diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-13 10:28:20 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-03-13 10:28:20 +0000 |
| commit | 28b2143a444a29f9739d0016633c01b9273cf88f (patch) | |
| tree | 79f16f1d6cac527f2994066720d2f02fd17cfc1f /os | |
| parent | 19d593770fe3faeab96477e77c1fa370fd9d095f (diff) | |
| download | ChibiOS-28b2143a444a29f9739d0016633c01b9273cf88f.tar.gz ChibiOS-28b2143a444a29f9739d0016633c01b9273cf88f.tar.bz2 ChibiOS-28b2143a444a29f9739d0016633c01b9273cf88f.zip | |
Fixed some RDY_ leftovers in HAL.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7768 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/osal/nil/osal.h | 2 | ||||
| -rw-r--r-- | os/hal/osal/rt/osal.h | 2 | ||||
| -rw-r--r-- | os/hal/src/adc.c | 6 | ||||
| -rw-r--r-- | os/hal/src/mac.c | 8 | ||||
| -rw-r--r-- | os/hal/templates/mac_lld.c | 8 | ||||
| -rw-r--r-- | os/hal/templates/osal/osal.h | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/os/hal/osal/nil/osal.h b/os/hal/osal/nil/osal.h index 9bdd9010c..8bd21b583 100644 --- a/os/hal/osal/nil/osal.h +++ b/os/hal/osal/nil/osal.h @@ -713,7 +713,7 @@ static inline void osalThreadQueueObjectInit(threads_queue_t *tqp) { * .
* @return The message from @p osalQueueWakeupOneI() or
* @p osalQueueWakeupAllI() functions.
- * @retval RDY_TIMEOUT if the thread has not been dequeued within the
+ * @retval MSG_TIMEOUT if the thread has not been dequeued within the
* specified timeout or if the function has been
* invoked with @p TIME_IMMEDIATE as timeout
* specification.
diff --git a/os/hal/osal/rt/osal.h b/os/hal/osal/rt/osal.h index cb12714e2..975f9f7bb 100644 --- a/os/hal/osal/rt/osal.h +++ b/os/hal/osal/rt/osal.h @@ -703,7 +703,7 @@ static inline void osalThreadQueueObjectInit(threads_queue_t *tqp) { * .
* @return The message from @p osalQueueWakeupOneI() or
* @p osalQueueWakeupAllI() functions.
- * @retval RDY_TIMEOUT if the thread has not been dequeued within the
+ * @retval MSG_TIMEOUT if the thread has not been dequeued within the
* specified timeout or if the function has been
* invoked with @p TIME_IMMEDIATE as timeout
* specification.
diff --git a/os/hal/src/adc.c b/os/hal/src/adc.c index 2297f03fc..f79d405e4 100644 --- a/os/hal/src/adc.c +++ b/os/hal/src/adc.c @@ -259,11 +259,11 @@ void adcStopConversionI(ADCDriver *adcp) { * @param[in] depth buffer depth (matrix rows number). The buffer depth
* must be one or an even number.
* @return The operation result.
- * @retval RDY_OK Conversion finished.
- * @retval RDY_RESET The conversion has been stopped using
+ * @retval MSG_OK Conversion finished.
+ * @retval MSG_RESET The conversion has been stopped using
* @p acdStopConversion() or @p acdStopConversionI(),
* the result buffer may contain incorrect data.
- * @retval RDY_TIMEOUT The conversion has been stopped because an hardware
+ * @retval MSG_TIMEOUT The conversion has been stopped because an hardware
* error.
*
* @api
diff --git a/os/hal/src/mac.c b/os/hal/src/mac.c index b6570073e..cbf10b811 100644 --- a/os/hal/src/mac.c +++ b/os/hal/src/mac.c @@ -141,8 +141,8 @@ void macStop(MACDriver *macp) { * - @a TIME_INFINITE no timeout.
* .
* @return The operation status.
- * @retval RDY_OK the descriptor was obtained.
- * @retval RDY_TIMEOUT the operation timed out, descriptor not initialized.
+ * @retval MSG_OK the descriptor was obtained.
+ * @retval MSG_TIMEOUT the operation timed out, descriptor not initialized.
*
* @api
*/
@@ -201,8 +201,8 @@ void macReleaseTransmitDescriptor(MACTransmitDescriptor *tdp) { * - @a TIME_INFINITE no timeout.
* .
* @return The operation status.
- * @retval RDY_OK the descriptor was obtained.
- * @retval RDY_TIMEOUT the operation timed out, descriptor not initialized.
+ * @retval MSG_OK the descriptor was obtained.
+ * @retval MSG_TIMEOUT the operation timed out, descriptor not initialized.
*
* @api
*/
diff --git a/os/hal/templates/mac_lld.c b/os/hal/templates/mac_lld.c index 23ca1d97e..75b47af95 100644 --- a/os/hal/templates/mac_lld.c +++ b/os/hal/templates/mac_lld.c @@ -124,8 +124,8 @@ void mac_lld_stop(MACDriver *macp) { * @param[in] macp pointer to the @p MACDriver object
* @param[out] tdp pointer to a @p MACTransmitDescriptor structure
* @return The operation status.
- * @retval RDY_OK the descriptor has been obtained.
- * @retval RDY_TIMEOUT descriptor not available.
+ * @retval MSG_OK the descriptor has been obtained.
+ * @retval MSG_TIMEOUT descriptor not available.
*
* @notapi
*/
@@ -158,8 +158,8 @@ void mac_lld_release_transmit_descriptor(MACTransmitDescriptor *tdp) { * @param[in] macp pointer to the @p MACDriver object
* @param[out] rdp pointer to a @p MACReceiveDescriptor structure
* @return The operation status.
- * @retval RDY_OK the descriptor has been obtained.
- * @retval RDY_TIMEOUT descriptor not available.
+ * @retval MSG_OK the descriptor has been obtained.
+ * @retval MSG_TIMEOUT descriptor not available.
*
* @notapi
*/
diff --git a/os/hal/templates/osal/osal.h b/os/hal/templates/osal/osal.h index 6e3d62ca0..a6bbcca35 100644 --- a/os/hal/templates/osal/osal.h +++ b/os/hal/templates/osal/osal.h @@ -718,7 +718,7 @@ static inline void osalThreadQueueObjectInit(threads_queue_t *tqp) { * .
* @return The message from @p osalQueueWakeupOneI() or
* @p osalQueueWakeupAllI() functions.
- * @retval RDY_TIMEOUT if the thread has not been dequeued within the
+ * @retval MSG_TIMEOUT if the thread has not been dequeued within the
* specified timeout or if the function has been
* invoked with @p TIME_IMMEDIATE as timeout
* specification.
|