shadowfacts/jinput-arm64
1
0
Fork 0
mirror of https://github.com/shadowfacts/jinput-arm64.git synced 2025-12-06 08:01:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9 from jamesjer/master

Browse source 
Remove references to nonexistent EVIOCGUSAGE
This commit is contained in:
Endolf 2016-05-19 20:00:28 +01:00
parent 61edc6b2cd bbf4c985f0
commit b813d5594e
2 changed files with 0 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
plugins/linux/src/java/net/java/games/input/LinuxEventDevice.java
View file

@ -94,28 +94,6 @@ final class LinuxEventDevice implements LinuxDevice {
}
private final Controller.Type guessType() throws IOException {
Controller.Type type_from_usages = guessTypeFromUsages();
if (type_from_usages == Controller.Type.UNKNOWN)
return guessTypeFromComponents();
else
return type_from_usages;
}
private final Controller.Type guessTypeFromUsages() throws IOException {
byte[] usage_bits = getDeviceUsageBits();
if (isBitSet(usage_bits, NativeDefinitions.USAGE_MOUSE))
return Controller.Type.MOUSE;
else if (isBitSet(usage_bits, NativeDefinitions.USAGE_KEYBOARD))
return Controller.Type.KEYBOARD;
else if (isBitSet(usage_bits, NativeDefinitions.USAGE_GAMEPAD))
return Controller.Type.GAMEPAD;
else if (isBitSet(usage_bits, NativeDefinitions.USAGE_JOYSTICK))
return Controller.Type.STICK;
else
return Controller.Type.UNKNOWN;
}
private final Controller.Type guessTypeFromComponents() throws IOException {
List components = getComponents();
if (components.size() == 0)
return Controller.Type.UNKNOWN;
@ -342,15 +320,6 @@ final class LinuxEventDevice implements LinuxDevice {
}
private final static native void nGetBits(long fd, int ev_type, byte[] evtype_bits) throws IOException;
private final byte[] getDeviceUsageBits() throws IOException {
byte[] bits = new byte[NativeDefinitions.USAGE_MAX/8 + 1];
if (getVersion() >= 0x010001) {
nGetDeviceUsageBits(fd, bits);
}
return bits;
}
private final static native void nGetDeviceUsageBits(long fd, byte[] type_bits) throws IOException;
public final synchronized void pollKeyStates() throws IOException {
nGetKeyStates(fd, key_states);
}

14
plugins/linux/src/native/net_java_games_input_LinuxEventDevice.c
View file

@ -112,20 +112,6 @@ JNIEXPORT jint JNICALL Java_net_java_games_input_LinuxEventDevice_nGetNumEffects
return num_effects;
}
JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetDeviceUsageBits(JNIEnv *env, jclass unused, jlong fd_address, jbyteArray usages_array) {
#if EV_VERSION >= 0x010001
int fd = (int)fd_address;
jsize len = (*env)->GetArrayLength(env, usages_array);
jbyte *usages = (*env)->GetByteArrayElements(env, usages_array, NULL);
if (usages == NULL)
return;
int res = ioctl(fd, EVIOCGUSAGE(len), usages);
(*env)->ReleaseByteArrayElements(env, usages_array, usages, 0);
if (res == -1)
throwIOException(env, "Failed to get device usages (%d)\n", errno);
#endif
}
JNIEXPORT void JNICALL Java_net_java_games_input_LinuxEventDevice_nGetBits(JNIEnv *env, jclass unused, jlong fd_address, jint evtype, jbyteArray bits_array) {
int fd = (int)fd_address;
jsize len = (*env)->GetArrayLength(env, bits_array);