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

Fix variable initialization and setting of socket options (update by author).

Browse Source
This commit is contained in:
mmdolze
2010-05-11 20:33:39 +00:00
parent 90107086ea
commit c5bb13ddfb
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/hd44780-ethlcd.c
+12 -4
View File
@@ -25,6 +25,7 @@
#include <string.h> #include <string.h>
#include <limits.h> #include <limits.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h>
void ethlcd_HD44780_senddata(PrivateData *p, unsigned char displayID, unsigned char flags, unsigned char ch); void ethlcd_HD44780_senddata(PrivateData *p, unsigned char displayID, unsigned char flags, unsigned char ch);
@@ -44,7 +45,7 @@ void ethlcd_HD44780_uPause(PrivateData *p, int usecs) {}
int hd_init_ethlcd(Driver *drvthis) int hd_init_ethlcd(Driver *drvthis)
{ {
char hostname[256]; char hostname[256];
long flags; unsigned long flags = 0;
PrivateData *p = (PrivateData*) drvthis->private_data; PrivateData *p = (PrivateData*) drvthis->private_data;
HD44780_functions *hd44780_functions = p->hd44780_functions; HD44780_functions *hd44780_functions = p->hd44780_functions;
@@ -61,18 +62,25 @@ int hd_init_ethlcd(Driver *drvthis)
p->sock = sock_connect(hostname, DEFAULT_ETHLCD_PORT); p->sock = sock_connect(hostname, DEFAULT_ETHLCD_PORT);
if (p->sock < 0) { if (p->sock < 0) {
report(RPT_ERR, "Connecting to %s:%d failed", hostname, DEFAULT_ETHLCD_PORT); report(RPT_ERR, "%s[%s]: Connecting to %s:%d failed",
drvthis->name, ETHLCD_DRV_NAME, hostname, DEFAULT_ETHLCD_PORT);
return -1; return -1;
} }
//we need to have a blocking read back again: //we need to have a blocking read back again:
if (fcntl(p->sock, F_GETFL, &flags) < 0) if (fcntl(p->sock, F_GETFL, &flags) < 0)
{ {
report(RPT_ERR, "Cannot set the socket to blocking mode"); report(RPT_ERR, "%s[%s]: Cannot obtain current flags: %s",
drvthis->name, ETHLCD_DRV_NAME, strerror(errno));
return -1; return -1;
} }
flags &= ~O_NONBLOCK; flags &= ~O_NONBLOCK;
fcntl(p->sock, F_SETFL, flags); if (fcntl(p->sock, F_SETFL, flags) < 0)
{
report(RPT_ERR, "%s[%s]: Unable to change socket to O_NONBLOCK: %s",
drvthis->name, ETHLCD_DRV_NAME, strerror(errno));
return -1;
}
// Set up two-line, small character (5x8) mode // Set up two-line, small character (5x8) mode
hd44780_functions->senddata(p, 0, RS_INSTR, FUNCSET | IF_4BIT | TWOLINE | SMALLCHAR); hd44780_functions->senddata(p, 0, RS_INSTR, FUNCSET | IF_4BIT | TWOLINE | SMALLCHAR);
server/drivers/hd44780-ethlcd.h
+1
View File
@@ -6,6 +6,7 @@
// initialise this particular driver // initialise this particular driver
int hd_init_ethlcd(Driver *drvthis); int hd_init_ethlcd(Driver *drvthis);
#define ETHLCD_DRV_NAME "ethlcd"
#define DEFAULT_ETHLCD_PORT 2425 #define DEFAULT_ETHLCD_PORT 2425
// ethlcd protocol constants: // ethlcd protocol constants: