diff --git a/docs/API-v0.5.txt b/docs/API-v0.5.txt index c8a6dcb..5d32116 100644 --- a/docs/API-v0.5.txt +++ b/docs/API-v0.5.txt @@ -53,7 +53,7 @@ API_VERSION in the code. All these Basic functions should be implemented ! - int (*init) (drvthis, char *args); + int (*init) (drvthis); void (*close) (drvthis); int (*width) (drvthis); int (*height) (drvthis); diff --git a/server/driver.c b/server/driver.c index da76a8f..b749053 100644 --- a/server/driver.c +++ b/server/driver.c @@ -89,12 +89,12 @@ static int driver_store_private_ptr(Driver * driver, void * private_data); Driver * -driver_load( char * name, char * filename, char * args ) +driver_load( char * name, char * filename ) { Driver * driver = NULL; int res; - report( RPT_DEBUG, "%s( name=\"%.40s\", filename=\"%.80s\", args=\"%.80s\")", __FUNCTION__, name, filename, args ); + report( RPT_DEBUG, "%s( name=\"%.40s\", filename=\"%.80s\")", __FUNCTION__, name, filename ); /* Allocate memory for new driver struct */ driver = malloc( sizeof( Driver )); @@ -127,7 +127,7 @@ driver_load( char * name, char * filename, char * args ) /* Call the init function */ debug( RPT_DEBUG, "%s: Calling driver [%.40s] init function", __FUNCTION__, driver->name ); - res = driver->init( driver, args ); + res = driver->init( driver ); if( res < 0 ) { report( RPT_ERR, "Driver [%.40s] init failed, return code < 0", driver->name ); /* Driver load failed, driver should not be added to list diff --git a/server/driver.h b/server/driver.h index 2b9b331..8ecb31d 100644 --- a/server/driver.h +++ b/server/driver.h @@ -21,7 +21,7 @@ #endif Driver * -driver_load( char * name, char * filename, char * args ); +driver_load( char * name, char * filename ); int driver_unload( Driver * driver ); diff --git a/server/drivers.c b/server/drivers.c index 467d7e2..f08abdb 100644 --- a/server/drivers.c +++ b/server/drivers.c @@ -46,7 +46,6 @@ drivers_load_driver( char * name ) char * s; char * driverpath; char * filename; - char * args; debug( RPT_DEBUG, "%s( name=\"%.40s\")", __FUNCTION__, name ); @@ -77,18 +76,13 @@ drivers_load_driver( char * name ) strcat( filename, MODULE_EXTENSION ); } - s = config_get_string( name, "arguments", 0, "" ); - args = malloc( strlen(s)+1 ); - strcpy( args, s ); - /* Load the module */ - driver = driver_load( name, filename, args ); + driver = driver_load( name, filename ); if( driver == NULL ) { /* It failed. The message has already been given by driver_load() */ report( RPT_INFO, "Module %.40s could not be loaded", filename ); free( driverpath ); free( filename ); - free( args ); return -1; } @@ -97,7 +91,6 @@ drivers_load_driver( char * name ) free( driverpath ); free( filename ); - free( args ); /* If first driver, store display properties */ if( driver_does_output(driver) && !display_props ) { diff --git a/server/drivers/CFontz.c b/server/drivers/CFontz.c index 4a428cd..238596a 100644 --- a/server/drivers/CFontz.c +++ b/server/drivers/CFontz.c @@ -107,7 +107,7 @@ static void CFontz_init_hbar (Driver *drvthis); // Opens com port and sets baud correctly... // MODULE_EXPORT int -CFontz_init (Driver *drvthis, char *args) +CFontz_init (Driver *drvthis) { struct termios portset; int tmp, w, h; @@ -130,7 +130,7 @@ CFontz_init (Driver *drvthis, char *args) p->cellheight = DEFAULT_CELL_HEIGHT; p->ccmode = standard; - debug(RPT_INFO, "CFontz: init(%p,%s)", drvthis, args ); + debug(RPT_INFO, "CFontz: init(%p)", drvthis ); /* Read config file */ /* Which device should be used */ diff --git a/server/drivers/CFontz.h b/server/drivers/CFontz.h index 0e80c12..a6f8c89 100644 --- a/server/drivers/CFontz.h +++ b/server/drivers/CFontz.h @@ -13,7 +13,7 @@ #define DEFAULT_SIZE "20x4" -MODULE_EXPORT int CFontz_init (Driver *drvthis, char *device); +MODULE_EXPORT int CFontz_init (Driver *drvthis); MODULE_EXPORT void CFontz_close (Driver *drvthis); MODULE_EXPORT int CFontz_width (Driver *drvthis); MODULE_EXPORT int CFontz_height (Driver *drvthis); diff --git a/server/drivers/CFontz633.c b/server/drivers/CFontz633.c index 05f8d4d..ad4b0b1 100644 --- a/server/drivers/CFontz633.c +++ b/server/drivers/CFontz633.c @@ -135,7 +135,7 @@ static void CFontz633_hardware_clear (Driver *drvthis); * Opens com port and sets baud correctly... */ MODULE_EXPORT int -CFontz633_init (Driver *drvthis, char *args) +CFontz633_init (Driver *drvthis) { struct termios portset; int tmp, w, h; @@ -158,7 +158,7 @@ CFontz633_init (Driver *drvthis, char *args) p->cellheight = DEFAULT_CELL_HEIGHT; p->ccmode = standard; - debug(RPT_INFO, "CFontz633: init(%p,%s)", drvthis, args ); + debug(RPT_INFO, "CFontz633: init(%p)", drvthis ); EmptyKeyRing(&keyring); EmptyReceiveBuffer(&receivebuffer); diff --git a/server/drivers/CFontz633.h b/server/drivers/CFontz633.h index 01baa03..7334183 100644 --- a/server/drivers/CFontz633.h +++ b/server/drivers/CFontz633.h @@ -16,7 +16,7 @@ #define DEFAULT_SIZE_CF631 "20x2" -MODULE_EXPORT int CFontz633_init (Driver *drvthis, char *device); +MODULE_EXPORT int CFontz633_init (Driver *drvthis); MODULE_EXPORT void CFontz633_close (Driver *drvthis); MODULE_EXPORT int CFontz633_width (Driver *drvthis); MODULE_EXPORT int CFontz633_height (Driver *drvthis); diff --git a/server/drivers/CFontzPacket.c b/server/drivers/CFontzPacket.c index b502b69..3cd197f 100644 --- a/server/drivers/CFontzPacket.c +++ b/server/drivers/CFontzPacket.c @@ -180,7 +180,7 @@ static void CFontz633_hardware_clear (Driver *drvthis); * Opens com port and sets baud correctly... */ MODULE_EXPORT int -CFontz633_init (Driver *drvthis, char *args) +CFontz633_init (Driver *drvthis) { struct termios portset; int tmp, w, h; @@ -204,7 +204,7 @@ CFontz633_init (Driver *drvthis, char *args) p->ccmode = standard; p->LEDstate = 0xFFFF; - debug(RPT_INFO, "CFontz633: init(%p,%s)", drvthis, args ); + debug(RPT_INFO, "CFontz633: init(%p)", drvthis ); EmptyKeyRing(&keyring); EmptyReceiveBuffer(&receivebuffer); diff --git a/server/drivers/CwLnx.c b/server/drivers/CwLnx.c index 87a9553..ab7257d 100644 --- a/server/drivers/CwLnx.c +++ b/server/drivers/CwLnx.c @@ -489,7 +489,7 @@ int Write_Line_LCD(int fd, char *buf) /***************************************************** * API: Opens com port and sets baud correctly... */ -int CwLnx_init(Driver * drvthis, char *args) +int CwLnx_init(Driver * drvthis) { struct termios portset_save; @@ -532,7 +532,7 @@ int CwLnx_init(Driver * drvthis, char *args) p->saved_heartbeat = -1; p->heartbeat = 0; - debug(RPT_INFO, "CwLnx: init(%p,%s)", drvthis, args); + debug(RPT_INFO, "CwLnx: init(%p)", drvthis); /* Read config file */ diff --git a/server/drivers/CwLnx.h b/server/drivers/CwLnx.h index ff4ff79..6c73386 100644 --- a/server/drivers/CwLnx.h +++ b/server/drivers/CwLnx.h @@ -52,7 +52,7 @@ #define DEFAULT_FORWARD_KEY CWLNX_KEY_RIGHT #define DEFAULT_MAIN_MENU_KEY CWLNX_KEY_DOWN -MODULE_EXPORT int CwLnx_init(Driver * drvthis, char *device); +MODULE_EXPORT int CwLnx_init(Driver * drvthis); MODULE_EXPORT void CwLnx_close(Driver * drvthis); /* */ MODULE_EXPORT int CwLnx_width (Driver * drvthis); /* */ MODULE_EXPORT int CwLnx_height (Driver * drvthis); diff --git a/server/drivers/IOWarrior.c b/server/drivers/IOWarrior.c index 1fc4f06..92eb2ed 100644 --- a/server/drivers/IOWarrior.c +++ b/server/drivers/IOWarrior.c @@ -211,7 +211,7 @@ int iowled_on_off(usb_dev_handle *udh,int type, unsigned int pattern) /***************************************************** * API: Open USB device and initialize it ... */ -int IOWarrior_init(Driver *drvthis, char *args) +int IOWarrior_init(Driver *drvthis) { char serial[LCD_MAX_WIDTH+1] = DEFAULT_SERIALNO; char size[LCD_MAX_WIDTH+1] = DEFAULT_SIZE; @@ -238,7 +238,7 @@ PrivateData *p; p->backlight = DEFAULT_BACKLIGHT; - debug(RPT_INFO, "IOWarrior: init(%p,%s)", drvthis, args); + debug(RPT_INFO, "IOWarrior: init(%p)", drvthis); /* Read config file */ diff --git a/server/drivers/IOWarrior.h b/server/drivers/IOWarrior.h index 3823061..aefd0f7 100644 --- a/server/drivers/IOWarrior.h +++ b/server/drivers/IOWarrior.h @@ -115,7 +115,7 @@ MODULE_EXPORT int supports_multiple = 1; MODULE_EXPORT char *symbol_prefix = "IOWarrior_"; /* API: functions for the server core */ -MODULE_EXPORT int IOWarrior_init(Driver *drvthis, char *device); +MODULE_EXPORT int IOWarrior_init(Driver *drvthis); MODULE_EXPORT void IOWarrior_close(Driver *drvthis); MODULE_EXPORT int IOWarrior_width(Driver *drvthis); MODULE_EXPORT int IOWarrior_height(Driver *drvthis); diff --git a/server/drivers/MtxOrb.c b/server/drivers/MtxOrb.c index 05618b1..4e55893 100644 --- a/server/drivers/MtxOrb.c +++ b/server/drivers/MtxOrb.c @@ -250,7 +250,7 @@ static char MtxOrb_parse_keypad_setting (Driver *drvthis, char * keyname, char d * Called to initialize driver settings */ MODULE_EXPORT int -MtxOrb_init (Driver *drvthis, char *args) +MtxOrb_init (Driver *drvthis) { struct termios portset; @@ -295,7 +295,7 @@ MtxOrb_init (Driver *drvthis, char *args) p->cellwidth = LCD_DEFAULT_CELLWIDTH; p->cellheight = LCD_DEFAULT_CELLHEIGHT; - debug( RPT_INFO, "MtxOrb: init(%p,%s)", drvthis, args ); + debug( RPT_INFO, "MtxOrb: init(%p)", drvthis ); /* READ CONFIG FILE */ diff --git a/server/drivers/MtxOrb.h b/server/drivers/MtxOrb.h index 4478017..e38d9b9 100644 --- a/server/drivers/MtxOrb.h +++ b/server/drivers/MtxOrb.h @@ -3,7 +3,7 @@ #include "lcd.h" -MODULE_EXPORT int MtxOrb_init (Driver *drvthis, char *device); +MODULE_EXPORT int MtxOrb_init (Driver *drvthis); MODULE_EXPORT void MtxOrb_close (Driver *drvthis); MODULE_EXPORT int MtxOrb_width (Driver *drvthis); MODULE_EXPORT int MtxOrb_height (Driver *drvthis); diff --git a/server/drivers/README b/server/drivers/README index f9fdc21..46ff704 100644 --- a/server/drivers/README +++ b/server/drivers/README @@ -36,7 +36,7 @@ typedef struct lcd_logical_driver { // Functions which should probably be implemented in each driver... int (*init) // initialize driver - (struct lcd_logical_driver * driver, char *args); + (struct lcd_logical_driver * driver); void (*close) (); // close void (*flush) (); // flush void (*flush_box) // flush box diff --git a/server/drivers/bayrad.c b/server/drivers/bayrad.c index 01ae076..2cd8efb 100644 --- a/server/drivers/bayrad.c +++ b/server/drivers/bayrad.c @@ -338,7 +338,7 @@ MODULE_EXPORT char *symbol_prefix = "bayrad_"; // init() should set up any device-specific stuff, and // point all the function pointers. MODULE_EXPORT int -bayrad_init(Driver *drvthis, char *args) +bayrad_init(Driver *drvthis) { char device[256] = BAYRAD_DEFAULT_DEVICE; diff --git a/server/drivers/bayrad.h b/server/drivers/bayrad.h index 6f18002..7d77a51 100644 --- a/server/drivers/bayrad.h +++ b/server/drivers/bayrad.h @@ -10,7 +10,7 @@ #include "lcd.h" -MODULE_EXPORT int bayrad_init(Driver * drvthis, char *args); +MODULE_EXPORT int bayrad_init(Driver * drvthis); MODULE_EXPORT void bayrad_close(Driver * drvthis); MODULE_EXPORT int bayrad_width(Driver * drvthis); MODULE_EXPORT int bayrad_height(Driver * drvthis); diff --git a/server/drivers/curses_drv.c b/server/drivers/curses_drv.c index 1a297aa..2867acf 100644 --- a/server/drivers/curses_drv.c +++ b/server/drivers/curses_drv.c @@ -190,7 +190,7 @@ MODULE_EXPORT char *symbol_prefix = "curses_drv_"; MODULE_EXPORT int -curses_drv_init (Driver *drvthis, char *args) +curses_drv_init (Driver *drvthis) { char buf[256]; diff --git a/server/drivers/curses_drv.h b/server/drivers/curses_drv.h index c4a8779..9d33971 100644 --- a/server/drivers/curses_drv.h +++ b/server/drivers/curses_drv.h @@ -3,7 +3,7 @@ #include "lcd.h" -MODULE_EXPORT int curses_drv_init (Driver * drvthis, char *args); +MODULE_EXPORT int curses_drv_init (Driver * drvthis); MODULE_EXPORT void curses_drv_close (Driver *drvthis); MODULE_EXPORT int curses_drv_width (Driver *drvthis); MODULE_EXPORT int curses_drv_height (Driver *drvthis); diff --git a/server/drivers/debug.c b/server/drivers/debug.c index 0123112..022577b 100644 --- a/server/drivers/debug.c +++ b/server/drivers/debug.c @@ -37,7 +37,7 @@ MODULE_EXPORT char *symbol_prefix = "debug_"; // function... MODULE_EXPORT int -debug_init (Driver *drvthis, char *args) +debug_init (Driver *drvthis) { report (RPT_INFO, "debug_init()"); diff --git a/server/drivers/debug.h b/server/drivers/debug.h index 9ffdcae..a41153c 100644 --- a/server/drivers/debug.h +++ b/server/drivers/debug.h @@ -3,7 +3,7 @@ #include "lcd.h" -MODULE_EXPORT int debug_init (Driver *drvthis, char *args); +MODULE_EXPORT int debug_init (Driver *drvthis); MODULE_EXPORT void debug_close (Driver *drvthis); MODULE_EXPORT int debug_width (Driver *drvthis); MODULE_EXPORT int debug_height (Driver *drvthis); diff --git a/server/drivers/glcdlib.c b/server/drivers/glcdlib.c index 14c8c64..9b6d34f 100644 --- a/server/drivers/glcdlib.c +++ b/server/drivers/glcdlib.c @@ -57,7 +57,7 @@ MODULE_EXPORT int supports_multiple = 0; MODULE_EXPORT char *symbol_prefix = "glcdlib_"; -MODULE_EXPORT int glcdlib_init (Driver *drvthis, char *args) +MODULE_EXPORT int glcdlib_init (Driver *drvthis) { glcdlibPD * pPD; diff --git a/server/drivers/glcdlib.h b/server/drivers/glcdlib.h index 7cfd68a..e5095a8 100644 --- a/server/drivers/glcdlib.h +++ b/server/drivers/glcdlib.h @@ -29,7 +29,7 @@ typedef unsigned char u8; // **************************************************************************************** -MODULE_EXPORT int glcdlib_init (Driver *drvthis, char *args); +MODULE_EXPORT int glcdlib_init (Driver *drvthis); MODULE_EXPORT void glcdlib_close (Driver *drvthis); MODULE_EXPORT int glcdlib_width (Driver *drvthis); MODULE_EXPORT int glcdlib_height (Driver *drvthis); diff --git a/server/drivers/glk.c b/server/drivers/glk.c index a45c71a..4633421 100644 --- a/server/drivers/glk.c +++ b/server/drivers/glk.c @@ -69,7 +69,7 @@ MODULE_EXPORT char *symbol_prefix = "glk_"; // init() should set up any device-specific stuff, and // point all the function pointers. MODULE_EXPORT int -glk_init(Driver *drvthis, char *args) +glk_init(Driver *drvthis) { char device[256] = GLK_DEFAULT_DEVICE; speed_t speed = GLK_DEFAULT_SPEED; diff --git a/server/drivers/glk.h b/server/drivers/glk.h index ee79c74..dc3c3e8 100644 --- a/server/drivers/glk.h +++ b/server/drivers/glk.h @@ -3,7 +3,7 @@ #include "lcd.h" -MODULE_EXPORT int glk_init(Driver *drvthis, char *args); +MODULE_EXPORT int glk_init(Driver *drvthis); MODULE_EXPORT void glk_close(Driver *drvthis); MODULE_EXPORT int glk_width(Driver *drvthis); MODULE_EXPORT int glk_height(Driver *drvthis); diff --git a/server/drivers/hd44780.c b/server/drivers/hd44780.c index ff04c74..cac1330 100644 --- a/server/drivers/hd44780.c +++ b/server/drivers/hd44780.c @@ -120,7 +120,7 @@ MODULE_EXPORT char *symbol_prefix = "HD44780_"; // Opens com port and sets baud correctly... // MODULE_EXPORT int -HD44780_init (Driver * drvthis, char *args) +HD44780_init (Driver * drvthis) { // TODO: remove the two magic numbers below // TODO: single point of return diff --git a/server/drivers/hd44780.h b/server/drivers/hd44780.h index b13735c..6dbeb28 100644 --- a/server/drivers/hd44780.h +++ b/server/drivers/hd44780.h @@ -18,7 +18,7 @@ #include "lcd.h" -MODULE_EXPORT int HD44780_init (Driver *drvthis, char *args); +MODULE_EXPORT int HD44780_init (Driver *drvthis); MODULE_EXPORT void HD44780_close (Driver *drvthis); MODULE_EXPORT int HD44780_width (Driver *drvthis); MODULE_EXPORT int HD44780_height (Driver *drvthis); diff --git a/server/drivers/icp_a106.c b/server/drivers/icp_a106.c index 46f14db..86720ca 100644 --- a/server/drivers/icp_a106.c +++ b/server/drivers/icp_a106.c @@ -69,7 +69,7 @@ MODULE_EXPORT char *symbol_prefix = "icp_a106_"; // Opens com port and sets baud correctly... // MODULE_EXPORT int -icp_a106_init (Driver *drvthis, char *args) +icp_a106_init (Driver *drvthis) { char device[200]; int speed=B1200; @@ -77,7 +77,7 @@ icp_a106_init (Driver *drvthis, char *args) PrivateData *p; - debug( RPT_INFO, "ICP_A106: init(%p,%s)", drvthis, args ); + debug( RPT_INFO, "ICP_A106: init(%p)", drvthis ); // Alocate and store private data p = (PrivateData *) calloc( 1, sizeof( PrivateData) ); diff --git a/server/drivers/icp_a106.h b/server/drivers/icp_a106.h index d601ba7..f636076 100644 --- a/server/drivers/icp_a106.h +++ b/server/drivers/icp_a106.h @@ -32,7 +32,7 @@ #define ICP_A106_H #include "lcd.h" -MODULE_EXPORT int icp_a106_init (Driver *drvthis, char *args); +MODULE_EXPORT int icp_a106_init (Driver *drvthis); MODULE_EXPORT void icp_a106_close (Driver *drvthis); MODULE_EXPORT int icp_a106_width (Driver *drvthis); MODULE_EXPORT int icp_a106_height (Driver *drvthis); diff --git a/server/drivers/imon.c b/server/drivers/imon.c index 3e49693..96d9d2d 100644 --- a/server/drivers/imon.c +++ b/server/drivers/imon.c @@ -71,7 +71,7 @@ typedef struct { /** * driver initialization */ -MODULE_EXPORT int imon_init (Driver *drvthis, char *args) +MODULE_EXPORT int imon_init (Driver *drvthis) { imonPD * pPD = 0; diff --git a/server/drivers/imon.h b/server/drivers/imon.h index 17f66bf..e6c7a2d 100644 --- a/server/drivers/imon.h +++ b/server/drivers/imon.h @@ -27,7 +27,7 @@ #include "lcd.h" -MODULE_EXPORT int imon_init (Driver *drvthis, char *args); +MODULE_EXPORT int imon_init (Driver *drvthis); MODULE_EXPORT void imon_close (Driver *drvthis); MODULE_EXPORT int imon_width (Driver *drvthis); MODULE_EXPORT int imon_height (Driver *drvthis); diff --git a/server/drivers/irmanin.c b/server/drivers/irmanin.c index 2928cc0..5604ad7 100644 --- a/server/drivers/irmanin.c +++ b/server/drivers/irmanin.c @@ -76,7 +76,7 @@ char *codes[] = { // init() should set up any device-specific stuff, and // point all the function pointers. MODULE_EXPORT int -irmanin_init (Driver *drvthis, char *args) +irmanin_init (Driver *drvthis) { char device[256]; char *ptrdevice; diff --git a/server/drivers/irmanin.h b/server/drivers/irmanin.h index a97ce81..8f2ac7b 100644 --- a/server/drivers/irmanin.h +++ b/server/drivers/irmanin.h @@ -1,7 +1,7 @@ #ifndef LCD_IRMANIN__H #define LCD_IRMANIN_H -MODULE_EXPORT int irmanin_init (Driver *drvthis, char *args); +MODULE_EXPORT int irmanin_init (Driver *drvthis); MODULE_EXPORT void irmanin_close (Driver *drvthis); MODULE_EXPORT char irmanin_getkey (Driver *drvthis); diff --git a/server/drivers/joy.c b/server/drivers/joy.c index 66e4086..794e61f 100644 --- a/server/drivers/joy.c +++ b/server/drivers/joy.c @@ -69,7 +69,7 @@ MODULE_EXPORT char *symbol_prefix = "joy_"; // init() should set up any device-specific stuff, and // point all the function pointers. MODULE_EXPORT int -joy_init (Driver *drvthis, char *args) +joy_init (Driver *drvthis) { char device[256]; diff --git a/server/drivers/joy.h b/server/drivers/joy.h index 7f45cf9..8a68944 100644 --- a/server/drivers/joy.h +++ b/server/drivers/joy.h @@ -3,7 +3,7 @@ #include "lcd.h" -MODULE_EXPORT int joy_init (Driver *drvthis, char *args); +MODULE_EXPORT int joy_init (Driver *drvthis); MODULE_EXPORT void joy_close (Driver *drvthis); MODULE_EXPORT char joy_getkey (Driver *drvthis); diff --git a/server/drivers/lb216.c b/server/drivers/lb216.c index 9477268..85e7cb7 100644 --- a/server/drivers/lb216.c +++ b/server/drivers/lb216.c @@ -73,7 +73,7 @@ MODULE_EXPORT char *symbol_prefix = "LB216_"; // Opens com port and sets baud correctly... // MODULE_EXPORT int -LB216_init(Driver * drvthis, char *args) +LB216_init(Driver * drvthis) { struct termios portset; int reboot=0; diff --git a/server/drivers/lb216.h b/server/drivers/lb216.h index 978e183..1442bc6 100644 --- a/server/drivers/lb216.h +++ b/server/drivers/lb216.h @@ -3,7 +3,7 @@ #include "lcd.h" -MODULE_EXPORT int LB216_init(Driver * drvthis, char *device); +MODULE_EXPORT int LB216_init(Driver * drvthis); MODULE_EXPORT void LB216_close(Driver * drvthis); MODULE_EXPORT int LB216_width (Driver *drvthis); MODULE_EXPORT int LB216_height (Driver *drvthis); diff --git a/server/drivers/lcd.h b/server/drivers/lcd.h index 37dfa40..3c94525 100644 --- a/server/drivers/lcd.h +++ b/server/drivers/lcd.h @@ -129,7 +129,7 @@ typedef struct lcd_logical_driver { /* The driver loader will look for symbols with these names ! */ /* Basic functions */ - int (*init) (struct lcd_logical_driver* drvthis, char *args); + int (*init) (struct lcd_logical_driver* drvthis); void (*close) (struct lcd_logical_driver* drvthis); int (*width) (struct lcd_logical_driver* drvthis); int (*height) (struct lcd_logical_driver* drvthis); diff --git a/server/drivers/lcdm001.c b/server/drivers/lcdm001.c index 6fd3058..f498a6d 100644 --- a/server/drivers/lcdm001.c +++ b/server/drivers/lcdm001.c @@ -133,7 +133,7 @@ lcdm001_cursorblink (Driver *drvthis, int on) * point all the function pointers. */ MODULE_EXPORT int -lcdm001_init (Driver *drvthis, char *args) +lcdm001_init (Driver *drvthis) { char device[200]; int speed=B38400; @@ -141,7 +141,7 @@ lcdm001_init (Driver *drvthis, char *args) char out[5]=""; - debug( RPT_INFO, "LCDM001: init(%p,%s)", drvthis, args ); + debug( RPT_INFO, "LCDM001: init(%p)", drvthis ); framebuf = malloc (width * height); diff --git a/server/drivers/lcdm001.h b/server/drivers/lcdm001.h index 3e4de7c..d7b2b91 100644 --- a/server/drivers/lcdm001.h +++ b/server/drivers/lcdm001.h @@ -33,7 +33,7 @@ /* REMOVE: I don't thing this is actualy needed. */ /* extern lcd_logical_driver *lcdm001; */ -MODULE_EXPORT int lcdm001_init (Driver *drvthis, char *args); +MODULE_EXPORT int lcdm001_init (Driver *drvthis); MODULE_EXPORT void lcdm001_close (Driver *drvthis); MODULE_EXPORT int lcdm001_width (Driver *drvthis); MODULE_EXPORT int lcdm001_height (Driver *drvthis); diff --git a/server/drivers/lcterm.c b/server/drivers/lcterm.c index e6ec4e7..94ff38b 100644 --- a/server/drivers/lcterm.c +++ b/server/drivers/lcterm.c @@ -74,14 +74,14 @@ MODULE_EXPORT char *symbol_prefix = "lcterm_"; // Opens com port and sets baud correctly... // MODULE_EXPORT int -lcterm_init (Driver *drvthis, char *args) +lcterm_init (Driver *drvthis) { char device[200]; int speed=B9600; struct termios portset; PrivateData *p; - debug( RPT_INFO, "LCTERM: init(%p,%s)", drvthis, args ); + debug( RPT_INFO, "LCTERM: init(%p)", drvthis ); // Alocate and store private data p = (PrivateData *) calloc( 1, sizeof( PrivateData) ); diff --git a/server/drivers/lcterm.h b/server/drivers/lcterm.h index b19a535..69b55c9 100644 --- a/server/drivers/lcterm.h +++ b/server/drivers/lcterm.h @@ -27,7 +27,7 @@ #define LCTERM_H #include "lcd.h" -MODULE_EXPORT int lcterm_init (Driver *drvthis, char *args); +MODULE_EXPORT int lcterm_init (Driver *drvthis); MODULE_EXPORT void lcterm_close (Driver *drvthis); MODULE_EXPORT int lcterm_width (Driver *drvthis); MODULE_EXPORT int lcterm_height (Driver *drvthis); diff --git a/server/drivers/lircin.c b/server/drivers/lircin.c index 80aa132..0c966ee 100644 --- a/server/drivers/lircin.c +++ b/server/drivers/lircin.c @@ -61,7 +61,7 @@ MODULE_EXPORT char *symbol_prefix = "lircin_"; * point all the function pointers. */ MODULE_EXPORT int -lircin_init (Driver *drvthis, char *args) +lircin_init (Driver *drvthis) { char s[200]=""; char *lircrc, *prog; diff --git a/server/drivers/lircin.h b/server/drivers/lircin.h index c9c3a60..2ec4033 100644 --- a/server/drivers/lircin.h +++ b/server/drivers/lircin.h @@ -21,7 +21,7 @@ #ifndef LCD_LIRCIN_H #define LCD_LIRCIN_H -MODULE_EXPORT int lircin_init (Driver *drvthis, char *args); +MODULE_EXPORT int lircin_init (Driver *drvthis); MODULE_EXPORT void lircin_close (Driver *drvthis); MODULE_EXPORT char * lircin_get_key (Driver *drvthis); diff --git a/server/drivers/ms6931.c b/server/drivers/ms6931.c index a00e398..ae5a08c 100644 --- a/server/drivers/ms6931.c +++ b/server/drivers/ms6931.c @@ -143,14 +143,14 @@ ms6931_draw_frame (char *dat) // Opens com port and sets baud correctly... // MODULE_EXPORT int -ms6931_init (Driver *drvthis, char *args) +ms6931_init (Driver *drvthis) { struct termios portset; int w, h; char device[200] = MS6931_DEF_DEVICE; char size[200] = MS6931_DEF_SIZE; - debug(RPT_INFO, "ms6931_init: init(%p,%s)", drvthis, args ); + debug(RPT_INFO, "ms6931_init: init(%p)", drvthis ); /*Which serial device should be used*/ strncpy(device, drvthis->config_get_string ( drvthis->name , "Device" , 0 , MS6931_DEF_DEVICE),sizeof(device)); diff --git a/server/drivers/ms6931.h b/server/drivers/ms6931.h index 1874e33..ea24ef9 100644 --- a/server/drivers/ms6931.h +++ b/server/drivers/ms6931.h @@ -33,7 +33,7 @@ #define MS6931_DEF_CELL_HEIGHT 8 -MODULE_EXPORT int ms6931_init (Driver *drvthis, char *args); +MODULE_EXPORT int ms6931_init (Driver *drvthis); MODULE_EXPORT void ms6931_close (Driver *drvthis); MODULE_EXPORT int ms6931_width (Driver *drvthis); MODULE_EXPORT int ms6931_height(Driver *drvthis); diff --git a/server/drivers/mtc_s16209x.c b/server/drivers/mtc_s16209x.c index 2c61941..47cac07 100644 --- a/server/drivers/mtc_s16209x.c +++ b/server/drivers/mtc_s16209x.c @@ -115,7 +115,7 @@ MODULE_EXPORT char *symbol_prefix = "MTC_S16209X_"; // Opens com port and sets baud correctly... // MODULE_EXPORT int -MTC_S16209X_init (Driver * drvthis, char *args) +MTC_S16209X_init (Driver * drvthis) { struct termios portset; char device[256] = MTC_DEFAULT_DEVICE; diff --git a/server/drivers/mtc_s16209x.h b/server/drivers/mtc_s16209x.h index 200d1ee..63e9293 100644 --- a/server/drivers/mtc_s16209x.h +++ b/server/drivers/mtc_s16209x.h @@ -40,7 +40,7 @@ #include "lcd.h" -MODULE_EXPORT int MTC_S16209X_init(Driver * drvthis, char *device); +MODULE_EXPORT int MTC_S16209X_init(Driver * drvthis); MODULE_EXPORT void MTC_S16209X_close(Driver * drvthis); MODULE_EXPORT int MTC_S16209X_width (Driver *drvthis); MODULE_EXPORT int MTC_S16209X_height (Driver *drvthis); diff --git a/server/drivers/sed1330.c b/server/drivers/sed1330.c index 188994c..7764540 100644 --- a/server/drivers/sed1330.c +++ b/server/drivers/sed1330.c @@ -313,13 +313,13 @@ unsigned char sed1330_readkeypad (PrivateData *p, unsigned int YData); // Init the driver and display // MODULE_EXPORT int -sed1330_init( Driver * drvthis, char *args ) +sed1330_init( Driver * drvthis ) { char * s; PrivateData * p; char data[8]; - debug( RPT_DEBUG, "%s( %p, args=\"%s\" )", __FUNCTION__, drvthis, args ); + debug( RPT_DEBUG, "%s( %p )", __FUNCTION__, drvthis ); // Alocate and store private p diff --git a/server/drivers/sed1330.h b/server/drivers/sed1330.h index fa7b0a2..bf81929 100644 --- a/server/drivers/sed1330.h +++ b/server/drivers/sed1330.h @@ -8,7 +8,7 @@ #include "lcd.h" -MODULE_EXPORT int sed1330_init( Driver * drvthis, char *args ); +MODULE_EXPORT int sed1330_init( Driver * drvthis ); MODULE_EXPORT void sed1330_close( Driver * drvthis ); MODULE_EXPORT int sed1330_width( Driver * drvthis ); MODULE_EXPORT int sed1330_height( Driver * drvthis ); diff --git a/server/drivers/sed1520.c b/server/drivers/sed1520.c index fb5b5eb..30470b2 100644 --- a/server/drivers/sed1520.c +++ b/server/drivers/sed1520.c @@ -147,7 +147,7 @@ drawchar2fb (int x, int y, unsigned char z) // a command line argument. // MODULE_EXPORT int -sed1520_init (Driver *drvthis, char *args) +sed1520_init (Driver *drvthis) { /* Read config file */ diff --git a/server/drivers/sed1520.h b/server/drivers/sed1520.h index d3f2e8d..7eb506f 100644 --- a/server/drivers/sed1520.h +++ b/server/drivers/sed1520.h @@ -3,7 +3,7 @@ #include "lcd.h" -MODULE_EXPORT int sed1520_init (Driver *drvthis, char *args); +MODULE_EXPORT int sed1520_init (Driver *drvthis); MODULE_EXPORT void sed1520_close (Driver *drvthis); MODULE_EXPORT int sed1520_width (Driver *drvthis); MODULE_EXPORT int sed1520_height (Driver *drvthis); diff --git a/server/drivers/stv5730.c b/server/drivers/stv5730.c index 9e549c8..44f17a6 100644 --- a/server/drivers/stv5730.c +++ b/server/drivers/stv5730.c @@ -281,7 +281,7 @@ stv5730_drawchar2fb (int x, int y, unsigned char z) // a command line argument. // MODULE_EXPORT int -stv5730_init (Driver *drvthis, char *args) +stv5730_init (Driver *drvthis) { int i; diff --git a/server/drivers/stv5730.h b/server/drivers/stv5730.h index eb0ef22..166c105 100644 --- a/server/drivers/stv5730.h +++ b/server/drivers/stv5730.h @@ -3,7 +3,7 @@ #include "lcd.h" -MODULE_EXPORT int stv5730_init (Driver *drvthis, char *args); +MODULE_EXPORT int stv5730_init (Driver *drvthis); MODULE_EXPORT void stv5730_close (Driver *drvthis); MODULE_EXPORT int stv5730_width (Driver *drvthis); MODULE_EXPORT int stv5730_height (Driver *drvthis); diff --git a/server/drivers/svgalib_drv.c b/server/drivers/svgalib_drv.c index 09f4db3..e2f8adb 100644 --- a/server/drivers/svgalib_drv.c +++ b/server/drivers/svgalib_drv.c @@ -252,7 +252,7 @@ MODULE_EXPORT char *symbol_prefix = "svgalib_drv_"; * Init driver */ MODULE_EXPORT int -svgalib_drv_init (Driver *drvthis, char *args) +svgalib_drv_init (Driver *drvthis) { int VGAMODE; diff --git a/server/drivers/svgalib_drv.h b/server/drivers/svgalib_drv.h index ef10c2e..8b49ddf 100644 --- a/server/drivers/svgalib_drv.h +++ b/server/drivers/svgalib_drv.h @@ -1,7 +1,7 @@ #ifndef LCD_SVGALIB_H #define LCD_SVGALIB_H -MODULE_EXPORT int svgalib_drv_init (Driver *drvthis, char *args); +MODULE_EXPORT int svgalib_drv_init (Driver *drvthis); MODULE_EXPORT void svgalib_drv_close (Driver *drvthis); MODULE_EXPORT int svgalib_drv_width (Driver *drvthis); MODULE_EXPORT int svgalib_drv_height (Driver *drvthis); diff --git a/server/drivers/t6963.c b/server/drivers/t6963.c index c03796a..40fca12 100644 --- a/server/drivers/t6963.c +++ b/server/drivers/t6963.c @@ -62,13 +62,13 @@ MODULE_EXPORT int supports_multiple = 0; MODULE_EXPORT char *symbol_prefix = "t6963_"; MODULE_EXPORT int -t6963_init (Driver *drvthis, char *args) +t6963_init (Driver *drvthis) { int w, h, p, i, ecp_input; char size[200] = DEFAULT_SIZE; - debug(RPT_INFO, "T6963: init(%p,%s)", drvthis, args ); + debug(RPT_INFO, "T6963: init(%p)", drvthis ); t6963_display_mode = 0; t6963_graph_line[0] = 0x20; diff --git a/server/drivers/t6963.h b/server/drivers/t6963.h index 7a922c7..66be818 100644 --- a/server/drivers/t6963.h +++ b/server/drivers/t6963.h @@ -112,7 +112,7 @@ typedef unsigned char u8; // **************************************************************************************** -MODULE_EXPORT int t6963_init (Driver *drvthis, char *args); +MODULE_EXPORT int t6963_init (Driver *drvthis); MODULE_EXPORT void t6963_close (Driver *drvthis); MODULE_EXPORT int t6963_width (Driver *drvthis); MODULE_EXPORT int t6963_height (Driver *drvthis); diff --git a/server/drivers/text.c b/server/drivers/text.c index 5253e8c..a54aef9 100644 --- a/server/drivers/text.c +++ b/server/drivers/text.c @@ -54,7 +54,7 @@ MODULE_EXPORT char *symbol_prefix = "text_"; MODULE_EXPORT int -text_init (Driver *drvthis, char *args) +text_init (Driver *drvthis) { char buf[256]; diff --git a/server/drivers/text.h b/server/drivers/text.h index e931654..9316069 100644 --- a/server/drivers/text.h +++ b/server/drivers/text.h @@ -3,7 +3,7 @@ #include "lcd.h" -MODULE_EXPORT int text_init (Driver * drvthis, char *args); +MODULE_EXPORT int text_init (Driver * drvthis); MODULE_EXPORT void text_close (Driver *drvthis); MODULE_EXPORT int text_width (Driver *drvthis); MODULE_EXPORT int text_height (Driver *drvthis); diff --git a/server/drivers/wirz-sli.c b/server/drivers/wirz-sli.c index 6ab5c0f..1841254 100644 --- a/server/drivers/wirz-sli.c +++ b/server/drivers/wirz-sli.c @@ -50,7 +50,7 @@ MODULE_EXPORT char *symbol_prefix = "sli_"; // Opens com port and sets baud correctly... // MODULE_EXPORT int -sli_init (Driver *drvthis, char *args) +sli_init (Driver *drvthis) { struct termios portset; char out[2]; diff --git a/server/drivers/wirz-sli.h b/server/drivers/wirz-sli.h index 7c3808d..950deac 100644 --- a/server/drivers/wirz-sli.h +++ b/server/drivers/wirz-sli.h @@ -9,7 +9,7 @@ #include "lcd.h" -MODULE_EXPORT int sli_init (Driver *drvthis, char *args); +MODULE_EXPORT int sli_init (Driver *drvthis); MODULE_EXPORT void sli_close (Driver *drvthis); MODULE_EXPORT int sli_width (Driver *drvthis); MODULE_EXPORT int sli_height (Driver *drvthis);