v1.0.3

kernel/common/include/osal/aic_osal.h

@@ -14,6 +14,19 @@
 #include <rtconfig.h>
 #include <aic_common.h>
 
+/* Common malloc align */
+typedef void *(*aicos_malloc1_t)(size_t);
+typedef void (*aicos_free1_t)(void *);
+typedef void *(*aicos_malloc2_t)(unsigned int, size_t);
+typedef void (*aicos_free2_t)(unsigned int, void *);
+
+void *_aicos_malloc_align_(size_t size, size_t align, unsigned int type, void *func);
+void _aicos_free_align_(void *ptr, unsigned int type, void *func);
+
+/* Irq */
+void aicos_irq_enter(void);
+void aicos_irq_exit(void);
+
 /* New define */
 typedef void *aicos_thread_t;
 typedef void (*aic_thread_entry_t)(void *argument);
@@ -22,13 +35,6 @@ typedef void *aicos_mutex_t;
 typedef void *aicos_event_t;
 typedef void *aicos_queue_t;
 
-typedef struct {
-    int item_size;
-    int depth;
-    void *buf;
-    void *q;
-} osal_queue_def_t;
-
 #if defined(KERNEL_RTTHREAD)
 #include "aic_osal_rtthread.h"
 #elif defined(KERNEL_FREERTOS)

kernel/common/include/osal/aic_osal_baremetal.h

@@ -11,6 +11,8 @@
  extern "C" {
 #endif
 
+#include <string.h>
+#include <csi_core.h>
 #include <aic_errno.h>
 #include <aic_tlsf.h>
 #include <aic_time.h>
@@ -236,24 +238,132 @@ static inline int aicos_event_send(aicos_event_t event, uint32_t set)
 //--------------------------------------------------------------------+
 // Queue API
 //--------------------------------------------------------------------+
-static inline aicos_queue_t aicos_queue_create(uint32_t item_size, uint32_t queue_size) {return NULL;}
-static inline void aicos_queue_delete(aicos_queue_t queue) {}
-static inline int aicos_queue_send(aicos_queue_t queue, void const *buff) {return -1;}
-static inline int aicos_queue_receive(aicos_queue_t queue, void *buff, uint32_t msec) {return -1;}
-static inline int aicos_queue_empty(aicos_queue_t queue) {return 0;}
+
+typedef struct
+{
+    unsigned short depth;               /* max items */
+    unsigned short item_size;           /* size of each item */
+    volatile unsigned short wr_idx;     /* write pointer */
+    volatile unsigned short rd_idx;     /* read pointer */
+    unsigned char buffer[0];            /* data buffer */
+}osal_queue_def_t;
+
+typedef osal_queue_def_t* osal_queue_t;
+
+/* ringbuffer */
+#define RB_DATA_COUNT(w, r, max) (((w)>=(r)) ? ((w)-(r)) : ((max)-(r)+(w)))
+#define RB_IS_FULL(w, r, max)    (RB_DATA_COUNT(w,r,max) >= ((max)-1))
+#define RB_INC_POINTER(p, max)        p = ((p)+1)%(max)
+
+static inline aicos_queue_t aicos_queue_create(uint32_t item_size, uint32_t queue_size)
+{
+    osal_queue_t q;
+
+    q = aicos_malloc(0, sizeof(osal_queue_def_t) + item_size*queue_size);
+    if (NULL == q)
+        return NULL;
+
+    q->item_size = item_size;
+    q->depth = queue_size;
+    q->rd_idx = 0;
+    q->wr_idx = 0;
+
+    return (aicos_queue_t)q;
+}
+
+static inline void aicos_queue_delete(aicos_queue_t queue)
+{
+    aicos_free(0, queue);
+}
+
+static inline int aicos_queue_send(aicos_queue_t queue, void const *buff)
+{
+    osal_queue_t q = (aicos_queue_t)queue;
+
+    if (!buff)
+        return -EINVAL;
+
+    if (RB_IS_FULL(q->wr_idx, q->rd_idx, q->depth))
+        return -EAGAIN;
+
+    memcpy(q->buffer + q->wr_idx*q->item_size, buff, q->item_size);
+
+    RB_INC_POINTER(q->wr_idx, q->depth);
+
+    return 0;
+}
+
+static inline int aicos_queue_receive(aicos_queue_t queue, void *buff, uint32_t msec)
+{
+    osal_queue_t q = (aicos_queue_t)queue;
+    u64 s_us = 0;
+    u64 e_us = 0;
+
+    if (!buff)
+        return -EINVAL;
+
+    if (RB_DATA_COUNT(q->wr_idx, q->rd_idx, q->depth)) {
+        memcpy(buff, q->buffer + q->rd_idx*q->item_size, q->item_size);
+        RB_INC_POINTER(q->rd_idx, q->depth);
+        return 0;
+    }
+
+    if (msec == 0) {
+        return -EAGAIN;
+    } else if (msec == AICOS_WAIT_FOREVER) {
+        while (!RB_DATA_COUNT(q->wr_idx, q->rd_idx, q->depth)) { }
+    } else {
+        s_us = aic_get_time_us();
+        while (!RB_DATA_COUNT(q->wr_idx, q->rd_idx, q->depth)) {
+            e_us = aic_get_time_us();
+            if (((e_us-s_us) / 1000) >= msec)
+                return -ETIME;
+        }
+    }
+
+    if (RB_DATA_COUNT(q->wr_idx, q->rd_idx, q->depth)) {
+        memcpy(buff, q->buffer + q->rd_idx*q->item_size, q->item_size);
+        RB_INC_POINTER(q->rd_idx, q->depth);
+        return 0;
+    }
+
+    return -EINVAL;
+}
+
+static inline int aicos_queue_empty(aicos_queue_t queue)
+{
+    osal_queue_t q = (aicos_queue_t)queue;
+
+    return !RB_DATA_COUNT(q->wr_idx, q->rd_idx, q->depth);
+}
 
 //--------------------------------------------------------------------+
 // Critical API
 //--------------------------------------------------------------------+
-static inline size_t aicos_enter_critical_section(void) {return -1;}
-static inline void aicos_leave_critical_section(size_t flag) {}
+static inline size_t aicos_enter_critical_section(void)
+{
+    return (size_t)csi_irq_save();;
+}
+static inline void aicos_leave_critical_section(size_t flag)
+{
+    csi_irq_restore(flag);
+}
 
 //--------------------------------------------------------------------+
 // Sleep API
 //--------------------------------------------------------------------+
-static inline void aicos_msleep(uint32_t delay) {}
-
+static inline void aicos_msleep(uint32_t delay)
+{
+    u64 s_us = 0;
+    u64 e_us = 0;
 
+    s_us = aic_get_time_us();
+    while (1) {
+        e_us = aic_get_time_us();
+        if (((e_us-s_us) / 1000) >= delay)
+            return;
+    }
+}
 
 #ifdef __cplusplus
  }

kernel/common/include/osal/aic_osal_freertos.h

@@ -16,6 +16,17 @@
 #include <timers.h>
 #include <event_groups.h>
 #include <aic_errno.h>
+#include <aic_tlsf.h>
+
+//--------------------------------------------------------------------+
+// Interrupt Define
+//--------------------------------------------------------------------+
+
+extern unsigned int g_aicos_irq_nested_cnt;
+static inline int aicos_in_irq(void)
+{
+    return g_aicos_irq_nested_cnt;
+}
 
 //--------------------------------------------------------------------+
 // Timeout Define
@@ -284,17 +295,33 @@ static inline void aicos_msleep(uint32_t delay)
 static inline void *aicos_malloc(unsigned int mem_type, size_t size)
 {
     if (mem_type == MEM_DEFAULT)
-        return rt_malloc(size);
+        return pvPortMalloc(size);
     else
-        return aic_memheap_malloc(mem_type, size);
+        return aic_tlsf_malloc(mem_type, size);
 }
 
 static inline void aicos_free(unsigned int mem_type, void *mem)
 {
     if (mem_type == MEM_DEFAULT)
-        rt_free(mem);
+        vPortFree(mem);
     else
-        aic_memheap_free(mem_type, mem);
+        aic_tlsf_free(mem_type, mem);
+}
+
+static inline void *aicos_malloc_align(uint32_t mem_type, size_t size, size_t align)
+{
+    if (mem_type == MEM_DEFAULT)
+        return _aicos_malloc_align_(size, align, 0xFFFF, (void *)pvPortMalloc);
+    else
+        return aic_tlsf_malloc_align(mem_type, size, align);
+}
+
+static inline void aicos_free_align(uint32_t mem_type, void *mem)
+{
+    if (mem_type == MEM_DEFAULT)
+        _aicos_free_align_(mem, 0xFFFF, (void *)vPortFree);
+    else
+        aic_tlsf_free_align(mem_type, mem);
 }
 
 #ifdef __cplusplus

kernel/common/include/osal/aic_osal_platform_lbl.h

@@ -51,7 +51,6 @@ typedef enum irqreturn irqreturn_t;
 typedef irqreturn_t (*irq_handler_t)(int, void *);
 typedef irqreturn_t (*pin_irq_handler_t)(void *);
 
-
 static inline int aicos_request_irq(unsigned int irq, irq_handler_t handler, unsigned int flags,
                                  const char *name, void *data)
 {
@@ -71,12 +70,6 @@ static inline void aicos_irq_disable(unsigned int irq)
     drv_irq_disable(irq);
 }
 
-extern unsigned int g_aicos_irq_nested_cnt;
-static inline int aicos_in_irq(void)
-{
-    return g_aicos_irq_nested_cnt;
-}
-
 //--------------------------------------------------------------------+
 // Cache API
 //--------------------------------------------------------------------+

kernel/common/include/osal/aic_osal_rhino.h

@@ -160,6 +160,13 @@ static inline int aicos_event_send(aicos_event_t event, uint32_t set)
 // Queue API
 //--------------------------------------------------------------------+
 
+typedef struct {
+    int item_size;
+    int depth;
+    void *buf;
+    void *q;
+} osal_queue_def_t;
+
 static inline aicos_queue_t aicos_queue_create(uint32_t item_size, uint32_t queue_size)
 {
     osal_queue_def_t *p_queue_def;

kernel/common/include/osal/aic_osal_rtthread.h

@@ -246,20 +246,18 @@ static inline void aicos_free(unsigned int mem_type, void *mem)
 
 static inline void *aicos_malloc_align(uint32_t mem_type, size_t size, size_t align)
 {
-    /* Only support MEM_DEFAULT type by now */
-    if (mem_type != MEM_DEFAULT)
-        return NULL;
-
-    return rt_malloc_align(size, align);
+    if (mem_type == MEM_DEFAULT)
+        return rt_malloc_align(size, align);
+    else
+        return _aicos_malloc_align_(size, align, mem_type, (void *)aic_memheap_malloc);
 }
 
 static inline void aicos_free_align(uint32_t mem_type, void *mem)
 {
-    /* Only support MEM_DEFAULT type by now */
-    if (mem_type != MEM_DEFAULT)
-        return;
-
-    rt_free_align(mem);
+    if (mem_type == MEM_DEFAULT)
+        rt_free_align(mem);
+    else
+        _aicos_free_align_(mem, mem_type, (void *)aic_memheap_free);
 }
 
 #ifdef __cplusplus