diff options
author | Tony Wasserka <neobrainx@gmail.com> | 2015-01-30 15:00:17 +0100 |
---|---|---|
committer | Tony Wasserka <neobrainx@gmail.com> | 2015-01-30 15:00:17 +0100 |
commit | 28702cbfeb1fe21109f8b1efa189785594319b78 (patch) | |
tree | 64e4b1ec43b7699fe1a6ab1be1c688b6d63c0d75 /src/core/mem_map.h | |
parent | Merge pull request #412 from purpasmart96/svc_table_cleanup (diff) | |
parent | Kernel: Mark all appropriate kernel objects as "final" (diff) | |
download | yuzu-28702cbfeb1fe21109f8b1efa189785594319b78.tar yuzu-28702cbfeb1fe21109f8b1efa189785594319b78.tar.gz yuzu-28702cbfeb1fe21109f8b1efa189785594319b78.tar.bz2 yuzu-28702cbfeb1fe21109f8b1efa189785594319b78.tar.lz yuzu-28702cbfeb1fe21109f8b1efa189785594319b78.tar.xz yuzu-28702cbfeb1fe21109f8b1efa189785594319b78.tar.zst yuzu-28702cbfeb1fe21109f8b1efa189785594319b78.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/mem_map.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/core/mem_map.h b/src/core/mem_map.h index fad40ae0c..8f4f21fec 100644 --- a/src/core/mem_map.h +++ b/src/core/mem_map.h @@ -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; |