summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2008-10-10 03:50:07 -0700
committerGabe Black <gblack@eecs.umich.edu>2008-10-10 03:50:07 -0700
commit57d663877e2d8de9a4614b82f2b755fee0961e0d (patch)
tree09f5cfa499e1d2655d38ff55efb2b2d361b0b797
parent94b08bed07d13106381a0bb692bf0d879c5353d4 (diff)
downloadgem5-57d663877e2d8de9a4614b82f2b755fee0961e0d.tar.xz
X86: Fix compilation with new eventq API.
-rw-r--r--src/dev/x86/south_bridge/cmos.hh15
-rw-r--r--src/dev/x86/south_bridge/i8254.hh11
-rw-r--r--src/dev/x86/south_bridge/south_bridge.cc4
3 files changed, 16 insertions, 14 deletions
diff --git a/src/dev/x86/south_bridge/cmos.hh b/src/dev/x86/south_bridge/cmos.hh
index d1aa74b72..1cb22fa9e 100644
--- a/src/dev/x86/south_bridge/cmos.hh
+++ b/src/dev/x86/south_bridge/cmos.hh
@@ -56,8 +56,9 @@ class Cmos : public SubDevice
class X86RTC : public MC146818
{
public:
- X86RTC(const std::string &n, const struct tm time,
- bool bcd, Tick frequency) : MC146818(n, time, bcd, frequency)
+ X86RTC(EventManager *em, const std::string &n, const struct tm time,
+ bool bcd, Tick frequency) :
+ MC146818(em, n, time, bcd, frequency)
{
}
protected:
@@ -69,22 +70,22 @@ class Cmos : public SubDevice
public:
- Cmos() : rtc("rtc", foo_time, true, ULL(5000000000))
+ Cmos(EventManager *em) : rtc(em, "rtc", foo_time, true, ULL(5000000000))
{
memset(regs, 0, numRegs * sizeof(uint8_t));
address = 0;
}
- Cmos(Tick _latency) : SubDevice(_latency),
- rtc("rtc", foo_time, true, ULL(5000000000))
+ Cmos(EventManager *em, Tick _latency) : SubDevice(_latency),
+ rtc(em, "rtc", foo_time, true, ULL(5000000000))
{
memset(regs, 0, numRegs * sizeof(uint8_t));
address = 0;
}
- Cmos(Addr start, Addr size, Tick _latency) :
+ Cmos(EventManager *em, Addr start, Addr size, Tick _latency) :
SubDevice(start, size, _latency),
- rtc("rtc", foo_time, true, ULL(5000000000))
+ rtc(em, "rtc", foo_time, true, ULL(5000000000))
{
memset(regs, 0, numRegs * sizeof(uint8_t));
address = 0;
diff --git a/src/dev/x86/south_bridge/i8254.hh b/src/dev/x86/south_bridge/i8254.hh
index 6f718a853..b6dd388a7 100644
--- a/src/dev/x86/south_bridge/i8254.hh
+++ b/src/dev/x86/south_bridge/i8254.hh
@@ -46,13 +46,14 @@ class I8254 : public SubDevice
public:
Intel8254Timer pit;
- I8254(const std::string &name) : pit(name)
+ I8254(EventManager *em, const std::string &name) : pit(em, name)
{}
- I8254(const std::string &name, Tick _latency) :
- SubDevice(_latency), pit(name)
+ I8254(EventManager *em, const std::string &name, Tick _latency) :
+ SubDevice(_latency), pit(em, name)
{}
- I8254(const std::string &name, Addr start, Addr size, Tick _latency) :
- SubDevice(start, size, _latency), pit(name)
+ I8254(EventManager *em, const std::string &name,
+ Addr start, Addr size, Tick _latency) :
+ SubDevice(start, size, _latency), pit(em, name)
{}
Tick read(PacketPtr pkt);
diff --git a/src/dev/x86/south_bridge/south_bridge.cc b/src/dev/x86/south_bridge/south_bridge.cc
index b1f0abfe6..ded5d7ac5 100644
--- a/src/dev/x86/south_bridge/south_bridge.cc
+++ b/src/dev/x86/south_bridge/south_bridge.cc
@@ -69,8 +69,8 @@ SouthBridge::write(PacketPtr pkt)
SouthBridge::SouthBridge(const Params *p) : PioDevice(p),
pic1(0x20, 2, p->pio_latency),
pic2(0xA0, 2, p->pio_latency),
- pit(p->name + ".pit", 0x40, 4, p->pio_latency),
- cmos(0x70, 2, p->pio_latency),
+ pit(this, p->name + ".pit", 0x40, 4, p->pio_latency),
+ cmos(this, 0x70, 2, p->pio_latency),
speaker(&pit, 0x61, 1, p->pio_latency)
{
addDevice(pic1);