Cleanup and partially fix AVRISP-MKII project's TPI programming support.

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

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.h b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.h
index cbd9e26..583a287 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XMEGANVM.h
@@ -106,8 +106,6 @@
                #define XMEGA_NVM_CMD_READEEPROM             0x06\r
 \r
        /* Function Prototypes: */\r
                #define XMEGA_NVM_CMD_READEEPROM             0x06\r
 \r
        /* Function Prototypes: */\r

-               void XMEGANVM_SendNVMRegAddress(const uint8_t Register);\r
-               void XMEGANVM_SendAddress(const uint32_t AbsoluteAddress);\r

                bool XMEGANVM_WaitWhileNVMBusBusy(void);\r
                bool XMEGANVM_WaitWhileNVMControllerBusy(void);\r
                bool XMEGANVM_GetMemoryCRC(const uint8_t CRCCommand, uint32_t* const CRCDest);\r
                bool XMEGANVM_WaitWhileNVMBusBusy(void);\r
                bool XMEGANVM_WaitWhileNVMControllerBusy(void);\r
                bool XMEGANVM_GetMemoryCRC(const uint8_t CRCCommand, uint32_t* const CRCDest);\r


@@ -118,4 +116,9 @@
                                              const uint8_t* WriteBuffer, uint16_t WriteSize);\r
                bool XMEGANVM_EraseMemory(const uint8_t EraseCommand, const uint32_t Address);\r
 \r
                                              const uint8_t* WriteBuffer, uint16_t WriteSize);\r
                bool XMEGANVM_EraseMemory(const uint8_t EraseCommand, const uint32_t Address);\r
 \r

+               #if defined(INCLUDE_FROM_XMEGANVM_C)\r
+                       static void XMEGANVM_SendNVMRegAddress(const uint8_t Register);\r
+                       static void XMEGANVM_SendAddress(const uint32_t AbsoluteAddress);               \r
+               #endif\r
+\r

 #endif\r
 #endif\r