derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge zed.eecs.umich.edu:/.automount/fox/y/mserrano/m5_dir/m5

Browse Source 
into  zed.eecs.umich.edu:/z/benash/bk/m5

--HG--
extra : convert_revision : 9b7ca872187a13179118ad0651301d531332dc63
This commit is contained in:
Benjamin Nash
2005-08-16 15:45:30 -04:00
parent 0d82e0f8b6 1906abcde0
commit 979d609656
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dev/uart8250.cc
View File

@@ -147,13 +147,15 @@ Uart8250::read(MemReqPtr &req, uint8_t *data)
case 0x2: // Intr Identification Register (IIR)
DPRINTF(Uart, "IIR Read, status = %#x\n", (uint32_t)status);
//Tx interrupts are cleared on IIR reads
status &= ~TX_INT;
if (status & RX_INT)
if (status & RX_INT) /* Rx data interrupt has a higher priority */
*(uint8_t*)data = IIR_RXID;
else if (status & TX_INT)
*(uint8_t*)data = IIR_TXID;
else
*(uint8_t*)data = IIR_NOPEND;
//Tx interrupts are cleared on IIR reads
status &= ~TX_INT;
break;
case 0x3: // Line Control Register (LCR)
*(uint8_t*)data = LCR;