ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename rarch_sleep to retro_sleep

This commit is contained in:
twinaphex 2015-09-22 18:55:14 +02:00
parent 1e3202a95e
commit 5465da0139
16 changed files with 23 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/drivers/ctr_audio.c
View File

@ -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;

2
audio/drivers/dsound.c
View File

@ -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;
}

2
audio/drivers/openal.c
View File

@ -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);
}
}

11
audio/librsound.c
View File

@ -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);
}
}
}

6
frontend/drivers/platform_ctr.c
View File

@ -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);
}
}

2
frontend/drivers/platform_emscripten.c
View File

@ -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;

2
frontend/drivers/platform_linux.c
View File

@ -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);

2
frontend/frontend.c
View File

@ -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);

6
input/connect/connect_wii.c
View File

@ -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;

4
libretro-common/include/retro_miscellaneous.h
View File

@ -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);

52
libretro-common/include/rthreads/rthreads.h
View File

@ -26,6 +26,7 @@
#include <boolean.h>
#include <stdint.h>
#include <retro_inline.h>
#include <retro_miscellaneous.h>
#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 <sys/timer.h>
#elif defined(XENON)
#include <time/time.h>
#elif defined(GEKKO) || defined(__PSL1GHT__) || defined(__QNX__)
#include <unistd.h>
#elif defined(PSP)
#include <pspthreadman.h>
#include <psputils.h>
#elif defined(VITA)
#include <psp2/kernel/threadmgr.h>
#elif defined(_3DS)
#include <3ds.h>
#elif defined(_WIN32) && !defined(_XBOX)
#include <windows.h>
#elif defined(_XBOX)
#include <xtl.h>
#else
#include <time.h>
#endif
/**
* retro_sleep:
* @msec : amount in milliseconds to sleep
*
* Sleeps for a specified amount of milliseconds (@msec).
**/
static INLINE void retro_sleep(unsigned msec)
{
#if defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
sys_timer_usleep(1000 * msec);
#elif defined(PSP) || defined(VITA)
sceKernelDelayThread(1000 * msec);
#elif defined(_3DS)
svcSleepThread(1000000 * (s64)msec);
#elif defined(_WIN32)
Sleep(msec);
#elif defined(XENON)
udelay(1000 * msec);
#elif defined(GEKKO) || defined(__PSL1GHT__) || defined(__QNX__)
usleep(1000 * msec);
#else
struct timespec tv = {0};
tv.tv_sec = msec / 1000;
tv.tv_nsec = (msec % 1000) * 1000000;
nanosleep(&tv, NULL);
#endif
}
#endif
#if defined(__cplusplus) && !defined(_MSC_VER)
}
#endif

2
netlogger.c
View File

@ -85,7 +85,7 @@ static int network_interface_up(struct sockaddr_in *target, int index,
if (state == CELL_NET_CTL_STATE_IPObtained)
break;
rarch_sleep(500);
retro_sleep(500);
timeout_count--;
if (index && timeout_count < 0)
return 0;

2
runloop.c
View File

@ -1126,7 +1126,7 @@ int rarch_main_iterate(unsigned *sleep_ms)
}
if ((settings->video.frame_delay > 0) && !driver->nonblock_state)
rarch_sleep(settings->video.frame_delay);
retro_sleep(settings->video.frame_delay);
/* Run libretro for one frame. */
pretro_run();

2
tools/retroarch-joyconfig.c
View File

@ -216,7 +216,7 @@ static void get_binds(config_file_t *conf, config_file_t *auto_conf,
* Ideally use an event-based joypad scheme,
* but it adds far more complexity, so, meh.
*/
rarch_sleep(10);
retro_sleep(10);
if (timeout_ticks)
{

2
ui/drivers/ui_cocoa.m
View File

@ -212,7 +212,7 @@ static void poll_iteration(void)
poll_iteration();
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(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.002, FALSE) == kCFRunLoopRunHandledSource);
}

2
ui/drivers/ui_cocoatouch.m
View File

@ -64,7 +64,7 @@ static void rarch_draw_observer(CFRunLoopObserverRef observer,
int ret = rarch_main_iterate(&sleep_ms);
if (ret == 1 && !ui_companion_is_on_foreground() && sleep_ms > 0)
rarch_sleep(sleep_ms);
retro_sleep(sleep_ms);
rarch_main_data_iterate();
if (ret == -1)