mirror of
				https://git.zaroz.cloud/nintendo-back-up/yuzu/yuzu.git
				synced 2025-05-12 00:45:25 +00:00 
			
		
		
		
	Service.FS: Rename FileSys::Archive to ArchiveBackend
This commit is contained in:
		
							parent
							
								
									f6153679b0
								
							
						
					
					
						commit
						82fe821e87
					
				| @ -93,7 +93,7 @@ set(HEADERS | |||||||
|             arm/skyeye_common/vfp/vfp.h |             arm/skyeye_common/vfp/vfp.h | ||||||
|             arm/skyeye_common/vfp/vfp_helper.h |             arm/skyeye_common/vfp/vfp_helper.h | ||||||
|             arm/arm_interface.h |             arm/arm_interface.h | ||||||
|             file_sys/archive.h |             file_sys/archive_backend.h | ||||||
|             file_sys/archive_romfs.h |             file_sys/archive_romfs.h | ||||||
|             file_sys/archive_sdmc.h |             file_sys/archive_sdmc.h | ||||||
|             file_sys/file.h |             file_sys/file.h | ||||||
|  | |||||||
| @ -160,9 +160,9 @@ private: | |||||||
|     std::u16string u16str; |     std::u16string u16str; | ||||||
| }; | }; | ||||||
| 
 | 
 | ||||||
| class Archive : NonCopyable { | class ArchiveBackend : NonCopyable { | ||||||
| public: | public: | ||||||
|     virtual ~Archive() { } |     virtual ~ArchiveBackend() { } | ||||||
| 
 | 
 | ||||||
|     /**
 |     /**
 | ||||||
|      * Get a descriptive name for the archive (e.g. "RomFS", "SaveData", etc.) |      * Get a descriptive name for the archive (e.g. "RomFS", "SaveData", etc.) | ||||||
| @ -8,7 +8,7 @@ | |||||||
| 
 | 
 | ||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
| 
 | 
 | ||||||
| #include "core/file_sys/archive.h" | #include "core/file_sys/archive_backend.h" | ||||||
| #include "core/loader/loader.h" | #include "core/loader/loader.h" | ||||||
| 
 | 
 | ||||||
| ////////////////////////////////////////////////////////////////////////////////////////////////////
 | ////////////////////////////////////////////////////////////////////////////////////////////////////
 | ||||||
| @ -17,7 +17,7 @@ | |||||||
| namespace FileSys { | namespace FileSys { | ||||||
| 
 | 
 | ||||||
| /// File system interface to the RomFS archive
 | /// File system interface to the RomFS archive
 | ||||||
| class Archive_RomFS final : public Archive { | class Archive_RomFS final : public ArchiveBackend { | ||||||
| public: | public: | ||||||
|     Archive_RomFS(const Loader::AppLoader& app_loader); |     Archive_RomFS(const Loader::AppLoader& app_loader); | ||||||
|     ~Archive_RomFS() override; |     ~Archive_RomFS() override; | ||||||
|  | |||||||
| @ -6,7 +6,7 @@ | |||||||
| 
 | 
 | ||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
| 
 | 
 | ||||||
| #include "core/file_sys/archive.h" | #include "core/file_sys/archive_backend.h" | ||||||
| #include "core/loader/loader.h" | #include "core/loader/loader.h" | ||||||
| 
 | 
 | ||||||
| ////////////////////////////////////////////////////////////////////////////////////////////////////
 | ////////////////////////////////////////////////////////////////////////////////////////////////////
 | ||||||
| @ -15,7 +15,7 @@ | |||||||
| namespace FileSys { | namespace FileSys { | ||||||
| 
 | 
 | ||||||
| /// File system interface to the SDMC archive
 | /// File system interface to the SDMC archive
 | ||||||
| class Archive_SDMC final : public Archive { | class Archive_SDMC final : public ArchiveBackend { | ||||||
| public: | public: | ||||||
|     Archive_SDMC(const std::string& mount_point); |     Archive_SDMC(const std::string& mount_point); | ||||||
|     ~Archive_SDMC() override; |     ~Archive_SDMC() override; | ||||||
|  | |||||||
| @ -8,7 +8,7 @@ | |||||||
| #include "common/file_util.h" | #include "common/file_util.h" | ||||||
| #include "common/math_util.h" | #include "common/math_util.h" | ||||||
| 
 | 
 | ||||||
| #include "core/file_sys/archive.h" | #include "core/file_sys/archive_backend.h" | ||||||
| #include "core/file_sys/archive_sdmc.h" | #include "core/file_sys/archive_sdmc.h" | ||||||
| #include "core/file_sys/directory.h" | #include "core/file_sys/directory.h" | ||||||
| #include "core/hle/service/fs/archive.h" | #include "core/hle/service/fs/archive.h" | ||||||
| @ -46,7 +46,7 @@ public: | |||||||
|     std::string GetName() const override { return "Archive: " + backend->GetName(); } |     std::string GetName() const override { return "Archive: " + backend->GetName(); } | ||||||
| 
 | 
 | ||||||
|     ArchiveIdCode id_code;      ///< Id code of the archive
 |     ArchiveIdCode id_code;      ///< Id code of the archive
 | ||||||
|     FileSys::Archive* backend;  ///< Archive backend interface
 |     FileSys::ArchiveBackend* backend;  ///< Archive backend interface
 | ||||||
| 
 | 
 | ||||||
|     ResultVal<bool> SyncRequest() override { |     ResultVal<bool> SyncRequest() override { | ||||||
|         u32* cmd_buff = Kernel::GetCommandBuffer(); |         u32* cmd_buff = Kernel::GetCommandBuffer(); | ||||||
| @ -267,7 +267,7 @@ ResultCode MountArchive(Archive* archive) { | |||||||
|     return RESULT_SUCCESS; |     return RESULT_SUCCESS; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| ResultCode CreateArchive(FileSys::Archive* backend, ArchiveIdCode id_code) { | ResultCode CreateArchive(FileSys::ArchiveBackend* backend, ArchiveIdCode id_code) { | ||||||
|     Archive* archive = new Archive; |     Archive* archive = new Archive; | ||||||
|     Handle handle = Kernel::g_object_pool.Create(archive); |     Handle handle = Kernel::g_object_pool.Create(archive); | ||||||
|     archive->id_code = id_code; |     archive->id_code = id_code; | ||||||
|  | |||||||
| @ -6,7 +6,7 @@ | |||||||
| 
 | 
 | ||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
| 
 | 
 | ||||||
| #include "core/file_sys/archive.h" | #include "core/file_sys/archive_backend.h" | ||||||
| #include "core/hle/kernel/kernel.h" | #include "core/hle/kernel/kernel.h" | ||||||
| #include "core/hle/result.h" | #include "core/hle/result.h" | ||||||
| 
 | 
 | ||||||
| @ -42,7 +42,7 @@ ResultCode CloseArchive(ArchiveIdCode id_code); | |||||||
|  * @param backend File system backend interface to the archive |  * @param backend File system backend interface to the archive | ||||||
|  * @param id_code Id code used to access this type of archive |  * @param id_code Id code used to access this type of archive | ||||||
|  */ |  */ | ||||||
| ResultCode CreateArchive(FileSys::Archive* backend, ArchiveIdCode id_code); | ResultCode CreateArchive(FileSys::ArchiveBackend* backend, ArchiveIdCode id_code); | ||||||
| 
 | 
 | ||||||
| /**
 | /**
 | ||||||
|  * Open a File from an Archive |  * Open a File from an Archive | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Yuri Kunde Schlesner
						Yuri Kunde Schlesner