changeset 5a07c4e3249b in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=5a07c4e3249b
description:
X86: Plug in an IDE controller.
diffstat:
3 files changed, 19 insertions(+), 2 deletions(-)
configs/common/FSConfig.py | 2 +-
src/dev/x86/Pc.py | 2 +-
src/dev/x86/SouthBridge.py | 17 +++++++++++++++++
diffs (65 lines):
diff -r 38f3f3e1e442 -r 5a07c4e3249b configs/common/FSConfig.py
--- a/configs/common/FSConfig.py Sat Jan 31 23:59:25 2009 -0800
+++ b/configs/common/FSConfig.py Sun Feb 01 00:00:03 2009 -0800
@@ -284,7 +284,7 @@
# 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 -r 38f3f3e1e442 -r 5a07c4e3249b src/dev/x86/Pc.py
--- a/src/dev/x86/Pc.py Sat Jan 31 23:59:25 2009 -0800
+++ b/src/dev/x86/Pc.py Sun Feb 01 00:00:03 2009 -0800
@@ -67,7 +67,7 @@
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 -r 38f3f3e1e442 -r 5a07c4e3249b src/dev/x86/SouthBridge.py
--- a/src/dev/x86/SouthBridge.py Sat Jan 31 23:59:25 2009 -0800
+++ b/src/dev/x86/SouthBridge.py Sun Feb 01 00:00:03 2009 -0800
@@ -34,6 +34,7 @@
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 @@
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 @@
# 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
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
