Module Name: src
Committed By: christos
Date: Tue May 13 02:10:05 UTC 2014
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/mii/miidevs_data.h
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/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.121 src/sys/dev/mii/miidevs.h:1.122
--- src/sys/dev/mii/miidevs.h:1.121 Tue Feb 25 23:31:29 2014
+++ src/sys/dev/mii/miidevs.h Mon May 12 22:10:05 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.121 2014/02/26 04:31:29 ozaki-r Exp $ */
+/* $NetBSD: miidevs.h,v 1.122 2014/05/13 02:10:05 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.118 2014/02/26 04:13:44 ozaki-r Exp
+ * NetBSD: miidevs,v 1.119 2014/05/13 02:08:59 christos Exp
*/
/*-
@@ -359,14 +359,22 @@
#define MII_STR_LEVEL1_LXT1000 "LXT1000 1000BASE-T media interface"
/* Marvell Semiconductor PHYs */
+#define MII_MODEL_xxMARVELL_E1000 0x0000
+#define MII_STR_xxMARVELL_E1000 "Marvell 88E1000 Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1011 0x0002
#define MII_STR_xxMARVELL_E1011 "Marvell 88E1011 Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1000_3 0x0003
#define MII_STR_xxMARVELL_E1000_3 "Marvell 88E1000 Gigabit PHY"
+#define MII_MODEL_xxMARVELL_E1000S 0x0004
+#define MII_STR_xxMARVELL_E1000S "Marvell 88E1000S Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1000_5 0x0005
#define MII_STR_xxMARVELL_E1000_5 "Marvell 88E1000 Gigabit PHY"
-#define MII_MODEL_xxMARVELL_E6060 0x0008
-#define MII_STR_xxMARVELL_E6060 "Marvell 88E6060 10/100 5-port PHY switch"
+#define MII_MODEL_xxMARVELL_E1101 0x0006
+#define MII_STR_xxMARVELL_E1101 "Marvell 88E1101 Gigabit PHY"
+#define MII_MODEL_xxMARVELL_E3082 0x0008
+#define MII_STR_xxMARVELL_E3082 "Marvell 88E3082 10/100 Fast Ethernet PHY"
+#define MII_MODEL_xxMARVELL_E1112 0x0009
+#define MII_STR_xxMARVELL_E1112 "Marvell 88E1112 Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1149 0x000b
#define MII_STR_xxMARVELL_E1149 "Marvell 88E1149 Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1111 0x000c
@@ -375,12 +383,30 @@
#define MII_STR_xxMARVELL_E1145 "Marvell 88E1145 Quad Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1116 0x0021
#define MII_STR_xxMARVELL_E1116 "Marvell 88E1116 Gigabit PHY"
+#define MII_MODEL_xxMARVELL_E1118 0x0022
+#define MII_STR_xxMARVELL_E1118 "Marvell 88E1118 Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1116R 0x0024
#define MII_STR_xxMARVELL_E1116R "Marvell 88E1116R Gigabit PHY"
+#define MII_MODEL_xxMARVELL_E1149R 0x0025
+#define MII_STR_xxMARVELL_E1149R "Marvell 88E1149R Quad Gigabit PHY"
+#define MII_MODEL_xxMARVELL_E3016 0x0026
+#define MII_STR_xxMARVELL_E3016 "Marvell 88E3016 10/100 Fast Ethernet PHY"
+#define MII_MODEL_xxMARVELL_PHYG65G 0x0027
+#define MII_STR_xxMARVELL_PHYG65G "Marvell PHYG65G Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1116R_29 0x0029
#define MII_STR_xxMARVELL_E1116R_29 "Marvell 88E1116R Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1543 0x002a
#define MII_STR_xxMARVELL_E1543 "Marvell 88E1543 Alaska Quad Port Gb PHY"
+#define MII_MODEL_MARVELL_E1000 0x0000
+#define MII_STR_MARVELL_E1000 "Marvell 88E1000 Gigabit PHY"
+#define MII_MODEL_MARVELL_E1011 0x0002
+#define MII_STR_MARVELL_E1011 "Marvell 88E1011 Gigabit PHY"
+#define MII_MODEL_MARVELL_E1000_3 0x0003
+#define MII_STR_MARVELL_E1000_3 "Marvell 88E1000 Gigabit PHY"
+#define MII_MODEL_MARVELL_E1000_5 0x0005
+#define MII_STR_MARVELL_E1000_5 "Marvell 88E1000 Gigabit PHY"
+#define MII_MODEL_MARVELL_E1111 0x000c
+#define MII_STR_MARVELL_E1111 "Marvell 88E1111 Gigabit PHY"
/* Micrel PHYs */
#define MII_MODEL_MICREL_KSZ9021RNI 0x0021
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.109 src/sys/dev/mii/miidevs_data.h:1.110
--- src/sys/dev/mii/miidevs_data.h:1.109 Tue Feb 25 23:31:29 2014
+++ src/sys/dev/mii/miidevs_data.h Mon May 12 22:10:05 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.109 2014/02/26 04:31:29 ozaki-r Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.110 2014/05/13 02:10:05 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.118 2014/02/26 04:13:44 ozaki-r Exp
+ * NetBSD: miidevs,v 1.119 2014/05/13 02:08:59 christos Exp
*/
/*-
@@ -140,17 +140,30 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT975, MII_STR_LEVEL1_LXT975 },
{ MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT1000_OLD, MII_STR_LEVEL1_LXT1000_OLD },
{ MII_OUI_LEVEL1, MII_MODEL_LEVEL1_LXT1000, MII_STR_LEVEL1_LXT1000 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000, MII_STR_xxMARVELL_E1000 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1011, MII_STR_xxMARVELL_E1011 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_3, MII_STR_xxMARVELL_E1000_3 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000S, MII_STR_xxMARVELL_E1000S },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1000_5, MII_STR_xxMARVELL_E1000_5 },
- { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E6060, MII_STR_xxMARVELL_E6060 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1101, MII_STR_xxMARVELL_E1101 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E3082, MII_STR_xxMARVELL_E3082 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1112, MII_STR_xxMARVELL_E1112 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1149, MII_STR_xxMARVELL_E1149 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1111, MII_STR_xxMARVELL_E1111 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1145, MII_STR_xxMARVELL_E1145 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116, MII_STR_xxMARVELL_E1116 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1118, MII_STR_xxMARVELL_E1118 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R, MII_STR_xxMARVELL_E1116R },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1149R, MII_STR_xxMARVELL_E1149R },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E3016, MII_STR_xxMARVELL_E3016 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_PHYG65G, MII_STR_xxMARVELL_PHYG65G },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R_29, MII_STR_xxMARVELL_E1116R_29 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1543, MII_STR_xxMARVELL_E1543 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000, MII_STR_MARVELL_E1000 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1011, MII_STR_MARVELL_E1011 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_3, MII_STR_MARVELL_E1000_3 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_5, MII_STR_MARVELL_E1000_5 },
+ { MII_OUI_MARVELL, MII_MODEL_MARVELL_E1111, MII_STR_MARVELL_E1111 },
{ MII_OUI_MICREL, MII_MODEL_MICREL_KSZ9021RNI, MII_STR_MICREL_KSZ9021RNI },
{ MII_OUI_xxMYSON, MII_MODEL_xxMYSON_MTD972, MII_STR_xxMYSON_MTD972 },
{ MII_OUI_MYSON, MII_MODEL_MYSON_MTD803, MII_STR_MYSON_MTD803 },
