Merge input_driver.c with retroarch.c

Makefile.common

@@ -207,7 +207,6 @@ OBJ += frontend/frontend.o \
        $(LIBRETRO_COMM_DIR)/hash/rhash.o \
        $(LIBRETRO_COMM_DIR)/audio/audio_mixer.o \
        input/common/input_hid_common.o \
-       input/input_driver.o \
        input/input_mapper.o \
        led/led_driver.o \
        led/drivers/led_null.o \

griffin/griffin.c

@@ -888,7 +888,6 @@ DRIVERS
 #include "../gfx/video_crt_switch.c"
 #include "../gfx/video_display_server.c"
 #include "../gfx/video_coord_array.c"
-#include "../input/input_driver.c"
 #include "../libretro-common/audio/audio_mixer.c"
 
 /*============================================================

input/input_driver.h

@@ -310,46 +310,26 @@ void input_poll(void);
  *
  * Input state callback function.
  *
- * Returns: Non-zero if the given key (identified by @id) was pressed by the user
+ * Returns: Non-zero if the given key (identified by @id) 
+ * was pressed by the user
  * (assigned to @port).
  **/
 int16_t input_state(unsigned port, unsigned device,
       unsigned idx, unsigned id);
 
-void input_keys_pressed(void *data, input_bits_t* new_state);
-
-#ifdef HAVE_MENU
-void input_menu_keys_pressed(void *data, input_bits_t* new_state);
-#endif
-
 void *input_driver_get_data(void);
 
-void input_get_state_for_port(void *data, unsigned port, input_bits_t *p_new_state);
+void input_get_state_for_port(
+      void *data, unsigned port, input_bits_t *p_new_state);
 
 const input_driver_t *input_get_ptr(void);
 
 void *input_get_data(void);
 
-const input_driver_t **input_get_double_ptr(void);
-
 void **input_driver_get_data_ptr(void);
 
 bool input_driver_has_capabilities(void);
 
-bool input_driver_init(void);
-
-void input_driver_deinit(void);
-
-void input_driver_destroy_data(void);
-
-void input_driver_destroy(void);
-
-bool input_driver_grab_stdin(void);
-
-bool input_driver_keyboard_mapping_is_blocked(void);
-
-bool input_driver_find_driver(void);
-
 void input_driver_set_flushing_input(void);
 
 void input_driver_unset_hotkey_block(void);
@@ -366,8 +346,6 @@ void input_driver_set_nonblock_state(void);
 
 void input_driver_unset_nonblock_state(void);
 
-bool input_driver_is_nonblock_state(void);
-
 void input_driver_set_own_driver(void);
 
 void input_driver_unset_own_driver(void);
@@ -397,8 +375,6 @@ float *input_driver_get_float(enum input_action action);
 
 unsigned *input_driver_get_uint(enum input_action action);
 
-bool input_driver_is_data_ptr_same(void *data);
-
 /**
  * joypad_driver_find_handle:
  * @index              : index of driver to get handle to.
@@ -437,16 +413,8 @@ const char* config_get_joypad_driver_options(void);
  *
  * Returns: joypad driver if found, otherwise NULL.
  **/
-const input_device_driver_t *input_joypad_init_driver(const char *ident, void *data);
-
-/**
- * input_joypad_init_first:
- *
- * Finds first suitable joypad driver and initializes.
- *
- * Returns: joypad driver if found, otherwise NULL.
- **/
-const input_device_driver_t *input_joypad_init_first(void *data);
+const input_device_driver_t *input_joypad_init_driver(
+      const char *ident, void *data);
 
 /**
  * input_conv_analog_id_to_bind_id:
@@ -551,7 +519,8 @@ bool input_joypad_set_rumble(const input_device_driver_t *driver,
  * Returns: true (1) if axis was pressed, otherwise
  * false (0).
  **/
-static INLINE int16_t input_joypad_axis_raw(const input_device_driver_t *drv,
+static INLINE int16_t input_joypad_axis_raw(
+      const input_device_driver_t *drv,
       unsigned port, unsigned axis)
 {
    if (!drv)
@@ -610,23 +579,6 @@ void input_pad_connect(unsigned port, input_device_driver_t *driver);
  **/
 bool input_mouse_button_raw(unsigned port, unsigned button);
 
-/**
- * input_joypad_name:
- * @drv                     : Input device driver handle.
- * @port                    : Joystick number.
- *
- * Gets name of the joystick (@port).
- *
- * Returns: name of joystick #port.
- **/
-static INLINE const char *input_joypad_name(const input_device_driver_t *drv,
-      unsigned port)
-{
-   if (!drv)
-      return NULL;
-   return drv->name(port);
-}
-
 #ifdef HAVE_HID
 
 #include "include/hid_driver.h"
@@ -721,7 +673,6 @@ bool input_keyboard_ctl(enum rarch_input_keyboard_ctl_state state, void *data);
 
 extern struct retro_keybind input_config_binds[MAX_USERS][RARCH_BIND_LIST_END];
 extern struct retro_keybind input_autoconf_binds[MAX_USERS][RARCH_BIND_LIST_END];
-extern const struct retro_keybind *libretro_input_binds[MAX_USERS];
 extern char input_device_names[MAX_USERS][64];
 
 const char *input_config_bind_map_get_base(unsigned i);