summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-10-08 19:13:08 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-10-08 19:13:08 +0000
commite29fdd6b602d63cdd6e0495e02dc6fcc61cdab62 (patch)
tree2fd8125d152d7820950d247f567620554567e41b /sys/arch
parentc0e6ddd519d7b8c4b84e1b0d78c5f4ce6cc21a10 (diff)
regen
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sgi/xbow/xbowdevs.h15
-rw-r--r--sys/arch/sgi/xbow/xbowdevs_data.h14
2 files changed, 16 insertions, 13 deletions
diff --git a/sys/arch/sgi/xbow/xbowdevs.h b/sys/arch/sgi/xbow/xbowdevs.h
index c4bc4229667..dbab72b2df2 100644
--- a/sys/arch/sgi/xbow/xbowdevs.h
+++ b/sys/arch/sgi/xbow/xbowdevs.h
@@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: xbowdevs,v 1.2 2009/04/25 20:36:18 miod Exp
+ * OpenBSD: xbowdevs,v 1.4 2009/10/08 19:13:00 miod Exp
*/
/*
* Copyright (c) 2008 Miodrag Vallat.
@@ -32,17 +32,20 @@
#define XBOW_PRODUCT_SGI_XBOW 0x0000 /* XBow */
#define XBOW_PRODUCT_SGI_XXBOW 0xd000 /* XXBow */
+#define XBOW_PRODUCT_SGI_BEDROCK 0xd100 /* Bedrock */
#define XBOW_PRODUCT_SGI2_ODYSSEY 0xc013 /* Odyssey */
#define XBOW_PRODUCT_SGI3_TPU 0xc202 /* TPU */
#define XBOW_PRODUCT_SGI3_XBRIDGE 0xd002 /* XBridge */
-/* PIC is really a single chip but two widgets, with 4 PCI-X slots per widget */
-#define XBOW_PRODUCT_SGI3_PIC0 0xd102 /* PIC (bus 0) */
-#define XBOW_PRODUCT_SGI3_PIC1 0xd112 /* PIC (bus 1) */
+/*
+ * PIC is really a single chip but with two widgets headers, and 4 PCI-X
+ * slots per widget.
+ * The second widget register set uses 0xd112 as the product id.
+ */
+#define XBOW_PRODUCT_SGI3_PIC 0xd102 /* PIC */
/* Supposedly a PIC-compatible chip, maybe a different revision */
-/* product SGI3 ? 0xe000 ? (bus 0) */
-/* product SGI3 ? 0xe010 ? (bus 1) */
+/* product SGI3 ? 0xe000 ? (0xe010 for the 2nd widget) */
#define XBOW_PRODUCT_SGI3_TIOCA 0xe020 /* TIO:CA */
#define XBOW_PRODUCT_SGI4_HEART 0xc001 /* Heart */
diff --git a/sys/arch/sgi/xbow/xbowdevs_data.h b/sys/arch/sgi/xbow/xbowdevs_data.h
index 8065cbd628f..a64dfe6c903 100644
--- a/sys/arch/sgi/xbow/xbowdevs_data.h
+++ b/sys/arch/sgi/xbow/xbowdevs_data.h
@@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: xbowdevs,v 1.2 2009/04/25 20:36:18 miod Exp
+ * OpenBSD: xbowdevs,v 1.4 2009/10/08 19:13:00 miod Exp
*/
/*
@@ -39,6 +39,10 @@ static const struct xbow_product xbow_products[] = {
"XXBow",
},
{
+ XBOW_VENDOR_SGI, XBOW_PRODUCT_SGI_BEDROCK,
+ "Bedrock",
+ },
+ {
XBOW_VENDOR_SGI2, XBOW_PRODUCT_SGI2_ODYSSEY,
"Odyssey",
},
@@ -51,12 +55,8 @@ static const struct xbow_product xbow_products[] = {
"XBridge",
},
{
- XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_PIC0,
- "PIC (bus 0)",
- },
- {
- XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_PIC1,
- "PIC (bus 1)",
+ XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_PIC,
+ "PIC",
},
{
XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_TIOCA,