I2C. Merged code from trunk.

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

1 files changed, 10 insertions, 7 deletions

diff --git a/os/kernel/src/chvt.c b/os/kernel/src/chvt.c
index b622bb493..4674c728e 100644
--- a/os/kernel/src/chvt.c
+++ b/os/kernel/src/chvt.c
@@ -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.

 

@@ -39,7 +40,7 @@ VTList vtlist;
  *

  * @notapi

  */

-void vt_init(void) {

+void _vt_init(void) {

 

   vtlist.vt_next = vtlist.vt_prev = (void *)&vtlist;

   vtlist.vt_time = (systime_t)-1;

@@ -52,10 +53,12 @@ void vt_init(void) {
  *          the I-Locked state, see @ref system_states.

  *

  * @param[out] vtp      the @p VirtualTimer structure pointer

- * @param[in] time      the number of time ticks, the value @p TIME_INFINITE

- *                      is notallowed. The value @p TIME_IMMEDIATE is allowed

- *                      but interpreted as a normal time specification not as

- *                      an immediate timeout specification.

+ * @param[in] time      the number of ticks before the operation timeouts, the

+ *                      special values are handled as follow:

+ *                      - @a TIME_INFINITE is allowed but interpreted as a

+ *                        normal time specification.

+ *                      - @a TIME_IMMEDIATE this value is not allowed.

+ *                      .

  * @param[in] vtfunc    the timer callback function. After invoking the

  *                      callback the timer is disabled and the structure can

  *                      be disposed or reused.

@@ -67,7 +70,7 @@ void vt_init(void) {
 void chVTSetI(VirtualTimer *vtp, systime_t time, vtfunc_t vtfunc, void *par) {

   VirtualTimer *p;

 

-  chDbgCheck((vtp != NULL) && (vtfunc != NULL) && (time != TIME_INFINITE),

+  chDbgCheck((vtp != NULL) && (vtfunc != NULL) && (time != TIME_IMMEDIATE),

              "chVTSetI");

 

   vtp->vt_par = par;