Some support for firestorm pad

This commit is contained in:
Ingo Ruhnke 2009-01-15 18:11:01 +01:00
parent cd400bddf0
commit 67f416ec03
3 changed files with 14 additions and 4 deletions

View file

@ -1,7 +1,7 @@
# -*- python -*-
# env = Environment(CPPFLAGS=["-g", "-O2", "-Wall", "-ansi", "-pedantic"], LIBS=["usb"])
env = Environment(CPPFLAGS=["-g", "-O2"], LIBS=["usb", "X11"])
env = Environment(CPPFLAGS=["-g", "-O2", "-Wall", "-ansi", "-pedantic"], LIBS=["usb", "X11"])
# env = Environment(CPPFLAGS=["-g", "-O2"], LIBS=["usb", "X11"])
env.Program("xboxdrv", ["src/xboxdrv.cpp",
"src/xboxmsg.cpp",
"src/uinput.cpp",
@ -11,6 +11,7 @@ env.Program("xboxdrv", ["src/xboxdrv.cpp",
"src/xbox_controller.cpp",
"src/xbox360_controller.cpp",
"src/xbox360_wireless_controller.cpp",
'src/firestorm_dual_controller.cpp',
"src/evdev_helper.cpp",
"src/linux_uinput.cpp"
])

View file

@ -35,6 +35,7 @@
#include "xbox_controller.hpp"
#include "xbox360_controller.hpp"
#include "xbox360_wireless_controller.hpp"
#include "firestorm_dual_controller.hpp"
#include "helper.hpp"
#include "evdev_helper.hpp"
#include "command_line_options.hpp"
@ -98,6 +99,8 @@ XPadDevice xpad_devices[] = {
{ GAMEPAD_XBOX_MAT, 0x0c12, 0x8809, "RedOctane Xbox Dance Pad" },
{ GAMEPAD_XBOX_MAT, 0x12ab, 0x8809, "Xbox DDR dancepad" },
{ GAMEPAD_XBOX_MAT, 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)" },
{ GAMEPAD_FIRESTORM, 0x044f, 0xb304, "ThrustMaster, Inc. Firestorm Dual Power" },
};
const int xpad_devices_count = sizeof(xpad_devices)/sizeof(XPadDevice);
@ -997,7 +1000,7 @@ void apply_square_axis(XboxGenericMsg& msg)
case GAMEPAD_XBOX360_GUITAR:
case GAMEPAD_UNKNOWN:
break;
}
}
}
void apply_deadzone(XboxGenericMsg& msg, int deadzone)
@ -1258,6 +1261,11 @@ void run_main(CommandLineOptions& opts)
controller = new Xbox360WirelessController(dev, opts.wireless_id);
break;
case GAMEPAD_FIRESTORM:
controller = new FirestormDualController(dev);
dev_type.type = GAMEPAD_XBOX360;
break;
default:
assert(!"Unknown gamepad type");
}

View file

@ -27,7 +27,8 @@ enum GamepadType {
GAMEPAD_XBOX_MAT,
GAMEPAD_XBOX360,
GAMEPAD_XBOX360_WIRELESS,
GAMEPAD_XBOX360_GUITAR
GAMEPAD_XBOX360_GUITAR,
GAMEPAD_FIRESTORM
};
struct Xbox360Msg