From c916bcf7b53bb7d0e909e7ec45b0740a09a661b6 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Wed, 6 May 2015 01:57:23 -0300 Subject: Move typedefs from kernel.h to more appropriate places --- src/core/hle/hle.h | 7 +++++++ src/core/hle/kernel/kernel.h | 11 +---------- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'src/core') diff --git a/src/core/hle/hle.h b/src/core/hle/hle.h index 23de1aab..e0b97797 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 ab06fa02..80a09cad 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -11,18 +11,9 @@ #include #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; -- cgit v1.2.3