From 51dda8e8a5e3c0b43ca0c08d3afb852a2e24a26c Mon Sep 17 00:00:00 2001 From: georgemoralis Date: Mon, 30 Oct 2023 12:43:39 +0200 Subject: [PATCH] namespace update --- src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp | 2 +- src/Core/hle/libraries/libkernel/time_management.cpp | 2 +- src/Core/hle/libraries/libkernel/time_management.h | 2 +- src/Emulator/Host/controller.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp b/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp index 4df60c7e..035bb5bd 100644 --- a/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp +++ b/src/Core/PS4/HLE/Graphics/Objects/video_out_ctx.cpp @@ -121,7 +121,7 @@ bool FlipQueue::flip(u32 micros) { m_done_cond.notify_one(); request->cfg->m_flip_status.count++; - request->cfg->m_flip_status.processTime = Core::Libraries::sceKernelGetProcessTime(); + request->cfg->m_flip_status.processTime = Core::Libraries::LibKernel::sceKernelGetProcessTime(); request->cfg->m_flip_status.tsc = HLE::Libs::LibKernel::sceKernelReadTsc(); request->cfg->m_flip_status.submitTsc = request->submit_tsc; request->cfg->m_flip_status.flipArg = request->flip_arg; diff --git a/src/Core/hle/libraries/libkernel/time_management.cpp b/src/Core/hle/libraries/libkernel/time_management.cpp index a49b2a24..fa71e557 100644 --- a/src/Core/hle/libraries/libkernel/time_management.cpp +++ b/src/Core/hle/libraries/libkernel/time_management.cpp @@ -4,7 +4,7 @@ #include "emuTimer.h" -namespace Core::Libraries { +namespace Core::Libraries::LibKernel { u64 sceKernelGetProcessTime() { return static_cast(Emulator::emuTimer::getTimeMsec() * 1000.0); // return time in microseconds } diff --git a/src/Core/hle/libraries/libkernel/time_management.h b/src/Core/hle/libraries/libkernel/time_management.h index 12d87ca8..35d997fb 100644 --- a/src/Core/hle/libraries/libkernel/time_management.h +++ b/src/Core/hle/libraries/libkernel/time_management.h @@ -3,7 +3,7 @@ #include "types.h" #include "Core/PS4/Loader/SymbolsResolver.h" -namespace Core::Libraries { +namespace Core::Libraries::LibKernel { u64 sceKernelGetProcessTime(); void timeSymbolsRegister(SymbolsResolver* sym); diff --git a/src/Emulator/Host/controller.cpp b/src/Emulator/Host/controller.cpp index f0e00885..55373f14 100644 --- a/src/Emulator/Host/controller.cpp +++ b/src/Emulator/Host/controller.cpp @@ -40,7 +40,7 @@ void GameController::addState(const State& state) { void GameController::checKButton(int id, u32 button, bool isPressed) { std::scoped_lock lock{m_mutex}; auto state = getLastState(); - state.time = Core::Libraries::sceKernelGetProcessTime(); + state.time = Core::Libraries::LibKernel::sceKernelGetProcessTime(); if (isPressed) { state.buttonsState |= button; } else {