diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index b8ad54d9a6..053141a898 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -341,7 +341,6 @@ - diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters index fda167a3cd..f6b304cd81 100644 --- a/rpcs3/emucore.vcxproj.filters +++ b/rpcs3/emucore.vcxproj.filters @@ -674,9 +674,6 @@ Utilities - - Source Files - Source Files diff --git a/rpcs3/ps3emu_api_enums.h b/rpcs3/ps3emu_api_enums.h deleted file mode 100644 index 92a6371873..0000000000 --- a/rpcs3/ps3emu_api_enums.h +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once - -#ifndef _PS3EMU_API_ENUMS -#define _PS3EMU_API_ENUMS - -#ifdef __cplusplus -extern"C" -{ -#endif /* __cplusplus */ - - typedef enum - { - ps3emu_api_ok, - ps3emu_api_bad_argument, - ps3emu_api_not_found, - ps3emu_api_internal_error, - ps3emu_api_not_initialized, - ps3emu_api_already_initialized - } ps3emu_api_error_code; - - enum - { - ps3emu_api_version = 1, - ps3emu_api_max_name_length = 16, - ps3emu_api_max_version_length = 64 - }; - - typedef enum - { - ps3emu_api_state_idle, - ps3emu_api_state_stoping, - ps3emu_api_state_stopped, - ps3emu_api_state_pausing, - ps3emu_api_state_paused, - ps3emu_api_state_starting, - ps3emu_api_state_started - } ps3emu_api_state; - - typedef enum - { - ps3emu_api_window_null, - ps3emu_api_window_opengl, - ps3emu_api_window_vulkan - /* ps3emu_api_window_direct3d */ - } ps3emu_api_window_type; - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _PS3EMU_API_ENUMS */ diff --git a/rpcs3/ps3emu_api_structs.h b/rpcs3/ps3emu_api_structs.h deleted file mode 100644 index cc8337f21e..0000000000 --- a/rpcs3/ps3emu_api_structs.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef _PS3EMU_API_STRUCTS -#define _PS3EMU_API_STRUCTS - -#include "ps3emu_api_enums.h" - -#ifdef __cplusplus -extern"C" -{ -#endif /* __cplusplus */ - typedef struct ps3emu_api_window_handle_s * ps3emu_api_window; - - typedef struct - { - ps3emu_api_error_code(*create_window)(ps3emu_api_window *window, ps3emu_api_window_type type, unsigned int version); - ps3emu_api_error_code(*destroy_window)(ps3emu_api_window window); - ps3emu_api_error_code(*flip)(ps3emu_api_window window); - } ps3emu_api_initialize_callbacks; - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _PS3EMU_API_STRUCTS */ diff --git a/rpcs3/rpcs3_api.cpp b/rpcs3/rpcs3_api.cpp deleted file mode 100644 index 71e3aff589..0000000000 --- a/rpcs3/rpcs3_api.cpp +++ /dev/null @@ -1,218 +0,0 @@ -#include "stdafx.h" -#include "ps3emu_api_enums.h" -#include "ps3emu_api_structs.h" -#include "rpcs3_version.h" -#include "Emu/System.h" - -#ifdef _MSC_VER - #define UTILS_DLL_C_EXPORT extern "C" __declspec(dllexport) -#else - #define UTILS_DLL_C_EXPORT extern "C" __attribute__((visibility("default"))) -#endif - -static bool g_is_initialized = false; - -UTILS_DLL_C_EXPORT unsigned int ps3emu_api_get_api_version() -{ - return ps3emu_api_version; -} - -UTILS_DLL_C_EXPORT ps3emu_api_error_code ps3emu_api_initialize(const ps3emu_api_initialize_callbacks *callbacks) -{ - if (g_is_initialized) - { - return ps3emu_api_already_initialized; - } - - if (!callbacks) - { - return ps3emu_api_bad_argument; - } - - g_is_initialized = true; - - //TODO - return ps3emu_api_ok; -} - -UTILS_DLL_C_EXPORT ps3emu_api_error_code ps3emu_api_destroy() -{ - if (!g_is_initialized) - { - return ps3emu_api_not_initialized; - } - - g_is_initialized = false; - - //TODO - return ps3emu_api_ok; -} - -UTILS_DLL_C_EXPORT ps3emu_api_error_code ps3emu_api_get_version_string(char *dest_buffer, int dest_buffer_size) -{ - if (!g_is_initialized) - { - return ps3emu_api_not_initialized; - } - - if (!dest_buffer || dest_buffer_size <= 0) - { - return ps3emu_api_bad_argument; - } - - if (dest_buffer_size > ps3emu_api_max_version_length) - { - dest_buffer_size = ps3emu_api_max_version_length; - } - - const std::string version_string = rpcs3::version.to_string(); - - if (dest_buffer_size > version_string.length()) - { - dest_buffer_size = version_string.length(); - } - - std::memcpy(dest_buffer, version_string.c_str(), dest_buffer_size - 1); - dest_buffer[dest_buffer_size - 1] = '\0'; - return ps3emu_api_ok; -} - -UTILS_DLL_C_EXPORT ps3emu_api_error_code ps3emu_api_get_version_number(int *version_number) -{ - if (!g_is_initialized) - { - return ps3emu_api_not_initialized; - } - - if (!version_number) - { - return ps3emu_api_bad_argument; - } - - *version_number = rpcs3::version.to_hex(); - return ps3emu_api_ok; -} - -UTILS_DLL_C_EXPORT ps3emu_api_error_code ps3emu_api_get_name_string(char *dest_buffer, int dest_buffer_size) -{ - if (!g_is_initialized) - { - return ps3emu_api_not_initialized; - } - - if (!dest_buffer || dest_buffer_size <= 0) - { - return ps3emu_api_bad_argument; - } - - if (dest_buffer_size > ps3emu_api_max_name_length) - { - dest_buffer_size = ps3emu_api_max_name_length; - } - - const std::string name_string = "RPCS3"; - - if (dest_buffer_size > name_string.length()) - { - dest_buffer_size = name_string.length(); - } - - std::memcpy(dest_buffer, name_string.c_str(), dest_buffer_size - 1); - dest_buffer[dest_buffer_size - 1] = '\0'; - - return ps3emu_api_ok; -} - -UTILS_DLL_C_EXPORT ps3emu_api_error_code ps3emu_api_load_elf(const char *path) -{ - if (!g_is_initialized) - { - return ps3emu_api_not_initialized; - } - - if (!path) - { - return ps3emu_api_bad_argument; - } - - if (!fs::is_file(path)) - { - return ps3emu_api_not_found; - } - - Emu.BootGame(path, true); - - return ps3emu_api_ok; -} - -UTILS_DLL_C_EXPORT ps3emu_api_error_code ps3emu_api_set_state(ps3emu_api_state state) -{ - if (!g_is_initialized) - { - return ps3emu_api_not_initialized; - } - - //TODO state machine - switch (state) - { - case ps3emu_api_state_stoping: - Emu.Stop(); - break; - - case ps3emu_api_state_pausing: - Emu.Pause(); - break; - - case ps3emu_api_state_starting: - if (Emu.IsPaused()) - { - Emu.Resume(); - } - else - { - Emu.Run(); - } - break; - - default: - return ps3emu_api_bad_argument; - } - - return ps3emu_api_ok; -} - -UTILS_DLL_C_EXPORT ps3emu_api_error_code ps3emu_api_get_state(ps3emu_api_state *state) -{ - if (!g_is_initialized) - { - return ps3emu_api_not_initialized; - } - - if (!state) - { - return ps3emu_api_bad_argument; - } - - if (Emu.IsRunning()) - { - *state = ps3emu_api_state_started; - } - else if (Emu.IsPaused()) - { - *state = ps3emu_api_state_paused; - } - else if (Emu.IsStopped()) - { - *state = ps3emu_api_state_stopped; - } - else if (Emu.IsReady()) - { - *state = ps3emu_api_state_idle; - } - else - { - return ps3emu_api_internal_error; - } - - return ps3emu_api_ok; -}