cc3000 hostdriver with the mbed socket interface
Dependents: cc3000_hello_world_demo cc3000_simple_socket_demo cc3000_ntp_demo cc3000_ping_demo ... more
Revision 30:251a0a7d88de, committed 2013-10-06
- Comitter:
- Kojto
- Date:
- Sun Oct 06 17:22:49 2013 +0200
- Parent:
- 29:c40918cd9b6d
- Child:
- 31:7b6e85b68b01
- Commit message:
- TCP/UDP client/server removal (my own versions)
- Socket interface replaced those
Changed in this revision
--- a/cc3000.h Sun Oct 06 17:17:48 2013 +0200 +++ b/cc3000.h Sun Oct 06 17:22:49 2013 +0200 @@ -1123,68 +1123,6 @@ cc3000_hci &_hci; }; -/** Client TCP/UDP class - TODO - not complete client - */ -class cc3000_client { -public: - /** - */ - cc3000_client(cc3000 &cc3000_ref); - /** - */ - cc3000_client(cc3000 &cc3000_ref, int16_t socket); - /** - */ - bool connected(void); - /** - */ - int16_t write(const void *buffer, uint16_t length, uint32_t flags); - /** - */ - int16_t read(void *buffer, uint16_t length, uint32_t flags); - /** - */ - void close(void); - -private: - int16_t _current_socket; - cc3000 &_cc3000; -}; - -/** Server TCP/UDP - */ -class cc3000_server { -public: - /** ctor (server was not created successfully) - */ - cc3000_server(cc3000 &cc3000_ref, sockaddr socket_add); - /** ctor - */ - cc3000_server(cc3000 &cc3000_ref, sockaddr socket_add, int16_t socket); - /** Blocking accept - */ - int32_t accept(void); - /** - */ - int32_t receive(void *buffer, uint16_t length, uint32_t flags); - /** - */ - int32_t send(void *buffer, uint16_t length, uint32_t flags); - /** - */ - void bind(void); - /** - */ - void listen(uint32_t backlog); - /** - */ - void close(void); -private: - int16_t _current_socket; - sockaddr _socket_address; - cc3000 &_cc3000; -}; - /** The main class of entire cc3000 implementation */ class cc3000 { @@ -1316,25 +1254,6 @@ */ bool get_ip_config(tNetappIpconfigRetArgs *ip_config); #endif - /** Creates tcp client - * \param ip_address Client's IP address - * \param port Client's PORT - * \return client with socket != -1 - */ - cc3000_client create_tcp_client(uint32_t ip_address, uint16_t port); - /** Creates tcp server - * \param ip_address Server's IP address - * \param port Server's PORT - * \return server with socket != -1 - */ - cc3000_server create_tcp_server(uint32_t ip_address, uint16_t port); - /** - * \brief Creates udp client - * \param ip_address Server's IP address - * \param port Server's PORT - * \return client with socket != -1 - */ - cc3000_client create_udp_client(uint32_t ip_address, uint16_t port); /** * \brief Delete all stored profiles * \param none
--- a/cc3000_client.cpp Sun Oct 06 17:17:48 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -/***************************************************************************** -* -* C++ interface/implementation created by Martin Kojtal (0xc0170). Thanks to -* Jim Carver and Frank Vannieuwkerke for their inital cc3000 mbed port and -* provided help. -* -* This version of "host driver" uses CC3000 Host Driver Implementation. Thus -* read the following copyright: -* -* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* -* Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* -* Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the -* distribution. -* -* Neither the name of Texas Instruments Incorporated nor the names of -* its contributors may be used to endorse or promote products derived -* from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -*****************************************************************************/ -#include "cc3000.h" - -namespace mbed_cc3000 { - - -cc3000_client::cc3000_client(cc3000 &cc3000_ref) : _cc3000(cc3000_ref) { - _current_socket = -1; -} - -cc3000_client::cc3000_client(cc3000 &cc3000_ref, int16_t socket) : _cc3000(cc3000_ref) { - _current_socket = socket; -} - -bool cc3000_client::connected(void) { - if (_current_socket < 0) { - return false; - } - - return true; -} - -int16_t cc3000_client::write(const void *buffer, uint16_t length, uint32_t flags = 0) { - return _cc3000._socket.send(_current_socket, buffer, length, flags); -} - -int16_t cc3000_client::read(void *buffer, uint16_t length, uint32_t flags) -{ - return _cc3000._socket.recv(_current_socket, buffer, length, flags); - -} - -} /* end of mbed_cc3000 namespace */
--- a/cc3000_server.cpp Sun Oct 06 17:17:48 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -/***************************************************************************** -* -* C++ interface/implementation created by Martin Kojtal (0xc0170). Thanks to -* Jim Carver and Frank Vannieuwkerke for their inital cc3000 mbed port and -* provided help. -* -* This version of "host driver" uses CC3000 Host Driver Implementation. Thus -* read the following copyright: -* -* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions -* are met: -* -* Redistributions of source code must retain the above copyright -* notice, this list of conditions and the following disclaimer. -* -* Redistributions in binary form must reproduce the above copyright -* notice, this list of conditions and the following disclaimer in the -* documentation and/or other materials provided with the -* distribution. -* -* Neither the name of Texas Instruments Incorporated nor the names of -* its contributors may be used to endorse or promote products derived -* from this software without specific prior written permission. -* -* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -*****************************************************************************/ -#include "cc3000.h" - -namespace mbed_cc3000 { -cc3000_server::cc3000_server(cc3000 &cc3000_ref, sockaddr socket_add) : _socket_address(socket_add), _cc3000(cc3000_ref) { - _current_socket = -1; -} - -cc3000_server::cc3000_server(cc3000 &cc3000_ref, sockaddr socket_add, int16_t socket) : _socket_address(socket_add), _cc3000(cc3000_ref) { - _current_socket = socket; -} - -int32_t cc3000_server::accept(void) { - int32_t client_descriptor = -2; - sockaddr dest_address; - - socklen_t address_length = sizeof(dest_address); - _current_socket = 0; - - DBG_HCI("Waiting for receiving a connection"); - - while((client_descriptor == -1) || (client_descriptor == -2)) - { - client_descriptor = _cc3000._socket.accept(_current_socket,&dest_address, &address_length); - } - - DBG_HCI("Received"); - - _current_socket = client_descriptor; - - return _current_socket; -} - -int32_t cc3000_server::receive(void *buffer, uint16_t length, uint32_t flags) { - return _cc3000._socket.recv(_current_socket, buffer, length, flags); -} - -int32_t cc3000_server::send(void *buffer, uint16_t length, uint32_t flags) { - return _cc3000._socket.send(_current_socket, buffer, length, flags); -} - -void cc3000_server::bind(void) { - _cc3000._socket.bind(_current_socket, &_socket_address, sizeof(sockaddr)); -} - -void cc3000_server::listen(uint32_t backlog) { - _cc3000._socket.listen(_current_socket, backlog); -} - -void cc3000_server::close(void) { - _cc3000._socket.closesocket(_current_socket); -} - -}