summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2020-06-25 08:00:25 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2020-06-26 14:35:21 +0200
commit72f14ae21f93663c74aec7e12f23d6dc52a7350c (patch)
tree0a0673bf7cacde2375f3640ff5adcadeae53d6d6
parentcaps: Use enum classes and check struct sizes on compile time (diff)
downloadyuzu-72f14ae21f93663c74aec7e12f23d6dc52a7350c.tar
yuzu-72f14ae21f93663c74aec7e12f23d6dc52a7350c.tar.gz
yuzu-72f14ae21f93663c74aec7e12f23d6dc52a7350c.tar.bz2
yuzu-72f14ae21f93663c74aec7e12f23d6dc52a7350c.tar.lz
yuzu-72f14ae21f93663c74aec7e12f23d6dc52a7350c.tar.xz
yuzu-72f14ae21f93663c74aec7e12f23d6dc52a7350c.tar.zst
yuzu-72f14ae21f93663c74aec7e12f23d6dc52a7350c.zip
-rw-r--r--src/core/hle/service/caps/caps_u.cpp24
1 files changed, 15 insertions, 9 deletions
diff --git a/src/core/hle/service/caps/caps_u.cpp b/src/core/hle/service/caps/caps_u.cpp
index 34f7f3881..f36d8de2d 100644
--- a/src/core/hle/service/caps/caps_u.cpp
+++ b/src/core/hle/service/caps/caps_u.cpp
@@ -58,19 +58,25 @@ void CAPS_U::GetAlbumContentsFileListForApplication(Kernel::HLERequestContext& c
// u8 ContentType, two s64s, and an u64 AppletResourceUserId. Returns an output u64 for total
// output entries (which is copied to a s32 by official SW).
IPC::RequestParser rp{ctx};
- [[maybe_unused]] const auto application_album_file_entries = rp.PopRaw<std::array<u8, 0x30>>();
- const auto pid = rp.Pop<s32>();
- const auto content_type = rp.PopRaw<ContentType>();
- [[maybe_unused]] const auto start_datetime = rp.PopRaw<AlbumFileDateTime>();
- [[maybe_unused]] const auto end_datetime = rp.PopRaw<AlbumFileDateTime>();
- const auto applet_resource_user_id = rp.Pop<u64>();
+ const auto pid{rp.Pop<s32>()};
+ const auto content_type{rp.PopEnum<ContentType>()};
+ const auto start_posix_time{rp.Pop<s64>()};
+ const auto end_posix_time{rp.Pop<s64>()};
+ const auto applet_resource_user_id{rp.Pop<u64>()};
+
+ // TODO: Update this when we implement the album.
+ // Currently we do not have a method of accessing album entries, set this to 0 for now.
+ constexpr s32 total_entries{0};
+
LOG_WARNING(Service_Capture,
- "(STUBBED) called. pid={}, content_type={}, applet_resource_user_id={}", pid,
- content_type, applet_resource_user_id);
+ "(STUBBED) called. pid={}, content_type={}, start_posix_time={}, "
+ "end_posix_time={}, applet_resource_user_id={}, total_entries={}",
+ pid, content_type, start_posix_time, end_posix_time, applet_resource_user_id,
+ total_entries);
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
- rb.Push<s32>(0);
+ rb.Push(total_entries);
}
} // namespace Service::Capture