From aefbfbb71a98f6b004b674c56c023bcd8866bc97 Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Wed, 14 Apr 2004 23:06:19 +0000
Subject: After enough checks on real hardware, it turns out the documentation
 is wrong, for once - SCON in GLOBAL1 on MVME188 is an SCON*, thus low if the
 board is the system controller.

---
 sys/arch/mvme88k/dev/vme.c         | 4 ++--
 sys/arch/mvme88k/include/mvme188.h | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/mvme88k/dev/vme.c b/sys/arch/mvme88k/dev/vme.c
index c28dbca99d7..c91e3a17cae 100644
--- a/sys/arch/mvme88k/dev/vme.c
+++ b/sys/arch/mvme88k/dev/vme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vme.c,v 1.29 2004/01/14 20:52:52 miod Exp $ */
+/*	$OpenBSD: vme.c,v 1.30 2004/04/14 23:06:16 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1995 Theo de Raadt
@@ -334,7 +334,7 @@ vmeattach(parent, self, args)
 
 		vmevecbase = 0x80;  /* Hard coded for MVME188 */
 		sconc = *(volatile u_int8_t *)GLOBAL1;
-		if (ISSET(sconc, M188_SYSCON))
+		if (!ISSET(sconc, M188_SYSCONNEG))
 			printf(": system controller");
 		printf("\n");
 		vmesyscon_init(sc);
diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h
index 6c82fa61556..ab8709820f2 100644
--- a/sys/arch/mvme88k/include/mvme188.h
+++ b/sys/arch/mvme88k/include/mvme188.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvme188.h,v 1.15 2003/10/11 22:08:57 miod Exp $ */
+/*	$OpenBSD: mvme188.h,v 1.16 2004/04/14 23:06:18 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -105,7 +105,8 @@
 #define GLB1		0xfff86003
 #define GLB2		0xfff86005
 #define GLB3		0xfff86007
-#define M188_SYSCON	0x00000040
+#define	M188_LRST	0x00000080
+#define M188_SYSCONNEG	0x00000040
 #define UCSR_REG	0xfff87000
 #define GLBRES_REG	0xfff8700C
 
-- 
cgit v1.2.3