mirrors/nxdumptool
1
0
Fork 0
mirror of https://github.com/DarkMatterCore/nxdumptool.git synced 2024-11-22 18:26:39 +00:00
Code Issues Releases Activity

utils: add emuMMC detection

Browse source
This commit is contained in:
Pablo Curiel 2024-10-08 01:09:46 +02:00
parent 7b36fddf33
commit 521191e0d3
2 changed files with 57 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/core/nxdt_utils.h
View file

@ -96,6 +96,9 @@ u8 utilsGetAtmosphereKeyGeneration(void);
/// Fills the provided SdkAddOnVersion element with the target firmware set by Atmosphère. /// Fills the provided SdkAddOnVersion element with the target firmware set by Atmosphère.
void utilsGetAtmosphereTargetFirmware(SdkAddOnVersion *out); void utilsGetAtmosphereTargetFirmware(SdkAddOnVersion *out);
/// Returns true if an emuMMC is being used.
bool utilsGetAtmosphereEmummcStatus(void);
/// Returns a UtilsCustomFirmwareType value. /// Returns a UtilsCustomFirmwareType value.
u8 utilsGetCustomFirmwareType(void); u8 utilsGetCustomFirmwareType(void);

68
source/core/nxdt_utils.c
View file

@ -90,14 +90,17 @@ static const size_t g_illegalFileSystemCharsLength = (MAX_ELEMENTS(g_illegalFile
static bool g_appUpdated = false; static bool g_appUpdated = false;
static const SplConfigItem SplConfigItem_ExosphereApiVersion = (SplConfigItem)65000; static const SplConfigItem SplConfigItem_ExosphereApiVersion = (SplConfigItem)65000;
static const SplConfigItem SplConfigItem_ExosphereEmummcType = (SplConfigItem)65007;
static UtilsExosphereApiVersion g_exosphereApiVersion = {0}; static UtilsExosphereApiVersion g_exosphereApiVersion = {0};
static bool g_exosphereIsEmummc = false;
/* Function prototypes. */ /* Function prototypes. */
static void _utilsGetLaunchPath(void); static void _utilsGetLaunchPath(void);
static bool utilsGetExosphereApiVersion(void); static bool utilsGetExosphereApiVersion(void);
static bool utilsGetExosphereEmummcType(void);
static void _utilsGetCustomFirmwareType(void); static void _utilsGetCustomFirmwareType(void);
@ -157,10 +160,8 @@ bool utilsInitializeResources(void)
#if LOG_LEVEL <= LOG_LEVEL_INFO #if LOG_LEVEL <= LOG_LEVEL_INFO
/* Log info messages. */ /* Log info messages. */
u32 hos_version = hosversionGet();
LOG_MSG_INFO(APP_TITLE " v" APP_VERSION " starting (" GIT_REV "). Built on " BUILD_TIMESTAMP "."); LOG_MSG_INFO(APP_TITLE " v" APP_VERSION " starting (" GIT_REV "). Built on " BUILD_TIMESTAMP ".");
if (g_nxLinkSocketFd >= 0) LOG_MSG_INFO("nxlink enabled! Host IP address: %s.", inet_ntoa(__nxlink_host)); if (g_nxLinkSocketFd >= 0) LOG_MSG_INFO("nxlink enabled! Host IP address: %s.", inet_ntoa(__nxlink_host));
LOG_MSG_INFO("Horizon OS version: %u.%u.%u.", HOSVER_MAJOR(hos_version), HOSVER_MINOR(hos_version), HOSVER_MICRO(hos_version));
#endif #endif
/* Retrieve Exosphère API version. */ /* Retrieve Exosphère API version. */
@ -170,18 +171,15 @@ bool utilsInitializeResources(void)
break; break;
} }
/* Retrieve Exosphère emuMMC status. */
if (!utilsGetExosphereEmummcType())
{
LOG_MSG_ERROR("Failed to retrieve Exosphère emuMMC status!");
break;
}
/* Retrieve custom firmware type. */ /* Retrieve custom firmware type. */
_utilsGetCustomFirmwareType(); _utilsGetCustomFirmwareType();
if (g_customFirmwareType != UtilsCustomFirmwareType_Unknown) LOG_MSG_INFO("Detected %s CFW.", (g_customFirmwareType == UtilsCustomFirmwareType_Atmosphere ? "Atmosphère" : \
(g_customFirmwareType == UtilsCustomFirmwareType_SXOS ? "SX OS" : "ReiNX")));
LOG_MSG_INFO("Exosphère API version info:\r\n" \
"- Release version: %u.%u.%u.\r\n" \
"- PKG1 key generation: %u (0x%02X).\r\n" \
"- Target firmware: %u.%u.%u.", \
g_exosphereApiVersion.ams_ver_major, g_exosphereApiVersion.ams_ver_minor, g_exosphereApiVersion.ams_ver_micro, \
g_exosphereApiVersion.key_generation, !g_exosphereApiVersion.key_generation ? g_exosphereApiVersion.key_generation : (g_exosphereApiVersion.key_generation + 1), \
g_exosphereApiVersion.target_firmware.major, g_exosphereApiVersion.target_firmware.minor, g_exosphereApiVersion.target_firmware.micro);
/* Get product model. */ /* Get product model. */
if (!_utilsGetProductModel()) break; if (!_utilsGetProductModel()) break;
@ -195,8 +193,34 @@ bool utilsInitializeResources(void)
/* Get applet type. */ /* Get applet type. */
g_programAppletType = appletGetAppletType(); g_programAppletType = appletGetAppletType();
LOG_MSG_INFO("Running under %s %s unit %s Terra flag in %s mode.", g_isDevUnit ? "development" : "retail", utilsIsMarikoUnit() ? "Mariko" : "Erista", \ #if LOG_LEVEL <= LOG_LEVEL_INFO
g_isTerraUnit ? "with" : "without", utilsIsAppletMode() ? "applet" : "title override"); /* Log info messages. */
u32 hos_version = hosversionGet();
LOG_MSG_INFO("Console info:\r\n" \
"- Horizon OS version: %u.%u.%u.\r\n" \
"- CFW: %s.\r\n" \
"- eMMC type: %s.\r\n" \
"- SoC type: %s\r\n" \
"- Development unit: %s.\r\n" \
"- Terra flag: %s.\r\n" \
"- Execution mode: %s.", \
HOSVER_MAJOR(hos_version), HOSVER_MINOR(hos_version), HOSVER_MICRO(hos_version), \
(g_customFirmwareType == UtilsCustomFirmwareType_Atmosphere ? "Atmosphère" : (g_customFirmwareType == UtilsCustomFirmwareType_SXOS ? "SX OS" : g_customFirmwareType == UtilsCustomFirmwareType_ReiNX ? "ReiNX" : "Unknown")), \
g_exosphereIsEmummc ? "emuMMC" : "sysMMC", \
utilsIsMarikoUnit() ? "Mariko" : "Erista", \
g_isDevUnit ? "yes" : "no", \
g_isTerraUnit ? "yes" : "no", \
utilsIsAppletMode() ? "applet" : "title override");
LOG_MSG_INFO("Exosphère API version info:\r\n" \
"- Release version: %u.%u.%u.\r\n" \
"- PKG1 key generation: %u (0x%02X).\r\n" \
"- Target firmware: %u.%u.%u.", \
g_exosphereApiVersion.ams_ver_major, g_exosphereApiVersion.ams_ver_minor, g_exosphereApiVersion.ams_ver_micro, \
g_exosphereApiVersion.key_generation, !g_exosphereApiVersion.key_generation ? g_exosphereApiVersion.key_generation : (g_exosphereApiVersion.key_generation + 1), \
g_exosphereApiVersion.target_firmware.major, g_exosphereApiVersion.target_firmware.minor, g_exosphereApiVersion.target_firmware.micro);
#endif
if (g_appLaunchPath) if (g_appLaunchPath)
{ {
@ -423,6 +447,11 @@ void utilsGetAtmosphereTargetFirmware(SdkAddOnVersion *out)
memcpy(out, &(g_exosphereApiVersion.target_firmware), sizeof(SdkAddOnVersion)); memcpy(out, &(g_exosphereApiVersion.target_firmware), sizeof(SdkAddOnVersion));
} }
bool utilsGetAtmosphereEmummcStatus(void)
{
return g_exosphereIsEmummc;
}
u8 utilsGetCustomFirmwareType(void) u8 utilsGetCustomFirmwareType(void)
{ {
return g_customFirmwareType; return g_customFirmwareType;
@ -1368,6 +1397,17 @@ static bool utilsGetExosphereApiVersion(void)
return ret; return ret;
} }
/* SMC config item available in Atmosphère and Atmosphère-based CFWs. */
static bool utilsGetExosphereEmummcType(void)
{
u64 is_emummc = 0;
Result rc = splGetConfig(SplConfigItem_ExosphereEmummcType, &is_emummc);
bool ret = R_SUCCEEDED(rc);
g_exosphereIsEmummc = (ret && is_emummc);
if (!ret) LOG_MSG_ERROR("splGetConfig failed! (0x%X).", rc);
return ret;
}
static void _utilsGetCustomFirmwareType(void) static void _utilsGetCustomFirmwareType(void)
{ {
bool tx_srv = servicesCheckRunningServiceByName("tx"); bool tx_srv = servicesCheckRunningServiceByName("tx");