mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup: 'static'ize function which are not in the API anymore

Browse Source
This commit is contained in:
marschap
2006-04-12 10:51:01 +00:00
parent fd2ed040f4
commit 30afa50bdf
18 changed files with 58 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/CFontzPacket.c
+1 -1
View File
@@ -1068,7 +1068,7 @@ CFontzPacket_hbar (Driver *drvthis, int x, int y, int len, int promille, int opt
/*
* Inits big numbers
*/
void
static void
CFontzPacket_init_num(Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
server/drivers/CwLnx.c
+15 -8
View File
@@ -124,7 +124,7 @@ static void CwLnx_linewrap(int fd, int on);
static void CwLnx_autoscroll(int fd, int on);
static void CwLnx_hidecursor(int fd);
void CwLnx_draw_frame(Driver *drvthis, char *dat);
static void CwLnx_draw_frame(Driver *drvthis, char *dat);
#define LCD_CMD 254
#define LCD_CMD_END 253
@@ -815,7 +815,8 @@ void Set_Insert(int fd, int row, int col)
*
* _flush_box is not an API entry anymore.
*
void CwLnx_flush_box(int lft, int top, int rgt, int bot)
static void
CwLnx_flush_box(int lft, int top, int rgt, int bot)
{
int y;
@@ -916,7 +917,8 @@ CwLnx_set_brightness(Driver * drvthis, int state, int promille)
/*********************************************************
* Toggle the built-in linewrapping feature
*/
static void CwLnx_linewrap(int fd, int on)
static void
CwLnx_linewrap(int fd, int on)
{
if (on)
Enable_Wrap(fd);
@@ -928,7 +930,8 @@ static void CwLnx_linewrap(int fd, int on)
/****************************************************************
* Toggle the built-in automatic scrolling feature
*/
static void CwLnx_autoscroll(int fd, int on)
static void
CwLnx_autoscroll(int fd, int on)
{
if (on)
Enable_Scroll(fd);
@@ -940,7 +943,8 @@ static void CwLnx_autoscroll(int fd, int on)
/*******************************************************************
* Get rid of the blinking curson
*/
static void CwLnx_hidecursor(int fd)
static void
CwLnx_hidecursor(int fd)
{
Disable_Cursor(fd);
}
@@ -950,7 +954,8 @@ static void CwLnx_hidecursor(int fd)
* NOTAPI: Inits vertical bars...
* This was part of API in 0.4 and removed in 0.5
*/
void CwLnx_init_vbar(Driver * drvthis)
static void
CwLnx_init_vbar(Driver * drvthis)
{
PrivateData * p = drvthis->private_data;
@@ -1027,7 +1032,8 @@ void CwLnx_init_vbar(Driver * drvthis)
* NOTAPI: Inits horizontal bars...
* This was part of API in 0.4 and removed in 0.5
*/
void CwLnx_init_hbar(Driver * drvthis)
static void
CwLnx_init_hbar(Driver * drvthis)
{
PrivateData * p = drvthis->private_data;
@@ -1334,7 +1340,8 @@ CwLnx_icon(Driver * drvthis, int x, int y, int icon)
*
* Input is a character array, sized CwLnx->wid*CwLnx->hgt
*/
void CwLnx_draw_frame(Driver *drvthis, char *dat)
static void
CwLnx_draw_frame(Driver *drvthis, char *dat)
{
PrivateData * p = drvthis->private_data;
server/drivers/CwLnx.h
+2 -8
View File
@@ -54,8 +54,8 @@
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);
MODULE_EXPORT int CwLnx_width (Driver * drvthis);
MODULE_EXPORT int CwLnx_height (Driver * drvthis);
MODULE_EXPORT void CwLnx_clear (Driver * drvthis);
MODULE_EXPORT void CwLnx_flush(Driver * drvthis);
MODULE_EXPORT void CwLnx_string(Driver * drvthis, int x, int y, char string[]);
@@ -70,11 +70,5 @@ MODULE_EXPORT void CwLnx_set_contrast(Driver * drvthis, int contrast);
MODULE_EXPORT void CwLnx_clear(Driver * drvthis);
MODULE_EXPORT void CwLnx_backlight(Driver * drvthis, int on);
// MODULE_EXPORT void CwLnx_flush_box(Driver * drvthis, int lft, int top, int rgt, int bot);
// MODULE_EXPORT void CwLnx_init_vbar( Driver * drvthis);
// MODULE_EXPORT void CwLnx_init_hbar( Driver * drvthis);
// MODULE_EXPORT void CwLnx_init_num( Driver * drvthis);
// MODULE_EXPORT void CwLnx_draw_frame(Driver * drvthis, char *dat);
#endif
server/drivers/NoritakeVFD.c
+3 -21
View File
@@ -294,24 +294,6 @@ NoritakeVFD_flush (Driver *drvthis)
}
MODULE_EXPORT void
NoritakeVFD_flush_box (Driver *drvthis, int lft, int top, int rgt, int bot)
{
PrivateData *p = drvthis->private_data;
int y;
char out[LCD_MAX_WIDTH];
debug(RPT_DEBUG, "%s: flush_box(%i,%i)-(%i,%i)", __FUNCTION__, lft, top, rgt, bot);
for (y = top; y <= bot; y++) {
int pos = y*p->width;
snprintf(out, sizeof(out), "%c%c%c", 0x1B, 'H', pos+lft);
write(p->fd, out, 3);
write(p->fd, p->framebuf + (y * p->width) + lft, rgt - lft + 1);
}
}
/////////////////////////////////////////////////////////////////
// Prints a character on the lcd display, at position (x,y). The
// upper-left is (1,1), and the lower right should be (20,4).
@@ -402,7 +384,7 @@ NoritakeVFD_reboot (Driver *drvthis)
/////////////////////////////////////////////////////////////////
// Sets up for vertical bars. Call before NoritakeVFD->vbar()
//
void
static void
NoritakeVFD_init_vbar (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
@@ -475,7 +457,7 @@ NoritakeVFD_init_vbar (Driver *drvthis)
/////////////////////////////////////////////////////////////////
// Inits horizontal bars...
//
void
static void
NoritakeVFD_init_hbar (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
@@ -658,7 +640,7 @@ NoritakeVFD_icon (Driver *drvthis, int x, int y, int icon)
//
// Input is a character array, sized NoritakeVFD->width*NoritakeVFD->height
//
void
static void
NoritakeVFD_draw_frame (Driver *drvthis, unsigned char *dat)
{
PrivateData *p = drvthis->private_data;
server/drivers/bayrad.c
+4 -3
View File
@@ -43,6 +43,7 @@
#define BAYRAD_DEFAULT_DEVICE "/dev/lcd"
//////////////////////////////////////////////////////////////////////////
////////////////////// Base "class" to derive from ///////////////////////
//////////////////////////////////////////////////////////////////////////
@@ -362,7 +363,7 @@ bayrad_backlight(Driver * drvthis, int on)
//////////////////////////////////////////////////////////////////////
// Tells the driver to get ready for vertical bargraphs.
//
void
static void
bayrad_init_vbar(Driver * drvthis)
{
PrivateData *p = drvthis->private_data;
@@ -460,7 +461,7 @@ bayrad_init_vbar(Driver * drvthis)
//////////////////////////////////////////////////////////////////////
// Tells the driver to get ready for horizontal bargraphs.
//
void
static void
bayrad_init_hbar(Driver * drvthis)
{
PrivateData *p = drvthis->private_data;
@@ -538,7 +539,7 @@ bayrad_init_hbar(Driver * drvthis)
//////////////////////////////////////////////////////////////////////
// Tells the driver to get ready for big numbers, if possible.
//
void
static void
bayrad_init_num(Driver * drvthis)
{
//PrivateData *p = drvthis->private_data;
server/drivers/bayrad.h
-3
View File
@@ -31,7 +31,4 @@ MODULE_EXPORT void bayrad_backlight(Driver * drvthis, int promille);
MODULE_EXPORT const char *bayrad_get_key(Driver * drvthis);
MODULE_EXPORT void bayrad_init_vbar(Driver * drvthis);
MODULE_EXPORT void bayrad_init_hbar(Driver * drvthis);
#endif
server/drivers/debug.c
+13 -13
View File
@@ -181,19 +181,7 @@ debug_backlight (Driver *drvthis, int on)
report(RPT_INFO, "%s(%i)", __FUNCTION__, on);
}
MODULE_EXPORT void
debug_init_vbar (Driver *drvthis)
{
report(RPT_INFO, "%s()", __FUNCTION__);
}
MODULE_EXPORT void
debug_init_hbar (Driver *drvthis)
{
report(RPT_INFO, "%s()", __FUNCTION__);
}
MODULE_EXPORT void
static void
debug_init_num (Driver *drvthis)
{
report(RPT_INFO, "%s()", __FUNCTION__);
@@ -211,6 +199,12 @@ debug_set_char (Driver *drvthis, int n, char *dat)
report(RPT_INFO, "%s(%i,data)", __FUNCTION__, n);
}
static void
debug_init_vbar (Driver *drvthis)
{
report(RPT_INFO, "%s()", __FUNCTION__);
}
/////////////////////////////////////////////////////////////////
// Draws a vertical bar; erases entire column onscreen.
//
@@ -230,6 +224,12 @@ debug_vbar (Driver *drvthis, int x, int y, int len, int promille, int options)
}
}
static void
debug_init_hbar (Driver *drvthis)
{
report(RPT_INFO, "%s()", __FUNCTION__);
}
/////////////////////////////////////////////////////////////////
// Draws a horizontal bar to the right.
//
server/drivers/debug.h
-4
View File
@@ -24,8 +24,4 @@ MODULE_EXPORT void debug_backlight (Driver *drvthis, int promille);
MODULE_EXPORT const char *debug_get_key (Driver *drvthis);
MODULE_EXPORT void debug_init_vbar (Driver *drvthis);
MODULE_EXPORT void debug_init_hbar (Driver *drvthis);
MODULE_EXPORT void debug_init_num (Driver *drvthis);
#endif
server/drivers/glk.c
+5 -5
View File
@@ -338,7 +338,7 @@ glk_flush(Driver *drvthis)
/* Write accumulated string */
glkputl(p->PortFD, GLKCommand, 0x79, xs * 6 + 1, y * 8, EOF);
glkputa(p->PortFD, x - xs, ps);
debug(RPT_DEBUG, "draw_frame: Writing at (%d,%d) for %d", xs, y, x - xs);
debug(RPT_DEBUG, "flush: Writing at (%d,%d) for %d", xs, y, x - xs);
xs = -1;
} else if ((*qf != *pf) && (xs < 0)) {
/* Start new string of changes */
@@ -351,7 +351,7 @@ glk_flush(Driver *drvthis)
/* Write accumulated line */
glkputl(p->PortFD, GLKCommand, 0x79, xs * 6 + 1, y * 8, EOF);
glkputa(p->PortFD, p->width - xs, ps);
debug(RPT_DEBUG, "draw_frame: Writing at (%d,%d) for %d", xs, y, p->width - xs);
debug(RPT_DEBUG, "flush: Writing at (%d,%d) for %d", xs, y, p->width - xs);
}
} /* For y */
}
@@ -495,7 +495,7 @@ glk_output(Driver *drvthis, int on)
//////////////////////////////////////////////////////////////////////
// Tells the driver to get ready for vertical bargraphs.
//
MODULE_EXPORT void
static void
glk_init_vbar(Driver *drvthis)
{
//PrivateData *p = drvthis->private_data;
@@ -506,7 +506,7 @@ glk_init_vbar(Driver *drvthis)
//////////////////////////////////////////////////////////////////////
// Tells the driver to get ready for horizontal bargraphs.
//
MODULE_EXPORT void
static void
glk_init_hbar(Driver *drvthis)
{
//PrivateData *p = drvthis->private_data;
@@ -517,7 +517,7 @@ glk_init_hbar(Driver *drvthis)
//////////////////////////////////////////////////////////////////////
// Tells the driver to get ready for big numbers, if possible.
//
MODULE_EXPORT void
static void
glk_init_num(Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
server/drivers/glk.h
-4
View File
@@ -28,8 +28,4 @@ MODULE_EXPORT void glk_output(Driver *drvthis, int on);
MODULE_EXPORT const char *glk_get_key(Driver *drvthis);
MODULE_EXPORT void glk_init_vbar(Driver *drvthis);
MODULE_EXPORT void glk_init_hbar(Driver *drvthis);
MODULE_EXPORT void glk_init_num(Driver *drvthis);
#endif
server/drivers/hd44780.c
+1 -1
View File
@@ -775,7 +775,7 @@ HD44780_hbar (Driver *drvthis, int x, int y, int len, int promille, int options)
/////////////////////////////////////////////////////////////////
// Sets up for big numbers.
//
MODULE_EXPORT void
static void
HD44780_init_num (Driver *drvthis)
{
PrivateData *p = (PrivateData *) drvthis->private_data;
server/drivers/hd44780.h
-4
View File
@@ -39,8 +39,4 @@ MODULE_EXPORT void HD44780_output (Driver *drvthis, int state);
MODULE_EXPORT const char * HD44780_get_key (Driver *drvthis);
static void HD44780_init_vbar (Driver *drvthis);
static void HD44780_init_hbar (Driver *drvthis);
static void HD44780_init_num (Driver *drvthis);
#endif
server/drivers/lb216.c
+2 -2
View File
@@ -383,7 +383,7 @@ LB216_string (Driver * drvthis, int x, int y, char string[])
/////////////////////////////////////////////////////////////////
// Sets up for vertical bars. Call before LB216->vbar()
//
MODULE_EXPORT void
static void
LB216_init_vbar(Driver * drvthis)
{
PrivateData *p = drvthis->private_data;
@@ -473,7 +473,7 @@ LB216_init_vbar(Driver * drvthis)
/////////////////////////////////////////////////////////////////
// Inits horizontal bars...
//
MODULE_EXPORT void
static void
LB216_init_hbar(Driver * drvthis)
{
PrivateData *p = drvthis->private_data;
server/drivers/lb216.h
-4
View File
@@ -23,8 +23,4 @@ MODULE_EXPORT void LB216_set_char(Driver * drvthis, int n, char *dat);
MODULE_EXPORT void LB216_backlight(Driver * drvthis, int on);
MODULE_EXPORT void LB216_init_vbar(Driver * drvthis);
MODULE_EXPORT void LB216_init_hbar(Driver * drvthis);
MODULE_EXPORT void LB216_init_num(Driver * drvthis);
#endif
server/drivers/lcdm001.c
-2
View File
@@ -307,8 +307,6 @@ lcdm001_flush (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
// Next 4 lines are moved from draw_frame (Joris)
//TODO: Check whether this is still correct
write(p->fd, p->framebuf, p->width * p->height);
server/drivers/lcterm.c
+1 -1
View File
@@ -529,7 +529,7 @@ lcterm_hbar(Driver *drvthis, int x, int y, int len, int promille, int options)
/////////////////////////////////////////////////////////////////
// Sets up for big numbers.
//
MODULE_EXPORT void
static void
lcterm_init_num (Driver *drvthis)
{
PrivateData *p = (PrivateData *) drvthis->private_data;
server/drivers/ms6931.c
+1 -1
View File
@@ -117,7 +117,7 @@ ms6931_attn(int fd, int len)
//
// Input is a character array, sized width*height
//
void
static void
ms6931_draw_frame (Driver *drvthis, unsigned char *dat)
{
PrivateData *p = drvthis->private_data;
server/drivers/serialVFD.c
+10 -10
View File
@@ -235,11 +235,11 @@ MODULE_EXPORT int supports_multiple = 0;
MODULE_EXPORT char *symbol_prefix = "serialVFD_";
/* Internal functions */
void serialVFD_init_vbar (Driver *drvthis);
void serialVFD_init_hbar (Driver *drvthis);
void serialVFD_draw_frame (Driver *drvthis, char *dat);
void serialVFD_put_brightness (Driver *drvthis);
void serialVFD_put_char (Driver *drvthis, int n);
static void serialVFD_init_vbar (Driver *drvthis);
static void serialVFD_init_hbar (Driver *drvthis);
static void serialVFD_draw_frame (Driver *drvthis, char *dat);
static void serialVFD_put_brightness (Driver *drvthis);
static void serialVFD_put_char (Driver *drvthis, int n);
// Opens com port and sets baud correctly...
//
@@ -663,7 +663,7 @@ serialVFD_set_brightness (Driver *drvthis, int state, int brightness)
}
}
void
static void
serialVFD_put_brightness (Driver *drvthis)
{ // set hardware brightness
PrivateData *p = drvthis->private_data;
@@ -737,7 +737,7 @@ serialVFD_set_char (Driver *drvthis, int n, char *dat)
p->custom_char_changed[n] = 1;
}
void
static void
serialVFD_put_char (Driver *drvthis, int n)
{ // put char in display
PrivateData *p = drvthis->private_data;
@@ -755,7 +755,7 @@ serialVFD_put_char (Driver *drvthis, int n)
//
// Input is a character array, sized serialVFD->width*serialVFD->height
//
void
static void
serialVFD_draw_frame (Driver *drvthis, char *dat)
{
PrivateData *p = drvthis->private_data;
@@ -907,7 +907,7 @@ serialVFD_icon (Driver *drvthis, int x, int y, int icon)
/////////////////////////////////////////////////////////////////
// Sets up for vertical bars. Call before serialVFD->vbar()
//
void
static void
serialVFD_init_vbar (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;
@@ -980,7 +980,7 @@ serialVFD_init_vbar (Driver *drvthis)
/////////////////////////////////////////////////////////////////
// Inits horizontal bars...
//
void
static void
serialVFD_init_hbar (Driver *drvthis)
{
PrivateData *p = drvthis->private_data;