Complete combining of PDI and TPI target communication code files, stub out TINY...

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

diff --git a/Projects/AVRISP/Lib/XPROG/XMEGANVM.h b/Projects/AVRISP/Lib/XPROG/XMEGANVM.h
index 4ae2ce4..10049f4 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/XMEGANVM.h
+++ b/Projects/AVRISP/Lib/XPROG/XMEGANVM.h
@@ -44,7 +44,7 @@
                #include <LUFA/Common/Common.h>\r
                \r
                #include "XPROGProtocol.h"\r
                #include <LUFA/Common/Common.h>\r
                \r
                #include "XPROGProtocol.h"\r

-               #include "PDITarget.h"\r
+               #include "XPROGTarget.h"\r

        \r
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
        \r
        /* Preprocessor Checks: */\r
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r


@@ -56,7 +56,7 @@
                #endif\r
 \r
        /* Defines: */\r
                #endif\r
 \r
        /* Defines: */\r

-               #define XMEGA_NVM_BUSY_TIMEOUT_MS            200\r
+               #define XMEGA_NVM_BUSY_TIMEOUT_MS            100\r

                \r
                #define XMEGA_NVM_REG_ADDR0                  0x00\r
                #define XMEGA_NVM_REG_ADDR1                  0x01\r
                \r
                #define XMEGA_NVM_REG_ADDR0                  0x00\r
                #define XMEGA_NVM_REG_ADDR1                  0x01\r


@@ -116,5 +116,6 @@
                                              const uint8_t WritePageCommand, const uint8_t PageMode, const uint32_t WriteAddress,\r
                                              const uint8_t* WriteBuffer, const uint16_t WriteSize);\r
                bool XMEGANVM_EraseMemory(const uint8_t EraseCommand, const uint32_t Address);\r
                                              const uint8_t WritePageCommand, const uint8_t PageMode, const uint32_t WriteAddress,\r
                                              const uint8_t* WriteBuffer, const uint16_t WriteSize);\r
                bool XMEGANVM_EraseMemory(const uint8_t EraseCommand, const uint32_t Address);\r

+               bool XMEGANVM_WaitWhileNVMBusBusy(void);\r

 \r
 #endif\r
 \r
 #endif\r