metta-systems
/
vesper
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Put memregions inside setup_paging

This commit is contained in:
Berkus Decker 2019-01-13 20:23:08 +02:00
parent ed9cbe5d4e
commit e75770a335
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/arch/aarch64/mod.rs
View File

@ -191,21 +191,6 @@ struct MemMapRegion {
impl MemMapRegion {}
static bcm2837_mem_map: [MemMapRegion; 2] = [
MemMapRegion {
virt: 0x00000000,
phys: 0x00000000,
size: 0x3f000000,
attr: MemType::NORMAL | MemType::INNER_SHARE,
},
MemMapRegion {
virt: 0x3f000000,
phys: 0x3f000000,
size: 0x01000000,
attr: MemType::DEVICE_NGNRNE | MemType::NON_SHARE | MemType::PXN | MemType::UXN,
},
];
fn setup_paging() {
// test if paging is enabled
// if so, loop here
@ -219,6 +204,21 @@ fn setup_paging() {
read_translation_control(),
read_mair(),
);
let bcm2837_mem_map: [MemMapRegion; 2] = [
MemMapRegion {
virt: 0x0000_0000,
phys: 0x0000_0000,
size: 0x3f00_0000,
attr: MemType::NORMAL | MemType::INNER_SHARE,
},
MemMapRegion {
virt: 0x3f00_0000,
phys: 0x3f00_0000,
size: 0x0100_0000,
attr: MemType::DEVICE_NGNRNE | MemType::NON_SHARE | MemType::PXN | MemType::UXN,
},
];
}
pub struct BcmHost;