xnu-792.17.14.tar.gz

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

diff --git a/bsd/dev/i386/cons.c b/bsd/dev/i386/cons.c
index 118878bd1197da648879c5c4e03ac9c89d75b201..39a9b3e2b64b12a91909c1b9978e22f62c9d1bce 100644 (file)
--- a/bsd/dev/i386/cons.c
+++ b/bsd/dev/i386/cons.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * 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. 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* 
  * Copyright (c) 1987, 1988 NeXT, Inc.
  */
 /* 
  * Copyright (c) 1987, 1988 NeXT, Inc.


@@ -44,80 +50,111 @@
 struct tty     cons;
 struct tty     *constty;               /* current console device */
 
 struct tty     cons;
 struct tty     *constty;               /* current console device */
 

+int cnopen(__unused dev_t dev, int flag, int devtype, struct proc *pp);
+int cnclose(__unused dev_t dev, int flag, int mode, struct proc *pp);
+int cnread(__unused dev_t dev, struct uio *uio, int ioflag);
+int cnwrite(__unused dev_t dev, struct uio *uio, int ioflag);
+int cnioctl(__unused dev_t dev, int cmd, caddr_t addr, int flg, struct proc *p);
+int cnselect(__unused dev_t dev, int flag, void * wql, struct proc *p);
+
+void slave_cnenable(void);
+
+int alert(
+       __unused int width, 
+       __unused int height, 
+       __unused const char *title, 
+       const char *msg, 
+       int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8);
+int alert_done(void);
+

 /*ARGSUSED*/
 int
 /*ARGSUSED*/
 int

-cnopen(dev, flag, devtype, pp)
-       dev_t dev;
-       int flag, devtype;
-       struct proc *pp;
+cnopen(__unused dev_t dev, int flag, int devtype, struct proc *pp)

 {
        dev_t device;
 {
        dev_t device;

+       boolean_t funnel_state;
+       int error;
+       
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);

 
        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;
 
        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;

-       return ((*cdevsw[major(device)].d_open)(device, flag, devtype, pp));
+       error =  (*cdevsw[major(device)].d_open)(device, flag, devtype, pp);
+       thread_funnel_set(kernel_flock, funnel_state);
+
+       return(error);

 }
 
 /*ARGSUSED*/
 int
 }
 
 /*ARGSUSED*/
 int

-cnclose(dev, flag, mode, pp)
-       dev_t dev;
-       int flag, mode;
-       struct proc *pp;
+cnclose(__unused dev_t dev, int flag, int mode, struct proc *pp)

 {
        dev_t device;
 {
        dev_t device;

+       boolean_t funnel_state;
+       int error;

 
 

+       funnel_state = thread_funnel_set(kernel_flock, TRUE);

        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;
        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;

-       return ((*cdevsw[major(device)].d_close)(device, flag, mode, pp));
+       error =  (*cdevsw[major(device)].d_close)(device, flag, mode, pp);
+       thread_funnel_set(kernel_flock, funnel_state);
+
+       return(error);
+
+

 }
 
 /*ARGSUSED*/
 int
 }
 
 /*ARGSUSED*/
 int

-cnread(dev, uio, ioflag)
-       dev_t dev;
-       struct uio *uio;
-       int ioflag;
+cnread(__unused dev_t dev, struct uio *uio, int ioflag)

 {
        dev_t device;
 {
        dev_t device;

+       boolean_t funnel_state;
+       int error;

 
 

+       funnel_state = thread_funnel_set(kernel_flock, TRUE);

        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;
        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;

-       return ((*cdevsw[major(device)].d_read)(device, uio, ioflag));
+       error = (*cdevsw[major(device)].d_read)(device, uio, ioflag);
+       thread_funnel_set(kernel_flock, funnel_state);
+
+       return(error);

 }
 
 /*ARGSUSED*/
 int
 }
 
 /*ARGSUSED*/
 int

-cnwrite(dev, uio, ioflag)
-       dev_t dev;
-       struct uio *uio;
-       int ioflag;
+cnwrite(__unused dev_t dev, struct uio *uio, int ioflag)

 {
     dev_t device;
 {
     dev_t device;

+       boolean_t funnel_state;
+       int error;

 
 

+       funnel_state = thread_funnel_set(kernel_flock, TRUE);

        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;
        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;

-    return ((*cdevsw[major(device)].d_write)(device, uio, ioflag));
+    error =  (*cdevsw[major(device)].d_write)(device, uio, ioflag);
+       thread_funnel_set(kernel_flock, funnel_state);
+
+       return(error);

 }
 
 /*ARGSUSED*/
 int
 }
 
 /*ARGSUSED*/
 int

-cnioctl(dev, cmd, addr, flag, p)
-       dev_t dev;
-       int cmd;
-       caddr_t addr;
-       int flag;
-       struct proc *p;
+cnioctl(__unused dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p)

 {
        dev_t device;
 {
        dev_t device;

+       boolean_t funnel_state;
+       int error;
+
+       funnel_state = thread_funnel_set(kernel_flock, TRUE);

 
        if (constty)
            device = constty->t_dev;
 
        if (constty)
            device = constty->t_dev;


@@ -127,23 +164,26 @@ cnioctl(dev, cmd, addr, flag, p)
         * Superuser can always use this to wrest control of console
         * output from the "virtual" console.
         */
         * Superuser can always use this to wrest control of console
         * output from the "virtual" console.
         */

-       if (cmd == TIOCCONS && constty) {
-               int error = suser(p->p_ucred, (u_short *) NULL);
-               if (error)
-                       return (error);
+       if ((unsigned) cmd == TIOCCONS && constty) {
+               error = proc_suser(p);
+               if (error) {
+                       goto out;
+               }

                constty = NULL;
                constty = NULL;

-               return (0);
+               error = 0;
+               goto out;

        }
        }

-       return ((*cdevsw[major(device)].d_ioctl)(device, cmd, addr, flag, p));
+       error =  (*cdevsw[major(device)].d_ioctl)(device, cmd, addr, flag, p);
+out:
+       thread_funnel_set(kernel_flock, funnel_state);
+
+       return(error);

 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/

+/* called with funnel held */

 int
 int

-cnselect(dev, flag, wql, p)
-       dev_t dev;
-       int flag;
-       void * wql;
-       struct proc *p;
+cnselect(__unused dev_t dev, int flag, void * wql, struct proc *p)

 {
        dev_t device;
 
 {
        dev_t device;
 


@@ -159,12 +199,18 @@ int
 cngetc()
 {
        dev_t device;
 cngetc()
 {
        dev_t device;

+       boolean_t funnel_state;
+       int error;

 
 

+       funnel_state = thread_funnel_set(kernel_flock, TRUE);

        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;
        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;

-       return ((*cdevsw[major(device)].d_getc)(device));
+       error =  (*cdevsw[major(device)].d_getc)(device);
+       thread_funnel_set(kernel_flock, funnel_state);
+
+       return(error);

 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/


@@ -173,21 +219,26 @@ cnputc(c)
        char c;
 {
        dev_t device;
        char c;
 {
        dev_t device;

+       boolean_t funnel_state;
+       int error;

 
 

+       funnel_state = thread_funnel_set(kernel_flock, TRUE);

        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;
        if (constty)
            device = constty->t_dev;
        else
            device = cons.t_dev;

-       return ((*cdevsw[major(device)].d_putc)(device, c));
+       error =  (*cdevsw[major(device)].d_putc)(device, c);
+       thread_funnel_set(kernel_flock, funnel_state);
+
+       return(error);

 }
 #endif
 
 }
 #endif
 

-#if    NCPUS > 1
-slave_cnenable()
+void
+slave_cnenable(void)

 {
        /* FIXME: what to do here? */
 }
 {
        /* FIXME: what to do here? */
 }

-#endif NCPUS > 1

 
 #if 0
 void
 
 #if 0
 void


@@ -207,9 +258,9 @@ kprintf( const char *format, ...)
  */
 int 
 alert(
  */
 int 
 alert(

-       int width, 
-       int height, 
-       const char *title, 
+       __unused int width, 
+       __unused int height, 
+       __unused const char *title, 

        const char *msg, 
        int p1, 
        int p2, 
        const char *msg, 
        int p1, 
        int p2, 


@@ -233,7 +284,7 @@ alert(
 }
 
 int 
 }
 
 int 

-alert_done()
+alert_done(void)

 {
        /* DoRestore(); */
        return 0;
 {
        /* DoRestore(); */
        return 0;