Module Name: src
Committed By: pgoyette
Date: Tue May 25 08:37:10 UTC 2010
Modified Files:
src/sys/arch/i386/pci: gcscehci.c
src/sys/dev/cardbus: ehci_cardbus.c ohci_cardbus.c uhci_cardbus.c
src/sys/dev/pci: azalia.c cs4280.c ehci_pci.c ohci_pci.c
Log Message:
Revert earlier changes to callers of pci_find{vendor,product} since
the original routine entrypoint name has been restored.
Requested by dyoung@ and mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/pci/gcscehci.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/cardbus/ehci_cardbus.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/cardbus/ohci_cardbus.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/cardbus/uhci_cardbus.c
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/pci/azalia.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/cs4280.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/ohci_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/pci/gcscehci.c
diff -u src/sys/arch/i386/pci/gcscehci.c:1.7 src/sys/arch/i386/pci/gcscehci.c:1.8
--- src/sys/arch/i386/pci/gcscehci.c:1.7 Mon May 24 20:29:49 2010
+++ src/sys/arch/i386/pci/gcscehci.c Tue May 25 08:37:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscehci.c,v 1.7 2010/05/24 20:29:49 pgoyette Exp $ */
+/* $NetBSD: gcscehci.c,v 1.8 2010/05/25 08:37:10 pgoyette Exp $ */
/*
* Copyright (c) 2001, 2002, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.7 2010/05/24 20:29:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.8 2010/05/25 08:37:10 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -150,7 +150,7 @@
sc->sc.sc_bus.usbrev = USBREV_2_0;
/* Figure out vendor for root hub descriptor. */
- vendor = pci_findvendor_vec(pa->pa_id);
+ vendor = pci_findvendor(pa->pa_id);
sc->sc.sc_id_vendor = PCI_VENDOR(pa->pa_id);
if (vendor)
strlcpy(sc->sc.sc_vendor, vendor, sizeof(sc->sc.sc_vendor));
Index: src/sys/dev/cardbus/ehci_cardbus.c
diff -u src/sys/dev/cardbus/ehci_cardbus.c:1.29 src/sys/dev/cardbus/ehci_cardbus.c:1.30
--- src/sys/dev/cardbus/ehci_cardbus.c:1.29 Mon May 24 20:29:49 2010
+++ src/sys/dev/cardbus/ehci_cardbus.c Tue May 25 08:37:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_cardbus.c,v 1.29 2010/05/24 20:29:49 pgoyette Exp $ */
+/* $NetBSD: ehci_cardbus.c,v 1.30 2010/05/25 08:37:10 pgoyette Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.29 2010/05/24 20:29:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.30 2010/05/25 08:37:10 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -172,7 +172,7 @@
}
/* Figure out vendor for root hub descriptor. */
- vendor = pci_findvendor_vec(ca->ca_id);
+ vendor = pci_findvendor(ca->ca_id);
sc->sc.sc_id_vendor = PCI_VENDOR(ca->ca_id);
if (vendor)
strlcpy(sc->sc.sc_vendor, vendor, sizeof(sc->sc.sc_vendor));
Index: src/sys/dev/cardbus/ohci_cardbus.c
diff -u src/sys/dev/cardbus/ohci_cardbus.c:1.37 src/sys/dev/cardbus/ohci_cardbus.c:1.38
--- src/sys/dev/cardbus/ohci_cardbus.c:1.37 Mon May 24 20:29:49 2010
+++ src/sys/dev/cardbus/ohci_cardbus.c Tue May 25 08:37:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_cardbus.c,v 1.37 2010/05/24 20:29:49 pgoyette Exp $ */
+/* $NetBSD: ohci_cardbus.c,v 1.38 2010/05/25 08:37:10 pgoyette Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.37 2010/05/24 20:29:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.38 2010/05/25 08:37:10 pgoyette Exp $");
#include "ehci_cardbus.h"
@@ -150,7 +150,7 @@
}
/* Figure out vendor for root hub descriptor. */
- vendor = pci_findvendor_vec(ca->ca_id);
+ vendor = pci_findvendor(ca->ca_id);
sc->sc.sc_id_vendor = PCI_VENDOR(ca->ca_id);
if (vendor)
strlcpy(sc->sc.sc_vendor, vendor, sizeof(sc->sc.sc_vendor));
Index: src/sys/dev/cardbus/uhci_cardbus.c
diff -u src/sys/dev/cardbus/uhci_cardbus.c:1.18 src/sys/dev/cardbus/uhci_cardbus.c:1.19
--- src/sys/dev/cardbus/uhci_cardbus.c:1.18 Mon May 24 20:29:49 2010
+++ src/sys/dev/cardbus/uhci_cardbus.c Tue May 25 08:37:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_cardbus.c,v 1.18 2010/05/24 20:29:49 pgoyette Exp $ */
+/* $NetBSD: uhci_cardbus.c,v 1.19 2010/05/25 08:37:10 pgoyette Exp $ */
/*
* Copyright (c) 1998-2005 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.18 2010/05/24 20:29:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.19 2010/05/25 08:37:10 pgoyette Exp $");
#include "ehci_cardbus.h"
@@ -157,7 +157,7 @@
}
/* Figure out vendor for root hub descriptor. */
- vendor = pci_findvendor_vec(ca->ca_id);
+ vendor = pci_findvendor(ca->ca_id);
sc->sc.sc_id_vendor = PCI_VENDOR(ca->ca_id);
if (vendor)
strlcpy(sc->sc.sc_vendor, vendor, sizeof(sc->sc.sc_vendor));
Index: src/sys/dev/pci/azalia.c
diff -u src/sys/dev/pci/azalia.c:1.74 src/sys/dev/pci/azalia.c:1.75
--- src/sys/dev/pci/azalia.c:1.74 Mon May 24 20:29:49 2010
+++ src/sys/dev/pci/azalia.c Tue May 25 08:37:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia.c,v 1.74 2010/05/24 20:29:49 pgoyette Exp $ */
+/* $NetBSD: azalia.c,v 1.75 2010/05/25 08:37:10 pgoyette Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.74 2010/05/24 20:29:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.75 2010/05/25 08:37:10 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -342,8 +342,8 @@
aprint_error_dev(self, "couldn't establish power handler\n");
sc->pciid = pa->pa_id;
- vendor = pci_findvendor_vec(pa->pa_id);
- name = pci_findproduct_vec(pa->pa_id);
+ vendor = pci_findvendor(pa->pa_id);
+ name = pci_findproduct(pa->pa_id);
if (vendor != NULL && name != NULL) {
aprint_normal_dev(self, "host: %s %s (rev. %d)",
vendor, name, PCI_REVISION(pa->pa_class));
Index: src/sys/dev/pci/cs4280.c
diff -u src/sys/dev/pci/cs4280.c:1.59 src/sys/dev/pci/cs4280.c:1.60
--- src/sys/dev/pci/cs4280.c:1.59 Mon May 24 20:29:49 2010
+++ src/sys/dev/pci/cs4280.c Tue May 25 08:37:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280.c,v 1.59 2010/05/24 20:29:49 pgoyette Exp $ */
+/* $NetBSD: cs4280.c,v 1.60 2010/05/25 08:37:10 pgoyette Exp $ */
/*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.59 2010/05/24 20:29:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.60 2010/05/25 08:37:10 pgoyette Exp $");
#include "midi.h"
@@ -259,8 +259,8 @@
cs_card = cs4280_identify_card(pa);
if (cs_card != NULL) {
- vendor = pci_findvendor_vec(cs_card->id);
- product = pci_findproduct_vec(cs_card->id);
+ vendor = pci_findvendor(cs_card->id);
+ product = pci_findproduct(cs_card->id);
if (vendor == NULL)
aprint_normal_dev(&sc->sc_dev,
"vendor 0x%04x product 0x%04x\n",
Index: src/sys/dev/pci/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.48 src/sys/dev/pci/ehci_pci.c:1.49
--- src/sys/dev/pci/ehci_pci.c:1.48 Mon May 24 20:29:49 2010
+++ src/sys/dev/pci/ehci_pci.c Tue May 25 08:37:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.48 2010/05/24 20:29:49 pgoyette Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.49 2010/05/25 08:37:10 pgoyette Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.48 2010/05/24 20:29:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.49 2010/05/25 08:37:10 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -208,7 +208,7 @@
}
/* Figure out vendor for root hub descriptor. */
- vendor = pci_findvendor_vec(pa->pa_id);
+ vendor = pci_findvendor(pa->pa_id);
sc->sc.sc_id_vendor = PCI_VENDOR(pa->pa_id);
if (vendor)
strlcpy(sc->sc.sc_vendor, vendor, sizeof(sc->sc.sc_vendor));
Index: src/sys/dev/pci/ohci_pci.c
diff -u src/sys/dev/pci/ohci_pci.c:1.45 src/sys/dev/pci/ohci_pci.c:1.46
--- src/sys/dev/pci/ohci_pci.c:1.45 Mon May 24 20:29:49 2010
+++ src/sys/dev/pci/ohci_pci.c Tue May 25 08:37:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_pci.c,v 1.45 2010/05/24 20:29:49 pgoyette Exp $ */
+/* $NetBSD: ohci_pci.c,v 1.46 2010/05/25 08:37:10 pgoyette Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.45 2010/05/24 20:29:49 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.46 2010/05/25 08:37:10 pgoyette Exp $");
#include "ehci.h"
@@ -142,7 +142,7 @@
aprint_normal_dev(self, "interrupting at %s\n", intrstr);
/* Figure out vendor for root hub descriptor. */
- vendor = pci_findvendor_vec(pa->pa_id);
+ vendor = pci_findvendor(pa->pa_id);
sc->sc.sc_id_vendor = PCI_VENDOR(pa->pa_id);
if (vendor)
strlcpy(sc->sc.sc_vendor, vendor, sizeof(sc->sc.sc_vendor));
