mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-23 13:22:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Time fixes (#102)

Browse Source 
* provide microseconds to gettimeofday
* implement clock functions
This commit is contained in:
Dave Murphy 2018-06-07 20:35:41 +01:00 committed by yellows8
parent 1abfb02460
commit 3326d5e62d
2 changed files with 72 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nx/source/runtime/init.c
View File

@ -14,6 +14,7 @@ void NORETURN __nx_exit(Result rc, LoaderReturnFn retaddr);
void virtmemSetup(void);
void newlibSetup(void);
void argvSetup(void);
void __libnx_init_time(void);
extern u32 __nx_applet_type;
@ -106,6 +107,8 @@ void __attribute__((weak)) __appInit(void)
if (R_FAILED(rc))
fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_Time));
__libnx_init_time();
rc = fsInitialize();
if (R_FAILED(rc))
fatalSimple(MAKERESULT(Module_Libnx, LibnxError_InitFail_FS));

75
nx/source/runtime/newlib.c
View File

@ -1,5 +1,6 @@
#include <string.h>
#include <errno.h>
#include <stdint.h>
#include <sys/iosupport.h>
#include <sys/time.h>
#include <sys/lock.h>
@ -8,6 +9,7 @@
#include "types.h"
#include "runtime/env.h"
#include "kernel/mutex.h"
#include "kernel/svc.h"
#include "services/fatal.h"
#include "services/time.h"
#include "result.h"
@ -29,20 +31,76 @@ static struct _reent* __libnx_get_reent(void) {
}
//TODO: timeGetCurrentTime() returns UTC time. How to handle timezones?
static u64 __boottime;
static u64 __bootticks;
// setup boot time variables
void __libnx_init_time(void) {
Result rc = timeGetCurrentTime(__nx_time_type, &__boottime);
if (R_FAILED(rc)) {
__boottime = UINT64_MAX;
} else {
__bootticks = svcGetSystemTick();
}
}
static const u64 nsec_clockres = 1000000000ULL / 19200000ULL;
int __libnx_clock_getres(clockid_t clock_id, struct timespec *tp) {
if(clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME) {
errno = EINVAL;
return -1;
}
if(tp) {
tp->tv_sec = 0;
tp->tv_nsec = nsec_clockres;
return 0;
} else {
errno = EFAULT;
return -1;
}
}
int __libnx_clock_gettime(clockid_t clock_id, struct timespec *tp) {
if(clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME) {
errno = EINVAL;
return -1;
}
if(tp) {
u64 now=svcGetSystemTick() - __bootticks;
u64 __bootsecs = now / 19200000ULL;
tp->tv_sec = __bootsecs + __boottime;
u64 nsecs = (now - __bootsecs * 19200000ULL) * 10000ULL / 192ULL;
tp->tv_nsec = nsecs - nsecs % nsec_clockres;
return 0;
} else {
errno = EFAULT;
return -1;
}
}
int __libnx_clock_settime(clockid_t clock_id,const struct timespec *tp) {
errno = EINVAL;
return -1;
}
int __libnx_gtod(struct _reent *ptr, struct timeval *tp, struct timezone *tz) {
if (tp != NULL) {
u64 now=0;
Result rc=0;
rc = timeGetCurrentTime(__nx_time_type, &now);
if (R_FAILED(rc)) {
if(__boottime == UINT64_MAX) {
ptr->_errno = EINVAL;
return -1;
}
tp->tv_sec = now;
tp->tv_usec = now*1000000;//timeGetCurrentTime() only returns seconds.
u64 now=svcGetSystemTick() - __bootticks;
u64 __bootsecs = now / 19200000ULL;
tp->tv_sec = __bootsecs + __boottime;
tp->tv_usec = (now - __bootsecs * 19200000ULL) * 10ULL / 192ULL;
}
if (tz != NULL) {
@ -65,6 +123,11 @@ void newlibSetup(void) {
__syscalls.gettod_r = __libnx_gtod;
__syscalls.getreent = __libnx_get_reent;
__syscalls.clock_gettime = __libnx_clock_gettime;
__syscalls.clock_getres = __libnx_clock_getres;
__syscalls.clock_settime = __libnx_clock_settime;
// Register locking syscalls
__syscalls.lock_init = mutexInit;
__syscalls.lock_acquire = mutexLock;