diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-01-18 15:48:38 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-01-18 15:48:38 -0500 |
| commit | c389c2e327cc3ee1c988855b05505660c6670172 (patch) | |
| tree | 7861dcb3ed07f03850ee922db9c0c33b038265e4 /dev/uart.cc | |
| parent | 42f3b4ffb3fedcb70e9ff068ed7160dc6020b8c4 (diff) | |
| parent | 25f54857c9356b7f8608be8d45fec17d6c26bce5 (diff) | |
| download | gem5-c389c2e327cc3ee1c988855b05505660c6670172.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/m5/
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : c8b7f46e9d0dbff2a12a7375d361098fba352647
Diffstat (limited to 'dev/uart.cc')
| -rw-r--r-- | dev/uart.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/uart.cc b/dev/uart.cc index 2ff94dda5..3c4ab6d04 100644 --- a/dev/uart.cc +++ b/dev/uart.cc @@ -88,8 +88,8 @@ Uart::IntrEvent::scheduleIntr() Uart::Uart(const string &name, SimConsole *c, MemoryController *mmu, Addr a, Addr s, HierParams *hier, Bus *bus, Tick pio_latency, Platform *p) - : PioDevice(name), addr(a), size(s), cons(c), txIntrEvent(this, TX_INT), - rxIntrEvent(this, RX_INT), platform(p) + : PioDevice(name, p), addr(a), size(s), cons(c), + txIntrEvent(this, TX_INT), rxIntrEvent(this, RX_INT) { mmu->add_child(this, RangeSize(addr, size)); |