sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/local: Remove all HAVE_LOCAL_POLL reference

Browse Source 
since HAVE_LOCAL_POLL always hardcode to 1

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-06-16 17:39:23 +08:00 committed by Gustavo Henrique Nihei
parent 4666b39f9c
commit d8769cb4f0
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net/local/local.h
View File

@ -45,7 +45,6 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#define HAVE_LOCAL_POLL 1
#define LOCAL_NPOLLWAITERS 2 #define LOCAL_NPOLLWAITERS 2
/* Packet format in FIFO: /* Packet format in FIFO:
@ -151,14 +150,12 @@ struct local_conn_s
sem_t lc_waitsem; /* Use to wait for a connection to be accepted */ sem_t lc_waitsem; /* Use to wait for a connection to be accepted */
#ifdef HAVE_LOCAL_POLL
/* The following is a list if poll structures of threads waiting for /* The following is a list if poll structures of threads waiting for
* socket events. * socket events.
*/ */
struct pollfd *lc_accept_fds[LOCAL_NPOLLWAITERS]; struct pollfd *lc_accept_fds[LOCAL_NPOLLWAITERS];
struct pollfd lc_inout_fds[2*LOCAL_NPOLLWAITERS]; struct pollfd lc_inout_fds[2*LOCAL_NPOLLWAITERS];
#endif
/* Union of fields unique to SOCK_STREAM client, server, and connected /* Union of fields unique to SOCK_STREAM client, server, and connected
* peers. * peers.
@ -628,12 +625,8 @@ int local_open_sender(FAR struct local_conn_s *conn, FAR const char *path,
* Name: local_accept_pollnotify * Name: local_accept_pollnotify
****************************************************************************/ ****************************************************************************/
#ifdef HAVE_LOCAL_POLL
void local_accept_pollnotify(FAR struct local_conn_s *conn, void local_accept_pollnotify(FAR struct local_conn_s *conn,
pollevent_t eventset); pollevent_t eventset);
#else
#define local_accept_pollnotify(conn, eventset) ((void)(conn))
#endif
/**************************************************************************** /****************************************************************************
* Name: local_pollsetup * Name: local_pollsetup
@ -651,9 +644,7 @@ void local_accept_pollnotify(FAR struct local_conn_s *conn,
* *
****************************************************************************/ ****************************************************************************/
#ifdef HAVE_LOCAL_POLL
int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds); int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds);
#endif
/**************************************************************************** /****************************************************************************
* Name: local_pollteardown * Name: local_pollteardown
@ -671,9 +662,7 @@ int local_pollsetup(FAR struct socket *psock, FAR struct pollfd *fds);
* *
****************************************************************************/ ****************************************************************************/
#ifdef HAVE_LOCAL_POLL
int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds); int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds);
#endif
#undef EXTERN #undef EXTERN
#ifdef __cplusplus #ifdef __cplusplus

4
net/local/local_netpoll.c
View File

@ -36,8 +36,6 @@
#include "socket/socket.h" #include "socket/socket.h"
#include "local/local.h" #include "local/local.h"
#ifdef HAVE_LOCAL_POLL
/**************************************************************************** /****************************************************************************
* Name: local_accept_pollsetup * Name: local_accept_pollsetup
****************************************************************************/ ****************************************************************************/
@ -390,5 +388,3 @@ int local_pollteardown(FAR struct socket *psock, FAR struct pollfd *fds)
return ret; return ret;
} }
#endif /* HAVE_LOCAL_POLL */

4
net/local/local_sockif.c
View File

@ -609,9 +609,6 @@ static int local_accept(FAR struct socket *psock, FAR struct sockaddr *addr,
static int local_poll(FAR struct socket *psock, FAR struct pollfd *fds, static int local_poll(FAR struct socket *psock, FAR struct pollfd *fds,
bool setup) bool setup)
{ {
#ifndef HAVE_LOCAL_POLL
return -ENOSYS;
#else
/* Check if we are setting up or tearing down the poll */ /* Check if we are setting up or tearing down the poll */
if (setup) if (setup)
@ -626,7 +623,6 @@ static int local_poll(FAR struct socket *psock, FAR struct pollfd *fds,
return local_pollteardown(psock, fds); return local_pollteardown(psock, fds);
} }
#endif /* HAVE_LOCAL_POLL */
} }
/**************************************************************************** /****************************************************************************