VERY experimental Nintendo Switch 2 emulator
C++
fs: stub cache storage and fix params alignment
Liam6bee9352b7ee
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cppindex 9e559d97ec..3a142f5d08 100644--- a/src/core/hle/service/filesystem/fsp_srv.cpp+++ b/src/core/hle/service/filesystem/fsp_srv.cpp@@ -24,8 +24,10 @@#include "core/file_sys/savedata_factory.h"#include "core/file_sys/system_archive/system_archive.h"#include "core/file_sys/vfs.h"+#include "core/hle/result.h"#include "core/hle/service/filesystem/filesystem.h"#include "core/hle/service/filesystem/fsp_srv.h"+#include "core/hle/service/hle_ipc.h"#include "core/hle/service/ipc_helpers.h"#include "core/reporter.h"@@ -308,8 +310,8 @@ private:class IFileSystem final : public ServiceFramework<IFileSystem> {public:explicit IFileSystem(Core::System& system_, FileSys::VirtualDir backend_, SizeGetter size_)- : ServiceFramework{system_, "IFileSystem"}, backend{std::move(backend_)}, size{std::move(- size_)} {+ : ServiceFramework{system_, "IFileSystem"}, backend{std::move(backend_)},+ size{std::move(size_)} {static const FunctionInfo functions[] = {{0, &IFileSystem::CreateFile, "CreateFile"},{1, &IFileSystem::DeleteFile, "DeleteFile"},@@ -552,9 +554,9 @@ public:// Write the data to memoryctx.WriteBuffer(begin, range_size);- IPC::ResponseBuilder rb{ctx, 3};+ IPC::ResponseBuilder rb{ctx, 4};rb.Push(ResultSuccess);- rb.Push<u32>(static_cast<u32>(actual_entries));+ rb.Push<u64>(actual_entries);}private:@@ -712,7 +714,7 @@ FSP_SRV::FSP_SRV(Core::System& system_){59, nullptr, "WriteSaveDataFileSystemExtraData"},{60, nullptr, "OpenSaveDataInfoReader"},{61, &FSP_SRV::OpenSaveDataInfoReaderBySaveDataSpaceId, "OpenSaveDataInfoReaderBySaveDataSpaceId"},- {62, nullptr, "OpenCacheStorageList"},+ {62, &FSP_SRV::OpenSaveDataInfoReaderOnlyCacheStorage, "OpenSaveDataInfoReaderOnlyCacheStorage"},{64, nullptr, "OpenSaveDataInternalStorageFileSystem"},{65, nullptr, "UpdateSaveDataMacForDebug"},{66, nullptr, "WriteSaveDataFileSystemExtraData2"},@@ -921,6 +923,15 @@ void FSP_SRV::OpenSaveDataInfoReaderBySaveDataSpaceId(HLERequestContext& ctx) {std::make_shared<ISaveDataInfoReader>(system, space, fsc));}+void FSP_SRV::OpenSaveDataInfoReaderOnlyCacheStorage(HLERequestContext& ctx) {+ LOG_WARNING(Service_FS, "(STUBBED) called");++ IPC::ResponseBuilder rb{ctx, 2, 0, 1};+ rb.Push(ResultSuccess);+ rb.PushIpcInterface<ISaveDataInfoReader>(system, FileSys::SaveDataSpaceId::TemporaryStorage,+ fsc);+}+void FSP_SRV::WriteSaveDataFileSystemExtraDataBySaveDataAttribute(HLERequestContext& ctx) {LOG_WARNING(Service_FS, "(STUBBED) called.");diff --git a/src/core/hle/service/filesystem/fsp_srv.h b/src/core/hle/service/filesystem/fsp_srv.hindex 49f17c7c33..4f3c2f6de0 100644--- a/src/core/hle/service/filesystem/fsp_srv.h+++ b/src/core/hle/service/filesystem/fsp_srv.h@@ -42,6 +42,7 @@ private:void OpenSaveDataFileSystem(HLERequestContext& ctx);void OpenReadOnlySaveDataFileSystem(HLERequestContext& ctx);void OpenSaveDataInfoReaderBySaveDataSpaceId(HLERequestContext& ctx);+ void OpenSaveDataInfoReaderOnlyCacheStorage(HLERequestContext& ctx);void WriteSaveDataFileSystemExtraDataBySaveDataAttribute(HLERequestContext& ctx);void ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(HLERequestContext& ctx);void OpenDataStorageByCurrentProcess(HLERequestContext& ctx);