add ptr to registerblock as associated constant

This commit introduces new associated constants to Core Peripherals. (pointers to the register block) This commit also adds a notice that 'ptr()' APIs will be deprecated in v0.7.
rust-embedded · Jul 24, 2020 · 64dc07d · 64dc07d
1 parent 498f9cd
commit 64dc07d
Showing 1 changed file with 56 additions and 14 deletions.
diff --git a/src/peripheral/mod.rs b/src/peripheral/mod.rs
@@ -234,7 +234,10 @@ impl CBP {
         }
     }
 
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const CBP_PTR: *const self::cbp::RegisterBlock = 0xE000_EF50 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const self::cbp::RegisterBlock {
         0xE000_EF50 as *const _
@@ -259,7 +262,10 @@ pub struct CPUID {
 unsafe impl Send for CPUID {}
 
 impl CPUID {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const CPUID_PTR: *const self::cpuid::RegisterBlock = 0xE000_ED00 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const self::cpuid::RegisterBlock {
         0xE000_ED00 as *const _
@@ -283,7 +289,10 @@ pub struct DCB {
 unsafe impl Send for DCB {}
 
 impl DCB {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const DCB_PTR: *const dcb::RegisterBlock = 0xE000_EDF0 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const dcb::RegisterBlock {
         0xE000_EDF0 as *const _
@@ -307,7 +316,10 @@ pub struct DWT {
 unsafe impl Send for DWT {}
 
 impl DWT {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const DWT_PTR: *const dwt::RegisterBlock = 0xE000_1000 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const dwt::RegisterBlock {
         0xE000_1000 as *const _
@@ -332,7 +344,10 @@ unsafe impl Send for FPB {}
 
 #[cfg(not(armv6m))]
 impl FPB {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const FPB_PTR: *const fpb::RegisterBlock = 0xE000_2000 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const fpb::RegisterBlock {
         0xE000_2000 as *const _
@@ -358,7 +373,10 @@ unsafe impl Send for FPU {}
 
 #[cfg(any(has_fpu, target_arch = "x86_64"))]
 impl FPU {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const FPU_PTR: *const fpu::RegisterBlock = 0xE000_EF30 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const fpu::RegisterBlock {
         0xE000_EF30 as *const _
@@ -388,7 +406,10 @@ pub struct ICB {
 unsafe impl Send for ICB {}
 
 impl ICB {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const ICB_PTR: *mut icb::RegisterBlock = 0xE000_E004 as *mut _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *mut icb::RegisterBlock {
         0xE000_E004 as *mut _
@@ -420,7 +441,10 @@ unsafe impl Send for ITM {}
 
 #[cfg(all(not(armv6m), not(armv8m_base)))]
 impl ITM {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const ITM_PTR: *mut itm::RegisterBlock = 0xE000_0000 as *mut _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *mut itm::RegisterBlock {
         0xE000_0000 as *mut _
@@ -453,7 +477,10 @@ pub struct MPU {
 unsafe impl Send for MPU {}
 
 impl MPU {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const MPU_PTR: *const mpu::RegisterBlock = 0xE000_ED90 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const mpu::RegisterBlock {
         0xE000_ED90 as *const _
@@ -477,7 +504,10 @@ pub struct NVIC {
 unsafe impl Send for NVIC {}
 
 impl NVIC {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const NVIC_PTR: *const nvic::RegisterBlock = 0xE000_E100 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const nvic::RegisterBlock {
         0xE000_E100 as *const _
@@ -502,7 +532,10 @@ unsafe impl Send for SAU {}
 
 #[cfg(armv8m)]
 impl SAU {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const SAU_PTR: *const sau::RegisterBlock = 0xE000_EDD0 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const sau::RegisterBlock {
         0xE000_EDD0 as *const _
@@ -527,7 +560,10 @@ pub struct SCB {
 unsafe impl Send for SCB {}
 
 impl SCB {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const SCB_PTR: *const scb::RegisterBlock = 0xE000_ED04 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const scb::RegisterBlock {
         0xE000_ED04 as *const _
@@ -551,7 +587,10 @@ pub struct SYST {
 unsafe impl Send for SYST {}
 
 impl SYST {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const SYST_PTR: *const syst::RegisterBlock = 0xE000_E010 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const syst::RegisterBlock {
         0xE000_E010 as *const _
@@ -576,7 +615,10 @@ unsafe impl Send for TPIU {}
 
 #[cfg(not(armv6m))]
 impl TPIU {
-    /// Returns a pointer to the register block
+    /// Pointer to the register block
+    pub const TPIU_PTR: *const tpiu::RegisterBlock = 0xE004_0000 as *const _;
+
+    /// Returns a pointer to the register block (to be deprecated in 0.7)
     #[inline(always)]
     pub const fn ptr() -> *const tpiu::RegisterBlock {
         0xE004_0000 as *const _