aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2022-08-25 14:16:16 +0200
committerGitHub <[email protected]>2022-08-25 14:16:16 +0200
commit193124bed171eb5dcf4a98502dd760e4faccdffa (patch)
tree1c9d7f529a517653332c7c0f987ae19a4d9b1046
parent63806022f3644687a98f3f562c83c02cb5ba5d71 (diff)
parent3826b4f7130366c92015f61566b4bb0783e0fee3 (diff)
Merge pull request #8 from danbev/test-ro-rw-constants
Rename REG_BUS_FEEDBEAD to REG_BUS_TEST_RO
-rw-r--r--src/lib.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib.rs b/src/lib.rs
index b8c003297..fe4d10ba2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -50,8 +50,8 @@ const REG_BUS_CTRL: u32 = 0x0;
50const REG_BUS_INTERRUPT: u32 = 0x04; // 16 bits - Interrupt status 50const REG_BUS_INTERRUPT: u32 = 0x04; // 16 bits - Interrupt status
51const REG_BUS_INTERRUPT_ENABLE: u32 = 0x06; // 16 bits - Interrupt mask 51const REG_BUS_INTERRUPT_ENABLE: u32 = 0x06; // 16 bits - Interrupt mask
52const REG_BUS_STATUS: u32 = 0x8; 52const REG_BUS_STATUS: u32 = 0x8;
53const REG_BUS_FEEDBEAD: u32 = 0x14; 53const REG_BUS_TEST_RO: u32 = 0x14;
54const REG_BUS_TEST: u32 = 0x18; 54const REG_BUS_TEST_RW: u32 = 0x18;
55const REG_BUS_RESP_DELAY: u32 = 0x1c; 55const REG_BUS_RESP_DELAY: u32 = 0x1c;
56 56
57// SPI_STATUS_REGISTER bits 57// SPI_STATUS_REGISTER bits
@@ -565,19 +565,19 @@ where
565 Timer::after(Duration::from_millis(250)).await; 565 Timer::after(Duration::from_millis(250)).await;
566 566
567 info!("waiting for ping..."); 567 info!("waiting for ping...");
568 while self.read32_swapped(REG_BUS_FEEDBEAD).await != FEEDBEAD {} 568 while self.read32_swapped(REG_BUS_TEST_RO).await != FEEDBEAD {}
569 info!("ping ok"); 569 info!("ping ok");
570 570
571 self.write32_swapped(0x18, TEST_PATTERN).await; 571 self.write32_swapped(REG_BUS_TEST_RW, TEST_PATTERN).await;
572 let val = self.read32_swapped(REG_BUS_TEST).await; 572 let val = self.read32_swapped(REG_BUS_TEST_RW).await;
573 assert_eq!(val, TEST_PATTERN); 573 assert_eq!(val, TEST_PATTERN);
574 574
575 // 32bit, little endian. 575 // 32bit, little endian.
576 self.write32_swapped(REG_BUS_CTRL, 0x00010031).await; 576 self.write32_swapped(REG_BUS_CTRL, 0x00010031).await;
577 577
578 let val = self.read32(FUNC_BUS, REG_BUS_FEEDBEAD).await; 578 let val = self.read32(FUNC_BUS, REG_BUS_TEST_RO).await;
579 assert_eq!(val, FEEDBEAD); 579 assert_eq!(val, FEEDBEAD);
580 let val = self.read32(FUNC_BUS, REG_BUS_TEST).await; 580 let val = self.read32(FUNC_BUS, REG_BUS_TEST_RW).await;
581 assert_eq!(val, TEST_PATTERN); 581 assert_eq!(val, TEST_PATTERN);
582 582
583 // No response delay in any of the funcs. 583 // No response delay in any of the funcs.