Update is_debugger_attached so as not to clear S_RESET_ST and S_RETIRE_ST

1 files changed, 14 insertions, 8 deletions

diff --git a/src/peripheral/dcb.rs b/src/peripheral/dcb.rs
index 1d5680e..e12542c 100644
--- a/src/peripheral/dcb.rs
+++ b/src/peripheral/dcb.rs
@@ -2,6 +2,7 @@
 
 use volatile_register::{RW, WO};
 
+use core::ptr;
 use peripheral::DCB;
 
 const DCB_DEMCR_TRCENA: u32 = 1 << 24;
@@ -26,26 +27,31 @@ impl DCB {
     /// soft-reset, only on power reset.
     pub fn enable_trace(&mut self) {
         // set bit 24 / TRCENA
-        unsafe { self.demcr.modify(|w| w | DCB_DEMCR_TRCENA); }
+        unsafe {
+            self.demcr.modify(|w| w | DCB_DEMCR_TRCENA);
+        }
     }
 
     /// Disables TRACE. See `DCB::enable_trace()` for more details
     pub fn disable_trace(&mut self) {
         // unset bit 24 / TRCENA
-        unsafe { self.demcr.modify(|w| w & !DCB_DEMCR_TRCENA); }
+        unsafe {
+            self.demcr.modify(|w| w & !DCB_DEMCR_TRCENA);
+        }
     }
 
-    /// Is there a debugger attached? (see notes)
+    /// Is there a debugger attached? (see note)
     ///
-    /// Note 1: This function is [reported not to
+    /// Note: This function is [reported not to
     /// work](http://web.archive.org/web/20180821191012/https://community.nxp.com/thread/424925#comment-782843)
     /// on Cortex-M0 devices. Per the ARM v6-M Architecture Reference Manual, "Access to the DHCSR
     /// from software running on the processor is IMPLEMENTATION DEFINED". Indeed, from the
     /// [Cortex-M0+ r0p1 Technical Reference Manual](http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0484c/BABJHEIG.html), "Note Software cannot access the debug registers."
-    ///
-    /// Note 2: This function reads the DHCSR register, and therefore clears S_RESET_ST and
-    /// S_RETIRE_ST.
     pub fn is_debugger_attached() -> bool {
-        unsafe { (*Self::ptr()).dhcsr.read() & 0x1 == 1 }
+        unsafe {
+            // do an 8-bit read of the 32-bit DHCSR register, and get the LSB
+            let value = ptr::read_volatile(Self::ptr() as *const u8);
+            value & 0x1 == 1
+        }
     }
 }