DM: cache management

adafruit · Oct 24, 2018 · 50a308a · 50a308a
1 parent 1d43acb
commit 50a308a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Adafruit_QSPI.cpp b/Adafruit_QSPI.cpp
@@ -66,10 +66,10 @@ void Adafruit_QSPI::begin() {
     @param size the number of bytes to read.
 */
 /**************************************************************************/
-void Adafruit_QSPI::runInstruction(const QSPIInstr *instr, uint32_t addr, uint8_t *txData, uint8_t *rxData, uint32_t size)
+void Adafruit_QSPI::runInstruction(const QSPIInstr *instr, uint32_t addr, uint8_t *txData, uint8_t *rxData, uint32_t size, bool invalidateCache)
 {
 	bool needToEnableCache = false;
-	if(CMCC->SR.bit.CSTS){
+	if(invalidateCache && CMCC->SR.bit.CSTS){
 		// clear the cache
 		CMCC->CTRL.bit.CEN = 0; // disable
 		while(CMCC->SR.bit.CSTS);

diff --git a/Adafruit_QSPI.h b/Adafruit_QSPI.h
@@ -161,7 +161,7 @@ class Adafruit_QSPI
 	void end(); ///< de-init the peripheral
 
 	void runInstruction(const QSPIInstr *instr);
-	void runInstruction(const QSPIInstr *instr, uint32_t addr, uint8_t *txData, uint8_t *rxData, uint32_t size);
+	void runInstruction(const QSPIInstr *instr, uint32_t addr, uint8_t *txData, uint8_t *rxData, uint32_t size, bool invalidateCache=true);
 
 	void setMemoryMode(QSPIMode_t mode);
 	void setClockDivider(uint8_t uc_div);

diff --git a/Adafruit_QSPI_Generic.cpp b/Adafruit_QSPI_Generic.cpp
@@ -192,9 +192,9 @@ byte Adafruit_QSPI_Generic::read8(uint32_t addr)
     @returns true
 */
 /**************************************************************************/
-bool Adafruit_QSPI_Generic::readMemory(uint32_t addr, uint8_t *data, uint32_t size)
+bool Adafruit_QSPI_Generic::readMemory(uint32_t addr, uint8_t *data, uint32_t size, bool invalidateCache)
 {
-	QSPI0.runInstruction(&cmdSetGeneric[ADAFRUIT_QSPI_GENERIC_CMD_QUAD_READ], addr, NULL, data, size);
+	QSPI0.runInstruction(&cmdSetGeneric[ADAFRUIT_QSPI_GENERIC_CMD_QUAD_READ], addr, NULL, data, size, invalidateCache);
 	return true;
 }
 

diff --git a/Adafruit_QSPI_Generic.h b/Adafruit_QSPI_Generic.h
@@ -35,7 +35,7 @@ class Adafruit_QSPI_Generic : public Adafruit_SPIFlash {
 
 	byte read8(uint32_t addr);
 
-	bool readMemory(uint32_t addr, uint8_t *data, uint32_t size);
+	bool readMemory(uint32_t addr, uint8_t *data, uint32_t size, bool invalidateCache=true);
 	bool writeMemory(uint32_t addr, uint8_t *data, uint32_t size);
 
 	/******** SPI FLASH CLASS METHODS *************/