arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-06 05:21:22 +03:00
Code

spi: use const for output buffers (#4552)

Browse Source
This commit is contained in:
david gauchard 2018-03-23 17:39:20 +01:00 committed by Develo
parent 95b1348a71
commit 559cb35025
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/SPI/SPI.cpp
View File

@ -380,7 +380,7 @@ void SPIClass::write32(uint32_t data, bool msb) {
* @param data uint8_t * * @param data uint8_t *
* @param size uint32_t * @param size uint32_t
*/ */
void SPIClass::writeBytes(uint8_t * data, uint32_t size) { void SPIClass::writeBytes(const uint8_t * data, uint32_t size) {
while(size) { while(size) {
if(size > 64) { if(size > 64) {
writeBytes_(data, 64); writeBytes_(data, 64);
@ -393,13 +393,13 @@ void SPIClass::writeBytes(uint8_t * data, uint32_t size) {
} }
} }
void SPIClass::writeBytes_(uint8_t * data, uint8_t size) { void SPIClass::writeBytes_(const uint8_t * data, uint8_t size) {
while(SPI1CMD & SPIBUSY) {} while(SPI1CMD & SPIBUSY) {}
// Set Bits to transfer // Set Bits to transfer
setDataBits(size * 8); setDataBits(size * 8);
uint32_t * fifoPtr = (uint32_t*)&SPI1W0; uint32_t * fifoPtr = (uint32_t*)&SPI1W0;
uint32_t * dataPtr = (uint32_t*) data; const uint32_t * dataPtr = (uint32_t*) data;
uint32_t dataSize = ((size + 3) / 4); uint32_t dataSize = ((size + 3) / 4);
while(dataSize--) { while(dataSize--) {
@ -418,14 +418,14 @@ void SPIClass::writeBytes_(uint8_t * data, uint8_t size) {
* @param size uint8_t max for size is 64Byte * @param size uint8_t max for size is 64Byte
* @param repeat uint32_t * @param repeat uint32_t
*/ */
void SPIClass::writePattern(uint8_t * data, uint8_t size, uint32_t repeat) { void SPIClass::writePattern(const uint8_t * data, uint8_t size, uint32_t repeat) {
if(size > 64) return; //max Hardware FIFO if(size > 64) return; //max Hardware FIFO
while(SPI1CMD & SPIBUSY) {} while(SPI1CMD & SPIBUSY) {}
uint32_t buffer[16]; uint32_t buffer[16];
uint8_t *bufferPtr=(uint8_t *)&buffer; uint8_t *bufferPtr=(uint8_t *)&buffer;
uint8_t *dataPtr = data; const uint8_t *dataPtr = data;
volatile uint32_t * fifoPtr = &SPI1W0; volatile uint32_t * fifoPtr = &SPI1W0;
uint8_t r; uint8_t r;
uint32_t repeatRem; uint32_t repeatRem;
@ -497,7 +497,7 @@ void SPIClass::writePattern(uint8_t * data, uint8_t size, uint32_t repeat) {
* @param in uint8_t * * @param in uint8_t *
* @param size uint32_t * @param size uint32_t
*/ */
void SPIClass::transferBytes(uint8_t * out, uint8_t * in, uint32_t size) { void SPIClass::transferBytes(const uint8_t * out, uint8_t * in, uint32_t size) {
while(size) { while(size) {
if(size > 64) { if(size > 64) {
transferBytes_(out, in, 64); transferBytes_(out, in, 64);
@ -511,7 +511,7 @@ void SPIClass::transferBytes(uint8_t * out, uint8_t * in, uint32_t size) {
} }
} }
void SPIClass::transferBytes_(uint8_t * out, uint8_t * in, uint8_t size) { void SPIClass::transferBytes_(const uint8_t * out, uint8_t * in, uint8_t size) {
while(SPI1CMD & SPIBUSY) {} while(SPI1CMD & SPIBUSY) {}
// Set in/out Bits to transfer // Set in/out Bits to transfer

10
libraries/SPI/SPI.h
View File

@ -69,15 +69,15 @@ public:
void write16(uint16_t data, bool msb); void write16(uint16_t data, bool msb);
void write32(uint32_t data); void write32(uint32_t data);
void write32(uint32_t data, bool msb); void write32(uint32_t data, bool msb);
void writeBytes(uint8_t * data, uint32_t size); void writeBytes(const uint8_t * data, uint32_t size);
void writePattern(uint8_t * data, uint8_t size, uint32_t repeat); void writePattern(const uint8_t * data, uint8_t size, uint32_t repeat);
void transferBytes(uint8_t * out, uint8_t * in, uint32_t size); void transferBytes(const uint8_t * out, uint8_t * in, uint32_t size);
void endTransaction(void); void endTransaction(void);
private: private:
bool useHwCs; bool useHwCs;
uint8_t pinSet; uint8_t pinSet;
void writeBytes_(uint8_t * data, uint8_t size); void writeBytes_(const uint8_t * data, uint8_t size);
void transferBytes_(uint8_t * out, uint8_t * in, uint8_t size); void transferBytes_(const uint8_t * out, uint8_t * in, uint8_t size);
inline void setDataBits(uint16_t bits); inline void setDataBits(uint16_t bits);
}; };