diff --git a/src/LibHac/FsSrv/BaseFileSystemService.cs b/src/LibHac/FsSrv/BaseFileSystemService.cs index 4c18be83..7d322c23 100644 --- a/src/LibHac/FsSrv/BaseFileSystemService.cs +++ b/src/LibHac/FsSrv/BaseFileSystemService.cs @@ -112,7 +112,7 @@ public readonly struct BaseFileSystemService if (!accessibility.CanRead || !accessibility.CanWrite) return ResultFs.PermissionDenied.Log(); - const StorageType storageFlag = StorageType.Bis; + const StorageLayoutType storageFlag = StorageLayoutType.Bis; using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); // Normalize the path @@ -218,7 +218,7 @@ public readonly struct BaseFileSystemService if (!accessibility.CanRead || !accessibility.CanWrite) return ResultFs.PermissionDenied.Log(); - const StorageType storageFlag = StorageType.Bis; + const StorageLayoutType storageFlag = StorageLayoutType.Bis; using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); using var fileSystem = new SharedRef(); diff --git a/src/LibHac/FsSrv/BaseStorageService.cs b/src/LibHac/FsSrv/BaseStorageService.cs index 6300c9e2..8f34721b 100644 --- a/src/LibHac/FsSrv/BaseStorageService.cs +++ b/src/LibHac/FsSrv/BaseStorageService.cs @@ -61,7 +61,7 @@ public readonly struct BaseStorageService public Result OpenBisStorage(ref SharedRef outStorage, BisPartitionId id) { - var storageFlag = StorageType.Bis; + var storageFlag = StorageLayoutType.Bis; using var scopedLayoutType = new ScopedStorageLayoutTypeSetter(storageFlag); Result rc = GetProgramInfo(out ProgramInfo programInfo); diff --git a/src/LibHac/FsSrv/FileSystemProxyImpl.cs b/src/LibHac/FsSrv/FileSystemProxyImpl.cs index 72d5f91c..60e783a4 100644 --- a/src/LibHac/FsSrv/FileSystemProxyImpl.cs +++ b/src/LibHac/FsSrv/FileSystemProxyImpl.cs @@ -803,7 +803,7 @@ public class FileSystemProxyImpl : IFileSystemProxy, IFileSystemProxyForLoader public Result OpenCloudBackupWorkStorageFileSystem(ref SharedRef outFileSystem, CloudBackupWorkStorageId storageId) { - var storageFlag = StorageType.NonGameCard; + var storageFlag = StorageLayoutType.NonGameCard; using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); Result rc = GetProgramInfo(out ProgramInfo programInfo); @@ -836,7 +836,7 @@ public class FileSystemProxyImpl : IFileSystemProxy, IFileSystemProxyForLoader public Result OpenCustomStorageFileSystem(ref SharedRef outFileSystem, CustomStorageId storageId) { - var storageFlag = StorageType.NonGameCard; + var storageFlag = StorageLayoutType.NonGameCard; using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); Result rc = GetProgramInfo(out ProgramInfo programInfo); diff --git a/src/LibHac/FsSrv/NcaFileSystemService.cs b/src/LibHac/FsSrv/NcaFileSystemService.cs index c0f025db..152cba2f 100644 --- a/src/LibHac/FsSrv/NcaFileSystemService.cs +++ b/src/LibHac/FsSrv/NcaFileSystemService.cs @@ -73,7 +73,7 @@ internal class NcaFileSystemService : IRomFileSystemAccessFailureManager public Result OpenFileSystemWithPatch(ref SharedRef outFileSystem, ProgramId programId, FileSystemProxyType fsType) { - const StorageType storageFlag = StorageType.All; + const StorageLayoutType storageFlag = StorageLayoutType.All; using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); // Get the program info for the caller and verify permissions @@ -228,7 +228,7 @@ internal class NcaFileSystemService : IRomFileSystemAccessFailureManager public Result OpenFileSystemWithId(ref SharedRef outFileSystem, in FspPath path, ulong id, FileSystemProxyType fsType) { - const StorageType storageFlag = StorageType.All; + const StorageLayoutType storageFlag = StorageLayoutType.All; using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); Result rc = GetProgramInfo(out ProgramInfo programInfo); @@ -361,7 +361,7 @@ internal class NcaFileSystemService : IRomFileSystemAccessFailureManager { UnsafeHelpers.SkipParamInit(out outRightsId); - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.All); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.All); Result rc = GetProgramInfo(out ProgramInfo programInfo); if (rc.IsFailure()) return rc; @@ -389,7 +389,7 @@ internal class NcaFileSystemService : IRomFileSystemAccessFailureManager const ulong checkThroughProgramId = ulong.MaxValue; UnsafeHelpers.SkipParamInit(out outRightsId, out outKeyGeneration); - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.All); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.All); Result rc = GetProgramInfo(out ProgramInfo programInfo); if (rc.IsFailure()) return rc; @@ -426,7 +426,7 @@ internal class NcaFileSystemService : IRomFileSystemAccessFailureManager { UnsafeHelpers.SkipParamInit(out isHostFs); - StorageType storageFlag = _serviceImpl.GetStorageFlag(programId); + StorageLayoutType storageFlag = _serviceImpl.GetStorageFlag(programId); using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); using var programPath = new Path(); @@ -452,7 +452,7 @@ internal class NcaFileSystemService : IRomFileSystemAccessFailureManager public Result OpenContentStorageFileSystem(ref SharedRef outFileSystem, ContentStorageId contentStorageId) { - StorageType storageFlag = contentStorageId == ContentStorageId.System ? StorageType.Bis : StorageType.All; + StorageLayoutType storageFlag = contentStorageId == ContentStorageId.System ? StorageLayoutType.Bis : StorageLayoutType.All; using var scopedLayoutType = new ScopedStorageLayoutTypeSetter(storageFlag); Result rc = GetProgramInfo(out ProgramInfo programInfo); @@ -535,7 +535,7 @@ internal class NcaFileSystemService : IRomFileSystemAccessFailureManager public Result OpenRegisteredUpdatePartition(ref SharedRef outFileSystem) { - var storageFlag = StorageType.All; + var storageFlag = StorageLayoutType.All; using var scopedLayoutType = new ScopedStorageLayoutTypeSetter(storageFlag); Result rc = GetProgramInfo(out ProgramInfo programInfo); diff --git a/src/LibHac/FsSrv/NcaFileSystemServiceImpl.cs b/src/LibHac/FsSrv/NcaFileSystemServiceImpl.cs index 0e9a4362..ba2131e3 100644 --- a/src/LibHac/FsSrv/NcaFileSystemServiceImpl.cs +++ b/src/LibHac/FsSrv/NcaFileSystemServiceImpl.cs @@ -815,13 +815,13 @@ public class NcaFileSystemServiceImpl return _locationResolverSet.ResolveRegisteredHtmlDocumentPath(ref path, id); } - internal StorageType GetStorageFlag(ulong programId) + internal StorageLayoutType GetStorageFlag(ulong programId) { if (programId >= _config.SpeedEmulationRange.ProgramIdMin && programId <= _config.SpeedEmulationRange.ProgramIdMax) - return StorageType.Bis; + return StorageLayoutType.Bis; else - return StorageType.All; + return StorageLayoutType.All; } public Result HandleResolubleAccessFailure(out bool wasDeferred, Result resultForNoFailureDetected, diff --git a/src/LibHac/FsSrv/SaveDataFileSystemService.cs b/src/LibHac/FsSrv/SaveDataFileSystemService.cs index 2038fea9..bfa316c2 100644 --- a/src/LibHac/FsSrv/SaveDataFileSystemService.cs +++ b/src/LibHac/FsSrv/SaveDataFileSystemService.cs @@ -450,7 +450,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result DeleteSaveDataFileSystem(ulong saveDataId) { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.Bis); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.Bis); return DeleteSaveDataFileSystemCommon(SaveDataSpaceId.System, saveDataId); } @@ -473,7 +473,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result DeleteSaveDataFileSystemBySaveDataSpaceId(SaveDataSpaceId spaceId, ulong saveDataId) { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); return DeleteSaveDataFileSystemBySaveDataSpaceIdCore(spaceId, saveDataId); } @@ -499,7 +499,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result DeleteSaveDataFileSystemBySaveDataAttribute(SaveDataSpaceId spaceId, in SaveDataAttribute attribute) { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); Result rs = GetSaveDataInfo(out SaveDataInfo info, spaceId, in attribute); if (rs.IsFailure()) return rs; @@ -691,7 +691,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave bool accessorInitialized = false; Result rc; - StorageType storageFlag = DecidePossibleStorageFlag(attribute.Type, creationInfo.SpaceId); + StorageLayoutType storageFlag = DecidePossibleStorageFlag(attribute.Type, creationInfo.SpaceId); using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); using var accessor = new UniqueRef(); @@ -863,7 +863,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave { UnsafeHelpers.SkipParamInit(out info); - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); using var accessor = new UniqueRef(); Result rc = OpenSaveDataIndexerAccessor(ref accessor.Ref(), spaceId); @@ -906,7 +906,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave private Result CreateSaveDataFileSystemWithHashSaltImpl(in SaveDataAttribute attribute, in SaveDataCreationInfo creationInfo, in SaveDataMetaInfo metaInfo, in Optional hashSalt) { - StorageType storageFlag = DecidePossibleStorageFlag(attribute.Type, creationInfo.SpaceId); + StorageLayoutType storageFlag = DecidePossibleStorageFlag(attribute.Type, creationInfo.SpaceId); using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); Result rc = GetProgramInfo(out ProgramInfo programInfo); @@ -943,7 +943,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result CreateSaveDataFileSystemBySystemSaveDataId(in SaveDataAttribute attribute, in SaveDataCreationInfo creationInfo) { - StorageType storageFlag = DecidePossibleStorageFlag(attribute.Type, creationInfo.SpaceId); + StorageLayoutType storageFlag = DecidePossibleStorageFlag(attribute.Type, creationInfo.SpaceId); using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); Result rc = GetProgramInfo(out ProgramInfo programInfo); @@ -1083,7 +1083,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave private Result OpenUserSaveDataFileSystemCore(ref SharedRef outFileSystem, SaveDataSpaceId spaceId, in SaveDataAttribute attribute, ProgramInfo programInfo, bool openReadOnly) { - StorageType storageFlag = DecidePossibleStorageFlag(attribute.Type, spaceId); + StorageLayoutType storageFlag = DecidePossibleStorageFlag(attribute.Type, spaceId); using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); // Try grabbing the mount count semaphore @@ -1199,7 +1199,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave Result rc = GetProgramInfo(out ProgramInfo programInfo); if (rc.IsFailure()) return rc; - StorageType storageFlag = DecidePossibleStorageFlag(attribute.Type, spaceId); + StorageLayoutType storageFlag = DecidePossibleStorageFlag(attribute.Type, spaceId); using var scopedContext = new ScopedStorageLayoutTypeSetter(storageFlag); Accessibility accessibility = @@ -1272,7 +1272,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave { UnsafeHelpers.SkipParamInit(out extraData); - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); using var accessor = new UniqueRef(); Result rc = OpenSaveDataIndexerAccessor(ref accessor.Ref(), spaceId); @@ -1291,7 +1291,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave { UnsafeHelpers.SkipParamInit(out extraData); - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); Result rc = GetProgramInfo(out ProgramInfo programInfo); if (rc.IsFailure()) return rc; @@ -1445,7 +1445,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave private Result WriteSaveDataFileSystemExtraDataCore(SaveDataSpaceId spaceId, ulong saveDataId, in SaveDataExtraData extraData, SaveDataType saveType, bool updateTimeStamp) { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); using Path saveDataRootPath = _saveDataRootPath.DangerousGetPath(); return _serviceImpl.WriteSaveDataFileSystemExtraData(spaceId, saveDataId, in extraData, in saveDataRootPath, @@ -1455,7 +1455,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave private Result WriteSaveDataFileSystemExtraDataWithMaskCore(ulong saveDataId, SaveDataSpaceId spaceId, in SaveDataExtraData extraData, in SaveDataExtraData extraDataMask) { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); Result rc = GetProgramInfo(out ProgramInfo programInfo); if (rc.IsFailure()) return rc; @@ -1539,7 +1539,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result OpenSaveDataInfoReader(ref SharedRef outInfoReader) { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.Bis); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.Bis); Result rc = GetProgramInfo(out ProgramInfo programInfo); if (rc.IsFailure()) return rc; @@ -1569,7 +1569,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result OpenSaveDataInfoReaderBySaveDataSpaceId( ref SharedRef outInfoReader, SaveDataSpaceId spaceId) { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); Result rc = GetProgramInfo(out ProgramInfo programInfo); if (rc.IsFailure()) return rc; @@ -1603,7 +1603,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result OpenSaveDataInfoReaderWithFilter(ref SharedRef outInfoReader, SaveDataSpaceId spaceId, in SaveDataFilter filter) { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); Result rc = GetProgramInfo(out ProgramInfo programInfo); if (rc.IsFailure()) return rc; @@ -1664,7 +1664,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave if (saveDataInfoBuffer.Size != Unsafe.SizeOf()) return ResultFs.InvalidArgument.Log(); - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); Result rc = GetProgramInfo(out ProgramInfo programInfo); if (rc.IsFailure()) return rc; @@ -1730,7 +1730,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result OpenSaveDataInfoReaderOnlyCacheStorage(ref SharedRef outInfoReader) { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); // Find where the current program's cache storage is located Result rc = GetCacheStorageSpaceId(out SaveDataSpaceId spaceId); @@ -1749,7 +1749,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave private Result OpenSaveDataInfoReaderOnlyCacheStorage(ref SharedRef outInfoReader, SaveDataSpaceId spaceId) { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); Result rc = GetProgramInfo(out ProgramInfo programInfo); if (rc.IsFailure()) return rc; @@ -1876,7 +1876,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result DeleteCacheStorage(ushort index) { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); Result rc = FindCacheStorage(out SaveDataInfo saveInfo, out SaveDataSpaceId spaceId, index); if (rc.IsFailure()) return rc; @@ -1891,7 +1891,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave { UnsafeHelpers.SkipParamInit(out usableDataSize, out journalSize); - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.NonGameCard); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.NonGameCard); Result rc = FindCacheStorage(out SaveDataInfo saveInfo, out SaveDataSpaceId spaceId, index); if (rc.IsFailure()) return rc; @@ -1972,7 +1972,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result CleanUpSaveData() { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.Bis); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.Bis); using var accessor = new UniqueRef(); Result rc = OpenSaveDataIndexerAccessor(ref accessor.Ref(), SaveDataSpaceId.System); @@ -1989,7 +1989,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result CompleteSaveDataExtension() { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.Bis); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.Bis); using var accessor = new UniqueRef(); Result rc = OpenSaveDataIndexerAccessor(ref accessor.Ref(), SaveDataSpaceId.System); @@ -2006,7 +2006,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave public Result CleanUpTemporaryStorage() { - using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageType.Bis); + using var scopedContext = new ScopedStorageLayoutTypeSetter(StorageLayoutType.Bis); using var fileSystem = new SharedRef(); Result rc = _serviceImpl.OpenSaveDataDirectoryFileSystem(ref fileSystem.Ref(), SaveDataSpaceId.Temporary); @@ -2197,16 +2197,16 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave } } - private StorageType DecidePossibleStorageFlag(SaveDataType type, SaveDataSpaceId spaceId) + private StorageLayoutType DecidePossibleStorageFlag(SaveDataType type, SaveDataSpaceId spaceId) { if (type == SaveDataType.Cache || type == SaveDataType.Bcat) - return StorageType.Bis | StorageType.SdCard | StorageType.Usb; + return StorageLayoutType.Bis | StorageLayoutType.SdCard | StorageLayoutType.Usb; if (type == SaveDataType.System || spaceId != SaveDataSpaceId.SdSystem && spaceId != SaveDataSpaceId.SdUser) - return StorageType.Bis; + return StorageLayoutType.Bis; - return StorageType.SdCard | StorageType.Usb; + return StorageLayoutType.SdCard | StorageLayoutType.Usb; } Result ISaveDataTransferCoreInterface.CreateSaveDataFileSystemCore(in SaveDataAttribute attribute, diff --git a/src/LibHac/FsSystem/StorageLayoutTypeSetter.cs b/src/LibHac/FsSystem/StorageLayoutTypeSetter.cs index 3450513e..59a7eb96 100644 --- a/src/LibHac/FsSystem/StorageLayoutTypeSetter.cs +++ b/src/LibHac/FsSystem/StorageLayoutTypeSetter.cs @@ -7,7 +7,7 @@ using LibHac.Fs.Fsa; namespace LibHac.FsSystem; [Flags] -internal enum StorageType +internal enum StorageLayoutType { Bis = 1 << 0, SdCard = 1 << 1, @@ -22,9 +22,9 @@ internal enum StorageType /// Contains functions for validating the storage layout type flag. /// /// Based on FS 13.1.0 (nnSdk 13.4.0) -internal static class StorageLayoutType +internal static class StorageLayoutTypeFunctions { - public static bool IsStorageFlagValid(StorageType storageFlag) + public static bool IsStorageFlagValid(StorageLayoutType storageFlag) { return storageFlag != 0; } @@ -33,7 +33,7 @@ internal static class StorageLayoutType internal struct ScopedStorageLayoutTypeSetter : IDisposable { // ReSharper disable once UnusedParameter.Local - public ScopedStorageLayoutTypeSetter(StorageType storageFlag) + public ScopedStorageLayoutTypeSetter(StorageLayoutType storageFlag) { // Todo: Implement } @@ -52,14 +52,14 @@ internal struct ScopedStorageLayoutTypeSetter : IDisposable internal class StorageLayoutTypeSetStorage : IStorage { private SharedRef _baseStorage; - private StorageType _storageFlag; + private StorageLayoutType _storageFlag; - public StorageLayoutTypeSetStorage(ref SharedRef baseStorage, StorageType storageFlag) + public StorageLayoutTypeSetStorage(ref SharedRef baseStorage, StorageLayoutType storageFlag) { _baseStorage = SharedRef.CreateMove(ref baseStorage); _storageFlag = storageFlag; - Assert.SdkAssert(StorageLayoutType.IsStorageFlagValid(storageFlag)); + Assert.SdkAssert(StorageLayoutTypeFunctions.IsStorageFlagValid(storageFlag)); } public override void Dispose() @@ -120,24 +120,24 @@ internal class StorageLayoutTypeSetFile : IFile private IFile _baseFile; private UniqueRef _baseFileUnique; private SharedRef _baseFileShared; - private StorageType _storageFlag; + private StorageLayoutType _storageFlag; - public StorageLayoutTypeSetFile(ref UniqueRef baseFile, StorageType storageFlag) + public StorageLayoutTypeSetFile(ref UniqueRef baseFile, StorageLayoutType storageFlag) { _baseFile = baseFile.Get; _baseFileUnique = new UniqueRef(ref baseFile); _storageFlag = storageFlag; - Assert.SdkAssert(StorageLayoutType.IsStorageFlagValid(storageFlag)); + Assert.SdkAssert(StorageLayoutTypeFunctions.IsStorageFlagValid(storageFlag)); } - public StorageLayoutTypeSetFile(ref SharedRef baseFile, StorageType storageFlag) + public StorageLayoutTypeSetFile(ref SharedRef baseFile, StorageLayoutType storageFlag) { _baseFile = baseFile.Get; _baseFileShared = SharedRef.CreateMove(ref baseFile); _storageFlag = storageFlag; - Assert.SdkAssert(StorageLayoutType.IsStorageFlagValid(storageFlag)); + Assert.SdkAssert(StorageLayoutTypeFunctions.IsStorageFlagValid(storageFlag)); } public override void Dispose() @@ -198,9 +198,9 @@ internal class StorageLayoutTypeSetFile : IFile internal class StorageLayoutTypeSetDirectory : IDirectory { private UniqueRef _baseDirectory; - private StorageType _storageFlag; + private StorageLayoutType _storageFlag; - public StorageLayoutTypeSetDirectory(ref UniqueRef baseDirectory, StorageType storageFlag) + public StorageLayoutTypeSetDirectory(ref UniqueRef baseDirectory, StorageLayoutType storageFlag) { _baseDirectory = new UniqueRef(ref baseDirectory); _storageFlag = storageFlag; @@ -236,14 +236,14 @@ internal class StorageLayoutTypeSetDirectory : IDirectory internal class StorageLayoutTypeSetFileSystem : IFileSystem { private SharedRef _baseFileSystem; - private StorageType _storageFlag; + private StorageLayoutType _storageFlag; - public StorageLayoutTypeSetFileSystem(ref SharedRef baseFileSystem, StorageType storageFlag) + public StorageLayoutTypeSetFileSystem(ref SharedRef baseFileSystem, StorageLayoutType storageFlag) { _baseFileSystem = SharedRef.CreateMove(ref baseFileSystem); _storageFlag = storageFlag; - Assert.SdkAssert(StorageLayoutType.IsStorageFlagValid(storageFlag)); + Assert.SdkAssert(StorageLayoutTypeFunctions.IsStorageFlagValid(storageFlag)); } public override void Dispose()