Mercurial > sdl-ios-xcode

comparison src/joystick/bsd/SDL_sysjoystick.c @ 715:de0351c47596

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Sam Lantinga <slouken@libsdl.org>
date Fri, 05 Sep 2003 15:20:47 +0000
parents 85e104fe14c2
children b8d311d90021
comparison
equal deleted inserted replaced
714:dfc1c102e825 715:de0351c47596
232 struct hid_item hitem; 232 struct hid_item hitem;
233 struct hid_data *hdata; 233 struct hid_data *hdata;
234 struct report *rep; 234 struct report *rep;
235 int fd; 235 int fd;
236 236
237 fd = open(path, O_RDWR); 237 fd = open(path, O_RDONLY);
238 if (fd == -1) { 238 if (fd == -1) {
239 SDL_SetError("%s: %s", path, strerror(errno)); 239 SDL_SetError("%s: %s", path, strerror(errno));
240 return (-1); 240 return (-1);
241 } 241 }
242 242
446 report_alloc(struct report *r, struct report_desc *rd, int repind) 446 report_alloc(struct report *r, struct report_desc *rd, int repind)
447 { 447 {
448 int len; 448 int len;
449 449
450 #ifdef __FreeBSD__ 450 #ifdef __FreeBSD__
451 # if (__FreeBSD_version >= 470000) 451 # if (__FreeBSD_version >= 460000)
452 # if (__FreeBSD_version <= 500111) 452 # if (__FreeBSD_version <= 500111)
453 len = hid_report_size(rd, r->rid, repinfo[repind].kind); 453 len = hid_report_size(rd, r->rid, repinfo[repind].kind);
454 # else 454 # else
455 len = hid_report_size(rd, repinfo[repind].kind, r->rid); 455 len = hid_report_size(rd, repinfo[repind].kind, r->rid);
456 # endif 456 # endif
457 # elif (__FreeBSD_version == 460002)
458 len = hid_report_size(rd, r->rid, repinfo[repind].kind);
459 # else 457 # else
460 len = hid_report_size(rd, repinfo[repind].kind, &r->rid); 458 len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
461 #endif 459 #endif
462 #else 460 #else
463 # ifdef USBHID_NEW 461 # ifdef USBHID_NEW