Add carriage return in ser_pritf (hyperterminal sux).

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

diff --git a/app/at91sam7s/at91sam7s.c b/app/at91sam7s/at91sam7s.c
index 4e75cf4e6372fa505bf62125fe3c0f398858fae6..dc52b23c22e5183feee384774e571d06c543c74b 100644 (file)
--- a/app/at91sam7s/at91sam7s.c
+++ b/app/at91sam7s/at91sam7s.c
@@ -45,10 +45,6 @@
 #include <cfg/macros.h>
 #include <io/arm.h>
 
-static int iort = 23;
-static int iort1 = 232;
-static int iort2 = 233;
-
 Timer leds_timer;
 
 static void leds_toggle(void)
@@ -75,12 +71,13 @@ 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_GETSTATE());
+       ASSERT(!IRQ_ENABLED());
 
 
 
@@ -89,38 +86,33 @@ int main(void)
        ser_setbaudrate(host_port, 115200);
        ser_setparity(host_port, SER_PARITY_NONE);
 
+
        IRQ_ENABLE;
-       ASSERT(IRQ_GETSTATE());
+       ASSERT(IRQ_ENABLED());
 
        /* 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_set_event_softint(&leds_timer, (Hook)leds_toggle, 0);
+       timer_setDelay(&leds_timer, ms_to_ticks(100));
+       timer_add(&leds_timer);
 
        // Main loop
        for(;;)
        {
-               ser_printf(host_port," %s", "a");
-               kprintf("W la figa!\n");
                proc_test();
-               iort+= 1;
-               iort1+= 1;
-               iort2+= 1;
+               ser_printf(host_port, "From serial 0: %s\r\n", msg);
        }
-
        return 0;
 }
-