started to move "private" header files containing implementation details to "lwip/priv/" include directory to seperate the API from the implementation.

src/include/lwip/memp.h

@@ -41,12 +41,12 @@ extern "C" {
 
 /* run once with empty definition to handle all custom includes in lwippools.h */
 #define LWIP_MEMPOOL(name,num,size,desc)
-#include "lwip/memp_std.h"
+#include "lwip/priv/memp_std.h"
 
 /* Create the list of all memory pools managed by memp. MEMP_MAX represents a NULL pool at the end */
 typedef enum {
 #define LWIP_MEMPOOL(name,num,size,desc)  MEMP_##name,
-#include "lwip/memp_std.h"
+#include "lwip/priv/memp_std.h"
   MEMP_MAX
 } memp_t;
 
@@ -60,7 +60,7 @@ typedef enum {
 #define LWIP_MALLOC_MEMPOOL_START 1
 #define LWIP_MALLOC_MEMPOOL(num, size) * MEMP_POOL_##size + 0
 #define LWIP_MALLOC_MEMPOOL_END
-#include "lwip/memp_std.h"
+#include "lwip/priv/memp_std.h"
     ) ,
     /* Get the last (via:
        MEMP_POOL_HELPER_END = ((u8_t) 0 + MEMP_POOL_A*0 + MEMP_POOL_B*0 + MEMP_POOL_C*1) */
@@ -69,7 +69,7 @@ typedef enum {
 #define LWIP_MALLOC_MEMPOOL_START
 #define LWIP_MALLOC_MEMPOOL(num, size) 0 + MEMP_POOL_##size *
 #define LWIP_MALLOC_MEMPOOL_END 1
-#include "lwip/memp_std.h"
+#include "lwip/priv/memp_std.h"
     )
 } memp_pool_helper_t;
 

src/include/lwip/priv/tcpip_priv.h

@@ -29,14 +29,15 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef LWIP_HDR_TCPIP_H
-#define LWIP_HDR_TCPIP_H
+#ifndef LWIP_HDR_TCPIP_PRIV_H
+#define LWIP_HDR_TCPIP_PRIV_H
 
 #include "lwip/opt.h"
 
 #if !NO_SYS /* don't build if not configured for use in lwipopts.h */
 
-#include "lwip/api_msg.h"
+#include "lwip/tcpip.h"
+#include "lwip/priv/api_msg.h"
 #include "lwip/netifapi.h"
 #include "lwip/pppapi.h"
 #include "lwip/pbuf.h"
@@ -132,23 +133,10 @@ extern sys_mutex_t lock_tcpip_core;
 #endif /* LWIP_MPU_COMPATIBLE */
 
 
-
-/** Function prototype for the init_done function passed to tcpip_init */
-typedef void (*tcpip_init_done_fn)(void *arg);
-/** Function prototype for functions passed to tcpip_callback() */
-typedef void (*tcpip_callback_fn)(void *ctx);
-
-/* Forward declarations */
-struct tcpip_callback_msg;
-
-void tcpip_init(tcpip_init_done_fn tcpip_init_done, void *arg);
-
 #if LWIP_NETCONN || LWIP_SOCKET
 err_t tcpip_apimsg(struct api_msg *apimsg);
 #endif /* LWIP_NETCONN || LWIP_SOCKET */
 
-err_t tcpip_input(struct pbuf *p, struct netif *inp);
-
 #if PPPOS_SUPPORT && !PPP_INPROC_IRQ_SAFE
 err_t tcpip_pppos_input(struct pbuf *p, struct netif *inp);
 #endif /* PPPOS_SUPPORT && !PPP_INPROC_IRQ_SAFE */
@@ -167,21 +155,6 @@ err_t tcpip_pppapi_lock(struct pppapi_msg *pppapimsg);
 #endif /* LWIP_TCPIP_CORE_LOCKING */
 #endif /* LWIP_PPP_API */
 
-err_t tcpip_callback_with_block(tcpip_callback_fn function, void *ctx, u8_t block);
-#define tcpip_callback(f, ctx)              tcpip_callback_with_block(f, ctx, 1)
-
-struct tcpip_callback_msg* tcpip_callbackmsg_new(tcpip_callback_fn function, void *ctx);
-void   tcpip_callbackmsg_delete(struct tcpip_callback_msg* msg);
-err_t  tcpip_trycallback(struct tcpip_callback_msg* msg);
-
-/* free pbufs or heap memory from another context without blocking */
-err_t pbuf_free_callback(struct pbuf *p);
-err_t mem_free_callback(void *m);
-
-#if LWIP_TCPIP_TIMEOUT
-err_t tcpip_timeout(u32_t msecs, sys_timeout_handler h, void *arg);
-err_t tcpip_untimeout(sys_timeout_handler h, void *arg);
-#endif /* LWIP_TCPIP_TIMEOUT */
 
 enum tcpip_msg_type {
 #if LWIP_NETCONN || LWIP_SOCKET
@@ -242,4 +215,4 @@ struct tcpip_msg {
 
 #endif /* !NO_SYS */
 
-#endif /* LWIP_HDR_TCPIP_H */
+#endif /* LWIP_HDR_TCPIP_PRIV_H */

src/include/netif/ppp/vj.h

@@ -29,7 +29,7 @@
 #define VJ_H
 
 #include "lwip/ip.h"
-#include "lwip/tcp_impl.h"
+#include "lwip/priv/tcp_priv.h"
 
 #define MAX_SLOTS 16 /* must be > 2 and < 256 */
 #define MAX_HDR   128