From dc5568350b289278d2e85f8d8eaea4e652b4876c Mon Sep 17 00:00:00 2001 From: reinelt <> Date: Sat, 26 Jun 2004 09:27:21 +0000 Subject: [lcd4linux @ 2004-06-26 09:27:20 by reinelt] added '-W' to CFLAGS changed all C++ comments to C ones ('//' => '/* */') cleaned up a lot of signed/unsigned mistakes --- drv_BeckmannEgle.c | 186 +++++++++++++++++++++++++++-------------------------- 1 file changed, 96 insertions(+), 90 deletions(-) (limited to 'drv_BeckmannEgle.c') diff --git a/drv_BeckmannEgle.c b/drv_BeckmannEgle.c index 6b45191..787005e 100644 --- a/drv_BeckmannEgle.c +++ b/drv_BeckmannEgle.c @@ -1,4 +1,4 @@ -/* $Id: drv_BeckmannEgle.c,v 1.9 2004/06/26 06:12:15 reinelt Exp $ +/* $Id: drv_BeckmannEgle.c,v 1.10 2004/06/26 09:27:20 reinelt Exp $ * * driver for Beckmann+Egle "Mini Terminals" and "Compact Terminals" * Copyright 2000 Michael Reinelt @@ -22,6 +22,12 @@ * * * $Log: drv_BeckmannEgle.c,v $ + * Revision 1.10 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.9 2004/06/26 06:12:15 reinelt * * support for Beckmann+Egle Compact Terminals @@ -111,7 +117,7 @@ typedef struct { static MODEL Models[] = { - // MultiTerminals + /* MultiTerminals */ { "MT16x1", 1, 16, 1, 0 }, { "MT16x2", 2, 16, 1, 1 }, { "MT16x4", 4, 16, 1, 2 }, @@ -126,7 +132,7 @@ static MODEL Models[] = { { "MT40x2", 2, 40, 1, 11 }, { "MT40x4", 4, 40, 1, 12 }, - // CompactTerminal + /* CompactTerminal */ { "CT20x4", 4, 20, 2, 0 }, { NULL, 0, 0, 0, 0 }, @@ -138,24 +144,24 @@ static int Protocol; -// **************************************** -// *** hardware dependant functions *** -// **************************************** +/****************************************/ +/*** hardware dependant functions ***/ +/****************************************/ static void drv_BuE_clear (void) { switch (Protocol) { case 1: - drv_generic_serial_write (ESC "&#", 3); // clear display + drv_generic_serial_write (ESC "&#", 3); /* clear display */ break; case 2: - drv_generic_serial_write (ESC "LL", 3); // clear display + drv_generic_serial_write (ESC "LL", 3); /* clear display */ break; } } -static void drv_BuE_MT_write (const int row, const int col, const unsigned char *data, const int len) +static void drv_BuE_MT_write (const int row, const int col, const char *data, const int len) { char cmd[] = ESC "[y;xH"; @@ -170,22 +176,22 @@ static void drv_BuE_MT_write (const int row, const int col, const unsigned char static void drv_BuE_MT_defchar (const int ascii, const unsigned char *matrix) { int i; - char cmd[22] = ESC "&T"; // enter transparent mode + char cmd[22] = ESC "&T"; /* enter transparent mode */ - cmd[3] = '\0'; // write cmd - cmd[4] = 0x40|8*ascii; // write CGRAM + cmd[3] = '\0'; /* write cmd */ + cmd[4] = 0x40|8*ascii; /* write CGRAM */ for (i = 0; i < 8; i++) { - cmd[2*i+5] = '\1'; // write data - cmd[2*i+6] = matrix[i] & 0x1f; // character bitmap + cmd[2*i+5] = '\1'; /* write data */ + cmd[2*i+6] = matrix[i] & 0x1f; /* character bitmap */ } - cmd[21] = '\377'; // leave transparent mode + cmd[21] = '\377'; /* leave transparent mode */ drv_generic_serial_write (cmd, 22); } -static void drv_BuE_CT_write (const int row, const int col, const unsigned char *data, const int len) +static void drv_BuE_CT_write (const int row, const int col, const char *data, const int len) { char cmd[] = ESC "LCzs1"; @@ -200,12 +206,12 @@ static void drv_BuE_CT_write (const int row, const int col, const unsigned char static void drv_BuE_CT_defchar (const int ascii, const unsigned char *matrix) { int i; - char cmd[13] = ESC "LZ"; // set custom char + char cmd[13] = ESC "LZ"; /* set custom char */ - // number of user-defined char (0..7) + /* number of user-defined char (0..7) */ cmd[3] = (char) ascii - CHAR0; - // ASCII code to replace + /* ASCII code to replace */ cmd[4] = (char) ascii; for (i = 0; i < 8; i++) { @@ -218,10 +224,10 @@ static void drv_BuE_CT_defchar (const int ascii, const unsigned char *matrix) static int drv_BuE_CT_contrast (int contrast) { - static unsigned char Contrast = 7; + static char Contrast = 7; char cmd[4] = ESC "LKn"; - // -1 is used to query the current contrast + /* -1 is used to query the current contrast */ if (contrast == -1) return Contrast; if (contrast < 0 ) contrast = 0; @@ -238,10 +244,10 @@ static int drv_BuE_CT_contrast (int contrast) static int drv_BuE_CT_backlight (int backlight) { - static unsigned char Backlight=0; + static char Backlight=0; char cmd[4] = ESC "LBn"; - // -1 is used to query the current backlight + /* -1 is used to query the current backlight */ if (backlight == -1) return Backlight; if (backlight < 0) backlight = 0; @@ -259,20 +265,20 @@ static int drv_BuE_CT_backlight (int backlight) static int drv_BuE_CT_gpo (int num, int val) { static int GPO[8] = { -1, -1, -1, -1, -1, -1, -1, -1 }; - unsigned char cmd[4] = ESC "Pnx"; + char cmd[4] = ESC "Pnx"; if (num < 0) num = 0; if (num > 7) num = 7; - // -1 is used to query the current GPO + /* -1 is used to query the current GPO */ if (val == -1) return GPO[num]; if (val < 0 ) val = 0; if (val > 255) val = 255; GPO[num] = val; - cmd[2] = (unsigned char)num; - cmd[3] = (unsigned char)val; + cmd[2] = (char)num; + cmd[3] = (char)val; drv_generic_serial_write (cmd, 4); @@ -283,12 +289,12 @@ static int drv_BuE_CT_gpo (int num, int val) static int drv_BuE_CT_gpi (int num) { char cmd[4] = ESC "?Pn"; - unsigned char buffer[4]; + char buffer[4]; if (num < 0) num = 0; if (num > 7) num = 7; - cmd[3] = (unsigned char)num; + cmd[3] = (char)num; drv_generic_serial_write (cmd, 4); usleep (10000); @@ -304,7 +310,7 @@ static int drv_BuE_CT_gpi (int num) static int drv_BuE_CT_adc (void) { - unsigned char buffer[4]; + char buffer[4]; drv_generic_serial_write (ESC "?A", 3); @@ -318,24 +324,24 @@ static int drv_BuE_CT_adc (void) return -1; } - // 10 bit value: 8 bit high, 2 bit low - return 4 * buffer[2] + buffer[3]; + /* 10 bit value: 8 bit high, 2 bit low */ + return 4 * (unsigned char) buffer[2] + (unsigned char) buffer[3]; } static int drv_BuE_CT_pwm (int val) { static int PWM = -1; - unsigned char cmd[4] = ESC "Adm"; + char cmd[4] = ESC "Adm"; - // -1 is used to query the current PWM + /* -1 is used to query the current PWM */ if (val == -1) return PWM; if (val < 0) val = 0; if (val > 255) val = 255; PWM = val; - cmd[2] = (unsigned char) val; + cmd[2] = (char) val; cmd[3] = val == 0 ? 1 : 2; drv_generic_serial_write (cmd, 4); @@ -347,12 +353,12 @@ static int drv_BuE_MT_start (const char *section) { char cmd[] = ESC "&sX"; - // CSTOPB: 2 stop bits + /* CSTOPB: 2 stop bits */ if (drv_generic_serial_open(section, Name, CSTOPB) < 0) return -1; cmd[4] = Models[Model].type; - drv_generic_serial_write (cmd, 4); // select display type - drv_generic_serial_write (ESC "&D", 3); // cursor off + drv_generic_serial_write (cmd, 4); /* select display type */ + drv_generic_serial_write (ESC "&D", 3); /* cursor off */ return 0; } @@ -367,14 +373,14 @@ static int drv_BuE_CT_start (const char *section) if (drv_generic_serial_open(section, Name, 0) < 0) return -1; #if 0 - drv_generic_serial_write (ESC "Kr", 3); // restart terminal + drv_generic_serial_write (ESC "Kr", 3); /* restart terminal */ usleep(10000); #endif - // Fixme: the CT does not return a serial number in byte mode - drv_generic_serial_write (ESC "KM\073", 4); // set parameter mode 'decimal' + /* Fixme: the CT does not return a serial number in byte mode */ + drv_generic_serial_write (ESC "KM\073", 4); /* set parameter mode 'decimal' */ - // read version + /* read version */ drv_generic_serial_write (ESC "?V", 3); usleep(100000); if ((len = drv_generic_serial_read (buffer, -sizeof(buffer))) > 0) { @@ -386,9 +392,9 @@ static int drv_BuE_CT_start (const char *section) } } - drv_generic_serial_write (ESC "KM\072", 4); // set parameter mode 'byte' + drv_generic_serial_write (ESC "KM\072", 4); /* set parameter mode 'byte' */ - // the CT20x4 can control smaller displays, too + /* the CT20x4 can control smaller displays, too */ size = cfg_get(section, "Size", NULL); if (size != NULL && *size != '\0') { int r, c; @@ -398,29 +404,29 @@ static int drv_BuE_CT_start (const char *section) return -1; } info ("%s: display size: %d rows %d columns", Name, r, c); - cmd[3] = (unsigned char) r; - cmd[4] = (unsigned char) c; - drv_generic_serial_write (cmd, 5); // set display size + cmd[3] = (char) r; + cmd[4] = (char) c; + drv_generic_serial_write (cmd, 5); /* set display size */ DCOLS = c; DROWS = r; } - // set contrast + /* set contrast */ if (cfg_number(section, "Contrast", 7, 0, 15, &i) > 0) { drv_BuE_CT_contrast(i); } - // set backlight + /* set backlight */ if (cfg_number(section, "Backlight", 0, 0, 1, &i) > 0) { drv_BuE_CT_backlight(i); } - // identify I/O Port + /* identify I/O Port */ for (i = 0; i < 8; i++) { char cmd[5] = ESC "K?Pn"; - cmd[4] = (unsigned char)i; - drv_generic_serial_write (cmd, 5); // query I/O port + cmd[4] = (char)i; + drv_generic_serial_write (cmd, 5); /* query I/O port */ usleep(10000); if ((len = drv_generic_serial_read (buffer, 4)) == 4) { info ("%s: Port %d is type %d", Name, i, buffer[3]); @@ -458,7 +464,7 @@ static int drv_BuE_start (const char *section) info ("%s: using model '%s'", Name, Models[Model].name); - // initialize global variables + /* initialize global variables */ DROWS = Models[Model].rows; DCOLS = Models[Model].cols; @@ -481,9 +487,9 @@ static int drv_BuE_start (const char *section) } -// **************************************** -// *** plugins *** -// **************************************** +/****************************************/ +/*** plugins ***/ +/****************************************/ static void plugin_contrast (RESULT *result, const int argc, RESULT *argv[]) { @@ -583,21 +589,21 @@ static void plugin_pwm (RESULT *result, const int argc, RESULT *argv[]) } -// **************************************** -// *** widget callbacks *** -// **************************************** +/****************************************/ +/*** widget callbacks ***/ +/****************************************/ -// using drv_generic_text_draw(W) -// using drv_generic_text_icon_draw(W) -// using drv_generic_text_bar_draw(W) +/* using drv_generic_text_draw(W) */ +/* using drv_generic_text_icon_draw(W) */ +/* using drv_generic_text_bar_draw(W) */ -// **************************************** -// *** exported functions *** -// **************************************** +/****************************************/ +/*** exported functions ***/ +/****************************************/ -// list models +/* list models */ int drv_BuE_list (void) { int i; @@ -609,33 +615,33 @@ int drv_BuE_list (void) } -// initialize driver & display +/* initialize driver & display */ int drv_BuE_init (const char *section, const int quiet) { WIDGET_CLASS wc; int ret; - // start display + /* start display */ if ((ret=drv_BuE_start (section)) != 0) { return ret; } - // display preferences - XRES = 5; // pixel width of one char - YRES = 8; // pixel height of one char - CHARS = 8; // number of user-defineable characters + /* display preferences */ + XRES = 5; /* pixel width of one char */ + YRES = 8; /* pixel height of one char */ + CHARS = 8; /* number of user-defineable characters */ - // real worker functions + /* real worker functions */ switch (Protocol) { case 1: - CHAR0 = 0; // ASCII of first user-defineable char - GOTO_COST = 6; // number of bytes a goto command requires + CHAR0 = 0; /* ASCII of first user-defineable char */ + GOTO_COST = 6; /* number of bytes a goto command requires */ drv_generic_text_real_write = drv_BuE_MT_write; drv_generic_text_real_defchar = drv_BuE_MT_defchar; break; case 2: - CHAR0 = 128; // ASCII of first user-defineable char - GOTO_COST = 6; // number of bytes a goto command requires + CHAR0 = 128; /* ASCII of first user-defineable char */ + GOTO_COST = 6; /* number of bytes a goto command requires */ drv_generic_text_real_write = drv_BuE_CT_write; drv_generic_text_real_defchar = drv_BuE_CT_defchar; break; @@ -650,38 +656,38 @@ int drv_BuE_init (const char *section, const int quiet) } } - // initialize generic text driver + /* initialize generic text driver */ if ((ret=drv_generic_text_init(section, Name))!=0) return ret; - // initialize generic icon driver + /* initialize generic icon driver */ if ((ret=drv_generic_text_icon_init())!=0) return ret; - // initialize generic bar driver + /* initialize generic bar driver */ if ((ret=drv_generic_text_bar_init(0))!=0) return ret; - // add fixed chars to the bar driver - drv_generic_text_bar_add_segment ( 0, 0,255, 32); // ASCII 32 = blank - drv_generic_text_bar_add_segment (255,255,255,255); // ASCII 255 = block + /* add fixed chars to the bar driver */ + drv_generic_text_bar_add_segment ( 0, 0,255, 32); /* ASCII 32 = blank */ + drv_generic_text_bar_add_segment (255,255,255,255); /* ASCII 255 = block */ - // register text widget + /* register text widget */ wc=Widget_Text; wc.draw=drv_generic_text_draw; widget_register(&wc); - // register icon widget + /* register icon widget */ wc=Widget_Icon; wc.draw=drv_generic_text_icon_draw; widget_register(&wc); - // register bar widget + /* register bar widget */ wc=Widget_Bar; wc.draw=drv_generic_text_bar_draw; widget_register(&wc); - // register plugins + /* register plugins */ AddFunction ("LCD::contrast", -1, plugin_contrast); AddFunction ("LCD::backlight", -1, plugin_backlight); AddFunction ("LCD::gpo", -1, plugin_gpo); @@ -693,17 +699,17 @@ int drv_BuE_init (const char *section, const int quiet) } -// close driver & display +/* close driver & display */ int drv_BuE_quit (const int quiet) { info("%s: shutting down.", Name); drv_generic_text_quit(); - // clear display + /* clear display */ drv_BuE_clear(); - // say goodbye... + /* say goodbye... */ if (!quiet) { drv_generic_text_greet ("goodbye!", NULL); } -- cgit v1.2.3