diff options
Diffstat (limited to 'src/drivers')
-rw-r--r-- | src/drivers/Spi.cpp | 2 | ||||
-rw-r--r-- | src/drivers/Spi.h | 2 | ||||
-rw-r--r-- | src/drivers/SpiMaster.cpp | 2 | ||||
-rw-r--r-- | src/drivers/SpiMaster.h | 2 | ||||
-rw-r--r-- | src/drivers/SpiNorFlash.cpp | 4 | ||||
-rw-r--r-- | src/drivers/SpiNorFlash.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/drivers/Spi.cpp b/src/drivers/Spi.cpp index ec3a5e94..bf08178d 100644 --- a/src/drivers/Spi.cpp +++ b/src/drivers/Spi.cpp @@ -27,7 +27,7 @@ bool Spi::Init() { return true; } -bool Spi::WriteCmdAndBuffer(uint8_t *cmd, size_t cmdSize, uint8_t *data, size_t dataSize) { +bool Spi::WriteCmdAndBuffer(const uint8_t *cmd, size_t cmdSize, const uint8_t *data, size_t dataSize) { return spiMaster.WriteCmdAndBuffer(pinCsn, cmd, cmdSize, data, dataSize); } diff --git a/src/drivers/Spi.h b/src/drivers/Spi.h index bee39af2..82ba8a65 100644 --- a/src/drivers/Spi.h +++ b/src/drivers/Spi.h @@ -22,7 +22,7 @@ namespace Pinetime { bool Init(); bool Write(const uint8_t* data, size_t size); bool Read(uint8_t* cmd, size_t cmdSize, uint8_t *data, size_t dataSize); - bool WriteCmdAndBuffer(uint8_t* cmd, size_t cmdSize, uint8_t *data, size_t dataSize); + bool WriteCmdAndBuffer(const uint8_t* cmd, size_t cmdSize, const uint8_t *data, size_t dataSize); void Sleep(); void Wakeup(); diff --git a/src/drivers/SpiMaster.cpp b/src/drivers/SpiMaster.cpp index ff241184..8087d386 100644 --- a/src/drivers/SpiMaster.cpp +++ b/src/drivers/SpiMaster.cpp @@ -239,7 +239,7 @@ void SpiMaster::Wakeup() { Init(); } -bool SpiMaster::WriteCmdAndBuffer(uint8_t pinCsn, uint8_t *cmd, size_t cmdSize, uint8_t *data, size_t dataSize) { +bool SpiMaster::WriteCmdAndBuffer(uint8_t pinCsn, const uint8_t *cmd, size_t cmdSize, const uint8_t *data, size_t dataSize) { xSemaphoreTake(mutex, portMAX_DELAY); taskToNotify = nullptr; diff --git a/src/drivers/SpiMaster.h b/src/drivers/SpiMaster.h index 88b37a35..cd3193e4 100644 --- a/src/drivers/SpiMaster.h +++ b/src/drivers/SpiMaster.h @@ -37,7 +37,7 @@ namespace Pinetime { bool Write(uint8_t pinCsn, const uint8_t* data, size_t size); bool Read(uint8_t pinCsn, uint8_t* cmd, size_t cmdSize, uint8_t *data, size_t dataSize); - bool WriteCmdAndBuffer(uint8_t pinCsn, uint8_t* cmd, size_t cmdSize, uint8_t *data, size_t dataSize); + bool WriteCmdAndBuffer(uint8_t pinCsn, const uint8_t* cmd, size_t cmdSize, const uint8_t *data, size_t dataSize); void OnStartedEvent(); void OnEndEvent(); diff --git a/src/drivers/SpiNorFlash.cpp b/src/drivers/SpiNorFlash.cpp index 8fbb53a1..7e4da1ca 100644 --- a/src/drivers/SpiNorFlash.cpp +++ b/src/drivers/SpiNorFlash.cpp @@ -96,12 +96,12 @@ bool SpiNorFlash::EraseFailed() { return (ReadSecurityRegister() & 0x40u) == 0x40u; } -void SpiNorFlash::Write(uint32_t address, uint8_t *buffer, size_t size) { +void SpiNorFlash::Write(uint32_t address, const uint8_t *buffer, size_t size) { static constexpr uint8_t cmdSize = 4; size_t len = size; uint32_t addr = address; - uint8_t* b = buffer; + const uint8_t* b = buffer; while(len > 0) { uint32_t pageLimit = (addr & ~(pageSize - 1u)) + pageSize; uint32_t toWrite = pageLimit - addr > len ? len : pageLimit - addr; diff --git a/src/drivers/SpiNorFlash.h b/src/drivers/SpiNorFlash.h index b5f19202..98267c09 100644 --- a/src/drivers/SpiNorFlash.h +++ b/src/drivers/SpiNorFlash.h @@ -24,7 +24,7 @@ namespace Pinetime { bool WriteEnabled(); uint8_t ReadConfigurationRegister(); void Read(uint32_t address, uint8_t* buffer, size_t size); - void Write(uint32_t address, uint8_t *buffer, size_t size); + void Write(uint32_t address, const uint8_t *buffer, size_t size); void WriteEnable(); void SectorErase(uint32_t sectorAddress); uint8_t ReadSecurityRegister(); |