From c97369c241d7ae3f1247868627d664ef05492ec4 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 21 Apr 2025 07:42:26 +0200 Subject: [PATCH] spiFlash: only uses spi_put with distinct cmd parameter --- src/spiFlash.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/spiFlash.cpp b/src/spiFlash.cpp index 66fd2c8..3425978 100644 --- a/src/spiFlash.cpp +++ b/src/spiFlash.cpp @@ -129,14 +129,13 @@ int SPIFlash::sector_erase(int addr) uint8_t cmd = (addr <= 0xffffff) ? FLASH_SE : FLASH_4SE; - tx[len++] = cmd; if (cmd == FLASH_4SE) tx[len++] = static_cast(0xff & (addr >> 24)); tx[len++] = static_cast(0xff & (addr >> 16)); tx[len++] = static_cast(0xff & (addr >> 8)); tx[len++] = static_cast(0xff & (addr )); - _spi->spi_put(tx, NULL, len); + _spi->spi_put(cmd, tx, NULL, len); return 0; } @@ -148,14 +147,13 @@ int SPIFlash::block32_erase(int addr) uint8_t cmd = (addr <= 0xffffff) ? FLASH_BE32 : FLASH_4BE32; - tx[len++] = cmd; if (cmd == FLASH_4BE32) tx[len++] = static_cast(0xff & (addr >> 24)); tx[len++] = static_cast(0xff & (addr >> 16)); tx[len++] = static_cast(0xff & (addr >> 8)); tx[len++] = static_cast(0xff & (addr )); - _spi->spi_put(tx, NULL, len); + _spi->spi_put(cmd, tx, NULL, len); return 0; } @@ -168,14 +166,13 @@ int SPIFlash::block64_erase(int addr) uint8_t cmd = (addr <= 0xffffff) ? FLASH_BE64 : FLASH_4BE64; - tx[len++] = cmd; if (cmd == FLASH_4BE64) tx[len++] = static_cast(0xff & (addr >> 24)); tx[len++] = static_cast(0xff & (addr >> 16)); tx[len++] = static_cast(0xff & (addr >> 8)); tx[len++] = static_cast(0xff & (addr )); - _spi->spi_put(tx, NULL, len); + _spi->spi_put(cmd, tx, NULL, len); return 0; }