STM32 board files and demos now use the new organization.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2497 35acf78f-673a-0410-8e92-d51de3d6d3f4

5 files changed, 60 insertions, 12 deletions

diff --git a/demos/ARMCM3-STM32F100-DISCOVERY-GCC/main.c b/demos/ARMCM3-STM32F100-DISCOVERY-GCC/main.c
index 4d4df9297..a94600203 100644
--- a/demos/ARMCM3-STM32F100-DISCOVERY-GCC/main.c
+++ b/demos/ARMCM3-STM32F100-DISCOVERY-GCC/main.c
@@ -170,8 +170,7 @@ static msg_t Thread1(void *arg) {
 }

 

 /*

- * Entry point, note, the main() function is already a thread in the system

- * on entry.

+ * Application entry point.

  */

 int main(int argc, char **argv) {

 

@@ -179,6 +178,16 @@ int main(int argc, char **argv) {
   (void)argv;

 

   /*

+   * System initializations.

+   * - HAL initialization, this also initializes the configured device drivers

+   *   and performs the board-specific initializations.

+   * - Kernel initialization, the main() function becomes a thread and the

+   *   RTOS is active.

+   */

+  halInit();

+  chSysInit();

+

+  /*

    * Activates the serial driver 1 using the driver default configuration.

    */

   sdStart(&SD1, NULL);

diff --git a/demos/ARMCM3-STM32F103-FATFS-GCC/main.c b/demos/ARMCM3-STM32F103-FATFS-GCC/main.c
index c9407731c..1d0018b9b 100644
--- a/demos/ARMCM3-STM32F103-FATFS-GCC/main.c
+++ b/demos/ARMCM3-STM32F103-FATFS-GCC/main.c
@@ -264,8 +264,7 @@ static void RemoveHandler(eventid_t id) {
 }

 

 /*

- * Entry point, note, the main() function is already a thread in the system

- * on entry.

+ * Application entry point.

  */

 int main(int argc, char **argv) {

   static const evhandler_t evhndl[] = {

@@ -279,6 +278,16 @@ int main(int argc, char **argv) {
   (void)argv;

 

   /*

+   * System initializations.

+   * - HAL initialization, this also initializes the configured device drivers

+   *   and performs the board-specific initializations.

+   * - Kernel initialization, the main() function becomes a thread and the

+   *   RTOS is active.

+   */

+  halInit();

+  chSysInit();

+

+  /*

    * Activates the serial driver 2 using the driver default configuration.

    */

   sdStart(&SD2, NULL);

diff --git a/demos/ARMCM3-STM32F103-GCC/main.c b/demos/ARMCM3-STM32F103-GCC/main.c
index 0072f0958..e133e6e3b 100644
--- a/demos/ARMCM3-STM32F103-GCC/main.c
+++ b/demos/ARMCM3-STM32F103-GCC/main.c
@@ -22,7 +22,7 @@
 #include "test.h"

 

 /*

- * Red LEDs blinker thread, times are in milliseconds.

+ * Red LED blinker thread, times are in milliseconds.

  */

 static WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

@@ -38,8 +38,7 @@ static msg_t Thread1(void *arg) {
 }

 

 /*

- * Entry point, note, the main() function is already a thread in the system

- * on entry.

+ * Application entry point.

  */

 int main(int argc, char **argv) {

 

@@ -47,6 +46,16 @@ int main(int argc, char **argv) {
   (void)argv;

 

   /*

+   * System initializations.

+   * - HAL initialization, this also initializes the configured device drivers

+   *   and performs the board-specific initializations.

+   * - Kernel initialization, the main() function becomes a thread and the

+   *   RTOS is active.

+   */

+  halInit();

+  chSysInit();

+

+  /*

    * Activates the serial driver 2 using the driver default configuration.

    */

   sdStart(&SD2, NULL);

diff --git a/demos/ARMCM3-STM32F103-IAR/main.c b/demos/ARMCM3-STM32F103-IAR/main.c
index a3a5c062e..e133e6e3b 100644
--- a/demos/ARMCM3-STM32F103-IAR/main.c
+++ b/demos/ARMCM3-STM32F103-IAR/main.c
@@ -22,7 +22,7 @@
 #include "test.h"

 

 /*

- * Red LEDs blinker thread, times are in milliseconds.

+ * Red LED blinker thread, times are in milliseconds.

  */

 static WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

@@ -34,10 +34,11 @@ static msg_t Thread1(void *arg) {
     palSetPad(IOPORT3, GPIOC_LED);

     chThdSleepMilliseconds(500);

   }

+  return 0;

 }

 

 /*

- * Entry point.

+ * Application entry point.

  */

 int main(int argc, char **argv) {

 

@@ -45,6 +46,16 @@ int main(int argc, char **argv) {
   (void)argv;

 

   /*

+   * System initializations.

+   * - HAL initialization, this also initializes the configured device drivers

+   *   and performs the board-specific initializations.

+   * - Kernel initialization, the main() function becomes a thread and the

+   *   RTOS is active.

+   */

+  halInit();

+  chSysInit();

+

+  /*

    * Activates the serial driver 2 using the driver default configuration.

    */

   sdStart(&SD2, NULL);

@@ -63,4 +74,5 @@ int main(int argc, char **argv) {
       TestThread(&SD2);

     chThdSleepMilliseconds(500);

   }

+  return 0;

 }

diff --git a/demos/ARMCM3-STM32F107-GCC/main.c b/demos/ARMCM3-STM32F107-GCC/main.c
index bddf485c0..fe463af89 100644
--- a/demos/ARMCM3-STM32F107-GCC/main.c
+++ b/demos/ARMCM3-STM32F107-GCC/main.c
@@ -22,7 +22,7 @@
 #include "test.h"

 

 /*

- * Red LEDs blinker thread, times are in milliseconds.

+ * Red LED blinker thread, times are in milliseconds.

  */

 static WORKING_AREA(waThread1, 128);

 static msg_t Thread1(void *arg) {

@@ -38,8 +38,7 @@ static msg_t Thread1(void *arg) {
 }

 

 /*

- * Entry point, note, the main() function is already a thread in the system

- * on entry.

+ * Application entry point.

  */

 int main(int argc, char **argv) {

 

@@ -47,6 +46,16 @@ int main(int argc, char **argv) {
   (void)argv;

 

   /*

+   * System initializations.

+   * - HAL initialization, this also initializes the configured device drivers

+   *   and performs the board-specific initializations.

+   * - Kernel initialization, the main() function becomes a thread and the

+   *   RTOS is active.

+   */

+  halInit();

+  chSysInit();

+

+  /*

    * Activates the serial driver 2 using the driver default configuration.

    */

   sdStart(&SD2, NULL);