diff options
| author | 2020-10-21 22:14:21 -0400 | |
|---|---|---|
| committer | 2020-10-21 22:14:23 -0400 | |
| commit | ea20b5c970cb261df93743803a227fafd5403d02 (patch) | |
| tree | b0f78e977fef8b78169a5c8df2105cd573ad21fa /src/core/hle/service/ns | |
| parent | Merge pull request #4811 from lioncash/warn-video (diff) | |
| download | yuzu-ea20b5c970cb261df93743803a227fafd5403d02.tar.gz yuzu-ea20b5c970cb261df93743803a227fafd5403d02.tar.xz yuzu-ea20b5c970cb261df93743803a227fafd5403d02.zip | |
core: Fix clang build pt.3
Should finally resolve building with clang.
Diffstat (limited to 'src/core/hle/service/ns')
| -rw-r--r-- | src/core/hle/service/ns/pl_u.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp index 40838a225..5ccec2637 100644 --- a/src/core/hle/service/ns/pl_u.cpp +++ b/src/core/hle/service/ns/pl_u.cpp | |||
| @@ -50,19 +50,9 @@ constexpr std::array<std::pair<FontArchives, const char*>, 7> SHARED_FONTS{ | |||
| 50 | std::make_pair(FontArchives::Extension, "nintendo_ext2_003.bfttf"), | 50 | std::make_pair(FontArchives::Extension, "nintendo_ext2_003.bfttf"), |
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | constexpr std::array<const char*, 7> SHARED_FONTS_TTF{ | ||
| 54 | "FontStandard.ttf", | ||
| 55 | "FontChineseSimplified.ttf", | ||
| 56 | "FontExtendedChineseSimplified.ttf", | ||
| 57 | "FontChineseTraditional.ttf", | ||
| 58 | "FontKorean.ttf", | ||
| 59 | "FontNintendoExtended.ttf", | ||
| 60 | "FontNintendoExtended2.ttf", | ||
| 61 | }; | ||
| 62 | |||
| 63 | // The below data is specific to shared font data dumped from Switch on f/w 2.2 | 53 | // The below data is specific to shared font data dumped from Switch on f/w 2.2 |
| 64 | // Virtual address and offsets/sizes likely will vary by dump | 54 | // Virtual address and offsets/sizes likely will vary by dump |
| 65 | constexpr VAddr SHARED_FONT_MEM_VADDR{0x00000009d3016000ULL}; | 55 | [[maybe_unused]] constexpr VAddr SHARED_FONT_MEM_VADDR{0x00000009d3016000ULL}; |
| 66 | constexpr u32 EXPECTED_RESULT{0x7f9a0218}; // What we expect the decrypted bfttf first 4 bytes to be | 56 | constexpr u32 EXPECTED_RESULT{0x7f9a0218}; // What we expect the decrypted bfttf first 4 bytes to be |
| 67 | constexpr u32 EXPECTED_MAGIC{0x36f81a1e}; // What we expect the encrypted bfttf first 4 bytes to be | 57 | constexpr u32 EXPECTED_MAGIC{0x36f81a1e}; // What we expect the encrypted bfttf first 4 bytes to be |
| 68 | constexpr u64 SHARED_FONT_MEM_SIZE{0x1100000}; | 58 | constexpr u64 SHARED_FONT_MEM_SIZE{0x1100000}; |