diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2009-04-22 13:03:11 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-04-22 13:03:11 +0000 |
commit | d860e9e842c05e759214f5170f78783decae9956 (patch) | |
tree | 688f408e32d6f4d205fce4bd33e953199c9ea7dc /Demos/Device/Joystick | |
parent | e5e7eaee7af719cee00a8c2cb6fb4649dde0aa05 (diff) | |
download | lufa-d860e9e842c05e759214f5170f78783decae9956.tar.gz lufa-d860e9e842c05e759214f5170f78783decae9956.tar.bz2 lufa-d860e9e842c05e759214f5170f78783decae9956.zip |
USB_HostRequest renamed to USB_ControlRequest, entire control request header is now read into USB_ControlRequest in Device mode rather than having the library pass only partially read header data to the application.
The USB_UnhandledControlPacket event has had its parameters removed, in favour of accessing the new USB_ControlRequest structure.
The Endpoint control stream functions now correctly send a ZLP to the host when less data than requested is sent.
Diffstat (limited to 'Demos/Device/Joystick')
-rw-r--r-- | Demos/Device/Joystick/Joystick.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/Demos/Device/Joystick/Joystick.c b/Demos/Device/Joystick/Joystick.c index e5d23bd6d..ee4bc6ad0 100644 --- a/Demos/Device/Joystick/Joystick.c +++ b/Demos/Device/Joystick/Joystick.c @@ -122,33 +122,20 @@ EVENT_HANDLER(USB_ConfigurationChanged) EVENT_HANDLER(USB_UnhandledControlPacket)
{
/* Handle HID Class specific requests */
- switch (bRequest)
+ switch (USB_ControlRequest.bRequest)
{
case REQ_GetReport:
- if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
+ if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
{
USB_JoystickReport_Data_t JoystickReportData;
/* Create the next HID report to send to the host */
GetNextReport(&JoystickReportData);
-
- /* Ignore report type and ID number value */
- Endpoint_Discard_Word();
-
- /* Ignore unused Interface number value */
- Endpoint_Discard_Word();
-
- /* Read in the number of bytes in the report to send to the host */
- uint16_t wLength = Endpoint_Read_Word_LE();
- /* If trying to send more bytes than exist to the host, clamp the value at the report size */
- if (wLength > sizeof(JoystickReportData))
- wLength = sizeof(JoystickReportData);
-
Endpoint_ClearSETUP();
/* Write the report data to the control endpoint */
- Endpoint_Write_Control_Stream_LE(&JoystickReportData, wLength);
+ Endpoint_Write_Control_Stream_LE(&JoystickReportData, sizeof(JoystickReportData));
/* Finalize the stream transfer to send the last packet or clear the host abort */
Endpoint_ClearOUT();
|