diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2011-02-06 18:03:29 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-02-06 18:03:29 +0000 |
commit | 5995c3f880899b2573f1026ed6dc1c3c3a8e93d2 (patch) | |
tree | ae393ebf71a9470e61c2a748d1bd636301874f41 /Demos/Device/Incomplete | |
parent | 355d12e039caafbb8e0ae18427be3acef03719d1 (diff) | |
download | lufa-5995c3f880899b2573f1026ed6dc1c3c3a8e93d2.tar.gz lufa-5995c3f880899b2573f1026ed6dc1c3c3a8e93d2.tar.bz2 lufa-5995c3f880899b2573f1026ed6dc1c3c3a8e93d2.zip |
Oops - fix missing constants in the TempDataLogger FatFS diskio.h header file.
Add const to all project descriptor definitions for safety.
Diffstat (limited to 'Demos/Device/Incomplete')
-rw-r--r-- | Demos/Device/Incomplete/Sideshow/Descriptors.c | 16 | ||||
-rw-r--r-- | Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.c b/Demos/Device/Incomplete/Sideshow/Descriptors.c index ca5697c04..b19888d3c 100644 --- a/Demos/Device/Incomplete/Sideshow/Descriptors.c +++ b/Demos/Device/Incomplete/Sideshow/Descriptors.c @@ -30,7 +30,7 @@ #include "Descriptors.h" -USB_Descriptor_Device_t PROGMEM DeviceDescriptor = +const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = { Header: {Size: sizeof(USB_Descriptor_Device_t), Type: DTYPE_Device}, @@ -52,7 +52,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = NumberOfConfigurations: 1 }; -USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = +const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = { .Config = { @@ -106,35 +106,35 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = } }; -USB_Descriptor_String_t PROGMEM LanguageString = +const USB_Descriptor_String_t PROGMEM LanguageString = { Header: {Size: USB_STRING_LEN(1), Type: DTYPE_String}, UnicodeString: {LANGUAGE_ID_ENG} }; -USB_Descriptor_String_t PROGMEM ManufacturerString = +const USB_Descriptor_String_t PROGMEM ManufacturerString = { Header: {Size: USB_STRING_LEN(11), Type: DTYPE_String}, UnicodeString: L"Dean Camera" }; -USB_Descriptor_String_t PROGMEM ProductString = +const USB_Descriptor_String_t PROGMEM ProductString = { Header: {Size: USB_STRING_LEN(22), Type: DTYPE_String}, UnicodeString: L"LUFA Sideshow Demo" }; -USB_Descriptor_String_t PROGMEM SerialNumberString = +const USB_Descriptor_String_t PROGMEM SerialNumberString = { Header: {Size: USB_STRING_LEN(12), Type: DTYPE_String}, UnicodeString: L"000000000000" }; -USB_OSDescriptor_t PROGMEM OSDescriptorString = +const USB_OSDescriptor_t PROGMEM OSDescriptorString = { Header: {Size: sizeof(USB_OSDescriptor_t), Type: DTYPE_String}, @@ -142,7 +142,7 @@ USB_OSDescriptor_t PROGMEM OSDescriptorString = VendorCode: REQ_GetOSFeatureDescriptor }; -USB_OSCompatibleIDDescriptor_t PROGMEM DevCompatIDs = +const USB_OSCompatibleIDDescriptor_t PROGMEM DevCompatIDs = { TotalLength: sizeof(USB_OSCompatibleIDDescriptor_t), Version: 0x0100, diff --git a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c index 93381b4e4..8cc6138f1 100644 --- a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c +++ b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c @@ -55,7 +55,7 @@ * number of device configurations. The descriptor is read out by the USB host when the enumeration * process begins. */ -USB_Descriptor_Device_t PROGMEM DeviceDescriptor = +const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = { .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device}, @@ -82,7 +82,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = * and endpoints. The descriptor is read out by the USB host during the enumeration process when selecting * a configuration so that the host may correctly communicate with the USB device. */ -USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = +const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = { .Config = { @@ -150,7 +150,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = * the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate * via the language ID table available at USB.org what languages the device supports for its string descriptors. */ -USB_Descriptor_String_t PROGMEM LanguageString = +const USB_Descriptor_String_t PROGMEM LanguageString = { .Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String}, @@ -161,7 +161,7 @@ USB_Descriptor_String_t PROGMEM LanguageString = * form, and is read out upon request by the host when the appropriate string ID is requested, listed in the Device * Descriptor. */ -USB_Descriptor_String_t PROGMEM ManufacturerString = +const USB_Descriptor_String_t PROGMEM ManufacturerString = { .Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String}, @@ -172,7 +172,7 @@ USB_Descriptor_String_t PROGMEM ManufacturerString = * and is read out upon request by the host when the appropriate string ID is requested, listed in the Device * Descriptor. */ -USB_Descriptor_String_t PROGMEM ProductString = +const USB_Descriptor_String_t PROGMEM ProductString = { .Header = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String}, |