Better solution - change compile time token names to DEVICE_STATE_AS_GPIOR and HOST_S...

[pub/USBasp.git] / LUFA / Drivers / USB / HighLevel / USBTask.h

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h
index 768057a..9601315 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.h
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.h
@@ -82,10 +82,11 @@
                                         *  \ref HOST_STATE_Configured and \ref HOST_STATE_Suspended states which are not implemented by\r
                                         *  the library.\r
                                         *\r
-                                        *  To reduce program size and speed up checks of this global, it can be placed into the AVR's GPIOR1\r
-                                        *  hardware register instead of RAM by defining the HOST_STATE_AS_GPIOR1 token in the project\r
-                                        *  makefile and passing it to the compiler via the -D switch. When defined, the GPIOR1 register should\r
-                                        *  not be used in the user application except implicitly via the library APIs.\r
+                                        *  To reduce program size and speed up checks of this global, it can be placed into one of the AVR's\r
+                                        *  GPIOR hardware registers instead of RAM by defining the HOST_STATE_AS_GPIOR token to a value \r
+                                        *  between 0 and 2 in the project makefile and passing it to the compiler via the -D switch. When\r
+                                        *  defined, the corresponding GPIOR register should not be used in the user application except\r
+                                        *  implicitly via the library APIs.\r
                                         *\r
                                         *  \note This global is only present if the user application can be a USB host.\r
                                         *\r
@@ -95,12 +96,14 @@
                                         */\r
                                        extern volatile uint8_t USB_HostState;\r
                                #else\r
-                                       #define USB_HostState GPIOR1\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
                                #endif\r
                        #endif\r
 \r
                        #if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)\r
-                               #if !defined(DEVICE_STATE_AS_GPIOR0) || defined(__DOXYGEN__)\r
+                               #if !defined(DEVICE_STATE_AS_GPIOR) || defined(__DOXYGEN__)\r
                                        /** Indicates the current device state machine state. When in device mode, this indicates the state\r
                                         *  via one of the values of the \ref USB_Device_States_t enum values.\r
                                         *\r
@@ -108,10 +111,11 @@
                                         *  library. The only exception to this rule is if the NO_LIMITED_CONTROLLER_CONNECT token is used\r
                                         *  (see \ref EVENT_USB_Connect() and \ref EVENT_USB_Disconnect() events).\r
                                         *\r
-                                        *  To reduce program size and speed up checks of this global, it can be placed into the AVR's GPIOR0\r
-                                        *  hardware register instead of RAM by defining the DEVICE_STATE_AS_GPIOR0 token in the project\r
-                                        *  makefile and passing it to the compiler via the -D switch. When defined, the GPIOR0 register should\r
-                                        *  not be used in the user application except implicitly via the library APIs.\r
+                                        *  To reduce program size and speed up checks of this global, it can be placed into one of the AVR's\r
+                                        *  GPIOR hardware registers instead of RAM by defining the DEVICE_STATE_AS_GPIOR token to a value \r
+                                        *  between 0 and 2 in the project makefile and passing it to the compiler via the -D switch. When\r
+                                        *  defined, the corresponding GPIOR register should not be used in the user application except\r
+                                        *  implicitly via the library APIs.\r
                                         *\r
                                         *  \note This global is only present if the user application can be a USB device.\r
                                         *\r
@@ -124,7 +128,9 @@
                                         */\r
                                        extern volatile uint8_t USB_DeviceState;\r
                                #else\r
-                                       #define USB_DeviceState GPIOR0\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
                                #endif\r
                        #endif\r
 \r