forked from mirror/qmk_firmware
Fixed bug in RNDISEthernet and DualCDC demos not using the correct USB_ControlRequest structure for control request data.
Fixed documentation showing incorrect USB mode support on the supported AVRs list.
This commit is contained in:
@@ -186,16 +186,8 @@ EVENT_HANDLER(USB_ConfigurationChanged)
|
||||
*/
|
||||
EVENT_HANDLER(USB_UnhandledControlPacket)
|
||||
{
|
||||
uint8_t* LineCodingData;
|
||||
|
||||
/* Discard the unused wValue parameter */
|
||||
Endpoint_Discard_Word();
|
||||
|
||||
/* wIndex indicates the interface being controlled */
|
||||
uint16_t wIndex = Endpoint_Read_Word_LE();
|
||||
|
||||
/* Determine which interface's Line Coding data is being set from the wIndex parameter */
|
||||
LineCodingData = (wIndex == 0) ? (uint8_t*)&LineCoding1 : (uint8_t*)&LineCoding2;
|
||||
uint8_t* LineCodingData = (USB_ControlRequest.wIndex == 0) ? (uint8_t*)&LineCoding1 : (uint8_t*)&LineCoding2;
|
||||
|
||||
/* Process CDC specific control requests */
|
||||
switch (USB_ControlRequest.bRequest)
|
||||
|
||||
@@ -140,15 +140,6 @@ EVENT_HANDLER(USB_ConfigurationChanged)
|
||||
*/
|
||||
EVENT_HANDLER(USB_UnhandledControlPacket)
|
||||
{
|
||||
/* Discard the unused wValue parameter */
|
||||
Endpoint_Discard_Word();
|
||||
|
||||
/* Discard the unused wIndex parameter */
|
||||
Endpoint_Discard_Word();
|
||||
|
||||
/* Read in the wLength parameter */
|
||||
uint16_t wLength = Endpoint_Read_Word_LE();
|
||||
|
||||
/* Process RNDIS class commands */
|
||||
switch (USB_ControlRequest.bRequest)
|
||||
{
|
||||
@@ -159,7 +150,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
|
||||
Endpoint_ClearSETUP();
|
||||
|
||||
/* Read in the RNDIS message into the message buffer */
|
||||
Endpoint_Read_Control_Stream_LE(RNDISMessageBuffer, wLength);
|
||||
Endpoint_Read_Control_Stream_LE(RNDISMessageBuffer, USB_ControlRequest.wLength);
|
||||
|
||||
/* Finalize the stream transfer to clear the last packet from the host */
|
||||
Endpoint_ClearIN();
|
||||
|
||||
Reference in New Issue
Block a user