More AVR32 achitecture ports.

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

diff --git a/Projects/AVRISP-MKII/Descriptors.c b/Projects/AVRISP-MKII/Descriptors.c
index f89cfae..bdc198a 100644 (file)
--- a/Projects/AVRISP-MKII/Descriptors.c
+++ b/Projects/AVRISP-MKII/Descriptors.c
@@ -81,7 +81,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .ConfigurationNumber    = 1,\r
                        .ConfigurationStrIndex  = NO_DESCRIPTOR,\r
                                \r
                        .ConfigurationNumber    = 1,\r
                        .ConfigurationStrIndex  = NO_DESCRIPTOR,\r
                                \r

-                       .ConfigAttributes       = USB_CONFIG_ATTR_SELFPOWERED,\r
+                       .ConfigAttributes       = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),\r

                        \r
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                        \r
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r


@@ -151,11 +151,14 @@ USB_Descriptor_String_t PROGMEM ManufacturerString =
  */\r
 USB_Descriptor_String_t PROGMEM ProductString =\r
 {\r
  */\r
 USB_Descriptor_String_t PROGMEM ProductString =\r
 {\r

-       .Header                 = {.Size = USB_STRING_LEN(33), .Type = DTYPE_String},\r
+       .Header                 = {.Size = USB_STRING_LEN(22), .Type = DTYPE_String},\r

                \r
                \r

-       .UnicodeString          = L"LUFA AVRISP MkII Clone Programmer"\r
+       .UnicodeString          = L"LUFA AVRISP MkII Clone"\r

 };\r
 \r
 };\r
 \r

+/** Serial number string. This is a Unicode string containing the device's unique serial number, expressed as a\r
+ *  series of uppercase hexadecimal digits.\r
+ */\r

 USB_Descriptor_String_t PROGMEM SerialString =\r
 {\r
        .Header                 = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},\r
 USB_Descriptor_String_t PROGMEM SerialString =\r
 {\r
        .Header                 = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},\r