Message ID | 1374771574-7848-7-git-send-email-julien.grall@linaro.org |
---|---|
State | Superseded, archived |
Headers | show |
Why the rename? Also no S-o-b.. On Thu, 2013-07-25 at 17:59 +0100, Julien Grall wrote: > --- > xen/arch/arm/arm32/debug-exynos4210.inc | 2 +- > xen/include/asm-arm/exynos4210-uart.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/xen/arch/arm/arm32/debug-exynos4210.inc b/xen/arch/arm/arm32/debug-exynos4210.inc > index d746c35..5a5ff68 100644 > --- a/xen/arch/arm/arm32/debug-exynos4210.inc > +++ b/xen/arch/arm/arm32/debug-exynos4210.inc > @@ -56,7 +56,7 @@ > .macro early_uart_ready rb rc > 1: > ldr \rc, [\rb, #UTRSTAT] /* <- UTRSTAT (Flag register) */ > - tst \rc, #UTRSTAT_TX_EMPTY /* Check BUSY bit */ > + tst \rc, #UTRSTAT_TXFE /* Check BUSY bit */ Pls keep the comment aligned. > beq 1b /* Wait for the UART to be ready */ > .endm > > diff --git a/xen/include/asm-arm/exynos4210-uart.h b/xen/include/asm-arm/exynos4210-uart.h > index 330e1c0..bd9a4be 100644 > --- a/xen/include/asm-arm/exynos4210-uart.h > +++ b/xen/include/asm-arm/exynos4210-uart.h > @@ -87,7 +87,7 @@ > #define UFSTAT_RX_COUNT_MASK (0xff << UFSTAT_RX_COUNT_SHIFT) > > /* UTRSTAT */ > -#define UTRSTAT_TX_EMPTY (1 << 1) > +#define UTRSTAT_TXFE (1 << 1) > > /* URHX */ > #define URXH_DATA_MASK (0xff)
On 07/29/2013 05:27 PM, Ian Campbell wrote: > Why the rename? To avoid confusion with UTRSTAT_TXE (introduce on the next patch). The real name of this bit is UTRSTAT_TXFE. > Also no S-o-b.. Oh right. Will be add on the next patch series. > On Thu, 2013-07-25 at 17:59 +0100, Julien Grall wrote: >> --- >> xen/arch/arm/arm32/debug-exynos4210.inc | 2 +- >> xen/include/asm-arm/exynos4210-uart.h | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/xen/arch/arm/arm32/debug-exynos4210.inc b/xen/arch/arm/arm32/debug-exynos4210.inc >> index d746c35..5a5ff68 100644 >> --- a/xen/arch/arm/arm32/debug-exynos4210.inc >> +++ b/xen/arch/arm/arm32/debug-exynos4210.inc >> @@ -56,7 +56,7 @@ >> .macro early_uart_ready rb rc >> 1: >> ldr \rc, [\rb, #UTRSTAT] /* <- UTRSTAT (Flag register) */ >> - tst \rc, #UTRSTAT_TX_EMPTY /* Check BUSY bit */ >> + tst \rc, #UTRSTAT_TXFE /* Check BUSY bit */ > > Pls keep the comment aligned. > >> beq 1b /* Wait for the UART to be ready */ >> .endm >> >> diff --git a/xen/include/asm-arm/exynos4210-uart.h b/xen/include/asm-arm/exynos4210-uart.h >> index 330e1c0..bd9a4be 100644 >> --- a/xen/include/asm-arm/exynos4210-uart.h >> +++ b/xen/include/asm-arm/exynos4210-uart.h >> @@ -87,7 +87,7 @@ >> #define UFSTAT_RX_COUNT_MASK (0xff << UFSTAT_RX_COUNT_SHIFT) >> >> /* UTRSTAT */ >> -#define UTRSTAT_TX_EMPTY (1 << 1) >> +#define UTRSTAT_TXFE (1 << 1) >> >> /* URHX */ >> #define URXH_DATA_MASK (0xff) > >
diff --git a/xen/arch/arm/arm32/debug-exynos4210.inc b/xen/arch/arm/arm32/debug-exynos4210.inc index d746c35..5a5ff68 100644 --- a/xen/arch/arm/arm32/debug-exynos4210.inc +++ b/xen/arch/arm/arm32/debug-exynos4210.inc @@ -56,7 +56,7 @@ .macro early_uart_ready rb rc 1: ldr \rc, [\rb, #UTRSTAT] /* <- UTRSTAT (Flag register) */ - tst \rc, #UTRSTAT_TX_EMPTY /* Check BUSY bit */ + tst \rc, #UTRSTAT_TXFE /* Check BUSY bit */ beq 1b /* Wait for the UART to be ready */ .endm diff --git a/xen/include/asm-arm/exynos4210-uart.h b/xen/include/asm-arm/exynos4210-uart.h index 330e1c0..bd9a4be 100644 --- a/xen/include/asm-arm/exynos4210-uart.h +++ b/xen/include/asm-arm/exynos4210-uart.h @@ -87,7 +87,7 @@ #define UFSTAT_RX_COUNT_MASK (0xff << UFSTAT_RX_COUNT_SHIFT) /* UTRSTAT */ -#define UTRSTAT_TX_EMPTY (1 << 1) +#define UTRSTAT_TXFE (1 << 1) /* URHX */ #define URXH_DATA_MASK (0xff)