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

harmonize coding style and messages; add more checks

Browse Source
This commit is contained in:
marschap
2006-04-07 18:46:46 +00:00
parent b9a3b9dc1f
commit fe53c43754
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/drivers/joy.c
+31 -20
View File
@@ -18,6 +18,7 @@
#include <termios.h> #include <termios.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h> #include <string.h>
#include <errno.h>
#include <sys/errno.h> #include <sys/errno.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/types.h> #include <sys/types.h>
@@ -42,7 +43,7 @@
#define JOY_DEFAULT_AXISMAP "EFGHIJKLMNOPQRST" #define JOY_DEFAULT_AXISMAP "EFGHIJKLMNOPQRST"
#define JOY_DEFAULT_BUTTONMAP "BDACEFGHIJKLMNOP" #define JOY_DEFAULT_BUTTONMAP "BDACEFGHIJKLMNOP"
int fd; int fd = -1;
struct js_event js; struct js_event js;
@@ -79,6 +80,7 @@ joy_init (Driver *drvthis)
strncpy(device, drvthis->config_get_string(drvthis->name, "Device", 0, strncpy(device, drvthis->config_get_string(drvthis->name, "Device", 0,
JOY_DEFAULT_DEVICE), sizeof(device)); JOY_DEFAULT_DEVICE), sizeof(device));
device[sizeof(device)-1] = '\0'; device[sizeof(device)-1] = '\0';
report(RPT_INFO, "%s: using Device %s", drvthis->name, device);
/* How does the axis map look like */ /* How does the axis map look like */
strncpy(axismap, drvthis->config_get_string(drvthis->name, "AxisMap", 0, strncpy(axismap, drvthis->config_get_string(drvthis->name, "AxisMap", 0,
@@ -92,42 +94,50 @@ joy_init (Driver *drvthis)
/* End of config file parsing */ /* End of config file parsing */
if ((fd = open (device, O_RDONLY)) < 0) if ((fd = open(device, O_RDONLY)) < 0) {
report(RPT_ERR, "%s: open(%s) failed (%s)",
drvthis->name, device, strerror(errno));
return -1; return -1;
}
fcntl (fd, F_SETFL, O_NONBLOCK); fcntl(fd, F_SETFL, O_NONBLOCK);
ioctl (fd, JSIOCGVERSION, &jsversion); ioctl(fd, JSIOCGVERSION, &jsversion);
ioctl (fd, JSIOCGAXES, &axes); ioctl(fd, JSIOCGAXES, &axes);
ioctl (fd, JSIOCGBUTTONS, &buttons); ioctl(fd, JSIOCGBUTTONS, &buttons);
ioctl (fd, JSIOCGNAME (JOY_NAMELENGTH), jsname); ioctl(fd, JSIOCGNAME(JOY_NAMELENGTH), jsname);
report (RPT_NOTICE, "Joystick (%s) has %d axes and %d buttons. Driver version is %d.%d.%d.\n", report(RPT_NOTICE, "%s: Joystick (%s) has %d axes and %d buttons. Driver version is %d.%d.%d",
jsname, axes, buttons, drvthis->name, jsname, axes, buttons,
jsversion >> 16, (jsversion >> 8) & 0xff, jsversion & 0xff); jsversion >> 16, (jsversion >> 8) & 0xff, jsversion & 0xff);
if ((axis = calloc (axes, sizeof (int))) == NULL) { if ((axis = calloc(axes, sizeof (int))) == NULL) {
report (RPT_ERR, "joystick: could not allocate memory for axes"); report(RPT_ERR, "%s: could not allocate memory for axes", drvthis->name);
return -1; return -1;
} }
if ((button = calloc (buttons, sizeof (char))) == NULL) { if ((button = calloc(buttons, sizeof (char))) == NULL) {
report (RPT_ERR, "joystick: could not allocate memory for buttons"); report(RPT_ERR, "%s: could not allocate memory for buttons", drvthis->name);
return -1; return -1;
} }
report(RPT_DEBUG, "%s: init() done", drvthis->name);
return 0; return 0;
} }
MODULE_EXPORT void MODULE_EXPORT void
joy_close (Driver *drvthis) joy_close (Driver *drvthis)
{ {
close (fd); if (fd >= 0)
close(fd);
// Why do I have so much trouble getting memory freed without segfaults?? // Why do I have so much trouble getting memory freed without segfaults??
// Use gdb and find out :) In preliminary testing, this seemed to work... // Use gdb and find out :) In preliminary testing, this seemed to work...
if(axis) free(axis); if (axis != NULL)
if(button) free(button); free(axis);
if (button != NULL)
free(button);
} }
@@ -142,15 +152,15 @@ joy_getkey (Driver *drvthis)
int i; int i;
int err; int err;
if ((err = read (fd, &js, sizeof (struct js_event))) <= 0) { if ((err = read(fd, &js, sizeof(struct js_event))) <= 0) {
return 0; return 0;
} else } else
if (err != sizeof (struct js_event)) { if (err != sizeof(struct js_event)) {
report(RPT_ERR, "error reading joystick input"); report(RPT_ERR, "%s: error reading joystick input", drvthis->name);
return 0; return 0;
} }
// if(js.type & JS_EVENT_INIT) return 0; // if (js.type & JS_EVENT_INIT) return 0;
switch (js.type & ~JS_EVENT_INIT) { switch (js.type & ~JS_EVENT_INIT) {
case JS_EVENT_BUTTON: case JS_EVENT_BUTTON:
@@ -183,3 +193,4 @@ joy_getkey (Driver *drvthis)
return 0; return 0;
} }