Replace the LUFA build system with DMBS.

[pub/USBasp.git] / LUFA / CodeTemplates / DeviceTemplate / Descriptors.c

diff --git a/LUFA/CodeTemplates/DeviceTemplate/Descriptors.c b/LUFA/CodeTemplates/DeviceTemplate/Descriptors.c
index a3aacde..c90b5e8 100644 (file)
--- a/LUFA/CodeTemplates/DeviceTemplate/Descriptors.c
+++ b/LUFA/CodeTemplates/DeviceTemplate/Descriptors.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2016.

 
   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 2016  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


@@ -42,11 +42,11 @@
  *  and the number of device configurations. The descriptor is read out by the
  *  USB host when the enumeration process begins.
  */
  *  and the number of device configurations. The descriptor is read out by the
  *  USB host when the enumeration process begins.
  */

-const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
+const USB_Descriptor_Device_t DeviceDescriptor =

 {
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 
 {
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
 

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

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


@@ -55,7 +55,7 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
 
        .VendorID               = 0x0000,
        .ProductID              = 0x0000,
 
        .VendorID               = 0x0000,
        .ProductID              = 0x0000,

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

 
        .ManufacturerStrIndex   = 0x01,
        .ProductStrIndex        = 0x02,
 
        .ManufacturerStrIndex   = 0x01,
        .ProductStrIndex        = 0x02,


@@ -127,7 +127,7 @@ const USB_Descriptor_String_t ProductString =
  *  USB host.
  */
 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  *  USB host.
  */
 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,

                                     const void** const DescriptorAddress
                                                                        #if defined(HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES)
                                                                        , uint8_t* const DescriptorMemorySpace
                                     const void** const DescriptorAddress
                                                                        #if defined(HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES)
                                                                        , uint8_t* const DescriptorMemorySpace