X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/7f9f97c792dee6875fbca9806422bdd7d6c5a657..ab8668b14ee05854dfe935bf143be7ebe051b8f5:/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h?ds=sidebyside

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
index ff0be48b6..65ec11bcf 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
@@ -30,11 +30,11 @@
 
 /** \file
  *
- *  Header file for PDITarget.c.
+ *  Header file for XPROGTarget.c.
  */
 
-#ifndef _PDI_TARGET_
-#define _PDI_TARGET_
+#ifndef _XPROG_TARGET_
+#define _XPROG_TARGET_
 
 	/* Includes: */
 		#include <avr/io.h>
@@ -54,35 +54,10 @@
 				#define ENABLE_XPROG_PROTOCOL
 			#endif
 		#endif
-
-	/* Defines: */
-		#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
-			#define XPROG_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    AUX_LINE_PORT
-			#define BITBANG_PDICLOCK_DDR     AUX_LINE_DDR
-			#define BITBANG_PDICLOCK_PIN     AUX_LINE_PIN
-			#define BITBANG_PDICLOCK_MASK    AUX_LINE_MASK
-
-			#define BITBANG_TPIDATA_PORT     PORTB
-			#define BITBANG_TPIDATA_DDR      DDRB
-			#define BITBANG_TPIDATA_PIN      PINB
-			#define BITBANG_TPIDATA_MASK     (1 << 3)
-				
-			#define BITBANG_TPICLOCK_PORT    PORTB
-			#define BITBANG_TPICLOCK_DDR     DDRB
-			#define BITBANG_TPICLOCK_PIN     PINB
-			#define BITBANG_TPICLOCK_MASK    (1 << 1)
-		#endif
-		
-		/** Number of cycles between each clock when software USART mode is used */
-		#define BITS_BETWEEN_USART_CLOCKS  200
 		
+		/** Serial carrier TPI/PDI speed when hardware TPI/PDI mode is used */
+		#define XPROG_HARDWARE_SPEED       1000000
+
 		/** Total number of bits in a single USART frame */
 		#define BITS_IN_USART_FRAME        12
 		
@@ -131,7 +106,7 @@
 		#define TPI_NVMENABLE_KEY          (uint8_t[]){0x12, 0x89, 0xAB, 0x45, 0xCD, 0xD8, 0x88, 0xFF}
 
 		#define TPI_POINTER_INDIRECT       0
-		#define TPI_POINTER_INDIRECT_PI    (1 << 2)
+		#define TPI_POINTER_INDIRECT_PI    4
 		
 	/* Function Prototypes: */
 		void    XPROGTarget_EnableTargetPDI(void);