X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/a5adbae652bcf5382ef34d71da4d11de15b482a6..24f730fce3f2022762011d795c3feada5ef874b3:/Projects/AVRISP/Lib/PDITarget.h

diff --git a/Projects/AVRISP/Lib/PDITarget.h b/Projects/AVRISP/Lib/PDITarget.h
index 55a1a9562..3758489a7 100644
--- a/Projects/AVRISP/Lib/PDITarget.h
+++ b/Projects/AVRISP/Lib/PDITarget.h
@@ -38,43 +38,72 @@
 
 	/* Includes: */
 		#include <avr/io.h>
+		#include <avr/interrupt.h>
 		#include <stdbool.h>
 		
 		#include <LUFA/Common/Common.h>
 	
+	/* Preprocessor Checks: */
+		#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
+			#undef ENABLE_ISP_PROTOCOL
+			
+			#if !defined(ENABLE_PDI_PROTOCOL)
+				#define ENABLE_PDI_PROTOCOL
+			#endif
+		#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) || (BOARD == BOARD_XPLAIN_REV1))
+			#define PDI_VIA_HARDWARE_USART
+		#else
+			#define BITBANG_PDIDATA_PORT     PORTB
+			#define BITBANG_PDIDATA_DDR      DDRB
+			#define BITBANG_PDIDATA_PIN      PINB
+			#define BITBANG_PDIDATA_MASK     (1 << 3)
+			
+			#define BITBANG_PDICLOCK_PORT    RESET_LINE_PORT
+			#define BITBANG_PDICLOCK_DDR     RESET_LINE_DDR
+			#define BITBANG_PDICLOCK_PIN     RESET_LINE_PIN
+			#define BITBANG_PDICLOCK_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
-		#define PDI_CMD_ST            0x60
-		#define PDI_CMD_LDCS          0x80
-		#define PDI_CMD_REPEAT        0xA0
-		#define PDI_CMD_STCS          0xC0
-		#define PDI_CMD_KEY           0xE0
+		#define BITS_IN_FRAME            12
 		
-		#define PD_STATUS_REG         0
-		#define PD_RESET_REG          1
-		#define PD_CTRL_REG           2
-
-		#define PDI_STATUS_NVM        (1 << 1)
+		#define PDI_NVM_TIMEOUT_MS       200
+		
+		#define PDI_CMD_LDS              0x00
+		#define PDI_CMD_LD               0x20
+		#define PDI_CMD_STS              0x40
+		#define PDI_CMD_ST               0x60
+		#define PDI_CMD_LDCS             0x80
+		#define PDI_CMD_REPEAT           0xA0
+		#define PDI_CMD_STCS             0xC0
+		#define PDI_CMD_KEY              0xE0
+		
+		#define PDI_STATUS_REG           0
+		#define PDI_RESET_REG            1
+		#define PDI_CTRL_REG             2
+		
+		#define PDI_STATUS_NVM           (1 << 1)
+		#define PDI_RESET_KEY            0x59
 
-		#define PDI_RESET_KEY         0x59
-		#define PDI_NVMENABLE_KEY     (uint8_t[]){0x12, 0x89, 0xAB, 0x45, 0xCD, 0xD8, 0x88, 0xFF}
+		#define PDI_NVMENABLE_KEY        (uint8_t[]){0x12, 0x89, 0xAB, 0x45, 0xCD, 0xD8, 0x88, 0xFF}
 
-		#define TOGGLE_PDI_CLOCK      MACROS{ PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; \
-		                                      PDICLOCK_LINE_PORT ^= PDICLOCK_LINE_MASK; }MACROE
+		#define PDI_DATSIZE_1BYTE        0
+		#define PDI_DATSIZE_2BYTES       1
+		#define PDI_DATSIZE_3BYTES       2
+		#define PDI_DATSIZE_4BYTES       3
 		
+		#define PDI_POINTER_INDIRECT     0
+		#define PDI_POINTER_INDIRECT_PI  1
+		#define PDI_POINTER_DIRECT       2
+				
 	/* Function Prototypes: */
-		void    PDITarget_SendByte(uint8_t Byte);
+		void    PDITarget_EnableTargetPDI(void);
+		void    PDITarget_DisableTargetPDI(void);
+		void    PDITarget_SendByte(const uint8_t Byte);
 		uint8_t PDITarget_ReceiveByte(void);
+		void    PDITarget_SendBreak(void);
+		bool    PDITarget_WaitWhileNVMBusBusy(void);
 
 #endif