abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 21:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "tcpip_send_msg_wait_sem() can return void now due to my last changes"

Browse Source 
My brain was asleep

This reverts commit 475be665ff8805088a688dbb66713f1a9e383b4d.
This commit is contained in:
Dirk Ziegelmeier 2016-04-26 22:03:18 +02:00
parent 475be665ff
commit b07031479c
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/api_lib.c
View File

@ -85,8 +85,10 @@ netconn_apimsg(tcpip_callback_fn fn, struct api_msg *apimsg)
apimsg->op_completed_sem = LWIP_NETCONN_THREAD_SEM_GET(); apimsg->op_completed_sem = LWIP_NETCONN_THREAD_SEM_GET();
#endif /* LWIP_NETCONN_SEM_PER_THREAD */ #endif /* LWIP_NETCONN_SEM_PER_THREAD */
tcpip_send_msg_wait_sem(fn, apimsg, LWIP_API_MSG_SEM(apimsg)); if (tcpip_send_msg_wait_sem(fn, apimsg, LWIP_API_MSG_SEM(apimsg)) == ERR_OK) {
return apimsg->err; return apimsg->err;
}
return ERR_VAL;
} }
/** /**
@ -396,7 +398,7 @@ netconn_accept(struct netconn *conn, struct netconn **new_conn)
/* Let the stack know that we have accepted the connection. */ /* Let the stack know that we have accepted the connection. */
API_MSG_VAR_ALLOC_DONTFAIL(msg); API_MSG_VAR_ALLOC_DONTFAIL(msg);
API_MSG_VAR_REF(msg).conn = newconn; API_MSG_VAR_REF(msg).conn = newconn;
/* don't care for the return value of lwip_netconn_do_accepted */ /* don't care for the return value of lwip_netconn_do_recv */
netconn_apimsg(lwip_netconn_do_accepted, &API_MSG_VAR_REF(msg)); netconn_apimsg(lwip_netconn_do_accepted, &API_MSG_VAR_REF(msg));
API_MSG_VAR_FREE(msg); API_MSG_VAR_FREE(msg);
#endif /* TCP_LISTEN_BACKLOG */ #endif /* TCP_LISTEN_BACKLOG */

5
src/api/tcpip.c
View File

@ -314,8 +314,9 @@ tcpip_untimeout(sys_timeout_handler h, void *arg)
* @param fn function to be called from TCPIP thread * @param fn function to be called from TCPIP thread
* @param apimsg argument to API function * @param apimsg argument to API function
* @param sem semaphore to wait on * @param sem semaphore to wait on
* @return ERR_OK if the function was called, another err_t if not
*/ */
void err_t
tcpip_send_msg_wait_sem(tcpip_callback_fn fn, void *apimsg, sys_sem_t* sem) tcpip_send_msg_wait_sem(tcpip_callback_fn fn, void *apimsg, sys_sem_t* sem)
{ {
#if LWIP_TCPIP_CORE_LOCKING #if LWIP_TCPIP_CORE_LOCKING
@ -323,6 +324,7 @@ tcpip_send_msg_wait_sem(tcpip_callback_fn fn, void *apimsg, sys_sem_t* sem)
LOCK_TCPIP_CORE(); LOCK_TCPIP_CORE();
fn(apimsg); fn(apimsg);
UNLOCK_TCPIP_CORE(); UNLOCK_TCPIP_CORE();
return ERR_OK;
#else /* LWIP_TCPIP_CORE_LOCKING */ #else /* LWIP_TCPIP_CORE_LOCKING */
LWIP_ASSERT("semaphore not initialized", sys_sem_valid(sem)); LWIP_ASSERT("semaphore not initialized", sys_sem_valid(sem));
@ -337,6 +339,7 @@ tcpip_send_msg_wait_sem(tcpip_callback_fn fn, void *apimsg, sys_sem_t* sem)
sys_mbox_post(&mbox, &TCPIP_MSG_VAR_REF(msg)); sys_mbox_post(&mbox, &TCPIP_MSG_VAR_REF(msg));
sys_arch_sem_wait(sem, 0); sys_arch_sem_wait(sem, 0);
TCPIP_MSG_VAR_FREE(msg); TCPIP_MSG_VAR_FREE(msg);
return ERR_OK;
#endif /* LWIP_TCPIP_CORE_LOCKING */ #endif /* LWIP_TCPIP_CORE_LOCKING */
} }

2
src/include/lwip/priv/tcpip_priv.h
View File

@ -92,7 +92,7 @@ struct netif;
#define API_MSG_M_DEF_C(t, m) const t * m #define API_MSG_M_DEF_C(t, m) const t * m
#endif /* LWIP_MPU_COMPATIBLE */ #endif /* LWIP_MPU_COMPATIBLE */
void tcpip_send_msg_wait_sem(tcpip_callback_fn fn, void *apimsg, sys_sem_t* sem); err_t tcpip_send_msg_wait_sem(tcpip_callback_fn fn, void *apimsg, sys_sem_t* sem);
struct tcpip_api_call_data struct tcpip_api_call_data
{ {