From e1f07aa7c670e670890698ba99df7c07fb78cb5a Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Mon, 1 Nov 2010 16:26:30 +0000
Subject: Fixed bug 3100925.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2325 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 os/various/ch.cpp | 8 ++++----
 os/various/ch.hpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/os/various/ch.cpp b/os/various/ch.cpp
index bd5f7b51a..a3507868d 100644
--- a/os/various/ch.cpp
+++ b/os/various/ch.cpp
@@ -284,14 +284,14 @@ namespace chibios_rt {
     chEvtBroadcast(&event);
   }
 
-  eventmask_t Event::Clear(eventmask_t mask) {
+  eventmask_t Event::ClearFlags(eventmask_t mask) {
 
-    return chEvtClear(mask);
+    return chEvtClearFlags(mask);
   }
 
-  eventmask_t Event::Pend(eventmask_t mask) {
+  eventmask_t Event::AddFlags(eventmask_t mask) {
 
-    return chEvtPend(mask);
+    return chEvtAddFlags(mask);
   }
 
   void Event::Dispatch(const evhandler_t handlers[], eventmask_t mask) {
diff --git a/os/various/ch.hpp b/os/various/ch.hpp
index 2f1ef754d..7bbd43c9f 100644
--- a/os/various/ch.hpp
+++ b/os/various/ch.hpp
@@ -516,7 +516,7 @@ namespace chibios_rt {
      * @param[in] mask          the events to be cleared
      * @return                  The pending events that were cleared.
      */
-    static eventmask_t Clear(eventmask_t mask);
+    static eventmask_t ClearFlags(eventmask_t mask);
 
     /**
      * @brief   Makes an events mask pending in the current thread.
@@ -525,7 +525,7 @@ namespace chibios_rt {
      * @param[in] mask          the events to be pended
      * @return                  The current pending events mask.
      */
-    static eventmask_t Pend(eventmask_t mask);
+    static eventmask_t AddFlags(eventmask_t mask);
 
     /**
      * @brief   Invokes the event handlers associated with a mask.
-- 
cgit v1.2.3