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

NTRユーザカラー、コメントはNTR設定全体をエクスポート、インポートして移行するように

Browse Source 
SDに出力するResult用マクロの整理

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@3 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-01-31 01:44:35 +00:00
parent 5ed32bde66
commit eeafd1919a
5 changed files with 28 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp
View File

@ -161,41 +161,17 @@ void WriteNorData()
NN_LOG("Get NTR User Setting\n"); NN_LOG("Get NTR User Setting\n");
// ユーザカラー // NTR設定
result = nn::cfg::nor::CTR::GetUserColor(&s_NtrNorData.userColor); result = nn::cfg::nor::CTR::GetNtrSetting(&s_NtrNorData.ntrConfig.ncd, &s_NtrNorData.ntrConfig.ncd_ex);
if (result.IsSuccess()) COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
{
NN_LOG("NTR User Color = %d\n", s_NtrNorData.userColor);
}
else
{
COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
}
// コメント
result = nn::cfg::nor::CTR::GetComment(&s_NtrNorData.comment);
if (result.IsSuccess())
{
NN_LOG("NTR User Comment = %ls\n", s_NtrNorData.comment.buffer);
}
else
{
COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
}
// TWL WiFi設定 // TWL WiFi設定
result = nn::cfg::nor::CTR::ReadTwlWifiSetting(0, s_NtrNorData.TwlWiFiSetting, common::TWL_WIFI_SETTING_SIZE); result = nn::cfg::nor::CTR::ReadTwlWifiSetting(0, s_NtrNorData.TwlWiFiSetting, common::TWL_WIFI_SETTING_SIZE);
if(result.IsFailure()) COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
{
COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
}
// NTR WiFi設定 // NTR WiFi設定
result = nn::cfg::nor::CTR::ReadNtrWifiSetting(0, s_NtrNorData.NtrWiFiSetting, common::NTR_WIFI_SETTING_SIZE); result = nn::cfg::nor::CTR::ReadNtrWifiSetting(0, s_NtrNorData.NtrWiFiSetting, common::NTR_WIFI_SETTING_SIZE);
if(result.IsFailure()) COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
{
COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
}
s_SdWriter.WriteBuf(common::NOR_PATHNAME, &s_NtrNorData, sizeof(common::NtrNorData)); s_SdWriter.WriteBuf(common::NOR_PATHNAME, &s_NtrNorData, sizeof(common::NtrNorData));
} }

27
trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
View File

@ -515,36 +515,19 @@ void ImportNorData()
if(result.IsSuccess()) if(result.IsSuccess())
{ {
// cfgを使ってセットする // cfgを使ってセットする
// ユーザカラー result = nn::cfg::nor::CTR::SetNtrSetting(&reinterpret_cast<common::NtrNorData*>(buf)->ntrConfig.ncd,
NN_LOG("user color = %d\n", (reinterpret_cast<common::NtrNorData*>(buf)->userColor)); &reinterpret_cast<common::NtrNorData*>(buf)->ntrConfig.ncd_ex);
result = nn::cfg::nor::CTR::SetUserColor(reinterpret_cast<common::NtrNorData*>(buf)->userColor); COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
if(result.IsFailure())
{
COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
}
// コメント
result = nn::cfg::nor::CTR::SetComment(reinterpret_cast<common::NtrNorData*>(buf)->comment);
if(result.IsFailure())
{
COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
}
// TWL WiFi設定 // TWL WiFi設定
result = nn::cfg::nor::CTR::WriteTwlWifiSetting(0, reinterpret_cast<common::NtrNorData*>(buf)->TwlWiFiSetting, result = nn::cfg::nor::CTR::WriteTwlWifiSetting(0, reinterpret_cast<common::NtrNorData*>(buf)->TwlWiFiSetting,
common::TWL_WIFI_SETTING_SIZE); common::TWL_WIFI_SETTING_SIZE);
if (result.IsFailure()) COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
{
COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
}
// NTR WiFi設定 // NTR WiFi設定
result = nn::cfg::nor::CTR::WriteNtrWifiSetting(0, reinterpret_cast<common::NtrNorData*>(buf)->NtrWiFiSetting, result = nn::cfg::nor::CTR::WriteNtrWifiSetting(0, reinterpret_cast<common::NtrNorData*>(buf)->NtrWiFiSetting,
common::NTR_WIFI_SETTING_SIZE); common::NTR_WIFI_SETTING_SIZE);
if (result.IsFailure()) COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
{
COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
}
} }
else else

5
trunk/ConsoleDataMigration/common/CommonLogger.h
View File

@ -38,6 +38,11 @@
COMMON_LOGGER_RESULT(result); \ COMMON_LOGGER_RESULT(result); \
} \ } \
#define COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result) \
if(result.IsFailure()) \
{ \
COMMON_LOGGER_RESULT_WITH_LINE(result, __LINE__); \
} \
namespace common namespace common
{ {

36
trunk/ConsoleDataMigration/common/SdReaderWriter.cpp
View File

@ -15,6 +15,7 @@
#include "SdReaderWriter.h" #include "SdReaderWriter.h"
#include "SdMountManager.h" #include "SdMountManager.h"
#include "CommonLogger.h"
namespace common namespace common
{ {
@ -58,10 +59,7 @@ nn::Result SdReaderWriter::WriteBuf(const wchar_t* path, void* buf, size_t size)
nn::Result result; nn::Result result;
result = Initialize(); result = Initialize();
if(result.IsFailure()) COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
{
nn::dbg::PrintResult(result);
}
result = file.TryInitialize(path, nn::fs::OPEN_MODE_WRITE | nn::fs::OPEN_MODE_CREATE); result = file.TryInitialize(path, nn::fs::OPEN_MODE_WRITE | nn::fs::OPEN_MODE_CREATE);
if (result.IsSuccess()) if (result.IsSuccess())
@ -74,28 +72,25 @@ nn::Result SdReaderWriter::WriteBuf(const wchar_t* path, void* buf, size_t size)
if (result.IsFailure()) if (result.IsFailure())
{ {
NN_LOG("SD TryFlush failed\n"); NN_LOG("SD TryFlush failed\n");
nn::dbg::PrintResult(result); COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
} }
} }
else else
{ {
NN_LOG("SD TryWrite failed\n"); NN_LOG("SD TryWrite failed\n");
nn::dbg::PrintResult(result); COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
} }
} }
else else
{ {
NN_LOG("SD TryInitialize failed\n"); NN_LOG("SD TryInitialize failed\n");
nn::dbg::PrintResult(result); COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
} }
file.Finalize(); file.Finalize();
result = Finalize(); result = Finalize();
if(result.IsFailure()) COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
{
nn::dbg::PrintResult(result);
}
return result; return result;
} }
@ -120,23 +115,17 @@ nn::Result SdReaderWriter::ReadBuf(const wchar_t* path, void* buf, size_t size,
{ {
// TODO バッファを超えるサイズのファイル読み込み // TODO バッファを超えるサイズのファイル読み込み
*totalSize = readSize; *totalSize = readSize;
result = file.TryFlush();
if (result.IsFailure())
{
NN_LOG("SD TryFlush failed\n");
nn::dbg::PrintResult(result);
}
} }
else else
{ {
NN_LOG("SD TryRead failed\n"); NN_LOG("SD TryRead failed\n");
nn::dbg::PrintResult(result); COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
} }
} }
else else
{ {
NN_LOG("SD TryInitialize failed\n"); NN_LOG("SD TryInitialize failed\n");
nn::dbg::PrintResult(result); COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
} }
file.Finalize(); file.Finalize();
@ -154,12 +143,11 @@ void SdReaderWriter::CreateDirectory(const wchar_t* path)
NN_LOG("Create Directory %ls\n", path); NN_LOG("Create Directory %ls\n", path);
result = nn::fs::TryCreateDirectory(path); result = nn::fs::TryCreateDirectory(path);
if(result.IsFailure()) COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
{
nn::dbg::PrintResult(result); result = Finalize();
} COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
Finalize();
} }
} }

5
trunk/ConsoleDataMigration/common/common_Types.h
View File

@ -28,12 +28,9 @@ const u32 TWL_WIFI_SETTING_SIZE = 0x600; // TWL Wifi 設定のサ
// NOR領域のみにある設定データ用構造体 // NOR領域のみにある設定データ用構造体
struct NtrNorData struct NtrNorData
{ {
nn::cfg::CTR::NtrComment comment; nn::cfg::CTR::NtrConfig ntrConfig;
u8 TwlWiFiSetting[TWL_WIFI_SETTING_SIZE]; u8 TwlWiFiSetting[TWL_WIFI_SETTING_SIZE];
u8 NtrWiFiSetting[NTR_WIFI_SETTING_SIZE]; u8 NtrWiFiSetting[NTR_WIFI_SETTING_SIZE];
NN_PADDING1;
u8 userColor;
}; };