diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-15 11:46:13 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-15 11:46:13 -0400 |
| commit | f06d508af0ff78d7fc0e774d658cb6aedf330635 (patch) | |
| tree | 1d400914f66e9ec03e34ad12a3989d3bad147d02 /src/dev/io_device.hh | |
| parent | 74b9868c786a8c58ef8fe65bebd2fd8e9573d0be (diff) | |
| parent | 88e22ee081f1b0259b624fe320af22a58f144251 (diff) | |
| download | gem5-f06d508af0ff78d7fc0e774d658cb6aedf330635.tar.xz | |
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
into zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
--HG--
extra : convert_revision : 8a1cd7ff43aa4ebbfce0ff174d2f4ba3f095dd47
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) |