projects / pub / lufa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Changed over all deprecated GCC structure tag initializers to the standardized C99...
[pub/lufa.git] / Demos / Device / MassStorage / Descriptors.c
diff --git a/Demos/Device/MassStorage/Descriptors.c b/Demos/Device/MassStorage/Descriptors.c
index dd98db5..3592e9d 100644 (file)
--- a/Demos/Device/MassStorage/Descriptors.c
+++ b/Demos/Device/MassStorage/Descriptors.c
@@ -44,24 +44,24 @@
  */\r
 USB_Descriptor_Device_t PROGMEM DeviceDescriptor =\r
 {\r
  */\r
 USB_Descriptor_Device_t PROGMEM DeviceDescriptor =\r
 {\r
-       Header:                 {Size: sizeof(USB_Descriptor_Device_t), Type: DTYPE_Device},\r
+       .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},\r
                \r
                \r
-       USBSpecification:       VERSION_BCD(01.10),\r
-       Class:                  0x00,\r
-       SubClass:               0x00,\r
-       Protocol:               0x00,\r
+       .USBSpecification       = VERSION_BCD(01.10),\r
+       .Class                  = 0x00,\r
+       .SubClass               = 0x00,\r
+       .Protocol               = 0x00,\r
                                \r
                                \r
-       Endpoint0Size:          8,\r
+       .Endpoint0Size          = 8,\r
                \r
                \r
-       VendorID:               0x03EB,\r
-       ProductID:              0x2045,\r
-       ReleaseNumber:          0x0000,\r
+       .VendorID               = 0x03EB,\r
+       .ProductID              = 0x2045,\r
+       .ReleaseNumber          = 0x0000,\r
                \r
                \r
-       ManufacturerStrIndex:   0x01,\r
-       ProductStrIndex:        0x02,\r
-       SerialNumStrIndex:      0x03,\r
+       .ManufacturerStrIndex   = 0x01,\r
+       .ProductStrIndex        = 0x02,\r
+       .SerialNumStrIndex      = 0x03,\r
                \r
                \r
-       NumberOfConfigurations: 1\r
+       .NumberOfConfigurations = 1\r
 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\r
 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\r
@@ -71,55 +71,55 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
  */\r
 USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =\r
 {\r
  */\r
 USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =\r
 {\r
-       Config:\r
+       .Config = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(USB_Descriptor_Configuration_Header_t), Type: DTYPE_Configuration},\r
+                       .Header                 = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},\r
 \r
 \r
-                       TotalConfigurationSize: sizeof(USB_Descriptor_Configuration_t),\r
-                       TotalInterfaces:        1,\r
+                       .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),\r
+                       .TotalInterfaces        = 1,\r
                                \r
                                \r
-                       ConfigurationNumber:    1,\r
-                       ConfigurationStrIndex:  NO_DESCRIPTOR,\r
+                       .ConfigurationNumber    = 1,\r
+                       .ConfigurationStrIndex  = NO_DESCRIPTOR,\r
                                \r
                                \r
-                       ConfigAttributes:       USB_CONFIG_ATTR_BUSPOWERED,\r
+                       .ConfigAttributes       = USB_CONFIG_ATTR_BUSPOWERED,\r
                        \r
                        \r
-                       MaxPowerConsumption:    USB_CONFIG_POWER_MA(100)\r
+                       .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r
                },\r
                \r
-       Interface:\r
+       .Interface = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface},\r
+                       .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
 \r
-                       InterfaceNumber:        0,\r
-                       AlternateSetting:       0,\r
+                       .InterfaceNumber        = 0,\r
+                       .AlternateSetting       = 0,\r
                        \r
                        \r
-                       TotalEndpoints:         2,\r
+                       .TotalEndpoints         = 2,\r
                                \r
                                \r
-                       Class:                  0x08,\r
-                       SubClass:               0x06,\r
-                       Protocol:               0x50,\r
+                       .Class                  = 0x08,\r
+                       .SubClass               = 0x06,\r
+                       .Protocol               = 0x50,\r
                                \r
                                \r
-                       InterfaceStrIndex:      NO_DESCRIPTOR\r
+                       .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r
                },\r
 \r
-       DataInEndpoint:\r
+       .DataInEndpoint = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
+                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
 \r
 \r
-                       EndpointAddress:        (ENDPOINT_DESCRIPTOR_DIR_IN | MASS_STORAGE_IN_EPNUM),\r
-                       Attributes:             EP_TYPE_BULK,\r
-                       EndpointSize:           MASS_STORAGE_IO_EPSIZE,\r
-                       PollingIntervalMS:      0x00\r
+                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | MASS_STORAGE_IN_EPNUM),\r
+                       .Attributes             = EP_TYPE_BULK,\r
+                       .EndpointSize           = MASS_STORAGE_IO_EPSIZE,\r
+                       .PollingIntervalMS      = 0x00\r
                },\r
 \r
                },\r
 \r
-       DataOutEndpoint:\r
+       .DataOutEndpoint = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
+                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
 \r
 \r
-                       EndpointAddress:        (ENDPOINT_DESCRIPTOR_DIR_OUT | MASS_STORAGE_OUT_EPNUM),\r
-                       Attributes:             EP_TYPE_BULK,\r
-                       EndpointSize:           MASS_STORAGE_IO_EPSIZE,\r
-                       PollingIntervalMS:      0x00\r
+                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | MASS_STORAGE_OUT_EPNUM),\r
+                       .Attributes             = EP_TYPE_BULK,\r
+                       .EndpointSize           = MASS_STORAGE_IO_EPSIZE,\r
+                       .PollingIntervalMS      = 0x00\r
                }\r
 };\r
 \r
                }\r
 };\r
 \r
@@ -129,9 +129,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
  */\r
 USB_Descriptor_String_t PROGMEM LanguageString =\r
 {\r
  */\r
 USB_Descriptor_String_t PROGMEM LanguageString =\r
 {\r
-       Header:                 {Size: USB_STRING_LEN(1), Type: DTYPE_String},\r
+       .Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},\r
                \r
                \r
-       UnicodeString:          {LANGUAGE_ID_ENG}\r
+       .UnicodeString          = {LANGUAGE_ID_ENG}\r
 };\r
 \r
 /** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable\r
 };\r
 \r
 /** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable\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(11), Type: DTYPE_String},\r
+       .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},\r
                \r
                \r
-       UnicodeString:          L"Dean Camera"\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,9 +151,9 @@ 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(22), Type: DTYPE_String},\r
+       .Header                 = {.Size = USB_STRING_LEN(22), .Type = DTYPE_String},\r
                \r
                \r
-       UnicodeString:          L"LUFA Mass Storage Demo"\r
+       .UnicodeString          = L"LUFA Mass Storage Demo"\r
 };\r
 \r
 /** Serial number descriptor string. This is a Unicode string containing a string of HEX characters at least 12\r
 };\r
 \r
 /** Serial number descriptor string. This is a Unicode string containing a string of HEX characters at least 12\r
@@ -165,9 +165,9 @@ USB_Descriptor_String_t PROGMEM ProductString =
  */\r
 USB_Descriptor_String_t PROGMEM SerialNumberString =\r
 {\r
  */\r
 USB_Descriptor_String_t PROGMEM SerialNumberString =\r
 {\r
-       Header:                 {Size: USB_STRING_LEN(12), Type: DTYPE_String},\r
+       .Header                 = {.Size = USB_STRING_LEN(12), .Type = DTYPE_String},\r
                \r
                \r
-       UnicodeString:          L"000000000000"\r
+       .UnicodeString          = L"000000000000"\r
 };\r
 \r
 /** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h\r
 };\r
 \r
 /** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h\r
@@ -186,30 +186,30 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
 \r
        switch (DescriptorType)\r
        {\r
 \r
        switch (DescriptorType)\r
        {\r
-               case DTYPE_Device:\r
+               case DTYPE_Device: \r
                        Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);\r
                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                        Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);\r
                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
-               case DTYPE_Configuration:\r
+               case DTYPE_Configuration: \r
                        Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                        Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
-               case DTYPE_String:\r
+               case DTYPE_String: \r
                        switch (DescriptorNumber)\r
                        {\r
                        switch (DescriptorNumber)\r
                        {\r
-                               case 0x00:\r
+                               case 0x00: \r
                                        Address = DESCRIPTOR_ADDRESS(LanguageString);\r
                                        Size    = pgm_read_byte(&LanguageString.Header.Size);\r
                                        break;\r
                                        Address = DESCRIPTOR_ADDRESS(LanguageString);\r
                                        Size    = pgm_read_byte(&LanguageString.Header.Size);\r
                                        break;\r
-                               case 0x01:\r
+                               case 0x01: \r
                                        Address = DESCRIPTOR_ADDRESS(ManufacturerString);\r
                                        Size    = pgm_read_byte(&ManufacturerString.Header.Size);\r
                                        break;\r
                                        Address = DESCRIPTOR_ADDRESS(ManufacturerString);\r
                                        Size    = pgm_read_byte(&ManufacturerString.Header.Size);\r
                                        break;\r
-                               case 0x02:\r
+                               case 0x02: \r
                                        Address = DESCRIPTOR_ADDRESS(ProductString);\r
                                        Size    = pgm_read_byte(&ProductString.Header.Size);\r
                                        break;\r
                                        Address = DESCRIPTOR_ADDRESS(ProductString);\r
                                        Size    = pgm_read_byte(&ProductString.Header.Size);\r
                                        break;\r
-                               case 0x03:\r
+                               case 0x03: \r
                                        Address = DESCRIPTOR_ADDRESS(SerialNumberString);\r
                                        Size    = pgm_read_byte(&SerialNumberString.Header.Size);\r
                                        break;\r
                                        Address = DESCRIPTOR_ADDRESS(SerialNumberString);\r
                                        Size    = pgm_read_byte(&SerialNumberString.Header.Size);\r
                                        break;\r
Lightweight USB Framework for AVRs