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
This commit is contained in:
parent
a6b9e598ee
commit
d62a644b1e
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES TRUE
|
#define CH_USE_MESSAGES TRUE
|
||||||
#endif
|
#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.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES TRUE
|
#define CH_USE_MESSAGES TRUE
|
||||||
#endif
|
#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.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES TRUE
|
#define CH_USE_MESSAGES TRUE
|
||||||
#endif
|
#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.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES FALSE
|
#define CH_USE_MESSAGES FALSE
|
||||||
#endif
|
#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 FALSE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If enabled then messages are served by priority rather than in FIFO order.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES TRUE
|
#define CH_USE_MESSAGES TRUE
|
||||||
#endif
|
#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.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES TRUE
|
#define CH_USE_MESSAGES TRUE
|
||||||
#endif
|
#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.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES TRUE
|
#define CH_USE_MESSAGES TRUE
|
||||||
#endif
|
#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.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES TRUE
|
#define CH_USE_MESSAGES TRUE
|
||||||
#endif
|
#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.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES TRUE
|
#define CH_USE_MESSAGES TRUE
|
||||||
#endif
|
#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.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES TRUE
|
#define CH_USE_MESSAGES TRUE
|
||||||
#endif
|
#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.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
|
@ -93,6 +93,9 @@ Win32-MinGW - ChibiOS/RT simulator and demo into a WIN32 process,
|
||||||
- NEW: Added a new "naked" context switch benchmark that better defines the
|
- NEW: Added a new "naked" context switch benchmark that better defines the
|
||||||
real context switch time, previous benchmarks introduced too much overhead
|
real context switch time, previous benchmarks introduced too much overhead
|
||||||
to the measurement. The STM32 performs the context switch in under 1.48uS.
|
to the measurement. The STM32 performs the context switch in under 1.48uS.
|
||||||
|
- CHANGE: Removed the chMsgSendWithEvent() function. It is rarely used and
|
||||||
|
the functionality can be re-created with a compound atomic operation. Also
|
||||||
|
removed the CH_USE_MESSAGES_EVENT configuration option.
|
||||||
|
|
||||||
*** 1.2.0 ***
|
*** 1.2.0 ***
|
||||||
- Added license exception text to the 1.2.0 branch.
|
- Added license exception text to the 1.2.0 branch.
|
||||||
|
|
34
src/chmsg.c
34
src/chmsg.c
|
@ -59,40 +59,6 @@ msg_t chMsgSend(Thread *tp, msg_t msg) {
|
||||||
return 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.
|
* @brief Suspends the thread and waits for an incoming message.
|
||||||
*
|
*
|
||||||
|
|
|
@ -48,10 +48,6 @@ extern "C" {
|
||||||
msg_t chMsgWait(void);
|
msg_t chMsgWait(void);
|
||||||
msg_t chMsgGet(void);
|
msg_t chMsgGet(void);
|
||||||
void chMsgRelease(msg_t msg);
|
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
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES TRUE
|
#define CH_USE_MESSAGES TRUE
|
||||||
#endif
|
#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.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
|
@ -215,16 +215,6 @@
|
||||||
#define CH_USE_MESSAGES TRUE
|
#define CH_USE_MESSAGES TRUE
|
||||||
#endif
|
#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.
|
* 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 The default is @p FALSE. Enable this if you have special requirements.
|
||||||
|
|
Loading…
Reference in New Issue