More startup code tests

nanoframework · Jun 11, 2024 · 626fc44 · 626fc44
1 parent ef475f4
commit 626fc44
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/targets/netcore/nanoFramework.nanoCLR/nanoCLR_native.cpp b/targets/netcore/nanoFramework.nanoCLR/nanoCLR_native.cpp
@@ -99,7 +99,7 @@ void nanoCLR_Run(NANO_CLR_SETTINGS nanoClrSettings)
         VERSION_REVISION);
 
     // initialize nanoHAL
-    //nanoHAL_Initialize();
+    nanoHAL_Initialize();
 
     // take care of block storage here as we are RAM based
     BlockStorageList_Initialize();
@@ -109,13 +109,13 @@ void nanoCLR_Run(NANO_CLR_SETTINGS nanoClrSettings)
     CLR_SETTINGS clrSettings;
     ZeroMemory(&clrSettings, sizeof(CLR_SETTINGS));
 
-    //clrSettings.MaxContextSwitches = nanoClrSettings.MaxContextSwitches;
-    //clrSettings.WaitForDebugger = nanoClrSettings.WaitForDebugger;
-    //clrSettings.EnterDebuggerLoopAfterExit = nanoClrSettings.EnterDebuggerLoopAfterExit;
-    //clrSettings.PerformGarbageCollection = nanoClrSettings.PerformGarbageCollection;
-    //clrSettings.PerformHeapCompaction = nanoClrSettings.PerformHeapCompaction;
+    clrSettings.MaxContextSwitches = nanoClrSettings.MaxContextSwitches;
+    clrSettings.WaitForDebugger = nanoClrSettings.WaitForDebugger;
+    clrSettings.EnterDebuggerLoopAfterExit = nanoClrSettings.EnterDebuggerLoopAfterExit;
+    clrSettings.PerformGarbageCollection = nanoClrSettings.PerformGarbageCollection;
+    clrSettings.PerformHeapCompaction = nanoClrSettings.PerformHeapCompaction;
 
-    //ClrStartup(clrSettings);
+    // ClrStartup(clrSettings);
 
 #if !defined(BUILD_RTM)
     CLR_Debug::Printf("Exiting.\r\n");

diff --git a/targets/win32/nanoCLR/Various.cpp b/targets/win32/nanoCLR/Various.cpp
@@ -146,23 +146,21 @@ void __cdecl HAL_AddSoftRebootHandler(ON_SOFT_REBOOT_HANDLER handler)
 
 bool g_fDoNotUninitializeDebuggerPort = false;
 
-void __cdecl nanoHAL_Initialize(void)
+void nanoHAL_Initialize(void)
 {
     HAL_CONTINUATION::InitializeList();
     HAL_COMPLETION::InitializeList();
 
     Events_Initialize();
 }
 
-void __cdecl nanoHAL_Uninitialize(bool isPoweringDown)
+void nanoHAL_Uninitialize(bool isPoweringDown)
 {
     (void)isPoweringDown;
 
-    int i;
-
     // UNDONE: FIXME: CPU_GPIO_Uninitialize();
 
-    for (i = 0; i < ARRAYSIZE(s_rebootHandlers); i++)
+    for (int i = 0; i < ARRAYSIZE(s_rebootHandlers); i++)
     {
         if (s_rebootHandlers[i] != NULL)
         {