From e2cbb0898caf2e89451fc3a7db1937281a03c9cd Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Sat, 2 Sep 2023 23:27:23 -0700 Subject: [PATCH] Diff GcSrv and SdmmcSrv with FS 16 --- src/LibHac/GcSrv/DummyGameCardManager.cs | 2 +- src/LibHac/GcSrv/GameCardDetectionEventManager.cs | 2 +- src/LibHac/GcSrv/GameCardDeviceOperator.cs | 2 +- src/LibHac/GcSrv/GameCardManager.cs | 2 +- src/LibHac/GcSrv/GameCardStorage.cs | 6 +++--- src/LibHac/GcSrv/GameCardStorageDevice.cs | 2 +- src/LibHac/GcSrv/GcSrvEnums.cs | 6 +++--- src/LibHac/GcSrv/IGameCardKeyManager.cs | 2 +- src/LibHac/GcSrv/IGameCardManager.cs | 2 +- src/LibHac/SdmmcSrv/ISdmmcDeviceManager.cs | 2 +- src/LibHac/SdmmcSrv/MmcDeviceOperator.cs | 2 +- src/LibHac/SdmmcSrv/MmcManager.cs | 2 +- src/LibHac/SdmmcSrv/MmcPartitionStorageDevice.cs | 8 ++++---- src/LibHac/SdmmcSrv/PatrolReader.cs | 2 +- src/LibHac/SdmmcSrv/SdCardDetectionEventManager.cs | 2 +- src/LibHac/SdmmcSrv/SdCardDeviceOperator.cs | 2 +- src/LibHac/SdmmcSrv/SdCardManager.cs | 2 +- src/LibHac/SdmmcSrv/SdCardStorageDevice.cs | 2 +- src/LibHac/SdmmcSrv/SdmmcResultConverter.cs | 2 +- src/LibHac/SdmmcSrv/SdmmcSrvEnums.cs | 8 ++++---- src/LibHac/SdmmcSrv/SdmmcStorage.cs | 4 ++-- 21 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/LibHac/GcSrv/DummyGameCardManager.cs b/src/LibHac/GcSrv/DummyGameCardManager.cs index cc526a76..89c9166b 100644 --- a/src/LibHac/GcSrv/DummyGameCardManager.cs +++ b/src/LibHac/GcSrv/DummyGameCardManager.cs @@ -13,7 +13,7 @@ namespace LibHac.GcSrv; /// /// The game card manager used on consoles without a game card slot. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public class DummyGameCardManager : IStorageDeviceManager, IStorageDeviceOperator, IGameCardKeyManager { private SharedRef _eventNotifier; diff --git a/src/LibHac/GcSrv/GameCardDetectionEventManager.cs b/src/LibHac/GcSrv/GameCardDetectionEventManager.cs index 64079916..b922ae41 100644 --- a/src/LibHac/GcSrv/GameCardDetectionEventManager.cs +++ b/src/LibHac/GcSrv/GameCardDetectionEventManager.cs @@ -6,7 +6,7 @@ namespace LibHac.GcSrv; /// /// Manages registering events and signaling them when a game card is inserted or removed. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class GameCardDetectionEventManager : CardDeviceDetectionEventManager { private IGcApi _gc; diff --git a/src/LibHac/GcSrv/GameCardDeviceOperator.cs b/src/LibHac/GcSrv/GameCardDeviceOperator.cs index 8ecd7f34..05489649 100644 --- a/src/LibHac/GcSrv/GameCardDeviceOperator.cs +++ b/src/LibHac/GcSrv/GameCardDeviceOperator.cs @@ -14,7 +14,7 @@ namespace LibHac.GcSrv; /// Performs various operations on the inserted game card. /// All available operations are listed in . /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class GameCardDeviceOperator : IStorageDeviceOperator { private SharedRef _storageDevice; diff --git a/src/LibHac/GcSrv/GameCardManager.cs b/src/LibHac/GcSrv/GameCardManager.cs index b1cb8f23..7be31806 100644 --- a/src/LibHac/GcSrv/GameCardManager.cs +++ b/src/LibHac/GcSrv/GameCardManager.cs @@ -29,7 +29,7 @@ namespace LibHac.GcSrv; /// from the game card after the card has been swapped. /// This class implements the interface, and all available operations are /// listed in . -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public class GameCardManager : IStorageDeviceManager, IStorageDeviceOperator, IGameCardManager, IGameCardKeyManager { private enum CardState diff --git a/src/LibHac/GcSrv/GameCardStorage.cs b/src/LibHac/GcSrv/GameCardStorage.cs index c20b0a92..c2fa6e39 100644 --- a/src/LibHac/GcSrv/GameCardStorage.cs +++ b/src/LibHac/GcSrv/GameCardStorage.cs @@ -14,7 +14,7 @@ namespace LibHac.GcSrv; /// /// Provides an interface for reading from the game card. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class ReadOnlyGameCardStorage : IStorage { private SharedRef _deviceManager; @@ -97,7 +97,7 @@ internal class ReadOnlyGameCardStorage : IStorage /// /// Provides an interface for writing to the game card. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class WriteOnlyGameCardStorage : IStorage { private SharedRef _deviceManager; @@ -168,7 +168,7 @@ internal class WriteOnlyGameCardStorage : IStorage /// An adapter that directly translates sf calls to calls with no checks /// or validations. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal abstract class GameCardStorageInterfaceAdapter : IStorageSf { private SharedRef _baseStorage; diff --git a/src/LibHac/GcSrv/GameCardStorageDevice.cs b/src/LibHac/GcSrv/GameCardStorageDevice.cs index f71aa12c..a1d55e33 100644 --- a/src/LibHac/GcSrv/GameCardStorageDevice.cs +++ b/src/LibHac/GcSrv/GameCardStorageDevice.cs @@ -13,7 +13,7 @@ namespace LibHac.GcSrv; /// /// An that handles interacting with the currently inserted game card. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class GameCardStorageDevice : GameCardStorageInterfaceAdapter, IStorageDevice { private SharedRef _manager; diff --git a/src/LibHac/GcSrv/GcSrvEnums.cs b/src/LibHac/GcSrv/GcSrvEnums.cs index 972374f3..e0d83f1e 100644 --- a/src/LibHac/GcSrv/GcSrvEnums.cs +++ b/src/LibHac/GcSrv/GcSrvEnums.cs @@ -3,7 +3,7 @@ /// /// The operations that can perform on the game card ASIC and writable game cards. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public enum GameCardManagerOperationIdValue { Finalize = 1, @@ -25,7 +25,7 @@ public enum GameCardManagerOperationIdValue /// /// The operations that can perform on the inserted game card. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public enum GameCardOperationIdValue { EraseGameCard = 1, @@ -40,7 +40,7 @@ public enum GameCardOperationIdValue /// /// Specifies which mode the game card storage should be opened as. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public enum OpenGameCardAttribute : long { ReadOnly = 0, diff --git a/src/LibHac/GcSrv/IGameCardKeyManager.cs b/src/LibHac/GcSrv/IGameCardKeyManager.cs index 011f2862..eed9601d 100644 --- a/src/LibHac/GcSrv/IGameCardKeyManager.cs +++ b/src/LibHac/GcSrv/IGameCardKeyManager.cs @@ -5,7 +5,7 @@ namespace LibHac.GcSrv; /// /// Sets the certificate and key used for communicating with the game card ASIC. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public interface IGameCardKeyManager : IDisposable { void PresetInternalKeys(ReadOnlySpan gameCardKey, ReadOnlySpan gameCardCertificate); diff --git a/src/LibHac/GcSrv/IGameCardManager.cs b/src/LibHac/GcSrv/IGameCardManager.cs index c6176b39..b43fa855 100644 --- a/src/LibHac/GcSrv/IGameCardManager.cs +++ b/src/LibHac/GcSrv/IGameCardManager.cs @@ -6,7 +6,7 @@ namespace LibHac.GcSrv; /// /// Handles granting access to the game card, and keeps track of the current game card handle. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal interface IGameCardManager : IDisposable { Result AcquireReadLock(ref SharedLock outLock, GameCardHandle handle); diff --git a/src/LibHac/SdmmcSrv/ISdmmcDeviceManager.cs b/src/LibHac/SdmmcSrv/ISdmmcDeviceManager.cs index 7e9f37a6..6703b187 100644 --- a/src/LibHac/SdmmcSrv/ISdmmcDeviceManager.cs +++ b/src/LibHac/SdmmcSrv/ISdmmcDeviceManager.cs @@ -8,7 +8,7 @@ namespace LibHac.SdmmcSrv; /// /// Manages locking and getting the storage from sdmmc devices. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal interface ISdmmcDeviceManager : IDisposable { Result Lock(ref UniqueLockRef outLock, SdmmcHandle handle); diff --git a/src/LibHac/SdmmcSrv/MmcDeviceOperator.cs b/src/LibHac/SdmmcSrv/MmcDeviceOperator.cs index 8de8f47c..03e48114 100644 --- a/src/LibHac/SdmmcSrv/MmcDeviceOperator.cs +++ b/src/LibHac/SdmmcSrv/MmcDeviceOperator.cs @@ -16,7 +16,7 @@ namespace LibHac.SdmmcSrv; /// Performs various operations on the internal MMC storage. /// All available operations are listed in . /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class MmcDeviceOperator : IStorageDeviceOperator { private SharedRef _storageDevice; diff --git a/src/LibHac/SdmmcSrv/MmcManager.cs b/src/LibHac/SdmmcSrv/MmcManager.cs index 1a09a7f3..12c1f0d6 100644 --- a/src/LibHac/SdmmcSrv/MmcManager.cs +++ b/src/LibHac/SdmmcSrv/MmcManager.cs @@ -16,7 +16,7 @@ namespace LibHac.SdmmcSrv; /// /// This class implements the interface, and all available /// operations are listed in . -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class MmcManager : IStorageDeviceManager, IStorageDeviceOperator, ISdmmcDeviceManager { private const SdmmcHandle MmcHandle = 1; diff --git a/src/LibHac/SdmmcSrv/MmcPartitionStorageDevice.cs b/src/LibHac/SdmmcSrv/MmcPartitionStorageDevice.cs index 046e761d..d46383d2 100644 --- a/src/LibHac/SdmmcSrv/MmcPartitionStorageDevice.cs +++ b/src/LibHac/SdmmcSrv/MmcPartitionStorageDevice.cs @@ -15,7 +15,7 @@ namespace LibHac.SdmmcSrv; /// Provides base functionality for MMC classes. Derived classes will need to provide /// methods for reading/writing the MMC storage. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal abstract class MmcPartitionStorageDevice : IDisposable { private SharedRef _manager; @@ -95,7 +95,7 @@ internal abstract class MmcPartitionStorageDevice : IDisposable /// and . Because C# doesn't have multiple inheritance, we make a copy of the /// class that inherits from . /// This class must mirror any changes made to . -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal abstract class MmcPartitionStorageDeviceInterfaceAdapter : MmcPartitionStorageDevice, IStorageDevice { private readonly IStorage _baseStorage; @@ -145,7 +145,7 @@ internal abstract class MmcPartitionStorageDeviceInterfaceAdapter : MmcPartition /// An that handles interacting with the partition /// on the internal MMC. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class MmcUserDataPartitionStorageDevice : MmcPartitionStorageDeviceInterfaceAdapter { private MmcUserDataPartitionStorageDevice(ref SharedRef manager, SdmmcHandle handle, @@ -209,7 +209,7 @@ internal class MmcUserDataPartitionStorageDevice : MmcPartitionStorageDeviceInte /// An that handles interacting with the and /// partitions on the internal MMC. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class MmcBootPartitionStorageDevice : MmcPartitionStorageDeviceInterfaceAdapter { private MmcBootPartitionStorageDevice(Fs.MmcPartition partition, ref SharedRef manager, diff --git a/src/LibHac/SdmmcSrv/PatrolReader.cs b/src/LibHac/SdmmcSrv/PatrolReader.cs index 9b4c32c3..6f50744c 100644 --- a/src/LibHac/SdmmcSrv/PatrolReader.cs +++ b/src/LibHac/SdmmcSrv/PatrolReader.cs @@ -21,7 +21,7 @@ namespace LibHac.SdmmcSrv; /// Every 2 hours it will save the current state of the patrol read to Boot Partition 1 on the MMC. /// This state contains the next sector index to be read and the number of times the MMC has been patrolled /// from start to finish. -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class PatrolReader { // Note: This class won't work until events and timer events are properly implemented. diff --git a/src/LibHac/SdmmcSrv/SdCardDetectionEventManager.cs b/src/LibHac/SdmmcSrv/SdCardDetectionEventManager.cs index d0fa7038..e8cc1c7f 100644 --- a/src/LibHac/SdmmcSrv/SdCardDetectionEventManager.cs +++ b/src/LibHac/SdmmcSrv/SdCardDetectionEventManager.cs @@ -6,7 +6,7 @@ namespace LibHac.SdmmcSrv; /// /// Registers an sdmmc detection callback when constructed, and unregisters the callback when disposed. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class SdCardDetectionEventManager : CardDeviceDetectionEventManager { // LibHac addition diff --git a/src/LibHac/SdmmcSrv/SdCardDeviceOperator.cs b/src/LibHac/SdmmcSrv/SdCardDeviceOperator.cs index 556741ea..0f140806 100644 --- a/src/LibHac/SdmmcSrv/SdCardDeviceOperator.cs +++ b/src/LibHac/SdmmcSrv/SdCardDeviceOperator.cs @@ -13,7 +13,7 @@ namespace LibHac.SdmmcSrv; /// Performs various operations on the inserted SD card. /// All available operations are listed in . /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class SdCardDeviceOperator : IStorageDeviceOperator { private SharedRef _storageDevice; diff --git a/src/LibHac/SdmmcSrv/SdCardManager.cs b/src/LibHac/SdmmcSrv/SdCardManager.cs index f975e218..5013a2e4 100644 --- a/src/LibHac/SdmmcSrv/SdCardManager.cs +++ b/src/LibHac/SdmmcSrv/SdCardManager.cs @@ -18,7 +18,7 @@ namespace LibHac.SdmmcSrv; /// /// This class implements the interface, and all available /// operations are listed in . -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public class SdCardManager : IStorageDeviceManager, IStorageDeviceOperator, ISdmmcDeviceManager { private const SdmmcHandle InvalidHandle = 0; diff --git a/src/LibHac/SdmmcSrv/SdCardStorageDevice.cs b/src/LibHac/SdmmcSrv/SdCardStorageDevice.cs index dc7450d1..e13a19e7 100644 --- a/src/LibHac/SdmmcSrv/SdCardStorageDevice.cs +++ b/src/LibHac/SdmmcSrv/SdCardStorageDevice.cs @@ -10,7 +10,7 @@ namespace LibHac.SdmmcSrv; /// /// An that handles interacting with the currently inserted game card. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class SdCardStorageDevice : SdmmcStorageInterfaceAdapter, IStorageDevice { private SharedRef _manager; diff --git a/src/LibHac/SdmmcSrv/SdmmcResultConverter.cs b/src/LibHac/SdmmcSrv/SdmmcResultConverter.cs index bf1e86bb..5f00de7b 100644 --- a/src/LibHac/SdmmcSrv/SdmmcResultConverter.cs +++ b/src/LibHac/SdmmcSrv/SdmmcResultConverter.cs @@ -6,7 +6,7 @@ namespace LibHac.SdmmcSrv; /// /// Contains functions to convert s to their equivalent. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public static class SdmmcResultConverter { public static Result GetFsResult(Port port, Result result) diff --git a/src/LibHac/SdmmcSrv/SdmmcSrvEnums.cs b/src/LibHac/SdmmcSrv/SdmmcSrvEnums.cs index 06d8e69e..c3cb9b12 100644 --- a/src/LibHac/SdmmcSrv/SdmmcSrvEnums.cs +++ b/src/LibHac/SdmmcSrv/SdmmcSrvEnums.cs @@ -3,7 +3,7 @@ /// /// The operations that can perform on the SD card device. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public enum SdCardManagerOperationIdValue { GetAndClearErrorInfo = 1, @@ -15,7 +15,7 @@ public enum SdCardManagerOperationIdValue /// /// The operations that can perform on the inserted SD card. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public enum SdCardOperationIdValue { GetSpeedMode = 1, @@ -29,7 +29,7 @@ public enum SdCardOperationIdValue /// /// The operations that can perform on the internal MMC device. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public enum MmcManagerOperationIdValue { GetAndClearErrorInfo = 1, @@ -44,7 +44,7 @@ public enum MmcManagerOperationIdValue /// /// The operations that can perform on the internal MMC storage. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) public enum MmcOperationIdValue { GetSpeedMode = 1, diff --git a/src/LibHac/SdmmcSrv/SdmmcStorage.cs b/src/LibHac/SdmmcSrv/SdmmcStorage.cs index ba338b4b..a81516d0 100644 --- a/src/LibHac/SdmmcSrv/SdmmcStorage.cs +++ b/src/LibHac/SdmmcSrv/SdmmcStorage.cs @@ -18,7 +18,7 @@ namespace LibHac.SdmmcSrv; /// Provides an interface for calling the sdmmc Read and Write functions. /// The offset and size of reads and writes must be aligned to 0x200 bytes (). /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class SdmmcStorage : IStorage { private Port _port; @@ -151,7 +151,7 @@ internal class SdmmcStorage : IStorage /// An adapter that directly translates sf calls to calls with no checks /// or validations. /// -/// Based on nnSdk 15.3.0 (FS 15.0.0) +/// Based on nnSdk 16.2.0 (FS 16.0.0) internal class SdmmcStorageInterfaceAdapter : IStorageSf { private IStorage _baseStorage;