hugopeixoto/yuzu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #97 from bunnei/time-stub

Browse Source 
time: Stub out GetTotalLocationNameCount and some cleanup.
This commit is contained in:
bunnei 2018-01-19 14:47:50 -05:00 committed by GitHub
commit c3005ee4d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/hle/service/time/time.cpp
View File

@ -45,6 +45,7 @@ public:
ITimeZoneService() : ServiceFramework("ITimeZoneService") { ITimeZoneService() : ServiceFramework("ITimeZoneService") {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &ITimeZoneService::GetDeviceLocationName, "GetDeviceLocationName"}, {0, &ITimeZoneService::GetDeviceLocationName, "GetDeviceLocationName"},
{2, &ITimeZoneService::GetTotalLocationNameCount, "GetTotalLocationNameCount"},
{101, &ITimeZoneService::ToCalendarTimeWithMyRule, "ToCalendarTimeWithMyRule"}, {101, &ITimeZoneService::ToCalendarTimeWithMyRule, "ToCalendarTimeWithMyRule"},
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
@ -53,10 +54,17 @@ public:
private: private:
void GetDeviceLocationName(Kernel::HLERequestContext& ctx) { void GetDeviceLocationName(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service, "(STUBBED) called"); LOG_WARNING(Service, "(STUBBED) called");
LocationName name{}; LocationName location_name{};
IPC::RequestBuilder rb{ctx, 11}; IPC::RequestBuilder rb{ctx, (sizeof(LocationName) / 4) + 2};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.PushRaw(name); rb.PushRaw(location_name);
}
void GetTotalLocationNameCount(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service, "(STUBBED) called");
IPC::RequestBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
rb.Push<u32>(0);
} }
void ToCalendarTimeWithMyRule(Kernel::HLERequestContext& ctx) { void ToCalendarTimeWithMyRule(Kernel::HLERequestContext& ctx) {

2
src/core/hle/service/time/time.h
View File

@ -13,7 +13,7 @@ namespace Time {
struct LocationName { struct LocationName {
INSERT_PADDING_BYTES(0x24); INSERT_PADDING_BYTES(0x24);
}; };
static_assert(sizeof(LocationName) == 0x24, "LocationName structure has incorrect size"); static_assert(sizeof(LocationName) == 0x24, "LocationName is incorrect size");
struct CalendarTime { struct CalendarTime {
u16_le year; u16_le year;