diff options
| author | Alex Barney <thealexbarney@gmail.com> | 2022-01-12 04:22:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-12 12:22:19 +0100 |
| commit | f4bbc019b98fc026cd5e701d54be891e27077ff8 (patch) | |
| tree | d9105a2aa8c3465c0f10786e9359a097a93a739e /Ryujinx.HLE/FileSystem | |
| parent | 6e0799580f0d1b473a79471c5d365c6524d97a86 (diff) | |
Update to LibHac 0.15.0 (#2986)
Diffstat (limited to 'Ryujinx.HLE/FileSystem')
| -rw-r--r-- | Ryujinx.HLE/FileSystem/Content/ContentManager.cs | 11 | ||||
| -rw-r--r-- | Ryujinx.HLE/FileSystem/Content/LocationEntry.cs | 2 | ||||
| -rw-r--r-- | Ryujinx.HLE/FileSystem/VirtualFileSystem.cs | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/Ryujinx.HLE/FileSystem/Content/ContentManager.cs b/Ryujinx.HLE/FileSystem/Content/ContentManager.cs index ebe201ad..dbc18d85 100644 --- a/Ryujinx.HLE/FileSystem/Content/ContentManager.cs +++ b/Ryujinx.HLE/FileSystem/Content/ContentManager.cs @@ -1,10 +1,13 @@ -using LibHac; using LibHac.Common; +using LibHac.Common.Keys; using LibHac.Fs; using LibHac.Fs.Fsa; using LibHac.FsSystem; -using LibHac.FsSystem.NcaUtils; using LibHac.Ncm; +using LibHac.Tools.Fs; +using LibHac.Tools.FsSystem; +using LibHac.Tools.FsSystem.NcaUtils; +using LibHac.Tools.Ncm; using Ryujinx.Common.Logging; using Ryujinx.HLE.Exceptions; using Ryujinx.HLE.HOS.Services.Time; @@ -839,7 +842,7 @@ namespace Ryujinx.HLE.FileSystem.Content LibHac.Crypto.Sha256.GenerateSha256Hash(content, hash); - if (LibHac.Utilities.ArraysEqual(hash.ToArray(), meta.ContentEntries[0].Hash)) + if (LibHac.Common.Utilities.ArraysEqual(hash.ToArray(), meta.ContentEntries[0].Hash)) { updateNcas.Remove(metaEntry.TitleId); } @@ -978,7 +981,7 @@ namespace Ryujinx.HLE.FileSystem.Content LibHac.Crypto.Sha256.GenerateSha256Hash(content, hash); - if (LibHac.Utilities.ArraysEqual(hash.ToArray(), meta.ContentEntries[0].Hash)) + if (LibHac.Common.Utilities.ArraysEqual(hash.ToArray(), meta.ContentEntries[0].Hash)) { updateNcas.Remove(metaEntry.TitleId); } diff --git a/Ryujinx.HLE/FileSystem/Content/LocationEntry.cs b/Ryujinx.HLE/FileSystem/Content/LocationEntry.cs index cc259c3a..bf938746 100644 --- a/Ryujinx.HLE/FileSystem/Content/LocationEntry.cs +++ b/Ryujinx.HLE/FileSystem/Content/LocationEntry.cs @@ -1,4 +1,4 @@ -using LibHac.FsSystem.NcaUtils; +using LibHac.FsSystem; namespace Ryujinx.HLE.FileSystem.Content { diff --git a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs index 87508216..f2d20cb1 100644 --- a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs +++ b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs @@ -8,6 +8,9 @@ using LibHac.FsSrv; using LibHac.FsSystem; using LibHac.Ncm; using LibHac.Spl; +using LibHac.Tools.Es; +using LibHac.Tools.Fs; +using LibHac.Tools.FsSystem; using Ryujinx.Common.Configuration; using Ryujinx.Common.Logging; using Ryujinx.HLE.FileSystem.Content; |