From 2fa253477b2f12e033c7e337268ca1c4354a280a Mon Sep 17 00:00:00 2001 From: reinelt <> Date: Mon, 19 Aug 2002 07:52:19 +0000 Subject: [lcd4linux @ 2002-08-19 07:52:19 by reinelt] corrected type declaration of (*defchar)() --- USBLCD.c | 7 +++++-- bar.c | 11 +++++++---- bar.h | 7 +++++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/USBLCD.c b/USBLCD.c index 85c05db..2e1bf62 100644 --- 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 e48ae4d..837eee1 100644 --- 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 2864cc7..f8e4505 100644 --- 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 -- cgit v1.2.3