aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Device/ClassDriver/Mouse/Descriptors.c
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2010-03-22 07:12:25 +0000
committerDean Camera <dean@fourwalledcubicle.com>2010-03-22 07:12:25 +0000
commit49b09a2042368947ab34f788f00b710183912285 (patch)
tree5f7a09d599f84d37d1b122b66e6c0c0b62731c5e /Demos/Device/ClassDriver/Mouse/Descriptors.c
parent5227ca4ce2be126b118a900e9242c813fef5e6bf (diff)
downloadlufa-49b09a2042368947ab34f788f00b710183912285.tar.gz
lufa-49b09a2042368947ab34f788f00b710183912285.tar.bz2
lufa-49b09a2042368947ab34f788f00b710183912285.zip
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.
Diffstat (limited to 'Demos/Device/ClassDriver/Mouse/Descriptors.c')
-rw-r--r--Demos/Device/ClassDriver/Mouse/Descriptors.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/Demos/Device/ClassDriver/Mouse/Descriptors.c b/Demos/Device/ClassDriver/Mouse/Descriptors.c
index c6aeb2ad7..7a5fc349e 100644
--- a/Demos/Device/ClassDriver/Mouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/Mouse/Descriptors.c
@@ -122,7 +122,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
- .Interface =
+ .HID_Interface =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
@@ -138,7 +138,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.InterfaceStrIndex = NO_DESCRIPTOR
},
- .MouseHID =
+ .HID_MouseHID =
{
.Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},
@@ -149,7 +149,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDReportLength = sizeof(MouseReport)
},
- .MouseEndpoint =
+ .HID_ReportINEndpoint =
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
@@ -236,7 +236,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
break;
case DTYPE_HID:
- Address = (void*)&ConfigurationDescriptor.MouseHID;
+ Address = (void*)&ConfigurationDescriptor.HID_MouseHID;
Size = sizeof(USB_HID_Descriptor_t);
break;
case DTYPE_Report: