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

Fixed more regressions. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13972 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2020-12-20 08:19:23 +00:00
parent 93e3cdbba2
commit f56587102a
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
os/common/ports/SIMIA32/chcore.h
View File

@ -243,6 +243,16 @@ struct port_context {
#define PORT_WORKING_AREA(s, n) \ #define PORT_WORKING_AREA(s, n) \
stkalign_t s[THD_WORKING_AREA_SIZE(n) / sizeof (stkalign_t)] stkalign_t s[THD_WORKING_AREA_SIZE(n) / sizeof (stkalign_t)]
/**
* @brief Priority level verification macro.
*/
#define PORT_IRQ_IS_VALID_PRIORITY(n) false
/**
* @brief Priority level verification macro.
*/
#define PORT_IRQ_IS_VALID_KERNEL_PRIORITY(n) false
/** /**
* @brief IRQ prologue code. * @brief IRQ prologue code.
* @details This macro must be inserted at the start of all IRQ handlers * @details This macro must be inserted at the start of all IRQ handlers
@ -321,7 +331,9 @@ extern "C" {
/** /**
* @brief Port-related initialization code. * @brief Port-related initialization code.
*/ */
static inline void port_init(void) { static inline void port_init(os_instance_t *oip) {
(void)oip;
port_irq_sts = (syssts_t)0; port_irq_sts = (syssts_t)0;
port_isr_context_flag = false; port_isr_context_flag = false;

6
os/hal/ports/simulator/posix/hal_lld.c
View File

@ -93,10 +93,10 @@ void _sim_check_for_interrupts(void) {
} }
if (int_occurred) { if (int_occurred) {
_dbg_check_lock(); __dbg_check_lock();
if (chSchIsPreemptionRequired()) if (chSchIsPreemptionRequired())
chSchDoReschedule(); chSchDoPreemption();
_dbg_check_unlock(); __dbg_check_unlock();
} }
} }

7
os/rt/src/chsys.c
View File

@ -86,16 +86,19 @@ void chSysInit(void) {
/* Initializing default OS instance.*/ /* Initializing default OS instance.*/
{ {
#if (CH_DBG_ENABLE_STACK_CHECK == TRUE) || (CH_CFG_USE_DYNAMIC == TRUE) #if CH_DBG_ENABLE_STACK_CHECK == TRUE
extern stkalign_t __main_thread_stack_base__, extern stkalign_t __main_thread_stack_base__,
__main_thread_stack_end__; __main_thread_stack_end__;
#endif #endif
static const os_instance_config_t default_cfg = { static const os_instance_config_t default_cfg = {
.name = "c0", .name = "c0",
#if (CH_DBG_ENABLE_STACK_CHECK == TRUE) || (CH_CFG_USE_DYNAMIC == TRUE) #if CH_DBG_ENABLE_STACK_CHECK == TRUE
.mainthread_base = &__main_thread_stack_base__, .mainthread_base = &__main_thread_stack_base__,
.mainthread_end = &__main_thread_stack_end__, .mainthread_end = &__main_thread_stack_end__,
#elif CH_CFG_USE_DYNAMIC == TRUE
.mainthread_base = NULL,
.mainthread_end = NULL,
#endif #endif
#if CH_CFG_NO_IDLE_THREAD == FALSE #if CH_CFG_NO_IDLE_THREAD == FALSE
.idlethread_base = THD_WORKING_AREA_BASE(ch_idle_thread_wa), .idlethread_base = THD_WORKING_AREA_BASE(ch_idle_thread_wa),