Merge pull request #2158 from armink/lts-v3.1.x

Lts v3.1.x

Author: BernardXiong

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,35 @@
+### Summary of this Pull Request (PR) 拉取/合并请求的简述  
+
+**Add description here.** **请在这里加入描述**
+
+### Intent for your PR 拉取/合并请求的目的  
+
+Choose one (Mandatory): 必须选择一项  
+
+- [ ] This PR is for a code-review and is intended to get feedback 本拉取/合并请求是一个草稿版本  
+- [ ] This PR is mature, and ready to be integrated into the repo 本拉取/合并请求是一个成熟版本  
+
+### Reviewers (Mandatory): 代码审阅者（必须指定）
+
+(@<github.com username(s)> Ex: @user1, @user2)  
+
+### Code Quality： 代码质量  
+
+As part of this pull request, I've considered the following:  
+我在这个拉取/合并请求中已经考虑了：
+
+- [ ] Already check the difference between PR and old code 已经仔细查看过代码改动的对比
+- [ ] Style guide is adhered to, including spacing, naming and other style 代码风格正确，包括缩进空格，命名及其他风格
+- [ ] All redundant code is removed and cleaned up 没有垃圾代码，代码尽量精简，不包含`#if 0`代码，不包含已经被注释了的代码
+- [ ] All modifications are justified and not affect other components or BSP 所有变更均有原因及合理的，并且不会影响到其他软件组件代码或BSP
+- [ ] I've commented appropriately where code is tricky 对难懂代码均提供对应的注释
+- [ ] Code in this PR is of high quality 本拉取/合并请求代码是高质量的
+
+### Testing：代码测试
+
+I've tested the code using the following test programs (provide list here):  
+我已经在如下场合跑过对应的测试：  
+
+- [ ] application 1
+- [ ] application 2
+- [ ] ...(add others here)

bsp/CME_M7/rtconfig.h

@@ -55,6 +55,7 @@
 #define RT_USING_DEVICE
 #define RT_USING_DEVICE_IPC
 #define RT_USING_SERIAL
+#define RT_SERIAL_USING_DMA
 
 /* SECTION: Console options */
 #define RT_USING_CONSOLE
@@ -100,8 +101,14 @@
 /* Enable DHCP */
 // #define RT_LWIP_DHCP
 
-/* the number of simulatenously active TCP connections*/
-#define RT_LWIP_TCP_PCB_NUM		3
+#define RT_MEMP_NUM_NETCONN     12
+#define RT_LWIP_PBUF_NUM        3
+#define RT_LWIP_RAW_PCB_NUM     2
+#define RT_LWIP_UDP_PCB_NUM     4
+#define RT_LWIP_TCP_PCB_NUM     8
+#define RT_LWIP_TCP_SEG_NUM     40
+#define RT_LWIP_TCP_SND_BUF     4380
+#define RT_LWIP_TCP_WND         4380
 
 /* ip address of target */
 #define RT_LWIP_IPADDR "192.168.1.30"

bsp/CME_M7/rtconfig.py

@@ -15,8 +15,10 @@
 	PLATFORM 	= 'armcc'
 	EXEC_PATH 	= 'C:/Keil'
 elif CROSS_TOOL == 'iar':
-	PLATFORM 	= 'iar'
-	EXEC_PATH 	= 'C:/Program Files/IAR Systems/Embedded Workbench 6.0 Evaluation'	
+	print('================ERROR============================')
+	print('Not support iar yet!')
+	print('=================================================')
+	exit(0)
 
 if os.getenv('RTT_EXEC_PATH'):
 	EXEC_PATH = os.getenv('RTT_EXEC_PATH')
@@ -64,15 +66,14 @@
     LINK = 'armlink'
     TARGET_EXT = 'axf'
 
-    DEVICE = ' --cortex-m3'
+    DEVICE = ' --cpu Cortex-M3'
     CFLAGS = DEVICE + ' --c99 --apcs=interwork'
     AFLAGS = DEVICE
-    LFLAGS = DEVICE + ' --info sizes --info totals --info unused --info veneers --list rtthread.map --scatter nuc472_flash.sct'
+    LFLAGS = DEVICE + ' --info sizes --info totals --info unused --info veneers --list rtthread.map --scatter CME_M7.sct'
 
-    CFLAGS += ' -I' + EXEC_PATH + '/ARM/RV31/INC'
-    LFLAGS += ' --libpath ' + EXEC_PATH + '/ARM/RV31/LIB'
+    LFLAGS += ' --keep *.o(.rti_fn.*)   --keep *.o(FSymTab) --keep *.o(VSymTab)' 
 
-    EXEC_PATH += '/arm/bin40/'
+    EXEC_PATH += '/ARM/ARMCC/bin'
 
     if BUILD == 'debug':
         CFLAGS += ' -g -O0'

bsp/allwinner_tina/.config

@@ -120,6 +120,7 @@ CONFIG_RT_USING_DFS_DEVFS=y
 #
 CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_USING_SERIAL=y
+CONFIG_RT_SERIAL_USING_DMA=y
 # CONFIG_RT_USING_CAN is not set
 # CONFIG_RT_USING_HWTIMER is not set
 # CONFIG_RT_USING_CPUTIME is not set

bsp/allwinner_tina/libcpu/start_gcc.S

@@ -48,7 +48,7 @@ _vector_reset:
 _vector_undef:
     .word vector_undef
 _vector_swi:
-    .word vector_swi
+    .word SVC_Handler
 _vector_pabt:
     .word vector_pabt
 _vector_dabt:
@@ -314,7 +314,9 @@ rt_hw_context_switch_interrupt_do:
     str     lr, [r0, #14*4]
 .endm
 
-    .align  5
+    .align 5
+.weak SVC_Handler
+SVC_Handler:
 vector_swi:
     push_svc_reg
     bl      rt_hw_trap_swi

bsp/allwinner_tina/rtconfig.h

@@ -111,6 +111,7 @@
 
 #define RT_USING_DEVICE_IPC
 #define RT_USING_SERIAL
+#define RT_SERIAL_USING_DMA
 /* RT_USING_CAN is not set */
 /* RT_USING_HWTIMER is not set */
 /* RT_USING_CPUTIME is not set */

bsp/allwinner_tina/rtconfig.py

@@ -2,7 +2,7 @@
 
 # toolchains options
 ARCH        ='arm'
-CPU         ='R6'
+CPU         ='arm9'
 CROSS_TOOL  ='gcc'
 
 if os.getenv('RTT_ROOT'):

bsp/amebaz/.config

@@ -106,6 +106,7 @@ CONFIG_FINSH_ARG_MAX=10
 CONFIG_RT_USING_DEVICE_IPC=y
 CONFIG_RT_PIPE_BUFSZ=512
 CONFIG_RT_USING_SERIAL=y
+CONFIG_RT_SERIAL_USING_DMA=y
 # CONFIG_RT_USING_CAN is not set
 # CONFIG_RT_USING_HWTIMER is not set
 # CONFIG_RT_USING_CPUTIME is not set

bsp/amebaz/drivers/wlan/drv_wifi.c

@@ -91,10 +91,16 @@ int rthw_wifi_register(struct ameba_wifi *wifi)
 
     if ((wifi->flag & WIFI_INIT_FLAG) == 0)
     {
+        wlan = rt_malloc(sizeof(struct rt_wlan_device));
+        RT_ASSERT(wlan != RT_NULL);
         if (wifi->type == WIFI_TYPE_STA)
-            wlan = rt_wlan_dev_register(RT_WLAN_DEVICE_STA_NAME, &ops, 0, wifi);
+        {
+            rt_wlan_dev_register(wlan, RT_WLAN_DEVICE_STA_NAME, &ops, 0, wifi);
+        }
         if (wifi->type == WIFI_TYPE_AP)
-            wlan = rt_wlan_dev_register(RT_WLAN_DEVICE_AP_NAME, &ops, 0, wifi);
+        {
+            rt_wlan_dev_register(wlan, RT_WLAN_DEVICE_AP_NAME, &ops, 0, wifi);
+        }
         wifi->flag |= WIFI_INIT_FLAG;
         wifi->wlan = wlan;
         LOG_D("F:%s L:%d wifi:0x%08x wlan:0x%08x\n", __FUNCTION__, __LINE__, wifi, wlan);

bsp/amebaz/rtconfig.h

@@ -75,6 +75,7 @@
 #define RT_USING_DEVICE_IPC
 #define RT_PIPE_BUFSZ 512
 #define RT_USING_SERIAL
+#define RT_SERIAL_USING_DMA
 
 /* Using WiFi */