FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #60 from 0-wiz-0/git_master

Browse Source 
Fix build on NetBSD.
This commit is contained in:
Diederick C. Niehorster 2017-07-31 22:47:32 +02:00 committed by GitHub
commit c1a3a1e456
2 changed files with 61 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
freeglut/freeglut/src/fg_joystick.c
View File

@ -40,65 +40,6 @@
#define JS_TRUE 1
#define JS_FALSE 0
/* BSD defines from "jsBSD.cxx" around lines 42-270 */
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# ifdef HAVE_USB_JS
# if defined(__NetBSD__)
# ifdef HAVE_USBHID_H
# include <usbhid.h>
# else
# include <usb.h>
# endif
# include <dev/usb/usb.h>
# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# ifdef HAVE_USBHID_H
# include <usbhid.h>
# else
# include <libusbhid.h>
# endif
# include <legacy/dev/usb/usb.h>
# endif
# include <dev/usb/usbhid.h>
/* Compatibility with older usb.h revisions */
# if !defined(USB_MAX_DEVNAMES) && defined(MAXDEVNAMES)
# define USB_MAX_DEVNAMES MAXDEVNAMES
# endif
# endif
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 ];
};
/* 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"
#endif
/*
* Functions associated with the "jsJoystick" class in PLIB
*/

61
freeglut/freeglut/src/x11/fg_joystick_x11.c
View File

@ -42,8 +42,68 @@
#include <fcntl.h>
/* BSD defines from "jsBSD.cxx" around lines 42-270 */
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# ifdef HAVE_USB_JS
# if defined(__NetBSD__)
# ifdef HAVE_USBHID_H
# include <usbhid.h>
# else
# include <usb.h>
# endif
# include <dev/usb/usb.h>
# elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# ifdef HAVE_USBHID_H
# include <usbhid.h>
# else
# include <libusbhid.h>
# endif
# include <legacy/dev/usb/usb.h>
# endif
# include <dev/usb/usbhid.h>
/* Compatibility with older usb.h revisions */
# if !defined(USB_MAX_DEVNAMES) && defined(MAXDEVNAMES)
# define USB_MAX_DEVNAMES MAXDEVNAMES
# endif
# endif
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 ];
};
/* 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"
#endif
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
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};
@ -104,6 +164,7 @@ static int fghJoystickFindUSBdev(char *name, char *out, int outlen)
}
return 0;
}
#endif
static int fghJoystickInitializeHID(struct os_specific_s *os,
int *num_axes, int *num_buttons)