X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Flcd_hd44.c;h=31f2335db71969890aa77e3f013d51ab8840aef3;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=0bd7b3440e115640727afe24f48ef52f7fd6c7b8;hpb=a341bd955d2b5a9eed4a77f3a341bc4eef476d51;p=bertos.git

diff --git a/drv/lcd_hd44.c b/drv/lcd_hd44.c
old mode 100755
new mode 100644
index 0bd7b344..31f2335d
--- a/drv/lcd_hd44.c
+++ b/drv/lcd_hd44.c
@@ -14,6 +14,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.5  2007/10/01 18:59:27  batt
+ *#* Set to const col_address; add static assert check on array dimension.
+ *#*
+ *#* Revision 1.4  2007/10/01 10:46:09  batt
+ *#* Add light LCD position computation.
+ *#*
  *#* Revision 1.3  2006/09/20 19:55:01  marco
  *#* Added CONFIG_LCD_4BIT.
  *#*
@@ -44,9 +50,19 @@
 #include <cfg/arch_config.h>
 #include <drv/timer.h>
 
+#if defined(LCD_READ_H) && defined(LCD_READ_L) && defined(LCD_WRITE_H) && defined(LCD_WRITE_L)
+	#define CONFIG_LCD_4BIT 1
+#elif defined(LCD_READ) && defined(LCD_WRITE)
+	#define CONFIG_LCD_4BIT 0
+#else
+	#error Incomplete or missing LCD_READ/LCD_WRITE macros
+#endif
+
 /** Flag di stato del display */
 #define LCDF_BUSY  BV(7)
 
+#if CONFIG_LCD_ADDRESS_FAST == 1
+#define lcd_address(x) lcd_address[x]
 /**
  * Addresses of LCD display character positions, expanded
  * for faster access (DB7 = 1).
@@ -94,6 +110,26 @@ static const uint8_t lcd_address[] =
 };
 
 STATIC_ASSERT(countof(lcd_address) == LCD_ROWS * LCD_COLS);
+#else  /* CONFIG_LCD_ADDRESS_FAST == 0 */
+
+static const uint8_t col_address[] =
+{
+	0x80,
+	0xC0,
+#if LCD_ROWS > 2
+	0x94,
+	0xD4
+#endif
+};
+STATIC_ASSERT(countof(col_address) == LCD_ROWS);
+/**
+ * Addresses of LCD display character positions, calculated runtime to save RAM
+ */
+static uint8_t lcd_address(uint8_t addr)
+{
+	return col_address[addr / LCD_COLS] + addr % LCD_COLS;
+}
+#endif /* CONFIG_LCD_ADDRESS_FAST */
 
 /**
  * Current display position. We remember this to optimize
@@ -280,7 +316,7 @@ void lcd_moveTo(uint8_t addr)
 	if (addr != lcd_current_addr)
 	{
 		lcd_waitBusy();
-		lcd_regWrite(lcd_address[addr]);
+		lcd_regWrite(lcd_address(addr));
 		lcd_current_addr = addr;
 	}
 }
@@ -306,7 +342,7 @@ void lcd_setReg(uint8_t val)
 void lcd_putc(uint8_t addr, uint8_t c)
 {
 	if (addr != lcd_current_addr)
-		lcd_setReg(lcd_address[addr]);
+		lcd_setReg(lcd_address(addr));
 
 	lcd_waitBusy();
 	lcd_dataWrite(c);
@@ -318,7 +354,7 @@ void lcd_putc(uint8_t addr, uint8_t c)
 
 	/* If we are at the end of a row put the cursor at the beginning of the next */
 	if (!(lcd_current_addr % LCD_COLS))
-		lcd_setReg(lcd_address[lcd_current_addr]);
+		lcd_setReg(lcd_address(lcd_current_addr));
 }
 
 
@@ -343,7 +379,7 @@ void lcd_remapChar(const char *glyph, char code)
 	}
 
 	/* Move back to original address */
-	lcd_setReg(lcd_address[lcd_current_addr]);
+	lcd_setReg(lcd_address(lcd_current_addr));
 }