RTX2: Fix LWIP so it doesn't require dynamic RTX memory

Author: bulislaw

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_Freescale/k64f_emac.c

@@ -686,11 +686,9 @@ err_t eth_arch_enetif_init(struct netif *netif)
   netif->linkoutput = k64f_low_level_output;
 
   /* CMSIS-RTOS, start tasks */
-#ifdef CMSIS_OS_RTX
   memset(k64f_enetdata.xTXDCountSem.data, 0, sizeof(k64f_enetdata.xTXDCountSem.data));
   k64f_enetdata.xTXDCountSem.attr.cb_mem = k64f_enetdata.xTXDCountSem.data;
   k64f_enetdata.xTXDCountSem.attr.cb_size = sizeof(k64f_enetdata.xTXDCountSem.data);
-#endif
   k64f_enetdata.xTXDCountSem.id = osSemaphoreNew(ENET_TX_RING_LEN, ENET_TX_RING_LEN, &k64f_enetdata.xTXDCountSem.attr);
 
   LWIP_ASSERT("xTXDCountSem creation error", (k64f_enetdata.xTXDCountSem.id != NULL));

features/FEATURE_LWIP/lwip-interface/lwip-eth/arch/TARGET_NXP/lpc17_emac.c

@@ -1022,11 +1022,9 @@ err_t eth_arch_enetif_init(struct netif *netif)
 
     /* CMSIS-RTOS, start tasks */
 #if NO_SYS == 0
-#ifdef CMSIS_OS_RTX
     memset(lpc_enetdata.xTXDCountSem.data, 0, sizeof(lpc_enetdata.xTXDCountSem.data));
     lpc_enetdata.xTXDCountSem.attr.cb_mem = lpc_enetdata.xTXDCountSem.data;
     lpc_enetdata.xTXDCountSem.attr.cb_size = sizeof(lpc_enetdata.xTXDCountSem.data);
-#endif
     lpc_enetdata.xTXDCountSem.id = osSemaphoreNew(LPC_NUM_BUFF_TXDESCS, LPC_NUM_BUFF_TXDESCS, &lpc_enetdata.xTXDCountSem.attr);
 	LWIP_ASSERT("xTXDCountSem creation error", (lpc_enetdata.xTXDCountSem.id != NULL));
 

features/FEATURE_LWIP/lwip-interface/lwip-sys/arch/lwip_sys_arch.c

@@ -125,13 +125,11 @@ err_t sys_mbox_new(sys_mbox_t *mbox, int queue_sz) {
     if (queue_sz > MB_SIZE)
         error("sys_mbox_new size error\n");
 
-#ifdef CMSIS_OS_RTX
     memset(mbox->queue, 0, sizeof(mbox->queue));
     mbox->attr.mq_mem = mbox->queue;
     mbox->attr.mq_size = sizeof(mbox->queue);
     mbox->attr.cb_mem = mbox->obj;
     mbox->attr.cb_size = sizeof(mbox->obj);
-#endif
     mbox->id = osMessageQueueNew(queue_sz, sizeof(void *), &mbox->attr);
     return (mbox->id == NULL) ? (ERR_MEM) : (ERR_OK);
 }
@@ -254,11 +252,9 @@ u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg) {
  *      err_t                 -- ERR_OK if semaphore created
  *---------------------------------------------------------------------------*/
 err_t sys_sem_new(sys_sem_t *sem, u8_t count) {
-#ifdef CMSIS_OS_RTX
     memset(sem->data, 0, sizeof(sem->data));
     sem->attr.cb_mem = sem->data;
     sem->attr.cb_size = sizeof(sem->data);
-#endif
     sem->id = osSemaphoreNew(UINT16_MAX, count, &sem->attr);
     if (sem->id == NULL)
         error("sys_sem_new create error\n");
@@ -325,15 +321,9 @@ void sys_sem_free(sys_sem_t *sem) {}
  * @param mutex pointer to the mutex to create
  * @return a new mutex */
 err_t sys_mutex_new(sys_mutex_t *mutex) {
-#ifdef CMSIS_OS_RTX
-#if defined(__MBED_CMSIS_RTOS_CA9) || defined(__MBED_CMSIS_RTOS_CM)
     memset(mutex->data, 0, sizeof(mutex->data));
-#else
-    memset(mutex->data, 0, sizeof(int32_t)*3);
-#endif
     mutex->attr.cb_mem = mutex->data;
     mutex->attr.cb_size = sizeof(mutex->data);
-#endif
     mutex->id = osMutexNew(&mutex->attr);
     if (mutex->id == NULL)
         return ERR_MEM;
@@ -366,10 +356,14 @@ void sys_mutex_free(sys_mutex_t *mutex) {}
  *      Initialize sys arch
  *---------------------------------------------------------------------------*/
 osMutexId_t lwip_sys_mutex;
+osMutexAttr_t lwip_sys_mutex_attr;
+os_mutex_t lwip_sys_mutex_obj;
 
 void sys_init(void) {
     us_ticker_read(); // Init sys tick
-    lwip_sys_mutex = osMutexNew(NULL);
+    lwip_sys_mutex_attr.cb_mem = &lwip_sys_mutex_obj;
+    lwip_sys_mutex_attr.cb_size = sizeof(lwip_sys_mutex_obj);
+    lwip_sys_mutex = osMutexNew(&lwip_sys_mutex_attr);
     if (lwip_sys_mutex == NULL)
         error("sys_init error\n");
 }
@@ -467,15 +461,15 @@ sys_thread_t sys_thread_new(const char *pcName,
     sys_thread_t t = (sys_thread_t)&thread_pool[thread_pool_index];
     thread_pool_index++;
 
-#ifdef CMSIS_OS_RTX
     t->attr.name = pcName;
     t->attr.priority = (osPriority_t)priority;
+    t->attr.cb_size = sizeof(t->obj);
+    t->attr.cb_mem = t->obj;
     t->attr.stack_size = stacksize;
     t->attr.stack_mem = malloc(stacksize);
     if (t->attr.stack_mem == NULL) {
       error("Error allocating the stack memory");
     }
-#endif
     t->id = osThreadNew((os_thread_func_t)thread, arg, &t->attr);
     if (t->id == NULL)
         error("sys_thread_new create error\n");

features/FEATURE_LWIP/lwip-interface/lwip-sys/arch/sys_arch.h

@@ -30,9 +30,7 @@ extern u8_t lwip_ram_heap[];
 typedef struct {
     osSemaphoreId_t   id;
     osSemaphoreAttr_t attr;
-#ifdef CMSIS_OS_RTX
     char         data[sizeof(os_semaphore_t)];
-#endif
 } sys_sem_t;
 
 #define sys_sem_valid(x)        (((*x).id == NULL) ? 0 : 1)
@@ -42,13 +40,7 @@ typedef struct {
 typedef struct {
     osMutexId_t    id;
     osMutexAttr_t  attr;
-#ifdef CMSIS_OS_RTX
-#if defined(__MBED_CMSIS_RTOS_CA9) || defined(__MBED_CMSIS_RTOS_CM)
     char       data[sizeof(os_mutex_t)];
-#else
-    int32_t    data[3];
-#endif
-#endif
 } sys_mutex_t;
 
 // === MAIL BOX ===
@@ -57,10 +49,8 @@ typedef struct {
 typedef struct {
     osMessageQueueId_t   id;
     osMessageQueueAttr_t attr;
-#ifdef CMSIS_OS_RTX
     char        queue[MB_SIZE * (sizeof(void*) + sizeof(os_message_t))];
     char        obj[sizeof(os_message_queue_t)];
-#endif
 } sys_mbox_t;
 
 #define SYS_MBOX_NULL               ((uint32_t) NULL)
@@ -79,6 +69,7 @@ typedef struct {
 typedef struct {
     osThreadId_t   id;
     osThreadAttr_t attr;
+    char obj[sizeof(os_thread_t)];
 } sys_thread_data_t;
 typedef sys_thread_data_t* sys_thread_t;
 

rtos/rtx2/mbed_rtx_conf.h

@@ -24,10 +24,10 @@
 
 #include "mbed_rtx.h"
 
-#define CMSIS_OS_RTX
-
 #ifndef OS_STACK_SIZE
 #define OS_STACK_SIZE               4096
 #endif
 
+#define OS_DYNAMIC_MEM_SIZE         0
+
 #endif /* MBED_RTX_CONF_H */