X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/1c79356b52d46aa6b508fb032f5ae709b1f2897b..4a2492630c73add3c3aa8a805ba4ff343d4a58ea:/bsd/sys/conf.h

diff --git a/bsd/sys/conf.h b/bsd/sys/conf.h
index 535881b08..ef86f5fbb 100644
--- a/bsd/sys/conf.h
+++ b/bsd/sys/conf.h
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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@
  */
@@ -63,6 +66,9 @@
 #ifndef _SYS_CONF_H_
 #define _SYS_CONF_H_ 1
 
+#include <sys/appleapiopts.h>
+#include <sys/cdefs.h>
+
 /*
  * Definitions of device driver entry switches
  */
@@ -73,6 +79,7 @@ struct tty;
 struct uio;
 struct vnode;
 
+#ifdef __APPLE_API_UNSTABLE
 /* 
  * Device switch function types.
  */
@@ -89,7 +96,7 @@ typedef	int  psize_fcn_t	__P((dev_t dev));
 typedef int  read_write_fcn_t 	__P((dev_t dev, struct uio *uio, int ioflag));
 typedef	int  stop_fcn_t 	__P((struct tty *tp, int rw));
 typedef	int  reset_fcn_t 	__P((int uban));
-typedef	int  select_fcn_t 	__P((dev_t dev, int which, struct proc *p));
+typedef	int  select_fcn_t 	__P((dev_t dev, int which, void * wql, struct proc *p));
 typedef	int  mmap_fcn_t 	__P(());
 typedef	int  getc_fcn_t 	__P((dev_t dev));
 typedef	int  putc_fcn_t 	__P((dev_t dev, char c));
@@ -100,6 +107,13 @@ typedef int  d_poll_t		__P((dev_t dev, int events, struct proc *p));
 #define	d_read_t	read_write_fcn_t
 #define	d_write_t	read_write_fcn_t
 #define	d_ioctl_t	ioctl_fcn_t
+#define	d_stop_t	stop_fcn_t
+#define	d_reset_t	reset_fcn_t
+#define	d_select_t	select_fcn_t
+#define	d_mmap_t	mmap_fcn_t
+#define	d_strategy_t	strategy_fcn_t
+#define	d_getc_t	getc_fcn_t
+#define	d_putc_t	putc_fcn_t
 
 __BEGIN_DECLS
 int	enodev ();		/* avoid actual prototype for multiple use */
@@ -143,13 +157,14 @@ struct bdevsw {
 	int			d_type;
 };
 
-#ifdef	KERNEL
+#ifdef KERNEL
 
 d_devtotty_t    nodevtotty;
 d_write_t	nowrite;
 
-
+#ifdef __APPLE_API_PRIVATE
 extern struct bdevsw bdevsw[];
+#endif /* __APPLE_API_PRIVATE */
 
 /*
  * Contents of empty bdevsw slot.
@@ -158,7 +173,7 @@ extern struct bdevsw bdevsw[];
 	{ eno_opcl,	eno_opcl,	eno_strat, eno_ioctl,	\
 	  eno_dump,	eno_psize,	0 	}
 	  
-#endif	/* KERNEL */
+#endif /* KERNEL */
 
 /*
  * Character device switch table
@@ -182,7 +197,9 @@ struct cdevsw {
 
 #ifdef KERNEL
 
+#ifdef __APPLE_API_PRIVATE
 extern struct cdevsw cdevsw[];
+#endif /* __APPLE_API_PRIVATE */
 
 /*
  * Contents of empty cdevsw slot.
@@ -192,12 +209,11 @@ extern struct cdevsw cdevsw[];
     {								  	\
 	eno_opcl,	eno_opcl,	eno_rdwrt,	eno_rdwrt,	\
 	eno_ioctl,	eno_stop,	eno_reset,	0,	  	\
-	seltrue,	eno_mmap,	eno_strat,	eno_getc,	\
+	(select_fcn_t *)seltrue,	eno_mmap,	eno_strat,	eno_getc,	\
 	eno_putc,	0 					  	\
     }
+#endif /* KERNEL */
     
-#endif	/* KERNEL */
-
 /*
  * Line discipline switch table
  */
@@ -216,14 +232,19 @@ struct linesw {
 };
 
 #ifdef KERNEL
+
+#ifdef __APPLE_API_PRIVATE
 extern struct linesw linesw[];
 extern int nlinesw;
+#endif /* __APPLE_API_PRIVATE */
  
 int ldisc_register __P((int , struct linesw *));
 void ldisc_deregister __P((int));
 #define LDISC_LOAD      -1              /* Loadable line discipline */
-#endif
 
+#endif /* KERNEL */
+
+#ifdef __APPLE_API_OBSOLETE
 /*
  * Swap device table
  */
@@ -239,7 +260,10 @@ struct swdevt {
 
 #ifdef KERNEL
 extern struct swdevt swdevt[];
-#endif
+#endif /* KERNEL */
+
+#endif /* __APPLE_API_OBSOLETE */
+
 
 #ifdef KERNEL
 /*
@@ -257,6 +281,8 @@ int  cdevsw_isfree __P((int));
 int  cdevsw_add __P((int, struct cdevsw *));
 int  cdevsw_remove __P((int, struct cdevsw *));
 __END_DECLS
-#endif
+#endif /* KERNEL */
+
+#endif /* __APPLE_API_UNSTABLE */
 
 #endif /* _SYS_CONF_H_ */