mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-03 16:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix sceRtcGetCurrentClockLocalTime,

Browse Source 
fixes sceRtcGetCurrentClockLocalTime using lizardy's suggestions.

also implements various formatting improvements and logging changes
This commit is contained in:
CrazyBloo 2024-09-03 16:17:00 +09:00
parent 9187913c42
commit 7a6f22dfa0
3 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/libraries/kernel/time_management.h
View File

@ -53,6 +53,7 @@ u64 PS4_SYSV_ABI sceKernelGetProcessTimeCounter();
u64 PS4_SYSV_ABI sceKernelGetProcessTimeCounterFrequency(); u64 PS4_SYSV_ABI sceKernelGetProcessTimeCounterFrequency();
u64 PS4_SYSV_ABI sceKernelReadTsc(); u64 PS4_SYSV_ABI sceKernelReadTsc();
int PS4_SYSV_ABI sceKernelClockGettime(s32 clock_id, OrbisKernelTimespec* tp); int PS4_SYSV_ABI sceKernelClockGettime(s32 clock_id, OrbisKernelTimespec* tp);
s32 PS4_SYSV_ABI sceKernelGettimezone(OrbisKernelTimezone* tz);
int PS4_SYSV_ABI sceKernelConvertLocaltimeToUtc(time_t param_1, int64_t param_2, time_t* seconds, int PS4_SYSV_ABI sceKernelConvertLocaltimeToUtc(time_t param_1, int64_t param_2, time_t* seconds,
OrbisKernelTimezone* timezone, int* dst_seconds); OrbisKernelTimezone* timezone, int* dst_seconds);
void timeSymbolsRegister(Core::Loader::SymbolsResolver* sym); void timeSymbolsRegister(Core::Loader::SymbolsResolver* sym);

60
src/core/libraries/rtc/rtc.cpp
View File

@ -80,7 +80,7 @@ int PS4_SYSV_ABI sceRtcConvertLocalTimeToUtc(OrbisRtcTick* pTickLocal, OrbisRtcT
if (convertValue >= 0) { if (convertValue >= 0) {
convertValue = sceRtcTickAddMinutes( convertValue = sceRtcTickAddMinutes(
pTickUtc, pTickLocal, -((timezone.tz_dsttime + timezone.tz_minuteswest) / 0x3c)); pTickUtc, pTickLocal, -((timezone.tz_dsttime + timezone.tz_minuteswest) / 60));
} }
return convertValue; return convertValue;
@ -99,7 +99,7 @@ int PS4_SYSV_ABI sceRtcConvertUtcToLocalTime(OrbisRtcTick* pTickUtc, OrbisRtcTic
(pTickUtc->tick + 0xff23400100d44000U) / 1000000, &seconds, &timezone, 0); (pTickUtc->tick + 0xff23400100d44000U) / 1000000, &seconds, &timezone, 0);
if (convertValue >= 0) { if (convertValue >= 0) {
auto newTime = ((timezone.dst_sec + timezone.west_sec) / 0x3c) * 60000000; auto newTime = ((timezone.dst_sec + timezone.west_sec) / 60) * 60000000;
if (pTickLocal == nullptr) if (pTickLocal == nullptr)
return ORBIS_RTC_ERROR_INVALID_POINTER; return ORBIS_RTC_ERROR_INVALID_POINTER;
@ -124,7 +124,8 @@ int PS4_SYSV_ABI sceRtcEnd() {
return SCE_OK; return SCE_OK;
} }
int PS4_SYSV_ABI sceRtcFormatRFC2822(char* pszDateTime, const OrbisRtcTick* pTickUtc, int minutes) { int PS4_SYSV_ABI sceRtcFormatRFC2822(char* pszDateTime, const OrbisRtcTick* pTickUtc,
int iTimeZoneMinutes) {
LOG_ERROR(Lib_Rtc, "(STUBBED) called"); LOG_ERROR(Lib_Rtc, "(STUBBED) called");
return ORBIS_OK; return ORBIS_OK;
} }
@ -134,7 +135,8 @@ int PS4_SYSV_ABI sceRtcFormatRFC2822LocalTime(char* pszDateTime, const OrbisRtcT
return ORBIS_OK; return ORBIS_OK;
} }
int PS4_SYSV_ABI sceRtcFormatRFC3339(char* pszDateTime, const OrbisRtcTick* pTickUtc, int minutes) { int PS4_SYSV_ABI sceRtcFormatRFC3339(char* pszDateTime, const OrbisRtcTick* pTickUtc,
int iTimeZoneMinutes) {
LOG_ERROR(Lib_Rtc, "(STUBBED) called"); LOG_ERROR(Lib_Rtc, "(STUBBED) called");
return ORBIS_OK; return ORBIS_OK;
} }
@ -145,7 +147,7 @@ int PS4_SYSV_ABI sceRtcFormatRFC3339LocalTime(char* pszDateTime, const OrbisRtcT
} }
int PS4_SYSV_ABI sceRtcFormatRFC3339Precise(char* pszDateTime, const OrbisRtcTick* pTickUtc, int PS4_SYSV_ABI sceRtcFormatRFC3339Precise(char* pszDateTime, const OrbisRtcTick* pTickUtc,
int minutes) { int iTimeZoneMinutes) {
LOG_ERROR(Lib_Rtc, "(STUBBED) called"); LOG_ERROR(Lib_Rtc, "(STUBBED) called");
return ORBIS_OK; return ORBIS_OK;
} }
@ -178,7 +180,7 @@ int PS4_SYSV_ABI sceRtcGetCurrentClock(OrbisRtcDateTime* pTime, int timeZone) {
LOG_TRACE(Lib_Rtc, "called"); LOG_TRACE(Lib_Rtc, "called");
if (pTime == nullptr) if (pTime == nullptr)
return ORBIS_RTC_ERROR_INVALID_POINTER; return ORBIS_RTC_ERROR_DATETIME_UNINITIALIZED;
Kernel::OrbisKernelTimespec clocktime; Kernel::OrbisKernelTimespec clocktime;
int returnValue = Kernel::sceKernelClockGettime(Kernel::ORBIS_CLOCK_REALTIME, &clocktime); int returnValue = Kernel::sceKernelClockGettime(Kernel::ORBIS_CLOCK_REALTIME, &clocktime);
@ -191,6 +193,9 @@ int PS4_SYSV_ABI sceRtcGetCurrentClock(OrbisRtcDateTime* pTime, int timeZone) {
sceRtcSetTick(pTime, &clockTick); sceRtcSetTick(pTime, &clockTick);
} }
LOG_INFO(Lib_Rtc, "Got Current Clock {}/{}/{} @ {}:{}", pTime->year, pTime->month, pTime->day,
pTime->hour, pTime->minute);
return returnValue; return returnValue;
} }
@ -198,28 +203,37 @@ int PS4_SYSV_ABI sceRtcGetCurrentClockLocalTime(OrbisRtcDateTime* pTime) {
LOG_TRACE(Lib_Rtc, "called"); LOG_TRACE(Lib_Rtc, "called");
if (pTime == nullptr) if (pTime == nullptr)
return ORBIS_RTC_ERROR_INVALID_POINTER; return ORBIS_RTC_ERROR_DATETIME_UNINITIALIZED;
Kernel::OrbisKernelTimespec clocktime; Kernel::OrbisKernelTimezone timeZone;
int returnValue = Kernel::sceKernelClockGettime(Kernel::ORBIS_CLOCK_REALTIME, &clocktime); int returnValue = Kernel::sceKernelGettimezone(&timeZone);
if (returnValue >= 0) { if (returnValue >= 0) {
u64 clockTick = clocktime.tv_nsec / 1000 + clocktime.tv_sec * 1000000 + 0xdcbffeff2bc000; Kernel::OrbisKernelTimespec clocktime;
time_t seconds; // calculate total timezone offset for converting UTC to local time
Kernel::OrbisTimesec timezone; uint64_t tzOffset = -(timeZone.tz_minuteswest - (timeZone.tz_dsttime * 60));
returnValue =
Kernel::sceKernelConvertUtcToLocaltime(clockTick / 1000000, &seconds, &timezone, 0);
returnValue = sceKernelClockGettime(0, &clocktime);
if (returnValue >= 0) { if (returnValue >= 0) {
OrbisRtcTick newTick; OrbisRtcTick newTick;
newTick.tick = clockTick; newTick.tick =
sceRtcTickAddMinutes(&newTick, &newTick, (timezone.dst_sec + timezone.west_sec) / 0x3c); ((unsigned __int64)((unsigned __int128)(clocktime.tv_nsec *
(signed __int128)2361183241434822607LL) >>
64) >>
63) +
((signed __int64)((unsigned __int128)(clocktime.tv_nsec *
(signed __int128)2361183241434822607LL) >>
64) >>
7) +
1000000 * clocktime.tv_sec + 62135596800000000LL;
sceRtcTickAddMinutes(&newTick, &newTick, tzOffset);
sceRtcSetTick(pTime, &newTick); sceRtcSetTick(pTime, &newTick);
} }
} }
LOG_INFO(Lib_Rtc, "Got Local Time {}/{}/{} @ {}:{}", pTime->year, pTime->month, pTime->day,
pTime->hour, pTime->minute);
return returnValue; return returnValue;
} }
@ -281,7 +295,7 @@ int PS4_SYSV_ABI sceRtcGetCurrentTick(OrbisRtcTick* pTick) {
LOG_TRACE(Lib_Rtc, "called"); LOG_TRACE(Lib_Rtc, "called");
if (pTick == nullptr) if (pTick == nullptr)
return ORBIS_RTC_ERROR_INVALID_POINTER; return ORBIS_RTC_ERROR_DATETIME_UNINITIALIZED;
Kernel::OrbisKernelTimespec clocktime; Kernel::OrbisKernelTimespec clocktime;
int returnValue = Kernel::sceKernelClockGettime(Kernel::ORBIS_CLOCK_REALTIME, &clocktime); int returnValue = Kernel::sceKernelClockGettime(Kernel::ORBIS_CLOCK_REALTIME, &clocktime);
@ -323,7 +337,13 @@ int PS4_SYSV_ABI sceRtcGetDayOfWeek(int year, int month, int day) {
if (day <= 0 || day > daysInMonth) if (day <= 0 || day > daysInMonth)
return ORBIS_RTC_ERROR_INVALID_DAY; return ORBIS_RTC_ERROR_INVALID_DAY;
return ORBIS_OK; std::chrono::sys_days chrono_time{std::chrono::year(year) / std::chrono::month(month) /
std::chrono::day(day)};
std::chrono::weekday chrono_weekday{chrono_time};
LOG_INFO(Lib_Rtc, "Got Day Of Week : {}", chrono_weekday.c_encoding());
return chrono_weekday.c_encoding();
} }
int PS4_SYSV_ABI sceRtcGetDaysInMonth(int year, int month) { int PS4_SYSV_ABI sceRtcGetDaysInMonth(int year, int month) {
@ -340,6 +360,8 @@ int PS4_SYSV_ABI sceRtcGetDaysInMonth(int year, int month) {
int lastDay = static_cast<int>(unsigned( int lastDay = static_cast<int>(unsigned(
std::chrono::year_month_day_last{chronoYear / chronoMonth / std::chrono::last}.day())); std::chrono::year_month_day_last{chronoYear / chronoMonth / std::chrono::last}.day()));
LOG_INFO(Lib_Rtc, "Got Days In Month : {}", lastDay);
return lastDay; return lastDay;
} }

1
src/core/libraries/rtc/rtc_error.h
View File

@ -3,6 +3,7 @@
#pragma once #pragma once
constexpr int ORBIS_RTC_ERROR_DATETIME_UNINITIALIZED = 0x7FFEF9FE;
constexpr int ORBIS_RTC_ERROR_INVALID_PARAMETER = 0x80010602; constexpr int ORBIS_RTC_ERROR_INVALID_PARAMETER = 0x80010602;
constexpr int ORBIS_RTC_ERROR_INVALID_TICK_PARAMETER = 0x80010603; constexpr int ORBIS_RTC_ERROR_INVALID_TICK_PARAMETER = 0x80010603;
constexpr int ORBIS_RTC_ERROR_INVALID_DATE_PARAMETER = 0x80010604; constexpr int ORBIS_RTC_ERROR_INVALID_DATE_PARAMETER = 0x80010604;