X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=app%2Fat91sam7s%2Fat91sam7s.c;h=4b442ec8214067cec9a678df37595b8e9e5512c6;hb=0620ea1408c9976801504b1741749519cd6bb6c2;hp=4e75cf4e6372fa505bf62125fe3c0f398858fae6;hpb=0ace0d776cdbb34ed7f4aaa0815d4e2dd46fcec7;p=bertos.git

diff --git a/app/at91sam7s/at91sam7s.c b/app/at91sam7s/at91sam7s.c
index 4e75cf4e..4b442ec8 100644
--- 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,52 +72,45 @@ 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());
 
 	/* 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_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_setSoftint(&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;
+		proc_testRun();
+		kfile_printf(&ser_fd.fd, "From serial 0: %s\r\n", msg);
 	}
-
 	return 0;
 }
-