From 6a8ae7a6a040876e697dfa8b837e1ba1bd7e1fd5 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Thu, 28 Jul 2005 11:47:06 -0400 Subject: ghgfsdf dev/pciconfigall.cc: removed union. dev/pcidev.cc: . dev/rtcreg.h: more macros to avoid magic numbers. dev/tsunami_io.cc: replaced magic numbers, no more advancing RTC as it isn't reaaly necessary. dev/tsunami_io.hh: removed declarations of things that go unused. dev/uart8250.cc: reading the Interrupt ID register should clear TX interrupt flag. dev/uart8250.hh: useful #defines. kern/freebsd/freebsd_system.cc: kern/freebsd/freebsd_system.hh: nothing. python/m5/objects/Pci.py: new PciFake. --HG-- extra : convert_revision : 88259704f5b215591d1416360180810fcda14d26 --- dev/tsunami_io.hh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'dev/tsunami_io.hh') diff --git a/dev/tsunami_io.hh b/dev/tsunami_io.hh index 4b28635e8..7054b4ff4 100644 --- a/dev/tsunami_io.hh +++ b/dev/tsunami_io.hh @@ -51,7 +51,7 @@ class TsunamiIO : public PioDevice /** The size of mappad from the above address */ static const Addr size = 0xff; - static struct tm tm; + struct tm tm; /** * In Tsunami RTC only has two i/o ports one for data and one for @@ -154,9 +154,6 @@ class TsunamiIO : public PioDevice Tsunami* tsunami; Tick interval; - /** Count of the number of RTC interrupts that have occured */ - uint32_t intr_count; - public: /** * RTC Event initializes the RTC event by scheduling an event @@ -165,7 +162,7 @@ class TsunamiIO : public PioDevice RTCEvent(Tsunami* t, Tick i); /** - * Interrupth the processor and reschedule the event. + * Interrupt the processor and reschedule the event. */ virtual void process(); @@ -187,6 +184,8 @@ class TsunamiIO : public PioDevice * @param section The section name of this object */ virtual void unserialize(Checkpoint *cp, const std::string §ion); + + void scheduleIntr(); }; /** uip UpdateInProgess says that the rtc is updating, but we just fake it @@ -243,7 +242,7 @@ class TsunamiIO : public PioDevice * This variable contains a flag as to how many writes have happened, and * the time so far. */ - uint32_t timerData; + uint16_t timerData; public: /** -- cgit v1.2.3