I2C. Test updated.

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

1 files changed, 29 insertions, 24 deletions

diff --git a/testhal/STM32F1xx/I2C/chconf.h b/testhal/STM32F1xx/I2C/chconf.h
index a293288d3..d97168805 100644
--- a/testhal/STM32F1xx/I2C/chconf.h
+++ b/testhal/STM32F1xx/I2C/chconf.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -56,22 +57,7 @@
  *          and generally faster.

  */

 #if !defined(CH_TIME_QUANTUM) || defined(__DOXYGEN__)

-#define CH_TIME_QUANTUM                 20

-#endif

-

-/**

- * @brief   Nested locks.

- * @details If enabled then the use of nested @p chSysLock() / @p chSysUnlock()

- *          operations is allowed.<br>

- *          For performance and code size reasons the recommended setting

- *          is to leave this option disabled.<br>

- *          You may use this option if you need to merge ChibiOS/RT with

- *          external libraries that require nested lock/unlock operations.

- *

- * @note T  he default is @p FALSE.

- */

-#if !defined(CH_USE_NESTED_LOCKS) || defined(__DOXYGEN__)

-#define CH_USE_NESTED_LOCKS             TRUE

+#define CH_TIME_QUANTUM                 0//20

 #endif

 

 /**

@@ -83,7 +69,7 @@
  *

  * @note    In order to let the OS manage the whole RAM the linker script must

  *          provide the @p __heap_base__ and @p __heap_end__ symbols.

- * @note    Requires @p CH_USE_COREMEM.

+ * @note    Requires @p CH_USE_MEMCORE.

  */

 #if !defined(CH_MEMCORE_SIZE) || defined(__DOXYGEN__)

 #define CH_MEMCORE_SIZE                 0

@@ -234,7 +220,7 @@
  * @note    Requires @p CH_USE_EVENTS.

  */

 #if !defined(CH_USE_EVENTS_TIMEOUT) || defined(__DOXYGEN__)

-#define CH_USE_EVENTS_TIMEOUT           TRUE

+#define CH_USE_EVENTS_TIMEOUT           FALSE

 #endif

 

 /**

@@ -277,7 +263,6 @@
  * @details If enabled then the I/O queues APIs are included in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_SEMAPHORES.

  */

 #if !defined(CH_USE_QUEUES) || defined(__DOXYGEN__)

 #define CH_USE_QUEUES                   TRUE

@@ -300,7 +285,7 @@
  *          in the kernel.

  *

  * @note    The default is @p TRUE.

- * @note    Requires @p CH_USE_COREMEM and either @p CH_USE_MUTEXES or

+ * @note    Requires @p CH_USE_MEMCORE and either @p CH_USE_MUTEXES or

  *          @p CH_USE_SEMAPHORES.

  * @note    Mutexes are recommended.

  */

@@ -315,7 +300,7 @@
  *

  * @note    The default is @p FALSE.

  * @note    Requires @p CH_USE_HEAP.

- * @note    The C-runtime may or may not require @p CH_USE_COREMEM, see the

+ * @note    The C-runtime may or may not require @p CH_USE_MEMCORE, see the

  *          appropriate documentation.

  */

 #if !defined(CH_USE_MALLOC_HEAP) || defined(__DOXYGEN__)

@@ -349,6 +334,16 @@
 /*===========================================================================*/

 /* Debug options.                                                            */

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

+/**

+ * @brief   Debug option, system state check.

+ * @details If enabled the correct call protocol for system APIs is checked

+ *          at runtime.

+ *

+ * @note    The default is @p FALSE.

+ */

+#if !defined(CH_DBG_SYSTEM_STATE_CHECK) || defined(__DOXYGEN__)

+#define CH_DBG_SYSTEM_STATE_CHECK       TRUE

+#endif

 

 /**

  * @brief   Debug option, parameters checks.

@@ -381,7 +376,7 @@
  * @note    The default is @p FALSE.

  */

 #if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)

-#define CH_DBG_ENABLE_TRACE             TRUE

+#define CH_DBG_ENABLE_TRACE             FALSE

 #endif

 

 /**

@@ -420,7 +415,7 @@
  *          some test cases into the test suite.

  */

 #if !defined(CH_DBG_THREADS_PROFILING) || defined(__DOXYGEN__)

-#define CH_DBG_THREADS_PROFILING        FALSE

+#define CH_DBG_THREADS_PROFILING        TRUE

 #endif

 

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

@@ -464,6 +459,16 @@
 #endif

 

 /**

+ * @brief   Context switch hook.

+ * @details This hook is invoked just before switching between threads.

+ */

+#if !defined(THREAD_CONTEXT_SWITCH_HOOK) || defined(__DOXYGEN__)

+#define THREAD_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \

+  /* System halt code here.*/                                               \

+}

+#endif

+

+/**

  * @brief   Idle Loop hook.

  * @details This hook is continuously invoked by the idle thread loop.

  */