mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 04:00:41 -04:00
77a52f9d83
Fix build of graphics/freeglut after the removal of the joy(4) driver in FreeBSD CURRENT. The same fix is applied for all FreeBSD versions though. Simply remove the include of sys/joystick.h, and instead bring in the definition of struct joystick from that file into the freeglut source. None of the ioctls in sys/joystick.h are ever used in freeglut. Please note that juystick support in freeglut on FreeBSD is not really tested, so no promises are made about it. Reported by: goshanecr on the FreeBSD forum in collaboration with: imp
85 lines
2.8 KiB
C
85 lines
2.8 KiB
C
--- src/x11/fg_internal_x11.h.orig 2014-10-20 15:27:04 UTC
|
|
+++ src/x11/fg_internal_x11.h
|
|
@@ -136,11 +136,50 @@ struct tagSFG_PlatformWindowState
|
|
#include <string.h>
|
|
|
|
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
|
|
+
|
|
+static int hatmap_x[9] = { 0, 0, 1, 1, 1, 0, -1, -1, -1 };
|
|
+static int hatmap_y[9] = { 0, 1, 1, 0, -1, -1, -1, 0, 1 };
|
|
+
|
|
+/* Idents lower than USB_IDENT_OFFSET are for analog joysticks. */
|
|
+# define USB_IDENT_OFFSET 2
|
|
+
|
|
+# define USBDEV "/dev/usb"
|
|
+# define UHIDDEV "/dev/uhid"
|
|
+# define AJSDEV "/dev/joy"
|
|
+
|
|
/* XXX The below hack is done until freeglut's autoconf is updated. */
|
|
# define HAVE_USB_JS 1
|
|
+# if defined(__NetBSD__)
|
|
+/* XXX The below hack is done until freeglut's autoconf is updated. */
|
|
+# define HAVE_USBHID_H 1
|
|
+# ifdef HAVE_USBHID_H
|
|
+# include <usbhid.h>
|
|
+# else
|
|
+# include <usb.h>
|
|
+# endif
|
|
+# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
+# ifdef HAVE_USBHID_H
|
|
+# include <usbhid.h>
|
|
+# else
|
|
+# include <libusbhid.h>
|
|
+# endif
|
|
+# include <dev/usb/usb_ioctl.h>
|
|
+# endif
|
|
+# include <dev/usb/usb.h>
|
|
+# include <dev/usb/usbhid.h>
|
|
|
|
+/* Compatibility with older usb.h revisions */
|
|
+# if !defined(USB_MAX_DEVNAMES) && defined(MAXDEVNAMES)
|
|
+# define USB_MAX_DEVNAMES MAXDEVNAMES
|
|
+# endif
|
|
+
|
|
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
|
|
-# include <sys/joystick.h>
|
|
+struct joystick {
|
|
+ int x;
|
|
+ int y;
|
|
+ int b1;
|
|
+ int b2;
|
|
+};
|
|
# else
|
|
/*
|
|
* XXX NetBSD/amd64 systems may find that they have to steal the
|
|
@@ -189,6 +228,30 @@ struct tagSFG_PlatformWindowState
|
|
*/
|
|
# define _JS_MAX_AXES 16
|
|
typedef struct tagSFG_PlatformJoystick SFG_PlatformJoystick;
|
|
+
|
|
+# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
|
|
+struct os_specific_s {
|
|
+ char fname [128 ];
|
|
+ int fd;
|
|
+ int is_analog;
|
|
+ /* The following structure members are specific to analog joysticks */
|
|
+ struct joystick ajs;
|
|
+# ifdef HAVE_USB_JS
|
|
+ /* The following structure members are specific to USB joysticks */
|
|
+ struct hid_item *hids;
|
|
+ int hid_dlen;
|
|
+ int hid_offset;
|
|
+ char *hid_data_buf;
|
|
+ int axes_usage [ _JS_MAX_AXES ];
|
|
+# endif
|
|
+ /* We keep button and axes state ourselves, as they might not be updated
|
|
+ * on every read of a USB device
|
|
+ */
|
|
+ int cache_buttons;
|
|
+ float cache_axes [ _JS_MAX_AXES ];
|
|
+};
|
|
+# endif
|
|
+
|
|
struct tagSFG_PlatformJoystick
|
|
{
|
|
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
|