Loading...
--- xnu/xnu-792.12.6/iokit/Kernel/IOMultiMemoryDescriptor.cpp
+++ xnu/xnu-201/iokit/Kernel/IOMultiMemoryDescriptor.cpp
@@ -1,31 +1,23 @@
/*
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_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. 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
- * 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.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 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 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 OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
*/
#include <IOKit/IOLib.h>
@@ -95,7 +87,7 @@
IOMemoryDescriptor ** descriptors,
UInt32 withCount,
IODirection withDirection,
- bool asReference )
+ bool asReference = false )
{
//
// Create a new IOMultiMemoryDescriptor. The "buffer" is made up of several
@@ -126,7 +118,7 @@
IOMemoryDescriptor ** descriptors,
UInt32 withCount,
IODirection withDirection,
- bool asReference )
+ bool asReference = false )
{
//
// Initialize an IOMultiMemoryDescriptor. The "buffer" is made up of several
@@ -139,19 +131,10 @@
assert(descriptors);
assert(withCount);
- // Release existing descriptors, if any
- if ( _descriptors )
- {
- for ( unsigned index = 0; index < _descriptorsCount; index++ )
- _descriptors[index]->release();
-
- if ( _descriptorsIsAllocated )
- IODelete(_descriptors, IOMemoryDescriptor *, _descriptorsCount);
- } else {
- // Ask our superclass' opinion.
- if ( super::init() == false ) return false;
- }
-
+ // Ask our superclass' opinion.
+
+ if ( super::init() == false ) return false;
+
// Initialize our minimal state.
_descriptors = 0;