diff options
| author | Gabe Black <gabeblack@google.com> | 2019-03-07 03:02:35 -0800 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2019-03-19 10:22:50 +0000 |
| commit | d3d24835bcc03ecf312ac6ba7df114656770730f (patch) | |
| tree | 43bb564a7bc3e22ffd7b1b906f6f96742ecb619a /src/dev/net/i8254xGBe.cc | |
| parent | 378d9ccbeb4053aeeab002159b26625854af54f7 (diff) | |
| download | gem5-d3d24835bcc03ecf312ac6ba7df114656770730f.tar.xz | |
arch, cpu, dev, gpu, mem, sim, python: start using getPort.
Replace the getMasterPort, getSlavePort, and getEthPort functions
with getPort, and remove extraneous mechanisms that are no longer
necessary.
Change-Id: Iab7e3c02d2f3a0cf33e7e824e18c28646b5bc318
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/17040
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/dev/net/i8254xGBe.cc')
| -rw-r--r-- | src/dev/net/i8254xGBe.cc | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/dev/net/i8254xGBe.cc b/src/dev/net/i8254xGBe.cc index 2d55603f1..9d83519df 100644 --- a/src/dev/net/i8254xGBe.cc +++ b/src/dev/net/i8254xGBe.cc @@ -139,16 +139,12 @@ IGbE::init() PciDevice::init(); } -EtherInt* -IGbE::getEthPort(const std::string &if_name, int idx) +Port & +IGbE::getPort(const std::string &if_name, PortID idx) { - - if (if_name == "interface") { - if (etherInt->getPeer()) - panic("Port already connected to\n"); - return etherInt; - } - return NULL; + if (if_name == "interface") + return *etherInt; + return EtherDevice::getPort(if_name, idx); } Tick |