We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Joystick patch for FreeBSD

src_joystick_bsd_SDL_sysjoystick.c.diff (text/plain), 1.45 KB, created by Marcus von Appen on 2012-07-21 03:09:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus von Appen

Created: 2012-07-21 03:09:20 UTC

Size: 1.45 KB

patch

obsolete

>diff -r 4488c8602961 src/joystick/bsd/SDL_sysjoystick.c
>--- a/src/joystick/bsd/SDL_sysjoystick.c	Wed Jul 18 14:14:55 2012 -0700
>+++ b/src/joystick/bsd/SDL_sysjoystick.c	Sat Jul 21 12:09:13 2012 +0200
>@@ -82,7 +82,9 @@
> #define MAX_JOYS	(MAX_UHID_JOYS + MAX_JOY_JOYS)
> 
> struct report {
>-#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
>+#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000)
>+	void *buf;			/* Buffer */
>+#elif defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
> 	struct	usb_gen_descriptor *buf;	/* Buffer */
> #else
> 	struct	usb_ctl_report *buf;	/* Buffer */
>@@ -148,8 +150,10 @@
> static int	report_alloc(struct report *, struct report_desc *, int);
> static void	report_free(struct report *);
> 
>-#if defined(USBHID_UCR_DATA)
>+#if defined(USBHID_UCR_DATA) || (defined(__FreeBSD_kernel__) && __FreeBSD_kernel_version <= 800063)
> #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
>+#elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000))
>+#define REP_BUF_DATA(rep) ((rep)->buf)
> #elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
> #define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
> #else
>@@ -582,8 +586,12 @@
> 	r->size = len;
> 
> 	if (r->size > 0) {
>+#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000)
>+		r->buf = SDL_malloc(r->size);
>+#else
> 		r->buf = SDL_malloc(sizeof(*r->buf) - sizeof(REP_BUF_DATA(r)) +
> 		    r->size);
>+#endif
> 		if (r->buf == NULL) {
> 			SDL_OutOfMemory();
> 			return (-1);

Actions: View | Diff

Attachments on bug 1552: 908

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.