309,310c309
< friend class EventWrapper<IdeDisk, &IdeDisk::doDmaTransfer>;
< EventWrapper<IdeDisk, &IdeDisk::doDmaTransfer> dmaTransferEvent;
---
> EventFunctionWrapper dmaTransferEvent;
316,317c315
< friend class EventWrapper<IdeDisk, &IdeDisk::doDmaRead>;
< EventWrapper<IdeDisk, &IdeDisk::doDmaRead> dmaReadWaitEvent;
---
> EventFunctionWrapper dmaReadWaitEvent;
323,324c321
< friend class EventWrapper<IdeDisk, &IdeDisk::doDmaWrite>;
< EventWrapper<IdeDisk, &IdeDisk::doDmaWrite> dmaWriteWaitEvent;
---
> EventFunctionWrapper dmaWriteWaitEvent;
327,328c324
< friend class EventWrapper<IdeDisk, &IdeDisk::dmaPrdReadDone>;
< EventWrapper<IdeDisk, &IdeDisk::dmaPrdReadDone> dmaPrdReadEvent;
---
> EventFunctionWrapper dmaPrdReadEvent;
331,332c327
< friend class EventWrapper<IdeDisk, &IdeDisk::dmaReadDone>;
< EventWrapper<IdeDisk, &IdeDisk::dmaReadDone> dmaReadEvent;
---
> EventFunctionWrapper dmaReadEvent;
335,336c330
< friend class EventWrapper<IdeDisk, &IdeDisk::dmaWriteDone>;
< EventWrapper<IdeDisk, &IdeDisk::dmaWriteDone> dmaWriteEvent;
---
> EventFunctionWrapper dmaWriteEvent;