GetInfraDeviceIdを自前で計算するように

nim::Shopは2.Xで互換性がなくなるので使わない

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@166 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-03-25 07:58:11 +00:00
parent 33f1523d6e
commit a2b8640ac0
3 changed files with 3 additions and 12 deletions

View File

@ -272,12 +272,7 @@ extern "C" void nnMain(void)
result = nn::ps::CTR::GetDeviceId(&s_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(s_DeviceId, &infraDeviceId);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
result = nn::nim::CTR::FinalizeForShop();
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
infraDeviceId = s_DeviceId + common::INFRA_DEVICE_ID_OFFSET;
// MACアドレスの取得
nn::nwm::Mac mac;

View File

@ -282,12 +282,7 @@ extern "C" void nnMain(void)
result = nn::ps::CTR::GetDeviceId(&s_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(s_DeviceId, &infraDeviceId);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
result = nn::nim::CTR::FinalizeForShop();
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
infraDeviceId = s_DeviceId + common::INFRA_DEVICE_ID_OFFSET;
// MACアドレスの取得
nn::nwm::Mac mac;

View File

@ -32,6 +32,7 @@ namespace common
const u32 NTR_WIFI_SETTING_SIZE = 0x400; // NTR Wifi 設定のサイズ
const u32 TWL_WIFI_SETTING_SIZE = 0x600; // TWL Wifi 設定のサイズ
const u64 INFRA_DEVICE_ID_OFFSET = 0x400000000;
// NOR領域のみにある設定データ用構造体
struct NtrNorData