diff --git a/server/drivers/IOWarrior.c b/server/drivers/IOWarrior.c index 92eb2ed..22a633d 100644 --- a/server/drivers/IOWarrior.c +++ b/server/drivers/IOWarrior.c @@ -211,7 +211,8 @@ 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) +MODULE_EXPORT int +IOWarrior_init(Driver *drvthis) { char serial[LCD_MAX_WIDTH+1] = DEFAULT_SERIALNO; char size[LCD_MAX_WIDTH+1] = DEFAULT_SIZE; @@ -622,7 +623,8 @@ PrivateData *p = drvthis->private_data; * NOTAPI: Inits vertical bars... * This was part of API in 0.4 and removed in 0.5 */ -void IOWarrior_init_vbar(Driver *drvthis) +static void +IOWarrior_init_vbar(Driver *drvthis) { PrivateData *p = drvthis->private_data; @@ -712,7 +714,8 @@ char g[CELLWIDTH*CELLHEIGHT] = { * NOTAPI: Inits horizontal bars... * This was part of API in 0.4 and removed in 0.5 */ -void IOWarrior_init_hbar(Driver *drvthis) +static void +IOWarrior_init_hbar(Driver *drvthis) { PrivateData *p = drvthis->private_data; @@ -825,7 +828,7 @@ PrivateData *p = drvthis->private_data; /******************************************************************* * API: Sets up for big numbers */ -MODULE_EXPORT void +static void IOWarrior_init_num(Driver *drvthis) { PrivateData *p = drvthis->private_data; diff --git a/server/drivers/MtxOrb.c b/server/drivers/MtxOrb.c index 211b9b5..b86a5f0 100644 --- a/server/drivers/MtxOrb.c +++ b/server/drivers/MtxOrb.c @@ -1253,7 +1253,7 @@ MtxOrb_get_key (Driver *drvthis) if (fds[0].revents == 0) { return NULL; } (void) read (p->fd, &in, 1); - report(RPT_INFO, "MtxOrb: getkey: key X %i", in); + report(RPT_INFO, "MtxOrb: get_key: key X %i", in); if ( 0 == in ) { debug( RPT_INFO, "MtxOrb_get_key: in=>%d\n", in ); diff --git a/server/drivers/MtxOrb.h b/server/drivers/MtxOrb.h index e38d9b9..4f62a5b 100644 --- a/server/drivers/MtxOrb.h +++ b/server/drivers/MtxOrb.h @@ -19,7 +19,7 @@ MODULE_EXPORT void MtxOrb_set_contrast (Driver *drvthis, int promille); MODULE_EXPORT void MtxOrb_backlight (Driver *drvthis, int on); MODULE_EXPORT void MtxOrb_output (Driver *drvthis, int on); -MODULE_EXPORT char MtxOrb_getkey (Driver *drvthis); +MODULE_EXPORT char * MtxOrb_get_key (Driver *drvthis); MODULE_EXPORT char * MtxOrb_get_info (Driver *drvthis); MODULE_EXPORT void MtxOrb_num (Driver *drvthis, int x, int num); diff --git a/server/drivers/t6963.h b/server/drivers/t6963.h index 66be818..f1654cb 100644 --- a/server/drivers/t6963.h +++ b/server/drivers/t6963.h @@ -128,7 +128,6 @@ MODULE_EXPORT int t6963_icon (Driver *drvthis, int x, int y, int icon); MODULE_EXPORT void t6963_set_char (Driver *drvthis, int n, char *dat); -//MODULE_EXPORT char t6963_getkey (Driver *drvthis); void t6963_graphic_clear (Driver *drvthis, int x1, int y1, int x2, int y2); void t6963_set_nchar (Driver *drvthis, int n, char *dat, int num); diff --git a/server/drivers/wirz-sli.c b/server/drivers/wirz-sli.c index 1841254..0d8fb87 100644 --- a/server/drivers/wirz-sli.c +++ b/server/drivers/wirz-sli.c @@ -255,7 +255,7 @@ sli_chr (Driver *drvthis, int x, int y, char c) characters, so that you can do both bar types at once.. maybe I will release a new version of the SLI driver that attempts this */ -MODULE_EXPORT void +static void sli_init_vbar (Driver *drvthis) { char a[] = { @@ -344,7 +344,7 @@ sli_init_vbar (Driver *drvthis) ///////////////////////////////////////////////////////////////// // Inits horizontal bars... // -MODULE_EXPORT void +static void sli_init_hbar (Driver *drvthis) { diff --git a/server/drivers/wirz-sli.h b/server/drivers/wirz-sli.h index 950deac..c0cf6a2 100644 --- a/server/drivers/wirz-sli.h +++ b/server/drivers/wirz-sli.h @@ -25,14 +25,4 @@ MODULE_EXPORT void sli_old_icon (Driver *drvthis, int which, char dest); MODULE_EXPORT void sli_set_char (Driver *drvthis, int n, char *dat); -MODULE_EXPORT int sli_get_contrast (Driver *drvthis); -MODULE_EXPORT void sli_set_contrast (Driver *drvthis, int contrast); -MODULE_EXPORT void sli_backlight (Driver *drvthis, int on); - -MODULE_EXPORT char sli_getkey (Driver *drvthis); - -MODULE_EXPORT void sli_init_vbar (Driver *drvthis); -MODULE_EXPORT void sli_init_hbar (Driver *drvthis); -MODULE_EXPORT void sli_init_num (Driver *drvthis); - #endif