diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-05-29 12:41:14 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-05-29 12:41:14 +0000 |
| commit | ea922c98d187eb74c31535afa3334ead5bd50526 (patch) | |
| tree | 0add2892e10e4686e555ddf1d98c9110ebb4ba9f /Projects/AVRISP-MKII/Lib/V2Protocol.h | |
| parent | cc9b190919abbc567cd179b31afeef565efb1f17 (diff) | |
| download | lufa-ea922c98d187eb74c31535afa3334ead5bd50526.tar.gz lufa-ea922c98d187eb74c31535afa3334ead5bd50526.tar.bz2 lufa-ea922c98d187eb74c31535afa3334ead5bd50526.zip | |
Added new incomplete AudioInputHost Host LowLevel demo.
Added missing Audio class control request definitions.
Added support for the Audio class GET STATUS request so that it is correctly ACKed when sent by the host.
Diffstat (limited to 'Projects/AVRISP-MKII/Lib/V2Protocol.h')
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/V2Protocol.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h index 8e9e6ff38..c2f0ee072 100644 --- a/Projects/AVRISP-MKII/Lib/V2Protocol.h +++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h @@ -37,12 +37,17 @@ #define _V2_PROTOCOL_ /* Includes: */ - #include <avr/io.h> - #include <avr/interrupt.h> - #include <avr/wdt.h> - + #include <LUFA/Common/Common.h> #include <LUFA/Drivers/USB/USB.h> + #if (ARCH == ARCH_AVR8) + #include <avr/io.h> + #include <avr/interrupt.h> + #include <avr/wdt.h> + #elif (ARCH == ARCH_UC3) + #include <avr32/io.h> + #endif + #include "../Descriptors.h" #include "V2ProtocolConstants.h" #include "V2ProtocolParams.h" @@ -69,15 +74,13 @@ /** Timeout period for each issued command from the host before it is aborted (in 10ms ticks). */ #define COMMAND_TIMEOUT_TICKS 100 - /** Command timeout expiration flag, GPIOR for speed. */ - #define TimeoutExpired GPIOR1 - /** MUX mask for the VTARGET ADC channel number. */ #define VTARGET_ADC_CHANNEL_MASK ADC_GET_CHANNEL_MASK(VTARGET_ADC_CHANNEL) /* External Variables: */ - extern uint32_t CurrentAddress; - extern bool MustLoadExtendedAddress; + extern uint32_t CurrentAddress; + extern bool MustLoadExtendedAddress; + extern volatile bool TimeoutExpired; /* Function Prototypes: */ void V2Protocol_Init(void); |