Can anything in the list below be removed from CURRENT? legacyfree1# cd dev/ legacyfree1# grep -irsn isa ./ | grep -i include ./acpica/acpi.c:54:#include <isa/isavar.h> ./acpica/acpi.c:55:#include <isa/pnpvar.h> ./acpica/acpi_acad.c:46:#include <isa/isavar.h> ./acpica/acpi_acad.c:47:#include <isa/pnpvar.h> ./acpica/acpi_isab.c:44:#include <isa/isavar.h> ./advansys/adv_eisa.c:51:#include <dev/eisa/eisaconf.h> ./advansys/adv_isa.c:63:#include <isa/isavar.h> ./aha/aha_isa.c:72:#include <isa/isavar.h> ./aha/aha_mca.c:44:#include <isa/isavar.h> ./ahb/ahb.c:52:#include <dev/eisa/eisaconf.h> ./aic/aic_cbus.c:39:#include <isa/isavar.h> ./aic/aic_isa.c:39:#include <isa/isavar.h> ./aic7xxx/ahc_eisa.c:37:#include <dev/eisa/eisaconf.h> ./aic7xxx/ahc_isa.c:44:#include <isa/isavar.h> ./an/if_an_isa.c:69:#include <isa/isavar.h> ./an/if_an_isa.c:70:#include <isa/pnpvar.h> ./ar/if_ar_isa.c:57:#include <isa/isavar.h> ./ar/if_ar_isa.c:58:#include "isa_if.h" ./arcmsr/arcmsr.c:80:#include <isa/rtc.h> ./arl/if_arl_isa.c:57:#include <isa/isavar.h> ./arl/if_arl_isa.c:58:#include <isa/pnpvar.h> ./arl/if_arl_isa.c:59:#include <isa/isa_common.h> ./asr/osd_util.h:80:# include "i386/isa/dpt_osd_defs.h" ./asr/osd_util.h:83:# include "i386/isa/dpt_osd_defs.h" ./asr/sys_info.h:55:# include "i386/isa/dpt_osd_util.h" ./asr/sys_info.h:58:# include "i386/isa/dpt_osd_util.h" ./ata/ata-cbus.c:45:#include <isa/isavar.h> ./ata/ata-isa.c:45:#include <isa/isavar.h> ./atkbdc/atkbd.c:57:#include <isa/isareg.h> ./atkbdc/atkbdc.c:54:#include <isa/isareg.h> ./atkbdc/atkbdc_isa.c:45:#include <isa/isareg.h> ./atkbdc/atkbdc_isa.c:46:#include <isa/isavar.h> ./atkbdc/psm.c:64:#include "opt_isa.h" ./atkbdc/psm.c:87:#include <isa/isavar.h> ./buslogic/bt_eisa.c:46:#include <dev/eisa/eisaconf.h> ./buslogic/bt_isa.c:46:#include <isa/isavar.h> ./buslogic/bt_mca.c:58:#include <isa/isavar.h> ./cs/if_cs_isa.c:46:#include <isa/isavar.h> ./ct/ct_isa.c:59:#include <dev/isa/isareg.h> ./ct/ct_isa.c:60:#include <dev/isa/isavar.h> ./ct/ct_isa.c:61:#include <dev/isa/isadmavar.h> ./ct/ct_isa.c:82:#include <isa/isavar.h> ./ctau/if_ct.c:44:#include <isa/isavar.h> ./cx/if_cx.c:47:#include <isa/isavar.h> ./cy/cy_isa.c:48:#include <isa/isavar.h> ./dpt/dpt_eisa.c:31:#include "opt_eisa.h" ./dpt/dpt_eisa.c:45:#include <dev/eisa/eisaconf.h> ./dpt/dpt_isa.c:41:#include <isa/isavar.h> ./dpt/dpt_scsi.c:53:#include "opt_eisa.h" ./ed/if_ed_cbus.c:47:#include <isa/isavar.h> ./ed/if_ed_isa.c:49:#include <isa/isavar.h> ./eisa/eisaconf.c:36:#include "opt_eisa.h" ./eisa/eisaconf.c:51:#include <dev/eisa/eisaconf.h> ./eisa/eisaconf.h:37:#include "eisa_if.h" ./ep/if_ep_eisa.c:41:#include <dev/eisa/eisaconf.h> ./ep/if_ep_isa.c:49:#include <isa/isavar.h> ./ep/if_ep_isa.c:55:#include <i386/isa/elink.h> ./ex/if_ex.c:70:#include <isa/isavar.h> ./ex/if_ex.c:71:#include <isa/pnpvar.h> ./ex/if_ex_isa.c:48:#include <isa/isavar.h> ./ex/if_ex_isa.c:49:#include <isa/pnpvar.h> ./fb/splash_bmp.c:42:#include <isa/isareg.h> ./fb/vga.c:62:#include <isa/isareg.h> ./fdc/fdc.c:84:#include <isa/isavar.h> ./fdc/fdc.c:85:#include <isa/isareg.h> ./fdc/fdc.c:87:#include <isa/rtc.h> ./fdc/fdc_isa.c:44:#include <isa/isavar.h> ./fdc/fdc_isa.c:45:#include <isa/isareg.h> ./fe/if_fe_cbus.c:50:#include <isa/isavar.h> ./fe/if_fe_isa.c:49:#include <isa/isavar.h> ./hfa/hfa_eisa.c:88:#include <dev/eisa/eisa_busreg.h> ./hfa/hfa_eisa.c:89:#include <dev/eisa/eisa_busvar.h> ./ida/ida_eisa.c:49:#include <dev/eisa/eisaconf.h> ./ie/if_ie.c:144:#include <i386/isa/elink.h> ./ie/if_ie_isa.c:60:#include <isa/isavar.h> ./ie/if_ie_isa.c:61:#include <isa/pnpvar.h> ./ie/if_ie_isa.c:63:#include <i386/isa/elink.h> ./ieee488/ibfoo.c:50:#include <isa/isavar.h> ./ieee488/pcii.c:52:#include <isa/isavar.h> ./ieee488/upd7210.c:51:#include <isa/isavar.h> ./ipmi/ipmi_isa.c:43:#include <isa/isavar.h> ./joy/joy_isa.c:46:#include <isa/isavar.h> ./joy/joy_isa.c:47:#include "isa_if.h" ./le/if_le_cbus.c:57:#include <isa/isavar.h> ./le/if_le_isa.c:96:#include <isa/isavar.h> ./lmc/if_lmc.c:272:# include <i386/isa/dma.h> ./lmc/if_lmc.c:273:# include <i386/isa/isavar.h> ./mcd/mcd.c:63:#include <isa/isavar.h> ./mcd/mcd_isa.c:24:#include <isa/isavar.h> ./mse/mse.c:88:#include <isa/isavar.h> ./mse/mse_cbus.c:88:#include <isa/isavar.h> ./mse/mse_isa.c:88:#include <isa/isavar.h> ./ncv/ncr53c500_pccard.c:58:#include <cam/scsi/scsi_low_pisa.h> ./nsp/nsp_pccard.c:57:#include <cam/scsi/scsi_low_pisa.h> ./pbio/pbio.c:50:#include <isa/isavar.h> ./pccbb/pccbb_isa.c:52:#include <isa/isavar.h> ./pcf/pcf_isa.c:50:#include <isa/isareg.h> ./pcf/pcf_isa.c:51:#include <isa/isavar.h> ./pci/isa_pci.c:44:#include <isa/isavar.h> ./pdq/if_fea.c:49:#include <dev/eisa/eisaconf.h> ./ppc/ppc_acpi.c:30:#include "opt_isa.h" ./ppc/ppc_acpi.c:39:#include <isa/isareg.h> ./ppc/ppc_acpi.c:40:#include <isa/isavar.h> ./ppc/ppc_isa.c:43:#include <isa/isareg.h> ./ppc/ppc_isa.c:45:#include <isa/isavar.h> ./rc/rc.c:57:#include <isa/isavar.h> ./rp/rp_isa.c:57:#include <isa/isavar.h> ./sbni/if_sbni_isa.c:48:#include <isa/isavar.h> ./scd/scd.c:65:#include <isa/isavar.h> ./scd/scd_isa.c:23:#include <isa/isavar.h> ./si/si.c:46:#include "opt_eisa.h" ./si/si_eisa.c:37:#include <dev/eisa/eisaconf.h> ./si/si_isa.c:39:#include <isa/isavar.h> ./sio/sio.c:76:#include <isa/isavar.h> ./sio/sio_isa.c:43:#include <isa/isareg.h> ./sio/sio_isa.c:44:#include <isa/isavar.h> ./sn/if_sn_isa.c:44:#include <isa/isavar.h> ./snc/if_snc_cbus.c:53:#include <isa/isavar.h> ./snc/if_snc_cbus.c:54:#include <sys/malloc.h> ./snc/if_snc_cbus.c:55:#include <isa/isa_common.h> ./sound/isa/ad1816.c:30:#include <dev/sound/isa/ad1816.h> ./sound/isa/ad1816.c:32:#include <isa/isavar.h> ./sound/isa/ess.c:34:#include <dev/sound/isa/sb.h> ./sound/isa/ess.c:37:#include <isa/isavar.h> ./sound/isa/gusc.c:42:#include <isa/isavar.h> ./sound/isa/gusc.c:43:#include <isa/isa_common.h> ./sound/isa/mss.c:35:#include <dev/sound/isa/mss.h> ./sound/isa/mss.c:36:#include <dev/sound/isa/sb.h> ./sound/isa/mss.c:39:#include <isa/isavar.h> ./sound/isa/sb16.c:34:#include <dev/sound/isa/sb.h> ./sound/isa/sb16.c:37:#include <isa/isavar.h> ./sound/isa/sb8.c:34:#include <dev/sound/isa/sb.h> ./sound/isa/sb8.c:37:#include <isa/isavar.h> ./sound/isa/sbc.c:29:#include <dev/sound/isa/sb.h> ./sound/isa/sbc.c:31:#include <isa/isavar.h> ./sound/isa/sndbuf_dma.c:29:#include <isa/isavar.h> ./sound/pci/als4000.c:37:#include <dev/sound/isa/sb.h> ./sound/pci/cmi.c:45:#include <dev/sound/isa/sb.h> ./sound/pci/solo.c:31:#include <dev/sound/isa/sb.h> ./sound/pcm/channel.c:28:#include "opt_isa.h" ./speaker/spkr.c:21:#include <isa/isavar.h> ./sr/if_sr_isa.c:48:#include <isa/isavar.h> ./sr/if_sr_isa.c:49:#include "isa_if.h" ./stg/tmc18c30_isa.c:57:#include <cam/scsi/scsi_low_pisa.h> ./stg/tmc18c30_pccard.c:59:#include <cam/scsi/scsi_low_pisa.h> ./stg/tmc18c30_pci.c:59:#include <cam/scsi/scsi_low_pisa.h> ./stg/tmc18c30_subr.c:55:#include <cam/scsi/scsi_low_pisa.h> ./syscons/scvgarndr.c:50:#include <isa/isareg.h> ./uart/uart_bus_acpi.c:38:#include <isa/isavar.h> ./uart/uart_bus_isa.c:38:#include <isa/isavar.h> ./vx/if_vx_eisa.c:49:#include <dev/eisa/eisaconf.h> ./wds/wd7000.c:158:#include <isa/isavar.h> ./wds/wd7000.c:159:#include <isa/pnpvar.h> ./wl/if_wl.c:224:#include <isa/isavar.h> legacyfree1# grep -irsn mca ./ | grep -i include ./aha/aha_mca.c:46:#include <dev/mca/mca_busreg.h> ./aha/aha_mca.c:47:#include <dev/mca/mca_busvar.h> ./buslogic/bt_mca.c:55:#include <dev/mca/mca_busreg.h> ./buslogic/bt_mca.c:56:#include <dev/mca/mca_busvar.h> ./ep/if_ep_mca.c:44:#include <dev/mca/mca_busreg.h> ./ep/if_ep_mca.c:45:#include <dev/mca/mca_busvar.h> ./mca/mca_bus.c:51:#include <dev/mca/mca_busreg.h> ./mca/mca_bus.c:52:#include <dev/mca/mca_busvar.h> legacyfree1# uname -a FreeBSD legacyfree1.local 7.0-CURRENT-200703 FreeBSD 7.0-CURRENT-200703 #1: Wed Mar 7 17:17:11 UTC 2007 nbritton@legacyfree1.local:/usr/src/sys/i386/compile/GENERIC i386
"Nikolas Britton" <nikolas.britton@gmail.com> writes:> Can anything in the list below be removed from CURRENT?No. Modern i386 and amd64 still have an ISA bus, and devices connected to that bus, even if they don't have ISA slots. DES -- Dag-Erling Sm?rgrav - des@des.no