mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move joypad drivers to input/drivers_joypad

Browse Source
This commit is contained in:
twinaphex 2015-01-12 06:28:39 +01:00
parent 8146514064
commit 2d66cdc3e7
20 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.common
View File

@ -62,7 +62,7 @@ endif
ifneq ($(findstring Linux,$(OS)),) ifneq ($(findstring Linux,$(OS)),)
LIBS += -lrt LIBS += -lrt
JOYCONFIG_LIBS += -lrt JOYCONFIG_LIBS += -lrt
OBJ += input/drivers/linuxraw_input.o input/linuxraw_joypad.o OBJ += input/drivers/linuxraw_input.o input/drivers_joypad/linuxraw_joypad.o
endif endif
ifeq ($(findstring Haiku,$(OS)),) ifeq ($(findstring Haiku,$(OS)),)
@ -143,7 +143,7 @@ OBJ += frontend/frontend.o \
gfx/nullgfx.o \ gfx/nullgfx.o \
audio/drivers/nullaudio.o \ audio/drivers/nullaudio.o \
input/drivers/nullinput.o \ input/drivers/nullinput.o \
input/nullinput_joypad.o \ input/drivers_joypad/nullinput_joypad.o \
input/osk/nullosk.o \ input/osk/nullosk.o \
playlist.o \ playlist.o \
movie.o \ movie.o \
@ -334,7 +334,7 @@ endif
ifeq ($(HAVE_WINXINPUT), 1) ifeq ($(HAVE_WINXINPUT), 1)
DEFINES += -DHAVE_WINXINPUT -DHAVE_BUILTIN_AUTOCONFIG DEFINES += -DHAVE_WINXINPUT -DHAVE_BUILTIN_AUTOCONFIG
OBJ += input/winxinput_joypad.o \ OBJ += input/drivers_joypad/winxinput_joypad.o \
input/autoconf/builtin_win.o input/autoconf/builtin_win.o
endif endif
@ -354,11 +354,11 @@ ifeq ($(HAVE_UDEV), 1)
DEFINES += $(UDEV_CFLAGS) DEFINES += $(UDEV_CFLAGS)
LIBS += $(UDEV_LIBS) LIBS += $(UDEV_LIBS)
JOYCONFIG_LIBS += $(UDEV_LIBS) JOYCONFIG_LIBS += $(UDEV_LIBS)
OBJ += input/drivers/udev_input.o input/udev_joypad.o OBJ += input/drivers/udev_input.o input/drivers_joypad/udev_joypad.o
endif endif
ifeq ($(HAVE_PARPORT), 1) ifeq ($(HAVE_PARPORT), 1)
OBJ += input/parport_joypad.o OBJ += input/drivers_joypad/parport_joypad.o
endif endif
# Video # Video
@ -449,7 +449,7 @@ ifeq ($(HAVE_SDL2), 1)
endif endif
ifeq ($(HAVE_SDL), 1) ifeq ($(HAVE_SDL), 1)
OBJ += gfx/sdl_gfx.o input/drivers/sdl_input.o input/sdl_joypad.o audio/drivers/sdl_audio.o OBJ += gfx/sdl_gfx.o input/drivers/sdl_input.o input/drivers_joypad/sdl_joypad.o audio/drivers/sdl_audio.o
ifeq ($(HAVE_OPENGL), 1) ifeq ($(HAVE_OPENGL), 1)
OBJ += gfx/context/sdl_gl_ctx.o OBJ += gfx/context/sdl_gl_ctx.o
@ -461,7 +461,7 @@ ifeq ($(HAVE_SDL), 1)
endif endif
ifeq ($(HAVE_SDL2), 1) ifeq ($(HAVE_SDL2), 1)
OBJ += gfx/sdl2_gfx.o input/drivers/sdl_input.o input/sdl_joypad.o audio/drivers/sdl_audio.o OBJ += gfx/sdl2_gfx.o input/drivers/sdl_input.o input/drivers_joypad/sdl_joypad.o audio/drivers/sdl_audio.o
ifeq ($(HAVE_OPENGL), 1) ifeq ($(HAVE_OPENGL), 1)
OBJ += gfx/context/sdl_gl_ctx.o OBJ += gfx/context/sdl_gl_ctx.o

2
audio/drivers/gx_audio.c
View File

@ -17,7 +17,7 @@
#include "../../driver.h" #include "../../driver.h"
#include <stdlib.h> #include <stdlib.h>
#include <boolean.h> #include <boolean.h>
#include "../general.h" #include "../../general.h"
#include <string.h> #include <string.h>
#ifdef GEKKO #ifdef GEKKO

26
griffin/griffin.c
View File

@ -293,22 +293,22 @@ INPUT
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include "../input/drivers/ps3_input.c" #include "../input/drivers/ps3_input.c"
#include "../input/ps3_input_joypad.c" #include "../input/drivers_joypad/ps3_input_joypad.c"
#include "../input/autoconf/builtin_ps3.c" #include "../input/autoconf/builtin_ps3.c"
#elif defined(SN_TARGET_PSP2) || defined(PSP) #elif defined(SN_TARGET_PSP2) || defined(PSP)
#include "../input/drivers/psp_input.c" #include "../input/drivers/psp_input.c"
#include "../input/psp_input_joypad.c" #include "../input/drivers_joypad/psp_input_joypad.c"
#include "../input/autoconf/builtin_psp.c" #include "../input/autoconf/builtin_psp.c"
#elif defined(GEKKO) #elif defined(GEKKO)
#ifdef HAVE_LIBSICKSAXIS #ifdef HAVE_LIBSICKSAXIS
#include "../input/gx_input_sicksaxis.c" #include "../input/drivers_joypad/gx_input_sicksaxis.c"
#endif #endif
#include "../input/drivers/gx_input.c" #include "../input/drivers/gx_input.c"
#include "../input/gx_input_joypad.c" #include "../input/drivers_joypad/gx_input_joypad.c"
#include "../input/autoconf/builtin_gx.c" #include "../input/autoconf/builtin_gx.c"
#elif defined(_XBOX) #elif defined(_XBOX)
#include "../input/drivers/xdk_xinput_input.c" #include "../input/drivers/xdk_xinput_input.c"
#include "../input/xdk_xinput_input_joypad.c" #include "../input/drivers_joypad/xdk_xinput_input_joypad.c"
#include "../input/autoconf/builtin_xdk.c" #include "../input/autoconf/builtin_xdk.c"
#elif defined(_WIN32) #elif defined(_WIN32)
#include "../input/autoconf/builtin_win.c" #include "../input/autoconf/builtin_win.c"
@ -316,12 +316,12 @@ INPUT
#include "../input/drivers/xenon360_input.c" #include "../input/drivers/xenon360_input.c"
#elif defined(ANDROID) #elif defined(ANDROID)
#include "../input/drivers/android_input.c" #include "../input/drivers/android_input.c"
#include "../input/android_input_joypad.c" #include "../input/drivers_joypad/android_input_joypad.c"
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include "../input/drivers/apple_input.c" #include "../input/drivers/apple_input.c"
#elif defined(__QNX__) #elif defined(__QNX__)
#include "../input/drivers/qnx_input.c" #include "../input/drivers/qnx_input.c"
#include "../input/qnx_input_joypad.c" #include "../input/drivers_joypad/qnx_input_joypad.c"
#elif defined(EMSCRIPTEN) #elif defined(EMSCRIPTEN)
#include "../input/drivers/rwebinput_input.c" #include "../input/drivers/rwebinput_input.c"
#endif #endif
@ -333,11 +333,11 @@ INPUT
#include "../input/connect/connect_wii.c" #include "../input/connect/connect_wii.c"
#ifdef HAVE_HID #ifdef HAVE_HID
#include "../input/apple_joypad_hid.c" #include "../input/drivers_joypad/apple_joypad_hid.c"
#endif #endif
#ifdef IOS #ifdef IOS
#include "../input/apple_joypad_ios.c" #include "../input/drivers_joypad/apple_joypad_ios.c"
#endif #endif
#endif #endif
@ -347,7 +347,7 @@ INPUT
#endif #endif
#ifdef HAVE_WINXINPUT #ifdef HAVE_WINXINPUT
#include "../input/winxinput_joypad.c" #include "../input/drivers_joypad/winxinput_joypad.c"
#endif #endif
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
@ -358,7 +358,7 @@ INPUT
#if defined(__linux__) && !defined(ANDROID) #if defined(__linux__) && !defined(ANDROID)
#include "../input/drivers/linuxraw_input.c" #include "../input/drivers/linuxraw_input.c"
#include "../input/linuxraw_joypad.c" #include "../input/drivers_joypad/linuxraw_joypad.c"
#endif #endif
#ifdef HAVE_X11 #ifdef HAVE_X11
@ -367,11 +367,11 @@ INPUT
#ifdef HAVE_UDEV #ifdef HAVE_UDEV
#include "../input/drivers/udev_input.c" #include "../input/drivers/udev_input.c"
#include "../input/udev_joypad.c" #include "../input/drivers_joypad/udev_joypad.c"
#endif #endif
#include "../input/drivers/nullinput.c" #include "../input/drivers/nullinput.c"
#include "../input/nullinput_joypad.c" #include "../input/drivers_joypad/nullinput_joypad.c"
/*============================================================ /*============================================================
KEYBOARD EVENT KEYBOARD EVENT

0
input/android_input_joypad.c → input/drivers_joypad/android_input_joypad.c
View File

8
input/apple_joypad_hid.c → input/drivers_joypad/apple_joypad_hid.c
View File

@ -16,10 +16,10 @@
#include <IOKit/hid/IOHIDManager.h> #include <IOKit/hid/IOHIDManager.h>
#include <IOKit/hid/IOHIDKeys.h> #include <IOKit/hid/IOHIDKeys.h>
#include "drivers/apple_input.h" #include "../drivers/apple_input.h"
#include "input_autodetect.h" #include "../input_autodetect.h"
#include "input_common.h" #include "../input_common.h"
#include "../general.h" #include "../../general.h"
struct pad_connection struct pad_connection
{ {

18
input/apple_joypad_ios.c → input/drivers_joypad/apple_joypad_ios.c
View File

@ -14,16 +14,16 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "drivers/apple_input.h" #include "../drivers/apple_input.h"
#include "input_autodetect.h" #include "../input_autodetect.h"
#include "input_common.h" #include "../input_common.h"
#include "../general.h" #include "../../general.h"
#include "../apple/common/apple_gamecontroller.h" #include "../../apple/common/apple_gamecontroller.h"
#include "../apple/iOS/bluetooth/btdynamic.c" #include "../../apple/iOS/bluetooth/btdynamic.c"
#include "../apple/iOS/bluetooth/btpad.c" #include "../../apple/iOS/bluetooth/btpad.c"
#include "../apple/iOS/bluetooth/btpad_queue.c" #include "../../apple/iOS/bluetooth/btpad_queue.c"
#include "connect/joypad_connection.h" #include "../connect/joypad_connection.h"
joypad_connection_t *slots; joypad_connection_t *slots;

2
input/gx_input_joypad.c → input/drivers_joypad/gx_input_joypad.c
View File

@ -15,7 +15,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "input_autodetect.h" #include "../input_autodetect.h"
#ifdef HW_RVL #ifdef HW_RVL
#include <gccore.h> #include <gccore.h>
#include <ogc/pad.h> #include <ogc/pad.h>

0
input/gx_input_sicksaxis.c → input/drivers_joypad/gx_input_sicksaxis.c
View File

0
input/gx_input_sicksaxis.h → input/drivers_joypad/gx_input_sicksaxis.h
View File

6
input/linuxraw_joypad.c → input/drivers_joypad/linuxraw_joypad.c
View File

@ -14,9 +14,9 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "input_autodetect.h" #include "../input_autodetect.h"
#include "input_common.h" #include "../input_common.h"
#include "../general.h" #include "../../general.h"
#include <unistd.h> #include <unistd.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>

2
input/nullinput_joypad.c → input/drivers_joypad/nullinput_joypad.c
View File

@ -18,7 +18,7 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <boolean.h> #include <boolean.h>
#include "input_context.h" #include "../input_context.h"
static const char *null_joypad_name(unsigned pad) static const char *null_joypad_name(unsigned pad)
{ {

6
input/parport_joypad.c → input/drivers_joypad/parport_joypad.c
View File

@ -13,9 +13,9 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "input_autodetect.h" #include "../input_autodetect.h"
#include "input_common.h" #include "../input_common.h"
#include "../general.h" #include "../../general.h"
#include <unistd.h> #include <unistd.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>

2
input/ps3_input_joypad.c → input/drivers_joypad/ps3_input_joypad.c
View File

@ -14,7 +14,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "input_autodetect.h" #include "../input_autodetect.h"
static uint64_t pad_state[MAX_PADS]; static uint64_t pad_state[MAX_PADS];
static int16_t analog_state[MAX_PADS][2][2]; static int16_t analog_state[MAX_PADS][2][2];

2
input/psp_input_joypad.c → input/drivers_joypad/psp_input_joypad.c
View File

@ -14,7 +14,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "input_autodetect.h" #include "../input_autodetect.h"
static uint64_t pad_state; static uint64_t pad_state;
static int16_t analog_state[1][2][2]; static int16_t analog_state[1][2][2];

2
input/qnx_input_joypad.c → input/drivers_joypad/qnx_input_joypad.c
View File

@ -15,7 +15,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "input_autodetect.h" #include "../input_autodetect.h"
static const char *qnx_joypad_name(unsigned pad) static const char *qnx_joypad_name(unsigned pad)
{ {

6
input/sdl_joypad.c → input/drivers_joypad/sdl_joypad.c
View File

@ -14,10 +14,10 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "input_autodetect.h" #include "../input_autodetect.h"
#include "input_common.h" #include "../input_common.h"
#include "SDL.h" #include "SDL.h"
#include "../general.h" #include "../../general.h"
typedef struct _sdl_joypad typedef struct _sdl_joypad
{ {

6
input/udev_joypad.c → input/drivers_joypad/udev_joypad.c
View File

@ -13,9 +13,9 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "input_autodetect.h" #include "../input_autodetect.h"
#include "input_common.h" #include "../input_common.h"
#include "../general.h" #include "../../general.h"
#include <unistd.h> #include <unistd.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>

6
input/winxinput_joypad.c → input/drivers_joypad/winxinput_joypad.c
View File

@ -20,10 +20,10 @@
// Some wrappers for other controllers also simulate xinput (as it is easier to implement) // Some wrappers for other controllers also simulate xinput (as it is easier to implement)
// so this may be useful for those also. // so this may be useful for those also.
#include "input_autodetect.h" #include "../input_autodetect.h"
#include "input_common.h" #include "../input_common.h"
#include "../general.h" #include "../../general.h"
#include <boolean.h> #include <boolean.h>
#include <stdlib.h> #include <stdlib.h>

2
input/xdk_xinput_input_joypad.c → input/drivers_joypad/xdk_xinput_input_joypad.c
View File

@ -14,7 +14,7 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "input_autodetect.h" #include "../input_autodetect.h"
static uint64_t pad_state[MAX_PADS]; static uint64_t pad_state[MAX_PADS];
static int16_t analog_state[MAX_PADS][2][2]; static int16_t analog_state[MAX_PADS][2][2];

12
tools/retroarch-joyconfig-griffin.c
View File

@ -18,7 +18,7 @@
#if defined(__linux) && !defined(ANDROID) #if defined(__linux) && !defined(ANDROID)
#include "../input/drivers/linuxraw_input.c" #include "../input/drivers/linuxraw_input.c"
#include "../input/linuxraw_joypad.c" #include "../input/drivers_joypad/linuxraw_joypad.c"
#endif #endif
#if defined(HAVE_DINPUT) #if defined(HAVE_DINPUT)
@ -26,19 +26,19 @@
#endif #endif
#if defined(HAVE_WINXINPUT) #if defined(HAVE_WINXINPUT)
#include "../input/winxinput_joypad.c" #include "../input/drivers_joypad/winxinput_joypad.c"
#endif #endif
#if defined(HAVE_UDEV) #if defined(HAVE_UDEV)
#include "../input/udev_joypad.c" #include "../input/drivers_joypad/udev_joypad.c"
#endif #endif
#if defined(HAVE_PARPORT) #if defined(HAVE_PARPORT)
#include "../input/parport_joypad.c" #include "../input/drivers_joypad/parport_joypad.c"
#endif #endif
#if defined(HAVE_SDL) || defined(HAVE_SDL2) #if defined(HAVE_SDL) || defined(HAVE_SDL2)
#include "../input/sdl_joypad.c" #include "../input/drivers_joypad/sdl_joypad.c"
#endif #endif
#include "../libretro-sdk/file/config_file.c" #include "../libretro-sdk/file/config_file.c"
@ -47,7 +47,7 @@
#include "../libretro-sdk/compat/compat.c" #include "../libretro-sdk/compat/compat.c"
#include "../input/drivers/nullinput.c" #include "../input/drivers/nullinput.c"
#include "../input/nullinput_joypad.c" #include "../input/drivers_joypad/nullinput_joypad.c"
#include "../input/input_context.c" #include "../input/input_context.c"
#include "../input/input_joypad.c" #include "../input/input_joypad.c"