Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Kernel: move memory_regions into Kernel instance

Browse source
This commit is contained in:
Weiyi Wang 2018-10-25 21:07:15 -04:00
parent 263290d48c
commit ece96807c4
7 changed files with 21 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/hle/kernel/kernel.h
View file

@ -4,12 +4,14 @@
#pragma once
#include <array>
#include <atomic>
#include <memory>
#include <string>
#include <vector>
#include <boost/smart_ptr/intrusive_ptr.hpp>
#include "common/common_types.h"
#include "core/hle/kernel/memory.h"
#include "core/hle/result.h"
namespace ConfigMem {
@ -209,6 +211,10 @@ public:
SharedPage::Handler& GetSharedPageHandler();
const SharedPage::Handler& GetSharedPageHandler() const;
MemoryRegionInfo* GetMemoryRegion(MemoryRegion region);
std::array<MemoryRegionInfo, 3> memory_regions;
private:
void MemoryInit(u32 mem_type);