diff options
| author | 2024-02-17 23:18:00 -0500 | |
|---|---|---|
| committer | 2024-02-17 23:18:00 -0500 | |
| commit | bdf8aca7509534f817644ce05e95d5f5c1f53941 (patch) | |
| tree | e2ebd062a528b0ace705130763569851632accf9 /src/frontend_common | |
| parent | Merge pull request #13054 from t895/lifecycle-utils (diff) | |
| parent | Add check for corrupted firmware files after install. (diff) | |
| download | yuzu-bdf8aca7509534f817644ce05e95d5f5c1f53941.tar.gz yuzu-bdf8aca7509534f817644ce05e95d5f5c1f53941.tar.xz yuzu-bdf8aca7509534f817644ce05e95d5f5c1f53941.zip | |
Merge pull request #13047 from anpilley/import-firmware
Import firmware from folder of loose NCA files
Diffstat (limited to 'src/frontend_common')
| -rw-r--r-- | src/frontend_common/content_manager.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/frontend_common/content_manager.h b/src/frontend_common/content_manager.h index f3efe3465..c4e97a47b 100644 --- a/src/frontend_common/content_manager.h +++ b/src/frontend_common/content_manager.h | |||
| @@ -251,11 +251,12 @@ inline InstallResult InstallNCA(FileSys::VfsFilesystem& vfs, const std::string& | |||
| 251 | * \param callback Callback to report the progress of the installation. The first size_t | 251 | * \param callback Callback to report the progress of the installation. The first size_t |
| 252 | * parameter is the total size of the installed contents and the second is the current progress. If | 252 | * parameter is the total size of the installed contents and the second is the current progress. If |
| 253 | * you return true to the callback, it will cancel the installation as soon as possible. | 253 | * you return true to the callback, it will cancel the installation as soon as possible. |
| 254 | * \param firmware_only Set to true to only scan system nand NCAs (firmware), post firmware install. | ||
| 254 | * \return A list of entries that failed to install. Returns an empty vector if successful. | 255 | * \return A list of entries that failed to install. Returns an empty vector if successful. |
| 255 | */ | 256 | */ |
| 256 | inline std::vector<std::string> VerifyInstalledContents( | 257 | inline std::vector<std::string> VerifyInstalledContents( |
| 257 | Core::System& system, FileSys::ManualContentProvider& provider, | 258 | Core::System& system, FileSys::ManualContentProvider& provider, |
| 258 | const std::function<bool(size_t, size_t)>& callback) { | 259 | const std::function<bool(size_t, size_t)>& callback, bool firmware_only = false) { |
| 259 | // Get content registries. | 260 | // Get content registries. |
| 260 | auto bis_contents = system.GetFileSystemController().GetSystemNANDContents(); | 261 | auto bis_contents = system.GetFileSystemController().GetSystemNANDContents(); |
| 261 | auto user_contents = system.GetFileSystemController().GetUserNANDContents(); | 262 | auto user_contents = system.GetFileSystemController().GetUserNANDContents(); |
| @@ -264,7 +265,7 @@ inline std::vector<std::string> VerifyInstalledContents( | |||
| 264 | if (bis_contents) { | 265 | if (bis_contents) { |
| 265 | content_providers.push_back(bis_contents); | 266 | content_providers.push_back(bis_contents); |
| 266 | } | 267 | } |
| 267 | if (user_contents) { | 268 | if (user_contents && !firmware_only) { |
| 268 | content_providers.push_back(user_contents); | 269 | content_providers.push_back(user_contents); |
| 269 | } | 270 | } |
| 270 | 271 | ||