Attachment 98124 Details for Bug 136973 – file.diff

[patch] file.diff

file.diff (text/plain), 1.18 KB, created by Wes Morgan on 2009-07-22 02:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wes Morgan

Created: 2009-07-22 02:50:00 UTC

Size: 1.18 KB

patch

obsolete

>--- SDL_sysjoystick.c.orig	2007-12-30 22:47:55.000000000 -0600
>+++ SDL_sysjoystick.c	2009-07-21 20:38:05.362267174 -0500
>@@ -74,6 +74,13 @@
> #define MAX_JOY_JOYS	2
> #define MAX_JOYS	(MAX_UHID_JOYS + MAX_JOY_JOYS)
> 
>+#if defined(__FREEBSD__) && (__FreeBSD_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 */
>@@ -137,7 +144,7 @@
> 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_version > 800063))
> #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
> #else
> #define REP_BUF_DATA(rep) ((rep)->buf->data)
>@@ -292,9 +299,13 @@
> 		    strerror(errno));
> 		goto usberr;
> 	}
>-
> 	rep = &hw->inreport;
>+#if defined(__FREEBSD__) && (__FreeBSD_version > 800063)
>+       rep->rid = hid_get_report_id(fd);
>+       if (rep->rid < 0) {
>+#else
> 	if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) {
>+#endif
> 		rep->rid = -1; /* XXX */
> 	}
> 	if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) {

Actions: View | Diff

Attachments on bug 136973: 98124