From f3fefa2ceb2f2aa81b1238bd56a42288668f978d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 21 Mar 2015 22:55:50 +0100 Subject: [PATCH] (QNX) Build fixes --- input/drivers_joypad/qnx_input_joypad.c | 12 ++++++++---- menu/menu_driver.h | 2 +- xdk/screenshot_xdk1.c | 3 ++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/input/drivers_joypad/qnx_input_joypad.c b/input/drivers_joypad/qnx_input_joypad.c index 9b05ac4467..1ea9f477ba 100644 --- a/input/drivers_joypad/qnx_input_joypad.c +++ b/input/drivers_joypad/qnx_input_joypad.c @@ -44,7 +44,8 @@ static bool qnx_joypad_init(void) static bool qnx_joypad_button(unsigned port_num, uint16_t joykey) { - qnx_input_t *qnx = (qnx_input_t*)driver.input_data; + driver_t *driver = driver_get_ptr(); + qnx_input_t *qnx = (qnx_input_t*)driver->input_data; if (!qnx || port_num >= MAX_PADS) return false; @@ -54,7 +55,8 @@ static bool qnx_joypad_button(unsigned port_num, uint16_t joykey) static uint64_t qnx_joypad_get_buttons(unsigned port_num) { - qnx_input_t *qnx = (qnx_input_t*)driver.input_data; + driver_t *driver = driver_get_ptr(); + qnx_input_t *qnx = (qnx_input_t*)driver->input_data; if (!qnx || port_num >= MAX_PADS) return 0; @@ -63,7 +65,8 @@ static uint64_t qnx_joypad_get_buttons(unsigned port_num) static int16_t qnx_joypad_axis(unsigned port_num, uint32_t joyaxis) { - qnx_input_t *qnx = (qnx_input_t*)driver.input_data; + driver_t *driver = driver_get_ptr(); + qnx_input_t *qnx = (qnx_input_t*)driver->input_data; if (!qnx || joyaxis == AXIS_NONE || port_num >= MAX_PADS) return 0; @@ -115,7 +118,8 @@ static void qnx_joypad_poll(void) static bool qnx_joypad_query_pad(unsigned pad) { - qnx_input_t *qnx = (qnx_input_t*)driver.input_data; + driver_t *driver = driver_get_ptr(); + qnx_input_t *qnx = (qnx_input_t*)driver->input_data; return (qnx && pad < MAX_USERS && qnx->pad_state[pad]); } diff --git a/menu/menu_driver.h b/menu/menu_driver.h index b96518f413..28a5071fc1 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -132,7 +132,7 @@ typedef struct /* This buffer can be used to display generic OK messages to the user. * Fill it and call - * menu_list_push(driver.menu->menu_stack, "", "message", 0, 0); + * menu_list_push(driver->menu->menu_stack, "", "message", 0, 0); */ char message_contents[PATH_MAX_LENGTH]; diff --git a/xdk/screenshot_xdk1.c b/xdk/screenshot_xdk1.c index a9674016ca..6f904c06aa 100644 --- a/xdk/screenshot_xdk1.c +++ b/xdk/screenshot_xdk1.c @@ -25,8 +25,9 @@ bool screenshot_dump(const char *folder, const void *frame, char filename[PATH_MAX_LENGTH]; char shotname[PATH_MAX_LENGTH]; HRESULT ret = S_OK; - d3d_video_t *d3d = (d3d_video_t*)driver.video_data; + driver_t *driver = driver_get_ptr(); settings_t *settings = config_get_ptr(); + d3d_video_t *d3d = (d3d_video_t*)driver->video_data; (void)folder; (void)frame;