summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFearlessTobi <thm.frey@gmail.com>2023-09-07 00:15:15 +0200
committerLiam <byteslice@airmail.cc>2023-09-10 02:44:05 +0200
commit36917d8a8f364857f2a54d22b8dfa39c54534f13 (patch)
tree31b7b6412e0881b7afb8fe2adbf6ee21b617edd7 /src
parentvk_buffer_cache: Respect max vertex bindings in BindVertexBuffers (#11471) (diff)
downloadyuzu-36917d8a8f364857f2a54d22b8dfa39c54534f13.tar
yuzu-36917d8a8f364857f2a54d22b8dfa39c54534f13.tar.gz
yuzu-36917d8a8f364857f2a54d22b8dfa39c54534f13.tar.bz2
yuzu-36917d8a8f364857f2a54d22b8dfa39c54534f13.tar.lz
yuzu-36917d8a8f364857f2a54d22b8dfa39c54534f13.tar.xz
yuzu-36917d8a8f364857f2a54d22b8dfa39c54534f13.tar.zst
yuzu-36917d8a8f364857f2a54d22b8dfa39c54534f13.zip
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};
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.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:
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;