diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-13 23:19:42 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-13 23:19:42 -0400 |
| commit | 185ec39f792386d8b30f3288f2c2e4eaf0b43d02 (patch) | |
| tree | bd06995cf95f7085d4c328fed2f1cec2aec1a01a /src/dev/io_device.hh | |
| parent | 7709e6ba93be4b67b22e2f3f9c853a3e1ab4458b (diff) | |
| parent | e981a97dec3df921f3800fd9ae5ec01ed4e9d2b1 (diff) | |
| download | gem5-185ec39f792386d8b30f3288f2c2e4eaf0b43d02.tar.xz | |
Merge zizzer:/bk/newmem
into vm1.(none):/home/stever/bk/newmem
--HG--
extra : convert_revision : 6ebb12890c516a11733a04041f29c9964267a5ca
Diffstat (limited to 'src/dev/io_device.hh')
| -rw-r--r-- | src/dev/io_device.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dev/io_device.hh b/src/dev/io_device.hh index 195ca0fb7..cd2c25eeb 100644 --- a/src/dev/io_device.hh +++ b/src/dev/io_device.hh @@ -247,7 +247,7 @@ class PioDevice : public MemObject virtual void init(); - virtual Port *getPort(const std::string &if_name) + virtual Port *getPort(const std::string &if_name, int idx = -1) { if (if_name == "pio") { if (pioPort != NULL) @@ -309,7 +309,7 @@ class DmaDevice : public PioDevice bool dmaPending() { return dmaPort->dmaPending(); } - virtual Port *getPort(const std::string &if_name) + virtual Port *getPort(const std::string &if_name, int idx = -1) { if (if_name == "pio") { if (pioPort != NULL) |