diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2012-01-07 02:16:37 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2012-01-07 02:16:37 -0800 |
| commit | 241cc0c8402f1b9f2ec20d1cc152d96930959b2a (patch) | |
| tree | 666717370cc9db4775ef46c10f7d8a92a34f40e2 /src/dev/terminal.cc | |
| parent | ec936364b7238cddea7734ea79c6e04b52a683c6 (diff) | |
| parent | 4b772782871f265cf7372c984ad750803396938c (diff) | |
| download | gem5-241cc0c8402f1b9f2ec20d1cc152d96930959b2a.tar.xz | |
Another merge with the main repository.
Diffstat (limited to 'src/dev/terminal.cc')
| -rw-r--r-- | src/dev/terminal.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/dev/terminal.cc b/src/dev/terminal.cc index 74d5ddde7..a11d45554 100644 --- a/src/dev/terminal.cc +++ b/src/dev/terminal.cc @@ -259,17 +259,13 @@ Terminal::write(const uint8_t *buf, size_t len) uint8_t Terminal::in() { - bool empty; uint8_t c; - empty = rxbuf.empty(); - assert(!empty); + assert(!rxbuf.empty()); rxbuf.read((char *)&c, 1); - empty = rxbuf.empty(); - DPRINTF(TerminalVerbose, "in: \'%c\' %#02x more: %d\n", - isprint(c) ? c : ' ', c, !empty); + isprint(c) ? c : ' ', c, !rxbuf.empty()); return c; } |