mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 12:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

(360) Xinput2 driver moved to input/

Browse Source
This commit is contained in:
Twinaphex 2012-07-07 16:20:31 +02:00
parent 4216cded79
commit 5b8c426b3c
7 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
360/frontend-xdk/main.c
View File

@ -21,7 +21,7 @@
#include <string> #include <string>
#include <xbdm.h> #include <xbdm.h>
#include "menu.h" #include "menu.h"
#include "../xdk360_input.h" #include "../../input/rarch_xinput2.h"
#include "../xdk360_video.h" #include "../xdk360_video.h"
#include "../../console/retroarch_console.h" #include "../../console/retroarch_console.h"
@ -262,7 +262,7 @@ int main(int argc, char *argv[])
init_libretro_sym(); init_libretro_sym();
video_xdk360.start(); video_xdk360.start();
input_xdk360.init(); input_xinput2.init();
rarch_input_set_default_keybind_names_for_emulator(); rarch_input_set_default_keybind_names_for_emulator();
@ -273,7 +273,7 @@ begin_loop:
{ {
bool repeat = false; bool repeat = false;
input_xdk360.poll(NULL); input_xinput2.poll(NULL);
rarch_set_auto_viewport(g_extern.frame_cache.width, g_extern.frame_cache.height); rarch_set_auto_viewport(g_extern.frame_cache.width, g_extern.frame_cache.height);
@ -297,7 +297,7 @@ begin_shutdown:
menu_free(); menu_free();
video_xdk360.stop(); video_xdk360.stop();
input_xdk360.free(NULL); input_xinput2.free(NULL);
rarch_exec(); rarch_exec();
return 0; return 0;

2
console/retroarch_console_input.h
View File

@ -82,7 +82,7 @@ enum ps3_device_id
}; };
#elif defined(_XBOX360) #elif defined(_XBOX360)
#include "../360/xdk360_input.h" #include "../input/rarch_xinput2.h"
enum xdk360_device_id enum xdk360_device_id
{ {

4
driver.c
View File

@ -119,8 +119,8 @@ static const input_driver_t *input_drivers[] = {
#ifdef XENON #ifdef XENON
&input_xenon360, &input_xenon360,
#endif #endif
#ifdef _XBOX360 #ifdef HAVE_XINPUT2
&input_xdk360, &input_xinput2,
#endif #endif
#ifdef GEKKO #ifdef GEKKO
&input_wii, &input_wii,

2
driver.h
View File

@ -246,7 +246,7 @@ extern const input_driver_t input_x;
extern const input_driver_t input_ps3; extern const input_driver_t input_ps3;
extern const input_driver_t input_xenon360; extern const input_driver_t input_xenon360;
extern const input_driver_t input_wii; extern const input_driver_t input_wii;
extern const input_driver_t input_xdk360; extern const input_driver_t input_xinput2;
extern const input_driver_t input_linuxraw; extern const input_driver_t input_linuxraw;
extern const input_driver_t input_null; extern const input_driver_t input_null;
//////////////////////////////////////////////// ////////////////////////////////////////////////

6
360/xdk360_input.h → input/rarch_xinput2.h
View File

@ -14,8 +14,8 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _XDK360_INPUT_H #ifndef __RARCH_XINPUT2_H
#define _XDK360_INPUT_H #define __RARCH_XINPUT2_H
#define XINPUT_GAMEPAD_LSTICK_LEFT_MASK (65536) #define XINPUT_GAMEPAD_LSTICK_LEFT_MASK (65536)
#define XINPUT_GAMEPAD_LSTICK_RIGHT_MASK (131072) #define XINPUT_GAMEPAD_LSTICK_RIGHT_MASK (131072)
@ -29,6 +29,8 @@
#define XINPUT_GAMEPAD_RIGHT_TRIGGER (33554432) #define XINPUT_GAMEPAD_RIGHT_TRIGGER (33554432)
#define DEADZONE (16000) #define DEADZONE (16000)
#ifdef _XBOX
extern void xdk360_input_map_dpad_to_stick(uint32_t map_dpad_enum, uint32_t controller_id); extern void xdk360_input_map_dpad_to_stick(uint32_t map_dpad_enum, uint32_t controller_id);
#endif
#endif #endif

52
360/xdk360_input.c → input/xinput2_input.c
View File

@ -16,17 +16,20 @@
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef _XBOX
#include <xtl.h> #include <xtl.h>
#endif
#include "../driver.h" #include "../driver.h"
#include "../general.h" #include "../general.h"
#include "../libretro.h" #include "../libretro.h"
#include "../console/retroarch_console.h" #include "rarch_xinput2.h"
#include "xdk360_input.h"
static uint64_t state[4]; static uint64_t state[4];
static unsigned pads_connected; static unsigned pads_connected;
static void xdk360_input_poll(void *data) static void xinput2_input_poll(void *data)
{ {
(void)data; (void)data;
@ -51,7 +54,7 @@ static void xdk360_input_poll(void *data)
} }
} }
static int16_t xdk360_input_state(void *data, const struct snes_keybind **binds, static int16_t xinput2_input_state(void *data, const struct snes_keybind **binds,
unsigned port, unsigned device, unsigned port, unsigned device,
unsigned index, unsigned id) unsigned index, unsigned id)
{ {
@ -62,17 +65,13 @@ static int16_t xdk360_input_state(void *data, const struct snes_keybind **binds,
return (state[player] & button) ? 1 : 0; return (state[player] & button) ? 1 : 0;
} }
static void xdk360_free_input(void *data) static void xinput2_input_free_input(void *data)
{ {
(void)data; (void)data;
} }
static void* xdk360_input_initialize(void) #ifdef _XBOX
{ #include "../console/retroarch_console.h"
for(unsigned i = 0; i < 4; i++)
xdk360_input_map_dpad_to_stick(g_settings.input.dpad_emulation[i], i);
return (void*)-1;
}
void xdk360_input_map_dpad_to_stick(uint32_t map_dpad_enum, uint32_t controller_id) void xdk360_input_map_dpad_to_stick(uint32_t map_dpad_enum, uint32_t controller_id)
{ {
@ -98,16 +97,26 @@ void xdk360_input_map_dpad_to_stick(uint32_t map_dpad_enum, uint32_t controller_
break; break;
} }
} }
#endif
static bool xdk360_key_pressed(void *data, int key) static void* xinput2_input_init(void)
{
#ifdef _XBOX
for(unsigned i = 0; i < 4; i++)
xdk360_input_map_dpad_to_stick(g_settings.input.dpad_emulation[i], i);
#endif
return (void*)-1;
}
static bool xinput2_input_key_pressed(void *data, int key)
{ {
(void)data; (void)data;
bool retval = false;
#ifdef _XBOX
XINPUT_STATE state; XINPUT_STATE state;
bool retval;
xdk360_video_t *d3d9 = (xdk360_video_t*)driver.video_data; xdk360_video_t *d3d9 = (xdk360_video_t*)driver.video_data;
XInputGetState(0, &state); XInputGetState(0, &state);
retval = false;
switch(key) switch(key)
{ {
@ -150,16 +159,17 @@ static bool xdk360_key_pressed(void *data, int key)
retval = g_console.ingame_menu_enable ? g_console.ingame_menu_enable : g_console.menu_enable; retval = g_console.ingame_menu_enable ? g_console.ingame_menu_enable : g_console.menu_enable;
} }
} }
#endif
return retval; return retval;
} }
const input_driver_t input_xdk360 = const input_driver_t input_xinput2 =
{ {
xdk360_input_initialize, xinput2_input_init,
xdk360_input_poll, xinput2_input_poll,
xdk360_input_state, xinput2_input_state,
xdk360_key_pressed, xinput2_input_key_pressed,
xdk360_free_input, xinput2_input_free_input,
"xdk360" "xinput2"
}; };

12
msvc/RetroArch-360/RetroArch-360.vcxproj
View File

@ -113,7 +113,7 @@
<MinimalRebuild>true</MinimalRebuild> <MinimalRebuild>true</MinimalRebuild>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>_DEBUG;_XBOX;PACKAGE_VERSION="0.9.6";%(PreprocessorDefinitions);HAVE_DEFAULT_RETROPAD_INPUT;_CRT_SECURE_NO_WARNINGS;main=rarch_main;RARCH_CONSOLE;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_XBOX;HAVE_XINPUT2;PACKAGE_VERSION="0.9.6";%(PreprocessorDefinitions);HAVE_DEFAULT_RETROPAD_INPUT;_CRT_SECURE_NO_WARNINGS;main=rarch_main;RARCH_CONSOLE;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions>
<CallAttributedProfiling>Callcap</CallAttributedProfiling> <CallAttributedProfiling>Callcap</CallAttributedProfiling>
</ClCompile> </ClCompile>
<Link> <Link>
@ -151,7 +151,7 @@
<PREfast>AnalyzeOnly</PREfast> <PREfast>AnalyzeOnly</PREfast>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PreprocessorDefinitions>_DEBUG;_XBOX;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.6";HAVE_DEFAULT_RETROPAD_INPUT;_CRT_SECURE_NO_WARNINGS;main=rarch_main;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;RARCH_CONSOLE;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.6";HAVE_DEFAULT_RETROPAD_INPUT;_CRT_SECURE_NO_WARNINGS;main=rarch_main;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;RARCH_CONSOLE;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions>
<CallAttributedProfiling>Callcap</CallAttributedProfiling> <CallAttributedProfiling>Callcap</CallAttributedProfiling>
</ClCompile> </ClCompile>
<Link> <Link>
@ -190,7 +190,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.6";HAVE_DEFAULT_RETROPAD_INPUT;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;main=rarch_main;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_XBOX;PROFILE;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.6";HAVE_DEFAULT_RETROPAD_INPUT;_CRT_SECURE_NO_WARNINGS;RARCH_CONSOLE;main=rarch_main;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions>
<CallAttributedProfiling>Callcap</CallAttributedProfiling> <CallAttributedProfiling>Callcap</CallAttributedProfiling>
</ClCompile> </ClCompile>
<Link> <Link>
@ -234,7 +234,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.6";HAVE_DEFAULT_RETROPAD_INPUT;_CRT_SECURE_NO_WARNINGS;main=rarch_main;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_XBOX;PROFILE;FASTCAP;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.6";HAVE_DEFAULT_RETROPAD_INPUT;_CRT_SECURE_NO_WARNINGS;main=rarch_main;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
@ -275,7 +275,7 @@
<ExceptionHandling>false</ExceptionHandling> <ExceptionHandling>false</ExceptionHandling>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>NDEBUG;_XBOX;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.6";_CRT_SECURE_NO_WARNINGS;HAVE_DEFAULT_RETROPAD_INPUT;main=rarch_main;RARCH_CONSOLE=1;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_XBOX;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.6";_CRT_SECURE_NO_WARNINGS;HAVE_DEFAULT_RETROPAD_INPUT;main=rarch_main;RARCH_CONSOLE=1;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
@ -316,7 +316,7 @@
<ExceptionHandling>false</ExceptionHandling> <ExceptionHandling>false</ExceptionHandling>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<PreprocessorDefinitions>NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);PACKAGE_VERSION="0.9.6";_CRT_SECURE_NO_WARNINGS;HAVE_DEFAULT_RETROPAD_INPUT;RARCH_CONSOLE;main=rarch_main;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_XBOX;LTCG;%(PreprocessorDefinitions);HAVE_XINPUT2;PACKAGE_VERSION="0.9.6";_CRT_SECURE_NO_WARNINGS;HAVE_DEFAULT_RETROPAD_INPUT;RARCH_CONSOLE;main=rarch_main;HAVE_CONFIGFILE;HAVE_FILEBROWSER;HAVE_HDD_CACHE_PARTITION;HAVE_NETPLAY;HAVE_SOCKET_LEGACY;HAVE_ZLIB;HAVE_RARCH_MAIN_WRAP;HAVE_RARCH_EXEC;HAVE_LIBRETRO_MANAGEMENT;D3DCOMPILE_USEVOIDS;HAVE_GRIFFIN;HAVE_HLSL;HAVE_VID_CONTEXT;HAVE_D3D9;_XBOX360</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>