X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..b0d623f7f2ae71ed96e60569f61f9a9a27016e80:/bsd/dev/ppc/cons.c

diff --git a/bsd/dev/ppc/cons.c b/bsd/dev/ppc/cons.c
index 7dca66a94..207ee03ae 100644
--- a/bsd/dev/ppc/cons.c
+++ b/bsd/dev/ppc/cons.c
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2006 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * 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 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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* 
  * Copyright (c) 1987, 1988 NeXT, Inc.
@@ -48,234 +46,94 @@
 #include <sys/tty.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
-#include <dev/ppc/cons.h>
-
-struct tty	cons;
-struct tty	*constty;		/* current console device */
+#include <machine/cons.h>
 
-/*ARGSUSED*/
-int
-consopen(dev, flag, devtype, pp)
-	dev_t dev;
-	int flag, devtype;
-	struct proc *pp;
-{
-	dev_t device;
-	boolean_t funnel_state;
-	int error;
-	
-	funnel_state = thread_funnel_set(kernel_flock, TRUE);
+struct tty	*constty;	/* current console device */
 
-	if (constty)
-	    device = constty->t_dev;
-	else
-	    device = cons.t_dev;
-	error =  (*cdevsw[major(device)].d_open)(device, flag, devtype, pp);
-	thread_funnel_set(kernel_flock, funnel_state);
+/*
+ * The km driver supplied the default console device for the systems
+ * (usually a raw frame buffer driver, but potentially a serial driver).
+ */
+extern struct tty *km_tty[1];
 
-	return(error);
+static dev_t
+cndev(void)
+{
+        if (constty)
+                return constty->t_dev;
+        else
+                return km_tty[0]->t_dev;
 }
 
 /*ARGSUSED*/
 int
-consclose(dev, flag, mode, pp)
-	dev_t dev;
-	int flag, mode;
-	struct proc *pp;
+consopen(__unused dev_t dev, int flag, int devtype, 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;
-	error =  (*cdevsw[major(device)].d_close)(device, flag, mode, pp);
-	thread_funnel_set(kernel_flock, funnel_state);
-
-	return(error);
-
-
+	dev = cndev();
+	return ((*cdevsw[major(dev)].d_open)(dev, flag, devtype, pp));
 }
 
+
 /*ARGSUSED*/
 int
-consread(dev, uio, ioflag)
-	dev_t dev;
-	struct uio *uio;
-	int ioflag;
+consclose(__unused dev_t dev, int flag, int mode, 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;
-	error = (*cdevsw[major(device)].d_read)(device, uio, ioflag);
-	thread_funnel_set(kernel_flock, funnel_state);
-
-	return(error);
+	dev = cndev();
+	return ((*cdevsw[major(dev)].d_close)(dev, flag, mode, pp));
 }
 
+
 /*ARGSUSED*/
 int
-conswrite(dev, uio, ioflag)
-	dev_t dev;
-	struct uio *uio;
-	int ioflag;
+consread(__unused dev_t dev, struct uio *uio, 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;
-    error =  (*cdevsw[major(device)].d_write)(device, uio, ioflag);
-	thread_funnel_set(kernel_flock, funnel_state);
-
-	return(error);
+	dev = cndev();
+	return ((*cdevsw[major(dev)].d_read)(dev, uio, ioflag));
 }
 
+
 /*ARGSUSED*/
 int
-consioctl(dev, cmd, addr, flag, p)
-	dev_t dev;
-	int cmd;
-	caddr_t addr;
-	int flag;
-	struct proc *p;
+conswrite(__unused dev_t dev, struct uio *uio, int ioflag)
 {
-	dev_t device;
-	boolean_t funnel_state;
-	int error;
+	dev = cndev();
+	return ((*cdevsw[major(dev)].d_write)(dev, uio, ioflag));
+}
 
-	funnel_state = thread_funnel_set(kernel_flock, TRUE);
 
-	if (constty)
-	    device = constty->t_dev;
-	else
-	    device = cons.t_dev;
+/*ARGSUSED*/
+int
+consioctl(__unused dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+{
+	dev = cndev();
+#if 0
 	/*
 	 * Superuser can always use this to wrest control of console
 	 * output from the "virtual" console.
+	 *
+	 * XXX Unfortunately, this code doesn't do what the author thougt
+	 * XXX it did; use of the console device, a TIOCCONS would always
+	 * XXX disassociate the console from a virtual terminal and send
+	 * XXX it back to the fake tty.
 	 */
-	if (cmd == TIOCCONS && constty) {
-		error = proc_suser(p);
-		if (error) {
-			goto out;
+	if ((unsigned) cmd == TIOCCONS && constty) {
+		int error = proc_suser(p);
+		if (!error) {
+			constty = NULL;
 		}
-		constty = NULL;
-		error = 0;
-		goto out;
+		return(error);
 	}
-	error =  (*cdevsw[major(device)].d_ioctl)(device, cmd, addr, flag, p);
-out:
-	thread_funnel_set(kernel_flock, funnel_state);
+#endif	/* 0 */
 
-	return(error);
+	return ((*cdevsw[major(dev)].d_ioctl)(dev, cmd, addr, flag, p));
 }
 
-/*ARGSUSED*/
-/* called with funnel held */
-int
-consselect(dev, flag, wql, p)
-	dev_t dev;
-	int flag;
-	void *wql;
-	struct proc *p;
-{
-	dev_t device;
-
-	if (constty)
-	    device = constty->t_dev;
-	else
-	    device = cons.t_dev;
-	return ((*cdevsw[major(device)].d_select)(device, flag, wql, p));
-}
-
-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;
-	error =  (*cdevsw[major(device)].d_getc)(device);
-	thread_funnel_set(kernel_flock, funnel_state);
-
-	return(error);
-}
 
 /*ARGSUSED*/
+/* called with funnel held */
 int
-cons_putc(c)
-	char c;
+consselect(__unused dev_t dev, int flag, void *wql, 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;
-	else
-	    device = cons.t_dev;
-	error =  (*cdevsw[major(device)].d_putc)(device, c);
-	thread_funnel_set(kernel_flock, funnel_state);
-
-	return(error);
+	dev = cndev();
+	return ((*cdevsw[major(dev)].d_select)(dev, flag, wql, p));
 }
-
-/*
- * Write message to console; create an alert panel if no text-type window
- * currently exists. Caller must call alert_done() when finished.
- * The height and width arguments are not used; they are provided for 
- * compatibility with the 68k version of alert().
- */
-int 
-alert(
-	int width, 
-	int height, 
-	const char *title, 
-	const char *msg, 
-	int p1, 
-	int p2, 
-	int p3, 
-	int p4, 
-	int p5, 
-	int p6, 
-	int p7, 
-	int p8)
-{
-	char smsg[200];
-	
-	sprintf(smsg, msg,  p1, p2, p3, p4, p5, p6, p7, p8);
-#if FIXME  /* [ */
-	/* DoAlert(title, smsg); */
-#else
-	printf("%s\n",smsg);
-#endif  /* FIXME ] */
-
-	return 0;
-}
-
-int 
-alert_done()
-{
-	/* DoRestore(); */
-	return 0;
-}
-