60,62d59
< # This is to make sure the interrupt lines are instantiated. Don't use
< # it for anything directly.
< int_lines = VectorParam.X86IntLine([], "Interrupt lines")
73,75d69
< def connectPins(self, source, sink):
< self.int_lines.append(X86IntLine(source=source, sink=sink))
<
96,108c90,99
< self.connectPins(self.pic1.output, self.io_apic.pin(0))
< self.connectPins(self.pic2.output, self.pic1.pin(2))
< self.connectPins(self.cmos.int_pin, self.pic2.pin(0))
< self.connectPins(self.pit.int_pin, self.pic1.pin(0))
< self.connectPins(self.pit.int_pin, self.io_apic.pin(2))
< # self.connectPins(self.keyboard.keyboard_int_pin,
< # self.pic1.pin(1))
< self.connectPins(self.keyboard.keyboard_int_pin,
< self.io_apic.pin(1))
< # self.connectPins(self.keyboard.mouse_int_pin,
< # self.pic2.pin(4))
< self.connectPins(self.keyboard.mouse_int_pin,
< self.io_apic.pin(12))
---
> self.int_lines = \
> [X86IntLine(source=self.pic1.output, sink=self.io_apic.pin(0)),
> X86IntLine(source=self.pic2.output, sink=self.pic1.pin(2)),
> X86IntLine(source=self.cmos.int_pin, sink=self.pic2.pin(0)),
> X86IntLine(source=self.pit.int_pin, sink=self.pic1.pin(0)),
> X86IntLine(source=self.pit.int_pin, sink=self.io_apic.pin(2)),
> X86IntLine(source=self.keyboard.keyboard_int_pin,
> sink=self.io_apic.pin(1)),
> X86IntLine(source=self.keyboard.mouse_int_pin,
> sink=self.io_apic.pin(12))]