[lcd4linux @ 2005-06-19 17:57:06 by reinelt]

cosmetics...

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@580 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/drv_generic_parport.c b/drv_generic_parport.c
index 9d5c07a60f18b9f6649acef9331addbe1c85601d..6d65a2305d84e34becf1834dbd6b7aeb017f861b 100644 (file)
--- a/drv_generic_parport.c
+++ b/drv_generic_parport.c
@@ -1,4 +1,4 @@
-/* $Id: drv_generic_parport.c,v 1.18 2005/06/13 03:43:46 reinelt Exp $
+/* $Id: drv_generic_parport.c,v 1.19 2005/06/19 17:57:06 reinelt Exp $
  *
  * generic driver helper for serial and parport access
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: drv_generic_parport.c,v $
+ * Revision 1.19  2005/06/19 17:57:06  reinelt
+ * cosmetics...
+ *
  * Revision 1.18  2005/06/13 03:43:46  reinelt
  * undo PPEXCL activation...
  *
@@ -284,23 +287,23 @@ static unsigned char drv_generic_parport_signal_ctrl(const char *name, const cha
 
     if (strcasecmp(signal, "STROBE") == 0) {
        wire = PARPORT_CONTROL_STROBE;
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:STROBE (Pin 1)]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:STROBE (Pin  1)", Driver, name);
     } else if (strcasecmp(signal, "AUTOFD") == 0) {
        wire = PARPORT_CONTROL_AUTOFD;
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:AUTOFD (Pin 14)]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:AUTOFD (Pin 14)", Driver, name);
     } else if (strcasecmp(signal, "INIT") == 0) {
        wire = PARPORT_CONTROL_INIT;
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:INIT (Pin 16)]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:INIT   (Pin 16)", Driver, name);
     } else if (strcasecmp(signal, "SLCTIN") == 0) {
        wire = PARPORT_CONTROL_SELECT;
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:SLCTIN (Pin 17)]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - 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);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:SLCTIN (Pin 17)", Driver, name);
     } else if (strcasecmp(signal, "GND") == 0) {
        wire = 0;
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:GND]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:GND", Driver, name);
     } else {
        error("%s: unknown signal <%s> for control line <%s>", Driver, signal, name);
        error("%s: should be STROBE, AUTOFD, INIT, SLCTIN or GND", Driver);
@@ -355,22 +358,22 @@ static unsigned char drv_generic_parport_signal_status(const char *name, const c
 
     if (strcasecmp(signal, "ERROR") == 0) {
        wire = PARPORT_STATUS_ERROR;
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:ERROR (Pin 15)]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:ERROR    (Pin 15)", Driver, name);
     } else if (strcasecmp(signal, "SELECT") == 0) {
        wire = PARPORT_STATUS_SELECT;
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:SELECT (Pin 13)]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:SELECT   (Pin 13)", Driver, name);
     } else if (strcasecmp(signal, "PAPEROUT") == 0) {
        wire = PARPORT_STATUS_PAPEROUT;
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:PAPEROUT (Pin 12)]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:PAPEROUT (Pin 12)", Driver, name);
     } else if (strcasecmp(signal, "ACK") == 0) {
        wire = PARPORT_STATUS_ACK;
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:ACK (Pin 10)]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:ACK      (Pin 10)", Driver, name);
     } else if (strcasecmp(signal, "BUSY") == 0) {
        wire = PARPORT_STATUS_BUSY;
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:BUSY (Pin 11)]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:BUSY     (Pin 11)", Driver, name);
     } else if (strcasecmp(signal, "GND") == 0) {
        wire = 0;
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:GND]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:GND", Driver, name);
     } else {
        error("%s: unknown signal <%s> for status line <%s>", Driver, signal, name);
        error("%s: should be ERROR, SELECT, PAPEROUT, ACK, BUSY or GND", Driver);
@@ -417,9 +420,9 @@ unsigned char drv_generic_parport_wire_data(const char *name, const char *deflt)
     }
     free(s);
     if (w == 0) {
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:GND]", Driver, name);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:GND", Driver, name);
     } else {
-       info("%s: wiring: [DISPLAY:%s]<==>[PARPORT:DB%d (Pin %d)]", Driver, name, w, w + 2);
+       info("%s: wiring: DISPLAY:%-9s - PARPORT:DB%d (Pin %2d)", Driver, name, w, w + 2);
     }
 
     w = 1 << w;

diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample
index 5ff5144c4921a1e7e5cdd848a6ee96fed6d1a614..7b39972dc6fa1184e00209bf2e6a42158efd59b3 100644 (file)
--- a/lcd4linux.conf.sample
+++ b/lcd4linux.conf.sample
@@ -103,7 +103,7 @@ Display HD44780-winamp {
     Driver 'HD44780'
     Model 'generic'
     UseBusy 1
-    Port '/dev/parport0'       
+    Port '/dev/parports/0'     
     Size '20x4'
     Wire {
        RW      'AUTOFD'
@@ -119,7 +119,7 @@ Display HD44780-kernelconcepts {
     Driver 'HD44780'
     Model 'HD66712'
     UseBusy 1
-    Port '/dev/parport0'       
+    Port '/dev/parports/0'     
     Size '20x4'
     Wire {
        RW      'AUTOFD'
@@ -132,7 +132,7 @@ Display HD44780-kernelconcepts {
 
 Display SC1602D {
     Driver 'HD44780'
-    Port '/dev/parport0'       
+    Port '/dev/parports/0'     
     Bits '8'
     Size '16x2'
     asc255bug 0
@@ -150,7 +150,7 @@ Display LCM-162 {
     Driver 'HD44780'
     Model 'LCM-162'
 #   Bus 'parport'
-    Port '/dev/parport0'       
+    Port '/dev/parports/0'     
     Size '16x2'
     UseBusy 1
     asc255bug 0
@@ -757,13 +757,14 @@ Layout testMySQL {
 #Display 'MI240'
 #Display 'CW12232'
 #Display 'HD44780-generic'
+Display 'HD44780-WinAmp'
 #Display 'SC1602D'
 #Display 'LCM-162'
 #Display 'CF631'
 #Display 'CF632'
 #Display 'CF633'
 #Display 'Curses'
-Display 'M50530-24x8'
+#Display 'M50530-24x8'
 #Display 'LCDTerm'
 #Display 'CT20x4'
 #Display 'T6963-240x64'