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

Added Paul Hedderly's patch from 0.4.4 to this current version. It allows

Browse Source 
USB serial devices to work.
This commit is contained in:
wayn3
2003-02-12 01:55:01 +00:00
parent 27529bc77f
commit bf93b6c288
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/MtxOrb.c
+15 -2
View File
@@ -39,6 +39,7 @@
#include <errno.h> #include <errno.h>
#include <syslog.h> #include <syslog.h>
#include <ctype.h> #include <ctype.h>
#include <sys/poll.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include "config.h" # include "config.h"
@@ -425,7 +426,7 @@ MtxOrb_init (Driver *drvthis, char *args)
/* 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... */
p->fd = open (device, O_RDWR | O_NOCTTY | O_NDELAY); p->fd = open (device, O_RDWR | O_NOCTTY);
if (p->fd == -1) { if (p->fd == -1) {
switch (errno) { switch (errno) {
case ENOENT: report (RPT_ERR, "MtxOrb_init: %s device file missing!\n", device); case ENOENT: report (RPT_ERR, "MtxOrb_init: %s device file missing!\n", device);
@@ -442,8 +443,9 @@ MtxOrb_init (Driver *drvthis, char *args)
tcgetattr (p->fd, &portset); tcgetattr (p->fd, &portset);
// THIS ALL COMMENTED OUT BECAUSE WE NEED TO SET TIMEOUTS
/* We use RAW mode */ /* We use RAW mode */
#ifdef HAVE_CFMAKERAW #ifdef HAVE_CFMAKERAW_NOT
/* The easy way */ /* The easy way */
cfmakeraw( &portset ); cfmakeraw( &portset );
#else #else
@@ -454,6 +456,8 @@ MtxOrb_init (Driver *drvthis, char *args)
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 ;
portset.c_cc[VMIN] = 1;
portset.c_cc[VTIME] = 3;
#endif #endif
/* Set port speed */ /* Set port speed */
@@ -1242,7 +1246,16 @@ MtxOrb_get_key (Driver *drvthis)
PrivateData * p = drvthis->private_data; PrivateData * p = drvthis->private_data;
// POLL For data or return
struct pollfd fds[1];
fds[0].fd = p->fd;
fds[0].events = POLLIN;
fds[0].revents = 0;
poll (fds,1,0);
if (fds[0].revents == 0) { return NULL; }
(void) read (p->fd, &in, 1); (void) read (p->fd, &in, 1);
report(RPT_INFO, "MtxOrb: getkey: key X %i", in);
if ( 0 == in ) { if ( 0 == in ) {
debug( RPT_INFO, "MtxOrb_get_key: in=>%d\n", in ); debug( RPT_INFO, "MtxOrb_get_key: in=>%d\n", in );