TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

device: fixes to sporadic device class detection on Linux

Browse Source
This commit is contained in:
rdb 2018-10-07 20:48:39 +02:00
parent 3d66e22905
commit f518b9aaf1
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
panda/src/device/evdevInputDevice.cxx
View File

@ -239,8 +239,7 @@ init_device() {
LightMutexHolder holder(_lock); LightMutexHolder holder(_lock);
uint8_t evtypes[(EV_MAX + 8) >> 3]; uint8_t evtypes[(EV_MAX + 8) >> 3] = {0};
memset(evtypes, 0, sizeof(evtypes));
char name[128]; char name[128];
if (ioctl(_fd, EVIOCGNAME(sizeof(name)), name) < 0 || if (ioctl(_fd, EVIOCGNAME(sizeof(name)), name) < 0 ||
ioctl(_fd, EVIOCGBIT(0, sizeof(evtypes)), evtypes) < 0) { ioctl(_fd, EVIOCGBIT(0, sizeof(evtypes)), evtypes) < 0) {
@ -267,10 +266,9 @@ init_device() {
bool has_keys = false; bool has_keys = false;
bool has_axes = false; bool has_axes = false;
uint8_t keys[(KEY_MAX + 8) >> 3]; uint8_t keys[(KEY_MAX + 8) >> 3] = {0};
if (test_bit(EV_KEY, evtypes)) { if (test_bit(EV_KEY, evtypes)) {
// Check which buttons are on the device. // Check which buttons are on the device.
memset(keys, 0, sizeof(keys));
ioctl(_fd, EVIOCGBIT(EV_KEY, sizeof(keys)), keys); ioctl(_fd, EVIOCGBIT(EV_KEY, sizeof(keys)), keys);
has_keys = true; has_keys = true;
@ -280,10 +278,9 @@ init_device() {
} }
int num_bits = 0; int num_bits = 0;
uint8_t axes[(ABS_MAX + 8) >> 3]; uint8_t axes[(ABS_MAX + 8) >> 3] = {0};
if (test_bit(EV_ABS, evtypes)) { if (test_bit(EV_ABS, evtypes)) {
// Check which axes are on the device. // Check which axes are on the device.
memset(axes, 0, sizeof(axes));
num_bits = ioctl(_fd, EVIOCGBIT(EV_ABS, sizeof(axes)), axes) << 3; num_bits = ioctl(_fd, EVIOCGBIT(EV_ABS, sizeof(axes)), axes) << 3;
has_axes = true; has_axes = true;
} }
@ -302,8 +299,7 @@ init_device() {
// Try to detect which type of device we have here // Try to detect which type of device we have here
if (_device_class == DC_unknown) { if (_device_class == DC_unknown) {
int device_scores[DC_COUNT]; int device_scores[DC_COUNT] = {0};
memset(device_scores, 0, sizeof(device_scores));
// Test for specific keys // Test for specific keys
if (test_bit(BTN_GAMEPAD, keys) && test_bit(ABS_X, axes) && test_bit(ABS_RX, axes)) { if (test_bit(BTN_GAMEPAD, keys) && test_bit(ABS_X, axes) && test_bit(ABS_RX, axes)) {
@ -374,8 +370,7 @@ init_device() {
if (has_keys) { if (has_keys) {
// Also check whether the buttons are currently pressed. // Also check whether the buttons are currently pressed.
uint8_t states[(KEY_MAX + 8) >> 3]; uint8_t states[(KEY_MAX + 8) >> 3] = {0};
memset(states, 0, sizeof(states));
ioctl(_fd, EVIOCGKEY(sizeof(states)), states); ioctl(_fd, EVIOCGKEY(sizeof(states)), states);
for (int i = 0; i <= KEY_MAX; ++i) { for (int i = 0; i <= KEY_MAX; ++i) {
@ -565,8 +560,7 @@ init_device() {
} }
if (test_bit(EV_FF, evtypes)) { if (test_bit(EV_FF, evtypes)) {
uint8_t effects[(FF_MAX + 8) >> 3]; uint8_t effects[(FF_MAX + 8) >> 3] = {0};
memset(effects, 0, sizeof(effects));
ioctl(_fd, EVIOCGBIT(EV_FF, sizeof(effects)), effects); ioctl(_fd, EVIOCGBIT(EV_FF, sizeof(effects)), effects);
if (test_bit(FF_RUMBLE, effects)) { if (test_bit(FF_RUMBLE, effects)) {