Fixed HOST_STATE_AS_GPIOR being ignored whilst in Host mode (thanks to David Lyons).

diff --git a/LUFA/Drivers/USB/HighLevel/Events.h b/LUFA/Drivers/USB/HighLevel/Events.h
index 933091a..89eb641 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/Events.h
+++ b/LUFA/Drivers/USB/HighLevel/Events.h
@@ -195,6 +195,11 @@
                         *  This event is time-critical; each packet within the request transaction must be acknowledged or\r
                         *  sent within 50ms or the host will abort the transfer.\r
                         *\r
                         *  This event is time-critical; each packet within the request transaction must be acknowledged or\r
                         *  sent within 50ms or the host will abort the transfer.\r
                         *\r

+                        *  The library interally handles all standard control requests with the exceptions of SYNC FRAME,\r
+                        *  SET DESCRIPTOR and SET INTERFACE. These and all other non-standard control requests will be left\r
+                        *  for the user to process via this event if desired. If not handled in the user application, requests\r
+                        *  are automatically STALLed.\r
+                        *\r

                         *  \note This event does not exist if the USB_HOST_ONLY token is supplied to the compiler (see\r
                         *        \ref Group_USBManagement documentation).\r
                         *\r
                         *  \note This event does not exist if the USB_HOST_ONLY token is supplied to the compiler (see\r
                         *        \ref Group_USBManagement documentation).\r
                         *\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h
index 9c0abf0..cc06015 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.h
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.h
@@ -76,7 +76,7 @@
                         extern USB_Request_Header_t USB_ControlRequest;\r
                        \r
                        #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)\r
                         extern USB_Request_Header_t USB_ControlRequest;\r
                        \r
                        #if defined(USB_CAN_BE_HOST) || defined(__DOXYGEN__)\r

-                               #if !defined(HOST_STATE_AS_GPIOR1) || defined(__DOXYGEN__)\r
+                               #if !defined(HOST_STATE_AS_GPIOR) || defined(__DOXYGEN__)\r

                                        /** Indicates the current host state machine state. When in host mode, this indicates the state\r
                                         *  via one of the values of the \ref USB_Host_States_t enum values.\r
                                         *\r
                                        /** Indicates the current host state machine state. When in host mode, this indicates the state\r
                                         *  via one of the values of the \ref USB_Host_States_t enum values.\r
                                         *\r


@@ -100,7 +100,7 @@
                                #else\r
                                        #define _GET_HOST_GPIOR_NAME2(y) GPIOR ## y\r
                                        #define _GET_HOST_GPIOR_NAME(x)  _GET_HOST_GPIOR_NAME2(x)\r
                                #else\r
                                        #define _GET_HOST_GPIOR_NAME2(y) GPIOR ## y\r
                                        #define _GET_HOST_GPIOR_NAME(x)  _GET_HOST_GPIOR_NAME2(x)\r

-                                       #define USB_HostState _GET_HOST_GPIOR_NAME(HOST_STATE_AS_GPIOR)\r
+                                       #define USB_HostState            _GET_HOST_GPIOR_NAME(HOST_STATE_AS_GPIOR)\r

                                #endif\r
                        #endif\r
 \r
                                #endif\r
                        #endif\r
 \r


@@ -132,7 +132,7 @@
                                #else\r
                                        #define _GET_DEVICE_GPIOR_NAME2(y) GPIOR ## y\r
                                        #define _GET_DEVICE_GPIOR_NAME(x)  _GET_DEVICE_GPIOR_NAME2(x)\r
                                #else\r
                                        #define _GET_DEVICE_GPIOR_NAME2(y) GPIOR ## y\r
                                        #define _GET_DEVICE_GPIOR_NAME(x)  _GET_DEVICE_GPIOR_NAME2(x)\r

-                                       #define USB_DeviceState _GET_DEVICE_GPIOR_NAME(DEVICE_STATE_AS_GPIOR)\r
+                                       #define USB_DeviceState            _GET_DEVICE_GPIOR_NAME(DEVICE_STATE_AS_GPIOR)\r

                                #endif\r
                        #endif\r
 \r
                                #endif\r
                        #endif\r
 \r


@@ -175,7 +175,7 @@
                        #endif\r
                        \r
                /* Macros: */\r
                        #endif\r
                        \r
                /* Macros: */\r

-                       #define HOST_TASK_NONBLOCK_WAIT(duration, nextstate) {USB_HostState = HOST_STATE_WaitForDevice; WaitMSRemaining = duration; PostWaitState = nextstate; }\r
+                       #define HOST_TASK_NONBLOCK_WAIT(duration, nextstate) MACROS{USB_HostState = HOST_STATE_WaitForDevice; WaitMSRemaining = duration; PostWaitState = nextstate; }MACROE\r

        #endif\r
        \r
        /* Disable C linkage for C++ Compilers: */\r
        #endif\r
        \r
        /* Disable C linkage for C++ Compilers: */\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index d58a070..84fa2a6 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -48,6 +48,7 @@
   *  - Corrected HID descriptor in the Joystick Device demos - buttons should be placed outside the pointer collection\r
   *  - Fixed HID report parser collection paths invalid due to misplaced semicolon in the free path item search loop\r
   *  - Fixed HID host Class driver report send/receive report broken when issued through the control pipe\r
   *  - Corrected HID descriptor in the Joystick Device demos - buttons should be placed outside the pointer collection\r
   *  - Fixed HID report parser collection paths invalid due to misplaced semicolon in the free path item search loop\r
   *  - Fixed HID host Class driver report send/receive report broken when issued through the control pipe\r

+  *  - Fixed HOST_STATE_AS_GPIOR compile time option being ignored when in host mode (thanks to David Lyons)\r

   *\r
   *  \section Sec_ChangeLog090924 Version 090924\r
   *\r
   *\r
   *  \section Sec_ChangeLog090924 Version 090924\r
   *\r