diff options
| -rw-r--r-- | HD44780.c | 15 | ||||
| -rw-r--r-- | MatrixOrbital.c | 11 | ||||
| -rw-r--r-- | T6963.c | 11 |
3 files changed, 22 insertions, 15 deletions
@@ -1,4 +1,4 @@ -/* $Id: HD44780.c,v 1.42 2003/09/21 06:43:02 reinelt Exp $ +/* $Id: HD44780.c,v 1.43 2003/09/29 06:12:56 reinelt Exp $ * * driver for display modules based on the HD44780 chip * @@ -27,11 +27,14 @@ * * * $Log: HD44780.c,v $ + * Revision 1.43 2003/09/29 06:12:56 reinelt + * changed default HD44780 wiring: unused signals are GND + * * Revision 1.42 2003/09/21 06:43:02 reinelt * * * MatrixOrbital: bidirectional communication - * HD44780: special handling for 16x1 displays (thanks to anonymous bug report on sf.net) + * HD44780: special handling for 16x1 displays (thanks to Maciej Witkowiak) * * Revision 1.41 2003/09/13 06:20:39 reinelt * HD44780 timings changed; deactivated libtool @@ -485,15 +488,15 @@ int HD_init (LCD *Self) if (Bits==8) { if ((SIGNAL_RS = parport_wire_ctrl ("RS", "AUTOFD"))==0xff) return -1; - if ((SIGNAL_RW = parport_wire_ctrl ("RW", "GND") )==0xff) return -1; + if ((SIGNAL_RW = parport_wire_ctrl ("RW", "GND" ))==0xff) return -1; if ((SIGNAL_ENABLE = parport_wire_ctrl ("ENABLE", "STROBE"))==0xff) return -1; - if ((SIGNAL_ENABLE2 = parport_wire_ctrl ("ENABLE2", "SELECT"))==0xff) return -1; - if ((SIGNAL_GPO = parport_wire_ctrl ("GPO", "INIT") )==0xff) return -1; + if ((SIGNAL_ENABLE2 = parport_wire_ctrl ("ENABLE2", "GND" ))==0xff) return -1; + if ((SIGNAL_GPO = parport_wire_ctrl ("GPO", "GND" ))==0xff) return -1; } else { if ((SIGNAL_RS = parport_wire_data ("RS", "DB4"))==0xff) return -1; if ((SIGNAL_RW = parport_wire_data ("RW", "DB5"))==0xff) return -1; if ((SIGNAL_ENABLE = parport_wire_data ("ENABLE", "DB6"))==0xff) return -1; - if ((SIGNAL_ENABLE2 = parport_wire_data ("ENABLE2", "DB7"))==0xff) return -1; + if ((SIGNAL_ENABLE2 = parport_wire_data ("ENABLE2", "GND"))==0xff) return -1; if ((SIGNAL_GPO = parport_wire_data ("GPO", "GND"))==0xff) return -1; } diff --git a/MatrixOrbital.c b/MatrixOrbital.c index b25bc37..ef3db4d 100644 --- a/MatrixOrbital.c +++ b/MatrixOrbital.c @@ -1,4 +1,4 @@ -/* $Id: MatrixOrbital.c,v 1.42 2003/09/21 06:43:02 reinelt Exp $ +/* $Id: MatrixOrbital.c,v 1.43 2003/09/29 06:12:56 reinelt Exp $ * * driver for Matrix Orbital serial display modules * @@ -20,11 +20,14 @@ * * * $Log: MatrixOrbital.c,v $ + * Revision 1.43 2003/09/29 06:12:56 reinelt + * changed default HD44780 wiring: unused signals are GND + * * Revision 1.42 2003/09/21 06:43:02 reinelt * * * MatrixOrbital: bidirectional communication - * HD44780: special handling for 16x1 displays (thanks to anonymous bug report on sf.net) + * HD44780: special handling for 16x1 displays (thanks to Maciej Witkowiak) * * Revision 1.41 2003/09/13 06:45:43 reinelt * icons for all remaining drivers @@ -272,7 +275,7 @@ static int MO_read (char *string, int len) } if (ret<0) { - error("Cwlinux: read() failed: %s", strerror(errno)); + error("MatrixOrbital: read() failed: %s", strerror(errno)); } return ret; @@ -447,8 +450,6 @@ static int MO_init (LCD *Self, int protocol) usleep(100000); MO_read (buffer, 1); debug ("Version number=<0x%x>", *buffer); - - #endif return 0; @@ -1,4 +1,4 @@ -/* $Id: T6963.c,v 1.11 2003/09/13 06:45:43 reinelt Exp $ +/* $Id: T6963.c,v 1.12 2003/09/29 06:12:56 reinelt Exp $ * * driver for display modules based on the Toshiba T6963 chip * @@ -20,6 +20,9 @@ * * * $Log: T6963.c,v $ + * Revision 1.12 2003/09/29 06:12:56 reinelt + * changed default HD44780 wiring: unused signals are GND + * * Revision 1.11 2003/09/13 06:45:43 reinelt * icons for all remaining drivers * @@ -110,7 +113,7 @@ void T6_status1 (void) // lower CE and RD parport_control (SIGNAL_CE | SIGNAL_RD, 0); - + // Access Time: 150 ns ndelay(150); @@ -130,7 +133,7 @@ void T6_status1 (void) // Output Hold Time: 50 ns ndelay(50); - + // turn on data line drivers parport_direction (0); } @@ -367,7 +370,7 @@ int T6_init (LCD *Self) if ((SIGNAL_WR=parport_wire_ctrl ("WR", "INIT") )==0xff) return -1; if (parport_open() != 0) { - error ("HD44780: could not initialize parallel port!"); + error ("T6963: could not initialize parallel port!"); return -1; } |