summaryrefslogtreecommitdiff
path: root/src/dev/x86/PC.py
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2008-10-11 01:45:25 -0700
committerGabe Black <gblack@eecs.umich.edu>2008-10-11 01:45:25 -0700
commit539563e04b4925e88c28cb44f5180915c3b3a5be (patch)
treede3c6c045eff66c6ba6e5f29589bb20c7c3e9ad1 /src/dev/x86/PC.py
parent119e127d7128edfb729101b92ca160c1f01391ca (diff)
downloadgem5-539563e04b4925e88c28cb44f5180915c3b3a5be.tar.xz
X86: Make the CMOS and I8259 devices use IntDev and IntPin.
Diffstat (limited to 'src/dev/x86/PC.py')
-rw-r--r--src/dev/x86/PC.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/dev/x86/PC.py b/src/dev/x86/PC.py
index d3d3118c6..e14c4cc9c 100644
--- a/src/dev/x86/PC.py
+++ b/src/dev/x86/PC.py
@@ -49,9 +49,10 @@ class PC(Platform):
pciconfig = PciConfigAll()
south_bridge = SouthBridge()
- pic1 = I8259(pio_addr=x86IOAddress(0x20))
- pic2 = I8259(pio_addr=x86IOAddress(0xA0), master=pic1)
- cmos = Cmos(pio_addr=x86IOAddress(0x70), i8259=pic2)
+ pic1 = I8259(pio_addr=x86IOAddress(0x20), mode='I8259Master')
+ pic2 = I8259(pio_addr=x86IOAddress(0xA0),
+ mode='I8259Slave', output=pic1.pin(2))
+ cmos = Cmos(pio_addr=x86IOAddress(0x70), int_pin=pic2.pin(0))
# "Non-existant" port used for timing purposes by the linux kernel
i_dont_exist = IsaFake(pio_addr=x86IOAddress(0x80), pio_size=1)