diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-02-05 04:15:31 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-02-05 04:15:31 +0000 |
| commit | cee83dbc37ee8a9b81fccffebe5364438dacceed (patch) | |
| tree | 9305f7209849732964211902a8169c64a35e16ac /sys/dev | |
| parent | 8db636ec47b8a7da799dedada1afff35831baa0e (diff) | |
restore CN_REMOTE priority, as it always was there.
anyway, only i386 uses that path and only if forced anyway.
also do not do comprobe1() on hppa since that hoses the port.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/com.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index 87b148938d5..71e52a35f99 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com.c,v 1.80 2002/01/30 20:45:34 nordin Exp $ */ +/* $OpenBSD: com.c,v 1.81 2002/02/05 04:15:30 mickey Exp $ */ /* $NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $ */ /* @@ -1504,7 +1504,11 @@ comcnprobe(cp) cp->cn_pri = CN_DEAD; return; } +#ifdef __hppa__ + found = 1; +#else found = comprobe1(iot, ioh); +#endif bus_space_unmap(iot, ioh, COM_NPORTS); if (!found) { cp->cn_pri = CN_DEAD; @@ -1518,14 +1522,13 @@ comcnprobe(cp) /* initialize required fields */ cp->cn_dev = makedev(commajor, CONUNIT); - cp->cn_pri = CN_NORMAL; + cp->cn_pri = CN_REMOTE; } void comcninit(cp) struct consdev *cp; { - comconsaddr = CONADDR; if (bus_space_map(comconsiot, comconsaddr, COM_NPORTS, 0, &comconsioh)) |