diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-09 13:05:57 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-09 13:05:57 +0000 |
| commit | c166dfc64ea10903a43a429709a92dc7ef9ee9dc (patch) | |
| tree | 94cd423adcc362137d3f1e178f29d5db0f537122 /Demos/Device/ClassDriver/KeyboardMouse | |
| parent | 66f14d44a3c3f1744e85cea14061b568c3c1306c (diff) | |
| download | lufa-c166dfc64ea10903a43a429709a92dc7ef9ee9dc.tar.gz lufa-c166dfc64ea10903a43a429709a92dc7ef9ee9dc.tar.bz2 lufa-c166dfc64ea10903a43a429709a92dc7ef9ee9dc.zip | |
Added class specific descriptor type defines with standard USB-IF element naming.
Diffstat (limited to 'Demos/Device/ClassDriver/KeyboardMouse')
| -rw-r--r-- | Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c | 8 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c index dff0b8fac..4f7c55b09 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c +++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c @@ -179,7 +179,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .HID1_KeyboardHID = { - .Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID}, + .Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = DTYPE_HID}, .HIDSpec = VERSION_BCD(01.11), .CountryCode = 0x00, @@ -216,7 +216,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = .HID2_MouseHID = { - .Header = {.Size = sizeof(USB_HID_Descriptor_t), .Type = DTYPE_HID}, + .Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = DTYPE_HID}, .HIDSpec = VERSION_BCD(01.11), .CountryCode = 0x00, @@ -317,12 +317,12 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, if (!(wIndex)) { Address = &ConfigurationDescriptor.HID1_KeyboardHID; - Size = sizeof(USB_HID_Descriptor_t); + Size = sizeof(USB_HID_Descriptor_HID_t); } else { Address = &ConfigurationDescriptor.HID2_MouseHID; - Size = sizeof(USB_HID_Descriptor_t); + Size = sizeof(USB_HID_Descriptor_HID_t); } break; case DTYPE_Report: diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h index e4908f947..b0d8f5a6b 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h +++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h @@ -51,10 +51,10 @@ { USB_Descriptor_Configuration_Header_t Config; USB_Descriptor_Interface_t HID1_KeyboardInterface; - USB_HID_Descriptor_t HID1_KeyboardHID; + USB_HID_Descriptor_HID_t HID1_KeyboardHID; USB_Descriptor_Endpoint_t HID1_ReportINEndpoint; USB_Descriptor_Interface_t HID2_MouseInterface; - USB_HID_Descriptor_t HID2_MouseHID; + USB_HID_Descriptor_HID_t HID2_MouseHID; USB_Descriptor_Endpoint_t HID2_ReportINEndpoint; } USB_Descriptor_Configuration_t; |