xnu-1504.9.26.tar.gz

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

diff --git a/bsd/sys/conf.h b/bsd/sys/conf.h
index bc79ead240e284c43eada3ea4161b932a8cfd429..4cf53a914b8a7a5a44aee12a647c57b20b6124e5 100644 (file)
--- a/bsd/sys/conf.h
+++ b/bsd/sys/conf.h
@@ -1,14 +1,19 @@
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * 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
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*-
@@ -104,9 +109,6 @@ typedef     int  stop_fcn_t(struct tty *tp, int rw);
 typedef        int  reset_fcn_t(int uban);
 typedef        int  select_fcn_t(dev_t dev, int which, void * wql, struct proc *p);
 typedef        int  mmap_fcn_t(void);
-typedef        int  getc_fcn_t(dev_t dev);
-typedef        int  putc_fcn_t(dev_t dev, char c);
-typedef int  d_poll_t(dev_t dev, int events, struct proc *p);
 
 #define        d_open_t        open_close_fcn_t
 #define        d_close_t       open_close_fcn_t
@@ -118,8 +120,6 @@ typedef int  d_poll_t(dev_t dev, int events, struct proc *p);
 #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(void);           
@@ -139,10 +139,11 @@ __END_DECLS
 #define eno_stop               ((stop_fcn_t *)&enodev)
 #define eno_reset              ((reset_fcn_t *)&enodev)
 #define eno_mmap               ((mmap_fcn_t *)&enodev)
-#define eno_getc               ((getc_fcn_t *)&enodev)
-#define eno_putc               ((putc_fcn_t *)&enodev)
 #define eno_select             ((select_fcn_t *)&enodev)
 
+/* For source backward compatibility only! */
+#define eno_getc               ((void *)&enodev)
+#define eno_putc               ((void *)&enodev)
 
 /*
  * Block device switch table
@@ -181,16 +182,16 @@ struct cdevsw {
        open_close_fcn_t        *d_close;
        read_write_fcn_t        *d_read;
        read_write_fcn_t        *d_write;
-       ioctl_fcn_t                     *d_ioctl;
-       stop_fcn_t                      *d_stop;
-       reset_fcn_t                     *d_reset;
+       ioctl_fcn_t             *d_ioctl;
+       stop_fcn_t              *d_stop;
+       reset_fcn_t             *d_reset;
        struct  tty             **d_ttys;
        select_fcn_t            *d_select;
-       mmap_fcn_t                      *d_mmap;
+       mmap_fcn_t              *d_mmap;
        strategy_fcn_t          *d_strategy;
-       getc_fcn_t                      *d_getc;
-       putc_fcn_t                      *d_putc;
-       int                                     d_type;
+       void                    *d_reserved_1;
+       void                    *d_reserved_2;
+       int                     d_type;
 };
 
 
@@ -282,6 +283,7 @@ int  cdevsw_isfree(int);
 int  cdevsw_add(int, struct cdevsw *);
 int  cdevsw_add_with_bdev(int index, struct cdevsw * csw, int bdev);
 int  cdevsw_remove(int, struct cdevsw *);
+int  isdisk(dev_t, int);
 __END_DECLS
 #endif /* KERNEL */