mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-04 10:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

set: fix SetRegion, setsysGetSerialNumber

Browse Source
This commit is contained in:
Michael Scire 2020-04-11 16:45:14 -07:00
parent 0a9f8261cb
commit b99efa5ab9
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nx/include/switch/services/set.h
View File

@ -51,9 +51,8 @@ typedef enum {
SetRegion_USA = 1, ///< The Americas SetRegion_USA = 1, ///< The Americas
SetRegion_EUR = 2, ///< Europe SetRegion_EUR = 2, ///< Europe
SetRegion_AUS = 3, ///< Australia/New Zealand SetRegion_AUS = 3, ///< Australia/New Zealand
SetRegion_CHN = 4, ///< China SetRegion_HTK = 4, ///< Hong Kong/Taiwan/Korea
SetRegion_KOR = 5, ///< Korea SetRegion_CHN = 5, ///< China
SetRegion_TWN = 6, ///< Taiwan
} SetRegion; } SetRegion;
/// ConnectionFlag /// ConnectionFlag
@ -341,6 +340,11 @@ typedef struct {
char digest[0x40]; char digest[0x40];
} SetSysFirmwareVersionDigest; } SetSysFirmwareVersionDigest;
/// Structure returned by \ref setsysGetSerialNumber.
typedef struct {
char number[0x18];
} SetSysSerialNumber;
/// UserSelectorSettings /// UserSelectorSettings
typedef struct { typedef struct {
u32 flags; ///< Bitmask with \ref SetSysUserSelectorFlag. u32 flags; ///< Bitmask with \ref SetSysUserSelectorFlag.
@ -1291,9 +1295,9 @@ Result setsysGetBatteryLot(SetBatteryLot *out);
/** /**
* @brief Gets the system's serial number. * @brief Gets the system's serial number.
* @param serial Pointer to output the serial to. (The buffer size needs to be at least 0x19 bytes) * @param[out] out \ref SetSysSerialNumber
*/ */
Result setsysGetSerialNumber(char *serial); Result setsysGetSerialNumber(SetSysSerialNumber *out);
/** /**
* @brief GetNfcEnableFlag * @brief GetNfcEnableFlag

11
nx/source/services/set.c
View File

@ -569,15 +569,8 @@ Result setsysGetBatteryLot(SetBatteryLot *out) {
return serviceDispatchOut(&g_setsysSrv, 67, *out); return serviceDispatchOut(&g_setsysSrv, 67, *out);
} }
Result setsysGetSerialNumber(char *serial) { Result setsysGetSerialNumber(SetSysSerialNumber *out) {
char out[0x18]={0}; return serviceDispatchOut(&g_setsysSrv, 68, *out);
Result rc = serviceDispatchOut(&g_setsysSrv, 68, out);
if (R_SUCCEEDED(rc) && serial) {
memcpy(serial, out, 0x18);
serial[0x18]=0;
}
return rc;
} }
Result setsysGetNfcEnableFlag(bool *out) { Result setsysGetNfcEnableFlag(bool *out) {