AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 18:15:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

DS: Fix incorrect stopwatch measurement resulting in jumpy movement etc

Browse Source
This commit is contained in:
UnknownShadow200 2024-03-22 19:42:01 +11:00
parent de815b0de8
commit 85db25c305
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Platform_NDS.c
View File

@ -30,9 +30,6 @@ const char* Platform_AppNameSuffix = " NDS";
/*########################################################################################################################* /*########################################################################################################################*
*------------------------------------------------------Logging/Time-------------------------------------------------------* *------------------------------------------------------Logging/Time-------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
static u32 rtcSecs;
static void syncRTC(void) { rtcSecs++; }
cc_uint64 Stopwatch_ElapsedMicroseconds(cc_uint64 beg, cc_uint64 end) { cc_uint64 Stopwatch_ElapsedMicroseconds(cc_uint64 beg, cc_uint64 end) {
if (end < beg) return 0; if (end < beg) return 0;
@ -40,9 +37,9 @@ cc_uint64 Stopwatch_ElapsedMicroseconds(cc_uint64 beg, cc_uint64 end) {
} }
cc_uint64 Stopwatch_Measure(void) { cc_uint64 Stopwatch_Measure(void) {
u16 raw = timerTick(1); u32 raw = cpuGetTiming();
u32 usecs = timerTicks2usec(raw); u32 usecs = timerTicks2usec(raw);
return rtcSecs * 1000000ULL + usecs; return usecs;
} }
void Platform_Log(const char* msg, int len) { void Platform_Log(const char* msg, int len) {
@ -56,11 +53,11 @@ void Platform_Log(const char* msg, int len) {
printf("%s\n", buffer); printf("%s\n", buffer);
} }
#define UnixTime_TotalMS(time) ((cc_uint64)time.tv_sec * 1000 + UNIX_EPOCH + (time.tv_usec / 1000)) #define UnixTime_TotalMS(time) ((cc_uint64)time.tv_sec * 1000 + UNIX_EPOCH)
TimeMS DateTime_CurrentUTC_MS(void) { TimeMS DateTime_CurrentUTC_MS(void) {
struct timeval cur; struct timeval cur;
gettimeofday(&cur, NULL); gettimeofday(&cur, NULL);
return UnixTime_TotalMS(cur); return UnixTime_TotalMS(cur); // no usec on the DS
} }
void DateTime_CurrentLocal(struct DateTime* t) { void DateTime_CurrentLocal(struct DateTime* t) {
@ -159,10 +156,6 @@ void Thread_Run(void** handle, Thread_StartFunc func, int stackSize, const char*
*handle = NULL; *handle = NULL;
} }
void Thread_Start2(void* handle, Thread_StartFunc func) {
// TODO: actual multithreading ???
}
void Thread_Detach(void* handle) { void Thread_Detach(void* handle) {
} }
@ -233,8 +226,7 @@ cc_result Socket_CheckWritable(cc_socket s, cc_bool* writable) {
*--------------------------------------------------------Platform---------------------------------------------------------* *--------------------------------------------------------Platform---------------------------------------------------------*
*#########################################################################################################################*/ *#########################################################################################################################*/
void Platform_Init(void) { void Platform_Init(void) {
// Setup a timer that triggers an interrupt once per second cpuStartTiming(1);
timerStart(1, ClockDivider_1024, TIMER_FREQ_1024(1), syncRTC);
// TODO: Redesign Drawer2D to better handle this // TODO: Redesign Drawer2D to better handle this
Options_SetBool(OPT_USE_CHAT_FONT, true); Options_SetBool(OPT_USE_CHAT_FONT, true);