diff options
| -rw-r--r-- | drv_SimpleLCD.c | 13 | ||||
| -rw-r--r-- | lcd4linux.conf.sample | 25 | ||||
| -rw-r--r-- | lcd4linux_i2c.h | 7 |
3 files changed, 35 insertions, 10 deletions
diff --git a/drv_SimpleLCD.c b/drv_SimpleLCD.c index 872eff5..d68947d 100644 --- a/drv_SimpleLCD.c +++ b/drv_SimpleLCD.c @@ -1,4 +1,4 @@ -/* $Id: drv_SimpleLCD.c,v 1.4 2005/05/08 04:32:44 reinelt Exp $ +/* $Id: drv_SimpleLCD.c,v 1.5 2005/07/06 04:40:18 reinelt Exp $ * * driver for a simple serial terminal. * @@ -22,6 +22,9 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * $Log: drv_SimpleLCD.c,v $ + * Revision 1.5 2005/07/06 04:40:18 reinelt + * GCC-4 fixes + * * Revision 1.4 2005/05/08 04:32:44 reinelt * CodingStyle added and applied * @@ -198,6 +201,7 @@ static void drv_SL_vt100_write(const int row, const int col, const char *data, i static int drv_SL_start(const char *section, const int quiet) { int rows = -1, cols = -1; + int value; unsigned int flags = 0; char *s; char *model = 0; @@ -209,9 +213,10 @@ static int drv_SL_start(const char *section, const int quiet) vt100_mode = 1; } - cfg_number(section, "BarCharValue", 0, 0, 255, &flags); - bar_char = flags; - cfg_number(section, "Options", 0, 0, 0xffff, &flags); + cfg_number(section, "BarCharValue", 0, 0, 255, &value); + bar_char = value; + cfg_number(section, "Options", 0, 0, 0xffff, &value); + flags = value; if (drv_generic_serial_open(section, Name, flags) < 0) return -1; diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample index 7b39972..3acd250 100644 --- a/lcd4linux.conf.sample +++ b/lcd4linux.conf.sample @@ -114,6 +114,23 @@ Display HD44780-winamp { } } +# Dual-HD44780 display from Pollin +Display WDC2704M { + Driver 'HD44780' + Model 'generic' + Controllers 2 + UseBusy 1 + Port '/dev/parports/0' + Size '27x4' + Wire { + RW 'AUTOFD' + RS 'INIT' + ENABLE 'STROBE' + ENABLE2 'SLCTIN' + GPO 'GND' + } +} + # HD44780 display from www.kernelconcepts.de Display HD44780-kernelconcepts { Driver 'HD44780' @@ -648,7 +665,6 @@ Widget Rain { Widget Test { class 'Text' expression '1234567890123456789012345678901234567890' - #expression '|' width 40 } @@ -757,7 +773,8 @@ Layout testMySQL { #Display 'MI240' #Display 'CW12232' #Display 'HD44780-generic' -Display 'HD44780-WinAmp' +#Display 'HD44780-WinAmp' +Display 'WDC2704M' #Display 'SC1602D' #Display 'LCM-162' #Display 'CF631' @@ -774,8 +791,8 @@ Display 'HD44780-WinAmp' #Display 'Image' #Display 'Trefon' -#Layout 'Default' -Layout 'L8x2' +Layout 'Default' +#Layout 'L8x2' #Layout 'L16x2' #Layout 'L20x2' #Layout 'Test' diff --git a/lcd4linux_i2c.h b/lcd4linux_i2c.h index 13fa5e7..5978044 100644 --- a/lcd4linux_i2c.h +++ b/lcd4linux_i2c.h @@ -1,4 +1,4 @@ -/* $Id: lcd4linux_i2c.h,v 1.2 2005/06/01 12:09:13 reinelt Exp $ +/* $Id: lcd4linux_i2c.h,v 1.3 2005/07/06 04:40:18 reinelt Exp $ * * user space i2c sturctures and defines, taken from the official kernel i2c * includes to solve the problem when compiling user space application @@ -32,6 +32,9 @@ * * * $Log: lcd4linux_i2c.h,v $ + * Revision 1.3 2005/07/06 04:40:18 reinelt + * GCC-4 fixes + * * Revision 1.2 2005/06/01 12:09:13 reinelt * removed ^M from lcd4linux_i2c.h; indent.sh run * @@ -78,7 +81,7 @@ extern int i2c_master_recv(struct i2c_client *, char *, int); /* Transfer num messages. */ -extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[], int num); +extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num); /* * Some adapter types (i.e. PCF 8584 based ones) may support slave behaviuor. |