From 6b7ebb3f82ae9674f2a4d66e870a53102b412003 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 21 Mar 2016 02:48:40 -0400 Subject: hle: Get rid of global access to g_reschedule This shouldn't be directly exposed if there's already a partial API that operates on it. We can just provide the rest of that API. --- src/core/hle/hle.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'src/core/hle/hle.cpp') diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp index 331b1b22a..3b1369800 100644 --- a/src/core/hle/hle.cpp +++ b/src/core/hle/hle.cpp @@ -14,9 +14,13 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -namespace HLE { +namespace { + +bool reschedule; ///< If true, immediately reschedules the CPU to a new thread -bool g_reschedule; ///< If true, immediately reschedules the CPU to a new thread +} + +namespace HLE { void Reschedule(const char *reason) { DEBUG_ASSERT_MSG(reason != nullptr && strlen(reason) < 256, "Reschedule: Invalid or too long reason."); @@ -29,13 +33,21 @@ void Reschedule(const char *reason) { Core::g_app_core->PrepareReschedule(); - g_reschedule = true; + reschedule = true; +} + +bool RescheduleIsPending() { + return reschedule; +} + +void DoneRescheduling() { + reschedule = false; } void Init() { Service::Init(); - g_reschedule = false; + reschedule = false; LOG_DEBUG(Kernel, "initialized OK"); } -- cgit v1.2.3 From 4cb2995c6159a5c6508ea0571ffa5fc5bcd21a47 Mon Sep 17 00:00:00 2001 From: bunnei Date: Thu, 5 May 2016 21:34:10 -0400 Subject: HLE: Rename RescheduleIsPending to IsReschedulePending. --- src/core/hle/hle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/hle/hle.cpp') diff --git a/src/core/hle/hle.cpp b/src/core/hle/hle.cpp index 3b1369800..96d3ec05b 100644 --- a/src/core/hle/hle.cpp +++ b/src/core/hle/hle.cpp @@ -36,7 +36,7 @@ void Reschedule(const char *reason) { reschedule = true; } -bool RescheduleIsPending() { +bool IsReschedulePending() { return reschedule; } -- cgit v1.2.3