summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2024-02-12 03:44:23 +0100
committerGitHub <noreply@github.com>2024-02-12 03:44:23 +0100
commitb6b56f48b7eedd44cdbb03b3a3ef82b7bedc7081 (patch)
tree825a923f3d479206e83697452b6e53c320f2fed7
parentMerge pull request #12986 from t895/input-config-clear-fix (diff)
parentservice: news: Stub remaining functions (diff)
downloadyuzu-b6b56f48b7eedd44cdbb03b3a3ef82b7bedc7081.tar
yuzu-b6b56f48b7eedd44cdbb03b3a3ef82b7bedc7081.tar.gz
yuzu-b6b56f48b7eedd44cdbb03b3a3ef82b7bedc7081.tar.bz2
yuzu-b6b56f48b7eedd44cdbb03b3a3ef82b7bedc7081.tar.lz
yuzu-b6b56f48b7eedd44cdbb03b3a3ef82b7bedc7081.tar.xz
yuzu-b6b56f48b7eedd44cdbb03b3a3ef82b7bedc7081.tar.zst
yuzu-b6b56f48b7eedd44cdbb03b3a3ef82b7bedc7081.zip
-rw-r--r--src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp2
-rw-r--r--src/core/hle/service/bcat/news/news_database_service.cpp24
-rw-r--r--src/core/hle/service/bcat/news/news_database_service.h8
-rw-r--r--src/core/hle/service/bcat/news/news_service.cpp17
-rw-r--r--src/core/hle/service/bcat/news/news_service.h4
-rw-r--r--src/core/hle/service/bcat/news/overwrite_event_holder.cpp2
-rw-r--r--src/core/hle/service/bcat/news/service_creator.cpp10
7 files changed, 54 insertions, 13 deletions
diff --git a/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp b/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp
index 5be167fce..ed393f7a2 100644
--- a/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp
+++ b/src/core/hle/service/bcat/news/newly_arrived_event_holder.cpp
@@ -12,7 +12,7 @@ INewlyArrivedEventHolder::INewlyArrivedEventHolder(Core::System& system_)
"INewlyArrivedEventHolder"} {
// clang-format off
static const FunctionInfo functions[] = {
- {0, C<&INewlyArrivedEventHolder::Get>, "Get"},
+ {0, D<&INewlyArrivedEventHolder::Get>, "Get"},
};
// clang-format on
diff --git a/src/core/hle/service/bcat/news/news_database_service.cpp b/src/core/hle/service/bcat/news/news_database_service.cpp
index 18109f9b0..b94ef0636 100644
--- a/src/core/hle/service/bcat/news/news_database_service.cpp
+++ b/src/core/hle/service/bcat/news/news_database_service.cpp
@@ -11,12 +11,12 @@ INewsDatabaseService::INewsDatabaseService(Core::System& system_)
// clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "GetListV1"},
- {1, C<&INewsDatabaseService::Count>, "Count"},
+ {1, D<&INewsDatabaseService::Count>, "Count"},
{2, nullptr, "CountWithKey"},
{3, nullptr, "UpdateIntegerValue"},
- {4, nullptr, "UpdateIntegerValueWithAddition"},
+ {4, D<&INewsDatabaseService::UpdateIntegerValueWithAddition>, "UpdateIntegerValueWithAddition"},
{5, nullptr, "UpdateStringValue"},
- {1000, nullptr, "GetList"},
+ {1000, D<&INewsDatabaseService::GetList>, "GetList"},
};
// clang-format on
@@ -32,4 +32,22 @@ Result INewsDatabaseService::Count(Out<s32> out_count,
R_SUCCEED();
}
+Result INewsDatabaseService::UpdateIntegerValueWithAddition(
+ u32 value, InBuffer<BufferAttr_HipcPointer> buffer_data_1,
+ InBuffer<BufferAttr_HipcPointer> buffer_data_2) {
+ LOG_WARNING(Service_BCAT, "(STUBBED) called, value={}, buffer_size_1={}, buffer_data_2={}",
+ value, buffer_data_1.size(), buffer_data_2.size());
+ R_SUCCEED();
+}
+
+Result INewsDatabaseService::GetList(Out<s32> out_count, u32 value,
+ OutBuffer<BufferAttr_HipcMapAlias> out_buffer_data,
+ InBuffer<BufferAttr_HipcPointer> buffer_data_1,
+ InBuffer<BufferAttr_HipcPointer> buffer_data_2) {
+ LOG_WARNING(Service_BCAT, "(STUBBED) called, value={}, buffer_size_1={}, buffer_data_2={}",
+ value, buffer_data_1.size(), buffer_data_2.size());
+ *out_count = 0;
+ R_SUCCEED();
+}
+
} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/news_database_service.h b/src/core/hle/service/bcat/news/news_database_service.h
index f5916634b..860b7074c 100644
--- a/src/core/hle/service/bcat/news/news_database_service.h
+++ b/src/core/hle/service/bcat/news/news_database_service.h
@@ -19,6 +19,14 @@ public:
private:
Result Count(Out<s32> out_count, InBuffer<BufferAttr_HipcPointer> buffer_data);
+
+ Result UpdateIntegerValueWithAddition(u32 value, InBuffer<BufferAttr_HipcPointer> buffer_data_1,
+ InBuffer<BufferAttr_HipcPointer> buffer_data_2);
+
+ Result GetList(Out<s32> out_count, u32 value,
+ OutBuffer<BufferAttr_HipcMapAlias> out_buffer_data,
+ InBuffer<BufferAttr_HipcPointer> buffer_data_1,
+ InBuffer<BufferAttr_HipcPointer> buffer_data_2);
};
} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/news_service.cpp b/src/core/hle/service/bcat/news/news_service.cpp
index e19cea7b5..bc6c2afd2 100644
--- a/src/core/hle/service/bcat/news/news_service.cpp
+++ b/src/core/hle/service/bcat/news/news_service.cpp
@@ -11,10 +11,10 @@ INewsService::INewsService(Core::System& system_) : ServiceFramework{system_, "I
static const FunctionInfo functions[] = {
{10100, nullptr, "PostLocalNews"},
{20100, nullptr, "SetPassphrase"},
- {30100, C<&INewsService::GetSubscriptionStatus>, "GetSubscriptionStatus"},
+ {30100, D<&INewsService::GetSubscriptionStatus>, "GetSubscriptionStatus"},
{30101, nullptr, "GetTopicList"},
{30110, nullptr, "Unknown30110"},
- {30200, nullptr, "IsSystemUpdateRequired"},
+ {30200, D<&INewsService::IsSystemUpdateRequired>, "IsSystemUpdateRequired"},
{30201, nullptr, "Unknown30201"},
{30210, nullptr, "Unknown30210"},
{30300, nullptr, "RequestImmediateReception"},
@@ -24,7 +24,7 @@ INewsService::INewsService(Core::System& system_) : ServiceFramework{system_, "I
{30901, nullptr, "Unknown30901"},
{30902, nullptr, "Unknown30902"},
{40100, nullptr, "SetSubscriptionStatus"},
- {40101, nullptr, "RequestAutoSubscription"},
+ {40101, D<&INewsService::RequestAutoSubscription>, "RequestAutoSubscription"},
{40200, nullptr, "ClearStorage"},
{40201, nullptr, "ClearSubscriptionStatusAll"},
{90100, nullptr, "GetNewsDatabaseDump"},
@@ -43,4 +43,15 @@ Result INewsService::GetSubscriptionStatus(Out<u32> out_status,
R_SUCCEED();
}
+Result INewsService::IsSystemUpdateRequired(Out<bool> out_is_system_update_required) {
+ LOG_WARNING(Service_BCAT, "(STUBBED) called");
+ *out_is_system_update_required = false;
+ R_SUCCEED();
+}
+
+Result INewsService::RequestAutoSubscription(u64 value) {
+ LOG_WARNING(Service_BCAT, "(STUBBED) called");
+ R_SUCCEED();
+}
+
} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/news_service.h b/src/core/hle/service/bcat/news/news_service.h
index 8d06be9d6..f1716a302 100644
--- a/src/core/hle/service/bcat/news/news_service.h
+++ b/src/core/hle/service/bcat/news/news_service.h
@@ -19,6 +19,10 @@ public:
private:
Result GetSubscriptionStatus(Out<u32> out_status, InBuffer<BufferAttr_HipcPointer> buffer_data);
+
+ Result IsSystemUpdateRequired(Out<bool> out_is_system_update_required);
+
+ Result RequestAutoSubscription(u64 value);
};
} // namespace Service::News
diff --git a/src/core/hle/service/bcat/news/overwrite_event_holder.cpp b/src/core/hle/service/bcat/news/overwrite_event_holder.cpp
index c32a5ca8f..1712971e4 100644
--- a/src/core/hle/service/bcat/news/overwrite_event_holder.cpp
+++ b/src/core/hle/service/bcat/news/overwrite_event_holder.cpp
@@ -11,7 +11,7 @@ IOverwriteEventHolder::IOverwriteEventHolder(Core::System& system_)
"IOverwriteEventHolder"} {
// clang-format off
static const FunctionInfo functions[] = {
- {0, C<&IOverwriteEventHolder::Get>, "Get"},
+ {0, D<&IOverwriteEventHolder::Get>, "Get"},
};
// clang-format on
diff --git a/src/core/hle/service/bcat/news/service_creator.cpp b/src/core/hle/service/bcat/news/service_creator.cpp
index d5ba5dff7..a1b22c004 100644
--- a/src/core/hle/service/bcat/news/service_creator.cpp
+++ b/src/core/hle/service/bcat/news/service_creator.cpp
@@ -15,11 +15,11 @@ IServiceCreator::IServiceCreator(Core::System& system_, u32 permissions_, const
: ServiceFramework{system_, name_}, permissions{permissions_} {
// clang-format off
static const FunctionInfo functions[] = {
- {0, C<&IServiceCreator::CreateNewsService>, "CreateNewsService"},
- {1, C<&IServiceCreator::CreateNewlyArrivedEventHolder>, "CreateNewlyArrivedEventHolder"},
- {2, C<&IServiceCreator::CreateNewsDataService>, "CreateNewsDataService"},
- {3, C<&IServiceCreator::CreateNewsDatabaseService>, "CreateNewsDatabaseService"},
- {4, C<&IServiceCreator::CreateOverwriteEventHolder>, "CreateOverwriteEventHolder"},
+ {0, D<&IServiceCreator::CreateNewsService>, "CreateNewsService"},
+ {1, D<&IServiceCreator::CreateNewlyArrivedEventHolder>, "CreateNewlyArrivedEventHolder"},
+ {2, D<&IServiceCreator::CreateNewsDataService>, "CreateNewsDataService"},
+ {3, D<&IServiceCreator::CreateNewsDatabaseService>, "CreateNewsDatabaseService"},
+ {4, D<&IServiceCreator::CreateOverwriteEventHolder>, "CreateOverwriteEventHolder"},
};
// clang-format on