summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2013-09-11 01:53:12 +0200
committerTodd Poynor <toddpoynor@google.com>2013-09-12 21:42:33 +0200
commite7265df3523d27c9f59829c858de256cf063da26 (patch)
treea55c3842e61ef49f749f86a9a4b9b317b1418100
parentminui: convert ev_*() event interface to epoll (diff)
downloadandroid_bootable_recovery-e7265df3523d27c9f59829c858de256cf063da26.tar
android_bootable_recovery-e7265df3523d27c9f59829c858de256cf063da26.tar.gz
android_bootable_recovery-e7265df3523d27c9f59829c858de256cf063da26.tar.bz2
android_bootable_recovery-e7265df3523d27c9f59829c858de256cf063da26.tar.lz
android_bootable_recovery-e7265df3523d27c9f59829c858de256cf063da26.tar.xz
android_bootable_recovery-e7265df3523d27c9f59829c858de256cf063da26.tar.zst
android_bootable_recovery-e7265df3523d27c9f59829c858de256cf063da26.zip
-rw-r--r--ui.cpp4
-rw-r--r--ui.h2
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();