uart: PRSDK-6347: fix Misra-C & KW issues

Signed-off-by: Hao Zhang <hzhang@ti.com>

5 files changed, 40 insertions, 39 deletions

diff --git a/UART.h b/UART.h
index 0958fc7..63c590a 100644
--- a/UART.h
+++ b/UART.h
@@ -436,7 +436,7 @@ typedef struct UART_FxnTable_s {
     /*! Function to implementation specific control function */
     UART_ControlFxn         controlFxn;
     /*! Function to initialize the given data object */
-    UART_InitFxn            initFxn;
+    UART_InitFxn            uartInitFxn;
     /*! Function to open the specified peripheral */
     UART_OpenFxn            openFxn;
     /*! Function to read from the specified peripheral */
@@ -481,11 +481,11 @@ typedef UART_Config UART_config_list[UART_MAX_CONFIG_CNT];
  *
  *  @pre    UART_open() had to be called first.
  *
- *  @param  handle  A UART_Handle returned from UART_open
+ *  @param  uartHnd A UART_Handle returned from UART_open
  *
  *  @sa     UART_open
  */
-extern void UART_close(UART_Handle handle);
+extern void UART_close(UART_Handle uartHnd);
 
 /*!
  *  @brief  Function performs implementation specific features on a given
@@ -493,18 +493,18 @@ extern void UART_close(UART_Handle handle);
  *
  *  @pre    UART_open() has to be called first.
  *
- *  @param  handle A UART handle returned from UART_open()
+ *  @param  uartHnd A UART handle returned from UART_open()
  *
- *  @param  cmd    A command value defined by the driver specific implementation
+ *  @param  cmd     A command value defined by the driver specific implementation
  *
- *  @param  arg    An optional argument that is accompanied with cmd
+ *  @param  arg     An optional argument that is accompanied with cmd
  *
  *  @return Implementation specific return codes. Negative values indicate
  *          unsuccessful operations.
  *
  *  @sa     UART_open()
  */
-extern int32_t UART_control(UART_Handle handle, uint32_t cmd, void *arg);
+extern int32_t UART_control(UART_Handle uartHnd, uint32_t cmd, void *arg);
 
 /*!
  *  @brief  Function to initializes the UART module
@@ -526,7 +526,7 @@ extern void UART_init(void);
  *  @param  idx           Logical peripheral number indexed into the HWAttrs
  *                        table
  *
- *  @param  params        Pointer to an parameter block, if NULL it will use
+ *  @param  uartParams    Pointer to an parameter block, if NULL it will use
  *                        default values
  *
  *  @return A UART_Handle on success or a NULL on an error or if it has been
@@ -534,7 +534,7 @@ extern void UART_init(void);
  *
  *  @sa     UART_close
  */
-extern UART_Handle UART_open(uint32_t idx, UART_Params *params);
+extern UART_Handle UART_open(uint32_t idx, UART_Params *uartParams);
 
 /*!
  *  @brief  Function to initialize the UART_Params struct to its defaults
@@ -554,9 +554,9 @@ extern UART_Handle UART_open(uint32_t idx, UART_Params *params);
  *  stopBits = UART_STOP_ONE;
  *  parityType = UART_PAR_NONE;
  *
- *  @param  params  Parameter structure to initialize
+ *  @param  uartParams  Parameter structure to initialize
  */
-extern void UART_Params_init(UART_Params *params);
+extern void UART_Params_init(UART_Params *uartParams);
 
 
 /*!
@@ -570,7 +570,7 @@ extern void UART_Params_init(UART_Params *params);
  *  In UART_MODE_CALLBACK, UART_write does not block task execution an calls a
  *  callback function specified by writeCallback.
  *
- *  @param  handle      A UART_Handle
+ *  @param  uartHnd     A UART_Handle
  *
  *  @param  buffer      A pointer to buffer containing data to be written
  *
@@ -580,7 +580,7 @@ extern void UART_Params_init(UART_Params *params);
  *  @return Returns the number of bytes that have been written to the UART,
  *          UART_ERROR on an error.
  */
-extern int32_t UART_write(UART_Handle handle, const void *buffer, size_t size);
+extern int32_t UART_write(UART_Handle uartHnd, const void *buffer, size_t size);
 
 /*!
  *  @brief  Function that writes data to a UART
@@ -589,7 +589,7 @@ extern int32_t UART_write(UART_Handle handle, const void *buffer, size_t size);
  *
  *  UART_write will not return until all the data was written to the UART.
  *
- *  @param  handle      A UART_Handle
+ *  @param  uartHnd     A UART_Handle
  *
  *  @param  buffer      A pointer to buffer containing data to be written
  *
@@ -599,7 +599,7 @@ extern int32_t UART_write(UART_Handle handle, const void *buffer, size_t size);
  *  @return Returns the number of bytes that have been written to the UART,
  *          UART_ERROR on an error.
  */
-extern int32_t UART_writePolling(UART_Handle handle, const void *buffer,
+extern int32_t UART_writePolling(UART_Handle uartHnd, const void *buffer,
                              size_t size);
 
 /*!
@@ -677,7 +677,7 @@ extern void UART_readCancel(UART_Handle handle);
  *
  *  @param  handle      A UART_Handle
  *
- *  @param  transaction A pointer to a UART_Transaction. All of the fields within
+ *  @param  uartTrans   A pointer to a UART_Transaction. All of the fields within
  *                      transaction except UART_Transaction.count and
  *                      UART_Transaction.status are WO (write-only) unless
  *                      otherwise noted in the driver implementations. If a
@@ -692,7 +692,7 @@ extern void UART_readCancel(UART_Handle handle);
  *
  *  @return Returns UART_SUCCESS or UART_ERROR on an error.
  */
-extern int32_t UART_read2(UART_Handle handle, UART_Transaction *transaction);
+extern int32_t UART_read2(UART_Handle handle, UART_Transaction *uartTrans);
 
 /*!
  *  @brief  Extended function that writes data to a UART
@@ -707,7 +707,7 @@ extern int32_t UART_read2(UART_Handle handle, UART_Transaction *transaction);
  *
  *  @param  handle      A UART_Handle
  *
- *  @param  transaction A pointer to a UART_Transaction. All of the fields within
+ *  @param  uartTrans   A pointer to a UART_Transaction. All of the fields within
  *                      transaction except UART_Transaction.count and
  *                      UART_Transaction.status are WO (write-only) unless
  *                      otherwise noted in the driver implementations. If a
@@ -722,7 +722,7 @@ extern int32_t UART_read2(UART_Handle handle, UART_Transaction *transaction);
  *
  *  @return Returns UART_SUCCESS or UART_ERROR on an error.
  */
-extern int32_t UART_write2(UART_Handle handle, UART_Transaction *transaction);
+extern int32_t UART_write2(UART_Handle handle, UART_Transaction *uartTrans);
 
 /*!
  *  @brief  Function to initialize the UART_Transaction struct to its defaults
@@ -733,9 +733,9 @@ extern int32_t UART_write2(UART_Handle handle, UART_Transaction *transaction);
  *  count = 0;
  *  status = UART_TRANSFER_STATUS_SUCCESS;
  *
- *  @transaction  transaction parameter structure to initialize
+ *  @uartTrans    transaction parameter structure to initialize
  */
-extern void UART_transactionInit(UART_Transaction *transaction);
+extern void UART_transactionInit(UART_Transaction *uartTrans);
 
 #ifdef __cplusplus
 }
diff --git a/UART_stdio.h b/UART_stdio.h
index e5c709d..d74d3cf 100644
--- a/UART_stdio.h
+++ b/UART_stdio.h
@@ -203,7 +203,7 @@ uint8_t UART_getc(void);
 
 /**
  * \brief   This function initializes the specified UART instance for use for
- *          console operations , with a configuration specified by 'params'
+ *          console operations , with a configuration specified by 'uartParams'
  *
  * \param   uart instance ID.
  *
@@ -212,7 +212,7 @@ uint8_t UART_getc(void);
  * \return  None.
  *
  */
-void UART_stdioInit2(uint32_t instance,UART_Params *params);
+void UART_stdioInit2(uint32_t instance,UART_Params *uartParams);
 
 /**
  * \brief   This function initializes the specified UART instance for use for
diff --git a/src/UART_drv.c b/src/UART_drv.c
index 8d5191f..669f87b 100644
--- a/src/UART_drv.c
+++ b/src/UART_drv.c
@@ -113,7 +113,7 @@ void UART_init(void)
     if (UART_count == (-((int32_t)1))) {
         /* Call each driver's init function */
         for (UART_count = 0; UART_config[UART_count].fxnTablePtr != NULL; UART_count++) {
-            UART_config[UART_count].fxnTablePtr->initFxn((UART_Handle)&(UART_config[UART_count]));
+            UART_config[UART_count].fxnTablePtr->uartInitFxn((UART_Handle)&(UART_config[UART_count]));
         }
     }
 
diff --git a/src/v0/UART_v0.c b/src/v0/UART_v0.c
index acd9bde..a516cbb 100644
--- a/src/v0/UART_v0.c
+++ b/src/v0/UART_v0.c
@@ -887,13 +887,9 @@ static int32_t UART_write2_v0(UART_Handle handle, UART_Transaction * transaction
     SemaphoreP_Status   semStatus;
 
     /* Input parameter validation */
-    OSAL_Assert(!((handle != NULL) && (transaction != NULL)));
-
-    if (transaction->count == 0)
-    {
-        ret_val = UART_ERROR;
-    }
-    else
+    if ((handle != NULL)            &&
+        (transaction != NULL)       &&
+        (transaction->count != 0U))
     {
         /* Get the pointer to the hwAttrs */
         hwAttrs = (UART_HwAttrs const *)handle->hwAttrs;
@@ -1083,6 +1079,10 @@ static int32_t UART_write2_v0(UART_Handle handle, UART_Transaction * transaction
             transaction->status = UART_TRANSFER_STATUS_SUCCESS;
         }
     }
+    else
+    {
+        ret_val = UART_ERROR;
+    }
 
     return(ret_val);
 }
@@ -1411,13 +1411,9 @@ static int32_t UART_read2_v0(UART_Handle handle, UART_Transaction *transaction)
     SemaphoreP_Status   semStatus;
 
     /* Input parameter validation */
-    OSAL_Assert(!((handle != NULL) && (transaction != NULL)));
-
-    if (transaction->count == 0)
-    {
-        ret_val = UART_ERROR;
-    }
-    else
+    if ((handle != NULL)            &&
+        (transaction != NULL)       &&
+        (transaction->count != 0U))
     {
         /* Get the pointer to the hwAttrs */
         hwAttrs = (UART_HwAttrs const *)handle->hwAttrs;
@@ -1601,6 +1597,11 @@ static int32_t UART_read2_v0(UART_Handle handle, UART_Transaction *transaction)
            transaction->status = UART_TRANSFER_STATUS_SUCCESS;
         }
     }
+    else
+    {
+        ret_val = UART_ERROR;
+    }
+
     return(ret_val);
 }
 
diff --git a/src/v1/UART_v1.h b/src/v1/UART_v1.h
index 6b04c48..356c796 100644
--- a/src/v1/UART_v1.h
+++ b/src/v1/UART_v1.h
@@ -225,7 +225,7 @@ typedef struct UART_HWAttrs {
 
 } UART_HwAttrs;
 
-extern void UART_v1_callback(UART_Handle handle, bool readTrans);
+extern void UART_v1_callback(UART_Handle uartHnd, bool readTrans);
 
 #ifdef UART_DMA_ENABLE
 extern void UART_receiveDMA(UART_Handle handle, const void *buffer, size_t size);