Diff: cc3000.h

Revision:

16:f3676ae62f96

Parent:

15:aae737ca3dd2

Parent:

12:1c2a856c618a

Child:

17:14b6a3a2b622

diff -r aae737ca3dd2 -r f3676ae62f96 cc3000.h
--- a/cc3000.h	Wed Oct 02 15:29:26 2013 +0000
+++ b/cc3000.h	Wed Oct 02 16:00:41 2013 +0000
@@ -277,27 +277,26 @@
 public:
     cc3000_socket(cc3000_simple_link &simplelink, cc3000_hci &hci, cc3000_event &event);
     ~cc3000_socket();
-    int32_t HostFlowControlConsumeBuff(int32_t sd);
     int32_t socket(int32_t domain, int32_t type, int32_t protocol);
-    int32_t closesocket(int32_t sd);
     int32_t accept(int32_t sd, sockaddr *addr, socklen_t *addrlen);
     int32_t bind(int32_t sd, const sockaddr *addr, int32_t addrlen);
+    int32_t HostFlowControlConsumeBuff(int32_t sd);
+    int32_t closesocket(int32_t sd);
     int32_t listen(int32_t sd, int32_t backlog);
-#ifndef CC3000_TINY_DRIVER
-    int32_t gethostbyname(uint8_t * hostname, uint16_t name_length, uint32_t* out_ip_addr);
-    int32_t get_host_by_name(uint8_t * hostname, uint16_t name_length, uint32_t* out_ip_addr);
-    int32_t set_sockopt(int32_t sd, int32_t level, int32_t optname, const void *optval, socklen_t optlen);
-#endif
     int32_t connect(int32_t sd, const sockaddr *addr, int32_t addrlen);
     int32_t select(int32_t nfds, fd_set *readsds, fd_set *writesds, fd_set *exceptsds, struct timeval *timeout);
-    int32_t get_sockopt (int32_t sd, int32_t level, int32_t optname, void *optval, socklen_t *optlen);
+    int32_t getsockopt (int32_t sd, int32_t level, int32_t optname, void *optval, socklen_t *optlen);
     int32_t simple_link_recv(int32_t sd, void *buf, int32_t len, int32_t flags, sockaddr *from, socklen_t *fromlen, int32_t opcode);
+    int32_t simple_link_send(int32_t sd, const void *buf, int32_t len, int32_t flags, const sockaddr *to, int32_t tolen, int32_t opcode);
     int32_t recv(int32_t sd, void *buf, int32_t len, int32_t flags);
     int32_t recvfrom(int32_t sd, void *buf, int32_t len, int32_t flags, sockaddr *from, socklen_t *fromlen);
-    int32_t simple_link_send(int32_t sd, const void *buf, int32_t len, int32_t flags, const sockaddr *to, int32_t tolen, int32_t opcode);
     int32_t send(int32_t sd, const void *buf, int32_t len, int32_t flags);
     int32_t sendto(int32_t sd, const void *buf, int32_t len, int32_t flags, const sockaddr *to, socklen_t tolen);
     int32_t mdns_advertiser(uint16_t mdns_enabled, uint8_t * device_service_name, uint16_t device_service_name_length);
+#ifndef CC3000_TINY_DRIVER
+    int32_t gethostbyname(uint8_t *hostname, uint16_t name_length, uint32_t *out_ip_addr);
+    int32_t setsockopt(int32_t sd, int32_t level, int32_t optname, const void *optval, socklen_t optlen);
+#endif
 private:
     cc3000_simple_link  &_simple_link;
     cc3000_hci          &_hci;