From c9c3272eba9327b13545a5ed7073fce8bda0777f Mon Sep 17 00:00:00 2001 From: mmdolze Date: Mon, 28 Mar 2011 18:17:58 +0000 Subject: [PATCH] Header fixes: * Do not include system headers in shared files (stdlib.h). * Don't include lcd.h only once in each driver. * Remove some unnecessary headers from driver (e.g. syslog.h) * Include instead of * Spelling fixes. --- clients/lcdexec/lcdexec.c | 27 ++++++++++++++------------- clients/lcdexec/menu.c | 1 + clients/lcdvc/lcd_link.c | 1 + clients/lcdvc/lcdvc.c | 1 + clients/lcdvc/vc_link.c | 3 ++- server/drivers/CFontz.c | 3 +-- server/drivers/CFontz.h | 2 -- server/drivers/CFontz633.c | 3 +-- server/drivers/CFontz633.h | 2 -- server/drivers/CFontzPacket.c | 3 +-- server/drivers/CFontzPacket.h | 2 -- server/drivers/CwLnx.c | 3 +-- server/drivers/CwLnx.h | 7 ------- server/drivers/EyeboxOne.c | 4 +--- server/drivers/EyeboxOne.h | 4 +--- server/drivers/IOWarrior.c | 5 ++--- server/drivers/IOWarrior.h | 5 +---- server/drivers/MD8800.c | 3 +-- server/drivers/MD8800.h | 1 - server/drivers/MtxOrb.c | 5 ++--- server/drivers/MtxOrb.h | 2 -- server/drivers/NoritakeVFD.c | 3 +-- server/drivers/NoritakeVFD.h | 1 - server/drivers/SureElec.c | 5 +---- server/drivers/SureElec.h | 2 -- server/drivers/bayrad.h | 2 -- server/drivers/curses_drv.c | 4 ---- server/drivers/curses_drv.h | 2 -- server/drivers/ea65.c | 1 - server/drivers/ea65.h | 2 -- server/drivers/g15.c | 1 - server/drivers/glk.c | 4 +--- server/drivers/glkproto.c | 5 +++-- server/drivers/hd44780-bwct-usb.c | 10 +--------- server/drivers/hd44780-bwct-usb.h | 1 - server/drivers/hd44780-ftdi.c | 2 +- server/drivers/hd44780-ftdi.h | 1 - server/drivers/hd44780-lcd2usb.c | 5 +---- server/drivers/hd44780-lcd2usb.h | 1 - server/drivers/hd44780-low.h | 2 +- server/drivers/hd44780-serial.c | 6 ++++-- server/drivers/hd44780-serial.h | 3 --- server/drivers/hd44780-usblcd.c | 1 + server/drivers/hd44780-usblcd.h | 1 - server/drivers/hd44780-usbtiny.c | 3 +-- server/drivers/hd44780-usbtiny.h | 1 - server/drivers/hd44780-uss720.c | 8 -------- server/drivers/hd44780-uss720.h | 4 +--- server/drivers/hd44780.c | 3 +-- server/drivers/hd44780.h | 2 -- server/drivers/i2500vfd.c | 4 ---- server/drivers/i2500vfd.h | 2 -- server/drivers/icp_a106.c | 1 - server/drivers/icp_a106.h | 1 - server/drivers/imon.c | 3 +-- server/drivers/imon.h | 2 -- server/drivers/imonlcd.c | 1 - server/drivers/imonlcd.h | 2 -- server/drivers/irmanin.c | 3 +-- server/drivers/irtrans.c | 1 - server/drivers/irtrans.h | 2 -- server/drivers/joy.c | 1 - server/drivers/lcd_lib.c | 4 ---- server/drivers/lcdm001.c | 1 - server/drivers/lircin.c | 5 ++--- server/drivers/lis.c | 6 +----- server/drivers/lis.h | 2 -- server/drivers/ms6931.c | 24 +++++++++++++----------- server/drivers/ms6931.h | 2 -- server/drivers/mtc_s16209x.c | 2 -- server/drivers/mtc_s16209x.h | 2 -- server/drivers/pylcd.c | 17 +++++++++++++---- server/drivers/sed1330.c | 1 + server/drivers/sed1520.c | 5 ----- server/drivers/sed1520.h | 2 -- server/drivers/serialPOS.c | 2 -- server/drivers/serialPOS.h | 2 -- server/drivers/serialVFD.c | 8 +++----- server/drivers/serialVFD_io.c | 4 +--- server/drivers/shuttleVFD.h | 2 -- server/drivers/stv5730.c | 20 ++++++++------------ server/drivers/svgalib_drv.c | 24 ++++++++---------------- server/drivers/text.c | 3 --- server/drivers/text.h | 2 -- server/drivers/tyan_lcdm.c | 1 - server/drivers/tyan_lcdm.h | 10 ++++------ server/drivers/ula200.c | 3 --- server/drivers/wirz-sli.h | 2 -- server/drivers/xosdlib_drv.c | 1 - shared/report.h | 3 --- shared/sockets.c | 2 -- shared/sockets.h | 2 -- 92 files changed, 105 insertions(+), 255 deletions(-) diff --git a/clients/lcdexec/lcdexec.c b/clients/lcdexec/lcdexec.c index 2306a0c..c461b6e 100644 --- a/clients/lcdexec/lcdexec.c +++ b/clients/lcdexec/lcdexec.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "getopt.h" @@ -209,7 +210,7 @@ static void sigchld_handler(int signal) p->status = status; p->endtime = time(NULL); } - } + } } } @@ -342,7 +343,7 @@ static int process_configfile(char *configfile) if (main_menu == NULL) { report(RPT_ERR, "no main menu found in configuration"); return -1; - } + } return 0; } @@ -364,12 +365,12 @@ static int connect_and_setup(void) } else { struct utsname unamebuf; - + if (uname(&unamebuf) == 0) sock_printf(sock, "client_set -name {%s %s}\n", progname, unamebuf.nodename); - else + else sock_printf(sock, "client_set -name {%s}\n", progname); - } + } /* Create our menu */ if (menu_sock_send(main_menu, NULL, sock) < 0) { @@ -406,7 +407,7 @@ static int process_response(char *str) if ((strcmp(argv[1], "select") == 0) || (strcmp(argv[1], "leave") == 0)) { MenuEntry *entry; - + if (argc < 3) { report(RPT_WARNING, "Server gave invalid response"); free(str2); @@ -434,13 +435,13 @@ static int process_response(char *str) if (entry->type == MT_EXEC) exec_command(entry); - } + } } else if ((strcmp(argv[1], "plus") == 0) || (strcmp(argv[1], "minus") == 0) || (strcmp(argv[1], "update") == 0)) { MenuEntry *entry; - + if (argc < 4) { report(RPT_WARNING, "Server gave invalid response"); free(str2); @@ -509,7 +510,7 @@ static int process_response(char *str) // TODO: make it better report(RPT_INFO, "Server said: \"%s\"", str); exit_program(EXIT_SUCCESS); - } + } else if (strcmp(argv[0], "huh?") == 0) { /* Report errors */ report(RPT_WARNING, "Server said: \"%s\"", str); @@ -575,7 +576,7 @@ static int exec_command(MenuEntry *cmd) default: /* error ? */ break; - } + } buf[sizeof(buf)-1] ='\0'; envp[i] = strdup(buf); @@ -651,7 +652,7 @@ static int show_procinfo_msg(ProcInfo *p) else { sock_printf(sock, "widget_set [%u] s2 1 3 {with code 0x%02X.}\n", p->pid, WEXITSTATUS(p->status)); - } + } } else if (WIFSIGNALED(p->status)) { sock_printf(sock, "widget_set [%u] s2 1 3 {killed by SIG %d.}\n", @@ -680,7 +681,7 @@ static int show_procinfo_msg(ProcInfo *p) else if (WIFSIGNALED(p->status)) { sock_printf(sock, "widget_set [%u] s2 1 2 {killed by SIG %d}\n", p->pid, WTERMSIG(p->status)); - + } } return 1; @@ -737,7 +738,7 @@ static int main_loop(void) for (p = proc_queue; p != NULL; p = p->next) { p->shown |= show_procinfo_msg(p); } - } + } } else { process_response(buf); diff --git a/clients/lcdexec/menu.c b/clients/lcdexec/menu.c index e3d9c42..bd5008c 100644 --- a/clients/lcdexec/menu.c +++ b/clients/lcdexec/menu.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "shared/report.h" #include "shared/configfile.h" diff --git a/clients/lcdvc/lcd_link.c b/clients/lcdvc/lcd_link.c index 6bdaf45..d21b685 100644 --- a/clients/lcdvc/lcd_link.c +++ b/clients/lcdvc/lcd_link.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "lcd_link.h" #include "vc_link.h" diff --git a/clients/lcdvc/lcdvc.c b/clients/lcdvc/lcdvc.c index 263b071..2ae2875 100644 --- a/clients/lcdvc/lcdvc.c +++ b/clients/lcdvc/lcdvc.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "getopt.h" diff --git a/clients/lcdvc/vc_link.c b/clients/lcdvc/vc_link.c index 344c92b..a215b73 100644 --- a/clients/lcdvc/vc_link.c +++ b/clients/lcdvc/vc_link.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "lcdvc.h" #include "vc_link.h" @@ -79,7 +80,7 @@ int read_vcdata(void) if (vc_buf == NULL) { report(RPT_ERR, "malloc failure: %s", strerror(errno)); return -1; - } + } memset(vc_buf, ' ', vc_width * vc_height); } } diff --git a/server/drivers/CFontz.c b/server/drivers/CFontz.c index 9056cb9..3eaf132 100644 --- a/server/drivers/CFontz.c +++ b/server/drivers/CFontz.c @@ -33,7 +33,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H # include "config.h" @@ -67,7 +66,7 @@ typedef struct CFontz_private_data { unsigned char *framebuf; unsigned char *backingstore; - /* defineable characters */ + /* definable characters */ CGmode ccmode; int contrast; diff --git a/server/drivers/CFontz.h b/server/drivers/CFontz.h index 8883d65..6c95742 100644 --- a/server/drivers/CFontz.h +++ b/server/drivers/CFontz.h @@ -1,8 +1,6 @@ #ifndef CFONTZ_H #define CFONTZ_H -#include "lcd.h" - #define DEFAULT_CELL_WIDTH 6 #define DEFAULT_CELL_HEIGHT 8 #define DEFAULT_CONTRAST 560 diff --git a/server/drivers/CFontz633.c b/server/drivers/CFontz633.c index af8a93e..d4308a4 100644 --- a/server/drivers/CFontz633.c +++ b/server/drivers/CFontz633.c @@ -54,7 +54,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H # include "config.h" @@ -97,7 +96,7 @@ typedef struct CFontz633_private_data { unsigned char *framebuf; unsigned char *backingstore; - /* defineable characters */ + /* definable characters */ CGmode ccmode; int contrast; diff --git a/server/drivers/CFontz633.h b/server/drivers/CFontz633.h index 7ea9c61..d3d8ce7 100644 --- a/server/drivers/CFontz633.h +++ b/server/drivers/CFontz633.h @@ -1,8 +1,6 @@ #ifndef CFONTZ633_H #define CFONTZ633_H -#include "lcd.h" - #define DEFAULT_CELL_WIDTH 6 #define DEFAULT_CELL_HEIGHT 8 #define DEFAULT_CONTRAST 560 diff --git a/server/drivers/CFontzPacket.c b/server/drivers/CFontzPacket.c index 7c63256..c115213 100644 --- a/server/drivers/CFontzPacket.c +++ b/server/drivers/CFontzPacket.c @@ -42,7 +42,6 @@ #include #include #include -#include #include "lcd.h" #include "CFontzPacket.h" @@ -80,7 +79,7 @@ typedef struct CFontzPacket_private_data { unsigned char *framebuf; unsigned char *backingstore; - /* defineable characters */ + /* definable characters */ CGmode ccmode; int contrast; diff --git a/server/drivers/CFontzPacket.h b/server/drivers/CFontzPacket.h index 23c7efb..58b7bfa 100644 --- a/server/drivers/CFontzPacket.h +++ b/server/drivers/CFontzPacket.h @@ -1,8 +1,6 @@ #ifndef CFONTZPACKET_H #define CFONTZPACKET_H -#include "lcd.h" - #define DEFAULT_CELL_HEIGHT 8 #define DEFAULT_CONTRAST 560 #define DEFAULT_DEVICE "/dev/lcd" diff --git a/server/drivers/CwLnx.c b/server/drivers/CwLnx.c index f95d4f8..0fc1e7d 100644 --- a/server/drivers/CwLnx.c +++ b/server/drivers/CwLnx.c @@ -54,7 +54,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H # include "config.h" @@ -94,7 +93,7 @@ typedef struct CwLnx_private_data { unsigned char *framebuf; unsigned char *backingstore; - /* defineable characters */ + /* definable characters */ CGmode ccmode; char saved_backlight; /* current state of the backlight */ diff --git a/server/drivers/CwLnx.h b/server/drivers/CwLnx.h index ec01d68..af458d7 100644 --- a/server/drivers/CwLnx.h +++ b/server/drivers/CwLnx.h @@ -22,13 +22,6 @@ #ifndef CWLNX_H #define CWLNX_H -#include "lcd.h" - -// #define DEFAULT_CONTRAST 560 -// #define DEFAULT_BRIGHTNESS 60 -// #define DEFAULT_OFFBRIGHTNESS 0 -// #define DEFAULT_EXITBRIGHTNESS 0 - #define DEFAULT_DEVICE "/dev/lcd" #define DEFAULT_BACKLIGHT 1 #define DEFAULT_BRIGHTNESS 700 diff --git a/server/drivers/EyeboxOne.c b/server/drivers/EyeboxOne.c index 314380d..dcdfdab 100644 --- a/server/drivers/EyeboxOne.c +++ b/server/drivers/EyeboxOne.c @@ -28,14 +28,12 @@ #include #include #include -#include #include #include #include #include -#include #include -#include +#include #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/server/drivers/EyeboxOne.h b/server/drivers/EyeboxOne.h index a59ef32..4810a57 100644 --- a/server/drivers/EyeboxOne.h +++ b/server/drivers/EyeboxOne.h @@ -1,8 +1,6 @@ #ifndef EYEBOXONE_H #define EYEBOXONE_H -#include "lcd.h" - MODULE_EXPORT int EyeboxOne_init (Driver *drvthis); MODULE_EXPORT void EyeboxOne_close (Driver *drvthis); MODULE_EXPORT int EyeboxOne_width (Driver *drvthis); @@ -21,7 +19,7 @@ MODULE_EXPORT const char * EyeboxOne_get_info (Driver *drvthis); #define DEFAULT_DEVICE "/dev/ttyS1" #define DEFAULT_SPEED 19200 -#define DEFAULT_CURSOR 0 +#define DEFAULT_CURSOR 0 #endif diff --git a/server/drivers/IOWarrior.c b/server/drivers/IOWarrior.c index cf19116..6e5cc9e 100644 --- a/server/drivers/IOWarrior.c +++ b/server/drivers/IOWarrior.c @@ -30,10 +30,9 @@ #include #include #include -#include #include #include -#include +#include #ifdef HAVE_CONFIG_H # include "config.h" @@ -591,7 +590,7 @@ IOWarrior_flush(Driver *drvthis) } } - /* Check which defineable chars we need to update */ + /* Check which definable chars we need to update */ count = 0; for (i = 0; i < NUM_CCs; i++) { if (!p->cc[i].clean) { diff --git a/server/drivers/IOWarrior.h b/server/drivers/IOWarrior.h index 39270c9..511cf2f 100644 --- a/server/drivers/IOWarrior.h +++ b/server/drivers/IOWarrior.h @@ -27,9 +27,6 @@ #ifndef IOWARRIOR_H #define IOWARRIOR_H -#include -#include "lcd.h" - #define DEFAULT_SERIALNO "" #define DEFAULT_SIZE "20x4" #define DEFAULT_BACKLIGHT 1 @@ -89,7 +86,7 @@ typedef struct IOWarrior_private_data { /* last LCD contents (for incremental updates) */ unsigned char *backingstore; - /* defineable characters */ + /* definable characters */ CGram cc[NUM_CCs]; CGmode ccmode; diff --git a/server/drivers/MD8800.c b/server/drivers/MD8800.c index 74492a0..8a9c2c8 100644 --- a/server/drivers/MD8800.c +++ b/server/drivers/MD8800.c @@ -178,7 +178,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H # include "config.h" @@ -205,7 +204,7 @@ typedef struct MD8800_private_data { /* framebuffer and buffer for old LCD contents */ unsigned char *framebuf; unsigned char *backingstore; - /* defineable characters */ + /* definable characters */ int on_brightness; int off_brightness; int hw_brightness; diff --git a/server/drivers/MD8800.h b/server/drivers/MD8800.h index b367e21..5f9701a 100644 --- a/server/drivers/MD8800.h +++ b/server/drivers/MD8800.h @@ -22,7 +22,6 @@ #ifndef MD8800_H #define MD8800_H -#include "lcd.h" #define DEFAULT_CELL_WIDTH 5 #define DEFAULT_CELL_HEIGHT 7 diff --git a/server/drivers/MtxOrb.c b/server/drivers/MtxOrb.c index 01faa22..f8e21b5 100644 --- a/server/drivers/MtxOrb.c +++ b/server/drivers/MtxOrb.c @@ -48,9 +48,8 @@ #include #include #include -#include #include -#include +#include #ifdef HAVE_CONFIG_H # include "config.h" @@ -118,7 +117,7 @@ typedef struct MtxOrb_private_data { unsigned char *framebuf; unsigned char *backingstore; - /* defineable characters */ + /* definable characters */ CGmode ccmode; int output_state; /**< current output state */ diff --git a/server/drivers/MtxOrb.h b/server/drivers/MtxOrb.h index 1b8cf1d..216a4ae 100644 --- a/server/drivers/MtxOrb.h +++ b/server/drivers/MtxOrb.h @@ -1,8 +1,6 @@ #ifndef MTXORB_H #define MTXORB_H -#include "lcd.h" - #define DEFAULT_CONTRAST 480 #define DEFAULT_ADJ_BACKLIGHT 1 #define DEFAULT_BRIGHTNESS 1000 diff --git a/server/drivers/NoritakeVFD.c b/server/drivers/NoritakeVFD.c index c501864..b02eb31 100644 --- a/server/drivers/NoritakeVFD.c +++ b/server/drivers/NoritakeVFD.c @@ -54,7 +54,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H # include "config.h" @@ -81,7 +80,7 @@ typedef struct NoritakeVFD_private_data { /* framebuffer and buffer for old LCD contents */ unsigned char *framebuf; unsigned char *backingstore; - /* defineable characters */ + /* definable characters */ CGmode ccmode; int brightness; int offbrightness; diff --git a/server/drivers/NoritakeVFD.h b/server/drivers/NoritakeVFD.h index 0211d5c..4c0cd7d 100644 --- a/server/drivers/NoritakeVFD.h +++ b/server/drivers/NoritakeVFD.h @@ -21,7 +21,6 @@ #ifndef NORITAKEVFD_H #define NORITAKEVFD_H -#include "lcd.h" #define DEFAULT_CELL_WIDTH 5 #define DEFAULT_CELL_HEIGHT 7 diff --git a/server/drivers/SureElec.c b/server/drivers/SureElec.c index 7136b87..b4c7cca 100644 --- a/server/drivers/SureElec.c +++ b/server/drivers/SureElec.c @@ -43,11 +43,8 @@ #include #include #include -#include #include -#include #include -#include #ifdef HAVE_CONFIG_H #include "config.h" @@ -84,7 +81,7 @@ typedef struct SureElec_private_data { unsigned char *framebuf; unsigned char *backingstore; - /* defineable characters */ + /* definable characters */ CGmode ccmode; int output_state; /**< current output state */ diff --git a/server/drivers/SureElec.h b/server/drivers/SureElec.h index f845ca4..7e1d3bf 100644 --- a/server/drivers/SureElec.h +++ b/server/drivers/SureElec.h @@ -4,8 +4,6 @@ #ifndef SUREELEC_H #define SUREELEC_H -#include "lcd.h" - #define DEFAULT_DEVICE "/dev/ttyUSB0" #define DEFAULT_SPEED 9600 #define DEFAULT_LINEWRAP 1 diff --git a/server/drivers/bayrad.h b/server/drivers/bayrad.h index b5e6291..44ec2c5 100644 --- a/server/drivers/bayrad.h +++ b/server/drivers/bayrad.h @@ -8,8 +8,6 @@ #ifndef _BAYRAD_H #define _BAYRAD_H -#include "lcd.h" - MODULE_EXPORT int bayrad_init(Driver *drvthis); MODULE_EXPORT void bayrad_close(Driver *drvthis); MODULE_EXPORT int bayrad_width(Driver *drvthis); diff --git a/server/drivers/curses_drv.c b/server/drivers/curses_drv.c index 023f209..a30e91a 100644 --- a/server/drivers/curses_drv.c +++ b/server/drivers/curses_drv.c @@ -52,11 +52,8 @@ Different implementations of (n)curses available on: #include #include #include -#include -#include #include #include -#include #include #ifdef HAVE_NCURSES_H #include @@ -67,7 +64,6 @@ Different implementations of (n)curses available on: #include "lcd.h" #include "curses_drv.h" #include "report.h" -//#include "configfile.h" // ACS_S9 and ACS_S1 are defined as part of XSI Curses standard, Issue 4. // However, ACS_S3 and ACS_S7 are not; these definitions were created to support diff --git a/server/drivers/curses_drv.h b/server/drivers/curses_drv.h index 8528fb2..f52ecd1 100644 --- a/server/drivers/curses_drv.h +++ b/server/drivers/curses_drv.h @@ -1,8 +1,6 @@ #ifndef LCD_CURSES_H #define LCD_CURSES_H -#include "lcd.h" - MODULE_EXPORT int curses_init (Driver *drvthis); MODULE_EXPORT void curses_close (Driver *drvthis); MODULE_EXPORT int curses_width (Driver *drvthis); diff --git a/server/drivers/ea65.c b/server/drivers/ea65.c index 5f64b01..395ca29 100644 --- a/server/drivers/ea65.c +++ b/server/drivers/ea65.c @@ -33,7 +33,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/server/drivers/ea65.h b/server/drivers/ea65.h index 2ac89c0..c3d764c 100644 --- a/server/drivers/ea65.h +++ b/server/drivers/ea65.h @@ -1,8 +1,6 @@ #ifndef EA65_H #define EA65_H -#include "lcd.h" - #define DEFAULT_BRIGHTNESS 500 #define DEFAULT_OFFBRIGHTNESS 0 diff --git a/server/drivers/g15.c b/server/drivers/g15.c index 2eba38d..980a6a3 100644 --- a/server/drivers/g15.c +++ b/server/drivers/g15.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/server/drivers/glk.c b/server/drivers/glk.c index 483ffd2..75c1378 100644 --- a/server/drivers/glk.c +++ b/server/drivers/glk.c @@ -17,14 +17,12 @@ #include #include #include -#include -#include #include -#include #ifdef HAVE_CONFIG_H # include "config.h" #endif + #if TIME_WITH_SYS_TIME # include # include diff --git a/server/drivers/glkproto.c b/server/drivers/glkproto.c index 274b179..6b02578 100644 --- a/server/drivers/glkproto.c +++ b/server/drivers/glkproto.c @@ -8,11 +8,12 @@ #include #include #include -#include #include #include -#include +#include + #include "glkproto.h" + #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/server/drivers/hd44780-bwct-usb.c b/server/drivers/hd44780-bwct-usb.c index 5ddbf09..9c39ddf 100644 --- a/server/drivers/hd44780-bwct-usb.c +++ b/server/drivers/hd44780-bwct-usb.c @@ -14,18 +14,10 @@ */ #include "hd44780-bwct-usb.h" - +#include "hd44780-low.h" #include "report.h" -#include -#include #include -#include - -#include -#include -#include - #include #ifdef HAVE_CONFIG_H diff --git a/server/drivers/hd44780-bwct-usb.h b/server/drivers/hd44780-bwct-usb.h index 4a75daa..e8c2c3a 100644 --- a/server/drivers/hd44780-bwct-usb.h +++ b/server/drivers/hd44780-bwct-usb.h @@ -2,7 +2,6 @@ #define HD_BWCT_USB_H #include "lcd.h" /* for Driver */ -#include "hd44780-low.h" /* vendor and product id */ #define BWCT_USB_VENDORID 0x03DA diff --git a/server/drivers/hd44780-ftdi.c b/server/drivers/hd44780-ftdi.c index 712e627..ca77b7a 100644 --- a/server/drivers/hd44780-ftdi.c +++ b/server/drivers/hd44780-ftdi.c @@ -29,13 +29,13 @@ */ #include "hd44780-ftdi.h" +#include "hd44780-low.h" #include "report.h" #include #include #include -#include #include #include diff --git a/server/drivers/hd44780-ftdi.h b/server/drivers/hd44780-ftdi.h index 786dec5..6a6b6cc 100644 --- a/server/drivers/hd44780-ftdi.h +++ b/server/drivers/hd44780-ftdi.h @@ -2,7 +2,6 @@ #define HD_FTDI_H #include "lcd.h" /* for Driver */ -#include "hd44780-low.h" // initialise this particular driver int hd_init_ftdi(Driver *drvthis); diff --git a/server/drivers/hd44780-lcd2usb.c b/server/drivers/hd44780-lcd2usb.c index ba0f206..5646361 100644 --- a/server/drivers/hd44780-lcd2usb.c +++ b/server/drivers/hd44780-lcd2usb.c @@ -16,15 +16,12 @@ # include "config.h" #endif -#include #include -#include -#include #include "hd44780-lcd2usb.h" +#include "hd44780-low.h" #include "report.h" - /* connection type specific functions to be exposed using pointers in init() */ void lcd2usb_HD44780_senddata(PrivateData *p, unsigned char displayID, unsigned char flags, unsigned char ch); void lcd2usb_HD44780_backlight(PrivateData *p, unsigned char state); diff --git a/server/drivers/hd44780-lcd2usb.h b/server/drivers/hd44780-lcd2usb.h index 0444473..9271c49 100644 --- a/server/drivers/hd44780-lcd2usb.h +++ b/server/drivers/hd44780-lcd2usb.h @@ -2,7 +2,6 @@ #define HD_LCD2USB_H #include "lcd.h" /* for Driver */ -#include "hd44780-low.h" /* vendor and product id */ #define LCD2USB_VENDORID 0x0403 diff --git a/server/drivers/hd44780-low.h b/server/drivers/hd44780-low.h index 48223df..a54a560 100644 --- a/server/drivers/hd44780-low.h +++ b/server/drivers/hd44780-low.h @@ -141,7 +141,7 @@ typedef struct hd44780_private_data { // For incremental updates store last lcd contents unsigned char *backingstore; - // The defineable characters + // The definable characters CGram cc[NUM_CCs]; CGmode ccmode; diff --git a/server/drivers/hd44780-serial.c b/server/drivers/hd44780-serial.c index 115187e..31e297e 100644 --- a/server/drivers/hd44780-serial.c +++ b/server/drivers/hd44780-serial.c @@ -50,6 +50,8 @@ #include #include +#include "lcd.h" +#include "hd44780-low.h" #include "hd44780-serial.h" #include "report.h" @@ -81,8 +83,8 @@ unsigned int bitrate_conversion[][2] = { #endif #if defined(B230400) , { 230400, B230400 } -#endif -#if defined(B460800) +#endif +#if defined(B460800) , { 460800, B460800 } #endif #if defined(B500000) diff --git a/server/drivers/hd44780-serial.h b/server/drivers/hd44780-serial.h index 0364ecd..c0985eb 100644 --- a/server/drivers/hd44780-serial.h +++ b/server/drivers/hd44780-serial.h @@ -6,9 +6,6 @@ #ifndef HD44780_SERIAL_H #define HD44780_SERIAL_H -#include "lcd.h" -#include "hd44780-low.h" - #define SERIALIF_NAME_LENGTH 20 #define DEFAULT_DEVICE "/dev/lcd" diff --git a/server/drivers/hd44780-usblcd.c b/server/drivers/hd44780-usblcd.c index e05a1f5..238508f 100644 --- a/server/drivers/hd44780-usblcd.c +++ b/server/drivers/hd44780-usblcd.c @@ -19,6 +19,7 @@ */ #include "hd44780-usblcd.h" +#include "hd44780-low.h" #include "report.h" #include diff --git a/server/drivers/hd44780-usblcd.h b/server/drivers/hd44780-usblcd.h index 666276b..35b2834 100644 --- a/server/drivers/hd44780-usblcd.h +++ b/server/drivers/hd44780-usblcd.h @@ -2,7 +2,6 @@ #define HD_USBLCD_H #include "lcd.h" /* for lcd_logical_driver */ -#include "hd44780-low.h" /* for HD44780_functions */ // initialise this particular driver int hd_init_usblcd(Driver *drvthis); diff --git a/server/drivers/hd44780-usbtiny.c b/server/drivers/hd44780-usbtiny.c index 3e3e4c1..6e6b6f4 100644 --- a/server/drivers/hd44780-usbtiny.c +++ b/server/drivers/hd44780-usbtiny.c @@ -18,10 +18,9 @@ #include #include -#include -#include #include "hd44780-usbtiny.h" +#include "hd44780-low.h" #include "report.h" diff --git a/server/drivers/hd44780-usbtiny.h b/server/drivers/hd44780-usbtiny.h index 5079209..9d8704c 100644 --- a/server/drivers/hd44780-usbtiny.h +++ b/server/drivers/hd44780-usbtiny.h @@ -2,7 +2,6 @@ #define HD_USBTINY_H #include "lcd.h" /* for Driver */ -#include "hd44780-low.h" /* vendor and product id */ #define USBTINY_VENDORID 0x03EB diff --git a/server/drivers/hd44780-uss720.c b/server/drivers/hd44780-uss720.c index d6e46b3..26929c4 100644 --- a/server/drivers/hd44780-uss720.c +++ b/server/drivers/hd44780-uss720.c @@ -27,18 +27,10 @@ #include "hd44780-uss720.h" #include "hd44780-low.h" #include "lpt-port.h" - #include "report.h" -#include #include #include -#include - -#include -#include -#include - #include #ifdef HAVE_CONFIG_H diff --git a/server/drivers/hd44780-uss720.h b/server/drivers/hd44780-uss720.h index dad85f1..c8c3e38 100644 --- a/server/drivers/hd44780-uss720.h +++ b/server/drivers/hd44780-uss720.h @@ -2,9 +2,7 @@ #define HD_USS720_H #include "lcd.h" /* for Driver */ -#include "hd44780-low.h" - -// initialise this particular driver +/* initialise this particular driver */ int hd_init_uss720(Driver *drvthis); #endif diff --git a/server/drivers/hd44780.c b/server/drivers/hd44780.c index 01d220f..c6561b8 100644 --- a/server/drivers/hd44780.c +++ b/server/drivers/hd44780.c @@ -73,7 +73,6 @@ #include #include #include -#include #include #include #include @@ -699,7 +698,7 @@ HD44780_flush(Driver *drvthis) } debug(RPT_DEBUG, "HD44780: flushed %d chars", count); - /* Check which defineable chars we need to update */ + /* Check which definable chars we need to update */ count = 0; for (i = 0; i < NUM_CCs; i++) { if (!p->cc[i].clean) { diff --git a/server/drivers/hd44780.h b/server/drivers/hd44780.h index 3df787a..6d6d20e 100644 --- a/server/drivers/hd44780.h +++ b/server/drivers/hd44780.h @@ -17,8 +17,6 @@ #ifndef HD44780_H #define HD44780_H -#include "lcd.h" - MODULE_EXPORT int HD44780_init(Driver *drvthis); MODULE_EXPORT void HD44780_close(Driver *drvthis); MODULE_EXPORT int HD44780_width(Driver *drvthis); diff --git a/server/drivers/i2500vfd.c b/server/drivers/i2500vfd.c index c03c243..ae7a57c 100644 --- a/server/drivers/i2500vfd.c +++ b/server/drivers/i2500vfd.c @@ -27,11 +27,7 @@ #include #include #include -#include -#include #include -#include -#include #include "i2500vfdfm.h" diff --git a/server/drivers/i2500vfd.h b/server/drivers/i2500vfd.h index 4087585..c63ebb1 100644 --- a/server/drivers/i2500vfd.h +++ b/server/drivers/i2500vfd.h @@ -1,8 +1,6 @@ #ifndef I2500VFD_H #define I2500VFD_H -#include "lcd.h" - MODULE_EXPORT int i2500vfd_init (Driver *drvthis); MODULE_EXPORT void i2500vfd_close (Driver *drvthis); MODULE_EXPORT int i2500vfd_width (Driver *drvthis); diff --git a/server/drivers/icp_a106.c b/server/drivers/icp_a106.c index ebe3013..2064a16 100644 --- a/server/drivers/icp_a106.c +++ b/server/drivers/icp_a106.c @@ -39,7 +39,6 @@ #include #include #include -//#include #include #ifdef HAVE_CONFIG_H diff --git a/server/drivers/icp_a106.h b/server/drivers/icp_a106.h index 9094b2d..36f6104 100644 --- a/server/drivers/icp_a106.h +++ b/server/drivers/icp_a106.h @@ -31,7 +31,6 @@ #ifndef ICP_A106_H #define ICP_A106_H -#include "lcd.h" MODULE_EXPORT int icp_a106_init (Driver *drvthis); MODULE_EXPORT void icp_a106_close (Driver *drvthis); MODULE_EXPORT int icp_a106_width (Driver *drvthis); diff --git a/server/drivers/imon.c b/server/drivers/imon.c index b6a9cd6..6f3fe6f 100644 --- a/server/drivers/imon.c +++ b/server/drivers/imon.c @@ -30,12 +30,11 @@ #include #include #include -#include #include #include +#include #include - #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/server/drivers/imon.h b/server/drivers/imon.h index 908f8b6..539e6ed 100644 --- a/server/drivers/imon.h +++ b/server/drivers/imon.h @@ -26,8 +26,6 @@ #ifndef IMON_H #define IMON_H -#include "lcd.h" - MODULE_EXPORT int imon_init (Driver *drvthis); MODULE_EXPORT void imon_close (Driver *drvthis); MODULE_EXPORT int imon_width (Driver *drvthis); diff --git a/server/drivers/imonlcd.c b/server/drivers/imonlcd.c index 1f5b14d..28c7381 100644 --- a/server/drivers/imonlcd.c +++ b/server/drivers/imonlcd.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/server/drivers/imonlcd.h b/server/drivers/imonlcd.h index 640dda2..08195d8 100644 --- a/server/drivers/imonlcd.h +++ b/server/drivers/imonlcd.h @@ -16,8 +16,6 @@ #ifndef IMONLCD_H #define IMONLCD_H -#include "lcd.h" - /* mandatory functions (necessary for all drivers) */ MODULE_EXPORT int imonlcd_init (Driver *drvthis); MODULE_EXPORT void imonlcd_close (Driver *drvthis); diff --git a/server/drivers/irmanin.c b/server/drivers/irmanin.c index a5760df..93ea9e3 100644 --- a/server/drivers/irmanin.c +++ b/server/drivers/irmanin.c @@ -16,7 +16,6 @@ #include #include #include -#include #define __u32 unsigned int #define __u8 unsigned char @@ -96,7 +95,7 @@ irmanin_init (Driver *drvthis) if (p->device[0] != '\0') { report(RPT_INFO, "%s: using Device %s", drvthis->name, p->device); ptrdevice = p->device; - } + } /* What config file should be used */ strncpy(p->config, drvthis->config_get_string(drvthis->name, "Config", 0, diff --git a/server/drivers/irtrans.c b/server/drivers/irtrans.c index 0d4df5d..6574f3e 100644 --- a/server/drivers/irtrans.c +++ b/server/drivers/irtrans.c @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/server/drivers/irtrans.h b/server/drivers/irtrans.h index 058e41f..78cb2a0 100644 --- a/server/drivers/irtrans.h +++ b/server/drivers/irtrans.h @@ -31,8 +31,6 @@ #ifndef LCD_TEXT_H #define LCD_TEXT_H -#include "lcd.h" - MODULE_EXPORT int irtrans_init(Driver *drvthis); MODULE_EXPORT void irtrans_close(Driver *drvthis); MODULE_EXPORT int irtrans_width(Driver *drvthis); diff --git a/server/drivers/joy.c b/server/drivers/joy.c index 68a2960..375adcb 100644 --- a/server/drivers/joy.c +++ b/server/drivers/joy.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/server/drivers/lcd_lib.c b/server/drivers/lcd_lib.c index ad727c8..7a11605 100644 --- a/server/drivers/lcd_lib.c +++ b/server/drivers/lcd_lib.c @@ -8,10 +8,6 @@ * the height of hbars, etc. */ -#include -#include -#include - #include "lcd.h" #ifdef HAVE_CONFIG_H diff --git a/server/drivers/lcdm001.c b/server/drivers/lcdm001.c index dd7faf6..d562f9c 100644 --- a/server/drivers/lcdm001.c +++ b/server/drivers/lcdm001.c @@ -37,7 +37,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/server/drivers/lircin.c b/server/drivers/lircin.c index fadad51..c29dc9c 100644 --- a/server/drivers/lircin.c +++ b/server/drivers/lircin.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -101,7 +100,7 @@ lircin_init (Driver *drvthis) if (drvthis->config_get_string(drvthis->name, "lircrc", 0 , NULL) != NULL) { strncpy(s, drvthis->config_get_string(drvthis->name, "lircrc", 0, ""), sizeof(s)); s[sizeof(s)-1] = '\0'; - } + } if (*s != '\0') { p->lircrc = malloc(strlen(s) + 1); @@ -185,7 +184,7 @@ lircin_close (Driver *drvthis) if (p->lircin_fd >= 0) { lirc_deinit (); close (p->lircin_fd); - } + } p->lircin_fd = -1; free(p); diff --git a/server/drivers/lis.c b/server/drivers/lis.c index ed2b170..dd3a85f 100644 --- a/server/drivers/lis.c +++ b/server/drivers/lis.c @@ -52,21 +52,17 @@ * 2007/11/01 Change Linux-centric clone() to POSIX * threads for portability. */ + #include #include #include -#include -#include #include #include -#include #include #include #include -#include - #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/server/drivers/lis.h b/server/drivers/lis.h index 48ebe59..bb794bf 100644 --- a/server/drivers/lis.h +++ b/server/drivers/lis.h @@ -19,8 +19,6 @@ #ifndef LIS_H #define LIS_H -#include "lcd.h" - #ifndef bool # define bool short # define true 1 diff --git a/server/drivers/ms6931.c b/server/drivers/ms6931.c index e310c22..e6c9d46 100644 --- a/server/drivers/ms6931.c +++ b/server/drivers/ms6931.c @@ -24,34 +24,36 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 +*/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #include #include #include #include -#include #include #include -#include -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#ifdef TIME_WITH_SYS_TIME +#if TIME_WITH_SYS_TIME # include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif #endif #include "lcd.h" #include "ms6931.h" #include "report.h" #include "lcd_lib.h" -/* -#include "server/configfile.h" -*/ /** private data for the \c ms6931 driver */ typedef struct ms6931_private_data { diff --git a/server/drivers/ms6931.h b/server/drivers/ms6931.h index 11eb467..0cf2f81 100644 --- a/server/drivers/ms6931.h +++ b/server/drivers/ms6931.h @@ -25,8 +25,6 @@ #ifndef MS6931_H #define MS6931_H -#include "lcd.h" - #define MS6931_DEF_DEVICE "/dev/ttyS1" #define MS6931_DEF_SIZE "16x2" #define MS6931_DEF_CELL_WIDTH 5 diff --git a/server/drivers/mtc_s16209x.c b/server/drivers/mtc_s16209x.c index 5091937..55e48e7 100644 --- a/server/drivers/mtc_s16209x.c +++ b/server/drivers/mtc_s16209x.c @@ -50,8 +50,6 @@ #include #include -#include - #ifdef HAVE_CONFIG_H # include "config.h" #endif diff --git a/server/drivers/mtc_s16209x.h b/server/drivers/mtc_s16209x.h index b3b825b..7f4ddee 100644 --- a/server/drivers/mtc_s16209x.h +++ b/server/drivers/mtc_s16209x.h @@ -38,8 +38,6 @@ #ifndef MTC_S16209X_H #define MTC_S16209X_H -#include "lcd.h" - MODULE_EXPORT int MTC_S16209X_init(Driver *drvthis); MODULE_EXPORT void MTC_S16209X_close(Driver *drvthis); MODULE_EXPORT int MTC_S16209X_width (Driver *drvthis); diff --git a/server/drivers/pylcd.c b/server/drivers/pylcd.c index 116bd11..2919829 100644 --- a/server/drivers/pylcd.c +++ b/server/drivers/pylcd.c @@ -25,6 +25,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -35,11 +39,16 @@ #include #include #include -#include -#include -#ifdef HAVE_CONFIG_H -# include "config.h" +#if TIME_WITH_SYS_TIME +# include +# include +#else +# if HAVE_SYS_TIME_H +# include +# else +# include +# endif #endif #include "shared/defines.h" diff --git a/server/drivers/sed1330.c b/server/drivers/sed1330.c index 785c2d6..2197e76 100644 --- a/server/drivers/sed1330.c +++ b/server/drivers/sed1330.c @@ -69,6 +69,7 @@ #include #include #include +#include #include "lcd.h" #include "sed1330.h" diff --git a/server/drivers/sed1520.c b/server/drivers/sed1520.c index 565c6d2..0a32c89 100644 --- a/server/drivers/sed1520.c +++ b/server/drivers/sed1520.c @@ -32,13 +32,8 @@ #endif #include -#include -#include -#include -#include #include #include -#include #include "lcd.h" #include "sed1520.h" diff --git a/server/drivers/sed1520.h b/server/drivers/sed1520.h index 89c366d..61ae72a 100644 --- a/server/drivers/sed1520.h +++ b/server/drivers/sed1520.h @@ -1,8 +1,6 @@ #ifndef SED1520_H #define SED1520_H -#include "lcd.h" - /* Commands for SED1520 */ #define DISP_OFF 0xAE #define DISP_ON 0xAF diff --git a/server/drivers/serialPOS.c b/server/drivers/serialPOS.c index 05e5ed1..a164204 100644 --- a/server/drivers/serialPOS.c +++ b/server/drivers/serialPOS.c @@ -66,9 +66,7 @@ get_info Implemented. #include #include #include -#include #include -#include #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/server/drivers/serialPOS.h b/server/drivers/serialPOS.h index 46c7251..0f923ad 100644 --- a/server/drivers/serialPOS.h +++ b/server/drivers/serialPOS.h @@ -1,8 +1,6 @@ #ifndef SERPOS_H #define SERPOS_H -#include "lcd.h" - #define DEFAULT_DEVICE "/dev/Stty" #define DEFAULT_SPEED 9800 #define DEFAULT_LINEWRAP 0 diff --git a/server/drivers/serialVFD.c b/server/drivers/serialVFD.c index fa9d48c..1cec2e6 100644 --- a/server/drivers/serialVFD.c +++ b/server/drivers/serialVFD.c @@ -46,9 +46,7 @@ #include #include #include -#include #include -#include #include "lcd.h" #include "report.h" @@ -422,7 +420,7 @@ serialVFD_flush (Driver *drvthis) } } /* line mode Display (partitially borrowed from serialPOS.c) */ - else { + else { for (j = 0; j < p->height; j++) { /* set pointers to start of the line in frame buffer * & backing store */ @@ -652,7 +650,7 @@ serialVFD_get_free_chars (Driver *drvthis) * * Converts the 5x7 matrix of bits stored in 7 bytes into a VFD specific * byte sequence. - * + * * \param drvthis Pointer to driver structure. * \param n Custom character to define [0 - (p->customchars)]. * \param dat Array of 7(=cellheight) bytes, each representing a pixel row @@ -856,7 +854,7 @@ serialVFD_put_char (Driver *drvthis, int n) * ISO_8859_1 is enabled. * \param drvthis Pointer to driver * \param i Index of character in framebuffer to write - * + * */ static void serialVFD_hw_write (Driver *drvthis, int i) diff --git a/server/drivers/serialVFD_io.c b/server/drivers/serialVFD_io.c index e9341ea..aa4e054 100644 --- a/server/drivers/serialVFD_io.c +++ b/server/drivers/serialVFD_io.c @@ -33,8 +33,6 @@ # include "config.h" #endif -#include -#include #include #include #include @@ -84,7 +82,7 @@ serialVFD_write_serial (Driver *drvthis, unsigned char *dat, size_t length) * Portwait = 2; as 1 + additional WR pulse width\n * Portwait = 3; as 2 + additional WR setup delay\n * Portwait >= 4; as 3 + additional wait delay to next command - * + * * \param drvthis Pointer to driver * \param dat Pointer to array storing the data * \param length Number of bytes to write diff --git a/server/drivers/shuttleVFD.h b/server/drivers/shuttleVFD.h index 7a5f7e8..45fd972 100644 --- a/server/drivers/shuttleVFD.h +++ b/server/drivers/shuttleVFD.h @@ -26,8 +26,6 @@ #ifndef SHUTTLE_VFD_H #define SHUTTLE_VFD_H -#include "lcd.h" - // mandatory functions (necessary for all drivers) MODULE_EXPORT int shuttleVFD_init(Driver *drvthis); MODULE_EXPORT void shuttleVFD_close(Driver *drvthis); diff --git a/server/drivers/stv5730.c b/server/drivers/stv5730.c index c105393..7e9fb4b 100644 --- a/server/drivers/stv5730.c +++ b/server/drivers/stv5730.c @@ -22,25 +22,21 @@ // package for further details. // ////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include -#include -#include -#include -#include "port.h" -#include "timing.h" - #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include +#include +#include +#include +#include + #include "lcd.h" #include "stv5730.h" #include "report.h" - +#include "port.h" +#include "timing.h" #ifndef LPTPORT #define LPTPORT 0x378 diff --git a/server/drivers/svgalib_drv.c b/server/drivers/svgalib_drv.c index 03637a1..53fa572 100644 --- a/server/drivers/svgalib_drv.c +++ b/server/drivers/svgalib_drv.c @@ -2,15 +2,12 @@ * LCDd \c svga driver for displaying on SVGA screens. */ -/* +/*- This is a hack of the curses driver. It's my first attempt at SVGALIB programming so please send comments to . Simon Harrison. 27 Dec 1999. - IMPORTANT NOTE: In order to make this work properly LCDd should not be - allowed to fork (-f option), otherwise k/b input won't work. - Changes: 9 Jan 2000: Figured out svgalib driver needs a hack to main.c just like curses. Maybe this should be fixed with another function call @@ -19,17 +16,12 @@ 26 Jul 2005: adapted better to 0.5 API; changed font from 5x7 to 6x8; take options from the config file: mode, size, brightness, contrast, ... - */ #include #include #include -#include -#include -#include #include -#include #include #include @@ -316,14 +308,14 @@ svga_init (Driver *drvthis) if (vga_init() != 0) { report(RPT_ERR, "%s: vga_init() failed", drvthis->name); return -1; - } + } /* check for legal VGA mode */ tmp = vga_getmodenumber(modestr); if (tmp <= 0) { report(RPT_ERR, "%s: illegal VGA mode %s", drvthis->name, modestr); return -1; - } + } p->mode = tmp; /* switch to selected VGA mode if it is available */ @@ -347,7 +339,7 @@ svga_init (Driver *drvthis) if (vga_setmode (p->mode) < 0) { report(RPT_ERR, "%s: unable to switch to mode %s", drvthis->name, modestr); return -1; - } + } gl_setcontextvga(p->mode); /* Physical screen context. */ gl_setrgbpalette(); @@ -356,7 +348,7 @@ svga_init (Driver *drvthis) if (p->font == NULL) { report(RPT_ERR, "%s: unable to allocate font memory", drvthis->name); return -1; - } + } tmp = (p->brightness * 255) / 1000; if (tmp <= 0) @@ -388,7 +380,7 @@ svga_close (Driver *drvthis) p->font = NULL; free(p); - } + } drvthis->store_private_ptr(drvthis, NULL); vga_setmode(TEXT); @@ -614,8 +606,8 @@ svga_get_key (Driver *drvthis) /* otherwise key not recognised; ignore it */ return NULL; case '\t': /* TAB, LF and CR serve as "Enter" */ - case 0x0A: - case 0x0D: + case 0x0A: + case 0x0D: return "Enter"; default: buf[0] = (char) key & 0xFF; /* make sure it fits into a char */ diff --git a/server/drivers/text.c b/server/drivers/text.c index 4cde69a..4390667 100644 --- a/server/drivers/text.c +++ b/server/drivers/text.c @@ -27,14 +27,11 @@ #include #include -#include -#include #include #include "lcd.h" #include "text.h" #include "report.h" -//#include "drv_base.h" /** private data for the \c text driver */ diff --git a/server/drivers/text.h b/server/drivers/text.h index f9eaadc..01a3fe4 100644 --- a/server/drivers/text.h +++ b/server/drivers/text.h @@ -1,8 +1,6 @@ #ifndef LCD_TEXT_H #define LCD_TEXT_H -#include "lcd.h" - MODULE_EXPORT int text_init (Driver *drvthis); MODULE_EXPORT void text_close (Driver *drvthis); MODULE_EXPORT int text_width (Driver *drvthis); diff --git a/server/drivers/tyan_lcdm.c b/server/drivers/tyan_lcdm.c index 7afe053..ae57e76 100644 --- a/server/drivers/tyan_lcdm.c +++ b/server/drivers/tyan_lcdm.c @@ -41,7 +41,6 @@ #include #include #include -#include #ifdef HAVE_CONFIG_H # include "config.h" diff --git a/server/drivers/tyan_lcdm.h b/server/drivers/tyan_lcdm.h index 715f261..dbc4e8b 100644 --- a/server/drivers/tyan_lcdm.h +++ b/server/drivers/tyan_lcdm.h @@ -20,8 +20,6 @@ #ifndef TYAN_LCDM_H #define TYAN_LCDM_H -#include "lcd.h" - #define DEFAULT_CELL_WIDTH 5 #define DEFAULT_CELL_HEIGHT 8 #define DEFAULT_DEVICE "/dev/lcd" @@ -54,19 +52,19 @@ typedef struct tyan_lcdm_private_data { char device[200]; int speed; int fd; - + unsigned char *framebuf; unsigned char *backingstore; - + int width; int height; int cellwidth; int cellheight; - /* defineable characters */ + /* definable characters */ CGram cc[NUM_CCs]; CGmode ccmode; -} PrivateData; +} PrivateData; /* API: variables for the server core */ diff --git a/server/drivers/ula200.c b/server/drivers/ula200.c index 5ef10cc..31c328f 100644 --- a/server/drivers/ula200.c +++ b/server/drivers/ula200.c @@ -27,11 +27,8 @@ #include #include #include -#include -#include #include #include -#include #include #include diff --git a/server/drivers/wirz-sli.h b/server/drivers/wirz-sli.h index 3c1874d..559e1a3 100644 --- a/server/drivers/wirz-sli.h +++ b/server/drivers/wirz-sli.h @@ -7,8 +7,6 @@ #ifndef SLI_H #define SLI_H -#include "lcd.h" - MODULE_EXPORT int sli_init (Driver *drvthis); MODULE_EXPORT void sli_close (Driver *drvthis); MODULE_EXPORT int sli_width (Driver *drvthis); diff --git a/server/drivers/xosdlib_drv.c b/server/drivers/xosdlib_drv.c index d478b25..17b6577 100644 --- a/server/drivers/xosdlib_drv.c +++ b/server/drivers/xosdlib_drv.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/shared/report.h b/shared/report.h index 193e0be..0a412d9 100644 --- a/shared/report.h +++ b/shared/report.h @@ -32,9 +32,6 @@ #ifndef REPORT_H #define REPORT_H -#include -#include - /* Reporting levels */ /** * \def RPT_CRIT diff --git a/shared/sockets.c b/shared/sockets.c index ee7ddec..33441a9 100644 --- a/shared/sockets.c +++ b/shared/sockets.c @@ -234,7 +234,6 @@ sock_send (int fd, void *src, size_t size) if (errno != EAGAIN) { report (RPT_ERR, "sock_send: socket write error"); report (RPT_DEBUG, "Message was: '%.*s'", size-offset, (char *) src); - //shutdown(fd, SHUT_RDWR); return sent; } continue; @@ -270,7 +269,6 @@ sock_recv (int fd, void *dest, size_t maxlen) err = read (fd, dest, maxlen); if (err < 0) { //report (RPT_DEBUG,"sock_recv: socket read error"); - //shutdown(fd, SHUT_RDWR); return err; } //debug(RPT_DEBUG, "sock_recv: Got message \"%s\"", (char *)dest); diff --git a/shared/sockets.h b/shared/sockets.h index 7c1fbb1..546d367 100644 --- a/shared/sockets.h +++ b/shared/sockets.h @@ -5,8 +5,6 @@ #ifndef SOCKETS_H #define SOCKETS_H -#include - #ifdef HAVE_CONFIG_H # include "config.h" #endif