diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-21 21:01:56 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-21 21:01:56 +0100 |
| commit | f7767c7541a8cdae55655d10f039a5bc62894ee8 (patch) | |
| tree | c559df77384b70faa52a3b1993c6587a37245fb8 /board/logicpd/zoom2 | |
| parent | b6535daefd65c93ea429bc4728062379dda6e482 (diff) | |
| parent | 127e10842b2474ac20e40572a4102dd4d5ed80f1 (diff) | |
| download | u-boot-imx-f7767c7541a8cdae55655d10f039a5bc62894ee8.zip u-boot-imx-f7767c7541a8cdae55655d10f039a5bc62894ee8.tar.gz u-boot-imx-f7767c7541a8cdae55655d10f039a5bc62894ee8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'board/logicpd/zoom2')
| -rw-r--r-- | board/logicpd/zoom2/zoom2_serial.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/board/logicpd/zoom2/zoom2_serial.c b/board/logicpd/zoom2/zoom2_serial.c index a3d777d..ba58e39 100644 --- a/board/logicpd/zoom2/zoom2_serial.c +++ b/board/logicpd/zoom2/zoom2_serial.c @@ -86,6 +86,8 @@ void quad_putc_dev (unsigned long base, const char c) quad_putc_dev (base, '\r'); NS16550_putc ((NS16550_t) base, c); + } else { + usbtty_putc(c); } } @@ -94,6 +96,8 @@ void quad_puts_dev (unsigned long base, const char *s) if (zoom2_debug_board_connected ()) { while ((s != NULL) && (*s != '\0')) quad_putc_dev (base, *s++); + } else { + usbtty_puts(s); } } @@ -101,16 +105,16 @@ int quad_getc_dev (unsigned long base) { if (zoom2_debug_board_connected ()) return NS16550_getc ((NS16550_t) base); - else - return 0; + + return usbtty_getc(); } int quad_tstc_dev (unsigned long base) { if (zoom2_debug_board_connected ()) return NS16550_tstc ((NS16550_t) base); - else - return 0; + + return usbtty_tstc(); } void quad_setbrg_dev (unsigned long base) |