42a43
> #include "sim/sim_object.hh"
108,109c109,114
< deschedule(tickEvent);
< deschedule(event);
---
> if (tickEvent.scheduled()) {
> deschedule(tickEvent);
> }
> if (event.scheduled()) {
> deschedule(event);
> }
205a211,224
> unsigned int
> MC146818::drain(Event *de)
> {
> if (event.scheduled()) {
> rtcTimerInterruptTickOffset = event.when() - curTick;
> rtcClockTickOffset = event.when() - curTick;
> deschedule(event);
> }
> if (tickEvent.scheduled()) {
> deschedule(tickEvent);
> }
> return 0;
> }
>
217d235
< Tick rtcTimerInterruptTickOffset = event.when() - curTick;
219d236
< Tick rtcClockTickOffset = event.when() - curTick;