Use _delay_us() function in the XPROGTarget.c file to ensure timing requirements...

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

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h
index e7d8dad..546e5ab 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h
@@ -1,13 +1,13 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r

 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r
 \r
   Permission to use, copy, modify, distribute, and sell this \r
   software and its documentation for any purpose is hereby granted\r


@@ -61,11 +61,16 @@
                #define TINY_NVM_CMD_SECTIONERASE      0x14\r
                #define TINY_NVM_CMD_WORDWRITE         0x1D\r
 \r
                #define TINY_NVM_CMD_SECTIONERASE      0x14\r
                #define TINY_NVM_CMD_WORDWRITE         0x1D\r
 \r

-       /* Function Prototypes: */\r
-               void TINYNVM_SendPointerAddress(const uint16_t AbsoluteAddress);\r
+       /* Function Prototypes: */              \r

                bool TINYNVM_WaitWhileNVMBusBusy(void);\r
                bool TINYNVM_WaitWhileNVMBusBusy(void);\r

-               bool TINYNVM_ReadMemory(const uint32_t ReadAddress, uint8_t* ReadBuffer, uint16_t ReadLength);\r
-               bool TINYNVM_WriteMemory(const uint32_t WriteAddress, const uint8_t* WriteBuffer, uint16_t WriteLength);\r
+               bool TINYNVM_ReadMemory(const uint16_t ReadAddress, uint8_t* ReadBuffer, uint16_t ReadLength);\r
+               bool TINYNVM_WriteMemory(const uint16_t WriteAddress, const uint8_t* WriteBuffer, uint16_t WriteLength);\r

                bool TINYNVM_EraseMemory(void);\r
 \r
                bool TINYNVM_EraseMemory(void);\r
 \r

+               #if defined(INCLUDE_FROM_TINYNVM_C)\r
+                       static void TINYNVM_SendReadNVMRegister(uint8_t Address);\r
+                       static void TINYNVM_SendWriteNVMRegister(uint8_t Address);\r
+                       static void TINYNVM_SendPointerAddress(const uint16_t AbsoluteAddress);\r
+               #endif\r
+\r

 #endif\r
 #endif\r