Browse Source

add:spi重新启用dma

Dozingfiretruck 4 years ago
parent
commit
b4a3539148
3 changed files with 5 additions and 29 deletions
  1. 1 1
      app/port/luat_shell_air101.c
  2. 2 3
      app/port/luat_spi_air101.c
  3. 2 25
      xmake.lua

+ 1 - 1
app/port/luat_shell_air101.c

@@ -113,7 +113,7 @@ static void luat_shell(void *sdata){
 static OS_STK __attribute__((aligned(4))) 			TaskStartStk[TASK_START_STK_SIZE] = {0};
 void luat_shell_poweron(int _drv) {
     tls_uart_rx_callback_register(0, luat_shell_uart_cb, NULL);
-	tls_os_queue_create(&shell_queue, 1024);
+	tls_os_queue_create(&shell_queue, 256);
 	tls_os_task_create(NULL, NULL,
 				luat_shell,
 				NULL,

+ 2 - 3
app/port/luat_spi_air101.c

@@ -33,7 +33,6 @@ int luat_spi_bus_setup(luat_spi_device_t* spi_dev){
         wm_spi_ck_config(WM_IO_PB_02);
         wm_spi_di_config(WM_IO_PB_03);
         wm_spi_do_config(WM_IO_PB_05);
-        return 0;
     }
     // #ifdef AIR103
     else if (bus_id == 1) { // 本质上是mode=1,不是spi1,该模式下psram可用
@@ -51,7 +50,7 @@ int luat_spi_bus_setup(luat_spi_device_t* spi_dev){
         LLOGD("spi_bus error");
         return -1;
     }
-    tls_spi_trans_type(SPI_BYTE_TRANSFER);
+    tls_spi_trans_type(SPI_DMA_TRANSFER);
 }
 
 //初始化配置SPI各项参数,并打开SPI
@@ -99,7 +98,7 @@ int luat_spi_setup(luat_spi_t* spi) {
     if(clk / (UNIT_MHZ/2) > sysclk.apbclk)
         clk = sysclk.apbclk * (UNIT_MHZ/2);
 
-    tls_spi_trans_type(SPI_BYTE_TRANSFER);
+    tls_spi_trans_type(SPI_DMA_TRANSFER);
     ret = tls_spi_setup(TLS_SPI_MODE, TLS_SPI_CS_LOW, clk);
 
     return ret;

+ 2 - 25
xmake.lua

@@ -39,14 +39,14 @@ add_cxflags(flto .. "-DTLS_CONFIG_CPU_XT804=1 -DGCC_COMPILE=1 -mcpu=ck804ef -std
 set_dependir("$(buildir)/.deps")
 set_objectdir("$(buildir)/.objs")
 
-set_policy("build.across_targets_in_parallel")
+set_policy("build.across_targets_in_parallel", false)
 
 target("app")
     set_kind("static")
     set_plat("cross")
     set_arch("c-sky")
 
-    add_includedirs("app/port")
+    add_includedirs("app/port",{public = true})
     
     add_files("src/app/**.c")
     del_files("src/app/btapp/**.c")
@@ -194,14 +194,9 @@ target("air10x")
     add_files("src/os/**.S")
     add_files("platform/common/**.c")
 
-    add_includedirs("platform/common/params",{public = true})
     add_includedirs("src/app/mbedtls/include",{public = true})
-    add_includedirs("src/os/rtos/include",{public = true})
     add_includedirs("platform/arch",{public = true})
-    add_includedirs("include",{public = true})
-    add_includedirs("include/driver",{public = true})
     add_includedirs("include/os",{public = true})
-    add_includedirs("include/platform",{public = true})
     add_includedirs("include/wifi",{public = true})
     add_includedirs("include/arch/xt804",{public = true})
     add_includedirs("include/arch/xt804/csi_core",{public = true})
@@ -210,30 +205,12 @@ target("air10x")
     add_includedirs("demo",{public = true})
     add_includedirs("platform/inc",{public = true})
 
-
-    add_includedirs("demo")
     add_includedirs("demo/console")
-    add_includedirs("include/app")
-    add_includedirs("include/arch/xt804")
-    add_includedirs("include/arch/xt804/csi_core")
     add_includedirs("include/arch/xt804/csi_dsp")
-    add_includedirs("include/bt")
-    add_includedirs("include/driver")
-    add_includedirs("include/net")
-    add_includedirs("include/os")
-    add_includedirs("include/platform")
-    add_includedirs("include/wifi")
-    add_includedirs("platform/common/params")
-    add_includedirs("platform/inc")
     add_includedirs("platform/sys")
-
-    add_includedirs("src/os/rtos/include")
-    add_includedirs("src/app/mbedtls/include")
     add_includedirs("src/app/mbedtls/ports")
     add_includedirs("src/app/fatfs")
 
-    add_includedirs("app/port",{public = true})
-
     add_files(luatos.."lua/src/*.c")
     add_files(luatos.."luat/modules/*.c")
     add_files(luatos.."luat/vfs/*.c")