diff options
| author | wdenk <wdenk> | 2004-03-14 22:25:36 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-03-14 22:25:36 +0000 |
| commit | 42dfe7a1844cbad7114038aaf03828acb7a84414 (patch) | |
| tree | d33893d34d2a97aa23257703733dbc9d86d48278 /cpu/sa1100 | |
| parent | 855a496fe9ba431772f1ff1aef21a5c001288bb0 (diff) | |
| download | u-boot-42dfe7a1844cbad7114038aaf03828acb7a84414.zip u-boot-42dfe7a1844cbad7114038aaf03828acb7a84414.tar.gz u-boot-42dfe7a1844cbad7114038aaf03828acb7a84414.tar.bz2 | |
Code cleanup; make several boards compile & link.LABEL_2004_03_14_2340
Diffstat (limited to 'cpu/sa1100')
| -rw-r--r-- | cpu/sa1100/serial.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpu/sa1100/serial.c b/cpu/sa1100/serial.c index d3b8628..a598489 100644 --- a/cpu/sa1100/serial.c +++ b/cpu/sa1100/serial.c @@ -66,7 +66,7 @@ void serial_setbrg (void) Ser1UTCR1 = 0; Ser1UTCR2 = (u32)reg; Ser1UTCR3 = ( UTCR3_RXE | UTCR3_TXE ); -#elif CONFIG_SERIAL3 +#elif defined(CONFIG_SERIAL3) /* Wait until port is ready ... */ while (Ser3UTSR1 & UTSR1_TBY) { } @@ -107,7 +107,7 @@ void serial_putc (const char c) while ((Ser1UTSR0 & UTSR0_TFS) == 0); Ser1UTDR = c; -#elif CONFIG_SERIAL3 +#elif defined(CONFIG_SERIAL3) /* wait for room in the tx FIFO on SERIAL3 */ while ((Ser3UTSR0 & UTSR0_TFS) == 0); @@ -128,7 +128,7 @@ int serial_tstc (void) { #ifdef CONFIG_SERIAL1 return Ser1UTSR1 & UTSR1_RNE; -#elif CONFIG_SERIAL3 +#elif defined(CONFIG_SERIAL3) return Ser3UTSR1 & UTSR1_RNE; #endif } @@ -144,7 +144,7 @@ int serial_getc (void) while (!(Ser1UTSR1 & UTSR1_RNE)); return (char) Ser1UTDR & 0xff; -#elif CONFIG_SERIAL3 +#elif defined(CONFIG_SERIAL3) while (!(Ser3UTSR1 & UTSR1_RNE)); return (char) Ser3UTDR & 0xff; |