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

harmonize coding style and messages; add a few checks

Browse Source
This commit is contained in:
marschap
2006-04-08 21:19:14 +00:00
parent 3c52181126
commit 2dcde3e4f2
2 changed files with 248 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/lb216.c
+54 -64
View File
@@ -50,7 +50,7 @@ typedef enum {
beat = 8 } custom_type; beat = 8 } custom_type;
static int fd; static int fd = -1;
static char *framebuf = NULL; static char *framebuf = NULL;
static int width = LCD_DEFAULT_WIDTH; static int width = LCD_DEFAULT_WIDTH;
static int height = LCD_DEFAULT_HEIGHT; static int height = LCD_DEFAULT_HEIGHT;
@@ -88,6 +88,7 @@ LB216_init(Driver * drvthis)
strncpy(device, drvthis->config_get_string(drvthis->name, "Device", 0, strncpy(device, drvthis->config_get_string(drvthis->name, "Device", 0,
LB216_DEFAULT_DEVICE), sizeof(device)); LB216_DEFAULT_DEVICE), sizeof(device));
device[sizeof(device)-1] = '\0'; device[sizeof(device)-1] = '\0';
report(RPT_INFO, "%s: using Device %s", drvthis->name, device);
/* What speed to use */ /* What speed to use */
speed = drvthis->config_get_int(drvthis->name, "Speed", 0, LB216_DEFAULT_SPEED); speed = drvthis->config_get_int(drvthis->name, "Speed", 0, LB216_DEFAULT_SPEED);
@@ -95,32 +96,31 @@ LB216_init(Driver * drvthis)
if (speed == 2400) speed = B2400; if (speed == 2400) speed = B2400;
else if (speed == 9600) speed = B9600; else if (speed == 9600) speed = B9600;
else { else {
report(RPT_WARNING, "lb216_init: Illegal speed: %d. Must be 2400 or 9600. Using default.\n", speed); report(RPT_WARNING, "%s: illegal Speed: %d; must be 2400 or 9600; using default %d",
drvthis->name, speed, LB216_DEFAULT_SPEED);
speed = B9600; speed = B9600;
} }
/* Which backlight brightness */ /* Which backlight brightness */
backlight_brightness = drvthis->config_get_int(drvthis->name, "Brightness", 0, LB216_DEFAULT_BRIGHTNESS); backlight_brightness = drvthis->config_get_int(drvthis->name, "Brightness", 0, LB216_DEFAULT_BRIGHTNESS);
if ((backlight_brightness < 0) || (backlight_brightness > 255)) { if ((backlight_brightness < 0) || (backlight_brightness > 255)) {
report (RPT_WARNING, "lb216_init: Brightness must be between 0 and 255. Using default value.\n"); report(RPT_WARNING, "%s: Brightness must be between 0 and 255; using default %d",
drvthis->name, backlight_brightness);
backlight_brightness = LB216_DEFAULT_BRIGHTNESS; backlight_brightness = LB216_DEFAULT_BRIGHTNESS;
} }
/* Reboot display? */ /* Reboot display? */
reboot = drvthis->config_get_bool(drvthis->name , "Reboot", 0, 0); reboot = drvthis->config_get_bool(drvthis->name , "Reboot", 0, 0);
if (reboot)
report (RPT_INFO, "LCDd: rebooting LB216 LCD...\n");
/* End of config file parsing */ /* End of config file parsing */
// Set up io port correctly, and open it... // Set up io port correctly, and open it...
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY); fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY);
if (fd == -1) if (fd == -1) {
{ report(RPT_ERR, "%s: open(%s) failed (%s)", drvthis->name, device, strerror(errno));
report(RPT_ERR, "lb216_init: open(%s) failed (%s)\n", device, strerror(errno));
return -1; return -1;
} }
report(RPT_DEBUG, "lb216_init: opened device %s\n", device); report(RPT_DEBUG, "%s: opened device %s", drvthis->name, device);
tcgetattr(fd, &portset); tcgetattr(fd, &portset);
@@ -148,14 +148,14 @@ LB216_init(Driver * drvthis)
// Make sure the frame buffer is there... // Make sure the frame buffer is there...
framebuf = malloc(width * height); framebuf = malloc(width * height);
if (framebuf == NULL) { if (framebuf == NULL) {
report(RPT_ERR, "lb216_init: unable to create framebuffer.\n"); report(RPT_ERR, "%s: unable to create framebuffer", drvthis->name);
return -1; return -1;
} }
memset (framebuf, ' ', width * height); memset (framebuf, ' ', width * height);
// Set display-specific stuff.. // Set display-specific stuff..
if (reboot) if (reboot) {
{ report(RPT_INFO, "%s: rebooting LCD...", drvthis->name);
LB216_reboot(); LB216_reboot();
sleep(4); sleep(4);
reboot = 0; reboot = 0;
@@ -164,7 +164,9 @@ LB216_init(Driver * drvthis)
LB216_hidecursor(); LB216_hidecursor();
LB216_backlight(drvthis, backlight_brightness); LB216_backlight(drvthis, backlight_brightness);
return 0; report(RPT_DEBUG, "%s: init() done", drvthis->name);
return 1;
} }
@@ -175,6 +177,7 @@ LB216_init(Driver * drvthis)
MODULE_EXPORT void MODULE_EXPORT void
LB216_close(Driver * drvthis) LB216_close(Driver * drvthis)
{ {
if (fd >= 0)
close(fd); close(fd);
if (framebuf) if (framebuf)
@@ -223,15 +226,14 @@ LB216_flush(Driver * drvthis)
write(fd, out, 2); write(fd, out, 2);
for (j = 0; j < height; j++) { for (j = 0; j < height; j++) {
if (j>=2) { if (j >= 2)
snprintf(out, sizeof(out), "%c%c", 254, 148 + (64 * (j - 2))); snprintf(out, sizeof(out), "%c%c", 254, 148 + (64 * (j - 2)));
} else { else
snprintf (out, sizeof(out),"%c%c",254,128+(64*(j))); snprintf(out, sizeof(out), "%c%c", 254, 128 + (64 * j));
}
write(fd, out, 2); write(fd, out, 2);
for(i=0; i<width; i++) {
write(fd, framebuf + i+(j*width), 1); for (i = 0; i < width; i++)
} write(fd, &framebuf[i + (j * width)], 1);
} }
} }
@@ -269,14 +271,8 @@ MODULE_EXPORT void
LB216_backlight(Driver * drvthis, int on) LB216_backlight(Driver * drvthis, int on)
{ {
char out[4]; char out[4];
if(on)
{ snprintf(out, sizeof(out), "%c%c", 254, (on) ? 253 : 252);
snprintf (out, sizeof(out), "%c%c", 254, 253);
}
else
{
snprintf (out, sizeof(out), "%c%c", 254, 252);
}
write(fd, out, 2); write(fd, out, 2);
} }
@@ -287,6 +283,7 @@ LB216_backlight(Driver * drvthis, int on)
static void LB216_hidecursor() static void LB216_hidecursor()
{ {
char out[4]; char out[4];
snprintf(out, sizeof(out), "%c%c", 254, 12); snprintf(out, sizeof(out), "%c%c", 254, 12);
write(fd, out, 2); write(fd, out, 2);
} }
@@ -297,6 +294,7 @@ static void LB216_hidecursor()
static void LB216_reboot() static void LB216_reboot()
{ {
char out[4]; char out[4];
snprintf(out, sizeof(out), "%c%c", 254, 1); snprintf(out, sizeof(out), "%c%c", 254, 1);
write(fd, out, 2); write(fd, out, 2);
} }
@@ -306,20 +304,16 @@ MODULE_EXPORT void
LB216_string (Driver * drvthis, int x, int y, char string[]) LB216_string (Driver * drvthis, int x, int y, char string[])
{ {
int i; int i;
char c;
//printf("%d,%d:%s\n",x,y,string); //printf("%d,%d:%s\n",x,y,string);
y--;x--; y--;x--;
for(i=0; string[i]; i++) for (i = 0; string[i] != '\0'; i++) {
{ char c = string[i];
c = string[i];
switch(c) if (c == '\254') /* is this correct ? */
{ c= '#';
case '\254': c = '#'; break;
}
framebuf[(y * width) + x + i] = c; framebuf[(y * width) + x + i] = c;
} }
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -486,17 +480,16 @@ MODULE_EXPORT void
LB216_vbar(Driver * drvthis, int x, int len) LB216_vbar(Driver * drvthis, int x, int len)
{ {
char map[9] = { 32, 1, 2, 3, 4, 5, 6, 7, 255 }; char map[9] = { 32, 1, 2, 3, 4, 5, 6, 7, 255 };
int y; int y;
for(y=height; y > 0 && len>0; y--)
{ for (y = height; y > 0 && len > 0; y--) {
if(len >= cellheight) LB216_chr(drvthis, x, y, 255); if (len >= cellheight)
else LB216_chr(drvthis, x, y, map[len]); LB216_chr(drvthis, x, y, map[8]);
else
LB216_chr(drvthis, x, y, map[len]);
len -= cellheight; len -= cellheight;
} }
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -507,17 +500,14 @@ LB216_hbar(Driver * drvthis, int x, int y, int len)
{ {
char map[7] = { 32, 1, 2, 3, 4, 5 }; char map[7] = { 32, 1, 2, 3, 4, 5 };
for(; x<=width && len>0; x++) for ( ; x <= width && len > 0; x++) {
{ if (len >= cellwidth)
if(len >= cellwidth) LB216_chr(drvthis, x,y,map[5]); LB216_chr(drvthis, x, y, map[5]);
else LB216_chr(drvthis, x, y, map[len]); else
LB216_chr(drvthis, x, y, map[len]);
//printf ("%d,",len);
len -= cellwidth; len -= cellwidth;
} }
// printf ("\n");
} }
@@ -533,20 +523,19 @@ LB216_set_char(Driver * drvthis, int n, char *dat)
{ {
char out[4]; char out[4];
int row, col; int row, col;
int letter;
if(n < 0 || n > 7) return; if ((n < 0) || (n > 7))
n=64+(8*n); return;
if(!dat) return; if (!dat)
return;
snprintf (out, sizeof(out), "%c%c", 254, n); snprintf(out, sizeof(out), "%c%c", 254, 64 + (8 * n));
write(fd, out, 2); write(fd, out, 2);
for(row=0; row<cellheight; row++) for (row = 0; row < cellheight; row++) {
{ int letter = 1;
letter = 1;
for(col=0; col<cellwidth; col++) for (col = 0; col < cellwidth; col++) {
{
letter <<= 1; letter <<= 1;
letter |= (dat[(row * cellwidth) + col] > 0); letter |= (dat[(row * cellwidth) + col] > 0);
} }
@@ -555,6 +544,7 @@ LB216_set_char(Driver * drvthis, int n, char *dat)
} }
} }
MODULE_EXPORT int MODULE_EXPORT int
LB216_icon(Driver * drvthis, int x, int y, int icon) LB216_icon(Driver * drvthis, int x, int y, int icon)
{ {
@@ -578,8 +568,7 @@ LB216_icon(Driver * drvthis, int x, int y, int icon)
1, 1, 0, 1, 1, 1, 1, 0, 1, 1,
1, 1, 1, 1, 1 }; 1, 1, 1, 1, 1 };
switch( icon ) switch (icon) {
{
case ICON_BLOCK_FILLED: case ICON_BLOCK_FILLED:
LB216_chr(drvthis, x, y, 255); LB216_chr(drvthis, x, y, 255);
break; break;
@@ -596,3 +585,4 @@ LB216_icon(Driver * drvthis, int x, int y, int icon)
} }
return 0; return 0;
} }
server/drivers/lcdm001.c
+37 -43
View File
@@ -64,7 +64,7 @@
//#include "configfile.h" //#include "configfile.h"
int fd; int fd = -1;
static int clear = 1; static int clear = 1;
static char icon_char = '@'; static char icon_char = '@';
static char pause_key = DOWN_KEY, back_key = LEFT_KEY, forward_key = RIGHT_KEY, main_menu_key = UP_KEY; static char pause_key = DOWN_KEY, back_key = LEFT_KEY, forward_key = RIGHT_KEY, main_menu_key = UP_KEY;
@@ -98,7 +98,8 @@ static char lcdm001_parse_keypad_setting (Driver *drvthis, char * keyname, char
} else if (strcmp(drvthis->config_get_string(drvthis->name, keyname, 0, default_value), "DownKey") == 0) { } else if (strcmp(drvthis->config_get_string(drvthis->name, keyname, 0, default_value), "DownKey") == 0) {
return_val = DOWN_KEY; return_val = DOWN_KEY;
} else { } else {
report (RPT_WARNING, "LCDM001: Invalid config file setting for %s. Using default value %s.\n", keyname, default_value); report(RPT_WARNING, "%s: invalid config setting for %s; using default %s",
drvthis->name, keyname, default_value);
if (strcmp(default_value, "LeftKey") == 0) { if (strcmp(default_value, "LeftKey") == 0) {
return_val = LEFT_KEY; return_val = LEFT_KEY;
} else if (strcmp(default_value, "RightKey") == 0) { } else if (strcmp(default_value, "RightKey") == 0) {
@@ -118,10 +119,10 @@ lcdm001_cursorblink (Driver *drvthis, int on)
{ {
if (on) { if (on) {
write(fd, "~K1", 3); write(fd, "~K1", 3);
debug(RPT_INFO, "LCDM001: cursorblink turned on"); debug(RPT_INFO, "%s: cursorblink turned on", drvthis->name);
} else { } else {
write(fd, "~K0", 3); write(fd, "~K0", 3);
debug(RPT_INFO, "LCDM001: cursorblink turned off"); debug(RPT_INFO, "%s: cursorblink turned off", drvthis->name);
} }
} }
@@ -144,9 +145,8 @@ lcdm001_init (Driver *drvthis)
debug(RPT_INFO, "LCDM001: init(%p)", drvthis); debug(RPT_INFO, "LCDM001: init(%p)", drvthis);
framebuf = malloc(width * height); framebuf = malloc(width * height);
if (framebuf == NULL) {
if (!framebuf) { report(RPT_ERR, "%s: unable to create framebuffer", drvthis->name);
report(RPT_ERR, "\nError: unable to create LCDM001 framebuffer.\n");
return -1; return -1;
} }
memset(framebuf, ' ', width * height); memset(framebuf, ' ', width * height);
@@ -155,8 +155,8 @@ lcdm001_init (Driver *drvthis)
// which serial device should be used // which serial device should be used
strncpy(device, drvthis->config_get_string(drvthis->name, "Device", 0, "/dev/lcd"), sizeof(device)); strncpy(device, drvthis->config_get_string(drvthis->name, "Device", 0, "/dev/lcd"), sizeof(device));
device[sizeof(device)-1]=0; device[sizeof(device)-1] = '\0';
report (RPT_INFO,"LCDM001: Using device: %s", device); report(RPT_INFO, "%s: using Device %s", drvthis->name, device);
// keypad settings // keypad settings
pause_key = lcdm001_parse_keypad_setting(drvthis, "PauseKey", "DownKey"); pause_key = lcdm001_parse_keypad_setting(drvthis, "PauseKey", "DownKey");
@@ -165,23 +165,18 @@ lcdm001_init (Driver *drvthis)
main_menu_key = lcdm001_parse_keypad_setting(drvthis, "MainMenuKey", "UpKey"); main_menu_key = lcdm001_parse_keypad_setting(drvthis, "MainMenuKey", "UpKey");
// Set up io port correctly, and open it... // Set up io port correctly, and open it...
debug( RPT_DEBUG, "LCDM001: Opening serial device: %s", device); debug(RPT_DEBUG, "%s: Opening serial device: %s", __FUNCTION__, device);
fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY); fd = open(device, O_RDWR | O_NOCTTY | O_NDELAY);
if (fd == -1) if (fd == -1) {
{ report(RPT_ERR, "%s: open(%d) failed (%s)",
switch (errno) { drvthis->name, device, strerror(errno));
case ENOENT: report( RPT_ERR, "LCDM001: lcdm001_init() failed: Device file missing: %s\n", device); if (errno == EACCES)
break; report(RPT_ERR, "%s: make sure you have rw access to %s!",
case EACCES: report( RPT_ERR, "LCDM001: lcdm001_init() failed: Could not open device: %s\n", device); drvthis->name, device);
report( RPT_ERR, "LCDM001: lcdm001_init() failed: Make sure you have rw access to %s!\n", device);
break;
default: report( RPT_ERR, "LCDM001: lcdm001_init() failed (%s)\n", strerror (errno));
break;
}
return -1; return -1;
} else {
report (RPT_INFO, "opened LCDM001 display on %s", device);
} }
report(RPT_INFO, "%s: opened display on %s", drvthis->name, device);
tcgetattr(fd, &portset); tcgetattr(fd, &portset);
#ifdef HAVE_CFMAKERAW #ifdef HAVE_CFMAKERAW
/* The easy way: */ /* The easy way: */
@@ -208,7 +203,9 @@ lcdm001_init (Driver *drvthis)
snprintf(out, sizeof(out), "\%cL%c%c", 126, 0, 0); snprintf(out, sizeof(out), "\%cL%c%c", 126, 0, 0);
write(fd, out, 4); write(fd, out, 4);
return 0; report(RPT_DEBUG, "%s: init() done", drvthis->name);
return 1;
} }
/* Below here, you may use either lcd.framebuf or driver->framebuf.. /* Below here, you may use either lcd.framebuf or driver->framebuf..
@@ -219,16 +216,21 @@ lcdm001_init (Driver *drvthis)
MODULE_EXPORT void MODULE_EXPORT void
lcdm001_close (Driver *drvthis) lcdm001_close (Driver *drvthis)
{ {
char out[5]; if (framebuf != NULL)
if(framebuf) free (framebuf); free(framebuf);
framebuf = NULL; framebuf = NULL;
if (fd >= 0) {
char out[5];
//switch off all LEDs //switch off all LEDs
snprintf(out, sizeof(out), "\%cL%c%c", 126, 0, 0); snprintf(out, sizeof(out), "\%cL%c%c", 126, 0, 0);
write(fd, out, 4); write(fd, out, 4);
close(fd); close(fd);
}
fd = -1;
report (RPT_INFO, "LCDM001: closed"); report(RPT_INFO, "%s: closed", drvthis->name);
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -293,9 +295,8 @@ lcdm001_chr (Driver *drvthis, int x, int y, char c)
ValidX(x); ValidX(x);
ValidY(y); ValidY(y);
if (c==0) { if (c == '\0')
c = icon_char; //heartbeat workaround c = icon_char; //heartbeat workaround
}
// write to frame buffer // write to frame buffer
y--; x--; // translate to 0-coords y--; x--; // translate to 0-coords
@@ -321,7 +322,7 @@ lcdm001_string (Driver *drvthis, int x, int y, char *string)
x--; y--; // Convert 1-based coords to 0-based... x--; y--; // Convert 1-based coords to 0-based...
offset = (y * width) + x; offset = (y * width) + x;
siz = (width * height) - offset - 1; siz = (width * height) - offset - 1;
siz = siz > strlen(string) ? strlen(string) : siz; siz = (siz > strlen(string)) ? strlen(string) : siz;
memcpy(framebuf + offset, string, siz); memcpy(framebuf + offset, string, siz);
@@ -336,20 +337,18 @@ lcdm001_output (Driver *drvthis, int state)
char out[5]; char out[5];
int one = 0, two = 0; int one = 0, two = 0;
if (state<=255) if (state <= 255) {
{
one = state; one = state;
two = 0; two = 0;
} }
else else {
{
one = state & 0xff; one = state & 0xff;
two = (state >> 8) & 0xff; two = (state >> 8) & 0xff;
} }
snprintf(out, sizeof(out), "~L%c%c", one, two); snprintf(out, sizeof(out), "~L%c%c", one, two);
write(fd, out, 4); write(fd, out, 4);
debug (RPT_DEBUG, "LCDM001: current LED state: %d", state); debug(RPT_DEBUG, "LCDM001: current LED state %d", state);
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -362,8 +361,7 @@ lcdm001_old_vbar(Driver *drvthis, int x, int len)
debug(RPT_DEBUG , "LCDM001: vertical bar at %d set to %d", x, len); debug(RPT_DEBUG , "LCDM001: vertical bar at %d set to %d", x, len);
while (len >= LCD_DEFAULT_CELLHEIGHT) while (len >= LCD_DEFAULT_CELLHEIGHT) {
{
lcdm001_chr(drvthis, x, y, 0xFF); lcdm001_chr(drvthis, x, y, 0xFF);
len -= LCD_DEFAULT_CELLHEIGHT; len -= LCD_DEFAULT_CELLHEIGHT;
y--; y--;
@@ -373,7 +371,6 @@ lcdm001_old_vbar(Driver *drvthis, int x, int len)
return; return;
//TODO: Distinguish between len>=4 and len<4 //TODO: Distinguish between len>=4 and len<4
} }
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -382,7 +379,6 @@ lcdm001_old_vbar(Driver *drvthis, int x, int len)
MODULE_EXPORT void MODULE_EXPORT void
lcdm001_old_hbar(Driver *drvthis, int x, int y, int len) lcdm001_old_hbar(Driver *drvthis, int x, int y, int len)
{ {
ValidX(x); ValidX(x);
ValidY(y); ValidY(y);
@@ -390,10 +386,8 @@ lcdm001_old_hbar(Driver *drvthis, int x, int y, int len)
//TODO: Improve this function //TODO: Improve this function
while((x <= width) && (len > 0)) while ((x <= width) && (len > 0)) {
{ if (len < LCD_DEFAULT_CELLWIDTH) {
if(len < LCD_DEFAULT_CELLWIDTH)
{
//lcdm001_chr(x, y, 0x98 + len); //lcdm001_chr(x, y, 0x98 + len);
break; break;
} }