Combine PDIProtocol and TPIProtocol into a single XPROGProtocol set of files.

[pub/USBasp.git] / Projects / AVRISP / Lib / XPROG / XPROGProtocol.h

diff --git a/Projects/AVRISP/Lib/XPROG/XPROGProtocol.h b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.h
index 9a10abb..847652e 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/XPROGProtocol.h
+++ b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.h
@@ -30,11 +30,11 @@
 \r
 /** \file\r
  *\r
- *  Header file for PDIProtocol.c.\r
+ *  Header file for XPROGProtocol.c.\r
  */\r
 \r
-#ifndef _PDI_PROTOCOL_\r
-#define _PDI_PROTOCOL_\r
+#ifndef _XPROG_PROTOCOL_\r
+#define _XPROG_PROTOCOL_\r
 \r
        /* Includes: */\r
                #include <avr/io.h>\r
@@ -46,14 +46,15 @@
                #include "../V2Protocol.h"\r
                #include "PDITarget.h"\r
                #include "XMEGANVM.h"\r
+               #include "TPITarget.h"\r
+               #include "TINYNVM.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
+                       #if !defined(ENABLE_XPROG_PROTOCOL)\r
+                               #define ENABLE_XPROG_PROTOCOL\r
                        #endif\r
                #endif\r
        \r
@@ -109,17 +110,17 @@
                extern uint32_t XPROG_Param_NVMBase;\r
                \r
        /* Function Prototypes: */\r
-               void PDIProtocol_XPROG_SetMode(void);\r
-               void PDIProtocol_XPROG_Command(void);\r
+               void XPROGProtocol_SetMode(void);\r
+               void XPROGProtocol_Command(void);\r
                \r
-               #if defined(INCLUDE_FROM_PDIPROTOCOL_C)\r
-                       static void PDIProtocol_EnterXPROGMode(void);\r
-                       static void PDIProtocol_LeaveXPROGMode(void);\r
-                       static void PDIProtocol_SetParam(void);\r
-                       static void PDIProtocol_Erase(void);\r
-                       static void PDIProtocol_WriteMemory(void);\r
-                       static void PDIProtocol_ReadMemory(void);\r
-                       static void PDIProtocol_ReadCRC(void);\r
+               #if defined(INCLUDE_FROM_XPROGPROTOCOL_C)\r
+                       static void XPROGProtocol_EnterXPROGMode(void);\r
+                       static void XPROGProtocol_LeaveXPROGMode(void);\r
+                       static void XPROGProtocol_SetParam(void);\r
+                       static void XPROGProtocol_Erase(void);\r
+                       static void XPROGProtocol_WriteMemory(void);\r
+                       static void XPROGProtocol_ReadMemory(void);\r
+                       static void XPROGProtocol_ReadCRC(void);\r
                #endif\r
                \r
 #endif\r