From db256c69a4bbe9b7687608bcde8386352c6a4a3c Mon Sep 17 00:00:00 2001 From: NarcolepticK Date: Fri, 22 Jun 2018 03:47:18 -0400 Subject: [PATCH] service/ptm: Migrate logging macros --- src/core/hle/service/ptm/ptm.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/core/hle/service/ptm/ptm.cpp b/src/core/hle/service/ptm/ptm.cpp index b361c3ec7a..5e31fa9c35 100644 --- a/src/core/hle/service/ptm/ptm.cpp +++ b/src/core/hle/service/ptm/ptm.cpp @@ -31,7 +31,7 @@ void Module::Interface::GetAdapterState(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); rb.Push(ptm->battery_is_charging); - LOG_WARNING(Service_PTM, "(STUBBED) called"); + NGLOG_WARNING(Service_PTM, "(STUBBED) called"); } void Module::Interface::GetShellState(Kernel::HLERequestContext& ctx) { @@ -49,7 +49,7 @@ void Module::Interface::GetBatteryLevel(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); rb.Push(static_cast(ChargeLevels::CompletelyFull)); // Set to a completely full battery - LOG_WARNING(Service_PTM, "(STUBBED) called"); + NGLOG_WARNING(Service_PTM, "(STUBBED) called"); } void Module::Interface::GetBatteryChargeState(Kernel::HLERequestContext& ctx) { @@ -59,7 +59,7 @@ void Module::Interface::GetBatteryChargeState(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); rb.Push(ptm->battery_is_charging); - LOG_WARNING(Service_PTM, "(STUBBED) called"); + NGLOG_WARNING(Service_PTM, "(STUBBED) called"); } void Module::Interface::GetPedometerState(Kernel::HLERequestContext& ctx) { @@ -69,7 +69,7 @@ void Module::Interface::GetPedometerState(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); rb.Push(ptm->pedometer_is_counting); - LOG_WARNING(Service_PTM, "(STUBBED) called"); + NGLOG_WARNING(Service_PTM, "(STUBBED) called"); } void Module::Interface::GetStepHistory(Kernel::HLERequestContext& ctx) { @@ -92,8 +92,8 @@ void Module::Interface::GetStepHistory(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); rb.PushMappedBuffer(buffer); - LOG_WARNING(Service_PTM, "(STUBBED) called, from time(raw): 0x%" PRIx64 ", for %u hours", - start_time, hours); + NGLOG_WARNING(Service_PTM, "(STUBBED) called, from time(raw): 0x{:x}, for {} hours", start_time, + hours); } void Module::Interface::GetTotalStepCount(Kernel::HLERequestContext& ctx) { @@ -103,7 +103,7 @@ void Module::Interface::GetTotalStepCount(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); rb.Push(0); - LOG_WARNING(Service_PTM, "(STUBBED) called"); + NGLOG_WARNING(Service_PTM, "(STUBBED) called"); } void Module::Interface::GetSoftwareClosedFlag(Kernel::HLERequestContext& ctx) { @@ -113,21 +113,23 @@ void Module::Interface::GetSoftwareClosedFlag(Kernel::HLERequestContext& ctx) { rb.Push(RESULT_SUCCESS); rb.Push(false); - LOG_WARNING(Service_PTM, "(STUBBED) called"); + NGLOG_WARNING(Service_PTM, "(STUBBED) called"); } void CheckNew3DS(IPC::RequestBuilder& rb) { const bool is_new_3ds = Settings::values.is_new_3ds; if (is_new_3ds) { - LOG_CRITICAL(Service_PTM, "The option 'is_new_3ds' is enabled as part of the 'System' " - "settings. Citra does not fully support New 3DS emulation yet!"); + NGLOG_CRITICAL(Service_PTM, + "The option 'is_new_3ds' is enabled as part of the 'System' " + "settings. Citra does not fully support New 3DS emulation yet!"); } rb.Push(RESULT_SUCCESS); rb.Push(is_new_3ds); - LOG_WARNING(Service_PTM, "(STUBBED) called isNew3DS = 0x%08x", static_cast(is_new_3ds)); + NGLOG_WARNING(Service_PTM, "(STUBBED) called isNew3DS = 0x{:08x}", + static_cast(is_new_3ds)); } void Module::Interface::CheckNew3DS(Kernel::HLERequestContext& ctx) {