From 1156b8197462c9b8546259822772180a5d833bdd Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Fri, 17 Feb 2012 02:34:08 +0000
Subject: [PATCH] =?UTF-8?q?Release=E3=83=93=E3=83=AB=E3=83=89=E3=81=A7?=
 =?UTF-8?q?=E3=82=82DETAIL=E3=83=AD=E3=82=B0=E3=82=92=E5=87=BA=E3=81=9B?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20TWL=E3=82=BB=E3=83=BC?=
 =?UTF-8?q?=E3=83=96=E3=83=87=E3=83=BC=E3=82=BF=E3=81=AE=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=88=E6=99=82=E3=81=AE=E9=80=B2=E6=8D=97?=
 =?UTF-8?q?=E3=81=8C=E5=8F=96=E5=BE=97=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=8B?=
 =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE=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@640 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/Controller.cpp              |  5 ++++-
 .../sources/ConsoleRestore/Importer.cpp                |  5 +++++
 .../sources/ConsoleRestore/Importer.h                  |  3 +++
 .../ConsoleDataMigration/sources/common/CommonLogger.h | 10 ----------
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
index 86d9be3..14401bf 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
@@ -1980,13 +1980,16 @@ u32 GetProgress()
 {
     if(s_RestoreState == RESTORE_TWL_SOUND ||
             s_RestoreState == RESTORE_TWL_PHOTO ||
-            s_RestoreState == RESTORE_TWL_NAND ||
             s_RestoreState == RESTORE_IN_PROGRESS ||
             s_RestoreState == POST_RESTORE ||
             s_RestoreState == RESTORE_DONE)
     {
         return GetImportProgress();
     }
+    else if (s_RestoreState == RESTORE_TWL_NAND)
+    {
+        return GetImportProgressTwlNand();
+    }
     else if(s_RestoreState == UPDATE_IN_PROGRESS ||
             s_RestoreState == UPDATE_DONE)
     {
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
index 7496356..bb6fad7 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
@@ -1076,6 +1076,11 @@ u32 GetImportProgress()
     }
 }
 
+u32 GetImportProgressTwlNand()
+{
+    return common::GetProgress();
+}
+
 bool UpdateNetworkSetting(nn::ac::NetworkSetting& networkSetting)
 {
     nn::Result result;
diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
index 73818ca..868a5b0 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
@@ -80,6 +80,9 @@ void CreateTransferAccountFinishedFile();
 // インポートスレッドの進捗を取得する
 u32 GetImportProgress();
 
+// インポートスレッドの進捗を取得する
+u32 GetImportProgressTwlNand();
+
 // NANDのごみを削除する
 nn::Result Cleanup();
 
diff --git a/trunk/ConsoleDataMigration/sources/common/CommonLogger.h b/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
index e3e3271..99c26ca 100644
--- a/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
+++ b/trunk/ConsoleDataMigration/sources/common/CommonLogger.h
@@ -39,21 +39,11 @@
     (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Func   = %s\n", func);                      \
     (void)common::Logger::GetLoggerInstance()->PrintResultSdLog("Result = %X\n", result.GetPrintableBits()); \
 
-#ifndef NN_SWITCH_DISABLE_DEBUG_PRINT
-#define COMMON_LOGGER_DEBUG( ... )  COMMON_LOGGER(__VA_ARGS__)
-#else   // ifndef NN_SWITCH_DISABLE_DEBUG_PRINT
-#define COMMON_LOGGER_DEBUG( ... )  ((void)0)
-#endif  // ifndef NN_SWITCH_DISABLE_DEBUG_PRINT else
-
-#ifndef NN_SWITCH_DISABLE_DEBUG_PRINT
 #ifdef COMMON_LOGGER_DETAIL_ENABLE
 #define COMMON_LOGGER_DETAIL(...)  COMMON_LOGGER(__VA_ARGS__)
 #else
 #define COMMON_LOGGER_DETAIL( ... ) ((void)0)
 #endif
-#else
-#define COMMON_LOGGER_DETAIL( ... ) ((void)0)
-#endif
 
 
 #define COMMON_LOGGER_RESULT_WITH_LINE(result, line, func)  \