Changeset 778

Timestamp:

08/04/08 20:51:26 (4 months ago)

Author:

liamstask

Message:

- incorporate changes from freertos lwip 1.3 port - mostly changes to sys_arch.c, adding in more stats info

Location:

firmware/trunk/core

Files:

• lwip/contrib/port/FreeRTOS/AT91SAM7X/arch/sys_arch.h (modified) (2 diffs)
• lwip/contrib/port/FreeRTOS/AT91SAM7X/sys_arch.c (modified) (8 diffs)
• makingthings/SAM7_EMAC.c (modified) (3 diffs)
• makingthings/lwipopts.h (modified) (2 diffs)

firmware/trunk/core/lwip/contrib/port/FreeRTOS/AT91SAM7X/arch/sys_arch.h

@@ -40 +40 @@
 #define SYS_MBOX_NULL (xQueueHandle)0
 #define SYS_SEM_NULL  (xSemaphoreHandle)0
-// MakingThings - addition for lwip 1.3.0
-// FIXME - more robust implementation...
-#define sys_arch_mbox_tryfetch(mbox,msg) sys_arch_mbox_fetch(mbox,msg,1)
 
 typedef xSemaphoreHandle sys_sem_t;
@@ -48 +45 @@
 typedef xTaskHandle sys_thread_t;
 
+/* Message queue constants. */
+#define archMESG_QUEUE_LENGTH ( 6 )
+#define archPOST_BLOCK_TIME_MS  ( ( unsigned portLONG ) 10000 )
+
 #endif /* __SYS_RTXC_H__ */
 

firmware/trunk/core/lwip/contrib/port/FreeRTOS/AT91SAM7X/sys_arch.c

@@ -39 +39 @@
 #include "lwip/sys.h"
 #include "lwip/mem.h"
-
-/* Message queue constants. */
-#define archMESG_QUEUE_LENGTH ( 6 )
-#define archPOST_BLOCK_TIME_MS  ( ( unsigned portLONG ) 10000 )
+#include "lwip/stats.h"
+#include "lwipopts.h"
 
 struct timeoutlist 
@@ -51 +49 @@
 
 /* This is the number of threads that can be started with sys_thread_new() */
-// #define SYS_THREAD_MAX 6
-
-#define lwipTCP_STACK_SIZE      200
-#define lwipBASIC_SERVER_STACK_SIZE 150
+//#define SYS_THREAD_MAX 4
 
 // static struct timeoutlist timeoutlist[SYS_THREAD_MAX];
@@ -76 +71 @@
   mbox = xQueueCreate( archMESG_QUEUE_LENGTH, sizeof( void * ) );
 
+#if SYS_STATS
+      ++lwip_stats.sys.mbox.used;
+      if (lwip_stats.sys.mbox.max < lwip_stats.sys.mbox.used) {
+         lwip_stats.sys.mbox.max = lwip_stats.sys.mbox.used;
+    }
+#endif /* SYS_STATS */
+
   return mbox;
 }
@@ -91 +93 @@
   {
     /* Line for breakpoint.  Should never break here! */
-    __asm volatile ( "NOP" );
+    portNOP();
+#if SYS_STATS
+      lwip_stats.sys.mbox.err++;
+#endif /* SYS_STATS */
   }
 
   vQueueDelete( mbox ); 
+
+#if SYS_STATS
+     --lwip_stats.sys.mbox.used;
+#endif /* SYS_STATS */
 }
 
@@ -107 +116 @@
 /*-----------------------------------------------------------------------------------*/
 // MakingThings - added for lwip 1.3.0
-//  Posts the "msg" to the mailbox. This function have to block until
-//  the "msg" is really posted.
+//  Posts the "msg" to the mailbox.
 err_t 
 sys_mbox_trypost(sys_mbox_t mbox, void *msg)
-{   
-  portBASE_TYPE result = xQueueSend( mbox, &msg, ( portTickType ) ( archPOST_BLOCK_TIME_MS / portTICK_RATE_MS ) );
-  while( result == errQUEUE_FULL)
-  {
-    vTaskDelay(1);
-    result = xQueueSend( mbox, &msg, ( portTickType ) ( archPOST_BLOCK_TIME_MS / portTICK_RATE_MS ) );
-  }
-  return ERR_OK;
+{
+err_t result;
+
+   if ( xQueueSend( mbox, &msg, 0 ) == pdPASS ) 
+   {
+      result = ERR_OK;
+   }
+   else {
+      // could not post, queue must be full
+      result = ERR_MEM;
+#if SYS_STATS
+      lwip_stats.sys.mbox.err++;
+#endif /* SYS_STATS */
+   }
+
+   return result;
 }
 
@@ -185 +201 @@
 
 /*-----------------------------------------------------------------------------------*/
+/*
+  Similar to sys_arch_mbox_fetch, but if message is not ready immediately, we'll
+  return with SYS_MBOX_EMPTY.  On success, 0 is returned.
+*/
+u32_t sys_arch_mbox_tryfetch(sys_mbox_t mbox, void **msg)
+{
+void *dummyptr;
+
+  if ( msg == NULL )
+  {
+    msg = &dummyptr;
+  }
+   
+   if ( pdTRUE == xQueueReceive( mbox, &(*msg), 0 ) ) 
+   {
+      return ERR_OK;
+   }
+   else 
+   {
+      return SYS_MBOX_EMPTY;   
+   }
+}
+
+/*-----------------------------------------------------------------------------------*/
 //  Creates and returns a new semaphore. The "count" argument specifies
 //  the initial state of the semaphore. TBD finish and test
@@ -202 +242 @@
   if( xSemaphore == NULL )
   {
+#if SYS_STATS
+      ++lwip_stats.sys.sem.err;
+#endif /* SYS_STATS */
     return NULL;  // TBD need assert
   }
   else
   {
+#if SYS_STATS
+      ++lwip_stats.sys.sem.used;
+      if (lwip_stats.sys.sem.max < lwip_stats.sys.sem.used) {
+         lwip_stats.sys.sem.max = lwip_stats.sys.sem.used;
+    }
+#endif /* SYS_STATS */
     return xSemaphore;
   }
@@ -281 +330 @@
 sys_sem_free(sys_sem_t sem)
 {
+#if SYS_STATS
+      --lwip_stats.sys.sem.used;
+#endif /* SYS_STATS */
   vQueueDelete( sem ); 
 }

firmware/trunk/core/makingthings/SAM7_EMAC.c

@@ -522 +522 @@
   while( !( AT91C_BASE_RSTC->RSTC_RSR & AT91C_RSTC_NRSTL ) )
   {
-    __asm volatile ( "NOP" );
-  }
-    __asm volatile ( "NOP" );
+    portNOP();
+  }
+
+  portNOP();
 
   /* Setup the pins. */
@@ -783 +784 @@
   while( !( AT91C_BASE_EMAC->EMAC_NSR & AT91C_EMAC_IDLE ) )
   {
-    __asm( "NOP" );
+    portNOP();
   }
 
@@ -806 +807 @@
   while( !( AT91C_BASE_EMAC->EMAC_NSR & AT91C_EMAC_IDLE ) )
   {
-    __asm( "NOP" );
+    portNOP();
   };
 

firmware/trunk/core/makingthings/lwipopts.h

@@ -41 +41 @@
 #define SYS_LIGHTWEIGHT_PROT            1
 
+#define lwipTCP_STACK_SIZE          600
 #define TCPIP_THREAD_PRIO 5
 
@@ -96 +97 @@
 /* ---------- Pbuf options ---------- */
 /* PBUF_POOL_SIZE: the number of buffers in the pbuf pool. */
-#define PBUF_POOL_SIZE          6
+#define PBUF_POOL_SIZE          8
 
 /* PBUF_POOL_BUFSIZE: the size of each pbuf in the pbuf pool. */