RTX2: Fix RTX wrapper in LWIP to use RTX objects directly

Author: bulislaw

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

@@ -686,8 +686,8 @@ err_t eth_arch_enetif_init(struct netif *netif)
   netif->linkoutput = k64f_low_level_output;
 
   /* CMSIS-RTOS, start tasks */
-  memset(k64f_enetdata.xTXDCountSem.data, 0, sizeof(k64f_enetdata.xTXDCountSem.data));
-  k64f_enetdata.xTXDCountSem.attr.cb_mem = k64f_enetdata.xTXDCountSem.data;
+  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);
   k64f_enetdata.xTXDCountSem.id = osSemaphoreNew(ENET_TX_RING_LEN, ENET_TX_RING_LEN, &k64f_enetdata.xTXDCountSem.attr);
 

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

@@ -1022,8 +1022,8 @@ err_t eth_arch_enetif_init(struct netif *netif)
 
     /* CMSIS-RTOS, start tasks */
 #if NO_SYS == 0
-    memset(lpc_enetdata.xTXDCountSem.data, 0, sizeof(lpc_enetdata.xTXDCountSem.data));
-    lpc_enetdata.xTXDCountSem.attr.cb_mem = lpc_enetdata.xTXDCountSem.data;
+    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);
     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

@@ -126,10 +126,11 @@ err_t sys_mbox_new(sys_mbox_t *mbox, int queue_sz) {
         error("sys_mbox_new size error\n");
 
     memset(mbox->queue, 0, sizeof(mbox->queue));
+    memset(&mbox->data, 0, sizeof(mbox->data));
     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);
+    mbox->attr.cb_mem = &mbox->data;
+    mbox->attr.cb_size = sizeof(mbox->data);
     mbox->id = osMessageQueueNew(queue_sz, sizeof(void *), &mbox->attr);
     return (mbox->id == NULL) ? (ERR_MEM) : (ERR_OK);
 }
@@ -252,8 +253,8 @@ 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) {
-    memset(sem->data, 0, sizeof(sem->data));
-    sem->attr.cb_mem = sem->data;
+    memset(&sem->data, 0, sizeof(sem->data));
+    sem->attr.cb_mem = &sem->data;
     sem->attr.cb_size = sizeof(sem->data);
     sem->id = osSemaphoreNew(UINT16_MAX, count, &sem->attr);
     if (sem->id == NULL)
@@ -321,8 +322,8 @@ 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) {
-    memset(mutex->data, 0, sizeof(mutex->data));
-    mutex->attr.cb_mem = mutex->data;
+    memset(&mutex->data, 0, sizeof(mutex->data));
+    mutex->attr.cb_mem = &mutex->data;
     mutex->attr.cb_size = sizeof(mutex->data);
     mutex->id = osMutexNew(&mutex->attr);
     if (mutex->id == NULL)
@@ -357,12 +358,12 @@ void sys_mutex_free(sys_mutex_t *mutex) {}
  *---------------------------------------------------------------------------*/
 osMutexId_t lwip_sys_mutex;
 osMutexAttr_t lwip_sys_mutex_attr;
-os_mutex_t lwip_sys_mutex_obj;
+os_mutex_t lwip_sys_mutex_data;
 
 void sys_init(void) {
     us_ticker_read(); // Init sys tick
-    lwip_sys_mutex_attr.cb_mem = &lwip_sys_mutex_obj;
-    lwip_sys_mutex_attr.cb_size = sizeof(lwip_sys_mutex_obj);
+    lwip_sys_mutex_attr.cb_mem = &lwip_sys_mutex_data;
+    lwip_sys_mutex_attr.cb_size = sizeof(lwip_sys_mutex_data);
     lwip_sys_mutex = osMutexNew(&lwip_sys_mutex_attr);
     if (lwip_sys_mutex == NULL)
         error("sys_init error\n");
@@ -463,8 +464,8 @@ sys_thread_t sys_thread_new(const char *pcName,
 
     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.cb_size = sizeof(t->data);
+    t->attr.cb_mem = &t->data;
     t->attr.stack_size = stacksize;
     t->attr.stack_mem = malloc(stacksize);
     if (t->attr.stack_mem == NULL) {

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

@@ -30,17 +30,17 @@ extern u8_t lwip_ram_heap[];
 typedef struct {
     osSemaphoreId_t   id;
     osSemaphoreAttr_t attr;
-    char         data[sizeof(os_semaphore_t)];
+    os_semaphore_t    data;
 } sys_sem_t;
 
 #define sys_sem_valid(x)        (((*x).id == NULL) ? 0 : 1)
 #define sys_sem_set_invalid(x)  ( (*x).id = NULL)
 
 // === MUTEX ===
 typedef struct {
-    osMutexId_t    id;
-    osMutexAttr_t  attr;
-    char       data[sizeof(os_mutex_t)];
+    osMutexId_t   id;
+    osMutexAttr_t attr;
+    os_mutex_t    data;
 } sys_mutex_t;
 
 // === MAIL BOX ===
@@ -49,8 +49,8 @@ typedef struct {
 typedef struct {
     osMessageQueueId_t   id;
     osMessageQueueAttr_t attr;
-    char        queue[MB_SIZE * (sizeof(void*) + sizeof(os_message_t))];
-    char        obj[sizeof(os_message_queue_t)];
+    char                 queue[MB_SIZE * (sizeof(void*) + sizeof(os_message_t))];
+    os_message_queue_t   data;
 } sys_mbox_t;
 
 #define SYS_MBOX_NULL               ((uint32_t) NULL)
@@ -69,7 +69,7 @@ typedef struct {
 typedef struct {
     osThreadId_t   id;
     osThreadAttr_t attr;
-    char obj[sizeof(os_thread_t)];
+    os_thread_t    data;
 } sys_thread_data_t;
 typedef sys_thread_data_t* sys_thread_t;