OmniNX/Atmosphere-Pro
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support for sd redirection, changed config

Browse Source
This commit is contained in:
Christoph Baumann
2025-02-20 17:13:52 +01:00
parent ed17414b50
commit f07eb50e68
6 changed files with 120 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
exosphere/program/source/secmon_setup.cpp
View File

@@ -91,7 +91,8 @@ namespace ams::secmon {
/* If the storage context is valid, we want to copy it to the global context. */
if (const auto &storage_ctx = *MemoryRegionPhysicalDramMonitorConfiguration.GetPointer<const SecureMonitorStorageConfiguration>(); storage_ctx.IsValid()) {
ctx.secmon_cfg.CopyFrom(storage_ctx);
ctx.emummc_cfg = storage_ctx.emummc_cfg;
ctx.emummc_cfg = storage_ctx.emummc_cfg;
ctx.emummc_sd_cfg = storage_ctx.emummc_sd_cfg;
} else {
/* If we don't have a valid storage context, we can just use the default one. */
ctx.secmon_cfg = DefaultSecureMonitorConfiguration;

12
exosphere/program/source/smc/secmon_smc_info.cpp
View File

@@ -284,8 +284,12 @@ namespace ams::secmon::smc {
case ConfigItem::ExosphereEmummcType:
/* Get what kind of emummc this unit has active. */
/* NOTE: This may return values other than 1 in the future. */
// TODO: Return redirection type instead
args.r[1] = (GetEmummcConfiguration().IsEmummcActive() ? 1 : 0);
break;
// TODO: GetConfig to get sd redirection type?
// For sd redirection type 0 (EmummcType_Emmc_Raw) doesn't indicate disabled,
// Add EmummcType_Disabled to explicitly indicate no redirection?
case ConfigItem::ExospherePayloadAddress:
/* Gets the physical address of the reboot payload buffer, if one exists. */
if (g_payload_address != 0) {
@@ -421,14 +425,12 @@ namespace ams::secmon::smc {
const uintptr_t user_offset = user_address % 4_KB;
/* Validate arguments. */
/* NOTE: In the future, configuration for non-NAND storage may be implemented. */
SMC_R_UNLESS(mmc == EmummcMmc_Nand, NotSupported);
/* NOTE: In the future, configuration for non-NAND/non-SD storage may be implemented. */
SMC_R_UNLESS(mmc == EmummcMmc_Nand || mmc == EmummcMmc_Sd, NotSupported);
SMC_R_UNLESS(user_offset + 2 * sizeof(EmummcFilePath) <= 4_KB, InvalidArgument);
/* Get the emummc config. */
const auto &cfg = GetEmummcConfiguration();
static_assert(sizeof(cfg.file_cfg) == sizeof(EmummcFilePath));
static_assert(sizeof(cfg.emu_dir_path) == sizeof(EmummcFilePath));
const auto &cfg = mmc == EmummcMmc_Nand ? GetEmummcConfiguration() : GetEmummcSdConfiguration();
/* Clear the output. */
constexpr size_t InlineOutputSize = sizeof(args) - sizeof(args.r[0]);