izzy/RetroArch
0
0
Fork 0
mirror of https://github.com/izzy2lost/RetroArch.git synced 2026-03-26 16:42:27 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite RUNLOOP_CTL_SYSTEM_INFO_GET

Browse Source
This commit is contained in:
twinaphex
2017-04-23 16:41:26 +02:00
parent 627089e2f6
commit 3ec5816259
22 changed files with 88 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
network/httpserver/httpserver.c
+3 -12
View File
@@ -171,7 +171,6 @@ static int httpserver_handle_basic_info(struct mg_connection* conn, void* cbdata
retro_ctx_memory_info_t vram;
char core_path[PATH_MAX_LENGTH] = {0};
const char* pixel_format = NULL;
const rarch_system_info_t* system = NULL;
const struct retro_subsystem_info* subsys = NULL;
const struct retro_subsystem_rom_info* rom = NULL;
const struct retro_subsystem_memory_info* mem = NULL;
@@ -182,9 +181,7 @@ static int httpserver_handle_basic_info(struct mg_connection* conn, void* cbdata
const core_option_manager_t* core_opts = NULL;
const struct mg_request_info * req = mg_get_request_info(conn);
const settings_t * settings = config_get_ptr();
if (!runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system))
return httpserver_error(conn, 500, "Could not get system information in %s", __FUNCTION__);
rarch_system_info_t *system = runloop_get_system_info();
if (string_is_empty(system->info.library_name))
return httpserver_error(conn, 500, "Core not initialized in %s", __FUNCTION__);
@@ -413,16 +410,13 @@ static int httpserver_handle_get_mmaps(struct mg_connection* conn, void* cbdata)
unsigned id;
const struct mg_request_info* req = mg_get_request_info(conn);
const char* comma = "";
rarch_system_info_t * system = NULL;
const struct retro_memory_map* mmaps = NULL;
const struct retro_memory_descriptor* mmap = NULL;
rarch_system_info_t *system = runloop_get_system_info();
if (strcmp(req->request_method, "GET"))
return httpserver_error(conn, 405, "Unimplemented method in %s: %s", __FUNCTION__, req->request_method);
if (!runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system))
return httpserver_error(conn, 500, "Could not get system information in %s", __FUNCTION__);
mmaps = &system->mmaps;
mmap = mmaps->descriptors;
@@ -469,11 +463,11 @@ static int httpserver_handle_get_mmap(struct mg_connection* conn, void* cbdata)
uLong buflen;
const struct mg_request_info * req = mg_get_request_info(conn);
const char * comma = "";
rarch_system_info_t* system = NULL;
const struct retro_memory_map* mmaps = NULL;
const struct retro_memory_descriptor* mmap = NULL;
const char* param = NULL;
Bytef* buffer = NULL;
rarch_system_info_t *system = runloop_get_system_info();
if (strcmp(req->request_method, "GET"))
return httpserver_error(conn, 405, "Unimplemented method in %s: %s", __FUNCTION__, req->request_method);
@@ -481,9 +475,6 @@ static int httpserver_handle_get_mmap(struct mg_connection* conn, void* cbdata)
if (sscanf(req->request_uri, "/" MEMORY_MAP "/%u", &id) != 1)
return httpserver_error(conn, 500, "Malformed request in %s: %s", __FUNCTION__, req->request_uri);
if (!runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system))
return httpserver_error(conn, 500, "Could not get system information in %s", __FUNCTION__);
mmaps = &system->mmaps;
if (id >= mmaps->num_descriptors)