Date: Mon, 01 Sep 2003 15:37:52 +0900
authorSam Lantinga
Fri, 05 Sep 2003 15:20:47 +0000
changeset 715de0351c47596
parent 714 dfc1c102e825
child 716 f25e3334d583
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
     1.1 --- a/src/joystick/bsd/SDL_sysjoystick.c	Fri Sep 05 15:19:14 2003 +0000
     1.2 +++ b/src/joystick/bsd/SDL_sysjoystick.c	Fri Sep 05 15:20:47 2003 +0000
     1.3 @@ -234,7 +234,7 @@
     1.4  	struct report *rep;
     1.5  	int fd;
     1.6  
     1.7 -	fd = open(path, O_RDWR);
     1.8 +	fd = open(path, O_RDONLY);
     1.9  	if (fd == -1) {
    1.10  		SDL_SetError("%s: %s", path, strerror(errno));
    1.11  		return (-1);
    1.12 @@ -448,14 +448,12 @@
    1.13  	int len;
    1.14  
    1.15  #ifdef __FreeBSD__
    1.16 -# if (__FreeBSD_version >= 470000)
    1.17 +# if (__FreeBSD_version >= 460000)
    1.18  #  if (__FreeBSD_version <= 500111)
    1.19  	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
    1.20  #  else
    1.21  	len = hid_report_size(rd, repinfo[repind].kind, r->rid);
    1.22  #  endif
    1.23 -# elif (__FreeBSD_version == 460002)
    1.24 -	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
    1.25  # else
    1.26  	len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
    1.27  #endif