libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 16:39:43 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(Android) Use djb2

Browse Source
This commit is contained in:
twinaphex 2015-06-15 04:18:17 +02:00
parent 6d6cb1c023
commit 23263e2f97
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
frontend/drivers/platform_android.c
View File

@ -21,6 +21,8 @@
#include <string.h>
#include <sys/resource.h>
#include <rhash.h>
#include "platform_android.h"
#include "../frontend.h"
@ -483,8 +485,6 @@ static void frontend_android_get_environment_settings(int *argc,
static char config_path[PATH_MAX_LENGTH] = {0};
const char *argv = NULL;
*config_path = '\0';
argv = (*env)->GetStringUTFChars(env, jstr, 0);
if (argv && *argv)
@ -751,19 +751,30 @@ static int frontend_android_get_rating(void)
return -1;
}
#define ANDROID_ARCH_ARMV7 0x26257a91U
#define ANDROID_ARCH_ARM 0x406a3516U
#define ANDROID_ARCH_MIPS 0x7c9aa25eU
#define ANDROID_ARCH_X86 0x0b88b8cbU
static enum frontend_architecture frontend_android_get_architecture(void)
{
uint32_t abi_hash;
char abi[PROP_VALUE_MAX] = {0};
system_property_get("ro.product.cpu.abi", abi);
if (!strcmp(abi, "armeabi-v7a"))
return FRONTEND_ARCH_ARM;
if (!strcmp(abi, "armeabi"))
return FRONTEND_ARCH_ARM;
if (!strcmp(abi, "mips"))
return FRONTEND_ARCH_MIPS;
if (!strcmp(abi, "x86"))
return FRONTEND_ARCH_X86;
abi_hash = djb2_calculate(abi);
switch (abi_hash)
{
case ANDROID_ARCH_ARMV7:
return FRONTEND_ARCH_ARM;
case ANDROID_ARCH_ARM:
return FRONTEND_ARCH_ARM;
case ANDROID_ARCH_MIPS:
return FRONTEND_ARCH_MIPS;
case ANDROID_ARCH_X86:
return FRONTEND_ARCH_X86;
}
return FRONTEND_ARCH_NONE;
}

1
menu/menu.c
View File

@ -299,7 +299,6 @@ int menu_iterate(retro_input_t input,
runloop_t *runloop = rarch_main_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
menu_input_t *menu_input = menu_input_get_ptr();
settings_t *settings = config_get_ptr();
menu_input->joypad.state = menu_input_frame(input, trigger_input);

1
menu/menu_entry.c
View File

@ -432,7 +432,6 @@ int menu_entry_iterate(unsigned action)
int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
{
int ret = 0;
menu_handle_t *menu = menu_driver_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr();
menu_display_t *disp = menu_display_get_ptr();
menu_list_t *menu_list = menu_list_get_ptr();