xnu-792.6.61.tar.gz

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

diff --git a/bsd/dev/ppc/conf.c b/bsd/dev/ppc/conf.c
index bfe8c9a0c9a023ff5695319483dcbf909481a97a..463700245d3b89f7be1efe512197c0ba49c677e6 100644 (file)
--- a/bsd/dev/ppc/conf.c
+++ b/bsd/dev/ppc/conf.c
@@ -35,7 +35,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
@@ -96,10 +95,13 @@ extern int  kmopen(),kmclose(),kmread(),kmwrite(),kmioctl(),
 
 extern int     cttyopen(), cttyread(), cttywrite(), cttyioctl(), cttyselect();
 
-extern int     mmread(),mmwrite();
+extern int     mmread(),mmwrite(),mmioctl();
 #define        mmselect        seltrue
 
 #if 1
+#ifdef NPTY
+#undef NPTY
+#endif /* NPTY */
 #define NPTY 32
 #else /* 1 */
 #include <pty.h>
@@ -144,7 +146,7 @@ struct cdevsw       cdevsw[] =
     {
        consopen,       consclose,      consread,       conswrite,      /* 0*/
        consioctl,      nulldev,        nulldev,        0,      consselect,
-       eno_mmap,       eno_strat,      cons_getc,      cons_putc, D_TTY
+       eno_mmap,       eno_strat,      (getc_fcn_t *)cons_getc,        (putc_fcn_t *)cons_putc, D_TTY
    },
     NO_CDEVICE,                                                                /* 1*/
     {
@@ -154,8 +156,8 @@ struct cdevsw       cdevsw[] =
     },
     {
        nulldev,        nulldev,        mmread,         mmwrite,        /* 3*/
-       eno_ioctl,      nulldev,        nulldev,        0,              mmselect,
-       eno_mmap,               eno_strat,      eno_getc,       eno_putc,       0
+       mmioctl,        nulldev,        nulldev,        0,              (select_fcn_t *)mmselect,
+       eno_mmap,               eno_strat,      eno_getc,       eno_putc,       D_DISK
     },
     {
        ptsopen,        ptsclose,       ptsread,        ptswrite,       /* 4*/