Updated some testhal projects to new ChibiOS code

1 files changed, 45 insertions, 14 deletions

diff --git a/testhal/STM32/STM32F1xx/onewire/chconf.h b/testhal/STM32/STM32F1xx/onewire/chconf.h
index e714890..732776d 100644
--- a/testhal/STM32/STM32F1xx/onewire/chconf.h
+++ b/testhal/STM32/STM32F1xx/onewire/chconf.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006-2014 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

@@ -28,6 +28,8 @@
 #ifndef _CHCONF_H_

 #define _CHCONF_H_

 

+#define _CHIBIOS_RT_CONF_

+

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

 /**

  * @name System timers settings

@@ -39,14 +41,14 @@
  * @brief   System time counter resolution.

  * @note    Allowed values are 16 or 32 bits.

  */

-#define CH_CFG_ST_RESOLUTION                32

+#define CH_CFG_ST_RESOLUTION                16

 

 /**

  * @brief   System tick frequency.

  * @details Frequency of the system timer that drives the system ticks. This

  *          setting also defines the system tick time unit.

  */

-#define CH_CFG_ST_FREQUENCY                 1000

+#define CH_CFG_ST_FREQUENCY                 10000

 

 /**

  * @brief   Time delta constant for the tick-less mode.

@@ -56,7 +58,7 @@
  *          The value one is not valid, timeouts are rounded up to

  *          this value.

  */

-#define CH_CFG_ST_TIMEDELTA                 0

+#define CH_CFG_ST_TIMEDELTA                 2

 

 /** @} */

 

@@ -99,7 +101,8 @@
  * @details When this option is activated the function @p chSysInit()

  *          does not spawn the idle thread. The application @p main()

  *          function becomes the idle thread and must implement an

- *          infinite loop. */

+ *          infinite loop.

+ */

 #define CH_CFG_NO_IDLE_THREAD               FALSE

 

 /** @} */

@@ -359,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                 FALSE

+#define CH_DBG_TRACE_BUFFER_SIZE            128

 

 /**

  * @brief   Debug option, stack checks.

@@ -426,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.*/                                  \

@@ -440,7 +446,21 @@
  * @details This hook is invoked just before switching between threads.

  */

 #define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \

-  /* System halt code here.*/                                               \

+  /* Context switch code here.*/                                            \

+}

+

+/**

+ * @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.*/                                              \

 }

 

 /**

@@ -449,7 +469,8 @@
  *          should be invoked from here.

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

  */

-#define CH_CFG_IDLE_ENTER_HOOK() {                                         \

+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \

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

 }

 

 /**

@@ -458,7 +479,8 @@
  *          should be invoked from here.

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

  */

-#define CH_CFG_IDLE_LEAVE_HOOK() {                                         \

+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \

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

 }

 

 /**

@@ -487,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.*/                                                     \

+}

+

 /** @} */

 

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