From 3c953d78ea269f945692c9fe1e1cdfcb886a4b9e Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Wed, 5 Apr 2017 18:02:54 +0000
Subject: [PATCH] Various fixes.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@10141 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h |  2 +-
 os/hal/ports/STM32/STM32L0xx/hal_lld.h      |  6 +++---
 os/rt/ports/ARMCMx/cmsis_os/cmsis_os.c      | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h b/demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h
index 83884702f..c400d3fd9 100644
--- a/demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h
+++ b/demos/STM32/RT-STM32L053R8-NUCLEO/mcuconf.h
@@ -62,7 +62,7 @@
 #define STM32_USART2SEL                     STM32_USART2SEL_APB
 #define STM32_LPUART1SEL                    STM32_LPUART1SEL_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
 
 /*
diff --git a/os/hal/ports/STM32/STM32L0xx/hal_lld.h b/os/hal/ports/STM32/STM32L0xx/hal_lld.h
index 3c9085112..b7ed52d5e 100644
--- a/os/hal/ports/STM32/STM32L0xx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32L0xx/hal_lld.h
@@ -475,7 +475,7 @@
  * @brief   LPTIM1 clock source.
  */
 #if !defined(STM32_LPTIM1SEL) || defined(__DOXYGEN__)
-#define STM32_LPTIM1SEL                     STM32_LPTIM1SEL_APB
+#define STM32_LPTIM1SEL                     STM32_LPTIM1SEL_LSI
 #endif
 
 /**
@@ -1063,8 +1063,8 @@
 /**
  * @brief   LPTIM1 frequency.
  */
-#if (STM32_LPTIM1SEL == STM32_LPTIM1SEL_APB) || defined(__DOXYGEN__)
-#define STM32_LPTIM1CLK             STM32_PCLK1
+#if (STM32_LPTIM1SEL == STM32_LPTIM1SEL_LSI) || defined(__DOXYGEN__)
+#define STM32_LPTIM1CLK             STM32_LSICLK
 #elif STM32_LPTIM1SEL == STM32_LPTIM1SEL_SYSCLK
 #define STM32_LPTIM1CLK             STM32_SYSCLK
 #elif STM32_LPTIM1SEL == STM32_LPTIM1SEL_HSI16
diff --git a/os/rt/ports/ARMCMx/cmsis_os/cmsis_os.c b/os/rt/ports/ARMCMx/cmsis_os/cmsis_os.c
index 75fdbc70e..aceedad51 100644
--- a/os/rt/ports/ARMCMx/cmsis_os/cmsis_os.c
+++ b/os/rt/ports/ARMCMx/cmsis_os/cmsis_os.c
@@ -153,15 +153,15 @@ osStatus osThreadSetPriority(osThreadId thread_id, osPriority newprio) {
 
   /* Changing priority.*/
 #if CH_CFG_USE_MUTEXES
-  if ((tp->prio == tp->realprio) || ((tprio_t)newprio > tp->prio))
-    tp->prio = (tprio_t)newprio;
-  tp->realprio = (tprio_t)newprio;
+  if ((tp->p_prio == tp->p_realprio) || ((tprio_t)newprio > tp->p_prio))
+    tp->p_prio = (tprio_t)newprio;
+  tp->p_realprio = (tprio_t)newprio;
 #else
   tp->prio = (tprio_t)newprio;
 #endif
 
   /* The following states need priority queues reordering.*/
-  switch (tp->state) {
+  switch (tp->p_state) {
 #if CH_CFG_USE_MUTEXES |                                                    \
     CH_CFG_USE_CONDVARS |                                                   \
     (CH_CFG_USE_SEMAPHORES && CH_CFG_USE_SEMAPHORES_PRIORITY) |             \
@@ -180,7 +180,7 @@ osStatus osThreadSetPriority(osThreadId thread_id, osPriority newprio) {
 #endif
     /* Re-enqueues tp with its new priority on the queue.*/
     queue_prio_insert(queue_dequeue(tp),
-                      (threads_queue_t *)tp->u.wtobjp);
+                      (threads_queue_t *)tp->p_u.wtobjp);
     break;
 #endif
   case CH_STATE_READY: