X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Flcd_hd44.c;h=01bd423d26214906c932785e4c6beef23814da75;hb=71daf6b25bbb86414b47f9c21426a5441c2c3c75;hp=ecfea365aa3b6df26bbbffbb28b4dd0df5f961bd;hpb=0c2f7108e2f9b6fa567bc83dda9a313fffceb286;p=bertos.git

diff --git a/drv/lcd_hd44.c b/drv/lcd_hd44.c
index ecfea365..01bd423d 100755
--- a/drv/lcd_hd44.c
+++ b/drv/lcd_hd44.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2005 Develer S.r.l. (http://www.develer.com/)
@@ -14,6 +14,15 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
+ *#*
+ *#* Revision 1.2  2006/07/19 12:56:25  bernie
+ *#* Convert to new Doxygen style.
+ *#*
  *#* Revision 1.1  2005/11/04 18:00:42  bernie
  *#* Import into DevLib.
  *#*
@@ -34,8 +43,8 @@
  *#*/
 
 #include "lcd_hd44.h"
-#include "lcd_bus_pz.h"
-#include <arch_config.h>
+#include "hw_lcd.h"
+#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)
@@ -46,10 +55,12 @@
 	#error Incomplete or missing LCD_READ/LCD_WRITE macros
 #endif
 
-/*! Flag di stato del display */
+/** 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).
  */
@@ -96,8 +107,28 @@ static const uint8_t lcd_address[] =
 };
 
 STATIC_ASSERT(countof(lcd_address) == LCD_ROWS * LCD_COLS);
+#else  /* CONFIG_LCD_ADDRESS_FAST == 0 */
+
+static uint8_t col_address[] =
+{
+	0x80,
+	0xC0,
+#if LCD_ROWS > 2
+	0x94,
+	0xD4
+#endif
+};
 
-/*!
+/**
+ * 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
  * LCD output by avoiding to set the address every time.
  */
@@ -181,7 +212,7 @@ INLINE uint8_t lcd_dataRead(void)
 	/* Read data */
 	LCD_SET_E;
 	LCD_DELAY_READ;
-	data |= LCD_READ;
+	data = LCD_READ;
 	LCD_CLR_E;
 	LCD_DELAY_READ;
 
@@ -260,7 +291,7 @@ extern uint8_t Emul_LCDReadData(void);
 #endif /* ARCH_EMUL */
 
 
-/*!
+/**
  * Wait until the LCD busy flag clears.
  */
 void lcd_waitBusy(void)
@@ -274,7 +305,7 @@ void lcd_waitBusy(void)
 }
 
 
-/*!
+/**
  * Move the cursor to \a addr, only if not already there.
  */
 void lcd_moveTo(uint8_t addr)
@@ -282,13 +313,13 @@ 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;
 	}
 }
 
 
-/*!
+/**
  * Write a value in LCD data register, waiting for the busy flag.
  */
 void lcd_setReg(uint8_t val)
@@ -298,7 +329,7 @@ void lcd_setReg(uint8_t val)
 }
 
 #include <cfg/debug.h>
-/*!
+/**
  * Write the character \a c on display address \a addr.
  *
  * NOTE: argh, the HD44 lcd type is a bad beast: our
@@ -308,7 +339,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);
@@ -320,11 +351,11 @@ 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));
 }
 
 
-/*!
+/**
  * Remap the glyph of a character.
  *
  * glyph - bitmap of 8x8 bits.
@@ -345,7 +376,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));
 }
 
 
@@ -388,8 +419,9 @@ void lcd_hw_init(void)
 	lcd_regWrite(LCD_CMD_CLEAR);
 	timer_delay(2);
 
-	//lcd_regWrite(LCD_CMD_RESET_DDRAM); 4 bit mode doesn't allow char reprogramming
-
+#if !CONFIG_LCD_4BIT
+	lcd_regWrite(LCD_CMD_RESET_DDRAM); // 4 bit mode doesn't allow char reprogramming
+#endif
 	lcd_regWrite(LCD_CMD_DISPLAYMODE);
 	timer_delay(2);
 }