Move Dataflash operational checking code out from SCSI.c into the DataflashManager...

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

diff --git a/Projects/AVRISP/Descriptors.c b/Projects/AVRISP/Descriptors.c
index 6ccf5ee..a2765d3 100644 (file)
--- a/Projects/AVRISP/Descriptors.c
+++ b/Projects/AVRISP/Descriptors.c
@@ -109,7 +109,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | AVRISP_DATA_EPNUM),\r
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | AVRISP_DATA_EPNUM),\r
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r

-                       .PollingIntervalMS      = 0x0A\r
+                       .PollingIntervalMS      = 0x00\r

                },\r
 
        .DataOutEndpoint =\r
                },\r
 
        .DataOutEndpoint =\r


@@ -119,7 +119,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | AVRISP_DATA_EPNUM),\r
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | AVRISP_DATA_EPNUM),\r
                        .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
                        .EndpointSize           = AVRISP_DATA_EPSIZE,\r

-                       .PollingIntervalMS      = 0x0A\r
+                       .PollingIntervalMS      = 0x00\r

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


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

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

                \r
                \r

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

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


@@ -151,16 +151,16 @@ 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(11), .Type = DTYPE_String},\r
+       .Header                 = {.Size = USB_STRING_LEN(33), .Type = DTYPE_String},\r

                \r
                \r

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

 };\r
 \r
 USB_Descriptor_String_t PROGMEM SerialString =\r
 {\r
 };\r
 \r
 USB_Descriptor_String_t PROGMEM SerialString =\r
 {\r

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

                \r
                \r

-       .UnicodeString          = L"00A000001B5B"\r
+       .UnicodeString          = L"0000A00128255"\r

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


@@ -176,7 +176,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
 \r
        void*    Address = NULL;\r
        uint16_t Size    = NO_DESCRIPTOR;\r
 \r
        void*    Address = NULL;\r
        uint16_t Size    = NO_DESCRIPTOR;\r

-\r
+       \r

        switch (DescriptorType)\r
        {\r
                case DTYPE_Device: \r
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device: \r