diff options
Diffstat (limited to 'arch/mips/au1000/common/puts.c')
-rw-r--r-- | arch/mips/au1000/common/puts.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/arch/mips/au1000/common/puts.c b/arch/mips/au1000/common/puts.c index e34c67e89293..55bbe24d45b6 100644 --- a/arch/mips/au1000/common/puts.c +++ b/arch/mips/au1000/common/puts.c | |||
@@ -1,11 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | * | 2 | * |
3 | * BRIEF MODULE DESCRIPTION | 3 | * BRIEF MODULE DESCRIPTION |
4 | * Low level uart routines to directly access a 16550 uart. | 4 | * Low level UART routines to directly access Alchemy UART. |
5 | * | 5 | * |
6 | * Copyright 2001 MontaVista Software Inc. | 6 | * Copyright 2001, 2008 MontaVista Software Inc. |
7 | * Author: MontaVista Software, Inc. | 7 | * Author: MontaVista Software, Inc. <source@mvista.com> |
8 | * ppopov@mvista.com or source@mvista.com | ||
9 | * | 8 | * |
10 | * This program is free software; you can redistribute it and/or modify it | 9 | * This program is free software; you can redistribute it and/or modify it |
11 | * under the terms of the GNU General Public License as published by the | 10 | * under the terms of the GNU General Public License as published by the |
@@ -40,12 +39,12 @@ | |||
40 | 39 | ||
41 | static volatile unsigned long * const com1 = (unsigned long *)SERIAL_BASE; | 40 | static volatile unsigned long * const com1 = (unsigned long *)SERIAL_BASE; |
42 | 41 | ||
43 | |||
44 | #ifdef SLOW_DOWN | 42 | #ifdef SLOW_DOWN |
45 | static inline void slow_down(void) | 43 | static inline void slow_down(void) |
46 | { | 44 | { |
47 | int k; | 45 | int k; |
48 | for (k=0; k<10000; k++); | 46 | |
47 | for (k = 0; k < 10000; k++); | ||
49 | } | 48 | } |
50 | #else | 49 | #else |
51 | #define slow_down() | 50 | #define slow_down() |
@@ -54,16 +53,16 @@ static inline void slow_down(void) | |||
54 | void | 53 | void |
55 | prom_putchar(const unsigned char c) | 54 | prom_putchar(const unsigned char c) |
56 | { | 55 | { |
57 | unsigned char ch; | 56 | unsigned char ch; |
58 | int i = 0; | 57 | int i = 0; |
58 | |||
59 | do { | ||
60 | ch = com1[SER_CMD]; | ||
61 | slow_down(); | ||
62 | i++; | ||
63 | if (i > TIMEOUT) | ||
64 | break; | ||
65 | } while (0 == (ch & TX_BUSY)); | ||
59 | 66 | ||
60 | do { | 67 | com1[SER_DATA] = c; |
61 | ch = com1[SER_CMD]; | ||
62 | slow_down(); | ||
63 | i++; | ||
64 | if (i>TIMEOUT) { | ||
65 | break; | ||
66 | } | ||
67 | } while (0 == (ch & TX_BUSY)); | ||
68 | com1[SER_DATA] = c; | ||
69 | } | 68 | } |