Merge pull request pine64#63 from jpeng0215/update

bouffalolab_release_bl_iot_sdk_1.6.36

components/fs/romfs/src/bl_romfs.c

@@ -55,6 +55,8 @@
 #define ROMFH_REG       2
 #define ROMFH_UNKNOW    3
 
+#define HEAD_MAGIC_LEN  (16)    /*romfs header magic num size*/
+
 struct romfh {
     int32_t nextfh;
     int32_t spec;
@@ -214,7 +216,8 @@ static int file_info(char *path, char **p_addr_start_input, char **p_addr_end_in
     /* /romfs */
     ROMFS_DUBUG("addr_start = %p\r\n", addr_start);
     if (addr_start == romfs_root) {
-        addr_start = (char *)(romfs_root + ALIGNUP16(strlen(romfs_root + 16) + 1) + 16 + 64);
+        /* point first dot file*/
+        addr_start = (char *)(romfs_root + ALIGNUP16(strlen(romfs_root + HEAD_MAGIC_LEN) + 1) + HEAD_MAGIC_LEN);
     }
 
     ROMFS_DUBUG("addr_start = %p, addr_end = %p, path = %s\r\n", addr_start, addr_end, path);
@@ -548,7 +551,8 @@ static aos_dir_t *romfs_opendir(file_t *fp, const char *path)
     if (0 == res) {
         /* need add update dir_addr and current_addr */
         if (start_addr == romfs_root) {
-            dp->dir_start_addr = (char *)(romfs_root + ALIGNUP16(strlen(romfs_root + 16) + 1) + 16 + 64);
+            /* point first dot file*/
+            dp->dir_start_addr = (char *)(romfs_root + ALIGNUP16(strlen(romfs_root + HEAD_MAGIC_LEN) + 1) + HEAD_MAGIC_LEN);
         } else {
             if (0 == dirent_childaddr(start_addr)) {
                 return NULL;

components/libc/newlibc/bouffalo.mk

@@ -10,6 +10,11 @@ CONFIG_SYS_TRACE_MEM_ENTRY_NUM ?= 1000
 CPPFLAGS += -DSYS_TRACE_MEM_ENABLE -DSYS_TRACE_MEM_ENTRY_NUM=$(CONFIG_SYS_TRACE_MEM_ENTRY_NUM)
 endif
 
+ifeq ($(CONFIG_USE_PSRAM), 1)
+CFLAGS   += -DCFG_USE_PSRAM
+CPPFLAGS += -DCFG_USE_PSRAM
+endif
+
 ## These include paths would be exported to project level
 COMPONENT_ADD_INCLUDEDIRS += ./
 

components/libc/newlibc/syscalls.c

@@ -56,8 +56,17 @@ typedef struct
     uint32_t entry_num_max;
 }malloc_table_info_t;
 
+typedef struct 
+{
+    void* caller;
+    uint32_t totalSize;
+    uint32_t mallocTimes;
+}mem_stats_t;
+
 malloc_entry_t malloc_entry[SYS_TRACE_MEM_ENTRY_NUM];
 malloc_table_info_t malloc_table_info;
+#define SYS_TRACE_MEM_STATS_ENTRY_NUM 100
+mem_stats_t mem_stats[SYS_TRACE_MEM_STATS_ENTRY_NUM];
 
 void trace_malloc(void *ptr, size_t size, void *caller)
 {
@@ -131,6 +140,58 @@ void trace_realloc(void *ptr_new, void *ptr_old, size_t size, void *caller)
         }
     }
 }
+
+void mem_trace_stats()
+{
+    for(int i=0;i<SYS_TRACE_MEM_STATS_ENTRY_NUM;i++)
+    {
+        mem_stats[i].caller = NULL;
+        mem_stats[i].totalSize = 0;
+        mem_stats[i].mallocTimes = 0;
+    }
+
+    for(int i=0; i<SYS_TRACE_MEM_ENTRY_NUM; i++)
+    {
+        if(malloc_entry[i].ptr == NULL)
+        {
+            continue;
+        }
+
+        uint8_t fExist = 0;
+        uint16_t firstEmpty = 0xFFFF;
+        for(int j=0; j<SYS_TRACE_MEM_STATS_ENTRY_NUM;j++)
+        {
+            if(malloc_entry[i].caller == mem_stats[j].caller)
+            {
+                fExist = 1;
+                mem_stats[j].mallocTimes++;
+                mem_stats[j].totalSize += malloc_entry[i].size;
+                break;
+            }
+
+            if(firstEmpty==0xFFFF && mem_stats[j].caller == NULL)
+            {
+                firstEmpty = j;
+            }
+        }
+
+        if(!fExist && firstEmpty != 0xFFFF)
+        {
+            mem_stats[firstEmpty].caller = malloc_entry[i].caller;
+            mem_stats[firstEmpty].totalSize = malloc_entry[i].size;
+            mem_stats[firstEmpty].mallocTimes = 1;
+        }
+    }
+
+    for(int i=0;i<SYS_TRACE_MEM_STATS_ENTRY_NUM;i++)
+    {
+        if(mem_stats[i].caller)
+        {
+            printf("%d, caller:0x%08lx, totalSize:%lu, mallocTimes:%lu\r\n", i, (uint32_t)mem_stats[i].caller, mem_stats[i].totalSize, mem_stats[i].mallocTimes);
+        }
+    }
+    printf("Current left size is %d bytes\r\n", xPortGetFreeHeapSize());
+}
 #endif
 
 /* Reentrant versions of system calls.  */
@@ -350,6 +411,11 @@ int fsync(int fd)
 #endif
 }
 
+#if defined(CFG_USE_PSRAM)
+#define IS_PSARAM(addr) ((addr&0xFF000000) == 0x26000000 || \
+                        (addr&0xFF000000) == 0x24000000 )
+#endif
+
 void *_malloc_r(struct _reent *ptr, size_t size)
 {
     void* result;
@@ -359,7 +425,17 @@ void *_malloc_r(struct _reent *ptr, size_t size)
         return NULL;
     }
 
-    result = (void*)pvPortMalloc(size);
+#if defined(CFG_USE_PSRAM)
+    if (xPortGetFreeHeapSizePsram() > size) {
+        result = (void*)pvPortMallocPsram(size);
+    }
+    else {
+        result = (void*)pvPortMalloc(size);
+    }
+#else
+	result = (void*)pvPortMalloc(size);
+#endif
+
     if (result == NULL)
     {
         ptr->_errno = ENOMEM;
@@ -376,7 +452,17 @@ void *_realloc_r(struct _reent *ptr, void *old, size_t newlen)
 {
     void* result;
 
-    result = (void*)pvPortRealloc(old, newlen);
+#if defined(CFG_USE_PSRAM)
+    if (IS_PSARAM((uint32_t)old)) {
+        result = (void*)pvPortReallocPsram(old, newlen);
+    }
+    else {
+        result = (void*)pvPortRealloc(old, newlen);
+    }
+#else
+	result = (void*)pvPortRealloc(old, newlen);
+#endif
+
     if (result == NULL)
     {
         ptr->_errno = ENOMEM;
@@ -398,7 +484,17 @@ void *_calloc_r(struct _reent *ptr, size_t size, size_t len)
         return NULL;
     }
 
-    result = (void*)pvPortCalloc(size, len);
+#if defined(CFG_USE_PSRAM)
+    if (xPortGetFreeHeapSizePsram()) {
+        result = (void*)pvPortCallocPsram(size, len);
+    }
+    else {
+        result = (void*)pvPortCalloc(size, len);
+    }
+#else
+	result = (void*)pvPortCalloc(size, len);
+#endif
+
     if (result == NULL)
     {
         ptr->_errno = ENOMEM;
@@ -413,7 +509,16 @@ void *_calloc_r(struct _reent *ptr, size_t size, size_t len)
 
 void _free_r(struct _reent *ptr, void *addr)
 {
-    vPortFree(addr);
+#if defined(CFG_USE_PSRAM)	
+    if (IS_PSARAM((uint32_t)addr)) {
+        vPortFreePsram(addr);
+    }
+    else {
+        vPortFree(addr);
+    }
+#else
+	vPortFree(addr);
+#endif
 
 #ifdef SYS_TRACE_MEM_ENABLE
     trace_free(addr, (void *)__builtin_return_address(0));

components/network/ble/ble_common.mk

@@ -40,6 +40,7 @@ CONFIG_DISABLE_BLE_CONTROLLER_SEC_CON := 1
 endif
 
 ifeq ($(PRIV_CONFIG_GEN_BLE),m0s1p)
+CONFIG_BLE_PDS := 1
 CONFIG_BT_CONN := 1
 CONFIG_BLE_TX_BUFF_DATA := 2
 CONFIG_BT_MESH := 0
@@ -52,6 +53,21 @@ CONFIG_DISABLE_BT_SMP := 1
 CONFIG_DISABLE_BT_HOST_PRIVACY := 1
 endif
 
+ifeq ($(PRIV_CONFIG_GEN_BLE),m0s0sp)
+CONFIG_BLE_PDS := 1
+CONFIG_BT_CONN := 0
+CONFIG_BLE_TX_BUFF_DATA := 2
+CONFIG_BT_MESH := 0
+CONFIG_BT_ALLROLES := 0
+CONFIG_BT_CENTRAL := 0
+CONFIG_BT_PERIPHERAL := 0
+CONFIG_BT_OBSERVER := 1
+CONFIG_BT_BROADCASTER := 0
+CONFIG_DISABLE_BT_SMP := 1
+CONFIG_DISABLE_BT_HOST_PRIVACY := 1
+CONFIG_BT_STACK_CLI := 0
+endif
+
 ifeq ($(PRIV_CONFIG_GEN_BLE),m16s1)
 CONFIG_BT_CONN := 16
 CONFIG_BT_ALLROLES := 0
@@ -82,6 +98,11 @@ CFLAGS   += -DBL702
 endif
 
 ifeq ($(CONFIG_CHIP_NAME),BL606P)
+CFLAGS   += -DBL606P
+CONFIG_BT_RESET=0
+endif
+
+ifeq ($(CONFIG_CHIP_NAME),BL808)
 CFLAGS   += -DBL808
 CONFIG_BT_RESET=0
 endif
@@ -145,8 +166,17 @@ ifeq ($(CONFIG_EM_16K),1)
 CFLAGS += -DCONFIG_EM_16K
 endif
 
-CONFIG_BLE ?=1
 CONFIG_BT ?= 1
+CONFIG_SCO_ESCO ?= 1
+CONFIG_PCA ?= 1
+CONFIG_RF_EXTRC ?= 1
+CONFIG_CSB ?= 1
+CONFIG_SNIFF ?= 1
+CONFIG_RSWITCH ?= 1
+CONFIG_TEST_MODE ?= 1
+CONFIG_SEC_CONN ?= 1
+CONFIG_BT_DIRECT_TEST_MODE ?= 1
+CONFIG_BLE ?= 1
 CONFIG_CIS ?= 1
 CONFIG_ADV_EXTENSION ?= 1
 CONFIG_BIS ?= 1
@@ -257,13 +287,16 @@ ifeq ($(CONFIG_BT_GEN_RANDOM_BY_SW),1)
 CFLAGS += -DCONFIG_BT_GEN_RANDOM_BY_SW
 endif
 
-ifeq ($(CONFIG_PDS_ENABLE),1)
+ifeq ($(CONFIG_BLE_PDS),1)
 CFLAGS += -DCFG_BLE_PDS
 CFLAGS += -DCONFIG_HW_SEC_ENG_DISABLE
 endif
 
-CFLAGS   += 	-DCONFIG_BT_CONN \
- 			-DCONFIG_BT_HCI_VS_EVT_USER \
+ifneq ($(CONFIG_BT_CONN),0)
+CFLAGS   += 	-DCONFIG_BT_CONN
+endif
+
+CFLAGS   += -DCONFIG_BT_HCI_VS_EVT_USER \
  			-DCONFIG_BT_ASSERT \
 
 ifneq ($(CONFIG_SIMPLE_MASTER),1)

components/network/ble/blecontroller_702_m0s0sp/bouffalo.mk

@@ -0,0 +1,6 @@
+COMPONENT_LIB_ONLY := 1
+COMPONENT_ADD_INCLUDEDIRS += ../blecontroller/ble_inc
+LIBS ?= blecontroller_702_m0s0sp
+COMPONENT_ADD_LDFLAGS += -L$(COMPONENT_PATH)/lib $(addprefix -l,$(LIBS))
+ALL_LIB_FILES := $(patsubst %,$(COMPONENT_PATH)/lib/lib%.a,$(LIBS))
+COMPONENT_ADD_LINKER_DEPS := $(ALL_LIB_FILES)