aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--os/ports/GCC/ARMCMx/chcore_v7m.c2
-rw-r--r--os/ports/GCC/ARMCMx/chcore_v7m.h14
-rw-r--r--os/ports/GCC/ARMCMx/port.dox2
-rw-r--r--os/ports/IAR/ARMCMx/chcore.h6
-rw-r--r--os/ports/IAR/STM8/chcore.h4
-rw-r--r--os/ports/IAR/STM8/port.dox2
-rw-r--r--os/ports/RC/STM8/chcore.h4
-rw-r--r--os/ports/RC/STM8/port.dox2
-rw-r--r--os/ports/RVCT/ARMCMx/chcore.h6
-rw-r--r--os/ports/cosmic/STM8/chcore.h4
-rw-r--r--os/ports/cosmic/STM8/port.dox2
11 files changed, 24 insertions, 24 deletions
diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.c b/os/ports/GCC/ARMCMx/chcore_v7m.c
index be6888ce5..29d02761c 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.c
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.c
@@ -123,7 +123,7 @@ void _port_init(void) {
CORTEX_PRIORITY_MASK(CORTEX_PRIORITY_SYSTICK));
}
-#if !CH_OPTIMIZE_SPEED
+#if !CH_CFG_OPTIMIZE_SPEED
void _port_lock(void) {
register uint32_t tmp asm ("r3") = CORTEX_BASEPRI_KERNEL;
asm volatile ("msr BASEPRI, %0" : : "r" (tmp) : "memory");
diff --git a/os/ports/GCC/ARMCMx/chcore_v7m.h b/os/ports/GCC/ARMCMx/chcore_v7m.h
index 2d99db7a0..8829872a9 100644
--- a/os/ports/GCC/ARMCMx/chcore_v7m.h
+++ b/os/ports/GCC/ARMCMx/chcore_v7m.h
@@ -373,16 +373,16 @@ struct context {
* @note In this port this it raises the base priority to kernel level.
*/
#if !CORTEX_SIMPLIFIED_PRIORITY || defined(__DOXYGEN__)
-#if CH_OPTIMIZE_SPEED || defined(__DOXYGEN__)
+#if CH_CFG_OPTIMIZE_SPEED || defined(__DOXYGEN__)
#define port_lock() { \
register uint32_t tmp asm ("r3") = CORTEX_BASEPRI_KERNEL; \
asm volatile ("msr BASEPRI, %0" : : "r" (tmp) : "memory"); \
}
-#else /* !CH_OPTIMIZE_SPEED */
+#else /* !CH_CFG_OPTIMIZE_SPEED */
#define port_lock() { \
asm volatile ("bl _port_lock" : : : "r3", "lr", "memory"); \
}
-#endif /* !CH_OPTIMIZE_SPEED */
+#endif /* !CH_CFG_OPTIMIZE_SPEED */
#else /* CORTEX_SIMPLIFIED_PRIORITY */
#define port_lock() asm volatile ("cpsid i" : : : "memory")
#endif /* CORTEX_SIMPLIFIED_PRIORITY */
@@ -394,16 +394,16 @@ struct context {
* @note In this port this it lowers the base priority to user level.
*/
#if !CORTEX_SIMPLIFIED_PRIORITY || defined(__DOXYGEN__)
-#if CH_OPTIMIZE_SPEED || defined(__DOXYGEN__)
+#if CH_CFG_OPTIMIZE_SPEED || defined(__DOXYGEN__)
#define port_unlock() { \
register uint32_t tmp asm ("r3") = CORTEX_BASEPRI_DISABLED; \
asm volatile ("msr BASEPRI, %0" : : "r" (tmp) : "memory"); \
}
-#else /* !CH_OPTIMIZE_SPEED */
+#else /* !CH_CFG_OPTIMIZE_SPEED */
#define port_unlock() { \
asm volatile ("bl _port_unlock" : : : "r3", "lr", "memory"); \
}
-#endif /* !CH_OPTIMIZE_SPEED */
+#endif /* !CH_CFG_OPTIMIZE_SPEED */
#else /* CORTEX_SIMPLIFIED_PRIORITY */
#define port_unlock() asm volatile ("cpsie i" : : : "memory")
#endif /* CORTEX_SIMPLIFIED_PRIORITY */
@@ -510,7 +510,7 @@ extern "C" {
void _port_exit_from_isr(void);
void _port_switch(thread_t *ntp, thread_t *otp);
void _port_thread_start(void);
-#if !CH_OPTIMIZE_SPEED
+#if !CH_CFG_OPTIMIZE_SPEED
void _port_lock(void);
void _port_unlock(void);
#endif
diff --git a/os/ports/GCC/ARMCMx/port.dox b/os/ports/GCC/ARMCMx/port.dox
index 4f209e654..1d6260b12 100644
--- a/os/ports/GCC/ARMCMx/port.dox
+++ b/os/ports/GCC/ARMCMx/port.dox
@@ -237,7 +237,7 @@
* stack checking is enabled (<tt>CH_DBG_ENABLE_STACK_CHECK==TRUE</tt>),
* it is an alias of @p __process_stack_base__ in this port.
* - @p __heap_base__ and @p __heap_end__, those symbols are required
- * if the memory core manager is enabled (<tt>CH_USE_MEMCORE==TRUE</tt>)
+ * if the memory core manager is enabled (<tt>CH_CFG_USE_MEMCORE==TRUE</tt>)
* with a default core size set to zero (<tt>CH_MEMCORE_SIZE==0</tt>).
* .
* @ingroup ARMCMx
diff --git a/os/ports/IAR/ARMCMx/chcore.h b/os/ports/IAR/ARMCMx/chcore.h
index 0ea154f00..3fd627715 100644
--- a/os/ports/IAR/ARMCMx/chcore.h
+++ b/os/ports/IAR/ARMCMx/chcore.h
@@ -170,17 +170,17 @@ struct intctx {};
*/
#define PORT_OPTIMIZED_ISPREEMPTIONREQUIRED
-#if (CH_TIME_QUANTUM > 0) || defined(__DOXYGEN__)
+#if (CH_CFG_TIME_QUANTUM > 0) || defined(__DOXYGEN__)
/**
* @brief Inline-able version of this kernel function.
*/
#define chSchIsPreemptionRequired() \
(currp->p_preempt ? firstprio(&rlist.r_queue) > currp->p_prio : \
firstprio(&rlist.r_queue) >= currp->p_prio)
-#else /* CH_TIME_QUANTUM == 0 */
+#else /* CH_CFG_TIME_QUANTUM == 0 */
#define chSchIsPreemptionRequired() \
(firstprio(&rlist.r_queue) > currp->p_prio)
-#endif /* CH_TIME_QUANTUM == 0 */
+#endif /* CH_CFG_TIME_QUANTUM == 0 */
#endif /* _FROM_ASM_ */
diff --git a/os/ports/IAR/STM8/chcore.h b/os/ports/IAR/STM8/chcore.h
index 29bf5087c..431b7f65d 100644
--- a/os/ports/IAR/STM8/chcore.h
+++ b/os/ports/IAR/STM8/chcore.h
@@ -322,12 +322,12 @@ typedef struct {
ThreadsQueue r_queue;
tprio_t r_prio;
Thread *r_current;
-#if CH_USE_REGISTRY
+#if CH_CFG_USE_REGISTRY
Thread *r_newer;
Thread *r_older;
#endif
/* End of the fields shared with the Thread structure.*/
-#if CH_TIME_QUANTUM > 0
+#if CH_CFG_TIME_QUANTUM > 0
cnt_t r_preempt;
#endif
} ReadyList;
diff --git a/os/ports/IAR/STM8/port.dox b/os/ports/IAR/STM8/port.dox
index c0eb35cdd..1a95b79bf 100644
--- a/os/ports/IAR/STM8/port.dox
+++ b/os/ports/IAR/STM8/port.dox
@@ -57,7 +57,7 @@
* kernel files should be loaded in the first 64K. Note that this is not
* a problem because upper addresses can be used by the user code, the
* kernel can context switch code running there.
- * - The configuration option @p CH_OPTIMIZE_SPEED is not currently supported
+ * - The configuration option @p CH_CFG_OPTIMIZE_SPEED is not currently supported
* because the missing support of the @p inline "C" keyword in the
* compiler.
* .
diff --git a/os/ports/RC/STM8/chcore.h b/os/ports/RC/STM8/chcore.h
index 716c8ff74..41c76a072 100644
--- a/os/ports/RC/STM8/chcore.h
+++ b/os/ports/RC/STM8/chcore.h
@@ -317,12 +317,12 @@ typedef struct {
ThreadsQueue r_queue;
tprio_t r_prio;
Thread *r_current;
-#if CH_USE_REGISTRY
+#if CH_CFG_USE_REGISTRY
Thread *r_newer;
Thread *r_older;
#endif
/* End of the fields shared with the Thread structure.*/
-#if CH_TIME_QUANTUM > 0
+#if CH_CFG_TIME_QUANTUM > 0
cnt_t r_preempt;
#endif
} ReadyList;
diff --git a/os/ports/RC/STM8/port.dox b/os/ports/RC/STM8/port.dox
index 8dc4ba259..903cb9198 100644
--- a/os/ports/RC/STM8/port.dox
+++ b/os/ports/RC/STM8/port.dox
@@ -57,7 +57,7 @@
* kernel files should be loaded in the first 64K. Note that this is not
* a problem because upper addresses can be used by the user code, the
* kernel can context switch code running there.
- * - The configuration option @p CH_OPTIMIZE_SPEED is not currently supported
+ * - The configuration option @p CH_CFG_OPTIMIZE_SPEED is not currently supported
* because the missing support of the @p inline "C" keyword in the
* compiler.
* .
diff --git a/os/ports/RVCT/ARMCMx/chcore.h b/os/ports/RVCT/ARMCMx/chcore.h
index 5ba5a1eb5..79f7916fb 100644
--- a/os/ports/RVCT/ARMCMx/chcore.h
+++ b/os/ports/RVCT/ARMCMx/chcore.h
@@ -169,17 +169,17 @@ struct intctx {};
*/
#define PORT_OPTIMIZED_ISPREEMPTIONREQUIRED
-#if (CH_TIME_QUANTUM > 0) || defined(__DOXYGEN__)
+#if (CH_CFG_TIME_QUANTUM > 0) || defined(__DOXYGEN__)
/**
* @brief Inline-able version of this kernel function.
*/
#define chSchIsPreemptionRequired() \
(currp->p_preempt ? firstprio(&rlist.r_queue) > currp->p_prio : \
firstprio(&rlist.r_queue) >= currp->p_prio)
-#else /* CH_TIME_QUANTUM == 0 */
+#else /* CH_CFG_TIME_QUANTUM == 0 */
#define chSchIsPreemptionRequired() \
(firstprio(&rlist.r_queue) > currp->p_prio)
-#endif /* CH_TIME_QUANTUM == 0 */
+#endif /* CH_CFG_TIME_QUANTUM == 0 */
#endif /* _FROM_ASM_ */
diff --git a/os/ports/cosmic/STM8/chcore.h b/os/ports/cosmic/STM8/chcore.h
index 2cb5ddeeb..9610d1549 100644
--- a/os/ports/cosmic/STM8/chcore.h
+++ b/os/ports/cosmic/STM8/chcore.h
@@ -315,12 +315,12 @@ typedef struct {
ThreadsQueue r_queue;
tprio_t r_prio;
Thread *r_current;
-#if CH_USE_REGISTRY
+#if CH_CFG_USE_REGISTRY
Thread *r_newer;
Thread *r_older;
#endif
/* End of the fields shared with the Thread structure.*/
-#if CH_TIME_QUANTUM > 0
+#if CH_CFG_TIME_QUANTUM > 0
cnt_t r_preempt;
#endif
} ReadyList;
diff --git a/os/ports/cosmic/STM8/port.dox b/os/ports/cosmic/STM8/port.dox
index f19f26cb2..e337fe9d7 100644
--- a/os/ports/cosmic/STM8/port.dox
+++ b/os/ports/cosmic/STM8/port.dox
@@ -57,7 +57,7 @@
* kernel files should be loaded in the first 64K. Note that this is not
* a problem because upper addresses can be used by the user code, the
* kernel can context switch code running there.
- * - The configuration option @p CH_OPTIMIZE_SPEED is not currently supported
+ * - The configuration option @p CH_CFG_OPTIMIZE_SPEED is not currently supported
* because the missing support of the @p inline "C" keyword in the
* compiler.
* .
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 15:42:36 +0000