[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/e92dc8e44a53
changeset: 509:e92dc8e44a53
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Wed Jul 25 17:14:19 2012 +0300
description:
Lazy update

diffstat:

 head/sys/dev/mii/ciphy.c |  6 +++++-
 head/sys/dev/mii/miidevs |  9 +++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (77 lines):

diff -r 3477fc52e1a4 -r e92dc8e44a53 head/sys/dev/mii/ciphy.c
--- a/head/sys/dev/mii/ciphy.c	Wed Jul 25 17:13:44 2012 +0300
+++ b/head/sys/dev/mii/ciphy.c	Wed Jul 25 17:14:19 2012 +0300
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/mii/ciphy.c 227908 2011-11-23 20:27:26Z marius $");
+__FBSDID("$FreeBSD: head/sys/dev/mii/ciphy.c 235999 2012-05-25 15:05:17Z raj $");
 
 /*
  * Driver for the Cicada/Vitesse CS/VSC8xxx 10/100/1000 copper PHY.
@@ -91,8 +91,10 @@
 	MII_PHY_DESC(xxCICADA, CS8201B),
 	MII_PHY_DESC(xxCICADA, CS8204),
 	MII_PHY_DESC(xxCICADA, VSC8211),
+	MII_PHY_DESC(xxCICADA, VSC8221),
 	MII_PHY_DESC(xxCICADA, CS8244),
 	MII_PHY_DESC(xxVITESSE, VSC8601),
+	MII_PHY_DESC(xxVITESSE, VSC8641),
 	MII_PHY_END
 };
 
@@ -368,8 +370,10 @@
 
 		break;
 	case MII_MODEL_xxCICADA_VSC8211:
+	case MII_MODEL_xxCICADA_VSC8221:
 	case MII_MODEL_xxCICADA_CS8244:
 	case MII_MODEL_xxVITESSE_VSC8601:
+	case MII_MODEL_xxVITESSE_VSC8641:
 		break;
 	default:
 		device_printf(sc->mii_dev, "unknown CICADA PHY model %x\n",
diff -r 3477fc52e1a4 -r e92dc8e44a53 head/sys/dev/mii/miidevs
--- a/head/sys/dev/mii/miidevs	Wed Jul 25 17:13:44 2012 +0300
+++ b/head/sys/dev/mii/miidevs	Wed Jul 25 17:14:19 2012 +0300
@@ -1,4 +1,4 @@
-$FreeBSD: head/sys/dev/mii/miidevs 231914 2012-02-19 12:25:58Z marius $
+$FreeBSD: head/sys/dev/mii/miidevs 235999 2012-05-25 15:05:17Z raj $
 /*$NetBSD: miidevs,v 1.105 2011/11/25 23:28:14 jakllsch Exp $*/
 
 /*-
@@ -52,7 +52,7 @@
 oui BROADCOM			0x001018	Broadcom Corporation
 oui BROADCOM2			0x000af7	Broadcom Corporation
 oui BROADCOM3			0x001be9	Broadcom Corporation
-oui CICADA			0x0003F1	Cicada Semiconductor
+oui CICADA			0x0003f1	Cicada Semiconductor
 oui DAVICOM			0x00606e	Davicom Semiconductor
 oui ENABLESEMI			0x0010dd	Enable Semiconductor
 oui ICPLUS			0x0090c3	IC Plus Corp.
@@ -72,6 +72,7 @@
 oui SIS				0x00e006	Silicon Integrated Systems
 oui TI				0x080028	Texas Instruments
 oui TSC				0x00c039	TDK Semiconductor
+oui VITESSE			0x0001c1	Vitesse Semiconductor
 oui XAQTI			0x00e0ae	XaQti Corp.
 
 /* Some Intel 82553's use an alternative OUI. */
@@ -193,6 +194,7 @@
 model xxCICADA CS8201		0x0001 Cicada CS8201 10/100/1000TX PHY
 model xxCICADA CS8204		0x0004 Cicada CS8204 10/100/1000TX PHY
 model xxCICADA VSC8211		0x000b Cicada VSC8211 10/100/1000TX PHY
+model xxCICADA VSC8221		0x0015 Cicada CS8201 10/100/1000TX PHY
 model xxCICADA CS8201A		0x0020 Cicada CS8201 10/100/1000TX PHY
 model xxCICADA CS8201B		0x0021 Cicada CS8201 10/100/1000TX PHY
 model xxCICADA CS8244		0x002c Cicada CS8244 10/100/1000TX PHY
@@ -324,5 +326,8 @@
 model xxTSC 78Q2120		0x0014 78Q2120 10/100 media interface
 model xxTSC 78Q2121		0x0015 78Q2121 100BASE-TX media interface
 
+/* Vitesse Semiconductor */
+model xxVITESSE VSC8641		0x0003 Vitesse VSC8641 10/100/1000TX PHY
+
 /* XaQti Corp. PHYs */
 model xxXAQTI XMACII		0x0000 XaQti Corp. XMAC II gigabit interface