Vendor GALILEO is now MARVELL.
This commit is contained in:
riz
parent
ec9d914ee6
commit
a9815feffa
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pchb.c,v 1.8 2006/04/05 15:46:58 tsutsui Exp $ */
|
||||
/* $NetBSD: pchb.c,v 1.9 2006/08/22 21:42:19 riz Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.8 2006/04/05 15:46:58 tsutsui Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.9 2006/08/22 21:42:19 riz Exp $");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
|
|
@ -51,8 +51,8 @@ pchb_match(struct device *parent, struct cfdata *match, void *aux)
|
|||
{
|
||||
struct pci_attach_args *pa = aux;
|
||||
|
||||
if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_GALILEO) &&
|
||||
(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_GALILEO_GT64011))
|
||||
if ((PCI_VENDOR(pa->pa_id) == PCI_VENDOR_MARVELL) &&
|
||||
(PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_MARVELL_GT64011))
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pci_machdep.c,v 1.23 2006/07/15 08:08:23 tsutsui Exp $ */
|
||||
/* $NetBSD: pci_machdep.c,v 1.24 2006/08/22 21:42:19 riz Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.23 2006/07/15 08:08:23 tsutsui Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.24 2006/08/22 21:42:19 riz Exp $");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/param.h>
|
||||
|
|
@ -232,8 +232,8 @@ pci_conf_hook(pci_chipset_tag_t pc, int bus, int dev, int func, pcireg_t id)
|
|||
return 0;
|
||||
|
||||
/* Don't configure the bridge and PCI probe. */
|
||||
if (PCI_VENDOR(id) == PCI_VENDOR_GALILEO &&
|
||||
PCI_PRODUCT(id) == PCI_PRODUCT_GALILEO_GT64011)
|
||||
if (PCI_VENDOR(id) == PCI_VENDOR_MARVELL &&
|
||||
PCI_PRODUCT(id) == PCI_PRODUCT_MARVELL_GT64011)
|
||||
return 0;
|
||||
|
||||
/* Don't configure on-board VIA VT82C586 (pcib, uhci) */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: pchb.c,v 1.8 2005/11/25 13:55:14 simonb Exp $ */
|
||||
/* $NetBSD: pchb.c,v 1.9 2006/08/22 21:42:19 riz Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 2002 Wasabi Systems, Inc.
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.8 2005/11/25 13:55:14 simonb Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.9 2006/08/22 21:42:19 riz Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/device.h>
|
||||
|
|
@ -64,9 +64,9 @@ pchb_match(struct device *parent, struct cfdata *match, void *aux)
|
|||
if (PCI_CLASS(pa->pa_class) == PCI_CLASS_BRIDGE &&
|
||||
PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_BRIDGE_HOST) {
|
||||
switch (PCI_VENDOR(pa->pa_id)) {
|
||||
case PCI_VENDOR_GALILEO:
|
||||
case PCI_VENDOR_MARVELL:
|
||||
switch (PCI_PRODUCT(pa->pa_id)) {
|
||||
case PCI_PRODUCT_GALILEO_GT64120:
|
||||
case PCI_PRODUCT_MARVELL_GT64120:
|
||||
return (!pcifound);
|
||||
}
|
||||
break;
|
||||
|
|
@ -89,8 +89,8 @@ pchb_attach(struct device *parent, struct device *self, void *aux)
|
|||
* might want to add code that does something that's
|
||||
* possibly chipset-specific.
|
||||
*/
|
||||
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_GALILEO &&
|
||||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_GALILEO_GT64120) {
|
||||
if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_MARVELL &&
|
||||
PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_MARVELL_GT64120) {
|
||||
/* Bah, same product ID... */
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: if_sk.c,v 1.29 2006/08/22 06:24:10 riz Exp $ */
|
||||
/* $NetBSD: if_sk.c,v 1.30 2006/08/22 21:42:19 riz Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 2003 The NetBSD Foundation, Inc.
|
||||
|
|
@ -270,8 +270,8 @@ static const struct sk_product {
|
|||
{ PCI_VENDOR_LINKSYS, PCI_PRODUCT_LINKSYS_EG1064, },
|
||||
{ PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SKNET_GE, },
|
||||
{ PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9821v2, },
|
||||
{ PCI_VENDOR_GALILEO, PCI_PRODUCT_GALILEO_SKNET, },
|
||||
{ PCI_VENDOR_GALILEO, PCI_PRODUCT_GALILEO_BELKIN, },
|
||||
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_SKNET, },
|
||||
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_BELKIN, },
|
||||
{ 0, 0, }
|
||||
};
|
||||
|
||||
|
|
@ -1739,7 +1739,7 @@ skc_attach(struct device *parent, struct device *self, void *aux)
|
|||
case PCI_ID_CODE(PCI_VENDOR_LINKSYS,PCI_PRODUCT_LINKSYS_EG1064):
|
||||
sc->sk_name = sc->sk_vpd_prodname;
|
||||
break;
|
||||
case PCI_ID_CODE(PCI_VENDOR_GALILEO,PCI_PRODUCT_GALILEO_SKNET):
|
||||
case PCI_ID_CODE(PCI_VENDOR_MARVELL,PCI_PRODUCT_MARVELL_SKNET):
|
||||
/* whoops yukon vpd prodname bears no resemblance to reality */
|
||||
switch (sc->sk_type) {
|
||||
case SK_GENESIS:
|
||||
|
|
@ -1779,7 +1779,7 @@ skc_attach(struct device *parent, struct device *self, void *aux)
|
|||
}
|
||||
}
|
||||
break;
|
||||
case PCI_ID_CODE(PCI_VENDOR_GALILEO,PCI_PRODUCT_GALILEO_BELKIN):
|
||||
case PCI_ID_CODE(PCI_VENDOR_MARVELL,PCI_PRODUCT_MARVELL_BELKIN):
|
||||
sc->sk_name = sc->sk_vpd_prodname;
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
Loading…
Reference in New Issue