xnu-6153.141.1.tar.gz

[apple/xnu.git] / iokit / Kernel / IODMAController.cpp

diff --git a/iokit/Kernel/IODMAController.cpp b/iokit/Kernel/IODMAController.cpp
index 33a54dc76bb8972d47b0e68c43ea6cc2e83602fd..8650d618996f2fa6fc30608b665610a49238937d 100644 (file)
--- a/iokit/Kernel/IODMAController.cpp
+++ b/iokit/Kernel/IODMAController.cpp
@@ -2,7 +2,7 @@
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 


@@ -32,68 +32,88 @@
 #define super IOService
 OSDefineMetaClassAndAbstractStructors(IODMAController, IOService);
 
 #define super IOService
 OSDefineMetaClassAndAbstractStructors(IODMAController, IOService);
 

-const OSSymbol *IODMAController::createControllerName(UInt32 phandle)
+const OSSymbol *
+IODMAController::createControllerName(UInt32 phandle)

 {
 #define CREATE_BUF_LEN 48
 {
 #define CREATE_BUF_LEN 48

-  char           buf[CREATE_BUF_LEN];
-  
-  snprintf(buf, CREATE_BUF_LEN, "IODMAController%08X", (uint32_t)phandle);
-  
-  return OSSymbol::withCString(buf);
+       char           buf[CREATE_BUF_LEN];
+
+       snprintf(buf, CREATE_BUF_LEN, "IODMAController%08X", (uint32_t)phandle);
+
+       return OSSymbol::withCString(buf);

 }
 
 }
 

-IODMAController *IODMAController::getController(IOService *provider, UInt32 dmaIndex)
+IODMAController *
+IODMAController::getController(IOService *provider, UInt32 dmaIndex)

 {
 {

-  OSData          *dmaParentData;
-  const OSSymbol  *dmaParentName;
-  IODMAController *dmaController;
-  
-  // Find the name of the parent dma controller
-  dmaParentData = OSDynamicCast(OSData, provider->getProperty("dma-parent"));
-  if (dmaParentData == 0) return false;
-  dmaParentName = createControllerName(*(UInt32 *)dmaParentData->getBytesNoCopy());
-  if (dmaParentName == 0) return false;
-  
-  // Wait for the parent dma controller
-  dmaController = OSDynamicCast(IODMAController, IOService::waitForService(IOService::nameMatching(dmaParentName)));
-  
-  return dmaController;
+       OSData          *dmaParentData;
+       const OSSymbol  *dmaParentName;
+       IODMAController *dmaController;
+
+       // Find the name of the parent dma controller
+       dmaParentData = OSDynamicCast(OSData, provider->getProperty("dma-parent"));
+       if (dmaParentData == NULL) {
+               return NULL;
+       }
+
+       if (dmaParentData->getLength() == sizeof(UInt32)) {
+               dmaParentName = createControllerName(*(UInt32 *)dmaParentData->getBytesNoCopy());
+       } else {
+               if (dmaIndex >= dmaParentData->getLength() / sizeof(UInt32)) {
+                       panic("dmaIndex out of range");
+               }
+               dmaParentName = createControllerName(*(UInt32 *)dmaParentData->getBytesNoCopy(dmaIndex * sizeof(UInt32), sizeof(UInt32)));
+       }
+       if (dmaParentName == NULL) {
+               return NULL;
+       }
+
+       // Wait for the parent dma controller
+       dmaController = OSDynamicCast(IODMAController, IOService::waitForService(IOService::nameMatching(dmaParentName)));
+
+       return dmaController;

 }
 
 
 }
 
 

-bool IODMAController::start(IOService *provider)
+bool
+IODMAController::start(IOService *provider)

 {
 {

-  if (!super::start(provider)) return false;
-  
-  _provider = provider;
-  
-  return true;
+       if (!super::start(provider)) {
+               return false;
+       }
+
+       _provider = provider;
+
+       return true;

 }
 
 
 // protected
 
 }
 
 
 // protected
 

-void IODMAController::registerDMAController(IOOptionBits options)
+void
+IODMAController::registerDMAController(IOOptionBits options)

 {
 {

-  OSData *phandleData;
-  
-  phandleData = OSDynamicCast(OSData, _provider->getProperty("AAPL,phandle"));
-  
-  _dmaControllerName = createControllerName(*(UInt32 *)phandleData->getBytesNoCopy());
-  
-  setName(_dmaControllerName);
-  
-  registerService(options | ((options & kIOServiceAsynchronous) ? 0 : kIOServiceSynchronous));
+       OSData *phandleData;
+
+       phandleData = OSDynamicCast(OSData, _provider->getProperty("AAPL,phandle"));
+
+       _dmaControllerName = createControllerName(*(UInt32 *)phandleData->getBytesNoCopy());
+
+       setName(_dmaControllerName);
+
+       registerService(options | ((options & kIOServiceAsynchronous) ? 0 : kIOServiceSynchronous));

 }
 
 }
 

-void IODMAController::completeDMACommand(IODMAEventSource *dmaES, IODMACommand *dmaCommand)
+void
+IODMAController::completeDMACommand(IODMAEventSource *dmaES, IODMACommand *dmaCommand)

 {
 {

-  dmaES->completeDMACommand(dmaCommand);
+       dmaES->completeDMACommand(dmaCommand);

 }
 
 }
 

-void IODMAController::notifyDMACommand(IODMAEventSource *dmaES, IODMACommand *dmaCommand, IOReturn status, IOByteCount actualByteCount)
+void
+IODMAController::notifyDMACommand(IODMAEventSource *dmaES, IODMACommand *dmaCommand, IOReturn status, IOByteCount actualByteCount, AbsoluteTime timeStamp)

 {
 {

-  dmaES->notifyDMACommand(dmaCommand, status, actualByteCount);
+       dmaES->notifyDMACommand(dmaCommand, status, actualByteCount, timeStamp);

 }
 
 
 }