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 lwIP byte alignment to make Zynq pings more reliable.

Browse source
This commit is contained in:
Richard Barry 2014-06-09 12:43:18 +00:00
parent 16ff69e873
commit be8b0ed21d
4 changed files with 33 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/FreeRTOSConfig.h
View file

@ -218,10 +218,10 @@ Zynq MPU. */
#define configMAC_ADDR5 0x16 #define configMAC_ADDR5 0x16
/* IP address configuration. */ /* IP address configuration. */
#define configIP_ADDR0 10 #define configIP_ADDR0 172
#define configIP_ADDR1 134 #define configIP_ADDR1 25
#define configIP_ADDR2 134 #define configIP_ADDR2 218
#define configIP_ADDR3 210 #define configIP_ADDR3 200
/* Netmask configuration. */ /* Netmask configuration. */
#define configNET_MASK0 255 #define configNET_MASK0 255

2
FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/lwIP_port/netif/xadapter.c
View file

@ -201,7 +201,7 @@ xemacif_input_thread(struct netif *netif)
* This semaphore is set by the packet receive interrupt * This semaphore is set by the packet receive interrupt
* routine. * routine.
*/ */
sys_sem_wait(&emac->sem_rx_data_available); sys_arch_sem_wait( &emac->sem_rx_data_available, 250 / portTICK_PERIOD_MS );
/* move all received packets to lwIP */ /* move all received packets to lwIP */
xemacif_input(netif); xemacif_input(netif);

7
FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/Full_Demo/lwIP_port/sys_arch.c
View file

@ -276,15 +276,10 @@ err_t sys_sem_new( sys_sem_t *pxSemaphore, u8_t ucCount )
{ {
err_t xReturn = ERR_MEM; err_t xReturn = ERR_MEM;
vSemaphoreCreateBinary( ( *pxSemaphore ) ); *pxSemaphore = xSemaphoreCreateCounting( 0xffff, ( unsigned long ) ucCount );
if( *pxSemaphore != NULL ) if( *pxSemaphore != NULL )
{ {
if( ucCount == 0U )
{
xSemaphoreTake( *pxSemaphore, 1UL );
}
xReturn = ERR_OK; xReturn = ERR_OK;
SYS_STATS_INC_USED( sem ); SYS_STATS_INC_USED( sem );
} }

33
FreeRTOS/Demo/CORTEX_A9_Zynq_ZC702/RTOSDemo/src/lwipopts.h
View file

@ -109,7 +109,7 @@ 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 64
/* 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. */
@ -148,10 +148,10 @@ a lot of data that needs to be copied, this should be set high. */
/* 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 0 #define MEMP_NUM_NETBUF 8
/* 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 16
/* 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
@ -198,6 +198,13 @@ a lot of data that needs to be copied, this should be set high. */
TCP_SND_BUF/TCP_MSS for things to work. */ TCP_SND_BUF/TCP_MSS for things to work. */
#define TCP_SND_QUEUELEN (16 * TCP_SND_BUF/TCP_MSS) #define TCP_SND_QUEUELEN (16 * TCP_SND_BUF/TCP_MSS)
#define CHECKSUM_GEN_TCP 0
#define CHECKSUM_GEN_UDP 0
#define CHECKSUM_GEN_IP 0
#define CHECKSUM_CHECK_TCP 0
#define CHECKSUM_CHECK_UDP 0
#define CHECKSUM_CHECK_IP 0
/* 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 */
@ -227,10 +234,15 @@ a lot of data that needs to be copied, this should be set high. */
/* 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 0 #define IP_REASSEMBLY 1
#define IP_REASS_MAX_PBUFS 10 #define IP_REASS_MAX_PBUFS 128
#define MEMP_NUM_REASSDATA 10 #define MEMP_NUM_REASSDATA 10
#define IP_FRAG 0 #define IP_FRAG 1
#define IP_OPTIONS 0
#define IP_FRAG_MAX_MTU 1500
#define IP_DEFAULT_TTL 255
#define LWIP_CHKSUM_ALGORITHM 3
/* ---------- ICMP options ---------- */ /* ---------- ICMP options ---------- */
@ -278,6 +290,15 @@ a lot of data that needs to be copied, this should be set high. */
#endif /* LWIP_STATS */ #endif /* LWIP_STATS */
#define NO_SYS_NO_TIMERS 1
#define MEMP_SEPARATE_POOLS 1
#define MEMP_NUM_FRAG_PBUF 256
#define IP_OPTIONS_ALLOWED 0
#define TCP_OVERSIZE TCP_MSS
#define LWIP_COMPAT_MUTEX 0
#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 1
/* ---------- PPP options ---------- */ /* ---------- PPP options ---------- */
#define PPP_SUPPORT 0 /* Set > 0 for PPP */ #define PPP_SUPPORT 0 /* Set > 0 for PPP */