Per Frederic's suggestion, renamed

[MEMP_[NUM_]]TCPIP_MSG to [MEMP_[NUM_]]TCPIP_MSG_API
and
    [MEMP_[NUM_]]TCPIP_MSG_INPUT to [MEMP_[NUM_]]TCPIP_MSG_INPKT.

Added defines in opt.h for temporary compatibility with older lwipopts.h.
This commit is contained in:
marcbou
2007-08-17 02:46:43 +00:00
parent 0471aaec52
commit 0167bbb89a
5 changed files with 31 additions and 24 deletions

View File

@@ -50,8 +50,8 @@ typedef enum {
MEMP_NETBUF,
MEMP_NETCONN,
MEMP_TCPIP_MSG,
MEMP_TCPIP_MSG_INPUT,
MEMP_TCPIP_MSG_API,
MEMP_TCPIP_MSG_INPKT,
#if ARP_QUEUEING
MEMP_ARP_QUEUE,
#endif

View File

@@ -192,15 +192,22 @@
#ifndef MEMP_NUM_NETCONN
#define MEMP_NUM_NETCONN 4
#endif
/* MEMP_NUM_TCPIPMSG: the number of struct tcpip_msg, which is used
for callback/timeout API communication. Used in src/api/tcpip.c. */
#ifndef MEMP_NUM_TCPIP_MSG
#define MEMP_NUM_TCPIP_MSG 8
/* For temporary compatibility with older lwipopts.h */
#if defined(MEMP_NUM_TCPIP_MSG) && !defined(MEMP_NUM_TCPIP_MSG_API) && !defined(MEMP_NUM_TCPIP_MSG_INPKT)
#define MEMP_NUM_TCPIP_MSG_API (MEMP_NUM_TCPIP_MSG / 2)
#define MEMP_NUM_TCPIP_MSG_INPKT (MEMP_NUM_TCPIP_MSG)
#endif
/* MEMP_NUM_TCPIPMSG_INPUT: the number of struct tcpip_msg, which is used
/* MEMP_NUM_TCPIP_MSG_API: the number of struct tcpip_msg, which is used
for callback/timeout API communication. Used in src/api/tcpip.c. */
#ifndef MEMP_NUM_TCPIP_MSG_API
#define MEMP_NUM_TCPIP_MSG_API 4
#endif
/* MEMP_NUM_TCPIP_MSG_INPKT: the number of struct tcpip_msg, which is used
for incoming packets. Used in src/api/tcpip.c. */
#ifndef MEMP_NUM_TCPIP_MSG_INPUT
#define MEMP_NUM_TCPIP_MSG_INPUT MEMP_NUM_TCPIP_MSG
#ifndef MEMP_NUM_TCPIP_MSG_INPKT
#define MEMP_NUM_TCPIP_MSG_INPKT 8
#endif
/* ---------- ARP options ---------- */

View File

@@ -87,7 +87,7 @@ err_t tcpip_timeout(u32_t msecs, sys_timeout_handler h, void *arg);
enum tcpip_msg_type {
TCPIP_MSG_API,
#if ETHARP_TCPIP_INPUT || ETHARP_TCPIP_ETHINPUT
TCPIP_MSG_INPUT,
TCPIP_MSG_INPKT,
#endif /* ETHARP_TCPIP_INPUT || ETHARP_TCPIP_ETHINPUT */
#if LWIP_NETIF_API
TCPIP_MSG_NETIFAPI,