Update Studio Integration DLL, to include package logging.

[pub/USBasp.git] / Bootloaders / CDC / BootloaderAPI.c

diff --git a/Bootloaders/CDC/BootloaderAPI.c b/Bootloaders/CDC/BootloaderAPI.c
index 0c98509..7dd7530 100644 (file)
--- a/Bootloaders/CDC/BootloaderAPI.c
+++ b/Bootloaders/CDC/BootloaderAPI.c
@@ -1,74 +1,75 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2011.\r
-\r
-  dean [at] fourwalledcubicle [dot] com\r
-           www.lufa-lib.org\r
-*/\r
-\r
-/*\r
-  Copyright 2011  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
-  without fee, provided that the above copyright notice appear in\r
-  all 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
- *  Bootloader user application API functions.\r
- */\r
-\r
-#include "BootloaderAPI.h"\r
-\r
-void BootloaderAPI_ErasePage(uint32_t Address)\r
-{\r
-       boot_page_erase_safe(Address);\r
-       boot_rww_enable();\r
-}\r
-\r
-void BootloaderAPI_WritePage(uint32_t Address)\r
-{\r
-       boot_page_write_safe(Address);\r
-       boot_rww_enable();\r
-}\r
-\r
-void BootloaderAPI_FillWord(uint32_t Address, uint16_t Word)\r
-{\r
-       boot_page_fill_safe(Address, Word);\r
-}\r
-\r
-uint8_t BootloaderAPI_ReadSignature(uint16_t Address)\r
-{\r
-       return boot_signature_byte_get(Address);\r
-}\r
-\r
-uint8_t BootloaderAPI_ReadFuse(uint16_t Address)\r
-{\r
-       return boot_lock_fuse_bits_get(Address);\r
-}\r
-\r
-uint8_t BootloaderAPI_ReadLock(void)\r
-{\r
-       return boot_lock_fuse_bits_get(GET_LOCK_BITS);\r
-}\r
-\r
-void BootloaderAPI_WriteLock(uint8_t LockBits)\r
-{\r
-       boot_lock_bits_set_safe(LockBits);\r
-}\r
-\r
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2015.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2015  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 disclaims 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
+ *
+ *  Bootloader user application API functions.
+ */
+
+#include "BootloaderAPI.h"
+
+void BootloaderAPI_ErasePage(const uint32_t Address)
+{
+       boot_page_erase_safe(Address);
+       boot_spm_busy_wait();
+       boot_rww_enable();
+}
+
+void BootloaderAPI_WritePage(const uint32_t Address)
+{
+       boot_page_write_safe(Address);
+       boot_spm_busy_wait();
+       boot_rww_enable();
+}
+
+void BootloaderAPI_FillWord(const uint32_t Address, const uint16_t Word)
+{
+       boot_page_fill_safe(Address, Word);
+}
+
+uint8_t BootloaderAPI_ReadSignature(const uint16_t Address)
+{
+       return boot_signature_byte_get(Address);
+}
+
+uint8_t BootloaderAPI_ReadFuse(const uint16_t Address)
+{
+       return boot_lock_fuse_bits_get(Address);
+}
+
+uint8_t BootloaderAPI_ReadLock(void)
+{
+       return boot_lock_fuse_bits_get(GET_LOCK_BITS);
+}
+
+void BootloaderAPI_WriteLock(const uint8_t LockBits)
+{
+       boot_lock_bits_set_safe(LockBits);
+}