diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-08-05 12:24:08 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-08-05 12:24:08 +0000 |
| commit | 314eb6c589f05a7793bef8d21240c1f92240ef92 (patch) | |
| tree | a3e7a739a3ae8e2cffc105bcad255f769f631631 | |
| parent | 5cbe3a8aad4f44ccee64c309836901b0a33f4bb6 (diff) | |
| download | ChibiOS-314eb6c589f05a7793bef8d21240c1f92240ef92.tar.gz ChibiOS-314eb6c589f05a7793bef8d21240c1f92240ef92.tar.bz2 ChibiOS-314eb6c589f05a7793bef8d21240c1f92240ef92.zip | |
Fixed bug #625.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8158 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/nil/ports/e200/nilcore.h | 19 | ||||
| -rw-r--r-- | os/rt/ports/e200/chcore.h | 6 | ||||
| -rw-r--r-- | readme.txt | 4 |
3 files changed, 25 insertions, 4 deletions
diff --git a/os/nil/ports/e200/nilcore.h b/os/nil/ports/e200/nilcore.h index 053522743..ac5a32433 100644 --- a/os/nil/ports/e200/nilcore.h +++ b/os/nil/ports/e200/nilcore.h @@ -102,10 +102,25 @@ * @p nilcore_timer.h, if this option is enabled then the file
* @p nilcore_timer_alt.h is included instead.
*/
-#if !defined(PORT_USE_ALT_TIMER)
+#if !defined(PORT_USE_ALT_TIMER) || defined(__DOXYGEN__)
#define PORT_USE_ALT_TIMER FALSE
#endif
+/**
+ * @brief Use VLE instruction set.
+ * @note This parameter is usually set in the Makefile.
+ */
+#if !defined(PPC_USE_VLE) || defined(__DOXYGEN__)
+#define PPC_USE_VLE TRUE
+#endif
+
+/**
+ * @brief Enables the use of the @p WFI instruction.
+ */
+#if !defined(PPC_ENABLE_WFI_IDLE) || defined(__DOXYGEN__)
+#define PPC_ENABLE_WFI_IDLE FALSE
+#endif
+
/*===========================================================================*/
/* Derived constants and error checks. */
/*===========================================================================*/
@@ -502,7 +517,9 @@ static inline void port_enable(void) { */
static inline void port_wait_for_interrupt(void) {
+#if PPC_ENABLE_WFI_IDLE
asm volatile ("wait" : : : "memory");
+#endif
}
/**
diff --git a/os/rt/ports/e200/chcore.h b/os/rt/ports/e200/chcore.h index c0b96e2df..c12b615e9 100644 --- a/os/rt/ports/e200/chcore.h +++ b/os/rt/ports/e200/chcore.h @@ -117,7 +117,7 @@ * @p chcore_timer.h, if this option is enabled then the file
* @p chcore_timer_alt.h is included instead.
*/
-#if !defined(PORT_USE_ALT_TIMER)
+#if !defined(PORT_USE_ALT_TIMER) || defined(__DOXYGEN__)
#define PORT_USE_ALT_TIMER FALSE
#endif
@@ -125,14 +125,14 @@ * @brief Use VLE instruction set.
* @note This parameter is usually set in the Makefile.
*/
-#if !defined(PPC_USE_VLE)
+#if !defined(PPC_USE_VLE) || defined(__DOXYGEN__)
#define PPC_USE_VLE TRUE
#endif
/**
* @brief Enables the use of the @p WFI instruction.
*/
-#if !defined(PPC_ENABLE_WFI_IDLE)
+#if !defined(PPC_ENABLE_WFI_IDLE) || defined(__DOXYGEN__)
#define PPC_ENABLE_WFI_IDLE FALSE
#endif
diff --git a/readme.txt b/readme.txt index 137f10997..d7f1928a8 100644 --- a/readme.txt +++ b/readme.txt @@ -86,6 +86,10 @@ - HAL: Introduced support for TIM21 and TIM22 in STM32 ST driver.
- HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
for STM32F030xC, STM32F070x6, STM32F070xB devices.
+- NIL: Fixed missing configuration options from NIL and RT PPC ports
+ (bug #625).
+- RT: Fixed missing configuration options from NIL and RT PPC ports
+ (bug #625).
- HAL: Fixed wrong offset in STM32 DAC driver (bug #624)(backported to 3.0.1).
- HAL: Fixed crash on STM32F030x4/6 devices (bug #623)(backported to 3.0.1).
- HAL: Fixed duplicated doxygen tag in STM32F4xx hal_lld.h file (bug #621)
|