1
0
mirror of https://github.com/libretro/RetroArch synced 2025-02-18 00:40:36 +00:00

(QNX) Build fixes

This commit is contained in:
twinaphex 2015-03-21 22:55:50 +01:00
parent 4bc9514197
commit f3fefa2ceb
3 changed files with 11 additions and 6 deletions

@ -44,7 +44,8 @@ static bool qnx_joypad_init(void)
static bool qnx_joypad_button(unsigned port_num, uint16_t joykey) 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) if (!qnx || port_num >= MAX_PADS)
return false; 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) 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) if (!qnx || port_num >= MAX_PADS)
return 0; 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) 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) if (!qnx || joyaxis == AXIS_NONE || port_num >= MAX_PADS)
return 0; return 0;
@ -115,7 +118,8 @@ static void qnx_joypad_poll(void)
static bool qnx_joypad_query_pad(unsigned pad) 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]); return (qnx && pad < MAX_USERS && qnx->pad_state[pad]);
} }

@ -132,7 +132,7 @@ typedef struct
/* This buffer can be used to display generic OK messages to the user. /* This buffer can be used to display generic OK messages to the user.
* Fill it and call * 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]; char message_contents[PATH_MAX_LENGTH];

@ -25,8 +25,9 @@ bool screenshot_dump(const char *folder, const void *frame,
char filename[PATH_MAX_LENGTH]; char filename[PATH_MAX_LENGTH];
char shotname[PATH_MAX_LENGTH]; char shotname[PATH_MAX_LENGTH];
HRESULT ret = S_OK; 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(); settings_t *settings = config_get_ptr();
d3d_video_t *d3d = (d3d_video_t*)driver->video_data;
(void)folder; (void)folder;
(void)frame; (void)frame;