Fix Serial peripheral driver compile error for XMEGA devices.

[pub/USBasp.git] / Projects / AVRISP-MKII / AVRISPDescriptors.c

diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.c b/Projects/AVRISP-MKII/AVRISPDescriptors.c
index ab30c0e..8f4ef54 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISPDescriptors.c
+++ b/Projects/AVRISP-MKII/AVRISPDescriptors.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2013.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -38,7 +38,7 @@
 #include "AVRISPDescriptors.h"
 
 #if defined(RESET_TOGGLES_LIBUSB_COMPAT) || defined(__DOXYGEN__)
 #include "AVRISPDescriptors.h"
 
 #if defined(RESET_TOGGLES_LIBUSB_COMPAT) || defined(__DOXYGEN__)

-       /** Indicates if an external reset has ocurred and the compatibility mode needs to be altered */
+       /** Indicates if an external reset has occurred and the compatibility mode needs to be altered */

        static bool AVRISP_NeedCompatibilitySwitch ATTR_NO_INIT;
 
        /** Current AVRISP data IN endpoint address. */
        static bool AVRISP_NeedCompatibilitySwitch ATTR_NO_INIT;
 
        /** Current AVRISP data IN endpoint address. */


@@ -174,7 +174,7 @@ const USB_Descriptor_String_t PROGMEM AVRISP_ProductString =
 /** Serial number string. This is a Unicode string containing the device's unique serial number, expressed as a
  *  series of uppercase hexadecimal digits.
  */
 /** Serial number string. This is a Unicode string containing the device's unique serial number, expressed as a
  *  series of uppercase hexadecimal digits.
  */

-const USB_Descriptor_String_t PROGMEM AVRISP_SerialString =
+USB_Descriptor_String_t AVRISP_SerialString =

 {
        .Header                 = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},
        
 {
        .Header                 = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},
        


@@ -233,7 +233,12 @@ uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
                                        break;
                                case 0x03:
                                        Address = &AVRISP_SerialString;
                                        break;
                                case 0x03:
                                        Address = &AVRISP_SerialString;

-                                       Size    = pgm_read_byte(&AVRISP_SerialString.Header.Size);
+                                       Size    = AVRISP_SerialString.Header.Size;
+                                       
+                                       /* Update serial number to have a different serial based on the current endpoint address */
+                                       ((uint16_t*)&AVRISP_SerialString.UnicodeString)[6] = cpu_to_le16('0' + (AVRISP_DATA_IN_EPADDR & ENDPOINT_EPNUM_MASK));
+                                       
+                                       *DescriptorMemorySpace = MEMSPACE_RAM;

                                        break;
                        }
 
                                        break;
                        }
 


@@ -255,7 +260,7 @@ uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
  */
 void CheckExternalReset(void)
 {      
  */
 void CheckExternalReset(void)
 {      

-       /* If an external reset occured, we need to change compatibility mode */
+       /* If an external reset occurred, we need to change compatibility mode */

        AVRISP_NeedCompatibilitySwitch = (MCUSR == (1 << EXTRF));
 
        MCUSR = 0;
        AVRISP_NeedCompatibilitySwitch = (MCUSR == (1 << EXTRF));
 
        MCUSR = 0;