diff options
Diffstat (limited to 'sys/arch/hp300/dev/hyper.c')
| -rw-r--r-- | sys/arch/hp300/dev/hyper.c | 64 |
1 files changed, 2 insertions, 62 deletions
diff --git a/sys/arch/hp300/dev/hyper.c b/sys/arch/hp300/dev/hyper.c index 5653e8b2a34..712a115cea4 100644 --- a/sys/arch/hp300/dev/hyper.c +++ b/sys/arch/hp300/dev/hyper.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hyper.c,v 1.13 2005/12/30 18:14:09 miod Exp $ */ +/* $OpenBSD: hyper.c,v 1.14 2005/12/31 18:13:41 miod Exp $ */ /* * Copyright (c) 2005, Miodrag Vallat. @@ -86,8 +86,6 @@ #include <hp300/dev/diodevs.h> #include <hp300/dev/intiovar.h> -#include <dev/cons.h> - #include <dev/wscons/wsconsio.h> #include <dev/wscons/wsdisplayvar.h> #include <dev/rasops/rasops.h> @@ -487,66 +485,8 @@ hyper_windowmove(struct diofb *fb, u_int16_t sx, u_int16_t sy, * Hyperion console support */ -int hyper_console_scan(int, caddr_t, void *); -cons_decl(hyper); - -int -hyper_console_scan(int scode, caddr_t va, void *arg) -{ - struct diofbreg *fbr = (struct diofbreg *)va; - struct consdev *cp = arg; - u_int pri; - - if (fbr->id != GRFHWID || fbr->fbid != GID_HYPERION) - return (0); - - pri = CN_NORMAL; - -#ifdef CONSCODE - /* - * Raise our prioity, if appropriate. - */ - if (scode == CONSCODE) - pri = CN_FORCED; -#endif - - /* Only raise priority. */ - if (pri > cp->cn_pri) - cp->cn_pri = pri; - - /* - * If our priority is higher than the currently-remembered - * console, stash our priority. - */ - if (cn_tab == NULL || cp->cn_pri > cn_tab->cn_pri) { - cn_tab = cp; - conscode = scode; - return (DIO_SIZE(scode, va)); - } - return (0); -} - -void -hypercnprobe(struct consdev *cp) -{ - int maj; - - for (maj = 0; maj < nchrdev; maj++) { - if (cdevsw[maj].d_open == wsdisplayopen) - break; - } - - if (maj == nchrdev) - return; - - cp->cn_dev = makedev(maj, 0); - cp->cn_pri = CN_DEAD; - - console_scan(hyper_console_scan, cp, HP300_BUS_DIO); -} - void -hypercninit(struct consdev *cp) +hypercninit() { hyper_reset(&diofb_cn, conscode, (struct diofbreg *)conaddr); diofb_cnattach(&diofb_cn); |