X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/2919aeeaaba0d1d54e03f9132269c5277d414543..05fcf7e2a79bebb978d4aeaef26b12f70c6826f8:/Projects/AVRISP/Lib/V2Protocol.h?ds=inline

diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index d40f951f9..8cc4c3c68 100644
--- a/Projects/AVRISP/Lib/V2Protocol.h
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -39,16 +39,18 @@
 	/* Includes: */
 		#include <LUFA/Drivers/USB/USB.h>
 		#include <LUFA/Drivers/Peripheral/SPI.h>
+		#include <LUFA/Drivers/Peripheral/Serial.h>
 		
 		#include "../Descriptors.h"
 		#include "V2ProtocolConstants.h"
 		#include "V2ProtocolParams.h"
-		#include "ISPProtocol.h"
-		#include "PDIProtocol.h"
+		#include "ISP/ISPProtocol.h"
+		#include "XPROG/XPROGProtocol.h"
 
 	/* Preprocessor Checks: */
-		#if (BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)
-			#undef  ENABLE_ISP_PROTOCOL
+		#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
+			#undef ENABLE_ISP_PROTOCOL
+			#undef ENABLE_TPI_PROTOCOL
 			
 			#if !defined(ENABLE_PDI_PROTOCOL)
 				#define ENABLE_PDI_PROTOCOL
@@ -57,25 +59,11 @@
 
 	/* Macros: */
 		/** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */
-		#define PROGRAMMER_ID                   "AVRISP_MK2"
-
-		/** Timeout in milliseconds of target busy-wait loops waiting for a command to complete */
-		#define TARGET_BUSY_TIMEOUT_MS    240
-
-	/* Inline Functions: */
-		/** Blocking delay for a given number of milliseconds, via a hardware timer.
-		 *
-		 *  \param[in] DelayMS  Number of milliseconds to delay for
-		 */
-		static inline void V2Protocol_DelayMS(uint8_t DelayMS)
-		{
-			TCNT0 = 0;
-			while (TCNT0 < DelayMS);
-		}
+		#define PROGRAMMER_ID     "AVRISP_MK2"
 
 	/* External Variables: */
 		extern uint32_t CurrentAddress;
-		extern bool MustSetAddress;
+		extern bool     MustSetAddress;
 
 	/* Function Prototypes: */
 		void V2Protocol_ProcessCommand(void);