From 11ecff2ff04633d261b9a43db792f6438df63f40 Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Fri, 14 Apr 2023 16:00:34 -0700 Subject: [PATCH] Rename Hipc to Cmif where appropriate (#3880) --- .../ServiceNotImplementedException.cs | 2 +- Ryujinx.HLE/HOS/Ipc/IpcMessage.cs | 2 +- Ryujinx.HLE/HOS/Ipc/IpcMessageType.cs | 12 +- .../AccountService/IManagerForApplication.cs | 14 +- .../IManagerForSystemService.cs | 8 +- .../Account/Acc/AccountService/IProfile.cs | 8 +- .../Acc/AccountService/IProfileEditor.cs | 12 +- .../Acc/IAccountServiceForAdministrator.cs | 22 +- .../Acc/IAccountServiceForApplication.cs | 40 ++-- .../Acc/IAccountServiceForSystemService.cs | 20 +- .../HOS/Services/Account/Acc/IAsyncContext.cs | 8 +- .../IAsyncNetworkServiceLicenseKindContext.cs | 2 +- .../ILibraryAppletProxy.cs | 20 +- .../ISystemAppletProxy.cs | 20 +- .../ILibraryAppletAccessor.cs | 28 +-- .../ILibraryAppletSelfAccessor.cs | 6 +- .../IProcessWindingController.cs | 2 +- .../SystemAppletProxy/IAudioController.cs | 10 +- .../SystemAppletProxy/ICommonStateGetter.cs | 36 +-- .../SystemAppletProxy/IDisplayController.cs | 10 +- .../SystemAppletProxy/IHomeMenuFunctions.cs | 4 +- .../ILibraryAppletCreator.cs | 8 +- .../SystemAppletProxy/ISelfController.cs | 64 ++--- .../SystemAppletProxy/IWindowController.cs | 4 +- .../IAllSystemAppletProxiesService.cs | 6 +- .../HOS/Services/Am/AppletAE/IStorage.cs | 2 +- .../Services/Am/AppletAE/IStorageAccessor.cs | 6 +- .../ApplicationProxy/IApplicationFunctions.cs | 72 +++--- .../IApplicationProxy.cs | 16 +- .../Am/AppletOE/IApplicationProxyService.cs | 2 +- Ryujinx.HLE/HOS/Services/Apm/IManager.cs | 6 +- .../HOS/Services/Apm/IManagerPrivileged.cs | 2 +- Ryujinx.HLE/HOS/Services/Apm/ISession.cs | 6 +- .../HOS/Services/Apm/ISystemManager.cs | 6 +- .../Services/Audio/AudioIn/AudioInServer.cs | 30 +-- .../Services/Audio/AudioInManagerServer.cs | 12 +- .../Services/Audio/AudioOut/AudioOutServer.cs | 28 +-- .../Services/Audio/AudioOutManagerServer.cs | 8 +- .../Audio/AudioRenderer/AudioDeviceServer.cs | 28 +-- .../AudioRenderer/AudioRendererServer.cs | 30 +-- .../Audio/AudioRendererManagerServer.cs | 8 +- .../IHardwareOpusDecoder.cs | 16 +- .../Audio/IHardwareOpusDecoderManager.cs | 16 +- .../HOS/Services/Bcat/IServiceCreator.cs | 6 +- .../Bcat/ServiceCreator/IBcatService.cs | 2 +- .../IDeliveryCacheDirectoryService.cs | 6 +- .../IDeliveryCacheFileService.cs | 8 +- .../IDeliveryCacheProgressService.cs | 4 +- .../IDeliveryCacheStorageService.cs | 6 +- .../Services/Bluetooth/IBluetoothDriver.cs | 2 +- .../HOS/Services/Bluetooth/IBluetoothUser.cs | 2 +- .../BluetoothManager/BtmUser/IBtmUserCore.cs | 8 +- .../HOS/Services/BluetoothManager/IBtmUser.cs | 2 +- .../Services/Caps/IAlbumApplicationService.cs | 6 +- .../HOS/Services/Caps/IAlbumControlService.cs | 2 +- .../Caps/IScreenShotApplicationService.cs | 8 +- ...pcAttribute.cs => CommandCmifAttribute.cs} | 4 +- Ryujinx.HLE/HOS/Services/Fatal/IService.cs | 6 +- .../HOS/Services/Friend/IServiceCreator.cs | 6 +- .../Friend/ServiceCreator/IFriendService.cs | 26 +- .../ServiceCreator/INotificationService.cs | 6 +- .../Services/Fs/FileSystemProxy/IDirectory.cs | 4 +- .../HOS/Services/Fs/FileSystemProxy/IFile.cs | 10 +- .../Fs/FileSystemProxy/IFileSystem.cs | 30 +-- .../Services/Fs/FileSystemProxy/IStorage.cs | 4 +- .../HOS/Services/Fs/IDeviceOperator.cs | 6 +- .../HOS/Services/Fs/IFileSystemProxy.cs | 194 +++++++-------- .../HOS/Services/Fs/IMultiCommitManager.cs | 4 +- .../HOS/Services/Fs/ISaveDataInfoReader.cs | 2 +- .../HidServer/IActiveVibrationDeviceList.cs | 2 +- .../Services/Hid/HidServer/IAppletResource.cs | 2 +- Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs | 226 +++++++++--------- .../HOS/Services/Hid/IHidSystemServer.cs | 8 +- .../HOS/Services/Hid/Irs/IIrSensorServer.cs | 26 +- Ryujinx.HLE/HOS/Services/IpcService.cs | 12 +- .../HOS/Services/Lbl/ILblController.cs | 18 +- .../HOS/Services/Ldn/IUserServiceCreator.cs | 2 +- .../IUserLocalCommunicationService.cs | 10 +- .../HOS/Services/Mii/IImageDatabaseService.cs | 4 +- .../HOS/Services/Mii/IStaticService.cs | 2 +- .../Mii/StaticService/IDatabaseService.cs | 52 ++-- Ryujinx.HLE/HOS/Services/Mm/IRequest.cs | 16 +- .../Services/Mnpp/IServiceForApplication.cs | 4 +- .../Ncm/Lr/ILocationResolverManager.cs | 2 +- .../ILocationResolver.cs | 32 +-- .../HOS/Services/Nfc/ISystemManager.cs | 2 +- Ryujinx.HLE/HOS/Services/Nfc/IUserManager.cs | 2 +- .../HOS/Services/Nfc/NfcManager/INfc.cs | 16 +- .../HOS/Services/Nfc/Nfp/IDebugManager.cs | 2 +- .../HOS/Services/Nfc/Nfp/ISystemManager.cs | 2 +- .../HOS/Services/Nfc/Nfp/IUserManager.cs | 2 +- .../HOS/Services/Nfc/Nfp/NfpManager/INfp.cs | 52 ++-- Ryujinx.HLE/HOS/Services/Ngct/IService.cs | 4 +- .../Ngct/IServiceWithManagementApi.cs | 4 +- .../HOS/Services/Nifm/IStaticService.cs | 4 +- .../Nifm/StaticService/IGeneralService.cs | 14 +- .../Services/Nifm/StaticService/IRequest.cs | 14 +- .../Services/Nim/IShopServiceAccessServer.cs | 2 +- .../Nim/IShopServiceAccessServerInterface.cs | 4 +- .../HOS/Services/Nim/IShopServiceAccessor.cs | 2 +- .../HOS/Services/Nim/Ntc/IStaticService.cs | 2 +- .../IEnsureNetworkClockAvailabilityService.cs | 8 +- .../Services/Ns/Aoc/IAddOnContentManager.cs | 34 +-- .../Services/Ns/Aoc/IPurchaseEventManager.cs | 6 +- .../Ns/IApplicationManagerInterface.cs | 2 +- ...ReadOnlyApplicationControlDataInterface.cs | 2 +- .../Services/Ns/IServiceGetterInterface.cs | 4 +- Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs | 28 +-- .../Olsc/IOlscServiceForApplication.cs | 6 +- .../Pctl/IParentalControlServiceFactory.cs | 4 +- .../IParentalControlService.cs | 22 +- .../HOS/Services/Pcv/Bpc/IRtcManager.cs | 2 +- .../Clkrst/ClkrstManager/IClkrstSession.cs | 4 +- .../HOS/Services/Pcv/Clkrst/IClkrstManager.cs | 6 +- .../HOS/Services/Pm/IDebugMonitorInterface.cs | 4 +- .../HOS/Services/Pm/IInformationInterface.cs | 5 +- .../HOS/Services/Pm/IShellInterface.cs | 2 +- .../HOS/Services/Ptm/Psm/IPsmServer.cs | 6 +- .../HOS/Services/Ptm/Psm/IPsmSession.cs | 10 +- .../HOS/Services/Ptm/Ts/IMeasurementServer.cs | 4 +- Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs | 12 +- .../HOS/Services/Sdb/Pdm/IQueryService.cs | 4 +- .../HOS/Services/Sdb/Pl/ISharedFontManager.cs | 14 +- Ryujinx.HLE/HOS/Services/ServerBase.cs | 18 +- .../HOS/Services/Settings/ISettingsServer.cs | 22 +- .../Settings/ISystemSettingsServer.cs | 22 +- Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs | 10 +- .../HOS/Services/Sockets/Bsd/IClient.cs | 62 ++--- .../HOS/Services/Sockets/Nsd/IManager.cs | 50 ++-- .../Services/Sockets/Sfdnsres/IResolver.cs | 28 +-- .../HOS/Services/Spl/IGeneralInterface.cs | 2 +- .../HOS/Services/Spl/IRandomInterface.cs | 2 +- Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs | 8 +- .../Services/Ssl/SslService/ISslConnection.cs | 56 ++--- .../Services/Ssl/SslService/ISslContext.cs | 8 +- .../SurfaceFlinger/IHOSBinderDriver.cs | 8 +- .../Services/Time/IStaticServiceForGlue.cs | 38 +-- .../HOS/Services/Time/IStaticServiceForPsc.cs | 38 +-- .../HOS/Services/Time/ITimeServiceManager.cs | 36 +-- .../Time/StaticService/ISteadyClock.cs | 16 +- .../Time/StaticService/ISystemClock.cs | 10 +- .../StaticService/ITimeZoneServiceForGlue.cs | 18 +- .../StaticService/ITimeZoneServiceForPsc.cs | 28 +-- .../Services/Vi/IApplicationRootService.cs | 2 +- .../HOS/Services/Vi/IManagerRootService.cs | 2 +- .../HOS/Services/Vi/ISystemRootService.cs | 2 +- .../IManagerDisplayService.cs | 12 +- .../ISystemDisplayService.cs | 8 +- .../RootService/IApplicationDisplayService.cs | 38 +-- 149 files changed, 1152 insertions(+), 1153 deletions(-) rename Ryujinx.HLE/HOS/Services/{CommandHIpcAttribute.cs => CommandCmifAttribute.cs} (63%) diff --git a/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs b/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs index 3dbf48d82..40b19cc8e 100644 --- a/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs +++ b/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs @@ -55,7 +55,7 @@ namespace Ryujinx.HLE.Exceptions if (callingType != null && callingMethod != null) { // If the type is past 0xF, we are using TIPC - var ipcCommands = Request.Type > IpcMessageType.TipcCloseSession ? Service.TipcCommands : Service.HipcCommands; + var ipcCommands = Request.Type > IpcMessageType.TipcCloseSession ? Service.TipcCommands : Service.CmifCommands; // Find the handler for the method called var ipcHandler = ipcCommands.FirstOrDefault(x => x.Value == callingMethod); diff --git a/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs b/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs index 4e8f2fbfd..394bf888e 100644 --- a/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs +++ b/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs @@ -88,7 +88,7 @@ namespace Ryujinx.HLE.HOS.Ipc long recvListPos = reader.BaseStream.Position + rawDataSize; - // only HIPC have the padding requirements. + // Only CMIF has the padding requirements. if (Type < IpcMessageType.TipcCloseSession) { long pad0 = GetPadSize16(reader.BaseStream.Position + cmdPtr); diff --git a/Ryujinx.HLE/HOS/Ipc/IpcMessageType.cs b/Ryujinx.HLE/HOS/Ipc/IpcMessageType.cs index dd3c56569..1c8622485 100644 --- a/Ryujinx.HLE/HOS/Ipc/IpcMessageType.cs +++ b/Ryujinx.HLE/HOS/Ipc/IpcMessageType.cs @@ -2,12 +2,12 @@ namespace Ryujinx.HLE.HOS.Ipc { enum IpcMessageType { - HipcResponse = 0, - HipcCloseSession = 2, - HipcRequest = 4, - HipcControl = 5, - HipcRequestWithContext = 6, - HipcControlWithContext = 7, + CmifResponse = 0, + CmifCloseSession = 2, + CmifRequest = 4, + CmifControl = 5, + CmifRequestWithContext = 6, + CmifControlWithContext = 7, TipcCloseSession = 0xF } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IManagerForApplication.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IManagerForApplication.cs index 68ed3f50a..9c058cb59 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IManagerForApplication.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IManagerForApplication.cs @@ -9,21 +9,21 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc.AccountService _managerServer = new ManagerServer(userId); } - [CommandHipc(0)] + [CommandCmif(0)] // CheckAvailability() public ResultCode CheckAvailability(ServiceCtx context) { return _managerServer.CheckAvailability(context); } - [CommandHipc(1)] + [CommandCmif(1)] // GetAccountId() -> nn::account::NetworkServiceAccountId public ResultCode GetAccountId(ServiceCtx context) { return _managerServer.GetAccountId(context); } - [CommandHipc(2)] + [CommandCmif(2)] // EnsureIdTokenCacheAsync() -> object public ResultCode EnsureIdTokenCacheAsync(ServiceCtx context) { @@ -37,28 +37,28 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc.AccountService return resultCode; } - [CommandHipc(3)] + [CommandCmif(3)] // LoadIdTokenCache() -> (u32 id_token_cache_size, buffer) public ResultCode LoadIdTokenCache(ServiceCtx context) { return _managerServer.LoadIdTokenCache(context); } - [CommandHipc(130)] + [CommandCmif(130)] // GetNintendoAccountUserResourceCacheForApplication() -> (nn::account::NintendoAccountId, nn::account::nas::NasUserBaseForApplication, buffer) public ResultCode GetNintendoAccountUserResourceCacheForApplication(ServiceCtx context) { return _managerServer.GetNintendoAccountUserResourceCacheForApplication(context); } - [CommandHipc(160)] // 5.0.0+ + [CommandCmif(160)] // 5.0.0+ // StoreOpenContext() public ResultCode StoreOpenContext(ServiceCtx context) { return _managerServer.StoreOpenContext(context); } - [CommandHipc(170)] // 6.0.0+ + [CommandCmif(170)] // 6.0.0+ // LoadNetworkServiceLicenseKindAsync() -> object public ResultCode LoadNetworkServiceLicenseKindAsync(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IManagerForSystemService.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IManagerForSystemService.cs index d054b80b8..ecd516876 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IManagerForSystemService.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IManagerForSystemService.cs @@ -9,21 +9,21 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc.AccountService _managerServer = new ManagerServer(userId); } - [CommandHipc(0)] + [CommandCmif(0)] // CheckAvailability() public ResultCode CheckAvailability(ServiceCtx context) { return _managerServer.CheckAvailability(context); } - [CommandHipc(1)] + [CommandCmif(1)] // GetAccountId() -> nn::account::NetworkServiceAccountId public ResultCode GetAccountId(ServiceCtx context) { return _managerServer.GetAccountId(context); } - [CommandHipc(2)] + [CommandCmif(2)] // EnsureIdTokenCacheAsync() -> object public ResultCode EnsureIdTokenCacheAsync(ServiceCtx context) { @@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc.AccountService return resultCode; } - [CommandHipc(3)] + [CommandCmif(3)] // LoadIdTokenCache() -> (u32 id_token_cache_size, buffer) public ResultCode LoadIdTokenCache(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IProfile.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IProfile.cs index 8595f54a3..14911dfb1 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IProfile.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IProfile.cs @@ -9,28 +9,28 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc.AccountService _profileServer = new ProfileServer(profile); } - [CommandHipc(0)] + [CommandCmif(0)] // Get() -> (nn::account::profile::ProfileBase, buffer) public ResultCode Get(ServiceCtx context) { return _profileServer.Get(context); } - [CommandHipc(1)] + [CommandCmif(1)] // GetBase() -> nn::account::profile::ProfileBase public ResultCode GetBase(ServiceCtx context) { return _profileServer.GetBase(context); } - [CommandHipc(10)] + [CommandCmif(10)] // GetImageSize() -> u32 public ResultCode GetImageSize(ServiceCtx context) { return _profileServer.GetImageSize(context); } - [CommandHipc(11)] + [CommandCmif(11)] // LoadImage() -> (u32, buffer) public ResultCode LoadImage(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IProfileEditor.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IProfileEditor.cs index 9ec467508..64b6070f2 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IProfileEditor.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/AccountService/IProfileEditor.cs @@ -9,42 +9,42 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc.AccountService _profileServer = new ProfileServer(profile); } - [CommandHipc(0)] + [CommandCmif(0)] // Get() -> (nn::account::profile::ProfileBase, buffer) public ResultCode Get(ServiceCtx context) { return _profileServer.Get(context); } - [CommandHipc(1)] + [CommandCmif(1)] // GetBase() -> nn::account::profile::ProfileBase public ResultCode GetBase(ServiceCtx context) { return _profileServer.GetBase(context); } - [CommandHipc(10)] + [CommandCmif(10)] // GetImageSize() -> u32 public ResultCode GetImageSize(ServiceCtx context) { return _profileServer.GetImageSize(context); } - [CommandHipc(11)] + [CommandCmif(11)] // LoadImage() -> (u32, buffer) public ResultCode LoadImage(ServiceCtx context) { return _profileServer.LoadImage(context); } - [CommandHipc(100)] + [CommandCmif(100)] // Store(nn::account::profile::ProfileBase, buffer) public ResultCode Store(ServiceCtx context) { return _profileServer.Store(context); } - [CommandHipc(101)] + [CommandCmif(101)] // StoreWithImage(nn::account::profile::ProfileBase, buffer, buffer) public ResultCode StoreWithImage(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForAdministrator.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForAdministrator.cs index cb73dcfe1..6a457f042 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForAdministrator.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForAdministrator.cs @@ -14,42 +14,42 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc _applicationServiceServer = new ApplicationServiceServer(serviceFlag); } - [CommandHipc(0)] + [CommandCmif(0)] // GetUserCount() -> i32 public ResultCode GetUserCount(ServiceCtx context) { return _applicationServiceServer.GetUserCountImpl(context); } - [CommandHipc(1)] + [CommandCmif(1)] // GetUserExistence(nn::account::Uid) -> bool public ResultCode GetUserExistence(ServiceCtx context) { return _applicationServiceServer.GetUserExistenceImpl(context); } - [CommandHipc(2)] + [CommandCmif(2)] // ListAllUsers() -> array public ResultCode ListAllUsers(ServiceCtx context) { return _applicationServiceServer.ListAllUsers(context); } - [CommandHipc(3)] + [CommandCmif(3)] // ListOpenUsers() -> array public ResultCode ListOpenUsers(ServiceCtx context) { return _applicationServiceServer.ListOpenUsers(context); } - [CommandHipc(4)] + [CommandCmif(4)] // GetLastOpenedUser() -> nn::account::Uid public ResultCode GetLastOpenedUser(ServiceCtx context) { return _applicationServiceServer.GetLastOpenedUser(context); } - [CommandHipc(5)] + [CommandCmif(5)] // GetProfile(nn::account::Uid) -> object public ResultCode GetProfile(ServiceCtx context) { @@ -63,7 +63,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return resultCode; } - [CommandHipc(50)] + [CommandCmif(50)] // IsUserRegistrationRequestPermitted(pid) -> bool public ResultCode IsUserRegistrationRequestPermitted(ServiceCtx context) { @@ -72,14 +72,14 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return _applicationServiceServer.IsUserRegistrationRequestPermitted(context); } - [CommandHipc(51)] + [CommandCmif(51)] // TrySelectUserWithoutInteraction(bool) -> nn::account::Uid public ResultCode TrySelectUserWithoutInteraction(ServiceCtx context) { return _applicationServiceServer.TrySelectUserWithoutInteraction(context); } - [CommandHipc(102)] + [CommandCmif(102)] // GetBaasAccountManagerForSystemService(nn::account::Uid) -> object public ResultCode GetBaasAccountManagerForSystemService(ServiceCtx context) { @@ -98,14 +98,14 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return ResultCode.Success; } - [CommandHipc(140)] // 6.0.0+ + [CommandCmif(140)] // 6.0.0+ // ListQualifiedUsers() -> array public ResultCode ListQualifiedUsers(ServiceCtx context) { return _applicationServiceServer.ListQualifiedUsers(context); } - [CommandHipc(205)] + [CommandCmif(205)] // GetProfileEditor(nn::account::Uid) -> object public ResultCode GetProfileEditor(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForApplication.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForApplication.cs index 413bedced..8ec83e5c1 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForApplication.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForApplication.cs @@ -14,42 +14,42 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc _applicationServiceServer = new ApplicationServiceServer(serviceFlag); } - [CommandHipc(0)] + [CommandCmif(0)] // GetUserCount() -> i32 public ResultCode GetUserCount(ServiceCtx context) { return _applicationServiceServer.GetUserCountImpl(context); } - [CommandHipc(1)] + [CommandCmif(1)] // GetUserExistence(nn::account::Uid) -> bool public ResultCode GetUserExistence(ServiceCtx context) { return _applicationServiceServer.GetUserExistenceImpl(context); } - [CommandHipc(2)] + [CommandCmif(2)] // ListAllUsers() -> array public ResultCode ListAllUsers(ServiceCtx context) { return _applicationServiceServer.ListAllUsers(context); } - [CommandHipc(3)] + [CommandCmif(3)] // ListOpenUsers() -> array public ResultCode ListOpenUsers(ServiceCtx context) { return _applicationServiceServer.ListOpenUsers(context); } - [CommandHipc(4)] + [CommandCmif(4)] // GetLastOpenedUser() -> nn::account::Uid public ResultCode GetLastOpenedUser(ServiceCtx context) { return _applicationServiceServer.GetLastOpenedUser(context); } - [CommandHipc(5)] + [CommandCmif(5)] // GetProfile(nn::account::Uid) -> object public ResultCode GetProfile(ServiceCtx context) { @@ -63,7 +63,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return resultCode; } - [CommandHipc(50)] + [CommandCmif(50)] // IsUserRegistrationRequestPermitted(pid) -> bool public ResultCode IsUserRegistrationRequestPermitted(ServiceCtx context) { @@ -71,16 +71,16 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return _applicationServiceServer.IsUserRegistrationRequestPermitted(context); } - [CommandHipc(51)] + [CommandCmif(51)] // TrySelectUserWithoutInteraction(bool) -> nn::account::Uid public ResultCode TrySelectUserWithoutInteraction(ServiceCtx context) { return _applicationServiceServer.TrySelectUserWithoutInteraction(context); } - [CommandHipc(100)] - [CommandHipc(140)] // 6.0.0+ - [CommandHipc(160)] // 13.0.0+ + [CommandCmif(100)] + [CommandCmif(140)] // 6.0.0+ + [CommandCmif(160)] // 13.0.0+ // InitializeApplicationInfo(u64 pid_placeholder, pid) public ResultCode InitializeApplicationInfo(ServiceCtx context) { @@ -105,7 +105,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return ResultCode.Success; } - [CommandHipc(101)] + [CommandCmif(101)] // GetBaasAccountManagerForApplication(nn::account::Uid) -> object public ResultCode GetBaasAccountManagerForApplication(ServiceCtx context) { @@ -124,7 +124,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return ResultCode.Success; } - [CommandHipc(103)] // 4.0.0+ + [CommandCmif(103)] // 4.0.0+ // CheckNetworkServiceAvailabilityAsync() -> object public ResultCode CheckNetworkServiceAvailabilityAsync(ServiceCtx context) { @@ -138,21 +138,21 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return resultCode; } - [CommandHipc(110)] + [CommandCmif(110)] // StoreSaveDataThumbnail(nn::account::Uid, buffer) public ResultCode StoreSaveDataThumbnail(ServiceCtx context) { return _applicationServiceServer.StoreSaveDataThumbnail(context); } - [CommandHipc(111)] + [CommandCmif(111)] // ClearSaveDataThumbnail(nn::account::Uid) public ResultCode ClearSaveDataThumbnail(ServiceCtx context) { return _applicationServiceServer.ClearSaveDataThumbnail(context); } - [CommandHipc(130)] // 5.0.0+ + [CommandCmif(130)] // 5.0.0+ // LoadOpenContext(nn::account::Uid) -> object public ResultCode LoadOpenContext(ServiceCtx context) { @@ -168,22 +168,22 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return ResultCode.Success; } - [CommandHipc(60)] // 5.0.0-5.1.0 - [CommandHipc(131)] // 6.0.0+ + [CommandCmif(60)] // 5.0.0-5.1.0 + [CommandCmif(131)] // 6.0.0+ // ListOpenContextStoredUsers() -> array public ResultCode ListOpenContextStoredUsers(ServiceCtx context) { return _applicationServiceServer.ListOpenContextStoredUsers(context); } - [CommandHipc(141)] // 6.0.0+ + [CommandCmif(141)] // 6.0.0+ // ListQualifiedUsers() -> array public ResultCode ListQualifiedUsers(ServiceCtx context) { return _applicationServiceServer.ListQualifiedUsers(context); } - [CommandHipc(150)] // 6.0.0+ + [CommandCmif(150)] // 6.0.0+ // IsUserAccountSwitchLocked() -> bool public ResultCode IsUserAccountSwitchLocked(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForSystemService.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForSystemService.cs index 934c06fee..3b5f3b03e 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForSystemService.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/IAccountServiceForSystemService.cs @@ -13,42 +13,42 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc _applicationServiceServer = new ApplicationServiceServer(serviceFlag); } - [CommandHipc(0)] + [CommandCmif(0)] // GetUserCount() -> i32 public ResultCode GetUserCount(ServiceCtx context) { return _applicationServiceServer.GetUserCountImpl(context); } - [CommandHipc(1)] + [CommandCmif(1)] // GetUserExistence(nn::account::Uid) -> bool public ResultCode GetUserExistence(ServiceCtx context) { return _applicationServiceServer.GetUserExistenceImpl(context); } - [CommandHipc(2)] + [CommandCmif(2)] // ListAllUsers() -> array public ResultCode ListAllUsers(ServiceCtx context) { return _applicationServiceServer.ListAllUsers(context); } - [CommandHipc(3)] + [CommandCmif(3)] // ListOpenUsers() -> array public ResultCode ListOpenUsers(ServiceCtx context) { return _applicationServiceServer.ListOpenUsers(context); } - [CommandHipc(4)] + [CommandCmif(4)] // GetLastOpenedUser() -> nn::account::Uid public ResultCode GetLastOpenedUser(ServiceCtx context) { return _applicationServiceServer.GetLastOpenedUser(context); } - [CommandHipc(5)] + [CommandCmif(5)] // GetProfile(nn::account::Uid) -> object public ResultCode GetProfile(ServiceCtx context) { @@ -62,7 +62,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return resultCode; } - [CommandHipc(50)] + [CommandCmif(50)] // IsUserRegistrationRequestPermitted(pid) -> bool public ResultCode IsUserRegistrationRequestPermitted(ServiceCtx context) { @@ -71,14 +71,14 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return _applicationServiceServer.IsUserRegistrationRequestPermitted(context); } - [CommandHipc(51)] + [CommandCmif(51)] // TrySelectUserWithoutInteraction(bool) -> nn::account::Uid public ResultCode TrySelectUserWithoutInteraction(ServiceCtx context) { return _applicationServiceServer.TrySelectUserWithoutInteraction(context); } - [CommandHipc(102)] + [CommandCmif(102)] // GetBaasAccountManagerForSystemService(nn::account::Uid) -> object public ResultCode GetBaasAccountManagerForSystemService(ServiceCtx context) { @@ -97,7 +97,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return ResultCode.Success; } - [CommandHipc(140)] // 6.0.0+ + [CommandCmif(140)] // 6.0.0+ // ListQualifiedUsers() -> array public ResultCode ListQualifiedUsers(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncContext.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncContext.cs index 9a12e7018..c9af0727f 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncContext.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncContext.cs @@ -14,7 +14,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc AsyncExecution = asyncExecution; } - [CommandHipc(0)] + [CommandCmif(0)] // GetSystemEvent() -> handle public ResultCode GetSystemEvent(ServiceCtx context) { @@ -28,7 +28,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // Cancel() public ResultCode Cancel(ServiceCtx context) { @@ -45,7 +45,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // HasDone() -> b8 public ResultCode HasDone(ServiceCtx context) { @@ -59,7 +59,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetResult() public ResultCode GetResult(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncNetworkServiceLicenseKindContext.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncNetworkServiceLicenseKindContext.cs index e62663e6f..1fa5cf2a1 100644 --- a/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncNetworkServiceLicenseKindContext.cs +++ b/Ryujinx.HLE/HOS/Services/Account/Acc/IAsyncNetworkServiceLicenseKindContext.cs @@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Services.Account.Acc _serviceLicenseKind = serviceLicenseKind; } - [CommandHipc(100)] + [CommandCmif(100)] // GetNetworkServiceLicenseKind() -> nn::account::NetworkServiceLicenseKind public ResultCode GetNetworkServiceLicenseKind(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ILibraryAppletProxy.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ILibraryAppletProxy.cs index 08b8fc7ea..bf86aaaa9 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ILibraryAppletProxy.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ILibraryAppletProxy.cs @@ -12,7 +12,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService _pid = pid; } - [CommandHipc(0)] + [CommandCmif(0)] // GetCommonStateGetter() -> object public ResultCode GetCommonStateGetter(ServiceCtx context) { @@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetSelfController() -> object public ResultCode GetSelfController(ServiceCtx context) { @@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetWindowController() -> object public ResultCode GetWindowController(ServiceCtx context) { @@ -39,7 +39,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetAudioController() -> object public ResultCode GetAudioController(ServiceCtx context) { @@ -48,7 +48,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // GetDisplayController() -> object public ResultCode GetDisplayController(ServiceCtx context) { @@ -57,7 +57,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(10)] + [CommandCmif(10)] // GetProcessWindingController() -> object public ResultCode GetProcessWindingController(ServiceCtx context) { @@ -66,7 +66,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // GetLibraryAppletCreator() -> object public ResultCode GetLibraryAppletCreator(ServiceCtx context) { @@ -75,7 +75,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(20)] + [CommandCmif(20)] // OpenLibraryAppletSelfAccessor() -> object public ResultCode OpenLibraryAppletSelfAccessor(ServiceCtx context) { @@ -84,7 +84,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(21)] + [CommandCmif(21)] // GetAppletCommonFunctions() -> object public ResultCode GetAppletCommonFunctions(ServiceCtx context) { @@ -93,7 +93,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(1000)] + [CommandCmif(1000)] // GetDebugFunctions() -> object public ResultCode GetDebugFunctions(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ISystemAppletProxy.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ISystemAppletProxy.cs index 61a7a46d3..dc26d80c1 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ISystemAppletProxy.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/ISystemAppletProxy.cs @@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService _pid = pid; } - [CommandHipc(0)] + [CommandCmif(0)] // GetCommonStateGetter() -> object public ResultCode GetCommonStateGetter(ServiceCtx context) { @@ -20,7 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetSelfController() -> object public ResultCode GetSelfController(ServiceCtx context) { @@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetWindowController() -> object public ResultCode GetWindowController(ServiceCtx context) { @@ -38,7 +38,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetAudioController() -> object public ResultCode GetAudioController(ServiceCtx context) { @@ -47,7 +47,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // GetDisplayController() -> object public ResultCode GetDisplayController(ServiceCtx context) { @@ -56,7 +56,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // GetLibraryAppletCreator() -> object public ResultCode GetLibraryAppletCreator(ServiceCtx context) { @@ -65,7 +65,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(20)] + [CommandCmif(20)] // GetHomeMenuFunctions() -> object public ResultCode GetHomeMenuFunctions(ServiceCtx context) { @@ -74,7 +74,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(21)] + [CommandCmif(21)] // GetGlobalStateController() -> object public ResultCode GetGlobalStateController(ServiceCtx context) { @@ -83,7 +83,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(22)] + [CommandCmif(22)] // GetApplicationCreator() -> object public ResultCode GetApplicationCreator(ServiceCtx context) { @@ -92,7 +92,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService return ResultCode.Success; } - [CommandHipc(1000)] + [CommandCmif(1000)] // GetDebugFunctions() -> object public ResultCode GetDebugFunctions(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs index 4ed502e0e..0057eba34 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs @@ -62,7 +62,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib _interactiveOutDataEvent.WritableEvent.Signal(); } - [CommandHipc(0)] + [CommandCmif(0)] // GetAppletStateChangedEvent() -> handle public ResultCode GetAppletStateChangedEvent(ServiceCtx context) { @@ -79,14 +79,14 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.Success; } - [CommandHipc(10)] + [CommandCmif(10)] // Start() public ResultCode Start(ServiceCtx context) { return (ResultCode)_applet.Start(_normalSession.GetConsumer(), _interactiveSession.GetConsumer()); } - [CommandHipc(20)] + [CommandCmif(20)] // RequestExit() public ResultCode RequestExit(ServiceCtx context) { @@ -98,14 +98,14 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.Success; } - [CommandHipc(30)] + [CommandCmif(30)] // GetResult() public ResultCode GetResult(ServiceCtx context) { return (ResultCode)_applet.GetResult(); } - [CommandHipc(60)] + [CommandCmif(60)] // PresetLibraryAppletGpuTimeSliceZero() public ResultCode PresetLibraryAppletGpuTimeSliceZero(ServiceCtx context) { @@ -118,7 +118,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.Success; } - [CommandHipc(100)] + [CommandCmif(100)] // PushInData(object) public ResultCode PushInData(ServiceCtx context) { @@ -129,7 +129,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.Success; } - [CommandHipc(101)] + [CommandCmif(101)] // PopOutData() -> object public ResultCode PopOutData(ServiceCtx context) { @@ -145,7 +145,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.NotAvailable; } - [CommandHipc(103)] + [CommandCmif(103)] // PushInteractiveInData(object) public ResultCode PushInteractiveInData(ServiceCtx context) { @@ -156,7 +156,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.Success; } - [CommandHipc(104)] + [CommandCmif(104)] // PopInteractiveOutData() -> object public ResultCode PopInteractiveOutData(ServiceCtx context) { @@ -172,7 +172,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.NotAvailable; } - [CommandHipc(105)] + [CommandCmif(105)] // GetPopOutDataEvent() -> handle public ResultCode GetPopOutDataEvent(ServiceCtx context) { @@ -189,7 +189,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.Success; } - [CommandHipc(106)] + [CommandCmif(106)] // GetPopInteractiveOutDataEvent() -> handle public ResultCode GetPopInteractiveOutDataEvent(ServiceCtx context) { @@ -206,21 +206,21 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.Success; } - [CommandHipc(110)] + [CommandCmif(110)] // NeedsToExitProcess() public ResultCode NeedsToExitProcess(ServiceCtx context) { return ResultCode.Stubbed; } - [CommandHipc(150)] + [CommandCmif(150)] // RequestForAppletToGetForeground() public ResultCode RequestForAppletToGetForeground(ServiceCtx context) { return ResultCode.Stubbed; } - [CommandHipc(160)] // 2.0.0+ + [CommandCmif(160)] // 2.0.0+ // GetIndirectLayerConsumerHandle() -> u64 indirect_layer_consumer_handle public ResultCode GetIndirectLayerConsumerHandle(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs index 720497141..176bd6322 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/ILibraryAppletSelfAccessor.cs @@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib } } - [CommandHipc(0)] + [CommandCmif(0)] // PopInData() -> object public ResultCode PopInData(ServiceCtx context) { @@ -45,7 +45,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // GetLibraryAppletInfo() -> nn::am::service::LibraryAppletInfo public ResultCode GetLibraryAppletInfo(ServiceCtx context) { @@ -60,7 +60,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib return ResultCode.Success; } - [CommandHipc(14)] + [CommandCmif(14)] // GetCallerAppletIdentityInfo() -> nn::am::service::AppletIdentityInfo public ResultCode GetCallerAppletIdentityInfo(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/IProcessWindingController.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/IProcessWindingController.cs index e6c167342..6acd18cd6 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/IProcessWindingController.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletProxy/IProcessWindingController.cs @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib { public IProcessWindingController() { } - [CommandHipc(0)] + [CommandCmif(0)] // GetLaunchReason() -> nn::am::service::AppletProcessLaunchReason public ResultCode GetLaunchReason(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAudioController.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAudioController.cs index 3f81fda67..48dd42e41 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAudioController.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IAudioController.cs @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys { public IAudioController() { } - [CommandHipc(0)] + [CommandCmif(0)] // SetExpectedMasterVolume(f32, f32) public ResultCode SetExpectedMasterVolume(ServiceCtx context) { @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetMainAppletExpectedMasterVolume() -> f32 public ResultCode GetMainAppletExpectedMasterVolume(ServiceCtx context) { @@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetLibraryAppletExpectedMasterVolume() -> f32 public ResultCode GetLibraryAppletExpectedMasterVolume(ServiceCtx context) { @@ -40,7 +40,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // ChangeMainAppletMasterVolume(f32, u64) public ResultCode ChangeMainAppletMasterVolume(ServiceCtx context) { @@ -52,7 +52,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // SetTransparentVolumeRate(f32) public ResultCode SetTransparentVolumeRate(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs index b145a65d1..381267b05 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ICommonStateGetter.cs @@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys _lblControllerServer = new Lbl.LblControllerServer(context); } - [CommandHipc(0)] + [CommandCmif(0)] // GetEventHandle() -> handle public ResultCode GetEventHandle(ServiceCtx context) { @@ -49,7 +49,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // ReceiveMessage() -> nn::am::AppletMessage public ResultCode ReceiveMessage(ServiceCtx context) { @@ -77,7 +77,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // GetOperationMode() -> u8 public ResultCode GetOperationMode(ServiceCtx context) { @@ -90,14 +90,14 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(6)] + [CommandCmif(6)] // GetPerformanceMode() -> nn::apm::PerformanceMode public ResultCode GetPerformanceMode(ServiceCtx context) { return (ResultCode)_apmManagerServer.GetPerformanceMode(context); } - [CommandHipc(8)] + [CommandCmif(8)] // GetBootMode() -> u8 public ResultCode GetBootMode(ServiceCtx context) { @@ -108,7 +108,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(9)] + [CommandCmif(9)] // GetCurrentFocusState() -> u8 public ResultCode GetCurrentFocusState(ServiceCtx context) { @@ -117,7 +117,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(50)] // 3.0.0+ + [CommandCmif(50)] // 3.0.0+ // IsVrModeEnabled() -> b8 public ResultCode IsVrModeEnabled(ServiceCtx context) { @@ -126,7 +126,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(51)] // 3.0.0+ + [CommandCmif(51)] // 3.0.0+ // SetVrModeEnabled(b8) public ResultCode SetVrModeEnabled(ServiceCtx context) { @@ -137,7 +137,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(52)] // 4.0.0+ + [CommandCmif(52)] // 4.0.0+ // SetLcdBacklighOffEnabled(b8) public ResultCode SetLcdBacklighOffEnabled(ServiceCtx context) { @@ -151,7 +151,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(53)] // 7.0.0+ + [CommandCmif(53)] // 7.0.0+ // BeginVrModeEx() public ResultCode BeginVrModeEx(ServiceCtx context) { @@ -160,7 +160,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(54)] // 7.0.0+ + [CommandCmif(54)] // 7.0.0+ // EndVrModeEx() public ResultCode EndVrModeEx(ServiceCtx context) { @@ -190,7 +190,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys // TODO: It signals an internal event of ICommonStateGetter. We have to determine where this event is used. } - [CommandHipc(60)] // 3.0.0+ + [CommandCmif(60)] // 3.0.0+ // GetDefaultDisplayResolution() -> (u32, u32) public ResultCode GetDefaultDisplayResolution(ServiceCtx context) { @@ -204,7 +204,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(61)] // 3.0.0+ + [CommandCmif(61)] // 3.0.0+ // GetDefaultDisplayResolutionChangeEvent() -> handle public ResultCode GetDefaultDisplayResolutionChangeEvent(ServiceCtx context) { @@ -224,7 +224,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(62)] // 4.0.0+ + [CommandCmif(62)] // 4.0.0+ // GetHdcpAuthenticationState() -> s32 state public ResultCode GetHdcpAuthenticationState(ServiceCtx context) { @@ -235,7 +235,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(66)] // 6.0.0+ + [CommandCmif(66)] // 6.0.0+ // SetCpuBoostMode(u32 cpu_boost_mode) public ResultCode SetCpuBoostMode(ServiceCtx context) { @@ -253,14 +253,14 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(91)] // 7.0.0+ + [CommandCmif(91)] // 7.0.0+ // GetCurrentPerformanceConfiguration() -> nn::apm::PerformanceConfiguration public ResultCode GetCurrentPerformanceConfiguration(ServiceCtx context) { return (ResultCode)_apmSystemManagerServer.GetCurrentPerformanceConfiguration(context); } - [CommandHipc(300)] // 9.0.0+ + [CommandCmif(300)] // 9.0.0+ // GetSettingsPlatformRegion() -> u8 public ResultCode GetSettingsPlatformRegion(ServiceCtx context) { @@ -272,7 +272,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(900)] // 11.0.0+ + [CommandCmif(900)] // 11.0.0+ // SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled() public ResultCode SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDisplayController.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDisplayController.cs index 7c03fc278..92c97d861 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDisplayController.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IDisplayController.cs @@ -17,7 +17,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys _transferMem = context.Device.System.AppletCaptureBufferTransfer; } - [CommandHipc(8)] // 2.0.0+ + [CommandCmif(8)] // 2.0.0+ // TakeScreenShotOfOwnLayer(b8, s32) public ResultCode TakeScreenShotOfOwnLayer(ServiceCtx context) { @@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // ReleaseLastApplicationCaptureBuffer() public ResultCode ReleaseLastApplicationCaptureBuffer(ServiceCtx context) { @@ -43,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(15)] + [CommandCmif(15)] // ReleaseCallerAppletCaptureBuffer() public ResultCode ReleaseCallerAppletCaptureBuffer(ServiceCtx context) { @@ -57,7 +57,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(16)] + [CommandCmif(16)] // AcquireLastApplicationCaptureBufferEx() -> (b8, handle) public ResultCode AcquireLastApplicationCaptureBufferEx(ServiceCtx context) { @@ -80,7 +80,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(18)] + [CommandCmif(18)] // AcquireCallerAppletCaptureBufferEx() -> (b8, handle) public ResultCode AcquireCallerAppletCaptureBufferEx(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IHomeMenuFunctions.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IHomeMenuFunctions.cs index 2a9848ddc..c7c073ff1 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IHomeMenuFunctions.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IHomeMenuFunctions.cs @@ -17,7 +17,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys _channelEvent = new KEvent(system.KernelContext); } - [CommandHipc(10)] + [CommandCmif(10)] // RequestToGetForeground() public ResultCode RequestToGetForeground(ServiceCtx context) { @@ -26,7 +26,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(21)] + [CommandCmif(21)] // GetPopFromGeneralChannelEvent() -> handle public ResultCode GetPopFromGeneralChannelEvent(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs index 8860f007c..fb870c242 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ILibraryAppletCreator.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys { public ILibraryAppletCreator() { } - [CommandHipc(0)] + [CommandCmif(0)] // CreateLibraryApplet(u32, u32) -> object public ResultCode CreateLibraryApplet(ServiceCtx context) { @@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(10)] + [CommandCmif(10)] // CreateStorage(u64) -> object public ResultCode CreateStorage(ServiceCtx context) { @@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // CreateTransferMemoryStorage(b8, u64, handle) -> object public ResultCode CreateTransferMemoryStorage(ServiceCtx context) { @@ -63,7 +63,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(12)] // 2.0.0+ + [CommandCmif(12)] // 2.0.0+ // CreateHandleStorage(u64, handle) -> object public ResultCode CreateHandleStorage(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs index 39be75776..399e778a4 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs @@ -43,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys _pid = pid; } - [CommandHipc(0)] + [CommandCmif(0)] // Exit() public ResultCode Exit(ServiceCtx context) { @@ -52,7 +52,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // LockExit() public ResultCode LockExit(ServiceCtx context) { @@ -61,7 +61,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // UnlockExit() public ResultCode UnlockExit(ServiceCtx context) { @@ -70,7 +70,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(3)] // 2.0.0+ + [CommandCmif(3)] // 2.0.0+ // EnterFatalSection() public ResultCode EnterFatalSection(ServiceCtx context) { @@ -82,7 +82,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(4)] // 2.0.0+ + [CommandCmif(4)] // 2.0.0+ // LeaveFatalSection() public ResultCode LeaveFatalSection(ServiceCtx context) { @@ -103,7 +103,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return result; } - [CommandHipc(9)] + [CommandCmif(9)] // GetLibraryAppletLaunchableEvent() -> handle public ResultCode GetLibraryAppletLaunchableEvent(ServiceCtx context) { @@ -124,7 +124,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(10)] + [CommandCmif(10)] // SetScreenShotPermission(u32) public ResultCode SetScreenShotPermission(ServiceCtx context) { @@ -137,7 +137,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // SetOperationModeChangedNotification(b8) public ResultCode SetOperationModeChangedNotification(ServiceCtx context) { @@ -150,7 +150,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(12)] + [CommandCmif(12)] // SetPerformanceModeChangedNotification(b8) public ResultCode SetPerformanceModeChangedNotification(ServiceCtx context) { @@ -163,7 +163,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(13)] + [CommandCmif(13)] // SetFocusHandlingMode(b8, b8, b8) public ResultCode SetFocusHandlingMode(ServiceCtx context) { @@ -176,7 +176,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(14)] + [CommandCmif(14)] // SetRestartMessageEnabled(b8) public ResultCode SetRestartMessageEnabled(ServiceCtx context) { @@ -189,7 +189,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(16)] // 2.0.0+ + [CommandCmif(16)] // 2.0.0+ // SetOutOfFocusSuspendingEnabled(b8) public ResultCode SetOutOfFocusSuspendingEnabled(ServiceCtx context) { @@ -202,7 +202,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(19)] // 3.0.0+ + [CommandCmif(19)] // 3.0.0+ // SetScreenShotImageOrientation(u32) public ResultCode SetScreenShotImageOrientation(ServiceCtx context) { @@ -215,7 +215,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(40)] + [CommandCmif(40)] // CreateManagedDisplayLayer() -> u64 public ResultCode CreateManagedDisplayLayer(ServiceCtx context) { @@ -227,7 +227,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(41)] // 4.0.0+ + [CommandCmif(41)] // 4.0.0+ // IsSystemBufferSharingEnabled() public ResultCode IsSystemBufferSharingEnabled(ServiceCtx context) { @@ -236,7 +236,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.NotImplemented; } - [CommandHipc(44)] // 10.0.0+ + [CommandCmif(44)] // 10.0.0+ // CreateManagedDisplaySeparableLayer() -> (u64, u64) public ResultCode CreateManagedDisplaySeparableLayer(ServiceCtx context) { @@ -250,7 +250,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(50)] + [CommandCmif(50)] // SetHandlesRequestToDisplay(b8) public ResultCode SetHandlesRequestToDisplay(ServiceCtx context) { @@ -263,7 +263,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(62)] + [CommandCmif(62)] // SetIdleTimeDetectionExtension(u32) public ResultCode SetIdleTimeDetectionExtension(ServiceCtx context) { @@ -276,7 +276,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(63)] + [CommandCmif(63)] // GetIdleTimeDetectionExtension() -> u32 public ResultCode GetIdleTimeDetectionExtension(ServiceCtx context) { @@ -287,7 +287,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(65)] + [CommandCmif(65)] // ReportUserIsActive() public ResultCode ReportUserIsActive(ServiceCtx context) { @@ -298,19 +298,19 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(67)] //3.0.0+ + [CommandCmif(67)] //3.0.0+ // IsIlluminanceAvailable() -> bool public ResultCode IsIlluminanceAvailable(ServiceCtx context) { // NOTE: This should call IsAmbientLightSensorAvailable through to Lbl, but there's no situation where we'd want false. context.ResponseData.Write(true); - + Logger.Stub?.PrintStub(LogClass.ServiceAm); return ResultCode.Success; } - [CommandHipc(68)] + [CommandCmif(68)] // SetAutoSleepDisabled(u8) public ResultCode SetAutoSleepDisabled(ServiceCtx context) { @@ -321,7 +321,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(69)] + [CommandCmif(69)] // IsAutoSleepDisabled() -> u8 public ResultCode IsAutoSleepDisabled(ServiceCtx context) { @@ -330,7 +330,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(71)] //5.0.0+ + [CommandCmif(71)] //5.0.0+ // GetCurrentIlluminanceEx() -> (bool, f32) public ResultCode GetCurrentIlluminanceEx(ServiceCtx context) { @@ -343,7 +343,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(80)] // 4.0.0+ + [CommandCmif(80)] // 4.0.0+ // SetWirelessPriorityMode(s32 wireless_priority_mode) public ResultCode SetWirelessPriorityMode(ServiceCtx context) { @@ -359,7 +359,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(90)] // 6.0.0+ + [CommandCmif(90)] // 6.0.0+ // GetAccumulatedSuspendedTickValue() -> u64 public ResultCode GetAccumulatedSuspendedTickValue(ServiceCtx context) { @@ -368,7 +368,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(91)] // 6.0.0+ + [CommandCmif(91)] // 6.0.0+ // GetAccumulatedSuspendedTickChangedEvent() -> handle public ResultCode GetAccumulatedSuspendedTickChangedEvent(ServiceCtx context) { @@ -389,7 +389,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(100)] // 7.0.0+ + [CommandCmif(100)] // 7.0.0+ // SetAlbumImageTakenNotificationEnabled(u8) public ResultCode SetAlbumImageTakenNotificationEnabled(ServiceCtx context) { @@ -400,7 +400,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(120)] // 11.0.0+ + [CommandCmif(120)] // 11.0.0+ // SaveCurrentScreenshot(s32 album_report_option) public ResultCode SaveCurrentScreenshot(ServiceCtx context) { @@ -416,7 +416,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(130)] // 13.0.0+ + [CommandCmif(130)] // 13.0.0+ // SetRecordVolumeMuted(b8) public ResultCode SetRecordVolumeMuted(ServiceCtx context) { @@ -429,4 +429,4 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } } -} +} \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IWindowController.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IWindowController.cs index 37a3efcba..730df5d05 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IWindowController.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/IWindowController.cs @@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys _pid = pid; } - [CommandHipc(1)] + [CommandCmif(1)] // GetAppletResourceUserId() -> nn::applet::AppletResourceUserId public ResultCode GetAppletResourceUserId(ServiceCtx context) { @@ -24,7 +24,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys return ResultCode.Success; } - [CommandHipc(10)] + [CommandCmif(10)] // AcquireForegroundRights() public ResultCode AcquireForegroundRights(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/IAllSystemAppletProxiesService.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/IAllSystemAppletProxiesService.cs index 926234f58..728a10180 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/IAllSystemAppletProxiesService.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/IAllSystemAppletProxiesService.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE { public IAllSystemAppletProxiesService(ServiceCtx context) { } - [CommandHipc(100)] + [CommandCmif(100)] // OpenSystemAppletProxy(u64, pid, handle) -> object public ResultCode OpenSystemAppletProxy(ServiceCtx context) { @@ -16,8 +16,8 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE return ResultCode.Success; } - [CommandHipc(200)] - [CommandHipc(201)] // 3.0.0+ + [CommandCmif(200)] + [CommandCmif(201)] // 3.0.0+ // OpenLibraryAppletProxy(u64, pid, handle) -> object public ResultCode OpenLibraryAppletProxy(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs index c844bfdce..190f1a514 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorage.cs @@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE Data = data; } - [CommandHipc(0)] + [CommandCmif(0)] // Open() -> object public ResultCode Open(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorageAccessor.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorageAccessor.cs index 33f5393ff..4c7e264d0 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorageAccessor.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/IStorageAccessor.cs @@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE _storage = storage; } - [CommandHipc(0)] + [CommandCmif(0)] // GetSize() -> u64 public ResultCode GetSize(ServiceCtx context) { @@ -20,7 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE return ResultCode.Success; } - [CommandHipc(10)] + [CommandCmif(10)] // Write(u64, buffer) public ResultCode Write(ServiceCtx context) { @@ -59,7 +59,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // Read(u64) -> buffer public ResultCode Read(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs b/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs index 924f54298..5ae8f459f 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/ApplicationProxy/IApplicationFunctions.cs @@ -55,7 +55,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati _horizon = system.LibHacHorizonManager.AmClient; } - [CommandHipc(1)] + [CommandCmif(1)] // PopLaunchParameter(LaunchParameterKind kind) -> object public ResultCode PopLaunchParameter(ServiceCtx context) { @@ -88,7 +88,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(12)] // 4.0.0+ + [CommandCmif(12)] // 4.0.0+ // CreateApplicationAndRequestToStart(u64 title_id) public ResultCode CreateApplicationAndRequestToStart(ServiceCtx context) { @@ -108,7 +108,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(20)] + [CommandCmif(20)] // EnsureSaveData(nn::account::Uid) -> u64 public ResultCode EnsureSaveData(ServiceCtx context) { @@ -127,7 +127,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return (ResultCode)result.Value; } - [CommandHipc(21)] + [CommandCmif(21)] // GetDesiredLanguage() -> nn::settings::LanguageCode public ResultCode GetDesiredLanguage(ServiceCtx context) { @@ -164,7 +164,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(22)] + [CommandCmif(22)] // SetTerminateResult(u32) public ResultCode SetTerminateResult(ServiceCtx context) { @@ -175,7 +175,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(23)] + [CommandCmif(23)] // GetDisplayVersion() -> nn::oe::DisplayVersion public ResultCode GetDisplayVersion(ServiceCtx context) { @@ -185,7 +185,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(25)] // 3.0.0+ + [CommandCmif(25)] // 3.0.0+ // ExtendSaveData(u8 save_data_type, nn::account::Uid, s64 save_size, s64 journal_size) -> u64 result_code public ResultCode ExtendSaveData(ServiceCtx context) { @@ -207,7 +207,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(26)] // 3.0.0+ + [CommandCmif(26)] // 3.0.0+ // GetSaveDataSize(u8 save_data_type, nn::account::Uid) -> (s64 save_size, s64 journal_size) public ResultCode GetSaveDataSize(ServiceCtx context) { @@ -226,7 +226,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(27)] // 5.0.0+ + [CommandCmif(27)] // 5.0.0+ // CreateCacheStorage(u16 index, s64 save_size, s64 journal_size) -> (u32 storageTarget, u64 requiredSize) public ResultCode CreateCacheStorage(ServiceCtx context) { @@ -250,7 +250,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(28)] // 11.0.0+ + [CommandCmif(28)] // 11.0.0+ // GetSaveDataSizeMax() -> (s64 save_size_max, s64 journal_size_max) public ResultCode GetSaveDataSizeMax(ServiceCtx context) { @@ -267,7 +267,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(30)] + [CommandCmif(30)] // BeginBlockingHomeButtonShortAndLongPressed() public ResultCode BeginBlockingHomeButtonShortAndLongPressed(ServiceCtx context) { @@ -278,7 +278,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(31)] + [CommandCmif(31)] // EndBlockingHomeButtonShortAndLongPressed() public ResultCode EndBlockingHomeButtonShortAndLongPressed(ServiceCtx context) { @@ -289,7 +289,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(32)] // 2.0.0+ + [CommandCmif(32)] // 2.0.0+ // BeginBlockingHomeButton(u64 nano_second) public ResultCode BeginBlockingHomeButton(ServiceCtx context) { @@ -302,7 +302,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(33)] // 2.0.0+ + [CommandCmif(33)] // 2.0.0+ // EndBlockingHomeButton() public ResultCode EndBlockingHomeButton(ServiceCtx context) { @@ -313,7 +313,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(40)] + [CommandCmif(40)] // NotifyRunning() -> b8 public ResultCode NotifyRunning(ServiceCtx context) { @@ -322,7 +322,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(50)] // 2.0.0+ + [CommandCmif(50)] // 2.0.0+ // GetPseudoDeviceId() -> nn::util::Uuid public ResultCode GetPseudoDeviceId(ServiceCtx context) { @@ -334,7 +334,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(60)] // 2.0.0+ + [CommandCmif(60)] // 2.0.0+ // SetMediaPlaybackStateForApplication(bool enabled) public ResultCode SetMediaPlaybackStateForApplication(ServiceCtx context) { @@ -347,7 +347,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(65)] // 3.0.0+ + [CommandCmif(65)] // 3.0.0+ // IsGamePlayRecordingSupported() -> u8 public ResultCode IsGamePlayRecordingSupported(ServiceCtx context) { @@ -356,7 +356,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(66)] // 3.0.0+ + [CommandCmif(66)] // 3.0.0+ // InitializeGamePlayRecording(u64, handle) public ResultCode InitializeGamePlayRecording(ServiceCtx context) { @@ -365,7 +365,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(67)] // 3.0.0+ + [CommandCmif(67)] // 3.0.0+ // SetGamePlayRecordingState(u32) public ResultCode SetGamePlayRecordingState(ServiceCtx context) { @@ -376,7 +376,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(90)] // 4.0.0+ + [CommandCmif(90)] // 4.0.0+ // EnableApplicationCrashReport(u8) public ResultCode EnableApplicationCrashReport(ServiceCtx context) { @@ -387,7 +387,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(100)] // 5.0.0+ + [CommandCmif(100)] // 5.0.0+ // InitializeApplicationCopyrightFrameBuffer(s32 width, s32 height, handle transfer_memory, u64 transfer_memory_size) public ResultCode InitializeApplicationCopyrightFrameBuffer(ServiceCtx context) { @@ -433,7 +433,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return resultCode; } - [CommandHipc(101)] // 5.0.0+ + [CommandCmif(101)] // 5.0.0+ // SetApplicationCopyrightImage(buffer frame_buffer, s32 x, s32 y, s32 width, s32 height, s32 window_origin_mode) public ResultCode SetApplicationCopyrightImage(ServiceCtx context) { @@ -480,7 +480,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(102)] // 5.0.0+ + [CommandCmif(102)] // 5.0.0+ // SetApplicationCopyrightVisibility(bool visible) public ResultCode SetApplicationCopyrightVisibility(ServiceCtx context) { @@ -493,7 +493,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(110)] // 5.0.0+ + [CommandCmif(110)] // 5.0.0+ // QueryApplicationPlayStatistics(buffer title_id_list) -> (buffer entries, s32 entries_count) public ResultCode QueryApplicationPlayStatistics(ServiceCtx context) { @@ -501,7 +501,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return (ResultCode)QueryPlayStatisticsManager.GetPlayStatistics(context); } - [CommandHipc(111)] // 6.0.0+ + [CommandCmif(111)] // 6.0.0+ // QueryApplicationPlayStatisticsByUid(nn::account::Uid, buffer title_id_list) -> (buffer entries, s32 entries_count) public ResultCode QueryApplicationPlayStatisticsByUid(ServiceCtx context) { @@ -509,7 +509,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return (ResultCode)QueryPlayStatisticsManager.GetPlayStatistics(context, true); } - [CommandHipc(120)] // 5.0.0+ + [CommandCmif(120)] // 5.0.0+ // ExecuteProgram(ProgramSpecifyKind kind, u64 value) public ResultCode ExecuteProgram(ServiceCtx context) { @@ -527,7 +527,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(121)] // 5.0.0+ + [CommandCmif(121)] // 5.0.0+ // ClearUserChannel() public ResultCode ClearUserChannel(ServiceCtx context) { @@ -536,7 +536,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(122)] // 5.0.0+ + [CommandCmif(122)] // 5.0.0+ // UnpopToUserChannel(object input_storage) public ResultCode UnpopToUserChannel(ServiceCtx context) { @@ -547,7 +547,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(123)] // 5.0.0+ + [CommandCmif(123)] // 5.0.0+ // GetPreviousProgramIndex() -> s32 program_index public ResultCode GetPreviousProgramIndex(ServiceCtx context) { @@ -560,7 +560,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(130)] // 8.0.0+ + [CommandCmif(130)] // 8.0.0+ // GetGpuErrorDetectedSystemEvent() -> handle public ResultCode GetGpuErrorDetectedSystemEvent(ServiceCtx context) { @@ -581,7 +581,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(140)] // 9.0.0+ + [CommandCmif(140)] // 9.0.0+ // GetFriendInvitationStorageChannelEvent() -> handle public ResultCode GetFriendInvitationStorageChannelEvent(ServiceCtx context) { @@ -598,7 +598,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(141)] // 9.0.0+ + [CommandCmif(141)] // 9.0.0+ // TryPopFromFriendInvitationStorageChannel() -> object public ResultCode TryPopFromFriendInvitationStorageChannel(ServiceCtx context) { @@ -612,7 +612,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.NotAvailable; } - [CommandHipc(150)] // 9.0.0+ + [CommandCmif(150)] // 9.0.0+ // GetNotificationStorageChannelEvent() -> handle public ResultCode GetNotificationStorageChannelEvent(ServiceCtx context) { @@ -629,7 +629,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(160)] // 9.0.0+ + [CommandCmif(160)] // 9.0.0+ // GetHealthWarningDisappearedSystemEvent() -> handle public ResultCode GetHealthWarningDisappearedSystemEvent(ServiceCtx context) { @@ -646,7 +646,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.Applicati return ResultCode.Success; } - [CommandHipc(1001)] // 10.0.0+ + [CommandCmif(1001)] // 10.0.0+ // PrepareForJit() public ResultCode PrepareForJit(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/IApplicationProxy.cs b/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/IApplicationProxy.cs index bb85c1db4..50e3be274 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/IApplicationProxy.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletOE/ApplicationProxyService/IApplicationProxy.cs @@ -12,7 +12,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService _pid = pid; } - [CommandHipc(0)] + [CommandCmif(0)] // GetCommonStateGetter() -> object public ResultCode GetCommonStateGetter(ServiceCtx context) { @@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetSelfController() -> object public ResultCode GetSelfController(ServiceCtx context) { @@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetWindowController() -> object public ResultCode GetWindowController(ServiceCtx context) { @@ -39,7 +39,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetAudioController() -> object public ResultCode GetAudioController(ServiceCtx context) { @@ -48,7 +48,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // GetDisplayController() -> object public ResultCode GetDisplayController(ServiceCtx context) { @@ -57,7 +57,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // GetLibraryAppletCreator() -> object public ResultCode GetLibraryAppletCreator(ServiceCtx context) { @@ -66,7 +66,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService return ResultCode.Success; } - [CommandHipc(20)] + [CommandCmif(20)] // GetApplicationFunctions() -> object public ResultCode GetApplicationFunctions(ServiceCtx context) { @@ -75,7 +75,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService return ResultCode.Success; } - [CommandHipc(1000)] + [CommandCmif(1000)] // GetDebugFunctions() -> object public ResultCode GetDebugFunctions(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletOE/IApplicationProxyService.cs b/Ryujinx.HLE/HOS/Services/Am/AppletOE/IApplicationProxyService.cs index 252ae352d..3a4c71e4b 100644 --- a/Ryujinx.HLE/HOS/Services/Am/AppletOE/IApplicationProxyService.cs +++ b/Ryujinx.HLE/HOS/Services/Am/AppletOE/IApplicationProxyService.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Am { public IApplicationProxyService(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // OpenApplicationProxy(u64, pid, handle) -> object public ResultCode OpenApplicationProxy(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Apm/IManager.cs b/Ryujinx.HLE/HOS/Services/Apm/IManager.cs index 11d28808f..72e39a77f 100644 --- a/Ryujinx.HLE/HOS/Services/Apm/IManager.cs +++ b/Ryujinx.HLE/HOS/Services/Apm/IManager.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm protected abstract PerformanceMode GetPerformanceMode(); protected abstract bool IsCpuOverclockEnabled(); - [CommandHipc(0)] + [CommandCmif(0)] // OpenSession() -> object public ResultCode OpenSession(ServiceCtx context) { @@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return resultCode; } - [CommandHipc(1)] + [CommandCmif(1)] // GetPerformanceMode() -> nn::apm::PerformanceMode public ResultCode GetPerformanceMode(ServiceCtx context) { @@ -31,7 +31,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return ResultCode.Success; } - [CommandHipc(6)] // 7.0.0+ + [CommandCmif(6)] // 7.0.0+ // IsCpuOverclockEnabled() -> bool public ResultCode IsCpuOverclockEnabled(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Apm/IManagerPrivileged.cs b/Ryujinx.HLE/HOS/Services/Apm/IManagerPrivileged.cs index 56a7c5aa9..9620c30a1 100644 --- a/Ryujinx.HLE/HOS/Services/Apm/IManagerPrivileged.cs +++ b/Ryujinx.HLE/HOS/Services/Apm/IManagerPrivileged.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm { public IManagerPrivileged(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // OpenSession() -> object public ResultCode OpenSession(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Apm/ISession.cs b/Ryujinx.HLE/HOS/Services/Apm/ISession.cs index fca01812c..f828cd175 100644 --- a/Ryujinx.HLE/HOS/Services/Apm/ISession.cs +++ b/Ryujinx.HLE/HOS/Services/Apm/ISession.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm protected abstract ResultCode GetPerformanceConfiguration(PerformanceMode performanceMode, out PerformanceConfiguration performanceConfiguration); protected abstract void SetCpuOverclockEnabled(bool enabled); - [CommandHipc(0)] + [CommandCmif(0)] // SetPerformanceConfiguration(nn::apm::PerformanceMode, nn::apm::PerformanceConfiguration) public ResultCode SetPerformanceConfiguration(ServiceCtx context) { @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return SetPerformanceConfiguration(performanceMode, performanceConfiguration); } - [CommandHipc(1)] + [CommandCmif(1)] // GetPerformanceConfiguration(nn::apm::PerformanceMode) -> nn::apm::PerformanceConfiguration public ResultCode GetPerformanceConfiguration(ServiceCtx context) { @@ -31,7 +31,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return resultCode; } - [CommandHipc(2)] // 8.0.0+ + [CommandCmif(2)] // 8.0.0+ // SetCpuOverclockEnabled(bool) public ResultCode SetCpuOverclockEnabled(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Apm/ISystemManager.cs b/Ryujinx.HLE/HOS/Services/Apm/ISystemManager.cs index 1268463b7..9d2c7b0b4 100644 --- a/Ryujinx.HLE/HOS/Services/Apm/ISystemManager.cs +++ b/Ryujinx.HLE/HOS/Services/Apm/ISystemManager.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm internal abstract void SetCpuBoostMode(CpuBoostMode cpuBoostMode); protected abstract PerformanceConfiguration GetCurrentPerformanceConfiguration(); - [CommandHipc(0)] + [CommandCmif(0)] // RequestPerformanceMode(nn::apm::PerformanceMode) public ResultCode RequestPerformanceMode(ServiceCtx context) { @@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return ResultCode.Success; } - [CommandHipc(6)] // 7.0.0+ + [CommandCmif(6)] // 7.0.0+ // SetCpuBoostMode(nn::apm::CpuBootMode) public ResultCode SetCpuBoostMode(ServiceCtx context) { @@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Apm return ResultCode.Success; } - [CommandHipc(7)] // 7.0.0+ + [CommandCmif(7)] // 7.0.0+ // GetCurrentPerformanceConfiguration() -> nn::apm::PerformanceConfiguration public ResultCode GetCurrentPerformanceConfiguration(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioIn/AudioInServer.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioIn/AudioInServer.cs index 4911b7f00..a80b94025 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioIn/AudioInServer.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioIn/AudioInServer.cs @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn _impl = impl; } - [CommandHipc(0)] + [CommandCmif(0)] // GetAudioInState() -> u32 state public ResultCode GetAudioInState(ServiceCtx context) { @@ -27,21 +27,21 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // Start() public ResultCode Start(ServiceCtx context) { return _impl.Start(); } - [CommandHipc(2)] + [CommandCmif(2)] // Stop() public ResultCode StopAudioIn(ServiceCtx context) { return _impl.Stop(); } - [CommandHipc(3)] + [CommandCmif(3)] // AppendAudioInBuffer(u64 tag, buffer) public ResultCode AppendAudioInBuffer(ServiceCtx context) { @@ -54,7 +54,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn return _impl.AppendBuffer(bufferTag, ref data); } - [CommandHipc(4)] + [CommandCmif(4)] // RegisterBufferEvent() -> handle public ResultCode RegisterBufferEvent(ServiceCtx context) { @@ -70,7 +70,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // GetReleasedAudioInBuffers() -> (u32 count, buffer tags) public ResultCode GetReleasedAudioInBuffers(ServiceCtx context) { @@ -87,7 +87,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn } } - [CommandHipc(6)] + [CommandCmif(6)] // ContainsAudioInBuffer(u64 tag) -> b8 public ResultCode ContainsAudioInBuffer(ServiceCtx context) { @@ -98,7 +98,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn return ResultCode.Success; } - [CommandHipc(7)] // 3.0.0+ + [CommandCmif(7)] // 3.0.0+ // AppendUacInBuffer(u64 tag, handle, buffer) public ResultCode AppendUacInBuffer(ServiceCtx context) { @@ -112,7 +112,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn return _impl.AppendUacBuffer(bufferTag, ref data, handle); } - [CommandHipc(8)] // 3.0.0+ + [CommandCmif(8)] // 3.0.0+ // AppendAudioInBufferAuto(u64 tag, buffer) public ResultCode AppendAudioInBufferAuto(ServiceCtx context) { @@ -125,7 +125,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn return _impl.AppendBuffer(bufferTag, ref data); } - [CommandHipc(9)] // 3.0.0+ + [CommandCmif(9)] // 3.0.0+ // GetReleasedAudioInBuffersAuto() -> (u32 count, buffer tags) public ResultCode GetReleasedAudioInBuffersAuto(ServiceCtx context) { @@ -141,7 +141,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn } } - [CommandHipc(10)] // 3.0.0+ + [CommandCmif(10)] // 3.0.0+ // AppendUacInBufferAuto(u64 tag, handle, buffer) public ResultCode AppendUacInBufferAuto(ServiceCtx context) { @@ -155,7 +155,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn return _impl.AppendUacBuffer(bufferTag, ref data, handle); } - [CommandHipc(11)] // 4.0.0+ + [CommandCmif(11)] // 4.0.0+ // GetAudioInBufferCount() -> u32 public ResultCode GetAudioInBufferCount(ServiceCtx context) { @@ -164,7 +164,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn return ResultCode.Success; } - [CommandHipc(12)] // 4.0.0+ + [CommandCmif(12)] // 4.0.0+ // SetAudioInVolume(s32) public ResultCode SetAudioInVolume(ServiceCtx context) { @@ -175,7 +175,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn return ResultCode.Success; } - [CommandHipc(13)] // 4.0.0+ + [CommandCmif(13)] // 4.0.0+ // GetAudioInVolume() -> s32 public ResultCode GetAudioInVolume(ServiceCtx context) { @@ -184,7 +184,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioIn return ResultCode.Success; } - [CommandHipc(14)] // 6.0.0+ + [CommandCmif(14)] // 6.0.0+ // FlushAudioInBuffers() -> b8 public ResultCode FlushAudioInBuffers(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioInManagerServer.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioInManagerServer.cs index 7b243c71b..755caee52 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioInManagerServer.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioInManagerServer.cs @@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio _impl = impl; } - [CommandHipc(0)] + [CommandCmif(0)] // ListAudioIns() -> (u32, buffer) public ResultCode ListAudioIns(ServiceCtx context) { @@ -57,7 +57,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // OpenAudioIn(AudioInInputConfiguration input_config, nn::applet::AppletResourceUserId, pid, handle, buffer name) // -> (u32 sample_rate, u32 channel_count, u32 pcm_format, u32, object, buffer name) public ResultCode OpenAudioIn(ServiceCtx context) @@ -92,7 +92,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return resultCode; } - [CommandHipc(2)] // 3.0.0+ + [CommandCmif(2)] // 3.0.0+ // ListAudioInsAuto() -> (u32, buffer) public ResultCode ListAudioInsAuto(ServiceCtx context) { @@ -127,7 +127,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(3)] // 3.0.0+ + [CommandCmif(3)] // 3.0.0+ // OpenAudioInAuto(AudioInInputConfiguration input_config, nn::applet::AppletResourceUserId, pid, handle, buffer) // -> (u32 sample_rate, u32 channel_count, u32 pcm_format, u32, object, buffer name) public ResultCode OpenAudioInAuto(ServiceCtx context) @@ -159,7 +159,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return resultCode; } - [CommandHipc(4)] // 3.0.0+ + [CommandCmif(4)] // 3.0.0+ // ListAudioInsAutoFiltered() -> (u32, buffer) public ResultCode ListAudioInsAutoFiltered(ServiceCtx context) { @@ -194,7 +194,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(5)] // 5.0.0+ + [CommandCmif(5)] // 5.0.0+ // OpenAudioInProtocolSpecified(b64 protocol_specified_related, AudioInInputConfiguration input_config, nn::applet::AppletResourceUserId, pid, handle, buffer name) // -> (u32 sample_rate, u32 channel_count, u32 pcm_format, u32, object, buffer name) public ResultCode OpenAudioInProtocolSpecified(ServiceCtx context) diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioOut/AudioOutServer.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioOut/AudioOutServer.cs index 2d6908e3f..329e17941 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioOut/AudioOutServer.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioOut/AudioOutServer.cs @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut _impl = impl; } - [CommandHipc(0)] + [CommandCmif(0)] // GetAudioOutState() -> u32 state public ResultCode GetAudioOutState(ServiceCtx context) { @@ -27,21 +27,21 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // Start() public ResultCode Start(ServiceCtx context) { return _impl.Start(); } - [CommandHipc(2)] + [CommandCmif(2)] // Stop() public ResultCode Stop(ServiceCtx context) { return _impl.Stop(); } - [CommandHipc(3)] + [CommandCmif(3)] // AppendAudioOutBuffer(u64 bufferTag, buffer buffer) public ResultCode AppendAudioOutBuffer(ServiceCtx context) { @@ -54,7 +54,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut return _impl.AppendBuffer(bufferTag, ref data); } - [CommandHipc(4)] + [CommandCmif(4)] // RegisterBufferEvent() -> handle public ResultCode RegisterBufferEvent(ServiceCtx context) { @@ -70,7 +70,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // GetReleasedAudioOutBuffers() -> (u32 count, buffer tags) public ResultCode GetReleasedAudioOutBuffers(ServiceCtx context) { @@ -87,7 +87,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut } } - [CommandHipc(6)] + [CommandCmif(6)] // ContainsAudioOutBuffer(u64 tag) -> b8 public ResultCode ContainsAudioOutBuffer(ServiceCtx context) { @@ -98,7 +98,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut return ResultCode.Success; } - [CommandHipc(7)] // 3.0.0+ + [CommandCmif(7)] // 3.0.0+ // AppendAudioOutBufferAuto(u64 tag, buffer) public ResultCode AppendAudioOutBufferAuto(ServiceCtx context) { @@ -111,7 +111,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut return _impl.AppendBuffer(bufferTag, ref data); } - [CommandHipc(8)] // 3.0.0+ + [CommandCmif(8)] // 3.0.0+ // GetReleasedAudioOutBuffersAuto() -> (u32 count, buffer tags) public ResultCode GetReleasedAudioOutBuffersAuto(ServiceCtx context) { @@ -127,7 +127,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut } } - [CommandHipc(9)] // 4.0.0+ + [CommandCmif(9)] // 4.0.0+ // GetAudioOutBufferCount() -> u32 public ResultCode GetAudioOutBufferCount(ServiceCtx context) { @@ -136,7 +136,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut return ResultCode.Success; } - [CommandHipc(10)] // 4.0.0+ + [CommandCmif(10)] // 4.0.0+ // GetAudioOutPlayedSampleCount() -> u64 public ResultCode GetAudioOutPlayedSampleCount(ServiceCtx context) { @@ -145,7 +145,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut return ResultCode.Success; } - [CommandHipc(11)] // 4.0.0+ + [CommandCmif(11)] // 4.0.0+ // FlushAudioOutBuffers() -> b8 public ResultCode FlushAudioOutBuffers(ServiceCtx context) { @@ -154,7 +154,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut return ResultCode.Success; } - [CommandHipc(12)] // 6.0.0+ + [CommandCmif(12)] // 6.0.0+ // SetAudioOutVolume(s32) public ResultCode SetAudioOutVolume(ServiceCtx context) { @@ -165,7 +165,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioOut return ResultCode.Success; } - [CommandHipc(13)] // 6.0.0+ + [CommandCmif(13)] // 6.0.0+ // GetAudioOutVolume() -> s32 public ResultCode GetAudioOutVolume(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioOutManagerServer.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioOutManagerServer.cs index 8a987dba9..7c5d8c4ec 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioOutManagerServer.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioOutManagerServer.cs @@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio _impl = impl; } - [CommandHipc(0)] + [CommandCmif(0)] // ListAudioOuts() -> (u32, buffer) public ResultCode ListAudioOuts(ServiceCtx context) { @@ -57,7 +57,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // OpenAudioOut(AudioOutInputConfiguration input_config, nn::applet::AppletResourceUserId, pid, handle process_handle, buffer name_in) // -> (AudioOutInputConfiguration output_config, object, buffer name_out) public ResultCode OpenAudioOut(ServiceCtx context) @@ -92,7 +92,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return resultCode; } - [CommandHipc(2)] // 3.0.0+ + [CommandCmif(2)] // 3.0.0+ // ListAudioOutsAuto() -> (u32, buffer) public ResultCode ListAudioOutsAuto(ServiceCtx context) { @@ -127,7 +127,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(3)] // 3.0.0+ + [CommandCmif(3)] // 3.0.0+ // OpenAudioOut(AudioOutInputConfiguration input_config, nn::applet::AppletResourceUserId, pid, handle process_handle, buffer name_in) // -> (AudioOutInputConfiguration output_config, object, buffer name_out) public ResultCode OpenAudioOutAuto(ServiceCtx context) diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRenderer/AudioDeviceServer.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRenderer/AudioDeviceServer.cs index e868ad5af..e7a751216 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioRenderer/AudioDeviceServer.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRenderer/AudioDeviceServer.cs @@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer _impl = impl; } - [CommandHipc(0)] + [CommandCmif(0)] // ListAudioDeviceName() -> (u32, buffer) public ResultCode ListAudioDeviceName(ServiceCtx context) { @@ -53,7 +53,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // SetAudioDeviceOutputVolume(f32 volume, buffer name) public ResultCode SetAudioDeviceOutputVolume(ServiceCtx context) { @@ -67,7 +67,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return _impl.SetAudioDeviceOutputVolume(deviceName, volume); } - [CommandHipc(2)] + [CommandCmif(2)] // GetAudioDeviceOutputVolume(buffer name) -> f32 volume public ResultCode GetAudioDeviceOutputVolume(ServiceCtx context) { @@ -86,7 +86,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return result; } - [CommandHipc(3)] + [CommandCmif(3)] // GetActiveAudioDeviceName() -> buffer public ResultCode GetActiveAudioDeviceName(ServiceCtx context) { @@ -109,7 +109,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // QueryAudioDeviceSystemEvent() -> handle public ResultCode QueryAudioDeviceSystemEvent(ServiceCtx context) { @@ -127,7 +127,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // GetActiveChannelCount() -> u32 public ResultCode GetActiveChannelCount(ServiceCtx context) { @@ -138,7 +138,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(6)] // 3.0.0+ + [CommandCmif(6)] // 3.0.0+ // ListAudioDeviceNameAuto() -> (u32, buffer) public ResultCode ListAudioDeviceNameAuto(ServiceCtx context) { @@ -171,7 +171,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(7)] // 3.0.0+ + [CommandCmif(7)] // 3.0.0+ // SetAudioDeviceOutputVolumeAuto(f32 volume, buffer name) public ResultCode SetAudioDeviceOutputVolumeAuto(ServiceCtx context) { @@ -184,7 +184,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return _impl.SetAudioDeviceOutputVolume(deviceName, volume); } - [CommandHipc(8)] // 3.0.0+ + [CommandCmif(8)] // 3.0.0+ // GetAudioDeviceOutputVolumeAuto(buffer name) -> f32 public ResultCode GetAudioDeviceOutputVolumeAuto(ServiceCtx context) { @@ -202,7 +202,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(10)] // 3.0.0+ + [CommandCmif(10)] // 3.0.0+ // GetActiveAudioDeviceNameAuto() -> buffer public ResultCode GetActiveAudioDeviceNameAuto(ServiceCtx context) { @@ -224,7 +224,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(11)] // 3.0.0+ + [CommandCmif(11)] // 3.0.0+ // QueryAudioDeviceInputEvent() -> handle public ResultCode QueryAudioDeviceInputEvent(ServiceCtx context) { @@ -242,7 +242,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(12)] // 3.0.0+ + [CommandCmif(12)] // 3.0.0+ // QueryAudioDeviceOutputEvent() -> handle public ResultCode QueryAudioDeviceOutputEvent(ServiceCtx context) { @@ -260,7 +260,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(13)] // 13.0.0+ + [CommandCmif(13)] // 13.0.0+ // GetActiveAudioOutputDeviceName() -> buffer public ResultCode GetActiveAudioOutputDeviceName(ServiceCtx context) { @@ -283,7 +283,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(14)] // 13.0.0+ + [CommandCmif(14)] // 13.0.0+ // ListAudioOutputDeviceName() -> (u32, buffer) public ResultCode ListAudioOutputDeviceName(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRenderer/AudioRendererServer.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRenderer/AudioRendererServer.cs index 3843b408e..813210461 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioRenderer/AudioRendererServer.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRenderer/AudioRendererServer.cs @@ -16,7 +16,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer _impl = impl; } - [CommandHipc(0)] + [CommandCmif(0)] // GetSampleRate() -> u32 public ResultCode GetSampleRate(ServiceCtx context) { @@ -25,7 +25,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetSampleCount() -> u32 public ResultCode GetSampleCount(ServiceCtx context) { @@ -34,7 +34,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetMixBufferCount() -> u32 public ResultCode GetMixBufferCount(ServiceCtx context) { @@ -43,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetState() -> u32 public ResultCode GetState(ServiceCtx context) { @@ -52,7 +52,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // RequestUpdate(buffer input) // -> (buffer output, buffer performanceOutput) public ResultCode RequestUpdate(ServiceCtx context) @@ -89,21 +89,21 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return result; } - [CommandHipc(5)] + [CommandCmif(5)] // Start() public ResultCode Start(ServiceCtx context) { return _impl.Start(); } - [CommandHipc(6)] + [CommandCmif(6)] // Stop() public ResultCode Stop(ServiceCtx context) { return _impl.Stop(); } - [CommandHipc(7)] + [CommandCmif(7)] // QuerySystemEvent() -> handle public ResultCode QuerySystemEvent(ServiceCtx context) { @@ -122,7 +122,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return result; } - [CommandHipc(8)] + [CommandCmif(8)] // SetAudioRendererRenderingTimeLimit(u32 limit) public ResultCode SetAudioRendererRenderingTimeLimit(ServiceCtx context) { @@ -133,7 +133,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(9)] + [CommandCmif(9)] // GetAudioRendererRenderingTimeLimit() -> u32 limit public ResultCode GetAudioRendererRenderingTimeLimit(ServiceCtx context) { @@ -144,7 +144,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(10)] // 3.0.0+ + [CommandCmif(10)] // 3.0.0+ // RequestUpdateAuto(buffer input) // -> (buffer output, buffer performanceOutput) public ResultCode RequestUpdateAuto(ServiceCtx context) @@ -172,14 +172,14 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return result; } - [CommandHipc(11)] // 3.0.0+ + [CommandCmif(11)] // 3.0.0+ // ExecuteAudioRendererRendering() public ResultCode ExecuteAudioRendererRendering(ServiceCtx context) { return _impl.ExecuteAudioRendererRendering(); } - [CommandHipc(12)] // 15.0.0+ + [CommandCmif(12)] // 15.0.0+ // SetVoiceDropParameter(f32 voiceDropParameter) public ResultCode SetVoiceDropParameter(ServiceCtx context) { @@ -190,7 +190,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer return ResultCode.Success; } - [CommandHipc(13)] // 15.0.0+ + [CommandCmif(13)] // 15.0.0+ // GetVoiceDropParameter() -> f32 voiceDropParameter public ResultCode GetVoiceDropParameter(ServiceCtx context) { @@ -209,4 +209,4 @@ namespace Ryujinx.HLE.HOS.Services.Audio.AudioRenderer } } } -} +} \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManagerServer.cs b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManagerServer.cs index c9591c06b..80b54e8c7 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManagerServer.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/AudioRendererManagerServer.cs @@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio _impl = impl; } - [CommandHipc(0)] + [CommandCmif(0)] // OpenAudioRenderer(nn::audio::detail::AudioRendererParameterInternal parameter, u64 workBufferSize, nn::applet::AppletResourceUserId appletResourceId, pid, handle workBuffer, handle processHandle) // -> object public ResultCode OpenAudioRenderer(ServiceCtx context) @@ -54,7 +54,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return result; } - [CommandHipc(1)] + [CommandCmif(1)] // GetWorkBufferSize(nn::audio::detail::AudioRendererParameterInternal parameter) -> u64 workBufferSize public ResultCode GetAudioRendererWorkBufferSize(ServiceCtx context) { @@ -80,7 +80,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio } } - [CommandHipc(2)] + [CommandCmif(2)] // GetAudioDeviceService(nn::applet::AppletResourceUserId) -> object public ResultCode GetAudioDeviceService(ServiceCtx context) { @@ -96,7 +96,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return result; } - [CommandHipc(4)] // 4.0.0+ + [CommandCmif(4)] // 4.0.0+ // GetAudioDeviceServiceWithRevisionInfo(s32 revision, nn::applet::AppletResourceUserId appletResourceId) -> object public ResultCode GetAudioDeviceServiceWithRevisionInfo(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs b/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs index 84c55d5ec..e94b31ca1 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/HardwareOpusDecoderManager/IHardwareOpusDecoder.cs @@ -21,35 +21,35 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager _flags = flags; } - [CommandHipc(0)] + [CommandCmif(0)] // DecodeInterleavedOld(buffer) -> (u32, u32, buffer) public ResultCode DecodeInterleavedOld(ServiceCtx context) { return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset: false, withPerf: false); } - [CommandHipc(2)] + [CommandCmif(2)] // DecodeInterleavedForMultiStreamOld(buffer) -> (u32, u32, buffer) public ResultCode DecodeInterleavedForMultiStreamOld(ServiceCtx context) { return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset: false, withPerf: false); } - [CommandHipc(4)] // 6.0.0+ + [CommandCmif(4)] // 6.0.0+ // DecodeInterleavedWithPerfOld(buffer) -> (u32, u32, u64, buffer) public ResultCode DecodeInterleavedWithPerfOld(ServiceCtx context) { return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset: false, withPerf: true); } - [CommandHipc(5)] // 6.0.0+ + [CommandCmif(5)] // 6.0.0+ // DecodeInterleavedForMultiStreamWithPerfOld(buffer) -> (u32, u32, u64, buffer) public ResultCode DecodeInterleavedForMultiStreamWithPerfOld(ServiceCtx context) { return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset: false, withPerf: true); } - [CommandHipc(6)] // 6.0.0+ + [CommandCmif(6)] // 6.0.0+ // DecodeInterleavedWithPerfAndResetOld(bool reset, buffer) -> (u32, u32, u64, buffer) public ResultCode DecodeInterleavedWithPerfAndResetOld(ServiceCtx context) { @@ -58,7 +58,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset, withPerf: true); } - [CommandHipc(7)] // 6.0.0+ + [CommandCmif(7)] // 6.0.0+ // DecodeInterleavedForMultiStreamWithPerfAndResetOld(bool reset, buffer) -> (u32, u32, u64, buffer) public ResultCode DecodeInterleavedForMultiStreamWithPerfAndResetOld(ServiceCtx context) { @@ -67,7 +67,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager return DecodeInterleavedInternal(context, OpusDecoderFlags.None, reset, withPerf: true); } - [CommandHipc(8)] // 7.0.0+ + [CommandCmif(8)] // 7.0.0+ // DecodeInterleaved(bool reset, buffer) -> (u32, u32, u64, buffer) public ResultCode DecodeInterleaved(ServiceCtx context) { @@ -76,7 +76,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio.HardwareOpusDecoderManager return DecodeInterleavedInternal(context, _flags, reset, withPerf: true); } - [CommandHipc(9)] // 7.0.0+ + [CommandCmif(9)] // 7.0.0+ // DecodeInterleavedForMultiStream(bool reset, buffer) -> (u32, u32, u64, buffer) public ResultCode DecodeInterleavedForMultiStream(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Audio/IHardwareOpusDecoderManager.cs b/Ryujinx.HLE/HOS/Services/Audio/IHardwareOpusDecoderManager.cs index 58680db85..8df8a38c9 100644 --- a/Ryujinx.HLE/HOS/Services/Audio/IHardwareOpusDecoderManager.cs +++ b/Ryujinx.HLE/HOS/Services/Audio/IHardwareOpusDecoderManager.cs @@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio { public IHardwareOpusDecoderManager(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // Initialize(bytes<8, 4>, u32, handle) -> object public ResultCode Initialize(ServiceCtx context) { @@ -25,7 +25,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetWorkBufferSize(bytes<8, 4>) -> u32 public ResultCode GetWorkBufferSize(ServiceCtx context) { @@ -42,7 +42,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(2)] // 3.0.0+ + [CommandCmif(2)] // 3.0.0+ // InitializeForMultiStream(u32, handle, buffer, 0x19>) -> object public ResultCode InitializeForMultiStream(ServiceCtx context) { @@ -58,7 +58,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(3)] // 3.0.0+ + [CommandCmif(3)] // 3.0.0+ // GetWorkBufferSizeForMultiStream(buffer, 0x19>) -> u32 public ResultCode GetWorkBufferSizeForMultiStream(ServiceCtx context) { @@ -77,7 +77,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(4)] // 12.0.0+ + [CommandCmif(4)] // 12.0.0+ // InitializeEx(OpusParametersEx, u32, handle) -> object public ResultCode InitializeEx(ServiceCtx context) { @@ -92,7 +92,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(5)] // 12.0.0+ + [CommandCmif(5)] // 12.0.0+ // GetWorkBufferSizeEx(OpusParametersEx) -> u32 public ResultCode GetWorkBufferSizeEx(ServiceCtx context) { @@ -109,7 +109,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(6)] // 12.0.0+ + [CommandCmif(6)] // 12.0.0+ // InitializeForMultiStreamEx(u32, handle, buffer, 0x19>) -> object public ResultCode InitializeForMultiStreamEx(ServiceCtx context) { @@ -134,7 +134,7 @@ namespace Ryujinx.HLE.HOS.Services.Audio return ResultCode.Success; } - [CommandHipc(7)] // 12.0.0+ + [CommandCmif(7)] // 12.0.0+ // GetWorkBufferSizeForMultiStreamEx(buffer, 0x19>) -> u32 public ResultCode GetWorkBufferSizeForMultiStreamEx(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs b/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs index 937fe76c5..1437a8e1f 100644 --- a/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs +++ b/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs @@ -28,7 +28,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat } } - [CommandHipc(0)] + [CommandCmif(0)] // CreateBcatService(pid) -> object public ResultCode CreateBcatService(ServiceCtx context) { @@ -46,7 +46,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // CreateDeliveryCacheStorageService(pid) -> object public ResultCode CreateDeliveryCacheStorageService(ServiceCtx context) { @@ -64,7 +64,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat return (ResultCode)rc.Value; } - [CommandHipc(2)] + [CommandCmif(2)] // CreateDeliveryCacheStorageServiceWithApplicationId(nn::ApplicationId) -> object public ResultCode CreateDeliveryCacheStorageServiceWithApplicationId(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IBcatService.cs b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IBcatService.cs index 6c0073ed8..fb11cedad 100644 --- a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IBcatService.cs +++ b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IBcatService.cs @@ -6,7 +6,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator { public IBcatService(ApplicationLaunchProperty applicationLaunchProperty) { } - [CommandHipc(10100)] + [CommandCmif(10100)] // RequestSyncDeliveryCache() -> object public ResultCode RequestSyncDeliveryCache(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheDirectoryService.cs b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheDirectoryService.cs index e7ccb6d09..575449779 100644 --- a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheDirectoryService.cs +++ b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheDirectoryService.cs @@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator } } - [CommandHipc(0)] + [CommandCmif(0)] // Open(nn::bcat::DirectoryName) public ResultCode Open(ServiceCtx context) { @@ -34,7 +34,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator return (ResultCode)result.Value; } - [CommandHipc(1)] + [CommandCmif(1)] // Read() -> (u32, buffer) public ResultCode Read(ServiceCtx context) { @@ -51,7 +51,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator } } - [CommandHipc(2)] + [CommandCmif(2)] // GetCount() -> u32 public ResultCode GetCount(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheFileService.cs b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheFileService.cs index c7706f921..5a9110e6a 100644 --- a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheFileService.cs +++ b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheFileService.cs @@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator } } - [CommandHipc(0)] + [CommandCmif(0)] // Open(nn::bcat::DirectoryName, nn::bcat::FileName) public ResultCode Open(ServiceCtx context) { @@ -34,7 +34,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator return (ResultCode)result.Value; } - [CommandHipc(1)] + [CommandCmif(1)] // Read(u64) -> (u64, buffer) public ResultCode Read(ServiceCtx context) { @@ -53,7 +53,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator } } - [CommandHipc(2)] + [CommandCmif(2)] // GetSize() -> u64 public ResultCode GetSize(ServiceCtx context) { @@ -64,7 +64,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator return (ResultCode)result.Value; } - [CommandHipc(3)] + [CommandCmif(3)] // GetDigest() -> nn::bcat::Digest public ResultCode GetDigest(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheProgressService.cs b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheProgressService.cs index b176195db..1555f1707 100644 --- a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheProgressService.cs +++ b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheProgressService.cs @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator _event = new KEvent(context.Device.System.KernelContext); } - [CommandHipc(0)] + [CommandCmif(0)] // GetEvent() -> handle public ResultCode GetEvent(ServiceCtx context) { @@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetImpl() -> buffer public ResultCode GetImpl(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheStorageService.cs b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheStorageService.cs index 32dd75d8e..be77226cb 100644 --- a/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheStorageService.cs +++ b/Ryujinx.HLE/HOS/Services/Bcat/ServiceCreator/IDeliveryCacheStorageService.cs @@ -14,7 +14,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator _base = SharedRef.CreateMove(ref baseService); } - [CommandHipc(0)] + [CommandCmif(0)] // CreateFileService() -> object public ResultCode CreateFileService(ServiceCtx context) { @@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator return (ResultCode)result.Value; } - [CommandHipc(1)] + [CommandCmif(1)] // CreateDirectoryService() -> object public ResultCode CreateDirectoryService(ServiceCtx context) { @@ -46,7 +46,7 @@ namespace Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator return (ResultCode)result.Value; } - [CommandHipc(10)] + [CommandCmif(10)] // EnumerateDeliveryCacheDirectory() -> (u32, buffer) public ResultCode EnumerateDeliveryCacheDirectory(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothDriver.cs b/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothDriver.cs index 65535ea10..feff5a73f 100644 --- a/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothDriver.cs +++ b/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothDriver.cs @@ -16,7 +16,7 @@ namespace Ryujinx.HLE.HOS.Services.Bluetooth public IBluetoothDriver(ServiceCtx context) { } - [CommandHipc(46)] + [CommandCmif(46)] // InitializeBluetoothLe() -> handle public ResultCode InitializeBluetoothLe(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothUser.cs b/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothUser.cs index a175cd853..1a5e25a48 100644 --- a/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothUser.cs +++ b/Ryujinx.HLE/HOS/Services/Bluetooth/IBluetoothUser.cs @@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Services.Bluetooth { public IBluetoothUser(ServiceCtx context) { } - [CommandHipc(9)] + [CommandCmif(9)] // RegisterBleEvent(pid) -> handle public ResultCode RegisterBleEvent(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/BluetoothManager/BtmUser/IBtmUserCore.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/BtmUser/IBtmUserCore.cs index 026b5bf12..3c9938ad7 100644 --- a/Ryujinx.HLE/HOS/Services/BluetoothManager/BtmUser/IBtmUserCore.cs +++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/BtmUser/IBtmUserCore.cs @@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.BluetoothManager.BtmUser public IBtmUserCore() { } - [CommandHipc(0)] // 5.0.0+ + [CommandCmif(0)] // 5.0.0+ // AcquireBleScanEvent() -> (byte<1>, handle) public ResultCode AcquireBleScanEvent(ServiceCtx context) { @@ -47,7 +47,7 @@ namespace Ryujinx.HLE.HOS.Services.BluetoothManager.BtmUser return ResultCode.Success; } - [CommandHipc(17)] // 5.0.0+ + [CommandCmif(17)] // 5.0.0+ // AcquireBleConnectionEvent() -> (byte<1>, handle) public ResultCode AcquireBleConnectionEvent(ServiceCtx context) { @@ -73,7 +73,7 @@ namespace Ryujinx.HLE.HOS.Services.BluetoothManager.BtmUser return ResultCode.Success; } - [CommandHipc(26)] // 5.0.0+ + [CommandCmif(26)] // 5.0.0+ // AcquireBleServiceDiscoveryEvent() -> (byte<1>, handle) public ResultCode AcquireBleServiceDiscoveryEvent(ServiceCtx context) { @@ -99,7 +99,7 @@ namespace Ryujinx.HLE.HOS.Services.BluetoothManager.BtmUser return ResultCode.Success; } - [CommandHipc(33)] // 5.0.0+ + [CommandCmif(33)] // 5.0.0+ // AcquireBleMtuConfigEvent() -> (byte<1>, handle) public ResultCode AcquireBleMtuConfigEvent(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmUser.cs b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmUser.cs index 8b74b8b4e..b00f0a2f3 100644 --- a/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmUser.cs +++ b/Ryujinx.HLE/HOS/Services/BluetoothManager/IBtmUser.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.BluetoothManager { public IBtmUser(ServiceCtx context) { } - [CommandHipc(0)] // 5.0.0+ + [CommandCmif(0)] // 5.0.0+ // GetCore() -> object public ResultCode GetCore(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Caps/IAlbumApplicationService.cs b/Ryujinx.HLE/HOS/Services/Caps/IAlbumApplicationService.cs index cc370126c..af99232eb 100644 --- a/Ryujinx.HLE/HOS/Services/Caps/IAlbumApplicationService.cs +++ b/Ryujinx.HLE/HOS/Services/Caps/IAlbumApplicationService.cs @@ -9,14 +9,14 @@ namespace Ryujinx.HLE.HOS.Services.Caps { public IAlbumApplicationService(ServiceCtx context) { } - [CommandHipc(32)] // 7.0.0+ + [CommandCmif(32)] // 7.0.0+ // SetShimLibraryVersion(pid, u64, nn::applet::AppletResourceUserId) public ResultCode SetShimLibraryVersion(ServiceCtx context) { return context.Device.System.CaptureManager.SetShimLibraryVersion(context); } - [CommandHipc(102)] + [CommandCmif(102)] // GetAlbumFileList0AafeAruidDeprecated(pid, u16 content_type, u64 start_time, u64 end_time, nn::applet::AppletResourceUserId) -> (u64 count, buffer) public ResultCode GetAlbumFileList0AafeAruidDeprecated(ServiceCtx context) { @@ -24,7 +24,7 @@ namespace Ryujinx.HLE.HOS.Services.Caps return GetAlbumFileList(context); } - [CommandHipc(142)] + [CommandCmif(142)] // GetAlbumFileList3AaeAruid(pid, u16 content_type, u64 start_time, u64 end_time, nn::applet::AppletResourceUserId) -> (u64 count, buffer) public ResultCode GetAlbumFileList3AaeAruid(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Caps/IAlbumControlService.cs b/Ryujinx.HLE/HOS/Services/Caps/IAlbumControlService.cs index 3b565b67a..b16a41224 100644 --- a/Ryujinx.HLE/HOS/Services/Caps/IAlbumControlService.cs +++ b/Ryujinx.HLE/HOS/Services/Caps/IAlbumControlService.cs @@ -5,7 +5,7 @@ namespace Ryujinx.HLE.HOS.Services.Caps { public IAlbumControlService(ServiceCtx context) { } - [CommandHipc(33)] // 7.0.0+ + [CommandCmif(33)] // 7.0.0+ // SetShimLibraryVersion(pid, u64, nn::applet::AppletResourceUserId) public ResultCode SetShimLibraryVersion(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Caps/IScreenShotApplicationService.cs b/Ryujinx.HLE/HOS/Services/Caps/IScreenShotApplicationService.cs index e0c65f440..a3501286c 100644 --- a/Ryujinx.HLE/HOS/Services/Caps/IScreenShotApplicationService.cs +++ b/Ryujinx.HLE/HOS/Services/Caps/IScreenShotApplicationService.cs @@ -8,14 +8,14 @@ namespace Ryujinx.HLE.HOS.Services.Caps { public IScreenShotApplicationService(ServiceCtx context) { } - [CommandHipc(32)] // 7.0.0+ + [CommandCmif(32)] // 7.0.0+ // SetShimLibraryVersion(pid, u64, nn::applet::AppletResourceUserId) public ResultCode SetShimLibraryVersion(ServiceCtx context) { return context.Device.System.CaptureManager.SetShimLibraryVersion(context); } - [CommandHipc(203)] + [CommandCmif(203)] // SaveScreenShotEx0(bytes<0x40> ScreenShotAttribute, u32 unknown, u64 AppletResourceUserId, pid, buffer ScreenshotData) -> bytes<0x20> ApplicationAlbumEntry public ResultCode SaveScreenShotEx0(ServiceCtx context) { @@ -38,7 +38,7 @@ namespace Ryujinx.HLE.HOS.Services.Caps return resultCode; } - [CommandHipc(205)] // 8.0.0+ + [CommandCmif(205)] // 8.0.0+ // SaveScreenShotEx1(bytes<0x40> ScreenShotAttribute, u32 unknown, u64 AppletResourceUserId, pid, buffer ApplicationData, buffer ScreenshotData) -> bytes<0x20> ApplicationAlbumEntry public ResultCode SaveScreenShotEx1(ServiceCtx context) { @@ -67,7 +67,7 @@ namespace Ryujinx.HLE.HOS.Services.Caps return resultCode; } - [CommandHipc(210)] + [CommandCmif(210)] // SaveScreenShotEx2(bytes<0x40> ScreenShotAttribute, u32 unknown, u64 AppletResourceUserId, buffer UserIdList, buffer ScreenshotData) -> bytes<0x20> ApplicationAlbumEntry public ResultCode SaveScreenShotEx2(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/CommandHIpcAttribute.cs b/Ryujinx.HLE/HOS/Services/CommandCmifAttribute.cs similarity index 63% rename from Ryujinx.HLE/HOS/Services/CommandHIpcAttribute.cs rename to Ryujinx.HLE/HOS/Services/CommandCmifAttribute.cs index ecdb75616..3b3279ab6 100644 --- a/Ryujinx.HLE/HOS/Services/CommandHIpcAttribute.cs +++ b/Ryujinx.HLE/HOS/Services/CommandCmifAttribute.cs @@ -3,10 +3,10 @@ namespace Ryujinx.HLE.HOS.Services { [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] - class CommandHipcAttribute : Attribute + class CommandCmifAttribute : Attribute { public readonly int Id; - public CommandHipcAttribute(int id) => Id = id; + public CommandCmifAttribute(int id) => Id = id; } } \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Fatal/IService.cs b/Ryujinx.HLE/HOS/Services/Fatal/IService.cs index c884e8803..aaa5c873a 100644 --- a/Ryujinx.HLE/HOS/Services/Fatal/IService.cs +++ b/Ryujinx.HLE/HOS/Services/Fatal/IService.cs @@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Services.Fatal { public IService(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // ThrowFatal(u64 result_code, u64 pid) public ResultCode ThrowFatal(ServiceCtx context) { @@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Fatal return ThrowFatalWithCpuContextImpl(context, resultCode, pid, FatalPolicy.ErrorReportAndErrorScreen, null); } - [CommandHipc(1)] + [CommandCmif(1)] // ThrowFatalWithPolicy(u64 result_code, u32 fatal_policy, u64 pid) public ResultCode ThrowFatalWithPolicy(ServiceCtx context) { @@ -32,7 +32,7 @@ namespace Ryujinx.HLE.HOS.Services.Fatal return ThrowFatalWithCpuContextImpl(context, resultCode, pid, fatalPolicy, null); } - [CommandHipc(2)] + [CommandCmif(2)] // ThrowFatalWithCpuContext(u64 result_code, u32 fatal_policy, u64 pid, buffer cpu_context) public ResultCode ThrowFatalWithCpuContext(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs b/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs index 4e73c3f2e..d5258a824 100644 --- a/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs +++ b/Ryujinx.HLE/HOS/Services/Friend/IServiceCreator.cs @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend _permissionLevel = permissionLevel; } - [CommandHipc(0)] + [CommandCmif(0)] // CreateFriendService() -> object public ResultCode CreateFriendService(ServiceCtx context) { @@ -27,7 +27,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend return ResultCode.Success; } - [CommandHipc(1)] // 2.0.0+ + [CommandCmif(1)] // 2.0.0+ // CreateNotificationService(nn::account::Uid userId) -> object public ResultCode CreateNotificationService(ServiceCtx context) { @@ -43,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend return ResultCode.Success; } - [CommandHipc(2)] // 4.0.0+ + [CommandCmif(2)] // 4.0.0+ // CreateDaemonSuspendSessionService() -> object public ResultCode CreateDaemonSuspendSessionService(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/IFriendService.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/IFriendService.cs index 4317c8f61..2858aa468 100644 --- a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/IFriendService.cs +++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/IFriendService.cs @@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator _permissionLevel = permissionLevel; } - [CommandHipc(0)] + [CommandCmif(0)] // GetCompletionEvent() -> handle public ResultCode GetCompletionEvent(ServiceCtx context) { @@ -42,7 +42,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // nn::friends::Cancel() public ResultCode Cancel(ServiceCtx context) { @@ -52,7 +52,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(10100)] + [CommandCmif(10100)] // nn::friends::GetFriendListIds(int offset, nn::account::Uid userId, nn::friends::detail::ipc::SizedFriendFilter friendFilter, ulong pidPlaceHolder, pid) // -> int outCount, array public ResultCode GetFriendListIds(ServiceCtx context) @@ -91,7 +91,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(10101)] + [CommandCmif(10101)] // nn::friends::GetFriendList(int offset, nn::account::Uid userId, nn::friends::detail::ipc::SizedFriendFilter friendFilter, ulong pidPlaceHolder, pid) // -> int outCount, array public ResultCode GetFriendList(ServiceCtx context) @@ -129,7 +129,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(10120)] // 10.0.0+ + [CommandCmif(10120)] // 10.0.0+ // nn::friends::IsFriendListCacheAvailable(nn::account::Uid userId) -> bool public ResultCode IsFriendListCacheAvailable(ServiceCtx context) { @@ -150,7 +150,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(10121)] // 10.0.0+ + [CommandCmif(10121)] // 10.0.0+ // nn::friends::EnsureFriendListAvailable(nn::account::Uid userId) public ResultCode EnsureFriendListAvailable(ServiceCtx context) { @@ -168,7 +168,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(10400)] + [CommandCmif(10400)] // nn::friends::GetBlockedUserListIds(int offset, nn::account::Uid userId) -> (u32, buffer) public ResultCode GetBlockedUserListIds(ServiceCtx context) { @@ -187,7 +187,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(10600)] + [CommandCmif(10600)] // nn::friends::DeclareOpenOnlinePlaySession(nn::account::Uid userId) public ResultCode DeclareOpenOnlinePlaySession(ServiceCtx context) { @@ -205,7 +205,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(10601)] + [CommandCmif(10601)] // nn::friends::DeclareCloseOnlinePlaySession(nn::account::Uid userId) public ResultCode DeclareCloseOnlinePlaySession(ServiceCtx context) { @@ -223,7 +223,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(10610)] + [CommandCmif(10610)] // nn::friends::UpdateUserPresence(nn::account::Uid, u64, pid, buffer) public ResultCode UpdateUserPresence(ServiceCtx context) { @@ -247,7 +247,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(10700)] + [CommandCmif(10700)] // nn::friends::GetPlayHistoryRegistrationKey(b8 unknown, nn::account::Uid) -> buffer public ResultCode GetPlayHistoryRegistrationKey(ServiceCtx context) { @@ -309,7 +309,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(10702)] + [CommandCmif(10702)] // nn::friends::AddPlayHistory(nn::account::Uid, u64, pid, buffer, buffer, buffer) public ResultCode AddPlayHistory(ServiceCtx context) { @@ -349,4 +349,4 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } } -} +} \ No newline at end of file diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/INotificationService.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/INotificationService.cs index 65cbd38e7..063750c6b 100644 --- a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/INotificationService.cs +++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/INotificationService.cs @@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator NotificationEventHandler.Instance.RegisterNotificationService(this); } - [CommandHipc(0)] //2.0.0+ + [CommandCmif(0)] //2.0.0+ // nn::friends::detail::ipc::INotificationService::GetEvent() -> handle public ResultCode GetEvent(ServiceCtx context) { @@ -54,7 +54,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(1)] //2.0.0+ + [CommandCmif(1)] //2.0.0+ // nn::friends::detail::ipc::INotificationService::Clear() public ResultCode Clear(ServiceCtx context) { @@ -69,7 +69,7 @@ namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator return ResultCode.Success; } - [CommandHipc(2)] // 2.0.0+ + [CommandCmif(2)] // 2.0.0+ // nn::friends::detail::ipc::INotificationService::Pop() -> nn::friends::detail::ipc::SizedNotificationInfo public ResultCode Pop(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IDirectory.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IDirectory.cs index bfe13592a..b97594498 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IDirectory.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IDirectory.cs @@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy _baseDirectory = SharedRef.CreateMove(ref directory); } - [CommandHipc(0)] + [CommandCmif(0)] // Read() -> (u64 count, buffer entries) public ResultCode Read(ServiceCtx context) { @@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy } } - [CommandHipc(1)] + [CommandCmif(1)] // GetEntryCount() -> u64 public ResultCode GetEntryCount(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs index 878fcacf6..4bc58ae5f 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFile.cs @@ -15,7 +15,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy _baseFile = SharedRef.CreateMove(ref baseFile); } - [CommandHipc(0)] + [CommandCmif(0)] // Read(u32 readOption, u64 offset, u64 size) -> (u64 out_size, buffer out_buf) public ResultCode Read(ServiceCtx context) { @@ -38,7 +38,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy } } - [CommandHipc(1)] + [CommandCmif(1)] // Write(u32 writeOption, u64 offset, u64 size, buffer) public ResultCode Write(ServiceCtx context) { @@ -57,14 +57,14 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)_baseFile.Get.Write(offset, new InBuffer(data), size, writeOption).Value; } - [CommandHipc(2)] + [CommandCmif(2)] // Flush() public ResultCode Flush(ServiceCtx context) { return (ResultCode)_baseFile.Get.Flush().Value; } - [CommandHipc(3)] + [CommandCmif(3)] // SetSize(u64 size) public ResultCode SetSize(ServiceCtx context) { @@ -73,7 +73,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)_baseFile.Get.SetSize(size).Value; } - [CommandHipc(4)] + [CommandCmif(4)] // GetSize() -> u64 fileSize public ResultCode GetSize(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs index 623f1371e..9effa79dc 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IFileSystem.cs @@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return SharedRef.CreateCopy(in _fileSystem); } - [CommandHipc(0)] + [CommandCmif(0)] // CreateFile(u32 createOption, u64 size, buffer, 0x19, 0x301> path) public ResultCode CreateFile(ServiceCtx context) { @@ -33,7 +33,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)_fileSystem.Get.CreateFile(in name, size, createOption).Value; } - [CommandHipc(1)] + [CommandCmif(1)] // DeleteFile(buffer, 0x19, 0x301> path) public ResultCode DeleteFile(ServiceCtx context) { @@ -42,7 +42,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)_fileSystem.Get.DeleteFile(in name).Value; } - [CommandHipc(2)] + [CommandCmif(2)] // CreateDirectory(buffer, 0x19, 0x301> path) public ResultCode CreateDirectory(ServiceCtx context) { @@ -51,7 +51,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)_fileSystem.Get.CreateDirectory(in name).Value; } - [CommandHipc(3)] + [CommandCmif(3)] // DeleteDirectory(buffer, 0x19, 0x301> path) public ResultCode DeleteDirectory(ServiceCtx context) { @@ -60,7 +60,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)_fileSystem.Get.DeleteDirectory(in name).Value; } - [CommandHipc(4)] + [CommandCmif(4)] // DeleteDirectoryRecursively(buffer, 0x19, 0x301> path) public ResultCode DeleteDirectoryRecursively(ServiceCtx context) { @@ -69,7 +69,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)_fileSystem.Get.DeleteDirectoryRecursively(in name).Value; } - [CommandHipc(5)] + [CommandCmif(5)] // RenameFile(buffer, 0x19, 0x301> oldPath, buffer, 0x19, 0x301> newPath) public ResultCode RenameFile(ServiceCtx context) { @@ -79,7 +79,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)_fileSystem.Get.RenameFile(in currentName, in newName).Value; } - [CommandHipc(6)] + [CommandCmif(6)] // RenameDirectory(buffer, 0x19, 0x301> oldPath, buffer, 0x19, 0x301> newPath) public ResultCode RenameDirectory(ServiceCtx context) { @@ -89,7 +89,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)_fileSystem.Get.RenameDirectory(in currentName, in newName).Value; } - [CommandHipc(7)] + [CommandCmif(7)] // GetEntryType(buffer, 0x19, 0x301> path) -> nn::fssrv::sf::DirectoryEntryType public ResultCode GetEntryType(ServiceCtx context) { @@ -102,7 +102,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)result.Value; } - [CommandHipc(8)] + [CommandCmif(8)] // OpenFile(u32 mode, buffer, 0x19, 0x301> path) -> object file public ResultCode OpenFile(ServiceCtx context) { @@ -123,7 +123,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)result.Value; } - [CommandHipc(9)] + [CommandCmif(9)] // OpenDirectory(u32 filter_flags, buffer, 0x19, 0x301> path) -> object directory public ResultCode OpenDirectory(ServiceCtx context) { @@ -144,14 +144,14 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)result.Value; } - [CommandHipc(10)] + [CommandCmif(10)] // Commit() public ResultCode Commit(ServiceCtx context) { return (ResultCode)_fileSystem.Get.Commit().Value; } - [CommandHipc(11)] + [CommandCmif(11)] // GetFreeSpaceSize(buffer, 0x19, 0x301> path) -> u64 totalFreeSpace public ResultCode GetFreeSpaceSize(ServiceCtx context) { @@ -164,7 +164,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)result.Value; } - [CommandHipc(12)] + [CommandCmif(12)] // GetTotalSpaceSize(buffer, 0x19, 0x301> path) -> u64 totalSize public ResultCode GetTotalSpaceSize(ServiceCtx context) { @@ -177,7 +177,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)result.Value; } - [CommandHipc(13)] + [CommandCmif(13)] // CleanDirectoryRecursively(buffer, 0x19, 0x301> path) public ResultCode CleanDirectoryRecursively(ServiceCtx context) { @@ -186,7 +186,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return (ResultCode)_fileSystem.Get.CleanDirectoryRecursively(in name).Value; } - [CommandHipc(14)] + [CommandCmif(14)] // GetFileTimeStampRaw(buffer, 0x19, 0x301> path) -> bytes<0x20> timestamp public ResultCode GetFileTimeStampRaw(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs index 5359cadd7..54c7b800b 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/FileSystemProxy/IStorage.cs @@ -14,7 +14,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy _baseStorage = SharedRef.CreateMove(ref baseStorage); } - [CommandHipc(0)] + [CommandCmif(0)] // Read(u64 offset, u64 length) -> buffer buffer public ResultCode Read(ServiceCtx context) { @@ -43,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // GetSize() -> u64 size public ResultCode GetSize(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Fs/IDeviceOperator.cs b/Ryujinx.HLE/HOS/Services/Fs/IDeviceOperator.cs index f069fa3e0..2a40aea4f 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/IDeviceOperator.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/IDeviceOperator.cs @@ -14,7 +14,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs _baseOperator = SharedRef.CreateMove(ref baseOperator); } - [CommandHipc(0)] + [CommandCmif(0)] // IsSdCardInserted() -> b8 is_inserted public ResultCode IsSdCardInserted(ServiceCtx context) { @@ -25,7 +25,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)result.Value; } - [CommandHipc(200)] + [CommandCmif(200)] // IsGameCardInserted() -> b8 is_inserted public ResultCode IsGameCardInserted(ServiceCtx context) { @@ -36,7 +36,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)result.Value; } - [CommandHipc(202)] + [CommandCmif(202)] // GetGameCardHandle() -> u32 gamecard_handle public ResultCode GetGameCardHandle(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs b/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs index 1b63f362e..e961e9b18 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs @@ -34,7 +34,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs _baseFileSystemProxy = applicationClient.Fs.Impl.GetFileSystemProxyServiceObject(); } - [CommandHipc(1)] + [CommandCmif(1)] // SetCurrentProcess(u64, pid) public ResultCode SetCurrentProcess(ServiceCtx context) { @@ -43,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(8)] + [CommandCmif(8)] // OpenFileSystemWithId(nn::fssrv::sf::FileSystemType filesystem_type, nn::ApplicationId tid, buffer, 0x19, 0x301> path) // -> object contentFs public ResultCode OpenFileSystemWithId(ServiceCtx context) @@ -99,7 +99,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.InvalidInput; } - [CommandHipc(11)] + [CommandCmif(11)] // OpenBisFileSystem(nn::fssrv::sf::Partition partitionID, buffer, 0x19, 0x301>) -> object Bis public ResultCode OpenBisFileSystem(ServiceCtx context) { @@ -116,7 +116,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(12)] + [CommandCmif(12)] // OpenBisStorage(u32 partitionId) -> object bisStorage public ResultCode OpenBisStorage(ServiceCtx context) { @@ -131,14 +131,14 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(13)] + [CommandCmif(13)] // InvalidateBisCache() -> () public ResultCode InvalidateBisCache(ServiceCtx context) { return (ResultCode)_baseFileSystemProxy.Get.InvalidateBisCache().Value; } - [CommandHipc(18)] + [CommandCmif(18)] // OpenSdCardFileSystem() -> object public ResultCode OpenSdCardFileSystem(ServiceCtx context) { @@ -152,14 +152,14 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(19)] + [CommandCmif(19)] // FormatSdCardFileSystem() -> () public ResultCode FormatSdCardFileSystem(ServiceCtx context) { return (ResultCode)_baseFileSystemProxy.Get.FormatSdCardFileSystem().Value; } - [CommandHipc(21)] + [CommandCmif(21)] // DeleteSaveDataFileSystem(u64 saveDataId) -> () public ResultCode DeleteSaveDataFileSystem(ServiceCtx context) { @@ -168,7 +168,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.DeleteSaveDataFileSystem(saveDataId).Value; } - [CommandHipc(22)] + [CommandCmif(22)] // CreateSaveDataFileSystem(nn::fs::SaveDataAttribute attribute, nn::fs::SaveDataCreationInfo creationInfo, nn::fs::SaveDataMetaInfo metaInfo) -> () public ResultCode CreateSaveDataFileSystem(ServiceCtx context) { @@ -179,7 +179,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.CreateSaveDataFileSystem(in attribute, in creationInfo, in metaInfo).Value; } - [CommandHipc(23)] + [CommandCmif(23)] // CreateSaveDataFileSystemBySystemSaveDataId(nn::fs::SaveDataAttribute attribute, nn::fs::SaveDataCreationInfo creationInfo) -> () public ResultCode CreateSaveDataFileSystemBySystemSaveDataId(ServiceCtx context) { @@ -189,7 +189,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.CreateSaveDataFileSystemBySystemSaveDataId(in attribute, in creationInfo).Value; } - [CommandHipc(24)] + [CommandCmif(24)] // RegisterSaveDataFileSystemAtomicDeletion(buffer saveDataIds) -> () public ResultCode RegisterSaveDataFileSystemAtomicDeletion(ServiceCtx context) { @@ -199,7 +199,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.RegisterSaveDataFileSystemAtomicDeletion(new InBuffer(saveIdBuffer)).Value; } - [CommandHipc(25)] + [CommandCmif(25)] // DeleteSaveDataFileSystemBySaveDataSpaceId(u8 spaceId, u64 saveDataId) -> () public ResultCode DeleteSaveDataFileSystemBySaveDataSpaceId(ServiceCtx context) { @@ -209,14 +209,14 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.DeleteSaveDataFileSystemBySaveDataSpaceId(spaceId, saveDataId).Value; } - [CommandHipc(26)] + [CommandCmif(26)] // FormatSdCardDryRun() -> () public ResultCode FormatSdCardDryRun(ServiceCtx context) { return (ResultCode)_baseFileSystemProxy.Get.FormatSdCardDryRun().Value; } - [CommandHipc(27)] + [CommandCmif(27)] // IsExFatSupported() -> (u8 isSupported) public ResultCode IsExFatSupported(ServiceCtx context) { @@ -228,7 +228,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(28)] + [CommandCmif(28)] // DeleteSaveDataFileSystemBySaveDataAttribute(u8 spaceId, nn::fs::SaveDataAttribute attribute) -> () public ResultCode DeleteSaveDataFileSystemBySaveDataAttribute(ServiceCtx context) { @@ -238,7 +238,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.DeleteSaveDataFileSystemBySaveDataAttribute(spaceId, in attribute).Value; } - [CommandHipc(30)] + [CommandCmif(30)] // OpenGameCardStorage(u32 handle, u32 partitionId) -> object public ResultCode OpenGameCardStorage(ServiceCtx context) { @@ -254,7 +254,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(31)] + [CommandCmif(31)] // OpenGameCardFileSystem(u32 handle, u32 partitionId) -> object public ResultCode OpenGameCardFileSystem(ServiceCtx context) { @@ -270,7 +270,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(32)] + [CommandCmif(32)] // ExtendSaveDataFileSystem(u8 spaceId, u64 saveDataId, s64 dataSize, s64 journalSize) -> () public ResultCode ExtendSaveDataFileSystem(ServiceCtx context) { @@ -282,7 +282,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.ExtendSaveDataFileSystem(spaceId, saveDataId, dataSize, journalSize).Value; } - [CommandHipc(33)] + [CommandCmif(33)] // DeleteCacheStorage(u16 index) -> () public ResultCode DeleteCacheStorage(ServiceCtx context) { @@ -291,7 +291,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.DeleteCacheStorage(index).Value; } - [CommandHipc(34)] + [CommandCmif(34)] // GetCacheStorageSize(u16 index) -> (s64 dataSize, s64 journalSize) public ResultCode GetCacheStorageSize(ServiceCtx context) { @@ -306,7 +306,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(35)] + [CommandCmif(35)] // CreateSaveDataFileSystemWithHashSalt(nn::fs::SaveDataAttribute attribute, nn::fs::SaveDataCreationInfo creationInfo, nn::fs::SaveDataMetaInfo metaInfo nn::fs::HashSalt hashSalt) -> () public ResultCode CreateSaveDataFileSystemWithHashSalt(ServiceCtx context) { @@ -318,7 +318,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.CreateSaveDataFileSystemWithHashSalt(in attribute, in creationInfo, in metaCreateInfo, in hashSalt).Value; } - [CommandHipc(37)] // 14.0.0+ + [CommandCmif(37)] // 14.0.0+ // CreateSaveDataFileSystemWithCreationInfo2(buffer creationInfo) -> () public ResultCode CreateSaveDataFileSystemWithCreationInfo2(ServiceCtx context) { @@ -329,7 +329,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.CreateSaveDataFileSystemWithCreationInfo2(in creationInfo).Value; } - [CommandHipc(51)] + [CommandCmif(51)] // OpenSaveDataFileSystem(u8 spaceId, nn::fs::SaveDataAttribute attribute) -> object saveDataFs public ResultCode OpenSaveDataFileSystem(ServiceCtx context) { @@ -345,7 +345,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(52)] + [CommandCmif(52)] // OpenSaveDataFileSystemBySystemSaveDataId(u8 spaceId, nn::fs::SaveDataAttribute attribute) -> object systemSaveDataFs public ResultCode OpenSaveDataFileSystemBySystemSaveDataId(ServiceCtx context) { @@ -361,7 +361,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(53)] + [CommandCmif(53)] // OpenReadOnlySaveDataFileSystem(u8 spaceId, nn::fs::SaveDataAttribute attribute) -> object public ResultCode OpenReadOnlySaveDataFileSystem(ServiceCtx context) { @@ -377,7 +377,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(57)] + [CommandCmif(57)] // ReadSaveDataFileSystemExtraDataBySaveDataSpaceId(u8 spaceId, u64 saveDataId) -> (buffer extraData) public ResultCode ReadSaveDataFileSystemExtraDataBySaveDataSpaceId(ServiceCtx context) { @@ -395,7 +395,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(58)] + [CommandCmif(58)] // ReadSaveDataFileSystemExtraData(u64 saveDataId) -> (buffer extraData) public ResultCode ReadSaveDataFileSystemExtraData(ServiceCtx context) { @@ -412,7 +412,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(59)] + [CommandCmif(59)] // WriteSaveDataFileSystemExtraData(u8 spaceId, u64 saveDataId, buffer extraData) -> () public ResultCode WriteSaveDataFileSystemExtraData(ServiceCtx context) { @@ -425,7 +425,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.WriteSaveDataFileSystemExtraData(saveDataId, spaceId, new InBuffer(extraDataBuffer)).Value; } - [CommandHipc(60)] + [CommandCmif(60)] // OpenSaveDataInfoReader() -> object public ResultCode OpenSaveDataInfoReader(ServiceCtx context) { @@ -439,7 +439,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(61)] + [CommandCmif(61)] // OpenSaveDataInfoReaderBySaveDataSpaceId(u8 spaceId) -> object public ResultCode OpenSaveDataInfoReaderBySaveDataSpaceId(ServiceCtx context) { @@ -454,7 +454,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(62)] + [CommandCmif(62)] // OpenSaveDataInfoReaderOnlyCacheStorage() -> object public ResultCode OpenSaveDataInfoReaderOnlyCacheStorage(ServiceCtx context) { @@ -468,7 +468,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(64)] + [CommandCmif(64)] // OpenSaveDataInternalStorageFileSystem(u8 spaceId, u64 saveDataId) -> object public ResultCode OpenSaveDataInternalStorageFileSystem(ServiceCtx context) { @@ -484,7 +484,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(65)] + [CommandCmif(65)] // UpdateSaveDataMacForDebug(u8 spaceId, u64 saveDataId) -> () public ResultCode UpdateSaveDataMacForDebug(ServiceCtx context) { @@ -494,7 +494,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.UpdateSaveDataMacForDebug(spaceId, saveDataId).Value; } - [CommandHipc(66)] + [CommandCmif(66)] public ResultCode WriteSaveDataFileSystemExtraDataWithMask(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64(); @@ -509,7 +509,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.WriteSaveDataFileSystemExtraDataWithMask(saveDataId, spaceId, new InBuffer(extraDataBuffer), new InBuffer(maskBuffer)).Value; } - [CommandHipc(67)] + [CommandCmif(67)] public ResultCode FindSaveDataWithFilter(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64(); @@ -529,7 +529,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(68)] + [CommandCmif(68)] public ResultCode OpenSaveDataInfoReaderWithFilter(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64(); @@ -544,7 +544,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(69)] + [CommandCmif(69)] public ResultCode ReadSaveDataFileSystemExtraDataBySaveDataAttribute(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64(); @@ -561,7 +561,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(70)] + [CommandCmif(70)] public ResultCode WriteSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64(); @@ -576,7 +576,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.WriteSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(in attribute, spaceId, new InBuffer(extraDataBuffer), new InBuffer(maskBuffer)).Value; } - [CommandHipc(71)] + [CommandCmif(71)] public ResultCode ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64(); @@ -596,7 +596,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(80)] + [CommandCmif(80)] public ResultCode OpenSaveDataMetaFile(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt32(); @@ -612,7 +612,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(84)] + [CommandCmif(84)] public ResultCode ListAccessibleSaveDataOwnerId(ServiceCtx context) { int startIndex = context.RequestData.ReadInt32(); @@ -630,7 +630,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(100)] + [CommandCmif(100)] public ResultCode OpenImageDirectoryFileSystem(ServiceCtx context) { ImageDirectoryId directoryId = (ImageDirectoryId)context.RequestData.ReadInt32(); @@ -644,7 +644,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(101)] + [CommandCmif(101)] public ResultCode OpenBaseFileSystem(ServiceCtx context) { BaseFileSystemId fileSystemId = (BaseFileSystemId)context.RequestData.ReadInt32(); @@ -658,7 +658,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(110)] + [CommandCmif(110)] public ResultCode OpenContentStorageFileSystem(ServiceCtx context) { ContentStorageId contentStorageId = (ContentStorageId)context.RequestData.ReadInt32(); @@ -672,7 +672,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(120)] + [CommandCmif(120)] public ResultCode OpenCloudBackupWorkStorageFileSystem(ServiceCtx context) { CloudBackupWorkStorageId storageId = (CloudBackupWorkStorageId)context.RequestData.ReadInt32(); @@ -686,7 +686,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(130)] + [CommandCmif(130)] public ResultCode OpenCustomStorageFileSystem(ServiceCtx context) { CustomStorageId customStorageId = (CustomStorageId)context.RequestData.ReadInt32(); @@ -700,7 +700,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(200)] + [CommandCmif(200)] // OpenDataStorageByCurrentProcess() -> object dataStorage public ResultCode OpenDataStorageByCurrentProcess(ServiceCtx context) { @@ -713,7 +713,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(202)] + [CommandCmif(202)] // OpenDataStorageByDataId(u8 storageId, nn::ncm::DataId dataId) -> object dataStorage public ResultCode OpenDataStorageByDataId(ServiceCtx context) { @@ -789,7 +789,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs throw new FileNotFoundException($"System archive with titleid {titleId:x16} was not found on Storage {storageId}. Found in {installedStorage}."); } - [CommandHipc(203)] + [CommandCmif(203)] // OpenPatchDataStorageByCurrentProcess() -> object public ResultCode OpenPatchDataStorageByCurrentProcess(ServiceCtx context) { @@ -802,7 +802,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(205)] + [CommandCmif(205)] // OpenDataStorageWithProgramIndex(u8 program_index) -> object public ResultCode OpenDataStorageWithProgramIndex(ServiceCtx context) { @@ -822,7 +822,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(400)] + [CommandCmif(400)] // OpenDataStorageByCurrentProcess() -> object dataStorage public ResultCode OpenDeviceOperator(ServiceCtx context) { @@ -836,7 +836,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(601)] + [CommandCmif(601)] public ResultCode QuerySaveDataTotalSize(ServiceCtx context) { long dataSize = context.RequestData.ReadInt64(); @@ -850,13 +850,13 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(511)] + [CommandCmif(511)] public ResultCode NotifySystemDataUpdateEvent(ServiceCtx context) { return (ResultCode)_baseFileSystemProxy.Get.NotifySystemDataUpdateEvent().Value; } - [CommandHipc(523)] + [CommandCmif(523)] public ResultCode SimulateDeviceDetectionEvent(ServiceCtx context) { bool signalEvent = context.RequestData.ReadBoolean(); @@ -867,7 +867,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.SimulateDeviceDetectionEvent(port, mode, signalEvent).Value; } - [CommandHipc(602)] + [CommandCmif(602)] public ResultCode VerifySaveDataFileSystem(ServiceCtx context) { ulong saveDataId = context.RequestData.ReadUInt64(); @@ -878,7 +878,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.VerifySaveDataFileSystem(saveDataId, new OutBuffer(readBuffer)).Value; } - [CommandHipc(603)] + [CommandCmif(603)] public ResultCode CorruptSaveDataFileSystem(ServiceCtx context) { ulong saveDataId = context.RequestData.ReadUInt64(); @@ -886,7 +886,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.CorruptSaveDataFileSystem(saveDataId).Value; } - [CommandHipc(604)] + [CommandCmif(604)] public ResultCode CreatePaddingFile(ServiceCtx context) { long size = context.RequestData.ReadInt64(); @@ -894,13 +894,13 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.CreatePaddingFile(size).Value; } - [CommandHipc(605)] + [CommandCmif(605)] public ResultCode DeleteAllPaddingFiles(ServiceCtx context) { return (ResultCode)_baseFileSystemProxy.Get.DeleteAllPaddingFiles().Value; } - [CommandHipc(606)] + [CommandCmif(606)] public ResultCode GetRightsId(ServiceCtx context) { StorageId storageId = (StorageId)context.RequestData.ReadInt64(); @@ -914,7 +914,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(607)] + [CommandCmif(607)] public ResultCode RegisterExternalKey(ServiceCtx context) { RightsId rightsId = context.RequestData.ReadStruct(); @@ -923,13 +923,13 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.RegisterExternalKey(in rightsId, in accessKey).Value; } - [CommandHipc(608)] + [CommandCmif(608)] public ResultCode UnregisterAllExternalKey(ServiceCtx context) { return (ResultCode)_baseFileSystemProxy.Get.UnregisterAllExternalKey().Value; } - [CommandHipc(609)] + [CommandCmif(609)] public ResultCode GetRightsIdByPath(ServiceCtx context) { ref readonly var path = ref FileSystemProxyHelper.GetFspPath(context); @@ -942,7 +942,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(610)] + [CommandCmif(610)] public ResultCode GetRightsIdAndKeyGenerationByPath(ServiceCtx context) { ref readonly var path = ref FileSystemProxyHelper.GetFspPath(context); @@ -957,7 +957,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(611)] + [CommandCmif(611)] public ResultCode SetCurrentPosixTimeWithTimeDifference(ServiceCtx context) { int timeDifference = context.RequestData.ReadInt32(); @@ -967,7 +967,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.SetCurrentPosixTimeWithTimeDifference(time, timeDifference).Value; } - [CommandHipc(612)] + [CommandCmif(612)] public ResultCode GetFreeSpaceSizeForSaveData(ServiceCtx context) { SaveDataSpaceId spaceId = context.RequestData.ReadStruct(); @@ -980,7 +980,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(613)] + [CommandCmif(613)] public ResultCode VerifySaveDataFileSystemBySaveDataSpaceId(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64(); @@ -992,7 +992,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.VerifySaveDataFileSystemBySaveDataSpaceId(spaceId, saveDataId, new OutBuffer(readBuffer)).Value; } - [CommandHipc(614)] + [CommandCmif(614)] public ResultCode CorruptSaveDataFileSystemBySaveDataSpaceId(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64(); @@ -1001,7 +1001,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.CorruptSaveDataFileSystemBySaveDataSpaceId(spaceId, saveDataId).Value; } - [CommandHipc(615)] + [CommandCmif(615)] public ResultCode QuerySaveDataInternalStorageTotalSize(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64(); @@ -1015,7 +1015,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(616)] + [CommandCmif(616)] public ResultCode GetSaveDataCommitId(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64(); @@ -1029,7 +1029,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(617)] + [CommandCmif(617)] public ResultCode UnregisterExternalKey(ServiceCtx context) { RightsId rightsId = context.RequestData.ReadStruct(); @@ -1037,7 +1037,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.UnregisterExternalKey(in rightsId).Value; } - [CommandHipc(620)] + [CommandCmif(620)] public ResultCode SetSdCardEncryptionSeed(ServiceCtx context) { EncryptionSeed encryptionSeed = context.RequestData.ReadStruct(); @@ -1045,7 +1045,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.SetSdCardEncryptionSeed(in encryptionSeed).Value; } - [CommandHipc(630)] + [CommandCmif(630)] // SetSdCardAccessibility(u8 isAccessible) public ResultCode SetSdCardAccessibility(ServiceCtx context) { @@ -1054,7 +1054,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.SetSdCardAccessibility(isAccessible).Value; } - [CommandHipc(631)] + [CommandCmif(631)] // IsSdCardAccessible() -> u8 isAccessible public ResultCode IsSdCardAccessible(ServiceCtx context) { @@ -1066,7 +1066,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(702)] + [CommandCmif(702)] public ResultCode IsAccessFailureDetected(ServiceCtx context) { ulong processId = context.RequestData.ReadUInt64(); @@ -1079,7 +1079,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(710)] + [CommandCmif(710)] public ResultCode ResolveAccessFailure(ServiceCtx context) { ulong processId = context.RequestData.ReadUInt64(); @@ -1087,7 +1087,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.ResolveAccessFailure(processId).Value; } - [CommandHipc(720)] + [CommandCmif(720)] public ResultCode AbandonAccessFailure(ServiceCtx context) { ulong processId = context.RequestData.ReadUInt64(); @@ -1095,7 +1095,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.AbandonAccessFailure(processId).Value; } - [CommandHipc(800)] + [CommandCmif(800)] public ResultCode GetAndClearErrorInfo(ServiceCtx context) { Result result = _baseFileSystemProxy.Get.GetAndClearErrorInfo(out FileSystemProxyErrorInfo errorInfo); @@ -1106,7 +1106,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(810)] + [CommandCmif(810)] public ResultCode RegisterProgramIndexMapInfo(ServiceCtx context) { int programCount = context.RequestData.ReadInt32(); @@ -1117,7 +1117,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.RegisterProgramIndexMapInfo(new InBuffer(mapInfoBuffer), programCount).Value; } - [CommandHipc(1000)] + [CommandCmif(1000)] public ResultCode SetBisRootForHost(ServiceCtx context) { BisPartitionId partitionId = (BisPartitionId)context.RequestData.ReadInt32(); @@ -1126,7 +1126,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.SetBisRootForHost(partitionId, in path).Value; } - [CommandHipc(1001)] + [CommandCmif(1001)] public ResultCode SetSaveDataSize(ServiceCtx context) { long dataSize = context.RequestData.ReadInt64(); @@ -1135,7 +1135,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.SetSaveDataSize(dataSize, journalSize).Value; } - [CommandHipc(1002)] + [CommandCmif(1002)] public ResultCode SetSaveDataRootPath(ServiceCtx context) { ref readonly var path = ref FileSystemProxyHelper.GetFspPath(context); @@ -1143,13 +1143,13 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.SetSaveDataRootPath(in path).Value; } - [CommandHipc(1003)] + [CommandCmif(1003)] public ResultCode DisableAutoSaveDataCreation(ServiceCtx context) { return (ResultCode)_baseFileSystemProxy.Get.DisableAutoSaveDataCreation().Value; } - [CommandHipc(1004)] + [CommandCmif(1004)] // SetGlobalAccessLogMode(u32 mode) public ResultCode SetGlobalAccessLogMode(ServiceCtx context) { @@ -1160,7 +1160,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(1005)] + [CommandCmif(1005)] // GetGlobalAccessLogMode() -> u32 logMode public ResultCode GetGlobalAccessLogMode(ServiceCtx context) { @@ -1171,7 +1171,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(1006)] + [CommandCmif(1006)] // OutputAccessLogToSdCard(buffer log_text) public ResultCode OutputAccessLogToSdCard(ServiceCtx context) { @@ -1183,13 +1183,13 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(1007)] + [CommandCmif(1007)] public ResultCode RegisterUpdatePartition(ServiceCtx context) { return (ResultCode)_baseFileSystemProxy.Get.RegisterUpdatePartition().Value; } - [CommandHipc(1008)] + [CommandCmif(1008)] public ResultCode OpenRegisteredUpdatePartition(ServiceCtx context) { using var fileSystem = new SharedRef(); @@ -1202,7 +1202,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(1009)] + [CommandCmif(1009)] public ResultCode GetAndClearMemoryReportInfo(ServiceCtx context) { Result result = _baseFileSystemProxy.Get.GetAndClearMemoryReportInfo(out MemoryReportInfo reportInfo); @@ -1213,7 +1213,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(1011)] + [CommandCmif(1011)] public ResultCode GetProgramIndexForAccessLog(ServiceCtx context) { Result result = _baseFileSystemProxy.Get.GetProgramIndexForAccessLog(out int programIndex, out int programCount); @@ -1225,7 +1225,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(1012)] + [CommandCmif(1012)] public ResultCode GetFsStackUsage(ServiceCtx context) { FsStackUsageThreadType threadType = context.RequestData.ReadStruct(); @@ -1238,25 +1238,25 @@ namespace Ryujinx.HLE.HOS.Services.Fs return ResultCode.Success; } - [CommandHipc(1013)] + [CommandCmif(1013)] public ResultCode UnsetSaveDataRootPath(ServiceCtx context) { return (ResultCode)_baseFileSystemProxy.Get.UnsetSaveDataRootPath().Value; } - [CommandHipc(1014)] + [CommandCmif(1014)] public ResultCode OutputMultiProgramTagAccessLog(ServiceCtx context) { return (ResultCode)_baseFileSystemProxy.Get.OutputMultiProgramTagAccessLog().Value; } - [CommandHipc(1016)] + [CommandCmif(1016)] public ResultCode FlushAccessLogOnSdCard(ServiceCtx context) { return (ResultCode)_baseFileSystemProxy.Get.FlushAccessLogOnSdCard().Value; } - [CommandHipc(1017)] + [CommandCmif(1017)] public ResultCode OutputApplicationInfoAccessLog(ServiceCtx context) { ApplicationInfo info = context.RequestData.ReadStruct(); @@ -1264,7 +1264,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.OutputApplicationInfoAccessLog(in info).Value; } - [CommandHipc(1100)] + [CommandCmif(1100)] public ResultCode OverrideSaveDataTransferTokenSignVerificationKey(ServiceCtx context) { byte[] keyBuffer = new byte[context.Request.SendBuff[0].Size]; @@ -1273,7 +1273,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.OverrideSaveDataTransferTokenSignVerificationKey(new InBuffer(keyBuffer)).Value; } - [CommandHipc(1110)] + [CommandCmif(1110)] public ResultCode CorruptSaveDataFileSystemByOffset(ServiceCtx context) { SaveDataSpaceId spaceId = (SaveDataSpaceId)context.RequestData.ReadInt64(); @@ -1283,7 +1283,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)_baseFileSystemProxy.Get.CorruptSaveDataFileSystemByOffset(spaceId, saveDataId, offset).Value; } - [CommandHipc(1200)] // 6.0.0+ + [CommandCmif(1200)] // 6.0.0+ // OpenMultiCommitManager() -> object public ResultCode OpenMultiCommitManager(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Fs/IMultiCommitManager.cs b/Ryujinx.HLE/HOS/Services/Fs/IMultiCommitManager.cs index 1a85e1b2d..aa04a7e64 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/IMultiCommitManager.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/IMultiCommitManager.cs @@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs _baseCommitManager = SharedRef.CreateMove(ref baseCommitManager); } - [CommandHipc(1)] // 6.0.0+ + [CommandCmif(1)] // 6.0.0+ // Add(object) public ResultCode Add(ServiceCtx context) { @@ -24,7 +24,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs return (ResultCode)result.Value; } - [CommandHipc(2)] // 6.0.0+ + [CommandCmif(2)] // 6.0.0+ // Commit() public ResultCode Commit(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Fs/ISaveDataInfoReader.cs b/Ryujinx.HLE/HOS/Services/Fs/ISaveDataInfoReader.cs index 0bb4123f2..0611375b1 100644 --- a/Ryujinx.HLE/HOS/Services/Fs/ISaveDataInfoReader.cs +++ b/Ryujinx.HLE/HOS/Services/Fs/ISaveDataInfoReader.cs @@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.Fs _baseReader = SharedRef.CreateMove(ref baseReader); } - [CommandHipc(0)] + [CommandCmif(0)] // ReadSaveDataInfo() -> (u64, buffer) public ResultCode ReadSaveDataInfo(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Hid/HidServer/IActiveVibrationDeviceList.cs b/Ryujinx.HLE/HOS/Services/Hid/HidServer/IActiveVibrationDeviceList.cs index cc089d051..56f63e52e 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/HidServer/IActiveVibrationDeviceList.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/HidServer/IActiveVibrationDeviceList.cs @@ -4,7 +4,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.HidServer { public IActiveApplicationDeviceList() { } - [CommandHipc(0)] + [CommandCmif(0)] // ActivateVibrationDevice(nn::hid::VibrationDeviceHandle) public ResultCode ActivateVibrationDevice(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Hid/HidServer/IAppletResource.cs b/Ryujinx.HLE/HOS/Services/Hid/HidServer/IAppletResource.cs index 29ee1706c..f0aaf5e36 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/HidServer/IAppletResource.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/HidServer/IAppletResource.cs @@ -15,7 +15,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.HidServer _hidSharedMem = hidSharedMem; } - [CommandHipc(0)] + [CommandCmif(0)] // GetSharedMemoryHandle() -> handle public ResultCode GetSharedMemoryHandle(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs b/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs index 266fc04fb..d508aba42 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs @@ -59,7 +59,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid _vibrationPermitted = true; } - [CommandHipc(0)] + [CommandCmif(0)] // CreateAppletResource(nn::applet::AppletResourceUserId) -> object public ResultCode CreateAppletResource(ServiceCtx context) { @@ -70,7 +70,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // ActivateDebugPad(nn::applet::AppletResourceUserId) public ResultCode ActivateDebugPad(ServiceCtx context) { @@ -88,7 +88,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // ActivateTouchScreen(nn::applet::AppletResourceUserId) public ResultCode ActivateTouchScreen(ServiceCtx context) { @@ -108,7 +108,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(21)] + [CommandCmif(21)] // ActivateMouse(nn::applet::AppletResourceUserId) public ResultCode ActivateMouse(ServiceCtx context) { @@ -128,7 +128,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(31)] + [CommandCmif(31)] // ActivateKeyboard(nn::applet::AppletResourceUserId) public ResultCode ActivateKeyboard(ServiceCtx context) { @@ -151,7 +151,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(32)] + [CommandCmif(32)] // SendKeyboardLockKeyEvent(uint flags, pid) public ResultCode SendKeyboardLockKeyEvent(ServiceCtx context) { @@ -164,7 +164,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(40)] + [CommandCmif(40)] // AcquireXpadIdEventHandle(ulong XpadId) -> nn::sf::NativeHandle public ResultCode AcquireXpadIdEventHandle(ServiceCtx context) { @@ -182,7 +182,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(41)] + [CommandCmif(41)] // ReleaseXpadIdEventHandle(ulong XpadId) public ResultCode ReleaseXpadIdEventHandle(ServiceCtx context) { @@ -195,7 +195,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(51)] + [CommandCmif(51)] // ActivateXpad(nn::hid::BasicXpadId, nn::applet::AppletResourceUserId) public ResultCode ActivateXpad(ServiceCtx context) { @@ -207,7 +207,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(55)] + [CommandCmif(55)] // GetXpadIds() -> long IdsCount, buffer, type: 0xa> public ResultCode GetXpadIds(ServiceCtx context) { @@ -219,7 +219,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(56)] + [CommandCmif(56)] // ActivateJoyXpad(nn::hid::JoyXpadId) public ResultCode ActivateJoyXpad(ServiceCtx context) { @@ -230,7 +230,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(58)] + [CommandCmif(58)] // GetJoyXpadLifoHandle(nn::hid::JoyXpadId) -> nn::sf::NativeHandle public ResultCode GetJoyXpadLifoHandle(ServiceCtx context) { @@ -245,7 +245,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(59)] + [CommandCmif(59)] // GetJoyXpadIds() -> long IdsCount, buffer, type: 0xa> public ResultCode GetJoyXpadIds(ServiceCtx context) { @@ -257,7 +257,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(60)] + [CommandCmif(60)] // ActivateSixAxisSensor(nn::hid::BasicXpadId) public ResultCode ActivateSixAxisSensor(ServiceCtx context) { @@ -268,7 +268,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(61)] + [CommandCmif(61)] // DeactivateSixAxisSensor(nn::hid::BasicXpadId) public ResultCode DeactivateSixAxisSensor(ServiceCtx context) { @@ -279,7 +279,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(62)] + [CommandCmif(62)] // GetSixAxisSensorLifoHandle(nn::hid::BasicXpadId) -> nn::sf::NativeHandle public ResultCode GetSixAxisSensorLifoHandle(ServiceCtx context) { @@ -294,7 +294,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(63)] + [CommandCmif(63)] // ActivateJoySixAxisSensor(nn::hid::JoyXpadId) public ResultCode ActivateJoySixAxisSensor(ServiceCtx context) { @@ -305,7 +305,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(64)] + [CommandCmif(64)] // DeactivateJoySixAxisSensor(nn::hid::JoyXpadId) public ResultCode DeactivateJoySixAxisSensor(ServiceCtx context) { @@ -316,7 +316,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(65)] + [CommandCmif(65)] // GetJoySixAxisSensorLifoHandle(nn::hid::JoyXpadId) -> nn::sf::NativeHandle public ResultCode GetJoySixAxisSensorLifoHandle(ServiceCtx context) { @@ -331,7 +331,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(66)] + [CommandCmif(66)] // StartSixAxisSensor(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) public ResultCode StartSixAxisSensor(ServiceCtx context) { @@ -344,7 +344,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(67)] + [CommandCmif(67)] // StopSixAxisSensor(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) public ResultCode StopSixAxisSensor(ServiceCtx context) { @@ -357,7 +357,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(68)] + [CommandCmif(68)] // IsSixAxisSensorFusionEnabled(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) -> bool IsEnabled public ResultCode IsSixAxisSensorFusionEnabled(ServiceCtx context) { @@ -372,7 +372,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(69)] + [CommandCmif(69)] // EnableSixAxisSensorFusion(bool Enabled, nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) public ResultCode EnableSixAxisSensorFusion(ServiceCtx context) { @@ -385,7 +385,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(70)] + [CommandCmif(70)] // SetSixAxisSensorFusionParameters(nn::hid::SixAxisSensorHandle, float RevisePower, float ReviseRange, nn::applet::AppletResourceUserId) public ResultCode SetSixAxisSensorFusionParameters(ServiceCtx context) { @@ -405,7 +405,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(71)] + [CommandCmif(71)] // GetSixAxisSensorFusionParameters(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) -> float RevisePower, float ReviseRange) public ResultCode GetSixAxisSensorFusionParameters(ServiceCtx context) { @@ -421,7 +421,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(72)] + [CommandCmif(72)] // ResetSixAxisSensorFusionParameters(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) public ResultCode ResetSixAxisSensorFusionParameters(ServiceCtx context) { @@ -437,7 +437,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(73)] + [CommandCmif(73)] // SetAccelerometerParameters(nn::hid::SixAxisSensorHandle, float X, float Y, nn::applet::AppletResourceUserId) public ResultCode SetAccelerometerParameters(ServiceCtx context) { @@ -457,7 +457,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(74)] + [CommandCmif(74)] // GetAccelerometerParameters(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) -> float X, float Y public ResultCode GetAccelerometerParameters(ServiceCtx context) { @@ -473,7 +473,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(75)] + [CommandCmif(75)] // ResetAccelerometerParameters(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) public ResultCode ResetAccelerometerParameters(ServiceCtx context) { @@ -489,7 +489,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(76)] + [CommandCmif(76)] // SetAccelerometerPlayMode(nn::hid::SixAxisSensorHandle, uint PlayMode, nn::applet::AppletResourceUserId) public ResultCode SetAccelerometerPlayMode(ServiceCtx context) { @@ -503,7 +503,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(77)] + [CommandCmif(77)] // GetAccelerometerPlayMode(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) -> uint PlayMode public ResultCode GetAccelerometerPlayMode(ServiceCtx context) { @@ -518,7 +518,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(78)] + [CommandCmif(78)] // ResetAccelerometerPlayMode(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) public ResultCode ResetAccelerometerPlayMode(ServiceCtx context) { @@ -533,7 +533,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(79)] + [CommandCmif(79)] // SetGyroscopeZeroDriftMode(nn::hid::SixAxisSensorHandle, uint GyroscopeZeroDriftMode, nn::applet::AppletResourceUserId) public ResultCode SetGyroscopeZeroDriftMode(ServiceCtx context) { @@ -546,7 +546,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(80)] + [CommandCmif(80)] // GetGyroscopeZeroDriftMode(nn::applet::AppletResourceUserId, nn::hid::SixAxisSensorHandle) -> int GyroscopeZeroDriftMode public ResultCode GetGyroscopeZeroDriftMode(ServiceCtx context) { @@ -561,7 +561,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(81)] + [CommandCmif(81)] // ResetGyroscopeZeroDriftMode(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) public ResultCode ResetGyroscopeZeroDriftMode(ServiceCtx context) { @@ -576,7 +576,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(82)] + [CommandCmif(82)] // IsSixAxisSensorAtRest(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) -> bool IsAsRest public ResultCode IsSixAxisSensorAtRest(ServiceCtx context) { @@ -593,7 +593,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(83)] // 6.0.0+ + [CommandCmif(83)] // 6.0.0+ // IsFirmwareUpdateAvailableForSixAxisSensor(nn::hid::AppletResourceUserId, nn::hid::SixAxisSensorHandle, pid) -> bool UpdateAvailable public ResultCode IsFirmwareUpdateAvailableForSixAxisSensor(ServiceCtx context) { @@ -608,7 +608,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(84)] // 13.0.0+ + [CommandCmif(84)] // 13.0.0+ // EnableSixAxisSensorUnalteredPassthrough(nn::applet::AppletResourceUserId, nn::hid::SixAxisSensorHandle, u8 enabled) public ResultCode EnableSixAxisSensorUnalteredPassthrough(ServiceCtx context) { @@ -621,7 +621,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(85)] // 13.0.0+ + [CommandCmif(85)] // 13.0.0+ // IsSixAxisSensorUnalteredPassthroughEnabled(nn::applet::AppletResourceUserId, nn::hid::SixAxisSensorHandle) -> u8 enabled public ResultCode IsSixAxisSensorUnalteredPassthroughEnabled(ServiceCtx context) { @@ -636,7 +636,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(87)] // 13.0.0+ + [CommandCmif(87)] // 13.0.0+ // LoadSixAxisSensorCalibrationParameter(nn::applet::AppletResourceUserId, nn::hid::SixAxisSensorHandle, u64 unknown) public ResultCode LoadSixAxisSensorCalibrationParameter(ServiceCtx context) { @@ -651,7 +651,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(88)] // 13.0.0+ + [CommandCmif(88)] // 13.0.0+ // GetSixAxisSensorIcInformation(nn::applet::AppletResourceUserId, nn::hid::SixAxisSensorHandle) -> u64 unknown public ResultCode GetSixAxisSensorIcInformation(ServiceCtx context) { @@ -666,7 +666,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(91)] + [CommandCmif(91)] // ActivateGesture(nn::applet::AppletResourceUserId, int Unknown0) public ResultCode ActivateGesture(ServiceCtx context) { @@ -678,7 +678,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(100)] + [CommandCmif(100)] // SetSupportedNpadStyleSet(pid, nn::applet::AppletResourceUserId, nn::hid::NpadStyleTag) public ResultCode SetSupportedNpadStyleSet(ServiceCtx context) { @@ -694,7 +694,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(101)] + [CommandCmif(101)] // GetSupportedNpadStyleSet(pid, nn::applet::AppletResourceUserId) -> uint nn::hid::NpadStyleTag public ResultCode GetSupportedNpadStyleSet(ServiceCtx context) { @@ -708,7 +708,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(102)] + [CommandCmif(102)] // SetSupportedNpadIdType(nn::applet::AppletResourceUserId, array) public ResultCode SetSupportedNpadIdType(ServiceCtx context) { @@ -733,14 +733,14 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(103)] + [CommandCmif(103)] // ActivateNpad(nn::applet::AppletResourceUserId) public ResultCode ActivateNpad(ServiceCtx context) { return ActiveNpadImpl(context); } - [CommandHipc(104)] + [CommandCmif(104)] // DeactivateNpad(nn::applet::AppletResourceUserId) public ResultCode DeactivateNpad(ServiceCtx context) { @@ -752,7 +752,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(106)] + [CommandCmif(106)] // AcquireNpadStyleSetUpdateEventHandle(nn::applet::AppletResourceUserId, uint, ulong) -> nn::sf::NativeHandle public ResultCode AcquireNpadStyleSetUpdateEventHandle(ServiceCtx context) { @@ -776,7 +776,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(107)] + [CommandCmif(107)] // DisconnectNpad(nn::applet::AppletResourceUserId, uint NpadIdType) public ResultCode DisconnectNpad(ServiceCtx context) { @@ -788,7 +788,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(108)] + [CommandCmif(108)] // GetPlayerLedPattern(u32 npad_id) -> u64 led_pattern public ResultCode GetPlayerLedPattern(ServiceCtx context) { @@ -814,7 +814,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(109)] // 5.0.0+ + [CommandCmif(109)] // 5.0.0+ // ActivateNpadWithRevision(nn::applet::AppletResourceUserId, ulong revision) public ResultCode ActivateNpadWithRevision(ServiceCtx context) { @@ -859,7 +859,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(120)] + [CommandCmif(120)] // SetNpadJoyHoldType(nn::applet::AppletResourceUserId, ulong NpadJoyHoldType) public ResultCode SetNpadJoyHoldType(ServiceCtx context) { @@ -885,7 +885,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(121)] + [CommandCmif(121)] // GetNpadJoyHoldType(nn::applet::AppletResourceUserId) -> ulong NpadJoyHoldType public ResultCode GetNpadJoyHoldType(ServiceCtx context) { @@ -904,7 +904,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(122)] + [CommandCmif(122)] // SetNpadJoyAssignmentModeSingleByDefault(uint HidControllerId, nn::applet::AppletResourceUserId) public ResultCode SetNpadJoyAssignmentModeSingleByDefault(ServiceCtx context) { @@ -920,7 +920,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(123)] + [CommandCmif(123)] // SetNpadJoyAssignmentModeSingle(uint npadIdType, nn::applet::AppletResourceUserId, uint npadJoyDeviceType) public ResultCode SetNpadJoyAssignmentModeSingle(ServiceCtx context) { @@ -937,7 +937,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(124)] + [CommandCmif(124)] // SetNpadJoyAssignmentModeDual(uint npadIdType, nn::applet::AppletResourceUserId) public ResultCode SetNpadJoyAssignmentModeDual(ServiceCtx context) { @@ -953,7 +953,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(125)] + [CommandCmif(125)] // MergeSingleJoyAsDualJoy(uint npadIdType0, uint npadIdType1, nn::applet::AppletResourceUserId) public ResultCode MergeSingleJoyAsDualJoy(ServiceCtx context) { @@ -969,7 +969,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(126)] + [CommandCmif(126)] // StartLrAssignmentMode(nn::applet::AppletResourceUserId) public ResultCode StartLrAssignmentMode(ServiceCtx context) { @@ -980,7 +980,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(127)] + [CommandCmif(127)] // StopLrAssignmentMode(nn::applet::AppletResourceUserId) public ResultCode StopLrAssignmentMode(ServiceCtx context) { @@ -991,7 +991,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(128)] + [CommandCmif(128)] // SetNpadHandheldActivationMode(nn::applet::AppletResourceUserId, long HidNpadHandheldActivationMode) public ResultCode SetNpadHandheldActivationMode(ServiceCtx context) { @@ -1003,7 +1003,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(129)] + [CommandCmif(129)] // GetNpadHandheldActivationMode(nn::applet::AppletResourceUserId) -> long HidNpadHandheldActivationMode public ResultCode GetNpadHandheldActivationMode(ServiceCtx context) { @@ -1016,7 +1016,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(130)] + [CommandCmif(130)] // SwapNpadAssignment(uint OldNpadAssignment, uint NewNpadAssignment, nn::applet::AppletResourceUserId) public ResultCode SwapNpadAssignment(ServiceCtx context) { @@ -1029,7 +1029,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(131)] + [CommandCmif(131)] // IsUnintendedHomeButtonInputProtectionEnabled(uint Unknown0, nn::applet::AppletResourceUserId) -> bool IsEnabled public ResultCode IsUnintendedHomeButtonInputProtectionEnabled(ServiceCtx context) { @@ -1043,7 +1043,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(132)] + [CommandCmif(132)] // EnableUnintendedHomeButtonInputProtection(bool Enable, uint Unknown0, nn::applet::AppletResourceUserId) public ResultCode EnableUnintendedHomeButtonInputProtection(ServiceCtx context) { @@ -1056,7 +1056,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(133)] // 5.0.0+ + [CommandCmif(133)] // 5.0.0+ // SetNpadJoyAssignmentModeSingleWithDestination(uint npadIdType, uint npadJoyDeviceType, nn::applet::AppletResourceUserId) -> bool npadIdTypeIsSet, uint npadIdTypeSet public ResultCode SetNpadJoyAssignmentModeSingleWithDestination(ServiceCtx context) { @@ -1091,7 +1091,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid // If not, it returns nothing. } - [CommandHipc(200)] + [CommandCmif(200)] // GetVibrationDeviceInfo(nn::hid::VibrationDeviceHandle) -> nn::hid::VibrationDeviceInfo public ResultCode GetVibrationDeviceInfo(ServiceCtx context) { @@ -1154,7 +1154,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.InvalidNpadDeviceType; } - [CommandHipc(201)] + [CommandCmif(201)] // SendVibrationValue(nn::hid::VibrationDeviceHandle, nn::hid::VibrationValue, nn::applet::AppletResourceUserId) public ResultCode SendVibrationValue(ServiceCtx context) { @@ -1185,7 +1185,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(202)] + [CommandCmif(202)] // GetActualVibrationValue(nn::hid::VibrationDeviceHandle, nn::applet::AppletResourceUserId) -> nn::hid::VibrationValue public ResultCode GetActualVibrationValue(ServiceCtx context) { @@ -1209,7 +1209,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(203)] + [CommandCmif(203)] // CreateActiveVibrationDeviceList() -> object public ResultCode CreateActiveVibrationDeviceList(ServiceCtx context) { @@ -1218,7 +1218,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(204)] + [CommandCmif(204)] // PermitVibration(bool Enable) public ResultCode PermitVibration(ServiceCtx context) { @@ -1229,7 +1229,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(205)] + [CommandCmif(205)] // IsVibrationPermitted() -> bool IsEnabled public ResultCode IsVibrationPermitted(ServiceCtx context) { @@ -1238,7 +1238,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(206)] + [CommandCmif(206)] // SendVibrationValues(nn::applet::AppletResourceUserId, buffer, type: 9>, buffer, type: 9>) public ResultCode SendVibrationValues(ServiceCtx context) { @@ -1281,7 +1281,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(207)] // 4.0.0+ + [CommandCmif(207)] // 4.0.0+ // SendVibrationGcErmCommand(nn::hid::VibrationDeviceHandle, nn::hid::VibrationGcErmCommand, nn::applet::AppletResourceUserId) public ResultCode SendVibrationGcErmCommand(ServiceCtx context) { @@ -1294,7 +1294,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(208)] // 4.0.0+ + [CommandCmif(208)] // 4.0.0+ // GetActualVibrationGcErmCommand(nn::hid::VibrationDeviceHandle, nn::applet::AppletResourceUserId) -> nn::hid::VibrationGcErmCommand public ResultCode GetActualVibrationGcErmCommand(ServiceCtx context) { @@ -1308,7 +1308,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(209)] // 4.0.0+ + [CommandCmif(209)] // 4.0.0+ // BeginPermitVibrationSession(nn::applet::AppletResourceUserId) public ResultCode BeginPermitVibrationSession(ServiceCtx context) { @@ -1319,7 +1319,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(210)] // 4.0.0+ + [CommandCmif(210)] // 4.0.0+ // EndPermitVibrationSession() public ResultCode EndPermitVibrationSession(ServiceCtx context) { @@ -1328,7 +1328,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(211)] // 7.0.0+ + [CommandCmif(211)] // 7.0.0+ // IsVibrationDeviceMounted(nn::hid::VibrationDeviceHandle, nn::applet::AppletResourceUserId) public ResultCode IsVibrationDeviceMounted(ServiceCtx context) { @@ -1343,7 +1343,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(300)] + [CommandCmif(300)] // ActivateConsoleSixAxisSensor(nn::applet::AppletResourceUserId) public ResultCode ActivateConsoleSixAxisSensor(ServiceCtx context) { @@ -1354,7 +1354,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(301)] + [CommandCmif(301)] // StartConsoleSixAxisSensor(nn::hid::ConsoleSixAxisSensorHandle, nn::applet::AppletResourceUserId) public ResultCode StartConsoleSixAxisSensor(ServiceCtx context) { @@ -1366,7 +1366,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(302)] + [CommandCmif(302)] // StopConsoleSixAxisSensor(nn::hid::ConsoleSixAxisSensorHandle, nn::applet::AppletResourceUserId) public ResultCode StopConsoleSixAxisSensor(ServiceCtx context) { @@ -1378,7 +1378,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(303)] // 5.0.0+ + [CommandCmif(303)] // 5.0.0+ // ActivateSevenSixAxisSensor(nn::applet::AppletResourceUserId) public ResultCode ActivateSevenSixAxisSensor(ServiceCtx context) { @@ -1389,7 +1389,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(304)] // 5.0.0+ + [CommandCmif(304)] // 5.0.0+ // StartSevenSixAxisSensor(nn::applet::AppletResourceUserId) public ResultCode StartSevenSixAxisSensor(ServiceCtx context) { @@ -1400,7 +1400,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(305)] // 5.0.0+ + [CommandCmif(305)] // 5.0.0+ // StopSevenSixAxisSensor(nn::applet::AppletResourceUserId) public ResultCode StopSevenSixAxisSensor(ServiceCtx context) { @@ -1411,7 +1411,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(306)] // 5.0.0+ + [CommandCmif(306)] // 5.0.0+ // InitializeSevenSixAxisSensor(array, ulong Counter0, array, ulong Counter1, nn::applet::AppletResourceUserId) public ResultCode InitializeSevenSixAxisSensor(ServiceCtx context) { @@ -1426,7 +1426,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(307)] // 5.0.0+ + [CommandCmif(307)] // 5.0.0+ // FinalizeSevenSixAxisSensor(nn::applet::AppletResourceUserId) public ResultCode FinalizeSevenSixAxisSensor(ServiceCtx context) { @@ -1437,7 +1437,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(308)] // 5.0.0+ + [CommandCmif(308)] // 5.0.0+ // SetSevenSixAxisSensorFusionStrength(float Strength, nn::applet::AppletResourceUserId) public ResultCode SetSevenSixAxisSensorFusionStrength(ServiceCtx context) { @@ -1449,7 +1449,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(309)] // 5.0.0+ + [CommandCmif(309)] // 5.0.0+ // GetSevenSixAxisSensorFusionStrength(nn::applet::AppletResourceUserId) -> float Strength public ResultCode GetSevenSixAxisSensorFusionStrength(ServiceCtx context) { @@ -1462,7 +1462,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(310)] // 6.0.0+ + [CommandCmif(310)] // 6.0.0+ // ResetSevenSixAxisSensorTimestamp(pid, nn::applet::AppletResourceUserId) public ResultCode ResetSevenSixAxisSensorTimestamp(ServiceCtx context) { @@ -1473,7 +1473,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(400)] + [CommandCmif(400)] // IsUsbFullKeyControllerEnabled() -> bool IsEnabled public ResultCode IsUsbFullKeyControllerEnabled(ServiceCtx context) { @@ -1484,7 +1484,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(401)] + [CommandCmif(401)] // EnableUsbFullKeyController(bool Enable) public ResultCode EnableUsbFullKeyController(ServiceCtx context) { @@ -1495,7 +1495,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(402)] + [CommandCmif(402)] // IsUsbFullKeyControllerConnected(uint Unknown0) -> bool Connected public ResultCode IsUsbFullKeyControllerConnected(ServiceCtx context) { @@ -1508,7 +1508,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(403)] // 4.0.0+ + [CommandCmif(403)] // 4.0.0+ // HasBattery(uint NpadId) -> bool HasBattery public ResultCode HasBattery(ServiceCtx context) { @@ -1521,7 +1521,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(404)] // 4.0.0+ + [CommandCmif(404)] // 4.0.0+ // HasLeftRightBattery(uint NpadId) -> bool HasLeftBattery, bool HasRightBattery public ResultCode HasLeftRightBattery(ServiceCtx context) { @@ -1535,7 +1535,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(405)] // 4.0.0+ + [CommandCmif(405)] // 4.0.0+ // GetNpadInterfaceType(uint NpadId) -> uchar InterfaceType public ResultCode GetNpadInterfaceType(ServiceCtx context) { @@ -1548,7 +1548,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(406)] // 4.0.0+ + [CommandCmif(406)] // 4.0.0+ // GetNpadLeftRightInterfaceType(uint NpadId) -> uchar LeftInterfaceType, uchar RightInterfaceType public ResultCode GetNpadLeftRightInterfaceType(ServiceCtx context) { @@ -1562,7 +1562,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(500)] // 5.0.0+ + [CommandCmif(500)] // 5.0.0+ // GetPalmaConnectionHandle(uint Unknown0, nn::applet::AppletResourceUserId) -> nn::hid::PalmaConnectionHandle public ResultCode GetPalmaConnectionHandle(ServiceCtx context) { @@ -1578,7 +1578,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(501)] // 5.0.0+ + [CommandCmif(501)] // 5.0.0+ // InitializePalma(nn::hid::PalmaConnectionHandle) public ResultCode InitializePalma(ServiceCtx context) { @@ -1591,7 +1591,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(502)] // 5.0.0+ + [CommandCmif(502)] // 5.0.0+ // AcquirePalmaOperationCompleteEvent(nn::hid::PalmaConnectionHandle) -> nn::sf::NativeHandle public ResultCode AcquirePalmaOperationCompleteEvent(ServiceCtx context) { @@ -1609,7 +1609,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(503)] // 5.0.0+ + [CommandCmif(503)] // 5.0.0+ // GetPalmaOperationInfo(nn::hid::PalmaConnectionHandle) -> long Unknown0, buffer public ResultCode GetPalmaOperationInfo(ServiceCtx context) { @@ -1624,7 +1624,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(504)] // 5.0.0+ + [CommandCmif(504)] // 5.0.0+ // PlayPalmaActivity(nn::hid::PalmaConnectionHandle, ulong Unknown0) public ResultCode PlayPalmaActivity(ServiceCtx context) { @@ -1638,7 +1638,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(505)] // 5.0.0+ + [CommandCmif(505)] // 5.0.0+ // SetPalmaFrModeType(nn::hid::PalmaConnectionHandle, ulong FrModeType) public ResultCode SetPalmaFrModeType(ServiceCtx context) { @@ -1652,7 +1652,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(506)] // 5.0.0+ + [CommandCmif(506)] // 5.0.0+ // ReadPalmaStep(nn::hid::PalmaConnectionHandle) public ResultCode ReadPalmaStep(ServiceCtx context) { @@ -1663,7 +1663,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(507)] // 5.0.0+ + [CommandCmif(507)] // 5.0.0+ // EnablePalmaStep(nn::hid::PalmaConnectionHandle, bool Enable) public ResultCode EnablePalmaStep(ServiceCtx context) { @@ -1677,7 +1677,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(508)] // 5.0.0+ + [CommandCmif(508)] // 5.0.0+ // ResetPalmaStep(nn::hid::PalmaConnectionHandle) public ResultCode ResetPalmaStep(ServiceCtx context) { @@ -1690,7 +1690,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(509)] // 5.0.0+ + [CommandCmif(509)] // 5.0.0+ // ReadPalmaApplicationSection(nn::hid::PalmaConnectionHandle, ulong Unknown0, ulong Unknown1) public ResultCode ReadPalmaApplicationSection(ServiceCtx context) { @@ -1703,7 +1703,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(510)] // 5.0.0+ + [CommandCmif(510)] // 5.0.0+ // WritePalmaApplicationSection(nn::hid::PalmaConnectionHandle, ulong Unknown0, ulong Unknown1, nn::hid::PalmaApplicationSectionAccessBuffer) public ResultCode WritePalmaApplicationSection(ServiceCtx context) { @@ -1719,7 +1719,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(511)] // 5.0.0+ + [CommandCmif(511)] // 5.0.0+ // ReadPalmaUniqueCode(nn::hid::PalmaConnectionHandle) public ResultCode ReadPalmaUniqueCode(ServiceCtx context) { @@ -1730,7 +1730,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(512)] // 5.0.0+ + [CommandCmif(512)] // 5.0.0+ // SetPalmaUniqueCodeInvalid(nn::hid::PalmaConnectionHandle) public ResultCode SetPalmaUniqueCodeInvalid(ServiceCtx context) { @@ -1741,7 +1741,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(522)] // 5.1.0+ + [CommandCmif(522)] // 5.1.0+ // SetIsPalmaAllConnectable(nn::applet::AppletResourceUserId, bool, pid) public ResultCode SetIsPalmaAllConnectable(ServiceCtx context) { @@ -1753,7 +1753,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(525)] // 5.1.0+ + [CommandCmif(525)] // 5.1.0+ // SetPalmaBoostMode(bool) public ResultCode SetPalmaBoostMode(ServiceCtx context) { @@ -1762,7 +1762,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(1000)] + [CommandCmif(1000)] // SetNpadCommunicationMode(long CommunicationMode, nn::applet::AppletResourceUserId) public ResultCode SetNpadCommunicationMode(ServiceCtx context) { @@ -1774,7 +1774,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(1001)] + [CommandCmif(1001)] // GetNpadCommunicationMode() -> long CommunicationMode public ResultCode GetNpadCommunicationMode(ServiceCtx context) { @@ -1785,7 +1785,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(1002)] // 9.0.0+ + [CommandCmif(1002)] // 9.0.0+ // SetTouchScreenConfiguration(nn::hid::TouchScreenConfigurationForNx, nn::applet::AppletResourceUserId) public ResultCode SetTouchScreenConfiguration(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Hid/IHidSystemServer.cs b/Ryujinx.HLE/HOS/Services/Hid/IHidSystemServer.cs index ec8295e27..4a5d0e9b5 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/IHidSystemServer.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/IHidSystemServer.cs @@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid { public IHidSystemServer(ServiceCtx context) { } - [CommandHipc(303)] + [CommandCmif(303)] // ApplyNpadSystemCommonPolicy(u64) public ResultCode ApplyNpadSystemCommonPolicy(ServiceCtx context) { @@ -20,7 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(306)] + [CommandCmif(306)] // GetLastActiveNpad(u32) -> u8, u8 public ResultCode GetLastActiveNpad(ServiceCtx context) { @@ -35,7 +35,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return resultCode; } - [CommandHipc(307)] + [CommandCmif(307)] // GetNpadSystemExtStyle() -> u64 public ResultCode GetNpadSystemExtStyle(ServiceCtx context) { @@ -52,7 +52,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid return ResultCode.Success; } - [CommandHipc(314)] // 9.0.0+ + [CommandCmif(314)] // 9.0.0+ // GetAppletFooterUiType(u32) -> u8 public ResultCode GetAppletFooterUiType(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Hid/Irs/IIrSensorServer.cs b/Ryujinx.HLE/HOS/Services/Hid/Irs/IIrSensorServer.cs index 7af06431a..130fcf687 100644 --- a/Ryujinx.HLE/HOS/Services/Hid/Irs/IIrSensorServer.cs +++ b/Ryujinx.HLE/HOS/Services/Hid/Irs/IIrSensorServer.cs @@ -15,7 +15,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs public IIrSensorServer(ServiceCtx context) { } - [CommandHipc(302)] + [CommandCmif(302)] // ActivateIrsensor(nn::applet::AppletResourceUserId, pid) public ResultCode ActivateIrsensor(ServiceCtx context) { @@ -28,7 +28,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(303)] + [CommandCmif(303)] // DeactivateIrsensor(nn::applet::AppletResourceUserId, pid) public ResultCode DeactivateIrsensor(ServiceCtx context) { @@ -41,7 +41,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(304)] + [CommandCmif(304)] // GetIrsensorSharedMemoryHandle(nn::applet::AppletResourceUserId, pid) -> handle public ResultCode GetIrsensorSharedMemoryHandle(ServiceCtx context) { @@ -61,7 +61,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(305)] + [CommandCmif(305)] // StopImageProcessor(pid, nn::irsensor::IrCameraHandle, nn::applet::AppletResourceUserId) public ResultCode StopImageProcessor(ServiceCtx context) { @@ -75,7 +75,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(306)] + [CommandCmif(306)] // RunMomentProcessor(pid, nn::irsensor::IrCameraHandle, nn::applet::AppletResourceUserId, PackedMomentProcessorConfig) public ResultCode RunMomentProcessor(ServiceCtx context) { @@ -90,7 +90,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(307)] + [CommandCmif(307)] // RunClusteringProcessor(pid, nn::irsensor::IrCameraHandle, nn::applet::AppletResourceUserId, PackedClusteringProcessorConfig) public ResultCode RunClusteringProcessor(ServiceCtx context) { @@ -105,7 +105,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(308)] + [CommandCmif(308)] // RunImageTransferProcessor(pid, nn::irsensor::IrCameraHandle, nn::applet::AppletResourceUserId, PackedImageTransferProcessorConfig, u64 TransferMemorySize, TransferMemoryHandle) public ResultCode RunImageTransferProcessor(ServiceCtx context) { @@ -122,7 +122,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(309)] + [CommandCmif(309)] // GetImageTransferProcessorState(pid, nn::irsensor::IrCameraHandle, nn::applet::AppletResourceUserId) public ResultCode GetImageTransferProcessorState(ServiceCtx context) { @@ -151,7 +151,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(310)] + [CommandCmif(310)] // RunTeraPluginProcessor(pid, nn::irsensor::IrCameraHandle, nn::applet::AppletResourceUserId, PackedTeraPluginProcessorConfig) public ResultCode RunTeraPluginProcessor(ServiceCtx context) { @@ -166,7 +166,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(311)] + [CommandCmif(311)] // GetNpadIrCameraHandle(u32) -> nn::irsensor::IrCameraHandle public ResultCode GetNpadIrCameraHandle(ServiceCtx context) { @@ -189,7 +189,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(314)] // 3.0.0+ + [CommandCmif(314)] // 3.0.0+ // CheckFirmwareVersion(nn::irsensor::IrCameraHandle, nn::irsensor::PackedMcuVersion, nn::applet::AppletResourceUserId, pid) public ResultCode CheckFirmwareVersion(ServiceCtx context) { @@ -203,7 +203,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(318)] // 4.0.0+ + [CommandCmif(318)] // 4.0.0+ // StopImageProcessorAsync(nn::irsensor::IrCameraHandle, nn::applet::AppletResourceUserId, pid) public ResultCode StopImageProcessorAsync(ServiceCtx context) { @@ -215,7 +215,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid.Irs return ResultCode.Success; } - [CommandHipc(319)] // 4.0.0+ + [CommandCmif(319)] // 4.0.0+ // ActivateIrsensorWithFunctionLevel(nn::applet::AppletResourceUserId, nn::irsensor::PackedFunctionLevel, pid) public ResultCode ActivateIrsensorWithFunctionLevel(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/IpcService.cs b/Ryujinx.HLE/HOS/Services/IpcService.cs index 4c7d83ea6..f42fd0e21 100644 --- a/Ryujinx.HLE/HOS/Services/IpcService.cs +++ b/Ryujinx.HLE/HOS/Services/IpcService.cs @@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Services { abstract class IpcService { - public IReadOnlyDictionary HipcCommands { get; } + public IReadOnlyDictionary CmifCommands { get; } public IReadOnlyDictionary TipcCommands { get; } public ServerBase Server { get; private set; } @@ -23,11 +23,11 @@ namespace Ryujinx.HLE.HOS.Services public IpcService(ServerBase server = null) { - HipcCommands = Assembly.GetExecutingAssembly().GetTypes() + CmifCommands = Assembly.GetExecutingAssembly().GetTypes() .Where(type => type == GetType()) .SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public)) - .SelectMany(methodInfo => methodInfo.GetCustomAttributes(typeof(CommandHipcAttribute)) - .Select(command => (((CommandHipcAttribute)command).Id, methodInfo))) + .SelectMany(methodInfo => methodInfo.GetCustomAttributes(typeof(CommandCmifAttribute)) + .Select(command => (((CommandCmifAttribute)command).Id, methodInfo))) .ToDictionary(command => command.Id, command => command.methodInfo); TipcCommands = Assembly.GetExecutingAssembly().GetTypes() @@ -61,7 +61,7 @@ namespace Ryujinx.HLE.HOS.Services _isDomain = false; } - public void CallHipcMethod(ServiceCtx context) + public void CallCmifMethod(ServiceCtx context) { IpcService service = this; @@ -107,7 +107,7 @@ namespace Ryujinx.HLE.HOS.Services long sfciMagic = context.RequestData.ReadInt64(); int commandId = (int)context.RequestData.ReadInt64(); - bool serviceExists = service.HipcCommands.TryGetValue(commandId, out MethodInfo processRequest); + bool serviceExists = service.CmifCommands.TryGetValue(commandId, out MethodInfo processRequest); if (context.Device.Configuration.IgnoreMissingServices || serviceExists) { diff --git a/Ryujinx.HLE/HOS/Services/Lbl/ILblController.cs b/Ryujinx.HLE/HOS/Services/Lbl/ILblController.cs index 3a81c814f..65074d5ff 100644 --- a/Ryujinx.HLE/HOS/Services/Lbl/ILblController.cs +++ b/Ryujinx.HLE/HOS/Services/Lbl/ILblController.cs @@ -10,14 +10,14 @@ internal abstract void DisableVrMode(); protected abstract bool IsVrModeEnabled(); - [CommandHipc(17)] + [CommandCmif(17)] // SetBrightnessReflectionDelayLevel(float, float) public ResultCode SetBrightnessReflectionDelayLevel(ServiceCtx context) { return ResultCode.Success; } - [CommandHipc(18)] + [CommandCmif(18)] // GetBrightnessReflectionDelayLevel(float) -> float public ResultCode GetBrightnessReflectionDelayLevel(ServiceCtx context) { @@ -26,21 +26,21 @@ return ResultCode.Success; } - [CommandHipc(21)] + [CommandCmif(21)] // SetCurrentAmbientLightSensorMapping(unknown<0xC>) public ResultCode SetCurrentAmbientLightSensorMapping(ServiceCtx context) { return ResultCode.Success; } - [CommandHipc(22)] + [CommandCmif(22)] // GetCurrentAmbientLightSensorMapping() -> unknown<0xC> public ResultCode GetCurrentAmbientLightSensorMapping(ServiceCtx context) { return ResultCode.Success; } - [CommandHipc(24)] // 3.0.0+ + [CommandCmif(24)] // 3.0.0+ // SetCurrentBrightnessSettingForVrMode(float) public ResultCode SetCurrentBrightnessSettingForVrMode(ServiceCtx context) { @@ -51,7 +51,7 @@ return ResultCode.Success; } - [CommandHipc(25)] // 3.0.0+ + [CommandCmif(25)] // 3.0.0+ // GetCurrentBrightnessSettingForVrMode() -> float public ResultCode GetCurrentBrightnessSettingForVrMode(ServiceCtx context) { @@ -62,7 +62,7 @@ return ResultCode.Success; } - [CommandHipc(26)] // 3.0.0+ + [CommandCmif(26)] // 3.0.0+ // EnableVrMode() public ResultCode EnableVrMode(ServiceCtx context) { @@ -71,7 +71,7 @@ return ResultCode.Success; } - [CommandHipc(27)] // 3.0.0+ + [CommandCmif(27)] // 3.0.0+ // DisableVrMode() public ResultCode DisableVrMode(ServiceCtx context) { @@ -80,7 +80,7 @@ return ResultCode.Success; } - [CommandHipc(28)] // 3.0.0+ + [CommandCmif(28)] // 3.0.0+ // IsVrModeEnabled() -> bool public ResultCode IsVrModeEnabled(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ldn/IUserServiceCreator.cs b/Ryujinx.HLE/HOS/Services/Ldn/IUserServiceCreator.cs index 7e9aa7021..4f3094ae5 100644 --- a/Ryujinx.HLE/HOS/Services/Ldn/IUserServiceCreator.cs +++ b/Ryujinx.HLE/HOS/Services/Ldn/IUserServiceCreator.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn { public IUserServiceCreator(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // CreateUserLocalCommunicationService() -> object public ResultCode CreateUserLocalCommunicationService(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs b/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs index 0c223c067..f425ddf78 100644 --- a/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs +++ b/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/IUserLocalCommunicationService.cs @@ -20,7 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator _networkInterface = new NetworkInterface(context.Device.System); } - [CommandHipc(0)] + [CommandCmif(0)] // GetState() -> s32 state public ResultCode GetState(ServiceCtx context) { @@ -41,7 +41,7 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator return result; } - [CommandHipc(100)] + [CommandCmif(100)] // AttachStateChangeEvent() -> handle public ResultCode AttachStateChangeEvent(ServiceCtx context) { @@ -60,21 +60,21 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator return ResultCode.Success; } - [CommandHipc(400)] + [CommandCmif(400)] // InitializeOld(u64, pid) public ResultCode InitializeOld(ServiceCtx context) { return _networkInterface.Initialize(UnknownValue, 0, null, null); } - [CommandHipc(401)] + [CommandCmif(401)] // Finalize() public ResultCode Finalize(ServiceCtx context) { return _networkInterface.Finalize(); } - [CommandHipc(402)] // 7.0.0+ + [CommandCmif(402)] // 7.0.0+ // Initialize(u64 ip_addresses, u64, pid) public ResultCode Initialize(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Mii/IImageDatabaseService.cs b/Ryujinx.HLE/HOS/Services/Mii/IImageDatabaseService.cs index 1792bbb71..7d65c73fa 100644 --- a/Ryujinx.HLE/HOS/Services/Mii/IImageDatabaseService.cs +++ b/Ryujinx.HLE/HOS/Services/Mii/IImageDatabaseService.cs @@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii public IImageDatabaseService(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // Initialize(b8) -> b8 public ResultCode Initialize(ServiceCtx context) { @@ -27,7 +27,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // GetCount() -> u32 public ResultCode GetCount(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Mii/IStaticService.cs b/Ryujinx.HLE/HOS/Services/Mii/IStaticService.cs index 4d1f1e289..a7fc71c96 100644 --- a/Ryujinx.HLE/HOS/Services/Mii/IStaticService.cs +++ b/Ryujinx.HLE/HOS/Services/Mii/IStaticService.cs @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii _databaseImpl = DatabaseImpl.Instance; } - [CommandHipc(0)] + [CommandCmif(0)] // GetDatabaseService(u32 mii_key_code) -> object public ResultCode GetDatabaseService(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Mii/StaticService/IDatabaseService.cs b/Ryujinx.HLE/HOS/Services/Mii/StaticService/IDatabaseService.cs index dea32f62b..e95364be8 100644 --- a/Ryujinx.HLE/HOS/Services/Mii/StaticService/IDatabaseService.cs +++ b/Ryujinx.HLE/HOS/Services/Mii/StaticService/IDatabaseService.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService { abstract class IDatabaseService : IpcService { - [CommandHipc(0)] + [CommandCmif(0)] // IsUpdated(SourceFlag flag) -> bool public ResultCode IsUpdated(ServiceCtx context) { @@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // IsFullDatabase() -> bool public ResultCode IsFullDatabase(ServiceCtx context) { @@ -28,7 +28,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetCount(SourceFlag flag) -> u32 public ResultCode GetCount(ServiceCtx context) { @@ -39,7 +39,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // Get(SourceFlag flag) -> (s32 count, buffer) public ResultCode Get(ServiceCtx context) { @@ -60,7 +60,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(4)] + [CommandCmif(4)] // Get1(SourceFlag flag) -> (s32 count, buffer) public ResultCode Get1(ServiceCtx context) { @@ -81,7 +81,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(5)] + [CommandCmif(5)] // UpdateLatest(nn::mii::CharInfo old_char_info, SourceFlag flag) -> nn::mii::CharInfo public ResultCode UpdateLatest(ServiceCtx context) { @@ -95,7 +95,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(6)] + [CommandCmif(6)] // BuildRandom(Age age, Gender gender, Race race) -> nn::mii::CharInfo public ResultCode BuildRandom(ServiceCtx context) { @@ -110,7 +110,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(7)] + [CommandCmif(7)] // BuildDefault(u32 index) -> nn::mii::CharInfoRaw public ResultCode BuildDefault(ServiceCtx context) { @@ -123,7 +123,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(8)] + [CommandCmif(8)] // Get2(SourceFlag flag) -> (u32 count, buffer) public ResultCode Get2(ServiceCtx context) { @@ -144,7 +144,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(9)] + [CommandCmif(9)] // Get3(SourceFlag flag) -> (u32 count, buffer) public ResultCode Get3(ServiceCtx context) { @@ -165,7 +165,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(10)] + [CommandCmif(10)] // UpdateLatest1(nn::mii::StoreData old_store_data, SourceFlag flag) -> nn::mii::StoreData public ResultCode UpdateLatest1(ServiceCtx context) { @@ -179,7 +179,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(11)] + [CommandCmif(11)] // FindIndex(nn::mii::CreateId create_id, bool is_special) -> s32 public ResultCode FindIndex(ServiceCtx context) { @@ -193,7 +193,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(12)] + [CommandCmif(12)] // Move(nn::mii::CreateId create_id, s32 new_index) public ResultCode Move(ServiceCtx context) { @@ -203,7 +203,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return Move(createId, newIndex); } - [CommandHipc(13)] + [CommandCmif(13)] // AddOrReplace(nn::mii::StoreData store_data) public ResultCode AddOrReplace(ServiceCtx context) { @@ -212,7 +212,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return AddOrReplace(storeData); } - [CommandHipc(14)] + [CommandCmif(14)] // Delete(nn::mii::CreateId create_id) public ResultCode Delete(ServiceCtx context) { @@ -221,28 +221,28 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return Delete(createId); } - [CommandHipc(15)] + [CommandCmif(15)] // DestroyFile() public ResultCode DestroyFile(ServiceCtx context) { return DestroyFile(); } - [CommandHipc(16)] + [CommandCmif(16)] // DeleteFile() public ResultCode DeleteFile(ServiceCtx context) { return DeleteFile(); } - [CommandHipc(17)] + [CommandCmif(17)] // Format() public ResultCode Format(ServiceCtx context) { return Format(); } - [CommandHipc(18)] + [CommandCmif(18)] // Import(buffer) public ResultCode Import(ServiceCtx context) { @@ -251,7 +251,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return Import(data); } - [CommandHipc(19)] + [CommandCmif(19)] // Export() -> buffer public ResultCode Export(ServiceCtx context) { @@ -266,7 +266,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(20)] + [CommandCmif(20)] // IsBrokenDatabaseWithClearFlag() -> bool public ResultCode IsBrokenDatabaseWithClearFlag(ServiceCtx context) { @@ -277,7 +277,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(21)] + [CommandCmif(21)] // GetIndex(nn::mii::CharInfo char_info) -> s32 public ResultCode GetIndex(ServiceCtx context) { @@ -290,7 +290,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(22)] // 5.0.0+ + [CommandCmif(22)] // 5.0.0+ // SetInterfaceVersion(u32 version) public ResultCode SetInterfaceVersion(ServiceCtx context) { @@ -301,7 +301,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return ResultCode.Success; } - [CommandHipc(23)] // 5.0.0+ + [CommandCmif(23)] // 5.0.0+ // Convert(nn::mii::Ver3StoreData ver3_store_data) -> nn::mii::CharInfo public ResultCode Convert(ServiceCtx context) { @@ -314,7 +314,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(24)] // 7.0.0+ + [CommandCmif(24)] // 7.0.0+ // ConvertCoreDataToCharInfo(nn::mii::CoreData core_data) -> nn::mii::CharInfo public ResultCode ConvertCoreDataToCharInfo(ServiceCtx context) { @@ -327,7 +327,7 @@ namespace Ryujinx.HLE.HOS.Services.Mii.StaticService return result; } - [CommandHipc(25)] // 7.0.0+ + [CommandCmif(25)] // 7.0.0+ // ConvertCharInfoToCoreData(nn::mii::CharInfo char_info) -> nn::mii::CoreData public ResultCode ConvertCharInfoToCoreData(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs b/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs index bce521190..fac425553 100644 --- a/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs +++ b/Ryujinx.HLE/HOS/Services/Mm/IRequest.cs @@ -14,7 +14,7 @@ namespace Ryujinx.HLE.HOS.Services.Mm public IRequest(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // InitializeOld(u32, u32, u32) public ResultCode InitializeOld(ServiceCtx context) { @@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Mm return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // FinalizeOld(u32) public ResultCode FinalizeOld(ServiceCtx context) { @@ -45,7 +45,7 @@ namespace Ryujinx.HLE.HOS.Services.Mm return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // SetAndWaitOld(u32, u32, u32) public ResultCode SetAndWaitOld(ServiceCtx context) { @@ -63,7 +63,7 @@ namespace Ryujinx.HLE.HOS.Services.Mm return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetOld(u32) -> u32 public ResultCode GetOld(ServiceCtx context) { @@ -83,7 +83,7 @@ namespace Ryujinx.HLE.HOS.Services.Mm return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // Initialize(u32, u32, u32) -> u32 public ResultCode Initialize(ServiceCtx context) { @@ -100,7 +100,7 @@ namespace Ryujinx.HLE.HOS.Services.Mm return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // Finalize(u32) public ResultCode Finalize(ServiceCtx context) { @@ -116,7 +116,7 @@ namespace Ryujinx.HLE.HOS.Services.Mm return ResultCode.Success; } - [CommandHipc(6)] + [CommandCmif(6)] // SetAndWait(u32, u32, u32) public ResultCode SetAndWait(ServiceCtx context) { @@ -134,7 +134,7 @@ namespace Ryujinx.HLE.HOS.Services.Mm return ResultCode.Success; } - [CommandHipc(7)] + [CommandCmif(7)] // Get(u32) -> u32 public ResultCode Get(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Mnpp/IServiceForApplication.cs b/Ryujinx.HLE/HOS/Services/Mnpp/IServiceForApplication.cs index 8e52a94ef..c2a4345c6 100644 --- a/Ryujinx.HLE/HOS/Services/Mnpp/IServiceForApplication.cs +++ b/Ryujinx.HLE/HOS/Services/Mnpp/IServiceForApplication.cs @@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Services.Mnpp { public IServiceForApplication(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // Initialize(pid) public ResultCode Initialize(ServiceCtx context) { @@ -27,7 +27,7 @@ namespace Ryujinx.HLE.HOS.Services.Mnpp return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // SendRawTelemetryData(nn::account::Uid user_id, buffer title_id) public ResultCode SendRawTelemetryData(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ncm/Lr/ILocationResolverManager.cs b/Ryujinx.HLE/HOS/Services/Ncm/Lr/ILocationResolverManager.cs index 546c05679..318ad30e6 100644 --- a/Ryujinx.HLE/HOS/Services/Ncm/Lr/ILocationResolverManager.cs +++ b/Ryujinx.HLE/HOS/Services/Ncm/Lr/ILocationResolverManager.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr { public ILocationResolverManager(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // OpenLocationResolver() public ResultCode OpenLocationResolver(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ncm/Lr/LocationResolverManager/ILocationResolver.cs b/Ryujinx.HLE/HOS/Services/Ncm/Lr/LocationResolverManager/ILocationResolver.cs index d97bd009b..55b49bcec 100644 --- a/Ryujinx.HLE/HOS/Services/Ncm/Lr/LocationResolverManager/ILocationResolver.cs +++ b/Ryujinx.HLE/HOS/Services/Ncm/Lr/LocationResolverManager/ILocationResolver.cs @@ -16,7 +16,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager _storageId = storageId; } - [CommandHipc(0)] + [CommandCmif(0)] // ResolveProgramPath(u64 titleId) public ResultCode ResolveProgramPath(ServiceCtx context) { @@ -32,7 +32,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager } } - [CommandHipc(1)] + [CommandCmif(1)] // RedirectProgramPath(u64 titleId) public ResultCode RedirectProgramPath(ServiceCtx context) { @@ -43,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // ResolveApplicationControlPath(u64 titleId) public ResultCode ResolveApplicationControlPath(ServiceCtx context) { @@ -59,7 +59,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager } } - [CommandHipc(3)] + [CommandCmif(3)] // ResolveApplicationHtmlDocumentPath(u64 titleId) public ResultCode ResolveApplicationHtmlDocumentPath(ServiceCtx context) { @@ -75,7 +75,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager } } - [CommandHipc(4)] + [CommandCmif(4)] // ResolveDataPath(u64 titleId) public ResultCode ResolveDataPath(ServiceCtx context) { @@ -91,7 +91,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager } } - [CommandHipc(5)] + [CommandCmif(5)] // RedirectApplicationControlPath(u64 titleId) public ResultCode RedirectApplicationControlPath(ServiceCtx context) { @@ -102,7 +102,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager return ResultCode.Success; } - [CommandHipc(6)] + [CommandCmif(6)] // RedirectApplicationHtmlDocumentPath(u64 titleId) public ResultCode RedirectApplicationHtmlDocumentPath(ServiceCtx context) { @@ -113,7 +113,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager return ResultCode.Success; } - [CommandHipc(7)] + [CommandCmif(7)] // ResolveApplicationLegalInformationPath(u64 titleId) public ResultCode ResolveApplicationLegalInformationPath(ServiceCtx context) { @@ -129,7 +129,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager } } - [CommandHipc(8)] + [CommandCmif(8)] // RedirectApplicationLegalInformationPath(u64 titleId) public ResultCode RedirectApplicationLegalInformationPath(ServiceCtx context) { @@ -140,7 +140,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager return ResultCode.Success; } - [CommandHipc(9)] + [CommandCmif(9)] // Refresh() public ResultCode Refresh(ServiceCtx context) { @@ -149,7 +149,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager return ResultCode.Success; } - [CommandHipc(10)] + [CommandCmif(10)] // SetProgramNcaPath2(u64 titleId) public ResultCode SetProgramNcaPath2(ServiceCtx context) { @@ -160,7 +160,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // ClearLocationResolver2() public ResultCode ClearLocationResolver2(ServiceCtx context) { @@ -169,7 +169,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager return ResultCode.Success; } - [CommandHipc(12)] + [CommandCmif(12)] // DeleteProgramNcaPath(u64 titleId) public ResultCode DeleteProgramNcaPath(ServiceCtx context) { @@ -180,7 +180,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager return ResultCode.Success; } - [CommandHipc(13)] + [CommandCmif(13)] // DeleteControlNcaPath(u64 titleId) public ResultCode DeleteControlNcaPath(ServiceCtx context) { @@ -191,7 +191,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager return ResultCode.Success; } - [CommandHipc(14)] + [CommandCmif(14)] // DeleteDocHtmlNcaPath(u64 titleId) public ResultCode DeleteDocHtmlNcaPath(ServiceCtx context) { @@ -202,7 +202,7 @@ namespace Ryujinx.HLE.HOS.Services.Ncm.Lr.LocationResolverManager return ResultCode.Success; } - [CommandHipc(15)] + [CommandCmif(15)] // DeleteInfoHtmlNcaPath(u64 titleId) public ResultCode DeleteInfoHtmlNcaPath(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nfc/ISystemManager.cs b/Ryujinx.HLE/HOS/Services/Nfc/ISystemManager.cs index 9072ed83e..ef90b6ad8 100644 --- a/Ryujinx.HLE/HOS/Services/Nfc/ISystemManager.cs +++ b/Ryujinx.HLE/HOS/Services/Nfc/ISystemManager.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc { public ISystemManager(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // CreateSystemInterface() -> object public ResultCode CreateSystemInterface(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nfc/IUserManager.cs b/Ryujinx.HLE/HOS/Services/Nfc/IUserManager.cs index 5f0ccf14a..97959a62f 100644 --- a/Ryujinx.HLE/HOS/Services/Nfc/IUserManager.cs +++ b/Ryujinx.HLE/HOS/Services/Nfc/IUserManager.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc { public IUserManager(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // CreateUserInterface() -> object public ResultCode CreateUserInterface(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nfc/NfcManager/INfc.cs b/Ryujinx.HLE/HOS/Services/Nfc/NfcManager/INfc.cs index a1ae0b9c7..b091aabfc 100644 --- a/Ryujinx.HLE/HOS/Services/Nfc/NfcManager/INfc.cs +++ b/Ryujinx.HLE/HOS/Services/Nfc/NfcManager/INfc.cs @@ -13,8 +13,8 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.NfcManager _state = State.NonInitialized; } - [CommandHipc(0)] - [CommandHipc(400)] // 4.0.0+ + [CommandCmif(0)] + [CommandCmif(400)] // 4.0.0+ // Initialize(u64, u64, pid, buffer) public ResultCode Initialize(ServiceCtx context) { @@ -25,8 +25,8 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.NfcManager return ResultCode.Success; } - [CommandHipc(1)] - [CommandHipc(401)] // 4.0.0+ + [CommandCmif(1)] + [CommandCmif(401)] // 4.0.0+ // Finalize() public ResultCode Finalize(ServiceCtx context) { @@ -37,8 +37,8 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.NfcManager return ResultCode.Success; } - [CommandHipc(2)] - [CommandHipc(402)] // 4.0.0+ + [CommandCmif(2)] + [CommandCmif(402)] // 4.0.0+ // GetState() -> u32 public ResultCode GetState(ServiceCtx context) { @@ -47,8 +47,8 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.NfcManager return ResultCode.Success; } - [CommandHipc(3)] - [CommandHipc(403)] // 4.0.0+ + [CommandCmif(3)] + [CommandCmif(403)] // 4.0.0+ // IsNfcEnabled() -> b8 public ResultCode IsNfcEnabled(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/IDebugManager.cs b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/IDebugManager.cs index 2faf489c3..fc4544739 100644 --- a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/IDebugManager.cs +++ b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/IDebugManager.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp { public IAmManager(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // CreateDebugInterface() -> object public ResultCode CreateDebugInterface(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/ISystemManager.cs b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/ISystemManager.cs index ed4c7bbf2..3fcf7a87a 100644 --- a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/ISystemManager.cs +++ b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/ISystemManager.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp { public ISystemManager(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // CreateSystemInterface() -> object public ResultCode CreateSystemInterface(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/IUserManager.cs b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/IUserManager.cs index 09df720a6..93da84194 100644 --- a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/IUserManager.cs +++ b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/IUserManager.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp { public IUserManager(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // CreateUserInterface() -> object public ResultCode CreateUserInterface(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/INfp.cs b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/INfp.cs index a7f2dbb85..e25a2972a 100644 --- a/Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/INfp.cs +++ b/Ryujinx.HLE/HOS/Services/Nfc/Nfp/NfpManager/INfp.cs @@ -35,7 +35,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp _permissionLevel = permissionLevel; } - [CommandHipc(0)] + [CommandCmif(0)] // Initialize(u64, u64, pid, buffer) public ResultCode Initialize(ServiceCtx context) { @@ -69,7 +69,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // Finalize() public ResultCode Finalize(ServiceCtx context) { @@ -89,7 +89,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // ListDevices() -> (u32, buffer) public ResultCode ListDevices(ServiceCtx context) { @@ -125,7 +125,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // StartDetection(bytes<8, 4>) public ResultCode StartDetection(ServiceCtx context) { @@ -176,7 +176,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // StopDetection(bytes<8, 4>) public ResultCode StopDetection(ServiceCtx context) { @@ -207,7 +207,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // Mount(bytes<8, 4>, u32, u32) public ResultCode Mount(ServiceCtx context) { @@ -265,7 +265,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return resultCode; } - [CommandHipc(6)] + [CommandCmif(6)] // Unmount(bytes<8, 4>) public ResultCode Unmount(ServiceCtx context) { @@ -307,7 +307,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return resultCode; } - [CommandHipc(7)] + [CommandCmif(7)] // OpenApplicationArea(bytes<8, 4>, u32) public ResultCode OpenApplicationArea(ServiceCtx context) { @@ -363,7 +363,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return resultCode; } - [CommandHipc(8)] + [CommandCmif(8)] // GetApplicationArea(bytes<8, 4>) -> (u32, buffer) public ResultCode GetApplicationArea(ServiceCtx context) { @@ -431,7 +431,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.Success; } - [CommandHipc(9)] + [CommandCmif(9)] // SetApplicationArea(bytes<8, 4>, buffer) public ResultCode SetApplicationArea(ServiceCtx context) { @@ -485,7 +485,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return resultCode; } - [CommandHipc(10)] + [CommandCmif(10)] // Flush(bytes<8, 4>) public ResultCode Flush(ServiceCtx context) { @@ -501,14 +501,14 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // Restore(bytes<8, 4>) public ResultCode Restore(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(12)] + [CommandCmif(12)] // CreateApplicationArea(bytes<8, 4>, u32, buffer) public ResultCode CreateApplicationArea(ServiceCtx context) { @@ -571,7 +571,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return resultCode; } - [CommandHipc(13)] + [CommandCmif(13)] // GetTagInfo(bytes<8, 4>) -> buffer, 0x1a> public ResultCode GetTagInfo(ServiceCtx context) { @@ -647,7 +647,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return resultCode; } - [CommandHipc(14)] + [CommandCmif(14)] // GetRegisterInfo(bytes<8, 4>) -> buffer, 0x1a> public ResultCode GetRegisterInfo(ServiceCtx context) { @@ -710,7 +710,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return resultCode; } - [CommandHipc(15)] + [CommandCmif(15)] // GetCommonInfo(bytes<8, 4>) -> buffer, 0x1a> public ResultCode GetCommonInfo(ServiceCtx context) { @@ -770,7 +770,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return resultCode; } - [CommandHipc(16)] + [CommandCmif(16)] // GetModelInfo(bytes<8, 4>) -> buffer, 0x1a> public ResultCode GetModelInfo(ServiceCtx context) { @@ -839,7 +839,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return resultCode; } - [CommandHipc(17)] + [CommandCmif(17)] // AttachActivateEvent(bytes<8, 4>) -> handle public ResultCode AttachActivateEvent(ServiceCtx context) { @@ -865,7 +865,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.DeviceNotFound; } - [CommandHipc(18)] + [CommandCmif(18)] // AttachDeactivateEvent(bytes<8, 4>) -> handle public ResultCode AttachDeactivateEvent(ServiceCtx context) { @@ -891,7 +891,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.DeviceNotFound; } - [CommandHipc(19)] + [CommandCmif(19)] // GetState() -> u32 public ResultCode GetState(ServiceCtx context) { @@ -900,7 +900,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.Success; } - [CommandHipc(20)] + [CommandCmif(20)] // GetDeviceState(bytes<8, 4>) -> u32 public ResultCode GetDeviceState(ServiceCtx context) { @@ -926,7 +926,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.DeviceNotFound; } - [CommandHipc(21)] + [CommandCmif(21)] // GetNpadId(bytes<8, 4>) -> u32 public ResultCode GetNpadId(ServiceCtx context) { @@ -945,7 +945,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.DeviceNotFound; } - [CommandHipc(22)] + [CommandCmif(22)] // GetApplicationAreaSize() -> u32 public ResultCode GetApplicationAreaSize(ServiceCtx context) { @@ -954,7 +954,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.Success; } - [CommandHipc(23)] // 3.0.0+ + [CommandCmif(23)] // 3.0.0+ // AttachAvailabilityChangeEvent() -> handle public ResultCode AttachAvailabilityChangeEvent(ServiceCtx context) { @@ -970,14 +970,14 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.Nfp return ResultCode.Success; } - [CommandHipc(24)] // 3.0.0+ + [CommandCmif(24)] // 3.0.0+ // RecreateApplicationArea(bytes<8, 4>, u32, buffer) public ResultCode RecreateApplicationArea(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(102)] + [CommandCmif(102)] // GetRegisterInfo2(bytes<8, 4>) -> buffer, 0x1a> public ResultCode GetRegisterInfo2(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ngct/IService.cs b/Ryujinx.HLE/HOS/Services/Ngct/IService.cs index 05e37db0f..eacf35f32 100644 --- a/Ryujinx.HLE/HOS/Services/Ngct/IService.cs +++ b/Ryujinx.HLE/HOS/Services/Ngct/IService.cs @@ -5,14 +5,14 @@ { public IService(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // Match(buffer) -> b8 public ResultCode Match(ServiceCtx context) { return NgctServer.Match(context); } - [CommandHipc(1)] + [CommandCmif(1)] // Filter(buffer) -> buffer public ResultCode Filter(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ngct/IServiceWithManagementApi.cs b/Ryujinx.HLE/HOS/Services/Ngct/IServiceWithManagementApi.cs index 371bec8b1..5ad056bab 100644 --- a/Ryujinx.HLE/HOS/Services/Ngct/IServiceWithManagementApi.cs +++ b/Ryujinx.HLE/HOS/Services/Ngct/IServiceWithManagementApi.cs @@ -5,14 +5,14 @@ { public IServiceWithManagementApi(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // Match(buffer) -> b8 public ResultCode Match(ServiceCtx context) { return NgctServer.Match(context); } - [CommandHipc(1)] + [CommandCmif(1)] // Filter(buffer) -> buffer public ResultCode Filter(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs b/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs index 10ee1b834..d6a4a29fb 100644 --- a/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs +++ b/Ryujinx.HLE/HOS/Services/Nifm/IStaticService.cs @@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm { public IStaticService(ServiceCtx context) { } - [CommandHipc(4)] + [CommandCmif(4)] // CreateGeneralServiceOld() -> object public ResultCode CreateGeneralServiceOld(ServiceCtx context) { @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm return ResultCode.Success; } - [CommandHipc(5)] // 3.0.0+ + [CommandCmif(5)] // 3.0.0+ // CreateGeneralService(u64, pid) -> object public ResultCode CreateGeneralService(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs b/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs index bc70750d9..fd7110408 100644 --- a/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs +++ b/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IGeneralService.cs @@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService GeneralServiceManager.Add(_generalServiceDetail); } - [CommandHipc(1)] + [CommandCmif(1)] // GetClientId() -> buffer public ResultCode GetClientId(ServiceCtx context) { @@ -43,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // CreateRequest(u32 version) -> object public ResultCode CreateRequest(ServiceCtx context) { @@ -59,7 +59,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // GetCurrentNetworkProfile() -> buffer public ResultCode GetCurrentNetworkProfile(ServiceCtx context) { @@ -91,7 +91,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(12)] + [CommandCmif(12)] // GetCurrentIpAddress() -> nn::nifm::IpV4Address public ResultCode GetCurrentIpAddress(ServiceCtx context) { @@ -109,7 +109,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(15)] + [CommandCmif(15)] // GetCurrentIpConfigInfo() -> (nn::nifm::IpAddressSetting, nn::nifm::DnsSetting) public ResultCode GetCurrentIpConfigInfo(ServiceCtx context) { @@ -128,7 +128,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(18)] + [CommandCmif(18)] // GetInternetConnectionStatus() -> nn::nifm::detail::sf::InternetConnectionStatus public ResultCode GetInternetConnectionStatus(ServiceCtx context) { @@ -149,7 +149,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(21)] + [CommandCmif(21)] // IsAnyInternetRequestAccepted(buffer) -> bool public ResultCode IsAnyInternetRequestAccepted(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IRequest.cs b/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IRequest.cs index 88757bee7..87aad30be 100644 --- a/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IRequest.cs +++ b/Ryujinx.HLE/HOS/Services/Nifm/StaticService/IRequest.cs @@ -31,7 +31,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService _version = version; } - [CommandHipc(0)] + [CommandCmif(0)] // GetRequestState() -> u32 public ResultCode GetRequestState(ServiceCtx context) { @@ -46,7 +46,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetResult() public ResultCode GetResult(ServiceCtx context) { @@ -60,7 +60,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetSystemEventReadableHandles() -> (handle, handle) public ResultCode GetSystemEventReadableHandles(ServiceCtx context) { @@ -85,7 +85,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // Cancel() public ResultCode Cancel(ServiceCtx context) { @@ -94,7 +94,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // Submit() public ResultCode Submit(ServiceCtx context) { @@ -103,7 +103,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // SetConnectionConfirmationOption(i8) public ResultCode SetConnectionConfirmationOption(ServiceCtx context) { @@ -112,7 +112,7 @@ namespace Ryujinx.HLE.HOS.Services.Nifm.StaticService return ResultCode.Success; } - [CommandHipc(21)] + [CommandCmif(21)] // GetAppletInfo(u32) -> (u32, u32, u32, buffer) public ResultCode GetAppletInfo(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServer.cs b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServer.cs index bada642c3..ab17871f8 100644 --- a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServer.cs +++ b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServer.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Nim.ShopServiceAccessServerInterface { public IShopServiceAccessServer() { } - [CommandHipc(0)] + [CommandCmif(0)] // CreateAccessorInterface(u8) -> object public ResultCode CreateAccessorInterface(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServerInterface.cs b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServerInterface.cs index 342f1ba1b..950004fa4 100644 --- a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServerInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessServerInterface.cs @@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Services.Nim { public IShopServiceAccessServerInterface(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // CreateServerInterface(pid, handle, u64) -> object public ResultCode CreateServerInterface(ServiceCtx context) { @@ -24,7 +24,7 @@ namespace Ryujinx.HLE.HOS.Services.Nim return ResultCode.Success; } - [CommandHipc(4)] // 10.0.0+ + [CommandCmif(4)] // 10.0.0+ // IsLargeResourceAvailable(pid) -> b8 public ResultCode IsLargeResourceAvailable(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessor.cs b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessor.cs index d6843d12e..3c0136faf 100644 --- a/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessor.cs +++ b/Ryujinx.HLE/HOS/Services/Nim/IShopServiceAccessor.cs @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Nim.ShopServiceAccessServerInterface.ShopServ _event = new KEvent(system.KernelContext); } - [CommandHipc(0)] + [CommandCmif(0)] // CreateAsyncInterface(u64) -> (handle, object) public ResultCode CreateAsyncInterface(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nim/Ntc/IStaticService.cs b/Ryujinx.HLE/HOS/Services/Nim/Ntc/IStaticService.cs index 1a4100ee3..4a63615bc 100644 --- a/Ryujinx.HLE/HOS/Services/Nim/Ntc/IStaticService.cs +++ b/Ryujinx.HLE/HOS/Services/Nim/Ntc/IStaticService.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Nim.Ntc { public IStaticService(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // OpenEnsureNetworkClockAvailabilityService(u64) -> object public ResultCode CreateAsyncInterface(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nim/Ntc/StaticService/IEnsureNetworkClockAvailabilityService.cs b/Ryujinx.HLE/HOS/Services/Nim/Ntc/StaticService/IEnsureNetworkClockAvailabilityService.cs index 3b533f0ff..82d0b5a80 100644 --- a/Ryujinx.HLE/HOS/Services/Nim/Ntc/StaticService/IEnsureNetworkClockAvailabilityService.cs +++ b/Ryujinx.HLE/HOS/Services/Nim/Ntc/StaticService/IEnsureNetworkClockAvailabilityService.cs @@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Nim.Ntc.StaticService // autonomic_correction_immediate_try_count_max, autonomic_correction_immediate_try_interval_milliseconds } - [CommandHipc(0)] + [CommandCmif(0)] // StartTask() public ResultCode StartTask(ServiceCtx context) { @@ -39,7 +39,7 @@ namespace Ryujinx.HLE.HOS.Services.Nim.Ntc.StaticService return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetFinishNotificationEvent() -> handle public ResultCode GetFinishNotificationEvent(ServiceCtx context) { @@ -53,14 +53,14 @@ namespace Ryujinx.HLE.HOS.Services.Nim.Ntc.StaticService return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetResult() public ResultCode GetResult(ServiceCtx context) { return _taskResultCode; } - [CommandHipc(3)] + [CommandCmif(3)] // Cancel() public ResultCode Cancel(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ns/Aoc/IAddOnContentManager.cs b/Ryujinx.HLE/HOS/Services/Ns/Aoc/IAddOnContentManager.cs index b8f9e3b97..b4b5bb1f5 100644 --- a/Ryujinx.HLE/HOS/Services/Ns/Aoc/IAddOnContentManager.cs +++ b/Ryujinx.HLE/HOS/Services/Ns/Aoc/IAddOnContentManager.cs @@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc _addOnContentListChangedEvent = new KEvent(context.Device.System.KernelContext); } - [CommandHipc(0)] // 1.0.0-6.2.0 + [CommandCmif(0)] // 1.0.0-6.2.0 // CountAddOnContentByApplicationId(u64 title_id) -> u32 public ResultCode CountAddOnContentByApplicationId(ServiceCtx context) { @@ -31,7 +31,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return CountAddOnContentImpl(context, titleId); } - [CommandHipc(1)] // 1.0.0-6.2.0 + [CommandCmif(1)] // 1.0.0-6.2.0 // ListAddOnContentByApplicationId(u64 title_id, u32 start_index, u32 buffer_size) -> (u32 count, buffer) public ResultCode ListAddOnContentByApplicationId(ServiceCtx context) { @@ -40,7 +40,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return ListAddContentImpl(context, titleId); } - [CommandHipc(2)] + [CommandCmif(2)] // CountAddOnContent(pid) -> u32 public ResultCode CountAddOnContent(ServiceCtx context) { @@ -51,7 +51,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return CountAddOnContentImpl(context, context.Device.Processes.ActiveApplication.ProgramId); } - [CommandHipc(3)] + [CommandCmif(3)] // ListAddOnContent(u32 start_index, u32 buffer_size, pid) -> (u32 count, buffer) public ResultCode ListAddOnContent(ServiceCtx context) { @@ -62,7 +62,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return ListAddContentImpl(context, context.Device.Processes.ActiveApplication.ProgramId); } - [CommandHipc(4)] // 1.0.0-6.2.0 + [CommandCmif(4)] // 1.0.0-6.2.0 // GetAddOnContentBaseIdByApplicationId(u64 title_id) -> u64 public ResultCode GetAddOnContentBaseIdByApplicationId(ServiceCtx context) { @@ -71,7 +71,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return GetAddOnContentBaseIdImpl(context, titleId); } - [CommandHipc(5)] + [CommandCmif(5)] // GetAddOnContentBaseId(pid) -> u64 public ResultCode GetAddOnContentBaseId(ServiceCtx context) { @@ -82,7 +82,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return GetAddOnContentBaseIdImpl(context, context.Device.Processes.ActiveApplication.ProgramId); } - [CommandHipc(6)] // 1.0.0-6.2.0 + [CommandCmif(6)] // 1.0.0-6.2.0 // PrepareAddOnContentByApplicationId(u64 title_id, u32 index) public ResultCode PrepareAddOnContentByApplicationId(ServiceCtx context) { @@ -91,7 +91,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return PrepareAddOnContentImpl(context, titleId); } - [CommandHipc(7)] + [CommandCmif(7)] // PrepareAddOnContent(u32 index, pid) public ResultCode PrepareAddOnContent(ServiceCtx context) { @@ -102,14 +102,14 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return PrepareAddOnContentImpl(context, context.Device.Processes.ActiveApplication.ProgramId); } - [CommandHipc(8)] // 4.0.0+ + [CommandCmif(8)] // 4.0.0+ // GetAddOnContentListChangedEvent() -> handle public ResultCode GetAddOnContentListChangedEvent(ServiceCtx context) { return GetAddOnContentListChangedEventImpl(context); } - [CommandHipc(9)] // 10.0.0+ + [CommandCmif(9)] // 10.0.0+ // GetAddOnContentLostErrorCode() -> u64 public ResultCode GetAddOnContentLostErrorCode(ServiceCtx context) { @@ -119,7 +119,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return ResultCode.Success; } - [CommandHipc(10)] // 11.0.0+ + [CommandCmif(10)] // 11.0.0+ // GetAddOnContentListChangedEventWithProcessId(pid) -> handle public ResultCode GetAddOnContentListChangedEventWithProcessId(ServiceCtx context) { @@ -138,7 +138,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return GetAddOnContentListChangedEventImpl(context); } - [CommandHipc(11)] // 13.0.0+ + [CommandCmif(11)] // 13.0.0+ // NotifyMountAddOnContent(pid, u64 title_id) public ResultCode NotifyMountAddOnContent(ServiceCtx context) { @@ -156,7 +156,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return ResultCode.Success; } - [CommandHipc(12)] // 13.0.0+ + [CommandCmif(12)] // 13.0.0+ // NotifyUnmountAddOnContent(pid, u64 title_id) public ResultCode NotifyUnmountAddOnContent(ServiceCtx context) { @@ -171,7 +171,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return ResultCode.Success; } - [CommandHipc(50)] // 13.0.0+ + [CommandCmif(50)] // 13.0.0+ // CheckAddOnContentMountStatus(pid) public ResultCode CheckAddOnContentMountStatus(ServiceCtx context) { @@ -185,7 +185,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return ResultCode.Success; } - [CommandHipc(100)] // 7.0.0+ + [CommandCmif(100)] // 7.0.0+ // CreateEcPurchasedEventManager() -> object public ResultCode CreateEcPurchasedEventManager(ServiceCtx context) { @@ -194,7 +194,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return ResultCode.Success; } - [CommandHipc(101)] // 9.0.0+ + [CommandCmif(101)] // 9.0.0+ // CreatePermanentEcPurchasedEventManager() -> object public ResultCode CreatePermanentEcPurchasedEventManager(ServiceCtx context) { @@ -205,7 +205,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return ResultCode.Success; } - [CommandHipc(110)] // 12.0.0+ + [CommandCmif(110)] // 12.0.0+ // CreateContentsServiceManager() -> object public ResultCode CreateContentsServiceManager(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ns/Aoc/IPurchaseEventManager.cs b/Ryujinx.HLE/HOS/Services/Ns/Aoc/IPurchaseEventManager.cs index 5ec43a3f5..1673fafc4 100644 --- a/Ryujinx.HLE/HOS/Services/Ns/Aoc/IPurchaseEventManager.cs +++ b/Ryujinx.HLE/HOS/Services/Ns/Aoc/IPurchaseEventManager.cs @@ -15,7 +15,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc _purchasedEvent = new KEvent(system.KernelContext); } - [CommandHipc(0)] + [CommandCmif(0)] // SetDefaultDeliveryTarget(pid, buffer unknown) public ResultCode SetDefaultDeliveryTarget(ServiceCtx context) { @@ -34,7 +34,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetPurchasedEventReadableHandle() -> handle public ResultCode GetPurchasedEventReadableHandle(ServiceCtx context) { @@ -48,7 +48,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns.Aoc return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // PopPurchasedProductInfo(nn::ec::detail::PurchasedProductInfo) public ResultCode PopPurchasedProductInfo(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ns/IApplicationManagerInterface.cs b/Ryujinx.HLE/HOS/Services/Ns/IApplicationManagerInterface.cs index 249343d79..06e911f8d 100644 --- a/Ryujinx.HLE/HOS/Services/Ns/IApplicationManagerInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Ns/IApplicationManagerInterface.cs @@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns { public IApplicationManagerInterface(ServiceCtx context) { } - [CommandHipc(400)] + [CommandCmif(400)] // GetApplicationControlData(u8, u64) -> (unknown<4>, buffer) public ResultCode GetApplicationControlData(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ns/IReadOnlyApplicationControlDataInterface.cs b/Ryujinx.HLE/HOS/Services/Ns/IReadOnlyApplicationControlDataInterface.cs index 8f6acc1c6..aa37a1e7f 100644 --- a/Ryujinx.HLE/HOS/Services/Ns/IReadOnlyApplicationControlDataInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Ns/IReadOnlyApplicationControlDataInterface.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns { public IReadOnlyApplicationControlDataInterface(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // GetApplicationControlData(u8, u64) -> (unknown<4>, buffer) public ResultCode GetApplicationControlData(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ns/IServiceGetterInterface.cs b/Ryujinx.HLE/HOS/Services/Ns/IServiceGetterInterface.cs index 1d7fa2c33..886bffdd3 100644 --- a/Ryujinx.HLE/HOS/Services/Ns/IServiceGetterInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Ns/IServiceGetterInterface.cs @@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns { public IServiceGetterInterface(ServiceCtx context) { } - [CommandHipc(7996)] + [CommandCmif(7996)] // GetApplicationManagerInterface() -> object public ResultCode GetApplicationManagerInterface(ServiceCtx context) { @@ -18,7 +18,7 @@ namespace Ryujinx.HLE.HOS.Services.Ns return ResultCode.Success; } - [CommandHipc(7989)] + [CommandCmif(7989)] // GetReadOnlyApplicationControlDataInterface() -> object public ResultCode GetReadOnlyApplicationControlDataInterface(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs b/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs index 32b429a6c..1d075d43f 100644 --- a/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs +++ b/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs @@ -235,7 +235,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv } } - [CommandHipc(0)] + [CommandCmif(0)] // Open(buffer path) -> (s32 fd, u32 error_code) public ResultCode Open(ServiceCtx context) { @@ -258,7 +258,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // Ioctl(s32 fd, u32 ioctl_cmd, buffer in_args) -> (u32 error_code, buffer out_args) public ResultCode Ioctl(ServiceCtx context) { @@ -299,7 +299,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // Close(s32 fd) -> u32 error_code public ResultCode Close(ServiceCtx context) { @@ -324,7 +324,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // Initialize(u32 transfer_memory_size, handle current_process, handle transfer_memory) -> u32 error_code public ResultCode Initialize(ServiceCtx context) { @@ -349,7 +349,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // QueryEvent(s32 fd, u32 event_id) -> (u32, handle) public ResultCode QueryEvent(ServiceCtx context) { @@ -385,7 +385,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // MapSharedMemory(s32 fd, u32 argument, handle) -> u32 error_code public ResultCode MapSharedMemory(ServiceCtx context) { @@ -410,7 +410,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv return ResultCode.Success; } - [CommandHipc(6)] + [CommandCmif(6)] // GetStatus() -> (unknown<0x20>, u32 error_code) public ResultCode GetStatus(ServiceCtx context) { @@ -439,14 +439,14 @@ namespace Ryujinx.HLE.HOS.Services.Nv return ResultCode.Success; } - [CommandHipc(7)] + [CommandCmif(7)] // ForceSetClientPid(u64) -> u32 error_code public ResultCode ForceSetClientPid(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(8)] + [CommandCmif(8)] // SetClientPID(u64, pid) -> u32 error_code public ResultCode SetClientPid(ServiceCtx context) { @@ -457,7 +457,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv return ResultCode.Success; } - [CommandHipc(9)] + [CommandCmif(9)] // DumpGraphicsMemoryInfo() public ResultCode DumpGraphicsMemoryInfo(ServiceCtx context) { @@ -466,14 +466,14 @@ namespace Ryujinx.HLE.HOS.Services.Nv return ResultCode.Success; } - [CommandHipc(10)] // 3.0.0+ + [CommandCmif(10)] // 3.0.0+ // InitializeDevtools(u32, handle) -> u32 error_code; public ResultCode InitializeDevtools(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(11)] // 3.0.0+ + [CommandCmif(11)] // 3.0.0+ // Ioctl2(s32 fd, u32 ioctl_cmd, buffer in_args, buffer inline_in_buffer) -> (u32 error_code, buffer out_args) public ResultCode Ioctl2(ServiceCtx context) { @@ -522,7 +522,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv return ResultCode.Success; } - [CommandHipc(12)] // 3.0.0+ + [CommandCmif(12)] // 3.0.0+ // Ioctl3(s32 fd, u32 ioctl_cmd, buffer in_args) -> (u32 error_code, buffer out_args, buffer inline_out_buffer) public ResultCode Ioctl3(ServiceCtx context) { @@ -572,7 +572,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv return ResultCode.Success; } - [CommandHipc(13)] // 3.0.0+ + [CommandCmif(13)] // 3.0.0+ // FinishInitialize(unknown<8>) public ResultCode FinishInitialize(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Olsc/IOlscServiceForApplication.cs b/Ryujinx.HLE/HOS/Services/Olsc/IOlscServiceForApplication.cs index 013e90641..89fe0c3a2 100644 --- a/Ryujinx.HLE/HOS/Services/Olsc/IOlscServiceForApplication.cs +++ b/Ryujinx.HLE/HOS/Services/Olsc/IOlscServiceForApplication.cs @@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.Olsc public IOlscServiceForApplication(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // Initialize(pid) public ResultCode Initialize(ServiceCtx context) { @@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Olsc return ResultCode.Success; } - [CommandHipc(13)] + [CommandCmif(13)] // GetSaveDataBackupSetting(nn::account::Uid) -> u8 public ResultCode GetSaveDataBackupSetting(ServiceCtx context) { @@ -61,7 +61,7 @@ namespace Ryujinx.HLE.HOS.Services.Olsc return ResultCode.Success; } - [CommandHipc(14)] + [CommandCmif(14)] // SetSaveDataBackupSettingEnabled(nn::account::Uid, bool) public ResultCode SetSaveDataBackupSettingEnabled(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlServiceFactory.cs b/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlServiceFactory.cs index f5be0cb42..990aef092 100644 --- a/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlServiceFactory.cs +++ b/Ryujinx.HLE/HOS/Services/Pctl/IParentalControlServiceFactory.cs @@ -15,7 +15,7 @@ namespace Ryujinx.HLE.HOS.Services.Pctl _permissionFlag = permissionFlag; } - [CommandHipc(0)] + [CommandCmif(0)] // CreateService(u64, pid) -> object public ResultCode CreateService(ServiceCtx context) { @@ -26,7 +26,7 @@ namespace Ryujinx.HLE.HOS.Services.Pctl return ResultCode.Success; } - [CommandHipc(1)] // 4.0.0+ + [CommandCmif(1)] // 4.0.0+ // CreateServiceWithoutInitialize(u64, pid) -> object public ResultCode CreateServiceWithoutInitialize(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Pctl/ParentalControlServiceFactory/IParentalControlService.cs b/Ryujinx.HLE/HOS/Services/Pctl/ParentalControlServiceFactory/IParentalControlService.cs index 02964749c..594ee4e0e 100644 --- a/Ryujinx.HLE/HOS/Services/Pctl/ParentalControlServiceFactory/IParentalControlService.cs +++ b/Ryujinx.HLE/HOS/Services/Pctl/ParentalControlServiceFactory/IParentalControlService.cs @@ -34,7 +34,7 @@ namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory } } - [CommandHipc(1)] // 4.0.0+ + [CommandCmif(1)] // 4.0.0+ // Initialize() public ResultCode Initialize(ServiceCtx context) { @@ -79,7 +79,7 @@ namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory return resultCode; } - [CommandHipc(1001)] + [CommandCmif(1001)] // CheckFreeCommunicationPermission() public ResultCode CheckFreeCommunicationPermission(ServiceCtx context) { @@ -98,7 +98,7 @@ namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory return ResultCode.Success; } - [CommandHipc(1017)] // 10.0.0+ + [CommandCmif(1017)] // 10.0.0+ // EndFreeCommunication() public ResultCode EndFreeCommunication(ServiceCtx context) { @@ -107,14 +107,14 @@ namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory return ResultCode.Success; } - [CommandHipc(1013)] // 4.0.0+ + [CommandCmif(1013)] // 4.0.0+ // ConfirmStereoVisionPermission() public ResultCode ConfirmStereoVisionPermission(ServiceCtx context) { return IsStereoVisionPermittedImpl(); } - [CommandHipc(1018)] + [CommandCmif(1018)] // IsFreeCommunicationAvailable() public ResultCode IsFreeCommunicationAvailable(ServiceCtx context) { @@ -131,7 +131,7 @@ namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory return ResultCode.Success; } - [CommandHipc(1031)] + [CommandCmif(1031)] // IsRestrictionEnabled() -> b8 public ResultCode IsRestrictionEnabled(ServiceCtx context) { @@ -145,7 +145,7 @@ namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory return ResultCode.Success; } - [CommandHipc(1061)] // 4.0.0+ + [CommandCmif(1061)] // 4.0.0+ // ConfirmStereoVisionRestrictionConfigurable() public ResultCode ConfirmStereoVisionRestrictionConfigurable(ServiceCtx context) { @@ -164,7 +164,7 @@ namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory } } - [CommandHipc(1062)] // 4.0.0+ + [CommandCmif(1062)] // 4.0.0+ // GetStereoVisionRestriction() -> bool public ResultCode GetStereoVisionRestriction(ServiceCtx context) { @@ -185,7 +185,7 @@ namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory return ResultCode.Success; } - [CommandHipc(1063)] // 4.0.0+ + [CommandCmif(1063)] // 4.0.0+ // SetStereoVisionRestriction(bool) public ResultCode SetStereoVisionRestriction(ServiceCtx context) { @@ -209,14 +209,14 @@ namespace Ryujinx.HLE.HOS.Services.Pctl.ParentalControlServiceFactory return ResultCode.Success; } - [CommandHipc(1064)] // 5.0.0+ + [CommandCmif(1064)] // 5.0.0+ // ResetConfirmedStereoVisionPermission() public ResultCode ResetConfirmedStereoVisionPermission(ServiceCtx context) { return ResultCode.Success; } - [CommandHipc(1065)] // 5.0.0+ + [CommandCmif(1065)] // 5.0.0+ // IsStereoVisionPermitted() -> bool public ResultCode IsStereoVisionPermitted(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Pcv/Bpc/IRtcManager.cs b/Ryujinx.HLE/HOS/Services/Pcv/Bpc/IRtcManager.cs index 6e1e9e6d6..e185c4787 100644 --- a/Ryujinx.HLE/HOS/Services/Pcv/Bpc/IRtcManager.cs +++ b/Ryujinx.HLE/HOS/Services/Pcv/Bpc/IRtcManager.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Pcv.Bpc { public IRtcManager(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // GetRtcTime() -> u64 public ResultCode GetRtcTime(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Pcv/Clkrst/ClkrstManager/IClkrstSession.cs b/Ryujinx.HLE/HOS/Services/Pcv/Clkrst/ClkrstManager/IClkrstSession.cs index 890c9ac97..b81e7fee0 100644 --- a/Ryujinx.HLE/HOS/Services/Pcv/Clkrst/ClkrstManager/IClkrstSession.cs +++ b/Ryujinx.HLE/HOS/Services/Pcv/Clkrst/ClkrstManager/IClkrstSession.cs @@ -27,7 +27,7 @@ namespace Ryujinx.HLE.HOS.Services.Pcv.Clkrst.ClkrstManager _unknown = unknown; } - [CommandHipc(7)] + [CommandCmif(7)] // SetClockRate(u32 hz) public ResultCode SetClockRate(ServiceCtx context) { @@ -43,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Pcv.Clkrst.ClkrstManager return ResultCode.Success; } - [CommandHipc(8)] + [CommandCmif(8)] // GetClockRate() -> u32 hz public ResultCode GetClockRate(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Pcv/Clkrst/IClkrstManager.cs b/Ryujinx.HLE/HOS/Services/Pcv/Clkrst/IClkrstManager.cs index 94ab49cac..4ba2f0945 100644 --- a/Ryujinx.HLE/HOS/Services/Pcv/Clkrst/IClkrstManager.cs +++ b/Ryujinx.HLE/HOS/Services/Pcv/Clkrst/IClkrstManager.cs @@ -14,7 +14,7 @@ namespace Ryujinx.HLE.HOS.Services.Pcv.Clkrst public IClkrstManager(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // OpenSession(u32 device_code, u32 unk) -> object public ResultCode OpenSession(ServiceCtx context) { @@ -28,7 +28,7 @@ namespace Ryujinx.HLE.HOS.Services.Pcv.Clkrst return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // GetModuleStateTableEvent() -> handle public ResultCode GetModuleStateTableEvent(ServiceCtx context) { @@ -45,7 +45,7 @@ namespace Ryujinx.HLE.HOS.Services.Pcv.Clkrst return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // GetModuleStateTableMaxCount() -> u32 max_count public ResultCode GetModuleStateTableMaxCount(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Pm/IDebugMonitorInterface.cs b/Ryujinx.HLE/HOS/Services/Pm/IDebugMonitorInterface.cs index 8d4934fab..cce2967a7 100644 --- a/Ryujinx.HLE/HOS/Services/Pm/IDebugMonitorInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Pm/IDebugMonitorInterface.cs @@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Services.Pm { public IDebugMonitorInterface(ServiceCtx context) { } - [CommandHipc(4)] + [CommandCmif(4)] // GetProgramId() -> sf::Out out_process_id public ResultCode GetApplicationProcessId(ServiceCtx context) { @@ -28,7 +28,7 @@ namespace Ryujinx.HLE.HOS.Services.Pm return ResultCode.ProcessNotFound; } - [CommandHipc(65000)] + [CommandCmif(65000)] // AtmosphereGetProcessInfo(os::ProcessId process_id) -> sf::OutCopyHandle out_process_handle, sf::Out out_loc, sf::Out out_status public ResultCode GetProcessInfo(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Pm/IInformationInterface.cs b/Ryujinx.HLE/HOS/Services/Pm/IInformationInterface.cs index e3ce6d2af..b3b5595fd 100644 --- a/Ryujinx.HLE/HOS/Services/Pm/IInformationInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Pm/IInformationInterface.cs @@ -1,5 +1,4 @@ -using Ryujinx.HLE.HOS.Kernel; -using Ryujinx.HLE.HOS.Kernel.Process; +using Ryujinx.HLE.HOS.Kernel.Process; namespace Ryujinx.HLE.HOS.Services.Pm { @@ -8,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Pm { public IInformationInterface(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // GetProgramId(os::ProcessId process_id) -> sf::Out out public ResultCode GetProgramId(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Pm/IShellInterface.cs b/Ryujinx.HLE/HOS/Services/Pm/IShellInterface.cs index e59b02d81..962023264 100644 --- a/Ryujinx.HLE/HOS/Services/Pm/IShellInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Pm/IShellInterface.cs @@ -5,7 +5,7 @@ { public IShellInterface(ServiceCtx context) { } - [CommandHipc(6)] + [CommandCmif(6)] // GetApplicationPid() -> u64 public ResultCode GetApplicationPid(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ptm/Psm/IPsmServer.cs b/Ryujinx.HLE/HOS/Services/Ptm/Psm/IPsmServer.cs index 96a503d41..4e3d3e8e2 100644 --- a/Ryujinx.HLE/HOS/Services/Ptm/Psm/IPsmServer.cs +++ b/Ryujinx.HLE/HOS/Services/Ptm/Psm/IPsmServer.cs @@ -7,7 +7,7 @@ namespace Ryujinx.HLE.HOS.Services.Ptm.Psm { public IPsmServer(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // GetBatteryChargePercentage() -> u32 public static ResultCode GetBatteryChargePercentage(ServiceCtx context) { @@ -20,7 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Ptm.Psm return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetChargerType() -> u32 public static ResultCode GetChargerType(ServiceCtx context) { @@ -33,7 +33,7 @@ namespace Ryujinx.HLE.HOS.Services.Ptm.Psm return ResultCode.Success; } - [CommandHipc(7)] + [CommandCmif(7)] // OpenSession() -> IPsmSession public ResultCode OpenSession(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ptm/Psm/IPsmSession.cs b/Ryujinx.HLE/HOS/Services/Ptm/Psm/IPsmSession.cs index 9b4e996d9..5d11f227a 100644 --- a/Ryujinx.HLE/HOS/Services/Ptm/Psm/IPsmSession.cs +++ b/Ryujinx.HLE/HOS/Services/Ptm/Psm/IPsmSession.cs @@ -16,7 +16,7 @@ namespace Ryujinx.HLE.HOS.Services.Ptm.Psm _stateChangeEventHandle = -1; } - [CommandHipc(0)] + [CommandCmif(0)] // BindStateChangeEvent() -> KObject public ResultCode BindStateChangeEvent(ServiceCtx context) { @@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Services.Ptm.Psm return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // UnbindStateChangeEvent() public ResultCode UnbindStateChangeEvent(ServiceCtx context) { @@ -52,7 +52,7 @@ namespace Ryujinx.HLE.HOS.Services.Ptm.Psm return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // SetChargerTypeChangeEventEnabled(u8) public ResultCode SetChargerTypeChangeEventEnabled(ServiceCtx context) { @@ -63,7 +63,7 @@ namespace Ryujinx.HLE.HOS.Services.Ptm.Psm return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // SetPowerSupplyChangeEventEnabled(u8) public ResultCode SetPowerSupplyChangeEventEnabled(ServiceCtx context) { @@ -74,7 +74,7 @@ namespace Ryujinx.HLE.HOS.Services.Ptm.Psm return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // SetBatteryVoltageStateChangeEventEnabled(u8) public ResultCode SetBatteryVoltageStateChangeEventEnabled(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ptm/Ts/IMeasurementServer.cs b/Ryujinx.HLE/HOS/Services/Ptm/Ts/IMeasurementServer.cs index d5a30097b..6ddc0aef2 100644 --- a/Ryujinx.HLE/HOS/Services/Ptm/Ts/IMeasurementServer.cs +++ b/Ryujinx.HLE/HOS/Services/Ptm/Ts/IMeasurementServer.cs @@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Services.Ptm.Ts public IMeasurementServer(ServiceCtx context) { } - [CommandHipc(1)] + [CommandCmif(1)] // GetTemperature(Location location) -> u32 public ResultCode GetTemperature(ServiceCtx context) { @@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Services.Ptm.Ts return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetTemperatureMilliC(Location location) -> u32 public ResultCode GetTemperatureMilliC(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs index 263e1c4ce..966adcffe 100644 --- a/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Ro/IRoInterface.cs @@ -424,7 +424,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro return ResultCode.InvalidProcess; } - [CommandHipc(0)] + [CommandCmif(0)] // LoadNro(u64, u64, u64, u64, u64, pid) -> u64 public ResultCode LoadNro(ServiceCtx context) { @@ -469,7 +469,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro return result; } - [CommandHipc(1)] + [CommandCmif(1)] // UnloadNro(u64, u64, pid) public ResultCode UnloadNro(ServiceCtx context) { @@ -493,7 +493,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro return result; } - [CommandHipc(2)] + [CommandCmif(2)] // LoadNrr(u64, u64, u64, pid) public ResultCode LoadNrr(ServiceCtx context) { @@ -526,7 +526,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro return result; } - [CommandHipc(3)] + [CommandCmif(3)] // UnloadNrr(u64, u64, pid) public ResultCode UnloadNrr(ServiceCtx context) { @@ -550,7 +550,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro return result; } - [CommandHipc(4)] + [CommandCmif(4)] // Initialize(u64, pid, KObject) public ResultCode Initialize(ServiceCtx context) { @@ -572,7 +572,7 @@ namespace Ryujinx.HLE.HOS.Services.Ro return ResultCode.Success; } - [CommandHipc(10)] + [CommandCmif(10)] // LoadNrr2(u64, u64, u64, pid) public ResultCode LoadNrr2(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Sdb/Pdm/IQueryService.cs b/Ryujinx.HLE/HOS/Services/Sdb/Pdm/IQueryService.cs index a243b0a0b..1f66ff9de 100644 --- a/Ryujinx.HLE/HOS/Services/Sdb/Pdm/IQueryService.cs +++ b/Ryujinx.HLE/HOS/Services/Sdb/Pdm/IQueryService.cs @@ -7,14 +7,14 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pdm { public IQueryService(ServiceCtx context) { } - [CommandHipc(13)] // 5.0.0+ + [CommandCmif(13)] // 5.0.0+ // QueryApplicationPlayStatisticsForSystem(buffer title_id_list) -> (buffer entries, s32 entries_count) public ResultCode QueryApplicationPlayStatisticsForSystem(ServiceCtx context) { return QueryPlayStatisticsManager.GetPlayStatistics(context); } - [CommandHipc(16)] // 6.0.0+ + [CommandCmif(16)] // 6.0.0+ // QueryApplicationPlayStatisticsByUserAccountIdForSystem(nn::account::Uid, buffer title_id_list) -> (buffer entries, s32 entries_count) public ResultCode QueryApplicationPlayStatisticsByUserAccountIdForSystem(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Sdb/Pl/ISharedFontManager.cs b/Ryujinx.HLE/HOS/Services/Sdb/Pl/ISharedFontManager.cs index f95c1d1f3..9e2f7a4e5 100644 --- a/Ryujinx.HLE/HOS/Services/Sdb/Pl/ISharedFontManager.cs +++ b/Ryujinx.HLE/HOS/Services/Sdb/Pl/ISharedFontManager.cs @@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl public ISharedFontManager(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // RequestLoad(u32) public ResultCode RequestLoad(ServiceCtx context) { @@ -24,7 +24,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetLoadState(u32) -> u32 public ResultCode GetLoadState(ServiceCtx context) { @@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetFontSize(u32) -> u32 public ResultCode GetFontSize(ServiceCtx context) { @@ -48,7 +48,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetSharedMemoryAddressOffset(u32) -> u32 public ResultCode GetSharedMemoryAddressOffset(ServiceCtx context) { @@ -59,7 +59,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // GetSharedMemoryNativeHandle() -> handle public ResultCode GetSharedMemoryNativeHandle(ServiceCtx context) { @@ -78,7 +78,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // GetSharedFontInOrderOfPriority(bytes<8, 1>) -> (u8, u32, buffer, buffer, buffer) public ResultCode GetSharedFontInOrderOfPriority(ServiceCtx context) { @@ -103,7 +103,7 @@ namespace Ryujinx.HLE.HOS.Services.Sdb.Pl return ResultCode.Success; } - [CommandHipc(6)] // 4.0.0+ + [CommandCmif(6)] // 4.0.0+ // GetSharedFontInOrderOfPriorityForSystem(bytes<8, 1>) -> (u8, u32, buffer, buffer, buffer) public ResultCode GetSharedFontInOrderOfPriorityForSystem(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/ServerBase.cs b/Ryujinx.HLE/HOS/Services/ServerBase.cs index 8b82b771f..762b4fa44 100644 --- a/Ryujinx.HLE/HOS/Services/ServerBase.cs +++ b/Ryujinx.HLE/HOS/Services/ServerBase.cs @@ -236,10 +236,10 @@ namespace Ryujinx.HLE.HOS.Services _requestDataStream.Write(request.RawData); _requestDataStream.Position = 0; - if (request.Type == IpcMessageType.HipcRequest || - request.Type == IpcMessageType.HipcRequestWithContext) + if (request.Type == IpcMessageType.CmifRequest || + request.Type == IpcMessageType.CmifRequestWithContext) { - response.Type = IpcMessageType.HipcResponse; + response.Type = IpcMessageType.CmifResponse; _responseDataStream.SetLength(0); @@ -253,12 +253,12 @@ namespace Ryujinx.HLE.HOS.Services _requestDataReader, _responseDataWriter); - _sessions[serverSessionHandle].CallHipcMethod(context); + _sessions[serverSessionHandle].CallCmifMethod(context); response.RawData = _responseDataStream.ToArray(); } - else if (request.Type == IpcMessageType.HipcControl || - request.Type == IpcMessageType.HipcControlWithContext) + else if (request.Type == IpcMessageType.CmifControl || + request.Type == IpcMessageType.CmifControlWithContext) { uint magic = (uint)_requestDataReader.ReadUInt64(); uint cmdId = (uint)_requestDataReader.ReadUInt64(); @@ -291,7 +291,7 @@ namespace Ryujinx.HLE.HOS.Services default: throw new NotImplementedException(cmdId.ToString()); } } - else if (request.Type == IpcMessageType.HipcCloseSession || request.Type == IpcMessageType.TipcCloseSession) + else if (request.Type == IpcMessageType.CmifCloseSession || request.Type == IpcMessageType.TipcCloseSession) { _context.Syscall.CloseHandle(serverSessionHandle); lock (_handleLock) @@ -376,7 +376,7 @@ namespace Ryujinx.HLE.HOS.Services private void FillHipcResponse(IpcMessage response, long result, ReadOnlySpan data) { - response.Type = IpcMessageType.HipcResponse; + response.Type = IpcMessageType.CmifResponse; _responseDataStream.SetLength(0); @@ -418,4 +418,4 @@ namespace Ryujinx.HLE.HOS.Services Dispose(true); } } -} \ No newline at end of file +} diff --git a/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs b/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs index 703f61632..17e9ec683 100644 --- a/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs +++ b/Ryujinx.HLE/HOS/Services/Settings/ISettingsServer.cs @@ -10,7 +10,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings { public ISettingsServer(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // GetLanguageCode() -> nn::settings::LanguageCode public ResultCode GetLanguageCode(ServiceCtx context) { @@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetAvailableLanguageCodes() -> (u32, buffer) public ResultCode GetAvailableLanguageCodes(ServiceCtx context) { @@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings 0xF); } - [CommandHipc(2)] // 4.0.0+ + [CommandCmif(2)] // 4.0.0+ // MakeLanguageCode(nn::settings::Language language_index) -> nn::settings::LanguageCode public ResultCode MakeLanguageCode(ServiceCtx context) { @@ -46,7 +46,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetAvailableLanguageCodeCount() -> u32 public ResultCode GetAvailableLanguageCodeCount(ServiceCtx context) { @@ -55,7 +55,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // GetRegionCode() -> u32 nn::settings::RegionCode public ResultCode GetRegionCode(ServiceCtx context) { @@ -73,7 +73,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // GetAvailableLanguageCodes2() -> (u32, buffer) public ResultCode GetAvailableLanguageCodes2(ServiceCtx context) { @@ -84,7 +84,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings SystemStateMgr.LanguageCodes.Length); } - [CommandHipc(6)] + [CommandCmif(6)] // GetAvailableLanguageCodeCount2() -> u32 public ResultCode GetAvailableLanguageCodeCount2(ServiceCtx context) { @@ -93,14 +93,14 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(7)] // 4.0.0+ + [CommandCmif(7)] // 4.0.0+ // GetKeyCodeMap() -> buffer public ResultCode GetKeyCodeMap(ServiceCtx context) { return GetKeyCodeMapImpl(context, 1); } - [CommandHipc(8)] // 5.0.0+ + [CommandCmif(8)] // 5.0.0+ // GetQuestFlag() -> bool public ResultCode GetQuestFlag(ServiceCtx context) { @@ -111,14 +111,14 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(9)] // 6.0.0+ + [CommandCmif(9)] // 6.0.0+ // GetKeyCodeMap2() -> buffer public ResultCode GetKeyCodeMap2(ServiceCtx context) { return GetKeyCodeMapImpl(context, 2); } - [CommandHipc(11)] // 10.1.0+ + [CommandCmif(11)] // 10.1.0+ // GetDeviceNickName() -> buffer public ResultCode GetDeviceNickName(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs index bae10d0b0..ef95fa5cb 100644 --- a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs +++ b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs @@ -19,14 +19,14 @@ namespace Ryujinx.HLE.HOS.Services.Settings { public ISystemSettingsServer(ServiceCtx context) { } - [CommandHipc(3)] + [CommandCmif(3)] // GetFirmwareVersion() -> buffer public ResultCode GetFirmwareVersion(ServiceCtx context) { return GetFirmwareVersion2(context); } - [CommandHipc(4)] + [CommandCmif(4)] // GetFirmwareVersion2() -> buffer public ResultCode GetFirmwareVersion2(ServiceCtx context) { @@ -87,7 +87,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(23)] + [CommandCmif(23)] // GetColorSetId() -> i32 public ResultCode GetColorSetId(ServiceCtx context) { @@ -96,7 +96,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(24)] + [CommandCmif(24)] // GetColorSetId() -> i32 public ResultCode SetColorSetId(ServiceCtx context) { @@ -107,7 +107,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(37)] + [CommandCmif(37)] // GetSettingsItemValueSize(buffer, buffer) -> u64 public ResultCode GetSettingsItemValueSize(ServiceCtx context) { @@ -156,7 +156,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(38)] + [CommandCmif(38)] // GetSettingsItemValue(buffer, buffer) -> (u64, buffer) public ResultCode GetSettingsItemValue(ServiceCtx context) { @@ -222,7 +222,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(60)] + [CommandCmif(60)] // IsUserSystemClockAutomaticCorrectionEnabled() -> bool public ResultCode IsUserSystemClockAutomaticCorrectionEnabled(ServiceCtx context) { @@ -234,7 +234,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(62)] + [CommandCmif(62)] // GetDebugModeFlag() -> bool public ResultCode GetDebugModeFlag(ServiceCtx context) { @@ -245,7 +245,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(77)] + [CommandCmif(77)] // GetDeviceNickName() -> buffer public ResultCode GetDeviceNickName(ServiceCtx context) { @@ -267,7 +267,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(78)] + [CommandCmif(78)] // SetDeviceNickName(buffer) public ResultCode SetDeviceNickName(ServiceCtx context) { @@ -283,7 +283,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings return ResultCode.Success; } - [CommandHipc(90)] + [CommandCmif(90)] // GetMiiAuthorId() -> nn::util::Uuid public ResultCode GetMiiAuthorId(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs b/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs index 73652da4b..005ec32d8 100644 --- a/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs @@ -34,7 +34,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm .ToDictionary(service => service.Name, service => service.type); } - [CommandHipc(0)] + [CommandCmif(0)] [CommandTipc(0)] // 12.0.0+ // Initialize(pid, u64 reserved) public ResultCode Initialize(ServiceCtx context) @@ -53,7 +53,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm return GetService(context); } - [CommandHipc(1)] + [CommandCmif(1)] public ResultCode GetService(ServiceCtx context) { if (!_isInitialized) @@ -127,9 +127,9 @@ namespace Ryujinx.HLE.HOS.Services.Sm return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // RegisterService(ServiceName name, u8 isLight, u32 maxHandles) -> handle - public ResultCode RegisterServiceHipc(ServiceCtx context) + public ResultCode RegisterServiceCmif(ServiceCtx context) { if (!_isInitialized) { @@ -199,7 +199,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] [CommandTipc(3)] // 12.0.0+ // UnregisterService(ServiceName name) public ResultCode UnregisterService(ServiceCtx context) diff --git a/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs b/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs index bc174cce5..b63864c90 100644 --- a/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs +++ b/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs @@ -128,7 +128,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd context.Memory.Write(bufferPosition, BsdSockAddr.FromIPEndPoint(endPoint)); } - [CommandHipc(0)] + [CommandCmif(0)] // Initialize(nn::socket::BsdBufferConfig config, u64 pid, u64 transferMemorySize, KObject, pid) -> u32 bsd_errno public ResultCode RegisterClient(ServiceCtx context) { @@ -158,7 +158,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // StartMonitoring(u64, pid) public ResultCode StartMonitoring(ServiceCtx context) { @@ -169,21 +169,21 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // Socket(u32 domain, u32 type, u32 protocol) -> (i32 ret, u32 bsd_errno) public ResultCode Socket(ServiceCtx context) { return SocketInternal(context, false); } - [CommandHipc(3)] + [CommandCmif(3)] // SocketExempt(u32 domain, u32 type, u32 protocol) -> (i32 ret, u32 bsd_errno) public ResultCode SocketExempt(ServiceCtx context) { return SocketInternal(context, true); } - [CommandHipc(4)] + [CommandCmif(4)] // Open(u32 flags, array path) -> (i32 ret, u32 bsd_errno) public ResultCode Open(ServiceCtx context) { @@ -204,7 +204,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // Select(u32 nfds, nn::socket::timeval timeout, buffer readfds_in, buffer writefds_in, buffer errorfds_in) // -> (i32 ret, u32 bsd_errno, buffer readfds_out, buffer writefds_out, buffer errorfds_out) public ResultCode Select(ServiceCtx context) @@ -325,7 +325,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return ResultCode.Success; } - [CommandHipc(6)] + [CommandCmif(6)] // Poll(u32 nfds, u32 timeout, buffer fds) -> (i32 ret, u32 bsd_errno, buffer) public ResultCode Poll(ServiceCtx context) { @@ -463,7 +463,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, updateCount, errno); } - [CommandHipc(7)] + [CommandCmif(7)] // Sysctl(buffer, buffer) -> (i32 ret, u32 bsd_errno, u32, buffer) public ResultCode Sysctl(ServiceCtx context) { @@ -474,7 +474,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return ResultCode.Success; } - [CommandHipc(8)] + [CommandCmif(8)] // Recv(u32 socket, u32 flags) -> (i32 ret, u32 bsd_errno, array message) public ResultCode Recv(ServiceCtx context) { @@ -504,7 +504,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, result, errno); } - [CommandHipc(9)] + [CommandCmif(9)] // RecvFrom(u32 sock, u32 flags) -> (i32 ret, u32 bsd_errno, u32 addrlen, buffer message, buffer) public ResultCode RecvFrom(ServiceCtx context) { @@ -544,7 +544,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, result, errno); } - [CommandHipc(10)] + [CommandCmif(10)] // Send(u32 socket, u32 flags, buffer) -> (i32 ret, u32 bsd_errno) public ResultCode Send(ServiceCtx context) { @@ -572,7 +572,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, result, errno); } - [CommandHipc(11)] + [CommandCmif(11)] // SendTo(u32 socket, u32 flags, buffer, buffer) -> (i32 ret, u32 bsd_errno) public ResultCode SendTo(ServiceCtx context) { @@ -603,7 +603,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, result, errno); } - [CommandHipc(12)] + [CommandCmif(12)] // Accept(u32 socket) -> (i32 ret, u32 bsd_errno, u32 addrlen, buffer addr) public ResultCode Accept(ServiceCtx context) { @@ -646,7 +646,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, -1, errno); } - [CommandHipc(13)] + [CommandCmif(13)] // Bind(u32 socket, buffer addr) -> (i32 ret, u32 bsd_errno) public ResultCode Bind(ServiceCtx context) { @@ -667,7 +667,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, 0, errno); } - [CommandHipc(14)] + [CommandCmif(14)] // Connect(u32 socket, buffer) -> (i32 ret, u32 bsd_errno) public ResultCode Connect(ServiceCtx context) { @@ -688,7 +688,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, 0, errno); } - [CommandHipc(15)] + [CommandCmif(15)] // GetPeerName(u32 socket) -> (i32 ret, u32 bsd_errno, u32 addrlen, buffer addr) public ResultCode GetPeerName(ServiceCtx context) { @@ -715,7 +715,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, 0, errno); } - [CommandHipc(16)] + [CommandCmif(16)] // GetSockName(u32 socket) -> (i32 ret, u32 bsd_errno, u32 addrlen, buffer addr) public ResultCode GetSockName(ServiceCtx context) { @@ -738,7 +738,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, 0, errno); } - [CommandHipc(17)] + [CommandCmif(17)] // GetSockOpt(u32 socket, u32 level, u32 option_name) -> (i32 ret, u32 bsd_errno, u32, buffer) public ResultCode GetSockOpt(ServiceCtx context) { @@ -765,7 +765,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, 0, errno); } - [CommandHipc(18)] + [CommandCmif(18)] // Listen(u32 socket, u32 backlog) -> (i32 ret, u32 bsd_errno) public ResultCode Listen(ServiceCtx context) { @@ -783,7 +783,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, 0, errno); } - [CommandHipc(19)] + [CommandCmif(19)] // Ioctl(u32 fd, u32 request, u32 bufcount, buffer, buffer, buffer, buffer) -> (i32 ret, u32 bsd_errno, buffer, buffer, buffer, buffer) public ResultCode Ioctl(ServiceCtx context) { @@ -818,7 +818,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, 0, errno); } - [CommandHipc(20)] + [CommandCmif(20)] // Fcntl(u32 socket, u32 cmd, u32 arg) -> (i32 ret, u32 bsd_errno) public ResultCode Fcntl(ServiceCtx context) { @@ -852,7 +852,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, result, errno); } - [CommandHipc(21)] + [CommandCmif(21)] // SetSockOpt(u32 socket, u32 level, u32 option_name, buffer option_value) -> (i32 ret, u32 bsd_errno) public ResultCode SetSockOpt(ServiceCtx context) { @@ -875,7 +875,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, 0, errno); } - [CommandHipc(22)] + [CommandCmif(22)] // Shutdown(u32 socket, u32 how) -> (i32 ret, u32 bsd_errno) public ResultCode Shutdown(ServiceCtx context) { @@ -898,7 +898,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, 0, errno); } - [CommandHipc(23)] + [CommandCmif(23)] // ShutdownAllSockets(u32 how) -> (i32 ret, u32 bsd_errno) public ResultCode ShutdownAllSockets(ServiceCtx context) { @@ -914,7 +914,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, 0, errno); } - [CommandHipc(24)] + [CommandCmif(24)] // Write(u32 fd, buffer message) -> (i32 ret, u32 bsd_errno) public ResultCode Write(ServiceCtx context) { @@ -941,7 +941,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, result, errno); } - [CommandHipc(25)] + [CommandCmif(25)] // Read(u32 fd) -> (i32 ret, u32 bsd_errno, buffer message) public ResultCode Read(ServiceCtx context) { @@ -970,7 +970,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, result, errno); } - [CommandHipc(26)] + [CommandCmif(26)] // Close(u32 fd) -> (i32 ret, u32 bsd_errno) public ResultCode Close(ServiceCtx context) { @@ -986,7 +986,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, 0, errno); } - [CommandHipc(27)] + [CommandCmif(27)] // DuplicateSocket(u32 fd, u64 reserved) -> (i32 ret, u32 bsd_errno) public ResultCode DuplicateSocket(ServiceCtx context) { @@ -1012,7 +1012,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd } - [CommandHipc(29)] // 7.0.0+ + [CommandCmif(29)] // 7.0.0+ // RecvMMsg(u32 fd, u32 vlen, u32 flags, u32 reserved, nn::socket::TimeVal timeout) -> (i32 ret, u32 bsd_errno, buffer message); public ResultCode RecvMMsg(ServiceCtx context) { @@ -1055,7 +1055,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, result, errno); } - [CommandHipc(30)] // 7.0.0+ + [CommandCmif(30)] // 7.0.0+ // SendMMsg(u32 fd, u32 vlen, u32 flags) -> (i32 ret, u32 bsd_errno, buffer message); public ResultCode SendMMsg(ServiceCtx context) { @@ -1096,7 +1096,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd return WriteBsdResult(context, result, errno); } - [CommandHipc(31)] // 7.0.0+ + [CommandCmif(31)] // 7.0.0+ // EventFd(nn::socket::EventFdFlags flags, u64 initval) -> (i32 ret, u32 bsd_errno) public ResultCode EventFd(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Sockets/Nsd/IManager.cs b/Ryujinx.HLE/HOS/Services/Sockets/Nsd/IManager.cs index b098e2edc..0b7adff4f 100644 --- a/Ryujinx.HLE/HOS/Services/Sockets/Nsd/IManager.cs +++ b/Ryujinx.HLE/HOS/Services/Sockets/Nsd/IManager.cs @@ -47,21 +47,21 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd }; } - [CommandHipc(5)] // 11.0.0+ + [CommandCmif(5)] // 11.0.0+ // GetSettingUrl() -> buffer, 0x16> public ResultCode GetSettingUrl(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(10)] + [CommandCmif(10)] // GetSettingName() -> buffer, 0x16> public ResultCode GetSettingName(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(11)] + [CommandCmif(11)] // GetEnvironmentIdentifier() -> buffer environment_identifier, 0x16> public ResultCode GetEnvironmentIdentifier(ServiceCtx context) { @@ -81,7 +81,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd return result; } - [CommandHipc(12)] + [CommandCmif(12)] // GetDeviceId() -> bytes<0x10, 1> public ResultCode GetDeviceId(ServiceCtx context) { @@ -90,7 +90,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd return ResultCode.Success; } - [CommandHipc(13)] + [CommandCmif(13)] // DeleteSettings(u32) public ResultCode DeleteSettings(ServiceCtx context) { @@ -127,14 +127,14 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd return ResultCode.Success; } - [CommandHipc(14)] + [CommandCmif(14)] // ImportSettings(u32, buffer) -> buffer public ResultCode ImportSettings(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(15)] // 4.0.0+ + [CommandCmif(15)] // 4.0.0+ // SetChangeEnvironmentIdentifierDisabled(bytes<1>) public ResultCode SetChangeEnvironmentIdentifierDisabled(ServiceCtx context) { @@ -153,7 +153,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd return ResultCode.Success; } - [CommandHipc(20)] + [CommandCmif(20)] // Resolve(buffer, 0x15>) -> buffer, 0x16> public ResultCode Resolve(ServiceCtx context) { @@ -176,7 +176,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd return result; } - [CommandHipc(21)] + [CommandCmif(21)] // ResolveEx(buffer, 0x15>) -> (u32, buffer, 0x16>) public ResultCode ResolveEx(ServiceCtx context) { @@ -201,56 +201,56 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd return result; } - [CommandHipc(30)] + [CommandCmif(30)] // GetNasServiceSetting(buffer, 0x15>) -> buffer, 0x16> public ResultCode GetNasServiceSetting(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(31)] + [CommandCmif(31)] // GetNasServiceSettingEx(buffer, 0x15>) -> (u32, buffer, 0x16>) public ResultCode GetNasServiceSettingEx(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(40)] + [CommandCmif(40)] // GetNasRequestFqdn() -> buffer, 0x16> public ResultCode GetNasRequestFqdn(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(41)] + [CommandCmif(41)] // GetNasRequestFqdnEx() -> (u32, buffer, 0x16>) public ResultCode GetNasRequestFqdnEx(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(42)] + [CommandCmif(42)] // GetNasApiFqdn() -> buffer, 0x16> public ResultCode GetNasApiFqdn(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(43)] + [CommandCmif(43)] // GetNasApiFqdnEx() -> (u32, buffer, 0x16>) public ResultCode GetNasApiFqdnEx(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(50)] + [CommandCmif(50)] // GetCurrentSetting() -> buffer, 0x16> public ResultCode GetCurrentSetting(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(51)] // 9.0.0+ + [CommandCmif(51)] // 9.0.0+ // WriteTestParameter(buffer) public ResultCode WriteTestParameter(ServiceCtx context) { @@ -259,7 +259,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd throw new ServiceNotImplementedException(this, context); } - [CommandHipc(52)] // 9.0.0+ + [CommandCmif(52)] // 9.0.0+ // ReadTestParameter() -> buffer public ResultCode ReadTestParameter(ServiceCtx context) { @@ -268,7 +268,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd throw new ServiceNotImplementedException(this, context); } - [CommandHipc(60)] + [CommandCmif(60)] // ReadSaveDataFromFsForTest() -> buffer, 0x16> public ResultCode ReadSaveDataFromFsForTest(ServiceCtx context) { @@ -284,7 +284,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd return ResultCode.Success; } - [CommandHipc(61)] + [CommandCmif(61)] // WriteSaveDataToFsForTest(buffer, 0x15>) public ResultCode WriteSaveDataToFsForTest(ServiceCtx context) { @@ -313,7 +313,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd return ResultCode.Success; } - [CommandHipc(62)] + [CommandCmif(62)] // DeleteSaveDataOfFsForTest() public ResultCode DeleteSaveDataOfFsForTest(ServiceCtx context) { @@ -342,7 +342,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd return ResultCode.Success; } - [CommandHipc(63)] // 4.0.0+ + [CommandCmif(63)] // 4.0.0+ // IsChangeEnvironmentIdentifierDisabled() -> bytes<1> public ResultCode IsChangeEnvironmentIdentifierDisabled(ServiceCtx context) { @@ -357,7 +357,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd return ResultCode.Success; } - [CommandHipc(100)] // 10.0.0+ + [CommandCmif(100)] // 10.0.0+ // GetApplicationServerEnvironmentType() -> bytes<1> public ResultCode GetApplicationServerEnvironmentType(ServiceCtx context) { @@ -385,14 +385,14 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Nsd return ResultCode.Success; } - [CommandHipc(101)] // 10.0.0+ + [CommandCmif(101)] // 10.0.0+ // SetApplicationServerEnvironmentType(bytes<1>) public ResultCode SetApplicationServerEnvironmentType(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(102)] // 10.0.0+ + [CommandCmif(102)] // 10.0.0+ // DeleteApplicationServerEnvironmentType() public ResultCode DeleteApplicationServerEnvironmentType(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/IResolver.cs b/Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/IResolver.cs index 13c5597fd..64c3acbb5 100644 --- a/Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/IResolver.cs +++ b/Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/IResolver.cs @@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres DnsMitmResolver.Instance.ReloadEntries(context); } - [CommandHipc(0)] + [CommandCmif(0)] // SetDnsAddressesPrivateRequest(u32, buffer) public ResultCode SetDnsAddressesPrivateRequest(ServiceCtx context) { @@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres return ResultCode.NotAllocated; } - [CommandHipc(1)] + [CommandCmif(1)] // GetDnsAddressPrivateRequest(u32) -> buffer public ResultCode GetDnsAddressPrivateRequest(ServiceCtx context) { @@ -51,7 +51,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres return ResultCode.NotAllocated; } - [CommandHipc(2)] + [CommandCmif(2)] // GetHostByNameRequest(u8, u32, u64, pid, buffer) -> (u32, u32, u32, buffer) public ResultCode GetHostByNameRequest(ServiceCtx context) { @@ -64,7 +64,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres return GetHostByNameRequestImpl(context, inputBufferPosition, inputBufferSize, outputBufferPosition, outputBufferSize, false, 0, 0); } - [CommandHipc(3)] + [CommandCmif(3)] // GetHostByAddrRequest(u32, u32, u32, u64, pid, buffer) -> (u32, u32, u32, buffer) public ResultCode GetHostByAddrRequest(ServiceCtx context) { @@ -77,7 +77,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres return GetHostByAddrRequestImpl(context, inputBufferPosition, inputBufferSize, outputBufferPosition, outputBufferSize, false, 0, 0); } - [CommandHipc(4)] + [CommandCmif(4)] // GetHostStringErrorRequest(u32) -> buffer public ResultCode GetHostStringErrorRequest(ServiceCtx context) { @@ -107,7 +107,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres return resultCode; } - [CommandHipc(5)] + [CommandCmif(5)] // GetGaiStringErrorRequest(u32) -> buffer public ResultCode GetGaiStringErrorRequest(ServiceCtx context) { @@ -152,7 +152,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres return resultCode; } - [CommandHipc(6)] + [CommandCmif(6)] // GetAddrInfoRequest(bool enable_nsd_resolve, u32, u64 pid_placeholder, pid, buffer host, buffer service, buffer hints) -> (i32 ret, u32 bsd_errno, u32 packed_addrinfo_size, buffer response) public ResultCode GetAddrInfoRequest(ServiceCtx context) { @@ -162,7 +162,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres return GetAddrInfoRequestImpl(context, responseBufferPosition, responseBufferSize, false, 0, 0); } - [CommandHipc(8)] + [CommandCmif(8)] // GetCancelHandleRequest(u64, pid) -> u32 public ResultCode GetCancelHandleRequest(ServiceCtx context) { @@ -176,7 +176,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres return ResultCode.Success; } - [CommandHipc(9)] + [CommandCmif(9)] // CancelRequest(u32, u64, pid) public ResultCode CancelRequest(ServiceCtx context) { @@ -188,7 +188,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres return ResultCode.Success; } - [CommandHipc(10)] // 5.0.0+ + [CommandCmif(10)] // 5.0.0+ // GetHostByNameRequestWithOptions(u8, u32, u64, pid, buffer, buffer) -> (u32, u32, u32, buffer) public ResultCode GetHostByNameRequestWithOptions(ServiceCtx context) { @@ -207,7 +207,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres optionsBufferSize); } - [CommandHipc(11)] // 5.0.0+ + [CommandCmif(11)] // 5.0.0+ // GetHostByAddrRequestWithOptions(u32, u32, u32, u64, pid, buffer, buffer) -> (u32, u32, u32, buffer) public ResultCode GetHostByAddrRequestWithOptions(ServiceCtx context) { @@ -226,7 +226,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres optionsBufferSize); } - [CommandHipc(12)] // 5.0.0+ + [CommandCmif(12)] // 5.0.0+ // GetAddrInfoRequestWithOptions(bool enable_nsd_resolve, u32, u64 pid_placeholder, pid, buffer host, buffer service, buffer hints, buffer) -> (i32 ret, u32 bsd_errno, u32 unknown, u32 packed_addrinfo_size, buffer response) public ResultCode GetAddrInfoRequestWithOptions(ServiceCtx context) { @@ -236,7 +236,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres return GetAddrInfoRequestImpl(context, outputBufferPosition, outputBufferSize, true, optionsBufferPosition, optionsBufferSize); } - [CommandHipc(14)] // 5.0.0+ + [CommandCmif(14)] // 5.0.0+ // ResolverSetOptionRequest(buffer, u64 unknown, u64 pid_placeholder, pid) -> (i32 ret, u32 bsd_errno) public ResultCode ResolverSetOptionRequest(ServiceCtx context) { @@ -263,7 +263,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres } // Atmosphère extension for dns_mitm - [CommandHipc(65000)] + [CommandCmif(65000)] // AtmosphereReloadHostsFile() public ResultCode AtmosphereReloadHostsFile(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs b/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs index 30e22e120..aa350b734 100644 --- a/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Spl/IGeneralInterface.cs @@ -14,7 +14,7 @@ namespace Ryujinx.HLE.HOS.Services.Spl { public IGeneralInterface(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // GetConfig(u32 config_item) -> u64 config_value public ResultCode GetConfig(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs b/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs index 3de746aca..c911f434c 100644 --- a/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs +++ b/Ryujinx.HLE/HOS/Services/Spl/IRandomInterface.cs @@ -14,7 +14,7 @@ namespace Ryujinx.HLE.HOS.Services.Spl _rng = RandomNumberGenerator.Create(); } - [CommandHipc(0)] + [CommandCmif(0)] // GetRandomBytes() -> buffer public ResultCode GetRandomBytes(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs b/Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs index 73f044418..7741ef7ed 100644 --- a/Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs +++ b/Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs @@ -15,7 +15,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl // In this case it is acceptable to stub all calls of the service. public ISslService(ServiceCtx context) { } - [CommandHipc(0)] + [CommandCmif(0)] // CreateContext(nn::ssl::sf::SslVersion, u64, pid) -> object public ResultCode CreateContext(ServiceCtx context) { @@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetCertificates(buffer ids) -> (u32 certificates_count, buffer certificates) public ResultCode GetCertificates(ServiceCtx context) { @@ -94,7 +94,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetCertificateBufSize(buffer ids) -> u32 buffer_size; public ResultCode GetCertificateBufSize(ServiceCtx context) { @@ -110,7 +110,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // SetInterfaceVersion(u32) public ResultCode SetInterfaceVersion(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ssl/SslService/ISslConnection.cs b/Ryujinx.HLE/HOS/Services/Ssl/SslService/ISslConnection.cs index 726ee122d..b9087f409 100644 --- a/Ryujinx.HLE/HOS/Services/Ssl/SslService/ISslConnection.cs +++ b/Ryujinx.HLE/HOS/Services/Ssl/SslService/ISslConnection.cs @@ -36,7 +36,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService _verifyOption = VerifyOption.PeerCa | VerifyOption.HostName; } - [CommandHipc(0)] + [CommandCmif(0)] // SetSocketDescriptor(u32) -> u32 public ResultCode SetSocketDescriptor(ServiceCtx context) { @@ -82,7 +82,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService _connection = new SslManagedSocketConnection(_bsdContext, _sslVersion, socketFd, bsdSocket); } - [CommandHipc(1)] + [CommandCmif(1)] // SetHostName(buffer) public ResultCode SetHostName(ServiceCtx context) { @@ -100,7 +100,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // SetVerifyOption(nn::ssl::sf::VerifyOption) public ResultCode SetVerifyOption(ServiceCtx context) { @@ -111,7 +111,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // SetIoMode(nn::ssl::sf::IoMode) public ResultCode SetIoMode(ServiceCtx context) { @@ -129,7 +129,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // GetSocketDescriptor() -> u32 public ResultCode GetSocketDescriptor(ServiceCtx context) { @@ -138,7 +138,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // GetHostName(buffer) -> u32 public ResultCode GetHostName(ServiceCtx context) { @@ -157,7 +157,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(6)] + [CommandCmif(6)] // GetVerifyOption() -> nn::ssl::sf::VerifyOption public ResultCode GetVerifyOption(ServiceCtx context) { @@ -168,7 +168,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(7)] + [CommandCmif(7)] // GetIoMode() -> nn::ssl::sf::IoMode public ResultCode GetIoMode(ServiceCtx context) { @@ -179,7 +179,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(8)] + [CommandCmif(8)] // DoHandshake() public ResultCode DoHandshake(ServiceCtx context) { @@ -191,7 +191,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return _connection.Handshake(_hostName); } - [CommandHipc(9)] + [CommandCmif(9)] // DoHandshakeGetServerCert() -> (u32, u32, buffer) public ResultCode DoHandshakeGetServerCert(ServiceCtx context) { @@ -224,7 +224,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return result; } - [CommandHipc(10)] + [CommandCmif(10)] // Read() -> (u32, buffer) public ResultCode Read(ServiceCtx context) { @@ -249,7 +249,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return result; } - [CommandHipc(11)] + [CommandCmif(11)] // Write(buffer) -> s32 public ResultCode Write(ServiceCtx context) { @@ -272,7 +272,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return result; } - [CommandHipc(12)] + [CommandCmif(12)] // Pending() -> s32 public ResultCode Pending(ServiceCtx context) { @@ -286,7 +286,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(13)] + [CommandCmif(13)] // Peek() -> (s32, buffer) public ResultCode Peek(ServiceCtx context) { @@ -311,28 +311,28 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return result; } - [CommandHipc(14)] + [CommandCmif(14)] // Poll(nn::ssl::sf::PollEvent poll_event, u32 timeout) -> nn::ssl::sf::PollEvent public ResultCode Poll(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(15)] + [CommandCmif(15)] // GetVerifyCertError() public ResultCode GetVerifyCertError(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(16)] + [CommandCmif(16)] // GetNeededServerCertBufferSize() -> u32 public ResultCode GetNeededServerCertBufferSize(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(17)] + [CommandCmif(17)] // SetSessionCacheMode(nn::ssl::sf::SessionCacheMode) public ResultCode SetSessionCacheMode(ServiceCtx context) { @@ -345,7 +345,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(18)] + [CommandCmif(18)] // GetSessionCacheMode() -> nn::ssl::sf::SessionCacheMode public ResultCode GetSessionCacheMode(ServiceCtx context) { @@ -356,28 +356,28 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(19)] + [CommandCmif(19)] // FlushSessionCache() public ResultCode FlushSessionCache(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(20)] + [CommandCmif(20)] // SetRenegotiationMode(nn::ssl::sf::RenegotiationMode) public ResultCode SetRenegotiationMode(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(21)] + [CommandCmif(21)] // GetRenegotiationMode() -> nn::ssl::sf::RenegotiationMode public ResultCode GetRenegotiationMode(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(22)] + [CommandCmif(22)] // SetOption(b8 value, nn::ssl::sf::OptionType option) public ResultCode SetOption(ServiceCtx context) { @@ -389,7 +389,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return SetOption(option, value); } - [CommandHipc(23)] + [CommandCmif(23)] // GetOption(nn::ssl::sf::OptionType) -> b8 public ResultCode GetOption(ServiceCtx context) { @@ -407,21 +407,21 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return result; } - [CommandHipc(24)] + [CommandCmif(24)] // GetVerifyCertErrors() -> (u32, u32, buffer) public ResultCode GetVerifyCertErrors(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(25)] // 4.0.0+ + [CommandCmif(25)] // 4.0.0+ // GetCipherInfo(u32) -> buffer public ResultCode GetCipherInfo(ServiceCtx context) { throw new ServiceNotImplementedException(this, context); } - [CommandHipc(26)] + [CommandCmif(26)] // SetNextAlpnProto(buffer) -> u32 public ResultCode SetNextAlpnProto(ServiceCtx context) { @@ -437,7 +437,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(27)] + [CommandCmif(27)] // GetNextAlpnProto(buffer) -> u32 public ResultCode GetNextAlpnProto(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Ssl/SslService/ISslContext.cs b/Ryujinx.HLE/HOS/Services/Ssl/SslService/ISslContext.cs index 93b9b423e..b38ff9214 100644 --- a/Ryujinx.HLE/HOS/Services/Ssl/SslService/ISslContext.cs +++ b/Ryujinx.HLE/HOS/Services/Ssl/SslService/ISslContext.cs @@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService _sslVersion = sslVersion; } - [CommandHipc(2)] + [CommandCmif(2)] // CreateConnection() -> object public ResultCode CreateConnection(ServiceCtx context) { @@ -30,7 +30,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetConnectionCount() -> u32 count public ResultCode GetConnectionCount(ServiceCtx context) { @@ -41,7 +41,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // ImportServerPki(nn::ssl::sf::CertificateFormat certificateFormat, buffer certificate) -> u64 certificateId public ResultCode ImportServerPki(ServiceCtx context) { @@ -57,7 +57,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl.SslService return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // ImportClientPki(buffer certificate, buffer ascii_password) -> u64 certificateId public ResultCode ImportClientPki(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/IHOSBinderDriver.cs b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/IHOSBinderDriver.cs index d641f7f09..0724c83ee 100644 --- a/Ryujinx.HLE/HOS/Services/SurfaceFlinger/IHOSBinderDriver.cs +++ b/Ryujinx.HLE/HOS/Services/SurfaceFlinger/IHOSBinderDriver.cs @@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger { public IHOSBinderDriver() { } - [CommandHipc(0)] + [CommandCmif(0)] // TransactParcel(s32, u32, u32, buffer) -> buffer public ResultCode TransactParcel(ServiceCtx context) { @@ -38,7 +38,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger return result; } - [CommandHipc(1)] + [CommandCmif(1)] // AdjustRefcount(s32, s32, s32) public ResultCode AdjustRefcount(ServiceCtx context) { @@ -49,7 +49,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger return AdjustRefcount(binderId, addVal, type); } - [CommandHipc(2)] + [CommandCmif(2)] // GetNativeHandle(s32, s32) -> handle public ResultCode GetNativeHandle(ServiceCtx context) { @@ -69,7 +69,7 @@ namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger return ResultCode.Success; } - [CommandHipc(3)] // 3.0.0+ + [CommandCmif(3)] // 3.0.0+ // TransactParcelAuto(s32, u32, u32, buffer) -> buffer public ResultCode TransactParcelAuto(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Time/IStaticServiceForGlue.cs b/Ryujinx.HLE/HOS/Services/Time/IStaticServiceForGlue.cs index c65f00420..31548b80c 100644 --- a/Ryujinx.HLE/HOS/Services/Time/IStaticServiceForGlue.cs +++ b/Ryujinx.HLE/HOS/Services/Time/IStaticServiceForGlue.cs @@ -23,28 +23,28 @@ namespace Ryujinx.HLE.HOS.Services.Time _inner.SetParent(this); } - [CommandHipc(0)] + [CommandCmif(0)] // GetStandardUserSystemClock() -> object public ResultCode GetStandardUserSystemClock(ServiceCtx context) { return _inner.GetStandardUserSystemClock(context); } - [CommandHipc(1)] + [CommandCmif(1)] // GetStandardNetworkSystemClock() -> object public ResultCode GetStandardNetworkSystemClock(ServiceCtx context) { return _inner.GetStandardNetworkSystemClock(context); } - [CommandHipc(2)] + [CommandCmif(2)] // GetStandardSteadyClock() -> object public ResultCode GetStandardSteadyClock(ServiceCtx context) { return _inner.GetStandardSteadyClock(context); } - [CommandHipc(3)] + [CommandCmif(3)] // GetTimeZoneService() -> object public ResultCode GetTimeZoneService(ServiceCtx context) { @@ -53,28 +53,28 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // GetStandardLocalSystemClock() -> object public ResultCode GetStandardLocalSystemClock(ServiceCtx context) { return _inner.GetStandardLocalSystemClock(context); } - [CommandHipc(5)] // 4.0.0+ + [CommandCmif(5)] // 4.0.0+ // GetEphemeralNetworkSystemClock() -> object public ResultCode GetEphemeralNetworkSystemClock(ServiceCtx context) { return _inner.GetEphemeralNetworkSystemClock(context); } - [CommandHipc(20)] // 6.0.0+ + [CommandCmif(20)] // 6.0.0+ // GetSharedMemoryNativeHandle() -> handle public ResultCode GetSharedMemoryNativeHandle(ServiceCtx context) { return _inner.GetSharedMemoryNativeHandle(context); } - [CommandHipc(50)] // 4.0.0+ + [CommandCmif(50)] // 4.0.0+ // SetStandardSteadyClockInternalOffset(nn::TimeSpanType internal_offset) public ResultCode SetStandardSteadyClockInternalOffset(ServiceCtx context) { @@ -90,7 +90,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(51)] // 9.0.0+ + [CommandCmif(51)] // 9.0.0+ // GetStandardSteadyClockRtcValue() -> u64 public ResultCode GetStandardSteadyClockRtcValue(ServiceCtx context) { @@ -104,21 +104,21 @@ namespace Ryujinx.HLE.HOS.Services.Time return result; } - [CommandHipc(100)] + [CommandCmif(100)] // IsStandardUserSystemClockAutomaticCorrectionEnabled() -> bool public ResultCode IsStandardUserSystemClockAutomaticCorrectionEnabled(ServiceCtx context) { return _inner.IsStandardUserSystemClockAutomaticCorrectionEnabled(context); } - [CommandHipc(101)] + [CommandCmif(101)] // SetStandardUserSystemClockAutomaticCorrectionEnabled(b8) public ResultCode SetStandardUserSystemClockAutomaticCorrectionEnabled(ServiceCtx context) { return _inner.SetStandardUserSystemClockAutomaticCorrectionEnabled(context); } - [CommandHipc(102)] // 5.0.0+ + [CommandCmif(102)] // 5.0.0+ // GetStandardUserSystemClockInitialYear() -> u32 public ResultCode GetStandardUserSystemClockInitialYear(ServiceCtx context) { @@ -132,49 +132,49 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(200)] // 3.0.0+ + [CommandCmif(200)] // 3.0.0+ // IsStandardNetworkSystemClockAccuracySufficient() -> bool public ResultCode IsStandardNetworkSystemClockAccuracySufficient(ServiceCtx context) { return _inner.IsStandardNetworkSystemClockAccuracySufficient(context); } - [CommandHipc(201)] // 6.0.0+ + [CommandCmif(201)] // 6.0.0+ // GetStandardUserSystemClockAutomaticCorrectionUpdatedTime() -> nn::time::SteadyClockTimePoint public ResultCode GetStandardUserSystemClockAutomaticCorrectionUpdatedTime(ServiceCtx context) { return _inner.GetStandardUserSystemClockAutomaticCorrectionUpdatedTime(context); } - [CommandHipc(300)] // 4.0.0+ + [CommandCmif(300)] // 4.0.0+ // CalculateMonotonicSystemClockBaseTimePoint(nn::time::SystemClockContext) -> s64 public ResultCode CalculateMonotonicSystemClockBaseTimePoint(ServiceCtx context) { return _inner.CalculateMonotonicSystemClockBaseTimePoint(context); } - [CommandHipc(400)] // 4.0.0+ + [CommandCmif(400)] // 4.0.0+ // GetClockSnapshot(u8) -> buffer public ResultCode GetClockSnapshot(ServiceCtx context) { return _inner.GetClockSnapshot(context); } - [CommandHipc(401)] // 4.0.0+ + [CommandCmif(401)] // 4.0.0+ // GetClockSnapshotFromSystemClockContext(u8, nn::time::SystemClockContext, nn::time::SystemClockContext) -> buffer public ResultCode GetClockSnapshotFromSystemClockContext(ServiceCtx context) { return _inner.GetClockSnapshotFromSystemClockContext(context); } - [CommandHipc(500)] // 4.0.0+ + [CommandCmif(500)] // 4.0.0+ // CalculateStandardUserSystemClockDifferenceByUser(buffer, buffer) -> nn::TimeSpanType public ResultCode CalculateStandardUserSystemClockDifferenceByUser(ServiceCtx context) { return _inner.CalculateStandardUserSystemClockDifferenceByUser(context); } - [CommandHipc(501)] // 4.0.0+ + [CommandCmif(501)] // 4.0.0+ // CalculateSpanBetween(buffer, buffer) -> nn::TimeSpanType public ResultCode CalculateSpanBetween(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Time/IStaticServiceForPsc.cs b/Ryujinx.HLE/HOS/Services/Time/IStaticServiceForPsc.cs index abb5bb40d..145d4e3b9 100644 --- a/Ryujinx.HLE/HOS/Services/Time/IStaticServiceForPsc.cs +++ b/Ryujinx.HLE/HOS/Services/Time/IStaticServiceForPsc.cs @@ -31,7 +31,7 @@ namespace Ryujinx.HLE.HOS.Services.Time _timeManager = manager; } - [CommandHipc(0)] + [CommandCmif(0)] // GetStandardUserSystemClock() -> object public ResultCode GetStandardUserSystemClock(ServiceCtx context) { @@ -42,7 +42,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(1)] + [CommandCmif(1)] // GetStandardNetworkSystemClock() -> object public ResultCode GetStandardNetworkSystemClock(ServiceCtx context) { @@ -53,7 +53,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetStandardSteadyClock() -> object public ResultCode GetStandardSteadyClock(ServiceCtx context) { @@ -64,7 +64,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // GetTimeZoneService() -> object public ResultCode GetTimeZoneService(ServiceCtx context) { @@ -74,7 +74,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(4)] + [CommandCmif(4)] // GetStandardLocalSystemClock() -> object public ResultCode GetStandardLocalSystemClock(ServiceCtx context) { @@ -85,7 +85,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(5)] // 4.0.0+ + [CommandCmif(5)] // 4.0.0+ // GetEphemeralNetworkSystemClock() -> object public ResultCode GetEphemeralNetworkSystemClock(ServiceCtx context) { @@ -96,7 +96,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(20)] // 6.0.0+ + [CommandCmif(20)] // 6.0.0+ // GetSharedMemoryNativeHandle() -> handle public ResultCode GetSharedMemoryNativeHandle(ServiceCtx context) { @@ -113,7 +113,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(50)] // 4.0.0+ + [CommandCmif(50)] // 4.0.0+ // SetStandardSteadyClockInternalOffset(nn::TimeSpanType internal_offset) public ResultCode SetStandardSteadyClockInternalOffset(ServiceCtx context) { @@ -121,7 +121,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.NotImplemented; } - [CommandHipc(51)] // 9.0.0+ + [CommandCmif(51)] // 9.0.0+ // GetStandardSteadyClockRtcValue() -> u64 public ResultCode GetStandardSteadyClockRtcValue(ServiceCtx context) { @@ -129,7 +129,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.NotImplemented; } - [CommandHipc(100)] + [CommandCmif(100)] // IsStandardUserSystemClockAutomaticCorrectionEnabled() -> bool public ResultCode IsStandardUserSystemClockAutomaticCorrectionEnabled(ServiceCtx context) { @@ -145,7 +145,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(101)] + [CommandCmif(101)] // SetStandardUserSystemClockAutomaticCorrectionEnabled(b8) public ResultCode SetStandardUserSystemClockAutomaticCorrectionEnabled(ServiceCtx context) { @@ -181,7 +181,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return result; } - [CommandHipc(102)] // 5.0.0+ + [CommandCmif(102)] // 5.0.0+ // GetStandardUserSystemClockInitialYear() -> u32 public ResultCode GetStandardUserSystemClockInitialYear(ServiceCtx context) { @@ -189,7 +189,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.NotImplemented; } - [CommandHipc(200)] // 3.0.0+ + [CommandCmif(200)] // 3.0.0+ // IsStandardNetworkSystemClockAccuracySufficient() -> bool public ResultCode IsStandardNetworkSystemClockAccuracySufficient(ServiceCtx context) { @@ -200,7 +200,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(201)] // 6.0.0+ + [CommandCmif(201)] // 6.0.0+ // GetStandardUserSystemClockAutomaticCorrectionUpdatedTime() -> nn::time::SteadyClockTimePoint public ResultCode GetStandardUserSystemClockAutomaticCorrectionUpdatedTime(ServiceCtx context) { @@ -216,7 +216,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(300)] // 4.0.0+ + [CommandCmif(300)] // 4.0.0+ // CalculateMonotonicSystemClockBaseTimePoint(nn::time::SystemClockContext) -> s64 public ResultCode CalculateMonotonicSystemClockBaseTimePoint(ServiceCtx context) { @@ -247,7 +247,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return result; } - [CommandHipc(400)] // 4.0.0+ + [CommandCmif(400)] // 4.0.0+ // GetClockSnapshot(u8) -> buffer public ResultCode GetClockSnapshot(ServiceCtx context) { @@ -277,7 +277,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return result; } - [CommandHipc(401)] // 4.0.0+ + [CommandCmif(401)] // 4.0.0+ // GetClockSnapshotFromSystemClockContext(u8, nn::time::SystemClockContext, nn::time::SystemClockContext) -> buffer public ResultCode GetClockSnapshotFromSystemClockContext(ServiceCtx context) { @@ -302,7 +302,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return result; } - [CommandHipc(500)] // 4.0.0+ + [CommandCmif(500)] // 4.0.0+ // CalculateStandardUserSystemClockDifferenceByUser(buffer, buffer) -> nn::TimeSpanType public ResultCode CalculateStandardUserSystemClockDifferenceByUser(ServiceCtx context) { @@ -320,7 +320,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(501)] // 4.0.0+ + [CommandCmif(501)] // 4.0.0+ // CalculateSpanBetween(buffer, buffer) -> nn::TimeSpanType public ResultCode CalculateSpanBetween(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Time/ITimeServiceManager.cs b/Ryujinx.HLE/HOS/Services/Time/ITimeServiceManager.cs index aae9aaafc..6c9c15f1b 100644 --- a/Ryujinx.HLE/HOS/Services/Time/ITimeServiceManager.cs +++ b/Ryujinx.HLE/HOS/Services/Time/ITimeServiceManager.cs @@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Time _automaticCorrectionEvent = 0; } - [CommandHipc(0)] + [CommandCmif(0)] // GetUserStaticService() -> object public ResultCode GetUserStaticService(ServiceCtx context) { @@ -31,7 +31,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(5)] + [CommandCmif(5)] // GetAdminStaticService() -> object public ResultCode GetAdminStaticService(ServiceCtx context) { @@ -40,7 +40,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(6)] + [CommandCmif(6)] // GetRepairStaticService() -> object public ResultCode GetRepairStaticService(ServiceCtx context) { @@ -49,7 +49,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(9)] + [CommandCmif(9)] // GetManufactureStaticService() -> object public ResultCode GetManufactureStaticService(ServiceCtx context) { @@ -58,7 +58,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(10)] + [CommandCmif(10)] // SetupStandardSteadyClock(nn::util::Uuid clock_source_id, nn::TimeSpanType setup_value, nn::TimeSpanType internal_offset, nn::TimeSpanType test_offset, bool is_rtc_reset_detected) public ResultCode SetupStandardSteadyClock(ServiceCtx context) { @@ -75,7 +75,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(11)] + [CommandCmif(11)] // SetupStandardLocalSystemClock(nn::time::SystemClockContext context, nn::time::PosixTime posix_time) public ResultCode SetupStandardLocalSystemClock(ServiceCtx context) { @@ -89,7 +89,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(12)] + [CommandCmif(12)] // SetupStandardNetworkSystemClock(nn::time::SystemClockContext context, nn::TimeSpanType sufficient_accuracy) public ResultCode SetupStandardNetworkSystemClock(ServiceCtx context) { @@ -101,7 +101,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(13)] + [CommandCmif(13)] // SetupStandardUserSystemClock(bool automatic_correction_enabled, nn::time::SteadyClockTimePoint steady_clock_timepoint) public ResultCode SetupStandardUserSystemClock(ServiceCtx context) { @@ -118,7 +118,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(14)] + [CommandCmif(14)] // SetupTimeZoneManager(nn::time::LocationName location_name, nn::time::SteadyClockTimePoint timezone_update_timepoint, u32 total_location_name_count, nn::time::TimeZoneRuleVersion timezone_rule_version, buffer timezone_binary) public ResultCode SetupTimeZoneManager(ServiceCtx context) { @@ -141,7 +141,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(15)] + [CommandCmif(15)] // SetupEphemeralNetworkSystemClock() public ResultCode SetupEphemeralNetworkSystemClock(ServiceCtx context) { @@ -150,7 +150,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(50)] + [CommandCmif(50)] // Unknown50() -> handle public ResultCode Unknown50(ServiceCtx context) { @@ -158,7 +158,7 @@ namespace Ryujinx.HLE.HOS.Services.Time throw new ServiceNotImplementedException(this, context); } - [CommandHipc(51)] + [CommandCmif(51)] // Unknown51() -> handle public ResultCode Unknown51(ServiceCtx context) { @@ -166,7 +166,7 @@ namespace Ryujinx.HLE.HOS.Services.Time throw new ServiceNotImplementedException(this, context); } - [CommandHipc(52)] + [CommandCmif(52)] // Unknown52() -> handle public ResultCode Unknown52(ServiceCtx context) { @@ -174,7 +174,7 @@ namespace Ryujinx.HLE.HOS.Services.Time throw new ServiceNotImplementedException(this, context); } - [CommandHipc(60)] + [CommandCmif(60)] // GetStandardUserSystemClockAutomaticCorrectionEvent() -> handle public ResultCode GetStandardUserSystemClockAutomaticCorrectionEvent(ServiceCtx context) { @@ -191,7 +191,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(100)] + [CommandCmif(100)] // SetStandardSteadyClockRtcOffset(nn::TimeSpanType rtc_offset) public ResultCode SetStandardSteadyClockRtcOffset(ServiceCtx context) { @@ -204,7 +204,7 @@ namespace Ryujinx.HLE.HOS.Services.Time return ResultCode.Success; } - [CommandHipc(200)] + [CommandCmif(200)] // GetAlarmRegistrationEvent() -> handle public ResultCode GetAlarmRegistrationEvent(ServiceCtx context) { @@ -212,7 +212,7 @@ namespace Ryujinx.HLE.HOS.Services.Time throw new ServiceNotImplementedException(this, context); } - [CommandHipc(201)] + [CommandCmif(201)] // UpdateSteadyAlarms() public ResultCode UpdateSteadyAlarms(ServiceCtx context) { @@ -220,7 +220,7 @@ namespace Ryujinx.HLE.HOS.Services.Time throw new ServiceNotImplementedException(this, context); } - [CommandHipc(202)] + [CommandCmif(202)] // TryGetNextSteadyClockAlarmSnapshot() -> (bool, nn::time::SteadyClockAlarmSnapshot) public ResultCode TryGetNextSteadyClockAlarmSnapshot(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Time/StaticService/ISteadyClock.cs b/Ryujinx.HLE/HOS/Services/Time/StaticService/ISteadyClock.cs index 1e5177131..97d7884ea 100644 --- a/Ryujinx.HLE/HOS/Services/Time/StaticService/ISteadyClock.cs +++ b/Ryujinx.HLE/HOS/Services/Time/StaticService/ISteadyClock.cs @@ -17,7 +17,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService _bypassUninitializedClock = bypassUninitializedClock; } - [CommandHipc(0)] + [CommandCmif(0)] // GetCurrentTimePoint() -> nn::time::SteadyClockTimePoint public ResultCode GetCurrentTimePoint(ServiceCtx context) { @@ -35,7 +35,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.Success; } - [CommandHipc(2)] + [CommandCmif(2)] // GetTestOffset() -> nn::TimeSpanType public ResultCode GetTestOffset(ServiceCtx context) { @@ -49,7 +49,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // SetTestOffset(nn::TimeSpanType) public ResultCode SetTestOffset(ServiceCtx context) { @@ -70,7 +70,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.Success; } - [CommandHipc(100)] // 2.0.0+ + [CommandCmif(100)] // 2.0.0+ // GetRtcValue() -> u64 public ResultCode GetRtcValue(ServiceCtx context) { @@ -89,7 +89,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return result; } - [CommandHipc(101)] // 2.0.0+ + [CommandCmif(101)] // 2.0.0+ // IsRtcResetDetected() -> bool public ResultCode IsRtcResetDetected(ServiceCtx context) { @@ -103,7 +103,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.Success; } - [CommandHipc(102)] // 2.0.0+ + [CommandCmif(102)] // 2.0.0+ // GetSetupResultValue() -> u32 public ResultCode GetSetupResultValue(ServiceCtx context) { @@ -117,7 +117,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.Success; } - [CommandHipc(200)] // 3.0.0+ + [CommandCmif(200)] // 3.0.0+ // GetInternalOffset() -> nn::TimeSpanType public ResultCode GetInternalOffset(ServiceCtx context) { @@ -131,7 +131,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.Success; } - [CommandHipc(201)] // 3.0.0-3.0.2 + [CommandCmif(201)] // 3.0.0-3.0.2 // SetInternalOffset(nn::TimeSpanType) public ResultCode SetInternalOffset(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs b/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs index c43c15820..3cd0a4a69 100644 --- a/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs +++ b/Ryujinx.HLE/HOS/Services/Time/StaticService/ISystemClock.cs @@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService _operationEventReadableHandle = 0; } - [CommandHipc(0)] + [CommandCmif(0)] // GetCurrentTime() -> nn::time::PosixTime public ResultCode GetCurrentTime(ServiceCtx context) { @@ -44,7 +44,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return result; } - [CommandHipc(1)] + [CommandCmif(1)] // SetCurrentTime(nn::time::PosixTime) public ResultCode SetCurrentTime(ServiceCtx context) { @@ -65,7 +65,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return _clockCore.SetCurrentTime(tickSource, posixTime); } - [CommandHipc(2)] + [CommandCmif(2)] // GetClockContext() -> nn::time::SystemClockContext public ResultCode GetSystemClockContext(ServiceCtx context) { @@ -86,7 +86,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return result; } - [CommandHipc(3)] + [CommandCmif(3)] // SetClockContext(nn::time::SystemClockContext) public ResultCode SetSystemClockContext(ServiceCtx context) { @@ -107,7 +107,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return result; } - [CommandHipc(4)] // 9.0.0+ + [CommandCmif(4)] // 9.0.0+ // GetOperationEventReadableHandle() -> handle public ResultCode GetOperationEventReadableHandle(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForGlue.cs b/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForGlue.cs index 265cec5dd..96a7e604f 100644 --- a/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForGlue.cs +++ b/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForGlue.cs @@ -23,14 +23,14 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService _inner = new ITimeZoneServiceForPsc(timeZoneContentManager.Manager, writePermission); } - [CommandHipc(0)] + [CommandCmif(0)] // GetDeviceLocationName() -> nn::time::LocationName public ResultCode GetDeviceLocationName(ServiceCtx context) { return _inner.GetDeviceLocationName(context); } - [CommandHipc(1)] + [CommandCmif(1)] // SetDeviceLocationName(nn::time::LocationName) public ResultCode SetDeviceLocationName(ServiceCtx context) { @@ -44,14 +44,14 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return _timeZoneContentManager.SetDeviceLocationName(locationName); } - [CommandHipc(2)] + [CommandCmif(2)] // GetTotalLocationNameCount() -> u32 public ResultCode GetTotalLocationNameCount(ServiceCtx context) { return _inner.GetTotalLocationNameCount(context); } - [CommandHipc(3)] + [CommandCmif(3)] // LoadLocationNameList(u32 index) -> (u32 outCount, buffer) public ResultCode LoadLocationNameList(ServiceCtx context) { @@ -86,7 +86,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return errorCode; } - [CommandHipc(4)] + [CommandCmif(4)] // LoadTimeZoneRule(nn::time::LocationName locationName) -> buffer public ResultCode LoadTimeZoneRule(ServiceCtx context) { @@ -111,28 +111,28 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService } } - [CommandHipc(100)] + [CommandCmif(100)] // ToCalendarTime(nn::time::PosixTime time, buffer rules) -> (nn::time::CalendarTime, nn::time::sf::CalendarAdditionalInfo) public ResultCode ToCalendarTime(ServiceCtx context) { return _inner.ToCalendarTime(context); } - [CommandHipc(101)] + [CommandCmif(101)] // ToCalendarTimeWithMyRule(nn::time::PosixTime) -> (nn::time::CalendarTime, nn::time::sf::CalendarAdditionalInfo) public ResultCode ToCalendarTimeWithMyRule(ServiceCtx context) { return _inner.ToCalendarTimeWithMyRule(context); } - [CommandHipc(201)] + [CommandCmif(201)] // ToPosixTime(nn::time::CalendarTime calendarTime, buffer rules) -> (u32 outCount, buffer) public ResultCode ToPosixTime(ServiceCtx context) { return _inner.ToPosixTime(context); } - [CommandHipc(202)] + [CommandCmif(202)] // ToPosixTimeWithMyRule(nn::time::CalendarTime calendarTime) -> (u32 outCount, buffer) public ResultCode ToPosixTimeWithMyRule(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs b/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs index e006c829e..3c9ac71f3 100644 --- a/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs +++ b/Ryujinx.HLE/HOS/Services/Time/StaticService/ITimeZoneServiceForPsc.cs @@ -23,7 +23,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService _writePermission = writePermission; } - [CommandHipc(0)] + [CommandCmif(0)] // GetDeviceLocationName() -> nn::time::LocationName public ResultCode GetDeviceLocationName(ServiceCtx context) { @@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return result; } - [CommandHipc(1)] + [CommandCmif(1)] // SetDeviceLocationName(nn::time::LocationName) public ResultCode SetDeviceLocationName(ServiceCtx context) { @@ -49,7 +49,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.NotImplemented; } - [CommandHipc(2)] + [CommandCmif(2)] // GetTotalLocationNameCount() -> u32 public ResultCode GetTotalLocationNameCount(ServiceCtx context) { @@ -63,21 +63,21 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return ResultCode.Success; } - [CommandHipc(3)] + [CommandCmif(3)] // LoadLocationNameList(u32 index) -> (u32 outCount, buffer) public ResultCode LoadLocationNameList(ServiceCtx context) { return ResultCode.NotImplemented; } - [CommandHipc(4)] + [CommandCmif(4)] // LoadTimeZoneRule(nn::time::LocationName locationName) -> buffer public ResultCode LoadTimeZoneRule(ServiceCtx context) { return ResultCode.NotImplemented; } - [CommandHipc(5)] // 2.0.0+ + [CommandCmif(5)] // 2.0.0+ // GetTimeZoneRuleVersion() -> nn::time::TimeZoneRuleVersion public ResultCode GetTimeZoneRuleVersion(ServiceCtx context) { @@ -91,7 +91,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return result; } - [CommandHipc(6)] // 5.0.0+ + [CommandCmif(6)] // 5.0.0+ // GetDeviceLocationNameAndUpdatedTime() -> (nn::time::LocationName, nn::time::SteadyClockTimePoint) public ResultCode GetDeviceLocationNameAndUpdatedTime(ServiceCtx context) { @@ -115,7 +115,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return result; } - [CommandHipc(7)] // 9.0.0+ + [CommandCmif(7)] // 9.0.0+ // SetDeviceLocationNameWithTimeZoneRule(nn::time::LocationName locationName, buffer timeZoneBinary) public ResultCode SetDeviceLocationNameWithTimeZoneRule(ServiceCtx context) { @@ -142,7 +142,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return result; } - [CommandHipc(8)] // 9.0.0+ + [CommandCmif(8)] // 9.0.0+ // ParseTimeZoneBinary(buffer timeZoneBinary) -> buffer public ResultCode ParseTimeZoneBinary(ServiceCtx context) { @@ -178,14 +178,14 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return result; } - [CommandHipc(20)] // 9.0.0+ + [CommandCmif(20)] // 9.0.0+ // GetDeviceLocationNameOperationEventReadableHandle() -> handle public ResultCode GetDeviceLocationNameOperationEventReadableHandle(ServiceCtx context) { return ResultCode.NotImplemented; } - [CommandHipc(100)] + [CommandCmif(100)] // ToCalendarTime(nn::time::PosixTime time, buffer rules) -> (nn::time::CalendarTime, nn::time::sf::CalendarAdditionalInfo) public ResultCode ToCalendarTime(ServiceCtx context) { @@ -213,7 +213,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return resultCode; } - [CommandHipc(101)] + [CommandCmif(101)] // ToCalendarTimeWithMyRule(nn::time::PosixTime) -> (nn::time::CalendarTime, nn::time::sf::CalendarAdditionalInfo) public ResultCode ToCalendarTimeWithMyRule(ServiceCtx context) { @@ -229,7 +229,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return resultCode; } - [CommandHipc(201)] + [CommandCmif(201)] // ToPosixTime(nn::time::CalendarTime calendarTime, buffer rules) -> (u32 outCount, buffer) public ResultCode ToPosixTime(ServiceCtx context) { @@ -262,7 +262,7 @@ namespace Ryujinx.HLE.HOS.Services.Time.StaticService return resultCode; } - [CommandHipc(202)] + [CommandCmif(202)] // ToPosixTimeWithMyRule(nn::time::CalendarTime calendarTime) -> (u32 outCount, buffer) public ResultCode ToPosixTimeWithMyRule(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Vi/IApplicationRootService.cs b/Ryujinx.HLE/HOS/Services/Vi/IApplicationRootService.cs index b4399c584..526cecf84 100644 --- a/Ryujinx.HLE/HOS/Services/Vi/IApplicationRootService.cs +++ b/Ryujinx.HLE/HOS/Services/Vi/IApplicationRootService.cs @@ -8,7 +8,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi { public IApplicationRootService(ServiceCtx context) : base(context.Device.System.ViServer) { } - [CommandHipc(0)] + [CommandCmif(0)] // GetDisplayService(u32) -> object public ResultCode GetDisplayService(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Vi/IManagerRootService.cs b/Ryujinx.HLE/HOS/Services/Vi/IManagerRootService.cs index 7852c613f..d564dabe7 100644 --- a/Ryujinx.HLE/HOS/Services/Vi/IManagerRootService.cs +++ b/Ryujinx.HLE/HOS/Services/Vi/IManagerRootService.cs @@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi // vi:u/m/s aren't on 3 separate threads but we can't put them together with the current ServerBase public IManagerRootService(ServiceCtx context) : base(context.Device.System.ViServerM) { } - [CommandHipc(2)] + [CommandCmif(2)] // GetDisplayService(u32) -> object public ResultCode GetDisplayService(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Vi/ISystemRootService.cs b/Ryujinx.HLE/HOS/Services/Vi/ISystemRootService.cs index f1122efe8..0dfd84f59 100644 --- a/Ryujinx.HLE/HOS/Services/Vi/ISystemRootService.cs +++ b/Ryujinx.HLE/HOS/Services/Vi/ISystemRootService.cs @@ -9,7 +9,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi // vi:u/m/s aren't on 3 separate threads but we can't put them together with the current ServerBase public ISystemRootService(ServiceCtx context) : base(context.Device.System.ViServerS) { } - [CommandHipc(1)] + [CommandCmif(1)] // GetDisplayService(u32) -> object public ResultCode GetDisplayService(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs index f40a053c6..6093381cc 100644 --- a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs +++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/IManagerDisplayService.cs @@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService _applicationDisplayService = applicationDisplayService; } - [CommandHipc(1102)] + [CommandCmif(1102)] // GetDisplayResolution(u64 display_id) -> (u64 width, u64 height) public ResultCode GetDisplayResolution(ServiceCtx context) { @@ -25,7 +25,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService return ResultCode.Success; } - [CommandHipc(2010)] + [CommandCmif(2010)] // CreateManagedLayer(u32, u64, nn::applet::AppletResourceUserId) -> u64 public ResultCode CreateManagedLayer(ServiceCtx context) { @@ -43,7 +43,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService return ResultCode.Success; } - [CommandHipc(2011)] + [CommandCmif(2011)] // DestroyManagedLayer(u64) public ResultCode DestroyManagedLayer(ServiceCtx context) { @@ -52,14 +52,14 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService return context.Device.System.SurfaceFlinger.DestroyManagedLayer(layerId); } - [CommandHipc(2012)] // 7.0.0+ + [CommandCmif(2012)] // 7.0.0+ // CreateStrayLayer(u32, u64) -> (u64, u64, buffer) public ResultCode CreateStrayLayer(ServiceCtx context) { return _applicationDisplayService.CreateStrayLayer(context); } - [CommandHipc(6000)] + [CommandCmif(6000)] // AddToLayerStack(u32, u64) public ResultCode AddToLayerStack(ServiceCtx context) { @@ -68,7 +68,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService return ResultCode.Success; } - [CommandHipc(6002)] + [CommandCmif(6002)] // SetLayerVisibility(b8, u64) public ResultCode SetLayerVisibility(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/ISystemDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/ISystemDisplayService.cs index 82dd6af63..a24aa0798 100644 --- a/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/ISystemDisplayService.cs +++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/ApplicationDisplayService/ISystemDisplayService.cs @@ -11,7 +11,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService _applicationDisplayService = applicationDisplayService; } - [CommandHipc(2205)] + [CommandCmif(2205)] // SetLayerZ(u64, u64) public ResultCode SetLayerZ(ServiceCtx context) { @@ -20,7 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService return ResultCode.Success; } - [CommandHipc(2207)] + [CommandCmif(2207)] // SetLayerVisibility(b8, u64) public ResultCode SetLayerVisibility(ServiceCtx context) { @@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService return ResultCode.Success; } - [CommandHipc(2312)] // 1.0.0-6.2.0 + [CommandCmif(2312)] // 1.0.0-6.2.0 // CreateStrayLayer(u32, u64) -> (u64, u64, buffer) public ResultCode CreateStrayLayer(ServiceCtx context) { @@ -38,7 +38,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService return _applicationDisplayService.CreateStrayLayer(context); } - [CommandHipc(3200)] + [CommandCmif(3200)] // GetDisplayMode(u64) -> nn::vi::DisplayModeInfo public ResultCode GetDisplayMode(ServiceCtx context) { diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs index 085d6c519..52ed52220 100644 --- a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs +++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs @@ -62,7 +62,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService AddDisplayInfo("Null", false, 0, 1920, 1080); } - [CommandHipc(100)] + [CommandCmif(100)] // GetRelayService() -> object public ResultCode GetRelayService(ServiceCtx context) { @@ -77,7 +77,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(101)] + [CommandCmif(101)] // GetSystemDisplayService() -> object public ResultCode GetSystemDisplayService(ServiceCtx context) { @@ -92,7 +92,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(102)] + [CommandCmif(102)] // GetManagerDisplayService() -> object public ResultCode GetManagerDisplayService(ServiceCtx context) { @@ -106,7 +106,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(103)] // 2.0.0+ + [CommandCmif(103)] // 2.0.0+ // GetIndirectDisplayTransactionService() -> object public ResultCode GetIndirectDisplayTransactionService(ServiceCtx context) { @@ -120,7 +120,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(1000)] + [CommandCmif(1000)] // ListDisplays() -> (u64 count, buffer) public ResultCode ListDisplays(ServiceCtx context) { @@ -139,7 +139,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(1010)] + [CommandCmif(1010)] // OpenDisplay(nn::vi::DisplayName) -> u64 display_id public ResultCode OpenDisplay(ServiceCtx context) { @@ -158,7 +158,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return OpenDisplayImpl(context, name); } - [CommandHipc(1011)] + [CommandCmif(1011)] // OpenDefaultDisplay() -> u64 display_id public ResultCode OpenDefaultDisplay(ServiceCtx context) { @@ -189,7 +189,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(1020)] + [CommandCmif(1020)] // CloseDisplay(u64 display_id) public ResultCode CloseDisplay(ServiceCtx context) { @@ -203,7 +203,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(1101)] + [CommandCmif(1101)] // SetDisplayEnabled(u32 enabled_bool, u64 display_id) public ResultCode SetDisplayEnabled(ServiceCtx context) { @@ -211,7 +211,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(1102)] + [CommandCmif(1102)] // GetDisplayResolution(u64 display_id) -> (u64 width, u64 height) public ResultCode GetDisplayResolution(ServiceCtx context) { @@ -227,7 +227,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(2020)] + [CommandCmif(2020)] // OpenLayer(nn::vi::DisplayName, u64, nn::applet::AppletResourceUserId, pid) -> (u64, buffer) public ResultCode OpenLayer(ServiceCtx context) { @@ -260,7 +260,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(2021)] + [CommandCmif(2021)] // CloseLayer(u64) public ResultCode CloseLayer(ServiceCtx context) { @@ -269,7 +269,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return context.Device.System.SurfaceFlinger.CloseLayer(layerId); } - [CommandHipc(2030)] + [CommandCmif(2030)] // CreateStrayLayer(u32, u64) -> (u64, u64, buffer) public ResultCode CreateStrayLayer(ServiceCtx context) { @@ -297,7 +297,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(2031)] + [CommandCmif(2031)] // DestroyStrayLayer(u64) public ResultCode DestroyStrayLayer(ServiceCtx context) { @@ -306,7 +306,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return context.Device.System.SurfaceFlinger.DestroyStrayLayer(layerId); } - [CommandHipc(2101)] + [CommandCmif(2101)] // SetLayerScalingMode(u32, u64) public ResultCode SetLayerScalingMode(ServiceCtx context) { @@ -319,7 +319,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(2102)] // 5.0.0+ + [CommandCmif(2102)] // 5.0.0+ // ConvertScalingMode(u32 source_scaling_mode) -> u64 destination_scaling_mode public ResultCode ConvertScalingMode(ServiceCtx context) { @@ -366,7 +366,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return (requiredMemorySize + defaultSize - 1) / defaultSize * defaultSize; } - [CommandHipc(2450)] + [CommandCmif(2450)] // GetIndirectLayerImageMap(s64 width, s64 height, u64 handle, nn::applet::AppletResourceUserId, pid) -> (s64, s64, buffer) public ResultCode GetIndirectLayerImageMap(ServiceCtx context) { @@ -413,7 +413,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(2460)] + [CommandCmif(2460)] // GetIndirectLayerImageRequiredMemoryInfo(u64 width, u64 height) -> (u64 size, u64 alignment) public ResultCode GetIndirectLayerImageRequiredMemoryInfo(ServiceCtx context) { @@ -454,7 +454,7 @@ namespace Ryujinx.HLE.HOS.Services.Vi.RootService return ResultCode.Success; } - [CommandHipc(5202)] + [CommandCmif(5202)] // GetDisplayVsyncEvent(u64) -> handle public ResultCode GetDisplayVSyncEvent(ServiceCtx context) {