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

add getVendorId and getProductId to android device detection (needs testing)

Browse Source
This commit is contained in:
Toad King 2014-09-30 12:31:28 -05:00
parent a3c4f52dd3
commit b0ade7e010
2 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/platform/platform_android.h
View File

@ -221,6 +221,10 @@ enum {
var = (*env)->CallDoubleMethod(env, clazz_obj, methodId); \ var = (*env)->CallDoubleMethod(env, clazz_obj, methodId); \
JNI_EXCEPTION(env) JNI_EXCEPTION(env)
#define CALL_INT_METHOD(env, var, clazz_obj, methodId) \
var = (*env)->CallIntMethod(env, clazz_obj, methodId); \
JNI_EXCEPTION(env)
extern void engine_handle_cmd(void*); extern void engine_handle_cmd(void*);
extern JNIEnv *jni_thread_getenv(void); extern JNIEnv *jni_thread_getenv(void);

39
input/android_input.c
View File

@ -250,10 +250,10 @@ static int android_input_get_id_port(android_input_t *android, int id,
return -1; return -1;
} }
static bool android_input_lookup_name(char *buf, size_t size, int id) static bool android_input_lookup_name(char *buf, int *vendorId, int *productId, size_t size, int id)
{ {
jclass class; jclass class;
jmethodID method, getName; jmethodID method, getName, getVendorId, getProductId;
jobject device, name; jobject device, name;
JNIEnv *env = (JNIEnv*)jni_thread_getenv(); JNIEnv *env = (JNIEnv*)jni_thread_getenv();
@ -300,6 +300,34 @@ static bool android_input_lookup_name(char *buf, size_t size, int id)
(*env)->ReleaseStringUTFChars(env, name, str); (*env)->ReleaseStringUTFChars(env, name, str);
RARCH_LOG("device name: %s\n", buf); RARCH_LOG("device name: %s\n", buf);
getVendorId = NULL;
GET_METHOD_ID(env, getVendorId, class, "getVendorId", "()I;");
if (!getVendorId)
goto error;
CALL_INT_METHOD(env, *vendorId, device, getVendorId);
if (!*vendorId)
{
RARCH_ERR("Failed to find vendor id for device ID: %d\n", id);
goto error;
}
RARCH_LOG("device vendor id: %d\n", *vendorId);
getProductId = NULL;
GET_METHOD_ID(env, getProductId, class, "getProductId", "()I;");
if (!getProductId)
goto error;
*productId = 0;
CALL_INT_METHOD(env, *productId, device, getProductId);
if (!*productId)
{
RARCH_ERR("Failed to find product id for device ID: %d\n", id);
goto error;
}
RARCH_LOG("device product id: %d\n", *productId);
return true; return true;
error: error:
return false; return false;
@ -325,6 +353,7 @@ static void handle_hotplug(android_input_t *android,
{ {
char device_name[256], name_buf[256]; char device_name[256], name_buf[256];
name_buf[0] = device_name[0] = 0; name_buf[0] = device_name[0] = 0;
int vendorId, productId;
if (!g_settings.input.autodetect_enable) if (!g_settings.input.autodetect_enable)
return; return;
@ -335,7 +364,11 @@ static void handle_hotplug(android_input_t *android,
return; return;
} }
android_input_lookup_name(device_name, sizeof(device_name), id); if (!android_input_lookup_name(device_name, &vendorId, &productId, sizeof(device_name), id))
{
RARCH_ERR("Could not look up device name or IDs.\n");
return;
}
/* FIXME: Ugly hack, see other FIXME note below. */ /* FIXME: Ugly hack, see other FIXME note below. */
if (strstr(device_name, "keypad-game-zeus") || if (strstr(device_name, "keypad-game-zeus") ||