minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 20:52:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge problems

Browse Source 
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2008-08-06 14:06:03 +02:00
parent f2302d4430
commit 1318673045
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/serial/serial_xuartlite.c
View File

@ -54,13 +54,8 @@ void serial_putc(const char c)
{ {
if (c == '\n') if (c == '\n')
serial_putc('\r'); serial_putc('\r');
<<<<<<< .merge_file_kaofiJ
while (in_be32((void *)UARTLITE_STATUS) & SR_TX_FIFO_FULL);
out_be32((void *)UARTLITE_TX_FIFO, (unsigned char) (c & 0xff));
=======
while (in_be32((u32 *) UARTLITE_STATUS) & SR_TX_FIFO_FULL); while (in_be32((u32 *) UARTLITE_STATUS) & SR_TX_FIFO_FULL);
out_be32((u32 *) UARTLITE_TX_FIFO, (unsigned char) (c & 0xff)); out_be32((u32 *) UARTLITE_TX_FIFO, (unsigned char) (c & 0xff));
>>>>>>> .merge_file_zSz9BG
} }
void serial_puts(const char * s) void serial_puts(const char * s)
@ -72,20 +67,11 @@ void serial_puts(const char * s)
int serial_getc(void) int serial_getc(void)
{ {
<<<<<<< .merge_file_kaofiJ
while (!(in_be32((void *)UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA));
return in_be32((void *)UARTLITE_RX_FIFO) & 0xff;
=======
while (!(in_be32((u32 *) UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA)); while (!(in_be32((u32 *) UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA));
return in_be32((u32 *) UARTLITE_RX_FIFO) & 0xff; return in_be32((u32 *) UARTLITE_RX_FIFO) & 0xff;
>>>>>>> .merge_file_zSz9BG
} }
int serial_tstc(void) int serial_tstc(void)
{ {
<<<<<<< .merge_file_kaofiJ
return (in_be32((void *)UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA);
=======
return (in_be32((u32 *) UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA); return (in_be32((u32 *) UARTLITE_STATUS) & SR_RX_FIFO_VALID_DATA);
>>>>>>> .merge_file_zSz9BG
} }