Make drivers non-const

This commit is contained in:
twinaphex 2014-09-11 07:06:20 +02:00
parent f1ccf07603
commit 75d2e13dcb
79 changed files with 159 additions and 182 deletions

View File

@ -70,7 +70,7 @@ static bool ios_camera_poll(void *data, retro_camera_frame_raw_framebuffer_t fra
return true; return true;
} }
const camera_driver_t camera_ios = { camera_driver_t camera_ios = {
ios_camera_init, ios_camera_init,
ios_camera_free, ios_camera_free,
ios_camera_start, ios_camera_start,

View File

@ -71,7 +71,7 @@ fail:
return false; return false;
} }
const location_driver_t location_apple = { location_driver_t location_apple = {
apple_location_init, apple_location_init,
apple_location_free, apple_location_free,
apple_location_start, apple_location_start,

View File

@ -284,7 +284,7 @@ static size_t alsa_buffer_size(void *data)
return alsa->buffer_size; return alsa->buffer_size;
} }
const audio_driver_t audio_alsa = { audio_driver_t audio_alsa = {
alsa_init, alsa_init,
alsa_write, alsa_write,
alsa_stop, alsa_stop,

View File

@ -361,7 +361,7 @@ static size_t alsa_qsa_buffer_size(void *data)
return alsa->buf_size * alsa->buf_count; return alsa->buf_size * alsa->buf_count;
} }
const audio_driver_t audio_alsa = { audio_driver_t audio_alsa = {
alsa_qsa_init, alsa_qsa_init,
alsa_qsa_write, alsa_qsa_write,
alsa_qsa_stop, alsa_qsa_stop,

View File

@ -316,7 +316,7 @@ static size_t alsa_thread_buffer_size(void *data)
return alsa->buffer_size; return alsa->buffer_size;
} }
const audio_driver_t audio_alsathread = { audio_driver_t audio_alsathread = {
alsa_thread_init, alsa_thread_init,
alsa_thread_write, alsa_thread_write,
alsa_thread_stop, alsa_thread_stop,

View File

@ -402,7 +402,7 @@ static size_t coreaudio_buffer_size(void *data)
return dev->buffer_size; return dev->buffer_size;
} }
const audio_driver_t audio_coreaudio = { audio_driver_t audio_coreaudio = {
coreaudio_init, coreaudio_init,
coreaudio_write, coreaudio_write,
coreaudio_stop, coreaudio_stop,
@ -414,4 +414,3 @@ const audio_driver_t audio_coreaudio = {
coreaudio_write_avail, coreaudio_write_avail,
coreaudio_buffer_size, coreaudio_buffer_size,
}; };

View File

@ -457,7 +457,7 @@ static bool dsound_use_float(void *data)
return false; return false;
} }
const audio_driver_t audio_dsound = { audio_driver_t audio_dsound = {
dsound_init, dsound_init,
dsound_write, dsound_write,
dsound_stop, dsound_stop,
@ -469,4 +469,3 @@ const audio_driver_t audio_dsound = {
dsound_write_avail, dsound_write_avail,
dsound_buffer_size, dsound_buffer_size,
}; };

View File

@ -220,7 +220,7 @@ static bool gx_audio_use_float(void *data)
return false; return false;
} }
const audio_driver_t audio_gx = { audio_driver_t audio_gx = {
gx_audio_init, gx_audio_init,
gx_audio_write, gx_audio_write,
gx_audio_stop, gx_audio_stop,

View File

@ -330,7 +330,7 @@ static size_t ja_buffer_size(void *data)
return jd->buffer_size; return jd->buffer_size;
} }
const audio_driver_t audio_jack = { audio_driver_t audio_jack = {
ja_init, ja_init,
ja_write, ja_write,
ja_stop, ja_stop,
@ -342,4 +342,3 @@ const audio_driver_t audio_jack = {
ja_write_avail, ja_write_avail,
ja_buffer_size, ja_buffer_size,
}; };

View File

@ -61,7 +61,7 @@ static bool null_audio_use_float(void *data)
return true; return true;
} }
const audio_driver_t audio_null = { audio_driver_t audio_null = {
null_audio_init, null_audio_init,
null_audio_write, null_audio_write,
null_audio_stop, null_audio_stop,
@ -73,4 +73,3 @@ const audio_driver_t audio_null = {
NULL, NULL,
NULL NULL
}; };

View File

@ -239,7 +239,7 @@ static bool al_use_float(void *data)
return false; return false;
} }
const audio_driver_t audio_openal = { audio_driver_t audio_openal = {
al_init, al_init,
al_write, al_write,
al_stop, al_stop,
@ -251,4 +251,3 @@ const audio_driver_t audio_openal = {
al_write_avail, al_write_avail,
al_buffer_size, al_buffer_size,
}; };

View File

@ -284,7 +284,7 @@ static bool sl_use_float(void *data)
return false; return false;
} }
const audio_driver_t audio_opensl = { audio_driver_t audio_opensl = {
sl_init, sl_init,
sl_write, sl_write,
sl_stop, sl_stop,
@ -296,4 +296,3 @@ const audio_driver_t audio_opensl = {
sl_write_avail, sl_write_avail,
sl_buffer_size, sl_buffer_size,
}; };

View File

@ -187,7 +187,7 @@ static bool oss_use_float(void *data)
return false; return false;
} }
const audio_driver_t audio_oss = { audio_driver_t audio_oss = {
oss_init, oss_init,
oss_write, oss_write,
oss_stop, oss_stop,
@ -199,4 +199,3 @@ const audio_driver_t audio_oss = {
oss_write_avail, oss_write_avail,
oss_buffer_size, oss_buffer_size,
}; };

View File

@ -218,7 +218,7 @@ static bool ps3_audio_use_float(void *data)
return true; return true;
} }
const audio_driver_t audio_ps3 = { audio_driver_t audio_ps3 = {
ps3_audio_init, ps3_audio_init,
ps3_audio_write, ps3_audio_write,
ps3_audio_stop, ps3_audio_stop,
@ -230,4 +230,3 @@ const audio_driver_t audio_ps3 = {
NULL, NULL,
NULL NULL
}; };

View File

@ -217,7 +217,7 @@ static size_t psp_buffer_size(void *data)
} }
const audio_driver_t audio_psp1 = { audio_driver_t audio_psp1 = {
psp_audio_init, psp_audio_init,
psp_audio_write, psp_audio_write,
psp_audio_stop, psp_audio_stop,

View File

@ -298,7 +298,7 @@ static size_t pulse_buffer_size(void *data)
return pa->buffer_size; return pa->buffer_size;
} }
const audio_driver_t audio_pulse = { audio_driver_t audio_pulse = {
pulse_init, pulse_init,
pulse_write, pulse_write,
pulse_stop, pulse_stop,
@ -310,4 +310,3 @@ const audio_driver_t audio_pulse = {
pulse_write_avail, pulse_write_avail,
pulse_buffer_size, pulse_buffer_size,
}; };

View File

@ -109,7 +109,7 @@ static bool ra_use_float(void *data)
return false; return false;
} }
const audio_driver_t audio_roar = { audio_driver_t audio_roar = {
ra_init, ra_init,
ra_write, ra_write,
ra_stop, ra_stop,

View File

@ -203,7 +203,7 @@ static bool rs_use_float(void *data)
return false; return false;
} }
const audio_driver_t audio_rsound = { audio_driver_t audio_rsound = {
rs_init, rs_init,
rs_write, rs_write,
rs_stop, rs_stop,
@ -215,4 +215,3 @@ const audio_driver_t audio_rsound = {
rs_write_avail, rs_write_avail,
rs_buffer_size, rs_buffer_size,
}; };

View File

@ -75,7 +75,7 @@ static size_t rwebaudio_buffer_size(void *data)
return RWebAudioBufferSize(); return RWebAudioBufferSize();
} }
const audio_driver_t audio_rwebaudio = { audio_driver_t audio_rwebaudio = {
rwebaudio_init, rwebaudio_init,
rwebaudio_write, rwebaudio_write,
rwebaudio_stop, rwebaudio_stop,
@ -87,4 +87,3 @@ const audio_driver_t audio_rwebaudio = {
rwebaudio_write_avail, rwebaudio_write_avail,
rwebaudio_buffer_size, rwebaudio_buffer_size,
}; };

View File

@ -196,7 +196,7 @@ static bool sdl_use_float(void *data)
return false; return false;
} }
const audio_driver_t audio_sdl = { audio_driver_t audio_sdl = {
sdl_audio_init, sdl_audio_init,
sdl_audio_write, sdl_audio_write,
sdl_audio_stop, sdl_audio_stop,
@ -212,4 +212,3 @@ const audio_driver_t audio_sdl = {
NULL, NULL,
NULL NULL
}; };

View File

@ -125,7 +125,7 @@ static size_t xa_buffer_size(void *data)
return xa->bufsize; return xa->bufsize;
} }
const audio_driver_t audio_xa = { audio_driver_t audio_xa = {
xa_init, xa_init,
xa_write, xa_write,
xa_stop, xa_stop,

View File

@ -114,7 +114,7 @@ static bool xenon360_use_float(void *data)
return false; return false;
} }
const audio_driver_t audio_xenon360 = { audio_driver_t audio_xenon360 = {
xenon360_audio_init, xenon360_audio_init,
xenon360_audio_write, xenon360_audio_write,
xenon360_audio_stop, xenon360_audio_stop,
@ -126,4 +126,3 @@ const audio_driver_t audio_xenon360 = {
NULL, NULL,
NULL NULL
}; };

View File

@ -187,7 +187,7 @@ static bool android_camera_poll(void *data,
return false; return false;
} }
const camera_driver_t camera_android = { camera_driver_t camera_android = {
android_camera_init, android_camera_init,
android_camera_free, android_camera_free,
android_camera_start, android_camera_start,
@ -195,4 +195,3 @@ const camera_driver_t camera_android = {
android_camera_poll, android_camera_poll,
"android", "android",
}; };

View File

@ -40,7 +40,7 @@ static bool nullcamera_poll(void *data, retro_camera_frame_raw_framebuffer_t fra
return true; return true;
} }
const camera_driver_t camera_null = { camera_driver_t camera_null = {
nullcamera_init, nullcamera_init,
nullcamera_free, nullcamera_free,
nullcamera_start, nullcamera_start,

View File

@ -43,7 +43,7 @@ static bool rwebcam_poll(void *data, retro_camera_frame_raw_framebuffer_t frame_
return RWebCamPoll(data, frame_raw_cb, frame_gl_cb); return RWebCamPoll(data, frame_raw_cb, frame_gl_cb);
} }
const camera_driver_t camera_rwebcam = { camera_driver_t camera_rwebcam = {
rwebcam_init, rwebcam_init,
rwebcam_free, rwebcam_free,
rwebcam_start, rwebcam_start,

View File

@ -434,7 +434,7 @@ static bool v4l_poll(void *data,
return false; return false;
} }
const camera_driver_t camera_v4l2 = { camera_driver_t camera_v4l2 = {
v4l_init, v4l_init,
v4l_free, v4l_free,
v4l_start, v4l_start,
@ -442,4 +442,3 @@ const camera_driver_t camera_v4l2 = {
v4l_poll, v4l_poll,
"video4linux2", "video4linux2",
}; };

136
driver.h
View File

@ -588,75 +588,79 @@ bool driver_update_system_av_info(const struct retro_system_av_info *info);
extern driver_t driver; extern driver_t driver;
/* Backends */ /* Backends */
extern const audio_driver_t audio_rsound; extern audio_driver_t audio_rsound;
extern const audio_driver_t audio_oss; extern audio_driver_t audio_oss;
extern const audio_driver_t audio_alsa; extern audio_driver_t audio_alsa;
extern const audio_driver_t audio_alsathread; extern audio_driver_t audio_alsathread;
extern const audio_driver_t audio_roar; extern audio_driver_t audio_roar;
extern const audio_driver_t audio_openal; extern audio_driver_t audio_openal;
extern const audio_driver_t audio_opensl; extern audio_driver_t audio_opensl;
extern const audio_driver_t audio_jack; extern audio_driver_t audio_jack;
extern const audio_driver_t audio_sdl; extern audio_driver_t audio_sdl;
extern const audio_driver_t audio_xa; extern audio_driver_t audio_xa;
extern const audio_driver_t audio_pulse; extern audio_driver_t audio_pulse;
extern const audio_driver_t audio_dsound; extern audio_driver_t audio_dsound;
extern const audio_driver_t audio_coreaudio; extern audio_driver_t audio_coreaudio;
extern const audio_driver_t audio_xenon360; extern audio_driver_t audio_xenon360;
extern const audio_driver_t audio_ps3; extern audio_driver_t audio_ps3;
extern const audio_driver_t audio_gx; extern audio_driver_t audio_gx;
extern const audio_driver_t audio_psp1; extern audio_driver_t audio_psp1;
extern const audio_driver_t audio_rwebaudio; extern audio_driver_t audio_rwebaudio;
extern const audio_driver_t audio_null; extern audio_driver_t audio_null;
extern const video_driver_t video_gl;
extern const video_driver_t video_psp1;
extern const video_driver_t video_vita;
extern const video_driver_t video_d3d;
extern const video_driver_t video_gx;
extern const video_driver_t video_xenon360;
extern const video_driver_t video_xvideo;
extern const video_driver_t video_xdk_d3d;
extern const video_driver_t video_sdl;
extern const video_driver_t video_sdl2;
extern const video_driver_t video_vg;
extern const video_driver_t video_null;
extern const video_driver_t video_omap;
extern const video_driver_t video_exynos;
extern const input_driver_t input_android;
extern const input_driver_t input_sdl;
extern const input_driver_t input_dinput;
extern const input_driver_t input_x;
extern const input_driver_t input_wayland;
extern const input_driver_t input_ps3;
extern const input_driver_t input_psp;
extern const input_driver_t input_xenon360;
extern const input_driver_t input_gx;
extern const input_driver_t input_xinput;
extern const input_driver_t input_linuxraw;
extern const input_driver_t input_udev;
extern const input_driver_t input_apple;
extern const input_driver_t input_qnx;
extern const input_driver_t input_rwebinput;
extern const input_driver_t input_null;
extern const camera_driver_t camera_v4l2;
extern const camera_driver_t camera_android;
extern const camera_driver_t camera_rwebcam;
extern const camera_driver_t camera_ios;
extern const camera_driver_t camera_null;
extern const location_driver_t location_apple;
extern const location_driver_t location_android;
extern const location_driver_t location_null;
extern const input_osk_driver_t input_ps3_osk; extern video_driver_t video_gl;
extern const input_osk_driver_t input_null_osk; extern video_driver_t video_psp1;
extern video_driver_t video_vita;
extern video_driver_t video_d3d;
extern video_driver_t video_gx;
extern video_driver_t video_xenon360;
extern video_driver_t video_xvideo;
extern video_driver_t video_xdk_d3d;
extern video_driver_t video_sdl;
extern video_driver_t video_sdl2;
extern video_driver_t video_vg;
extern video_driver_t video_null;
extern video_driver_t video_omap;
extern video_driver_t video_exynos;
extern const menu_ctx_driver_t menu_ctx_rmenu; extern input_driver_t input_android;
extern const menu_ctx_driver_t menu_ctx_rmenu_xui; extern input_driver_t input_sdl;
extern const menu_ctx_driver_t menu_ctx_rgui; extern input_driver_t input_dinput;
extern const menu_ctx_driver_t menu_ctx_glui; extern input_driver_t input_x;
extern const menu_ctx_driver_t menu_ctx_lakka; extern input_driver_t input_wayland;
extern input_driver_t input_ps3;
extern input_driver_t input_psp;
extern input_driver_t input_xenon360;
extern input_driver_t input_gx;
extern input_driver_t input_xinput;
extern input_driver_t input_linuxraw;
extern input_driver_t input_udev;
extern input_driver_t input_apple;
extern input_driver_t input_qnx;
extern input_driver_t input_rwebinput;
extern input_driver_t input_null;
extern const menu_ctx_driver_backend_t menu_ctx_backend_common; extern camera_driver_t camera_v4l2;
extern const menu_ctx_driver_backend_t menu_ctx_backend_lakka; extern camera_driver_t camera_android;
extern camera_driver_t camera_rwebcam;
extern camera_driver_t camera_ios;
extern camera_driver_t camera_null;
extern location_driver_t location_apple;
extern location_driver_t location_android;
extern location_driver_t location_null;
extern input_osk_driver_t input_ps3_osk;
extern input_osk_driver_t input_null_osk;
extern menu_ctx_driver_t menu_ctx_rmenu;
extern menu_ctx_driver_t menu_ctx_rmenu_xui;
extern menu_ctx_driver_t menu_ctx_rgui;
extern menu_ctx_driver_t menu_ctx_glui;
extern menu_ctx_driver_t menu_ctx_lakka;
extern menu_ctx_driver_backend_t menu_ctx_backend_common;
extern menu_ctx_driver_backend_t menu_ctx_backend_lakka;
static inline bool input_key_pressed_func(int key) static inline bool input_key_pressed_func(int key)
{ {

View File

@ -1739,7 +1739,7 @@ static void menu_common_setting_set_label(char *type_str,
type, menu_label, label, index); type, menu_label, label, index);
} }
const menu_ctx_driver_backend_t menu_ctx_backend_common = { menu_ctx_driver_backend_t menu_ctx_backend_common = {
menu_common_iterate, menu_common_iterate,
#ifdef HAVE_SHADER_MANAGER #ifdef HAVE_SHADER_MANAGER
menu_common_shader_manager_init, menu_common_shader_manager_init,

View File

@ -427,7 +427,7 @@ static int menu_lakka_iterate(unsigned action)
return 0; return 0;
} }
const menu_ctx_driver_backend_t menu_ctx_backend_lakka = { menu_ctx_driver_backend_t menu_ctx_backend_lakka = {
menu_lakka_iterate, menu_lakka_iterate,
//#ifndef HAVE_SHADER_MANAGER //#ifndef HAVE_SHADER_MANAGER
NULL, NULL,

View File

@ -311,7 +311,7 @@ static void glui_context_reset(void *data)
g_settings.video.font_size); g_settings.video.font_size);
} }
const menu_ctx_driver_t menu_ctx_glui = { menu_ctx_driver_t menu_ctx_glui = {
NULL, NULL,
NULL, NULL,
NULL, NULL,

View File

@ -1150,7 +1150,7 @@ static void *lakka_init(void)
return menu; return menu;
} }
const menu_ctx_driver_t menu_ctx_lakka = { menu_ctx_driver_t menu_ctx_lakka = {
NULL, NULL,
NULL, NULL,
NULL, NULL,

View File

@ -469,7 +469,7 @@ void rgui_set_texture(void *data)
menu_framebuf, false, menu->width, menu->height, 1.0f); menu_framebuf, false, menu->width, menu->height, 1.0f);
} }
const menu_ctx_driver_t menu_ctx_rgui = { menu_ctx_driver_t menu_ctx_rgui = {
rgui_set_texture, rgui_set_texture,
rgui_render_messagebox, rgui_render_messagebox,
rgui_render, rgui_render,

View File

@ -341,7 +341,7 @@ static int rmenu_input_postprocess(uint64_t old_state)
return 0; return 0;
} }
const menu_ctx_driver_t menu_ctx_rmenu = { menu_ctx_driver_t menu_ctx_rmenu = {
rmenu_set_texture, rmenu_set_texture,
rmenu_render_messagebox, rmenu_render_messagebox,
rmenu_render, rmenu_render,

View File

@ -531,7 +531,7 @@ static void rmenu_xui_list_set_selection(void *data)
XuiListSetCurSel(m_menulist, file_list_get_directory_ptr(list)); XuiListSetCurSel(m_menulist, file_list_get_directory_ptr(list));
} }
const menu_ctx_driver_t menu_ctx_rmenu_xui = { menu_ctx_driver_t menu_ctx_rmenu_xui = {
NULL, NULL,
rmenu_xui_render_messagebox, rmenu_xui_render_messagebox,
rmenu_xui_render, rmenu_xui_render,

View File

@ -1255,7 +1255,7 @@ static void *d3d_init(const video_info_t *info, const input_driver_t **input,
return vid; return vid;
} }
const video_driver_t video_d3d = { video_driver_t video_d3d = {
d3d_init, d3d_init,
d3d_frame, d3d_frame,
d3d_set_nonblock_state, d3d_set_nonblock_state,

View File

@ -969,7 +969,7 @@ static bool d3d_read_viewport(void *data, uint8_t *buffer)
return false; return false;
} }
const video_driver_t video_d3d = { video_driver_t video_d3d = {
d3d_init, d3d_init,
d3d_frame, d3d_frame,
d3d_set_nonblock_state, d3d_set_nonblock_state,

View File

@ -1475,7 +1475,7 @@ static bool exynos_gfx_read_viewport(void *data, uint8_t *buffer)
return true; return true;
} }
const video_driver_t video_exynos = { video_driver_t video_exynos = {
exynos_gfx_init, exynos_gfx_init,
exynos_gfx_frame, exynos_gfx_frame,
exynos_gfx_set_nonblock_state, exynos_gfx_set_nonblock_state,

View File

@ -2963,7 +2963,7 @@ static void gl_get_poke_interface(void *data, const video_poke_interface_t **ifa
*iface = &gl_poke_interface; *iface = &gl_poke_interface;
} }
const video_driver_t video_gl = { video_driver_t video_gl = {
gl_init, gl_init,
gl_frame, gl_frame,
gl_set_nonblock_state, gl_set_nonblock_state,

View File

@ -1329,7 +1329,7 @@ static bool gx_set_shader(void *data,
return false; return false;
} }
const video_driver_t video_gx = { video_driver_t video_gx = {
gx_init, gx_init,
gx_frame, gx_frame,
gx_set_nonblock_state, gx_set_nonblock_state,

View File

@ -101,7 +101,7 @@ static void null_gfx_get_poke_interface(void *data,
(void)iface; (void)iface;
} }
const video_driver_t video_null = { video_driver_t video_null = {
null_gfx_init, null_gfx_init,
null_gfx_frame, null_gfx_frame,
null_gfx_set_nonblock_state, null_gfx_set_nonblock_state,

View File

@ -910,7 +910,7 @@ static void omap_gfx_get_poke_interface(void *data,
(void)iface; (void)iface;
} }
const video_driver_t video_omap = { video_driver_t video_omap = {
omap_gfx_init, omap_gfx_init,
omap_gfx_frame, omap_gfx_frame,
omap_gfx_set_nonblock_state, omap_gfx_set_nonblock_state,

View File

@ -814,7 +814,7 @@ static bool psp_set_shader(void *data,
return false; return false;
} }
const video_driver_t video_psp1 = { video_driver_t video_psp1 = {
psp_init, psp_init,
psp_frame, psp_frame,
psp_set_nonblock_state, psp_set_nonblock_state,

View File

@ -714,7 +714,7 @@ static bool sdl2_gfx_set_shader(void *data,
return false; return false;
} }
const video_driver_t video_sdl2 = { video_driver_t video_sdl2 = {
sdl2_gfx_init, sdl2_gfx_init,
sdl2_gfx_frame, sdl2_gfx_frame,
sdl2_gfx_set_nonblock_state, sdl2_gfx_set_nonblock_state,

View File

@ -516,7 +516,7 @@ static bool sdl_gfx_read_viewport(void *data, uint8_t *buffer)
return true; return true;
} }
const video_driver_t video_sdl = { video_driver_t video_sdl = {
sdl_gfx_init, sdl_gfx_init,
sdl_gfx_frame, sdl_gfx_frame,
sdl_gfx_set_nonblock_state, sdl_gfx_set_nonblock_state,
@ -533,4 +533,3 @@ const video_driver_t video_sdl = {
#endif #endif
sdl_get_poke_interface sdl_get_poke_interface
}; };

View File

@ -451,7 +451,7 @@ static void vg_get_poke_interface(void *data,
(void)iface; (void)iface;
} }
const video_driver_t video_vg = { video_driver_t video_vg = {
vg_init, vg_init,
vg_frame, vg_frame,
vg_set_nonblock_state, vg_set_nonblock_state,

View File

@ -300,7 +300,7 @@ static void xenon360_gfx_get_poke_interface(void *data,
(void)iface; (void)iface;
} }
const video_driver_t video_xenon360 = { video_driver_t video_xenon360 = {
xenon360_gfx_init, xenon360_gfx_init,
xenon360_gfx_frame, xenon360_gfx_frame,
xenon360_gfx_set_nonblock_state, xenon360_gfx_set_nonblock_state,
@ -318,4 +318,3 @@ const video_driver_t video_xenon360 = {
#endif #endif
xenon360_gfx_get_poke_interface xenon360_gfx_get_poke_interface
}; };

View File

@ -840,7 +840,7 @@ static bool xv_set_shader(void *data,
return false; return false;
} }
const video_driver_t video_xvideo = { video_driver_t video_xvideo = {
xv_init, xv_init,
xv_frame, xv_frame,
xv_set_nonblock_state, xv_set_nonblock_state,
@ -857,4 +857,3 @@ const video_driver_t video_xvideo = {
#endif #endif
xv_get_poke_interface xv_get_poke_interface
}; };

View File

@ -752,7 +752,7 @@ static const rarch_joypad_driver_t *android_input_get_joypad_driver(void *data)
return android->joypad; return android->joypad;
} }
const input_driver_t input_android = { input_driver_t input_android = {
android_input_init, android_input_init,
android_input_poll, android_input_poll,
android_input_state, android_input_state,

View File

@ -131,7 +131,7 @@ static void android_joypad_destroy(void)
{ {
} }
const rarch_joypad_driver_t android_joypad = { rarch_joypad_driver_t android_joypad = {
android_joypad_init, android_joypad_init,
android_joypad_query_pad, android_joypad_query_pad,
android_joypad_destroy, android_joypad_destroy,

View File

@ -623,7 +623,7 @@ static const rarch_joypad_driver_t *apple_get_joypad_driver(void *data)
return joypad; return joypad;
} }
const input_driver_t input_apple = { input_driver_t input_apple = {
apple_input_init, apple_input_init,
apple_input_poll, apple_input_poll,
apple_input_state, apple_input_state,

View File

@ -410,7 +410,7 @@ static const char *apple_joypad_name(unsigned joypad)
return NULL; return NULL;
} }
const rarch_joypad_driver_t apple_joypad = { rarch_joypad_driver_t apple_joypad = {
apple_joypad_init, apple_joypad_init,
apple_joypad_query_pad, apple_joypad_query_pad,
apple_joypad_destroy, apple_joypad_destroy,

View File

@ -956,7 +956,7 @@ static const char *dinput_joypad_name(unsigned pad)
return NULL; return NULL;
} }
const rarch_joypad_driver_t dinput_joypad = { rarch_joypad_driver_t dinput_joypad = {
dinput_joypad_init, dinput_joypad_init,
dinput_joypad_query_pad, dinput_joypad_query_pad,
dinput_joypad_destroy, dinput_joypad_destroy,

View File

@ -540,7 +540,7 @@ static const rarch_joypad_driver_t *gx_input_get_joypad_driver(void *data)
return &gx_joypad; return &gx_joypad;
} }
const input_driver_t input_gx = { input_driver_t input_gx = {
gx_input_init, gx_input_init,
gx_input_poll, gx_input_poll,
gx_input_state, gx_input_state,

View File

@ -116,7 +116,7 @@ static void gx_joypad_destroy(void)
} }
} }
const rarch_joypad_driver_t gx_joypad = { rarch_joypad_driver_t gx_joypad = {
gx_joypad_init, gx_joypad_init,
gx_joypad_query_pad, gx_joypad_query_pad,
gx_joypad_destroy, gx_joypad_destroy,

View File

@ -45,7 +45,7 @@
#include "../file.h" #include "../file.h"
static const rarch_joypad_driver_t *joypad_drivers[] = { static rarch_joypad_driver_t *joypad_drivers[] = {
#ifndef IS_RETROLAUNCH #ifndef IS_RETROLAUNCH
#ifdef __CELLOS_LV2__ #ifdef __CELLOS_LV2__
&ps3_joypad, &ps3_joypad,

View File

@ -106,18 +106,18 @@ bool input_joypad_hat_raw(const rarch_joypad_driver_t *driver,
const char *input_joypad_name(const rarch_joypad_driver_t *driver, const char *input_joypad_name(const rarch_joypad_driver_t *driver,
unsigned joypad); unsigned joypad);
extern const rarch_joypad_driver_t dinput_joypad; extern rarch_joypad_driver_t dinput_joypad;
extern const rarch_joypad_driver_t linuxraw_joypad; extern rarch_joypad_driver_t linuxraw_joypad;
extern const rarch_joypad_driver_t udev_joypad; extern rarch_joypad_driver_t udev_joypad;
extern const rarch_joypad_driver_t winxinput_joypad; extern rarch_joypad_driver_t winxinput_joypad;
extern const rarch_joypad_driver_t sdl_joypad; extern rarch_joypad_driver_t sdl_joypad;
extern const rarch_joypad_driver_t ps3_joypad; extern rarch_joypad_driver_t ps3_joypad;
extern const rarch_joypad_driver_t psp_joypad; extern rarch_joypad_driver_t psp_joypad;
extern const rarch_joypad_driver_t xdk_joypad; extern rarch_joypad_driver_t xdk_joypad;
extern const rarch_joypad_driver_t gx_joypad; extern rarch_joypad_driver_t gx_joypad;
extern const rarch_joypad_driver_t apple_joypad; extern rarch_joypad_driver_t apple_joypad;
extern const rarch_joypad_driver_t android_joypad; extern rarch_joypad_driver_t android_joypad;
extern const rarch_joypad_driver_t qnx_joypad; extern rarch_joypad_driver_t qnx_joypad;
struct rarch_key_map struct rarch_key_map
{ {

View File

@ -236,7 +236,7 @@ static uint64_t linuxraw_get_capabilities(void *data)
return caps; return caps;
} }
const input_driver_t input_linuxraw = { input_driver_t input_linuxraw = {
linuxraw_input_init, linuxraw_input_init,
linuxraw_input_poll, linuxraw_input_poll,
linuxraw_input_state, linuxraw_input_state,

View File

@ -305,7 +305,7 @@ static const char *linuxraw_joypad_name(unsigned pad)
return *g_pads[pad].ident ? g_pads[pad].ident : NULL; return *g_pads[pad].ident ? g_pads[pad].ident : NULL;
} }
const rarch_joypad_driver_t linuxraw_joypad = { rarch_joypad_driver_t linuxraw_joypad = {
linuxraw_joypad_init, linuxraw_joypad_init,
linuxraw_joypad_query_pad, linuxraw_joypad_query_pad,
linuxraw_joypad_destroy, linuxraw_joypad_destroy,
@ -316,4 +316,3 @@ const rarch_joypad_driver_t linuxraw_joypad = {
linuxraw_joypad_name, linuxraw_joypad_name,
"linuxraw", "linuxraw",
}; };

View File

@ -68,7 +68,7 @@ static bool nullinput_set_sensor_state(void *data,
return false; return false;
} }
const input_driver_t input_null = { input_driver_t input_null = {
nullinput_input_init, nullinput_input_init,
nullinput_input_poll, nullinput_input_poll,
nullinput_input_state, nullinput_input_state,

View File

@ -59,7 +59,7 @@ static void nullosk_lifecycle(void *data, uint64_t status)
{ {
} }
const input_osk_driver_t input_null_osk = { input_osk_driver_t input_null_osk = {
nullosk_init, nullosk_init,
nullosk_free, nullosk_free,
nullosk_enable_key_layout, nullosk_enable_key_layout,

View File

@ -183,7 +183,7 @@ static void oskutil_lifecycle(void *data, uint64_t status)
} }
} }
const input_osk_driver_t input_ps3_osk = { input_osk_driver_t input_ps3_osk = {
oskutil_init, oskutil_init,
oskutil_free, oskutil_free,
oskutil_enable_key_layout, oskutil_enable_key_layout,

View File

@ -351,7 +351,7 @@ static const rarch_joypad_driver_t *ps3_input_get_joypad_driver(void *data)
return ps3->joypad; return ps3->joypad;
} }
const input_driver_t input_ps3 = { input_driver_t input_ps3 = {
ps3_input_init, ps3_input_init,
ps3_input_poll, ps3_input_poll,
ps3_input_state, ps3_input_state,

View File

@ -109,7 +109,7 @@ static void ps3_joypad_destroy(void)
{ {
} }
const rarch_joypad_driver_t ps3_joypad = { rarch_joypad_driver_t ps3_joypad = {
ps3_joypad_init, ps3_joypad_init,
ps3_joypad_query_pad, ps3_joypad_query_pad,
ps3_joypad_destroy, ps3_joypad_destroy,

View File

@ -167,7 +167,7 @@ static const rarch_joypad_driver_t *psp_input_get_joypad_driver(void *data)
return psp->joypad; return psp->joypad;
} }
const input_driver_t input_psp = { input_driver_t input_psp = {
psp_input_initialize, psp_input_initialize,
psp_input_poll, psp_input_poll,
psp_input_state, psp_input_state,

View File

@ -108,7 +108,7 @@ static void psp_joypad_destroy(void)
{ {
} }
const rarch_joypad_driver_t psp_joypad = { rarch_joypad_driver_t psp_joypad = {
psp_joypad_init, psp_joypad_init,
psp_joypad_query_pad, psp_joypad_query_pad,
psp_joypad_destroy, psp_joypad_destroy,

View File

@ -802,7 +802,7 @@ static const rarch_joypad_driver_t *qnx_input_get_joypad_driver(void *data)
return qnx->joypad; return qnx->joypad;
} }
const input_driver_t input_qnx = { input_driver_t input_qnx = {
qnx_input_init, qnx_input_init,
qnx_input_poll, qnx_input_poll,
qnx_input_state, qnx_input_state,

View File

@ -108,7 +108,7 @@ static void qnx_joypad_destroy(void)
{ {
} }
const rarch_joypad_driver_t qnx_joypad = { rarch_joypad_driver_t qnx_joypad = {
qnx_joypad_init, qnx_joypad_init,
qnx_joypad_query_pad, qnx_joypad_query_pad,
qnx_joypad_destroy, qnx_joypad_destroy,

View File

@ -180,7 +180,7 @@ static uint64_t rwebinput_get_capabilities(void *data)
return caps; return caps;
} }
const input_driver_t input_rwebinput = { input_driver_t input_rwebinput = {
rwebinput_input_init, rwebinput_input_init,
rwebinput_input_poll, rwebinput_input_poll,
rwebinput_input_state, rwebinput_input_state,
@ -192,4 +192,3 @@ const input_driver_t input_rwebinput = {
"rwebinput", "rwebinput",
rwebinput_grab_mouse, rwebinput_grab_mouse,
}; };

View File

@ -353,7 +353,7 @@ static uint64_t sdl_get_capabilities(void *data)
return caps; return caps;
} }
const input_driver_t input_sdl = { input_driver_t input_sdl = {
sdl_input_init, sdl_input_init,
sdl_input_poll, sdl_input_poll,
sdl_input_state, sdl_input_state,
@ -372,4 +372,3 @@ const input_driver_t input_sdl = {
sdl_set_rumble, sdl_set_rumble,
sdl_get_joypad_driver, sdl_get_joypad_driver,
}; };

View File

@ -404,7 +404,7 @@ static const char *sdl_joypad_name(unsigned pad)
return pad_name(pad); return pad_name(pad);
} }
const rarch_joypad_driver_t sdl_joypad = { rarch_joypad_driver_t sdl_joypad = {
sdl_joypad_init, sdl_joypad_init,
sdl_joypad_query_pad, sdl_joypad_query_pad,
sdl_joypad_destroy, sdl_joypad_destroy,
@ -423,4 +423,3 @@ const rarch_joypad_driver_t sdl_joypad = {
"sdl" "sdl"
#endif #endif
}; };

View File

@ -818,7 +818,7 @@ static const rarch_joypad_driver_t *udev_input_get_joypad_driver(void *data)
return udev->joypad; return udev->joypad;
} }
const input_driver_t input_udev = { input_driver_t input_udev = {
udev_input_init, udev_input_init,
udev_input_poll, udev_input_poll,
udev_input_state, udev_input_state,
@ -832,4 +832,3 @@ const input_driver_t input_udev = {
udev_input_set_rumble, udev_input_set_rumble,
udev_input_get_joypad_driver, udev_input_get_joypad_driver,
}; };

View File

@ -571,7 +571,7 @@ static const char *udev_joypad_name(unsigned pad)
return *g_pads[pad].ident ? g_pads[pad].ident : NULL; return *g_pads[pad].ident ? g_pads[pad].ident : NULL;
} }
const rarch_joypad_driver_t udev_joypad = { rarch_joypad_driver_t udev_joypad = {
udev_joypad_init, udev_joypad_init,
udev_joypad_query_pad, udev_joypad_query_pad,
udev_joypad_destroy, udev_joypad_destroy,
@ -582,4 +582,3 @@ const rarch_joypad_driver_t udev_joypad = {
udev_joypad_name, udev_joypad_name,
"udev", "udev",
}; };

View File

@ -426,7 +426,7 @@ static bool winxinput_joypad_rumble(unsigned pad,
== ERROR_SUCCESS; == ERROR_SUCCESS;
} }
const rarch_joypad_driver_t winxinput_joypad = { rarch_joypad_driver_t winxinput_joypad = {
winxinput_joypad_init, winxinput_joypad_init,
winxinput_joypad_query_pad, winxinput_joypad_query_pad,
winxinput_joypad_destroy, winxinput_joypad_destroy,
@ -437,4 +437,3 @@ const rarch_joypad_driver_t winxinput_joypad = {
winxinput_joypad_name, winxinput_joypad_name,
"winxinput", "winxinput",
}; };

View File

@ -329,7 +329,7 @@ static uint64_t x_input_get_capabilities(void *data)
return caps; return caps;
} }
const input_driver_t input_x = { input_driver_t input_x = {
x_input_init, x_input_init,
x_input_poll, x_input_poll,
x_input_state, x_input_state,
@ -343,4 +343,3 @@ const input_driver_t input_x = {
x_set_rumble, x_set_rumble,
x_get_joypad_driver, x_get_joypad_driver,
}; };

View File

@ -276,8 +276,7 @@ static const rarch_joypad_driver_t *xdk_input_get_joypad_driver(void *data)
return xdk->joypad; return xdk->joypad;
} }
const input_driver_t input_xinput = input_driver_t input_xinput = {
{
xdk_input_init, xdk_input_init,
xdk_input_poll, xdk_input_poll,
xdk_input_state, xdk_input_state,

View File

@ -115,7 +115,7 @@ static void xdk_joypad_destroy(void)
{ {
} }
const rarch_joypad_driver_t xdk_joypad = { rarch_joypad_driver_t xdk_joypad = {
xdk_joypad_init, xdk_joypad_init,
xdk_joypad_query_pad, xdk_joypad_query_pad,
xdk_joypad_destroy, xdk_joypad_destroy,

View File

@ -101,7 +101,7 @@ static uint64_t xenon360_get_capabilities(void *data)
return caps; return caps;
} }
const input_driver_t input_xenon360 = { input_driver_t input_xenon360 = {
xenon360_input_init, xenon360_input_init,
xenon360_input_poll, xenon360_input_poll,
xenon360_input_state, xenon360_input_state,

View File

@ -203,7 +203,7 @@ static void android_location_set_interval(void *data, unsigned interval_ms,
(int)interval_distance); (int)interval_distance);
} }
const location_driver_t location_android = { location_driver_t location_android = {
android_location_init, android_location_init,
android_location_free, android_location_free,
android_location_start, android_location_start,

View File

@ -53,7 +53,7 @@ static void null_location_set_interval(void *data,
{ {
} }
const location_driver_t location_null = { location_driver_t location_null = {
null_location_init, null_location_init,
null_location_free, null_location_free,
null_location_start, null_location_start,