ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed minor issue with the RNDISEthernet demo DHCP protocol decoder routine using incorrectly named variables (thanks to Jonathan Oakley).

Browse source 
Fixed GenericHIDHost demo report write routine incorrect for control type requests (thanks to Andrei).
This commit is contained in:
Dean Camera 2009-04-15 00:56:12 +00:00
parent ecaf872177
commit ef06bfd1c0
4 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Demos/Device/RNDISEthernet/ProtocolDecoders.c
View file

@ -273,7 +273,7 @@ void DecodeDHCPHeader(void* InDataStart)
}
}
DHCPOptionsINStart += ((DHCPOptionsINStart[0] == DHCP_OPTION_PAD) ? 1 : (DHCPOptionsINStart[1] + 2));
DHCPOptions += ((DHCPOptions[0] == DHCP_OPTION_PAD) ? 1 : (DHCPOptions[1] + 2));
}
#endif

12
Demos/Host/GenericHIDHost/GenericHIDHost.c
View file

@ -219,9 +219,11 @@ void ReadNextReport(void)
/** Writes a report to the attached device.
*
* \param ReportOUTData Buffer containing the report to send to the device
* \param ReportIndex Index of the report in the device (zero if the device does not use multiple reports)
* \param ReportType Type of report to send, either HID_REPORTTYPE_OUTPUT or HID_REPORTTYPE_FEATURE
* \param ReportLength Length of the report to send
*/
void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)
void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t ReportType, uint16_t ReportLength)
{
/* Select and unfreeze HID data OUT pipe */
Pipe_SelectPipe(HID_DATA_OUT_PIPE);
@ -240,8 +242,12 @@ void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)
return;
}
/* If the report index is used, send it before the report data */
if (ReportIndex)
Pipe_Write_Byte(ReportIndex);
/* Read in HID report data */
/* Write out HID report data */
Pipe_Write_Stream_LE(ReportOUTData, ReportLength);
/* Clear the OUT endpoint, send last data packet */
@ -257,7 +263,7 @@ void WriteNextReport(uint8_t* ReportOUTData, uint16_t ReportLength)
{
bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
bRequest: REQ_SetReport,
wValue: 0,
wValue: ((ReportType << 8) | ReportIndex),
wIndex: 0,
wLength: ReportLength,
};

6
Demos/Host/GenericHIDHost/GenericHIDHost.h
View file

@ -64,6 +64,12 @@
/** HID Class specific request to send a HID report to the device. */
#define REQ_SetReport 0x09
/** HID Report type specifier, for output reports to a device */
#define HID_REPORTTYPE_OUTPUT 0x02
/** HID Report type specifier, for feature reports to a device */
#define HID_REPORTTYPE_FEATURE 0x03
/* Task Definitions: */
TASK(USB_HID_Host);