X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=examples%2Flm3s1968%2Flm3s1968.c;h=8a7d89556c00e4f3fd10a5b9a32680d709b90df0;hb=b9a16fa534d736d6c170c4a448c8d74d63e2f694;hp=a9e995e357834283450b41bb16b23dd83f63fc0e;hpb=2f91d0006f90e1dada0ac16bcc606ec0ea498ddc;p=bertos.git

diff --git a/examples/lm3s1968/lm3s1968.c b/examples/lm3s1968/lm3s1968.c
index a9e995e3..8a7d8955 100644
--- a/examples/lm3s1968/lm3s1968.c
+++ b/examples/lm3s1968/lm3s1968.c
@@ -38,6 +38,7 @@
 #include <cpu/irq.h>
 #include <drv/timer.h>
 #include <drv/ser.h>
+#include <drv/lcd_rit128x96.h>
 #include <gfx/gfx.h>
 #include <gfx/font.h>
 #include <gfx/text.h>
@@ -47,7 +48,7 @@
 #include "cfg/compiler.h"
 #include "cfg/cfg_gfx.h"
 
-#include "hw/hw_lcd.h"
+#include "hw/hw_rit128x96.h"
 
 #define PROC_STACK_SIZE	KERN_MINSTACKSIZE
 
@@ -63,14 +64,14 @@ static PROC_DEFINE_STACK(ser_stack, PROC_STACK_SIZE);
 static PROC_DEFINE_STACK(led_stack, PROC_STACK_SIZE);
 #endif
 
-static Process *hp_proc, *lp_proc, *res_proc;
-
-static hptime_t start, end;
-
+extern Font font_helvB10;
 static uint8_t raster[RAST_SIZE(LCD_WIDTH, LCD_HEIGHT)];
 static Bitmap bm;
 
-extern Font font_helvB10;
+static Process *hp_proc, *lp_proc, *res_proc;
+static hptime_t start, end;
+
+static Serial ser_port;
 
 static void led_init(void)
 {
@@ -110,6 +111,23 @@ static void NORETURN led_process(void)
 	}
 }
 
+static void NORETURN ser_process(void)
+{
+	char buf[32];
+	int i;
+
+	ser_init(&ser_port, SER_UART0);
+	ser_setbaudrate(&ser_port, 115200);
+
+	/* BeRTOS terminal */
+	for (i = 0; ; i++)
+	{
+		kfile_printf(&ser_port.fd, "\n\r[%03d] BeRTOS:~$ ", i);
+		kfile_gets_echo(&ser_port.fd, buf, sizeof(buf), true);
+		kfile_printf(&ser_port.fd, "%s", buf);
+	}
+}
+
 INLINE hptime_t get_hp_ticks(void)
 {
 	return (TIMER_HW_CNT - timer_hw_hpread()) +
@@ -214,24 +232,6 @@ static void bouncing_logo(Bitmap *bm)
 	}
 }
 
-static void NORETURN ser_process(void)
-{
-	char buf[32];
-	Serial ser_port;
-	int i;
-
-	ser_init(&ser_port, SER_UART0);
-	ser_setbaudrate(&ser_port, 115200);
-
-	/* BeRTOS terminal */
-	for (i = 0; ; i++)
-	{
-		kfile_printf(&ser_port.fd, "\n\r[%03d] BeRTOS:~$ ", i);
-		kfile_gets_echo(&ser_port.fd, buf, sizeof(buf), true);
-		kfile_printf(&ser_port.fd, "%s", buf);
-	}
-}
-
 int main(void)
 {
 	char buffer[32];