Update preset.

[bertos.git] / bertos / drv / lcd_text.h

diff --git a/bertos/drv/lcd_text.h b/bertos/drv/lcd_text.h
index e86d701f121cc598cb6ad5a8ffdd4082a02991a4..09a1c70e7687aa611e65606c75b77cde5034d0b7 100644 (file)
--- a/bertos/drv/lcd_text.h
+++ b/bertos/drv/lcd_text.h
@@ -32,9 +32,11 @@
  *
  * \brief Generic text LCD driver (interface).
  *
- * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  * \author Stefano Fedrigo <aleph@develer.com>
+ *
+ * $WIZ$ module_name = "lcd_text"
+ * $WIZ$ module_depends = "lcd_hd44", "timer", "formatwr"
  */
 
 #ifndef DRV_LCD_H
@@ -59,11 +61,11 @@
 #define LAYER_HIDDEN   -127
 
 /* Compute LCD address from x/y coordinates */
-#define LCD_POS(x,y)  ((lcdpos_t)((uint8_t)(x) + (uint8_t)(y) * (uint8_t)LCD_COLS))
-#define LCD_ROW0  (LCD_COLS * 0)
-#define LCD_ROW1  (LCD_COLS * 1)
-#define LCD_ROW2  (LCD_COLS * 2)
-#define LCD_ROW3  (LCD_COLS * 3)
+#define LCD_POS(x,y)  ((lcdpos_t)((uint8_t)(x) + (uint8_t)(y) * (uint8_t)CONFIG_LCD_COLS))
+#define LCD_ROW0  (CONFIG_LCD_COLS * 0)
+#define LCD_ROW1  (CONFIG_LCD_COLS * 1)
+#define LCD_ROW2  (CONFIG_LCD_COLS * 2)
+#define LCD_ROW3  (CONFIG_LCD_COLS * 3)
 
 /**
  * Overwrapping layer context.
@@ -80,7 +82,7 @@ typedef struct _Layer
        lcdpos_t addr;
 
        /** Priority of this layer (greater in front of lesser). */
-       char pri;
+       signed char pri;
 
        /**
         * Layer backing store buffer.
@@ -89,7 +91,7 @@ typedef struct _Layer
         * Characters cells with value 0 are transparent with respect
         * to other layers in the background.
         */
-       char buf[LCD_COLS * LCD_ROWS];
+       char buf[CONFIG_LCD_COLS * CONFIG_LCD_ROWS];
 } Layer;