aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/ARM7-AT91SAM7X-GCC/chconf.h10
-rw-r--r--demos/ARM7-AT91SAM7X-WEB-GCC/chconf.h10
-rw-r--r--demos/ARM7-LPC214x-G++/chconf.h10
-rw-r--r--demos/ARM7-LPC214x-GCC-minimal/chconf.h10
-rw-r--r--demos/ARM7-LPC214x-GCC/chconf.h10
-rw-r--r--demos/ARMCM3-STM32F103-GCC/chconf.h10
-rw-r--r--demos/AVR-AT90CANx-GCC/chconf.h10
-rw-r--r--demos/AVR-ATmega128-GCC/chconf.h10
-rw-r--r--demos/MSP430-MSP430x1611-GCC/chconf.h10
-rw-r--r--demos/Win32-MinGW/chconf.h10
-rw-r--r--readme.txt3
-rw-r--r--src/chmsg.c34
-rw-r--r--src/include/messages.h4
-rw-r--r--src/templates/chconf.h10
-rw-r--r--test/coverage/chconf.h10
15 files changed, 3 insertions, 158 deletions
diff --git a/demos/ARM7-AT91SAM7X-GCC/chconf.h b/demos/ARM7-AT91SAM7X-GCC/chconf.h
index 84c581f3f..ac0b475e5 100644
--- a/demos/ARM7-AT91SAM7X-GCC/chconf.h
+++ b/demos/ARM7-AT91SAM7X-GCC/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.
diff --git a/demos/ARM7-AT91SAM7X-WEB-GCC/chconf.h b/demos/ARM7-AT91SAM7X-WEB-GCC/chconf.h
index cb606580b..bffe5dc33 100644
--- a/demos/ARM7-AT91SAM7X-WEB-GCC/chconf.h
+++ b/demos/ARM7-AT91SAM7X-WEB-GCC/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.
diff --git a/demos/ARM7-LPC214x-G++/chconf.h b/demos/ARM7-LPC214x-G++/chconf.h
index cb606580b..bffe5dc33 100644
--- a/demos/ARM7-LPC214x-G++/chconf.h
+++ b/demos/ARM7-LPC214x-G++/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.
diff --git a/demos/ARM7-LPC214x-GCC-minimal/chconf.h b/demos/ARM7-LPC214x-GCC-minimal/chconf.h
index 934a5dd1b..ea458f196 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/chconf.h
+++ b/demos/ARM7-LPC214x-GCC-minimal/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 FALSE
-#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.
diff --git a/demos/ARM7-LPC214x-GCC/chconf.h b/demos/ARM7-LPC214x-GCC/chconf.h
index cb606580b..bffe5dc33 100644
--- a/demos/ARM7-LPC214x-GCC/chconf.h
+++ b/demos/ARM7-LPC214x-GCC/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.
diff --git a/demos/ARMCM3-STM32F103-GCC/chconf.h b/demos/ARMCM3-STM32F103-GCC/chconf.h
index cb606580b..bffe5dc33 100644
--- a/demos/ARMCM3-STM32F103-GCC/chconf.h
+++ b/demos/ARMCM3-STM32F103-GCC/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.
diff --git a/demos/AVR-AT90CANx-GCC/chconf.h b/demos/AVR-AT90CANx-GCC/chconf.h
index ff98f4164..2681f9563 100644
--- a/demos/AVR-AT90CANx-GCC/chconf.h
+++ b/demos/AVR-AT90CANx-GCC/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.
diff --git a/demos/AVR-ATmega128-GCC/chconf.h b/demos/AVR-ATmega128-GCC/chconf.h
index ff98f4164..2681f9563 100644
--- a/demos/AVR-ATmega128-GCC/chconf.h
+++ b/demos/AVR-ATmega128-GCC/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.
diff --git a/demos/MSP430-MSP430x1611-GCC/chconf.h b/demos/MSP430-MSP430x1611-GCC/chconf.h
index 7ce3cdbce..75239717e 100644
--- a/demos/MSP430-MSP430x1611-GCC/chconf.h
+++ b/demos/MSP430-MSP430x1611-GCC/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.
diff --git a/demos/Win32-MinGW/chconf.h b/demos/Win32-MinGW/chconf.h
index 40cb2e53d..208c67a18 100644
--- a/demos/Win32-MinGW/chconf.h
+++ b/demos/Win32-MinGW/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.
diff --git a/readme.txt b/readme.txt
index 0ec73ab03..9b7798aa6 100644
--- a/readme.txt
+++ b/readme.txt
@@ -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
real context switch time, previous benchmarks introduced too much overhead
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 ***
- Added license exception text to the 1.2.0 branch.
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.
diff --git a/test/coverage/chconf.h b/test/coverage/chconf.h
index ebd7c3dbd..3666deae2 100644
--- a/test/coverage/chconf.h
+++ b/test/coverage/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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 14:02:56 +0000