Module Name: src Committed By: jdolecek Date: Wed Jun 13 23:25:41 UTC 2018
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.130 -r1.131 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.118 -r1.119 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.130 src/sys/dev/mii/miidevs.h:1.131 --- src/sys/dev/mii/miidevs.h:1.130 Thu May 10 02:50:00 2018 +++ src/sys/dev/mii/miidevs.h Wed Jun 13 23:25:41 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs.h,v 1.130 2018/05/10 02:50:00 msaitoh Exp $ */ +/* $NetBSD: miidevs.h,v 1.131 2018/06/13 23:25:41 jdolecek Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.127 2018/05/10 02:49:41 msaitoh Exp + * NetBSD: miidevs,v 1.128 2018/06/13 23:25:25 jdolecek Exp */ /*- @@ -419,14 +419,16 @@ #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_E1000_0 0x0000 +#define MII_STR_MARVELL_E1000_0 "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_E1000_6 0x0006 +#define MII_STR_MARVELL_E1000_6 "Marvell 88E1000 Gigabit PHY" #define MII_MODEL_MARVELL_E1111 0x000c #define MII_STR_MARVELL_E1111 "Marvell 88E1111 Gigabit PHY" Index: src/sys/dev/mii/miidevs_data.h diff -u src/sys/dev/mii/miidevs_data.h:1.118 src/sys/dev/mii/miidevs_data.h:1.119 --- src/sys/dev/mii/miidevs_data.h:1.118 Thu May 10 02:50:00 2018 +++ src/sys/dev/mii/miidevs_data.h Wed Jun 13 23:25:41 2018 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs_data.h,v 1.118 2018/05/10 02:50:00 msaitoh Exp $ */ +/* $NetBSD: miidevs_data.h,v 1.119 2018/06/13 23:25:41 jdolecek Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.127 2018/05/10 02:49:41 msaitoh Exp + * NetBSD: miidevs,v 1.128 2018/06/13 23:25:25 jdolecek Exp */ /*- @@ -170,10 +170,11 @@ struct mii_knowndev mii_knowndevs[] = { { 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_E1000_0, MII_STR_MARVELL_E1000_0 }, { 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_E1000_6, MII_STR_MARVELL_E1000_6 }, { 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 },