encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed build on older Raspberry Pi environments

This commit is contained in:
Sam Lantinga 2016-10-01 15:04:13 -07:00
parent a0d3e0d64a
commit ac7d117475
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/linux/SDL_evdev.c
View File

@ -675,6 +675,7 @@ SDL_EVDEV_destroy_touchscreen(SDL_evdevlist_item* item) {
static void static void
SDL_EVDEV_sync_device(SDL_evdevlist_item *item) SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
{ {
#ifdef EVIOCGMTSLOTS
int i, ret; int i, ret;
struct input_absinfo abs_info; struct input_absinfo abs_info;
/* /*
@ -698,7 +699,6 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
mt_req_code = SDL_calloc(1, mt_req_size); mt_req_code = SDL_calloc(1, mt_req_size);
if (mt_req_code == NULL) { if (mt_req_code == NULL) {
SDL_Log("Failed to sync device");
return; return;
} }
@ -708,7 +708,6 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
ret = ioctl(item->fd, EVIOCGMTSLOTS(mt_req_size), mt_req_code); ret = ioctl(item->fd, EVIOCGMTSLOTS(mt_req_size), mt_req_code);
if (ret < 0) { if (ret < 0) {
SDL_free(mt_req_code); SDL_free(mt_req_code);
SDL_Log("Failed to sync device");
return; return;
} }
for(i = 0; i < item->touchscreen_data->max_slots; i++) { for(i = 0; i < item->touchscreen_data->max_slots; i++) {
@ -736,7 +735,6 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
ret = ioctl(item->fd, EVIOCGMTSLOTS(mt_req_size), mt_req_code); ret = ioctl(item->fd, EVIOCGMTSLOTS(mt_req_size), mt_req_code);
if (ret < 0) { if (ret < 0) {
SDL_free(mt_req_code); SDL_free(mt_req_code);
SDL_Log("Failed to sync device");
return; return;
} }
for(i = 0; i < item->touchscreen_data->max_slots; i++) { for(i = 0; i < item->touchscreen_data->max_slots; i++) {
@ -755,7 +753,6 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
ret = ioctl(item->fd, EVIOCGMTSLOTS(mt_req_size), mt_req_code); ret = ioctl(item->fd, EVIOCGMTSLOTS(mt_req_size), mt_req_code);
if (ret < 0) { if (ret < 0) {
SDL_free(mt_req_code); SDL_free(mt_req_code);
SDL_Log("Failed to sync device");
return; return;
} }
for(i = 0; i < item->touchscreen_data->max_slots; i++) { for(i = 0; i < item->touchscreen_data->max_slots; i++) {
@ -773,12 +770,13 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
ret = ioctl(item->fd, EVIOCGABS(ABS_MT_SLOT), &abs_info); ret = ioctl(item->fd, EVIOCGABS(ABS_MT_SLOT), &abs_info);
if (ret < 0) { if (ret < 0) {
SDL_free(mt_req_code); SDL_free(mt_req_code);
SDL_Log("Failed to sync device");
return; return;
} }
item->touchscreen_data->current_slot = abs_info.value; item->touchscreen_data->current_slot = abs_info.value;
SDL_free(mt_req_code); SDL_free(mt_req_code);
#endif /* EVIOCGMTSLOTS */
} }
#if SDL_USE_LIBUDEV #if SDL_USE_LIBUDEV