xnu-1699.24.8.tar.gz

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

diff --git a/iokit/Kernel/IOMemoryCursor.cpp b/iokit/Kernel/IOMemoryCursor.cpp
index 2487209f813e07e48143d8fd32920886596d407e..99999991d92eef222d389b71e963a97670150158 100644 (file)
--- a/iokit/Kernel/IOMemoryCursor.cpp
+++ b/iokit/Kernel/IOMemoryCursor.cpp
@@ -72,7 +72,7 @@ IOMemoryCursor::initWithSpecification(SegmentFunction  inSegFunc,
 static UInt sMaxDBDMASegment;
 if (!sMaxDBDMASegment) {
     sMaxDBDMASegment = (UInt) -1;
 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);
 }
 
         IOLog("Setting MaxDBDMASegment to %d\n", sMaxDBDMASegment);
 }
 


@@ -101,7 +101,7 @@ if (inMaxSegmentSize > sMaxDBDMASegment) inMaxSegmentSize = sMaxDBDMASegment;
 
 UInt32 
 IOMemoryCursor::genPhysicalSegments(IOMemoryDescriptor *inDescriptor,
 
 UInt32 
 IOMemoryCursor::genPhysicalSegments(IOMemoryDescriptor *inDescriptor,

-                                    IOPhysicalLength   fromPosition,
+                                    IOByteCount                fromPosition,

                                     void *             inSegments,
                                     UInt32             inMaxSegments,
                                     UInt32             inMaxTransferSize,
                                     void *             inSegments,
                                     UInt32             inMaxSegments,
                                     UInt32             inMaxTransferSize,


@@ -133,7 +133,7 @@ IOMemoryCursor::genPhysicalSegments(IOMemoryDescriptor *inDescriptor,
         if (!seg.location)
         {
             seg.location = inDescriptor->getPhysicalSegment(
         if (!seg.location)
         {
             seg.location = inDescriptor->getPhysicalSegment(

-                               fromPosition, &seg.length);
+                               fromPosition, (IOByteCount*)&seg.length);

             assert(seg.location);
             assert(seg.length);
             fromPosition += seg.length;
             assert(seg.location);
             assert(seg.length);
             fromPosition += seg.length;


@@ -325,66 +325,3 @@ IOLittleMemoryCursor::initWithSpecification(IOPhysicalLength inMaxSegmentSize,
                                         inMaxTransferSize,
                                         inAlignment);
 }
                                         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__) */
-