Revision 3:53191b0b1f16, committed 2014-07-01

Comitter:

Ademir501

Date:

Tue Jul 01 17:52:55 2014 +0000

Parent:

2:e187daf510da

Commit message:

wiznet.h

Changed in this revision

diff -r e187daf510da -r 53191b0b1f16 WIZnetInterface/Socket/Socket.cpp
--- a/WIZnetInterface/Socket/Socket.cpp	Mon Jun 09 22:36:16 2014 +0000
+++ b/WIZnetInterface/Socket/Socket.cpp	Tue Jul 01 17:52:55 2014 +0000
@@ -1,40 +1,40 @@
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
- 
-#include "Socket.h"
-
-Socket::Socket() : _sock_fd(-1),_blocking(true), _timeout(1500) {
-    eth = WIZnet_Chip::getInstance();
-    if (eth == NULL) {
-        error("Socket constructor error: no W5500 instance available!\r\n");
-    }       
-}
-
-void Socket::set_blocking(bool blocking, unsigned int timeout) {
-    _blocking = blocking;
-    _timeout = timeout;
-}
-
-int Socket::close() {
-    return (eth->close(_sock_fd)) ? 0 : -1;
-}
-
-Socket::~Socket() {
-    close(); //Don't want to leak
-}
+/* Copyright (C) 2012 mbed.org, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+ 
+#include "Socket.h"
 
+Socket::Socket() : _sock_fd(-1),_blocking(true), _timeout(1) {
+    eth = WIZnet_Chip::getInstance();
+    if (eth == NULL) {
+        error("Socket constructor error: no W5500 instance available!\r\n");
+    }       
+}
+
+void Socket::set_blocking(bool blocking, unsigned int timeout) {
+    _blocking = blocking;
+    _timeout = timeout;
+}
+
+int Socket::close() {
+    return (eth->close(_sock_fd)) ? 0 : -1;
+}
+
+Socket::~Socket() {
+    close(); //Don't want to leak
+}
+

diff -r e187daf510da -r 53191b0b1f16 WIZnetInterface/Socket/TCPSocketServer.cpp
--- a/WIZnetInterface/Socket/TCPSocketServer.cpp	Mon Jun 09 22:36:16 2014 +0000
+++ b/WIZnetInterface/Socket/TCPSocketServer.cpp	Tue Jul 01 17:52:55 2014 +0000
@@ -1,75 +1,75 @@
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include "TCPSocketServer.h"
-
-TCPSocketServer::TCPSocketServer() {}
-
-// Server initialization
-int TCPSocketServer::bind(int port) {
-    if (_sock_fd < 0) {
-        _sock_fd = eth->new_socket();
-        if (_sock_fd < 0) {
-            return -1;
-        }
-    }
-    // set TCP protocol
-    eth->setProtocol(_sock_fd, TCP);
-    // set local port
-    eth->sreg<uint16_t>(_sock_fd, Sn_PORT, port);
-    // connect the network
-    eth->scmd(_sock_fd, OPEN);
-    return 0;
-}
-
-int TCPSocketServer::listen(int backlog) {
-    if (_sock_fd < 0) {
-        return -1;
-    }
-    if (backlog != 1) {
-        return -1;
-    }
-    eth->scmd(_sock_fd, LISTEN);
-    return 0;
-}
-
-
-int TCPSocketServer::accept(TCPSocketConnection& connection) {
-    if (_sock_fd < 0) {
-        return -1;
-    }
-    Timer t;
-    t.reset();
-    t.start();
-    while(1) {
-        if (t.read_ms() > _timeout && _blocking == false) {
-            return -1;
-        }
-        if (eth->sreg<uint8_t>(_sock_fd, Sn_SR) == SOCK_ESTABLISHED) {
-            break;
-        }
-    }
-    uint32_t ip = eth->sreg<uint32_t>(_sock_fd, Sn_DIPR);
-    char host[16];
-    snprintf(host, sizeof(host), "%d.%d.%d.%d", (ip>>24)&0xff, (ip>>16)&0xff, (ip>>8)&0xff, ip&0xff);
-    uint16_t port = eth->sreg<uint16_t>(_sock_fd, Sn_DPORT);
-    connection._sock_fd = _sock_fd;
-    connection.set_address(host, port);
-    return 0;
-}
+/* Copyright (C) 2012 mbed.org, MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include "TCPSocketServer.h"
+
+TCPSocketServer::TCPSocketServer() {}
 
+// Server initialization
+int TCPSocketServer::bind(int port) {
+    if (_sock_fd < 0) {
+        _sock_fd = eth->new_socket();
+        if (_sock_fd < 0) {
+            return -1;
+        }
+    }
+    // set TCP protocol
+    eth->setProtocol(_sock_fd, TCP);
+    // set local port
+    eth->sreg<uint16_t>(_sock_fd, Sn_PORT, port);
+    // connect the network
+    eth->scmd(_sock_fd, OPEN);
+    return 0;
+}
+
+int TCPSocketServer::listen(int backlog) {
+    if (_sock_fd < 0) {
+        return -1;
+    }
+    if (backlog != 1) {
+        return -1;
+    }
+    eth->scmd(_sock_fd, LISTEN);
+    return 0;
+}
+
+
+int TCPSocketServer::accept(TCPSocketConnection& connection) {
+    if (_sock_fd < 0) {
+        return -1;
+    }
+    Timer t;
+    t.reset();
+    t.start();
+    while(1) {
+        if (t.read_ms() > _timeout && _blocking == false) {
+            return -1;
+        }
+        if (eth->sreg<uint8_t>(_sock_fd, Sn_SR) == SOCK_ESTABLISHED) {
+            break;
+        }
+    }
+    uint32_t ip = eth->sreg<uint32_t>(_sock_fd, Sn_DIPR);
+    char host[16];
+    snprintf(host, sizeof(host), "%d.%d.%d.%d", (ip>>24)&0xff, (ip>>16)&0xff, (ip>>8)&0xff, ip&0xff);
+    uint16_t port = eth->sreg<uint16_t>(_sock_fd, Sn_DPORT);
+    connection._sock_fd = _sock_fd;
+    connection.set_address(host, port);
+    return 0;
+}
+

diff -r e187daf510da -r 53191b0b1f16 WIZnetInterface/WIZnet/wiznet.h
--- a/WIZnetInterface/WIZnet/wiznet.h	Mon Jun 09 22:36:16 2014 +0000
+++ b/WIZnetInterface/WIZnet/wiznet.h	Tue Jul 01 17:52:55 2014 +0000
@@ -22,9 +22,9 @@
 #include "mbed.h"
 #include "mbed_debug.h"
 
-#define USE_W5500
+//#define USE_W5500
 //#define USE_W5200
-//#define USE_W5100
+#define USE_W5100
 
 #if defined(USE_W5500)
 #include "W5500.h"