[lcd4linux @ 2005-12-12 05:52:03 by reinelt]

type of delays is 'unsigned long'

4 files changed, 24 insertions, 16 deletions

diff --git a/drv_HD44780.c b/drv_HD44780.c
index 9a636bd..52b03dd 100644
--- a/drv_HD44780.c
+++ b/drv_HD44780.c
@@ -1,4 +1,4 @@
-/* $Id: drv_HD44780.c,v 1.55 2005/10/02 07:58:48 reinelt Exp $
+/* $Id: drv_HD44780.c,v 1.56 2005/12/12 05:52:03 reinelt Exp $
  *
  * new style driver for HD44780-based displays
  *
@@ -32,6 +32,9 @@
  *
  *
  * $Log: drv_HD44780.c,v $
+ * Revision 1.56  2005/12/12 05:52:03  reinelt
+ * type of delays is 'unsigned long'
+ *
  * Revision 1.55  2005/10/02 07:58:48  reinelt
  * HD44780 address setup time increased
  *
@@ -386,8 +389,8 @@ static MODEL Models[] = {
 /****************************************/
 
 static int (*drv_HD_load) (const char *section);
-static void (*drv_HD_command) (const unsigned char controller, const unsigned char cmd, const int delay);
-static void (*drv_HD_data) (const unsigned char controller, const char *string, const int len, const int delay);
+static void (*drv_HD_command) (const unsigned char controller, const unsigned char cmd, const unsigned long delay);
+static void (*drv_HD_data) (const unsigned char controller, const char *string, const int len, const unsigned long delay);
 static void (*drv_HD_stop) (void);
 
 
@@ -566,7 +569,7 @@ static void drv_HD_PP_byte(const unsigned char controller, const unsigned char d
 }
 
 
-static void drv_HD_PP_command(const unsigned char controller, const unsigned char cmd, const int delay)
+static void drv_HD_PP_command(const unsigned char controller, const unsigned char cmd, const unsigned long delay)
 {
     unsigned char enable;
 
@@ -613,7 +616,7 @@ static void drv_HD_PP_command(const unsigned char controller, const unsigned cha
 }
 
 
-static void drv_HD_PP_data(const unsigned char controller, const char *string, const int len, const int delay)
+static void drv_HD_PP_data(const unsigned char controller, const char *string, const int len, const unsigned long delay)
 {
     int l = len;
     unsigned char enable;
@@ -906,7 +909,7 @@ static void drv_HD_I2C_byte(const unsigned char controller, const unsigned char
 
 
 static void drv_HD_I2C_command(const unsigned char controller, const unsigned char cmd, __attribute__ ((unused))
-			       const int delay)
+			       const unsigned long delay)
 {
     /* send data with RS disabled */
     drv_HD_I2C_nibble(controller, ((cmd >> 4) & 0x0f));
@@ -914,7 +917,7 @@ static void drv_HD_I2C_command(const unsigned char controller, const unsigned ch
 }
 
 static void drv_HD_I2C_data(const unsigned char controller, const char *string, const int len, __attribute__ ((unused))
-			    const int delay)
+			    const unsigned long delay)
 {
     int l = len;
 
diff --git a/drv_generic_parport.c b/drv_generic_parport.c
index 6d65a23..697634b 100644
--- a/drv_generic_parport.c
+++ b/drv_generic_parport.c
@@ -1,4 +1,4 @@
-/* $Id: drv_generic_parport.c,v 1.19 2005/06/19 17:57:06 reinelt Exp $
+/* $Id: drv_generic_parport.c,v 1.20 2005/12/12 05:52:03 reinelt Exp $
  *
  * generic driver helper for serial and parport access
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: drv_generic_parport.c,v $
+ * Revision 1.20  2005/12/12 05:52:03  reinelt
+ * type of delays is 'unsigned long'
+ *
  * Revision 1.19  2005/06/19 17:57:06  reinelt
  * cosmetics...
  *
@@ -210,7 +213,6 @@ int drv_generic_parport_open(const char *section, const char *driver)
 	    error("%s: open(%s) failed: %s", Driver, PPdev, strerror(errno));
 	    return -1;
 	}
-
 #if 0
 	/* PPEXCL fails if someone else uses the port (e.g. lp.ko) */
 	if (ioctl(PPfd, PPEXCL)) {
@@ -496,7 +498,7 @@ void drv_generic_parport_control(const unsigned char mask, const unsigned char v
 }
 
 
-void drv_generic_parport_toggle(const unsigned char bits, const int level, const int delay)
+void drv_generic_parport_toggle(const unsigned char bits, const int level, const unsigned long delay)
 {
     unsigned char value1, value2;
 
diff --git a/drv_generic_parport.h b/drv_generic_parport.h
index 089085c..73e5215 100644
--- a/drv_generic_parport.h
+++ b/drv_generic_parport.h
@@ -1,4 +1,4 @@
-/* $Id: drv_generic_parport.h,v 1.11 2005/05/08 04:32:44 reinelt Exp $
+/* $Id: drv_generic_parport.h,v 1.12 2005/12/12 05:52:03 reinelt Exp $
  *
  * generic driver helper for parallel port displays
  *
@@ -23,6 +23,9 @@
  *
  *
  * $Log: drv_generic_parport.h,v $
+ * Revision 1.12  2005/12/12 05:52:03  reinelt
+ * type of delays is 'unsigned long'
+ *
  * Revision 1.11  2005/05/08 04:32:44  reinelt
  * CodingStyle added and applied
  *
@@ -132,7 +135,7 @@ unsigned char drv_generic_parport_wire_data(const char *name, const char *deflt)
 void drv_generic_parport_direction(const int direction);
 unsigned char drv_generic_parport_status(void);
 void drv_generic_parport_control(const unsigned char mask, const unsigned char value);
-void drv_generic_parport_toggle(const unsigned char bit, const int level, const int delay);
+void drv_generic_parport_toggle(const unsigned char bit, const int level, const unsigned long delay);
 void drv_generic_parport_data(const unsigned char data);
 unsigned char drv_generic_parport_read(void);
 void drv_generic_parport_debug(void);
diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample
index 984d60d..da346fb 100644
--- a/lcd4linux.conf.sample
+++ b/lcd4linux.conf.sample
@@ -220,8 +220,8 @@ Display SimpleLCD {
 Display BA63 {
     Driver   'WincorNixdorf'
     Model    'BA63'
-#   Port     '/dev/tts/0'
-    Port     '/dev/tts/USB0'
+    Port     '/dev/tts/0'
+#   Port     '/dev/tts/USB0'
     Speed     9600
     BarChar   219
     SelfTest  0
@@ -839,12 +839,12 @@ Layout testMySQL {
 #Display 'M50530-24x8'
 #Display 'LCDTerm'
 #Display 'SimpleLCD'
-#Display 'BA63'
+Display 'BA63'
 #Display 'CT20x4'
 #Display 'T6963-240x64'
 #Display 'XWindow'
 #Display 'USBLCD'
-Display 'BWCT'
+#Display 'BWCT'
 #Display 'Image'
 #Display 'Trefon'
 #Display 'LPH7508-serdisplib'