diff --git a/arch/dreamcast/audio.c b/arch/dreamcast/audio.c index 2233e2738..b7847b0b7 100644 --- a/arch/dreamcast/audio.c +++ b/arch/dreamcast/audio.c @@ -25,7 +25,6 @@ #include #include -#include "platform.h" #ifdef CONFIG_AUDIO @@ -57,7 +56,7 @@ static void *dc_audio_thread(void *dud) void init_audio_platform(struct config_info *conf) { - audio.buffer_samples = conf->buffer_size / 2; + audio.buffer_samples = conf->audio_buffer_samples / 2; buffer_size = 4 * audio.buffer_samples; audio.mix_buffer = cmalloc(buffer_size * 2); sound_buffer = cmalloc(buffer_size); diff --git a/arch/dreamcast/event.c b/arch/dreamcast/event.c index 0e7244f27..108d69f0f 100644 --- a/arch/dreamcast/event.c +++ b/arch/dreamcast/event.c @@ -36,11 +36,11 @@ void real_warp_mouse(int x, int y) { } -bool dc_update_input(void); +boolean dc_update_input(void); -bool __update_event_status(void) +boolean __update_event_status(void) { - bool retval = false; + boolean retval = false; retval |= dc_update_input(); return retval; } @@ -56,7 +56,7 @@ void __wait_event(int timeout) // Taken from arch/nds/event.c // Send a key up/down event to MZX. -void do_unicode_key_event(struct buffered_status *status, bool down, +void do_unicode_key_event(struct buffered_status *status, boolean down, enum keycode code, int unicode) { if(down) @@ -75,7 +75,7 @@ void do_unicode_key_event(struct buffered_status *status, bool down, } } -void do_key_event(struct buffered_status *status, bool down, +void do_key_event(struct buffered_status *status, boolean down, enum keycode code) { do_unicode_key_event(status, down, code, @@ -83,7 +83,7 @@ void do_key_event(struct buffered_status *status, bool down, } // Send a joystick button up/down event to MZX. -void do_joybutton_event(struct buffered_status *status, bool down, +void do_joybutton_event(struct buffered_status *status, boolean down, int button) { // Look up the keycode for this joystick button. @@ -91,7 +91,7 @@ void do_joybutton_event(struct buffered_status *status, bool down, do_key_event(status, down, stuffed_key); } -static inline bool check_key(struct buffered_status *status, +static inline boolean check_key(struct buffered_status *status, Uint32 down, Uint32 up, Uint32 key, enum keycode code) { if(down & key) @@ -113,7 +113,7 @@ static inline bool check_key(struct buffered_status *status, } } -static inline bool check_joy(struct buffered_status *status, +static inline boolean check_joy(struct buffered_status *status, Uint32 down, Uint32 up, Uint32 key, Uint32 code) { if(down & key) @@ -138,13 +138,13 @@ static inline bool check_joy(struct buffered_status *status, static Uint32 last_buttons; static Uint32 last_ltrig, last_rtrig; -bool dc_update_input(void) +boolean dc_update_input(void) { struct buffered_status *status = store_status(); maple_device_t *maple_pad, *maple_kbd; cont_state_t *pad; Uint32 down, held, up; - bool retval = false; + boolean retval = false; maple_pad = maple_enum_type(0, MAPLE_FUNC_CONTROLLER); if (maple_pad && (pad = (cont_state_t*) maple_dev_status(maple_pad))) { diff --git a/arch/dreamcast/event.h b/arch/dreamcast/event.h index 70d1fc92a..400dc75ab 100644 --- a/arch/dreamcast/event.h +++ b/arch/dreamcast/event.h @@ -24,9 +24,9 @@ #include "../../src/event.h" -void do_unicode_key_event(struct buffered_status *status, bool down, +void do_unicode_key_event(struct buffered_status *status, boolean down, enum keycode code, int unicode); -void do_key_event(struct buffered_status *status, bool down, enum keycode code); -void do_joybutton_event(struct buffered_status *status, bool down, int button); +void do_key_event(struct buffered_status *status, boolean down, enum keycode code); +void do_joybutton_event(struct buffered_status *status, boolean down, int button); #endif /* __DREAMCAST_EVENT_H__ */ diff --git a/arch/dreamcast/platform.c b/arch/dreamcast/platform.c index ef0e64270..f2c82acc7 100644 --- a/arch/dreamcast/platform.c +++ b/arch/dreamcast/platform.c @@ -41,7 +41,7 @@ Uint32 get_ticks(void) return (Uint32) timer_ms_gettime64(); } -bool platform_init(void) +boolean platform_init(void) { return true; } diff --git a/arch/dreamcast/thread.h b/arch/dreamcast/thread.h index 137901ebd..b6bcdf600 100644 --- a/arch/dreamcast/thread.h +++ b/arch/dreamcast/thread.h @@ -25,6 +25,7 @@ __M_BEGIN_DECLS #include +#include #define THREAD_RES void* #define THREAD_RETURN do { return; } while(0)