X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/bbcdaaa6dc6024911a280e5fda6b4a43f71fb98e..f9f1bcc25c17b031029200cd9648d76d4ee39dc4:/Projects/AVRISP/Lib/V2Protocol.h?ds=inline

diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index c9d39cb71..5c8bd7513 100644
--- a/Projects/AVRISP/Lib/V2Protocol.h
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -37,31 +37,47 @@
 #define _V2_PROTOCOL_
 
 	/* Includes: */
-		#include <avr/io.h>
-
 		#include <LUFA/Drivers/USB/USB.h>
-		
-		#include "V2ProtocolConstants.h"
+		#include <LUFA/Drivers/Peripheral/SPI.h>
+		
+		#include "../Descriptors.h"
+		#include "V2ProtocolConstants.h"
+		#include "V2ProtocolParams.h"
+		#include "V2ProtocolTarget.h"
 
-	/* Macros: */
-		#define PROGRAMMER_ID       "AVRISP_MK2"
-		#define PROGRAMMER_ID_LEN   (sizeof(PROGRAMMER_ID) - 1)
+	/* Macros: */
+		/** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */
+		#define PROGRAMMER_ID                   "AVRISP_MK2"
 		
-	/* Type Defines: */
-		typedef struct
-		{
-			uint8_t ParameterID;
-			uint8_t ParameterValue;
-		} ParameterItem_t;
+		/** Mask for the reading or writing of the high byte in a FLASH word when issuing a low-level programming command */
+		#define READ_WRITE_HIGH_BYTE_MASK       (1 << 3)
+
+		#define PROG_MODE_PAGED_WRITES_MASK     (1 << 0)
+		#define PROG_MODE_WORD_TIMEDELAY_MASK   (1 << 1)
+		#define PROG_MODE_WORD_VALUE_MASK       (1 << 2)
+		#define PROG_MODE_WORD_READYBUSY_MASK   (1 << 3)
+		#define PROG_MODE_PAGED_TIMEDELAY_MASK  (1 << 4)
+		#define PROG_MODE_PAGED_VALUE_MASK      (1 << 5)
+		#define PROG_MODE_PAGED_READYBUSY_MASK  (1 << 6)
+		#define PROG_MODE_COMMIT_PAGE_MASK      (1 << 7)
 
-	/* Function Prototypes: */	
+	/* 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_Command_Unknown(uint8_t V2Command);
+			static void V2Protocol_Command_SignOn(void);
+			static void V2Protocol_Command_GetSetParam(uint8_t V2Command);
+			static void V2Protocol_Command_LoadAddress(void);
+			static void V2Protocol_Command_ResetProtection(void);
+			static void V2Protocol_Command_EnterISPMode(void);
+			static void V2Protocol_Command_LeaveISPMode(void);
+			static void V2Protocol_Command_ProgramMemory(uint8_t V2Command);
+			static void V2Protocol_Command_ReadMemory(uint8_t V2Command);
+			static void V2Protocol_Command_ChipErase(void);
+			static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command);
+			static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command);
+			static void V2Protocol_Command_SPIMulti(void);
 		#endif
 
 #endif