From 8aa0d02b3179abe4fd21c49d4eed272fcc95f769 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 14 Jul 2014 19:03:05 -0400
Subject: [PATCH 1/2] qnx_input.c syntax errors

---
 input/qnx_input.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/input/qnx_input.c b/input/qnx_input.c
index 16c6b2c16f..28aff73716 100644
--- a/input/qnx_input.c
+++ b/input/qnx_input.c
@@ -108,7 +108,7 @@ static void process_gamepad_event(void *data, screen_event_t screen_event, int t
    screen_get_event_property_iv(screen_event, SCREEN_PROPERTY_BUTTONS, &controller->buttons);
 
    uint64_t *state_cur = (uint64_t*)&qnx->pad_state[controller->port];
-   int i;
+   //int i;
 
    *state_cur = 0;
    for (i = 0; i < 20; i++)
@@ -334,7 +334,7 @@ static void process_keyboard_event(void *data, screen_event_t event, int type)
          if (flags & KEY_DOWN)
          {
             controller->buttons |= 1 << b;
-            *state_cur |= 1 << b
+            *state_cur |= 1 << b;
          }
          else
             controller->buttons &= ~(1<<b);
@@ -437,6 +437,7 @@ static void process_touch_event(void *data, screen_event_t event, int type)
 static void handle_screen_event(void *data, bps_event_t *event)
 {
    int type;
+   qnx_input_t *qnx = (qnx_input_t*)data;
 
    screen_event_t screen_event = screen_event_get_event(event);
    screen_get_event_property_iv(screen_event, SCREEN_PROPERTY_TYPE, &type);
@@ -626,7 +627,7 @@ static int16_t qnx_input_state(void *data, const struct retro_keybind **retro_ke
    switch (device)
    {
       case RETRO_DEVICE_JOYPAD:
-         return input_joypad_pressed(qnx->joypad, port, binds[port], id);
+         return input_joypad_pressed(qnx->joypad, port, (unsigned int)g_settings.input.binds[port], id);
 #ifdef HAVE_BB10
       case RETRO_DEVICE_ANALOG:
          //Need to return [-0x8000, 0x7fff]

From 63738f3165f6c28c029c558c9230b345d66dc49c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Tue, 15 Jul 2014 16:02:14 -0400
Subject: [PATCH 2/2] missed 1

---
 input/qnx_input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/input/qnx_input.c b/input/qnx_input.c
index 28aff73716..a6f8c0d35b 100644
--- a/input/qnx_input.c
+++ b/input/qnx_input.c
@@ -270,7 +270,7 @@ static void qnx_input_autodetect_gamepad(void *data, input_device_t* controller,
    if (name_buf[0] != '\0')
    {
       strlcpy(g_settings.input.device_names[port], name_buf, sizeof(g_settings.input.device_names[port]));
-      input_config_autoconfigure_joypad(port, name_buf, android_joypad.ident);
+      input_config_autoconfigure_joypad(port, name_buf, qnx->joypad);
 
       controller->port = port;
       qnx->port_device[port] = controller;