From 1bb7fdaca43c5dcb016dfb9fd13319f4638cb0d2 Mon Sep 17 00:00:00 2001 From: Alex Barney Date: Tue, 1 Sep 2020 13:08:59 -0700 Subject: Update to LibHac 0.12.0 (#1485) * Update to LibHac 0.12.0 * Auto-formatting. Fixed a bug in SetApplicationCopyrightImage --- Ryujinx.HLE/FileSystem/Content/ContentManager.cs | 5 +++-- Ryujinx.HLE/FileSystem/SaveHelper.cs | 2 +- Ryujinx.HLE/FileSystem/VirtualFileSystem.cs | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'Ryujinx.HLE/FileSystem') diff --git a/Ryujinx.HLE/FileSystem/Content/ContentManager.cs b/Ryujinx.HLE/FileSystem/Content/ContentManager.cs index a8e9e961..4c4f3c86 100644 --- a/Ryujinx.HLE/FileSystem/Content/ContentManager.cs +++ b/Ryujinx.HLE/FileSystem/Content/ContentManager.cs @@ -1,6 +1,7 @@ using LibHac; using LibHac.Common; using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using LibHac.FsSystem.NcaUtils; using LibHac.Ncm; @@ -827,7 +828,7 @@ namespace Ryujinx.HLE.FileSystem.Content LibHac.Crypto.Sha256.GenerateSha256Hash(content, hash); - if (LibHac.Util.ArraysEqual(hash.ToArray(), meta.ContentEntries[0].Hash)) + if (LibHac.Utilities.ArraysEqual(hash.ToArray(), meta.ContentEntries[0].Hash)) { updateNcas.Remove(metaEntry.TitleId); } @@ -962,7 +963,7 @@ namespace Ryujinx.HLE.FileSystem.Content LibHac.Crypto.Sha256.GenerateSha256Hash(content, hash); - if (LibHac.Util.ArraysEqual(hash.ToArray(), meta.ContentEntries[0].Hash)) + if (LibHac.Utilities.ArraysEqual(hash.ToArray(), meta.ContentEntries[0].Hash)) { updateNcas.Remove(metaEntry.TitleId); } diff --git a/Ryujinx.HLE/FileSystem/SaveHelper.cs b/Ryujinx.HLE/FileSystem/SaveHelper.cs index b9abcb85..51a25515 100644 --- a/Ryujinx.HLE/FileSystem/SaveHelper.cs +++ b/Ryujinx.HLE/FileSystem/SaveHelper.cs @@ -1,4 +1,4 @@ -using LibHac.Fs; +using LibHac.Fs.Fsa; using LibHac.FsSystem; using Ryujinx.HLE.HOS; using System.IO; diff --git a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs index a95c9c0f..5b44f2d7 100644 --- a/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs +++ b/Ryujinx.HLE/FileSystem/VirtualFileSystem.cs @@ -1,7 +1,8 @@ using LibHac; using LibHac.Common; using LibHac.Fs; -using LibHac.FsService; +using LibHac.Fs.Fsa; +using LibHac.FsSrv; using LibHac.FsSystem; using LibHac.Spl; using Ryujinx.Common.Configuration; -- cgit v1.2.3