Module Name: src
Committed By: jnemeth
Date: Sat Nov 13 09:48:55 UTC 2010
Modified Files:
src/sys/arch/amd64/conf: GENERIC XEN3_DOM0
src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0
Log Message:
Add new et(4)/etphy(4) devices.
To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.276 -r1.277 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.998 -r1.999 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/i386/conf/XEN3_DOM0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.290 src/sys/arch/amd64/conf/GENERIC:1.291
--- src/sys/arch/amd64/conf/GENERIC:1.290 Wed Nov 10 10:07:44 2010
+++ src/sys/arch/amd64/conf/GENERIC Sat Nov 13 09:48:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.290 2010/11/10 10:07:44 dholland Exp $
+# $NetBSD: GENERIC,v 1.291 2010/11/13 09:48:54 jnemeth Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.290 $"
+#ident "GENERIC-$Revision: 1.291 $"
maxusers 64 # estimated number of users
@@ -667,6 +667,7 @@
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
esh* at pci? dev ? function ? # Essential HIPPI card
+et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
@@ -747,6 +748,7 @@
brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
ciphy* at mii? phy ? # Cicada CS8201 Gig-E PHYs
dmphy* at mii? phy ? # Davicom DM9101 PHYs
+etphy* at mii? phy ? # Agere/LSI ET1011 TruePHY Gig-E PHYs
exphy* at mii? phy ? # 3Com internal PHYs
gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs
glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.58 src/sys/arch/amd64/conf/XEN3_DOM0:1.59
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.58 Sat Nov 6 15:08:59 2010
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Nov 13 09:48:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.58 2010/11/06 15:08:59 jakllsch Exp $
+# $NetBSD: XEN3_DOM0,v 1.59 2010/11/13 09:48:54 jnemeth Exp $
include "arch/amd64/conf/std.xen"
@@ -332,6 +332,7 @@
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
esh* at pci? dev ? function ? # Essential HIPPI card
+et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
@@ -378,6 +379,7 @@
brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
ciphy* at mii? phy ? # Cicada CS8201 Gig-E PHYs
dmphy* at mii? phy ? # Davicom DM9101 PHYs
+etphy* at mii? phy ? # Agere/LSI ET1011 TruePHY Gig-E PHYs
exphy* at mii? phy ? # 3Com internal PHYs
gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs
glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.276 src/sys/arch/i386/conf/ALL:1.277
--- src/sys/arch/i386/conf/ALL:1.276 Sat Nov 6 15:11:50 2010
+++ src/sys/arch/i386/conf/ALL Sat Nov 13 09:48:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.276 2010/11/06 15:11:50 jakllsch Exp $
+# $NetBSD: ALL,v 1.277 2010/11/13 09:48:55 jnemeth Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.276 $"
+#ident "ALL-$Revision: 1.277 $"
maxusers 64 # estimated number of users
@@ -1003,6 +1003,7 @@
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
esh* at pci? dev ? function ? # Essential HIPPI card
+et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
@@ -1136,6 +1137,7 @@
brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
ciphy* at mii? phy ? # Cicada CS8201 Gig-E PHYs
dmphy* at mii? phy ? # Davicom DM9101 PHYs
+etphy* at mii? phy ? # Agere/LSI ET1011 TruePHY Gig-E PHYs
exphy* at mii? phy ? # 3Com internal PHYs
gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs
glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.998 src/sys/arch/i386/conf/GENERIC:1.999
--- src/sys/arch/i386/conf/GENERIC:1.998 Sat Nov 6 15:06:29 2010
+++ src/sys/arch/i386/conf/GENERIC Sat Nov 13 09:48:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.998 2010/11/06 15:06:29 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.999 2010/11/13 09:48:55 jnemeth Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.998 $"
+#ident "GENERIC-$Revision: 1.999 $"
maxusers 64 # estimated number of users
@@ -953,6 +953,7 @@
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
esh* at pci? dev ? function ? # Essential HIPPI card
+et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
@@ -1085,6 +1086,7 @@
brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
ciphy* at mii? phy ? # Cicada CS8201 Gig-E PHYs
dmphy* at mii? phy ? # Davicom DM9101 PHYs
+etphy* at mii? phy ? # Agere/LSI ET1011 TruePHY Gig-E PHYs
exphy* at mii? phy ? # 3Com internal PHYs
gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs
glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.39 src/sys/arch/i386/conf/XEN3_DOM0:1.40
--- src/sys/arch/i386/conf/XEN3_DOM0:1.39 Sat Nov 6 15:08:59 2010
+++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Nov 13 09:48:55 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.39 2010/11/06 15:08:59 jakllsch Exp $
+# $NetBSD: XEN3_DOM0,v 1.40 2010/11/13 09:48:55 jnemeth Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -316,6 +316,7 @@
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
esh* at pci? dev ? function ? # Essential HIPPI card
+et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit
ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
@@ -362,6 +363,7 @@
brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
ciphy* at mii? phy ? # Cicada CS8201 Gig-E PHYs
dmphy* at mii? phy ? # Davicom DM9101 PHYs
+etphy* at mii? phy ? # Agere/LSI ET1011 TruePHY Gig-E PHYs
exphy* at mii? phy ? # 3Com internal PHYs
gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs
glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
