From ea8ef5a7f1ae31837cf49a3a1ee691c907d0a7df Mon Sep 17 00:00:00 2001 From: Andre Richter Date: Thu, 2 Dec 2021 23:36:52 +0100 Subject: [PATCH] More Readme fixes --- 14_virtual_mem_part2_mmio_remap/README.md | 2 +- 15_virtual_mem_part3_precomputed_tables/README.md | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/14_virtual_mem_part2_mmio_remap/README.md b/14_virtual_mem_part2_mmio_remap/README.md index cb87b91c..8fac022a 100644 --- a/14_virtual_mem_part2_mmio_remap/README.md +++ b/14_virtual_mem_part2_mmio_remap/README.md @@ -239,7 +239,7 @@ of a raw address. The following is an example for the `UART`: impl PL011Uart { /// Create an instance. pub const unsafe fn new( - phys_mmio_descriptor: memory::mmu::MMIODescriptor, + mmio_descriptor: memory::mmu::MMIODescriptor, irq_number: bsp::device_driver::IRQNumber, ) -> Self { Self { diff --git a/15_virtual_mem_part3_precomputed_tables/README.md b/15_virtual_mem_part3_precomputed_tables/README.md index 97188d49..f0067cda 100644 --- a/15_virtual_mem_part3_precomputed_tables/README.md +++ b/15_virtual_mem_part3_precomputed_tables/README.md @@ -528,9 +528,7 @@ pub unsafe extern "C" fn _start_rust( // Turn on the MMU for EL1. let addr = Address::new(phys_kernel_tables_base_addr as usize); - if unlikely(memory::mmu::enable_mmu_and_caching(addr).is_err()) { - cpu::wait_forever(); - } + memory::mmu::enable_mmu_and_caching(addr).unwrap(); // Use `eret` to "return" to EL1. This results in execution of kernel_init() in EL1. asm::eret()