From 688bb31037ba478bdc34ab006cdd1646fdb6968b Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 5 Sep 2003 15:20:47 +0000 Subject: [PATCH] Date: Mon, 01 Sep 2003 15:37:52 +0900 From: SUGIMOTO Sadahiro Subject: [SDL] [PATCH] bsd joystick Hi, on FreeBSD systems, I had troubles using a USB joystick with SDL. There are two problems in src/joystick/bsd/SDL_sysjoystick.c . 1. The macro __FreeBSD_version is compared to inappropriate numbers. According to http://www.jp.freebsd.org/cgi/cvsweb.cgi/src/lib/libusbhid/usbhid.h http://www.jp.freebsd.org/cgi/cvsweb.cgi/src/lib/libusbhid/Attic/libusb.h http://www.jp.freebsd.org/cgi/cvsweb.cgi/src/lib/libusbhid/Attic/libusbhid.h the APIs of USB HID are common in each following groups of OS versions, a. 4.1-4.5 b. 4.6-4.8, and 5.0 c. 5.1 2. open() error $ uname -sr FreeBSD 5.1-RELEASE $ ls -l /dev/uhid0 crw-r--r-- 1 root operator 122, 0 8 3 14:06 /dev/uhid0 Then, open("/dev/uhid0", O_RDWR) fails. It seems that this device file does not need to be writable, so O_RDONLY may be suitable. --- src/joystick/bsd/SDL_sysjoystick.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/joystick/bsd/SDL_sysjoystick.c b/src/joystick/bsd/SDL_sysjoystick.c index 1d4808a17..cc16204c3 100644 --- a/src/joystick/bsd/SDL_sysjoystick.c +++ b/src/joystick/bsd/SDL_sysjoystick.c @@ -234,7 +234,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy) struct report *rep; int fd; - fd = open(path, O_RDWR); + fd = open(path, O_RDONLY); if (fd == -1) { SDL_SetError("%s: %s", path, strerror(errno)); return (-1); @@ -448,14 +448,12 @@ report_alloc(struct report *r, struct report_desc *rd, int repind) int len; #ifdef __FreeBSD__ -# if (__FreeBSD_version >= 470000) +# if (__FreeBSD_version >= 460000) # if (__FreeBSD_version <= 500111) len = hid_report_size(rd, r->rid, repinfo[repind].kind); # else len = hid_report_size(rd, repinfo[repind].kind, r->rid); # endif -# elif (__FreeBSD_version == 460002) - len = hid_report_size(rd, r->rid, repinfo[repind].kind); # else len = hid_report_size(rd, repinfo[repind].kind, &r->rid); #endif