Merge system.h with core.h

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"

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"

configuration.c

@@ -36,7 +36,6 @@
 #include "core.h"
 #include "retroarch.h"
 #include "runloop.h"
-#include "system.h"
 #include "verbosity.h"
 #include "lakka.h"
 

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;

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"

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"

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"

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"
 

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"

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"
 

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

menu/cbs/menu_cbs_get_value.c

@@ -27,6 +27,7 @@
 #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"
@@ -34,7 +35,6 @@
 #include "../../managers/cheat_manager.h"
 #include "../../performance_counters.h"
 #include "../../runloop.h"
-#include "../../system.h"
 #include "../../intl/intl.h"
 
 #ifndef BIND_ACTION_GET_VALUE

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) \

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"
 

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

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"

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"

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"

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"

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"

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"

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

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"

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

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"

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"

system.h

@@ -1,58 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2016 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_SYSTEM_H
-#define __RARCH_SYSTEM_H
-
-#include <retro_miscellaneous.h>
-#include <retro_common_api.h>
-#include <libretro.h>
-
-#include "input/input_defines.h"
-
-RETRO_BEGIN_DECLS
-
-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;
-
-RETRO_END_DECLS
-
-#endif

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"

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;

ui/drivers/ui_qt.cpp

@@ -18,14 +18,15 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include "general.h"
-#include "system.h"
 
 #include <file/file_path.h>
 #include <rthreads/rthreads.h>
 
+#include "general.h"
+
 #include "ui_qt.h"
 #include "../ui_companion_driver.h"
+#include "../../core.h"
 #include "../../configuration.h"
 #include "../../tasks/tasks_internal.h"
 #include "qt/wrapper/wrapper.h"