Commit 82db0931 authored by Ryan C. Gordon's avatar Ryan C. Gordon

Patched to compile on newer FreeBSD releases.

Thanks to Marcus von Appen for the patch!
parent 5759a8f1
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
#ifndef __DragonFly__ #ifndef __DragonFly__
#include <osreldate.h> #include <osreldate.h>
#endif #endif
#if __FreeBSD_kernel_version > 800063
#include <dev/usb/usb_ioctl.h>
#endif
#include <sys/joystick.h> #include <sys/joystick.h>
#endif #endif
...@@ -77,16 +80,14 @@ ...@@ -77,16 +80,14 @@
#define MAX_JOY_JOYS 2 #define MAX_JOY_JOYS 2
#define MAX_JOYS (MAX_UHID_JOYS + MAX_JOY_JOYS) #define MAX_JOYS (MAX_UHID_JOYS + MAX_JOY_JOYS)
#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063) && false
struct usb_ctl_report {
int ucr_report;
u_char ucr_data[1024]; /* filled data size will vary */
};
#endif
struct report struct report
{ {
#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
struct usb_gen_descriptor *buf; /* Buffer */
#else
struct usb_ctl_report *buf; /* Buffer */ struct usb_ctl_report *buf; /* Buffer */
#endif
size_t size; /* Buffer size */ size_t size; /* Buffer size */
int rid; /* Report ID */ int rid; /* Report ID */
enum enum
...@@ -148,8 +149,10 @@ static char *joydevnames[MAX_JOYS]; ...@@ -148,8 +149,10 @@ static char *joydevnames[MAX_JOYS];
static int report_alloc(struct report *, struct report_desc *, int); static int report_alloc(struct report *, struct report_desc *, int);
static void report_free(struct report *); static void report_free(struct report *);
#if defined(USBHID_UCR_DATA) || (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)) || defined(__FreeBSD_kernel__) #if defined(USBHID_UCR_DATA) || defined(__FreeBSD_kernel__)
#define REP_BUF_DATA(rep) ((rep)->buf->ucr_data) #define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
#elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
#define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
#else #else
#define REP_BUF_DATA(rep) ((rep)->buf->data) #define REP_BUF_DATA(rep) ((rep)->buf->data)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment