mika/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-07-14 21:12:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

ncm: minor fixes

Browse Source
This commit is contained in:
Michael Scire 2020-03-04 19:35:51 -08:00
parent f4af4f8be0
commit e96c84f1f0
9 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_cache.hpp
View File

@ -236,7 +236,7 @@ namespace ams::kvdb {
static Result CreateNewCache(const char *dir) { static Result CreateNewCache(const char *dir) {
/* Make a new key value store filesystem, and a new lru_list.dat. */ /* Make a new key value store filesystem, and a new lru_list.dat. */
R_TRY(LeastRecentlyUsedList::CreateNewList(GetLeastRecentlyUsedListPath(dir))); R_TRY(LeastRecentlyUsedList::CreateNewList(GetLeastRecentlyUsedListPath(dir)));
R_UNLESS(mkdir(GetFileKeyValueStorePath(dir), 0) == 0, fsdevGetLastResult()); R_TRY(fs::CreateDirectory(dir));
return ResultSuccess(); return ResultSuccess();
} }

2
libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta.hpp
View File

@ -23,7 +23,7 @@ namespace ams::ncm {
u16 extended_header_size; u16 extended_header_size;
u16 content_count; u16 content_count;
u16 content_meta_count; u16 content_meta_count;
ContentMetaAttribute attributes; u8 attributes;
StorageId storage_id; StorageId storage_id;
}; };

4
libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta_database.hpp
View File

@ -103,7 +103,7 @@ namespace ams::ncm {
return lc; return lc;
} }
ListCount ListContentMeta(ContentMetaKey *dst, size_t dst_size, ContentMetaType type, ProgramId app_id, ProgramId min, ProgramId max, ContentInstallType install_type) { ListCount ListContentMeta(ContentMetaKey *dst, size_t dst_size, ContentMetaType type, ProgramId app_id = InvalidProgramId, ProgramId min = {std::numeric_limits<u64>::min()}, ProgramId max = {std::numeric_limits<u64>::max()}, ContentInstallType install_type = ContentInstallType::Full) {
ListCount lc = {}; ListCount lc = {};
R_ABORT_UNLESS(this->interface->List(std::addressof(lc.total), std::addressof(lc.written), sf::OutArray<ContentMetaKey>(dst, dst_size), type, app_id, min, max, install_type)); R_ABORT_UNLESS(this->interface->List(std::addressof(lc.total), std::addressof(lc.written), sf::OutArray<ContentMetaKey>(dst, dst_size), type, app_id, min, max, install_type));
return lc; return lc;
@ -173,7 +173,7 @@ namespace ams::ncm {
return this->interface->Commit(); return this->interface->Commit();
} }
Result GetAttributes(ContentMetaAttribute *out_attributes, const ContentMetaKey &key) { Result GetAttributes(u8 *out_attributes, const ContentMetaKey &key) {
AMS_ASSERT(this->interface != nullptr); AMS_ASSERT(this->interface != nullptr);
return this->interface->GetAttributes(out_attributes, key); return this->interface->GetAttributes(out_attributes, key);
} }

2
libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_meta_database.hpp
View File

@ -66,7 +66,7 @@ namespace ams::ncm {
virtual Result Commit() = 0; virtual Result Commit() = 0;
virtual Result HasContent(sf::Out<bool> out, const ContentMetaKey &key, const ContentId &content_id) = 0; virtual Result HasContent(sf::Out<bool> out, const ContentMetaKey &key, const ContentId &content_id) = 0;
virtual Result ListContentMetaInfo(sf::Out<u32> out_entries_written, const sf::OutArray<ContentMetaInfo> &out_meta_info, const ContentMetaKey &key, u32 start_index) = 0; virtual Result ListContentMetaInfo(sf::Out<u32> out_entries_written, const sf::OutArray<ContentMetaInfo> &out_meta_info, const ContentMetaKey &key, u32 start_index) = 0;
virtual Result GetAttributes(sf::Out<ContentMetaAttribute> out_attributes, const ContentMetaKey &key) = 0; virtual Result GetAttributes(sf::Out<u8> out_attributes, const ContentMetaKey &key) = 0;
virtual Result GetRequiredApplicationVersion(sf::Out<u32> out_version, const ContentMetaKey &key) = 0; virtual Result GetRequiredApplicationVersion(sf::Out<u32> out_version, const ContentMetaKey &key) = 0;
virtual Result GetContentIdByTypeAndIdOffset(sf::Out<ContentId> out_content_id, const ContentMetaKey &key, ContentType type, u8 id_offset) = 0; virtual Result GetContentIdByTypeAndIdOffset(sf::Out<ContentId> out_content_id, const ContentMetaKey &key, ContentType type, u8 id_offset) = 0;
public: public:

8
libraries/libstratosphere/include/stratosphere/ncm/ncm_types.hpp
View File

@ -43,10 +43,10 @@ namespace ams::ncm {
DeltaFragment = 6, DeltaFragment = 6,
}; };
enum class ContentMetaAttribute : u8 { enum ContentMetaAttribute : u8 {
None = 0, ContentMetaAttribute_None = (0 << 0),
IncludesExFatDriver = 1, ContentMetaAttribute_IncludesExFatDriver = (1 << 0),
Rebootless = 2, ContentMetaAttribute_Rebootless = (1 << 1),
}; };
enum class ContentInstallType : u8 { enum class ContentInstallType : u8 {

1
libraries/libstratosphere/source/boot2/boot2_api.cpp
View File

@ -13,7 +13,6 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <dirent.h>
#include <stratosphere.hpp> #include <stratosphere.hpp>
namespace ams::boot2 { namespace ams::boot2 {

4
libraries/libstratosphere/source/ncm/ncm_remote_content_meta_database_impl.hpp
View File

@ -144,9 +144,9 @@ namespace ams::ncm {
return ncmContentMetaDatabaseListContentMetaInfo(std::addressof(this->srv), reinterpret_cast<s32 *>(out_entries_written.GetPointer()), out_meta_info.GetPointer(), out_meta_info.GetSize(), Convert(key), start_index); return ncmContentMetaDatabaseListContentMetaInfo(std::addressof(this->srv), reinterpret_cast<s32 *>(out_entries_written.GetPointer()), out_meta_info.GetPointer(), out_meta_info.GetSize(), Convert(key), start_index);
} }
virtual Result GetAttributes(sf::Out<ContentMetaAttribute> out_attributes, const ContentMetaKey &key) override { virtual Result GetAttributes(sf::Out<u8> out_attributes, const ContentMetaKey &key) override {
static_assert(sizeof(ContentMetaAttribute) == sizeof(u8)); static_assert(sizeof(ContentMetaAttribute) == sizeof(u8));
return ncmContentMetaDatabaseGetAttributes(std::addressof(this->srv), Convert(key), reinterpret_cast<u8 *>(out_attributes.GetPointer())); return ncmContentMetaDatabaseGetAttributes(std::addressof(this->srv), Convert(key), out_attributes.GetPointer());
} }
virtual Result GetRequiredApplicationVersion(sf::Out<u32> out_version, const ContentMetaKey &key) override { virtual Result GetRequiredApplicationVersion(sf::Out<u32> out_version, const ContentMetaKey &key) override {

2
stratosphere/ncm/source/ncm_content_meta_database_impl.cpp
View File

@ -333,7 +333,7 @@ namespace ams::ncm {
return ResultSuccess(); return ResultSuccess();
} }
Result ContentMetaDatabaseImpl::GetAttributes(sf::Out<ContentMetaAttribute> out_attributes, const ContentMetaKey &key) { Result ContentMetaDatabaseImpl::GetAttributes(sf::Out<u8> out_attributes, const ContentMetaKey &key) {
R_TRY(this->EnsureEnabled()); R_TRY(this->EnsureEnabled());
const void *meta; const void *meta;

2
stratosphere/ncm/source/ncm_content_meta_database_impl.hpp
View File

@ -47,7 +47,7 @@ namespace ams::ncm {
virtual Result Commit() override; virtual Result Commit() override;
virtual Result HasContent(sf::Out<bool> out, const ContentMetaKey &key, const ContentId &content_id) override; virtual Result HasContent(sf::Out<bool> out, const ContentMetaKey &key, const ContentId &content_id) override;
virtual Result ListContentMetaInfo(sf::Out<u32> out_entries_written, const sf::OutArray<ContentMetaInfo> &out_meta_info, const ContentMetaKey &key, u32 start_index) override; virtual Result ListContentMetaInfo(sf::Out<u32> out_entries_written, const sf::OutArray<ContentMetaInfo> &out_meta_info, const ContentMetaKey &key, u32 start_index) override;
virtual Result GetAttributes(sf::Out<ContentMetaAttribute> out_attributes, const ContentMetaKey &key) override; virtual Result GetAttributes(sf::Out<u8> out_attributes, const ContentMetaKey &key) override;
virtual Result GetRequiredApplicationVersion(sf::Out<u32> out_version, const ContentMetaKey &key) override; virtual Result GetRequiredApplicationVersion(sf::Out<u32> out_version, const ContentMetaKey &key) override;
virtual Result GetContentIdByTypeAndIdOffset(sf::Out<ContentId> out_content_id, const ContentMetaKey &key, ContentType type, u8 id_offset) override; virtual Result GetContentIdByTypeAndIdOffset(sf::Out<ContentId> out_content_id, const ContentMetaKey &key, ContentType type, u8 id_offset) override;
}; };