From bfcd9f164dd93935a891a75b87eff2546cce3b54 Mon Sep 17 00:00:00 2001 From: N2614 Date: Mon, 27 May 2013 04:22:50 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=20731-742=20=E3=82=92=20trunk/ConsoleDataMigration=20=E3=81=8B?= =?UTF-8?q?=E3=82=89=E3=83=9E=E3=83=BC=E3=82=B8:=20CTR=E3=80=81SPR?= =?UTF-8?q?=E3=82=88=E3=82=8A=E5=BE=8C=E3=81=AE=E3=83=A2=E3=83=87=E3=83=AB?= =?UTF-8?q?=E3=81=A7=E3=81=AFX=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=A7?= =?UTF-8?q?=E7=84=A1=E7=B7=9AON/OFF=E3=82=92=E5=88=87=E3=82=8A=E6=9B=BF?= =?UTF-8?q?=E3=81=88=E3=82=89=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=80=82=E3=83=93=E3=83=AB=E3=83=89=E3=81=AB=E3=81=AFnwm=5FExt?= =?UTF-8?q?API.cpp=E3=82=92=E5=B7=AE=E3=81=97=E6=9B=BF=E3=81=88=E3=82=8B?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=8C=E3=81=82=E3=82=8B=20........=20?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20........=20X=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=AB?= =?UTF-8?q?=E3=82=88=E3=82=8B=E7=84=A1=E7=B7=9A=E3=83=88=E3=82=B0=E3=83=AB?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E5=89=8A=E9=99=A4=20........=20?= =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=AF=E3=82=A8=E3=83=A9=E3=83=BC=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20........=20Backup=E8=B5=B7=E5=8B=95?= =?UTF-8?q?=E6=99=82=E3=81=AB=E7=84=A1=E7=B7=9AOFF=E3=80=81Restore?= =?UTF-8?q?=E8=B5=B7=E5=8B=95=E6=99=82=E3=81=AB=E7=84=A1=E7=B7=9AON?= =?UTF-8?q?=E3=80=81Restore=E3=81=AE=E7=B5=82=E4=BA=86=E3=82=B9=E3=83=86?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=A7=E7=84=A1=E7=B7=9AOFF=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20........=20trunk?= =?UTF-8?q?=E3=81=8B=E3=82=89=E3=82=B3=E3=83=94=E3=83=BC=E3=81=97=E3=81=9F?= =?UTF-8?q?pl=5FSharedDataTitleId.h=E3=82=92=E8=BF=BD=E5=8A=A0=20=E3=83=93?= =?UTF-8?q?=E3=83=AB=E3=83=89=E6=99=82=E3=81=AE=E6=B3=A8=E6=84=8F=E3=82=92?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20........=20=E3=83=AA=E3=83=93=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=20716=20=E3=82=92=20trunk/ConsoleDataMigrati?= =?UTF-8?q?on=20=E3=81=8B=E3=82=89=E3=83=9E=E3=83=BC=E3=82=B8:=20=E3=82=B3?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E8=BF=BD=E5=8A=A0=E3=80=82aes?= =?UTF-8?q?=E9=8D=B5=E8=A8=AD=E5=AE=9A=E3=81=AE=E8=AD=A6=E5=91=8A=E3=83=A1?= =?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=82=92=E5=89=8A=E9=99=A4?= =?UTF-8?q?=20........?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ nwmのパッチを追加 ........ ビルド環境を更新 ........ リリースしないのでConsoleRestoreをビルド対象から外す ........ ビルド環境を更新 ........ 無線トグル機能の削除忘れ ........ git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@743 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleBackup/ConsoleBackup.cpp | 6 ++++- .../sources/ConsoleRestore/ConsoleRestore.cpp | 3 +++ .../sources/ConsoleRestore/Controller.cpp | 4 +++ .../sources/common/DrawSystemState.cpp | 19 ++++++++++++- .../sources/common/DrawSystemState.h | 3 ++- .../sources/common/HardwareStateManager.cpp | 10 +++++++ .../sources/common/HardwareStateManager.h | 2 ++ .../1stNUP_for_2ndNUP/sources/common/Util.cpp | 27 ++++++++++++++++++- .../1stNUP_for_2ndNUP/sources/common/Util.h | 10 +++++++ 9 files changed, 80 insertions(+), 4 deletions(-) diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp index f6d15c0..16160c7 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleBackup/ConsoleBackup.cpp @@ -139,6 +139,9 @@ extern "C" void nnMain(void) s_HwUtility.InitializeForBackup(); common::HardwareStateManager manager(s_HwUtility); + // 無線OFF + s_HwUtility.SetWifiOff(); + // 情報出力 COMMON_LOGGER("CTR Console Backup %s-%s-%s\n", CONSOLE_REPAIR_VERSION_MAJOR, CONSOLE_REPAIR_VERSION_MINOR, CONSOLE_REPAIR_VERSION_MICRO); COMMON_LOGGER("System Ver. %d.%d.%d-%d\n", @@ -246,7 +249,8 @@ extern "C" void nnMain(void) operationMessage, s_HwUtility.GetRegion(), s_HwUtility.GetSerialNumber(), - s_HwUtility.HasReadFriendCode() + s_HwUtility.HasReadFriendCode(), + s_HwUtility.IsWifiOn() ); if (GetBackupMode() == BACKUP_MODE_DELETE_IF_FAILED) diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/ConsoleRestore.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/ConsoleRestore.cpp index 09039b5..877ce47 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/ConsoleRestore.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/ConsoleRestore.cpp @@ -160,6 +160,9 @@ extern "C" void nnMain(void) s_HwUtility.InitializeForRestore(); common::HardwareStateManager manager(s_HwUtility); + // 無線ON + s_HwUtility.SetWifiOn(); + // 情報出力 COMMON_LOGGER("CTR Console Restore %s-%s-%s\n", CONSOLE_REPAIR_VERSION_MAJOR, CONSOLE_REPAIR_VERSION_MINOR, CONSOLE_REPAIR_VERSION_MICRO); COMMON_LOGGER("System Ver. %d.%d.%d-%d\n", s_HwUtility.GetCupMajorVersion(), diff --git a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Controller.cpp b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Controller.cpp index 6a16d7b..e9fe7b9 100644 --- a/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Controller.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/ConsoleRestore/Controller.cpp @@ -1489,6 +1489,7 @@ void ControlState(common::HardwareStateManager& manager, ::std::vector* s_OperationMessage; bool s_ReadFriendCode; +bool s_IsWifiOn; } @@ -66,7 +67,21 @@ void SetTextWriterCore() { GetTextWriter()->Print("\n"); + f32 cursorX = GetTextWriter()->GetCursorX(); + f32 cursorY = GetTextWriter()->GetCursorY(); GetTextWriter()->Printf("System Ver. %d.%d.%d-%d\n", s_CupMajor, s_CupMinor, s_CupMicro, s_NupMajor); + GetTextWriter()->SetCursorX(cursorX); + GetTextWriter()->SetCursorY(cursorY); + if(s_IsWifiOn) + { + GetTextWriter()->Printf(" WiFi ON\n"); + } + else + { + GetTextWriter()->SetTextColor(nn::util::Color8(80, 80, 80, 255)); + GetTextWriter()->Printf(" WiFi OFF\n"); + GetTextWriter()->SetTextColor(nn::util::Color8(255, 255, 255, 255)); + } GetTextWriter()->Printf("System Region %s\n", nn::cfg::CTR::GetRegionCodeA3(s_Region)); GetTextWriter()->Printf("Serial No. %s\n", s_SerialNo); GetTextWriter()->Printf("Device ID %llu\n", s_DeviceId); @@ -114,7 +129,8 @@ void DrawSystemState ::std::vector& operationMessage, nn::cfg::CTR::CfgRegionCode region, u8* serialNo, - bool readFriendCode + bool readFriendCode, + bool isWifiOn ) { @@ -134,6 +150,7 @@ void DrawSystemState s_SerialNo[nn::cfg::CTR::CFG_SECURE_INFO_SERIAL_NO_LEN] = '\0'; s_OperationMessage = &operationMessage; s_ReadFriendCode = readFriendCode; + s_IsWifiOn = isWifiOn; // デフォルトで上画面に描画するもの diff --git a/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.h b/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.h index db575fe..e103a66 100644 --- a/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.h +++ b/branches/1stNUP_for_2ndNUP/sources/common/DrawSystemState.h @@ -73,7 +73,8 @@ void DrawSystemState ::std::vector& operationMessage, nn::cfg::CTR::CfgRegionCode region, u8* s_SerialNo, - bool readFriendCode + bool readFriendCode, + bool isWifiOn ); } diff --git a/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.cpp b/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.cpp index 0f5fa76..6ad1ee7 100644 --- a/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.cpp @@ -73,4 +73,14 @@ void HardwareStateManager::GetVersionData(common::VerDef* version) return m_pUtil->GetVersionData(version); } +void HardwareStateManager::SetWifiOn() +{ + m_pUtil->SetWifiOn(); +} + +void HardwareStateManager::SetWifiOff() +{ + m_pUtil->SetWifiOff(); +} + } diff --git a/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.h b/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.h index 1483dff..d5c292f 100644 --- a/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.h +++ b/branches/1stNUP_for_2ndNUP/sources/common/HardwareStateManager.h @@ -38,6 +38,8 @@ public: nn::Handle GetMcuHandle(); void GetSerialNumber(u8** serial, size_t* size); void GetVersionData(common::VerDef* version); + void SetWifiOn(); + void SetWifiOff(); private: NN_PADDING4; diff --git a/branches/1stNUP_for_2ndNUP/sources/common/Util.cpp b/branches/1stNUP_for_2ndNUP/sources/common/Util.cpp index d46e743..0a3ba6f 100644 --- a/branches/1stNUP_for_2ndNUP/sources/common/Util.cpp +++ b/branches/1stNUP_for_2ndNUP/sources/common/Util.cpp @@ -1,4 +1,4 @@ -/*---------------------------------------------------------------------------* +/*---------------------------------------------------------------------------* Project: Horizon File: Util.cpp @@ -28,6 +28,9 @@ #include #include +#include +#include + #include "Util.h" #include "FileName.h" #include "CommonLogger.h" @@ -130,6 +133,9 @@ void Util::Initialize() // バージョンの取得 common::GetSystemVersion(&m_VerData, m_Region); + // nwmの初期化 + nn::nwm::InitializeExtControl(); + // MACアドレスの取得 nn::nwm::Mac mac; @@ -151,9 +157,28 @@ void Util::FinalizeForRestore() void Util::Finalize() { + nn::nwm::FinalizeExtControl(); nn::mcu::CTR::FinalizeHwCheck(&m_McuSession); } +void Util::SetWifiOn() +{ + COMMON_LOGGER_RESULT_IF_FAILED( + nn::nwm::Ext::SetWifiOn()); +} + +void Util::SetWifiOff() +{ + COMMON_LOGGER_RESULT_IF_FAILED( + nn::nwm::Ext::SetWifiOff()); +} + +// 無線状態を取得する +bool Util::IsWifiOn() +{ + return nn::nwm::IsWifiOn(); +} + // NULL終端されたシリアルナンバーを受け取る // NULL終端された場所にチェックデジットを付加して新たにNULL終端する void Util::AddCheckDigit(char* serial) diff --git a/branches/1stNUP_for_2ndNUP/sources/common/Util.h b/branches/1stNUP_for_2ndNUP/sources/common/Util.h index ebcf875..8e9329d 100644 --- a/branches/1stNUP_for_2ndNUP/sources/common/Util.h +++ b/branches/1stNUP_for_2ndNUP/sources/common/Util.h @@ -30,6 +30,7 @@ namespace common class Util { public: + Util(); virtual ~Util(); @@ -39,6 +40,15 @@ public: void FinalizeForBackup(); void FinalizeForRestore(); + // 無線状態をONにする + void SetWifiOn(); + + // 無線状態をOFFにする + void SetWifiOff(); + + // 無線状態を取得する + bool IsWifiOn(); + // シリアルナンバーにモジュラス10 ウェイト3・1（M10W31）でチェックデジットを付加する static void AddCheckDigit(char* serial);