xnu-517.3.15.tar.gz

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

diff --git a/bsd/sys/conf.h b/bsd/sys/conf.h
index d3b213bf044afae0a7e062541c41c522ee631719..ef86f5fbb35694dc3f2cadfac67ca17fa2ceb44e 100644 (file)
--- a/bsd/sys/conf.h
+++ b/bsd/sys/conf.h
@@ -3,19 +3,22 @@
  *
  * @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@
  */
@@ -64,6 +67,7 @@
 #define _SYS_CONF_H_ 1
 
 #include <sys/appleapiopts.h>
+#include <sys/cdefs.h>
 
 /*
  * Definitions of device driver entry switches
@@ -103,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 */
@@ -198,7 +209,7 @@ 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 */