summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2007-05-23 18:29:36 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2007-05-23 18:29:36 +0000
commitf1506023f2b67e85e1a66dabd49d690d4633fb03 (patch)
tree300ff813d676f4221cde1c072e0dee4844610387
parent1249ff8922caa7dae4fd28dae5ea686ef9e3fac1 (diff)
Add hack to prevent switching to serial console on four-digit B/C/J class
workstations. This makes these machines actually boot. ok miod@
-rw-r--r--sys/arch/hppa/dev/pdc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/arch/hppa/dev/pdc.c b/sys/arch/hppa/dev/pdc.c
index ff48b53b480..0f1136c042a 100644
--- a/sys/arch/hppa/dev/pdc.c
+++ b/sys/arch/hppa/dev/pdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdc.c,v 1.28 2004/04/07 18:24:19 mickey Exp $ */
+/* $OpenBSD: pdc.c,v 1.29 2007/05/23 18:29:35 kettenis Exp $ */
/*
* Copyright (c) 1998-2003 Michael Shalayeff
@@ -142,6 +142,13 @@ pdc_init()
conaddr = (u_long)pzd->pz_hpa + IOMOD_DEVOFFSET;
conunit = 0;
+ /*
+ * XXX Attaching the serial console on four-digit B/C/J
+ * class workstations, so disable it for now.
+ */
+ if (conaddr == 0xfee003f8 + IOMOD_DEVOFFSET)
+ conaddr = 0;
+
/* compute correct baud rate */
if (PZL_SPEED(pzd->pz_layers[0]) <
sizeof(pdc_speeds) / sizeof(int))