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 ba13fc3ee874bfe3bbe8b1da8832b9530d3726f2..463700245d3b89f7be1efe512197c0ba49c677e6 100644 (file)
--- a/bsd/dev/ppc/conf.c
+++ b/bsd/dev/ppc/conf.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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.
  * 
- * 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -38,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>
@@ -99,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>
@@ -147,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*/
     {
@@ -157,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*/