diff --git a/src/LibHac/Common/Id128.cs b/src/LibHac/Common/Id128.cs index 8b7f8529..a0289014 100644 --- a/src/LibHac/Common/Id128.cs +++ b/src/LibHac/Common/Id128.cs @@ -35,7 +35,7 @@ namespace LibHac.Common public override bool Equals(object obj) { - return obj is FsSystem.UserId other && Equals(other); + return obj is Id128 other && Equals(other); } public override int GetHashCode() diff --git a/src/LibHac/Fs/Accessors/MountTable.cs b/src/LibHac/Fs/Accessors/MountTable.cs index 06469eab..ec9f94cb 100644 --- a/src/LibHac/Fs/Accessors/MountTable.cs +++ b/src/LibHac/Fs/Accessors/MountTable.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using LibHac.FsSystem; namespace LibHac.Fs.Accessors { diff --git a/src/LibHac/Fs/ContentStorage.cs b/src/LibHac/Fs/ContentStorage.cs index 25a8da2a..c9545d71 100644 --- a/src/LibHac/Fs/ContentStorage.cs +++ b/src/LibHac/Fs/ContentStorage.cs @@ -1,6 +1,5 @@ using System; using LibHac.Common; -using LibHac.FsSystem; using LibHac.FsService; namespace LibHac.Fs diff --git a/src/LibHac/FsSystem/DirectoryEntry.cs b/src/LibHac/Fs/DirectoryEntry.cs similarity index 96% rename from src/LibHac/FsSystem/DirectoryEntry.cs rename to src/LibHac/Fs/DirectoryEntry.cs index 332e4f6d..1d60e85d 100644 --- a/src/LibHac/FsSystem/DirectoryEntry.cs +++ b/src/LibHac/Fs/DirectoryEntry.cs @@ -1,8 +1,9 @@ using System; using System.Runtime.InteropServices; using LibHac.Common; +using LibHac.FsSystem; -namespace LibHac.FsSystem +namespace LibHac.Fs { public class DirectoryEntryEx { diff --git a/src/LibHac/Fs/FileSystemClient.Directory.cs b/src/LibHac/Fs/FileSystemClient.Directory.cs index 6d29c054..90253dfe 100644 --- a/src/LibHac/Fs/FileSystemClient.Directory.cs +++ b/src/LibHac/Fs/FileSystemClient.Directory.cs @@ -1,5 +1,4 @@ using System; -using LibHac.FsSystem; namespace LibHac.Fs { diff --git a/src/LibHac/Fs/FileSystemClient.Mount.cs b/src/LibHac/Fs/FileSystemClient.Mount.cs index 0ccb6440..4eed577d 100644 --- a/src/LibHac/Fs/FileSystemClient.Mount.cs +++ b/src/LibHac/Fs/FileSystemClient.Mount.cs @@ -1,5 +1,4 @@ using LibHac.Common; -using LibHac.FsSystem; using LibHac.FsService; namespace LibHac.Fs diff --git a/src/LibHac/Fs/FileSystemClient.cs b/src/LibHac/Fs/FileSystemClient.cs index 3c4f5ff9..999aa7a6 100644 --- a/src/LibHac/Fs/FileSystemClient.cs +++ b/src/LibHac/Fs/FileSystemClient.cs @@ -1,5 +1,4 @@ using LibHac.Common; -using LibHac.FsSystem; using LibHac.FsService; namespace LibHac.Fs diff --git a/src/LibHac/FsSystem/FileTimeStamp.cs b/src/LibHac/Fs/FileTimeStamp.cs similarity index 82% rename from src/LibHac/FsSystem/FileTimeStamp.cs rename to src/LibHac/Fs/FileTimeStamp.cs index 0dbe64eb..74aff00a 100644 --- a/src/LibHac/FsSystem/FileTimeStamp.cs +++ b/src/LibHac/Fs/FileTimeStamp.cs @@ -1,4 +1,4 @@ -namespace LibHac.FsSystem +namespace LibHac.Fs { public struct FileTimeStampRaw { diff --git a/src/LibHac/FsSystem/FsEnums.cs b/src/LibHac/Fs/FsEnums.cs similarity index 98% rename from src/LibHac/FsSystem/FsEnums.cs rename to src/LibHac/Fs/FsEnums.cs index b00cf136..223f36fb 100644 --- a/src/LibHac/FsSystem/FsEnums.cs +++ b/src/LibHac/Fs/FsEnums.cs @@ -1,4 +1,4 @@ -namespace LibHac.FsSystem +namespace LibHac.Fs { public enum BisPartitionId { diff --git a/src/LibHac/FsSystem/IAttributeFileSystem.cs b/src/LibHac/Fs/IAttributeFileSystem.cs similarity index 89% rename from src/LibHac/FsSystem/IAttributeFileSystem.cs rename to src/LibHac/Fs/IAttributeFileSystem.cs index e7688a1b..e5a4858d 100644 --- a/src/LibHac/FsSystem/IAttributeFileSystem.cs +++ b/src/LibHac/Fs/IAttributeFileSystem.cs @@ -1,4 +1,4 @@ -namespace LibHac.FsSystem +namespace LibHac.Fs { public interface IAttributeFileSystem : IFileSystem { diff --git a/src/LibHac/FsSystem/IDirectory.cs b/src/LibHac/Fs/IDirectory.cs similarity index 98% rename from src/LibHac/FsSystem/IDirectory.cs rename to src/LibHac/Fs/IDirectory.cs index d9355ec4..401d26d7 100644 --- a/src/LibHac/FsSystem/IDirectory.cs +++ b/src/LibHac/Fs/IDirectory.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.FsSystem +namespace LibHac.Fs { /// /// Provides an interface for enumerating the child entries of a directory. diff --git a/src/LibHac/FsSystem/IFile.cs b/src/LibHac/Fs/IFile.cs similarity index 98% rename from src/LibHac/FsSystem/IFile.cs rename to src/LibHac/Fs/IFile.cs index 6e81af02..bec15141 100644 --- a/src/LibHac/FsSystem/IFile.cs +++ b/src/LibHac/Fs/IFile.cs @@ -1,6 +1,7 @@ using System; +using LibHac.FsSystem; -namespace LibHac.FsSystem +namespace LibHac.Fs { /// /// Provides an interface for reading and writing a sequence of bytes. diff --git a/src/LibHac/FsSystem/IFileSystem.cs b/src/LibHac/Fs/IFileSystem.cs similarity index 99% rename from src/LibHac/FsSystem/IFileSystem.cs rename to src/LibHac/Fs/IFileSystem.cs index 9ff76341..5e6275b6 100644 --- a/src/LibHac/FsSystem/IFileSystem.cs +++ b/src/LibHac/Fs/IFileSystem.cs @@ -1,6 +1,7 @@ using System; +using LibHac.FsSystem; -namespace LibHac.FsSystem +namespace LibHac.Fs { /// /// Provides an interface for accessing a file system. / is used as the path delimiter. diff --git a/src/LibHac/FsSystem/IStorage.cs b/src/LibHac/Fs/IStorage.cs similarity index 98% rename from src/LibHac/FsSystem/IStorage.cs rename to src/LibHac/Fs/IStorage.cs index 6f38528b..8f0a1b47 100644 --- a/src/LibHac/FsSystem/IStorage.cs +++ b/src/LibHac/Fs/IStorage.cs @@ -1,6 +1,6 @@ using System; -namespace LibHac.FsSystem +namespace LibHac.Fs { /// /// Provides an interface for reading and writing a sequence of bytes. diff --git a/src/LibHac/Fs/MountHelpers.cs b/src/LibHac/Fs/MountHelpers.cs index 5d46e223..33ecb09e 100644 --- a/src/LibHac/Fs/MountHelpers.cs +++ b/src/LibHac/Fs/MountHelpers.cs @@ -1,5 +1,4 @@ using LibHac.Common; -using LibHac.FsSystem; namespace LibHac.Fs { @@ -24,6 +23,7 @@ namespace LibHac.Fs return Result.Success; } + // ReSharper disable once UnusedParameter.Local private static bool CheckMountNameImpl(U8Span name) { // Todo diff --git a/src/LibHac/FsSystem/ResultFs.cs b/src/LibHac/Fs/ResultFs.cs similarity index 99% rename from src/LibHac/FsSystem/ResultFs.cs rename to src/LibHac/Fs/ResultFs.cs index 0f064a80..fcc8eb68 100644 --- a/src/LibHac/FsSystem/ResultFs.cs +++ b/src/LibHac/Fs/ResultFs.cs @@ -1,4 +1,4 @@ -namespace LibHac.FsSystem +namespace LibHac.Fs { public class ResultFs { diff --git a/src/LibHac/FsSystem/ResultRangeFs.cs b/src/LibHac/Fs/ResultRangeFs.cs similarity index 97% rename from src/LibHac/FsSystem/ResultRangeFs.cs rename to src/LibHac/Fs/ResultRangeFs.cs index 3ffd032d..f0289aeb 100644 --- a/src/LibHac/FsSystem/ResultRangeFs.cs +++ b/src/LibHac/Fs/ResultRangeFs.cs @@ -1,4 +1,4 @@ -namespace LibHac.FsSystem +namespace LibHac.Fs { public static class ResultRangeFs { diff --git a/src/LibHac/FsSystem/RightsId.cs b/src/LibHac/Fs/RightsId.cs similarity index 98% rename from src/LibHac/FsSystem/RightsId.cs rename to src/LibHac/Fs/RightsId.cs index d3ac5836..11f0969d 100644 --- a/src/LibHac/FsSystem/RightsId.cs +++ b/src/LibHac/Fs/RightsId.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using LibHac.Common; -namespace LibHac.FsSystem +namespace LibHac.Fs { [StructLayout(LayoutKind.Sequential, Size = 0x10)] public struct RightsId : IEquatable, IComparable, IComparable diff --git a/src/LibHac/FsSystem/SaveDataAttribute.cs b/src/LibHac/Fs/SaveDataAttribute.cs similarity index 99% rename from src/LibHac/FsSystem/SaveDataAttribute.cs rename to src/LibHac/Fs/SaveDataAttribute.cs index d501602a..3fd4614d 100644 --- a/src/LibHac/FsSystem/SaveDataAttribute.cs +++ b/src/LibHac/Fs/SaveDataAttribute.cs @@ -3,7 +3,7 @@ using System.Buffers.Binary; using LibHac.FsSystem.Save; using LibHac.Kvdb; -namespace LibHac.FsSystem +namespace LibHac.Fs { public class SaveDataAttribute : IComparable, IComparable, IEquatable, IExportable { diff --git a/src/LibHac/FsSystem/SaveDataStructs.cs b/src/LibHac/Fs/SaveDataStructs.cs similarity index 87% rename from src/LibHac/FsSystem/SaveDataStructs.cs rename to src/LibHac/Fs/SaveDataStructs.cs index ee2a2d7c..adcd0569 100644 --- a/src/LibHac/FsSystem/SaveDataStructs.cs +++ b/src/LibHac/Fs/SaveDataStructs.cs @@ -4,7 +4,7 @@ using LibHac.Common; using LibHac.FsSystem.Save; using LibHac.Ncm; -namespace LibHac.FsSystem +namespace LibHac.Fs { [StructLayout(LayoutKind.Explicit, Size = 0x40)] public struct SaveDataAttribute2 @@ -67,4 +67,17 @@ namespace LibHac.FsSystem public Span Hash => SpanHelpers.CreateSpan(ref _hashStart, HashLength); } + + [StructLayout(LayoutKind.Explicit, Size = 0x10)] + public struct SaveMetaCreateInfo + { + [FieldOffset(0)] public int Size; + [FieldOffset(4)] public SaveMetaType Type; + } + + [StructLayout(LayoutKind.Explicit, Size = 0x40)] + public struct SaveDataCreateInfo + { + // Todo + } } diff --git a/src/LibHac/FsSystem/UserId.cs b/src/LibHac/Fs/UserId.cs similarity index 98% rename from src/LibHac/FsSystem/UserId.cs rename to src/LibHac/Fs/UserId.cs index 7332102a..4a14fc46 100644 --- a/src/LibHac/FsSystem/UserId.cs +++ b/src/LibHac/Fs/UserId.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using LibHac.Common; -namespace LibHac.FsSystem +namespace LibHac.Fs { [StructLayout(LayoutKind.Sequential, Size = 0x10)] public struct UserId : IEquatable, IComparable, IComparable diff --git a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs index 9ba8578a..edba44ca 100644 --- a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreator.cs @@ -1,5 +1,5 @@ using System.Diagnostics; -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs index 0fd195ab..1e6ebe98 100644 --- a/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs +++ b/src/LibHac/FsService/Creators/EmulatedBisFileSystemCreatorConfig.cs @@ -1,5 +1,5 @@ using System.Diagnostics; -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs b/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs index b5392d4f..b27c6aff 100644 --- a/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/EmulatedSdFileSystemCreator.cs @@ -1,5 +1,5 @@ using System; -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs b/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs index b1798719..7c6c20f9 100644 --- a/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/EncryptedFileSystemCreator.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; using LibHac.FsSystem; namespace LibHac.FsService.Creators diff --git a/src/LibHac/FsService/Creators/FileSystemCreators.cs b/src/LibHac/FsService/Creators/FileSystemCreators.cs index 0539a95c..2afa63df 100644 --- a/src/LibHac/FsService/Creators/FileSystemCreators.cs +++ b/src/LibHac/FsService/Creators/FileSystemCreators.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IBuiltInStorageCreator.cs b/src/LibHac/FsService/Creators/IBuiltInStorageCreator.cs index 397da7ef..e7e6df62 100644 --- a/src/LibHac/FsService/Creators/IBuiltInStorageCreator.cs +++ b/src/LibHac/FsService/Creators/IBuiltInStorageCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs b/src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs index 07c4b68d..b94ca90a 100644 --- a/src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IBuiltInStorageFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs b/src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs index 36f73579..f6cfde96 100644 --- a/src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IEncryptedFileSystemCreator.cs @@ -1,5 +1,5 @@ using System; -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs b/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs index 8b139d5c..b86fac56 100644 --- a/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IFatFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs b/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs index c57357dd..550ce9c6 100644 --- a/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IGameCardFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IGameCardStorageCreator.cs b/src/LibHac/FsService/Creators/IGameCardStorageCreator.cs index b6afd9e5..e5fdfc19 100644 --- a/src/LibHac/FsService/Creators/IGameCardStorageCreator.cs +++ b/src/LibHac/FsService/Creators/IGameCardStorageCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs b/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs index 809fbef0..d7c50ff5 100644 --- a/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IHostFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IMemoryStorageCreator.cs b/src/LibHac/FsService/Creators/IMemoryStorageCreator.cs index 14b0e961..403dbe01 100644 --- a/src/LibHac/FsService/Creators/IMemoryStorageCreator.cs +++ b/src/LibHac/FsService/Creators/IMemoryStorageCreator.cs @@ -1,5 +1,5 @@ using System; -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs b/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs index d6b43d6b..af99e8cd 100644 --- a/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IPartitionFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs b/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs index 3429397f..b2ea3957 100644 --- a/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/IRomFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs b/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs index 854fb051..29f45fb5 100644 --- a/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ISaveDataFileSystemCreator.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs; using LibHac.FsSystem; using LibHac.FsSystem.Save; diff --git a/src/LibHac/FsService/Creators/ISdFileSystemCreator.cs b/src/LibHac/FsService/Creators/ISdFileSystemCreator.cs index 0a0765dc..041f0217 100644 --- a/src/LibHac/FsService/Creators/ISdFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ISdFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/ISdStorageCreator.cs b/src/LibHac/FsService/Creators/ISdStorageCreator.cs index bb2c2dac..691359bb 100644 --- a/src/LibHac/FsService/Creators/ISdStorageCreator.cs +++ b/src/LibHac/FsService/Creators/ISdStorageCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs b/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs index 92378a75..2d6d8fb3 100644 --- a/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs +++ b/src/LibHac/FsService/Creators/IStorageOnNcaCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; using LibHac.FsSystem.NcaUtils; namespace LibHac.FsService.Creators diff --git a/src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs b/src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs index 1ac8a48a..3bae3cb7 100644 --- a/src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ISubDirectoryFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs b/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs index 59eed39a..e0858de4 100644 --- a/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/ITargetManagerFileSystemCreator.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs b/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs index fed3898c..06983e72 100644 --- a/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs +++ b/src/LibHac/FsService/Creators/SubDirectoryFileSystemCreator.cs @@ -1,4 +1,5 @@ -using LibHac.FsSystem; +using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac.FsService.Creators { diff --git a/src/LibHac/FsService/FileSystemProxy.cs b/src/LibHac/FsService/FileSystemProxy.cs index a015e579..a579ea05 100644 --- a/src/LibHac/FsService/FileSystemProxy.cs +++ b/src/LibHac/FsService/FileSystemProxy.cs @@ -10,6 +10,7 @@ namespace LibHac.FsService private FileSystemProxyCore FsProxyCore { get; } /// The client instance to be used for internal operations like save indexer access. + // ReSharper disable once UnusedAutoPropertyAccessor.Local private FileSystemClient FsClient { get; } public long CurrentProcess { get; private set; } @@ -110,7 +111,7 @@ namespace LibHac.FsService if (!IsSystemSaveDataId(attribute.SaveId)) return ResultFs.InvalidArgument.Log(); - Result rc = OpenSaveDataFileSystemImpl(out IFileSystem saveFs, out ulong saveDataId, spaceId, + Result rc = OpenSaveDataFileSystemImpl(out IFileSystem saveFs, out _, spaceId, attribute, false, true); if (rc.IsFailure()) return rc; @@ -159,6 +160,7 @@ namespace LibHac.FsService if (saveDataId != SaveIndexerId) { + // ReSharper disable once ConditionIsAlwaysTrueOrFalse if (hasFixedId) { // todo: remove save indexer entry diff --git a/src/LibHac/FsService/FileSystemProxyCore.cs b/src/LibHac/FsService/FileSystemProxyCore.cs index 8463c2a3..3534074d 100644 --- a/src/LibHac/FsService/FileSystemProxyCore.cs +++ b/src/LibHac/FsService/FileSystemProxyCore.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; using LibHac.FsSystem; using LibHac.FsSystem.Save; using LibHac.FsService.Creators; @@ -157,9 +158,8 @@ namespace LibHac.FsService // Missing save FS cache lookup - rc = FsCreators.SaveDataFileSystemCreator.Create(out IFileSystem saveFs, - out ISaveDataExtraDataAccessor extraDataAccessor, saveDirFs, saveDataId, allowDirectorySaveData, - useDeviceUniqueMac, type, null); + rc = FsCreators.SaveDataFileSystemCreator.Create(out IFileSystem saveFs, out _, saveDirFs, saveDataId, + allowDirectorySaveData, useDeviceUniqueMac, type, null); if (rc.IsFailure()) return rc; diff --git a/src/LibHac/FsService/IFileSystemProxy.cs b/src/LibHac/FsService/IFileSystemProxy.cs index 708d3155..2b5791ca 100644 --- a/src/LibHac/FsService/IFileSystemProxy.cs +++ b/src/LibHac/FsService/IFileSystemProxy.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs; using LibHac.FsSystem; using LibHac.Ncm; using LibHac.Spl; diff --git a/src/LibHac/FsSystem/SaveIndexerStruct.cs b/src/LibHac/FsService/SaveIndexerStruct.cs similarity index 98% rename from src/LibHac/FsSystem/SaveIndexerStruct.cs rename to src/LibHac/FsService/SaveIndexerStruct.cs index b51dfa6f..e78ff3a6 100644 --- a/src/LibHac/FsSystem/SaveIndexerStruct.cs +++ b/src/LibHac/FsService/SaveIndexerStruct.cs @@ -2,7 +2,7 @@ using System.Buffers.Binary; using LibHac.Kvdb; -namespace LibHac.FsSystem +namespace LibHac.FsService { public class SaveIndexerStruct : IExportable { diff --git a/src/LibHac/FsService/Util.cs b/src/LibHac/FsService/Util.cs index 6519cf26..195549e8 100644 --- a/src/LibHac/FsService/Util.cs +++ b/src/LibHac/FsService/Util.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; using LibHac.FsSystem; namespace LibHac.FsService diff --git a/src/LibHac/FsSystem/Aes128CtrExStorage.cs b/src/LibHac/FsSystem/Aes128CtrExStorage.cs index eebe24ff..d91b889b 100644 --- a/src/LibHac/FsSystem/Aes128CtrExStorage.cs +++ b/src/LibHac/FsSystem/Aes128CtrExStorage.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/Aes128CtrStorage.cs b/src/LibHac/FsSystem/Aes128CtrStorage.cs index 0437c092..e413bff3 100644 --- a/src/LibHac/FsSystem/Aes128CtrStorage.cs +++ b/src/LibHac/FsSystem/Aes128CtrStorage.cs @@ -1,6 +1,7 @@ using System; using System.Buffers; using System.Buffers.Binary; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/Aes128XtsStorage.cs b/src/LibHac/FsSystem/Aes128XtsStorage.cs index a0844d61..865e366f 100644 --- a/src/LibHac/FsSystem/Aes128XtsStorage.cs +++ b/src/LibHac/FsSystem/Aes128XtsStorage.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/AesXtsDirectory.cs b/src/LibHac/FsSystem/AesXtsDirectory.cs index bb7d4415..c262ae6d 100644 --- a/src/LibHac/FsSystem/AesXtsDirectory.cs +++ b/src/LibHac/FsSystem/AesXtsDirectory.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/AesXtsFile.cs b/src/LibHac/FsSystem/AesXtsFile.cs index 683c2341..bd70578f 100644 --- a/src/LibHac/FsSystem/AesXtsFile.cs +++ b/src/LibHac/FsSystem/AesXtsFile.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/AesXtsFileHeader.cs b/src/LibHac/FsSystem/AesXtsFileHeader.cs index da830f82..89233eab 100644 --- a/src/LibHac/FsSystem/AesXtsFileHeader.cs +++ b/src/LibHac/FsSystem/AesXtsFileHeader.cs @@ -2,6 +2,7 @@ using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Text; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/AesXtsFileSystem.cs b/src/LibHac/FsSystem/AesXtsFileSystem.cs index fa33b06a..a5de6e98 100644 --- a/src/LibHac/FsSystem/AesXtsFileSystem.cs +++ b/src/LibHac/FsSystem/AesXtsFileSystem.cs @@ -1,5 +1,6 @@ using System; using System.Diagnostics; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/BucketTree.cs b/src/LibHac/FsSystem/BucketTree.cs index a9095a77..85f6608e 100644 --- a/src/LibHac/FsSystem/BucketTree.cs +++ b/src/LibHac/FsSystem/BucketTree.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/CachedStorage.cs b/src/LibHac/FsSystem/CachedStorage.cs index f73fffb2..bc6485fb 100644 --- a/src/LibHac/FsSystem/CachedStorage.cs +++ b/src/LibHac/FsSystem/CachedStorage.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/ConcatenationDirectory.cs b/src/LibHac/FsSystem/ConcatenationDirectory.cs index 76587582..13b60cc7 100644 --- a/src/LibHac/FsSystem/ConcatenationDirectory.cs +++ b/src/LibHac/FsSystem/ConcatenationDirectory.cs @@ -1,6 +1,6 @@ using System; using LibHac.Common; - +using LibHac.Fs; #if CROSS_PLATFORM using System.Runtime.InteropServices; #endif diff --git a/src/LibHac/FsSystem/ConcatenationFile.cs b/src/LibHac/FsSystem/ConcatenationFile.cs index 887ac26a..88ee7589 100644 --- a/src/LibHac/FsSystem/ConcatenationFile.cs +++ b/src/LibHac/FsSystem/ConcatenationFile.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/ConcatenationFileSystem.cs b/src/LibHac/FsSystem/ConcatenationFileSystem.cs index c7c18686..f9683629 100644 --- a/src/LibHac/FsSystem/ConcatenationFileSystem.cs +++ b/src/LibHac/FsSystem/ConcatenationFileSystem.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; - +using LibHac.Fs; #if CROSS_PLATFORM using System.Runtime.InteropServices; #endif diff --git a/src/LibHac/FsSystem/ConcatenationStorage.cs b/src/LibHac/FsSystem/ConcatenationStorage.cs index 7d695dc5..9bce2554 100644 --- a/src/LibHac/FsSystem/ConcatenationStorage.cs +++ b/src/LibHac/FsSystem/ConcatenationStorage.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/ConcatenationStorageBuilder.cs b/src/LibHac/FsSystem/ConcatenationStorageBuilder.cs index ff2da7b8..afe464bd 100644 --- a/src/LibHac/FsSystem/ConcatenationStorageBuilder.cs +++ b/src/LibHac/FsSystem/ConcatenationStorageBuilder.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/Delta.cs b/src/LibHac/FsSystem/Delta.cs index 9ca03cef..a3869dbe 100644 --- a/src/LibHac/FsSystem/Delta.cs +++ b/src/LibHac/FsSystem/Delta.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/DirectorySaveDataFile.cs b/src/LibHac/FsSystem/DirectorySaveDataFile.cs index 62e384ce..09c61ba9 100644 --- a/src/LibHac/FsSystem/DirectorySaveDataFile.cs +++ b/src/LibHac/FsSystem/DirectorySaveDataFile.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs b/src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs index a782dc2e..cfa98fbe 100644 --- a/src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs +++ b/src/LibHac/FsSystem/DirectorySaveDataFileSystem.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/DirectoryUtils.cs b/src/LibHac/FsSystem/DirectoryUtils.cs index b5bba902..f28e5896 100644 --- a/src/LibHac/FsSystem/DirectoryUtils.cs +++ b/src/LibHac/FsSystem/DirectoryUtils.cs @@ -1,5 +1,6 @@ using System; using LibHac.Common; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/FileBase.cs b/src/LibHac/FsSystem/FileBase.cs index 742853c2..33b30489 100644 --- a/src/LibHac/FsSystem/FileBase.cs +++ b/src/LibHac/FsSystem/FileBase.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/FileReader.cs b/src/LibHac/FsSystem/FileReader.cs index cf4607b4..b1c79db8 100644 --- a/src/LibHac/FsSystem/FileReader.cs +++ b/src/LibHac/FsSystem/FileReader.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.Runtime.InteropServices; using System.Text; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/FileStorage.cs b/src/LibHac/FsSystem/FileStorage.cs index 21bf43c9..a1865732 100644 --- a/src/LibHac/FsSystem/FileStorage.cs +++ b/src/LibHac/FsSystem/FileStorage.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/FileSystemExtensions.cs b/src/LibHac/FsSystem/FileSystemExtensions.cs index 9ed1571a..fd7ba09b 100644 --- a/src/LibHac/FsSystem/FileSystemExtensions.cs +++ b/src/LibHac/FsSystem/FileSystemExtensions.cs @@ -3,6 +3,7 @@ using System.Buffers; using System.Collections.Generic; using System.IO; using LibHac.Common; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs b/src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs index 709eca51..4d6d14be 100644 --- a/src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs +++ b/src/LibHac/FsSystem/HierarchicalIntegrityVerificationStorage.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Security.Cryptography; using System.Text; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/IndirectStorage.cs b/src/LibHac/FsSystem/IndirectStorage.cs index 850b401f..e2c0dc05 100644 --- a/src/LibHac/FsSystem/IndirectStorage.cs +++ b/src/LibHac/FsSystem/IndirectStorage.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/IntegrityVerificationStorage.cs b/src/LibHac/FsSystem/IntegrityVerificationStorage.cs index 5e7bd8ce..49d14636 100644 --- a/src/LibHac/FsSystem/IntegrityVerificationStorage.cs +++ b/src/LibHac/FsSystem/IntegrityVerificationStorage.cs @@ -2,6 +2,7 @@ using System.Buffers; using System.IO; using System.Security.Cryptography; +using LibHac.Fs; using LibHac.FsSystem.Save; namespace LibHac.FsSystem diff --git a/src/LibHac/FsSystem/LayeredFileSystem.cs b/src/LibHac/FsSystem/LayeredFileSystem.cs index 47e88d4a..fe29a3fb 100644 --- a/src/LibHac/FsSystem/LayeredFileSystem.cs +++ b/src/LibHac/FsSystem/LayeredFileSystem.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/LayeredFileSystemDirectory.cs b/src/LibHac/FsSystem/LayeredFileSystemDirectory.cs index 3c23e239..244beeed 100644 --- a/src/LibHac/FsSystem/LayeredFileSystemDirectory.cs +++ b/src/LibHac/FsSystem/LayeredFileSystemDirectory.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/LocalDirectory.cs b/src/LibHac/FsSystem/LocalDirectory.cs index 02f478be..c49b16ab 100644 --- a/src/LibHac/FsSystem/LocalDirectory.cs +++ b/src/LibHac/FsSystem/LocalDirectory.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Runtime.CompilerServices; using LibHac.Common; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/LocalFile.cs b/src/LibHac/FsSystem/LocalFile.cs index 4d7abd4b..92fc844b 100644 --- a/src/LibHac/FsSystem/LocalFile.cs +++ b/src/LibHac/FsSystem/LocalFile.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/LocalFileSystem.cs b/src/LibHac/FsSystem/LocalFileSystem.cs index dea5ba32..0e3431e5 100644 --- a/src/LibHac/FsSystem/LocalFileSystem.cs +++ b/src/LibHac/FsSystem/LocalFileSystem.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Security; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/MemoryStorage.cs b/src/LibHac/FsSystem/MemoryStorage.cs index 9b139158..8ec783a5 100644 --- a/src/LibHac/FsSystem/MemoryStorage.cs +++ b/src/LibHac/FsSystem/MemoryStorage.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/NcaUtils/Nca.cs b/src/LibHac/FsSystem/NcaUtils/Nca.cs index 9cb388e6..f10ae281 100644 --- a/src/LibHac/FsSystem/NcaUtils/Nca.cs +++ b/src/LibHac/FsSystem/NcaUtils/Nca.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using LibHac.Fs; using LibHac.FsSystem.RomFs; namespace LibHac.FsSystem.NcaUtils diff --git a/src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs b/src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs index 5138a917..b9ddfc7f 100644 --- a/src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs +++ b/src/LibHac/FsSystem/NcaUtils/NcaExtensions.cs @@ -1,6 +1,7 @@ using System; using System.Buffers.Binary; using System.Diagnostics; +using LibHac.Fs; namespace LibHac.FsSystem.NcaUtils { diff --git a/src/LibHac/FsSystem/NcaUtils/NcaHeader.cs b/src/LibHac/FsSystem/NcaUtils/NcaHeader.cs index 6f19818b..7445129b 100644 --- a/src/LibHac/FsSystem/NcaUtils/NcaHeader.cs +++ b/src/LibHac/FsSystem/NcaUtils/NcaHeader.cs @@ -2,6 +2,7 @@ using System.IO; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using LibHac.Fs; namespace LibHac.FsSystem.NcaUtils { diff --git a/src/LibHac/FsSystem/NullFile.cs b/src/LibHac/FsSystem/NullFile.cs index 44847aa3..a3d12591 100644 --- a/src/LibHac/FsSystem/NullFile.cs +++ b/src/LibHac/FsSystem/NullFile.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/NullStorage.cs b/src/LibHac/FsSystem/NullStorage.cs index a019e898..ba78a51b 100644 --- a/src/LibHac/FsSystem/NullStorage.cs +++ b/src/LibHac/FsSystem/NullStorage.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/NxFileStream.cs b/src/LibHac/FsSystem/NxFileStream.cs index 7d6dd02b..48b5d99f 100644 --- a/src/LibHac/FsSystem/NxFileStream.cs +++ b/src/LibHac/FsSystem/NxFileStream.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/PartitionDirectory.cs b/src/LibHac/FsSystem/PartitionDirectory.cs index 518c1350..c66de8f2 100644 --- a/src/LibHac/FsSystem/PartitionDirectory.cs +++ b/src/LibHac/FsSystem/PartitionDirectory.cs @@ -2,6 +2,7 @@ using System.IO; using System.Text; using LibHac.Common; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/PartitionFile.cs b/src/LibHac/FsSystem/PartitionFile.cs index 62a6c213..0c734f13 100644 --- a/src/LibHac/FsSystem/PartitionFile.cs +++ b/src/LibHac/FsSystem/PartitionFile.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/PartitionFileSystem.cs b/src/LibHac/FsSystem/PartitionFileSystem.cs index 4012cfba..ece8b637 100644 --- a/src/LibHac/FsSystem/PartitionFileSystem.cs +++ b/src/LibHac/FsSystem/PartitionFileSystem.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs b/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs index bbe4a0b4..12cf4c82 100644 --- a/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs +++ b/src/LibHac/FsSystem/PartitionFileSystemBuilder.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Security.Cryptography; using System.Text; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/PathTools.cs b/src/LibHac/FsSystem/PathTools.cs index bb7cf41a..3a0fcd51 100644 --- a/src/LibHac/FsSystem/PathTools.cs +++ b/src/LibHac/FsSystem/PathTools.cs @@ -1,6 +1,7 @@ using System; using System.Diagnostics; using System.Runtime.CompilerServices; +using LibHac.Fs; #if HAS_FILE_SYSTEM_NAME using System.IO.Enumeration; diff --git a/src/LibHac/FsSystem/ReadOnlyFile.cs b/src/LibHac/FsSystem/ReadOnlyFile.cs index c93be5ba..07611c3f 100644 --- a/src/LibHac/FsSystem/ReadOnlyFile.cs +++ b/src/LibHac/FsSystem/ReadOnlyFile.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/ReadOnlyFileSystem.cs b/src/LibHac/FsSystem/ReadOnlyFileSystem.cs index a3c35b94..66fc9e18 100644 --- a/src/LibHac/FsSystem/ReadOnlyFileSystem.cs +++ b/src/LibHac/FsSystem/ReadOnlyFileSystem.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/RomFs/HierarchicalRomFileTable.cs b/src/LibHac/FsSystem/RomFs/HierarchicalRomFileTable.cs index c6476ec5..8d455b2a 100644 --- a/src/LibHac/FsSystem/RomFs/HierarchicalRomFileTable.cs +++ b/src/LibHac/FsSystem/RomFs/HierarchicalRomFileTable.cs @@ -1,5 +1,6 @@ using System; using System.Runtime.InteropServices; +using LibHac.Fs; namespace LibHac.FsSystem.RomFs { diff --git a/src/LibHac/FsSystem/RomFs/RomFsBuilder.cs b/src/LibHac/FsSystem/RomFs/RomFsBuilder.cs index 3ec7cbb8..5f95e172 100644 --- a/src/LibHac/FsSystem/RomFs/RomFsBuilder.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsBuilder.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using LibHac.Fs; namespace LibHac.FsSystem.RomFs { diff --git a/src/LibHac/FsSystem/RomFs/RomFsDictionary.cs b/src/LibHac/FsSystem/RomFs/RomFsDictionary.cs index d93970c9..9989f8a7 100644 --- a/src/LibHac/FsSystem/RomFs/RomFsDictionary.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsDictionary.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using LibHac.Fs; namespace LibHac.FsSystem.RomFs { diff --git a/src/LibHac/FsSystem/RomFs/RomFsDirectory.cs b/src/LibHac/FsSystem/RomFs/RomFsDirectory.cs index 3d0ae58a..12c19acb 100644 --- a/src/LibHac/FsSystem/RomFs/RomFsDirectory.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsDirectory.cs @@ -1,6 +1,7 @@ using System; using System.Text; using LibHac.Common; +using LibHac.Fs; namespace LibHac.FsSystem.RomFs { diff --git a/src/LibHac/FsSystem/RomFs/RomFsFile.cs b/src/LibHac/FsSystem/RomFs/RomFsFile.cs index 42aa8493..d069d860 100644 --- a/src/LibHac/FsSystem/RomFs/RomFsFile.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsFile.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem.RomFs { diff --git a/src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs b/src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs index b2b6f718..cdd8507d 100644 --- a/src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs +++ b/src/LibHac/FsSystem/RomFs/RomFsFileSystem.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem.RomFs { diff --git a/src/LibHac/FsSystem/Save/AllocationTable.cs b/src/LibHac/FsSystem/Save/AllocationTable.cs index a09e9deb..57c221b3 100644 --- a/src/LibHac/FsSystem/Save/AllocationTable.cs +++ b/src/LibHac/FsSystem/Save/AllocationTable.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/AllocationTableStorage.cs b/src/LibHac/FsSystem/Save/AllocationTableStorage.cs index cf66ff44..1e8b60c0 100644 --- a/src/LibHac/FsSystem/Save/AllocationTableStorage.cs +++ b/src/LibHac/FsSystem/Save/AllocationTableStorage.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/DuplexBitmap.cs b/src/LibHac/FsSystem/Save/DuplexBitmap.cs index e76d2492..993eb7d5 100644 --- a/src/LibHac/FsSystem/Save/DuplexBitmap.cs +++ b/src/LibHac/FsSystem/Save/DuplexBitmap.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/DuplexStorage.cs b/src/LibHac/FsSystem/Save/DuplexStorage.cs index 25206542..6ac63544 100644 --- a/src/LibHac/FsSystem/Save/DuplexStorage.cs +++ b/src/LibHac/FsSystem/Save/DuplexStorage.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/Header.cs b/src/LibHac/FsSystem/Save/Header.cs index 7e8b908b..98a98f4f 100644 --- a/src/LibHac/FsSystem/Save/Header.cs +++ b/src/LibHac/FsSystem/Save/Header.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/HierarchicalDuplexStorage.cs b/src/LibHac/FsSystem/Save/HierarchicalDuplexStorage.cs index 0c4c212a..e942fbd6 100644 --- a/src/LibHac/FsSystem/Save/HierarchicalDuplexStorage.cs +++ b/src/LibHac/FsSystem/Save/HierarchicalDuplexStorage.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/HierarchicalSaveFileTable.cs b/src/LibHac/FsSystem/Save/HierarchicalSaveFileTable.cs index 359bea1b..236af46b 100644 --- a/src/LibHac/FsSystem/Save/HierarchicalSaveFileTable.cs +++ b/src/LibHac/FsSystem/Save/HierarchicalSaveFileTable.cs @@ -1,6 +1,7 @@ using System; using System.IO; using System.Runtime.InteropServices; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/JournalMap.cs b/src/LibHac/FsSystem/Save/JournalMap.cs index c03dae94..dd13c552 100644 --- a/src/LibHac/FsSystem/Save/JournalMap.cs +++ b/src/LibHac/FsSystem/Save/JournalMap.cs @@ -1,4 +1,5 @@ using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/JournalStorage.cs b/src/LibHac/FsSystem/Save/JournalStorage.cs index 05f162d0..5897b145 100644 --- a/src/LibHac/FsSystem/Save/JournalStorage.cs +++ b/src/LibHac/FsSystem/Save/JournalStorage.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/RemapStorage.cs b/src/LibHac/FsSystem/Save/RemapStorage.cs index 74fee6e4..a392a63d 100644 --- a/src/LibHac/FsSystem/Save/RemapStorage.cs +++ b/src/LibHac/FsSystem/Save/RemapStorage.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/SaveDataDirectory.cs b/src/LibHac/FsSystem/Save/SaveDataDirectory.cs index 7062a58e..a1a4e061 100644 --- a/src/LibHac/FsSystem/Save/SaveDataDirectory.cs +++ b/src/LibHac/FsSystem/Save/SaveDataDirectory.cs @@ -1,6 +1,7 @@ using System; using System.Text; using LibHac.Common; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs b/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs index b2874841..1e62ed3b 100644 --- a/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs +++ b/src/LibHac/FsSystem/Save/SaveDataFileSystem.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs b/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs index c0929ec3..731676ab 100644 --- a/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs +++ b/src/LibHac/FsSystem/Save/SaveDataFileSystemCore.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/SaveFsList.cs b/src/LibHac/FsSystem/Save/SaveFsList.cs index 47806a1a..2d83c572 100644 --- a/src/LibHac/FsSystem/Save/SaveFsList.cs +++ b/src/LibHac/FsSystem/Save/SaveFsList.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using LibHac.Fs; namespace LibHac.FsSystem.Save { diff --git a/src/LibHac/FsSystem/Save/SaveResults.cs b/src/LibHac/FsSystem/Save/SaveResults.cs index 0ec59399..c8bfdc9a 100644 --- a/src/LibHac/FsSystem/Save/SaveResults.cs +++ b/src/LibHac/FsSystem/Save/SaveResults.cs @@ -1,4 +1,6 @@ -namespace LibHac.FsSystem.Save +using LibHac.Fs; + +namespace LibHac.FsSystem.Save { internal static class SaveResults { diff --git a/src/LibHac/FsSystem/SaveDataCreateInfo.cs b/src/LibHac/FsSystem/SaveDataCreateInfo.cs deleted file mode 100644 index 875bb0e2..00000000 --- a/src/LibHac/FsSystem/SaveDataCreateInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Runtime.InteropServices; - -namespace LibHac.FsSystem -{ - [StructLayout(LayoutKind.Explicit, Size = 0x40)] - public struct SaveDataCreateInfo - { - // Todo - } -} diff --git a/src/LibHac/FsSystem/SaveMetaCreateInfo.cs b/src/LibHac/FsSystem/SaveMetaCreateInfo.cs deleted file mode 100644 index a8677328..00000000 --- a/src/LibHac/FsSystem/SaveMetaCreateInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Runtime.InteropServices; - -namespace LibHac.FsSystem -{ - [StructLayout(LayoutKind.Explicit, Size = 0x10)] - public struct SaveMetaCreateInfo - { - [FieldOffset(0)] public int Size; - [FieldOffset(4)] public SaveMetaType Type; - } -} diff --git a/src/LibHac/FsSystem/SectorStorage.cs b/src/LibHac/FsSystem/SectorStorage.cs index 6246ed9f..1760ad3f 100644 --- a/src/LibHac/FsSystem/SectorStorage.cs +++ b/src/LibHac/FsSystem/SectorStorage.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/StorageBase.cs b/src/LibHac/FsSystem/StorageBase.cs index 0fada5e8..267bb83c 100644 --- a/src/LibHac/FsSystem/StorageBase.cs +++ b/src/LibHac/FsSystem/StorageBase.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/StorageExtensions.cs b/src/LibHac/FsSystem/StorageExtensions.cs index 46ee10e3..3deebdf5 100644 --- a/src/LibHac/FsSystem/StorageExtensions.cs +++ b/src/LibHac/FsSystem/StorageExtensions.cs @@ -2,6 +2,7 @@ using System.Buffers; using System.IO; using System.Runtime.InteropServices; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/StorageFile.cs b/src/LibHac/FsSystem/StorageFile.cs index 32009c5f..08f460ce 100644 --- a/src/LibHac/FsSystem/StorageFile.cs +++ b/src/LibHac/FsSystem/StorageFile.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/StorageStream.cs b/src/LibHac/FsSystem/StorageStream.cs index 265e1edf..0f900f70 100644 --- a/src/LibHac/FsSystem/StorageStream.cs +++ b/src/LibHac/FsSystem/StorageStream.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/StreamFile.cs b/src/LibHac/FsSystem/StreamFile.cs index 2103166c..c2308049 100644 --- a/src/LibHac/FsSystem/StreamFile.cs +++ b/src/LibHac/FsSystem/StreamFile.cs @@ -1,6 +1,6 @@ using System; using System.IO; - +using LibHac.Fs; #if !STREAM_SPAN using System.Buffers; #endif diff --git a/src/LibHac/FsSystem/SubStorage.cs b/src/LibHac/FsSystem/SubStorage.cs index 82616040..c8272bd8 100644 --- a/src/LibHac/FsSystem/SubStorage.cs +++ b/src/LibHac/FsSystem/SubStorage.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/FsSystem/SubdirectoryFileSystem.cs b/src/LibHac/FsSystem/SubdirectoryFileSystem.cs index 9c2df12f..ad61357e 100644 --- a/src/LibHac/FsSystem/SubdirectoryFileSystem.cs +++ b/src/LibHac/FsSystem/SubdirectoryFileSystem.cs @@ -1,4 +1,5 @@ using System; +using LibHac.Fs; namespace LibHac.FsSystem { diff --git a/src/LibHac/Kip.cs b/src/LibHac/Kip.cs index ac0e6b20..839bc544 100644 --- a/src/LibHac/Kip.cs +++ b/src/LibHac/Kip.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using LibHac.Fs; using LibHac.FsSystem; namespace LibHac diff --git a/src/LibHac/Ncm/IContentStorage.cs b/src/LibHac/Ncm/IContentStorage.cs index 9834f3a0..2cd17ea9 100644 --- a/src/LibHac/Ncm/IContentStorage.cs +++ b/src/LibHac/Ncm/IContentStorage.cs @@ -1,5 +1,5 @@ using System; -using LibHac.FsSystem; +using LibHac.Fs; namespace LibHac.Ncm { diff --git a/src/LibHac/Nro.cs b/src/LibHac/Nro.cs index 1afd9710..d5cca492 100644 --- a/src/LibHac/Nro.cs +++ b/src/LibHac/Nro.cs @@ -1,4 +1,5 @@ using System.IO; +using LibHac.Fs; using LibHac.FsSystem; namespace LibHac diff --git a/src/LibHac/Nso.cs b/src/LibHac/Nso.cs index 09e49b96..59dfa245 100644 --- a/src/LibHac/Nso.cs +++ b/src/LibHac/Nso.cs @@ -1,5 +1,6 @@ using System.Collections; using System.IO; +using LibHac.Fs; using LibHac.FsSystem; namespace LibHac diff --git a/src/LibHac/Package1.cs b/src/LibHac/Package1.cs index b94f7f8e..f8dc9947 100644 --- a/src/LibHac/Package1.cs +++ b/src/LibHac/Package1.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using LibHac.Fs; using LibHac.FsSystem; namespace LibHac diff --git a/src/LibHac/Package2.cs b/src/LibHac/Package2.cs index dee1e26c..9e9cf4c6 100644 --- a/src/LibHac/Package2.cs +++ b/src/LibHac/Package2.cs @@ -1,5 +1,6 @@ using System; using System.IO; +using LibHac.Fs; using LibHac.FsSystem; namespace LibHac diff --git a/src/LibHac/SwitchFs.cs b/src/LibHac/SwitchFs.cs index d6455293..f39f369c 100644 --- a/src/LibHac/SwitchFs.cs +++ b/src/LibHac/SwitchFs.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; using System.Linq; +using LibHac.Fs; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; using LibHac.FsSystem.Save; diff --git a/src/LibHac/Xci.cs b/src/LibHac/Xci.cs index 4154f43f..b8250571 100644 --- a/src/LibHac/Xci.cs +++ b/src/LibHac/Xci.cs @@ -1,4 +1,5 @@ -using LibHac.FsSystem; +using LibHac.Fs; +using LibHac.FsSystem; namespace LibHac { diff --git a/src/hactoolnet/ProcessBench.cs b/src/hactoolnet/ProcessBench.cs index 1f889940..e464c39d 100644 --- a/src/hactoolnet/ProcessBench.cs +++ b/src/hactoolnet/ProcessBench.cs @@ -1,5 +1,6 @@ using System.Diagnostics; using LibHac; +using LibHac.Fs; using LibHac.FsSystem; namespace hactoolnet diff --git a/src/hactoolnet/ProcessDelta.cs b/src/hactoolnet/ProcessDelta.cs index 3ab22e4b..3f80126b 100644 --- a/src/hactoolnet/ProcessDelta.cs +++ b/src/hactoolnet/ProcessDelta.cs @@ -2,6 +2,7 @@ using System.IO; using System.Runtime.InteropServices; using System.Text; +using LibHac.Fs; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; using static hactoolnet.Print; diff --git a/src/hactoolnet/ProcessFsBuild.cs b/src/hactoolnet/ProcessFsBuild.cs index b9162cde..3f56759a 100644 --- a/src/hactoolnet/ProcessFsBuild.cs +++ b/src/hactoolnet/ProcessFsBuild.cs @@ -1,4 +1,5 @@ using System.IO; +using LibHac.Fs; using LibHac.FsSystem; using LibHac.FsSystem.RomFs; diff --git a/src/hactoolnet/ProcessPfs.cs b/src/hactoolnet/ProcessPfs.cs index c450f7ed..fd7bbf2b 100644 --- a/src/hactoolnet/ProcessPfs.cs +++ b/src/hactoolnet/ProcessPfs.cs @@ -2,6 +2,7 @@ using System.Reflection; using System.Text; using LibHac; +using LibHac.Fs; using LibHac.FsSystem; using static hactoolnet.Print; diff --git a/src/hactoolnet/ProcessRomfs.cs b/src/hactoolnet/ProcessRomfs.cs index 86af0c46..093816ee 100644 --- a/src/hactoolnet/ProcessRomfs.cs +++ b/src/hactoolnet/ProcessRomfs.cs @@ -1,4 +1,5 @@ using System.IO; +using LibHac.Fs; using LibHac.FsSystem; using LibHac.FsSystem.RomFs; diff --git a/src/hactoolnet/ProcessSwitchFs.cs b/src/hactoolnet/ProcessSwitchFs.cs index 441346f8..a2fa567d 100644 --- a/src/hactoolnet/ProcessSwitchFs.cs +++ b/src/hactoolnet/ProcessSwitchFs.cs @@ -4,6 +4,7 @@ using System.IO; using System.Linq; using System.Text; using LibHac; +using LibHac.Fs; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; using LibHac.FsSystem.Save; diff --git a/src/hactoolnet/ProcessXci.cs b/src/hactoolnet/ProcessXci.cs index 240830b4..03841cca 100644 --- a/src/hactoolnet/ProcessXci.cs +++ b/src/hactoolnet/ProcessXci.cs @@ -3,6 +3,7 @@ using System.IO; using System.Linq; using System.Text; using LibHac; +using LibHac.Fs; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; using static hactoolnet.Print;