Improvements on BlockStorage declarations (#44)

nanoframework · Jun 6, 2018 · d228cce · d228cce
1 parent eaaeff7
commit d228cce
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 40 deletions.
diff --git a/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/common/Device_BlockStorage.c b/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/common/Device_BlockStorage.c
@@ -53,14 +53,9 @@ const BlockRegionInfo BlockRegions[] =
 
 const DeviceBlockInfo Device_BlockInfo =
 {
-    {  
-        false,              // BOOL Removable;
-        true,               // BOOL SupportsXIP;
-        false,              // BOOL WriteProtected;
-        false               // BOOL SupportsCopyBack
-    },
+    (MediaAttribute_SupportsXIP),
     ARRAYSIZE_CONST_EXPR(BlockRegions),     // UINT32 NumRegions;
-    BlockRegions,                           // const BlockRegionInfo* pRegions;
+    (BlockRegionInfo*)BlockRegions,         // const BlockRegionInfo* pRegions;
 };
 
 MEMORY_MAPPED_NOR_BLOCK_CONFIG Device_BlockStorageConfig =
@@ -71,7 +66,7 @@ MEMORY_MAPPED_NOR_BLOCK_CONFIG Device_BlockStorageConfig =
             false,      // BOOL                 ActiveState;
         },
 
-        &Device_BlockInfo,             // BlockDeviceinfo
+        (DeviceBlockInfo*)&Device_BlockInfo,    // BlockDeviceinfo
     },
 
     { // CPU_MEMORY_CONFIG

diff --git a/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/common/Device_BlockStorage.c b/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/common/Device_BlockStorage.c
@@ -53,14 +53,9 @@ const BlockRegionInfo BlockRegions[] =
 
 const DeviceBlockInfo Device_BlockInfo =
 {
-    {  
-        false,              // BOOL Removable;
-        true,               // BOOL SupportsXIP;
-        false,              // BOOL WriteProtected;
-        false               // BOOL SupportsCopyBack
-    },
+    (MediaAttribute_SupportsXIP),
     ARRAYSIZE_CONST_EXPR(BlockRegions),     // UINT32 NumRegions;
-    BlockRegions,                           // const BlockRegionInfo* pRegions;
+    (BlockRegionInfo*)BlockRegions,         // const BlockRegionInfo* pRegions;
 };
 
 MEMORY_MAPPED_NOR_BLOCK_CONFIG Device_BlockStorageConfig =
@@ -71,7 +66,7 @@ MEMORY_MAPPED_NOR_BLOCK_CONFIG Device_BlockStorageConfig =
             false,      // BOOL                 ActiveState;
         },
 
-        &Device_BlockInfo,             // BlockDeviceinfo
+        (DeviceBlockInfo*)&Device_BlockInfo,    // BlockDeviceinfo
     },
 
     { // CPU_MEMORY_CONFIG

diff --git a/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/common/Device_BlockStorage.c b/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/common/Device_BlockStorage.c
@@ -53,14 +53,9 @@ const BlockRegionInfo BlockRegions[] =
 
 const DeviceBlockInfo Device_BlockInfo =
 {
-    {  
-        false,              // BOOL Removable;
-        true,               // BOOL SupportsXIP;
-        false,              // BOOL WriteProtected;
-        false               // BOOL SupportsCopyBack
-    },
+    (MediaAttribute_SupportsXIP),
     ARRAYSIZE_CONST_EXPR(BlockRegions),     // UINT32 NumRegions;
-    BlockRegions,                           // const BlockRegionInfo* pRegions;
+    (BlockRegionInfo*)BlockRegions,         // const BlockRegionInfo* pRegions;
 };
 
 MEMORY_MAPPED_NOR_BLOCK_CONFIG Device_BlockStorageConfig =
@@ -71,7 +66,7 @@ MEMORY_MAPPED_NOR_BLOCK_CONFIG Device_BlockStorageConfig =
             false,      // BOOL                 ActiveState;
         },
 
-        &Device_BlockInfo,             // BlockDeviceinfo
+        (DeviceBlockInfo*)&Device_BlockInfo,    // BlockDeviceinfo
     },
 
     { // CPU_MEMORY_CONFIG

diff --git a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/common/Device_BlockStorage.c b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/common/Device_BlockStorage.c
@@ -53,14 +53,9 @@ const BlockRegionInfo BlockRegions[] =
 
 const DeviceBlockInfo Device_BlockInfo =
 {
-    {  
-        false,              // BOOL Removable;
-        true,               // BOOL SupportsXIP;
-        false,              // BOOL WriteProtected;
-        false               // BOOL SupportsCopyBack
-    },
+    (MediaAttribute_SupportsXIP),
     ARRAYSIZE_CONST_EXPR(BlockRegions),     // UINT32 NumRegions;
-    BlockRegions,                           // const BlockRegionInfo* pRegions;
+    (BlockRegionInfo*)BlockRegions,         // const BlockRegionInfo* pRegions;
 };
 
 MEMORY_MAPPED_NOR_BLOCK_CONFIG Device_BlockStorageConfig =
@@ -71,7 +66,7 @@ MEMORY_MAPPED_NOR_BLOCK_CONFIG Device_BlockStorageConfig =
             false,      // BOOL                 ActiveState;
         },
 
-        &Device_BlockInfo,             // BlockDeviceinfo
+        (DeviceBlockInfo*)&Device_BlockInfo,    // BlockDeviceinfo
     },
 
     { // CPU_MEMORY_CONFIG

diff --git a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/common/Device_BlockStorage.c b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/common/Device_BlockStorage.c
@@ -53,14 +53,9 @@ const BlockRegionInfo BlockRegions[] =
 
 const DeviceBlockInfo Device_BlockInfo =
 {
-    {  
-        false,              // BOOL Removable;
-        true,               // BOOL SupportsXIP;
-        false,              // BOOL WriteProtected;
-        false               // BOOL SupportsCopyBack
-    },
+    (MediaAttribute_SupportsXIP),
     ARRAYSIZE_CONST_EXPR(BlockRegions),     // UINT32 NumRegions;
-    BlockRegions,                           // const BlockRegionInfo* pRegions;
+    (BlockRegionInfo*)BlockRegions,         // const BlockRegionInfo* pRegions;
 };
 
 MEMORY_MAPPED_NOR_BLOCK_CONFIG Device_BlockStorageConfig =
@@ -71,7 +66,7 @@ MEMORY_MAPPED_NOR_BLOCK_CONFIG Device_BlockStorageConfig =
             false,      // BOOL                 ActiveState;
         },
 
-        &Device_BlockInfo,             // BlockDeviceinfo
+        (DeviceBlockInfo*)&Device_BlockInfo,    // BlockDeviceinfo
     },
 
     { // CPU_MEMORY_CONFIG