From da12ba3ef687037adb8c7d0c6d6c4ce629ac2aff Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 8 Apr 2011 00:37:14 +0000
Subject: [PATCH] =?UTF-8?q?Backup=E3=81=A7=E3=81=AF=E3=83=87=E3=83=BC?=
 =?UTF-8?q?=E3=83=A2=E3=83=B3=E3=81=AE=E8=87=AA=E5=BE=8B=E5=8B=95=E4=BD=9C?=
 =?UTF-8?q?=E3=82=92ac=E3=81=AE=E8=87=AA=E5=8B=95=E6=8E=A5=E7=B6=9A?=
 =?UTF-8?q?=E3=82=82=E5=90=AB=E3=82=81=E3=81=A6=E6=AD=A2=E3=82=81=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20ProductCode=E3=81=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
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@189 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../ConsoleBackup/ConsoleBackup.cpp              | 16 +++++-----------
 .../ConsoleBackup/ConsoleBackup.rsf              |  2 +-
 .../ConsoleRestore/ConsoleRestore.rsf            |  2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
index 374b0e8..61e86b5 100644
--- a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.cpp
@@ -159,21 +159,15 @@ extern "C" void nnMain(void)
 
     // hid の初期化
     result = nn::hid::Initialize();
-    NN_UTIL_PANIC_IF_FAILED(result);
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     // ndmの初期化
     result = nn::ndm::Initialize();
-    NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result);
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
-    // デーモンの自律動作を停止
-    result = nn::ndm::Suspend(nn::ndm::DN_CEC);
-    NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result);
-    result = nn::ndm::Suspend(nn::ndm::DN_BOSS);
-    NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result);
-    result = nn::ndm::Suspend(nn::ndm::DN_FRIENDS);
-    NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result);
-    result = nn::ndm::Suspend(nn::ndm::DN_NIM);
-    NN_ERR_THROW_FATAL_IF_FATAL_ONLY(result);
+    // 全デーモンの自律動作をacの自動接続も含めて止める
+    result = nn::ndm::SuspendScheduler();
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     // cfg の初期化
     nn::cfg::CTR::init::Initialize();
diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf
index a30132a..b585ddb 100644
--- a/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf
+++ b/trunk/ConsoleDataMigration/ConsoleBackup/ConsoleBackup.rsf
@@ -1,6 +1,6 @@
 BasicInfo:
   Title      : ConsoleBackup
-  ProductCode: ConsoleBackup
+  ProductCode: CTR-P-22TA
   BackupMemoryType: None
 
 TitleInfo:
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.rsf b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.rsf
index be9685f..01dec0a 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.rsf
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/ConsoleRestore.rsf
@@ -1,6 +1,6 @@
 BasicInfo:
   Title      : ConsoleRestore
-  ProductCode: ConsoleRestore
+  ProductCode: CTR-P-22UA
   BackupMemoryType: None
 
 TitleInfo: