From a2b8640ac03c91bb474a487d9c2c26e52e3e661b Mon Sep 17 00:00:00 2001 From: N2614 Date: Fri, 25 Mar 2011 07:58:11 +0000 Subject: [PATCH] =?UTF-8?q?GetInfraDeviceId=E3=82=92=E8=87=AA=E5=89=8D?= =?UTF-8?q?=E3=81=A7=E8=A8=88=E7=AE=97=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=20nim::Shop=E3=81=AF2.X=E3=81=A7=E4=BA=92=E6=8F=9B?= =?UTF-8?q?=E6=80=A7=E3=81=8C=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E4=BD=BF=E3=82=8F=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp | 7 +------ .../ConsoleDataMigration/ConsoleRestore/ConsoleRestore.cpp | 7 +------ trunk/ConsoleDataMigration/common/common_Types.h | 1 + 3 files changed, 3 insertions(+), 12 deletions(-) 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