xnu-1504.7.4.tar.gz

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

diff --git a/iokit/Kernel/IORangeAllocator.cpp b/iokit/Kernel/IORangeAllocator.cpp
index 26f6161ac3cf8e5af240df2de67cecf4548b6b6d..12804d24a13292d5adc89efc65ca6fab54f811ea 100644 (file)
--- a/iokit/Kernel/IORangeAllocator.cpp
+++ b/iokit/Kernel/IORangeAllocator.cpp
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * 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. 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
  * 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.
+ * 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_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (c) 1999 Apple Computer, Inc.
  */
 /*
  * Copyright (c) 1999 Apple Computer, Inc.


@@ -85,11 +91,11 @@ bool IORangeAllocator::init( IORangeScalar endOfRange,
     return( true );
 }
 
     return( true );
 }
 

-IORangeAllocator * IORangeAllocator:: withRange(
+IORangeAllocator * IORangeAllocator::withRange(

                                        IORangeScalar endOfRange,
                                        IORangeScalar endOfRange,

-                                       IORangeScalar defaultAlignment = 0,
-                                       UInt32 capacity = 0,
-                                       IOOptionBits options = 0 )
+                                       IORangeScalar defaultAlignment,
+                                       UInt32 capacity,
+                                       IOOptionBits options )

 {
     IORangeAllocator * thingy;
 
 {
     IORangeAllocator * thingy;
 


@@ -177,7 +183,7 @@ void IORangeAllocator::deallocElement( UInt32 index )
 
 bool IORangeAllocator::allocate( IORangeScalar size,
                                 IORangeScalar * result,
 
 bool IORangeAllocator::allocate( IORangeScalar size,
                                 IORangeScalar * result,

-                                IORangeScalar alignment = 0 )
+                                IORangeScalar alignment )

 {
     IORangeScalar      data, dataEnd;
     IORangeScalar      thisStart, thisEnd;
 {
     IORangeScalar      data, dataEnd;
     IORangeScalar      thisStart, thisEnd;