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/TemperatureDataLogger/Descriptors.c | 14 +++++++------- Projects/TemperatureDataLogger/Descriptors.h | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'Projects/TemperatureDataLogger') diff --git a/Projects/TemperatureDataLogger/Descriptors.c b/Projects/TemperatureDataLogger/Descriptors.c index e4f5666e5..48778d8c5 100644 --- a/Projects/TemperatureDataLogger/Descriptors.c +++ b/Projects/TemperatureDataLogger/Descriptors.c @@ -124,7 +124,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}, @@ -140,7 +140,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .InterfaceStrIndex = NO_DESCRIPTOR }, - .MSDataInEndpoint = + .MS_DataInEndpoint = { .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, @@ -150,7 +150,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .PollingIntervalMS = 0x00 }, - .MSDataOutEndpoint = + .MS_DataOutEndpoint = { .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, @@ -160,7 +160,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .PollingIntervalMS = 0x00 }, - .HIDInterface = + .HID_Interface = { .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, @@ -176,7 +176,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .InterfaceStrIndex = NO_DESCRIPTOR }, - .HIDInfo = + .HID_GenericHID = { .Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID}, @@ -187,7 +187,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .HIDReportLength = sizeof(GenericReport) }, - .HIDDataInEndpoint = + .HID_ReportINEndpoint = { .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, @@ -274,7 +274,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, break; case DTYPE_HID: - Address = (void*)&ConfigurationDescriptor.HIDInfo; + Address = (void*)&ConfigurationDescriptor.HID_GenericHID; Size = sizeof(USB_HID_Descriptor_t); break; case DTYPE_Report: diff --git a/Projects/TemperatureDataLogger/Descriptors.h b/Projects/TemperatureDataLogger/Descriptors.h index a0f03c38d..6c238ac42 100644 --- a/Projects/TemperatureDataLogger/Descriptors.h +++ b/Projects/TemperatureDataLogger/Descriptors.h @@ -45,12 +45,12 @@ 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 HIDInterface; - USB_HID_Descriptor_t HIDInfo; - USB_Descriptor_Endpoint_t HIDDataInEndpoint; + USB_Descriptor_Interface_t MS_Interface; + USB_Descriptor_Endpoint_t MS_DataInEndpoint; + USB_Descriptor_Endpoint_t MS_DataOutEndpoint; + USB_Descriptor_Interface_t HID_Interface; + USB_HID_Descriptor_t HID_GenericHID; + USB_Descriptor_Endpoint_t HID_ReportINEndpoint; } USB_Descriptor_Configuration_t; /* Function Prototypes: */ -- cgit v1.2.3