Add missing assert.

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

diff --git a/app/at91sam7s/at91sam7s.c b/app/at91sam7s/at91sam7s.c
index 371c7dc63f57fe8166885d716a9275d752485679..275af6e565faf6246d980d8d198ed674a8af9ac7 100644 (file)
--- a/app/at91sam7s/at91sam7s.c
+++ b/app/at91sam7s/at91sam7s.c
@@ -46,6 +46,7 @@
 #include <io/arm.h>
 
 Timer leds_timer;
+Serial ser_fd;
 
 static void leds_toggle(void)
 {
@@ -71,24 +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();
+       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);
 
-       /* Open the main communication port */
-       Serial *host_port1 = ser_open(1);
-       ser_setbaudrate(host_port1, 115200);
-       ser_setparity(host_port1, SER_PARITY_NONE);
 
        IRQ_ENABLE;
        ASSERT(IRQ_ENABLED());
@@ -107,36 +102,15 @@ int main(void)
        /* turn first led on */
        PIOA_CODR  = 0x00000001;
 
+       timer_setSoftint(&leds_timer, (Hook)leds_toggle, 0);
+       timer_setDelay(&leds_timer, ms_to_ticks(100));
+       timer_add(&leds_timer);
 
-//     timer_set_event_softint(&leds_timer, (Hook)leds_toggle, 0);
-//     timer_setDelay(&leds_timer, ms_to_ticks(100));
-//     timer_add(&leds_timer);
-
-       int a=0;
+       ASSERT(proc_testRun() == 0);
        // Main loop
        for(;;)
        {
-//             proc_test();
-
-               a = ser_getchar(host_port1);
-
-               if(a == 49)
-                       PIOA_CODR  = 0x0000000F;
-               if(a == 50)
-               {
-                       PIOA_SODR  = 0x0000000A;
-                       ser_printf(host_port, "%c", a);
-               }
-
-               if(a == 51)
-                       PIOA_CODR  = 0x0000000F;
-               if(a == 52)
-               {
-                       PIOA_SODR  = 0x00000005;
-                       ser_printf(host_port1, "%c", a);
-               }
-
+               kfile_printf(&ser_fd.fd, "From serial 0: %s\r\n", msg);
        }
-
        return 0;
 }