use new APBUART

2 files changed, 10 insertions, 4 deletions

diff --git a/bsps/include/grlib/apbuart.h b/bsps/include/grlib/apbuart.h
index 8eeb01f388..d2b7b12a41 100644
--- a/bsps/include/grlib/apbuart.h
+++ b/bsps/include/grlib/apbuart.h
@@ -61,7 +61,7 @@
 extern "C" {
 #endif
 
-/* Generated from spec:/dev/grlib/if/apbuart-inbyte-polled */
+/* Generated from spec:/dev/grlib/if/apbuart-inbyte-nonblocking */
 
 /**
  * @ingroup RTEMSDeviceGRLIBAPBUART
diff --git a/bsps/shared/grlib/uart/apbuart_polled.c b/bsps/shared/grlib/uart/apbuart_polled.c
index 80213433bb..f877d00cb0 100644
--- a/bsps/shared/grlib/uart/apbuart_polled.c
+++ b/bsps/shared/grlib/uart/apbuart_polled.c
@@ -55,12 +55,18 @@ void apbuart_outbyte_polled( apbuart *regs, char ch)
 
 int apbuart_inbyte_nonblocking( apbuart *regs )
 {
+  uint32_t status;
+
+  status = grlib_load_32( &regs->status );
+
   /* Clear errors, writes to non-error flags are ignored */
-  grlib_store_32( &regs->status, 0 );
+  status &= ~( APBUART_STATUS_FE | APBUART_STATUS_PE | APBUART_STATUS_OV |
+    APBUART_STATUS_BR );
+  grlib_store_32( &regs->status, status );
 
-  if ( ( grlib_load_32( &regs->status ) & APBUART_STATUS_DR ) == 0 ) {
+  if ( ( status & APBUART_STATUS_DR ) == 0 ) {
     return -1;
   }
 
-  return (uint8_t) grlib_load_32( &regs->data );
+  return (int) APBUART_DATA_DATA_GET( grlib_load_32( &regs->data ) );
 }