xnu-7195.50.7.100.1.tar.gz

[apple/xnu.git] / iokit / IOKit / IOSharedDataQueue.h

diff --git a/iokit/IOKit/IOSharedDataQueue.h b/iokit/IOKit/IOSharedDataQueue.h
index c956ce7740d9eeed6c4e02aae3fea5ae58797c57..e634da8f82e3d281dc94202d13894a19482c645f 100644 (file)
--- a/iokit/IOKit/IOSharedDataQueue.h
+++ b/iokit/IOKit/IOSharedDataQueue.h
@@ -32,6 +32,7 @@
 #define DISABLE_DATAQUEUE_WARNING /* IODataQueue is deprecated, please use IOSharedDataQueue instead */
 
 #include <IOKit/IODataQueue.h>
 #define DISABLE_DATAQUEUE_WARNING /* IODataQueue is deprecated, please use IOSharedDataQueue instead */
 
 #include <IOKit/IODataQueue.h>

+#include <libkern/c++/OSPtr.h>

 
 #undef DISABLE_DATAQUEUE_WARNING
 
 
 #undef DISABLE_DATAQUEUE_WARNING
 


@@ -87,7 +88,7 @@ public:
  * @param size The size of the data queue memory region.
  * @result Returns the newly allocated IOSharedDataQueue instance.  Zero is returned on failure.
  */
  * @param size The size of the data queue memory region.
  * @result Returns the newly allocated IOSharedDataQueue instance.  Zero is returned on failure.
  */

-       static IOSharedDataQueue *withCapacity(UInt32 size);
+       static OSPtr<IOSharedDataQueue> withCapacity(UInt32 size);

 
 /*!
  * @function withEntries
 
 /*!
  * @function withEntries


@@ -97,7 +98,7 @@ public:
  * @param entrySize Size of each entry.
  * @result Reeturns the newly allocated IOSharedDataQueue instance.  Zero is returned on failure.
  */
  * @param entrySize Size of each entry.
  * @result Reeturns the newly allocated IOSharedDataQueue instance.  Zero is returned on failure.
  */

-       static IOSharedDataQueue *withEntries(UInt32 numEntries, UInt32 entrySize);
+       static OSPtr<IOSharedDataQueue> withEntries(UInt32 numEntries, UInt32 entrySize);

 
 /*!
  * @function initWithCapacity
 
 /*!
  * @function initWithCapacity


@@ -114,7 +115,7 @@ public:
  * @discussion The IOMemoryDescriptor instance returned by this method is intended to be mapped into a user process.  This is the memory region that the IODataQueueClient code operates on.
  * @result Returns a newly allocated IOMemoryDescriptor for the IODataQueueMemory region.  Returns zero on failure.
  */
  * @discussion The IOMemoryDescriptor instance returned by this method is intended to be mapped into a user process.  This is the memory region that the IODataQueueClient code operates on.
  * @result Returns a newly allocated IOMemoryDescriptor for the IODataQueueMemory region.  Returns zero on failure.
  */

-       virtual IOMemoryDescriptor *getMemoryDescriptor() APPLE_KEXT_OVERRIDE;
+       virtual OSPtr<IOMemoryDescriptor> getMemoryDescriptor() APPLE_KEXT_OVERRIDE;

 
 /*!
  * @function peek
 
 /*!
  * @function peek