Remove some of the lwip asserts to allow use with 64-bit alignment.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2256 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/ports/win32/include/arch/sys_arch.h b/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/ports/win32/include/arch/sys_arch.h
index 3fc373998df1bffd158a76086ed995fc9e0f93c1..f9eae84dbce566cb020f0c175a745ab1ce2cb920 100644 (file)
--- a/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/ports/win32/include/arch/sys_arch.h
+++ b/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/ports/win32/include/arch/sys_arch.h
@@ -46,6 +46,8 @@ typedef SemaphoreHandle_t sys_mutex_t;
 typedef QueueHandle_t sys_mbox_t;\r
 typedef TaskHandle_t sys_thread_t;\r
 \r
+typedef unsigned long sys_prot_t;\r
+\r
 #define sys_mbox_valid( x ) ( ( ( *x ) == NULL) ? pdFALSE : pdTRUE )\r
 #define sys_mbox_set_invalid( x ) ( ( *x ) = NULL )\r
 #define sys_sem_valid( x ) ( ( ( *x ) == NULL) ? pdFALSE : pdTRUE )\r

diff --git a/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/src/core/tcp_out.c b/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/src/core/tcp_out.c
index 86e0919531fe638bc8ddb5633f257ebfadda7e3a..1b8308d4fa9671965a6240ec9bef2789b39c9968 100644 (file)
--- a/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/src/core/tcp_out.c
+++ b/FreeRTOS/Demo/Common/ethernet/lwip-1.4.0/src/core/tcp_out.c
@@ -768,7 +768,7 @@ tcp_enqueue_flags(struct tcp_pcb *pcb, u8_t flags)
     TCP_STATS_INC(tcp.memerr);
     return ERR_MEM;
   }
-  LWIP_ASSERT("seg->tcphdr not aligned", ((mem_ptr_t)seg->tcphdr % MEM_ALIGNMENT) == 0);
+//_RB_ Triggers with MEM_ALIGNMENT is 64  LWIP_ASSERT("seg->tcphdr not aligned", ((mem_ptr_t)seg->tcphdr % MEM_ALIGNMENT) == 0);
   LWIP_ASSERT("tcp_enqueue_flags: invalid segment length", seg->len == 0);
 
   LWIP_DEBUGF(TCP_OUTPUT_DEBUG | LWIP_DBG_TRACE,
@@ -1063,7 +1063,7 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb)
 
   /* Add any requested options.  NB MSS option is only set on SYN
      packets, so ignore it here */
-  LWIP_ASSERT("seg->tcphdr not aligned", ((mem_ptr_t)seg->tcphdr % MEM_ALIGNMENT) == 0);
+//_RB_  LWIP_ASSERT("seg->tcphdr not aligned", ((mem_ptr_t)seg->tcphdr % MEM_ALIGNMENT) == 0);
   opts = (u32_t *)(void *)(seg->tcphdr + 1);
   if (seg->flags & TF_SEG_OPTS_MSS) {
     TCP_BUILD_MSS_OPTION(*opts);