Oops - with new changes to the way the device Configuration Descriptor is retrieved...

[pub/USBasp.git] / Projects / AVRISP / Lib / V2Protocol.h

diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index c9d39cb..5c8bd75 100644 (file)
--- 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>\r
+               \r
+               #include "../Descriptors.h"
+               #include "V2ProtocolConstants.h"\r
+               #include "V2ProtocolParams.h"
+               #include "V2ProtocolTarget.h"\r
 
-       /* Macros: */
-               #define PROGRAMMER_ID       "AVRISP_MK2"
-               #define PROGRAMMER_ID_LEN   (sizeof(PROGRAMMER_ID) - 1)\r
+       /* Macros: */\r
+               /** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */
+               #define PROGRAMMER_ID                   "AVRISP_MK2"\r
                \r
-       /* Type Defines: */\r
-               typedef struct\r
-               {\r
-                       uint8_t ParameterID;\r
-                       uint8_t ParameterValue;\r
-               } ParameterItem_t;
+               /** Mask for the reading or writing of the high byte in a FLASH word when issuing a low-level programming command */\r
+               #define READ_WRITE_HIGH_BYTE_MASK       (1 << 3)\r
+\r
+               #define PROG_MODE_PAGED_WRITES_MASK     (1 << 0)\r
+               #define PROG_MODE_WORD_TIMEDELAY_MASK   (1 << 1)\r
+               #define PROG_MODE_WORD_VALUE_MASK       (1 << 2)\r
+               #define PROG_MODE_WORD_READYBUSY_MASK   (1 << 3)\r
+               #define PROG_MODE_PAGED_TIMEDELAY_MASK  (1 << 4)\r
+               #define PROG_MODE_PAGED_VALUE_MASK      (1 << 5)\r
+               #define PROG_MODE_PAGED_READYBUSY_MASK  (1 << 6)\r
+               #define PROG_MODE_COMMIT_PAGE_MASK      (1 << 7)\r
 
-       /* Function Prototypes: */      
+       /* Function Prototypes: */\r
                void V2Protocol_ProcessCommand(void);\r
                \r
                #if defined(INCLUDE_FROM_V2PROTOCOL_C)\r
-                       static ParameterItem_t* V2Protocol_GetParameterItem(uint8_t ParamID);\r
-                       static void V2Protocol_ProcessCmdSignOn(void);\r
-                       static void V2Protocol_ProcessCmdSetParam(void);\r
-                       static void V2Protocol_ProcessCmdGetParam(void);\r
+                       static void V2Protocol_Command_Unknown(uint8_t V2Command);\r
+                       static void V2Protocol_Command_SignOn(void);\r
+                       static void V2Protocol_Command_GetSetParam(uint8_t V2Command);\r
+                       static void V2Protocol_Command_LoadAddress(void);\r
+                       static void V2Protocol_Command_ResetProtection(void);\r
+                       static void V2Protocol_Command_EnterISPMode(void);\r
+                       static void V2Protocol_Command_LeaveISPMode(void);\r
+                       static void V2Protocol_Command_ProgramMemory(uint8_t V2Command);\r
+                       static void V2Protocol_Command_ReadMemory(uint8_t V2Command);\r
+                       static void V2Protocol_Command_ChipErase(void);\r
+                       static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command);\r
+                       static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command);\r
+                       static void V2Protocol_Command_SPIMulti(void);\r
                #endif
 
 #endif