xnu-3789.60.24.tar.gz

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

diff --git a/iokit/Kernel/IOMemoryCursor.cpp b/iokit/Kernel/IOMemoryCursor.cpp
index ccc9539571a2d2369e34fcbcfe374d52d341892e..99999991d92eef222d389b71e963a97670150158 100644 (file)
--- a/iokit/Kernel/IOMemoryCursor.cpp
+++ b/iokit/Kernel/IOMemoryCursor.cpp
@@ -1,23 +1,29 @@
 /*
  * 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,
- * 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@
  */
 /* IOMemoryCursor.cpp created by wgulland on 1999-3-02 */
 
@@ -66,7 +72,7 @@ IOMemoryCursor::initWithSpecification(SegmentFunction  inSegFunc,
 static UInt sMaxDBDMASegment;
 if (!sMaxDBDMASegment) {
     sMaxDBDMASegment = (UInt) -1;
-    if (PE_parse_boot_arg("mseg", &sMaxDBDMASegment))
+    if (PE_parse_boot_argn("mseg", &sMaxDBDMASegment, sizeof (sMaxDBDMASegment)))
         IOLog("Setting MaxDBDMASegment to %d\n", sMaxDBDMASegment);
 }
 
@@ -95,7 +101,7 @@ if (inMaxSegmentSize > sMaxDBDMASegment) inMaxSegmentSize = sMaxDBDMASegment;
 
 UInt32 
 IOMemoryCursor::genPhysicalSegments(IOMemoryDescriptor *inDescriptor,
-                                    IOPhysicalLength   fromPosition,
+                                    IOByteCount                fromPosition,
                                     void *             inSegments,
                                     UInt32             inMaxSegments,
                                     UInt32             inMaxTransferSize,
@@ -127,7 +133,7 @@ IOMemoryCursor::genPhysicalSegments(IOMemoryDescriptor *inDescriptor,
         if (!seg.location)
         {
             seg.location = inDescriptor->getPhysicalSegment(
-                               fromPosition, &seg.length);
+                               fromPosition, (IOByteCount*)&seg.length);
             assert(seg.location);
             assert(seg.length);
             fromPosition += seg.length;
@@ -319,66 +325,3 @@ IOLittleMemoryCursor::initWithSpecification(IOPhysicalLength inMaxSegmentSize,
                                         inMaxTransferSize,
                                         inAlignment);
 }
-
-/************************* class IODBDMAMemoryCursor *************************/
-
-#if defined(__ppc__)
-
-#include <IOKit/ppc/IODBDMA.h>
-
-#undef super
-#define super IOMemoryCursor
-OSDefineMetaClassAndStructors(IODBDMAMemoryCursor, IOMemoryCursor)
-
-void 
-IODBDMAMemoryCursor::outputSegment(PhysicalSegment inSegment,
-                                   void *         inSegments,
-                                   UInt32         inSegmentIndex)
-{
-    IODBDMADescriptor *segment;
-
-    segment = &((IODBDMADescriptor *) inSegments)[inSegmentIndex];
-
-    // Write location into address field
-    OSWriteSwapInt32((UInt32 *) segment, 4, inSegment.location);
-
-    // Write count into 1st two bytes of operation field.
-    // DO NOT touch rest of operation field as it should contain a STOP command.
-    OSWriteSwapInt16((UInt16 *) segment, 0, inSegment.length);
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-IODBDMAMemoryCursor *
-IODBDMAMemoryCursor::withSpecification(IOPhysicalLength inMaxSegmentSize,
-                                       IOPhysicalLength inMaxTransferSize,
-                                       IOPhysicalLength inAlignment)
-{
-    IODBDMAMemoryCursor *me = new IODBDMAMemoryCursor;
-
-    if (me && !me->initWithSpecification(inMaxSegmentSize,
-                                         inMaxTransferSize,
-                                         inAlignment))
-    {
-        me->release();
-        return 0;
-    }
-
-    return me;
-}
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-bool
-IODBDMAMemoryCursor::initWithSpecification(IOPhysicalLength inMaxSegmentSize,
-                                           IOPhysicalLength inMaxTransferSize,
-                                           IOPhysicalLength inAlignment)
-{
-    return super::initWithSpecification(&IODBDMAMemoryCursor::outputSegment,
-                                        inMaxSegmentSize,
-                                        inMaxTransferSize,
-                                        inAlignment);
-}
-
-#endif /* defined(__ppc__) */
-