diff options
| author | Benjamin Nash <benash@umich.edu> | 2005-07-28 13:16:45 -0400 |
|---|---|---|
| committer | Benjamin Nash <benash@umich.edu> | 2005-07-28 13:16:45 -0400 |
| commit | a115249eb07f6e3c9666bf408e214fcd38a665fb (patch) | |
| tree | 21ea53a2698dc89fdc7f26fc81d45db6d69fbe4f /dev/uart8250.cc | |
| parent | 648c3beb1d4735e423e77f5189c27c28e5b34493 (diff) | |
| parent | 74fd4f68c5a7df2efba11497ba1ab5ab62b0b1bf (diff) | |
| download | gem5-a115249eb07f6e3c9666bf408e214fcd38a665fb.tar.xz | |
Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_new/m5
into zed.eecs.umich.edu:/z/benash/bk/m5
SConscript:
dev/ide_disk.hh:
Formatting.
dev/ide_ctrl.cc:
Endianness
dev/ide_disk.cc:
dev/pcidev.cc:
dev/tsunami_io.cc:
dev/uart8250.cc:
Clean up code.
--HG--
extra : convert_revision : cb554f0e3a701371d2106cd7e11a4a22f773acc2
Diffstat (limited to 'dev/uart8250.cc')
| -rw-r--r-- | dev/uart8250.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/uart8250.cc b/dev/uart8250.cc index ad3232686..013cbfd00 100644 --- a/dev/uart8250.cc +++ b/dev/uart8250.cc @@ -148,9 +148,9 @@ Uart8250::read(MemReqPtr &req, uint8_t *data) DPRINTF(Uart, "IIR Read, status = %#x\n", (uint32_t)status); status &= ~TX_INT; if (status & RX_INT) - *(uint8_t*)data = 0x4; + *(uint8_t*)data = IIR_RXID; else - *(uint8_t*)data = 0x1; + *(uint8_t*)data = IIR_NOPEND; break; case 0x3: // Line Control Register (LCR) *(uint8_t*)data = LCR; |