drivers/bus: Rename MP_SPI_ADDR_IS_32B to MICROPY_HW_SPI_ADDR_IS_32BIT.

dpgeorge · dpgeorge · commit 54f1694ab67f · 2022-06-02T14:30:51.000+10:00
And allow it to be configured externally, if needed.

Signed-off-by: Damien George &lt;damien@micropython.org&gt;
diff --git a/drivers/bus/qspi.h b/drivers/bus/qspi.h
@@ -28,7 +28,9 @@
 
 #include "py/mphal.h"
 
-#define MP_SPI_ADDR_IS_32B(addr) (addr & 0xff000000)
+#ifndef MICROPY_HW_SPI_ADDR_IS_32BIT
+#define MICROPY_HW_SPI_ADDR_IS_32BIT(addr) (addr & 0xff000000)
+#endif
 
 enum {
     MP_QSPI_IOCTL_INIT,
@@ -57,7 +59,7 @@ typedef struct _mp_soft_qspi_obj_t {
 extern const mp_qspi_proto_t mp_soft_qspi_proto;
 
 static inline uint8_t mp_spi_set_addr_buff(uint8_t *buf, uint32_t addr) {
-    if (MP_SPI_ADDR_IS_32B(addr)) {
+    if (MICROPY_HW_SPI_ADDR_IS_32BIT(addr)) {
         buf[0] = addr >> 24;
         buf[1] = addr >> 16;
         buf[2] = addr >> 8;
diff --git a/drivers/memory/spiflash.c b/drivers/memory/spiflash.c
@@ -123,9 +123,9 @@ STATIC void mp_spiflash_read_data(mp_spiflash_t *self, uint32_t addr, size_t len
     const mp_spiflash_config_t *c = self->config;
     uint8_t cmd;
     if (c->bus_kind == MP_SPIFLASH_BUS_SPI) {
-        cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_READ_32 : CMD_READ;
+        cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_READ_32 : CMD_READ;
     } else {
-        cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_C4READ_32 : CMD_C4READ;
+        cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_C4READ_32 : CMD_C4READ;
     }
     mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, len, NULL, dest);
 }
@@ -218,7 +218,7 @@ STATIC int mp_spiflash_erase_block_internal(mp_spiflash_t *self, uint32_t addr)
     }
 
     // erase the sector
-    uint8_t cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_SEC_ERASE_32 : CMD_SEC_ERASE;
+    uint8_t cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_SEC_ERASE_32 : CMD_SEC_ERASE;
     mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, 0, NULL, NULL);
 
     // wait WIP=0
@@ -236,7 +236,7 @@ STATIC int mp_spiflash_write_page(mp_spiflash_t *self, uint32_t addr, size_t len
     }
 
     // write the page
-    uint8_t cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_WRITE_32 : CMD_WRITE;
+    uint8_t cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_WRITE_32 : CMD_WRITE;
     mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, len, src, NULL);
 
     // wait WIP=0
diff --git a/ports/stm32/qspi.c b/ports/stm32/qspi.c
@@ -246,7 +246,7 @@ STATIC void qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, uint32_t
 STATIC void qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t addr, size_t len, const uint8_t *src) {
     (void)self_in;
 
-    uint8_t adsize = MP_SPI_ADDR_IS_32B(addr) ? 3 : 2;
+    uint8_t adsize = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 3 : 2;
 
     QUADSPI->FCR = QUADSPI_FCR_CTCF; // clear TC flag
 
@@ -331,7 +331,7 @@ STATIC uint32_t qspi_read_cmd(void *self_in, uint8_t cmd, size_t len) {
 STATIC void qspi_read_cmd_qaddr_qdata(void *self_in, uint8_t cmd, uint32_t addr, size_t len, uint8_t *dest) {
     (void)self_in;
 
-    uint8_t adsize = MP_SPI_ADDR_IS_32B(addr) ? 3 : 2;
+    uint8_t adsize = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? 3 : 2;
 
     QUADSPI->FCR = QUADSPI_FCR_CTCF; // clear TC flag
 

Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,9 @@ STATIC void mp_spiflash_read_data(mp_spiflash_t *self, uint32_t addr, size_t len`
`123`	`123`	`const mp_spiflash_config_t *c = self->config;`
`124`	`124`	`uint8_t cmd;`
`125`	`125`	`if (c->bus_kind == MP_SPIFLASH_BUS_SPI) {`
`126`		`- cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_READ_32 : CMD_READ;`
	`126`	`+ cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_READ_32 : CMD_READ;`
`127`	`127`	`} else {`
`128`		`- cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_C4READ_32 : CMD_C4READ;`
	`128`	`+ cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_C4READ_32 : CMD_C4READ;`
`129`	`129`	`}`
`130`	`130`	`mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, len, NULL, dest);`
`131`	`131`	`}`
`@@ -218,7 +218,7 @@ STATIC int mp_spiflash_erase_block_internal(mp_spiflash_t *self, uint32_t addr)`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`// erase the sector`
`221`		`- uint8_t cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_SEC_ERASE_32 : CMD_SEC_ERASE;`
	`221`	`+ uint8_t cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_SEC_ERASE_32 : CMD_SEC_ERASE;`
`222`	`222`	`mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, 0, NULL, NULL);`
`223`	`223`
`224`	`224`	`// wait WIP=0`
`@@ -236,7 +236,7 @@ STATIC int mp_spiflash_write_page(mp_spiflash_t *self, uint32_t addr, size_t len`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`// write the page`
`239`		`- uint8_t cmd = MP_SPI_ADDR_IS_32B(addr) ? CMD_WRITE_32 : CMD_WRITE;`
	`239`	`+ uint8_t cmd = MICROPY_HW_SPI_ADDR_IS_32BIT(addr) ? CMD_WRITE_32 : CMD_WRITE;`
`240`	`240`	`mp_spiflash_transfer_cmd_addr_data(self, cmd, addr, len, src, NULL);`
`241`	`241`
`242`	`242`	`// wait WIP=0`