xnu-517.7.21.tar.gz

[apple/xnu.git] / bsd / sys / conf.h

diff --git a/bsd/sys/conf.h b/bsd/sys/conf.h
index 535881b0897af9b317b30ae267ed80cda8d59cb6..9e7e806870e7d523ab40ef9710a773ad636f151c 100644 (file)
--- a/bsd/sys/conf.h
+++ b/bsd/sys/conf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -63,6 +63,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 +76,7 @@ struct tty;
 struct uio;
 struct vnode;
 
+#ifdef __APPLE_API_UNSTABLE
 /* 
  * Device switch function types.
  */
@@ -89,7 +93,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 +104,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 +154,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 +170,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 +194,9 @@ struct cdevsw {
 
 #ifdef KERNEL
 
+#ifdef __APPLE_API_PRIVATE
 extern struct cdevsw cdevsw[];
+#endif /* __APPLE_API_PRIVATE */
 
 /*
  * Contents of empty cdevsw slot.
@@ -192,12 +206,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 +229,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 +257,10 @@ struct swdevt {
 
 #ifdef KERNEL
 extern struct swdevt swdevt[];
-#endif
+#endif /* KERNEL */
+
+#endif /* __APPLE_API_OBSOLETE */
+
 
 #ifdef KERNEL
 /*
@@ -257,6 +278,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_ */