aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-11-20 13:44:32 +0100
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-11-20 13:44:32 +0100
commit3a30c62190d5d598c3c76c9a239c4cb0f044f9b9 (patch)
tree1cb357b04df73f5c9c3a561cb62d49c74c4f5aaa
parentb1b0d27fc0d0d3d49f4978e1673c8f5f78632f27 (diff)
downloadandroid-input-bridge-linaro-master.tar.gz
aib: Make it compile on 4.2linaro-master
Change-Id: Id22d94386fb3f6ed6542e936e953d3cf8f6ed191 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
-rw-r--r--README.linaro1
-rw-r--r--aibd.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/README.linaro b/README.linaro
index 373c041..89ed986 100644
--- a/README.linaro
+++ b/README.linaro
@@ -2,3 +2,4 @@ This is a clone of
git://github.com/rperier/android_input_bridge
Local modifications:
+- Make it compile on 4.2+ (patch submitted upstream 2012/11/19)
diff --git a/aibd.c b/aibd.c
index 2cf04ac..03c4b3b 100644
--- a/aibd.c
+++ b/aibd.c
@@ -37,7 +37,7 @@
static int remote_socks[LISTENING_QUEUE_SIZE];
static struct input_event events[EVENTS_QUEUE_SIZE];
-static uint32_t buffer[EVENTS_QUEUE_SIZE * 2];
+static uint32_t buffer[EVENTS_QUEUE_SIZE * 2 + 1];
static void usage(char *progname)
{
@@ -143,7 +143,7 @@ static int input_subsystem_init(void)
for(i = 1; i <= 248; i++)
ioctlx(uinput_fd, UI_SET_KEYBIT, i);
- memcpy(uidev.name, "aibd-device", UINPUT_MAX_NAME_SIZE);
+ memcpy(uidev.name, "aibd-device\0", UINPUT_MAX_NAME_SIZE < 12 ? UINPUT_MAX_NAME_SIZE : 12);
uidev.id.bustype = BUS_USB;
uidev.id.version = 1;