summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2012-10-26 16:26:14 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2012-10-26 16:26:14 +0000
commitf4413c52f1d6742f5daf3a32662abbd40069983e (patch)
treebf21432804fe8c452da9637c57fcfa10923ee949
parent5a9ba57f2c354261ad898c168b8ad665b83f7aa0 (diff)
Previous revision would prevent grtwo(4) boards from being recognized.
Make sure that what seems to be a 8-bit ID register of value zero does not match as an expansion board, which it can't be, and continue with the specific frame buffer test logic.
-rw-r--r--sys/arch/sgi/gio/gio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/sgi/gio/gio.c b/sys/arch/sgi/gio/gio.c
index 3a4a24fb257..47623c092d1 100644
--- a/sys/arch/sgi/gio/gio.c
+++ b/sys/arch/sgi/gio/gio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gio.c,v 1.13 2012/07/18 20:56:46 miod Exp $ */
+/* $OpenBSD: gio.c,v 1.14 2012/10/26 16:26:13 miod Exp $ */
/* $NetBSD: gio.c,v 1.32 2011/07/01 18:53:46 dyoung Exp $ */
/*
@@ -389,7 +389,7 @@ gio_id(vaddr_t va, paddr_t pa, int maybe_gfx)
*/
if ((id32 & 0xffff) == id16 && (id32 & 0xff) == id8 &&
- !GIO_PRODUCT_32BIT_ID(id8))
+ !GIO_PRODUCT_32BIT_ID(id8) && id8 != 0x00)
return /*GIO_PRODUCT_PRODUCTID*/(id8);
/*