[lcd4linux @ 2002-08-19 07:52:19 by reinelt]

corrected type declaration of (*defchar)()

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

diff --git a/USBLCD.c b/USBLCD.c
index 85c05dbf37bbfa0aa0594f44b31013f65926db54..2e1bf624fd27a183569460b46a3ec1631d6dcc95 100644 (file)
--- a/USBLCD.c
+++ b/USBLCD.c
@@ -1,4 +1,4 @@
-/* $Id: USBLCD.c,v 1.5 2002/08/19 07:36:29 reinelt Exp $
+/* $Id: USBLCD.c,v 1.6 2002/08/19 07:52:19 reinelt Exp $
  *
  * Driver for USBLCD ( see http://www.usblcd.de )
  * This Driver is based on HD44780.c
@@ -22,6 +22,9 @@
  *
  *
  * $Log: USBLCD.c,v $
+ * Revision 1.6  2002/08/19 07:52:19  reinelt
+ * corrected type declaration of (*defchar)()
+ *
  * Revision 1.5  2002/08/19 07:36:29  reinelt
  *
  * finished bar.c, USBLCD is the first driver that uses the generic bar functions
@@ -172,7 +175,7 @@ static int USBLCD_open (void)
   return 0;
 }
 
-static void USBLCD_define_char (int ascii, char *buffer)
+void USBLCD_define_char (int ascii, char *buffer)
 {
   USBLCD_command (0x40|8*ascii);
   USBLCD_write (buffer, 8);

diff --git a/bar.c b/bar.c
index e48ae4d9c6d831a471fff58f81a27dbbbe622058..837eee13d321ed27551bb9ed894761afae1919c1 100644 (file)
--- a/bar.c
+++ b/bar.c
@@ -1,4 +1,4 @@
-/* $Id: bar.c,v 1.2 2002/08/19 07:36:29 reinelt Exp $
+/* $Id: bar.c,v 1.3 2002/08/19 07:52:19 reinelt Exp $
  *
  * generic bar handling
  *
@@ -20,6 +20,9 @@
  *
  *
  * $Log: bar.c,v $
+ * Revision 1.3  2002/08/19 07:52:19  reinelt
+ * corrected type declaration of (*defchar)()
+ *
  * Revision 1.2  2002/08/19 07:36:29  reinelt
  *
  * finished bar.c, USBLCD is the first driver that uses the generic bar functions
@@ -41,7 +44,7 @@
  *
  * int bar_draw (int type, int row, int col, int max, int len1, int len2)
  *
- * int bar_process (void)
+ * int bar_process (void(*defchar)(int ascii, char *matrix))
  *
  * int bar_peek (int row, int col)
  *
@@ -311,7 +314,7 @@ static void pack_segments (void)
 }
 
 
-static void define_chars (int(*defchar)(int ascii, char *matrix))
+static void define_chars (void(*defchar)(int ascii, char *matrix))
 {
   int c, i, j;
   char buffer[8];
@@ -373,7 +376,7 @@ static void define_chars (int(*defchar)(int ascii, char *matrix))
 }
 
 
-int bar_process (int(*defchar)(int ascii, char *matrix))
+int bar_process (void(*defchar)(int ascii, char *matrix))
 {
   int n, s;
   

diff --git a/bar.h b/bar.h
index 2864cc7b80ef43cf054776cdd5f4d26ad1dd92af..f8e4505c50813310e52c1c33db2d5d1e61db627f 100644 (file)
--- a/bar.h
+++ b/bar.h
@@ -1,4 +1,4 @@
-/* $Id: bar.h,v 1.2 2002/08/19 07:36:29 reinelt Exp $
+/* $Id: bar.h,v 1.3 2002/08/19 07:52:19 reinelt Exp $
  *
  * generic bar handling
  *
@@ -20,6 +20,9 @@
  *
  *
  * $Log: bar.h,v $
+ * Revision 1.3  2002/08/19 07:52:19  reinelt
+ * corrected type declaration of (*defchar)()
+ *
  * Revision 1.2  2002/08/19 07:36:29  reinelt
  *
  * finished bar.c, USBLCD is the first driver that uses the generic bar functions
@@ -67,7 +70,7 @@ int  bar_init (int rows, int cols, int xres, int yres, int chars);
 void bar_clear(void);
 void bar_add_segment(int len1, int len2, int type, int ascii);
 int  bar_draw (int type, int row, int col, int max, int len1, int len2);
-int  bar_process (int(*defchar)(int ascii, char *matrix));
+int  bar_process (void(*defchar)(int ascii, char *matrix));
 int  bar_peek (int row, int col);
 
 #endif