Better solution - change compile time token names to DEVICE_STATE_AS_GPIOR and HOST_STATE_AS_GPIOR and allow the user to set them to the index of the GPIOR register within the device to use.

2 files changed, 9 insertions, 7 deletions

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index b8ba3b2ce..2aaef12d4 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -34,7 +34,7 @@
   *  - Added new Benito Arduino Programmer project

   *  - Added new LEDs_ToggleLEDs() function to the LEDs driver

   *  - Added new Pipe_BoundEndpointNumber() and Pipe_IsEndpointBound() functions

-  *  - Added new DEVICE_STATE_AS_GPIOR0 and DEVICE_STATE_AS_GPIOR1 compile time options

+  *  - Added new DEVICE_STATE_AS_GPIOR and HOST_STATE_AS_GPIOR compile time options

   *  

   *  <b>Changed:</b>

   *  - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused)

diff --git a/LUFA/ManPages/CompileTimeTokens.txt b/LUFA/ManPages/CompileTimeTokens.txt
index 130a2e8fb..513d85454 100644
--- 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

  *  binary.

  *

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

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

  *  One of the most frequenty used global variables in the stack is the USB_DeviceState global, which indicates the current state of

  *  the Device State Machine. To reduce the amount of code and time required to access and modify this global in an application, this token

- *  make be defined to fix the state variable into one of the three general purpose IO registers inside the AVR reserved for application

- *  use. When defined, the GPIOR0 register should not be used within the user application except implicitly via the library APIs.

+ *  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

+ *  reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except

+ *  implicitly via the library APIs.

  *

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

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

  *  One of the most frequenty used global variables in the stack is the USB_HostState global, which indicates the current state of

  *  the Host State Machine. To reduce the amount of code and time required to access and modify this global in an application, this token

- *  make be defined to fix the state variable into one of the three general purpose IO registers inside the AVR reserved for application

- *  use. When defined, the GPIOR1 register should not be used within the user application except implicitly via the library APIs.

+ *  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

+ *  reserved for application use. When defined, the corresponding GPIOR register should not be used within the user application except

+ *  implicitly via the library APIs.

  *

  *  <b>TOTAL_NUM_CONFIGURATIONS</b> - ( \ref Group_Device ) \n

  *  By default, the library determines the number of configurations a USB device supports by reading the device descriptor. This reduces