FS: Stub TWL_PHOTO

CMakeLists.txt

@@ -338,6 +338,7 @@ set(LOADER_SOURCE_FILES src/core/loader/elf.cpp src/core/loader/ncsd.cpp src/cor
 set(FS_SOURCE_FILES src/core/fs/archive_self_ncch.cpp src/core/fs/archive_save_data.cpp src/core/fs/archive_sdmc.cpp
                     src/core/fs/archive_ext_save_data.cpp src/core/fs/archive_ncch.cpp src/core/fs/romfs.cpp
                     src/core/fs/ivfc.cpp src/core/fs/archive_user_save_data.cpp src/core/fs/archive_system_save_data.cpp
+                    src/core/fs/archive_twl_photo.cpp
 )
 
 set(APPLET_SOURCE_FILES src/core/applets/applet.cpp src/core/applets/mii_selector.cpp src/core/applets/software_keyboard.cpp src/core/applets/applet_manager.cpp
@@ -387,7 +388,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp
                  include/PICA/pica_vert_config.hpp include/sdl_sensors.hpp include/PICA/draw_acceleration.hpp include/renderdoc.hpp
                  include/align.hpp include/audio/aac_decoder.hpp include/PICA/pica_simd.hpp include/services/fonts.hpp
                  include/audio/audio_interpolation.hpp include/audio/hle_mixer.hpp include/audio/dsp_simd.hpp
-                 include/services/dsp_firmware_db.hpp include/frontend_settings.hpp
+                 include/services/dsp_firmware_db.hpp include/frontend_settings.hpp include/fs/archive_twl_photo.hpp
 )
 
 cmrc_add_resource_library(

include/fs/archive_base.hpp

@@ -7,6 +7,7 @@
 #include <string>
 #include <type_traits>
 #include <vector>
+
 #include "helpers.hpp"
 #include "memory.hpp"
 #include "result.hpp"
@@ -40,6 +41,8 @@ namespace ArchiveID {
 		UserSaveData1 = 0x567890B2,
 		// 3DBrew: Similar to 0x567890B2 but can only access Accessible Save specified in exheader?
 		UserSaveData2 = 0x567890B4,
+
+		TwlPhoto = 0x567890AC
 	};
 
 	static std::string toString(u32 id) {
@@ -52,10 +55,11 @@ namespace ArchiveID {
 			case SDMC: return "SDMC";
 			case SDMCWriteOnly: return "SDMC (Write-only)";
 			case SavedataAndNcch: return "Savedata & NCCH (archive 0x2345678A)";
+			case TwlPhoto: return "TWL_PHOTO";
 			default: return "Unknown archive";
 		}
 	}
-}
+}  // namespace ArchiveID
 
 struct FSPath {
 	u32 type = PathType::Invalid;
@@ -68,9 +72,7 @@ struct FSPath {
 
 	FSPath(u32 type, const std::vector<u8>& vec) : type(type) {
 		switch (type) {
-            case PathType::Binary:
-                binary = std::move(vec);
-                break;
+			case PathType::Binary: binary = std::move(vec); break;
 
 			case PathType::ASCII:
 				string.resize(vec.size() - 1);                           // -1 because of the null terminator
@@ -82,8 +84,8 @@ struct FSPath {
 				utf16_string.resize(size);
 				std::memcpy(utf16_string.data(), vec.data(), size * sizeof(u16));
 				break;
+			};
 		}
-;        }
 	}
 };
 
@@ -105,12 +107,12 @@ struct FileSession {
 	u32 priority = 0;  // TODO: What does this even do
 	bool isOpen;
 
-    FileSession(ArchiveBase* archive, const FSPath& filePath, const FSPath& archivePath, FILE* fd, bool isOpen = true) :
-        archive(archive), path(filePath), archivePath(archivePath), fd(fd), isOpen(isOpen), priority(0) {}
+	FileSession(ArchiveBase* archive, const FSPath& filePath, const FSPath& archivePath, FILE* fd, bool isOpen = true)
+		: archive(archive), path(filePath), archivePath(archivePath), fd(fd), isOpen(isOpen), priority(0) {}
 
 	// For cloning a file session
-    FileSession(const FileSession& other) : archive(other.archive), path(other.path),
-        archivePath(other.archivePath), fd(other.fd), isOpen(other.isOpen), priority(other.priority) {}
+	FileSession(const FileSession& other)
+		: archive(other.archive), path(other.path), archivePath(other.archivePath), fd(other.fd), isOpen(other.isOpen), priority(other.priority) {}
 };
 
 struct ArchiveSession {
@@ -173,8 +175,8 @@ protected:
 
 	// Returns if a specified 3DS path in UTF16 or ASCII format is safe or not
 	// A 3DS path is considered safe if its first character is '/' which means we're not trying to access anything outside the root of the fs
-    // And if it doesn't contain enough instances of ".." (Indicating "climb up a folder" in filesystems) to let the software climb up the directory tree
-    // And access files outside of the emulator's app data folder
+	// And if it doesn't contain enough instances of ".." (Indicating "climb up a folder" in filesystems) to let the software climb up the directory
+	// tree And access files outside of the emulator's app data folder
 	template <u32 format>
 	bool isPathSafe(const FSPath& path) {
 		static_assert(format == PathType::ASCII || format == PathType::UTF16);
@@ -242,9 +244,7 @@ public:
 		return Err(Result::FS::FileNotFoundAlt);
 	}
 
-    virtual void format(const FSPath& path, const FormatInfo& info) {
-        Helpers::panic("Unimplemented Format for %s archive", name().c_str());
-    }
+	virtual void format(const FSPath& path, const FormatInfo& info) { Helpers::panic("Unimplemented Format for %s archive", name().c_str()); }
 
 	virtual HorizonResult renameFile(const FSPath& oldPath, const FSPath& newPath) {
 		Helpers::panic("Unimplemented RenameFile for %s archive", name().c_str());

include/fs/archive_twl_photo.hpp

@@ -0,0 +1,30 @@
+#pragma once
+#include "archive_base.hpp"
+#include "result/result.hpp"
+
+using Result::HorizonResult;
+
+class TWLPhotoArchive : public ArchiveBase {
+  public:
+	TWLPhotoArchive(Memory& mem) : ArchiveBase(mem) {}
+	std::string name() override { return "TWL_PHOTO"; }
+
+	u64 getFreeBytes() override {
+		Helpers::warn("Unimplemented GetFreeBytes for TWLPhoto archive");
+		return 32_MB;
+	}
+
+	HorizonResult createDirectory(const FSPath& path) override;
+	HorizonResult createFile(const FSPath& path, u64 size) override;
+	HorizonResult deleteFile(const FSPath& path) override;
+
+	Rust::Result<ArchiveBase*, HorizonResult> openArchive(const FSPath& path) override;
+	Rust::Result<DirectorySession, HorizonResult> openDirectory(const FSPath& path) override;
+
+	FileDescriptor openFile(const FSPath& path, const FilePerms& perms) override;
+
+	std::optional<u32> readFile(FileSession* file, u64 offset, u32 size, u32 dataPointer) override {
+		Helpers::panic("Unimplemented ReadFile for TWL_PHOTO archive");
+		return {};
+	};
+};

include/services/fs.hpp

@@ -6,6 +6,7 @@
 #include "fs/archive_sdmc.hpp"
 #include "fs/archive_self_ncch.hpp"
 #include "fs/archive_system_save_data.hpp"
+#include "fs/archive_twl_photo.hpp"
 #include "fs/archive_user_save_data.hpp"
 #include "helpers.hpp"
 #include "kernel_types.hpp"
@@ -39,6 +40,8 @@ class FSService {
 	ExtSaveDataArchive sharedExtSaveData_nand;
 	SystemSaveDataArchive systemSaveData;
 
+	TWLPhotoArchive twlPhoto;
+
 	ArchiveBase* getArchiveFromID(u32 id, const FSPath& archivePath);
 	Rust::Result<Handle, HorizonResult> openArchiveHandle(u32 archiveID, const FSPath& path);
 	Rust::Result<Handle, HorizonResult> openDirectoryHandle(ArchiveBase* archive, const FSPath& path);
@@ -87,7 +90,7 @@ class FSService {
 	FSService(Memory& mem, Kernel& kernel, const EmulatorConfig& config)
 		: mem(mem), saveData(mem), sharedExtSaveData_nand(mem, "../SharedFiles/NAND", true), extSaveData_sdmc(mem, "SDMC"), sdmc(mem),
 		  sdmcWriteOnly(mem, true), selfNcch(mem), ncch(mem), userSaveData1(mem, ArchiveID::UserSaveData1),
-		  userSaveData2(mem, ArchiveID::UserSaveData2), kernel(kernel), config(config), systemSaveData(mem) {}
+		  userSaveData2(mem, ArchiveID::UserSaveData2), systemSaveData(mem), twlPhoto(mem), kernel(kernel), config(config) {}
 
 	void reset();
 	void handleSyncRequest(u32 messagePointer);

src/core/fs/archive_system_save_data.cpp

@@ -87,7 +87,7 @@ HorizonResult SystemSaveDataArchive::createFile(const FSPath& path, u64 size) {
 HorizonResult SystemSaveDataArchive::createDirectory(const FSPath& path) {
 	if (path.type == PathType::UTF16) {
 		if (!isPathSafe<PathType::UTF16>(path)) {
-			Helpers::panic("Unsafe path in SystemSaveData::OpenFile");
+			Helpers::panic("Unsafe path in SystemSaveData::CreateDirectory");
 		}
 
 		fs::path p = IOFile::getAppData() / ".." / "SharedFiles" / "SystemSaveData";

src/core/fs/archive_twl_photo.cpp

@@ -0,0 +1,40 @@
+#include <algorithm>
+#include <memory>
+
+#include "fs/archive_twl_photo.hpp"
+
+namespace fs = std::filesystem;
+
+HorizonResult TWLPhotoArchive::createFile(const FSPath& path, u64 size) {
+	Helpers::panic("[TWL_PHOTO] CreateFile not yet supported");
+	return Result::Success;
+}
+
+HorizonResult TWLPhotoArchive::deleteFile(const FSPath& path) {
+	Helpers::panic("[TWL_PHOTO] Unimplemented DeleteFile");
+	return Result::Success;
+}
+
+HorizonResult TWLPhotoArchive::createDirectory(const FSPath& path) {
+	Helpers::panic("[TWL_PHOTO] CreateDirectory not yet supported");
+	return Result::Success;
+}
+
+FileDescriptor TWLPhotoArchive::openFile(const FSPath& path, const FilePerms& perms) {
+	Helpers::panic("[TWL_PHOTO] OpenFile not yet supported");
+	return FileError;
+}
+
+Rust::Result<ArchiveBase*, HorizonResult> TWLPhotoArchive::openArchive(const FSPath& path) {
+	if (path.type != PathType::Empty) {
+		Helpers::panic("Unimplemented path type for TWLPhotoArchive::OpenArchive");
+	}
+
+	Helpers::warn("Unimplemented: TWL_PHOTO archive");
+	return Err(Result::FailurePlaceholder);
+}
+
+Rust::Result<DirectorySession, HorizonResult> TWLPhotoArchive::openDirectory(const FSPath& path) {
+	Helpers::panic("[TWL_PHOTO] OpenDirectory not yet supported");
+	return Err(Result::FailurePlaceholder);
+}

src/core/services/fs.cpp

@@ -99,6 +99,9 @@ ArchiveBase* FSService::getArchiveFromID(u32 id, const FSPath& archivePath) {
 		case ArchiveID::SDMC: return &sdmc;
 		case ArchiveID::SDMCWriteOnly: return &sdmcWriteOnly;
 		case ArchiveID::SavedataAndNcch: return &ncch; // This can only access NCCH outside of FSPXI
+
+		case ArchiveID::TwlPhoto: return &twlPhoto;
+
 		default:
 			Helpers::panic("Unknown archive. ID: %d\n", id);
 			return nullptr;