Fix HID report parser incorrectly decoding 32-bit USAGE elements.

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

diff --git a/Bootloaders/Printer/BootloaderAPI.c b/Bootloaders/Printer/BootloaderAPI.c
index 7dd7530..c1e76d3 100644 (file)
--- a/Bootloaders/Printer/BootloaderAPI.c
+++ b/Bootloaders/Printer/BootloaderAPI.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2015.
+     Copyright (C) Dean Camera, 2018.

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

-  Copyright 2015  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2018  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


@@ -35,18 +35,39 @@
 
 #include "BootloaderAPI.h"
 
 
 #include "BootloaderAPI.h"
 

+static bool IsPageAddressValid(const uint32_t Address)
+{
+       /* 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_ErasePage(const uint32_t Address)
 {
 void BootloaderAPI_ErasePage(const uint32_t Address)
 {

-       boot_page_erase_safe(Address);
-       boot_spm_busy_wait();
-       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_WritePage(const uint32_t Address)
 {
 }
 
 void BootloaderAPI_WritePage(const uint32_t Address)
 {

-       boot_page_write_safe(Address);
-       boot_spm_busy_wait();
-       boot_rww_enable();
+       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)
 }
 
 void BootloaderAPI_FillWord(const uint32_t Address, const uint16_t Word)


@@ -71,5 +92,8 @@ uint8_t BootloaderAPI_ReadLock(void)
 
 void BootloaderAPI_WriteLock(const 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);
+       }

 }
 }