101,102c101
< //friend class EventWrapper<IGbE, &IGbE::rdtrProcess>;
< EventWrapper<IGbE, &IGbE::rdtrProcess> rdtrEvent;
---
> EventFunctionWrapper rdtrEvent;
112,113c111
< //friend class EventWrapper<IGbE, &IGbE::radvProcess>;
< EventWrapper<IGbE, &IGbE::radvProcess> radvEvent;
---
> EventFunctionWrapper radvEvent;
123,124c121
< //friend class EventWrapper<IGbE, &IGbE::tadvProcess>;
< EventWrapper<IGbE, &IGbE::tadvProcess> tadvEvent;
---
> EventFunctionWrapper tadvEvent;
133,134c130
< //friend class EventWrapper<IGbE, &IGbE::tidvProcess>;
< EventWrapper<IGbE, &IGbE::tidvProcess> tidvEvent;
---
> EventFunctionWrapper tidvEvent;
138,139c134
< //friend class EventWrapper<IGbE, &IGbE::tick>;
< EventWrapper<IGbE, &IGbE::tick> tickEvent;
---
> EventFunctionWrapper tickEvent;
165c160
< EventWrapper<IGbE, &IGbE::delayIntEvent> interEvent;
---
> EventFunctionWrapper interEvent;
287c282
< EventWrapper<DescCache, &DescCache::writeback1> wbDelayEvent;
---
> EventFunctionWrapper wbDelayEvent;
294c289
< EventWrapper<DescCache, &DescCache::fetchDescriptors1> fetchDelayEvent;
---
> EventFunctionWrapper fetchDelayEvent;
299c294
< EventWrapper<DescCache, &DescCache::fetchComplete> fetchEvent;
---
> EventFunctionWrapper fetchEvent;
304c299
< EventWrapper<DescCache, &DescCache::wbComplete> wbEvent;
---
> EventFunctionWrapper wbEvent;
387c382
< EventWrapper<RxDescCache, &RxDescCache::pktComplete> pktEvent;
---
> EventFunctionWrapper pktEvent;
392,393c387,388
< EventWrapper<RxDescCache, &RxDescCache::pktSplitDone> pktHdrEvent;
< EventWrapper<RxDescCache, &RxDescCache::pktSplitDone> pktDataEvent;
---
> EventFunctionWrapper pktHdrEvent;
> EventFunctionWrapper pktDataEvent;
487c482
< EventWrapper<TxDescCache, &TxDescCache::pktComplete> pktEvent;
---
> EventFunctionWrapper pktEvent;
490c485
< EventWrapper<TxDescCache, &TxDescCache::headerComplete> headerEvent;
---
> EventFunctionWrapper headerEvent;
506c501
< EventWrapper<TxDescCache, &TxDescCache::nullCallback> nullEvent;
---
> EventFunctionWrapper nullEvent;