Skip to content

Commit ed44f42

Browse files
austinscreationsaustinscreations
committed
missing spiETH changes
1 parent 7a418d3 commit ed44f42

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎src/EthernetClient.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ uint16_t EthernetClient::localPort()
182182
{
183183
if (_sockindex >= MAX_SOCK_NUM) return 0;
184184
uint16_t port;
185-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
185+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
186186
port = W5100.readSnPORT(_sockindex);
187-
SPI.endTransaction();
187+
spiETH.endTransaction();
188188
return port;
189189
}
190190

@@ -194,9 +194,9 @@ IPAddress EthernetClient::remoteIP()
194194
{
195195
if (_sockindex >= MAX_SOCK_NUM) return IPAddress((uint32_t)0);
196196
uint8_t remoteIParray[4];
197-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
197+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
198198
W5100.readSnDIPR(_sockindex, remoteIParray);
199-
SPI.endTransaction();
199+
spiETH.endTransaction();
200200
return IPAddress(remoteIParray);
201201
}
202202

@@ -206,8 +206,8 @@ uint16_t EthernetClient::remotePort()
206206
{
207207
if (_sockindex >= MAX_SOCK_NUM) return 0;
208208
uint16_t port;
209-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
209+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
210210
port = W5100.readSnDPORT(_sockindex);
211-
SPI.endTransaction();
211+
spiETH.endTransaction();
212212
return port;
213213
}

‎src/socket.cpp

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ uint8_t EthernetClass::socketBegin(uint8_t protocol, uint16_t port)
7171
if (chip == 51) maxindex = 4; // W5100 chip never supports more than 4 sockets
7272
#endif
7373
//Serial.printf("W5000socket begin, protocol=%d, port=%d\n", protocol, port);
74-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
74+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
7575
// look at all the hardware sockets, use any that are closed (unused)
7676
for (s=0; s < maxindex; s++) {
7777
status[s] = W5100.readSnSR(s);
@@ -95,7 +95,7 @@ uint8_t EthernetClass::socketBegin(uint8_t protocol, uint16_t port)
9595
if (stat == SnSR::CLOSE_WAIT) goto closemakesocket;
9696
}
9797
#endif
98-
SPI.endTransaction();
98+
spiETH.endTransaction();
9999
return MAX_SOCK_NUM; // all sockets are in use
100100
closemakesocket:
101101
//Serial.printf("W5000socket close\n");
@@ -119,7 +119,7 @@ uint8_t EthernetClass::socketBegin(uint8_t protocol, uint16_t port)
119119
state[s].RX_inc = 0;
120120
state[s].TX_FSR = 0;
121121
//Serial.printf("W5000socket prot=%d, RX_RD=%d\n", W5100.readSnMR(s), state[s].RX_RD);
122-
SPI.endTransaction();
122+
spiETH.endTransaction();
123123
return s;
124124
}
125125

@@ -135,7 +135,7 @@ uint8_t EthernetClass::socketBeginMulticast(uint8_t protocol, IPAddress ip, uint
135135
if (chip == 51) maxindex = 4; // W5100 chip never supports more than 4 sockets
136136
#endif
137137
//Serial.printf("W5000socket begin, protocol=%d, port=%d\n", protocol, port);
138-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
138+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
139139
// look at all the hardware sockets, use any that are closed (unused)
140140
for (s=0; s < maxindex; s++) {
141141
status[s] = W5100.readSnSR(s);
@@ -159,7 +159,7 @@ uint8_t EthernetClass::socketBeginMulticast(uint8_t protocol, IPAddress ip, uint
159159
if (stat == SnSR::CLOSE_WAIT) goto closemakesocket;
160160
}
161161
#endif
162-
SPI.endTransaction();
162+
spiETH.endTransaction();
163163
return MAX_SOCK_NUM; // all sockets are in use
164164
closemakesocket:
165165
//Serial.printf("W5000socket close\n");
@@ -191,16 +191,16 @@ uint8_t EthernetClass::socketBeginMulticast(uint8_t protocol, IPAddress ip, uint
191191
state[s].RX_inc = 0;
192192
state[s].TX_FSR = 0;
193193
//Serial.printf("W5000socket prot=%d, RX_RD=%d\n", W5100.readSnMR(s), state[s].RX_RD);
194-
SPI.endTransaction();
194+
spiETH.endTransaction();
195195
return s;
196196
}
197197
// Return the socket's status
198198
//
199199
uint8_t EthernetClass::socketStatus(uint8_t s)
200200
{
201-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
201+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
202202
uint8_t status = W5100.readSnSR(s);
203-
SPI.endTransaction();
203+
spiETH.endTransaction();
204204
return status;
205205
}
206206

@@ -209,23 +209,23 @@ uint8_t EthernetClass::socketStatus(uint8_t s)
209209
//
210210
void EthernetClass::socketClose(uint8_t s)
211211
{
212-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
212+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
213213
W5100.execCmdSn(s, Sock_CLOSE);
214-
SPI.endTransaction();
214+
spiETH.endTransaction();
215215
}
216216

217217

218218
// Place the socket in listening (server) mode
219219
//
220220
uint8_t EthernetClass::socketListen(uint8_t s)
221221
{
222-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
222+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
223223
if (W5100.readSnSR(s) != SnSR::INIT) {
224-
SPI.endTransaction();
224+
spiETH.endTransaction();
225225
return 0;
226226
}
227227
W5100.execCmdSn(s, Sock_LISTEN);
228-
SPI.endTransaction();
228+
spiETH.endTransaction();
229229
return 1;
230230
}
231231

@@ -235,11 +235,11 @@ uint8_t EthernetClass::socketListen(uint8_t s)
235235
void EthernetClass::socketConnect(uint8_t s, uint8_t * addr, uint16_t port)
236236
{
237237
// set destination IP
238-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
238+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
239239
W5100.writeSnDIPR(s, addr);
240240
W5100.writeSnDPORT(s, port);
241241
W5100.execCmdSn(s, Sock_CONNECT);
242-
SPI.endTransaction();
242+
spiETH.endTransaction();
243243
}
244244

245245

@@ -248,9 +248,9 @@ void EthernetClass::socketConnect(uint8_t s, uint8_t * addr, uint16_t port)
248248
//
249249
void EthernetClass::socketDisconnect(uint8_t s)
250250
{
251-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
251+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
252252
W5100.execCmdSn(s, Sock_DISCON);
253-
SPI.endTransaction();
253+
spiETH.endTransaction();
254254
}
255255

256256

@@ -305,7 +305,7 @@ int EthernetClass::socketRecv(uint8_t s, uint8_t *buf, int16_t len)
305305
{
306306
// Check how much data is available
307307
int ret = state[s].RX_RSR;
308-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
308+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
309309
if (ret < len) {
310310
uint16_t rsr = getSnRX_RSR(s);
311311
ret = rsr - state[s].RX_inc;
@@ -342,7 +342,7 @@ int EthernetClass::socketRecv(uint8_t s, uint8_t *buf, int16_t len)
342342
state[s].RX_inc = inc;
343343
}
344344
}
345-
SPI.endTransaction();
345+
spiETH.endTransaction();
346346
//Serial.printf("socketRecv, ret=%d\n", ret);
347347
return ret;
348348
}
@@ -351,9 +351,9 @@ uint16_t EthernetClass::socketRecvAvailable(uint8_t s)
351351
{
352352
uint16_t ret = state[s].RX_RSR;
353353
if (ret == 0) {
354-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
354+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
355355
uint16_t rsr = getSnRX_RSR(s);
356-
SPI.endTransaction();
356+
spiETH.endTransaction();
357357
ret = rsr - state[s].RX_inc;
358358
state[s].RX_RSR = ret;
359359
//Serial.printf("sockRecvAvailable s=%d, RX_RSR=%d\n", s, ret);
@@ -366,10 +366,10 @@ uint16_t EthernetClass::socketRecvAvailable(uint8_t s)
366366
uint8_t EthernetClass::socketPeek(uint8_t s)
367367
{
368368
uint8_t b;
369-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
369+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
370370
uint16_t ptr = state[s].RX_RD;
371371
W5100.read((ptr & W5100.SMASK) + W5100.RBASE(s), &b, 1);
372-
SPI.endTransaction();
372+
spiETH.endTransaction();
373373
return b;
374374
}
375375

@@ -433,10 +433,10 @@ uint16_t EthernetClass::socketSend(uint8_t s, const uint8_t * buf, uint16_t len)
433433

434434
// if freebuf is available, start.
435435
do {
436-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
436+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
437437
freesize = getSnTX_FSR(s);
438438
status = W5100.readSnSR(s);
439-
SPI.endTransaction();
439+
spiETH.endTransaction();
440440
if ((status != SnSR::ESTABLISHED) && (status != SnSR::CLOSE_WAIT)) {
441441
ret = 0;
442442
break;
@@ -445,35 +445,35 @@ uint16_t EthernetClass::socketSend(uint8_t s, const uint8_t * buf, uint16_t len)
445445
} while (freesize < ret);
446446

447447
// copy data
448-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
448+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
449449
write_data(s, 0, (uint8_t *)buf, ret);
450450
W5100.execCmdSn(s, Sock_SEND);
451451

452452
/* +2008.01 bj */
453453
while ( (W5100.readSnIR(s) & SnIR::SEND_OK) != SnIR::SEND_OK ) {
454454
/* m2008.01 [bj] : reduce code */
455455
if ( W5100.readSnSR(s) == SnSR::CLOSED ) {
456-
SPI.endTransaction();
456+
spiETH.endTransaction();
457457
return 0;
458458
}
459-
SPI.endTransaction();
459+
spiETH.endTransaction();
460460
yield();
461-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
461+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
462462
}
463463
/* +2008.01 bj */
464464
W5100.writeSnIR(s, SnIR::SEND_OK);
465-
SPI.endTransaction();
465+
spiETH.endTransaction();
466466
return ret;
467467
}
468468

469469
uint16_t EthernetClass::socketSendAvailable(uint8_t s)
470470
{
471471
uint8_t status=0;
472472
uint16_t freesize=0;
473-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
473+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
474474
freesize = getSnTX_FSR(s);
475475
status = W5100.readSnSR(s);
476-
SPI.endTransaction();
476+
spiETH.endTransaction();
477477
if ((status == SnSR::ESTABLISHED) || (status == SnSR::CLOSE_WAIT)) {
478478
return freesize;
479479
}
@@ -484,15 +484,15 @@ uint16_t EthernetClass::socketBufferData(uint8_t s, uint16_t offset, const uint8
484484
{
485485
//Serial.printf(" bufferData, offset=%d, len=%d\n", offset, len);
486486
uint16_t ret =0;
487-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
487+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
488488
uint16_t txfree = getSnTX_FSR(s);
489489
if (len > txfree) {
490490
ret = txfree; // check size not to exceed MAX size.
491491
} else {
492492
ret = len;
493493
}
494494
write_data(s, offset, buf, ret);
495-
SPI.endTransaction();
495+
spiETH.endTransaction();
496496
return ret;
497497
}
498498

@@ -502,35 +502,35 @@ bool EthernetClass::socketStartUDP(uint8_t s, uint8_t* addr, uint16_t port)
502502
((port == 0x00)) ) {
503503
return false;
504504
}
505-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
505+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
506506
W5100.writeSnDIPR(s, addr);
507507
W5100.writeSnDPORT(s, port);
508-
SPI.endTransaction();
508+
spiETH.endTransaction();
509509
return true;
510510
}
511511

512512
bool EthernetClass::socketSendUDP(uint8_t s)
513513
{
514-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
514+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
515515
W5100.execCmdSn(s, Sock_SEND);
516516

517517
/* +2008.01 bj */
518518
while ( (W5100.readSnIR(s) & SnIR::SEND_OK) != SnIR::SEND_OK ) {
519519
if (W5100.readSnIR(s) & SnIR::TIMEOUT) {
520520
/* +2008.01 [bj]: clear interrupt */
521521
W5100.writeSnIR(s, (SnIR::SEND_OK|SnIR::TIMEOUT));
522-
SPI.endTransaction();
522+
spiETH.endTransaction();
523523
//Serial.printf("sendUDP timeout\n");
524524
return false;
525525
}
526-
SPI.endTransaction();
526+
spiETH.endTransaction();
527527
yield();
528-
SPI.beginTransaction(SPI_ETHERNET_SETTINGS);
528+
spiETH.beginTransaction(SPI_ETHERNET_SETTINGS);
529529
}
530530

531531
/* +2008.01 bj */
532532
W5100.writeSnIR(s, SnIR::SEND_OK);
533-
SPI.endTransaction();
533+
spiETH.endTransaction();
534534

535535
//Serial.printf("sendUDP ok\n");
536536
/* Sent ok */

0 commit comments

Comments
 (0)