Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make sceRtcSetTime_t test complete

Browse source 
(Now with fixed line endings)
This commit is contained in:
TMaul 2012-12-05 23:48:20 +00:00
parent 1a13bfe8a9
commit af8dfdb4e4
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Core/HLE/sceRtc.cpp
View file

@ -419,14 +419,14 @@ int sceRtcCheckValid(u32 datePtr)
return ret; return ret;
} }
int sceRtcSetTime_t(u32 datePtr, u64 time) int sceRtcSetTime_t(u32 datePtr, u32 time)
{ {
ERROR_LOG(HLE, "HACK sceRtcSetTime_t(%d,%d)", datePtr, time); ERROR_LOG(HLE, "HACK sceRtcSetTime_t(%d,%d)", datePtr, time);
if (Memory::IsValidAddress(datePtr)) if (Memory::IsValidAddress(datePtr))
{ {
ScePspDateTime pt; ScePspDateTime pt;
__RtcTicksToPspTime(pt, time*1000000ULL);
__RtcTicksToPspTime(pt, time); pt.year += 1969;
Memory::WriteStruct(datePtr, &pt); Memory::WriteStruct(datePtr, &pt);
} }
else else
@ -620,18 +620,28 @@ int sceRtcTickAddMonths(u32 destTickPtr, u32 srcTickPtr, int numMonths)
{ {
u64 srcTick = Memory::Read_U64(srcTickPtr); u64 srcTick = Memory::Read_U64(srcTickPtr);
// slightly bodgy but we need to add months to a pt and then convert to ticks // slightly bodgy but we need to add months to a pt and then convert to ticks to cover different day count in months and leapyears
ScePspDateTime pt; ScePspDateTime pt;
memset(&pt, 0, sizeof(pt)); memset(&pt, 0, sizeof(pt));
if (numMonths < 0) if (numMonths < 0)
{ {
numMonths = (numMonths^0xFFFFFFFF)+1; numMonths = -numMonths;;
int years = numMonths /12; int years = numMonths /12;
int realmonths = numMonths % 12; int realmonths = numMonths % 12;
pt.year = years; pt.year = years;
pt.month = realmonths; pt.month = realmonths;
srcTick -=__RtcPspTimeToTicks(pt); u64 monthTicks =__RtcPspTimeToTicks(pt);
if (monthTicks <= srcTick)
{
srcTick-=monthTicks;
}
else
{
srcTick=0;
}
} }
else else
{ {
@ -661,7 +671,7 @@ int sceRtcTickAddYears(u32 destTickPtr, u32 srcTickPtr, int numYears)
if (numYears < 0) if (numYears < 0)
{ {
pt.year = (numYears^0xFFFFFFFF)+1; pt.year = -numYears;
u64 yearTicks = __RtcPspTimeToTicks(pt); u64 yearTicks = __RtcPspTimeToTicks(pt);
if (yearTicks <= srcTick) if (yearTicks <= srcTick)
{ {
@ -706,7 +716,7 @@ const HLEFunction sceRtc[] =
{0x05ef322c, WrapU_UU<sceRtcGetDaysInMonth>, "sceRtcGetDaysInMonth"}, {0x05ef322c, WrapU_UU<sceRtcGetDaysInMonth>, "sceRtcGetDaysInMonth"},
{0x57726bc1, WrapU_UUU<sceRtcGetDayOfWeek>, "sceRtcGetDayOfWeek"}, {0x57726bc1, WrapU_UUU<sceRtcGetDayOfWeek>, "sceRtcGetDayOfWeek"},
{0x4B1B5E82, WrapI_U<sceRtcCheckValid>, "sceRtcCheckValid"}, {0x4B1B5E82, WrapI_U<sceRtcCheckValid>, "sceRtcCheckValid"},
{0x3a807cc8, WrapI_UU64<sceRtcSetTime_t>, "sceRtcSetTime_t"}, {0x3a807cc8, WrapI_UU<sceRtcSetTime_t>, "sceRtcSetTime_t"},
{0x27c4594c, WrapI_UU<sceRtcGetTime_t>, "sceRtcGetTime_t"}, {0x27c4594c, WrapI_UU<sceRtcGetTime_t>, "sceRtcGetTime_t"},
{0xF006F264, WrapI_UU<sceRtcSetDosTime>, "sceRtcSetDosTime"}, {0xF006F264, WrapI_UU<sceRtcSetDosTime>, "sceRtcSetDosTime"},
{0x36075567, WrapI_UU<sceRtcGetDosTime>, "sceRtcGetDosTime"}, {0x36075567, WrapI_UU<sceRtcGetDosTime>, "sceRtcGetDosTime"},