IStorage

src/Ryujinx.Horizon/Sdk/Am/Controllers/IAppletCommonFunctions.cs

@@ -1,8 +1,9 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
-    public interface IAppletCommonFunctions
+    interface IAppletCommonFunctions : IServiceObject
     {
         Result SetTerminateResult();
         Result ReadThemeStorage();

src/Ryujinx.Horizon/Sdk/Am/Controllers/IApplicationFunctions.cs

@@ -1,8 +1,9 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
-    public interface IApplicationFunctions
+    interface IApplicationFunctions : IServiceObject
     {
         Result PopLaunchParameter();
         Result CreateApplicationAndPushAndRequestToStart();

src/Ryujinx.Horizon/Sdk/Am/Controllers/IAudioController.cs

@@ -1,8 +1,9 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
-    public interface IAudioController
+    interface IAudioController : IServiceObject
     {
         Result SetExpectedMasterVolume(float mainAppletVolume, float libraryAppletVolume);
         Result GetMainAppletExpectedMasterVolume(out float mainAppletVolume);

src/Ryujinx.Horizon/Sdk/Am/Controllers/ICommonStateGetter.cs

@@ -1,8 +1,9 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
-    public interface ICommonStateGetter
+    interface ICommonStateGetter : IServiceObject
     {
         Result GetEventHandle();
         Result ReceiveMessage();

src/Ryujinx.Horizon/Sdk/Am/Controllers/IDebugFunctions.cs

@@ -1,8 +1,9 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
-    public interface IDebugFunctions
+    interface IDebugFunctions : IServiceObject
     {
         Result NotifyMessageToHomeMenuForDebug();
         Result OpenMainApplication();

src/Ryujinx.Horizon/Sdk/Am/Controllers/ILibraryAppletCreator.cs

@@ -1,8 +1,9 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
-    public interface ILibraryAppletCreator
+    interface ILibraryAppletCreator : IServiceObject
     {
         Result CreateLibraryApplet();
         Result TerminateAllLibraryApplets();

src/Ryujinx.Horizon/Sdk/Am/Controllers/ILibraryAppletSelfAccessor.cs

@@ -1,8 +1,9 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
-    public interface ILibraryAppletSelfAccessor
+    interface ILibraryAppletSelfAccessor : IServiceObject
     {
         Result PopInData();
         Result PushOutData();

src/Ryujinx.Horizon/Sdk/Am/Controllers/IOverlayFunctions.cs

@@ -1,8 +1,9 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
-    public interface IOverlayFunctions
+    interface IOverlayFunctions : IServiceObject
     {
         Result BeginToWatchShortHomeButtonMessage();
         Result EndToWatchShortHomeButtonMessage();

src/Ryujinx.Horizon/Sdk/Am/Controllers/IProcessWindingController.cs

@@ -1,8 +1,9 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
-    public interface IProcessWindingController
+    interface IProcessWindingController : IServiceObject
     {
         Result GetLaunchReason();
         Result OpenCallingLibraryApplet();

src/Ryujinx.Horizon/Sdk/Am/Controllers/ISelfController.cs

@@ -1,8 +1,9 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
-    public interface ISelfController
+    interface ISelfController : IServiceObject
     {
         Result Exit();
         Result LockExit();

src/Ryujinx.Horizon/Sdk/Am/Controllers/IWindowController.cs

@@ -1,9 +1,10 @@
 using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
 using System;
 
 namespace Ryujinx.Horizon.Sdk.Am.Controllers
 {
-    public interface IWindowController
+    interface IWindowController : IServiceObject
     {
         Result CreateWindow();
         Result GetAppletResourceUserId();

src/Ryujinx.Horizon/Sdk/Am/Proxies/IApplicationProxy.cs

@@ -1,9 +1,10 @@
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am.Controllers;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Proxies
 {
-    public interface IApplicationProxy
+    interface IApplicationProxy : IServiceObject
     {
         Result GetCommonStateGetter(out ICommonStateGetter commonStateGetter);
         Result GetSelfController(out ISelfController selfController);

src/Ryujinx.Horizon/Sdk/Am/Proxies/ILibraryAppletProxy.cs

@@ -1,9 +1,10 @@
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am.Controllers;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Proxies
 {
-    public interface ILibraryAppletProxy
+    interface ILibraryAppletProxy : IServiceObject
     {
         Result GetCommonStateGetter(out ICommonStateGetter commonStateGetter);
         Result GetSelfController(out ISelfController selfController);

src/Ryujinx.Horizon/Sdk/Am/Proxies/IOverlayAppletProxy.cs

@@ -1,9 +1,10 @@
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am.Controllers;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Proxies
 {
-    public interface IOverlayAppletProxy
+    interface IOverlayAppletProxy : IServiceObject
     {
         Result GetCommonStateGetter(out ICommonStateGetter commonStateGetter);
         Result GetSelfController(out ISelfController selfController);

src/Ryujinx.Horizon/Sdk/Am/Proxies/ISystemAppletProxy.cs

@@ -1,9 +1,10 @@
 using Ryujinx.Horizon.Common;
 using Ryujinx.Horizon.Sdk.Am.Controllers;
+using Ryujinx.Horizon.Sdk.Sf;
 
 namespace Ryujinx.Horizon.Sdk.Am.Proxies
 {
-    public interface ISystemAppletProxy
+    interface ISystemAppletProxy : IServiceObject
     {
         Result GetCommonStateGetter(out ICommonStateGetter commonStateGetter);
         Result GetSelfController(out ISelfController selfController);

src/Ryujinx.Horizon/Sdk/Am/Storage/IStorage.cs

@@ -0,0 +1,12 @@
+using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
+
+namespace Ryujinx.Horizon.Sdk.Am.Storage
+{
+    interface IStorage : IServiceObject
+    {
+        Result Open(out IStorageAccessor arg0);
+        Result OpenTransferStorage(out ITransferStorageAccessor arg0);
+        Result GetAndInvalidate(out IStorage arg0);
+    }
+}

src/Ryujinx.Horizon/Sdk/Am/Storage/IStorageAccessor.cs

@@ -0,0 +1,13 @@
+using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
+using System;
+
+namespace Ryujinx.Horizon.Sdk.Am.Storage
+{
+    interface IStorageAccessor : IServiceObject
+    {
+        Result GetSize(out long arg0);
+        Result Write(long arg0, ReadOnlySpan<byte> arg1);
+        Result Read(long arg0, Span<byte> arg1);
+    }
+}

src/Ryujinx.Horizon/Sdk/Am/Storage/IStorageChannel.cs

@@ -0,0 +1,14 @@
+using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
+
+namespace Ryujinx.Horizon.Sdk.Am.Storage
+{
+    interface IStorageChannel : IServiceObject
+    {
+        Result Push(IStorage arg0);
+        Result Unpop(IStorage arg0);
+        Result Pop(out IStorage arg0);
+        Result GetPopEventHandle(out int arg0);
+        Result Clear();
+    }
+}

src/Ryujinx.Horizon/Sdk/Am/Storage/ITransferStorageAccessor.cs

@@ -0,0 +1,11 @@
+using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.Sf;
+
+namespace Ryujinx.Horizon.Sdk.Am.Storage
+{
+    interface ITransferStorageAccessor : IServiceObject
+    {
+        Result GetSize(out long arg0);
+        Result GetHandle(out int arg0, out ulong arg1);
+    }
+}