Update mod.rs

dstric-aqueduct · dstric-aqueduct · commit ea60249a2cce · 2022-12-13T08:23:08.000-05:00
remove const def of base registers
diff --git a/imxrt-hal/src/can/mod.rs b/imxrt-hal/src/can/mod.rs
@@ -117,9 +117,6 @@ pub struct CAN<M> {
     _mailbox_reader_index: u8,
 }
 
-const CAN1_ADDR: u32 = 0x401d0000;
-const CAN2_ADDR: u32 = 0x401d4000;
-
 #[derive(Debug)]
 pub struct MailboxData {
     pub frame: Frame,
@@ -245,10 +242,8 @@ where
     }
 
     pub fn base_address(&self) -> u32 {
-        match self.is_can1() {
-            true => CAN1_ADDR,
-            false => CAN2_ADDR,
-        }
+        let addr: *const ral::can::RegisterBlock = &*self.reg;
+        addr as u32
     }
 
     pub fn free(self) -> ral::can::Instance {

Original file line number	Diff line number	Diff line change
`@@ -117,9 +117,6 @@ pub struct CAN<M> {`
`117`	`117`	`_mailbox_reader_index: u8,`
`118`	`118`	`}`
`119`	`119`
`120`		`-const CAN1_ADDR: u32 = 0x401d0000;`
`121`		`-const CAN2_ADDR: u32 = 0x401d4000;`
`122`		`-`
`123`	`120`	`#[derive(Debug)]`
`124`	`121`	`pub struct MailboxData {`
`125`	`122`	`pub frame: Frame,`
`@@ -245,10 +242,8 @@ where`
`245`	`242`	`}`
`246`	`243`
`247`	`244`	`pub fn base_address(&self) -> u32 {`
`248`		`- match self.is_can1() {`
`249`		`- true => CAN1_ADDR,`
`250`		`- false => CAN2_ADDR,`
`251`		`- }`
	`245`	`+ let addr: const ral::can::RegisterBlock = &self.reg;`
	`246`	`+ addr as u32`
`252`	`247`	`}`
`253`	`248`
`254`	`249`	`pub fn free(self) -> ral::can::Instance {`