Merge system.h with core.h

mme4crt · Sep 6, 2016 · 82d8211 · 82d8211
1 parent 48ac633
commit 82d8211
Show file tree

Hide file tree

Showing 30 changed files with 50 additions and 87 deletions.
diff --git a/cheevos.c b/cheevos.c
@@ -24,7 +24,6 @@
 #include "cheevos.h"
 #include "command.h"
 #include "dynamic.h"
-#include "system.h"
 #include "network/net_http_special.h"
 #include "tasks/tasks_internal.h"
 #include "configuration.h"

diff --git a/command.c b/command.c
@@ -53,7 +53,6 @@
 #include "retroarch.h"
 #include "managers/cheat_manager.h"
 #include "managers/state_manager.h"
-#include "system.h"
 #include "ui/ui_companion_driver.h"
 #include "tasks/tasks_internal.h"
 #include "list_special.h"

diff --git a/configuration.c b/configuration.c
@@ -36,7 +36,6 @@
 #include "core.h"
 #include "retroarch.h"
 #include "runloop.h"
-#include "system.h"
 #include "verbosity.h"
 #include "lakka.h"
 

diff --git a/core.h b/core.h
@@ -20,9 +20,12 @@
 
 #include <boolean.h>
 #include <libretro.h>
+
+#include <retro_miscellaneous.h>
 #include <retro_common_api.h>
 
 #include "core_type.h"
+#include "input/input_defines.h"
 
 RETRO_BEGIN_DECLS
 
@@ -40,6 +43,34 @@ enum
    POLL_TYPE_LATE
 };
 
+typedef struct rarch_system_info
+{
+   struct retro_system_info info;
+
+   unsigned rotation;
+   unsigned performance_level;
+
+   const char *input_desc_btn[MAX_USERS][RARCH_FIRST_META_KEY];
+   char valid_extensions[PATH_MAX_LENGTH];
+
+   struct retro_disk_control_callback  disk_control_cb; 
+   struct retro_location_callback      location_cb;
+
+   struct
+   {
+      struct retro_subsystem_info *data;
+      unsigned size;
+   } subsystem;
+
+   struct
+   {
+      struct retro_controller_info *data;
+      unsigned size;
+   } ports;
+
+   struct retro_memory_map mmaps;
+} rarch_system_info_t;
+
 typedef struct retro_ctx_input_state_info
 {
    retro_input_state_t cb;

diff --git a/core_impl.c b/core_impl.c
@@ -32,7 +32,6 @@
 #include "msg_hash.h"
 #include "managers/state_manager.h"
 #include "runloop.h"
-#include "system.h"
 #include "verbosity.h"
 #include "gfx/video_driver.h"
 #include "audio/audio_driver.h"

diff --git a/driver.c b/driver.c
@@ -20,7 +20,6 @@
 
 #include "command.h"
 #include "msg_hash.h"
-#include "system.h"
 
 #include "audio/audio_driver.h"
 #include "audio/audio_resampler_driver.h"

diff --git a/dynamic.c b/dynamic.c
@@ -41,7 +41,6 @@
 #include "record/record_driver.h"
 #include "core.h"
 #include "performance_counters.h"
-#include "system.h"
 #include "gfx/video_context_driver.h"
 
 #include "cores/internal_cores.h"

diff --git a/gfx/video_driver.c b/gfx/video_driver.c
@@ -41,7 +41,6 @@
 #include "../performance_counters.h"
 #include "../list_special.h"
 #include "../core.h"
-#include "../system.h"
 #include "../command.h"
 #include "../msg_hash.h"
 

diff --git a/httpserver/httpserver.c b/httpserver/httpserver.c
@@ -1,5 +1,5 @@
 #include <libretro.h>
-#include "system.h"
+#include "core.h"
 #include "runloop.h"
 #include "core.h"
 #include "gfx/video_driver.h"

diff --git a/location/location_driver.c b/location/location_driver.c
@@ -23,10 +23,10 @@
 #include "location_driver.h"
 
 #include "../configuration.h"
+#include "../core.h"
 #include "../driver.h"
 #include "../retroarch.h"
 #include "../runloop.h"
-#include "../system.h"
 #include "../list_special.h"
 #include "../verbosity.h"
 

diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
@@ -29,9 +29,9 @@
 #include "../../cores/internal_cores.h"
 
 #include "../../configuration.h"
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../verbosity.h"
 
 #ifndef BIND_ACTION_DEFERRED_PUSH

diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
@@ -27,14 +27,14 @@
 #include "../../input/input_autodetect.h"
 #include "../../input/input_config.h"
 
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../configuration.h"
 #include "../../file_path_special.h"
 #include "../../managers/core_option_manager.h"
 #include "../../managers/cheat_manager.h"
 #include "../../performance_counters.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../intl/intl.h"
 
 #ifndef BIND_ACTION_GET_VALUE

diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
@@ -27,12 +27,12 @@
 #include "../menu_navigation.h"
 
 #include "../../configuration.h"
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../managers/cheat_manager.h"
 #include "../../file_path_special.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../../system.h"
 
 #ifndef BIND_ACTION_LEFT
 #define BIND_ACTION_LEFT(cbs, name) \

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
@@ -30,6 +30,7 @@
 #include "../menu_popup.h"
 #include "../menu_content.h"
 
+#include "../../core.h"
 #include "../../configuration.h"
 #include "../../core_info.h"
 #include "../../frontend/frontend_driver.h"
@@ -39,7 +40,6 @@
 #include "../../input/input_remapping.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../verbosity.h"
 #include "../../lakka.h"
 

diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
@@ -27,12 +27,12 @@
 #include "../menu_navigation.h"
 
 #include "../../configuration.h"
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../managers/cheat_manager.h"
 #include "../../file_path_special.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../ui/ui_companion_driver.h"
 
 #ifndef BIND_ACTION_RIGHT

diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
@@ -25,12 +25,12 @@
 #include "../menu_shader.h"
 
 #include "../../configuration.h"
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../managers/core_option_manager.h"
 #include "../../managers/cheat_manager.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../performance_counters.h"
 
 #include "../../gfx/video_shader_driver.h"

diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
@@ -38,10 +38,10 @@
 #include "../menu_display.h"
 
 #include "../../core_info.h"
+#include "../../core.h"
 #include "../../configuration.h"
 #include "../../frontend/frontend_driver.h"
 #include "../../retroarch.h"
-#include "../../system.h"
 #include "../../runloop.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks_internal.h"

diff --git a/menu/drivers/nuklear.c b/menu/drivers/nuklear.c
@@ -39,10 +39,10 @@
 #include "../menu_navigation.h"
 #include "../menu_display.h"
 
+#include "../../core.h"
 #include "../../core_info.h"
 #include "../../configuration.h"
 #include "../../frontend/frontend_driver.h"
-#include "../../system.h"
 #include "../../runloop.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks_internal.h"

diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
@@ -41,10 +41,10 @@
 #include "../menu_cbs.h"
 
 #include "../../frontend/frontend_driver.h"
+#include "../../core.h"
 #include "../../verbosity.h"
 #include "../../configuration.h"
 #include "../../retroarch.h"
-#include "../../system.h"
 #include "../../file_path_special.h"
 
 #include "../../tasks/tasks_internal.h"

diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
@@ -42,7 +42,6 @@
 #include "../managers/core_option_manager.h"
 #include "../retroarch.h"
 #include "../runloop.h"
-#include "../system.h"
 #include "../core.h"
 #include "../frontend/frontend_driver.h"
 #include "../ui/ui_companion_driver.h"

diff --git a/menu/menu_driver.c b/menu/menu_driver.c
@@ -32,9 +32,9 @@
 #include "../content.h"
 #include "../configuration.h"
 #include "../dynamic.h"
+#include "../core.h"
 #include "../core_info.h"
 #include "../retroarch.h"
-#include "../system.h"
 #include "../defaults.h"
 #include "../frontend/frontend.h"
 #include "../list_special.h"

diff --git a/menu/menu_entries.c b/menu/menu_entries.c
@@ -24,9 +24,9 @@
 #include "menu_cbs.h"
 #include "menu_navigation.h"
 
+#include "../core.h"
 #include "../configuration.h"
 #include "../runloop.h"
-#include "../system.h"
 #include "../version.h"
 
 struct menu_list

diff --git a/menu/menu_setting.c b/menu/menu_setting.c
@@ -45,11 +45,11 @@
 #include "menu_input.h"
 #include "menu_navigation.h"
 
+#include "../core.h"
 #include "../configuration.h"
 #include "../msg_hash.h"
 #include "../defaults.h"
 #include "../driver.h"
-#include "../system.h"
 #include "../core.h"
 #include "../dynamic.h"
 #include "../runloop.h"

diff --git a/network/netplay/netplay_private.h b/network/netplay/netplay_private.h
@@ -22,8 +22,8 @@
 #include <net/net_compat.h>
 #include <retro_endianness.h>
 
+#include "../../core.h"
 #include "../../msg_hash.h"
-#include "../../system.h"
 #include "../../verbosity.h"
 
 #ifdef ANDROID

diff --git a/retroarch.c b/retroarch.c
@@ -61,7 +61,6 @@
 #include "configuration.h"
 #include "runloop.h"
 #include "managers/cheat_manager.h"
-#include "system.h"
 #include "tasks/tasks_internal.h"
 
 #include "version.h"

diff --git a/runloop.c b/runloop.c
@@ -46,7 +46,6 @@
 #include "managers/core_option_manager.h"
 #include "managers/cheat_manager.h"
 #include "managers/state_manager.h"
-#include "system.h"
 #include "list_special.h"
 #include "audio/audio_driver.h"
 #include "camera/camera_driver.h"

diff --git a/system.h b/system.h
diff --git a/tasks/task_content.c b/tasks/task_content.c
@@ -81,7 +81,6 @@
 #include "../content.h"
 #include "../dynamic.h"
 #include "../patch.h"
-#include "../system.h"
 #include "../runloop.h"
 #include "../retroarch.h"
 #include "../file_path_special.h"

diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
@@ -31,9 +31,9 @@
 #include "../../input/drivers_keyboard/keyboard_event_apple.h"
 #include "../../frontend/frontend.h"
 #include "../../configuration.h"
+#include "../../core.h"
 #include "../../retroarch.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../tasks/tasks_internal.h"
 
 id apple_platform;