Update all callers of the pci_find{vendor,product} routines to now call
these routines through their global pointers.
This commit is contained in:
pgoyette
parent
72a7c70b78
commit
b18bc9eab4
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: gcscehci.c,v 1.6 2009/12/04 11:13:04 njoly Exp $ */
|
||||
/* $NetBSD: gcscehci.c,v 1.7 2010/05/24 20:29:49 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.6 2009/12/04 11:13:04 njoly Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v 1.7 2010/05/24 20:29:49 pgoyette Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -150,7 +150,7 @@ gcscehci_attach(device_t parent, device_t self, void *aux)
|
|||
sc->sc.sc_bus.usbrev = USBREV_2_0;
|
||||
|
||||
/* Figure out vendor for root hub descriptor. */
|
||||
vendor = pci_findvendor(pa->pa_id);
|
||||
vendor = pci_findvendor_vec(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));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ehci_cardbus.c,v 1.28 2010/03/10 00:21:10 dyoung Exp $ */
|
||||
/* $NetBSD: ehci_cardbus.c,v 1.29 2010/05/24 20:29:49 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.28 2010/03/10 00:21:10 dyoung Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.29 2010/05/24 20:29:49 pgoyette Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -172,7 +172,7 @@ ehci_cardbus_attach(device_t parent, device_t self, void *aux)
|
|||
}
|
||||
|
||||
/* Figure out vendor for root hub descriptor. */
|
||||
vendor = pci_findvendor(ca->ca_id);
|
||||
vendor = pci_findvendor_vec(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));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ohci_cardbus.c,v 1.36 2010/03/10 00:21:10 dyoung Exp $ */
|
||||
/* $NetBSD: ohci_cardbus.c,v 1.37 2010/05/24 20:29:49 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.36 2010/03/10 00:21:10 dyoung Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.37 2010/05/24 20:29:49 pgoyette Exp $");
|
||||
|
||||
#include "ehci_cardbus.h"
|
||||
|
||||
|
|
@ -150,7 +150,7 @@ ohci_cardbus_attach(device_t parent, device_t self, void *aux)
|
|||
}
|
||||
|
||||
/* Figure out vendor for root hub descriptor. */
|
||||
vendor = pci_findvendor(ca->ca_id);
|
||||
vendor = pci_findvendor_vec(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));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: uhci_cardbus.c,v 1.17 2010/03/18 20:54:56 dyoung Exp $ */
|
||||
/* $NetBSD: uhci_cardbus.c,v 1.18 2010/05/24 20:29:49 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.17 2010/03/18 20:54:56 dyoung Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.18 2010/05/24 20:29:49 pgoyette Exp $");
|
||||
|
||||
#include "ehci_cardbus.h"
|
||||
|
||||
|
|
@ -157,7 +157,7 @@ uhci_cardbus_attach(device_t parent, device_t self,
|
|||
}
|
||||
|
||||
/* Figure out vendor for root hub descriptor. */
|
||||
vendor = pci_findvendor(ca->ca_id);
|
||||
vendor = pci_findvendor_vec(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));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: azalia.c,v 1.73 2010/02/24 22:37:59 dyoung Exp $ */
|
||||
/* $NetBSD: azalia.c,v 1.74 2010/05/24 20:29:49 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.73 2010/02/24 22:37:59 dyoung Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.74 2010/05/24 20:29:49 pgoyette Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/device.h>
|
||||
|
|
@ -342,8 +342,8 @@ azalia_pci_attach(device_t parent, device_t self, void *aux)
|
|||
aprint_error_dev(self, "couldn't establish power handler\n");
|
||||
|
||||
sc->pciid = pa->pa_id;
|
||||
vendor = pci_findvendor(pa->pa_id);
|
||||
name = pci_findproduct(pa->pa_id);
|
||||
vendor = pci_findvendor_vec(pa->pa_id);
|
||||
name = pci_findproduct_vec(pa->pa_id);
|
||||
if (vendor != NULL && name != NULL) {
|
||||
aprint_normal_dev(self, "host: %s %s (rev. %d)",
|
||||
vendor, name, PCI_REVISION(pa->pa_class));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: cs4280.c,v 1.58 2010/05/22 01:51:14 pgoyette Exp $ */
|
||||
/* $NetBSD: cs4280.c,v 1.59 2010/05/24 20:29:49 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.58 2010/05/22 01:51:14 pgoyette Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.59 2010/05/24 20:29:49 pgoyette Exp $");
|
||||
|
||||
#include "midi.h"
|
||||
|
||||
|
|
@ -259,8 +259,8 @@ cs4280_attach(device_t parent, device_t self, void *aux)
|
|||
|
||||
cs_card = cs4280_identify_card(pa);
|
||||
if (cs_card != NULL) {
|
||||
vendor = pci_findvendor(cs_card->id);
|
||||
product = pci_findproduct(cs_card->id);
|
||||
vendor = pci_findvendor_vec(cs_card->id);
|
||||
product = pci_findproduct_vec(cs_card->id);
|
||||
if (vendor == NULL)
|
||||
aprint_normal_dev(&sc->sc_dev,
|
||||
"vendor 0x%04x product 0x%04x\n",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ehci_pci.c,v 1.47 2010/02/24 22:37:59 dyoung Exp $ */
|
||||
/* $NetBSD: ehci_pci.c,v 1.48 2010/05/24 20:29:49 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.47 2010/02/24 22:37:59 dyoung Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.48 2010/05/24 20:29:49 pgoyette Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -208,7 +208,7 @@ ehci_pci_attach(device_t parent, device_t self, void *aux)
|
|||
}
|
||||
|
||||
/* Figure out vendor for root hub descriptor. */
|
||||
vendor = pci_findvendor(pa->pa_id);
|
||||
vendor = pci_findvendor_vec(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));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ohci_pci.c,v 1.44 2010/03/11 04:00:36 mrg Exp $ */
|
||||
/* $NetBSD: ohci_pci.c,v 1.45 2010/05/24 20:29:49 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.44 2010/03/11 04:00:36 mrg Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.45 2010/05/24 20:29:49 pgoyette Exp $");
|
||||
|
||||
#include "ehci.h"
|
||||
|
||||
|
|
@ -142,7 +142,7 @@ ohci_pci_attach(device_t parent, device_t self, void *aux)
|
|||
aprint_normal_dev(self, "interrupting at %s\n", intrstr);
|
||||
|
||||
/* Figure out vendor for root hub descriptor. */
|
||||
vendor = pci_findvendor(pa->pa_id);
|
||||
vendor = pci_findvendor_vec(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));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: uhci_pci.c,v 1.50 2010/02/24 22:38:01 dyoung Exp $ */
|
||||
/* $NetBSD: uhci_pci.c,v 1.51 2010/05/24 20:29:49 pgoyette Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.50 2010/02/24 22:38:01 dyoung Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.51 2010/05/24 20:29:49 pgoyette Exp $");
|
||||
|
||||
#include "ehci.h"
|
||||
|
||||
|
|
@ -172,7 +172,7 @@ uhci_pci_attach(device_t parent, device_t self, void *aux)
|
|||
}
|
||||
|
||||
/* Figure out vendor for root hub descriptor. */
|
||||
vendor = pci_findvendor(pa->pa_id);
|
||||
vendor = pci_findvendor_vec(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));
|
||||
|
|
|
|||
Loading…
Reference in New Issue