Skip to content

Commit 2114151

Browse files
committed
Ethernet: fixed regression for SAM (Arduino Due)
Fix #4072
1 parent 5be4466 commit 2114151

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

libraries/Ethernet/src/utility/w5100.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ void W5100Class::init(void)
3030
SPI.begin();
3131
initSS();
3232
#else
33-
SPI.begin(SPI_CS);
33+
SPI.begin(ETHERNET_SHIELD_SPI_CS);
3434
// Set clock to 4Mhz (W5100 should support up to about 14Mhz)
35-
SPI.setClockDivider(SPI_CS, 21);
36-
SPI.setDataMode(SPI_CS, SPI_MODE0);
35+
SPI.setClockDivider(ETHERNET_SHIELD_SPI_CS, 21);
36+
SPI.setDataMode(ETHERNET_SHIELD_SPI_CS, SPI_MODE0);
3737
#endif
3838
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
3939
writeMR(1<<RST);
@@ -144,10 +144,10 @@ uint8_t W5100Class::write(uint16_t _addr, uint8_t _data)
144144
SPI.transfer(_data);
145145
resetSS();
146146
#else
147-
SPI.transfer(SPI_CS, 0xF0, SPI_CONTINUE);
148-
SPI.transfer(SPI_CS, _addr >> 8, SPI_CONTINUE);
149-
SPI.transfer(SPI_CS, _addr & 0xFF, SPI_CONTINUE);
150-
SPI.transfer(SPI_CS, _data);
147+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, 0xF0, SPI_CONTINUE);
148+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, _addr >> 8, SPI_CONTINUE);
149+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, _addr & 0xFF, SPI_CONTINUE);
150+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, _data);
151151
#endif
152152
return 1;
153153
}
@@ -165,10 +165,10 @@ uint16_t W5100Class::write(uint16_t _addr, const uint8_t *_buf, uint16_t _len)
165165
SPI.transfer(_buf[i]);
166166
resetSS();
167167
#else
168-
SPI.transfer(SPI_CS, 0xF0, SPI_CONTINUE);
169-
SPI.transfer(SPI_CS, _addr >> 8, SPI_CONTINUE);
170-
SPI.transfer(SPI_CS, _addr & 0xFF, SPI_CONTINUE);
171-
SPI.transfer(SPI_CS, _buf[i]);
168+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, 0xF0, SPI_CONTINUE);
169+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, _addr >> 8, SPI_CONTINUE);
170+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, _addr & 0xFF, SPI_CONTINUE);
171+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, _buf[i]);
172172
_addr++;
173173
#endif
174174
}
@@ -185,10 +185,10 @@ uint8_t W5100Class::read(uint16_t _addr)
185185
uint8_t _data = SPI.transfer(0);
186186
resetSS();
187187
#else
188-
SPI.transfer(SPI_CS, 0x0F, SPI_CONTINUE);
189-
SPI.transfer(SPI_CS, _addr >> 8, SPI_CONTINUE);
190-
SPI.transfer(SPI_CS, _addr & 0xFF, SPI_CONTINUE);
191-
uint8_t _data = SPI.transfer(SPI_CS, 0);
188+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, 0x0F, SPI_CONTINUE);
189+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, _addr >> 8, SPI_CONTINUE);
190+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, _addr & 0xFF, SPI_CONTINUE);
191+
uint8_t _data = SPI.transfer(ETHERNET_SHIELD_SPI_CS, 0);
192192
#endif
193193
return _data;
194194
}
@@ -206,10 +206,10 @@ uint16_t W5100Class::read(uint16_t _addr, uint8_t *_buf, uint16_t _len)
206206
_buf[i] = SPI.transfer(0);
207207
resetSS();
208208
#else
209-
SPI.transfer(SPI_CS, 0x0F, SPI_CONTINUE);
210-
SPI.transfer(SPI_CS, _addr >> 8, SPI_CONTINUE);
211-
SPI.transfer(SPI_CS, _addr & 0xFF, SPI_CONTINUE);
212-
_buf[i] = SPI.transfer(SPI_CS, 0);
209+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, 0x0F, SPI_CONTINUE);
210+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, _addr >> 8, SPI_CONTINUE);
211+
SPI.transfer(ETHERNET_SHIELD_SPI_CS, _addr & 0xFF, SPI_CONTINUE);
212+
_buf[i] = SPI.transfer(ETHERNET_SHIELD_SPI_CS, 0);
213213
_addr++;
214214
#endif
215215
}

0 commit comments

Comments
 (0)