Module Name: src
Committed By: martin
Date: Thu Mar 8 14:31:18 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: if_msk.c pcidevs
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #616):
sys/dev/pci/if_msk.c: revision 1.55
sys/dev/pci/pcidevs: revision 1.1299
update entry for Marvel Yukon 8058, and fix URL for pci ids (Rocky Hotas)
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.54.8.1 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.1289.2.2 -r1.1289.2.3 src/sys/dev/pci/pcidevs
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/pci/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.54 src/sys/dev/pci/if_msk.c:1.54.8.1
--- src/sys/dev/pci/if_msk.c:1.54 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/pci/if_msk.c Thu Mar 8 14:31:18 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.54 2016/12/15 09:28:05 ozaki-r Exp $ */
+/* $NetBSD: if_msk.c,v 1.54.8.1 2018/03/08 14:31:18 martin Exp $ */
/* $OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $ */
/*
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.54 2016/12/15 09:28:05 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.54.8.1 2018/03/08 14:31:18 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -160,7 +160,6 @@ static const struct msk_product {
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C034 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C036 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C042 },
- { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_C055 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8035 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8036 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8038 },
@@ -171,6 +170,7 @@ static const struct msk_product {
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8053 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8055 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8056 },
+ { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8058 },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021CU },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021X },
{ PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022CU },
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1289.2.2 src/sys/dev/pci/pcidevs:1.1289.2.3
--- src/sys/dev/pci/pcidevs:1.1289.2.2 Tue Nov 21 14:48:23 2017
+++ src/sys/dev/pci/pcidevs Thu Mar 8 14:31:18 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1289.2.2 2017/11/21 14:48:23 martin Exp $
+$NetBSD: pcidevs,v 1.1289.2.3 2018/03/08 14:31:18 martin Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -34,7 +34,7 @@ $NetBSD: pcidevs,v 1.1289.2.2 2017/11/21
/*
* NOTE: a fairly complete list of PCI codes can be found at:
*
- * http://www.pcidatabase.com/
+ * https://pci-ids.ucw.cz/
*
* (but it doesn't always seem to match vendor documentation)
*
@@ -2450,7 +2450,7 @@ product MARVELL YUKON_C036 0x4366 Yukon
product MARVELL YUKON_C032 0x4367 Yukon 88EC032
product MARVELL YUKON_C034 0x4368 Yukon 88EC034
product MARVELL YUKON_C042 0x4369 Yukon 88EC042
-product MARVELL YUKON_C055 0x436a Yukon 88EC055
+product MARVELL YUKON_8058 0x436a Yukon 88E8058
product MARVELL GT64120 0x4620 GT-64120 System Controller
product MARVELL BELKIN 0x5005 Belkin Gigabit Ethernet
product MARVELL 88SX5040 0x5040 88SX5040 SATA
