mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-04 05:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing #if/#endif to fix build problems with:

Browse Source 
#define NO_SYS 0
#define LWIP_SOCKET 0
#define LWIP_NETCONN 0
This commit is contained in:
fbernon 2007-09-12 09:19:43 +00:00
parent 6aab0332e8
commit c265fa3331
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/tcpip.c
View File

@ -44,6 +44,7 @@
#include "lwip/memp.h" #include "lwip/memp.h"
#include "lwip/pbuf.h" #include "lwip/pbuf.h"
#include "lwip/ip_frag.h" #include "lwip/ip_frag.h"
#include "lwip/tcp.h"
#include "lwip/autoip.h" #include "lwip/autoip.h"
#include "lwip/dhcp.h" #include "lwip/dhcp.h"
#include "lwip/igmp.h" #include "lwip/igmp.h"
@ -302,10 +303,12 @@ tcpip_thread(void *arg)
while (1) { /* MAIN Loop */ while (1) { /* MAIN Loop */
sys_mbox_fetch(mbox, (void *)&msg); sys_mbox_fetch(mbox, (void *)&msg);
switch (msg->type) { switch (msg->type) {
#if LWIP_NETCONN
case TCPIP_MSG_API: case TCPIP_MSG_API:
LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: API message %p\n", (void *)msg)); LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: API message %p\n", (void *)msg));
msg->msg.apimsg->function(&(msg->msg.apimsg->msg)); msg->msg.apimsg->function(&(msg->msg.apimsg->msg));
break; break;
#endif /* LWIP_NETCONN */
case TCPIP_MSG_INPKT: case TCPIP_MSG_INPKT:
LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: PACKET %p\n", (void *)msg)); LWIP_DEBUGF(TCPIP_DEBUG, ("tcpip_thread: PACKET %p\n", (void *)msg));
@ -348,7 +351,6 @@ tcpip_thread(void *arg)
} }
} }
#if LWIP_ARP
/** /**
* Pass a received packet to tcpip_thread for input processing * Pass a received packet to tcpip_thread for input processing
* *
@ -375,7 +377,6 @@ tcpip_input(struct pbuf *p, struct netif *inp)
} }
return ERR_VAL; return ERR_VAL;
} }
#endif /* LWIP_ARP */
/** /**
* Call a specific function in the thread context of * Call a specific function in the thread context of
@ -428,6 +429,7 @@ tcpip_timeout(u32_t msecs, sys_timeout_handler h, void *arg)
return ERR_VAL; return ERR_VAL;
} }
#if LWIP_NETCONN
/** /**
* Call the lower part of a netconn_* function * Call the lower part of a netconn_* function
* This function is then running in the thread context * This function is then running in the thread context
@ -470,6 +472,7 @@ tcpip_apimsg_lock(struct api_msg *apimsg)
} }
#endif /* LWIP_TCPIP_CORE_LOCKING */ #endif /* LWIP_TCPIP_CORE_LOCKING */
#endif /* LWIP_NETCONN */
#if LWIP_NETIF_API #if LWIP_NETIF_API
#if !LWIP_TCPIP_CORE_LOCKING #if !LWIP_TCPIP_CORE_LOCKING

7
src/include/lwip/tcpip.h
View File

@ -63,10 +63,13 @@ extern sys_sem_t lock_tcpip_core;
#endif /* LWIP_TCPIP_CORE_LOCKING */ #endif /* LWIP_TCPIP_CORE_LOCKING */
void tcpip_init(void (* tcpip_init_done)(void *), void *arg); void tcpip_init(void (* tcpip_init_done)(void *), void *arg);
#if LWIP_NETCONN
err_t tcpip_apimsg(struct api_msg *apimsg); err_t tcpip_apimsg(struct api_msg *apimsg);
#if LWIP_TCPIP_CORE_LOCKING #if LWIP_TCPIP_CORE_LOCKING
err_t tcpip_apimsg_lock(struct api_msg *apimsg); err_t tcpip_apimsg_lock(struct api_msg *apimsg);
#endif /* LWIP_TCPIP_CORE_LOCKING */ #endif /* LWIP_TCPIP_CORE_LOCKING */
#endif /* LWIP_NETCONN */
err_t tcpip_input(struct pbuf *p, struct netif *inp); err_t tcpip_input(struct pbuf *p, struct netif *inp);
@ -82,7 +85,9 @@ err_t tcpip_timeout(u32_t msecs, sys_timeout_handler h, void *arg);
#define tcpip_untimeout(h, arg) tcpip_timeout(0xffffffff, h, arg) #define tcpip_untimeout(h, arg) tcpip_timeout(0xffffffff, h, arg)
enum tcpip_msg_type { enum tcpip_msg_type {
#if LWIP_NETCONN
TCPIP_MSG_API, TCPIP_MSG_API,
#endif /* LWIP_NETCONN */
TCPIP_MSG_INPKT, TCPIP_MSG_INPKT,
#if LWIP_NETIF_API #if LWIP_NETIF_API
TCPIP_MSG_NETIFAPI, TCPIP_MSG_NETIFAPI,
@ -95,7 +100,9 @@ struct tcpip_msg {
enum tcpip_msg_type type; enum tcpip_msg_type type;
sys_sem_t *sem; sys_sem_t *sem;
union { union {
#if LWIP_NETCONN
struct api_msg *apimsg; struct api_msg *apimsg;
#endif /* LWIP_NETCONN */
#if LWIP_NETIF_API #if LWIP_NETIF_API
struct netifapi_msg *netifapimsg; struct netifapi_msg *netifapimsg;
#endif /* LWIP_NETIF_API */ #endif /* LWIP_NETIF_API */