xnu-344.23.tar.gz

[apple/xnu.git] / iokit / Drivers / platform / drvAppleMacIO / AppleMacIO.cpp

diff --git a/iokit/Drivers/platform/drvAppleMacIO/AppleMacIO.cpp b/iokit/Drivers/platform/drvAppleMacIO/AppleMacIO.cpp
index c145435f0cd05e6110b171383db0e995283a3f24..062a140d08627758821a05d6f94798f3b4ef52bc 100644 (file)
--- a/iokit/Drivers/platform/drvAppleMacIO/AppleMacIO.cpp
+++ b/iokit/Drivers/platform/drvAppleMacIO/AppleMacIO.cpp
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * 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
- * compliance with the License. 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
+ * This 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,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * 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 OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -269,28 +266,17 @@ OSMetaClassDefineReservedUnused(AppleMacIODevice,  3);
 bool AppleMacIODevice::compareName( OSString * name,
                                        OSString ** matched = 0 ) const
 {
-  return (IODTCompareNubName(this, name, matched) ||
-         IORegistryEntry::compareName(name, matched));
+    return( ((AppleMacIO *)getProvider())->
+               compareNubName( this, name, matched ));
 }
 
 IOService * AppleMacIODevice::matchLocation( IOService * /* client */ )
 {
-  return this;
+      return( this );
 }
 
 IOReturn AppleMacIODevice::getResources( void )
 {
-  IOService *macIO = this;
-  
-  if (getDeviceMemory() != 0) return kIOReturnSuccess;
-  
-  while (macIO && ((macIO = macIO->getProvider()) != 0))
-    if (strcmp("mac-io", macIO->getName()) == 0) break;
-  
-  if (macIO == 0) return kIOReturnError;
-  
-  IODTResolveAddressing(this, "reg", macIO->getDeviceMemoryWithIndex(0));
-  
-  return kIOReturnSuccess;
+    return( ((AppleMacIO *)getProvider())->getNubResources( this ));
 }