Skip to content

Commit 6958aea

Browse files
committed
Fix warnings in SPI library
1 parent e91cbe8 commit 6958aea

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

libraries/SPI/src/SPI.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void SPIClass::detachMaskedInterrupts() {
131131
uint8_t shift = 0;
132132
while (temp != 0) {
133133
if (temp & 1) {
134-
uint8_t* pin_ctrl_reg = getPINnCTRLregister(portToPortStruct(shift/8), shift%8);
134+
volatile uint8_t* pin_ctrl_reg = getPINnCTRLregister(portToPortStruct(shift/8), shift%8);
135135
irqMap[shift] = *pin_ctrl_reg;
136136
*pin_ctrl_reg &= ~(PORT_ISC_gm);
137137
}
@@ -142,7 +142,7 @@ void SPIClass::detachMaskedInterrupts() {
142142
shift = 32;
143143
while (temp != 0) {
144144
if (temp & 1) {
145-
uint8_t* pin_ctrl_reg = getPINnCTRLregister(portToPortStruct(shift/8), shift%8);
145+
volatile uint8_t* pin_ctrl_reg = getPINnCTRLregister(portToPortStruct(shift/8), shift%8);
146146
irqMap[shift] = *pin_ctrl_reg;
147147
*pin_ctrl_reg &= ~(PORT_ISC_gm);
148148
}
@@ -156,7 +156,7 @@ void SPIClass::reattachMaskedInterrupts() {
156156
uint8_t shift = 0;
157157
while (temp != 0) {
158158
if (temp & 1) {
159-
uint8_t* pin_ctrl_reg = getPINnCTRLregister(portToPortStruct(shift/8), shift%8);
159+
volatile uint8_t* pin_ctrl_reg = getPINnCTRLregister(portToPortStruct(shift/8), shift%8);
160160
*pin_ctrl_reg |= irqMap[shift];
161161
}
162162
temp = temp >> 1;
@@ -166,7 +166,7 @@ void SPIClass::reattachMaskedInterrupts() {
166166
shift = 32;
167167
while (temp != 0) {
168168
if (temp & 1) {
169-
uint8_t* pin_ctrl_reg = getPINnCTRLregister(portToPortStruct(shift/8), shift%8);
169+
volatile uint8_t* pin_ctrl_reg = getPINnCTRLregister(portToPortStruct(shift/8), shift%8);
170170
*pin_ctrl_reg |= irqMap[shift];
171171
}
172172
temp = temp >> 1;

libraries/SPI/src/SPI.h

+2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848
#define SPI_INTERRUPT_DISABLE 0
4949
#define SPI_INTERRUPT_ENABLE 1
5050

51+
#ifndef EXTERNAL_NUM_INTERRUPTS
5152
#define EXTERNAL_NUM_INTERRUPTS NUM_TOTAL_PINS
53+
#endif
5254

5355
class SPISettings {
5456
public:

0 commit comments

Comments
 (0)