RTCの表示を止める

cciのみビルドするように

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
This commit is contained in:
N2614 2011-05-26 04:38:44 +00:00
parent c67a4a8999
commit 80f6c3a8f7
10 changed files with 8 additions and 46 deletions

View File

@ -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();

View File

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

View File

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

View File

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

View File

@ -38,7 +38,6 @@ u8 s_BatteryRemain;
std::string s_AdapterState;
u8 s_Progress;
::std::vector<std::string>* 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<u32> (s_FriendCode / 10000ULL % 10000ULL),
static_cast<u32> (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<std::string>& 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;
// デフォルトで上画面に描画するもの

View File

@ -24,7 +24,6 @@
#include <nn/cfg/CTR/cfg_ApiInit.h>
#include <nn/cfg/CTR/cfg_ApiSys.h>
#include <nn/util/util_Color.h>
#include <nn/mcu.h>
#include <string>
#include <vector>
@ -72,8 +71,7 @@ void DrawSystemState
char8* macAddress,
::std::vector<std::string>& operationMessage,
nn::cfg::CTR::CfgRegionCode region,
u8* serialNo,
nn::mcu::CTR::RtcData rtc
u8* s_SerialNo
);
}

View File

@ -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();
}
}

View File

@ -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;

View File

@ -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;

View File

@ -84,9 +84,6 @@ public:
// バッテリ残量を0100で返す
u32 GetBatteryRemain();
// RTC生値を返す
nn::mcu::CTR::RtcData GetRtcAll();
// 64bitインフラデバイスIDを返す
u64 GetInfraDeviceId();