diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2005-01-16 00:16:08 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-01-16 00:16:08 +0000 |
commit | cd96e1c6246b7afcf381800be1f8f5413c62b045 (patch) | |
tree | bf5c89ffcbe37be03fcea7faa8577f0633f55ff9 | |
parent | cdd90b138bc320d4297b43b0567d407d8edc265d (diff) |
Since Hyperion can only attach in DIO-II space, don't bother looking for
an Hyperion in internal space when looking for the console device.
-rw-r--r-- | sys/arch/hp300/dev/hyper.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/sys/arch/hp300/dev/hyper.c b/sys/arch/hp300/dev/hyper.c index 05fdade8c17..cbc7b20aa21 100644 --- a/sys/arch/hp300/dev/hyper.c +++ b/sys/arch/hp300/dev/hyper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hyper.c,v 1.2 2005/01/15 21:08:37 miod Exp $ */ +/* $OpenBSD: hyper.c,v 1.3 2005/01/16 00:16:07 miod Exp $ */ /* * Copyright (c) 2005, Miodrag Vallat. @@ -566,9 +566,6 @@ void hypercnprobe(struct consdev *cp) { int maj; - caddr_t va; - struct diofbreg *fbr; - int force = 0; /* Abort early if console is already forced. */ if (conforced) @@ -585,36 +582,6 @@ hypercnprobe(struct consdev *cp) cp->cn_dev = makedev(maj, 0); cp->cn_pri = CN_DEAD; - /* Look for "internal" framebuffer. */ - va = (caddr_t)IIOV(GRFIADDR); - fbr = (struct diofbreg *)va; - if (!badaddr(va) && - (fbr->id == GRFHWID && fbr->id2 == GID_HYPERION)) { - cp->cn_pri = CN_INTERNAL; - -#ifdef CONSCODE - if (CONSCODE == -1) { - force = conforced = 1; - } -#endif - - /* - * If our priority is higher than the currently - * remembered console, stash our priority, and - * unmap whichever device might be currently mapped. - * Since we're internal, we set the saved size to 0 - * so they don't attempt to unmap our fixed VA later. - */ - if (cn_tab == NULL || cp->cn_pri > cn_tab->cn_pri || force) { - cn_tab = cp; - if (convasize) - iounmap(conaddr, convasize); - conscode = -1; - conaddr = va; - convasize = 0; - } - } - console_scan(hyper_console_scan, cp, HP300_BUS_DIO); } |