Diff: ESP8266Interface.cpp

Revision:

51:eb8c3577e22d

Parent:

50:2d7f6b97234e

Child:

54:e78fad32cfff

--- a/ESP8266Interface.cpp	Mon Feb 29 23:05:00 2016 +0000
+++ b/ESP8266Interface.cpp	Mon Feb 29 23:13:15 2016 +0000
@@ -23,36 +23,6 @@
 #define ESP8266_MISC_TIMEOUT    500
 
 
-/** ESP8266Socket class
- *  Implementation of the SocketInterface for the ESP8266
- */
-class ESP8266Socket : public SocketInterface
-{
-public:
-    // ESP8266 specific methods
-    ESP8266Socket(
-        ESP8266 *esp,
-        ns_protocol_t proto,
-        int id);
-
-    virtual ~ESP8266Socket();
-
-    int getID() const;
-
-    // Implementation of SocketInterface
-    virtual int32_t open(const char *ip, uint16_t port);
-    virtual int32_t close();
-
-    virtual int32_t send(const void *data, uint32_t size);
-    virtual int32_t recv(void *data, uint32_t size);
-
-private:
-    ESP8266 *_esp;
-    ns_protocol_t _proto;
-    int _id;
-};
-
-
 // ESP8266Interface implementation
 ESP8266Interface::ESP8266Interface(PinName tx, PinName rx, bool debug)
     : _esp(tx, rx, debug)
@@ -134,27 +104,13 @@
 void ESP8266Interface::destroySocket(SocketInterface *iface)
 {
     ESP8266Socket *socket = (ESP8266Socket *)iface;
-    _ids[socket->getID()] = false;
+    _ids[socket->_id] = false;
     delete socket;
 }
 
 
 // ESP8266Socket implementation
-ESP8266Socket::ESP8266Socket(
-        ESP8266 *esp,
-        ns_protocol_t proto,
-        int id)
-    : _esp(esp)
-    , _proto(proto)
-    , _id(id)
-{
-}
-
-ESP8266Socket::~ESP8266Socket()
-{
-}
-
-int32_t ESP8266Socket::open(const char *ip, uint16_t port)
+int32_t ESP8266Interface::ESP8266Socket::open(const char *ip, uint16_t port)
 {
     _esp->setTimeout(ESP8266_MISC_TIMEOUT);
 
@@ -167,7 +123,7 @@
     return 0;
 }
 
-int32_t ESP8266Socket::close()
+int32_t ESP8266Interface::ESP8266Interface::ESP8266Socket::close()
 {
     _esp->setTimeout(ESP8266_MISC_TIMEOUT);
 
@@ -178,7 +134,7 @@
     return 0;
 }
 
-int32_t ESP8266Socket::send(const void *data, uint32_t size)
+int32_t ESP8266Interface::ESP8266Socket::send(const void *data, uint32_t size)
 {
     _esp->setTimeout(ESP8266_SEND_TIMEOUT);
 
@@ -189,7 +145,7 @@
     return 0;
 }
 
-int32_t ESP8266Socket::recv(void *data, uint32_t size)
+int32_t ESP8266Interface::ESP8266Socket::recv(void *data, uint32_t size)
 {
     _esp->setTimeout(ESP8266_RECV_TIMEOUT);
 
@@ -202,7 +158,3 @@
     return recv;
 }
 
-int ESP8266Socket::getID() const {
-    return _id;
-}
-