X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/bbcdaaa6dc6024911a280e5fda6b4a43f71fb98e..7aecda6fda5bcced68d72b0cf73d00174aa5c7cd:/Projects/AVRISP/Lib/V2Protocol.h

diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index c9d39cb71..c6203004f 100644
--- a/Projects/AVRISP/Lib/V2Protocol.h
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -37,31 +37,55 @@
 #define _V2_PROTOCOL_
 
 	/* Includes: */
-		#include <avr/io.h>
-
 		#include <LUFA/Drivers/USB/USB.h>
-		
-		#include "V2ProtocolConstants.h"
-
-	/* Macros: */
-		#define PROGRAMMER_ID       "AVRISP_MK2"
-		#define PROGRAMMER_ID_LEN   (sizeof(PROGRAMMER_ID) - 1)
+		#include <LUFA/Drivers/Peripheral/SPI.h>
 		
-	/* Type Defines: */
-		typedef struct
-		{
-			uint8_t ParameterID;
-			uint8_t ParameterValue;
-		} ParameterItem_t;
+		#include "../Descriptors.h"
+		#include "V2ProtocolConstants.h"
+		#include "V2ProtocolParams.h"
+		#include "ISPProtocol.h"
+		#include "PDIProtocol.h"
+
+	/* Preprocessor Checks: */
+		#if (BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)
+			#undef  ENABLE_ISP_PROTOCOL
+			
+			#if !defined(ENABLE_PDI_PROTOCOL)
+				#define ENABLE_PDI_PROTOCOL
+			#endif
+		#endif
 
-	/* Function Prototypes: */	
+	/* 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);
+		}
+
+	/* External Variables: */
+		extern uint32_t CurrentAddress;
+		extern bool MustSetAddress;
+
+	/* Function Prototypes: */
 		void V2Protocol_ProcessCommand(void);
 		
 		#if defined(INCLUDE_FROM_V2PROTOCOL_C)
-			static ParameterItem_t* V2Protocol_GetParameterItem(uint8_t ParamID);
-			static void V2Protocol_ProcessCmdSignOn(void);
-			static void V2Protocol_ProcessCmdSetParam(void);
-			static void V2Protocol_ProcessCmdGetParam(void);
+			static void V2Protocol_UnknownCommand(uint8_t V2Command);
+			static void V2Protocol_SignOn(void);
+			static void V2Protocol_GetSetParam(uint8_t V2Command);
+			static void V2Protocol_ResetProtection(void);
+			static void V2Protocol_LoadAddress(void);
 		#endif
 
 #endif