Commit e4264633 authored by Dean Camera's avatar Dean Camera
Browse files

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

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.
parent c1be3073
...@@ -117,7 +117,7 @@ LUFA_PATH = ../.. ...@@ -117,7 +117,7 @@ LUFA_PATH = ../..
# LUFA library compile-time options # LUFA library compile-time options
LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS = -D USB_DEVICE_ONLY
LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES
LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR0 LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1
LUFA_OPTS += -D USE_RAM_DESCRIPTORS LUFA_OPTS += -D USE_RAM_DESCRIPTORS
......
...@@ -117,7 +117,7 @@ LUFA_PATH = ../.. ...@@ -117,7 +117,7 @@ LUFA_PATH = ../..
# LUFA library compile-time options # LUFA library compile-time options
LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS = -D USB_DEVICE_ONLY
LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES
LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR0 LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
LUFA_OPTS += -D CONTROL_ONLY_DEVICE LUFA_OPTS += -D CONTROL_ONLY_DEVICE
LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32
LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1
......
...@@ -118,7 +118,7 @@ LUFA_PATH = ../.. ...@@ -118,7 +118,7 @@ LUFA_PATH = ../..
LUFA_OPTS = -D USB_DEVICE_ONLY LUFA_OPTS = -D USB_DEVICE_ONLY
LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES
LUFA_OPTS += -D CONTROL_ONLY_DEVICE LUFA_OPTS += -D CONTROL_ONLY_DEVICE
LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR0 LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0
LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8
LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1 LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1
LUFA_OPTS += -D USE_RAM_DESCRIPTORS LUFA_OPTS += -D USE_RAM_DESCRIPTORS
......
...@@ -36,11 +36,11 @@ ...@@ -36,11 +36,11 @@
volatile bool USB_IsInitialized; volatile bool USB_IsInitialized;
USB_Request_Header_t USB_ControlRequest; USB_Request_Header_t USB_ControlRequest;
#if defined(USB_CAN_BE_HOST) && !defined(HOST_STATE_AS_GPIOR1) #if defined(USB_CAN_BE_HOST) && !defined(HOST_STATE_AS_GPIOR)
volatile uint8_t USB_HostState; volatile uint8_t USB_HostState;
#endif #endif
#if defined(USB_CAN_BE_DEVICE) && !defined(DEVICE_STATE_AS_GPIOR0) #if defined(USB_CAN_BE_DEVICE) && !defined(DEVICE_STATE_AS_GPIOR)
volatile uint8_t USB_DeviceState; volatile uint8_t USB_DeviceState;
#endif #endif
......
...@@ -82,10 +82,11 @@ ...@@ -82,10 +82,11 @@
* \ref HOST_STATE_Configured and \ref HOST_STATE_Suspended states which are not implemented by * \ref HOST_STATE_Configured and \ref HOST_STATE_Suspended states which are not implemented by
* the library. * the library.
* *
* To reduce program size and speed up checks of this global, it can be placed into the AVR's GPIOR1 * To reduce program size and speed up checks of this global, it can be placed into one of the AVR's
* hardware register instead of RAM by defining the HOST_STATE_AS_GPIOR1 token in the project * GPIOR hardware registers instead of RAM by defining the HOST_STATE_AS_GPIOR token to a value
* makefile and passing it to the compiler via the -D switch. When defined, the GPIOR1 register should * between 0 and 2 in the project makefile and passing it to the compiler via the -D switch. When
* not be used in the user application except implicitly via the library APIs. * defined, the corresponding GPIOR register should not be used in the user application except
* implicitly via the library APIs.
* *
* \note This global is only present if the user application can be a USB host. * \note This global is only present if the user application can be a USB host.
* *
...@@ -95,12 +96,14 @@ ...@@ -95,12 +96,14 @@
*/ */
extern volatile uint8_t USB_HostState; extern volatile uint8_t USB_HostState;
#else #else
#define USB_HostState GPIOR1 #define _GET_HOST_GPIOR_NAME2(y) GPIOR ## y
#define _GET_HOST_GPIOR_NAME(x) _GET_HOST_GPIOR_NAME2(x)
#define USB_HostState _GET_HOST_GPIOR_NAME(HOST_STATE_AS_GPIOR)
#endif #endif
#endif #endif
#if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__) #if defined(USB_CAN_BE_DEVICE) || defined(__DOXYGEN__)
#if !defined(DEVICE_STATE_AS_GPIOR0) || defined(__DOXYGEN__) #if !defined(DEVICE_STATE_AS_GPIOR) || defined(__DOXYGEN__)
/** Indicates the current device state machine state. When in device mode, this indicates the state /** Indicates the current device state machine state. When in device mode, this indicates the state
* via one of the values of the \ref USB_Device_States_t enum values. * via one of the values of the \ref USB_Device_States_t enum values.
* *
...@@ -108,10 +111,11 @@ ...@@ -108,10 +111,11 @@
* library. The only exception to this rule is if the NO_LIMITED_CONTROLLER_CONNECT token is used * library. The only exception to this rule is if the NO_LIMITED_CONTROLLER_CONNECT token is used
* (see \ref EVENT_USB_Connect() and \ref EVENT_USB_Disconnect() events). * (see \ref EVENT_USB_Connect() and \ref EVENT_USB_Disconnect() events).
* *
* To reduce program size and speed up checks of this global, it can be placed into the AVR's GPIOR0 * To reduce program size and speed up checks of this global, it can be placed into one of the AVR's
* hardware register instead of RAM by defining the DEVICE_STATE_AS_GPIOR0 token in the project * GPIOR hardware registers instead of RAM by defining the DEVICE_STATE_AS_GPIOR token to a value
* makefile and passing it to the compiler via the -D switch. When defined, the GPIOR0 register should * between 0 and 2 in the project makefile and passing it to the compiler via the -D switch. When
* not be used in the user application except implicitly via the library APIs. * defined, the corresponding GPIOR register should not be used in the user application except
* implicitly via the library APIs.
* *
* \note This global is only present if the user application can be a USB device. * \note This global is only present if the user application can be a USB device.
* *
...@@ -124,7 +128,9 @@ ...@@ -124,7 +128,9 @@
*/ */
extern volatile uint8_t USB_DeviceState; extern volatile uint8_t USB_DeviceState;
#else #else
#define USB_DeviceState GPIOR0 #define _GET_DEVICE_GPIOR_NAME2(y) GPIOR ## y
#define _GET_DEVICE_GPIOR_NAME(x) _GET_DEVICE_GPIOR_NAME2(x)
#define USB_DeviceState _GET_DEVICE_GPIOR_NAME(DEVICE_STATE_AS_GPIOR)
#endif #endif
#endif #endif
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
* - Added new Benito Arduino Programmer project * - Added new Benito Arduino Programmer project
* - Added new LEDs_ToggleLEDs() function to the LEDs driver * - Added new LEDs_ToggleLEDs() function to the LEDs driver
* - Added new Pipe_BoundEndpointNumber() and Pipe_IsEndpointBound() functions * - 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> * <b>Changed:</b>
* - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused) * - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused)
......
...@@ -95,17 +95,19 @@ ...@@ -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 * 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. * 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 * 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 * 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 * 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
* use. When defined, the GPIOR0 register should not be used within the user application except implicitly via the library APIs. * 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 * 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 * 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 * 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
* use. When defined, the GPIOR1 register should not be used within the user application except implicitly via the library APIs. * 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 * <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 * By default, the library determines the number of configurations a USB device supports by reading the device descriptor. This reduces
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment