XHAL SPI ready for testing.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@16295 27425a3e-05d8-49a3-a47f-9c15f0e5edd8

os/xhal/codegen/hal_sio.xml

@@ -407,6 +407,10 @@ do {
         <brief>Type of SIO event flags.</brief>
         <basetype ctype="chnflags_t" />
       </typedef>
+      <typedef name="hal_sio_driver_c">
+        <brief>Type of structure representing a SIO driver.</brief>
+        <basetype ctype="struct hal_sio_driver" />
+      </typedef>
       <typedef name="hal_sio_config_t">
         <brief>Type of structure representing a SIO configuration.</brief>
         <basetype ctype="struct hal_sio_config" />

os/xhal/codegen/hal_spi.xml

@@ -64,6 +64,10 @@
       </macro>
     </macros>
     <types>
+      <typedef name="hal_spi_driver_c">
+        <brief>Type of structure representing a SPI driver.</brief>
+        <basetype ctype="struct hal_spi_driver" />
+      </typedef>
       <typedef name="hal_spi_config_t">
         <brief>Type of structure representing a SPI configuration.</brief>
         <basetype ctype="struct hal_spi_config" />

os/xhal/hal.mk

@@ -34,7 +34,7 @@ HALSRC = $(CHIBIOS)/os/xhal/src/hal.c \
          $(CHIBIOS)/os/xhal/src/hal_st.c \
          $(CHIBIOS)/os/xhal/src/hal_queues.c \
          $(CHIBIOS)/os/xhal/src/hal_pal.c \
-         $(CHIBIOS)/os/xhal/src/hal_sio.c
+         $(CHIBIOS)/os/xhal/src/hal_sio.c \
          $(CHIBIOS)/os/xhal/src/hal_spi.c
 endif
 

os/xhal/include/hal_sio.h

@@ -477,6 +477,11 @@
  */
 typedef chnflags_t sioevents_t;
 
+/**
+ * @brief       Type of structure representing a SIO driver.
+ */
+typedef struct hal_sio_driver hal_sio_driver_c;
+
 /**
  * @brief       Type of structure representing a SIO configuration.
  */

os/xhal/include/hal_spi.h

@@ -140,6 +140,11 @@
 /* Module data structures and types.                                         */
 /*===========================================================================*/
 
+/**
+ * @brief       Type of structure representing a SPI driver.
+ */
+typedef struct hal_spi_driver hal_spi_driver_c;
+
 /**
  * @brief       Type of structure representing a SPI configuration.
  */

os/xhal/ports/STM32/LLD/SPIv2/hal_spi_lld.c

@@ -116,6 +116,25 @@ SPIDriver SPID6;
 /* Driver local variables and types.                                         */
 /*===========================================================================*/
 
+/*
+ * Default SPI configuration.
+ */
+static const hal_spi_config_t spi_default_config = {
+  .circular         = false,
+  .slave            = false,
+#if (SPI_SELECT_MODE == SPI_SELECT_MODE_LINE) || defined (__DOXYGEN__)
+  .ssline           = PAL_LINE(STM32_SPI_DEFAULT_PORT, STM32_SPI_DEFAULT_PAD);
+#elif SPI_SELECT_MODE == SPI_SELECT_MODE_PORT
+  .ssport           = STM32_SPI_DEFAULT_PORT,
+  .ssport           = PAL_PORT_BIT(STM32_SPI_DEFAULT_PAD),
+#elif SPI_SELECT_MODE == SPI_SELECT_MODE_PAD
+  .ssport           = STM32_SPI_DEFAULT_PORT,
+  .sspad            = STM32_SPI_DEFAULT_PAD,
+#endif
+  .cr1              = STM32_SPI_DEFAULT_CR1,
+  .cr2              = STM32_SPI_DEFAULT_CR2
+};
+
 /*===========================================================================*/
 /* Driver local functions.                                                   */
 /*===========================================================================*/
@@ -454,14 +473,12 @@ void spi_lld_init(void) {
  * @notapi
  */
 msg_t spi_lld_start(SPIDriver *spip) {
-  uint32_t ds;
   msg_t msg;
 
   /* Resetting TX pattern source.*/
   spip->txsource = (uint32_t)STM32_SPI_FILLER_PATTERN;
 
-  /* If in stopped state then enables the SPI and DMA clocks.*/
+  /* Activating SPI unit.*/
-  if (spip->state == DRV_STATE_STOP) {
   if (false) {
   }
 
@@ -580,40 +597,9 @@ msg_t spi_lld_start(SPIDriver *spip) {
   /* DMA setup.*/
   dmaStreamSetPeripheral(spip->dmarx, &spip->spi->DR);
   dmaStreamSetPeripheral(spip->dmatx, &spip->spi->DR);
-  }
-  else {
-    /* De-activation before re-configuration.*/
-    spi_lld_disable(spip);
-  }
 
-  /* Configuration-specific DMA setup.*/
+  /* Configures the peripheral.*/
-  ds = __spi_getfield(spip, cr2) & SPI_CR2_DS;
+  spi_lld_configure(spip, &spi_default_config);
-  if (!ds || (ds <= (SPI_CR2_DS_2 | SPI_CR2_DS_1 | SPI_CR2_DS_0))) {
-    /* Frame width is 8 bits or smaller.*/
-    spip->rxdmamode = (spip->rxdmamode & ~STM32_DMA_CR_SIZE_MASK) |
-                      STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE;
-    spip->txdmamode = (spip->txdmamode & ~STM32_DMA_CR_SIZE_MASK) |
-                      STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE;
-  }
-  else {
-    /* Frame width is larger than 8 bits.*/
-    spip->rxdmamode = (spip->rxdmamode & ~STM32_DMA_CR_SIZE_MASK) |
-                      STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD;
-    spip->txdmamode = (spip->txdmamode & ~STM32_DMA_CR_SIZE_MASK) |
-                      STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD;
-  }
-
-  if (__spi_getfield(spip, circular)) {
-    spip->rxdmamode |= (STM32_DMA_CR_CIRC | STM32_DMA_CR_HTIE);
-    spip->txdmamode |= (STM32_DMA_CR_CIRC | STM32_DMA_CR_HTIE);
-  }
-  else {
-    spip->rxdmamode &= ~(STM32_DMA_CR_CIRC | STM32_DMA_CR_HTIE);
-    spip->txdmamode &= ~(STM32_DMA_CR_CIRC | STM32_DMA_CR_HTIE);
-  }
-
-  /* SPI setup.*/
-  spi_lld_enable(spip);
 
   return HAL_RET_SUCCESS;
 }
@@ -627,9 +613,6 @@ msg_t spi_lld_start(SPIDriver *spip) {
  */
 void spi_lld_stop(SPIDriver *spip) {
 
-  /* If in ready state then disables the SPI clock.*/
-  if (spip->state == SPI_READY) {
-
   /* Just in case this has been called uncleanly.*/
   spi_lld_disable(spip);
 
@@ -686,7 +669,58 @@ void spi_lld_stop(SPIDriver *spip) {
   else {
     osalDbgAssert(false, "invalid SPI instance");
   }
+}
+
+/**
+ * @brief   SPI configuration.
+ *
+ * @param[in] spip      pointer to the @p hal_spi_driver_c object
+ * @param[in] config    pointer to the @p hal_spi_config_t structure
+ * @return              A pointer to the current configuration structure.
+ *
+ * @notapi
+ */
+const hal_spi_config_t *spi_lld_configure(hal_spi_driver_c *spip,
+                                          const hal_spi_config_t *config) {
+  uint32_t ds;
+
+  if (config == NULL) {
+    config = &spi_default_config;
   }
+
+  /* De-activation before re-configuration.*/
+  spi_lld_disable(spip);
+
+  /* Configuration-specific DMA setup.*/
+  ds = __spi_getfield(spip, cr2) & SPI_CR2_DS;
+  if (!ds || (ds <= (SPI_CR2_DS_2 | SPI_CR2_DS_1 | SPI_CR2_DS_0))) {
+    /* Frame width is 8 bits or smaller.*/
+    spip->rxdmamode = (spip->rxdmamode & ~STM32_DMA_CR_SIZE_MASK) |
+                      STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE;
+    spip->txdmamode = (spip->txdmamode & ~STM32_DMA_CR_SIZE_MASK) |
+                      STM32_DMA_CR_PSIZE_BYTE | STM32_DMA_CR_MSIZE_BYTE;
+  }
+  else {
+    /* Frame width is larger than 8 bits.*/
+    spip->rxdmamode = (spip->rxdmamode & ~STM32_DMA_CR_SIZE_MASK) |
+                      STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD;
+    spip->txdmamode = (spip->txdmamode & ~STM32_DMA_CR_SIZE_MASK) |
+                      STM32_DMA_CR_PSIZE_HWORD | STM32_DMA_CR_MSIZE_HWORD;
+  }
+
+  if (__spi_getfield(spip, circular)) {
+    spip->rxdmamode |= (STM32_DMA_CR_CIRC | STM32_DMA_CR_HTIE);
+    spip->txdmamode |= (STM32_DMA_CR_CIRC | STM32_DMA_CR_HTIE);
+  }
+  else {
+    spip->rxdmamode &= ~(STM32_DMA_CR_CIRC | STM32_DMA_CR_HTIE);
+    spip->txdmamode &= ~(STM32_DMA_CR_CIRC | STM32_DMA_CR_HTIE);
+  }
+
+  /* SPI setup.*/
+  spi_lld_enable(spip);
+
+  return config;
 }
 
 #if (SPI_SELECT_MODE == SPI_SELECT_MODE_LLD) || defined(__DOXYGEN__)

os/xhal/ports/STM32/LLD/SPIv2/hal_spi_lld.h

@@ -218,6 +218,34 @@
 #if !defined(STM32_SPI_DMA_ERROR_HOOK) || defined(__DOXYGEN__)
 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
 #endif
+
+/**
+ * @brief   Default PAL port for Chip Select line.
+ */
+#if !defined(STM32_SPI_DEFAULT_PORT) || defined(__DOXYGEN__)
+#define STM32_SPI_DEFAULT_PORT              GPIOA
+#endif
+
+/**
+ * @brief   Default PAL pad for Chip Select line.
+ */
+#if !defined(STM32_SPI_DEFAULT_PAD) || defined(__DOXYGEN__)
+#define STM32_SPI_DEFAULT_PAD               0U
+#endif
+
+/**
+ * @brief   CR1 setting for default SPI configuration.
+ */
+#if !defined(STM32_SPI_DEFAULT_CR1) || defined(__DOXYGEN__)
+#define STM32_SPI_DEFAULT_CR1               (SPI_CR1_BR_2 | SPI_CR1_BR_1)
+#endif
+
+/**
+ * @brief   CR2 setting for default SPI configuration.
+ */
+#if !defined(STM32_SPI_DEFAULT_CR2) || defined(__DOXYGEN__)
+#define STM32_SPI_DEFAULT_CR2               (SPI_CR2_DS_2 | SPI_CR2_DS_1 | SPI_CR2_DS_0)
+#endif
 /** @} */
 
 /*===========================================================================*/
@@ -549,6 +577,8 @@ extern "C" {
   void spi_lld_init(void);
   msg_t spi_lld_start(SPIDriver *spip);
   void spi_lld_stop(SPIDriver *spip);
+  const hal_spi_config_t *spi_lld_configure(hal_spi_driver_c *spip,
+                                            const hal_spi_config_t *config);
 #if (SPI_SELECT_MODE == SPI_SELECT_MODE_LLD) || defined(__DOXYGEN__)
   void spi_lld_select(SPIDriver *spip);
   void spi_lld_unselect(SPIDriver *spip);

os/xhal/ports/STM32/LLD/USARTv3/hal_sio_lld.c

@@ -460,6 +460,15 @@ void sio_lld_stop(SIODriver *siop) {
   }
 }
 
+/**
+ * @brief   SIO configuration.
+ *
+ * @param[in] siop      pointer to the @p SIODriver object
+ * @param[in] config    pointer to the @p SIOConfig structure
+ * @return              A pointer to the current configuration structure.
+ *
+ * @notapi
+ */
 const SIOConfig *sio_lld_configure(SIODriver *siop, const SIOConfig *config) {
   USART_TypeDef *u = siop->usart;
   uint32_t presc, brr, clock;