* jtag3.c: Fill in the missing pieces for Xmega support (both,

PDI and JTAG).
* jtagmkII.c (jtagmkII_set_xmega_params): Use "fuse1" rather
than "fuse0" memory space to fill in the NVM offset from, as
there is no "fuse0" on some Xmega devices.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1111 81a1dc3b-b13d-400b-aceb-764788c761c2

ChangeLog

@@ -1,3 +1,11 @@
+2012-11-29  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	* jtag3.c: Fill in the missing pieces for Xmega support (both,
+	PDI and JTAG).
+	* jtagmkII.c (jtagmkII_set_xmega_params): Use "fuse1" rather
+	than "fuse0" memory space to fill in the NVM offset from, as
+	there is no "fuse0" on some Xmega devices.
+
 2012-11-29  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* avrdude.conf.in (ATmega256RFR2, ATmega128RFR2, ATmega64RFR2):

NEWS

@@ -35,7 +35,7 @@ Current:
         X3(1), sck = DSR X3(2), mosi = DCD X3(3), reset = RI X3(4))
       + diecimila (alias for arduino-ft232r)
 
-    - Atmel JTAGICE3 (megaAVR/JTAG only so far)
+    - Atmel JTAGICE3 (megaAVR/JTAG, Xmega/JTAG/PDI only so far)
 
   * Bugfixes
       - bug #34027: avrdude AT90S1200 Problem

jtag3.c

@@ -759,6 +759,42 @@ static int jtag3_initialize(PROGRAMMER * pgm, AVRPART * p)
   if ((p->flags & AVRPART_HAS_PDI))
   {
     struct xmega_device_desc xd;
+    LNODEID ln;
+    AVRMEM * m;
+
+    u16_to_b2(xd.nvm_base_addr, p->nvm_base);
+    u16_to_b2(xd.mcu_base_addr, p->mcu_base);
+
+    for (ln = lfirst(p->mem); ln; ln = lnext(ln)) {
+      m = ldata(ln);
+      if (strcmp(m->desc, "flash") == 0) {
+        PDATA(pgm)->flash_pagesize = m->page_size;
+	u16_to_b2(xd.flash_page_size, m->page_size);
+      } else if (strcmp(m->desc, "eeprom") == 0) {
+	xd.eeprom_page_size = m->page_size;
+	u16_to_b2(xd.eeprom_size, m->size);
+	u32_to_b4(xd.nvm_eeprom_offset, m->offset);
+      } else if (strcmp(m->desc, "application") == 0) {
+	u32_to_b4(xd.app_size, m->size);
+	u32_to_b4(xd.nvm_app_offset, m->offset);
+      } else if (strcmp(m->desc, "boot") == 0) {
+	u16_to_b2(xd.boot_size, m->size);
+	u32_to_b4(xd.nvm_boot_offset, m->offset);
+      } else if (strcmp(m->desc, "fuse1") == 0) {
+	u32_to_b4(xd.nvm_fuse_offset, m->offset & ~7);
+      } else if (strcmp(m->desc, "lock") == 0) {
+	u32_to_b4(xd.nvm_lock_offset, m->offset);
+      } else if (strcmp(m->desc, "usersig") == 0) {
+	u32_to_b4(xd.nvm_user_sig_offset, m->offset);
+      } else if (strcmp(m->desc, "prodsig") == 0) {
+	u32_to_b4(xd.nvm_prod_sig_offset, m->offset);
+      } else if (strcmp(m->desc, "data") == 0) {
+	u32_to_b4(xd.nvm_data_offset, m->offset);
+      }
+    }
+
+    if (jtag3_setparm(pgm, SCOPE_AVR, 2, PARM3_DEVICEDESC, (unsigned char *)&xd, sizeof xd) < 0)
+      return -1;
   }
   else
   {
@@ -784,21 +820,19 @@ static int jtag3_initialize(PROGRAMMER * pgm, AVRPART * p)
     }
 
     //md.sram_offset[2] = p->sram;  // do we need it?
-    u16_to_b2(md.sram_offset, 0x200);
     md.ocd_revision = 3;        /* XXX! */
     md.always_one = 1;
     md.allow_full_page_bitstream = (p->flags & AVRPART_ALLOWFULLPAGEBITSTREAM) != 0;
     md.idr_address = p->idr;
 
     if (p->eecr == 0)
-      p->eecr = 0x1f;		/* matches most "modern" mega/tiny AVRs */
+      p->eecr = 0x3f;		/* matches most "modern" mega/tiny AVRs */
-    md.eearh_address = p->eecr + 3;
+    md.eearh_address = p->eecr - 0x20 + 3;
-    md.eearl_address = p->eecr + 2;
+    md.eearl_address = p->eecr - 0x20 + 2;
-    md.eecr_address = p->eecr;
+    md.eecr_address = p->eecr - 0x20;
-    md.eedr_address = p->eecr + 1;
+    md.eedr_address = p->eecr - 0x20 + 1;
     md.spmcr_address = p->spmcr;
     //md.osccal_address = p->osccal;  // do we need it at all?
-    md.osccal_address = 0x46;	/* XXX */
 
     if (jtag3_setparm(pgm, SCOPE_AVR, 2, PARM3_DEVICEDESC, (unsigned char *)&md, sizeof md) < 0)
       return -1;
@@ -827,6 +861,23 @@ static int jtag3_initialize(PROGRAMMER * pgm, AVRPART * p)
 
   free(resp);
 
+  PDATA(pgm)->boot_start = ULONG_MAX;
+  if ((p->flags & AVRPART_HAS_PDI)) {
+    /*
+     * Find out where the border between application and boot area
+     * is.
+     */
+    AVRMEM *bootmem = avr_locate_mem(p, "boot");
+    AVRMEM *flashmem = avr_locate_mem(p, "flash");
+    if (bootmem == NULL || flashmem == NULL) {
+      fprintf(stderr,
+	      "%s: jtagmk3_initialize(): Cannot locate \"flash\" and \"boot\" memories in description\n",
+	      progname);
+    } else {
+      PDATA(pgm)->boot_start = bootmem->offset - flashmem->offset;
+    }
+  }
+
   free(PDATA(pgm)->flash_pagecache);
   free(PDATA(pgm)->eeprom_pagecache);
   if ((PDATA(pgm)->flash_pagecache = malloc(PDATA(pgm)->flash_pagesize)) == NULL) {
@@ -1854,12 +1905,7 @@ static unsigned char jtag3_memtype(PROGRAMMER * pgm, AVRPART * p, unsigned long
 
 static unsigned int jtag3_memaddr(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, unsigned long addr)
 {
-#if 0
+  if ((p->flags & AVRPART_HAS_PDI) != 0) {
-  /*
-   * Xmega devices handled by V7+ firmware don't want to be told their
-   * m->offset within the write memory command.
-   */
-  if (PDATA(pgm)->fwver >= 0x700 && (p->flags & AVRPART_HAS_PDI) != 0) {
     if (addr >= PDATA(pgm)->boot_start)
       /*
        * all memories but "flash" are smaller than boot_start anyway, so
@@ -1871,12 +1917,9 @@ static unsigned int jtag3_memaddr(PROGRAMMER * pgm, AVRPART * p, AVRMEM * m, uns
       return addr;
   }
   /*
-   * Old firmware, or non-Xmega device.  Non-Xmega (and non-AVR32)
+   * Non-Xmega device.
-   * devices always have an m->offset of 0, so we don't have to
-   * distinguish them here.
    */
-#endif
+  return addr;
-  return addr + m->offset;
 }
 
 

jtagmkII.c

@@ -1078,8 +1078,8 @@ static void jtagmkII_set_xmega_params(PROGRAMMER * pgm, AVRPART * p)
     } else if (strcmp(m->desc, "boot") == 0) {
       u16_to_b2(sendbuf.dd.boot_size, m->size);
       u32_to_b4(sendbuf.dd.nvm_boot_offset, m->offset);
-    } else if (strcmp(m->desc, "fuse0") == 0) {
+    } else if (strcmp(m->desc, "fuse1") == 0) {
-      u32_to_b4(sendbuf.dd.nvm_fuse_offset, m->offset);
+      u32_to_b4(sendbuf.dd.nvm_fuse_offset, m->offset & ~7);
     } else if (strcmp(m->desc, "lock") == 0) {
       u32_to_b4(sendbuf.dd.nvm_lock_offset, m->offset);
     } else if (strcmp(m->desc, "usersig") == 0) {