Skip to content
Permalink
Browse files

Joystick patch from FreeBSD ports system

  • Loading branch information
slouken committed Oct 12, 2009
1 parent 39d8eae commit 085cea85f8ce489fb418c688774bbaebc4ce13d3
Showing with 13 additions and 2 deletions.
  1. +13 −2 src/joystick/bsd/SDL_sysjoystick.c
@@ -78,6 +78,13 @@
#define MAX_JOY_JOYS 2
#define MAX_JOYS (MAX_UHID_JOYS + MAX_JOY_JOYS)

#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
struct usb_ctl_report {
int ucr_report;
u_char ucr_data[1024]; /* filled data size will vary */
};
#endif

struct report {
struct usb_ctl_report *buf; /* Buffer */
size_t size; /* Buffer size */
@@ -141,7 +148,7 @@ static char *joydevnames[MAX_JOYS];
static int report_alloc(struct report *, struct report_desc *, int);
static void report_free(struct report *);

#ifdef USBHID_UCR_DATA
#if defined(USBHID_UCR_DATA) || (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
#define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
#else
#define REP_BUF_DATA(rep) ((rep)->buf->data)
@@ -296,9 +303,13 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
strerror(errno));
goto usberr;
}

#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
rep->rid = hid_get_report_id(fd);
if (rep->rid < 0) {
#else
rep = &hw->inreport;
if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) {
#endif
rep->rid = -1; /* XXX */
}
if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) {

0 comments on commit 085cea8

Please sign in to comment.