aboutsummaryrefslogtreecommitdiffstats
path: root/Demos/Device/LowLevel/Joystick
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2010-11-05 05:15:20 +0000
committerDean Camera <dean@fourwalledcubicle.com>2010-11-05 05:15:20 +0000
commitfb76acb0844a2528c32610455a8c7cd5266f3027 (patch)
tree24ea91f9555876585b311fff33fa271468b9e081 /Demos/Device/LowLevel/Joystick
parent99a9e415efd1e27d902427ccd1aa6e4a9f9d4d05 (diff)
downloadlufa-fb76acb0844a2528c32610455a8c7cd5266f3027.tar.gz
lufa-fb76acb0844a2528c32610455a8c7cd5266f3027.tar.bz2
lufa-fb76acb0844a2528c32610455a8c7cd5266f3027.zip
Renamed the EVENT_USB_Device_UnhandledControlRequest() event to EVENT_USB_Device_ControlRequest() as it is now fired before the library request handlers, not afterwards.
Diffstat (limited to 'Demos/Device/LowLevel/Joystick')
-rw-r--r--Demos/Device/LowLevel/Joystick/Joystick.c8
-rw-r--r--Demos/Device/LowLevel/Joystick/Joystick.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/Demos/Device/LowLevel/Joystick/Joystick.c b/Demos/Device/LowLevel/Joystick/Joystick.c
index b78e53fe7..de2e283c6 100644
--- a/Demos/Device/LowLevel/Joystick/Joystick.c
+++ b/Demos/Device/LowLevel/Joystick/Joystick.c
@@ -103,11 +103,11 @@ void EVENT_USB_Device_ConfigurationChanged(void)
LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
}
-/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific
- * control requests that are not handled internally by the USB library (including the HID commands, which are
- * all issued via the control endpoint), so that they can be handled appropriately for the application.
+/** Event handler for the USB_ControlRequest event. This is used to catch and process control requests sent to
+ * the device from the USB host before passing along unhandled control requests to the library for processing
+ * internally.
*/
-void EVENT_USB_Device_UnhandledControlRequest(void)
+void EVENT_USB_Device_ControlRequest(void)
{
/* Handle HID Class specific requests */
switch (USB_ControlRequest.bRequest)
diff --git a/Demos/Device/LowLevel/Joystick/Joystick.h b/Demos/Device/LowLevel/Joystick/Joystick.h
index 87b3508cb..d2cae1bf6 100644
--- a/Demos/Device/LowLevel/Joystick/Joystick.h
+++ b/Demos/Device/LowLevel/Joystick/Joystick.h
@@ -82,7 +82,7 @@
void EVENT_USB_Device_Connect(void);
void EVENT_USB_Device_Disconnect(void);
void EVENT_USB_Device_ConfigurationChanged(void);
- void EVENT_USB_Device_UnhandledControlRequest(void);
+ void EVENT_USB_Device_ControlRequest(void);
bool GetNextReport(USB_JoystickReport_Data_t* const ReportData);