|
30 | 30 | static void spiSend(uint8_t b) {
|
31 | 31 | #ifndef USE_SPI_LIB
|
32 | 32 | SPDR = b;
|
33 |
| - while (!(SPSR & (1 << SPIF))); |
| 33 | + while (!(SPSR & (1 << SPIF))) |
| 34 | + ; |
34 | 35 | #else
|
35 | 36 | SPI.transfer(b);
|
36 | 37 | #endif
|
@@ -124,7 +125,8 @@ uint8_t Sd2Card::cardCommand(uint8_t cmd, uint32_t arg) {
|
124 | 125 | spiSend(crc);
|
125 | 126 |
|
126 | 127 | // wait for response
|
127 |
| - for (uint8_t i = 0; ((status_ = spiRec()) & 0X80) && i != 0XFF; i++); |
| 128 | + for (uint8_t i = 0; ((status_ = spiRec()) & 0X80) && i != 0XFF; i++) |
| 129 | + ; |
128 | 130 | return status_;
|
129 | 131 | }
|
130 | 132 | //------------------------------------------------------------------------------
|
@@ -383,18 +385,21 @@ uint8_t Sd2Card::readData(uint32_t block,
|
383 | 385 |
|
384 | 386 | // skip data before offset
|
385 | 387 | for (;offset_ < offset; offset_++) {
|
386 |
| - while (!(SPSR & (1 << SPIF))); |
| 388 | + while (!(SPSR & (1 << SPIF))) |
| 389 | + ; |
387 | 390 | SPDR = 0XFF;
|
388 | 391 | }
|
389 | 392 | // transfer data
|
390 | 393 | n = count - 1;
|
391 | 394 | for (uint16_t i = 0; i < n; i++) {
|
392 |
| - while (!(SPSR & (1 << SPIF))); |
| 395 | + while (!(SPSR & (1 << SPIF))) |
| 396 | + ; |
393 | 397 | dst[i] = SPDR;
|
394 | 398 | SPDR = 0XFF;
|
395 | 399 | }
|
396 | 400 | // wait for last byte
|
397 |
| - while (!(SPSR & (1 << SPIF))); |
| 401 | + while (!(SPSR & (1 << SPIF))) |
| 402 | + ; |
398 | 403 | dst[n] = SPDR;
|
399 | 404 |
|
400 | 405 | #else // OPTIMIZE_HARDWARE_SPI
|
@@ -429,11 +434,13 @@ void Sd2Card::readEnd(void) {
|
429 | 434 | // optimize skip for hardware
|
430 | 435 | SPDR = 0XFF;
|
431 | 436 | while (offset_++ < 513) {
|
432 |
| - while (!(SPSR & (1 << SPIF))); |
| 437 | + while (!(SPSR & (1 << SPIF))) |
| 438 | + ; |
433 | 439 | SPDR = 0XFF;
|
434 | 440 | }
|
435 | 441 | // wait for last crc byte
|
436 |
| - while (!(SPSR & (1 << SPIF))); |
| 442 | + while (!(SPSR & (1 << SPIF))) |
| 443 | + ; |
437 | 444 | #else // OPTIMIZE_HARDWARE_SPI
|
438 | 445 | while (offset_++ < 514) spiRec();
|
439 | 446 | #endif // OPTIMIZE_HARDWARE_SPI
|
@@ -602,14 +609,17 @@ uint8_t Sd2Card::writeData(uint8_t token, const uint8_t* src) {
|
602 | 609 |
|
603 | 610 | // send two byte per iteration
|
604 | 611 | for (uint16_t i = 0; i < 512; i += 2) {
|
605 |
| - while (!(SPSR & (1 << SPIF))); |
| 612 | + while (!(SPSR & (1 << SPIF))) |
| 613 | + ; |
606 | 614 | SPDR = src[i];
|
607 |
| - while (!(SPSR & (1 << SPIF))); |
| 615 | + while (!(SPSR & (1 << SPIF))) |
| 616 | + ; |
608 | 617 | SPDR = src[i+1];
|
609 | 618 | }
|
610 | 619 |
|
611 | 620 | // wait for last data byte
|
612 |
| - while (!(SPSR & (1 << SPIF))); |
| 621 | + while (!(SPSR & (1 << SPIF))) |
| 622 | + ; |
613 | 623 |
|
614 | 624 | #else // OPTIMIZE_HARDWARE_SPI
|
615 | 625 | spiSend(token);
|
|
0 commit comments