From dfdf7961e1756dd33f1eb5907c9c9a24fdac4b34 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 19 Sep 2011 07:01:02 +0000 Subject: [PATCH] 2011-09-19 Andrei Mozzhuhin PR 1915/libcpu * at91rm9200/usart/usart.c: Fixed polled read. --- c/src/lib/libcpu/arm/ChangeLog | 5 +++++ c/src/lib/libcpu/arm/at91rm9200/usart/usart.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/c/src/lib/libcpu/arm/ChangeLog b/c/src/lib/libcpu/arm/ChangeLog index 22da65f790..e8f5bb8321 100644 --- a/c/src/lib/libcpu/arm/ChangeLog +++ b/c/src/lib/libcpu/arm/ChangeLog @@ -1,3 +1,8 @@ +2011-09-19 Andrei Mozzhuhin + + PR 1915/libcpu + * at91rm9200/usart/usart.c: Fixed polled read. + 2011-07-13 Sebastian Huber PR 1832/libcpu diff --git a/c/src/lib/libcpu/arm/at91rm9200/usart/usart.c b/c/src/lib/libcpu/arm/at91rm9200/usart/usart.c index be2b6322e9..1fd035a37c 100644 --- a/c/src/lib/libcpu/arm/at91rm9200/usart/usart.c +++ b/c/src/lib/libcpu/arm/at91rm9200/usart/usart.c @@ -122,10 +122,10 @@ static int usart_read_polled(int minor) return -1; /* if nothing ready return -1 */ - if ( (usart->sr & US_IER_RXBUFF) == 0 ) + if ( (usart->sr & US_IER_RXRDY) == 0 ) return -1; - return usart->thr; + return usart->rhr; }