X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/b1dbd92c32022c2ec1601f6a6e51c5714a69c56c..fd96b288824caaa3ee4e5e03887f016de9df80cf:/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 dab41f316..7166c1023 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2009.
+     Copyright (C) Dean Camera, 2010.
               
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
 
 /*
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this 
   software and its documentation for any purpose is hereby granted
@@ -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>
@@ -58,7 +58,7 @@
 	/* Defines: */
 		#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
 			#define XPROG_VIA_HARDWARE_USART
-		#else
+		#else		
 			#define BITBANG_PDIDATA_PORT     PORTB
 			#define BITBANG_PDIDATA_DDR      DDRB
 			#define BITBANG_PDIDATA_PIN      PINB
@@ -80,6 +80,9 @@
 			#define BITBANG_TPICLOCK_MASK    (1 << 1)
 		#endif
 		
+		/** Serial carrier TPI/PDI speed when hardware TPI/PDI mode is used */
+		#define XPROG_HARDWARE_SPEED       500000
+
 		/** Number of cycles between each clock when software USART mode is used */
 		#define BITS_BETWEEN_USART_CLOCKS  100
 		
@@ -131,7 +134,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);