Rename Hipc to Cmif where appropriate (#3880)

2023-04-14 16:00:34 -07:00 · 2023-04-14 16:00:34 -07:00 · 11ecff2ff0
commit 11ecff2ff0
parent 4c3f09644a
149 changed files with 1152 additions and 1153 deletions
--- 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<nn::timesrv::detail::service::ISystemClock>
        public ResultCode GetStandardUserSystemClock(ServiceCtx context)
        {
            return _inner.GetStandardUserSystemClock(context);
        }

-        [CommandHipc(1)]
+        [CommandCmif(1)]
        // GetStandardNetworkSystemClock() -> object<nn::timesrv::detail::service::ISystemClock>
        public ResultCode GetStandardNetworkSystemClock(ServiceCtx context)
        {
            return _inner.GetStandardNetworkSystemClock(context);
        }

-        [CommandHipc(2)]
+        [CommandCmif(2)]
        // GetStandardSteadyClock() -> object<nn::timesrv::detail::service::ISteadyClock>
        public ResultCode GetStandardSteadyClock(ServiceCtx context)
        {
            return _inner.GetStandardSteadyClock(context);
        }

-        [CommandHipc(3)]
+        [CommandCmif(3)]
        // GetTimeZoneService() -> object<nn::timesrv::detail::service::ITimeZoneService>
        public ResultCode GetTimeZoneService(ServiceCtx context)
        {
@ -53,28 +53,28 @@ namespace Ryujinx.HLE.HOS.Services.Time
            return ResultCode.Success;
        }

-        [CommandHipc(4)]
+        [CommandCmif(4)]
        // GetStandardLocalSystemClock() -> object<nn::timesrv::detail::service::ISystemClock>
        public ResultCode GetStandardLocalSystemClock(ServiceCtx context)
        {
            return _inner.GetStandardLocalSystemClock(context);
        }

-        [CommandHipc(5)] // 4.0.0+
+        [CommandCmif(5)] // 4.0.0+
        // GetEphemeralNetworkSystemClock() -> object<nn::timesrv::detail::service::ISystemClock>
        public ResultCode GetEphemeralNetworkSystemClock(ServiceCtx context)
        {
            return _inner.GetEphemeralNetworkSystemClock(context);
        }

-        [CommandHipc(20)] // 6.0.0+
+        [CommandCmif(20)] // 6.0.0+
        // GetSharedMemoryNativeHandle() -> handle<copy>
        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<nn::time::sf::ClockSnapshot, 0x1a>
        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<nn::time::sf::ClockSnapshot, 0x1a>
        public ResultCode GetClockSnapshotFromSystemClockContext(ServiceCtx context)
        {
            return _inner.GetClockSnapshotFromSystemClockContext(context);
        }

-        [CommandHipc(500)] // 4.0.0+
+        [CommandCmif(500)] // 4.0.0+
        // CalculateStandardUserSystemClockDifferenceByUser(buffer<nn::time::sf::ClockSnapshot, 0x19>, buffer<nn::time::sf::ClockSnapshot, 0x19>) -> nn::TimeSpanType
        public ResultCode CalculateStandardUserSystemClockDifferenceByUser(ServiceCtx context)
        {
            return _inner.CalculateStandardUserSystemClockDifferenceByUser(context);
        }

-        [CommandHipc(501)] // 4.0.0+
+        [CommandCmif(501)] // 4.0.0+
        // CalculateSpanBetween(buffer<nn::time::sf::ClockSnapshot, 0x19>, buffer<nn::time::sf::ClockSnapshot, 0x19>) -> nn::TimeSpanType
        public ResultCode CalculateSpanBetween(ServiceCtx context)
        {
--- 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<nn::timesrv::detail::service::ISystemClock>
        public ResultCode GetStandardUserSystemClock(ServiceCtx context)
        {
@ -42,7 +42,7 @@ namespace Ryujinx.HLE.HOS.Services.Time
            return ResultCode.Success;
        }

-        [CommandHipc(1)]
+        [CommandCmif(1)]
        // GetStandardNetworkSystemClock() -> object<nn::timesrv::detail::service::ISystemClock>
        public ResultCode GetStandardNetworkSystemClock(ServiceCtx context)
        {
@ -53,7 +53,7 @@ namespace Ryujinx.HLE.HOS.Services.Time
            return ResultCode.Success;
        }

-        [CommandHipc(2)]
+        [CommandCmif(2)]
        // GetStandardSteadyClock() -> object<nn::timesrv::detail::service::ISteadyClock>
        public ResultCode GetStandardSteadyClock(ServiceCtx context)
        {
@ -64,7 +64,7 @@ namespace Ryujinx.HLE.HOS.Services.Time
            return ResultCode.Success;
        }

-        [CommandHipc(3)]
+        [CommandCmif(3)]
        // GetTimeZoneService() -> object<nn::timesrv::detail::service::ITimeZoneService>
        public ResultCode GetTimeZoneService(ServiceCtx context)
        {
@ -74,7 +74,7 @@ namespace Ryujinx.HLE.HOS.Services.Time
            return ResultCode.Success;
        }

-        [CommandHipc(4)]
+        [CommandCmif(4)]
        // GetStandardLocalSystemClock() -> object<nn::timesrv::detail::service::ISystemClock>
        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<nn::timesrv::detail::service::ISystemClock>
        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<copy>
        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<nn::time::sf::ClockSnapshot, 0x1a>
        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<nn::time::sf::ClockSnapshot, 0x1a>
        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<nn::time::sf::ClockSnapshot, 0x19>, buffer<nn::time::sf::ClockSnapshot, 0x19>) -> 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<nn::time::sf::ClockSnapshot, 0x19>, buffer<nn::time::sf::ClockSnapshot, 0x19>) -> nn::TimeSpanType
        public ResultCode CalculateSpanBetween(ServiceCtx context)
        {
--- 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<nn::timesrv::detail::service::IStaticService>
        public ResultCode GetUserStaticService(ServiceCtx context)
        {
@ -31,7 +31,7 @@ namespace Ryujinx.HLE.HOS.Services.Time
            return ResultCode.Success;
        }

-        [CommandHipc(5)]
+        [CommandCmif(5)]
        // GetAdminStaticService() -> object<nn::timesrv::detail::service::IStaticService>
        public ResultCode GetAdminStaticService(ServiceCtx context)
        {
@ -40,7 +40,7 @@ namespace Ryujinx.HLE.HOS.Services.Time
            return ResultCode.Success;
        }

-        [CommandHipc(6)]
+        [CommandCmif(6)]
        // GetRepairStaticService() -> object<nn::timesrv::detail::service::IStaticService>
        public ResultCode GetRepairStaticService(ServiceCtx context)
        {
@ -49,7 +49,7 @@ namespace Ryujinx.HLE.HOS.Services.Time
            return ResultCode.Success;
        }

-        [CommandHipc(9)]
+        [CommandCmif(9)]
        // GetManufactureStaticService() -> object<nn::timesrv::detail::service::IStaticService>
        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<nn::time::TimeZoneBinary, 0x21> 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<copy>
        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<copy>
        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<copy>
        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<copy>
        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<copy>
        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)
        {
--- 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)
        {
--- 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<copy>
        public ResultCode GetOperationEventReadableHandle(ServiceCtx context)
        {
--- 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<nn::time::LocationName, 6>)
        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<nn::time::TimeZoneRule, 0x16>
        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<nn::time::TimeZoneRule, 0x15> 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<nn::time::TimeZoneRule, 0x15> rules) -> (u32 outCount, buffer<nn::time::PosixTime, 0xa>)
        public ResultCode ToPosixTime(ServiceCtx context)
        {
            return _inner.ToPosixTime(context);
        }

-        [CommandHipc(202)]
+        [CommandCmif(202)]
        // ToPosixTimeWithMyRule(nn::time::CalendarTime calendarTime) -> (u32 outCount, buffer<nn::time::PosixTime, 0xa>)
        public ResultCode ToPosixTimeWithMyRule(ServiceCtx context)
        {
--- 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<nn::time::LocationName, 6>)
        public ResultCode LoadLocationNameList(ServiceCtx context)
        {
            return ResultCode.NotImplemented;
        }

-        [CommandHipc(4)]
+        [CommandCmif(4)]
        // LoadTimeZoneRule(nn::time::LocationName locationName) -> buffer<nn::time::TimeZoneRule, 0x16>
        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<nn::time::TimeZoneBinary, 0x21> 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<nn::time::TimeZoneBinary, 0x21> timeZoneBinary) -> buffer<nn::time::TimeZoneRule, 0x16>
        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<copy>
        public ResultCode GetDeviceLocationNameOperationEventReadableHandle(ServiceCtx context)
        {
            return ResultCode.NotImplemented;
        }

-        [CommandHipc(100)]
+        [CommandCmif(100)]
        // ToCalendarTime(nn::time::PosixTime time, buffer<nn::time::TimeZoneRule, 0x15> 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<nn::time::TimeZoneRule, 0x15> rules) -> (u32 outCount, buffer<nn::time::PosixTime, 0xa>)
        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<nn::time::PosixTime, 0xa>)
        public ResultCode ToPosixTimeWithMyRule(ServiceCtx context)
        {