aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Poynor <toddpoynor@google.com>2013-09-17 13:39:10 -0700
committerTodd Poynor <toddpoynor@google.com>2013-09-17 21:58:52 +0000
commita5ef19fabd10428ccff2055455ef1a55dfdc5fa0 (patch)
tree01344df30924781bb0d658a44503fd7997f2b3b4
parentbe96809d181f587255176add2aa298adaaec69e4 (diff)
downloadbootable_recovery-a5ef19fabd10428ccff2055455ef1a55dfdc5fa0.zip
bootable_recovery-a5ef19fabd10428ccff2055455ef1a55dfdc5fa0.tar.gz
bootable_recovery-a5ef19fabd10428ccff2055455ef1a55dfdc5fa0.tar.bz2
recovery: fix epoll events type to uint32_t
Change-Id: I5db9987102201c18821acb45d1f824e9865a1451
-rw-r--r--minui/events.c2
-rw-r--r--minui/minui.h4
-rw-r--r--ui.cpp2
-rw-r--r--ui.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/minui/events.c b/minui/events.c
index 008a7d8..df7dad4 100644
--- a/minui/events.c
+++ b/minui/events.c
@@ -168,7 +168,7 @@ void ev_dispatch(void)
}
}
-int ev_get_input(int fd, unsigned int epevents, struct input_event *ev)
+int ev_get_input(int fd, uint32_t epevents, struct input_event *ev)
{
int r;
diff --git a/minui/minui.h b/minui/minui.h
index ab08202..573dd71 100644
--- a/minui/minui.h
+++ b/minui/minui.h
@@ -50,7 +50,7 @@ unsigned int gr_get_height(gr_surface surface);
// see http://www.mjmwired.net/kernel/Documentation/input/ for info.
struct input_event;
-typedef int (*ev_callback)(int fd, unsigned int epevents, void *data);
+typedef int (*ev_callback)(int fd, uint32_t epevents, void *data);
typedef int (*ev_set_key_callback)(int code, int value, void *data);
int ev_init(ev_callback input_cb, void *data);
@@ -65,7 +65,7 @@ int ev_sync_key_state(ev_set_key_callback set_key_cb, void *data);
*/
int ev_wait(int timeout);
-int ev_get_input(int fd, unsigned int epevents, struct input_event *ev);
+int ev_get_input(int fd, uint32_t epevents, struct input_event *ev);
void ev_dispatch(void);
int ev_get_epollfd(void);
diff --git a/ui.cpp b/ui.cpp
index 08c291d..67a2500 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -63,7 +63,7 @@ void RecoveryUI::Init() {
}
-int RecoveryUI::input_callback(int fd, unsigned int epevents, void* data)
+int RecoveryUI::input_callback(int fd, uint32_t epevents, void* data)
{
struct input_event ev;
int ret;
diff --git a/ui.h b/ui.h
index 22f3e5c..8cc1da1 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, unsigned int epevents, void* data);
+ static int input_callback(int fd, uint32_t epevents, void* data);
void process_key(int key_code, int updown);
bool usb_connected();