Module Name: src
Committed By: msaitoh
Date: Mon Sep 5 04:36:50 UTC 2011
Modified Files:
src/sys/dev/cardbus: if_fxp_cardbus.c
src/sys/dev/pci: if_fxp_pci.c
Log Message:
Change 0x1229's product name from 82557 to 8255x.
82550, 82551, 82558 and 82559 share the same product id.
This change makes "pcictl dump" happy.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/cardbus/if_fxp_cardbus.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/pci/if_fxp_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/dev/cardbus/if_fxp_cardbus.c
diff -u src/sys/dev/cardbus/if_fxp_cardbus.c:1.48 src/sys/dev/cardbus/if_fxp_cardbus.c:1.49
--- src/sys/dev/cardbus/if_fxp_cardbus.c:1.48 Mon Aug 1 11:20:27 2011
+++ src/sys/dev/cardbus/if_fxp_cardbus.c Mon Sep 5 04:36:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_cardbus.c,v 1.48 2011/08/01 11:20:27 drochner Exp $ */
+/* $NetBSD: if_fxp_cardbus.c,v 1.49 2011/09/05 04:36:50 msaitoh Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.48 2011/08/01 11:20:27 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.49 2011/09/05 04:36:50 msaitoh Exp $");
#include "opt_inet.h"
#include "rnd.h"
@@ -113,7 +113,7 @@
struct cardbus_attach_args *ca = aux;
if (PCI_VENDOR(ca->ca_id) == PCI_VENDOR_INTEL &&
- PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_INTEL_82557)
+ PCI_PRODUCT(ca->ca_id) == PCI_PRODUCT_INTEL_8255X)
return (1);
return (0);
Index: src/sys/dev/pci/if_fxp_pci.c
diff -u src/sys/dev/pci/if_fxp_pci.c:1.76 src/sys/dev/pci/if_fxp_pci.c:1.77
--- src/sys/dev/pci/if_fxp_pci.c:1.76 Fri Sep 2 03:16:18 2011
+++ src/sys/dev/pci/if_fxp_pci.c Mon Sep 5 04:36:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_pci.c,v 1.76 2011/09/02 03:16:18 msaitoh Exp $ */
+/* $NetBSD: if_fxp_pci.c,v 1.77 2011/09/05 04:36:50 msaitoh Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.76 2011/09/02 03:16:18 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.77 2011/09/05 04:36:50 msaitoh Exp $");
#include "rnd.h"
@@ -102,8 +102,8 @@
} fxp_pci_products[] = {
{ PCI_PRODUCT_INTEL_82552,
"Intel i82552 10/100 Network Connection" },
- { PCI_PRODUCT_INTEL_82557,
- "Intel i82557 Ethernet" },
+ { PCI_PRODUCT_INTEL_8255X,
+ "Intel i8255x Ethernet" },
{ PCI_PRODUCT_INTEL_82559ER,
"Intel i82559ER Ethernet" },
{ PCI_PRODUCT_INTEL_IN_BUSINESS,
@@ -378,7 +378,7 @@
sc->sc_rev = PCI_REVISION(pa->pa_class);
switch (fpp->fpp_prodid) {
- case PCI_PRODUCT_INTEL_82557:
+ case PCI_PRODUCT_INTEL_8255X:
case PCI_PRODUCT_INTEL_IN_BUSINESS:
if (sc->sc_rev >= FXP_REV_82558_A4) {
