diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c index 3679c30ce6..2b49e39b2a 100644 --- a/android/native/jni/input_android.c +++ b/android/native/jni/input_android.c @@ -108,6 +108,8 @@ static void android_input_poll(void *data) int source = AInputEvent_getSource(event); int id = AInputEvent_getDeviceId(event); + if (id == zeus_second_id) + id = zeus_id; int keycode = AKeyEvent_getKeyCode(event); int type_event = AInputEvent_getType(event); diff --git a/android/native/jni/input_autodetect.c b/android/native/jni/input_autodetect.c index aab3b823b8..81ae739a21 100644 --- a/android/native/jni/input_autodetect.c +++ b/android/native/jni/input_autodetect.c @@ -96,8 +96,8 @@ void input_autodetect_init (void) } } -static int zeus_id = -1; -static int zeus_second_id = -1; +int zeus_id = -1; +int zeus_second_id = -1; static unsigned zeus_port; void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned port, unsigned id, int source) diff --git a/android/native/jni/input_autodetect.h b/android/native/jni/input_autodetect.h index 0cb8ae7378..5c76415251 100644 --- a/android/native/jni/input_autodetect.h +++ b/android/native/jni/input_autodetect.h @@ -62,6 +62,8 @@ enum { extern uint64_t keycode_lut[LAST_KEYCODE]; extern bool volume_enable; +extern int zeus_id; +extern int zeus_second_id; void input_autodetect_init (void); void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned port, unsigned id, int source);