forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed RNDISEthenet demo checking the incorrect message field for packet size constraints (thanks to Jonathan).

Browse Source 
Fixed WriteNextReport code in the GenericHIDHost demo using incorrect parameter types and not selecting the correct endpoint.
pull/1469/head
Dean Camera 16 years ago
parent d3484e6bdd
commit af02b5b0c9
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File

2
Demos/Device/RNDISEthernet/RNDISEthernet.c
Unescape View File

@ -284,7 +284,7 @@ TASK(RNDIS_Task)
Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_PACKET_MSG_t)); Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_PACKET_MSG_t));
/* Stall the request if the data is too large */ /* Stall the request if the data is too large */
if (RNDISPacketHeader.MessageLength > ETHERNET_FRAME_SIZE_MAX) if (RNDISPacketHeader.DataLength > ETHERNET_FRAME_SIZE_MAX)
{ {
Endpoint_StallTransaction(); Endpoint_StallTransaction();
return; return;

6
Demos/Host/GenericHIDHost/GenericHIDHost.c
Unescape View File

@ -221,10 +221,10 @@ void ReadNextReport(void)
* \param ReportOUTData Buffer containing the report to send to the device * \param ReportOUTData Buffer containing the report to send to the device
* \param ReportLength Length of the report to send * \param ReportLength Length of the report to send
*/ */
void WriteNextReport(uint8_t ReportOUTData, uint16_t ReportLength) void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)
{ {
/* Select and unfreeze HID data OUT pipe */ /* Select and unfreeze HID data OUT pipe */
Pipe_SelectPipe(HID_DATA_IN_PIPE); Pipe_SelectPipe(HID_DATA_OUT_PIPE);
/* Not all HID devices have an OUT endpoint (some require OUT reports to be sent over the /* Not all HID devices have an OUT endpoint (some require OUT reports to be sent over the
* control endpoint instead) - check to see if the OUT endpoint has been initialized */ * control endpoint instead) - check to see if the OUT endpoint has been initialized */
@ -242,7 +242,7 @@ void WriteNextReport(uint8_t ReportOUTData, uint16_t ReportLength)
} }
/* Read in HID report data */ /* Read in HID report data */
Pipe_Write_Stream_LE(&ReportOUTData, ReportLength); Pipe_Write_Stream_LE(ReportOUTData, ReportLength);
/* Clear the OUT endpoint, send last data packet */ /* Clear the OUT endpoint, send last data packet */
Pipe_ClearCurrentBank(); Pipe_ClearCurrentBank();

2
Demos/Host/GenericHIDHost/GenericHIDHost.h
Unescape View File

@ -88,6 +88,6 @@
/* Function Prototypes: */ /* Function Prototypes: */
void UpdateStatus(uint8_t CurrentStatus); void UpdateStatus(uint8_t CurrentStatus);
void ReadNextReport(void); void ReadNextReport(void);
void WriteNextReport(uint8_t ReportOUTData, uint16_t ReportLength); void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength);
#endif #endif

2
LUFA/ChangeLog.txt
Unescape View File

@ -27,6 +27,8 @@
* - Added support to the CDCHost demo for devices with mutiple CDC interfaces which are not the correct ACM type preceeding the desired * - Added support to the CDCHost demo for devices with mutiple CDC interfaces which are not the correct ACM type preceeding the desired
* ACM CDC interface * ACM CDC interface
* - Fixed GenericHID demo not starting USB and HID management tasks when not using interrupt driven modes (thanks to Carl Kjeldsen) * - Fixed GenericHID demo not starting USB and HID management tasks when not using interrupt driven modes (thanks to Carl Kjeldsen)
* - Fixed RNDISEthenet demo checking the incorrect message field for packet size constraints (thanks to Jonathan)
* - Fixed WriteNextReport code in the GenericHIDHost demo using incorrect parameter types and not selecting the correct endpoint
* *
* \section Sec_ChangeLog090401 Version 090401 * \section Sec_ChangeLog090401 Version 090401
* *

Write Preview
Loading…
Cancel
Save