Revert "Expose the orphaned ICTR/ACTLR registers."

This reverts commit 196d496.

Author: adamgreig

src/peripheral/icb.rs

@@ -68,7 +68,7 @@
 //!
 //! - ARMv7-M Architecture Reference Manual (Issue E.b) - Chapter B3
 
-// TODO stand-alone register: STIR
+// TODO stand-alone registers: ICTR, ACTLR and STIR
 
 
 use core::marker::PhantomData;
@@ -86,7 +86,6 @@ pub mod fpb;
 // NOTE(target_arch) is for documentation purposes
 #[cfg(any(has_fpu, target_arch = "x86_64"))]
 pub mod fpu;
-pub mod icb;
 #[cfg(not(armv6m))]
 pub mod itm;
 pub mod mpu;
@@ -122,14 +121,7 @@ pub struct Peripherals {
     /// Floating Point Unit (only present on `thumbv7em-none-eabihf`)
     pub FPU: FPU,
 
-    /// Implementation Control Block.
-    ///
-    /// The name is from the v8-M spec, but the block existed in earlier
-    /// revisions, without a name.
-    pub ICB: ICB,
-
-    /// Instrumentation Trace Macrocell.
-    /// Not available on Armv6-M and Armv8-M Baseline.
+    /// Instrumentation Trace Macrocell (not present on Cortex-M0 variants)
     pub ITM: ITM,
 
     /// Memory Protection Unit
@@ -193,9 +185,6 @@ impl Peripherals {
             FPU: FPU {
                 _marker: PhantomData,
             },
-            ICB: ICB {
-                _marker: PhantomData,
-            },
             ITM: ITM {
                 _marker: PhantomData,
             },
@@ -375,42 +364,6 @@ impl ops::Deref for FPU {
     }
 }
 
-/// Implementation Control Block.
-///
-/// This block contains implementation-defined registers like `ictr` and
-/// `actlr`. It's called the "implementation control block" in the ARMv8-M
-/// standard, but earlier standards contained the registers, just without a
-/// name.
-pub struct ICB {
-    _marker: PhantomData<*const ()>,
-}
-
-unsafe impl Send for ICB {}
-
-impl ICB {
-    /// Returns a pointer to the register block
-    #[inline(always)]
-    pub fn ptr() -> *mut icb::RegisterBlock {
-        0xE000_E004 as *mut _
-    }
-}
-
-impl ops::Deref for ICB {
-    type Target = self::icb::RegisterBlock;
-
-    #[inline(always)]
-    fn deref(&self) -> &Self::Target {
-        unsafe { &*Self::ptr() }
-    }
-}
-
-impl ops::DerefMut for ICB {
-    #[inline(always)]
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        unsafe { &mut *Self::ptr() }
-    }
-}
-
 /// Instrumentation Trace Macrocell
 pub struct ITM {
     _marker: PhantomData<*const ()>,