aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Device/ClassDriver/Joystick
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-06-26 11:43:56 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-06-26 11:43:56 +0000
commit3cbdcd36868693cfc1863231a1ec64507ce3d29f (patch)
tree40b92ea99ca3c9e55a6a9070bb551daf5e1b8a88 /Demos/Device/ClassDriver/Joystick
parent7366f590f5ab89e954a176eb7cc7fa713ce07d3e (diff)
downloadlufa-3cbdcd36868693cfc1863231a1ec64507ce3d29f.tar.gz
lufa-3cbdcd36868693cfc1863231a1ec64507ce3d29f.tar.bz2
lufa-3cbdcd36868693cfc1863231a1ec64507ce3d29f.zip
Reduce struct name pollution - group typedef struct names by class driver name where appropriate.
Diffstat (limited to 'Demos/Device/ClassDriver/Joystick')
-rw-r--r--Demos/Device/ClassDriver/Joystick/Descriptors.c4
-rw-r--r--Demos/Device/ClassDriver/Joystick/Descriptors.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.c b/Demos/Device/ClassDriver/Joystick/Descriptors.c
index f3313e020..84901b618 100644
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.c
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.c
@@ -140,7 +140,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.JoystickHID =
{
- .Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
+ .Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID},
.HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00,
@@ -237,7 +237,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
break;
case DTYPE_HID:
Address = (void*)&ConfigurationDescriptor.JoystickHID;
- Size = sizeof(USB_Descriptor_HID_t);
+ Size = sizeof(USB_HID_Descriptor_t);
break;
case DTYPE_Report:
Address = (void*)&JoystickReport;
diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.h b/Demos/Device/ClassDriver/Joystick/Descriptors.h
index 963ed1bb4..aaee98232 100644
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.h
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.h
@@ -51,7 +51,7 @@
{
USB_Descriptor_Configuration_Header_t Config;
USB_Descriptor_Interface_t Interface;
- USB_Descriptor_HID_t JoystickHID;
+ USB_HID_Descriptor_t JoystickHID;
USB_Descriptor_Endpoint_t JoystickEndpoint;
} USB_Descriptor_Configuration_t;