Move CLR_SETTINGS to targets

- Following nanoframework/nf-interpreter#832 Signed-off-by: José Simões <[email protected]>
nanoframework · Aug 29, 2018 · a9df783 · a9df783
1 parent d22273f
commit a9df783
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 6 deletions.
diff --git a/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/nanoCLR/main.c b/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/nanoCLR/main.c
@@ -53,8 +53,17 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+
+  // CLR settings to launch CLR thread
+  CLR_SETTINGS clrSettings;
+  (void)memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
+
+  clrSettings.MaxContextSwitches         = 50;
+  clrSettings.WaitForDebugger            = false;
+  clrSettings.EnterDebuggerLoopAfterExit = true;
+
   // create the CLR Startup thread 
-  osThreadCreate(osThread(CLRStartupThread), NULL); 
+  osThreadCreate(osThread(CLRStartupThread), &clrSettings);
 
   // EXT driver needs to be started from main   
   #if (HAL_USE_EXT == TRUE)

diff --git a/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/nanoCLR/main.c b/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/nanoCLR/main.c
@@ -53,8 +53,17 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+
+  // CLR settings to launch CLR thread
+  CLR_SETTINGS clrSettings;
+  (void)memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
+
+  clrSettings.MaxContextSwitches         = 50;
+  clrSettings.WaitForDebugger            = false;
+  clrSettings.EnterDebuggerLoopAfterExit = true;
+
   // create the CLR Startup thread 
-  osThreadCreate(osThread(CLRStartupThread), NULL); 
+  osThreadCreate(osThread(CLRStartupThread), &clrSettings);
 
   // EXT driver needs to be started from main   
   #if (HAL_USE_EXT == TRUE)

diff --git a/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/nanoCLR/main.c b/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/nanoCLR/main.c
@@ -53,8 +53,17 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+
+  // CLR settings to launch CLR thread
+  CLR_SETTINGS clrSettings;
+  (void)memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
+
+  clrSettings.MaxContextSwitches         = 50;
+  clrSettings.WaitForDebugger            = false;
+  clrSettings.EnterDebuggerLoopAfterExit = true;
+
   // create the CLR Startup thread 
-  osThreadCreate(osThread(CLRStartupThread), NULL); 
+  osThreadCreate(osThread(CLRStartupThread), &clrSettings);
 
   // EXT driver needs to be started from main   
   #if (HAL_USE_EXT == TRUE)

diff --git a/CMSIS-OS/ChibiOS/ST_NUCLEO144_F412ZG_NF/nanoCLR/main.c b/CMSIS-OS/ChibiOS/ST_NUCLEO144_F412ZG_NF/nanoCLR/main.c
@@ -50,8 +50,17 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+
+  // CLR settings to launch CLR thread
+  CLR_SETTINGS clrSettings;
+  (void)memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
+
+  clrSettings.MaxContextSwitches         = 50;
+  clrSettings.WaitForDebugger            = false;
+  clrSettings.EnterDebuggerLoopAfterExit = true;
+
   // create the CLR Startup thread 
-  osThreadCreate(osThread(CLRStartupThread), NULL); 
+  osThreadCreate(osThread(CLRStartupThread), &clrSettings); 
 
   // start kernel, after this main() will behave like a thread with priority osPriorityNormal
   osKernelStart();

diff --git a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/nanoCLR/main.c b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/nanoCLR/main.c
@@ -53,8 +53,17 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+
+  // CLR settings to launch CLR thread
+  CLR_SETTINGS clrSettings;
+  (void)memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
+
+  clrSettings.MaxContextSwitches         = 50;
+  clrSettings.WaitForDebugger            = false;
+  clrSettings.EnterDebuggerLoopAfterExit = true;
+
   // create the CLR Startup thread 
-  osThreadCreate(osThread(CLRStartupThread), NULL); 
+  osThreadCreate(osThread(CLRStartupThread), &clrSettings);
 
   // EXT driver needs to be started from main   
   #if (HAL_USE_EXT == TRUE)

diff --git a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/nanoCLR/main.c b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/nanoCLR/main.c
@@ -53,8 +53,17 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+
+  // CLR settings to launch CLR thread
+  CLR_SETTINGS clrSettings;
+  (void)memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
+
+  clrSettings.MaxContextSwitches         = 50;
+  clrSettings.WaitForDebugger            = false;
+  clrSettings.EnterDebuggerLoopAfterExit = true;
+
   // create the CLR Startup thread 
-  osThreadCreate(osThread(CLRStartupThread), NULL); 
+  osThreadCreate(osThread(CLRStartupThread), &clrSettings);
 
   // EXT driver needs to be started from main   
   #if (HAL_USE_EXT == TRUE)