mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-05-24 19:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

libstrat: make build with new ncm/fs api changes (sysmodules probably fail to build)

Browse source
This commit is contained in:
Michael Scire 2023-02-21 22:51:05 -07:00 • committed by SciresM
parent bb6446aada
commit 0ea5dbcfbb
39 changed files with 389 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libraries/libstratosphere/source/fs/fs_content.cpp
View file

@ -32,7 +32,7 @@ namespace ams::fs {
}
}
Result MountContentImpl(const char *name, const char *path, u64 id, ContentType type) {
Result MountContentImpl(const char *name, const char *path, fs::ContentAttributes attr, u64 id, ContentType type) {
/* Validate the mount name. */
R_TRY(impl::CheckMountNameAllowingReserved(name));
@ -46,7 +46,7 @@ namespace ams::fs {
/* Open the filesystem. */
auto fsp = impl::GetFileSystemProxyServiceObject();
sf::SharedPointer<fssrv::sf::IFileSystem> fs;
R_TRY(fsp->OpenFileSystemWithId(std::addressof(fs), sf_path, id, ConvertToFileSystemProxyType(type)));
R_TRY(fsp->OpenFileSystemWithId(std::addressof(fs), sf_path, attr, id, ConvertToFileSystemProxyType(type)));
/* Allocate a new filesystem wrapper. */
auto fsa = std::make_unique<impl::FileSystemServiceObjectAdapter>(std::move(fs));
@ -58,12 +58,12 @@ namespace ams::fs {
}
Result MountContent(const char *name, const char *path, ContentType content_type) {
Result MountContent(const char *name, const char *path, fs::ContentAttributes attr, ContentType content_type) {
auto mount_impl = [=]() -> Result {
/* This API only supports mounting Meta content. */
R_UNLESS(content_type == ContentType_Meta, fs::ResultInvalidArgument());
R_RETURN(MountContentImpl(name, path, ncm::InvalidProgramId.value, content_type));
R_RETURN(MountContentImpl(name, path, attr, ncm::InvalidProgramId.value, content_type));
};
/* Perform the mount. */
@ -75,9 +75,9 @@ namespace ams::fs {
R_SUCCEED();
}
Result MountContent(const char *name, const char *path, ncm::ProgramId id, ContentType content_type) {
Result MountContent(const char *name, const char *path, fs::ContentAttributes attr, ncm::ProgramId id, ContentType content_type) {
auto mount_impl = [=]() -> Result {
R_RETURN(MountContentImpl(name, path, id.value, content_type));
R_RETURN(MountContentImpl(name, path, attr, id.value, content_type));
};
/* Perform the mount. */
@ -89,9 +89,9 @@ namespace ams::fs {
R_SUCCEED();
}
Result MountContent(const char *name, const char *path, ncm::DataId id, ContentType content_type) {
Result MountContent(const char *name, const char *path, fs::ContentAttributes attr, ncm::DataId id, ContentType content_type) {
auto mount_impl = [=]() -> Result {
R_RETURN(MountContentImpl(name, path, id.value, content_type));
R_RETURN(MountContentImpl(name, path, attr, id.value, content_type));
};
/* Perform the mount. */