Skip to content

Commit 23a0658

Browse files
jerome-pouillerjhedberg
authored andcommitted
wiseconnect: Get rid of PSRAM_RD_DUMMY_BITS
PSRAM_RD_DUMMY_BITS contains an hardware configuration parameter. This parameter belongs to the DT on the Zephyr side. Hence, it can't be defined with a macro. Fortunately, this symbol is redundant with ...spi_config_1.no_of_dummy_bytes. So, we can replace the macro by this field. Signed-off-by: Jérôme Pouiller <[email protected]>
1 parent d6563e9 commit 23a0658

File tree

1 file changed

+6
-6
lines changed
  • wiseconnect/components/device/silabs/si91x/mcu/drivers/unified_api/src

1 file changed

+6
-6
lines changed

wiseconnect/components/device/silabs/si91x/mcu/drivers/unified_api/src/sl_si91x_psram.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,10 +1385,10 @@ sl_psram_return_type_t sl_si91x_psram_manual_read_in_blocking_mode(uint32_t addr
13851385
addr,
13861386
PSRAM_Device.spi_config.spi_config_2.cs_no);
13871387

1388-
if ((PSRAM_Device.spi_config.spi_config_1.dummy_W_or_R == DUMMY_READS) && (PSRAM_RD_DUMMY_BITS > 0)) {
1388+
if ((PSRAM_Device.spi_config.spi_config_1.dummy_W_or_R == DUMMY_READS) && (PSRAM_Device.spi_config.spi_config_1.no_of_dummy_bytes > 0)) {
13891389

13901390
RSI_QSPI_WriteToFlash((qspi_reg_t *)M4_QSPI_2_BASE_ADDRESS,
1391-
(PSRAM_RD_DUMMY_BITS),
1391+
PSRAM_Device.spi_config.spi_config_1.no_of_dummy_bytes * 8,
13921392
0x00,
13931393
PSRAM_Device.spi_config.spi_config_2.cs_no);
13941394
}
@@ -1412,7 +1412,7 @@ sl_psram_return_type_t sl_si91x_psram_manual_read_in_blocking_mode(uint32_t addr
14121412
psramXferBuf[5] = 0x00;
14131413
psramXferBuf[6] = 0x00;
14141414

1415-
transmit_length += (PSRAM_RD_DUMMY_BITS / 8); // Dummy bits in this case are always multiple of 8
1415+
transmit_length += PSRAM_Device.spi_config.spi_config_1.no_of_dummy_bytes; // Dummy bits in this case are always multiple of 8
14161416

14171417
qspi_transmit((qspi_reg_t *)M4_QSPI_2_BASE_ADDRESS,
14181418
sizeof(uint8_t),
@@ -1906,10 +1906,10 @@ sl_psram_return_type_t sl_si91x_psram_manual_read_in_dma_mode(uint32_t addr,
19061906
PSRAM_Device.spi_config.spi_config_2.cs_no);
19071907
}
19081908

1909-
if ((PSRAM_Device.spi_config.spi_config_1.dummy_W_or_R == DUMMY_READS) && (PSRAM_RD_DUMMY_BITS > 0)) {
1909+
if ((PSRAM_Device.spi_config.spi_config_1.dummy_W_or_R == DUMMY_READS) && (PSRAM_Device.spi_config.spi_config_1.no_of_dummy_bytes > 0)) {
19101910

19111911
RSI_QSPI_WriteToFlash((qspi_reg_t *)M4_QSPI_2_BASE_ADDRESS,
1912-
(PSRAM_RD_DUMMY_BITS),
1912+
PSRAM_Device.spi_config.spi_config_1.no_of_dummy_bytes * 8,
19131913
0x00,
19141914
PSRAM_Device.spi_config.spi_config_2.cs_no);
19151915
}
@@ -1932,7 +1932,7 @@ sl_psram_return_type_t sl_si91x_psram_manual_read_in_dma_mode(uint32_t addr,
19321932
psramXferBuf[5] = 0x00;
19331933
psramXferBuf[6] = 0x00;
19341934

1935-
transmit_length += (PSRAM_RD_DUMMY_BITS / 8); // Dummy bits in this case are always multiple of 8
1935+
transmit_length += PSRAM_Device.spi_config.spi_config_1.no_of_dummy_bytes; // Dummy bits in this case are always multiple of 8
19361936

19371937
qspi_transmit((qspi_reg_t *)M4_QSPI_2_BASE_ADDRESS,
19381938
sizeof(uint8_t),

0 commit comments

Comments
 (0)