diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2009-02-01 00:00:03 -0800 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2009-02-01 00:00:03 -0800 |
| commit | bb7ad80bbe565800b09c38bdc02c12f827ec9240 (patch) | |
| tree | 3274e18a386f2533ad05f84f00e578b27e8d26fc | |
| parent | c2c5740b98c6601385e143c88aefbd827422f717 (diff) | |
| download | gem5-bb7ad80bbe565800b09c38bdc02c12f827ec9240.tar.xz | |
X86: Plug in an IDE controller.
| -rw-r--r-- | configs/common/FSConfig.py | 2 | ||||
| -rw-r--r-- | src/dev/x86/Pc.py | 2 | ||||
| -rw-r--r-- | src/dev/x86/SouthBridge.py | 17 |
3 files changed, 19 insertions, 2 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 8ffd69a40..45fdc80a1 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -284,7 +284,7 @@ def makeLinuxX86System(mem_mode, mdesc = None): # Command line self.boot_osflags = 'earlyprintk=ttyS0 console=ttyS0 lpj=9608015 ' + \ - 'ide0=noprobe ide1=noprobe ' + \ + 'ide1=noprobe ' + \ 'ide2=noprobe ide3=noprobe ' + \ 'ide4=noprobe ide5=noprobe' return self diff --git a/src/dev/x86/Pc.py b/src/dev/x86/Pc.py index 7211fa3f4..6f315cbcb 100644 --- a/src/dev/x86/Pc.py +++ b/src/dev/x86/Pc.py @@ -67,7 +67,7 @@ class Pc(Platform): fake_com_4 = IsaFake(pio_addr=x86IOAddress(0x2e8), pio_size=8) # A device to catch accesses to the non-existant floppy controller. - fake_floppy = IsaFake(pio_addr=x86IOAddress(0x3f2), pio_size=4) + fake_floppy = IsaFake(pio_addr=x86IOAddress(0x3f2), pio_size=2) def attachIO(self, bus): self.south_bridge.attachIO(bus) diff --git a/src/dev/x86/SouthBridge.py b/src/dev/x86/SouthBridge.py index a3db83610..be9276145 100644 --- a/src/dev/x86/SouthBridge.py +++ b/src/dev/x86/SouthBridge.py @@ -34,6 +34,7 @@ from I82094AA import I82094AA from I8237 import I8237 from I8254 import I8254 from I8259 import I8259 +from Ide import IdeController from PcSpeaker import PcSpeaker from X86IntPin import X86IntLine from m5.SimObject import SimObject @@ -72,6 +73,21 @@ class SouthBridge(SimObject): def connectPins(self, source, sink): self.int_lines.append(X86IntLine(source=source, sink=sink)) + # IDE controller + ide = IdeController(disks=[], pci_func=0, pci_dev=4, pci_bus=0) + ide.BAR0 = 0x1f0 + ide.BAR0LegacyIO = True + ide.BAR1 = 0x3f4 + ide.BAR1Size = '3B' + ide.BAR1LegacyIO = True + ide.BAR2 = 0x170 + ide.BAR2LegacyIO = True + ide.BAR3 = 0x374 + ide.BAR3Size = '3B' + ide.BAR3LegacyIO = True + ide.BAR4 = 1 + ide.Command = 1 + def attachIO(self, bus): # Route interupt signals self.connectPins(self.pic1.output, self.io_apic.pin(0)) @@ -94,6 +110,7 @@ class SouthBridge(SimObject): # Connect to the bus self.cmos.pio = bus.port self.dma1.pio = bus.port + self.ide.pio = bus.port self.keyboard.pio = bus.port self.pic1.pio = bus.port self.pic2.pio = bus.port |