From 779ede67613c3f9d42f8f19a23cfa87934ed9a12 Mon Sep 17 00:00:00 2001 From: mmdolze Date: Thu, 14 May 2009 05:56:22 +0000 Subject: [PATCH] Correct style and indention --- server/drivers/EyeboxOne.c | 41 ++++++------ server/drivers/IOWarrior.c | 56 ++++++++--------- server/drivers/lis.c | 126 ++++++++++++++++++------------------- 3 files changed, 112 insertions(+), 111 deletions(-) diff --git a/server/drivers/EyeboxOne.c b/server/drivers/EyeboxOne.c index e130b9b..5fdd9b0 100644 --- a/server/drivers/EyeboxOne.c +++ b/server/drivers/EyeboxOne.c @@ -105,7 +105,8 @@ static void EyeboxOne_use_bar(int fd, int bar, int level); static void EyeboxOne_use_led(int fd, int led, int color); /* Parse one key from the configfile */ -static char EyeboxOne_parse_keypad_setting (Driver *drvthis, char * keyname, char default_value) +static char +EyeboxOne_parse_keypad_setting (Driver *drvthis, char * keyname, char default_value) { char return_val = 0; const char *s; @@ -126,7 +127,7 @@ static char EyeboxOne_parse_keypad_setting (Driver *drvthis, char * keyname, cha * * Called to initialize driver settings */ - MODULE_EXPORT int +MODULE_EXPORT int EyeboxOne_init (Driver *drvthis) { struct termios portset; @@ -307,7 +308,7 @@ EyeboxOne_init (Driver *drvthis) report(RPT_DEBUG, "%s: init() done", drvthis->name); - return 1; + return 0; } #define ValidX(x) if ((x) > p->width) { (x) = p->width; } else (x) = (x) < 1 ? 1 : (x); @@ -317,7 +318,9 @@ EyeboxOne_init (Driver *drvthis) /******************** * Use bars */ -static void EyeboxOne_use_bar(int fd, int bar, int level){ +static void +EyeboxOne_use_bar(int fd, int bar, int level) +{ char buffer[16]; if(bar > 2 || bar < 1) @@ -334,7 +337,9 @@ static void EyeboxOne_use_bar(int fd, int bar, int level){ /******************** * Use leds */ -static void EyeboxOne_use_led(int fd, int led, int color){ +static void +EyeboxOne_use_led(int fd, int led, int color) +{ char buffer[16]; int a,b; @@ -371,7 +376,7 @@ static void EyeboxOne_use_led(int fd, int led, int color){ /****************************** * Clear the screen (the frame buffer) */ - MODULE_EXPORT void +MODULE_EXPORT void EyeboxOne_clear (Driver *drvthis) { PrivateData * p = drvthis->private_data; @@ -386,7 +391,7 @@ EyeboxOne_clear (Driver *drvthis) /****************************** * Clean-up */ - MODULE_EXPORT void +MODULE_EXPORT void EyeboxOne_close (Driver *drvthis) { PrivateData * p = drvthis->private_data; @@ -416,7 +421,7 @@ EyeboxOne_close (Driver *drvthis) /****************************** * Returns the display width */ - MODULE_EXPORT int +MODULE_EXPORT int EyeboxOne_width (Driver *drvthis) { PrivateData * p = drvthis->private_data; @@ -427,7 +432,7 @@ EyeboxOne_width (Driver *drvthis) /****************************** * Returns the display height */ - MODULE_EXPORT int +MODULE_EXPORT int EyeboxOne_height (Driver *drvthis) { PrivateData * p = drvthis->private_data; @@ -438,7 +443,7 @@ EyeboxOne_height (Driver *drvthis) /****************************** * Display a string at x,y */ - MODULE_EXPORT void +MODULE_EXPORT void EyeboxOne_string (Driver *drvthis, int x, int y, const char string[]) { int offset, siz; @@ -477,7 +482,7 @@ EyeboxOne_string (Driver *drvthis, int x, int y, const char string[]) /****************************** * Send what we have to the hardware */ - MODULE_EXPORT void +MODULE_EXPORT void EyeboxOne_flush (Driver *drvthis) { char out[12]; @@ -526,7 +531,7 @@ EyeboxOne_flush (Driver *drvthis) * 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). */ - MODULE_EXPORT void +MODULE_EXPORT void EyeboxOne_chr (Driver *drvthis, int x, int y, char c) { int offset; @@ -546,11 +551,7 @@ EyeboxOne_chr (Driver *drvthis, int x, int y, char c) /****************************** * Sets the backlight on or off */ - -#define BACKLIGHT_OFF 0 -#define BACKLIGHT_ON 1 - - MODULE_EXPORT void +MODULE_EXPORT void EyeboxOne_backlight (Driver *drvthis, int on) { PrivateData * p = drvthis->private_data; @@ -587,7 +588,7 @@ EyeboxOne_backlight (Driver *drvthis, int on) /********************** * Toggle cursor on/off */ - static void +static void EyeboxOne_showcursor (Driver *drvthis, int on) { PrivateData * p = drvthis->private_data; @@ -605,7 +606,7 @@ EyeboxOne_showcursor (Driver *drvthis, int on) * returns a string for the function characters from the keypad... * (A-Z) on success, 0 on failure... */ - MODULE_EXPORT const char * +MODULE_EXPORT const char * EyeboxOne_get_key (Driver *drvthis) { PrivateData * p = drvthis->private_data; @@ -658,7 +659,7 @@ EyeboxOne_get_key (Driver *drvthis) * Returns string with general information about the display * I think lcd is able to tell us more, but I can't find how... */ - MODULE_EXPORT const char * +MODULE_EXPORT const char * EyeboxOne_get_info (Driver *drvthis) { PrivateData * p = drvthis->private_data; diff --git a/server/drivers/IOWarrior.c b/server/drivers/IOWarrior.c index d11b181..4c5f5cd 100644 --- a/server/drivers/IOWarrior.c +++ b/server/drivers/IOWarrior.c @@ -239,16 +239,16 @@ static int iowled_on_off(PrivateData *p, unsigned int pattern) MODULE_EXPORT int IOWarrior_init(Driver *drvthis) { -char serial[LCD_MAX_WIDTH+1] = DEFAULT_SERIALNO; -char size[LCD_MAX_WIDTH+1] = DEFAULT_SIZE; + char serial[LCD_MAX_WIDTH+1] = DEFAULT_SERIALNO; + char size[LCD_MAX_WIDTH+1] = DEFAULT_SIZE; -struct usb_bus *busses; -struct usb_bus *bus; + struct usb_bus *busses; + struct usb_bus *bus; -int w; -int h; + int w; + int h; -PrivateData *p; + PrivateData *p; /* Allocate and store private data */ p = (PrivateData *) calloc(1, sizeof(PrivateData)); @@ -461,7 +461,7 @@ PrivateData *p; MODULE_EXPORT void IOWarrior_close(Driver *drvthis) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; if (p != NULL) { /* don't turn display off: keep the logoff message */ @@ -500,7 +500,7 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT int IOWarrior_width(Driver *drvthis) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; debug(RPT_DEBUG, "%s: returning width", drvthis->name); @@ -516,7 +516,7 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT int IOWarrior_height(Driver *drvthis) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; debug(RPT_DEBUG, "%s: returning height", drvthis->name); @@ -532,7 +532,7 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT int IOWarrior_cellwidth(Driver *drvthis) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; debug(RPT_DEBUG, "%s: returning cellwidth", drvthis->name); @@ -548,7 +548,7 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT int IOWarrior_cellheight(Driver *drvthis) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; debug(RPT_DEBUG, "%s: returning cellheight", drvthis->name); @@ -563,11 +563,11 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT void IOWarrior_flush(Driver *drvthis) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; -int x, y; -int i; -int count; + int x, y; + int i; + int count; /* Update LCD incrementally by comparing with last contents */ for (y = 0; y < p->height; y++) { @@ -611,7 +611,7 @@ int count; MODULE_EXPORT void IOWarrior_clear(Driver *drvthis) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; memset(p->framebuf, ' ', p->width * p->height); @@ -632,7 +632,7 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT void IOWarrior_chr(Driver *drvthis, int x, int y, char c) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; y--; x--; @@ -656,8 +656,8 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT void IOWarrior_string(Driver *drvthis, int x, int y, const char string[]) { -PrivateData *p = drvthis->private_data; -int i; + PrivateData *p = drvthis->private_data; + int i; x--; y--; @@ -691,7 +691,7 @@ int i; MODULE_EXPORT void IOWarrior_backlight(Driver *drvthis, int on) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; p->backlight = on; } @@ -709,7 +709,7 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT void IOWarrior_vbar(Driver *drvthis, int x, int y, int len, int promille, int options) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; if (p->ccmode != vbar) { unsigned char vBar[p->cellheight]; @@ -748,7 +748,7 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT void IOWarrior_hbar(Driver *drvthis, int x, int y, int len, int promille, int options) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; if (p->ccmode != hbar) { unsigned char hBar[p->cellheight]; @@ -783,8 +783,8 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT void IOWarrior_num(Driver *drvthis, int x, int num) { -PrivateData *p = drvthis->private_data; -int do_init = 0; + PrivateData *p = drvthis->private_data; + int do_init = 0; if ((num < 0) || (num > 10)) return; @@ -866,9 +866,9 @@ IOWarrior_get_free_chars (Driver *drvthis) MODULE_EXPORT void IOWarrior_set_char(Driver *drvthis, int n, unsigned char *dat) { -PrivateData *p = drvthis->private_data; -unsigned char mask = (1 << p->cellwidth) - 1; -int row; + PrivateData *p = drvthis->private_data; + unsigned char mask = (1 << p->cellwidth) - 1; + int row; if ((n < 0) || (n >= NUM_CCs)) return; diff --git a/server/drivers/lis.c b/server/drivers/lis.c index b14eb9a..706b4dd 100644 --- a/server/drivers/lis.c +++ b/server/drivers/lis.c @@ -1406,29 +1406,29 @@ lis_test(Driver *drvthis) MODULE_EXPORT void lis_set_char(Driver *drvthis, int n, unsigned char *dat) { -PrivateData *p = drvthis->private_data; -unsigned char mask = (1 << p->cellwidth) - 1; -int row; + PrivateData *p = drvthis->private_data; + unsigned char mask = (1 << p->cellwidth) - 1; + int row; - if ((n < 0) || (n >= NUM_CCs)) - return; - if (dat == NULL) - return; + if ((n < 0) || (n >= NUM_CCs)) + return; + if (dat == NULL) + return; - for (row = 0; row < p->cellheight; row++) { - int letter = 0; + for (row = 0; row < p->cellheight; row++) { + int letter = 0; - if (p->lastline || (row < p->cellheight - 1)) - letter = dat[row] & mask; + if (p->lastline || (row < p->cellheight - 1)) + letter = dat[row] & mask; - if (p->cc[n].cache[row] != letter) { - p->cc[n].clean = 0; /* only mark dirty if really different */ - } - p->cc[n].cache[row] = letter; - } - report(RPT_DEBUG, "%s: cached custom character #%d", - drvthis->name, n); + if (p->cc[n].cache[row] != letter) { + p->cc[n].clean = 0; /* only mark dirty if really different */ + } + p->cc[n].cache[row] = letter; + } + report(RPT_DEBUG, "%s: cached custom character #%d", + drvthis->name, n); } @@ -1444,33 +1444,33 @@ int row; MODULE_EXPORT void lis_vbar(Driver *drvthis, int x, int y, int len, int promille, int options) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; - if (p->ccmode != vbar) { - unsigned char vBar[p->cellheight]; - int i; + if (p->ccmode != vbar) { + unsigned char vBar[p->cellheight]; + int i; - if (p->ccmode != standard) { - /* Not supported(yet) */ - report(RPT_WARNING, "%s: vbar: cannot combine two modes using user-defined characters", - drvthis->name); - return; - } - p->ccmode = vbar; + if (p->ccmode != standard) { + /* Not supported(yet) */ + report(RPT_WARNING, "%s: vbar: cannot combine two modes using user-defined characters", + drvthis->name); + return; + } + p->ccmode = vbar; - memset(vBar, 0x00, sizeof(vBar)); + memset(vBar, 0x00, sizeof(vBar)); - for (i = 2; i <= p->cellheight; i++) { - // add pixel line per pixel line ... - vBar[p->cellheight - i + 1] = 0x1F; - lis_set_char(drvthis, i, vBar); - } - } + for (i = 2; i <= p->cellheight; i++) { + // add pixel line per pixel line ... + vBar[p->cellheight - i + 1] = 0x1F; + lis_set_char(drvthis, i, vBar); + } + } - report(RPT_DEBUG, "%s: vbar @ %d,%d len %d, %d/1000", - drvthis->name, x, y, len, promille); + report(RPT_DEBUG, "%s: vbar @ %d,%d len %d, %d/1000", + drvthis->name, x, y, len, promille); - lib_vbar_static(drvthis, x, y, len, promille, options, p->cellheight, 2); + lib_vbar_static(drvthis, x, y, len, promille, options, p->cellheight, 2); } @@ -1486,31 +1486,31 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT void lis_hbar(Driver *drvthis, int x, int y, int len, int promille, int options) { -PrivateData *p = drvthis->private_data; + PrivateData *p = drvthis->private_data; - if (p->ccmode != hbar) { - unsigned char hBar[p->cellheight]; - int i; + if (p->ccmode != hbar) { + unsigned char hBar[p->cellheight]; + int i; - if (p->ccmode != standard) { - /* Not supported(yet) */ - report(RPT_WARNING, "%s: hbar: cannot combine two modes using user-defined characters", - drvthis->name); - return; - } + if (p->ccmode != standard) { + /* Not supported(yet) */ + report(RPT_WARNING, "%s: hbar: cannot combine two modes using user-defined characters", + drvthis->name); + return; + } - p->ccmode = hbar; + p->ccmode = hbar; - for (i = 1; i <= p->cellwidth; i++) { - // fill pixel columns from left to right. - memset(hBar, 0xFF & ~((1 << (p->cellwidth - i)) - 1), sizeof(hBar)); - lis_set_char(drvthis, i + 2, hBar); - } - } - report(RPT_DEBUG, "%s: hbar @ %d,%d len %d, %d/1000", - drvthis->name, x, y, len, promille); + for (i = 1; i <= p->cellwidth; i++) { + // fill pixel columns from left to right. + memset(hBar, 0xFF & ~((1 << (p->cellwidth - i)) - 1), sizeof(hBar)); + lis_set_char(drvthis, i + 2, hBar); + } + } + report(RPT_DEBUG, "%s: hbar @ %d,%d len %d, %d/1000", + drvthis->name, x, y, len, promille); - lib_hbar_static(drvthis, x, y, len, promille, options, p->cellwidth, 2); + lib_hbar_static(drvthis, x, y, len, promille, options, p->cellwidth, 2); } @@ -1523,8 +1523,8 @@ PrivateData *p = drvthis->private_data; MODULE_EXPORT void lis_num(Driver *drvthis, int x, int num) { -PrivateData *p = drvthis->private_data; -int do_init = 0; + PrivateData *p = drvthis->private_data; + int do_init = 0; if ((num < 0) || (num > 10)) return; @@ -1558,8 +1558,8 @@ int do_init = 0; MODULE_EXPORT int lis_get_free_chars (Driver *drvthis) { -//PrivateData *p = drvthis->private_data; + //PrivateData *p = drvthis->private_data; - return NUM_CCs - 3; // first three are reserved + return NUM_CCs - 3; // first three are reserved }