diff options
| -rw-r--r-- | sys/arch/hp300/dev/dca.c | 6 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/dcareg.h | 5 | ||||
| -rw-r--r-- | sys/arch/hp300/stand/common/dca.c | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/sys/arch/hp300/dev/dca.c b/sys/arch/hp300/dev/dca.c index 4a1245c6b92..81469a2b14d 100644 --- a/sys/arch/hp300/dev/dca.c +++ b/sys/arch/hp300/dev/dca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dca.c,v 1.26 2005/02/27 22:08:39 miod Exp $ */ +/* $OpenBSD: dca.c,v 1.27 2005/12/28 21:13:40 miod Exp $ */ /* $NetBSD: dca.c,v 1.35 1997/05/05 20:58:18 thorpej Exp $ */ /* @@ -999,8 +999,8 @@ dca_console_scan(scode, va, arg) pri = CN_NORMAL; break; - case DCAREMID0: - case DCAREMID1: + case DCAID0 | DCACON: + case DCAID1 | DCACON: pri = CN_REMOTE; break; diff --git a/sys/arch/hp300/dev/dcareg.h b/sys/arch/hp300/dev/dcareg.h index e8c03d7cf74..43deaaaed7e 100644 --- a/sys/arch/hp300/dev/dcareg.h +++ b/sys/arch/hp300/dev/dcareg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dcareg.h,v 1.6 2003/06/02 23:27:44 millert Exp $ */ +/* $OpenBSD: dcareg.h,v 1.7 2005/12/28 21:13:40 miod Exp $ */ /* $NetBSD: dcareg.h,v 1.6 1996/02/24 00:55:02 thorpej Exp $ */ /* @@ -82,9 +82,8 @@ struct dcadevice { /* interface reset/id (300 only) */ #define DCAID0 0x02 -#define DCAREMID0 0x82 #define DCAID1 0x42 -#define DCAREMID1 0xC2 +#define DCACON 0x80 /* REMOTE/LOCAL switch */ /* interrupt control (300 only) */ #define DCAIPL(x) ((((x) >> 4) & 3) + 3) diff --git a/sys/arch/hp300/stand/common/dca.c b/sys/arch/hp300/stand/common/dca.c index fc1d4c4ea2e..bc93e87fb7d 100644 --- a/sys/arch/hp300/stand/common/dca.c +++ b/sys/arch/hp300/stand/common/dca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dca.c,v 1.2 2003/06/02 23:27:46 millert Exp $ */ +/* $OpenBSD: dca.c,v 1.3 2005/12/28 21:13:45 miod Exp $ */ /* $NetBSD: dca.c,v 1.10 1996/10/06 01:42:48 mycroft Exp $ */ /* @@ -76,8 +76,8 @@ dcaprobe(cp) case DCAID1: cp->cn_pri = CN_NORMAL; break; - case DCAREMID0: - case DCAREMID1: + case DCAID0 | DCACON: + case DCAID1 | DCACON: cp->cn_pri = CN_REMOTE; break; default: |