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

Fix incorrect names for the HID Host protocol setting routines.

Browse Source
pull/1469/head
Dean Camera 15 years ago
parent f0fcffd146
commit 573a27d90a
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c
Unescape View File

@ -99,7 +99,7 @@ int main(void)
break; break;
} }
if (USB_HID_Host_SetBootProtocol(&Keyboard_HID_Interface) != 0) if (HID_Host_SetBootProtocol(&Keyboard_HID_Interface) != 0)
{ {
printf("Could not Set Boot Protocol Mode.\r\n"); printf("Could not Set Boot Protocol Mode.\r\n");
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

2
Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
Unescape View File

@ -104,7 +104,7 @@ int main(void)
break; break;
} }
if (USB_HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0) if (HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0)
{ {
printf("Error Setting Report Protocol Mode or Not a Valid Keyboard.\r\n"); printf("Error Setting Report Protocol Mode or Not a Valid Keyboard.\r\n");
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

2
Demos/Host/ClassDriver/MouseHost/MouseHost.c
Unescape View File

@ -99,7 +99,7 @@ int main(void)
break; break;
} }
if (USB_HID_Host_SetBootProtocol(&Mouse_HID_Interface) != 0) if (HID_Host_SetBootProtocol(&Mouse_HID_Interface) != 0)
{ {
printf("Could not Set Boot Protocol Mode.\r\n"); printf("Could not Set Boot Protocol Mode.\r\n");
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

2
Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
Unescape View File

@ -104,7 +104,7 @@ int main(void)
break; break;
} }
if (USB_HID_Host_SetReportProtocol(&Mouse_HID_Interface) != 0) if (HID_Host_SetReportProtocol(&Mouse_HID_Interface) != 0)
{ {
printf("Error Setting Report Protocol Mode or Not a Valid Mouse.\r\n"); printf("Error Setting Report Protocol Mode or Not a Valid Mouse.\r\n");
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

4
LUFA/Drivers/USB/Class/Host/HID.c
Unescape View File

@ -265,7 +265,7 @@ bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
return ReportReceived; return ReportReceived;
} }
uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
{ {
if (HIDInterfaceInfo->State.UsingBootProtocol) if (HIDInterfaceInfo->State.UsingBootProtocol)
return HOST_SENDCONTROL_Successful; return HOST_SENDCONTROL_Successful;
@ -295,7 +295,7 @@ uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfac
return HOST_SENDCONTROL_Successful; return HOST_SENDCONTROL_Successful;
} }
uint8_t USB_HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
{ {
uint8_t ErrorCode; uint8_t ErrorCode;

8
LUFA/Drivers/USB/Class/Host/HID.h
Unescape View File

@ -94,7 +94,7 @@
uint16_t DataOUTPipeSize; /**< Size in bytes of the HID interface's OUT data pipe */ uint16_t DataOUTPipeSize; /**< Size in bytes of the HID interface's OUT data pipe */
bool SupportsBootProtocol; /**< Indicates if the current interface instance supports the HID Boot bool SupportsBootProtocol; /**< Indicates if the current interface instance supports the HID Boot
* Protocol when enabled via \ref USB_HID_Host_SetBootProtocol() * Protocol when enabled via \ref HID_Host_SetBootProtocol()
*/ */
bool DeviceUsesOUTPipe; /**< Indicates if the current interface instance uses a seperate OUT data pipe for bool DeviceUsesOUTPipe; /**< Indicates if the current interface instance uses a seperate OUT data pipe for
* OUT reports, or if OUT reports are sent via the control pipe instead. * OUT reports, or if OUT reports are sent via the control pipe instead.
@ -136,7 +136,7 @@
* machine is in the Addressed state. * machine is in the Addressed state.
* *
* \note Once the device pipes are configured, the HID device's reporting protocol <b>must</b> be set via a call * \note Once the device pipes are configured, the HID device's reporting protocol <b>must</b> be set via a call
* to either the \ref USB_HID_Host_SetBootProtocol() or \ref USB_HID_Host_SetReportProtocol() function. * to either the \ref HID_Host_SetBootProtocol() or \ref HID_Host_SetReportProtocol() function.
* *
* \param[in,out] HIDInterfaceInfo Pointer to a structure containing a HID Class host configuration and state * \param[in,out] HIDInterfaceInfo Pointer to a structure containing a HID Class host configuration and state
* \param[in] ConfigDescriptorSize Length of the attached device's Configuration Descriptor * \param[in] ConfigDescriptorSize Length of the attached device's Configuration Descriptor
@ -197,7 +197,7 @@
* \return \ref HID_ERROR_LOGICAL if the device does not support Boot Protocol mode, a value from the * \return \ref HID_ERROR_LOGICAL if the device does not support Boot Protocol mode, a value from the
* \ref USB_Host_SendControlErrorCodes_t enum otherwise * \ref USB_Host_SendControlErrorCodes_t enum otherwise
*/ */
uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1); uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
/** Switches the attached HID device's reporting protocol over to the standard Report protocol mode. This also retrieves /** Switches the attached HID device's reporting protocol over to the standard Report protocol mode. This also retrieves
* and parses the device's HID report descriptor, so that the size of each report can be determined in advance. * and parses the device's HID report descriptor, so that the size of each report can be determined in advance.
@ -212,7 +212,7 @@
* not have a valid \ref HID_ReportInfo_t structure set in its configuration, a mask of \ref HID_ERROR_LOGICAL * not have a valid \ref HID_ReportInfo_t structure set in its configuration, a mask of \ref HID_ERROR_LOGICAL
* and a value from the \ref HID_Parse_ErrorCodes_t otherwise * and a value from the \ref HID_Parse_ErrorCodes_t otherwise
*/ */
uint8_t USB_HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1); uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);
/* Private Interface - For use in library only: */ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__) #if !defined(__DOXYGEN__)

Write Preview
Loading…
Cancel
Save