aboutsummaryrefslogtreecommitdiff
path: root/Bootloaders/DFU
diff options
context:
space:
mode:
authorDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2010-03-22 07:12:25 +0000
committerDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2010-03-22 07:12:25 +0000
commitd0e2d301db1a96a307e5451425eeadb4670216e6 (patch)
tree5f7a09d599f84d37d1b122b66e6c0c0b62731c5e /Bootloaders/DFU
parenta300f527f1211ab3c35ca7a8f2d8a18ed77bf248 (diff)
Standardized the naming scheme given to configuration descriptor sub-elements in the Device mode demos, bootloaders and projects.
Fix errors in the MouseHostWithParser demo from incorrect use of the HID_ALIGN_DATA() macro. git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1172 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'Bootloaders/DFU')
-rw-r--r--Bootloaders/DFU/Descriptors.c4
-rw-r--r--Bootloaders/DFU/Descriptors.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c
index f20fbeb9..510a29fb 100644
--- a/Bootloaders/DFU/Descriptors.c
+++ b/Bootloaders/DFU/Descriptors.c
@@ -86,7 +86,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
- .DFUInterface =
+ .DFU_Interface =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
@@ -102,7 +102,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
.InterfaceStrIndex = NO_DESCRIPTOR
},
- .DFUFunctional =
+ .DFU_Functional =
{
.Header = {.Size = sizeof(USB_DFU_Functional_Descriptor_t), .Type = DTYPE_DFUFunctional},
diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h
index 32d58285..961e480e 100644
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -161,8 +161,8 @@
typedef struct
{
USB_Descriptor_Configuration_Header_t Config;
- USB_Descriptor_Interface_t DFUInterface;
- USB_DFU_Functional_Descriptor_t DFUFunctional;
+ USB_Descriptor_Interface_t DFU_Interface;
+ USB_DFU_Functional_Descriptor_t DFU_Functional;
} USB_Descriptor_Configuration_t;
/* Function Prototypes: */