michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: wifi: remove dependency on NET_SOCKETS_POSIX_NAMES

Browse source 
This change removes references to raw POSIX types and functions,
allowing the drivers to build without NET_SOCKETS_POSIX_NAMES.

After this, the dependency between NET_SOCKETS_OFFLOAD and
NET_SOCKETS_POSIX_NAMES can be removed.

See issue #26033 for additional context

Signed-off-by: Adam Porter <porter.adam@gmail.com>
This commit is contained in:
Adam Porter 2020-06-11 15:30:14 -07:00 • committed by Carles Cufí
commit 722a85aea2
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/wifi/eswifi/eswifi_socket_offload.c
View file

@ -412,7 +412,7 @@ unlock:
return idx; return idx;
} }
static int eswifi_socket_poll(struct pollfd *fds, int nfds, int msecs) static int eswifi_socket_poll(struct zsock_pollfd *fds, int nfds, int msecs)
{ {
struct eswifi_off_socket *socket; struct eswifi_off_socket *socket;
int sock, ret; int sock, ret;

14
drivers/wifi/simplelink/simplelink_sockets.c
View file

@ -526,7 +526,7 @@ exit:
static const struct socket_op_vtable simplelink_socket_fd_op_vtable; static const struct socket_op_vtable simplelink_socket_fd_op_vtable;
static int simplelink_poll(struct pollfd *fds, int nfds, int msecs) static int simplelink_poll(struct zsock_pollfd *fds, int nfds, int msecs)
{ {
int max_sd = 0; int max_sd = 0;
struct SlTimeval_t tv, *ptv; struct SlTimeval_t tv, *ptv;
@ -987,18 +987,18 @@ static int simplelink_getaddrinfo(const char *node, const char *service,
/* Check args: */ /* Check args: */
if (!node) { if (!node) {
retval = EAI_NONAME; retval = DNS_EAI_NONAME;
goto exit; goto exit;
} }
if (service) { if (service) {
port = strtol(service, NULL, 10); port = strtol(service, NULL, 10);
if (port < 1 || port > USHRT_MAX) { if (port < 1 || port > USHRT_MAX) {
retval = EAI_SERVICE; retval = DNS_EAI_SERVICE;
goto exit; goto exit;
} }
} }
if (!res) { if (!res) {
retval = EAI_NONAME; retval = DNS_EAI_NONAME;
goto exit; goto exit;
} }
@ -1018,7 +1018,7 @@ static int simplelink_getaddrinfo(const char *node, const char *service,
if (retval < 0) { if (retval < 0) {
LOG_ERR("Could not resolve name: %s, retval: %d", LOG_ERR("Could not resolve name: %s, retval: %d",
node, retval); node, retval);
retval = EAI_NONAME; retval = DNS_EAI_NONAME;
goto exit; goto exit;
} }
@ -1026,13 +1026,13 @@ static int simplelink_getaddrinfo(const char *node, const char *service,
*res = calloc(1, sizeof(struct zsock_addrinfo)); *res = calloc(1, sizeof(struct zsock_addrinfo));
ai = *res; ai = *res;
if (!ai) { if (!ai) {
retval = EAI_MEMORY; retval = DNS_EAI_MEMORY;
goto exit; goto exit;
} else { } else {
/* Now, alloc the embedded sockaddr struct: */ /* Now, alloc the embedded sockaddr struct: */
ai_addr = calloc(1, sizeof(struct sockaddr)); ai_addr = calloc(1, sizeof(struct sockaddr));
if (!ai_addr) { if (!ai_addr) {
retval = EAI_MEMORY; retval = DNS_EAI_MEMORY;
free(*res); free(*res);
goto exit; goto exit;
} }