ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12052 from yarbcy/pr/fix-for-arm-issue-11860 

fpga tests: clear uart fix

Fixes  #11860 (correction from the commit msg)
pull/12081/head
Martin Kojtal 2019-12-11 08:05:53 +01:00 committed by GitHub
parent 06da49984f a79b1b3369
commit f2701463ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp
View File

@ -133,6 +133,9 @@ static void uart_test_common(int baudrate, int data_bits, SerialParity parity, i
serial_set_flow_control_direct(&serial, FlowControlRTSCTS, &pinmap); serial_set_flow_control_direct(&serial, FlowControlRTSCTS, &pinmap);
#else #else
//skip this test case if static pinmap is not supported //skip this test case if static pinmap is not supported
// Cleanup uart to be able execute next test case
serial_free(&serial);
tester.reset();
return; return;
#endif #endif
} else { } else {

2
targets/TARGET_Cypress/TARGET_PSOC6/psoc6csp/hal/src/cyhal_uart.c
View File

@ -720,10 +720,12 @@ void cyhal_uart_enable_event(cyhal_uart_t *obj, cyhal_uart_event_t event, uint8_
obj->irq_cause &= ~event; obj->irq_cause &= ~event;
if (event & CYHAL_UART_IRQ_RX_NOT_EMPTY) if (event & CYHAL_UART_IRQ_RX_NOT_EMPTY)
{ {
Cy_SCB_ClearRxInterrupt(obj->base, CY_SCB_RX_INTR_NOT_EMPTY);
Cy_SCB_SetRxInterruptMask(obj->base, Cy_SCB_GetRxInterruptMask(obj->base) & ~CY_SCB_RX_INTR_NOT_EMPTY); Cy_SCB_SetRxInterruptMask(obj->base, Cy_SCB_GetRxInterruptMask(obj->base) & ~CY_SCB_RX_INTR_NOT_EMPTY);
} }
if (event & CYHAL_UART_IRQ_TX_EMPTY) if (event & CYHAL_UART_IRQ_TX_EMPTY)
{ {
Cy_SCB_ClearTxInterrupt(obj->base, CY_SCB_UART_TX_EMPTY);
Cy_SCB_SetTxInterruptMask(obj->base, Cy_SCB_GetTxInterruptMask(obj->base) & ~CY_SCB_UART_TX_EMPTY); Cy_SCB_SetTxInterruptMask(obj->base, Cy_SCB_GetTxInterruptMask(obj->base) & ~CY_SCB_UART_TX_EMPTY);
} }
} }