Module Name: src
Committed By: snj
Date: Mon Dec 12 07:04:31 UTC 2016
Modified Files:
src/sys/dev/mii [netbsd-7]: atphy.c ihphy.c ikphy.c inphy.c makphy.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1301):
sys/dev/mii/inphy.c: revision 1.55
sys/dev/mii/makphy.c: revision 1.42
sys/dev/mii/ikphy.c: revision 1.12
sys/dev/mii/atphy.c: revision 1.18
sys/dev/mii/ihphy.c: revision 1.10
Set mii_mpd_{oui,model,rev}.
--
Set mii_mpd_{oui,model,rev}.
--
Set mii_mpd_{oui,model,rev}.
--
Set mii_mpd_{oui,rev}.
To generate a diff of this commit:
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/sys/dev/mii/atphy.c
cvs rdiff -u -r1.8 -r1.8.2.1 src/sys/dev/mii/ihphy.c
cvs rdiff -u -r1.10 -r1.10.2.1 src/sys/dev/mii/ikphy.c
cvs rdiff -u -r1.53 -r1.53.2.1 src/sys/dev/mii/inphy.c
cvs rdiff -u -r1.40 -r1.40.2.1 src/sys/dev/mii/makphy.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/mii/atphy.c
diff -u src/sys/dev/mii/atphy.c:1.16.2.1 src/sys/dev/mii/atphy.c:1.16.2.2
--- src/sys/dev/mii/atphy.c:1.16.2.1 Wed Nov 4 18:19:58 2015
+++ src/sys/dev/mii/atphy.c Mon Dec 12 07:04:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: atphy.c,v 1.16.2.1 2015/11/04 18:19:58 riz Exp $ */
+/* $NetBSD: atphy.c,v 1.16.2.2 2016/12/12 07:04:31 snj Exp $ */
/* $OpenBSD: atphy.c,v 1.1 2008/09/25 20:47:16 brad Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.16.2.1 2015/11/04 18:19:58 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atphy.c,v 1.16.2.2 2016/12/12 07:04:31 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,6 +146,9 @@ atphy_attach(device_t parent, device_t s
sc->mii_dev = self;
sc->mii_inst = mii->mii_instance;
sc->mii_phy = ma->mii_phyno;
+ sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
+ sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+ sc->mii_mpd_rev = MII_REV(ma->mii_id2);
sc->mii_funcs = &atphy_funcs;
sc->mii_pdata = mii;
sc->mii_flags = ma->mii_flags;
Index: src/sys/dev/mii/ihphy.c
diff -u src/sys/dev/mii/ihphy.c:1.8 src/sys/dev/mii/ihphy.c:1.8.2.1
--- src/sys/dev/mii/ihphy.c:1.8 Mon Jun 16 16:48:16 2014
+++ src/sys/dev/mii/ihphy.c Mon Dec 12 07:04:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ihphy.c,v 1.8 2014/06/16 16:48:16 msaitoh Exp $ */
+/* $NetBSD: ihphy.c,v 1.8.2.1 2016/12/12 07:04:31 snj Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.8 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ihphy.c,v 1.8.2.1 2016/12/12 07:04:31 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,6 +132,9 @@ ihphyattach(device_t parent, device_t se
sc->mii_dev = self;
sc->mii_inst = mii->mii_instance;
sc->mii_phy = ma->mii_phyno;
+ sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
+ sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+ sc->mii_mpd_rev = MII_REV(ma->mii_id2);
sc->mii_funcs = &ihphy_funcs;
sc->mii_pdata = mii;
sc->mii_flags = ma->mii_flags;
Index: src/sys/dev/mii/ikphy.c
diff -u src/sys/dev/mii/ikphy.c:1.10 src/sys/dev/mii/ikphy.c:1.10.2.1
--- src/sys/dev/mii/ikphy.c:1.10 Mon Jun 16 16:48:16 2014
+++ src/sys/dev/mii/ikphy.c Mon Dec 12 07:04:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ikphy.c,v 1.10 2014/06/16 16:48:16 msaitoh Exp $ */
+/* $NetBSD: ikphy.c,v 1.10.2.1 2016/12/12 07:04:31 snj Exp $ */
/*******************************************************************************
Copyright (c) 2001-2005, Intel Corporation
@@ -59,7 +59,7 @@ POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ikphy.c,v 1.10 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ikphy.c,v 1.10.2.1 2016/12/12 07:04:31 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -125,6 +125,9 @@ ikphyattach(device_t parent, device_t se
sc->mii_dev = self;
sc->mii_inst = mii->mii_instance;
sc->mii_phy = ma->mii_phyno;
+ sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
+ sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+ sc->mii_mpd_rev = MII_REV(ma->mii_id2);
sc->mii_funcs = &ikphy_funcs;
sc->mii_pdata = mii;
sc->mii_flags = ma->mii_flags;
Index: src/sys/dev/mii/inphy.c
diff -u src/sys/dev/mii/inphy.c:1.53 src/sys/dev/mii/inphy.c:1.53.2.1
--- src/sys/dev/mii/inphy.c:1.53 Mon Jun 16 16:48:16 2014
+++ src/sys/dev/mii/inphy.c Mon Dec 12 07:04:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: inphy.c,v 1.53 2014/06/16 16:48:16 msaitoh Exp $ */
+/* $NetBSD: inphy.c,v 1.53.2.1 2016/12/12 07:04:31 snj Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.53 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.53.2.1 2016/12/12 07:04:31 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,6 +137,9 @@ inphyattach(device_t parent, device_t se
sc->mii_dev = self;
sc->mii_inst = mii->mii_instance;
sc->mii_phy = ma->mii_phyno;
+ sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
+ sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+ sc->mii_mpd_rev = MII_REV(ma->mii_id2);
sc->mii_funcs = &inphy_funcs;
sc->mii_pdata = mii;
sc->mii_flags = ma->mii_flags;
Index: src/sys/dev/mii/makphy.c
diff -u src/sys/dev/mii/makphy.c:1.40 src/sys/dev/mii/makphy.c:1.40.2.1
--- src/sys/dev/mii/makphy.c:1.40 Mon Jun 16 16:48:16 2014
+++ src/sys/dev/mii/makphy.c Mon Dec 12 07:04:31 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.40 2014/06/16 16:48:16 msaitoh Exp $ */
+/* $NetBSD: makphy.c,v 1.40.2.1 2016/12/12 07:04:31 snj Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.40 2014/06/16 16:48:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.40.2.1 2016/12/12 07:04:31 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -154,7 +154,9 @@ makphyattach(device_t parent, device_t s
aprint_normal(": %s, rev. %d\n", mpd->mpd_name, MII_REV(ma->mii_id2));
sc->mii_dev = self;
+ sc->mii_mpd_oui = MII_OUI(ma->mii_id1, ma->mii_id2);
sc->mii_mpd_model = MII_MODEL(ma->mii_id2);
+ sc->mii_mpd_rev = MII_REV(ma->mii_id2);
sc->mii_inst = mii->mii_instance;
sc->mii_phy = ma->mii_phyno;
sc->mii_funcs = &makphy_funcs;
