From 55b88837b6495b32575279194a9dd9d508780aa9 Mon Sep 17 00:00:00 2001 From: mdodd Date: Wed, 27 Oct 1999 06:30:10 +0000 Subject: [PATCH] Modify the entries regarding the 'ep' driver to take into account my recent changes to that driver. --- sys/amd64/conf/GENERIC | 9 +++------ sys/conf/NOTES | 5 ++--- sys/i386/conf/GENERIC | 9 +++------ sys/i386/conf/LINT | 5 ++--- sys/i386/conf/NOTES | 5 ++--- 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 356abb00eef5..729cd97f65f3 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -180,14 +180,11 @@ device wb0 # Winbond W89C840F device xl0 # 3Com 3c90x (``Boomerang'', ``Cyclone'') # ISA Ethernet NICs. -# The probe order of these is presently determined by i386/isa/isa_compat.c. device ed0 at isa? port 0x280 irq 10 iomem 0xd8000 -device ie0 at isa? port 0x300 irq 10 iomem 0xd0000 -# NOTE: if you configure ep0 for pccard, use -# device ep0 -# instead. -device ep0 at isa? port 0x300 irq 10 device ex0 at isa? port? irq? +device ep0 +# The probe order of these is presently determined by i386/isa/isa_compat.c. +device ie0 at isa? port 0x300 irq 10 iomem 0xd0000 device fe0 at isa? port 0x300 irq ? device le0 at isa? port 0x300 irq 5 iomem 0xd0000 device lnc0 at isa? port 0x280 irq 10 drq 0 diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 765ee6f317c9..cb70c010380c 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1233,7 +1233,7 @@ options EXTRA_SIO=2 #number of extra sio ports to allocate # cx: Cronyx/Sigma multiport sync/async (with Cisco or PPP framing) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # el: 3Com 3C501 (slow!) -# ep: 3Com 3C509 (buggy) +# ep: 3Com 3C509 # ex: Intel EtherExpress Pro/10 and other i82595-based adapters # fe: Fujitsu MB86960A/MB86965A Ethernet # ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; Intel EtherExpress @@ -1259,8 +1259,7 @@ device cs0 at isa? port 0x300 irq ? device cx0 at isa? port 0x240 irq 15 drq 7 device ed0 at isa? port 0x280 irq 5 iomem 0xd8000 device el0 at isa? port 0x300 irq 9 -# for pccard support of ep0, omit all after at in following line. -device ep0 at isa? port 0x300 irq 10 +device ep0 device ex0 at isa? port? irq? device fe0 at isa? port 0x300 irq ? device ie0 at isa? port 0x300 irq 5 iomem 0xd0000 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 356abb00eef5..729cd97f65f3 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -180,14 +180,11 @@ device wb0 # Winbond W89C840F device xl0 # 3Com 3c90x (``Boomerang'', ``Cyclone'') # ISA Ethernet NICs. -# The probe order of these is presently determined by i386/isa/isa_compat.c. device ed0 at isa? port 0x280 irq 10 iomem 0xd8000 -device ie0 at isa? port 0x300 irq 10 iomem 0xd0000 -# NOTE: if you configure ep0 for pccard, use -# device ep0 -# instead. -device ep0 at isa? port 0x300 irq 10 device ex0 at isa? port? irq? +device ep0 +# The probe order of these is presently determined by i386/isa/isa_compat.c. +device ie0 at isa? port 0x300 irq 10 iomem 0xd0000 device fe0 at isa? port 0x300 irq ? device le0 at isa? port 0x300 irq 5 iomem 0xd0000 device lnc0 at isa? port 0x280 irq 10 drq 0 diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 765ee6f317c9..cb70c010380c 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -1233,7 +1233,7 @@ options EXTRA_SIO=2 #number of extra sio ports to allocate # cx: Cronyx/Sigma multiport sync/async (with Cisco or PPP framing) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # el: 3Com 3C501 (slow!) -# ep: 3Com 3C509 (buggy) +# ep: 3Com 3C509 # ex: Intel EtherExpress Pro/10 and other i82595-based adapters # fe: Fujitsu MB86960A/MB86965A Ethernet # ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; Intel EtherExpress @@ -1259,8 +1259,7 @@ device cs0 at isa? port 0x300 irq ? device cx0 at isa? port 0x240 irq 15 drq 7 device ed0 at isa? port 0x280 irq 5 iomem 0xd8000 device el0 at isa? port 0x300 irq 9 -# for pccard support of ep0, omit all after at in following line. -device ep0 at isa? port 0x300 irq 10 +device ep0 device ex0 at isa? port? irq? device fe0 at isa? port 0x300 irq ? device ie0 at isa? port 0x300 irq 5 iomem 0xd0000 diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 765ee6f317c9..cb70c010380c 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -1233,7 +1233,7 @@ options EXTRA_SIO=2 #number of extra sio ports to allocate # cx: Cronyx/Sigma multiport sync/async (with Cisco or PPP framing) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # el: 3Com 3C501 (slow!) -# ep: 3Com 3C509 (buggy) +# ep: 3Com 3C509 # ex: Intel EtherExpress Pro/10 and other i82595-based adapters # fe: Fujitsu MB86960A/MB86965A Ethernet # ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; Intel EtherExpress @@ -1259,8 +1259,7 @@ device cs0 at isa? port 0x300 irq ? device cx0 at isa? port 0x240 irq 15 drq 7 device ed0 at isa? port 0x280 irq 5 iomem 0xd8000 device el0 at isa? port 0x300 irq 9 -# for pccard support of ep0, omit all after at in following line. -device ep0 at isa? port 0x300 irq 10 +device ep0 device ex0 at isa? port? irq? device fe0 at isa? port 0x300 irq ? device ie0 at isa? port 0x300 irq 5 iomem 0xd0000