Split out NVM access code in the AVRISP project into a seperate NVMTarget.c source...

[pub/USBasp.git] / Projects / AVRISP / Lib / PDITarget.c

diff --git a/Projects/AVRISP/Lib/PDITarget.c b/Projects/AVRISP/Lib/PDITarget.c
index 7fa48e6..e1b77f0 100644 (file)
--- a/Projects/AVRISP/Lib/PDITarget.c
+++ b/Projects/AVRISP/Lib/PDITarget.c
@@ -28,8 +28,6 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

-#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r
-\r

 /** \file\r
  *\r
  *  Target-related functions for the PDI Protocol decoder.\r
 /** \file\r
  *\r
  *  Target-related functions for the PDI Protocol decoder.\r


@@ -38,6 +36,8 @@
 #define  INCLUDE_FROM_PDITARGET_C\r
 #include "PDITarget.h"\r
 \r
 #define  INCLUDE_FROM_PDITARGET_C\r
 #include "PDITarget.h"\r
 \r

+#if defined(ENABLE_PDI_PROTOCOL) || defined(__DOXYGEN__)\r
+\r

 volatile bool     IsSending;\r
 \r
 #if !defined(PDI_VIA_HARDWARE_USART)\r
 volatile bool     IsSending;\r
 \r
 #if !defined(PDI_VIA_HARDWARE_USART)\r


@@ -275,40 +275,4 @@ void PDITarget_SendBreak(void)
 #endif\r
 }\r
 \r
 #endif\r
 }\r
 \r

-void PDITarget_SendAddress(uint32_t Address)\r
-{\r
-       PDITarget_SendByte(Address >> 24);\r
-       PDITarget_SendByte(Address >> 26);\r
-       PDITarget_SendByte(Address >> 8);\r
-       PDITarget_SendByte(Address &  0xFF);\r
-}\r
-\r
-bool PDITarget_WaitWhileNVMBusBusy(void)\r
-{\r
-       uint8_t AttemptsRemaining = 255;\r
-\r
-       /* Poll the STATUS register to check to see if NVM access has been enabled */\r
-       while (AttemptsRemaining--)\r
-       {\r
-               PDITarget_SendByte(PDI_CMD_LDCS | PDI_STATUS_REG);\r
-               if (PDITarget_ReceiveByte() & PDI_STATUS_NVM)\r
-                 return true;\r
-       }\r
-       \r
-       return false;\r
-}\r
-\r
-void PDITarget_WaitWhileNVMControllerBusy(void)\r
-{\r
-       /* Poll the NVM STATUS register to check to see if NVM controller is busy */\r
-       for (;;)\r
-       {\r
-               PDITarget_SendByte(PDI_CMD_LDS | (PDI_DATSIZE_1BYTE << 2));\r
-               PDITarget_SendAddress(DATAMEM_BASE | DATAMEM_NVM_STATUS);\r
-               \r
-               if (!(PDITarget_ReceiveByte() & (1 << 7)))\r
-                 return;\r
-       }\r
-}\r
-\r

 #endif\r
 #endif\r