aboutsummaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorDamien George2018-03-09 17:32:28 +1100
committerDamien George2018-03-10 00:59:43 +1100
commita739b35a9618c2dd2d25c9ef4d076eeffddbb399 (patch)
tree5dc151563b57bf0973fc30fac9c84a945f4f3995 /ports
parent58ebeca6a9a172a35b9298a911d450722797c409 (diff)
drivers/memory/spiflash: Change to use low-level SPI object not uPy one.
This patch alters the SPI-flash memory driver so that it uses the new low-level C SPI protocol (from drivers/bus/spi.h) instead of the uPy SPI protocol (from extmod/machine_spi.h). This allows the SPI-flash driver to be used independently from the uPy runtime.
Diffstat (limited to 'ports')
-rw-r--r--ports/stm32/spibdev.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/ports/stm32/spibdev.c b/ports/stm32/spibdev.c
index 846b29d1f..0e47a8189 100644
--- a/ports/stm32/spibdev.c
+++ b/ports/stm32/spibdev.c
@@ -40,23 +40,20 @@ static uint32_t flash_tick_counter_last_write;
// External SPI flash uses standard SPI interface
-STATIC const mp_machine_soft_spi_obj_t spiflash_spi_bus = {
- .base = {&mp_machine_soft_spi_type},
- .spi = {
+STATIC const mp_soft_spi_obj_t soft_spi_bus = {
.delay_half = MICROPY_HW_SOFTSPI_MIN_DELAY,
.polarity = 0,
.phase = 0,
.sck = &MICROPY_HW_SPIFLASH_SCK,
.mosi = &MICROPY_HW_SPIFLASH_MOSI,
.miso = &MICROPY_HW_SPIFLASH_MISO,
- }
};
STATIC const mp_spiflash_config_t spiflash_config = {
.bus_kind = MP_SPIFLASH_BUS_SPI,
.bus.u_spi.cs = &MICROPY_HW_SPIFLASH_CS,
- .bus.u_spi.data = (void*)&spiflash_spi_bus,
- .bus.u_spi.proto = &mp_machine_soft_spi_p,
+ .bus.u_spi.data = (void*)&soft_spi_bus,
+ .bus.u_spi.proto = &mp_soft_spi_proto,
};
#elif defined(MICROPY_HW_SPIFLASH_IO0)