diff options
| author | Fanming <[email protected]> | 2019-12-03 19:26:10 +0800 |
|---|---|---|
| committer | Fanming <[email protected]> | 2019-12-17 17:46:43 +0800 |
| commit | 7e9d54d87a23397c4c8634ddec3cf639f4e68a70 (patch) | |
| tree | 13063c949013c8427fc5f4f4af25086cec940f4a /components/drivers | |
| parent | 0dc7da688fa4d20745461b8835d3f6228fb90bf3 (diff) | |
[drivers/spi_flash_sfud] accept the error from spi read or write in spi_write_read function.
Diffstat (limited to 'components/drivers')
| -rw-r--r-- | components/drivers/spi/spi_flash_sfud.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/components/drivers/spi/spi_flash_sfud.c b/components/drivers/spi/spi_flash_sfud.c index 7fa7de6ad5..53270c1bf1 100644 --- a/components/drivers/spi/spi_flash_sfud.c +++ b/components/drivers/spi/spi_flash_sfud.c @@ -151,11 +151,11 @@ static sfud_err spi_write_read(const sfud_spi *spi, const uint8_t *write_buf, si if(rtt_dev->rt_spi_device->bus->mode & RT_SPI_BUS_MODE_QSPI) { qspi_dev = (struct rt_qspi_device *) (rtt_dev->rt_spi_device); if (write_size && read_size) { - if (rt_qspi_send_then_recv(qspi_dev, write_buf, write_size, read_buf, read_size) == 0) { + if (rt_qspi_send_then_recv(qspi_dev, write_buf, write_size, read_buf, read_size) <= 0) { result = SFUD_ERR_TIMEOUT; } } else if (write_size) { - if (rt_qspi_send(qspi_dev, write_buf, write_size) == 0) { + if (rt_qspi_send(qspi_dev, write_buf, write_size) <= 0) { result = SFUD_ERR_TIMEOUT; } } @@ -168,11 +168,11 @@ static sfud_err spi_write_read(const sfud_spi *spi, const uint8_t *write_buf, si result = SFUD_ERR_TIMEOUT; } } else if (write_size) { - if (rt_spi_send(rtt_dev->rt_spi_device, write_buf, write_size) == 0) { + if (rt_spi_send(rtt_dev->rt_spi_device, write_buf, write_size) <= 0) { result = SFUD_ERR_TIMEOUT; } } else { - if (rt_spi_recv(rtt_dev->rt_spi_device, read_buf, read_size) == 0) { + if (rt_spi_recv(rtt_dev->rt_spi_device, read_buf, read_size) <= 0) { result = SFUD_ERR_TIMEOUT; } } @@ -317,7 +317,7 @@ sfud_err sfud_spi_port_init(sfud_flash *flash) { } #ifdef RT_USING_DEVICE_OPS -const static struct rt_device_ops flash_device_ops = +const static struct rt_device_ops flash_device_ops = { RT_NULL, RT_NULL, @@ -729,6 +729,7 @@ static void sf(uint8_t argc, char **argv) { for (i = 0; i < size; i += write_size) { result = sfud_write(sfud_dev, addr + i, write_size, write_data); if (result != SFUD_SUCCESS) { + rt_kprintf("Writing %s failed, already wr for %lu bytes, write %d each time\n", sfud_dev->name, i, write_size); break; } } @@ -756,6 +757,7 @@ static void sf(uint8_t argc, char **argv) { } if (result != SFUD_SUCCESS) { + rt_kprintf("Read %s failed, already rd for %lu bytes, read %d each time\n", sfud_dev->name, i, read_size); break; } } |
