Updated source to match SDL function prototype style

This commit is contained in:
Sam Lantinga
2023-05-23 10:59:03 -07:00
parent 92f72682e7
commit 3f1fd5abff
243 changed files with 1218 additions and 2364 deletions

View File

@@ -274,8 +274,7 @@ void SDL_TimerQuit(void)
}
}
SDL_TimerID
SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param)
SDL_TimerID SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param)
{
SDL_TimerData *data = &SDL_timer_data;
SDL_Timer *timer;
@@ -337,8 +336,7 @@ SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param)
return entry->timerID;
}
SDL_bool
SDL_RemoveTimer(SDL_TimerID id)
SDL_bool SDL_RemoveTimer(SDL_TimerID id)
{
SDL_TimerData *data = &SDL_timer_data;
SDL_TimerMap *prev, *entry;
@@ -420,8 +418,7 @@ void SDL_TimerQuit(void)
}
}
SDL_TimerID
SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param)
SDL_TimerID SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param)
{
SDL_TimerData *data = &SDL_timer_data;
SDL_TimerMap *entry;
@@ -446,8 +443,7 @@ SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *param)
return entry->timerID;
}
SDL_bool
SDL_RemoveTimer(SDL_TimerID id)
SDL_bool SDL_RemoveTimer(SDL_TimerID id)
{
SDL_TimerData *data = &SDL_timer_data;
SDL_TimerMap *prev, *entry;
@@ -480,8 +476,7 @@ SDL_RemoveTimer(SDL_TimerID id)
which wraps back to zero every ~49 days. The newer SDL_GetTicks64()
doesn't have this problem, so we just wrap that function and clamp to
the low 32-bits for binary compatibility. */
Uint32
SDL_GetTicks(void)
Uint32 SDL_GetTicks(void)
{
return (Uint32)(SDL_GetTicks64() & 0xFFFFFFFF);
}

View File

@@ -39,8 +39,7 @@ void SDL_TicksQuit(void)
ticks_started = SDL_FALSE;
}
Uint64
SDL_GetTicks64(void)
Uint64 SDL_GetTicks64(void)
{
if (!ticks_started) {
SDL_TicksInit();
@@ -50,14 +49,12 @@ SDL_GetTicks64(void)
return 0;
}
Uint64
SDL_GetPerformanceCounter(void)
Uint64 SDL_GetPerformanceCounter(void)
{
return SDL_GetTicks();
}
Uint64
SDL_GetPerformanceFrequency(void)
Uint64 SDL_GetPerformanceFrequency(void)
{
return 1000;
}

View File

@@ -45,8 +45,7 @@ void SDL_TicksQuit(void)
ticks_started = SDL_FALSE;
}
Uint64
SDL_GetTicks64(void)
Uint64 SDL_GetTicks64(void)
{
if (!ticks_started) {
SDL_TicksInit();
@@ -55,14 +54,12 @@ SDL_GetTicks64(void)
return (Uint64)((system_time() - start) / 1000);
}
Uint64
SDL_GetPerformanceCounter(void)
Uint64 SDL_GetPerformanceCounter(void)
{
return system_time();
}
Uint64
SDL_GetPerformanceFrequency(void)
Uint64 SDL_GetPerformanceFrequency(void)
{
return 1000000;
}

View File

@@ -44,8 +44,7 @@ void SDL_TicksQuit(void)
ticks_started = SDL_FALSE;
}
Uint64
SDL_GetTicks64(void)
Uint64 SDL_GetTicks64(void)
{
u64 elapsed;
if (!ticks_started) {
@@ -56,14 +55,12 @@ SDL_GetTicks64(void)
return elapsed / CPU_TICKS_PER_MSEC;
}
Uint64
SDL_GetPerformanceCounter(void)
Uint64 SDL_GetPerformanceCounter(void)
{
return svcGetSystemTick();
}
Uint64
SDL_GetPerformanceFrequency(void)
Uint64 SDL_GetPerformanceFrequency(void)
{
return SYSCLOCK_ARM11;
}

View File

@@ -56,8 +56,7 @@ void SDL_TicksQuit(void)
ticks_started = SDL_FALSE;
}
Uint64
SDL_GetTicks64(void)
Uint64 SDL_GetTicks64(void)
{
if (!ticks_started) {
SDL_TicksInit();
@@ -69,14 +68,12 @@ SDL_GetTicks64(void)
return (Uint64)(deltaTics * tickPeriodMilliSeconds);
}
Uint64
SDL_GetPerformanceCounter(void)
Uint64 SDL_GetPerformanceCounter(void)
{
return (Uint64)User::TickCount();
}
Uint64
SDL_GetPerformanceFrequency(void)
Uint64 SDL_GetPerformanceFrequency(void)
{
return 1000000;
}

View File

@@ -43,8 +43,7 @@ static SDL_bool ticks_started = SDL_FALSE;
static ULONG ulTmrFreq = 0;
static ULLONG ullTmrStart = 0;
void
SDL_TicksInit(void)
void SDL_TicksInit(void)
{
ULONG ulTmrStart; /* for 32-bit fallback. */
ULONG ulRC;
@@ -70,14 +69,12 @@ SDL_TicksInit(void)
ullTmrStart = (ULLONG) ulTmrStart;
}
void
SDL_TicksQuit(void)
void SDL_TicksQuit(void)
{
ticks_started = SDL_FALSE;
}
Uint64
SDL_GetTicks64(void)
Uint64 SDL_GetTicks64(void)
{
Uint64 ui64Result;
ULLONG ullTmrNow;
@@ -99,8 +96,7 @@ SDL_GetTicks64(void)
return ui64Result;
}
Uint64
SDL_GetPerformanceCounter(void)
Uint64 SDL_GetPerformanceCounter(void)
{
QWORD qwTmrNow;
@@ -110,14 +106,12 @@ SDL_GetPerformanceCounter(void)
return *((Uint64 *)&qwTmrNow);
}
Uint64
SDL_GetPerformanceFrequency(void)
Uint64 SDL_GetPerformanceFrequency(void)
{
return (ulTmrFreq == 0)? 1000 : (Uint64)ulTmrFreq;
}
void
SDL_Delay(Uint32 ms)
void SDL_Delay(Uint32 ms)
{
HTIMER hTimer = NULLHANDLE;
ULONG ulRC;

View File

@@ -49,8 +49,7 @@ void SDL_TicksQuit(void)
ticks_started = SDL_FALSE;
}
Uint64
SDL_GetTicks64(void)
Uint64 SDL_GetTicks64(void)
{
uint64_t now;
@@ -62,14 +61,12 @@ SDL_GetTicks64(void)
return (Uint64)((now - start) / (kBUSCLK / CLOCKS_PER_SEC));
}
Uint64
SDL_GetPerformanceCounter(void)
Uint64 SDL_GetPerformanceCounter(void)
{
return SDL_GetTicks64();
}
Uint64
SDL_GetPerformanceFrequency(void)
Uint64 SDL_GetPerformanceFrequency(void)
{
return 1000;
}

View File

@@ -49,8 +49,7 @@ void SDL_TicksQuit(void)
ticks_started = SDL_FALSE;
}
Uint64
SDL_GetTicks64(void)
Uint64 SDL_GetTicks64(void)
{
struct timeval now;
@@ -62,14 +61,12 @@ SDL_GetTicks64(void)
return (Uint64)(((Sint64)(now.tv_sec - start.tv_sec) * 1000) + ((now.tv_usec - start.tv_usec) / 1000));
}
Uint64
SDL_GetPerformanceCounter(void)
Uint64 SDL_GetPerformanceCounter(void)
{
return SDL_GetTicks64();
}
Uint64
SDL_GetPerformanceFrequency(void)
Uint64 SDL_GetPerformanceFrequency(void)
{
return 1000;
}

View File

@@ -101,8 +101,7 @@ void SDL_TicksQuit(void)
ticks_started = SDL_FALSE;
}
Uint64
SDL_GetTicks64(void)
Uint64 SDL_GetTicks64(void)
{
if (!ticks_started) {
SDL_TicksInit();
@@ -127,8 +126,7 @@ SDL_GetTicks64(void)
}
}
Uint64
SDL_GetPerformanceCounter(void)
Uint64 SDL_GetPerformanceCounter(void)
{
Uint64 ticks;
if (!ticks_started) {
@@ -160,8 +158,7 @@ SDL_GetPerformanceCounter(void)
return ticks;
}
Uint64
SDL_GetPerformanceFrequency(void)
Uint64 SDL_GetPerformanceFrequency(void)
{
if (!ticks_started) {
SDL_TicksInit();

View File

@@ -49,8 +49,7 @@ void SDL_TicksQuit(void)
ticks_started = SDL_FALSE;
}
Uint64
SDL_GetTicks64(void)
Uint64 SDL_GetTicks64(void)
{
uint64_t now;
@@ -62,14 +61,12 @@ SDL_GetTicks64(void)
return (Uint64)((now - start) / 1000);
}
Uint64
SDL_GetPerformanceCounter(void)
Uint64 SDL_GetPerformanceCounter(void)
{
return sceKernelGetProcessTimeWide();
}
Uint64
SDL_GetPerformanceFrequency(void)
Uint64 SDL_GetPerformanceFrequency(void)
{
return 1000000;
}

View File

@@ -106,8 +106,7 @@ void SDL_TicksQuit(void)
ticks_started = SDL_FALSE;
}
Uint64
SDL_GetTicks64(void)
Uint64 SDL_GetTicks64(void)
{
LARGE_INTEGER now;
BOOL rc;
@@ -121,8 +120,7 @@ SDL_GetTicks64(void)
return (Uint64)(((now.QuadPart - start_ticks.QuadPart) * 1000) / ticks_per_second.QuadPart);
}
Uint64
SDL_GetPerformanceCounter(void)
Uint64 SDL_GetPerformanceCounter(void)
{
LARGE_INTEGER counter;
const BOOL rc = QueryPerformanceCounter(&counter);
@@ -130,8 +128,7 @@ SDL_GetPerformanceCounter(void)
return (Uint64)counter.QuadPart;
}
Uint64
SDL_GetPerformanceFrequency(void)
Uint64 SDL_GetPerformanceFrequency(void)
{
LARGE_INTEGER frequency;
const BOOL rc = QueryPerformanceFrequency(&frequency);