Rename input_common.c to input_config.c

2024-11-23 16:09:47 +00:00 · 2015-11-28 02:22:46 +01:00 · 2015-11-28 02:22:46 +01:00 · a6ccc188a8
commit a6ccc188a8
parent bbe9927eea
35 changed files with 32 additions and 37 deletions
--- 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 \
--- 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"
--- 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)
--- a/gfx/video_state_tracker.c
+++ b/gfx/video_state_tracker.c
@ -19,7 +19,7 @@
 #include <compat/strl.h>
 #include <retro_inline.h>
 #include "../general.h"
-#include "../input/input_common.h"
+#include "../input/input_config.h"
 #include "../verbosity.h"

 #ifdef HAVE_PYTHON
--- 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"
--- 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"
--- a/input/connect/joypad_connection.h
+++ b/input/connect/joypad_connection.h
@ -19,7 +19,7 @@

 #include <stdint.h>
 #include <stddef.h>
-#include "../input_common.h"
+#include "../input_config.h"

 typedef void (*send_control_t)(void *data, uint8_t *buf, size_t size);

--- 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"
--- 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
--- a/input/drivers/cocoa_input.c
+++ b/input/drivers/cocoa_input.c
@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <unistd.h>

-#include "../input_common.h"
+#include "../input_config.h"
 #include "../input_joypad.h"
 #include "../input_keymaps.h"
 #include "cocoa_input.h"
--- 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
--- 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"

--- 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
--- 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
--- 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"

--- 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"
--- 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"
--- a/input/drivers/x11_input.c
+++ b/input/drivers/x11_input.c
@ -22,7 +22,7 @@

 #include <boolean.h>

-#include "../input_common.h"
+#include "../input_config.h"
 #include "../input_joypad.h"
 #include "../input_keymaps.h"

--- 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"

--- 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"

--- a/input/drivers_joypad/xinput_joypad.c
+++ b/input/drivers_joypad/xinput_joypad.c
@ -30,7 +30,7 @@
 #include <boolean.h>

 #include "../input_autodetect.h"
-#include "../input_common.h"
+#include "../input_config.h"

 #include "../../general.h"
 #include "../../verbosity.h"
--- a/input/drivers_keyboard/keyboard_event_apple.c
+++ b/input/drivers_keyboard/keyboard_event_apple.c
@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <unistd.h>

-#include "../input_common.h"
+#include "../input_config.h"
 #include "../input_keymaps.h"
 #include "../keyboard_line.h"
 #include "../drivers/cocoa_input.h"
--- 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,
--- a/input/input_autodetect.c
+++ b/input/input_autodetect.c
@ -21,7 +21,7 @@
 #include <file/dir_list.h>
 #include <file/file_path.h>

-#include "input_common.h"
+#include "input_config.h"
 #include "input_autodetect.h"

 #include "../general.h"
--- a/input/input_config.c
+++ b/input/input_config.c
@ -20,7 +20,7 @@

 #include <file/file_path.h>

-#include "input_common.h"
+#include "input_config.h"
 #include "input_keymaps.h"
 #include "input_remapping.h"

--- a/input/input_config.h
+++ b/input/input_config.h
@ -14,8 +14,8 @@
 *  If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef INPUT_COMMON_H__
-#define INPUT_COMMON_H__
+#ifndef INPUT_CONFIG_H__
+#define INPUT_CONFIG_H__

 #include <file/config_file.h>
 #include <stdint.h>
--- 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
 {
--- 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"

--- 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"
--- 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"
--- 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
 {
--- 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"
--- 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
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@ -21,7 +21,7 @@
 #include <rhash.h>
 #include "tasks.h"

-#include "../input/input_common.h"
+#include "../input/input_config.h"
 #include "../input/input_overlay.h"
 #include "../configuration.h"
 #include "../verbosity.h"
--- a/ui/drivers/cocoa/cocoatouch_menu.m
+++ b/ui/drivers/cocoa/cocoatouch_menu.m
@ -21,7 +21,7 @@
 #include <retro_miscellaneous.h>

 #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"