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, 20 insertions, 9 deletions

diff --git a/os/kernel/src/chevents.c b/os/kernel/src/chevents.c
index a0ef2d1bb..d74ad2dc4 100644
--- a/os/kernel/src/chevents.c
+++ b/os/kernel/src/chevents.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.

 

@@ -160,12 +161,12 @@ eventmask_t chEvtAddFlags(eventmask_t mask) {
  *

  * @api

  */

-void chEvtSignal(Thread *tp, eventmask_t mask) {

+void chEvtSignalFlags(Thread *tp, eventmask_t mask) {

 

   chDbgCheck(tp != NULL, "chEvtSignal");

 

   chSysLock();

-  chEvtSignalI(tp, mask);

+  chEvtSignalFlagsI(tp, mask);

   chSchRescheduleS();

   chSysUnlock();

 }

@@ -182,7 +183,7 @@ void chEvtSignal(Thread *tp, eventmask_t mask) {
  *

  * @iclass

  */

-void chEvtSignalI(Thread *tp, eventmask_t mask) {

+void chEvtSignalFlagsI(Thread *tp, eventmask_t mask) {

 

   chDbgCheck(tp != NULL, "chEvtSignalI");

 

@@ -198,15 +199,20 @@ void chEvtSignalI(Thread *tp, eventmask_t mask) {
 /**

  * @brief   Signals all the Event Listeners registered on the specified Event

  *          Source.

+ * @details This function variants ORs the specified event flags to all the

+ *          threads registered on the @p EventSource in addition to the event

+ *          flags specified by the threads themselves in the

+ *          @p EventListener objects.

  *

  * @param[in] esp       pointer to the @p EventSource structure

+ * @param[in] mask      the event flags set to be ORed

  *

  * @api

  */

-void chEvtBroadcast(EventSource *esp) {

+void chEvtBroadcastFlags(EventSource *esp, eventmask_t mask) {

 

   chSysLock();

-  chEvtBroadcastI(esp);

+  chEvtBroadcastFlagsI(esp, mask);

   chSchRescheduleS();

   chSysUnlock();

 }

@@ -214,23 +220,28 @@ void chEvtBroadcast(EventSource *esp) {
 /**

  * @brief   Signals all the Event Listeners registered on the specified Event

  *          Source.

+ * @details This function variants ORs the specified event flags to all the

+ *          threads registered on the @p EventSource in addition to the event

+ *          flags specified by the threads themselves in the

+ *          @p EventListener objects.

  * @post    This function does not reschedule so a call to a rescheduling

  *          function must be performed before unlocking the kernel. Note that

  *          interrupt handlers always reschedule on exit so an explicit

  *          reschedule must not be performed in ISRs.

  *

  * @param[in] esp       pointer to the @p EventSource structure

+ * @param[in] mask      the event flags set to be ORed

  *

  * @iclass

  */

-void chEvtBroadcastI(EventSource *esp) {

+void chEvtBroadcastFlagsI(EventSource *esp, eventmask_t mask) {

   EventListener *elp;

 

-  chDbgCheck(esp != NULL, "chEvtBroadcastI");

+  chDbgCheck(esp != NULL, "chEvtBroadcastMaskI");

 

   elp = esp->es_next;

   while (elp != (EventListener *)esp) {

-    chEvtSignalI(elp->el_listener, elp->el_mask);

+    chEvtSignalFlagsI(elp->el_listener, elp->el_mask | mask);

     elp = elp->el_next;

   }

 }