From eeafd1919a640086a13e493b4718e74b4d7f7f83 Mon Sep 17 00:00:00 2001 From: N2614 Date: Mon, 31 Jan 2011 01:44:35 +0000 Subject: [PATCH] =?UTF-8?q?NTR=E3=83=A6=E3=83=BC=E3=82=B6=E3=82=AB?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=80=81=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=81=AFNTR=E8=A8=AD=E5=AE=9A=E5=85=A8=E4=BD=93=E3=82=92?= =?UTF-8?q?=E3=82=A8=E3=82=AF=E3=82=B9=E3=83=9D=E3=83=BC=E3=83=88=E3=80=81?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=88=E3=81=97=E3=81=A6?= =?UTF-8?q?=E7=A7=BB=E8=A1=8C=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=20SD=E3=81=AB=E5=87=BA=E5=8A=9B=E3=81=99=E3=82=8BResult?= =?UTF-8?q?=E7=94=A8=E3=83=9E=E3=82=AF=E3=83=AD=E3=81=AE=E6=95=B4=E7=90=86?= 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@3 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../ConsoleBackup/Exporter.cpp | 34 +++--------------- .../ConsoleRestore/Importer.cpp | 27 +++----------- .../common/CommonLogger.h | 5 +++ .../common/SdReaderWriter.cpp | 36 +++++++------------ .../common/common_Types.h | 5 +-- 5 files changed, 28 insertions(+), 79 deletions(-) diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp index 0495cef..6294195 100644 --- a/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp +++ b/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp @@ -161,41 +161,17 @@ void WriteNorData() NN_LOG("Get NTR User Setting\n"); - // ユーザカラー - result = nn::cfg::nor::CTR::GetUserColor(&s_NtrNorData.userColor); - if (result.IsSuccess()) - { - 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__); - } + // NTR設定 + result = nn::cfg::nor::CTR::GetNtrSetting(&s_NtrNorData.ntrConfig.ncd, &s_NtrNorData.ntrConfig.ncd_ex); + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); // TWL WiFi設定 result = nn::cfg::nor::CTR::ReadTwlWifiSetting(0, s_NtrNorData.TwlWiFiSetting, common::TWL_WIFI_SETTING_SIZE); - if(result.IsFailure()) - { - COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__); - } + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); // NTR WiFi設定 result = nn::cfg::nor::CTR::ReadNtrWifiSetting(0, s_NtrNorData.NtrWiFiSetting, common::NTR_WIFI_SETTING_SIZE); - if(result.IsFailure()) - { - COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__); - } + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); s_SdWriter.WriteBuf(common::NOR_PATHNAME, &s_NtrNorData, sizeof(common::NtrNorData)); } diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp index 2292f9a..35023e7 100644 --- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp +++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp @@ -515,36 +515,19 @@ void ImportNorData() if(result.IsSuccess()) { // cfgを使ってセットする - // ユーザカラー - NN_LOG("user color = %d\n", (reinterpret_cast(buf)->userColor)); - result = nn::cfg::nor::CTR::SetUserColor(reinterpret_cast(buf)->userColor); - if(result.IsFailure()) - { - COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__); - } - - // コメント - result = nn::cfg::nor::CTR::SetComment(reinterpret_cast(buf)->comment); - if(result.IsFailure()) - { - COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__); - } + result = nn::cfg::nor::CTR::SetNtrSetting(&reinterpret_cast(buf)->ntrConfig.ncd, + &reinterpret_cast(buf)->ntrConfig.ncd_ex); + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); // TWL WiFi設定 result = nn::cfg::nor::CTR::WriteTwlWifiSetting(0, reinterpret_cast(buf)->TwlWiFiSetting, common::TWL_WIFI_SETTING_SIZE); - if (result.IsFailure()) - { - COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__); - } + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); // NTR WiFi設定 result = nn::cfg::nor::CTR::WriteNtrWifiSetting(0, reinterpret_cast(buf)->NtrWiFiSetting, common::NTR_WIFI_SETTING_SIZE); - if (result.IsFailure()) - { - COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__); - } + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); } else diff --git a/trunk/ConsoleDataMigration/common/CommonLogger.h b/trunk/ConsoleDataMigration/common/CommonLogger.h index 3af1e2d..4018a3b 100644 --- a/trunk/ConsoleDataMigration/common/CommonLogger.h +++ b/trunk/ConsoleDataMigration/common/CommonLogger.h @@ -38,6 +38,11 @@ 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 { diff --git a/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp b/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp index 63f53bd..8164695 100644 --- a/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp +++ b/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp @@ -15,6 +15,7 @@ #include "SdReaderWriter.h" #include "SdMountManager.h" +#include "CommonLogger.h" namespace common { @@ -58,10 +59,7 @@ nn::Result SdReaderWriter::WriteBuf(const wchar_t* path, void* buf, size_t size) nn::Result result; result = Initialize(); - if(result.IsFailure()) - { - nn::dbg::PrintResult(result); - } + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); result = file.TryInitialize(path, nn::fs::OPEN_MODE_WRITE | nn::fs::OPEN_MODE_CREATE); if (result.IsSuccess()) @@ -74,28 +72,25 @@ nn::Result SdReaderWriter::WriteBuf(const wchar_t* path, void* buf, size_t size) if (result.IsFailure()) { NN_LOG("SD TryFlush failed\n"); - nn::dbg::PrintResult(result); + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); } } else { NN_LOG("SD TryWrite failed\n"); - nn::dbg::PrintResult(result); + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); } } else { NN_LOG("SD TryInitialize failed\n"); - nn::dbg::PrintResult(result); + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); } file.Finalize(); result = Finalize(); - if(result.IsFailure()) - { - nn::dbg::PrintResult(result); - } + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); return result; } @@ -120,23 +115,17 @@ nn::Result SdReaderWriter::ReadBuf(const wchar_t* path, void* buf, size_t size, { // TODO バッファを超えるサイズのファイル読み込み *totalSize = readSize; - result = file.TryFlush(); - if (result.IsFailure()) - { - NN_LOG("SD TryFlush failed\n"); - nn::dbg::PrintResult(result); - } } else { NN_LOG("SD TryRead failed\n"); - nn::dbg::PrintResult(result); + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); } } else { NN_LOG("SD TryInitialize failed\n"); - nn::dbg::PrintResult(result); + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); } file.Finalize(); @@ -154,12 +143,11 @@ void SdReaderWriter::CreateDirectory(const wchar_t* path) NN_LOG("Create Directory %ls\n", path); result = nn::fs::TryCreateDirectory(path); - if(result.IsFailure()) - { - nn::dbg::PrintResult(result); - } + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); + + result = Finalize(); + COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result); - Finalize(); } } diff --git a/trunk/ConsoleDataMigration/common/common_Types.h b/trunk/ConsoleDataMigration/common/common_Types.h index dcba8bf..4a69164 100644 --- a/trunk/ConsoleDataMigration/common/common_Types.h +++ b/trunk/ConsoleDataMigration/common/common_Types.h @@ -28,12 +28,9 @@ const u32 TWL_WIFI_SETTING_SIZE = 0x600; // TWL Wifi 設定のサ // NOR領域のみにある設定データ用構造体 struct NtrNorData { - nn::cfg::CTR::NtrComment comment; + nn::cfg::CTR::NtrConfig ntrConfig; u8 TwlWiFiSetting[TWL_WIFI_SETTING_SIZE]; u8 NtrWiFiSetting[NTR_WIFI_SETTING_SIZE]; - NN_PADDING1; - u8 userColor; - };