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

1 files changed, 8 insertions, 8 deletions

diff --git a/cp_regs.h b/cp_regs.h
index 98a8bb8..2bc6c9f 100644
--- a/cp_regs.h
+++ b/cp_regs.h
@@ -98,14 +98,14 @@ typedef union
 
     // i'm not sure 'interprocess region bits' is the right name,
     // I'm just guessing (by analogy to RGN -> region bits)
-#define CACHEABLE_BIT                  C
-#define INTERPROCESS_REGION_BITS_1     IRGN_1
-#define SHAREABLE_BIT                  S
-#define IMPLEMENTATION_DEFINED_BIT     IMP
-#define REGION_BITS_1_0                RGN
-#define INTERPROCESS_REGION_BITS_0     IRGN_0
-#define NON_OUTER_SHAREABLE_BIT        NOS
-#define TRANSLATION_TABLE_BASE_ADDRESS Bits_31_14
+#define TTBR_CACHEABLE_BIT                  C
+#define TTBR_INTERPROCESS_REGION_BITS_1     IRGN_1
+#define TTBR_SHAREABLE_BIT                  S
+#define TTBR_IMPLEMENTATION_DEFINED_BIT     IMP
+#define TTBR_REGION_BITS_1_0                RGN
+#define TTBR_INTERPROCESS_REGION_BITS_0     IRGN_0
+#define TTBR_NON_OUTER_SHAREABLE_BIT        NOS
+#define TTBR_TRANSLATION_TABLE_BASE_ADDRESS Bits_31_14
   } fields;
 } TTBR_t;