[lcd4linux @ 2005-05-05 08:36:12 by reinelt]

changed SELECT to SLCTIN

6 files changed, 34 insertions, 15 deletions

diff --git a/drv_HD44780.c b/drv_HD44780.c
index c47370a..881a0de 100644
--- a/drv_HD44780.c
+++ b/drv_HD44780.c
@@ -1,4 +1,4 @@
-/* $Id: drv_HD44780.c,v 1.47 2005/03/28 22:29:23 reinelt Exp $
+/* $Id: drv_HD44780.c,v 1.48 2005/05/05 08:36:12 reinelt Exp $
  *
  * new style driver for HD44780-based displays
  *
@@ -32,6 +32,9 @@
  *
  *
  * $Log: drv_HD44780.c,v $
+ * Revision 1.48  2005/05/05 08:36:12  reinelt
+ * changed SELECT to SLCTIN
+ *
  * Revision 1.47  2005/03/28 22:29:23  reinelt
  * HD44780 multiple displays patch from geronet
  *
@@ -658,7 +661,7 @@ static int drv_HD_PP_load (const char *section)
   /* Soft-Wiring */
   if (Capabilities & CAP_LCM162) {
     /* the LCM-162 is hardwired */
-    if ((SIGNAL_RS        = drv_generic_parport_hardwire_ctrl ("RS",        "SELECT")) == 0xff) return -1;
+    if ((SIGNAL_RS        = drv_generic_parport_hardwire_ctrl ("RS",        "SLCTIN")) == 0xff) return -1;
     if ((SIGNAL_RW        = drv_generic_parport_hardwire_ctrl ("RW",        "INIT"  )) == 0xff) return -1;
     if ((SIGNAL_ENABLE    = drv_generic_parport_hardwire_ctrl ("ENABLE",    "AUTOFD")) == 0xff) return -1;
     if ((SIGNAL_ENABLE2   = drv_generic_parport_hardwire_ctrl ("ENABLE2",   "GND"   )) == 0xff) return -1;
diff --git a/drv_M50530.c b/drv_M50530.c
index 1344391..93e6cd4 100644
--- a/drv_M50530.c
+++ b/drv_M50530.c
@@ -1,4 +1,4 @@
-#/* $Id: drv_M50530.c,v 1.16 2005/01/18 06:30:23 reinelt Exp $
+#/* $Id: drv_M50530.c,v 1.17 2005/05/05 08:36:12 reinelt Exp $
  *
  * new style driver for M50530-based displays
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: drv_M50530.c,v $
+ * Revision 1.17  2005/05/05 08:36:12  reinelt
+ * changed SELECT to SLCTIN
+ *
  * Revision 1.16  2005/01/18 06:30:23  reinelt
  * added (C) to all copyright statements
  *
@@ -286,7 +289,7 @@ static int drv_M5_start (const char *section, const int quiet)
   }
 
   if ((SIGNAL_EX   = drv_generic_parport_wire_ctrl ("EX",   "STROBE"))==0xff) return -1;
-  if ((SIGNAL_IOC1 = drv_generic_parport_wire_ctrl ("IOC1", "SELECT"))==0xff) return -1;
+  if ((SIGNAL_IOC1 = drv_generic_parport_wire_ctrl ("IOC1", "SLCTIN"))==0xff) return -1;
   if ((SIGNAL_IOC2 = drv_generic_parport_wire_ctrl ("IOC2", "AUTOFD"))==0xff) return -1;
   if ((SIGNAL_GPO  = drv_generic_parport_wire_ctrl ("GPO",  "GND"   ))==0xff) return -1;
 
diff --git a/drv_Noritake.c b/drv_Noritake.c
index 65a9d72..9b1678d 100644
--- a/drv_Noritake.c
+++ b/drv_Noritake.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Noritake.c,v 1.2 2005/05/04 07:18:44 obconseil Exp $
+/* $Id: drv_Noritake.c,v 1.3 2005/05/05 08:36:12 reinelt Exp $
  * 
  * Driver for a Noritake GU128x32-311 graphical display.
  * 
@@ -22,6 +22,9 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Log: drv_Noritake.c,v $
+ * Revision 1.3  2005/05/05 08:36:12  reinelt
+ * changed SELECT to SLCTIN
+ *
  * Revision 1.2  2005/05/04 07:18:44  obconseil
  * Driver modified according to Michels's recommendations :
  *
@@ -222,7 +225,7 @@ static int drv_GU311_start(const char *section)
   if ((SIGNAL_CS=drv_generic_parport_wire_ctrl    ("CS", "AUTOFD"))==0xff) return -1;
   if ((SIGNAL_WR=drv_generic_parport_wire_ctrl    ("WR", "STROBE"))==0xff) return -1;
   if ((SIGNAL_RESET=drv_generic_parport_wire_ctrl ("RESET", "INIT"))==0xff) return -1;
-  if ((SIGNAL_BLANK=drv_generic_parport_wire_ctrl ("BLANK", "SELECT")  )==0xff) return -1;
+  if ((SIGNAL_BLANK=drv_generic_parport_wire_ctrl ("BLANK", "SLCTIN")  )==0xff) return -1;
   /* SIGNAL_BUSY=PARPORT_STATUS_BUSY; */ /* Not currently needed */ 
   /* SIGNAL_FRP=PARPORT_STATUS_ACK;   */ /* Not currently needed */
   
diff --git a/drv_T6963.c b/drv_T6963.c
index 27dda0d..6338a54 100644
--- a/drv_T6963.c
+++ b/drv_T6963.c
@@ -1,4 +1,4 @@
-/* $Id: drv_T6963.c,v 1.14 2005/01/18 06:30:23 reinelt Exp $
+/* $Id: drv_T6963.c,v 1.15 2005/05/05 08:36:12 reinelt Exp $
  *
  * new style driver for T6963-based displays
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: drv_T6963.c,v $
+ * Revision 1.15  2005/05/05 08:36:12  reinelt
+ * changed SELECT to SLCTIN
+ *
  * Revision 1.14  2005/01/18 06:30:23  reinelt
  * added (C) to all copyright statements
  *
@@ -495,7 +498,7 @@ static int drv_T6_start (const char *section)
   }
   
   if ((SIGNAL_CE=drv_generic_parport_wire_ctrl ("CE", "STROBE"))==0xff) return -1;
-  if ((SIGNAL_CD=drv_generic_parport_wire_ctrl ("CD", "SELECT"))==0xff) return -1;
+  if ((SIGNAL_CD=drv_generic_parport_wire_ctrl ("CD", "SLCTIN"))==0xff) return -1;
   if ((SIGNAL_RD=drv_generic_parport_wire_ctrl ("RD", "AUTOFD"))==0xff) return -1;
   if ((SIGNAL_WR=drv_generic_parport_wire_ctrl ("WR", "INIT")  )==0xff) return -1;
   
diff --git a/drv_generic_parport.c b/drv_generic_parport.c
index e39da76..cb173bd 100644
--- a/drv_generic_parport.c
+++ b/drv_generic_parport.c
@@ -1,4 +1,4 @@
-/* $Id: drv_generic_parport.c,v 1.14 2005/05/04 06:13:05 reinelt Exp $
+/* $Id: drv_generic_parport.c,v 1.15 2005/05/05 08:36:12 reinelt Exp $
  *
  * generic driver helper for serial and parport access
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: drv_generic_parport.c,v $
+ * Revision 1.15  2005/05/05 08:36:12  reinelt
+ * changed SELECT to SLCTIN
+ *
  * Revision 1.14  2005/05/04 06:13:05  reinelt
  * parport_wire_status() added
  *
@@ -281,15 +284,19 @@ static unsigned char drv_generic_parport_signal_ctrl (const char *name, const ch
   } else if(strcasecmp(signal,"INIT") == 0) {
     wire = PARPORT_CONTROL_INIT;
     info ("%s: wiring: [DISPLAY:%s]<==>[PARPORT:INIT (Pin 16)]", Driver, name);
-  } else if(strcasecmp(signal,"SELECT") == 0 || strcasecmp(signal,"SLCTIN") == 0) {
+  } else if(strcasecmp(signal,"SLCTIN") == 0) {
+    wire = PARPORT_CONTROL_SELECT;
+    info ("%s: wiring: [DISPLAY:%s]<==>[PARPORT:SLCTIN (Pin 17)]", Driver, name);
+  } else if(strcasecmp(signal,"SELECT") == 0) {
     wire = PARPORT_CONTROL_SELECT;
+    error ("%s: SELECT is deprecated. Please use SLCTIN instead!", Driver);
     info ("%s: wiring: [DISPLAY:%s]<==>[PARPORT:SLCTIN (Pin 17)]", Driver, name);
   } else if(strcasecmp(signal,"GND") == 0) {
     wire = 0;
     info ("%s: wiring: [DISPLAY:%s]<==>[PARPORT:GND]", Driver, name);
   } else {
     error ("%s: unknown signal <%s> for control line <%s>", Driver, signal, name);
-    error ("%s: should be STROBE, AUTOFD, INIT, SELECT or GND", Driver);
+    error ("%s: should be STROBE, AUTOFD, INIT, SLCTIN or GND", Driver);
     return 0xff;
   }
   
@@ -359,7 +366,7 @@ static unsigned char drv_generic_parport_signal_status (const char *name, const
     info ("%s: wiring: [DISPLAY:%s]<==>[PARPORT:GND]", Driver, name);
   } else {
     error ("%s: unknown signal <%s> for status line <%s>", Driver, signal, name);
-    error ("%s: should be STROBE, AUTOFD, INIT, SELECT or GND", Driver);
+    error ("%s: should be ERROR, SELECT, PAPEROUT, ACK, BUSY or GND", Driver);
     return 0xff;
   }
   
@@ -574,7 +581,7 @@ void drv_generic_parport_debug(void)
       control=ctr;
     }
   
-  debug ("%cSTROBE %cAUTOFD %cINIT %cSELECT", 
+  debug ("%cSTROBE %cAUTOFD %cINIT %cSLCTIN", 
 	 control & PARPORT_CONTROL_STROBE ? '-':'+',
 	 control & PARPORT_CONTROL_AUTOFD ? '-':'+',
 	 control & PARPORT_CONTROL_INIT   ? '+':'-',
diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample
index 1175b34..c089d52 100644
--- a/lcd4linux.conf.sample
+++ b/lcd4linux.conf.sample
@@ -190,7 +190,7 @@ Display M50530-24x8 {
 #   Port '0x378'
     Size '24x8'
     Wire.EX   'STROBE'
-    Wire.IOC1 'SELECT'
+    Wire.IOC1 'SLCTIN'
     Wire.IOC2 'AUTOFD'
     Wire.GPO  'INIT'
 }
@@ -231,7 +231,7 @@ Display T6963-240x64 {
     Port '/dev/parport0'
     Size '240x64'
     Wire.CE 'STROBE'
-    Wire.CD 'SELECT'
+    Wire.CD 'SLCTIN'
     Wire.RD 'AUTOFD'
     Wire.WR 'INIT'
 }