Merge dynamic.c into retroarch.c

Makefile.common

@@ -213,7 +213,6 @@ OBJ += frontend/frontend.o \
        gfx/video_crt_switch.o \
        configuration.o \
        $(LIBRETRO_COMM_DIR)/dynamic/dylib.o \
-       dynamic.o \
        cores/dynamic_dummy.o \
        $(LIBRETRO_COMM_DIR)/queues/message_queue.o \
        managers/state_manager.o \

core.h

@@ -174,8 +174,6 @@ bool core_run(void);
 
 bool core_init(void);
 
-bool core_deinit(void *data);
-
 bool core_unload_game(void);
 
 bool core_reset(void);
@@ -216,22 +214,12 @@ bool core_set_controller_port_device(retro_ctx_controller_info_t *pad);
 
 bool core_has_set_input_descriptor(void);
 
-void core_set_input_descriptors(void);
-
-void core_unset_input_descriptors(void);
-
-bool core_uninit_libretro_callbacks(void);
-
 void core_uninit_symbols(void);
 
-void core_set_input_state(retro_ctx_input_state_info_t *info);
-
 bool core_is_symbols_inited(void);
 
 bool core_is_inited(void);
 
-bool core_is_game_loaded(void);
-
 void core_free_retro_game_info(struct retro_game_info *dest);
 
 RETRO_END_DECLS

driver.h

@@ -87,11 +87,6 @@ enum driver_ctl_state
     * calls audio_monitor_set_refresh_rate(). */
    RARCH_DRIVER_CTL_SET_REFRESH_RATE,
 
-   /* Update the system Audio/Video information.
-    * Will reinitialize audio/video drivers.
-    * Used by RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO. */
-   RARCH_DRIVER_CTL_UPDATE_SYSTEM_AV_INFO,
-
    RARCH_DRIVER_CTL_FIND_FIRST,
 
    RARCH_DRIVER_CTL_FIND_LAST,

dynamic.h

@@ -120,32 +120,6 @@ struct retro_core_t
 
 bool libretro_get_shared_context(void);
 
-/**
- * init_libretro_sym:
- * @type                        : Type of core to be loaded.
- *                                If CORE_TYPE_DUMMY, will
- *                                load dummy symbols.
- *
- * Initializes libretro symbols and
- * setups environment callback functions. Returns true on success,
- * or false if symbols could not be loaded.
- **/
-bool init_libretro_sym(enum rarch_core_type type,
-      struct retro_core_t *core);
-
-bool init_libretro_sym_custom(enum rarch_core_type type, struct retro_core_t *current_core, const char *lib_path, void *lib_handle_p);
-
-/**
- * uninit_libretro_sym:
- *
- * Frees libretro core.
- *
- * Frees all core options,
- * associated state, and
- * unbind all libretro callback symbols.
- **/
-void uninit_libretro_sym(struct retro_core_t *core);
-
 /* Arbitrary twenty subsystems limite */
 #define SUBSYSTEM_MAX_SUBSYSTEMS 20
 /* Arbitrary 10 roms for each subsystem limit */

griffin/griffin.c

@@ -918,7 +918,6 @@ FILTERS
 DYNAMIC
 ============================================================ */
 #include "../libretro-common/dynamic/dylib.c"
-#include "../dynamic.c"
 #include "../gfx/video_filter.c"
 #include "../libretro-common/audio/dsp_filter.c"
 

input/input_driver.h

@@ -244,22 +244,6 @@ bool input_sensor_set_state(unsigned port,
 
 float input_sensor_get_input(unsigned port, unsigned id);
 
-/**
- * input_state:
- * @port                 : user number.
- * @device               : device identifier of user.
- * @idx                  : index value of user.
- * @id                   : identifier of key pressed by user.
- *
- * Input state callback function.
- *
- * 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_driver_get_data(void);
 
 void input_get_state_for_port(
@@ -269,10 +253,6 @@ const input_driver_t *input_get_ptr(void);
 
 void *input_get_data(void);
 
-void **input_driver_get_data_ptr(void);
-
-bool input_driver_has_capabilities(void);
-
 void input_driver_set_flushing_input(void);
 
 void input_driver_unset_hotkey_block(void);

retroarch.h

@@ -116,7 +116,6 @@ enum rarch_ctl_state
 
    RARCH_CTL_FRAME_TIME_FREE,
    RARCH_CTL_SET_FRAME_TIME_LAST,
-   RARCH_CTL_SET_FRAME_TIME,
 
    RARCH_CTL_IS_IDLE,
    RARCH_CTL_SET_IDLE,
@@ -176,11 +175,9 @@ enum rarch_ctl_state
    /* Core options */
    RARCH_CTL_HAS_CORE_OPTIONS,
    RARCH_CTL_GET_CORE_OPTION_SIZE,
-   RARCH_CTL_IS_CORE_OPTION_UPDATED,
    RARCH_CTL_CORE_OPTIONS_LIST_GET,
    RARCH_CTL_CORE_OPTION_PREV,
    RARCH_CTL_CORE_OPTION_NEXT,
-   RARCH_CTL_CORE_OPTIONS_GET,
    RARCH_CTL_CORE_OPTIONS_INIT,
    RARCH_CTL_CORE_OPTIONS_DEINIT,
 
@@ -555,10 +552,6 @@ typedef struct audio_driver
    size_t (*buffer_size)(void *data);
 } audio_driver_t;
 
-bool audio_driver_is_suspended(void);
-
-bool audio_driver_is_active(void);
-
 bool audio_driver_enable_callback(void);
 
 bool audio_driver_disable_callback(void);
@@ -604,8 +597,6 @@ bool audio_driver_get_devices_list(void **ptr);
 
 void audio_driver_setup_rewind(void);
 
-bool audio_driver_set_callback(const void *data);
-
 bool audio_driver_callback(void);
 
 bool audio_driver_has_callback(void);
@@ -830,8 +821,6 @@ void recording_set_state(bool state);
 
 void streaming_set_state(bool state);
 
-void *recording_driver_get_data_ptr(void);
-
 bool recording_is_enabled(void);
 
 bool streaming_is_enabled(void);
@@ -1632,8 +1621,9 @@ bool video_driver_cached_frame_has_valid_framebuffer(void);
 void video_driver_set_cached_frame_ptr(const void *data);
 void video_driver_set_stub_frame(void);
 void video_driver_unset_stub_frame(void);
-bool video_driver_is_stub_frame(void);
+
 bool video_driver_supports_viewport_read(void);
+
 bool video_driver_prefer_viewport_read(void);
 bool video_driver_supports_read_frame_raw(void);
 void video_driver_set_viewport_config(void);
@@ -1679,8 +1669,6 @@ void video_driver_set_video_cache_context_ack(void);
 
 bool video_driver_is_video_cache_context_ack(void);
 
-bool video_driver_is_active(void);
-
 bool video_driver_get_current_software_framebuffer(struct
       retro_framebuffer *fb);
 

runahead/run_ahead.h

@@ -1,16 +0,0 @@
-#ifndef __RUN_AHEAD_H__
-#define __RUN_AHEAD_H__
-
-#include <stddef.h>
-#include <boolean.h>
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-bool want_fast_savestate(void);
-bool get_hard_disable_audio(void);
-
-RETRO_END_DECLS
-
-#endif