From 5465da0139ce40ead91515de0200d912d000d20b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 22 Sep 2015 18:55:14 +0200 Subject: [PATCH] Rename rarch_sleep to retro_sleep --- audio/drivers/ctr_audio.c | 2 +- audio/drivers/dsound.c | 2 +- audio/drivers/openal.c | 2 +- audio/librsound.c | 11 +--- frontend/drivers/platform_ctr.c | 6 ++- frontend/drivers/platform_emscripten.c | 2 +- frontend/drivers/platform_linux.c | 2 +- frontend/frontend.c | 2 +- input/connect/connect_wii.c | 6 +-- libretro-common/include/retro_miscellaneous.h | 4 +- libretro-common/include/rthreads/rthreads.h | 52 +------------------ netlogger.c | 2 +- runloop.c | 2 +- tools/retroarch-joyconfig.c | 2 +- ui/drivers/ui_cocoa.m | 2 +- ui/drivers/ui_cocoatouch.m | 2 +- 16 files changed, 23 insertions(+), 78 deletions(-) diff --git a/audio/drivers/ctr_audio.c b/audio/drivers/ctr_audio.c index 0cfc3db9b2..809f530055 100644 --- a/audio/drivers/ctr_audio.c +++ b/audio/drivers/ctr_audio.c @@ -126,7 +126,7 @@ static ssize_t ctr_audio_write(void *data, const void *buf, size_t size) { do{ /* todo: compute the correct sleep period */ - rarch_sleep(1); + retro_sleep(1); current_tick = svcGetSystemTick(); samples_played = (current_tick - ctr->cpu_ticks_last) / ctr->cpu_ticks_per_sample; ctr->playpos = (ctr->playpos + samples_played) & CTR_AUDIO_COUNT_MASK; diff --git a/audio/drivers/dsound.c b/audio/drivers/dsound.c index aeb27713fd..26a6b5bb85 100644 --- a/audio/drivers/dsound.c +++ b/audio/drivers/dsound.c @@ -166,7 +166,7 @@ static void dsound_thread(void *data) * but it is not guaranteed to work, so use high * priority sleeping patterns. */ - rarch_sleep(1); + retro_sleep(1); continue; } diff --git a/audio/drivers/openal.c b/audio/drivers/openal.c index 1a746e5a6b..e8ce4495aa 100644 --- a/audio/drivers/openal.c +++ b/audio/drivers/openal.c @@ -151,7 +151,7 @@ static bool al_get_buffer(al_t *al, ALuint *buffer) return false; /* Must sleep as there is no proper blocking method. */ - rarch_sleep(1); + retro_sleep(1); } } diff --git a/audio/librsound.c b/audio/librsound.c index 2f9b9ceb88..2c583206ee 100644 --- a/audio/librsound.c +++ b/audio/librsound.c @@ -153,7 +153,6 @@ static int rsnd_send_info_query(rsound_t *rd); static int rsnd_update_server_info(rsound_t *rd); static int rsnd_poll(struct pollfd *fd, int numfd, int timeout); -static void rsnd_sleep(int msec); static void rsnd_cb_thread(void *thread_data); static void rsnd_thread(void *thread_data); @@ -748,12 +747,6 @@ static int64_t rsnd_get_time_usec(void) #endif } -static void rsnd_sleep(int msec) -{ - rarch_sleep(msec); -} - - /* Calculates how many bytes there are in total in the virtual buffer. This is calculated client side. It should be accurate enough unless we have big problems with buffer underruns. This function is called by rsd_delay() to determine the latency. @@ -1246,7 +1239,7 @@ static void rsnd_cb_thread(void *thread_data) // The network might do things in large chunks, so it may request large amounts of data in short periods of time. // This breaks when the caller cannot buffer up big buffers beforehand, so do short sleeps inbetween. // This is somewhat dirty, but I cannot see a better solution - rsnd_sleep(1); + retro_sleep(1); } } } @@ -1513,7 +1506,7 @@ void rsd_delay_wait(rsound_t *rd) { int64_t sleep_ms = latency_ms - rd->max_latency; RSD_DEBUG("[RSound] Delay wait: %d ms.\n", (int)sleep_ms); - rsnd_sleep((int)sleep_ms); + retro_sleep((int)sleep_ms); } } } diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c index df4ed28427..a2412b4243 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -265,9 +265,11 @@ void wait_for_input(void) if (kDown & KEY_SELECT) exit(0); -// select_pressed = true; +#if 0 + select_pressed = true; +#endif - rarch_sleep(1); + retro_sleep(1); } } diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c index 8c4b1f7860..f0e5b894c2 100644 --- a/frontend/drivers/platform_emscripten.c +++ b/frontend/drivers/platform_emscripten.c @@ -32,7 +32,7 @@ static void emscripten_mainloop(void) unsigned sleep_ms = 0; int ret = rarch_main_iterate(&sleep_ms); if (ret == 1 && sleep_ms > 0) - rarch_sleep(sleep_ms); + retro_sleep(sleep_ms); rarch_main_data_iterate(); if (ret != -1) return; diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index c769439128..dcc3eb3882 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -696,7 +696,7 @@ static void android_app_entry(void *data) ret = rarch_main_iterate(&sleep_ms); if (ret == 1 && sleep_ms > 0) - rarch_sleep(sleep_ms); + retro_sleep(sleep_ms); rarch_main_data_iterate(); }while (ret != -1); diff --git a/frontend/frontend.c b/frontend/frontend.c index 97a0d2d876..13a4f78d74 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -346,7 +346,7 @@ int rarch_main(int argc, char *argv[], void *data) ret = rarch_main_iterate(&sleep_ms); if (ret == 1 && sleep_ms > 0) - rarch_sleep(sleep_ms); + retro_sleep(sleep_ms); rarch_main_data_iterate(); }while(ret != -1); diff --git a/input/connect/connect_wii.c b/input/connect/connect_wii.c index 8cfe6f71eb..1abc4619dc 100644 --- a/input/connect/connect_wii.c +++ b/input/connect/connect_wii.c @@ -484,12 +484,12 @@ static int wiimote_handshake(struct connect_wii_wiimote_t* wm, * 0x00 to 0x(4)A400FB. (support clones) */ buf = 0x55; wiimote_write_data(wm, 0x04A400F0, &buf, 1); - rarch_sleep(100); + retro_sleep(100); buf = 0x00; wiimote_write_data(wm, 0x04A400FB, &buf, 1); /* check extension type! */ - rarch_sleep(100); + retro_sleep(100); wiimote_read_data(wm, WM_EXP_MEM_CALIBR + 220, 4); #if 0 wiimote_read_data(wm, WM_EXP_MEM_CALIBR, EXP_HANDSHAKE_LEN); @@ -553,7 +553,7 @@ static int wiimote_handshake(struct connect_wii_wiimote_t* wm, switch (id) { case IDENT_CC: - rarch_sleep(100); + retro_sleep(100); /* pedimos datos de calibracion del JOY! */ wiimote_read_data(wm, WM_EXP_MEM_CALIBR, 16); wm->handshake_state = 5; diff --git a/libretro-common/include/retro_miscellaneous.h b/libretro-common/include/retro_miscellaneous.h index 1c00442388..0209c9bcd0 100644 --- a/libretro-common/include/retro_miscellaneous.h +++ b/libretro-common/include/retro_miscellaneous.h @@ -71,12 +71,12 @@ #define RARCH_SCALE_BASE 256 /** - * rarch_sleep: + * retro_sleep: * @msec : amount in milliseconds to sleep * * Sleeps for a specified amount of milliseconds (@msec). **/ -static INLINE void rarch_sleep(unsigned msec) +static INLINE void retro_sleep(unsigned msec) { #if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) sys_timer_usleep(1000 * msec); diff --git a/libretro-common/include/rthreads/rthreads.h b/libretro-common/include/rthreads/rthreads.h index be83d68107..399f25d380 100644 --- a/libretro-common/include/rthreads/rthreads.h +++ b/libretro-common/include/rthreads/rthreads.h @@ -26,6 +26,7 @@ #include #include #include +#include #if defined(__cplusplus) && !defined(_MSC_VER) extern "C" { @@ -169,57 +170,6 @@ int scond_broadcast(scond_t *cond); **/ void scond_signal(scond_t *cond); -#ifndef RARCH_INTERNAL -#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__) -#include -#elif defined(XENON) -#include