ioctl(fd, EVIOCGNAME(sizeof(name)-6), name+6);
printf("in_evdev: found \"%s\" with %d events (type %08x)\n",
name+6, count, support);
- in_register(name, IN_DRVID_EVDEV, dev);
+ in_register(name, IN_DRVID_EVDEV, fd, dev);
continue;
skip:
perror("in_evdev: F_SETFL fcntl failed");
}
-int in_evdev_update_keycode(void **data, int dcount, int *which, int *is_down, int timeout_ms)
+static int in_evdev_update_keycode(void *data, int *is_down)
{
- in_evdev_t **devs = (in_evdev_t **)data;
- struct timeval tv, *timeout = NULL;
- int i, fdmax = -1;
-
- if (timeout_ms > 0) {
- tv.tv_sec = timeout_ms / 1000;
- tv.tv_usec = (timeout_ms % 1000) * 1000;
- timeout = &tv;
- }
+ in_evdev_t *dev = data;
+ struct input_event ev;
+ int rd;
if (is_down != NULL)
*is_down = 0;
- for (i = 0; i < dcount; i++)
- if (devs[i]->fd > fdmax) fdmax = devs[i]->fd;
-
- while (1)
- {
- struct input_event ev[64];
- in_evdev_t *dev = NULL;
- int ret, rd;
- fd_set fdset;
-
- FD_ZERO(&fdset);
- for (i = 0; i < dcount; i++)
- FD_SET(devs[i]->fd, &fdset);
-
- ret = select(fdmax + 1, &fdset, NULL, NULL, timeout);
- if (ret == -1)
- {
- perror("in_evdev: select failed");
- sleep(1);
- return 0;
- }
-
- if (ret == 0)
- return 0; /* timeout */
-
- for (i = 0; i < dcount; i++)
- if (FD_ISSET(devs[i]->fd, &fdset))
- *which = i, dev = devs[i];
-
- rd = read(dev->fd, ev, sizeof(ev[0]) * 64);
- if (rd < (int) sizeof(ev[0])) {
+ rd = read(dev->fd, &ev, sizeof(ev));
+ if (rd < (int) sizeof(ev)) {
+ if (errno != EAGAIN) {
perror("in_evdev: error reading");
sleep(1);
- return 0;
}
+ return -1;
+ }
- for (i = 0; i < rd / sizeof(ev[0]); i++)
- {
- if (ev[i].type == EV_KEY) {
- if (ev[i].value < 0 || ev[i].value > 1)
- continue;
- if (is_down != NULL)
- *is_down = ev[i].value;
- return ev[i].code;
+ if (ev.type == EV_KEY) {
+ if (ev.value < 0 || ev.value > 1)
+ return -1;
+ if (is_down != NULL)
+ *is_down = ev.value;
+ return ev.code;
+ }
+ else if (ev.type == EV_ABS)
+ {
+ int down = 0;
+ if (dev->abs_lzone != 0 && ev.code == ABS_X) {
+ if (ev.value < dev->abs_lzone) {
+ down = 1;
+ dev->abs_lastx = KEY_LEFT;
+ }
+ else if (ev.value > dev->abs_rzone) {
+ down = 1;
+ dev->abs_lastx = KEY_RIGHT;
}
- else if (ev[i].type == EV_ABS)
- {
- int down = 0;
- if (dev->abs_lzone != 0 && ev[i].code == ABS_X) {
- if (ev[i].value < dev->abs_lzone) {
- down = 1;
- dev->abs_lastx = KEY_LEFT;
- }
- else if (ev[i].value > dev->abs_rzone) {
- down = 1;
- dev->abs_lastx = KEY_RIGHT;
- }
- if (is_down != NULL)
- *is_down = down;
- return dev->abs_lastx;
- }
- if (dev->abs_tzone != 0 && ev[i].code == ABS_Y) {
- if (ev[i].value < dev->abs_tzone) {
- down = 1;
- dev->abs_lasty = KEY_UP;
- }
- else if (ev[i].value > dev->abs_bzone) {
- down = 1;
- dev->abs_lasty = KEY_DOWN;
- }
- if (is_down != NULL)
- *is_down = down;
- return dev->abs_lasty;
- }
+ if (is_down != NULL)
+ *is_down = down;
+ return dev->abs_lastx;
+ }
+ if (dev->abs_tzone != 0 && ev.code == ABS_Y) {
+ if (ev.value < dev->abs_tzone) {
+ down = 1;
+ dev->abs_lasty = KEY_UP;
+ }
+ else if (ev.value > dev->abs_bzone) {
+ down = 1;
+ dev->abs_lasty = KEY_DOWN;
}
+ if (is_down != NULL)
+ *is_down = down;
+ return dev->abs_lasty;
}
}
+
+ return -1;
}
static int in_evdev_menu_translate(int keycode)
{
switch (keycode) {
- /* keyboards */
case KEY_UP: return PBTN_UP;
case KEY_DOWN: return PBTN_DOWN;
case KEY_LEFT: return PBTN_LEFT;
case KEY_RIGHT: return PBTN_RIGHT;
case KEY_ENTER:
- case BTN_TRIGGER: return PBTN_EAST;
+ case BTN_A:
+ case BTN_TRIGGER: return PBTN_MOK;
case KEY_ESC:
- case BTN_THUMB: return PBTN_SOUTH;
+ case BTN_B:
+ case BTN_THUMB: return PBTN_MBACK;
+ case KEY_MENU: return PBTN_MENU;
default: return 0;
}
}
for (i = 0; i < KEY_MAX + 1; i++) {
const char *k = in_evdev_keys[i];
- if (k != NULL && k[0] == key_name[0] &&
- strcasecmp(k, key_name) == 0)
+ if (k != NULL && strcasecmp(k, key_name) == 0)
return i;
}
{ KEY_LEFT, 2 },
{ KEY_RIGHT, 3 },
{ KEY_S, 4 }, /* B */
+ { BTN_B, 4 },
{ KEY_D, 5 }, /* C */
+ { BTN_A, 5 },
{ KEY_A, 6 }, /* A */
+ { BTN_Y, 6 },
{ KEY_ENTER, 7 },
+ { BTN_START, 7 },
};
#define DEF_BIND_COUNT (sizeof(in_evdev_def_binds) / sizeof(in_evdev_def_binds[0]))
drv->get_def_binds = in_evdev_get_def_binds;
drv->clean_binds = in_evdev_clean_binds;
drv->set_blocking = in_evdev_set_blocking;
+ drv->update_keycode = in_evdev_update_keycode;
drv->menu_translate = in_evdev_menu_translate;
drv->get_key_code = in_evdev_get_key_code;
drv->get_key_name = in_evdev_get_key_name;