X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d4ca7fb44c7d326b96cf391f0275dc323dbe24de..ce8d0424b1a59bb2b0bd3ab8f69f4e4cf8c9930b:/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 a892829c1..d08a8b653 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>
@@ -44,6 +44,7 @@
 		#include <LUFA/Common/Common.h>
 		
 		#include "../V2Protocol.h"
+		#include "XPROGProtocol.h"
 	
 	/* Preprocessor Checks: */
 		#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
@@ -63,10 +64,10 @@
 			#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
+			#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
@@ -99,8 +100,8 @@
 		#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_DATSIZE_1BYTE          0
@@ -130,7 +131,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);
@@ -141,5 +142,10 @@
 		uint8_t XPROGTarget_ReceiveByte(void);
 		void    XPROGTarget_SendBreak(void);
 		bool    XPROGTarget_WaitWhileNVMBusBusy(void);
+		
+		#if defined(INCLUDE_FROM_XPROGTARGET_C)
+			static void XPROGTarget_SetTxMode(void);
+			static void XPROGTarget_SetRxMode(void);
+		#endif
 
 #endif