Просмотр исходного кода

update:从裸机stack里分出4KB给freertos和sys用,扩展luatos task的stac

alienwalker 3 лет назад
Родитель
Сommit
56901437f4

+ 1 - 1
bsp/air105/include/FreeRTOSConfig.h

@@ -83,7 +83,7 @@
 #define configCPU_CLOCK_HZ                (SystemCoreClock)
 #define configTICK_RATE_HZ                ((TickType_t)100)
 #define configMINIMAL_STACK_SIZE          ((uint16_t)256)
-#define configTOTAL_HEAP_SIZE             ((size_t)(30 * 1024))
+#define configTOTAL_HEAP_SIZE             ((size_t)(32 * 1024))
 #define configMAX_TASK_NAME_LEN           (16)
 #define configUSE_TRACE_FACILITY          0
 #define configUSE_16_BIT_TICKS            0

+ 2 - 2
bsp/air105/platform/app_main.c

@@ -46,7 +46,7 @@ const uint32_t __attribute__((section (".app_info")))
 	0,
 };
 
-static void prvSystemReserCtrl(void)
+static void prvSystemHaltResetCtrl(void)
 {
 #ifdef __DEBUG__
 	WDT_Feed();
@@ -151,7 +151,7 @@ static void prvHW_Init(void)
 
 int main(void)
 {
-    cm_backtrace_init_ex("air105", "1.0", "v0001", prvSystemReserCtrl);
+    cm_backtrace_init_ex("air105", "1.0", "v0001", prvSystemHaltResetCtrl);
 	__NVIC_SetPriorityGrouping(7 - __NVIC_PRIO_BITS);//对于freeRTOS必须这样配置
 	SystemCoreClockUpdate();
     CoreTick_Init();

+ 3 - 1
bsp/common/include/platform_define.h

@@ -339,6 +339,8 @@ enum
 #ifdef __AIR106_BSP__
 enum
 {
+	LCD_ID0 = 0,
+	LCD_MAX,
 	USB_ID0 = 0,
 	USB_MAX,
 	CAN_ID0 = 0,	//CAN CLK=SYS/2
@@ -355,7 +357,7 @@ enum
 	VIRTUAL_UART0 = 0,
 	VIRTUAL_UART_MAX,
 
-	SPI_ID0,
+	SPI_ID0 = 0,
 	SPI_ID1,
 	SPI_MAX,
 

+ 1 - 1
bsp/common/src/core_service.c

@@ -892,7 +892,7 @@ void Core_ServiceInit(void)
 void Core_UserTaskInit(void)
 {
 #ifdef __LUATOS__
-	prvService.UserHandle = Task_Create(prvLuatOS_Task, NULL, 8*1024, LUATOS_TASK_PRO, "luatos task");
+	prvService.UserHandle = Task_Create(prvLuatOS_Task, NULL, 12*1024, LUATOS_TASK_PRO, "luatos task");
 	luat_base_init();
 #endif
 }

+ 1 - 1
project/air105/app.ld

@@ -5,7 +5,7 @@ ENTRY(Reset_Handler)
 
 _stext = ORIGIN(FLASH);
 _Min_Heap_Size = 0 ;	/* required amount of heap  */
-_Min_Stack_Size = 0x2000 ;	/* required amount of stack */
+_Min_Stack_Size = 0x1000 ;	/* required amount of stack */
 _estack = ORIGIN(RAM) + _Min_Stack_Size + _Min_Heap_Size;	/* start of "RAM" Ram type memory */
 _sstack = ORIGIN(RAM); /* start of "RAM" Ram type memory */
 __ram_end = ORIGIN(RAM) + LENGTH(RAM);