diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-08-16 16:49:02 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-08-16 16:49:02 -0400 |
| commit | 773cb77656174b221c1e51b92a8af7d8e268b733 (patch) | |
| tree | c6358a24188fde67e0d0a2816f6b9e2b55d8c535 /configs | |
| parent | a9e4daf574e265e419a0a4a6bcbd03edf3a3299f (diff) | |
| download | gem5-773cb77656174b221c1e51b92a8af7d8e268b733.tar.xz | |
Devices: Make EtherInts connect in the same way memory ports currently do.
--HG--
extra : convert_revision : 765b096785a77df9adc4791c9101b90696bd7be2
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/common/FSConfig.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index e2d6b710b..04a12e356 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -42,7 +42,6 @@ def makeLinuxAlphaSystem(mem_mode, mdesc = None): class BaseTsunami(Tsunami): ethernet = NSGigE(configdata=NSGigEPciData(), pci_bus=0, pci_dev=1, pci_func=0) - etherint = NSGigEInt(device=Parent.ethernet) ide = IdeController(disks=[Parent.disk0, Parent.disk2], pci_func=0, pci_dev=0, pci_bus=0) @@ -125,8 +124,10 @@ def makeDualRoot(testSystem, driveSystem, dumpfile): self = Root() self.testsys = testSystem self.drivesys = driveSystem - self.etherlink = EtherLink(int1 = Parent.testsys.tsunami.etherint[0], - int2 = Parent.drivesys.tsunami.etherint[0]) + self.etherlink = EtherLink() + self.etherlink.int0 = Parent.testsys.tsunami.ethernet.interface + self.etherlink.int1 = Parent.drivesys.tsunami.ethernet.interface + if dumpfile: self.etherdump = EtherDump(file=dumpfile) self.etherlink.dump = Parent.etherdump |