mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move netplay_get_architecture to frontend_driver.c

Browse Source
This commit is contained in:
twinaphex 2020-01-27 16:39:36 +01:00
parent 9f9191819d
commit e8bc606c20
5 changed files with 52 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
frontend/frontend_driver.c
View File

@ -14,10 +14,12 @@
* If not, see <http://www.gnu.org/licenses/>. * If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <stdio.h>
#include <string.h> #include <string.h>
#include <compat/strl.h> #include <compat/strl.h>
#include <string/stdstring.h> #include <string/stdstring.h>
#include <retro_miscellaneous.h>
#include <libretro.h> #include <libretro.h>
#if defined(_3DS) #if defined(_3DS)
@ -398,6 +400,49 @@ enum frontend_architecture frontend_driver_get_cpu_architecture(void)
return frontend->get_architecture(); return frontend->get_architecture();
} }
void frontend_driver_get_cpu_architecture_str(
char *frontend_architecture, size_t size)
{
const frontend_ctx_driver_t
*frontend = frontend_get_ptr();
enum frontend_architecture arch = frontend_driver_get_cpu_architecture();
char architecture[PATH_MAX_LENGTH];
switch (arch)
{
case FRONTEND_ARCH_X86:
strlcpy(architecture, "x86", sizeof(architecture));
break;
case FRONTEND_ARCH_X86_64:
strlcpy(architecture, "x64", sizeof(architecture));
break;
case FRONTEND_ARCH_PPC:
strlcpy(architecture, "PPC", sizeof(architecture));
break;
case FRONTEND_ARCH_ARM:
strlcpy(architecture, "ARM", sizeof(architecture));
break;
case FRONTEND_ARCH_ARMV7:
strlcpy(architecture, "ARMv7", sizeof(architecture));
break;
case FRONTEND_ARCH_ARMV8:
strlcpy(architecture, "ARMv8", sizeof(architecture));
break;
case FRONTEND_ARCH_MIPS:
strlcpy(architecture, "MIPS", sizeof(architecture));
break;
case FRONTEND_ARCH_TILE:
strlcpy(architecture, "Tilera", sizeof(architecture));
break;
case FRONTEND_ARCH_NONE:
default:
strlcpy(architecture, "N/A", sizeof(architecture));
break;
}
snprintf(frontend_architecture, size, "%s %s",
frontend->ident, architecture);
}
uint64_t frontend_driver_get_total_memory(void) uint64_t frontend_driver_get_total_memory(void)
{ {
frontend_ctx_driver_t *frontend = frontend_get_ptr(); frontend_ctx_driver_t *frontend = frontend_get_ptr();

3
frontend/frontend_driver.h
View File

@ -172,6 +172,9 @@ void frontend_driver_free(void);
enum frontend_architecture frontend_driver_get_cpu_architecture(void); enum frontend_architecture frontend_driver_get_cpu_architecture(void);
void frontend_driver_get_cpu_architecture_str(
char *frontend_architecture, size_t size);
environment_get_t frontend_driver_environment_get_ptr(void); environment_get_t frontend_driver_environment_get_ptr(void);
bool frontend_driver_has_get_video_driver_func(void); bool frontend_driver_has_get_video_driver_func(void);

2
network/netplay/netplay.h
View File

@ -124,6 +124,4 @@ int netplay_rooms_get_count(void);
void netplay_rooms_free(void); void netplay_rooms_free(void);
void netplay_get_architecture(char *frontend_architecture, size_t size);
#endif #endif

3
network/netplay/netplay_discovery.c
View File

@ -301,7 +301,8 @@ bool netplay_lan_ad_server(netplay_t *netplay)
char *p; char *p;
char sub[NETPLAY_HOST_STR_LEN]; char sub[NETPLAY_HOST_STR_LEN];
char frontend[NETPLAY_HOST_STR_LEN]; char frontend[NETPLAY_HOST_STR_LEN];
netplay_get_architecture(frontend, sizeof(frontend)); frontend_driver_get_cpu_architecture_str(
frontend, sizeof(frontend));
p=strrchr(reply_addr,'.'); p=strrchr(reply_addr,'.');
if (p) if (p)

46
network/netplay/netplay_frontend.c
View File

@ -811,49 +811,6 @@ static void netplay_announce_cb(retro_task_t *task,
return; return;
} }
void netplay_get_architecture(char *frontend_architecture, size_t size)
{
const frontend_ctx_driver_t
*frontend = frontend_get_ptr();
enum frontend_architecture arch = frontend_driver_get_cpu_architecture();
char architecture[PATH_MAX_LENGTH];
switch (arch)
{
case FRONTEND_ARCH_X86:
strlcpy(architecture, "x86", sizeof(architecture));
break;
case FRONTEND_ARCH_X86_64:
strlcpy(architecture, "x64", sizeof(architecture));
break;
case FRONTEND_ARCH_PPC:
strlcpy(architecture, "PPC", sizeof(architecture));
break;
case FRONTEND_ARCH_ARM:
strlcpy(architecture, "ARM", sizeof(architecture));
break;
case FRONTEND_ARCH_ARMV7:
strlcpy(architecture, "ARMv7", sizeof(architecture));
break;
case FRONTEND_ARCH_ARMV8:
strlcpy(architecture, "ARMv8", sizeof(architecture));
break;
case FRONTEND_ARCH_MIPS:
strlcpy(architecture, "MIPS", sizeof(architecture));
break;
case FRONTEND_ARCH_TILE:
strlcpy(architecture, "Tilera", sizeof(architecture));
break;
case FRONTEND_ARCH_NONE:
default:
strlcpy(architecture,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
sizeof(architecture));
break;
}
snprintf(frontend_architecture, size, "%s %s", frontend->ident, architecture);
}
static void netplay_announce(void) static void netplay_announce(void)
{ {
char buf[4600]; char buf[4600];
@ -894,7 +851,8 @@ static void netplay_announce(void)
net_http_urlencode(&subsystemname, "N/A"); net_http_urlencode(&subsystemname, "N/A");
} }
netplay_get_architecture(frontend_architecture, sizeof(frontend_architecture)); frontend_driver_get_cpu_architecture_str(
frontend_architecture, sizeof(frontend_architecture));
#ifdef HAVE_DISCORD #ifdef HAVE_DISCORD
if(discord_is_ready()) if(discord_is_ready())