diff -r a1030fdb26d3 -r 5fb3262c7a09 src/dev/arm/pl111.cc --- a/src/dev/arm/pl111.cc Fri Feb 11 18:39:38 2011 -0600 +++ b/src/dev/arm/pl111.cc Fri Feb 11 18:39:59 2011 -0600 @@ -586,6 +586,29 @@ SERIALIZE_SCALAR(curAddr); SERIALIZE_SCALAR(waterMark); SERIALIZE_SCALAR(dmaPendingNum); + + Tick int_event_time = 0; + Tick read_event_time = 0; + Tick fill_fifo_event_time = 0; + + if (readEvent.scheduled()) + read_event_time = readEvent.when(); + if (fillFifoEvent.scheduled()) + fill_fifo_event_time = fillFifoEvent.when(); + if (intEvent.scheduled()) + int_event_time = intEvent.when(); + + SERIALIZE_SCALAR(read_event_time); + SERIALIZE_SCALAR(fill_fifo_event_time); + SERIALIZE_SCALAR(int_event_time); + + vector dma_done_event_tick; + dma_done_event_tick.resize(maxOutstandingDma); + for (int x = 0; x < maxOutstandingDma; x++) { + dma_done_event_tick[x] = dmaDoneEvent[x].scheduled() ? + dmaDoneEvent[x].when() : 0; + } + arrayParamOut(os, "dma_done_event_tick", dma_done_event_tick); } void @@ -667,6 +690,29 @@ UNSERIALIZE_SCALAR(waterMark); UNSERIALIZE_SCALAR(dmaPendingNum); + Tick int_event_time = 0; + Tick read_event_time = 0; + Tick fill_fifo_event_time = 0; + + UNSERIALIZE_SCALAR(read_event_time); + UNSERIALIZE_SCALAR(fill_fifo_event_time); + UNSERIALIZE_SCALAR(int_event_time); + + if (int_event_time) + schedule(intEvent, int_event_time); + if (read_event_time) + schedule(readEvent, read_event_time); + if (fill_fifo_event_time) + schedule(fillFifoEvent, fill_fifo_event_time); + + vector dma_done_event_tick; + dma_done_event_tick.resize(maxOutstandingDma); + arrayParamIn(cp, section, "dma_done_event_tick", dma_done_event_tick); + for (int x = 0; x < maxOutstandingDma; x++) { + if (dma_done_event_tick[x]) + schedule(dmaDoneEvent[x], dma_done_event_tick[x]); + } + updateVideoParams(); if (vncserver) vncserver->setDirty();