From 49b09a2042368947ab34f788f00b710183912285 Mon Sep 17 00:00:00 2001 From: Dean Camera 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. --- Projects/Incomplete/StandaloneProgrammer/Descriptors.c | 6 +++--- Projects/Incomplete/StandaloneProgrammer/Descriptors.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Projects/Incomplete/StandaloneProgrammer') diff --git a/Projects/Incomplete/StandaloneProgrammer/Descriptors.c b/Projects/Incomplete/StandaloneProgrammer/Descriptors.c index e665ddbdd..9836d4338 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Descriptors.c +++ b/Projects/Incomplete/StandaloneProgrammer/Descriptors.c @@ -100,7 +100,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .MaxPowerConsumption = USB_CONFIG_POWER_MA(100) }, - .MSInterface = + .MS_Interface = { .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, @@ -116,7 +116,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .InterfaceStrIndex = NO_DESCRIPTOR }, - .MSDataInEndpoint = + .MS_DataInEndpoint = { .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, @@ -126,7 +126,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .PollingIntervalMS = 0x00 }, - .MSDataOutEndpoint = + .MS_DataOutEndpoint = { .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, diff --git a/Projects/Incomplete/StandaloneProgrammer/Descriptors.h b/Projects/Incomplete/StandaloneProgrammer/Descriptors.h index 3b162ae80..46a9c8014 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Descriptors.h +++ b/Projects/Incomplete/StandaloneProgrammer/Descriptors.h @@ -76,9 +76,9 @@ typedef struct { USB_Descriptor_Configuration_Header_t Config; - USB_Descriptor_Interface_t MSInterface; - USB_Descriptor_Endpoint_t MSDataInEndpoint; - USB_Descriptor_Endpoint_t MSDataOutEndpoint; + USB_Descriptor_Interface_t MS_Interface; + USB_Descriptor_Endpoint_t MS_DataInEndpoint; + USB_Descriptor_Endpoint_t MS_DataOutEndpoint; } USB_Descriptor_Configuration_t; /* Function Prototypes: */ -- cgit v1.2.3