Addressing review feedback.

Author: dustin-crossman

targets/TARGET_Cypress/TARGET_PSOC6/common/ext-wifi-fw/cy_ext_wifi_fw_resources.c

@@ -199,8 +199,7 @@ resource_result_t ext_wifi_fw_resource_read(const resource_hnd_t *resource, uint
         *size = (uint32_t)size64;
         wiced_filesystem_file_close (&file_handle);
     }
-#else
-#ifdef USES_RESOURCE_FILESYSTEM
+#elif USES_RESOURCE_FILESYSTEM
     else
     {
         wicedfs_file_t file_hnd;
@@ -224,8 +223,7 @@ resource_result_t ext_wifi_fw_resource_read(const resource_hnd_t *resource, uint
 
         wicedfs_fclose(&file_hnd);
     }
-#endif /* ifdef USES_RESOURCE_FILESYSTEM */
-#endif /* USES_RESOURCE_GENERIC_FILESYSTEM */
+#endif
     return RESOURCE_SUCCESS;
 }
 

targets/TARGET_Cypress/TARGET_PSOC6/common/reserved-region-bd/CyReservedRegionBlockDevice.cpp

@@ -39,7 +39,14 @@ int CyReservedRegionBlockDevice::init()
     {
         // Round up to start usable region on an erase boundary
         // May need to wait until after init() to determine erase size (e.g. QSPI)
-        _reserved_region_end = _reserved_region_size + get_erase_size() - (_reserved_region_size % get_erase_size());
+        if (_reserved_region_size % get_erase_size() != 0)
+        {
+            _reserved_region_end = _reserved_region_size + get_erase_size() - (_reserved_region_size % get_erase_size());
+        }
+        else
+        {
+            _reserved_region_end = _reserved_region_size;
+        }
     }
     return status;
 }