From 6cc02c1c9b6b0877fb3ca6195915694ccee3a146 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Mon, 28 Jul 2008 18:50:59 +0000
Subject: [PATCH] Put XBOW in the generated constants, not PCI...

---
 sys/arch/sgi/xbow/devlist2h.awk | 8 ++++----
 sys/arch/sgi/xbow/xbridge.c     | 6 +++---
 sys/arch/sgi/xbow/xheart.c      | 6 +++---
 sys/arch/sgi/xbow/xhub.c        | 6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys/arch/sgi/xbow/devlist2h.awk b/sys/arch/sgi/xbow/devlist2h.awk
index 3bea098490d..a7106aa986b 100644
--- a/sys/arch/sgi/xbow/devlist2h.awk
+++ b/sys/arch/sgi/xbow/devlist2h.awk
@@ -1,5 +1,5 @@
 #! /usr/bin/awk -f
-#	$OpenBSD: devlist2h.awk,v 1.1 2008/04/07 22:47:40 miod Exp $
+#	$OpenBSD: devlist2h.awk,v 1.2 2008/07/28 18:50:59 miod Exp $
 #	$NetBSD: devlist2h.awk,v 1.2 1996/01/22 21:08:09 cgd Exp $
 #
 # Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -68,7 +68,7 @@ $1 == "vendor" {
 	vendorindex[$2] = nvendors;		# record index for this name, for later.
 	vendors[nvendors, 1] = $2;		# name
 	vendors[nvendors, 2] = $3;		# id
-	printf("#define\tPCI_VENDOR_%s\t%s\n", vendors[nvendors, 1],
+	printf("#define\tXBOW_VENDOR_%s\t%s\n", vendors[nvendors, 1],
 	    vendors[nvendors, 2]) > hfile
 
 	next
@@ -79,7 +79,7 @@ $1 == "product" {
 	products[nproducts, 1] = $2;		# vendor name
 	products[nproducts, 2] = $3;		# product id
 	products[nproducts, 3] = $4;		# id
-	printf("#define\tPCI_PRODUCT_%s_%s\t%s\t", products[nproducts, 1],
+	printf("#define\tXBOW_PRODUCT_%s_%s\t%s\t", products[nproducts, 1],
 	    products[nproducts, 2], products[nproducts, 3]) > hfile
 
 	i=4; f = 5;
@@ -146,7 +146,7 @@ END {
 	    > dfile
 	for (i = 1; i <= nproducts; i++) {
 		printf("\t{\n") > dfile
-		printf("\t    PCI_VENDOR_%s, PCI_PRODUCT_%s_%s,\n",
+		printf("\t    XBOW_VENDOR_%s, XBOW_PRODUCT_%s_%s,\n",
 		    products[i, 1], products[i, 1], products[i, 2]) \
 		    > dfile
 
diff --git a/sys/arch/sgi/xbow/xbridge.c b/sys/arch/sgi/xbow/xbridge.c
index fc3198986b1..e10a6f4f1fe 100644
--- a/sys/arch/sgi/xbow/xbridge.c
+++ b/sys/arch/sgi/xbow/xbridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xbridge.c,v 1.1 2008/04/07 22:47:40 miod Exp $	*/
+/*	$OpenBSD: xbridge.c,v 1.2 2008/07/28 18:50:59 miod Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -125,8 +125,8 @@ xbridge_match(struct device *parent, void *match, void *aux)
 {
 	struct xbow_attach_args *xaa = aux;
 
-	if (xaa->xaa_vendor == PCI_VENDOR_SGI4 &&
-	    xaa->xaa_product == PCI_PRODUCT_SGI4_BRIDGE)
+	if (xaa->xaa_vendor == XBOW_VENDOR_SGI4 &&
+	    xaa->xaa_product == XBOW_PRODUCT_SGI4_BRIDGE)
 		return 1;
 
 	return 0;
diff --git a/sys/arch/sgi/xbow/xheart.c b/sys/arch/sgi/xbow/xheart.c
index cd278fcb0c0..1c11b90b85a 100644
--- a/sys/arch/sgi/xbow/xheart.c
+++ b/sys/arch/sgi/xbow/xheart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xheart.c,v 1.1 2008/04/07 22:47:40 miod Exp $	*/
+/*	$OpenBSD: xheart.c,v 1.2 2008/07/28 18:50:59 miod Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -76,8 +76,8 @@ xheart_match(struct device *parent, void *match, void *aux)
 {
 	struct xbow_attach_args *xaa = aux;
 
-	if (xaa->xaa_vendor == PCI_VENDOR_SGI4 &&
-	    xaa->xaa_product == PCI_PRODUCT_SGI4_HEART) {
+	if (xaa->xaa_vendor == XBOW_VENDOR_SGI4 &&
+	    xaa->xaa_product == XBOW_PRODUCT_SGI4_HEART) {
 		/*
 		 * Only match if no interrupt widget has registered yet.
 		 * There should be only one Heart in a system anyway.
diff --git a/sys/arch/sgi/xbow/xhub.c b/sys/arch/sgi/xbow/xhub.c
index db77bd20486..c930ad69211 100644
--- a/sys/arch/sgi/xbow/xhub.c
+++ b/sys/arch/sgi/xbow/xhub.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xhub.c,v 1.1 2008/04/07 22:47:40 miod Exp $	*/
+/*	$OpenBSD: xhub.c,v 1.2 2008/07/28 18:50:59 miod Exp $	*/
 
 /*
  * Copyright (c) 2008 Miodrag Vallat.
@@ -47,8 +47,8 @@ xhub_match(struct device *parent, void *match, void *aux)
 {
 	struct xbow_attach_args *xaa = aux;
 
-	if (xaa->xaa_vendor == PCI_VENDOR_SGI4 &&
-	    xaa->xaa_product == PCI_PRODUCT_SGI4_HUB)
+	if (xaa->xaa_vendor == XBOW_VENDOR_SGI4 &&
+	    xaa->xaa_product == XBOW_PRODUCT_SGI4_HUB)
 		return xbow_intr_widget == 0 ? 20 : 1;
 
 	return 0;
-- 
2.20.1