regen

diff --git a/sys/arch/sgi/xbow/xbowdevs.h b/sys/arch/sgi/xbow/xbowdevs.h
index 144f1f7..b2380af 100644 (file)
--- a/sys/arch/sgi/xbow/xbowdevs.h
+++ b/sys/arch/sgi/xbow/xbowdevs.h
@@ -20,28 +20,28 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define        PCI_VENDOR_SGI  0x0000
-#define        PCI_VENDOR_SGI2 0x0023
-#define        PCI_VENDOR_SGI3 0x0024
-#define        PCI_VENDOR_SGI4 0x0036
-#define        PCI_VENDOR_SGI5 0x02aa
+#define        XBOW_VENDOR_SGI 0x0000
+#define        XBOW_VENDOR_SGI2        0x0023
+#define        XBOW_VENDOR_SGI3        0x0024
+#define        XBOW_VENDOR_SGI4        0x0036
+#define        XBOW_VENDOR_SGI5        0x02aa
 
 /*
  * List of known products.  Grouped by ``manufacturer''.
  */
 
-#define        PCI_PRODUCT_SGI_XBOW    0x0000          /* XBow */
-#define        PCI_PRODUCT_SGI_XXBOW   0xd000          /* XXBow */
+#define        XBOW_PRODUCT_SGI_XBOW   0x0000          /* XBow */
+#define        XBOW_PRODUCT_SGI_XXBOW  0xd000          /* XXBow */
 
-#define        PCI_PRODUCT_SGI2_ODYSSEY        0xc013          /* Odyssey */
+#define        XBOW_PRODUCT_SGI2_ODYSSEY       0xc013          /* Odyssey */
 
-#define        PCI_PRODUCT_SGI3_TPU    0xc202          /* TPU */
-#define        PCI_PRODUCT_SGI3_XBRIDGE        0xd002          /* XBridge */
+#define        XBOW_PRODUCT_SGI3_TPU   0xc202          /* TPU */
+#define        XBOW_PRODUCT_SGI3_XBRIDGE       0xd002          /* XBridge */
 
-#define        PCI_PRODUCT_SGI4_HEART  0xc001          /* Heart */
-#define        PCI_PRODUCT_SGI4_BRIDGE 0xc002          /* Bridge */
-#define        PCI_PRODUCT_SGI4_HUB    0xc101          /* Hub */
-#define        PCI_PRODUCT_SGI4_BEDROCK        0xc110          /* Bedrock */
+#define        XBOW_PRODUCT_SGI4_HEART 0xc001          /* Heart */
+#define        XBOW_PRODUCT_SGI4_BRIDGE        0xc002          /* Bridge */
+#define        XBOW_PRODUCT_SGI4_HUB   0xc101          /* Hub */
+#define        XBOW_PRODUCT_SGI4_BEDROCK       0xc110          /* Bedrock */
 
-#define        PCI_PRODUCT_SGI5_IMPACT 0xc003          /* ImpactSR */
-#define        PCI_PRODUCT_SGI5_KONA   0xc102          /* Kona */
+#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 002a544..e73743b 100644 (file)
--- a/sys/arch/sgi/xbow/xbowdevs_data.h
+++ b/sys/arch/sgi/xbow/xbowdevs_data.h
@@ -31,47 +31,47 @@ struct xbow_product {
 
 static const struct xbow_product xbow_products[] = {
        {
-           PCI_VENDOR_SGI, PCI_PRODUCT_SGI_XBOW,
+           XBOW_VENDOR_SGI, XBOW_PRODUCT_SGI_XBOW,
            "XBow",
        },
        {
-           PCI_VENDOR_SGI, PCI_PRODUCT_SGI_XXBOW,
+           XBOW_VENDOR_SGI, XBOW_PRODUCT_SGI_XXBOW,
            "XXBow",
        },
        {
-           PCI_VENDOR_SGI2, PCI_PRODUCT_SGI2_ODYSSEY,
+           XBOW_VENDOR_SGI2, XBOW_PRODUCT_SGI2_ODYSSEY,
            "Odyssey",
        },
        {
-           PCI_VENDOR_SGI3, PCI_PRODUCT_SGI3_TPU,
+           XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_TPU,
            "TPU",
        },
        {
-           PCI_VENDOR_SGI3, PCI_PRODUCT_SGI3_XBRIDGE,
+           XBOW_VENDOR_SGI3, XBOW_PRODUCT_SGI3_XBRIDGE,
            "XBridge",
        },
        {
-           PCI_VENDOR_SGI4, PCI_PRODUCT_SGI4_HEART,
+           XBOW_VENDOR_SGI4, XBOW_PRODUCT_SGI4_HEART,
            "Heart",
        },
        {
-           PCI_VENDOR_SGI4, PCI_PRODUCT_SGI4_BRIDGE,
+           XBOW_VENDOR_SGI4, XBOW_PRODUCT_SGI4_BRIDGE,
            "Bridge",
        },
        {
-           PCI_VENDOR_SGI4, PCI_PRODUCT_SGI4_HUB,
+           XBOW_VENDOR_SGI4, XBOW_PRODUCT_SGI4_HUB,
            "Hub",
        },
        {
-           PCI_VENDOR_SGI4, PCI_PRODUCT_SGI4_BEDROCK,
+           XBOW_VENDOR_SGI4, XBOW_PRODUCT_SGI4_BEDROCK,
            "Bedrock",
        },
        {
-           PCI_VENDOR_SGI5, PCI_PRODUCT_SGI5_IMPACT,
+           XBOW_VENDOR_SGI5, XBOW_PRODUCT_SGI5_IMPACT,
            "ImpactSR",
        },
        {
-           PCI_VENDOR_SGI5, PCI_PRODUCT_SGI5_KONA,
+           XBOW_VENDOR_SGI5, XBOW_PRODUCT_SGI5_KONA,
            "Kona",
        },
        { 0, 0, NULL, }