xnu-2050.24.15.tar.gz

[apple/xnu.git] / bsd / dev / i386 / conf.c

diff --git a/bsd/dev/i386/conf.c b/bsd/dev/i386/conf.c
index 0b39c35cd5039e8f9c01a48dde6d529314fa647d..bff6f72322b7a8dc0bfe655fecaf217a08467346 100644 (file)
--- a/bsd/dev/i386/conf.c
+++ b/bsd/dev/i386/conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1997-2012 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -45,7 +45,6 @@
 #include <sys/conf.h>
 
 /* Prototypes that should be elsewhere: */
-extern int     isdisk(dev_t dev, int type);
 extern dev_t   chrtoblk(dev_t dev);
 extern int     chrtoblk_set(int cdev, int bdev);
 extern int     iskmemdev(dev_t dev);
@@ -102,15 +101,11 @@ extern d_read_t           cnread;
 extern d_write_t       cnwrite;
 extern d_ioctl_t       cnioctl;
 extern d_select_t      cnselect;
-extern d_getc_t                cngetc;
-extern d_putc_t                cnputc;
 extern d_open_t                kmopen;
 extern d_close_t       kmclose;
 extern d_read_t                kmread;
 extern d_write_t       kmwrite;
 extern d_ioctl_t       kmioctl;
-extern d_getc_t                kmgetc;
-extern d_putc_t                kmputc;
 extern d_open_t                sgopen;
 extern d_close_t       sgclose;
 extern d_ioctl_t       sgioctl;
@@ -126,6 +121,7 @@ extern d_ioctl_t    volioctl;
 #endif
 
 extern d_open_t                cttyopen;
+extern d_close_t       cttyclose;
 extern d_read_t                cttyread;
 extern d_write_t       cttywrite;
 extern d_ioctl_t       cttyioctl;
@@ -145,7 +141,6 @@ extern d_close_t    ptsclose;
 extern d_read_t                ptsread;
 extern d_write_t       ptswrite;
 extern d_stop_t                ptsstop;
-extern d_putc_t                ptsputc;
 extern d_open_t                ptcopen;
 extern d_close_t       ptcclose;
 extern d_read_t                ptcread;
@@ -158,7 +153,6 @@ extern d_ioctl_t    ptyioctl;
 #define ptsread                eno_rdwrt
 #define ptswrite       eno_rdwrt
 #define        ptsstop         nulldev
-#define ptsputc                nulldev
 
 #define ptcopen                eno_opcl
 #define ptcclose       eno_opcl
@@ -204,13 +198,13 @@ struct cdevsw     cdevsw[] =
     {
        cnopen,         cnclose,        cnread,         cnwrite,        /* 0*/
        cnioctl,        nullstop,       nullreset,      0,              cnselect,
-       eno_mmap,       eno_strat,      cngetc,         cnputc,         D_TTY
+       eno_mmap,       eno_strat,      eno_getc,       eno_putc,       D_TTY
     },
     NO_CDEVICE,                                                                /* 1*/
     {
-       cttyopen,       nullclose,      cttyread,       cttywrite,      /* 2*/
+       cttyopen,       cttyclose,      cttyread,       cttywrite,      /* 2*/
        cttyioctl,      nullstop,       nullreset,      0,              cttyselect,
-       eno_mmap,       eno_strat,      eno_getc,       eno_putc,       D_TTY
+       eno_mmap,       eno_strat,      eno_getc,       eno_putc,       D_TTY | D_TRACKCLOSE
     },
     {
        nullopen,       nullclose,      mmread,         mmwrite,        /* 3*/
@@ -240,7 +234,7 @@ struct cdevsw       cdevsw[] =
     {
        kmopen,         kmclose,        kmread,         kmwrite,        /*12*/
        kmioctl,        nullstop,       nullreset,      km_tty,         ttselect,
-       eno_mmap,       eno_strat,      kmgetc,         kmputc,         0
+       eno_mmap,       eno_strat,      eno_getc,       eno_putc,       0
     },
     NO_CDEVICE,                                                                /*13*/
     NO_CDEVICE,                                                                /*14*/
@@ -295,6 +289,7 @@ struct cdevsw       cdevsw[] =
 };
 int    nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
 
+uint64_t cdevsw_flags[sizeof (cdevsw) / sizeof (cdevsw[0])];
 
 #include       <sys/vnode.h> /* for VCHR and VBLK */
 /*
@@ -313,7 +308,7 @@ isdisk(dev_t dev, int type)
                }
                /* FALL THROUGH */
        case VBLK:
-               if (bdevsw[maj].d_type == D_DISK) {
+               if ((D_TYPEMASK & bdevsw[maj].d_type) == D_DISK) {
                        return (1);
                }
                break;
@@ -330,7 +325,7 @@ static int chrtoblktab[] = {
        /*  8 */        NODEV,          /*  9 */        NODEV,
        /* 10 */        NODEV,          /* 11 */        NODEV,
        /* 12 */        NODEV,          /* 13 */        NODEV,
-       /* 14 */        6,              /* 15 */        NODEV,
+       /* 14 */        NODEV,          /* 15 */        NODEV,
        /* 16 */        NODEV,          /* 17 */        NODEV,
        /* 18 */        NODEV,          /* 19 */        NODEV,
        /* 20 */        NODEV,          /* 21 */        NODEV,
@@ -343,7 +338,7 @@ static int chrtoblktab[] = {
        /* 34 */        NODEV,          /* 35 */        NODEV,
        /* 36 */        NODEV,          /* 37 */        NODEV,
        /* 38 */        NODEV,          /* 39 */        NODEV,
-       /* 40 */        NODEV,          /* 41 */        1,
+       /* 40 */        NODEV,          /* 41 */        NODEV,
        /* 42 */        NODEV,          /* 43 */        NODEV,
        /* 44 */        NODEV,
 };