Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and...

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

diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index c9d39cb..8cc4c3c 100644 (file)
--- a/Projects/AVRISP/Lib/V2Protocol.h
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -37,31 +37,43 @@
 #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)\r
+               #include <LUFA/Drivers/Peripheral/SPI.h>\r
+               #include <LUFA/Drivers/Peripheral/Serial.h>\r
                \r
-       /* Type Defines: */\r
-               typedef struct\r
-               {\r
-                       uint8_t ParameterID;\r
-                       uint8_t ParameterValue;\r
-               } ParameterItem_t;
+               #include "../Descriptors.h"
+               #include "V2ProtocolConstants.h"\r
+               #include "V2ProtocolParams.h"
+               #include "ISP/ISPProtocol.h"\r
+               #include "XPROG/XPROGProtocol.h"\r
+\r
+       /* Preprocessor Checks: */\r
+               #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
+                       #undef ENABLE_ISP_PROTOCOL\r
+                       #undef ENABLE_TPI_PROTOCOL\r
+                       \r
+                       #if !defined(ENABLE_PDI_PROTOCOL)\r
+                               #define ENABLE_PDI_PROTOCOL\r
+                       #endif\r
+               #endif\r
 
-       /* Function Prototypes: */      
+       /* Macros: */\r
+               /** Programmer ID string, returned to the host during the CMD_SIGN_ON command processing */
+               #define PROGRAMMER_ID     "AVRISP_MK2"\r
+\r
+       /* External Variables: */\r
+               extern uint32_t CurrentAddress;\r
+               extern bool     MustSetAddress;\r
+\r
+       /* 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_UnknownCommand(uint8_t V2Command);\r
+                       static void V2Protocol_SignOn(void);\r
+                       static void V2Protocol_GetSetParam(uint8_t V2Command);\r
+                       static void V2Protocol_ResetProtection(void);\r
+                       static void V2Protocol_LoadAddress(void);\r
                #endif
 
 #endif