[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

  1. 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.

The attached patch is for src/joystick/bsd/SDL_sysjoystick.c revision 1.17 .

  • SUGIMOTO
    -------------- next part --------------
    — SDL_sysjoystick.c.orig Sun Aug 3 14:35:09 2003
    +++ SDL_sysjoystick.c Sun Aug 3 15:51:52 2003
    @@ -234,7 +234,7 @@
    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 @@
    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

Hi,
on FreeBSD systems, I had troubles using a USB joystick with SDL.
There are two problems in src/joystick/bsd/SDL_sysjoystick.c .

Fixed! Thanks. :slight_smile:

See ya,
-Sam Lantinga, Software Engineer, Blizzard Entertainment