Move critical section out of Storage::writeResource()

Author: pingdynasty

Source/MidiHandler.cpp

@@ -16,6 +16,7 @@
 #include "Storage.h"
 #ifndef USE_BOOTLOADER_MODE
 #include "BootloaderStorage.h"
+#include "cmsis_os.h"
 #endif
 #ifdef USE_DIGITALBUS
 #include "bus.h"
@@ -275,7 +276,13 @@ void MidiHandler::handleSettingsResetCommand(uint8_t* data, uint16_t size){
 }
 
 void MidiHandler::handleSettingsStoreCommand(uint8_t* data, uint16_t size){
+#ifndef USE_BOOTLOADER_MODE
+  UBaseType_t uxSavedInterruptStatus = taskENTER_CRITICAL_FROM_ISR();
+#endif
   settings.saveToFlash();
+#ifndef USE_BOOTLOADER_MODE
+  taskEXIT_CRITICAL_FROM_ISR(uxSavedInterruptStatus);
+#endif
 }
 
 void MidiHandler::handleFirmwareUploadCommand(uint8_t* data, uint16_t size){

Source/ProgramManager.cpp

@@ -467,8 +467,10 @@ void programFlashTask(void* p){
     }
   }else{
     ResourceHeader* header = (ResourceHeader*)flashAddressToWrite;
+    taskENTER_CRITICAL();
     storage.writeResource(header);
     registry.init();
+    taskEXIT_CRITICAL();
     if(index == 0){
       onResourceUpdate();
     }else{

Source/Storage.cpp

@@ -381,9 +381,6 @@ size_t Storage::writeResource(ResourceHeader* header){
     error(FLASH_ERROR, "No free resources");
     return 0;
   }
-#ifndef USE_BOOTLOADER_MODE
-  taskENTER_CRITICAL();
-#endif
   int status = -1;
   if(dest->isMemoryMapped()){
 #ifdef USE_FLASH
@@ -402,9 +399,6 @@ size_t Storage::writeResource(ResourceHeader* header){
       error(FLASH_ERROR, "Readback failed");
 #endif
   }
-#ifndef USE_BOOTLOADER_MODE
-  taskEXIT_CRITICAL();
-#endif
   if(status){
     error(FLASH_ERROR, "Write failed");
   }else if(dest->getTotalSize() < length){ // allow for storage-specific alignment