MCUXpresso: Update EDMA drivers to fix warnings

Signed-off-by: Mahesh Mahadevan <[email protected]>

Author: mmahadevan108

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/drivers/fsl_flexio_camera_edma.c

@@ -170,6 +170,9 @@ status_t FLEXIO_CAMERA_TransferReceiveEDMA(FLEXIO_CAMERA_Type *base,
         EDMA_PrepareTransfer(&xferConfig, (void *)FLEXIO_CAMERA_GetRxBufferAddress(base), 32, (void *)xfer->dataAddress,
                              32, 32, xfer->dataNum, kEDMA_PeripheralToMemory);
 
+        /* Store the initially configured eDMA minor byte transfer count into the FLEXIO CAMERA handle */
+        handle->nbytes = 32;
+
         /* Submit transfer. */
         EDMA_SubmitTransfer(handle->rxEdmaHandle, &xferConfig);
         EDMA_StartTransfer(handle->rxEdmaHandle);
@@ -207,7 +210,9 @@ status_t FLEXIO_CAMERA_TransferGetReceiveCountEDMA(FLEXIO_CAMERA_Type *base,
 
     if (kFLEXIO_CAMERA_RxBusy == handle->rxState)
     {
-        *count = (handle->rxSize - EDMA_GetRemainingBytes(handle->rxEdmaHandle->base, handle->rxEdmaHandle->channel));
+        *count = (handle->rxSize -
+                  (uint32_t)handle->nbytes *
+                      EDMA_GetRemainingMajorLoopCount(handle->rxEdmaHandle->base, handle->rxEdmaHandle->channel));
     }
     else
     {

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/drivers/fsl_flexio_camera_edma.h

@@ -39,29 +39,29 @@
  * @{
  */
 
-
 /*******************************************************************************
  * Definitions
  ******************************************************************************/
 
 /*! @brief Forward declaration of the handle typedef. */
 typedef struct _flexio_camera_edma_handle flexio_camera_edma_handle_t;
 
-/*! @brief CAMERA transfer callback function. */
+/*! @brief Camera transfer callback function. */
 typedef void (*flexio_camera_edma_transfer_callback_t)(FLEXIO_CAMERA_Type *base,
                                                        flexio_camera_edma_handle_t *handle,
                                                        status_t status,
                                                        void *userData);
 
 /*!
-* @brief CAMERA eDMA handle
+* @brief Camera eDMA handle
 */
 struct _flexio_camera_edma_handle
 {
     flexio_camera_edma_transfer_callback_t callback; /*!< Callback function. */
-    void *userData;                                  /*!< CAMERA callback function parameter.*/
+    void *userData;                                  /*!< Camera callback function parameter.*/
     size_t rxSize;                                   /*!< Total bytes to be received. */
     edma_handle_t *rxEdmaHandle;                     /*!< The eDMA RX channel used. */
+    uint8_t nbytes;                                  /*!< eDMA minor byte transfer count initially configured. */
     volatile uint8_t rxState;                        /*!< RX transfer state */
 };
 
@@ -79,15 +79,15 @@ extern "C" {
  */
 
 /*!
- * @brief Initializes the camera handle, which is used in transactional functions.
+ * @brief Initializes the Camera handle, which is used in transactional functions.
  *
- * @param base pointer to FLEXIO_CAMERA_Type.
+ * @param base Pointer to the FLEXIO_CAMERA_Type.
  * @param handle Pointer to flexio_camera_edma_handle_t structure.
  * @param callback The callback function.
  * @param userData The parameter of the callback function.
  * @param rxEdmaHandle User requested DMA handle for RX DMA transfer.
  * @retval kStatus_Success Successfully create the handle.
- * @retval kStatus_OutOfRange The FlexIO camera eDMA type/handle table out of range.
+ * @retval kStatus_OutOfRange The FlexIO Camera eDMA type/handle table out of range.
  */
 status_t FLEXIO_CAMERA_TransferCreateHandleEDMA(FLEXIO_CAMERA_Type *base,
                                                 flexio_camera_edma_handle_t *handle,
@@ -103,7 +103,7 @@ status_t FLEXIO_CAMERA_TransferCreateHandleEDMA(FLEXIO_CAMERA_Type *base,
  *
  * @param base Pointer to the FLEXIO_CAMERA_Type.
  * @param handle Pointer to the flexio_camera_edma_handle_t structure.
- * @param xfer CAMERA eDMA transfer structure, see #flexio_camera_transfer_t.
+ * @param xfer Camera eDMA transfer structure, see #flexio_camera_transfer_t.
  * @retval kStatus_Success if succeeded, others failed.
  * @retval kStatus_CAMERA_RxBusy Previous transfer on going.
  */

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/drivers/fsl_flexio_i2s_edma.c

@@ -225,6 +225,9 @@ status_t FLEXIO_I2S_TransferSendEDMA(FLEXIO_I2S_Type *base,
     EDMA_PrepareTransfer(&config, xfer->data, handle->bytesPerFrame, (void *)destAddr, handle->bytesPerFrame,
                          handle->bytesPerFrame, xfer->dataSize, kEDMA_MemoryToPeripheral);
 
+    /* Store the initially configured eDMA minor byte transfer count into the FLEXIO I2S handle */
+    handle->nbytes = handle->bytesPerFrame;
+
     EDMA_SubmitTransfer(handle->dmaHandle, &config);
 
     /* Start DMA transfer */
@@ -272,6 +275,9 @@ status_t FLEXIO_I2S_TransferReceiveEDMA(FLEXIO_I2S_Type *base,
     EDMA_PrepareTransfer(&config, (void *)srcAddr, handle->bytesPerFrame, xfer->data, handle->bytesPerFrame,
                          handle->bytesPerFrame, xfer->dataSize, kEDMA_PeripheralToMemory);
 
+    /* Store the initially configured eDMA minor byte transfer count into the FLEXIO I2S handle */
+    handle->nbytes = handle->bytesPerFrame;
+
     EDMA_SubmitTransfer(handle->dmaHandle, &config);
 
     /* Start DMA transfer */
@@ -327,7 +333,8 @@ status_t FLEXIO_I2S_TransferGetSendCountEDMA(FLEXIO_I2S_Type *base, flexio_i2s_e
     else
     {
         *count = handle->transferSize[handle->queueDriver] -
-                 EDMA_GetRemainingBytes(handle->dmaHandle->base, handle->dmaHandle->channel);
+                 (uint32_t)handle->nbytes *
+                     EDMA_GetRemainingMajorLoopCount(handle->dmaHandle->base, handle->dmaHandle->channel);
     }
 
     return status;
@@ -346,7 +353,8 @@ status_t FLEXIO_I2S_TransferGetReceiveCountEDMA(FLEXIO_I2S_Type *base, flexio_i2
     else
     {
         *count = handle->transferSize[handle->queueDriver] -
-                 EDMA_GetRemainingBytes(handle->dmaHandle->base, handle->dmaHandle->channel);
+                 (uint32_t)handle->nbytes *
+                     EDMA_GetRemainingMajorLoopCount(handle->dmaHandle->base, handle->dmaHandle->channel);
     }
 
     return status;

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/drivers/fsl_flexio_i2s_edma.h

@@ -38,7 +38,6 @@
  * @{
  */
 
-
 /*******************************************************************************
  * Definitions
  ******************************************************************************/
@@ -56,6 +55,7 @@ struct _flexio_i2s_edma_handle
 {
     edma_handle_t *dmaHandle;                        /*!< DMA handler for FlexIO I2S send */
     uint8_t bytesPerFrame;                           /*!< Bytes in a frame */
+    uint8_t nbytes;                                  /*!< eDMA minor byte transfer count initially configured. */
     uint32_t state;                                  /*!< Internal state for FlexIO I2S eDMA transfer */
     flexio_i2s_edma_callback_t callback;             /*!< Callback for users while transfer finish or error occurred */
     void *userData;                                  /*!< User callback parameter */
@@ -83,13 +83,13 @@ extern "C" {
  *
  * This function initializes the FlexIO I2S master DMA handle which can be used for other FlexIO I2S master
  * transactional APIs.
- * Usually, for a specified FlexIO I2S instance, user need only call this API once to get the initialized handle.
+ * Usually, for a specified FlexIO I2S instance, call this API once to get the initialized handle.
  *
  * @param base FlexIO I2S peripheral base address.
  * @param handle FlexIO I2S eDMA handle pointer.
  * @param callback FlexIO I2S eDMA callback function called while finished a block.
  * @param userData User parameter for callback.
- * @param dmaHandle eDMA handle for FlexIO I2S. This handle shall be a static value allocated by users.
+ * @param dmaHandle eDMA handle for FlexIO I2S. This handle is a static value allocated by users.
  */
 void FLEXIO_I2S_TransferTxCreateHandleEDMA(FLEXIO_I2S_Type *base,
                                            flexio_i2s_edma_handle_t *handle,
@@ -102,13 +102,13 @@ void FLEXIO_I2S_TransferTxCreateHandleEDMA(FLEXIO_I2S_Type *base,
  *
  * This function initializes the FlexIO I2S slave DMA handle which can be used for other FlexIO I2S master transactional
  * APIs.
- * Usually, for a specified FlexIO I2S instance, user need only call this API once to get the initialized handle.
+ * Usually, for a specified FlexIO I2S instance, call this API once to get the initialized handle.
  *
  * @param base FlexIO I2S peripheral base address.
  * @param handle FlexIO I2S eDMA handle pointer.
  * @param callback FlexIO I2S eDMA callback function called while finished a block.
  * @param userData User parameter for callback.
- * @param dmaHandle eDMA handle for FlexIO I2S. This handle shall be a static value allocated by users.
+ * @param dmaHandle eDMA handle for FlexIO I2S. This handle is a static value allocated by users.
  */
 void FLEXIO_I2S_TransferRxCreateHandleEDMA(FLEXIO_I2S_Type *base,
                                            flexio_i2s_edma_handle_t *handle,
@@ -120,7 +120,7 @@ void FLEXIO_I2S_TransferRxCreateHandleEDMA(FLEXIO_I2S_Type *base,
  * @brief Configures the FlexIO I2S Tx audio format.
  *
  * Audio format can be changed in run-time of FlexIO I2S. This function configures the sample rate and audio data
- * format to be transferred. This function also sets eDMA parameter according to format.
+ * format to be transferred. This function also sets the eDMA parameter according to format.
  *
  * @param base FlexIO I2S peripheral base address.
  * @param handle FlexIO I2S eDMA handle pointer
@@ -137,8 +137,8 @@ void FLEXIO_I2S_TransferSetFormatEDMA(FLEXIO_I2S_Type *base,
 /*!
  * @brief Performs a non-blocking FlexIO I2S transfer using DMA.
  *
- * @note This interface returned immediately after transfer initiates, users should call
- * FLEXIO_I2S_GetTransferStatus to poll the transfer status to check whether FlexIO I2S transfer finished.
+ * @note This interface returned immediately after transfer initiates. Users should call
+ * FLEXIO_I2S_GetTransferStatus to poll the transfer status and check whether the FlexIO I2S transfer is finished.
  *
  * @param base FlexIO I2S peripheral base address.
  * @param handle FlexIO I2S DMA handle pointer.
@@ -154,8 +154,8 @@ status_t FLEXIO_I2S_TransferSendEDMA(FLEXIO_I2S_Type *base,
 /*!
  * @brief Performs a non-blocking FlexIO I2S receive using eDMA.
  *
- * @note This interface returned immediately after transfer initiates, users should call
- * FLEXIO_I2S_GetReceiveRemainingBytes to poll the transfer status to check whether FlexIO I2S transfer finished.
+ * @note This interface returned immediately after transfer initiates. Users should call
+ * FLEXIO_I2S_GetReceiveRemainingBytes to poll the transfer status and check whether the FlexIO I2S transfer is finished.
  *
  * @param base FlexIO I2S peripheral base address.
  * @param handle FlexIO I2S DMA handle pointer.

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/drivers/fsl_flexio_spi_edma.c

@@ -198,7 +198,7 @@ static void FLEXIO_SPI_EDMAConfig(FLEXIO_SPI_Type *base,
     /* Configure DMA channel. */
     if (xfer->txData)
     {
-        xferConfig.srcOffset = 1;
+        xferConfig.srcOffset = bytesPerFrame;
         xferConfig.srcAddr = (uint32_t)(xfer->txData);
     }
     else
@@ -210,6 +210,9 @@ static void FLEXIO_SPI_EDMAConfig(FLEXIO_SPI_Type *base,
 
     xferConfig.majorLoopCounts = (xfer->dataSize / xferConfig.minorLoopBytes);
 
+    /* Store the initially configured eDMA minor byte transfer count into the FLEXIO SPI handle */
+    handle->nbytes = xferConfig.minorLoopBytes;
+
     if (handle->txHandle)
     {
         EDMA_SubmitTransfer(handle->txHandle, &xferConfig);
@@ -219,9 +222,16 @@ static void FLEXIO_SPI_EDMAConfig(FLEXIO_SPI_Type *base,
     if (xfer->rxData)
     {
         xferConfig.srcAddr = FLEXIO_SPI_GetRxDataRegisterAddress(base, direction);
+        if (bytesPerFrame == 2U)
+        {
+            if (direction == kFLEXIO_SPI_LsbFirst)
+            {
+                xferConfig.srcAddr -= 1U;
+            }
+        }
         xferConfig.srcOffset = 0;
         xferConfig.destAddr = (uint32_t)(xfer->rxData);
-        xferConfig.destOffset = 1;
+        xferConfig.destOffset = bytesPerFrame;
         EDMA_SubmitTransfer(handle->rxHandle, &xferConfig);
         handle->rxInProgress = true;
         FLEXIO_SPI_EnableDMA(base, kFLEXIO_SPI_RxDmaEnable, true);
@@ -349,11 +359,15 @@ status_t FLEXIO_SPI_MasterTransferGetCountEDMA(FLEXIO_SPI_Type *base,
 
     if (handle->rxInProgress)
     {
-        *count = (handle->transferSize - EDMA_GetRemainingBytes(handle->rxHandle->base, handle->rxHandle->channel));
+        *count = (handle->transferSize -
+                  (uint32_t)handle->nbytes *
+                      EDMA_GetRemainingMajorLoopCount(handle->rxHandle->base, handle->rxHandle->channel));
     }
     else
     {
-        *count = (handle->transferSize - EDMA_GetRemainingBytes(handle->txHandle->base, handle->txHandle->channel));
+        *count = (handle->transferSize -
+                  (uint32_t)handle->nbytes *
+                      EDMA_GetRemainingMajorLoopCount(handle->txHandle->base, handle->txHandle->channel));
     }
 
     return kStatus_Success;

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/drivers/fsl_flexio_spi_edma.h

@@ -38,7 +38,6 @@
  * @{
  */
 
-
 /*******************************************************************************
  * Definitions
  ******************************************************************************/
@@ -65,6 +64,7 @@ typedef void (*flexio_spi_slave_edma_transfer_callback_t)(FLEXIO_SPI_Type *base,
 struct _flexio_spi_master_edma_handle
 {
     size_t transferSize;                                 /*!< Total bytes to be transferred. */
+    uint8_t nbytes;                                      /*!< eDMA minor byte transfer count initially configured. */
     bool txInProgress;                                   /*!< Send transfer in progress */
     bool rxInProgress;                                   /*!< Receive transfer in progress */
     edma_handle_t *txHandle;                             /*!< DMA handler for SPI send */
@@ -86,14 +86,14 @@ extern "C" {
  */
 
 /*!
- * @brief Initializes the FLEXO SPI master eDMA handle.
+ * @brief Initializes the FlexIO SPI master eDMA handle.
  *
- * This function initializes the FLEXO SPI master eDMA handle which can be used for other FLEXO SPI master transactional
+ * This function initializes the FlexIO SPI master eDMA handle which can be used for other FlexIO SPI master transactional
  * APIs.
- * For a specified FLEXO SPI instance, call this API once to get the initialized handle.
+ * For a specified FlexIO SPI instance, call this API once to get the initialized handle.
  *
- * @param base pointer to FLEXIO_SPI_Type structure.
- * @param handle pointer to flexio_spi_master_edma_handle_t structure to store the transfer state.
+ * @param base Pointer to FLEXIO_SPI_Type structure.
+ * @param handle Pointer to flexio_spi_master_edma_handle_t structure to store the transfer state.
  * @param callback SPI callback, NULL means no callback.
  * @param userData callback function parameter.
  * @param txHandle User requested eDMA handle for FlexIO SPI RX eDMA transfer.
@@ -112,11 +112,11 @@ status_t FLEXIO_SPI_MasterTransferCreateHandleEDMA(FLEXIO_SPI_Type *base,
  * @brief Performs a non-blocking FlexIO SPI transfer using eDMA.
  *
  * @note This interface returns immediately after transfer initiates. Call
- * FLEXIO_SPI_MasterGetTransferCountEDMA to poll the transfer status to check
- * whether FlexIO SPI transfer finished.
+ * FLEXIO_SPI_MasterGetTransferCountEDMA to poll the transfer status and check
+ * whether the FlexIO SPI transfer is finished.
  *
- * @param base pointer to FLEXIO_SPI_Type structure.
- * @param handle pointer to flexio_spi_master_edma_handle_t structure to store the transfer state.
+ * @param base Pointer to FLEXIO_SPI_Type structure.
+ * @param handle Pointer to flexio_spi_master_edma_handle_t structure to store the transfer state.
  * @param xfer Pointer to FlexIO SPI transfer structure.
  * @retval kStatus_Success Successfully start a transfer.
  * @retval kStatus_InvalidArgument Input argument is invalid.
@@ -129,15 +129,15 @@ status_t FLEXIO_SPI_MasterTransferEDMA(FLEXIO_SPI_Type *base,
 /*!
  * @brief Aborts a FlexIO SPI transfer using eDMA.
  *
- * @param base pointer to FLEXIO_SPI_Type structure.
+ * @param base Pointer to FLEXIO_SPI_Type structure.
  * @param handle FlexIO SPI eDMA handle pointer.
  */
 void FLEXIO_SPI_MasterTransferAbortEDMA(FLEXIO_SPI_Type *base, flexio_spi_master_edma_handle_t *handle);
 
 /*!
  * @brief Gets the remaining bytes for FlexIO SPI eDMA transfer.
  *
- * @param base pointer to FLEXIO_SPI_Type structure.
+ * @param base Pointer to FLEXIO_SPI_Type structure.
  * @param handle FlexIO SPI eDMA handle pointer.
  * @param count Number of bytes transferred so far by the non-blocking transaction.
  */
@@ -150,8 +150,8 @@ status_t FLEXIO_SPI_MasterTransferGetCountEDMA(FLEXIO_SPI_Type *base,
  *
  * This function initializes the FlexIO SPI slave eDMA handle.
  *
- * @param base pointer to FLEXIO_SPI_Type structure.
- * @param handle pointer to flexio_spi_slave_edma_handle_t structure to store the transfer state.
+ * @param base Pointer to FLEXIO_SPI_Type structure.
+ * @param handle Pointer to flexio_spi_slave_edma_handle_t structure to store the transfer state.
  * @param callback SPI callback, NULL means no callback.
  * @param userData callback function parameter.
  * @param txHandle User requested eDMA handle for FlexIO SPI TX eDMA transfer.
@@ -171,11 +171,11 @@ static inline void FLEXIO_SPI_SlaveTransferCreateHandleEDMA(FLEXIO_SPI_Type *bas
  * @brief Performs a non-blocking FlexIO SPI transfer using eDMA.
  *
  * @note This interface returns immediately after transfer initiates. Call
- * FLEXIO_SPI_SlaveGetTransferCountEDMA to poll the transfer status to
- * check whether FlexIO SPI transfer finished.
+ * FLEXIO_SPI_SlaveGetTransferCountEDMA to poll the transfer status and
+ * check whether the FlexIO SPI transfer is finished.
  *
- * @param base pointer to FLEXIO_SPI_Type structure.
- * @param handle pointer to flexio_spi_slave_edma_handle_t structure to store the transfer state.
+ * @param base Pointer to FLEXIO_SPI_Type structure.
+ * @param handle Pointer to flexio_spi_slave_edma_handle_t structure to store the transfer state.
  * @param xfer Pointer to FlexIO SPI transfer structure.
  * @retval kStatus_Success Successfully start a transfer.
  * @retval kStatus_InvalidArgument Input argument is invalid.
@@ -188,8 +188,8 @@ status_t FLEXIO_SPI_SlaveTransferEDMA(FLEXIO_SPI_Type *base,
 /*!
  * @brief Aborts a FlexIO SPI transfer using eDMA.
  *
- * @param base pointer to FLEXIO_SPI_Type structure.
- * @param handle pointer to flexio_spi_slave_edma_handle_t structure to store the transfer state.
+ * @param base Pointer to FLEXIO_SPI_Type structure.
+ * @param handle Pointer to flexio_spi_slave_edma_handle_t structure to store the transfer state.
  */
 static inline void FLEXIO_SPI_SlaveTransferAbortEDMA(FLEXIO_SPI_Type *base, flexio_spi_slave_edma_handle_t *handle)
 {
@@ -199,7 +199,7 @@ static inline void FLEXIO_SPI_SlaveTransferAbortEDMA(FLEXIO_SPI_Type *base, flex
 /*!
  * @brief Gets the remaining bytes to be transferred for FlexIO SPI eDMA.
  *
- * @param base pointer to FLEXIO_SPI_Type structure.
+ * @param base Pointer to FLEXIO_SPI_Type structure.
  * @param handle FlexIO SPI eDMA handle pointer.
  * @param count Number of bytes transferred so far by the non-blocking transaction.
  */