xnu-1504.7.4.tar.gz

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

diff --git a/iokit/IOKit/IOCatalogue.h b/iokit/IOKit/IOCatalogue.h
index f666bf4265aaf4deeb2680227a9e5c3aa3191414..f087396fddba14851a481ebf4716dc86810383d8 100644 (file)
--- a/iokit/IOKit/IOCatalogue.h
+++ b/iokit/IOKit/IOCatalogue.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2000 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -26,7 +26,7 @@
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*

- * Copyright (c) 1998 Apple Computer, Inc.  All rights reserved. 
+ * Copyright (c) 1998 Apple Inc.  All rights reserved. 

  *
  * HISTORY
  *
  *
  * HISTORY
  *


@@ -62,7 +62,12 @@ private:
     IOLock *                 lock;
     SInt32                   generation;
 
     IOLock *                 lock;
     SInt32                   generation;
 

+/* This stuff is no longer used at all but was exported in prior
+ * releases, so we keep it around for PPC/i386 only.
+ */
+#if __ppc__ || __i386__

     IOLock *                 kld_lock;
     IOLock *                 kld_lock;

+#endif /* __ppc__ || __i386__ */

 
 public:
     /*!
 
 public:
     /*!


@@ -210,6 +215,10 @@ public:
 
     bool serializeData(IOOptionBits kind, OSSerialize * s) const;
 
 
     bool serializeData(IOOptionBits kind, OSSerialize * s) const;
 

+/* This stuff is no longer used at all we keep it around for PPC/i386
+ * binary compatibility only. Symbols are no longer exported.
+ */
+#if __ppc__ || __i386__

     /*!
         @function recordStartupExtensions
         @abstract Records extensions made available by the primary booter.
     /*!
         @function recordStartupExtensions
         @abstract Records extensions made available by the primary booter.


@@ -244,8 +253,7 @@ public:
             removed or wasn't present, KERN_FAILURE otherwise.
     */
     virtual kern_return_t removeKernelLinker(void);
             removed or wasn't present, KERN_FAILURE otherwise.
     */
     virtual kern_return_t removeKernelLinker(void);

-
-    static void disableExternalLinker(void);
+#endif /* __ppc__ || __i386__ */

 
 private:
 
 
 private:
 


@@ -257,21 +265,8 @@ private:
     IOReturn unloadModule( OSString * moduleName ) const;
 };
 
     IOReturn unloadModule( OSString * moduleName ) const;
 };
 

-__BEGIN_DECLS
-/*!
-    @function IOKitRelocStart
-    @abstract Deprecated API.
-*/
-kmod_start_func_t IOKitRelocStart;
-/*!
-    @function IOKitRelocStop
-    @abstract Deprecated API.
-*/
-kmod_stop_func_t IOKitRelocStop;
-__END_DECLS
-
-extern const OSSymbol *                gIOClassKey;
-extern const OSSymbol *                gIOProbeScoreKey;
-extern IOCatalogue *            gIOCatalogue;
+extern const OSSymbol * gIOClassKey;
+extern const OSSymbol * gIOProbeScoreKey;
+extern IOCatalogue    * gIOCatalogue;

 
 #endif /* ! _IOKIT_IOCATALOGUE_H */
 
 #endif /* ! _IOKIT_IOCATALOGUE_H */