[src/netbsd-1-4]: src/sys/arch/alpha/mcbus Pull up revision 1.3 (requested by...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f0128c1cbad7
branches:  netbsd-1-4
changeset: 469868:f0128c1cbad7
user:      he <he%NetBSD.org@localhost>
date:      Thu Dec 16 23:16:28 1999 +0000

description:
Pull up revision 1.3 (requested by mjacob):
  Force probing of MCPCIAs such that if they are not there we can
  still boot.  Not all Alpha 4100 / Rawhide systems have the full
  four MCPCIAs.

diffstat:

 sys/arch/alpha/mcbus/mcbusreg.h |  15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 18153d06f8ec -r f0128c1cbad7 sys/arch/alpha/mcbus/mcbusreg.h
--- a/sys/arch/alpha/mcbus/mcbusreg.h   Thu Dec 16 23:16:04 1999 +0000
+++ b/sys/arch/alpha/mcbus/mcbusreg.h   Thu Dec 16 23:16:28 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mcbusreg.h,v 1.2 1998/04/15 20:40:34 mjacob Exp $ */
+/* $NetBSD: mcbusreg.h,v 1.2.8.1 1999/12/16 23:16:28 he Exp $ */
 
 /*
  * Copyright (c) 1998 by Matthew Jacob
@@ -71,7 +71,14 @@
 #define        MCBUS_MID_MASK          0x0000000E00000000L
 #define        MCBUS_MID_SHIFT         33
 
+#define        MAX_MC_BUS              8
 
-#define        MCPCIA_PER_MCBUS        4
-
-#define        MAX_MC_BUS              8
+/*
+ * This is something of a layering violation, but it makes probing cleaner.
+ */
+#define        MCPCIA_PER_MCBUS                4
+/* the MCPCIA bridge CSR addresses, offset zero, is a good thing to probe for */
+#define        MCPCIA_BRIDGE_ADDR(gid, mid)    \
+       (MCBUS_IOSPACE | 0x1E0000000LL  |               \
+       (((unsigned long) gid) << MCBUS_GID_SHIFT) |    \
+       (((unsigned long) mid) << MCBUS_MID_SHIFT))