diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-01-26 21:33:07 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-01-26 21:33:07 +0000 |
| commit | a852ea8e43d6df9642df3524a974073d2229fa4c (patch) | |
| tree | 7524d3d7c881de32080cb0ed82fc4aa16d6f7755 /Demos/Device/ClassDriver/KeyboardMouse | |
| parent | 6c7ed7ecd6d4727e33ddb8c5e4321499a2b76151 (diff) | |
| download | lufa-a852ea8e43d6df9642df3524a974073d2229fa4c.tar.gz lufa-a852ea8e43d6df9642df3524a974073d2229fa4c.tar.bz2 lufa-a852ea8e43d6df9642df3524a974073d2229fa4c.zip | |
Added new KeyboardMouseMultiReport Device ClassDriver demo.
Fixed ReportID not being removed from the feature/out report data array in the HID class driver when Report IDs are used.
Added new MAX() and MIN() convenience macros.
Diffstat (limited to 'Demos/Device/ClassDriver/KeyboardMouse')
| -rw-r--r-- | Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c | 1 | ||||
| -rw-r--r-- | Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c index 10b0e2dda..6c7b06dc0 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c +++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c @@ -279,6 +279,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, Address = &ConfigurationDescriptor.HID2_MouseHID; Size = sizeof(USB_HID_Descriptor_HID_t); } + break; case HID_DTYPE_Report: if (!(wIndex)) diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c index c198c0dd1..5563cda72 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c +++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c @@ -157,7 +157,7 @@ void EVENT_USB_Device_StartOfFrame(void) /** HID class driver callback function for the creation of HID reports to the host. * * \param[in] HIDInterfaceInfo Pointer to the HID class interface configuration structure being referenced - * \param[in,out] ReportID Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID + * \param[in,out] ReportID Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID * \param[in] ReportType Type of the report to create, either HID_REPORT_ITEM_In or HID_REPORT_ITEM_Feature * \param[out] ReportData Pointer to a buffer where the created report should be stored * \param[out] ReportSize Number of bytes written in the report (or zero if no report is to be sent |