diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp index bbb64c3..784db50 100644 --- a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp +++ b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp @@ -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; diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp index 7e08570..3970329 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp @@ -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; diff --git a/trunk/ConsoleDataMigration/common/common_Types.h b/trunk/ConsoleDataMigration/common/common_Types.h index 4f54f13..08b0197 100644 --- a/trunk/ConsoleDataMigration/common/common_Types.h +++ b/trunk/ConsoleDataMigration/common/common_Types.h @@ -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