X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..008676633c2ad2c325837c2b64915f7ded690a8f:/iokit/Kernel/IODeviceMemory.cpp diff --git a/iokit/Kernel/IODeviceMemory.cpp b/iokit/Kernel/IODeviceMemory.cpp index dbd731921..f7ed8020c 100644 --- a/iokit/Kernel/IODeviceMemory.cpp +++ b/iokit/Kernel/IODeviceMemory.cpp @@ -1,16 +1,19 @@ /* * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ - * - * Copyright (c) 1999-2003 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 - * 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. + * compliance with the License. The rights granted to you under the License + * may not be used to create, or enable the creation or redistribution of, + * 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. * * The Original Code and all software distributed under the License are * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER @@ -20,10 +23,11 @@ * Please see the License for the specific language governing rights and * limitations under the License. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ #include +#include /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -31,8 +35,8 @@ IODeviceMemory * IODeviceMemory::withRange( IOPhysicalAddress start, IOPhysicalLength length ) { - return( (IODeviceMemory *) IOMemoryDescriptor::withPhysicalAddress( - start, length, kIODirectionNone )); + return( (IODeviceMemory *) IOMemoryDescriptor::withAddressRange( + start, length, kIODirectionNone | kIOMemoryMapperNone, NULL )); } @@ -41,7 +45,7 @@ IODeviceMemory * IODeviceMemory::withSubRange( IOPhysicalAddress offset, IOPhysicalLength length ) { - return( (IODeviceMemory *) IOMemoryDescriptor::withSubRange( + return( (IODeviceMemory *) IOSubMemoryDescriptor::withSubRange( of, offset, length, kIODirectionNone )); }