From d0c7529cb9833ede3595051df5599a11fe03be48 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Thu, 5 Apr 2007 15:25:19 +0200 Subject: import new upstream --- drv_Crystalfontz.c | 186 +++-------------------------------------------------- 1 file changed, 9 insertions(+), 177 deletions(-) (limited to 'drv_Crystalfontz.c') diff --git a/drv_Crystalfontz.c b/drv_Crystalfontz.c index bade58b..aef6fc1 100644 --- a/drv_Crystalfontz.c +++ b/drv_Crystalfontz.c @@ -1,4 +1,5 @@ -/* $Id: drv_Crystalfontz.c,v 1.45 2006/07/19 01:48:11 cmay Exp $ +/* $Id: drv_Crystalfontz.c 728 2007-01-14 11:14:38Z michael $ + * $URL: https://ssl.bulix.org/svn/lcd4linux/branches/0.10.1/drv_Crystalfontz.c $ * * new style driver for Crystalfontz display modules * @@ -21,176 +22,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * - * $Log: drv_Crystalfontz.c,v $ - * Revision 1.45 2006/07/19 01:48:11 cmay - * Ran indent.sh to make pretty code. - * - * Revision 1.44 2006/07/19 01:35:31 cmay - * Renamed keypad direction names to avoid conflict with Curses library defs. - * Added keypad support to Curses display driver. - * - * Revision 1.43 2006/07/14 20:15:11 reinelt - * buffer too small (thanks to anonymous) - * - * Revision 1.42 2006/02/22 15:59:39 cmay - * removed KEYPADSIZE cruft per harbaum's suggestion - * - * Revision 1.41 2006/02/21 15:52:30 cmay - * added back CF635 GPO counts in model struct lost after last merge - * - * Revision 1.40 2006/02/21 05:50:34 reinelt - * keypad support from Cris Maj - * - * Revision 1.39 2006/02/19 15:37:38 reinelt - * CF635 GPO patch from cmaj - * - * Revision 1.38 2006/01/30 06:25:49 reinelt - * added CVS Revision - * - * Revision 1.37 2006/01/06 08:12:19 reinelt - * GPO's for Crystalfontz - * - * Revision 1.36 2005/09/07 06:51:44 reinelt - * Support for CF635 added - * - * Revision 1.35 2005/08/21 08:18:56 reinelt - * CrystalFontz ACK processing - * - * Revision 1.34 2005/05/08 04:32:44 reinelt - * CodingStyle added and applied - * - * Revision 1.33 2005/04/02 05:28:58 reinelt - * fixed gcc4 warnings about signed/unsigned mismatches - * - * Revision 1.32 2005/03/23 12:23:35 reinelt - * fixed some signed/unsigned char mismatches in the Crystalfontz driver (ticket #12) - * - * Revision 1.31 2005/02/24 07:06:48 reinelt - * SimpleLCD driver added - * - * Revision 1.30 2005/01/18 06:30:22 reinelt - * added (C) to all copyright statements - * - * Revision 1.29 2004/06/26 12:04:59 reinelt - * - * uh-oh... the last CVS log message messed up things a lot... - * - * Revision 1.28 2004/06/26 09:27:20 reinelt - * - * added '-W' to CFLAGS - * changed all C++ comments to C ones - * cleaned up a lot of signed/unsigned mistakes - * - * Revision 1.27 2004/06/20 10:09:54 reinelt - * - * 'const'ified the whole source - * - * Revision 1.26 2004/06/06 06:51:59 reinelt - * - * do not display end splash screen if quiet=1 - * - * Revision 1.25 2004/06/05 06:41:39 reinelt - * - * chancged splash screen again - * - * Revision 1.24 2004/06/05 06:13:11 reinelt - * - * splash screen for all text-based display drivers - * - * Revision 1.23 2004/06/02 09:41:19 reinelt - * - * prepared support for startup splash screen - * - * Revision 1.22 2004/06/02 05:56:25 reinelt - * - * extended contrast range for Crystalfontz - * - * Revision 1.21 2004/06/01 06:45:28 reinelt - * - * some Fixme's processed - * documented some code - * - * Revision 1.20 2004/05/31 05:38:02 reinelt - * - * fixed possible bugs with user-defined chars (clear high bits) - * thanks to Andy Baxter for debugging the MilfordInstruments driver! - * - * Revision 1.19 2004/05/30 08:25:50 reinelt - * - * Crystalfontz 631 driver finished - * - * Revision 1.18 2004/05/28 13:51:42 reinelt - * - * ported driver for Beckmann+Egle Mini-Terminals - * added 'flags' parameter to serial_init() - * - * Revision 1.17 2004/05/27 03:39:47 reinelt - * - * changed function naming scheme to plugin::function - * - * Revision 1.16 2004/05/26 11:37:36 reinelt - * - * Curses driver ported. - * - * Revision 1.15 2004/05/25 14:26:29 reinelt - * - * added "Image" driver (was: Raster.c) for PPM and PNG creation - * fixed some glitches in the X11 driver - * - * Revision 1.14 2004/03/19 09:17:46 reinelt - * - * removed the extra 'goto' function, row and col are additional parameters - * of the write() function now. - * - * Revision 1.13 2004/03/03 03:41:02 reinelt - * Crystalfontz Contrast issue fixed - * - * Revision 1.12 2004/03/01 04:29:51 reinelt - * cfg_number() returns -1 on error, 0 if value not found (but default val used), - * and 1 if value was used from the configuration. - * HD44780 driver adopted to new cfg_number() - * Crystalfontz 631 driver nearly finished - * - * Revision 1.11 2004/02/14 11:56:17 reinelt - * M50530 driver ported - * changed lots of 'char' to 'unsigned char' - * - * Revision 1.10 2004/02/05 07:10:23 reinelt - * evaluator function names are no longer case-sensitive - * Crystalfontz Fan PWM control, Fan RPM monitoring, temperature monitoring - * - * Revision 1.9 2004/02/04 19:10:51 reinelt - * Crystalfontz driver nearly finished - * - * Revision 1.8 2004/02/01 08:05:12 reinelt - * Crystalfontz 633 extensions (CRC checking and stuff) - * Models table for HD44780 - * Noritake VFD BVrightness patch from Bill Paxton - * - * Revision 1.7 2004/01/30 20:57:56 reinelt - * HD44780 patch from Martin Hejl - * dmalloc integrated - * - * Revision 1.6 2004/01/29 04:40:02 reinelt - * every .c file includes "config.h" now - * - * Revision 1.5 2004/01/25 05:30:09 reinelt - * plugin_netdev for parsing /proc/net/dev added - * - * Revision 1.4 2004/01/23 07:04:03 reinelt - * icons finished! - * - * Revision 1.3 2004/01/23 04:53:34 reinelt - * icon widget added (not finished yet!) - * - * Revision 1.2 2004/01/22 07:57:45 reinelt - * several bugs fixed where segfaulting on layout>display - * Crystalfontz driver optimized, 632 display already works - * - * Revision 1.1 2004/01/21 12:36:19 reinelt - * Crystalfontz NextGeneration driver added - * */ /* @@ -367,7 +198,8 @@ static void drv_CF_process_packet(void) default: /* this should not happen */ - error("%s: unexpected response type=0x%02x code=0x%02x size=%d", Packet.type, Packet.code, Packet.size); + error("%s: unexpected response type=0x%02x code=0x%02x size=%d", Name, Packet.type, Packet.code, + Packet.size); break; } @@ -375,14 +207,14 @@ static void drv_CF_process_packet(void) case 0x03: /* error response from display to host */ - error("%s: error response type=0x%02x code=0x%02x size=%d", Packet.type, Packet.code, Packet.size); + error("%s: error response type=0x%02x code=0x%02x size=%d", Name, Packet.type, Packet.code, Packet.size); break; default: /* these should not happen: */ /* type 0x00: command from host to display: should never come back */ /* type 0x01: command response from display to host: are processed within send() */ - error("%s: unexpected packet type=0x%02x code=0x%02x size=%d", Packet.type, Packet.code, Packet.size); + error("%s: unexpected packet type=0x%02x code=0x%02x size=%d", Name, Packet.type, Packet.code, Packet.size); break; } @@ -502,7 +334,7 @@ static void drv_CF_send(const unsigned char cmd, const unsigned char len, const /* this is the ack we're waiting for */ if (0) { gettimeofday(&end, NULL); - debug("%s: ACK after %d usec", Name, + debug("%s: ACK after %ld usec", Name, 1000000 * (end.tv_sec - now.tv_sec) + end.tv_usec - now.tv_usec); } break; @@ -1079,7 +911,7 @@ static void plugin_backlight(RESULT * result, const int argc, RESULT * argv[]) SetResult(&result, R_NUMBER, &backlight); break; default: - error("%s.backlight(): wrong number of parameters"); + error("%s.backlight(): wrong number of parameters", Name); SetResult(&result, R_STRING, ""); } } @@ -1123,7 +955,7 @@ int drv_CF_init(const char *section, const int quiet) WIDGET_CLASS wc; int ret; - info("%s: %s", Name, "$Revision: 1.45 $"); + info("%s: %s", Name, "$Rev: 728 $"); /* start display */ if ((ret = drv_CF_start(section)) != 0) { -- cgit v1.2.3