From 49b09a2042368947ab34f788f00b710183912285 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Mon, 22 Mar 2010 07:12:25 +0000
Subject: 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.
---
 Bootloaders/DFU/Descriptors.c | 4 ++--
 Bootloaders/DFU/Descriptors.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Bootloaders/DFU')

diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c
index f20fbeb97..510a29fb4 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 32d58285b..961e480e7 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: */
-- 
cgit v1.2.3