rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

ReleaseビルドでもDETAILログを出せるように

Browse Source 
TWLセーブデータのインポート時の進捗が取得できなかったのを修正

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
This commit is contained in:
N2614 2012-02-17 02:34:08 +00:00
parent 68c9011a61
commit 1156b81974
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trunk/ConsoleDataMigration/sources/ConsoleRestore/Controller.cpp
View File

@ -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)
{

5
trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.cpp
View File

@ -1076,6 +1076,11 @@ u32 GetImportProgress()
}
}
u32 GetImportProgressTwlNand()
{
return common::GetProgress();
}
bool UpdateNetworkSetting(nn::ac::NetworkSetting& networkSetting)
{
nn::Result result;

3
trunk/ConsoleDataMigration/sources/ConsoleRestore/Importer.h
View File

@ -80,6 +80,9 @@ void CreateTransferAccountFinishedFile();
// インポートスレッドの進捗を取得する
u32 GetImportProgress();
// インポートスレッドの進捗を取得する
u32 GetImportProgressTwlNand();
// NANDのごみを削除する
nn::Result Cleanup();

10
trunk/ConsoleDataMigration/sources/common/CommonLogger.h
View File

@ -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) \