Fix for a few -Wextra warnings.
This commit is contained in:
parent
72586eb30a
commit
43018a48c4
3 changed files with 18 additions and 14 deletions
|
@ -1753,7 +1753,7 @@ void kill()
|
||||||
SERIAL_ERRORLNPGM(MSG_ERR_KILLED);
|
SERIAL_ERRORLNPGM(MSG_ERR_KILLED);
|
||||||
LCD_ALERTMESSAGEPGM(MSG_KILLED);
|
LCD_ALERTMESSAGEPGM(MSG_KILLED);
|
||||||
suicide();
|
suicide();
|
||||||
while(1); // Wait for reset
|
while(1) { /* Intentionally left empty */ } // Wait for reset
|
||||||
}
|
}
|
||||||
|
|
||||||
void Stop()
|
void Stop()
|
||||||
|
|
|
@ -42,28 +42,28 @@ static void spiInit(uint8_t spiRate) {
|
||||||
/** SPI receive a byte */
|
/** SPI receive a byte */
|
||||||
static uint8_t spiRec() {
|
static uint8_t spiRec() {
|
||||||
SPDR = 0XFF;
|
SPDR = 0XFF;
|
||||||
while (!(SPSR & (1 << SPIF)));
|
while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
||||||
return SPDR;
|
return SPDR;
|
||||||
}
|
}
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
/** SPI read data - only one call so force inline */
|
/** SPI read data - only one call so force inline */
|
||||||
static inline __attribute__((always_inline))
|
static inline __attribute__((always_inline))
|
||||||
void spiRead(uint8_t* buf, uint16_t nbyte) {
|
void spiRead(uint8_t* buf, uint16_t nbyte) {
|
||||||
if (nbyte-- == 0) return;
|
if (nbyte-- == 0) return;
|
||||||
SPDR = 0XFF;
|
SPDR = 0XFF;
|
||||||
for (uint16_t i = 0; i < nbyte; i++) {
|
for (uint16_t i = 0; i < nbyte; i++) {
|
||||||
while (!(SPSR & (1 << SPIF)));
|
while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
||||||
buf[i] = SPDR;
|
buf[i] = SPDR;
|
||||||
SPDR = 0XFF;
|
SPDR = 0XFF;
|
||||||
}
|
}
|
||||||
while (!(SPSR & (1 << SPIF)));
|
while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
||||||
buf[nbyte] = SPDR;
|
buf[nbyte] = SPDR;
|
||||||
}
|
}
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
/** SPI send a byte */
|
/** SPI send a byte */
|
||||||
static void spiSend(uint8_t b) {
|
static void spiSend(uint8_t b) {
|
||||||
SPDR = b;
|
SPDR = b;
|
||||||
while (!(SPSR & (1 << SPIF)));
|
while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
||||||
}
|
}
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
/** SPI send block - only one call so force inline */
|
/** SPI send block - only one call so force inline */
|
||||||
|
@ -71,12 +71,12 @@ static inline __attribute__((always_inline))
|
||||||
void spiSendBlock(uint8_t token, const uint8_t* buf) {
|
void spiSendBlock(uint8_t token, const uint8_t* buf) {
|
||||||
SPDR = token;
|
SPDR = token;
|
||||||
for (uint16_t i = 0; i < 512; i += 2) {
|
for (uint16_t i = 0; i < 512; i += 2) {
|
||||||
while (!(SPSR & (1 << SPIF)));
|
while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
||||||
SPDR = buf[i];
|
SPDR = buf[i];
|
||||||
while (!(SPSR & (1 << SPIF)));
|
while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
||||||
SPDR = buf[i + 1];
|
SPDR = buf[i + 1];
|
||||||
}
|
}
|
||||||
while (!(SPSR & (1 << SPIF)));
|
while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
||||||
}
|
}
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
#else // SOFTWARE_SPI
|
#else // SOFTWARE_SPI
|
||||||
|
@ -174,7 +174,7 @@ uint8_t Sd2Card::cardCommand(uint8_t cmd, uint32_t arg) {
|
||||||
if (cmd == CMD12) spiRec();
|
if (cmd == CMD12) spiRec();
|
||||||
|
|
||||||
// wait for response
|
// wait for response
|
||||||
for (uint8_t i = 0; ((status_ = spiRec()) & 0X80) && i != 0XFF; i++);
|
for (uint8_t i = 0; ((status_ = spiRec()) & 0X80) && i != 0XFF; i++) { /* Intentionally left empty */ }
|
||||||
return status_;
|
return status_;
|
||||||
}
|
}
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
|
@ -245,8 +245,10 @@ void CardReader::openFile(char* name,bool read)
|
||||||
SERIAL_PROTOCOLLNPGM(".");
|
SERIAL_PROTOCOLLNPGM(".");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
;//SERIAL_ECHOLN("dive ok");
|
{
|
||||||
|
//SERIAL_ECHOLN("dive ok");
|
||||||
|
}
|
||||||
|
|
||||||
curDir=&myDir;
|
curDir=&myDir;
|
||||||
dirname_start=dirname_end+1;
|
dirname_start=dirname_end+1;
|
||||||
|
@ -339,8 +341,10 @@ void CardReader::removeFile(char* name)
|
||||||
SERIAL_PROTOCOLLNPGM(".");
|
SERIAL_PROTOCOLLNPGM(".");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
;//SERIAL_ECHOLN("dive ok");
|
{
|
||||||
|
//SERIAL_ECHOLN("dive ok");
|
||||||
|
}
|
||||||
|
|
||||||
curDir=&myDir;
|
curDir=&myDir;
|
||||||
dirname_start=dirname_end+1;
|
dirname_start=dirname_end+1;
|
||||||
|
|
Reference in a new issue