From 3f7d2c8977368de7b2309a511c36d2a5d802f7c9 Mon Sep 17 00:00:00 2001
From: amcewen <amcewen@bcs.org.uk>
Date: Mon, 29 Aug 2011 22:36:28 +0100
Subject: Changed names of the Ethernet classes: Client -> EthernetClient,
 NetClient -> Client, and basic testing performed

---
 cores/arduino/Client.h    | 27 +++++++++++++++++++++++++++
 cores/arduino/NetClient.h | 25 -------------------------
 cores/arduino/NetServer.h | 11 -----------
 cores/arduino/Server.h    |  9 +++++++++
 4 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 cores/arduino/Client.h
 delete mode 100644 cores/arduino/NetClient.h
 delete mode 100644 cores/arduino/NetServer.h
 create mode 100644 cores/arduino/Server.h

(limited to 'cores')

diff --git a/cores/arduino/Client.h b/cores/arduino/Client.h
new file mode 100644
index 0000000..ed9e9b4
--- /dev/null
+++ b/cores/arduino/Client.h
@@ -0,0 +1,27 @@
+#ifndef client_h
+#define client_h
+#include "Print.h"
+#include "Stream.h"
+#include "IPAddress.h"
+
+class Client : public Stream {
+
+public:
+  virtual int connect(IPAddress ip, uint16_t port) =0;
+  virtual int connect(const char *host, uint16_t port) =0;
+  virtual size_t write(uint8_t) =0;
+  virtual size_t write(const char *str) =0;
+  virtual size_t write(const uint8_t *buf, size_t size) =0;
+  virtual int available() = 0;
+  virtual int read() = 0;
+  virtual int read(uint8_t *buf, size_t size) = 0;
+  virtual int peek() = 0;
+  virtual void flush() = 0;
+  virtual void stop() = 0;
+  virtual uint8_t connected() = 0;
+  virtual operator bool() = 0;
+protected:
+  uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); };
+};
+
+#endif
diff --git a/cores/arduino/NetClient.h b/cores/arduino/NetClient.h
deleted file mode 100644
index 35bfa0a..0000000
--- a/cores/arduino/NetClient.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef netclient_h
-#define netclient_h
-#include "Print.h"
-#include "NetClient.h"
-#include "IPAddress.h"
-
-class NetClient : public Stream {
-
-public:
-  virtual int connect(IPAddress ip, uint16_t port) =0;
-  virtual int connect(const char *host, uint16_t port) =0;
-  virtual size_t write(uint8_t) =0;
-  virtual size_t write(const char *str) =0;
-  virtual size_t write(const uint8_t *buf, size_t size) =0;
-  virtual int available() = 0;
-  virtual int read() = 0;
-  virtual int read(uint8_t *buf, size_t size) = 0;
-  virtual int peek() = 0;
-  virtual void flush() = 0;
-  virtual void stop() = 0;
-  virtual uint8_t connected() = 0;
-  virtual operator bool() = 0;
-};
-
-#endif
diff --git a/cores/arduino/NetServer.h b/cores/arduino/NetServer.h
deleted file mode 100644
index 91f4848..0000000
--- a/cores/arduino/NetServer.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef netserver_h
-#define netserver_h
-
-class NetClient;
-
-class NetServer {
-public:
-  virtual void begin() =0;
-};
-
-#endif
diff --git a/cores/arduino/Server.h b/cores/arduino/Server.h
new file mode 100644
index 0000000..edab726
--- /dev/null
+++ b/cores/arduino/Server.h
@@ -0,0 +1,9 @@
+#ifndef server_h
+#define server_h
+
+class Server {
+public:
+  virtual void begin() =0;
+};
+
+#endif
-- 
cgit v1.2.3-18-g5258