/*
* Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
- *
- * 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
+ * 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
+ *
+ * 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_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
*/
/* Copyright (c) 1992 NeXT Computer, Inc. All rights reserved.
*
#include <sys/time.h>
#include <dev/kmreg_com.h>
#include <pexpert/pexpert.h>
+#include <pexpert/i386/boot.h>
+
+extern int hz;
+
+extern void cnputcusr(char);
+extern int cngetc(void);
+
+void kminit(void);
+int kmopen(dev_t dev, int flag, int devtype, struct proc *pp);
+int kmclose(dev_t dev, int flag, int mode, struct proc *p);
+int kmread(dev_t dev, struct uio *uio, int ioflag);
+int kmwrite(dev_t dev, struct uio *uio, int ioflag);
+int kmioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p);
+int kmputc(int c);
+int kmgetc(dev_t dev);
+int kmgetc_silent(dev_t dev);
+void cons_cinput(char ch);
/*
* 'Global' variables, shared only by this file and conf.c.
*/
-extern struct tty cons;
struct tty *km_tty[1] = { &cons };
/*
int initialized = 0;
static int kmoutput(struct tty *tp);
-static void kmtimeout(struct tty *tp);
static void kmstart(struct tty *tp);
extern void KeyboardOpen(void);
-int kminit()
+void
+kminit(void)
{
- cons.t_dev = makedev(12, 0);
+ cons.t_dev = makedev(12, 0);
initialized = 1;
}
/*
kmopen(
dev_t dev,
int flag,
- int devtype,
+ __unused int devtype,
struct proc *pp)
{
- int rtn;
int unit;
struct tty *tp;
struct winsize *wp;
tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
termioschars(&tp->t_termios);
ttsetwater(tp);
- } else if ((tp->t_state & TS_XCLUDE) && pp->p_ucred->cr_uid != 0)
+ } else if ((tp->t_state & TS_XCLUDE) && proc_suser(pp))
return EBUSY;
tp->t_state |= TS_CARR_ON; /* lie and say carrier exists and is on. */
bzero(&video, sizeof(video));
PE_current_console(&video);
- if( video.v_width != 0 && video.v_height != 0 ) {
+ if( video.v_display == VGA_TEXT_MODE ) {
+ wp->ws_col = video.v_width;
+ wp->ws_row = video.v_height;
+ } else if( video.v_width != 0 && video.v_height != 0 ) {
wp->ws_col = video.v_width / wp->ws_xpixel;
wp->ws_row = video.v_height / wp->ws_ypixel;
} else {
int
kmclose(
- dev_t dev,
+ __unused dev_t dev,
int flag,
- int mode,
- struct proc *p)
+ __unused int mode,
+ __unused struct proc *p)
{
struct tty *tp;
int
kmread(
- dev_t dev,
+ __unused dev_t dev,
struct uio *uio,
int ioflag)
{
int
kmwrite(
- dev_t dev,
+ __unused dev_t dev,
struct uio *uio,
int ioflag)
{
int
kmioctl(
- dev_t dev,
+ __unused dev_t dev,
int cmd,
caddr_t data,
int flag,
}
default:
error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p);
- if (error >= 0) {
+ if (ENOTTY != error)
return error;
- }
- error = ttioctl (tp, cmd, data, flag, p);
- if (error >= 0) {
- return error;
- }
- else {
- return ENOTTY;
- }
+ return ttioctl (tp, cmd, data, flag, p);
}
}
return( 0);
if(c == '\n')
- cnputc('\r');
+ cnputcusr('\r');
- cnputc(c);
+ cnputcusr(c);
return 0;
}
int
kmgetc(
- dev_t dev)
+ __unused dev_t dev)
{
int c;
if (c == '\r') {
c = '\n';
}
- cnputc(c);
+ cnputcusr(c);
return c;
}
int
kmgetc_silent(
- dev_t dev)
+ __unused dev_t dev)
{
int c;
kmstart(
struct tty *tp)
{
- extern int hz;
if (tp->t_state & (TS_TIMEOUT | TS_BUSY | TS_TTSTOP))
goto out;
if (tp->t_outq.c_cc == 0)
goto out;
tp->t_state |= TS_BUSY;
- if (tp->t_outq.c_cc > tp->t_lowat) {
- /*
- * Start immediately.
- */
- kmoutput(tp);
- }
- else {
- /*
- * Wait a bit...
- */
-#if 0
- /* FIXME */
- timeout(kmtimeout, tp, hz);
-#else
- kmoutput(tp);
-#endif
- }
+ kmoutput(tp);
+ return;
+
out:
- ttwwakeup(tp);
+ (*linesw[tp->t_line].l_start)(tp);
+ return;
}
static void
-kmtimeout( struct tty *tp)
+kmtimeout(void *arg)
{
boolean_t funnel_state;
+ struct tty *tp = (struct tty *) arg;
funnel_state = thread_funnel_set(kernel_flock, TRUE);
kmoutput(tp);
char buf[80];
char *cp;
int cc = -1;
- extern int hz;
while (tp->t_outq.c_cc > 0) {
timeout(kmtimeout, tp, hz);
}
tp->t_state &= ~TS_BUSY;
- ttwwakeup(tp);
+ (*linesw[tp->t_line].l_start)(tp);
return 0;
}
+
+void
cons_cinput(char ch)
{
struct tty *tp = &cons;
- boolean_t funnel_state;
-
(*linesw[tp->t_line].l_rint) (ch, tp);
-
}
projects / apple / xnu.git / blobdiff