FS: Stub TWL_SOUND

CMakeLists.txt

@@ -338,7 +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
+                    src/core/fs/archive_twl_photo.cpp src/core/fs/archive_twl_sound.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
@@ -389,6 +389,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.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/fs/archive_twl_photo.hpp
+                 include/fs/archive_twl_sound.hpp
 )
 
 cmrc_add_resource_library(

include/fs/archive_base.hpp

@@ -42,7 +42,8 @@ namespace ArchiveID {
 		// 3DBrew: Similar to 0x567890B2 but can only access Accessible Save specified in exheader?
 		UserSaveData2 = 0x567890B4,
 
-		TwlPhoto = 0x567890AC
+		TwlPhoto = 0x567890AC,
+		TwlSound = 0x567890AD,
 	};
 
 	static std::string toString(u32 id) {
@@ -56,6 +57,7 @@ namespace ArchiveID {
 			case SDMCWriteOnly: return "SDMC (Write-only)";
 			case SavedataAndNcch: return "Savedata & NCCH (archive 0x2345678A)";
 			case TwlPhoto: return "TWL_PHOTO";
+			case TwlSound: return "TWL_SOUND";
 			default: return "Unknown archive";
 		}
 	}

include/fs/archive_twl_sound.hpp

@@ -0,0 +1,30 @@
+#pragma once
+#include "archive_base.hpp"
+#include "result/result.hpp"
+
+using Result::HorizonResult;
+
+class TWLSoundArchive : public ArchiveBase {
+  public:
+	TWLSoundArchive(Memory& mem) : ArchiveBase(mem) {}
+	std::string name() override { return "TWL_SOUND"; }
+
+	u64 getFreeBytes() override {
+		Helpers::warn("Unimplemented GetFreeBytes for TWLSound 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_SOUND archive");
+		return {};
+	};
+};

include/services/fs.hpp

@@ -7,6 +7,7 @@
 #include "fs/archive_self_ncch.hpp"
 #include "fs/archive_system_save_data.hpp"
 #include "fs/archive_twl_photo.hpp"
+#include "fs/archive_twl_sound.hpp"
 #include "fs/archive_user_save_data.hpp"
 #include "helpers.hpp"
 #include "kernel_types.hpp"
@@ -41,6 +42,7 @@ class FSService {
 	SystemSaveDataArchive systemSaveData;
 
 	TWLPhotoArchive twlPhoto;
+	TWLSoundArchive twlSound;
 
 	ArchiveBase* getArchiveFromID(u32 id, const FSPath& archivePath);
 	Rust::Result<Handle, HorizonResult> openArchiveHandle(u32 archiveID, const FSPath& path);
@@ -90,7 +92,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), systemSaveData(mem), twlPhoto(mem), kernel(kernel), config(config) {}
+		  userSaveData2(mem, ArchiveID::UserSaveData2), systemSaveData(mem), twlPhoto(mem), twlSound(mem), kernel(kernel), config(config) {}
 
 	void reset();
 	void handleSyncRequest(u32 messagePointer);

src/core/fs/archive_twl_sound.cpp

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

src/core/services/fs.cpp

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