63c63
< /** The platform that device/port are in. This is used to select which mode
---
> /** The system that device/port are in. This is used to select which mode
65c65
< Platform *platform;
---
> System *sys;
108a109,117
> /** Number of timing requests that are emulating the device timing before
> * attempting to end up on the bus.
> */
> int outTiming;
>
> /** If we need to drain, keep the drain event around until we're done
> * here.*/
> Event *drainEvent;
>
111c120
< { new PioPort::SendEvent(this, pkt, time); }
---
> { outTiming++; new PioPort::SendEvent(this, pkt, time); }
118c127
< PioPort(PioDevice *dev, Platform *p, std::string pname = "-pioport");
---
> PioPort(PioDevice *dev, System *s, std::string pname = "-pioport");
119a129,130
> unsigned int drain(Event *de);
>
150c161
< /** The platform that device/port are in. This is used to select which mode
---
> /** The system that device/port are in. This is used to select which mode
152c163
< Platform *platform;
---
> System *sys;
156a168,174
> /** If a dmaAction is in progress. */
> int actionInProgress;
>
> /** If we need to drain, keep the drain event around until we're done
> * here.*/
> Event *drainEvent;
>
174c192
< DmaPort(DmaDevice *dev, Platform *p);
---
> DmaPort(DmaDevice *dev, System *s);
180a199
> unsigned int drain(Event *de);
198a218,219
> System *sys;
>
243,244c264,265
< : MemObject(p->name), platform(p->platform), pioPort(NULL),
< _params(p)
---
> : MemObject(p->name), platform(p->platform), sys(p->system),
> pioPort(NULL), _params(p)
250a272,273
> virtual unsigned int drain(Event *de);
>
256c279
< pioPort = new PioPort(this, params()->platform);
---
> pioPort = new PioPort(this, sys);
312a336,337
> virtual unsigned int drain(Event *de);
>
318c343
< pioPort = new PioPort(this, params()->platform);
---
> pioPort = new PioPort(this, sys);
323c348
< dmaPort = new DmaPort(this, params()->platform);
---
> dmaPort = new DmaPort(this, sys);