diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-06 06:57:23 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 04:45:05 +0200 |
commit | c916bcf7b53bb7d0e909e7ec45b0740a09a661b6 (patch) | |
tree | 3369fdbae3bc36fb05d38c1da03a176905193db4 /src/core | |
parent | Common: Move NonCopyable to common_types.h (diff) | |
download | yuzu-c916bcf7b53bb7d0e909e7ec45b0740a09a661b6.tar yuzu-c916bcf7b53bb7d0e909e7ec45b0740a09a661b6.tar.gz yuzu-c916bcf7b53bb7d0e909e7ec45b0740a09a661b6.tar.bz2 yuzu-c916bcf7b53bb7d0e909e7ec45b0740a09a661b6.tar.lz yuzu-c916bcf7b53bb7d0e909e7ec45b0740a09a661b6.tar.xz yuzu-c916bcf7b53bb7d0e909e7ec45b0740a09a661b6.tar.zst yuzu-c916bcf7b53bb7d0e909e7ec45b0740a09a661b6.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/hle.h | 7 | ||||
-rw-r--r-- | src/core/hle/kernel/kernel.h | 11 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/core/hle/hle.h b/src/core/hle/hle.h index 23de1aab7..e0b97797c 100644 --- a/src/core/hle/hle.h +++ b/src/core/hle/hle.h @@ -4,6 +4,13 @@ #pragma once +#include "common/common_types.h" + +typedef u32 Handle; +typedef s32 Result; + +const Handle INVALID_HANDLE = 0; + namespace HLE { extern bool g_reschedule; ///< If true, immediately reschedules the CPU to a new thread diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index ab06fa025..80a09cadc 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -11,18 +11,9 @@ #include <vector> #include "common/common.h" +#include "core/hle/hle.h" #include "core/hle/result.h" -typedef u32 Handle; -typedef s32 Result; - -// TODO: It would be nice to eventually replace these with strong types that prevent accidental -// conversion between each other. -typedef u32 VAddr; ///< Represents a pointer in the userspace virtual address space. -typedef u32 PAddr; ///< Represents a pointer in the ARM11 physical address space. - -const Handle INVALID_HANDLE = 0; - namespace Kernel { class Thread; |