andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13517 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

This commit is contained in:
Giovanni Di Sirio 2020-04-06 12:41:34 +00:00
parent 6e4e900e6c
commit 5e0daf6d1a
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/STM32/RT-STM32L552ZE-NUCLEO144/debug/RT-STM32L552ZE-NUCLEO144 (ST-Link GDB Server, Flash and Run).launch
View File

@ -33,7 +33,7 @@
<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;brr-usart_init-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;lr-sp-ctx-tp-chThdCreateStatic-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;lr-sp-ctx-tp-chThdCreateStatic-(format)&quot; val=&quot;4&quot;/&gt;&lt;content id=&quot;brr-usart_init-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
<stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;globalVariableList/&gt;&#10;"/>
<stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList&gt;&#10;&lt;memoryBlockExpressionItem&gt;&#10;&lt;expression text=&quot;0xe000a40&quot;/&gt;&#10;&lt;/memoryBlockExpressionItem&gt;&#10;&lt;/memoryBlockExpressionList&gt;&#10;"/>
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>

5
os/common/ports/ARMv8-M-ML/chcore.c
View File

@ -54,8 +54,7 @@
/**
* @brief Tail ISR context switch code.
*
* @param[in] sp the stack pointer being switched-out
* @return The stack pointer being switched-in.
* @return The thread being switched-in.
*/
thread_t *port_schedule_next(void) {
thread_t *ntp;
@ -63,7 +62,7 @@ thread_t *port_schedule_next(void) {
chSysLock();
/* TODO statistics, tracing etc */
ntp = chSchRunAhead();
ntp = chSchSelectFirstI();
chSysUnlock();

2
os/common/ports/ARMv8-M-ML/compilers/GCC/chcoreasm.S
View File

@ -122,6 +122,8 @@ SVC_Handler:
PendSV_Handler:
/* Pointer to the current thread.*/
ldr r1, =ch
// movw r1, #:lower16:ch
// movt r1, #:upper16:ch
ldr r1, [r1, #CURRENT_OFFSET]
/* Saving callee context of thread being swapped out.*/

2
os/rt/include/chschd.h
View File

@ -724,7 +724,7 @@ static inline void chSchPreemption(void) {
*
* @special
*/
static inline thread_t *chSchRunAhead(void) {
static inline thread_t *chSchSelectFirstI(void) {
thread_t *otp = currp;
thread_t *ntp;