|
@@ -42,28 +42,28 @@ static void spiInit(uint8_t spiRate) {
|
42
|
42
|
/** SPI receive a byte */
|
43
|
43
|
static uint8_t spiRec() {
|
44
|
44
|
SPDR = 0XFF;
|
45
|
|
- while (!(SPSR & (1 << SPIF)));
|
|
45
|
+ while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
46
|
46
|
return SPDR;
|
47
|
47
|
}
|
48
|
48
|
//------------------------------------------------------------------------------
|
49
|
49
|
/** SPI read data - only one call so force inline */
|
50
|
50
|
static inline __attribute__((always_inline))
|
51
|
|
- void spiRead(uint8_t* buf, uint16_t nbyte) {
|
|
51
|
+void spiRead(uint8_t* buf, uint16_t nbyte) {
|
52
|
52
|
if (nbyte-- == 0) return;
|
53
|
53
|
SPDR = 0XFF;
|
54
|
54
|
for (uint16_t i = 0; i < nbyte; i++) {
|
55
|
|
- while (!(SPSR & (1 << SPIF)));
|
|
55
|
+ while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
56
|
56
|
buf[i] = SPDR;
|
57
|
57
|
SPDR = 0XFF;
|
58
|
58
|
}
|
59
|
|
- while (!(SPSR & (1 << SPIF)));
|
|
59
|
+ while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
60
|
60
|
buf[nbyte] = SPDR;
|
61
|
61
|
}
|
62
|
62
|
//------------------------------------------------------------------------------
|
63
|
63
|
/** SPI send a byte */
|
64
|
64
|
static void spiSend(uint8_t b) {
|
65
|
65
|
SPDR = b;
|
66
|
|
- while (!(SPSR & (1 << SPIF)));
|
|
66
|
+ while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
67
|
67
|
}
|
68
|
68
|
//------------------------------------------------------------------------------
|
69
|
69
|
/** SPI send block - only one call so force inline */
|
|
@@ -71,12 +71,12 @@ static inline __attribute__((always_inline))
|
71
|
71
|
void spiSendBlock(uint8_t token, const uint8_t* buf) {
|
72
|
72
|
SPDR = token;
|
73
|
73
|
for (uint16_t i = 0; i < 512; i += 2) {
|
74
|
|
- while (!(SPSR & (1 << SPIF)));
|
|
74
|
+ while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
75
|
75
|
SPDR = buf[i];
|
76
|
|
- while (!(SPSR & (1 << SPIF)));
|
|
76
|
+ while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
77
|
77
|
SPDR = buf[i + 1];
|
78
|
78
|
}
|
79
|
|
- while (!(SPSR & (1 << SPIF)));
|
|
79
|
+ while (!(SPSR & (1 << SPIF))) { /* Intentionally left empty */ }
|
80
|
80
|
}
|
81
|
81
|
//------------------------------------------------------------------------------
|
82
|
82
|
#else // SOFTWARE_SPI
|
|
@@ -174,7 +174,7 @@ uint8_t Sd2Card::cardCommand(uint8_t cmd, uint32_t arg) {
|
174
|
174
|
if (cmd == CMD12) spiRec();
|
175
|
175
|
|
176
|
176
|
// wait for response
|
177
|
|
- for (uint8_t i = 0; ((status_ = spiRec()) & 0X80) && i != 0XFF; i++);
|
|
177
|
+ for (uint8_t i = 0; ((status_ = spiRec()) & 0X80) && i != 0XFF; i++) { /* Intentionally left empty */ }
|
178
|
178
|
return status_;
|
179
|
179
|
}
|
180
|
180
|
//------------------------------------------------------------------------------
|