Fix incorrect names for the HID Host protocol setting routines.

diff --git a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c
index 45cf5e5..0f901dd 100644 (file)
--- a/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c
+++ b/Demos/Host/ClassDriver/KeyboardHost/KeyboardHost.c
@@ -99,7 +99,7 @@ int main(void)
                                        break;\r
                                }\r
 \r
                                        break;\r
                                }\r
 \r

-                               if (USB_HID_Host_SetBootProtocol(&Keyboard_HID_Interface) != 0)\r
+                               if (HID_Host_SetBootProtocol(&Keyboard_HID_Interface) != 0)\r

                                {\r
                                        printf("Could not Set Boot Protocol Mode.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                {\r
                                        printf("Could not Set Boot Protocol Mode.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r

diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
index e9af0c0..d8a719d 100644 (file)
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/KeyboardHostWithParser.c
@@ -104,7 +104,7 @@ int main(void)
                                        break;\r
                                }\r
 \r
                                        break;\r
                                }\r
 \r

-                               if (USB_HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0)\r
+                               if (HID_Host_SetReportProtocol(&Keyboard_HID_Interface) != 0)\r

                                {\r
                                        printf("Error Setting Report Protocol Mode or Not a Valid Keyboard.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                {\r
                                        printf("Error Setting Report Protocol Mode or Not a Valid Keyboard.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r

diff --git a/Demos/Host/ClassDriver/MouseHost/MouseHost.c b/Demos/Host/ClassDriver/MouseHost/MouseHost.c
index 7434e7c..ffeba5d 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHost/MouseHost.c
+++ b/Demos/Host/ClassDriver/MouseHost/MouseHost.c
@@ -99,7 +99,7 @@ int main(void)
                                        break;\r
                                }\r
 \r
                                        break;\r
                                }\r
 \r

-                               if (USB_HID_Host_SetBootProtocol(&Mouse_HID_Interface) != 0)\r
+                               if (HID_Host_SetBootProtocol(&Mouse_HID_Interface) != 0)\r

                                {\r
                                        printf("Could not Set Boot Protocol Mode.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                {\r
                                        printf("Could not Set Boot Protocol Mode.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r

diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
index 0aa7d4a..0beec9a 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
@@ -104,7 +104,7 @@ int main(void)
                                        break;\r
                                }\r
 \r
                                        break;\r
                                }\r
 \r

-                               if (USB_HID_Host_SetReportProtocol(&Mouse_HID_Interface) != 0)\r
+                               if (HID_Host_SetReportProtocol(&Mouse_HID_Interface) != 0)\r

                                {\r
                                        printf("Error Setting Report Protocol Mode or Not a Valid Mouse.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                                {\r
                                        printf("Error Setting Report Protocol Mode or Not a Valid Mouse.\r\n");\r
                                        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r

diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HID.c
index b420a5b..a8e761d 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HID.c
@@ -265,7 +265,7 @@ bool HID_Host_IsReportReceived(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)
        return ReportReceived;\r
 }\r
 \r
        return ReportReceived;\r
 }\r
 \r

-uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
+uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r

 {\r
        if (HIDInterfaceInfo->State.UsingBootProtocol)\r
          return HOST_SENDCONTROL_Successful;\r
 {\r
        if (HIDInterfaceInfo->State.UsingBootProtocol)\r
          return HOST_SENDCONTROL_Successful;\r


@@ -295,7 +295,7 @@ uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfac
        return HOST_SENDCONTROL_Successful;\r
 }\r
 \r
        return HOST_SENDCONTROL_Successful;\r
 }\r
 \r

-uint8_t USB_HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r
+uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo)\r

 {\r
        uint8_t ErrorCode;\r
 \r
 {\r
        uint8_t ErrorCode;\r
 \r

diff --git a/LUFA/Drivers/USB/Class/Host/HID.h b/LUFA/Drivers/USB/Class/Host/HID.h
index 5526990..95afbb4 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/HID.h
+++ b/LUFA/Drivers/USB/Class/Host/HID.h
@@ -94,7 +94,7 @@
                                        uint16_t DataOUTPipeSize;  /**< Size in bytes of the HID interface's OUT data pipe */\r
                                        \r
                                        bool SupportsBootProtocol; /**< Indicates if the current interface instance supports the HID Boot\r
                                        uint16_t DataOUTPipeSize;  /**< Size in bytes of the HID interface's OUT data pipe */\r
                                        \r
                                        bool SupportsBootProtocol; /**< Indicates if the current interface instance supports the HID Boot\r

-                                                                   *   Protocol when enabled via \ref USB_HID_Host_SetBootProtocol()\r
+                                                                   *   Protocol when enabled via \ref HID_Host_SetBootProtocol()\r

                                                                    */\r
                                        bool DeviceUsesOUTPipe; /**< Indicates if the current interface instance uses a seperate OUT data pipe for\r
                                                                 *   OUT reports, or if OUT reports are sent via the control pipe instead.\r
                                                                    */\r
                                        bool DeviceUsesOUTPipe; /**< Indicates if the current interface instance uses a seperate OUT data pipe for\r
                                                                 *   OUT reports, or if OUT reports are sent via the control pipe instead.\r


@@ -136,7 +136,7 @@
                         *  machine is in the Addressed state.\r
                         *\r
                         *  \note Once the device pipes are configured, the HID device's reporting protocol <b>must</b> be set via a call\r
                         *  machine is in the Addressed state.\r
                         *\r
                         *  \note Once the device pipes are configured, the HID device's reporting protocol <b>must</b> be set via a call\r

-                        *        to either the \ref USB_HID_Host_SetBootProtocol() or \ref USB_HID_Host_SetReportProtocol() function.\r
+                        *        to either the \ref HID_Host_SetBootProtocol() or \ref HID_Host_SetReportProtocol() function.\r

                         *\r
                         *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class host configuration and state\r
                         *  \param[in] ConfigDescriptorSize  Length of the attached device's Configuration Descriptor\r
                         *\r
                         *  \param[in,out] HIDInterfaceInfo  Pointer to a structure containing a HID Class host configuration and state\r
                         *  \param[in] ConfigDescriptorSize  Length of the attached device's Configuration Descriptor\r


@@ -197,7 +197,7 @@
                         *  \return \ref HID_ERROR_LOGICAL if the device does not support Boot Protocol mode, a value from the\r
                         *          \ref USB_Host_SendControlErrorCodes_t enum otherwise\r
                         */\r
                         *  \return \ref HID_ERROR_LOGICAL if the device does not support Boot Protocol mode, a value from the\r
                         *          \ref USB_Host_SendControlErrorCodes_t enum otherwise\r
                         */\r

-                       uint8_t USB_HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
+                       uint8_t HID_Host_SetBootProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r

 \r
                        /** Switches the attached HID device's reporting protocol over to the standard Report protocol mode. This also retrieves\r
                         *  and parses the device's HID report descriptor, so that the size of each report can be determined in advance.\r
 \r
                        /** Switches the attached HID device's reporting protocol over to the standard Report protocol mode. This also retrieves\r
                         *  and parses the device's HID report descriptor, so that the size of each report can be determined in advance.\r


@@ -212,7 +212,7 @@
                         *          not have a valid \ref HID_ReportInfo_t structure set in its configuration, a mask of \ref HID_ERROR_LOGICAL\r
                         *          and a value from the \ref HID_Parse_ErrorCodes_t otherwise\r
                         */\r
                         *          not have a valid \ref HID_ReportInfo_t structure set in its configuration, a mask of \ref HID_ERROR_LOGICAL\r
                         *          and a value from the \ref HID_Parse_ErrorCodes_t otherwise\r
                         */\r

-                       uint8_t USB_HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r
+                       uint8_t HID_Host_SetReportProtocol(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo) ATTR_NON_NULL_PTR_ARG(1);\r

                \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r
                \r
        /* Private Interface - For use in library only: */\r
        #if !defined(__DOXYGEN__)\r