From 6a7b2aed5c88efe9f3e670d2a6c5d02def0486be Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 27 Jan 2016 08:17:12 +0100 Subject: [PATCH] Simplifications --- command_event.c | 4 ++-- libretro_version_1.c | 6 +++++- libretro_version_1.h | 6 ++++++ retroarch.c | 3 --- retroarch.h | 8 -------- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/command_event.c b/command_event.c index a8c95fe6d4..88717e046a 100644 --- a/command_event.c +++ b/command_event.c @@ -592,8 +592,8 @@ static bool event_init_core(void) && !content_ctl(CONTENT_CTL_DOES_NOT_NEED_CONTENT, NULL)) rarch_ctl(RARCH_CTL_SET_PATHS_REDIRECT, NULL); - rarch_ctl(RARCH_CTL_VERIFY_API_VERSION, NULL); - core_ctl(CORE_CTL_RETRO_INIT, NULL); + if (!core_ctl(CORE_CTL_RETRO_INIT, NULL)) + return false; global->sram.use = rarch_ctl(RARCH_CTL_IS_PLAIN_CORE, NULL) && !content_ctl(CONTENT_CTL_DOES_NOT_NEED_CONTENT, NULL); diff --git a/libretro_version_1.c b/libretro_version_1.c index ee999fd8f8..de9a69e817 100644 --- a/libretro_version_1.c +++ b/libretro_version_1.c @@ -260,7 +260,11 @@ bool core_ctl(enum core_ctl_state state, void *data) retro_set_rewind_callbacks(); break; case CORE_CTL_INIT: - return retro_init_libretro_cbs(&retro_ctx); + if (!core_ctl(CORE_CTL_VERIFY_API_VERSION, NULL)) + return false; + if (!retro_init_libretro_cbs(&retro_ctx)) + return false; + break; case CORE_CTL_DEINIT: return retro_uninit_libretro_cbs(&retro_ctx); case CORE_CTL_VERIFY_API_VERSION: diff --git a/libretro_version_1.h b/libretro_version_1.h index f2e7ec7c56..c668354c90 100644 --- a/libretro_version_1.h +++ b/libretro_version_1.h @@ -74,6 +74,12 @@ enum core_ctl_state CORE_CTL_RETRO_UNSERIALIZE, + /* Compare libretro core API version against API version + * used by RetroArch. + * + * TODO - when libretro v2 gets added, allow for switching + * between libretro version backend dynamically. + */ CORE_CTL_VERIFY_API_VERSION }; diff --git a/retroarch.c b/retroarch.c index 8845db80c6..dbc50f74a0 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1477,9 +1477,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) #endif } break; - case RARCH_CTL_VERIFY_API_VERSION: - core_ctl(CORE_CTL_VERIFY_API_VERSION, NULL); - break; case RARCH_CTL_FILL_PATHNAMES: rarch_init_savefile_paths(); bsv_movie_set_path(global->name.savefile); diff --git a/retroarch.h b/retroarch.h index 2a294e8c32..90fc2d4ad6 100644 --- a/retroarch.h +++ b/retroarch.h @@ -94,14 +94,6 @@ enum rarch_ctl_state RARCH_CTL_FORCE_QUIT, - /* Compare libretro core API version against API version - * used by RetroArch. - * - * TODO - when libretro v2 gets added, allow for switching - * between libretro version backend dynamically. - */ - RARCH_CTL_VERIFY_API_VERSION, - /* Validates CPU features for given processor architecture. * Make sure we haven't compiled for something we cannot run. * Ideally, code would get swapped out depending on CPU support,