diff --git a/src/api/pppapi.c b/src/api/pppapi.c index eaf37b09..1c112a52 100644 --- a/src/api/pppapi.c +++ b/src/api/pppapi.c @@ -339,57 +339,4 @@ pppapi_ioctl(ppp_pcb *pcb, u8_t cmd, void *arg) } -#if LWIP_NETIF_STATUS_CALLBACK -/** - * Call ppp_set_netif_statuscallback() inside the tcpip_thread context. - */ -static void -pppapi_do_ppp_set_netif_statuscallback(struct pppapi_msg_msg *msg) -{ - ppp_set_netif_statuscallback(msg->ppp, msg->msg.netifstatuscallback.status_callback); - TCPIP_PPPAPI_ACK(msg); -} - -/** - * Call ppp_set_netif_statuscallback() in a thread-safe way by running that function inside the - * tcpip_thread context. - */ -void -pppapi_set_netif_statuscallback(ppp_pcb *pcb, netif_status_callback_fn status_callback) -{ - struct pppapi_msg msg; - msg.function = pppapi_do_ppp_set_netif_statuscallback; - msg.msg.ppp = pcb; - msg.msg.msg.netifstatuscallback.status_callback = status_callback; - TCPIP_PPPAPI(&msg); -} -#endif /* LWIP_NETIF_STATUS_CALLBACK */ - - -#if LWIP_NETIF_LINK_CALLBACK -/** - * Call ppp_set_netif_linkcallback() inside the tcpip_thread context. - */ -static void -pppapi_do_ppp_set_netif_linkcallback(struct pppapi_msg_msg *msg) -{ - ppp_set_netif_linkcallback(msg->ppp, msg->msg.netiflinkcallback.link_callback); - TCPIP_PPPAPI_ACK(msg); -} - -/** - * Call ppp_set_netif_linkcallback() in a thread-safe way by running that function inside the - * tcpip_thread context. - */ -void -pppapi_set_netif_linkcallback(ppp_pcb *pcb, netif_status_callback_fn link_callback) -{ - struct pppapi_msg msg; - msg.function = pppapi_do_ppp_set_netif_linkcallback; - msg.msg.ppp = pcb; - msg.msg.msg.netiflinkcallback.link_callback = link_callback; - TCPIP_PPPAPI(&msg); -} -#endif /* LWIP_NETIF_LINK_CALLBACK */ - #endif /* LWIP_PPP_API */ diff --git a/src/include/lwip/pppapi.h b/src/include/lwip/pppapi.h index f5e3598e..f963da7e 100644 --- a/src/include/lwip/pppapi.h +++ b/src/include/lwip/pppapi.h @@ -99,16 +99,6 @@ struct pppapi_msg_msg { u8_t cmd; void *arg; } ioctl; -#if LWIP_NETIF_STATUS_CALLBACK - struct { - netif_status_callback_fn status_callback; - } netifstatuscallback; -#endif /* LWIP_NETIF_STATUS_CALLBACK */ -#if LWIP_NETIF_LINK_CALLBACK - struct { - netif_status_callback_fn link_callback; - } netiflinkcallback; -#endif /* LWIP_NETIF_LINK_CALLBACK */ } msg; }; @@ -140,12 +130,6 @@ err_t pppapi_open(ppp_pcb *pcb, u16_t holdoff); err_t pppapi_close(ppp_pcb *pcb, u8_t nocarrier); err_t pppapi_free(ppp_pcb *pcb); err_t pppapi_ioctl(ppp_pcb *pcb, u8_t cmd, void *arg); -#if LWIP_NETIF_STATUS_CALLBACK -void pppapi_set_netif_statuscallback(ppp_pcb *pcb, netif_status_callback_fn status_callback); -#endif /* LWIP_NETIF_STATUS_CALLBACK */ -#if LWIP_NETIF_LINK_CALLBACK -void pppapi_set_netif_linkcallback(ppp_pcb *pcb, netif_status_callback_fn link_callback); -#endif /* LWIP_NETIF_LINK_CALLBACK */ #ifdef __cplusplus } diff --git a/src/include/netif/ppp/ppp.h b/src/include/netif/ppp/ppp.h index a80dbb95..b2464dc1 100644 --- a/src/include/netif/ppp/ppp.h +++ b/src/include/netif/ppp/ppp.h @@ -521,14 +521,13 @@ err_t ppp_ioctl(ppp_pcb *pcb, u8_t cmd, void *arg); /* Get the PPP addresses */ #define ppp_addrs(ppp) (&(ppp)->addrs) -#if LWIP_NETIF_STATUS_CALLBACK /* Set an lwIP-style status-callback for the selected PPP device */ -void ppp_set_netif_statuscallback(ppp_pcb *pcb, netif_status_callback_fn status_callback); -#endif /* LWIP_NETIF_STATUS_CALLBACK */ -#if LWIP_NETIF_LINK_CALLBACK +#define ppp_set_netif_statuscallback(ppp, status_cb) \ + netif_set_status_callback(ppp->netif, status_cb); + /* Set an lwIP-style link-callback for the selected PPP device */ -void ppp_set_netif_linkcallback(ppp_pcb *pcb, netif_status_callback_fn link_callback); -#endif /* LWIP_NETIF_LINK_CALLBACK */ +#define ppp_set_netif_linkcallback(ppp, link_cb) \ + netif_set_link_callback(ppp->netif, link_cb); #endif /* PPP_H */ diff --git a/src/netif/ppp/ppp.c b/src/netif/ppp/ppp.c index 980c752c..2f9c09cc 100644 --- a/src/netif/ppp/ppp.c +++ b/src/netif/ppp/ppp.c @@ -388,36 +388,6 @@ fail: return ERR_VAL; } -#if LWIP_NETIF_STATUS_CALLBACK -/** Set the status callback of a PPP's netif - * - * @param pcb The PPP descriptor returned by ppp_new() - * @param status_callback pointer to the status callback function - * - * @see netif_set_status_callback - */ -void -ppp_set_netif_statuscallback(ppp_pcb *pcb, netif_status_callback_fn status_callback) -{ - netif_set_status_callback(pcb->netif, status_callback); -} -#endif /* LWIP_NETIF_STATUS_CALLBACK */ - -#if LWIP_NETIF_LINK_CALLBACK -/** Set the link callback of a PPP's netif - * - * @param pcb The PPP descriptor returned by ppp_new() - * @param link_callback pointer to the link callback function - * - * @see netif_set_link_callback - */ -void -ppp_set_netif_linkcallback(ppp_pcb *pcb, netif_status_callback_fn link_callback) -{ - netif_set_link_callback(pcb->netif, link_callback); -} -#endif /* LWIP_NETIF_LINK_CALLBACK */ - /**********************************/ /*** LOCAL FUNCTION DEFINITIONS ***/