Skip to content

Commit d9f7120

Browse files
dpgeorgedpgeorge
committed
cc3200: Use simplelink API instead of emulated BSD API.
Most of cc3200 uses explicit simplelink calls anyway, and this means there are no longer any clashes with macros from the C stdlib.
1 parent 29551ba commit d9f7120

5 files changed

Lines changed: 47 additions & 47 deletions

File tree

‎cc3200/ftp/ftp.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -500,12 +500,12 @@ static void ftp_wait_for_enabled (void) {
500500

501501
static bool ftp_create_listening_socket (_i16 *sd, _u16 port, _u8 backlog) {
502502
SlSockNonblocking_t nonBlockingOption;
503-
sockaddr_in sServerAddress;
503+
SlSockAddrIn_t sServerAddress;
504504
_i16 _sd;
505505
_i16 result;
506506

507507
// Open a socket for ftp data listen
508-
ASSERT ((*sd = sl_Socket(AF_INET, SOCK_STREAM, IPPROTO_IP)) > 0);
508+
ASSERT ((*sd = sl_Socket(SL_AF_INET, SL_SOCK_STREAM, SL_IPPROTO_IP)) > 0);
509509
_sd = *sd;
510510

511511
if (_sd > 0) {
@@ -514,12 +514,12 @@ static bool ftp_create_listening_socket (_i16 *sd, _u16 port, _u8 backlog) {
514514

515515
// Enable non-blocking mode
516516
nonBlockingOption.NonblockingEnabled = 1;
517-
ASSERT ((result = sl_SetSockOpt(_sd, SOL_SOCKET, SL_SO_NONBLOCKING, &nonBlockingOption, sizeof(nonBlockingOption))) == SL_SOC_OK);
517+
ASSERT ((result = sl_SetSockOpt(_sd, SL_SOL_SOCKET, SL_SO_NONBLOCKING, &nonBlockingOption, sizeof(nonBlockingOption))) == SL_SOC_OK);
518518

519519
// Bind the socket to a port number
520-
sServerAddress.sin_family = AF_INET;
521-
sServerAddress.sin_addr.s_addr = INADDR_ANY;
522-
sServerAddress.sin_port = htons(port);
520+
sServerAddress.sin_family = SL_AF_INET;
521+
sServerAddress.sin_addr.s_addr = SL_INADDR_ANY;
522+
sServerAddress.sin_port = sl_Htons(port);
523523

524524
ASSERT ((result |= sl_Bind(_sd, (const SlSockAddr_t *)&sServerAddress, sizeof(sServerAddress))) == SL_SOC_OK);
525525

@@ -535,7 +535,7 @@ static bool ftp_create_listening_socket (_i16 *sd, _u16 port, _u8 backlog) {
535535
}
536536

537537
static ftp_result_t ftp_wait_for_connection (_i16 l_sd, _i16 *n_sd) {
538-
sockaddr_in sClientAddress;
538+
SlSockAddrIn_t sClientAddress;
539539
SlSocklen_t in_addrSize;
540540

541541
// accepts a connection from a TCP client, if there is any, otherwise returns SL_EAGAIN

‎cc3200/mods/modusocket.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ void modusocket_socket_delete (int16_t sd) {
9595
}
9696

9797
void modusocket_enter_sleep (void) {
98-
fd_set socketset;
98+
SlFdSet_t socketset;
9999
int16_t maxfd = 0;
100100

101101
for (int i = 0; i < MOD_NETWORK_MAX_SOCKETS; i++) {
102102
int16_t sd;
103103
if ((sd = modusocket_sockets[i].sd) >= 0) {
104-
FD_SET(sd, &socketset);
104+
SL_FD_SET(sd, &socketset);
105105
maxfd = (maxfd > sd) ? maxfd : sd;
106106
}
107107
}
@@ -133,9 +133,9 @@ STATIC mp_obj_t socket_make_new(const mp_obj_type_t *type, size_t n_args, size_t
133133
// create socket object
134134
mod_network_socket_obj_t *s = m_new_obj_with_finaliser(mod_network_socket_obj_t);
135135
s->base.type = (mp_obj_t)&socket_type;
136-
s->sock_base.u_param.domain = AF_INET;
137-
s->sock_base.u_param.type = SOCK_STREAM;
138-
s->sock_base.u_param.proto = IPPROTO_TCP;
136+
s->sock_base.u_param.domain = SL_AF_INET;
137+
s->sock_base.u_param.type = SL_SOCK_STREAM;
138+
s->sock_base.u_param.proto = SL_IPPROTO_TCP;
139139
s->sock_base.u_param.fileno = -1;
140140
s->sock_base.has_timeout = false;
141141
s->sock_base.cert_req = false;
@@ -501,13 +501,13 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
501501

502502
// ipv4 only
503503
uint8_t out_ip[MOD_NETWORK_IPV4ADDR_BUF_SIZE];
504-
int32_t result = wlan_gethostbyname(host, hlen, out_ip, AF_INET);
504+
int32_t result = wlan_gethostbyname(host, hlen, out_ip, SL_AF_INET);
505505
if (result < 0) {
506506
mp_raise_OSError(-result);
507507
}
508508
mp_obj_tuple_t *tuple = mp_obj_new_tuple(5, NULL);
509-
tuple->items[0] = MP_OBJ_NEW_SMALL_INT(AF_INET);
510-
tuple->items[1] = MP_OBJ_NEW_SMALL_INT(SOCK_STREAM);
509+
tuple->items[0] = MP_OBJ_NEW_SMALL_INT(SL_AF_INET);
510+
tuple->items[1] = MP_OBJ_NEW_SMALL_INT(SL_SOCK_STREAM);
511511
tuple->items[2] = MP_OBJ_NEW_SMALL_INT(0);
512512
tuple->items[3] = MP_OBJ_NEW_QSTR(MP_QSTR_);
513513
tuple->items[4] = netutils_format_inet_addr(out_ip, port, NETUTILS_LITTLE);
@@ -525,14 +525,14 @@ STATIC const mp_map_elem_t mp_module_usocket_globals_table[] = {
525525
{ MP_OBJ_NEW_QSTR(MP_QSTR_timeout), (mp_obj_t)&mp_type_TimeoutError },
526526

527527
// class constants
528-
{ MP_OBJ_NEW_QSTR(MP_QSTR_AF_INET), MP_OBJ_NEW_SMALL_INT(AF_INET) },
528+
{ MP_OBJ_NEW_QSTR(MP_QSTR_AF_INET), MP_OBJ_NEW_SMALL_INT(SL_AF_INET) },
529529

530-
{ MP_OBJ_NEW_QSTR(MP_QSTR_SOCK_STREAM), MP_OBJ_NEW_SMALL_INT(SOCK_STREAM) },
531-
{ MP_OBJ_NEW_QSTR(MP_QSTR_SOCK_DGRAM), MP_OBJ_NEW_SMALL_INT(SOCK_DGRAM) },
530+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SOCK_STREAM), MP_OBJ_NEW_SMALL_INT(SL_SOCK_STREAM) },
531+
{ MP_OBJ_NEW_QSTR(MP_QSTR_SOCK_DGRAM), MP_OBJ_NEW_SMALL_INT(SL_SOCK_DGRAM) },
532532

533533
{ MP_OBJ_NEW_QSTR(MP_QSTR_IPPROTO_SEC), MP_OBJ_NEW_SMALL_INT(SL_SEC_SOCKET) },
534-
{ MP_OBJ_NEW_QSTR(MP_QSTR_IPPROTO_TCP), MP_OBJ_NEW_SMALL_INT(IPPROTO_TCP) },
535-
{ MP_OBJ_NEW_QSTR(MP_QSTR_IPPROTO_UDP), MP_OBJ_NEW_SMALL_INT(IPPROTO_UDP) },
534+
{ MP_OBJ_NEW_QSTR(MP_QSTR_IPPROTO_TCP), MP_OBJ_NEW_SMALL_INT(SL_IPPROTO_TCP) },
535+
{ MP_OBJ_NEW_QSTR(MP_QSTR_IPPROTO_UDP), MP_OBJ_NEW_SMALL_INT(SL_IPPROTO_UDP) },
536536
};
537537

538538
STATIC MP_DEFINE_CONST_DICT(mp_module_usocket_globals, mp_module_usocket_globals_table);

‎cc3200/mods/modwlan.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ typedef enum{
122122
#define WLAN_MAX_RX_SIZE 16000
123123
#define WLAN_MAX_TX_SIZE 1476
124124

125-
#define MAKE_SOCKADDR(addr, ip, port) sockaddr addr; \
126-
addr.sa_family = AF_INET; \
125+
#define MAKE_SOCKADDR(addr, ip, port) SlSockAddr_t addr; \
126+
addr.sa_family = SL_AF_INET; \
127127
addr.sa_data[0] = port >> 8; \
128128
addr.sa_data[1] = port; \
129129
addr.sa_data[2] = ip[3]; \
@@ -1364,8 +1364,8 @@ int wlan_socket_listen(mod_network_socket_obj_t *s, mp_int_t backlog, int *_errn
13641364
int wlan_socket_accept(mod_network_socket_obj_t *s, mod_network_socket_obj_t *s2, byte *ip, mp_uint_t *port, int *_errno) {
13651365
// accept incoming connection
13661366
int16_t sd;
1367-
sockaddr addr;
1368-
socklen_t addr_len = sizeof(addr);
1367+
SlSockAddr_t addr;
1368+
SlSocklen_t addr_len = sizeof(addr);
13691369

13701370
sd = sl_Accept(s->sock_base.sd, &addr, &addr_len);
13711371
// save the socket descriptor
@@ -1413,7 +1413,7 @@ int wlan_socket_recv(mod_network_socket_obj_t *s, byte *buf, mp_uint_t len, int
14131413

14141414
int wlan_socket_sendto( mod_network_socket_obj_t *s, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno) {
14151415
MAKE_SOCKADDR(addr, ip, port)
1416-
int ret = sl_SendTo(s->sock_base.sd, (byte*)buf, len, 0, (sockaddr*)&addr, sizeof(addr));
1416+
int ret = sl_SendTo(s->sock_base.sd, (byte*)buf, len, 0, (SlSockAddr_t*)&addr, sizeof(addr));
14171417
if (ret < 0) {
14181418
*_errno = ret;
14191419
return -1;
@@ -1422,8 +1422,8 @@ int wlan_socket_sendto( mod_network_socket_obj_t *s, const byte *buf, mp_uint_t
14221422
}
14231423

14241424
int wlan_socket_recvfrom(mod_network_socket_obj_t *s, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno) {
1425-
sockaddr addr;
1426-
socklen_t addr_len = sizeof(addr);
1425+
SlSockAddr_t addr;
1426+
SlSocklen_t addr_len = sizeof(addr);
14271427
mp_int_t ret = sl_RecvFrom(s->sock_base.sd, buf, MIN(len, WLAN_MAX_RX_SIZE), 0, &addr, &addr_len);
14281428
if (ret < 0) {
14291429
*_errno = ret;
@@ -1454,14 +1454,14 @@ int wlan_socket_settimeout(mod_network_socket_obj_t *s, mp_uint_t timeout_s, int
14541454
// set blocking mode
14551455
option.NonblockingEnabled = 0;
14561456
}
1457-
ret = sl_SetSockOpt(s->sock_base.sd, SOL_SOCKET, SO_NONBLOCKING, &option, sizeof(option));
1457+
ret = sl_SetSockOpt(s->sock_base.sd, SL_SOL_SOCKET, SL_SO_NONBLOCKING, &option, sizeof(option));
14581458
has_timeout = false;
14591459
} else {
14601460
// set timeout
14611461
struct SlTimeval_t timeVal;
14621462
timeVal.tv_sec = timeout_s; // seconds
14631463
timeVal.tv_usec = 0; // microseconds. 10000 microseconds resolution
1464-
ret = sl_SetSockOpt(s->sock_base.sd, SOL_SOCKET, SO_RCVTIMEO, &timeVal, sizeof(timeVal));
1464+
ret = sl_SetSockOpt(s->sock_base.sd, SL_SOL_SOCKET, SL_SO_RCVTIMEO, &timeVal, sizeof(timeVal));
14651465
has_timeout = true;
14661466
}
14671467

@@ -1482,20 +1482,20 @@ int wlan_socket_ioctl (mod_network_socket_obj_t *s, mp_uint_t request, mp_uint_t
14821482
int32_t sd = s->sock_base.sd;
14831483

14841484
// init fds
1485-
fd_set rfds, wfds, xfds;
1486-
FD_ZERO(&rfds);
1487-
FD_ZERO(&wfds);
1488-
FD_ZERO(&xfds);
1485+
SlFdSet_t rfds, wfds, xfds;
1486+
SL_FD_ZERO(&rfds);
1487+
SL_FD_ZERO(&wfds);
1488+
SL_FD_ZERO(&xfds);
14891489

14901490
// set fds if needed
14911491
if (flags & MP_STREAM_POLL_RD) {
1492-
FD_SET(sd, &rfds);
1492+
SL_FD_SET(sd, &rfds);
14931493
}
14941494
if (flags & MP_STREAM_POLL_WR) {
1495-
FD_SET(sd, &wfds);
1495+
SL_FD_SET(sd, &wfds);
14961496
}
14971497
if (flags & MP_STREAM_POLL_HUP) {
1498-
FD_SET(sd, &xfds);
1498+
SL_FD_SET(sd, &xfds);
14991499
}
15001500

15011501
// call simplelink's select with minimum timeout
@@ -1511,13 +1511,13 @@ int wlan_socket_ioctl (mod_network_socket_obj_t *s, mp_uint_t request, mp_uint_t
15111511
}
15121512

15131513
// check return of select
1514-
if (FD_ISSET(sd, &rfds)) {
1514+
if (SL_FD_ISSET(sd, &rfds)) {
15151515
ret |= MP_STREAM_POLL_RD;
15161516
}
1517-
if (FD_ISSET(sd, &wfds)) {
1517+
if (SL_FD_ISSET(sd, &wfds)) {
15181518
ret |= MP_STREAM_POLL_WR;
15191519
}
1520-
if (FD_ISSET(sd, &xfds)) {
1520+
if (SL_FD_ISSET(sd, &xfds)) {
15211521
ret |= MP_STREAM_POLL_HUP;
15221522
}
15231523
} else {

‎cc3200/simplelink/user.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ extern "C" {
163163
164164
\warning
165165
*/
166-
#define SL_INC_STD_BSD_API_NAMING
166+
/* #define SL_INC_STD_BSD_API_NAMING */
167167

168168

169169
/*!

‎cc3200/telnet/telnet.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -296,23 +296,23 @@ static void telnet_wait_for_enabled (void) {
296296

297297
static bool telnet_create_socket (void) {
298298
SlSockNonblocking_t nonBlockingOption;
299-
sockaddr_in sServerAddress;
299+
SlSockAddrIn_t sServerAddress;
300300
_i16 result;
301301

302302
// Open a socket for telnet
303-
ASSERT ((telnet_data.sd = sl_Socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) > 0);
303+
ASSERT ((telnet_data.sd = sl_Socket(SL_AF_INET, SL_SOCK_STREAM, SL_IPPROTO_TCP)) > 0);
304304
if (telnet_data.sd > 0) {
305305
// add the socket to the network administration
306306
modusocket_socket_add(telnet_data.sd, false);
307307

308308
// Enable non-blocking mode
309309
nonBlockingOption.NonblockingEnabled = 1;
310-
ASSERT ((result = sl_SetSockOpt(telnet_data.sd, SOL_SOCKET, SL_SO_NONBLOCKING, &nonBlockingOption, sizeof(nonBlockingOption))) == SL_SOC_OK);
310+
ASSERT ((result = sl_SetSockOpt(telnet_data.sd, SL_SOL_SOCKET, SL_SO_NONBLOCKING, &nonBlockingOption, sizeof(nonBlockingOption))) == SL_SOC_OK);
311311

312312
// Bind the socket to a port number
313-
sServerAddress.sin_family = AF_INET;
314-
sServerAddress.sin_addr.s_addr = INADDR_ANY;
315-
sServerAddress.sin_port = htons(TELNET_PORT);
313+
sServerAddress.sin_family = SL_AF_INET;
314+
sServerAddress.sin_addr.s_addr = SL_INADDR_ANY;
315+
sServerAddress.sin_port = sl_Htons(TELNET_PORT);
316316

317317
ASSERT ((result |= sl_Bind(telnet_data.sd, (const SlSockAddr_t *)&sServerAddress, sizeof(sServerAddress))) == SL_SOC_OK);
318318

@@ -330,7 +330,7 @@ static bool telnet_create_socket (void) {
330330

331331
static void telnet_wait_for_connection (void) {
332332
SlSocklen_t in_addrSize;
333-
sockaddr_in sClientAddress;
333+
SlSockAddrIn_t sClientAddress;
334334

335335
// accepts a connection from a TCP client, if there is any, otherwise returns SL_EAGAIN
336336
telnet_data.n_sd = sl_Accept(telnet_data.sd, (SlSockAddr_t *)&sClientAddress, (SlSocklen_t *)&in_addrSize);

0 commit comments

Comments
 (0)