resync with FreeRTOS_iMX7D_1.0.1 GAColibri_iMX7_M4_FreeRTOS_V1.0.1_20160810

14 files changed, 61 insertions, 60 deletions

diff --git a/platform/devices/MCIMX7D/include/MCIMX7D_M4.h b/platform/devices/MCIMX7D/include/MCIMX7D_M4.h
index 7bb2f15..5d9ffe4 100644
--- a/platform/devices/MCIMX7D/include/MCIMX7D_M4.h
+++ b/platform/devices/MCIMX7D/include/MCIMX7D_M4.h
@@ -38892,8 +38892,8 @@ typedef struct {
 #define RDC_SEMAPHORE_GATE_GTFSM_MASK            0xFu
 #define RDC_SEMAPHORE_GATE_GTFSM_SHIFT           0
 #define RDC_SEMAPHORE_GATE_GTFSM(x)              (((uint8_t)(((uint8_t)(x))<<RDC_SEMAPHORE_GATE_GTFSM_SHIFT))&RDC_SEMAPHORE_GATE_GTFSM_MASK)
-#define RDC_SEMAPHORE_GATE_LDOM_MASK             0x60u
-#define RDC_SEMAPHORE_GATE_LDOM_SHIFT            5
+#define RDC_SEMAPHORE_GATE_LDOM_MASK             0x30u
+#define RDC_SEMAPHORE_GATE_LDOM_SHIFT            4
 #define RDC_SEMAPHORE_GATE_LDOM(x)               (((uint8_t)(((uint8_t)(x))<<RDC_SEMAPHORE_GATE_LDOM_SHIFT))&RDC_SEMAPHORE_GATE_LDOM_MASK)
 /* RSTGT_W Bit Fields */
 #define RDC_SEMAPHORE_RSTGT_W_RSTGDP_MASK        0xFFu
diff --git a/platform/drivers/inc/adc_imx7d.h b/platform/drivers/inc/adc_imx7d.h
index a3d4eba..5788259 100644
--- a/platform/drivers/inc/adc_imx7d.h
+++ b/platform/drivers/inc/adc_imx7d.h
@@ -45,14 +45,14 @@
  * Definitions
  ******************************************************************************/
 
-/*! @brief ADC module initialize structure. */
+/*! @brief ADC module initialization structure. */
 typedef struct _adc_init_config
 {
     uint32_t sampleRate;         /*!< The desired ADC sample rate.*/
     bool     levelShifterEnable; /*!< The level shifter module configuration(Enable to power on ADC module).*/
 } adc_init_config_t;
 
-/*! @brief ADC logic channel initialize structure. */
+/*! @brief ADC logic channel initialization structure. */
 typedef struct _adc_logic_ch_init_config
 {
     uint32_t convertRate;      /*!< The continuous rate when continuous sample enabled.*/
@@ -153,10 +153,10 @@ extern "C" {
  */
 
 /*!
- * @brief Initialize ADC to reset state and initialize with initialize structure.
+ * @brief Initialize ADC to reset state and initialize with initialization structure.
  *
  * @param base ADC base pointer.
- * @param initConfig ADC initialize structure.
+ * @param initConfig ADC initialization structure.
  */
 void ADC_Init(ADC_Type* base, const adc_init_config_t* initConfig);
 
@@ -233,11 +233,11 @@ void ADC_SetPowerDownCmd(ADC_Type* base, bool powerDown);
  */
 
 /*!
- * @brief Initialize ADC Logic channel with initialize structure.
+ * @brief Initialize ADC Logic channel with initialization structure.
  *
  * @param base ADC base pointer.
  * @param logicCh ADC module logic channel selection (see @ref _adc_logic_ch_selection enumeration).
- * @param chInitConfig ADC logic channel initialize structure.
+ * @param chInitConfig ADC logic channel initialization structure.
  */
 void ADC_LogicChInit(ADC_Type* base, uint8_t logicCh, const adc_logic_ch_init_config_t* chInitConfig);
 
@@ -315,8 +315,8 @@ void ADC_TriggerSingleConvert(ADC_Type* base, uint8_t logicCh);
 
 /*!
  * @brief Stop current convert on target logic channel.
- *        For logic channel A ~ D, current conversion will stop immediately.
- *        For Software channel, this function will be waited until current conversion finished.
+ *        For logic channel A ~ D, current conversion stops immediately.
+ *        For Software channel, this function is waited until current conversion is finished.
  * @param base ADC base pointer.
  * @param logicCh ADC module logic channel selection (see @ref _adc_logic_ch_selection enumeration).
  */
diff --git a/platform/drivers/inc/ccm_analog_imx7d.h b/platform/drivers/inc/ccm_analog_imx7d.h
index 0b5f2a1..1af5baa 100644
--- a/platform/drivers/inc/ccm_analog_imx7d.h
+++ b/platform/drivers/inc/ccm_analog_imx7d.h
@@ -262,7 +262,7 @@ static inline void CCM_ANALOG_DisablePllClock(CCM_ANALOG_Type * base, uint32_t p
  * @brief Get ARM PLL clock frequency
  *
  * @param base CCM_ANALOG base pointer.
- * @return ARM PLL clock frequency in HZ
+ * @return ARM PLL clock frequency in Hz
  */
 uint32_t CCM_ANALOG_GetArmPllFreq(CCM_ANALOG_Type * base);
 
@@ -270,7 +270,7 @@ uint32_t CCM_ANALOG_GetArmPllFreq(CCM_ANALOG_Type * base);
  * @brief Get System PLL (PLL_480) clock frequency
  *
  * @param base CCM_ANALOG base pointer.
- * @return System PLL clock frequency in HZ
+ * @return System PLL clock frequency in Hz
  */
 uint32_t CCM_ANALOG_GetSysPllFreq(CCM_ANALOG_Type * base);
 
@@ -278,7 +278,7 @@ uint32_t CCM_ANALOG_GetSysPllFreq(CCM_ANALOG_Type * base);
  * @brief Get DDR PLL clock frequency
  *
  * @param base CCM_ANALOG base pointer.
- * @return DDR PLL clock frequency in HZ
+ * @return DDR PLL clock frequency in Hz
  */
 uint32_t CCM_ANALOG_GetDdrPllFreq(CCM_ANALOG_Type * base);
 
@@ -286,7 +286,7 @@ uint32_t CCM_ANALOG_GetDdrPllFreq(CCM_ANALOG_Type * base);
  * @brief Get ENET PLL clock frequency
  *
  * @param base CCM_ANALOG base pointer.
- * @return ENET PLL clock frequency in HZ
+ * @return ENET PLL clock frequency in Hz
  */
 uint32_t CCM_ANALOG_GetEnetPllFreq(CCM_ANALOG_Type * base);
 
@@ -294,7 +294,7 @@ uint32_t CCM_ANALOG_GetEnetPllFreq(CCM_ANALOG_Type * base);
  * @brief Get Audio PLL clock frequency
  *
  * @param base CCM_ANALOG base pointer.
- * @return Audio PLL clock frequency in HZ
+ * @return Audio PLL clock frequency in Hz
  */
 uint32_t CCM_ANALOG_GetAudioPllFreq(CCM_ANALOG_Type * base);
 
@@ -302,7 +302,7 @@ uint32_t CCM_ANALOG_GetAudioPllFreq(CCM_ANALOG_Type * base);
  * @brief Get Video PLL clock frequency
  *
  * @param base CCM_ANALOG base pointer.
- * @return Video PLL clock frequency in HZ
+ * @return Video PLL clock frequency in Hz
  */
 uint32_t CCM_ANALOG_GetVideoPllFreq(CCM_ANALOG_Type * base);
 
@@ -380,7 +380,7 @@ static inline uint32_t CCM_ANALOG_GetPfdFrac(CCM_ANALOG_Type * base, uint32_t pf
  *
  * @param base CCM_ANALOG base pointer.
  * @param pfdFrac PFD clock fraction (see @ref _ccm_analog_pfd_frac enumeration)
- * @return PFD clock frequency in HZ
+ * @return PFD clock frequency in Hz
  */
 uint32_t CCM_ANALOG_GetPfdFreq(CCM_ANALOG_Type * base, uint32_t pfdFrac);
 
diff --git a/platform/drivers/inc/ccm_imx7d.h b/platform/drivers/inc/ccm_imx7d.h
index cc4d88f..0889718 100644
--- a/platform/drivers/inc/ccm_imx7d.h
+++ b/platform/drivers/inc/ccm_imx7d.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Freescale Semiconductor, Inc.
+ * Copyright (c) 2015-2016, Freescale Semiconductor, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -53,7 +53,7 @@
 /*! @brief Root control names for root clock setting. */
 enum _ccm_root_control
 {
-    ccmRootM4     = (uint32_t)(&CCM_TARGET_ROOT1),   /*!< M4 Clock control name.*/
+    ccmRootM4     = (uint32_t)(&CCM_TARGET_ROOT1),   /*!< ARM Cortex-M4 Clock control name.*/
     ccmRootAxi    = (uint32_t)(&CCM_TARGET_ROOT16),  /*!< AXI Clock control name.*/
     ccmRootAhb    = (uint32_t)(&CCM_TARGET_ROOT32),  /*!< AHB Clock control name.*/
     ccmRootIpg    = (uint32_t)(&CCM_TARGET_ROOT33),  /*!< IPG Clock control name.*/
@@ -87,14 +87,14 @@ enum _ccm_root_control
 /*! @brief Clock source enumeration for ARM Cortex-M4 core. */
 enum _ccm_rootmux_m4
 {
-    ccmRootmuxM4Osc24m      = 0U, /*!< M4 Clock from OSC 24M.*/
-    ccmRootmuxM4SysPllDiv2  = 1U, /*!< M4 Clock from SYSTEM PLL divided by 2.*/
-    ccmRootmuxM4EnetPll250m = 2U, /*!< M4 Clock from Ethernet PLL 250M.*/
-    ccmRootmuxM4SysPllPfd2  = 3U, /*!< M4 Clock from SYSTEM PLL PFD2.*/
-    ccmRootmuxM4DdrPllDiv2  = 4U, /*!< M4 Clock from DDR PLL divided by 2.*/
-    ccmRootmuxM4AudioPll    = 5U, /*!< M4 Clock from AUDIO PLL.*/
-    ccmRootmuxM4VideoPll    = 6U, /*!< M4 Clock from VIDEO PLL.*/
-    ccmRootmuxM4UsbPll      = 7U, /*!< M4 Clock from USB PLL.*/
+    ccmRootmuxM4Osc24m      = 0U, /*!< ARM Cortex-M4 Clock from OSC 24M.*/
+    ccmRootmuxM4SysPllDiv2  = 1U, /*!< ARM Cortex-M4 Clock from SYSTEM PLL divided by 2.*/
+    ccmRootmuxM4EnetPll250m = 2U, /*!< ARM Cortex-M4 Clock from Ethernet PLL 250M.*/
+    ccmRootmuxM4SysPllPfd2  = 3U, /*!< ARM Cortex-M4 Clock from SYSTEM PLL PFD2.*/
+    ccmRootmuxM4DdrPllDiv2  = 4U, /*!< ARM Cortex-M4 Clock from DDR PLL divided by 2.*/
+    ccmRootmuxM4AudioPll    = 5U, /*!< ARM Cortex-M4 Clock from AUDIO PLL.*/
+    ccmRootmuxM4VideoPll    = 6U, /*!< ARM Cortex-M4 Clock from VIDEO PLL.*/
+    ccmRootmuxM4UsbPll      = 7U, /*!< ARM Cortex-M4 Clock from USB PLL.*/
 };
 
 /*! @brief Clock source enumeration for AXI bus. */
@@ -274,6 +274,7 @@ enum _ccm_pll_gate
 /*! @brief CCM CCGR gate control. */
 enum _ccm_ccgr_gate
 {
+    ccmCcgrGateSimWakeup = (uint32_t)(&CCM_CCGR9),   /*!< Wakeup Mix Bus Clock Gate.*/
     ccmCcgrGateIpmux1    = (uint32_t)(&CCM_CCGR10),  /*!< IOMUX1 Clock Gate.*/
     ccmCcgrGateIpmux2    = (uint32_t)(&CCM_CCGR11),  /*!< IOMUX2 Clock Gate.*/
     ccmCcgrGateIpmux3    = (uint32_t)(&CCM_CCGR12),  /*!< IPMUX3 Clock Gate.*/
diff --git a/platform/drivers/inc/ecspi.h b/platform/drivers/inc/ecspi.h
index 151472b..952ae14 100644
--- a/platform/drivers/inc/ecspi.h
+++ b/platform/drivers/inc/ecspi.h
@@ -172,7 +172,7 @@ extern "C" {
  * @brief Initializes the eCSPI module.
  *
  * @param base eCSPI base pointer.
- * @param initConfig eCSPI initialize structure.
+ * @param initConfig eCSPI initialization structure.
  */
 void ECSPI_Init(ECSPI_Type* base, const ecspi_init_config_t* initConfig);
 
@@ -411,7 +411,7 @@ static inline uint32_t ECSPI_GetTxfifoCounter(ECSPI_Type* base)
  *               - true: Enable specified DMA Source.
  *               - false: Disable specified DMA Source.
  */
-void ECSPPI_SetDMACmd(ECSPI_Type* base, uint32_t source, bool enable);
+void ECSPI_SetDMACmd(ECSPI_Type* base, uint32_t source, bool enable);
 
 /*!
   * @brief Set the burst length of a DMA operation.
diff --git a/platform/drivers/inc/flexcan.h b/platform/drivers/inc/flexcan.h
index 016952b..b787ab2 100644
--- a/platform/drivers/inc/flexcan.h
+++ b/platform/drivers/inc/flexcan.h
@@ -86,7 +86,7 @@ enum _flexcan_msgbuf_code_tx
 /*! @brief FlexCAN operation modes. */
 enum _flexcan_operatining_modes
 {
-    flexCanNormalMode     = 0x1, /*!< Normal mode or user mode @internal gui name="Normal". */
+    flexcanNormalMode     = 0x1, /*!< Normal mode or user mode @internal gui name="Normal". */
     flexcanListenOnlyMode = 0x2, /*!< Listen-only mode @internal gui name="Listen-only". */
     flexcanLoopBackMode   = 0x4, /*!< Loop-back mode @internal gui name="Loop back". */
 };
@@ -169,7 +169,7 @@ enum _flexcan_rx_fifo_filter_id_number
 };
 
 /*! @brief FlexCAN RX FIFO ID filter table structure. */
-typedef struct FLEXCANIdTable
+typedef struct _flexcan_id_table
 {
     uint32_t *idFilter;   /*!< Rx FIFO ID filter elements. */
     bool isRemoteFrame;   /*!< Remote frame. */
@@ -189,9 +189,9 @@ typedef struct _flexcan_msgbuf
             uint32_t rtr       : 1;
             uint32_t ide       : 1;
             uint32_t srr       : 1;
-            uint32_t reverse1  : 1;
+            uint32_t reserved1 : 1;
             uint32_t code      : 4;
-            uint32_t reverse2  : 4;
+            uint32_t reserved2 : 4;
         };
     };
 
@@ -241,7 +241,7 @@ typedef struct _flexcan_timing
     uint32_t propSeg;    /*!< Propagation segment. */
 } flexcan_timing_t;
 
-/*! @brief FlexCAN module initialize structure. */
+/*! @brief FlexCAN module initialization structure. */
 typedef struct _flexcan_init_config
 {
     flexcan_timing_t timing;        /*!< Desired FlexCAN module timing configuration. */
@@ -263,10 +263,10 @@ extern "C" {
  */
 
 /*!
- * @brief Initialize FlexCAN module with given initialize structure.
+ * @brief Initialize FlexCAN module with given initialization structure.
  *
  * @param base CAN base pointer.
- * @param initConfig CAN initialize structure (see @ref flexcan_init_config_t structure).
+ * @param initConfig CAN initialization structure (see @ref flexcan_init_config_t structure).
  */
 void FLEXCAN_Init(CAN_Type* base, const flexcan_init_config_t* initConfig);
 
diff --git a/platform/drivers/inc/i2c_imx.h b/platform/drivers/inc/i2c_imx.h
index 566c70a..f5a2d2a 100644
--- a/platform/drivers/inc/i2c_imx.h
+++ b/platform/drivers/inc/i2c_imx.h
@@ -45,7 +45,7 @@
  * Definitions
  ******************************************************************************/
 
-/*! @brief I2C module initialize structure. */
+/*! @brief I2C module initialization structure. */
 typedef struct _i2c_init_config
 {
     uint32_t clockRate;    /*!< Current I2C module clock freq. */
@@ -93,10 +93,10 @@ extern "C" {
  */
 
 /*!
- * @brief Initialize I2C module with given initialize structure.
+ * @brief Initialize I2C module with given initialization structure.
  *
  * @param base I2C base pointer.
- * @param initConfig I2C initialize structure (see @ref i2c_init_config_t).
+ * @param initConfig I2C initialization structure (see @ref i2c_init_config_t).
  */
 void I2C_Init(I2C_Type* base, const i2c_init_config_t* initConfig);
 
diff --git a/platform/drivers/inc/rdc_defs_imx7d.h b/platform/drivers/inc/rdc_defs_imx7d.h
index e77990f..294d0ad 100644
--- a/platform/drivers/inc/rdc_defs_imx7d.h
+++ b/platform/drivers/inc/rdc_defs_imx7d.h
@@ -43,9 +43,9 @@
 /*! @brief RDC master assignment. */
 enum _rdc_mda
 {
-    rdcMdaA7          = 0U,  /*!< A7 RDC Master. */
-    rdcMdaM4          = 1U,  /*!< M4 RDC Master. */
-    rdcMdaPcie        = 2U,  /*!< PCIE RDC Master. */
+    rdcMdaA7          = 0U,  /*!< ARM Cortex-A7 RDC Master. */
+    rdcMdaM4          = 1U,  /*!< ARM Cortex-M4 RDC Master. */
+    rdcMdaPcie        = 2U,  /*!< PCIe RDC Master. */
     rdcMdaCsi         = 3U,  /*!< CSI RDC Master. */
     rdcMdaEpdc        = 4U,  /*!< EPDC RDC Master. */
     rdcMdaLcdif       = 5U,  /*!< LCDIF RDC Master. */
diff --git a/platform/drivers/inc/sema4.h b/platform/drivers/inc/sema4.h
index cd04c14..ff77185 100644
--- a/platform/drivers/inc/sema4.h
+++ b/platform/drivers/inc/sema4.h
@@ -266,7 +266,6 @@ static inline uint16_t SEMA4_GetIntEnabled(SEMA4_Type * base, uint16_t flags)
 
 /*@}*/
 
-
 #if defined(__cplusplus)
 }
 #endif
diff --git a/platform/drivers/inc/uart_imx.h b/platform/drivers/inc/uart_imx.h
index bb204ab..1719124 100644
--- a/platform/drivers/inc/uart_imx.h
+++ b/platform/drivers/inc/uart_imx.h
@@ -45,7 +45,7 @@
  * Definitions
  ******************************************************************************/
 
-/*! @brief Uart module initialize structure. */
+/*! @brief Uart module initialization structure. */
 typedef struct _uart_init_config
 {
     uint32_t clockRate;  /*!< Current UART module clock freq. */
@@ -220,10 +220,10 @@ extern "C" {
  */
 
 /*!
- * @brief Initialize UART module with given initialize structure.
+ * @brief Initialize UART module with given initialization structure.
  *
  * @param base UART base pointer.
- * @param initConfig UART initialize structure (see @ref uart_init_config_t structure above).
+ * @param initConfig UART initialization structure (see @ref uart_init_config_t structure above).
  */
 void UART_Init(UART_Type* base, const uart_init_config_t* initConfig);
 
@@ -533,7 +533,7 @@ static inline void UART_SetCtsTriggerLevel(UART_Type* base, uint8_t triggerLevel
 }
 
 /*!
- * @brief This function is used to set the role(DTE/DCE) of UART module
+ * @brief This function is used to set the role (DTE/DCE) of UART module
  *        in RS-232 communication.
  *
  * @param base UART base pointer.
@@ -605,7 +605,7 @@ void UART_SetRiPinLevel(UART_Type* base, bool active);
  * @param base UART base pointer.
  * @param data Data(9 bits) to be set through UART module.
  */
-void UAER_Putchar9(UART_Type* base, uint16_t data);
+void UART_Putchar9(UART_Type* base, uint16_t data);
 
 /*!
  * @brief This functions is used to receive 9 Bits length data in
@@ -614,7 +614,7 @@ void UAER_Putchar9(UART_Type* base, uint16_t data);
  * @param base UART base pointer.
  * @return The data(9 bits) received from UART module.
  */
-uint16_t UAER_Getchar9(UART_Type* base);
+uint16_t UART_Getchar9(UART_Type* base);
 
 /*!
  * @brief This function is used to set the enable condition of 
diff --git a/platform/drivers/src/ecspi.c b/platform/drivers/src/ecspi.c
index cfba518..2a3a0c1 100644
--- a/platform/drivers/src/ecspi.c
+++ b/platform/drivers/src/ecspi.c
@@ -152,11 +152,11 @@ uint32_t ECSPI_SetBaudRate(ECSPI_Type* base, uint32_t sourceClockInHz, uint32_t
  ******************************************************************************/
 /*FUNCTION**********************************************************************
  *
- * Function Name : ECSPPI_SetDMACmd
+ * Function Name : ECSPI_SetDMACmd
  * Description   : Enable or disable the specified DMA Source.
  *
  *END**************************************************************************/
-void ECSPPI_SetDMACmd(ECSPI_Type* base, uint32_t source, bool enable)
+void ECSPI_SetDMACmd(ECSPI_Type* base, uint32_t source, bool enable)
 {
     /* Configure the DAM source */
     if(enable)
diff --git a/platform/drivers/src/flexcan.c b/platform/drivers/src/flexcan.c
index 2fb1d16..bd9290a 100644
--- a/platform/drivers/src/flexcan.c
+++ b/platform/drivers/src/flexcan.c
@@ -257,14 +257,14 @@ void FLEXCAN_SetTiming(CAN_Type* base, const flexcan_timing_t* timing)
  *END**************************************************************************/
 void FLEXCAN_SetOperatingMode(CAN_Type* base, uint8_t mode)
 {
-    assert((mode & flexCanNormalMode) ||
+    assert((mode & flexcanNormalMode) ||
            (mode & flexcanListenOnlyMode) ||
            (mode & flexcanLoopBackMode));
 
     /* Assert Freeze mode*/
     FLEXCAN_EnterFreezeMode(base);
 
-    if (mode & flexCanNormalMode)
+    if (mode & flexcanNormalMode)
         CAN_MCR_REG(base) &= ~CAN_MCR_SUPV_MASK;
     else
         CAN_MCR_REG(base) |= CAN_MCR_SUPV_MASK;
diff --git a/platform/drivers/src/uart_imx.c b/platform/drivers/src/uart_imx.c
index 0f78265..f60ce9f 100644
--- a/platform/drivers/src/uart_imx.c
+++ b/platform/drivers/src/uart_imx.c
@@ -370,8 +370,8 @@ void UART_SetCtsFlowCtrlCmd(UART_Type* base, bool enable)
  * Function Name : UART_SetCtsPinLevel
  * Description   : This function is used to control the CTS_B pin state when 
  *                 auto CTS control is disabled.
- *                 The CTS_B pin is low(active)
- *                 The CTS_B pin is high(inactive)
+ *                 The CTS_B pin is low (active)
+ *                 The CTS_B pin is high (inactive)
  *
  *END**************************************************************************/
 void UART_SetCtsPinLevel(UART_Type* base, bool active)
@@ -392,6 +392,7 @@ void UART_SetCtsPinLevel(UART_Type* base, bool active)
 void UART_SetModemMode(UART_Type* base, uint32_t mode)
 {
     assert((mode == uartModemModeDce) || (mode == uartModemModeDte));
+
     if (uartModemModeDce == mode)
         UART_UFCR_REG(base) &= ~UART_UFCR_DCEDTE_MASK;
     else
@@ -449,12 +450,12 @@ void UART_SetRiPinLevel(UART_Type* base, bool active)
  ******************************************************************************/
 /*FUNCTION**********************************************************************
  *
- * Function Name : UAER_Putchar9
+ * Function Name : UART_Putchar9
  * Description   : This function is used to send 9 Bits length data in
  *                 RS-485 Multidrop mode.
  *
  *END**************************************************************************/
-void UAER_Putchar9(UART_Type* base, uint16_t data)
+void UART_Putchar9(UART_Type* base, uint16_t data)
 {
     assert(data <= 0x1FF);
 
@@ -467,12 +468,12 @@ void UAER_Putchar9(UART_Type* base, uint16_t data)
 
 /*FUNCTION**********************************************************************
  *
- * Function Name : UAER_Getchar9
+ * Function Name : UART_Getchar9
  * Description   : This functions is used to receive 9 Bits length data in
  *                 RS-485 Multidrop mode.
  *
  *END**************************************************************************/
-uint16_t UAER_Getchar9(UART_Type* base)
+uint16_t UART_Getchar9(UART_Type* base)
 {
     uint16_t rxData = UART_URXD_REG(base);
 
diff --git a/platform/utilities/inc/debug_console_imx.h b/platform/utilities/inc/debug_console_imx.h
index 6779e67..75e6e88 100644
--- a/platform/utilities/inc/debug_console_imx.h
+++ b/platform/utilities/inc/debug_console_imx.h
@@ -44,7 +44,7 @@
  ******************************************************************************/
 #define IO_MAXLINE  20
 
-/*! @brief Configuration for toolchain's printf/scanf or Freescale version printf/scanf */
+/*! @brief Configuration for toolchain's printf/scanf or NXP version printf/scanf */
 #define PRINTF          debug_printf
 //#define PRINTF          printf
 #define SCANF           debug_scanf