Loading...
--- xnu/xnu-4570.71.2/iokit/Kernel/IODMAEventSource.cpp
+++ xnu/xnu-1228/iokit/Kernel/IODMAEventSource.cpp
@@ -65,12 +65,6 @@
return true;
}
-void IODMAEventSource::free()
-{
- if (dmaCommandsCompletedLock != NULL) IOSimpleLockFree(dmaCommandsCompletedLock);
- super::free();
-}
-
IODMAEventSource *IODMAEventSource::dmaEventSource(OSObject *inOwner,
IOService *inProvider,
Action inCompletion,
@@ -109,7 +103,7 @@
return kIOReturnSuccess;
}
-IOReturn IODMAEventSource::stopDMACommand(bool flush, uint64_t timeout)
+IOReturn IODMAEventSource::stopDMACommand(bool flush, mach_timespec_t *timeout)
{
if ((dmaController == 0) || (dmaIndex == 0xFFFFFFFF)) return kIOReturnError;
@@ -124,37 +118,6 @@
return dmaController->queryDMACommand(dmaIndex, dmaCommand, transferCount, waitForIdle);
}
-
-IOByteCount IODMAEventSource::getFIFODepth(IODirection direction)
-{
- if ((dmaController == 0) || (dmaIndex == 0xFFFFFFFF)) return 0;
-
- return dmaController->getFIFODepth(dmaIndex, direction);
-}
-
-
-IOReturn IODMAEventSource::setFIFODepth(IOByteCount depth)
-{
- if ((dmaController == 0) || (dmaIndex == 0xFFFFFFFF)) return kIOReturnError;
-
- return dmaController->setFIFODepth(dmaIndex, depth);
-}
-
-
-IOByteCount IODMAEventSource::validFIFODepth(IOByteCount depth, IODirection direction)
-{
- if ((dmaController == 0) || (dmaIndex == 0xFFFFFFFF)) return kIOReturnError;
-
- return dmaController->validFIFODepth(dmaIndex, depth, direction);
-}
-
-
-IOReturn IODMAEventSource::setFrameSize(UInt8 byteCount)
-{
- if ((dmaController == 0) || (dmaIndex == 0xFFFFFFFF)) return kIOReturnError;
-
- return dmaController->setFrameSize(dmaIndex, byteCount);
-}
// protected
@@ -174,7 +137,7 @@
IOSimpleLockUnlock(dmaCommandsCompletedLock);
if (work) {
- (*dmaCompletionAction)(owner, this, dmaCommand, dmaCommand->reserved->fStatus, dmaCommand->reserved->fActualByteCount, dmaCommand->reserved->fTimeStamp);
+ (*dmaCompletionAction)(owner, this, dmaCommand, dmaCommand->reserved->fStatus, dmaCommand->reserved->fActualByteCount);
}
return again;
@@ -194,21 +157,10 @@
}
}
-void IODMAEventSource::notifyDMACommand(IODMACommand *dmaCommand, IOReturn status, IOByteCount actualByteCount, AbsoluteTime timeStamp)
+void IODMAEventSource::notifyDMACommand(IODMACommand *dmaCommand, IOReturn status, IOByteCount actualByteCount)
{
dmaCommand->reserved->fStatus = status;
- dmaCommand->reserved->fActualByteCount = actualByteCount;
- dmaCommand->reserved->fTimeStamp = timeStamp;
+ dmaCommand->reserved->fActualByteCount = actualByteCount;
- if (dmaNotificationAction != 0) (*dmaNotificationAction)(owner, this, dmaCommand, status, actualByteCount, timeStamp);
+ if (dmaNotificationAction != 0) (*dmaNotificationAction)(owner, this, dmaCommand, status, actualByteCount);
}
-
-IOReturn IODMAEventSource::setDMAConfig(UInt32 newReqIndex)
-{
- return dmaController->setDMAConfig(dmaIndex, dmaProvider, newReqIndex);
-}
-
-bool IODMAEventSource::validDMAConfig(UInt32 newReqIndex)
-{
- return dmaController->validDMAConfig(dmaIndex, dmaProvider, newReqIndex);
-}