X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/0b4e3aa066abc0728aacb4bbeb86f53f9737156e..89b3af67bb32e691275bf6fa803d1834b2284115:/bsd/dev/ppc/cons.c diff --git a/bsd/dev/ppc/cons.c b/bsd/dev/ppc/cons.c index 26290d9a3..8a8963908 100644 --- a/bsd/dev/ppc/cons.c +++ b/bsd/dev/ppc/cons.c @@ -1,23 +1,29 @@ /* * 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, - * 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. @@ -53,12 +59,19 @@ consopen(dev, flag, devtype, pp) struct proc *pp; { 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; - 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*/ @@ -69,12 +82,20 @@ consclose(dev, flag, mode, pp) struct proc *pp; { 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; - 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*/ @@ -85,12 +106,18 @@ consread(dev, uio, ioflag) int ioflag; { 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; - 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*/ @@ -101,12 +128,18 @@ conswrite(dev, uio, ioflag) int ioflag; { 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; - 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*/ @@ -119,6 +152,10 @@ consioctl(dev, cmd, addr, flag, p) struct proc *p; { dev_t device; + boolean_t funnel_state; + int error; + + funnel_state = thread_funnel_set(kernel_flock, TRUE); if (constty) device = constty->t_dev; @@ -129,16 +166,23 @@ consioctl(dev, cmd, addr, flag, p) * output from the "virtual" console. */ if (cmd == TIOCCONS && constty) { - int error = suser(p->p_ucred, (u_short *) NULL); - if (error) - return (error); + error = proc_suser(p); + if (error) { + goto out; + } 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*/ +/* called with funnel held */ int consselect(dev, flag, wql, p) dev_t dev; @@ -159,12 +203,18 @@ int cons_getc() { 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; - return ((*cdevsw[major(device)].d_getc)(device)); + error = (*cdevsw[major(device)].d_getc)(device); + thread_funnel_set(kernel_flock, funnel_state); + + return(error); } /*ARGSUSED*/ @@ -173,12 +223,18 @@ cons_putc(c) 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; - 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); } /*