diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-12-03 08:35:32 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-12-03 08:35:32 +0000 |
| commit | f1baf12fae61a13e6d8e88655d709d74977322b5 (patch) | |
| tree | 3903a0a155f520bac44def96e666352e5fbf224b /Projects/AVRISP/Lib | |
| parent | a5adbae652bcf5382ef34d71da4d11de15b482a6 (diff) | |
| download | lufa-f1baf12fae61a13e6d8e88655d709d74977322b5.tar.gz lufa-f1baf12fae61a13e6d8e88655d709d74977322b5.tar.bz2 lufa-f1baf12fae61a13e6d8e88655d709d74977322b5.zip | |
Auto-configure AVRISP programmer configuration when built for the XPLAIN board to match the XPLAIN hardware connections.
Diffstat (limited to 'Projects/AVRISP/Lib')
| -rw-r--r-- | Projects/AVRISP/Lib/ISPProtocol.h | 6 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/ISPTarget.h | 6 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/PDIProtocol.h | 6 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/PDITarget.h | 33 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/V2Protocol.h | 6 |
5 files changed, 49 insertions, 8 deletions
diff --git a/Projects/AVRISP/Lib/ISPProtocol.h b/Projects/AVRISP/Lib/ISPProtocol.h index 5a91f59e3..5a144c4f7 100644 --- a/Projects/AVRISP/Lib/ISPProtocol.h +++ b/Projects/AVRISP/Lib/ISPProtocol.h @@ -40,6 +40,12 @@ #include <avr/io.h>
#include "V2Protocol.h"
+
+ /* Preprocessor Checks: */
+ #if BOARD == BOARD_XPLAIN
+ #undef ENABLE_SPI_PROTOCOL
+ #define ENABLE_PDI_PROTOCOL
+ #endif
/* Macros: */
/** Mask for the reading or writing of the high byte in a FLASH word when issuing a low-level programming command */
diff --git a/Projects/AVRISP/Lib/ISPTarget.h b/Projects/AVRISP/Lib/ISPTarget.h index 121d7893f..4c4b891d1 100644 --- a/Projects/AVRISP/Lib/ISPTarget.h +++ b/Projects/AVRISP/Lib/ISPTarget.h @@ -47,6 +47,12 @@ #include "V2ProtocolConstants.h"
#include "V2ProtocolParams.h"
+ /* Preprocessor Checks: */
+ #if BOARD == BOARD_XPLAIN
+ #undef ENABLE_SPI_PROTOCOL
+ #define ENABLE_PDI_PROTOCOL
+ #endif
+
/* Macros: */
/** Total number of allowable ISP programming speeds supported by the device */
#define TOTAL_ISP_PROGRAMMING_SPEEDS 7
diff --git a/Projects/AVRISP/Lib/PDIProtocol.h b/Projects/AVRISP/Lib/PDIProtocol.h index 406ba2732..6ac3eb209 100644 --- a/Projects/AVRISP/Lib/PDIProtocol.h +++ b/Projects/AVRISP/Lib/PDIProtocol.h @@ -43,6 +43,12 @@ #include "V2Protocol.h"
#include "PDITarget.h"
+ /* Preprocessor Checks: */
+ #if BOARD == BOARD_XPLAIN
+ #undef ENABLE_SPI_PROTOCOL
+ #define ENABLE_PDI_PROTOCOL
+ #endif
+
/* Macros: */
#define XPRG_CMD_ENTER_PROGMODE 0x01
#define XPRG_CMD_LEAVE_PROGMODE 0x02
diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h index 55a1a9562..f2281fe11 100644 --- a/Projects/AVRISP/Lib/PDITarget.h +++ b/Projects/AVRISP/Lib/PDITarget.h @@ -42,16 +42,33 @@ #include <LUFA/Common/Common.h>
+ /* Preprocessor Checks: */
+ #if BOARD == BOARD_XPLAIN
+ #undef ENABLE_SPI_PROTOCOL
+ #define ENABLE_PDI_PROTOCOL
+ #endif
+
/* Defines: */
- #define PDIDATA_LINE_PORT PORTB
- #define PDIDATA_LINE_DDR DDRB
- #define PDIDATA_LINE_PIN PINB
- #define PDIDATA_LINE_MASK (1 << 2)
+ #if BOARD == BOARD_XPLAIN
+ #define PDIDATA_LINE_PORT PORTD
+ #define PDIDATA_LINE_DDR DDRD
+ #define PDIDATA_LINE_PIN PIND
+ #define PDIDATA_LINE_MASK (1 << 2)
+
+ #define PDICLOCK_LINE_PORT PORTD
+ #define PDICLOCK_LINE_DDR DDRD
+ #define PDICLOCK_LINE_MASK (1 << 5)
+ #else
+ #define PDIDATA_LINE_PORT PORTB
+ #define PDIDATA_LINE_DDR DDRB
+ #define PDIDATA_LINE_PIN PINB
+ #define PDIDATA_LINE_MASK (1 << 2)
+
+ #define PDICLOCK_LINE_PORT RESET_LINE_PORT
+ #define PDICLOCK_LINE_DDR RESET_LINE_DDR
+ #define PDICLOCK_LINE_MASK RESET_LINE_MASK
+ #endif
- #define PDICLOCK_LINE_PORT RESET_LINE_PORT
- #define PDICLOCK_LINE_DDR RESET_LINE_DDR
- #define PDICLOCK_LINE_MASK RESET_LINE_MASK
-
#define PDI_CMD_LDS 0x00
#define PDI_CMD_LD 0x20
#define PDI_CMD_STS 0x40
diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h index 7a181e32b..f65a57c06 100644 --- a/Projects/AVRISP/Lib/V2Protocol.h +++ b/Projects/AVRISP/Lib/V2Protocol.h @@ -45,6 +45,12 @@ #include "V2ProtocolParams.h" #include "ISPProtocol.h"
#include "PDIProtocol.h"
+
+ /* Preprocessor Checks: */
+ #if BOARD == BOARD_XPLAIN
+ #undef ENABLE_SPI_PROTOCOL
+ #define ENABLE_PDI_PROTOCOL
+ #endif
/* Macros: */
/** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */ |