X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/b0d623f7f2ae71ed96e60569f61f9a9a27016e80..3e170ce000f1506b7b5d2c5c7faec85ceabb573d:/bsd/dev/i386/conf.c

diff --git a/bsd/dev/i386/conf.c b/bsd/dev/i386/conf.c
index 964f945bf..62d62601e 100644
--- 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@
  * 
@@ -47,7 +47,6 @@
 /* Prototypes that should be elsewhere: */
 extern dev_t	chrtoblk(dev_t dev);
 extern int	chrtoblk_set(int cdev, int bdev);
-extern int	iskmemdev(dev_t dev);
 
 struct bdevsw	bdevsw[] =
 {
@@ -134,12 +133,12 @@ extern d_ioctl_t	mmioctl;
 
 #include <pty.h>
 #if NPTY > 0
-extern struct tty *pt_tty[];
 extern d_open_t		ptsopen;
 extern d_close_t	ptsclose;
 extern d_read_t		ptsread;
 extern d_write_t	ptswrite;
 extern d_stop_t		ptsstop;
+extern d_select_t	ptsselect;
 extern d_open_t		ptcopen;
 extern d_close_t	ptcclose;
 extern d_read_t		ptcread;
@@ -212,7 +211,7 @@ struct cdevsw	cdevsw[] =
     },
     {
 	ptsopen,	ptsclose,	ptsread,	ptswrite,	/* 4*/
-	ptyioctl,	ptsstop,	nullreset,	pt_tty,		ttselect,
+	ptyioctl,	ptsstop,	nullreset,	0,		ptsselect,
 	eno_mmap,	eno_strat,	eno_getc,	eno_putc,	D_TTY
     },
     {
@@ -288,6 +287,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 */
 /*
@@ -323,7 +323,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,
@@ -336,7 +336,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,
 };
@@ -368,10 +368,3 @@ chrtoblk_set(int cdev, int bdev)
 	return 0;
 }
 
-/*
- * Returns true if dev is /dev/mem or /dev/kmem.
- */
-int iskmemdev(dev_t dev)
-{
-	return (major(dev) == 3 && minor(dev) < 2);
-}