len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 21:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update the names of some of the newly introduced API functions so they are more consistent with the names of pre-existing API functions.

Browse source
This commit is contained in:
Richard Barry 2011-08-07 10:37:24 +00:00
parent 40ce7c8b52
commit 667b722bde
3 changed files with 95 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Demo/WIN32-MSVC-lwIP/WIN32.suo
View file

Binary file not shown.

1
Demo/WIN32-MSVC-lwIP/lwIP_Apps/apps/httpserver_raw_from_lwIP_download/httpd.c
View file

@ -2092,6 +2092,7 @@ http_accept(void *arg, struct tcp_pcb *pcb, err_t err)
/* Tell TCP that this is the structure we wish to be passed for our /* Tell TCP that this is the structure we wish to be passed for our
callbacks. */ callbacks. */
tcp_nagle_disable(pcb);//_RB_
tcp_arg(pcb, hs); tcp_arg(pcb, hs);
/* Set up the various callback functions */ /* Set up the various callback functions */

189
Demo/WIN32-MSVC-lwIP/lwIP_Apps/lwipopts.h
View file

@ -47,32 +47,23 @@ void vLwipAppsReleaseTxBuffer( void );
#define DEFAULT_TCP_RECVMBOX_SIZE 5 #define DEFAULT_TCP_RECVMBOX_SIZE 5
#define DEFAULT_ACCEPTMBOX_SIZE 5 #define DEFAULT_ACCEPTMBOX_SIZE 5
#define TCPIP_MBOX_SIZE 10
#define NO_SYS 0 #define NO_SYS 0
#define LWIP_SOCKET (NO_SYS==0) #define LWIP_SOCKET (NO_SYS==0)
#define LWIP_NETCONN (NO_SYS==0) #define LWIP_NETCONN 1
#define LWIP_IGMP 1 #define LWIP_SNMP 0
#define LWIP_ICMP 1 #define LWIP_IGMP 0
#define LWIP_SNMP 1 #define LWIP_ICMP 1
#define LWIP_DNS 1 /* DNS is not going to be used as this is a simple local example. */
#define LWIP_DNS 0
#define LWIP_HAVE_LOOPIF 1
#define LWIP_NETIF_LOOPBACK 1
#define LWIP_LOOPBACK_MAX_PBUFS 10
#define TCP_LISTEN_BACKLOG 0
#define LWIP_COMPAT_SOCKETS 1
#define LWIP_SO_RCVTIMEO 1
#define LWIP_SO_RCVBUF 1
#define LWIP_TCPIP_CORE_LOCKING 0
#define LWIP_NETIF_LINK_CALLBACK 0
#define LWIP_NETIF_STATUS_CALLBACK 0
#define LWIP_HAVE_LOOPIF 0
#define TCP_LISTEN_BACKLOG 0
#define LWIP_SO_RCVTIMEO 1
#define LWIP_SO_RCVBUF 1
#ifdef LWIP_DEBUG #ifdef LWIP_DEBUG
@ -107,7 +98,7 @@ void vLwipAppsReleaseTxBuffer( void );
#define LWIP_DBG_TYPES_ON (LWIP_DBG_ON|LWIP_DBG_TRACE|LWIP_DBG_STATE|LWIP_DBG_FRESH|LWIP_DBG_HALT) #define LWIP_DBG_TYPES_ON (LWIP_DBG_ON|LWIP_DBG_TRACE|LWIP_DBG_STATE|LWIP_DBG_FRESH|LWIP_DBG_HALT)
#define TCPIP_MBOX_SIZE 10
/* ---------- Memory options ---------- */ /* ---------- Memory options ---------- */
/* MEM_ALIGNMENT: should be set to the alignment of the CPU for which /* MEM_ALIGNMENT: should be set to the alignment of the CPU for which
@ -115,188 +106,196 @@ void vLwipAppsReleaseTxBuffer( void );
byte alignment -> define MEM_ALIGNMENT to 2. */ byte alignment -> define MEM_ALIGNMENT to 2. */
/* MSVC port: intel processors don't need 4-byte alignment, /* MSVC port: intel processors don't need 4-byte alignment,
but are faster that way! */ but are faster that way! */
#define MEM_ALIGNMENT 4 #define MEM_ALIGNMENT 4
/* MEM_SIZE: the size of the heap memory. If the application will send /* MEM_SIZE: the size of the heap memory. If the application will send
a lot of data that needs to be copied, this should be set high. */ a lot of data that needs to be copied, this should be set high. */
#define MEM_SIZE 10240 #define MEM_SIZE 10240
/* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application /* MEMP_NUM_PBUF: the number of memp struct pbufs. If the application
sends a lot of data out of ROM (or other static memory), this sends a lot of data out of ROM (or other static memory), this
should be set high. */ should be set high. */
#define MEMP_NUM_PBUF 16 #define MEMP_NUM_PBUF 10
/* MEMP_NUM_RAW_PCB: the number of UDP protocol control blocks. One /* MEMP_NUM_RAW_PCB: the number of UDP protocol control blocks. One
per active RAW "connection". */ per active RAW "connection". */
#define MEMP_NUM_RAW_PCB 3 #define LWIP_RAW 0
#define MEMP_NUM_RAW_PCB 0
/* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One /* MEMP_NUM_UDP_PCB: the number of UDP protocol control blocks. One
per active UDP "connection". */ per active UDP "connection". */
#define MEMP_NUM_UDP_PCB 4 #define MEMP_NUM_UDP_PCB 2
/* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP /* MEMP_NUM_TCP_PCB: the number of simulatenously active TCP
connections. */ connections. */
#define MEMP_NUM_TCP_PCB 5 #define MEMP_NUM_TCP_PCB 30
/* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP /* MEMP_NUM_TCP_PCB_LISTEN: the number of listening TCP
connections. */ connections. */
#define MEMP_NUM_TCP_PCB_LISTEN 8 #define MEMP_NUM_TCP_PCB_LISTEN 2
/* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP /* MEMP_NUM_TCP_SEG: the number of simultaneously queued TCP
segments. */ segments. */
#define MEMP_NUM_TCP_SEG 16 #define MEMP_NUM_TCP_SEG 10
/* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active /* MEMP_NUM_SYS_TIMEOUT: the number of simulateously active
timeouts. */ timeouts. */
#define MEMP_NUM_SYS_TIMEOUT 15 #define MEMP_NUM_SYS_TIMEOUT 15
/* The following four are used only with the sequential API and can be /* The following four are used only with the sequential API and can be
set to 0 if the application only will use the raw API. */ set to 0 if the application only will use the raw API. */
/* MEMP_NUM_NETBUF: the number of struct netbufs. */ /* MEMP_NUM_NETBUF: the number of struct netbufs. */
#define MEMP_NUM_NETBUF 2 #define MEMP_NUM_NETBUF 0
/* MEMP_NUM_NETCONN: the number of struct netconns. */ /* MEMP_NUM_NETCONN: the number of struct netconns. */
#define MEMP_NUM_NETCONN 10 #define MEMP_NUM_NETCONN 10
/* MEMP_NUM_TCPIP_MSG_*: the number of struct tcpip_msg, which is used /* MEMP_NUM_TCPIP_MSG_*: the number of struct tcpip_msg, which is used
for sequential API communication and incoming packets. Used in for sequential API communication and incoming packets. Used in
src/api/tcpip.c. */ src/api/tcpip.c. */
#define MEMP_NUM_TCPIP_MSG_API 16 #define MEMP_NUM_TCPIP_MSG_API 4
#define MEMP_NUM_TCPIP_MSG_INPKT 16 #define MEMP_NUM_TCPIP_MSG_INPKT 4
#define MEMP_NUM_ARP_QUEUE 5
/* ---------- Pbuf options ---------- */ /* ---------- Pbuf options ---------- */
/* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */ /* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */
#define PBUF_POOL_SIZE 100 #define PBUF_POOL_SIZE 10
/* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */ /* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */
#define PBUF_POOL_BUFSIZE 128 #define PBUF_POOL_BUFSIZE 375
/* PBUF_LINK_HLEN: the number of bytes that should be allocated for a /* PBUF_LINK_HLEN: the number of bytes that should be allocated for a
link level header. */ link level header. */
#define PBUF_LINK_HLEN 16 #define PBUF_LINK_HLEN 16
/** SYS_LIGHTWEIGHT_PROT /** SYS_LIGHTWEIGHT_PROT
* define SYS_LIGHTWEIGHT_PROT in lwipopts.h if you want inter-task protection * define SYS_LIGHTWEIGHT_PROT in lwipopts.h if you want inter-task protection
* for certain critical regions during buffer allocation, deallocation and memory * for certain critical regions during buffer allocation, deallocation and memory
* allocation and deallocation. * allocation and deallocation.
*/ */
#define SYS_LIGHTWEIGHT_PROT (NO_SYS==0) #define SYS_LIGHTWEIGHT_PROT (NO_SYS==0)
/* ---------- TCP options ---------- */ /* ---------- TCP options ---------- */
#define LWIP_TCP 1 #define LWIP_TCP 1
#define TCP_TTL 255 #define TCP_TTL 255
/* Controls if TCP should queue segments that arrive out of /* Controls if TCP should queue segments that arrive out of
order. Define to 0 if your device is low on memory. */ order. Define to 0 if your device is low on memory. */
#define TCP_QUEUE_OOSEQ 1 #define TCP_QUEUE_OOSEQ 1
/* TCP Maximum segment size. */ /* TCP Maximum segment size. */
#define TCP_MSS 1024 #define TCP_MSS 1460
/* TCP sender buffer space (bytes). */ /* TCP sender buffer space (bytes). */
#define TCP_SND_BUF 2048 #define TCP_SND_BUF 2048
/* TCP sender buffer space (pbufs). This must be at least = 2 * /* TCP sender buffer space (pbufs). This must be at least = 2 *
TCP_SND_BUF/TCP_MSS for things to work. */ TCP_SND_BUF/TCP_MSS for things to work. */
#define TCP_SND_QUEUELEN (4 * TCP_SND_BUF/TCP_MSS) #define TCP_SND_QUEUELEN (4 * TCP_SND_BUF/TCP_MSS)
/* TCP writable space (bytes). This must be less than or equal /* TCP writable space (bytes). This must be less than or equal
to TCP_SND_BUF. It is the amount of space which must be to TCP_SND_BUF. It is the amount of space which must be
available in the tcp snd_buf for select to return writable */ available in the tcp snd_buf for select to return writable */
#define TCP_SNDLOWAT (TCP_SND_BUF/2) #define TCP_SNDLOWAT (TCP_SND_BUF/2)
/* TCP receive window. */ /* TCP receive window. */
#define TCP_WND 8096 #define TCP_WND 4048
/* Maximum number of retransmissions of data segments. */ /* Maximum number of retransmissions of data segments. */
#define TCP_MAXRTX 12 #define TCP_MAXRTX 12
/* Maximum number of retransmissions of SYN segments. */ /* Maximum number of retransmissions of SYN segments. */
#define TCP_SYNMAXRTX 4 #define TCP_SYNMAXRTX 4
/* ---------- ARP options ---------- */ /* ---------- ARP options ---------- */
#define LWIP_ARP 1 #define LWIP_ARP 1
#define ARP_TABLE_SIZE 10 #define ARP_TABLE_SIZE 10
#define ARP_QUEUEING 1 #define ARP_QUEUEING 1
/* ---------- IP options ---------- */ /* ---------- IP options ---------- */
/* Define IP_FORWARD to 1 if you wish to have the ability to forward /* Define IP_FORWARD to 1 if you wish to have the ability to forward
IP packets across network interfaces. If you are going to run lwIP IP packets across network interfaces. If you are going to run lwIP
on a device with only one network interface, define this to 0. */ on a device with only one network interface, define this to 0. */
#define IP_FORWARD 1 #define IP_FORWARD 0
/* IP reassembly and segmentation.These are orthogonal even /* IP reassembly and segmentation.These are orthogonal even
* if they both deal with IP fragments */ * if they both deal with IP fragments */
#define IP_REASSEMBLY 1 #define IP_REASSEMBLY 0
#define IP_REASS_MAX_PBUFS 10 #define IP_REASS_MAX_PBUFS 10
#define MEMP_NUM_REASSDATA 10 #define MEMP_NUM_REASSDATA 10
#define IP_FRAG 1 #define IP_FRAG 0
/* ---------- ICMP options ---------- */ /* ---------- ICMP options ---------- */
#define ICMP_TTL 255 #define ICMP_TTL 255
/* ---------- DHCP options ---------- */ /* ---------- DHCP options ---------- */
/* Define LWIP_DHCP to 1 if you want DHCP configuration of /* Define LWIP_DHCP to 1 if you want DHCP configuration of
interfaces. */ interfaces. */
#define LWIP_DHCP 0 #define LWIP_DHCP 0
/* 1 if you want to do an ARP check on the offered address /* 1 if you want to do an ARP check on the offered address
(recommended). */ (recommended). */
#define DHCP_DOES_ARP_CHECK (LWIP_DHCP) #define DHCP_DOES_ARP_CHECK (LWIP_DHCP)
/* ---------- AUTOIP options ------- */ /* ---------- AUTOIP options ------- */
#define LWIP_AUTOIP 0 #define LWIP_AUTOIP 0
#define LWIP_DHCP_AUTOIP_COOP (LWIP_DHCP && LWIP_AUTOIP) #define LWIP_DHCP_AUTOIP_COOP (LWIP_DHCP && LWIP_AUTOIP)
/* ---------- UDP options ---------- */ /* ---------- UDP options ---------- */
#define LWIP_UDP 1 #define LWIP_UDP 1
#define LWIP_UDPLITE 1 #define LWIP_UDPLITE 1
#define UDP_TTL 255 #define UDP_TTL 255
/* ---------- Statistics options ---------- */ /* ---------- Statistics options ---------- */
#define LWIP_STATS 1 #define LWIP_STATS 1
#define LWIP_STATS_DISPLAY 1 #define LWIP_STATS_DISPLAY 0
#if LWIP_STATS #if LWIP_STATS
#define LINK_STATS 1 #define LINK_STATS 1
#define IP_STATS 1 #define IP_STATS 1
#define ICMP_STATS 1 #define ICMP_STATS 0
#define IGMP_STATS 1 #define IGMP_STATS 0
#define IPFRAG_STATS 1 #define IPFRAG_STATS 0
#define UDP_STATS 1 #define UDP_STATS 1
#define TCP_STATS 1 #define TCP_STATS 1
#define MEM_STATS 1 #define MEM_STATS 1
#define MEMP_STATS 1 #define MEMP_STATS 1
#define PBUF_STATS 1 #define PBUF_STATS 1
#define SYS_STATS 1 #define SYS_STATS 1
#endif /* LWIP_STATS */ #endif /* LWIP_STATS */
/* ---------- PPP options ---------- */ /* ---------- PPP options ---------- */
#define PPP_SUPPORT 0 /* Set > 0 for PPP */ #define PPP_SUPPORT 0 /* Set > 0 for PPP */
#if PPP_SUPPORT #if PPP_SUPPORT
#define NUM_PPP 1 /* Max PPP sessions. */ #define NUM_PPP 1 /* Max PPP sessions. */
/* Select modules to enable. Ideally these would be set in the makefile but
/* Select modules to enable. Ideally these would be set in the makefile but * we're limited by the command line length so you need to modify the settings
* we're limited by the command line length so you need to modify the settings * in this file.
* in this file. */
*/ #define PPPOE_SUPPORT 1
#define PPPOE_SUPPORT 1 #define PPPOS_SUPPORT 1
#define PPPOS_SUPPORT 1 #define PAP_SUPPORT 1 /* Set > 0 for PAP. */
#define CHAP_SUPPORT 1 /* Set > 0 for CHAP. */
#define PAP_SUPPORT 1 /* Set > 0 for PAP. */ #define MSCHAP_SUPPORT 0 /* Set > 0 for MSCHAP (NOT FUNCTIONAL!) */
#define CHAP_SUPPORT 1 /* Set > 0 for CHAP. */ #define CBCP_SUPPORT 0 /* Set > 0 for CBCP (NOT FUNCTIONAL!) */
#define MSCHAP_SUPPORT 0 /* Set > 0 for MSCHAP (NOT FUNCTIONAL!) */ #define CCP_SUPPORT 0 /* Set > 0 for CCP (NOT FUNCTIONAL!) */
#define CBCP_SUPPORT 0 /* Set > 0 for CBCP (NOT FUNCTIONAL!) */ #define VJ_SUPPORT 1 /* Set > 0 for VJ header compression. */
#define CCP_SUPPORT 0 /* Set > 0 for CCP (NOT FUNCTIONAL!) */ #define MD5_SUPPORT 1 /* Set > 0 for MD5 (see also CHAP) */
#define VJ_SUPPORT 1 /* Set > 0 for VJ header compression. */
#define MD5_SUPPORT 1 /* Set > 0 for MD5 (see also CHAP) */
#endif /* PPP_SUPPORT */ #endif /* PPP_SUPPORT */