diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2008-10-11 01:45:25 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2008-10-11 01:45:25 -0700 |
| commit | 539563e04b4925e88c28cb44f5180915c3b3a5be (patch) | |
| tree | de3c6c045eff66c6ba6e5f29589bb20c7c3e9ad1 /src/dev/x86/cmos.hh | |
| parent | 119e127d7128edfb729101b92ca160c1f01391ca (diff) | |
| download | gem5-539563e04b4925e88c28cb44f5180915c3b3a5be.tar.xz | |
X86: Make the CMOS and I8259 devices use IntDev and IntPin.
Diffstat (limited to 'src/dev/x86/cmos.hh')
| -rw-r--r-- | src/dev/x86/cmos.hh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/dev/x86/cmos.hh b/src/dev/x86/cmos.hh index 337fb8b02..45fb9e8f2 100644 --- a/src/dev/x86/cmos.hh +++ b/src/dev/x86/cmos.hh @@ -38,7 +38,7 @@ namespace X86ISA { -class I8259; +class IntPin; class Cmos : public BasicPioDevice { @@ -57,13 +57,11 @@ class Cmos : public BasicPioDevice class X86RTC : public MC146818 { protected: - I8259 * i8259; - int intLine; + IntPin * intPin; public: X86RTC(EventManager *em, const std::string &n, const struct tm time, - bool bcd, Tick frequency, I8259 *_i8259, int _intLine) : - MC146818(em, n, time, bcd, frequency), - i8259(_i8259), intLine(_intLine) + bool bcd, Tick frequency, IntPin * _intPin) : + MC146818(em, n, time, bcd, frequency), intPin(_intPin) { } protected: @@ -74,8 +72,7 @@ class Cmos : public BasicPioDevice typedef CmosParams Params; Cmos(const Params *p) : BasicPioDevice(p), latency(p->pio_latency), - rtc(this, "rtc", p->time, true, ULL(5000000000), - p->i8259, p->int_line) + rtc(this, "rtc", p->time, true, ULL(5000000000), p->int_pin) { pioSize = 2; memset(regs, 0, numRegs * sizeof(uint8_t)); |