Add USB_STRING_DESCRIPTOR and make the Keyboard demo use it.

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

diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.c b/Projects/AVRISP-MKII/AVRISPDescriptors.c
index 61c9206..e4feb31 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, 2013.
+     Copyright (C) Dean Camera, 2014.

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

-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2014  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


@@ -57,7 +57,7 @@ const USB_Descriptor_Device_t PROGMEM AVRISP_DeviceDescriptor =
 {
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
 {
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 

-       .USBSpecification       = VERSION_BCD(01.10),
+       .USBSpecification       = VERSION_BCD(1,1,0),

        .Class                  = USB_CSCP_VendorSpecificClass,
        .SubClass               = USB_CSCP_NoDeviceSubclass,
        .Protocol               = USB_CSCP_NoDeviceProtocol,
        .Class                  = USB_CSCP_VendorSpecificClass,
        .SubClass               = USB_CSCP_NoDeviceSubclass,
        .Protocol               = USB_CSCP_NoDeviceProtocol,


@@ -66,11 +66,11 @@ const USB_Descriptor_Device_t PROGMEM AVRISP_DeviceDescriptor =
 
        .VendorID               = 0x03EB,
        .ProductID              = 0x2104,
 
        .VendorID               = 0x03EB,
        .ProductID              = 0x2104,

-       .ReleaseNumber          = VERSION_BCD(02.00),
+       .ReleaseNumber          = VERSION_BCD(2,0,0),

 
 

-       .ManufacturerStrIndex   = STRING_ID_Manufacturer,
-       .ProductStrIndex        = STRING_ID_Product,
-       .SerialNumStrIndex      = STRING_ID_Serial,
+       .ManufacturerStrIndex   = AVRISP_STRING_ID_Manufacturer,
+       .ProductStrIndex        = AVRISP_STRING_ID_Product,
+       .SerialNumStrIndex      = AVRISP_STRING_ID_Serial,

 
        .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
 };
 
        .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
 };


@@ -101,7 +101,7 @@ AVRISP_USB_Descriptor_Configuration_t AVRISP_ConfigurationDescriptor =
                {
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 
                {
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
 

-                       .InterfaceNumber        = 0,
+                       .InterfaceNumber        = INTERFACE_ID_AVRISP,

                        .AlternateSetting       = 0,
 
                        .TotalEndpoints         = 2,
                        .AlternateSetting       = 0,
 
                        .TotalEndpoints         = 2,


@@ -219,19 +219,19 @@ uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
                case DTYPE_String:
                        switch (DescriptorNumber)
                        {
                case DTYPE_String:
                        switch (DescriptorNumber)
                        {

-                               case STRING_ID_Language:
+                               case AVRISP_STRING_ID_Language:

                                        Address = &AVRISP_LanguageString;
                                        Size    = pgm_read_byte(&AVRISP_LanguageString.Header.Size);
                                        break;
                                        Address = &AVRISP_LanguageString;
                                        Size    = pgm_read_byte(&AVRISP_LanguageString.Header.Size);
                                        break;

-                               case STRING_ID_Manufacturer:
+                               case AVRISP_STRING_ID_Manufacturer:

                                        Address = &AVRISP_ManufacturerString;
                                        Size    = pgm_read_byte(&AVRISP_ManufacturerString.Header.Size);
                                        break;
                                        Address = &AVRISP_ManufacturerString;
                                        Size    = pgm_read_byte(&AVRISP_ManufacturerString.Header.Size);
                                        break;

-                               case STRING_ID_Product:
+                               case AVRISP_STRING_ID_Product:

                                        Address = &AVRISP_ProductString;
                                        Size    = pgm_read_byte(&AVRISP_ProductString.Header.Size);
                                        break;
                                        Address = &AVRISP_ProductString;
                                        Size    = pgm_read_byte(&AVRISP_ProductString.Header.Size);
                                        break;

-                               case STRING_ID_Serial:
+                               case AVRISP_STRING_ID_Serial:

                                        Address = &AVRISP_SerialString;
                                        Size    = AVRISP_SerialString.Header.Size;
 
                                        Address = &AVRISP_SerialString;
                                        Size    = AVRISP_SerialString.Header.Size;