diff options
Diffstat (limited to 'src/dev')
| -rw-r--r-- | src/dev/alpha/tsunami_cchip.cc | 2 | ||||
| -rw-r--r-- | src/dev/terminal.cc | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/dev/alpha/tsunami_cchip.cc b/src/dev/alpha/tsunami_cchip.cc index 891fe17da..4477b5adc 100644 --- a/src/dev/alpha/tsunami_cchip.cc +++ b/src/dev/alpha/tsunami_cchip.cc @@ -109,7 +109,7 @@ TsunamiCChip::read(PacketPtr pkt) panic("TSDEV_CC_MTR not implemeted\n"); break; case TSDEV_CC_MISC: - pkt->set((ipint << 8) & 0xF | (itint << 4) & 0xF | + pkt->set(((ipint << 8) & 0xF) | ((itint << 4) & 0xF) | (pkt->req->getCpuNum() & 0x3)); break; case TSDEV_CC_AAR0: diff --git a/src/dev/terminal.cc b/src/dev/terminal.cc index 8c18e3bbc..fba0c6130 100644 --- a/src/dev/terminal.cc +++ b/src/dev/terminal.cc @@ -294,8 +294,7 @@ Terminal::out(char c) if (DTRACE(Terminal)) { static char last = '\0'; - if (c != '\n' && c != '\r' || - last != '\n' && last != '\r') { + if ((c != '\n' && c != '\r') || (last != '\n' && last != '\r')) { if (c == '\n' || c == '\r') { int size = linebuf.size(); char *buffer = new char[size + 1]; |