Add missing assert.

[bertos.git] / app / at91sam7s / at91sam7s.c

diff --git a/app/at91sam7s/at91sam7s.c b/app/at91sam7s/at91sam7s.c
index 57fdd8fde89a04268585ead10237cf8f5d31df43..275af6e565faf6246d980d8d198ed674a8af9ac7 100644 (file)
--- a/app/at91sam7s/at91sam7s.c
+++ b/app/at91sam7s/at91sam7s.c
@@ -45,11 +45,8 @@
 #include <cfg/macros.h>
 #include <io/arm.h>
 
-static int iort = 23;
-static int iort1 = 232;
-static int iort2 = 233;
-
 Timer leds_timer;
+Serial ser_fd;
 
 static void leds_toggle(void)
 {
@@ -75,19 +72,18 @@ static void leds_toggle(void)
 
 int main(void)
 {
+       char msg[]="BeRTOS, be fast be beatiful be realtime";
        kdbg_init();
-       sysirq_init();
        timer_init();
 
        proc_init();
        ASSERT(!IRQ_ENABLED());
 
-
-
        /* Open the main communication port */
-       Serial *host_port = ser_open(0);
-       ser_setbaudrate(host_port, 115200);
-       ser_setparity(host_port, SER_PARITY_NONE);
+       ser_init(&ser_fd, 0);
+       ser_setbaudrate(&ser_fd, 115200);
+       ser_setparity(&ser_fd, SER_PARITY_NONE);
+
 
        IRQ_ENABLE;
        ASSERT(IRQ_ENABLED());
@@ -95,32 +91,26 @@ int main(void)
        /* Disable all pullups */
        PIOA_PUDR = 0xffffffff;
        /* Set PA0..3 connected to PIOA */
-       PIOA_PER  = 0x0000000f;
+       PIOA_PER  = 0x0000001f;
        /* Set PA0..3 as output */
-       PIOA_OER  = 0x0000000f;
+       PIOA_OER  = 0x0000001f;
        /* Disable multidrive on all pins */
-       PIOA_MDDR = 0x0000000f;
+       PIOA_MDDR = 0x0000001f;
 
        /* Set PA0..3 to 1 to turn off leds */
        PIOA_SODR  = 0x0000000f;
        /* turn first led on */
        PIOA_CODR  = 0x00000001;
 
-       timer_set_event_softint(&leds_timer, (Hook)leds_toggle, 0);
-       timer_setDelay(&leds_timer, ms_to_ticks(100));
-       timer_add(&leds_timer);
+       timer_setSoftint(&leds_timer, (Hook)leds_toggle, 0);
+       timer_setDelay(&leds_timer, ms_to_ticks(100));
+       timer_add(&leds_timer);
 
+       ASSERT(proc_testRun() == 0);
        // Main loop
        for(;;)
        {
-               ser_printf(host_port," %s", "a");
-               kprintf("W la figa!\n");
-               proc_test();
-               iort+= 1;
-               iort1+= 1;
-               iort2+= 1;
+               kfile_printf(&ser_fd.fd, "From serial 0: %s\r\n", msg);
        }
-
        return 0;
 }
-