259,260c259
< friend class EventWrapper<NSGigE, &NSGigE::rxDmaReadDone>;
< EventWrapper<NSGigE, &NSGigE::rxDmaReadDone> rxDmaReadEvent;
---
> EventFunctionWrapper rxDmaReadEvent;
263,264c262
< friend class EventWrapper<NSGigE, &NSGigE::rxDmaWriteDone>;
< EventWrapper<NSGigE, &NSGigE::rxDmaWriteDone> rxDmaWriteEvent;
---
> EventFunctionWrapper rxDmaWriteEvent;
267,268c265
< friend class EventWrapper<NSGigE, &NSGigE::txDmaReadDone>;
< EventWrapper<NSGigE, &NSGigE::txDmaReadDone> txDmaReadEvent;
---
> EventFunctionWrapper txDmaReadEvent;
271,272c268
< friend class EventWrapper<NSGigE, &NSGigE::txDmaWriteDone>;
< EventWrapper<NSGigE, &NSGigE::txDmaWriteDone> txDmaWriteEvent;
---
> EventFunctionWrapper txDmaWriteEvent;
287,289c283
< typedef EventWrapper<NSGigE, &NSGigE::rxKick> RxKickEvent;
< friend void RxKickEvent::process();
< RxKickEvent rxKickEvent;
---
> EventFunctionWrapper rxKickEvent;
293,295c287
< typedef EventWrapper<NSGigE, &NSGigE::txKick> TxKickEvent;
< friend void TxKickEvent::process();
< TxKickEvent txKickEvent;
---
> EventFunctionWrapper txKickEvent;
309,311c301
< typedef EventWrapper<NSGigE, &NSGigE::txEventTransmit> TxEvent;
< friend void TxEvent::process();
< TxEvent txEvent;
---
> EventFunctionWrapper txEvent;
342,344c332
< typedef EventWrapper<NSGigE, &NSGigE::cpuInterrupt> IntrEvent;
< friend void IntrEvent::process();
< IntrEvent *intrEvent;
---
> EventFunctionWrapper *intrEvent;