Merge pull request #580 from pu-cc/fix-spiflash-qen

trabucayre · web-flow · commit 26849d089bc6 · 2025-09-03T14:37:16.000+02:00
spiFlash: mask RDSR_WIP instead of RDSR_WEL while waiting for completion
diff --git a/src/spiFlash.cpp b/src/spiFlash.cpp
@@ -970,7 +970,7 @@ bool SPIFlash::set_quad_bit(bool set_quad)
 	_spi->spi_put(reg_wr, (uint8_t *)&reg_val, NULL, nb_wr_byte);
 
 	/* Wait for completion */
-	if (_spi->spi_wait(FLASH_RDSR, FLASH_RDSR_WEL, 0x00, 10000) != 0) {
+	if (_spi->spi_wait(FLASH_RDSR, FLASH_RDSR_WIP, 0x00, 10000) != 0) {
 		printError("SPIFlash Error: failed to disable write");
 		return false;
 	}

Original file line number	Diff line number	Diff line change
`@@ -970,7 +970,7 @@ bool SPIFlash::set_quad_bit(bool set_quad)`
`970`	`970`	`_spi->spi_put(reg_wr, (uint8_t *)&reg_val, NULL, nb_wr_byte);`
`971`	`971`
`972`	`972`	`/* Wait for completion */`
`973`		`- if (_spi->spi_wait(FLASH_RDSR, FLASH_RDSR_WEL, 0x00, 10000) != 0) {`
	`973`	`+ if (_spi->spi_wait(FLASH_RDSR, FLASH_RDSR_WIP, 0x00, 10000) != 0) {`
`974`	`974`	`printError("SPIFlash Error: failed to disable write");`
`975`	`975`	`return false;`
`976`	`976`	`}`