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

Various fixes. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@10141 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2017-04-05 18:02:54 +00:00
parent 92f956b336
commit 3c953d78ea
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h
View File

@ -62,7 +62,7 @@
#define STM32_USART2SEL STM32_USART2SEL_APB #define STM32_USART2SEL STM32_USART2SEL_APB
#define STM32_LPUART1SEL STM32_LPUART1SEL_APB #define STM32_LPUART1SEL STM32_LPUART1SEL_APB
#define STM32_I2C1SEL STM32_I2C1SEL_APB #define STM32_I2C1SEL STM32_I2C1SEL_APB
#define STM32_LPTIM1SEL STM32_LPTIM1SEL_APB #define STM32_LPTIM1SEL STM32_LPTIM1SEL_LSI
#define STM32_HSI48SEL STM32_HSI48SEL_HSI48 #define STM32_HSI48SEL STM32_HSI48SEL_HSI48
/* /*

6
os/hal/ports/STM32/STM32L0xx/hal_lld.h
View File

@ -475,7 +475,7 @@
* @brief LPTIM1 clock source. * @brief LPTIM1 clock source.
*/ */
#if !defined(STM32_LPTIM1SEL) || defined(__DOXYGEN__) #if !defined(STM32_LPTIM1SEL) || defined(__DOXYGEN__)
#define STM32_LPTIM1SEL STM32_LPTIM1SEL_APB #define STM32_LPTIM1SEL STM32_LPTIM1SEL_LSI
#endif #endif
/** /**
@ -1063,8 +1063,8 @@
/** /**
* @brief LPTIM1 frequency. * @brief LPTIM1 frequency.
*/ */
#if (STM32_LPTIM1SEL == STM32_LPTIM1SEL_APB) || defined(__DOXYGEN__) #if (STM32_LPTIM1SEL == STM32_LPTIM1SEL_LSI) || defined(__DOXYGEN__)
#define STM32_LPTIM1CLK STM32_PCLK1 #define STM32_LPTIM1CLK STM32_LSICLK
#elif STM32_LPTIM1SEL == STM32_LPTIM1SEL_SYSCLK #elif STM32_LPTIM1SEL == STM32_LPTIM1SEL_SYSCLK
#define STM32_LPTIM1CLK STM32_SYSCLK #define STM32_LPTIM1CLK STM32_SYSCLK
#elif STM32_LPTIM1SEL == STM32_LPTIM1SEL_HSI16 #elif STM32_LPTIM1SEL == STM32_LPTIM1SEL_HSI16

10
os/rt/ports/ARMCMx/cmsis_os/cmsis_os.c
View File

@ -153,15 +153,15 @@ osStatus osThreadSetPriority(osThreadId thread_id, osPriority newprio) {
/* Changing priority.*/ /* Changing priority.*/
#if CH_CFG_USE_MUTEXES #if CH_CFG_USE_MUTEXES
if ((tp->prio == tp->realprio) || ((tprio_t)newprio > tp->prio)) if ((tp->p_prio == tp->p_realprio) || ((tprio_t)newprio > tp->p_prio))
tp->prio = (tprio_t)newprio; tp->p_prio = (tprio_t)newprio;
tp->realprio = (tprio_t)newprio; tp->p_realprio = (tprio_t)newprio;
#else #else
tp->prio = (tprio_t)newprio; tp->prio = (tprio_t)newprio;
#endif #endif
/* The following states need priority queues reordering.*/ /* The following states need priority queues reordering.*/
switch (tp->state) { switch (tp->p_state) {
#if CH_CFG_USE_MUTEXES | \ #if CH_CFG_USE_MUTEXES | \
CH_CFG_USE_CONDVARS | \ CH_CFG_USE_CONDVARS | \
(CH_CFG_USE_SEMAPHORES && CH_CFG_USE_SEMAPHORES_PRIORITY) | \ (CH_CFG_USE_SEMAPHORES && CH_CFG_USE_SEMAPHORES_PRIORITY) | \
@ -180,7 +180,7 @@ osStatus osThreadSetPriority(osThreadId thread_id, osPriority newprio) {
#endif #endif
/* Re-enqueues tp with its new priority on the queue.*/ /* Re-enqueues tp with its new priority on the queue.*/
queue_prio_insert(queue_dequeue(tp), queue_prio_insert(queue_dequeue(tp),
(threads_queue_t *)tp->u.wtobjp); (threads_queue_t *)tp->p_u.wtobjp);
break; break;
#endif #endif
case CH_STATE_READY: case CH_STATE_READY: