From 2d66cdc3e7f32ceb13fe81e38c1a2ae76ff5d252 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 12 Jan 2015 06:28:39 +0100 Subject: [PATCH] Move joypad drivers to input/drivers_joypad --- Makefile.common | 14 +++++----- audio/drivers/gx_audio.c | 2 +- griffin/griffin.c | 26 +++++++++---------- .../android_input_joypad.c | 0 input/{ => drivers_joypad}/apple_joypad_hid.c | 8 +++--- input/{ => drivers_joypad}/apple_joypad_ios.c | 18 ++++++------- input/{ => drivers_joypad}/gx_input_joypad.c | 2 +- .../{ => drivers_joypad}/gx_input_sicksaxis.c | 0 .../{ => drivers_joypad}/gx_input_sicksaxis.h | 0 input/{ => drivers_joypad}/linuxraw_joypad.c | 6 ++--- input/{ => drivers_joypad}/nullinput_joypad.c | 2 +- input/{ => drivers_joypad}/parport_joypad.c | 6 ++--- input/{ => drivers_joypad}/ps3_input_joypad.c | 2 +- input/{ => drivers_joypad}/psp_input_joypad.c | 2 +- input/{ => drivers_joypad}/qnx_input_joypad.c | 2 +- input/{ => drivers_joypad}/sdl_joypad.c | 6 ++--- input/{ => drivers_joypad}/udev_joypad.c | 6 ++--- input/{ => drivers_joypad}/winxinput_joypad.c | 6 ++--- .../xdk_xinput_input_joypad.c | 2 +- tools/retroarch-joyconfig-griffin.c | 12 ++++----- 20 files changed, 61 insertions(+), 61 deletions(-) rename input/{ => drivers_joypad}/android_input_joypad.c (100%) rename input/{ => drivers_joypad}/apple_joypad_hid.c (98%) rename input/{ => drivers_joypad}/apple_joypad_ios.c (88%) rename input/{ => drivers_joypad}/gx_input_joypad.c (99%) rename input/{ => drivers_joypad}/gx_input_sicksaxis.c (100%) rename input/{ => drivers_joypad}/gx_input_sicksaxis.h (100%) rename input/{ => drivers_joypad}/linuxraw_joypad.c (99%) rename input/{ => drivers_joypad}/nullinput_joypad.c (98%) rename input/{ => drivers_joypad}/parport_joypad.c (99%) rename input/{ => drivers_joypad}/ps3_input_joypad.c (99%) rename input/{ => drivers_joypad}/psp_input_joypad.c (99%) rename input/{ => drivers_joypad}/qnx_input_joypad.c (98%) rename input/{ => drivers_joypad}/sdl_joypad.c (99%) rename input/{ => drivers_joypad}/udev_joypad.c (99%) rename input/{ => drivers_joypad}/winxinput_joypad.c (99%) rename input/{ => drivers_joypad}/xdk_xinput_input_joypad.c (99%) diff --git a/Makefile.common b/Makefile.common index 17d19f0ba4..d376983d73 100644 --- a/Makefile.common +++ b/Makefile.common @@ -62,7 +62,7 @@ endif ifneq ($(findstring Linux,$(OS)),) 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 ifeq ($(findstring Haiku,$(OS)),) @@ -143,7 +143,7 @@ OBJ += frontend/frontend.o \ gfx/nullgfx.o \ audio/drivers/nullaudio.o \ input/drivers/nullinput.o \ - input/nullinput_joypad.o \ + input/drivers_joypad/nullinput_joypad.o \ input/osk/nullosk.o \ playlist.o \ movie.o \ @@ -334,7 +334,7 @@ endif ifeq ($(HAVE_WINXINPUT), 1) DEFINES += -DHAVE_WINXINPUT -DHAVE_BUILTIN_AUTOCONFIG - OBJ += input/winxinput_joypad.o \ + OBJ += input/drivers_joypad/winxinput_joypad.o \ input/autoconf/builtin_win.o endif @@ -354,11 +354,11 @@ ifeq ($(HAVE_UDEV), 1) DEFINES += $(UDEV_CFLAGS) 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 ifeq ($(HAVE_PARPORT), 1) - OBJ += input/parport_joypad.o + OBJ += input/drivers_joypad/parport_joypad.o endif # Video @@ -449,7 +449,7 @@ ifeq ($(HAVE_SDL2), 1) endif 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) OBJ += gfx/context/sdl_gl_ctx.o @@ -461,7 +461,7 @@ ifeq ($(HAVE_SDL), 1) endif 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) OBJ += gfx/context/sdl_gl_ctx.o diff --git a/audio/drivers/gx_audio.c b/audio/drivers/gx_audio.c index af2f30a3d0..24da783d1c 100644 --- a/audio/drivers/gx_audio.c +++ b/audio/drivers/gx_audio.c @@ -17,7 +17,7 @@ #include "../../driver.h" #include #include -#include "../general.h" +#include "../../general.h" #include #ifdef GEKKO diff --git a/griffin/griffin.c b/griffin/griffin.c index b053b88a91..e99360894c 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -293,22 +293,22 @@ INPUT #if defined(__CELLOS_LV2__) #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" #elif defined(SN_TARGET_PSP2) || defined(PSP) #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" #elif defined(GEKKO) #ifdef HAVE_LIBSICKSAXIS -#include "../input/gx_input_sicksaxis.c" +#include "../input/drivers_joypad/gx_input_sicksaxis.c" #endif #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" #elif defined(_XBOX) #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" #elif defined(_WIN32) #include "../input/autoconf/builtin_win.c" @@ -316,12 +316,12 @@ INPUT #include "../input/drivers/xenon360_input.c" #elif defined(ANDROID) #include "../input/drivers/android_input.c" -#include "../input/android_input_joypad.c" +#include "../input/drivers_joypad/android_input_joypad.c" #elif defined(__APPLE__) #include "../input/drivers/apple_input.c" #elif defined(__QNX__) #include "../input/drivers/qnx_input.c" -#include "../input/qnx_input_joypad.c" +#include "../input/drivers_joypad/qnx_input_joypad.c" #elif defined(EMSCRIPTEN) #include "../input/drivers/rwebinput_input.c" #endif @@ -333,11 +333,11 @@ INPUT #include "../input/connect/connect_wii.c" #ifdef HAVE_HID -#include "../input/apple_joypad_hid.c" +#include "../input/drivers_joypad/apple_joypad_hid.c" #endif #ifdef IOS -#include "../input/apple_joypad_ios.c" +#include "../input/drivers_joypad/apple_joypad_ios.c" #endif #endif @@ -347,7 +347,7 @@ INPUT #endif #ifdef HAVE_WINXINPUT -#include "../input/winxinput_joypad.c" +#include "../input/drivers_joypad/winxinput_joypad.c" #endif #if defined(__CELLOS_LV2__) @@ -358,7 +358,7 @@ INPUT #if defined(__linux__) && !defined(ANDROID) #include "../input/drivers/linuxraw_input.c" -#include "../input/linuxraw_joypad.c" +#include "../input/drivers_joypad/linuxraw_joypad.c" #endif #ifdef HAVE_X11 @@ -367,11 +367,11 @@ INPUT #ifdef HAVE_UDEV #include "../input/drivers/udev_input.c" -#include "../input/udev_joypad.c" +#include "../input/drivers_joypad/udev_joypad.c" #endif #include "../input/drivers/nullinput.c" -#include "../input/nullinput_joypad.c" +#include "../input/drivers_joypad/nullinput_joypad.c" /*============================================================ KEYBOARD EVENT diff --git a/input/android_input_joypad.c b/input/drivers_joypad/android_input_joypad.c similarity index 100% rename from input/android_input_joypad.c rename to input/drivers_joypad/android_input_joypad.c diff --git a/input/apple_joypad_hid.c b/input/drivers_joypad/apple_joypad_hid.c similarity index 98% rename from input/apple_joypad_hid.c rename to input/drivers_joypad/apple_joypad_hid.c index c9e2eedbae..dce1ab63cb 100644 --- a/input/apple_joypad_hid.c +++ b/input/drivers_joypad/apple_joypad_hid.c @@ -16,10 +16,10 @@ #include #include -#include "drivers/apple_input.h" -#include "input_autodetect.h" -#include "input_common.h" -#include "../general.h" +#include "../drivers/apple_input.h" +#include "../input_autodetect.h" +#include "../input_common.h" +#include "../../general.h" struct pad_connection { diff --git a/input/apple_joypad_ios.c b/input/drivers_joypad/apple_joypad_ios.c similarity index 88% rename from input/apple_joypad_ios.c rename to input/drivers_joypad/apple_joypad_ios.c index 41e95b94b7..1e156f6625 100644 --- a/input/apple_joypad_ios.c +++ b/input/drivers_joypad/apple_joypad_ios.c @@ -14,16 +14,16 @@ * If not, see . */ -#include "drivers/apple_input.h" -#include "input_autodetect.h" -#include "input_common.h" -#include "../general.h" -#include "../apple/common/apple_gamecontroller.h" +#include "../drivers/apple_input.h" +#include "../input_autodetect.h" +#include "../input_common.h" +#include "../../general.h" +#include "../../apple/common/apple_gamecontroller.h" -#include "../apple/iOS/bluetooth/btdynamic.c" -#include "../apple/iOS/bluetooth/btpad.c" -#include "../apple/iOS/bluetooth/btpad_queue.c" -#include "connect/joypad_connection.h" +#include "../../apple/iOS/bluetooth/btdynamic.c" +#include "../../apple/iOS/bluetooth/btpad.c" +#include "../../apple/iOS/bluetooth/btpad_queue.c" +#include "../connect/joypad_connection.h" joypad_connection_t *slots; diff --git a/input/gx_input_joypad.c b/input/drivers_joypad/gx_input_joypad.c similarity index 99% rename from input/gx_input_joypad.c rename to input/drivers_joypad/gx_input_joypad.c index 0695f44784..48fb13fa98 100644 --- a/input/gx_input_joypad.c +++ b/input/drivers_joypad/gx_input_joypad.c @@ -15,7 +15,7 @@ * If not, see . */ -#include "input_autodetect.h" +#include "../input_autodetect.h" #ifdef HW_RVL #include #include diff --git a/input/gx_input_sicksaxis.c b/input/drivers_joypad/gx_input_sicksaxis.c similarity index 100% rename from input/gx_input_sicksaxis.c rename to input/drivers_joypad/gx_input_sicksaxis.c diff --git a/input/gx_input_sicksaxis.h b/input/drivers_joypad/gx_input_sicksaxis.h similarity index 100% rename from input/gx_input_sicksaxis.h rename to input/drivers_joypad/gx_input_sicksaxis.h diff --git a/input/linuxraw_joypad.c b/input/drivers_joypad/linuxraw_joypad.c similarity index 99% rename from input/linuxraw_joypad.c rename to input/drivers_joypad/linuxraw_joypad.c index a7d3ddd5d7..62759f7ebe 100644 --- a/input/linuxraw_joypad.c +++ b/input/drivers_joypad/linuxraw_joypad.c @@ -14,9 +14,9 @@ * If not, see . */ -#include "input_autodetect.h" -#include "input_common.h" -#include "../general.h" +#include "../input_autodetect.h" +#include "../input_common.h" +#include "../../general.h" #include #include #include diff --git a/input/nullinput_joypad.c b/input/drivers_joypad/nullinput_joypad.c similarity index 98% rename from input/nullinput_joypad.c rename to input/drivers_joypad/nullinput_joypad.c index dab608af74..472c8c000f 100644 --- a/input/nullinput_joypad.c +++ b/input/drivers_joypad/nullinput_joypad.c @@ -18,7 +18,7 @@ #include #include #include -#include "input_context.h" +#include "../input_context.h" static const char *null_joypad_name(unsigned pad) { diff --git a/input/parport_joypad.c b/input/drivers_joypad/parport_joypad.c similarity index 99% rename from input/parport_joypad.c rename to input/drivers_joypad/parport_joypad.c index 8d7a316d42..45f1681e66 100644 --- a/input/parport_joypad.c +++ b/input/drivers_joypad/parport_joypad.c @@ -13,9 +13,9 @@ * If not, see . */ -#include "input_autodetect.h" -#include "input_common.h" -#include "../general.h" +#include "../input_autodetect.h" +#include "../input_common.h" +#include "../../general.h" #include #include #include diff --git a/input/ps3_input_joypad.c b/input/drivers_joypad/ps3_input_joypad.c similarity index 99% rename from input/ps3_input_joypad.c rename to input/drivers_joypad/ps3_input_joypad.c index 66b75950aa..ea82a9f10a 100644 --- a/input/ps3_input_joypad.c +++ b/input/drivers_joypad/ps3_input_joypad.c @@ -14,7 +14,7 @@ * If not, see . */ -#include "input_autodetect.h" +#include "../input_autodetect.h" static uint64_t pad_state[MAX_PADS]; static int16_t analog_state[MAX_PADS][2][2]; diff --git a/input/psp_input_joypad.c b/input/drivers_joypad/psp_input_joypad.c similarity index 99% rename from input/psp_input_joypad.c rename to input/drivers_joypad/psp_input_joypad.c index 141b4e3cd9..a705e8cfb1 100644 --- a/input/psp_input_joypad.c +++ b/input/drivers_joypad/psp_input_joypad.c @@ -14,7 +14,7 @@ * If not, see . */ -#include "input_autodetect.h" +#include "../input_autodetect.h" static uint64_t pad_state; static int16_t analog_state[1][2][2]; diff --git a/input/qnx_input_joypad.c b/input/drivers_joypad/qnx_input_joypad.c similarity index 98% rename from input/qnx_input_joypad.c rename to input/drivers_joypad/qnx_input_joypad.c index 8b9319d8b9..e19c6ade47 100644 --- a/input/qnx_input_joypad.c +++ b/input/drivers_joypad/qnx_input_joypad.c @@ -15,7 +15,7 @@ * If not, see . */ -#include "input_autodetect.h" +#include "../input_autodetect.h" static const char *qnx_joypad_name(unsigned pad) { diff --git a/input/sdl_joypad.c b/input/drivers_joypad/sdl_joypad.c similarity index 99% rename from input/sdl_joypad.c rename to input/drivers_joypad/sdl_joypad.c index 3374912393..d1e3c765a1 100644 --- a/input/sdl_joypad.c +++ b/input/drivers_joypad/sdl_joypad.c @@ -14,10 +14,10 @@ * If not, see . */ -#include "input_autodetect.h" -#include "input_common.h" +#include "../input_autodetect.h" +#include "../input_common.h" #include "SDL.h" -#include "../general.h" +#include "../../general.h" typedef struct _sdl_joypad { diff --git a/input/udev_joypad.c b/input/drivers_joypad/udev_joypad.c similarity index 99% rename from input/udev_joypad.c rename to input/drivers_joypad/udev_joypad.c index 0a4aa1e328..288074b6cc 100644 --- a/input/udev_joypad.c +++ b/input/drivers_joypad/udev_joypad.c @@ -13,9 +13,9 @@ * If not, see . */ -#include "input_autodetect.h" -#include "input_common.h" -#include "../general.h" +#include "../input_autodetect.h" +#include "../input_common.h" +#include "../../general.h" #include #include #include diff --git a/input/winxinput_joypad.c b/input/drivers_joypad/winxinput_joypad.c similarity index 99% rename from input/winxinput_joypad.c rename to input/drivers_joypad/winxinput_joypad.c index 48d7421c99..789c739cf7 100644 --- a/input/winxinput_joypad.c +++ b/input/drivers_joypad/winxinput_joypad.c @@ -20,10 +20,10 @@ // Some wrappers for other controllers also simulate xinput (as it is easier to implement) // so this may be useful for those also. -#include "input_autodetect.h" -#include "input_common.h" +#include "../input_autodetect.h" +#include "../input_common.h" -#include "../general.h" +#include "../../general.h" #include #include diff --git a/input/xdk_xinput_input_joypad.c b/input/drivers_joypad/xdk_xinput_input_joypad.c similarity index 99% rename from input/xdk_xinput_input_joypad.c rename to input/drivers_joypad/xdk_xinput_input_joypad.c index 77afc5c98c..6caee605fc 100644 --- a/input/xdk_xinput_input_joypad.c +++ b/input/drivers_joypad/xdk_xinput_input_joypad.c @@ -14,7 +14,7 @@ * If not, see . */ -#include "input_autodetect.h" +#include "../input_autodetect.h" static uint64_t pad_state[MAX_PADS]; static int16_t analog_state[MAX_PADS][2][2]; diff --git a/tools/retroarch-joyconfig-griffin.c b/tools/retroarch-joyconfig-griffin.c index f653d14c14..a55b82ed1e 100644 --- a/tools/retroarch-joyconfig-griffin.c +++ b/tools/retroarch-joyconfig-griffin.c @@ -18,7 +18,7 @@ #if defined(__linux) && !defined(ANDROID) #include "../input/drivers/linuxraw_input.c" -#include "../input/linuxraw_joypad.c" +#include "../input/drivers_joypad/linuxraw_joypad.c" #endif #if defined(HAVE_DINPUT) @@ -26,19 +26,19 @@ #endif #if defined(HAVE_WINXINPUT) -#include "../input/winxinput_joypad.c" +#include "../input/drivers_joypad/winxinput_joypad.c" #endif #if defined(HAVE_UDEV) -#include "../input/udev_joypad.c" +#include "../input/drivers_joypad/udev_joypad.c" #endif #if defined(HAVE_PARPORT) -#include "../input/parport_joypad.c" +#include "../input/drivers_joypad/parport_joypad.c" #endif #if defined(HAVE_SDL) || defined(HAVE_SDL2) -#include "../input/sdl_joypad.c" +#include "../input/drivers_joypad/sdl_joypad.c" #endif #include "../libretro-sdk/file/config_file.c" @@ -47,7 +47,7 @@ #include "../libretro-sdk/compat/compat.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_joypad.c"