2002-02-14 01:24:08 +00:00
|
|
|
/*
|
|
|
|
SDL - Simple DirectMedia Layer
|
2010-01-24 21:10:53 +00:00
|
|
|
Copyright (C) 1997-2010 Sam Lantinga
|
2002-02-14 01:24:08 +00:00
|
|
|
|
|
|
|
This library is free software; you can redistribute it and/or
|
2006-02-01 06:32:25 +00:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
2002-02-14 01:24:08 +00:00
|
|
|
License as published by the Free Software Foundation; either
|
2006-02-01 06:32:25 +00:00
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
2002-02-14 01:24:08 +00:00
|
|
|
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2006-02-01 06:32:25 +00:00
|
|
|
Lesser General Public License for more details.
|
2002-02-14 01:24:08 +00:00
|
|
|
|
2006-02-01 06:32:25 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
|
|
License along with this library; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
2002-02-14 01:24:08 +00:00
|
|
|
|
|
|
|
Sam Lantinga
|
2006-02-01 06:32:25 +00:00
|
|
|
slouken@libsdl.org
|
2002-02-14 01:24:08 +00:00
|
|
|
*/
|
2006-02-21 08:46:50 +00:00
|
|
|
#include "SDL_config.h"
|
2002-02-14 01:24:08 +00:00
|
|
|
|
2006-04-14 04:46:47 +00:00
|
|
|
#ifdef SDL_JOYSTICK_USBHID
|
|
|
|
|
2002-02-14 01:24:08 +00:00
|
|
|
/*
|
|
|
|
* Joystick driver for the uhid(4) interface found in OpenBSD,
|
|
|
|
* NetBSD and FreeBSD.
|
|
|
|
*
|
|
|
|
* Maintainer: <vedge at csoft.org>
|
|
|
|
*/
|
|
|
|
|
2002-12-02 02:35:58 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
|
2002-02-14 01:24:08 +00:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <errno.h>
|
|
|
|
|
2009-10-10 09:44:04 +00:00
|
|
|
#ifndef __FreeBSD_kernel_version
|
|
|
|
#define __FreeBSD_kernel_version __FreeBSD_version
|
|
|
|
#endif
|
|
|
|
|
2002-06-11 19:56:41 +00:00
|
|
|
#if defined(HAVE_USB_H)
|
|
|
|
#include <usb.h>
|
|
|
|
#endif
|
2006-03-21 08:54:50 +00:00
|
|
|
#ifdef __DragonFly__
|
|
|
|
#include <bus/usb/usb.h>
|
|
|
|
#include <bus/usb/usbhid.h>
|
|
|
|
#else
|
2002-02-14 01:24:08 +00:00
|
|
|
#include <dev/usb/usb.h>
|
|
|
|
#include <dev/usb/usbhid.h>
|
2006-03-21 08:54:50 +00:00
|
|
|
#endif
|
2002-04-16 16:45:23 +00:00
|
|
|
|
2002-05-28 20:01:29 +00:00
|
|
|
#if defined(HAVE_USBHID_H)
|
|
|
|
#include <usbhid.h>
|
|
|
|
#elif defined(HAVE_LIBUSB_H)
|
|
|
|
#include <libusb.h>
|
|
|
|
#elif defined(HAVE_LIBUSBHID_H)
|
|
|
|
#include <libusbhid.h>
|
2002-04-16 16:45:23 +00:00
|
|
|
#endif
|
2002-02-14 01:24:08 +00:00
|
|
|
|
2006-02-21 08:46:50 +00:00
|
|
|
#ifdef __FREEBSD__
|
2006-03-21 08:54:50 +00:00
|
|
|
#ifndef __DragonFly__
|
2003-04-15 16:02:08 +00:00
|
|
|
#include <osreldate.h>
|
2006-03-21 08:54:50 +00:00
|
|
|
#endif
|
2004-01-06 04:07:12 +00:00
|
|
|
#include <sys/joystick.h>
|
|
|
|
#endif
|
|
|
|
|
2006-03-21 08:54:50 +00:00
|
|
|
#if SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
|
2004-01-06 04:07:12 +00:00
|
|
|
#include <machine/joystick.h>
|
2003-04-15 16:02:08 +00:00
|
|
|
#endif
|
|
|
|
|
2002-02-14 01:24:08 +00:00
|
|
|
#include "SDL_joystick.h"
|
2006-02-16 10:11:48 +00:00
|
|
|
#include "../SDL_sysjoystick.h"
|
|
|
|
#include "../SDL_joystick_c.h"
|
2002-02-14 01:24:08 +00:00
|
|
|
|
|
|
|
#define MAX_UHID_JOYS 4
|
|
|
|
#define MAX_JOY_JOYS 2
|
|
|
|
#define MAX_JOYS (MAX_UHID_JOYS + MAX_JOY_JOYS)
|
|
|
|
|
2009-10-12 09:42:50 +00:00
|
|
|
#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
|
|
|
|
struct usb_ctl_report {
|
|
|
|
int ucr_report;
|
|
|
|
u_char ucr_data[1024]; /* filled data size will vary */
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
struct report
|
|
|
|
{
|
|
|
|
struct usb_ctl_report *buf; /* Buffer */
|
|
|
|
size_t size; /* Buffer size */
|
|
|
|
int rid; /* Report ID */
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
SREPORT_UNINIT,
|
|
|
|
SREPORT_CLEAN,
|
|
|
|
SREPORT_DIRTY
|
|
|
|
} status;
|
2002-02-14 01:24:08 +00:00
|
|
|
};
|
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
static struct
|
|
|
|
{
|
|
|
|
int uhid_report;
|
|
|
|
hid_kind_t kind;
|
|
|
|
const char *name;
|
2002-02-14 01:24:08 +00:00
|
|
|
} const repinfo[] = {
|
2006-07-10 21:04:37 +00:00
|
|
|
{UHID_INPUT_REPORT, hid_input, "input"},
|
|
|
|
{UHID_OUTPUT_REPORT, hid_output, "output"},
|
|
|
|
{UHID_FEATURE_REPORT, hid_feature, "feature"}
|
2002-02-14 01:24:08 +00:00
|
|
|
};
|
2002-03-10 03:49:25 +00:00
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
enum
|
|
|
|
{
|
|
|
|
REPORT_INPUT = 0,
|
|
|
|
REPORT_OUTPUT = 1,
|
|
|
|
REPORT_FEATURE = 2
|
2002-03-10 03:49:25 +00:00
|
|
|
};
|
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
enum
|
|
|
|
{
|
|
|
|
JOYAXE_X,
|
|
|
|
JOYAXE_Y,
|
|
|
|
JOYAXE_Z,
|
|
|
|
JOYAXE_SLIDER,
|
|
|
|
JOYAXE_WHEEL,
|
|
|
|
JOYAXE_RX,
|
|
|
|
JOYAXE_RY,
|
|
|
|
JOYAXE_RZ,
|
|
|
|
JOYAXE_count
|
2002-03-10 03:49:25 +00:00
|
|
|
};
|
2002-02-14 01:24:08 +00:00
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
struct joystick_hwdata
|
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
char *path;
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
BSDJOY_UHID, /* uhid(4) */
|
|
|
|
BSDJOY_JOY /* joy(4) */
|
|
|
|
} type;
|
|
|
|
struct report_desc *repdesc;
|
|
|
|
struct report inreport;
|
|
|
|
int axis_map[JOYAXE_count]; /* map present JOYAXE_* to 0,1,.. */
|
2002-02-14 01:24:08 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static char *joynames[MAX_JOYS];
|
|
|
|
static char *joydevnames[MAX_JOYS];
|
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
static int report_alloc(struct report *, struct report_desc *, int);
|
|
|
|
static void report_free(struct report *);
|
2002-02-14 01:24:08 +00:00
|
|
|
|
2009-10-12 09:42:50 +00:00
|
|
|
#if defined(USBHID_UCR_DATA) || (defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063))
|
2002-05-28 20:01:29 +00:00
|
|
|
#define REP_BUF_DATA(rep) ((rep)->buf->ucr_data)
|
|
|
|
#else
|
|
|
|
#define REP_BUF_DATA(rep) ((rep)->buf->data)
|
|
|
|
#endif
|
|
|
|
|
2002-02-14 01:24:08 +00:00
|
|
|
int
|
|
|
|
SDL_SYS_JoystickInit(void)
|
|
|
|
{
|
2006-07-10 21:04:37 +00:00
|
|
|
char s[16];
|
|
|
|
int i, fd;
|
|
|
|
|
|
|
|
SDL_numjoysticks = 0;
|
|
|
|
|
|
|
|
SDL_memset(joynames, 0, sizeof(joynames));
|
|
|
|
SDL_memset(joydevnames, 0, sizeof(joydevnames));
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_UHID_JOYS; i++) {
|
|
|
|
SDL_Joystick nj;
|
|
|
|
|
|
|
|
SDL_snprintf(s, SDL_arraysize(s), "/dev/uhid%d", i);
|
|
|
|
|
|
|
|
nj.index = SDL_numjoysticks;
|
|
|
|
joynames[nj.index] = strdup(s);
|
|
|
|
|
|
|
|
if (SDL_SYS_JoystickOpen(&nj) == 0) {
|
|
|
|
SDL_SYS_JoystickClose(&nj);
|
|
|
|
SDL_numjoysticks++;
|
|
|
|
} else {
|
|
|
|
SDL_free(joynames[nj.index]);
|
|
|
|
joynames[nj.index] = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (i = 0; i < MAX_JOY_JOYS; i++) {
|
|
|
|
SDL_snprintf(s, SDL_arraysize(s), "/dev/joy%d", i);
|
|
|
|
fd = open(s, O_RDONLY);
|
|
|
|
if (fd != -1) {
|
|
|
|
joynames[SDL_numjoysticks++] = strdup(s);
|
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the default USB HID usage table. */
|
|
|
|
hid_init(NULL);
|
|
|
|
|
|
|
|
return (SDL_numjoysticks);
|
2002-02-14 01:24:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
const char *
|
|
|
|
SDL_SYS_JoystickName(int index)
|
|
|
|
{
|
2006-07-10 21:04:37 +00:00
|
|
|
if (joydevnames[index] != NULL) {
|
|
|
|
return (joydevnames[index]);
|
|
|
|
}
|
|
|
|
return (joynames[index]);
|
2002-02-14 01:24:08 +00:00
|
|
|
}
|
|
|
|
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
static int
|
|
|
|
usage_to_joyaxe(unsigned usage)
|
|
|
|
{
|
|
|
|
int joyaxe;
|
|
|
|
switch (usage) {
|
|
|
|
case HUG_X:
|
2006-07-10 21:04:37 +00:00
|
|
|
joyaxe = JOYAXE_X;
|
|
|
|
break;
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
case HUG_Y:
|
2006-07-10 21:04:37 +00:00
|
|
|
joyaxe = JOYAXE_Y;
|
|
|
|
break;
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
case HUG_Z:
|
2006-07-10 21:04:37 +00:00
|
|
|
joyaxe = JOYAXE_Z;
|
|
|
|
break;
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
case HUG_SLIDER:
|
2006-07-10 21:04:37 +00:00
|
|
|
joyaxe = JOYAXE_SLIDER;
|
|
|
|
break;
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
case HUG_WHEEL:
|
2006-07-10 21:04:37 +00:00
|
|
|
joyaxe = JOYAXE_WHEEL;
|
|
|
|
break;
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
case HUG_RX:
|
2006-07-10 21:04:37 +00:00
|
|
|
joyaxe = JOYAXE_RX;
|
|
|
|
break;
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
case HUG_RY:
|
2006-07-10 21:04:37 +00:00
|
|
|
joyaxe = JOYAXE_RY;
|
|
|
|
break;
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
case HUG_RZ:
|
2006-07-10 21:04:37 +00:00
|
|
|
joyaxe = JOYAXE_RZ;
|
|
|
|
break;
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
default:
|
2006-07-10 21:04:37 +00:00
|
|
|
joyaxe = -1;
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
}
|
2006-07-10 21:04:37 +00:00
|
|
|
return joyaxe;
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned
|
|
|
|
hatval_to_sdl(Sint32 hatval)
|
|
|
|
{
|
|
|
|
static const unsigned hat_dir_map[8] = {
|
2006-07-10 21:04:37 +00:00
|
|
|
SDL_HAT_UP, SDL_HAT_RIGHTUP, SDL_HAT_RIGHT, SDL_HAT_RIGHTDOWN,
|
|
|
|
SDL_HAT_DOWN, SDL_HAT_LEFTDOWN, SDL_HAT_LEFT, SDL_HAT_LEFTUP
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
};
|
|
|
|
unsigned result;
|
2006-07-10 21:04:37 +00:00
|
|
|
if ((hatval & 7) == hatval)
|
|
|
|
result = hat_dir_map[hatval];
|
|
|
|
else
|
|
|
|
result = SDL_HAT_CENTERED;
|
Date: Sun, 1 Jun 2003 15:38:45 -0700 (PDT)
From: Jeff Brown <jabrown@caida.org>
Subject: [patch] SDL-1.2.5 + FreeBSD joystick axes, hat fixes
Hello again! When I sent in some SDL fixes last December, I found out
they'd already been fixed in the CVS version. This time, I checked the
repository before bugging you. =)
I'm using SDL-1.2.5 on a FreeBSD 4.6.2-RELEASE system, and in the course
of getting my multi-analog-axis USB controller (with a hat switch!)
working with d2x-sdl -- the SDL port of the Descent 2 engine -- I came
across a few problems:
1) The second analog stick is reported as a slider in one direction, and
"Rz" in the other. SDL was ignoring the Rz axis, so I added Rx/Ry/Rz to
the set of things SDL considers to be axes.
2) After the above change, the set of JOYAXE_* axes for my gamepad was
{0,1,3,7}; however, d2x-sdl expects the axes to be contiguously numbered
from 0, which seems like a pretty reasonable expectation, rather than
having to scan the entire space of axes that SDL may or may not have.
So, I added a table lookup which maps the JOYAXE_* axis numbers to 0,1,...
in the order they're detected by SDL_SYS_JoystickOpen(), when reporting
them to the application. I also added a function "usage_to_joyaxe()"
which maps the USB HUG_* usage values to JOYAXE_values, since the repeated
case statements testing for HUG_* were getting out of hand.
3) The BSD joystick driver had no hat support, so I added it. It looks
like our USB library can only support one hat switch per device, which
makes life easy.
The patch against SDL-1.2.5 which implements these changes is at:
http://www.caida.org/~jabrown/patches/sdl-1.2.5-bsdhat.diff
After applying, SDL's "testjoystick" reports all activity from my gamepad
correctly, and d2x works too (though it needed some other fixes).
Moving on...
There is also a problem with slightly different USBHID library interfaces
on different versions of FreeBSD. I wasn't going to mention this since the
FreeBSD port for SDL-1.2.5 (and not SDL itself) was doing the FreeBSD
version-specific patching, so I e-mailed the port maintainer with this
change. However, I see that you've incorporated the FreeBSD
version-checking stuff into the CVS version of SDL, so now it's relevant
for you too.
The problem is, the FreeBSD #if tests don't work right for FreeBSD
4.6.2-RELEASE. There may be other versions with this problem, but I've
only tested 4.6.2-R. The following patch against your latest CVS version
fixes this:
--- SDL_sysjoystick.c-1.16 Tue Apr 15 09:02:08 2003
+++ SDL_sysjoystick.c Sun Jun 1 15:10:28 2003
@@ -420,6 +420,8 @@
# else
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
# endif
+# elif (__FreeBSD_version == 460002)
+ len = hid_report_size(rd, r->rid, repinfo[repind].kind);
# else
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
#endif
I hope this is all useful to you. I've been getting myself dizzy playing
Descent 2 with it, all morning!
-Jeff Brown
P.S. My USB controller is a Thrustmaster Firestorm Dual Analog 2. That's
probably irrelevant, but I threw it in for completeness.
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40633
2003-06-02 14:50:22 +00:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-02-14 01:24:08 +00:00
|
|
|
int
|
2006-07-10 21:04:37 +00:00
|
|
|
SDL_SYS_JoystickOpen(SDL_Joystick * joy)
|
2002-02-14 01:24:08 +00:00
|
|
|
{
|
2006-07-10 21:04:37 +00:00
|
|
|
char *path = joynames[joy->index];
|
|
|
|
struct joystick_hwdata *hw;
|
|
|
|
struct hid_item hitem;
|
|
|
|
struct hid_data *hdata;
|
|
|
|
struct report *rep;
|
|
|
|
int fd;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
fd = open(path, O_RDONLY);
|
|
|
|
if (fd == -1) {
|
|
|
|
SDL_SetError("%s: %s", path, strerror(errno));
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
hw = (struct joystick_hwdata *)
|
|
|
|
SDL_malloc(sizeof(struct joystick_hwdata));
|
|
|
|
if (hw == NULL) {
|
|
|
|
SDL_OutOfMemory();
|
|
|
|
close(fd);
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
joy->hwdata = hw;
|
|
|
|
hw->fd = fd;
|
|
|
|
hw->path = strdup(path);
|
|
|
|
if (!SDL_strncmp(path, "/dev/joy", 8)) {
|
|
|
|
hw->type = BSDJOY_JOY;
|
|
|
|
joy->naxes = 2;
|
|
|
|
joy->nbuttons = 2;
|
|
|
|
joy->nhats = 0;
|
|
|
|
joy->nballs = 0;
|
|
|
|
joydevnames[joy->index] = strdup("Gameport joystick");
|
|
|
|
goto usbend;
|
|
|
|
} else {
|
|
|
|
hw->type = BSDJOY_UHID;
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
int ax;
|
|
|
|
for (ax = 0; ax < JOYAXE_count; ax++)
|
|
|
|
hw->axis_map[ax] = -1;
|
|
|
|
}
|
|
|
|
hw->repdesc = hid_get_report_desc(fd);
|
|
|
|
if (hw->repdesc == NULL) {
|
|
|
|
SDL_SetError("%s: USB_GET_REPORT_DESC: %s", hw->path,
|
|
|
|
strerror(errno));
|
|
|
|
goto usberr;
|
|
|
|
}
|
2009-10-12 09:42:50 +00:00
|
|
|
#if defined(__FREEBSD__) && (__FreeBSD_kernel_version > 800063)
|
|
|
|
rep->rid = hid_get_report_id(fd);
|
|
|
|
if (rep->rid < 0) {
|
|
|
|
#else
|
2006-07-10 21:04:37 +00:00
|
|
|
rep = &hw->inreport;
|
|
|
|
if (ioctl(fd, USB_GET_REPORT_ID, &rep->rid) < 0) {
|
2009-10-12 09:42:50 +00:00
|
|
|
#endif
|
2006-07-10 21:04:37 +00:00
|
|
|
rep->rid = -1; /* XXX */
|
|
|
|
}
|
|
|
|
if (report_alloc(rep, hw->repdesc, REPORT_INPUT) < 0) {
|
|
|
|
goto usberr;
|
|
|
|
}
|
|
|
|
if (rep->size <= 0) {
|
|
|
|
SDL_SetError("%s: Input report descriptor has invalid length",
|
|
|
|
hw->path);
|
|
|
|
goto usberr;
|
|
|
|
}
|
2009-10-10 09:36:12 +00:00
|
|
|
#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111)
|
2006-07-10 21:04:37 +00:00
|
|
|
hdata = hid_start_parse(hw->repdesc, 1 << hid_input, rep->rid);
|
2002-06-12 03:32:01 +00:00
|
|
|
#else
|
2006-07-10 21:04:37 +00:00
|
|
|
hdata = hid_start_parse(hw->repdesc, 1 << hid_input);
|
2002-06-12 03:32:01 +00:00
|
|
|
#endif
|
2006-07-10 21:04:37 +00:00
|
|
|
if (hdata == NULL) {
|
|
|
|
SDL_SetError("%s: Cannot start HID parser", hw->path);
|
|
|
|
goto usberr;
|
|
|
|
}
|
|
|
|
joy->naxes = 0;
|
|
|
|
joy->nbuttons = 0;
|
|
|
|
joy->nhats = 0;
|
|
|
|
joy->nballs = 0;
|
|
|
|
for (i = 0; i < JOYAXE_count; i++)
|
|
|
|
hw->axis_map[i] = -1;
|
|
|
|
|
|
|
|
while (hid_get_item(hdata, &hitem) > 0) {
|
|
|
|
char *sp;
|
|
|
|
const char *s;
|
|
|
|
|
|
|
|
switch (hitem.kind) {
|
|
|
|
case hid_collection:
|
|
|
|
switch (HID_PAGE(hitem.usage)) {
|
|
|
|
case HUP_GENERIC_DESKTOP:
|
|
|
|
switch (HID_USAGE(hitem.usage)) {
|
|
|
|
case HUG_JOYSTICK:
|
|
|
|
case HUG_GAME_PAD:
|
|
|
|
s = hid_usage_in_page(hitem.usage);
|
|
|
|
sp = SDL_malloc(SDL_strlen(s) + 5);
|
|
|
|
SDL_snprintf(sp, SDL_strlen(s) + 5, "%s (%d)",
|
|
|
|
s, joy->index);
|
|
|
|
joydevnames[joy->index] = sp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case hid_input:
|
|
|
|
switch (HID_PAGE(hitem.usage)) {
|
|
|
|
case HUP_GENERIC_DESKTOP:
|
|
|
|
{
|
|
|
|
unsigned usage = HID_USAGE(hitem.usage);
|
|
|
|
int joyaxe = usage_to_joyaxe(usage);
|
|
|
|
if (joyaxe >= 0) {
|
|
|
|
hw->axis_map[joyaxe] = 1;
|
|
|
|
} else if (usage == HUG_HAT_SWITCH) {
|
|
|
|
joy->nhats++;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case HUP_BUTTON:
|
|
|
|
joy->nbuttons++;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
hid_end_parse(hdata);
|
|
|
|
for (i = 0; i < JOYAXE_count; i++)
|
|
|
|
if (hw->axis_map[i] > 0)
|
|
|
|
hw->axis_map[i] = joy->naxes++;
|
|
|
|
|
|
|
|
usbend:
|
|
|
|
/* The poll blocks the event thread. */
|
|
|
|
fcntl(fd, F_SETFL, O_NONBLOCK);
|
|
|
|
|
|
|
|
return (0);
|
|
|
|
usberr:
|
|
|
|
close(hw->fd);
|
|
|
|
SDL_free(hw->path);
|
|
|
|
SDL_free(hw);
|
|
|
|
return (-1);
|
2002-02-14 01:24:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2006-07-10 21:04:37 +00:00
|
|
|
SDL_SYS_JoystickUpdate(SDL_Joystick * joy)
|
2002-02-14 01:24:08 +00:00
|
|
|
{
|
2006-07-10 21:04:37 +00:00
|
|
|
struct hid_item hitem;
|
|
|
|
struct hid_data *hdata;
|
|
|
|
struct report *rep;
|
|
|
|
int nbutton, naxe = -1;
|
|
|
|
Sint32 v;
|
2004-01-06 04:07:12 +00:00
|
|
|
|
2006-03-21 08:54:50 +00:00
|
|
|
#if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
|
2006-07-10 21:04:37 +00:00
|
|
|
struct joystick gameport;
|
|
|
|
static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
|
|
|
|
|
|
|
|
if (joy->hwdata->type == BSDJOY_JOY) {
|
|
|
|
if (read(joy->hwdata->fd, &gameport, sizeof gameport) !=
|
|
|
|
sizeof gameport)
|
|
|
|
return;
|
|
|
|
if (abs(x - gameport.x) > 8) {
|
|
|
|
x = gameport.x;
|
|
|
|
if (x < xmin) {
|
|
|
|
xmin = x;
|
|
|
|
}
|
|
|
|
if (x > xmax) {
|
|
|
|
xmax = x;
|
|
|
|
}
|
|
|
|
if (xmin == xmax) {
|
|
|
|
xmin--;
|
|
|
|
xmax++;
|
|
|
|
}
|
|
|
|
v = (Sint32) x;
|
|
|
|
v -= (xmax + xmin + 1) / 2;
|
|
|
|
v *= 32768 / ((xmax - xmin + 1) / 2);
|
|
|
|
SDL_PrivateJoystickAxis(joy, 0, v);
|
|
|
|
}
|
|
|
|
if (abs(y - gameport.y) > 8) {
|
|
|
|
y = gameport.y;
|
|
|
|
if (y < ymin) {
|
|
|
|
ymin = y;
|
|
|
|
}
|
|
|
|
if (y > ymax) {
|
|
|
|
ymax = y;
|
|
|
|
}
|
|
|
|
if (ymin == ymax) {
|
|
|
|
ymin--;
|
|
|
|
ymax++;
|
|
|
|
}
|
|
|
|
v = (Sint32) y;
|
|
|
|
v -= (ymax + ymin + 1) / 2;
|
|
|
|
v *= 32768 / ((ymax - ymin + 1) / 2);
|
|
|
|
SDL_PrivateJoystickAxis(joy, 1, v);
|
|
|
|
}
|
|
|
|
if (gameport.b1 != joy->buttons[0]) {
|
|
|
|
SDL_PrivateJoystickButton(joy, 0, gameport.b1);
|
|
|
|
}
|
|
|
|
if (gameport.b2 != joy->buttons[1]) {
|
|
|
|
SDL_PrivateJoystickButton(joy, 1, gameport.b2);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
2006-03-21 08:54:50 +00:00
|
|
|
#endif /* defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
|
2002-05-28 20:01:29 +00:00
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
rep = &joy->hwdata->inreport;
|
|
|
|
|
|
|
|
if (read(joy->hwdata->fd, REP_BUF_DATA(rep), rep->size) != rep->size) {
|
|
|
|
return;
|
|
|
|
}
|
2009-10-10 09:36:12 +00:00
|
|
|
#if defined(USBHID_NEW) || (defined(__FREEBSD__) && __FreeBSD_kernel_version >= 500111)
|
2006-07-10 21:04:37 +00:00
|
|
|
hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input, rep->rid);
|
2002-06-12 03:32:01 +00:00
|
|
|
#else
|
2006-07-10 21:04:37 +00:00
|
|
|
hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
|
2002-06-12 03:32:01 +00:00
|
|
|
#endif
|
2006-07-10 21:04:37 +00:00
|
|
|
if (hdata == NULL) {
|
|
|
|
fprintf(stderr, "%s: Cannot start HID parser\n", joy->hwdata->path);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (nbutton = 0; hid_get_item(hdata, &hitem) > 0;) {
|
|
|
|
switch (hitem.kind) {
|
|
|
|
case hid_input:
|
|
|
|
switch (HID_PAGE(hitem.usage)) {
|
|
|
|
case HUP_GENERIC_DESKTOP:
|
|
|
|
{
|
|
|
|
unsigned usage = HID_USAGE(hitem.usage);
|
|
|
|
int joyaxe = usage_to_joyaxe(usage);
|
|
|
|
if (joyaxe >= 0) {
|
|
|
|
naxe = joy->hwdata->axis_map[joyaxe];
|
|
|
|
/* scaleaxe */
|
|
|
|
v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
|
|
|
|
v -= (hitem.logical_maximum +
|
|
|
|
hitem.logical_minimum + 1) / 2;
|
|
|
|
v *= 32768 /
|
|
|
|
((hitem.logical_maximum -
|
|
|
|
hitem.logical_minimum + 1) / 2);
|
|
|
|
if (v != joy->axes[naxe]) {
|
|
|
|
SDL_PrivateJoystickAxis(joy, naxe, v);
|
|
|
|
}
|
|
|
|
} else if (usage == HUG_HAT_SWITCH) {
|
|
|
|
v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
|
|
|
|
SDL_PrivateJoystickHat(joy, 0,
|
|
|
|
hatval_to_sdl(v) -
|
|
|
|
hitem.logical_minimum);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case HUP_BUTTON:
|
|
|
|
v = (Sint32) hid_get_data(REP_BUF_DATA(rep), &hitem);
|
|
|
|
if (joy->buttons[nbutton] != v) {
|
|
|
|
SDL_PrivateJoystickButton(joy, nbutton, v);
|
|
|
|
}
|
|
|
|
nbutton++;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
hid_end_parse(hdata);
|
|
|
|
|
|
|
|
return;
|
2002-02-14 01:24:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Function to close a joystick after use */
|
|
|
|
void
|
2006-07-10 21:04:37 +00:00
|
|
|
SDL_SYS_JoystickClose(SDL_Joystick * joy)
|
2002-02-14 01:24:08 +00:00
|
|
|
{
|
2006-07-10 21:04:37 +00:00
|
|
|
if (SDL_strncmp(joy->hwdata->path, "/dev/joy", 8)) {
|
|
|
|
report_free(&joy->hwdata->inreport);
|
|
|
|
hid_dispose_report_desc(joy->hwdata->repdesc);
|
|
|
|
}
|
|
|
|
close(joy->hwdata->fd);
|
|
|
|
SDL_free(joy->hwdata->path);
|
|
|
|
SDL_free(joy->hwdata);
|
|
|
|
|
|
|
|
return;
|
2002-02-14 01:24:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
SDL_SYS_JoystickQuit(void)
|
|
|
|
{
|
2006-07-10 21:04:37 +00:00
|
|
|
int i;
|
2002-02-14 01:24:08 +00:00
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
for (i = 0; i < MAX_JOYS; i++) {
|
|
|
|
if (joynames[i] != NULL)
|
|
|
|
SDL_free(joynames[i]);
|
|
|
|
if (joydevnames[i] != NULL)
|
|
|
|
SDL_free(joydevnames[i]);
|
|
|
|
}
|
2002-02-14 01:24:08 +00:00
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
return;
|
2002-02-14 01:24:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
report_alloc(struct report *r, struct report_desc *rd, int repind)
|
|
|
|
{
|
2006-07-10 21:04:37 +00:00
|
|
|
int len;
|
2002-02-14 01:24:08 +00:00
|
|
|
|
2006-03-21 08:54:50 +00:00
|
|
|
#ifdef __DragonFly__
|
2006-07-10 21:04:37 +00:00
|
|
|
len = hid_report_size(rd, r->rid, repinfo[repind].kind);
|
2006-03-21 08:54:50 +00:00
|
|
|
#elif __FREEBSD__
|
2009-10-10 09:36:12 +00:00
|
|
|
# if (__FreeBSD_kernel_version >= 460000) || defined(__FreeBSD_kernel__)
|
|
|
|
# if (__FreeBSD_kernel_version <= 500111)
|
2006-07-10 21:04:37 +00:00
|
|
|
len = hid_report_size(rd, r->rid, repinfo[repind].kind);
|
2003-04-15 16:02:08 +00:00
|
|
|
# else
|
2006-07-10 21:04:37 +00:00
|
|
|
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
|
2003-04-15 16:02:08 +00:00
|
|
|
# endif
|
2002-12-02 02:35:58 +00:00
|
|
|
# else
|
2006-07-10 21:04:37 +00:00
|
|
|
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
|
2006-03-21 08:54:50 +00:00
|
|
|
# endif
|
2002-11-17 19:03:05 +00:00
|
|
|
#else
|
2002-12-02 02:35:58 +00:00
|
|
|
# ifdef USBHID_NEW
|
2006-07-10 21:04:37 +00:00
|
|
|
len = hid_report_size(rd, repinfo[repind].kind, r->rid);
|
2006-03-21 08:54:50 +00:00
|
|
|
# else
|
2006-07-10 21:04:37 +00:00
|
|
|
len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
|
2002-12-02 02:35:58 +00:00
|
|
|
# endif
|
2002-06-12 03:32:01 +00:00
|
|
|
#endif
|
2002-12-02 02:35:58 +00:00
|
|
|
|
2006-07-10 21:04:37 +00:00
|
|
|
if (len < 0) {
|
|
|
|
SDL_SetError("Negative HID report size");
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
r->size = len;
|
|
|
|
|
|
|
|
if (r->size > 0) {
|
|
|
|
r->buf = SDL_malloc(sizeof(*r->buf) - sizeof(REP_BUF_DATA(r)) +
|
|
|
|
r->size);
|
|
|
|
if (r->buf == NULL) {
|
|
|
|
SDL_OutOfMemory();
|
|
|
|
return (-1);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
r->buf = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
r->status = SREPORT_CLEAN;
|
|
|
|
return (0);
|
2002-02-14 01:24:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
report_free(struct report *r)
|
|
|
|
{
|
2006-07-10 21:04:37 +00:00
|
|
|
if (r->buf != NULL) {
|
|
|
|
SDL_free(r->buf);
|
|
|
|
}
|
|
|
|
r->status = SREPORT_UNINIT;
|
2002-02-14 01:24:08 +00:00
|
|
|
}
|
|
|
|
|
2006-04-14 04:46:47 +00:00
|
|
|
#endif /* SDL_JOYSTICK_USBHID */
|
2006-07-10 21:04:37 +00:00
|
|
|
/* vi: set ts=4 sw=4 expandtab: */
|