Build: Fix incorrect build target for Ubuntu CI builds.

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

diff --git a/Bootloaders/CDC/BootloaderAPI.c b/Bootloaders/CDC/BootloaderAPI.c
index 8f381b9..21d13bb 100644 (file)
--- a/Bootloaders/CDC/BootloaderAPI.c
+++ b/Bootloaders/CDC/BootloaderAPI.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2019.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2019  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
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  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
   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


@@ -35,29 +35,52 @@
 
 #include "BootloaderAPI.h"
 
 
 #include "BootloaderAPI.h"
 

-void BootloaderAPI_ErasePage(uint32_t Address)
+static bool IsPageAddressValid(const uint32_t Address)

 {
 {

-       boot_page_erase_safe(Address);
-       boot_rww_enable();
+       /* Determine if the given page address is correctly aligned to the
+          start of a flash page. */
+       bool PageAddressIsAligned = !(Address & (SPM_PAGESIZE - 1));
+
+       return (Address < BOOT_START_ADDR) && PageAddressIsAligned;

 }
 
 }
 

-void BootloaderAPI_WritePage(uint32_t Address)
+void BootloaderAPI_ErasePage(const uint32_t Address)

 {
 {

-       boot_page_write_safe(Address);
-       boot_rww_enable();
+       if (! IsPageAddressValid(Address))
+               return;
+
+       ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+       {
+               boot_page_erase_safe(Address);
+               boot_spm_busy_wait();
+               boot_rww_enable();
+       }

 }
 
 }
 

-void BootloaderAPI_FillWord(uint32_t Address, uint16_t Word)
+void BootloaderAPI_WritePage(const uint32_t Address)
+{
+       if (! IsPageAddressValid(Address))
+               return;
+
+       ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+       {
+               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);
 }
 
 {
        boot_page_fill_safe(Address, Word);
 }
 

-uint8_t BootloaderAPI_ReadSignature(uint16_t Address)
+uint8_t BootloaderAPI_ReadSignature(const uint16_t Address)

 {
        return boot_signature_byte_get(Address);
 }
 
 {
        return boot_signature_byte_get(Address);
 }
 

-uint8_t BootloaderAPI_ReadFuse(uint16_t Address)
+uint8_t BootloaderAPI_ReadFuse(const uint16_t Address)

 {
        return boot_lock_fuse_bits_get(Address);
 }
 {
        return boot_lock_fuse_bits_get(Address);
 }


@@ -67,8 +90,10 @@ uint8_t BootloaderAPI_ReadLock(void)
        return boot_lock_fuse_bits_get(GET_LOCK_BITS);
 }
 
        return boot_lock_fuse_bits_get(GET_LOCK_BITS);
 }
 

-void BootloaderAPI_WriteLock(uint8_t LockBits)
+void BootloaderAPI_WriteLock(const uint8_t LockBits)

 {
 {

-       boot_lock_bits_set_safe(LockBits);
+       ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+       {
+               boot_lock_bits_set_safe(LockBits);
+       }

 }
 }

-