From 3826b4f7130366c92015f61566b4bb0783e0fee3 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Thu, 25 Aug 2022 05:43:38 +0200 Subject: [PATCH] Rename REG_BUS_FEEDBEAD to REG_BUS_TEST_RO This commit renames the REG_BUS_FEEDBEAD to REG_BUS_TEST_RO (Read-Only) which is the name used in the specification, section 4.2.3 Table 6. It also adds a constant named REG_BUS_TEST_RW (Read-Write) to represent the dummy register which the host can use to write data and read back to check that the gSPI interface is working properly. --- src/lib.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 1c49771b..e287ca12 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -50,8 +50,8 @@ const REG_BUS_CTRL: u32 = 0x0; const REG_BUS_INTERRUPT: u32 = 0x04; // 16 bits - Interrupt status const REG_BUS_INTERRUPT_ENABLE: u32 = 0x06; // 16 bits - Interrupt mask const REG_BUS_STATUS: u32 = 0x8; -const REG_BUS_FEEDBEAD: u32 = 0x14; -const REG_BUS_TEST: u32 = 0x18; +const REG_BUS_TEST_RO: u32 = 0x14; +const REG_BUS_TEST_RW: u32 = 0x18; const REG_BUS_RESP_DELAY: u32 = 0x1c; // SPI_STATUS_REGISTER bits @@ -563,19 +563,19 @@ where Timer::after(Duration::from_millis(250)).await; info!("waiting for ping..."); - while self.read32_swapped(REG_BUS_FEEDBEAD).await != FEEDBEAD {} + while self.read32_swapped(REG_BUS_TEST_RO).await != FEEDBEAD {} info!("ping ok"); - self.write32_swapped(0x18, TEST_PATTERN).await; - let val = self.read32_swapped(REG_BUS_TEST).await; + self.write32_swapped(REG_BUS_TEST_RW, TEST_PATTERN).await; + let val = self.read32_swapped(REG_BUS_TEST_RW).await; assert_eq!(val, TEST_PATTERN); // 32bit, little endian. self.write32_swapped(REG_BUS_CTRL, 0x00010031).await; - let val = self.read32(FUNC_BUS, REG_BUS_FEEDBEAD).await; + let val = self.read32(FUNC_BUS, REG_BUS_TEST_RO).await; assert_eq!(val, FEEDBEAD); - let val = self.read32(FUNC_BUS, REG_BUS_TEST).await; + let val = self.read32(FUNC_BUS, REG_BUS_TEST_RW).await; assert_eq!(val, TEST_PATTERN); // No response delay in any of the funcs.