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

diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index 8830f3e..2152408 100644 (file)
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -117,7 +117,7 @@ LUFA_PATH = ../..
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r

-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR0\r
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0\r

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r

diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index 333eb11..0964f03 100644 (file)
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -117,7 +117,7 @@ LUFA_PATH = ../..
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r

-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR0\r
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0\r

 LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32\r
 LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32\r
 LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r

diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile
index e02e6ce..0751024 100644 (file)
--- a/Bootloaders/TeensyHID/makefile
+++ b/Bootloaders/TeensyHID/makefile
@@ -118,7 +118,7 @@ LUFA_PATH = ../..
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r

-LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR0\r
+LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0\r

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index 31cedac..5c70457 100644 (file)
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -36,11 +36,11 @@
 volatile bool        USB_IsInitialized;\r
 USB_Request_Header_t USB_ControlRequest;\r
 \r
 volatile bool        USB_IsInitialized;\r
 USB_Request_Header_t USB_ControlRequest;\r
 \r

-#if defined(USB_CAN_BE_HOST) && !defined(HOST_STATE_AS_GPIOR1)\r
+#if defined(USB_CAN_BE_HOST) && !defined(HOST_STATE_AS_GPIOR)\r

 volatile uint8_t     USB_HostState;\r
 #endif\r
 \r
 volatile uint8_t     USB_HostState;\r
 #endif\r
 \r

-#if defined(USB_CAN_BE_DEVICE) && !defined(DEVICE_STATE_AS_GPIOR0)\r
+#if defined(USB_CAN_BE_DEVICE) && !defined(DEVICE_STATE_AS_GPIOR)\r

 volatile uint8_t     USB_DeviceState;\r
 #endif\r
 \r
 volatile uint8_t     USB_DeviceState;\r
 #endif\r
 \r

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
                                         *  \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
                                         *\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
                                         */\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
                                #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
                                        /** 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
                                         *  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
                                         *\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
                                         */\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
                                #endif\r
                        #endif\r
 \r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index b8ba3b2..2aaef12 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -34,7 +34,7 @@
   *  - Added new Benito Arduino Programmer project\r
   *  - Added new LEDs_ToggleLEDs() function to the LEDs driver\r
   *  - Added new Pipe_BoundEndpointNumber() and Pipe_IsEndpointBound() functions\r
   *  - Added new Benito Arduino Programmer project\r
   *  - Added new LEDs_ToggleLEDs() function to the LEDs driver\r
   *  - Added new Pipe_BoundEndpointNumber() and Pipe_IsEndpointBound() functions\r

-  *  - Added new DEVICE_STATE_AS_GPIOR0 and DEVICE_STATE_AS_GPIOR1 compile time options\r
+  *  - Added new DEVICE_STATE_AS_GPIOR and HOST_STATE_AS_GPIOR compile time options\r

   *  \r
   *  <b>Changed:</b>\r
   *  - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused)\r
   *  \r
   *  <b>Changed:</b>\r
   *  - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused)\r

diff --git a/LUFA/ManPages/CompileTimeTokens.txt b/LUFA/ManPages/CompileTimeTokens.txt
index 130a2e8..513d854 100644 (file)
--- a/LUFA/ManPages/CompileTimeTokens.txt
+++ b/LUFA/ManPages/CompileTimeTokens.txt
@@ -95,17 +95,19 @@
  *  defined to a non-zero value instead to give the size in bytes of the control endpoint, to reduce the size of the compiled\r
  *  binary.\r
  *\r
  *  defined to a non-zero value instead to give the size in bytes of the control endpoint, to reduce the size of the compiled\r
  *  binary.\r
  *\r

- *  <b>DEVICE_STATE_AS_GPIOR0</b> - ( \ref Group_Device ) \n\r
+ *  <b>DEVICE_STATE_AS_GPIOR</b> - ( \ref Group_Device ) \n\r

  *  One of the most frequenty used global variables in the stack is the USB_DeviceState global, which indicates the current state of\r
  *  the Device State Machine. To reduce the amount of code and time required to access and modify this global in an application, this token\r
  *  One of the most frequenty used global variables in the stack is the USB_DeviceState global, which indicates the current state of\r
  *  the Device State Machine. To reduce the amount of code and time required to access and modify this global in an application, this token\r

- *  make be defined to fix the state variable into one of the three general purpose IO registers inside the AVR reserved for application\r
- *  use. When defined, the GPIOR0 register should not be used within the user application except implicitly via the library APIs.\r
+ *  may be defined to a value between 0 and 2 to fix the state variable into one of the three general purpose IO registers inside the AVR\r
+ *  reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except\r
+ *  implicitly via the library APIs.\r

  *\r
  *\r

- *  <b>HOST_STATE_AS_GPIOR1</b> - ( \ref Group_Host ) \n\r
+ *  <b>HOST_STATE_AS_GPIOR</b> - ( \ref Group_Host ) \n\r

  *  One of the most frequenty used global variables in the stack is the USB_HostState global, which indicates the current state of\r
  *  the Host State Machine. To reduce the amount of code and time required to access and modify this global in an application, this token\r
  *  One of the most frequenty used global variables in the stack is the USB_HostState global, which indicates the current state of\r
  *  the Host State Machine. To reduce the amount of code and time required to access and modify this global in an application, this token\r

- *  make be defined to fix the state variable into one of the three general purpose IO registers inside the AVR reserved for application\r
- *  use. When defined, the GPIOR1 register should not be used within the user application except implicitly via the library APIs.\r
+ *  may be defined to a value between 0 and 2 to fix the state variable into one of the three general purpose IO registers inside the AVR\r
+ *  reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except\r
+ *  implicitly via the library APIs.\r

  *\r
  *  <b>TOTAL_NUM_CONFIGURATIONS</b> - ( \ref Group_Device ) \n\r
  *  By default, the library determines the number of configurations a USB device supports by reading the device descriptor. This reduces\r
  *\r
  *  <b>TOTAL_NUM_CONFIGURATIONS</b> - ( \ref Group_Device ) \n\r
  *  By default, the library determines the number of configurations a USB device supports by reading the device descriptor. This reduces\r