mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
twinaphex 2020-05-24 18:28:27 +02:00
parent 5b562c4c24
commit 53beaee6e6
2 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dynamic.h
View File

@ -100,7 +100,6 @@ bool libretro_get_shared_context(void);
#define SUBSYSTEM_MAX_SUBSYSTEM_ROMS 10 #define SUBSYSTEM_MAX_SUBSYSTEM_ROMS 10
extern struct retro_subsystem_info subsystem_data[SUBSYSTEM_MAX_SUBSYSTEMS]; extern struct retro_subsystem_info subsystem_data[SUBSYSTEM_MAX_SUBSYSTEMS];
extern struct retro_subsystem_rom_info subsystem_data_roms[SUBSYSTEM_MAX_SUBSYSTEMS][SUBSYSTEM_MAX_SUBSYSTEM_ROMS];
extern unsigned subsystem_current_count; extern unsigned subsystem_current_count;
RETRO_END_DECLS RETRO_END_DECLS

65
retroarch.c
View File

@ -239,29 +239,6 @@
/* DRIVERS */ /* DRIVERS */
#define DRIVERS_CMD_ALL \
( DRIVER_AUDIO_MASK \
| DRIVER_VIDEO_MASK \
| DRIVER_INPUT_MASK \
| DRIVER_CAMERA_MASK \
| DRIVER_LOCATION_MASK \
| DRIVER_MENU_MASK \
| DRIVERS_VIDEO_INPUT_MASK \
| DRIVER_WIFI_MASK \
| DRIVER_LED_MASK \
| DRIVER_MIDI_MASK )
#define DRIVERS_CMD_ALL_BUT_MENU \
( DRIVER_AUDIO_MASK \
| DRIVER_VIDEO_MASK \
| DRIVER_INPUT_MASK \
| DRIVER_CAMERA_MASK \
| DRIVER_LOCATION_MASK \
| DRIVERS_VIDEO_INPUT_MASK \
| DRIVER_WIFI_MASK \
| DRIVER_LED_MASK \
| DRIVER_MIDI_MASK )
audio_driver_t audio_null = { audio_driver_t audio_null = {
NULL, /* init */ NULL, /* init */
NULL, /* write */ NULL, /* write */
@ -1007,6 +984,30 @@ static const camera_driver_t *camera_drivers[] = {
/* MAIN GLOBAL VARIABLES */ /* MAIN GLOBAL VARIABLES */
#define DRIVERS_CMD_ALL \
( DRIVER_AUDIO_MASK \
| DRIVER_VIDEO_MASK \
| DRIVER_INPUT_MASK \
| DRIVER_CAMERA_MASK \
| DRIVER_LOCATION_MASK \
| DRIVER_MENU_MASK \
| DRIVERS_VIDEO_INPUT_MASK \
| DRIVER_WIFI_MASK \
| DRIVER_LED_MASK \
| DRIVER_MIDI_MASK )
#define DRIVERS_CMD_ALL_BUT_MENU \
( DRIVER_AUDIO_MASK \
| DRIVER_VIDEO_MASK \
| DRIVER_INPUT_MASK \
| DRIVER_CAMERA_MASK \
| DRIVER_LOCATION_MASK \
| DRIVERS_VIDEO_INPUT_MASK \
| DRIVER_WIFI_MASK \
| DRIVER_LED_MASK \
| DRIVER_MIDI_MASK )
#define _PSUPP(var, name, desc) printf(" %s:\n\t\t%s: %s\n", name, desc, var ? "yes" : "no") #define _PSUPP(var, name, desc) printf(" %s:\n\t\t%s: %s\n", name, desc, var ? "yes" : "no")
#define FAIL_CPU(simd_type) do { \ #define FAIL_CPU(simd_type) do { \
@ -1369,6 +1370,13 @@ static const camera_driver_t *camera_drivers[] = {
#define LIBNX_SWKBD_LIMIT 500 /* enforced by HOS */ #define LIBNX_SWKBD_LIMIT 500 /* enforced by HOS */
#endif #endif
/* Griffin hack */
#ifdef HAVE_QT
#ifndef HAVE_MAIN
#define HAVE_MAIN
#endif
#endif
/* Descriptive names for options without short variant. /* Descriptive names for options without short variant.
* *
* Please keep the name in sync with the option name. * Please keep the name in sync with the option name.
@ -2373,8 +2381,10 @@ static struct retro_callbacks secondary_callbacks;
#endif #endif
#endif #endif
/* TODO/FIXME - public global variable */
struct retro_subsystem_info subsystem_data[SUBSYSTEM_MAX_SUBSYSTEMS]; struct retro_subsystem_info subsystem_data[SUBSYSTEM_MAX_SUBSYSTEMS];
struct retro_subsystem_rom_info subsystem_data_roms[SUBSYSTEM_MAX_SUBSYSTEMS][SUBSYSTEM_MAX_SUBSYSTEM_ROMS];
static struct retro_subsystem_rom_info subsystem_data_roms[SUBSYSTEM_MAX_SUBSYSTEMS][SUBSYSTEM_MAX_SUBSYSTEM_ROMS];
/* Forward declarations */ /* Forward declarations */
static void retroarch_fail(int error_code, const char *error); static void retroarch_fail(int error_code, const char *error);
@ -8622,13 +8632,6 @@ bool command_event(enum event_command cmd, void *data)
/* FRONTEND */ /* FRONTEND */
/* Griffin hack */
#ifdef HAVE_QT
#ifndef HAVE_MAIN
#define HAVE_MAIN
#endif
#endif
void retroarch_override_setting_set( void retroarch_override_setting_set(
enum rarch_override_setting enum_idx, void *data) enum rarch_override_setting enum_idx, void *data)
{ {