Removed the chMsgSendWithEvent() function and the related configuration option.

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

3 files changed, 0 insertions, 48 deletions

diff --git a/src/chmsg.c b/src/chmsg.c
index c506b6847..393ab8dad 100644
--- a/src/chmsg.c
+++ b/src/chmsg.c
@@ -59,40 +59,6 @@ msg_t chMsgSend(Thread *tp, msg_t msg) {
   return msg;

 }

 

-#if CH_USE_EVENTS && CH_USE_MESSAGES_EVENT

-/**

- * @brief Sends a message to the specified thread and atomically pends an

- *        events set.

- * @details The sender is stopped until the receiver executes a

- *          @p chMsgRelease() after receiving the message.

- *

- * @param[in] tp the pointer to the thread

- * @param[in] msg the message

- * @param[in] mask the event flags set to be pended

- * @return The return message from @p chMsgRelease().

- * @note This function assumes that the receiving thread is not sleeping into

- *       a @p chMsgWait(). The use case is that the server thread is waiting

- *       for both messages AND events while waiting into @p chEvtWaitXXX().

- */

-msg_t chMsgSendWithEvent(Thread *tp, msg_t msg, eventmask_t mask) {

-

-  chDbgCheck(tp != NULL, "chMsgSendWithEvent");

-

-  chSysLock();

-  chDbgAssert(tp->p_state != PRWTMSG,

-              "chMsgSendWithEvent(), #1",

-              "waiting for messages not events");

-  chEvtSignalI(tp, mask);

-  msg_insert(currp, &tp->p_msgqueue);

-  currp->p_wtthdp = tp;

-  currp->p_msg = msg;

-  chSchGoSleepS(PRSNDMSG);

-  msg = currp->p_rdymsg;

-  chSysUnlock();

-  return msg;

-}

-#endif /* CH_USE_EVENTS && CH_USE_MESSAGES_EVENT */

-

 /**

  * @brief Suspends the thread and waits for an incoming message.

  *

diff --git a/src/include/messages.h b/src/include/messages.h
index 1c4876b81..ee1449a82 100644
--- a/src/include/messages.h
+++ b/src/include/messages.h
@@ -48,10 +48,6 @@ extern "C" {
   msg_t chMsgWait(void);

   msg_t chMsgGet(void);

   void chMsgRelease(msg_t msg);

-

-#if CH_USE_EVENTS && CH_USE_MESSAGES_EVENT

-  msg_t chMsgSendWithEvent(Thread *tp, msg_t msg, eventmask_t mask);

-#endif

 #ifdef __cplusplus

 }

 #endif

diff --git a/src/templates/chconf.h b/src/templates/chconf.h
index cb606580b..bffe5dc33 100644
--- a/src/templates/chconf.h
+++ b/src/templates/chconf.h
@@ -216,16 +216,6 @@
 #endif

 

 /**

- * If specified then the @p chMsgSendWithEvent() function is included in the

- * kernel.

- * @note The default is @p TRUE.

- * @note Requires @p CH_USE_MESSAGES and @p CH_USE_EVENTS.

- */

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

-#define CH_USE_MESSAGES_EVENT           TRUE

-#endif

-

-/**

  * If enabled then messages are served by priority rather than in FIFO order.

  * @note The default is @p FALSE. Enable this if you have special requirements.

  * @note Requires @p CH_USE_MESSAGES.