Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci add some fujitsu ethernet id's and a new vendor ...



details:   https://anonhg.NetBSD.org/src/rev/5e4a825b5968
branches:  trunk
changeset: 765214:5e4a825b5968
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun May 22 08:13:17 2011 +0000

description:
add some fujitsu ethernet id's and a new vendor id.  partly from
Michael Moll <kvedulv%kvedulv.de@localhost>, taken from openbsd.

XXX: move the #if 0'd usage of PCI_VENDOR_CITICORP inside the #if 0 code
XXX: region, as this id conflits with the (4th) fijutsi id.

diffstat:

 sys/dev/pci/iwic_pci.c |   7 +++++--
 sys/dev/pci/pcidevs    |  11 ++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r 51a40f0aa916 -r 5e4a825b5968 sys/dev/pci/iwic_pci.c
--- a/sys/dev/pci/iwic_pci.c    Sun May 22 04:27:15 2011 +0000
+++ b/sys/dev/pci/iwic_pci.c    Sun May 22 08:13:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iwic_pci.c,v 1.16 2009/11/26 15:17:10 njoly Exp $      */
+/*     $NetBSD: iwic_pci.c,v 1.17 2011/05/22 08:13:17 mrg Exp $        */
 
 /*
  * Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -36,7 +36,7 @@
  *---------------------------------------------------------------------------*/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.16 2009/11/26 15:17:10 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.17 2011/05/22 08:13:17 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -122,6 +122,9 @@
                "ASUSCOM P-IN100-ST-D"
        },
        {
+#ifndef PCI_VENDOR_CITICORP
+#define PCI_VENDOR_CITICORP    PCI_VENDOR_FUJITSU4
+#endif
                PCI_ID_CODE(PCI_VENDOR_CITICORP,0x105E),
                -1,
                -1,
diff -r 51a40f0aa916 -r 5e4a825b5968 sys/dev/pci/pcidevs
--- a/sys/dev/pci/pcidevs       Sun May 22 04:27:15 2011 +0000
+++ b/sys/dev/pci/pcidevs       Sun May 22 08:13:17 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1078 2011/05/21 12:48:59 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1079 2011/05/22 08:13:17 mrg Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -257,8 +257,8 @@
 vendor MENTOR          0x10cc  Mentor ARC
 vendor ADVSYS          0x10cd  Advanced System Products
 vendor RADIUS          0x10ce  Radius
-vendor CITICORP                0x10cf  Citicorp TTI
-vendor FUJITSU2                0x10d0  Fujitsu Limited (2nd PCI Vendor ID)
+vendor FUJITSU4                0x10cf  Fujitsu (4th PCI Vendor ID)
+vendor FUJITSU2                0x10d0  Fujitsu (2nd PCI Vendor ID)
 vendor FUTUREPLUS      0x10d1  Future+ Systems
 vendor MOLEX           0x10d2  Molex
 vendor JABIL           0x10d3  Jabil Circuit
@@ -2034,6 +2034,11 @@
 /* Future Domain products */
 product FUTUREDOMAIN TMC_18C30 0x0000  TMC-18C30 (36C70)
 
+/* Fujitsu products */
+product        FUJITSU4        PW008GE5        0x11a1  PW008GE5
+product        FUJITSU4        PW008GE4        0x11a2  PW008GE4
+product        FUJITSU4        PP250_450_LAN   0x11cc  PRIMEPOWER250/450 LAN
+
 /* FZ Juelich / ZEL products */
 product FZJZEL GIGALINK        0x0001  Gigabit Link / STR1100
 product FZJZEL PLXHOTLINK      0x0002  HOTlink Interface



Home | Main Index | Thread Index | Old Index