sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

X86: Make auto eoi mode work in the I8259 PIC.

Browse source
This commit is contained in:
Gabe Black 2008-10-12 23:27:08 -07:00
parent fb5bb434a9
commit be6055e0f2
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/dev/x86/i8259.cc
View file

@ -36,7 +36,7 @@ X86ISA::I8259::I8259(Params * p) : BasicPioDevice(p), IntDev(this),
latency(p->pio_latency), output(p->output), latency(p->pio_latency), output(p->output),
mode(p->mode), slave(NULL), mode(p->mode), slave(NULL),
IRR(0), ISR(0), IMR(0), IRR(0), ISR(0), IMR(0),
readIRR(true), initControlWord(0) readIRR(true), initControlWord(0), autoEOI(false)
{ {
if (output) { if (output) {
I8259 * master; I8259 * master;
@ -91,6 +91,9 @@ X86ISA::I8259::write(PacketPtr pkt)
DPRINTF(I8259, "%s mode.\n", DPRINTF(I8259, "%s mode.\n",
cascadeMode ? "Cascade" : "Single"); cascadeMode ? "Cascade" : "Single");
expectICW4 = bits(val, 0); expectICW4 = bits(val, 0);
if (!expectICW4) {
autoEOI = false;
}
initControlWord = 1; initControlWord = 1;
DPRINTF(I8259, "Expecting %d more bytes.\n", expectICW4 ? 3 : 2); DPRINTF(I8259, "Expecting %d more bytes.\n", expectICW4 ? 3 : 2);
} else if (bits(val, 4, 3) == 0) { } else if (bits(val, 4, 3) == 0) {
@ -203,8 +206,10 @@ X86ISA::I8259::write(PacketPtr pkt)
} else { } else {
DPRINTF(I8259, "Unrecognized buffer mode.\n"); DPRINTF(I8259, "Unrecognized buffer mode.\n");
} }
autoEOI = bits(val, 1);
DPRINTF(I8259, "%s End Of Interrupt.\n", DPRINTF(I8259, "%s End Of Interrupt.\n",
bits(val, 1) ? "Automatic" : "Normal"); autoEOI ? "Automatic" : "Normal");
DPRINTF(I8259, "%s mode.\n", bits(val, 0) ? "80x86" : "MCX-80/85"); DPRINTF(I8259, "%s mode.\n", bits(val, 0) ? "80x86" : "MCX-80/85");
initControlWord = 0; initControlWord = 0;
break; break;
@ -265,7 +270,11 @@ X86ISA::I8259::getVector()
int line = findMsbSet(IRR); int line = findMsbSet(IRR);
IRR &= ~(1 << line); IRR &= ~(1 << line);
DPRINTF(I8259, "Interrupt %d was accepted.\n", line); DPRINTF(I8259, "Interrupt %d was accepted.\n", line);
if (autoEOI) {
handleEOI(line);
} else {
ISR |= 1 << line; ISR |= 1 << line;
}
if (slave && bits(cascadeBits, line)) { if (slave && bits(cascadeBits, line)) {
DPRINTF(I8259, "Interrupt was from slave who will " DPRINTF(I8259, "Interrupt was from slave who will "
"provide the vector.\n"); "provide the vector.\n");

3
src/dev/x86/i8259.hh
View file

@ -73,6 +73,9 @@ class I8259 : public BasicPioDevice, public IntDev
bool expectICW4; bool expectICW4;
int initControlWord; int initControlWord;
// Whether or not the PIC is in auto EOI mode.
bool autoEOI;
void requestInterrupt(int line); void requestInterrupt(int line);
void handleEOI(int line); void handleEOI(int line);