VERY experimental Nintendo Switch 2 emulator
C++
service: am: Fix wrong interface
Narr the Rege0ba30fb8e86
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cppindex 4f400d3416..585675718e 100644--- a/src/core/hle/service/am/am.cpp+++ b/src/core/hle/service/am/am.cpp@@ -1317,6 +1317,50 @@ void ILibraryAppletCreator::CreateHandleStorage(HLERequestContext& ctx) {rb.PushIpcInterface<IStorage>(system, std::move(memory));}+ILibraryAppletSelfAccessor::ILibraryAppletSelfAccessor(Core::System& system_)+ : ServiceFramework{system_, "ILibraryAppletSelfAccessor"} {+ static const FunctionInfo functions[] = {+ {0, nullptr, "PopInData"},+ {1, nullptr, "PushOutData"},+ {2, nullptr, "PopInteractiveInData"},+ {3, nullptr, "PushInteractiveOutData"},+ {5, nullptr, "GetPopInDataEvent"},+ {6, nullptr, "GetPopInteractiveInDataEvent"},+ {10, nullptr, "ExitProcessAndReturn"},+ {11, nullptr, "GetLibraryAppletInfo"},+ {12, nullptr, "GetMainAppletIdentityInfo"},+ {13, nullptr, "CanUseApplicationCore"},+ {14, nullptr, "GetCallerAppletIdentityInfo"},+ {15, nullptr, "GetMainAppletApplicationControlProperty"},+ {16, nullptr, "GetMainAppletStorageId"},+ {17, nullptr, "GetCallerAppletIdentityInfoStack"},+ {18, nullptr, "GetNextReturnDestinationAppletIdentityInfo"},+ {19, nullptr, "GetDesirableKeyboardLayout"},+ {20, nullptr, "PopExtraStorage"},+ {25, nullptr, "GetPopExtraStorageEvent"},+ {30, nullptr, "UnpopInData"},+ {31, nullptr, "UnpopExtraStorage"},+ {40, nullptr, "GetIndirectLayerProducerHandle"},+ {50, nullptr, "ReportVisibleError"},+ {51, nullptr, "ReportVisibleErrorWithErrorContext"},+ {60, nullptr, "GetMainAppletApplicationDesiredLanguage"},+ {70, nullptr, "GetCurrentApplicationId"},+ {80, nullptr, "RequestExitToSelf"},+ {90, nullptr, "CreateApplicationAndPushAndRequestToLaunch"},+ {100, nullptr, "CreateGameMovieTrimmer"},+ {101, nullptr, "ReserveResourceForMovieOperation"},+ {102, nullptr, "UnreserveResourceForMovieOperation"},+ {110, nullptr, "GetMainAppletAvailableUsers"},+ {120, nullptr, "GetLaunchStorageInfoForDebug"},+ {130, nullptr, "GetGpuErrorDetectedSystemEvent"},+ {140, nullptr, "SetApplicationMemoryReservation"},+ {150, nullptr, "ShouldSetGpuTimeSliceManually"},+ };+ RegisterHandlers(functions);+}++ILibraryAppletSelfAccessor::~ILibraryAppletSelfAccessor() = default;+IApplicationFunctions::IApplicationFunctions(Core::System& system_): ServiceFramework{system_, "IApplicationFunctions"}, service_context{system,"IApplicationFunctions"} {diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.hindex d4fd163daf..3db09c214f 100644--- a/src/core/hle/service/am/am.h+++ b/src/core/hle/service/am/am.h@@ -314,6 +314,12 @@ private:void CreateHandleStorage(HLERequestContext& ctx);};+class ILibraryAppletSelfAccessor final : public ServiceFramework<ILibraryAppletSelfAccessor> {+public:+ explicit ILibraryAppletSelfAccessor(Core::System& system_);+ ~ILibraryAppletSelfAccessor() override;+};+class IApplicationFunctions final : public ServiceFramework<IApplicationFunctions> {public:explicit IApplicationFunctions(Core::System& system_);diff --git a/src/core/hle/service/am/applet_ae.cpp b/src/core/hle/service/am/applet_ae.cppindex 2764f7ceba..ee9d99a547 100644--- a/src/core/hle/service/am/applet_ae.cpp+++ b/src/core/hle/service/am/applet_ae.cpp@@ -26,8 +26,10 @@ public:{4, &ILibraryAppletProxy::GetDisplayController, "GetDisplayController"},{10, &ILibraryAppletProxy::GetProcessWindingController, "GetProcessWindingController"},{11, &ILibraryAppletProxy::GetLibraryAppletCreator, "GetLibraryAppletCreator"},- {20, &ILibraryAppletProxy::GetApplicationFunctions, "GetApplicationFunctions"},+ {20, &ILibraryAppletProxy::OpenLibraryAppletSelfAccessor, "OpenLibraryAppletSelfAccessor"},{21, nullptr, "GetAppletCommonFunctions"},+ {22, nullptr, "GetHomeMenuFunctions"},+ {23, nullptr, "GetGlobalStateController"},{1000, &ILibraryAppletProxy::GetDebugFunctions, "GetDebugFunctions"},};// clang-format on@@ -100,12 +102,12 @@ private:rb.PushIpcInterface<ILibraryAppletCreator>(system);}- void GetApplicationFunctions(HLERequestContext& ctx) {+ void OpenLibraryAppletSelfAccessor(HLERequestContext& ctx) {LOG_DEBUG(Service_AM, "called");IPC::ResponseBuilder rb{ctx, 2, 0, 1};rb.Push(ResultSuccess);- rb.PushIpcInterface<IApplicationFunctions>(system);+ rb.PushIpcInterface<ILibraryAppletSelfAccessor>(system);}Nvnflinger::Nvnflinger& nvnflinger;