This updates these drivers with minor bug fixes.

This commit is contained in:
ddouthitt
2001-10-05 23:50:37 +00:00
parent ae18a158fc
commit df90652a8b
6 changed files with 20 additions and 20 deletions
+6 -6
View File
@@ -186,12 +186,12 @@ MtxOrb_init (lcd_logical_driver * driver, char *args)
int argc; int argc;
struct termios portset; struct termios portset;
int i; int i;
int tmp; //int tmp;
int contrast = DEFAULT_CONTRAST; int contrast = DEFAULT_CONTRAST;
char device[256] = DEFAULT_DEVICE; char device[256] = DEFAULT_DEVICE;
int speed = DEFAULT_SPEED; int speed = DEFAULT_SPEED;
char c; //char c;
MtxOrb_type = MTXORB_LKD; // Assume it's an LCD w/keypad MtxOrb_type = MTXORB_LKD; // Assume it's an LCD w/keypad
@@ -389,8 +389,8 @@ MtxOrb_init (lcd_logical_driver * driver, char *args)
return fd; return fd;
} }
#define ValidX(a) { if (x > MtxOrb->wid) { x = MtxOrb->wid; } else x < 1 ? 1 : x; } #define ValidX(x) if ((x) > MtxOrb->wid) { (x) = MtxOrb->wid; } else (x) = (x) < 1 ? 1 : (x);
#define ValidY(a) { if (y > MtxOrb->hgt) { y = MtxOrb->hgt; } else y < 1 ? 1 : y; } #define ValidY(y) if ((y) > MtxOrb->hgt) { (y) = MtxOrb->hgt; } else (y) = (y) < 1 ? 1 : (y);
// TODO: Check this quick hack to detect clear of the screen. // TODO: Check this quick hack to detect clear of the screen.
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
@@ -480,7 +480,7 @@ MtxOrb_flush_box (int lft, int top, int rgt, int bot)
static void static void
MtxOrb_chr (int x, int y, char c) MtxOrb_chr (int x, int y, char c)
{ {
char out[10], buf[64]; char buf[64]; // char out[10];
int offset; int offset;
// Characters may or may NOT be alphabetic; it appears // Characters may or may NOT be alphabetic; it appears
@@ -717,7 +717,7 @@ MtxOrb_getinfo (void)
char in = 0; char in = 0;
static char info[255]; static char info[255];
char tmp[255], buf[64]; char tmp[255], buf[64];
int i = 0; //int i = 0;
fd_set rfds; fd_set rfds;
struct timeval tv; struct timeval tv;
+2 -2
View File
@@ -327,8 +327,8 @@ curses_drv_clear ()
werase (lcd_win); werase (lcd_win);
} }
#define ValidX(x) { if ((x) > curses_drv->wid) { (x) = curses_drv->wid; } else (x) < 1 ? 1 : x; } #define ValidX(x) { if ((x) > curses_drv->wid) { (x) = curses_drv->wid; } else (x) = (x) < 1 ? 1 : x; }
#define ValidY(y) { if ((y) > curses_drv->hgt) { (y) = curses_drv->hgt; } else (y) < 1 ? 1 : y; } #define ValidY(y) { if ((y) > curses_drv->hgt) { (y) = curses_drv->hgt; } else (y) = (y) < 1 ? 1 : y; }
void void
curses_drv_backlight (int on) curses_drv_backlight (int on)
+4 -4
View File
@@ -46,8 +46,8 @@ static void lcdm001_string (int x, int y, char *string);
static void lcdm001_usage (void); static void lcdm001_usage (void);
#define ValidX(a) { if (x > lcdm001->wid) { x = lcdm001->wid; } else x < 1 ? 1 : x; } #define ValidX(x) if ((x) > lcdm001->wid) { (x) = lcdm001->wid; } else (x) = (x) < 1 ? 1 : (x);
#define ValidY(a) { if (y > lcdm001->hgt) { y = lcdm001->hgt; } else y < 1 ? 1 : y; } #define ValidY(y) if ((y) > lcdm001->hgt) { (y) = lcdm001->hgt; } else (y) = (y) < 1 ? 1 : (y);
// Set cursorblink on/off // Set cursorblink on/off
// //
@@ -88,7 +88,7 @@ lcdm001_init (struct lcd_logical_driver *driver, char *args)
int argc; int argc;
int i; int i;
struct termios portset; struct termios portset;
char c; //char c;
char out[5]=""; char out[5]="";
//fprintf(stderr,"lcdm001_init()\n"); //fprintf(stderr,"lcdm001_init()\n");
@@ -351,7 +351,7 @@ lcdm001_flush_box (int lft, int top, int rgt, int bot)
static void static void
lcdm001_chr (int x, int y, char c) lcdm001_chr (int x, int y, char c)
{ {
char out[10], buf[64]; char buf[64]; // char out[10];
int offset; int offset;
ValidX(x); ValidX(x);
+1 -1
View File
@@ -184,7 +184,7 @@ sed1520_init (struct lcd_logical_driver *driver, char *args)
else if (0 == strcmp (argv[i], "-h") else if (0 == strcmp (argv[i], "-h")
|| 0 == strcmp (argv[i], "--help")) || 0 == strcmp (argv[i], "--help"))
{ {
int i; //int i;
printf printf
("LCDproc sed1520 driver\n\t-p n\t--port n\tSelect the output device to use port n\n"); ("LCDproc sed1520 driver\n\t-p n\t--port n\tSelect the output device to use port n\n");
printf ("put the options in quotes like this: '-p 0x278'\n"); printf ("put the options in quotes like this: '-p 0x278'\n");
+1 -1
View File
@@ -320,7 +320,7 @@ stv5730_init (struct lcd_logical_driver *driver, char *args)
else if (0 == strcmp (argv[i], "-h") else if (0 == strcmp (argv[i], "-h")
|| 0 == strcmp (argv[i], "--help")) || 0 == strcmp (argv[i], "--help"))
{ {
int i; //int i;
printf printf
("LCDproc stv5730 driver\n\t-p n\t--port n\tSelect the output device to use port n\n"); ("LCDproc stv5730 driver\n\t-p n\t--port n\tSelect the output device to use port n\n");
printf ("put the options in quotes like this: '-p 0x278'\n"); printf ("put the options in quotes like this: '-p 0x278'\n");
+6 -6
View File
@@ -247,11 +247,11 @@ svgalib_drv_init (struct lcd_logical_driver *driver, char *args)
{ {
char *argv[64]; char *argv[64];
int argc; int argc;
int i, j; //int i, j;
int VGAMODE; int VGAMODE;
int fgtemp; //int fgtemp;
char param[100]; //char param[100];
char buffer[1024]; //char buffer[1024];
/* not used at the moment */ /* not used at the moment */
argc = get_args (argv, args, 64); argc = get_args (argv, args, 64);
@@ -474,8 +474,8 @@ char
svgalib_drv_getkey () svgalib_drv_getkey ()
{ {
int i; int i;
int loop; //int loop;
FILE *fd; //FILE *fd;
i = vga_getkey (); i = vga_getkey ();
if (i) { if (i) {
switch (i) { switch (i) {