mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-12-28 06:06:55 +00:00
Move VAddr/PAddr typedefs to kernel.h
This commit is contained in:
parent
9a345de2bd
commit
b5ee4f9df9
|
@ -16,6 +16,11 @@
|
|||
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 {
|
||||
|
|
|
@ -7,12 +7,9 @@
|
|||
#include "common/common.h"
|
||||
#include "common/common_types.h"
|
||||
|
||||
namespace Memory {
|
||||
#include "core/hle/kernel/kernel.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 ARM11 virtual address space.
|
||||
typedef u32 PAddr; ///< Represents a pointer in the physical address space.
|
||||
namespace Memory {
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
@ -190,7 +187,3 @@ VAddr PhysicalToVirtualAddress(PAddr addr);
|
|||
PAddr VirtualToPhysicalAddress(VAddr addr);
|
||||
|
||||
} // namespace
|
||||
|
||||
// These are used often, so re-export then on the root namespace
|
||||
using Memory::VAddr;
|
||||
using Memory::PAddr;
|
||||
|
|
Loading…
Reference in a new issue