64,66c64
< typedef EventWrapper<Base, &Base::cpuInterrupt> IntrEvent;
< friend void IntrEvent::process();
< IntrEvent *intrEvent;
---
> EventFunctionWrapper *intrEvent;
199,200d196
< typedef EventWrapper<Device, &Device::rxKick> RxKickEvent;
< friend void RxKickEvent::process();
204,205d199
< typedef EventWrapper<Device, &Device::txKick> TxKickEvent;
< friend void TxKickEvent::process();
217,219c211
< typedef EventWrapper<Device, &Device::txEventTransmit> TxEvent;
< friend void TxEvent::process();
< TxEvent txEvent;
---
> EventFunctionWrapper txEvent;
248,249c240
< friend class EventWrapper<Device, &Device::rxDmaDone>;
< EventWrapper<Device, &Device::rxDmaDone> rxDmaEvent;
---
> EventFunctionWrapper rxDmaEvent;
252,253c243
< friend class EventWrapper<Device, &Device::txDmaDone>;
< EventWrapper<Device, &Device::txDmaDone> txDmaEvent;
---
> EventFunctionWrapper txDmaEvent;