Fixed bug #600.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8017 35acf78f-673a-0410-8e92-d51de3d6d3f4
2015-06-12 08:52:52 +00:00 · 2015-06-12 08:52:52 +00:00 · 37a6ee0c67
parent bc9dcab2c8
commit 37a6ee0c67
22 changed files with 81 additions and 12 deletions
--- a/demos/SPC5/RT-SPC560B-EVB/Makefile
+++ b/demos/SPC5/RT-SPC560B-EVB/Makefile
@ -114,7 +114,7 @@ ASMSRC = $(PORTASM)

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 #
 # Project, sources and paths
--- a/demos/SPC5/RT-SPC560D-EVB/Makefile
+++ b/demos/SPC5/RT-SPC560D-EVB/Makefile
@ -114,7 +114,7 @@ ASMSRC = $(PORTASM)

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 #
 # Project, sources and paths
--- a/demos/SPC5/RT-SPC560P-EVB/Makefile
+++ b/demos/SPC5/RT-SPC560P-EVB/Makefile
@ -114,7 +114,7 @@ ASMSRC = $(PORTASM)

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 #
 # Project, sources and paths
--- a/demos/SPC5/RT-SPC563M-EVB/Makefile
+++ b/demos/SPC5/RT-SPC563M-EVB/Makefile
@ -114,7 +114,7 @@ ASMSRC = $(PORTASM)

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 #
 # Project, sources and paths
--- a/demos/SPC5/RT-SPC564A-EVB/Makefile
+++ b/demos/SPC5/RT-SPC564A-EVB/Makefile
@ -114,7 +114,7 @@ ASMSRC = $(PORTASM)

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 #
 # Project, sources and paths
--- a/demos/SPC5/RT-SPC56EC-EVB/Makefile
+++ b/demos/SPC5/RT-SPC56EC-EVB/Makefile
@ -114,7 +114,7 @@ ASMSRC = $(PORTASM)

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 #
 # Project, sources and paths
--- a/demos/SPC5/RT-SPC56EL-EVB/Makefile
+++ b/demos/SPC5/RT-SPC56EL-EVB/Makefile
@ -114,7 +114,7 @@ ASMSRC = $(PORTASM)

 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
         $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
-         $(CHIBIOS)/os/various
+         $(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various

 #
 # Project, sources and paths
--- a/os/common/ports/e200/compilers/GCC/rules.mk
+++ b/os/common/ports/e200/compilers/GCC/rules.mk
@ -210,8 +210,6 @@ else
 	@$(OD) $(ODFLAGS) $< > $@
 	@echo
 	@$(SZ) $<
-	@echo
-	@echo Done
 endif

 %.list: %.elf $(LDSCRIPT)
--- a/os/common/ports/e200/devices/SPC560BCxx/intc.h
+++ b/os/common/ports/e200/devices/SPC560BCxx/intc.h
@ -41,6 +41,11 @@
 #define INTC_EOIR_ADDR      (INTC_BASE + 0x18)
 /** @} */

+/**
+ * @brief   INTC priority levels.
+ */
+#define INTC_PRIORITY_LEVELS 16U
+
 /*===========================================================================*/
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/
--- a/os/common/ports/e200/devices/SPC560Bxx/intc.h
+++ b/os/common/ports/e200/devices/SPC560Bxx/intc.h
@ -41,6 +41,11 @@
 #define INTC_EOIR_ADDR      (INTC_BASE + 0x18)
 /** @} */

+/**
+ * @brief   INTC priority levels.
+ */
+#define INTC_PRIORITY_LEVELS 16U
+
 /*===========================================================================*/
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/
--- a/os/common/ports/e200/devices/SPC560Dxx/intc.h
+++ b/os/common/ports/e200/devices/SPC560Dxx/intc.h
@ -41,6 +41,11 @@
 #define INTC_EOIR_ADDR      (INTC_BASE + 0x18)
 /** @} */

+/**
+ * @brief   INTC priority levels.
+ */
+#define INTC_PRIORITY_LEVELS 16U
+
 /*===========================================================================*/
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/
--- a/os/common/ports/e200/devices/SPC560Pxx/intc.h
+++ b/os/common/ports/e200/devices/SPC560Pxx/intc.h
@ -41,6 +41,11 @@
 #define INTC_EOIR_ADDR      (INTC_BASE + 0x18)
 /** @} */

+/**
+ * @brief   INTC priority levels.
+ */
+#define INTC_PRIORITY_LEVELS 16U
+
 /*===========================================================================*/
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/
--- a/os/common/ports/e200/devices/SPC563Mxx/intc.h
+++ b/os/common/ports/e200/devices/SPC563Mxx/intc.h
@ -41,6 +41,11 @@
 #define INTC_EOIR_ADDR      (INTC_BASE + 0x18)
 /** @} */

+/**
+ * @brief   INTC priority levels.
+ */
+#define INTC_PRIORITY_LEVELS 16U
+
 /*===========================================================================*/
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/
--- a/os/common/ports/e200/devices/SPC564Axx/intc.h
+++ b/os/common/ports/e200/devices/SPC564Axx/intc.h
@ -41,6 +41,11 @@
 #define INTC_EOIR_ADDR      (INTC_BASE + 0x18)
 /** @} */

+/**
+ * @brief   INTC priority levels.
+ */
+#define INTC_PRIORITY_LEVELS 16U
+
 /*===========================================================================*/
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/
--- a/os/common/ports/e200/devices/SPC56ECxx/intc.h
+++ b/os/common/ports/e200/devices/SPC56ECxx/intc.h
@ -41,6 +41,11 @@
 #define INTC_EOIR_ADDR      (INTC_BASE + 0x18)
 /** @} */

+/**
+ * @brief   INTC priority levels.
+ */
+#define INTC_PRIORITY_LEVELS 16U
+
 /*===========================================================================*/
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/
--- a/os/common/ports/e200/devices/SPC56ELxx/intc.h
+++ b/os/common/ports/e200/devices/SPC56ELxx/intc.h
@ -41,6 +41,11 @@
 #define INTC_EOIR_ADDR      (INTC_BASE + 0x18)
 /** @} */

+/**
+ * @brief   INTC priority levels.
+ */
+#define INTC_PRIORITY_LEVELS 16U
+
 /*===========================================================================*/
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/
--- a/os/common/ports/e200/devices/SPC57EMxx_HSM/intc.h
+++ b/os/common/ports/e200/devices/SPC57EMxx_HSM/intc.h
@ -41,6 +41,11 @@
 #define INTC_EOIR_ADDR      (INTC_BASE + 0x30)
 /** @} */

+/**
+ * @brief   INTC priority levels.
+ */
+#define INTC_PRIORITY_LEVELS 16U
+
 /*===========================================================================*/
 /* Module pre-compile time settings.                                         */
 /*===========================================================================*/
--- a/os/nil/ports/e200/nilcore.h
+++ b/os/nil/ports/e200/nilcore.h
@ -289,6 +289,18 @@ struct port_intctx {
 */
 #define PORT_FAST_IRQ_HANDLER(id) void id(void)

+/**
+ * @brief   Priority level verification macro.
+ */
+#define PORT_IRQ_IS_VALID_PRIORITY(n)                                       \
+  (((n) >= 0U) && ((n) < INTC_PRIORITY_LEVELS))
+
+/**
+ * @brief   Priority level verification macro.
+ */
+#define PORT_IRQ_IS_VALID_KERNEL_PRIORITY(n)                                \
+    (((n) >= 0U) && ((n) < INTC_PRIORITY_LEVELS))
+
 /**
 * @brief   Performs a context switch between two threads.
 * @details This is the most critical code in any port, this function
--- a/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h
+++ b/os/rt/ports/ARMCMx/compilers/GCC/chtypes.h
@ -40,7 +40,6 @@
 */
 #if !defined(FALSE) || defined(__DOXYGEN__)
 #define FALSE               0
-
 #endif

 /**
--- a/os/rt/ports/e200/chcore.h
+++ b/os/rt/ports/e200/chcore.h
@ -330,6 +330,18 @@ struct context {
 */
 #define PORT_FAST_IRQ_HANDLER(id) void id(void)

+/**
+ * @brief   Priority level verification macro.
+ */
+#define PORT_IRQ_IS_VALID_PRIORITY(n)                                       \
+  (((n) >= 0U) && ((n) < INTC_PRIORITY_LEVELS))
+
+/**
+ * @brief   Priority level verification macro.
+ */
+#define PORT_IRQ_IS_VALID_KERNEL_PRIORITY(n)                                \
+    (((n) >= 0U) && ((n) < INTC_PRIORITY_LEVELS))
+
 /**
 * @brief   Performs a context switch between two threads.
 * @details This is the most critical code in any port, this function
--- a/os/rt/ports/e200/compilers/GCC/chtypes.h
+++ b/os/rt/ports/e200/compilers/GCC/chtypes.h
@ -98,7 +98,7 @@ typedef uint32_t            ucnt_t;         /**< Generic unsigned counter.  */
 /**
 * @brief   Optimized thread function declaration macro.
 */
-#define PORT_THD_FUNCTION(tname, arg) msg_t tname(void *arg)
+#define PORT_THD_FUNCTION(tname, arg) void tname(void *arg)

 #endif /* _CHTYPES_H_ */

--- a/readme.txt
+++ b/readme.txt
@ -74,8 +74,11 @@
 *****************************************************************************

 *** 3.0.0p6 ***
+- NIL: Added INTC priorities check to the e200z port.
+- RT:  Added INTC priorities check to the e200z port.
+- DEM: Fixed missing paths in e200z demos (bug #600).
 - HAL: Added support for extra DMA channels in STM32F072 devices.
- HAL: Fixed error in platofm_f105_f107.mk file (bug #599).
+- HAL: Fixed error in platform_f105_f107.mk file (bug #599).
 - HAL: Fixed issue in DMA drivers when channels share ISRs (bug #597).

 *** 3.0.0p5 ***