aboutsummaryrefslogtreecommitdiffstats
path: root/Projects/RelayBoard
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2011-02-06 18:03:29 +0000
committerDean Camera <dean@fourwalledcubicle.com>2011-02-06 18:03:29 +0000
commit5995c3f880899b2573f1026ed6dc1c3c3a8e93d2 (patch)
treeae393ebf71a9470e61c2a748d1bd636301874f41 /Projects/RelayBoard
parent355d12e039caafbb8e0ae18427be3acef03719d1 (diff)
downloadlufa-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 'Projects/RelayBoard')
-rw-r--r--Projects/RelayBoard/Descriptors.c16
-rw-r--r--Projects/RelayBoard/Descriptors.h6
2 files changed, 11 insertions, 11 deletions
diff --git a/Projects/RelayBoard/Descriptors.c b/Projects/RelayBoard/Descriptors.c
index bfd3ea4e7..ef98567ef 100644
--- a/Projects/RelayBoard/Descriptors.c
+++ b/Projects/RelayBoard/Descriptors.c
@@ -43,7 +43,7 @@
* number of device configurations. The descriptor is read out by the USB host when the enumeration
* process begins.
*/
-USB_Descriptor_Device_t PROGMEM RelayBoard_DeviceDescriptor =
+const USB_Descriptor_Device_t PROGMEM RelayBoard_DeviceDescriptor =
{
.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
@@ -70,13 +70,13 @@ USB_Descriptor_Device_t PROGMEM RelayBoard_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.
*/
-RelayBoard_USB_Descriptor_Configuration_t PROGMEM RelayBoard_ConfigurationDescriptor =
+const USB_Descriptor_Configuration_t PROGMEM RelayBoard_ConfigurationDescriptor =
{
.Config =
{
.Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
- .TotalConfigurationSize = sizeof(RelayBoard_USB_Descriptor_Configuration_t),
+ .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
.TotalInterfaces = 1,
.ConfigurationNumber = 1,
@@ -108,7 +108,7 @@ RelayBoard_USB_Descriptor_Configuration_t PROGMEM RelayBoard_ConfigurationDescri
* 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 RelayBoard_LanguageString =
+const USB_Descriptor_String_t PROGMEM RelayBoard_LanguageString =
{
.Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
@@ -119,7 +119,7 @@ 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.
*/
-USB_Descriptor_String_t PROGMEM RelayBoard_ManufacturerString =
+const USB_Descriptor_String_t PROGMEM RelayBoard_ManufacturerString =
{
.Header = {.Size = USB_STRING_LEN(5), .Type = DTYPE_String},
@@ -130,7 +130,7 @@ USB_Descriptor_String_t PROGMEM RelayBoard_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 RelayBoard_ProductString =
+const USB_Descriptor_String_t PROGMEM RelayBoard_ProductString =
{
.Header = {.Size = USB_STRING_LEN(10), .Type = DTYPE_String},
@@ -140,7 +140,7 @@ USB_Descriptor_String_t PROGMEM RelayBoard_ProductString =
/** Serial number string. This is a Unicode string containing the device's unique serial number, expressed as a
* series of uppercase hexadecimal digits.
*/
-USB_Descriptor_String_t PROGMEM RelayBoard_SerialString =
+const USB_Descriptor_String_t PROGMEM RelayBoard_SerialString =
{
.Header = {.Size = USB_STRING_LEN(5), .Type = DTYPE_String},
@@ -171,7 +171,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
break;
case DTYPE_Configuration:
Address = &RelayBoard_ConfigurationDescriptor;
- Size = sizeof(RelayBoard_USB_Descriptor_Configuration_t);
+ Size = sizeof(USB_Descriptor_Configuration_t);
break;
case DTYPE_String:
switch (DescriptorNumber)
diff --git a/Projects/RelayBoard/Descriptors.h b/Projects/RelayBoard/Descriptors.h
index 1a68ae3f7..d913eb722 100644
--- a/Projects/RelayBoard/Descriptors.h
+++ b/Projects/RelayBoard/Descriptors.h
@@ -48,9 +48,9 @@
*/
typedef struct
{
- USB_Descriptor_Configuration_Header_t Config;
- USB_Descriptor_Interface_t RelayBoardInterface;
- } RelayBoard_USB_Descriptor_Configuration_t;
+ USB_Descriptor_Configuration_Header_t Config;
+ USB_Descriptor_Interface_t RelayBoardInterface;
+ } USB_Descriptor_Configuration_t;
/* Function Prototypes: */
uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,