Continue merge of RT4/NIL2.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8908 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 43 insertions, 13 deletions

diff --git a/testhal/STM32/STM32F4xx/CAN/Makefile b/testhal/STM32/STM32F4xx/CAN/Makefile
index 83bb8fe99..4854b9300 100644
--- a/testhal/STM32/STM32F4xx/CAN/Makefile
+++ b/testhal/STM32/STM32F4xx/CAN/Makefile
@@ -69,7 +69,7 @@ ifeq ($(USE_EXCEPTIONS_STACKSIZE),)
   USE_EXCEPTIONS_STACKSIZE = 0x400

 endif

 

-# Enables the use of FPU on Cortex-M4 (no, softfp, hard).

+# Enables the use of FPU (no, softfp, hard).

 ifeq ($(USE_FPU),)

   USE_FPU = no

 endif

@@ -88,7 +88,7 @@ PROJECT = ch
 # Imported source files and paths

 CHIBIOS = ../../../..

 # Startup files.

-include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk

+include $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk

 # HAL-OSAL files (optional).

 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

@@ -96,7 +96,7 @@ include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk
 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 # RTOS files (optional).

 include $(CHIBIOS)/os/rt/rt.mk

-include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk

+include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk

 # Other files (optional).

 #include $(CHIBIOS)/test/rt/test.mk

 

@@ -212,5 +212,5 @@ ULIBS =
 # End of user defines

 ##############################################################################

 

-RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC

+RULESPATH = $(CHIBIOS)/os/common/startup/ARMCMx/compilers/GCC

 include $(RULESPATH)/rules.mk

diff --git a/testhal/STM32/STM32F4xx/CAN/chconf.h b/testhal/STM32/STM32F4xx/CAN/chconf.h
index 405149b3b..edd657ac1 100644
--- a/testhal/STM32/STM32F4xx/CAN/chconf.h
+++ b/testhal/STM32/STM32F4xx/CAN/chconf.h
@@ -28,6 +28,8 @@
 #ifndef _CHCONF_H_

 #define _CHCONF_H_

 

+#define _CHIBIOS_RT_CONF_

+

 /*===========================================================================*/

 /**

  * @name System timers settings

@@ -325,7 +327,7 @@
  *

  * @note    The default is @p FALSE.

  */

-#define CH_DBG_STATISTICS                   TRUE

+#define CH_DBG_STATISTICS                   FALSE

 

 /**

  * @brief   Debug option, system state check.

@@ -360,9 +362,16 @@
  * @details If enabled then the context switch circular trace buffer is

  *          activated.

  *

- * @note    The default is @p FALSE.

+ * @note    The default is @p CH_DBG_TRACE_MASK_NONE.

+ */

+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_ALL

+

+/**

+ * @brief   Trace buffer entries.

+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is

+ *          different from @p CH_DBG_TRACE_MASK_NONE.

  */

-#define CH_DBG_ENABLE_TRACE                 TRUE

+#define CH_DBG_TRACE_BUFFER_SIZE            128

 

 /**

  * @brief   Debug option, stack checks.

@@ -427,10 +436,6 @@
 /**

  * @brief   Threads finalization hook.

  * @details User finalization code added to the @p chThdExit() API.

- *

- * @note    It is inserted into lock zone.

- * @note    It is also invoked when the threads simply return in order to

- *          terminate.

  */

 #define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \

   /* Add threads finalization code here.*/                                  \

@@ -445,12 +450,27 @@
 }

 

 /**

+ * @brief   ISR enter hook.

+ */

+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \

+  /* IRQ prologue code here.*/                                              \

+}

+

+/**

+ * @brief   ISR exit hook.

+ */

+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \

+  /* IRQ epilogue code here.*/                                              \

+}

+

+/**

  * @brief   Idle thread enter hook.

  * @note    This hook is invoked within a critical zone, no OS functions

  *          should be invoked from here.

  * @note    This macro can be used to activate a power saving mode.

  */

 #define CH_CFG_IDLE_ENTER_HOOK() {                                          \

+  /* Idle-enter code here.*/                                                \

 }

 

 /**

@@ -460,6 +480,7 @@
  * @note    This macro can be used to deactivate a power saving mode.

  */

 #define CH_CFG_IDLE_LEAVE_HOOK() {                                          \

+  /* Idle-leave code here.*/                                                \

 }

 

 /**

@@ -488,6 +509,15 @@
   /* System halt code here.*/                                               \

 }

 

+/**

+ * @brief   Trace hook.

+ * @details This hook is invoked each time a new record is written in the

+ *          trace buffer.

+ */

+#define CH_CFG_TRACE_HOOK(tep) {                                            \

+  /* Trace code here.*/                                                     \

+}

+

 /** @} */

 

 /*===========================================================================*/

diff --git a/testhal/STM32/STM32F4xx/CAN/main.c b/testhal/STM32/STM32F4xx/CAN/main.c
index b7ae9dc79..9ba7762be 100644
--- a/testhal/STM32/STM32F4xx/CAN/main.c
+++ b/testhal/STM32/STM32F4xx/CAN/main.c
@@ -49,7 +49,7 @@ static THD_FUNCTION(can_rx, p) {
   (void)p;

   chRegSetThreadName("receiver");

   chEvtRegister(&cip->canp->rxfull_event, &el, 0);

-  while(!chThdShouldTerminateX()) {

+  while (true) {

     if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)

       continue;

     while (canReceive(cip->canp, CAN_ANY_MAILBOX,

@@ -77,7 +77,7 @@ static THD_FUNCTION(can_tx, p) {
   txmsg.data32[0] = 0x55AA55AA;

   txmsg.data32[1] = 0x00FF00FF;

 

-  while (!chThdShouldTerminateX()) {

+  while (true) {

     canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));

     canTransmit(&CAND2, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));

     chThdSleepMilliseconds(500);