diff options
| author | Tom Rix <Tom.Rix@windriver.com> | 2010-01-23 07:22:23 -0600 |
|---|---|---|
| committer | Tom Rix <Tom.Rix@windriver.com> | 2010-01-23 07:22:23 -0600 |
| commit | 790af6ed08cc3675267191eb60403bd4f0d9a03c (patch) | |
| tree | ded9dced10adeea568982bf634b9dc7d3c00f537 /cpu/mpc512x/serial.c | |
| parent | 69df282a781dfe7a1bfc62acf0605992d3ea6c52 (diff) | |
| parent | 57ae8a5cced612088104303777e71a3dc89c00ef (diff) | |
| download | u-boot-imx-790af6ed08cc3675267191eb60403bd4f0d9a03c.zip u-boot-imx-790af6ed08cc3675267191eb60403bd4f0d9a03c.tar.gz u-boot-imx-790af6ed08cc3675267191eb60403bd4f0d9a03c.tar.bz2 | |
Merge branch 'r-ml-master' into t-master
Diffstat (limited to 'cpu/mpc512x/serial.c')
| -rw-r--r-- | cpu/mpc512x/serial.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpu/mpc512x/serial.c b/cpu/mpc512x/serial.c index 4fc4693..ec2f41b 100644 --- a/cpu/mpc512x/serial.c +++ b/cpu/mpc512x/serial.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000 - 2009 + * (C) Copyright 2000 - 2010 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -125,7 +125,7 @@ void serial_putc (const char c) while (!(in_be16(&psc->psc_status) & PSC_SR_TXEMP)) ; - psc->tfdata_8 = c; + out_8(&psc->tfdata_8, c); } void serial_putc_raw (const char c) @@ -137,7 +137,7 @@ void serial_putc_raw (const char c) while (!(in_be16(&psc->psc_status) & PSC_SR_TXEMP)) ; - psc->tfdata_8 = c; + out_8(&psc->tfdata_8, c); } @@ -157,7 +157,7 @@ int serial_getc (void) while (in_be32(&psc->rfstat) & PSC_FIFO_EMPTY) ; - return psc->rfdata_8; + return in_8(&psc->rfdata_8); } int serial_tstc (void) |