diff options
| author |  Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 11:45:45 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 11:45:45 -0700 |
| commit | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (patch) | |
| tree | a180a736708834708e0e5b95fd1720f37722b429 /src/core/hle/kernel/kernel.h | |
| parent | 337f1e1b96445b81c40c313b1bf680fe660f14f5 (diff) | |
| parent | c956e8a6869d0ee1edd68a6ab880efa6bf1fbe70 (diff) | |
Merge pull request #721 from yuriks/more-cleanups
More cleanups
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index ab06fa02..a7bc6b71 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -10,18 +10,10 @@ #include <string> #include <vector> -#include "common/common.h" -#include "core/hle/result.h" - -typedef u32 Handle; -typedef s32 Result; +#include "common/common_types.h" -// 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; +#include "core/hle/hle.h" +#include "core/hle/result.h" namespace Kernel { |