From 80f6c3a8f7a8f68018adbe525a5b51ba3324d32d Mon Sep 17 00:00:00 2001 From: N2614 Date: Thu, 26 May 2011 04:38:44 +0000 Subject: [PATCH] =?UTF-8?q?RTC=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=82=92?= =?UTF-8?q?=E6=AD=A2=E3=82=81=E3=82=8B=20cci=E3=81=AE=E3=81=BF=E3=83=93?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= 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@285 385bec56-5757-e545-9c3a-d8741f4650f1 --- .../sources/ConsoleBackup/ConsoleBackup.cpp | 3 +-- .../sources/ConsoleBackup/OMakefile | 5 +---- .../sources/ConsoleRestore/ConsoleRestore.cpp | 3 +-- .../sources/ConsoleRestore/OMakefile | 5 +---- .../sources/common/DrawSystemState.cpp | 18 +++--------------- .../sources/common/DrawSystemState.h | 4 +--- .../sources/common/HardwareStateManager.cpp | 5 ----- .../sources/common/HardwareStateManager.h | 1 - .../sources/common/Util.cpp | 7 ------- .../ConsoleDataMigration/sources/common/Util.h | 3 --- 10 files changed, 8 insertions(+), 46 deletions(-) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp index 0ec2d34..a7a0ef9 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/ConsoleBackup.cpp @@ -251,8 +251,7 @@ extern "C" void nnMain(void) s_HwUtility.GetMacAddress(), operationMessage, s_HwUtility.GetRegion(), - s_HwUtility.GetSerialNumber(), - s_HwUtility.GetRtcAll() + s_HwUtility.GetSerialNumber() ); renderSystem.SwapBuffers(); diff --git a/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile b/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile index 104b529..7bd1982 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile +++ b/trunk/ConsoleDataMigration/sources/ConsoleBackup/OMakefile @@ -14,10 +14,7 @@ # $Rev$ #---------------------------------------------------------------------------- SUPPORTED_TARGETS = CTR-T*.Process.MPCore.* -#MAKECSU = true -#INSTALL_SDK_TOOL = true -CTR_APPTYPE = BOTH -CTR_MAKE_DEVELOPMENT_IMAGE = true +CTR_APPTYPE = CARD TARGET_PROGRAM = ConsoleBackup diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp index 6d892c7..547019f 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/ConsoleRestore.cpp @@ -288,8 +288,7 @@ extern "C" void nnMain(void) s_HwUtility.GetMacAddress(), operationMessage, s_HwUtility.GetRegion(), - s_HwUtility.GetSerialNumber(), - s_HwUtility.GetRtcAll() + s_HwUtility.GetSerialNumber() ); if (GetRestoreMode() != RESTORE_MODE_RESTORE) diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile index 17ff132..4420d61 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/OMakefile @@ -14,10 +14,7 @@ # $Rev$ #---------------------------------------------------------------------------- SUPPORTED_TARGETS = CTR-T*.Process.MPCore.* -#MAKECSU = true -#INSTALL_SDK_TOOL = true -CTR_APPTYPE = BOTH -CTR_MAKE_DEVELOPMENT_IMAGE = true +CTR_APPTYPE = CARD TARGET_PROGRAM = ConsoleRestore diff --git a/trunk/ConsoleDataMigration/sources/common/DrawSystemState.cpp b/trunk/ConsoleDataMigration/sources/common/DrawSystemState.cpp index 4bc9f83..594b749 100644 --- a/trunk/ConsoleDataMigration/sources/common/DrawSystemState.cpp +++ b/trunk/ConsoleDataMigration/sources/common/DrawSystemState.cpp @@ -38,7 +38,6 @@ u8 s_BatteryRemain; std::string s_AdapterState; u8 s_Progress; ::std::vector* s_OperationMessage; -nn::mcu::CTR::RtcData s_Rtc; } @@ -65,15 +64,8 @@ void SetTextWriterCore() { GetTextWriter()->Print("\n"); - if(nn::cfg::CTR::GetRegionCodeA3(s_Region) != NULL) - { - GetTextWriter()->Printf("System Ver. %d.%d.%d-%d%c\n", s_CupMajor, s_CupMinor, s_CupMicro, s_NupMajor, - nn::cfg::CTR::GetRegionCodeA3(s_Region)[0]); - } - else - { - GetTextWriter()->Printf("System Ver. %d.%d.%d-%d\n", s_CupMajor, s_CupMinor, s_CupMicro, s_NupMajor); - } + GetTextWriter()->Printf("System Ver. %d.%d.%d-%d\n", s_CupMajor, s_CupMinor, s_CupMicro, s_NupMajor); + 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); GetTextWriter()->Printf("MAC Address %s\n", s_MacAddress); @@ -81,8 +73,6 @@ void SetTextWriterCore() / 100000000ULL % 10000ULL), static_cast (s_FriendCode / 10000ULL % 10000ULL), static_cast (s_FriendCode % 10000ULL)); - GetTextWriter()->Printf("Raw RTC 20%02d/%02d/%02d %02d:%02d:%02d\n", s_Rtc.m_Year, s_Rtc.m_Month, s_Rtc.m_Day, - s_Rtc.m_Hour, s_Rtc.m_Minute, s_Rtc.m_Second); GetTextWriter()->Printf("Battery %d%%\n", s_BatteryRemain); GetTextWriter()->Printf("AC Adaper %s\n", s_AdapterState.c_str()); GetTextWriter()->Printf("Progress %02d%%\n", s_Progress); @@ -118,8 +108,7 @@ void DrawSystemState char8* macAddress, ::std::vector& operationMessage, nn::cfg::CTR::CfgRegionCode region, - u8* serialNo, - nn::mcu::CTR::RtcData rtc + u8* serialNo ) { // パラメータ保存 @@ -137,7 +126,6 @@ void DrawSystemState std::memcpy(s_SerialNo, serialNo, sizeof(s_SerialNo)); s_SerialNo[nn::cfg::CTR::CFG_SECURE_INFO_SERIAL_NO_LEN] = '\0'; s_OperationMessage = &operationMessage; - s_Rtc = rtc; // デフォルトで上画面に描画するもの diff --git a/trunk/ConsoleDataMigration/sources/common/DrawSystemState.h b/trunk/ConsoleDataMigration/sources/common/DrawSystemState.h index 53d5791..8acab14 100644 --- a/trunk/ConsoleDataMigration/sources/common/DrawSystemState.h +++ b/trunk/ConsoleDataMigration/sources/common/DrawSystemState.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include @@ -72,8 +71,7 @@ void DrawSystemState char8* macAddress, ::std::vector& operationMessage, nn::cfg::CTR::CfgRegionCode region, - u8* serialNo, - nn::mcu::CTR::RtcData rtc + u8* s_SerialNo ); } diff --git a/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.cpp b/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.cpp index e6068f4..aa633ee 100644 --- a/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.cpp +++ b/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.cpp @@ -78,9 +78,4 @@ void HardwareStateManager::GetVersionData(common::VerDef* version) return m_pUtil->GetVersionData(version); } -nn::mcu::CTR::RtcData HardwareStateManager::GetRtcAll() -{ - return m_pUtil->GetRtcAll(); -} - } diff --git a/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.h b/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.h index faf8b73..65b6525 100644 --- a/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.h +++ b/trunk/ConsoleDataMigration/sources/common/HardwareStateManager.h @@ -40,7 +40,6 @@ public: nn::Handle GetMcuHandle(); void GetSerialNumber(u8** serial, size_t* size); void GetVersionData(common::VerDef* version); - nn::mcu::CTR::RtcData GetRtcAll(); private: NN_PADDING4; diff --git a/trunk/ConsoleDataMigration/sources/common/Util.cpp b/trunk/ConsoleDataMigration/sources/common/Util.cpp index 25893be..177d7d4 100644 --- a/trunk/ConsoleDataMigration/sources/common/Util.cpp +++ b/trunk/ConsoleDataMigration/sources/common/Util.cpp @@ -281,13 +281,6 @@ u32 Util::GetBatteryRemain() return remain; } -nn::mcu::CTR::RtcData Util::GetRtcAll() -{ - nn::mcu::CTR::RtcData data; - mp_Mcu->GetRtcAll(&data); - return data; -} - u64 Util::GetInfraDeviceId() { bit64 infraDeviceId; diff --git a/trunk/ConsoleDataMigration/sources/common/Util.h b/trunk/ConsoleDataMigration/sources/common/Util.h index 0a15cae..17151c0 100644 --- a/trunk/ConsoleDataMigration/sources/common/Util.h +++ b/trunk/ConsoleDataMigration/sources/common/Util.h @@ -84,9 +84,6 @@ public: // バッテリ残量を0～100で返す u32 GetBatteryRemain(); - // RTC生値を返す - nn::mcu::CTR::RtcData GetRtcAll(); - // 64bitインフラデバイスIDを返す u64 GetInfraDeviceId();