Improvements in power mode API (#2567)

josesimoes · web-flow · commit 034e1a18cd38 · 2023-02-15T12:05:36.000Z
***NO_CI***
diff --git a/src/CLR/Startup/CLRStartup.cpp b/src/CLR/Startup/CLRStartup.cpp
@@ -444,7 +444,7 @@ void ClrStartup(CLR_SETTINGS params)
 
                 s_ClrSettings.Cleanup();
 
-                nanoHAL_Uninitialize();
+                nanoHAL_Uninitialize(false);
 
                 // re-init the hal for the reboot (initially it is called in bootentry)
                 nanoHAL_Initialize();
diff --git a/src/HAL/Include/nanoHAL.h b/src/HAL/Include/nanoHAL.h
@@ -800,7 +800,7 @@ template <typename T> class HAL_RingBuffer
 // hal cleanup for CLR reboot
 
 void nanoHAL_Initialize();
-void nanoHAL_Uninitialize();
+void nanoHAL_Uninitialize(bool isPoweringDown);
 
 typedef void (*ON_SOFT_REBOOT_HANDLER)(void);
 
diff --git a/src/HAL/Include/nanoHAL_v2.h b/src/HAL/Include/nanoHAL_v2.h
@@ -201,7 +201,7 @@ extern "C"
 #endif
 
     void nanoHAL_Initialize_C();
-    void nanoHAL_Uninitialize_C();
+    void nanoHAL_Uninitialize_C(bool isPoweringDown);
     void HeapLocation_C(unsigned char **baseAddress, unsigned int *sizeInBytes);
 
     // Call to the external memory configuration and initialization function
@@ -220,6 +220,10 @@ extern "C"
     void CPU_Reset();
     void CPU_Sleep(SLEEP_LEVEL_type level, uint64_t wakeEvents);
     void CPU_SetPowerMode(PowerLevel_type powerLevel);
+    // platform specific handler for power mode changes (may be empty)
+    void CPU_SetPowerModePlatform(PowerLevel_type powerLevel);
+    // target specific handler for power mode changes (may be empty)
+    void CPU_SetPowerModeTarget(PowerLevel_type powerLevel);
 
 #ifdef __cplusplus
 }
diff --git a/targets/AzureRTOS/Maxim/_nanoCLR/targetHAL.cpp b/targets/AzureRTOS/Maxim/_nanoCLR/targetHAL.cpp
@@ -40,9 +40,9 @@ extern "C"
         nanoHAL_Initialize();
     }
 
-    void nanoHAL_Uninitialize_C()
+    void nanoHAL_Uninitialize_C(bool isPoweringDown)
     {
-        nanoHAL_Uninitialize();
+        nanoHAL_Uninitialize(isPoweringDown);
     }
 }
 
@@ -161,8 +161,10 @@ void nanoHAL_Initialize()
     Network_Initialize();
 }
 
-void nanoHAL_Uninitialize()
+void nanoHAL_Uninitialize(bool isPoweringDown)
 {
+    (void)isPoweringDown;
+
     // release the global mutex, just in case it's locked somewhere
     // chMtxUnlock(&interpreterGlobalMutex);
 
diff --git a/targets/AzureRTOS/Maxim/_nanoCLR/targetHAL_Power.c b/targets/AzureRTOS/Maxim/_nanoCLR/targetHAL_Power.c
@@ -46,7 +46,7 @@ void CPU_SetPowerMode(PowerLevel_type powerLevel)
             // wdgStop(&WDGD1);
 
             // gracefully shutdown everything
-            nanoHAL_Uninitialize_C();
+            nanoHAL_Uninitialize_C(true);
 
             // chSysDisable();
             // disable interrupts
diff --git a/targets/AzureRTOS/ST/_nanoCLR/targetHAL.cpp b/targets/AzureRTOS/ST/_nanoCLR/targetHAL.cpp
@@ -38,9 +38,9 @@ extern "C"
         nanoHAL_Initialize();
     }
 
-    void nanoHAL_Uninitialize_C()
+    void nanoHAL_Uninitialize_C(bool isPoweringDown)
     {
-        nanoHAL_Uninitialize();
+        nanoHAL_Uninitialize(isPoweringDown);
     }
 }
 
@@ -157,8 +157,10 @@ void nanoHAL_Initialize()
     Network_Initialize();
 }
 
-void nanoHAL_Uninitialize()
+void nanoHAL_Uninitialize(bool isPoweringDown)
 {
+    (void)isPoweringDown;
+
     // release the global mutex, just in case it's locked somewhere
     // chMtxUnlock(&interpreterGlobalMutex);
 
diff --git a/targets/AzureRTOS/ST/_nanoCLR/targetHAL_Power.c b/targets/AzureRTOS/ST/_nanoCLR/targetHAL_Power.c
@@ -70,7 +70,7 @@ void CPU_SetPowerMode(PowerLevel_type powerLevel)
 #endif
 #endif
             // gracefully shutdown everything
-            nanoHAL_Uninitialize_C();
+            nanoHAL_Uninitialize_C(true);
 
             __disable_irq();
 
diff --git a/targets/AzureRTOS/SiliconLabs/_nanoCLR/targetHAL.cpp b/targets/AzureRTOS/SiliconLabs/_nanoCLR/targetHAL.cpp
@@ -37,7 +37,6 @@ extern void DeInitPwm();
 #include <sys_dev_usbstream_native_target.h>
 #endif
 
-
 // global mutex protecting the internal state of the interpreter, including event flags
 // mutex_t interpreterGlobalMutex;
 
@@ -51,9 +50,9 @@ extern "C"
         nanoHAL_Initialize();
     }
 
-    void nanoHAL_Uninitialize_C()
+    void nanoHAL_Uninitialize_C(bool isPoweringDown)
     {
-        nanoHAL_Uninitialize();
+        nanoHAL_Uninitialize(isPoweringDown);
     }
 }
 
@@ -138,10 +137,10 @@ void nanoHAL_Initialize()
 #endif
 
 #if (GECKO_USE_ADC0 == TRUE) && defined(NANO_GG_ADC_NATIVE_TARGET_H)
-adc0Initialized = false;
+    adc0Initialized = false;
 #endif
 #if (GECKO_USE_ADC1 == TRUE) && defined(NANO_GG_ADC_NATIVE_TARGET_H)
-adc1Initialized = false;
+    adc1Initialized = false;
 #endif
 
 #if GECKO_FEATURE_USBD_WINUSB == TRUE
@@ -205,8 +204,10 @@ adc1Initialized = false;
     Network_Initialize();
 }
 
-void nanoHAL_Uninitialize()
+void nanoHAL_Uninitialize(bool isPoweringDown)
 {
+    (void)isPoweringDown;
+
     // release the global mutex, just in case it's locked somewhere
     // chMtxUnlock(&interpreterGlobalMutex);
 
@@ -283,16 +284,16 @@ void nanoHAL_Uninitialize()
 #endif
 
 #if (GECKO_USE_ADC0 == TRUE) && defined(NANO_GG_ADC_NATIVE_TARGET_H)
-ADC_Reset(ADC0);
-adc0Initialized = false;
+    ADC_Reset(ADC0);
+    adc0Initialized = false;
 #endif
 #if (GECKO_USE_ADC1 == TRUE) && defined(NANO_GG_ADC_NATIVE_TARGET_H)
-ADC_Reset(ADC1);
-adc1Initialized = false;
+    ADC_Reset(ADC1);
+    adc1Initialized = false;
 #endif
 
 #if GECKO_FEATURE_USBD_WINUSB == TRUE
-    
+
     // abort any transfer in progress, just in case
     sl_usbd_vendor_abort_write_bulk(sl_usbd_vendor_winusb_number);
     sl_usbd_vendor_abort_read_bulk(sl_usbd_vendor_winusb_number);
diff --git a/targets/AzureRTOS/SiliconLabs/_nanoCLR/targetHAL_Power.c b/targets/AzureRTOS/SiliconLabs/_nanoCLR/targetHAL_Power.c
@@ -44,7 +44,7 @@ void CPU_SetPowerMode(PowerLevel_type powerLevel)
             // wdgStop(&WDGD1);
 
             // gracefully shutdown everything
-            nanoHAL_Uninitialize_C();
+            nanoHAL_Uninitialize_C(true);
 
             __disable_irq();
 
diff --git a/targets/ChibiOS/_nanoCLR/targetHAL.cpp b/targets/ChibiOS/_nanoCLR/targetHAL.cpp
@@ -40,9 +40,9 @@ extern "C"
         nanoHAL_Initialize();
     }
 
-    void nanoHAL_Uninitialize_C()
+    void nanoHAL_Uninitialize_C(bool isPoweringDown)
     {
-        nanoHAL_Uninitialize();
+        nanoHAL_Uninitialize(isPoweringDown);
     }
 }
 
@@ -155,8 +155,10 @@ void nanoHAL_Initialize()
     Network_Initialize();
 }
 
-void nanoHAL_Uninitialize()
+void nanoHAL_Uninitialize(bool isPoweringDown)
 {
+    (void)isPoweringDown;
+
     // release the global mutex, just in case it's locked somewhere
     // chMtxUnlock(&interpreterGlobalMutex);
 
diff --git a/targets/ChibiOS/_nanoCLR/targetHAL_Power.c b/targets/ChibiOS/_nanoCLR/targetHAL_Power.c
@@ -69,7 +69,7 @@ void CPU_SetPowerMode(PowerLevel_type powerLevel)
 #endif
 
             // gracefully shutdown everything
-            nanoHAL_Uninitialize_C();
+            nanoHAL_Uninitialize_C(true);
 
             chSysDisable();
 
diff --git a/targets/ESP32/_nanoCLR/targetHAL.cpp b/targets/ESP32/_nanoCLR/targetHAL.cpp
@@ -55,9 +55,9 @@ extern "C"
         nanoHAL_Initialize();
     }
 
-    void nanoHAL_Uninitialize_C()
+    void nanoHAL_Uninitialize_C(bool isPoweringDown)
     {
-        nanoHAL_Uninitialize();
+        nanoHAL_Uninitialize(isPoweringDown);
     }
 }
 
@@ -112,8 +112,10 @@ void nanoHAL_Initialize()
 #endif
 }
 
-void nanoHAL_Uninitialize()
+void nanoHAL_Uninitialize(bool isPoweringDown)
 {
+    (void)isPoweringDown;
+
     // check for s_rebootHandlers
     for (unsigned int i = 0; i < ARRAYSIZE(s_rebootHandlers); i++)
     {
diff --git a/targets/ESP32/_nanoCLR/targetHAL_Power.c b/targets/ESP32/_nanoCLR/targetHAL_Power.c
@@ -29,7 +29,7 @@ void CPU_SetPowerMode(PowerLevel_type powerLevel)
     {
         case PowerLevel__Off:
             // gracefully shutdown everything
-            nanoHAL_Uninitialize_C();
+            nanoHAL_Uninitialize_C(true);
 
             esp_deep_sleep_start();
 
diff --git a/targets/FreeRTOS/NXP/_nanoCLR/targetHAL.cpp b/targets/FreeRTOS/NXP/_nanoCLR/targetHAL.cpp
@@ -42,9 +42,9 @@ extern "C"
         nanoHAL_Initialize();
     }
 
-    void nanoHAL_Uninitialize_C()
+    void nanoHAL_Uninitialize_C(bool isPoweringDown)
     {
-        nanoHAL_Uninitialize();
+        nanoHAL_Uninitialize(isPoweringDown);
     }
 }
 
@@ -83,8 +83,10 @@ void nanoHAL_Initialize()
     // SOCKETS_DbgInitialize( 0 );
 }
 
-void nanoHAL_Uninitialize()
+void nanoHAL_Uninitialize(bool isPoweringDown)
 {
+    (void)isPoweringDown;
+
     // check for s_rebootHandlers
     for (unsigned int i = 0; i < ARRAYSIZE(s_rebootHandlers); i++)
     {
diff --git a/targets/TI_SimpleLink/_nanoCLR/targetHAL.cpp b/targets/TI_SimpleLink/_nanoCLR/targetHAL.cpp
@@ -57,9 +57,9 @@ extern "C"
         nanoHAL_Initialize();
     }
 
-    void nanoHAL_Uninitialize_C()
+    void nanoHAL_Uninitialize_C(bool isPoweringDown)
     {
-        nanoHAL_Uninitialize();
+        nanoHAL_Uninitialize(isPoweringDown);
     }
 }
 
@@ -110,8 +110,10 @@ void nanoHAL_Initialize()
     // SOCKETS_DbgInitialize( 0 );
 }
 
-void nanoHAL_Uninitialize()
+void nanoHAL_Uninitialize(bool isPoweringDown)
 {
+    (void)isPoweringDown;
+
     // check for s_rebootHandlers
     for (unsigned int i = 0; i < ARRAYSIZE(s_rebootHandlers); i++)
     {
diff --git a/targets/TI_SimpleLink/_nanoCLR/targetHAL_Power.c b/targets/TI_SimpleLink/_nanoCLR/targetHAL_Power.c
@@ -25,7 +25,10 @@ void CPU_SetPowerMode(PowerLevel_type powerLevel)
     {
         case PowerLevel__Off:
             // gracefully shutdown everything
-            nanoHAL_Uninitialize_C();
+            nanoHAL_Uninitialize_C(true);
+
+            // take care of platform and target specific taks for powering down
+            CPU_SetPowerModePlatform(powerLevel);
 
             // now let's go with shutdown
             Power_shutdown(0, 0);
@@ -37,3 +40,15 @@ void CPU_SetPowerMode(PowerLevel_type powerLevel)
             break;
     }
 }
+
+void CPU_SetPowerModePlatform(PowerLevel_type powerLevel)
+{
+    // call target specific implementation
+    CPU_SetPowerModeTarget(powerLevel);
+}
+
+// implemented as weak symbol to be overridden by target implementation
+__nfweak void CPU_SetPowerModeTarget(PowerLevel_type powerLevel)
+{
+    (void)powerLevel;
+}
diff --git a/targets/netcore/nanoFramework.nanoCLR/CLRStartup.cpp b/targets/netcore/nanoFramework.nanoCLR/CLRStartup.cpp
@@ -630,7 +630,7 @@ void ClrStartup(CLR_SETTINGS params)
 
                 s_ClrSettings.Cleanup();
 
-                nanoHAL_Uninitialize();
+                nanoHAL_Uninitialize(false);
 
                 // re-init the hal for the reboot (initially it is called in bootentry)
                 nanoHAL_Initialize();
diff --git a/targets/win32/nanoCLR/Various.cpp b/targets/win32/nanoCLR/Various.cpp
@@ -154,8 +154,10 @@ void __cdecl nanoHAL_Initialize(void)
     Events_Initialize();
 }
 
-void __cdecl nanoHAL_Uninitialize(void)
+void __cdecl nanoHAL_Uninitialize(bool isPoweringDown)
 {
+    (void)isPoweringDown;
+
     int i;
 
     // UNDONE: FIXME: CPU_GPIO_Uninitialize();

Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,9 @@ extern "C"`
`40`	`40`	`nanoHAL_Initialize();`
`41`	`41`	`}`
`42`	`42`
`43`		`- void nanoHAL_Uninitialize_C()`
	`43`	`+ void nanoHAL_Uninitialize_C(bool isPoweringDown)`
`44`	`44`	`{`
`45`		`- nanoHAL_Uninitialize();`
	`45`	`+ nanoHAL_Uninitialize(isPoweringDown);`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`@@ -161,8 +161,10 @@ void nanoHAL_Initialize()`
`161`	`161`	`Network_Initialize();`
`162`	`162`	`}`
`163`	`163`
`164`		`-void nanoHAL_Uninitialize()`
	`164`	`+void nanoHAL_Uninitialize(bool isPoweringDown)`
`165`	`165`	`{`
	`166`	`+ (void)isPoweringDown;`
	`167`	`+`
`166`	`168`	`// release the global mutex, just in case it's locked somewhere`
`167`	`169`	`// chMtxUnlock(&interpreterGlobalMutex);`
`168`	`170`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ extern "C"`
`38`	`38`	`nanoHAL_Initialize();`
`39`	`39`	`}`
`40`	`40`
`41`		`- void nanoHAL_Uninitialize_C()`
	`41`	`+ void nanoHAL_Uninitialize_C(bool isPoweringDown)`
`42`	`42`	`{`
`43`		`- nanoHAL_Uninitialize();`
	`43`	`+ nanoHAL_Uninitialize(isPoweringDown);`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`@@ -157,8 +157,10 @@ void nanoHAL_Initialize()`
`157`	`157`	`Network_Initialize();`
`158`	`158`	`}`
`159`	`159`
`160`		`-void nanoHAL_Uninitialize()`
	`160`	`+void nanoHAL_Uninitialize(bool isPoweringDown)`
`161`	`161`	`{`
	`162`	`+ (void)isPoweringDown;`
	`163`	`+`
`162`	`164`	`// release the global mutex, just in case it's locked somewhere`
`163`	`165`	`// chMtxUnlock(&interpreterGlobalMutex);`
`164`	`166`