X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Flcd_text.c;h=ca27f22d50d2ec81c40d20292bf2363d8997ed65;hb=ab3c5d37b28cb17c4d7ded2c311c138a1e3a673a;hp=b1f3d6f19a2f9fdef8196ca0a8550cc084542e7d;hpb=6c7d29116e4b6ba206f0c5e59674794c447623e8;p=bertos.git

diff --git a/bertos/drv/lcd_text.c b/bertos/drv/lcd_text.c
index b1f3d6f1..ca27f22d 100644
--- a/bertos/drv/lcd_text.c
+++ b/bertos/drv/lcd_text.c
@@ -33,7 +33,7 @@
  * \brief Generic text LCD driver (impl.).
  *
  * \version $Id$
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
@@ -46,7 +46,7 @@
 #include <drv/timer.h> // timer_delay()
 
 #include <mware/formatwr.h> // _formatted_write()
-#include <mware/list.h> // LIST_EMPTY()
+#include <struct/list.h> // LIST_EMPTY()
 
 #include <string.h> // strlen()
 
@@ -54,15 +54,16 @@
 /** Maximum number of layers. */
 #define LCD_LAYERS 6
 
-#if CONFIG_KERNEL
+#if CONFIG_KERN
+	#include <kern/sem.h>
 	/** Semaphore to arbitrate access to the display. */
 	static struct Semaphore lcd_semaphore;
 	#define LOCK_LCD	sem_obtain(&lcd_semaphore)
 	#define UNLOCK_LCD	sem_release(&lcd_semaphore)
-#else /* !CONFIG_KERNEL */
+#else /* !CONFIG_KERN */
 	#define LOCK_LCD	do {} while (0)
 	#define UNLOCK_LCD	do {} while (0)
-#endif /* !CONFIG_KERNEL */
+#endif /* !CONFIG_KERN */
 
 DECLARE_LIST_TYPE(Layer);
 
@@ -91,7 +92,7 @@ void lcd_setAddr(Layer *layer, lcdpos_t addr)
 	layer->addr = addr;
 }
 
-#if CONFIG_KERNEL
+#if CONFIG_KERN
 
 void lcd_lock(void)
 {
@@ -104,7 +105,7 @@ void lcd_unlock(void)
 	UNLOCK_LCD;
 }
 
-#endif /* CONFIG_KERNEL */
+#endif /* CONFIG_KERN */
 
 
 /**