sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

X86: Fix compilation with new eventq API.

Browse source
This commit is contained in:
Gabe Black 2008-10-10 03:50:07 -07:00
parent 94b08bed07
commit 57d663877e
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/dev/x86/south_bridge/cmos.hh
View file

@ -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;

11
src/dev/x86/south_bridge/i8254.hh
View file

@ -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);

4
src/dev/x86/south_bridge/south_bridge.cc
View file

@ -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);