regen

2 files changed, 60 insertions, 24 deletions

diff --git a/sys/arch/sgi/xbow/xbowdevs.h b/sys/arch/sgi/xbow/xbowdevs.h
index b6e95bf0c40..c2d6b3a4189 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.5 2009/10/14 20:19:23 miod Exp 
+ *	OpenBSD: xbowdevs,v 1.6 2009/10/15 23:42:43 miod Exp 
  */
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -27,16 +27,31 @@
 #define	XBOW_VENDOR_SGI5	0x02aa
 
 /*
- * List of known products.  Grouped by ``manufacturer''.
+ * List of known products.  Grouped by type.
+ */
+
+/*
+ * Crossbows
  */
 
 #define	XBOW_PRODUCT_SGI_XBOW	0x0000		/* XBow */
 #define	XBOW_PRODUCT_SGI_XXBOW	0xd000		/* XXBow */
-#define	XBOW_PRODUCT_SGI_BEDROCK	0xd100		/* PXBow */
+#define	XBOW_PRODUCT_SGI_PXBOW	0xd100		/* PXBow */
 
-#define	XBOW_PRODUCT_SGI2_ODYSSEY	0xc013		/* Odyssey */
+/*
+ * Frame buffers and graphics related devices
+ */
 
+#define	XBOW_PRODUCT_SGI5_IMPACT	0xc003		/* ImpactSR */
+#define	XBOW_PRODUCT_SGI2_ODYSSEY	0xc013		/* Odyssey */
+#define	XBOW_PRODUCT_SGI5_KONA	0xc102		/* Kona */
 #define	XBOW_PRODUCT_SGI3_TPU	0xc202		/* TPU */
+
+/*
+ * Non-XIO bus bridges
+ */
+
+#define	XBOW_PRODUCT_SGI4_BRIDGE	0xc002		/* Bridge */
 #define	XBOW_PRODUCT_SGI3_XBRIDGE	0xd002		/* XBridge */
 /*
  * PIC is really a single chip but with two widgets headers, and 4 PCI-X
@@ -44,14 +59,27 @@
  * 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	? (0xe010 for the 2nd widget) */
+/*
+ * TIO apparently is a next-generation XIO framework; TIO:CP being a TIO
+ * variant of PIC with two PCI-X buses, and TIO:CA an AGP bridge.
+ * Unlike PIC, the two heads of TIO:CP would appear as two distinct TIO
+ * widgets.
+ * TIO widgets are supposedly only found on SN2 systems onwards (i.e.
+ * ia64-based Altix systems), but in case there is a way to connect TIO
+ * nodes to XIO nodes, better identify them properly.
+ */
+#define	XBOW_PRODUCT_SGI3_TIOCP0	0xe000		/* TIO:CP */
+#define	XBOW_PRODUCT_SGI3_TIOCP1	0xe010		/* TIO:CP */
 #define	XBOW_PRODUCT_SGI3_TIOCA	0xe020		/* TIO:CA */
 
+/*
+ * Octane HEART memory and interrupt controller
+ */
 #define	XBOW_PRODUCT_SGI4_HEART	0xc001		/* Heart */
-#define	XBOW_PRODUCT_SGI4_BRIDGE	0xc002		/* Bridge */
+
+/*
+ * Miscellaneous widgets
+ */
+
 #define	XBOW_PRODUCT_SGI4_HUB	0xc101		/* Hub */
 #define	XBOW_PRODUCT_SGI4_BEDROCK	0xc110		/* Bedrock */
-
-#define	XBOW_PRODUCT_SGI5_IMPACT	0xc003		/* ImpactSR */
-#define	XBOW_PRODUCT_SGI5_KONA	0xc102		/* Kona */
diff --git a/sys/arch/sgi/xbow/xbowdevs_data.h b/sys/arch/sgi/xbow/xbowdevs_data.h
index fc7aeee5e38..a6553a06856 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.5 2009/10/14 20:19:23 miod Exp 
+ *	OpenBSD: xbowdevs,v 1.6 2009/10/15 23:42:43 miod Exp 
  */
 
 /*
@@ -39,18 +39,30 @@ static const struct xbow_product xbow_products[] = {
 	    "XXBow",
 	},
 	{
-	    XBOW_VENDOR_SGI, XBOW_PRODUCT_SGI_BEDROCK,
+	    XBOW_VENDOR_SGI, XBOW_PRODUCT_SGI_PXBOW,
 	    "PXBow",
 	},
 	{
+	    XBOW_VENDOR_SGI5, XBOW_PRODUCT_SGI5_IMPACT,
+	    "ImpactSR",
+	},
+	{
 	    XBOW_VENDOR_SGI2, XBOW_PRODUCT_SGI2_ODYSSEY,
 	    "Odyssey",
 	},
 	{
+	    XBOW_VENDOR_SGI5, XBOW_PRODUCT_SGI5_KONA,
+	    "Kona",
+	},
+	{
 	    XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_TPU,
 	    "TPU",
 	},
 	{
+	    XBOW_VENDOR_SGI4, XBOW_PRODUCT_SGI4_BRIDGE,
+	    "Bridge",
+	},
+	{
 	    XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_XBRIDGE,
 	    "XBridge",
 	},
@@ -59,6 +71,14 @@ static const struct xbow_product xbow_products[] = {
 	    "PIC",
 	},
 	{
+	    XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_TIOCP0,
+	    "TIO:CP",
+	},
+	{
+	    XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_TIOCP1,
+	    "TIO:CP",
+	},
+	{
 	    XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_TIOCA,
 	    "TIO:CA",
 	},
@@ -67,10 +87,6 @@ static const struct xbow_product xbow_products[] = {
 	    "Heart",
 	},
 	{
-	    XBOW_VENDOR_SGI4, XBOW_PRODUCT_SGI4_BRIDGE,
-	    "Bridge",
-	},
-	{
 	    XBOW_VENDOR_SGI4, XBOW_PRODUCT_SGI4_HUB,
 	    "Hub",
 	},
@@ -78,14 +94,6 @@ static const struct xbow_product xbow_products[] = {
 	    XBOW_VENDOR_SGI4, XBOW_PRODUCT_SGI4_BEDROCK,
 	    "Bedrock",
 	},
-	{
-	    XBOW_VENDOR_SGI5, XBOW_PRODUCT_SGI5_IMPACT,
-	    "ImpactSR",
-	},
-	{
-	    XBOW_VENDOR_SGI5, XBOW_PRODUCT_SGI5_KONA,
-	    "Kona",
-	},
 	{ 0, 0, NULL, }
 };