Re #1643: added main stack (MSP) paint and free check

opentx · Aug 31, 2014 · a78c2b8 · a78c2b8
1 parent b15ce6f
commit a78c2b8
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 4 deletions.
diff --git a/radio/src/gui/view_statistics.cpp b/radio/src/gui/view_statistics.cpp
@@ -204,12 +204,14 @@ void menuStatisticsDebug(uint8_t event)
   lcd_putsLeft(6*FH, STR_FREESTACKMINB);
 
 #if LCD_W >= 212
-  lcd_putsAtt(MENU_DEBUG_COL1_OFS, 6*FH+1, "[Main]", SMLSIZE);
+  lcd_putsAtt(MENU_DEBUG_COL1_OFS, 6*FH+1, "[G]", SMLSIZE);
   lcd_outdezAtt(lcdLastPos, 6*FH, stack_free(0), UNSIGN|LEFT);
-  lcd_putsAtt(lcdLastPos+2, 6*FH+1, "[Mix]", SMLSIZE);
+  lcd_putsAtt(lcdLastPos+2, 6*FH+1, "[M]", SMLSIZE);
   lcd_outdezAtt(lcdLastPos, 6*FH, stack_free(1), UNSIGN|LEFT);
-  lcd_putsAtt(lcdLastPos+2, 6*FH+1, "[Audio]", SMLSIZE);
+  lcd_putsAtt(lcdLastPos+2, 6*FH+1, "[A]", SMLSIZE);
   lcd_outdezAtt(lcdLastPos, 6*FH, stack_free(2), UNSIGN|LEFT);
+  lcd_putsAtt(lcdLastPos+2, 6*FH+1, "[I]", SMLSIZE);
+  lcd_outdezAtt(lcdLastPos, 6*FH, stack_free(255), UNSIGN|LEFT);
 #else
   lcd_outdezAtt(MENU_DEBUG_COL1_OFS, 6*FH, stack_free(0), UNSIGN|LEFT);
   lcd_puts(lcdLastPos, 6*FH, "/");

diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
@@ -3304,6 +3304,11 @@ uint16_t stack_free(uint8_t tid)
       stack = audioStack;
       size = AUDIO_STACK_SIZE;
       break;
+    case 255:
+      // main stack
+      stack = (OS_STK *)&_main_stack_start;
+      size = (_main_stack_size / 4);
+      break;
     default:
       return 0;
   }

diff --git a/radio/src/opentx.h b/radio/src/opentx.h
@@ -694,6 +694,8 @@ extern uint8_t flightModeTransitionLast;
   extern unsigned char *heap;
   extern int _end;
   extern unsigned char *_estack;
+  extern unsigned char * _main_stack_start;
+  extern const int _main_stack_size;
   #define getAvailableMemory() ((unsigned int)((unsigned char *)&_estack - heap))
 #endif
 

diff --git a/radio/src/targets/sky9x/syscalls.c b/radio/src/targets/sky9x/syscalls.c
@@ -55,6 +55,7 @@
 extern int errno;
 extern int  _end;
 extern int _estack;
+extern const int _main_stack_size;
 
 #define RAM_END (unsigned char *)&_estack
 
@@ -68,7 +69,7 @@ extern int _getpid ( void ) ;
 unsigned char *heap = (unsigned char *)&_end;
 extern caddr_t _sbrk(int nbytes)
 {
-  if (heap + nbytes < RAM_END-4096) {
+  if (heap + nbytes < RAM_END-_main_stack_size) {
     unsigned char *prev_heap = heap;
     heap += nbytes;
     return (caddr_t) prev_heap;

diff --git a/...V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc_ride7/startup_stm32f2xx.s b/...V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/gcc_ride7/startup_stm32f2xx.s
@@ -98,6 +98,17 @@ LoopFillZerobss:
   ldr  r3, = _ebss
   cmp  r2, r3
   bcc  FillZerobss
+
+/*Paint Main Stack */
+  ldr  r2, = _main_stack_start
+PaintMainStack:
+  movs r3, #0x55555555
+  str  r3, [r2], #4
+LoopPaintMainStack:
+  ldr  r3, = _estack
+  cmp  r2, r3
+  bcc  PaintMainStack
+
 /* Call the clock system intitialization function.*/
   bl  SystemInit   
 /* Call the application's entry point.*/

diff --git a/radio/src/targets/taranis/stm32_flash_bl.ld b/radio/src/targets/taranis/stm32_flash_bl.ld
@@ -34,6 +34,8 @@ ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
 _estack = 0x20020000;    /* end of 128K SRAM */
+_main_stack_size = 0x2000;   /*size of main stack*/
+_main_stack_start = _estack - _main_stack_size;
 
 /* Generate a link error if heap and stack don't fit into RAM */
 _Min_Heap_Size = 0;      /* required amount of heap  */

diff --git a/radio/src/targets/taranis/stm32_ramBoot.ld b/radio/src/targets/taranis/stm32_ramBoot.ld
@@ -21,6 +21,9 @@ ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
 _estack = 0x20020000;    /* end of 128K SRAM */
+_main_stack_size = 0x2000;   /*size of main stack*/
+_main_stack_start = _estack - _main_stack_size;
+
 
 /* Generate a link error if heap and stack don't fit into RAM */
 _Min_Heap_Size = 0;      /* required amount of heap  */