Mirror/LibHac
1
0
Fork 0
mirror of https://github.com/Thealexbarney/LibHac.git synced 2025-02-09 13:14:46 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename some save enum/struct fields

Browse Source
This commit is contained in:
Alex Barney 2021-12-29 10:13:42 -07:00
parent 5013e7d2ec
commit 5380902376
9 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/LibHac/Fs/ApplicationSaveDataManagement.cs
View File

@ -253,7 +253,7 @@ public static class ApplicationSaveDataManagement
}
else if (targetMedia == CacheStorageTargetMedia.SdCard)
{
rc = TryCreateCacheStorage(fs, out requiredSizeLocal, SaveDataSpaceId.SdCache, applicationId,
rc = TryCreateCacheStorage(fs, out requiredSizeLocal, SaveDataSpaceId.SdUser, applicationId,
saveDataOwnerId, index, dataSize, journalSize, allowExisting);
if (rc.IsFailure()) return rc;
}
@ -265,7 +265,7 @@ public static class ApplicationSaveDataManagement
{
target = CacheStorageTargetMedia.SdCard;
Result CreateFuncSdCard() => fs.CreateCacheStorage(applicationId, SaveDataSpaceId.SdCache,
Result CreateFuncSdCard() => fs.CreateCacheStorage(applicationId, SaveDataSpaceId.SdUser,
saveDataOwnerId, index, dataSize, journalSize, SaveDataFlags.None);
rc = CreateSaveData(fs, CreateFuncSdCard, ref requiredSizeLocal, 0x4000, dataSize, journalSize);
@ -420,7 +420,7 @@ public static class ApplicationSaveDataManagement
if (fs.IsSdCardAccessible())
{
Result rc = fs.FindSaveDataWithFilter(out _, SaveDataSpaceId.SdCache, in filter);
Result rc = fs.FindSaveDataWithFilter(out _, SaveDataSpaceId.SdUser, in filter);
if (rc.IsFailure() && !ResultFs.TargetNotFound.Includes(rc)) return rc;
if (rc.IsSuccess())

4
src/LibHac/Fs/FsEnums.cs
View File

@ -52,7 +52,7 @@ public enum SaveDataSpaceId : byte
User = 1,
SdSystem = 2,
Temporary = 3,
SdCache = 4,
SdUser = 4,
ProperSystem = 100,
SafeMode = 101,
BisAuto = 127
@ -260,5 +260,5 @@ public enum SdCardSpeedMode
Sdr50 = 5,
Sdr104 = 6,
Ddr50 = 7,
Unknown = 8,
Unknown = 8
}

6
src/LibHac/Fs/SaveDataStructs.cs
View File

@ -118,7 +118,7 @@ public struct SaveDataCreationInfo
[FieldOffset(0x18)] public ulong OwnerId;
[FieldOffset(0x20)] public SaveDataFlags Flags;
[FieldOffset(0x24)] public SaveDataSpaceId SpaceId;
[FieldOffset(0x25)] public bool Field25;
[FieldOffset(0x25)] public bool IsPseudoSaveData;
public static Result Make(out SaveDataCreationInfo creationInfo, long size, long journalSize, ulong ownerId,
SaveDataFlags flags, SaveDataSpaceId spaceId)
@ -132,7 +132,7 @@ public struct SaveDataCreationInfo
tempCreationInfo.OwnerId = ownerId;
tempCreationInfo.Flags = flags;
tempCreationInfo.SpaceId = spaceId;
tempCreationInfo.Field25 = false;
tempCreationInfo.IsPseudoSaveData = false;
if (!SaveDataTypesValidity.IsValid(in tempCreationInfo))
return ResultFs.InvalidArgument.Log();
@ -331,7 +331,7 @@ internal static class SaveDataTypesValidity
public static bool IsValid(in SaveDataSpaceId spaceId)
{
return (uint)spaceId <= (uint)SaveDataSpaceId.SdCache || spaceId == SaveDataSpaceId.ProperSystem ||
return (uint)spaceId <= (uint)SaveDataSpaceId.SdUser || spaceId == SaveDataSpaceId.ProperSystem ||
spaceId == SaveDataSpaceId.SafeMode;
}

10
src/LibHac/FsSrv/SaveDataFileSystemService.cs
View File

@ -102,7 +102,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave
break;
case SaveDataSpaceId.User:
case SaveDataSpaceId.Temporary:
case SaveDataSpaceId.SdCache:
case SaveDataSpaceId.SdUser:
if (!programInfo.AccessControl.CanCall(OperationType.OpenSaveDataInfoReader))
return ResultFs.PermissionDenied.Log();
break;
@ -1751,7 +1751,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave
Result rc = GetProgramInfo(out ProgramInfo programInfo);
if (rc.IsFailure()) return rc;
if (spaceId != SaveDataSpaceId.SdCache && spaceId != SaveDataSpaceId.User)
if (spaceId != SaveDataSpaceId.SdUser && spaceId != SaveDataSpaceId.User)
return ResultFs.InvalidSaveDataSpaceId.Log();
using var filterReader = new UniqueRef<SaveDataInfoFilterReader>();
@ -1810,12 +1810,12 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave
// Cache storage on the SD card will always take priority over case storage in NAND
if (_serviceImpl.IsSdCardAccessible())
{
rc = SaveExists(out bool existsOnSdCard, SaveDataSpaceId.SdCache);
rc = SaveExists(out bool existsOnSdCard, SaveDataSpaceId.SdUser);
if (rc.IsFailure()) return rc;
if (existsOnSdCard)
{
spaceId = SaveDataSpaceId.SdCache;
spaceId = SaveDataSpaceId.SdUser;
return Result.Success;
}
}
@ -2207,7 +2207,7 @@ internal class SaveDataFileSystemService : ISaveDataTransferCoreInterface, ISave
return StorageType.Bis | StorageType.SdCard | StorageType.Usb;
if (type == SaveDataType.System ||
spaceId != SaveDataSpaceId.SdSystem && spaceId != SaveDataSpaceId.SdCache)
spaceId != SaveDataSpaceId.SdSystem && spaceId != SaveDataSpaceId.SdUser)
return StorageType.Bis;
return StorageType.SdCard | StorageType.Usb;

4
src/LibHac/FsSrv/SaveDataFileSystemServiceImpl.cs
View File

@ -659,7 +659,7 @@ public class SaveDataFileSystemServiceImpl
return Result.Success;
case SaveDataSpaceId.SdSystem:
case SaveDataSpaceId.SdCache:
case SaveDataSpaceId.SdUser:
{
rc = _config.BaseFsService.OpenSdCardProxyFileSystem(ref baseFileSystem.Ref(), true);
if (rc.IsFailure()) return rc.Miss();
@ -721,7 +721,7 @@ public class SaveDataFileSystemServiceImpl
_config.SaveFsCreator.SetSdCardEncryptionSeed(seed.Value);
_config.SaveIndexerManager.InvalidateIndexer(SaveDataSpaceId.SdSystem);
_config.SaveIndexerManager.InvalidateIndexer(SaveDataSpaceId.SdCache);
_config.SaveIndexerManager.InvalidateIndexer(SaveDataSpaceId.SdUser);
return Result.Success;
}

4
src/LibHac/FsSrv/SaveDataIndexerManager.cs
View File

@ -85,7 +85,7 @@ internal class SaveDataIndexerManager : ISaveDataIndexerManager
indexer = _bisIndexer.Indexer;
break;
case SaveDataSpaceId.SdSystem:
case SaveDataSpaceId.SdCache:
case SaveDataSpaceId.SdUser:
// ReSharper doesn't realize that UniqueLock locks the indexer's lock object
// ReSharper disable InconsistentlySynchronizedField
indexerLock = new UniqueLock(_sdCardIndexer.Locker);
@ -176,7 +176,7 @@ internal class SaveDataIndexerManager : ISaveDataIndexerManager
// Note: Nintendo doesn't lock when doing this operation
lock (_sdCardIndexer.Locker)
{
if (spaceId != SaveDataSpaceId.SdCache && spaceId != SaveDataSpaceId.SdSystem)
if (spaceId != SaveDataSpaceId.SdUser && spaceId != SaveDataSpaceId.SdSystem)
{
Abort.UnexpectedDefault();
}

2
tests/LibHac.Tests/Fs/FileSystemClientTests/ApplicationSaveDataManagementTests.cs
View File

@ -140,7 +140,7 @@ public class ApplicationSaveDataManagementTests
Assert.Equal(CacheStorageTargetMedia.SdCard, target);
using var iterator = new UniqueRef<SaveDataIterator>();
fs.OpenSaveDataIterator(ref iterator.Ref(), SaveDataSpaceId.SdCache);
fs.OpenSaveDataIterator(ref iterator.Ref(), SaveDataSpaceId.SdUser);
var info = new SaveDataInfo[2];
Assert.Success(iterator.Get.ReadSaveDataInfo(out long entriesRead, info));

4
tests/LibHac.Tests/Fs/FileSystemClientTests/ShimTests/SaveData.cs
View File

@ -25,7 +25,7 @@ public class SaveData
var applicationId = new Ncm.ApplicationId(1);
FileSystemClient fs = FileSystemServerFactory.CreateClient(true);
fs.CreateCacheStorage(applicationId, SaveDataSpaceId.SdCache, applicationId.Value, 0, 0, SaveDataFlags.None);
fs.CreateCacheStorage(applicationId, SaveDataSpaceId.SdUser, applicationId.Value, 0, 0, SaveDataFlags.None);
fs.MountCacheStorage("cache".ToU8Span(), applicationId);
fs.CreateFile("cache:/file".ToU8Span(), 0);
@ -43,7 +43,7 @@ public class SaveData
var applicationId = new Ncm.ApplicationId(1);
FileSystemClient fs = FileSystemServerFactory.CreateClient(true);
Assert.Success(fs.CreateCacheStorage(applicationId, SaveDataSpaceId.SdCache, applicationId.Value, 0, 0, SaveDataFlags.None));
Assert.Success(fs.CreateCacheStorage(applicationId, SaveDataSpaceId.SdUser, applicationId.Value, 0, 0, SaveDataFlags.None));
Assert.Success(fs.MountCacheStorage("cache".ToU8Span(), applicationId));
fs.CreateFile("cache:/sd".ToU8Span(), 0);
fs.Commit("cache".ToU8Span());

6
tests/LibHac.Tests/Fs/FileSystemClientTests/ShimTests/SaveDataManagement.cs
View File

@ -36,10 +36,10 @@ public class SaveDataManagement
var applicationId = new Ncm.ApplicationId(1);
FileSystemClient fs = FileSystemServerFactory.CreateClient(true);
Assert.Success(fs.CreateCacheStorage(applicationId, SaveDataSpaceId.SdCache, applicationId.Value, 0, 0, SaveDataFlags.None));
Assert.Success(fs.CreateCacheStorage(applicationId, SaveDataSpaceId.SdUser, applicationId.Value, 0, 0, SaveDataFlags.None));
using var iterator = new UniqueRef<SaveDataIterator>();
fs.OpenSaveDataIterator(ref iterator.Ref(), SaveDataSpaceId.SdCache);
fs.OpenSaveDataIterator(ref iterator.Ref(), SaveDataSpaceId.SdUser);
var info = new SaveDataInfo[2];
iterator.Get.ReadSaveDataInfo(out long entriesRead, info);
@ -54,7 +54,7 @@ public class SaveDataManagement
var applicationId = new Ncm.ApplicationId(1);
FileSystemClient fs = FileSystemServerFactory.CreateClient(false);
Assert.Result(ResultFs.PortSdCardNoDevice, fs.CreateCacheStorage(applicationId, SaveDataSpaceId.SdCache, applicationId.Value, 0, 0, SaveDataFlags.None));
Assert.Result(ResultFs.PortSdCardNoDevice, fs.CreateCacheStorage(applicationId, SaveDataSpaceId.SdUser, applicationId.Value, 0, 0, SaveDataFlags.None));
}
[Fact]