refactor(port_arm): rename CSSIDR to CCSIDR

That's the actual name of the register.

Author: yvt

src/constance_port_arm/src/arm.rs

@@ -42,9 +42,9 @@ macro_rules! sys_coproc_write_raw {
 }
 
 mod bpiall;
+mod ccsidr;
 mod clidr;
 mod csselr;
-mod cssidr;
 mod dacr;
 mod dcisw;
 mod iciallu;
@@ -53,9 +53,9 @@ mod tlbiall;
 mod ttbcr;
 mod ttbr0;
 pub use self::bpiall::*;
+pub use self::ccsidr::*;
 pub use self::clidr::*;
 pub use self::csselr::*;
-pub use self::cssidr::*;
 pub use self::dacr::*;
 pub use self::dcisw::*;
 pub use self::iciallu::*;

src/constance_port_arm/src/arm/cssidr.rs renamed to src/constance_port_arm/src/arm/ccsidr.rs

@@ -1,5 +1,5 @@
 register::register_bitfields! {u32,
-    pub CSSIDR [
+    pub CCSIDR [
         /// (Log2(Number of words in cache line)) -2.
         LineSize OFFSET(0) NUMBITS(3) [],
         /// (Associativity of cache) - 1
@@ -10,9 +10,9 @@ register::register_bitfields! {u32,
 }
 
 /// Cache Level ID Register
-pub const CSSIDR: CSSIDRAccessor = CSSIDRAccessor;
-pub struct CSSIDRAccessor;
+pub const CCSIDR: CCSIDRAccessor = CCSIDRAccessor;
+pub struct CCSIDRAccessor;
 
-impl register::cpu::RegisterReadOnly<u32, CSSIDR::Register> for CSSIDRAccessor {
+impl register::cpu::RegisterReadOnly<u32, CCSIDR::Register> for CCSIDRAccessor {
     sys_coproc_read_raw!(u32, [p15, c0, 1, c0, 0]);
 }

src/constance_port_arm/src/startup/imp.rs

@@ -101,10 +101,10 @@ extern "C" fn reset_handler1<System: EntryPoint + StartupOptions>() {
             arm::CSSELR.set(level_and_d);
             unsafe { llvm_asm!("isb") };
 
-            let cssidr = arm::CSSIDR.extract();
-            let log2_line_size = cssidr.read(arm::CSSIDR::LineSize) + 2;
-            let max_way_index = cssidr.read(arm::CSSIDR::Associativity);
-            let max_set_index = cssidr.read(arm::CSSIDR::NumSets);
+            let cssidr = arm::CCSIDR.extract();
+            let log2_line_size = cssidr.read(arm::CCSIDR::LineSize) + 2;
+            let max_way_index = cssidr.read(arm::CCSIDR::Associativity);
+            let max_set_index = cssidr.read(arm::CCSIDR::NumSets);
 
             let way_offset = max_way_index.leading_zeros();