X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/5e12d436fa31399ba6b5c8cab484d4a7b5adf7e7..eed7d4df6ae3da8616ec294d303ceea26078c707:/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
index 7ebed129c..e0400e2cc 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
@@ -57,27 +57,7 @@
 
 	/* Defines: */
 		#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
-//			#define XPROG_VIA_HARDWARE_USART
-
-			#define BITBANG_PDIDATA_PORT     PORTD
-			#define BITBANG_PDIDATA_DDR      DDRD
-			#define BITBANG_PDIDATA_PIN      PIND
-			#define BITBANG_PDIDATA_MASK     (1 << 3)
-			
-			#define BITBANG_PDICLOCK_PORT    PORTD
-			#define BITBANG_PDICLOCK_DDR     DDRD
-			#define BITBANG_PDICLOCK_PIN     PIND
-			#define BITBANG_PDICLOCK_MASK    (1 << 5)
-
-			#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)
+			#define XPROG_VIA_HARDWARE_USART
 		#else
 			#define BITBANG_PDIDATA_PORT     PORTB
 			#define BITBANG_PDIDATA_DDR      DDRB
@@ -100,8 +80,11 @@
 			#define BITBANG_TPICLOCK_MASK    (1 << 1)
 		#endif
 		
+		/** Serial carrier TPI/PDI speed when hardware TPI/PDI mode is used */
+		#define XPROG_HARDWARE_SPEED       1000000
+
 		/** Number of cycles between each clock when software USART mode is used */
-		#define BITS_BETWEEN_USART_CLOCKS  80
+		#define BITS_BETWEEN_USART_CLOCKS  100
 		
 		/** Total number of bits in a single USART frame */
 		#define BITS_IN_USART_FRAME        12