From dc3c0827efdc184ecc4c5baecec834a0acfd3068 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Mon, 11 Nov 2019 01:16:40 +0100 Subject: represent page table descriptor as struct, fix #define conflicts between translation_table_descriptors.h and cp_regs.h, fix name of one #define'd field of section descriptors --- kernel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel.c') diff --git a/kernel.c b/kernel.c index 8d2fdef..765b770 100644 --- a/kernel.c +++ b/kernel.c @@ -96,7 +96,7 @@ void kernel_main(uint32_t r0, uint32_t r1, uint32_t atags) .SECTION_OR_SUPERSECTION_BIT = DESCRIBES_SECTION, .ACCESS_PERMISSIONS_2 = AP_2_0_MODEL_RW_PL1 >> 2, .ACCESS_PERMISSIONS_1_0 = AP_2_0_MODEL_RW_PL1 & 0b011, - .DESCRIPTOR_TYPE_2 = + .DESCRIPTOR_TYPE_1 = SHORT_DESCRIPTOR_SECTION_OR_SUPERSECTION >> 1, // rest of fields are 0s }; @@ -162,7 +162,7 @@ void kernel_main(uint32_t r0, uint32_t r1, uint32_t atags) // Now do stuff with TTBR0 TTBR_t TTBR0; TTBR0.raw = 0; - TTBR0.fields.TRANSLATION_TABLE_BASE_ADDRESS = + TTBR0.fields.TTBR_TRANSLATION_TABLE_BASE_ADDRESS = translation_table_base >> 14; // rest of TTBR0 remains 0s -- cgit v1.2.3