From e7265df3523d27c9f59829c858de256cf063da26 Mon Sep 17 00:00:00 2001 From: Todd Poynor Date: Tue, 10 Sep 2013 16:53:12 -0700 Subject: recovery: ui changes for ev_*() switch to epoll Convert callback events parameter to unsigned int. Change-Id: Ife0e983f307c07bf4aca807d70574aeb20c460cd --- ui.cpp | 4 ++-- ui.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui.cpp b/ui.cpp index 5043ee528..08c291ddc 100644 --- a/ui.cpp +++ b/ui.cpp @@ -63,12 +63,12 @@ void RecoveryUI::Init() { } -int RecoveryUI::input_callback(int fd, short revents, void* data) +int RecoveryUI::input_callback(int fd, unsigned int epevents, void* data) { struct input_event ev; int ret; - ret = ev_get_input(fd, revents, &ev); + ret = ev_get_input(fd, epevents, &ev); if (ret) return -1; diff --git a/ui.h b/ui.h index d85fc659b..22f3e5c53 100644 --- a/ui.h +++ b/ui.h @@ -134,7 +134,7 @@ private: pthread_t input_t; static void* input_thread(void* cookie); - static int input_callback(int fd, short revents, void* data); + static int input_callback(int fd, unsigned int epevents, void* data); void process_key(int key_code, int updown); bool usb_connected(); -- cgit v1.2.3