summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar FearlessTobi2023-09-07 00:15:15 +0200
committerGravatar Liam2023-09-09 20:44:05 -0400
commit36917d8a8f364857f2a54d22b8dfa39c54534f13 (patch)
tree31b7b6412e0881b7afb8fe2adbf6ee21b617edd7 /src
parentvk_buffer_cache: Respect max vertex bindings in BindVertexBuffers (#11471) (diff)
downloadyuzu-36917d8a8f364857f2a54d22b8dfa39c54534f13.tar.gz
yuzu-36917d8a8f364857f2a54d22b8dfa39c54534f13.tar.xz
yuzu-36917d8a8f364857f2a54d22b8dfa39c54534f13.zip
am: Remove bcat from PopLaunchParameter
This never belonged here and has no use anymore since the Boxcat backend was removed. .
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/am/am.cpp25
-rw-r--r--src/core/hle/service/am/am.h1
2 files changed, 5 insertions, 21 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp
index e92f400de..42e00c30a 100644
--- a/src/core/hle/service/am/am.cpp
+++ b/src/core/hle/service/am/am.cpp
@@ -46,7 +46,7 @@ constexpr Result ResultNoMessages{ErrorModule::AM, 3};
46constexpr Result ResultInvalidOffset{ErrorModule::AM, 503}; 46constexpr Result ResultInvalidOffset{ErrorModule::AM, 503};
47 47
48enum class LaunchParameterKind : u32 { 48enum class LaunchParameterKind : u32 {
49 ApplicationSpecific = 1, 49 UserChannel = 1,
50 AccountPreselectedUser = 2, 50 AccountPreselectedUser = 2,
51}; 51};
52 52
@@ -1518,25 +1518,10 @@ void IApplicationFunctions::PopLaunchParameter(HLERequestContext& ctx) {
1518 IPC::RequestParser rp{ctx}; 1518 IPC::RequestParser rp{ctx};
1519 const auto kind = rp.PopEnum<LaunchParameterKind>(); 1519 const auto kind = rp.PopEnum<LaunchParameterKind>();
1520 1520
1521 LOG_DEBUG(Service_AM, "called, kind={:08X}", kind); 1521 LOG_WARNING(Service_AM, "(STUBBED) called, kind={:08X}", kind);
1522 1522
1523 if (kind == LaunchParameterKind::ApplicationSpecific && !launch_popped_application_specific) { 1523 if (kind == LaunchParameterKind::UserChannel) {
1524 const auto backend = BCAT::CreateBackendFromSettings(system, [this](u64 tid) { 1524 LOG_ERROR(Service_AM, "Popping from UserChannel is not supported!");
1525 return system.GetFileSystemController().GetBCATDirectory(tid);
1526 });
1527 const auto build_id_full = system.GetApplicationProcessBuildID();
1528 u64 build_id{};
1529 std::memcpy(&build_id, build_id_full.data(), sizeof(u64));
1530
1531 auto data =
1532 backend->GetLaunchParameter({system.GetApplicationProcessProgramID(), build_id});
1533 if (data.has_value()) {
1534 IPC::ResponseBuilder rb{ctx, 2, 0, 1};
1535 rb.Push(ResultSuccess);
1536 rb.PushIpcInterface<IStorage>(system, std::move(*data));
1537 launch_popped_application_specific = true;
1538 return;
1539 }
1540 } else if (kind == LaunchParameterKind::AccountPreselectedUser && 1525 } else if (kind == LaunchParameterKind::AccountPreselectedUser &&
1541 !launch_popped_account_preselect) { 1526 !launch_popped_account_preselect) {
1542 LaunchParameterAccountPreselectedUser params{}; 1527 LaunchParameterAccountPreselectedUser params{};
diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h
index d68998f04..f75a665b2 100644
--- a/src/core/hle/service/am/am.h
+++ b/src/core/hle/service/am/am.h
@@ -339,7 +339,6 @@ private:
339 339
340 KernelHelpers::ServiceContext service_context; 340 KernelHelpers::ServiceContext service_context;
341 341
342 bool launch_popped_application_specific = false;
343 bool launch_popped_account_preselect = false; 342 bool launch_popped_account_preselect = false;
344 s32 previous_program_index{-1}; 343 s32 previous_program_index{-1};
345 Kernel::KEvent* gpu_error_detected_event; 344 Kernel::KEvent* gpu_error_detected_event;