commit 9f316c246baafa15c542a5aea81a94f26e3d6507

[freertos] / FreeRTOS / Demo / CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso / NXP_Code / component / uart / usart_adapter.c

diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/NXP_Code/component/uart/usart_adapter.c b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/NXP_Code/component/uart/usart_adapter.c
index 19fc78c784f1007ee08fe825a6f79d82d5968a1d..228d90b2586983475c7d1fe123e915efb13d64fe 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/NXP_Code/component/uart/usart_adapter.c
+++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/NXP_Code/component/uart/usart_adapter.c
@@ -65,10 +65,9 @@ static USART_Type *const s_UsartAdapterBase[] = USART_BASE_PTRS;
 \r
 #if (defined(UART_ADAPTER_NON_BLOCKING_MODE) && (UART_ADAPTER_NON_BLOCKING_MODE > 0U))\r
 \r
+#if !(defined(HAL_UART_TRANSFER_MODE) && (HAL_UART_TRANSFER_MODE > 0U))\r
 /* Array of USART IRQ number. */\r
 static const IRQn_Type s_UsartIRQ[] = USART_IRQS;\r
-\r
-#if !(defined(HAL_UART_TRANSFER_MODE) && (HAL_UART_TRANSFER_MODE > 0U))\r
 #endif\r
 \r
 #endif\r
@@ -177,9 +176,9 @@ static void HAL_UartInterruptHandle(USART_Type *base, void *handle)
             {\r
                 USART_DisableInterrupts(s_UsartAdapterBase[instance],\r
                                         USART_FIFOINTENCLR_RXLVL_MASK | USART_FIFOINTENCLR_RXERR_MASK);\r
+                uartHandle->rx.buffer = NULL;\r
                 if (uartHandle->callback)\r
                 {\r
-                    uartHandle->rx.buffer = NULL;\r
                     uartHandle->callback(uartHandle, kStatus_HAL_UartRxIdle, uartHandle->callbackParam);\r
                 }\r
             }\r
@@ -196,9 +195,9 @@ static void HAL_UartInterruptHandle(USART_Type *base, void *handle)
             if (uartHandle->tx.bufferSofar >= uartHandle->tx.bufferLength)\r
             {\r
                 USART_DisableInterrupts(s_UsartAdapterBase[instance], USART_FIFOINTENCLR_TXLVL_MASK);\r
+                uartHandle->tx.buffer = NULL;\r
                 if (uartHandle->callback)\r
                 {\r
-                    uartHandle->tx.buffer = NULL;\r
                     uartHandle->callback(uartHandle, kStatus_HAL_UartTxIdle, uartHandle->callbackParam);\r
                 }\r
             }\r
@@ -252,8 +251,8 @@ hal_uart_status_t HAL_UartInit(hal_uart_handle_t handle, hal_uart_config_t *conf
     {\r
         usartConfig.stopBitCount = kUSART_OneStopBit;\r
     }\r
-    usartConfig.enableRx = config->enableRx;\r
-    usartConfig.enableTx = config->enableTx;\r
+    usartConfig.enableRx    = config->enableRx;\r
+    usartConfig.enableTx    = config->enableTx;\r
     usartConfig.txWatermark = kUSART_TxFifo0;\r
     usartConfig.rxWatermark = kUSART_RxFifo1;\r
 \r
@@ -264,7 +263,7 @@ hal_uart_status_t HAL_UartInit(hal_uart_handle_t handle, hal_uart_config_t *conf
         return HAL_UartGetStatus(status);\r
     }\r
 \r
-    uartHandle = (hal_uart_state_t *)handle;\r
+    uartHandle           = (hal_uart_state_t *)handle;\r
     uartHandle->instance = config->instance;\r
 \r
 #if (defined(UART_ADAPTER_NON_BLOCKING_MODE) && (UART_ADAPTER_NON_BLOCKING_MODE > 0U))\r
@@ -276,6 +275,7 @@ hal_uart_status_t HAL_UartInit(hal_uart_handle_t handle, hal_uart_config_t *conf
     /* Enable interrupt in NVIC. */\r
     FLEXCOMM_SetIRQHandler(s_UsartAdapterBase[config->instance], (flexcomm_irq_handler_t)HAL_UartInterruptHandle,\r
                            handle);\r
+    NVIC_SetPriority((IRQn_Type)s_UsartIRQ[config->instance], HAL_UART_ISR_PRIORITY);\r
     EnableIRQ(s_UsartIRQ[config->instance]);\r
 #endif\r
 \r
@@ -340,6 +340,20 @@ hal_uart_status_t HAL_UartSendBlocking(hal_uart_handle_t handle, const uint8_t *
     return kStatus_HAL_UartSuccess;\r
 }\r
 \r
+hal_uart_status_t HAL_UartEnterLowpower(hal_uart_handle_t handle)\r
+{\r
+    assert(handle);\r
+\r
+    return kStatus_HAL_UartSuccess;\r
+}\r
+\r
+hal_uart_status_t HAL_UartExitLowpower(hal_uart_handle_t handle)\r
+{\r
+    assert(handle);\r
+\r
+    return kStatus_HAL_UartSuccess;\r
+}\r
+\r
 #if (defined(UART_ADAPTER_NON_BLOCKING_MODE) && (UART_ADAPTER_NON_BLOCKING_MODE > 0U))\r
 \r
 #if (defined(HAL_UART_TRANSFER_MODE) && (HAL_UART_TRANSFER_MODE > 0U))\r
@@ -356,7 +370,7 @@ hal_uart_status_t HAL_UartTransferInstallCallback(hal_uart_handle_t handle,
     uartHandle = (hal_uart_state_t *)handle;\r
 \r
     uartHandle->callbackParam = callbackParam;\r
-    uartHandle->callback = callback;\r
+    uartHandle->callback      = callback;\r
 \r
     return kStatus_HAL_UartSuccess;\r
 }\r
@@ -465,7 +479,7 @@ hal_uart_status_t HAL_UartInstallCallback(hal_uart_handle_t handle,
     uartHandle = (hal_uart_state_t *)handle;\r
 \r
     uartHandle->callbackParam = callbackParam;\r
-    uartHandle->callback = callback;\r
+    uartHandle->callback      = callback;\r
 \r
     return kStatus_HAL_UartSuccess;\r
 }\r
@@ -486,13 +500,13 @@ hal_uart_status_t HAL_UartReceiveNonBlocking(hal_uart_handle_t handle, uint8_t *
     }\r
 \r
     uartHandle->rx.bufferLength = length;\r
-    uartHandle->rx.bufferSofar = 0;\r
-    uartHandle->rx.buffer = data;\r
+    uartHandle->rx.bufferSofar  = 0;\r
+    uartHandle->rx.buffer       = data;\r
     USART_EnableInterrupts(s_UsartAdapterBase[uartHandle->instance], USART_FIFOINTENSET_RXLVL_MASK);\r
     return kStatus_HAL_UartSuccess;\r
 }\r
 \r
-hal_uart_status_t HAL_UartSendNonBlocking(hal_uart_handle_t handle, const uint8_t *data, size_t length)\r
+hal_uart_status_t HAL_UartSendNonBlocking(hal_uart_handle_t handle, uint8_t *data, size_t length)\r
 {\r
     hal_uart_state_t *uartHandle;\r
     assert(handle);\r
@@ -507,41 +521,41 @@ hal_uart_status_t HAL_UartSendNonBlocking(hal_uart_handle_t handle, const uint8_
         return kStatus_HAL_UartTxBusy;\r
     }\r
     uartHandle->tx.bufferLength = length;\r
-    uartHandle->tx.bufferSofar = 0;\r
-    uartHandle->tx.buffer = (volatile uint8_t *)data;\r
+    uartHandle->tx.bufferSofar  = 0;\r
+    uartHandle->tx.buffer       = (volatile uint8_t *)data;\r
     USART_EnableInterrupts(s_UsartAdapterBase[uartHandle->instance], USART_FIFOINTENSET_TXLVL_MASK);\r
     return kStatus_HAL_UartSuccess;\r
 }\r
 \r
-hal_uart_status_t HAL_UartGetReceiveCount(hal_uart_handle_t handle, uint32_t *count)\r
+hal_uart_status_t HAL_UartGetReceiveCount(hal_uart_handle_t handle, uint32_t *reCount)\r
 {\r
     hal_uart_state_t *uartHandle;\r
     assert(handle);\r
-    assert(count);\r
+    assert(reCount);\r
     assert(!HAL_UART_TRANSFER_MODE);\r
 \r
     uartHandle = (hal_uart_state_t *)handle;\r
 \r
     if (uartHandle->rx.buffer)\r
     {\r
-        *count = uartHandle->rx.bufferSofar;\r
+        *reCount = uartHandle->rx.bufferSofar;\r
         return kStatus_HAL_UartSuccess;\r
     }\r
     return kStatus_HAL_UartError;\r
 }\r
 \r
-hal_uart_status_t HAL_UartGetSendCount(hal_uart_handle_t handle, uint32_t *count)\r
+hal_uart_status_t HAL_UartGetSendCount(hal_uart_handle_t handle, uint32_t *seCount)\r
 {\r
     hal_uart_state_t *uartHandle;\r
     assert(handle);\r
-    assert(count);\r
+    assert(seCount);\r
     assert(!HAL_UART_TRANSFER_MODE);\r
 \r
     uartHandle = (hal_uart_state_t *)handle;\r
 \r
     if (uartHandle->tx.buffer)\r
     {\r
-        *count = uartHandle->tx.bufferSofar;\r
+        *seCount = uartHandle->tx.bufferSofar;\r
         return kStatus_HAL_UartSuccess;\r
     }\r
     return kStatus_HAL_UartError;\r
@@ -599,6 +613,7 @@ void HAL_UartIsrFunction(hal_uart_handle_t handle)
 #endif\r
     USART_TransferHandleIRQ(s_UsartAdapterBase[uartHandle->instance], &uartHandle->hardwareHandle);\r
 #if 0\r
+    NVIC_SetPriority((IRQn_Type)s_UsartIRQ[uartHandle->instance], HAL_UART_ISR_PRIORITY);\r
     EnableIRQ(s_UsartIRQ[uartHandle->instance]);\r
 #endif\r
 }\r
@@ -618,6 +633,7 @@ void HAL_UartIsrFunction(hal_uart_handle_t handle)
 #endif\r
     HAL_UartInterruptHandle(s_UsartAdapterBase[uartHandle->instance], (void *)uartHandle);\r
 #if 0\r
+    NVIC_SetPriority((IRQn_Type)s_UsartIRQ[uartHandle->instance], HAL_UART_ISR_PRIORITY);\r
     EnableIRQ(s_UsartIRQ[uartHandle->instance]);\r
 #endif\r
 }\r