Do not use UDEV references in EVDEV if UDEV has not been detected

This commit is contained in:
Gabriel Jacobo 2013-09-28 15:48:32 -03:00
parent 99789c71c1
commit 1ccbad9603

View File

@ -53,12 +53,14 @@ static _THIS = NULL;
#define SYN_DROPPED 3 #define SYN_DROPPED 3
#endif #endif
static int SDL_EVDEV_device_removed(const char *devpath);
static int SDL_EVDEV_device_added(const SDL_UDEV_deviceclass devclass, const char *devpath);
static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode); static SDL_Scancode SDL_EVDEV_translate_keycode(int keycode);
static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item); static void SDL_EVDEV_sync_device(SDL_evdevlist_item *item);
#if SDL_USE_LIBUDEV
static int SDL_EVDEV_device_removed(const char *devpath);
static int SDL_EVDEV_device_added(const SDL_UDEV_deviceclass devclass, const char *devpath);
void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, SDL_UDEV_deviceclass udev_class, const char *devpath); void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, SDL_UDEV_deviceclass udev_class, const char *devpath);
#endif /* SDL_USE_LIBUDEV */
static SDL_Scancode EVDEV_Keycodes[] = { static SDL_Scancode EVDEV_Keycodes[] = {
SDL_SCANCODE_UNKNOWN, /* KEY_RESERVED 0 */ SDL_SCANCODE_UNKNOWN, /* KEY_RESERVED 0 */
@ -390,6 +392,7 @@ SDL_EVDEV_Quit(void)
} }
} }
#if SDL_USE_LIBUDEV
void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, SDL_UDEV_deviceclass udev_class, const char *devpath) void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, SDL_UDEV_deviceclass udev_class, const char *devpath)
{ {
SDL_EVDEV_deviceclass devclass; SDL_EVDEV_deviceclass devclass;
@ -429,6 +432,8 @@ void SDL_EVDEV_udev_callback(SDL_UDEV_deviceevent udev_type, SDL_UDEV_deviceclas
} }
#endif /* SDL_USE_LIBUDEV */
void void
SDL_EVDEV_Poll(void) SDL_EVDEV_Poll(void)
{ {
@ -562,6 +567,7 @@ SDL_EVDEV_sync_device(SDL_evdevlist_item *item)
/* TODO: get full state of device and report whatever is required */ /* TODO: get full state of device and report whatever is required */
} }
#if SDL_USE_LIBUDEV
static int static int
SDL_EVDEV_device_added(const SDL_UDEV_deviceclass devclass, const char *devpath) SDL_EVDEV_device_added(const SDL_UDEV_deviceclass devclass, const char *devpath)
{ {
@ -640,6 +646,7 @@ SDL_EVDEV_device_removed(const char *devpath)
return -1; return -1;
} }
#endif /* SDL_USE_LIBUDEV */
#endif /* SDL_INPUT_LINUXEV */ #endif /* SDL_INPUT_LINUXEV */