From e2c7954be5ccabc7c5f87000db01cef040ca4b47 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Wed, 29 Jul 2015 11:54:44 -0300
Subject: Memory: Move address type conversion routines to memory.cpp/h

These helpers aren't really part of the kernel, and mem_map.cpp/h is
going to be moved there next.
---
 src/core/mem_map.h | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'src/core/mem_map.h')

diff --git a/src/core/mem_map.h b/src/core/mem_map.h
index 229ef82c5..cba8a0714 100644
--- a/src/core/mem_map.h
+++ b/src/core/mem_map.h
@@ -32,15 +32,4 @@ u32 MapBlock_Heap(u32 size, u32 operation, u32 permissions);
  */
 u32 MapBlock_HeapLinear(u32 size, u32 operation, u32 permissions);
 
-/**
- * Converts a virtual address inside a region with 1:1 mapping to physical memory to a physical
- * address. This should be used by services to translate addresses for use by the hardware.
- */
-PAddr VirtualToPhysicalAddress(VAddr addr);
-
-/**
- * Undoes a mapping performed by VirtualToPhysicalAddress().
- */
-VAddr PhysicalToVirtualAddress(PAddr addr);
-
 } // namespace
-- 
cgit v1.2.3


From 69c3021a8d203dbbea9673977535f1eb75b274a1 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Wed, 29 Jul 2015 12:08:00 -0300
Subject: Move core/mem_map.{cpp,h} => core/hle/kernel/memory.{cpp,h}

---
 src/core/mem_map.h | 35 -----------------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 src/core/mem_map.h

(limited to 'src/core/mem_map.h')

diff --git a/src/core/mem_map.h b/src/core/mem_map.h
deleted file mode 100644
index cba8a0714..000000000
--- a/src/core/mem_map.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "common/common_types.h"
-
-namespace Kernel {
-class VMManager;
-}
-
-namespace Memory {
-
-void Init();
-void InitLegacyAddressSpace(Kernel::VMManager& address_space);
-void Shutdown();
-
-/**
- * Maps a block of memory on the heap
- * @param size Size of block in bytes
- * @param operation Memory map operation type
- * @param permissions Memory allocation permissions
- */
-u32 MapBlock_Heap(u32 size, u32 operation, u32 permissions);
-
-/**
- * Maps a block of memory on the GSP heap
- * @param size Size of block in bytes
- * @param operation Memory map operation type
- * @param permissions Control memory permissions
- */
-u32 MapBlock_HeapLinear(u32 size, u32 operation, u32 permissions);
-
-} // namespace
-- 
cgit v1.2.3