diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-05-10 01:57:20 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-05-10 01:57:20 +0000 |
| commit | 36b7c7e9de9e75cdaecb771eef3450575cc45955 (patch) | |
| tree | 4e7bf4528c5cf0f3127fd5852d5d8f8a065364e4 /sys/arch/hp300/dev/apci.c | |
| parent | 97373a3318e1d990f01acb18f6083e168690d429 (diff) | |
When acpi is used as the console, set cn_tab appropriately so that a
serial console on the 425e gets attached properly.
The hp300 port should really be changed such that drivers don't
touch cn_tab themselves but this turns out to be a bit tricky so
I'm going to punt on that for now.
Diffstat (limited to 'sys/arch/hp300/dev/apci.c')
| -rw-r--r-- | sys/arch/hp300/dev/apci.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c index dff2c9cc1c7..33edcf6d54d 100644 --- a/sys/arch/hp300/dev/apci.c +++ b/sys/arch/hp300/dev/apci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apci.c,v 1.5 2001/05/10 01:43:31 millert Exp $ */ +/* $OpenBSD: apci.c,v 1.6 2001/05/10 01:57:19 millert Exp $ */ /* $NetBSD: apci.c,v 1.1 1997/05/12 08:12:36 thorpej Exp $ */ /* @@ -965,6 +965,13 @@ apcicnprobe(cp) #else cp->cn_pri = CN_NORMAL; #endif + /* + * If our priority is higher than the currently-remembered + * console, install ourselves. + */ + if (((cn_tab == NULL) || (cp->cn_pri > cn_tab->cn_pri)) || + conforced) + cn_tab = cp; } } |