diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-09-03 15:48:09 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-09-03 15:48:09 +0000 |
| commit | 9d9a04e4645b9f4b70e74dd4245a1412e82c902a (patch) | |
| tree | fd48c875d30f2895654697ef6562c19dd6189282 /os/hal/include/hal_spi.h | |
| parent | 4b148d3cbcd338dd5d72fac683e712f448d08341 (diff) | |
| download | ChibiOS-9d9a04e4645b9f4b70e74dd4245a1412e82c902a.tar.gz ChibiOS-9d9a04e4645b9f4b70e74dd4245a1412e82c902a.tar.bz2 ChibiOS-9d9a04e4645b9f4b70e74dd4245a1412e82c902a.zip | |
SPI driver improvements.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10545 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/include/hal_spi.h')
| -rw-r--r-- | os/hal/include/hal_spi.h | 83 |
1 files changed, 77 insertions, 6 deletions
diff --git a/os/hal/include/hal_spi.h b/os/hal/include/hal_spi.h index 9e4b46425..3795bf828 100644 --- a/os/hal/include/hal_spi.h +++ b/os/hal/include/hal_spi.h @@ -31,6 +31,19 @@ /* Driver constants. */
/*===========================================================================*/
+/**
+ * @name Chip Select modes
+ * @{
+ */
+#define SPI_SELECT_MODE_NONE 0 /** @brief @p spiSelect() and
+ @p spiUnselect() do
+ nothing. */
+#define SPI_SELECT_MODE_PAD 1 /** @brief Legacy mode. */
+#define SPI_SELECT_MODE_PORT 2 /** @brief Fastest mode. */
+#define SPI_SELECT_MODE_LINE 3 /** @brief Packed mode. */
+#define SPI_SELECT_MODE_LLD 4 /** @brief LLD-defined mode.*/
+/** @} */
+
/*===========================================================================*/
/* Driver pre-compile time settings. */
/*===========================================================================*/
@@ -44,7 +57,7 @@ * @note Disabling this option saves both code and data space.
*/
#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
-#define SPI_USE_WAIT TRUE
+#define SPI_USE_WAIT TRUE
#endif
/**
@@ -52,7 +65,15 @@ * @note Disabling this option saves both code and data space.
*/
#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
-#define SPI_USE_MUTUAL_EXCLUSION TRUE
+#define SPI_USE_MUTUAL_EXCLUSION TRUE
+#endif
+
+/**
+ * @brief Enables the use of the .
+ * @note Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
#endif
/** @} */
@@ -60,6 +81,14 @@ /* Derived constants and error checks. */
/*===========================================================================*/
+#if (SPI_SELECT_MODE != SPI_SELECT_MODE_NONE) && \
+ (SPI_SELECT_MODE != SPI_SELECT_MODE_PAD) && \
+ (SPI_SELECT_MODE != SPI_SELECT_MODE_PORT) && \
+ (SPI_SELECT_MODE != SPI_SELECT_MODE_LINE) && \
+ (SPI_SELECT_MODE != SPI_SELECT_MODE_LLD)
+#error "invalid SPI_SELECT_MODE setting"
+#endif
+
/*===========================================================================*/
/* Driver data structures and types. */
/*===========================================================================*/
@@ -85,6 +114,7 @@ typedef enum { * @name Macro Functions
* @{
*/
+#if (SPI_SELECT_MODE == SPI_SELECT_MODE_LLD) || defined(__DOXYGEN__)
/**
* @brief Asserts the slave select signal and prepares for transfers.
*
@@ -92,9 +122,10 @@ typedef enum { *
* @iclass
*/
-#define spiSelectI(spip) { \
+#define spiSelectI(spip) \
+do { \
spi_lld_select(spip); \
-}
+} while (false)
/**
* @brief Deasserts the slave select signal.
@@ -104,9 +135,49 @@ typedef enum { *
* @iclass
*/
-#define spiUnselectI(spip) { \
+#define spiUnselectI(spip) \
+do { \
spi_lld_unselect(spip); \
-}
+} while (false)
+
+#elif SPI_SELECT_MODE == SPI_SELECT_MODE_LINE
+#define spiSelectI(spip) \
+do { \
+ palClearLine(spip->config->ssline); \
+} while (false)
+
+#define spiUnselectI(spip) \
+do { \
+ palSetLine(spip->config->ssline); \
+} while (false)
+
+#elif SPI_SELECT_MODE == SPI_SELECT_MODE_PORT
+#define spiSelectI(spip) \
+do { \
+ palClearPort(spip->config->ssport, spip->config->ssmask); \
+} while (false)
+
+#define spiUnselectI(spip) \
+do { \
+ palSetPort(spip->config->ssport, spip->config->ssmask); \
+} while (false)
+
+#elif SPI_SELECT_MODE == SPI_SELECT_MODE_PAD
+#define spiSelectI(spip) \
+do { \
+ palClearPad(spip->config->ssport, spip->config->sspad); \
+} while (false)
+
+#define spiUnselectI(spip) \
+do { \
+ palSetPad(spip->config->ssport, spip->config->sspad); \
+} while (false)
+
+#elif SPI_SELECT_MODE == SPI_SELECT_MODE_NONE
+#define spiSelectI(spip)
+
+#define spiUnselectI(spip)
+#endif
/**
* @brief Ignores data on the SPI bus.
|