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

BMSで検索するためのインフラデバイスIDを表示するように

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@65 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-02-17 02:03:59 +00:00
parent ddd2db472a
commit 61c11763a9
6 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
View File

@ -32,6 +32,7 @@
#include <nn/os/os_SharedInfo.h>
#include <nn/pl/CTR/pl_Version.h>
#include <nn/fs/fs_ApiSharedExtSaveData.h>
#include <nn/nim.h>
#include "demo.h"
@ -240,6 +241,11 @@ extern "C" void nnMain(void)
bit32 deviceId;
result = nn::ps::CTR::GetDeviceId(&deviceId);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
bit64 infraDeviceId;
result = nn::nim::CTR::InitializeForShop();
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
result = nn::nim::CTR::Shop::GetInfraDeviceId(deviceId, &infraDeviceId);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
// MACアドレスの取得
nn::nwm::Mac mac;
@ -266,7 +272,7 @@ extern "C" void nnMain(void)
mVerData.nup.majorVersion);
COMMON_LOGGER("System Region %s\n", nn::cfg::CTR::GetRegionCodeA3(region));
COMMON_LOGGER("Serial Number %s\n", s_SerialNo);
COMMON_LOGGER("Device ID %X\n", deviceId);
COMMON_LOGGER("Device ID %llu\n", infraDeviceId);
COMMON_LOGGER("MAC Address %s\n", macAddress);
COMMON_LOGGER("Friend Code %04u-%04u-%04u\n",
static_cast<u32>(friendCode / 100000000ULL % 10000ULL),
@ -354,7 +360,7 @@ extern "C" void nnMain(void)
BACKUP_VERSION_NUM,
&mVerData,
batteryRemain,
deviceId,
infraDeviceId,
friendCode,
GetProgress(),
macAddress,

1
trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf
View File

@ -24,6 +24,7 @@ SystemControlInfo:
- hid
- gsp
- friends
- nim
AccessControlInfo:
Priority : 16

1
trunk/ConsoleDataMigration/ConsoleBackup/OMakefile
View File

@ -65,6 +65,7 @@ LIBS += libnn_cfg \
lib_demo \
libnn_nwm \
libnn_friends \
libnn_nim \
INSTALL_SDK_TOOL = true

10
trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp
View File

@ -32,6 +32,7 @@
#include <nn/am/am_ApiSystemMenu.h>
#include <nn/os/os_SharedInfo.h>
#include <nn/ndm.h>
#include <nn/nim.h>
#include "demo.h"
#include <vector>
@ -264,6 +265,11 @@ extern "C" void nnMain(void)
bit32 deviceId;
result = nn::ps::CTR::GetDeviceId(&deviceId);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
bit64 infraDeviceId;
result = nn::nim::CTR::InitializeForShop();
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
result = nn::nim::CTR::Shop::GetInfraDeviceId(deviceId, &infraDeviceId);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
// MACアドレスの取得
nn::nwm::Mac mac;
@ -290,7 +296,7 @@ extern "C" void nnMain(void)
mVerData.nup.majorVersion);
COMMON_LOGGER("System Region %s\n", nn::cfg::CTR::GetRegionCodeA3(region));
COMMON_LOGGER("Serial Number %s\n", s_SerialNo);
COMMON_LOGGER("Device ID %X\n", deviceId);
COMMON_LOGGER("Device ID %llu\n", infraDeviceId);
COMMON_LOGGER("MAC Address %s\n", macAddress);
COMMON_LOGGER("Friend Code %04u-%04u-%04u\n",
static_cast<u32>(friendCode / 100000000ULL % 10000ULL),
@ -387,7 +393,7 @@ extern "C" void nnMain(void)
RESTORE_VERSION_NUM,
&mVerData,
batteryRemain,
deviceId,
infraDeviceId,
friendCode,
GetProgress(),
macAddress,

4
trunk/ConsoleDataMigration/common/DrawSystemState.cpp
View File

@ -49,7 +49,7 @@ void DrawSystemState
const char* toolVersion,
common::VerDef* mVerData,
u8 batteryRemain,
bit32 deviceId,
u64 deviceId,
u64 friendCode,
u32 progress,
char8* macAddress,
@ -84,7 +84,7 @@ void DrawSystemState
mVerData->nup.majorVersion);
renderSystem.DrawText(0, line++ * spaceSize, "System Region %s", nn::cfg::CTR::GetRegionCodeA3(region));
renderSystem.DrawText(0, line++ * spaceSize, "Serial No. %s", s_SerialNo);
renderSystem.DrawText(0, line++ * spaceSize, "Device ID %X", deviceId);
renderSystem.DrawText(0, line++ * spaceSize, "Device ID %llu", deviceId);
renderSystem.DrawText(0, line++ * spaceSize, "MAC Address %s", macAddress);
renderSystem.DrawText(0, line++ * spaceSize, "Friend Code %04u-%04u-%04u", static_cast<u32> (friendCode
/ 100000000ULL % 10000ULL), static_cast<u32> (friendCode / 10000ULL % 10000ULL),

2
trunk/ConsoleDataMigration/common/DrawSystemState.h
View File

@ -55,7 +55,7 @@ void DrawSystemState
const char* toolVersion,
common::VerDef* mVerData,
u8 batteryRemain,
bit32 deviceId,
u64 deviceId,
u64 friendCode,
u32 progress,
char8* macAddress,