Cooperative scheduling support for Ehternet library.

cmaglie · cmaglie · commit 1f0e7770dc2e · 2012-11-20T17:09:12.000+01:00
diff --git a/hardware/arduino/sam/cores/arduino/UARTClass.cpp b/hardware/arduino/sam/cores/arduino/UARTClass.cpp
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include "Arduino.h"
 #include "UARTClass.h"
 
 // Constructors ////////////////////////////////////////////////////////////////
diff --git a/hardware/arduino/sam/cores/arduino/USARTClass.cpp b/hardware/arduino/sam/cores/arduino/USARTClass.cpp
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include "Arduino.h"
 #include "USARTClass.h"
 
 // Constructors ////////////////////////////////////////////////////////////////
diff --git a/hardware/arduino/sam/libraries/Ethernet/utility/socket.cpp b/hardware/arduino/sam/libraries/Ethernet/utility/socket.cpp
@@ -114,24 +114,24 @@ uint16_t send(SOCKET s, const uint8_t * buf, uint16_t len)
       ret = 0; 
       break;
     }
+    if (freesize >= ret)
+      break;
+    yield();
   } 
-  while (freesize < ret);
+  while (true);
 
   // copy data
   W5100.send_data_processing(s, (uint8_t *)buf, ret);
   W5100.execCmdSn(s, Sock_SEND);
 
-  /* +2008.01 bj */
   while ( (W5100.readSnIR(s) & SnIR::SEND_OK) != SnIR::SEND_OK ) 
   {
-    /* m2008.01 [bj] : reduce code */
     if ( W5100.readSnSR(s) == SnSR::CLOSED )
     {
       close(s);
       return 0;
     }
   }
-  /* +2008.01 bj */
   W5100.writeSnIR(s, SnIR::SEND_OK);
   return ret;
 }
diff --git a/hardware/arduino/sam/libraries/Ethernet/utility/w5100.cpp b/hardware/arduino/sam/libraries/Ethernet/utility/w5100.cpp
@@ -40,7 +40,11 @@ void W5100Class::init(void)
   for (int i=0; i<MAX_SOCK_NUM; i++) {
     SBASE[i] = TXBUF_BASE + SSIZE * i;
     RBASE[i] = RXBUF_BASE + RSIZE * i;
+
+    cmdSnTickets[i] = 0;
+    cmdSntNext[i] = 0;
   }
+
 }
 
 uint16_t W5100Class::getTXFreeSize(SOCKET s)
@@ -175,9 +179,16 @@ uint16_t W5100Class::read(uint16_t _addr, uint8_t *_buf, uint16_t _len)
 }
 
 void W5100Class::execCmdSn(SOCKET s, SockCMD _cmd) {
+  uint8_t turn = cmdSnTickets[s];
+  cmdSnTickets[s]++;
+  while (cmdSntNext[s] != turn)
+	  yield();
+
   // Send command to socket
   writeSnCR(s, _cmd);
   // Wait for command to complete
   while (readSnCR(s))
-    ;
+    yield();
+
+  cmdSntNext[s]++;
 }
diff --git a/hardware/arduino/sam/libraries/Ethernet/utility/w5100.h b/hardware/arduino/sam/libraries/Ethernet/utility/w5100.h
@@ -321,6 +321,8 @@ class W5100Class {
   uint16_t SBASE[SOCKETS]; // Tx buffer base address
   uint16_t RBASE[SOCKETS]; // Rx buffer base address
 
+  uint8_t cmdSnTickets[MAX_SOCK_NUM];
+  uint8_t cmdSntNext[MAX_SOCK_NUM];
 };
 
 extern W5100Class W5100;

Original file line number	Diff line number	Diff line change
`@@ -114,24 +114,24 @@ uint16_t send(SOCKET s, const uint8_t * buf, uint16_t len)`
`114`	`114`	`ret = 0;`
`115`	`115`	`break;`
`116`	`116`	`}`
	`117`	`+ if (freesize >= ret)`
	`118`	`+ break;`
	`119`	`+ yield();`
`117`	`120`	`}`
`118`		`- while (freesize < ret);`
	`121`	`+ while (true);`
`119`	`122`
`120`	`123`	`// copy data`
`121`	`124`	`W5100.send_data_processing(s, (uint8_t *)buf, ret);`
`122`	`125`	`W5100.execCmdSn(s, Sock_SEND);`
`123`	`126`
`124`		`- /* +2008.01 bj */`
`125`	`127`	`while ( (W5100.readSnIR(s) & SnIR::SEND_OK) != SnIR::SEND_OK )`
`126`	`128`	`{`
`127`		`- /* m2008.01 [bj] : reduce code */`
`128`	`129`	`if ( W5100.readSnSR(s) == SnSR::CLOSED )`
`129`	`130`	`{`
`130`	`131`	`close(s);`
`131`	`132`	`return 0;`
`132`	`133`	`}`
`133`	`134`	`}`
`134`		`- /* +2008.01 bj */`
`135`	`135`	`W5100.writeSnIR(s, SnIR::SEND_OK);`
`136`	`136`	`return ret;`
`137`	`137`	`}`