mirrors/citra
1
0
Fork 0
Code Issues Pull requests Releases Activity

am: Run clang-format and attribute TODOs.

Browse source
This commit is contained in:
Steveice10 2018-07-09 15:51:56 -07:00
parent ba35079449
commit 56488a969d
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/core/hle/service/am/am.cpp
View file

@ -399,10 +399,11 @@ std::string GetTitleContentPath(Service::FS::MediaType media_type, u64 tid, u16
u32 content_id = 0; u32 content_id = 0;
FileSys::TitleMetadata tmd; FileSys::TitleMetadata tmd;
if (tmd.Load(tmd_path) == Loader::ResultStatus::Success) { if (tmd.Load(tmd_path) == Loader::ResultStatus::Success) {
if(index < tmd.GetContentCount()) { if (index < tmd.GetContentCount()) {
content_id = tmd.GetContentIDByIndex(index); content_id = tmd.GetContentIDByIndex(index);
} else { } else {
LOG_ERROR(Service_AM, "Attempted to get path for non-existent content index {:04x}.", index); LOG_ERROR(Service_AM, "Attempted to get path for non-existent content index {:04x}.",
index);
} }
// TODO(shinyquagsire23): how does DLC actually get this folder on hardware? // TODO(shinyquagsire23): how does DLC actually get this folder on hardware?
@ -530,10 +531,12 @@ void Module::Interface::FindDLCContentInfos(Kernel::HLERequestContext& ctx) {
u64 romfs_offset = 0; u64 romfs_offset = 0;
if (content_requested[i] >= tmd.GetContentCount()) { if (content_requested[i] >= tmd.GetContentCount()) {
LOG_ERROR(Service_AM, "Attempted to get info for non-existent content index {:04x}.", content_requested[i]); LOG_ERROR(Service_AM,
"Attempted to get info for non-existent content index {:04x}.",
content_requested[i]);
IPC::RequestBuilder rb = rp.MakeBuilder(1, 4); IPC::RequestBuilder rb = rp.MakeBuilder(1, 4);
rb.Push<u32>(-1); // TODO: Find the right error code rb.Push<u32>(-1); // TODO(Steveice10): Find the right error code
rb.PushMappedBuffer(content_requested_in); rb.PushMappedBuffer(content_requested_in);
rb.PushMappedBuffer(content_info_out); rb.PushMappedBuffer(content_info_out);
return; return;
@ -544,7 +547,8 @@ void Module::Interface::FindDLCContentInfos(Kernel::HLERequestContext& ctx) {
content_info.type = tmd.GetContentTypeByIndex(content_requested[i]); content_info.type = tmd.GetContentTypeByIndex(content_requested[i]);
content_info.content_id = tmd.GetContentIDByIndex(content_requested[i]); content_info.content_id = tmd.GetContentIDByIndex(content_requested[i]);
content_info.size = tmd.GetContentSizeByIndex(content_requested[i]); content_info.size = tmd.GetContentSizeByIndex(content_requested[i]);
content_info.ownership = OWNERSHIP_OWNED; // TODO: Pull this from the ticket. content_info.ownership =
OWNERSHIP_OWNED; // TODO(Steveice10): Pull this from the ticket.
if (FileUtil::Exists(GetTitleContentPath(media_type, title_id, content_requested[i]))) { if (FileUtil::Exists(GetTitleContentPath(media_type, title_id, content_requested[i]))) {
content_info.ownership |= OWNERSHIP_DOWNLOADED; content_info.ownership |= OWNERSHIP_DOWNLOADED;
@ -598,7 +602,8 @@ void Module::Interface::ListDLCContentInfos(Kernel::HLERequestContext& ctx) {
content_info.type = tmd.GetContentTypeByIndex(i); content_info.type = tmd.GetContentTypeByIndex(i);
content_info.content_id = tmd.GetContentIDByIndex(i); content_info.content_id = tmd.GetContentIDByIndex(i);
content_info.size = tmd.GetContentSizeByIndex(i); content_info.size = tmd.GetContentSizeByIndex(i);
content_info.ownership = OWNERSHIP_OWNED; // TODO: Pull this from the ticket. content_info.ownership =
OWNERSHIP_OWNED; // TODO(Steveice10): Pull this from the ticket.
if (FileUtil::Exists(GetTitleContentPath(media_type, title_id, i))) { if (FileUtil::Exists(GetTitleContentPath(media_type, title_id, i))) {
content_info.ownership |= OWNERSHIP_DOWNLOADED; content_info.ownership |= OWNERSHIP_DOWNLOADED;