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

Added support for USB. This changes how the driver opens the connection.

Browse Source
This commit is contained in:
wayn3
2003-05-29 02:04:38 +00:00
parent c6f9540b01
commit a6b9141538
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/CFontz633.c
+31 -9
View File
@@ -114,6 +114,7 @@ CFontz633_init (Driver * drvthis, char *args)
struct termios portset; struct termios portset;
int tmp, w, h; int tmp, w, h;
int reboot = 0; int reboot = 0;
int usb = 0;
int contrast = DEFAULT_CONTRAST; int contrast = DEFAULT_CONTRAST;
char device[200] = DEFAULT_DEVICE; char device[200] = DEFAULT_DEVICE;
@@ -189,9 +190,18 @@ CFontz633_init (Driver * drvthis, char *args)
reboot = 1; reboot = 1;
} }
/*Am I USB or not?*/
if(drvthis->config_get_bool( drvthis->name , "USB" , 0 , 0)) {
usb = 1;
}
/* Set up io port correctly, and open it... */ /* Set up io port correctly, and open it... */
debug( RPT_DEBUG, "CFontz633: Opening serial device: %s", device); debug( RPT_DEBUG, "CFontz633: Opening serial device: %s", device);
fd = open (device, O_RDWR | O_NOCTTY | O_NDELAY); if ( usb ) {
fd = open (device, O_RDWR | O_NOCTTY);
} else {
fd = open (device, O_RDWR | O_NOCTTY | O_NDELAY);
}
if (fd == -1) { if (fd == -1) {
report (RPT_ERR, "CFontz633_init: failed (%s)\n", strerror (errno)); report (RPT_ERR, "CFontz633_init: failed (%s)\n", strerror (errno));
return -1; return -1;
@@ -200,18 +210,30 @@ CFontz633_init (Driver * drvthis, char *args)
tcgetattr (fd, &portset); tcgetattr (fd, &portset);
/* We use RAW mode */ /* We use RAW mode */
if ( usb ) {
// The USB way
portset.c_iflag &= ~( IGNBRK | BRKINT | PARMRK | ISTRIP
| INLCR | IGNCR | ICRNL | IXON );
portset.c_oflag &= ~OPOST;
portset.c_lflag &= ~( ECHO | ECHONL | ICANON | ISIG | IEXTEN );
portset.c_cflag &= ~( CSIZE | PARENB | CRTSCTS );
portset.c_cflag |= CS8 | CREAD | CLOCAL ;
portset.c_cc[VMIN] = 0;
portset.c_cc[VTIME] = 1;
} else {
#ifdef HAVE_CFMAKERAW #ifdef HAVE_CFMAKERAW
/* The easy way */ /* The easy way */
cfmakeraw( &portset ); cfmakeraw( &portset );
#else #else
/* The hard way */ /* The hard way */
portset.c_iflag &= ~( IGNBRK | BRKINT | PARMRK | ISTRIP portset.c_iflag &= ~( IGNBRK | BRKINT | PARMRK | ISTRIP
| INLCR | IGNCR | ICRNL | IXON ); | INLCR | IGNCR | ICRNL | IXON );
portset.c_oflag &= ~OPOST; portset.c_oflag &= ~OPOST;
portset.c_lflag &= ~( ECHO | ECHONL | ICANON | ISIG | IEXTEN ); portset.c_lflag &= ~( ECHO | ECHONL | ICANON | ISIG | IEXTEN );
portset.c_cflag &= ~( CSIZE | PARENB | CRTSCTS ); portset.c_cflag &= ~( CSIZE | PARENB | CRTSCTS );
portset.c_cflag |= CS8 | CREAD | CLOCAL ; portset.c_cflag |= CS8 | CREAD | CLOCAL ;
#endif #endif
}
/* Set port speed */ /* Set port speed */
cfsetospeed (&portset, speed); cfsetospeed (&portset, speed);