Ooops - TeensyHID bootloader makefile should use a 16MHz FCPU, not 8MHz.

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

diff --git a/Projects/AVRISP/Lib/NVMTarget.c b/Projects/AVRISP/Lib/NVMTarget.c
index 9402b2b..adf213b 100644 (file)
--- a/Projects/AVRISP/Lib/NVMTarget.c
+++ b/Projects/AVRISP/Lib/NVMTarget.c
@@ -42,23 +42,20 @@
  *\r
  *  \param[in] Register  NVM register whose absolute address is to be sent\r
  */\r
-void NVMTarget_SendNVMRegAddress(uint8_t Register)\r
+void NVMTarget_SendNVMRegAddress(const uint8_t Register)\r
 {\r
        /* Determine the absolute register address from the NVM base memory address and the NVM register address */\r
        uint32_t Address = XPROG_Param_NVMBase | Register;\r
 \r
        /* Send the calculated 32-bit address to the target, LSB first */\r
-       PDITarget_SendByte(Address &  0xFF);\r
-       PDITarget_SendByte(Address >> 8);\r
-       PDITarget_SendByte(Address >> 16);\r
-       PDITarget_SendByte(Address >> 24);\r
+       NVMTarget_SendAddress(Address);\r
 }\r
 \r
 /** Sends the given 32-bit absolute address to the target.\r
  *\r
  *  \param[in] AbsoluteAddress  Absolute address to send to the target\r
  */\r
-void NVMTarget_SendAddress(uint32_t AbsoluteAddress)\r
+void NVMTarget_SendAddress(const uint32_t AbsoluteAddress)\r
 {\r
        /* Send the given 32-bit address to the target, LSB first */\r
        PDITarget_SendByte(AbsoluteAddress &  0xFF);\r
@@ -75,9 +72,12 @@ void NVMTarget_SendAddress(uint32_t AbsoluteAddress)
 bool NVMTarget_WaitWhileNVMControllerBusy(void)\r
 {\r
        TCNT0 = 0;\r
-\r
+       TIFR0 = (1 << OCF1A);\r
+                       \r
+       uint8_t TimeoutMS = PDI_NVM_TIMEOUT_MS;\r
+       \r
        /* Poll the NVM STATUS register while the NVM controller is busy */\r
-       while (TCNT0 < NVM_BUSY_TIMEOUT_MS)\r
+       while (TimeoutMS)\r
        {\r
                /* Send a LDS command to read the NVM STATUS register to check the BUSY flag */\r
                PDITarget_SendByte(PDI_CMD_LDS | (PDI_DATSIZE_4BYTES << 2));\r
@@ -86,6 +86,12 @@ bool NVMTarget_WaitWhileNVMControllerBusy(void)
                /* Check to see if the BUSY flag is still set */\r
                if (!(PDITarget_ReceiveByte() & (1 << 7)))\r
                  return true;\r
+\r
+               if (TIFR0 & (1 << OCF1A))\r
+               {\r
+                       TIFR0 = (1 << OCF1A);\r
+                       TimeoutMS--;\r
+               }\r
        }\r
        \r
        return false;\r
@@ -98,7 +104,7 @@ bool NVMTarget_WaitWhileNVMControllerBusy(void)
  *\r
  *  \return Boolean true if the command sequence complete successfully\r
  */\r
-bool NVMTarget_GetMemoryCRC(uint8_t CRCCommand, uint32_t* CRCDest)\r
+bool NVMTarget_GetMemoryCRC(const uint8_t CRCCommand, uint32_t* const CRCDest)\r
 {\r
        /* Wait until the NVM controller is no longer busy */\r
        if (!(NVMTarget_WaitWhileNVMControllerBusy()))\r
@@ -150,7 +156,7 @@ bool NVMTarget_GetMemoryCRC(uint8_t CRCCommand, uint32_t* CRCDest)
  *\r
  *  \return Boolean true if the command sequence complete successfully\r
  */\r
-bool NVMTarget_ReadMemory(uint32_t ReadAddress, uint8_t* ReadBuffer, uint16_t ReadSize)\r
+bool NVMTarget_ReadMemory(const uint32_t ReadAddress, uint8_t* ReadBuffer, const uint16_t ReadSize)\r
 {\r
        /* Wait until the NVM controller is no longer busy */\r
        if (!(NVMTarget_WaitWhileNVMControllerBusy()))\r
@@ -182,11 +188,10 @@ bool NVMTarget_ReadMemory(uint32_t ReadAddress, uint8_t* ReadBuffer, uint16_t Re
  *  \param[in]  WriteCommand  Command to send to the device to write each memory byte\r
  *  \param[in]  WriteAddress  Start address to write to within the target's address space\r
  *  \param[in]  WriteBuffer   Buffer to source data from\r
- *  \param[in]  WriteSize     Number of bytes to write\r
  *\r
  *  \return Boolean true if the command sequence complete successfully\r
  */\r
-bool NVMTarget_WriteByteMemory(uint8_t WriteCommand, uint32_t WriteAddress, uint8_t* WriteBuffer)\r
+bool NVMTarget_WriteByteMemory(const uint8_t WriteCommand, const uint32_t WriteAddress, const uint8_t* WriteBuffer)\r
 {\r
        /* Wait until the NVM controller is no longer busy */\r
        if (!(NVMTarget_WaitWhileNVMControllerBusy()))\r
@@ -199,7 +204,7 @@ bool NVMTarget_WriteByteMemory(uint8_t WriteCommand, uint32_t WriteAddress, uint
        \r
        /* Send new memory byte to the memory to the target */\r
        PDITarget_SendByte(PDI_CMD_STS | (PDI_DATSIZE_4BYTES << 2));\r
-       NVMTarget_SendAddress(WriteAddress++);\r
+       NVMTarget_SendAddress(WriteAddress);\r
        PDITarget_SendByte(*(WriteBuffer++));\r
        \r
        return true;\r
@@ -217,8 +222,9 @@ bool NVMTarget_WriteByteMemory(uint8_t WriteCommand, uint32_t WriteAddress, uint
  *\r
  *  \return Boolean true if the command sequence complete successfully\r
  */\r
-bool NVMTarget_WritePageMemory(uint8_t WriteBuffCommand, uint8_t EraseBuffCommand, uint8_t WritePageCommand,\r
-                               uint8_t PageMode, uint32_t WriteAddress, uint8_t* WriteBuffer, uint16_t WriteSize)\r
+bool NVMTarget_WritePageMemory(const uint8_t WriteBuffCommand, const uint8_t EraseBuffCommand,\r
+                               const uint8_t WritePageCommand, const uint8_t PageMode, const uint32_t WriteAddress,\r
+                               const uint8_t* WriteBuffer, const uint16_t WriteSize)\r
 {\r
        if (PageMode & XPRG_PAGEMODE_ERASE)\r
        {\r
@@ -289,7 +295,7 @@ bool NVMTarget_WritePageMemory(uint8_t WriteBuffCommand, uint8_t EraseBuffComman
  *\r
  *  \return Boolean true if the command sequence complete successfully\r
  */\r
-bool NVMTarget_EraseMemory(uint8_t EraseCommand, uint32_t Address)\r
+bool NVMTarget_EraseMemory(const uint8_t EraseCommand, const uint32_t Address)\r
 {\r
        /* Wait until the NVM controller is no longer busy */\r
        if (!(NVMTarget_WaitWhileNVMControllerBusy()))\r