From e27accc15dff2a4b0d893be8f098d6a6a36cdad3 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Thu, 18 Jan 2018 00:57:11 -0500
Subject: [PATCH] time: Stub out GetTotalLocationNameCount and some cleanup.
---
src/core/hle/service/time/time.cpp | 14 +++++++++++---
src/core/hle/service/time/time.h | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/core/hle/service/time/time.cpp b/src/core/hle/service/time/time.cpp
index a48d7b304..9fed89246 100644
--- a/src/core/hle/service/time/time.cpp
+++ b/src/core/hle/service/time/time.cpp
@@ -45,6 +45,7 @@ public:
ITimeZoneService() : ServiceFramework("ITimeZoneService") {
static const FunctionInfo functions[] = {
{0, &ITimeZoneService::GetDeviceLocationName, "GetDeviceLocationName"},
+ {2, &ITimeZoneService::GetTotalLocationNameCount, "GetTotalLocationNameCount"},
{101, &ITimeZoneService::ToCalendarTimeWithMyRule, "ToCalendarTimeWithMyRule"},
};
RegisterHandlers(functions);
@@ -53,10 +54,17 @@ public:
private:
void GetDeviceLocationName(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service, "(STUBBED) called");
- LocationName name{};
- IPC::RequestBuilder rb{ctx, 11};
+ LocationName location_name{};
+ IPC::RequestBuilder rb{ctx, (sizeof(LocationName) / 4) + 2};
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) {
diff --git a/src/core/hle/service/time/time.h b/src/core/hle/service/time/time.h
index 2aa424dbb..399f474d6 100644
--- a/src/core/hle/service/time/time.h
+++ b/src/core/hle/service/time/time.h
@@ -13,7 +13,7 @@ namespace Time {
struct LocationName {
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 {
u16_le year;