Do a major clean-up of the BUSDMA architecture. A large number of
authorMatthew Dillon <dillon@dragonflybsd.org>
Wed, 25 Oct 2006 20:56:03 +0000 (20:56 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Wed, 25 Oct 2006 20:56:03 +0000 (20:56 +0000)
commit1f7ab7c9fc18f47a2f16dc45b13dee254c603ce7
tree9f4aa8f3642696932fcfd5e23cec33c3361920b8
parent84982e90d9d7f07a55adb378958893783185e0e9
Do a major clean-up of the BUSDMA architecture.  A large number of
essentially machine-independant drivers use the structures and definitions
in machine-dependant directories that are really machine-independant in
nature.

Split <machine/bus_dma.h> into machine-depdendant and machine-independant parts
and make the primary access run through <sys/bus_dma.h>.

Remove <machine/bus.h>, <machine/bus_memio.h> and <machine/bus_pio.h>.  The
optimizations related to bus_memio.h and bus_pio.h made a huge mess,
introduced machine-specific knowledge into essentially machine-independant
drivers, and required specific #include file orderings to do their job.
They may be reintroduced in some other form later on.

Move <machine/resource.h> to <sys/bus_resource.h>.  The contents of the file
is machine-independant or can be made a superset across many platforms.

Make <sys/bus.h> include <sys/bus_dma.h> and <sys/bus_resource.h> and
include <sys/bus.h> where necessary. Remove all #include's of
<machine/resource.h> and <machine/bus.h>.  That is, make the BUSDMA
infrastructure integral to I/O-mapped and memory-mapped accesses to devices
and remove a large chunk of machine-specific dependancies from drivers.
bus_if.h and device_if.h are now required to be present when using <sys/bus.h>.
366 files changed:
sys/bus/eisa/eisaconf.c
sys/bus/firewire/firewire.c
sys/bus/firewire/fwdev.c
sys/bus/firewire/fwdma.c
sys/bus/firewire/fwmem.c
sys/bus/firewire/fwohci.c
sys/bus/firewire/fwohci_pci.c
sys/bus/iicbus/i386/pcf.c
sys/bus/isa/i386/isa.c
sys/bus/isa/i386/isa_compat.c
sys/bus/isa/isa_common.c
sys/bus/isa/isahint.c
sys/bus/isa/pnpeat.c
sys/bus/isa/vga_isa.c
sys/bus/pccard/pccard.c
sys/bus/pccard/pccard_cis.c
sys/bus/pccard/pccard_cis_quirks.c
sys/bus/pccard/pccardvar.h
sys/bus/pccard/slot.h
sys/bus/pci/pci.c
sys/bus/pci/pci_compat.c
sys/bus/pci/pci_isab.c
sys/bus/pci/pci_pcib.c
sys/bus/pci/pcisupport.c
sys/bus/usb/ehci.c
sys/bus/usb/ehci_pci.c
sys/bus/usb/ohci.c
sys/bus/usb/ohci_pci.c
sys/bus/usb/uhci.c
sys/bus/usb/uhci_pci.c
sys/bus/usb/uhub.c
sys/bus/usb/usb.c
sys/bus/usb/usb_mem.c
sys/bus/usb/usb_subr.c
sys/bus/usb/usbdi.c
sys/contrib/dev/ath/dragonfly/ah_osdep.h
sys/contrib/dev/fla/fla.c
sys/contrib/dev/oltr/if_oltr.c
sys/cpu/i386/include/bus_at386.h
sys/cpu/i386/include/bus_dma.h
sys/cpu/i386/misc/in_cksum2.s
sys/dev/acpica5/Osd/OsdDebug.c
sys/dev/acpica5/Osd/OsdHardware.c
sys/dev/acpica5/Osd/OsdInterrupt.c
sys/dev/acpica5/acpi.c
sys/dev/acpica5/acpi_acad.c
sys/dev/acpica5/acpi_cmbat.c
sys/dev/acpica5/acpi_cpu.c
sys/dev/acpica5/acpi_ec.c
sys/dev/acpica5/acpi_package.c
sys/dev/acpica5/acpi_resource.c
sys/dev/acpica5/acpi_timer.c
sys/dev/acpica5/acpivar.h
sys/dev/agp/agp.c
sys/dev/agp/agp_amd.c
sys/dev/agp/agp_i810.c
sys/dev/agp/agp_nvidia.c
sys/dev/crypto/hifn/hifn7751.c
sys/dev/crypto/ubsec/ubsec.c
sys/dev/disk/advansys/adv_eisa.c
sys/dev/disk/advansys/adv_isa.c
sys/dev/disk/advansys/adv_pci.c
sys/dev/disk/advansys/advansys.c
sys/dev/disk/advansys/advlib.c
sys/dev/disk/advansys/adw_pci.c
sys/dev/disk/advansys/adwcam.c
sys/dev/disk/advansys/adwlib.c
sys/dev/disk/aha/aha.c
sys/dev/disk/aha/aha_isa.c
sys/dev/disk/ahb/ahb.c
sys/dev/disk/aic/aic.c
sys/dev/disk/aic/aic_isa.c
sys/dev/disk/aic/aic_pccard.c
sys/dev/disk/aic7xxx/aic79xx_osm.h
sys/dev/disk/aic7xxx/aic7xxx_osm.h
sys/dev/disk/amd/amd.c
sys/dev/disk/ata/ata-all.c
sys/dev/disk/ata/ata-card.c
sys/dev/disk/ata/ata-disk.c
sys/dev/disk/ata/ata-dma.c
sys/dev/disk/ata/ata-isa.c
sys/dev/disk/ata/ata-pci.c
sys/dev/disk/ata/ata-raid.c
sys/dev/disk/ata/atapi-all.c
sys/dev/disk/ata/atapi-cam.c
sys/dev/disk/ata/atapi-cd.c
sys/dev/disk/ata/atapi-fd.c
sys/dev/disk/ata/atapi-tape.c
sys/dev/disk/buslogic/bt.c
sys/dev/disk/buslogic/bt_eisa.c
sys/dev/disk/buslogic/bt_isa.c
sys/dev/disk/buslogic/bt_pci.c
sys/dev/disk/fd/fd.c
sys/dev/disk/fd/fd_pccard.c
sys/dev/disk/isp/isp_freebsd.h
sys/dev/disk/isp/isp_pci.c
sys/dev/disk/mpt/mpt_freebsd.h
sys/dev/disk/mpt/mpt_pci.c
sys/dev/disk/ncr/ncr.c
sys/dev/disk/ncv/ncr53c500.c
sys/dev/disk/ncv/ncr53c500_pccard.c
sys/dev/disk/nsp/nsp.c
sys/dev/disk/nsp/nsp_pccard.c
sys/dev/disk/sbp/sbp.c
sys/dev/disk/stg/tmc18c30.c
sys/dev/disk/stg/tmc18c30_isa.c
sys/dev/disk/stg/tmc18c30_pccard.c
sys/dev/disk/sym/sym_hipd.c
sys/dev/disk/trm/trm.c
sys/dev/drm/drm_os_freebsd.h
sys/dev/misc/atkbd/atkbd_isa.c
sys/dev/misc/atkbdc_layer/atkbdc_isa.c
sys/dev/misc/dcons/dcons/Makefile
sys/dev/misc/dcons/dcons_crom.c
sys/dev/misc/dcons/dcons_os.c
sys/dev/misc/joy/joy.c
sys/dev/misc/kbd/atkbd.c
sys/dev/misc/kbd/atkbdc.c
sys/dev/misc/lpt/lpt.c
sys/dev/misc/mse/mse.c
sys/dev/misc/musycc/musycc.c
sys/dev/misc/orm/orm.c
sys/dev/misc/pcfclock/pcfclock.c
sys/dev/misc/ppc/ppc.c
sys/dev/misc/ppi/ppi.c
sys/dev/misc/pps/pps.c
sys/dev/misc/psm/psm.c
sys/dev/misc/puc/puc.c
sys/dev/misc/spic/spic.c
sys/dev/misc/syscons/scgfbrndr.c
sys/dev/misc/xrpu/xrpu.c
sys/dev/netif/acx/acx100.c
sys/dev/netif/acx/acx111.c
sys/dev/netif/acx/acxcmd.c
sys/dev/netif/acx/if_acx.c
sys/dev/netif/an/if_an.c
sys/dev/netif/an/if_an_isa.c
sys/dev/netif/an/if_an_pccard.c
sys/dev/netif/an/if_an_pci.c
sys/dev/netif/ar/if_ar.c
sys/dev/netif/ar/if_ar_isa.c
sys/dev/netif/ar/if_ar_pci.c
sys/dev/netif/ath/ath/if_ath.c
sys/dev/netif/ath/ath/if_ath_pci.c
sys/dev/netif/ath/rate_amrr/amrr.c
sys/dev/netif/ath/rate_onoe/onoe.c
sys/dev/netif/ath/rate_sample/sample.c
sys/dev/netif/aue/if_aue.c
sys/dev/netif/awi/am79c930.c
sys/dev/netif/awi/awi.c
sys/dev/netif/awi/awi_wep.c
sys/dev/netif/awi/awi_wicfg.c
sys/dev/netif/awi/if_awi_pccard.c
sys/dev/netif/axe/if_axe.c
sys/dev/netif/bfe/if_bfe.c
sys/dev/netif/bge/if_bge.c
sys/dev/netif/cm/if_cm_isa.c
sys/dev/netif/cm/smc90cx6.c
sys/dev/netif/cs/if_cs.c
sys/dev/netif/cs/if_cs_isa.c
sys/dev/netif/cs/if_cs_pccard.c
sys/dev/netif/cue/if_cue.c
sys/dev/netif/dc/if_dc.c
sys/dev/netif/de/if_de.c
sys/dev/netif/ed/if_ed.c
sys/dev/netif/ed/if_ed_isa.c
sys/dev/netif/ed/if_ed_pccard.c
sys/dev/netif/ed/if_ed_pci.c
sys/dev/netif/em/if_em.h
sys/dev/netif/em/if_em_osdep.h
sys/dev/netif/ep/if_ep.c
sys/dev/netif/ep/if_ep_eisa.c
sys/dev/netif/ep/if_ep_isa.c
sys/dev/netif/ep/if_ep_pccard.c
sys/dev/netif/ex/if_ex.c
sys/dev/netif/ex/if_ex_isa.c
sys/dev/netif/ex/if_ex_pccard.c
sys/dev/netif/fe/if_fe.c
sys/dev/netif/fe/if_fe_isa.c
sys/dev/netif/fe/if_fe_pccard.c
sys/dev/netif/fea/if_fea.c
sys/dev/netif/fwe/if_fwe.c
sys/dev/netif/fxp/if_fxp.c
sys/dev/netif/gx/if_gx.c
sys/dev/netif/ipw/if_ipw.c
sys/dev/netif/iwi/if_iwi.c
sys/dev/netif/kue/if_kue.c
sys/dev/netif/lge/if_lge.c
sys/dev/netif/lnc/am7990.c
sys/dev/netif/lnc/am79900.c
sys/dev/netif/lnc/if_lnc_isa.c
sys/dev/netif/lnc/if_lnc_pci.c
sys/dev/netif/lnc/lance.c
sys/dev/netif/mii_layer/brgphy.c
sys/dev/netif/mii_layer/ciphy.c
sys/dev/netif/mii_layer/dcphy.c
sys/dev/netif/mii_layer/pnphy.c
sys/dev/netif/mii_layer/rgephy.c
sys/dev/netif/mii_layer/rlphy.c
sys/dev/netif/mii_layer/tlphy.c
sys/dev/netif/mn/if_mn.c
sys/dev/netif/my/if_my.c
sys/dev/netif/ndis/if_ndis.c
sys/dev/netif/ndis/if_ndis_pccard.c
sys/dev/netif/ndis/if_ndis_pci.c
sys/dev/netif/nfe/if_nfe.c
sys/dev/netif/nge/if_nge.c
sys/dev/netif/nv/if_nv.c
sys/dev/netif/pcn/if_pcn.c
sys/dev/netif/pdq_layer/pdqvar.h
sys/dev/netif/plip/if_plip.c
sys/dev/netif/ral/if_ral_pci.c
sys/dev/netif/ral/rt2560.c
sys/dev/netif/ral/rt2661.c
sys/dev/netif/ray/if_ray.c
sys/dev/netif/re/if_re.c
sys/dev/netif/rl/if_rl.c
sys/dev/netif/rtw/if_rtw_pci.c
sys/dev/netif/rtw/rtw.c
sys/dev/netif/rtw/rtwphy.c
sys/dev/netif/rtw/rtwphyio.c
sys/dev/netif/rtw/smc93cx6.c
sys/dev/netif/rue/if_rue.c
sys/dev/netif/sbni/if_sbni.c
sys/dev/netif/sbni/if_sbni_pci.c
sys/dev/netif/sbsh/if_sbsh.c
sys/dev/netif/sf/if_sf.c
sys/dev/netif/sis/if_sis.c
sys/dev/netif/sk/if_sk.c
sys/dev/netif/sn/if_sn.c
sys/dev/netif/sn/if_sn_isa.c
sys/dev/netif/sn/if_sn_pccard.c
sys/dev/netif/sr/if_sr.c
sys/dev/netif/sr/if_sr_isa.c
sys/dev/netif/sr/if_sr_pci.c
sys/dev/netif/ste/if_ste.c
sys/dev/netif/ti/if_ti.c
sys/dev/netif/tl/if_tl.c
sys/dev/netif/tx/if_tx.c
sys/dev/netif/txp/if_txp.c
sys/dev/netif/vge/if_vge.c
sys/dev/netif/vr/if_vr.c
sys/dev/netif/vx/if_vx.c
sys/dev/netif/vx/if_vx_eisa.c
sys/dev/netif/vx/if_vx_pci.c
sys/dev/netif/wb/if_wb.c
sys/dev/netif/wi/if_wi.c
sys/dev/netif/wi/if_wi_pccard.c
sys/dev/netif/wi/if_wi_pci.c
sys/dev/netif/wl/if_wl.c
sys/dev/netif/xe/if_xe.c
sys/dev/netif/xe/if_xe_pccard.c
sys/dev/netif/xl/if_xl.c
sys/dev/pccard/cardbus/cardbus.c
sys/dev/pccard/cardbus/cardbus_cis.c
sys/dev/pccard/exca/exca.c
sys/dev/pccard/pccbb/pccbb.c
sys/dev/powermng/i386/alpm/alpm.c
sys/dev/powermng/i386/amdpm/amdpm.c
sys/dev/powermng/i386/intpm/intpm.c
sys/dev/powermng/i386/viapm/viapm.c
sys/dev/powermng/ichsmb/ichsmb.c
sys/dev/powermng/ichsmb/ichsmb_pci.c
sys/dev/raid/aac/aac.c
sys/dev/raid/aac/aac_cam.c
sys/dev/raid/aac/aac_debug.c
sys/dev/raid/aac/aac_disk.c
sys/dev/raid/aac/aac_pci.c
sys/dev/raid/amr/amr.c
sys/dev/raid/amr/amr_cam.c
sys/dev/raid/amr/amr_disk.c
sys/dev/raid/amr/amr_pci.c
sys/dev/raid/asr/asr.c
sys/dev/raid/ciss/ciss.c
sys/dev/raid/dpt/dpt_eisa.c
sys/dev/raid/dpt/dpt_pci.c
sys/dev/raid/dpt/dpt_scsi.c
sys/dev/raid/ida/ida.c
sys/dev/raid/ida/ida_disk.c
sys/dev/raid/ida/ida_eisa.c
sys/dev/raid/ida/ida_pci.c
sys/dev/raid/iir/iir.c
sys/dev/raid/iir/iir_ctrl.c
sys/dev/raid/iir/iir_pci.c
sys/dev/raid/ips/ips.h
sys/dev/raid/ips/ips_disk.h
sys/dev/raid/mlx/mlx.c
sys/dev/raid/mlx/mlx_disk.c
sys/dev/raid/mlx/mlx_pci.c
sys/dev/raid/mly/mly.c
sys/dev/raid/mly/mly_cam.c
sys/dev/raid/mly/mly_pci.c
sys/dev/raid/pst/pst-iop.c
sys/dev/raid/pst/pst-pci.c
sys/dev/raid/pst/pst-raid.c
sys/dev/raid/twa/twa_includes.h
sys/dev/raid/twe/twe_compat.h
sys/dev/serial/dgb/dgm.c
sys/dev/serial/digi/digi.c
sys/dev/serial/digi/digi_isa.c
sys/dev/serial/digi/digi_pci.c
sys/dev/serial/rp/rp.c
sys/dev/serial/rp/rp_isa.c
sys/dev/serial/rp/rp_pci.c
sys/dev/serial/si/si.c
sys/dev/serial/si/si_eisa.c
sys/dev/serial/si/si_isa.c
sys/dev/serial/si/si_pci.c
sys/dev/serial/sio/sio.c
sys/dev/serial/sio/sio_pccard.c
sys/dev/sound/isa/gusc.c
sys/dev/sound/pci/csa.c
sys/dev/sound/pcm/sound.h
sys/dev/usbmisc/udbp/udbp.c
sys/dev/video/bktr/bktr_audio.c
sys/dev/video/bktr/bktr_card.c
sys/dev/video/bktr/bktr_core.c
sys/dev/video/bktr/bktr_i2c.c
sys/dev/video/bktr/bktr_os.c
sys/dev/video/bktr/bktr_tuner.c
sys/dev/video/bktr/msp34xx.c
sys/emulation/ndis/kern_ndis.c
sys/emulation/ndis/subr_hal.c
sys/emulation/ndis/subr_ndis.c
sys/emulation/ndis/subr_ntoskrnl.c
sys/kern/bus_if.m
sys/kern/subr_bus.c
sys/kern/subr_rman.c
sys/net/faith/Makefile
sys/net/faith/if_faith.c
sys/net/gif/Makefile
sys/net/gif/if_gif.c
sys/net/gre/Makefile
sys/net/gre/if_gre.c
sys/net/i4b/capi/iavc/iavc_card.c
sys/net/i4b/capi/iavc/iavc_isa.c
sys/net/i4b/capi/iavc/iavc_lli.c
sys/net/i4b/capi/iavc/iavc_pci.c
sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c
sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c
sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c
sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c
sys/net/i4b/layer1/isic/i4b_isic.h
sys/net/i4b/layer1/isic/i4b_usr_sti.c
sys/net/i4b/layer1/itjc/i4b_itjc_pci.c
sys/net/i4b/layer1/iwic/i4b_iwic_pci.c
sys/net/ppp_layer/ppp_tty.c
sys/net/sl/if_sl.c
sys/net/vlan/Makefile
sys/net/vlan/if_vlan.c
sys/platform/pc32/acpica5/acpi_wakeup.c
sys/platform/pc32/i386/busdma_machdep.c
sys/platform/pc32/i386/nexus.c
sys/platform/pc32/include/bus.h [deleted file]
sys/platform/pc32/include/bus_memio.h [deleted file]
sys/platform/pc32/include/bus_pio.h [deleted file]
sys/platform/pc32/isa/npx.c
sys/platform/vkernel/conf/files
sys/platform/vkernel/conf/options
sys/sys/bus.h
sys/sys/bus_dma.h [copied from sys/cpu/i386/include/bus_dma.h with 95% similarity]
sys/sys/bus_resource.h [moved from sys/platform/pc32/include/resource.h with 86% similarity]
sys/sys/firmware.h
sys/sys/rman.h