Commit ee180efda7a697c27008d9a5edc4ed482d038f55
2020-12-20T12:08:49
Fixed bug 5406 - Upstreaming DragonFlyBSD changes from DeltaPorts (patch from David Carlier)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248
diff --git a/cmake/sdlchecks.cmake b/cmake/sdlchecks.cmake
index 43e345d..a9434c8 100644
--- a/cmake/sdlchecks.cmake
+++ b/cmake/sdlchecks.cmake
@@ -973,8 +973,8 @@ macro(CheckUSBHID)
#include <usb.h>
#endif
#ifdef __DragonFly__
- # include <bus/usb/usb.h>
- # include <bus/usb/usbhid.h>
+ # include <bus/u4b/usb.h>
+ # include <bus/u4b/usbhid.h>
#else
# include <dev/usb/usb.h>
# include <dev/usb/usbhid.h>
@@ -999,8 +999,8 @@ macro(CheckUSBHID)
#include <usb.h>
#endif
#ifdef __DragonFly__
- # include <bus/usb/usb.h>
- # include <bus/usb/usbhid.h>
+ # include <bus/u4b/usb.h>
+ # include <bus/u4b/usbhid.h>
#else
# include <dev/usb/usb.h>
# include <dev/usb/usbhid.h>
@@ -1027,8 +1027,8 @@ macro(CheckUSBHID)
#include <usb.h>
#endif
#ifdef __DragonFly__
- #include <bus/usb/usb.h>
- #include <bus/usb/usbhid.h>
+ #include <bus/u4b/usb.h>
+ #include <bus/u4b/usbhid.h>
#else
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
diff --git a/configure b/configure
index 0edf785..cdb12bd 100755
--- a/configure
+++ b/configure
@@ -24036,7 +24036,7 @@ $as_echo "#define SDL_LOADSO_DLOPEN 1" >>confdefs.h
CheckUSBHID()
{
case "$host" in
- *-*-*bsd*)
+ *-*-*bsd*|*-*-dragonfly*)
if test x$enable_joystick = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for hid_init in -lusbhid" >&5
$as_echo_n "checking for hid_init in -lusbhid... " >&6; }
@@ -24161,8 +24161,8 @@ $as_echo_n "checking for usbhid... " >&6; }
#include <usb.h>
#endif
#ifdef __DragonFly__
- # include <bus/usb/usb.h>
- # include <bus/usb/usbhid.h>
+ # include <bus/u4b/usb.h>
+ # include <bus/u4b/usbhid.h>
#else
# include <dev/usb/usb.h>
# include <dev/usb/usbhid.h>
@@ -24208,8 +24208,8 @@ $as_echo_n "checking for ucr_data member of usb_ctl_report... " >&6; }
#include <usb.h>
#endif
#ifdef __DragonFly__
- # include <bus/usb/usb.h>
- # include <bus/usb/usbhid.h>
+ # include <bus/u4b/usb.h>
+ # include <bus/u4b/usbhid.h>
#else
# include <dev/usb/usb.h>
# include <dev/usb/usbhid.h>
@@ -24256,8 +24256,8 @@ $as_echo_n "checking for new usbhid API... " >&6; }
#include <usb.h>
#endif
#ifdef __DragonFly__
- #include <bus/usb/usb.h>
- #include <bus/usb/usbhid.h>
+ #include <bus/u4b/usb.h>
+ #include <bus/u4b/usbhid.h>
#else
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
diff --git a/configure.ac b/configure.ac
index 80863e5..b7e519b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3198,7 +3198,7 @@ dnl Check for the usbhid(3) library on *BSD
CheckUSBHID()
{
case "$host" in
- *-*-*bsd*)
+ *-*-*bsd*|*-*-dragonfly*)
if test x$enable_joystick = xyes; then
AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
if test x$have_libusbhid = xyes; then
@@ -3222,8 +3222,8 @@ CheckUSBHID()
#include <usb.h>
#endif
#ifdef __DragonFly__
- # include <bus/usb/usb.h>
- # include <bus/usb/usbhid.h>
+ # include <bus/u4b/usb.h>
+ # include <bus/u4b/usbhid.h>
#else
# include <dev/usb/usb.h>
# include <dev/usb/usbhid.h>
@@ -3253,8 +3253,8 @@ CheckUSBHID()
#include <usb.h>
#endif
#ifdef __DragonFly__
- # include <bus/usb/usb.h>
- # include <bus/usb/usbhid.h>
+ # include <bus/u4b/usb.h>
+ # include <bus/u4b/usbhid.h>
#else
# include <dev/usb/usb.h>
# include <dev/usb/usbhid.h>
@@ -3285,8 +3285,8 @@ CheckUSBHID()
#include <usb.h>
#endif
#ifdef __DragonFly__
- #include <bus/usb/usb.h>
- #include <bus/usb/usbhid.h>
+ #include <bus/u4b/usb.h>
+ #include <bus/u4b/usbhid.h>
#else
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c
index a1cc86d..b529a6d 100644
--- a/src/cpuinfo/SDL_cpuinfo.c
+++ b/src/cpuinfo/SDL_cpuinfo.c
@@ -894,7 +894,7 @@ SDL_GetSystemRAM(void)
#endif
#ifdef HAVE_SYSCTLBYNAME
if (SDL_SystemRAM <= 0) {
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__DragonFly__)
#ifdef HW_REALMEM
int mib[2] = {CTL_HW, HW_REALMEM};
#else
diff --git a/src/joystick/bsd/SDL_bsdjoystick.c b/src/joystick/bsd/SDL_bsdjoystick.c
index 1595acf..60d7799 100644
--- a/src/joystick/bsd/SDL_bsdjoystick.c
+++ b/src/joystick/bsd/SDL_bsdjoystick.c
@@ -43,8 +43,8 @@
#include <usb.h>
#endif
#ifdef __DragonFly__
-#include <bus/usb/usb.h>
-#include <bus/usb/usbhid.h>
+#include <bus/u4b/usb.h>
+#include <bus/u4b/usbhid.h>
#else
#include <dev/usb/usb.h>
#include <dev/usb/usbhid.h>
@@ -59,13 +59,14 @@
#endif
#if defined(__FREEBSD__) || defined(__FreeBSD_kernel__)
-#ifndef __DragonFly__
#include <osreldate.h>
-#endif
#if __FreeBSD_kernel_version > 800063
#include <dev/usb/usb_ioctl.h>
#endif
#include <sys/joystick.h>
+#elif defined(__DragonFly__)
+#include <bus/u4b/usb_ioctl.h>
+#include <sys/joystick.h>
#endif
#if SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
@@ -126,7 +127,8 @@ dpad_to_sdl(Sint32 *dpad)
struct report
{
-#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000)
+#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000) || \
+ defined(__DragonFly__)
void *buf; /* Buffer */
#elif defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
struct usb_gen_descriptor *buf; /* Buffer */
@@ -196,7 +198,8 @@ static void report_free(struct report *);
#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))
+#elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000)) || \
+ defined(__DragonFly__)
#define REP_BUF_DATA(rep) ((rep)->buf)
#elif (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
#define REP_BUF_DATA(rep) ((rep)->buf->ugd_data)
@@ -393,7 +396,7 @@ BSD_JoystickOpen(SDL_Joystick *joy, int device_index)
goto usberr;
}
rep = &hw->inreport;
-#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063) || defined(__FreeBSD_kernel__)
+#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
rep->rid = hid_get_report_id(fd);
if (rep->rid < 0) {
#else
@@ -439,7 +442,7 @@ desc_failed:
hw->path);
goto usberr;
}
-#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111) || defined(__FreeBSD_kernel__)
+#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
hdata = hid_start_parse(hw->repdesc, 1 << hid_input, rep->rid);
#else
hdata = hid_start_parse(hw->repdesc, 1 << hid_input);
@@ -543,7 +546,7 @@ BSD_JoystickUpdate(SDL_Joystick *joy)
Sint32 dpad[4] = {0, 0, 0, 0};
#endif
-#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H || defined(__FreeBSD_kernel__)
+#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H || defined(__FreeBSD_kernel__) || defined(__DragonFly_)
struct joystick gameport;
static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
@@ -593,7 +596,7 @@ BSD_JoystickUpdate(SDL_Joystick *joy)
rep = &joy->hwdata->inreport;
while (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) == rep->size) {
-#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111) || defined(__FreeBSD_kernel__)
+#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid);
#else
hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
@@ -707,7 +710,7 @@ report_alloc(struct report *r, struct report_desc *rd, int repind)
int len;
#ifdef __DragonFly__
- len = hid_report_size(rd, r->rid, repinfo[repind].kind);
+ len = hid_report_size(rd, repinfo[repind].kind, r->rid);
#elif __FREEBSD__
# if (__FreeBSD_kernel_version >= 460000) || defined(__FreeBSD_kernel__)
# if (__FreeBSD_kernel_version <= 500111)
@@ -732,7 +735,7 @@ report_alloc(struct report *r, struct report_desc *rd, int repind)
r->size = len;
if (r->size > 0) {
-#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000)
+#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 900000) || defined(__DragonFly__)
r->buf = SDL_malloc(r->size);
#else
r->buf = SDL_malloc(sizeof(*r->buf) - sizeof(REP_BUF_DATA(r)) +