RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input: fix name/manufacturer/serial fetching for some evdev devices

This commit is contained in:
rdb 2018-01-23 12:59:14 +01:00
parent 712b246dd6
commit f189b817c6
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -572,8 +572,14 @@ init_device() {
char path[64];
char buffer[256];
const char *parent = "";
sprintf(path, "/sys/class/input/event%d/device/device/../product", _index);
FILE *f = fopen(path, "r");
if (!f) {
parent = "../";
sprintf(path, "/sys/class/input/event%d/device/device/%s../product", _index, parent);
f = fopen(path, "r");
}
if (f) {
if (fgets(buffer, sizeof(buffer), f) != NULL) {
buffer[strcspn(buffer, "\r\n")] = 0;
@ -583,7 +589,7 @@ init_device() {
}
fclose(f);
}
sprintf(path, "/sys/class/input/event%d/device/device/../manufacturer", _index);
sprintf(path, "/sys/class/input/event%d/device/device/%s../manufacturer", _index, parent);
f = fopen(path, "r");
if (f) {
if (fgets(buffer, sizeof(buffer), f) != NULL) {
@ -592,7 +598,7 @@ init_device() {
}
fclose(f);
}
sprintf(path, "/sys/class/input/event%d/device/device/../serial", _index);
sprintf(path, "/sys/class/input/event%d/device/device/%s../serial", _index, parent);
f = fopen(path, "r");
if (f) {
if (fgets(buffer, sizeof(buffer), f) != NULL) {