X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=examples%2Flm3s1968%2Fhw%2Fhw_lcd.h;h=4a6ceb9d163f48a63006c9162b1032c5a6d29494;hb=7ed78ec7125b2f79aaf7a6369e6c295749009fde;hp=abffecc8763c7b84f948faffc5d32af0dbd11d11;hpb=c05941e41ee333ab29af6bb62ecc08862c7321fd;p=bertos.git

diff --git a/examples/lm3s1968/hw/hw_lcd.h b/examples/lm3s1968/hw/hw_lcd.h
index abffecc8..4a6ceb9d 100644
--- a/examples/lm3s1968/hw/hw_lcd.h
+++ b/examples/lm3s1968/hw/hw_lcd.h
@@ -38,8 +38,9 @@
 #ifndef HW_LCD_H
 #define HW_LCD_H
 
-#include <cfg/macros.h>   /* BV() */
-#include <cfg/debug.h>
+#include "cfg/macros.h"   /* BV() */
+#include "cfg/debug.h"
+#include "cfg/cfg_lcd.h" /* CONFIG_LCD_4BIT */
 
 #include <cpu/attr.h>
 #include <cpu/irq.h>
@@ -78,7 +79,7 @@
 #define LCD_WRITE(x)	lm3s_ssiWriteFrame(SSI0_BASE, x)
 
 /* Read data from the display */
-#define LCD_READ()					\
+#define LCD_READ					\
 	({						\
 		uint32_t frame;				\
 		lm3s_ssiReadFrame(SSI0_BASE, &frame);	\
@@ -97,7 +98,7 @@ INLINE void lcd_bus_init(void)
 	SYSCTL_RCGC1_R |= SYSCTL_RCGC1_SSI0;
 	SYSCTL_RCGC2_R |= SYSCTL_RCGC2_GPIOA;
 	SYSCTL_RCGC2_R |= SYSCTL_RCGC2_GPIOH;
-	__delay(512);
+	lm3s_busyWait(512);
 
 	/* Configure the SSI0CLK and SSIOTX pins for SSI operation. */
 	lm3s_gpio_pin_config(GPIO_PORTA_BASE, BV(2) | BV(3) | BV(5),