fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaning up kernel namespaces.

Browse Source
This commit is contained in:
Ben Vanik
2014-08-16 00:25:13 -07:00
parent bf48e9fbbd
commit c84fcc70a4
31 changed files with 76 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/xenia/kernel/xboxkrnl_memory.cc
View File

@@ -15,12 +15,6 @@
#include <xenia/kernel/util/shim_utils.h>
using namespace alloy;
using namespace xe;
using namespace xe::kernel;
using namespace xe::kernel::xboxkrnl;
namespace xe {
namespace kernel {
@@ -268,7 +262,7 @@ SHIM_CALL MmAllocatePhysicalMemoryEx_shim(
assert_true(max_addr_range == 0xFFFFFFFF);
// Allocate.
uint32_t flags = MEMORY_FLAG_PHYSICAL;
uint32_t flags = alloy::MEMORY_FLAG_PHYSICAL;
uint32_t base_address = (uint32_t)state->memory()->HeapAlloc(
0, adjusted_size, flags, adjusted_alignment);
if (!base_address) {
@@ -445,7 +439,7 @@ SHIM_CALL ExAllocatePoolTypeWithTag_shim(
}
uint32_t addr = (uint32_t)state->memory()->HeapAlloc(
0, adjusted_size, MEMORY_FLAG_ZERO, alignment);
0, adjusted_size, alloy::MEMORY_FLAG_ZERO, alignment);
SHIM_SET_RETURN_32(addr);
}