From 739d88794a0b7c45cd4ae62277edf915bfc44ef4 Mon Sep 17 00:00:00 2001
From: dwf1m12 <d.w.flynn@soton.ac.uk>
Date: Thu, 11 Jan 2024 11:49:32 +0000
Subject: [PATCH] enhance getc from FT1248/UART to support adp test
---
software/common/retarget/uart_stdout.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/software/common/retarget/uart_stdout.c b/software/common/retarget/uart_stdout.c
index 17257a0..c7145f8 100644
--- a/software/common/retarget/uart_stdout.c
+++ b/software/common/retarget/uart_stdout.c
@@ -94,13 +94,9 @@ unsigned char UartPutc(unsigned char my_ch)
// Get a character
unsigned char UartGetc(void)
{
- if ((CMSDK_USRT2->CTRL & 1)==0) {
- while ((CMSDK_UART2->STATE & 2)==0);
- return (CMSDK_UART2->DATA);
- } else {
- while ((CMSDK_USRT2->STATE & 2)==0);
- return (CMSDK_USRT2->DATA);
- }
+ while (((CMSDK_UART2->STATE & 2)==0) & ((CMSDK_USRT2->STATE & 2)==0));
+ if ((CMSDK_UART2->STATE & 2)==2) return (CMSDK_UART2->DATA);
+ if ((CMSDK_USRT2->STATE & 2)==2) return (CMSDK_USRT2->DATA);
}
void UartEndSimulation(void)
--
GitLab