Work on config block (#904)

nanoframework · Oct 9, 2018 · 9f8e66f · 9f8e66f
1 parent 18b4abc
commit 9f8e66f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 23 deletions.
diff --git a/CMake/ChibiOS_target_os.h.in b/CMake/ChibiOS_target_os.h.in
@@ -23,6 +23,6 @@
 
 #define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
 
-#define HAS_CONFIG_BLOCK @NF_FEATURE_HAS_CONFIG_BLOCK@
+#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
 
 #endif /* _TARGET_OS_H_ */
diff --git a/CMake/ESP32_target_os.h.in b/CMake/ESP32_target_os.h.in
@@ -20,6 +20,6 @@
 
 #define SUPPORT_ANY_BASE_CONVERSION @TARGET_SUPPORT_ANY_BASE_CONVERSION@
 
-#define HAS_CONFIG_BLOCK @NF_FEATURE_HAS_CONFIG_BLOCK@
+#define HAS_CONFIG_BLOCK @TARGET_HAS_CONFIG_BLOCK@
 
 #endif /* _TARGET_OS_H_ */
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -311,8 +311,10 @@ endif()
 option(NF_FEATURE_HAS_CONFIG_BLOCK "option to enable configuration block storage")
 
 if(NF_FEATURE_HAS_CONFIG_BLOCK)
+    set(TARGET_HAS_CONFIG_BLOCK TRUE CACHE INTERNAL "Option for config block")
     message(STATUS "Configuration block storage is included")
 else()
+    set(TARGET_HAS_CONFIG_BLOCK FALSE CACHE INTERNAL "Option for config block")
     message(STATUS "Configuration block storage IS NOT included")
 endif()
 

diff --git a/src/HAL/Include/nanoHAL_ConfigurationManager.h b/src/HAL/Include/nanoHAL_ConfigurationManager.h
@@ -92,7 +92,8 @@ bool ConfigurationManager_UpdateConfigurationBlock(void* configurationBlock, Dev
 void InitialiseWirelessDefaultConfig(HAL_Configuration_Wireless80211 * pconfig, uint32_t configurationIndex);
 
 //  Default initialisation for Network interface config blocks
-void InitialiseNetworkDefaultConfig(HAL_Configuration_NetworkInterface * pconfig, uint32_t configurationIndex);
+// returns FALSE if it's not possible to create a default config block
+bool InitialiseNetworkDefaultConfig(HAL_Configuration_NetworkInterface * pconfig, uint32_t configurationIndex);
 
 // helper functions
 

diff --git a/targets/CMSIS-OS/ChibiOS/common/targetHAL_ConfigurationManager.cpp b/targets/CMSIS-OS/ChibiOS/common/targetHAL_ConfigurationManager.cpp
@@ -67,7 +67,10 @@ __nfweak bool ConfigurationManager_GetConfigurationBlock(void* configurationBloc
         if(g_TargetConfiguration.NetworkInterfaceConfigs->Count == 0)
         {
             // there is no network config block, init one with default settings
-            InitialiseNetworkDefaultConfig(NULL, 0);
+            if(!InitialiseNetworkDefaultConfig(NULL, 0))
+            {
+                return FALSE;
+            }
         }
         else
         {
@@ -116,10 +119,11 @@ __nfweak bool ConfigurationManager_StoreConfigurationBlock(void* configurationBl
 
     if(configuration == DeviceConfigurationOption_Network)
     {
-        if(g_TargetConfiguration.NetworkInterfaceConfigs->Count == 0 ||
+        if( g_TargetConfiguration.NetworkInterfaceConfigs->Count == 0 ||
             (configurationIndex + 1) > g_TargetConfiguration.NetworkInterfaceConfigs->Count)
         {
-            // there is no room for this block, fail the operation
+            // there is no room for this block, or there are no blocks stored at all
+            // failing the operation
             return FALSE;
         }
 
@@ -136,10 +140,11 @@ __nfweak bool ConfigurationManager_StoreConfigurationBlock(void* configurationBl
     }
     else if(configuration == DeviceConfigurationOption_Wireless80211Network)
     {
-        if(g_TargetConfiguration.Wireless80211Configs->Count == 0 ||
+        if( g_TargetConfiguration.Wireless80211Configs->Count == 0 ||
             (configurationIndex + 1) > g_TargetConfiguration.Wireless80211Configs->Count)
         {
-            // there is no room for this block, fail the operation
+            // there is no room for this block, or there are no blocks stored at all
+            // failing the operation
             return FALSE;
         }
 
@@ -281,22 +286,11 @@ __nfweak void InitialiseWirelessDefaultConfig(HAL_Configuration_Wireless80211 *
 
 //  Default initialisation for Network interface config blocks
 // it's implemented with 'weak' attribute so it can be replaced at target level if different configurations are intended
-__nfweak void InitialiseNetworkDefaultConfig(HAL_Configuration_NetworkInterface * pconfig, uint32_t configurationIndex)
+__nfweak bool InitialiseNetworkDefaultConfig(HAL_Configuration_NetworkInterface * pconfig, uint32_t configurationIndex)
 {
     (void)pconfig;
     (void)configurationIndex;
 
-    HAL_Configuration_NetworkInterface config;
-
-    config.InterfaceType = NetworkInterfaceType_Ethernet;
-
-    // defaults to DHCP and DNS from DHCP
-    config.StartupAddressMode = AddressMode_DHCP;
-    config.AutomaticDNS = TRUE;
-
-    // store this to the 0 index block
-    ConfigurationManager_StoreConfigurationBlock(&config, DeviceConfigurationOption_Network, 0, 0);
-
-    // need to update the block count
-    g_TargetConfiguration.NetworkInterfaceConfigs->Count = 1;
+    // can't create a "default" network config because we are lacking definition of a MAC address
+    return FALSE;
 }
diff --git a/targets/FreeRTOS/ESP32_DevKitC/nanoCLR/targetHAL_ConfigurationManager.cpp b/targets/FreeRTOS/ESP32_DevKitC/nanoCLR/targetHAL_ConfigurationManager.cpp
@@ -144,7 +144,7 @@ void InitialiseWirelessDefaultConfig(HAL_Configuration_Wireless80211 * pconfig,
 }
 
 //  Default initialisation of Network interface config blocks for ESP32 targets
-void InitialiseNetworkDefaultConfig(HAL_Configuration_NetworkInterface * pconfig, uint32_t configurationIndex)
+bool InitialiseNetworkDefaultConfig(HAL_Configuration_NetworkInterface * pconfig, uint32_t configurationIndex)
 {
     memset( pconfig, 0, sizeof(HAL_Configuration_NetworkInterface));
 
@@ -171,6 +171,9 @@ void InitialiseNetworkDefaultConfig(HAL_Configuration_NetworkInterface * pconfig
             pconfig->StartupAddressMode = AddressMode_DHCP;
             break;
     }
+
+    // always good
+    return TRUE;
 }
 
 // Gets a configuration block from the configuration block stored in the NVS block, 
@@ -239,6 +242,7 @@ bool ConfigurationManager_GetConfigurationBlock(void* configurationBlock, Device
                 }
                 else if ( configuration == DeviceConfigurationOption_Network )
                 {
+                    // OK to skip checking return value
                     InitialiseNetworkDefaultConfig((HAL_Configuration_NetworkInterface *)configurationBlock,configurationIndex);
                     storeConfig = true;
                 }