Skip to content

Commit 11cf45d

Browse files
committed
Fix indent and small cosmetic changes
1 parent 6f96742 commit 11cf45d

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

hardware/arduino/sam/libraries/SPI/SPI.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ void SPIClass::init() {
6262
#define interruptsStatus() __interruptsStatus()
6363
static inline unsigned char __interruptsStatus(void) __attribute__((always_inline, unused));
6464
static inline unsigned char __interruptsStatus(void) {
65-
unsigned int primask, faultmask;
66-
asm volatile ("mrs %0, primask" : "=r" (primask));
67-
if (primask) return 0;
68-
asm volatile ("mrs %0, faultmask" : "=r" (faultmask));
69-
if (faultmask) return 0;
70-
return 1;
65+
unsigned int primask, faultmask;
66+
asm volatile ("mrs %0, primask" : "=r" (primask));
67+
if (primask) return 0;
68+
asm volatile ("mrs %0, faultmask" : "=r" (faultmask));
69+
if (faultmask) return 0;
70+
return 1;
7171
}
7272
#endif
7373

@@ -182,18 +182,18 @@ byte SPIClass::transfer(byte _pin, uint8_t _data, SPITransferMode _mode) {
182182
d |= SPI_TDR_LASTXFER;
183183

184184
// SPI_Write(spi, _channel, _data);
185-
while ((spi->SPI_SR & SPI_SR_TDRE) == 0)
186-
;
187-
spi->SPI_TDR = d;
188-
189-
// return SPI_Read(spi);
190-
while ((spi->SPI_SR & SPI_SR_RDRF) == 0)
191-
;
192-
d = spi->SPI_RDR;
185+
while ((spi->SPI_SR & SPI_SR_TDRE) == 0)
186+
;
187+
spi->SPI_TDR = d;
188+
189+
// return SPI_Read(spi);
190+
while ((spi->SPI_SR & SPI_SR_RDRF) == 0)
191+
;
192+
d = spi->SPI_RDR;
193193
// Reverse bit order
194194
if (bitOrder[ch] == LSBFIRST)
195195
d = __REV(__RBIT(d));
196-
return d & 0xFF;
196+
return d & 0xFF;
197197
}
198198

199199
void SPIClass::attachInterrupt(void) {

hardware/arduino/sam/libraries/SPI/SPI.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,8 @@ class SPIClass {
336336

337337
// Transaction Functions
338338
void usingInterrupt(uint8_t interruptNumber);
339+
void beginTransaction(SPISettings settings) { beginTransaction(BOARD_SPI_DEFAULT_SS, settings); }
339340
void beginTransaction(uint8_t pin, SPISettings settings);
340-
void beginTransaction(SPISettings settings) {
341-
beginTransaction(BOARD_SPI_DEFAULT_SS, settings);
342-
}
343341
void endTransaction(void);
344342

345343
// SPI Configuration methods

0 commit comments

Comments
 (0)