diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2011-05-29 12:47:56 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2011-05-29 12:47:56 +0000 |
| commit | 0b6d5467bc70ba36ff71a186da9cf4d0742612a6 (patch) | |
| tree | a0292668256c00166ee52cac38da1d4dc7316726 /Projects/AVRISP-MKII/Lib/V2Protocol.h | |
| parent | ea922c98d187eb74c31535afa3334ead5bd50526 (diff) | |
| download | lufa-0b6d5467bc70ba36ff71a186da9cf4d0742612a6.tar.gz lufa-0b6d5467bc70ba36ff71a186da9cf4d0742612a6.tar.bz2 lufa-0b6d5467bc70ba36ff71a186da9cf4d0742612a6.zip | |
Oops - revert commit of an incomplete port of the AVRISP-MKII project.
Diffstat (limited to 'Projects/AVRISP-MKII/Lib/V2Protocol.h')
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/V2Protocol.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h index c2f0ee072..8e9e6ff38 100644 --- a/Projects/AVRISP-MKII/Lib/V2Protocol.h +++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h @@ -37,17 +37,12 @@ #define _V2_PROTOCOL_ /* Includes: */ - #include <LUFA/Common/Common.h> + #include <avr/io.h> + #include <avr/interrupt.h> + #include <avr/wdt.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" @@ -74,13 +69,15 @@ /** 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 volatile bool TimeoutExpired; + extern uint32_t CurrentAddress; + extern bool MustLoadExtendedAddress; /* Function Prototypes: */ void V2Protocol_Init(void); |