summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorLiam <byteslice@airmail.cc>2022-12-17 20:34:03 +0100
committerLiam <byteslice@airmail.cc>2022-12-17 22:26:24 +0100
commitd3123079e887710580b622b444a642ae298ddec0 (patch)
tree2bad10cc78ddb74f851a572dc69704154ea63b69 /src/core
parentMerge pull request #7450 from FernandoS27/ndc-vulkan (diff)
downloadyuzu-d3123079e887710580b622b444a642ae298ddec0.tar
yuzu-d3123079e887710580b622b444a642ae298ddec0.tar.gz
yuzu-d3123079e887710580b622b444a642ae298ddec0.tar.bz2
yuzu-d3123079e887710580b622b444a642ae298ddec0.tar.lz
yuzu-d3123079e887710580b622b444a642ae298ddec0.tar.xz
yuzu-d3123079e887710580b622b444a642ae298ddec0.tar.zst
yuzu-d3123079e887710580b622b444a642ae298ddec0.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/core.cpp18
-rw-r--r--src/core/core.h4
2 files changed, 8 insertions, 14 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index a738f221f..47292cd78 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -183,26 +183,20 @@ struct System::Impl {
Initialize(system);
}
- SystemResultStatus Run() {
+ void Run() {
std::unique_lock<std::mutex> lk(suspend_guard);
- status = SystemResultStatus::Success;
kernel.Suspend(false);
core_timing.SyncPause(false);
is_paused.store(false, std::memory_order_relaxed);
-
- return status;
}
- SystemResultStatus Pause() {
+ void Pause() {
std::unique_lock<std::mutex> lk(suspend_guard);
- status = SystemResultStatus::Success;
core_timing.SyncPause(true);
kernel.Suspend(true);
is_paused.store(true, std::memory_order_relaxed);
-
- return status;
}
bool IsPaused() const {
@@ -553,12 +547,12 @@ void System::Initialize() {
impl->Initialize(*this);
}
-SystemResultStatus System::Run() {
- return impl->Run();
+void System::Run() {
+ impl->Run();
}
-SystemResultStatus System::Pause() {
- return impl->Pause();
+void System::Pause() {
+ impl->Pause();
}
bool System::IsPaused() const {
diff --git a/src/core/core.h b/src/core/core.h
index 4ebedffd9..fb5cda2f5 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -152,13 +152,13 @@ public:
* Run the OS and Application
* This function will start emulation and run the relevant devices
*/
- [[nodiscard]] SystemResultStatus Run();
+ void Run();
/**
* Pause the OS and Application
* This function will pause emulation and stop the relevant devices
*/
- [[nodiscard]] SystemResultStatus Pause();
+ void Pause();
/// Check if the core is currently paused.
[[nodiscard]] bool IsPaused() const;