changeset a7892fbabd6e in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=a7892fbabd6e
description:
X86: Fix compilation with new eventq API.
diffstat:
3 files changed, 1 insertion(+), 6 deletions(-)
src/dev/x86/south_bridge/cmos.hh | 2 --
src/dev/x86/south_bridge/i8254.hh | 4 +---
src/dev/x86/south_bridge/south_bridge.cc | 1 -
diffs (80 lines):
diff -r 0e1e9c186769 -r a7892fbabd6e src/dev/x86/south_bridge/cmos.hh
--- a/src/dev/x86/south_bridge/cmos.hh Thu Oct 09 22:19:39 2008 -0700
+++ b/src/dev/x86/south_bridge/cmos.hh Fri Oct 10 03:50:07 2008 -0700
@@ -56,8 +56,9 @@
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 @@
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 -r 0e1e9c186769 -r a7892fbabd6e src/dev/x86/south_bridge/i8254.hh
--- a/src/dev/x86/south_bridge/i8254.hh Thu Oct 09 22:19:39 2008 -0700
+++ b/src/dev/x86/south_bridge/i8254.hh Fri Oct 10 03:50:07 2008 -0700
@@ -46,13 +46,14 @@
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 -r 0e1e9c186769 -r a7892fbabd6e src/dev/x86/south_bridge/south_bridge.cc
--- a/src/dev/x86/south_bridge/south_bridge.cc Thu Oct 09 22:19:39 2008 -0700
+++ b/src/dev/x86/south_bridge/south_bridge.cc Fri Oct 10 03:50:07 2008 -0700
@@ -69,8 +69,8 @@
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);
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
