midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3868 from NarcolepticK/ptm-migrate-logging

Browse Source 
service/ptm: Migrate logging macros
This commit is contained in:
Weiyi Wang 2018-06-22 13:33:46 +03:00 committed by GitHub
commit 53ad300144
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/hle/service/ptm/ptm.cpp
View File

@ -31,7 +31,7 @@ void Module::Interface::GetAdapterState(Kernel::HLERequestContext& ctx) {
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.Push(ptm->battery_is_charging); 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) { void Module::Interface::GetShellState(Kernel::HLERequestContext& ctx) {
@ -49,7 +49,7 @@ void Module::Interface::GetBatteryLevel(Kernel::HLERequestContext& ctx) {
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.Push(static_cast<u32>(ChargeLevels::CompletelyFull)); // Set to a completely full battery rb.Push(static_cast<u32>(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) { void Module::Interface::GetBatteryChargeState(Kernel::HLERequestContext& ctx) {
@ -59,7 +59,7 @@ void Module::Interface::GetBatteryChargeState(Kernel::HLERequestContext& ctx) {
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.Push(ptm->battery_is_charging); 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) { void Module::Interface::GetPedometerState(Kernel::HLERequestContext& ctx) {
@ -69,7 +69,7 @@ void Module::Interface::GetPedometerState(Kernel::HLERequestContext& ctx) {
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.Push(ptm->pedometer_is_counting); 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) { void Module::Interface::GetStepHistory(Kernel::HLERequestContext& ctx) {
@ -92,8 +92,8 @@ void Module::Interface::GetStepHistory(Kernel::HLERequestContext& ctx) {
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.PushMappedBuffer(buffer); rb.PushMappedBuffer(buffer);
LOG_WARNING(Service_PTM, "(STUBBED) called, from time(raw): 0x%" PRIx64 ", for %u hours", NGLOG_WARNING(Service_PTM, "(STUBBED) called, from time(raw): 0x{:x}, for {} hours", start_time,
start_time, hours); hours);
} }
void Module::Interface::GetTotalStepCount(Kernel::HLERequestContext& ctx) { void Module::Interface::GetTotalStepCount(Kernel::HLERequestContext& ctx) {
@ -103,7 +103,7 @@ void Module::Interface::GetTotalStepCount(Kernel::HLERequestContext& ctx) {
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.Push<u32>(0); rb.Push<u32>(0);
LOG_WARNING(Service_PTM, "(STUBBED) called"); NGLOG_WARNING(Service_PTM, "(STUBBED) called");
} }
void Module::Interface::GetSoftwareClosedFlag(Kernel::HLERequestContext& ctx) { void Module::Interface::GetSoftwareClosedFlag(Kernel::HLERequestContext& ctx) {
@ -113,21 +113,23 @@ void Module::Interface::GetSoftwareClosedFlag(Kernel::HLERequestContext& ctx) {
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.Push(false); rb.Push(false);
LOG_WARNING(Service_PTM, "(STUBBED) called"); NGLOG_WARNING(Service_PTM, "(STUBBED) called");
} }
void CheckNew3DS(IPC::RequestBuilder& rb) { void CheckNew3DS(IPC::RequestBuilder& rb) {
const bool is_new_3ds = Settings::values.is_new_3ds; const bool is_new_3ds = Settings::values.is_new_3ds;
if (is_new_3ds) { if (is_new_3ds) {
LOG_CRITICAL(Service_PTM, "The option 'is_new_3ds' is enabled as part of the 'System' " NGLOG_CRITICAL(Service_PTM,
"settings. Citra does not fully support New 3DS emulation yet!"); "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(RESULT_SUCCESS);
rb.Push(is_new_3ds); rb.Push(is_new_3ds);
LOG_WARNING(Service_PTM, "(STUBBED) called isNew3DS = 0x%08x", static_cast<u32>(is_new_3ds)); NGLOG_WARNING(Service_PTM, "(STUBBED) called isNew3DS = 0x{:08x}",
static_cast<u32>(is_new_3ds));
} }
void Module::Interface::CheckNew3DS(Kernel::HLERequestContext& ctx) { void Module::Interface::CheckNew3DS(Kernel::HLERequestContext& ctx) {