Remove obsolete macros and preprocessor checks from the AVRISP-MKII project's V2Proto...

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

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
index 1fdb5a1..978a5a2 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
@@ -98,12 +98,12 @@
 
                #define XPRG_PARAM_NVMBASE                  0x01
                #define XPRG_PARAM_EEPPAGESIZE              0x02
 
                #define XPRG_PARAM_NVMBASE                  0x01
                #define XPRG_PARAM_EEPPAGESIZE              0x02

-               #define XPRG_PARAM_NVMCMD_REG               0x03 /* Undocumented, Reverse-engineered */
-               #define XPRG_PARAM_NVMCSR_REG               0x04 /* Undocumented, Reverse-engineered */
+               #define XPRG_PARAM_NVMCMD_REG               0x03
+               #define XPRG_PARAM_NVMCSR_REG               0x04

                
                #define XPRG_PROTOCOL_PDI                   0x00
                #define XPRG_PROTOCOL_JTAG                  0x01
                
                #define XPRG_PROTOCOL_PDI                   0x00
                #define XPRG_PROTOCOL_JTAG                  0x01

-               #define XPRG_PROTOCOL_TPI                   0x02 /* Undocumented, Reverse-engineered */
+               #define XPRG_PROTOCOL_TPI                   0x02

                
                #define XPRG_PAGEMODE_WRITE                 (1 << 1)
                #define XPRG_PAGEMODE_ERASE                 (1 << 0)
                
                #define XPRG_PAGEMODE_WRITE                 (1 << 1)
                #define XPRG_PAGEMODE_ERASE                 (1 << 0)


@@ -119,7 +119,7 @@
                void XPROGProtocol_SetMode(void);
                void XPROGProtocol_Command(void);
                
                void XPROGProtocol_SetMode(void);
                void XPROGProtocol_Command(void);
                

-               #if defined(INCLUDE_FROM_XPROGPROTOCOL_C)
+               #if (defined(INCLUDE_FROM_XPROGPROTOCOL_C) && defined(ENABLE_XPROG_PROTOCOL))

                        static void XPROGProtocol_EnterXPROGMode(void);
                        static void XPROGProtocol_LeaveXPROGMode(void);
                        static void XPROGProtocol_SetParam(void);
                        static void XPROGProtocol_EnterXPROGMode(void);
                        static void XPROGProtocol_LeaveXPROGMode(void);
                        static void XPROGProtocol_SetParam(void);