Minor documentation improvements.

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

diff --git a/Projects/AVRISP-MKII/Descriptors.c b/Projects/AVRISP-MKII/Descriptors.c
index 1e72954..12f44f9 100644 (file)
--- a/Projects/AVRISP-MKII/Descriptors.c
+++ b/Projects/AVRISP-MKII/Descriptors.c
@@ -81,7 +81,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .ConfigurationNumber    = 1,
                        .ConfigurationStrIndex  = NO_DESCRIPTOR,
 
                        .ConfigurationNumber    = 1,
                        .ConfigurationStrIndex  = NO_DESCRIPTOR,
 

-                       .ConfigAttributes       = USB_CONFIG_ATTR_RESERVED,
+                       .ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),

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


@@ -96,8 +96,8 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .TotalEndpoints         = 2,
 
                        .Class                  = USB_CSCP_VendorSpecificClass,
                        .TotalEndpoints         = 2,
 
                        .Class                  = USB_CSCP_VendorSpecificClass,

-                       .SubClass               = 0x00,
-                       .Protocol               = 0x00,
+                       .SubClass               = USB_CSCP_NoDeviceSubclass,
+                       .Protocol               = USB_CSCP_NoDeviceProtocol,

 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },


@@ -140,9 +140,9 @@ const USB_Descriptor_String_t PROGMEM LanguageString =
  */
 const USB_Descriptor_String_t PROGMEM ManufacturerString =
 {
  */
 const USB_Descriptor_String_t PROGMEM ManufacturerString =
 {

-       .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
+       .Header                 = {.Size = USB_STRING_LEN(5), .Type = DTYPE_String},

 
 

-       .UnicodeString          = L"Dean Camera"
+       .UnicodeString          = L"ATMEL"

 };
 
 /** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
 };
 
 /** Product descriptor string. This is a Unicode string containing the product's details in human readable form,


@@ -151,9 +151,9 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString =
  */
 const USB_Descriptor_String_t PROGMEM ProductString =
 {
  */
 const USB_Descriptor_String_t PROGMEM ProductString =
 {

-       .Header                 = {.Size = USB_STRING_LEN(22), .Type = DTYPE_String},
+       .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},

 
 

-       .UnicodeString          = L"LUFA AVRISP MkII Clone"
+       .UnicodeString          = L"AVRISP mkII"

 };
 
 /** Serial number string. This is a Unicode string containing the device's unique serial number, expressed as a
 };
 
 /** Serial number string. This is a Unicode string containing the device's unique serial number, expressed as a


@@ -162,8 +162,8 @@ const USB_Descriptor_String_t PROGMEM ProductString =
 const USB_Descriptor_String_t PROGMEM SerialString =
 {
        .Header                 = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},
 const USB_Descriptor_String_t PROGMEM SerialString =
 {
        .Header                 = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String},

-
-       .UnicodeString          = L"0000A00128255"
+       
+       .UnicodeString          = L"000200012345\0" // Note: Real AVRISP-MKII has the embedded NUL byte, bug in firmware?

 };
 
 /** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
 };
 
 /** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"