diff options
Diffstat (limited to 'Ryujinx.HLE/HOS/Font/SharedFontManager.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/Font/SharedFontManager.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Ryujinx.HLE/HOS/Font/SharedFontManager.cs b/Ryujinx.HLE/HOS/Font/SharedFontManager.cs index 5201e0f3..34129404 100644 --- a/Ryujinx.HLE/HOS/Font/SharedFontManager.cs +++ b/Ryujinx.HLE/HOS/Font/SharedFontManager.cs @@ -19,7 +19,7 @@ namespace Ryujinx.HLE.HOS.Font { private Switch _device; - private long _physicalAddress; + private ulong _physicalAddress; private struct FontInfo { @@ -35,7 +35,7 @@ namespace Ryujinx.HLE.HOS.Font private Dictionary<SharedFontType, FontInfo> _fontData; - public SharedFontManager(Switch device, long physicalAddress) + public SharedFontManager(Switch device, ulong physicalAddress) { _physicalAddress = physicalAddress; _device = device; @@ -52,7 +52,7 @@ namespace Ryujinx.HLE.HOS.Font { if (_fontData == null) { - _device.Memory.FillWithZeros(_physicalAddress, Horizon.FontSize); + _device.Memory.ZeroFill(_physicalAddress, Horizon.FontSize); uint fontOffset = 0; @@ -67,7 +67,7 @@ namespace Ryujinx.HLE.HOS.Font if (!string.IsNullOrWhiteSpace(fontPath)) { byte[] data; - + using (IStorage ncaFileStream = new LocalStorage(fontPath, FileAccess.Read, FileMode.Open)) { Nca nca = new Nca(_device.System.KeySet, ncaFileStream); @@ -77,7 +77,7 @@ namespace Ryujinx.HLE.HOS.Font data = DecryptFont(fontFile.AsStream()); } - + FontInfo info = new FontInfo((int)fontOffset, data.Length); WriteMagicAndSize(_physicalAddress + fontOffset, data.Length); @@ -88,7 +88,7 @@ namespace Ryujinx.HLE.HOS.Font for (; fontOffset - start < data.Length; fontOffset++) { - _device.Memory.WriteByte(_physicalAddress + fontOffset, data[fontOffset - start]); + _device.Memory.Write(_physicalAddress + fontOffset, data[fontOffset - start]); } return info; @@ -129,15 +129,15 @@ namespace Ryujinx.HLE.HOS.Font } } - private void WriteMagicAndSize(long position, int size) + private void WriteMagicAndSize(ulong address, int size) { const int decMagic = 0x18029a7f; const int key = 0x49621806; int encryptedSize = BinaryPrimitives.ReverseEndianness(size ^ key); - _device.Memory.WriteInt32(position + 0, decMagic); - _device.Memory.WriteInt32(position + 4, encryptedSize); + _device.Memory.Write(address + 0, decMagic); + _device.Memory.Write(address + 4, encryptedSize); } public int GetFontSize(SharedFontType fontType) |