deon/chopstx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update example-led.

Browse Source
This commit is contained in:
NIIBE Yutaka
2017-11-20 10:14:34 +09:00
parent 8c4ea854cb
commit 14c4256337
4 changed files with 23 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,5 +1,7 @@
2017-11-20 NIIBE Yutaka <gniibe@fsij.org> 2017-11-20 NIIBE Yutaka <gniibe@fsij.org>
* example-led: Update using stack-def.h.
* chopstx-cortex-m.c [__ARM_ARCH_6M__] (chx_sched): Fix. * chopstx-cortex-m.c [__ARM_ARCH_6M__] (chx_sched): Fix.
2017-11-18 NIIBE Yutaka <gniibe@fsij.org> 2017-11-18 NIIBE Yutaka <gniibe@fsij.org>

15
example-led/sample.c
View File

@@ -72,14 +72,17 @@ blk (void *arg)
#define PRIO_BLK 2 #define PRIO_BLK 2
#endif #endif
extern uint8_t __process1_stack_base__[], __process1_stack_size__[]; #define STACK_MAIN
extern uint8_t __process2_stack_base__[], __process2_stack_size__[]; #define STACK_PROCESS_1
#define STACK_PROCESS_2
#include "stack-def.h"
#define STACK_ADDR_PWM ((uint32_t)__process1_stack_base__)
#define STACK_SIZE_PWM ((uint32_t)__process1_stack_size__)
#define STACK_ADDR_BLK ((uint32_t)__process2_stack_base__) #define STACK_ADDR_PWM ((uint32_t)process1_base)
#define STACK_SIZE_BLK ((uint32_t)__process2_stack_size__) #define STACK_SIZE_PWM (sizeof process1_base)
#define STACK_ADDR_BLK ((uint32_t)process2_base)
#define STACK_SIZE_BLK (sizeof process2_base)
int int

37
example-led/sample.ld
View File

@@ -1,12 +1,6 @@
/* /*
* ST32F0 memory setup. * ST32F0 memory setup.
*/ */
__main_stack_size__ = 0x0100; /* Idle+Exception handlers */
__process0_stack_size__ = 0x0100; /* Main program */
__process1_stack_size__ = 0x0100; /* first thread program */
__process2_stack_size__ = 0x0100; /* second thread program */
__process3_stack_size__ = 0x0100; /* third thread program */
MEMORY MEMORY
{ {
flash0 : org = 0x08000000, len = 4k flash0 : org = 0x08000000, len = 4k
@@ -87,34 +81,15 @@ SECTIONS
KEEP(*(.bss.startup.*)) KEEP(*(.bss.startup.*))
} > ram } > ram
.process_stack : .stacks (NOLOAD) :
{ {
. = ALIGN(8); . = ALIGN(8);
__process3_stack_base__ = .; *(.main_stack)
. += __process3_stack_size__; *(.process_stack.0)
*(.process_stack.1)
*(.process_stack.2)
*(.process_stack.3)
. = ALIGN(8); . = ALIGN(8);
__process3_stack_end__ = .;
__process2_stack_base__ = .;
. += __process2_stack_size__;
. = ALIGN(8);
__process2_stack_end__ = .;
__process1_stack_base__ = .;
. += __process1_stack_size__;
. = ALIGN(8);
__process1_stack_end__ = .;
__process0_stack_base__ = .;
. += __process0_stack_size__;
. = ALIGN(8);
__process0_stack_end__ = .;
} > ram
.main_stack :
{
. = ALIGN(8);
__main_stack_base__ = .;
. += __main_stack_size__;
. = ALIGN(8);
__main_stack_end__ = .;
} > ram } > ram
.data : .data :

38
example-led/sample.ld.m3
View File

@@ -1,12 +1,6 @@
/* /*
* ST32F103 memory setup. * ST32F103 memory setup.
*/ */
__main_stack_size__ = 0x0100; /* Idle+Exception handlers */
__process0_stack_size__ = 0x0100; /* Main program */
__process1_stack_size__ = 0x0100; /* first thread program */
__process2_stack_size__ = 0x0100; /* second thread program */
__process3_stack_size__ = 0x0100; /* third thread program */
MEMORY MEMORY
{ {
flash0 : org = 0x08000000, len = 4k flash0 : org = 0x08000000, len = 4k
@@ -78,34 +72,14 @@ SECTIONS
_etext = .; _etext = .;
_textdata = _etext; _textdata = _etext;
.process_stack : .stacks (NOLOAD) :
{ {
*(.main_stack)
*(.process_stack.0)
*(.process_stack.1)
*(.process_stack.2)
*(.process_stack.3)
. = ALIGN(8); . = ALIGN(8);
__process3_stack_base__ = .;
. += __process3_stack_size__;
. = ALIGN(8);
__process3_stack_end__ = .;
__process2_stack_base__ = .;
. += __process2_stack_size__;
. = ALIGN(8);
__process2_stack_end__ = .;
__process1_stack_base__ = .;
. += __process1_stack_size__;
. = ALIGN(8);
__process1_stack_end__ = .;
__process0_stack_base__ = .;
. += __process0_stack_size__;
. = ALIGN(8);
__process0_stack_end__ = .;
} > ram
.main_stack :
{
. = ALIGN(8);
__main_stack_base__ = .;
. += __main_stack_size__;
. = ALIGN(8);
__main_stack_end__ = .;
} > ram } > ram
.data : .data :