From a6ccc188a8f7762d59258c71ff4d85d6632fb984 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 28 Nov 2015 02:22:46 +0100 Subject: [PATCH] Rename input_common.c to input_config.c --- Makefile.common | 2 +- configuration.c | 2 +- gfx/video_state_python.c | 2 +- gfx/video_state_tracker.c | 2 +- griffin/griffin.c | 2 +- input/autoconf/builtin.h | 3 ++- input/connect/joypad_connection.h | 2 +- input/drivers/android_input.c | 2 +- input/drivers/apple_keycode.h | 2 +- input/drivers/cocoa_input.c | 2 +- input/drivers/ctr_input.c | 2 +- input/drivers/dinput.c | 2 +- input/drivers/linuxraw_input.c | 1 - input/drivers/psp_input.c | 2 +- input/drivers/rwebinput_input.c | 3 +-- input/drivers/sdl_input.c | 2 +- input/drivers/udev_input.c | 2 +- input/drivers/x11_input.c | 2 +- input/drivers_joypad/dinput_joypad.c | 2 +- input/drivers_joypad/hid_joypad.c | 1 - input/drivers_joypad/xinput_joypad.c | 2 +- input/drivers_keyboard/keyboard_event_apple.c | 2 +- input/drivers_keyboard/keyboard_event_win32.cpp | 2 +- input/input_autodetect.c | 2 +- input/{input_common.c => input_config.c} | 2 +- input/{input_common.h => input_config.h} | 4 ++-- input/input_overlay.c | 1 - libretro_version_1.c | 1 - menu/drivers/menu_generic.c | 2 +- menu/menu_displaylist.c | 2 +- menu/menu_input.c | 2 +- menu/menu_setting.c | 2 +- runloop.c | 1 - tasks/task_overlay.c | 2 +- ui/drivers/cocoa/cocoatouch_menu.m | 2 +- 35 files changed, 32 insertions(+), 37 deletions(-) rename input/{input_common.c => input_config.c} (99%) rename input/{input_common.h => input_config.h} (97%) diff --git a/Makefile.common b/Makefile.common index 7a3aedca2d..1a535389cd 100644 --- a/Makefile.common +++ b/Makefile.common @@ -162,7 +162,7 @@ OBJ += frontend/frontend.o \ input/input_autodetect.o \ input/input_joypad_driver.o \ input/input_joypad.o \ - input/input_common.o \ + input/input_config.o \ input/input_keymaps.o \ input/input_remapping.o \ tasks/task_overlay.o \ diff --git a/configuration.c b/configuration.c index a804e5e02f..df1660f738 100644 --- a/configuration.c +++ b/configuration.c @@ -24,7 +24,7 @@ #include "audio/audio_driver.h" #include "config.def.h" -#include "input/input_common.h" +#include "input/input_config.h" #include "input/input_keymaps.h" #include "input/input_remapping.h" #include "general.h" diff --git a/gfx/video_state_python.c b/gfx/video_state_python.c index 9bc0aed54c..3ff7d7bb56 100644 --- a/gfx/video_state_python.c +++ b/gfx/video_state_python.c @@ -27,7 +27,7 @@ #include "../libretro.h" #include "../general.h" #include "../verbosity.h" -#include "../input/input_common.h" +#include "../input/input_config.h" #include "../file_ops.h" static PyObject* py_read_wram(PyObject *self, PyObject *args) diff --git a/gfx/video_state_tracker.c b/gfx/video_state_tracker.c index d2ec2530fd..1dc126bf23 100644 --- a/gfx/video_state_tracker.c +++ b/gfx/video_state_tracker.c @@ -19,7 +19,7 @@ #include #include #include "../general.h" -#include "../input/input_common.h" +#include "../input/input_config.h" #include "../verbosity.h" #ifdef HAVE_PYTHON diff --git a/griffin/griffin.c b/griffin/griffin.c index c6ecc3fb57..845b03f22e 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -311,7 +311,7 @@ INPUT #include "../input/input_joypad_driver.c" #include "../input/input_joypad.c" #include "../input/input_hid_driver.c" -#include "../input/input_common.c" +#include "../input/input_config.c" #include "../input/input_keymaps.c" #include "../input/input_remapping.c" #include "../input/keyboard_line.c" diff --git a/input/autoconf/builtin.h b/input/autoconf/builtin.h index 7a25b250f4..6a9896150e 100644 --- a/input/autoconf/builtin.h +++ b/input/autoconf/builtin.h @@ -17,7 +17,8 @@ #ifndef AUTOCONF_BUILTIN_H__ #define AUTOCONF_BUILTIN_H__ -#include "../input_common.h" +#include "../input_config.h" + #define DECL_BTN(btn, bind) "input_" #btn "_btn = " #bind "\n" #define DECL_AXIS(axis, bind) "input_" #axis "_axis = " #bind "\n" #define DECL_MENU(btn) "input_menu_toggle_btn = " #btn "\n" diff --git a/input/connect/joypad_connection.h b/input/connect/joypad_connection.h index 34898b06be..d1e5788882 100644 --- a/input/connect/joypad_connection.h +++ b/input/connect/joypad_connection.h @@ -19,7 +19,7 @@ #include #include -#include "../input_common.h" +#include "../input_config.h" typedef void (*send_control_t)(void *data, uint8_t *buf, size_t size); diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index fe3a15e457..c4e21bb4ee 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -24,7 +24,7 @@ #include "../../frontend/drivers/platform_linux.h" #include "../input_autodetect.h" -#include "../input_common.h" +#include "../input_config.h" #include "../input_joypad.h" #include "../../performance.h" #include "../../general.h" diff --git a/input/drivers/apple_keycode.h b/input/drivers/apple_keycode.h index f433e3df1d..5078434eda 100644 --- a/input/drivers/apple_keycode.h +++ b/input/drivers/apple_keycode.h @@ -156,6 +156,6 @@ enum KEY_RightGUI = 231 }; -#include "../input_common.h" +#include "../input_config.h" #endif diff --git a/input/drivers/cocoa_input.c b/input/drivers/cocoa_input.c index 2e32cb444f..f69a136b0f 100644 --- a/input/drivers/cocoa_input.c +++ b/input/drivers/cocoa_input.c @@ -17,7 +17,7 @@ #include #include -#include "../input_common.h" +#include "../input_config.h" #include "../input_joypad.h" #include "../input_keymaps.h" #include "cocoa_input.h" diff --git a/input/drivers/ctr_input.c b/input/drivers/ctr_input.c index c7e4bc3fac..a0e4e18b6b 100644 --- a/input/drivers/ctr_input.c +++ b/input/drivers/ctr_input.c @@ -20,7 +20,7 @@ #include "../../driver.h" #include "../../libretro.h" #include "../../general.h" -#include "../input_common.h" +#include "../input_config.h" #include "../input_joypad.h" #define MAX_PADS 1 diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c index 0a5ec7bbb9..2f83b639e3 100644 --- a/input/drivers/dinput.c +++ b/input/drivers/dinput.c @@ -37,7 +37,7 @@ #include "../../general.h" #include "../../verbosity.h" #include "../input_autodetect.h" -#include "../input_common.h" +#include "../input_config.h" #include "../input_joypad.h" #include "../input_keymaps.h" diff --git a/input/drivers/linuxraw_input.c b/input/drivers/linuxraw_input.c index c8cc833ae2..4f274feef3 100644 --- a/input/drivers/linuxraw_input.c +++ b/input/drivers/linuxraw_input.c @@ -28,7 +28,6 @@ #include "../common/linux_common.h" #include "../input_keymaps.h" -#include "../input_common.h" #include "../input_joypad.h" typedef struct linuxraw_input diff --git a/input/drivers/psp_input.c b/input/drivers/psp_input.c index 3a42e6cdde..7eb47c3cf5 100644 --- a/input/drivers/psp_input.c +++ b/input/drivers/psp_input.c @@ -34,7 +34,7 @@ #include "../../driver.h" #include "../../libretro.h" #include "../../general.h" -#include "../input_common.h" +#include "../input_config.h" #ifdef HAVE_KERNEL_PRX #include "../../bootstrap/psp1/kernel_functions.h" #endif diff --git a/input/drivers/rwebinput_input.c b/input/drivers/rwebinput_input.c index 203b47a675..31c521613a 100644 --- a/input/drivers/rwebinput_input.c +++ b/input/drivers/rwebinput_input.c @@ -19,9 +19,8 @@ #include "../input_joypad.h" #include "../input_autodetect.h" -#include "../input_common.h" +#include "../input_config.h" #include "../input_keymaps.h" -//#include "../input_joypad.h" #include "../../driver.h" diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c index c4f771b541..5d1a6c9700 100644 --- a/input/drivers/sdl_input.c +++ b/input/drivers/sdl_input.c @@ -27,7 +27,7 @@ #include "../../verbosity.h" #include "../../libretro.h" #include "../input_autodetect.h" -#include "../input_common.h" +#include "../input_config.h" #include "../input_joypad.h" #include "../input_keymaps.h" #include "../keyboard_line.h" diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c index 1e743fabf6..863145e939 100644 --- a/input/drivers/udev_input.c +++ b/input/drivers/udev_input.c @@ -36,7 +36,7 @@ #include "../common/linux_common.h" -#include "../input_common.h" +#include "../input_config.h" #include "../input_joypad.h" #include "../input_keymaps.h" #include "../../general.h" diff --git a/input/drivers/x11_input.c b/input/drivers/x11_input.c index c89557c0ed..a13e97166d 100644 --- a/input/drivers/x11_input.c +++ b/input/drivers/x11_input.c @@ -22,7 +22,7 @@ #include -#include "../input_common.h" +#include "../input_config.h" #include "../input_joypad.h" #include "../input_keymaps.h" diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c index 488fdcd413..e5d57d3ed1 100644 --- a/input/drivers_joypad/dinput_joypad.c +++ b/input/drivers_joypad/dinput_joypad.c @@ -26,7 +26,7 @@ #include "../../general.h" #include "../../verbosity.h" #include "../input_autodetect.h" -#include "../input_common.h" +#include "../input_config.h" #include "../input_joypad.h" #include "../input_keymaps.h" diff --git a/input/drivers_joypad/hid_joypad.c b/input/drivers_joypad/hid_joypad.c index 6037851a48..410838858a 100644 --- a/input/drivers_joypad/hid_joypad.c +++ b/input/drivers_joypad/hid_joypad.c @@ -15,7 +15,6 @@ */ #include "../input_autodetect.h" -#include "../input_common.h" #include "../input_hid_driver.h" #include "../../driver.h" diff --git a/input/drivers_joypad/xinput_joypad.c b/input/drivers_joypad/xinput_joypad.c index 11538c6777..e3c8a52f28 100644 --- a/input/drivers_joypad/xinput_joypad.c +++ b/input/drivers_joypad/xinput_joypad.c @@ -30,7 +30,7 @@ #include #include "../input_autodetect.h" -#include "../input_common.h" +#include "../input_config.h" #include "../../general.h" #include "../../verbosity.h" diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c index 46aa3bbace..e172c531dc 100644 --- a/input/drivers_keyboard/keyboard_event_apple.c +++ b/input/drivers_keyboard/keyboard_event_apple.c @@ -17,7 +17,7 @@ #include #include -#include "../input_common.h" +#include "../input_config.h" #include "../input_keymaps.h" #include "../keyboard_line.h" #include "../drivers/cocoa_input.h" diff --git a/input/drivers_keyboard/keyboard_event_win32.cpp b/input/drivers_keyboard/keyboard_event_win32.cpp index cf12703e4d..12f23e477f 100644 --- a/input/drivers_keyboard/keyboard_event_win32.cpp +++ b/input/drivers_keyboard/keyboard_event_win32.cpp @@ -17,7 +17,7 @@ #include "../../general.h" #include "../keyboard_line.h" #include "../../gfx/common/win32_common.h" -#include "../input_common.h" +#include "../input_config.h" #include "../input_keymaps.h" LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message, diff --git a/input/input_autodetect.c b/input/input_autodetect.c index 09a42235c4..288ed879b5 100644 --- a/input/input_autodetect.c +++ b/input/input_autodetect.c @@ -21,7 +21,7 @@ #include #include -#include "input_common.h" +#include "input_config.h" #include "input_autodetect.h" #include "../general.h" diff --git a/input/input_common.c b/input/input_config.c similarity index 99% rename from input/input_common.c rename to input/input_config.c index 9658f72fa8..1deb2881ce 100644 --- a/input/input_common.c +++ b/input/input_config.c @@ -20,7 +20,7 @@ #include -#include "input_common.h" +#include "input_config.h" #include "input_keymaps.h" #include "input_remapping.h" diff --git a/input/input_common.h b/input/input_config.h similarity index 97% rename from input/input_common.h rename to input/input_config.h index 128f1266f4..7e3ce3b341 100644 --- a/input/input_common.h +++ b/input/input_config.h @@ -14,8 +14,8 @@ * If not, see . */ -#ifndef INPUT_COMMON_H__ -#define INPUT_COMMON_H__ +#ifndef INPUT_CONFIG_H__ +#define INPUT_CONFIG_H__ #include #include diff --git a/input/input_overlay.c b/input/input_overlay.c index 4a85ad6a71..72bca1029a 100644 --- a/input/input_overlay.c +++ b/input/input_overlay.c @@ -34,7 +34,6 @@ #include "../configuration.h" #include "../verbosity.h" #include "../tasks/tasks.h" -#include "input_common.h" struct input_overlay { diff --git a/libretro_version_1.c b/libretro_version_1.c index 9cb640eafa..dc08d02915 100644 --- a/libretro_version_1.c +++ b/libretro_version_1.c @@ -27,7 +27,6 @@ #include "libretro.h" #include "general.h" #include "rewind.h" -#include "input/input_common.h" #include "gfx/video_driver.h" #include "audio/audio_driver.h" diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c index da3f6cee81..166b1196ec 100644 --- a/menu/drivers/menu_generic.c +++ b/menu/drivers/menu_generic.c @@ -29,7 +29,7 @@ #include "../../configuration.h" #include "../../performance.h" #include "../../input/input_autodetect.h" -#include "../../input/input_common.h" +#include "../../input/input_config.h" #include "../../cheevos.h" #include "../../runloop.h" diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 92e82d58d4..329da204cc 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -33,7 +33,7 @@ #include "../config.features.h" #include "../git_version.h" #include "../file_ext.h" -#include "../input/input_common.h" +#include "../input/input_config.h" #include "../dir_list_special.h" #include "../string_list_special.h" #include "../cheevos.h" diff --git a/menu/menu_input.c b/menu/menu_input.c index 5e20e32f37..7b7487457c 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -38,7 +38,7 @@ #include "../performance.h" #include "../input/input_joypad.h" #include "../input/input_remapping.h" -#include "../input/input_common.h" +#include "../input/input_config.h" enum menu_mouse_action { diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 89da069699..a269fdb432 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -40,7 +40,7 @@ #include "../dynamic.h" #include "../audio/audio_driver.h" #include "../audio/audio_resampler_driver.h" -#include "../input/input_common.h" +#include "../input/input_config.h" #include "../input/input_autodetect.h" #include "../config.def.h" #include "../file_ext.h" diff --git a/runloop.c b/runloop.c index 1b03ee9404..9404adb7f8 100644 --- a/runloop.c +++ b/runloop.c @@ -36,7 +36,6 @@ #include "msg_hash.h" #include "input/keyboard_line.h" -#include "input/input_common.h" #include "input/input_driver.h" #ifdef HAVE_MENU diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c index 9c657bc28f..4d7b28bf2c 100644 --- a/tasks/task_overlay.c +++ b/tasks/task_overlay.c @@ -21,7 +21,7 @@ #include #include "tasks.h" -#include "../input/input_common.h" +#include "../input/input_config.h" #include "../input/input_overlay.h" #include "../configuration.h" #include "../verbosity.h" diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m index 15fe93f703..6890e7080b 100644 --- a/ui/drivers/cocoa/cocoatouch_menu.m +++ b/ui/drivers/cocoa/cocoatouch_menu.m @@ -21,7 +21,7 @@ #include #include "cocoa_common.h" -#include "../../../input/input_common.h" +#include "../../../input/input_config.h" #include "../../../input/input_keymaps.h" #include "../../../input/drivers/cocoa_input.h"