Fix ring buffer example.

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

diff --git a/Projects/RelayBoard/Descriptors.c b/Projects/RelayBoard/Descriptors.c
index c6b2d8f..d595186 100644 (file)
--- a/Projects/RelayBoard/Descriptors.c
+++ b/Projects/RelayBoard/Descriptors.c
@@ -1,6 +1,6 @@
 /*
              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


@@ -8,7 +8,7 @@
 
 /*
   Copyright 2010  OBinou (obconseil [at] gmail [dot] com)
 
 /*
   Copyright 2010  OBinou (obconseil [at] gmail [dot] com)

-  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


@@ -47,7 +47,7 @@ const USB_Descriptor_Device_t PROGMEM RelayBoard_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,


@@ -56,7 +56,7 @@ const USB_Descriptor_Device_t PROGMEM RelayBoard_DeviceDescriptor =
 
        .VendorID               = 0x04B4,
        .ProductID              = 0xFD11,
 
        .VendorID               = 0x04B4,
        .ProductID              = 0xFD11,

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

 
        .ManufacturerStrIndex   = STRING_ID_Manufacturer,
        .ProductStrIndex        = STRING_ID_Product,
 
        .ManufacturerStrIndex   = STRING_ID_Manufacturer,
        .ProductStrIndex        = STRING_ID_Product,


@@ -91,7 +91,7 @@ const USB_Descriptor_Configuration_t PROGMEM RelayBoard_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_RelayBoard,

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


@@ -119,33 +119,18 @@ const USB_Descriptor_String_t PROGMEM RelayBoard_LanguageString =
  *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */
  *  form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */

-const USB_Descriptor_String_t PROGMEM RelayBoard_ManufacturerString =
-{
-       .Header                 = {.Size = USB_STRING_LEN(5), .Type = DTYPE_String},
-
-       .UnicodeString          = L"SISPM"
-};
+const USB_Descriptor_String_t PROGMEM RelayBoard_ManufacturerString = USB_STRING_DESCRIPTOR(L"SISPM");

 
 /** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
  *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */
 
 /** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
  *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device
  *  Descriptor.
  */

-const USB_Descriptor_String_t PROGMEM RelayBoard_ProductString =
-{
-       .Header                 = {.Size = USB_STRING_LEN(10), .Type = DTYPE_String},
-
-       .UnicodeString          = L"RelayBoard"
-};
+const USB_Descriptor_String_t PROGMEM RelayBoard_ProductString = USB_STRING_DESCRIPTOR(L"RelayBoard");

 
 /** 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 RelayBoard_SerialString =
-{
-       .Header                 = {.Size = USB_STRING_LEN(5), .Type = DTYPE_String},
-
-       .UnicodeString          = L"00001"
-};
+const USB_Descriptor_String_t PROGMEM RelayBoard_SerialString = USB_STRING_DESCRIPTOR(L"00001");

 
 /** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
  *  documentation) by the application code so that the address and size of a requested descriptor can be given
 
 /** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
  *  documentation) by the application code so that the address and size of a requested descriptor can be given