From: Sascha Wildner Date: Sun, 8 Jun 2014 08:49:27 +0000 (+0200) Subject: Move ed(4), sr(4), and ng_sync_{ar,sr} to being i386 only. X-Git-Tag: v4.1.0~652 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/0055c35bf8e57ea74ebf1308bbf4a690e9004ff6 Move ed(4), sr(4), and ng_sync_{ar,sr} to being i386 only. If someone needs them on x86_64, they will first have to fix the various int <-> pointer conversions which they warn about. --- diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 31a5497ebe..71f8024084 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -2634,6 +2634,8 @@ TO_REMOVE+=/usr/share/man/man8/ilmid.8.gz TO_REMOVE+=/usr/share/man/cat8/scspd.8.gz TO_REMOVE+=/usr/share/man/man8/scspd.8.gz TO_REMOVE+=/boot/kernel/.ko +TO_REMOVE+=/usr/share/man/cat4/ed.4.gz +TO_REMOVE+=/usr/share/man/man4/ed.4.gz .if ${MACHINE_ARCH} == "x86_64" TO_REMOVE+=/usr/sbin/stlstats @@ -2651,6 +2653,10 @@ TO_REMOVE+=/boot/kernel/if_ar.ko TO_REMOVE+=/boot/kernel/glxsb.ko TO_REMOVE+=/boot/kernel/if_sbni.ko TO_REMOVE+=/boot/kernel/pst.ko +TO_REMOVE+=/boot/kernel/if_ed.ko +TO_REMOVE+=/boot/kernel/if_sr.ko +TO_REMOVE+=/boot/kernel/ng_sync_ar.ko +TO_REMOVE+=/boot/kernel/ng_sync_sr.ko .endif # XXX Remove when pfsync(4) has been fixed diff --git a/UPDATING b/UPDATING index 189f2e02bb..d4f1401265 100644 --- a/UPDATING +++ b/UPDATING @@ -8,6 +8,17 @@ # If you discover any problem, please contact the bugs@lists.dragonflybsd.org # mailing list with the details. ++-----------------------------------------------------------------------+ ++ UPGRADING DRAGONFLY FROM 3.8 TO LATER VERSIONS + ++-----------------------------------------------------------------------+ + +OLDER NETWORK DRIVERS MOVED TO I386 ONLY +---------------------------------------- + +The following drivers have been made i386 only: ed(4), sr(4), ng_sync_ar +and ng_sync_sr. ed(4) used to be in X86_64_GENERIC, so it has to be +removed in kernel configs derived from X86_64_GENERIC. + +-----------------------------------------------------------------------+ + UPGRADING DRAGONFLY FROM 3.6 TO LATER VERSIONS + +-----------------------------------------------------------------------+ diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index adfafd1d53..887f43be7c 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -88,7 +88,6 @@ MAN= aac.4 \ dsched_bfq.4 \ dummynet.4 \ ecc.4 \ - ed.4 \ ehci.4 \ em.4 \ est.4 \ @@ -429,7 +428,6 @@ MLINKS+=drm.4 i915kms.4 \ drm.4 tdfx.4 # drm.4 viadrm.4 MLINKS+=dsched.4 dsched_fq.4 -MLINKS+=ed.4 if_ed.4 MLINKS+=em.4 emx.4 \ em.4 if_em.4 \ em.4 if_emx.4 diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile index b6105df368..c401c4c52d 100644 --- a/share/man/man4/man4.i386/Makefile +++ b/share/man/man4/man4.i386/Makefile @@ -4,6 +4,7 @@ MAN= ar.4 \ cs.4 \ cy.4 \ digi.4 \ + ed.4 \ ep.4 \ ex.4 \ fe.4 \ @@ -26,6 +27,7 @@ MAN= ar.4 \ vx.4 MLINKS+=ar.4 if_ar.4 +MLINKS+=ed.4 if_ed.4 MLINKS+=ep.4 if_ep.4 MLINKS+=lnc.4 if_lnc.4 MLINKS+=sbni.4 if_sbni.4 diff --git a/share/man/man4/ed.4 b/share/man/man4/man4.i386/ed.4 similarity index 99% rename from share/man/man4/ed.4 rename to share/man/man4/man4.i386/ed.4 index 6fba79d2e8..9635763e1b 100644 --- a/share/man/man4/ed.4 +++ b/share/man/man4/man4.i386/ed.4 @@ -31,7 +31,7 @@ .\" $FreeBSD: src/share/man/man4/ed.4,v 1.19.2.10 2003/02/17 21:20:39 trhodes Exp $ .\" .Dd October 28, 1995 -.Dt ED 4 +.Dt ED 4 i386 .Os .Sh NAME .Nm ed diff --git a/sys/conf/files b/sys/conf/files index ba4206d1c9..43c9c9dc39 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -360,9 +360,6 @@ dev/misc/dcons/dcons_crom.c optional dcons_crom dev/misc/dcons/dcons_os.c optional dcons dev/raid/dpt/dpt_scsi.c optional dpt dev/raid/dpt/dpt_pci.c optional dpt pci -dev/netif/ed/if_ed.c optional nowerror ed -dev/netif/ed/if_ed_pccard.c optional ed pccard -dev/netif/ed/if_ed_pci.c optional ed pci dev/netif/ep/if_ep.c optional ep dev/netif/ep/if_ep_pccard.c optional ep pccard dev/netif/em/if_em.c optional em @@ -795,8 +792,6 @@ dev/netif/sln/if_sln.c optional sln pci dev/netif/sn/if_sn.c optional sn dev/netif/sn/if_sn_pccard.c optional sn pccard dev/misc/snp/snp.c optional snp -dev/netif/sr/if_sr.c optional sr -dev/netif/sr/if_sr_pci.c optional sr pci dev/disk/stg/tmc18c30.c optional stg dev/disk/stg/tmc18c30_pccard.c optional stg pccard dev/crypto/tpm/tpm.c optional tpm diff --git a/sys/config/GENERIC b/sys/config/GENERIC index 5b3f95e027..51725fce1e 100644 --- a/sys/config/GENERIC +++ b/sys/config/GENERIC @@ -253,6 +253,7 @@ device bce # Broadcom NetXtreme II Gigabit Ethernet device bfe # Broadcom BCM440x 10/100 Ethernet device bnx # Broadcom NetXtreme 5718/57785 Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes +device ed # NE-2000 and WD-80x3 Ethernet device et # Agere ET1310 10/100/1000 Ethernet device fxp # Intel EtherExpress PRO/100B (82557, 82558) device jme # JMicron Gigabit/Fast Ethernet @@ -273,15 +274,12 @@ device bge # Broadcom BCM570x (``Tigon III'') device stge # Sundance/Tamarack TC9021 Gigabit Ethernet device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nfe # NVIDIA nForce MCP 10/100/Gigabit Ethernet +device ex +device xe # Xircom Ethernet # ISA Ethernet NICs. -# 'device ed' requires 'device miibus' -device ed0 at isa? disable port 0x280 irq 10 iomem 0xd8000 -device ex device ep device fe0 at isa? disable port 0x300 -# Xircom Ethernet -device xe # Wireless NIC cards options IEEE80211_DEBUG #enable debugging msgs diff --git a/sys/config/LINT64 b/sys/config/LINT64 index 2a2dc78bee..7aba3d09af 100644 --- a/sys/config/LINT64 +++ b/sys/config/LINT64 @@ -1124,7 +1124,6 @@ device puc # Network interfaces: `ed', `ep', `is', `lnc' # # cs: IBM Etherjet and other Crystal Semi CS89x0-based adapters -# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # ep: 3Com 3C509 # ex: Intel EtherExpress Pro/10 and other i82595-based adapters # lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 & Am79C960) @@ -1137,7 +1136,6 @@ device puc # xe: Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller. # device cs -device ed device ep device ex device lnc diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC index 8af5734044..8b5b4ac2ef 100644 --- a/sys/config/X86_64_GENERIC +++ b/sys/config/X86_64_GENERIC @@ -253,13 +253,8 @@ device bge # Broadcom BCM570x (``Tigon III'') device stge # Sundance/Tamarack TC9021 Gigabit Ethernet device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nfe # NVIDIA nForce MCP 10/100/Gigabit Ethernet - -# ISA Ethernet NICs. -# 'device ed' requires 'device miibus' -device ed0 at isa? disable port 0x280 irq 10 iomem 0xd8000 device ex -# Xircom Ethernet -device xe +device xe # Xircom Ethernet # Wireless NIC cards options IEEE80211_DEBUG #enable debugging msgs diff --git a/sys/dev/netif/Makefile b/sys/dev/netif/Makefile index b6978b0957..3ebf82b4f7 100644 --- a/sys/dev/netif/Makefile +++ b/sys/dev/netif/Makefile @@ -1,12 +1,12 @@ SUBDIR= an age alc ale ath bce bfe bge bwn \ - dc ed em ep et \ + dc em ep et \ fwe fxp ic iwi iwn jme lge lnc \ mii_layer my msk mxge ndis nfe nge oce pcn \ - ral re rl sbsh sf sis sk sln sr ste stge ti tl tx txp \ + ral re rl sbsh sf sis sk sln ste stge ti tl tx txp \ vge vr vx wb wi wpi xe xl ig_hal emx ae igb ix bnx .if ${MACHINE_ARCH} == "i386" -SUBDIR+=ar sbni +SUBDIR+=ar ed sbni sr .endif # XXX need to be updated to the new net80211 stack diff --git a/sys/netgraph/Makefile b/sys/netgraph/Makefile index eaa940bcc2..b9170fdb34 100644 --- a/sys/netgraph/Makefile +++ b/sys/netgraph/Makefile @@ -1,6 +1,5 @@ # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $ # $FreeBSD: src/sys/modules/netgraph/Makefile,v 1.8.2.8 2002/08/20 23:48:15 archie Exp $ -# $DragonFly: src/sys/netgraph/Makefile,v 1.6 2007/10/13 10:45:39 sephe Exp $ SUBDIR= UI \ async \ @@ -25,8 +24,6 @@ SUBDIR= UI \ pptpgre \ rfc1490 \ socket \ - sync_ar \ - sync_sr \ tee \ tty \ vjc @@ -35,4 +32,8 @@ SUBDIR= UI \ SUBDIR+= mppc .endif +.if ${MACHINE_ARCH} == "i386" +SUBDIR+= sync_ar sync_sr +.endif + .include diff --git a/sys/platform/pc32/conf/files b/sys/platform/pc32/conf/files index 8a0f3ea4f8..22faa44e71 100644 --- a/sys/platform/pc32/conf/files +++ b/sys/platform/pc32/conf/files @@ -125,6 +125,9 @@ dev/video/fb/splash.c optional splash dev/video/fb/vga.c optional vga dev/powermng/est/est.c optional cpu_enable_est dev/powermng/longrun/longrun.c optional cpu_enable_longrun +dev/netif/ed/if_ed.c optional ed +dev/netif/ed/if_ed_pccard.c optional ed pccard +dev/netif/ed/if_ed_pci.c optional ed pci dev/netif/fe/if_fe.c optional fe dev/netif/fe/if_fe_pccard.c optional fe pccard dev/netif/ndis/if_ndis.c optional ndis @@ -133,6 +136,8 @@ dev/netif/ndis/if_ndis_pci.c optional ndis cardbus dev/netif/ndis/if_ndis_pci.c optional ndis pci dev/netif/ndis/if_ndis_usb.c optional ndis oldusb dev/netif/ndis/if_ndis_u4b.c optional ndis usb +dev/netif/sr/if_sr.c optional sr +dev/netif/sr/if_sr_pci.c optional sr pci dev/misc/kbd/atkbd.c optional atkbd dev/misc/kbd/atkbdc.c optional atkbdc dev/misc/kbd/kbd.c optional atkbd