Ticket #23709: patch-avr910.c.diff

avr910.c

@@ -55 +55 @@
   unsigned char use_blockmode;
 };
 
+static char is_usb = 0;
+#define READ_SIZE 64
+static unsigned char extra_buf[1024+7];
+
 #define PDATA(pgm) ((struct pdata *)(pgm->cookie))
 
 static void avr910_setup(PROGRAMMER * pgm)
@@ -154 +158 @@
   return -1;
 }
 
+static int can_cmd = 0;
 
 /*
  * initialize the AVR device and prepare it to accept commands
@@ -175 +180 @@
   avr910_send(pgm, "S", 1);
   memset (id, 0, sizeof(id));
   avr910_recv(pgm, id, sizeof(id)-1);
+  is_usb = !strncmp(id, "USB910",6);
 
   /* Get the HW and SW versions to see if the programmer is present. */
 
   avr910_send(pgm, "V", 1);
   avr910_recv(pgm, sw, sizeof(sw));
+  if (sw[0] == '2') {
+    can_cmd = 1;
+  }
 
   avr910_send(pgm, "v", 1);
   avr910_recv(pgm, hw, sizeof(hw));
@@ -304 +313 @@
 {
   char buf[5];
 
-  /* FIXME: Insert version check here */
+  if (!can_cmd) return -1;
 
   buf[0] = '.';                 /* New Universal Command */
   buf[1] = cmd[0];
@@ -320 +329 @@
   res[2] = cmd[1];
   res[3] = buf[0];
 
-  return 0;
+  return (buf[1] == 'Y')?0:-1;
 }
 
 
@@ -518 +527 @@
   avr910_set_addr(pgm, addr>>1);
 
   while (addr < max_addr) {
-    page_wr_cmd_pending = 1;
-    buf[0] = cmd[addr & 0x01];
-    buf[1] = m->buf[addr];
-    avr910_send(pgm, buf, sizeof(buf));
-    avr910_vfy_cmd_sent(pgm, "write byte");
+    if (is_usb && m->paged) {
+      int i;
+      int idx = 0;
+      extra_buf[idx++] = 'A';
+      extra_buf[idx++] = (addr>>(8+1)) & 0xff;
+      extra_buf[idx++] = (addr>>1) & 0xff;
+      for (i=0; i< page_size; i++) {
+        extra_buf[idx++] = cmd[(addr+i)&0x01];
+        extra_buf[idx++] = (addr + i >= max_addr)?0xff:m->buf[addr+i];
+      }
+      extra_buf[idx++] = 'A';
+      extra_buf[idx++] = (addr>>(8+1)) & 0xff;
+      extra_buf[idx++] = (addr>>1) & 0xff;
+      extra_buf[idx++] = 'm';
+      avr910_send(pgm, extra_buf, idx);
+      avr910_recv(pgm, extra_buf, 3 + page_size);
+      addr += page_size;
+      usleep(m->max_write_delay);
+    } else {
+      page_wr_cmd_pending = 1;
+      buf[0] = cmd[addr & 0x01];
+      buf[1] = m->buf[addr];
+      avr910_send(pgm, buf, sizeof(buf));
+      avr910_vfy_cmd_sent(pgm, "write byte");
 
-    addr++;
-    page_bytes--;
+      addr++;
+      page_bytes--;
 
-    if (m->paged && (page_bytes == 0)) {
-      /* Send the "Issue Page Write" if we have sent a whole page. */
+      if (m->paged && (page_bytes == 0)) {
+        /* Send the "Issue Page Write" if we have sent a whole page. */
 
-      avr910_set_addr(pgm, page_addr>>1);
-      avr910_send(pgm, "m", 1);
-      avr910_vfy_cmd_sent(pgm, "flush page");
+        avr910_set_addr(pgm, page_addr>>1);
+        avr910_send(pgm, "m", 1);
+        avr910_vfy_cmd_sent(pgm, "flush page");
 
-      page_wr_cmd_pending = 0;
-      usleep(m->max_write_delay);
-      avr910_set_addr(pgm, addr>>1);
+        page_wr_cmd_pending = 0;
+        usleep(m->max_write_delay);
+        avr910_set_addr(pgm, addr>>1);
 
-      /* Set page address for next page. */
+        /* Set page address for next page. */
 
-      page_addr = addr;
-      page_bytes = page_size;
-    }
-    else if ((PDATA(pgm)->has_auto_incr_addr != 'Y') && ((addr & 0x01) == 0)) {
-      avr910_set_addr(pgm, addr>>1);
+        page_addr = addr;
+        page_bytes = page_size;
+      }
+      else if ((PDATA(pgm)->has_auto_incr_addr != 'Y') && ((addr & 0x01) == 0)) {
+        avr910_set_addr(pgm, addr>>1);
+      }
     }
-
     report_progress (addr, max_addr, NULL);
   }
 
@@ -676 +704 @@
     avr910_set_addr(pgm, addr);
 
     while (addr < max_addr) {
-      avr910_send(pgm, &cmd, 1);
-      if (cmd == 'R') {
-        /* The 'R' command returns two bytes, MSB first, we need to put the data
-           into the memory buffer LSB first. */
-        avr910_recv(pgm, buf, 2);
-        m->buf[addr*2]   = buf[1];  /* LSB */
-        m->buf[addr*2+1] = buf[0];  /* MSB */
-      }
-      else {
-        avr910_recv(pgm, (char *)&m->buf[addr], 1);
+      if (is_usb && cmd == 'R') {
+        int i;
+        for (i=0; i<READ_SIZE/2; i++) {
+          extra_buf[i] = 'R';
+        }
+        avr910_send(pgm, extra_buf, READ_SIZE/2);
+        avr910_recv(pgm, extra_buf, READ_SIZE);
+        for (i=0; i< READ_SIZE; i+=2) {
+          m->buf[addr*2+i]   = extra_buf[i+1];  /* LSB */
+          m->buf[addr*2+i+1] = extra_buf[i];    /* MSB */
+        }
+        addr += READ_SIZE/2;
+      } else {
+        avr910_send(pgm, &cmd, 1);
+        if (cmd == 'R') {
+          /* The 'R' command returns two bytes, MSB first, we need to put the data
+             into the memory buffer LSB first. */
+          avr910_recv(pgm, buf, 2);
+          m->buf[addr*2]   = buf[1];  /* LSB */
+          m->buf[addr*2+1] = buf[0];  /* MSB */
+        } else {
+          avr910_recv(pgm, (char *)&m->buf[addr], 1);
+        }
+
+        addr++;
+
+        if (PDATA(pgm)->has_auto_incr_addr != 'Y') {
+          avr910_set_addr(pgm, addr);
+        }
       }
-
-      addr++;
-
-      if (PDATA(pgm)->has_auto_incr_addr != 'Y') {
-        avr910_set_addr(pgm, addr);
-      }
-
       report_progress (addr, max_addr, NULL);
     }