rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

デバイスIDを4文字ごとに空白で区切るように

Browse Source 
git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@659 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2012-03-08 00:46:39 +00:00
parent 9c73351cef
commit 6636bc75ba
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
trunk/ConsoleDataMigration/sources/common/DrawSystemState.cpp
View File

@ -16,6 +16,7 @@
#include "DrawSystemState.h" #include "DrawSystemState.h"
#include "ResFont.h" #include "ResFont.h"
#include "version.h" #include "version.h"
#include "Util.h"
#include <nn/nwm.h> #include <nn/nwm.h>
@ -32,7 +33,7 @@ u8 s_CupMicro;
u8 s_NupMajor; u8 s_NupMajor;
nn::cfg::CTR::CfgRegionCode s_Region; nn::cfg::CTR::CfgRegionCode s_Region;
u8 s_SerialNo[nn::cfg::CTR::CFG_SECURE_INFO_SERIAL_NO_LEN + 1]; u8 s_SerialNo[nn::cfg::CTR::CFG_SECURE_INFO_SERIAL_NO_LEN + 1];
bit64 s_DeviceId; char s_DeviceIdStr[30];
char8 s_MacAddress[nn::nwm::Mac::MAC_STRING_SIZE]; char8 s_MacAddress[nn::nwm::Mac::MAC_STRING_SIZE];
u64 s_FriendCode; u64 s_FriendCode;
u8 s_BatteryRemain; u8 s_BatteryRemain;
@ -70,7 +71,7 @@ void SetTextWriterCore()
GetTextWriter()->Printf("System Ver. %d.%d.%d-%d\n", s_CupMajor, s_CupMinor, s_CupMicro, s_NupMajor); GetTextWriter()->Printf("System Ver. %d.%d.%d-%d\n", s_CupMajor, s_CupMinor, s_CupMicro, s_NupMajor);
GetTextWriter()->Printf("System Region %s\n", nn::cfg::CTR::GetRegionCodeA3(s_Region)); GetTextWriter()->Printf("System Region %s\n", nn::cfg::CTR::GetRegionCodeA3(s_Region));
GetTextWriter()->Printf("Serial No. %s\n", s_SerialNo); GetTextWriter()->Printf("Serial No. %s\n", s_SerialNo);
GetTextWriter()->Printf("Device ID %llu\n", s_DeviceId); GetTextWriter()->Printf("Device ID %s\n", s_DeviceIdStr);
GetTextWriter()->Printf("MAC Address %s\n", s_MacAddress); GetTextWriter()->Printf("MAC Address %s\n", s_MacAddress);
if (s_ReadFriendCode) if (s_ReadFriendCode)
{ {
@ -126,7 +127,10 @@ void DrawSystemState
s_CupMicro = cupMicroVersion; s_CupMicro = cupMicroVersion;
s_NupMajor = nupVersion; s_NupMajor = nupVersion;
s_BatteryRemain = batteryRemain; s_BatteryRemain = batteryRemain;
s_DeviceId = deviceId; nn::nstd::TSNPrintf(s_DeviceIdStr, sizeof(s_DeviceIdStr), "%llu", deviceId);
std::string deviceIdString(s_DeviceIdStr);
Util::SplitDeviceidWithSpace(deviceIdString);
std::memcpy(s_DeviceIdStr, deviceIdString.c_str(), deviceIdString.size());
s_FriendCode = friendCode; s_FriendCode = friendCode;
s_Progress = progress; s_Progress = progress;
std::memcpy(s_MacAddress, macAddress, sizeof(s_MacAddress)); std::memcpy(s_MacAddress, macAddress, sizeof(s_MacAddress));

16
trunk/ConsoleDataMigration/sources/common/Util.cpp
View File

@ -370,6 +370,22 @@ bool Util::HasReadFriendCode()
return m_HasReadFriendCode; return m_HasReadFriendCode;
} }
void Util::SplitDeviceidWithSpace(std::string& deviceIdStr)
{
std::string tmp = deviceIdStr;
deviceIdStr.clear();
u32 i = 0;
do
{
deviceIdStr.append(tmp.substr(i, 1));
i++;
if( i % 4 == 0)
{
deviceIdStr.push_back(' ');
}
}while( i < tmp.size());
}
nn::Result PrintNetworkSetting() nn::Result PrintNetworkSetting()
{ {
nn::Result result; nn::Result result;

3
trunk/ConsoleDataMigration/sources/common/Util.h
View File

@ -111,6 +111,9 @@ public:
// フレンドコードを取得済みかどうか // フレンドコードを取得済みかどうか
bool HasReadFriendCode(); bool HasReadFriendCode();
// デバイスIDを4文字ごとに空白で区切る
static void SplitDeviceidWithSpace(std::string& deviceIdStr);
private: private:
void Initialize(); void Initialize();
void Finalize(); void Finalize();