Merge pull request ARMmbed#10 from adustm/spi_h743

H743 SPI : use LL instead of HAL

Author: jeromecoutant

targets/TARGET_STM/stm_spi_api.c

@@ -82,7 +82,6 @@ void init_spi(spi_t *obj)
     if (HAL_SPI_Init(handle) != HAL_OK) {
         error("Cannot initialize SPI");
     }
-
     /* In case of standard 4 wires SPI,PI can be kept enabled all time
      * and SCK will only be generated during the write operations. But in case
      * of 3 wires, it should be only enabled during rd/wr unitary operations,
@@ -190,6 +189,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
 #if TARGET_STM32H7
     handle->Init.NSSPMode          = SPI_NSS_PULSE_DISABLE;
     handle->Init.MasterKeepIOState = SPI_MASTER_KEEP_IO_STATE_ENABLE;
+    handle->Init.FifoThreshold     = SPI_FIFO_THRESHOLD_01DATA;
 #endif
 
     init_spi(obj);
@@ -399,16 +399,6 @@ int spi_master_write(spi_t *obj, int value)
     if (handle->Init.Direction == SPI_DIRECTION_1LINE) {
         return HAL_SPI_Transmit(handle, (uint8_t *)&value, 1, TIMEOUT_1_BYTE);
     }
-#if TARGET_STM32H7
-    else {
-        int retval = 0;
-        if (HAL_SPI_TransmitReceive(handle, (uint8_t *)&value, (uint8_t *)&retval, 1, TIMEOUT_1_BYTE) != HAL_OK) {
-            error("spi transmit receive error\n");
-        }
-        return retval;
-    }
-#else
-
 
 #if defined(LL_SPI_RX_FIFO_TH_HALF)
     /*  Configure the default data size */
@@ -425,32 +415,39 @@ int spi_master_write(spi_t *obj, int value)
      *  but this will increase performances significantly
      */
 
-    /* Wait TXE flag to transmit data */
 #if TARGET_STM32H7
-    while (!LL_SPI_IsActiveFlag_TXC(SPI_INST(obj)));
-#else /* TARGET_STM32H7 */
+    /* Master transfer start */
+    LL_SPI_StartMasterTransfer(SPI_INST(obj));
+
+    /* Wait TXP flag to transmit data */
+    while (!LL_SPI_IsActiveFlag_TXP(SPI_INST(obj)));
+#else
+    /* Wait TXE flag to transmit data */
     while (!LL_SPI_IsActiveFlag_TXE(SPI_INST(obj)));
+
 #endif /* TARGET_STM32H7 */
 
+    /* Transmit data */
     if (handle->Init.DataSize == SPI_DATASIZE_16BIT) {
-        LL_SPI_TransmitData16(SPI_INST(obj), value);
+        LL_SPI_TransmitData16(SPI_INST(obj), (uint16_t)value);
     } else {
-        LL_SPI_TransmitData8(SPI_INST(obj), (uint8_t) value);
+        LL_SPI_TransmitData8(SPI_INST(obj), (uint8_t)value);
     }
 
-    /* Then wait RXE flag before reading */
 #if TARGET_STM32H7
-    while (!LL_SPI_IsActiveFlag_RXWNE(SPI_INST(obj)));
+    /* Wait for RXP or end of Transfer */
+        while (!LL_SPI_IsActiveFlag_RXP(SPI_INST(obj)));
 #else /* TARGET_STM32H7 */
+    /* Wait for RXNE flag before reading */
     while (!LL_SPI_IsActiveFlag_RXNE(SPI_INST(obj)));
 #endif /* TARGET_STM32H7 */
 
+    /* Read received data */
     if (handle->Init.DataSize == SPI_DATASIZE_16BIT) {
         return LL_SPI_ReceiveData16(SPI_INST(obj));
     } else {
         return LL_SPI_ReceiveData8(SPI_INST(obj));
     }
-#endif
 }
 
 int spi_master_block_write(spi_t *obj, const char *tx_buffer, int tx_length,