diff options
| author | 2017-02-13 09:18:23 -0800 | |
|---|---|---|
| committer | 2017-02-13 09:18:23 -0800 | |
| commit | d60767d393b0fd163d2676f649e3c209537ef884 (patch) | |
| tree | fc8db322e44cb699e17081e7ed6d4f484eb4f75e /src/core/hle | |
| parent | video_core/shader: Document sanitized MUL operation (diff) | |
| parent | loader: use self NCCH archive (diff) | |
| download | yuzu-d60767d393b0fd163d2676f649e3c209537ef884.tar.gz yuzu-d60767d393b0fd163d2676f649e3c209537ef884.tar.xz yuzu-d60767d393b0fd163d2676f649e3c209537ef884.zip | |
Merge pull request #2561 from wwylele/fs-rom
file_sys: change RomFS archive to Self NCCH archive
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/result.h | 4 | ||||
| -rw-r--r-- | src/core/hle/service/fs/archive.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/core/hle/result.h b/src/core/hle/result.h index 53864a3a7..cfefbbc64 100644 --- a/src/core/hle/result.h +++ b/src/core/hle/result.h | |||
| @@ -20,6 +20,7 @@ enum class ErrorDescription : u32 { | |||
| 20 | OS_InvalidBufferDescriptor = 48, | 20 | OS_InvalidBufferDescriptor = 48, |
| 21 | MaxConnectionsReached = 52, | 21 | MaxConnectionsReached = 52, |
| 22 | WrongAddress = 53, | 22 | WrongAddress = 53, |
| 23 | FS_RomFSNotFound = 100, | ||
| 23 | FS_ArchiveNotMounted = 101, | 24 | FS_ArchiveNotMounted = 101, |
| 24 | FS_FileNotFound = 112, | 25 | FS_FileNotFound = 112, |
| 25 | FS_PathNotFound = 113, | 26 | FS_PathNotFound = 113, |
| @@ -35,10 +36,13 @@ enum class ErrorDescription : u32 { | |||
| 35 | OutofRangeOrMisalignedAddress = | 36 | OutofRangeOrMisalignedAddress = |
| 36 | 513, // TODO(purpasmart): Check if this name fits its actual usage | 37 | 513, // TODO(purpasmart): Check if this name fits its actual usage |
| 37 | GPU_FirstInitialization = 519, | 38 | GPU_FirstInitialization = 519, |
| 39 | FS_ExeFSSectionNotFound = 567, | ||
| 40 | FS_CommandNotAllowed = 630, | ||
| 38 | FS_InvalidReadFlag = 700, | 41 | FS_InvalidReadFlag = 700, |
| 39 | FS_InvalidPath = 702, | 42 | FS_InvalidPath = 702, |
| 40 | FS_WriteBeyondEnd = 705, | 43 | FS_WriteBeyondEnd = 705, |
| 41 | FS_UnsupportedOpenFlags = 760, | 44 | FS_UnsupportedOpenFlags = 760, |
| 45 | FS_IncorrectExeFSReadSize = 761, | ||
| 42 | FS_UnexpectedFileOrDirectory = 770, | 46 | FS_UnexpectedFileOrDirectory = 770, |
| 43 | InvalidSection = 1000, | 47 | InvalidSection = 1000, |
| 44 | TooLarge = 1001, | 48 | TooLarge = 1001, |
diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h index 519c1f3a9..2ea956e0b 100644 --- a/src/core/hle/service/fs/archive.h +++ b/src/core/hle/service/fs/archive.h | |||
| @@ -26,7 +26,7 @@ namespace FS { | |||
| 26 | 26 | ||
| 27 | /// Supported archive types | 27 | /// Supported archive types |
| 28 | enum class ArchiveIdCode : u32 { | 28 | enum class ArchiveIdCode : u32 { |
| 29 | RomFS = 0x00000003, | 29 | SelfNCCH = 0x00000003, |
| 30 | SaveData = 0x00000004, | 30 | SaveData = 0x00000004, |
| 31 | ExtSaveData = 0x00000006, | 31 | ExtSaveData = 0x00000006, |
| 32 | SharedExtSaveData = 0x00000007, | 32 | SharedExtSaveData = 0x00000007, |