X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Flcd_text.c;h=5cdb00581656169fa33a1535394981a8dbd7b9d9;hb=692b24f898b31b95e639c0f43f225ed1726719d3;hp=3ded59f3809dc0efaa93d3fc2305fc0285beb5ec;hpb=a5fdf78b7671975a529c0f6dcf085a275241a9f3;p=bertos.git

diff --git a/bertos/drv/lcd_text.c b/bertos/drv/lcd_text.c
index 3ded59f3..5cdb0058 100644
--- a/bertos/drv/lcd_text.c
+++ b/bertos/drv/lcd_text.c
@@ -27,39 +27,43 @@
  * the GNU General Public License.
  *
  * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
- *
+ * All Rights Reserved.
  * -->
  *
  * \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>
  */
 
 #include "lcd_text.h"
 #include "lcd_hd44.h"
-#include <drv/timer.h> // timer_delay()
-#include <mware/formatwr.h> // _formatted_write()
-#include <mware/list.h> // LIST_EMPTY()
+
 #include <cfg/macros.h> // BV()
 #include <cfg/debug.h>
 
+#include <drv/timer.h> // timer_delay()
+
+#include <mware/formatwr.h> // _formatted_write()
+#include <struct/list.h> // LIST_EMPTY()
+
 #include <string.h> // strlen()
 
 
 /** 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);
 
@@ -88,7 +92,7 @@ void lcd_setAddr(Layer *layer, lcdpos_t addr)
 	layer->addr = addr;
 }
 
-#if CONFIG_KERNEL
+#if CONFIG_KERN
 
 void lcd_lock(void)
 {
@@ -101,7 +105,7 @@ void lcd_unlock(void)
 	UNLOCK_LCD;
 }
 
-#endif /* CONFIG_KERNEL */
+#endif /* CONFIG_KERN */
 
 
 /**
@@ -434,6 +438,10 @@ static void lcd_setDefLayer(Layer *layer)
 #include <cfg/debug.h>
 void lcd_init(void)
 {
+	#if CONFIG_KERN
+	sem_init(&lcd_semaphore);
+	#endif
+
 	int i;
 
 	LIST_INIT(&lcd_Layers);
@@ -448,16 +456,4 @@ void lcd_init(void)
 	lcd_setCursor(0);
 }
 
-#if CONFIG_TEST
-void lcd_test(void)
-{
-	int i;
-
-	for (i = 0; i < LCD_ROWS * LCD_COLS; ++i)
-	{
-		lcd_putCharUnlocked('0' + (i % 10), lcd_DefLayer);
-		timer_delay(100);
-	}
-}
-#endif /* CONFIG_TEST */