update for cortex-ar API update

zynq-mmu/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2024"
 
 [dependencies]
 thiserror = { version = "2", default-features = false }
-cortex-ar = { version = "0.2", path = "../../../Rust/cortex-ar/cortex-ar", optional = true }
+cortex-ar = { version = "0.2", path = "../../../Rust/cortex-ar/cortex-ar" }
 
 [features]
-default = ["cortex-ar"]
+tools = []

zynq-mmu/src/lib.rs

@@ -3,8 +3,8 @@
 #![no_std]
 
 use core::cell::UnsafeCell;
-
+use cortex_ar::mmu::L1Section;
-#[cfg(feature = "cortex-ar")]
+#[cfg(not(feature = "tools"))]
 use cortex_ar::{
     asm::{dsb, isb},
     cache::clean_and_invalidate_l1_data_cache,
@@ -23,20 +23,20 @@ pub struct AddrNotAlignedToOneMb;
 /// You can use [L1Table] to create a static global L1 table, which can be shared and updated
 /// without requiring a static mutable global.
 #[repr(C, align(16384))]
-pub struct L1TableRaw(pub [u32; NUM_L1_PAGE_TABLE_ENTRIES]);
+pub struct L1TableRaw(pub [L1Section; NUM_L1_PAGE_TABLE_ENTRIES]);
 
 impl L1TableRaw {
     #[inline(always)]
     pub const fn as_ptr(&self) -> *const u32 {
-        self.0.as_ptr()
+        self.0.as_ptr() as *const _
     }
 
     #[inline(always)]
     pub const fn as_mut_ptr(&mut self) -> *mut u32 {
-        self.0.as_mut_ptr()
+        self.0.as_mut_ptr() as *mut _
     }
 
-    #[cfg(feature = "cortex-ar")]
+    #[cfg(not(feature = "tools"))]
     pub fn update(
         &mut self,
         addr: u32,
@@ -46,7 +46,7 @@ impl L1TableRaw {
             return Err(AddrNotAlignedToOneMb);
         }
         let index = addr as usize / 0x10_0000;
-        self.0[index] = (self.0[index] & 0xFFF0_0000) | section_attrs.raw();
+        self.0[index].set_section_attrs(section_attrs);
 
         // The Zynq 7000 has a 32 kB 4-way associative cache with a line length of 32 bytes.
         // 4-way associative cache: A == 2
@@ -74,7 +74,7 @@ unsafe impl Sync for L1Table {}
 
 impl L1Table {
     #[inline]
-    pub const fn new(l1_table: [u32; NUM_L1_PAGE_TABLE_ENTRIES]) -> L1Table {
+    pub const fn new(l1_table: [L1Section; NUM_L1_PAGE_TABLE_ENTRIES]) -> L1Table {
         L1Table(UnsafeCell::new(L1TableRaw(l1_table)))
     }
 }
@@ -89,7 +89,7 @@ impl<'a> L1TableWrapper<'a> {
 }
 
 impl L1TableWrapper<'_> {
-    #[cfg(feature = "cortex-ar")]
+    #[cfg(not(feature = "tools"))]
     pub fn update(
         &mut self,
         addr: u32,

zynq7000-rt/Cargo.toml

@@ -15,11 +15,11 @@ cortex-a-rt = { version = "0.1", optional = true, features = ["vfp-dp"] }
 # cortex-ar = "0.2"
 cortex-ar = { version = "0.2", path = "../../../Rust/cortex-ar/cortex-ar" }
 arbitrary-int = "1.3"
-zynq-mmu = { path = "../zynq-mmu", version = "0.1.0", default-features = false }
+zynq-mmu = { path = "../zynq-mmu", version = "0.1.0" }
 
 [features]
-default = ["rt", "zynq-mmu/cortex-ar"]
+default = ["rt"]
-tools = []
+tools = ["zynq-mmu/tools"]
 rt = ["dep:cortex-a-rt"]
 
 [[bin]]

zynq7000-rt/src/bin/table-gen.rs

@@ -8,7 +8,7 @@ macro_rules! write_l1_section {
     ($writer:expr, $offset:expr, $attr:expr) => {
         writeln!(
             $writer,
-            "L1Section::new({:#010x}, {}).raw_value(),",
+            "L1Section::new_with_addr_and_attrs({:#010x}, {}),",
             $offset, $attr
         )
         .unwrap();