templates: semihosting argv[1] loops

ilg-ul · ilg-ul · commit f88fefc7cab4 · 2015-04-06T20:53:04.000+03:00
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-100-include.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-100-include.c
@@ -6,4 +6,5 @@
 // ----------------------------------------------------------------------------
 
 #include <stdio.h>
+#include <stdlib.h>
 #include "diag/Trace.h"
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-none-loop-blinky.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-none-loop-blinky.c
@@ -0,0 +1,17 @@
+
+  timer_start();
+
+  blink_led_init();
+  
+  uint32_t seconds = 0;
+
+  // Infinite loop
+  while (1)
+    {
+      blink_led_on();
+      timer_sleep(BLINK_ON_TICKS);
+
+      blink_led_off();
+      timer_sleep(BLINK_OFF_TICKS);
+
+      ++seconds;
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-none-loop-blinky.cpp b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-none-loop-blinky.cpp
@@ -0,0 +1,21 @@
+
+  Timer timer;
+  timer.start();
+
+  BlinkLed blinkLed;
+
+  // Perform all necessary initialisations for the LED.
+  blinkLed.powerUp();
+
+  uint32_t seconds = 0;
+
+  // Infinite loop
+  while (1)
+    {
+      blinkLed.turnOn();
+      timer.sleep(BLINK_ON_TICKS);
+
+      blinkLed.turnOff();
+      timer.sleep(BLINK_OFF_TICKS);
+
+      ++seconds;
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-none-loop-empty.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-none-loop-empty.c
@@ -0,0 +1,6 @@
+
+  // Infinite loop
+  while (1)
+    {
+       // Add your code here.
+    }
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-retarget-loop-blinky.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-retarget-loop-blinky.c
@@ -0,0 +1,17 @@
+
+  timer_start();
+
+  blink_led_init();
+  
+  uint32_t seconds = 0;
+
+  // Infinite loop
+  while (1)
+    {
+      blink_led_on();
+      timer_sleep(BLINK_ON_TICKS);
+
+      blink_led_off();
+      timer_sleep(BLINK_OFF_TICKS);
+
+      ++seconds;
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-retarget-loop-blinky.cpp b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-retarget-loop-blinky.cpp
@@ -0,0 +1,21 @@
+
+  Timer timer;
+  timer.start();
+
+  BlinkLed blinkLed;
+
+  // Perform all necessary initialisations for the LED.
+  blinkLed.powerUp();
+
+  uint32_t seconds = 0;
+
+  // Infinite loop
+  while (1)
+    {
+      blinkLed.turnOn();
+      timer.sleep(BLINK_ON_TICKS);
+
+      blinkLed.turnOff();
+      timer.sleep(BLINK_OFF_TICKS);
+
+      ++seconds;
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-retarget-loop-empty.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-retarget-loop-empty.c
@@ -0,0 +1,6 @@
+
+  // Infinite loop
+  while (1)
+    {
+       // Add your code here.
+    }
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-semihosting-loop-blinky.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-semihosting-loop-blinky.c
@@ -0,0 +1,26 @@
+
+  timer_start();
+
+  blink_led_init();
+  
+  uint32_t seconds = 0;
+
+#define LOOP_COUNT (5)
+  int loops = LOOP_COUNT;
+  if (argc > 1)
+    {
+      // If defined, get the number of loops from the command line,
+      // configurable via semihosting.
+      loops = atoi (argv[1]);
+    }
+
+  // Short loop.
+  for (int i = 0; i < loops; i++)
+    {
+      blink_led_on();
+      timer_sleep(BLINK_ON_TICKS);
+
+      blink_led_off();
+      timer_sleep(BLINK_OFF_TICKS);
+
+      ++seconds;
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-semihosting-loop-blinky.cpp b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-semihosting-loop-blinky.cpp
@@ -0,0 +1,30 @@
+
+  Timer timer;
+  timer.start();
+
+  BlinkLed blinkLed;
+
+  // Perform all necessary initialisations for the LED.
+  blinkLed.powerUp();
+
+  uint32_t seconds = 0;
+
+#define LOOP_COUNT (5)
+  int loops = LOOP_COUNT;
+  if (argc > 1)
+    {
+      // If defined, get the number of loops from the command line,
+      // configurable via semihosting.
+      loops = atoi (argv[1]);
+    }
+
+  // Short loop.
+  for (int i = 0; i < loops; i++)
+    {
+      blinkLed.turnOn();
+      timer.sleep(BLINK_ON_TICKS);
+
+      blinkLed.turnOff();
+      timer.sleep(BLINK_OFF_TICKS);
+
+      ++seconds;
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-semihosting-loop-empty.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-200-semihosting-loop-empty.c
@@ -0,0 +1,15 @@
+
+#define LOOP_COUNT (5)
+  int loops = LOOP_COUNT;
+  if (argc > 1)
+    {
+      // If defined, get the number of loops from the command line,
+      // configurable via semihosting.
+      loops = atoi (argv[1]);
+    }
+
+  // Short loop.
+  for (int i = 0; i < loops; i++)
+    {
+       // Add your code here.
+    }
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-220-none-loopend.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-220-none-loopend.c
@@ -0,0 +1,2 @@
+    }
+  // Infinite loop, never return.
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-220-retarget-loopend.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-220-retarget-loopend.c
@@ -0,0 +1,2 @@
+    }
+  // Infinite loop, never return.
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-220-semihosting-loopend.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-220-semihosting-loopend.c
@@ -0,0 +1 @@
+    }
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-230-none-end.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-230-none-end.c
@@ -0,0 +1,5 @@
+}
+
+#pragma GCC diagnostic pop
+
+// ----------------------------------------------------------------------------
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-230-retarget-end.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-230-retarget-end.c
@@ -0,0 +1,5 @@
+}
+
+#pragma GCC diagnostic pop
+
+// ----------------------------------------------------------------------------
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-230-semihosting-end.c b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-230-semihosting-end.c
@@ -0,0 +1,6 @@
+  return 0;
+}
+
+#pragma GCC diagnostic pop
+
+// ----------------------------------------------------------------------------
diff --git a/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-include.xcdl.cpp b/ilg.gnuarmeclipse.templates.core/templates/common/src/main/main-include.xcdl.cpp
@@ -15,11 +15,11 @@
 //@XCDL @if "$(content)"=="blinky"
 //@XCDL @include "$(commonDir)/src/main/main-180-$(syscalls)-hello.c"
 //@XCDL @include "$(commonDir)/src/main/main-190-clock-blinky.c"
-//@XCDL @include "$(commonDir)/src/main/main-200-loop-blinky.$(fileExtension)"
+//@XCDL @include "$(commonDir)/src/main/main-200-$(syscalls)-loop-blinky.$(fileExtension)"
 //@XCDL @include "$(commonDir)/src/main/main-210-print.c"
-//@XCDL @include "$(commonDir)/src/main/main-220-loopend.c"
+//@XCDL @include "$(commonDir)/src/main/main-220-$(syscalls)-loopend.c"
 //@XCDL @elif "$(content)"=="empty"
 //@XCDL @include "$(commonDir)/src/main/main-190-clock-empty.c"
-//@XCDL @include "$(commonDir)/src/main/main-200-loop-empty.c"
+//@XCDL @include "$(commonDir)/src/main/main-200-$(syscalls)-loop-empty.c"
 //@XCDL @endif
-//@XCDL @include "$(commonDir)/src/main/main-230-end.c"
+//@XCDL @include "$(commonDir)/src/main/main-230-$(syscalls)-end.c"
diff --git a/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-10.c b/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-10.c
@@ -6,6 +6,7 @@
 // ----------------------------------------------------------------------------
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "diag/Trace.h"
 #include "Timer.h"
diff --git a/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-30-none.c b/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-30-none.c
@@ -0,0 +1,6 @@
+
+  int seconds = 0;
+
+  // Infinite loop
+  while (1)
+    {
diff --git a/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-30-retarget.c b/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-30-retarget.c
@@ -0,0 +1,6 @@
+
+  int seconds = 0;
+
+  // Infinite loop
+  while (1)
+    {
diff --git a/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-30-semihosting.c b/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-30-semihosting.c
@@ -0,0 +1,15 @@
+
+  int seconds = 0;
+
+#define LOOP_COUNT (5)
+  int loops = LOOP_COUNT;
+  if (argc > 1)
+    {
+      // If defined, get the number of loops from the command line,
+      // configurable via semihosting.
+      loops = atoi (argv[1]);
+    }
+
+  // Short loop.
+  for (int i = 0; i < loops; i++)
+    {
diff --git a/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-50-none.c b/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-50-none.c
@@ -0,0 +1,12 @@
+
+      ++seconds;
+
+      // Count seconds on the trace device.
+      trace_printf ("Second %d\n", seconds);
+    }
+  // Infinite loop, never return.
+}
+
+#pragma GCC diagnostic pop
+
+// ----------------------------------------------------------------------------
diff --git a/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-50-retarget.c b/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-50-retarget.c
@@ -0,0 +1,12 @@
+
+      ++seconds;
+
+      // Count seconds on the trace device.
+      trace_printf ("Second %d\n", seconds);
+    }
+  // Infinite loop, never return.
+}
+
+#pragma GCC diagnostic pop
+
+// ----------------------------------------------------------------------------
diff --git a/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-50-semihosting.c b/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/src/main-50-semihosting.c
@@ -0,0 +1,12 @@
+
+      ++seconds;
+
+      // Count seconds on the trace device.
+      trace_printf ("Second %d\n", seconds);
+    }
+  return 0;
+}
+
+#pragma GCC diagnostic pop
+
+// ----------------------------------------------------------------------------
diff --git a/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/template.xml b/ilg.gnuarmeclipse.templates.cortexm/templates/cortexm_project/template.xml
@@ -333,7 +333,7 @@ and is available athttp://www.eclipse.org/legal/epl-v10.html"
 					<simple name="replaceable" value="true" />
 				</element>
 				<element>
-					<simple name="source" value="src/main-30.c" />
+					<simple name="source" value="src/main-30-$(syscalls).c" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
@@ -343,7 +343,7 @@ and is available athttp://www.eclipse.org/legal/epl-v10.html"
 					<simple name="replaceable" value="true" />
 				</element>
 				<element>
-					<simple name="source" value="src/main-50.c" />
+					<simple name="source" value="src/main-50-$(syscalls).c" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
diff --git a/ilg.gnuarmeclipse.templates.freescale/templates/klxx_c_project/template.xml b/ilg.gnuarmeclipse.templates.freescale/templates/klxx_c_project/template.xml
@@ -397,7 +397,7 @@ and is available athttp://www.eclipse.org/legal/epl-v10.html"
 				</element>
 				<element>
 					<simple name="source"
-						value="$(commonDir)/src/main/main-200-loop-blinky.$(fileExtension)" />
+						value="$(commonDir)/src/main/main-200-$(syscalls)-loop-blinky.$(fileExtension)" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
@@ -407,12 +407,12 @@ and is available athttp://www.eclipse.org/legal/epl-v10.html"
 					<simple name="replaceable" value="true" />
 				</element>
 				<element>
-					<simple name="source" value="$(commonDir)/src/main/main-220-loopend.c" />
+					<simple name="source" value="$(commonDir)/src/main/main-220-$(syscalls)-loopend.c" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
 				<element>
-					<simple name="source" value="$(commonDir)/src/main/main-230-end.c" />
+					<simple name="source" value="$(commonDir)/src/main/main-230-$(syscalls)-end.c" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
@@ -532,12 +532,12 @@ and is available athttp://www.eclipse.org/legal/epl-v10.html"
 					<simple name="replaceable" value="true" />
 				</element>
 				<element>
-					<simple name="source" value="$(commonDir)/src/main/main-200-loop-empty.c" />
+					<simple name="source" value="$(commonDir)/src/main/main-200-$(syscalls)-loop-empty.c" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
 				<element>
-					<simple name="source" value="$(commonDir)/src/main/main-230-end.c" />
+					<simple name="source" value="$(commonDir)/src/main/main-230-$(syscalls)-end.c" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
diff --git a/ilg.gnuarmeclipse.templates.stm/templates/stm32f0xx_exe_c_project/template.xml b/ilg.gnuarmeclipse.templates.stm/templates/stm32f0xx_exe_c_project/template.xml
@@ -358,7 +358,7 @@
 				</element>
 				<element>
 					<simple name="source"
-						value="$(commonDir)/src/main/main-200-loop-blinky.$(fileExtension)" />
+						value="$(commonDir)/src/main/main-200-$(syscalls)-loop-blinky.$(fileExtension)" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
@@ -368,12 +368,12 @@
 					<simple name="replaceable" value="true" />
 				</element>
 				<element>
-					<simple name="source" value="$(commonDir)/src/main/main-220-loopend.c" />
+					<simple name="source" value="$(commonDir)/src/main/main-220-$(syscalls)-loopend.c" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
 				<element>
-					<simple name="source" value="$(commonDir)/src/main/main-230-end.c" />
+					<simple name="source" value="$(commonDir)/src/main/main-230-$(syscalls)-end.c" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
@@ -493,12 +493,12 @@
 					<simple name="replaceable" value="true" />
 				</element>
 				<element>
-					<simple name="source" value="$(commonDir)/src/main/main-200-loop-empty.c" />
+					<simple name="source" value="$(commonDir)/src/main/main-200-$(syscalls)-loop-empty.c" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
 				<element>
-					<simple name="source" value="$(commonDir)/src/main/main-230-end.c" />
+					<simple name="source" value="$(commonDir)/src/main/main-230-$(syscalls)-end.c" />
 					<simple name="target" value="$(sourceDir)/main.$(fileExtension)" />
 					<simple name="replaceable" value="true" />
 				</element>
diff --git a/ilg.gnuarmeclipse.templates.stm/templates/stm32f10x_exe_c_project/template.xml b/ilg.gnuarmeclipse.templates.stm/templates/stm32f10x_exe_c_project/template.xml
diff --git a/ilg.gnuarmeclipse.templates.stm/templates/stm32f2xx_exe_c_project/template.xml b/ilg.gnuarmeclipse.templates.stm/templates/stm32f2xx_exe_c_project/template.xml
diff --git a/ilg.gnuarmeclipse.templates.stm/templates/stm32f3xx_exe_c_project/template.xml b/ilg.gnuarmeclipse.templates.stm/templates/stm32f3xx_exe_c_project/template.xml
diff --git a/ilg.gnuarmeclipse.templates.stm/templates/stm32f4xx_exe_c_project/template.xml b/ilg.gnuarmeclipse.templates.stm/templates/stm32f4xx_exe_c_project/template.xml
