VERY experimental Nintendo Switch 2 emulator
C++
am: Remove bcat from PopLaunchParameter
FearlessTobiabf45c2d0be5
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cppindex e92f400de2..42e00c30ac 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};constexpr Result ResultInvalidOffset{ErrorModule::AM, 503};enum class LaunchParameterKind : u32 {- ApplicationSpecific = 1,+ UserChannel = 1,AccountPreselectedUser = 2,};@@ -1518,25 +1518,10 @@ void IApplicationFunctions::PopLaunchParameter(HLERequestContext& ctx) {IPC::RequestParser rp{ctx};const auto kind = rp.PopEnum<LaunchParameterKind>();- LOG_DEBUG(Service_AM, "called, kind={:08X}", kind);-- if (kind == LaunchParameterKind::ApplicationSpecific && !launch_popped_application_specific) {- const auto backend = BCAT::CreateBackendFromSettings(system, [this](u64 tid) {- return system.GetFileSystemController().GetBCATDirectory(tid);- });- const auto build_id_full = system.GetApplicationProcessBuildID();- u64 build_id{};- std::memcpy(&build_id, build_id_full.data(), sizeof(u64));-- auto data =- backend->GetLaunchParameter({system.GetApplicationProcessProgramID(), build_id});- if (data.has_value()) {- IPC::ResponseBuilder rb{ctx, 2, 0, 1};- rb.Push(ResultSuccess);- rb.PushIpcInterface<IStorage>(system, std::move(*data));- launch_popped_application_specific = true;- return;- }+ LOG_WARNING(Service_AM, "(STUBBED) called, kind={:08X}", kind);++ if (kind == LaunchParameterKind::UserChannel) {+ LOG_ERROR(Service_AM, "Popping from UserChannel is not supported!");} else if (kind == LaunchParameterKind::AccountPreselectedUser &&!launch_popped_account_preselect) {LaunchParameterAccountPreselectedUser params{};diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.hindex d68998f049..f75a665b25 100644--- a/src/core/hle/service/am/am.h+++ b/src/core/hle/service/am/am.h@@ -339,7 +339,6 @@ private:KernelHelpers::ServiceContext service_context;- bool launch_popped_application_specific = false;bool launch_popped_account_preselect = false;s32 previous_program_index{-1};Kernel::KEvent* gpu_error_detected_event;