altos: Call ao_task_init before initializing any drivers

When using task queues, the sleep queues must be initialized before
any invocation of ao_wakeup or the OS will crash. Just make sure
ao_task_init is always invoked early in the task process to get that done.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/avr-demo/ao_demo.c b/src/avr-demo/ao_demo.c
index 756dd0d4a506550b3c881d7c8b154a26ef5d0b59..e35babb3decc243a5ecb67640596e9837b91eac0 100644 (file)
--- a/src/avr-demo/ao_demo.c
+++ b/src/avr-demo/ao_demo.c
@@ -34,6 +34,8 @@ main(void)
 {
        ao_clock_init();
 
+       ao_task_init();
+
        ao_serial_init();
 
        ao_led_init(LEDS_AVAILABLE);

diff --git a/src/product/ao_telebt.c b/src/product/ao_telebt.c
index 46c63418bab456ccf3c5b4e864d8672de6bbfbcd..b147eabc0cb1e1feb31be2746c6cbcbe5296ffb7 100644 (file)
--- a/src/product/ao_telebt.c
+++ b/src/product/ao_telebt.c
@@ -29,6 +29,9 @@ main(void)
        /* Turn on the LED until the system is stable */
        ao_led_init(LEDS_AVAILABLE);
        ao_led_on(AO_LED_RED);
+
+       ao_task_init();
+
        ao_timer_init();
 #if HAS_BEEP
        ao_beep_init();

diff --git a/src/product/ao_teledongle.c b/src/product/ao_teledongle.c
index 25ebe73ea71b513732f0d9d789492bb877f3c60f..8bfd8b845e73052080a682e739a64153e2e32a27 100644 (file)
--- a/src/product/ao_teledongle.c
+++ b/src/product/ao_teledongle.c
@@ -26,6 +26,8 @@ main(void)
        /* Turn on the LED until the system is stable */
        ao_led_init(LEDS_AVAILABLE);
        ao_led_on(AO_LED_RED);
+       ao_task_init();
+
        ao_timer_init();
        ao_cmd_init();
        ao_usb_init();

diff --git a/src/product/ao_telelaunch.c b/src/product/ao_telelaunch.c
index b6e4bfc130c2b7243deb39e295e227618d1aa536..dde66090ddfca6d9b902768a82e3b86366b67dcd 100644 (file)
--- a/src/product/ao_telelaunch.c
+++ b/src/product/ao_telelaunch.c
@@ -27,6 +27,8 @@ main(void)
        ao_led_init(LEDS_AVAILABLE);
        ao_led_on(AO_LED_RED);
 
+       ao_task_init();
+
        ao_timer_init();
        ao_adc_init();
        ao_beep_init();

diff --git a/src/product/ao_telemetrum.c b/src/product/ao_telemetrum.c
index ea77f5afe83e55c5a5808fe50cb023ea194f48f2..221498d6aa19305cfb697d3699198d042590c56e 100644 (file)
--- a/src/product/ao_telemetrum.c
+++ b/src/product/ao_telemetrum.c
@@ -42,6 +42,8 @@ main(void)
                while (P1_3 == 0)
                        ;
        }
+       ao_task_init();
+
        ao_timer_init();
        ao_adc_init();
        ao_beep_init();

diff --git a/src/product/ao_telemini.c b/src/product/ao_telemini.c
index 21551ee902b2c59359d3c44441ca0ad653328712..a0d8e18af08c4baf34d71ac98710b4f09bdd403d 100644 (file)
--- a/src/product/ao_telemini.c
+++ b/src/product/ao_telemini.c
@@ -46,6 +46,8 @@ main(void)
                        ;
        }
 
+       ao_task_init();
+
        ao_timer_init();
        ao_adc_init();
        ao_cmd_init();

diff --git a/src/product/ao_telenano.c b/src/product/ao_telenano.c
index d91983d08c3ef70165d41db8d892327a2bdc2d1b..77750efda72f16273863bcf52f8ca148bb03da16 100644 (file)
--- a/src/product/ao_telenano.c
+++ b/src/product/ao_telenano.c
@@ -28,6 +28,8 @@ main(void)
        ao_led_init(LEDS_AVAILABLE);
        ao_led_on(AO_LED_RED);
 
+       ao_task_init();
+
        ao_timer_init();
        ao_adc_init();
        ao_cmd_init();

diff --git a/src/product/ao_telepyro.c b/src/product/ao_telepyro.c
index 79454fb7d75bcfa001549972db987af33bbea647..6f09be64e9aa7daa1094f5cf0476437a7f6efc87 100644 (file)
--- a/src/product/ao_telepyro.c
+++ b/src/product/ao_telepyro.c
@@ -25,6 +25,8 @@ main(void)
        PORTE |= (1 << 6);
        DDRE |= (1 << 6);
 
+       ao_task_init();
+
        ao_avr_stdio_init();
        ao_timer_init();
        ao_cmd_init();

diff --git a/src/product/ao_telescience.c b/src/product/ao_telescience.c
index d448d31854d888212378febdfa1c43d359552666..2888c2668df1f2fc198674df0b68b944f4980f8f 100644 (file)
--- a/src/product/ao_telescience.c
+++ b/src/product/ao_telescience.c
@@ -28,6 +28,8 @@ main(void)
        PORTE |= (1 << 6);
        DDRE |= (1 << 6);
 
+       ao_task_init();
+
        ao_avr_stdio_init();
        ao_timer_init();
        ao_cmd_init();

diff --git a/src/product/ao_teleterra.c b/src/product/ao_teleterra.c
index d696b914e88c845a70d1789424b7e2ec21553281..e739ae0b7af5948e4e46aef501912fc7a7fc617b 100644 (file)
--- a/src/product/ao_teleterra.c
+++ b/src/product/ao_teleterra.c
@@ -26,6 +26,8 @@ main(void)
        /* Turn on the red LED until the system is stable */
        ao_led_init(AO_LED_RED|AO_LED_GREEN);
        ao_led_on(AO_LED_RED);
+       ao_task_init();
+
        ao_timer_init();
        ao_beep_init();
        ao_cmd_init();

diff --git a/src/product/ao_teleterra_0_2.c b/src/product/ao_teleterra_0_2.c
index 68f0259646e478f87af0116ef6b63134ef977e62..4f7530f7b3a61b957531a067c9b85a043f6fb2d6 100644 (file)
--- a/src/product/ao_teleterra_0_2.c
+++ b/src/product/ao_teleterra_0_2.c
@@ -23,6 +23,8 @@ main(void)
 {
        ao_clock_init();
 
+       ao_task_init();
+
        ao_timer_init();
        ao_beep_init();
        ao_cmd_init();

diff --git a/src/product/ao_test.c b/src/product/ao_test.c
index 14c2eb75c41e2656996673a0cb29d4d4d4973c0f..273a73b51421c4b1f21325095bf9085b1f6e0214 100644 (file)
--- a/src/product/ao_test.c
+++ b/src/product/ao_test.c
@@ -102,6 +102,8 @@ main(void)
 {
        ao_clock_init();
 
+       ao_task_init();
+
 //     ao_add_task(&blink_0_task, blink_0);
 //     ao_add_task(&blink_1_task, blink_1);
 //     ao_add_task(&wakeup_task, wakeup);

diff --git a/src/product/ao_tidongle.c b/src/product/ao_tidongle.c
index cba0b12249a44757ea674d7500cd6e56785f1db8..b1a96bdd1cfcf3acd5c357302135a7782a1c1cdb 100644 (file)
--- a/src/product/ao_tidongle.c
+++ b/src/product/ao_tidongle.c
@@ -27,6 +27,9 @@ main(void)
        /* Turn on the LED until the system is stable */
        ao_led_init(AO_LED_RED);
        ao_led_on(AO_LED_RED);
+
+       ao_task_init();
+
        ao_timer_init();
        ao_cmd_init();
        ao_usb_init();

diff --git a/src/spiradio-v0.1/ao_spiradio.c b/src/spiradio-v0.1/ao_spiradio.c
index d3647cc78e373dc62f97e1a9c32de2ec6426fc23..de9ea7068aeed5c076abf6a479ac6367e4cf6145 100644 (file)
--- a/src/spiradio-v0.1/ao_spiradio.c
+++ b/src/spiradio-v0.1/ao_spiradio.c
@@ -25,6 +25,8 @@ main(void)
 
        ao_led_init(LEDS_AVAILABLE);
 
+       ao_task_init();
+
        ao_serial_init();
        ao_timer_init();
        ao_cmd_init();

diff --git a/src/stm-demo/ao_demo.c b/src/stm-demo/ao_demo.c
index d464528102fb501cfd47094537bc8075e24ec921..ec572fdc204a8a8871046085b91a73ac6f981a50 100644 (file)
--- a/src/stm-demo/ao_demo.c
+++ b/src/stm-demo/ao_demo.c
@@ -192,6 +192,8 @@ main(void)
 {
        ao_clock_init();
        
+       ao_task_init();
+
        ao_serial_init();
        ao_timer_init();
        ao_dma_init();

diff --git a/src/stm-flash/ao_stm_flash.c b/src/stm-flash/ao_stm_flash.c
index 65bc2daf007d3a2a34438cf16d60eda695bb7c0d..df466d8553de86eb9c0d342071f85801732c42c5 100644 (file)
--- a/src/stm-flash/ao_stm_flash.c
+++ b/src/stm-flash/ao_stm_flash.c
@@ -122,6 +122,9 @@ int
 main(void)
 {
        ao_clock_init();
+
+       ao_task_init();
+
        ao_timer_init();
 //     ao_dma_init();
        ao_cmd_init();

diff --git a/src/teleballoon-v1.1/ao_teleballoon.c b/src/teleballoon-v1.1/ao_teleballoon.c
index c8bf7760f89741198753c5bd857b9323b698a9e0..867e98ab2fe26f9c23400d802b58de926e6be8de 100644 (file)
--- a/src/teleballoon-v1.1/ao_teleballoon.c
+++ b/src/teleballoon-v1.1/ao_teleballoon.c
@@ -52,6 +52,8 @@ main(void)
                while (P1_3 == 0)
                        ;
        }
+       ao_task_init();
+
        ao_timer_init();
        ao_adc_init();
        ao_beep_init();

diff --git a/src/telefire-v0.1/ao_telefire.c b/src/telefire-v0.1/ao_telefire.c
index cc0f668fc6b6374c663df8e25c5326b1bb6de20d..afa09e20e2db339508b183fc0d56430ba255b915 100644 (file)
--- a/src/telefire-v0.1/ao_telefire.c
+++ b/src/telefire-v0.1/ao_telefire.c
@@ -27,6 +27,8 @@ main(void)
 
        ao_led_init(LEDS_AVAILABLE);
 
+       ao_task_init();
+
        ao_timer_init();
        ao_adc_init();
        ao_beep_init();

diff --git a/src/telelco-v0.1/ao_telelco.c b/src/telelco-v0.1/ao_telelco.c
index 080a140b74137b2eca08b699c57458629fda6da1..70665ec699622735e1d3b5f665ca1c84d2631871 100644 (file)
--- a/src/telelco-v0.1/ao_telelco.c
+++ b/src/telelco-v0.1/ao_telelco.c
@@ -36,6 +36,8 @@ main(void)
        
        ao_led_init(LEDS_AVAILABLE);
        ao_led_on(AO_LED_GREEN);
+       ao_task_init();
+
        ao_timer_init();
 
        ao_spi_init();

diff --git a/src/telescience-v0.2/ao_telescience.c b/src/telescience-v0.2/ao_telescience.c
index 2fb3186a57b6b4944da77b1245a12bbf4c46cd23..74eef8f48147659492e8ae873ae95538401db361 100644 (file)
--- a/src/telescience-v0.2/ao_telescience.c
+++ b/src/telescience-v0.2/ao_telescience.c
@@ -29,9 +29,11 @@ main(void)
        ao_mpu_init();
 #endif
 
-       ao_task_init();
        ao_led_init(LEDS_AVAILABLE);
        ao_led_on(AO_LED_GREEN);
+
+       ao_task_init();
+
        ao_timer_init();
 
        ao_spi_init();

diff --git a/src/teleshield-v0.1/ao_teleshield.c b/src/teleshield-v0.1/ao_teleshield.c
index 4c32817af214eb3cc624ea41f2b2589c71e6e757..d602f6464005c2e3708171b80082c4b883da9ce4 100644 (file)
--- a/src/teleshield-v0.1/ao_teleshield.c
+++ b/src/teleshield-v0.1/ao_teleshield.c
@@ -29,6 +29,7 @@ main(void)
        /* Turn on the LED until the system is stable */
        ao_led_init(LEDS_AVAILABLE);
        ao_led_on(AO_LED_RED);
+       ao_task_init();
        ao_timer_init();
        ao_cmd_init();
        ao_spi_init();