Update UC3 platform driver support to use the bitmasks defined in the header files...
[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / XPROG / TINYNVM.h
index 75d1129..b2b37e9 100644 (file)
@@ -1,73 +1,85 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\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
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
-  software without specific, written prior permission.\r
-\r
-  The author disclaim all warranties with regard to this\r
-  software, including all implied warranties of merchantability\r
-  and fitness.  In no event shall the author be liable for any\r
-  special, indirect or consequential damages or any damages\r
-  whatsoever resulting from loss of use, data or profits, whether\r
-  in an action of contract, negligence or other tortious action,\r
-  arising out of or in connection with the use or performance of\r
-  this software.\r
-*/\r
-\r
-/** \file\r
- *\r
- *  Header file for TINYNVM.c.\r
- */\r
-\r
-#ifndef _TINY_NVM_\r
-#define _TINY_NVM_\r
-\r
-       /* Includes: */\r
-               #include <avr/io.h>\r
-               #include <avr/interrupt.h>\r
-               #include <stdbool.h>\r
-               \r
-               #include <LUFA/Common/Common.h>\r
-               \r
-               #include "XPROGProtocol.h"\r
-               #include "XPROGTarget.h"\r
-       \r
-       /* Preprocessor Checks: */\r
-               #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))\r
-                       #undef ENABLE_ISP_PROTOCOL\r
-                       \r
-                       #if !defined(ENABLE_XPROG_PROTOCOL)\r
-                               #define ENABLE_XPROG_PROTOCOL\r
-                       #endif\r
-               #endif\r
-\r
-       /* Defines: */\r
-               #define TINY_NVM_REG_NVMCSR            0x32\r
-               #define TINY_NVM_REG_NVMCMD            0x33\r
-\r
-               #define TINY_NVM_CMD_NOOP              0x00\r
-               #define TINY_NVM_CMD_CHIPERASE         0x10\r
-               #define TINY_NVM_CMD_SECTIONERASE      0x14\r
-               #define TINY_NVM_CMD_WORDWRITE         0x1D\r
-\r
-       /* Function Prototypes: */\r
-               bool TINYNVM_WaitWhileNVMBusBusy(void);\r
-               bool TINYNVM_ReadMemory(const uint32_t ReadAddress, uint8_t* ReadBuffer, const uint16_t ReadSize);\r
-               bool TINYNVM_WriteMemory(const uint8_t WriteCommand, const uint32_t WriteAddress, const uint8_t* WriteBuffer);\r
-               bool TINYNVM_EraseMemory(const uint8_t EraseCommand, const uint32_t Address);\r
-\r
-#endif\r
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+
+  Permission to use, copy, modify, distribute, and sell this
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  Header file for TINYNVM.c.
+ */
+
+#ifndef _TINY_NVM_
+#define _TINY_NVM_
+
+       /* Includes: */
+               #include <avr/io.h>
+               #include <avr/interrupt.h>
+               #include <stdbool.h>
+
+               #include <LUFA/Common/Common.h>
+
+               #include "XPROGProtocol.h"
+               #include "XPROGTarget.h"
+
+       /* Preprocessor Checks: */
+               #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
+                       #undef ENABLE_ISP_PROTOCOL
+
+                       #if !defined(ENABLE_XPROG_PROTOCOL)
+                               #define ENABLE_XPROG_PROTOCOL
+                       #endif
+               #endif
+
+       /* Defines: */
+               #define TINY_NVM_CMD_NOOP              0x00
+               #define TINY_NVM_CMD_CHIPERASE         0x10
+               #define TINY_NVM_CMD_SECTIONERASE      0x14
+               #define TINY_NVM_CMD_WORDWRITE         0x1D
+
+       /* Function Prototypes: */
+               bool TINYNVM_WaitWhileNVMBusBusy(void);
+               bool TINYNVM_WaitWhileNVMControllerBusy(void);
+               bool TINYNVM_EnableTPI(void);
+               void TINYNVM_DisableTPI(void);
+               bool TINYNVM_ReadMemory(const uint16_t ReadAddress,
+                                       uint8_t* ReadBuffer,
+                                       uint16_t ReadLength);
+               bool TINYNVM_WriteMemory(const uint16_t WriteAddress,
+                                        uint8_t* WriteBuffer,
+                                        uint16_t WriteLength);
+               bool TINYNVM_EraseMemory(const uint8_t EraseCommand,
+                                        const uint16_t Address);
+
+               #if (defined(INCLUDE_FROM_TINYNVM_C) && defined(ENABLE_XPROG_PROTOCOL))
+                       static void TINYNVM_SendReadNVMRegister(const uint8_t Address);
+                       static void TINYNVM_SendWriteNVMRegister(const uint8_t Address);
+                       static void TINYNVM_SendPointerAddress(const uint16_t AbsoluteAddress);
+               #endif
+
+#endif
+