From a0720b5681852f3d786d77bd3793b0359dea321c Mon Sep 17 00:00:00 2001
From: Ac_K <Acoustik666@gmail.com>
Date: Thu, 19 Sep 2019 02:45:11 +0200
Subject: Refactoring HOS folder structure (#771)

* Refactoring HOS folder structure

Refactoring HOS folder structure:

- Added some subfolders when needed (Following structure decided in private).
- Added some `Types` folders when needed.
- Little cleanup here and there.
- Add services placeholders for every HOS services (close #766 and #753).

* Remove Types namespaces
---
 .../ServiceCreator/FriendService/Types/Friend.cs   | 29 ++++++++++++++++++++++
 .../FriendService/Types/FriendFilter.cs            | 24 ++++++++++++++++++
 .../FriendService/Types/PresenceStatus.cs          |  9 +++++++
 .../FriendService/Types/PresenceStatusFilter.cs    | 10 ++++++++
 .../FriendService/Types/UserPresence.cs            | 27 ++++++++++++++++++++
 5 files changed, 99 insertions(+)
 create mode 100644 Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/Friend.cs
 create mode 100644 Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/FriendFilter.cs
 create mode 100644 Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/PresenceStatus.cs
 create mode 100644 Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/PresenceStatusFilter.cs
 create mode 100644 Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/UserPresence.cs

(limited to 'Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService')

diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/Friend.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/Friend.cs
new file mode 100644
index 00000000..4947a5ce
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/Friend.cs
@@ -0,0 +1,29 @@
+using Ryujinx.HLE.Utilities;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.FriendService
+{
+    [StructLayout(LayoutKind.Sequential, Pack = 0x8, Size = 0x200, CharSet = CharSet.Ansi)]
+    struct Friend
+    {
+        public UInt128 UserId;
+        public long    NetworkUserId;
+
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x21)]
+        public string Nickname;
+
+        public UserPresence presence;
+
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsFavourite;
+
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsNew;
+
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x6)]
+        char[] Unknown;
+
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsValid;
+    }
+}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/FriendFilter.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/FriendFilter.cs
new file mode 100644
index 00000000..261bf7bf
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/FriendFilter.cs
@@ -0,0 +1,24 @@
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.FriendService
+{
+    [StructLayout(LayoutKind.Sequential)]
+    struct FriendFilter
+    {
+        public PresenceStatusFilter PresenceStatus;
+
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsFavoriteOnly;
+
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsSameAppPresenceOnly;
+
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsSameAppPlayedOnly;
+
+        [MarshalAs(UnmanagedType.I1)]
+        public bool IsArbitraryAppPlayedOnly;
+
+        public long PresenceGroupId;
+    }
+}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/PresenceStatus.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/PresenceStatus.cs
new file mode 100644
index 00000000..df2e6525
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/PresenceStatus.cs
@@ -0,0 +1,9 @@
+namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.FriendService
+{
+    enum PresenceStatus : uint
+    {
+        Offline,
+        Online,
+        OnlinePlay
+    }
+}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/PresenceStatusFilter.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/PresenceStatusFilter.cs
new file mode 100644
index 00000000..24da7fd3
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/PresenceStatusFilter.cs
@@ -0,0 +1,10 @@
+namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.FriendService
+{
+    enum PresenceStatusFilter : uint
+    {
+        None,
+        Online,
+        OnlinePlay,
+        OnlineOrOnlinePlay
+    }
+}
\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/UserPresence.cs b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/UserPresence.cs
new file mode 100644
index 00000000..5fe8bfd7
--- /dev/null
+++ b/Ryujinx.HLE/HOS/Services/Friend/ServiceCreator/FriendService/Types/UserPresence.cs
@@ -0,0 +1,27 @@
+using Ryujinx.HLE.Utilities;
+using System.Runtime.InteropServices;
+
+namespace Ryujinx.HLE.HOS.Services.Friend.ServiceCreator.FriendService
+{
+    [StructLayout(LayoutKind.Sequential, Pack = 0x8, CharSet = CharSet.Ansi)]
+    struct UserPresence
+    {
+        public UInt128        UserId;
+        public long           LastTimeOnlineTimestamp;
+        public PresenceStatus Status;
+
+        [MarshalAs(UnmanagedType.I1)]
+        public bool SamePresenceGroupApplication;
+
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x3)]
+        public char[] Unknown;
+
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0xC0)]
+        public char[] AppKeyValueStorage;
+
+        public override string ToString()
+        {
+            return $"UserPresence {{ UserId: {UserId}, LastTimeOnlineTimestamp: {LastTimeOnlineTimestamp}, Status: {Status}, AppKeyValueStorage: {AppKeyValueStorage} }}";
+        }
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3