diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-10-11 11:48:03 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-10-11 11:48:03 +0000 |
| commit | 7c2a8e13d969029fb675e67c57349c1deaa09284 (patch) | |
| tree | b5ac48d0272cccf258c22f658f9589bcf0f6cc1c /os/hal/include | |
| parent | 8cbeb405b96f12df958a75bcbc1af072ceb0e26e (diff) | |
| download | ChibiOS-7c2a8e13d969029fb675e67c57349c1deaa09284.tar.gz ChibiOS-7c2a8e13d969029fb675e67c57349c1deaa09284.tar.bz2 ChibiOS-7c2a8e13d969029fb675e67c57349c1deaa09284.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2246 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/include')
| -rw-r--r-- | os/hal/include/spi.h | 62 |
1 files changed, 56 insertions, 6 deletions
diff --git a/os/hal/include/spi.h b/os/hal/include/spi.h index e6fbe7c90..fee5742d1 100644 --- a/os/hal/include/spi.h +++ b/os/hal/include/spi.h @@ -39,7 +39,7 @@ /*===========================================================================*/
/**
- * @brief Enables the @p spiWait() API.
+ * @brief Enables the "wait" APIs.
* @note Disabling this option saves both code and data space.
*/
#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
@@ -112,9 +112,10 @@ typedef enum { /**
* @brief Emits a train of clock pulses on the SPI bus.
* @details This asynchronous function starts the emission of a train of
- * clock pulses without asserting any slave, while this is not
- * usually required by the SPI protocol it is required by
- * initialization procedure of MMC/SD cards in SPI mode.
+ * clock pulses without asserting any slave.
+ * @note This functionality is not usually required by the SPI protocol
+ * but it is required by initialization procedure of MMC/SD cards
+ * in SPI mode.
* @post At the end of the operation the configured callback is invoked.
*
* @param[in] spip pointer to the @p SPIDriver object
@@ -209,6 +210,51 @@ typedef enum { spi_lld_receive(spip, n, rxbuf); \
}
+#if SPI_USE_WAIT || defined(__DOXYGEN__)
+/**
+ * @brief Awakens the thread waiting for operation completion, if any.
+ * @note This macro is meant to be used in the low level drivers
+ * implementation only.
+ *
+ * @param[in] spip pointer to the @p SPIDriver object
+ *
+ * @notapi
+ */
+#define _spi_wakeup(spip) { \
+ if ((spip)->spd_thread != NULL) { \
+ Thread *tp = (spip)->spd_thread; \
+ (spip)->spd_thread = NULL; \
+ tp->p_u.rdymsg = RDY_RESET; \
+ chSchReadyI(tp); \
+ } \
+}
+
+/**
+ * @brief Waits for operation completion.
+ * @details This function waits for the driver to complete the current
+ * operation.
+ * @pre An operation must be running while the function is invoked.
+ * @post On exit the SPI driver is ready to accept more commands.
+ * @note No more than one thread can wait on a SPI driver using
+ * this function.
+ *
+ * @param[in] spip pointer to the @p SPIDriver object
+ *
+ * @sclass
+ */
+#define spiWaitS(spip) { \
+ chDbgAssert((spip)->spd_thread == NULL, \
+ "spiWaitS(), #1", "already waiting"); \
+ (spip)->spd_thread = chThdSelf(); \
+ chSchGoSleepS(THD_STATE_SUSPENDED); \
+}
+#else /* !SPI_USE_WAIT */
+
+/* No wakeup when wait functions are disabled.*/
+#define _spi_wakeup(spip)
+
+#endif /* !SPI_USE_WAIT */
+
/*===========================================================================*/
/* External declarations. */
/*===========================================================================*/
@@ -228,8 +274,12 @@ extern "C" { void spiSend(SPIDriver *spip, size_t n, const void *txbuf);
void spiReceive(SPIDriver *spip, size_t n, void *rxbuf);
#if SPI_USE_WAIT
- void _spi_wakeup(SPIDriver *spip, mag_t msg);
- msg_t spiWait(SPIDriver *spip);
+ void spiWait(SPIDriver *spip);
+ void spiSynchronizeWait(SPIDriver *spip, size_t n);
+ void spiIgnoreWait(SPIDriver *spip, size_t n);
+ void spiExchangeWait(SPIDriver *spip, size_t n, const void *txbuf, void *rxbuf);
+ void spiSendWait(SPIDriver *spip, size_t n, const void *txbuf);
+ void spiReceiveWait(SPIDriver *spip, size_t n, void *rxbuf);
#endif /* SPI_USE_WAIT */
#if SPI_USE_MUTUAL_EXCLUSION
void spiAcquireBus(SPIDriver *spip);
|