mirrors/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-06-02 23:59:49 -04:00
Code Issues Projects Releases Packages Wiki Activity

boot2: update for 16.0.0

Browse source
This commit is contained in:
Michael Scire 2023-02-21 16:06:21 -07:00 • committed by SciresM
parent cb89c66bd8
commit e46e7e0eb1
15 changed files with 68 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/libstratosphere/include/stratosphere/fs/fs_bis.hpp
View file

@ -44,6 +44,8 @@ namespace ams::fs {
SystemProperEncryption = 32,
SystemProperPartition = 33,
SignedSystemPartitionOnSafeMode = 34,
DeviceTreeBlob = 35,
System0 = 36,
};
const char *GetBisMountName(BisPartitionId id);

8
libraries/libstratosphere/include/stratosphere/fs/fs_content_storage.hpp
View file

@ -15,16 +15,10 @@
*/
#pragma once
#include <stratosphere/fs/fs_common.hpp>
#include <stratosphere/fs/fs_content_storage_id.hpp>
namespace ams::fs {
/* ACCURATE_TO_VERSION: Unknown */
enum class ContentStorageId : u32 {
System = 0,
User = 1,
SdCard = 2,
};
constexpr inline const char * const ContentStorageDirectoryName = "Contents";
const char *GetContentStorageMountName(ContentStorageId id);

29
libraries/libstratosphere/include/stratosphere/fs/fs_content_storage_id.hpp Normal file
View file

@ -0,0 +1,29 @@
/*
* Copyright (c) Atmosphère-NX
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include <vapours.hpp>
namespace ams::fs {
/* ACCURATE_TO_VERSION: 16.2.0.0 */
enum class ContentStorageId : u32 {
System = 0,
User = 1,
SdCard = 2,
System0 = 3,
};
}

3
libraries/libstratosphere/include/stratosphere/ncm/ncm_api.hpp
View file

@ -17,6 +17,7 @@
#include <stratosphere/ncm/ncm_content_meta_database.hpp>
#include <stratosphere/ncm/ncm_content_storage.hpp>
#include <stratosphere/ncm/ncm_i_content_manager.hpp>
#include <stratosphere/fs/fs_content_storage_id.hpp>
namespace ams::ncm {
@ -46,6 +47,8 @@ namespace ams::ncm {
Result InvalidateRightsIdCache();
Result ActivateFsContentStorage(fs::ContentStorageId fs_content_storage_id);
/* Deprecated API. */
Result CloseContentStorageForcibly(StorageId storage_id);
Result CloseContentMetaDatabaseForcibly(StorageId storage_id);

1
libraries/libstratosphere/include/stratosphere/ncm/ncm_content_manager_impl.hpp
View file

@ -151,6 +151,7 @@ namespace ams::ncm {
Result InactivateContentMetaDatabase(StorageId storage_id);
Result InvalidateRightsIdCache();
Result GetMemoryReport(sf::Out<MemoryReport> out);
Result ActivateFsContentStorage(fs::ContentStorageId fs_content_storage_id);
};
static_assert(IsIContentManager<ContentManagerImpl>);

4
libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_manager.hpp
View file

@ -17,6 +17,7 @@
#include <stratosphere/ncm/ncm_i_content_storage.hpp>
#include <stratosphere/ncm/ncm_i_content_meta_database.hpp>
#include <stratosphere/ncm/ncm_memory_report.hpp>
#include <stratosphere/fs/fs_content_storage_id.hpp>
#define AMS_NCM_I_CONTENT_MANAGER_INTERFACE_INFO(C, H) \
AMS_SF_METHOD_INFO(C, H, 0, Result, CreateContentStorage, (ncm::StorageId storage_id), (storage_id)) \
@ -33,6 +34,7 @@
AMS_SF_METHOD_INFO(C, H, 11, Result, ActivateContentMetaDatabase, (ncm::StorageId storage_id), (storage_id), hos::Version_2_0_0) \
AMS_SF_METHOD_INFO(C, H, 12, Result, InactivateContentMetaDatabase, (ncm::StorageId storage_id), (storage_id), hos::Version_2_0_0) \
AMS_SF_METHOD_INFO(C, H, 13, Result, InvalidateRightsIdCache, (), (), hos::Version_9_0_0) \
AMS_SF_METHOD_INFO(C, H, 14, Result, GetMemoryReport, (sf::Out<ncm::MemoryReport> out), (out), hos::Version_10_0_0)
AMS_SF_METHOD_INFO(C, H, 14, Result, GetMemoryReport, (sf::Out<ncm::MemoryReport> out), (out), hos::Version_10_0_0) \
AMS_SF_METHOD_INFO(C, H, 15, Result, ActivateFsContentStorage, (fs::ContentStorageId fs_storage_id), (fs_storage_id)) /* Technically min 16.0.0, but used. */
AMS_SF_DEFINE_INTERFACE(ams::ncm, IContentManager, AMS_NCM_I_CONTENT_MANAGER_INTERFACE_INFO, 0xFDB4FFE1);

2
libraries/libstratosphere/include/stratosphere/ncm/ncm_system_content_meta_id.hpp
View file

@ -98,6 +98,7 @@ namespace ams::ncm {
static const SystemProgramId Pgl;
static const SystemProgramId Omm;
static const SystemProgramId Eth;
static const SystemProgramId Ngc;
static const SystemProgramId End;
@ -205,6 +206,7 @@ namespace ams::ncm {
inline constexpr const SystemProgramId SystemProgramId::Pgl = { 0x0100000000000042ul };
inline constexpr const SystemProgramId SystemProgramId::Omm = { 0x0100000000000045ul };
inline constexpr const SystemProgramId SystemProgramId::Eth = { 0x0100000000000046ul };
inline constexpr const SystemProgramId SystemProgramId::Ngc = { 0x0100000000000050ul };
inline constexpr const SystemProgramId SystemProgramId::End = { 0x01000000000007FFul };