From 1f2de5d41c9be614e9a1cba7cf16de309a2ea210 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 7 Aug 2003 21:19:26 +0000 Subject: [PATCH] kernel tree reorganization stage 1: Major cvs repository work (not logged as commits) plus a major reworking of the #include's to accomodate the relocations. * CVS repository files manually moved. Old directories left intact and empty (temporary). * Reorganize all filesystems into vfs/, most devices into dev/, sub-divide devices by function. * Begin to move device-specific architecture files to the device subdirs rather then throwing them all into, e.g. i386/include * Reorganize files related to system busses, placing the related code in a new bus/ directory. Also move cam to bus/cam though this may not have been the best idea in retrospect. * Reorganize emulation code and place it in a new emulation/ directory. * Remove the -I- compiler option in order to allow #include file localization, rename all config generated X.h files to use_X.h to clean up the conflicts. * Remove /usr/src/include (or /usr/include) dependancies during the kernel build, beyond what is normally needed to compile helper programs. * Make config create 'machine' softlinks for architecture specific directories outside of the standard /include. * Bump the config rev. WARNING! after this commit /usr/include and /usr/src/sys/compile/* should be regenerated from scratch. --- include/paths.h | 21 +- sbin/vinum/vinumparser.c | 10 +- sbin/vinum/vinumutil.c | 6 +- sys/Makefile | 12 +- sys/boot/alpha/boot1/sys.c | 8 +- sys/boot/common/ls.c | 6 +- sys/boot/i386/boot2/boot2.c | 6 +- sys/boot/pc32/boot2/boot2.c | 6 +- sys/boot/pc98/boot2/boot.h | 8 +- sys/boot/pc98/boot2/serial_16550.S | 4 +- sys/boot/pc98/boot2/serial_8251.S | 4 +- sys/bus/cam/cam.c | 4 +- sys/bus/cam/cam_ccb.h | 6 +- sys/bus/cam/cam_extend.c | 4 +- sys/bus/cam/cam_periph.c | 20 +- sys/bus/cam/cam_queue.c | 10 +- sys/bus/cam/cam_sim.c | 10 +- sys/bus/cam/cam_xpt.c | 26 +- sys/bus/cam/cam_xpt_periph.h | 4 +- sys/bus/cam/cam_xpt_sim.h | 6 +- sys/bus/cam/scsi/scsi_all.c | 14 +- sys/bus/cam/scsi/scsi_cd.c | 20 +- sys/bus/cam/scsi/scsi_ch.c | 24 +- sys/bus/cam/scsi/scsi_da.c | 16 +- sys/bus/cam/scsi/scsi_low.c | 18 +- sys/bus/cam/scsi/scsi_low.h | 14 +- sys/bus/cam/scsi/scsi_low_pisa.c | 6 +- sys/bus/cam/scsi/scsi_pass.c | 24 +- sys/bus/cam/scsi/scsi_pass.h | 4 +- sys/bus/cam/scsi/scsi_pt.c | 20 +- sys/bus/cam/scsi/scsi_sa.c | 20 +- sys/bus/cam/scsi/scsi_ses.c | 22 +- sys/bus/cam/scsi/scsi_targ_bh.c | 20 +- sys/bus/cam/scsi/scsi_target.c | 12 +- sys/bus/cam/scsi/scsi_targetio.h | 6 +- sys/bus/canbus/canbus.c | 6 +- sys/bus/eisa/eisaconf.c | 4 +- sys/bus/firewire/firewire.c | 12 +- sys/bus/firewire/fwcrom.c | 6 +- sys/bus/firewire/fwdev.c | 12 +- sys/bus/firewire/fwdma.c | 8 +- sys/bus/firewire/fwmem.c | 8 +- sys/bus/firewire/fwohci.c | 20 +- sys/bus/firewire/fwohci_pci.c | 16 +- sys/bus/iicbus/i386/pcf.c | 10 +- sys/bus/iicbus/iic.c | 6 +- sys/bus/iicbus/iicbb.c | 8 +- sys/bus/iicbus/iicbus.c | 6 +- sys/bus/iicbus/iiconf.c | 6 +- sys/bus/iicbus/iicsmb.c | 8 +- sys/bus/isa/i386/isa.c | 6 +- sys/bus/isa/i386/isa_compat.c | 8 +- sys/bus/isa/i386/isa_compat.h | 81 +- sys/bus/isa/i386/isa_device.h | 4 +- sys/bus/isa/i386/isa_dma.c | 6 +- sys/bus/isa/isa_common.c | 8 +- sys/bus/isa/isa_if.m | 4 +- sys/bus/isa/isahint.c | 4 +- sys/bus/isa/isavar.h | 4 +- sys/bus/isa/pnp.c | 8 +- sys/bus/isa/pnpparse.c | 8 +- sys/bus/isa/syscons_isa.c | 8 +- sys/bus/isa/vga_isa.c | 10 +- sys/bus/mca/i386/mca_machdep.c | 6 +- sys/bus/mca/mca_bus.c | 6 +- sys/bus/pccard/mecia.c | 12 +- sys/bus/pccard/pccard.c | 10 +- sys/bus/pccard/pccard_beep.c | 4 +- sys/bus/pccard/pccard_nbk.c | 10 +- sys/bus/pccard/pcic.c | 19 +- sys/bus/pccard/pcic_isa.c | 17 +- sys/bus/pccard/pcic_pci.c | 23 +- sys/bus/pccard/pcic_pci.h | 4 +- sys/bus/pci/i386/pci_cfgreg.c | 10 +- sys/bus/pci/i386/pcibus.c | 8 +- sys/bus/pci/ide_pci.c | 14 +- sys/bus/pci/ohci_pci.c | 18 +- sys/bus/pci/pci.c | 6 +- sys/bus/pci/pci_compat.c | 6 +- sys/bus/pci/pcisupport.c | 6 +- sys/bus/pci/uhci_pci.c | 18 +- sys/bus/ppbus/ppb_1284.c | 8 +- sys/bus/ppbus/ppb_base.c | 6 +- sys/bus/ppbus/ppb_msq.c | 6 +- sys/bus/ppbus/ppbconf.c | 6 +- sys/bus/ppbus/ppbus_if.m | 4 +- sys/bus/smbus/smb.c | 6 +- sys/bus/smbus/smbconf.c | 6 +- sys/bus/smbus/smbus.c | 6 +- sys/bus/usb/hid.c | 8 +- sys/bus/usb/ohci.c | 16 +- sys/bus/usb/uhci.c | 16 +- sys/bus/usb/uhub.c | 10 +- sys/bus/usb/usb.c | 12 +- sys/bus/usb/usb.h | 6 +- sys/bus/usb/usb_ethersubr.c | 6 +- sys/bus/usb/usb_quirks.c | 8 +- sys/bus/usb/usb_subr.c | 16 +- sys/bus/usb/usbdi.c | 12 +- sys/bus/usb/usbdi_util.c | 10 +- sys/conf/Makefile.i386 | 8 +- sys/conf/files | 2017 ++++++++--------- sys/conf/files.i386 | 689 +++--- sys/conf/kmod.mk | 14 +- sys/config/LINT | 4 +- sys/contrib/dev/fla/fla.c | 7 +- sys/contrib/dev/oltr/if_oltr.c | 6 +- sys/contrib/ipfilter/netinet/fil.c | 18 +- sys/contrib/ipfilter/netinet/ip_auth.c | 8 +- sys/contrib/ipfilter/netinet/ip_fil.c | 16 +- sys/contrib/ipfilter/netinet/ip_frag.c | 14 +- sys/contrib/ipfilter/netinet/ip_log.c | 6 +- sys/contrib/ipfilter/netinet/ip_nat.c | 14 +- sys/contrib/ipfilter/netinet/ip_proxy.c | 24 +- sys/contrib/ipfilter/netinet/ip_state.c | 12 +- sys/contrib/ipfilter/netinet/mlfk_ipl.c | 18 +- sys/cpu/i386/include/bus_at386.h | 4 +- sys/cpu/i386/include/cpu.h | 8 +- sys/cpu/i386/include/cpufunc.h | 4 +- sys/cpu/i386/include/db_machdep.h | 10 +- sys/cpu/i386/include/floatingpoint.h | 4 +- sys/cpu/i386/include/signal.h | 4 +- sys/cpu/i386/misc/i386-gdbstub.c | 8 +- sys/dev/agp/agp.c | 12 +- sys/dev/agp/agp_ali.c | 10 +- sys/dev/agp/agp_amd.c | 10 +- sys/dev/agp/agp_i810.c | 10 +- sys/dev/agp/agp_intel.c | 10 +- sys/dev/agp/agp_sis.c | 10 +- sys/dev/agp/agp_via.c | 10 +- sys/dev/agp/agppriv.h | 4 +- sys/dev/atm/en/midway.c | 10 +- sys/dev/atm/hea/eni.c | 8 +- sys/dev/atm/hea/eni.h | 6 +- sys/dev/atm/hea/eni_buffer.c | 8 +- sys/dev/atm/hea/eni_globals.c | 6 +- sys/dev/atm/hea/eni_if.c | 10 +- sys/dev/atm/hea/eni_init.c | 8 +- sys/dev/atm/hea/eni_intr.c | 10 +- sys/dev/atm/hea/eni_receive.c | 8 +- sys/dev/atm/hea/eni_transmit.c | 8 +- sys/dev/atm/hea/eni_vcm.c | 8 +- sys/dev/atm/hfa/fore_buffer.c | 4 +- sys/dev/atm/hfa/fore_command.c | 4 +- sys/dev/atm/hfa/fore_globals.c | 4 +- sys/dev/atm/hfa/fore_if.c | 4 +- sys/dev/atm/hfa/fore_include.h | 16 +- sys/dev/atm/hfa/fore_init.c | 4 +- sys/dev/atm/hfa/fore_intr.c | 4 +- sys/dev/atm/hfa/fore_load.c | 4 +- sys/dev/atm/hfa/fore_output.c | 4 +- sys/dev/atm/hfa/fore_receive.c | 4 +- sys/dev/atm/hfa/fore_stats.c | 4 +- sys/dev/atm/hfa/fore_timer.c | 4 +- sys/dev/atm/hfa/fore_transmit.c | 4 +- sys/dev/atm/hfa/fore_vcm.c | 4 +- sys/dev/crypto/hifn/hifn7751.c | 12 +- sys/dev/crypto/rndtest/rndtest.c | 4 +- sys/dev/crypto/ubsec/ubsec.c | 12 +- sys/dev/disk/advansys/adv_eisa.c | 6 +- sys/dev/disk/advansys/adv_isa.c | 8 +- sys/dev/disk/advansys/adv_pci.c | 8 +- sys/dev/disk/advansys/advansys.c | 20 +- sys/dev/disk/advansys/advansys.h | 4 +- sys/dev/disk/advansys/advlib.c | 22 +- sys/dev/disk/advansys/adw_pci.c | 16 +- sys/dev/disk/advansys/adwcam.c | 16 +- sys/dev/disk/advansys/adwlib.c | 14 +- sys/dev/disk/advansys/adwlib.h | 7 +- sys/dev/disk/advansys/adwmcode.c | 4 +- sys/dev/disk/advansys/adwvar.h | 4 +- sys/dev/disk/adw_pci.c | 10 +- sys/dev/disk/aha/aha.c | 16 +- sys/dev/disk/aha/aha_isa.c | 8 +- sys/dev/disk/aha/aha_mca.c | 11 +- sys/dev/disk/aha/ahareg.h | 6 +- sys/dev/disk/ahb/ahb.c | 18 +- sys/dev/disk/aic/aic.c | 18 +- sys/dev/disk/aic/aic_cbus.c | 8 +- sys/dev/disk/aic/aic_isa.c | 8 +- sys/dev/disk/aic/aic_pccard.c | 6 +- sys/dev/disk/aic7xxx/ahc_eisa.c | 6 +- sys/dev/disk/aic7xxx/ahc_pci.c | 4 +- sys/dev/disk/aic7xxx/ahd_pci.c | 4 +- sys/dev/disk/aic7xxx/aic7770.c | 8 +- sys/dev/disk/aic7xxx/aic79xx.c | 8 +- sys/dev/disk/aic7xxx/aic79xx_osm.c | 6 +- sys/dev/disk/aic7xxx/aic79xx_osm.h | 24 +- sys/dev/disk/aic7xxx/aic79xx_pci.c | 6 +- sys/dev/disk/aic7xxx/aic7xxx.c | 8 +- sys/dev/disk/aic7xxx/aic7xxx_93cx6.c | 8 +- sys/dev/disk/aic7xxx/aic7xxx_osm.c | 6 +- sys/dev/disk/aic7xxx/aic7xxx_osm.h | 24 +- sys/dev/disk/aic7xxx/aic7xxx_pci.c | 8 +- sys/dev/disk/amd/amd.c | 22 +- sys/dev/disk/ata/ata-all.c | 22 +- sys/dev/disk/ata/ata-card.c | 4 +- sys/dev/disk/ata/ata-disk.c | 8 +- sys/dev/disk/ata/ata-dma.c | 6 +- sys/dev/disk/ata/ata-isa.c | 8 +- sys/dev/disk/ata/ata-pci.c | 8 +- sys/dev/disk/ata/ata-raid.c | 8 +- sys/dev/disk/ata/atapi-all.c | 15 +- sys/dev/disk/ata/atapi-cam.c | 20 +- sys/dev/disk/ata/atapi-cd.c | 8 +- sys/dev/disk/ata/atapi-fd.c | 8 +- sys/dev/disk/ata/atapi-tape.c | 8 +- sys/dev/disk/buslogic/bt.c | 18 +- sys/dev/disk/buslogic/bt_eisa.c | 6 +- sys/dev/disk/buslogic/bt_isa.c | 8 +- sys/dev/disk/buslogic/bt_mca.c | 12 +- sys/dev/disk/buslogic/bt_pci.c | 8 +- sys/dev/disk/ccd/ccd.c | 4 +- sys/dev/disk/ct/bshw_machdep.c | 10 +- sys/dev/disk/ct/ct.c | 8 +- sys/dev/disk/ct/ct_isa.c | 16 +- sys/dev/disk/fd/fd.c | 14 +- sys/dev/disk/fd/fdreg.h | 4 +- sys/dev/disk/i386/bs/bs.c | 18 +- sys/dev/disk/i386/bs/bsfunc.c | 4 +- sys/dev/disk/i386/bs/bshw.c | 10 +- sys/dev/disk/i386/bs/bsif.c | 18 +- sys/dev/disk/i386/bs/bsif.h | 18 +- sys/dev/disk/isp/isp.c | 4 +- sys/dev/disk/isp/isp_freebsd.c | 6 +- sys/dev/disk/isp/isp_freebsd.h | 28 +- sys/dev/disk/isp/isp_pci.c | 8 +- sys/dev/disk/isp/isp_target.c | 4 +- sys/dev/disk/isp/ispvar.h | 8 +- sys/dev/disk/ispfw/ispfw.c | 14 +- sys/dev/disk/mcd/mcd.c | 9 +- sys/dev/disk/mpt/mpt.c | 4 +- sys/dev/disk/mpt/mpt.h | 4 +- sys/dev/disk/mpt/mpt_debug.c | 4 +- sys/dev/disk/mpt/mpt_freebsd.c | 4 +- sys/dev/disk/mpt/mpt_freebsd.h | 38 +- sys/dev/disk/mpt/mpt_pci.c | 8 +- sys/dev/disk/ncr/ncr.c | 22 +- sys/dev/disk/ncv/ncr53c500.c | 12 +- sys/dev/disk/ncv/ncr53c500_pccard.c | 16 +- sys/dev/disk/nsp/nsp.c | 8 +- sys/dev/disk/nsp/nsp_pccard.c | 14 +- sys/dev/disk/sbp/sbp.c | 28 +- sys/dev/disk/scd/scd.c | 8 +- sys/dev/disk/simos/simos.c | 22 +- sys/dev/disk/stg/tmc18c30.c | 8 +- sys/dev/disk/stg/tmc18c30_isa.c | 14 +- sys/dev/disk/stg/tmc18c30_pccard.c | 14 +- sys/dev/disk/sym/sym_hipd.c | 34 +- sys/dev/disk/trm/trm.c | 20 +- sys/dev/disk/vpo/immio.c | 12 +- sys/dev/disk/vpo/vpo.c | 24 +- sys/dev/disk/vpo/vpoio.c | 10 +- sys/dev/disk/wcd/wd_cd.c | 4 +- sys/dev/disk/wd/wd.c | 12 +- sys/dev/disk/wfd/wfd.c | 4 +- sys/dev/disk/wst/wst.c | 4 +- sys/dev/disk/wt/wt.c | 8 +- sys/dev/drm/drm_os_freebsd.h | 6 +- sys/dev/drm/mga/mga_dma.c | 8 +- sys/dev/drm/mga/mga_drv.c | 8 +- sys/dev/drm/mga/mga_irq.c | 8 +- sys/dev/drm/mga/mga_state.c | 8 +- sys/dev/drm/mga/mga_warp.c | 10 +- sys/dev/drm/r128/r128_cce.c | 8 +- sys/dev/drm/r128/r128_drv.c | 8 +- sys/dev/drm/r128/r128_irq.c | 8 +- sys/dev/drm/r128/r128_state.c | 8 +- sys/dev/drm/radeon/radeon_cp.c | 8 +- sys/dev/drm/radeon/radeon_drv.c | 8 +- sys/dev/drm/radeon/radeon_irq.c | 8 +- sys/dev/drm/radeon/radeon_mem.c | 8 +- sys/dev/drm/radeon/radeon_state.c | 8 +- sys/dev/drm/tdfx/tdfx_drv.c | 4 +- sys/dev/misc/atkbd/atkbd_isa.c | 12 +- sys/dev/misc/atkbdc_layer/atkbdc_isa.c | 8 +- sys/dev/misc/dec/mcclock.c | 6 +- sys/dev/misc/gpib/gpib.c | 8 +- sys/dev/misc/joy/joy.c | 4 +- sys/dev/misc/kbd/atkbd.c | 12 +- sys/dev/misc/kbd/atkbdc.c | 8 +- sys/dev/misc/kbd/kbd.c | 4 +- sys/dev/misc/labpc/labpc.c | 6 +- sys/dev/misc/lpbb/lpbb.c | 10 +- sys/dev/misc/lpt/lpt.c | 12 +- sys/dev/misc/mse/mse.c | 4 +- sys/dev/misc/musycc/musycc.c | 6 +- sys/dev/misc/orm/orm.c | 6 +- sys/dev/misc/pcfclock/pcfclock.c | 8 +- sys/dev/misc/pcic/i82365.c | 6 +- sys/dev/misc/pcic/i82365_isa.c | 12 +- sys/dev/misc/pcic/i82365var.h | 4 +- sys/dev/misc/ppc/ppc.c | 12 +- sys/dev/misc/ppi/ppi.c | 12 +- sys/dev/misc/pps/pps.c | 9 +- sys/dev/misc/psm/psm.c | 6 +- sys/dev/misc/puc/puc.c | 8 +- sys/dev/misc/puc/pucdata.c | 10 +- sys/dev/misc/spic/spic.c | 6 +- sys/dev/misc/spigot/spigot.c | 6 +- sys/dev/misc/streams/streams.c | 14 +- sys/dev/misc/syscons/scgfbrndr.c | 4 +- sys/dev/misc/syscons/schistory.c | 6 +- sys/dev/misc/syscons/scmouse.c | 7 +- sys/dev/misc/syscons/scterm-dumb.c | 6 +- sys/dev/misc/syscons/scterm-sc.c | 6 +- sys/dev/misc/syscons/scterm.c | 6 +- sys/dev/misc/syscons/scvesactl.c | 4 +- sys/dev/misc/syscons/scvgarndr.c | 10 +- sys/dev/misc/syscons/scvidctl.c | 6 +- sys/dev/misc/syscons/scvtb.c | 6 +- sys/dev/misc/syscons/syscons.c | 14 +- sys/dev/misc/syscons/sysmouse.c | 4 +- sys/dev/misc/tw/tw.c | 6 +- sys/dev/misc/xrpu/xrpu.c | 6 +- sys/dev/netif/an/if_an.c | 6 +- sys/dev/netif/an/if_an_isa.c | 10 +- sys/dev/netif/an/if_an_pccard.c | 6 +- sys/dev/netif/an/if_an_pci.c | 10 +- sys/dev/netif/ar/if_ar.c | 8 +- sys/dev/netif/ar/if_ar_isa.c | 8 +- sys/dev/netif/ar/if_ar_pci.c | 10 +- sys/dev/netif/aue/if_aue.c | 20 +- sys/dev/netif/awi/am79c930.c | 6 +- sys/dev/netif/awi/awi.c | 12 +- sys/dev/netif/awi/awi_wep.c | 10 +- sys/dev/netif/awi/awi_wicfg.c | 12 +- sys/dev/netif/awi/if_awi_pccard.c | 10 +- sys/dev/netif/bge/if_bge.c | 18 +- sys/dev/netif/cm/if_cm_isa.c | 4 +- sys/dev/netif/cm/smc90cx6.c | 6 +- sys/dev/netif/cs/if_cs.c | 6 +- sys/dev/netif/cs/if_cs_isa.c | 6 +- sys/dev/netif/cs/if_cs_pccard.c | 6 +- sys/dev/netif/cue/if_cue.c | 16 +- sys/dev/netif/cx/cx.c | 6 +- sys/dev/netif/cx/if_cx.c | 10 +- sys/dev/netif/dc/if_dc.c | 14 +- sys/dev/netif/de/if_de.c | 10 +- sys/dev/netif/ed/if_ed.c | 12 +- sys/dev/netif/ed/if_ed_cbus.c | 12 +- sys/dev/netif/ed/if_ed_isa.c | 8 +- sys/dev/netif/ed/if_ed_pccard.c | 16 +- sys/dev/netif/ed/if_ed_pci.c | 8 +- sys/dev/netif/el/if_el.c | 8 +- sys/dev/netif/elink_layer/elink.c | 4 +- sys/dev/netif/em/if_em.c | 4 +- sys/dev/netif/em/if_em.h | 10 +- sys/dev/netif/em/if_em_hw.c | 4 +- sys/dev/netif/em/if_em_hw.h | 4 +- sys/dev/netif/em/if_em_osdep.h | 6 +- sys/dev/netif/en_pci/if_en_pci.c | 12 +- sys/dev/netif/ep/if_ep.c | 8 +- sys/dev/netif/ep/if_ep_eisa.c | 8 +- sys/dev/netif/ep/if_ep_isa.c | 12 +- sys/dev/netif/ep/if_ep_mca.c | 10 +- sys/dev/netif/ep/if_ep_pccard.c | 6 +- sys/dev/netif/ex/if_ex.c | 10 +- sys/dev/netif/ex/if_ex_isa.c | 10 +- sys/dev/netif/ex/if_ex_pccard.c | 8 +- sys/dev/netif/fe/if_fe.c | 6 +- sys/dev/netif/fe/if_fe_cbus.c | 8 +- sys/dev/netif/fe/if_fe_isa.c | 8 +- sys/dev/netif/fe/if_fe_pccard.c | 10 +- sys/dev/netif/fea/if_fea.c | 8 +- sys/dev/netif/fpa/if_fpa.c | 10 +- sys/dev/netif/fwe/if_fwe.c | 10 +- sys/dev/netif/fxp/if_fxp.c | 18 +- sys/dev/netif/gx/if_gx.c | 16 +- sys/dev/netif/ic/if_ic.c | 6 +- sys/dev/netif/ie/if_ie.c | 14 +- sys/dev/netif/kue/if_kue.c | 18 +- sys/dev/netif/le/if_le.c | 6 +- sys/dev/netif/lge/if_lge.c | 12 +- sys/dev/netif/lnc/if_lnc.c | 10 +- sys/dev/netif/lnc_p/if_lnc_p.c | 10 +- sys/dev/netif/mii_layer/acphy.c | 10 +- sys/dev/netif/mii_layer/amphy.c | 10 +- sys/dev/netif/mii_layer/brgphy.c | 10 +- sys/dev/netif/mii_layer/dcphy.c | 13 +- sys/dev/netif/mii_layer/e1000phy.c | 10 +- sys/dev/netif/mii_layer/exphy.c | 8 +- sys/dev/netif/mii_layer/inphy.c | 10 +- sys/dev/netif/mii_layer/lxtphy.c | 10 +- sys/dev/netif/mii_layer/mii.c | 6 +- sys/dev/netif/mii_layer/mii_physubr.c | 6 +- sys/dev/netif/mii_layer/mlphy.c | 6 +- sys/dev/netif/mii_layer/nsgphy.c | 10 +- sys/dev/netif/mii_layer/nsphy.c | 10 +- sys/dev/netif/mii_layer/pnaphy.c | 8 +- sys/dev/netif/mii_layer/pnphy.c | 10 +- sys/dev/netif/mii_layer/qsphy.c | 10 +- sys/dev/netif/mii_layer/rlphy.c | 10 +- sys/dev/netif/mii_layer/tlphy.c | 10 +- sys/dev/netif/mii_layer/ukphy.c | 6 +- sys/dev/netif/mii_layer/ukphy_subr.c | 6 +- sys/dev/netif/mii_layer/xmphy.c | 10 +- sys/dev/netif/mn/if_mn.c | 6 +- sys/dev/netif/my/if_my.c | 12 +- sys/dev/netif/nge/if_nge.c | 14 +- sys/dev/netif/pcn/if_pcn.c | 12 +- sys/dev/netif/pdq_layer/pdq.c | 6 +- sys/dev/netif/pdq_layer/pdq_ifsubr.c | 6 +- sys/dev/netif/plip/if_plip.c | 6 +- sys/dev/netif/ray/if_ray.c | 12 +- sys/dev/netif/rdp/if_rdp.c | 8 +- sys/dev/netif/rl/if_rl.c | 12 +- sys/dev/netif/sbni/if_sbni.c | 6 +- sys/dev/netif/sbni/if_sbni_isa.c | 8 +- sys/dev/netif/sbni/if_sbni_pci.c | 10 +- sys/dev/netif/sbsh/if_sbsh.c | 8 +- sys/dev/netif/sf/if_sf.c | 12 +- sys/dev/netif/sis/if_sis.c | 14 +- sys/dev/netif/sk/if_sk.c | 16 +- sys/dev/netif/sn/if_sn.c | 6 +- sys/dev/netif/sn/if_sn_isa.c | 6 +- sys/dev/netif/sn/if_sn_pccard.c | 8 +- sys/dev/netif/snc/dp83932.c | 6 +- sys/dev/netif/snc/dp83932subr.c | 10 +- sys/dev/netif/snc/if_snc.c | 12 +- sys/dev/netif/snc/if_snc_cbus.c | 16 +- sys/dev/netif/snc/if_snc_pccard.c | 10 +- sys/dev/netif/sr/if_sr.c | 8 +- sys/dev/netif/sr/if_sr_isa.c | 8 +- sys/dev/netif/sr/if_sr_pci.c | 8 +- sys/dev/netif/ste/if_ste.c | 14 +- sys/dev/netif/ti/if_ti.c | 14 +- sys/dev/netif/tl/if_tl.c | 12 +- sys/dev/netif/tx/if_tx.c | 21 +- sys/dev/netif/txp/if_txp.c | 16 +- sys/dev/netif/vr/if_vr.c | 12 +- sys/dev/netif/vx/if_vx.c | 6 +- sys/dev/netif/vx/if_vx_eisa.c | 6 +- sys/dev/netif/vx/if_vx_pci.c | 8 +- sys/dev/netif/wb/if_wb.c | 12 +- sys/dev/netif/wi/if_wi.c | 10 +- sys/dev/netif/wi/if_wi_pccard.c | 14 +- sys/dev/netif/wi/if_wi_pci.c | 14 +- sys/dev/netif/wi/wi_hostap.c | 10 +- sys/dev/netif/wl/if_wl.c | 11 +- sys/dev/netif/wx/if_wx.c | 4 +- sys/dev/netif/wx/if_wxvar.h | 12 +- sys/dev/netif/xe/if_xe.c | 8 +- sys/dev/netif/xl/if_xl.c | 12 +- sys/dev/powermng/i386/alpm/alpm.c | 12 +- sys/dev/powermng/i386/amdpm/amdpm.c | 10 +- sys/dev/powermng/i386/intpm/intpm.c | 10 +- sys/dev/powermng/i386/viapm/viapm.c | 14 +- sys/dev/powermng/ichsmb/ichsmb.c | 8 +- sys/dev/powermng/ichsmb/ichsmb_pci.c | 12 +- sys/dev/powermng/pc98/pmc/pmc.c | 4 +- sys/dev/raid/aac/aac.c | 14 +- sys/dev/raid/aac/aac_cam.c | 26 +- sys/dev/raid/aac/aac_debug.c | 10 +- sys/dev/raid/aac/aac_disk.c | 10 +- sys/dev/raid/aac/aac_linux.c | 8 +- sys/dev/raid/aac/aac_pci.c | 14 +- sys/dev/raid/amr/amr.c | 16 +- sys/dev/raid/amr/amr_cam.c | 24 +- sys/dev/raid/amr/amr_disk.c | 12 +- sys/dev/raid/amr/amr_pci.c | 14 +- sys/dev/raid/asr/asr.c | 36 +- sys/dev/raid/asr/dptsig.h | 4 +- sys/dev/raid/asr/i2oadptr.h | 6 +- sys/dev/raid/asr/i2obscsi.h | 6 +- sys/dev/raid/asr/i2oexec.h | 10 +- sys/dev/raid/asr/i2omsg.h | 6 +- sys/dev/raid/asr/i2otypes.h | 6 +- sys/dev/raid/asr/i2outil.h | 6 +- sys/dev/raid/asr/osd_util.h | 4 +- sys/dev/raid/asr/sys_info.h | 4 +- sys/dev/raid/ciss/ciss.c | 26 +- sys/dev/raid/dpt/dpt_control.c | 4 +- sys/dev/raid/dpt/dpt_eisa.c | 8 +- sys/dev/raid/dpt/dpt_pci.c | 10 +- sys/dev/raid/dpt/dpt_scsi.c | 18 +- sys/dev/raid/ida/ida.c | 8 +- sys/dev/raid/ida/ida_disk.c | 6 +- sys/dev/raid/ida/ida_eisa.c | 8 +- sys/dev/raid/ida/ida_pci.c | 10 +- sys/dev/raid/iir/iir.c | 21 +- sys/dev/raid/iir/iir_ctrl.c | 4 +- sys/dev/raid/iir/iir_pci.c | 10 +- sys/dev/raid/mlx/mlx.c | 10 +- sys/dev/raid/mlx/mlx_disk.c | 10 +- sys/dev/raid/mlx/mlx_pci.c | 14 +- sys/dev/raid/mly/mly.c | 12 +- sys/dev/raid/mly/mly_cam.c | 24 +- sys/dev/raid/mly/mly_pci.c | 12 +- sys/dev/raid/pst/pst-iop.c | 8 +- sys/dev/raid/pst/pst-pci.c | 8 +- sys/dev/raid/pst/pst-raid.c | 8 +- sys/dev/raid/twe/twe.c | 12 +- sys/dev/raid/twe/twe_compat.h | 6 +- sys/dev/raid/twe/twe_freebsd.c | 12 +- sys/dev/raid/vinum/vinum.c | 6 +- sys/dev/raid/vinum/vinumconfig.c | 6 +- sys/dev/raid/vinum/vinumdaemon.c | 6 +- sys/dev/raid/vinum/vinumhdr.h | 10 +- sys/dev/raid/vinum/vinuminterrupt.c | 6 +- sys/dev/raid/vinum/vinumio.c | 6 +- sys/dev/raid/vinum/vinumioctl.c | 6 +- sys/dev/raid/vinum/vinumlock.c | 6 +- sys/dev/raid/vinum/vinummemory.c | 6 +- sys/dev/raid/vinum/vinumparser.c | 10 +- sys/dev/raid/vinum/vinumraid5.c | 6 +- sys/dev/raid/vinum/vinumrequest.c | 6 +- sys/dev/raid/vinum/vinumrevive.c | 6 +- sys/dev/raid/vinum/vinumstate.c | 6 +- sys/dev/raid/vinum/vinumutil.c | 6 +- sys/dev/raid/vinum/vinumvar.h | 4 +- sys/dev/serial/cronyx/cronyx.c | 4 +- sys/dev/serial/cy/cy.c | 8 +- sys/dev/serial/cy/cy_pci.c | 6 +- sys/dev/serial/dgb/dgm.c | 8 +- sys/dev/serial/rc/rc.c | 8 +- sys/dev/serial/rp/rp.c | 6 +- sys/dev/serial/rp/rp_isa.c | 8 +- sys/dev/serial/rp/rp_pci.c | 10 +- sys/dev/serial/rp2/rp.c | 10 +- sys/dev/serial/si/si.c | 8 +- sys/dev/serial/si/si2_z280.c | 4 +- sys/dev/serial/si/si3_t225.c | 4 +- sys/dev/serial/si/si_eisa.c | 8 +- sys/dev/serial/si/si_isa.c | 8 +- sys/dev/serial/si/si_pci.c | 8 +- sys/dev/serial/sio/sio.c | 26 +- sys/dev/serial/stl/stallion.c | 10 +- sys/dev/serial/stli/istallion.c | 4 +- sys/dev/sound/isa/gusc.c | 8 +- sys/dev/sound/isa/i386/ad1848.c | 6 +- sys/dev/sound/isa/i386/adlib_card.c | 3 +- sys/dev/sound/isa/i386/dev_table.c | 4 +- sys/dev/sound/isa/i386/dmabuf.c | 4 +- sys/dev/sound/isa/i386/gus/gus_card.c | 3 +- sys/dev/sound/isa/i386/gus/gus_midi.c | 3 +- sys/dev/sound/isa/i386/gus/gus_vol.c | 4 +- sys/dev/sound/isa/i386/gus/gus_wave.c | 4 +- sys/dev/sound/isa/i386/midi_synth.c | 5 +- sys/dev/sound/isa/i386/midibuf.c | 3 +- sys/dev/sound/isa/i386/opl3.c | 6 +- sys/dev/sound/isa/i386/patmgr.c | 3 +- sys/dev/sound/isa/i386/pca/pcaudio.c | 6 +- sys/dev/sound/isa/i386/sb/sb_dsp.c | 4 +- sys/dev/sound/isa/i386/sb/sb_mixer.c | 3 +- sys/dev/sound/isa/i386/sbmidi/sb16_midi.c | 6 +- sys/dev/sound/isa/i386/sbxvi/sb16_dsp.c | 12 +- sys/dev/sound/isa/i386/sequencer.c | 6 +- sys/dev/sound/isa/i386/sound_config.h | 8 +- sys/dev/sound/isa/i386/sound_pnp.c | 3 +- sys/dev/sound/isa/i386/sound_switch.c | 3 +- sys/dev/sound/isa/i386/sound_timer.c | 3 +- sys/dev/sound/isa/i386/soundcard.c | 9 +- sys/dev/sound/isa/i386/spkr/spkr.c | 4 +- sys/dev/sound/isa/i386/sys_timer.c | 3 +- sys/dev/sound/isa/i386/trix/trix.c | 3 +- sys/dev/sound/pci/als4000.c | 8 +- sys/dev/sound/pci/aureal.c | 8 +- sys/dev/sound/pci/cmi.c | 8 +- sys/dev/sound/pci/cs4281.c | 8 +- sys/dev/sound/pci/csa.c | 10 +- sys/dev/sound/pci/csapcm.c | 8 +- sys/dev/sound/pci/ds1.c | 8 +- sys/dev/sound/pci/emu10k1.c | 10 +- sys/dev/sound/pci/es137x.c | 8 +- sys/dev/sound/pci/fm801.c | 8 +- sys/dev/sound/pci/ich.c | 8 +- sys/dev/sound/pci/maestro.c | 8 +- sys/dev/sound/pci/maestro3.c | 8 +- sys/dev/sound/pci/neomagic.c | 8 +- sys/dev/sound/pci/solo.c | 8 +- sys/dev/sound/pci/t4dwave.c | 8 +- sys/dev/sound/pci/via8233.c | 8 +- sys/dev/sound/pci/via82c686.c | 8 +- sys/dev/sound/pci/vibes.c | 8 +- sys/dev/sound/pcm/sound.h | 4 +- sys/dev/sound/usb/uaudio.c | 10 +- sys/dev/usbmisc/ubsa/ubsa.c | 16 +- sys/dev/usbmisc/ucom/ucom.c | 16 +- sys/dev/usbmisc/ufm/ufm.c | 12 +- sys/dev/usbmisc/uftdi/uftdi.c | 16 +- sys/dev/usbmisc/ugen/ugen.c | 8 +- sys/dev/usbmisc/uhid/uhid.c | 12 +- sys/dev/usbmisc/ukbd/ukbd.c | 20 +- sys/dev/usbmisc/ulpt/ulpt.c | 8 +- sys/dev/usbmisc/umass/umass.c | 24 +- sys/dev/usbmisc/umodem/umodem.c | 14 +- sys/dev/usbmisc/ums/ums.c | 16 +- sys/dev/usbmisc/uplcom/uplcom.c | 16 +- sys/dev/usbmisc/urio/urio.c | 12 +- sys/dev/usbmisc/uscanner/uscanner.c | 10 +- sys/dev/usbmisc/uvisor/uvisor.c | 14 +- sys/dev/usbmisc/uvscom/uvscom.c | 16 +- sys/dev/video/bktr/bktr_audio.c | 14 +- sys/dev/video/bktr/bktr_card.c | 14 +- sys/dev/video/bktr/bktr_core.c | 26 +- sys/dev/video/bktr/bktr_i2c.c | 18 +- sys/dev/video/bktr/bktr_mem.c | 4 +- sys/dev/video/bktr/bktr_os.c | 22 +- sys/dev/video/bktr/bktr_reg.h | 4 +- sys/dev/video/bktr/bktr_tuner.c | 12 +- sys/dev/video/ctx/ctx.c | 8 +- sys/dev/video/fb/bmp/splash_bmp.c | 4 +- sys/dev/video/fb/boot_font.c | 14 +- sys/dev/video/fb/fb.c | 4 +- sys/dev/video/fb/gfb.c | 10 +- sys/dev/video/fb/splash.c | 6 +- sys/dev/video/fb/tga.c | 16 +- sys/dev/video/fb/vga.c | 8 +- sys/dev/video/gfb/gfb_pci.c | 8 +- sys/dev/video/gsc/gsc.c | 10 +- sys/dev/video/i386/vesa/vesa.c | 4 +- sys/dev/video/meteor/meteor.c | 11 +- sys/dev/video/pcvt/i386/pcvt_drv.c | 6 +- sys/dev/video/pcvt/i386/pcvt_ext.c | 6 +- sys/dev/video/pcvt/i386/pcvt_hdr.h | 12 +- sys/dev/video/pcvt/i386/pcvt_kbd.c | 10 +- sys/dev/video/pcvt/i386/pcvt_out.c | 6 +- sys/dev/video/pcvt/i386/pcvt_sup.c | 6 +- sys/dev/video/pcvt/i386/pcvt_vtf.c | 8 +- sys/dev/video/tga/tga_pci.c | 8 +- sys/emulation/ibcs2/coff/imgact_coff.c | 6 +- sys/emulation/ibcs2/i386/Makefile | 14 +- sys/emulation/ibcs2/i386/ibcs2_dirent.h | 7 +- sys/emulation/ibcs2/i386/ibcs2_errno.c | 4 +- sys/emulation/ibcs2/i386/ibcs2_fcntl.c | 10 +- sys/emulation/ibcs2/i386/ibcs2_fcntl.h | 7 +- sys/emulation/ibcs2/i386/ibcs2_ioctl.c | 16 +- sys/emulation/ibcs2/i386/ibcs2_ipc.c | 12 +- sys/emulation/ibcs2/i386/ibcs2_isc.c | 10 +- sys/emulation/ibcs2/i386/ibcs2_isc_syscall.h | 4 +- sys/emulation/ibcs2/i386/ibcs2_isc_sysent.c | 12 +- sys/emulation/ibcs2/i386/ibcs2_misc.c | 16 +- sys/emulation/ibcs2/i386/ibcs2_msg.c | 12 +- sys/emulation/ibcs2/i386/ibcs2_other.c | 10 +- sys/emulation/ibcs2/i386/ibcs2_proto.h | 4 +- sys/emulation/ibcs2/i386/ibcs2_signal.c | 12 +- sys/emulation/ibcs2/i386/ibcs2_socksys.c | 6 +- sys/emulation/ibcs2/i386/ibcs2_socksys.h | 4 +- sys/emulation/ibcs2/i386/ibcs2_stat.c | 14 +- sys/emulation/ibcs2/i386/ibcs2_stat.h | 7 +- sys/emulation/ibcs2/i386/ibcs2_syscall.h | 4 +- sys/emulation/ibcs2/i386/ibcs2_sysent.c | 10 +- sys/emulation/ibcs2/i386/ibcs2_sysi86.c | 10 +- sys/emulation/ibcs2/i386/ibcs2_sysvec.c | 6 +- sys/emulation/ibcs2/i386/ibcs2_termios.h | 7 +- sys/emulation/ibcs2/i386/ibcs2_time.h | 7 +- sys/emulation/ibcs2/i386/ibcs2_union.h | 4 +- sys/emulation/ibcs2/i386/ibcs2_ustat.h | 7 +- sys/emulation/ibcs2/i386/ibcs2_util.c | 4 +- sys/emulation/ibcs2/i386/ibcs2_utime.h | 4 +- sys/emulation/ibcs2/i386/ibcs2_xenix.c | 16 +- sys/emulation/ibcs2/i386/ibcs2_xenix.h | 4 +- .../ibcs2/i386/ibcs2_xenix_syscall.h | 4 +- sys/emulation/ibcs2/i386/ibcs2_xenix_sysent.c | 10 +- sys/emulation/ibcs2/i386/syscalls.isc | 10 +- sys/emulation/ibcs2/i386/syscalls.master | 8 +- sys/emulation/ibcs2/i386/syscalls.xenix | 8 +- sys/emulation/linux/i386/Makefile | 6 +- sys/emulation/linux/i386/imgact_linux.c | 4 +- .../linux/i386/linprocfs/linprocfs_misc.c | 4 +- .../linux/i386/linprocfs/linprocfs_subr.c | 4 +- .../linux/i386/linprocfs/linprocfs_vfsops.c | 4 +- .../linux/i386/linprocfs/linprocfs_vnops.c | 4 +- sys/emulation/linux/i386/linux.h | 4 +- sys/emulation/linux/i386/linux_dummy.c | 8 +- sys/emulation/linux/i386/linux_genassym.c | 4 +- sys/emulation/linux/i386/linux_locore.s | 5 +- sys/emulation/linux/i386/linux_machdep.c | 12 +- sys/emulation/linux/i386/linux_proto.h | 4 +- sys/emulation/linux/i386/linux_ptrace.c | 6 +- sys/emulation/linux/i386/linux_syscall.h | 4 +- sys/emulation/linux/i386/linux_sysent.c | 8 +- sys/emulation/linux/i386/linux_sysvec.c | 10 +- sys/emulation/linux/i386/linux_union.h | 4 +- sys/emulation/linux/i386/syscalls.master | 6 +- sys/emulation/linux/linux_file.c | 12 +- sys/emulation/linux/linux_getcwd.c | 10 +- sys/emulation/linux/linux_ioctl.c | 12 +- sys/emulation/linux/linux_ipc.c | 10 +- sys/emulation/linux/linux_mib.c | 6 +- sys/emulation/linux/linux_misc.c | 12 +- sys/emulation/linux/linux_signal.c | 10 +- sys/emulation/linux/linux_socket.c | 10 +- sys/emulation/linux/linux_stats.c | 8 +- sys/emulation/linux/linux_sysctl.c | 8 +- sys/emulation/linux/linux_uid16.c | 8 +- sys/emulation/linux/linux_util.c | 4 +- sys/emulation/posix4/ksched.c | 4 +- sys/emulation/posix4/p1003_1b.c | 4 +- sys/emulation/posix4/posix4.h | 4 +- sys/emulation/posix4/posix4_mib.c | 4 +- sys/emulation/svr4/Makefile | 6 +- sys/emulation/svr4/i386/svr4_genassym.c | 8 +- sys/emulation/svr4/i386/svr4_locore.s | 4 +- sys/emulation/svr4/i386/svr4_machdep.c | 16 +- sys/emulation/svr4/i386/svr4_machdep.h | 4 +- sys/emulation/svr4/imgact_svr4.c | 4 +- sys/emulation/svr4/svr4_fcntl.c | 14 +- sys/emulation/svr4/svr4_fcntl.h | 4 +- sys/emulation/svr4/svr4_filio.c | 16 +- sys/emulation/svr4/svr4_fuser.h | 4 +- sys/emulation/svr4/svr4_ioctl.c | 24 +- sys/emulation/svr4/svr4_ipc.c | 14 +- sys/emulation/svr4/svr4_misc.c | 28 +- sys/emulation/svr4/svr4_proto.h | 4 +- sys/emulation/svr4/svr4_resource.c | 14 +- sys/emulation/svr4/svr4_signal.c | 14 +- sys/emulation/svr4/svr4_signal.h | 6 +- sys/emulation/svr4/svr4_socket.c | 16 +- sys/emulation/svr4/svr4_sockio.c | 10 +- sys/emulation/svr4/svr4_stat.c | 24 +- sys/emulation/svr4/svr4_stat.h | 4 +- sys/emulation/svr4/svr4_stream.c | 22 +- sys/emulation/svr4/svr4_syscall.h | 4 +- sys/emulation/svr4/svr4_syscallnames.c | 4 +- sys/emulation/svr4/svr4_sysent.c | 12 +- sys/emulation/svr4/svr4_sysvec.c | 22 +- sys/emulation/svr4/svr4_termios.c | 10 +- sys/emulation/svr4/svr4_ttold.c | 10 +- sys/emulation/svr4/svr4_union.h | 4 +- sys/emulation/svr4/svr4_ustat.h | 4 +- sys/emulation/svr4/svr4_utsname.h | 4 +- sys/emulation/svr4/syscalls.master | 10 +- sys/i386/apic/mpapic.h | 4 +- sys/i386/bios/mca_machdep.c | 6 +- sys/i386/boot/biosboot/boot.h | 8 +- sys/i386/boot/biosboot/serial.S | 4 +- sys/i386/boot/kzipboot/misc.c | 4 +- sys/i386/boot/kzipboot/unzip.c | 4 +- sys/i386/conf/LINT | 4 +- sys/i386/gnu/fpemul/div_small.s | 4 +- sys/i386/gnu/fpemul/errors.c | 16 +- sys/i386/gnu/fpemul/exception.h | 4 +- sys/i386/gnu/fpemul/fpu_arith.c | 6 +- sys/i386/gnu/fpemul/fpu_asm.h | 4 +- sys/i386/gnu/fpemul/fpu_aux.c | 10 +- sys/i386/gnu/fpemul/fpu_emu.h | 8 +- sys/i386/gnu/fpemul/fpu_entry.c | 10 +- sys/i386/gnu/fpemul/fpu_etc.c | 10 +- sys/i386/gnu/fpemul/fpu_trig.c | 14 +- sys/i386/gnu/fpemul/get_address.c | 8 +- sys/i386/gnu/fpemul/load_store.c | 8 +- sys/i386/gnu/fpemul/poly_2xm1.c | 4 +- sys/i386/gnu/fpemul/poly_atan.c | 6 +- sys/i386/gnu/fpemul/poly_div.s | 4 +- sys/i386/gnu/fpemul/poly_l2.c | 6 +- sys/i386/gnu/fpemul/poly_mul64.s | 4 +- sys/i386/gnu/fpemul/poly_sin.c | 8 +- sys/i386/gnu/fpemul/poly_tan.c | 6 +- sys/i386/gnu/fpemul/polynomial.s | 4 +- sys/i386/gnu/fpemul/reg_add_sub.c | 6 +- sys/i386/gnu/fpemul/reg_compare.c | 12 +- sys/i386/gnu/fpemul/reg_constant.c | 8 +- sys/i386/gnu/fpemul/reg_constant.h | 4 +- sys/i386/gnu/fpemul/reg_div.s | 4 +- sys/i386/gnu/fpemul/reg_ld_str.c | 14 +- sys/i386/gnu/fpemul/reg_mul.c | 4 +- sys/i386/gnu/fpemul/reg_norm.s | 4 +- sys/i386/gnu/fpemul/reg_round.s | 6 +- sys/i386/gnu/fpemul/reg_u_add.s | 4 +- sys/i386/gnu/fpemul/reg_u_div.s | 4 +- sys/i386/gnu/fpemul/reg_u_mul.s | 4 +- sys/i386/gnu/fpemul/reg_u_sub.s | 4 +- sys/i386/gnu/fpemul/wm_shrx.s | 4 +- sys/i386/gnu/fpemul/wm_sqrt.s | 4 +- sys/i386/gnu/isa/dgb.c | 12 +- sys/i386/gnu/isa/sound/awe_wave.c | 14 +- sys/i386/i386/autoconf.c | 14 +- sys/i386/i386/bios.c | 11 +- sys/i386/i386/exception.s | 4 +- sys/i386/i386/genassym.c | 12 +- sys/i386/i386/i386-gdbstub.c | 8 +- sys/i386/i386/machdep.c | 14 +- sys/i386/i386/mp_clock.c | 4 +- sys/i386/i386/nexus.c | 6 +- sys/i386/i386/procfs_machdep.c | 4 +- sys/i386/i386/support.s | 4 +- sys/i386/i386/swtch.s | 4 +- sys/i386/i386/trap.c | 8 +- sys/i386/i386/userconfig.c | 8 +- sys/i386/i386/vm_machdep.c | 9 +- sys/i386/include/bus.h | 8 +- sys/i386/include/bus_at386.h | 4 +- sys/i386/include/bus_pc98.h | 4 +- sys/i386/include/cpu.h | 8 +- sys/i386/include/cpufunc.h | 4 +- sys/i386/include/db_machdep.h | 10 +- sys/i386/include/floatingpoint.h | 4 +- sys/i386/include/globaldata.h | 6 +- sys/i386/include/lock.h | 4 +- sys/i386/include/mpapic.h | 4 +- sys/i386/include/pcb.h | 4 +- sys/i386/include/pcb_ext.h | 8 +- sys/i386/include/signal.h | 4 +- sys/i386/include/smp.h | 4 +- sys/i386/isa/README.stl | 6 +- sys/i386/isa/asc.c | 10 +- sys/i386/isa/atapi.c | 11 +- sys/i386/isa/clock.c | 12 +- sys/i386/isa/intr_machdep.c | 15 +- sys/i386/isa/npx.c | 4 +- sys/i386/isa/sound/local.h | 29 +- sys/i386/isa/sound/os.h | 4 +- sys/i386/isa/vector.s | 4 +- sys/kern/Make.tags.inc | 12 +- sys/kern/Makefile | 12 +- sys/kern/kern_lockf.c | 6 +- sys/kern/kern_p1003_1b.c | 4 +- sys/kern/kern_posix4_mib.c | 4 +- sys/kern/kern_sched.c | 4 +- sys/kern/link_aout.c | 11 +- sys/kern/subr_diskslice.c | 4 +- sys/kern/sys_process.c | 4 +- sys/kern/tty_pty.c | 5 +- sys/kern/vfs_conf.c | 10 +- sys/kern/vfs_syscalls.c | 4 +- sys/libkern/quad.h | 5 +- sys/libkern/strcat.c | 8 +- sys/libkern/strcmp.c | 7 +- sys/libkern/strcpy.c | 4 +- sys/libkern/strlen.c | 4 +- sys/libkern/strncmp.c | 4 +- sys/libkern/strncpy.c | 4 +- sys/net/bpf.c | 4 +- sys/net/bridge/bridge.c | 4 +- sys/net/dummynet/ip_dummynet.c | 8 +- sys/net/faith/if_faith.c | 4 +- sys/net/gif/if_gif.c | 4 +- sys/net/gre/if_gre.c | 4 +- sys/net/i4b/capi/capi_l4if.c | 17 +- sys/net/i4b/capi/capi_llif.c | 17 +- sys/net/i4b/capi/capi_msgs.c | 17 +- sys/net/i4b/capi/iavc/iavc_card.c | 19 +- sys/net/i4b/capi/iavc/iavc_isa.c | 19 +- sys/net/i4b/capi/iavc/iavc_lli.c | 21 +- sys/net/i4b/capi/iavc/iavc_pci.c | 23 +- sys/net/i4b/driver/i4b_bsdi_ibc.c | 14 +- sys/net/i4b/driver/i4b_ctl.c | 15 +- sys/net/i4b/driver/i4b_ing.c | 17 +- sys/net/i4b/driver/i4b_ipr.c | 16 +- sys/net/i4b/driver/i4b_isppp.c | 17 +- sys/net/i4b/driver/i4b_rbch.c | 19 +- sys/net/i4b/driver/i4b_tel.c | 19 +- sys/net/i4b/driver/i4b_trace.c | 14 +- sys/net/i4b/include/i4b_l1l2.h | 4 +- sys/net/i4b/layer1/i4b_l1.h | 4 +- sys/net/i4b/layer1/i4b_l1dmux.c | 22 +- sys/net/i4b/layer1/i4b_l1lib.c | 4 +- sys/net/i4b/layer1/ifpi/i4b_ifpi_ext.h | 4 +- sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c | 20 +- sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c | 18 +- sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c | 19 +- sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c | 24 +- sys/net/i4b/layer1/ifpi2/i4b_ifpi2_ext.h | 4 +- sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c | 21 +- sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1.c | 24 +- sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c | 25 +- sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c | 32 +- sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c | 26 +- sys/net/i4b/layer1/ifpnp/i4b_ifpnp_ext.h | 4 +- sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c | 25 +- sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1.c | 22 +- sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c | 23 +- sys/net/i4b/layer1/ihfc/i4b_ihfc.h | 4 +- sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c | 22 +- sys/net/i4b/layer1/ihfc/i4b_ihfc_ext.h | 5 +- sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c | 20 +- sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c | 19 +- sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c | 8 +- sys/net/i4b/layer1/isic/i4b_avm_a1.c | 14 +- sys/net/i4b/layer1/isic/i4b_bchan.c | 20 +- sys/net/i4b/layer1/isic/i4b_ctx_s0P.c | 14 +- sys/net/i4b/layer1/isic/i4b_diva.c | 12 +- sys/net/i4b/layer1/isic/i4b_drn_ngo.c | 8 +- sys/net/i4b/layer1/isic/i4b_dynalink.c | 14 +- sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c | 8 +- sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c | 8 +- sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c | 14 +- sys/net/i4b/layer1/isic/i4b_hscx.c | 20 +- sys/net/i4b/layer1/isic/i4b_isac.c | 22 +- sys/net/i4b/layer1/isic/i4b_isic.c | 24 +- sys/net/i4b/layer1/isic/i4b_isic.h | 6 +- sys/net/i4b/layer1/isic/i4b_isic_ext.h | 4 +- sys/net/i4b/layer1/isic/i4b_isic_isa.c | 8 +- sys/net/i4b/layer1/isic/i4b_isic_pnp.c | 8 +- sys/net/i4b/layer1/isic/i4b_itk_ix1.c | 14 +- sys/net/i4b/layer1/isic/i4b_l1.c | 20 +- sys/net/i4b/layer1/isic/i4b_l1fsm.c | 20 +- sys/net/i4b/layer1/isic/i4b_siemens_isurf.c | 8 +- sys/net/i4b/layer1/isic/i4b_sws.c | 14 +- sys/net/i4b/layer1/isic/i4b_tel_s016.c | 14 +- sys/net/i4b/layer1/isic/i4b_tel_s0163.c | 14 +- sys/net/i4b/layer1/isic/i4b_tel_s08.c | 14 +- sys/net/i4b/layer1/isic/i4b_usr_sti.c | 14 +- sys/net/i4b/layer1/itjc/i4b_itjc_ext.h | 4 +- sys/net/i4b/layer1/itjc/i4b_itjc_isac.c | 24 +- sys/net/i4b/layer1/itjc/i4b_itjc_l1.c | 24 +- sys/net/i4b/layer1/itjc/i4b_itjc_l1fsm.c | 27 +- sys/net/i4b/layer1/itjc/i4b_itjc_pci.c | 30 +- sys/net/i4b/layer1/iwic/i4b_iwic.h | 4 +- sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c | 23 +- sys/net/i4b/layer1/iwic/i4b_iwic_dchan.c | 25 +- sys/net/i4b/layer1/iwic/i4b_iwic_ext.h | 4 +- sys/net/i4b/layer1/iwic/i4b_iwic_fsm.c | 21 +- sys/net/i4b/layer1/iwic/i4b_iwic_l1if.c | 26 +- sys/net/i4b/layer1/iwic/i4b_iwic_pci.c | 25 +- sys/net/i4b/layer2/i4b_iframe.c | 20 +- sys/net/i4b/layer2/i4b_l2.c | 18 +- sys/net/i4b/layer2/i4b_l2fsm.c | 18 +- sys/net/i4b/layer2/i4b_l2timer.c | 12 +- sys/net/i4b/layer2/i4b_lme.c | 8 +- sys/net/i4b/layer2/i4b_mbuf.c | 4 +- sys/net/i4b/layer2/i4b_sframe.c | 14 +- sys/net/i4b/layer2/i4b_tei.c | 18 +- sys/net/i4b/layer2/i4b_uframe.c | 16 +- sys/net/i4b/layer2/i4b_util.c | 14 +- sys/net/i4b/layer3/i4b_l2if.c | 24 +- sys/net/i4b/layer3/i4b_l3fsm.c | 22 +- sys/net/i4b/layer3/i4b_l3timer.c | 16 +- sys/net/i4b/layer3/i4b_l4if.c | 22 +- sys/net/i4b/layer3/i4b_q931.c | 24 +- sys/net/i4b/layer3/i4b_q932fac.c | 14 +- sys/net/i4b/layer4/i4b_i4bdrv.c | 26 +- sys/net/i4b/layer4/i4b_l4.c | 28 +- sys/net/i4b/layer4/i4b_l4mgmt.c | 14 +- sys/net/i4b/layer4/i4b_l4timer.c | 14 +- sys/net/if_ethersubr.c | 8 +- sys/net/if_iso88025subr.c | 4 +- sys/net/if_loop.c | 4 +- sys/net/intrq.c | 4 +- sys/net/ip6fw/ip6_fw.c | 4 +- sys/net/ip_mroute/ip_mroute.c | 4 +- sys/net/ipfw/ip_fw.c | 6 +- sys/net/ipfw/ip_fw.h | 4 +- sys/net/ipfw/ip_fw2.c | 4 +- sys/net/net_osdep.h | 6 +- sys/net/oldbridge/bridge.c | 4 +- sys/net/ppp/if_ppp.c | 10 +- sys/net/ppp/if_ppp.h | 4 +- sys/net/ppp_layer/ppp_deflate.c | 6 +- sys/net/ppp_layer/ppp_tty.c | 6 +- sys/net/route.c | 4 +- sys/net/sl/if_sl.c | 6 +- sys/net/sppp/if_spppsubr.c | 4 +- sys/net/stf/if_stf.c | 4 +- sys/net/tap/if_tap.c | 6 +- sys/net/tun/if_tun.c | 6 +- sys/net/vlan/if_vlan.c | 6 +- sys/netgraph/UI/ng_UI.c | 4 +- sys/netgraph/async/ng_async.c | 4 +- sys/netgraph/bpf/ng_bpf.c | 4 +- sys/netgraph/bridge/ng_bridge.c | 4 +- sys/netgraph/cisco/ng_cisco.c | 4 +- sys/netgraph/echo/ng_echo.c | 4 +- sys/netgraph/eiface/ng_eiface.c | 4 +- sys/netgraph/etf/ng_etf.c | 4 +- sys/netgraph/ether/ng_ether.c | 4 +- sys/netgraph/fec/ng_fec.c | 4 +- sys/netgraph/frame_relay/ng_frame_relay.c | 4 +- sys/netgraph/hole/ng_hole.c | 4 +- sys/netgraph/iface/ng_iface.c | 4 +- sys/netgraph/ksocket/ng_ksocket.c | 4 +- sys/netgraph/l2tp/ng_l2tp.c | 4 +- sys/netgraph/lmi/ng_lmi.c | 4 +- sys/netgraph/mppc/ng_mppc.c | 4 +- sys/netgraph/netgraph/ng_base.c | 4 +- sys/netgraph/netgraph/ng_parse.c | 4 +- sys/netgraph/one2many/ng_one2many.c | 4 +- sys/netgraph/ppp/ng_ppp.c | 4 +- sys/netgraph/pppoe/ng_pppoe.c | 4 +- sys/netgraph/pptpgre/ng_pptpgre.c | 4 +- sys/netgraph/rfc1490/ng_rfc1490.c | 4 +- sys/netgraph/socket/ng_socket.c | 6 +- sys/netgraph/tee/ng_tee.c | 4 +- sys/netgraph/tty/ng_tty.c | 4 +- sys/netgraph/vjc/ng_vjc.c | 4 +- sys/netinet/in_gif.c | 4 +- sys/netinet/ip_input.c | 6 +- sys/netinet/ip_output.c | 6 +- sys/netinet/raw_ip.c | 8 +- sys/netinet6/icmp6.c | 4 +- sys/netinet6/in6_gif.c | 4 +- sys/netinet6/in6_pcb.c | 6 +- sys/netinet6/in6_proto.c | 4 +- sys/netinet6/in6_src.c | 4 +- sys/netinet6/ip6_forward.c | 8 +- sys/netinet6/ip6_input.c | 10 +- sys/netinet6/ip6_output.c | 8 +- sys/netinet6/nd6.c | 4 +- sys/netinet6/raw_ip6.c | 6 +- sys/netinet6/udp6_usrreq.c | 6 +- sys/netproto/atalk/aarp.c | 12 +- sys/netproto/atalk/at_control.c | 8 +- sys/netproto/atalk/at_proto.c | 8 +- sys/netproto/atalk/ddp_input.c | 12 +- sys/netproto/atalk/ddp_output.c | 12 +- sys/netproto/atalk/ddp_usrreq.c | 10 +- sys/netproto/atm/atm_aal5.c | 4 +- sys/netproto/atm/atm_cm.c | 4 +- sys/netproto/atm/atm_device.c | 4 +- sys/netproto/atm/atm_if.c | 4 +- sys/netproto/atm/atm_proto.c | 4 +- sys/netproto/atm/atm_signal.c | 4 +- sys/netproto/atm/atm_socket.c | 4 +- sys/netproto/atm/atm_subr.c | 4 +- sys/netproto/atm/atm_usrreq.c | 4 +- sys/netproto/atm/ipatm/ipatm_event.c | 8 +- sys/netproto/atm/ipatm/ipatm_if.c | 6 +- sys/netproto/atm/ipatm/ipatm_input.c | 4 +- sys/netproto/atm/ipatm/ipatm_load.c | 6 +- sys/netproto/atm/ipatm/ipatm_output.c | 6 +- sys/netproto/atm/ipatm/ipatm_usrreq.c | 6 +- sys/netproto/atm/ipatm/ipatm_vcm.c | 8 +- sys/netproto/atm/kern_include.h | 28 +- sys/netproto/atm/sigpvc/sigpvc_if.c | 4 +- sys/netproto/atm/sigpvc/sigpvc_subr.c | 4 +- sys/netproto/atm/spans/spans_arp.c | 6 +- sys/netproto/atm/spans/spans_cls.c | 6 +- sys/netproto/atm/spans/spans_if.c | 4 +- sys/netproto/atm/spans/spans_msg.c | 4 +- sys/netproto/atm/spans/spans_print.c | 4 +- sys/netproto/atm/spans/spans_proto.c | 4 +- sys/netproto/atm/spans/spans_subr.c | 4 +- sys/netproto/atm/spans/spans_util.c | 4 +- sys/netproto/atm/uni/q2110_sigaa.c | 8 +- sys/netproto/atm/uni/q2110_sigcpcs.c | 10 +- sys/netproto/atm/uni/q2110_subr.c | 8 +- sys/netproto/atm/uni/qsaal1_sigaa.c | 8 +- sys/netproto/atm/uni/qsaal1_sigcpcs.c | 10 +- sys/netproto/atm/uni/qsaal1_subr.c | 8 +- sys/netproto/atm/uni/sscf_uni.c | 6 +- sys/netproto/atm/uni/sscf_uni_lower.c | 10 +- sys/netproto/atm/uni/sscf_uni_upper.c | 8 +- sys/netproto/atm/uni/sscop.c | 10 +- sys/netproto/atm/uni/sscop_lower.c | 8 +- sys/netproto/atm/uni/sscop_pdu.c | 10 +- sys/netproto/atm/uni/sscop_sigaa.c | 8 +- sys/netproto/atm/uni/sscop_sigcpcs.c | 10 +- sys/netproto/atm/uni/sscop_subr.c | 10 +- sys/netproto/atm/uni/sscop_timer.c | 8 +- sys/netproto/atm/uni/sscop_upper.c | 10 +- sys/netproto/atm/uni/uniarp.c | 6 +- sys/netproto/atm/uni/uniarp_cache.c | 6 +- sys/netproto/atm/uni/uniarp_input.c | 4 +- sys/netproto/atm/uni/uniarp_output.c | 4 +- sys/netproto/atm/uni/uniarp_timer.c | 4 +- sys/netproto/atm/uni/uniarp_vcm.c | 4 +- sys/netproto/atm/uni/uniip.c | 4 +- sys/netproto/atm/uni/unisig_decode.c | 10 +- sys/netproto/atm/uni/unisig_encode.c | 10 +- sys/netproto/atm/uni/unisig_if.c | 10 +- sys/netproto/atm/uni/unisig_mbuf.c | 8 +- sys/netproto/atm/uni/unisig_msg.c | 10 +- sys/netproto/atm/uni/unisig_print.c | 8 +- sys/netproto/atm/uni/unisig_proto.c | 4 +- sys/netproto/atm/uni/unisig_sigmgr_state.c | 8 +- sys/netproto/atm/uni/unisig_subr.c | 6 +- sys/netproto/atm/uni/unisig_util.c | 6 +- sys/netproto/atm/uni/unisig_vc_state.c | 6 +- sys/netproto/ipsec/ipsec.c | 22 +- sys/netproto/ipsec/ipsec.h | 4 +- sys/netproto/ipsec/ipsec6.h | 4 +- sys/netproto/ipsec/ipsec_input.c | 20 +- sys/netproto/ipsec/ipsec_mbuf.c | 4 +- sys/netproto/ipsec/ipsec_output.c | 20 +- sys/netproto/ipsec/key.c | 16 +- sys/netproto/ipsec/key_debug.c | 8 +- sys/netproto/ipsec/keydb.h | 4 +- sys/netproto/ipsec/keysock.c | 8 +- sys/netproto/ipsec/xform_ah.c | 16 +- sys/netproto/ipsec/xform_esp.c | 20 +- sys/netproto/ipsec/xform_ipcomp.c | 16 +- sys/netproto/ipsec/xform_ipip.c | 14 +- sys/netproto/ipx/ipx.c | 8 +- sys/netproto/ipx/ipx_cksum.c | 6 +- sys/netproto/ipx/ipx_input.c | 12 +- sys/netproto/ipx/ipx_ip.c | 10 +- sys/netproto/ipx/ipx_outputfl.c | 8 +- sys/netproto/ipx/ipx_pcb.c | 10 +- sys/netproto/ipx/ipx_proto.c | 8 +- sys/netproto/ipx/ipx_usrreq.c | 12 +- sys/netproto/ipx/spx_debug.c | 12 +- sys/netproto/ipx/spx_usrreq.c | 16 +- sys/netproto/key/key.c | 10 +- sys/netproto/key/key_debug.c | 6 +- sys/netproto/key/keydb.c | 4 +- sys/netproto/key/keydb.h | 4 +- sys/netproto/key/keysock.c | 10 +- sys/netproto/natm/natm.c | 4 +- sys/netproto/natm/natm_pcb.c | 4 +- sys/netproto/natm/natm_proto.c | 4 +- sys/netproto/ncp/ncp_conn.c | 8 +- sys/netproto/ncp/ncp_crypt.c | 6 +- sys/netproto/ncp/ncp_lib.h | 10 +- sys/netproto/ncp/ncp_login.c | 16 +- sys/netproto/ncp/ncp_mod.c | 16 +- sys/netproto/ncp/ncp_ncp.c | 16 +- sys/netproto/ncp/ncp_nls.c | 6 +- sys/netproto/ncp/ncp_rq.c | 14 +- sys/netproto/ncp/ncp_sock.c | 12 +- sys/netproto/ncp/ncp_subr.c | 16 +- sys/netproto/ns/idp_usrreq.c | 14 +- sys/netproto/ns/ns.c | 6 +- sys/netproto/ns/ns_error.c | 10 +- sys/netproto/ns/ns_input.c | 14 +- sys/netproto/ns/ns_ip.c | 8 +- sys/netproto/ns/ns_output.c | 10 +- sys/netproto/ns/ns_pcb.c | 8 +- sys/netproto/ns/ns_proto.c | 4 +- sys/netproto/ns/spp_debug.c | 20 +- sys/netproto/ns/spp_usrreq.c | 22 +- sys/netproto/smb/smb_conn.c | 12 +- sys/netproto/smb/smb_conn.h | 4 +- sys/netproto/smb/smb_crypt.c | 10 +- sys/netproto/smb/smb_dev.c | 10 +- sys/netproto/smb/smb_dev.h | 4 +- sys/netproto/smb/smb_iod.c | 12 +- sys/netproto/smb/smb_rq.c | 12 +- sys/netproto/smb/smb_smb.c | 12 +- sys/netproto/smb/smb_subr.c | 10 +- sys/netproto/smb/smb_trantcp.c | 14 +- sys/netproto/smb/smb_usr.c | 12 +- sys/platform/pc32/apic/mpapic.h | 4 +- sys/platform/pc32/bios/mca_machdep.c | 6 +- sys/platform/pc32/boot/biosboot/boot.h | 8 +- sys/platform/pc32/boot/biosboot/serial.S | 4 +- sys/platform/pc32/boot/kzipboot/misc.c | 4 +- sys/platform/pc32/boot/kzipboot/unzip.c | 4 +- sys/platform/pc32/gnu/fpemul/div_small.s | 4 +- sys/platform/pc32/gnu/fpemul/errors.c | 16 +- sys/platform/pc32/gnu/fpemul/exception.h | 4 +- sys/platform/pc32/gnu/fpemul/fpu_arith.c | 6 +- sys/platform/pc32/gnu/fpemul/fpu_asm.h | 4 +- sys/platform/pc32/gnu/fpemul/fpu_aux.c | 10 +- sys/platform/pc32/gnu/fpemul/fpu_emu.h | 8 +- sys/platform/pc32/gnu/fpemul/fpu_entry.c | 10 +- sys/platform/pc32/gnu/fpemul/fpu_etc.c | 10 +- sys/platform/pc32/gnu/fpemul/fpu_trig.c | 14 +- sys/platform/pc32/gnu/fpemul/get_address.c | 8 +- sys/platform/pc32/gnu/fpemul/load_store.c | 8 +- sys/platform/pc32/gnu/fpemul/poly_2xm1.c | 4 +- sys/platform/pc32/gnu/fpemul/poly_atan.c | 6 +- sys/platform/pc32/gnu/fpemul/poly_div.s | 4 +- sys/platform/pc32/gnu/fpemul/poly_l2.c | 6 +- sys/platform/pc32/gnu/fpemul/poly_mul64.s | 4 +- sys/platform/pc32/gnu/fpemul/poly_sin.c | 8 +- sys/platform/pc32/gnu/fpemul/poly_tan.c | 6 +- sys/platform/pc32/gnu/fpemul/polynomial.s | 4 +- sys/platform/pc32/gnu/fpemul/reg_add_sub.c | 6 +- sys/platform/pc32/gnu/fpemul/reg_compare.c | 12 +- sys/platform/pc32/gnu/fpemul/reg_constant.c | 8 +- sys/platform/pc32/gnu/fpemul/reg_constant.h | 4 +- sys/platform/pc32/gnu/fpemul/reg_div.s | 4 +- sys/platform/pc32/gnu/fpemul/reg_ld_str.c | 14 +- sys/platform/pc32/gnu/fpemul/reg_mul.c | 4 +- sys/platform/pc32/gnu/fpemul/reg_norm.s | 4 +- sys/platform/pc32/gnu/fpemul/reg_round.s | 6 +- sys/platform/pc32/gnu/fpemul/reg_u_add.s | 4 +- sys/platform/pc32/gnu/fpemul/reg_u_div.s | 4 +- sys/platform/pc32/gnu/fpemul/reg_u_mul.s | 4 +- sys/platform/pc32/gnu/fpemul/reg_u_sub.s | 4 +- sys/platform/pc32/gnu/fpemul/wm_shrx.s | 4 +- sys/platform/pc32/gnu/fpemul/wm_sqrt.s | 4 +- sys/platform/pc32/gnu/isa/dgb.c | 12 +- sys/platform/pc32/gnu/isa/sound/awe_wave.c | 14 +- sys/platform/pc32/i386/autoconf.c | 14 +- sys/platform/pc32/i386/bios.c | 11 +- sys/platform/pc32/i386/exception.s | 4 +- sys/platform/pc32/i386/genassym.c | 12 +- sys/platform/pc32/i386/i386-gdbstub.c | 8 +- sys/platform/pc32/i386/machdep.c | 14 +- sys/platform/pc32/i386/mp_clock.c | 4 +- sys/platform/pc32/i386/nexus.c | 6 +- sys/platform/pc32/i386/procfs_machdep.c | 4 +- sys/platform/pc32/i386/support.s | 4 +- sys/platform/pc32/i386/swtch.s | 4 +- sys/platform/pc32/i386/trap.c | 8 +- sys/platform/pc32/i386/userconfig.c | 8 +- sys/platform/pc32/i386/vm_machdep.c | 9 +- sys/platform/pc32/include/bus.h | 8 +- sys/platform/pc32/include/bus_pc98.h | 4 +- sys/platform/pc32/include/globaldata.h | 6 +- sys/platform/pc32/include/lock.h | 4 +- sys/platform/pc32/include/mpapic.h | 4 +- sys/platform/pc32/include/pcb.h | 4 +- sys/platform/pc32/include/pcb_ext.h | 8 +- sys/platform/pc32/include/smp.h | 4 +- sys/platform/pc32/isa/README.stl | 6 +- sys/platform/pc32/isa/asc.c | 10 +- sys/platform/pc32/isa/atapi.c | 11 +- sys/platform/pc32/isa/clock.c | 12 +- sys/platform/pc32/isa/intr_machdep.c | 15 +- sys/platform/pc32/isa/npx.c | 4 +- sys/platform/pc32/isa/sound/local.h | 29 +- sys/platform/pc32/isa/sound/os.h | 4 +- sys/platform/pc32/isa/vector.s | 4 +- sys/platform/vkernel/i386/genassym.c | 12 +- sys/sys/camlib.h | 179 ++ sys/{libkern/strncmp.c => sys/paths.h} | 36 +- sys/sys/posix4.h | 4 +- sys/vfs/coda/cnode.h | 4 +- sys/vfs/coda/coda_fbsd.c | 12 +- sys/vfs/coda/coda_namecache.c | 10 +- sys/vfs/coda/coda_psdev.c | 14 +- sys/vfs/coda/coda_subr.c | 12 +- sys/vfs/coda/coda_venus.c | 10 +- sys/vfs/coda/coda_vfsops.c | 20 +- sys/vfs/coda/coda_vnops.c | 18 +- sys/vfs/fdesc/fdesc_vfsops.c | 4 +- sys/vfs/fdesc/fdesc_vnops.c | 4 +- sys/vfs/fifofs/fifo_vnops.c | 4 +- sys/vfs/gnu/ext2fs/ext2_alloc.c | 16 +- sys/vfs/gnu/ext2fs/ext2_balloc.c | 16 +- sys/vfs/gnu/ext2fs/ext2_fs.h | 4 +- sys/vfs/gnu/ext2fs/ext2_inode.c | 18 +- sys/vfs/gnu/ext2fs/ext2_inode_cnv.c | 10 +- sys/vfs/gnu/ext2fs/ext2_linux_balloc.c | 18 +- sys/vfs/gnu/ext2fs/ext2_linux_ialloc.c | 20 +- sys/vfs/gnu/ext2fs/ext2_lookup.c | 18 +- sys/vfs/gnu/ext2fs/ext2_subr.c | 12 +- sys/vfs/gnu/ext2fs/ext2_vfsops.c | 18 +- sys/vfs/gnu/ext2fs/ext2_vnops.c | 22 +- sys/vfs/hpfs/hpfs_alsubr.c | 6 +- sys/vfs/hpfs/hpfs_hash.c | 4 +- sys/vfs/hpfs/hpfs_lookup.c | 8 +- sys/vfs/hpfs/hpfs_subr.c | 8 +- sys/vfs/hpfs/hpfs_vfsops.c | 8 +- sys/vfs/hpfs/hpfs_vnops.c | 10 +- sys/vfs/isofs/cd9660/cd9660_bmap.c | 6 +- sys/vfs/isofs/cd9660/cd9660_lookup.c | 8 +- sys/vfs/isofs/cd9660/cd9660_node.c | 8 +- sys/vfs/isofs/cd9660/cd9660_rrip.c | 10 +- sys/vfs/isofs/cd9660/cd9660_util.c | 4 +- sys/vfs/isofs/cd9660/cd9660_vfsops.c | 10 +- sys/vfs/isofs/cd9660/cd9660_vnops.c | 10 +- sys/vfs/mfs/mfs_vfsops.c | 19 +- sys/vfs/mfs/mfs_vnops.c | 6 +- sys/vfs/msdosfs/msdosfs_conv.c | 4 +- sys/vfs/msdosfs/msdosfs_denode.c | 12 +- sys/vfs/msdosfs/msdosfs_fat.c | 12 +- sys/vfs/msdosfs/msdosfs_lookup.c | 12 +- sys/vfs/msdosfs/msdosfs_vfsops.c | 14 +- sys/vfs/msdosfs/msdosfs_vnops.c | 12 +- sys/vfs/nfs/bootp_subr.c | 14 +- sys/vfs/nfs/krpc_subr.c | 8 +- sys/vfs/nfs/nfs_bio.c | 14 +- sys/vfs/nfs/nfs_node.c | 12 +- sys/vfs/nfs/nfs_nqlease.c | 18 +- sys/vfs/nfs/nfs_serv.c | 14 +- sys/vfs/nfs/nfs_socket.c | 20 +- sys/vfs/nfs/nfs_srvcache.c | 10 +- sys/vfs/nfs/nfs_subs.c | 20 +- sys/vfs/nfs/nfs_syscalls.c | 22 +- sys/vfs/nfs/nfs_vfsops.c | 20 +- sys/vfs/nfs/nfs_vnops.c | 20 +- sys/vfs/nfs/nfsnode.h | 4 +- sys/vfs/nfs/nfsv2.h | 4 +- sys/vfs/ntfs/ntfs_compr.c | 6 +- sys/vfs/ntfs/ntfs_ihash.c | 8 +- sys/vfs/ntfs/ntfs_subr.c | 16 +- sys/vfs/ntfs/ntfs_vfsops.c | 14 +- sys/vfs/ntfs/ntfs_vnops.c | 8 +- sys/vfs/nullfs/null_subr.c | 4 +- sys/vfs/nullfs/null_vfsops.c | 4 +- sys/vfs/nullfs/null_vnops.c | 4 +- sys/vfs/nwfs/nwfs.h | 4 +- sys/vfs/nwfs/nwfs_io.c | 8 +- sys/vfs/nwfs/nwfs_ioctl.c | 8 +- sys/vfs/nwfs/nwfs_node.c | 10 +- sys/vfs/nwfs/nwfs_subr.c | 8 +- sys/vfs/nwfs/nwfs_vfsops.c | 8 +- sys/vfs/nwfs/nwfs_vnops.c | 8 +- sys/vfs/portal/portal_vfsops.c | 4 +- sys/vfs/portal/portal_vnops.c | 4 +- sys/vfs/procfs/procfs_ctl.c | 4 +- sys/vfs/procfs/procfs_dbregs.c | 4 +- sys/vfs/procfs/procfs_fpregs.c | 4 +- sys/vfs/procfs/procfs_map.c | 4 +- sys/vfs/procfs/procfs_mem.c | 4 +- sys/vfs/procfs/procfs_note.c | 4 +- sys/vfs/procfs/procfs_regs.c | 4 +- sys/vfs/procfs/procfs_rlimit.c | 4 +- sys/vfs/procfs/procfs_status.c | 4 +- sys/vfs/procfs/procfs_subr.c | 4 +- sys/vfs/procfs/procfs_type.c | 4 +- sys/vfs/procfs/procfs_vfsops.c | 4 +- sys/vfs/procfs/procfs_vnops.c | 4 +- sys/vfs/smbfs/smbfs_io.c | 8 +- sys/vfs/smbfs/smbfs_node.c | 8 +- sys/vfs/smbfs/smbfs_smb.c | 8 +- sys/vfs/smbfs/smbfs_subr.c | 8 +- sys/vfs/smbfs/smbfs_vfsops.c | 8 +- sys/vfs/smbfs/smbfs_vnops.c | 8 +- sys/vfs/ufs/README | 6 +- sys/vfs/ufs/ffs_alloc.c | 14 +- sys/vfs/ufs/ffs_balloc.c | 12 +- sys/vfs/ufs/ffs_inode.c | 14 +- sys/vfs/ufs/ffs_rawread.c | 8 +- sys/vfs/ufs/ffs_softdep.c | 18 +- sys/vfs/ufs/ffs_softdep_stub.c | 10 +- sys/vfs/ufs/ffs_subr.c | 12 +- sys/vfs/ufs/ffs_vfsops.c | 14 +- sys/vfs/ufs/ffs_vnops.c | 16 +- sys/vfs/ufs/inode.h | 4 +- sys/vfs/ufs/ufs_bmap.c | 10 +- sys/vfs/ufs/ufs_dirhash.c | 14 +- sys/vfs/ufs/ufs_ihash.c | 8 +- sys/vfs/ufs/ufs_inode.c | 14 +- sys/vfs/ufs/ufs_lookup.c | 14 +- sys/vfs/ufs/ufs_quota.c | 8 +- sys/vfs/ufs/ufs_vfsops.c | 10 +- sys/vfs/ufs/ufs_vnops.c | 16 +- sys/vfs/umapfs/umap_subr.c | 4 +- sys/vfs/umapfs/umap_vfsops.c | 4 +- sys/vfs/umapfs/umap_vnops.c | 6 +- sys/vfs/union/union_subr.c | 4 +- sys/vfs/union/union_vfsops.c | 4 +- sys/vfs/union/union_vnops.c | 4 +- usr.sbin/config/configvers.h | 4 +- usr.sbin/config/main.c | 33 +- usr.sbin/config/mkheaders.c | 7 +- usr.sbin/config/mkioconf.c | 4 +- 1323 files changed, 7743 insertions(+), 7568 deletions(-) create mode 100644 sys/sys/camlib.h copy sys/{libkern/strncmp.c => sys/paths.h} (73%) diff --git a/include/paths.h b/include/paths.h index cb96062b93..4fc5665ecb 100644 --- a/include/paths.h +++ b/include/paths.h @@ -32,13 +32,14 @@ * * @(#)paths.h 8.1 (Berkeley) 6/2/93 * $FreeBSD: src/include/paths.h,v 1.9.6.4 2002/07/19 07:53:41 jmallett Exp $ - * $DragonFly: src/include/paths.h,v 1.2 2003/06/17 04:25:56 dillon Exp $ + * $DragonFly: src/include/paths.h,v 1.3 2003/08/07 21:19:26 dillon Exp $ */ #ifndef _PATHS_H_ #define _PATHS_H_ #include +#include /* dev paths */ /* Default search path. */ #define _PATH_DEFPATH "/usr/bin:/bin" @@ -48,34 +49,34 @@ #define _PATH_AUTHCONF "/etc/auth.conf" #define _PATH_BSHELL "/bin/sh" -#define _PATH_CONSOLE "/dev/console" +#define _PATH_CONSOLE __SYS_PATH_CONSOLE #define _PATH_CP "/bin/cp" #define _PATH_CSHELL "/bin/csh" -#define _PATH_DEFTAPE "/dev/sa0" +#define _PATH_DEFTAPE __SYS_PATH_DEFTAPE #define _PATH_DEVDB "/var/run/dev.db" -#define _PATH_DEVNULL "/dev/null" -#define _PATH_DEVZERO "/dev/zero" -#define _PATH_DRUM "/dev/drum" +#define _PATH_DEVNULL __SYS_PATH_DEVNULL +#define _PATH_DEVZERO __SYS_PATH_DEVZERO +#define _PATH_DRUM __SYS_PATH_DRUM #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" -#define _PATH_KMEM "/dev/kmem" +#define _PATH_KMEM __SYS_PATH_KMEM #define _PATH_LOGIN "/usr/bin/login" #define _PATH_MAILDIR "/var/mail" #define _PATH_MAN "/usr/share/man" -#define _PATH_MEM "/dev/mem" +#define _PATH_MEM __SYS_PATH_MEM #define _PATH_NOLOGIN "/var/run/nologin" #define _PATH_RCP "/bin/rcp" #define _PATH_RLOGIN "/usr/bin/rlogin" #define _PATH_RSH "/usr/bin/rsh" #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHELLS "/etc/shells" -#define _PATH_TTY "/dev/tty" +#define _PATH_TTY __SYS_PATH_TTY #define _PATH_UNIX "don't use _PATH_UNIX" #define _PATH_VI "/usr/bin/vi" #define _PATH_WALL "/usr/bin/wall" /* Provide trailing slash, since mostly used for building pathnames. */ -#define _PATH_DEV "/dev/" +#define _PATH_DEV __SYS_PATH_DEV #define _PATH_TMP "/tmp/" #define _PATH_VARDB "/var/db/" #define _PATH_VARRUN "/var/run/" diff --git a/sbin/vinum/vinumparser.c b/sbin/vinum/vinumparser.c index 7dfe04a04a..e506c242d3 100644 --- a/sbin/vinum/vinumparser.c +++ b/sbin/vinum/vinumparser.c @@ -35,7 +35,7 @@ * * $Id: vinumparser.c,v 1.21 2000/12/20 03:44:13 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumparser.c,v 1.20.2.5 2001/05/28 05:56:27 grog Exp $ - * $DragonFly: src/sbin/vinum/vinumparser.c,v 1.3 2003/06/25 03:55:50 dillon Exp $ + * $DragonFly: src/sbin/vinum/vinumparser.c,v 1.4 2003/08/07 21:17:09 dillon Exp $ */ /* @@ -59,7 +59,7 @@ */ #include -#include +#include "vinumkw.h" #ifdef _KERNEL #include #include @@ -71,9 +71,9 @@ #include #include -#include -#include -#include +#include "vinumvar.h" +#include "vinumio.h" +#include "vinumext.h" #define iswhite(c) ((c == ' ') || (c == '\t')) /* check for white space */ #else /* userland */ #include diff --git a/sbin/vinum/vinumutil.c b/sbin/vinum/vinumutil.c index 247d94d0d2..96d71d3302 100644 --- a/sbin/vinum/vinumutil.c +++ b/sbin/vinum/vinumutil.c @@ -37,13 +37,13 @@ * * $Id: vinumutil.c,v 1.14 1999/12/30 07:04:02 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumutil.c,v 1.15 2000/02/29 06:16:44 grog Exp $ - * $DragonFly: src/sbin/vinum/vinumutil.c,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sbin/vinum/vinumutil.c,v 1.3 2003/08/07 21:17:10 dillon Exp $ */ /* This file contains utility routines used both in kernel and user context */ -#include -#include +#include "vinumhdr.h" +#include "statetexts.h" #ifndef _KERNEL #include extern jmp_buf command_fail; /* return on a failed command */ diff --git a/sys/Makefile b/sys/Makefile index 370f2a7c27..75a63897b3 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/Makefile,v 1.20.2.1 2000/07/10 08:22:34 obrien Exp $ -# $DragonFly: src/sys/Makefile,v 1.4 2003/07/30 00:19:11 dillon Exp $ +# $DragonFly: src/sys/Makefile,v 1.5 2003/08/07 21:16:41 dillon Exp $ # This is the old aout only boot loader. .if exists(${.CURDIR}/${MACHINE_ARCH}/boot) && ${OBJFORMAT} == "aout" @@ -23,8 +23,8 @@ HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", rele all_sysent: (cd ${.CURDIR}/kern; ${MAKE} init_sysent.c) - (cd ${.CURDIR}/svr4; ${MAKE} svr4_sysent.c) - (cd ${.CURDIR}/i386/linux; ${MAKE} linux_sysent.c) - (cd ${.CURDIR}/i386/ibcs2; ${MAKE} ibcs2_sysent.c) - (cd ${.CURDIR}/i386/ibcs2; ${MAKE} ibcs2_isc_sysent.c) - (cd ${.CURDIR}/i386/ibcs2; ${MAKE} ibcs2_xenix_sysent.c) + (cd ${.CURDIR}/emulation/svr4; ${MAKE} svr4_sysent.c) + (cd ${.CURDIR}/emulation/linux/i386; ${MAKE} linux_sysent.c) + (cd ${.CURDIR}/emulation/ibcs2/i386; ${MAKE} ibcs2_sysent.c) + (cd ${.CURDIR}/emulation/ibcs2/i386; ${MAKE} ibcs2_isc_sysent.c) + (cd ${.CURDIR}/emulation/ibcs2/i386; ${MAKE} ibcs2_xenix_sysent.c) diff --git a/sys/boot/alpha/boot1/sys.c b/sys/boot/alpha/boot1/sys.c index 903206d120..4e5e98d574 100644 --- a/sys/boot/alpha/boot1/sys.c +++ b/sys/boot/alpha/boot1/sys.c @@ -26,16 +26,16 @@ * from: Mach, Revision 2.2 92/04/04 11:36:34 rpd * fromL Id: sys.c,v 1.21 1997/06/09 05:10:56 bde Exp * $FreeBSD: src/sys/boot/alpha/boot1/sys.c,v 1.4.2.2 2002/01/19 02:16:09 iedowse Exp $ - * $DragonFly: src/sys/boot/alpha/boot1/Attic/sys.c,v 1.2 2003/06/17 04:28:16 dillon Exp $ + * $DragonFly: src/sys/boot/alpha/boot1/Attic/sys.c,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ #include #include #include -#include -#include -#include +#include +#include +#include #include diff --git a/sys/boot/common/ls.c b/sys/boot/common/ls.c index 6faf9e5f43..eb47d96a96 100644 --- a/sys/boot/common/ls.c +++ b/sys/boot/common/ls.c @@ -1,6 +1,6 @@ /* * $FreeBSD: src/sys/boot/common/ls.c,v 1.8.2.2 2000/07/07 00:09:45 obrien Exp $ - * $DragonFly: src/sys/boot/common/ls.c,v 1.2 2003/06/17 04:28:16 dillon Exp $ + * $DragonFly: src/sys/boot/common/ls.c,v 1.3 2003/08/07 21:16:44 dillon Exp $ * From: $NetBSD: ls.c,v 1.3 1997/06/13 13:48:47 drochner Exp $ */ @@ -41,8 +41,8 @@ #include -#include -#include +#include +#include #include #include diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index a2aa0267b1..d2d8e386f8 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -15,7 +15,7 @@ /* * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.28.2.7 2002/10/10 15:53:24 iwasaki Exp $ - * $DragonFly: src/sys/boot/i386/boot2/Attic/boot2.c,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/boot/i386/boot2/Attic/boot2.c,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ #include @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/sys/boot/pc32/boot2/boot2.c b/sys/boot/pc32/boot2/boot2.c index 8c87e038f3..6a09c4d267 100644 --- a/sys/boot/pc32/boot2/boot2.c +++ b/sys/boot/pc32/boot2/boot2.c @@ -15,7 +15,7 @@ /* * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.28.2.7 2002/10/10 15:53:24 iwasaki Exp $ - * $DragonFly: src/sys/boot/pc32/boot2/boot2.c,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/boot/pc32/boot2/boot2.c,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ #include @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/sys/boot/pc98/boot2/boot.h b/sys/boot/pc98/boot2/boot.h index bc0ef4414b..862ea18477 100644 --- a/sys/boot/pc98/boot2/boot.h +++ b/sys/boot/pc98/boot2/boot.h @@ -25,15 +25,15 @@ * * from: Mach, Revision 2.2 92/04/04 11:35:03 rpd * $FreeBSD: src/sys/boot/pc98/boot2/boot.h,v 1.2 1999/08/28 00:40:25 peter Exp $ - * $DragonFly: src/sys/boot/pc98/boot2/Attic/boot.h,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/boot/pc98/boot2/Attic/boot.h,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ #include #include -#include -#include -#include +#include +#include +#include #define RB_DUAL 0x40000 /* XXX */ #define RB_PROBEKBD 0x80000 /* XXX */ diff --git a/sys/boot/pc98/boot2/serial_16550.S b/sys/boot/pc98/boot2/serial_16550.S index 1e7a3ebe87..43aaeeecf5 100644 --- a/sys/boot/pc98/boot2/serial_16550.S +++ b/sys/boot/pc98/boot2/serial_16550.S @@ -25,7 +25,7 @@ * * from: Mach, Revision 2.2 92/04/04 11:34:26 rpd * $FreeBSD: src/sys/boot/pc98/boot2/serial_16550.S,v 1.1.2.2 2002/03/08 13:00:22 nyan Exp $ - * $DragonFly: src/sys/boot/pc98/boot2/Attic/serial_16550.S,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/boot/pc98/boot2/Attic/serial_16550.S,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ /* @@ -68,7 +68,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .file "serial.S" -#include +#include #include "asm.h" .text diff --git a/sys/boot/pc98/boot2/serial_8251.S b/sys/boot/pc98/boot2/serial_8251.S index d050916148..667f24a7d4 100644 --- a/sys/boot/pc98/boot2/serial_8251.S +++ b/sys/boot/pc98/boot2/serial_8251.S @@ -25,7 +25,7 @@ * * from: Mach, Revision 2.2 92/04/04 11:34:26 rpd * $FreeBSD: src/sys/boot/pc98/boot2/serial_8251.S,v 1.1.2.1 2000/04/16 03:55:16 nyan Exp $ - * $DragonFly: src/sys/boot/pc98/boot2/Attic/serial_8251.S,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/boot/pc98/boot2/Attic/serial_8251.S,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ /* @@ -72,7 +72,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .file "serial.S" -#include +#include #include "asm.h" .text diff --git a/sys/bus/cam/cam.c b/sys/bus/cam/cam.c index c4fd1cfba4..f0f18b05a1 100644 --- a/sys/bus/cam/cam.c +++ b/sys/bus/cam/cam.c @@ -26,11 +26,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/cam.c,v 1.3 1999/08/28 00:40:38 peter Exp $ - * $DragonFly: src/sys/bus/cam/cam.c,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/bus/cam/cam.c,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ #include -#include +#include "cam.h" void cam_strvis(u_int8_t *dst, const u_int8_t *src, int srclen, int dstlen) diff --git a/sys/bus/cam/cam_ccb.h b/sys/bus/cam/cam_ccb.h index 5fb6a61602..3893ac46b7 100644 --- a/sys/bus/cam/cam_ccb.h +++ b/sys/bus/cam/cam_ccb.h @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.15.2.2 2000/09/22 23:09:19 gibbs Exp $ - * $DragonFly: src/sys/bus/cam/cam_ccb.h,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/bus/cam/cam_ccb.h,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ #ifndef _CAM_CAM_CCB_H @@ -38,8 +38,8 @@ #ifndef _KERNEL #include #endif -#include -#include +#include "cam_debug.h" +#include "scsi/scsi_all.h" /* General allocation length definitions for CCB structures */ diff --git a/sys/bus/cam/cam_extend.c b/sys/bus/cam/cam_extend.c index a70f1be732..f676240e54 100644 --- a/sys/bus/cam/cam_extend.c +++ b/sys/bus/cam/cam_extend.c @@ -13,7 +13,7 @@ * functioning of this software in any circumstances. * * $FreeBSD: src/sys/cam/cam_extend.c,v 1.3 1999/08/28 00:40:39 peter Exp $ - * $DragonFly: src/sys/bus/cam/cam_extend.c,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/bus/cam/cam_extend.c,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ /* * XXX XXX XXX XXX We should get DEVFS working so that we @@ -29,7 +29,7 @@ #include #include -#include +#include "cam_extend.h" struct extend_array { diff --git a/sys/bus/cam/cam_periph.c b/sys/bus/cam/cam_periph.c index 796fd8dcce..363ca7a957 100644 --- a/sys/bus/cam/cam_periph.c +++ b/sys/bus/cam/cam_periph.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/cam_periph.c,v 1.24.2.3 2003/01/25 19:04:40 dillon Exp $ - * $DragonFly: src/sys/bus/cam/cam_periph.c,v 1.4 2003/07/19 21:14:11 dillon Exp $ + * $DragonFly: src/sys/bus/cam/cam_periph.c,v 1.5 2003/08/07 21:16:44 dillon Exp $ */ #include @@ -42,16 +42,16 @@ #include #include -#include -#include -#include -#include -#include +#include "cam.h" +#include "cam_ccb.h" +#include "cam_xpt_periph.h" +#include "cam_periph.h" +#include "cam_debug.h" -#include -#include -#include -#include +#include +#include +#include +#include static u_int camperiphnextunit(struct periph_driver *p_drv, u_int newunit, int wired, diff --git a/sys/bus/cam/cam_queue.c b/sys/bus/cam/cam_queue.c index 8bb281cc6d..c3c7cd26a9 100644 --- a/sys/bus/cam/cam_queue.c +++ b/sys/bus/cam/cam_queue.c @@ -26,17 +26,17 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/cam_queue.c,v 1.5 1999/08/28 00:40:41 peter Exp $ - * $DragonFly: src/sys/bus/cam/cam_queue.c,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/bus/cam/cam_queue.c,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ #include #include #include #include -#include -#include -#include -#include +#include "cam.h" +#include "cam_ccb.h" +#include "cam_queue.h" +#include "cam_debug.h" static __inline int queue_cmp(cam_pinfo **queue_array, int i, int j); diff --git a/sys/bus/cam/cam_sim.c b/sys/bus/cam/cam_sim.c index 08f10c055e..2218591437 100644 --- a/sys/bus/cam/cam_sim.c +++ b/sys/bus/cam/cam_sim.c @@ -26,17 +26,17 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/cam_sim.c,v 1.3 1999/08/28 00:40:42 peter Exp $ - * $DragonFly: src/sys/bus/cam/cam_sim.c,v 1.3 2003/07/23 02:30:12 dillon Exp $ + * $DragonFly: src/sys/bus/cam/cam_sim.c,v 1.4 2003/08/07 21:16:44 dillon Exp $ */ #include #include #include -#include -#include -#include -#include +#include "cam.h" +#include "cam_ccb.h" +#include "cam_sim.h" +#include "cam_queue.h" #define CAM_PATH_ANY (u_int32_t)-1 diff --git a/sys/bus/cam/cam_xpt.c b/sys/bus/cam/cam_xpt.c index ecaddedc43..abd2cfc377 100644 --- a/sys/bus/cam/cam_xpt.c +++ b/sys/bus/cam/cam_xpt.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.80.2.18 2002/12/09 17:31:55 gibbs Exp $ - * $DragonFly: src/sys/bus/cam/cam_xpt.c,v 1.5 2003/07/21 05:50:24 dillon Exp $ + * $DragonFly: src/sys/bus/cam/cam_xpt.c,v 1.6 2003/08/07 21:16:44 dillon Exp $ */ #include #include @@ -49,18 +49,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include "cam.h" +#include "cam_ccb.h" +#include "cam_periph.h" +#include "cam_sim.h" +#include "cam_xpt.h" +#include "cam_xpt_sim.h" +#include "cam_xpt_periph.h" +#include "cam_debug.h" + +#include "scsi/scsi_all.h" +#include "scsi/scsi_message.h" +#include "scsi/scsi_pass.h" #include "opt_cam.h" /* Datastructures internal to the xpt layer */ diff --git a/sys/bus/cam/cam_xpt_periph.h b/sys/bus/cam/cam_xpt_periph.h index 831ad552ed..0b21331e2a 100644 --- a/sys/bus/cam/cam_xpt_periph.h +++ b/sys/bus/cam/cam_xpt_periph.h @@ -28,13 +28,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/cam_xpt_periph.h,v 1.3 1999/12/29 04:54:28 peter Exp $ - * $DragonFly: src/sys/bus/cam/cam_xpt_periph.h,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/bus/cam/cam_xpt_periph.h,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ #ifndef _CAM_CAM_XPT_PERIPH_H #define _CAM_CAM_XPT_PERIPH_H 1 -#include +#include "cam_xpt.h" /* Functions accessed by the peripheral drivers */ #ifdef _KERNEL diff --git a/sys/bus/cam/cam_xpt_sim.h b/sys/bus/cam/cam_xpt_sim.h index b75dde07c4..244afb753f 100644 --- a/sys/bus/cam/cam_xpt_sim.h +++ b/sys/bus/cam/cam_xpt_sim.h @@ -27,14 +27,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/cam_xpt_sim.h,v 1.7 2000/01/14 23:08:46 gibbs Exp $ - * $DragonFly: src/sys/bus/cam/cam_xpt_sim.h,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/bus/cam/cam_xpt_sim.h,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ #ifndef _CAM_CAM_XPT_SIM_H #define _CAM_CAM_XPT_SIM_H 1 -#include -#include +#include "cam_xpt.h" +#include "cam_queue.h" /* Functions accessed by SIM drivers */ #ifdef _KERNEL diff --git a/sys/bus/cam/scsi/scsi_all.c b/sys/bus/cam/scsi/scsi_all.c index 362c2f62cc..bfe520314d 100644 --- a/sys/bus/cam/scsi/scsi_all.c +++ b/sys/bus/cam/scsi/scsi_all.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.14.2.9 2002/10/21 05:38:11 simokawa Exp $ - * $DragonFly: src/sys/bus/cam/scsi/scsi_all.c,v 1.2 2003/06/17 04:28:18 dillon Exp $ + * $DragonFly: src/sys/bus/cam/scsi/scsi_all.c,v 1.3 2003/08/07 21:16:44 dillon Exp $ */ #include @@ -42,13 +42,13 @@ #include #endif -#include -#include -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_xpt.h" +#include "../cam_xpt_periph.h" +#include "scsi_all.h" #ifndef _KERNEL -#include +#include #ifndef FALSE #define FALSE 0 diff --git a/sys/bus/cam/scsi/scsi_cd.c b/sys/bus/cam/scsi/scsi_cd.c index 67d65c42c8..f5c001348b 100644 --- a/sys/bus/cam/scsi/scsi_cd.c +++ b/sys/bus/cam/scsi/scsi_cd.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.31.2.13 2002/11/25 05:30:31 njl Exp $ - * $DragonFly: src/sys/bus/cam/scsi/scsi_cd.c,v 1.8 2003/07/27 01:49:48 hmp Exp $ + * $DragonFly: src/sys/bus/cam/scsi/scsi_cd.c,v 1.9 2003/08/07 21:16:44 dillon Exp $ */ /* * Portions of this driver taken from the original FreeBSD cd driver. @@ -65,16 +65,16 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_extend.h" +#include "../cam_periph.h" +#include "../cam_xpt_periph.h" +#include "../cam_queue.h" -#include -#include -#include +#include "scsi_message.h" +#include "scsi_da.h" +#include "scsi_cd.h" #define LEADOUT 0xaa /* leadout toc entry */ diff --git a/sys/bus/cam/scsi/scsi_ch.c b/sys/bus/cam/scsi/scsi_ch.c index 98e560b91b..4f28d10d3a 100644 --- a/sys/bus/cam/scsi/scsi_ch.c +++ b/sys/bus/cam/scsi/scsi_ch.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.20.2.2 2000/10/31 08:09:49 dwmalone Exp $ - * $DragonFly: src/sys/bus/cam/scsi/scsi_ch.c,v 1.5 2003/07/21 05:50:24 dillon Exp $ + * $DragonFly: src/sys/bus/cam/scsi/scsi_ch.c,v 1.6 2003/08/07 21:16:44 dillon Exp $ */ /* * Derived from the NetBSD SCSI changer driver. @@ -83,17 +83,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_extend.h" +#include "../cam_periph.h" +#include "../cam_xpt_periph.h" +#include "../cam_queue.h" +#include "../cam_debug.h" + +#include "scsi_all.h" +#include "scsi_message.h" +#include "scsi_ch.h" /* * Timeout definitions for various changer related commands. They may diff --git a/sys/bus/cam/scsi/scsi_da.c b/sys/bus/cam/scsi/scsi_da.c index adc33d0ac9..b924ee9982 100644 --- a/sys/bus/cam/scsi/scsi_da.c +++ b/sys/bus/cam/scsi/scsi_da.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.42.2.36 2003/05/17 21:48:30 njl Exp $ - * $DragonFly: src/sys/bus/cam/scsi/scsi_da.c,v 1.7 2003/07/22 17:03:18 dillon Exp $ + * $DragonFly: src/sys/bus/cam/scsi/scsi_da.c,v 1.8 2003/08/07 21:16:45 dillon Exp $ */ #ifdef _KERNEL @@ -62,16 +62,16 @@ #include #endif /* _KERNEL */ -#include -#include -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_extend.h" +#include "../cam_periph.h" +#include "../cam_xpt_periph.h" -#include +#include "scsi_message.h" #ifndef _KERNEL -#include +#include "scsi_da.h" #endif /* !_KERNEL */ #ifdef _KERNEL diff --git a/sys/bus/cam/scsi/scsi_low.c b/sys/bus/cam/scsi/scsi_low.c index cd45df175c..5e43dedb95 100644 --- a/sys/bus/cam/scsi/scsi_low.c +++ b/sys/bus/cam/scsi/scsi_low.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.1.2.4 2001/12/17 13:30:20 non Exp $ */ -/* $DragonFly: src/sys/bus/cam/scsi/scsi_low.c,v 1.2 2003/06/17 04:28:19 dillon Exp $ */ +/* $DragonFly: src/sys/bus/cam/scsi/scsi_low.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ */ /* $NecBSD: scsi_low.c,v 1.24.10.8 2001/06/26 07:39:44 honda Exp $ */ /* $NetBSD$ */ @@ -105,16 +105,16 @@ #endif /* __NetBSD__ */ #ifdef __FreeBSD__ -#include -#include -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_sim.h" +#include "../cam_debug.h" +#include "../cam_periph.h" -#include -#include +#include "scsi_all.h" +#include "scsi_message.h" -#include +#include "scsi_low.h" #include #endif /* __FreeBSD__ */ diff --git a/sys/bus/cam/scsi/scsi_low.h b/sys/bus/cam/scsi/scsi_low.h index 4ad7cb75ad..6e2dfa3a4f 100644 --- a/sys/bus/cam/scsi/scsi_low.h +++ b/sys/bus/cam/scsi/scsi_low.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/cam/scsi/scsi_low.h,v 1.1.2.4 2001/07/22 00:21:41 non Exp $ */ -/* $DragonFly: src/sys/bus/cam/scsi/scsi_low.h,v 1.2 2003/06/17 04:28:19 dillon Exp $ */ +/* $DragonFly: src/sys/bus/cam/scsi/scsi_low.h,v 1.3 2003/08/07 21:16:45 dillon Exp $ */ /* $NecBSD: scsi_low.h,v 1.24.10.5 2001/06/26 07:31:46 honda Exp $ */ /* $NetBSD$ */ @@ -67,13 +67,13 @@ #ifdef __FreeBSD__ #include -#include -#include -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_sim.h" +#include "../cam_xpt_sim.h" +#include "../cam_debug.h" -#include +#include "scsi_dvcfg.h" #include #endif /* __FreeBSD__ */ diff --git a/sys/bus/cam/scsi/scsi_low_pisa.c b/sys/bus/cam/scsi/scsi_low_pisa.c index f7ce05c934..9d641f9411 100644 --- a/sys/bus/cam/scsi/scsi_low_pisa.c +++ b/sys/bus/cam/scsi/scsi_low_pisa.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/cam/scsi/scsi_low_pisa.c,v 1.2.2.4 2001/12/17 13:30:20 non Exp $ */ -/* $DragonFly: src/sys/bus/cam/scsi/scsi_low_pisa.c,v 1.2 2003/06/17 04:28:19 dillon Exp $ */ +/* $DragonFly: src/sys/bus/cam/scsi/scsi_low_pisa.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ */ /* $NecBSD: scsi_low_pisa.c,v 1.13 1998/11/26 14:26:11 honda Exp $ */ /* $NetBSD$ */ @@ -129,8 +129,8 @@ scsi_low_notify_pisa(dh, ev) #include #include -#include -#include +#include "scsi_low.h" +#include "scsi_low_pisa.h" int scsi_low_deactivate_pisa(sc) diff --git a/sys/bus/cam/scsi/scsi_pass.c b/sys/bus/cam/scsi/scsi_pass.c index 653af26289..25fe822ddc 100644 --- a/sys/bus/cam/scsi/scsi_pass.c +++ b/sys/bus/cam/scsi/scsi_pass.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.19 2000/01/17 06:27:37 mjacob Exp $ - * $DragonFly: src/sys/bus/cam/scsi/scsi_pass.c,v 1.7 2003/07/27 01:49:48 hmp Exp $ + * $DragonFly: src/sys/bus/cam/scsi/scsi_pass.c,v 1.8 2003/08/07 21:16:45 dillon Exp $ */ #include @@ -44,17 +44,17 @@ #include #include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_extend.h" +#include "../cam_periph.h" +#include "../cam_xpt_periph.h" +#include "../cam_debug.h" + +#include "scsi_all.h" +#include "scsi_message.h" +#include "scsi_da.h" +#include "scsi_pass.h" typedef enum { PASS_FLAG_OPEN = 0x01, diff --git a/sys/bus/cam/scsi/scsi_pass.h b/sys/bus/cam/scsi/scsi_pass.h index b86159d4b7..0f6764e91d 100644 --- a/sys/bus/cam/scsi/scsi_pass.h +++ b/sys/bus/cam/scsi/scsi_pass.h @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/scsi/scsi_pass.h,v 1.3 1999/08/28 00:40:48 peter Exp $ - * $DragonFly: src/sys/bus/cam/scsi/scsi_pass.h,v 1.2 2003/06/17 04:28:19 dillon Exp $ + * $DragonFly: src/sys/bus/cam/scsi/scsi_pass.h,v 1.3 2003/08/07 21:16:45 dillon Exp $ */ #ifndef _SCSI_PASS_H @@ -31,7 +31,7 @@ #include -#include +#include "../cam_ccb.h" #define CAMIOCOMMAND _IOWR(CAM_VERSION, 2, union ccb) #define CAMGETPASSTHRU _IOWR(CAM_VERSION, 3, union ccb) diff --git a/sys/bus/cam/scsi/scsi_pt.c b/sys/bus/cam/scsi/scsi_pt.c index 4241688f6c..aa9149d1dd 100644 --- a/sys/bus/cam/scsi/scsi_pt.c +++ b/sys/bus/cam/scsi/scsi_pt.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.17 2000/01/17 06:27:37 mjacob Exp $ - * $DragonFly: src/sys/bus/cam/scsi/scsi_pt.c,v 1.6 2003/07/23 02:30:14 dillon Exp $ + * $DragonFly: src/sys/bus/cam/scsi/scsi_pt.c,v 1.7 2003/08/07 21:16:45 dillon Exp $ */ #include @@ -41,16 +41,16 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_extend.h" +#include "../cam_periph.h" +#include "../cam_xpt_periph.h" +#include "../cam_debug.h" -#include -#include -#include +#include "scsi_all.h" +#include "scsi_message.h" +#include "scsi_pt.h" #include "opt_pt.h" diff --git a/sys/bus/cam/scsi/scsi_sa.c b/sys/bus/cam/scsi/scsi_sa.c index 6f2d308782..158e98bdc4 100644 --- a/sys/bus/cam/scsi/scsi_sa.c +++ b/sys/bus/cam/scsi/scsi_sa.c @@ -1,6 +1,6 @@ /* * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.45.2.13 2002/12/17 17:08:50 trhodes Exp $ - * $DragonFly: src/sys/bus/cam/scsi/scsi_sa.c,v 1.6 2003/07/21 05:50:24 dillon Exp $ + * $DragonFly: src/sys/bus/cam/scsi/scsi_sa.c,v 1.7 2003/08/07 21:16:45 dillon Exp $ * * Implementation of SCSI Sequential Access Peripheral driver for CAM. * @@ -51,16 +51,16 @@ #include #endif -#include -#include -#include -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_extend.h" +#include "../cam_periph.h" +#include "../cam_xpt_periph.h" +#include "../cam_debug.h" -#include -#include -#include +#include "scsi_all.h" +#include "scsi_message.h" +#include "scsi_sa.h" #ifdef _KERNEL diff --git a/sys/bus/cam/scsi/scsi_ses.c b/sys/bus/cam/scsi/scsi_ses.c index 3b797ba8c6..bba6850459 100644 --- a/sys/bus/cam/scsi/scsi_ses.c +++ b/sys/bus/cam/scsi/scsi_ses.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.8.2.2 2000/08/08 23:19:21 mjacob Exp $ */ -/* $DragonFly: src/sys/bus/cam/scsi/scsi_ses.c,v 1.5 2003/07/21 07:57:36 dillon Exp $ */ +/* $DragonFly: src/sys/bus/cam/scsi/scsi_ses.c,v 1.6 2003/08/07 21:16:45 dillon Exp $ */ /* * Copyright (c) 2000 Matthew Jacob * All rights reserved. @@ -40,18 +40,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_extend.h" +#include "../cam_periph.h" +#include "../cam_xpt_periph.h" +#include "../cam_queue.h" +#include "../cam_debug.h" -#include -#include +#include "scsi_all.h" +#include "scsi_message.h" #include -#include +#include "scsi_ses.h" #include diff --git a/sys/bus/cam/scsi/scsi_targ_bh.c b/sys/bus/cam/scsi/scsi_targ_bh.c index 74a8173ae4..7e6aef672d 100644 --- a/sys/bus/cam/scsi/scsi_targ_bh.c +++ b/sys/bus/cam/scsi/scsi_targ_bh.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.4.2.5 2001/07/30 00:15:22 mjacob Exp $ - * $DragonFly: src/sys/bus/cam/scsi/scsi_targ_bh.c,v 1.3 2003/07/27 01:49:48 hmp Exp $ + * $DragonFly: src/sys/bus/cam/scsi/scsi_targ_bh.c,v 1.4 2003/08/07 21:16:45 dillon Exp $ */ #include #include @@ -39,16 +39,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_extend.h" +#include "../cam_periph.h" +#include "../cam_queue.h" +#include "../cam_xpt_periph.h" +#include "../cam_debug.h" -#include -#include +#include "scsi_all.h" +#include "scsi_message.h" typedef enum { TARGBH_STATE_NORMAL, diff --git a/sys/bus/cam/scsi/scsi_target.c b/sys/bus/cam/scsi/scsi_target.c index 47ba243af9..959c1fe2cf 100644 --- a/sys/bus/cam/scsi/scsi_target.c +++ b/sys/bus/cam/scsi/scsi_target.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.22.2.7 2003/02/18 22:07:10 njl Exp $ - * $DragonFly: src/sys/bus/cam/scsi/scsi_target.c,v 1.4 2003/07/21 05:50:24 dillon Exp $ + * $DragonFly: src/sys/bus/cam/scsi/scsi_target.c,v 1.5 2003/08/07 21:16:45 dillon Exp $ */ #include @@ -39,11 +39,11 @@ #include #include -#include -#include -#include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" +#include "../cam_periph.h" +#include "../cam_xpt_periph.h" +#include "scsi_targetio.h" /* Transaction information attached to each CCB sent by the user */ struct targ_cmd_descr { diff --git a/sys/bus/cam/scsi/scsi_targetio.h b/sys/bus/cam/scsi/scsi_targetio.h index 021a523215..9c05b68dff 100644 --- a/sys/bus/cam/scsi/scsi_targetio.h +++ b/sys/bus/cam/scsi/scsi_targetio.h @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/cam/scsi/scsi_targetio.h,v 1.5.2.3 2003/02/18 22:07:10 njl Exp $ - * $DragonFly: src/sys/bus/cam/scsi/scsi_targetio.h,v 1.2 2003/06/17 04:28:19 dillon Exp $ + * $DragonFly: src/sys/bus/cam/scsi/scsi_targetio.h,v 1.3 2003/08/07 21:16:45 dillon Exp $ */ #ifndef _CAM_SCSI_SCSI_TARGETIO_H_ @@ -37,8 +37,8 @@ #endif #include -#include -#include +#include "../cam.h" +#include "../cam_ccb.h" /* * CCBs (ATIO, CTIO, INOT, REL_SIMQ) are sent to the kernel driver diff --git a/sys/bus/canbus/canbus.c b/sys/bus/canbus/canbus.c index 470d3f8bd0..f5ddf0721a 100644 --- a/sys/bus/canbus/canbus.c +++ b/sys/bus/canbus/canbus.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pc98/pc98/canbus.c,v 1.3.2.1 2003/02/10 13:11:51 nyan Exp $ - * $DragonFly: src/sys/bus/canbus/Attic/canbus.c,v 1.2 2003/06/17 04:28:55 dillon Exp $ + * $DragonFly: src/sys/bus/canbus/Attic/canbus.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ */ #include @@ -42,8 +42,8 @@ #include #include -#include -#include +#include "canbus.h" +#include "canbusvars.h" #include "canbus_if.h" diff --git a/sys/bus/eisa/eisaconf.c b/sys/bus/eisa/eisaconf.c index 38c98be1fd..85a23f7ca9 100644 --- a/sys/bus/eisa/eisaconf.c +++ b/sys/bus/eisa/eisaconf.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.55 2000/01/14 07:13:57 peter Exp $ - * $DragonFly: src/sys/bus/eisa/eisaconf.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/bus/eisa/eisaconf.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ */ #include "opt_eisa.h" @@ -47,7 +47,7 @@ #include #include -#include +#include "eisaconf.h" typedef struct resvaddr { u_long addr; /* start address */ diff --git a/sys/bus/firewire/firewire.c b/sys/bus/firewire/firewire.c index 2b018d0f92..4278c2c1ec 100644 --- a/sys/bus/firewire/firewire.c +++ b/sys/bus/firewire/firewire.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/firewire.c,v 1.3.2.22 2003/05/12 04:16:30 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/firewire.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/firewire.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ * */ @@ -54,11 +54,11 @@ #include /* used by smbus and newbus */ #include -#include -#include -#include -#include -#include +#include "firewire.h" +#include "firewirereg.h" +#include "fwmem.h" +#include "iec13213.h" +#include "iec68113.h" int firewire_debug=0, try_bmr=1; SYSCTL_INT(_debug, OID_AUTO, firewire_debug, CTLFLAG_RW, &firewire_debug, 0, diff --git a/sys/bus/firewire/fwcrom.c b/sys/bus/firewire/fwcrom.c index f2aaadfc72..72a501d4ae 100644 --- a/sys/bus/firewire/fwcrom.c +++ b/sys/bus/firewire/fwcrom.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/fwcrom.c,v 1.2.2.2 2003/04/28 03:29:18 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/fwcrom.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwcrom.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ */ #include @@ -50,8 +50,8 @@ #include #include #endif -#include -#include +#include "firewire.h" +#include "iec13213.h" void crom_init_context(struct crom_context *cc, u_int32_t *p) diff --git a/sys/bus/firewire/fwdev.c b/sys/bus/firewire/fwdev.c index f1d6d65810..658307c3e4 100644 --- a/sys/bus/firewire/fwdev.c +++ b/sys/bus/firewire/fwdev.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.2.4.11 2003/04/28 03:29:18 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/fwdev.c,v 1.4 2003/07/21 05:50:30 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwdev.c,v 1.5 2003/08/07 21:16:45 dillon Exp $ * */ @@ -52,11 +52,11 @@ #include -#include -#include -#include -#include -#include +#include "firewire.h" +#include "firewirereg.h" +#include "fwdma.h" +#include "fwmem.h" +#include "iec68113.h" #define CDEV_MAJOR 127 #define FWNODE_INVAL 0xffff diff --git a/sys/bus/firewire/fwdma.c b/sys/bus/firewire/fwdma.c index a8a60255b3..af61f35918 100644 --- a/sys/bus/firewire/fwdma.c +++ b/sys/bus/firewire/fwdma.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/fwdma.c,v 1.1.2.1 2003/04/28 03:29:18 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/fwdma.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwdma.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ */ #include #include @@ -43,9 +43,9 @@ #include #include -#include -#include -#include +#include "firewire.h" +#include "firewirereg.h" +#include "fwdma.h" static void fwdma_map_cb(void *arg, bus_dma_segment_t *segs, int nseg, int error) diff --git a/sys/bus/firewire/fwmem.c b/sys/bus/firewire/fwmem.c index cc7728cbcd..e2dcec26da 100644 --- a/sys/bus/firewire/fwmem.c +++ b/sys/bus/firewire/fwmem.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/fwmem.c,v 1.1.2.9 2003/04/28 03:29:18 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/fwmem.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwmem.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ */ #include @@ -51,9 +51,9 @@ #include #include -#include -#include -#include +#include "firewire.h" +#include "firewirereg.h" +#include "fwmem.h" static int fwmem_speed=2, fwmem_debug=0; static struct fw_eui64 fwmem_eui64; diff --git a/sys/bus/firewire/fwohci.c b/sys/bus/firewire/fwohci.c index 4f15e3a90d..91dcee9417 100644 --- a/sys/bus/firewire/fwohci.c +++ b/sys/bus/firewire/fwohci.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/fwohci.c,v 1.1.2.19 2003/05/01 06:24:37 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/fwohci.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwohci.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ * */ @@ -65,17 +65,17 @@ #include /* for rdtsc proto for clock.h below */ #include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include +#include "firewire.h" +#include "firewirereg.h" +#include "fwdma.h" +#include "fwohcireg.h" +#include "fwohcivar.h" +#include "firewire_phy.h" -#include +#include "iec68113.h" #undef OHCI_DEBUG diff --git a/sys/bus/firewire/fwohci_pci.c b/sys/bus/firewire/fwohci_pci.c index 4e4ae45dbc..643efc6d10 100644 --- a/sys/bus/firewire/fwohci_pci.c +++ b/sys/bus/firewire/fwohci_pci.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/fwohci_pci.c,v 1.3.2.11 2003/04/28 03:29:18 simokawa Exp $ - * $DragonFly: src/sys/bus/firewire/fwohci_pci.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/bus/firewire/fwohci_pci.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ */ #define BOUNCE_BUFFER_TEST 0 @@ -48,15 +48,15 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "firewire.h" +#include "firewirereg.h" -#include -#include -#include +#include "fwdma.h" +#include "fwohcireg.h" +#include "fwohcivar.h" static int fwohci_pci_attach(device_t self); static int fwohci_pci_detach(device_t self); diff --git a/sys/bus/iicbus/i386/pcf.c b/sys/bus/iicbus/i386/pcf.c index 49f116f8c9..b7ac92dddc 100644 --- a/sys/bus/iicbus/i386/pcf.c +++ b/sys/bus/iicbus/i386/pcf.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/pcf.c,v 1.14 2000/01/14 00:18:05 nsouch Exp $ - * $DragonFly: src/sys/bus/iicbus/i386/pcf.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/bus/iicbus/i386/pcf.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ * */ #include @@ -39,12 +39,12 @@ #include #include -#include -#include +#include +#include -#include +#include -#include +#include "../iiconf.h" #include "iicbus_if.h" #define IO_PCFSIZE 2 diff --git a/sys/bus/iicbus/iic.c b/sys/bus/iicbus/iic.c index 2dd5b187a5..bfd2b1852e 100644 --- a/sys/bus/iicbus/iic.c +++ b/sys/bus/iicbus/iic.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/iicbus/iic.c,v 1.18 1999/11/18 05:43:32 peter Exp $ - * $DragonFly: src/sys/bus/iicbus/iic.c,v 1.4 2003/07/21 07:57:41 dillon Exp $ + * $DragonFly: src/sys/bus/iicbus/iic.c,v 1.5 2003/08/07 21:16:45 dillon Exp $ * */ #include @@ -40,8 +40,8 @@ #include -#include -#include +#include "iiconf.h" +#include "iicbus.h" #include diff --git a/sys/bus/iicbus/iicbb.c b/sys/bus/iicbus/iicbb.c index a0c34dc32f..d98d7ff7e2 100644 --- a/sys/bus/iicbus/iicbb.c +++ b/sys/bus/iicbus/iicbb.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/iicbus/iicbb.c,v 1.6.2.2 2002/04/19 05:52:12 nsouch Exp $ - * $DragonFly: src/sys/bus/iicbus/iicbb.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * $DragonFly: src/sys/bus/iicbus/iicbb.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ * */ @@ -57,10 +57,10 @@ #include -#include -#include +#include "iiconf.h" +#include "iicbus.h" -#include +#include #include "iicbus_if.h" #include "iicbb_if.h" diff --git a/sys/bus/iicbus/iicbus.c b/sys/bus/iicbus/iicbus.c index 19a5579bd5..09ad2ce2b4 100644 --- a/sys/bus/iicbus/iicbus.c +++ b/sys/bus/iicbus/iicbus.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/iicbus/iicbus.c,v 1.13 1999/12/03 08:41:02 mdodd Exp $ - * $DragonFly: src/sys/bus/iicbus/iicbus.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * $DragonFly: src/sys/bus/iicbus/iicbus.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ * */ @@ -40,8 +40,8 @@ #include -#include -#include +#include "iiconf.h" +#include "iicbus.h" #include "iicbus_if.h" diff --git a/sys/bus/iicbus/iiconf.c b/sys/bus/iicbus/iiconf.c index 61f8817897..55aed6eec5 100644 --- a/sys/bus/iicbus/iiconf.c +++ b/sys/bus/iicbus/iiconf.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/iicbus/iiconf.c,v 1.10 1999/12/03 08:41:02 mdodd Exp $ - * $DragonFly: src/sys/bus/iicbus/iiconf.c,v 1.3 2003/07/19 21:14:22 dillon Exp $ + * $DragonFly: src/sys/bus/iicbus/iiconf.c,v 1.4 2003/08/07 21:16:45 dillon Exp $ * */ #include @@ -34,8 +34,8 @@ #include #include -#include -#include +#include "iiconf.h" +#include "iicbus.h" #include "iicbus_if.h" /* diff --git a/sys/bus/iicbus/iicsmb.c b/sys/bus/iicbus/iicsmb.c index 9f64eac3a0..1c7cff7b70 100644 --- a/sys/bus/iicbus/iicsmb.c +++ b/sys/bus/iicbus/iicsmb.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/iicbus/iicsmb.c,v 1.5.2.2 2000/08/09 00:59:27 peter Exp $ - * $DragonFly: src/sys/bus/iicbus/iicsmb.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * $DragonFly: src/sys/bus/iicbus/iicsmb.c,v 1.3 2003/08/07 21:16:45 dillon Exp $ * */ @@ -58,10 +58,10 @@ #include -#include -#include +#include "iiconf.h" +#include "iicbus.h" -#include +#include #include "iicbus_if.h" #include "smbus_if.h" diff --git a/sys/bus/isa/i386/isa.c b/sys/bus/isa/i386/isa.c index f3e455260c..989dc8caea 100644 --- a/sys/bus/isa/i386/isa.c +++ b/sys/bus/isa/i386/isa.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/isa.c,v 1.132.2.5 2002/03/03 05:42:50 nyan Exp $ - * $DragonFly: src/sys/bus/isa/i386/isa.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/bus/isa/i386/isa.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ /* @@ -65,8 +65,8 @@ #include -#include -#include +#include "../isavar.h" +#include "../isa_common.h" void isa_init(void) diff --git a/sys/bus/isa/i386/isa_compat.c b/sys/bus/isa/i386/isa_compat.c index db8a5f871f..afe124ea92 100644 --- a/sys/bus/isa/i386/isa_compat.c +++ b/sys/bus/isa/i386/isa_compat.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/isa_compat.c,v 1.18.2.1 2001/05/17 23:05:06 imp Exp $ - * $DragonFly: src/sys/bus/isa/i386/isa_compat.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/bus/isa/i386/isa_compat.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ #include @@ -43,9 +43,9 @@ #include #include -#include -#include -#include +#include "../isavar.h" +#include "isa_compat.h" +#include "isa_device.h" struct isa_compat_resources { struct resource *ports; diff --git a/sys/bus/isa/i386/isa_compat.h b/sys/bus/isa/i386/isa_compat.h index 0485a44ca3..33e11a20db 100644 --- a/sys/bus/isa/i386/isa_compat.h +++ b/sys/bus/isa/i386/isa_compat.h @@ -24,49 +24,48 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/isa_compat.h,v 1.27.2.11 2002/10/05 18:31:48 scottl Exp $ - * $DragonFly: src/sys/bus/isa/i386/isa_compat.h,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/bus/isa/i386/isa_compat.h,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ -#include "vt.h" -#include "wdc.h" -#include "cx.h" -#include "el.h" -#include "le.h" -#include "lnc.h" -#include "rdp.h" -#include "wl.h" -#include "pcm.h" -#include "pas.h" -#include "sb.h" -#include "sbxvi.h" -#include "sbmidi.h" -#include "awe.h" -#include "gus.h" -#include "mss.h" -#include "css.h" -#include "sscape.h" -#include "trix.h" -#include "opl.h" -#include "mpu.h" -#include "uart.h" -#include "mcd.h" -#include "scd.h" -#include "wt.h" -#include "ctx.h" -#include "spigot.h" -#include "gp.h" -#include "gsc.h" -#include "cy.h" -#include "dgb.h" -#include "labpc.h" -#include "rc.h" -#include "rp.h" -#include "tw.h" -#include "asc.h" -#include "stl.h" -#include "stli.h" -#include "loran.h" -#include "fla.h" +#include "use_vt.h" +#include "use_wdc.h" +#include "use_cx.h" +#include "use_el.h" +#include "use_le.h" +#include "use_lnc.h" +#include "use_rdp.h" +#include "use_wl.h" +#include "use_pcm.h" +#include "use_pas.h" +#include "use_sb.h" +#include "use_sbxvi.h" +#include "use_sbmidi.h" +#include "use_awe.h" +#include "use_gus.h" +#include "use_mss.h" +#include "use_css.h" +#include "use_sscape.h" +#include "use_trix.h" +#include "use_opl.h" +#include "use_mpu.h" +#include "use_uart.h" +#include "use_mcd.h" +#include "use_scd.h" +#include "use_wt.h" +#include "use_ctx.h" +#include "use_spigot.h" +#include "use_gp.h" +#include "use_gsc.h" +#include "use_cy.h" +#include "use_dgb.h" +#include "use_labpc.h" +#include "use_rc.h" +#include "use_rp.h" +#include "use_tw.h" +#include "use_asc.h" +#include "use_stl.h" +#include "use_stli.h" +#include "use_fla.h" struct old_isa_driver { int type; diff --git a/sys/bus/isa/i386/isa_device.h b/sys/bus/isa/i386/isa_device.h index 0c9417cd39..f567152832 100644 --- a/sys/bus/isa/i386/isa_device.h +++ b/sys/bus/isa/i386/isa_device.h @@ -32,7 +32,7 @@ * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/isa/isa_device.h,v 1.68 2000/01/29 18:01:10 peter Exp $ - * $DragonFly: src/sys/bus/isa/i386/isa_device.h,v 1.3 2003/06/29 03:28:43 dillon Exp $ + * $DragonFly: src/sys/bus/isa/i386/isa_device.h,v 1.4 2003/08/07 21:16:46 dillon Exp $ */ #ifndef _I386_ISA_ISA_DEVICE_H_ @@ -40,7 +40,7 @@ #ifdef _KERNEL #ifndef _ISA_ISAVAR_H_ -#include +#include "isa_dma.h" #endif #endif #ifndef _SYS_INTERRUPT_H_ diff --git a/sys/bus/isa/i386/isa_dma.c b/sys/bus/isa/i386/isa_dma.c index cba7a2216e..298e0a9657 100644 --- a/sys/bus/isa/i386/isa_dma.c +++ b/sys/bus/isa/i386/isa_dma.c @@ -35,7 +35,7 @@ * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * $FreeBSD: src/sys/i386/isa/isa_dma.c,v 1.4.2.1 2000/08/08 19:49:53 peter Exp $ - * $DragonFly: src/sys/bus/isa/i386/isa_dma.c,v 1.3 2003/07/06 21:23:49 dillon Exp $ + * $DragonFly: src/sys/bus/isa/i386/isa_dma.c,v 1.4 2003/08/07 21:16:46 dillon Exp $ */ /* @@ -54,8 +54,8 @@ #include #include #include -#include -#include +#include "isa.h" +#include "isa_dma.h" #include /* diff --git a/sys/bus/isa/isa_common.c b/sys/bus/isa/isa_common.c index 06427e1055..943e2dc7ff 100644 --- a/sys/bus/isa/isa_common.c +++ b/sys/bus/isa/isa_common.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/isa_common.c,v 1.16.2.1 2000/09/16 15:49:52 roger Exp $ - * $DragonFly: src/sys/bus/isa/isa_common.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/bus/isa/isa_common.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ /* * Modifications for Intel architecture by Garrett A. Wollman. @@ -71,10 +71,10 @@ #include -#include -#include +#include "isavar.h" +#include "isa_common.h" #ifdef __alpha__ /* XXX workaround a stupid warning */ -#include +#include "isavar.h" #endif static int isa_print_child __P((device_t, device_t)); diff --git a/sys/bus/isa/isa_if.m b/sys/bus/isa/isa_if.m index 79c64e2451..1656d54a91 100644 --- a/sys/bus/isa/isa_if.m +++ b/sys/bus/isa/isa_if.m @@ -24,11 +24,11 @@ # SUCH DAMAGE. # # $FreeBSD: src/sys/isa/isa_if.m,v 1.5 1999/10/12 21:35:48 dfr Exp $ -# $DragonFly: src/sys/bus/isa/isa_if.m,v 1.2 2003/06/17 04:28:40 dillon Exp $ +# $DragonFly: src/sys/bus/isa/isa_if.m,v 1.3 2003/08/07 21:16:46 dillon Exp $ # CODE { -#include +#include }; INTERFACE isa; diff --git a/sys/bus/isa/isahint.c b/sys/bus/isa/isahint.c index 602fb335ba..56ff97af82 100644 --- a/sys/bus/isa/isahint.c +++ b/sys/bus/isa/isahint.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/isahint.c,v 1.8.2.1 2001/03/21 11:18:25 nyan Exp $ - * $DragonFly: src/sys/bus/isa/isahint.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/bus/isa/isahint.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ #include @@ -32,7 +32,7 @@ #include #include #include -#include +#include "isavar.h" #include static void diff --git a/sys/bus/isa/isavar.h b/sys/bus/isa/isavar.h index b5f96297d0..9d2feadf3f 100644 --- a/sys/bus/isa/isavar.h +++ b/sys/bus/isa/isavar.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/isavar.h,v 1.16.2.2 2000/10/29 13:07:56 nyan Exp $ - * $DragonFly: src/sys/bus/isa/isavar.h,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/bus/isa/isavar.h,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ #ifndef _ISA_ISAVAR_H_ @@ -35,7 +35,7 @@ struct isa_pnp_id; typedef void isa_config_cb(void *arg, struct isa_config *config, int enable); #include "isa_if.h" -#include +#include "pnpvar.h" #ifdef _KERNEL diff --git a/sys/bus/isa/pnp.c b/sys/bus/isa/pnp.c index fe18fa740c..784c273822 100644 --- a/sys/bus/isa/pnp.c +++ b/sys/bus/isa/pnp.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/pnp.c,v 1.5.2.1 2002/10/14 09:31:09 nyan Exp $ - * $DragonFly: src/sys/bus/isa/pnp.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/bus/isa/pnp.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ * from: pnp.c,v 1.11 1999/05/06 22:11:19 peter Exp */ @@ -34,9 +34,9 @@ #include #include #include -#include -#include -#include +#include "isavar.h" +#include "pnpreg.h" +#include "pnpvar.h" #include typedef struct _pnp_id { diff --git a/sys/bus/isa/pnpparse.c b/sys/bus/isa/pnpparse.c index 43e5e41cfb..692e75a63c 100644 --- a/sys/bus/isa/pnpparse.c +++ b/sys/bus/isa/pnpparse.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/pnpparse.c,v 1.2.2.3 2000/11/07 05:53:55 msmith Exp $ - * $DragonFly: src/sys/bus/isa/pnpparse.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/bus/isa/pnpparse.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ #include @@ -33,9 +33,9 @@ #include #include #include -#include -#include -#include +#include "isavar.h" +#include "pnpreg.h" +#include "pnpvar.h" #define MAXDEP 8 diff --git a/sys/bus/isa/syscons_isa.c b/sys/bus/isa/syscons_isa.c index 90e1f578d9..fd8ec69186 100644 --- a/sys/bus/isa/syscons_isa.c +++ b/sys/bus/isa/syscons_isa.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/syscons_isa.c,v 1.11.2.2 2001/08/01 10:42:28 yokota Exp $ - * $DragonFly: src/sys/bus/isa/syscons_isa.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/bus/isa/syscons_isa.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ #include "opt_syscons.h" @@ -56,10 +56,10 @@ #endif /* __i386__ */ -#include +#include -#include -#include +#include "isareg.h" +#include "isavar.h" static devclass_t sc_devclass; diff --git a/sys/bus/isa/vga_isa.c b/sys/bus/isa/vga_isa.c index 64e2749ecb..017cca56c0 100644 --- a/sys/bus/isa/vga_isa.c +++ b/sys/bus/isa/vga_isa.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/vga_isa.c,v 1.17 2000/01/29 15:08:56 peter Exp $ - * $DragonFly: src/sys/bus/isa/vga_isa.c,v 1.5 2003/07/22 17:03:32 dillon Exp $ + * $DragonFly: src/sys/bus/isa/vga_isa.c,v 1.6 2003/08/07 21:16:46 dillon Exp $ */ #include "opt_vga.h" @@ -49,11 +49,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "isareg.h" +#include "isavar.h" #define VGA_SOFTC(unit) \ ((vga_softc_t *)devclass_get_softc(isavga_devclass, unit)) diff --git a/sys/bus/mca/i386/mca_machdep.c b/sys/bus/mca/i386/mca_machdep.c index c0c591a1dd..2d6b933f40 100644 --- a/sys/bus/mca/i386/mca_machdep.c +++ b/sys/bus/mca/i386/mca_machdep.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/mca_machdep.c,v 1.4 2000/01/29 16:17:34 peter Exp $ - * $DragonFly: src/sys/bus/mca/i386/Attic/mca_machdep.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/bus/mca/i386/Attic/mca_machdep.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ #include @@ -38,8 +38,8 @@ #include #include -#include -#include +#include "../mca_busreg.h" +#include "mca_machdep.h" /* Global MCA bus flag */ int MCA_system = 0; diff --git a/sys/bus/mca/mca_bus.c b/sys/bus/mca/mca_bus.c index 65642d62c5..1492f14c04 100644 --- a/sys/bus/mca/mca_bus.c +++ b/sys/bus/mca/mca_bus.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mca/mca_bus.c,v 1.7.2.1 2000/03/17 23:55:48 peter Exp $ - * $DragonFly: src/sys/bus/mca/Attic/mca_bus.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/bus/mca/Attic/mca_bus.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ /* @@ -47,8 +47,8 @@ #include #include -#include -#include +#include "mca_busreg.h" +#include "mca_busvar.h" #include diff --git a/sys/bus/pccard/mecia.c b/sys/bus/pccard/mecia.c index 2cbafffd1d..765a854295 100644 --- a/sys/bus/pccard/mecia.c +++ b/sys/bus/pccard/mecia.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pccard/mecia.c,v 1.2.2.4 2001/08/14 23:36:18 imp Exp $ - * $DragonFly: src/sys/bus/pccard/Attic/mecia.c,v 1.2 2003/06/17 04:28:55 dillon Exp $ + * $DragonFly: src/sys/bus/pccard/Attic/mecia.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ * * Based heavily on the FreeBSD pcic driver's pcic98 support, derived * from PAO3 tree. This copyright notice likely needs modification for @@ -41,17 +41,17 @@ #include #include -#include -#include -#include +#include "meciareg.h" +#include "cardinfo.h" +#include "slot.h" #ifndef MECIA_IOBASE #define MECIA_IOBASE 0x80d0 #endif /* Get pnp IDs */ -#include +#include -#include +#include #include "card_if.h" #define MECIA_DEVICE2SOFTC(dev) ((struct mecia_slot *) device_get_softc(dev)) diff --git a/sys/bus/pccard/pccard.c b/sys/bus/pccard/pccard.c index b4fe2d6005..889ab4d435 100644 --- a/sys/bus/pccard/pccard.c +++ b/sys/bus/pccard/pccard.c @@ -30,7 +30,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pccard/pccard.c,v 1.106.2.15 2003/02/26 18:42:00 imp Exp $ - * $DragonFly: src/sys/bus/pccard/pccard.c,v 1.6 2003/07/27 01:49:53 hmp Exp $ + * $DragonFly: src/sys/bus/pccard/pccard.c,v 1.7 2003/08/07 21:16:46 dillon Exp $ */ #include @@ -46,10 +46,10 @@ #include #include -#include -#include -#include -#include +#include "cardinfo.h" +#include "driver.h" +#include "slot.h" +#include "pccard_nbk.h" #include diff --git a/sys/bus/pccard/pccard_beep.c b/sys/bus/pccard/pccard_beep.c index aa6f2806dc..f864859c32 100644 --- a/sys/bus/pccard/pccard_beep.c +++ b/sys/bus/pccard/pccard_beep.c @@ -4,7 +4,7 @@ * This file is in the public domain. */ /* $FreeBSD: src/sys/pccard/pccard_beep.c,v 1.3.2.3 2001/06/05 19:11:34 imp Exp $ */ -/* $DragonFly: src/sys/bus/pccard/Attic/pccard_beep.c,v 1.2 2003/06/17 04:28:55 dillon Exp $ */ +/* $DragonFly: src/sys/bus/pccard/Attic/pccard_beep.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ #include #include @@ -12,7 +12,7 @@ #include -#include +#include "driver.h" static enum beepstate allow_beep = BEEP_OFF; static int melody_type = 0; diff --git a/sys/bus/pccard/pccard_nbk.c b/sys/bus/pccard/pccard_nbk.c index 699846e980..f34fb33c9c 100644 --- a/sys/bus/pccard/pccard_nbk.c +++ b/sys/bus/pccard/pccard_nbk.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pccard/pccard_nbk.c,v 1.15.2.11 2002/09/22 20:26:58 imp Exp $ - * $DragonFly: src/sys/bus/pccard/Attic/pccard_nbk.c,v 1.2 2003/06/17 04:28:55 dillon Exp $ + * $DragonFly: src/sys/bus/pccard/Attic/pccard_nbk.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ /* @@ -65,13 +65,13 @@ #ifdef PC98 #include #else -#include +#include #endif -#include -#include +#include "cardinfo.h" +#include "slot.h" -#include +#include #include #include "card_if.h" diff --git a/sys/bus/pccard/pcic.c b/sys/bus/pccard/pcic.c index ca1576110d..5dfc126383 100644 --- a/sys/bus/pccard/pcic.c +++ b/sys/bus/pccard/pcic.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pccard/pcic.c,v 1.89.2.28 2003/02/26 18:42:00 imp Exp $ - * $DragonFly: src/sys/bus/pccard/Attic/pcic.c,v 1.2 2003/06/17 04:28:55 dillon Exp $ + * $DragonFly: src/sys/bus/pccard/Attic/pcic.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ #include @@ -39,17 +39,16 @@ #include #include -#include -#include -#include -#include -#include +#include "i82365.h" +#include "pcic_pci.h" +#include "cardinfo.h" +#include "slot.h" +#include "pcicvar.h" /* Get pnp IDs */ -#include -#include - -#include +#include +#include +#include "pccardvar.h" #include "card_if.h" /* diff --git a/sys/bus/pccard/pcic_isa.c b/sys/bus/pccard/pcic_isa.c index 78e03e1d54..95a6eb62c2 100644 --- a/sys/bus/pccard/pcic_isa.c +++ b/sys/bus/pccard/pcic_isa.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pccard/pcic_isa.c,v 1.13.2.8 2003/02/26 18:42:00 imp Exp $ - * $DragonFly: src/sys/bus/pccard/Attic/pcic_isa.c,v 1.2 2003/06/17 04:28:55 dillon Exp $ + * $DragonFly: src/sys/bus/pccard/Attic/pcic_isa.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ #include @@ -32,16 +32,15 @@ #include #include -#include -#include -#include -#include +#include "i82365.h" +#include "cardinfo.h" +#include "slot.h" +#include "pcicvar.h" /* Get pnp IDs */ -#include -#include - -#include +#include +#include +#include "pccardvar.h" #include "card_if.h" static struct isa_pnp_id pcic_ids[] = { diff --git a/sys/bus/pccard/pcic_pci.c b/sys/bus/pccard/pcic_pci.c index 2cdb5ec1c7..c94552a1a7 100644 --- a/sys/bus/pccard/pcic_pci.c +++ b/sys/bus/pccard/pcic_pci.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pccard/pcic_pci.c,v 1.54.2.22 2003/02/26 18:42:00 imp Exp $ - * $DragonFly: src/sys/bus/pccard/Attic/pcic_pci.c,v 1.2 2003/06/17 04:28:55 dillon Exp $ + * $DragonFly: src/sys/bus/pccard/Attic/pcic_pci.c,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ #include @@ -37,21 +37,16 @@ #include #include -#if __FreeBSD_version < 500000 -#include -#include -#else -#include -#include -#endif +#include +#include -#include -#include -#include -#include -#include +#include "pcic_pci.h" +#include "i82365.h" +#include "cardinfo.h" +#include "slot.h" +#include "pcicvar.h" -#include +#include #include "card_if.h" #define PRVERB(x) do { \ diff --git a/sys/bus/pccard/pcic_pci.h b/sys/bus/pccard/pcic_pci.h index 2cbf8516a3..36b55368b5 100644 --- a/sys/bus/pccard/pcic_pci.h +++ b/sys/bus/pccard/pcic_pci.h @@ -27,11 +27,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pccard/pcic_pci.h,v 1.23.2.12 2003/02/26 18:42:00 imp Exp $ - * $DragonFly: src/sys/bus/pccard/Attic/pcic_pci.h,v 1.2 2003/06/17 04:28:55 dillon Exp $ + * $DragonFly: src/sys/bus/pccard/Attic/pcic_pci.h,v 1.3 2003/08/07 21:16:46 dillon Exp $ */ /* Share the devid database with NEWCARD */ -#include +#include /* CL-PD683x CardBus defines */ #define CLPD6833_CFG_MISC_1 0x98 diff --git a/sys/bus/pci/i386/pci_cfgreg.c b/sys/bus/pci/i386/pci_cfgreg.c index 1ea5b54a6b..1eca8a4cb3 100644 --- a/sys/bus/pci/i386/pci_cfgreg.c +++ b/sys/bus/pci/i386/pci_cfgreg.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/pci_cfgreg.c,v 1.1.2.7 2001/11/28 05:47:03 imp Exp $ - * $DragonFly: src/sys/bus/pci/i386/pci_cfgreg.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/bus/pci/i386/pci_cfgreg.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ * */ @@ -39,10 +39,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include "pcibus.h" /* #include */ #include #include diff --git a/sys/bus/pci/i386/pcibus.c b/sys/bus/pci/i386/pcibus.c index 35ff71de42..152ade084a 100644 --- a/sys/bus/pci/i386/pcibus.c +++ b/sys/bus/pci/i386/pcibus.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/pcibus.c,v 1.57.2.11 2002/11/13 21:40:40 peter Exp $ - * $DragonFly: src/sys/bus/pci/i386/pcibus.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/bus/pci/i386/pcibus.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ * */ @@ -33,9 +33,9 @@ #include #include -#include -#include -#include +#include +#include +#include "pcibus.h" #include #include diff --git a/sys/bus/pci/ide_pci.c b/sys/bus/pci/ide_pci.c index 7d87b4f20e..e0682dd1b6 100644 --- a/sys/bus/pci/ide_pci.c +++ b/sys/bus/pci/ide_pci.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/ide_pci.c,v 1.42 2000/01/29 16:59:53 peter Exp $ - * $DragonFly: src/sys/bus/pci/Attic/ide_pci.c,v 1.2 2003/06/17 04:28:56 dillon Exp $ + * $DragonFly: src/sys/bus/pci/Attic/ide_pci.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ */ #include @@ -38,17 +38,17 @@ #include #include -#include +#include #ifdef PC98 #include #else -#include +#include #endif -#include +#include -#include -#include -#include +#include "pcivar.h" +#include "pcireg.h" +#include "ide_pcireg.h" #ifndef MIN #define MIN(a,b) (((a)<(b))?(a):(b)) diff --git a/sys/bus/pci/ohci_pci.c b/sys/bus/pci/ohci_pci.c index 98d7c27cf5..371a3ea119 100644 --- a/sys/bus/pci/ohci_pci.c +++ b/sys/bus/pci/ohci_pci.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/pci/ohci_pci.c,v 1.16.2.5 2002/08/28 20:51:56 joe Exp $ */ -/* $DragonFly: src/sys/bus/pci/Attic/ohci_pci.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ */ +/* $DragonFly: src/sys/bus/pci/Attic/ohci_pci.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -62,16 +62,16 @@ #include #include -#include -#include +#include "pcivar.h" +#include "pcireg.h" -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include #define PCI_OHCI_VENDORID_ACERLABS 0x10b9 #define PCI_OHCI_VENDORID_AMD 0x1022 diff --git a/sys/bus/pci/pci.c b/sys/bus/pci/pci.c index 7d6f4e9b66..1a947bb123 100644 --- a/sys/bus/pci/pci.c +++ b/sys/bus/pci/pci.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/pci.c,v 1.141.2.15 2002/04/30 17:48:18 tmm Exp $ - * $DragonFly: src/sys/bus/pci/pci.c,v 1.4 2003/07/21 05:50:46 dillon Exp $ + * $DragonFly: src/sys/bus/pci/pci.c,v 1.5 2003/08/07 21:16:47 dillon Exp $ * */ @@ -57,8 +57,8 @@ #include #endif -#include -#include +#include "pcireg.h" +#include "pcivar.h" #include #ifdef __alpha__ diff --git a/sys/bus/pci/pci_compat.c b/sys/bus/pci/pci_compat.c index 90db78af70..4073666919 100644 --- a/sys/bus/pci/pci_compat.c +++ b/sys/bus/pci/pci_compat.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/pci_compat.c,v 1.35.2.1 2001/10/14 21:14:14 luigi Exp $ - * $DragonFly: src/sys/bus/pci/pci_compat.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/bus/pci/pci_compat.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ * */ @@ -45,8 +45,8 @@ #include #include -#include -#include +#include "pcireg.h" +#include "pcivar.h" #ifdef APIC_IO #include diff --git a/sys/bus/pci/pcisupport.c b/sys/bus/pci/pcisupport.c index 16db28c19a..ddebec621c 100644 --- a/sys/bus/pci/pcisupport.c +++ b/sys/bus/pci/pcisupport.c @@ -1,7 +1,7 @@ /************************************************************************** ** ** $FreeBSD: src/sys/pci/pcisupport.c,v 1.154.2.15 2003/04/29 15:55:06 simokawa Exp $ -** $DragonFly: src/sys/bus/pci/pcisupport.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ +** $DragonFly: src/sys/bus/pci/pcisupport.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ ** ** Device driver for DEC/INTEL PCI chipsets. ** @@ -51,8 +51,8 @@ #include #include -#include -#include +#include "pcivar.h" +#include "pcireg.h" #include #include diff --git a/sys/bus/pci/uhci_pci.c b/sys/bus/pci/uhci_pci.c index 45e0d35b60..a7e2b61d98 100644 --- a/sys/bus/pci/uhci_pci.c +++ b/sys/bus/pci/uhci_pci.c @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/uhci_pci.c,v 1.26.2.8 2003/05/07 16:46:55 jhb Exp $ - * $DragonFly: src/sys/bus/pci/Attic/uhci_pci.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/bus/pci/Attic/uhci_pci.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ */ /* Universal Host Controller Interface @@ -64,16 +64,16 @@ #include #endif -#include -#include +#include "pcivar.h" +#include "pcireg.h" -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include #define PCI_UHCI_VENDORID_INTEL 0x8086 #define PCI_UHCI_VENDORID_VIA 0x1106 diff --git a/sys/bus/ppbus/ppb_1284.c b/sys/bus/ppbus/ppb_1284.c index b6158864c3..d8e734d75e 100644 --- a/sys/bus/ppbus/ppb_1284.c +++ b/sys/bus/ppbus/ppb_1284.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/ppb_1284.c,v 1.11 2000/01/14 08:03:14 nsouch Exp $ - * $DragonFly: src/sys/bus/ppbus/ppb_1284.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/bus/ppbus/ppb_1284.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ * */ @@ -40,12 +40,12 @@ #include -#include -#include +#include "ppbconf.h" +#include "ppb_1284.h" #include "ppbus_if.h" -#include +#include "ppbio.h" #define DEVTOSOFTC(dev) ((struct ppb_data *)device_get_softc(dev)) diff --git a/sys/bus/ppbus/ppb_base.c b/sys/bus/ppbus/ppb_base.c index b5b5f98af3..f2e6de3b36 100644 --- a/sys/bus/ppbus/ppb_base.c +++ b/sys/bus/ppbus/ppb_base.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/ppb_base.c,v 1.10.2.1 2000/08/01 23:26:26 n_hibma Exp $ - * $DragonFly: src/sys/bus/ppbus/ppb_base.c,v 1.4 2003/07/26 14:25:24 rob Exp $ + * $DragonFly: src/sys/bus/ppbus/ppb_base.c,v 1.5 2003/08/07 21:16:47 dillon Exp $ * */ #include @@ -35,11 +35,11 @@ #include -#include +#include "ppbconf.h" #include "ppbus_if.h" -#include +#include "ppbio.h" #define DEVTOSOFTC(dev) ((struct ppb_data *)device_get_softc(dev)) diff --git a/sys/bus/ppbus/ppb_msq.c b/sys/bus/ppbus/ppb_msq.c index 70806734d8..fec6da1edd 100644 --- a/sys/bus/ppbus/ppb_msq.c +++ b/sys/bus/ppbus/ppb_msq.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/ppb_msq.c,v 1.9.2.1 2000/05/24 00:20:57 n_hibma Exp $ - * $DragonFly: src/sys/bus/ppbus/ppb_msq.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/bus/ppbus/ppb_msq.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ * */ #include @@ -33,8 +33,8 @@ #include #include -#include -#include +#include "ppbconf.h" +#include "ppb_msq.h" #include "ppbus_if.h" diff --git a/sys/bus/ppbus/ppbconf.c b/sys/bus/ppbus/ppbconf.c index 43b36eff9d..3b11039c27 100644 --- a/sys/bus/ppbus/ppbconf.c +++ b/sys/bus/ppbus/ppbconf.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/ppbconf.c,v 1.17.2.1 2000/05/24 00:20:57 n_hibma Exp $ - * $DragonFly: src/sys/bus/ppbus/ppbconf.c,v 1.3 2003/07/19 21:14:25 dillon Exp $ + * $DragonFly: src/sys/bus/ppbus/ppbconf.c,v 1.4 2003/08/07 21:16:47 dillon Exp $ * */ #include "opt_ppb_1284.h" @@ -36,8 +36,8 @@ #include #include -#include -#include +#include "ppbconf.h" +#include "ppb_1284.h" #include "ppbus_if.h" diff --git a/sys/bus/ppbus/ppbus_if.m b/sys/bus/ppbus/ppbus_if.m index 8593460fa0..a84671ab1c 100644 --- a/sys/bus/ppbus/ppbus_if.m +++ b/sys/bus/ppbus/ppbus_if.m @@ -24,11 +24,11 @@ # SUCH DAMAGE. # # $FreeBSD: src/sys/dev/ppbus/ppbus_if.m,v 1.1.2.1 2000/05/24 00:20:57 n_hibma Exp $ -# $DragonFly: src/sys/bus/ppbus/ppbus_if.m,v 1.2 2003/06/17 04:28:29 dillon Exp $ +# $DragonFly: src/sys/bus/ppbus/ppbus_if.m,v 1.3 2003/08/07 21:16:47 dillon Exp $ # #include -#include +#include INTERFACE ppbus; diff --git a/sys/bus/smbus/smb.c b/sys/bus/smbus/smb.c index 90360c5fa8..2773195348 100644 --- a/sys/bus/smbus/smb.c +++ b/sys/bus/smbus/smb.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/smbus/smb.c,v 1.20 1999/11/18 05:44:56 peter Exp $ - * $DragonFly: src/sys/bus/smbus/smb.c,v 1.4 2003/07/21 07:57:42 dillon Exp $ + * $DragonFly: src/sys/bus/smbus/smb.c,v 1.5 2003/08/07 21:16:47 dillon Exp $ * */ #include @@ -40,8 +40,8 @@ #include -#include -#include +#include "smbconf.h" +#include "smbus.h" #include #include "smbus_if.h" diff --git a/sys/bus/smbus/smbconf.c b/sys/bus/smbus/smbconf.c index 20f8a04c5f..2c4d6ad65e 100644 --- a/sys/bus/smbus/smbconf.c +++ b/sys/bus/smbus/smbconf.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/smbus/smbconf.c,v 1.9 1999/12/03 08:41:08 mdodd Exp $ - * $DragonFly: src/sys/bus/smbus/smbconf.c,v 1.3 2003/07/19 21:14:28 dillon Exp $ + * $DragonFly: src/sys/bus/smbus/smbconf.c,v 1.4 2003/08/07 21:16:47 dillon Exp $ * */ #include @@ -34,8 +34,8 @@ #include #include -#include -#include +#include "smbconf.h" +#include "smbus.h" #include "smbus_if.h" /* diff --git a/sys/bus/smbus/smbus.c b/sys/bus/smbus/smbus.c index 804f875a8f..a00641b9b7 100644 --- a/sys/bus/smbus/smbus.c +++ b/sys/bus/smbus/smbus.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/smbus/smbus.c,v 1.12.2.3 2002/04/19 05:52:12 nsouch Exp $ - * $DragonFly: src/sys/bus/smbus/smbus.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/bus/smbus/smbus.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ * */ #include @@ -33,8 +33,8 @@ #include #include -#include -#include +#include "smbconf.h" +#include "smbus.h" /* * Autoconfiguration and support routines for the Philips serial I2C bus diff --git a/sys/bus/usb/hid.c b/sys/bus/usb/hid.c index 47e9db6482..85a3055243 100644 --- a/sys/bus/usb/hid.c +++ b/sys/bus/usb/hid.c @@ -1,6 +1,6 @@ /* $NetBSD: hid.c,v 1.15 2000/04/27 15:26:46 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/hid.c,v 1.11.2.6 2002/11/06 14:03:37 joe Exp $ */ -/* $DragonFly: src/sys/bus/usb/hid.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ */ +/* $DragonFly: src/sys/bus/usb/hid.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -46,10 +46,10 @@ #endif #include -#include -#include +#include "usb.h" +#include "usbhid.h" -#include +#include "hid.h" #ifdef USB_DEBUG #define DPRINTF(x) if (usbdebug) logprintf x diff --git a/sys/bus/usb/ohci.c b/sys/bus/usb/ohci.c index 696ed2bddf..d530dd2c00 100644 --- a/sys/bus/usb/ohci.c +++ b/sys/bus/usb/ohci.c @@ -1,6 +1,6 @@ /* $NetBSD: ohci.c,v 1.64 2000/01/19 00:23:58 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.39.2.9 2003/03/05 17:09:44 shiba Exp $ */ -/* $DragonFly: src/sys/bus/usb/ohci.c,v 1.3 2003/06/29 03:28:41 dillon Exp $ */ +/* $DragonFly: src/sys/bus/usb/ohci.c,v 1.4 2003/08/07 21:16:47 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -69,14 +69,14 @@ #include #include -#include -#include -#include -#include -#include +#include "usb.h" +#include "usbdi.h" +#include "usbdivar.h" +#include "usb_mem.h" +#include "usb_quirks.h" -#include -#include +#include "ohcireg.h" +#include "ohcivar.h" #if defined(__FreeBSD__) #include diff --git a/sys/bus/usb/uhci.c b/sys/bus/usb/uhci.c index 64e51c5f53..cd4995c450 100644 --- a/sys/bus/usb/uhci.c +++ b/sys/bus/usb/uhci.c @@ -1,6 +1,6 @@ /* $NetBSD: uhci.c,v 1.80 2000/01/19 01:16:38 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.40.2.10 2003/01/12 02:13:58 iedowse Exp $ */ -/* $DragonFly: src/sys/bus/usb/uhci.c,v 1.5 2003/07/19 21:14:30 dillon Exp $ */ +/* $DragonFly: src/sys/bus/usb/uhci.c,v 1.6 2003/08/07 21:16:47 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -71,14 +71,14 @@ #include #include -#include -#include -#include -#include -#include +#include "usb.h" +#include "usbdi.h" +#include "usbdivar.h" +#include "usb_mem.h" +#include "usb_quirks.h" -#include -#include +#include "uhcireg.h" +#include "uhcivar.h" #if defined(__FreeBSD__) #include diff --git a/sys/bus/usb/uhub.c b/sys/bus/usb/uhub.c index 1d692ee382..00ed415dad 100644 --- a/sys/bus/usb/uhub.c +++ b/sys/bus/usb/uhub.c @@ -1,6 +1,6 @@ /* $NetBSD: uhub.c,v 1.47 2000/09/24 02:08:38 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.21.2.7 2002/11/06 20:23:50 joe Exp $ */ -/* $DragonFly: src/sys/bus/usb/uhub.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ */ +/* $DragonFly: src/sys/bus/usb/uhub.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -59,10 +59,10 @@ #include -#include -#include -#include -#include +#include "usb.h" +#include "usbdi.h" +#include "usbdi_util.h" +#include "usbdivar.h" #define UHUB_INTR_INTERVAL 255 /* ms */ diff --git a/sys/bus/usb/usb.c b/sys/bus/usb/usb.c index 15c1ccc22a..fce536a782 100644 --- a/sys/bus/usb/usb.c +++ b/sys/bus/usb/usb.c @@ -1,6 +1,6 @@ /* $NetBSD: usb.c,v 1.33 1999/11/22 21:57:09 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb.c,v 1.26.2.9 2002/11/13 15:15:22 joe Exp $ */ -/* $DragonFly: src/sys/bus/usb/usb.c,v 1.7 2003/07/21 05:50:37 dillon Exp $ */ +/* $DragonFly: src/sys/bus/usb/usb.c,v 1.8 2003/08/07 21:16:47 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -66,9 +66,9 @@ #include #include -#include -#include -#include +#include "usb.h" +#include "usbdi.h" +#include "usbdi_util.h" #define USBUNIT(d) (minor(d)) /* usb_discover device nodes, kthread */ #define USB_DEV_MINOR 255 /* event queue device */ @@ -83,8 +83,8 @@ MALLOC_DEFINE(M_USBHC, "USBHC", "USB host controller"); #include -#include -#include +#include "usbdivar.h" +#include "usb_quirks.h" /* Define this unconditionally in case a kernel module is loaded that * has been compiled with debugging options. diff --git a/sys/bus/usb/usb.h b/sys/bus/usb/usb.h index 27cc4cc661..359fcead56 100644 --- a/sys/bus/usb/usb.h +++ b/sys/bus/usb/usb.h @@ -1,6 +1,6 @@ /* $NetBSD: usb.h,v 1.38 1999/10/20 21:02:39 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb.h,v 1.17.2.11 2002/11/13 15:15:22 joe Exp $ */ -/* $DragonFly: src/sys/bus/usb/usb.h,v 1.2 2003/06/17 04:28:32 dillon Exp $ */ +/* $DragonFly: src/sys/bus/usb/usb.h,v 1.3 2003/08/07 21:16:47 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ #include #if defined(_KERNEL) -#include +#include "usb_port.h" #endif /* _KERNEL */ #elif defined(__FreeBSD__) @@ -61,7 +61,7 @@ MALLOC_DECLARE(M_USB); MALLOC_DECLARE(M_USBDEV); MALLOC_DECLARE(M_USBHC); -#include +#include "usb_port.h" #endif /* _KERNEL */ #endif /* __FreeBSD__ */ diff --git a/sys/bus/usb/usb_ethersubr.c b/sys/bus/usb/usb_ethersubr.c index 2cf5654cb2..60d2e9a8d3 100644 --- a/sys/bus/usb/usb_ethersubr.c +++ b/sys/bus/usb/usb_ethersubr.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/usb_ethersubr.c,v 1.4.2.4 2002/11/06 14:23:20 joe Exp $ - * $DragonFly: src/sys/bus/usb/usb_ethersubr.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ + * $DragonFly: src/sys/bus/usb/usb_ethersubr.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ * * $FreeBSD: src/sys/dev/usb/usb_ethersubr.c,v 1.4.2.4 2002/11/06 14:23:20 joe Exp $ */ @@ -67,8 +67,8 @@ #include #include -#include -#include +#include "usb.h" +#include "usb_ethersubr.h" Static struct ifqueue usbq_rx; Static struct ifqueue usbq_tx; diff --git a/sys/bus/usb/usb_quirks.c b/sys/bus/usb/usb_quirks.c index 29f0523be1..3a0035d8a9 100644 --- a/sys/bus/usb/usb_quirks.c +++ b/sys/bus/usb/usb_quirks.c @@ -1,6 +1,6 @@ /* $NetBSD: usb_quirks.c,v 1.26 2000/04/27 15:26:50 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.21.2.8 2003/02/12 14:05:57 sanpei Exp $ */ -/* $DragonFly: src/sys/bus/usb/usb_quirks.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ */ +/* $DragonFly: src/sys/bus/usb/usb_quirks.c,v 1.3 2003/08/07 21:16:47 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -42,10 +42,10 @@ #include #include -#include +#include "usb.h" -#include -#include +#include "usbdevs.h" +#include "usb_quirks.h" #ifdef USB_DEBUG extern int usbdebug; diff --git a/sys/bus/usb/usb_subr.c b/sys/bus/usb/usb_subr.c index 82f06ee27c..029b9d33c9 100644 --- a/sys/bus/usb/usb_subr.c +++ b/sys/bus/usb/usb_subr.c @@ -1,6 +1,6 @@ /* $NetBSD: usb_subr.c,v 1.76 2000/04/27 15:26:50 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.23.2.8 2003/01/17 17:46:24 joe Exp $ */ -/* $DragonFly: src/sys/bus/usb/usb_subr.c,v 1.4 2003/07/19 21:14:30 dillon Exp $ */ +/* $DragonFly: src/sys/bus/usb/usb_subr.c,v 1.5 2003/08/07 21:16:47 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -54,13 +54,13 @@ #include -#include +#include "usb.h" -#include -#include -#include -#include -#include +#include "usbdi.h" +#include "usbdi_util.h" +#include "usbdivar.h" +#include "usbdevs.h" +#include "usb_quirks.h" #if defined(__FreeBSD__) #include @@ -107,7 +107,7 @@ struct usb_knowndev { }; #define USB_KNOWNDEV_NOPROD 0x01 /* match on vendor only */ -#include +#include "usbdevs_data.h" #endif /* USBVERBOSE */ Static const char *usbd_error_strs[] = { diff --git a/sys/bus/usb/usbdi.c b/sys/bus/usb/usbdi.c index 9a8f3fe194..74b7acde84 100644 --- a/sys/bus/usb/usbdi.c +++ b/sys/bus/usb/usbdi.c @@ -1,6 +1,6 @@ /* $NetBSD: usbdi.c,v 1.60 2000/01/19 00:23:58 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.34.2.7 2002/11/06 14:03:37 joe Exp $ */ -/* $DragonFly: src/sys/bus/usb/usbdi.c,v 1.4 2003/07/19 21:14:30 dillon Exp $ */ +/* $DragonFly: src/sys/bus/usb/usbdi.c,v 1.5 2003/08/07 21:16:47 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -56,11 +56,11 @@ #include -#include -#include -#include -#include -#include +#include "usb.h" +#include "usbdi.h" +#include "usbdi_util.h" +#include "usbdivar.h" +#include "usb_mem.h" #if defined(__FreeBSD__) #include "usb_if.h" diff --git a/sys/bus/usb/usbdi_util.c b/sys/bus/usb/usbdi_util.c index ca70bb9684..9d3b870774 100644 --- a/sys/bus/usb/usbdi_util.c +++ b/sys/bus/usb/usbdi_util.c @@ -1,6 +1,6 @@ /* $NetBSD: usbdi_util.c,v 1.24 1999/11/17 23:00:50 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi_util.c,v 1.15.2.5 2002/11/06 14:03:37 joe Exp $ */ -/* $DragonFly: src/sys/bus/usb/usbdi_util.c,v 1.3 2003/07/19 21:14:30 dillon Exp $ */ +/* $DragonFly: src/sys/bus/usb/usbdi_util.c,v 1.4 2003/08/07 21:16:47 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -50,11 +50,11 @@ #include #endif -#include -#include +#include "usb.h" +#include "usbhid.h" -#include -#include +#include "usbdi.h" +#include "usbdi_util.h" #ifdef USB_DEBUG #define DPRINTF(x) if (usbdebug) logprintf x diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index 3e039ff347..4ef967576c 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # $FreeBSD: src/sys/conf/Makefile.i386,v 1.179.2.16 2002/11/18 11:26:49 ru Exp $ -# $DragonFly: src/sys/conf/Attic/Makefile.i386,v 1.2 2003/06/17 04:28:19 dillon Exp $ +# $DragonFly: src/sys/conf/Attic/Makefile.i386,v 1.3 2003/08/07 21:16:48 dillon Exp $ # # Makefile for FreeBSD # @@ -18,7 +18,7 @@ # # Which version of config(8) is required. -%VERSREQ= 400019 +%VERSREQ= 400020 # Can be overridden by makeoptions or /etc/make.conf KERNEL?= kernel @@ -40,7 +40,9 @@ COPTFLAGS?=-O -pipe .if !defined(NO_CPU_COPTFLAGS) COPTFLAGS+= ${_CPUCFLAGS} .endif -INCLUDES= -nostdinc -I- -I. -I$S +# don't use -I- so we can use proper source-relative locality for local +# includes +INCLUDES= -nostdinc -I. -I$S # This hack is to allow kernel compiles to succeed on machines w/out srcdist .if exists($S/../include) INCLUDES+= -I$S/../include diff --git a/sys/conf/files b/sys/conf/files index f2b4211d55..21c4eb99f0 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,33 +1,33 @@ # $FreeBSD: src/sys/conf/files,v 1.340.2.137 2003/06/04 17:10:30 sam Exp $ -# $DragonFly: src/sys/conf/files,v 1.9 2003/08/03 12:29:05 hmp Exp $ +# $DragonFly: src/sys/conf/files,v 1.10 2003/08/07 21:16:48 dillon Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # aicasm optional ahc \ - dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ - compile-with "${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ + dependency "$S/dev/disk/aic7xxx/aicasm/*.[chyl]" \ + compile-with "${MAKE} -f $S/dev/disk/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/disk/aic7xxx/aicasm" \ no-obj no-implicit-rule \ clean "aicasm* y.tab.h" aicasm optional ahd \ - dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \ - compile-with "${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \ + dependency "$S/dev/disk/aic7xxx/aicasm/*.[chyl]" \ + compile-with "${MAKE} -f $S/dev/disk/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/disk/aic7xxx/aicasm" \ no-obj no-implicit-rule \ clean "aicasm* y.tab.h" aic7xxx_{seq.h,reg.h,reg_print.c} optional ahc \ - compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq" \ + compile-with "./aicasm ${INCLUDES} -I$S/bus/cam/scsi -I$S/dev/disk/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/disk/aic7xxx/aic7xxx_osm.h $S/dev/disk/aic7xxx/aic7xxx.seq" \ no-obj no-implicit-rule before-depend \ clean "aic7xxx_seq.h aic7xxx_reg.h aic7xxx_reg_print.c" \ - dependency "$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" + dependency "$S/dev/disk/aic7xxx/aic7xxx.{reg,seq} $S/bus/cam/scsi/scsi_message.h aicasm" aic7xxx_reg_print.o optional ahc ahc_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local aic79xx_{seq.h,reg.h,reg_print.c} optional ahd pci \ - compile-with "./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq" \ + compile-with "./aicasm ${INCLUDES} -I$S/bus/cam/scsi -I$S/dev/disk/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/disk/aic7xxx/aic79xx_osm.h $S/dev/disk/aic7xxx/aic79xx.seq" \ no-obj no-implicit-rule before-depend \ clean "aic79xx_seq.h aic79xx_reg.h aic79xx_reg_print.c" \ - dependency "$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm" + dependency "$S/dev/disk/aic7xxx/aic79xx.{reg,seq} $S/bus/cam/scsi/scsi_message.h aicasm" aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \ compile-with "${NORMAL_C}" \ no-implicit-rule local @@ -57,37 +57,37 @@ bus_if.h standard \ compile-with "perl5 $S/kern/makeops.pl -h $S/kern/bus_if.m" \ no-obj no-implicit-rule before-depend \ clean "bus_if.h" -coda/coda_namecache.c optional vcoda -coda/coda_fbsd.c optional vcoda -coda/coda_psdev.c optional vcoda -coda/coda_subr.c optional vcoda -coda/coda_venus.c optional vcoda -coda/coda_vfsops.c optional vcoda -coda/coda_vnops.c optional vcoda -cam/cam.c optional scbus -cam/cam_xpt.c optional scbus -cam/cam_extend.c optional scbus -cam/cam_queue.c optional scbus -cam/cam_periph.c optional scbus -cam/cam_sim.c optional scbus -cam/scsi/scsi_all.c optional scbus -cam/scsi/scsi_da.c optional da -cam/scsi/scsi_pt.c optional pt -cam/scsi/scsi_sa.c optional sa -cam/scsi/scsi_cd.c optional cd -cam/scsi/scsi_ch.c optional ch -cam/scsi/scsi_low.c optional ct -cam/scsi/scsi_low.c optional ncv -cam/scsi/scsi_low.c optional nsp -cam/scsi/scsi_low.c optional stg -cam/scsi/scsi_low_pisa.c optional ct -cam/scsi/scsi_low_pisa.c optional ncv -cam/scsi/scsi_low_pisa.c optional nsp -cam/scsi/scsi_low_pisa.c optional stg -cam/scsi/scsi_pass.c optional pass -cam/scsi/scsi_ses.c optional ses -cam/scsi/scsi_target.c optional targ -cam/scsi/scsi_targ_bh.c optional targbh +vfs/coda/coda_namecache.c optional vcoda +vfs/coda/coda_fbsd.c optional vcoda +vfs/coda/coda_psdev.c optional vcoda +vfs/coda/coda_subr.c optional vcoda +vfs/coda/coda_venus.c optional vcoda +vfs/coda/coda_vfsops.c optional vcoda +vfs/coda/coda_vnops.c optional vcoda +bus/cam/cam.c optional scbus +bus/cam/cam_xpt.c optional scbus +bus/cam/cam_extend.c optional scbus +bus/cam/cam_queue.c optional scbus +bus/cam/cam_periph.c optional scbus +bus/cam/cam_sim.c optional scbus +bus/cam/scsi/scsi_all.c optional scbus +bus/cam/scsi/scsi_da.c optional da +bus/cam/scsi/scsi_pt.c optional pt +bus/cam/scsi/scsi_sa.c optional sa +bus/cam/scsi/scsi_cd.c optional cd +bus/cam/scsi/scsi_ch.c optional ch +bus/cam/scsi/scsi_low.c optional ct +bus/cam/scsi/scsi_low.c optional ncv +bus/cam/scsi/scsi_low.c optional nsp +bus/cam/scsi/scsi_low.c optional stg +bus/cam/scsi/scsi_low_pisa.c optional ct +bus/cam/scsi/scsi_low_pisa.c optional ncv +bus/cam/scsi/scsi_low_pisa.c optional nsp +bus/cam/scsi/scsi_low_pisa.c optional stg +bus/cam/scsi/scsi_pass.c optional pass +bus/cam/scsi/scsi_ses.c optional ses +bus/cam/scsi/scsi_target.c optional targ +bus/cam/scsi/scsi_targ_bh.c optional targbh contrib/ipfilter/netinet/fil.c optional ipfilter inet contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet contrib/ipfilter/netinet/ip_fil.c optional ipfilter inet @@ -97,266 +97,266 @@ contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet contrib/ipfilter/netinet/ip_state.c optional ipfilter inet contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet -crypto/blowfish/bf_skey.c optional ipsec ipsec_esp -crypto/cast128/cast128.c optional ipsec ipsec_esp -crypto/des/des_ecb.c optional ipsec ipsec_esp -crypto/des/des_setkey.c optional ipsec ipsec_esp +crypto/blowfish/bf_skey.c optional ipsec ipsec_esp +crypto/cast128/cast128.c optional ipsec ipsec_esp +crypto/des/des_ecb.c optional ipsec ipsec_esp +crypto/des/des_setkey.c optional ipsec ipsec_esp crypto/rijndael/rijndael-alg-fst.c optional ipsec ipsec_esp crypto/rijndael/rijndael-api-fst.c optional ipsec ipsec_esp -crypto/sha1.c optional ipsec -crypto/sha2/sha2.c optional ipsec -ddb/db_access.c optional ddb -ddb/db_kld.c optional ddb -ddb/db_break.c optional ddb -ddb/db_command.c optional ddb -ddb/db_examine.c optional ddb -ddb/db_expr.c optional ddb -ddb/db_input.c optional ddb -ddb/db_lex.c optional ddb -ddb/db_output.c optional ddb -ddb/db_print.c optional ddb -ddb/db_ps.c optional ddb -ddb/db_run.c optional ddb -ddb/db_sym.c optional ddb -ddb/db_sysctl.c optional ddb -ddb/db_trap.c optional ddb -ddb/db_variables.c optional ddb -ddb/db_watch.c optional ddb -ddb/db_write_cmd.c optional ddb -dev/aac/aac.c optional aac -#dev/aac/aac_debug.c optional aac -dev/aac/aac_disk.c optional aac -dev/aac/aac_pci.c optional aac pci -dev/aac/aac_linux.c optional aac compat_linux -dev/aac/aac_cam.c optional aacp aac -dev/advansys/adv_eisa.c optional adv eisa -dev/advansys/adv_pci.c optional adv pci -dev/advansys/advansys.c optional adv -dev/advansys/advlib.c optional adv -dev/advansys/advmcode.c optional adv -dev/advansys/adw_pci.c optional adw pci -dev/advansys/adwcam.c optional adw -dev/advansys/adwlib.c optional adw -dev/advansys/adwmcode.c optional adw -dev/an/if_an.c optional an -dev/an/if_an_isa.c optional an isa -dev/an/if_an_pci.c optional an pci -dev/an/if_an_pccard.c optional an card -dev/ar/if_ar.c optional ar -dev/ar/if_ar_pci.c optional ar pci -dev/asr/asr.c optional asr pci -dev/ata/ata-all.c optional ata -dev/ata/ata-isa.c optional ata isa -dev/ata/ata-card.c optional ata card -dev/ata/ata-pci.c optional ata pci -dev/ata/ata-dma.c optional ata pci -dev/ata/ata-disk.c optional atadisk -dev/ata/ata-raid.c optional atadisk -dev/ata/atapi-all.c optional atapicd -dev/ata/atapi-all.c optional atapifd -dev/ata/atapi-all.c optional atapist -dev/ata/atapi-all.c optional atapicam -dev/ata/atapi-cd.c optional atapicd -dev/ata/atapi-fd.c optional atapifd -dev/ata/atapi-tape.c optional atapist -dev/ata/atapi-cam.c optional atapicam -dev/amr/amr_cam.c optional amr -dev/amr/amr_disk.c optional amr -dev/amr/amr_pci.c optional amr -dev/amr/amr.c optional amr -dev/aha/aha.c optional aha -dev/aha/aha_isa.c optional aha isa -dev/aha/aha_mca.c optional aha mca -dev/ahb/ahb.c optional ahb eisa -dev/aic/aic.c optional aic -dev/aic/aic_pccard.c optional aic card -dev/aic7xxx/aic7770.c optional ahc eisa -dev/aic7xxx/ahc_eisa.c optional ahc eisa -#dev/aic7xxx/ahc_isa.c optional ahc isa -dev/aic7xxx/ahc_pci.c optional ahc pci -dev/aic7xxx/aic7xxx.c optional ahc -dev/aic7xxx/aic7xxx_93cx6.c optional ahc -dev/aic7xxx/aic7xxx_osm.c optional ahc -dev/aic7xxx/aic7xxx_pci.c optional ahc pci -dev/aic7xxx/ahd_pci.c optional ahd pci -dev/aic7xxx/aic79xx.c optional ahd pci -dev/aic7xxx/aic79xx_osm.c optional ahd pci -dev/aic7xxx/aic79xx_pci.c optional ahd pci -dev/bge/if_bge.c optional bge -dev/buslogic/bt.c optional bt -dev/buslogic/bt_isa.c optional bt isa -dev/buslogic/bt_mca.c optional bt mca -dev/buslogic/bt_eisa.c optional bt eisa -dev/buslogic/bt_pci.c optional bt pci -dev/ccd/ccd.c optional ccd -dev/ciss/ciss.c optional ciss -dev/cm/smc90cx6.c optional cm -dev/cs/if_cs.c optional cs -dev/cs/if_cs_isa.c optional cs isa -dev/cs/if_cs_pccard.c optional cs card -#dev/dpt/dpt_control.c optional dpt -dev/dpt/dpt_scsi.c optional dpt -dev/dpt/dpt_eisa.c optional dpt eisa -dev/dpt/dpt_pci.c optional dpt pci -dev/ed/if_ed_pci.c optional ed pci -dev/ep/if_ep.c optional ep -dev/ep/if_ep_isa.c optional ep isa -dev/ep/if_ep_eisa.c optional ep eisa -dev/ep/if_ep_mca.c optional ep mca -dev/ep/if_ep_pccard.c optional ep card -dev/en/midway.c optional en -dev/ex/if_ex.c optional ex -dev/ex/if_ex_isa.c optional ex isa -dev/ex/if_ex_pccard.c optional ex card -dev/fe/if_fe.c optional fe -dev/fe/if_fe_pccard.c optional fe card -dev/firewire/firewire.c optional firewire -dev/firewire/fwcrom.c optional firewire -dev/firewire/fwdev.c optional firewire -dev/firewire/fwdma.c optional firewire -dev/firewire/fwmem.c optional firewire -dev/firewire/fwohci.c optional firewire -dev/firewire/fwohci_pci.c optional firewire pci -dev/firewire/if_fwe.c optional fwe -dev/firewire/sbp.c optional sbp -dev/fxp/if_fxp.c optional fxp -dev/gx/if_gx.c optional gx -dev/hea/eni.c optional hea -dev/hea/eni_buffer.c optional hea -dev/hea/eni_globals.c optional hea -dev/hea/eni_if.c optional hea -dev/hea/eni_init.c optional hea -dev/hea/eni_intr.c optional hea -dev/hea/eni_receive.c optional hea -dev/hea/eni_transmit.c optional hea -dev/hea/eni_vcm.c optional hea -dev/hfa/fore_buffer.c optional hfa -dev/hfa/fore_command.c optional hfa -dev/hfa/fore_globals.c optional hfa -dev/hfa/fore_if.c optional hfa -dev/hfa/fore_init.c optional hfa -dev/hfa/fore_intr.c optional hfa -dev/hfa/fore_load.c optional hfa -dev/hfa/fore_output.c optional hfa -dev/hfa/fore_receive.c optional hfa -dev/hfa/fore_stats.c optional hfa -dev/hfa/fore_timer.c optional hfa -dev/hfa/fore_transmit.c optional hfa -dev/hfa/fore_vcm.c optional hfa -dev/ie/if_ie.c optional ie isa -dev/ichsmb/ichsmb.c optional ichsmb -dev/ichsmb/ichsmb_pci.c optional ichsmb pci -dev/ida/ida.c optional ida -dev/ida/ida_disk.c optional ida -dev/ida/ida_eisa.c optional ida eisa -dev/ida/ida_pci.c optional ida pci -dev/isp/isp_freebsd.c optional isp -dev/isp/isp.c optional isp -dev/isp/isp_pci.c optional isp -dev/isp/isp_target.c optional isp -dev/ispfw/ispfw.c optional ispfw -dev/iir/iir.c optional iir -dev/iir/iir_ctrl.c optional iir -dev/iir/iir_pci.c optional iir pci -dev/lge/if_lge.c optional lge -dev/mca/mca_bus.c optional mca -dev/md/md.c optional md -dev/mii/mii.c optional miibus -dev/mii/mii_physubr.c optional miibus -dev/mii/ukphy.c optional miibus -dev/mii/ukphy_subr.c optional miibus -dev/mii/amphy.c optional miibus -dev/mii/brgphy.c optional miibus -dev/mii/dcphy.c optional miibus pci -dev/mii/e1000phy.c optional miibus -dev/mii/exphy.c optional miibus -dev/mii/inphy.c optional miibus -dev/mii/mlphy.c optional miibus -dev/mii/nsphy.c optional miibus -dev/mii/nsgphy.c optional miibus -dev/mii/pnphy.c optional miibus -dev/mii/pnaphy.c optional miibus -dev/mii/tlphy.c optional miibus -dev/mii/rlphy.c optional miibus -dev/mii/xmphy.c optional miibus -dev/mii/lxtphy.c optional miibus -dev/mii/qsphy.c optional miibus -dev/mii/acphy.c optional miibus +crypto/sha1.c optional ipsec +crypto/sha2/sha2.c optional ipsec +ddb/db_access.c optional ddb +ddb/db_kld.c optional ddb +ddb/db_break.c optional ddb +ddb/db_command.c optional ddb +ddb/db_examine.c optional ddb +ddb/db_expr.c optional ddb +ddb/db_input.c optional ddb +ddb/db_lex.c optional ddb +ddb/db_output.c optional ddb +ddb/db_print.c optional ddb +ddb/db_ps.c optional ddb +ddb/db_run.c optional ddb +ddb/db_sym.c optional ddb +ddb/db_sysctl.c optional ddb +ddb/db_trap.c optional ddb +ddb/db_variables.c optional ddb +ddb/db_watch.c optional ddb +ddb/db_write_cmd.c optional ddb +dev/raid/aac/aac.c optional aac +#dev/raid/aac/aac_debug.c optional aac +dev/raid/aac/aac_disk.c optional aac +dev/raid/aac/aac_pci.c optional aac pci +dev/raid/aac/aac_linux.c optional aac compat_linux +dev/raid/aac/aac_cam.c optional aacp aac +dev/disk/advansys/adv_eisa.c optional adv eisa +dev/disk/advansys/adv_pci.c optional adv pci +dev/disk/advansys/advansys.c optional adv +dev/disk/advansys/advlib.c optional adv +dev/disk/advansys/advmcode.c optional adv +dev/disk/advansys/adw_pci.c optional adw pci +dev/disk/advansys/adwcam.c optional adw +dev/disk/advansys/adwlib.c optional adw +dev/disk/advansys/adwmcode.c optional adw +dev/netif/an/if_an.c optional an +dev/netif/an/if_an_isa.c optional an isa +dev/netif/an/if_an_pci.c optional an pci +dev/netif/an/if_an_pccard.c optional an card +dev/netif/ar/if_ar.c optional ar +dev/netif/ar/if_ar_pci.c optional ar pci +dev/raid/asr/asr.c optional asr pci +dev/disk/ata/ata-all.c optional ata +dev/disk/ata/ata-isa.c optional ata isa +dev/disk/ata/ata-card.c optional ata card +dev/disk/ata/ata-pci.c optional ata pci +dev/disk/ata/ata-dma.c optional ata pci +dev/disk/ata/ata-disk.c optional atadisk +dev/disk/ata/ata-raid.c optional atadisk +dev/disk/ata/atapi-all.c optional atapicd +dev/disk/ata/atapi-all.c optional atapifd +dev/disk/ata/atapi-all.c optional atapist +dev/disk/ata/atapi-all.c optional atapicam +dev/disk/ata/atapi-cd.c optional atapicd +dev/disk/ata/atapi-fd.c optional atapifd +dev/disk/ata/atapi-tape.c optional atapist +dev/disk/ata/atapi-cam.c optional atapicam +dev/raid/amr/amr_cam.c optional amr +dev/raid/amr/amr_disk.c optional amr +dev/raid/amr/amr_pci.c optional amr +dev/raid/amr/amr.c optional amr +dev/disk/aha/aha.c optional aha +dev/disk/aha/aha_isa.c optional aha isa +dev/disk/aha/aha_mca.c optional aha mca +dev/disk/ahb/ahb.c optional ahb eisa +dev/disk/aic/aic.c optional aic +dev/disk/aic/aic_pccard.c optional aic card +dev/disk/aic7xxx/aic7770.c optional ahc eisa +dev/disk/aic7xxx/ahc_eisa.c optional ahc eisa +#dev/disk/aic7xxx/ahc_isa.c optional ahc isa +dev/disk/aic7xxx/ahc_pci.c optional ahc pci +dev/disk/aic7xxx/aic7xxx.c optional ahc +dev/disk/aic7xxx/aic7xxx_93cx6.c optional ahc +dev/disk/aic7xxx/aic7xxx_osm.c optional ahc +dev/disk/aic7xxx/aic7xxx_pci.c optional ahc pci +dev/disk/aic7xxx/ahd_pci.c optional ahd pci +dev/disk/aic7xxx/aic79xx.c optional ahd pci +dev/disk/aic7xxx/aic79xx_osm.c optional ahd pci +dev/disk/aic7xxx/aic79xx_pci.c optional ahd pci +dev/netif/bge/if_bge.c optional bge +dev/disk/buslogic/bt.c optional bt +dev/disk/buslogic/bt_isa.c optional bt isa +dev/disk/buslogic/bt_mca.c optional bt mca +dev/disk/buslogic/bt_eisa.c optional bt eisa +dev/disk/buslogic/bt_pci.c optional bt pci +dev/disk/ccd/ccd.c optional ccd +dev/raid/ciss/ciss.c optional ciss +dev/netif/cm/smc90cx6.c optional cm +dev/netif/cs/if_cs.c optional cs +dev/netif/cs/if_cs_isa.c optional cs isa +dev/netif/cs/if_cs_pccard.c optional cs card +#dev/raid/dpt/dpt_control.c optional dpt +dev/raid/dpt/dpt_scsi.c optional dpt +dev/raid/dpt/dpt_eisa.c optional dpt eisa +dev/raid/dpt/dpt_pci.c optional dpt pci +dev/netif/ed/if_ed_pci.c optional ed pci +dev/netif/ep/if_ep.c optional ep +dev/netif/ep/if_ep_isa.c optional ep isa +dev/netif/ep/if_ep_eisa.c optional ep eisa +dev/netif/ep/if_ep_mca.c optional ep mca +dev/netif/ep/if_ep_pccard.c optional ep card +dev/atm/en/midway.c optional en +dev/netif/ex/if_ex.c optional ex +dev/netif/ex/if_ex_isa.c optional ex isa +dev/netif/ex/if_ex_pccard.c optional ex card +dev/netif/fe/if_fe.c optional fe +dev/netif/fe/if_fe_pccard.c optional fe card +bus/firewire/firewire.c optional firewire +bus/firewire/fwcrom.c optional firewire +bus/firewire/fwdev.c optional firewire +bus/firewire/fwdma.c optional firewire +bus/firewire/fwmem.c optional firewire +bus/firewire/fwohci.c optional firewire +bus/firewire/fwohci_pci.c optional firewire pci +dev/netif/fwe/if_fwe.c optional fwe +dev/disk/sbp/sbp.c optional sbp +dev/netif/fxp/if_fxp.c optional fxp +dev/netif/gx/if_gx.c optional gx +dev/atm/hea/eni.c optional hea +dev/atm/hea/eni_buffer.c optional hea +dev/atm/hea/eni_globals.c optional hea +dev/atm/hea/eni_if.c optional hea +dev/atm/hea/eni_init.c optional hea +dev/atm/hea/eni_intr.c optional hea +dev/atm/hea/eni_receive.c optional hea +dev/atm/hea/eni_transmit.c optional hea +dev/atm/hea/eni_vcm.c optional hea +dev/atm/hfa/fore_buffer.c optional hfa +dev/atm/hfa/fore_command.c optional hfa +dev/atm/hfa/fore_globals.c optional hfa +dev/atm/hfa/fore_if.c optional hfa +dev/atm/hfa/fore_init.c optional hfa +dev/atm/hfa/fore_intr.c optional hfa +dev/atm/hfa/fore_load.c optional hfa +dev/atm/hfa/fore_output.c optional hfa +dev/atm/hfa/fore_receive.c optional hfa +dev/atm/hfa/fore_stats.c optional hfa +dev/atm/hfa/fore_timer.c optional hfa +dev/atm/hfa/fore_transmit.c optional hfa +dev/atm/hfa/fore_vcm.c optional hfa +dev/netif/ie/if_ie.c optional ie isa +dev/powermng/ichsmb/ichsmb.c optional ichsmb +dev/powermng/ichsmb/ichsmb_pci.c optional ichsmb pci +dev/raid/ida/ida.c optional ida +dev/raid/ida/ida_disk.c optional ida +dev/raid/ida/ida_eisa.c optional ida eisa +dev/raid/ida/ida_pci.c optional ida pci +dev/disk/isp/isp_freebsd.c optional isp +dev/disk/isp/isp.c optional isp +dev/disk/isp/isp_pci.c optional isp +dev/disk/isp/isp_target.c optional isp +dev/disk/ispfw/ispfw.c optional ispfw +dev/raid/iir/iir.c optional iir +dev/raid/iir/iir_ctrl.c optional iir +dev/raid/iir/iir_pci.c optional iir pci +dev/netif/lge/if_lge.c optional lge +bus/mca/mca_bus.c optional mca +dev/disk/md/md.c optional md +dev/netif/mii_layer/mii.c optional miibus +dev/netif/mii_layer/mii_physubr.c optional miibus +dev/netif/mii_layer/ukphy.c optional miibus +dev/netif/mii_layer/ukphy_subr.c optional miibus +dev/netif/mii_layer/amphy.c optional miibus +dev/netif/mii_layer/brgphy.c optional miibus +dev/netif/mii_layer/dcphy.c optional miibus pci +dev/netif/mii_layer/e1000phy.c optional miibus +dev/netif/mii_layer/exphy.c optional miibus +dev/netif/mii_layer/inphy.c optional miibus +dev/netif/mii_layer/mlphy.c optional miibus +dev/netif/mii_layer/nsphy.c optional miibus +dev/netif/mii_layer/nsgphy.c optional miibus +dev/netif/mii_layer/pnphy.c optional miibus +dev/netif/mii_layer/pnaphy.c optional miibus +dev/netif/mii_layer/tlphy.c optional miibus +dev/netif/mii_layer/rlphy.c optional miibus +dev/netif/mii_layer/xmphy.c optional miibus +dev/netif/mii_layer/lxtphy.c optional miibus +dev/netif/mii_layer/qsphy.c optional miibus +dev/netif/mii_layer/acphy.c optional miibus miibus_if.o optional miibus \ dependency "miibus_if.c miibus_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local miibus_if.c optional miibus \ - dependency "$S/kern/makeops.pl $S/dev/mii/miibus_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/dev/mii/miibus_if.m" \ + dependency "$S/kern/makeops.pl $S/dev/netif/mii_layer/miibus_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/dev/netif/mii_layer/miibus_if.m" \ no-obj no-implicit-rule before-depend local \ clean "miibus_if.c" miibus_if.h optional miibus \ - dependency "$S/kern/makeops.pl $S/dev/mii/miibus_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/dev/mii/miibus_if.m" \ + dependency "$S/kern/makeops.pl $S/dev/netif/mii_layer/miibus_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/dev/netif/mii_layer/miibus_if.m" \ no-obj no-implicit-rule before-depend \ clean "miibus_if.h" -dev/mlx/mlx_disk.c optional mlx -dev/mlx/mlx_pci.c optional mlx -dev/mlx/mlx.c optional mlx -dev/mly/mly.c optional mly -dev/mly/mly_cam.c optional mly -dev/mly/mly_pci.c optional mly -dev/mpt/mpt.c optional mpt -dev/mpt/mpt_debug.c optional mpt -dev/mpt/mpt_freebsd.c optional mpt -dev/mpt/mpt_pci.c optional mpt -dev/my/if_my.c optional my -dev/musycc/musycc.c optional musycc -dev/ncv/ncr53c500.c optional ncv -dev/ncv/ncr53c500_pccard.c optional ncv card -dev/nge/if_nge.c optional nge -dev/nmdm/nmdm.c optional nmdm -dev/nsp/nsp.c optional nsp -dev/nsp/nsp_pccard.c optional nsp card -dev/pccard/pccard.c optional pccard -dev/pccard/pccard_cis.c optional pccard -dev/pccard/pccard_cis_quirks.c optional pccard -power_if.o optional pccard \ +dev/raid/mlx/mlx_disk.c optional mlx +dev/raid/mlx/mlx_pci.c optional mlx +dev/raid/mlx/mlx.c optional mlx +dev/raid/mly/mly.c optional mly +dev/raid/mly/mly_cam.c optional mly +dev/raid/mly/mly_pci.c optional mly +dev/disk/mpt/mpt.c optional mpt +dev/disk/mpt/mpt_debug.c optional mpt +dev/disk/mpt/mpt_freebsd.c optional mpt +dev/disk/mpt/mpt_pci.c optional mpt +dev/netif/my/if_my.c optional my +dev/misc/musycc/musycc.c optional musycc +dev/disk/ncv/ncr53c500.c optional ncv +dev/disk/ncv/ncr53c500_pccard.c optional ncv card +dev/netif/nge/if_nge.c optional nge +dev/misc/nmdm/nmdm.c optional nmdm +dev/disk/nsp/nsp.c optional nsp +dev/disk/nsp/nsp_pccard.c optional nsp card +dev/misc/pccard/pccard.c optional pccard +dev/misc/pccard/pccard_cis.c optional pccard +dev/misc/pccard/pccard_cis_quirks.c optional pccard +power_if.o optional pccard \ dependency "power_if.c power_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local -power_if.c optional pccard \ - dependency "$S/kern/makeops.pl $S/dev/pccard/power_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/dev/pccard/power_if.m" \ +power_if.c optional pccard \ + dependency "$S/kern/makeops.pl $S/dev/misc/pccard/power_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/dev/misc/pccard/power_if.m" \ no-obj no-implicit-rule before-depend local \ clean "power_if.c" -power_if.h optional pccard \ - dependency "$S/kern/makeops.pl $S/dev/pccard/power_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/dev/pccard/power_if.m" \ +power_if.h optional pccard \ + dependency "$S/kern/makeops.pl $S/dev/misc/pccard/power_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/dev/misc/pccard/power_if.m" \ no-obj no-implicit-rule before-depend \ clean "power_if.h" -power_if.o optional card \ +power_if.o optional card \ dependency "power_if.c power_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local -power_if.c optional card \ - dependency "$S/kern/makeops.pl $S/dev/pccard/power_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/dev/pccard/power_if.m" \ +power_if.c optional card \ + dependency "$S/kern/makeops.pl $S/dev/misc/pccard/power_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/dev/misc/pccard/power_if.m" \ no-obj no-implicit-rule before-depend local \ clean "power_if.c" -power_if.h optional card \ - dependency "$S/kern/makeops.pl $S/dev/pccard/power_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/dev/pccard/power_if.m" \ +power_if.h optional card \ + dependency "$S/kern/makeops.pl $S/dev/misc/pccard/power_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/dev/misc/pccard/power_if.m" \ no-obj no-implicit-rule before-depend \ clean "power_if.h" -card_if.o optional pccard \ +card_if.o optional pccard \ dependency "card_if.c card_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local -card_if.c optional pccard \ - dependency "$S/kern/makeops.pl $S/dev/pccard/card_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/dev/pccard/card_if.m" \ +card_if.c optional pccard \ + dependency "$S/kern/makeops.pl $S/dev/misc/pccard/card_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/dev/misc/pccard/card_if.m" \ no-obj no-implicit-rule before-depend local \ clean "card_if.c" card_if.h optional pccard \ - dependency "$S/kern/makeops.pl $S/dev/pccard/card_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/dev/pccard/card_if.m" \ + dependency "$S/kern/makeops.pl $S/dev/misc/pccard/card_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/dev/misc/pccard/card_if.m" \ no-obj no-implicit-rule before-depend \ clean "card_if.h" card_if.o optional card \ @@ -364,228 +364,226 @@ card_if.o optional card \ compile-with "${NORMAL_C}" \ no-implicit-rule local card_if.c optional card \ - dependency "$S/kern/makeops.pl $S/dev/pccard/card_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/dev/pccard/card_if.m" \ + dependency "$S/kern/makeops.pl $S/dev/misc/pccard/card_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/dev/misc/pccard/card_if.m" \ no-obj no-implicit-rule before-depend local \ clean "card_if.c" card_if.h optional card \ - dependency "$S/kern/makeops.pl $S/dev/pccard/card_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/dev/pccard/card_if.m" \ + dependency "$S/kern/makeops.pl $S/dev/misc/pccard/card_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/dev/misc/pccard/card_if.m" \ no-obj no-implicit-rule before-depend \ clean "card_if.h" -dev/pcic/i82365.c optional pcic pccard -dev/pcic/i82365_isa.c optional pcic pccard -dev/pdq/if_fea.c optional fea eisa -dev/pdq/if_fpa.c optional fpa pci -dev/pdq/pdq.c optional fea eisa -dev/pdq/pdq_ifsubr.c optional fea eisa -dev/pdq/pdq.c optional fpa pci -dev/pdq/pdq_ifsubr.c optional fpa pci +dev/misc/pcic/i82365.c optional pcic pccard +dev/misc/pcic/i82365_isa.c optional pcic pccard +dev/netif/fea/if_fea.c optional fea eisa +dev/netif/fpa/if_fpa.c optional fpa pci +dev/netif/pdq_layer/pdq.c optional fea eisa +dev/netif/pdq_layer/pdq_ifsubr.c optional fea eisa +dev/netif/pdq_layer/pdq.c optional fpa pci +dev/netif/pdq_layer/pdq_ifsubr.c optional fpa pci ppbus_if.o optional ppbus \ dependency "ppbus_if.c ppbus_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local ppbus_if.c optional ppbus \ - dependency "$S/kern/makeops.pl $S/dev/ppbus/ppbus_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/dev/ppbus/ppbus_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/ppbus/ppbus_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/bus/ppbus/ppbus_if.m" \ no-obj no-implicit-rule before-depend local \ clean "ppbus_if.c" ppbus_if.h optional ppbus \ - dependency "$S/kern/makeops.pl $S/dev/ppbus/ppbus_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/dev/ppbus/ppbus_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/ppbus/ppbus_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/bus/ppbus/ppbus_if.m" \ no-obj no-implicit-rule before-depend \ clean "ppbus_if.h" -dev/ppbus/immio.c optional vpo -dev/ppbus/if_plip.c optional plip -dev/ppbus/lpbb.c optional lpbb -dev/ppbus/lpt.c optional lpt -dev/ppbus/pcfclock.c optional pcfclock -dev/ppbus/ppb_base.c optional ppbus -dev/ppbus/ppb_1284.c optional ppbus -dev/ppbus/ppb_msq.c optional ppbus -dev/ppbus/ppbconf.c optional ppbus -dev/ppbus/ppi.c optional ppi -dev/ppbus/pps.c optional pps -dev/ppbus/vpo.c optional vpo -dev/ppbus/vpoio.c optional vpo -dev/ray/if_ray.c optional ray card -dev/ray/if_ray.c optional ray pccard -dev/rndtest/rndtest.c optional rndtest -dev/rp/rp.c optional nrp -dev/rp/rp_isa.c optional nrp isa -dev/rp/rp_pci.c optional nrp pci -dev/sbni/if_sbni_pci.c optional sbni pci -dev/sbsh/if_sbsh.c optional sbsh +dev/disk/vpo/immio.c optional vpo +dev/netif/plip/if_plip.c optional plip +dev/misc/lpbb/lpbb.c optional lpbb +dev/misc/lpt/lpt.c optional lpt +dev/misc/pcfclock/pcfclock.c optional pcfclock +bus/ppbus/ppb_base.c optional ppbus +bus/ppbus/ppb_1284.c optional ppbus +bus/ppbus/ppb_msq.c optional ppbus +bus/ppbus/ppbconf.c optional ppbus +dev/misc/ppi/ppi.c optional ppi +dev/misc/pps/pps.c optional pps +dev/disk/vpo/vpo.c optional vpo +dev/disk/vpo/vpoio.c optional vpo +dev/netif/ray/if_ray.c optional ray card +dev/netif/ray/if_ray.c optional ray pccard +dev/crypto/rndtest/rndtest.c optional rndtest +dev/serial/rp/rp.c optional nrp +dev/serial/rp/rp_isa.c optional nrp isa +dev/serial/rp/rp_pci.c optional nrp pci +dev/netif/sbni/if_sbni_pci.c optional sbni pci +dev/netif/sbsh/if_sbsh.c optional sbsh smbus_if.o optional smbus \ dependency "smbus_if.c smbus_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local smbus_if.c optional smbus \ - dependency "$S/kern/makeops.pl $S/dev/smbus/smbus_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/dev/smbus/smbus_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/smbus/smbus_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/bus/smbus/smbus_if.m" \ no-obj no-implicit-rule before-depend local \ clean "smbus_if.c" smbus_if.h optional smbus \ - dependency "$S/kern/makeops.pl $S/dev/smbus/smbus_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/dev/smbus/smbus_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/smbus/smbus_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/bus/smbus/smbus_if.m" \ no-obj no-implicit-rule before-depend \ clean "smbus_if.h" -dev/smbus/smbconf.c optional smbus -dev/smbus/smbus.c optional smbus -dev/smbus/smb.c optional smb -dev/si/si.c optional si -dev/si/si2_z280.c optional si -dev/si/si3_t225.c optional si -dev/si/si_eisa.c optional si eisa -dev/si/si_isa.c optional si isa -dev/si/si_pci.c optional si pci -dev/sn/if_sn.c optional sn -dev/sn/if_sn_isa.c optional sn isa -dev/sn/if_sn_pccard.c optional sn card -dev/snp/snp.c optional snp -dev/sr/if_sr.c optional sr -dev/sr/if_sr_pci.c optional sr pci -dev/stg/tmc18c30.c optional stg -dev/stg/tmc18c30_isa.c optional stg isa -dev/stg/tmc18c30_pccard.c optional stg card -dev/iicbus/iicbb.c optional iicbb +bus/smbus/smbconf.c optional smbus +bus/smbus/smbus.c optional smbus +bus/smbus/smb.c optional smb +dev/serial/si/si.c optional si +dev/serial/si/si2_z280.c optional si +dev/serial/si/si3_t225.c optional si +dev/serial/si/si_eisa.c optional si eisa +dev/serial/si/si_isa.c optional si isa +dev/serial/si/si_pci.c optional si pci +dev/netif/sn/if_sn.c optional sn +dev/netif/sn/if_sn_isa.c optional sn isa +dev/netif/sn/if_sn_pccard.c optional sn card +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_isa.c optional stg isa +dev/disk/stg/tmc18c30_pccard.c optional stg card +bus/iicbus/iicbb.c optional iicbb iicbb_if.o optional iicbb \ dependency "iicbb_if.c" \ compile-with "${NORMAL_C}" \ no-implicit-rule local iicbb_if.c optional iicbb \ - dependency "$S/kern/makeops.pl $S/dev/iicbus/iicbb_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/dev/iicbus/iicbb_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/iicbus/iicbb_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/bus/iicbus/iicbb_if.m" \ no-obj no-implicit-rule before-depend local \ clean "iicbb_if.c" iicbb_if.h optional iicbb \ - dependency "$S/kern/makeops.pl $S/dev/iicbus/iicbb_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/dev/iicbus/iicbb_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/iicbus/iicbb_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/bus/iicbus/iicbb_if.m" \ no-obj no-implicit-rule before-depend \ clean "iicbb_if.h" -dev/iicbus/iicsmb.c optional iicsmb \ +bus/iicbus/iicsmb.c optional iicsmb \ dependency "iicbus_if.h" iicbus_if.o optional iicbus \ dependency "iicbus_if.c iicbus_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local iicbus_if.c optional iicbus \ - dependency "$S/kern/makeops.pl $S/dev/iicbus/iicbus_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/dev/iicbus/iicbus_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/iicbus/iicbus_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/bus/iicbus/iicbus_if.m" \ no-obj no-implicit-rule before-depend local \ clean "iicbus_if.c" iicbus_if.h optional iicbus \ - dependency "$S/kern/makeops.pl $S/dev/iicbus/iicbus_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/dev/iicbus/iicbus_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/iicbus/iicbus_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/bus/iicbus/iicbus_if.m" \ no-obj no-implicit-rule before-depend \ clean "iicbus_if.h" -dev/iicbus/iiconf.c optional iicbus -dev/iicbus/iicbus.c optional iicbus -dev/iicbus/if_ic.c optional ic -dev/iicbus/iic.c optional iic -dev/trm/trm.c optional trm -dev/twe/twe.c optional twe -dev/twe/twe_freebsd.c optional twe -dev/tx/if_tx.c optional tx -dev/txp/if_txp.c optional txp -dev/vinum/vinum.c optional vinum -dev/vinum/vinumconfig.c optional vinum -dev/vinum/vinumdaemon.c optional vinum -dev/vinum/vinuminterrupt.c optional vinum -dev/vinum/vinumio.c optional vinum -dev/vinum/vinumioctl.c optional vinum -dev/vinum/vinumlock.c optional vinum -dev/vinum/vinummemory.c optional vinum -dev/vinum/vinumparser.c optional vinum -dev/vinum/vinumraid5.c optional vinum -dev/vinum/vinumrequest.c optional vinum -dev/vinum/vinumrevive.c optional vinum -dev/vinum/vinumstate.c optional vinum -dev/vinum/vinumutil.c optional vinum -dev/vn/vn.c optional vn -dev/vx/if_vx.c optional vx -dev/vx/if_vx_eisa.c optional vx eisa -dev/vx/if_vx_pci.c optional vx pci -dev/wi/if_wi.c optional wi -dev/wi/if_wi_pccard.c optional wi card -dev/wi/if_wi_pci.c optional wi pci -dev/wi/wi_hostap.c optional wi -dev/xe/if_xe.c optional xe card -gnu/ext2fs/ext2_alloc.c optional ext2fs -gnu/ext2fs/ext2_balloc.c optional ext2fs -gnu/ext2fs/ext2_inode.c optional ext2fs -gnu/ext2fs/ext2_inode_cnv.c optional ext2fs -gnu/ext2fs/ext2_linux_balloc.c optional ext2fs -gnu/ext2fs/ext2_linux_ialloc.c optional ext2fs -gnu/ext2fs/ext2_lookup.c optional ext2fs -gnu/ext2fs/ext2_subr.c optional ext2fs -gnu/ext2fs/ext2_vfsops.c optional ext2fs -gnu/ext2fs/ext2_vnops.c optional ext2fs +bus/iicbus/iiconf.c optional iicbus +bus/iicbus/iicbus.c optional iicbus +bus/iicbus/iic.c optional iic +dev/netif/ic/if_ic.c optional ic +dev/disk/trm/trm.c optional trm +dev/raid/twe/twe.c optional twe +dev/raid/twe/twe_freebsd.c optional twe +dev/netif/tx/if_tx.c optional tx +dev/netif/txp/if_txp.c optional txp +dev/raid/vinum/vinum.c optional vinum +dev/raid/vinum/vinumconfig.c optional vinum +dev/raid/vinum/vinumdaemon.c optional vinum +dev/raid/vinum/vinuminterrupt.c optional vinum +dev/raid/vinum/vinumio.c optional vinum +dev/raid/vinum/vinumioctl.c optional vinum +dev/raid/vinum/vinumlock.c optional vinum +dev/raid/vinum/vinummemory.c optional vinum +dev/raid/vinum/vinumparser.c optional vinum +dev/raid/vinum/vinumraid5.c optional vinum +dev/raid/vinum/vinumrequest.c optional vinum +dev/raid/vinum/vinumrevive.c optional vinum +dev/raid/vinum/vinumstate.c optional vinum +dev/raid/vinum/vinumutil.c optional vinum +dev/disk/vn/vn.c optional vn +dev/netif/vx/if_vx.c optional vx +dev/netif/vx/if_vx_eisa.c optional vx eisa +dev/netif/vx/if_vx_pci.c optional vx pci +dev/netif/wi/if_wi.c optional wi +dev/netif/wi/if_wi_pccard.c optional wi card +dev/netif/wi/if_wi_pci.c optional wi pci +dev/netif/wi/wi_hostap.c optional wi +dev/netif/xe/if_xe.c optional xe card +vfs/gnu/ext2fs/ext2_alloc.c optional ext2fs +vfs/gnu/ext2fs/ext2_balloc.c optional ext2fs +vfs/gnu/ext2fs/ext2_inode.c optional ext2fs +vfs/gnu/ext2fs/ext2_inode_cnv.c optional ext2fs +vfs/gnu/ext2fs/ext2_linux_balloc.c optional ext2fs +vfs/gnu/ext2fs/ext2_linux_ialloc.c optional ext2fs +vfs/gnu/ext2fs/ext2_lookup.c optional ext2fs +vfs/gnu/ext2fs/ext2_subr.c optional ext2fs +vfs/gnu/ext2fs/ext2_vfsops.c optional ext2fs +vfs/gnu/ext2fs/ext2_vnops.c optional ext2fs # # isdn4bsd device drivers # -i4b/driver/i4b_trace.c optional i4btrc -i4b/driver/i4b_rbch.c optional i4brbch -i4b/driver/i4b_tel.c optional i4btel -i4b/driver/i4b_ipr.c optional i4bipr -net/slcompress.c optional i4bipr -i4b/driver/i4b_ctl.c optional i4bctl -i4b/driver/i4b_ing.c optional i4bing -i4b/driver/i4b_isppp.c optional i4bisppp -net/slcompress.c optional i4bisppp +net/i4b/driver/i4b_trace.c optional i4btrc +net/i4b/driver/i4b_rbch.c optional i4brbch +net/i4b/driver/i4b_tel.c optional i4btel +net/i4b/driver/i4b_ipr.c optional i4bipr +net/i4b/driver/i4b_ctl.c optional i4bctl +net/i4b/driver/i4b_ing.c optional i4bing +net/i4b/driver/i4b_isppp.c optional i4bisppp # # isdn4bsd CAPI driver # -i4b/capi/capi_l4if.c optional i4bcapi -i4b/capi/capi_llif.c optional i4bcapi -i4b/capi/capi_msgs.c optional i4bcapi +net/i4b/capi/capi_l4if.c optional i4bcapi +net/i4b/capi/capi_llif.c optional i4bcapi +net/i4b/capi/capi_msgs.c optional i4bcapi # # isdn4bsd AVM B1/T1 CAPI driver # -i4b/capi/iavc/iavc_pci.c optional iavc -i4b/capi/iavc/iavc_isa.c optional iavc -i4b/capi/iavc/iavc_lli.c optional iavc -i4b/capi/iavc/iavc_card.c optional iavc +net/i4b/capi/iavc/iavc_pci.c optional iavc +net/i4b/capi/iavc/iavc_isa.c optional iavc +net/i4b/capi/iavc/iavc_lli.c optional iavc +net/i4b/capi/iavc/iavc_card.c optional iavc # # isdn4bsd support # -i4b/layer2/i4b_mbuf.c optional i4btrc +net/i4b/layer2/i4b_mbuf.c optional i4btrc # # isdn4bsd Q.921 handler # -i4b/layer2/i4b_l2.c optional i4bq921 -i4b/layer2/i4b_l2fsm.c optional i4bq921 -i4b/layer2/i4b_uframe.c optional i4bq921 -i4b/layer2/i4b_tei.c optional i4bq921 -i4b/layer2/i4b_sframe.c optional i4bq921 -i4b/layer2/i4b_iframe.c optional i4bq921 -i4b/layer2/i4b_l2timer.c optional i4bq921 -i4b/layer2/i4b_util.c optional i4bq921 -i4b/layer2/i4b_lme.c optional i4bq921 +net/i4b/layer2/i4b_l2.c optional i4bq921 +net/i4b/layer2/i4b_l2fsm.c optional i4bq921 +net/i4b/layer2/i4b_uframe.c optional i4bq921 +net/i4b/layer2/i4b_tei.c optional i4bq921 +net/i4b/layer2/i4b_sframe.c optional i4bq921 +net/i4b/layer2/i4b_iframe.c optional i4bq921 +net/i4b/layer2/i4b_l2timer.c optional i4bq921 +net/i4b/layer2/i4b_util.c optional i4bq921 +net/i4b/layer2/i4b_lme.c optional i4bq921 # # isdn4bsd Q.931 handler # -i4b/layer3/i4b_q931.c optional i4bq931 -i4b/layer3/i4b_l3fsm.c optional i4bq931 -i4b/layer3/i4b_l3timer.c optional i4bq931 -i4b/layer3/i4b_l2if.c optional i4bq931 -i4b/layer3/i4b_l4if.c optional i4bq931 -i4b/layer3/i4b_q932fac.c optional i4bq931 +net/i4b/layer3/i4b_q931.c optional i4bq931 +net/i4b/layer3/i4b_l3fsm.c optional i4bq931 +net/i4b/layer3/i4b_l3timer.c optional i4bq931 +net/i4b/layer3/i4b_l2if.c optional i4bq931 +net/i4b/layer3/i4b_l4if.c optional i4bq931 +net/i4b/layer3/i4b_q932fac.c optional i4bq931 # # isdn4bsd control device driver, interface to isdnd # -i4b/layer4/i4b_i4bdrv.c optional i4b -i4b/layer4/i4b_l4.c optional i4b -i4b/layer4/i4b_l4mgmt.c optional i4b -i4b/layer4/i4b_l4timer.c optional i4b +net/i4b/layer4/i4b_i4bdrv.c optional i4b +net/i4b/layer4/i4b_l4.c optional i4b +net/i4b/layer4/i4b_l4mgmt.c optional i4b +net/i4b/layer4/i4b_l4timer.c optional i4b # -isofs/cd9660/cd9660_bmap.c optional cd9660 -isofs/cd9660/cd9660_lookup.c optional cd9660 -isofs/cd9660/cd9660_node.c optional cd9660 -isofs/cd9660/cd9660_rrip.c optional cd9660 -isofs/cd9660/cd9660_util.c optional cd9660 -isofs/cd9660/cd9660_vfsops.c optional cd9660 -isofs/cd9660/cd9660_vnops.c optional cd9660 +vfs/isofs/cd9660/cd9660_bmap.c optional cd9660 +vfs/isofs/cd9660/cd9660_lookup.c optional cd9660 +vfs/isofs/cd9660/cd9660_node.c optional cd9660 +vfs/isofs/cd9660/cd9660_rrip.c optional cd9660 +vfs/isofs/cd9660/cd9660_util.c optional cd9660 +vfs/isofs/cd9660/cd9660_vfsops.c optional cd9660 +vfs/isofs/cd9660/cd9660_vnops.c optional cd9660 kern/imgact_aout.c standard kern/imgact_elf.c standard kern/imgact_gzip.c optional gzip @@ -646,7 +644,7 @@ kern/subr_diskslice.c standard kern/subr_eventhandler.c standard kern/subr_kobj.c standard kern/subr_log.c standard -kern/subr_mchain.c optional libmchain +kern/libmchain/subr_mchain.c optional libmchain kern/subr_module.c standard kern/subr_param.c standard kern/subr_prf.c standard @@ -693,583 +691,584 @@ kern/vfs_syscalls.c standard kern/vfs_vnops.c standard kern/kern_threads.c standard kern/vfs_aio.c standard -miscfs/deadfs/dead_vnops.c standard -miscfs/fdesc/fdesc_vfsops.c optional fdesc -miscfs/fdesc/fdesc_vnops.c optional fdesc -miscfs/fifofs/fifo_vnops.c standard -miscfs/nullfs/null_subr.c optional nullfs -miscfs/nullfs/null_vfsops.c optional nullfs -miscfs/nullfs/null_vnops.c optional nullfs -miscfs/portal/portal_vfsops.c optional portal -miscfs/portal/portal_vnops.c optional portal -miscfs/procfs/procfs_ctl.c optional procfs -miscfs/procfs/procfs_dbregs.c standard -miscfs/procfs/procfs_fpregs.c standard -miscfs/procfs/procfs_map.c optional procfs -miscfs/procfs/procfs_mem.c standard -miscfs/procfs/procfs_note.c optional procfs -miscfs/procfs/procfs_regs.c standard -miscfs/procfs/procfs_status.c optional procfs -miscfs/procfs/procfs_subr.c optional procfs -miscfs/procfs/procfs_type.c optional procfs -miscfs/procfs/procfs_vfsops.c optional procfs -miscfs/procfs/procfs_vnops.c optional procfs -miscfs/procfs/procfs_rlimit.c optional procfs -miscfs/specfs/spec_vnops.c standard -miscfs/umapfs/umap_subr.c optional umapfs -miscfs/umapfs/umap_vfsops.c optional umapfs -miscfs/umapfs/umap_vnops.c optional umapfs -miscfs/union/union_subr.c optional union -miscfs/union/union_vfsops.c optional union -miscfs/union/union_vnops.c optional union -msdosfs/msdosfs_conv.c optional msdosfs -msdosfs/msdosfs_denode.c optional msdosfs -msdosfs/msdosfs_fat.c optional msdosfs -msdosfs/msdosfs_lookup.c optional msdosfs -msdosfs/msdosfs_vfsops.c optional msdosfs -msdosfs/msdosfs_vnops.c optional msdosfs -ntfs/ntfs_vfsops.c optional ntfs -ntfs/ntfs_vnops.c optional ntfs -ntfs/ntfs_subr.c optional ntfs -ntfs/ntfs_compr.c optional ntfs -ntfs/ntfs_ihash.c optional ntfs -net/bpf.c standard -net/bpf_filter.c optional bpf -net/bridge.c optional bridge -net/bsd_comp.c optional ppp_bsdcomp +vfs/deadfs/dead_vnops.c standard +vfs/fdesc/fdesc_vfsops.c optional fdesc +vfs/fdesc/fdesc_vnops.c optional fdesc +vfs/fifofs/fifo_vnops.c standard +vfs/nullfs/null_subr.c optional nullfs +vfs/nullfs/null_vfsops.c optional nullfs +vfs/nullfs/null_vnops.c optional nullfs +vfs/portal/portal_vfsops.c optional portal +vfs/portal/portal_vnops.c optional portal +vfs/procfs/procfs_ctl.c optional procfs +vfs/procfs/procfs_dbregs.c standard +vfs/procfs/procfs_fpregs.c standard +vfs/procfs/procfs_map.c optional procfs +vfs/procfs/procfs_mem.c standard +vfs/procfs/procfs_note.c optional procfs +vfs/procfs/procfs_regs.c standard +vfs/procfs/procfs_status.c optional procfs +vfs/procfs/procfs_subr.c optional procfs +vfs/procfs/procfs_type.c optional procfs +vfs/procfs/procfs_vfsops.c optional procfs +vfs/procfs/procfs_vnops.c optional procfs +vfs/procfs/procfs_rlimit.c optional procfs +vfs/specfs/spec_vnops.c standard +vfs/umapfs/umap_subr.c optional umapfs +vfs/umapfs/umap_vfsops.c optional umapfs +vfs/umapfs/umap_vnops.c optional umapfs +vfs/union/union_subr.c optional union +vfs/union/union_vfsops.c optional union +vfs/union/union_vnops.c optional union +vfs/msdosfs/msdosfs_conv.c optional msdosfs +vfs/msdosfs/msdosfs_denode.c optional msdosfs +vfs/msdosfs/msdosfs_fat.c optional msdosfs +vfs/msdosfs/msdosfs_lookup.c optional msdosfs +vfs/msdosfs/msdosfs_vfsops.c optional msdosfs +vfs/msdosfs/msdosfs_vnops.c optional msdosfs +vfs/ntfs/ntfs_vfsops.c optional ntfs +vfs/ntfs/ntfs_vnops.c optional ntfs +vfs/ntfs/ntfs_subr.c optional ntfs +vfs/ntfs/ntfs_compr.c optional ntfs +vfs/ntfs/ntfs_ihash.c optional ntfs +net/bpf.c standard +net/bpf_filter.c optional bpf +net/bridge/bridge.c optional bridge +net/bsd_comp.c optional ppp_bsdcomp #net/hostcache.c standard -net/if.c standard -net/if_arcsubr.c optional arcnet -net/if_atmsubr.c optional atm -net/if_disc.c optional disc -net/if_ef.c optional ef -net/if_ethersubr.c optional ether -net/if_iso88025subr.c optional token -net/if_faith.c optional faith -net/if_fddisubr.c optional fddi -net/if_gif.c optional gif -net/if_gre.c optional gre +net/if.c standard +net/if_arcsubr.c optional arcnet +net/if_atmsubr.c optional atm +net/disc/if_disc.c optional disc +net/ef/if_ef.c optional ef +net/if_ethersubr.c optional ether +net/if_iso88025subr.c optional token +net/faith/if_faith.c optional faith +net/if_fddisubr.c optional fddi +net/gif/if_gif.c optional gif +net/gre/if_gre.c optional gre +net/ppp_layer/slcompress.c optional netgraph_vjc +net/ppp_layer/slcompress.c optional ppp +net/ppp_layer/slcompress.c optional sl +net/ppp_layer/slcompress.c optional sppp +net/ppp_layer/slcompress.c optional i4bisppp +net/ppp_layer/slcompress.c optional i4bipr +net/ppp_layer/ppp_deflate.c optional ppp_deflate +net/ppp_layer/ppp_tty.c optional ppp net/if_loop.c optional loop net/if_media.c standard net/if_mib.c standard -net/if_ppp.c optional ppp -net/if_sl.c optional sl -net/if_spppsubr.c optional sppp -net/if_spppsubr.c optional i4bisppp -net/if_stf.c optional stf -net/if_tun.c optional tun -net/if_tap.c optional tap -net/if_vlan.c optional vlan +net/ppp/if_ppp.c optional ppp +net/sl/if_sl.c optional sl +net/sppp/if_spppsubr.c optional sppp +net/sppp/if_spppsubr.c optional i4bisppp +net/stf/if_stf.c optional stf +net/tun/if_tun.c optional tun +net/tap/if_tap.c optional tap +net/vlan/if_vlan.c optional vlan net/net_osdep.c standard net/netisr.c standard -net/ppp_deflate.c optional ppp_deflate -net/ppp_tty.c optional ppp net/intrq.c standard net/radix.c standard net/raw_cb.c standard net/raw_usrreq.c standard net/route.c standard net/rtsock.c standard -net/slcompress.c optional ppp -net/slcompress.c optional sl -net/slcompress.c optional sppp net/zlib.c optional ppp_deflate net/zlib.c optional ipsec -netatalk/aarp.c optional netatalk -netatalk/at_control.c optional netatalk -netatalk/at_proto.c optional netatalk -netatalk/at_rmx.c optional netatalkdebug -netatalk/ddp_input.c optional netatalk -netatalk/ddp_output.c optional netatalk -netatalk/ddp_usrreq.c optional netatalk -netatm/atm_aal5.c optional atm_core -netatm/atm_cm.c optional atm_core -netatm/atm_device.c optional atm_core -netatm/atm_if.c optional atm_core -netatm/atm_proto.c optional atm_core -netatm/atm_signal.c optional atm_core -netatm/atm_socket.c optional atm_core -netatm/atm_subr.c optional atm_core -netatm/atm_usrreq.c optional atm_core -netatm/ipatm/ipatm_event.c optional atm_ip atm_core -netatm/ipatm/ipatm_if.c optional atm_ip atm_core -netatm/ipatm/ipatm_input.c optional atm_ip atm_core -netatm/ipatm/ipatm_load.c optional atm_ip atm_core -netatm/ipatm/ipatm_output.c optional atm_ip atm_core -netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core -netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core -netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core -netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core -netatm/spans/spans_arp.c optional atm_spans atm_core \ +netproto/atalk/aarp.c optional netatalk +netproto/atalk/at_control.c optional netatalk +netproto/atalk/at_proto.c optional netatalk +netproto/atalk/at_rmx.c optional netatalkdebug +netproto/atalk/ddp_input.c optional netatalk +netproto/atalk/ddp_output.c optional netatalk +netproto/atalk/ddp_usrreq.c optional netatalk +netproto/atm/atm_aal5.c optional atm_core +netproto/atm/atm_cm.c optional atm_core +netproto/atm/atm_device.c optional atm_core +netproto/atm/atm_if.c optional atm_core +netproto/atm/atm_proto.c optional atm_core +netproto/atm/atm_signal.c optional atm_core +netproto/atm/atm_socket.c optional atm_core +netproto/atm/atm_subr.c optional atm_core +netproto/atm/atm_usrreq.c optional atm_core +netproto/atm/ipatm/ipatm_event.c optional atm_ip atm_core +netproto/atm/ipatm/ipatm_if.c optional atm_ip atm_core +netproto/atm/ipatm/ipatm_input.c optional atm_ip atm_core +netproto/atm/ipatm/ipatm_load.c optional atm_ip atm_core +netproto/atm/ipatm/ipatm_output.c optional atm_ip atm_core +netproto/atm/ipatm/ipatm_usrreq.c optional atm_ip atm_core +netproto/atm/ipatm/ipatm_vcm.c optional atm_ip atm_core +netproto/atm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core +netproto/atm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core +netproto/atm/spans/spans_arp.c optional atm_spans atm_core \ dependency "spans_xdr.h" -netatm/spans/spans_cls.c optional atm_spans atm_core -netatm/spans/spans_if.c optional atm_spans atm_core -netatm/spans/spans_kxdr.c optional atm_spans atm_core -netatm/spans/spans_msg.c optional atm_spans atm_core -netatm/spans/spans_print.c optional atm_spans atm_core -netatm/spans/spans_proto.c optional atm_spans atm_core -netatm/spans/spans_subr.c optional atm_spans atm_core -netatm/spans/spans_util.c optional atm_spans atm_core +netproto/atm/spans/spans_cls.c optional atm_spans atm_core +netproto/atm/spans/spans_if.c optional atm_spans atm_core +netproto/atm/spans/spans_kxdr.c optional atm_spans atm_core +netproto/atm/spans/spans_msg.c optional atm_spans atm_core +netproto/atm/spans/spans_print.c optional atm_spans atm_core +netproto/atm/spans/spans_proto.c optional atm_spans atm_core +netproto/atm/spans/spans_subr.c optional atm_spans atm_core +netproto/atm/spans/spans_util.c optional atm_spans atm_core spans_xdr.h optional atm_spans atm_core \ before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x > spans_xdr.h" \ + dependency "$S/netproto/atm/spans/spans_xdr.x" \ + compile-with "rpcgen -h -C $S/netproto/atm/spans/spans_xdr.x > spans_xdr.h" \ clean "spans_xdr.h" \ no-obj no-implicit-rule spans_xdr.c optional atm_spans atm_core \ before-depend \ - dependency "$S/netatm/spans/spans_xdr.x" \ - compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x > spans_xdr.c" \ + dependency "$S/netproto/atm/spans/spans_xdr.x" \ + compile-with "rpcgen -c -C $S/netproto/atm/spans/spans_xdr.x > spans_xdr.c" \ clean "spans_xdr.c" \ no-obj no-implicit-rule local spans_xdr.o optional atm_spans atm_core \ - dependency "$S/netatm/spans/spans_xdr.x" \ + dependency "$S/netproto/atm/spans/spans_xdr.x" \ compile-with "${NORMAL_C}" \ no-implicit-rule local -netatm/uni/q2110_sigaa.c optional atm_uni atm_core -netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core -netatm/uni/q2110_subr.c optional atm_uni atm_core -netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core -netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core -netatm/uni/qsaal1_subr.c optional atm_uni atm_core -netatm/uni/sscf_uni.c optional atm_uni atm_core -netatm/uni/sscf_uni_lower.c optional atm_uni atm_core -netatm/uni/sscf_uni_upper.c optional atm_uni atm_core -netatm/uni/sscop.c optional atm_uni atm_core -netatm/uni/sscop_lower.c optional atm_uni atm_core -netatm/uni/sscop_pdu.c optional atm_uni atm_core -netatm/uni/sscop_sigaa.c optional atm_uni atm_core -netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core -netatm/uni/sscop_subr.c optional atm_uni atm_core -netatm/uni/sscop_timer.c optional atm_uni atm_core -netatm/uni/sscop_upper.c optional atm_uni atm_core -netatm/uni/uni_load.c optional atm_uni atm_core -netatm/uni/uniarp.c optional atm_uni atm_core -netatm/uni/uniarp_cache.c optional atm_uni atm_core -netatm/uni/uniarp_input.c optional atm_uni atm_core -netatm/uni/uniarp_output.c optional atm_uni atm_core -netatm/uni/uniarp_timer.c optional atm_uni atm_core -netatm/uni/uniarp_vcm.c optional atm_uni atm_core -netatm/uni/uniip.c optional atm_uni atm_core -netatm/uni/unisig_decode.c optional atm_uni atm_core -netatm/uni/unisig_encode.c optional atm_uni atm_core -netatm/uni/unisig_if.c optional atm_uni atm_core -netatm/uni/unisig_mbuf.c optional atm_uni atm_core -netatm/uni/unisig_msg.c optional atm_uni atm_core -netatm/uni/unisig_print.c optional atm_uni atm_core -netatm/uni/unisig_proto.c optional atm_uni atm_core -netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core -netatm/uni/unisig_subr.c optional atm_uni atm_core -netatm/uni/unisig_util.c optional atm_uni atm_core -netatm/uni/unisig_vc_state.c optional atm_uni atm_core -netgraph/ng_base.c optional netgraph -netgraph/ng_parse.c optional netgraph -netgraph/ng_async.c optional netgraph_async -netgraph/ng_bpf.c optional netgraph_bpf +netproto/atm/uni/q2110_sigaa.c optional atm_uni atm_core +netproto/atm/uni/q2110_sigcpcs.c optional atm_uni atm_core +netproto/atm/uni/q2110_subr.c optional atm_uni atm_core +netproto/atm/uni/qsaal1_sigaa.c optional atm_uni atm_core +netproto/atm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core +netproto/atm/uni/qsaal1_subr.c optional atm_uni atm_core +netproto/atm/uni/sscf_uni.c optional atm_uni atm_core +netproto/atm/uni/sscf_uni_lower.c optional atm_uni atm_core +netproto/atm/uni/sscf_uni_upper.c optional atm_uni atm_core +netproto/atm/uni/sscop.c optional atm_uni atm_core +netproto/atm/uni/sscop_lower.c optional atm_uni atm_core +netproto/atm/uni/sscop_pdu.c optional atm_uni atm_core +netproto/atm/uni/sscop_sigaa.c optional atm_uni atm_core +netproto/atm/uni/sscop_sigcpcs.c optional atm_uni atm_core +netproto/atm/uni/sscop_subr.c optional atm_uni atm_core +netproto/atm/uni/sscop_timer.c optional atm_uni atm_core +netproto/atm/uni/sscop_upper.c optional atm_uni atm_core +netproto/atm/uni/uni_load.c optional atm_uni atm_core +netproto/atm/uni/uniarp.c optional atm_uni atm_core +netproto/atm/uni/uniarp_cache.c optional atm_uni atm_core +netproto/atm/uni/uniarp_input.c optional atm_uni atm_core +netproto/atm/uni/uniarp_output.c optional atm_uni atm_core +netproto/atm/uni/uniarp_timer.c optional atm_uni atm_core +netproto/atm/uni/uniarp_vcm.c optional atm_uni atm_core +netproto/atm/uni/uniip.c optional atm_uni atm_core +netproto/atm/uni/unisig_decode.c optional atm_uni atm_core +netproto/atm/uni/unisig_encode.c optional atm_uni atm_core +netproto/atm/uni/unisig_if.c optional atm_uni atm_core +netproto/atm/uni/unisig_mbuf.c optional atm_uni atm_core +netproto/atm/uni/unisig_msg.c optional atm_uni atm_core +netproto/atm/uni/unisig_print.c optional atm_uni atm_core +netproto/atm/uni/unisig_proto.c optional atm_uni atm_core +netproto/atm/uni/unisig_sigmgr_state.c optional atm_uni atm_core +netproto/atm/uni/unisig_subr.c optional atm_uni atm_core +netproto/atm/uni/unisig_util.c optional atm_uni atm_core +netproto/atm/uni/unisig_vc_state.c optional atm_uni atm_core +netgraph/netgraph/ng_base.c optional netgraph +netgraph/netgraph/ng_parse.c optional netgraph +netgraph/async/ng_async.c optional netgraph_async +netgraph/bpf/ng_bpf.c optional netgraph_bpf net/bpf_filter.c optional netgraph_bpf -netgraph/ng_bridge.c optional netgraph_bridge -netgraph/ng_cisco.c optional netgraph_cisco -netgraph/ng_echo.c optional netgraph_echo -netgraph/ng_ether.c optional netgraph_ether -netgraph/ng_frame_relay.c optional netgraph_frame_relay -netgraph/ng_hole.c optional netgraph_hole -netgraph/ng_iface.c optional netgraph_iface -netgraph/ng_ksocket.c optional netgraph_ksocket -netgraph/ng_l2tp.c optional netgraph_l2tp -netgraph/ng_lmi.c optional netgraph_lmi -netgraph/ng_mppc.c optional netgraph_mppc_compression +netgraph/bridge/ng_bridge.c optional netgraph_bridge +netgraph/cisco/ng_cisco.c optional netgraph_cisco +netgraph/echo/ng_echo.c optional netgraph_echo +netgraph/ether/ng_ether.c optional netgraph_ether +netgraph/frame_relay/ng_frame_relay.c optional netgraph_frame_relay +netgraph/hole/ng_hole.c optional netgraph_hole +netgraph/iface/ng_iface.c optional netgraph_iface +netgraph/ksocket/ng_ksocket.c optional netgraph_ksocket +netgraph/l2tp/ng_l2tp.c optional netgraph_l2tp +netgraph/lmi/ng_lmi.c optional netgraph_lmi +netgraph/mppc/ng_mppc.c optional netgraph_mppc_compression # The next two files (plus the header file net/mppc.h) are proprietary and # must be obtained elsewhere in order to enable NETGRAPH_MPPC_COMPRESSION -net/mppcc.c optional netgraph_mppc_compression -net/mppcd.c optional netgraph_mppc_compression -netgraph/ng_mppc.c optional netgraph_mppc_encryption -crypto/rc4/rc4.c optional awi -crypto/rc4/rc4.c optional netgraph_mppc_encryption -crypto/sha1.c optional netgraph_mppc_encryption -netgraph/ng_one2many.c optional netgraph_one2many -netgraph/ng_parse.c optional netgraph -netgraph/ng_ppp.c optional netgraph_ppp -netgraph/ng_pppoe.c optional netgraph_pppoe -netgraph/ng_pptpgre.c optional netgraph_pptpgre -netgraph/ng_rfc1490.c optional netgraph_rfc1490 -netgraph/ng_socket.c optional netgraph_socket -netgraph/ng_tee.c optional netgraph_tee -netgraph/ng_tty.c optional netgraph_tty -netgraph/ng_UI.c optional netgraph_UI -netgraph/ng_vjc.c optional netgraph_vjc -net/slcompress.c optional netgraph_vjc -netinet/accf_data.c optional accept_filter_data -netinet/accf_http.c optional accept_filter_http -netinet/if_atm.c optional atm -netinet/if_ether.c optional ether -netinet/in_gif.c optional gif inet -netinet/igmp.c optional inet -netinet/in.c optional inet -#netinet/in_hostcache.c optional inet -netinet/ip_gre.c optional gre inet -netinet/ip_id.c optional inet -netinet/in_pcb.c optional inet -netinet/in_proto.c optional inet -netinet/in_rmx.c optional inet -netinet/ip_ecn.c optional inet -netinet/ip_ecn.c optional inet6 -netinet/ip_encap.c optional inet -netinet/ip_encap.c optional inet6 -netinet/ip_divert.c optional ipdivert -netinet/ip_dummynet.c optional dummynet -netinet/ip_flow.c optional inet -netinet/ip_fw.c optional ipfirewall -netinet/ip_fw2.c optional ipfw2 -netinet/ip_icmp.c optional inet -netinet/ip_input.c optional inet -netinet/ip_mroute.c optional mrouting -netinet/ip_output.c optional inet -netinet/raw_ip.c optional inet -netinet/tcp_debug.c optional tcpdebug -netinet/tcp_input.c optional inet -netinet/tcp_output.c optional inet -netinet/tcp_subr.c optional inet -netinet/tcp_syncache.c optional inet -netinet/tcp_timer.c optional inet -netinet/tcp_usrreq.c optional inet -netinet/udp_usrreq.c optional inet -netinet6/ah_core.c optional ipsec -netinet6/ah_input.c optional ipsec -netinet6/ah_output.c optional ipsec -netinet6/esp_core.c optional ipsec ipsec_esp -netinet6/esp_input.c optional ipsec ipsec_esp -netinet6/esp_output.c optional ipsec ipsec_esp -netinet6/esp_rijndael.c optional ipsec ipsec_esp -netinet6/ipsec.c optional ipsec -netinet6/dest6.c optional inet6 -netinet6/frag6.c optional inet6 -netinet6/icmp6.c optional inet6 -netinet6/in6.c optional inet6 -netinet6/in6_cksum.c optional inet6 -netinet6/in6_gif.c optional gif inet6 -netinet6/ip6_forward.c optional inet6 -netinet6/ip6_fw.c optional inet6 ipv6firewall -netinet6/in6_ifattach.c optional inet6 -netinet6/ip6_input.c optional inet6 -netinet6/ip6_mroute.c optional inet6 -netinet6/ip6_output.c optional inet6 -netinet6/in6_src.c optional inet6 -netinet6/ipcomp_core.c optional ipsec -netinet6/ipcomp_input.c optional ipsec +netgraph/mppc/mppcc.c optional netgraph_mppc_compression +netgarph/mppc/mppcd.c optional netgraph_mppc_compression +netgraph/mppc/ng_mppc.c optional netgraph_mppc_encryption +crypto/rc4/rc4.c optional awi +crypto/rc4/rc4.c optional netgraph_mppc_encryption +crypto/sha1.c optional netgraph_mppc_encryption +netgraph/one2many/ng_one2many.c optional netgraph_one2many +netgraph/ppp/ng_ppp.c optional netgraph_ppp +netgraph/pppoe/ng_pppoe.c optional netgraph_pppoe +netgraph/pptpgre/ng_pptpgre.c optional netgraph_pptpgre +netgraph/rfc1490/ng_rfc1490.c optional netgraph_rfc1490 +netgraph/socket/ng_socket.c optional netgraph_socket +netgraph/tee/ng_tee.c optional netgraph_tee +netgraph/tty/ng_tty.c optional netgraph_tty +netgraph/UI/ng_UI.c optional netgraph_UI +netgraph/vjc/ng_vjc.c optional netgraph_vjc +net/accf_data/accf_data.c optional accept_filter_data +net/accf_http/accf_http.c optional accept_filter_http +netinet/if_atm.c optional atm +netinet/if_ether.c optional ether +netinet/in_gif.c optional gif inet +netinet/igmp.c optional inet +netinet/in.c optional inet +#netinet/in_hostcache.c optional inet +netinet/ip_gre.c optional gre inet +netinet/ip_id.c optional inet +netinet/in_pcb.c optional inet +netinet/in_proto.c optional inet +netinet/in_rmx.c optional inet +netinet/ip_ecn.c optional inet +netinet/ip_ecn.c optional inet6 +netinet/ip_encap.c optional inet +netinet/ip_encap.c optional inet6 +netinet/ip_divert.c optional ipdivert +net/dummynet/ip_dummynet.c optional dummynet +netinet/ip_flow.c optional inet +net/ipfw/ip_fw.c optional ipfirewall +net/ipfw/ip_fw2.c optional ipfw2 +netinet/ip_icmp.c optional inet +netinet/ip_input.c optional inet +net/ip_mroute/ip_mroute.c optional mrouting +netinet/ip_output.c optional inet +netinet/raw_ip.c optional inet +netinet/tcp_debug.c optional tcpdebug +netinet/tcp_input.c optional inet +netinet/tcp_output.c optional inet +netinet/tcp_subr.c optional inet +netinet/tcp_syncache.c optional inet +netinet/tcp_timer.c optional inet +netinet/tcp_usrreq.c optional inet +netinet/udp_usrreq.c optional inet +netinet6/ah_core.c optional ipsec +netinet6/ah_input.c optional ipsec +netinet6/ah_output.c optional ipsec +netinet6/esp_core.c optional ipsec ipsec_esp +netinet6/esp_input.c optional ipsec ipsec_esp +netinet6/esp_output.c optional ipsec ipsec_esp +netinet6/esp_rijndael.c optional ipsec ipsec_esp +netinet6/ipsec.c optional ipsec +netinet6/dest6.c optional inet6 +netinet6/frag6.c optional inet6 +netinet6/icmp6.c optional inet6 +netinet6/in6.c optional inet6 +netinet6/in6_cksum.c optional inet6 +netinet6/in6_gif.c optional gif inet6 +netinet6/ip6_forward.c optional inet6 +net/ip6fw/ip6_fw.c optional inet6 ipv6firewall +netinet6/in6_ifattach.c optional inet6 +netinet6/ip6_input.c optional inet6 +netinet6/ip6_mroute.c optional inet6 +netinet6/ip6_output.c optional inet6 +netinet6/in6_src.c optional inet6 +netinet6/ipcomp_core.c optional ipsec +netinet6/ipcomp_input.c optional ipsec netinet6/ipcomp_output.c optional ipsec -netinet6/in6_pcb.c optional inet6 -netinet6/in6_prefix.c optional inet6 -netinet6/in6_proto.c optional inet6 -netinet6/in6_rmx.c optional inet6 -netinet6/mld6.c optional inet6 -netinet6/nd6.c optional inet6 -netinet6/nd6_nbr.c optional inet6 -netinet6/nd6_rtr.c optional inet6 -netinet6/raw_ip6.c optional inet6 -netinet6/route6.c optional inet6 -netinet6/scope6.c optional inet6 -netinet6/udp6_output.c optional inet6 -netinet6/udp6_usrreq.c optional inet6 -netipsec/ipsec.c optional fast_ipsec -netipsec/ipsec_input.c optional fast_ipsec -netipsec/ipsec_mbuf.c optional fast_ipsec -netipsec/ipsec_output.c optional fast_ipsec -netipsec/key.c optional fast_ipsec -netipsec/key_debug.c optional fast_ipsec -netipsec/keysock.c optional fast_ipsec -netipsec/xform_ah.c optional fast_ipsec -netipsec/xform_esp.c optional fast_ipsec -netipsec/xform_ipcomp.c optional fast_ipsec -netipsec/xform_ipip.c optional fast_ipsec -netipx/ipx.c optional ipx -netipx/ipx_cksum.c optional ipx -netipx/ipx_input.c optional ipx -netipx/ipx_ip.c optional ipx -netipx/ipx_outputfl.c optional ipx -netipx/ipx_pcb.c optional ipx -netipx/ipx_proto.c optional ipx -netipx/ipx_tun.c optional ipx -netipx/ipx_usrreq.c optional ipx -netipx/spx_debug.c optional ipx -netipx/spx_usrreq.c optional ipx -netkey/key.c optional ipsec -netkey/key_debug.c optional ipsec -netkey/keydb.c optional ipsec -netkey/keysock.c optional ipsec -netnatm/natm.c optional natm -netnatm/natm_pcb.c optional natm -netnatm/natm_proto.c optional natm -netncp/ncp_conn.c optional ncp -netncp/ncp_crypt.c optional ncp -netncp/ncp_login.c optional ncp -netncp/ncp_mod.c optional ncp -netncp/ncp_ncp.c optional ncp -netncp/ncp_nls.c optional ncp -netncp/ncp_rq.c optional ncp -netncp/ncp_sock.c optional ncp -netncp/ncp_subr.c optional ncp -netns/idp_usrreq.c optional ns -netns/ns.c optional ns -netns/ns_error.c optional ns -netns/ns_input.c optional ns -netns/ns_ip.c optional ns -netns/ns_output.c optional ns -netns/ns_pcb.c optional ns -netns/ns_proto.c optional ns -netns/spp_debug.c optional ns -netns/spp_usrreq.c optional ns -nfs/nfs_bio.c optional nfs -nfs/nfs_node.c optional nfs -nfs/nfs_nqlease.c optional nfs -nfs/nfs_serv.c optional nfs -nfs/nfs_socket.c optional nfs -nfs/nfs_srvcache.c optional nfs -nfs/nfs_subs.c optional nfs -nfs/nfs_syscalls.c optional nfs -nfs/nfs_vfsops.c optional nfs -nfs/nfs_vnops.c optional nfs -nfs/bootp_subr.c optional bootp -nfs/krpc_subr.c optional bootp -nwfs/nwfs_io.c optional nwfs -nwfs/nwfs_ioctl.c optional nwfs -nwfs/nwfs_node.c optional nwfs -nwfs/nwfs_subr.c optional nwfs -nwfs/nwfs_vfsops.c optional nwfs -nwfs/nwfs_vnops.c optional nwfs -pccard/pccard.c optional card -pccard/pccard_beep.c optional card -pccard/pccard_nbk.c optional card -pccard/pcic.c optional pcic card -pccard/pcic_isa.c optional pcic isa card -pccard/pcic_pci.c optional pcic pci card -pci/agp.c optional agp -pci/agp_intel.c optional agp -pci/agp_via.c optional agp -pci/agp_sis.c optional agp -pci/agp_ali.c optional agp -pci/agp_amd.c optional agp -pci/agp_i810.c optional agp -agp_if.o optional agp \ +netinet6/in6_pcb.c optional inet6 +netinet6/in6_prefix.c optional inet6 +netinet6/in6_proto.c optional inet6 +netinet6/in6_rmx.c optional inet6 +netinet6/mld6.c optional inet6 +netinet6/nd6.c optional inet6 +netinet6/nd6_nbr.c optional inet6 +netinet6/nd6_rtr.c optional inet6 +netinet6/raw_ip6.c optional inet6 +netinet6/route6.c optional inet6 +netinet6/scope6.c optional inet6 +netinet6/udp6_output.c optional inet6 +netinet6/udp6_usrreq.c optional inet6 +netproto/ipsec/ipsec.c optional fast_ipsec +netproto/ipsec/ipsec_input.c optional fast_ipsec +netproto/ipsec/ipsec_mbuf.c optional fast_ipsec +netproto/ipsec/ipsec_output.c optional fast_ipsec +netproto/ipsec/key.c optional fast_ipsec +netproto/ipsec/key_debug.c optional fast_ipsec +netproto/ipsec/keysock.c optional fast_ipsec +netproto/ipsec/xform_ah.c optional fast_ipsec +netproto/ipsec/xform_esp.c optional fast_ipsec +netproto/ipsec/xform_ipcomp.c optional fast_ipsec +netproto/ipsec/xform_ipip.c optional fast_ipsec +netproto/ipx/ipx.c optional ipx +netproto/ipx/ipx_cksum.c optional ipx +netproto/ipx/ipx_input.c optional ipx +netproto/ipx/ipx_ip.c optional ipx +netproto/ipx/ipx_outputfl.c optional ipx +netproto/ipx/ipx_pcb.c optional ipx +netproto/ipx/ipx_proto.c optional ipx +netproto/ipx/ipx_tun.c optional ipx +netproto/ipx/ipx_usrreq.c optional ipx +netproto/ipx/spx_debug.c optional ipx +netproto/ipx/spx_usrreq.c optional ipx +netproto/key/key.c optional ipsec +netproto/key/key_debug.c optional ipsec +netproto/key/keydb.c optional ipsec +netproto/key/keysock.c optional ipsec +netproto/natm/natm.c optional natm +netproto/natm/natm_pcb.c optional natm +netproto/natm/natm_proto.c optional natm +netproto/ncp/ncp_conn.c optional ncp +netproto/ncp/ncp_crypt.c optional ncp +netproto/ncp/ncp_login.c optional ncp +netproto/ncp/ncp_mod.c optional ncp +netproto/ncp/ncp_ncp.c optional ncp +netproto/ncp/ncp_nls.c optional ncp +netproto/ncp/ncp_rq.c optional ncp +netproto/ncp/ncp_sock.c optional ncp +netproto/ncp/ncp_subr.c optional ncp +netproto/ns/idp_usrreq.c optional ns +netproto/ns/ns.c optional ns +netproto/ns/ns_error.c optional ns +netproto/ns/ns_input.c optional ns +netproto/ns/ns_ip.c optional ns +netproto/ns/ns_output.c optional ns +netproto/ns/ns_pcb.c optional ns +netproto/ns/ns_proto.c optional ns +netproto/ns/spp_debug.c optional ns +netproto/ns/spp_usrreq.c optional ns +vfs/nfs/nfs_bio.c optional nfs +vfs/nfs/nfs_node.c optional nfs +vfs/nfs/nfs_nqlease.c optional nfs +vfs/nfs/nfs_serv.c optional nfs +vfs/nfs/nfs_socket.c optional nfs +vfs/nfs/nfs_srvcache.c optional nfs +vfs/nfs/nfs_subs.c optional nfs +vfs/nfs/nfs_syscalls.c optional nfs +vfs/nfs/nfs_vfsops.c optional nfs +vfs/nfs/nfs_vnops.c optional nfs +vfs/nfs/bootp_subr.c optional bootp +vfs/nfs/krpc_subr.c optional bootp +vfs/nwfs/nwfs_io.c optional nwfs +vfs/nwfs/nwfs_ioctl.c optional nwfs +vfs/nwfs/nwfs_node.c optional nwfs +vfs/nwfs/nwfs_subr.c optional nwfs +vfs/nwfs/nwfs_vfsops.c optional nwfs +vfs/nwfs/nwfs_vnops.c optional nwfs +bus/pccard/pccard.c optional card +bus/pccard/pccard_beep.c optional card +bus/pccard/pccard_nbk.c optional card +bus/pccard/pcic.c optional pcic card +bus/pccard/pcic_isa.c optional pcic isa card +bus/pccard/pcic_pci.c optional pcic pci card +dev/agp/agp.c optional agp +dev/agp/agp_intel.c optional agp +dev/agp/agp_via.c optional agp +dev/agp/agp_sis.c optional agp +dev/agp/agp_ali.c optional agp +dev/agp/agp_amd.c optional agp +dev/agp/agp_i810.c optional agp +agp_if.o optional agp \ dependency "agp_if.c agp_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local agp_if.c optional agp \ - dependency "$S/kern/makeops.pl $S/pci/agp_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/pci/agp_if.m" \ + dependency "$S/kern/makeops.pl $S/dev/agp/agp_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/dev/agp/agp_if.m" \ no-obj no-implicit-rule before-depend local \ clean "agp_if.c" agp_if.h optional agp \ - dependency "$S/kern/makeops.pl $S/pci/agp_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/pci/agp_if.m" \ + dependency "$S/kern/makeops.pl $S/dev/agp/agp_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/dev/agp/agp_if.m" \ no-obj no-implicit-rule before-depend \ clean "agp_if.h" -pci/amd.c optional amd -dev/awi/am79c930.c optional awi -dev/awi/awi.c optional awi -dev/awi/awi_wep.c optional awi -dev/awi/awi_wicfg.c optional awi -dev/awi/if_awi_pccard.c optional awi card -dev/bktr/bktr_core.c optional bktr pci -dev/bktr/bktr_i2c.c optional bktr pci smbus -dev/bktr/bktr_card.c optional bktr pci -dev/bktr/bktr_tuner.c optional bktr pci -dev/bktr/bktr_audio.c optional bktr pci -dev/bktr/bktr_os.c optional bktr pci -pci/cy_pci.c optional cy pci -pci/if_dc.c optional dc -pci/if_de.c optional de -pci/if_en_pci.c optional en pci -pci/if_lnc_p.c optional lnc pci -pci/if_pcn.c optional pcn -pci/if_mn.c optional mn -pci/if_rl.c optional rl -pci/if_sf.c optional sf -pci/if_sis.c optional sis -pci/if_sk.c optional sk -pci/if_ste.c optional ste -pci/if_ti.c optional ti -pci/if_tl.c optional tl -pci/if_vr.c optional vr -pci/if_wb.c optional wb -pci/if_wx.c optional wx -pci/if_xl.c optional xl -pci/intpm.c optional intpm -pci/amdpm.c optional amdpm -pci/viapm.c optional viapm -pci/meteor.c optional meteor pci -pci/ncr.c optional ncr -dev/sym/sym_hipd.c optional sym \ - dependency "$S/dev/sym/sym_{conf,defs}.h" -pci/pci.c optional pci -pci/pci_compat.c optional pci -pci/pcisupport.c optional pci -pci_if.o optional pci \ +dev/disk/amd/amd.c optional amd +dev/netif/awi/am79c930.c optional awi +dev/netif/awi/awi.c optional awi +dev/netif/awi/awi_wep.c optional awi +dev/netif/awi/awi_wicfg.c optional awi +dev/netif/awi/if_awi_pccard.c optional awi card +dev/video/bktr/bktr_core.c optional bktr pci +dev/video/bktr/bktr_i2c.c optional bktr pci smbus +dev/video/bktr/bktr_card.c optional bktr pci +dev/video/bktr/bktr_tuner.c optional bktr pci +dev/video/bktr/bktr_audio.c optional bktr pci +dev/video/bktr/bktr_os.c optional bktr pci +dev/serial/cy/cy_pci.c optional cy pci +dev/netif/dc/if_dc.c optional dc +dev/netif/de/if_de.c optional de +dev/netif/en_pci/if_en_pci.c optional en pci +dev/netif/lnc_p/if_lnc_p.c optional lnc pci +dev/netif/pcn/if_pcn.c optional pcn +dev/netif/mn/if_mn.c optional mn +dev/netif/rl/if_rl.c optional rl +dev/netif/sf/if_sf.c optional sf +dev/netif/sis/if_sis.c optional sis +dev/netif/sk/if_sk.c optional sk +dev/netif/ste/if_ste.c optional ste +dev/netif/ti/if_ti.c optional ti +dev/netif/tl/if_tl.c optional tl +dev/netif/vr/if_vr.c optional vr +dev/netif/wb/if_wb.c optional wb +dev/netif/wx/if_wx.c optional wx +dev/netif/xl/if_xl.c optional xl +dev/powermng/i386/intpm/intpm.c optional intpm +dev/powermng/i386/amdpm/amdpm.c optional amdpm +dev/powermng/i386/viapm/viapm.c optional viapm +dev/video/meteor/meteor.c optional meteor pci +dev/disk/ncr/ncr.c optional ncr +dev/disk/sym/sym_hipd.c optional sym \ + dependency "$S/dev/disk/sym/sym_{conf,defs}.h" +bus/pci/pci.c optional pci +bus/pci/pci_compat.c optional pci +bus/pci/pcisupport.c optional pci +pci_if.o optional pci \ dependency "pci_if.c pci_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local pci_if.c optional pci \ - dependency "$S/kern/makeops.pl $S/pci/pci_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/pci/pci_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/pci/pci_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/bus/pci/pci_if.m" \ no-obj no-implicit-rule before-depend local \ clean "pci_if.c" pci_if.h optional pci \ - dependency "$S/kern/makeops.pl $S/pci/pci_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/pci/pci_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/pci/pci_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/bus/pci/pci_if.m" \ no-obj no-implicit-rule before-depend \ clean "pci_if.h" -pci/simos.c optional simos -pci/alpm.c optional alpm -pci/xrpu.c optional xrpu -posix4/posix4_mib.c standard -posix4/p1003_1b.c standard -posix4/ksched.c optional _kposix_priority_scheduling -ufs/ffs/ffs_alloc.c optional ffs -ufs/ffs/ffs_alloc.c optional mfs -ufs/ffs/ffs_balloc.c optional ffs -ufs/ffs/ffs_balloc.c optional mfs -ufs/ffs/ffs_inode.c optional ffs -ufs/ffs/ffs_inode.c optional mfs -ufs/ffs/ffs_softdep_stub.c standard -ufs/ffs/ffs_softdep.c optional softupdates -ufs/ffs/ffs_subr.c optional ffs -ufs/ffs/ffs_subr.c optional mfs -ufs/ffs/ffs_tables.c optional ffs -ufs/ffs/ffs_tables.c optional mfs -ufs/ffs/ffs_vfsops.c optional ffs -ufs/ffs/ffs_vfsops.c optional mfs -ufs/ffs/ffs_vnops.c optional ffs -ufs/ffs/ffs_vnops.c optional mfs -ufs/ffs/ffs_rawread.c optional directio -ufs/mfs/mfs_vfsops.c optional mfs -ufs/mfs/mfs_vnops.c optional mfs -ufs/ufs/ufs_bmap.c standard -ufs/ufs/ufs_disksubr.c standard -ufs/ufs/ufs_ihash.c standard -ufs/ufs/ufs_inode.c standard -ufs/ufs/ufs_lookup.c standard -ufs/ufs/ufs_quota.c standard -ufs/ufs/ufs_vfsops.c standard -ufs/ufs/ufs_vnops.c standard -ufs/ufs/ufs_dirhash.c standard -vm/default_pager.c standard -vm/device_pager.c standard -vm/phys_pager.c standard -vm/swap_pager.c standard -vm/vm_fault.c standard -vm/vm_glue.c standard -vm/vm_init.c standard -vm/vm_kern.c standard -vm/vm_map.c standard -vm/vm_meter.c standard -vm/vm_mmap.c standard -vm/vm_object.c standard -vm/vm_page.c standard -vm/vm_pageout.c standard -vm/vm_pager.c standard -vm/vm_swap.c standard -vm/vm_unix.c standard -vm/vnode_pager.c standard -vm/vm_zone.c standard -dev/streams/streams.c optional streams +dev/disk/simos/simos.c optional simos +dev/powermng/i386/alpm/alpm.c optional alpm +dev/misc/xrpu/xrpu.c optional xrpu +emulation/posix4/posix4_mib.c standard +emulation/posix4/p1003_1b.c standard +emulation/posix4/ksched.c optional _kposix_priority_scheduling +vfs/ufs/ffs_alloc.c optional ffs +vfs/ufs/ffs_alloc.c optional mfs +vfs/ufs/ffs_balloc.c optional ffs +vfs/ufs/ffs_balloc.c optional mfs +vfs/ufs/ffs_inode.c optional ffs +vfs/ufs/ffs_inode.c optional mfs +vfs/ufs/ffs_softdep_stub.c standard +vfs/ufs/ffs_softdep.c optional softupdates +vfs/ufs/ffs_subr.c optional ffs +vfs/ufs/ffs_subr.c optional mfs +vfs/ufs/ffs_tables.c optional ffs +vfs/ufs/ffs_tables.c optional mfs +vfs/ufs/ffs_vfsops.c optional ffs +vfs/ufs/ffs_vfsops.c optional mfs +vfs/ufs/ffs_vnops.c optional ffs +vfs/ufs/ffs_vnops.c optional mfs +vfs/ufs/ffs_rawread.c optional directio +vfs/mfs/mfs_vfsops.c optional mfs +vfs/mfs/mfs_vnops.c optional mfs +vfs/ufs/ufs_bmap.c standard +vfs/ufs/ufs_disksubr.c standard +vfs/ufs/ufs_ihash.c standard +vfs/ufs/ufs_inode.c standard +vfs/ufs/ufs_lookup.c standard +vfs/ufs/ufs_quota.c standard +vfs/ufs/ufs_vfsops.c standard +vfs/ufs/ufs_vnops.c standard +vfs/ufs/ufs_dirhash.c standard +vm/default_pager.c standard +vm/device_pager.c standard +vm/phys_pager.c standard +vm/swap_pager.c standard +vm/vm_fault.c standard +vm/vm_glue.c standard +vm/vm_init.c standard +vm/vm_kern.c standard +vm/vm_map.c standard +vm/vm_meter.c standard +vm/vm_mmap.c standard +vm/vm_object.c standard +vm/vm_page.c standard +vm/vm_pageout.c standard +vm/vm_pager.c standard +vm/vm_swap.c standard +vm/vm_unix.c standard +vm/vnode_pager.c standard +vm/vm_zone.c standard +dev/misc/streams/streams.c optional streams # # USB support -pci/uhci_pci.c optional uhci -pci/ohci_pci.c optional ohci +bus/pci/uhci_pci.c optional uhci +bus/pci/ohci_pci.c optional ohci usb_if.o optional usb \ dependency "usb_if.c" \ compile-with "${NORMAL_C}" \ no-implicit-rule local usb_if.c optional usb \ - dependency "$S/kern/makeops.pl $S/dev/usb/usb_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/dev/usb/usb_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/usb/usb_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/bus/usb/usb_if.m" \ no-obj no-implicit-rule before-depend local \ clean "usb_if.c" usb_if.h optional usb \ - dependency "$S/kern/makeops.pl $S/dev/usb/usb_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/dev/usb/usb_if.m" \ + dependency "$S/kern/makeops.pl $S/bus/usb/usb_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/bus/usb/usb_if.m" \ no-obj no-implicit-rule before-depend \ clean "usb_if.h" -dev/usb/uhci.c optional uhci -dev/usb/ohci.c optional ohci -dev/usb/ucom.c optional ucom -dev/usb/uvisor.c optional uvisor ucom -dev/usb/uvscom.c optional uvscom ucom -dev/usb/usb.c optional usb -dev/usb/usbdi.c optional usb -dev/usb/usbdi_util.c optional usb -#dev/usb/usb_mem.c optional usb -dev/usb/usb_ethersubr.c optional usb -dev/usb/usb_subr.c optional usb -dev/usb/usb_quirks.c optional usb -dev/usb/hid.c optional usb -dev/usb/ufm.c optional ufm -dev/usb/ubsa.c optional ubsa ucom -dev/usb/uftdi.c optional uftdi ucom -dev/usb/ugen.c optional ugen -dev/usb/uhid.c optional uhid -dev/usb/ums.c optional ums -dev/usb/uplcom.c optional uplcom ucom -dev/usb/urio.c optional urio -dev/usb/ulpt.c optional ulpt -dev/usb/ukbd.c optional ukbd -dev/usb/umass.c optional umass -dev/usb/umodem.c optional umodem -dev/usb/uhub.c optional usb -dev/usb/uscanner.c optional uscanner -dev/usb/if_aue.c optional aue -dev/usb/if_cue.c optional cue -dev/usb/if_kue.c optional kue -isa_if.o optional isa \ +bus/usb/uhci.c optional uhci +bus/usb/ohci.c optional ohci +dev/usbmisc/ucom/ucom.c optional ucom +dev/usbmisc/uvisor/uvisor.c optional uvisor ucom +dev/usbmisc/uvscom/uvscom.c optional uvscom ucom +bus/usb/usb.c optional usb +bus/usb/usbdi.c optional usb +bus/usb/usbdi_util.c optional usb +#bus/usb/usb_mem.c optional usb +bus/usb/usb_ethersubr.c optional usb +bus/usb/usb_subr.c optional usb +bus/usb/usb_quirks.c optional usb +bus/usb/hid.c optional usb +bus/usb/uhub.c optional usb +dev/usbmisc/ufm/ufm.c optional ufm +dev/usbmisc/ubsa/ubsa.c optional ubsa ucom +dev/usbmisc/uftdi/uftdi.c optional uftdi ucom +dev/usbmisc/ugen/ugen.c optional ugen +dev/usbmisc/uhid/uhid.c optional uhid +dev/usbmisc/ums/ums.c optional ums +dev/usbmisc/uplcom/uplcom.c optional uplcom ucom +dev/usbmisc/urio/urio.c optional urio +dev/usbmisc/ulpt/ulpt.c optional ulpt +dev/usbmisc/ukbd/ukbd.c optional ukbd +dev/usbmisc/umass/umass.c optional umass +dev/usbmisc/umodem/umodem.c optional umodem +dev/usbmisc/uscanner/uscanner.c optional uscanner +dev/netif/aue/if_aue.c optional aue +dev/netif/cue/if_cue.c optional cue +dev/netif/kue/if_kue.c optional kue +isa_if.o optional isa \ dependency "isa_if.c isa_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local -isa_if.c optional isa \ - dependency "$S/kern/makeops.pl $S/isa/isa_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -c $S/isa/isa_if.m" \ +isa_if.c optional isa \ + dependency "$S/kern/makeops.pl $S/bus/isa/isa_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -c $S/bus/isa/isa_if.m" \ no-obj no-implicit-rule before-depend local \ clean "isa_if.c" -isa_if.h optional isa \ - dependency "$S/kern/makeops.pl $S/isa/isa_if.m" \ - compile-with "perl5 $S/kern/makeops.pl -h $S/isa/isa_if.m" \ +isa_if.h optional isa \ + dependency "$S/kern/makeops.pl $S/bus/isa/isa_if.m" \ + compile-with "perl5 $S/kern/makeops.pl -h $S/bus/isa/isa_if.m" \ no-obj no-implicit-rule before-depend \ clean "isa_if.h" -isa/isa_common.c optional isa -isa/isahint.c optional isa -isa/joy.c optional joy -isa/orm.c optional isa -isa/pnp.c optional isa -isa/pnpparse.c optional isa +bus/isa/isa_common.c optional isa +bus/isa/isahint.c optional isa +dev/misc/joy/joy.c optional joy +dev/misc/orm/orm.c optional isa +bus/isa/pnp.c optional isa +bus/isa/pnpparse.c optional isa # -dev/sound/isa/ad1816.c optional pcm isa -dev/sound/isa/es1888.c optional pcm isa -dev/sound/isa/ess.c optional pcm isa -dev/sound/isa/gusc.c optional gusc isa -dev/sound/isa/gusc.c optional pcm isa -dev/sound/isa/mss.c optional pcm isa -dev/sound/isa/sb16.c optional pcm isa -dev/sound/isa/sb8.c optional pcm isa -dev/sound/isa/sbc.c optional pcm isa -dev/sound/isa/sbc.c optional sbc isa +dev/sound/isa/ad1816.c optional pcm isa +dev/sound/isa/es1888.c optional pcm isa +dev/sound/isa/ess.c optional pcm isa +dev/sound/isa/gusc.c optional gusc isa +dev/sound/isa/gusc.c optional pcm isa +dev/sound/isa/mss.c optional pcm isa +dev/sound/isa/sb16.c optional pcm isa +dev/sound/isa/sb8.c optional pcm isa +dev/sound/isa/sbc.c optional pcm isa +dev/sound/isa/sbc.c optional sbc isa # -dev/sound/pci/als4000.c optional pcm pci -dev/sound/pci/cmi.c optional pcm pci -dev/sound/pci/cs4281.c optional pcm pci -dev/sound/pci/csa.c optional csa pci -dev/sound/pci/csa.c optional pcm pci -dev/sound/pci/csapcm.c optional pcm pci -dev/sound/pci/ds1.c optional pcm pci -dev/sound/pci/emu10k1.c optional pcm pci -dev/sound/pci/es137x.c optional pcm pci -dev/sound/pci/fm801.c optional pcm pci -dev/sound/pci/ich.c optional pcm pci -dev/sound/pci/maestro.c optional pcm pci -dev/sound/pci/neomagic.c optional pcm pci -dev/sound/pci/solo.c optional pcm pci -dev/sound/pci/t4dwave.c optional pcm pci -dev/sound/pci/via8233.c optional pcm pci +dev/sound/pci/als4000.c optional pcm pci +dev/sound/pci/cmi.c optional pcm pci +dev/sound/pci/cs4281.c optional pcm pci +dev/sound/pci/csa.c optional csa pci +dev/sound/pci/csa.c optional pcm pci +dev/sound/pci/csapcm.c optional pcm pci +dev/sound/pci/ds1.c optional pcm pci +dev/sound/pci/emu10k1.c optional pcm pci +dev/sound/pci/es137x.c optional pcm pci +dev/sound/pci/fm801.c optional pcm pci +dev/sound/pci/ich.c optional pcm pci +dev/sound/pci/maestro.c optional pcm pci +dev/sound/pci/neomagic.c optional pcm pci +dev/sound/pci/solo.c optional pcm pci +dev/sound/pci/t4dwave.c optional pcm pci +dev/sound/pci/via8233.c optional pcm pci dev/sound/pci/via82c686.c optional pcm pci -dev/sound/pci/vibes.c optional pcm pci -dev/sound/usb/uaudio.c optional pcm usb +dev/sound/pci/vibes.c optional pcm pci +dev/sound/usb/uaudio.c optional pcm usb dev/sound/usb/uaudio_pcm.c optional pcm usb # ac97_if.o optional pcm \ @@ -1333,19 +1332,19 @@ mixer_if.h optional pcm \ clean "mixer_if.h" # -dev/sound/pcm/ac97.c optional pcm -dev/sound/pcm/ac97_patch.c optional pcm -dev/sound/pcm/buffer.c optional pcm -dev/sound/pcm/channel.c optional pcm -dev/sound/pcm/dsp.c optional pcm -dev/sound/pcm/fake.c optional pcm -dev/sound/pcm/feeder.c optional pcm -dev/sound/pcm/feeder_fmt.c optional pcm -dev/sound/pcm/feeder_rate.c optional pcm -dev/sound/pcm/mixer.c optional pcm -dev/sound/pcm/sndstat.c optional pcm -dev/sound/pcm/sound.c optional pcm -dev/sound/pcm/vchan.c optional pcm +dev/sound/pcm/ac97.c optional pcm +dev/sound/pcm/ac97_patch.c optional pcm +dev/sound/pcm/buffer.c optional pcm +dev/sound/pcm/channel.c optional pcm +dev/sound/pcm/dsp.c optional pcm +dev/sound/pcm/fake.c optional pcm +dev/sound/pcm/feeder.c optional pcm +dev/sound/pcm/feeder_fmt.c optional pcm +dev/sound/pcm/feeder_rate.c optional pcm +dev/sound/pcm/mixer.c optional pcm +dev/sound/pcm/sndstat.c optional pcm +dev/sound/pcm/sound.c optional pcm +dev/sound/pcm/vchan.c optional pcm # # These files in libkern/ are those needed by all architectures. Some # of the files in libkern/ are only needed on some architectures, e.g., @@ -1353,83 +1352,83 @@ dev/sound/pcm/vchan.c optional pcm # routines may be optimized for a particular platform. In either case, # the file should be moved to conf/files. from here. # -libkern/arc4random.c standard -libkern/bcd.c standard -libkern/crc32.c standard -libkern/iconv.c optional libiconv -libkern/iconv_xlat.c optional libiconv -iconv_converter_if.o optional libiconv \ +libkern/arc4random.c standard +libkern/bcd.c standard +libkern/crc32.c standard +libkern/iconv.c optional libiconv +libkern/iconv_xlat.c optional libiconv +iconv_converter_if.o optional libiconv \ dependency "iconv_converter_if.c iconv_converter_if.h" \ compile-with "${NORMAL_C}" \ no-implicit-rule local -iconv_converter_if.c optional libiconv \ +iconv_converter_if.c optional libiconv \ dependency "$S/kern/makeobjops.pl $S/libkern/iconv_converter_if.m" \ compile-with "perl5 $S/kern/makeobjops.pl -c $S/libkern/iconv_converter_if.m" \ no-obj no-implicit-rule before-depend local \ clean "iconv_converter_if.c" -iconv_converter_if.h optional libiconv \ +iconv_converter_if.h optional libiconv \ dependency "$S/kern/makeobjops.pl $S/libkern/iconv_converter_if.m" \ compile-with "perl5 $S/kern/makeobjops.pl -h $S/libkern/iconv_converter_if.m" \ no-obj no-implicit-rule before-depend \ clean "iconv_converter_if.h" -libkern/index.c standard -libkern/inet_ntoa.c standard -libkern/mcount.c optional profiling-routine -libkern/qsort.c standard -libkern/random.c standard -libkern/rindex.c standard -libkern/scanc.c standard -libkern/skpc.c standard -libkern/strcat.c standard -libkern/strcmp.c standard -libkern/strcpy.c standard -libkern/strlen.c standard -libkern/strncmp.c standard -libkern/strncpy.c standard -libkern/strtol.c standard -libkern/strtoq.c standard -libkern/strtoul.c standard -libkern/strtouq.c standard -crypto/blowfish/bf_skey.c optional crypto -crypto/blowfish/bf_skey.c optional crypto -crypto/cast128/cast128.c optional crypto -crypto/des/des_ecb.c optional crypto -crypto/des/des_ecb.c optional crypto -crypto/des/des_setkey.c optional crypto -crypto/des/des_setkey.c optional crypto +libkern/index.c standard +libkern/inet_ntoa.c standard +libkern/mcount.c optional profiling-routine +libkern/qsort.c standard +libkern/random.c standard +libkern/rindex.c standard +libkern/scanc.c standard +libkern/skpc.c standard +libkern/strcat.c standard +libkern/strcmp.c standard +libkern/strcpy.c standard +libkern/strlen.c standard +libkern/strncmp.c standard +libkern/strncpy.c standard +libkern/strtol.c standard +libkern/strtoq.c standard +libkern/strtoul.c standard +libkern/strtouq.c standard +crypto/blowfish/bf_skey.c optional crypto +crypto/blowfish/bf_skey.c optional crypto +crypto/cast128/cast128.c optional crypto +crypto/des/des_ecb.c optional crypto +crypto/des/des_ecb.c optional crypto +crypto/des/des_setkey.c optional crypto +crypto/des/des_setkey.c optional crypto crypto/rijndael/rijndael-alg-fst.c optional crypto crypto/rijndael/rijndael-api-fst.c optional crypto -crypto/sha1.c optional crypto -crypto/sha1.c optional crypto -crypto/sha2/sha2.c optional ipsec -crypto/sha2/sha2.c optional crypto -net/zlib.c optional crypto -opencrypto/cast.c optional crypto -opencrypto/criov.c optional crypto -opencrypto/crmbuf.c optional crypto -opencrypto/crypto.c optional crypto -opencrypto/cryptodev.c optional cryptodev -opencrypto/cryptosoft.c optional crypto -opencrypto/deflate.c optional crypto -opencrypto/rijndael.c optional crypto -opencrypto/rmd160.c optional crypto -opencrypto/skipjack.c optional crypto -opencrypto/xform.c optional crypto -dev/ubsec/ubsec.c optional ubsec -dev/hifn/hifn7751.c optional hifn -dev/drm/mga_dma.c optional mgadrm -dev/drm/mga_drv.c optional mgadrm -dev/drm/mga_irq.c optional mgadrm -dev/drm/mga_state.c optional mgadrm -dev/drm/mga_warp.c optional mgadrm -dev/drm/r128_cce.c optional r128drm -dev/drm/r128_drv.c optional r128drm -dev/drm/r128_irq.c optional r128drm -dev/drm/r128_state.c optional r128drm -dev/drm/radeon_cp.c optional radeondrm -dev/drm/radeon_drv.c optional radeondrm -dev/drm/radeon_irq.c optional radeondrm -dev/drm/radeon_mem.c optional radeondrm -dev/drm/radeon_state.c optional radeondrm -dev/drm/tdfx_drv.c optional tdfxdrm +crypto/sha1.c optional crypto +crypto/sha1.c optional crypto +crypto/sha2/sha2.c optional ipsec +crypto/sha2/sha2.c optional crypto +net/zlib.c optional crypto +opencrypto/cast.c optional crypto +opencrypto/criov.c optional crypto +opencrypto/crmbuf.c optional crypto +opencrypto/crypto.c optional crypto +opencrypto/cryptodev.c optional cryptodev +opencrypto/cryptosoft.c optional crypto +opencrypto/deflate.c optional crypto +opencrypto/rijndael.c optional crypto +opencrypto/rmd160.c optional crypto +opencrypto/skipjack.c optional crypto +opencrypto/xform.c optional crypto +dev/crypto/ubsec/ubsec.c optional ubsec +dev/crypto/hifn/hifn7751.c optional hifn +dev/drm/mga/mga_dma.c optional mgadrm +dev/drm/mga/mga_drv.c optional mgadrm +dev/drm/mga/mga_irq.c optional mgadrm +dev/drm/mga/mga_state.c optional mgadrm +dev/drm/mga/mga_warp.c optional mgadrm +dev/drm/r128/r128_cce.c optional r128drm +dev/drm/r128/r128_drv.c optional r128drm +dev/drm/r128/r128_irq.c optional r128drm +dev/drm/r128/r128_state.c optional r128drm +dev/drm/radeon/radeon_cp.c optional radeondrm +dev/drm/radeon/radeon_drv.c optional radeondrm +dev/drm/radeon/radeon_irq.c optional radeondrm +dev/drm/radeon/radeon_mem.c optional radeondrm +dev/drm/radeon/radeon_state.c optional radeondrm +dev/drm/tdfx/tdfx_drv.c optional tdfxdrm diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 59db07914b..0b189f4002 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -2,20 +2,20 @@ # files marked standard are always included. # # $FreeBSD: src/sys/conf/files.i386,v 1.307.2.38 2003/01/02 20:41:33 kan Exp $ -# $DragonFly: src/sys/conf/Attic/files.i386,v 1.3 2003/07/06 21:23:45 dillon Exp $ +# $DragonFly: src/sys/conf/Attic/files.i386,v 1.4 2003/08/07 21:16:48 dillon Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and # dependency lines other than the first are silently ignored. # linux_genassym.o optional compat_linux \ - dependency "$S/i386/linux/linux_genassym.c" \ + dependency "$S/emulation/linux/i386/linux_genassym.c" \ compile-with "${CC} ${CFLAGS} -c ${.IMPSRC}" \ no-obj no-implicit-rule \ clean "linux_genassym.o" # svr4_genassym.o optional compat_svr4 \ - dependency "$S/i386/svr4/svr4_genassym.c" \ + dependency "$S/emulation/svr4/i386/svr4_genassym.c" \ compile-with "${CC} ${CFLAGS} -c ${.IMPSRC}" \ no-obj no-implicit-rule \ clean "svr4_genassym.o" @@ -47,18 +47,18 @@ ukbdmap.h optional ukbd_dflt_keymap \ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -compat/linux/linux_file.c optional compat_linux -compat/linux/linux_getcwd.c optional compat_linux -compat/linux/linux_ioctl.c optional compat_linux -compat/linux/linux_ipc.c optional compat_linux -compat/linux/linux_mib.c optional compat_linux -compat/linux/linux_misc.c optional compat_linux -compat/linux/linux_signal.c optional compat_linux -compat/linux/linux_socket.c optional compat_linux -compat/linux/linux_stats.c optional compat_linux -compat/linux/linux_sysctl.c optional compat_linux -compat/linux/linux_uid16.c optional compat_linux -compat/linux/linux_util.c optional compat_linux +emulation/linux/linux_file.c optional compat_linux +emulation/linux/linux_getcwd.c optional compat_linux +emulation/linux/linux_ioctl.c optional compat_linux +emulation/linux/linux_ipc.c optional compat_linux +emulation/linux/linux_mib.c optional compat_linux +emulation/linux/linux_misc.c optional compat_linux +emulation/linux/linux_signal.c optional compat_linux +emulation/linux/linux_socket.c optional compat_linux +emulation/linux/linux_stats.c optional compat_linux +emulation/linux/linux_sysctl.c optional compat_linux +emulation/linux/linux_uid16.c optional compat_linux +emulation/linux/linux_util.c optional compat_linux # contrib/dev/fla/fla.c optional fla msysosak.o optional fla \ @@ -89,87 +89,87 @@ bf_enc.o optional crypto \ crypto/des/arch/i386/des_enc.S optional crypto crypto/des/des_ecb.c optional crypto crypto/des/des_setkey.c optional crypto -dev/advansys/adv_isa.c optional adv isa -dev/aic/aic_isa.c optional aic isa -dev/ar/if_ar_isa.c optional ar isa -dev/dgb/dgm.c optional dgm -dev/cm/if_cm_isa.c optional cm isa -dev/ed/if_ed.c optional ed -dev/ed/if_ed_isa.c optional ed isa -dev/ed/if_ed_pccard.c optional ed card -dev/eisa/eisaconf.c optional eisa -dev/em/if_em.c optional em -dev/em/if_em_hw.c optional em -dev/fb/fb.c optional fb -dev/fb/fb.c optional vga -dev/fb/splash.c optional splash -dev/fb/vga.c optional vga -dev/fe/if_fe_isa.c optional fe isa -dev/kbd/atkbd.c optional atkbd -dev/kbd/atkbdc.c optional atkbdc -dev/kbd/kbd.c optional atkbd -dev/kbd/kbd.c optional kbd -dev/kbd/kbd.c optional sc -dev/kbd/kbd.c optional ukbd -dev/kbd/kbd.c optional vt -dev/pst/pst-pci.c optional pst pci -dev/pst/pst-iop.c optional pst -dev/pst/pst-raid.c optional pst -dev/puc/puc.c optional puc -dev/puc/pucdata.c optional puc -dev/sbni/if_sbni.c optional sbni -dev/sbni/if_sbni_isa.c optional sbni isa -dev/sr/if_sr_isa.c optional sr isa -dev/syscons/schistory.c optional sc -dev/syscons/scmouse.c optional sc -dev/syscons/scterm.c optional sc -dev/syscons/scterm-dumb.c optional sc -dev/syscons/scterm-sc.c optional sc -dev/syscons/scvesactl.c optional sc vga vesa -dev/syscons/scvgarndr.c optional sc vga -dev/syscons/scvidctl.c optional sc -dev/syscons/scvtb.c optional sc -dev/syscons/syscons.c optional sc -dev/syscons/sysmouse.c optional sc -fs/smbfs/smbfs_io.c optional smbfs -fs/smbfs/smbfs_node.c optional smbfs -fs/smbfs/smbfs_smb.c optional smbfs -fs/smbfs/smbfs_subr.c optional smbfs -fs/smbfs/smbfs_vfsops.c optional smbfs -fs/smbfs/smbfs_vnops.c optional smbfs -gnu/i386/fpemul/div_small.s optional gpl_math_emulate -gnu/i386/fpemul/errors.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_arith.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_aux.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_entry.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_etc.c optional gpl_math_emulate -gnu/i386/fpemul/fpu_trig.c optional gpl_math_emulate -gnu/i386/fpemul/get_address.c optional gpl_math_emulate -gnu/i386/fpemul/load_store.c optional gpl_math_emulate -gnu/i386/fpemul/poly_2xm1.c optional gpl_math_emulate -gnu/i386/fpemul/poly_atan.c optional gpl_math_emulate -gnu/i386/fpemul/poly_div.s optional gpl_math_emulate -gnu/i386/fpemul/poly_l2.c optional gpl_math_emulate -gnu/i386/fpemul/poly_mul64.s optional gpl_math_emulate -gnu/i386/fpemul/poly_sin.c optional gpl_math_emulate -gnu/i386/fpemul/poly_tan.c optional gpl_math_emulate -gnu/i386/fpemul/polynomial.s optional gpl_math_emulate -gnu/i386/fpemul/reg_add_sub.c optional gpl_math_emulate -gnu/i386/fpemul/reg_compare.c optional gpl_math_emulate -gnu/i386/fpemul/reg_constant.c optional gpl_math_emulate -gnu/i386/fpemul/reg_div.s optional gpl_math_emulate -gnu/i386/fpemul/reg_ld_str.c optional gpl_math_emulate -gnu/i386/fpemul/reg_mul.c optional gpl_math_emulate -gnu/i386/fpemul/reg_norm.s optional gpl_math_emulate -gnu/i386/fpemul/reg_round.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_add.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_div.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_mul.s optional gpl_math_emulate -gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate -gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate -gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate -gnu/i386/isa/dgb.c optional dgb -gnu/i386/isa/sound/awe_wave.c optional awe +dev/disk/advansys/adv_isa.c optional adv isa +dev/disk/aic/aic_isa.c optional aic isa +dev/netif/ar/if_ar_isa.c optional ar isa +dev/serial/dgb/dgm.c optional dgm +dev/netif/cm/if_cm_isa.c optional cm isa +dev/netif/ed/if_ed.c optional ed +dev/netif/ed/if_ed_isa.c optional ed isa +dev/netif/ed/if_ed_pccard.c optional ed card +bus/eisa/eisaconf.c optional eisa +dev/netif/em/if_em.c optional em +dev/netif/em/if_em_hw.c optional em +dev/video/fb/fb.c optional fb +dev/video/fb/fb.c optional vga +dev/video/fb/splash.c optional splash +dev/video/fb/vga.c optional vga +dev/netif/fe/if_fe_isa.c optional fe isa +dev/misc/kbd/atkbd.c optional atkbd +dev/misc/kbd/atkbdc.c optional atkbdc +dev/misc/kbd/kbd.c optional atkbd +dev/misc/kbd/kbd.c optional kbd +dev/misc/kbd/kbd.c optional sc +dev/misc/kbd/kbd.c optional ukbd +dev/misc/kbd/kbd.c optional vt +dev/misc/pst/pst-pci.c optional pst pci +dev/misc/pst/pst-iop.c optional pst +dev/misc/pst/pst-raid.c optional pst +dev/misc/puc/puc.c optional puc +dev/misc/puc/pucdata.c optional puc +dev/netif/sbni/if_sbni.c optional sbni +dev/netif/sbni/if_sbni_isa.c optional sbni isa +dev/netif/sr/if_sr_isa.c optional sr isa +dev/misc/syscons/schistory.c optional sc +dev/misc/syscons/scmouse.c optional sc +dev/misc/syscons/scterm.c optional sc +dev/misc/syscons/scterm-dumb.c optional sc +dev/misc/syscons/scterm-sc.c optional sc +dev/misc/syscons/scvesactl.c optional sc vga vesa +dev/misc/syscons/scvgarndr.c optional sc vga +dev/misc/syscons/scvidctl.c optional sc +dev/misc/syscons/scvtb.c optional sc +dev/misc/syscons/syscons.c optional sc +dev/misc/syscons/sysmouse.c optional sc +vfs/smbfs/smbfs_io.c optional smbfs +vfs/smbfs/smbfs_node.c optional smbfs +vfs/smbfs/smbfs_smb.c optional smbfs +vfs/smbfs/smbfs_subr.c optional smbfs +vfs/smbfs/smbfs_vfsops.c optional smbfs +vfs/smbfs/smbfs_vnops.c optional smbfs +i386/gnu/fpemul/div_small.s optional gpl_math_emulate +i386/gnu/fpemul/errors.c optional gpl_math_emulate +i386/gnu/fpemul/fpu_arith.c optional gpl_math_emulate +i386/gnu/fpemul/fpu_aux.c optional gpl_math_emulate +i386/gnu/fpemul/fpu_entry.c optional gpl_math_emulate +i386/gnu/fpemul/fpu_etc.c optional gpl_math_emulate +i386/gnu/fpemul/fpu_trig.c optional gpl_math_emulate +i386/gnu/fpemul/get_address.c optional gpl_math_emulate +i386/gnu/fpemul/load_store.c optional gpl_math_emulate +i386/gnu/fpemul/poly_2xm1.c optional gpl_math_emulate +i386/gnu/fpemul/poly_atan.c optional gpl_math_emulate +i386/gnu/fpemul/poly_div.s optional gpl_math_emulate +i386/gnu/fpemul/poly_l2.c optional gpl_math_emulate +i386/gnu/fpemul/poly_mul64.s optional gpl_math_emulate +i386/gnu/fpemul/poly_sin.c optional gpl_math_emulate +i386/gnu/fpemul/poly_tan.c optional gpl_math_emulate +i386/gnu/fpemul/polynomial.s optional gpl_math_emulate +i386/gnu/fpemul/reg_add_sub.c optional gpl_math_emulate +i386/gnu/fpemul/reg_compare.c optional gpl_math_emulate +i386/gnu/fpemul/reg_constant.c optional gpl_math_emulate +i386/gnu/fpemul/reg_div.s optional gpl_math_emulate +i386/gnu/fpemul/reg_ld_str.c optional gpl_math_emulate +i386/gnu/fpemul/reg_mul.c optional gpl_math_emulate +i386/gnu/fpemul/reg_norm.s optional gpl_math_emulate +i386/gnu/fpemul/reg_round.s optional gpl_math_emulate +i386/gnu/fpemul/reg_u_add.s optional gpl_math_emulate +i386/gnu/fpemul/reg_u_div.s optional gpl_math_emulate +i386/gnu/fpemul/reg_u_mul.s optional gpl_math_emulate +i386/gnu/fpemul/reg_u_sub.s optional gpl_math_emulate +i386/gnu/fpemul/wm_shrx.s optional gpl_math_emulate +i386/gnu/fpemul/wm_sqrt.s optional gpl_math_emulate +i386/gnu/isa/dgb.c optional dgb +i386/gnu/isa/sound/awe_wave.c optional awe i386/apm/apm.c optional apm i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" @@ -214,287 +214,284 @@ i386/i386/trap.c standard i386/i386/userconfig.c optional userconfig i386/i386/vm86.c standard i386/i386/vm_machdep.c standard -i386/ibcs2/ibcs2_errno.c optional ibcs2 -i386/ibcs2/ibcs2_fcntl.c optional ibcs2 -i386/ibcs2/ibcs2_ioctl.c optional ibcs2 -i386/ibcs2/ibcs2_ipc.c optional ibcs2 -i386/ibcs2/ibcs2_isc.c optional ibcs2 -i386/ibcs2/ibcs2_isc_sysent.c optional ibcs2 -i386/ibcs2/ibcs2_misc.c optional ibcs2 -i386/ibcs2/ibcs2_msg.c optional ibcs2 -i386/ibcs2/ibcs2_other.c optional ibcs2 -i386/ibcs2/ibcs2_signal.c optional ibcs2 -i386/ibcs2/ibcs2_socksys.c optional ibcs2 -i386/ibcs2/ibcs2_stat.c optional ibcs2 -i386/ibcs2/ibcs2_sysent.c optional ibcs2 -i386/ibcs2/ibcs2_sysi86.c optional ibcs2 -i386/ibcs2/ibcs2_sysvec.c optional ibcs2 -i386/ibcs2/ibcs2_util.c optional ibcs2 -i386/ibcs2/ibcs2_xenix.c optional ibcs2 -i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 -i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/asc.c optional asc -i386/isa/atapi.c optional wdc \ +emulation/ibcs2/i386/ibcs2_errno.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_fcntl.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_ioctl.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_ipc.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_isc.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_isc_sysent.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_misc.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_msg.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_other.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_signal.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_socksys.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_stat.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_sysent.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_sysi86.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_sysvec.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_util.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_xenix.c optional ibcs2 +emulation/ibcs2/i386/ibcs2_xenix_sysent.c optional ibcs2 +emulation/ibcs2/coff/imgact_coff.c optional ibcs2 +i386/isa/asc.c optional asc +i386/isa/atapi.c optional wdc \ warning "The wdc driver is obsolete. Please use the ata driver!" -i386/isa/clock.c standard -i386/isa/cronyx.c optional cx -i386/isa/ctx.c optional ctx -i386/isa/cx.c optional cx -i386/isa/cy.c optional cy -i386/isa/elink.c optional ep -i386/isa/elink.c optional ie -isa/fd.c optional fd -i386/isa/gpib.c optional gp -i386/isa/gsc.c optional gsc -i386/isa/if_cx.c optional cx -i386/isa/if_el.c optional el -i386/isa/if_le.c optional le -i386/isa/if_lnc.c optional lnc -i386/isa/if_rdp.c optional rdp -i386/isa/if_wl.c optional wl -i386/isa/if_wlp.c optional wlp -i386/isa/intr_machdep.c standard -i386/isa/ipl_funcs.c standard \ +i386/isa/clock.c standard +dev/serial/cronyx/cronyx.c optional cx +dev/video/ctx/ctx.c optional ctx +dev/serial/cy/cy.c optional cy +dev/netif/elink_layer/elink.c optional ep +dev/netif/elink_layer/elink.c optional ie +dev/disk/fd/fd.c optional fd +dev/misc/gpib/gpib.c optional gp +dev/video/gsc/gsc.c optional gsc +dev/netif/cx/if_cx.c optional cx +dev/netif/el/if_el.c optional el +dev/netif/le/if_le.c optional le +dev/netif/lnc/if_lnc.c optional lnc +dev/netif/rdp/if_rdp.c optional rdp +dev/netif/wl/if_wl.c optional wl +i386/isa/intr_machdep.c standard +i386/isa/ipl_funcs.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" -i386/isa/isa.c optional isa -i386/isa/isa_compat.c optional isa -i386/isa/isa_dma.c optional isa -i386/isa/istallion.c optional stli -i386/isa/labpc.c optional labpc -i386/isa/loran.c optional loran -i386/isa/mca_machdep.c optional mca -i386/isa/mcd.c optional mcd -i386/isa/mse.c optional mse -i386/isa/npx.c mandatory npx -i386/isa/pcaudio.c optional pca -i386/isa/pcf.c optional pcf -i386/isa/pci_cfgreg.c optional pci -i386/isa/pcibus.c optional pci -i386/isa/pcvt/pcvt_drv.c optional vt -i386/isa/pcvt/pcvt_ext.c optional vt -i386/isa/pcvt/pcvt_kbd.c optional vt -i386/isa/pcvt/pcvt_out.c optional vt -i386/isa/pcvt/pcvt_sup.c optional vt -i386/isa/pcvt/pcvt_vtf.c optional vt -i386/isa/prof_machdep.c optional profiling-routine -i386/isa/rc.c optional rc -i386/isa/rp.c optional rp -i386/isa/scd.c optional scd -i386/isa/sound/ad1848.c optional css -i386/isa/sound/ad1848.c optional gus -i386/isa/sound/ad1848.c optional gusxvi -i386/isa/sound/ad1848.c optional mss -i386/isa/sound/ad1848.c optional sscape -i386/isa/sound/ad1848.c optional trix -i386/isa/sound/ad1848.c optional sscape_mss -i386/isa/sound/adlib_card.c optional opl -i386/isa/sound/adlib_card.c optional trix -i386/isa/sound/audio.c optional snd \ +bus/isa/i386/isa.c optional isa +bus/isa/i386/isa_compat.c optional isa +bus/isa/i386/isa_dma.c optional isa +dev/serial/stli/istallion.c optional stli +dev/misc/labpc/labpc.c optional labpc +bus/mca/i386/mca_machdep.c optional mca +dev/disk/mcd/mcd.c optional mcd +dev/misc/mse/mse.c optional mse +i386/isa/npx.c mandatory npx +dev/sound/isa/i386/pca/pcaudio.c optional pca +bus/iicbus/i386/pcf.c optional pcf +bus/pci/i386/pci_cfgreg.c optional pci +bus/pci/i386/pcibus.c optional pci +dev/video/pcvt/i386/pcvt_drv.c optional vt +dev/video/pcvt/i386/pcvt_ext.c optional vt +dev/video/pcvt/i386/pcvt_kbd.c optional vt +dev/video/pcvt/i386/pcvt_out.c optional vt +dev/video/pcvt/i386/pcvt_sup.c optional vt +dev/video/pcvt/i386/pcvt_vtf.c optional vt +i386/isa/prof_machdep.c optional profiling-routine +dev/serial/rc/rc.c optional rc +dev/serial/rp2/rp.c optional rp +dev/disk/scd/scd.c optional scd +dev/sound/isa/i386/ad1848.c optional css +dev/sound/isa/i386/ad1848.c optional gus +dev/sound/isa/i386/ad1848.c optional gusxvi +dev/sound/isa/i386/ad1848.c optional mss +dev/sound/isa/i386/ad1848.c optional sscape +dev/sound/isa/i386/ad1848.c optional trix +dev/sound/isa/i386/ad1848.c optional sscape_mss +dev/sound/isa/i386/adlib_card.c optional opl +dev/sound/isa/i386/adlib_card.c optional trix +dev/sound/isa/i386/audio.c optional snd \ warning "The snd drivers are deprecated. Please see pcm/sbc/etc." -i386/isa/sound/cs4232.c optional css -i386/isa/sound/dev_table.c optional snd -i386/isa/sound/dmabuf.c optional snd -i386/isa/sound/gus_card.c optional gus -i386/isa/sound/gus_midi.c optional gus -i386/isa/sound/gus_vol.c optional gus -i386/isa/sound/gus_wave.c optional gus -i386/isa/sound/ics2101.c optional gus -i386/isa/sound/midi_synth.c optional css -i386/isa/sound/midi_synth.c optional gus -i386/isa/sound/midi_synth.c optional mpu -i386/isa/sound/midi_synth.c optional mss -i386/isa/sound/midi_synth.c optional pas -i386/isa/sound/midi_synth.c optional sb -i386/isa/sound/midi_synth.c optional sscape -i386/isa/sound/midi_synth.c optional uart -i386/isa/sound/midibuf.c optional css -i386/isa/sound/midibuf.c optional gus -i386/isa/sound/midibuf.c optional mpu -i386/isa/sound/midibuf.c optional mss -i386/isa/sound/midibuf.c optional pas -i386/isa/sound/midibuf.c optional sb -i386/isa/sound/midibuf.c optional sscape -i386/isa/sound/midibuf.c optional uart -i386/isa/sound/mpu401.c optional mpu -i386/isa/sound/mpu401.c optional sscape -i386/isa/sound/opl3.c optional opl -i386/isa/sound/opl3.c optional trix -i386/isa/sound/pas2_card.c optional pas -i386/isa/sound/pas2_midi.c optional pas -i386/isa/sound/pas2_mixer.c optional pas -i386/isa/sound/pas2_pcm.c optional pas -i386/isa/sound/patmgr.c optional snd -i386/isa/sound/sb16_dsp.c optional sbxvi -i386/isa/sound/sb16_midi.c optional sbmidi -i386/isa/sound/sb_card.c optional sb -i386/isa/sound/sb_dsp.c optional sb -i386/isa/sound/sb_midi.c optional sb -i386/isa/sound/sb_mixer.c optional sb -i386/isa/sound/sequencer.c optional snd -i386/isa/sound/sound_switch.c optional snd -i386/isa/sound/sound_timer.c optional css -i386/isa/sound/sound_timer.c optional gus -i386/isa/sound/sound_timer.c optional mss -i386/isa/sound/sound_timer.c optional mss -i386/isa/sound/sound_timer.c optional sscape -i386/isa/sound/sound_timer.c optional trix -i386/isa/sound/soundcard.c optional snd -i386/isa/sound/sscape.c optional sscape -i386/isa/sound/sys_timer.c optional snd -i386/isa/sound/trix.c optional trix -i386/isa/sound/uart6850.c optional uart -i386/isa/spic.c optional spic -i386/isa/spigot.c optional spigot -i386/isa/spkr.c optional speaker -i386/isa/stallion.c optional stl -i386/isa/tw.c optional tw -i386/isa/vesa.c optional vga vesa -i386/isa/wd.c optional wd \ +dev/sound/isa/i386/css/cs4232.c optional css +dev/sound/isa/i386/dev_table.c optional snd +dev/sound/isa/i386/dmabuf.c optional snd +dev/sound/isa/i386/gus/gus_card.c optional gus +dev/sound/isa/i386/gus/gus_midi.c optional gus +dev/sound/isa/i386/gus/gus_vol.c optional gus +dev/sound/isa/i386/gus/gus_wave.c optional gus +dev/sound/isa/i386/gus/ics2101.c optional gus +dev/sound/isa/i386/midi_synth.c optional css +dev/sound/isa/i386/midi_synth.c optional gus +dev/sound/isa/i386/midi_synth.c optional mpu +dev/sound/isa/i386/midi_synth.c optional mss +dev/sound/isa/i386/midi_synth.c optional pas +dev/sound/isa/i386/midi_synth.c optional sb +dev/sound/isa/i386/midi_synth.c optional sscape +dev/sound/isa/i386/midi_synth.c optional uart +dev/sound/isa/i386/midibuf.c optional css +dev/sound/isa/i386/midibuf.c optional gus +dev/sound/isa/i386/midibuf.c optional mpu +dev/sound/isa/i386/midibuf.c optional mss +dev/sound/isa/i386/midibuf.c optional pas +dev/sound/isa/i386/midibuf.c optional sb +dev/sound/isa/i386/midibuf.c optional sscape +dev/sound/isa/i386/midibuf.c optional uart +dev/sound/isa/i386/mpu/mpu401.c optional mpu +dev/sound/isa/i386/mpu/mpu401.c optional sscape +dev/sound/isa/i386/opl3.c optional opl +dev/sound/isa/i386/opl3.c optional trix +dev/sound/isa/i386/pas2/pas2_card.c optional pas +dev/sound/isa/i386/pas2/pas2_midi.c optional pas +dev/sound/isa/i386/pas2/pas2_mixer.c optional pas +dev/sound/isa/i386/pas2/pas2_pcm.c optional pas +dev/sound/isa/i386/patmgr.c optional snd +dev/sound/isa/i386/sbxvi/sb16_dsp.c optional sbxvi +dev/sound/isa/i386/sbmidi/sb16_midi.c optional sbmidi +dev/sound/isa/i386/sb/sb_card.c optional sb +dev/sound/isa/i386/sb/sb_dsp.c optional sb +dev/sound/isa/i386/sb/sb_midi.c optional sb +dev/sound/isa/i386/sb/sb_mixer.c optional sb +dev/sound/isa/i386/sequencer.c optional snd +dev/sound/isa/i386/sound_switch.c optional snd +dev/sound/isa/i386/sound_timer.c optional css +dev/sound/isa/i386/sound_timer.c optional gus +dev/sound/isa/i386/sound_timer.c optional mss +dev/sound/isa/i386/sound_timer.c optional mss +dev/sound/isa/i386/sound_timer.c optional sscape +dev/sound/isa/i386/sound_timer.c optional trix +dev/sound/isa/i386/soundcard.c optional snd +dev/sound/isa/i386/sscape/sscape.c optional sscape +dev/sound/isa/i386/sys_timer.c optional snd +dev/sound/isa/i386/trix/trix.c optional trix +dev/sound/isa/i386/uart/uart6850.c optional uart +dev/misc/spic/spic.c optional spic +dev/misc/spigot/spigot.c optional spigot +dev/sound/isa/i386/spkr/spkr.c optional speaker +dev/serial/stl/stallion.c optional stl +dev/misc/tw/tw.c optional tw +dev/video/i386/vesa/vesa.c optional vga vesa +dev/disk/wd/wd.c optional wd \ warning "The wd driver is obsolete. Please use the atadisk driver!" -i386/isa/wd.c optional wdc -i386/isa/wd_cd.c optional wcd wdc \ +dev/disk/wd/wd.c optional wdc +dev/disk/wcd/wd_cd.c optional wcd wdc \ warning "The wcd driver is obsolete. Please use the atapicd driver!" -i386/isa/wfd.c optional wfd wdc \ +dev/disk/wfd/wfd.c optional wfd wdc \ warning "The wfd driver is obsolete. Please use the atapifd driver!" -i386/isa/wst.c optional wst wdc \ +dev/disk/wst/wst.c optional wst wdc \ warning "The wst driver is obsolete. Please use the atapist driver!" -i386/isa/wt.c optional wt -i386/linux/imgact_linux.c optional compat_linux -i386/linux/linux_dummy.c optional compat_linux -i386/linux/linux_locore.s optional compat_linux \ +dev/disk/wt/wt.c optional wt +emulation/linux/i386/imgact_linux.c optional compat_linux +emulation/linux/i386/linux_dummy.c optional compat_linux +emulation/linux/i386/linux_locore.s optional compat_linux \ dependency "linux_assym.h" -i386/linux/linux_machdep.c optional compat_linux -i386/linux/linux_ptrace.c optional compat_linux -i386/linux/linux_sysent.c optional compat_linux -i386/linux/linux_sysvec.c optional compat_linux -svr4/imgact_svr4.c optional compat_svr4 -svr4/svr4_fcntl.c optional compat_svr4 -svr4/svr4_filio.c optional compat_svr4 -svr4/svr4_ioctl.c optional compat_svr4 -svr4/svr4_ipc.c optional compat_svr4 -svr4/svr4_misc.c optional compat_svr4 -svr4/svr4_resource.c optional compat_svr4 -svr4/svr4_signal.c optional compat_svr4 -svr4/svr4_socket.c optional compat_svr4 -svr4/svr4_sockio.c optional compat_svr4 -svr4/svr4_stat.c optional compat_svr4 -svr4/svr4_stream.c optional compat_svr4 -svr4/svr4_syscallnames.c optional compat_svr4 -svr4/svr4_sysent.c optional compat_svr4 -svr4/svr4_sysvec.c optional compat_svr4 -svr4/svr4_termios.c optional compat_svr4 -svr4/svr4_ttold.c optional compat_svr4 -i386/svr4/svr4_locore.s optional compat_svr4 \ +emulation/linux/i386/linux_machdep.c optional compat_linux +emulation/linux/i386/linux_ptrace.c optional compat_linux +emulation/linux/i386/linux_sysent.c optional compat_linux +emulation/linux/i386/linux_sysvec.c optional compat_linux +emulation/svr4/imgact_svr4.c optional compat_svr4 +emulation/svr4/svr4_fcntl.c optional compat_svr4 +emulation/svr4/svr4_filio.c optional compat_svr4 +emulation/svr4/svr4_ioctl.c optional compat_svr4 +emulation/svr4/svr4_ipc.c optional compat_svr4 +emulation/svr4/svr4_misc.c optional compat_svr4 +emulation/svr4/svr4_resource.c optional compat_svr4 +emulation/svr4/svr4_signal.c optional compat_svr4 +emulation/svr4/svr4_socket.c optional compat_svr4 +emulation/svr4/svr4_sockio.c optional compat_svr4 +emulation/svr4/svr4_stat.c optional compat_svr4 +emulation/svr4/svr4_stream.c optional compat_svr4 +emulation/svr4/svr4_syscallnames.c optional compat_svr4 +emulation/svr4/svr4_sysent.c optional compat_svr4 +emulation/svr4/svr4_sysvec.c optional compat_svr4 +emulation/svr4/svr4_termios.c optional compat_svr4 +emulation/svr4/svr4_ttold.c optional compat_svr4 +emulation/svr4/i386/svr4_locore.s optional compat_svr4 \ dependency "svr4_assym.h" -i386/svr4/svr4_machdep.c optional compat_svr4 +emulation/svr4/i386/svr4_machdep.c optional compat_svr4 # # isdn4bsd, needed for isic | iwic | ifpi | | ifpi2 | ihfc | ifpnp | itjc # -i4b/layer1/i4b_l1dmux.c optional isic -i4b/layer1/i4b_l1lib.c optional isic -i4b/layer1/i4b_l1dmux.c optional iwic -i4b/layer1/i4b_l1lib.c optional iwic -i4b/layer1/i4b_l1dmux.c optional ifpi -i4b/layer1/i4b_l1lib.c optional ifpi -i4b/layer1/i4b_l1dmux.c optional ifpi2 -i4b/layer1/i4b_l1lib.c optional ifpi2 -i4b/layer1/i4b_l1dmux.c optional ihfc -i4b/layer1/i4b_l1lib.c optional ihfc -i4b/layer1/i4b_l1dmux.c optional ifpnp -i4b/layer1/i4b_l1lib.c optional ifpnp -i4b/layer1/i4b_l1dmux.c optional itjc -i4b/layer1/i4b_l1lib.c optional itjc +net/i4b/layer1/i4b_l1dmux.c optional isic +net/i4b/layer1/i4b_l1lib.c optional isic +net/i4b/layer1/i4b_l1dmux.c optional iwic +net/i4b/layer1/i4b_l1lib.c optional iwic +net/i4b/layer1/i4b_l1dmux.c optional ifpi +net/i4b/layer1/i4b_l1lib.c optional ifpi +net/i4b/layer1/i4b_l1dmux.c optional ifpi2 +net/i4b/layer1/i4b_l1lib.c optional ifpi2 +net/i4b/layer1/i4b_l1dmux.c optional ihfc +net/i4b/layer1/i4b_l1lib.c optional ihfc +net/i4b/layer1/i4b_l1dmux.c optional ifpnp +net/i4b/layer1/i4b_l1lib.c optional ifpnp +net/i4b/layer1/i4b_l1dmux.c optional itjc +net/i4b/layer1/i4b_l1lib.c optional itjc # # isdn4bsd, isic # -i4b/layer1/isic/i4b_asuscom_ipac.c optional isic -i4b/layer1/isic/i4b_avm_a1.c optional isic -i4b/layer1/isic/i4b_bchan.c optional isic -i4b/layer1/isic/i4b_ctx_s0P.c optional isic -i4b/layer1/isic/i4b_drn_ngo.c optional isic -i4b/layer1/isic/i4b_dynalink.c optional isic -i4b/layer1/isic/i4b_elsa_qs1i.c optional isic -i4b/layer1/isic/i4b_elsa_qs1p.c optional isic -i4b/layer1/isic/i4b_elsa_pcc16.c optional isic -i4b/layer1/isic/i4b_hscx.c optional isic -i4b/layer1/isic/i4b_isac.c optional isic -i4b/layer1/isic/i4b_isic.c optional isic -i4b/layer1/isic/i4b_isic_isa.c optional isic -i4b/layer1/isic/i4b_isic_pnp.c optional isic -i4b/layer1/isic/i4b_itk_ix1.c optional isic -i4b/layer1/isic/i4b_l1.c optional isic -i4b/layer1/isic/i4b_l1fsm.c optional isic -i4b/layer1/isic/i4b_siemens_isurf.c optional isic -i4b/layer1/isic/i4b_sws.c optional isic -i4b/layer1/isic/i4b_tel_s016.c optional isic -i4b/layer1/isic/i4b_tel_s0163.c optional isic -i4b/layer1/isic/i4b_tel_s08.c optional isic -i4b/layer1/isic/i4b_usr_sti.c optional isic -i4b/layer1/isic/i4b_diva.c optional isic +net/i4b/layer1/isic/i4b_asuscom_ipac.c optional isic +net/i4b/layer1/isic/i4b_avm_a1.c optional isic +net/i4b/layer1/isic/i4b_bchan.c optional isic +net/i4b/layer1/isic/i4b_ctx_s0P.c optional isic +net/i4b/layer1/isic/i4b_drn_ngo.c optional isic +net/i4b/layer1/isic/i4b_dynalink.c optional isic +net/i4b/layer1/isic/i4b_elsa_qs1i.c optional isic +net/i4b/layer1/isic/i4b_elsa_qs1p.c optional isic +net/i4b/layer1/isic/i4b_elsa_pcc16.c optional isic +net/i4b/layer1/isic/i4b_hscx.c optional isic +net/i4b/layer1/isic/i4b_isac.c optional isic +net/i4b/layer1/isic/i4b_isic.c optional isic +net/i4b/layer1/isic/i4b_isic_isa.c optional isic +net/i4b/layer1/isic/i4b_isic_pnp.c optional isic +net/i4b/layer1/isic/i4b_itk_ix1.c optional isic +net/i4b/layer1/isic/i4b_l1.c optional isic +net/i4b/layer1/isic/i4b_l1fsm.c optional isic +net/i4b/layer1/isic/i4b_siemens_isurf.c optional isic +net/i4b/layer1/isic/i4b_sws.c optional isic +net/i4b/layer1/isic/i4b_tel_s016.c optional isic +net/i4b/layer1/isic/i4b_tel_s0163.c optional isic +net/i4b/layer1/isic/i4b_tel_s08.c optional isic +net/i4b/layer1/isic/i4b_usr_sti.c optional isic +net/i4b/layer1/isic/i4b_diva.c optional isic # # isdn4bsd, iwic # -i4b/layer1/iwic/i4b_iwic_pci.c optional iwic -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic +net/i4b/layer1/iwic/i4b_iwic_pci.c optional iwic +net/i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic +net/i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic +net/i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic +net/i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic # # isdn4bsd, ifpi # -i4b/layer1/ifpi/i4b_ifpi_pci.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi +net/i4b/layer1/ifpi/i4b_ifpi_pci.c optional ifpi +net/i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi +net/i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi +net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi # # isdn4bsd, ifpi2 # -i4b/layer1/ifpi2/i4b_ifpi2_pci.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 +net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c optional ifpi2 +net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 +net/i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 +net/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 # # isdn4bsd, ifpnp # -i4b/layer1/ifpnp/i4b_ifpnp_avm.c optional ifpnp -i4b/layer1/ifpnp/i4b_ifpnp_isac.c optional ifpnp -i4b/layer1/ifpnp/i4b_ifpnp_l1.c optional ifpnp -i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c optional ifpnp +net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c optional ifpnp +net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c optional ifpnp +net/i4b/layer1/ifpnp/i4b_ifpnp_l1.c optional ifpnp +net/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c optional ifpnp # # isdn4bsd, ihfc # -i4b/layer1/ihfc/i4b_ihfc_l1if.c optional ihfc -i4b/layer1/ihfc/i4b_ihfc_pnp.c optional ihfc -i4b/layer1/ihfc/i4b_ihfc_drv.c optional ihfc +net/i4b/layer1/ihfc/i4b_ihfc_l1if.c optional ihfc +net/i4b/layer1/ihfc/i4b_ihfc_pnp.c optional ihfc +net/i4b/layer1/ihfc/i4b_ihfc_drv.c optional ihfc # # isdn4bsd, itjc # -i4b/layer1/itjc/i4b_itjc_pci.c optional itjc -i4b/layer1/itjc/i4b_itjc_isac.c optional itjc -i4b/layer1/itjc/i4b_itjc_l1.c optional itjc -i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc +net/i4b/layer1/itjc/i4b_itjc_pci.c optional itjc +net/i4b/layer1/itjc/i4b_itjc_isac.c optional itjc +net/i4b/layer1/itjc/i4b_itjc_l1.c optional itjc +net/i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc # -isa/atkbd_isa.c optional atkbd -isa/atkbdc_isa.c optional atkbdc -isa/ppc.c optional ppc -isa/psm.c optional psm -isa/sio.c optional sio -isa/syscons_isa.c optional sc -isa/vga_isa.c optional vga -kern/md4c.c optional netsmb -kern/subr_diskmbr.c standard -libkern/divdi3.c standard -libkern/moddi3.c standard -libkern/qdivrem.c standard -libkern/udivdi3.c standard -libkern/umoddi3.c standard -netsmb/smb_conn.c optional netsmb -netsmb/smb_crypt.c optional netsmb -netsmb/smb_dev.c optional netsmb -netsmb/smb_iod.c optional netsmb -netsmb/smb_rq.c optional netsmb -netsmb/smb_smb.c optional netsmb -netsmb/smb_subr.c optional netsmb -netsmb/smb_trantcp.c optional netsmb -netsmb/smb_usr.c optional netsmb -pci/ide_pci.c optional wdc pci +dev/misc/atkbd/atkbd_isa.c optional atkbd +dev/misc/atkbdc_layer/atkbdc_isa.c optional atkbdc +dev/misc/ppc/ppc.c optional ppc +dev/misc/psm/psm.c optional psm +dev/serial/sio/sio.c optional sio +bus/isa/syscons_isa.c optional sc +bus/isa/vga_isa.c optional vga +kern/md4c.c optional netsmb +kern/subr_diskmbr.c standard +libkern/divdi3.c standard +libkern/moddi3.c standard +libkern/qdivrem.c standard +libkern/udivdi3.c standard +libkern/umoddi3.c standard +netproto/smb/smb_conn.c optional netsmb +netproto/smb/smb_crypt.c optional netsmb +netproto/smb/smb_dev.c optional netsmb +netproto/smb/smb_iod.c optional netsmb +netproto/smb/smb_rq.c optional netsmb +netproto/smb/smb_smb.c optional netsmb +netproto/smb/smb_subr.c optional netsmb +netproto/smb/smb_trantcp.c optional netsmb +netproto/smb/smb_usr.c optional netsmb +bus/pci/ide_pci.c optional wdc pci diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 1b9c154c77..263f607d72 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -1,6 +1,6 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 # $FreeBSD: src/sys/conf/kmod.mk,v 1.82.2.15 2003/02/10 13:11:50 nyan Exp $ -# $DragonFly: src/sys/conf/kmod.mk,v 1.2 2003/06/17 04:28:20 dillon Exp $ +# $DragonFly: src/sys/conf/kmod.mk,v 1.3 2003/08/07 21:16:48 dillon Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -215,14 +215,14 @@ ${_src}: .endif .endfor -MFILES?= kern/bus_if.m kern/device_if.m dev/iicbus/iicbb_if.m \ - dev/iicbus/iicbus_if.m isa/isa_if.m dev/mii/miibus_if.m \ - dev/pccard/card_if.m dev/pccard/power_if.m pci/pci_if.m \ - dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m dev/usb/usb_if.m \ +MFILES?= kern/bus_if.m kern/device_if.m bus/iicbus/iicbb_if.m \ + bus/iicbus/iicbus_if.m bus/isa/isa_if.m dev/netif/mii_layer/miibus_if.m \ + dev/misc/pccard/card_if.m dev/misc/pccard/power_if.m bus/pci/pci_if.m \ + bus/ppbus/ppbus_if.m bus/smbus/smbus_if.m bus/usb/usb_if.m \ dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \ - libkern/iconv_converter_if.m pci/agp_if.m opencrypto/crypto_if.m \ - pc98/pc98/canbus_if.m + libkern/iconv_converter_if.m dev/agp/agp_if.m opencrypto/crypto_if.m \ + bus/canbus/canbus_if.m .for _srcsrc in ${MFILES} .for _ext in c h diff --git a/sys/config/LINT b/sys/config/LINT index 3b46d6634f..e33db0db4a 100644 --- a/sys/config/LINT +++ b/sys/config/LINT @@ -3,7 +3,7 @@ # as much of the source tree as it can. # # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $ -# $DragonFly: src/sys/config/LINT,v 1.3 2003/08/01 10:58:59 rob Exp $ +# $DragonFly: src/sys/config/LINT,v 1.4 2003/08/07 21:17:20 dillon Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1752,8 +1752,6 @@ device asc0 at isa? port IO_ASC1 drq 3 irq 10 device spic0 at isa? irq 0 port 0x10a0 device stl0 at isa? port 0x2a0 irq 10 device stli0 at isa? port 0x2a0 iomem 0xcc000 flags 23 iosiz 0x1000 -# You are unlikely to have the hardware for loran0 -device loran0 at isa? irq 5 # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu # nullmodem terminal driver diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c index 03abb0707d..7c7ac8b7ab 100644 --- a/sys/contrib/dev/fla/fla.c +++ b/sys/contrib/dev/fla/fla.c @@ -7,11 +7,12 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/contrib/dev/fla/fla.c,v 1.16 1999/12/08 04:45:16 ken Exp $ - * $DragonFly: src/sys/contrib/dev/fla/Attic/fla.c,v 1.5 2003/07/22 17:03:26 dillon Exp $ + * $DragonFly: src/sys/contrib/dev/fla/Attic/fla.c,v 1.6 2003/08/07 21:16:48 dillon Exp $ * */ -#include "fla.h" +#include "use_fla.h" + #include #include #include @@ -32,7 +33,7 @@ #include #include -#include +#include #ifdef SMP #include diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c index f59fd00f6b..8aa34a2c8e 100644 --- a/sys/contrib/dev/oltr/if_oltr.c +++ b/sys/contrib/dev/oltr/if_oltr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.11.2.5 2001/10/20 04:15:21 mdodd Exp $ - * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.5 2003/07/27 01:49:48 hmp Exp $ + * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.6 2003/08/07 21:16:48 dillon Exp $ */ #include @@ -69,8 +69,8 @@ #include #include -#include -#include +#include +#include #include "contrib/dev/oltr/trlld.h" diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c index 8913c082bf..54c72918d5 100644 --- a/sys/contrib/ipfilter/netinet/fil.c +++ b/sys/contrib/ipfilter/netinet/fil.c @@ -5,7 +5,7 @@ * * @(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed * $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.23.2.6 2003/03/01 03:55:54 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/fil.c,v 1.3 2003/07/26 14:07:18 rob Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/fil.c,v 1.4 2003/08/07 21:16:48 dillon Exp $ */ #if defined(__sgi) && (IRIX > 602) # include @@ -74,7 +74,7 @@ #include #include #include -#include "netinet/ip_compat.h" +#include "ip_compat.h" #ifdef USE_INET6 # include # if !SOLARIS && defined(_KERNEL) @@ -82,12 +82,12 @@ # endif #endif #include -#include "netinet/ip_fil.h" -#include "netinet/ip_nat.h" -#include "netinet/ip_frag.h" -#include "netinet/ip_state.h" -#include "netinet/ip_proxy.h" -#include "netinet/ip_auth.h" +#include "ip_fil.h" +#include "ip_nat.h" +#include "ip_frag.h" +#include "ip_state.h" +#include "ip_proxy.h" +#include "ip_auth.h" # if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) # include # if defined(_KERNEL) && !defined(IPFILTER_LKM) @@ -97,7 +97,7 @@ #ifndef MIN # define MIN(a,b) (((a)<(b))?(a):(b)) #endif -#include "netinet/ipl.h" +#include "ipl.h" #include diff --git a/sys/contrib/ipfilter/netinet/ip_auth.c b/sys/contrib/ipfilter/netinet/ip_auth.c index 5c385a0292..980287aebd 100644 --- a/sys/contrib/ipfilter/netinet/ip_auth.c +++ b/sys/contrib/ipfilter/netinet/ip_auth.c @@ -5,7 +5,7 @@ * * @(#)$Id: ip_auth.c,v 2.11.2.20 2002/06/04 14:40:42 darrenr Exp $ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.21.2.7 2003/03/01 03:55:54 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.3 2003/07/26 14:07:18 rob Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_auth.c,v 1.4 2003/08/07 21:16:48 dillon Exp $ */ #if defined(__sgi) && (IRIX > 602) # include @@ -89,10 +89,10 @@ extern struct ifqueue ipintrq; /* ip packet input queue */ #endif #include #include -#include "netinet/ip_compat.h" +#include "ip_compat.h" #include -#include "netinet/ip_fil.h" -#include "netinet/ip_auth.h" +#include "ip_fil.h" +#include "ip_auth.h" #if !SOLARIS && !defined(linux) # include # ifdef __FreeBSD__ diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c index d99f194b55..f3cc8ce68a 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil.c +++ b/sys/contrib/ipfilter/netinet/ip_fil.c @@ -6,7 +6,7 @@ * @(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed * @(#)$Id: ip_fil.c,v 2.42.2.60 2002/08/28 12:40:39 darrenr Exp $ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.25.2.6 2003/03/01 03:55:54 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.4 2003/07/26 14:07:18 rob Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_fil.c,v 1.5 2003/08/07 21:16:48 dillon Exp $ */ #ifndef SOLARIS #define SOLARIS (defined(sun) && (defined(__svr4__) || defined(__SVR4))) @@ -98,7 +98,7 @@ # include # include #endif -#include "netinet/ip_compat.h" +#include "ip_compat.h" #ifdef USE_INET6 # include # if !SOLARIS @@ -106,12 +106,12 @@ # include # endif #endif -#include "netinet/ip_fil.h" -#include "netinet/ip_nat.h" -#include "netinet/ip_frag.h" -#include "netinet/ip_state.h" -#include "netinet/ip_proxy.h" -#include "netinet/ip_auth.h" +#include "ip_fil.h" +#include "ip_nat.h" +#include "ip_frag.h" +#include "ip_state.h" +#include "ip_proxy.h" +#include "ip_auth.h" #if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000) # include #endif diff --git a/sys/contrib/ipfilter/netinet/ip_frag.c b/sys/contrib/ipfilter/netinet/ip_frag.c index 27ba3c1162..1741a63516 100644 --- a/sys/contrib/ipfilter/netinet/ip_frag.c +++ b/sys/contrib/ipfilter/netinet/ip_frag.c @@ -6,7 +6,7 @@ * @(#)ip_frag.c 1.11 3/24/96 (C) 1993-2000 Darren Reed * @(#)$Id: ip_frag.c,v 2.10.2.24 2002/08/28 12:41:04 darrenr Exp $ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_frag.c,v 1.15.2.6 2003/03/01 03:55:54 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_frag.c,v 1.2 2003/06/17 04:28:20 dillon Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_frag.c,v 1.3 2003/08/07 21:16:48 dillon Exp $ */ #if defined(KERNEL) && !defined(_KERNEL) # define _KERNEL @@ -67,13 +67,13 @@ #include #include #include -#include "netinet/ip_compat.h" +#include "ip_compat.h" #include -#include "netinet/ip_fil.h" -#include "netinet/ip_nat.h" -#include "netinet/ip_frag.h" -#include "netinet/ip_state.h" -#include "netinet/ip_auth.h" +#include "ip_fil.h" +#include "ip_nat.h" +#include "ip_frag.h" +#include "ip_state.h" +#include "ip_auth.h" #if (__FreeBSD_version >= 300000) # include # if (defined(KERNEL) || defined(_KERNEL)) diff --git a/sys/contrib/ipfilter/netinet/ip_log.c b/sys/contrib/ipfilter/netinet/ip_log.c index f9c700c9fd..b53770fc76 100644 --- a/sys/contrib/ipfilter/netinet/ip_log.c +++ b/sys/contrib/ipfilter/netinet/ip_log.c @@ -5,7 +5,7 @@ * * $Id: ip_log.c,v 2.5.2.1 2000/07/19 13:11:47 darrenr Exp $ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.17.2.4 2003/03/01 03:55:54 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.3 2003/07/26 14:07:18 rob Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_log.c,v 1.4 2003/08/07 21:16:48 dillon Exp $ */ #include #if defined(KERNEL) && !defined(_KERNEL) @@ -113,9 +113,9 @@ # ifndef _KERNEL # include # endif -# include "netinet/ip_compat.h" +# include "ip_compat.h" # include -# include "netinet/ip_fil.h" +# include "ip_fil.h" # if (__FreeBSD_version >= 300000) # include # endif diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c index f2f721db16..8fd7ea5b5d 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat.c +++ b/sys/contrib/ipfilter/netinet/ip_nat.c @@ -8,7 +8,7 @@ * @(#)ip_nat.c 1.11 6/5/96 (C) 1995 Darren Reed * @(#)$Id: ip_nat.c,v 2.37.2.70 2002/08/28 12:45:48 darrenr Exp $ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.22.2.7 2003/03/01 03:55:54 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.3 2003/07/26 14:07:18 rob Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_nat.c,v 1.4 2003/08/07 21:16:48 dillon Exp $ */ #if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL) #define _KERNEL @@ -96,13 +96,13 @@ extern struct ifnet vpnif; #include #include #include -#include "netinet/ip_compat.h" +#include "ip_compat.h" #include -#include "netinet/ip_fil.h" -#include "netinet/ip_nat.h" -#include "netinet/ip_frag.h" -#include "netinet/ip_state.h" -#include "netinet/ip_proxy.h" +#include "ip_fil.h" +#include "ip_nat.h" +#include "ip_frag.h" +#include "ip_state.h" +#include "ip_proxy.h" #if (__FreeBSD_version >= 300000) # include #endif diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c index ba989f00d8..c9ce93cb1a 100644 --- a/sys/contrib/ipfilter/netinet/ip_proxy.c +++ b/sys/contrib/ipfilter/netinet/ip_proxy.c @@ -5,7 +5,7 @@ * * @(#)$Id: ip_proxy.c,v 2.9.2.24 2002/08/28 12:45:51 darrenr Exp $ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.11.2.5 2003/03/01 03:55:54 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.4 2003/07/27 01:49:49 hmp Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_proxy.c,v 1.5 2003/08/07 21:16:48 dillon Exp $ */ #if defined(__FreeBSD__) && defined(KERNEL) && !defined(_KERNEL) # define _KERNEL @@ -68,12 +68,12 @@ #include #include #include -#include "netinet/ip_compat.h" +#include "ip_compat.h" #include -#include "netinet/ip_fil.h" -#include "netinet/ip_nat.h" -#include "netinet/ip_state.h" -#include "netinet/ip_proxy.h" +#include "ip_fil.h" +#include "ip_nat.h" +#include "ip_state.h" +#include "ip_proxy.h" #if (__FreeBSD_version >= 300000) # include #endif @@ -89,14 +89,14 @@ static int appr_fixseqack __P((fr_info_t *, ip_t *, ap_session_t *, int )); #define AP_SESS_SIZE 53 -#include "netinet/ip_ftp_pxy.c" +#include "ip_ftp_pxy.c" #if defined(_KERNEL) -#include "netinet/ip_rcmd_pxy.c" -#include "netinet/ip_raudio_pxy.c" -#include "netinet/ip_netbios_pxy.c" -#include "netinet/ip_h323_pxy.c" +#include "ip_rcmd_pxy.c" +#include "ip_raudio_pxy.c" +#include "ip_netbios_pxy.c" +#include "ip_h323_pxy.c" #endif -#include "netinet/ip_ipsec_pxy.c" +#include "ip_ipsec_pxy.c" ap_session_t *ap_sess_tab[AP_SESS_SIZE]; ap_session_t *ap_sess_list = NULL; diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c index 07c41c90e2..25524575db 100644 --- a/sys/contrib/ipfilter/netinet/ip_state.c +++ b/sys/contrib/ipfilter/netinet/ip_state.c @@ -6,7 +6,7 @@ * @(#)ip_state.c 1.8 6/5/96 (C) 1993-2000 Darren Reed * @(#)$Id: ip_state.c,v 2.30.2.74 2002/07/27 15:58:10 darrenr Exp $ * $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_state.c,v 1.21.2.5 2003/03/01 03:55:54 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_state.c,v 1.3 2003/07/26 14:07:18 rob Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/ip_state.c,v 1.4 2003/08/07 21:16:48 dillon Exp $ */ #if defined(__sgi) && (IRIX > 602) @@ -80,12 +80,12 @@ #endif #include #include -#include "netinet/ip_compat.h" +#include "ip_compat.h" #include -#include "netinet/ip_fil.h" -#include "netinet/ip_nat.h" -#include "netinet/ip_frag.h" -#include "netinet/ip_state.h" +#include "ip_fil.h" +#include "ip_nat.h" +#include "ip_frag.h" +#include "ip_state.h" #ifdef USE_INET6 #include #endif diff --git a/sys/contrib/ipfilter/netinet/mlfk_ipl.c b/sys/contrib/ipfilter/netinet/mlfk_ipl.c index bd1992b4ed..57609155bf 100644 --- a/sys/contrib/ipfilter/netinet/mlfk_ipl.c +++ b/sys/contrib/ipfilter/netinet/mlfk_ipl.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.9.2.2 2002/04/27 17:37:12 darrenr Exp $ - * $DragonFly: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.3 2003/07/21 05:50:26 dillon Exp $ + * $DragonFly: src/sys/contrib/ipfilter/netinet/mlfk_ipl.c,v 1.4 2003/08/07 21:16:48 dillon Exp $ */ @@ -47,14 +47,14 @@ #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include "ipl.h" +#include "ip_compat.h" +#include "ip_fil.h" +#include "ip_state.h" +#include "ip_nat.h" +#include "ip_auth.h" +#include "ip_frag.h" +#include "ip_proxy.h" static dev_t ipf_devs[IPL_LOGMAX + 1]; diff --git a/sys/cpu/i386/include/bus_at386.h b/sys/cpu/i386/include/bus_at386.h index 8fbf634eec..d9f09696b9 100644 --- a/sys/cpu/i386/include/bus_at386.h +++ b/sys/cpu/i386/include/bus_at386.h @@ -68,12 +68,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* $FreeBSD: src/sys/i386/include/bus_at386.h,v 1.8.2.3 2002/03/03 05:42:50 nyan Exp $ */ -/* $DragonFly: src/sys/cpu/i386/include/bus_at386.h,v 1.4 2003/07/26 01:04:08 dillon Exp $ */ +/* $DragonFly: src/sys/cpu/i386/include/bus_at386.h,v 1.5 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _I386_BUS_AT386_H_ #define _I386_BUS_AT386_H_ -#include +#include "cpufunc.h" /* * To remain compatible with NetBSD's interface, default to both memio and diff --git a/sys/cpu/i386/include/cpu.h b/sys/cpu/i386/include/cpu.h index cafca623df..d428fcc7e9 100644 --- a/sys/cpu/i386/include/cpu.h +++ b/sys/cpu/i386/include/cpu.h @@ -35,7 +35,7 @@ * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/include/cpu.h,v 1.43.2.2 2001/06/15 09:37:57 scottl Exp $ - * $DragonFly: src/sys/cpu/i386/include/cpu.h,v 1.8 2003/07/12 17:54:34 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/cpu.h,v 1.9 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -44,9 +44,9 @@ /* * Definitions unique to i386 cpu support. */ -#include -#include -#include +#include "psl.h" +#include "frame.h" +#include "segments.h" /* * definitions of cpu-dependent requirements diff --git a/sys/cpu/i386/include/cpufunc.h b/sys/cpu/i386/include/cpufunc.h index 1abf5fc089..7bad028eb4 100644 --- a/sys/cpu/i386/include/cpufunc.h +++ b/sys/cpu/i386/include/cpufunc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.96.2.3 2002/04/28 22:50:54 dwmalone Exp $ - * $DragonFly: src/sys/cpu/i386/include/cpufunc.h,v 1.5 2003/07/06 21:23:49 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/cpufunc.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ */ /* @@ -55,7 +55,7 @@ __BEGIN_DECLS #ifdef __GNUC__ #ifdef SMP -#include /* XXX */ +#include "lock.h" /* XXX */ #endif #ifdef SWTCH_OPTIM_STATS diff --git a/sys/cpu/i386/include/db_machdep.h b/sys/cpu/i386/include/db_machdep.h index 9adc3538f0..3be853f964 100644 --- a/sys/cpu/i386/include/db_machdep.h +++ b/sys/cpu/i386/include/db_machdep.h @@ -24,16 +24,16 @@ * the rights to redistribute these changes. * * $FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04 13:55:35 marcel Exp $ - * $DragonFly: src/sys/cpu/i386/include/db_machdep.h,v 1.3 2003/07/08 06:27:26 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/db_machdep.h,v 1.4 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ #define _MACHINE_DB_MACHDEP_H_ -#include -#include -#include -#include +#include "frame.h" +#include "psl.h" +#include "trap.h" +#include "globaldata.h" #define i386_saved_state trapframe diff --git a/sys/cpu/i386/include/floatingpoint.h b/sys/cpu/i386/include/floatingpoint.h index 0160e16102..97ad8ab455 100644 --- a/sys/cpu/i386/include/floatingpoint.h +++ b/sys/cpu/i386/include/floatingpoint.h @@ -32,7 +32,7 @@ * * from: @(#) floatingpoint.h 1.0 (Berkeley) 9/23/93 * $FreeBSD: src/sys/i386/include/floatingpoint.h,v 1.10.2.1 2002/06/30 00:55:09 bde Exp $ - * $DragonFly: src/sys/cpu/i386/include/floatingpoint.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/floatingpoint.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _FLOATINGPOINT_H_ @@ -49,7 +49,7 @@ */ #include -#include +#include "ieeefp.h" #ifdef __GNUC__ diff --git a/sys/cpu/i386/include/signal.h b/sys/cpu/i386/include/signal.h index 9b402847c0..44fb5769af 100644 --- a/sys/cpu/i386/include/signal.h +++ b/sys/cpu/i386/include/signal.h @@ -32,7 +32,7 @@ * * @(#)signal.h 8.1 (Berkeley) 6/11/93 * $FreeBSD: src/sys/i386/include/signal.h,v 1.12 1999/11/12 13:52:11 marcel Exp $ - * $DragonFly: src/sys/cpu/i386/include/signal.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/cpu/i386/include/signal.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_SIGNAL_H_ @@ -46,7 +46,7 @@ typedef int sig_atomic_t; #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -#include /* codes for SIGILL, SIGFPE */ +#include "trap.h" /* codes for SIGILL, SIGFPE */ /* * Information pushed on stack when a signal is delivered. diff --git a/sys/cpu/i386/misc/i386-gdbstub.c b/sys/cpu/i386/misc/i386-gdbstub.c index ca49116ebb..28594d3bdc 100644 --- a/sys/cpu/i386/misc/i386-gdbstub.c +++ b/sys/cpu/i386/misc/i386-gdbstub.c @@ -92,7 +92,10 @@ * ****************************************************************************/ /* $FreeBSD: src/sys/i386/i386/i386-gdbstub.c,v 1.13.2.1 2000/08/03 00:54:41 peter Exp $ */ -/* $DragonFly: src/sys/cpu/i386/misc/i386-gdbstub.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ */ +/* $DragonFly: src/sys/cpu/i386/misc/i386-gdbstub.c,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ + +#include "use_sio.h" +#include "opt_ddb.h" #include #include @@ -103,9 +106,6 @@ #include -#include "sio.h" -#include "opt_ddb.h" - void gdb_handle_exception (db_regs_t *, int, int); #if NSIO == 0 diff --git a/sys/dev/agp/agp.c b/sys/dev/agp/agp.c index 0babd83d2b..2c40a910a4 100644 --- a/sys/dev/agp/agp.c +++ b/sys/dev/agp/agp.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agp.c,v 1.3.2.4 2002/08/11 19:58:12 alc Exp $ - * $DragonFly: src/sys/dev/agp/agp.c,v 1.6 2003/07/21 05:50:46 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agp.c,v 1.7 2003/08/07 21:16:48 dillon Exp $ */ #include "opt_bus.h" @@ -41,11 +41,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include "agppriv.h" +#include "agpvar.h" +#include "agpreg.h" #include #include diff --git a/sys/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c index c7fa063b99..29b09056d8 100644 --- a/sys/dev/agp/agp_ali.c +++ b/sys/dev/agp/agp_ali.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agp_ali.c,v 1.1.2.1 2000/07/19 09:48:04 ru Exp $ - * $DragonFly: src/sys/dev/agp/agp_ali.c,v 1.2 2003/06/17 04:28:56 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agp_ali.c,v 1.3 2003/08/07 21:16:48 dillon Exp $ */ #include "opt_bus.h" @@ -37,10 +37,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include "agppriv.h" +#include "agpreg.h" #include #include diff --git a/sys/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c index ef404f743e..8d8d9de6b4 100644 --- a/sys/dev/agp/agp_amd.c +++ b/sys/dev/agp/agp_amd.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agp_amd.c,v 1.3.2.4 2002/04/25 23:41:36 cokane Exp $ - * $DragonFly: src/sys/dev/agp/agp_amd.c,v 1.2 2003/06/17 04:28:56 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agp_amd.c,v 1.3 2003/08/07 21:16:48 dillon Exp $ */ #include "opt_bus.h" @@ -37,10 +37,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include "agppriv.h" +#include "agpreg.h" #include #include diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c index f7140647e7..fd555e9060 100644 --- a/sys/dev/agp/agp_i810.c +++ b/sys/dev/agp/agp_i810.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agp_i810.c,v 1.1.2.5 2002/09/15 08:45:41 anholt Exp $ - * $DragonFly: src/sys/dev/agp/agp_i810.c,v 1.2 2003/06/17 04:28:56 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agp_i810.c,v 1.3 2003/08/07 21:16:48 dillon Exp $ */ /* @@ -42,10 +42,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include "agppriv.h" +#include "agpreg.h" #include #include diff --git a/sys/dev/agp/agp_intel.c b/sys/dev/agp/agp_intel.c index 5e678f8095..5c5b42bc85 100644 --- a/sys/dev/agp/agp_intel.c +++ b/sys/dev/agp/agp_intel.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agp_intel.c,v 1.1.2.5 2003/06/02 17:38:19 jhb Exp $ - * $DragonFly: src/sys/dev/agp/agp_intel.c,v 1.2 2003/06/17 04:28:56 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agp_intel.c,v 1.3 2003/08/07 21:16:48 dillon Exp $ */ #include "opt_bus.h" @@ -37,10 +37,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include "agppriv.h" +#include "agpreg.h" #include #include diff --git a/sys/dev/agp/agp_sis.c b/sys/dev/agp/agp_sis.c index 4fb3f07a91..41911f5b5a 100644 --- a/sys/dev/agp/agp_sis.c +++ b/sys/dev/agp/agp_sis.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agp_sis.c,v 1.1.2.1 2000/07/19 09:48:04 ru Exp $ - * $DragonFly: src/sys/dev/agp/agp_sis.c,v 1.2 2003/06/17 04:28:56 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agp_sis.c,v 1.3 2003/08/07 21:16:48 dillon Exp $ */ #include "opt_bus.h" @@ -37,10 +37,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include "agppriv.h" +#include "agpreg.h" #include #include diff --git a/sys/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c index bc942060b9..0c2cd0f22c 100644 --- a/sys/dev/agp/agp_via.c +++ b/sys/dev/agp/agp_via.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agp_via.c,v 1.1.2.2 2001/10/04 09:53:04 ru Exp $ - * $DragonFly: src/sys/dev/agp/agp_via.c,v 1.2 2003/06/17 04:28:56 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agp_via.c,v 1.3 2003/08/07 21:16:48 dillon Exp $ */ #include "opt_bus.h" @@ -37,10 +37,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include "agppriv.h" +#include "agpreg.h" #include #include diff --git a/sys/dev/agp/agppriv.h b/sys/dev/agp/agppriv.h index 5b998042e3..7c40133b00 100644 --- a/sys/dev/agp/agppriv.h +++ b/sys/dev/agp/agppriv.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/agppriv.h,v 1.3.2.1 2000/07/19 09:48:04 ru Exp $ - * $DragonFly: src/sys/dev/agp/agppriv.h,v 1.2 2003/06/17 04:28:56 dillon Exp $ + * $DragonFly: src/sys/dev/agp/agppriv.h,v 1.3 2003/08/07 21:16:48 dillon Exp $ */ #ifndef _PCI_AGPPRIV_H_ @@ -35,7 +35,7 @@ */ #include -#include +#include "agpvar.h" #define AGP_DEBUGxx diff --git a/sys/dev/atm/en/midway.c b/sys/dev/atm/en/midway.c index d3ba8ffa2d..db5d812fb1 100644 --- a/sys/dev/atm/en/midway.c +++ b/sys/dev/atm/en/midway.c @@ -33,7 +33,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/en/midway.c,v 1.19.2.1 2003/01/23 21:06:42 sam Exp $ - * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -109,7 +109,7 @@ #endif /* EN_DEBUG */ #ifdef __FreeBSD__ -#include "en.h" /* XXX for midwayvar.h's NEN */ +#include "use_en.h" /* XXX for midwayvar.h's NEN */ #include "opt_inet.h" #include "opt_natm.h" #include "opt_ddb.h" @@ -159,8 +159,8 @@ #endif #elif defined(__FreeBSD__) #include /* for DELAY */ -#include -#include +#include "midwayreg.h" +#include "midwayvar.h" #include /* for vtophys proto */ #ifndef IFF_NOTRAILERS @@ -169,7 +169,7 @@ #endif /* __FreeBSD__ */ -#include "bpf.h" +#include "use_bpf.h" #if NBPF > 0 #include #ifdef __FreeBSD__ diff --git a/sys/dev/atm/hea/eni.c b/sys/dev/atm/hea/eni.c index 06e13898dd..0098bdefeb 100644 --- a/sys/dev/atm/hea/eni.c +++ b/sys/dev/atm/hea/eni.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.10 1999/08/28 00:41:42 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "eni_stats.h" +#include "eni.h" +#include "eni_var.h" /* * Typedef local functions diff --git a/sys/dev/atm/hea/eni.h b/sys/dev/atm/hea/eni.h index 70e9d60a11..6dd7a9cf3c 100644 --- a/sys/dev/atm/hea/eni.h +++ b/sys/dev/atm/hea/eni.h @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni.h,v 1.2 1999/08/28 00:41:43 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni.h,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni.h,v 1.3 2003/08/07 21:16:49 dillon Exp $ * */ @@ -38,8 +38,8 @@ #ifndef _ENI_ENI_H #define _ENI_ENI_H -#include -#include +#include +#include /* * Physical device name - used to configure HARP devices diff --git a/sys/dev/atm/hea/eni_buffer.c b/sys/dev/atm/hea/eni_buffer.c index 91865511de..2638cb1b8f 100644 --- a/sys/dev/atm/hea/eni_buffer.c +++ b/sys/dev/atm/hea/eni_buffer.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_buffer.c,v 1.5 1999/08/28 00:41:43 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_buffer.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_buffer.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "eni_stats.h" +#include "eni.h" +#include "eni_var.h" static int eni_test_memory __P((Eni_unit *)); diff --git a/sys/dev/atm/hea/eni_globals.c b/sys/dev/atm/hea/eni_globals.c index f7db1322d8..b184945f8a 100644 --- a/sys/dev/atm/hea/eni_globals.c +++ b/sys/dev/atm/hea/eni_globals.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.5 2000/01/17 20:49:41 mks Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_globals.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_globals.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -37,8 +37,8 @@ #include -#include -#include +#include "eni_stats.h" +#include "eni.h" /* * Device unit table diff --git a/sys/dev/atm/hea/eni_if.c b/sys/dev/atm/hea/eni_if.c index 1617b63214..cbd597661e 100644 --- a/sys/dev/atm/hea/eni_if.c +++ b/sys/dev/atm/hea/eni_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_if.c,v 1.5 1999/08/28 00:41:44 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_if.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_if.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "eni_stats.h" +#include "eni.h" +#include "eni_suni.h" +#include "eni_var.h" static void eni_get_stats __P((Eni_unit *)); diff --git a/sys/dev/atm/hea/eni_init.c b/sys/dev/atm/hea/eni_init.c index fbafffab55..b38e75b550 100644 --- a/sys/dev/atm/hea/eni_init.c +++ b/sys/dev/atm/hea/eni_init.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_init.c,v 1.3 1999/08/28 00:41:44 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_init.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_init.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "eni_stats.h" +#include "eni.h" +#include "eni_var.h" /* * Initialize adapter for PDU processing diff --git a/sys/dev/atm/hea/eni_intr.c b/sys/dev/atm/hea/eni_intr.c index 75b1561f5d..e85f54c523 100644 --- a/sys/dev/atm/hea/eni_intr.c +++ b/sys/dev/atm/hea/eni_intr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_intr.c,v 1.4 1999/08/28 00:41:44 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_intr.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_intr.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "eni_stats.h" +#include "eni.h" +#include "eni_suni.h" +#include "eni_var.h" static void eni_suni_intr __P((Eni_unit *)); diff --git a/sys/dev/atm/hea/eni_receive.c b/sys/dev/atm/hea/eni_receive.c index 4c90cc66c6..efb7356129 100644 --- a/sys/dev/atm/hea/eni_receive.c +++ b/sys/dev/atm/hea/eni_receive.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_receive.c,v 1.5 1999/08/28 00:41:45 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_receive.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_receive.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "eni_stats.h" +#include "eni.h" +#include "eni_var.h" static void eni_recv_stack __P((void *, KBuffer *)); diff --git a/sys/dev/atm/hea/eni_transmit.c b/sys/dev/atm/hea/eni_transmit.c index 8259b8da47..1d821ce6f5 100644 --- a/sys/dev/atm/hea/eni_transmit.c +++ b/sys/dev/atm/hea/eni_transmit.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_transmit.c,v 1.6 1999/12/21 08:24:35 eivind Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_transmit.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_transmit.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -38,9 +38,9 @@ #include -#include -#include -#include +#include "eni_stats.h" +#include "eni.h" +#include "eni_var.h" /* * Make a variable which controls printing of PDUs diff --git a/sys/dev/atm/hea/eni_vcm.c b/sys/dev/atm/hea/eni_vcm.c index 552ee659db..a62c3ee616 100644 --- a/sys/dev/atm/hea/eni_vcm.c +++ b/sys/dev/atm/hea/eni_vcm.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hea/eni_vcm.c,v 1.3 1999/08/28 00:41:47 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hea/eni_vcm.c,v 1.3 2003/07/23 02:30:16 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hea/eni_vcm.c,v 1.4 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -38,9 +38,9 @@ #include -#include -#include -#include +#include "eni_stats.h" +#include "eni.h" +#include "eni_var.h" /* * VCC Stack Instantiation diff --git a/sys/dev/atm/hfa/fore_buffer.c b/sys/dev/atm/hfa/fore_buffer.c index 5cff2de2f2..ad6c655c6e 100644 --- a/sys/dev/atm/hfa/fore_buffer.c +++ b/sys/dev/atm/hfa/fore_buffer.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_buffer.c,v 1.5 2000/01/15 21:01:04 mks Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_buffer.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_buffer.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * Local functions diff --git a/sys/dev/atm/hfa/fore_command.c b/sys/dev/atm/hfa/fore_command.c index aac4fbd3ac..9145250f6d 100644 --- a/sys/dev/atm/hfa/fore_command.c +++ b/sys/dev/atm/hfa/fore_command.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_command.c,v 1.6 1999/08/28 00:41:49 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_command.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_command.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * Local variables diff --git a/sys/dev/atm/hfa/fore_globals.c b/sys/dev/atm/hfa/fore_globals.c index d5d3cf0337..4d11ebe050 100644 --- a/sys/dev/atm/hfa/fore_globals.c +++ b/sys/dev/atm/hfa/fore_globals.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.4 1999/08/28 00:41:49 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_globals.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_globals.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * Supported device models diff --git a/sys/dev/atm/hfa/fore_if.c b/sys/dev/atm/hfa/fore_if.c index 1b63e6ed15..d2ce02a311 100644 --- a/sys/dev/atm/hfa/fore_if.c +++ b/sys/dev/atm/hfa/fore_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_if.c,v 1.5 1999/08/28 00:41:49 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_if.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_if.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * Handle netatm core service interface ioctl requests diff --git a/sys/dev/atm/hfa/fore_include.h b/sys/dev/atm/hfa/fore_include.h index 296ec95d7e..126f74f1b4 100644 --- a/sys/dev/atm/hfa/fore_include.h +++ b/sys/dev/atm/hfa/fore_include.h @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.2 1999/08/28 00:41:50 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_include.h,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_include.h,v 1.3 2003/08/07 21:16:49 dillon Exp $ * */ @@ -53,15 +53,15 @@ #endif #ifdef FORE_PCI -#include -#include +#include +#include #endif -#include -#include -#include -#include -#include +#include "fore.h" +#include "fore_aali.h" +#include "fore_slave.h" +#include "fore_stats.h" +#include "fore_var.h" /* * Global function declarations diff --git a/sys/dev/atm/hfa/fore_init.c b/sys/dev/atm/hfa/fore_init.c index 8e06f30ebe..28019cfc1d 100644 --- a/sys/dev/atm/hfa/fore_init.c +++ b/sys/dev/atm/hfa/fore_init.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_init.c,v 1.6 1999/08/29 10:28:09 bde Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_init.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_init.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * Local functions diff --git a/sys/dev/atm/hfa/fore_intr.c b/sys/dev/atm/hfa/fore_intr.c index 8961121ff2..dbbf6af8f9 100644 --- a/sys/dev/atm/hfa/fore_intr.c +++ b/sys/dev/atm/hfa/fore_intr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_intr.c,v 1.3 1999/08/28 00:41:50 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_intr.c,v 1.3 2003/07/23 02:30:16 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_intr.c,v 1.4 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" #if defined(sun) /* diff --git a/sys/dev/atm/hfa/fore_load.c b/sys/dev/atm/hfa/fore_load.c index 421fe13b0a..9164b4f8e6 100644 --- a/sys/dev/atm/hfa/fore_load.c +++ b/sys/dev/atm/hfa/fore_load.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.13 1999/09/25 18:23:49 phk Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_load.c,v 1.4 2003/07/23 02:30:16 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_load.c,v 1.5 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * Local functions diff --git a/sys/dev/atm/hfa/fore_output.c b/sys/dev/atm/hfa/fore_output.c index 69469fcd9e..585afbfdf8 100644 --- a/sys/dev/atm/hfa/fore_output.c +++ b/sys/dev/atm/hfa/fore_output.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_output.c,v 1.5 2000/01/15 21:01:04 mks Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_output.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_output.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * Local functions diff --git a/sys/dev/atm/hfa/fore_receive.c b/sys/dev/atm/hfa/fore_receive.c index f60585cf7d..4d727dab4a 100644 --- a/sys/dev/atm/hfa/fore_receive.c +++ b/sys/dev/atm/hfa/fore_receive.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_receive.c,v 1.5.2.2 2003/01/23 21:06:43 sam Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_receive.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_receive.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * Local functions diff --git a/sys/dev/atm/hfa/fore_stats.c b/sys/dev/atm/hfa/fore_stats.c index 3f0f20feb4..699bd8a711 100644 --- a/sys/dev/atm/hfa/fore_stats.c +++ b/sys/dev/atm/hfa/fore_stats.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_stats.c,v 1.4 1999/08/28 00:41:52 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_stats.c,v 1.4 2003/08/01 17:46:16 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_stats.c,v 1.5 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * Get device statistics from CP diff --git a/sys/dev/atm/hfa/fore_timer.c b/sys/dev/atm/hfa/fore_timer.c index cc3092afe1..64541b0c77 100644 --- a/sys/dev/atm/hfa/fore_timer.c +++ b/sys/dev/atm/hfa/fore_timer.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_timer.c,v 1.3 1999/08/28 00:41:52 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_timer.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_timer.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * Process a Fore timer tick diff --git a/sys/dev/atm/hfa/fore_transmit.c b/sys/dev/atm/hfa/fore_transmit.c index 65d2aa8120..43e4328351 100644 --- a/sys/dev/atm/hfa/fore_transmit.c +++ b/sys/dev/atm/hfa/fore_transmit.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_transmit.c,v 1.4 1999/08/28 00:41:53 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_transmit.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_transmit.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * Allocate Transmit Queue Data Structures diff --git a/sys/dev/atm/hfa/fore_vcm.c b/sys/dev/atm/hfa/fore_vcm.c index f8d31e818a..c709605692 100644 --- a/sys/dev/atm/hfa/fore_vcm.c +++ b/sys/dev/atm/hfa/fore_vcm.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/dev/hfa/fore_vcm.c,v 1.4 1999/08/28 00:41:53 peter Exp $ - * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_vcm.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * @(#) $DragonFly: src/sys/dev/atm/hfa/fore_vcm.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "fore_include.h" /* * VCC Stack Instantiation diff --git a/sys/dev/crypto/hifn/hifn7751.c b/sys/dev/crypto/hifn/hifn7751.c index 9647eb1efc..2e52a6c75e 100644 --- a/sys/dev/crypto/hifn/hifn7751.c +++ b/sys/dev/crypto/hifn/hifn7751.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/hifn/hifn7751.c,v 1.5.2.5 2003/06/04 17:56:59 sam Exp $ */ -/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.3 2003/07/30 00:20:38 dillon Exp $ */ +/* $DragonFly: src/sys/dev/crypto/hifn/hifn7751.c,v 1.4 2003/08/07 21:16:49 dillon Exp $ */ /* $OpenBSD: hifn7751.c,v 1.120 2002/05/17 00:33:34 deraadt Exp $ */ /* @@ -68,14 +68,14 @@ #include #include -#include -#include +#include +#include #ifdef HIFN_RNDTEST -#include +#include "../rndtest/rndtest.h" #endif -#include -#include +#include "hifn7751reg.h" +#include "hifn7751var.h" /* * Prototypes and count for the pci_device structure diff --git a/sys/dev/crypto/rndtest/rndtest.c b/sys/dev/crypto/rndtest/rndtest.c index 1779ff1330..97c6ed29f4 100644 --- a/sys/dev/crypto/rndtest/rndtest.c +++ b/sys/dev/crypto/rndtest/rndtest.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/rndtest/rndtest.c,v 1.1.4.1 2003/06/04 17:10:30 sam Exp $ */ -/* $DragonFly: src/sys/dev/crypto/rndtest/rndtest.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ */ +/* $DragonFly: src/sys/dev/crypto/rndtest/rndtest.c,v 1.3 2003/08/07 21:16:49 dillon Exp $ */ /* $OpenBSD$ */ /* @@ -44,7 +44,7 @@ #include #include -#include +#include "rndtest.h" static void rndtest_test(struct rndtest_state *); static void rndtest_timeout(void *); diff --git a/sys/dev/crypto/ubsec/ubsec.c b/sys/dev/crypto/ubsec/ubsec.c index d5b8faf62d..b4890f9d5c 100644 --- a/sys/dev/crypto/ubsec/ubsec.c +++ b/sys/dev/crypto/ubsec/ubsec.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.12 2003/06/04 17:56:59 sam Exp $ */ -/* $DragonFly: src/sys/dev/crypto/ubsec/ubsec.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ */ +/* $DragonFly: src/sys/dev/crypto/ubsec/ubsec.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ /* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */ /* @@ -72,8 +72,8 @@ #include #include -#include -#include +#include +#include /* grr, #defines for gratuitous incompatibility in queue.h */ #define SIMPLEQ_HEAD STAILQ_HEAD @@ -89,10 +89,10 @@ #define letoh32(x) le32toh(x) #ifdef UBSEC_RNDTEST -#include +#include "../rndtest/rndtest.h" #endif -#include -#include +#include "ubsecreg.h" +#include "ubsecvar.h" /* * Prototypes and count for the pci_device structure diff --git a/sys/dev/disk/advansys/adv_eisa.c b/sys/dev/disk/advansys/adv_eisa.c index d5f557f817..4bb856b8d1 100644 --- a/sys/dev/disk/advansys/adv_eisa.c +++ b/sys/dev/disk/advansys/adv_eisa.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adv_eisa.c,v 1.9.2.1 2000/04/14 13:32:44 nyan Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adv_eisa.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adv_eisa.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -47,9 +47,9 @@ #include #include -#include +#include -#include +#include "advansys.h" #define EISA_DEVICE_ID_ADVANSYS_740 0x04507400 #define EISA_DEVICE_ID_ADVANSYS_750 0x04507500 diff --git a/sys/dev/disk/advansys/adv_isa.c b/sys/dev/disk/advansys/adv_isa.c index 1827b02a0c..5f1b69aded 100644 --- a/sys/dev/disk/advansys/adv_isa.c +++ b/sys/dev/disk/advansys/adv_isa.c @@ -45,7 +45,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adv_isa.c,v 1.14.2.5 2002/01/06 21:21:42 dwmalone Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adv_isa.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adv_isa.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -58,11 +58,11 @@ #include #include -#include +#include -#include +#include "advansys.h" -#include +#include #define ADV_ISA_MAX_DMA_ADDR (0x00FFFFFFL) #define ADV_ISA_MAX_DMA_COUNT (0x00FFFFFFL) diff --git a/sys/dev/disk/advansys/adv_pci.c b/sys/dev/disk/advansys/adv_pci.c index d154c17873..8e0eb3138f 100644 --- a/sys/dev/disk/advansys/adv_pci.c +++ b/sys/dev/disk/advansys/adv_pci.c @@ -58,7 +58,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adv_pci.c,v 1.11.2.3 2001/06/02 04:38:10 nyan Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adv_pci.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adv_pci.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -71,10 +71,10 @@ #include #include -#include -#include +#include +#include -#include +#include "advansys.h" #define PCI_BASEADR0 PCIR_MAPS /* I/O Address */ #define PCI_BASEADR1 PCIR_MAPS + 4 /* Mem I/O Address */ diff --git a/sys/dev/disk/advansys/advansys.c b/sys/dev/disk/advansys/advansys.c index 8aa9a825da..850c478749 100644 --- a/sys/dev/disk/advansys/advansys.c +++ b/sys/dev/disk/advansys/advansys.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/advansys.c,v 1.14.2.4 2002/01/06 21:21:42 dwmalone Exp $ - * $DragonFly: src/sys/dev/disk/advansys/advansys.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/advansys.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ /* * Ported from: @@ -59,21 +59,21 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include #include -#include +#include "advansys.h" static void adv_action(struct cam_sim *sim, union ccb *ccb); static void adv_execute_ccb(void *arg, bus_dma_segment_t *dm_segs, diff --git a/sys/dev/disk/advansys/advansys.h b/sys/dev/disk/advansys/advansys.h index 43139a9a36..aeeefb9887 100644 --- a/sys/dev/disk/advansys/advansys.h +++ b/sys/dev/disk/advansys/advansys.h @@ -31,13 +31,13 @@ * All rights reserved. * * $FreeBSD: src/sys/dev/advansys/advansys.h,v 1.2.2.1 2000/04/14 13:32:48 nyan Exp $ - * $DragonFly: src/sys/dev/disk/advansys/advansys.h,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/advansys.h,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #ifndef _ADVANSYS_H_ #define _ADVANSYS_H_ -#include +#include "advlib.h" struct adv_softc * adv_alloc(device_t dev, bus_space_tag_t tag, bus_space_handle_t bsh); diff --git a/sys/dev/disk/advansys/advlib.c b/sys/dev/disk/advansys/advlib.c index 9579f07e65..8f486c2c95 100644 --- a/sys/dev/disk/advansys/advlib.c +++ b/sys/dev/disk/advansys/advlib.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/advlib.c,v 1.15.2.1 2000/04/14 13:32:49 nyan Exp $ - * $DragonFly: src/sys/dev/disk/advansys/advlib.c,v 1.3 2003/07/27 01:49:49 hmp Exp $ + * $DragonFly: src/sys/dev/disk/advansys/advlib.c,v 1.4 2003/08/07 21:16:50 dillon Exp $ */ /* * Ported from: @@ -55,22 +55,22 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include -#include +#include "advansys.h" +#include "advmcode.h" struct adv_quirk_entry { struct scsi_inquiry_pattern inq_pat; diff --git a/sys/dev/disk/advansys/adw_pci.c b/sys/dev/disk/advansys/adw_pci.c index 3fc6c99de9..a8c090966d 100644 --- a/sys/dev/disk/advansys/adw_pci.c +++ b/sys/dev/disk/advansys/adw_pci.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adw_pci.c,v 1.12.2.1 2000/08/02 22:22:40 peter Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adw_pci.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adw_pci.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -48,15 +48,15 @@ #include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include -#include +#include "adwvar.h" +#include "adwlib.h" +#include "adwmcode.h" #define ADW_PCI_IOBASE PCIR_MAPS /* I/O Address */ #define ADW_PCI_MEMBASE PCIR_MAPS + 4 /* Mem I/O Address */ diff --git a/sys/dev/disk/advansys/adwcam.c b/sys/dev/disk/advansys/adwcam.c index d2647037c0..ba88d2d861 100644 --- a/sys/dev/disk/advansys/adwcam.c +++ b/sys/dev/disk/advansys/adwcam.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adwcam.c,v 1.7.2.2 2001/03/05 13:08:55 obrien Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adwcam.c,v 1.3 2003/07/27 01:49:49 hmp Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adwcam.c,v 1.4 2003/08/07 21:16:50 dillon Exp $ */ /* * Ported from: @@ -60,15 +60,15 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include -#include +#include "adwvar.h" /* Definitions for our use of the SIM private CCB area */ #define ccb_acb_ptr spriv_ptr0 diff --git a/sys/dev/disk/advansys/adwlib.c b/sys/dev/disk/advansys/adwlib.c index 8c23a45185..f097416b5f 100644 --- a/sys/dev/disk/advansys/adwlib.c +++ b/sys/dev/disk/advansys/adwlib.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adwlib.c,v 1.6.2.1 2000/04/14 13:32:50 nyan Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adwlib.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adwlib.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ /* * Ported from: @@ -54,13 +54,13 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include "adwlib.h" const struct adw_eeprom adw_asc3550_default_eeprom = { diff --git a/sys/dev/disk/advansys/adwlib.h b/sys/dev/disk/advansys/adwlib.h index a75fccd99a..287dd9cce4 100644 --- a/sys/dev/disk/advansys/adwlib.h +++ b/sys/dev/disk/advansys/adwlib.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/advansys/adwlib.h,v 1.4 2000/03/02 00:08:35 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adwlib.h,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adwlib.h,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ /* * Ported from: @@ -49,10 +49,7 @@ #define _ADWLIB_H_ #include "opt_adw.h" - -#include /* for offsetof */ - -#include +#include "adwmcode.h" #define ADW_DEF_MAX_HOST_QNG 253 #define ADW_DEF_MIN_HOST_QNG 16 diff --git a/sys/dev/disk/advansys/adwmcode.c b/sys/dev/disk/advansys/adwmcode.c index 18ffec1eac..9a70a1e59d 100644 --- a/sys/dev/disk/advansys/adwmcode.c +++ b/sys/dev/disk/advansys/adwmcode.c @@ -3,7 +3,7 @@ * Advanced Systems Inc. SCSI controllers * * $FreeBSD: src/sys/dev/advansys/adwmcode.c,v 1.3 2000/02/03 16:34:57 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adwmcode.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adwmcode.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ * * Obtained from: * advansys.c - Linux Host Driver for AdvanSys SCSI Adapters @@ -20,7 +20,7 @@ #include -#include +#include "adwmcode.h" const u_int8_t adw_asc3550_mcode[] = { diff --git a/sys/dev/disk/advansys/adwvar.h b/sys/dev/disk/advansys/adwvar.h index 1ae7ed6568..cce1d81a82 100644 --- a/sys/dev/disk/advansys/adwvar.h +++ b/sys/dev/disk/advansys/adwvar.h @@ -31,13 +31,13 @@ * All rights reserved. * * $FreeBSD: src/sys/dev/advansys/adwvar.h,v 1.3.2.1 2000/08/08 23:50:48 peter Exp $ - * $DragonFly: src/sys/dev/disk/advansys/adwvar.h,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/advansys/adwvar.h,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #ifndef _ADWVAR_H_ #define _ADWVAR_H_ -#include +#include "adwlib.h" struct adw_softc * adw_alloc(device_t dev, struct resource *regs, int regs_type, int regs_id); diff --git a/sys/dev/disk/adw_pci.c b/sys/dev/disk/adw_pci.c index b6c07ace5e..02f0d8b29f 100644 --- a/sys/dev/disk/adw_pci.c +++ b/sys/dev/disk/adw_pci.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/adw_pci.c,v 1.8 1999/08/28 00:50:41 peter Exp $ - * $DragonFly: src/sys/dev/disk/Attic/adw_pci.c,v 1.2 2003/06/17 04:28:55 dillon Exp $ + * $DragonFly: src/sys/dev/disk/Attic/adw_pci.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -39,11 +39,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include #include #include diff --git a/sys/dev/disk/aha/aha.c b/sys/dev/disk/aha/aha.c index 26cf9c5fab..d28dd2183e 100644 --- a/sys/dev/disk/aha/aha.c +++ b/sys/dev/disk/aha/aha.c @@ -56,7 +56,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aha/aha.c,v 1.34.2.1 2000/08/02 22:24:39 peter Exp $ - * $DragonFly: src/sys/dev/disk/aha/aha.c,v 1.3 2003/07/27 01:49:49 hmp Exp $ + * $DragonFly: src/sys/dev/disk/aha/aha.c,v 1.4 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -69,18 +69,18 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include #include #include -#include +#include "ahareg.h" struct aha_softc *aha_softcs[NAHATOT]; diff --git a/sys/dev/disk/aha/aha_isa.c b/sys/dev/disk/aha/aha_isa.c index cc7e13f53c..676e853438 100644 --- a/sys/dev/disk/aha/aha_isa.c +++ b/sys/dev/disk/aha/aha_isa.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aha/aha_isa.c,v 1.17.2.1 2000/08/02 22:24:40 peter Exp $ - * $DragonFly: src/sys/dev/disk/aha/aha_isa.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aha/aha_isa.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -43,11 +43,11 @@ #include #include -#include +#include -#include +#include "ahareg.h" -#include +#include static struct isa_pnp_id aha_ids[] = { {ADP0100_PNP, "Adaptec 1540/1542 ISA SCSI"}, /* ADP0100 */ diff --git a/sys/dev/disk/aha/aha_mca.c b/sys/dev/disk/aha/aha_mca.c index 3de77bd69d..c88cb14670 100644 --- a/sys/dev/disk/aha/aha_mca.c +++ b/sys/dev/disk/aha/aha_mca.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aha/aha_mca.c,v 1.2 2000/01/24 07:08:40 imp Exp $ - * $DragonFly: src/sys/dev/disk/aha/Attic/aha_mca.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aha/Attic/aha_mca.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ * * Based on aha_isa.c */ @@ -40,12 +40,11 @@ #include #include -#include +#include +#include +#include -#include -#include - -#include +#include "ahareg.h" static struct mca_ident aha_mca_devs[] = { { 0x0f1f, "Adaptec AHA-1640 SCSI Adapter" }, diff --git a/sys/dev/disk/aha/ahareg.h b/sys/dev/disk/aha/ahareg.h index 454ab4b294..e3d1695b25 100644 --- a/sys/dev/disk/aha/ahareg.h +++ b/sys/dev/disk/aha/ahareg.h @@ -31,16 +31,16 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aha/ahareg.h,v 1.8.2.1 2000/08/02 22:24:40 peter Exp $ - * $DragonFly: src/sys/dev/disk/aha/ahareg.h,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aha/ahareg.h,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #ifndef _AHAREG_H_ #define _AHAREG_H_ -#include "aha.h" +#include "use_aha.h" #include -#include +#include #define AHA_MAXTRANSFER_SIZE 0xffffff /* limited by 24bit counter */ #define AHA_NSEG 17 /* The number of dma segments diff --git a/sys/dev/disk/ahb/ahb.c b/sys/dev/disk/ahb/ahb.c index ab2b3b9139..14e2f27ea3 100644 --- a/sys/dev/disk/ahb/ahb.c +++ b/sys/dev/disk/ahb/ahb.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ahb/ahb.c,v 1.18.2.3 2001/03/05 13:08:55 obrien Exp $ - * $DragonFly: src/sys/dev/disk/ahb/ahb.c,v 1.3 2003/07/27 01:49:50 hmp Exp $ + * $DragonFly: src/sys/dev/disk/ahb/ahb.c,v 1.4 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -42,17 +42,17 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include -#include +#include -#include +#include "ahbreg.h" #define ccb_ecb_ptr spriv_ptr0 #define ccb_ahb_ptr spriv_ptr1 diff --git a/sys/dev/disk/aic/aic.c b/sys/dev/disk/aic/aic.c index f7f998a52d..3510d75b43 100644 --- a/sys/dev/disk/aic/aic.c +++ b/sys/dev/disk/aic/aic.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aic.c,v 1.8 2000/01/14 23:42:35 imp Exp $ - * $DragonFly: src/sys/dev/disk/aic/aic.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic/aic.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -39,16 +39,16 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include -#include -#include +#include "aic6360reg.h" +#include "aicvar.h" static void aic_action __P((struct cam_sim *sim, union ccb *ccb)); static void aic_execute_scb __P((void *arg, bus_dma_segment_t *dm_segs, diff --git a/sys/dev/disk/aic/aic_cbus.c b/sys/dev/disk/aic/aic_cbus.c index ad1e358f12..ad2e75e246 100644 --- a/sys/dev/disk/aic/aic_cbus.c +++ b/sys/dev/disk/aic/aic_cbus.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aic_cbus.c,v 1.1.2.2 2000/06/21 09:37:09 nyan Exp $ - * $DragonFly: src/sys/dev/disk/aic/Attic/aic_cbus.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic/Attic/aic_cbus.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -38,9 +38,9 @@ #include #include -#include -#include -#include +#include +#include "aic6360reg.h" +#include "aicvar.h" struct aic_isa_softc { struct aic_softc sc_aic; diff --git a/sys/dev/disk/aic/aic_isa.c b/sys/dev/disk/aic/aic_isa.c index afbd6f5561..7e4e4747ba 100644 --- a/sys/dev/disk/aic/aic_isa.c +++ b/sys/dev/disk/aic/aic_isa.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aic_isa.c,v 1.3 2000/01/14 23:42:35 imp Exp $ - * $DragonFly: src/sys/dev/disk/aic/aic_isa.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic/aic_isa.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -38,9 +38,9 @@ #include #include -#include -#include -#include +#include +#include "aic6360reg.h" +#include "aicvar.h" struct aic_isa_softc { struct aic_softc sc_aic; diff --git a/sys/dev/disk/aic/aic_pccard.c b/sys/dev/disk/aic/aic_pccard.c index 028d15c089..90cbedb79c 100644 --- a/sys/dev/disk/aic/aic_pccard.c +++ b/sys/dev/disk/aic/aic_pccard.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aic/aic_pccard.c,v 1.1 2000/01/14 23:42:36 imp Exp $ - * $DragonFly: src/sys/dev/disk/aic/aic_pccard.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic/aic_pccard.c,v 1.3 2003/08/07 21:16:50 dillon Exp $ */ #include @@ -38,8 +38,8 @@ #include #include -#include -#include +#include "aic6360reg.h" +#include "aicvar.h" struct aic_pccard_softc { struct aic_softc sc_aic; diff --git a/sys/dev/disk/aic7xxx/ahc_eisa.c b/sys/dev/disk/aic7xxx/ahc_eisa.c index aee624b94a..87c4a8d416 100644 --- a/sys/dev/disk/aic7xxx/ahc_eisa.c +++ b/sys/dev/disk/aic7xxx/ahc_eisa.c @@ -29,12 +29,12 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahc_eisa.c#11 $ * * $FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.15.2.11 2003/06/10 03:26:07 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/ahc_eisa.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/ahc_eisa.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ -#include +#include "aic7xxx_osm.h" -#include +#include static int aic7770_probe(device_t dev) diff --git a/sys/dev/disk/aic7xxx/ahc_pci.c b/sys/dev/disk/aic7xxx/ahc_pci.c index 7a9737f935..780b592579 100644 --- a/sys/dev/disk/aic7xxx/ahc_pci.c +++ b/sys/dev/disk/aic7xxx/ahc_pci.c @@ -31,10 +31,10 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahc_pci.c#13 $ * * $FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.29.2.14 2003/06/10 03:26:07 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/ahc_pci.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/ahc_pci.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ -#include +#include "aic7xxx_osm.h" #define AHC_PCI_IOADDR PCIR_MAPS /* I/O Address */ #define AHC_PCI_MEMADDR (PCIR_MAPS + 4) /* Mem I/O Address */ diff --git a/sys/dev/disk/aic7xxx/ahd_pci.c b/sys/dev/disk/aic7xxx/ahd_pci.c index 5a3509afeb..c516e9c317 100644 --- a/sys/dev/disk/aic7xxx/ahd_pci.c +++ b/sys/dev/disk/aic7xxx/ahd_pci.c @@ -31,10 +31,10 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahd_pci.c#13 $ * * $FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.2.2.5 2003/06/10 03:26:07 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/ahd_pci.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/ahd_pci.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ -#include +#include "aic79xx_osm.h" #define AHD_PCI_IOADDR0 PCIR_MAPS /* Primary I/O BAR */ #define AHD_PCI_MEMADDR (PCIR_MAPS + 4) /* Mem I/O Address */ diff --git a/sys/dev/disk/aic7xxx/aic7770.c b/sys/dev/disk/aic7xxx/aic7770.c index 46aa67a1fa..544c5a9965 100644 --- a/sys/dev/disk/aic7xxx/aic7770.c +++ b/sys/dev/disk/aic7xxx/aic7770.c @@ -40,7 +40,7 @@ * $Id: //depot/aic7xxx/aic7xxx/aic7770.c#32 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7770.c,v 1.1.2.9 2003/06/10 03:26:07 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic7770.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic7770.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ #ifdef __linux__ @@ -48,9 +48,9 @@ #include "aic7xxx_inline.h" #include "aic7xxx_93cx6.h" #else -#include -#include -#include +#include "aic7xxx_osm.h" +#include "aic7xxx_inline.h" +#include "aic7xxx_93cx6.h" #endif #define ID_AIC7770 0x04907770 diff --git a/sys/dev/disk/aic7xxx/aic79xx.c b/sys/dev/disk/aic7xxx/aic79xx.c index 7ce72e6426..c219d382e3 100644 --- a/sys/dev/disk/aic7xxx/aic79xx.c +++ b/sys/dev/disk/aic7xxx/aic79xx.c @@ -40,18 +40,12 @@ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#198 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.3.2.5 2003/06/10 03:26:07 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ -#ifdef __linux__ #include "aic79xx_osm.h" #include "aic79xx_inline.h" #include "aicasm/aicasm_insformat.h" -#else -#include -#include -#include -#endif /******************************** Globals *************************************/ struct ahd_softc_tailq ahd_tailq = TAILQ_HEAD_INITIALIZER(ahd_tailq); diff --git a/sys/dev/disk/aic7xxx/aic79xx_osm.c b/sys/dev/disk/aic7xxx/aic79xx_osm.c index cdb7ca0979..f444b59c6e 100644 --- a/sys/dev/disk/aic7xxx/aic79xx_osm.c +++ b/sys/dev/disk/aic7xxx/aic79xx_osm.c @@ -32,11 +32,11 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.c#27 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.c,v 1.3.2.4 2003/06/10 03:26:07 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx_osm.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx_osm.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ -#include -#include +#include "aic79xx_osm.h" +#include "aic79xx_inline.h" #include "opt_ddb.h" #ifdef DDB diff --git a/sys/dev/disk/aic7xxx/aic79xx_osm.h b/sys/dev/disk/aic7xxx/aic79xx_osm.h index 24760da326..da140e229e 100644 --- a/sys/dev/disk/aic7xxx/aic79xx_osm.h +++ b/sys/dev/disk/aic7xxx/aic79xx_osm.h @@ -33,7 +33,7 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#20 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.4.2.3 2003/06/10 03:26:07 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx_osm.h,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx_osm.h,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ #ifndef _AIC79XX_FREEBSD_H_ @@ -62,18 +62,18 @@ #include -#include -#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #ifdef CAM_NEW_TRAN_CODE #define AHD_NEW_TRAN_SETTINGS @@ -220,7 +220,7 @@ typedef struct callout ahd_timer_t; #else #define AIC_DEBUG_REGISTERS 0 #endif -#include +#include "aic79xx.h" /***************************** Timer Facilities *******************************/ timeout_t ahd_timeout; diff --git a/sys/dev/disk/aic7xxx/aic79xx_pci.c b/sys/dev/disk/aic7xxx/aic79xx_pci.c index 1a3917ea89..b2cbac5628 100644 --- a/sys/dev/disk/aic7xxx/aic79xx_pci.c +++ b/sys/dev/disk/aic7xxx/aic79xx_pci.c @@ -41,15 +41,15 @@ * $Id: //depot/aic7xxx/aic7xxx/aic79xx_pci.c#75 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic79xx_pci.c,v 1.3.2.5 2003/06/10 03:26:07 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx_pci.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic79xx_pci.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ #ifdef __linux__ #include "aic79xx_osm.h" #include "aic79xx_inline.h" #else -#include -#include +#include "aic79xx_osm.h" +#include "aic79xx_inline.h" #endif static __inline uint64_t diff --git a/sys/dev/disk/aic7xxx/aic7xxx.c b/sys/dev/disk/aic7xxx/aic7xxx.c index a9b8e66158..849204e630 100644 --- a/sys/dev/disk/aic7xxx/aic7xxx.c +++ b/sys/dev/disk/aic7xxx/aic7xxx.c @@ -40,18 +40,12 @@ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#134 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.41.2.27 2003/06/10 03:26:08 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ -#ifdef __linux__ #include "aic7xxx_osm.h" #include "aic7xxx_inline.h" #include "aicasm/aicasm_insformat.h" -#else -#include -#include -#include -#endif /****************************** Softc Data ************************************/ struct ahc_softc_tailq ahc_tailq = TAILQ_HEAD_INITIALIZER(ahc_tailq); diff --git a/sys/dev/disk/aic7xxx/aic7xxx_93cx6.c b/sys/dev/disk/aic7xxx/aic7xxx_93cx6.c index d3990a9d9a..6978e30e58 100644 --- a/sys/dev/disk/aic7xxx/aic7xxx_93cx6.c +++ b/sys/dev/disk/aic7xxx/aic7xxx_93cx6.c @@ -31,7 +31,7 @@ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_93cx6.c#17 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_93cx6.c,v 1.8.2.6 2002/08/31 07:25:53 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx_93cx6.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx_93cx6.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ /* @@ -73,9 +73,9 @@ #include "aic7xxx_inline.h" #include "aic7xxx_93cx6.h" #else -#include -#include -#include +#include "aic7xxx_osm.h" +#include "aic7xxx_inline.h" +#include "aic7xxx_93cx6.h" #endif /* diff --git a/sys/dev/disk/aic7xxx/aic7xxx_osm.c b/sys/dev/disk/aic7xxx/aic7xxx_osm.c index c917640e04..4690dbab08 100644 --- a/sys/dev/disk/aic7xxx/aic7xxx_osm.c +++ b/sys/dev/disk/aic7xxx/aic7xxx_osm.c @@ -31,11 +31,11 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.c#13 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.c,v 1.27.2.6 2003/06/10 03:26:09 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx_osm.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx_osm.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ -#include -#include +#include "aic7xxx_osm.h" +#include "aic7xxx_inline.h" #ifndef AHC_TMODE_ENABLE #define AHC_TMODE_ENABLE 0 diff --git a/sys/dev/disk/aic7xxx/aic7xxx_osm.h b/sys/dev/disk/aic7xxx/aic7xxx_osm.h index 627a3a805c..3784132288 100644 --- a/sys/dev/disk/aic7xxx/aic7xxx_osm.h +++ b/sys/dev/disk/aic7xxx/aic7xxx_osm.h @@ -32,7 +32,7 @@ * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aic7xxx_osm.h#15 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_osm.h,v 1.14.2.6 2003/06/10 03:26:09 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx_osm.h,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx_osm.h,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ #ifndef _AIC7XXX_FREEBSD_H_ @@ -52,7 +52,7 @@ #include #if __FreeBSD_version < 500000 -#include +#include #else #define NPCI 1 #endif @@ -70,18 +70,18 @@ #include #if NPCI > 0 -#include -#include +#include +#include #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #ifdef CAM_NEW_TRAN_CODE #define AHC_NEW_TRAN_SETTINGS @@ -231,7 +231,7 @@ typedef struct callout ahc_timer_t; #else #define AIC_DEBUG_REGISTERS 0 #endif -#include +#include "aic7xxx.h" /***************************** Timer Facilities *******************************/ timeout_t ahc_timeout; diff --git a/sys/dev/disk/aic7xxx/aic7xxx_pci.c b/sys/dev/disk/aic7xxx/aic7xxx_pci.c index 47ec524605..42e76b56e5 100644 --- a/sys/dev/disk/aic7xxx/aic7xxx_pci.c +++ b/sys/dev/disk/aic7xxx/aic7xxx_pci.c @@ -42,7 +42,7 @@ * $Id: //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#69 $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.2.2.17 2003/06/10 03:26:09 gibbs Exp $ - * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx_pci.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx_pci.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ #ifdef __linux__ @@ -50,9 +50,9 @@ #include "aic7xxx_inline.h" #include "aic7xxx_93cx6.h" #else -#include -#include -#include +#include "aic7xxx_osm.h" +#include "aic7xxx_inline.h" +#include "aic7xxx_93cx6.h" #endif #define AHC_PCI_IOADDR PCIR_MAPS /* I/O Address */ diff --git a/sys/dev/disk/amd/amd.c b/sys/dev/disk/amd/amd.c index 33442e04ff..5d4db57eee 100644 --- a/sys/dev/disk/amd/amd.c +++ b/sys/dev/disk/amd/amd.c @@ -31,7 +31,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ********************************************************************* * $FreeBSD: src/sys/pci/amd.c,v 1.3.2.2 2001/06/02 04:32:50 nyan Exp $ - * $DragonFly: src/sys/dev/disk/amd/amd.c,v 1.2 2003/06/17 04:28:56 dillon Exp $ + * $DragonFly: src/sys/dev/disk/amd/amd.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ /* @@ -69,18 +69,18 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include "amd.h" #define PCI_DEVICE_ID_AMD53C974 0x20201022ul #define PCI_BASE_ADDR0 0x10 diff --git a/sys/dev/disk/ata/ata-all.c b/sys/dev/disk/ata/ata-all.c index 21bb82c9fe..04b51c73d5 100644 --- a/sys/dev/disk/ata/ata-all.c +++ b/sys/dev/disk/ata/ata-all.c @@ -26,16 +26,16 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-all.c,v 1.50.2.45 2003/03/12 14:47:12 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-all.c,v 1.6 2003/07/21 05:50:27 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-all.c,v 1.7 2003/08/07 21:16:51 dillon Exp $ */ #include "opt_ata.h" -#include "ata.h" -#include "atadisk.h" -#include "atapicd.h" -#include "atapifd.h" -#include "atapist.h" -#include "atapicam.h" +#include "use_ata.h" +#include "use_atadisk.h" +#include "use_atapicd.h" +#include "use_atapifd.h" +#include "use_atapist.h" +#include "use_atapicam.h" #include #include #include @@ -56,10 +56,10 @@ #ifdef __alpha__ #include #endif -#include -#include -#include -#include +#include "ata-all.h" +#include "ata-disk.h" +#include "ata-raid.h" +#include "atapi-all.h" /* device structures */ static d_ioctl_t ataioctl; diff --git a/sys/dev/disk/ata/ata-card.c b/sys/dev/disk/ata/ata-card.c index 175e71086b..ece9f20b2b 100644 --- a/sys/dev/disk/ata/ata-card.c +++ b/sys/dev/disk/ata/ata-card.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-card.c,v 1.4.2.1 2002/03/18 08:37:33 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-card.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-card.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ #include @@ -43,7 +43,7 @@ #include #include #include -#include +#include "ata-all.h" static int ata_pccard_probe(device_t dev) diff --git a/sys/dev/disk/ata/ata-disk.c b/sys/dev/disk/ata/ata-disk.c index d8796288f7..235a8280b8 100644 --- a/sys/dev/disk/ata/ata-disk.c +++ b/sys/dev/disk/ata/ata-disk.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.60.2.24 2003/01/30 07:19:59 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-disk.c,v 1.6 2003/07/22 17:03:27 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-disk.c,v 1.7 2003/08/07 21:16:51 dillon Exp $ */ #include "opt_ata.h" @@ -49,9 +49,9 @@ #include #include #include -#include -#include -#include +#include "ata-all.h" +#include "ata-disk.h" +#include "ata-raid.h" #include #include diff --git a/sys/dev/disk/ata/ata-dma.c b/sys/dev/disk/ata/ata-dma.c index 4aa41c1c40..1aa3578c7b 100644 --- a/sys/dev/disk/ata/ata-dma.c +++ b/sys/dev/disk/ata/ata-dma.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.35.2.31 2003/05/07 16:46:11 jhb Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-dma.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-dma.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ #include @@ -39,10 +39,10 @@ #include #include #include -#include +#include #include #include -#include +#include "ata-all.h" /* prototypes */ static void cyrix_timing(struct ata_channel *, int, int); diff --git a/sys/dev/disk/ata/ata-isa.c b/sys/dev/disk/ata/ata-isa.c index 3731c662dd..45d64f1fa0 100644 --- a/sys/dev/disk/ata/ata-isa.c +++ b/sys/dev/disk/ata/ata-isa.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.4.2.1 2002/03/18 08:37:33 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-isa.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-isa.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ #include @@ -43,8 +43,8 @@ #include #include #include -#include -#include +#include +#include "ata-all.h" /* local vars */ static struct isa_pnp_id ata_ids[] = { @@ -106,7 +106,7 @@ DRIVER_MODULE(ata, isa, ata_isa_driver, ata_devclass, 0, 0); * the following is a bandaid to get ISA only setups to link, * since these are getting rare the ugliness is kept here */ -#include "pci.h" +#include "use_pci.h" #if NPCI == 0 void * ata_dmaalloc(struct ata_channel *ch, int device) diff --git a/sys/dev/disk/ata/ata-pci.c b/sys/dev/disk/ata/ata-pci.c index b598e3137e..6c58ca39d3 100644 --- a/sys/dev/disk/ata/ata-pci.c +++ b/sys/dev/disk/ata/ata-pci.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.32.2.15 2003/06/06 13:27:05 fjoe Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-pci.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-pci.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ #include @@ -47,9 +47,9 @@ #include #endif #include -#include -#include -#include +#include +#include +#include "ata-all.h" /* device structures */ struct ata_pci_controller { diff --git a/sys/dev/disk/ata/ata-raid.c b/sys/dev/disk/ata/ata-raid.c index 190e7e54ba..eee00df434 100644 --- a/sys/dev/disk/ata/ata-raid.c +++ b/sys/dev/disk/ata/ata-raid.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.3.2.19 2003/01/30 07:19:59 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/ata-raid.c,v 1.7 2003/07/22 17:03:27 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/ata-raid.c,v 1.8 2003/08/07 21:16:51 dillon Exp $ */ #include "opt_ata.h" @@ -43,9 +43,9 @@ #include #include #include -#include -#include -#include +#include "ata-all.h" +#include "ata-disk.h" +#include "ata-raid.h" #include #include diff --git a/sys/dev/disk/ata/atapi-all.c b/sys/dev/disk/ata/atapi-all.c index feb4c5f483..52c69adb07 100644 --- a/sys/dev/disk/ata/atapi-all.c +++ b/sys/dev/disk/ata/atapi-all.c @@ -26,14 +26,15 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-all.c,v 1.46.2.18 2002/10/31 23:10:33 thomas Exp $ - * $DragonFly: src/sys/dev/disk/ata/atapi-all.c,v 1.3 2003/07/19 21:14:18 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/atapi-all.c,v 1.4 2003/08/07 21:16:51 dillon Exp $ */ #include "opt_ata.h" -#include "atapicd.h" -#include "atapifd.h" -#include "atapist.h" -#include "atapicam.h" +#include "use_atapicd.h" +#include "use_atapifd.h" +#include "use_atapist.h" +#include "use_atapicam.h" + #include #include #include @@ -45,8 +46,8 @@ #include #include #include -#include -#include +#include "ata-all.h" +#include "atapi-all.h" /* prototypes */ static void atapi_read(struct atapi_request *, int); diff --git a/sys/dev/disk/ata/atapi-cam.c b/sys/dev/disk/ata/atapi-cam.c index 916b780af2..aa03c6d8e3 100644 --- a/sys/dev/disk/ata/atapi-cam.c +++ b/sys/dev/disk/ata/atapi-cam.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.10.2.3 2003/05/21 09:24:55 thomas Exp $ - * $DragonFly: src/sys/dev/disk/ata/atapi-cam.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/atapi-cam.c,v 1.3 2003/08/07 21:16:51 dillon Exp $ */ #include @@ -38,16 +38,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include "ata-all.h" +#include "atapi-all.h" /* hardware command descriptor block */ struct atapi_hcb { diff --git a/sys/dev/disk/ata/atapi-cd.c b/sys/dev/disk/ata/atapi-cd.c index ce76577d44..7fdb6da317 100644 --- a/sys/dev/disk/ata/atapi-cd.c +++ b/sys/dev/disk/ata/atapi-cd.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.48.2.20 2002/11/25 05:30:31 njl Exp $ - * $DragonFly: src/sys/dev/disk/ata/atapi-cd.c,v 1.7 2003/07/21 05:50:27 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/atapi-cd.c,v 1.8 2003/08/07 21:16:51 dillon Exp $ */ #include "opt_ata.h" @@ -47,9 +47,9 @@ #include #include #include -#include -#include -#include +#include "ata-all.h" +#include "atapi-all.h" +#include "atapi-cd.h" /* device structures */ static d_open_t acdopen; diff --git a/sys/dev/disk/ata/atapi-fd.c b/sys/dev/disk/ata/atapi-fd.c index 1bb45005f9..83792206b5 100644 --- a/sys/dev/disk/ata/atapi-fd.c +++ b/sys/dev/disk/ata/atapi-fd.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.44.2.9 2002/07/31 11:19:26 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/atapi-fd.c,v 1.6 2003/07/22 17:03:27 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/atapi-fd.c,v 1.7 2003/08/07 21:16:51 dillon Exp $ */ #include @@ -42,9 +42,9 @@ #include #include #include -#include -#include -#include +#include "ata-all.h" +#include "atapi-all.h" +#include "atapi-fd.h" /* device structures */ static d_open_t afdopen; diff --git a/sys/dev/disk/ata/atapi-tape.c b/sys/dev/disk/ata/atapi-tape.c index 01fc4d2518..3401c9baf2 100644 --- a/sys/dev/disk/ata/atapi-tape.c +++ b/sys/dev/disk/ata/atapi-tape.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.36.2.12 2002/07/31 11:19:26 sos Exp $ - * $DragonFly: src/sys/dev/disk/ata/atapi-tape.c,v 1.6 2003/07/21 05:50:27 dillon Exp $ + * $DragonFly: src/sys/dev/disk/ata/atapi-tape.c,v 1.7 2003/08/07 21:16:51 dillon Exp $ */ #include "opt_ata.h" @@ -43,9 +43,9 @@ #include #include #include -#include -#include -#include +#include "ata-all.h" +#include "atapi-all.h" +#include "atapi-tape.h" /* device structures */ static d_open_t astopen; diff --git a/sys/dev/disk/buslogic/bt.c b/sys/dev/disk/buslogic/bt.c index 53fb84e18a..2d815c504a 100644 --- a/sys/dev/disk/buslogic/bt.c +++ b/sys/dev/disk/buslogic/bt.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/buslogic/bt.c,v 1.25.2.1 2000/08/02 22:32:26 peter Exp $ - * $DragonFly: src/sys/dev/disk/buslogic/bt.c,v 1.3 2003/07/27 01:49:50 hmp Exp $ + * $DragonFly: src/sys/dev/disk/buslogic/bt.c,v 1.4 2003/08/07 21:16:52 dillon Exp $ */ /* @@ -55,7 +55,7 @@ * attempt to perform memory mapped I/O. */ #if 0 -#include "pci.h" +#include "use_pci.h" #if NPCI > 0 #include #endif @@ -65,18 +65,18 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include #include #include -#include +#include "btreg.h" /* MailBox Management functions */ static __inline void btnextinbox(struct bt_softc *bt); diff --git a/sys/dev/disk/buslogic/bt_eisa.c b/sys/dev/disk/buslogic/bt_eisa.c index 32cbc18f70..fcb120dbda 100644 --- a/sys/dev/disk/buslogic/bt_eisa.c +++ b/sys/dev/disk/buslogic/bt_eisa.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/buslogic/bt_eisa.c,v 1.12 2000/01/29 14:27:26 peter Exp $ - * $DragonFly: src/sys/dev/disk/buslogic/bt_eisa.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/disk/buslogic/bt_eisa.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ #include @@ -41,9 +41,9 @@ #include #include -#include +#include -#include +#include "btreg.h" #define EISA_DEVICE_ID_BUSLOGIC_74X_B 0x0ab34201 #define EISA_DEVICE_ID_BUSLOGIC_74X_C 0x0ab34202 diff --git a/sys/dev/disk/buslogic/bt_isa.c b/sys/dev/disk/buslogic/bt_isa.c index 679a2e8321..825dee5e95 100644 --- a/sys/dev/disk/buslogic/bt_isa.c +++ b/sys/dev/disk/buslogic/bt_isa.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/buslogic/bt_isa.c,v 1.18 1999/10/12 21:35:43 dfr Exp $ - * $DragonFly: src/sys/dev/disk/buslogic/bt_isa.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/disk/buslogic/bt_isa.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ #include @@ -41,10 +41,10 @@ #include #include -#include -#include +#include +#include "btreg.h" -#include +#include static bus_dma_filter_t btvlbouncefilter; static bus_dmamap_callback_t btmapsensebuffers; diff --git a/sys/dev/disk/buslogic/bt_mca.c b/sys/dev/disk/buslogic/bt_mca.c index 14693e10be..105fdc7e56 100644 --- a/sys/dev/disk/buslogic/bt_mca.c +++ b/sys/dev/disk/buslogic/bt_mca.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/buslogic/bt_mca.c,v 1.4 1999/10/09 04:02:02 mdodd Exp $ - * $DragonFly: src/sys/dev/disk/buslogic/Attic/bt_mca.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/disk/buslogic/Attic/bt_mca.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ /* @@ -49,14 +49,14 @@ #include #include -#include -#include +#include +#include -#include +#include -#include +#include "btreg.h" -#include +#include static struct mca_ident bt_mca_devs[] = { { 0x0708, "BusLogic 32 Bit Bus Master MCA-to-SCSI Host Adapter" }, diff --git a/sys/dev/disk/buslogic/bt_pci.c b/sys/dev/disk/buslogic/bt_pci.c index 0fbb3c96eb..d288520bbd 100644 --- a/sys/dev/disk/buslogic/bt_pci.c +++ b/sys/dev/disk/buslogic/bt_pci.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/buslogic/bt_pci.c,v 1.11 2000/01/17 12:38:00 nyan Exp $ - * $DragonFly: src/sys/dev/disk/buslogic/bt_pci.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/disk/buslogic/bt_pci.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ #include @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -44,7 +44,7 @@ #include #include -#include +#include "btreg.h" #define BT_PCI_IOADDR PCIR_MAPS #define BT_PCI_MEMADDR PCIR_MAPS + 4 diff --git a/sys/dev/disk/ccd/ccd.c b/sys/dev/disk/ccd/ccd.c index d88a9150f6..cd94999a14 100644 --- a/sys/dev/disk/ccd/ccd.c +++ b/sys/dev/disk/ccd/ccd.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ccd/ccd.c,v 1.73.2.1 2001/09/11 09:49:52 kris Exp $ */ -/* $DragonFly: src/sys/dev/disk/ccd/ccd.c,v 1.8 2003/07/21 05:50:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ccd/ccd.c,v 1.9 2003/08/07 21:16:52 dillon Exp $ */ /* $NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $ */ @@ -88,7 +88,7 @@ * Moffett Field, CA 94035 */ -#include "ccd.h" +#include "use_ccd.h" #include #include diff --git a/sys/dev/disk/ct/bshw_machdep.c b/sys/dev/disk/ct/bshw_machdep.c index 31d8cf960e..456b361339 100644 --- a/sys/dev/disk/ct/bshw_machdep.c +++ b/sys/dev/disk/ct/bshw_machdep.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ct/bshw_machdep.c,v 1.3.2.1 2001/07/26 02:32:18 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/ct/Attic/bshw_machdep.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ct/Attic/bshw_machdep.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ /* $NecBSD: bshw_machdep.c,v 1.8.12.6 2001/06/29 06:28:05 honda Exp $ */ /* $NetBSD$ */ @@ -80,12 +80,12 @@ #include #include -#include +#include #include -#include -#include -#include +#include "ctvar.h" +#include "ct_machdep.h" +#include "bshwvar.h" #include #endif /* __FreeBSD__ */ diff --git a/sys/dev/disk/ct/ct.c b/sys/dev/disk/ct/ct.c index 3c5304b64f..9465302aaf 100644 --- a/sys/dev/disk/ct/ct.c +++ b/sys/dev/disk/ct/ct.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ct/ct.c,v 1.4.2.1 2001/07/26 02:32:18 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/ct/Attic/ct.c,v 1.3 2003/07/26 14:25:20 rob Exp $ */ +/* $DragonFly: src/sys/dev/disk/ct/Attic/ct.c,v 1.4 2003/08/07 21:16:52 dillon Exp $ */ /* $NecBSD: ct.c,v 1.13.12.5 2001/06/26 07:31:53 honda Exp $ */ /* $NetBSD$ */ @@ -78,11 +78,11 @@ #include #include -#include +#include #include -#include -#include +#include "ctvar.h" +#include "ct_machdep.h" #endif /* __FreeBSD__ */ #define CT_NTARGETS 8 diff --git a/sys/dev/disk/ct/ct_isa.c b/sys/dev/disk/ct/ct_isa.c index 64d18fe4ed..44e23b7dad 100644 --- a/sys/dev/disk/ct/ct_isa.c +++ b/sys/dev/disk/ct/ct_isa.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ct/ct_isa.c,v 1.3.2.3 2003/06/01 04:26:44 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/ct/Attic/ct_isa.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ct/Attic/ct_isa.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ /* $NecBSD: ct_isa.c,v 1.6 1999/07/26 06:32:01 honda Exp $ */ /* $NetBSD$ */ @@ -58,9 +58,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -81,16 +81,16 @@ #include #include -#include +#include #include #include -#include +#include #include -#include -#include +#include "ctvar.h" +#include "bshwvar.h" #endif /* __FreeBSD__ */ #define BSHW_IOSZ 0x08 diff --git a/sys/dev/disk/fd/fd.c b/sys/dev/disk/fd/fd.c index 65f7008878..f62a2169a3 100644 --- a/sys/dev/disk/fd/fd.c +++ b/sys/dev/disk/fd/fd.c @@ -51,12 +51,12 @@ * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 * $FreeBSD: src/sys/isa/fd.c,v 1.176.2.8 2002/05/15 21:56:14 joerg Exp $ - * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.9 2003/07/26 19:25:18 rob Exp $ + * $DragonFly: src/sys/dev/disk/fd/fd.c,v 1.10 2003/08/07 21:16:52 dillon Exp $ * */ #include "opt_fdc.h" -#include "card.h" +#include "use_card.h" #include #include @@ -85,11 +85,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include "fdreg.h" +#include "fdc.h" +#include /* misuse a flag to identify format operation */ #define B_FORMAT B_XXX diff --git a/sys/dev/disk/fd/fdreg.h b/sys/dev/disk/fd/fdreg.h index ac966b6cb3..53d16ef13e 100644 --- a/sys/dev/disk/fd/fdreg.h +++ b/sys/dev/disk/fd/fdreg.h @@ -32,7 +32,7 @@ * * from: @(#)fdreg.h 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/isa/fdreg.h,v 1.13 2000/01/06 07:13:54 imp Exp $ - * $DragonFly: src/sys/dev/disk/fd/fdreg.h,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/dev/disk/fd/fdreg.h,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ /* @@ -40,7 +40,7 @@ */ /* uses NEC765 controller */ -#include +#include "nec765.h" /* registers */ #define FDOUT 2 /* Digital Output Register (W) */ diff --git a/sys/dev/disk/i386/bs/bs.c b/sys/dev/disk/i386/bs/bs.c index 536c922f68..21d83f6fa7 100644 --- a/sys/dev/disk/i386/bs/bs.c +++ b/sys/dev/disk/i386/bs/bs.c @@ -1,7 +1,7 @@ /* $NecBSD: bs.c,v 1.1 1997/07/18 09:18:59 kmatsuda Exp $ */ /* $NetBSD$ */ /* $FreeBSD: src/sys/i386/isa/bs/bs.c,v 1.8 1999/12/03 11:58:11 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bs.c,v 1.3 2003/07/26 19:07:48 rob Exp $ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bs.c,v 1.4 2003/08/07 21:16:52 dillon Exp $ */ /* * [NetBSD for NEC PC98 series] * Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff. @@ -38,17 +38,17 @@ #include #endif #ifdef __FreeBSD__ -#include +#include "bsif.h" #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include /***************************************************************** * Inline phase funcs diff --git a/sys/dev/disk/i386/bs/bsfunc.c b/sys/dev/disk/i386/bs/bsfunc.c index b06fa96586..f7e9e7f9aa 100644 --- a/sys/dev/disk/i386/bs/bsfunc.c +++ b/sys/dev/disk/i386/bs/bsfunc.c @@ -1,7 +1,7 @@ /* $NecBSD: bsfunc.c,v 1.2 1997/10/31 17:43:37 honda Exp $ */ /* $NetBSD$ */ /* $FreeBSD: src/sys/i386/isa/bs/bsfunc.c,v 1.7.2.2 2001/07/26 02:32:18 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsfunc.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsfunc.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ /* * [NetBSD for NEC PC98 series] * Copyright (c) 1994, 1995, 1996 NetBSD/pc98 porting staff. @@ -38,7 +38,7 @@ #include #endif #ifdef __FreeBSD__ -#include +#include "bsif.h" #endif #ifdef BS_STATICS diff --git a/sys/dev/disk/i386/bs/bshw.c b/sys/dev/disk/i386/bs/bshw.c index 13ad0c9fb5..8aef761f73 100644 --- a/sys/dev/disk/i386/bs/bshw.c +++ b/sys/dev/disk/i386/bs/bshw.c @@ -32,7 +32,7 @@ * Copyright (c) 1994, 1995, 1996 Naofumi HONDA. All rights reserved. * * $FreeBSD: src/sys/i386/isa/bs/bshw.c,v 1.7.2.1 2001/07/26 02:32:18 nyan Exp $ - * $DragonFly: src/sys/dev/disk/i386/bs/Attic/bshw.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/dev/disk/i386/bs/Attic/bshw.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ #ifdef __NetBSD__ @@ -43,8 +43,8 @@ #ifdef __FreeBSD__ #include "opt_pc98.h" #include -#include -#include +#include "bsif.h" +#include "bshw.lst" #include #include #endif @@ -426,8 +426,8 @@ bshw_unlock(bsc) #include #endif #ifdef __FreeBSD__ -#include -#include +#include "bshw_dma.c" +#include "bshw_pdma.c" #endif /********************************************** diff --git a/sys/dev/disk/i386/bs/bsif.c b/sys/dev/disk/i386/bs/bsif.c index 0b6797e517..3d25af056c 100644 --- a/sys/dev/disk/i386/bs/bsif.c +++ b/sys/dev/disk/i386/bs/bsif.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/bs/bsif.c,v 1.10.2.1 2000/08/24 08:06:08 kato Exp $ - * $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsif.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsif.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ #if 0 @@ -42,17 +42,17 @@ #include "opt_bs.h" #include "opt_pc98.h" #include "bs.h" -#include +#include "bsif.h" #endif /* __FreeBSD__ */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include /************************************************** * DEVICE DECLARE diff --git a/sys/dev/disk/i386/bs/bsif.h b/sys/dev/disk/i386/bs/bsif.h index 0a14691a7a..ace321b933 100644 --- a/sys/dev/disk/i386/bs/bsif.h +++ b/sys/dev/disk/i386/bs/bsif.h @@ -1,6 +1,6 @@ /* $NecBSD: bsif.h,v 1.5 1997/10/23 20:52:34 honda Exp $ */ /* $FreeBSD: src/sys/i386/isa/bs/bsif.h,v 1.12.2.2 2001/07/26 02:32:18 nyan Exp $ */ -/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsif.h,v 1.3 2003/07/26 19:07:48 rob Exp $ */ +/* $DragonFly: src/sys/dev/disk/i386/bs/Attic/bsif.h,v 1.4 2003/08/07 21:16:52 dillon Exp $ */ /* * Copyright (c) HONDA Naofumi, KATO Takenori, 1996. All rights reserved. * @@ -118,14 +118,14 @@ #include #include -#include +#include #if 0 -#include +#include #endif -#include +#include #include -#include +#include #include #endif /* __FreeBSD__ */ @@ -156,10 +156,10 @@ #include #include -#include -#include -#include -#include +#include +#include "bsvar.h" +#include "bshw.h" +#include "bsfunc.h" #endif /* __FreeBSD__ */ /*************************************************** diff --git a/sys/dev/disk/isp/isp.c b/sys/dev/disk/isp/isp.c index acf2470f95..40dc95d08b 100644 --- a/sys/dev/disk/isp/isp.c +++ b/sys/dev/disk/isp/isp.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/isp/isp.c,v 1.41.2.23 2002/10/11 17:34:28 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/isp/isp.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/isp/isp.c,v 1.3 2003/08/07 21:16:52 dillon Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -44,7 +44,7 @@ #include #endif #ifdef __FreeBSD__ -#include +#include "isp_freebsd.h" #endif #ifdef __OpenBSD__ #include diff --git a/sys/dev/disk/isp/isp_freebsd.c b/sys/dev/disk/isp/isp_freebsd.c index 5597dd6ab6..9dd8f6c40b 100644 --- a/sys/dev/disk/isp/isp_freebsd.c +++ b/sys/dev/disk/isp/isp_freebsd.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.32.2.20 2002/10/11 18:49:25 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.c,v 1.5 2003/07/21 05:50:31 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.c,v 1.6 2003/08/07 21:16:52 dillon Exp $ */ /* * Platform (FreeBSD) dependent common attachment code for Qlogic adapters. * @@ -26,13 +26,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#include +#include "isp_freebsd.h" #include #include #include /* for use by isp_prt below */ #include #include -#include +#include "isp_ioctl.h" static d_ioctl_t ispioctl; diff --git a/sys/dev/disk/isp/isp_freebsd.h b/sys/dev/disk/isp/isp_freebsd.h index 5f8755ebfd..999c4efa2c 100644 --- a/sys/dev/disk/isp/isp_freebsd.h +++ b/sys/dev/disk/isp/isp_freebsd.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/isp/isp_freebsd.h,v 1.26.2.17 2002/10/11 17:35:11 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.h,v 1.4 2003/07/19 21:14:23 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/isp/isp_freebsd.h,v 1.5 2003/08/07 21:16:53 dillon Exp $ */ /* * Qlogic ISP SCSI Host Adapter FreeBSD Wrapper Definitions * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002 by Matthew Jacob @@ -45,15 +45,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "opt_ddb.h" #include "opt_isp.h" @@ -339,9 +339,9 @@ default: \ * Includes of common header files */ -#include -#include -#include +#include "ispreg.h" +#include "ispvar.h" +#include "ispmbox.h" /* * isp_osinfo definiitions && shorthand @@ -484,5 +484,5 @@ strncat(char *d, const char *s, size_t c) * Common inline functions */ -#include +#include "isp_inline.h" #endif /* _ISP_FREEBSD_H */ diff --git a/sys/dev/disk/isp/isp_pci.c b/sys/dev/disk/isp/isp_pci.c index 924899a702..1e4ac4c614 100644 --- a/sys/dev/disk/isp/isp_pci.c +++ b/sys/dev/disk/isp/isp_pci.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.78.2.4 2002/10/11 18:50:53 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/isp/isp_pci.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/isp/isp_pci.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* * PCI specific probe and attach routines for Qlogic ISP SCSI adapters. * FreeBSD Version. @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -44,7 +44,7 @@ #include #include -#include +#include "isp_freebsd.h" static u_int16_t isp_pci_rd_reg(struct ispsoftc *, int); static void isp_pci_wr_reg(struct ispsoftc *, int, u_int16_t); diff --git a/sys/dev/disk/isp/isp_target.c b/sys/dev/disk/isp/isp_target.c index f32904668c..a7f77a75a0 100644 --- a/sys/dev/disk/isp/isp_target.c +++ b/sys/dev/disk/isp/isp_target.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/isp/isp_target.c,v 1.5.4.10 2002/07/29 04:25:59 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/isp/isp_target.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/isp/isp_target.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* * Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters. * @@ -41,7 +41,7 @@ #include #endif #ifdef __FreeBSD__ -#include +#include "isp_freebsd.h" #endif #ifdef __OpenBSD__ #include diff --git a/sys/dev/disk/isp/ispvar.h b/sys/dev/disk/isp/ispvar.h index 43866f56e3..0a0d23c5c2 100644 --- a/sys/dev/disk/isp/ispvar.h +++ b/sys/dev/disk/isp/ispvar.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.25.2.17 2002/10/11 18:51:49 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/isp/ispvar.h,v 1.2 2003/06/17 04:28:27 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/isp/ispvar.h,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* * Soft Definitions for for Qlogic ISP SCSI adapters. * @@ -40,10 +40,10 @@ #endif #endif #ifdef __FreeBSD__ -#include +#include "ispmbox.h" #ifdef ISP_TARGET_MODE -#include -#include +#include "isp_target.h" +#include "isp_tpublic.h" #endif #endif #ifdef __linux__ diff --git a/sys/dev/disk/ispfw/ispfw.c b/sys/dev/disk/ispfw/ispfw.c index 426da478e9..ebbede5a85 100644 --- a/sys/dev/disk/ispfw/ispfw.c +++ b/sys/dev/disk/ispfw/ispfw.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ispfw/ispfw.c,v 1.2.2.5 2002/10/12 00:13:09 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/ispfw/ispfw.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ispfw/ispfw.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* * ISP Firmware Helper Pseudo Device for FreeBSD * @@ -36,12 +36,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "asm_1040.h" +#include "asm_1080.h" +#include "asm_12160.h" +#include "asm_2100.h" +#include "asm_2200.h" +#include "asm_2300.h" #define ISPFW_VERSION 0 diff --git a/sys/dev/disk/mcd/mcd.c b/sys/dev/disk/mcd/mcd.c index 04a3e9e923..a506803a4c 100644 --- a/sys/dev/disk/mcd/mcd.c +++ b/sys/dev/disk/mcd/mcd.c @@ -41,11 +41,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/mcd.c,v 1.115 2000/01/29 16:17:34 peter Exp $ - * $DragonFly: src/sys/dev/disk/mcd/Attic/mcd.c,v 1.6 2003/07/23 02:30:19 dillon Exp $ + * $DragonFly: src/sys/dev/disk/mcd/Attic/mcd.c,v 1.7 2003/08/07 21:16:53 dillon Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; -#include "mcd.h" +#include "use_mcd.h" + #include #include #include @@ -58,8 +59,8 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include #include -#include -#include +#include +#include "mcdreg.h" #define MCD_TRACE(format, args...) \ { \ diff --git a/sys/dev/disk/mpt/mpt.c b/sys/dev/disk/mpt/mpt.c index 69f9388c92..2bb2e43a8f 100644 --- a/sys/dev/disk/mpt/mpt.c +++ b/sys/dev/disk/mpt/mpt.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/mpt/mpt.c,v 1.3.2.3 2002/09/24 21:37:24 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/mpt/mpt.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/mpt/mpt.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* * Generic routines for LSI '909 FC adapters. * FreeBSD Version. @@ -31,7 +31,7 @@ * Additional Copyright (c) 2002 by Matthew Jacob under same license. */ -#include +#include "mpt_freebsd.h" #define MPT_MAX_TRYS 3 #define MPT_MAX_WAIT 300000 diff --git a/sys/dev/disk/mpt/mpt.h b/sys/dev/disk/mpt/mpt.h index c7d02b30f0..ea488c6d91 100644 --- a/sys/dev/disk/mpt/mpt.h +++ b/sys/dev/disk/mpt/mpt.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/mpt/mpt.h,v 1.2.2.2 2002/09/01 23:08:06 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/mpt/mpt.h,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/mpt/mpt.h,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* * Generic defines for LSI '909 FC adapters. * FreeBSD Version. @@ -33,7 +33,7 @@ #ifndef _MPT_H_ #define _MPT_H_ -#include +#include "mpt_freebsd.h" #define MPT_OK (0) #define MPT_FAIL (0x10000) diff --git a/sys/dev/disk/mpt/mpt_debug.c b/sys/dev/disk/mpt/mpt_debug.c index 8572de577d..90f355b8c7 100644 --- a/sys/dev/disk/mpt/mpt_debug.c +++ b/sys/dev/disk/mpt/mpt_debug.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/mpt/mpt_debug.c,v 1.2.2.1 2002/08/23 06:59:05 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/mpt/mpt_debug.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/mpt/mpt_debug.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* * Debug routines for LSI '909 FC adapters. * FreeBSD Version. @@ -31,7 +31,7 @@ * Additional Copyright (c) 2002 by Matthew Jacob under same license. */ -#include +#include "mpt_freebsd.h" struct Error_Map { int Error_Code; diff --git a/sys/dev/disk/mpt/mpt_freebsd.c b/sys/dev/disk/mpt/mpt_freebsd.c index 5fd6d70f51..a89ef27ee8 100644 --- a/sys/dev/disk/mpt/mpt_freebsd.c +++ b/sys/dev/disk/mpt/mpt_freebsd.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/mpt/mpt_freebsd.c,v 1.3.2.3 2002/09/24 21:37:25 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/mpt/mpt_freebsd.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/mpt/mpt_freebsd.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* * FreeBSD/CAM specific routines for LSI '909 FC adapters. * FreeBSD Version. @@ -31,7 +31,7 @@ * Additional Copyright (c) 2002 by Matthew Jacob under same license. */ -#include +#include "mpt_freebsd.h" static void mpt_poll(struct cam_sim *); static timeout_t mpttimeout; diff --git a/sys/dev/disk/mpt/mpt_freebsd.h b/sys/dev/disk/mpt/mpt_freebsd.h index 6671829ad0..dbaff4bfc5 100644 --- a/sys/dev/disk/mpt/mpt_freebsd.h +++ b/sys/dev/disk/mpt/mpt_freebsd.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/mpt/mpt_freebsd.h,v 1.3.2.3 2002/09/24 21:37:25 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/mpt/mpt_freebsd.h,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/mpt/mpt_freebsd.h,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* * LSI MPT Host Adapter FreeBSD Wrapper Definitions (CAM version) * @@ -57,26 +57,26 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "opt_ddb.h" -#include "dev/mpt/mpilib/mpi_type.h" -#include "dev/mpt/mpilib/mpi.h" -#include "dev/mpt/mpilib/mpi_cnfg.h" -#include "dev/mpt/mpilib/mpi_fc.h" -#include "dev/mpt/mpilib/mpi_init.h" -#include "dev/mpt/mpilib/mpi_ioc.h" -#include "dev/mpt/mpilib/mpi_lan.h" -#include "dev/mpt/mpilib/mpi_targ.h" +#include "mpilib/mpi_type.h" +#include "mpilib/mpi.h" +#include "mpilib/mpi_cnfg.h" +#include "mpilib/mpi_fc.h" +#include "mpilib/mpi_init.h" +#include "mpilib/mpi_ioc.h" +#include "mpilib/mpi_lan.h" +#include "mpilib/mpi_targ.h" #define INLINE __inline @@ -305,7 +305,7 @@ typedef struct mpt_softc { } mpt_softc_t; -#include +#include "mpt.h" static INLINE void mpt_write(mpt_softc_t *, size_t, u_int32_t); diff --git a/sys/dev/disk/mpt/mpt_pci.c b/sys/dev/disk/mpt/mpt_pci.c index af0273e722..1aa78cbf70 100644 --- a/sys/dev/disk/mpt/mpt_pci.c +++ b/sys/dev/disk/mpt/mpt_pci.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/mpt/mpt_pci.c,v 1.3.2.3 2002/09/24 21:37:25 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/disk/mpt/mpt_pci.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/mpt/mpt_pci.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* * PCI specific probe and attach routines for LSI '909 FC adapters. * FreeBSD Version. @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -48,7 +48,7 @@ #include #include -#include +#include "mpt_freebsd.h" #ifndef PCI_VENDOR_LSI #define PCI_VENDOR_LSI 0x1000 diff --git a/sys/dev/disk/ncr/ncr.c b/sys/dev/disk/ncr/ncr.c index bcc8daa2b2..3a9f108933 100644 --- a/sys/dev/disk/ncr/ncr.c +++ b/sys/dev/disk/ncr/ncr.c @@ -1,7 +1,7 @@ /************************************************************************** ** ** $FreeBSD: src/sys/pci/ncr.c,v 1.155.2.3 2001/03/05 13:09:10 obrien Exp $ -** $DragonFly: src/sys/dev/disk/ncr/ncr.c,v 1.3 2003/07/26 21:56:10 rob Exp $ +** $DragonFly: src/sys/dev/disk/ncr/ncr.c,v 1.4 2003/08/07 21:16:53 dillon Exp $ ** ** Device driver for the NCR 53C8XX PCI-SCSI-Controller Family. ** @@ -191,18 +191,18 @@ #include #endif -#include -#include -#include +#include +#include +#include "ncrreg.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include /*========================================================== ** diff --git a/sys/dev/disk/ncv/ncr53c500.c b/sys/dev/disk/ncv/ncr53c500.c index 96184f6194..b49c71a31a 100644 --- a/sys/dev/disk/ncv/ncr53c500.c +++ b/sys/dev/disk/ncv/ncr53c500.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.1.2.4 2001/12/17 13:30:18 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500.c,v 1.3 2003/07/26 14:25:22 rob Exp $ */ +/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500.c,v 1.4 2003/08/07 21:16:53 dillon Exp $ */ /* $NecBSD: ncr53c500.c,v 1.30.12.3 2001/06/26 07:31:41 honda Exp $ */ /* $NetBSD$ */ @@ -81,13 +81,13 @@ #include #include -#include +#include -#include -#include -#include +#include "ncr53c500reg.h" +#include "ncr53c500hw.h" +#include "ncr53c500var.h" -#include +#include "ncr53c500hwtab.h" #endif /* __FreeBSD__ */ #define NCV_MAX_DATA_SIZE (64 * 1024) diff --git a/sys/dev/disk/ncv/ncr53c500_pccard.c b/sys/dev/disk/ncv/ncr53c500_pccard.c index ca58d2af4a..308d25f859 100644 --- a/sys/dev/disk/ncv/ncr53c500_pccard.c +++ b/sys/dev/disk/ncv/ncr53c500_pccard.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/ncv/ncr53c500_pccard.c,v 1.2.2.5 2001/12/17 13:30:18 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500_pccard.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/ncv/ncr53c500_pccard.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* $NecBSD: ncr53c500_pisa.c,v 1.28 1998/11/26 01:59:11 honda Exp $ */ /* $NetBSD$ */ @@ -57,12 +57,12 @@ #include -#include -#include +#include +#include -#include -#include -#include +#include "ncr53c500reg.h" +#include "ncr53c500hw.h" +#include "ncr53c500var.h" #define KME_KXLC004_01 0x100 #define OFFSET_KME_KXLC004_01 0x10 @@ -72,8 +72,8 @@ #if !defined(__FreeBSD__) || __FreeBSD_version < 500014 #include #endif -#include -#include +#include +#include static int ncvprobe(DEVPORT_PDEVICE devi); static int ncvattach(DEVPORT_PDEVICE devi); diff --git a/sys/dev/disk/nsp/nsp.c b/sys/dev/disk/nsp/nsp.c index dd71eb75f3..9985fa9d8f 100644 --- a/sys/dev/disk/nsp/nsp.c +++ b/sys/dev/disk/nsp/nsp.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/nsp/nsp.c,v 1.1.2.6 2001/12/17 13:30:18 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/nsp/nsp.c,v 1.3 2003/07/26 14:25:23 rob Exp $ */ +/* $DragonFly: src/sys/dev/disk/nsp/nsp.c,v 1.4 2003/08/07 21:16:53 dillon Exp $ */ /* $NecBSD: nsp.c,v 1.21.12.6 2001/06/29 06:27:52 honda Exp $ */ /* $NetBSD$ */ @@ -81,9 +81,9 @@ #include #include -#include -#include -#include +#include +#include "nspreg.h" +#include "nspvar.h" #endif /* __FreeBSD__ */ /*************************************************** diff --git a/sys/dev/disk/nsp/nsp_pccard.c b/sys/dev/disk/nsp/nsp_pccard.c index 53ca2956b2..a35f75b9fa 100644 --- a/sys/dev/disk/nsp/nsp_pccard.c +++ b/sys/dev/disk/nsp/nsp_pccard.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/nsp/nsp_pccard.c,v 1.2.2.6 2001/12/17 13:30:19 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/nsp/nsp_pccard.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/nsp/nsp_pccard.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ */ /* $NecBSD: nsp_pisa.c,v 1.4 1999/04/15 01:35:54 kmatsuda Exp $ */ /* $NetBSD$ */ @@ -54,11 +54,11 @@ #include -#include -#include +#include +#include -#include -#include +#include "nspreg.h" +#include "nspvar.h" #define NSP_HOSTID 7 @@ -67,8 +67,8 @@ #if !defined(__FreeBSD__) || __FreeBSD_version < 500014 #include #endif -#include -#include +#include +#include #define PIO_MODE 0x100 /* pd_flags */ diff --git a/sys/dev/disk/sbp/sbp.c b/sys/dev/disk/sbp/sbp.c index ea8ebef1fb..c0af45d68b 100644 --- a/sys/dev/disk/sbp/sbp.c +++ b/sys/dev/disk/sbp/sbp.c @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.5.2.19 2003/05/12 04:16:30 simokawa Exp $ - * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * $DragonFly: src/sys/dev/disk/sbp/sbp.c,v 1.3 2003/08/07 21:16:53 dillon Exp $ * */ @@ -49,23 +49,23 @@ #include /* for struct devstat */ #endif -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #define ccb_sdev_ptr spriv_ptr0 #define ccb_sbp_ptr spriv_ptr1 diff --git a/sys/dev/disk/scd/scd.c b/sys/dev/disk/scd/scd.c index eba683a93e..7fcde8c9d2 100644 --- a/sys/dev/disk/scd/scd.c +++ b/sys/dev/disk/scd/scd.c @@ -42,13 +42,13 @@ /* $FreeBSD: src/sys/i386/isa/scd.c,v 1.54 2000/01/29 16:00:30 peter Exp $ */ -/* $DragonFly: src/sys/dev/disk/scd/Attic/scd.c,v 1.6 2003/07/23 02:30:19 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/scd/Attic/scd.c,v 1.7 2003/08/07 21:16:54 dillon Exp $ */ /* Please send any comments to micke@dynas.se */ #define SCD_DEBUG 0 -#include "scd.h" +#include "use_scd.h" #include #include #include @@ -61,8 +61,8 @@ #include #include -#include -#include +#include +#include "scdreg.h" #define scd_part(dev) ((minor(dev)) & 7) diff --git a/sys/dev/disk/simos/simos.c b/sys/dev/disk/simos/simos.c index f9209e9a94..01abe81530 100644 --- a/sys/dev/disk/simos/simos.c +++ b/sys/dev/disk/simos/simos.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/simos.c,v 1.7 1999/08/28 00:51:06 peter Exp $ - * $DragonFly: src/sys/dev/disk/simos/Attic/simos.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/disk/simos/Attic/simos.c,v 1.3 2003/08/07 21:16:54 dillon Exp $ */ #include @@ -33,14 +33,14 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include @@ -48,10 +48,10 @@ #include #include -#include +#include "simos.h" -#include -#include +#include +#include #include diff --git a/sys/dev/disk/stg/tmc18c30.c b/sys/dev/disk/stg/tmc18c30.c index 76469f0d68..5c37dd47a2 100644 --- a/sys/dev/disk/stg/tmc18c30.c +++ b/sys/dev/disk/stg/tmc18c30.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.1.2.5 2001/12/17 13:30:19 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/stg/tmc18c30.c,v 1.3 2003/07/26 14:25:26 rob Exp $ */ +/* $DragonFly: src/sys/dev/disk/stg/tmc18c30.c,v 1.4 2003/08/07 21:16:54 dillon Exp $ */ /* $NecBSD: tmc18c30.c,v 1.28.12.3 2001/06/19 04:35:48 honda Exp $ */ /* $NetBSD$ */ @@ -79,9 +79,9 @@ #include #include -#include -#include -#include +#include +#include "tmc18c30reg.h" +#include "tmc18c30var.h" #endif /* __FreeBSD__ */ /*************************************************** diff --git a/sys/dev/disk/stg/tmc18c30_isa.c b/sys/dev/disk/stg/tmc18c30_isa.c index a5e5433e3a..83f8e1257b 100644 --- a/sys/dev/disk/stg/tmc18c30_isa.c +++ b/sys/dev/disk/stg/tmc18c30_isa.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/stg/tmc18c30_isa.c,v 1.2.2.4 2001/09/04 04:45:23 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_isa.c,v 1.2 2003/06/17 04:28:31 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_isa.c,v 1.3 2003/08/07 21:16:54 dillon Exp $ */ /* $NecBSD: tmc18c30_pisa.c,v 1.22 1998/11/26 01:59:21 honda Exp $ */ /* $NetBSD$ */ @@ -61,18 +61,18 @@ #include #include -#include +#include #include #include -#include -#include -#include +#include +#include +#include -#include -#include +#include "tmc18c30reg.h" +#include "tmc18c30var.h" #define STG_HOSTID 7 diff --git a/sys/dev/disk/stg/tmc18c30_pccard.c b/sys/dev/disk/stg/tmc18c30_pccard.c index 1dd114180d..dcb2d7431f 100644 --- a/sys/dev/disk/stg/tmc18c30_pccard.c +++ b/sys/dev/disk/stg/tmc18c30_pccard.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/stg/tmc18c30_pccard.c,v 1.2.2.6 2001/12/17 13:30:19 non Exp $ */ -/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_pccard.c,v 1.2 2003/06/17 04:28:31 dillon Exp $ */ +/* $DragonFly: src/sys/dev/disk/stg/tmc18c30_pccard.c,v 1.3 2003/08/07 21:16:54 dillon Exp $ */ /* $NecBSD: tmc18c30_pisa.c,v 1.22 1998/11/26 01:59:21 honda Exp $ */ /* $NetBSD$ */ @@ -59,11 +59,11 @@ #include -#include -#include +#include +#include -#include -#include +#include "tmc18c30reg.h" +#include "tmc18c30var.h" #define STG_HOSTID 7 @@ -72,8 +72,8 @@ #if !defined(__FreeBSD__) || __FreeBSD_version < 500014 #include #endif -#include -#include +#include +#include static int stgprobe(DEVPORT_PDEVICE devi); static int stgattach(DEVPORT_PDEVICE devi); diff --git a/sys/dev/disk/sym/sym_hipd.c b/sys/dev/disk/sym/sym_hipd.c index 77eb8ce56d..90523fba31 100644 --- a/sys/dev/disk/sym/sym_hipd.c +++ b/sys/dev/disk/sym/sym_hipd.c @@ -56,14 +56,14 @@ */ /* $FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.6.2.12 2001/12/02 19:01:10 groudier Exp $ */ -/* $DragonFly: src/sys/dev/disk/sym/sym_hipd.c,v 1.3 2003/07/27 01:49:51 hmp Exp $ */ +/* $DragonFly: src/sys/dev/disk/sym/sym_hipd.c,v 1.4 2003/08/07 21:16:54 dillon Exp $ */ #define SYM_DRIVER_NAME "sym-1.6.5-20000902" /* #define SYM_DEBUG_GENERIC_SUPPORT */ /* #define CAM_NEW_TRAN_CODE */ -#include +#include "use_pci.h" #include /* @@ -81,10 +81,10 @@ * Driver configuration options. */ #include "opt_sym.h" -#include +#include "sym_conf.h" #ifndef FreeBSD_Bus_Io_Abstraction -#include "ncr.h" /* To know if the ncr has been configured */ +#include "use_ncr.h" /* To know if the ncr has been configured */ #endif #include @@ -97,8 +97,8 @@ #include -#include -#include +#include +#include #ifdef FreeBSD_Bus_Space_Abstraction #include @@ -119,14 +119,14 @@ #endif #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include @@ -150,8 +150,8 @@ typedef u_int32_t u32; /* * Driver definitions. */ -#include -#include +#include "sym_defs.h" +#include "sym_fw.h" /* * IA32 architecture does not reorder STORES and prevents @@ -1952,7 +1952,7 @@ static __inline char *sym_name(hcb_p np) */ #define SYM_FWA_SCR sym_fw1a_scr #define SYM_FWB_SCR sym_fw1b_scr -#include +#include "sym_fw1.h" struct sym_fwa_ofs sym_fw1a_ofs = { SYM_GEN_FW_A(struct SYM_FWA_SCR) }; @@ -1968,7 +1968,7 @@ struct sym_fwb_ofs sym_fw1b_ofs = { */ #define SYM_FWA_SCR sym_fw2a_scr #define SYM_FWB_SCR sym_fw2b_scr -#include +#include "sym_fw2.h" struct sym_fwa_ofs sym_fw2a_ofs = { SYM_GEN_FW_A(struct SYM_FWA_SCR) }; diff --git a/sys/dev/disk/trm/trm.c b/sys/dev/disk/trm/trm.c index 0ff27ca241..8c0d8f9f9c 100644 --- a/sys/dev/disk/trm/trm.c +++ b/sys/dev/disk/trm/trm.c @@ -45,7 +45,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/trm/trm.c,v 1.2.2.2 2002/12/19 20:34:45 cognet Exp $ - * $DragonFly: src/sys/dev/disk/trm/trm.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ + * $DragonFly: src/sys/dev/disk/trm/trm.c,v 1.3 2003/08/07 21:16:54 dillon Exp $ */ /* @@ -73,23 +73,23 @@ #include #include -#include -#include +#include +#include #include #include #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include -#include +#include "trm.h" #define trm_reg_read8(reg) bus_space_read_1(pACB->tag, pACB->bsh, reg) #define trm_reg_read16(reg) bus_space_read_2(pACB->tag, pACB->bsh, reg) diff --git a/sys/dev/disk/vpo/immio.c b/sys/dev/disk/vpo/immio.c index 42d24de0e3..5cdf1af9d1 100644 --- a/sys/dev/disk/vpo/immio.c +++ b/sys/dev/disk/vpo/immio.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/immio.c,v 1.10.2.3 2001/10/02 05:27:20 nsouch Exp $ - * $DragonFly: src/sys/dev/disk/vpo/immio.c,v 1.3 2003/07/26 14:25:23 rob Exp $ + * $DragonFly: src/sys/dev/disk/vpo/immio.c,v 1.4 2003/08/07 21:16:54 dillon Exp $ * */ @@ -46,11 +46,11 @@ #include "opt_vpo.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include "vpoio.h" +#include #include "ppbus_if.h" diff --git a/sys/dev/disk/vpo/vpo.c b/sys/dev/disk/vpo/vpo.c index 412269f14c..1d1b43242c 100644 --- a/sys/dev/disk/vpo/vpo.c +++ b/sys/dev/disk/vpo/vpo.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/vpo.c,v 1.20.2.1 2000/05/07 21:08:18 n_hibma Exp $ - * $DragonFly: src/sys/dev/disk/vpo/vpo.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/disk/vpo/vpo.c,v 1.3 2003/08/07 21:16:54 dillon Exp $ */ #include @@ -36,23 +36,23 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include #include #include "opt_vpo.h" -#include -#include +#include +#include "vpoio.h" #include "ppbus_if.h" diff --git a/sys/dev/disk/vpo/vpoio.c b/sys/dev/disk/vpo/vpoio.c index 58894b016b..477b3bc17d 100644 --- a/sys/dev/disk/vpo/vpoio.c +++ b/sys/dev/disk/vpo/vpoio.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/vpoio.c,v 1.10.2.3 2001/10/02 05:27:20 nsouch Exp $ - * $DragonFly: src/sys/dev/disk/vpo/vpoio.c,v 1.3 2003/07/26 14:25:24 rob Exp $ + * $DragonFly: src/sys/dev/disk/vpo/vpoio.c,v 1.4 2003/08/07 21:16:54 dillon Exp $ * */ @@ -45,10 +45,10 @@ #include "opt_vpo.h" -#include -#include -#include -#include +#include +#include +#include +#include "vpoio.h" #include "ppbus_if.h" diff --git a/sys/dev/disk/wcd/wd_cd.c b/sys/dev/disk/wcd/wd_cd.c index 53606425bd..bd8ec9952d 100644 --- a/sys/dev/disk/wcd/wd_cd.c +++ b/sys/dev/disk/wcd/wd_cd.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/wd_cd.c,v 1.29 2000/01/29 16:00:33 peter Exp $ - * $DragonFly: src/sys/dev/disk/wcd/Attic/wd_cd.c,v 1.7 2003/07/23 02:30:19 dillon Exp $ + * $DragonFly: src/sys/dev/disk/wcd/Attic/wd_cd.c,v 1.8 2003/08/07 21:16:54 dillon Exp $ */ #include @@ -44,7 +44,7 @@ #include #include #include -#include +#include "wd_cd.h" static d_open_t acdopen; static d_close_t acdclose; diff --git a/sys/dev/disk/wd/wd.c b/sys/dev/disk/wd/wd.c index 88dde368f4..c421cd7be3 100644 --- a/sys/dev/disk/wd/wd.c +++ b/sys/dev/disk/wd/wd.c @@ -35,7 +35,7 @@ * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/isa/wd.c,v 1.219.2.2 2000/08/04 22:31:07 peter Exp $ - * $DragonFly: src/sys/dev/disk/wd/Attic/wd.c,v 1.7 2003/07/26 19:07:48 rob Exp $ + * $DragonFly: src/sys/dev/disk/wd/Attic/wd.c,v 1.8 2003/08/07 21:16:54 dillon Exp $ */ /* TODO: @@ -53,12 +53,12 @@ * driver entries for polled reinit and polled write). */ -#include "wd.h" +#include "use_wd.h" #ifdef NWDC #undef NWDC #endif -#include "wdc.h" +#include "use_wdc.h" #if NWDC > 0 @@ -80,9 +80,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include "wdreg.h" #include #include #include diff --git a/sys/dev/disk/wfd/wfd.c b/sys/dev/disk/wfd/wfd.c index 0b9f6297d5..27c51e301f 100644 --- a/sys/dev/disk/wfd/wfd.c +++ b/sys/dev/disk/wfd/wfd.c @@ -24,14 +24,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/wfd.c,v 1.35 2000/01/29 16:00:33 peter Exp $ - * $DragonFly: src/sys/dev/disk/wfd/Attic/wfd.c,v 1.7 2003/07/23 02:30:19 dillon Exp $ + * $DragonFly: src/sys/dev/disk/wfd/Attic/wfd.c,v 1.8 2003/08/07 21:16:54 dillon Exp $ */ /* * ATAPI Floppy, LS-120 driver */ -#include "wdc.h" +#include "use_wdc.h" #include #include diff --git a/sys/dev/disk/wst/wst.c b/sys/dev/disk/wst/wst.c index 2261d9369d..0bdaeb6265 100644 --- a/sys/dev/disk/wst/wst.c +++ b/sys/dev/disk/wst/wst.c @@ -26,10 +26,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/wst.c,v 1.28 2000/01/29 16:00:34 peter Exp $ - * $DragonFly: src/sys/dev/disk/wst/Attic/wst.c,v 1.5 2003/07/23 02:30:19 dillon Exp $ + * $DragonFly: src/sys/dev/disk/wst/Attic/wst.c,v 1.6 2003/08/07 21:16:55 dillon Exp $ */ -#include "wdc.h" +#include "use_wdc.h" #include "opt_ddb.h" #include diff --git a/sys/dev/disk/wt/wt.c b/sys/dev/disk/wt/wt.c index 702297b9c2..7eba066dd2 100644 --- a/sys/dev/disk/wt/wt.c +++ b/sys/dev/disk/wt/wt.c @@ -21,7 +21,7 @@ * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 * $FreeBSD: src/sys/i386/isa/wt.c,v 1.57.2.1 2000/08/08 19:49:53 peter Exp $ - * $DragonFly: src/sys/dev/disk/wt/wt.c,v 1.5 2003/07/21 07:57:45 dillon Exp $ + * $DragonFly: src/sys/dev/disk/wt/wt.c,v 1.6 2003/08/07 21:16:55 dillon Exp $ * */ @@ -58,7 +58,7 @@ * rights to redistribute these changes. */ -#include "wt.h" +#include "use_wt.h" #include #include @@ -71,8 +71,8 @@ #include -#include -#include +#include +#include "wtreg.h" /* diff --git a/sys/dev/drm/drm_os_freebsd.h b/sys/dev/drm/drm_os_freebsd.h index db8c6806f9..82278cba7a 100644 --- a/sys/dev/drm/drm_os_freebsd.h +++ b/sys/dev/drm/drm_os_freebsd.h @@ -1,6 +1,6 @@ /* * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.10.2.1 2003/04/26 07:05:28 anholt Exp $ - * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.6 2003/07/21 07:57:40 dillon Exp $ + * $DragonFly: src/sys/dev/drm/Attic/drm_os_freebsd.h,v 1.7 2003/08/07 21:16:55 dillon Exp $ */ #include #include @@ -31,7 +31,7 @@ #include #include #include -#include +#include #if __FreeBSD_version >= 500000 #include #else @@ -57,7 +57,7 @@ #define __REALLY_HAVE_SG (__HAVE_SG) #if __REALLY_HAVE_AGP -#include +#include #include #endif diff --git a/sys/dev/drm/mga/mga_dma.c b/sys/dev/drm/mga/mga_dma.c index 42ce48719e..bf263e6398 100644 --- a/sys/dev/drm/mga/mga_dma.c +++ b/sys/dev/drm/mga/mga_dma.c @@ -33,14 +33,14 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/mga_dma.c,v 1.6.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/mga/Attic/mga_dma.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/mga/Attic/mga_dma.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/mga.h" +#include "mga.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/mga_drm.h" -#include "dev/drm/mga_drv.h" +#include "mga_drm.h" +#include "mga_drv.h" #define MGA_DEFAULT_USEC_TIMEOUT 10000 #define MGA_FREELIST_DEBUG 0 diff --git a/sys/dev/drm/mga/mga_drv.c b/sys/dev/drm/mga/mga_drv.c index 465b3c5a25..cfa5d89f88 100644 --- a/sys/dev/drm/mga/mga_drv.c +++ b/sys/dev/drm/mga/mga_drv.c @@ -29,14 +29,14 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/mga_drv.c,v 1.5.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/mga/Attic/mga_drv.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/mga/Attic/mga_drv.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/mga.h" +#include "mga.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/mga_drm.h" -#include "dev/drm/mga_drv.h" +#include "mga_drm.h" +#include "mga_drv.h" /* List acquired from http://www.yourvote.com/pci/pcihdr.h and xc/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h * Please report to anholt@teleport.com inaccuracies or if a chip you have works that is marked unsupported here. diff --git a/sys/dev/drm/mga/mga_irq.c b/sys/dev/drm/mga/mga_irq.c index 86ae4039ba..2cdbe1ee0c 100644 --- a/sys/dev/drm/mga/mga_irq.c +++ b/sys/dev/drm/mga/mga_irq.c @@ -30,14 +30,14 @@ * Eric Anholt * * $FreeBSD: src/sys/dev/drm/mga_irq.c,v 1.1.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/mga/Attic/mga_irq.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/mga/Attic/mga_irq.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/mga.h" +#include "mga.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/mga_drm.h" -#include "dev/drm/mga_drv.h" +#include "mga_drm.h" +#include "mga_drv.h" void mga_dma_service( DRM_IRQ_ARGS ) { diff --git a/sys/dev/drm/mga/mga_state.c b/sys/dev/drm/mga/mga_state.c index 4836ea4c92..5ebef3d34b 100644 --- a/sys/dev/drm/mga/mga_state.c +++ b/sys/dev/drm/mga/mga_state.c @@ -32,14 +32,14 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/mga_state.c,v 1.6.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/mga/Attic/mga_state.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/mga/Attic/mga_state.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/mga.h" +#include "mga.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/mga_drm.h" -#include "dev/drm/mga_drv.h" +#include "mga_drm.h" +#include "mga_drv.h" /* ================================================================ diff --git a/sys/dev/drm/mga/mga_warp.c b/sys/dev/drm/mga/mga_warp.c index b85991b22f..c419294612 100644 --- a/sys/dev/drm/mga/mga_warp.c +++ b/sys/dev/drm/mga/mga_warp.c @@ -27,16 +27,16 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/mga_warp.c,v 1.4.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/mga/Attic/mga_warp.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/mga/Attic/mga_warp.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ #define __NO_VERSION__ -#include "dev/drm/mga.h" +#include "mga.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/mga_drm.h" -#include "dev/drm/mga_drv.h" -#include "dev/drm/mga_ucode.h" +#include "mga_drm.h" +#include "mga_drv.h" +#include "mga_ucode.h" #define MGA_WARP_CODE_ALIGN 256 /* in bytes */ diff --git a/sys/dev/drm/r128/r128_cce.c b/sys/dev/drm/r128/r128_cce.c index 45ac401bef..e20749e6eb 100644 --- a/sys/dev/drm/r128/r128_cce.c +++ b/sys/dev/drm/r128/r128_cce.c @@ -28,14 +28,14 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/r128_cce.c,v 1.6.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/r128/Attic/r128_cce.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/r128/Attic/r128_cce.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/r128.h" +#include "r128.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/r128_drm.h" -#include "dev/drm/r128_drv.h" +#include "r128_drm.h" +#include "r128_drv.h" #define R128_FIFO_DEBUG 0 diff --git a/sys/dev/drm/r128/r128_drv.c b/sys/dev/drm/r128/r128_drv.c index 0ffc75b4d0..30d22f29a3 100644 --- a/sys/dev/drm/r128/r128_drv.c +++ b/sys/dev/drm/r128/r128_drv.c @@ -29,14 +29,14 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.5.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/r128/Attic/r128_drv.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/r128/Attic/r128_drv.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/r128.h" +#include "r128.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/r128_drm.h" -#include "dev/drm/r128_drv.h" +#include "r128_drm.h" +#include "r128_drv.h" #if __REALLY_HAVE_SG #include "dev/drm/ati_pcigart.h" #endif diff --git a/sys/dev/drm/r128/r128_irq.c b/sys/dev/drm/r128/r128_irq.c index 55ded72e1b..08a8226c31 100644 --- a/sys/dev/drm/r128/r128_irq.c +++ b/sys/dev/drm/r128/r128_irq.c @@ -30,14 +30,14 @@ * Eric Anholt * * $FreeBSD: src/sys/dev/drm/r128_irq.c,v 1.1.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/r128/Attic/r128_irq.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/r128/Attic/r128_irq.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/r128.h" +#include "r128.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/r128_drm.h" -#include "dev/drm/r128_drv.h" +#include "r128_drm.h" +#include "r128_drv.h" void r128_dma_service( DRM_IRQ_ARGS ) { diff --git a/sys/dev/drm/r128/r128_state.c b/sys/dev/drm/r128/r128_state.c index 0fcc52c052..60db46011f 100644 --- a/sys/dev/drm/r128/r128_state.c +++ b/sys/dev/drm/r128/r128_state.c @@ -27,14 +27,14 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/r128_state.c,v 1.6.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/r128/Attic/r128_state.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/r128/Attic/r128_state.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/r128.h" +#include "r128.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/r128_drm.h" -#include "dev/drm/r128_drv.h" +#include "r128_drm.h" +#include "r128_drv.h" /* ================================================================ diff --git a/sys/dev/drm/radeon/radeon_cp.c b/sys/dev/drm/radeon/radeon_cp.c index 859241ccef..3ae770d3cc 100644 --- a/sys/dev/drm/radeon/radeon_cp.c +++ b/sys/dev/drm/radeon/radeon_cp.c @@ -28,14 +28,14 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/radeon_cp.c,v 1.6.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_cp.c,v 1.3 2003/07/19 21:14:20 dillon Exp $ + * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_cp.c,v 1.4 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/radeon.h" +#include "radeon.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drm.h" +#include "radeon_drv.h" #define RADEON_FIFO_DEBUG 0 diff --git a/sys/dev/drm/radeon/radeon_drv.c b/sys/dev/drm/radeon/radeon_drv.c index 36a10aa950..fdfed598da 100644 --- a/sys/dev/drm/radeon/radeon_drv.c +++ b/sys/dev/drm/radeon/radeon_drv.c @@ -27,14 +27,14 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/radeon_drv.c,v 1.6.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_drv.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_drv.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/radeon.h" +#include "radeon.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drm.h" +#include "radeon_drv.h" #if __REALLY_HAVE_SG #include "dev/drm/ati_pcigart.h" #endif diff --git a/sys/dev/drm/radeon/radeon_irq.c b/sys/dev/drm/radeon/radeon_irq.c index 7cc8bada31..435cc77bf6 100644 --- a/sys/dev/drm/radeon/radeon_irq.c +++ b/sys/dev/drm/radeon/radeon_irq.c @@ -30,14 +30,14 @@ * Michel Dänzer * * $FreeBSD: src/sys/dev/drm/radeon_irq.c,v 1.2.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_irq.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_irq.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/radeon.h" +#include "radeon.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drm.h" +#include "radeon_drv.h" /* Interrupts - Used for device synchronization and flushing in the * following circumstances: diff --git a/sys/dev/drm/radeon/radeon_mem.c b/sys/dev/drm/radeon/radeon_mem.c index 35fdc4d808..af40e9a199 100644 --- a/sys/dev/drm/radeon/radeon_mem.c +++ b/sys/dev/drm/radeon/radeon_mem.c @@ -29,14 +29,14 @@ * Keith Whitwell * * $FreeBSD: src/sys/dev/drm/radeon_mem.c,v 1.2.2.1 2003/04/26 07:05:29 anholt Exp $ - * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_mem.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_mem.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/radeon.h" +#include "radeon.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" -#include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drm.h" +#include "radeon_drv.h" /* Very simple allocator for agp memory, working on a static range * already mapped into each client's address space. diff --git a/sys/dev/drm/radeon/radeon_state.c b/sys/dev/drm/radeon/radeon_state.c index 5e54da4a58..a5372be8d8 100644 --- a/sys/dev/drm/radeon/radeon_state.c +++ b/sys/dev/drm/radeon/radeon_state.c @@ -27,15 +27,15 @@ * Kevin E. Martin * * $FreeBSD: src/sys/dev/drm/radeon_state.c,v 1.6.2.1 2003/04/26 07:05:30 anholt Exp $ - * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_state.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/radeon/Attic/radeon_state.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/radeon.h" +#include "radeon.h" #include "dev/drm/drmP.h" #include "dev/drm/drm.h" #include "dev/drm/drm_sarea.h" -#include "dev/drm/radeon_drm.h" -#include "dev/drm/radeon_drv.h" +#include "radeon_drm.h" +#include "radeon_drv.h" /* ================================================================ diff --git a/sys/dev/drm/tdfx/tdfx_drv.c b/sys/dev/drm/tdfx/tdfx_drv.c index 8efbac0ecb..f7edeaa5c6 100644 --- a/sys/dev/drm/tdfx/tdfx_drv.c +++ b/sys/dev/drm/tdfx/tdfx_drv.c @@ -30,10 +30,10 @@ * Gareth Hughes * * $FreeBSD: src/sys/dev/drm/tdfx_drv.c,v 1.4.2.1 2003/04/26 07:05:30 anholt Exp $ - * $DragonFly: src/sys/dev/drm/tdfx/Attic/tdfx_drv.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/drm/tdfx/Attic/tdfx_drv.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ -#include "dev/drm/tdfx.h" +#include "tdfx.h" #include "dev/drm/drmP.h" #define DRIVER_AUTHOR "VA Linux Systems Inc." diff --git a/sys/dev/misc/atkbd/atkbd_isa.c b/sys/dev/misc/atkbd/atkbd_isa.c index 210f7d4f0e..4a2bacfa69 100644 --- a/sys/dev/misc/atkbd/atkbd_isa.c +++ b/sys/dev/misc/atkbd/atkbd_isa.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/atkbd_isa.c,v 1.7.2.3 2001/08/01 10:42:28 yokota Exp $ - * $DragonFly: src/sys/dev/misc/atkbd/atkbd_isa.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/dev/misc/atkbd/atkbd_isa.c,v 1.3 2003/08/07 21:16:55 dillon Exp $ */ #include "opt_kbd.h" @@ -39,12 +39,12 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include typedef struct { struct resource *intr; diff --git a/sys/dev/misc/atkbdc_layer/atkbdc_isa.c b/sys/dev/misc/atkbdc_layer/atkbdc_isa.c index ddba377859..37d38ab8e6 100644 --- a/sys/dev/misc/atkbdc_layer/atkbdc_isa.c +++ b/sys/dev/misc/atkbdc_layer/atkbdc_isa.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/atkbdc_isa.c,v 1.14.2.1 2000/03/31 12:52:05 yokota Exp $ - * $DragonFly: src/sys/dev/misc/atkbdc_layer/atkbdc_isa.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/dev/misc/atkbdc_layer/atkbdc_isa.c,v 1.3 2003/08/07 21:16:56 dillon Exp $ */ #include "opt_kbd.h" @@ -39,10 +39,10 @@ #include #include -#include +#include -#include -#include +#include +#include MALLOC_DEFINE(M_ATKBDDEV, "atkbddev", "AT Keyboard device"); diff --git a/sys/dev/misc/dec/mcclock.c b/sys/dev/misc/dec/mcclock.c index a3f26f7eef..a7dc065396 100644 --- a/sys/dev/misc/dec/mcclock.c +++ b/sys/dev/misc/dec/mcclock.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/dec/mcclock.c,v 1.5.2.2 2001/12/17 14:03:15 gallatin Exp $ */ -/* $DragonFly: src/sys/dev/misc/dec/Attic/mcclock.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ */ +/* $DragonFly: src/sys/dev/misc/dec/Attic/mcclock.c,v 1.3 2003/08/07 21:16:56 dillon Exp $ */ /* $NetBSD: mcclock.c,v 1.11 1998/04/19 07:50:25 jonathan Exp $ */ /* @@ -35,8 +35,8 @@ #include #include -#include -#include +#include "mcclockvar.h" +#include "mc146818reg.h" /* * XXX rate is machine-dependent. diff --git a/sys/dev/misc/gpib/gpib.c b/sys/dev/misc/gpib/gpib.c index 8afb09af12..336a6bc7b8 100644 --- a/sys/dev/misc/gpib/gpib.c +++ b/sys/dev/misc/gpib/gpib.c @@ -17,7 +17,7 @@ * all derivative works or modified versions. * * $FreeBSD: src/sys/i386/isa/gpib.c,v 1.29 2000/01/29 16:17:32 peter Exp $ - * $DragonFly: src/sys/dev/misc/gpib/gpib.c,v 1.6 2003/07/27 01:49:51 hmp Exp $ + * $DragonFly: src/sys/dev/misc/gpib/gpib.c,v 1.7 2003/08/07 21:16:56 dillon Exp $ * */ /*Please read the README file for usage information*/ @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include "gpibreg.h" +#include "gpib.h" +#include #define GPIBPRI PCATCH #define SLEEP_MAX 1000 diff --git a/sys/dev/misc/joy/joy.c b/sys/dev/misc/joy/joy.c index e93eb04d2e..7d992846a8 100644 --- a/sys/dev/misc/joy/joy.c +++ b/sys/dev/misc/joy/joy.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/joy.c,v 1.38.2.1 2001/09/01 05:55:31 murray Exp $ - * $DragonFly: src/sys/dev/misc/joy/joy.c,v 1.4 2003/07/21 05:50:42 dillon Exp $ + * $DragonFly: src/sys/dev/misc/joy/joy.c,v 1.5 2003/08/07 21:16:56 dillon Exp $ */ #include @@ -42,7 +42,7 @@ #include #include -#include +#include #include "isa_if.h" /* The game port can manage 4 buttons and 4 variable resistors (usually 2 diff --git a/sys/dev/misc/kbd/atkbd.c b/sys/dev/misc/kbd/atkbd.c index f6eee4b1cc..0bfdc232b4 100644 --- a/sys/dev/misc/kbd/atkbd.c +++ b/sys/dev/misc/kbd/atkbd.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/kbd/atkbd.c,v 1.25.2.4 2002/04/08 19:21:38 asmodai Exp $ - * $DragonFly: src/sys/dev/misc/kbd/atkbd.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/misc/kbd/atkbd.c,v 1.3 2003/08/07 21:16:56 dillon Exp $ */ #include "opt_kbd.h" @@ -51,11 +51,11 @@ #endif /* __i386__ */ #include -#include -#include -#include +#include "kbdreg.h" +#include "atkbdreg.h" +#include "atkbdcreg.h" -#include +#include static timeout_t atkbd_timeout; @@ -251,7 +251,7 @@ static int typematic_rate(int rate); #define KBD_DFLT_KEYMAP #include "atkbdmap.h" #endif -#include +#include "kbdtables.h" /* structures for the default keyboard */ static keyboard_t default_kbd; diff --git a/sys/dev/misc/kbd/atkbdc.c b/sys/dev/misc/kbd/atkbdc.c index 6c035797c9..40c90bda06 100644 --- a/sys/dev/misc/kbd/atkbdc.c +++ b/sys/dev/misc/kbd/atkbdc.c @@ -28,12 +28,12 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/kbd/atkbdc.c,v 1.5.2.2 2002/03/31 11:02:02 murray Exp $ - * $DragonFly: src/sys/dev/misc/kbd/atkbdc.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/misc/kbd/atkbdc.c,v 1.3 2003/08/07 21:16:56 dillon Exp $ * from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp */ -#include "atkbdc.h" #include "opt_kbd.h" +#include "use_atkbdc.h" #include #include @@ -47,9 +47,9 @@ #include -#include +#include "atkbdcreg.h" -#include +#include /* constants */ diff --git a/sys/dev/misc/kbd/kbd.c b/sys/dev/misc/kbd/kbd.c index 7bb342d730..02685cfc65 100644 --- a/sys/dev/misc/kbd/kbd.c +++ b/sys/dev/misc/kbd/kbd.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/kbd/kbd.c,v 1.17.2.2 2001/07/30 16:46:43 yokota Exp $ - * $DragonFly: src/sys/dev/misc/kbd/kbd.c,v 1.5 2003/07/21 05:50:32 dillon Exp $ + * $DragonFly: src/sys/dev/misc/kbd/kbd.c,v 1.6 2003/08/07 21:16:56 dillon Exp $ */ #include "opt_kbd.h" @@ -42,7 +42,7 @@ #include -#include +#include "kbdreg.h" #define KBD_INDEX(dev) minor(dev) diff --git a/sys/dev/misc/labpc/labpc.c b/sys/dev/misc/labpc/labpc.c index 7f6ef6655b..cbad4f80e0 100644 --- a/sys/dev/misc/labpc/labpc.c +++ b/sys/dev/misc/labpc/labpc.c @@ -39,11 +39,11 @@ * dufault@hda.com * * $FreeBSD: src/sys/i386/isa/labpc.c,v 1.35 1999/09/25 18:24:08 phk Exp $ - * $DragonFly: src/sys/dev/misc/labpc/labpc.c,v 1.4 2003/07/21 07:57:44 dillon Exp $ + * $DragonFly: src/sys/dev/misc/labpc/labpc.c,v 1.5 2003/08/07 21:16:56 dillon Exp $ * */ -#include "labpc.h" +#include "use_labpc.h" #include "opt_debug_outb.h" #include @@ -60,7 +60,7 @@ #include #endif -#include +#include diff --git a/sys/dev/misc/lpbb/lpbb.c b/sys/dev/misc/lpbb/lpbb.c index 1df965accf..4dc5457ee0 100644 --- a/sys/dev/misc/lpbb/lpbb.c +++ b/sys/dev/misc/lpbb/lpbb.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/lpbb.c,v 1.11.2.1 2000/05/24 00:20:57 n_hibma Exp $ - * $DragonFly: src/sys/dev/misc/lpbb/lpbb.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/misc/lpbb/lpbb.c,v 1.3 2003/08/07 21:16:56 dillon Exp $ * */ @@ -43,12 +43,12 @@ #include -#include +#include #include "ppbus_if.h" -#include +#include -#include -#include +#include +#include #include "iicbb_if.h" diff --git a/sys/dev/misc/lpt/lpt.c b/sys/dev/misc/lpt/lpt.c index 7aab1ebe55..663d71d108 100644 --- a/sys/dev/misc/lpt/lpt.c +++ b/sys/dev/misc/lpt/lpt.c @@ -49,7 +49,7 @@ * From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp * From Id: nlpt.c,v 1.14 1999/02/08 13:55:43 des Exp * $FreeBSD: src/sys/dev/ppbus/lpt.c,v 1.15.2.3 2000/07/07 00:30:40 obrien Exp $ - * $DragonFly: src/sys/dev/misc/lpt/lpt.c,v 1.6 2003/07/26 14:25:24 rob Exp $ + * $DragonFly: src/sys/dev/misc/lpt/lpt.c,v 1.7 2003/08/07 21:16:56 dillon Exp $ */ /* @@ -79,12 +79,12 @@ #include #include -#include -#include -#include -#include +#include "lptio.h" +#include +#include +#include "lpt.h" #include "ppbus_if.h" -#include +#include MALLOC_DEFINE(M_LPT, "lpt", "LPT buffers"); diff --git a/sys/dev/misc/mse/mse.c b/sys/dev/misc/mse/mse.c index 2989dc13cb..f56684ba71 100644 --- a/sys/dev/misc/mse/mse.c +++ b/sys/dev/misc/mse/mse.c @@ -12,7 +12,7 @@ * without express or implied warranty. * * $FreeBSD: src/sys/i386/isa/mse.c,v 1.49.2.1 2000/03/20 13:58:47 yokota Exp $ - * $DragonFly: src/sys/dev/misc/mse/mse.c,v 1.5 2003/07/21 07:57:44 dillon Exp $ + * $DragonFly: src/sys/dev/misc/mse/mse.c,v 1.6 2003/08/07 21:16:57 dillon Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -61,7 +61,7 @@ #include #include -#include +#include /* driver configuration flags (config) */ #define MSE_CONFIG_ACCEL 0x00f0 /* acceleration factor */ diff --git a/sys/dev/misc/musycc/musycc.c b/sys/dev/misc/musycc/musycc.c index 8f489c0a9b..af6db8ec5a 100644 --- a/sys/dev/misc/musycc/musycc.c +++ b/sys/dev/misc/musycc/musycc.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/dev/musycc/musycc.c,v 1.17.2.3 2001/03/13 22:05:36 phk Exp $ - * $DragonFly: src/sys/dev/misc/musycc/musycc.c,v 1.3 2003/07/19 21:14:24 dillon Exp $ + * $DragonFly: src/sys/dev/misc/musycc/musycc.c,v 1.4 2003/08/07 21:16:57 dillon Exp $ * * * @@ -52,8 +52,8 @@ #include #include #include -#include -#include +#include +#include #include "pci_if.h" diff --git a/sys/dev/misc/orm/orm.c b/sys/dev/misc/orm/orm.c index 6d4dcfa73d..903b7fc7a9 100644 --- a/sys/dev/misc/orm/orm.c +++ b/sys/dev/misc/orm/orm.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/orm.c,v 1.1.2.1 2001/06/19 05:48:29 imp Exp $ - * $DragonFly: src/sys/dev/misc/orm/orm.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/dev/misc/orm/orm.c,v 1.3 2003/08/07 21:16:57 dillon Exp $ */ /* @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include #define IOMEM_START 0x0a0000 #define IOMEM_STEP 0x000800 diff --git a/sys/dev/misc/pcfclock/pcfclock.c b/sys/dev/misc/pcfclock/pcfclock.c index 5cecb637c2..5cf17c59ac 100644 --- a/sys/dev/misc/pcfclock/pcfclock.c +++ b/sys/dev/misc/pcfclock/pcfclock.c @@ -22,7 +22,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/pcfclock.c,v 1.3.2.1 2000/05/24 00:20:57 n_hibma Exp $ - * $DragonFly: src/sys/dev/misc/pcfclock/pcfclock.c,v 1.4 2003/07/21 07:57:41 dillon Exp $ + * $DragonFly: src/sys/dev/misc/pcfclock/pcfclock.c,v 1.5 2003/08/07 21:16:57 dillon Exp $ * */ @@ -42,9 +42,9 @@ #include #include /* for DELAY */ -#include -#include -#include +#include +#include +#include #include "ppbus_if.h" diff --git a/sys/dev/misc/pcic/i82365.c b/sys/dev/misc/pcic/i82365.c index 05fc0f479f..034c316fa5 100644 --- a/sys/dev/misc/pcic/i82365.c +++ b/sys/dev/misc/pcic/i82365.c @@ -1,6 +1,6 @@ /* $NetBSD: i82365.c,v 1.25 1999/10/15 06:07:27 haya Exp $ */ /* $FreeBSD: src/sys/dev/pcic/i82365.c,v 1.16.2.1 2000/05/23 03:57:02 imp Exp $ */ -/* $DragonFly: src/sys/dev/misc/pcic/Attic/i82365.c,v 1.4 2003/07/19 21:14:25 dillon Exp $ */ +/* $DragonFly: src/sys/dev/misc/pcic/Attic/i82365.c,v 1.5 2003/08/07 21:16:57 dillon Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -56,8 +56,8 @@ #include #include -#include -#include +#include "i82365reg.h" +#include "i82365var.h" #include "card_if.h" diff --git a/sys/dev/misc/pcic/i82365_isa.c b/sys/dev/misc/pcic/i82365_isa.c index b0648a12d1..e7b56b10c0 100644 --- a/sys/dev/misc/pcic/i82365_isa.c +++ b/sys/dev/misc/pcic/i82365_isa.c @@ -1,7 +1,7 @@ /* $NetBSD: i82365_isasubr.c,v 1.3 1999/10/15 06:07:27 haya Exp $ */ /* $NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $ */ /* $FreeBSD: src/sys/dev/pcic/i82365_isa.c,v 1.13.2.1 2000/05/23 03:57:02 imp Exp $ */ -/* $DragonFly: src/sys/dev/misc/pcic/Attic/i82365_isa.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ */ +/* $DragonFly: src/sys/dev/misc/pcic/Attic/i82365_isa.c,v 1.3 2003/08/07 21:16:57 dillon Exp $ */ /* * Copyright (c) 1998 Bill Sommerfeld. All rights reserved. @@ -46,13 +46,13 @@ #include #include -#include +#include -#include -#include +#include +#include -#include -#include +#include "i82365reg.h" +#include "i82365var.h" #include "power_if.h" #include "card_if.h" diff --git a/sys/dev/misc/pcic/i82365var.h b/sys/dev/misc/pcic/i82365var.h index 80821c34ea..ab4d68c3bf 100644 --- a/sys/dev/misc/pcic/i82365var.h +++ b/sys/dev/misc/pcic/i82365var.h @@ -1,6 +1,6 @@ /* $NetBSD: i82365var.h,v 1.8 1999/10/15 06:07:27 haya Exp $ */ /* $FreeBSD: src/sys/dev/pcic/i82365var.h,v 1.15.2.1 2000/05/23 03:57:02 imp Exp $ */ -/* $DragonFly: src/sys/dev/misc/pcic/Attic/i82365var.h,v 1.2 2003/06/17 04:28:29 dillon Exp $ */ +/* $DragonFly: src/sys/dev/misc/pcic/Attic/i82365var.h,v 1.3 2003/08/07 21:16:57 dillon Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -33,7 +33,7 @@ #include -#include +#include "i82365reg.h" struct proc; diff --git a/sys/dev/misc/ppc/ppc.c b/sys/dev/misc/ppc/ppc.c index 3c4fdbfb79..beac0fb2d1 100644 --- a/sys/dev/misc/ppc/ppc.c +++ b/sys/dev/misc/ppc/ppc.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/ppc.c,v 1.26.2.5 2001/10/02 05:21:45 nsouch Exp $ - * $DragonFly: src/sys/dev/misc/ppc/ppc.c,v 1.4 2003/07/26 19:25:18 rob Exp $ + * $DragonFly: src/sys/dev/misc/ppc/ppc.c,v 1.5 2003/08/07 21:16:58 dillon Exp $ * */ @@ -44,13 +44,13 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include -#include +#include "ppcreg.h" #include "ppbus_if.h" diff --git a/sys/dev/misc/ppi/ppi.c b/sys/dev/misc/ppi/ppi.c index 3a1ea64d1f..2583898265 100644 --- a/sys/dev/misc/ppi/ppi.c +++ b/sys/dev/misc/ppi/ppi.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ppbus/ppi.c,v 1.21.2.3 2000/08/07 18:24:43 peter Exp $ - * $DragonFly: src/sys/dev/misc/ppi/ppi.c,v 1.5 2003/07/21 05:50:34 dillon Exp $ + * $DragonFly: src/sys/dev/misc/ppi/ppi.c,v 1.6 2003/08/07 21:16:58 dillon Exp $ * */ #include "opt_ppb_1284.h" @@ -43,18 +43,18 @@ #include #include -#include -#include +#include +#include #ifdef PERIPH_1284 -#include +#include #endif -#include +#include "ppi.h" #include "ppbus_if.h" -#include +#include #define BUFSIZE 512 diff --git a/sys/dev/misc/pps/pps.c b/sys/dev/misc/pps/pps.c index 01d310cc82..75a98b0e4f 100644 --- a/sys/dev/misc/pps/pps.c +++ b/sys/dev/misc/pps/pps.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/dev/ppbus/pps.c,v 1.24.2.1 2000/05/24 00:20:57 n_hibma Exp $ - * $DragonFly: src/sys/dev/misc/pps/pps.c,v 1.4 2003/07/21 07:57:41 dillon Exp $ + * $DragonFly: src/sys/dev/misc/pps/pps.c,v 1.5 2003/08/07 21:16:58 dillon Exp $ * * This driver implements a draft-mogul-pps-api-02.txt PPS source. * @@ -16,6 +16,8 @@ * */ +#include "use_pps.h" + #include #include #include @@ -27,10 +29,9 @@ #include #include -#include +#include #include "ppbus_if.h" -#include -#include "pps.h" +#include #define PPS_NAME "pps" /* our official name */ diff --git a/sys/dev/misc/psm/psm.c b/sys/dev/misc/psm/psm.c index 8317e7d5f0..4b723052bb 100644 --- a/sys/dev/misc/psm/psm.c +++ b/sys/dev/misc/psm/psm.c @@ -21,7 +21,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/isa/psm.c,v 1.23.2.6 2002/03/27 16:53:35 pb Exp $ - * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.6 2003/07/26 19:25:18 rob Exp $ + * $DragonFly: src/sys/dev/misc/psm/psm.c,v 1.7 2003/08/07 21:16:58 dillon Exp $ */ /* @@ -84,8 +84,8 @@ #include #include -#include -#include +#include +#include /* * Driver specific options: the following options may be set by diff --git a/sys/dev/misc/puc/puc.c b/sys/dev/misc/puc/puc.c index 2cc55d0942..1f01ca24a7 100644 --- a/sys/dev/misc/puc/puc.c +++ b/sys/dev/misc/puc/puc.c @@ -1,7 +1,7 @@ /* * $NetBSD: puc.c,v 1.7 2000/07/29 17:43:38 jlam Exp $ * $FreeBSD: src/sys/dev/puc/puc.c,v 1.3.2.5 2003/04/04 08:42:17 sobomax Exp $ - * $DragonFly: src/sys/dev/misc/puc/puc.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/misc/puc/puc.c,v 1.3 2003/08/07 21:16:58 dillon Exp $ */ /*- @@ -93,9 +93,9 @@ #include #include -#include -#include -#include +#include +#include +#include "pucvar.h" #include diff --git a/sys/dev/misc/puc/pucdata.c b/sys/dev/misc/puc/pucdata.c index 3fdfa3c7bc..1f88f36dcd 100644 --- a/sys/dev/misc/puc/pucdata.c +++ b/sys/dev/misc/puc/pucdata.c @@ -30,7 +30,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/puc/pucdata.c,v 1.2.2.12 2003/05/14 09:43:22 wilko Exp $ - * $DragonFly: src/sys/dev/misc/puc/pucdata.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/misc/puc/pucdata.c,v 1.3 2003/08/07 21:16:58 dillon Exp $ */ /* @@ -40,10 +40,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include "pucvar.h" #define COM_FREQ DEFAULT_RCLK diff --git a/sys/dev/misc/spic/spic.c b/sys/dev/misc/spic/spic.c index 92e9a6aac8..c780001619 100644 --- a/sys/dev/misc/spic/spic.c +++ b/sys/dev/misc/spic/spic.c @@ -48,7 +48,7 @@ * also provided sample code upon which this driver was based. * * $FreeBSD: src/sys/i386/isa/spic.c,v 1.4.2.1 2002/04/15 00:52:12 will Exp $ - * $DragonFly: src/sys/dev/misc/spic/spic.c,v 1.5 2003/07/21 07:57:45 dillon Exp $ + * $DragonFly: src/sys/dev/misc/spic/spic.c,v 1.6 2003/08/07 21:16:58 dillon Exp $ */ #include @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include @@ -71,7 +71,7 @@ #include #include -#include +#include "spicreg.h" static int spic_pollrate; diff --git a/sys/dev/misc/spigot/spigot.c b/sys/dev/misc/spigot/spigot.c index 2f8c6a55ab..2bae5b459e 100644 --- a/sys/dev/misc/spigot/spigot.c +++ b/sys/dev/misc/spigot/spigot.c @@ -43,11 +43,11 @@ * Version 1.7, December 1995. * * $FreeBSD: src/sys/i386/isa/spigot.c,v 1.44 2000/01/29 16:17:36 peter Exp $ - * $DragonFly: src/sys/dev/misc/spigot/spigot.c,v 1.5 2003/07/21 07:57:45 dillon Exp $ + * $DragonFly: src/sys/dev/misc/spigot/spigot.c,v 1.6 2003/08/07 21:16:58 dillon Exp $ * */ -#include "spigot.h" +#include "use_spigot.h" #if NSPIGOT > 1 error "Can only have 1 spigot configured." @@ -67,7 +67,7 @@ error "Can only have 1 spigot configured." #include #include -#include +#include static struct spigot_softc { u_long flags; diff --git a/sys/dev/misc/streams/streams.c b/sys/dev/misc/streams/streams.c index 8dad31ef60..23bc146133 100644 --- a/sys/dev/misc/streams/streams.c +++ b/sys/dev/misc/streams/streams.c @@ -31,7 +31,7 @@ * in 3.0-980524-SNAP then hacked a bit (but probably not enough :-). * * $FreeBSD: src/sys/dev/streams/streams.c,v 1.16.2.1 2001/02/26 04:23:07 jlemon Exp $ - * $DragonFly: src/sys/dev/misc/streams/Attic/streams.c,v 1.8 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/dev/misc/streams/Attic/streams.c,v 1.9 2003/08/07 21:16:59 dillon Exp $ */ #include @@ -55,12 +55,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include static int svr4_soo_close __P((struct file *, struct thread *)); static int svr4_ptm_alloc __P((struct thread *)); diff --git a/sys/dev/misc/syscons/scgfbrndr.c b/sys/dev/misc/syscons/scgfbrndr.c index c1eff048dc..0de8ce8bf5 100644 --- a/sys/dev/misc/syscons/scgfbrndr.c +++ b/sys/dev/misc/syscons/scgfbrndr.c @@ -26,7 +26,7 @@ * Copyright (c) 2000 Andrew Miklic * * $FreeBSD: src/sys/dev/syscons/scgfbrndr.c,v 1.14.2.1 2001/11/01 08:33:15 obrien Exp $ - * $DragonFly: src/sys/dev/misc/syscons/scgfbrndr.c,v 1.2 2003/06/17 04:28:31 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/scgfbrndr.c,v 1.3 2003/08/07 21:16:59 dillon Exp $ */ #include "opt_syscons.h" @@ -41,7 +41,7 @@ #include #include -#include +#include "syscons.h" #ifndef SC_RENDER_DEBUG #define SC_RENDER_DEBUG 0 diff --git a/sys/dev/misc/syscons/schistory.c b/sys/dev/misc/syscons/schistory.c index 860df433ea..e695cc7b98 100644 --- a/sys/dev/misc/syscons/schistory.c +++ b/sys/dev/misc/syscons/schistory.c @@ -27,10 +27,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/schistory.c,v 1.8.2.1 2001/07/19 06:38:53 dd Exp $ - * $DragonFly: src/sys/dev/misc/syscons/schistory.c,v 1.3 2003/06/23 17:55:35 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/schistory.c,v 1.4 2003/08/07 21:16:59 dillon Exp $ */ -#include "sc.h" +#include "use_sc.h" #include "opt_syscons.h" #ifndef SC_NO_HISTORY @@ -45,7 +45,7 @@ #include #include -#include +#include "syscons.h" #if !defined(SC_MAX_HISTORY_SIZE) #define SC_MAX_HISTORY_SIZE (1000 * MAXCONS * NSC) diff --git a/sys/dev/misc/syscons/scmouse.c b/sys/dev/misc/syscons/scmouse.c index 81b38e9086..a506b3d7bd 100644 --- a/sys/dev/misc/syscons/scmouse.c +++ b/sys/dev/misc/syscons/scmouse.c @@ -24,12 +24,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/scmouse.c,v 1.12.2.3 2001/07/28 12:51:47 yokota Exp $ - * $DragonFly: src/sys/dev/misc/syscons/scmouse.c,v 1.3 2003/06/23 17:55:35 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/scmouse.c,v 1.4 2003/08/07 21:16:59 dillon Exp $ */ #include "opt_syscons.h" -#include #include #include #include @@ -41,7 +40,7 @@ #include #include -#include +#include "syscons.h" #ifdef SC_TWOBUTTON_MOUSE #define SC_MOUSE_PASTEBUTTON MOUSE_BUTTON3DOWN /* right button */ @@ -869,7 +868,7 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, if (mouse->u.mouse_char < 0) { mouse->u.mouse_char = scp->sc->mouse_char; } else { - if (mouse->u.mouse_char >= UCHAR_MAX - 4) + if (mouse->u.mouse_char >= (unsigned char)-1 - 4) return EINVAL; s = spltty(); sc_remove_all_mouse(scp->sc); diff --git a/sys/dev/misc/syscons/scterm-dumb.c b/sys/dev/misc/syscons/scterm-dumb.c index d6038a0799..8e316a1ff2 100644 --- a/sys/dev/misc/syscons/scterm-dumb.c +++ b/sys/dev/misc/syscons/scterm-dumb.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/scterm-dumb.c,v 1.2 2000/01/29 15:08:45 peter Exp $ - * $DragonFly: src/sys/dev/misc/syscons/scterm-dumb.c,v 1.3 2003/06/23 17:55:35 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/scterm-dumb.c,v 1.4 2003/08/07 21:16:59 dillon Exp $ */ #include "opt_syscons.h" @@ -36,8 +36,8 @@ #include -#include -#include +#include "syscons.h" +#include "sctermvar.h" #ifdef SC_DUMB_TERMINAL diff --git a/sys/dev/misc/syscons/scterm-sc.c b/sys/dev/misc/syscons/scterm-sc.c index 5d6553f2e6..66f46b69fb 100644 --- a/sys/dev/misc/syscons/scterm-sc.c +++ b/sys/dev/misc/syscons/scterm-sc.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/scterm-sc.c,v 1.4.2.10 2001/06/11 09:05:39 phk Exp $ - * $DragonFly: src/sys/dev/misc/syscons/scterm-sc.c,v 1.3 2003/06/23 17:55:35 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/scterm-sc.c,v 1.4 2003/08/07 21:16:59 dillon Exp $ */ #include "opt_syscons.h" @@ -37,8 +37,8 @@ #include -#include -#include +#include "syscons.h" +#include "sctermvar.h" #ifndef SC_DUMB_TERMINAL diff --git a/sys/dev/misc/syscons/scterm.c b/sys/dev/misc/syscons/scterm.c index bfe005add4..d89d70c8ca 100644 --- a/sys/dev/misc/syscons/scterm.c +++ b/sys/dev/misc/syscons/scterm.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/scterm.c,v 1.2 2000/01/29 15:08:46 peter Exp $ - * $DragonFly: src/sys/dev/misc/syscons/scterm.c,v 1.2 2003/06/17 04:28:31 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/scterm.c,v 1.3 2003/08/07 21:16:59 dillon Exp $ */ #include "opt_syscons.h" @@ -34,8 +34,8 @@ #include #include -#include -#include +#include "syscons.h" +#include "sctermvar.h" /* exported subroutines */ diff --git a/sys/dev/misc/syscons/scvesactl.c b/sys/dev/misc/syscons/scvesactl.c index 69a0e84488..09b2bc0f2a 100644 --- a/sys/dev/misc/syscons/scvesactl.c +++ b/sys/dev/misc/syscons/scvesactl.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/scvesactl.c,v 1.15 2000/01/29 15:08:47 peter Exp $ - * $DragonFly: src/sys/dev/misc/syscons/Attic/scvesactl.c,v 1.3 2003/06/23 17:55:35 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/Attic/scvesactl.c,v 1.4 2003/08/07 21:16:59 dillon Exp $ */ #include "opt_vga.h" @@ -41,7 +41,7 @@ #include #include -#include +#include "syscons.h" static d_ioctl_t *prev_user_ioctl; diff --git a/sys/dev/misc/syscons/scvgarndr.c b/sys/dev/misc/syscons/scvgarndr.c index 20b518ae7b..69cb15952f 100644 --- a/sys/dev/misc/syscons/scvgarndr.c +++ b/sys/dev/misc/syscons/scvgarndr.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/scvgarndr.c,v 1.5.2.3 2001/07/28 12:51:47 yokota Exp $ - * $DragonFly: src/sys/dev/misc/syscons/scvgarndr.c,v 1.2 2003/06/17 04:28:31 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/scvgarndr.c,v 1.3 2003/08/07 21:16:59 dillon Exp $ */ #include "opt_syscons.h" @@ -36,11 +36,11 @@ #include -#include -#include -#include +#include +#include +#include "syscons.h" -#include +#include #ifndef SC_RENDER_DEBUG #define SC_RENDER_DEBUG 0 diff --git a/sys/dev/misc/syscons/scvidctl.c b/sys/dev/misc/syscons/scvidctl.c index 0b840748dc..acb11e9d2c 100644 --- a/sys/dev/misc/syscons/scvidctl.c +++ b/sys/dev/misc/syscons/scvidctl.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/scvidctl.c,v 1.19.2.2 2000/05/05 09:16:08 nyan Exp $ - * $DragonFly: src/sys/dev/misc/syscons/scvidctl.c,v 1.3 2003/06/23 17:55:35 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/scvidctl.c,v 1.4 2003/08/07 21:16:59 dillon Exp $ */ #include "opt_syscons.h" @@ -38,8 +38,8 @@ #include -#include -#include +#include +#include "syscons.h" /* for compatibility with previous versions */ /* 3.0-RELEASE used the following structure */ diff --git a/sys/dev/misc/syscons/scvtb.c b/sys/dev/misc/syscons/scvtb.c index 36275c3af2..62d9780415 100644 --- a/sys/dev/misc/syscons/scvtb.c +++ b/sys/dev/misc/syscons/scvtb.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/scvtb.c,v 1.5.2.1 2001/07/16 05:21:23 yokota Exp $ - * $DragonFly: src/sys/dev/misc/syscons/scvtb.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/scvtb.c,v 1.3 2003/08/07 21:16:59 dillon Exp $ */ #include "opt_syscons.h" @@ -36,8 +36,8 @@ #include #include -#include -#include +#include +#include "syscons.h" #define vtb_wrap(vtb, at, offset) \ (((at) + (offset) + (vtb)->vtb_size)%(vtb)->vtb_size) diff --git a/sys/dev/misc/syscons/syscons.c b/sys/dev/misc/syscons/syscons.c index 0bff6f192d..47d784d2eb 100644 --- a/sys/dev/misc/syscons/syscons.c +++ b/sys/dev/misc/syscons/syscons.c @@ -26,14 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.336.2.15 2002/10/24 00:35:31 kbyanc Exp $ - * $DragonFly: src/sys/dev/misc/syscons/syscons.c,v 1.6 2003/07/21 05:50:36 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/syscons.c,v 1.7 2003/08/07 21:16:59 dillon Exp $ */ -#include "splash.h" +#include "use_splash.h" #include "opt_syscons.h" #include "opt_ddb.h" #ifdef __i386__ -#include "apm.h" +#include "use_apm.h" #endif #include @@ -59,10 +59,10 @@ #include #endif -#include -#include -#include -#include +#include +#include +#include +#include "syscons.h" #define COLD 0 #define WARM 1 diff --git a/sys/dev/misc/syscons/sysmouse.c b/sys/dev/misc/syscons/sysmouse.c index 71d43064f9..5159f787a8 100644 --- a/sys/dev/misc/syscons/sysmouse.c +++ b/sys/dev/misc/syscons/sysmouse.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/syscons/sysmouse.c,v 1.2.2.2 2001/07/16 05:21:24 yokota Exp $ - * $DragonFly: src/sys/dev/misc/syscons/sysmouse.c,v 1.5 2003/07/21 05:50:36 dillon Exp $ + * $DragonFly: src/sys/dev/misc/syscons/sysmouse.c,v 1.6 2003/08/07 21:16:59 dillon Exp $ */ #include "opt_syscons.h" @@ -39,7 +39,7 @@ #include #include -#include +#include "syscons.h" #ifndef SC_NO_SYSMOUSE diff --git a/sys/dev/misc/tw/tw.c b/sys/dev/misc/tw/tw.c index f4ca0dfa7e..45fd1858fa 100644 --- a/sys/dev/misc/tw/tw.c +++ b/sys/dev/misc/tw/tw.c @@ -29,11 +29,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/tw.c,v 1.38 2000/01/29 16:00:32 peter Exp $ - * $DragonFly: src/sys/dev/misc/tw/tw.c,v 1.7 2003/07/30 00:20:41 dillon Exp $ + * $DragonFly: src/sys/dev/misc/tw/tw.c,v 1.8 2003/08/07 21:16:59 dillon Exp $ * */ -#include "tw.h" +#include "use_tw.h" /* * Driver configuration parameters @@ -154,7 +154,7 @@ #include #endif /* HIRESTIME */ -#include +#include /* * Transmission is done by calling write() to send three byte packets of data. diff --git a/sys/dev/misc/xrpu/xrpu.c b/sys/dev/misc/xrpu/xrpu.c index 0e7a82e0c5..518a85e6ab 100644 --- a/sys/dev/misc/xrpu/xrpu.c +++ b/sys/dev/misc/xrpu/xrpu.c @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/pci/xrpu.c,v 1.19.2.1 2000/08/02 22:19:57 peter Exp $ - * $DragonFly: src/sys/dev/misc/xrpu/Attic/xrpu.c,v 1.4 2003/07/21 07:57:52 dillon Exp $ + * $DragonFly: src/sys/dev/misc/xrpu/Attic/xrpu.c,v 1.5 2003/08/07 21:16:59 dillon Exp $ * * A very simple device driver for PCI cards based on Xilinx 6200 series * FPGA/RPU devices. Current Functionality is to allow you to open and @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include "pci_if.h" /* diff --git a/sys/dev/netif/an/if_an.c b/sys/dev/netif/an/if_an.c index 65fd9e7218..2549031edf 100644 --- a/sys/dev/netif/an/if_an.c +++ b/sys/dev/netif/an/if_an.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.5 2003/07/19 21:14:17 dillon Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an.c,v 1.6 2003/08/07 21:16:59 dillon Exp $ * * $FreeBSD: src/sys/dev/an/if_an.c,v 1.2.2.13 2003/02/11 03:32:48 ambrisko Exp $ */ @@ -132,8 +132,8 @@ #include -#include -#include +#include "if_aironet_ieee.h" +#include "if_anreg.h" /* These are global because we need them in sys/pci/if_an_p.c. */ static void an_reset __P((struct an_softc *)); diff --git a/sys/dev/netif/an/if_an_isa.c b/sys/dev/netif/an/if_an_isa.c index 9091dfe861..0736881afa 100644 --- a/sys/dev/netif/an/if_an_isa.c +++ b/sys/dev/netif/an/if_an_isa.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.1.2.5 2003/02/01 03:25:12 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an_isa.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an_isa.c,v 1.3 2003/08/07 21:16:59 dillon Exp $ * * $FreeBSD: src/sys/dev/an/if_an_isa.c,v 1.1.2.5 2003/02/01 03:25:12 ambrisko Exp $ */ @@ -68,11 +68,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "if_aironet_ieee.h" +#include "if_anreg.h" static struct isa_pnp_id an_ids[] = { { 0x0100ec06, "Aironet ISA4500/ISA4800" }, diff --git a/sys/dev/netif/an/if_an_pccard.c b/sys/dev/netif/an/if_an_pccard.c index 3b54336846..18f8687033 100644 --- a/sys/dev/netif/an/if_an_pccard.c +++ b/sys/dev/netif/an/if_an_pccard.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.1.2.6 2003/02/01 03:25:12 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an_pccard.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an_pccard.c,v 1.3 2003/08/07 21:16:59 dillon Exp $ * * $FreeBSD: src/sys/dev/an/if_an_pccard.c,v 1.1.2.6 2003/02/01 03:25:12 ambrisko Exp $ */ @@ -67,8 +67,8 @@ #include #include -#include -#include +#include "if_aironet_ieee.h" +#include "if_anreg.h" /* * Support for PCMCIA cards. diff --git a/sys/dev/netif/an/if_an_pci.c b/sys/dev/netif/an/if_an_pci.c index ebd3ec183b..faa29530a4 100644 --- a/sys/dev/netif/an/if_an_pci.c +++ b/sys/dev/netif/an/if_an_pci.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.2.2.8 2003/02/11 03:32:48 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/an/if_an_pci.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/netif/an/if_an_pci.c,v 1.3 2003/08/07 21:16:59 dillon Exp $ * * $FreeBSD: src/sys/dev/an/if_an_pci.c,v 1.2.2.8 2003/02/11 03:32:48 ambrisko Exp $ */ @@ -81,11 +81,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "if_aironet_ieee.h" +#include "if_anreg.h" struct an_type { u_int16_t an_vid; diff --git a/sys/dev/netif/ar/if_ar.c b/sys/dev/netif/ar/if_ar.c index 9fe85e8521..7141c96d61 100644 --- a/sys/dev/netif/ar/if_ar.c +++ b/sys/dev/netif/ar/if_ar.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ar/if_ar.c,v 1.52.2.1 2002/06/17 15:10:57 jhay Exp $ - * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ar/if_ar.c,v 1.3 2003/08/07 21:16:59 dillon Exp $ */ /* @@ -68,7 +68,7 @@ #include #include #include -#include +#include "if_ar.h" #else /* NETGRAPH */ #include #include @@ -77,8 +77,8 @@ #include #include -#include -#include +#include "../ic_layer/hd64570.h" +#include "if_arregs.h" #ifdef TRACE #define TRC(x) x diff --git a/sys/dev/netif/ar/if_ar_isa.c b/sys/dev/netif/ar/if_ar_isa.c index 6aae7de041..8ca609a748 100644 --- a/sys/dev/netif/ar/if_ar_isa.c +++ b/sys/dev/netif/ar/if_ar_isa.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ar/if_ar_isa.c,v 1.49.2.1 2002/06/17 15:10:57 jhay Exp $ - * $DragonFly: src/sys/dev/netif/ar/if_ar_isa.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ar/if_ar_isa.c,v 1.3 2003/08/07 21:16:59 dillon Exp $ */ /* @@ -57,11 +57,11 @@ #include #include -#include +#include #include "isa_if.h" -#include -#include +#include "../ic_layer/hd64570.h" +#include "if_arregs.h" #ifdef TRACE #define TRC(x) x diff --git a/sys/dev/netif/ar/if_ar_pci.c b/sys/dev/netif/ar/if_ar_pci.c index 63a286a8b9..e5692306a6 100644 --- a/sys/dev/netif/ar/if_ar_pci.c +++ b/sys/dev/netif/ar/if_ar_pci.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ar/if_ar_pci.c,v 1.6.2.1 2002/06/17 15:10:57 jhay Exp $ - * $DragonFly: src/sys/dev/netif/ar/if_ar_pci.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ar/if_ar_pci.c,v 1.3 2003/08/07 21:16:59 dillon Exp $ */ #include @@ -41,11 +41,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "../ic_layer/hd64570.h" +#include "if_arregs.h" #ifdef TRACE #define TRC(x) x diff --git a/sys/dev/netif/aue/if_aue.c b/sys/dev/netif/aue/if_aue.c index e446b78979..4e27485eec 100644 --- a/sys/dev/netif/aue/if_aue.c +++ b/sys/dev/netif/aue/if_aue.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.19.2.18 2003/06/14 15:56:48 trhodes Exp $ - * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.3 2003/07/26 14:25:26 rob Exp $ + * $DragonFly: src/sys/dev/netif/aue/if_aue.c,v 1.4 2003/08/07 21:16:59 dillon Exp $ * * $FreeBSD: src/sys/dev/usb/if_aue.c,v 1.19.2.18 2003/06/14 15:56:48 trhodes Exp $ */ @@ -83,17 +83,17 @@ #include /* for DELAY */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include +#include "if_auereg.h" /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" diff --git a/sys/dev/netif/awi/am79c930.c b/sys/dev/netif/awi/am79c930.c index de81e9ff85..57a5ce5eab 100644 --- a/sys/dev/netif/awi/am79c930.c +++ b/sys/dev/netif/awi/am79c930.c @@ -1,6 +1,6 @@ /* $NetBSD: am79c930.c,v 1.5 2000/03/23 13:57:58 onoe Exp $ */ /* $FreeBSD: src/sys/dev/awi/am79c930.c,v 1.2.2.1 2000/12/07 04:09:39 imp Exp $ */ -/* $DragonFly: src/sys/dev/netif/awi/Attic/am79c930.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/awi/Attic/am79c930.c,v 1.3 2003/08/07 21:17:00 dillon Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -83,8 +83,8 @@ #include #endif #ifdef __FreeBSD__ -#include -#include +#include "am79c930reg.h" +#include "am79c930var.h" #endif #define AM930_DELAY(x) /*nothing*/ diff --git a/sys/dev/netif/awi/awi.c b/sys/dev/netif/awi/awi.c index 8aa6b94300..88c9379228 100644 --- a/sys/dev/netif/awi/awi.c +++ b/sys/dev/netif/awi/awi.c @@ -1,6 +1,6 @@ /* $NetBSD: awi.c,v 1.26 2000/07/21 04:48:55 onoe Exp $ */ /* $FreeBSD: src/sys/dev/awi/awi.c,v 1.10.2.2 2003/01/23 21:06:42 sam Exp $ */ -/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.5 2003/07/19 21:14:18 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/awi/Attic/awi.c,v 1.6 2003/08/07 21:17:00 dillon Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ #if defined(__FreeBSD__) && __FreeBSD__ >= 4 #define NBPFILTER 1 #elif defined(__FreeBSD__) && __FreeBSD__ >= 3 -#include "bpf.h" +#include "use_bpf.h" #define NBPFILTER NBPF #else #include "bpfilter.h" @@ -156,10 +156,10 @@ #include #endif #ifdef __FreeBSD__ -#include -#include -#include -#include +#include "am79c930reg.h" +#include "am79c930var.h" +#include "awireg.h" +#include "awivar.h" #endif static int awi_ioctl __P((struct ifnet *ifp, u_long cmd, caddr_t data)); diff --git a/sys/dev/netif/awi/awi_wep.c b/sys/dev/netif/awi/awi_wep.c index 412b46c302..cbd4ba351f 100644 --- a/sys/dev/netif/awi/awi_wep.c +++ b/sys/dev/netif/awi/awi_wep.c @@ -1,6 +1,6 @@ /* $NetBSD: awi_wep.c,v 1.4 2000/08/14 11:28:03 onoe Exp $ */ /* $FreeBSD: src/sys/dev/awi/awi_wep.c,v 1.3.2.2 2003/01/23 21:06:42 sam Exp $ */ -/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wep.c,v 1.4 2003/06/25 03:55:46 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wep.c,v 1.5 2003/08/07 21:17:00 dillon Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -93,10 +93,10 @@ #endif #ifdef __FreeBSD__ -#include -#include -#include -#include +#include "am79c930reg.h" +#include "am79c930var.h" +#include "awireg.h" +#include "awivar.h" #include static __inline int diff --git a/sys/dev/netif/awi/awi_wicfg.c b/sys/dev/netif/awi/awi_wicfg.c index 3e5a709898..9049f640cb 100644 --- a/sys/dev/netif/awi/awi_wicfg.c +++ b/sys/dev/netif/awi/awi_wicfg.c @@ -1,6 +1,6 @@ /* $NetBSD: awi_wicfg.c,v 1.3 2000/07/06 17:22:25 onoe Exp $ */ /* $FreeBSD: src/sys/dev/awi/awi_wicfg.c,v 1.3.2.2 2002/06/18 08:06:15 jhay Exp $ */ -/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wicfg.c,v 1.4 2003/06/25 03:55:46 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/awi/Attic/awi_wicfg.c,v 1.5 2003/08/07 21:17:00 dillon Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -83,14 +83,14 @@ #include /* XXX */ #endif #ifdef __FreeBSD__ -#include -#include +#include "am79c930reg.h" +#include "am79c930var.h" #undef _KERNEL /* XXX */ -#include /* XXX */ +#include /* XXX */ #define _KERNEL /* XXX */ -#include -#include +#include "awireg.h" +#include "awivar.h" #endif static int awi_cfgget __P((struct ifnet *ifp, u_long cmd, caddr_t data)); diff --git a/sys/dev/netif/awi/if_awi_pccard.c b/sys/dev/netif/awi/if_awi_pccard.c index c12a3a3b99..70a9222e44 100644 --- a/sys/dev/netif/awi/if_awi_pccard.c +++ b/sys/dev/netif/awi/if_awi_pccard.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/awi/if_awi_pccard.c,v 1.5.2.1 2000/12/07 04:09:39 imp Exp $ - * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/netif/awi/Attic/if_awi_pccard.c,v 1.3 2003/08/07 21:17:00 dillon Exp $ */ #include @@ -46,10 +46,10 @@ #include -#include -#include -#include -#include +#include "am79c930reg.h" +#include "am79c930var.h" +#include "awireg.h" +#include "awivar.h" struct awi_pccard_softc { struct awi_softc sc_awi; diff --git a/sys/dev/netif/bge/if_bge.c b/sys/dev/netif/bge/if_bge.c index 1d1bfc258a..99f86ba4b0 100644 --- a/sys/dev/netif/bge/if_bge.c +++ b/sys/dev/netif/bge/if_bge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.22 2003/05/11 18:00:55 ps Exp $ - * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.4 2003/07/30 01:34:49 drhodus Exp $ + * $DragonFly: src/sys/dev/netif/bge/if_bge.c,v 1.5 2003/08/07 21:17:00 dillon Exp $ * * $FreeBSD: src/sys/dev/bge/if_bge.c,v 1.3.2.22 2003/05/11 18:00:55 ps Exp $ */ @@ -91,7 +91,7 @@ #include #include -#include +#include #include #include @@ -106,15 +106,15 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include -#include +#include "if_bgereg.h" #define BGE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) diff --git a/sys/dev/netif/cm/if_cm_isa.c b/sys/dev/netif/cm/if_cm_isa.c index c3222e4724..6f5bbb6a7f 100644 --- a/sys/dev/netif/cm/if_cm_isa.c +++ b/sys/dev/netif/cm/if_cm_isa.c @@ -1,6 +1,6 @@ /* $NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */ /* $FreeBSD: src/sys/dev/cm/if_cm_isa.c,v 1.1.2.1 2002/02/13 22:33:41 fjoe Exp $ */ -/* $DragonFly: src/sys/dev/netif/cm/Attic/if_cm_isa.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/cm/Attic/if_cm_isa.c,v 1.3 2003/08/07 21:17:00 dillon Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -51,7 +51,7 @@ #include #include -#include +#include "smc90cx6var.h" static int cm_isa_probe __P((device_t)); static int cm_isa_attach __P((device_t)); diff --git a/sys/dev/netif/cm/smc90cx6.c b/sys/dev/netif/cm/smc90cx6.c index dbe3d9ec96..5617a16771 100644 --- a/sys/dev/netif/cm/smc90cx6.c +++ b/sys/dev/netif/cm/smc90cx6.c @@ -1,6 +1,6 @@ /* $NetBSD: smc90cx6.c,v 1.38 2001/07/07 15:57:53 thorpej Exp $ */ /* $FreeBSD: src/sys/dev/cm/smc90cx6.c,v 1.1.2.3 2003/02/05 18:42:14 fjoe Exp $ */ -/* $DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/cm/Attic/smc90cx6.c,v 1.3 2003/08/07 21:17:00 dillon Exp $ */ /*- * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc. @@ -70,8 +70,8 @@ #include #include -#include -#include +#include "smc90cx6reg.h" +#include "smc90cx6var.h" MODULE_DEPEND(if_cm, arcnet, 1, 1, 1); diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c index 1edb4a4f71..a8da62ca63 100644 --- a/sys/dev/netif/cs/if_cs.c +++ b/sys/dev/netif/cs/if_cs.c @@ -28,7 +28,7 @@ /* * $FreeBSD: src/sys/dev/cs/if_cs.c,v 1.19.2.1 2001/01/25 20:13:48 imp Exp $ - * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.3 2003/08/07 21:17:00 dillon Exp $ * * Device driver for Crystal Semiconductor CS8920 based ethernet * adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997 @@ -61,8 +61,8 @@ #include #include -#include -#include +#include "if_csreg.h" +#include "if_csvar.h" #ifdef CS_USE_64K_DMA #define CS_DMA_BUFFER_SIZE 65536 diff --git a/sys/dev/netif/cs/if_cs_isa.c b/sys/dev/netif/cs/if_cs_isa.c index f2b727ae09..ccfad73425 100644 --- a/sys/dev/netif/cs/if_cs_isa.c +++ b/sys/dev/netif/cs/if_cs_isa.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/cs/if_cs_isa.c,v 1.1.2.1 2001/01/25 20:13:48 imp Exp $ - * $DragonFly: src/sys/dev/netif/cs/if_cs_isa.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cs/if_cs_isa.c,v 1.3 2003/08/07 21:17:00 dillon Exp $ */ #include @@ -42,9 +42,9 @@ #include #include -#include +#include -#include +#include "if_csvar.h" static int cs_isa_probe (device_t); static int cs_isa_attach (device_t); diff --git a/sys/dev/netif/cs/if_cs_pccard.c b/sys/dev/netif/cs/if_cs_pccard.c index 416064aced..dece6a7a72 100644 --- a/sys/dev/netif/cs/if_cs_pccard.c +++ b/sys/dev/netif/cs/if_cs_pccard.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/cs/if_cs_pccard.c,v 1.1.2.1 2001/01/25 20:13:48 imp Exp $ - * $DragonFly: src/sys/dev/netif/cs/if_cs_pccard.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cs/if_cs_pccard.c,v 1.3 2003/08/07 21:17:00 dillon Exp $ */ #include @@ -41,8 +41,8 @@ #include #include -#include -#include +#include "if_csvar.h" +#include #include "card_if.h" diff --git a/sys/dev/netif/cue/if_cue.c b/sys/dev/netif/cue/if_cue.c index 79d2f3c48a..7d3008c946 100644 --- a/sys/dev/netif/cue/if_cue.c +++ b/sys/dev/netif/cue/if_cue.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.7.2.6 2002/11/06 14:23:20 joe Exp $ - * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cue/if_cue.c,v 1.3 2003/08/07 21:17:00 dillon Exp $ * * $FreeBSD: src/sys/dev/usb/if_cue.c,v 1.7.2.6 2002/11/06 14:23:20 joe Exp $ */ @@ -71,14 +71,14 @@ #include /* for DELAY */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include "if_cuereg.h" /* * Various supported device vendors/products. diff --git a/sys/dev/netif/cx/cx.c b/sys/dev/netif/cx/cx.c index 8f979e66c8..0a8dcb4599 100644 --- a/sys/dev/netif/cx/cx.c +++ b/sys/dev/netif/cx/cx.c @@ -16,12 +16,12 @@ * Version 1.9, Wed Oct 4 18:58:15 MSK 1995 * * $FreeBSD: src/sys/i386/isa/cx.c,v 1.45.2.1 2001/02/26 04:23:09 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/cx/cx.c,v 1.6 2003/07/21 07:57:44 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cx/cx.c,v 1.7 2003/08/07 21:17:00 dillon Exp $ * */ #undef DEBUG -#include "cx.h" +#include "use_cx.h" #include #include @@ -56,7 +56,7 @@ #endif #include -#include +#include "cxreg.h" /* XXX imported from if_cx.c. */ void cxswitch (cx_chan_t *c, cx_soft_opt_t new); diff --git a/sys/dev/netif/cx/if_cx.c b/sys/dev/netif/cx/if_cx.c index aa2f85718d..df791e98a4 100644 --- a/sys/dev/netif/cx/if_cx.c +++ b/sys/dev/netif/cx/if_cx.c @@ -17,13 +17,13 @@ * Version 1.9, Wed Oct 4 18:58:15 MSK 1995 * * $FreeBSD: src/sys/i386/isa/if_cx.c,v 1.32 1999/11/18 08:36:42 peter Exp $ - * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.3 2003/08/07 21:17:00 dillon Exp $ * */ #undef DEBUG -#include "cx.h" -#include "sppp.h" +#include "use_cx.h" +#include "use_sppp.h" #if NSPPP <= 0 #error The device 'cx' requires sppp. #endif @@ -41,13 +41,13 @@ #include -#include +#include #define watchdog_func_t void(*)(struct ifnet *) #define start_func_t void(*)(struct ifnet*) #include #include -#include +#include "cxreg.h" /* XXX exported. */ void cxswitch (cx_chan_t *c, cx_soft_opt_t new); diff --git a/sys/dev/netif/dc/if_dc.c b/sys/dev/netif/dc/if_dc.c index b579bbb9ab..6461a09726 100644 --- a/sys/dev/netif/dc/if_dc.c +++ b/sys/dev/netif/dc/if_dc.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ - * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.3 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/netif/dc/if_dc.c,v 1.4 2003/08/07 21:17:00 dillon Exp $ * * $FreeBSD: src/sys/pci/if_dc.c,v 1.9.2.45 2003/06/08 14:31:53 mux Exp $ */ @@ -105,7 +105,7 @@ #include #include #include -#include +#include #include @@ -119,18 +119,18 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include +#include +#include #define DC_USEIOSPACE #ifdef __alpha__ #define SRM_MEDIA #endif -#include +#include "if_dcreg.h" /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" diff --git a/sys/dev/netif/de/if_de.c b/sys/dev/netif/de/if_de.c index 7459f20260..4fedb81395 100644 --- a/sys/dev/netif/de/if_de.c +++ b/sys/dev/netif/de/if_de.c @@ -1,7 +1,7 @@ /* $NetBSD: if_de.c,v 1.86 1999/06/01 19:17:59 thorpej Exp $ */ /* $FreeBSD: src/sys/pci/if_de.c,v 1.123.2.4 2000/08/04 23:25:09 peter Exp $ */ -/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.3 2003/07/23 02:30:23 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/de/if_de.c,v 1.4 2003/08/07 21:17:00 dillon Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -86,9 +86,9 @@ #include #include -#include -#include -#include +#include +#include +#include /* * Intel CPUs should use I/O mapped access. @@ -115,7 +115,7 @@ #define TULIP_HZ 10 -#include +#include "if_devar.h" /* * This module supports diff --git a/sys/dev/netif/ed/if_ed.c b/sys/dev/netif/ed/if_ed.c index 7a0f9e9442..dc52123a7c 100644 --- a/sys/dev/netif/ed/if_ed.c +++ b/sys/dev/netif/ed/if_ed.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.173.2.13 2001/11/03 00:36:07 luigi Exp $ - * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.3 2003/07/26 14:25:20 rob Exp $ + * $DragonFly: src/sys/dev/netif/ed/if_ed.c,v 1.4 2003/08/07 21:17:01 dillon Exp $ */ /* @@ -60,18 +60,18 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" #include #include "opt_bdg.h" -#include +#include #include #include -#include -#include +#include "if_edreg.h" +#include "if_edvar.h" static void ed_init __P((void *)); static int ed_ioctl __P((struct ifnet *, u_long, caddr_t)); diff --git a/sys/dev/netif/ed/if_ed_cbus.c b/sys/dev/netif/ed/if_ed_cbus.c index 481cfe4717..64185202a9 100644 --- a/sys/dev/netif/ed/if_ed_cbus.c +++ b/sys/dev/netif/ed/if_ed_cbus.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ed/if_ed_cbus.c,v 1.1.2.1 2000/09/10 08:45:11 nyan Exp $ - * $DragonFly: src/sys/dev/netif/ed/Attic/if_ed_cbus.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ed/Attic/if_ed_cbus.c,v 1.3 2003/08/07 21:17:01 dillon Exp $ */ #include @@ -48,13 +48,13 @@ #include #include -#include -#include +#include +#include -#include +#include "if_edvar.h" #ifdef PC98 -#include -#include +#include "if_edreg.h" +#include "if_ed98.h" static int ed98_alloc_port __P((device_t, int)); static int ed98_alloc_memory __P((device_t, int)); diff --git a/sys/dev/netif/ed/if_ed_isa.c b/sys/dev/netif/ed/if_ed_isa.c index 5aa18a196d..e386c42874 100644 --- a/sys/dev/netif/ed/if_ed_isa.c +++ b/sys/dev/netif/ed/if_ed_isa.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ed/if_ed_isa.c,v 1.5.2.2 2002/07/29 07:52:57 takawata Exp $ - * $DragonFly: src/sys/dev/netif/ed/if_ed_isa.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ed/if_ed_isa.c,v 1.3 2003/08/07 21:17:01 dillon Exp $ */ #include @@ -42,10 +42,10 @@ #include #include -#include -#include +#include +#include -#include +#include "if_edvar.h" static int ed_isa_probe __P((device_t)); static int ed_isa_attach __P((device_t)); diff --git a/sys/dev/netif/ed/if_ed_pccard.c b/sys/dev/netif/ed/if_ed_pccard.c index 60ae5e4352..0d5c2a71f7 100644 --- a/sys/dev/netif/ed/if_ed_pccard.c +++ b/sys/dev/netif/ed/if_ed_pccard.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ed/if_ed_pccard.c,v 1.9.2.6 2001/07/25 18:06:01 iedowse Exp $ - * $DragonFly: src/sys/dev/netif/ed/if_ed_pccard.c,v 1.4 2003/07/22 17:03:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ed/if_ed_pccard.c,v 1.5 2003/08/07 21:17:01 dillon Exp $ */ #include @@ -48,13 +48,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "if_edreg.h" +#include "if_edvar.h" +#include +#include +#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" /* "device miibus" required. See GENERIC if you get errors here. */ #include "miibus_if.h" diff --git a/sys/dev/netif/ed/if_ed_pci.c b/sys/dev/netif/ed/if_ed_pci.c index 8ebdca1c16..c404c43ede 100644 --- a/sys/dev/netif/ed/if_ed_pci.c +++ b/sys/dev/netif/ed/if_ed_pci.c @@ -18,7 +18,7 @@ * are met. * * $FreeBSD: src/sys/dev/ed/if_ed_pci.c,v 1.23.2.1 2000/09/10 08:45:11 nyan Exp $ - * $DragonFly: src/sys/dev/netif/ed/if_ed_pci.c,v 1.2 2003/06/17 04:28:24 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ed/if_ed_pci.c,v 1.3 2003/08/07 21:17:01 dillon Exp $ */ #include @@ -37,10 +37,10 @@ #include #include -#include -#include +#include +#include -#include +#include "if_edvar.h" static struct _pcsid { diff --git a/sys/dev/netif/el/if_el.c b/sys/dev/netif/el/if_el.c index 82c5f507de..e8b78a48f9 100644 --- a/sys/dev/netif/el/if_el.c +++ b/sys/dev/netif/el/if_el.c @@ -7,7 +7,7 @@ * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu. * * $FreeBSD: src/sys/i386/isa/if_el.c,v 1.47.2.2 2000/07/17 21:24:30 archie Exp $ - * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.3 2003/07/26 19:07:48 rob Exp $ + * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.4 2003/08/07 21:17:01 dillon Exp $ */ /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) @@ -20,7 +20,7 @@ * - Does not currently support DMA * - Does not currently support multicasts */ -#include "el.h" +#include "use_el.h" #include "opt_inet.h" #include "opt_ipx.h" @@ -41,8 +41,8 @@ #include -#include -#include +#include +#include "if_elreg.h" /* For debugging convenience */ #ifdef EL_DEBUG diff --git a/sys/dev/netif/elink_layer/elink.c b/sys/dev/netif/elink_layer/elink.c index 8de66fa540..edb11fa183 100644 --- a/sys/dev/netif/elink_layer/elink.c +++ b/sys/dev/netif/elink_layer/elink.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/elink.c,v 1.10 1999/08/28 00:44:41 peter Exp $ - * $DragonFly: src/sys/dev/netif/elink_layer/elink.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/dev/netif/elink_layer/elink.c,v 1.3 2003/08/07 21:17:01 dillon Exp $ */ /* @@ -38,7 +38,7 @@ #include -#include +#include "elink.h" /* * Issue a `global reset' to all cards. We have to be careful to do this only diff --git a/sys/dev/netif/em/if_em.c b/sys/dev/netif/em/if_em.c index 4eb4d77337..12f9e94c9b 100644 --- a/sys/dev/netif/em/if_em.c +++ b/sys/dev/netif/em/if_em.c @@ -32,9 +32,9 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /*$FreeBSD: src/sys/dev/em/if_em.c,v 1.2.2.15 2003/06/09 22:10:15 pdeuskar Exp $*/ -/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.2 2003/06/17 04:28:24 dillon Exp $*/ +/*$DragonFly: src/sys/dev/netif/em/if_em.c,v 1.3 2003/08/07 21:17:01 dillon Exp $*/ -#include +#include "if_em.h" /********************************************************************* * Set this to one to display debug statistics diff --git a/sys/dev/netif/em/if_em.h b/sys/dev/netif/em/if_em.h index 21872ad039..628dcc1cf7 100644 --- a/sys/dev/netif/em/if_em.h +++ b/sys/dev/netif/em/if_em.h @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /*$FreeBSD: src/sys/dev/em/if_em.h,v 1.1.2.13 2003/06/09 21:43:41 pdeuskar Exp $*/ -/*$DragonFly: src/sys/dev/netif/em/if_em.h,v 1.2 2003/06/17 04:28:25 dillon Exp $*/ +/*$DragonFly: src/sys/dev/netif/em/if_em.h,v 1.3 2003/08/07 21:17:01 dillon Exp $*/ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -55,7 +55,7 @@ POSSIBILITY OF SUCH DAMAGE. #include #include -#include +#include #include #include @@ -70,13 +70,13 @@ POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include -#include +#include +#include #include #include #include "opt_bdg.h" -#include +#include "if_em_hw.h" /* Tunables */ diff --git a/sys/dev/netif/em/if_em_hw.c b/sys/dev/netif/em/if_em_hw.c index 76e8147066..405159dc19 100644 --- a/sys/dev/netif/em/if_em_hw.c +++ b/sys/dev/netif/em/if_em_hw.c @@ -32,12 +32,12 @@ *******************************************************************************/ /*$FreeBSD: src/sys/dev/em/if_em_hw.c,v 1.1.2.8 2003/06/09 21:43:41 pdeuskar Exp $*/ -/*$DragonFly: src/sys/dev/netif/em/if_em_hw.c,v 1.2 2003/06/17 04:28:25 dillon Exp $*/ +/*$DragonFly: src/sys/dev/netif/em/if_em_hw.c,v 1.3 2003/08/07 21:17:01 dillon Exp $*/ /* if_em_hw.c * Shared functions for accessing and configuring the MAC */ -#include +#include "if_em_hw.h" static int32_t em_set_phy_type(struct em_hw *hw); static void em_phy_init_script(struct em_hw *hw); diff --git a/sys/dev/netif/em/if_em_hw.h b/sys/dev/netif/em/if_em_hw.h index f8b7e7befc..18ac224e75 100644 --- a/sys/dev/netif/em/if_em_hw.h +++ b/sys/dev/netif/em/if_em_hw.h @@ -32,7 +32,7 @@ *******************************************************************************/ /*$FreeBSD: src/sys/dev/em/if_em_hw.h,v 1.1.2.8 2003/06/09 21:43:41 pdeuskar Exp $*/ -/*$DragonFly: src/sys/dev/netif/em/if_em_hw.h,v 1.2 2003/06/17 04:28:25 dillon Exp $*/ +/*$DragonFly: src/sys/dev/netif/em/if_em_hw.h,v 1.3 2003/08/07 21:17:01 dillon Exp $*/ /* if_em_hw.h * Structures, enums, and macros for the MAC */ @@ -40,7 +40,7 @@ #ifndef _EM_HW_H_ #define _EM_HW_H_ -#include +#include "if_em_osdep.h" /* Forward declarations of structures used by the shared code */ struct em_hw; diff --git a/sys/dev/netif/em/if_em_osdep.h b/sys/dev/netif/em/if_em_osdep.h index aa74db4477..f98b530621 100644 --- a/sys/dev/netif/em/if_em_osdep.h +++ b/sys/dev/netif/em/if_em_osdep.h @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ /*$FreeBSD: src/sys/dev/em/if_em_osdep.h,v 1.1.2.11 2003/06/09 21:43:41 pdeuskar Exp $*/ -/*$DragonFly: src/sys/dev/netif/em/if_em_osdep.h,v 1.2 2003/06/17 04:28:25 dillon Exp $*/ +/*$DragonFly: src/sys/dev/netif/em/if_em_osdep.h,v 1.3 2003/08/07 21:17:01 dillon Exp $*/ #ifndef _FREEBSD_OS_H_ #define _FREEBSD_OS_H_ @@ -52,8 +52,8 @@ POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include -#include +#include +#include #define ASSERT(x) if(!(x)) panic("EM: x") diff --git a/sys/dev/netif/en_pci/if_en_pci.c b/sys/dev/netif/en_pci/if_en_pci.c index 8c48980918..039e7869d0 100644 --- a/sys/dev/netif/en_pci/if_en_pci.c +++ b/sys/dev/netif/en_pci/if_en_pci.c @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_en_pci.c,v 1.12 1999/08/21 22:10:49 msmith Exp $ - * $DragonFly: src/sys/dev/netif/en_pci/if_en_pci.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/en_pci/if_en_pci.c,v 1.3 2003/08/07 21:17:01 dillon Exp $ */ /* @@ -46,7 +46,7 @@ * thanks to Matt Thomas for figuring out FreeBSD vs NetBSD vs etc.. diffs. */ -#include "en.h" +#include "use_en.h" #include #include @@ -61,11 +61,11 @@ #include -#include -#include +#include +#include -#include -#include +#include +#include /* diff --git a/sys/dev/netif/ep/if_ep.c b/sys/dev/netif/ep/if_ep.c index 276e59468f..bdf24375de 100644 --- a/sys/dev/netif/ep/if_ep.c +++ b/sys/dev/netif/ep/if_ep.c @@ -39,7 +39,7 @@ /* * $FreeBSD: src/sys/dev/ep/if_ep.c,v 1.95.2.3 2002/03/06 07:26:35 imp Exp $ - * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.3 2003/07/26 14:25:20 rob Exp $ + * $DragonFly: src/sys/dev/netif/ep/if_ep.c,v 1.4 2003/08/07 21:17:01 dillon Exp $ * * Promiscuous mode added and interrupt logic slightly changed * to reduce the number of adapter failures. Transceiver select @@ -88,9 +88,9 @@ #include -#include -#include -#include +#include "if_epreg.h" +#include "if_epvar.h" +#include "../elink_layer/elink.h" /* Exported variables */ devclass_t ep_devclass; diff --git a/sys/dev/netif/ep/if_ep_eisa.c b/sys/dev/netif/ep/if_ep_eisa.c index aa610bb7a7..814c809240 100644 --- a/sys/dev/netif/ep/if_ep_eisa.c +++ b/sys/dev/netif/ep/if_ep_eisa.c @@ -20,7 +20,7 @@ * are met. * * $FreeBSD: src/sys/dev/ep/if_ep_eisa.c,v 1.18 2000/01/14 07:14:00 peter Exp $ - * $DragonFly: src/sys/dev/netif/ep/if_ep_eisa.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ep/if_ep_eisa.c,v 1.3 2003/08/07 21:17:01 dillon Exp $ */ #include @@ -41,10 +41,10 @@ #include -#include +#include -#include -#include +#include "if_epreg.h" +#include "if_epvar.h" #define EISA_DEVICE_ID_3COM_3C509_TP 0x506d5090 #define EISA_DEVICE_ID_3COM_3C509_BNC 0x506d5091 diff --git a/sys/dev/netif/ep/if_ep_isa.c b/sys/dev/netif/ep/if_ep_isa.c index a20f5954ab..616a8660b5 100644 --- a/sys/dev/netif/ep/if_ep_isa.c +++ b/sys/dev/netif/ep/if_ep_isa.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ep/if_ep_isa.c,v 1.8.2.1 2000/12/16 03:47:57 nyan Exp $ - * $DragonFly: src/sys/dev/netif/ep/if_ep_isa.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ep/if_ep_isa.c,v 1.3 2003/08/07 21:17:01 dillon Exp $ */ #include @@ -49,12 +49,12 @@ #include -#include -#include +#include +#include -#include -#include -#include +#include "if_epreg.h" +#include "if_epvar.h" +#include "../elink_layer/elink.h" static u_int16_t get_eeprom_data (int, int); diff --git a/sys/dev/netif/ep/if_ep_mca.c b/sys/dev/netif/ep/if_ep_mca.c index cdc74a006a..2cc1d6ae5c 100644 --- a/sys/dev/netif/ep/if_ep_mca.c +++ b/sys/dev/netif/ep/if_ep_mca.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ep/if_ep_mca.c,v 1.2 1999/10/27 06:25:15 mdodd Exp $ - * $DragonFly: src/sys/dev/netif/ep/Attic/if_ep_mca.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ep/Attic/if_ep_mca.c,v 1.3 2003/08/07 21:17:01 dillon Exp $ */ #include @@ -43,11 +43,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "if_epreg.h" +#include "if_epvar.h" #define EP_MCA_627C 0x627C #define EP_MCA_627D 0x627D diff --git a/sys/dev/netif/ep/if_ep_pccard.c b/sys/dev/netif/ep/if_ep_pccard.c index 7274262375..d4a779b1ff 100644 --- a/sys/dev/netif/ep/if_ep_pccard.c +++ b/sys/dev/netif/ep/if_ep_pccard.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ep/if_ep_pccard.c,v 1.12.2.2 2000/08/08 23:55:02 peter Exp $ - * $DragonFly: src/sys/dev/netif/ep/if_ep_pccard.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ep/if_ep_pccard.c,v 1.3 2003/08/07 21:17:01 dillon Exp $ */ /* @@ -56,8 +56,8 @@ #include -#include -#include +#include "if_epreg.h" +#include "if_epvar.h" static const char *ep_pccard_identify(u_short id); diff --git a/sys/dev/netif/ex/if_ex.c b/sys/dev/netif/ex/if_ex.c index 9caea87c6d..d285503f4d 100644 --- a/sys/dev/netif/ex/if_ex.c +++ b/sys/dev/netif/ex/if_ex.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ex/if_ex.c,v 1.26.2.3 2001/03/05 05:33:20 imp Exp $ - * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.3 2003/07/23 02:30:15 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ex/if_ex.c,v 1.4 2003/08/07 21:17:01 dillon Exp $ * * MAINTAINER: Matthew N. Dodd * @@ -64,11 +64,11 @@ #include -#include -#include +#include +#include -#include -#include +#include "if_exreg.h" +#include "if_exvar.h" #ifdef EXDEBUG # define Start_End 1 diff --git a/sys/dev/netif/ex/if_ex_isa.c b/sys/dev/netif/ex/if_ex_isa.c index 7c9c93fec8..f949d4e389 100644 --- a/sys/dev/netif/ex/if_ex_isa.c +++ b/sys/dev/netif/ex/if_ex_isa.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ex/if_ex_isa.c,v 1.3.2.1 2001/03/05 05:33:20 imp Exp $ - * $DragonFly: src/sys/dev/netif/ex/if_ex_isa.c,v 1.3 2003/07/23 02:30:15 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ex/if_ex_isa.c,v 1.4 2003/08/07 21:17:01 dillon Exp $ */ #include @@ -45,11 +45,11 @@ #include -#include -#include +#include +#include -#include -#include +#include "if_exreg.h" +#include "if_exvar.h" /* Bus Front End Functions */ static void ex_isa_identify __P((driver_t *, device_t)); diff --git a/sys/dev/netif/ex/if_ex_pccard.c b/sys/dev/netif/ex/if_ex_pccard.c index 4ef0ca32e3..228fa62d7a 100644 --- a/sys/dev/netif/ex/if_ex_pccard.c +++ b/sys/dev/netif/ex/if_ex_pccard.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ex/if_ex_pccard.c,v 1.2.2.1 2001/03/05 05:33:20 imp Exp $ - * $DragonFly: src/sys/dev/netif/ex/if_ex_pccard.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ex/if_ex_pccard.c,v 1.3 2003/08/07 21:17:01 dillon Exp $ */ #include @@ -44,10 +44,10 @@ #include -#include -#include +#include "if_exreg.h" +#include "if_exvar.h" -#include +#include /* Bus Front End Functions */ static int ex_pccard_probe __P((device_t)); diff --git a/sys/dev/netif/fe/if_fe.c b/sys/dev/netif/fe/if_fe.c index 9d4a6ed7c9..1e27192270 100644 --- a/sys/dev/netif/fe/if_fe.c +++ b/sys/dev/netif/fe/if_fe.c @@ -22,7 +22,7 @@ /* * $FreeBSD: src/sys/dev/fe/if_fe.c,v 1.65.2.1 2000/09/22 10:01:47 nyan Exp $ - * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.3 2003/07/20 07:29:18 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fe/if_fe.c,v 1.4 2003/08/07 21:17:02 dillon Exp $ * * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards. * Contributed by M. Sekiguchi. @@ -98,8 +98,8 @@ #include #include -#include -#include +#include "if_fereg.h" +#include "if_fevar.h" /* * Transmit just one packet per a "send" command to 86960. diff --git a/sys/dev/netif/fe/if_fe_cbus.c b/sys/dev/netif/fe/if_fe_cbus.c index d0d26774fa..8e4e0bc104 100644 --- a/sys/dev/netif/fe/if_fe_cbus.c +++ b/sys/dev/netif/fe/if_fe_cbus.c @@ -20,7 +20,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fe/if_fe_cbus.c,v 1.2.2.5 2002/02/09 03:12:27 nyan Exp $ - * $DragonFly: src/sys/dev/netif/fe/Attic/if_fe_cbus.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fe/Attic/if_fe_cbus.c,v 1.3 2003/08/07 21:17:02 dillon Exp $ */ #include "opt_fe.h" @@ -48,10 +48,10 @@ #include #include -#include -#include +#include "if_fereg.h" +#include "if_fevar.h" -#include +#include /* * Cbus specific code. diff --git a/sys/dev/netif/fe/if_fe_isa.c b/sys/dev/netif/fe/if_fe_isa.c index dd9390be90..0c29826118 100644 --- a/sys/dev/netif/fe/if_fe_isa.c +++ b/sys/dev/netif/fe/if_fe_isa.c @@ -20,7 +20,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fe/if_fe_isa.c,v 1.2.2.1 2000/09/22 10:01:47 nyan Exp $ - * $DragonFly: src/sys/dev/netif/fe/if_fe_isa.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fe/if_fe_isa.c,v 1.3 2003/08/07 21:17:02 dillon Exp $ */ #include "opt_fe.h" @@ -47,10 +47,10 @@ #include #include -#include -#include +#include "if_fereg.h" +#include "if_fevar.h" -#include +#include /* * ISA specific code. diff --git a/sys/dev/netif/fe/if_fe_pccard.c b/sys/dev/netif/fe/if_fe_pccard.c index d17edbbfb6..37f756529e 100644 --- a/sys/dev/netif/fe/if_fe_pccard.c +++ b/sys/dev/netif/fe/if_fe_pccard.c @@ -20,7 +20,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fe/if_fe_pccard.c,v 1.2.2.1 2000/09/22 10:01:47 nyan Exp $ - * $DragonFly: src/sys/dev/netif/fe/if_fe_pccard.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fe/if_fe_pccard.c,v 1.3 2003/08/07 21:17:02 dillon Exp $ */ #include "opt_fe.h" @@ -46,11 +46,11 @@ #include #include -#include -#include +#include "if_fereg.h" +#include "if_fevar.h" -#include -#include +#include +#include /* * PC-Card (PCMCIA) specific code. diff --git a/sys/dev/netif/fea/if_fea.c b/sys/dev/netif/fea/if_fea.c index 0cab7c79e6..d604401144 100644 --- a/sys/dev/netif/fea/if_fea.c +++ b/sys/dev/netif/fea/if_fea.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pdq/if_fea.c,v 1.19 2000/01/14 07:14:03 peter Exp $ - * $DragonFly: src/sys/dev/netif/fea/Attic/if_fea.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fea/Attic/if_fea.c,v 1.3 2003/08/07 21:17:02 dillon Exp $ */ /* @@ -44,9 +44,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include static void pdq_eisa_subprobe __P((pdq_bus_t, u_int32_t, u_int32_t *, u_int32_t *, u_int32_t *)); static void pdq_eisa_devinit __P((pdq_softc_t *)); diff --git a/sys/dev/netif/fpa/if_fpa.c b/sys/dev/netif/fpa/if_fpa.c index d0a3da481c..7eee8bd0ae 100644 --- a/sys/dev/netif/fpa/if_fpa.c +++ b/sys/dev/netif/fpa/if_fpa.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.13 1999/08/28 00:50:50 peter Exp $ - * $DragonFly: src/sys/dev/netif/fpa/Attic/if_fpa.c,v 1.3 2003/07/26 14:25:23 rob Exp $ + * $DragonFly: src/sys/dev/netif/fpa/Attic/if_fpa.c,v 1.4 2003/08/07 21:17:02 dillon Exp $ * */ @@ -42,13 +42,13 @@ #include #if defined(__FreeBSD__) -#include "fpa.h" +#include "use_fpa.h" #include #include #include -#include -#include -#include +#include +#include +#include #elif defined(__bsdi__) #include #include diff --git a/sys/dev/netif/fwe/if_fwe.c b/sys/dev/netif/fwe/if_fwe.c index 6b68318e01..980aeef6be 100644 --- a/sys/dev/netif/fwe/if_fwe.c +++ b/sys/dev/netif/fwe/if_fwe.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.1.2.11 2003/04/28 03:29:18 simokawa Exp $ - * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fwe/if_fwe.c,v 1.3 2003/08/07 21:17:02 dillon Exp $ */ #include "opt_inet.h" @@ -54,14 +54,14 @@ #include #include #include -#include +#include #include #include -#include -#include -#include +#include +#include +#include "if_fwevar.h" #define FWEDEBUG if (fwedebug) printf #define TX_MAX_QUEUE (FWMAXQUEUE - 1) diff --git a/sys/dev/netif/fxp/if_fxp.c b/sys/dev/netif/fxp/if_fxp.c index c0e5ef5ef1..24e74ad778 100644 --- a/sys/dev/netif/fxp/if_fxp.c +++ b/sys/dev/netif/fxp/if_fxp.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.110.2.30 2003/06/12 16:47:05 mux Exp $ - * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * $DragonFly: src/sys/dev/netif/fxp/if_fxp.c,v 1.3 2003/08/07 21:17:02 dillon Exp $ */ /* @@ -66,17 +66,17 @@ #include /* for DELAY */ #include -#include +#include -#include -#include /* for PCIM_CMD_xxx */ +#include +#include /* for PCIM_CMD_xxx */ -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include -#include +#include "if_fxpreg.h" +#include "if_fxpvar.h" +#include "rcvbundl.h" MODULE_DEPEND(fxp, miibus, 1, 1, 1); #include "miibus_if.h" diff --git a/sys/dev/netif/gx/if_gx.c b/sys/dev/netif/gx/if_gx.c index 169f9c6749..d9350aef3f 100644 --- a/sys/dev/netif/gx/if_gx.c +++ b/sys/dev/netif/gx/if_gx.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/gx/if_gx.c,v 1.2.2.3 2001/12/14 19:51:39 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.2 2003/06/17 04:28:26 dillon Exp $ + * $DragonFly: src/sys/dev/netif/gx/Attic/if_gx.c,v 1.3 2003/08/07 21:17:02 dillon Exp $ */ #include @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include @@ -64,14 +64,14 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include +#include "if_gxreg.h" +#include "if_gxvar.h" MODULE_DEPEND(gx, miibus, 1, 1, 1); #include "miibus_if.h" diff --git a/sys/dev/netif/ic/if_ic.c b/sys/dev/netif/ic/if_ic.c index 7353d4ad9d..9ab5825e05 100644 --- a/sys/dev/netif/ic/if_ic.c +++ b/sys/dev/netif/ic/if_ic.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/iicbus/if_ic.c,v 1.8 1999/12/29 04:35:39 peter Exp $ - * $DragonFly: src/sys/dev/netif/ic/if_ic.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ic/if_ic.c,v 1.3 2003/08/07 21:17:02 dillon Exp $ */ /* @@ -62,8 +62,8 @@ #include -#include -#include +#include +#include #include "iicbus_if.h" diff --git a/sys/dev/netif/ie/if_ie.c b/sys/dev/netif/ie/if_ie.c index 7bb2ba1938..ea546f6c5f 100644 --- a/sys/dev/netif/ie/if_ie.c +++ b/sys/dev/netif/ie/if_ie.c @@ -48,7 +48,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.72.2.4 2003/03/27 21:01:49 mdodd Exp $ - * $DragonFly: src/sys/dev/netif/ie/if_ie.c,v 1.3 2003/07/26 14:25:21 rob Exp $ + * $DragonFly: src/sys/dev/netif/ie/if_ie.c,v 1.4 2003/08/07 21:17:02 dillon Exp $ */ /* @@ -107,7 +107,7 @@ iomem and and with 0xffff. */ -#include "ie.h" +#include "use_ie.h" #include "opt_inet.h" #include "opt_ipx.h" @@ -133,13 +133,13 @@ iomem and and with 0xffff. #include #include -#include +#include #include #include -#include -#include -#include -#include +#include "if_iereg.h" +#include "if_ie507.h" +#include "if_iee16.h" +#include "../elink_layer/elink.h" #include diff --git a/sys/dev/netif/kue/if_kue.c b/sys/dev/netif/kue/if_kue.c index 8f3dc4417b..997e35f015 100644 --- a/sys/dev/netif/kue/if_kue.c +++ b/sys/dev/netif/kue/if_kue.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.9 2003/04/13 02:39:25 murray Exp $ - * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ + * $DragonFly: src/sys/dev/netif/kue/if_kue.c,v 1.3 2003/08/07 21:17:02 dillon Exp $ * * $FreeBSD: src/sys/dev/usb/if_kue.c,v 1.17.2.9 2003/04/13 02:39:25 murray Exp $ */ @@ -86,15 +86,15 @@ #include /* for DELAY */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include +#include "if_kuereg.h" +#include /* * Various supported device vendors/products. diff --git a/sys/dev/netif/le/if_le.c b/sys/dev/netif/le/if_le.c index 13f8026115..7308bc4e83 100644 --- a/sys/dev/netif/le/if_le.c +++ b/sys/dev/netif/le/if_le.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/if_le.c,v 1.56.2.4 2002/06/05 23:24:10 paul Exp $ - * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.3 2003/07/26 19:07:48 rob Exp $ + * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.4 2003/08/07 21:17:02 dillon Exp $ */ /* @@ -36,7 +36,7 @@ * DE2002, DE203, DE204, DE205, and DE422 cards. */ -#include "le.h" +#include "use_le.h" #include "opt_inet.h" #include "opt_ipx.h" @@ -59,7 +59,7 @@ #include -#include +#include #include #include diff --git a/sys/dev/netif/lge/if_lge.c b/sys/dev/netif/lge/if_lge.c index c27cd07eb9..0aa2a9a101 100644 --- a/sys/dev/netif/lge/if_lge.c +++ b/sys/dev/netif/lge/if_lge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $ - * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.3 2003/07/26 14:25:21 rob Exp $ + * $DragonFly: src/sys/dev/netif/lge/if_lge.c,v 1.4 2003/08/07 21:17:03 dillon Exp $ * * $FreeBSD: src/sys/dev/lge/if_lge.c,v 1.5.2.2 2001/12/14 19:49:23 jlemon Exp $ */ @@ -102,15 +102,15 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include +#include +#include #define LGE_USEIOSPACE -#include +#include "if_lgereg.h" /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" diff --git a/sys/dev/netif/lnc/if_lnc.c b/sys/dev/netif/lnc/if_lnc.c index f3e4158164..0517eafed7 100644 --- a/sys/dev/netif/lnc/if_lnc.c +++ b/sys/dev/netif/lnc/if_lnc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/if_lnc.c,v 1.68.2.5 2002/02/13 00:43:10 dillon Exp $ - * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/dev/netif/lnc/Attic/if_lnc.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -61,8 +61,8 @@ * */ -#include "pci.h" -#include "lnc.h" +#include "use_pci.h" +#include "use_lnc.h" #include "opt_inet.h" @@ -94,8 +94,8 @@ #endif #include -#include -#include +#include +#include "if_lnc.h" struct lnc_softc { struct arpcom arpcom; /* see ../../net/if_arp.h */ diff --git a/sys/dev/netif/lnc_p/if_lnc_p.c b/sys/dev/netif/lnc_p/if_lnc_p.c index e97d7c06c3..d5c4a25bcc 100644 --- a/sys/dev/netif/lnc_p/if_lnc_p.c +++ b/sys/dev/netif/lnc_p/if_lnc_p.c @@ -18,17 +18,17 @@ * are met. * * $FreeBSD: src/sys/pci/if_lnc_p.c,v 1.13 1999/08/28 00:50:51 peter Exp $ - * $DragonFly: src/sys/dev/netif/lnc_p/Attic/if_lnc_p.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/lnc_p/Attic/if_lnc_p.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ +#include "use_lnc.h" + #include #include #include #include -#include -#include - -#include "lnc.h" +#include +#include #define PCI_DEVICE_ID_PCNet_PCI 0x20001022 #define PCI_DEVICE_ID_PCHome_PCI 0x20011022 diff --git a/sys/dev/netif/mii_layer/acphy.c b/sys/dev/netif/mii_layer/acphy.c index 9a58e8b019..0b37b3bcb0 100644 --- a/sys/dev/netif/mii_layer/acphy.c +++ b/sys/dev/netif/mii_layer/acphy.c @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/acphy.c,v 1.2.2.2 2002/10/21 21:20:19 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/acphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/acphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -82,11 +82,11 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" -#include +#include "acphyreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/amphy.c b/sys/dev/netif/mii_layer/amphy.c index 440e417a94..b7a30e345f 100644 --- a/sys/dev/netif/mii_layer/amphy.c +++ b/sys/dev/netif/mii_layer/amphy.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/amphy.c,v 1.2.2.2 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/amphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/amphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ * * $FreeBSD: src/sys/dev/mii/amphy.c,v 1.2.2.2 2002/11/08 21:53:49 semenu Exp $ */ @@ -50,11 +50,11 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" -#include +#include "amphyreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/brgphy.c b/sys/dev/netif/mii_layer/brgphy.c index 2816ee9895..33448637a4 100644 --- a/sys/dev/netif/mii_layer/brgphy.c +++ b/sys/dev/netif/mii_layer/brgphy.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.1.2.7 2003/05/11 18:00:55 ps Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/brgphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/brgphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ * * $FreeBSD: src/sys/dev/mii/brgphy.c,v 1.1.2.7 2003/05/11 18:00:55 ps Exp $ */ @@ -51,11 +51,11 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" -#include +#include "brgphyreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/dcphy.c b/sys/dev/netif/mii_layer/dcphy.c index 5a93ac57de..e1730f033e 100644 --- a/sys/dev/netif/mii_layer/dcphy.c +++ b/sys/dev/netif/mii_layer/dcphy.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/dcphy.c,v 1.2.2.2 2000/10/14 00:44:40 wpaul Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/dcphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/dcphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ * * $FreeBSD: src/sys/dev/mii/dcphy.c,v 1.2.2.2 2000/10/14 00:44:40 wpaul Exp $ */ @@ -56,9 +56,9 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" #include #include @@ -67,9 +67,8 @@ #include #include -#include - -#include +#include +#include "../dc/if_dcreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/e1000phy.c b/sys/dev/netif/mii_layer/e1000phy.c index a72347a5cf..a7ab9ab15a 100644 --- a/sys/dev/netif/mii_layer/e1000phy.c +++ b/sys/dev/netif/mii_layer/e1000phy.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/mii/e1000phy.c,v 1.1.2.2 2002/11/08 21:53:49 semenu Exp $ */ -/* $DragonFly: src/sys/dev/netif/mii_layer/e1000phy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/mii_layer/e1000phy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* * Principal Author: Parag Patel * Copyright (c) 2001 @@ -46,11 +46,11 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" -#include +#include "e1000phyreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/exphy.c b/sys/dev/netif/mii_layer/exphy.c index 110e5e7ba9..7367857223 100644 --- a/sys/dev/netif/mii_layer/exphy.c +++ b/sys/dev/netif/mii_layer/exphy.c @@ -37,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/exphy.c,v 1.4.2.2 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/exphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/exphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -83,9 +83,9 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/inphy.c b/sys/dev/netif/mii_layer/inphy.c index 825d98e662..54a69c64d8 100644 --- a/sys/dev/netif/mii_layer/inphy.c +++ b/sys/dev/netif/mii_layer/inphy.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/inphy.c,v 1.4.2.2 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/inphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/inphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -43,11 +43,11 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" -#include +#include "inphyreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/lxtphy.c b/sys/dev/netif/mii_layer/lxtphy.c index 8777503336..ea890159a9 100644 --- a/sys/dev/netif/mii_layer/lxtphy.c +++ b/sys/dev/netif/mii_layer/lxtphy.c @@ -38,7 +38,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/lxtphy.c,v 1.1.2.1 2001/06/08 19:58:33 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/lxtphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/lxtphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -86,11 +86,11 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" -#include +#include "lxtphyreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/mii.c b/sys/dev/netif/mii_layer/mii.c index d9cac24c0e..3190c21867 100644 --- a/sys/dev/netif/mii_layer/mii.c +++ b/sys/dev/netif/mii_layer/mii.c @@ -37,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/mii.c,v 1.6.2.2 2002/08/19 16:56:33 ambrisko Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/mii.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/mii.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -56,8 +56,8 @@ #include #include -#include -#include +#include "mii.h" +#include "miivar.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/mii_physubr.c b/sys/dev/netif/mii_layer/mii_physubr.c index 9933143231..a3a52cb85f 100644 --- a/sys/dev/netif/mii_layer/mii_physubr.c +++ b/sys/dev/netif/mii_layer/mii_physubr.c @@ -37,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/mii_physubr.c,v 1.2.2.1 2000/12/12 19:29:14 wpaul Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/mii_physubr.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/mii_physubr.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -57,8 +57,8 @@ #include #include -#include -#include +#include "mii.h" +#include "miivar.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/mlphy.c b/sys/dev/netif/mii_layer/mlphy.c index 50bfc9e774..d4d2e3aaf0 100644 --- a/sys/dev/netif/mii_layer/mlphy.c +++ b/sys/dev/netif/mii_layer/mlphy.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/mlphy.c,v 1.2.2.3 2001/02/09 09:50:15 asmodai Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/mlphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/mlphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -61,8 +61,8 @@ #include #include -#include -#include +#include "mii.h" +#include "miivar.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/nsgphy.c b/sys/dev/netif/mii_layer/nsgphy.c index d930b79749..92d73ff6fd 100644 --- a/sys/dev/netif/mii_layer/nsgphy.c +++ b/sys/dev/netif/mii_layer/nsgphy.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/nsgphy.c,v 1.1.2.3 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/nsgphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/nsgphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ * * $FreeBSD: src/sys/dev/mii/nsgphy.c,v 1.1.2.3 2002/11/08 21:53:49 semenu Exp $ */ @@ -61,11 +61,11 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" -#include +#include "nsgphyreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/nsphy.c b/sys/dev/netif/mii_layer/nsphy.c index e82951f879..c27deaeb57 100644 --- a/sys/dev/netif/mii_layer/nsphy.c +++ b/sys/dev/netif/mii_layer/nsphy.c @@ -37,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/nsphy.c,v 1.2.2.5 2001/06/08 19:58:33 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/nsphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/nsphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -85,11 +85,11 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" -#include +#include "nsphyreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/pnaphy.c b/sys/dev/netif/mii_layer/pnaphy.c index d9c84978a9..e629707f0c 100644 --- a/sys/dev/netif/mii_layer/pnaphy.c +++ b/sys/dev/netif/mii_layer/pnaphy.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/pnaphy.c,v 1.1.2.3 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/pnaphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/pnaphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ * * $FreeBSD: src/sys/dev/mii/pnaphy.c,v 1.1.2.3 2002/11/08 21:53:49 semenu Exp $ */ @@ -58,9 +58,9 @@ #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/pnphy.c b/sys/dev/netif/mii_layer/pnphy.c index 406102e91e..9236b640e0 100644 --- a/sys/dev/netif/mii_layer/pnphy.c +++ b/sys/dev/netif/mii_layer/pnphy.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/pnphy.c,v 1.1.2.1 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/pnphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/pnphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ * * $FreeBSD: src/sys/dev/mii/pnphy.c,v 1.1.2.1 2002/11/08 21:53:49 semenu Exp $ */ @@ -54,9 +54,9 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" #include #include @@ -65,7 +65,7 @@ #include #include -#include +#include "../dc/if_dcreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/qsphy.c b/sys/dev/netif/mii_layer/qsphy.c index d5ef6605c9..62a6f5ac94 100644 --- a/sys/dev/netif/mii_layer/qsphy.c +++ b/sys/dev/netif/mii_layer/qsphy.c @@ -38,7 +38,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/qsphy.c,v 1.1.2.2 2002/10/21 21:21:42 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/qsphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/qsphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -86,11 +86,11 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" -#include +#include "qsphyreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/rlphy.c b/sys/dev/netif/mii_layer/rlphy.c index 44471ca350..ab0a823456 100644 --- a/sys/dev/netif/mii_layer/rlphy.c +++ b/sys/dev/netif/mii_layer/rlphy.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/rlphy.c,v 1.2.2.4 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/rlphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/rlphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ * * $FreeBSD: src/sys/dev/mii/rlphy.c,v 1.2.2.4 2002/11/08 21:53:49 semenu Exp $ */ @@ -49,12 +49,12 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" #include -#include +#include "../rl/if_rlreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/tlphy.c b/sys/dev/netif/mii_layer/tlphy.c index ee5af48dc1..d6707ab09e 100644 --- a/sys/dev/netif/mii_layer/tlphy.c +++ b/sys/dev/netif/mii_layer/tlphy.c @@ -37,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/tlphy.c,v 1.2.2.2 2001/07/29 22:48:37 kris Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/tlphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/tlphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -88,11 +88,11 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" -#include +#include "tlphyreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/ukphy.c b/sys/dev/netif/mii_layer/ukphy.c index 759e23c05c..eae6a7abca 100644 --- a/sys/dev/netif/mii_layer/ukphy.c +++ b/sys/dev/netif/mii_layer/ukphy.c @@ -37,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/ukphy.c,v 1.2.2.2 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/ukphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/ukphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -86,8 +86,8 @@ #include -#include -#include +#include "mii.h" +#include "miivar.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/ukphy_subr.c b/sys/dev/netif/mii_layer/ukphy_subr.c index 0bc60c177e..1c26663fd2 100644 --- a/sys/dev/netif/mii_layer/ukphy_subr.c +++ b/sys/dev/netif/mii_layer/ukphy_subr.c @@ -37,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/ukphy_subr.c,v 1.2.2.1 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/ukphy_subr.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/ukphy_subr.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -54,8 +54,8 @@ #include #include -#include -#include +#include "mii.h" +#include "miivar.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mii_layer/xmphy.c b/sys/dev/netif/mii_layer/xmphy.c index 563992790c..39c96a411a 100644 --- a/sys/dev/netif/mii_layer/xmphy.c +++ b/sys/dev/netif/mii_layer/xmphy.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mii/xmphy.c,v 1.1.2.5 2002/11/08 21:53:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/mii_layer/xmphy.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mii_layer/xmphy.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ * * $FreeBSD: src/sys/dev/mii/xmphy.c,v 1.1.2.5 2002/11/08 21:53:49 semenu Exp $ */ @@ -52,11 +52,11 @@ #include #include -#include -#include -#include +#include "mii.h" +#include "miivar.h" +#include "miidevs.h" -#include +#include "xmphyreg.h" #include "miibus_if.h" diff --git a/sys/dev/netif/mn/if_mn.c b/sys/dev/netif/mn/if_mn.c index 3faa16613b..8f1b37f119 100644 --- a/sys/dev/netif/mn/if_mn.c +++ b/sys/dev/netif/mn/if_mn.c @@ -22,7 +22,7 @@ * this gadget. * * $FreeBSD: src/sys/pci/if_mn.c,v 1.11.2.3 2001/01/23 12:47:09 phk Exp $ - * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.3 2003/08/07 21:17:03 dillon Exp $ */ /* @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include #include "pci_if.h" #include diff --git a/sys/dev/netif/my/if_my.c b/sys/dev/netif/my/if_my.c index 7766c6e523..42f5511a96 100644 --- a/sys/dev/netif/my/if_my.c +++ b/sys/dev/netif/my/if_my.c @@ -26,7 +26,7 @@ * Written by: yen_cw@myson.com.tw available at: http://www.myson.com.tw/ * * $FreeBSD: src/sys/dev/my/if_my.c,v 1.2.2.4 2002/04/17 02:05:27 julian Exp $ - * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.3 2003/07/26 14:25:22 rob Exp $ + * $DragonFly: src/sys/dev/netif/my/if_my.c,v 1.4 2003/08/07 21:17:04 dillon Exp $ * * Myson fast ethernet PCI NIC driver * @@ -63,11 +63,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" #include "miibus_if.h" @@ -86,7 +86,7 @@ static int MY_USEIOSPACE = 1; #endif -#include +#include "if_myreg.h" /* * Various supported device vendors/types and their names. diff --git a/sys/dev/netif/nge/if_nge.c b/sys/dev/netif/nge/if_nge.c index 92ad2057ce..203a275d2c 100644 --- a/sys/dev/netif/nge/if_nge.c +++ b/sys/dev/netif/nge/if_nge.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.3 2003/07/26 14:25:22 rob Exp $ + * $DragonFly: src/sys/dev/netif/nge/if_nge.c,v 1.4 2003/08/07 21:17:04 dillon Exp $ * * $FreeBSD: src/sys/dev/nge/if_nge.c,v 1.13.2.13 2003/02/05 22:03:57 mbr Exp $ */ @@ -104,7 +104,7 @@ #include #include #include -#include +#include #include @@ -118,15 +118,15 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include +#include +#include #define NGE_USEIOSPACE -#include +#include "if_ngereg.h" MODULE_DEPEND(nge, miibus, 1, 1, 1); diff --git a/sys/dev/netif/pcn/if_pcn.c b/sys/dev/netif/pcn/if_pcn.c index c103fc0608..8a725a4fbf 100644 --- a/sys/dev/netif/pcn/if_pcn.c +++ b/sys/dev/netif/pcn/if_pcn.c @@ -31,7 +31,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.3 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/netif/pcn/if_pcn.c,v 1.4 2003/08/07 21:17:04 dillon Exp $ * * $FreeBSD: src/sys/pci/if_pcn.c,v 1.5.2.10 2003/03/05 18:42:33 njl Exp $ */ @@ -84,15 +84,15 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include +#include +#include #define PCN_USEIOSPACE -#include +#include "if_pcnreg.h" /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" diff --git a/sys/dev/netif/pdq_layer/pdq.c b/sys/dev/netif/pdq_layer/pdq.c index 5183de0af1..0b757c6537 100644 --- a/sys/dev/netif/pdq_layer/pdq.c +++ b/sys/dev/netif/pdq_layer/pdq.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pdq/pdq.c,v 1.5 1999/08/28 00:42:19 peter Exp $ - * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdq.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdq.c,v 1.3 2003/08/07 21:17:04 dillon Exp $ * */ @@ -41,8 +41,8 @@ #define PDQ_HWSUPPORT /* for pdq.h */ #if defined(__FreeBSD__) -#include -#include +#include "pdqvar.h" +#include "pdqreg.h" #else #include "pdqvar.h" #include "pdqreg.h" diff --git a/sys/dev/netif/pdq_layer/pdq_ifsubr.c b/sys/dev/netif/pdq_layer/pdq_ifsubr.c index a0e5327fdd..b090c18e69 100644 --- a/sys/dev/netif/pdq_layer/pdq_ifsubr.c +++ b/sys/dev/netif/pdq_layer/pdq_ifsubr.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pdq/pdq_ifsubr.c,v 1.11.2.1 2000/08/02 22:39:30 peter Exp $ - * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdq_ifsubr.c,v 1.3 2003/07/23 02:30:17 dillon Exp $ + * $DragonFly: src/sys/dev/netif/pdq_layer/Attic/pdq_ifsubr.c,v 1.4 2003/08/07 21:17:04 dillon Exp $ * */ @@ -68,8 +68,8 @@ #endif #if defined(__FreeBSD__) -#include -#include +#include "pdqvar.h" +#include "pdqreg.h" #else #include "pdqvar.h" #include "pdqreg.h" diff --git a/sys/dev/netif/plip/if_plip.c b/sys/dev/netif/plip/if_plip.c index 4bc1bdb383..07823eb5a9 100644 --- a/sys/dev/netif/plip/if_plip.c +++ b/sys/dev/netif/plip/if_plip.c @@ -25,7 +25,7 @@ * * From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp * $FreeBSD: src/sys/dev/ppbus/if_plip.c,v 1.19.2.1 2000/05/24 00:20:57 n_hibma Exp $ - * $DragonFly: src/sys/dev/netif/plip/if_plip.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/plip/if_plip.c,v 1.3 2003/08/07 21:17:04 dillon Exp $ */ /* @@ -105,9 +105,9 @@ #include -#include +#include #include "ppbus_if.h" -#include +#include #ifndef LPMTU /* MTU for the lp# interfaces */ #define LPMTU 1500 diff --git a/sys/dev/netif/ray/if_ray.c b/sys/dev/netif/ray/if_ray.c index 4458be902d..9cde3c7946 100644 --- a/sys/dev/netif/ray/if_ray.c +++ b/sys/dev/netif/ray/if_ray.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ray/if_ray.c,v 1.47.2.4 2001/08/14 22:54:05 dmlb Exp $ - * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.3 2003/07/19 21:14:26 dillon Exp $ + * $DragonFly: src/sys/dev/netif/ray/Attic/if_ray.c,v 1.4 2003/08/07 21:17:04 dillon Exp $ * */ @@ -267,13 +267,13 @@ #include -#include +#include #include "card_if.h" -#include -#include -#include -#include +#include "if_rayreg.h" +#include "if_raymib.h" +#include "if_raydbg.h" +#include "if_rayvar.h" /* * Prototyping diff --git a/sys/dev/netif/rdp/if_rdp.c b/sys/dev/netif/rdp/if_rdp.c index deb5eb6893..bf8be94eec 100644 --- a/sys/dev/netif/rdp/if_rdp.c +++ b/sys/dev/netif/rdp/if_rdp.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/if_rdp.c,v 1.6.2.2 2000/07/17 21:24:32 archie Exp $ - * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.3 2003/07/21 07:57:44 dillon Exp $ + * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.4 2003/08/07 21:17:04 dillon Exp $ */ /* @@ -62,7 +62,7 @@ * for this kind of service. */ -#include "rdp.h" +#include "use_rdp.h" #include #include @@ -94,9 +94,9 @@ #include #include -#include +#include #include -#include +#include "if_rdpreg.h" #include #define IOCTL_CMD_T u_long diff --git a/sys/dev/netif/rl/if_rl.c b/sys/dev/netif/rl/if_rl.c index 3eb09643c1..b68048a483 100644 --- a/sys/dev/netif/rl/if_rl.c +++ b/sys/dev/netif/rl/if_rl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.3 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/netif/rl/if_rl.c,v 1.4 2003/08/07 21:17:04 dillon Exp $ * * $FreeBSD: src/sys/pci/if_rl.c,v 1.38.2.16 2003/03/05 18:42:33 njl Exp $ */ @@ -112,11 +112,11 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include +#include +#include /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" @@ -131,7 +131,7 @@ */ #define RL_USEIOSPACE -#include +#include "if_rlreg.h" /* * Various supported device vendors/types and their names. diff --git a/sys/dev/netif/sbni/if_sbni.c b/sys/dev/netif/sbni/if_sbni.c index 15bd714f08..f50ee950a1 100644 --- a/sys/dev/netif/sbni/if_sbni.c +++ b/sys/dev/netif/sbni/if_sbni.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sbni/if_sbni.c,v 1.1.2.4 2002/08/11 09:32:00 fjoe Exp $ - * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.6 2003/07/26 18:09:03 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sbni/if_sbni.c,v 1.7 2003/08/07 21:17:04 dillon Exp $ */ /* @@ -80,8 +80,8 @@ #include #include -#include -#include +#include "if_sbnireg.h" +#include "if_sbnivar.h" #define ASM_CRC 1 diff --git a/sys/dev/netif/sbni/if_sbni_isa.c b/sys/dev/netif/sbni/if_sbni_isa.c index 41bde61161..ea1dcddd83 100644 --- a/sys/dev/netif/sbni/if_sbni_isa.c +++ b/sys/dev/netif/sbni/if_sbni_isa.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sbni/if_sbni_isa.c,v 1.1.2.5 2002/08/11 09:32:00 fjoe Exp $ - * $DragonFly: src/sys/dev/netif/sbni/Attic/if_sbni_isa.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sbni/Attic/if_sbni_isa.c,v 1.3 2003/08/07 21:17:04 dillon Exp $ */ @@ -45,10 +45,10 @@ #include #include -#include +#include -#include -#include +#include "if_sbnireg.h" +#include "if_sbnivar.h" static int sbni_probe_isa(device_t); static int sbni_attach_isa(device_t); diff --git a/sys/dev/netif/sbni/if_sbni_pci.c b/sys/dev/netif/sbni/if_sbni_pci.c index 1efd013e1f..814cc5ff46 100644 --- a/sys/dev/netif/sbni/if_sbni_pci.c +++ b/sys/dev/netif/sbni/if_sbni_pci.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sbni/if_sbni_pci.c,v 1.1.2.4 2002/08/11 09:32:00 fjoe Exp $ - * $DragonFly: src/sys/dev/netif/sbni/if_sbni_pci.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sbni/if_sbni_pci.c,v 1.3 2003/08/07 21:17:04 dillon Exp $ */ @@ -45,11 +45,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "if_sbnireg.h" +#include "if_sbnivar.h" static int sbni_pci_probe(device_t); static int sbni_pci_attach(device_t); diff --git a/sys/dev/netif/sbsh/if_sbsh.c b/sys/dev/netif/sbsh/if_sbsh.c index ac667e60f2..c64341030a 100644 --- a/sys/dev/netif/sbsh/if_sbsh.c +++ b/sys/dev/netif/sbsh/if_sbsh.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sbsh/if_sbsh.c,v 1.3.2.1 2003/04/15 18:15:07 fjoe Exp $ - * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.5 2003/07/19 21:14:27 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sbsh/if_sbsh.c,v 1.6 2003/08/07 21:17:04 dillon Exp $ */ #include @@ -53,10 +53,10 @@ #include #include -#include -#include +#include +#include -#include +#include "if_sbshreg.h" /* -------------------------------------------------------------------------- */ diff --git a/sys/dev/netif/sf/if_sf.c b/sys/dev/netif/sf/if_sf.c index 891d964a34..fb78bba614 100644 --- a/sys/dev/netif/sf/if_sf.c +++ b/sys/dev/netif/sf/if_sf.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $ - * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sf/if_sf.c,v 1.3 2003/08/07 21:17:05 dillon Exp $ * * $FreeBSD: src/sys/pci/if_sf.c,v 1.18.2.8 2001/12/16 15:46:07 luigi Exp $ */ @@ -108,18 +108,18 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" -#include -#include +#include +#include #define SF_USEIOSPACE -#include +#include "if_sfreg.h" static struct sf_type sf_devs[] = { { AD_VENDORID, AD_DEVICEID_STARFIRE, diff --git a/sys/dev/netif/sis/if_sis.c b/sys/dev/netif/sis/if_sis.c index 811ca28e04..65e650d13b 100644 --- a/sys/dev/netif/sis/if_sis.c +++ b/sys/dev/netif/sis/if_sis.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $ - * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.3 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/netif/sis/if_sis.c,v 1.4 2003/08/07 21:17:05 dillon Exp $ * * $FreeBSD: src/sys/pci/if_sis.c,v 1.13.4.24 2003/03/05 18:42:33 njl Exp $ */ @@ -75,7 +75,7 @@ #include #include #include -#include +#include #include @@ -89,15 +89,15 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include +#include +#include #define SIS_USEIOSPACE -#include +#include "if_sisreg.h" /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" diff --git a/sys/dev/netif/sk/if_sk.c b/sys/dev/netif/sk/if_sk.c index 9cdb6bc360..9d238939db 100644 --- a/sys/dev/netif/sk/if_sk.c +++ b/sys/dev/netif/sk/if_sk.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $ - * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.3 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/netif/sk/if_sk.c,v 1.4 2003/08/07 21:17:05 dillon Exp $ * * $FreeBSD: src/sys/pci/if_sk.c,v 1.19.2.9 2003/03/05 18:42:34 njl Exp $ */ @@ -98,17 +98,17 @@ #include #include -#include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" +#include "../mii_layer/brgphyreg.h" -#include -#include +#include +#include #define SK_USEIOSPACE -#include -#include +#include "if_skreg.h" +#include "xmaciireg.h" /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" diff --git a/sys/dev/netif/sn/if_sn.c b/sys/dev/netif/sn/if_sn.c index b0f041f234..8a0d3e8c3d 100644 --- a/sys/dev/netif/sn/if_sn.c +++ b/sys/dev/netif/sn/if_sn.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sn/if_sn.c,v 1.7.2.3 2001/02/04 04:38:38 toshi Exp $ - * $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.3 2003/07/26 14:25:25 rob Exp $ + * $DragonFly: src/sys/dev/netif/sn/if_sn.c,v 1.4 2003/08/07 21:17:05 dillon Exp $ */ /* @@ -123,8 +123,8 @@ #include -#include -#include +#include "if_snreg.h" +#include "if_snvar.h" /* Exported variables */ devclass_t sn_devclass; diff --git a/sys/dev/netif/sn/if_sn_isa.c b/sys/dev/netif/sn/if_sn_isa.c index b70a2bb10f..2cb960b02b 100644 --- a/sys/dev/netif/sn/if_sn_isa.c +++ b/sys/dev/netif/sn/if_sn_isa.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sn/if_sn_isa.c,v 1.3.2.1 2001/01/25 19:38:18 imp Exp $ - * $DragonFly: src/sys/dev/netif/sn/if_sn_isa.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sn/if_sn_isa.c,v 1.3 2003/08/07 21:17:05 dillon Exp $ */ #include @@ -45,9 +45,9 @@ #include #include -#include +#include -#include +#include "if_snvar.h" static int sn_isa_probe (device_t); static int sn_isa_attach (device_t); diff --git a/sys/dev/netif/sn/if_sn_pccard.c b/sys/dev/netif/sn/if_sn_pccard.c index c231ae6aad..f8a66d6e62 100644 --- a/sys/dev/netif/sn/if_sn_pccard.c +++ b/sys/dev/netif/sn/if_sn_pccard.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sn/if_sn_pccard.c,v 1.3.2.2 2001/01/25 19:40:27 imp Exp $ - * $DragonFly: src/sys/dev/netif/sn/if_sn_pccard.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sn/if_sn_pccard.c,v 1.3 2003/08/07 21:17:05 dillon Exp $ */ /* @@ -52,9 +52,9 @@ #include -#include -#include -#include +#include "if_snreg.h" +#include "if_snvar.h" +#include /* * Initialize the device - called from Slot manager. diff --git a/sys/dev/netif/snc/dp83932.c b/sys/dev/netif/snc/dp83932.c index c7e41549b1..d2f4c1b3d6 100644 --- a/sys/dev/netif/snc/dp83932.c +++ b/sys/dev/netif/snc/dp83932.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/snc/dp83932.c,v 1.1.2.2 2003/02/11 08:52:00 nyan Exp $ */ -/* $DragonFly: src/sys/dev/netif/snc/Attic/dp83932.c,v 1.3 2003/07/26 14:25:25 rob Exp $ */ +/* $DragonFly: src/sys/dev/netif/snc/Attic/dp83932.c,v 1.4 2003/08/07 21:17:05 dillon Exp $ */ /* $NecBSD: dp83932.c,v 1.5 1999/07/29 05:08:44 kmatsuda Exp $ */ /* $NetBSD: if_snc.c,v 1.18 1998/04/25 21:27:40 scottr Exp $ */ @@ -94,8 +94,8 @@ #include #include -#include -#include +#include "dp83932reg.h" +#include "dp83932var.h" hide void sncwatchdog __P((struct ifnet *)); hide void sncinit __P((void *)); diff --git a/sys/dev/netif/snc/dp83932subr.c b/sys/dev/netif/snc/dp83932subr.c index dee03296e3..3e2fe97d53 100644 --- a/sys/dev/netif/snc/dp83932subr.c +++ b/sys/dev/netif/snc/dp83932subr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/snc/dp83932subr.c,v 1.2.2.2 2003/06/01 04:24:50 nyan Exp $ */ -/* $DragonFly: src/sys/dev/netif/snc/Attic/dp83932subr.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/snc/Attic/dp83932subr.c,v 1.3 2003/08/07 21:17:05 dillon Exp $ */ /* $NecBSD: dp83932subr.c,v 1.5.6.2 1999/10/09 05:47:23 kmatsuda Exp $ */ /* $NetBSD$ */ @@ -77,10 +77,10 @@ #include #include -#include -#include -#include -#include +#include "dp83932reg.h" +#include "dp83932var.h" +#include "if_sncreg.h" +#include "dp83932subr.h" integrate u_int16_t snc_nec16_select_bank __P((struct snc_softc *, u_int32_t, u_int32_t)); diff --git a/sys/dev/netif/snc/if_snc.c b/sys/dev/netif/snc/if_snc.c index ef6b929c60..8dde7e1529 100644 --- a/sys/dev/netif/snc/if_snc.c +++ b/sys/dev/netif/snc/if_snc.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/snc/if_snc.c,v 1.2.2.1 2000/10/21 03:30:03 nyan Exp $ - * $DragonFly: src/sys/dev/netif/snc/Attic/if_snc.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/netif/snc/Attic/if_snc.c,v 1.3 2003/08/07 21:17:05 dillon Exp $ */ /* @@ -61,11 +61,11 @@ #include #endif -#include -#include -#include -#include -#include +#include "dp83932reg.h" +#include "dp83932var.h" +#include "dp83932subr.h" +#include "if_sncreg.h" +#include "if_sncvar.h" /* devclass for "snc" */ devclass_t snc_devclass; diff --git a/sys/dev/netif/snc/if_snc_cbus.c b/sys/dev/netif/snc/if_snc_cbus.c index 1a8a25be71..f9778fe26d 100644 --- a/sys/dev/netif/snc/if_snc_cbus.c +++ b/sys/dev/netif/snc/if_snc_cbus.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/snc/if_snc_cbus.c,v 1.1.2.1 2000/10/21 03:30:03 nyan Exp $ - * $DragonFly: src/sys/dev/netif/snc/Attic/if_snc_cbus.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/netif/snc/Attic/if_snc_cbus.c,v 1.3 2003/08/07 21:17:05 dillon Exp $ */ /* @@ -52,15 +52,15 @@ #include #include -#include -#include +#include +#include #include /* as dependency for isa/isa_common.h */ -#include /* for snc_isapnp_reconfig() */ +#include /* for snc_isapnp_reconfig() */ -#include -#include -#include -#include +#include "dp83932var.h" +#include "dp83932subr.h" +#include "if_sncreg.h" +#include "if_sncvar.h" static void snc_isapnp_reconfig __P((device_t)); static int snc_isa_probe __P((device_t)); diff --git a/sys/dev/netif/snc/if_snc_pccard.c b/sys/dev/netif/snc/if_snc_pccard.c index 2f984a3d66..012c43a345 100644 --- a/sys/dev/netif/snc/if_snc_pccard.c +++ b/sys/dev/netif/snc/if_snc_pccard.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/snc/if_snc_pccard.c,v 1.1.2.1 2000/10/21 03:30:03 nyan Exp $ - * $DragonFly: src/sys/dev/netif/snc/Attic/if_snc_pccard.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/netif/snc/Attic/if_snc_pccard.c,v 1.3 2003/08/07 21:17:05 dillon Exp $ */ /* @@ -53,10 +53,10 @@ #include -#include -#include -#include -#include +#include "dp83932var.h" +#include "dp83932reg.h" +#include "if_sncvar.h" +#include "if_sncreg.h" /* * PC-Card (PCMCIA) specific code. diff --git a/sys/dev/netif/sr/if_sr.c b/sys/dev/netif/sr/if_sr.c index 580295cf1c..d0a44a9525 100644 --- a/sys/dev/netif/sr/if_sr.c +++ b/sys/dev/netif/sr/if_sr.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sr/if_sr.c,v 1.48.2.1 2002/06/17 15:10:58 jhay Exp $ - * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.2 2003/06/17 04:28:31 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sr/if_sr.c,v 1.3 2003/08/07 21:17:05 dillon Exp $ */ /* @@ -50,7 +50,7 @@ #include "opt_netgraph.h" #ifdef NETGRAPH -#include +#include "if_sr.h" #endif /* NETGRAPH */ #include @@ -78,8 +78,8 @@ #include -#include -#include +#include "../ic_layer/hd64570.h" +#include "if_srregs.h" #ifdef NETGRAPH #include diff --git a/sys/dev/netif/sr/if_sr_isa.c b/sys/dev/netif/sr/if_sr_isa.c index a1ef491cf8..eac191d629 100644 --- a/sys/dev/netif/sr/if_sr_isa.c +++ b/sys/dev/netif/sr/if_sr_isa.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sr/if_sr_isa.c,v 1.46.2.1 2002/06/17 15:10:58 jhay Exp $ - * $DragonFly: src/sys/dev/netif/sr/if_sr_isa.c,v 1.2 2003/06/17 04:28:31 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sr/if_sr_isa.c,v 1.3 2003/08/07 21:17:05 dillon Exp $ */ #include @@ -46,11 +46,11 @@ #include #include -#include +#include #include "isa_if.h" -#include -#include +#include "../ic_layer/hd64570.h" +#include "if_srregs.h" /* * List of valid interrupt numbers for the N2 ISA card. diff --git a/sys/dev/netif/sr/if_sr_pci.c b/sys/dev/netif/sr/if_sr_pci.c index 2ddb61cbe4..be217bf21f 100644 --- a/sys/dev/netif/sr/if_sr_pci.c +++ b/sys/dev/netif/sr/if_sr_pci.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sr/if_sr_pci.c,v 1.15.2.1 2002/06/17 15:10:58 jhay Exp $ - * $DragonFly: src/sys/dev/netif/sr/if_sr_pci.c,v 1.2 2003/06/17 04:28:31 dillon Exp $ + * $DragonFly: src/sys/dev/netif/sr/if_sr_pci.c,v 1.3 2003/08/07 21:17:05 dillon Exp $ */ @@ -43,11 +43,11 @@ #include #include -#include +#include #include -#include -#include +#include "../ic_layer/hd64570.h" +#include "if_srregs.h" #ifndef BUGGY #define BUGGY 0 diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c index 429d1266fd..fbbc0264fa 100644 --- a/sys/dev/netif/ste/if_ste.c +++ b/sys/dev/netif/ste/if_ste.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.3 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.4 2003/08/07 21:17:05 dillon Exp $ * * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $ */ @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include @@ -62,18 +62,18 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include +#include +#include /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" #define STE_USEIOSPACE -#include +#include "if_stereg.h" /* * Various supported device vendors/types and their names. diff --git a/sys/dev/netif/ti/if_ti.c b/sys/dev/netif/ti/if_ti.c index 318efed85c..aa335f5afe 100644 --- a/sys/dev/netif/ti/if_ti.c +++ b/sys/dev/netif/ti/if_ti.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.3 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/netif/ti/if_ti.c,v 1.4 2003/08/07 21:17:05 dillon Exp $ * * $FreeBSD: src/sys/pci/if_ti.c,v 1.25.2.14 2002/02/15 04:20:20 silby Exp $ */ @@ -96,7 +96,7 @@ #include #include #include -#include +#include #include @@ -113,12 +113,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "if_tireg.h" +#include "ti_fw.h" +#include "ti_fw2.h" /* * Temporarily disable the checksum offload support for now. diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c index f412935d5d..4e487c9825 100644 --- a/sys/dev/netif/tl/if_tl.c +++ b/sys/dev/netif/tl/if_tl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $ - * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.3 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.4 2003/08/07 21:17:06 dillon Exp $ * * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $ */ @@ -207,11 +207,11 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include +#include +#include /* * Default to using PIO register access mode to pacify certain @@ -220,7 +220,7 @@ */ #define TL_USEIOSPACE -#include +#include "if_tlreg.h" /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" diff --git a/sys/dev/netif/tx/if_tx.c b/sys/dev/netif/tx/if_tx.c index ea8df34919..1ee84e19ca 100644 --- a/sys/dev/netif/tx/if_tx.c +++ b/sys/dev/netif/tx/if_tx.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/tx/if_tx.c,v 1.61.2.1 2002/10/29 01:43:49 semenu Exp $ - * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.3 2003/07/26 14:25:26 rob Exp $ + * $DragonFly: src/sys/dev/netif/tx/if_tx.c,v 1.4 2003/08/07 21:17:06 dillon Exp $ */ /* @@ -56,7 +56,7 @@ #include -#include +#include #include /* for vtophys */ #include /* for vtophys */ @@ -68,19 +68,18 @@ #include #include -#include -#include +#include +#include -#include -#include -#include - -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" +#include "../mii_layer/miidevs.h" +#include "../mii_layer/lxtphyreg.h" #include "miibus_if.h" -#include -#include +#include "if_txreg.h" +#include "if_txvar.h" MODULE_DEPEND(tx, miibus, 1, 1, 1); diff --git a/sys/dev/netif/txp/if_txp.c b/sys/dev/netif/txp/if_txp.c index 5ab523a61f..d9171d0129 100644 --- a/sys/dev/netif/txp/if_txp.c +++ b/sys/dev/netif/txp/if_txp.c @@ -1,6 +1,6 @@ /* $OpenBSD: if_txp.c,v 1.48 2001/06/27 06:34:50 kjc Exp $ */ /* $FreeBSD: src/sys/dev/txp/if_txp.c,v 1.4.2.4 2001/12/14 19:50:43 jlemon Exp $ */ -/* $DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/txp/if_txp.c,v 1.3 2003/08/07 21:17:06 dillon Exp $ */ /* * Copyright (c) 2001 @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include @@ -78,16 +78,16 @@ #include #include -#include -#include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" +#include +#include #define TXP_USEIOSPACE #define __STRICT_ALIGNMENT -#include -#include +#include "if_txpreg.h" +#include "3c990img.h" /* * Various supported device vendors/types and their names. diff --git a/sys/dev/netif/vr/if_vr.c b/sys/dev/netif/vr/if_vr.c index 96a76949b9..a717af835d 100644 --- a/sys/dev/netif/vr/if_vr.c +++ b/sys/dev/netif/vr/if_vr.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $ - * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.3 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/netif/vr/if_vr.c,v 1.4 2003/08/07 21:17:06 dillon Exp $ * * $FreeBSD: src/sys/pci/if_vr.c,v 1.26.2.13 2003/02/06 04:46:20 silby Exp $ */ @@ -88,15 +88,15 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include +#include +#include #define VR_USEIOSPACE -#include +#include "if_vrreg.h" /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" diff --git a/sys/dev/netif/vx/if_vx.c b/sys/dev/netif/vx/if_vx.c index 5f2bd0ba4d..a90b1327e1 100644 --- a/sys/dev/netif/vx/if_vx.c +++ b/sys/dev/netif/vx/if_vx.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/vx/if_vx.c,v 1.25.2.6 2002/02/13 00:43:10 dillon Exp $ - * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.3 2003/07/26 14:25:27 rob Exp $ + * $DragonFly: src/sys/dev/netif/vx/if_vx.c,v 1.4 2003/08/07 21:17:06 dillon Exp $ * */ @@ -55,7 +55,7 @@ * babkin@hq.icb.chel.su */ -#include "vx.h" +#include "use_vx.h" #if NVX < 4 /* These cost 4 bytes apiece, so give us 4 */ #undef NVX @@ -79,7 +79,7 @@ #include -#include +#include "if_vxreg.h" #define ETHER_MAX_LEN 1518 #define ETHER_ADDR_LEN 6 diff --git a/sys/dev/netif/vx/if_vx_eisa.c b/sys/dev/netif/vx/if_vx_eisa.c index 59c0dade55..1c2e47a1d1 100644 --- a/sys/dev/netif/vx/if_vx_eisa.c +++ b/sys/dev/netif/vx/if_vx_eisa.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/vx/if_vx_eisa.c,v 1.14 2000/01/29 14:50:31 peter Exp $ - * $DragonFly: src/sys/dev/netif/vx/if_vx_eisa.c,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sys/dev/netif/vx/if_vx_eisa.c,v 1.3 2003/08/07 21:17:06 dillon Exp $ */ #include @@ -44,9 +44,9 @@ #include #include -#include +#include -#include +#include "if_vxreg.h" #define EISA_DEVICE_ID_3COM_3C592 0x506d5920 #define EISA_DEVICE_ID_3COM_3C597_TX 0x506d5970 diff --git a/sys/dev/netif/vx/if_vx_pci.c b/sys/dev/netif/vx/if_vx_pci.c index e7d3fee4fd..8b6cbbf113 100644 --- a/sys/dev/netif/vx/if_vx_pci.c +++ b/sys/dev/netif/vx/if_vx_pci.c @@ -27,10 +27,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/vx/if_vx_pci.c,v 1.20 2000/01/29 14:50:32 peter Exp $ - * $DragonFly: src/sys/dev/netif/vx/if_vx_pci.c,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sys/dev/netif/vx/if_vx_pci.c,v 1.3 2003/08/07 21:17:06 dillon Exp $ */ -#include "vx.h" +#include "use_vx.h" #include #include @@ -41,9 +41,9 @@ #include #include -#include +#include -#include +#include "if_vxreg.h" static void vx_pci_shutdown(void *, int); static const char *vx_pci_probe(pcici_t, pcidi_t); diff --git a/sys/dev/netif/wb/if_wb.c b/sys/dev/netif/wb/if_wb.c index a3795b7273..804396f34d 100644 --- a/sys/dev/netif/wb/if_wb.c +++ b/sys/dev/netif/wb/if_wb.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $ - * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.3 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/netif/wb/if_wb.c,v 1.4 2003/08/07 21:17:06 dillon Exp $ * * $FreeBSD: src/sys/pci/if_wb.c,v 1.26.2.6 2003/03/05 18:42:34 njl Exp $ */ @@ -115,18 +115,18 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" /* "controller miibus0" required. See GENERIC if you get errors here. */ #include "miibus_if.h" #define WB_USEIOSPACE -#include +#include "if_wbreg.h" /* * Various supported device vendors/types and their names. diff --git a/sys/dev/netif/wi/if_wi.c b/sys/dev/netif/wi/if_wi.c index 1a0971490c..f1447c1439 100644 --- a/sys/dev/netif/wi/if_wi.c +++ b/sys/dev/netif/wi/if_wi.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/wi/if_wi.c,v 1.103.2.2 2002/08/02 07:11:34 imp Exp $ - * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.4 2003/06/25 03:55:51 dillon Exp $ + * $DragonFly: src/sys/dev/netif/wi/if_wi.c,v 1.5 2003/08/07 21:17:06 dillon Exp $ */ /* @@ -99,10 +99,10 @@ #include -#include -#include -#include -#include +#include "if_wavelan_ieee.h" +#include "wi_hostap.h" +#include "if_wivar.h" +#include "if_wireg.h" static void wi_intr(void *); static void wi_reset(struct wi_softc *); diff --git a/sys/dev/netif/wi/if_wi_pccard.c b/sys/dev/netif/wi/if_wi_pccard.c index 263864e5ad..135d069a7b 100644 --- a/sys/dev/netif/wi/if_wi_pccard.c +++ b/sys/dev/netif/wi/if_wi_pccard.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/wi/if_wi_pccard.c,v 1.8.2.2 2002/08/02 07:11:34 imp Exp $ - * $DragonFly: src/sys/dev/netif/wi/if_wi_pccard.c,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sys/dev/netif/wi/if_wi_pccard.c,v 1.3 2003/08/07 21:17:06 dillon Exp $ */ /* @@ -60,15 +60,15 @@ #include #include -#include +#include #if __FreeBSD_version >= 500000 -#include +#include #endif -#include -#include -#include -#include +#include "if_wavelan_ieee.h" +#include "wi_hostap.h" +#include "if_wivar.h" +#include "if_wireg.h" #include "card_if.h" diff --git a/sys/dev/netif/wi/if_wi_pci.c b/sys/dev/netif/wi/if_wi_pci.c index 377b4a06a2..a3379c63d5 100644 --- a/sys/dev/netif/wi/if_wi_pci.c +++ b/sys/dev/netif/wi/if_wi_pci.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/wi/if_wi_pci.c,v 1.8.2.3 2002/06/16 18:07:18 nsayer Exp $ - * $DragonFly: src/sys/dev/netif/wi/if_wi_pci.c,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sys/dev/netif/wi/if_wi_pci.c,v 1.3 2003/08/07 21:17:06 dillon Exp $ */ /* @@ -53,8 +53,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -63,10 +63,10 @@ #include #include -#include -#include -#include -#include +#include "if_wavelan_ieee.h" +#include "wi_hostap.h" +#include "if_wivar.h" +#include "if_wireg.h" static int wi_pci_probe(device_t); static int wi_pci_attach(device_t); diff --git a/sys/dev/netif/wi/wi_hostap.c b/sys/dev/netif/wi/wi_hostap.c index c78aeac064..6febb4436a 100644 --- a/sys/dev/netif/wi/wi_hostap.c +++ b/sys/dev/netif/wi/wi_hostap.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/wi/wi_hostap.c,v 1.7.2.4 2002/08/02 07:11:34 imp Exp $ - * $DragonFly: src/sys/dev/netif/wi/Attic/wi_hostap.c,v 1.4 2003/06/25 03:55:51 dillon Exp $ + * $DragonFly: src/sys/dev/netif/wi/Attic/wi_hostap.c,v 1.5 2003/08/07 21:17:06 dillon Exp $ */ /* This is experimental Host AP software for Prism 2 802.11b interfaces. @@ -78,10 +78,10 @@ #include #include -#include -#include -#include -#include +#include "if_wavelan_ieee.h" +#include "wi_hostap.h" +#include "if_wivar.h" +#include "if_wireg.h" MALLOC_DEFINE(M_HAP_STA, "hostap_sta", "if_wi host AP mode station entry"); diff --git a/sys/dev/netif/wl/if_wl.c b/sys/dev/netif/wl/if_wl.c index 3f640cb0fe..2ec37ceb63 100644 --- a/sys/dev/netif/wl/if_wl.c +++ b/sys/dev/netif/wl/if_wl.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/isa/if_wl.c,v 1.27.2.2 2000/07/17 21:24:32 archie Exp $ */ -/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.4 2003/07/26 19:07:48 rob Exp $ */ +/* $DragonFly: src/sys/dev/netif/wl/if_wl.c,v 1.5 2003/08/07 21:17:06 dillon Exp $ */ /* * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -189,7 +189,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * transmit buffer available in sram space. */ -#include "wl.h" +#include "use_wl.h" #include "opt_wavelan.h" #include "opt_inet.h" @@ -219,13 +219,12 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include -#include - -#include /* Definitions for the Intel chip */ +#include +#include "if_wl_i82586.h" /* Definitions for the Intel chip */ /* was 1000 in original, fed to DELAY(x) */ #define DELAYCONST 1000 -#include +#include "if_wl.h" #include static char t_packet[ETHERMTU + sizeof(struct ether_header) + sizeof(long)]; diff --git a/sys/dev/netif/wx/if_wx.c b/sys/dev/netif/wx/if_wx.c index 1c3aa7b59a..ac75fd4db1 100644 --- a/sys/dev/netif/wx/if_wx.c +++ b/sys/dev/netif/wx/if_wx.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/pci/if_wx.c,v 1.5.2.12 2003/03/05 18:42:34 njl Exp $ */ -/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wx.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wx.c,v 1.3 2003/08/07 21:17:06 dillon Exp $ */ /* * Principal Author: Matthew Jacob * Copyright (c) 1999, 2001 by Traakan Software @@ -62,7 +62,7 @@ * Since the includes are a mess, they'll all be in if_wxvar.h */ -#include +#include "if_wxvar.h" #ifdef __alpha__ #undef vtophys diff --git a/sys/dev/netif/wx/if_wxvar.h b/sys/dev/netif/wx/if_wxvar.h index 951e1efa85..4758c371b4 100644 --- a/sys/dev/netif/wx/if_wxvar.h +++ b/sys/dev/netif/wx/if_wxvar.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/pci/if_wxvar.h,v 1.4.2.6 2001/10/20 17:44:12 mjacob Exp $ */ -/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wxvar.h,v 1.2 2003/06/17 04:28:57 dillon Exp $ */ +/* $DragonFly: src/sys/dev/netif/wx/Attic/if_wxvar.h,v 1.3 2003/08/07 21:17:06 dillon Exp $ */ /* * Principal Author: Matthew Jacob * Copyright (c) 1999, 2001 by Traakan Software @@ -73,11 +73,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include "if_wxreg.h" +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" #include #define NBPFILTER 1 diff --git a/sys/dev/netif/xe/if_xe.c b/sys/dev/netif/xe/if_xe.c index 6c868bc678..97f76fbca6 100644 --- a/sys/dev/netif/xe/if_xe.c +++ b/sys/dev/netif/xe/if_xe.c @@ -25,7 +25,7 @@ * * $Id: if_xe.c,v 1.20 1999/06/13 19:17:40 scott Exp $ * $FreeBSD: src/sys/dev/xe/if_xe.c,v 1.13.2.6 2003/02/05 22:03:57 mbr Exp $ - * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.4 2003/07/26 14:25:27 rob Exp $ + * $DragonFly: src/sys/dev/netif/xe/if_xe.c,v 1.5 2003/08/07 21:17:07 dillon Exp $ */ /* @@ -135,11 +135,11 @@ #include #include -#include +#include #include "card_if.h" -#include -#include +#include "if_xereg.h" +#include "if_xevar.h" #include diff --git a/sys/dev/netif/xl/if_xl.c b/sys/dev/netif/xl/if_xl.c index 4e851cf422..1fe6438df9 100644 --- a/sys/dev/netif/xl/if_xl.c +++ b/sys/dev/netif/xl/if_xl.c @@ -30,7 +30,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.25 2003/02/05 22:03:58 mbr Exp $ - * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.3 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/netif/xl/if_xl.c,v 1.4 2003/08/07 21:17:07 dillon Exp $ * * $FreeBSD: src/sys/pci/if_xl.c,v 1.72.2.25 2003/02/05 22:03:58 mbr Exp $ */ @@ -130,11 +130,11 @@ #include #include -#include -#include +#include "../mii_layer/mii.h" +#include "../mii_layer/miivar.h" -#include -#include +#include +#include MODULE_DEPEND(xl, miibus, 1, 1, 1); @@ -153,7 +153,7 @@ MODULE_DEPEND(xl, miibus, 1, 1, 1); */ #define XL_USEIOSPACE -#include +#include "if_xlreg.h" #define XL905B_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) diff --git a/sys/dev/powermng/i386/alpm/alpm.c b/sys/dev/powermng/i386/alpm/alpm.c index 4f82d7fd91..45373ed646 100644 --- a/sys/dev/powermng/i386/alpm/alpm.c +++ b/sys/dev/powermng/i386/alpm/alpm.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/alpm.c,v 1.8 1999/12/03 08:41:21 mdodd Exp $ - * $DragonFly: src/sys/dev/powermng/i386/alpm/alpm.c,v 1.3 2003/07/23 02:30:23 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/i386/alpm/alpm.c,v 1.4 2003/08/07 21:17:07 dillon Exp $ * */ @@ -47,14 +47,14 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include #include "smbus_if.h" -#include "alpm.h" +#include "use_alpm.h" #define ALPM_DEBUG(x) if (alpm_debug) (x) diff --git a/sys/dev/powermng/i386/amdpm/amdpm.c b/sys/dev/powermng/i386/amdpm/amdpm.c index 0a02f0bae3..bb471a71fa 100644 --- a/sys/dev/powermng/i386/amdpm/amdpm.c +++ b/sys/dev/powermng/i386/amdpm/amdpm.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/amdpm.c,v 1.1.2.1 2001/10/10 12:10:26 murray Exp $ - * $DragonFly: src/sys/dev/powermng/i386/amdpm/amdpm.c,v 1.3 2003/07/23 02:30:23 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/i386/amdpm/amdpm.c,v 1.4 2003/08/07 21:17:07 dillon Exp $ * */ @@ -50,11 +50,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include #include "smbus_if.h" #define AMDPM_DEBUG(x) if (amdpm_debug) (x) diff --git a/sys/dev/powermng/i386/intpm/intpm.c b/sys/dev/powermng/i386/intpm/intpm.c index 34cbee069a..d1e8b1a193 100644 --- a/sys/dev/powermng/i386/intpm/intpm.c +++ b/sys/dev/powermng/i386/intpm/intpm.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/intpm.c,v 1.16.2.1 2001/12/23 08:17:47 pirzyk Exp $ - * $DragonFly: src/sys/dev/powermng/i386/intpm/intpm.c,v 1.3 2003/07/19 21:14:49 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/i386/intpm/intpm.c,v 1.4 2003/08/07 21:17:07 dillon Exp $ */ #include @@ -43,16 +43,16 @@ #include #include #include -#include +#include #include "smbus_if.h" /*This should be removed if force_pci_map_int supported*/ #include -#include -#include -#include +#include +#include +#include "intpmreg.h" #include "opt_intpm.h" diff --git a/sys/dev/powermng/i386/viapm/viapm.c b/sys/dev/powermng/i386/viapm/viapm.c index 0b6856cdf6..d631ed5b54 100644 --- a/sys/dev/powermng/i386/viapm/viapm.c +++ b/sys/dev/powermng/i386/viapm/viapm.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/viapm.c,v 1.1.2.1 2002/04/19 05:52:15 nsouch Exp $ - * $DragonFly: src/sys/dev/powermng/i386/viapm/viapm.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/i386/viapm/viapm.c,v 1.3 2003/08/07 21:17:07 dillon Exp $ * */ #include @@ -42,14 +42,14 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include +#include +#include #include "iicbb_if.h" #include "smbus_if.h" diff --git a/sys/dev/powermng/ichsmb/ichsmb.c b/sys/dev/powermng/ichsmb/ichsmb.c index 88d84a0577..4a1ebfc7ca 100644 --- a/sys/dev/powermng/ichsmb/ichsmb.c +++ b/sys/dev/powermng/ichsmb/ichsmb.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/dev/ichsmb/ichsmb.c,v 1.1.2.1 2000/10/09 00:52:43 archie Exp $ - * $DragonFly: src/sys/dev/powermng/ichsmb/ichsmb.c,v 1.3 2003/07/19 21:14:21 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/ichsmb/ichsmb.c,v 1.4 2003/08/07 21:17:07 dillon Exp $ */ /* @@ -56,10 +56,10 @@ #include #include -#include +#include -#include -#include +#include "ichsmb_var.h" +#include "ichsmb_reg.h" /* * Enable debugging by defining ICHSMB_DEBUG to a non-zero value. diff --git a/sys/dev/powermng/ichsmb/ichsmb_pci.c b/sys/dev/powermng/ichsmb/ichsmb_pci.c index c19e276315..42d54653bd 100644 --- a/sys/dev/powermng/ichsmb/ichsmb_pci.c +++ b/sys/dev/powermng/ichsmb/ichsmb_pci.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/dev/ichsmb/ichsmb_pci.c,v 1.1.2.3 2002/10/20 14:57:19 nyan Exp $ - * $DragonFly: src/sys/dev/powermng/ichsmb/ichsmb_pci.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/ichsmb/ichsmb_pci.c,v 1.3 2003/08/07 21:17:07 dillon Exp $ */ /* @@ -56,13 +56,13 @@ #include #include -#include -#include +#include +#include -#include +#include -#include -#include +#include "ichsmb_var.h" +#include "ichsmb_reg.h" /* PCI unique identifiers */ #define ID_82801AA 0x24138086 diff --git a/sys/dev/powermng/pc98/pmc/pmc.c b/sys/dev/powermng/pc98/pmc/pmc.c index 81f0a3f082..6475bdc5b5 100644 --- a/sys/dev/powermng/pc98/pmc/pmc.c +++ b/sys/dev/powermng/pc98/pmc/pmc.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pc98/pc98/pmc.c,v 1.2.2.1 2001/11/01 09:42:29 nyan Exp $ - * $DragonFly: src/sys/dev/powermng/pc98/pmc/Attic/pmc.c,v 1.2 2003/06/17 04:28:55 dillon Exp $ + * $DragonFly: src/sys/dev/powermng/pc98/pmc/Attic/pmc.c,v 1.3 2003/08/07 21:17:07 dillon Exp $ */ #include @@ -44,7 +44,7 @@ #include #include -#include +#include struct pmc_isa_softc { struct resource *port_res; diff --git a/sys/dev/raid/aac/aac.c b/sys/dev/raid/aac/aac.c index 71dcf8b45c..3d670ae0a1 100644 --- a/sys/dev/raid/aac/aac.c +++ b/sys/dev/raid/aac/aac.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aac/aac.c,v 1.9.2.14 2003/04/08 13:22:08 scottl Exp $ - * $DragonFly: src/sys/dev/raid/aac/aac.c,v 1.7 2003/07/23 02:30:14 dillon Exp $ + * $DragonFly: src/sys/dev/raid/aac/aac.c,v 1.8 2003/08/07 21:17:07 dillon Exp $ */ /* @@ -50,7 +50,7 @@ #include #endif -#include +#include "aac_compat.h" #include #include @@ -64,11 +64,11 @@ #include #include -#include -#include -#include -#include -#include +#include "aacreg.h" +#include "aac_ioctl.h" +#include "aacvar.h" +#include "aac_tables.h" +#include "aac_cam.h" static void aac_startup(void *arg); static void aac_add_container(struct aac_softc *sc, diff --git a/sys/dev/raid/aac/aac_cam.c b/sys/dev/raid/aac/aac_cam.c index ab51207a2f..103d5388f4 100644 --- a/sys/dev/raid/aac/aac_cam.c +++ b/sys/dev/raid/aac/aac_cam.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aac/aac_cam.c,v 1.2.2.4 2003/04/08 13:22:08 scottl Exp $ - * $DragonFly: src/sys/dev/raid/aac/aac_cam.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/raid/aac/aac_cam.c,v 1.3 2003/08/07 21:17:07 dillon Exp $ */ /* @@ -39,15 +39,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include +#include "aac_compat.h" #include #include #include @@ -60,10 +60,10 @@ #include #include -#include -#include -#include -#include +#include "aacreg.h" +#include "aac_ioctl.h" +#include "aacvar.h" +#include "aac_cam.h" struct aac_cam { device_t dev; diff --git a/sys/dev/raid/aac/aac_debug.c b/sys/dev/raid/aac/aac_debug.c index c9b8f13b2e..c0202120ba 100644 --- a/sys/dev/raid/aac/aac_debug.c +++ b/sys/dev/raid/aac/aac_debug.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aac/aac_debug.c,v 1.2.2.5 2003/01/11 18:39:39 scottl Exp $ - * $DragonFly: src/sys/dev/raid/aac/aac_debug.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/raid/aac/aac_debug.c,v 1.3 2003/08/07 21:17:07 dillon Exp $ */ /* @@ -39,7 +39,7 @@ #include #include -#include +#include "aac_compat.h" #include #include #include @@ -47,9 +47,9 @@ #include #include -#include -#include -#include +#include "aacreg.h" +#include "aac_ioctl.h" +#include "aacvar.h" #ifdef AAC_DEBUG void aac_printstate0(void); diff --git a/sys/dev/raid/aac/aac_disk.c b/sys/dev/raid/aac/aac_disk.c index 8176f80713..cdfa558cc8 100644 --- a/sys/dev/raid/aac/aac_disk.c +++ b/sys/dev/raid/aac/aac_disk.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.3.2.8 2003/01/11 18:39:39 scottl Exp $ - * $DragonFly: src/sys/dev/raid/aac/aac_disk.c,v 1.4 2003/07/22 17:03:27 dillon Exp $ + * $DragonFly: src/sys/dev/raid/aac/aac_disk.c,v 1.5 2003/08/07 21:17:07 dillon Exp $ */ #include "opt_aac.h" @@ -37,7 +37,7 @@ #include #include -#include +#include "aac_compat.h" #include #include #include @@ -50,9 +50,9 @@ #include #include -#include -#include -#include +#include "aacreg.h" +#include "aac_ioctl.h" +#include "aacvar.h" /* * Interface to parent. diff --git a/sys/dev/raid/aac/aac_linux.c b/sys/dev/raid/aac/aac_linux.c index 10e2a350c6..04b06ef65b 100644 --- a/sys/dev/raid/aac/aac_linux.c +++ b/sys/dev/raid/aac/aac_linux.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aac/aac_linux.c,v 1.1.4.1 2003/03/28 19:50:17 scottl Exp $ - * $DragonFly: src/sys/dev/raid/aac/aac_linux.c,v 1.3 2003/06/25 03:55:45 dillon Exp $ + * $DragonFly: src/sys/dev/raid/aac/aac_linux.c,v 1.4 2003/08/07 21:17:07 dillon Exp $ */ #include @@ -37,9 +37,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include /* There are multiple ioctl number ranges that need to be handled */ #define AAC_LINUX_IOCTL_MIN 0x0000 diff --git a/sys/dev/raid/aac/aac_pci.c b/sys/dev/raid/aac/aac_pci.c index 252abd7375..3f56efb509 100644 --- a/sys/dev/raid/aac/aac_pci.c +++ b/sys/dev/raid/aac/aac_pci.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.3.2.18 2003/04/08 13:22:08 scottl Exp $ - * $DragonFly: src/sys/dev/raid/aac/aac_pci.c,v 1.2 2003/06/17 04:28:21 dillon Exp $ + * $DragonFly: src/sys/dev/raid/aac/aac_pci.c,v 1.3 2003/08/07 21:17:07 dillon Exp $ */ /* @@ -40,7 +40,7 @@ #include #include -#include +#include "aac_compat.h" #include #include #include @@ -51,12 +51,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "aacreg.h" +#include "aac_ioctl.h" +#include "aacvar.h" static int aac_pci_probe(device_t dev); static int aac_pci_attach(device_t dev); diff --git a/sys/dev/raid/amr/amr.c b/sys/dev/raid/amr/amr.c index 62b7c3420a..b22e16f120 100644 --- a/sys/dev/raid/amr/amr.c +++ b/sys/dev/raid/amr/amr.c @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/amr/amr.c,v 1.7.2.13 2003/01/15 13:41:18 emoore Exp $ - * $DragonFly: src/sys/dev/raid/amr/amr.c,v 1.4 2003/07/21 05:50:26 dillon Exp $ + * $DragonFly: src/sys/dev/raid/amr/amr.c,v 1.5 2003/08/07 21:17:08 dillon Exp $ */ /* @@ -65,7 +65,7 @@ #include #include -#include +#include "amr_compat.h" #include #include #include @@ -78,14 +78,14 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "amrio.h" +#include "amrreg.h" +#include "amrvar.h" #define AMR_DEFINE_TABLES -#include +#include "amr_tables.h" #define AMR_CDEV_MAJOR 132 diff --git a/sys/dev/raid/amr/amr_cam.c b/sys/dev/raid/amr/amr_cam.c index 3afd387d42..c18d9e549d 100644 --- a/sys/dev/raid/amr/amr_cam.c +++ b/sys/dev/raid/amr/amr_cam.c @@ -53,7 +53,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/amr/amr_cam.c,v 1.1.2.3 2002/11/11 13:19:10 emoore Exp $ - * $DragonFly: src/sys/dev/raid/amr/amr_cam.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/raid/amr/amr_cam.c,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ #include @@ -61,27 +61,27 @@ #include #include -#include +#include "amr_compat.h" #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include +#include "amrreg.h" +#include "amrvar.h" static void amr_cam_action(struct cam_sim *sim, union ccb *ccb); static void amr_cam_poll(struct cam_sim *sim); diff --git a/sys/dev/raid/amr/amr_disk.c b/sys/dev/raid/amr/amr_disk.c index 16995bf800..2934d45289 100644 --- a/sys/dev/raid/amr/amr_disk.c +++ b/sys/dev/raid/amr/amr_disk.c @@ -54,7 +54,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/amr/amr_disk.c,v 1.5.2.5 2002/12/20 15:12:04 emoore Exp $ - * $DragonFly: src/sys/dev/raid/amr/amr_disk.c,v 1.4 2003/07/22 17:03:27 dillon Exp $ + * $DragonFly: src/sys/dev/raid/amr/amr_disk.c,v 1.5 2003/08/07 21:17:08 dillon Exp $ */ /* @@ -65,7 +65,7 @@ #include #include -#include +#include "amr_compat.h" #include #include #include @@ -74,10 +74,10 @@ #include #include -#include -#include -#include -#include +#include "amrio.h" +#include "amrreg.h" +#include "amrvar.h" +#include "amr_tables.h" /* prototypes */ static int amrd_probe(device_t dev); diff --git a/sys/dev/raid/amr/amr_pci.c b/sys/dev/raid/amr/amr_pci.c index 06439b4f76..6f0ff637a8 100644 --- a/sys/dev/raid/amr/amr_pci.c +++ b/sys/dev/raid/amr/amr_pci.c @@ -53,14 +53,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/amr/amr_pci.c,v 1.1.2.9 2002/12/20 15:12:04 emoore Exp $ - * $DragonFly: src/sys/dev/raid/amr/amr_pci.c,v 1.2 2003/06/17 04:28:22 dillon Exp $ + * $DragonFly: src/sys/dev/raid/amr/amr_pci.c,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ #include #include #include -#include +#include "amr_compat.h" #include #include #include @@ -72,12 +72,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "amrio.h" +#include "amrreg.h" +#include "amrvar.h" static int amr_pci_probe(device_t dev); static int amr_pci_attach(device_t dev); diff --git a/sys/dev/raid/asr/asr.c b/sys/dev/raid/asr/asr.c index 6287dff194..00e44e2428 100644 --- a/sys/dev/raid/asr/asr.c +++ b/sys/dev/raid/asr/asr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/asr.c,v 1.3.2.2 2001/08/23 05:21:29 scottl Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.8 2003/07/23 02:30:15 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/asr.c,v 1.9 2003/08/07 21:17:08 dillon Exp $ */ /* * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000-2001 Adaptec Corporation @@ -197,7 +197,7 @@ #endif /* DEBUG_ASR_USR_CMD */ #define dsDescription_size 46 /* Snug as a bug in a rug */ -#include "dev/asr/dptsig.h" +#include "dptsig.h" static dpt_sig_S ASR_sig = { { 'd', 'P', 't', 'S', 'i', 'G'}, SIG_VERSION, PROC_INTEL, @@ -225,14 +225,14 @@ static dpt_sig_S ASR_sig = { #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include #include #include @@ -240,8 +240,8 @@ static dpt_sig_S ASR_sig = { #include #include -#include -#include +#include +#include #define STATIC static #define INLINE @@ -258,14 +258,14 @@ static dpt_sig_S ASR_sig = { #define osdSwap4(x) ((u_long)ntohl((u_long)(x))) #define KVTOPHYS(x) vtophys(x) -#include "dev/asr/dptalign.h" -#include "dev/asr/i2oexec.h" -#include "dev/asr/i2obscsi.h" -#include "dev/asr/i2odpt.h" -#include "dev/asr/i2oadptr.h" +#include "dptalign.h" +#include "i2oexec.h" +#include "i2obscsi.h" +#include "i2odpt.h" +#include "i2oadptr.h" #include "opt_asr.h" -#include "dev/asr/sys_info.h" +#include "sys_info.h" /* Configuration Definitions */ @@ -3848,7 +3848,7 @@ typedef U32 DPT_MSG_T; typedef U32 DPT_RTN_T; #undef SCSI_RESET /* Conflicts with "scsi/scsiconf.h" defintion */ -#include "dev/asr/osd_unix.h" +#include "osd_unix.h" #define asr_unit(dev) minor(dev) diff --git a/sys/dev/raid/asr/dptsig.h b/sys/dev/raid/asr/dptsig.h index f63bc9d2c9..147d0f93b6 100644 --- a/sys/dev/raid/asr/dptsig.h +++ b/sys/dev/raid/asr/dptsig.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/dptsig.h,v 1.1.2.2 2001/08/23 05:21:29 scottl Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/dptsig.h,v 1.2 2003/06/17 04:28:22 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/dptsig.h,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ /* * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000-2001 Adaptec Corporation. @@ -26,7 +26,7 @@ #ifndef __DPTSIG_H_ #define __DPTSIG_H_ #ifdef _SINIX_ADDON -#include "dpt.h" +#include "use_dpt.h" #endif /* DPT SIGNATURE SPEC AND HEADER FILE */ /* Signature Version 1 (sorry no 'A') */ diff --git a/sys/dev/raid/asr/i2oadptr.h b/sys/dev/raid/asr/i2oadptr.h index 348c9c7851..d1e5476bca 100644 --- a/sys/dev/raid/asr/i2oadptr.h +++ b/sys/dev/raid/asr/i2oadptr.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/i2oadptr.h,v 1.1.2.1 2000/09/21 20:33:50 msmith Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/i2oadptr.h,v 1.2 2003/06/17 04:28:22 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/i2oadptr.h,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ /**************************************************************** * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000 Adaptec Corproation. @@ -84,9 +84,9 @@ #if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__)) # if (KERN_VERSION < 3) -# include "i386/pci/i2omsg.h" +# include "i2omsg.h" # else -# include "dev/asr/i2omsg.h" +# include "i2omsg.h" # endif #else # include "i2omsg.h" /* Include the Base Message file */ diff --git a/sys/dev/raid/asr/i2obscsi.h b/sys/dev/raid/asr/i2obscsi.h index 545fd92208..6c016927f8 100644 --- a/sys/dev/raid/asr/i2obscsi.h +++ b/sys/dev/raid/asr/i2obscsi.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/i2obscsi.h,v 1.1.2.1 2000/09/21 20:33:50 msmith Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/i2obscsi.h,v 1.2 2003/06/17 04:28:22 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/i2obscsi.h,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ /**************************************************************** * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000 Adaptec Corporation. @@ -84,9 +84,9 @@ #if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__)) # if (KERN_VERSION < 3) -# include "i386/pci/i2omsg.h" /* Include the Base Message file */ +# include "i2omsg.h" /* Include the Base Message file */ # else -# include "dev/asr/i2omsg.h" +# include "i2omsg.h" # endif #else # include "i2omsg.h" /* Include the Base Message file */ diff --git a/sys/dev/raid/asr/i2oexec.h b/sys/dev/raid/asr/i2oexec.h index 05e1ede66b..10d3f7c0b6 100644 --- a/sys/dev/raid/asr/i2oexec.h +++ b/sys/dev/raid/asr/i2oexec.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/i2oexec.h,v 1.1.2.1 2000/09/21 20:33:50 msmith Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/i2oexec.h,v 1.2 2003/06/17 04:28:22 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/i2oexec.h,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ /**************************************************************** * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000 Adaptec Corporation. @@ -96,11 +96,11 @@ # include # endif # if (KERN_VERSION < 3) -# include "i386/pci/i2omsg.h" /* Include the Base Message file */ -# include "i386/pci/i2outil.h" +# include "i2omsg.h" /* Include the Base Message file */ +# include "i2outil.h" # else -# include "dev/asr/i2omsg.h" /* Include the Base Message file */ -# include "dev/asr/i2outil.h" +# include "i2omsg.h" /* Include the Base Message file */ +# include "i2outil.h" # endif #else # include "i2omsg.h" /* Include the Base Message file */ diff --git a/sys/dev/raid/asr/i2omsg.h b/sys/dev/raid/asr/i2omsg.h index f096d695b0..578851a133 100644 --- a/sys/dev/raid/asr/i2omsg.h +++ b/sys/dev/raid/asr/i2omsg.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/i2omsg.h,v 1.1.2.2 2001/08/23 05:21:29 scottl Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/i2omsg.h,v 1.2 2003/06/17 04:28:22 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/i2omsg.h,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ /**************************************************************** * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000 Adaptec Corporation. @@ -117,9 +117,9 @@ #if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__)) # if (KERN_VERSION < 3) -# include "i386/pci/i2otypes.h" +# include "i2otypes.h" # else -# include "dev/asr/i2otypes.h" +# include "i2otypes.h" # endif #else # include "i2otypes.h" diff --git a/sys/dev/raid/asr/i2otypes.h b/sys/dev/raid/asr/i2otypes.h index 1631b49737..a7f73e1ae9 100644 --- a/sys/dev/raid/asr/i2otypes.h +++ b/sys/dev/raid/asr/i2otypes.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/i2otypes.h,v 1.1.2.1 2000/09/21 20:33:50 msmith Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/i2otypes.h,v 1.2 2003/06/17 04:28:22 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/i2otypes.h,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ /**************************************************************** * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000 Adaptec Corporation. @@ -88,9 +88,9 @@ #if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__)) # if (KERN_VERSION < 3) -# include "i386/pci/i2odep.h" +# include "i2odep.h" # else -# include "dev/asr/i2odep.h" +# include "i2odep.h" # endif #else # include "i2odep.h" diff --git a/sys/dev/raid/asr/i2outil.h b/sys/dev/raid/asr/i2outil.h index 8ce94be1c8..61df0828b5 100644 --- a/sys/dev/raid/asr/i2outil.h +++ b/sys/dev/raid/asr/i2outil.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/i2outil.h,v 1.1.2.1 2000/09/21 20:33:50 msmith Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/i2outil.h,v 1.2 2003/06/17 04:28:22 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/i2outil.h,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ /**************************************************************** * Copyright (c) 1996-2000 Distributed Processing Technology Corporation * Copyright (c) 2000 Adaptec Corporation. @@ -93,9 +93,9 @@ #if ((defined(KERNEL) || defined(_KERNEL)) && defined(__FreeBSD__)) # if (KERN_VERSION < 3) -# include "i386/pci/i2omsg.h" /* Include the Base Message file */ +# include "i2omsg.h" /* Include the Base Message file */ # else -# include "dev/asr/i2omsg.h" +# include "i2omsg.h" # endif #else # include "i2omsg.h" /* Include the Base Message file */ diff --git a/sys/dev/raid/asr/osd_util.h b/sys/dev/raid/asr/osd_util.h index 6a26d94e01..f3722c95e7 100644 --- a/sys/dev/raid/asr/osd_util.h +++ b/sys/dev/raid/asr/osd_util.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/osd_util.h,v 1.1.2.2 2001/08/23 05:21:29 scottl Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/osd_util.h,v 1.2 2003/06/17 04:28:22 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/osd_util.h,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ /* * Copyright (c) 1996-1999 Distributed Processing Technology Corporation * All rights reserved. @@ -83,7 +83,7 @@ # if (KERN_VERSION < 3) # include "i386/isa/dpt_osd_defs.h" # else -# include "dev/asr/osd_defs.h" +# include "osd_defs.h" # endif #else # include "osd_defs.h" diff --git a/sys/dev/raid/asr/sys_info.h b/sys/dev/raid/asr/sys_info.h index 2f9ec6d642..31bd51750f 100644 --- a/sys/dev/raid/asr/sys_info.h +++ b/sys/dev/raid/asr/sys_info.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/asr/sys_info.h,v 1.1.2.2 2001/08/23 05:21:29 scottl Exp $ */ -/* $DragonFly: src/sys/dev/raid/asr/sys_info.h,v 1.2 2003/06/17 04:28:22 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/asr/sys_info.h,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ /* * Copyright (c) 1996-1999 Distributed Processing Technology Corporation * All rights reserved. @@ -58,7 +58,7 @@ # if (KERN_VERSION < 3) # include "i386/isa/dpt_osd_util.h" # else -# include "dev/asr/osd_util.h" +# include "osd_util.h" # endif #else # include "osd_util.h" diff --git a/sys/dev/raid/ciss/ciss.c b/sys/dev/raid/ciss/ciss.c index 53ecb64251..51fa9e50d5 100644 --- a/sys/dev/raid/ciss/ciss.c +++ b/sys/dev/raid/ciss/ciss.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ciss/ciss.c,v 1.2.2.6 2003/02/18 22:27:41 ps Exp $ - * $DragonFly: src/sys/dev/raid/ciss/ciss.c,v 1.3 2003/07/21 05:50:28 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ciss/ciss.c,v 1.4 2003/08/07 21:17:08 dillon Exp $ */ /* @@ -78,13 +78,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -93,12 +93,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "cissreg.h" +#include "cissvar.h" +#include "cissio.h" MALLOC_DEFINE(CISS_MALLOC_CLASS, "ciss_data", "ciss internal data buffers"); diff --git a/sys/dev/raid/dpt/dpt_control.c b/sys/dev/raid/dpt/dpt_control.c index eee6072338..8a96f8a9d6 100644 --- a/sys/dev/raid/dpt/dpt_control.c +++ b/sys/dev/raid/dpt/dpt_control.c @@ -37,7 +37,7 @@ */ #ident "$FreeBSD: src/sys/dev/dpt/dpt_control.c,v 1.16 1999/09/25 18:23:48 phk Exp $" -#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_control.c,v 1.3 2003/07/21 05:50:29 dillon Exp $" +#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_control.c,v 1.4 2003/08/07 21:17:08 dillon Exp $" #include "opt_dpt.h" @@ -55,7 +55,7 @@ #include #include -#include +#include "dpt.h" #define INLINE __inline diff --git a/sys/dev/raid/dpt/dpt_eisa.c b/sys/dev/raid/dpt/dpt_eisa.c index b17dac47f1..79dfe70360 100644 --- a/sys/dev/raid/dpt/dpt_eisa.c +++ b/sys/dev/raid/dpt/dpt_eisa.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/dpt/dpt_eisa.c,v 1.12.2.1 2000/08/07 18:48:14 peter Exp $ - * $DragonFly: src/sys/dev/raid/dpt/dpt_eisa.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/raid/dpt/dpt_eisa.c,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ #include @@ -38,11 +38,11 @@ #include #include -#include +#include -#include +#include -#include +#include "dpt.h" #define DPT_EISA_IOSIZE 0x100 #define DPT_EISA_SLOT_OFFSET 0x0c00 diff --git a/sys/dev/raid/dpt/dpt_pci.c b/sys/dev/raid/dpt/dpt_pci.c index 1f8d3751cc..a8c8c473f3 100644 --- a/sys/dev/raid/dpt/dpt_pci.c +++ b/sys/dev/raid/dpt/dpt_pci.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/dpt/dpt_pci.c,v 1.17.2.2 2000/08/26 22:21:21 peter Exp $ - * $DragonFly: src/sys/dev/raid/dpt/dpt_pci.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/raid/dpt/dpt_pci.c,v 1.3 2003/08/07 21:17:08 dillon Exp $ */ #include @@ -42,12 +42,12 @@ #include #include -#include -#include +#include +#include -#include +#include -#include +#include "dpt.h" #define DPT_VENDOR_ID 0x1044 #define DPT_DEVICE_ID 0xa400 diff --git a/sys/dev/raid/dpt/dpt_scsi.c b/sys/dev/raid/dpt/dpt_scsi.c index 121c63d8fe..3a15fd0bf3 100644 --- a/sys/dev/raid/dpt/dpt_scsi.c +++ b/sys/dev/raid/dpt/dpt_scsi.c @@ -44,7 +44,7 @@ */ #ident "$FreeBSD: src/sys/dev/dpt/dpt_scsi.c,v 1.28.2.3 2003/01/31 02:47:10 grog Exp $" -#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_scsi.c,v 1.3 2003/07/19 21:14:20 dillon Exp $" +#ident "$DragonFly: src/sys/dev/raid/dpt/dpt_scsi.c,v 1.4 2003/08/07 21:17:08 dillon Exp $" #define _DPT_C_ @@ -63,18 +63,18 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include "dpt.h" /* dpt_isa.c, dpt_eisa.c, and dpt_pci.c need this in a central place */ int dpt_controllers_present; diff --git a/sys/dev/raid/ida/ida.c b/sys/dev/raid/ida/ida.c index ba34a61832..6928b9b5b4 100644 --- a/sys/dev/raid/ida/ida.c +++ b/sys/dev/raid/ida/ida.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ida/ida.c,v 1.7.2.3 2001/03/01 01:57:32 ps Exp $ - * $DragonFly: src/sys/dev/raid/ida/ida.c,v 1.4 2003/07/19 21:14:22 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ida/ida.c,v 1.5 2003/08/07 21:17:09 dillon Exp $ */ /* @@ -39,7 +39,7 @@ * i386/eisa/ida_eisa.c */ -#include +#include #include #include @@ -61,8 +61,8 @@ #include #include -#include -#include +#include "idareg.h" +#include "idavar.h" /* prototypes */ static void ida_alloc_qcb(struct ida_softc *ida); diff --git a/sys/dev/raid/ida/ida_disk.c b/sys/dev/raid/ida/ida_disk.c index f3e25d11bb..43a3f45080 100644 --- a/sys/dev/raid/ida/ida_disk.c +++ b/sys/dev/raid/ida/ida_disk.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ida/ida_disk.c,v 1.12.2.6 2001/11/27 20:21:02 ps Exp $ - * $DragonFly: src/sys/dev/raid/ida/ida_disk.c,v 1.5 2003/07/22 17:03:29 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ida/ida_disk.c,v 1.6 2003/08/07 21:17:09 dillon Exp $ */ /* @@ -55,8 +55,8 @@ #include #include -#include -#include +#include "idareg.h" +#include "idavar.h" /* prototypes */ static int idad_probe(device_t dev); diff --git a/sys/dev/raid/ida/ida_eisa.c b/sys/dev/raid/ida/ida_eisa.c index c8c1ba3bd5..b5a9ba49bf 100644 --- a/sys/dev/raid/ida/ida_eisa.c +++ b/sys/dev/raid/ida/ida_eisa.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ida/ida_eisa.c,v 1.1.2.4 2001/07/30 20:29:58 jlemon Exp $ - * $DragonFly: src/sys/dev/raid/ida/ida_eisa.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ida/ida_eisa.c,v 1.3 2003/08/07 21:17:09 dillon Exp $ */ #include @@ -42,10 +42,10 @@ #include #include -#include -#include +#include "idavar.h" +#include "idareg.h" -#include +#include #define IDA_EISA_IOPORT_START 0x0c88 #define IDA_EISA_IOPORT_LEN 0x0017 diff --git a/sys/dev/raid/ida/ida_pci.c b/sys/dev/raid/ida/ida_pci.c index da400d7165..559c3800d6 100644 --- a/sys/dev/raid/ida/ida_pci.c +++ b/sys/dev/raid/ida/ida_pci.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ida/ida_pci.c,v 1.7.2.7 2001/07/30 20:29:58 jlemon Exp $ - * $DragonFly: src/sys/dev/raid/ida/ida_pci.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ + * $DragonFly: src/sys/dev/raid/ida/ida_pci.c,v 1.3 2003/08/07 21:17:09 dillon Exp $ */ #include @@ -43,11 +43,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "idavar.h" +#include "idareg.h" #define IDA_PCI_MAX_DMA_ADDR 0xFFFFFFFF #define IDA_PCI_MAX_DMA_COUNT 0xFFFFFFFF diff --git a/sys/dev/raid/iir/iir.c b/sys/dev/raid/iir/iir.c index c04677c6e4..7854a8091e 100644 --- a/sys/dev/raid/iir/iir.c +++ b/sys/dev/raid/iir/iir.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/iir/iir.c,v 1.2.2.3 2002/05/05 08:18:12 asmodai Exp $ */ -/* $DragonFly: src/sys/dev/raid/iir/iir.c,v 1.3 2003/07/19 21:14:22 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/iir/iir.c,v 1.4 2003/08/07 21:17:09 dillon Exp $ */ /* * Copyright (c) 2000-01 Intel Corporation * All Rights Reserved @@ -49,31 +49,30 @@ /* #include "opt_iir.h" */ #include #include +#include #include #include #include #include -#include /* For offsetof */ - #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include +#include "iir.h" struct gdt_softc *gdt_wait_gdt; int gdt_wait_index; diff --git a/sys/dev/raid/iir/iir_ctrl.c b/sys/dev/raid/iir/iir_ctrl.c index e0d54c65f8..ad264bdc0d 100644 --- a/sys/dev/raid/iir/iir_ctrl.c +++ b/sys/dev/raid/iir/iir_ctrl.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.2.2.4 2002/05/05 08:18:12 asmodai Exp $ */ -/* $DragonFly: src/sys/dev/raid/iir/iir_ctrl.c,v 1.4 2003/07/21 05:50:31 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/iir/iir_ctrl.c,v 1.5 2003/08/07 21:17:09 dillon Exp $ */ /* * Copyright (c) 2000-01 Intel Corporation * All Rights Reserved @@ -54,7 +54,7 @@ #include #include -#include +#include "iir.h" /* Entry points and other prototypes */ static struct gdt_softc *gdt_minor2softc(int minor_no); diff --git a/sys/dev/raid/iir/iir_pci.c b/sys/dev/raid/iir/iir_pci.c index ed918d95e8..3b41550c2c 100644 --- a/sys/dev/raid/iir/iir_pci.c +++ b/sys/dev/raid/iir/iir_pci.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/iir/iir_pci.c,v 1.3.2.3 2002/05/05 08:18:12 asmodai Exp $ */ -/* $DragonFly: src/sys/dev/raid/iir/iir_pci.c,v 1.2 2003/06/17 04:28:27 dillon Exp $ */ +/* $DragonFly: src/sys/dev/raid/iir/iir_pci.c,v 1.3 2003/08/07 21:17:09 dillon Exp $ */ /* * Copyright (c) 2000-01 Intel Corporation * All Rights Reserved @@ -56,12 +56,12 @@ #include #include -#include -#include +#include +#include -#include +#include -#include +#include "iir.h" /* Mapping registers for various areas */ #define PCI_DPMEM PCIR_MAPS diff --git a/sys/dev/raid/mlx/mlx.c b/sys/dev/raid/mlx/mlx.c index f9a782d30d..1387ae86af 100644 --- a/sys/dev/raid/mlx/mlx.c +++ b/sys/dev/raid/mlx/mlx.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mlx/mlx.c,v 1.14.2.5 2001/09/11 09:49:53 kris Exp $ - * $DragonFly: src/sys/dev/raid/mlx/mlx.c,v 1.5 2003/07/21 05:50:32 dillon Exp $ + * $DragonFly: src/sys/dev/raid/mlx/mlx.c,v 1.6 2003/08/07 21:17:09 dillon Exp $ */ /* @@ -49,10 +49,10 @@ #include #include -#include -#include -#include -#include +#include "mlx_compat.h" +#include "mlxio.h" +#include "mlxvar.h" +#include "mlxreg.h" #define MLX_CDEV_MAJOR 130 diff --git a/sys/dev/raid/mlx/mlx_disk.c b/sys/dev/raid/mlx/mlx_disk.c index 2bb08348b6..536fd987be 100644 --- a/sys/dev/raid/mlx/mlx_disk.c +++ b/sys/dev/raid/mlx/mlx_disk.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mlx/mlx_disk.c,v 1.8.2.4 2001/06/25 04:37:51 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mlx/mlx_disk.c,v 1.5 2003/07/22 17:03:30 dillon Exp $ + * $DragonFly: src/sys/dev/raid/mlx/mlx_disk.c,v 1.6 2003/08/07 21:17:09 dillon Exp $ */ /* @@ -44,10 +44,10 @@ #include #include -#include -#include -#include -#include +#include "mlx_compat.h" +#include "mlxio.h" +#include "mlxvar.h" +#include "mlxreg.h" /* prototypes */ static int mlxd_probe(device_t dev); diff --git a/sys/dev/raid/mlx/mlx_pci.c b/sys/dev/raid/mlx/mlx_pci.c index 8cca934ced..3a468755eb 100644 --- a/sys/dev/raid/mlx/mlx_pci.c +++ b/sys/dev/raid/mlx/mlx_pci.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mlx/mlx_pci.c,v 1.4.2.5 2001/06/25 04:37:51 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mlx/mlx_pci.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/raid/mlx/mlx_pci.c,v 1.3 2003/08/07 21:17:09 dillon Exp $ */ #include @@ -42,13 +42,13 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include +#include "mlx_compat.h" +#include "mlxio.h" +#include "mlxvar.h" +#include "mlxreg.h" static int mlx_pci_probe(device_t dev); static int mlx_pci_attach(device_t dev); diff --git a/sys/dev/raid/mly/mly.c b/sys/dev/raid/mly/mly.c index 6cdc5bc4d7..5e53355262 100644 --- a/sys/dev/raid/mly/mly.c +++ b/sys/dev/raid/mly/mly.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mly/mly.c,v 1.3.2.3 2001/03/05 20:17:24 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mly/mly.c,v 1.5 2003/07/21 05:50:33 dillon Exp $ + * $DragonFly: src/sys/dev/raid/mly/mly.c,v 1.6 2003/08/07 21:17:09 dillon Exp $ */ #include @@ -43,13 +43,13 @@ #include #include -#include +#include -#include -#include -#include +#include "mlyreg.h" +#include "mlyio.h" +#include "mlyvar.h" #define MLY_DEFINE_TABLES -#include +#include "mly_tables.h" static int mly_get_controllerinfo(struct mly_softc *sc); static void mly_scan_devices(struct mly_softc *sc); diff --git a/sys/dev/raid/mly/mly_cam.c b/sys/dev/raid/mly/mly_cam.c index b715d70d46..7cd7d0607b 100644 --- a/sys/dev/raid/mly/mly_cam.c +++ b/sys/dev/raid/mly/mly_cam.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mly/mly_cam.c,v 1.1.2.3 2001/04/21 04:09:06 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mly/Attic/mly_cam.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/raid/mly/Attic/mly_cam.c,v 1.3 2003/08/07 21:17:09 dillon Exp $ */ /* * CAM interface for FreeBSD @@ -36,21 +36,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include +#include "mlyreg.h" +#include "mlyio.h" +#include "mlyvar.h" +#include "mly_tables.h" static void mly_cam_poll(struct cam_sim *sim); static void mly_cam_action(struct cam_sim *sim, union ccb *ccb); diff --git a/sys/dev/raid/mly/mly_pci.c b/sys/dev/raid/mly/mly_pci.c index c9de62cc0f..b386d07210 100644 --- a/sys/dev/raid/mly/mly_pci.c +++ b/sys/dev/raid/mly/mly_pci.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/mly/mly_pci.c,v 1.1.2.2 2001/03/05 20:17:24 msmith Exp $ - * $DragonFly: src/sys/dev/raid/mly/Attic/mly_pci.c,v 1.2 2003/06/17 04:28:28 dillon Exp $ + * $DragonFly: src/sys/dev/raid/mly/Attic/mly_pci.c,v 1.3 2003/08/07 21:17:09 dillon Exp $ */ #include @@ -43,12 +43,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "mlyreg.h" +#include "mlyio.h" +#include "mlyvar.h" static int mly_pci_probe(device_t dev); static int mly_pci_attach(device_t dev); diff --git a/sys/dev/raid/pst/pst-iop.c b/sys/dev/raid/pst/pst-iop.c index 60e0ff826c..b36c625bd1 100644 --- a/sys/dev/raid/pst/pst-iop.c +++ b/sys/dev/raid/pst/pst-iop.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pst/pst-iop.c,v 1.2.2.1 2002/08/18 12:32:36 sos Exp $ - * $DragonFly: src/sys/dev/raid/pst/pst-iop.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/raid/pst/pst-iop.c,v 1.3 2003/08/07 21:16:58 dillon Exp $ */ #include @@ -43,10 +43,10 @@ #include #include #include -#include -#include +#include +#include -#include "dev/pst/pst-iop.h" +#include "pst-iop.h" /* local vars */ MALLOC_DEFINE(M_PSTIOP, "PSTIOP", "Promise SuperTrak IOP driver"); diff --git a/sys/dev/raid/pst/pst-pci.c b/sys/dev/raid/pst/pst-pci.c index 5d5f64b055..b7566c2b36 100644 --- a/sys/dev/raid/pst/pst-pci.c +++ b/sys/dev/raid/pst/pst-pci.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pst/pst-pci.c,v 1.1.2.1 2002/08/18 12:32:36 sos Exp $ - * $DragonFly: src/sys/dev/raid/pst/pst-pci.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/raid/pst/pst-pci.c,v 1.3 2003/08/07 21:16:58 dillon Exp $ */ #include @@ -42,10 +42,10 @@ #include #include #include -#include -#include +#include +#include -#include "dev/pst/pst-iop.h" +#include "pst-iop.h" static int iop_pci_probe(device_t dev) diff --git a/sys/dev/raid/pst/pst-raid.c b/sys/dev/raid/pst/pst-raid.c index 4f1845b45a..c4f19c9585 100644 --- a/sys/dev/raid/pst/pst-raid.c +++ b/sys/dev/raid/pst/pst-raid.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/pst/pst-raid.c,v 1.2.2.1 2002/08/18 12:32:36 sos Exp $ - * $DragonFly: src/sys/dev/raid/pst/pst-raid.c,v 1.4 2003/07/22 17:03:30 dillon Exp $ + * $DragonFly: src/sys/dev/raid/pst/pst-raid.c,v 1.5 2003/08/07 21:16:58 dillon Exp $ */ #include @@ -47,10 +47,10 @@ #include #include #include -#include -#include +#include +#include -#include "dev/pst/pst-iop.h" +#include "pst-iop.h" /* device structures */ static d_strategy_t pststrategy; diff --git a/sys/dev/raid/twe/twe.c b/sys/dev/raid/twe/twe.c index bff7c3ec76..ac5744d4bf 100644 --- a/sys/dev/raid/twe/twe.c +++ b/sys/dev/raid/twe/twe.c @@ -25,19 +25,19 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/twe/twe.c,v 1.1.2.6 2002/03/07 09:57:02 msmith Exp $ - * $DragonFly: src/sys/dev/raid/twe/twe.c,v 1.3 2003/07/19 21:14:29 dillon Exp $ + * $DragonFly: src/sys/dev/raid/twe/twe.c,v 1.4 2003/08/07 21:17:09 dillon Exp $ */ /* * Driver for the 3ware Escalade family of IDE RAID controllers. */ -#include -#include -#include -#include +#include "twe_compat.h" +#include "twereg.h" +#include "tweio.h" +#include "twevar.h" #define TWE_DEFINE_TABLES -#include +#include "twe_tables.h" /* * Command submission. diff --git a/sys/dev/raid/twe/twe_compat.h b/sys/dev/raid/twe/twe_compat.h index 42a886c66c..913fed6487 100644 --- a/sys/dev/raid/twe/twe_compat.h +++ b/sys/dev/raid/twe/twe_compat.h @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/twe/twe_compat.h,v 1.1.2.3 2002/03/07 09:57:02 msmith Exp $ - * $DragonFly: src/sys/dev/raid/twe/twe_compat.h,v 1.3 2003/06/19 01:55:04 dillon Exp $ + * $DragonFly: src/sys/dev/raid/twe/twe_compat.h,v 1.4 2003/08/07 21:17:09 dillon Exp $ */ /* * Portability and compatibility interfaces. @@ -52,8 +52,8 @@ #include #include -#include -#include +#include +#include /* * These macros allows us to build a version of the driver which can diff --git a/sys/dev/raid/twe/twe_freebsd.c b/sys/dev/raid/twe/twe_freebsd.c index 9519b022b3..4d1da43a0f 100644 --- a/sys/dev/raid/twe/twe_freebsd.c +++ b/sys/dev/raid/twe/twe_freebsd.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/twe/twe_freebsd.c,v 1.2.2.5 2002/03/07 09:57:02 msmith Exp $ - * $DragonFly: src/sys/dev/raid/twe/twe_freebsd.c,v 1.4 2003/07/22 17:03:31 dillon Exp $ + * $DragonFly: src/sys/dev/raid/twe/twe_freebsd.c,v 1.5 2003/08/07 21:17:09 dillon Exp $ */ /* @@ -39,11 +39,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include "twe_compat.h" +#include "twereg.h" +#include "tweio.h" +#include "twevar.h" +#include "twe_tables.h" #include diff --git a/sys/dev/raid/vinum/vinum.c b/sys/dev/raid/vinum/vinum.c index a4c03d673c..ef9ca7bdeb 100644 --- a/sys/dev/raid/vinum/vinum.c +++ b/sys/dev/raid/vinum/vinum.c @@ -37,12 +37,12 @@ * * $Id: vinum.c,v 1.33 2001/01/09 06:19:15 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinum.c,v 1.38.2.3 2003/01/07 12:14:16 joerg Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinum.c,v 1.7 2003/07/31 12:01:38 hmp Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinum.c,v 1.8 2003/08/07 21:17:09 dillon Exp $ */ #define STATIC static /* nothing while we're testing XXX */ -#include +#include "vinumhdr.h" #include /* for sync(2) */ #include #ifdef VINUMDEBUG @@ -52,7 +52,7 @@ extern int total_malloced; extern int malloccount; extern struct mc malloced[]; #endif -#include +#include "request.h" STATIC struct cdevsw vinum_cdevsw = { diff --git a/sys/dev/raid/vinum/vinumconfig.c b/sys/dev/raid/vinum/vinumconfig.c index a35c9a0fcc..ed868a9e13 100644 --- a/sys/dev/raid/vinum/vinumconfig.c +++ b/sys/dev/raid/vinum/vinumconfig.c @@ -47,13 +47,13 @@ * * $Id: vinumconfig.c,v 1.30 2000/05/01 09:45:50 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.32.2.6 2002/02/03 00:43:35 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumconfig.c,v 1.3 2003/07/19 21:14:31 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumconfig.c,v 1.4 2003/08/07 21:17:09 dillon Exp $ */ #define STATIC static -#include -#include +#include "vinumhdr.h" +#include "request.h" #define MAXTOKEN 64 /* maximum number of tokens in a line */ diff --git a/sys/dev/raid/vinum/vinumdaemon.c b/sys/dev/raid/vinum/vinumdaemon.c index 6237ba534d..09cb37630c 100644 --- a/sys/dev/raid/vinum/vinumdaemon.c +++ b/sys/dev/raid/vinum/vinumdaemon.c @@ -36,11 +36,11 @@ * * $Id: vinumdaemon.c,v 1.8 2000/01/03 05:22:03 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumdaemon.c,v 1.16 2000/01/05 06:03:56 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumdaemon.c,v 1.3 2003/07/19 21:14:31 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumdaemon.c,v 1.4 2003/08/07 21:17:09 dillon Exp $ */ -#include -#include +#include "vinumhdr.h" +#include "request.h" #ifdef VINUMDEBUG #include diff --git a/sys/dev/raid/vinum/vinumhdr.h b/sys/dev/raid/vinum/vinumhdr.h index 078c77c789..6f32b2d671 100644 --- a/sys/dev/raid/vinum/vinumhdr.h +++ b/sys/dev/raid/vinum/vinumhdr.h @@ -38,7 +38,7 @@ /* * $Id: vinumhdr.h,v 1.18 2001/01/04 00:14:14 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumhdr.h,v 1.16.2.1 2001/03/13 02:59:43 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumhdr.h,v 1.4 2003/07/22 17:03:31 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumhdr.h,v 1.5 2003/08/07 21:17:09 dillon Exp $ */ #include @@ -75,8 +75,8 @@ #include -#include -#include -#include -#include +#include "vinumvar.h" +#include "vinumio.h" +#include "vinumkw.h" +#include "vinumext.h" #include diff --git a/sys/dev/raid/vinum/vinuminterrupt.c b/sys/dev/raid/vinum/vinuminterrupt.c index fa8ff1bd1d..e17ab6c2ff 100644 --- a/sys/dev/raid/vinum/vinuminterrupt.c +++ b/sys/dev/raid/vinum/vinuminterrupt.c @@ -41,11 +41,11 @@ * * $Id: vinuminterrupt.c,v 1.12 2000/11/24 03:41:42 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinuminterrupt.c,v 1.25.2.3 2001/05/28 05:56:27 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinuminterrupt.c,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinuminterrupt.c,v 1.3 2003/08/07 21:17:09 dillon Exp $ */ -#include -#include +#include "vinumhdr.h" +#include "request.h" #include void complete_raid5_write(struct rqelement *); diff --git a/sys/dev/raid/vinum/vinumio.c b/sys/dev/raid/vinum/vinumio.c index 742c9edb48..d676e07897 100644 --- a/sys/dev/raid/vinum/vinumio.c +++ b/sys/dev/raid/vinum/vinumio.c @@ -35,11 +35,11 @@ * * $Id: vinumio.c,v 1.30 2000/05/10 23:23:30 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumio.c,v 1.52.2.6 2002/05/02 08:43:44 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumio.c,v 1.4 2003/07/22 17:03:31 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumio.c,v 1.5 2003/08/07 21:17:09 dillon Exp $ */ -#include -#include +#include "vinumhdr.h" +#include "request.h" #include static char *sappend(char *txt, char *s); diff --git a/sys/dev/raid/vinum/vinumioctl.c b/sys/dev/raid/vinum/vinumioctl.c index 01144572f8..f0d5e09e75 100644 --- a/sys/dev/raid/vinum/vinumioctl.c +++ b/sys/dev/raid/vinum/vinumioctl.c @@ -43,11 +43,11 @@ * * $Id: vinumioctl.c,v 1.14 2000/10/27 03:07:53 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.25.2.4 2002/02/03 00:44:19 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumioctl.c,v 1.3 2003/06/23 17:55:36 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumioctl.c,v 1.4 2003/08/07 21:17:09 dillon Exp $ */ -#include -#include +#include "vinumhdr.h" +#include "request.h" #ifdef VINUMDEBUG #include diff --git a/sys/dev/raid/vinum/vinumlock.c b/sys/dev/raid/vinum/vinumlock.c index afcca01d9e..f4c6994afb 100644 --- a/sys/dev/raid/vinum/vinumlock.c +++ b/sys/dev/raid/vinum/vinumlock.c @@ -39,11 +39,11 @@ * * $Id: vinumlock.c,v 1.13 2000/05/02 23:25:02 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumlock.c,v 1.18.2.3 2001/04/04 06:27:11 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumlock.c,v 1.3 2003/07/19 21:14:31 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumlock.c,v 1.4 2003/08/07 21:17:09 dillon Exp $ */ -#include -#include +#include "vinumhdr.h" +#include "request.h" /* Lock a drive, wait if it's in use */ #if VINUMDEBUG diff --git a/sys/dev/raid/vinum/vinummemory.c b/sys/dev/raid/vinum/vinummemory.c index 08e35a2626..19ba9ee251 100644 --- a/sys/dev/raid/vinum/vinummemory.c +++ b/sys/dev/raid/vinum/vinummemory.c @@ -35,16 +35,16 @@ * * $Id: vinummemory.c,v 1.25 2000/05/04 01:57:48 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinummemory.c,v 1.22.2.1 2000/06/02 04:26:11 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinummemory.c,v 1.3 2003/06/29 03:28:42 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinummemory.c,v 1.4 2003/08/07 21:17:09 dillon Exp $ */ -#include +#include "vinumhdr.h" #ifdef VINUMDEBUG #undef longjmp /* this was defined as LongJmp */ void longjmp(jmp_buf, int); /* the kernel doesn't define this */ -#include +#include "request.h" extern struct rqinfo rqinfo[]; extern struct rqinfo *rqip; int rqinfo_size = RQINFO_SIZE; /* for debugger */ diff --git a/sys/dev/raid/vinum/vinumparser.c b/sys/dev/raid/vinum/vinumparser.c index 5cc380aa72..9c385508b6 100644 --- a/sys/dev/raid/vinum/vinumparser.c +++ b/sys/dev/raid/vinum/vinumparser.c @@ -35,7 +35,7 @@ * * $Id: vinumparser.c,v 1.21 2000/12/20 03:44:13 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumparser.c,v 1.20.2.5 2001/05/28 05:56:27 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumparser.c,v 1.3 2003/06/25 03:55:50 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumparser.c,v 1.4 2003/08/07 21:17:09 dillon Exp $ */ /* @@ -59,7 +59,7 @@ */ #include -#include +#include "vinumkw.h" #ifdef _KERNEL #include #include @@ -71,9 +71,9 @@ #include #include -#include -#include -#include +#include "vinumvar.h" +#include "vinumio.h" +#include "vinumext.h" #define iswhite(c) ((c == ' ') || (c == '\t')) /* check for white space */ #else /* userland */ #include diff --git a/sys/dev/raid/vinum/vinumraid5.c b/sys/dev/raid/vinum/vinumraid5.c index dbc2897a55..e21a9d4e6b 100644 --- a/sys/dev/raid/vinum/vinumraid5.c +++ b/sys/dev/raid/vinum/vinumraid5.c @@ -40,10 +40,10 @@ * * $Id: vinumraid5.c,v 1.21 2001/01/09 04:21:27 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumraid5.c,v 1.6.2.2 2001/03/13 02:59:43 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumraid5.c,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumraid5.c,v 1.3 2003/08/07 21:17:09 dillon Exp $ */ -#include -#include +#include "vinumhdr.h" +#include "request.h" #include /* diff --git a/sys/dev/raid/vinum/vinumrequest.c b/sys/dev/raid/vinum/vinumrequest.c index 9d2efc67de..ccb599bb80 100644 --- a/sys/dev/raid/vinum/vinumrequest.c +++ b/sys/dev/raid/vinum/vinumrequest.c @@ -39,11 +39,11 @@ * * $Id: vinumrequest.c,v 1.30 2001/01/09 04:20:55 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumrequest.c,v 1.44.2.5 2002/08/28 04:30:56 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumrequest.c,v 1.3 2003/06/26 05:55:11 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumrequest.c,v 1.4 2003/08/07 21:17:09 dillon Exp $ */ -#include -#include +#include "vinumhdr.h" +#include "request.h" #include enum requeststatus bre(struct request *rq, diff --git a/sys/dev/raid/vinum/vinumrevive.c b/sys/dev/raid/vinum/vinumrevive.c index 22f1800989..82c71a2c9e 100644 --- a/sys/dev/raid/vinum/vinumrevive.c +++ b/sys/dev/raid/vinum/vinumrevive.c @@ -39,11 +39,11 @@ * * $Id: vinumrevive.c,v 1.14 2000/12/21 01:55:11 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.22.2.5 2001/03/13 02:59:43 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumrevive.c,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumrevive.c,v 1.3 2003/08/07 21:17:09 dillon Exp $ */ -#include -#include +#include "vinumhdr.h" +#include "request.h" /* * Revive a block of a subdisk. Return an error diff --git a/sys/dev/raid/vinum/vinumstate.c b/sys/dev/raid/vinum/vinumstate.c index f48fe8a312..e3cf425b3f 100644 --- a/sys/dev/raid/vinum/vinumstate.c +++ b/sys/dev/raid/vinum/vinumstate.c @@ -39,11 +39,11 @@ * * $Id: vinumstate.c,v 2.18 2000/05/10 07:30:50 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumstate.c,v 1.28.2.2 2000/06/08 02:00:23 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumstate.c,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumstate.c,v 1.3 2003/08/07 21:17:10 dillon Exp $ */ -#include -#include +#include "vinumhdr.h" +#include "request.h" /* Update drive state */ /* Return 1 if the state changes, otherwise 0 */ diff --git a/sys/dev/raid/vinum/vinumutil.c b/sys/dev/raid/vinum/vinumutil.c index ff99e9fc4d..47a89a689b 100644 --- a/sys/dev/raid/vinum/vinumutil.c +++ b/sys/dev/raid/vinum/vinumutil.c @@ -37,13 +37,13 @@ * * $Id: vinumutil.c,v 1.14 1999/12/30 07:04:02 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumutil.c,v 1.15 2000/02/29 06:16:44 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumutil.c,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumutil.c,v 1.3 2003/08/07 21:17:10 dillon Exp $ */ /* This file contains utility routines used both in kernel and user context */ -#include -#include +#include "vinumhdr.h" +#include "statetexts.h" #ifndef _KERNEL #include extern jmp_buf command_fail; /* return on a failed command */ diff --git a/sys/dev/raid/vinum/vinumvar.h b/sys/dev/raid/vinum/vinumvar.h index 807e315ee9..e7c542d4f5 100644 --- a/sys/dev/raid/vinum/vinumvar.h +++ b/sys/dev/raid/vinum/vinumvar.h @@ -39,11 +39,11 @@ * * $Id: vinumvar.h,v 1.24 2000/03/01 02:34:57 grog Exp grog $ * $FreeBSD: src/sys/dev/vinum/vinumvar.h,v 1.32.2.4 2001/05/28 05:56:27 grog Exp $ - * $DragonFly: src/sys/dev/raid/vinum/vinumvar.h,v 1.3 2003/07/21 05:50:38 dillon Exp $ + * $DragonFly: src/sys/dev/raid/vinum/vinumvar.h,v 1.4 2003/08/07 21:17:10 dillon Exp $ */ #include -#include +#include "vinumstate.h" /* * Some configuration maxima. They're an enum because diff --git a/sys/dev/serial/cronyx/cronyx.c b/sys/dev/serial/cronyx/cronyx.c index 0ac3406f79..294e4f03a6 100644 --- a/sys/dev/serial/cronyx/cronyx.c +++ b/sys/dev/serial/cronyx/cronyx.c @@ -13,7 +13,7 @@ * * Version 1.6, Wed May 31 16:03:20 MSD 1995 * $FreeBSD: src/sys/i386/isa/cronyx.c,v 1.10.6.1 2000/08/03 01:01:20 peter Exp $ - * $DragonFly: src/sys/dev/serial/cronyx/cronyx.c,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/dev/serial/cronyx/cronyx.c,v 1.3 2003/08/07 21:17:10 dillon Exp $ */ #if defined (MSDOS) || defined (__MSDOS__) # include @@ -38,7 +38,7 @@ # include # endif # include -# include +# include #endif #define DMA_MASK 0xd4 /* DMA mask register */ diff --git a/sys/dev/serial/cy/cy.c b/sys/dev/serial/cy/cy.c index 4a5ef5b8f2..a5e54149f1 100644 --- a/sys/dev/serial/cy/cy.c +++ b/sys/dev/serial/cy/cy.c @@ -28,11 +28,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/cy.c,v 1.97.2.2 2001/08/22 13:04:58 bde Exp $ - * $DragonFly: src/sys/dev/serial/cy/cy.c,v 1.7 2003/07/23 02:30:19 dillon Exp $ + * $DragonFly: src/sys/dev/serial/cy/cy.c,v 1.8 2003/08/07 21:17:10 dillon Exp $ */ #include "opt_compat.h" -#include "cy.h" +#include "use_cy.h" /* * TODO: @@ -86,8 +86,8 @@ #endif #include -#include -#include +#include +#include "cyreg.h" #include #ifdef SMP diff --git a/sys/dev/serial/cy/cy_pci.c b/sys/dev/serial/cy/cy_pci.c index 42ae7b38a2..ce773c2ac2 100644 --- a/sys/dev/serial/cy/cy_pci.c +++ b/sys/dev/serial/cy/cy_pci.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/pci/cy_pci.c,v 1.17.2.1 2002/03/17 04:14:18 bde Exp $ - * $DragonFly: src/sys/dev/serial/cy/cy_pci.c,v 1.2 2003/06/17 04:28:56 dillon Exp $ + * $DragonFly: src/sys/dev/serial/cy/cy_pci.c,v 1.3 2003/08/07 21:17:10 dillon Exp $ */ /* @@ -40,9 +40,9 @@ #include #include -#include +#include -#include +#include "cy_pcireg.h" #ifdef CY_PCI_FASTINTR #include diff --git a/sys/dev/serial/dgb/dgm.c b/sys/dev/serial/dgb/dgm.c index 0310c2278a..b342c72624 100644 --- a/sys/dev/serial/dgb/dgm.c +++ b/sys/dev/serial/dgb/dgm.c @@ -1,6 +1,6 @@ /*- * $FreeBSD: src/sys/dev/dgb/dgm.c,v 1.31.2.3 2001/10/07 09:02:25 brian Exp $ - * $DragonFly: src/sys/dev/serial/dgb/dgm.c,v 1.6 2003/07/21 07:57:40 dillon Exp $ + * $DragonFly: src/sys/dev/serial/dgb/dgm.c,v 1.7 2003/08/07 21:17:10 dillon Exp $ * * This driver and the associated header files support the ISA PC/Xem * Digiboards. Its evolutionary roots are described below. @@ -95,9 +95,9 @@ #include #include -#include -#include -#include +#include "dgmfep.h" +#include "dgmbios.h" +#include "dgmreg.h" #define CALLOUT_MASK 0x40000 #define CONTROL_MASK 0xC0 diff --git a/sys/dev/serial/rc/rc.c b/sys/dev/serial/rc/rc.c index 490b645eef..bf0513f1fc 100644 --- a/sys/dev/serial/rc/rc.c +++ b/sys/dev/serial/rc/rc.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/rc.c,v 1.53.2.1 2001/02/26 04:23:10 jlemon Exp $ - * $DragonFly: src/sys/dev/serial/rc/rc.c,v 1.7 2003/07/26 19:07:48 rob Exp $ + * $DragonFly: src/sys/dev/serial/rc/rc.c,v 1.8 2003/08/07 21:17:10 dillon Exp $ * */ @@ -34,7 +34,7 @@ * */ -#include "rc.h" +#include "use_rc.h" /*#define RCDEBUG*/ @@ -50,10 +50,10 @@ #include #include -#include +#include #include -#include +#include "rcreg.h" /* Prototypes */ static int rcprobe __P((struct isa_device *)); diff --git a/sys/dev/serial/rp/rp.c b/sys/dev/serial/rp/rp.c index e9a7277aae..a866ae5e26 100644 --- a/sys/dev/serial/rp/rp.c +++ b/sys/dev/serial/rp/rp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/rp/rp.c,v 1.45.2.2 2002/11/07 22:26:59 tegge Exp $ - * $DragonFly: src/sys/dev/serial/rp/rp.c,v 1.7 2003/07/26 14:25:24 rob Exp $ + * $DragonFly: src/sys/dev/serial/rp/rp.c,v 1.8 2003/08/07 21:17:11 dillon Exp $ */ /* @@ -52,8 +52,8 @@ #include #define ROCKET_C -#include -#include +#include "rpreg.h" +#include "rpvar.h" static const char RocketPortVersion[] = "3.02"; diff --git a/sys/dev/serial/rp/rp_isa.c b/sys/dev/serial/rp/rp_isa.c index 41f7c7384f..f4f8ed4ade 100644 --- a/sys/dev/serial/rp/rp_isa.c +++ b/sys/dev/serial/rp/rp_isa.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/rp/rp_isa.c,v 1.3.2.1 2002/06/18 03:11:46 obrien Exp $ - * $DragonFly: src/sys/dev/serial/rp/rp_isa.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/serial/rp/rp_isa.c,v 1.3 2003/08/07 21:17:11 dillon Exp $ */ #include @@ -49,10 +49,10 @@ #include #define ROCKET_C -#include -#include +#include "rpreg.h" +#include "rpvar.h" -#include +#include /* ISA-specific part of CONTROLLER_t */ struct ISACONTROLLER_T { diff --git a/sys/dev/serial/rp/rp_pci.c b/sys/dev/serial/rp/rp_pci.c index 9639031794..4418d1b22e 100644 --- a/sys/dev/serial/rp/rp_pci.c +++ b/sys/dev/serial/rp/rp_pci.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/rp/rp_pci.c,v 1.3.2.1 2002/06/18 03:11:46 obrien Exp $ - * $DragonFly: src/sys/dev/serial/rp/rp_pci.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/serial/rp/rp_pci.c,v 1.3 2003/08/07 21:17:11 dillon Exp $ */ #include @@ -49,11 +49,11 @@ #include #define ROCKET_C -#include -#include +#include "rpreg.h" +#include "rpvar.h" -#include -#include +#include +#include /* PCI IDs */ #define RP_VENDOR_ID 0x11FE diff --git a/sys/dev/serial/rp2/rp.c b/sys/dev/serial/rp2/rp.c index b1c677c511..0cd1b59f62 100644 --- a/sys/dev/serial/rp2/rp.c +++ b/sys/dev/serial/rp2/rp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/rp.c,v 1.33.2.2 2001/02/26 04:23:10 jlemon Exp $ - * $DragonFly: src/sys/dev/serial/rp2/Attic/rp.c,v 1.7 2003/07/26 19:07:48 rob Exp $ + * $DragonFly: src/sys/dev/serial/rp2/Attic/rp.c,v 1.8 2003/08/07 21:17:11 dillon Exp $ */ /* @@ -48,13 +48,13 @@ #include #include -#include +#include -#include +#include #define ROCKET_C -#include -#include +#include "rpreg.h" +#include "rpvar.h" #ifndef TRUE #define TRUE 1 diff --git a/sys/dev/serial/si/si.c b/sys/dev/serial/si/si.c index 28c53b8a14..634dae89a4 100644 --- a/sys/dev/serial/si/si.c +++ b/sys/dev/serial/si/si.c @@ -31,7 +31,7 @@ * NO EVENT SHALL THE AUTHORS BE LIABLE. * * $FreeBSD: src/sys/dev/si/si.c,v 1.101.2.1 2001/02/26 04:23:06 jlemon Exp $ - * $DragonFly: src/sys/dev/serial/si/si.c,v 1.6 2003/07/21 07:57:41 dillon Exp $ + * $DragonFly: src/sys/dev/serial/si/si.c,v 1.7 2003/08/07 21:17:11 dillon Exp $ */ #ifndef lint @@ -68,9 +68,9 @@ static const char si_copyright1[] = "@(#) Copyright (C) Specialix International #include -#include -#include -#include +#include "sireg.h" +#include "sivar.h" +#include "si.h" /* * This device driver is designed to interface the Specialix International diff --git a/sys/dev/serial/si/si2_z280.c b/sys/dev/serial/si/si2_z280.c index 70afd0b02f..1936a5585c 100644 --- a/sys/dev/serial/si/si2_z280.c +++ b/sys/dev/serial/si/si2_z280.c @@ -26,12 +26,12 @@ * NO EVENT SHALL THE AUTHORS BE LIABLE. * * $FreeBSD: src/sys/dev/si/si2_z280.c,v 1.4 2000/01/24 07:24:00 peter Exp $ - * $DragonFly: src/sys/dev/serial/si/si2_z280.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/serial/si/si2_z280.c,v 1.3 2003/08/07 21:17:11 dillon Exp $ */ #include #include -#include +#include "sivar.h" /* SI2_Z280.C Version, Bootstrap and Download Code Arrays... */ diff --git a/sys/dev/serial/si/si3_t225.c b/sys/dev/serial/si/si3_t225.c index 66cb8551d4..6b218afdd3 100644 --- a/sys/dev/serial/si/si3_t225.c +++ b/sys/dev/serial/si/si3_t225.c @@ -26,12 +26,12 @@ * NO EVENT SHALL THE AUTHORS BE LIABLE. * * $FreeBSD: src/sys/dev/si/si3_t225.c,v 1.6 2000/01/25 16:45:54 peter Exp $ - * $DragonFly: src/sys/dev/serial/si/si3_t225.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/serial/si/si3_t225.c,v 1.3 2003/08/07 21:17:11 dillon Exp $ */ #include #include -#include +#include "sivar.h" /* SI3_T225.C Version, Bootstrap and Download Code Arrays... */ diff --git a/sys/dev/serial/si/si_eisa.c b/sys/dev/serial/si/si_eisa.c index 2b59bffc7b..1a1dbd7ce4 100644 --- a/sys/dev/serial/si/si_eisa.c +++ b/sys/dev/serial/si/si_eisa.c @@ -18,7 +18,7 @@ * NO EVENT SHALL THE AUTHORS BE LIABLE. * * $FreeBSD: src/sys/dev/si/si_eisa.c,v 1.1 2000/01/24 07:24:01 peter Exp $ - * $DragonFly: src/sys/dev/serial/si/si_eisa.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/serial/si/si_eisa.c,v 1.3 2003/08/07 21:17:11 dillon Exp $ */ #include @@ -30,10 +30,10 @@ #include #include -#include -#include +#include "sireg.h" +#include "sivar.h" -#include +#include static int si_eisa_probe(device_t dev) diff --git a/sys/dev/serial/si/si_isa.c b/sys/dev/serial/si/si_isa.c index 898f7ff9fe..6e05bba0d5 100644 --- a/sys/dev/serial/si/si_isa.c +++ b/sys/dev/serial/si/si_isa.c @@ -18,7 +18,7 @@ * NO EVENT SHALL THE AUTHORS BE LIABLE. * * $FreeBSD: src/sys/dev/si/si_isa.c,v 1.1 2000/01/24 07:24:01 peter Exp $ - * $DragonFly: src/sys/dev/serial/si/si_isa.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/serial/si/si_isa.c,v 1.3 2003/08/07 21:17:11 dillon Exp $ */ #include "opt_debug_si.h" @@ -31,10 +31,10 @@ #include #include -#include -#include +#include "sireg.h" +#include "sivar.h" -#include +#include /* Look for a valid board at the given mem addr */ static int diff --git a/sys/dev/serial/si/si_pci.c b/sys/dev/serial/si/si_pci.c index 79c917b316..9ecef9deae 100644 --- a/sys/dev/serial/si/si_pci.c +++ b/sys/dev/serial/si/si_pci.c @@ -18,7 +18,7 @@ * NO EVENT SHALL THE AUTHORS BE LIABLE. * * $FreeBSD: src/sys/dev/si/si_pci.c,v 1.2 2000/01/24 08:11:10 peter Exp $ - * $DragonFly: src/sys/dev/serial/si/si_pci.c,v 1.2 2003/06/17 04:28:29 dillon Exp $ + * $DragonFly: src/sys/dev/serial/si/si_pci.c,v 1.3 2003/08/07 21:17:11 dillon Exp $ */ #include @@ -29,10 +29,10 @@ #include #include -#include -#include +#include "sireg.h" +#include "sivar.h" -#include +#include static int si_pci_probe(device_t dev) diff --git a/sys/dev/serial/sio/sio.c b/sys/dev/serial/sio/sio.c index 08cb778cc2..e36f84f647 100644 --- a/sys/dev/serial/sio/sio.c +++ b/sys/dev/serial/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/isa/sio.c,v 1.291.2.35 2003/05/18 08:51:15 murray Exp $ - * $DragonFly: src/sys/dev/serial/sio/sio.c,v 1.8 2003/07/21 05:50:42 dillon Exp $ + * $DragonFly: src/sys/dev/serial/sio/sio.c,v 1.9 2003/08/07 21:17:11 dillon Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -40,12 +40,12 @@ #include "opt_compat.h" #include "opt_ddb.h" #include "opt_sio.h" -#include "card.h" -#include "pci.h" +#include "use_card.h" +#include "use_pci.h" #ifdef __i386__ -#include "puc.h" +#include "use_puc.h" #endif -#include "sio.h" +#include "use_sio.h" /* * Serial driver, based on 386BSD-0.1 com driver. @@ -78,14 +78,14 @@ #include -#include -#include +#include +#include #if NPCI > 0 -#include -#include +#include +#include #endif #if NPUC > 0 -#include +#include #endif #include @@ -96,12 +96,12 @@ #endif #include -#include +#include "sioreg.h" #ifdef COM_ESP -#include +#include "../ic_layer/esp.h" #endif -#include +#include "../ic_layer/ns16550.h" #define LOTS_OF_EVENTS 64 /* helps separate urgent events from input */ diff --git a/sys/dev/serial/stl/stallion.c b/sys/dev/serial/stl/stallion.c index 81ad3c64ca..2c6664ed9a 100644 --- a/sys/dev/serial/stl/stallion.c +++ b/sys/dev/serial/stl/stallion.c @@ -34,13 +34,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/stallion.c,v 1.39.2.2 2001/08/30 12:29:57 murray Exp $ - * $DragonFly: src/sys/dev/serial/stl/stallion.c,v 1.6 2003/07/21 07:57:45 dillon Exp $ + * $DragonFly: src/sys/dev/serial/stl/stallion.c,v 1.7 2003/08/07 21:17:11 dillon Exp $ */ /*****************************************************************************/ #define TTYDEFCHARS 1 +#include "use_pci.h" #include "opt_compat.h" #include @@ -51,15 +52,14 @@ #include #include #include -#include +#include #include #include #include -#include "pci.h" #if NPCI > 0 -#include -#include +#include +#include #endif #undef STLDEBUG diff --git a/sys/dev/serial/stli/istallion.c b/sys/dev/serial/stli/istallion.c index 385462aaf8..d99177b125 100644 --- a/sys/dev/serial/stli/istallion.c +++ b/sys/dev/serial/stli/istallion.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/istallion.c,v 1.36.2.2 2001/08/30 12:29:57 murray Exp $ - * $DragonFly: src/sys/dev/serial/stli/istallion.c,v 1.7 2003/07/23 02:30:19 dillon Exp $ + * $DragonFly: src/sys/dev/serial/stli/istallion.c,v 1.8 2003/08/07 21:17:11 dillon Exp $ */ /*****************************************************************************/ @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/dev/sound/isa/gusc.c b/sys/dev/sound/isa/gusc.c index 924c0590f4..692857a336 100644 --- a/sys/dev/sound/isa/gusc.c +++ b/sys/dev/sound/isa/gusc.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/isa/gusc.c,v 1.5.2.6 2002/04/22 15:49:30 cg Exp $ - * $DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.3 2003/08/07 21:17:11 dillon Exp $ */ #include @@ -42,13 +42,13 @@ #include #include "bus_if.h" -#include -#include +#include +#include #ifdef __alpha__ /* XXX workaround a stupid warning */ #include #endif -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/isa/gusc.c,v 1.3 2003/08/07 21:17:11 dillon Exp $"); #define LOGICALID_NOPNP 0 #define LOGICALID_PCM 0x0000561e diff --git a/sys/dev/sound/isa/i386/ad1848.c b/sys/dev/sound/isa/i386/ad1848.c index 4c02bcc28f..568b926e49 100644 --- a/sys/dev/sound/isa/i386/ad1848.c +++ b/sys/dev/sound/isa/i386/ad1848.c @@ -48,16 +48,16 @@ * initialization routine. * * $FreeBSD: src/sys/i386/isa/sound/ad1848.c,v 1.30 1999/12/01 14:15:30 nyan Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/Attic/ad1848.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/ad1848.c,v 1.3 2003/08/07 21:17:12 dillon Exp $ */ #define DEB(x) #define DEB1(x) -#include +#include "sound_config.h" #if defined(CONFIG_AD1848) -#include +#include "ad1848_mixer.h" #include #if defined(CONFIG_CS4232) diff --git a/sys/dev/sound/isa/i386/adlib_card.c b/sys/dev/sound/isa/i386/adlib_card.c index 41039b934d..f2710f3c8b 100644 --- a/sys/dev/sound/isa/i386/adlib_card.c +++ b/sys/dev/sound/isa/i386/adlib_card.c @@ -25,9 +25,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/adlib_card.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ -#include +#include "sound_config.h" #if defined(CONFIG_YM3812) diff --git a/sys/dev/sound/isa/i386/dev_table.c b/sys/dev/sound/isa/i386/dev_table.c index 0417c42ba3..cfa21c7326 100644 --- a/sys/dev/sound/isa/i386/dev_table.c +++ b/sys/dev/sound/isa/i386/dev_table.c @@ -26,11 +26,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/sound/dev_table.c,v 1.18 1999/12/20 18:04:59 eivind Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/Attic/dev_table.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/dev_table.c,v 1.3 2003/08/07 21:17:12 dillon Exp $ */ #define _DEV_TABLE_C_ -#include +#include "sound_config.h" #if NSND > 0 diff --git a/sys/dev/sound/isa/i386/dmabuf.c b/sys/dev/sound/isa/i386/dmabuf.c index 2ee75663ac..ee3359793a 100644 --- a/sys/dev/sound/isa/i386/dmabuf.c +++ b/sys/dev/sound/isa/i386/dmabuf.c @@ -26,10 +26,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/sound/dmabuf.c,v 1.38.2.2 2000/08/08 19:49:54 peter Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/Attic/dmabuf.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/dmabuf.c,v 1.3 2003/08/07 21:17:12 dillon Exp $ */ -#include +#include "sound_config.h" #include diff --git a/sys/dev/sound/isa/i386/gus/gus_card.c b/sys/dev/sound/isa/i386/gus/gus_card.c index 7dac1bdf18..74082e92d2 100644 --- a/sys/dev/sound/isa/i386/gus/gus_card.c +++ b/sys/dev/sound/isa/i386/gus/gus_card.c @@ -25,13 +25,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $DragonFly: src/sys/dev/sound/isa/i386/gus/Attic/gus_card.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ #include #if defined(CONFIG_GUS) -#include +#include "gus_hw.h" #include int gus_base, gus_irq, gus_dma; diff --git a/sys/dev/sound/isa/i386/gus/gus_midi.c b/sys/dev/sound/isa/i386/gus/gus_midi.c index 0dfc7c502a..d93a1a11bf 100644 --- a/sys/dev/sound/isa/i386/gus/gus_midi.c +++ b/sys/dev/sound/isa/i386/gus/gus_midi.c @@ -25,12 +25,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $DragonFly: src/sys/dev/sound/isa/i386/gus/Attic/gus_midi.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ #include #if defined(CONFIG_GUS) && defined(CONFIG_MIDI) -#include +#include "gus_hw.h" static int midi_busy = 0, input_opened = 0; static int my_dev; diff --git a/sys/dev/sound/isa/i386/gus/gus_vol.c b/sys/dev/sound/isa/i386/gus/gus_vol.c index fc66618f3b..aa9cf3d723 100644 --- a/sys/dev/sound/isa/i386/gus/gus_vol.c +++ b/sys/dev/sound/isa/i386/gus/gus_vol.c @@ -2,11 +2,13 @@ * gus_vol.c - Compute volume for GUS. * * Greg Lee 1993. + * + * $DragonFly: src/sys/dev/sound/isa/i386/gus/Attic/gus_vol.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ #include #ifdef CONFIG_GUS -#include +#include "gus_linearvol.h" #define GUS_VOLUME gus_wave_volume diff --git a/sys/dev/sound/isa/i386/gus/gus_wave.c b/sys/dev/sound/isa/i386/gus/gus_wave.c index 80b1766f27..547b25cfb0 100644 --- a/sys/dev/sound/isa/i386/gus/gus_wave.c +++ b/sys/dev/sound/isa/i386/gus/gus_wave.c @@ -26,14 +26,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/sound/gus_wave.c,v 1.32 1999/12/20 18:05:00 eivind Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/gus/Attic/gus_wave.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/gus/Attic/gus_wave.c,v 1.3 2003/08/07 21:17:12 dillon Exp $ */ #include #include #include -#include +#include "gus_hw.h" #include #include diff --git a/sys/dev/sound/isa/i386/midi_synth.c b/sys/dev/sound/isa/i386/midi_synth.c index e63b24ad86..58f7087a70 100644 --- a/sys/dev/sound/isa/i386/midi_synth.c +++ b/sys/dev/sound/isa/i386/midi_synth.c @@ -25,6 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/midi_synth.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ #define USE_SEQ_MACROS @@ -32,7 +33,7 @@ #include -#include +#include "sound_config.h" #if defined(CONFIGURE_SOUNDCARD) /* && defined(CONFIG_MIDI) */ @@ -41,7 +42,7 @@ static int *sysex_sleeper = NULL; static volatile struct snd_wait sysex_sleep_flag = {0}; -#include +#include "midi_synth.h" static int midi2synth[MAX_MIDI_DEV]; static int sysex_state[MAX_MIDI_DEV] = diff --git a/sys/dev/sound/isa/i386/midibuf.c b/sys/dev/sound/isa/i386/midibuf.c index 75e5c323d4..3942d9ed72 100644 --- a/sys/dev/sound/isa/i386/midibuf.c +++ b/sys/dev/sound/isa/i386/midibuf.c @@ -25,9 +25,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/midibuf.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ -#include +#include "sound_config.h" #if defined(CONFIG_MIDI) diff --git a/sys/dev/sound/isa/i386/opl3.c b/sys/dev/sound/isa/i386/opl3.c index bd3eb61e18..bd75e52f36 100644 --- a/sys/dev/sound/isa/i386/opl3.c +++ b/sys/dev/sound/isa/i386/opl3.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/sound/opl3.c,v 1.20 1999/12/27 04:37:18 tanimura Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/Attic/opl3.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/opl3.c,v 1.3 2003/08/07 21:17:12 dillon Exp $ * */ @@ -36,12 +36,12 @@ /* * hooft@chem.ruu.nl */ -#include +#include "sound_config.h" #if defined(CONFIG_YM3812) -#include +#include "opl3.h" #include #define MAX_VOICE 18 diff --git a/sys/dev/sound/isa/i386/patmgr.c b/sys/dev/sound/isa/i386/patmgr.c index 752b2e95de..f4a8025763 100644 --- a/sys/dev/sound/isa/i386/patmgr.c +++ b/sys/dev/sound/isa/i386/patmgr.c @@ -25,10 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/patmgr.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ #define PATMGR_C -#include +#include "sound_config.h" #if defined(CONFIG_SEQUENCER) diff --git a/sys/dev/sound/isa/i386/pca/pcaudio.c b/sys/dev/sound/isa/i386/pca/pcaudio.c index 6ca8c3da2a..4f4e49c9e1 100644 --- a/sys/dev/sound/isa/i386/pca/pcaudio.c +++ b/sys/dev/sound/isa/i386/pca/pcaudio.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/pcaudio.c,v 1.58 2000/01/25 21:58:43 dfr Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/pca/Attic/pcaudio.c,v 1.5 2003/07/21 07:57:44 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/pca/Attic/pcaudio.c,v 1.6 2003/08/07 21:17:12 dillon Exp $ */ #include @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include #include #define BUF_SIZE 8192 diff --git a/sys/dev/sound/isa/i386/sb/sb_dsp.c b/sys/dev/sound/isa/i386/sb/sb_dsp.c index 99f541b69c..3b1bbc17d6 100644 --- a/sys/dev/sound/isa/i386/sb/sb_dsp.c +++ b/sys/dev/sound/isa/i386/sb/sb_dsp.c @@ -31,7 +31,7 @@ * JRA Gibson April 1995 Code added for MV ProSonic/Jazz 16 in 16 bit mode * * $FreeBSD: src/sys/i386/isa/sound/sb_dsp.c,v 1.42 1999/12/27 04:37:19 tanimura Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/sb/Attic/sb_dsp.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/sb/Attic/sb_dsp.c,v 1.3 2003/08/07 21:17:12 dillon Exp $ */ #include @@ -43,7 +43,7 @@ #endif #include -#include +#include "sb_mixer.h" #include #undef SB_TEST_IRQ diff --git a/sys/dev/sound/isa/i386/sb/sb_mixer.c b/sys/dev/sound/isa/i386/sb/sb_mixer.c index 14db176fba..dd2bf375ea 100644 --- a/sys/dev/sound/isa/i386/sb/sb_mixer.c +++ b/sys/dev/sound/isa/i386/sb/sb_mixer.c @@ -28,6 +28,7 @@ * Modified: Hunyue Yau Jan 6 1994 Added code to support the Sound Galaxy * NX Pro mixer. * + * $DragonFly: src/sys/dev/sound/isa/i386/sb/Attic/sb_mixer.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ #include @@ -36,7 +37,7 @@ #define __SB_MIXER_C__ #include -#include +#include "sb_mixer.h" #undef SB_TEST_IRQ extern int sbc_base; diff --git a/sys/dev/sound/isa/i386/sbmidi/sb16_midi.c b/sys/dev/sound/isa/i386/sbmidi/sb16_midi.c index 60ff285369..7b757a7ec1 100644 --- a/sys/dev/sound/isa/i386/sbmidi/sb16_midi.c +++ b/sys/dev/sound/isa/i386/sbmidi/sb16_midi.c @@ -26,17 +26,17 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/sound/sb16_midi.c,v 1.20 1999/12/27 04:37:18 tanimura Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/sbmidi/Attic/sb16_midi.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/sbmidi/Attic/sb16_midi.c,v 1.3 2003/08/07 21:17:12 dillon Exp $ * */ +#include "use_sb.h" + #include #include #if defined(CONFIG_SB) && defined(CONFIG_SB16) && defined(CONFIG_MIDI) -#include "sb.h" - #ifdef PC98 #define DATAPORT (sb16midi_base) #define COMDPORT (sb16midi_base+0x100) diff --git a/sys/dev/sound/isa/i386/sbxvi/sb16_dsp.c b/sys/dev/sound/isa/i386/sbxvi/sb16_dsp.c index 2fc037b8c7..0bfc8d09ea 100644 --- a/sys/dev/sound/isa/i386/sbxvi/sb16_dsp.c +++ b/sys/dev/sound/isa/i386/sbxvi/sb16_dsp.c @@ -28,19 +28,19 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/sound/sb16_dsp.c,v 1.33 1999/12/27 04:37:18 tanimura Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/sbxvi/Attic/sb16_dsp.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/sbxvi/Attic/sb16_dsp.c,v 1.3 2003/08/07 21:17:12 dillon Exp $ * */ #define DEB(x) #define DEB1(x) -#include -#include "sb.h" -#include -#include +#include "use_sb.h" -#if defined(CONFIG_SB16) && (NSB > 0) && defined(CONFIG_AUDIO) && defined(CONFIG_SBPRO) +#include +#include +#include +#if defined(CONFIG_SB16) && (NSB > 0) && defined(CONFIG_AUDIO) && defined(CONFIG_SBPRO) extern sound_os_info *sb_osp; extern int sbc_base; diff --git a/sys/dev/sound/isa/i386/sequencer.c b/sys/dev/sound/isa/i386/sequencer.c index f028d0373a..765987b6f2 100644 --- a/sys/dev/sound/isa/i386/sequencer.c +++ b/sys/dev/sound/isa/i386/sequencer.c @@ -26,11 +26,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/sound/sequencer.c,v 1.25.2.1 2001/06/10 02:02:05 dd Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/Attic/sequencer.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/sequencer.c,v 1.3 2003/08/07 21:17:12 dillon Exp $ */ #define SEQUENCER_C -#include +#include "sound_config.h" #if NSND > 0 @@ -38,7 +38,7 @@ #include -#include +#include "midi_ctrl.h" static void seq_drain_midi_queues(void); int diff --git a/sys/dev/sound/isa/i386/sound_config.h b/sys/dev/sound/isa/i386/sound_config.h index 650adbe77a..14e9f54119 100644 --- a/sys/dev/sound/isa/i386/sound_config.h +++ b/sys/dev/sound/isa/i386/sound_config.h @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/sound/sound_config.h,v 1.20 1999/12/27 04:37:19 tanimura Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/Attic/sound_config.h,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/sound_config.h,v 1.3 2003/08/07 21:17:12 dillon Exp $ * */ @@ -47,7 +47,7 @@ #undef LOADABLE_SOUNDCARD #include -#include +#include "soundvers.h" #if defined(ISC) || defined(SCO) || defined(SVR42) #define GENERIC_SYSV @@ -195,8 +195,8 @@ struct channel_info { #define OPEN_WRITE PCM_ENABLE_OUTPUT #define OPEN_READWRITE (OPEN_READ|OPEN_WRITE) -#include -#include +#include "sound_calls.h" +#include "dev_table.h" #ifndef DEB #define DEB(x) diff --git a/sys/dev/sound/isa/i386/sound_pnp.c b/sys/dev/sound/isa/i386/sound_pnp.c index d3d278b9cc..52f213e64c 100644 --- a/sys/dev/sound/isa/i386/sound_pnp.c +++ b/sys/dev/sound/isa/i386/sound_pnp.c @@ -25,8 +25,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/sound_pnp.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ -#include +#include "sound_config.h" /* * XXX check what to use in place of CONFIG_PNP diff --git a/sys/dev/sound/isa/i386/sound_switch.c b/sys/dev/sound/isa/i386/sound_switch.c index 763a10ca12..80bfd82fe5 100644 --- a/sys/dev/sound/isa/i386/sound_switch.c +++ b/sys/dev/sound/isa/i386/sound_switch.c @@ -25,9 +25,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/sound_switch.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ -#include +#include "sound_config.h" #if NSND > 0 diff --git a/sys/dev/sound/isa/i386/sound_timer.c b/sys/dev/sound/isa/i386/sound_timer.c index cef7596f09..32a265186c 100644 --- a/sys/dev/sound/isa/i386/sound_timer.c +++ b/sys/dev/sound/isa/i386/sound_timer.c @@ -23,10 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/sound_timer.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ #define SEQUENCER_C -#include +#include "sound_config.h" #if NSND > 0 diff --git a/sys/dev/sound/isa/i386/soundcard.c b/sys/dev/sound/isa/i386/soundcard.c index 4c8f7f04cd..eb7124e957 100644 --- a/sys/dev/sound/isa/i386/soundcard.c +++ b/sys/dev/sound/isa/i386/soundcard.c @@ -26,19 +26,20 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/sound/soundcard.c,v 1.87 1999/12/20 18:05:01 eivind Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/Attic/soundcard.c,v 1.3 2003/07/21 05:50:41 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/soundcard.c,v 1.4 2003/08/07 21:17:12 dillon Exp $ * */ -#include +#include "use_snd.h" +#include "sound_config.h" #if NSND > 0 /* from "snd.h" */ -#include "uart.h" +#include "use_uart.h" #include #include #include #include -#include +#include /* diff --git a/sys/dev/sound/isa/i386/spkr/spkr.c b/sys/dev/sound/isa/i386/spkr/spkr.c index 60af4f6d77..cac230a56d 100644 --- a/sys/dev/sound/isa/i386/spkr/spkr.c +++ b/sys/dev/sound/isa/i386/spkr/spkr.c @@ -5,7 +5,7 @@ * modified for FreeBSD by Andrew A. Chernov * * $FreeBSD: src/sys/i386/isa/spkr.c,v 1.45 2000/01/29 16:00:32 peter Exp $ - * $DragonFly: src/sys/dev/sound/isa/i386/spkr/Attic/spkr.c,v 1.6 2003/07/21 05:50:40 dillon Exp $ + * $DragonFly: src/sys/dev/sound/isa/i386/spkr/Attic/spkr.c,v 1.7 2003/08/07 21:17:13 dillon Exp $ */ #include @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sys/dev/sound/isa/i386/sys_timer.c b/sys/dev/sound/isa/i386/sys_timer.c index a605dfc2f4..ea629d6258 100644 --- a/sys/dev/sound/isa/i386/sys_timer.c +++ b/sys/dev/sound/isa/i386/sys_timer.c @@ -26,10 +26,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $DragonFly: src/sys/dev/sound/isa/i386/Attic/sys_timer.c,v 1.2 2003/08/07 21:17:12 dillon Exp $ */ #define SEQUENCER_C -#include +#include "sound_config.h" #if NSND > 0 diff --git a/sys/dev/sound/isa/i386/trix/trix.c b/sys/dev/sound/isa/i386/trix/trix.c index 818ad5ffb3..a6ce463dca 100644 --- a/sys/dev/sound/isa/i386/trix/trix.c +++ b/sys/dev/sound/isa/i386/trix/trix.c @@ -25,6 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * + * $DragonFly: src/sys/dev/sound/isa/i386/trix/Attic/trix.c,v 1.2 2003/08/07 21:17:13 dillon Exp $ */ #include @@ -32,7 +33,7 @@ #if NTRIX > 0 #ifdef INCLUDE_TRIX_BOOT -#include +#include "trix_boot.h" #endif #if (NSB > 0) diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 856b6b5e5c..8b140d2264 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/als4000.c,v 1.2.2.5 2002/04/22 15:49:31 cg Exp $ - * $DragonFly: src/sys/dev/sound/pci/als4000.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/als4000.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ /* @@ -40,12 +40,12 @@ #include #include -#include -#include +#include +#include #include "mixer_if.h" -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/als4000.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/als4000.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* Debugging macro's */ #undef DEB diff --git a/sys/dev/sound/pci/aureal.c b/sys/dev/sound/pci/aureal.c index afd841ba28..58567454e4 100644 --- a/sys/dev/sound/pci/aureal.c +++ b/sys/dev/sound/pci/aureal.c @@ -24,17 +24,17 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/aureal.c,v 1.8.2.7 2002/04/22 15:49:31 cg Exp $ - * $DragonFly: src/sys/dev/sound/pci/aureal.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/aureal.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include #include #include -#include -#include +#include bus/ +#include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/aureal.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/aureal.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* PCI IDs of supported chips */ #define AU8820_PCI_ID 0x000112eb diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index daba21e7da..4472c8138b 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -40,21 +40,21 @@ * those that don't. * * $FreeBSD: src/sys/dev/sound/pci/cmi.c,v 1.1.2.8 2002/08/27 00:17:34 orion Exp $ - * $DragonFly: src/sys/dev/sound/pci/cmi.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/cmi.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include #include #include -#include -#include +#include +#include #include #include "mixer_if.h" -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/cmi.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/cmi.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index 63f0004af3..87bec3665b 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -29,18 +29,18 @@ * contributed towards power management. * * $FreeBSD: src/sys/dev/sound/pci/cs4281.c,v 1.2.2.8 2002/08/27 00:25:55 orion Exp $ - * $DragonFly: src/sys/dev/sound/pci/cs4281.c,v 1.3 2003/07/27 01:49:50 hmp Exp $ + * $DragonFly: src/sys/dev/sound/pci/cs4281.c,v 1.4 2003/08/07 21:17:13 dillon Exp $ */ #include #include -#include -#include +#include +#include #include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/cs4281.c,v 1.3 2003/07/27 01:49:50 hmp Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/cs4281.c,v 1.4 2003/08/07 21:17:13 dillon Exp $"); #define CS4281_DEFAULT_BUFSZ 16384 diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 5136b2c5cc..bbaea3cf71 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/csa.c,v 1.8.2.12 2002/10/05 19:53:18 orion Exp $ - * $DragonFly: src/sys/dev/sound/pci/csa.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/csa.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include @@ -46,12 +46,12 @@ #include #include -#include -#include +#include +#include -#include +#include "gnu/csaimg.h" -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/csa.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/csa.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* This is the pci device id. */ #define CS4610_PCI_ID 0x60011013 diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index 4644edb5cd..c0b53f2129 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/csapcm.c,v 1.8.2.7 2002/04/22 15:49:32 cg Exp $ - * $DragonFly: src/sys/dev/sound/pci/csapcm.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/csapcm.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include @@ -38,10 +38,10 @@ #include #include -#include -#include +#include +#include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/csapcm.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/csapcm.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* Buffer size on dma transfer. Fixed for CS416x. */ #define CS461x_BUFFSIZE (4 * 1024) diff --git a/sys/dev/sound/pci/ds1.c b/sys/dev/sound/pci/ds1.c index 05a9f0d570..9ac5a5c993 100644 --- a/sys/dev/sound/pci/ds1.c +++ b/sys/dev/sound/pci/ds1.c @@ -24,19 +24,19 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.8.2.9 2003/04/28 03:59:03 simokawa Exp $ - * $DragonFly: src/sys/dev/sound/pci/ds1.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/ds1.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include #include -#include -#include +#include +#include #include #include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/ds1.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/ds1.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index d1c9425db1..78a9bb942c 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -24,18 +24,18 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/emu10k1.c,v 1.6.2.9 2002/04/22 15:49:32 cg Exp $ - * $DragonFly: src/sys/dev/sound/pci/emu10k1.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/emu10k1.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include #include -#include +#include "gnu/emu10k1.h" -#include -#include +#include +#include #include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/emu10k1.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/emu10k1.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index d4aa93cead..518e29b5fe 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -39,7 +39,7 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/es137x.c,v 1.13.2.10 2002/05/07 17:02:25 greid Exp $ - * $DragonFly: src/sys/dev/sound/pci/es137x.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/es137x.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ /* @@ -55,14 +55,14 @@ #include #include -#include -#include +#include +#include #include #include "mixer_if.h" -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/es137x.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/es137x.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); static int debug = 0; SYSCTL_INT(_debug, OID_AUTO, es_debug, CTLFLAG_RW, &debug, 0, ""); diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 4c83acce64..5dda0715cf 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -24,15 +24,15 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.3.2.8 2002/12/24 21:17:42 semenu Exp $ - * $DragonFly: src/sys/dev/sound/pci/fm801.c,v 1.3 2003/07/26 14:25:25 rob Exp $ + * $DragonFly: src/sys/dev/sound/pci/fm801.c,v 1.4 2003/08/07 21:17:13 dillon Exp $ */ #include #include -#include -#include +#include +#include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/fm801.c,v 1.3 2003/07/26 14:25:25 rob Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/fm801.c,v 1.4 2003/08/07 21:17:13 dillon Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 #define PCI_DEVICE_FORTEMEDIA1 0x08011319 diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index 6d4d493f75..b412709a5d 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -25,17 +25,17 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/ich.c,v 1.3.2.12 2003/01/20 03:59:42 orion Exp $ - * $DragonFly: src/sys/dev/sound/pci/ich.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/ich.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include #include #include -#include -#include +#include +#include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/ich.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/ich.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c index 3dc3c21547..d71d0c19c4 100644 --- a/sys/dev/sound/pci/maestro.c +++ b/sys/dev/sound/pci/maestro.c @@ -25,7 +25,7 @@ * * $Id: maestro.c,v 1.12 2000/09/06 03:32:34 taku Exp $ * $FreeBSD: src/sys/dev/sound/pci/maestro.c,v 1.2.2.5 2002/04/22 15:49:32 cg Exp $ - * $DragonFly: src/sys/dev/sound/pci/maestro.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/maestro.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ /* @@ -48,12 +48,12 @@ #include #include -#include -#include +#include +#include #include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/maestro.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/maestro.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); #define inline __inline diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index 9f6e65d43c..46d1eff211 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/maestro3.c,v 1.2.2.11 2002/09/16 19:52:33 scottl Exp $ - * $DragonFly: src/sys/dev/sound/pci/maestro3.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/maestro3.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ /* @@ -58,13 +58,13 @@ #include #include -#include -#include +#include +#include #include #include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/maestro3.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/maestro3.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index 03c3c4a5df..ec05f8f05e 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/neomagic.c,v 1.7.2.11 2002/04/22 15:49:32 cg Exp $ - * $DragonFly: src/sys/dev/sound/pci/neomagic.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/neomagic.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include @@ -34,10 +34,10 @@ #include #include -#include -#include +#include +#include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/neomagic.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/neomagic.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index 8b7255a29c..6197bc7203 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -23,20 +23,20 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/solo.c,v 1.9.2.8 2002/04/22 15:49:32 cg Exp $ - * $DragonFly: src/sys/dev/sound/pci/solo.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/solo.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include -#include -#include +#include +#include #include #include #include "mixer_if.h" -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/solo.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/solo.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); #define SOLO_DEFAULT_BUFSZ 16384 #define ABS(x) (((x) < 0)? -(x) : (x)) diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index 815996b14d..8472f618e4 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -24,17 +24,17 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.9.2.11 2002/10/22 08:27:13 cognet Exp $ - * $DragonFly: src/sys/dev/sound/pci/t4dwave.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/t4dwave.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include #include #include -#include -#include +#include +#include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/t4dwave.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/t4dwave.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* -------------------------------------------------------------------- */ #define TDX_PCI_ID 0x20001023 diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 55b54bd9c9..da0dac2bdc 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/via8233.c,v 1.2.2.2 2003/02/06 17:35:56 orion Exp $ - * $DragonFly: src/sys/dev/sound/pci/via8233.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/via8233.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ /* Some Credits: @@ -40,13 +40,13 @@ #include #include -#include -#include +#include +#include #include #include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/via8233.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/via8233.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); #define VIA8233_PCI_ID 0x30591106 diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index fc3bdfaca9..7b889f3b92 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -24,19 +24,19 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pci/via82c686.c,v 1.4.2.10 2003/05/11 01:45:53 orion Exp $ - * $DragonFly: src/sys/dev/sound/pci/via82c686.c,v 1.2 2003/06/17 04:28:30 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/via82c686.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include #include -#include -#include +#include +#include #include #include -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/via82c686.c,v 1.2 2003/06/17 04:28:30 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/via82c686.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); #define VIA_PCI_ID 0x30581106 #define NSEGS 4 /* Number of segments in SGD table */ diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index e332a96903..bf1d2d12f2 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -28,18 +28,18 @@ * muting. * * $FreeBSD: src/sys/dev/sound/pci/vibes.c,v 1.4.2.6 2002/04/22 15:49:33 cg Exp $ - * $DragonFly: src/sys/dev/sound/pci/vibes.c,v 1.2 2003/06/17 04:28:31 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pci/vibes.c,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ #include #include -#include -#include +#include +#include #include "mixer_if.h" -SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/vibes.c,v 1.2 2003/06/17 04:28:31 dillon Exp $"); +SND_DECLARE_FILE("$DragonFly: src/sys/dev/sound/pci/vibes.c,v 1.3 2003/08/07 21:17:13 dillon Exp $"); /* ------------------------------------------------------------------------- */ /* Constants */ diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index ae9dad11b6..02b51b451a 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/sound/pcm/sound.h,v 1.10.2.11 2002/04/22 15:49:36 cg Exp $ - * $DragonFly: src/sys/dev/sound/pcm/sound.h,v 1.2 2003/06/17 04:28:31 dillon Exp $ + * $DragonFly: src/sys/dev/sound/pcm/sound.h,v 1.3 2003/08/07 21:17:13 dillon Exp $ */ /* @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index cac14ca645..5a73e86724 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -1,6 +1,6 @@ /* $NetBSD: uaudio.c,v 1.41 2001/01/23 14:04:13 augustss Exp $ */ /* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.6.2.2 2002/11/06 21:18:17 joe Exp $: */ -/* $DragonFly: src/sys/dev/sound/usb/uaudio.c,v 1.3 2003/06/19 01:02:29 dillon Exp $: */ +/* $DragonFly: src/sys/dev/sound/usb/uaudio.c,v 1.4 2003/08/07 21:17:13 dillon Exp $: */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -78,10 +78,10 @@ #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/sys/dev/usbmisc/ubsa/ubsa.c b/sys/dev/usbmisc/ubsa/ubsa.c index 08d856d82c..b6ea3a990a 100644 --- a/sys/dev/usbmisc/ubsa/ubsa.c +++ b/sys/dev/usbmisc/ubsa/ubsa.c @@ -59,7 +59,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/ubsa.c,v 1.2.2.1 2002/12/11 20:54:47 kan Exp $ - * $DragonFly: src/sys/dev/usbmisc/ubsa/ubsa.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ + * $DragonFly: src/sys/dev/usbmisc/ubsa/ubsa.c,v 1.3 2003/08/07 21:17:14 dillon Exp $ */ #include @@ -82,15 +82,15 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include "../ucom/ucomvar.h" #ifdef UBSA_DEBUG Static int ubsadebug = 0; diff --git a/sys/dev/usbmisc/ucom/ucom.c b/sys/dev/usbmisc/ucom/ucom.c index 1b8576663a..3b0fa6aadc 100644 --- a/sys/dev/usbmisc/ucom/ucom.c +++ b/sys/dev/usbmisc/ucom/ucom.c @@ -1,6 +1,6 @@ /* $NetBSD: ucom.c,v 1.39 2001/08/16 22:31:24 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/ucom.c,v 1.24.2.2 2003/01/17 17:32:10 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/ucom/ucom.c,v 1.7 2003/07/21 07:57:42 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/ucom/ucom.c,v 1.8 2003/08/07 21:17:14 dillon Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -91,15 +91,15 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include "ucomvar.h" #ifdef USB_DEBUG static int ucomdebug = 0; diff --git a/sys/dev/usbmisc/ufm/ufm.c b/sys/dev/usbmisc/ufm/ufm.c index 50b57e985e..d411d508e8 100644 --- a/sys/dev/usbmisc/ufm/ufm.c +++ b/sys/dev/usbmisc/ufm/ufm.c @@ -29,7 +29,7 @@ */ /* $FreeBSD: src/sys/dev/usb/ufm.c,v 1.1.2.3 2002/11/06 14:41:01 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/ufm/ufm.c,v 1.3 2003/07/21 05:50:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/ufm/ufm.c,v 1.4 2003/08/07 21:17:14 dillon Exp $ */ #include #include @@ -58,12 +58,12 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #ifdef USB_DEBUG #define DPRINTF(x) if (ufmdebug) logprintf x diff --git a/sys/dev/usbmisc/uftdi/uftdi.c b/sys/dev/usbmisc/uftdi/uftdi.c index 618cf37cbd..df252b4a57 100644 --- a/sys/dev/usbmisc/uftdi/uftdi.c +++ b/sys/dev/usbmisc/uftdi/uftdi.c @@ -1,6 +1,6 @@ /* $NetBSD: uftdi.c,v 1.12 2002/07/18 14:44:10 scw Exp $ */ /* $FreeBSD: src/sys/dev/usb/uftdi.c,v 1.3.2.1 2002/11/21 01:28:17 ticso Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/uftdi/uftdi.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/uftdi/uftdi.c,v 1.3 2003/08/07 21:17:14 dillon Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -68,16 +68,16 @@ #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include +#include "../ucom/ucomvar.h" -#include +#include "uftdireg.h" #ifdef USB_DEBUG static int uftdidebug = 0; diff --git a/sys/dev/usbmisc/ugen/ugen.c b/sys/dev/usbmisc/ugen/ugen.c index 6af22383e0..c4100a426c 100644 --- a/sys/dev/usbmisc/ugen/ugen.c +++ b/sys/dev/usbmisc/ugen/ugen.c @@ -1,6 +1,6 @@ /* $NetBSD: ugen.c,v 1.27 1999/10/28 12:08:38 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.38.2.9 2002/11/06 14:41:01 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/ugen/ugen.c,v 1.6 2003/07/21 05:50:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/ugen/ugen.c,v 1.7 2003/08/07 21:17:14 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -63,9 +63,9 @@ #include #include -#include -#include -#include +#include +#include +#include #ifdef USB_DEBUG #define DPRINTF(x) if (ugendebug) logprintf x diff --git a/sys/dev/usbmisc/uhid/uhid.c b/sys/dev/usbmisc/uhid/uhid.c index afb34a97e6..0b31ae5f50 100644 --- a/sys/dev/usbmisc/uhid/uhid.c +++ b/sys/dev/usbmisc/uhid/uhid.c @@ -1,6 +1,6 @@ /* $NetBSD: uhid.c,v 1.38 2000/04/27 15:26:48 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhid.c,v 1.27.2.12 2002/11/06 20:23:50 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/uhid/uhid.c,v 1.5 2003/07/21 05:50:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/uhid/uhid.c,v 1.6 2003/08/07 21:17:14 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -67,12 +67,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #if defined(__FreeBSD__) && defined(__i386__) #include diff --git a/sys/dev/usbmisc/ukbd/ukbd.c b/sys/dev/usbmisc/ukbd/ukbd.c index 1f06e1a91f..a86223e5cf 100644 --- a/sys/dev/usbmisc/ukbd/ukbd.c +++ b/sys/dev/usbmisc/ukbd/ukbd.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/usb/ukbd.c,v 1.24.2.6 2002/11/06 20:23:50 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/ukbd/ukbd.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/ukbd/ukbd.c,v 1.3 2003/08/07 21:17:14 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -58,16 +58,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #define UKBD_EMULATE_ATSCANCODE 1 @@ -418,7 +418,7 @@ Static int keycode2scancode(int keycode, int shift, int up); #define KBD_DFLT_KEYMAP #include "ukbdmap.h" #endif -#include +#include /* structures for the default keyboard */ Static keyboard_t default_kbd; diff --git a/sys/dev/usbmisc/ulpt/ulpt.c b/sys/dev/usbmisc/ulpt/ulpt.c index 4e166a889a..63494358b9 100644 --- a/sys/dev/usbmisc/ulpt/ulpt.c +++ b/sys/dev/usbmisc/ulpt/ulpt.c @@ -1,6 +1,6 @@ /* $NetBSD: ulpt.c,v 1.29 1999/11/17 23:00:50 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.26.2.13 2002/11/06 20:23:50 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/ulpt/ulpt.c,v 1.4 2003/07/21 05:50:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/ulpt/ulpt.c,v 1.5 2003/08/07 21:17:14 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -62,9 +62,9 @@ #include #include -#include -#include -#include +#include +#include +#include #define TIMEOUT hz*16 /* wait up to 16 seconds for a ready */ #define STEP hz/4 diff --git a/sys/dev/usbmisc/umass/umass.c b/sys/dev/usbmisc/umass/umass.c index 273611a0f5..9082d24856 100644 --- a/sys/dev/usbmisc/umass/umass.c +++ b/sys/dev/usbmisc/umass/umass.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/umass.c,v 1.11.2.19 2003/05/17 21:45:27 njl Exp $ - * $DragonFly: src/sys/dev/usbmisc/umass/umass.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ + * $DragonFly: src/sys/dev/usbmisc/umass/umass.c,v 1.3 2003/08/07 21:17:14 dillon Exp $ * $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $ */ @@ -104,20 +104,20 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include #ifdef USB_DEBUG #define DIF(m, x) if (umassdebug & (m)) do { x ; } while (0) diff --git a/sys/dev/usbmisc/umodem/umodem.c b/sys/dev/usbmisc/umodem/umodem.c index 5e90968614..7971d7fa4d 100644 --- a/sys/dev/usbmisc/umodem/umodem.c +++ b/sys/dev/usbmisc/umodem/umodem.c @@ -1,6 +1,6 @@ /* $NetBSD: umodem.c,v 1.5 1999/01/08 11:58:25 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/umodem.c,v 1.17.2.9 2002/11/06 20:23:50 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/umodem/umodem.c,v 1.5 2003/07/21 05:50:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/umodem/umodem.c,v 1.6 2003/08/07 21:17:14 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -73,13 +73,13 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/sys/dev/usbmisc/ums/ums.c b/sys/dev/usbmisc/ums/ums.c index 8493ab1da8..61538d5ad2 100644 --- a/sys/dev/usbmisc/ums/ums.c +++ b/sys/dev/usbmisc/ums/ums.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/usb/ums.c,v 1.36.2.6 2002/11/06 20:23:50 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/ums/ums.c,v 1.4 2003/07/21 05:50:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/ums/ums.c,v 1.5 2003/08/07 21:17:15 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -58,14 +58,14 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/sys/dev/usbmisc/uplcom/uplcom.c b/sys/dev/usbmisc/uplcom/uplcom.c index 2dbc9fd547..fd91234a50 100644 --- a/sys/dev/usbmisc/uplcom/uplcom.c +++ b/sys/dev/usbmisc/uplcom/uplcom.c @@ -1,6 +1,6 @@ /* $NetBSD: uplcom.c,v 1.20 2001/07/31 12:33:11 ichiro Exp $ */ /* $FreeBSD: src/sys/dev/usb/uplcom.c,v 1.8.2.1 2002/08/08 18:45:04 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/uplcom/uplcom.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/uplcom/uplcom.c,v 1.3 2003/08/07 21:17:15 dillon Exp $ */ /*- * Copyright (c) 2001-2002, Shunsuke Akiyama . @@ -92,15 +92,15 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include "../ucom/ucomvar.h" #ifdef USB_DEBUG static int uplcomdebug = 0; diff --git a/sys/dev/usbmisc/urio/urio.c b/sys/dev/usbmisc/urio/urio.c index abb4a2ee66..ff426cb1a9 100644 --- a/sys/dev/usbmisc/urio/urio.c +++ b/sys/dev/usbmisc/urio/urio.c @@ -29,7 +29,7 @@ */ /* $FreeBSD: src/sys/dev/usb/urio.c,v 1.11.2.4 2002/11/06 14:41:01 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/urio/urio.c,v 1.5 2003/07/21 05:50:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/urio/urio.c,v 1.6 2003/08/07 21:17:15 dillon Exp $ */ /* * 2000/3/24 added NetBSD/OpenBSD support (from Alex Nemirovsky) @@ -71,12 +71,12 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #ifdef USB_DEBUG #define DPRINTF(x) if (uriodebug) logprintf x diff --git a/sys/dev/usbmisc/uscanner/uscanner.c b/sys/dev/usbmisc/uscanner/uscanner.c index 820f8f9774..c793d2950b 100644 --- a/sys/dev/usbmisc/uscanner/uscanner.c +++ b/sys/dev/usbmisc/uscanner/uscanner.c @@ -1,6 +1,6 @@ /* $NetBSD: uscanner.c,v 1.26 2001/12/31 12:15:22 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/uscanner.c,v 1.2.2.12 2003/01/27 09:48:57 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/uscanner/uscanner.c,v 1.3 2003/07/21 05:50:37 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/uscanner/uscanner.c,v 1.4 2003/08/07 21:17:15 dillon Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -63,11 +63,11 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include #ifdef USB_DEBUG #define DPRINTF(x) if (uscannerdebug) logprintf x diff --git a/sys/dev/usbmisc/uvisor/uvisor.c b/sys/dev/usbmisc/uvisor/uvisor.c index 8078b1109d..42d1874ab8 100644 --- a/sys/dev/usbmisc/uvisor/uvisor.c +++ b/sys/dev/usbmisc/uvisor/uvisor.c @@ -1,6 +1,6 @@ /* $NetBSD: uvisor.c,v 1.9 2001/01/23 14:04:14 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/uvisor.c,v 1.7.2.3 2002/08/27 13:46:28 joe Exp $ */ -/* $DragonFly: src/sys/dev/usbmisc/uvisor/uvisor.c,v 1.2 2003/06/17 04:28:32 dillon Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/uvisor/uvisor.c,v 1.3 2003/08/07 21:17:15 dillon Exp $ */ /* This version of uvisor is heavily based upon the version in NetBSD * but is missing the following patches: @@ -67,14 +67,14 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include +#include "../ucom/ucomvar.h" #ifdef USB_DEBUG #define DPRINTF(x) if (uvisordebug) printf x diff --git a/sys/dev/usbmisc/uvscom/uvscom.c b/sys/dev/usbmisc/uvscom/uvscom.c index 4ce80100d0..1e56652604 100644 --- a/sys/dev/usbmisc/uvscom/uvscom.c +++ b/sys/dev/usbmisc/uvscom/uvscom.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/usb/uvscom.c,v 1.9.2.3 2003/02/13 13:03:25 sanpei Exp $ - * $DragonFly: src/sys/dev/usbmisc/uvscom/uvscom.c,v 1.3 2003/07/19 21:14:30 dillon Exp $ + * $DragonFly: src/sys/dev/usbmisc/uvscom/uvscom.c,v 1.4 2003/08/07 21:17:15 dillon Exp $ */ /* @@ -60,15 +60,15 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include "../ucom/ucomvar.h" #ifdef USB_DEBUG static int uvscomdebug = 0; diff --git a/sys/dev/video/bktr/bktr_audio.c b/sys/dev/video/bktr/bktr_audio.c index 0b456d99b6..60c1513851 100644 --- a/sys/dev/video/bktr/bktr_audio.c +++ b/sys/dev/video/bktr/bktr_audio.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/bktr/bktr_audio.c,v 1.2.2.5 2003/02/08 02:04:57 orion Exp $ */ -/* $DragonFly: src/sys/dev/video/bktr/bktr_audio.c,v 1.3 2003/07/19 21:14:19 dillon Exp $ */ +/* $DragonFly: src/sys/dev/video/bktr/bktr_audio.c,v 1.4 2003/08/07 21:17:15 dillon Exp $ */ /* * This is part of the Driver for Video Capture Cards (Frame grabbers) * and TV Tuner cards using the Brooktree Bt848, Bt848A, Bt849A, Bt878, Bt879 @@ -58,7 +58,7 @@ #include /* for DELAY */ #endif -#include +#include #if (__FreeBSD_version >=300000) #include /* for bus space */ @@ -78,11 +78,11 @@ #else #include /* Traditional location of .h files */ #include /* extensions to ioctl_meteor.h */ -#include -#include -#include -#include -#include +#include "bktr_reg.h" +#include "bktr_core.h" +#include "bktr_tuner.h" +#include "bktr_card.h" +#include "bktr_audio.h" #endif /* diff --git a/sys/dev/video/bktr/bktr_card.c b/sys/dev/video/bktr/bktr_card.c index 119a1eadf2..9bd443c8d7 100644 --- a/sys/dev/video/bktr/bktr_card.c +++ b/sys/dev/video/bktr/bktr_card.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.9.2.5 2003/02/08 02:04:57 orion Exp $ */ -/* $DragonFly: src/sys/dev/video/bktr/bktr_card.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ */ +/* $DragonFly: src/sys/dev/video/bktr/bktr_card.c,v 1.3 2003/08/07 21:17:15 dillon Exp $ */ /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -60,7 +60,7 @@ #include /* for DELAY */ #endif -#include +#include #if (__FreeBSD_version >=300000) #include /* for bus space */ @@ -79,11 +79,11 @@ #else #include /* Traditional location for .h files */ #include /* extensions to ioctl_meteor.h */ -#include -#include -#include -#include -#include +#include "bktr_reg.h" +#include "bktr_core.h" +#include "bktr_tuner.h" +#include "bktr_card.h" +#include "bktr_audio.h" #endif /* Include the PCI Vendor definitions */ diff --git a/sys/dev/video/bktr/bktr_core.c b/sys/dev/video/bktr/bktr_core.c index 8a6b7eb255..2224f60c99 100644 --- a/sys/dev/video/bktr/bktr_core.c +++ b/sys/dev/video/bktr/bktr_core.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.103.2.4 2000/11/01 09:36:14 roger Exp $ */ -/* $DragonFly: src/sys/dev/video/bktr/bktr_core.c,v 1.4 2003/07/19 21:14:19 dillon Exp $ */ +/* $DragonFly: src/sys/dev/video/bktr/bktr_core.c,v 1.5 2003/08/07 21:17:15 dillon Exp $ */ /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -98,7 +98,7 @@ #include "opt_bktr.h" /* Include any kernel config options */ #ifdef __FreeBSD__ -#include "bktr.h" +#include "use_bktr.h" #endif /* __FreeBSD__ */ #if ( \ @@ -133,7 +133,7 @@ #include /* for DELAY */ #endif -#include +#include #if (__FreeBSD_version >=300000) #include /* for bus space */ @@ -143,20 +143,20 @@ #include #include /* extensions to ioctl_meteor.h */ -#include -#include -#include -#include -#include -#include +#include "bktr_reg.h" +#include "bktr_tuner.h" +#include "bktr_card.h" +#include "bktr_audio.h" +#include "bktr_os.h" +#include "bktr_core.h" #if defined(BKTR_FREEBSD_MODULE) -#include +#include "bktr_mem.h" #endif #if defined(BKTR_USE_FREEBSD_SMBUS) -#include -#include -#include +#include "bktr_i2c.h" +#include +#include #include "smbus_if.h" #include "iicbus_if.h" #endif diff --git a/sys/dev/video/bktr/bktr_i2c.c b/sys/dev/video/bktr/bktr_i2c.c index 17ada18f40..0a1550e15e 100644 --- a/sys/dev/video/bktr/bktr_i2c.c +++ b/sys/dev/video/bktr/bktr_i2c.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.13.2.3 2000/10/26 16:38:46 roger Exp $ - * $DragonFly: src/sys/dev/video/bktr/bktr_i2c.c,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/video/bktr/bktr_i2c.c,v 1.3 2003/08/07 21:17:15 dillon Exp $ * */ @@ -34,7 +34,7 @@ * From brooktree848.c */ -#include "bktr.h" +#include "use_bktr.h" #include #include @@ -54,18 +54,18 @@ #include #endif -#include -#include +#include +#include #include #include /* extensions to ioctl_meteor.h */ -#include +#include "bktr_reg.h" -#include +#include "bktr_i2c.h" -#include -#include +#include +#include -#include +#include #include "iicbb_if.h" #include "smbus_if.h" diff --git a/sys/dev/video/bktr/bktr_mem.c b/sys/dev/video/bktr/bktr_mem.c index 0cf7c50002..ec61e663c4 100644 --- a/sys/dev/video/bktr/bktr_mem.c +++ b/sys/dev/video/bktr/bktr_mem.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/bktr/bktr_mem.c,v 1.2.2.4 2001/10/09 04:08:41 jlemon Exp $ */ -/* $DragonFly: src/sys/dev/video/bktr/bktr_mem.c,v 1.3 2003/08/03 11:38:45 hmp Exp $ */ +/* $DragonFly: src/sys/dev/video/bktr/bktr_mem.c,v 1.4 2003/08/07 21:17:15 dillon Exp $ */ /* * This is prt of the Driver for Video Capture Cards (Frame grabbers) @@ -50,7 +50,7 @@ #include #include #include -#include +#include "bktr_mem.h" struct memory_pointers { int addresses_stored; diff --git a/sys/dev/video/bktr/bktr_os.c b/sys/dev/video/bktr/bktr_os.c index f0bac2d8b1..10ad2eacaf 100644 --- a/sys/dev/video/bktr/bktr_os.c +++ b/sys/dev/video/bktr/bktr_os.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.4.2.3 2000/10/27 00:46:09 jhb Exp $ */ -/* $DragonFly: src/sys/dev/video/bktr/bktr_os.c,v 1.4 2003/07/21 05:50:28 dillon Exp $ */ +/* $DragonFly: src/sys/dev/video/bktr/bktr_os.c,v 1.5 2003/08/07 21:17:15 dillon Exp $ */ /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -50,7 +50,7 @@ #ifdef __FreeBSD__ -#include "bktr.h" +#include "use_bktr.h" #endif /* __FreeBSD__ */ #include "opt_bktr.h" /* include any kernel config options */ @@ -99,8 +99,8 @@ #include /* for DELAY */ #endif -#include -#include +#include +#include #include int bt848_card = -1; @@ -181,14 +181,14 @@ int bktr_debug = 0; #else /* Traditional location for .h files */ #include #include /* extensions to ioctl_meteor.h */ -#include -#include -#include -#include -#include -#include +#include "bktr_reg.h" +#include "bktr_tuner.h" +#include "bktr_card.h" +#include "bktr_audio.h" +#include "bktr_core.h" +#include "bktr_os.h" #if defined(BKTR_USE_FREEBSD_SMBUS) -#include +#include "bktr_i2c.h" #endif #endif diff --git a/sys/dev/video/bktr/bktr_reg.h b/sys/dev/video/bktr/bktr_reg.h index 1f94152ab7..692c30d61a 100644 --- a/sys/dev/video/bktr/bktr_reg.h +++ b/sys/dev/video/bktr/bktr_reg.h @@ -1,6 +1,6 @@ /* * $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.36.2.4 2000/11/01 09:36:14 roger Exp $ - * $DragonFly: src/sys/dev/video/bktr/bktr_reg.h,v 1.2 2003/06/17 04:28:23 dillon Exp $ + * $DragonFly: src/sys/dev/video/bktr/bktr_reg.h,v 1.3 2003/08/07 21:17:15 dillon Exp $ * * Copyright (c) 1999 Roger Hardiman * Copyright (c) 1998 Amancio Hasty @@ -37,7 +37,7 @@ #ifdef __FreeBSD__ # if (__FreeBSD_version >= 310000) -# include "smbus.h" +# include "use_smbus.h" # else # define NSMBUS 0 /* FreeBSD before 3.1 does not have SMBUS */ # endif diff --git a/sys/dev/video/bktr/bktr_tuner.c b/sys/dev/video/bktr/bktr_tuner.c index e09847d430..74ed015e39 100644 --- a/sys/dev/video/bktr/bktr_tuner.c +++ b/sys/dev/video/bktr/bktr_tuner.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/dev/bktr/bktr_tuner.c,v 1.5.2.3 2000/10/26 16:38:46 roger Exp $ */ -/* $DragonFly: src/sys/dev/video/bktr/bktr_tuner.c,v 1.3 2003/07/19 21:14:19 dillon Exp $ */ +/* $DragonFly: src/sys/dev/video/bktr/bktr_tuner.c,v 1.4 2003/08/07 21:17:15 dillon Exp $ */ /* * This is part of the Driver for Video Capture Cards (Frame grabbers) @@ -55,7 +55,7 @@ #endif #ifdef __FreeBSD__ -#include +#include #if (__FreeBSD_version < 500000) #include /* for DELAY */ @@ -77,10 +77,10 @@ #else #include /* Traditional .h file location */ #include /* extensions to ioctl_meteor.h */ -#include -#include -#include -#include +#include "bktr_reg.h" +#include "bktr_tuner.h" +#include "bktr_card.h" +#include "bktr_core.h" #endif diff --git a/sys/dev/video/ctx/ctx.c b/sys/dev/video/ctx/ctx.c index b13fcf3e5a..995bb14787 100644 --- a/sys/dev/video/ctx/ctx.c +++ b/sys/dev/video/ctx/ctx.c @@ -9,7 +9,7 @@ * for damages incurred with its use. * * $FreeBSD: src/sys/i386/isa/ctx.c,v 1.36 2000/01/29 16:17:31 peter Exp $ - * $DragonFly: src/sys/dev/video/ctx/ctx.c,v 1.4 2003/07/21 07:57:44 dillon Exp $ + * $DragonFly: src/sys/dev/video/ctx/ctx.c,v 1.5 2003/08/07 21:17:15 dillon Exp $ */ /* @@ -109,7 +109,7 @@ * */ -#include "ctx.h" +#include "use_ctx.h" #include #include @@ -117,8 +117,8 @@ #include #include #include -#include -#include +#include +#include "ctxreg.h" #include #include diff --git a/sys/dev/video/fb/bmp/splash_bmp.c b/sys/dev/video/fb/bmp/splash_bmp.c index f4a872f9ed..b53a42ef66 100644 --- a/sys/dev/video/fb/bmp/splash_bmp.c +++ b/sys/dev/video/fb/bmp/splash_bmp.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/modules/splash/bmp/splash_bmp.c,v 1.10.2.3 2000/10/31 08:00:06 nyan Exp $ - * $DragonFly: src/sys/dev/video/fb/bmp/splash_bmp.c,v 1.2 2003/06/17 04:28:46 dillon Exp $ + * $DragonFly: src/sys/dev/video/fb/bmp/splash_bmp.c,v 1.3 2003/08/07 21:17:16 dillon Exp $ */ #include @@ -39,7 +39,7 @@ #ifndef PC98 #include -#include +#include #endif #define FADE_TIMEOUT 15 /* sec */ diff --git a/sys/dev/video/fb/boot_font.c b/sys/dev/video/fb/boot_font.c index 7e3ea57f35..1ec6d1959e 100644 --- a/sys/dev/video/fb/boot_font.c +++ b/sys/dev/video/fb/boot_font.c @@ -34,7 +34,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fb/boot_font.c,v 1.1.2.1 2001/11/01 08:33:14 obrien Exp $ - * $DragonFly: src/sys/dev/video/fb/Attic/boot_font.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/video/fb/Attic/boot_font.c,v 1.3 2003/08/07 21:17:15 dillon Exp $ */ /* @@ -53,8 +53,8 @@ #include #include -#include -#include +#include +#include "vgareg.h" #include #include @@ -72,11 +72,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "fbreg.h" +#include "gfb.h" #include #include "opt_fb.h" diff --git a/sys/dev/video/fb/fb.c b/sys/dev/video/fb/fb.c index cc2f7b2e5e..3aa5a7c334 100644 --- a/sys/dev/video/fb/fb.c +++ b/sys/dev/video/fb/fb.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fb/fb.c,v 1.11.2.2 2000/08/02 22:35:22 peter Exp $ - * $DragonFly: src/sys/dev/video/fb/fb.c,v 1.5 2003/07/22 17:03:28 dillon Exp $ + * $DragonFly: src/sys/dev/video/fb/fb.c,v 1.6 2003/08/07 21:17:15 dillon Exp $ */ #include "opt_fb.h" @@ -44,7 +44,7 @@ #include #include -#include +#include "fbreg.h" /* local arrays */ diff --git a/sys/dev/video/fb/gfb.c b/sys/dev/video/fb/gfb.c index 1964e89868..ed1732b2e0 100644 --- a/sys/dev/video/fb/gfb.c +++ b/sys/dev/video/fb/gfb.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fb/gfb.c,v 1.1.2.1 2001/11/01 08:33:14 obrien Exp $ - * $DragonFly: src/sys/dev/video/fb/Attic/gfb.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/video/fb/Attic/gfb.c,v 1.3 2003/08/07 21:17:16 dillon Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -80,11 +80,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include "fbreg.h" +#include "gfb.h" #include #include "opt_gfb.h" diff --git a/sys/dev/video/fb/splash.c b/sys/dev/video/fb/splash.c index 3cc0796af6..7397637f92 100644 --- a/sys/dev/video/fb/splash.c +++ b/sys/dev/video/fb/splash.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fb/splash.c,v 1.8 2000/01/29 14:42:57 peter Exp $ - * $DragonFly: src/sys/dev/video/fb/splash.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/video/fb/splash.c,v 1.3 2003/08/07 21:17:16 dillon Exp $ */ #include @@ -34,8 +34,8 @@ #include #include -#include -#include +#include "fbreg.h" +#include "splashreg.h" /* video adapter and image decoder */ static video_adapter_t *splash_adp; diff --git a/sys/dev/video/fb/tga.c b/sys/dev/video/fb/tga.c index c6db7faf2c..38c5bd4b2c 100644 --- a/sys/dev/video/fb/tga.c +++ b/sys/dev/video/fb/tga.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fb/tga.c,v 1.1.2.1 2001/11/01 08:33:14 obrien Exp $ - * $DragonFly: src/sys/dev/video/fb/Attic/tga.c,v 1.2 2003/06/17 04:28:25 dillon Exp $ + * $DragonFly: src/sys/dev/video/fb/Attic/tga.c,v 1.3 2003/08/07 21:17:16 dillon Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -66,8 +66,8 @@ #include #include -#include -#include +#include +#include "vgareg.h" #include #include @@ -85,14 +85,14 @@ #include #include -#include -#include +#include +#include -#include +#include "fbreg.h" #include -#include +#include "gfb.h" #include -#include +#include "tga.h" #include #include "opt_fb.h" diff --git a/sys/dev/video/fb/vga.c b/sys/dev/video/fb/vga.c index 43152e2ab7..d5412d90fb 100644 --- a/sys/dev/video/fb/vga.c +++ b/sys/dev/video/fb/vga.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/fb/vga.c,v 1.9.2.1 2001/08/11 02:58:44 yokota Exp $ - * $DragonFly: src/sys/dev/video/fb/vga.c,v 1.5 2003/07/23 06:02:38 dillon Exp $ + * $DragonFly: src/sys/dev/video/fb/vga.c,v 1.6 2003/08/07 21:17:16 dillon Exp $ */ #include "opt_vga.h" @@ -50,10 +50,10 @@ #include #include -#include -#include +#include "fbreg.h" +#include "vgareg.h" -#include +#include #ifndef VGA_DEBUG #define VGA_DEBUG 0 diff --git a/sys/dev/video/gfb/gfb_pci.c b/sys/dev/video/gfb/gfb_pci.c index acd1c9a36b..e13315ae4c 100644 --- a/sys/dev/video/gfb/gfb_pci.c +++ b/sys/dev/video/gfb/gfb_pci.c @@ -27,7 +27,7 @@ * Copyright (c) 2000 Andrew Miklic, Andrew Gallatin, and Thomas V. Crimi * * $FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.1.2.1 2001/11/01 08:33:15 obrien Exp $ - * $DragonFly: src/sys/dev/video/gfb/Attic/gfb_pci.c,v 1.3 2003/07/22 17:03:29 dillon Exp $ + * $DragonFly: src/sys/dev/video/gfb/Attic/gfb_pci.c,v 1.4 2003/08/07 21:17:16 dillon Exp $ */ #include @@ -54,12 +54,12 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include "gfb_pci.h" #ifdef __alpha__ diff --git a/sys/dev/video/gsc/gsc.c b/sys/dev/video/gsc/gsc.c index 27514cad98..2ad3d9acbc 100644 --- a/sys/dev/video/gsc/gsc.c +++ b/sys/dev/video/gsc/gsc.c @@ -32,11 +32,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/gsc.c,v 1.35.2.1 2000/08/08 19:49:53 peter Exp $ - * $DragonFly: src/sys/dev/video/gsc/gsc.c,v 1.6 2003/07/27 01:49:51 hmp Exp $ + * $DragonFly: src/sys/dev/video/gsc/gsc.c,v 1.7 2003/08/07 21:17:16 dillon Exp $ * */ -#include "gsc.h" +#include "use_gsc.h" #include #include #include @@ -47,9 +47,9 @@ #include -#include -#include -#include +#include +#include +#include "gscreg.h" /*********************************************************************** * diff --git a/sys/dev/video/i386/vesa/vesa.c b/sys/dev/video/i386/vesa/vesa.c index 3bd10a19da..128e5a64aa 100644 --- a/sys/dev/video/i386/vesa/vesa.c +++ b/sys/dev/video/i386/vesa/vesa.c @@ -24,7 +24,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/vesa.c,v 1.32.2.1 2002/08/13 02:42:33 rwatson Exp $ - * $DragonFly: src/sys/dev/video/i386/vesa/vesa.c,v 1.2 2003/06/17 04:28:37 dillon Exp $ + * $DragonFly: src/sys/dev/video/i386/vesa/vesa.c,v 1.3 2003/08/07 21:17:16 dillon Exp $ */ #include "opt_vga.h" @@ -52,7 +52,7 @@ #include #ifndef __i386__ -#include +#include #else #include #endif diff --git a/sys/dev/video/meteor/meteor.c b/sys/dev/video/meteor/meteor.c index d1d8e4957a..0575512f1d 100644 --- a/sys/dev/video/meteor/meteor.c +++ b/sys/dev/video/meteor/meteor.c @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/pci/meteor.c,v 1.49 1999/09/25 18:24:41 phk Exp $ - * $DragonFly: src/sys/dev/video/meteor/meteor.c,v 1.6 2003/07/26 21:56:10 rob Exp $ + * $DragonFly: src/sys/dev/video/meteor/meteor.c,v 1.7 2003/08/07 21:17:16 dillon Exp $ */ /* Change History: @@ -146,8 +146,7 @@ future version of this driver. */ -#include "meteor.h" - +#include "use_meteor.h" #include "opt_meteor.h" #include @@ -167,10 +166,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include "meteor_reg.h" static void meteor_intr __P((void *arg)); diff --git a/sys/dev/video/pcvt/i386/pcvt_drv.c b/sys/dev/video/pcvt/i386/pcvt_drv.c index 5dfdefcbec..95206ca07a 100644 --- a/sys/dev/video/pcvt/i386/pcvt_drv.c +++ b/sys/dev/video/pcvt/i386/pcvt_drv.c @@ -51,16 +51,16 @@ * Last Edit-Date: [Mon Dec 27 14:03:36 1999] * * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_drv.c,v 1.63.2.1 2001/02/26 04:23:13 jlemon Exp $ - * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_drv.c,v 1.6 2003/07/26 19:07:49 rob Exp $ + * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_drv.c,v 1.7 2003/08/07 21:17:16 dillon Exp $ * *---------------------------------------------------------------------------*/ -#include "vt.h" +#include "use_vt.h" #if NVT > 0 #define EXTERN /* allocate mem */ -#include /* global include */ +#include "pcvt_hdr.h" /* global include */ #if PCVT_FREEBSD >= 200 #include diff --git a/sys/dev/video/pcvt/i386/pcvt_ext.c b/sys/dev/video/pcvt/i386/pcvt_ext.c index 44e1bdb5dd..ec9cfb5e45 100644 --- a/sys/dev/video/pcvt/i386/pcvt_ext.c +++ b/sys/dev/video/pcvt/i386/pcvt_ext.c @@ -45,14 +45,14 @@ * Last Edit-Date: [Mon Dec 27 14:05:16 1999] * * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_ext.c,v 1.17 1999/12/30 16:17:09 hm Exp $ - * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_ext.c,v 1.5 2003/07/21 07:57:45 dillon Exp $ + * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_ext.c,v 1.6 2003/08/07 21:17:16 dillon Exp $ * *---------------------------------------------------------------------------*/ -#include "vt.h" +#include "use_vt.h" #if NVT > 0 -#include /* global include */ +#include "pcvt_hdr.h" /* global include */ #define ISSIGVALID(sig) ((sig) > 0 && (sig) < NSIG) diff --git a/sys/dev/video/pcvt/i386/pcvt_hdr.h b/sys/dev/video/pcvt/i386/pcvt_hdr.h index f250b007e4..17e86a2513 100644 --- a/sys/dev/video/pcvt/i386/pcvt_hdr.h +++ b/sys/dev/video/pcvt/i386/pcvt_hdr.h @@ -42,7 +42,7 @@ * Last Edit-Date: [Mon Dec 27 14:06:31 1999] * * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_hdr.h,v 1.36.2.3 2001/08/06 15:30:21 joerg Exp $ - * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_hdr.h,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_hdr.h,v 1.3 2003/08/07 21:17:16 dillon Exp $ * *---------------------------------------------------------------------------*/ @@ -98,12 +98,12 @@ #endif /* PCVT_FREEBSD >= 200 */ -#include +#include "pcvt_conf.h" #include -#include -#include +#include +#include #if PCVT_NETBSD > 9 #include "device.h" @@ -113,7 +113,7 @@ #include "i386/isa/isavar.h" #include "i386/cpufunc.h" #elif PCVT_FREEBSD >= 200 -#include +#include #else #include "i386/isa/isa_device.h" #endif @@ -127,7 +127,7 @@ #if PCVT_NETBSD > 100 #include "i386/isa/isareg.h" #elif PCVT_FREEBSD >= 200 -#include +#include #else #include "i386/isa/isa.h" #endif diff --git a/sys/dev/video/pcvt/i386/pcvt_kbd.c b/sys/dev/video/pcvt/i386/pcvt_kbd.c index 505fa4386c..5aa065162f 100644 --- a/sys/dev/video/pcvt/i386/pcvt_kbd.c +++ b/sys/dev/video/pcvt/i386/pcvt_kbd.c @@ -48,16 +48,16 @@ * Last Edit-Date: [Mon Dec 27 14:01:50 1999] * * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_kbd.c,v 1.32.2.1 2000/10/29 16:59:28 dwmalone Exp $ - * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_kbd.c,v 1.3 2003/07/26 19:07:49 rob Exp $ + * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_kbd.c,v 1.4 2003/08/07 21:17:16 dillon Exp $ * *---------------------------------------------------------------------------*/ -#include "vt.h" +#include "use_vt.h" #include "opt_ddb.h" #if NVT > 0 -#include /* global include */ +#include "pcvt_hdr.h" /* global include */ #define LEDSTATE_UPDATE_PENDING (1 << 3) @@ -100,7 +100,7 @@ static void scrollback_restore_screen ( void ); u_char rawkeybuf[80]; #endif -#include /* tables etc */ +#include "pcvt_kbd.h" /* tables etc */ #if PCVT_SHOWKEYS /*---------------------------------------------------------------------------* @@ -1687,7 +1687,7 @@ scroll_reset: #endif /* PCVT_CTRL_ALT_DEL */ #if !(PCVT_NETBSD || PCVT_FREEBSD >= 200) -#include "ddb.h" +#include "use_ddb.h" #endif /* !(PCVT_NETBSD || PCVT_FREEBSD >= 200) */ #if NDDB > 0 || defined(DDB) /* Check for cntl-alt-esc */ diff --git a/sys/dev/video/pcvt/i386/pcvt_out.c b/sys/dev/video/pcvt/i386/pcvt_out.c index a51bee3356..6c374f7153 100644 --- a/sys/dev/video/pcvt/i386/pcvt_out.c +++ b/sys/dev/video/pcvt/i386/pcvt_out.c @@ -45,16 +45,16 @@ * Last Edit-Date: [Mon Dec 27 14:07:39 1999] * * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_out.c,v 1.20 1999/12/30 16:17:10 hm Exp $ - * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_out.c,v 1.3 2003/07/26 19:07:49 rob Exp $ + * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_out.c,v 1.4 2003/08/07 21:17:16 dillon Exp $ * *---------------------------------------------------------------------------*/ -#include "vt.h" +#include "use_vt.h" #if NVT > 0 #define PCVT_INCLUDE_VT_SELATTR /* get inline function from pcvt_hdr.h */ -#include /* global include */ +#include "pcvt_hdr.h" /* global include */ #include #include #include diff --git a/sys/dev/video/pcvt/i386/pcvt_sup.c b/sys/dev/video/pcvt/i386/pcvt_sup.c index 91bc3e1308..c587a3626b 100644 --- a/sys/dev/video/pcvt/i386/pcvt_sup.c +++ b/sys/dev/video/pcvt/i386/pcvt_sup.c @@ -47,14 +47,14 @@ * Last Edit-Date: [Thu Dec 30 17:01:03 1999] * * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_sup.c,v 1.16 1999/12/30 16:17:10 hm Exp $ - * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_sup.c,v 1.3 2003/07/26 19:07:49 rob Exp $ + * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_sup.c,v 1.4 2003/08/07 21:17:16 dillon Exp $ * *---------------------------------------------------------------------------*/ -#include "vt.h" +#include "use_vt.h" #if NVT > 0 -#include /* global include */ +#include "pcvt_hdr.h" /* global include */ #include diff --git a/sys/dev/video/pcvt/i386/pcvt_vtf.c b/sys/dev/video/pcvt/i386/pcvt_vtf.c index 60ec6ceaa6..913b872b08 100644 --- a/sys/dev/video/pcvt/i386/pcvt_vtf.c +++ b/sys/dev/video/pcvt/i386/pcvt_vtf.c @@ -45,17 +45,17 @@ * Last Edit-Date: [Mon Dec 27 14:13:33 1999] * * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_vtf.c,v 1.11 1999/12/30 16:17:11 hm Exp $ - * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_vtf.c,v 1.4 2003/07/26 19:07:49 rob Exp $ + * $DragonFly: src/sys/dev/video/pcvt/i386/Attic/pcvt_vtf.c,v 1.5 2003/08/07 21:17:16 dillon Exp $ * *---------------------------------------------------------------------------*/ -#include "vt.h" +#include "use_vt.h" #if NVT > 0 #define PCVT_INCLUDE_VT_SELATTR /* get inline function from pcvt_hdr.h */ -#include /* global include */ -#include /* character set conversion tables */ +#include "pcvt_hdr.h" /* global include */ +#include "pcvt_tbl.h" /* character set conversion tables */ static void clear_dld ( struct video_state *svsp ); static void init_dld ( struct video_state *svsp ); diff --git a/sys/dev/video/tga/tga_pci.c b/sys/dev/video/tga/tga_pci.c index 4365bb9df8..ba6c594b59 100644 --- a/sys/dev/video/tga/tga_pci.c +++ b/sys/dev/video/tga/tga_pci.c @@ -27,7 +27,7 @@ * Copyright (c) 2000 Andrew Miklic, Andrew Gallatin, and Thomas V. Crimi * * $FreeBSD: src/sys/dev/tga/tga_pci.c,v 1.1.2.1 2001/11/01 08:33:15 obrien Exp $ - * $DragonFly: src/sys/dev/video/tga/Attic/tga_pci.c,v 1.4 2003/07/22 17:03:31 dillon Exp $ + * $DragonFly: src/sys/dev/video/tga/Attic/tga_pci.c,v 1.5 2003/08/07 21:17:17 dillon Exp $ */ #include @@ -54,12 +54,12 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include "tga_pci.h" #include #include diff --git a/sys/emulation/ibcs2/coff/imgact_coff.c b/sys/emulation/ibcs2/coff/imgact_coff.c index 0950a11380..66e3bf0a1e 100644 --- a/sys/emulation/ibcs2/coff/imgact_coff.c +++ b/sys/emulation/ibcs2/coff/imgact_coff.c @@ -27,7 +27,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/ibcs2/imgact_coff.c,v 1.40 1999/12/15 23:01:47 eivind Exp $ - * $DragonFly: src/sys/emulation/ibcs2/coff/Attic/imgact_coff.c,v 1.4 2003/06/26 05:55:13 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/coff/Attic/imgact_coff.c,v 1.5 2003/08/07 21:17:17 dillon Exp $ */ #include @@ -49,8 +49,8 @@ #include #include -#include -#include +#include "../i386/coff.h" +#include "../i386/ibcs2_util.h" extern struct sysentvec ibcs2_svr3_sysvec; diff --git a/sys/emulation/ibcs2/i386/Makefile b/sys/emulation/ibcs2/i386/Makefile index 7aa10df9f1..4e4d9bd218 100644 --- a/sys/emulation/ibcs2/i386/Makefile +++ b/sys/emulation/ibcs2/i386/Makefile @@ -1,28 +1,28 @@ # Makefile for syscall tables # # $FreeBSD: src/sys/i386/ibcs2/Makefile,v 1.2 1999/08/28 00:43:56 peter Exp $ -# $DragonFly: src/sys/emulation/ibcs2/i386/Attic/Makefile,v 1.3 2003/07/24 01:41:23 dillon Exp $ +# $DragonFly: src/sys/emulation/ibcs2/i386/Attic/Makefile,v 1.4 2003/08/07 21:17:17 dillon Exp $ all: @echo "make ibcs2_sysent.c, ibcs2_isc_sysent.c or ibcs2_xenix_sysent.c only" -ibcs2_sysent.c ibcs2_syscall.h ibcs2_proto.h ibcs2_union.h: ../../kern/makesyscalls.sh \ +ibcs2_sysent.c ibcs2_syscall.h ibcs2_proto.h ibcs2_union.h: ../../../kern/makesyscalls.sh \ syscalls.master syscalls.conf -mv -f ibcs2_sysent.c ibcs2_sysent.c.bak -mv -f ibcs2_syscall.h ibcs2_syscall.h.bak -mv -f ibcs2_proto.h ibcs2_proto.h.bak -mv -f ibcs2_union.h ibcs2_union.h.bak - sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf + sh ../../../kern/makesyscalls.sh syscalls.master syscalls.conf -ibcs2_isc_sysent.c ibcs2_isc_syscall.h : ../../kern/makesyscalls.sh \ +ibcs2_isc_sysent.c ibcs2_isc_syscall.h : ../../../kern/makesyscalls.sh \ syscalls.isc syscalls.isc.conf -mv -f ibcs2_isc_sysent.c ibcs2_isc_sysent.c.bak -mv -f ibcs2_isc_syscall.h ibcs2_isc_syscall.h.bak - sh ../../kern/makesyscalls.sh syscalls.isc syscalls.isc.conf + sh ../../../kern/makesyscalls.sh syscalls.isc syscalls.isc.conf ibcs2_xenix_sysent.c ibcs2_xenix_syscall.h ibcs2_xenix.h: \ - ../../kern/makesyscalls.sh syscalls.xenix syscalls.xenix.conf + ../../../kern/makesyscalls.sh syscalls.xenix syscalls.xenix.conf -mv -f ibcs2_xenix_sysent.c ibcs2_xenix_sysent.c.bak -mv -f ibcs2_xenix_syscall.h ibcs2_xenix_syscall.h.bak -mv -f ibcs2_xenix.h ibcs2_xenix.h.bak - sh ../../kern/makesyscalls.sh syscalls.xenix syscalls.xenix.conf + sh ../../../kern/makesyscalls.sh syscalls.xenix syscalls.xenix.conf diff --git a/sys/emulation/ibcs2/i386/ibcs2_dirent.h b/sys/emulation/ibcs2/i386/ibcs2_dirent.h index 9db996d6da..df19d248b1 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_dirent.h +++ b/sys/emulation/ibcs2/i386/ibcs2_dirent.h @@ -1,5 +1,3 @@ -/* $NetBSD: ibcs2_dirent.h,v 1.2 1994/10/26 02:52:51 cgd Exp $ */ - /* * Copyright (c) 1994 Scott Bartram * All rights reserved. @@ -28,13 +26,16 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_dirent.h,v 1.2 2003/08/07 21:17:17 dillon Exp $ + * $NetBSD: ibcs2_dirent.h,v 1.2 1994/10/26 02:52:51 cgd Exp $ */ #ifndef _IBCS2_DIRENT_H #define _IBCS2_DIRENT_H 1 -#include +#include "ibcs2_types.h" #define IBCS2_MAXNAMLEN 512 #define IBCS2_DIRBUF 1048 diff --git a/sys/emulation/ibcs2/i386/ibcs2_errno.c b/sys/emulation/ibcs2/i386/ibcs2_errno.c index b2e78c9053..a9c3bda4b6 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_errno.c +++ b/sys/emulation/ibcs2/i386/ibcs2_errno.c @@ -27,10 +27,12 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_errno.c,v 1.2 2003/08/07 21:17:17 dillon Exp $ */ #include -#include +#include "ibcs2_errno.h" int bsd_to_ibcs2_errno[ELAST + 1] = { 0, /* 0 */ diff --git a/sys/emulation/ibcs2/i386/ibcs2_fcntl.c b/sys/emulation/ibcs2/i386/ibcs2_fcntl.c index 72635a61e5..092f0ca850 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_fcntl.c +++ b/sys/emulation/ibcs2/i386/ibcs2_fcntl.c @@ -25,7 +25,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.c,v 1.14 1999/09/19 17:00:14 green Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_fcntl.c,v 1.7 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_fcntl.c,v 1.8 2003/08/07 21:17:17 dillon Exp $ */ #include "opt_spx_hack.h" @@ -40,10 +40,10 @@ #include #include -#include -#include -#include -#include +#include "ibcs2_fcntl.h" +#include "ibcs2_signal.h" +#include "ibcs2_proto.h" +#include "ibcs2_util.h" static void cvt_iflock2flock __P((struct ibcs2_flock *, struct flock *)); static void cvt_flock2iflock __P((struct flock *, struct ibcs2_flock *)); diff --git a/sys/emulation/ibcs2/i386/ibcs2_fcntl.h b/sys/emulation/ibcs2/i386/ibcs2_fcntl.h index 9af210680c..0a099f62d0 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_fcntl.h +++ b/sys/emulation/ibcs2/i386/ibcs2_fcntl.h @@ -1,5 +1,3 @@ -/* $NetBSD: ibcs2_fcntl.h,v 1.2 1994/10/26 02:52:54 cgd Exp $ */ - /* * Copyright (c) 1994 Scott Bartram * All rights reserved. @@ -28,12 +26,15 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $NetBSD: ibcs2_fcntl.h,v 1.2 1994/10/26 02:52:54 cgd Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_fcntl.h,v 1.2 2003/08/07 21:17:17 dillon Exp $ */ #ifndef _IBCS2_FCNTL_H #define _IBCS2_FCNTL_H 1 -#include +#include "ibcs2_types.h" #define IBCS2_O_RDONLY 0x0000 #define IBCS2_O_WRONLY 0x0001 diff --git a/sys/emulation/ibcs2/i386/ibcs2_ioctl.c b/sys/emulation/ibcs2/i386/ibcs2_ioctl.c index 29e7a5b601..befe0f7ba4 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_ioctl.c +++ b/sys/emulation/ibcs2/i386/ibcs2_ioctl.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/ibcs2/ibcs2_ioctl.c,v 1.13.2.1 2001/07/31 20:14:21 jon Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_ioctl.c,v 1.5 2003/07/26 19:07:47 rob Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_ioctl.c,v 1.6 2003/08/07 21:17:17 dillon Exp $ */ #include @@ -43,13 +43,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "ibcs2_signal.h" +#include "ibcs2_socksys.h" +#include "ibcs2_stropts.h" +#include "ibcs2_proto.h" +#include "ibcs2_termios.h" +#include "ibcs2_util.h" +#include "ibcs2_ioctl.h" static void stios2btios __P((struct ibcs2_termios *, struct termios *)); static void btios2stios __P((struct termios *, struct ibcs2_termios *)); diff --git a/sys/emulation/ibcs2/i386/ibcs2_ipc.c b/sys/emulation/ibcs2/i386/ibcs2_ipc.c index 44c4919e5f..a3843da637 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_ipc.c +++ b/sys/emulation/ibcs2/i386/ibcs2_ipc.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/ibcs2/ibcs2_ipc.c,v 1.15 1999/08/28 00:43:57 peter Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_ipc.c,v 1.3 2003/06/23 17:55:38 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_ipc.c,v 1.4 2003/08/07 21:17:17 dillon Exp $ */ #include @@ -33,11 +33,11 @@ #include #include -#include -#include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_proto.h" +#include "ibcs2_util.h" +#include "ibcs2_ipc.h" #define IBCS2_IPC_RMID 0 #define IBCS2_IPC_SET 1 diff --git a/sys/emulation/ibcs2/i386/ibcs2_isc.c b/sys/emulation/ibcs2/i386/ibcs2_isc.c index 7da4189879..02a64af508 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_isc.c +++ b/sys/emulation/ibcs2/i386/ibcs2_isc.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/ibcs2/ibcs2_isc.c,v 1.12 1999/08/28 00:43:58 peter Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_isc.c,v 1.3 2003/06/23 17:55:38 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_isc.c,v 1.4 2003/08/07 21:17:17 dillon Exp $ */ #include @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_proto.h" +#include "ibcs2_isc_syscall.h" extern struct sysent isc_sysent[]; diff --git a/sys/emulation/ibcs2/i386/ibcs2_isc_syscall.h b/sys/emulation/ibcs2/i386/ibcs2_isc_syscall.h index 6992959217..5e42a4f13c 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_isc_syscall.h +++ b/sys/emulation/ibcs2/i386/ibcs2_isc_syscall.h @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_isc_syscall.h,v 1.4 2003/07/30 00:19:13 dillon Exp $ - * created from DragonFly: src/sys/i386/ibcs2/syscalls.isc,v 1.2 2003/06/17 04:28:35 dillon Exp + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_isc_syscall.h,v 1.5 2003/08/07 21:17:17 dillon Exp $ + * created from DragonFly: src/sys/emulation/ibcs2/i386/syscalls.isc,v 1.2 2003/06/17 04:28:35 dillon Exp */ #define IBCS2_ISC_ibcs2_rename 2 diff --git a/sys/emulation/ibcs2/i386/ibcs2_isc_sysent.c b/sys/emulation/ibcs2/i386/ibcs2_isc_sysent.c index 3c7d104641..cbed380f29 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_isc_sysent.c +++ b/sys/emulation/ibcs2/i386/ibcs2_isc_sysent.c @@ -2,17 +2,17 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_isc_sysent.c,v 1.4 2003/07/30 00:19:13 dillon Exp $ - * created from DragonFly: src/sys/i386/ibcs2/syscalls.isc,v 1.2 2003/06/17 04:28:35 dillon Exp + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_isc_sysent.c,v 1.5 2003/08/07 21:17:17 dillon Exp $ + * created from DragonFly: src/sys/emulation/ibcs2/i386/syscalls.isc,v 1.2 2003/06/17 04:28:35 dillon Exp */ #include #include #include -#include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_proto.h" +#include "ibcs2_xenix.h" #define AS(name) ((sizeof(struct name) - sizeof(union sysmsg)) / sizeof(register_t)) diff --git a/sys/emulation/ibcs2/i386/ibcs2_misc.c b/sys/emulation/ibcs2/i386/ibcs2_misc.c index 4a9671f3c9..4eee50ddc3 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_misc.c +++ b/sys/emulation/ibcs2/i386/ibcs2_misc.c @@ -46,7 +46,7 @@ * @(#)sun_misc.c 8.1 (Berkeley) 6/18/93 * * $FreeBSD: src/sys/i386/ibcs2/ibcs2_misc.c,v 1.34 1999/09/29 15:12:09 marcel Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_misc.c,v 1.6 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_misc.c,v 1.7 2003/08/07 21:17:17 dillon Exp $ */ /* @@ -76,13 +76,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "ibcs2_dirent.h" +#include "ibcs2_signal.h" +#include "ibcs2_proto.h" +#include "ibcs2_unistd.h" +#include "ibcs2_util.h" +#include "ibcs2_utime.h" +#include "ibcs2_xenix.h" int ibcs2_ulimit(struct ibcs2_ulimit_args *uap) diff --git a/sys/emulation/ibcs2/i386/ibcs2_msg.c b/sys/emulation/ibcs2/i386/ibcs2_msg.c index eb5e4c972e..986651f5b2 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_msg.c +++ b/sys/emulation/ibcs2/i386/ibcs2_msg.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/ibcs2/ibcs2_msg.c,v 1.7 1999/08/28 00:43:59 peter Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_msg.c,v 1.5 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_msg.c,v 1.6 2003/08/07 21:17:17 dillon Exp $ */ /* @@ -34,11 +34,11 @@ #include #include -#include -#include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_util.h" +#include "ibcs2_poll.h" +#include "ibcs2_proto.h" int diff --git a/sys/emulation/ibcs2/i386/ibcs2_other.c b/sys/emulation/ibcs2/i386/ibcs2_other.c index 5f317544f3..2741926bba 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_other.c +++ b/sys/emulation/ibcs2/i386/ibcs2_other.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/ibcs2/ibcs2_other.c,v 1.10 1999/08/28 00:43:59 peter Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_other.c,v 1.6 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_other.c,v 1.7 2003/08/07 21:17:17 dillon Exp $ */ /* @@ -35,10 +35,10 @@ #include #include -#include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_proto.h" +#include "ibcs2_util.h" #define IBCS2_SECURE_GETLUID 1 #define IBCS2_SECURE_SETLUID 2 diff --git a/sys/emulation/ibcs2/i386/ibcs2_proto.h b/sys/emulation/ibcs2/i386/ibcs2_proto.h index d919a49948..5d0c07fdd2 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_proto.h +++ b/sys/emulation/ibcs2/i386/ibcs2_proto.h @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_proto.h,v 1.6 2003/07/30 00:19:13 dillon Exp $ - * created from DragonFly: src/sys/i386/ibcs2/syscalls.master,v 1.2 2003/06/17 04:28:35 dillon Exp + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_proto.h,v 1.7 2003/08/07 21:17:17 dillon Exp $ + * created from DragonFly: src/sys/emulation/ibcs2/i386/syscalls.master,v 1.2 2003/06/17 04:28:35 dillon Exp */ #ifndef _IBCS2_SYSPROTO_H_ diff --git a/sys/emulation/ibcs2/i386/ibcs2_signal.c b/sys/emulation/ibcs2/i386/ibcs2_signal.c index dbd0fae595..d33dfc90a9 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_signal.c +++ b/sys/emulation/ibcs2/i386/ibcs2_signal.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/ibcs2/ibcs2_signal.c,v 1.16 1999/10/10 09:14:31 marcel Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_signal.c,v 1.5 2003/07/30 00:19:14 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_signal.c,v 1.6 2003/08/07 21:17:17 dillon Exp $ */ #include @@ -34,11 +34,11 @@ #include #include -#include -#include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_proto.h" +#include "ibcs2_xenix.h" +#include "ibcs2_util.h" #define sigemptyset(s) SIGEMPTYSET(*(s)) #define sigismember(s, n) SIGISMEMBER(*(s), n) diff --git a/sys/emulation/ibcs2/i386/ibcs2_socksys.c b/sys/emulation/ibcs2/i386/ibcs2_socksys.c index 2e599dc926..fce0b26cf9 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_socksys.c +++ b/sys/emulation/ibcs2/i386/ibcs2_socksys.c @@ -21,6 +21,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_socksys.c,v 1.4 2003/08/07 21:17:17 dillon Exp $ */ #include @@ -29,8 +31,8 @@ #include #include -#include -#include +#include "ibcs2_socksys.h" +#include "ibcs2_util.h" /* Local structures */ struct getipdomainname_args { diff --git a/sys/emulation/ibcs2/i386/ibcs2_socksys.h b/sys/emulation/ibcs2/i386/ibcs2_socksys.h index 5341293808..8ea1fdb644 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_socksys.h +++ b/sys/emulation/ibcs2/i386/ibcs2_socksys.h @@ -21,6 +21,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_socksys.h,v 1.3 2003/08/07 21:17:17 dillon Exp $ */ #ifndef _I386_IBCS2_IBCS2_SOCKSYS_H_ @@ -28,7 +30,7 @@ #include -#include +#include "ibcs2_types.h" #define SOCKSYS_ACCEPT 1 #define SOCKSYS_BIND 2 diff --git a/sys/emulation/ibcs2/i386/ibcs2_stat.c b/sys/emulation/ibcs2/i386/ibcs2_stat.c index a7846ce611..b12a03e273 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_stat.c +++ b/sys/emulation/ibcs2/i386/ibcs2_stat.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/ibcs2/ibcs2_stat.c,v 1.10 1999/12/15 23:01:45 eivind Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_stat.c,v 1.5 2003/07/26 19:07:47 rob Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_stat.c,v 1.6 2003/08/07 21:17:17 dillon Exp $ */ #include @@ -42,12 +42,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "ibcs2_signal.h" +#include "ibcs2_stat.h" +#include "ibcs2_statfs.h" +#include "ibcs2_proto.h" +#include "ibcs2_util.h" +#include "ibcs2_utsname.h" #include diff --git a/sys/emulation/ibcs2/i386/ibcs2_stat.h b/sys/emulation/ibcs2/i386/ibcs2_stat.h index 97928be906..2cb27b9d10 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_stat.h +++ b/sys/emulation/ibcs2/i386/ibcs2_stat.h @@ -1,5 +1,3 @@ -/* $NetBSD: ibcs2_stat.h,v 1.2 1994/10/26 02:53:03 cgd Exp $ */ - /* * Copyright (c) 1994 Scott Bartram * All rights reserved. @@ -28,12 +26,15 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_stat.h,v 1.2 2003/08/07 21:17:17 dillon Exp $ + * $NetBSD: ibcs2_stat.h,v 1.2 1994/10/26 02:53:03 cgd Exp $ */ #ifndef _IBCS2_STAT_H #define _IBCS2_STAT_H -#include +#include "ibcs2_types.h" struct ibcs2_stat { ibcs2_dev_t st_dev; diff --git a/sys/emulation/ibcs2/i386/ibcs2_syscall.h b/sys/emulation/ibcs2/i386/ibcs2_syscall.h index 80bace0c96..0bb3eec415 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_syscall.h +++ b/sys/emulation/ibcs2/i386/ibcs2_syscall.h @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_syscall.h,v 1.6 2003/07/30 00:19:14 dillon Exp $ - * created from DragonFly: src/sys/i386/ibcs2/syscalls.master,v 1.2 2003/06/17 04:28:35 dillon Exp + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_syscall.h,v 1.7 2003/08/07 21:17:17 dillon Exp $ + * created from DragonFly: src/sys/emulation/ibcs2/i386/syscalls.master,v 1.2 2003/06/17 04:28:35 dillon Exp */ #define IBCS2_SYS_syscall 0 diff --git a/sys/emulation/ibcs2/i386/ibcs2_sysent.c b/sys/emulation/ibcs2/i386/ibcs2_sysent.c index 3c8fa12712..745dcbc427 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_sysent.c +++ b/sys/emulation/ibcs2/i386/ibcs2_sysent.c @@ -2,16 +2,16 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_sysent.c,v 1.6 2003/07/30 00:19:14 dillon Exp $ - * created from DragonFly: src/sys/i386/ibcs2/syscalls.master,v 1.2 2003/06/17 04:28:35 dillon Exp + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_sysent.c,v 1.7 2003/08/07 21:17:17 dillon Exp $ + * created from DragonFly: src/sys/emulation/ibcs2/i386/syscalls.master,v 1.2 2003/06/17 04:28:35 dillon Exp */ #include #include #include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_proto.h" #define AS(name) ((sizeof(struct name) - sizeof(union sysmsg)) / sizeof(register_t)) diff --git a/sys/emulation/ibcs2/i386/ibcs2_sysi86.c b/sys/emulation/ibcs2/i386/ibcs2_sysi86.c index 6b5e773f31..0309829c04 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_sysi86.c +++ b/sys/emulation/ibcs2/i386/ibcs2_sysi86.c @@ -27,17 +27,17 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * ibcs2_sysi86.c,v 1.1 1994/10/14 08:53:11 sos Exp - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_sysi86.c,v 1.5 2003/07/30 00:19:14 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_sysi86.c,v 1.6 2003/08/07 21:17:17 dillon Exp $ */ #include #include #include -#include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_util.h" +#include "ibcs2_proto.h" #define IBCS2_FP_NO 0 /* no fp support */ #define IBCS2_FP_SW 1 /* software emulator */ diff --git a/sys/emulation/ibcs2/i386/ibcs2_sysvec.c b/sys/emulation/ibcs2/i386/ibcs2_sysvec.c index b258138621..9a373aa308 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_sysvec.c +++ b/sys/emulation/ibcs2/i386/ibcs2_sysvec.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysvec.c,v 1.17.2.1 2001/02/22 05:15:01 marcel Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_sysvec.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_sysvec.c,v 1.3 2003/08/07 21:17:17 dillon Exp $ */ #include @@ -38,8 +38,8 @@ #include #include -#include -#include +#include "ibcs2_syscall.h" +#include "ibcs2_signal.h" extern int bsd_to_ibcs2_errno[]; extern struct sysent ibcs2_sysent[IBCS2_SYS_MAXSYSCALL]; diff --git a/sys/emulation/ibcs2/i386/ibcs2_termios.h b/sys/emulation/ibcs2/i386/ibcs2_termios.h index 394f7f3bac..fbf6ca9327 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_termios.h +++ b/sys/emulation/ibcs2/i386/ibcs2_termios.h @@ -1,5 +1,3 @@ -/* $NetBSD: ibcs2_termios.h,v 1.3 1994/10/26 02:53:07 cgd Exp $ */ - /* * Copyright (c) 1994 Scott Bartram * All rights reserved. @@ -28,12 +26,15 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_termios.h,v 1.2 2003/08/07 21:17:17 dillon Exp $ + * $NetBSD: ibcs2_termios.h,v 1.3 1994/10/26 02:53:07 cgd Exp $ */ #ifndef _IBCS2_TERMIOS_H #define _IBCS2_TERMIOS_H 1 -#include +#include "ibcs2_types.h" #define IBCS2_NCC 8 #define IBCS2_NCCS 13 diff --git a/sys/emulation/ibcs2/i386/ibcs2_time.h b/sys/emulation/ibcs2/i386/ibcs2_time.h index d416a3d6e2..072e9838e7 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_time.h +++ b/sys/emulation/ibcs2/i386/ibcs2_time.h @@ -1,5 +1,3 @@ -/* $NetBSD: ibcs2_time.h,v 1.2 1994/10/26 02:53:08 cgd Exp $ */ - /* * Copyright (c) 1994 Scott Bartram * All rights reserved. @@ -28,12 +26,15 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_time.h,v 1.2 2003/08/07 21:17:17 dillon Exp $ + * $NetBSD: ibcs2_time.h,v 1.2 1994/10/26 02:53:08 cgd Exp $ */ #ifndef _IBCS2_TIME_H #define _IBCS2_TIME_H -#include +#include "ibcs2_types.h" struct ibcs2_tm { int tm_sec; diff --git a/sys/emulation/ibcs2/i386/ibcs2_union.h b/sys/emulation/ibcs2/i386/ibcs2_union.h index a1fdbe38d3..2cdad9f8c7 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_union.h +++ b/sys/emulation/ibcs2/i386/ibcs2_union.h @@ -2,8 +2,8 @@ * Union of syscall args for messaging. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_union.h,v 1.2 2003/07/30 00:19:14 dillon Exp $ - * created from DragonFly: src/sys/i386/ibcs2/syscalls.master,v 1.2 2003/06/17 04:28:35 dillon Exp + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_union.h,v 1.3 2003/08/07 21:17:17 dillon Exp $ + * created from DragonFly: src/sys/emulation/ibcs2/i386/syscalls.master,v 1.2 2003/06/17 04:28:35 dillon Exp */ union sysunion { diff --git a/sys/emulation/ibcs2/i386/ibcs2_ustat.h b/sys/emulation/ibcs2/i386/ibcs2_ustat.h index 9bbad51aa2..bab4d3e867 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_ustat.h +++ b/sys/emulation/ibcs2/i386/ibcs2_ustat.h @@ -1,5 +1,3 @@ -/* $NetBSD: ibcs2_ustat.h,v 1.2 1994/10/26 02:53:13 cgd Exp $ */ - /* * Copyright (c) 1994 Scott Bartram * All rights reserved. @@ -28,12 +26,15 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_ustat.h,v 1.2 2003/08/07 21:17:17 dillon Exp $ + * $NetBSD: ibcs2_ustat.h,v 1.2 1994/10/26 02:53:13 cgd Exp $ */ #ifndef _IBCS2_USTAT_H #define _IBCS2_USTAT_H 1 -#include +#include "ibcs2_types.h" struct ibcs2_ustat { long f_tfree; diff --git a/sys/emulation/ibcs2/i386/ibcs2_util.c b/sys/emulation/ibcs2/i386/ibcs2_util.c index 9da2f276b9..8b7f692a6b 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_util.c +++ b/sys/emulation/ibcs2/i386/ibcs2_util.c @@ -28,7 +28,7 @@ * * from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp * $FreeBSD: src/sys/i386/ibcs2/ibcs2_util.c,v 1.7 1999/12/15 23:01:45 eivind Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_util.c,v 1.5 2003/06/26 05:55:13 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_util.c,v 1.6 2003/08/07 21:17:17 dillon Exp $ */ #include @@ -38,7 +38,7 @@ #include #include -#include +#include "ibcs2_util.h" #include diff --git a/sys/emulation/ibcs2/i386/ibcs2_utime.h b/sys/emulation/ibcs2/i386/ibcs2_utime.h index 46700aeb4d..2670413f2a 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_utime.h +++ b/sys/emulation/ibcs2/i386/ibcs2_utime.h @@ -26,12 +26,14 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_utime.h,v 1.2 2003/08/07 21:17:17 dillon Exp $ */ #ifndef _IBCS2_UTIME_H #define _IBCS2_UTIME_H -#include +#include "ibcs2_types.h" struct ibcs2_utimbuf { ibcs2_time_t actime; diff --git a/sys/emulation/ibcs2/i386/ibcs2_xenix.c b/sys/emulation/ibcs2/i386/ibcs2_xenix.c index 314565ca5d..c88988531b 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_xenix.c +++ b/sys/emulation/ibcs2/i386/ibcs2_xenix.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/ibcs2/ibcs2_xenix.c,v 1.20 1999/12/15 23:01:46 eivind Exp $ - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_xenix.c,v 1.7 2003/07/30 00:19:14 dillon Exp $ + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_xenix.c,v 1.8 2003/08/07 21:17:17 dillon Exp $ */ #include @@ -43,13 +43,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_unistd.h" +#include "ibcs2_signal.h" +#include "ibcs2_util.h" +#include "ibcs2_proto.h" +#include "ibcs2_xenix.h" +#include "ibcs2_xenix_syscall.h" #include diff --git a/sys/emulation/ibcs2/i386/ibcs2_xenix.h b/sys/emulation/ibcs2/i386/ibcs2_xenix.h index f86dfa2437..97a378c3e4 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_xenix.h +++ b/sys/emulation/ibcs2/i386/ibcs2_xenix.h @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_xenix.h,v 1.5 2003/07/30 00:19:14 dillon Exp $ - * created from DragonFly: src/sys/i386/ibcs2/syscalls.xenix,v 1.2 2003/06/17 04:28:35 dillon Exp + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_xenix.h,v 1.6 2003/08/07 21:17:17 dillon Exp $ + * created from DragonFly: src/sys/emulation/ibcs2/i386/syscalls.xenix,v 1.2 2003/06/17 04:28:35 dillon Exp */ #ifndef _IBCS2_XENIX_H_ diff --git a/sys/emulation/ibcs2/i386/ibcs2_xenix_syscall.h b/sys/emulation/ibcs2/i386/ibcs2_xenix_syscall.h index 2b7ed920fe..a9376e84c1 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_xenix_syscall.h +++ b/sys/emulation/ibcs2/i386/ibcs2_xenix_syscall.h @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_xenix_syscall.h,v 1.4 2003/07/30 00:19:14 dillon Exp $ - * created from DragonFly: src/sys/i386/ibcs2/syscalls.xenix,v 1.2 2003/06/17 04:28:35 dillon Exp + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_xenix_syscall.h,v 1.5 2003/08/07 21:17:17 dillon Exp $ + * created from DragonFly: src/sys/emulation/ibcs2/i386/syscalls.xenix,v 1.2 2003/06/17 04:28:35 dillon Exp */ #define IBCS2_XENIX_xenix_rdchk 7 diff --git a/sys/emulation/ibcs2/i386/ibcs2_xenix_sysent.c b/sys/emulation/ibcs2/i386/ibcs2_xenix_sysent.c index 32ec250733..3bd741e4ea 100644 --- a/sys/emulation/ibcs2/i386/ibcs2_xenix_sysent.c +++ b/sys/emulation/ibcs2/i386/ibcs2_xenix_sysent.c @@ -2,16 +2,16 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_xenix_sysent.c,v 1.4 2003/07/30 00:19:14 dillon Exp $ - * created from DragonFly: src/sys/i386/ibcs2/syscalls.xenix,v 1.2 2003/06/17 04:28:35 dillon Exp + * $DragonFly: src/sys/emulation/ibcs2/i386/Attic/ibcs2_xenix_sysent.c,v 1.5 2003/08/07 21:17:17 dillon Exp $ + * created from DragonFly: src/sys/emulation/ibcs2/i386/syscalls.xenix,v 1.2 2003/06/17 04:28:35 dillon Exp */ #include #include #include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_xenix.h" #define AS(name) ((sizeof(struct name) - sizeof(union sysmsg)) / sizeof(register_t)) diff --git a/sys/emulation/ibcs2/i386/syscalls.isc b/sys/emulation/ibcs2/i386/syscalls.isc index 6173c939d1..35a4918d24 100644 --- a/sys/emulation/ibcs2/i386/syscalls.isc +++ b/sys/emulation/ibcs2/i386/syscalls.isc @@ -1,13 +1,13 @@ - $DragonFly: src/sys/emulation/ibcs2/i386/Attic/syscalls.isc,v 1.2 2003/06/17 04:28:35 dillon Exp $ + $DragonFly: src/sys/emulation/ibcs2/i386/Attic/syscalls.isc,v 1.3 2003/08/07 21:17:17 dillon Exp $ ; $FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.5 1999/08/28 00:44:01 peter Exp $ #include #include #include -#include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_proto.h" +#include "ibcs2_xenix.h" 0 UNIMPL ISC nosys 1 UNIMPL ISC isc_setostype diff --git a/sys/emulation/ibcs2/i386/syscalls.master b/sys/emulation/ibcs2/i386/syscalls.master index a3d81bcc76..2af866bf5f 100644 --- a/sys/emulation/ibcs2/i386/syscalls.master +++ b/sys/emulation/ibcs2/i386/syscalls.master @@ -1,4 +1,4 @@ - $DragonFly: src/sys/emulation/ibcs2/i386/Attic/syscalls.master,v 1.2 2003/06/17 04:28:35 dillon Exp $ + $DragonFly: src/sys/emulation/ibcs2/i386/Attic/syscalls.master,v 1.3 2003/08/07 21:17:17 dillon Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; $FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.9.2.2 2001/10/05 07:34:36 peter Exp $ @@ -27,9 +27,9 @@ #include #include #include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_proto.h" ; #ifdef's, etc. may be included, and are copied to the output files. diff --git a/sys/emulation/ibcs2/i386/syscalls.xenix b/sys/emulation/ibcs2/i386/syscalls.xenix index 35fda5e2c1..11b09234a8 100644 --- a/sys/emulation/ibcs2/i386/syscalls.xenix +++ b/sys/emulation/ibcs2/i386/syscalls.xenix @@ -1,12 +1,12 @@ - $DragonFly: src/sys/emulation/ibcs2/i386/Attic/syscalls.xenix,v 1.2 2003/06/17 04:28:35 dillon Exp $ + $DragonFly: src/sys/emulation/ibcs2/i386/Attic/syscalls.xenix,v 1.3 2003/08/07 21:17:17 dillon Exp $ ; $FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.6 1999/08/28 00:44:02 peter Exp $ #include #include #include -#include -#include -#include +#include "ibcs2_types.h" +#include "ibcs2_signal.h" +#include "ibcs2_xenix.h" 0 UNIMPL XENIX nosys 1 UNIMPL XENIX xenix_xlocking diff --git a/sys/emulation/linux/i386/Makefile b/sys/emulation/linux/i386/Makefile index 1f897d25d6..849fdf4876 100644 --- a/sys/emulation/linux/i386/Makefile +++ b/sys/emulation/linux/i386/Makefile @@ -1,15 +1,15 @@ # Makefile for syscall tables # # $FreeBSD: src/sys/i386/linux/Makefile,v 1.4 1999/08/28 00:45:21 peter Exp $ -# $DragonFly: src/sys/emulation/linux/i386/Makefile,v 1.3 2003/07/24 01:41:24 dillon Exp $ +# $DragonFly: src/sys/emulation/linux/i386/Makefile,v 1.4 2003/08/07 21:17:18 dillon Exp $ all: @echo "make linux_sysent.c only" -linux_sysent.c linux_syscall.h linux_proto.h linux_union.h: ../../kern/makesyscalls.sh \ +linux_sysent.c linux_syscall.h linux_proto.h linux_union.h: ../../../kern/makesyscalls.sh \ syscalls.master syscalls.conf -mv -f linux_sysent.c linux_sysent.c.bak -mv -f linux_syscall.h linux_syscall.h.bak -mv -f linux_proto.h linux_proto.h.bak -mv -f linux_union.h linux_union.h.bak - sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf + sh ../../../kern/makesyscalls.sh syscalls.master syscalls.conf diff --git a/sys/emulation/linux/i386/imgact_linux.c b/sys/emulation/linux/i386/imgact_linux.c index bd5bfd0f85..6341fe3685 100644 --- a/sys/emulation/linux/i386/imgact_linux.c +++ b/sys/emulation/linux/i386/imgact_linux.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/linux/imgact_linux.c,v 1.35.2.2 2001/11/03 01:41:08 ps Exp $ - * $DragonFly: src/sys/emulation/linux/i386/imgact_linux.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/i386/imgact_linux.c,v 1.3 2003/08/07 21:17:18 dillon Exp $ */ #include @@ -51,7 +51,7 @@ #include #include -#include +#include "linux.h" static int exec_linux_imgact __P((struct image_params *iparams)); diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c b/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c index a42d8cb31d..3587fe372b 100644 --- a/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c +++ b/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c @@ -39,7 +39,7 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 * * $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs_misc.c,v 1.3.2.8 2001/06/25 19:46:47 pirzyk Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c,v 1.4 2003/07/03 17:24:02 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_misc.c,v 1.5 2003/08/07 21:17:19 dillon Exp $ */ #include @@ -67,7 +67,7 @@ #include #include -#include +#include "linprocfs.h" /* * Various conversion macros diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c b/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c index 2675afaf26..1fc72ec00c 100644 --- a/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c +++ b/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c @@ -39,7 +39,7 @@ * @(#)procfs_subr.c 8.6 (Berkeley) 5/14/95 * * $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs_subr.c,v 1.3.2.4 2001/06/25 19:46:47 pirzyk Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c,v 1.4 2003/07/19 21:14:36 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c,v 1.5 2003/08/07 21:17:19 dillon Exp $ */ #include @@ -47,7 +47,7 @@ #include #include #include -#include +#include "linprocfs.h" static struct pfsnode *pfshead; static int pfsvplock; diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs_vfsops.c b/sys/emulation/linux/i386/linprocfs/linprocfs_vfsops.c index 3edf894b28..30fc466ca9 100644 --- a/sys/emulation/linux/i386/linprocfs/linprocfs_vfsops.c +++ b/sys/emulation/linux/i386/linprocfs/linprocfs_vfsops.c @@ -39,7 +39,7 @@ * @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95 * * $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs_vfsops.c,v 1.2.2.3 2001/10/15 20:42:01 des Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vfsops.c,v 1.3 2003/06/25 03:55:55 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vfsops.c,v 1.4 2003/08/07 21:17:19 dillon Exp $ */ /* @@ -53,7 +53,7 @@ #include #include #include -#include +#include "linprocfs.h" static int linprocfs_mount __P((struct mount *mp, char *path, caddr_t data, struct nameidata *ndp, struct thread *td)); diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c b/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c index e8c7f93b0d..9ab319ca18 100644 --- a/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c +++ b/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c @@ -39,7 +39,7 @@ * @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95 * * $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs_vnops.c,v 1.3.2.5 2001/08/12 14:29:19 rwatson Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c,v 1.6 2003/07/19 21:14:36 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c,v 1.7 2003/08/07 21:17:19 dillon Exp $ */ /* @@ -61,7 +61,7 @@ #include #include #include -#include +#include "linprocfs.h" #include extern struct vnode *procfs_findtextvp __P((struct proc *)); diff --git a/sys/emulation/linux/i386/linux.h b/sys/emulation/linux/i386/linux.h index 48dfc7774a..b8ed5a61a7 100644 --- a/sys/emulation/linux/i386/linux.h +++ b/sys/emulation/linux/i386/linux.h @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/linux/linux.h,v 1.41.2.4 2003/01/06 09:19:43 fjoe Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linux.h,v 1.4 2003/07/21 07:57:46 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linux.h,v 1.5 2003/08/07 21:17:18 dillon Exp $ */ #ifndef _I386_LINUX_LINUX_H_ @@ -34,7 +34,7 @@ #include /* for sigval union */ -#include +#include "linux_syscall.h" /* * debugging support diff --git a/sys/emulation/linux/i386/linux_dummy.c b/sys/emulation/linux/i386/linux_dummy.c index ca39566b5d..393fac0367 100644 --- a/sys/emulation/linux/i386/linux_dummy.c +++ b/sys/emulation/linux/i386/linux_dummy.c @@ -26,16 +26,16 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/linux/linux_dummy.c,v 1.21.2.7 2003/01/02 20:41:33 kan Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linux_dummy.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linux_dummy.c,v 1.3 2003/08/07 21:17:18 dillon Exp $ */ #include #include #include -#include -#include -#include +#include "linux.h" +#include "linux_proto.h" +#include "../linux_util.h" DUMMY(stat); DUMMY(mount); diff --git a/sys/emulation/linux/i386/linux_genassym.c b/sys/emulation/linux/i386/linux_genassym.c index 4d8689708a..481694bd3e 100644 --- a/sys/emulation/linux/i386/linux_genassym.c +++ b/sys/emulation/linux/i386/linux_genassym.c @@ -1,10 +1,10 @@ /* $FreeBSD: src/sys/i386/linux/linux_genassym.c,v 1.13.2.3 2001/11/05 19:08:23 marcel Exp $ */ -/* $DragonFly: src/sys/emulation/linux/i386/linux_genassym.c,v 1.2 2003/06/17 04:28:38 dillon Exp $ */ +/* $DragonFly: src/sys/emulation/linux/i386/linux_genassym.c,v 1.3 2003/08/07 21:17:18 dillon Exp $ */ #include #include -#include +#include "linux.h" ASSYM(LINUX_SIGF_HANDLER, offsetof(struct l_sigframe, sf_handler)); ASSYM(LINUX_SIGF_SC, offsetof(struct l_sigframe, sf_sc)); diff --git a/sys/emulation/linux/i386/linux_locore.s b/sys/emulation/linux/i386/linux_locore.s index c99f02d768..ca63dd8872 100644 --- a/sys/emulation/linux/i386/linux_locore.s +++ b/sys/emulation/linux/i386/linux_locore.s @@ -1,10 +1,9 @@ /* $FreeBSD: src/sys/i386/linux/linux_locore.s,v 1.5.2.3 2001/11/05 19:08:23 marcel Exp $ */ -/* $DragonFly: src/sys/emulation/linux/i386/linux_locore.s,v 1.2 2003/06/17 04:28:38 dillon Exp $ */ +/* $DragonFly: src/sys/emulation/linux/i386/linux_locore.s,v 1.3 2003/08/07 21:17:18 dillon Exp $ */ #include "linux_assym.h" /* system definitions */ #include /* miscellaneous asm macros */ - -#include /* system call numbers */ +#include "linux_syscall.h" /* system call numbers */ NON_GPROF_ENTRY(linux_sigcode) call *LINUX_SIGF_HANDLER(%esp) diff --git a/sys/emulation/linux/i386/linux_machdep.c b/sys/emulation/linux/i386/linux_machdep.c index 9929383960..ee30dd5462 100644 --- a/sys/emulation/linux/i386/linux_machdep.c +++ b/sys/emulation/linux/i386/linux_machdep.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/linux/linux_machdep.c,v 1.6.2.4 2001/11/05 19:08:23 marcel Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linux_machdep.c,v 1.7 2003/07/30 00:19:14 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linux_machdep.c,v 1.8 2003/08/07 21:17:18 dillon Exp $ */ #include @@ -48,11 +48,11 @@ #include #include -#include -#include -#include -#include -#include +#include "linux.h" +#include "linux_proto.h" +#include "../linux_ipc.h" +#include "../linux_signal.h" +#include "../linux_util.h" struct l_descriptor { l_uint entry_number; diff --git a/sys/emulation/linux/i386/linux_proto.h b/sys/emulation/linux/i386/linux_proto.h index d775ac05c2..4c8f044219 100644 --- a/sys/emulation/linux/i386/linux_proto.h +++ b/sys/emulation/linux/i386/linux_proto.h @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/linux/i386/linux_proto.h,v 1.6 2003/07/30 00:19:14 dillon Exp $ - * created from DragonFly: src/sys/i386/linux/syscalls.master,v 1.2 2003/06/17 04:28:39 dillon Exp + * $DragonFly: src/sys/emulation/linux/i386/linux_proto.h,v 1.7 2003/08/07 21:17:18 dillon Exp $ + * created from DragonFly: src/sys/emulation/linux/i386/syscalls.master,v 1.2 2003/06/17 04:28:39 dillon Exp */ #ifndef _LINUX_SYSPROTO_H_ diff --git a/sys/emulation/linux/i386/linux_ptrace.c b/sys/emulation/linux/i386/linux_ptrace.c index c2ad970769..971b3a1781 100644 --- a/sys/emulation/linux/i386/linux_ptrace.c +++ b/sys/emulation/linux/i386/linux_ptrace.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/linux/linux_ptrace.c,v 1.7.4.3 2003/01/03 17:13:23 kan Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linux_ptrace.c,v 1.7 2003/08/01 10:58:59 rob Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linux_ptrace.c,v 1.8 2003/08/07 21:17:18 dillon Exp $ */ #include "opt_cpu.h" @@ -46,8 +46,8 @@ #include #include -#include -#include +#include "linux.h" +#include "linux_proto.h" /* * Linux ptrace requests numbers. Mostly identical to FreeBSD, diff --git a/sys/emulation/linux/i386/linux_syscall.h b/sys/emulation/linux/i386/linux_syscall.h index bec9aacf57..9715ebad54 100644 --- a/sys/emulation/linux/i386/linux_syscall.h +++ b/sys/emulation/linux/i386/linux_syscall.h @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/linux/i386/linux_syscall.h,v 1.6 2003/07/30 00:19:14 dillon Exp $ - * created from DragonFly: src/sys/i386/linux/syscalls.master,v 1.2 2003/06/17 04:28:39 dillon Exp + * $DragonFly: src/sys/emulation/linux/i386/linux_syscall.h,v 1.7 2003/08/07 21:17:18 dillon Exp $ + * created from DragonFly: src/sys/emulation/linux/i386/syscalls.master,v 1.2 2003/06/17 04:28:39 dillon Exp */ #define LINUX_SYS_exit 1 diff --git a/sys/emulation/linux/i386/linux_sysent.c b/sys/emulation/linux/i386/linux_sysent.c index 77edf5b1a2..a1821e43e4 100644 --- a/sys/emulation/linux/i386/linux_sysent.c +++ b/sys/emulation/linux/i386/linux_sysent.c @@ -2,16 +2,16 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/linux/i386/linux_sysent.c,v 1.6 2003/07/30 00:19:14 dillon Exp $ - * created from DragonFly: src/sys/i386/linux/syscalls.master,v 1.2 2003/06/17 04:28:39 dillon Exp + * $DragonFly: src/sys/emulation/linux/i386/linux_sysent.c,v 1.7 2003/08/07 21:17:18 dillon Exp $ + * created from DragonFly: src/sys/emulation/linux/i386/syscalls.master,v 1.2 2003/06/17 04:28:39 dillon Exp */ #include "opt_compat.h" #include #include #include -#include -#include +#include "linux.h" +#include "linux_proto.h" #define AS(name) ((sizeof(struct name) - sizeof(union sysmsg)) / sizeof(register_t)) diff --git a/sys/emulation/linux/i386/linux_sysvec.c b/sys/emulation/linux/i386/linux_sysvec.c index afea802cb0..d4e8e421eb 100644 --- a/sys/emulation/linux/i386/linux_sysvec.c +++ b/sys/emulation/linux/i386/linux_sysvec.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.55.2.9 2002/01/12 11:03:30 bde Exp $ - * $DragonFly: src/sys/emulation/linux/i386/linux_sysvec.c,v 1.7 2003/07/30 00:19:14 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/i386/linux_sysvec.c,v 1.8 2003/08/07 21:17:18 dillon Exp $ */ /* XXX we use functions that might not exist. */ @@ -57,10 +57,10 @@ #include #include -#include -#include -#include -#include +#include "linux.h" +#include "linux_proto.h" +#include "../linux_signal.h" +#include "../linux_util.h" MALLOC_DEFINE(M_LINUX, "linux", "Linux mode structures"); diff --git a/sys/emulation/linux/i386/linux_union.h b/sys/emulation/linux/i386/linux_union.h index 7b52ea6b25..7f5df143f6 100644 --- a/sys/emulation/linux/i386/linux_union.h +++ b/sys/emulation/linux/i386/linux_union.h @@ -2,8 +2,8 @@ * Union of syscall args for messaging. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/linux/i386/linux_union.h,v 1.2 2003/07/30 00:19:14 dillon Exp $ - * created from DragonFly: src/sys/i386/linux/syscalls.master,v 1.2 2003/06/17 04:28:39 dillon Exp + * $DragonFly: src/sys/emulation/linux/i386/linux_union.h,v 1.3 2003/08/07 21:17:18 dillon Exp $ + * created from DragonFly: src/sys/emulation/linux/i386/syscalls.master,v 1.2 2003/06/17 04:28:39 dillon Exp */ union sysunion { diff --git a/sys/emulation/linux/i386/syscalls.master b/sys/emulation/linux/i386/syscalls.master index 54afa64784..c08cb7302f 100644 --- a/sys/emulation/linux/i386/syscalls.master +++ b/sys/emulation/linux/i386/syscalls.master @@ -1,4 +1,4 @@ - $DragonFly: src/sys/emulation/linux/i386/syscalls.master,v 1.2 2003/06/17 04:28:39 dillon Exp $ + $DragonFly: src/sys/emulation/linux/i386/syscalls.master,v 1.3 2003/08/07 21:17:18 dillon Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.30.2.8 2003/01/02 20:41:33 kan Exp $ @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include "linux.h" +#include "linux_proto.h" ; #ifdef's, etc. may be included, and are copied to the output files. diff --git a/sys/emulation/linux/linux_file.c b/sys/emulation/linux/linux_file.c index 64d8d9f136..f17300a944 100644 --- a/sys/emulation/linux/linux_file.c +++ b/sys/emulation/linux/linux_file.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.41.2.6 2003/01/06 09:19:43 fjoe Exp $ - * $DragonFly: src/sys/emulation/linux/linux_file.c,v 1.7 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/linux_file.c,v 1.8 2003/08/07 21:17:18 dillon Exp $ */ #include "opt_compat.h" @@ -46,14 +46,14 @@ #include #include -#include -#include +#include +#include #include -#include -#include -#include +#include +#include +#include "linux_util.h" #ifndef __alpha__ int diff --git a/sys/emulation/linux/linux_getcwd.c b/sys/emulation/linux/linux_getcwd.c index fb20441887..543c48a6b5 100644 --- a/sys/emulation/linux/linux_getcwd.c +++ b/sys/emulation/linux/linux_getcwd.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.2.2.3 2001/11/05 19:08:22 marcel Exp $ */ -/* $DragonFly: src/sys/emulation/linux/linux_getcwd.c,v 1.8 2003/07/30 00:19:13 dillon Exp $ */ +/* $DragonFly: src/sys/emulation/linux/linux_getcwd.c,v 1.9 2003/08/07 21:17:18 dillon Exp $ */ /* $OpenBSD: linux_getcwd.c,v 1.2 2001/05/16 12:50:21 ho Exp $ */ /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */ @@ -54,11 +54,11 @@ #include #include #include -#include /* XXX only for DIRBLKSIZ */ +#include /* XXX only for DIRBLKSIZ */ -#include -#include -#include +#include +#include +#include "linux_util.h" static int linux_getcwd_scandir __P((struct vnode **, struct vnode **, diff --git a/sys/emulation/linux/linux_ioctl.c b/sys/emulation/linux/linux_ioctl.c index 065c5ebfb0..1dcf01ed71 100644 --- a/sys/emulation/linux/linux_ioctl.c +++ b/sys/emulation/linux/linux_ioctl.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.55.2.11 2003/05/01 20:16:09 anholt Exp $ - * $DragonFly: src/sys/emulation/linux/linux_ioctl.c,v 1.5 2003/07/21 07:57:39 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/linux_ioctl.c,v 1.6 2003/08/07 21:17:18 dillon Exp $ */ #include @@ -54,12 +54,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "linux_ioctl.h" +#include "linux_mib.h" +#include "linux_util.h" static linux_ioctl_function_t linux_ioctl_cdrom; static linux_ioctl_function_t linux_ioctl_console; diff --git a/sys/emulation/linux/linux_ipc.c b/sys/emulation/linux/linux_ipc.c index c72fead9e7..9b64056695 100644 --- a/sys/emulation/linux/linux_ipc.c +++ b/sys/emulation/linux/linux_ipc.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.17.2.3 2001/11/05 19:08:22 marcel Exp $ - * $DragonFly: src/sys/emulation/linux/linux_ipc.c,v 1.5 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/linux_ipc.c,v 1.6 2003/08/07 21:17:18 dillon Exp $ */ #include @@ -36,10 +36,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include "linux_ipc.h" +#include "linux_util.h" struct l_seminfo { l_int semmap; diff --git a/sys/emulation/linux/linux_mib.c b/sys/emulation/linux/linux_mib.c index 39065afa96..b3b731ed45 100644 --- a/sys/emulation/linux/linux_mib.c +++ b/sys/emulation/linux/linux_mib.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/linux/linux_mib.c,v 1.7.2.2 2001/11/05 19:08:22 marcel Exp $ - * $DragonFly: src/sys/emulation/linux/linux_mib.c,v 1.5 2003/07/26 13:59:53 rob Exp $ + * $DragonFly: src/sys/emulation/linux/linux_mib.c,v 1.6 2003/08/07 21:17:18 dillon Exp $ */ #include @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include "linux_mib.h" struct linux_prison { char pr_osname[LINUX_MAX_UTSNAME]; diff --git a/sys/emulation/linux/linux_misc.c b/sys/emulation/linux/linux_misc.c index 014ab2de6a..b631569355 100644 --- a/sys/emulation/linux/linux_misc.c +++ b/sys/emulation/linux/linux_misc.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.85.2.9 2002/09/24 08:11:41 mdodd Exp $ - * $DragonFly: src/sys/emulation/linux/linux_misc.c,v 1.11 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/linux_misc.c,v 1.12 2003/08/07 21:17:18 dillon Exp $ */ #include "opt_compat.h" @@ -72,12 +72,12 @@ #include #endif -#include +#include -#include -#include -#include -#include +#include +#include +#include "linux_mib.h" +#include "linux_util.h" #ifdef __alpha__ #define BSD_TO_LINUX_SIGNAL(sig) (sig) diff --git a/sys/emulation/linux/linux_signal.c b/sys/emulation/linux/linux_signal.c index 2e9fb2f706..282ba7a9f3 100644 --- a/sys/emulation/linux/linux_signal.c +++ b/sys/emulation/linux/linux_signal.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.23.2.3 2001/11/05 19:08:23 marcel Exp $ - * $DragonFly: src/sys/emulation/linux/linux_signal.c,v 1.5 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/linux_signal.c,v 1.6 2003/08/07 21:17:18 dillon Exp $ */ #include @@ -36,10 +36,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include "linux_signal.h" +#include "linux_util.h" void linux_to_bsd_sigset(l_sigset_t *lss, sigset_t *bss) diff --git a/sys/emulation/linux/linux_socket.c b/sys/emulation/linux/linux_socket.c index 089f0af5be..e05607d0da 100644 --- a/sys/emulation/linux/linux_socket.c +++ b/sys/emulation/linux/linux_socket.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.19.2.8 2001/11/07 20:33:55 marcel Exp $ - * $DragonFly: src/sys/emulation/linux/linux_socket.c,v 1.6 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/linux_socket.c,v 1.7 2003/08/07 21:17:18 dillon Exp $ */ /* XXX we use functions that might not exist. */ @@ -50,10 +50,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include "linux_socket.h" +#include "linux_util.h" /* * FreeBSD's socket calls require the sockaddr struct length to agree diff --git a/sys/emulation/linux/linux_stats.c b/sys/emulation/linux/linux_stats.c index e8ed350d3d..c1cb349bff 100644 --- a/sys/emulation/linux/linux_stats.c +++ b/sys/emulation/linux/linux_stats.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.22.2.3 2001/11/05 19:08:23 marcel Exp $ - * $DragonFly: src/sys/emulation/linux/linux_stats.c,v 1.5 2003/07/22 17:03:26 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/linux_stats.c,v 1.6 2003/08/07 21:17:18 dillon Exp $ */ #include @@ -45,9 +45,9 @@ #include #include -#include -#include -#include +#include +#include +#include "linux_util.h" static int newstat_copyout(struct stat *buf, void *ubuf) diff --git a/sys/emulation/linux/linux_sysctl.c b/sys/emulation/linux/linux_sysctl.c index f704320cac..5177ab1025 100644 --- a/sys/emulation/linux/linux_sysctl.c +++ b/sys/emulation/linux/linux_sysctl.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/compat/linux/linux_sysctl.c,v 1.2.2.1 2001/10/21 03:57:35 marcel Exp $ - * $DragonFly: src/sys/emulation/linux/linux_sysctl.c,v 1.3 2003/06/23 17:55:26 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/linux_sysctl.c,v 1.4 2003/08/07 21:17:18 dillon Exp $ */ #include "opt_compat.h" @@ -36,9 +36,9 @@ #include #include -#include -#include -#include +#include +#include +#include "linux_util.h" #define LINUX_CTL_KERN 1 #define LINUX_CTL_VM 2 diff --git a/sys/emulation/linux/linux_uid16.c b/sys/emulation/linux/linux_uid16.c index 2600cfb7c0..dc2f8daf48 100644 --- a/sys/emulation/linux/linux_uid16.c +++ b/sys/emulation/linux/linux_uid16.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/compat/linux/linux_uid16.c,v 1.4.2.1 2001/10/21 03:57:35 marcel Exp $ - * $DragonFly: src/sys/emulation/linux/linux_uid16.c,v 1.6 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/linux_uid16.c,v 1.7 2003/08/07 21:17:18 dillon Exp $ */ #include "opt_compat.h" @@ -34,9 +34,9 @@ #include #include -#include -#include -#include +#include +#include +#include "linux_util.h" DUMMY(setfsuid16); DUMMY(setfsgid16); diff --git a/sys/emulation/linux/linux_util.c b/sys/emulation/linux/linux_util.c index 6d065d0782..1e20ac03f4 100644 --- a/sys/emulation/linux/linux_util.c +++ b/sys/emulation/linux/linux_util.c @@ -28,7 +28,7 @@ * * from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp * $FreeBSD: src/sys/compat/linux/linux_util.c,v 1.12.2.2 2001/11/05 19:08:23 marcel Exp $ - * $DragonFly: src/sys/emulation/linux/linux_util.c,v 1.5 2003/06/26 05:55:10 dillon Exp $ + * $DragonFly: src/sys/emulation/linux/linux_util.c,v 1.6 2003/08/07 21:17:18 dillon Exp $ */ #include @@ -38,7 +38,7 @@ #include #include -#include +#include "linux_util.h" const char linux_emul_path[] = "/compat/linux"; diff --git a/sys/emulation/posix4/ksched.c b/sys/emulation/posix4/ksched.c index 9369821d19..31d92bdbc1 100644 --- a/sys/emulation/posix4/ksched.c +++ b/sys/emulation/posix4/ksched.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/posix4/ksched.c,v 1.7.2.1 2000/05/16 06:58:13 dillon Exp $ - * $DragonFly: src/sys/emulation/posix4/Attic/ksched.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/emulation/posix4/Attic/ksched.c,v 1.3 2003/08/07 21:17:19 dillon Exp $ */ /* ksched: Soft real time scheduling based on "rtprio". @@ -44,7 +44,7 @@ #include /* For need_resched */ #include /* For need_resched */ -#include +#include "posix4.h" /* ksched: Real-time extension to support POSIX priority scheduling. */ diff --git a/sys/emulation/posix4/p1003_1b.c b/sys/emulation/posix4/p1003_1b.c index 293fee59f8..f59392b7e8 100644 --- a/sys/emulation/posix4/p1003_1b.c +++ b/sys/emulation/posix4/p1003_1b.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/posix4/p1003_1b.c,v 1.5.2.2 2003/03/25 06:13:35 rwatson Exp $ - * $DragonFly: src/sys/emulation/posix4/Attic/p1003_1b.c,v 1.5 2003/07/30 00:19:15 dillon Exp $ + * $DragonFly: src/sys/emulation/posix4/Attic/p1003_1b.c,v 1.6 2003/08/07 21:17:19 dillon Exp $ */ /* p1003_1b: Real Time common code. @@ -46,7 +46,7 @@ #include #include -#include +#include "posix4.h" MALLOC_DEFINE(M_P31B, "p1003.1b", "Posix 1003.1B"); diff --git a/sys/emulation/posix4/posix4.h b/sys/emulation/posix4/posix4.h index 0f533dc91e..a246686a90 100644 --- a/sys/emulation/posix4/posix4.h +++ b/sys/emulation/posix4/posix4.h @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/posix4/posix4.h,v 1.6 1999/12/27 10:22:09 bde Exp $ - * $DragonFly: src/sys/emulation/posix4/Attic/posix4.h,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/emulation/posix4/Attic/posix4.h,v 1.3 2003/08/07 21:17:19 dillon Exp $ */ #include "opt_posix.h" @@ -40,7 +40,7 @@ #include #include #include -#include +#include "sched.h" /* Generate syscall stubs for when something is optionally * loadable as a module. References "syscall_not_present". diff --git a/sys/emulation/posix4/posix4_mib.c b/sys/emulation/posix4/posix4_mib.c index 7a2e045589..61d5de0cb4 100644 --- a/sys/emulation/posix4/posix4_mib.c +++ b/sys/emulation/posix4/posix4_mib.c @@ -30,14 +30,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/posix4/posix4_mib.c,v 1.3.2.1 2000/08/03 01:09:59 peter Exp $ - * $DragonFly: src/sys/emulation/posix4/Attic/posix4_mib.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/emulation/posix4/Attic/posix4_mib.c,v 1.3 2003/08/07 21:17:19 dillon Exp $ */ #include #include #include #include -#include +#include "posix4.h" static int facility[CTL_P1003_1B_MAXID - 1]; diff --git a/sys/emulation/svr4/Makefile b/sys/emulation/svr4/Makefile index 54d954e9a3..f6fc424907 100644 --- a/sys/emulation/svr4/Makefile +++ b/sys/emulation/svr4/Makefile @@ -1,17 +1,17 @@ # Makefile for syscall tables # # $FreeBSD: src/sys/svr4/Makefile,v 1.3 1999/09/01 00:32:18 newton Exp $ -# $DragonFly: src/sys/emulation/svr4/Attic/Makefile,v 1.3 2003/07/24 01:41:26 dillon Exp $ +# $DragonFly: src/sys/emulation/svr4/Attic/Makefile,v 1.4 2003/08/07 21:17:19 dillon Exp $ MAINTAINER= newton@freebsd.org all: @echo "make svr4_sysent.c only" -svr4_sysent.c svr4_syscall.h svr4_proto.h svr4_union.h: ../kern/makesyscalls.sh \ +svr4_sysent.c svr4_syscall.h svr4_proto.h svr4_union.h: ../../kern/makesyscalls.sh \ syscalls.master syscalls.conf -mv -f svr4_sysent.c svr4_sysent.c.bak -mv -f svr4_syscall.h svr4_syscall.h.bak -mv -f svr4_proto.h svr4_proto.h.bak -mv -f svr4_union.h svr4_union.h.bak - sh ../kern/makesyscalls.sh syscalls.master syscalls.conf + sh ../../kern/makesyscalls.sh syscalls.master syscalls.conf diff --git a/sys/emulation/svr4/i386/svr4_genassym.c b/sys/emulation/svr4/i386/svr4_genassym.c index 38f6c107f9..a8897f219a 100644 --- a/sys/emulation/svr4/i386/svr4_genassym.c +++ b/sys/emulation/svr4/i386/svr4_genassym.c @@ -1,17 +1,17 @@ /* $FreeBSD: src/sys/i386/svr4/svr4_genassym.c,v 1.5.2.1 2001/10/09 04:25:26 jlemon Exp $ */ -/* $DragonFly: src/sys/emulation/svr4/i386/Attic/svr4_genassym.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ */ +/* $DragonFly: src/sys/emulation/svr4/i386/Attic/svr4_genassym.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ */ /* Derived from: Id: linux_genassym.c,v 1.8 1998/07/29 15:50:41 bde Exp */ #include #include -#include -#include +#include "../svr4_signal.h" +#include "../svr4_ucontext.h" /* XXX: This bit sucks rocks, but gets rid of compiler errors. Maybe I should * fix the include files instead... */ #define SVR4_MACHDEP_JUST_REGS -#include +#include "svr4_machdep.h" ASSYM(SVR4_SIGF_HANDLER, offsetof(struct svr4_sigframe, sf_handler)); ASSYM(SVR4_SIGF_UC, offsetof(struct svr4_sigframe, sf_uc)); diff --git a/sys/emulation/svr4/i386/svr4_locore.s b/sys/emulation/svr4/i386/svr4_locore.s index 16b8c0b97e..e634066e16 100644 --- a/sys/emulation/svr4/i386/svr4_locore.s +++ b/sys/emulation/svr4/i386/svr4_locore.s @@ -1,10 +1,10 @@ #include "svr4_assym.h" /* system definitions */ #include /* miscellaneous asm macros */ -#include /* system call numbers */ +#include "../svr4_syscall.h" /* system call numbers */ /* $FreeBSD: src/sys/i386/svr4/svr4_locore.s,v 1.10.2.1 2000/07/07 00:38:51 obrien Exp $ */ -/* $DragonFly: src/sys/emulation/svr4/i386/Attic/svr4_locore.s,v 1.3 2003/07/01 20:31:39 dillon Exp $ */ +/* $DragonFly: src/sys/emulation/svr4/i386/Attic/svr4_locore.s,v 1.4 2003/08/07 21:17:20 dillon Exp $ */ NON_GPROF_ENTRY(svr4_sigcode) call *SVR4_SIGF_HANDLER(%esp) diff --git a/sys/emulation/svr4/i386/svr4_machdep.c b/sys/emulation/svr4/i386/svr4_machdep.c index f2291ed69f..5f5a179703 100644 --- a/sys/emulation/svr4/i386/svr4_machdep.c +++ b/sys/emulation/svr4/i386/svr4_machdep.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/svr4/svr4_machdep.c,v 1.13.2.1 2002/01/12 11:03:30 bde Exp $ - * $DragonFly: src/sys/emulation/svr4/i386/Attic/svr4_machdep.c,v 1.5 2003/07/26 19:07:50 rob Exp $ + * $DragonFly: src/sys/emulation/svr4/i386/Attic/svr4_machdep.c,v 1.6 2003/08/07 21:17:20 dillon Exp $ */ #include @@ -50,13 +50,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "../svr4.h" +#include "../svr4_types.h" +#include "../svr4_signal.h" +#include "svr4_machdep.h" +#include "../svr4_ucontext.h" +#include "../svr4_proto.h" +#include "../svr4_util.h" #undef sigcode #undef szsigcode diff --git a/sys/emulation/svr4/i386/svr4_machdep.h b/sys/emulation/svr4/i386/svr4_machdep.h index 2f2ca849b9..bbf1dfd355 100644 --- a/sys/emulation/svr4/i386/svr4_machdep.h +++ b/sys/emulation/svr4/i386/svr4_machdep.h @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/svr4/svr4_machdep.h,v 1.6 2000/01/09 09:57:19 bde Exp $ - * $DragonFly: src/sys/emulation/svr4/i386/Attic/svr4_machdep.h,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/i386/Attic/svr4_machdep.h,v 1.3 2003/08/07 21:17:20 dillon Exp $ */ #ifndef _I386_SVR4_MACHDEP_H_ @@ -34,7 +34,7 @@ #if !defined(SVR4_MACHDEP_JUST_REGS) #include -#include +#include "../svr4_types.h" #endif /* diff --git a/sys/emulation/svr4/imgact_svr4.c b/sys/emulation/svr4/imgact_svr4.c index dd355a3122..370b13b6a1 100644 --- a/sys/emulation/svr4/imgact_svr4.c +++ b/sys/emulation/svr4/imgact_svr4.c @@ -30,7 +30,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/imgact_svr4.c,v 1.8.2.1 2001/11/03 01:41:09 ps Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/imgact_svr4.c,v 1.3 2003/07/23 02:30:23 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/imgact_svr4.c,v 1.4 2003/08/07 21:17:19 dillon Exp $ */ #include @@ -52,7 +52,7 @@ #include #include -#include +#include "svr4.h" static int exec_svr4_imgact __P((struct image_params *iparams)); diff --git a/sys/emulation/svr4/svr4_fcntl.c b/sys/emulation/svr4/svr4_fcntl.c index 447d736f29..af47a0835d 100644 --- a/sys/emulation/svr4/svr4_fcntl.c +++ b/sys/emulation/svr4/svr4_fcntl.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_fcntl.c,v 1.7 1999/12/12 10:27:04 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_fcntl.c,v 1.10 2003/08/05 14:08:52 hmp Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_fcntl.c,v 1.11 2003/08/07 21:17:19 dillon Exp $ */ #include #include @@ -47,12 +47,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_signal.h" +#include "svr4_proto.h" +#include "svr4_util.h" +#include "svr4_fcntl.h" static int svr4_to_bsd_flags __P((int)); static u_long svr4_to_bsd_cmd __P((u_long)); diff --git a/sys/emulation/svr4/svr4_fcntl.h b/sys/emulation/svr4/svr4_fcntl.h index c50f2a79a4..5aba45f0f5 100644 --- a/sys/emulation/svr4/svr4_fcntl.h +++ b/sys/emulation/svr4/svr4_fcntl.h @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_fcntl.h,v 1.3 1999/08/28 00:51:15 peter Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_fcntl.h,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_fcntl.h,v 1.3 2003/08/07 21:17:19 dillon Exp $ */ #ifndef _SVR4_FCNTL_H_ #define _SVR4_FCNTL_H_ -#include +#include "svr4_types.h" #include #define SVR4_O_RDONLY 0x0000 diff --git a/sys/emulation/svr4/svr4_filio.c b/sys/emulation/svr4/svr4_filio.c index 62597936c7..5452e192e9 100644 --- a/sys/emulation/svr4/svr4_filio.c +++ b/sys/emulation/svr4/svr4_filio.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_filio.c,v 1.8 2000/01/15 15:30:44 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_filio.c,v 1.6 2003/07/30 00:19:15 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_filio.c,v 1.7 2003/08/07 21:17:19 dillon Exp $ */ #include @@ -42,13 +42,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_util.h" +#include "svr4_signal.h" +#include "svr4_proto.h" +#include "svr4_ioctl.h" +#include "svr4_filio.h" /*#define GROTTY_READ_HACK*/ diff --git a/sys/emulation/svr4/svr4_fuser.h b/sys/emulation/svr4/svr4_fuser.h index dede5288e1..16b707457f 100644 --- a/sys/emulation/svr4/svr4_fuser.h +++ b/sys/emulation/svr4/svr4_fuser.h @@ -1,6 +1,6 @@ /* * $FreeBSD: src/sys/svr4/svr4_fuser.h,v 1.3 1999/08/28 00:51:16 peter Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_fuser.h,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_fuser.h,v 1.3 2003/08/07 21:17:19 dillon Exp $ * Derived from: * $NetBSD: svr4_fuser.h,v 1.4 1998/09/04 19:54:38 christos Exp $ */ @@ -75,7 +75,7 @@ #ifndef _SVR4_FUSER_H_ #define _SVR4_FUSER_H_ -#include +#include "svr4_types.h" struct svr4_f_user { svr4_pid_t fu_pid; diff --git a/sys/emulation/svr4/svr4_ioctl.c b/sys/emulation/svr4/svr4_ioctl.c index cc27388547..82e695f7ef 100644 --- a/sys/emulation/svr4/svr4_ioctl.c +++ b/sys/emulation/svr4/svr4_ioctl.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_ioctl.c,v 1.6 1999/12/08 12:00:48 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_ioctl.c,v 1.8 2003/07/30 00:19:15 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_ioctl.c,v 1.9 2003/08/07 21:17:19 dillon Exp $ */ #include @@ -38,17 +38,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_util.h" +#include "svr4_signal.h" +#include "svr4_proto.h" +#include "svr4_stropts.h" +#include "svr4_ioctl.h" +#include "svr4_termios.h" +#include "svr4_ttold.h" +#include "svr4_filio.h" +#include "svr4_sockio.h" #ifdef DEBUG_SVR4 static void svr4_decode_cmd __P((u_long, char *, char *, int *, int *)); diff --git a/sys/emulation/svr4/svr4_ipc.c b/sys/emulation/svr4/svr4_ipc.c index 8e9ecec285..dea6cc4427 100644 --- a/sys/emulation/svr4/svr4_ipc.c +++ b/sys/emulation/svr4/svr4_ipc.c @@ -1,6 +1,6 @@ /* * $FreeBSD: src/sys/svr4/svr4_ipc.c,v 1.5 1999/12/08 10:51:16 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_ipc.c,v 1.3 2003/07/26 18:12:46 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_ipc.c,v 1.4 2003/08/07 21:17:19 dillon Exp $ * Derived from: * $NetBSD: svr4_ipc.c,v 1.7 1998/10/19 22:43:00 tron Exp $ */ @@ -84,12 +84,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_signal.h" +#include "svr4_proto.h" +#include "svr4_util.h" +#include "svr4_ipc.h" #if defined(SYSVMSG) || defined(SYSVSHM) || defined(SYSVSEM) static void svr4_to_bsd_ipc_perm __P((const struct svr4_ipc_perm *, diff --git a/sys/emulation/svr4/svr4_misc.c b/sys/emulation/svr4/svr4_misc.c index e999bb1a66..5b631f327f 100644 --- a/sys/emulation/svr4/svr4_misc.c +++ b/sys/emulation/svr4/svr4_misc.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_misc.c,v 1.13.2.7 2003/01/14 21:33:58 dillon Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_misc.c,v 1.10 2003/08/05 18:07:41 hmp Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_misc.c,v 1.11 2003/08/07 21:17:19 dillon Exp $ */ /* @@ -64,19 +64,19 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_signal.h" +#include "svr4_proto.h" +#include "svr4_util.h" +#include "svr4_sysconfig.h" +#include "svr4_dirent.h" +#include "svr4_acl.h" +#include "svr4_ulimit.h" +#include "svr4_statvfs.h" +#include "svr4_hrt.h" +#include "svr4_mman.h" +#include "svr4_wait.h" #include #include diff --git a/sys/emulation/svr4/svr4_proto.h b/sys/emulation/svr4/svr4_proto.h index 32752295a3..42a918c2e7 100644 --- a/sys/emulation/svr4/svr4_proto.h +++ b/sys/emulation/svr4/svr4_proto.h @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_proto.h,v 1.6 2003/07/30 00:19:15 dillon Exp $ - * created from DragonFly: src/sys/svr4/syscalls.master,v 1.2 2003/06/17 04:28:58 dillon Exp + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_proto.h,v 1.7 2003/08/07 21:17:19 dillon Exp $ + * created from DragonFly: src/sys/emulation/svr4/syscalls.master,v 1.2 2003/06/17 04:28:58 dillon Exp */ #ifndef _SVR4_SYSPROTO_H_ diff --git a/sys/emulation/svr4/svr4_resource.c b/sys/emulation/svr4/svr4_resource.c index 08800c1d15..32c4b4a53c 100644 --- a/sys/emulation/svr4/svr4_resource.c +++ b/sys/emulation/svr4/svr4_resource.c @@ -40,7 +40,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_resource.c,v 1.4.2.1 2002/09/02 21:22:54 dillon Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_resource.c,v 1.3 2003/06/23 17:55:49 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_resource.c,v 1.4 2003/08/07 21:17:19 dillon Exp $ */ /* @@ -80,12 +80,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_resource.h" +#include "svr4_signal.h" +#include "svr4_proto.h" +#include "svr4_util.h" static __inline int svr4_to_native_rl __P((int)); diff --git a/sys/emulation/svr4/svr4_signal.c b/sys/emulation/svr4/svr4_signal.c index fa3018d4cc..80dd2672a4 100644 --- a/sys/emulation/svr4/svr4_signal.c +++ b/sys/emulation/svr4/svr4_signal.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_signal.c,v 1.9 2000/01/15 15:38:17 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_signal.c,v 1.7 2003/07/30 00:19:15 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_signal.c,v 1.8 2003/08/07 21:17:19 dillon Exp $ */ #include @@ -37,12 +37,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_signal.h" +#include "svr4_proto.h" +#include "svr4_util.h" +#include "svr4_ucontext.h" #define svr4_sigmask(n) (1 << (((n) - 1) & 31)) #define svr4_sigword(n) (((n) - 1) >> 5) diff --git a/sys/emulation/svr4/svr4_signal.h b/sys/emulation/svr4/svr4_signal.h index ed7f9a653d..5272c65b63 100644 --- a/sys/emulation/svr4/svr4_signal.h +++ b/sys/emulation/svr4/svr4_signal.h @@ -26,14 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_signal.h,v 1.6.2.1 2001/02/22 05:15:12 marcel Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_signal.h,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_signal.h,v 1.3 2003/08/07 21:17:19 dillon Exp $ */ #ifndef _SVR4_SIGNAL_H_ #define _SVR4_SIGNAL_H_ -#include -#include +#include "i386/svr4_machdep.h" +#include "svr4_siginfo.h" #define SVR4_SIGHUP 1 #define SVR4_SIGINT 2 diff --git a/sys/emulation/svr4/svr4_socket.c b/sys/emulation/svr4/svr4_socket.c index a1c61cefa0..274441372f 100644 --- a/sys/emulation/svr4/svr4_socket.c +++ b/sys/emulation/svr4/svr4_socket.c @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_socket.c,v 1.7 1999/12/08 12:00:48 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_socket.c,v 1.4 2003/06/25 03:56:10 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_socket.c,v 1.5 2003/08/07 21:17:19 dillon Exp $ */ /* @@ -55,13 +55,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_util.h" +#include "svr4_socket.h" +#include "svr4_signal.h" +#include "svr4_sockmod.h" +#include "svr4_proto.h" struct svr4_sockcache_entry { struct thread *td; /* Process for the socket */ diff --git a/sys/emulation/svr4/svr4_sockio.c b/sys/emulation/svr4/svr4_sockio.c index 661622c30a..8f151def46 100644 --- a/sys/emulation/svr4/svr4_sockio.c +++ b/sys/emulation/svr4/svr4_sockio.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_sockio.c,v 1.7 1999/12/08 12:00:48 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_sockio.c,v 1.3 2003/06/25 03:56:10 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_sockio.c,v 1.4 2003/08/07 21:17:19 dillon Exp $ */ #include @@ -39,10 +39,10 @@ #include #include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_util.h" +#include "svr4_ioctl.h" +#include "svr4_sockio.h" static int bsd_to_svr4_flags __P((int)); diff --git a/sys/emulation/svr4/svr4_stat.c b/sys/emulation/svr4/svr4_stat.c index ba942e1dd0..5a0a78b723 100644 --- a/sys/emulation/svr4/svr4_stat.c +++ b/sys/emulation/svr4/svr4_stat.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_stat.c,v 1.6 1999/12/08 12:00:48 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_stat.c,v 1.6 2003/07/30 00:19:15 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_stat.c,v 1.7 2003/08/07 21:17:19 dillon Exp $ */ #include @@ -44,17 +44,17 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_signal.h" +#include "svr4_proto.h" +#include "svr4_util.h" +#include "svr4_stat.h" +#include "svr4_ustat.h" +#include "svr4_utsname.h" +#include "svr4_systeminfo.h" +#include "svr4_socket.h" +#include "svr4_time.h" #if defined(NOTYET) #include "svr4_fuser.h" #endif diff --git a/sys/emulation/svr4/svr4_stat.h b/sys/emulation/svr4/svr4_stat.h index 511c1d38d2..c6fa02f6a1 100644 --- a/sys/emulation/svr4/svr4_stat.h +++ b/sys/emulation/svr4/svr4_stat.h @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_stat.h,v 1.3 1999/08/28 00:51:23 peter Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_stat.h,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_stat.h,v 1.3 2003/08/07 21:17:19 dillon Exp $ */ #ifndef _SVR4_STAT_H_ #define _SVR4_STAT_H_ -#include +#include "svr4_types.h" #include struct svr4_stat { diff --git a/sys/emulation/svr4/svr4_stream.c b/sys/emulation/svr4/svr4_stream.c index 6d9864ea24..bf8d94ce41 100644 --- a/sys/emulation/svr4/svr4_stream.c +++ b/sys/emulation/svr4/svr4_stream.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_stream.c,v 1.12.2.2 2000/11/26 04:42:27 dillon Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_stream.c,v 1.7 2003/07/30 00:19:15 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_stream.c,v 1.8 2003/08/07 21:17:19 dillon Exp $ */ /* @@ -65,16 +65,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_util.h" +#include "svr4_signal.h" +#include "svr4_proto.h" +#include "svr4_stropts.h" +#include "svr4_timod.h" +#include "svr4_sockmod.h" +#include "svr4_ioctl.h" +#include "svr4_socket.h" /* Utils */ static int clean_pipe __P((const char *)); diff --git a/sys/emulation/svr4/svr4_syscall.h b/sys/emulation/svr4/svr4_syscall.h index 7f9765a7e6..fa2cc6d52a 100644 --- a/sys/emulation/svr4/svr4_syscall.h +++ b/sys/emulation/svr4/svr4_syscall.h @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_syscall.h,v 1.6 2003/07/30 00:19:15 dillon Exp $ - * created from DragonFly: src/sys/svr4/syscalls.master,v 1.2 2003/06/17 04:28:58 dillon Exp + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_syscall.h,v 1.7 2003/08/07 21:17:19 dillon Exp $ + * created from DragonFly: src/sys/emulation/svr4/syscalls.master,v 1.2 2003/06/17 04:28:58 dillon Exp */ #define SVR4_SYS_exit 1 diff --git a/sys/emulation/svr4/svr4_syscallnames.c b/sys/emulation/svr4/svr4_syscallnames.c index 7f3b93d15f..08031fbeeb 100644 --- a/sys/emulation/svr4/svr4_syscallnames.c +++ b/sys/emulation/svr4/svr4_syscallnames.c @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_syscallnames.c,v 1.6 2003/07/30 00:19:15 dillon Exp $ - * created from DragonFly: src/sys/svr4/syscalls.master,v 1.2 2003/06/17 04:28:58 dillon Exp + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_syscallnames.c,v 1.7 2003/08/07 21:17:19 dillon Exp $ + * created from DragonFly: src/sys/emulation/svr4/syscalls.master,v 1.2 2003/06/17 04:28:58 dillon Exp */ char *svr4_syscallnames[] = { diff --git a/sys/emulation/svr4/svr4_sysent.c b/sys/emulation/svr4/svr4_sysent.c index c7ed1cd214..a82127aa3c 100644 --- a/sys/emulation/svr4/svr4_sysent.c +++ b/sys/emulation/svr4/svr4_sysent.c @@ -2,18 +2,18 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_sysent.c,v 1.6 2003/07/30 00:19:15 dillon Exp $ - * created from DragonFly: src/sys/svr4/syscalls.master,v 1.2 2003/06/17 04:28:58 dillon Exp + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_sysent.c,v 1.7 2003/08/07 21:17:19 dillon Exp $ + * created from DragonFly: src/sys/emulation/svr4/syscalls.master,v 1.2 2003/06/17 04:28:58 dillon Exp */ #include #include #include #include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_signal.h" +#include "svr4_proto.h" #define AS(name) ((sizeof(struct name) - sizeof(union sysmsg)) / sizeof(register_t)) diff --git a/sys/emulation/svr4/svr4_sysvec.c b/sys/emulation/svr4/svr4_sysvec.c index 3207111721..35e71ccea6 100644 --- a/sys/emulation/svr4/svr4_sysvec.c +++ b/sys/emulation/svr4/svr4_sysvec.c @@ -28,7 +28,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_sysvec.c,v 1.10.2.2 2002/07/09 14:12:43 robert Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_sysvec.c,v 1.5 2003/06/26 05:55:19 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_sysvec.c,v 1.6 2003/08/07 21:17:19 dillon Exp $ */ /* XXX we use functions that might not exist. */ @@ -57,16 +57,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_syscall.h" +#include "svr4_signal.h" +#include "svr4_sockio.h" +#include "svr4_socket.h" +#include "svr4_errno.h" +#include "svr4_proto.h" +#include "svr4_siginfo.h" +#include "svr4_util.h" int bsd_to_svr4_errno[ELAST+1] = { 0, diff --git a/sys/emulation/svr4/svr4_termios.c b/sys/emulation/svr4/svr4_termios.c index a7656de26b..4fdea47365 100644 --- a/sys/emulation/svr4/svr4_termios.c +++ b/sys/emulation/svr4/svr4_termios.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_termios.c,v 1.5 1999/12/08 12:00:48 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_termios.c,v 1.3 2003/06/25 03:56:10 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_termios.c,v 1.4 2003/08/07 21:17:19 dillon Exp $ */ #include @@ -39,10 +39,10 @@ #include #include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_util.h" +#include "svr4_ioctl.h" +#include "svr4_termios.h" #ifndef __CONCAT3 # if __STDC__ diff --git a/sys/emulation/svr4/svr4_ttold.c b/sys/emulation/svr4/svr4_ttold.c index 23a9a79156..d9b70a32ca 100644 --- a/sys/emulation/svr4/svr4_ttold.c +++ b/sys/emulation/svr4/svr4_ttold.c @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_ttold.c,v 1.7 1999/12/08 12:00:49 newton Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_ttold.c,v 1.3 2003/06/25 03:56:10 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_ttold.c,v 1.4 2003/08/07 21:17:19 dillon Exp $ */ #include @@ -38,10 +38,10 @@ #include #include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_util.h" +#include "svr4_ttold.h" +#include "svr4_ioctl.h" static void svr4_tchars_to_bsd_tchars __P((const struct svr4_tchars *st, diff --git a/sys/emulation/svr4/svr4_union.h b/sys/emulation/svr4/svr4_union.h index 5da9f53a7b..15f2c2ae51 100644 --- a/sys/emulation/svr4/svr4_union.h +++ b/sys/emulation/svr4/svr4_union.h @@ -2,8 +2,8 @@ * Union of syscall args for messaging. * * DO NOT EDIT-- this file is automatically generated. - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_union.h,v 1.2 2003/07/30 00:19:15 dillon Exp $ - * created from DragonFly: src/sys/svr4/syscalls.master,v 1.2 2003/06/17 04:28:58 dillon Exp + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_union.h,v 1.3 2003/08/07 21:17:19 dillon Exp $ + * created from DragonFly: src/sys/emulation/svr4/syscalls.master,v 1.2 2003/06/17 04:28:58 dillon Exp */ union sysunion { diff --git a/sys/emulation/svr4/svr4_ustat.h b/sys/emulation/svr4/svr4_ustat.h index 35a6356a66..d2bc8b690a 100644 --- a/sys/emulation/svr4/svr4_ustat.h +++ b/sys/emulation/svr4/svr4_ustat.h @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_ustat.h,v 1.3 1999/08/28 00:51:28 peter Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_ustat.h,v 1.2 2003/06/17 04:28:58 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_ustat.h,v 1.3 2003/08/07 21:17:19 dillon Exp $ */ #ifndef _SVR4_USTAT_H_ #define _SVR4_USTAT_H_ -#include +#include "svr4_types.h" struct svr4_ustat { svr4_daddr_t f_tfree; diff --git a/sys/emulation/svr4/svr4_utsname.h b/sys/emulation/svr4/svr4_utsname.h index a62b60df3b..13ed319d4f 100644 --- a/sys/emulation/svr4/svr4_utsname.h +++ b/sys/emulation/svr4/svr4_utsname.h @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/svr4/svr4_utsname.h,v 1.3 1999/08/28 00:51:28 peter Exp $ - * $DragonFly: src/sys/emulation/svr4/Attic/svr4_utsname.h,v 1.2 2003/06/17 04:28:58 dillon Exp $ + * $DragonFly: src/sys/emulation/svr4/Attic/svr4_utsname.h,v 1.3 2003/08/07 21:17:19 dillon Exp $ */ #ifndef _SVR4_UTSNAME_H_ #define _SVR4_UTSNAME_H_ -#include +#include "svr4_types.h" struct svr4_utsname { char sysname[257]; diff --git a/sys/emulation/svr4/syscalls.master b/sys/emulation/svr4/syscalls.master index 630e66f64c..1aeba3c5ae 100644 --- a/sys/emulation/svr4/syscalls.master +++ b/sys/emulation/svr4/syscalls.master @@ -1,4 +1,4 @@ - $DragonFly: src/sys/emulation/svr4/Attic/syscalls.master,v 1.2 2003/06/17 04:28:58 dillon Exp $ + $DragonFly: src/sys/emulation/svr4/Attic/syscalls.master,v 1.3 2003/08/07 21:17:19 dillon Exp $ ; from: @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; $FreeBSD: src/sys/svr4/syscalls.master,v 1.6.2.2 2001/10/05 07:34:37 peter Exp $ ; @@ -30,10 +30,10 @@ #include #include -#include -#include -#include -#include +#include "svr4.h" +#include "svr4_types.h" +#include "svr4_signal.h" +#include "svr4_proto.h" 0 UNIMPL SVR4 unused 1 NOPROTO POSIX { void sys_exit(int rval); } exit sys_exit_args void diff --git a/sys/i386/apic/mpapic.h b/sys/i386/apic/mpapic.h index 1a8d508e8a..47b73be909 100644 --- a/sys/i386/apic/mpapic.h +++ b/sys/i386/apic/mpapic.h @@ -23,13 +23,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/mpapic.h,v 1.14.2.2 2000/09/30 02:49:34 ps Exp $ - * $DragonFly: src/sys/i386/apic/Attic/mpapic.h,v 1.3 2003/07/04 00:32:26 dillon Exp $ + * $DragonFly: src/sys/i386/apic/Attic/mpapic.h,v 1.4 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_MPAPIC_H_ #define _MACHINE_MPAPIC_H_ -#include +#include "apic.h" #include diff --git a/sys/i386/bios/mca_machdep.c b/sys/i386/bios/mca_machdep.c index 6cecfa58d6..699e1eab38 100644 --- a/sys/i386/bios/mca_machdep.c +++ b/sys/i386/bios/mca_machdep.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/bios/mca_machdep.c,v 1.4 2000/01/29 16:17:34 peter Exp $ - * $DragonFly: src/sys/i386/bios/Attic/mca_machdep.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/bios/Attic/mca_machdep.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ */ #include @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include "mca_machdep.h" /* Global MCA bus flag */ int MCA_system = 0; diff --git a/sys/i386/boot/biosboot/boot.h b/sys/i386/boot/biosboot/boot.h index a5f8d0b748..4e3f75d903 100644 --- a/sys/i386/boot/biosboot/boot.h +++ b/sys/i386/boot/biosboot/boot.h @@ -25,15 +25,15 @@ * * from: Mach, Revision 2.2 92/04/04 11:35:03 rpd * $FreeBSD: src/sys/i386/boot/biosboot/boot.h,v 1.25 1999/08/28 00:43:12 peter Exp $ - * $DragonFly: src/sys/i386/boot/biosboot/Attic/boot.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/boot/biosboot/Attic/boot.h,v 1.3 2003/08/07 21:17:20 dillon Exp $ */ #include #include -#include -#include -#include +#include +#include +#include #define RB_DUAL 0x40000 /* XXX */ #define RB_PROBEKBD 0x80000 /* XXX */ diff --git a/sys/i386/boot/biosboot/serial.S b/sys/i386/boot/biosboot/serial.S index 8545271f59..cb7f8bc762 100644 --- a/sys/i386/boot/biosboot/serial.S +++ b/sys/i386/boot/biosboot/serial.S @@ -25,7 +25,7 @@ * * from: Mach, Revision 2.2 92/04/04 11:34:26 rpd * $FreeBSD: src/sys/i386/boot/biosboot/serial.S,v 1.13 1999/08/28 00:43:14 peter Exp $ - * $DragonFly: src/sys/i386/boot/biosboot/Attic/serial.S,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/boot/biosboot/Attic/serial.S,v 1.3 2003/08/07 21:17:20 dillon Exp $ */ /* @@ -68,7 +68,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .file "serial.S" -#include +#include #include "asm.h" .text diff --git a/sys/i386/boot/kzipboot/misc.c b/sys/i386/boot/kzipboot/misc.c index a971aeec8b..542c44f165 100644 --- a/sys/i386/boot/kzipboot/misc.c +++ b/sys/i386/boot/kzipboot/misc.c @@ -5,9 +5,11 @@ * adapted for Linux. * * Ported to 386bsd by Serge Vakulenko + * + * $DragonFly: src/sys/i386/boot/kzipboot/Attic/misc.c,v 1.2 2003/08/07 21:17:20 dillon Exp $ */ -#include "gzip.h" +#include "use_gzip.h" unsigned outcnt; unsigned insize; diff --git a/sys/i386/boot/kzipboot/unzip.c b/sys/i386/boot/kzipboot/unzip.c index 93a2c8b842..b044a46151 100644 --- a/sys/i386/boot/kzipboot/unzip.c +++ b/sys/i386/boot/kzipboot/unzip.c @@ -10,6 +10,8 @@ * * The code in this file is derived from the file funzip.c written * and put in the public domain by Mark Adler. + * + * $DragonFly: src/sys/i386/boot/kzipboot/Attic/unzip.c,v 1.2 2003/08/07 21:17:20 dillon Exp $ */ /* @@ -18,7 +20,7 @@ * either deflated or stored. */ -#include "gzip.h" +#include "use_gzip.h" #include #include diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 33dfed9000..904deca8f4 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -3,7 +3,7 @@ # as much of the source tree as it can. # # $FreeBSD: src/sys/i386/conf/LINT,v 1.749.2.144 2003/06/04 17:56:59 sam Exp $ -# $DragonFly: src/sys/i386/conf/Attic/LINT,v 1.3 2003/08/01 10:58:59 rob Exp $ +# $DragonFly: src/sys/i386/conf/Attic/LINT,v 1.4 2003/08/07 21:17:20 dillon Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -1752,8 +1752,6 @@ device asc0 at isa? port IO_ASC1 drq 3 irq 10 device spic0 at isa? irq 0 port 0x10a0 device stl0 at isa? port 0x2a0 irq 10 device stli0 at isa? port 0x2a0 iomem 0xcc000 flags 23 iosiz 0x1000 -# You are unlikely to have the hardware for loran0 -device loran0 at isa? irq 5 # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu # nullmodem terminal driver diff --git a/sys/i386/gnu/fpemul/div_small.s b/sys/i386/gnu/fpemul/div_small.s index c2faec2ca9..a1eff2bbaf 100644 --- a/sys/i386/gnu/fpemul/div_small.s +++ b/sys/i386/gnu/fpemul/div_small.s @@ -58,7 +58,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/div_small.s,v 1.8 1999/08/28 00:42:48 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/div_small.s,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/div_small.s,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -66,7 +66,7 @@ | unsigned long div_small(unsigned long long *x, unsigned long y) | +---------------------------------------------------------------------------*/ -#include +#include "fpu_asm.h" .text ENTRY(div_small) diff --git a/sys/i386/gnu/fpemul/errors.c b/sys/i386/gnu/fpemul/errors.c index 6582d03635..1c23787d9d 100644 --- a/sys/i386/gnu/fpemul/errors.c +++ b/sys/i386/gnu/fpemul/errors.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/errors.c,v 1.10 1999/08/28 00:42:49 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/errors.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/errors.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -77,13 +77,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "status_w.h" +#include "control_w.h" +#include "reg_constant.h" +#include "version.h" /* */ #undef PRINT_MESSAGES diff --git a/sys/i386/gnu/fpemul/exception.h b/sys/i386/gnu/fpemul/exception.h index 83f22f104f..dde835cd97 100644 --- a/sys/i386/gnu/fpemul/exception.h +++ b/sys/i386/gnu/fpemul/exception.h @@ -55,7 +55,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/exception.h,v 1.9 1999/08/28 00:42:49 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/exception.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/exception.h,v 1.3 2003/08/07 21:17:20 dillon Exp $ * * */ @@ -71,7 +71,7 @@ #endif #ifndef SW_C1 -#include +#include "fpu_emu.h" #endif /* SW_C1 */ #define FPU_BUSY Const_(0x8000) /* FPU busy bit (8087 compatibility) */ diff --git a/sys/i386/gnu/fpemul/fpu_arith.c b/sys/i386/gnu/fpemul/fpu_arith.c index 6e9f38994a..1c6178eb85 100644 --- a/sys/i386/gnu/fpemul/fpu_arith.c +++ b/sys/i386/gnu/fpemul/fpu_arith.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_arith.c,v 1.9 1999/08/28 00:42:49 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_arith.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_arith.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -68,8 +68,8 @@ #include #include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" void diff --git a/sys/i386/gnu/fpemul/fpu_asm.h b/sys/i386/gnu/fpemul/fpu_asm.h index 18fa24f66f..608d73340b 100644 --- a/sys/i386/gnu/fpemul/fpu_asm.h +++ b/sys/i386/gnu/fpemul/fpu_asm.h @@ -55,7 +55,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_asm.h,v 1.8 1999/08/28 00:42:50 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_asm.h,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_asm.h,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ @@ -63,7 +63,7 @@ #define _FPU_ASM_H_ #include -#include +#include "fpu_emu.h" #define EXCEPTION exception diff --git a/sys/i386/gnu/fpemul/fpu_aux.c b/sys/i386/gnu/fpemul/fpu_aux.c index 8c9c67304b..65fcc4e69f 100644 --- a/sys/i386/gnu/fpemul/fpu_aux.c +++ b/sys/i386/gnu/fpemul/fpu_aux.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_aux.c,v 1.11 1999/10/12 02:23:14 msmith Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_aux.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_aux.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -70,10 +70,10 @@ #include #include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "status_w.h" static void diff --git a/sys/i386/gnu/fpemul/fpu_emu.h b/sys/i386/gnu/fpemul/fpu_emu.h index 976bee07bd..8c92f81b17 100644 --- a/sys/i386/gnu/fpemul/fpu_emu.h +++ b/sys/i386/gnu/fpemul/fpu_emu.h @@ -55,7 +55,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_emu.h,v 1.7 1999/08/28 00:42:50 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_emu.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_emu.h,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -81,7 +81,7 @@ #define PECULIAR_486 #ifdef LOCORE -#include +#include "fpu_asm.h" #define Const(x) $/**/x #else #define Const(x) x @@ -110,7 +110,7 @@ #ifndef LOCORE #include -#include +#include "math_emu.h" #ifdef PARANOID extern char emulating; @@ -181,7 +181,7 @@ polynomial(unsigned accum[], unsigned x[], unsigned int control_w); #ifndef MAKING_PROTO -#include +#include "fpu_proto.h" #endif #endif /* LOCORE */ diff --git a/sys/i386/gnu/fpemul/fpu_entry.c b/sys/i386/gnu/fpemul/fpu_entry.c index 0d47c2908e..e54e54c15b 100644 --- a/sys/i386/gnu/fpemul/fpu_entry.c +++ b/sys/i386/gnu/fpemul/fpu_entry.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_entry.c,v 1.23 1999/10/12 02:23:14 msmith Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_entry.c,v 1.3 2003/06/26 20:27:51 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_entry.c,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ @@ -80,10 +80,10 @@ #include #include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "status_w.h" #define __BAD__ Un_impl /* Not implemented */ diff --git a/sys/i386/gnu/fpemul/fpu_etc.c b/sys/i386/gnu/fpemul/fpu_etc.c index 2a728eaf20..739ba2e457 100644 --- a/sys/i386/gnu/fpemul/fpu_etc.c +++ b/sys/i386/gnu/fpemul/fpu_etc.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_etc.c,v 1.8 1999/08/28 00:42:51 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_etc.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_etc.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -68,10 +68,10 @@ #include #include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "status_w.h" static void diff --git a/sys/i386/gnu/fpemul/fpu_trig.c b/sys/i386/gnu/fpemul/fpu_trig.c index 99a9df6467..4e354941f9 100644 --- a/sys/i386/gnu/fpemul/fpu_trig.c +++ b/sys/i386/gnu/fpemul/fpu_trig.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_trig.c,v 1.10 1999/08/28 00:42:52 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_trig.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/fpu_trig.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -69,12 +69,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "status_w.h" +#include "reg_constant.h" +#include "control_w.h" static void convert_l2reg(long *arg, FPU_REG * dest); diff --git a/sys/i386/gnu/fpemul/get_address.c b/sys/i386/gnu/fpemul/get_address.c index a9c37cc6af..465dc448a0 100644 --- a/sys/i386/gnu/fpemul/get_address.c +++ b/sys/i386/gnu/fpemul/get_address.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/get_address.c,v 1.10 1999/10/12 02:23:14 msmith Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/get_address.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/get_address.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -75,9 +75,9 @@ #include #include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" static int reg_offset[] = { tEAX, tECX, tEDX, tEBX, tESP, tEBP, tESI, tEDI}; diff --git a/sys/i386/gnu/fpemul/load_store.c b/sys/i386/gnu/fpemul/load_store.c index efb0706188..e2d089513f 100644 --- a/sys/i386/gnu/fpemul/load_store.c +++ b/sys/i386/gnu/fpemul/load_store.c @@ -58,7 +58,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/load_store.c,v 1.13 1999/08/28 00:42:52 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/load_store.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/load_store.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -74,9 +74,9 @@ #include #include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "status_w.h" #define _NONE_ 0 /* FPU_st0_ptr etc not needed */ diff --git a/sys/i386/gnu/fpemul/poly_2xm1.c b/sys/i386/gnu/fpemul/poly_2xm1.c index 4470152fa4..ebffe238fb 100644 --- a/sys/i386/gnu/fpemul/poly_2xm1.c +++ b/sys/i386/gnu/fpemul/poly_2xm1.c @@ -57,11 +57,11 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_2xm1.c,v 1.8 1999/08/28 00:42:53 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_2xm1.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_2xm1.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include +#include "reg_constant.h" diff --git a/sys/i386/gnu/fpemul/poly_atan.c b/sys/i386/gnu/fpemul/poly_atan.c index 15d2bff8b2..07ec25945a 100644 --- a/sys/i386/gnu/fpemul/poly_atan.c +++ b/sys/i386/gnu/fpemul/poly_atan.c @@ -57,12 +57,12 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_atan.c,v 1.10 1999/08/28 00:42:53 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_atan.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_atan.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include -#include +#include "reg_constant.h" +#include "control_w.h" #define HIPOWERon 6 /* odd poly, negative terms */ diff --git a/sys/i386/gnu/fpemul/poly_div.s b/sys/i386/gnu/fpemul/poly_div.s index bc9612ee18..7d8f69f477 100644 --- a/sys/i386/gnu/fpemul/poly_div.s +++ b/sys/i386/gnu/fpemul/poly_div.s @@ -58,11 +58,11 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_div.s,v 1.8 1999/08/28 00:42:53 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_div.s,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_div.s,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include +#include "fpu_asm.h" .text diff --git a/sys/i386/gnu/fpemul/poly_l2.c b/sys/i386/gnu/fpemul/poly_l2.c index caa814f1c7..25ee2d51a1 100644 --- a/sys/i386/gnu/fpemul/poly_l2.c +++ b/sys/i386/gnu/fpemul/poly_l2.c @@ -57,13 +57,13 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_l2.c,v 1.10 1999/08/28 00:42:53 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_l2.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_l2.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include -#include +#include "reg_constant.h" +#include "control_w.h" diff --git a/sys/i386/gnu/fpemul/poly_mul64.s b/sys/i386/gnu/fpemul/poly_mul64.s index cb9bf70416..9b2d676012 100644 --- a/sys/i386/gnu/fpemul/poly_mul64.s +++ b/sys/i386/gnu/fpemul/poly_mul64.s @@ -60,12 +60,12 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_mul64.s,v 1.8 1999/08/28 00:42:54 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_mul64.s,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_mul64.s,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include +#include "fpu_asm.h" .text ENTRY(mul64) diff --git a/sys/i386/gnu/fpemul/poly_sin.c b/sys/i386/gnu/fpemul/poly_sin.c index 4794b7ae94..b0310dbc7a 100644 --- a/sys/i386/gnu/fpemul/poly_sin.c +++ b/sys/i386/gnu/fpemul/poly_sin.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_sin.c,v 1.10 1999/08/28 00:42:54 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_sin.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_sin.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -66,9 +66,9 @@ #include /* for printf() in EXCEPTION() */ #endif -#include -#include -#include +#include "exception.h" +#include "reg_constant.h" +#include "control_w.h" #define HIPOWER 5 diff --git a/sys/i386/gnu/fpemul/poly_tan.c b/sys/i386/gnu/fpemul/poly_tan.c index 70e42ca996..7f8fca060a 100644 --- a/sys/i386/gnu/fpemul/poly_tan.c +++ b/sys/i386/gnu/fpemul/poly_tan.c @@ -57,12 +57,12 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_tan.c,v 1.10 1999/08/28 00:42:54 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_tan.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/poly_tan.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include -#include +#include "reg_constant.h" +#include "control_w.h" #define HIPOWERop 3 /* odd poly, positive terms */ diff --git a/sys/i386/gnu/fpemul/polynomial.s b/sys/i386/gnu/fpemul/polynomial.s index 5fb916a692..51b226cbba 100644 --- a/sys/i386/gnu/fpemul/polynomial.s +++ b/sys/i386/gnu/fpemul/polynomial.s @@ -65,13 +65,13 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/polynomial.s,v 1.8 1999/08/28 00:42:55 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/polynomial.s,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/polynomial.s,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ .file "fpolynom.s" -#include +#include "fpu_asm.h" /* #define EXTRA_PRECISE*/ diff --git a/sys/i386/gnu/fpemul/reg_add_sub.c b/sys/i386/gnu/fpemul/reg_add_sub.c index 5edc9f5279..1538fb0f34 100644 --- a/sys/i386/gnu/fpemul/reg_add_sub.c +++ b/sys/i386/gnu/fpemul/reg_add_sub.c @@ -56,7 +56,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_add_sub.c,v 1.8 1999/08/28 00:42:55 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_add_sub.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_add_sub.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -65,8 +65,8 @@ | the source FPU_REGs. | +---------------------------------------------------------------------------*/ -#include -#include +#include "reg_constant.h" +#include "control_w.h" void diff --git a/sys/i386/gnu/fpemul/reg_compare.c b/sys/i386/gnu/fpemul/reg_compare.c index 0c3685192e..c79814f169 100644 --- a/sys/i386/gnu/fpemul/reg_compare.c +++ b/sys/i386/gnu/fpemul/reg_compare.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_compare.c,v 1.11 1999/08/28 00:42:55 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_compare.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_compare.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -69,11 +69,11 @@ #include #include -#include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "control_w.h" +#include "status_w.h" int diff --git a/sys/i386/gnu/fpemul/reg_constant.c b/sys/i386/gnu/fpemul/reg_constant.c index 5d38487c98..e88cac5b5b 100644 --- a/sys/i386/gnu/fpemul/reg_constant.c +++ b/sys/i386/gnu/fpemul/reg_constant.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_constant.c,v 1.6.8.1 2000/08/03 00:53:55 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_constant.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_constant.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ */ @@ -65,9 +65,9 @@ #include #include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "status_w.h" FPU_REG CONST_1 = {SIGN_POS, TW_Valid, EXP_BIAS, diff --git a/sys/i386/gnu/fpemul/reg_constant.h b/sys/i386/gnu/fpemul/reg_constant.h index c2cd37fc2f..1482196612 100644 --- a/sys/i386/gnu/fpemul/reg_constant.h +++ b/sys/i386/gnu/fpemul/reg_constant.h @@ -55,14 +55,14 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_constant.h,v 1.7 1999/08/28 00:42:55 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_constant.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_constant.h,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ #ifndef _REG_CONSTANT_H_ #define _REG_CONSTANT_H_ -#include +#include "fpu_emu.h" extern FPU_REG CONST_1; extern FPU_REG CONST_2; diff --git a/sys/i386/gnu/fpemul/reg_div.s b/sys/i386/gnu/fpemul/reg_div.s index c951a2bda4..7f74105d94 100644 --- a/sys/i386/gnu/fpemul/reg_div.s +++ b/sys/i386/gnu/fpemul/reg_div.s @@ -61,11 +61,11 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_div.s,v 1.9.2.1 2000/07/07 00:38:42 obrien Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_div.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_div.s,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ -#include +#include "fpu_asm.h" .text ENTRY(reg_div) diff --git a/sys/i386/gnu/fpemul/reg_ld_str.c b/sys/i386/gnu/fpemul/reg_ld_str.c index f33833edd8..df50d6b1c9 100644 --- a/sys/i386/gnu/fpemul/reg_ld_str.c +++ b/sys/i386/gnu/fpemul/reg_ld_str.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_ld_str.c,v 1.13 1999/08/28 00:42:56 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_ld_str.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_ld_str.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -73,12 +73,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "reg_constant.h" +#include "control_w.h" +#include "status_w.h" #define EXTENDED_Emax 0x3fff /* largest valid exponent */ diff --git a/sys/i386/gnu/fpemul/reg_mul.c b/sys/i386/gnu/fpemul/reg_mul.c index 5b315ee703..c4d88fe6a2 100644 --- a/sys/i386/gnu/fpemul/reg_mul.c +++ b/sys/i386/gnu/fpemul/reg_mul.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_mul.c,v 1.8 1999/08/28 00:42:56 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_mul.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_mul.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -65,7 +65,7 @@ | The destination may be any FPU_REG, including one of the source FPU_REGs. | +---------------------------------------------------------------------------*/ -#include +#include "reg_constant.h" /* This routine must be called with non-empty source registers */ diff --git a/sys/i386/gnu/fpemul/reg_norm.s b/sys/i386/gnu/fpemul/reg_norm.s index c65c8c933d..6ae87fc41f 100644 --- a/sys/i386/gnu/fpemul/reg_norm.s +++ b/sys/i386/gnu/fpemul/reg_norm.s @@ -62,12 +62,12 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_norm.s,v 1.8 1999/08/28 00:42:57 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_norm.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_norm.s,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ -#include +#include "fpu_asm.h" .text diff --git a/sys/i386/gnu/fpemul/reg_round.s b/sys/i386/gnu/fpemul/reg_round.s index 36c6f37717..47502a2175 100644 --- a/sys/i386/gnu/fpemul/reg_round.s +++ b/sys/i386/gnu/fpemul/reg_round.s @@ -66,7 +66,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_round.s,v 1.9.2.1 2000/07/07 00:38:42 obrien Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_round.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_round.s,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ @@ -119,8 +119,8 @@ +---------------------------------------------------------------------------*/ -#include -#include +#include "exception.h" +#include "control_w.h" #define LOST_DOWN $1 #define LOST_UP $2 diff --git a/sys/i386/gnu/fpemul/reg_u_add.s b/sys/i386/gnu/fpemul/reg_u_add.s index 72105ea2df..cf91d8695e 100644 --- a/sys/i386/gnu/fpemul/reg_u_add.s +++ b/sys/i386/gnu/fpemul/reg_u_add.s @@ -63,7 +63,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_add.s,v 1.9 1999/08/28 00:42:57 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_u_add.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_u_add.s,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ @@ -77,7 +77,7 @@ | Basic checks are performed if PARANOID is defined. */ -#include +#include "fpu_asm.h" .text ENTRY(reg_u_add) diff --git a/sys/i386/gnu/fpemul/reg_u_div.s b/sys/i386/gnu/fpemul/reg_u_div.s index 76401c4b1f..85b60fcedc 100644 --- a/sys/i386/gnu/fpemul/reg_u_div.s +++ b/sys/i386/gnu/fpemul/reg_u_div.s @@ -58,7 +58,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_div.s,v 1.9 1999/08/28 00:42:58 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_u_div.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_u_div.s,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ @@ -71,7 +71,7 @@ | Does not compute the destination exponent, but does adjust it. | +---------------------------------------------------------------------------*/ -#include +#include "fpu_asm.h" /* #define dSIGL(x) (x) */ diff --git a/sys/i386/gnu/fpemul/reg_u_mul.s b/sys/i386/gnu/fpemul/reg_u_mul.s index d6960a6e5d..126ed4c9ff 100644 --- a/sys/i386/gnu/fpemul/reg_u_mul.s +++ b/sys/i386/gnu/fpemul/reg_u_mul.s @@ -58,7 +58,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_mul.s,v 1.9 1999/08/28 00:42:58 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_u_mul.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_u_mul.s,v 1.4 2003/08/07 21:17:21 dillon Exp $ * */ @@ -72,7 +72,7 @@ | Result is rounded to nearest 53 or 64 bits, using "nearest or even". | +---------------------------------------------------------------------------*/ -#include +#include "fpu_asm.h" .data diff --git a/sys/i386/gnu/fpemul/reg_u_sub.s b/sys/i386/gnu/fpemul/reg_u_sub.s index d982ab6fbf..cec12eaca4 100644 --- a/sys/i386/gnu/fpemul/reg_u_sub.s +++ b/sys/i386/gnu/fpemul/reg_u_sub.s @@ -62,7 +62,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_sub.s,v 1.9 1999/08/28 00:42:58 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_u_sub.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/reg_u_sub.s,v 1.4 2003/08/07 21:17:21 dillon Exp $ * */ @@ -77,7 +77,7 @@ | Basic checks are performed if PARANOID is defined. */ -#include +#include "fpu_asm.h" .text ENTRY(reg_u_sub) diff --git a/sys/i386/gnu/fpemul/wm_shrx.s b/sys/i386/gnu/fpemul/wm_shrx.s index c087c3dff7..ffc62b10d1 100644 --- a/sys/i386/gnu/fpemul/wm_shrx.s +++ b/sys/i386/gnu/fpemul/wm_shrx.s @@ -63,12 +63,12 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/wm_shrx.s,v 1.8 1999/08/28 00:42:59 peter Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/wm_shrx.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/wm_shrx.s,v 1.4 2003/08/07 21:17:21 dillon Exp $ * */ -#include +#include "fpu_asm.h" .text diff --git a/sys/i386/gnu/fpemul/wm_sqrt.s b/sys/i386/gnu/fpemul/wm_sqrt.s index 3f0ef227ec..e721cd628a 100644 --- a/sys/i386/gnu/fpemul/wm_sqrt.s +++ b/sys/i386/gnu/fpemul/wm_sqrt.s @@ -61,7 +61,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/wm_sqrt.s,v 1.9.2.1 2000/07/07 00:38:42 obrien Exp $ - * $DragonFly: src/sys/i386/gnu/fpemul/Attic/wm_sqrt.s,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/i386/gnu/fpemul/Attic/wm_sqrt.s,v 1.3 2003/08/07 21:17:21 dillon Exp $ * */ @@ -78,7 +78,7 @@ | The guess is kept in %esi:%edi | +---------------------------------------------------------------------------*/ -#include +#include "fpu_asm.h" .data diff --git a/sys/i386/gnu/isa/dgb.c b/sys/i386/gnu/isa/dgb.c index c8ea7de527..e3139848b8 100644 --- a/sys/i386/gnu/isa/dgb.c +++ b/sys/i386/gnu/isa/dgb.c @@ -1,6 +1,6 @@ /*- * dgb.c $FreeBSD: src/sys/gnu/i386/isa/dgb.c,v 1.56.2.1 2001/02/26 04:23:09 jlemon Exp $ - * dgb.c $DragonFly: src/sys/i386/gnu/isa/Attic/dgb.c,v 1.7 2003/07/23 02:30:18 dillon Exp $ + * dgb.c $DragonFly: src/sys/i386/gnu/isa/Attic/dgb.c,v 1.8 2003/08/07 21:17:21 dillon Exp $ * * Digiboard driver. * @@ -31,7 +31,7 @@ #include "opt_compat.h" #include "opt_dgb.h" -#include "dgb.h" +#include "use_dgb.h" /* Helg: i.e.25 times per sec board will be polled */ #define POLLSPERSEC 25 @@ -59,13 +59,13 @@ #include #include -#include +#include -#include -#include +#include "dgbios.h" +#include "dgfep.h" #define DGB_DEBUG /* Enable debugging info via sysctl */ -#include +#include "dgreg.h" #define CALLOUT_MASK 0x80 #define CONTROL_MASK 0x60 diff --git a/sys/i386/gnu/isa/sound/awe_wave.c b/sys/i386/gnu/isa/sound/awe_wave.c index 1bffbf5a46..6680430536 100644 --- a/sys/i386/gnu/isa/sound/awe_wave.c +++ b/sys/i386/gnu/isa/sound/awe_wave.c @@ -19,12 +19,14 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $DragonFly: src/sys/i386/gnu/isa/sound/Attic/awe_wave.c,v 1.2 2003/08/07 21:17:21 dillon Exp $ */ #include #ifdef __FreeBSD__ -# include +# include "awe_config.h" #else # include "awe_config.h" #endif @@ -34,13 +36,13 @@ #ifdef CONFIG_AWE32_SYNTH #ifdef __FreeBSD__ -# include -# include -# include +# include "awe_hw.h" +# include "awe_version.h" +# include "awe_voice.h" #else # include "awe_hw.h" # include "awe_version.h" -# include +# include "awe_voice.h" #endif #ifdef AWE_HAS_GUS_COMPATIBILITY @@ -449,7 +451,7 @@ static int awe_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg); /* define macros for compatibility */ #ifdef __FreeBSD__ -# include +# include "awe_compat.h" #else # include "awe_compat.h" #endif diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index d71fe57cf9..a7cff64d10 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -35,7 +35,7 @@ * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.146.2.2 2001/06/07 06:05:58 dd Exp $ - * $DragonFly: src/sys/i386/i386/Attic/autoconf.c,v 1.8 2003/07/23 02:30:18 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/autoconf.c,v 1.9 2003/08/07 21:17:22 dillon Exp $ */ /* @@ -54,7 +54,7 @@ #include "opt_bus.h" #include "opt_rootdevname.h" -#include "isa.h" +#include "use_isa.h" #include #include @@ -86,7 +86,7 @@ #include #if NISA > 0 -#include +#include device_t isa_bus_device = 0; #endif @@ -364,10 +364,10 @@ setroot() #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include extern struct nfs_diskless nfs_diskless; diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c index 227625487e..dc30521604 100644 --- a/sys/i386/i386/bios.c +++ b/sys/i386/i386/bios.c @@ -25,17 +25,16 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/bios.c,v 1.29.2.3 2001/07/19 18:07:35 imp Exp $ - * $DragonFly: src/sys/i386/i386/Attic/bios.c,v 1.4 2003/06/28 04:16:02 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/bios.c,v 1.5 2003/08/07 21:17:22 dillon Exp $ */ /* * Code for dealing with the BIOS in x86 PC systems. */ +#include "use_isa.h" #include "opt_pnp.h" -#include "isa.h" - #include #include #include @@ -50,10 +49,10 @@ #include #include #include -#include -#include +#include +#include #if NISA > 0 -#include +#include #endif #define BIOS_START 0xe0000 diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s index 20ebc804f6..a321cfb2e0 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.s @@ -31,10 +31,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/exception.s,v 1.65.2.3 2001/08/15 01:23:49 peter Exp $ - * $DragonFly: src/sys/i386/i386/Attic/exception.s,v 1.17 2003/07/24 23:52:36 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/exception.s,v 1.18 2003/08/07 21:17:22 dillon Exp $ */ -#include "npx.h" +#include "use_npx.h" #include #include diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c index d001f73a48..d2473a71e6 100644 --- a/sys/i386/i386/genassym.c +++ b/sys/i386/i386/genassym.c @@ -35,13 +35,11 @@ * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.86.2.3 2002/03/03 05:42:49 nyan Exp $ - * $DragonFly: src/sys/i386/i386/Attic/genassym.c,v 1.27 2003/07/24 01:41:16 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/genassym.c,v 1.28 2003/08/07 21:17:22 dillon Exp $ */ #include "opt_user_ldt.h" -#include - #include #include #include @@ -63,10 +61,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef SMP #include #endif diff --git a/sys/i386/i386/i386-gdbstub.c b/sys/i386/i386/i386-gdbstub.c index ec7a5775c9..21775ef9aa 100644 --- a/sys/i386/i386/i386-gdbstub.c +++ b/sys/i386/i386/i386-gdbstub.c @@ -92,7 +92,10 @@ * ****************************************************************************/ /* $FreeBSD: src/sys/i386/i386/i386-gdbstub.c,v 1.13.2.1 2000/08/03 00:54:41 peter Exp $ */ -/* $DragonFly: src/sys/i386/i386/Attic/i386-gdbstub.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ */ +/* $DragonFly: src/sys/i386/i386/Attic/i386-gdbstub.c,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ + +#include "use_sio.h" +#include "opt_ddb.h" #include #include @@ -103,9 +106,6 @@ #include -#include "sio.h" -#include "opt_ddb.h" - void gdb_handle_exception (db_regs_t *, int, int); #if NSIO == 0 diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index f99aecbdc9..6f484d194d 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -36,12 +36,13 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $ - * $DragonFly: src/sys/i386/i386/Attic/machdep.c,v 1.31 2003/08/01 10:58:59 rob Exp $ + * $DragonFly: src/sys/i386/i386/Attic/machdep.c,v 1.32 2003/08/07 21:17:22 dillon Exp $ */ -#include "apm.h" -#include "ether.h" -#include "npx.h" +#include "use_apm.h" +#include "use_ether.h" +#include "use_npx.h" +#include "use_isa.h" #include "opt_atalk.h" #include "opt_compat.h" #include "opt_cpu.h" @@ -110,10 +111,10 @@ #include #ifdef OLD_BUS_ARCH -#include +#include #endif #include -#include +#include #include #include #include @@ -1977,7 +1978,6 @@ init386(int first) if (metadata_missing) printf("WARNING: loader(8) metadata is missing!\n"); -#include "isa.h" #if NISA >0 isa_defaultirq(); #endif diff --git a/sys/i386/i386/mp_clock.c b/sys/i386/i386/mp_clock.c index f4f74736d7..1b310d26bb 100644 --- a/sys/i386/i386/mp_clock.c +++ b/sys/i386/i386/mp_clock.c @@ -30,7 +30,7 @@ * directions. If we only cared about monosity two reads would be enough. * * $FreeBSD: src/sys/i386/i386/mp_clock.c,v 1.4.2.2 2000/09/30 02:49:32 ps Exp $ - * $DragonFly: src/sys/i386/i386/Attic/mp_clock.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/mp_clock.c,v 1.3 2003/08/07 21:17:22 dillon Exp $ * */ @@ -44,7 +44,7 @@ #include #include -#include +#include static unsigned piix_get_timecount(struct timecounter *tc); diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c index 6db5aeb0c2..28484d05c7 100644 --- a/sys/i386/i386/nexus.c +++ b/sys/i386/i386/nexus.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/nexus.c,v 1.26.2.10 2003/02/22 13:16:45 imp Exp $ - * $DragonFly: src/sys/i386/i386/Attic/nexus.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/nexus.c,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ /* @@ -41,7 +41,7 @@ * and I/O memory address space. */ -#include "mca.h" +#include "use_mca.h" #include #include @@ -66,7 +66,7 @@ #ifdef PC98 #include #else -#include +#include #endif #include diff --git a/sys/i386/i386/procfs_machdep.c b/sys/i386/i386/procfs_machdep.c index 19fc2949c9..754fe7c77b 100644 --- a/sys/i386/i386/procfs_machdep.c +++ b/sys/i386/i386/procfs_machdep.c @@ -38,7 +38,7 @@ * * From: * $FreeBSD: src/sys/i386/i386/procfs_machdep.c,v 1.14 1999/10/11 14:50:03 peter Exp $ - * $DragonFly: src/sys/i386/i386/Attic/procfs_machdep.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/procfs_machdep.c,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ /* @@ -74,7 +74,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s index 2bb732889e..4940095349 100644 --- a/sys/i386/i386/support.s +++ b/sys/i386/i386/support.s @@ -31,10 +31,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/support.s,v 1.67.2.5 2001/08/15 01:23:50 peter Exp $ - * $DragonFly: src/sys/i386/i386/Attic/support.s,v 1.8 2003/07/20 07:29:20 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/support.s,v 1.9 2003/08/07 21:17:22 dillon Exp $ */ -#include "npx.h" +#include "use_npx.h" #include #include diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s index fcd1c1a239..f345a2cfa2 100644 --- a/sys/i386/i386/swtch.s +++ b/sys/i386/i386/swtch.s @@ -35,10 +35,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.89.2.10 2003/01/23 03:36:24 ps Exp $ - * $DragonFly: src/sys/i386/i386/Attic/swtch.s,v 1.25 2003/07/20 04:20:29 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/swtch.s,v 1.26 2003/08/07 21:17:22 dillon Exp $ */ -#include "npx.h" +#include "use_npx.h" #include "opt_user_ldt.h" #include diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 4375eb0c76..24d7c33edc 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -36,13 +36,16 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * $FreeBSD: src/sys/i386/i386/trap.c,v 1.147.2.11 2003/02/27 19:09:59 luoqi Exp $ - * $DragonFly: src/sys/i386/i386/Attic/trap.c,v 1.30 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/i386/i386/Attic/trap.c,v 1.31 2003/08/07 21:17:22 dillon Exp $ */ /* * 386 Trap and System call handling */ +#include "use_isa.h" +#include "use_npx.h" + #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_ktrace.h" @@ -99,9 +102,6 @@ #include #include -#include "isa.h" -#include "npx.h" - int (*pmath_emulate) __P((struct trapframe *)); extern void trap __P((struct trapframe frame)); diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c index 90e46f6188..2a686b5831 100644 --- a/sys/i386/i386/userconfig.c +++ b/sys/i386/i386/userconfig.c @@ -47,7 +47,7 @@ ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** ** $FreeBSD: src/sys/i386/i386/userconfig.c,v 1.175.2.10 2002/10/05 18:31:48 scottl Exp $ - ** $DragonFly: src/sys/i386/i386/Attic/userconfig.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + ** $DragonFly: src/sys/i386/i386/Attic/userconfig.c,v 1.3 2003/08/07 21:17:22 dillon Exp $ **/ /** @@ -2428,7 +2428,7 @@ visuserconfig(void) * $FreeBSD: src/sys/i386/i386/userconfig.c,v 1.175.2.10 2002/10/05 18:31:48 scottl Exp $ */ -#include "scbus.h" +#include "use_scbus.h" #define PARM_DEVSPEC 0x1 #define PARM_INT 0x2 @@ -2489,11 +2489,11 @@ static int set_pnp_parms(CmdParm *); static int lineno; -#include "eisa.h" +#include "use_eisa.h" #if NEISA > 0 -#include +#include static int set_num_eisa_slots(CmdParm *); diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c index df1e9df5f2..487120e3fd 100644 --- a/sys/i386/i386/vm_machdep.c +++ b/sys/i386/i386/vm_machdep.c @@ -39,10 +39,11 @@ * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $ - * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.22 2003/07/31 11:03:34 hmp Exp $ + * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.23 2003/08/07 21:17:22 dillon Exp $ */ -#include "npx.h" +#include "use_npx.h" +#include "use_isa.h" #include "opt_user_ldt.h" #ifdef PC98 #include "opt_pc98.h" @@ -87,7 +88,7 @@ #ifdef PC98 #include #else -#include +#include #endif static void cpu_reset_real __P((void)); @@ -630,8 +631,6 @@ SYSINIT(vm_setup, SI_SUB_CPU, SI_ORDER_ANY, swi_vm_setup, NULL); * or other unpredictable behaviour. */ -#include "isa.h" - int is_physical_memory(addr) vm_offset_t addr; diff --git a/sys/i386/include/bus.h b/sys/i386/include/bus.h index 81aa4a77e4..c07e01de36 100644 --- a/sys/i386/include/bus.h +++ b/sys/i386/include/bus.h @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/bus.h,v 1.7.2.2 2002/03/03 05:42:50 nyan Exp $ - * $DragonFly: src/sys/i386/include/Attic/bus.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/bus.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _I386_BUS_H_ @@ -37,11 +37,11 @@ #ifdef PC98 /* NEC PC-98 */ -#include +#include "bus_pc98.h" #else /* IBM-PC */ -#include +#include "bus_at386.h" #endif -#include +#include "bus_dma.h" #endif /* _I386_BUS_H_ */ diff --git a/sys/i386/include/bus_at386.h b/sys/i386/include/bus_at386.h index ef673ecb2c..f52f2d9e9a 100644 --- a/sys/i386/include/bus_at386.h +++ b/sys/i386/include/bus_at386.h @@ -68,12 +68,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* $FreeBSD: src/sys/i386/include/bus_at386.h,v 1.8.2.3 2002/03/03 05:42:50 nyan Exp $ */ -/* $DragonFly: src/sys/i386/include/Attic/bus_at386.h,v 1.4 2003/07/26 01:04:08 dillon Exp $ */ +/* $DragonFly: src/sys/i386/include/Attic/bus_at386.h,v 1.5 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _I386_BUS_AT386_H_ #define _I386_BUS_AT386_H_ -#include +#include "cpufunc.h" /* * To remain compatible with NetBSD's interface, default to both memio and diff --git a/sys/i386/include/bus_pc98.h b/sys/i386/include/bus_pc98.h index 650ed938f7..a4d8d1517a 100644 --- a/sys/i386/include/bus_pc98.h +++ b/sys/i386/include/bus_pc98.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/include/bus_pc98.h,v 1.8.2.5 2002/03/03 05:42:50 nyan Exp $ */ -/* $DragonFly: src/sys/i386/include/Attic/bus_pc98.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ */ +/* $DragonFly: src/sys/i386/include/Attic/bus_pc98.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ /* $NecBSD: busio.h,v 3.25.4.2.2.1 2000/06/12 03:53:08 honda Exp $ */ /* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ @@ -49,7 +49,7 @@ #include -#include +#include "cpufunc.h" /* * Bus address and size types diff --git a/sys/i386/include/cpu.h b/sys/i386/include/cpu.h index 1cf874af85..911db5979f 100644 --- a/sys/i386/include/cpu.h +++ b/sys/i386/include/cpu.h @@ -35,7 +35,7 @@ * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/include/cpu.h,v 1.43.2.2 2001/06/15 09:37:57 scottl Exp $ - * $DragonFly: src/sys/i386/include/Attic/cpu.h,v 1.8 2003/07/12 17:54:34 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/cpu.h,v 1.9 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_CPU_H_ @@ -44,9 +44,9 @@ /* * Definitions unique to i386 cpu support. */ -#include -#include -#include +#include "psl.h" +#include "frame.h" +#include "segments.h" /* * definitions of cpu-dependent requirements diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index 7899b21c51..7685af2083 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/cpufunc.h,v 1.96.2.3 2002/04/28 22:50:54 dwmalone Exp $ - * $DragonFly: src/sys/i386/include/Attic/cpufunc.h,v 1.5 2003/07/06 21:23:49 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/cpufunc.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ */ /* @@ -55,7 +55,7 @@ __BEGIN_DECLS #ifdef __GNUC__ #ifdef SMP -#include /* XXX */ +#include "lock.h" /* XXX */ #endif #ifdef SWTCH_OPTIM_STATS diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h index a8c8ec678b..fa623a5afd 100644 --- a/sys/i386/include/db_machdep.h +++ b/sys/i386/include/db_machdep.h @@ -24,16 +24,16 @@ * the rights to redistribute these changes. * * $FreeBSD: src/sys/i386/include/db_machdep.h,v 1.16 1999/10/04 13:55:35 marcel Exp $ - * $DragonFly: src/sys/i386/include/Attic/db_machdep.h,v 1.3 2003/07/08 06:27:26 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/db_machdep.h,v 1.4 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_DB_MACHDEP_H_ #define _MACHINE_DB_MACHDEP_H_ -#include -#include -#include -#include +#include "frame.h" +#include "psl.h" +#include "trap.h" +#include "globaldata.h" #define i386_saved_state trapframe diff --git a/sys/i386/include/floatingpoint.h b/sys/i386/include/floatingpoint.h index c66b4e430c..73cbf92295 100644 --- a/sys/i386/include/floatingpoint.h +++ b/sys/i386/include/floatingpoint.h @@ -32,7 +32,7 @@ * * from: @(#) floatingpoint.h 1.0 (Berkeley) 9/23/93 * $FreeBSD: src/sys/i386/include/floatingpoint.h,v 1.10.2.1 2002/06/30 00:55:09 bde Exp $ - * $DragonFly: src/sys/i386/include/Attic/floatingpoint.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/floatingpoint.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _FLOATINGPOINT_H_ @@ -49,7 +49,7 @@ */ #include -#include +#include "ieeefp.h" #ifdef __GNUC__ diff --git a/sys/i386/include/globaldata.h b/sys/i386/include/globaldata.h index ec3f16999b..271475ff2c 100644 --- a/sys/i386/include/globaldata.h +++ b/sys/i386/include/globaldata.h @@ -28,7 +28,7 @@ * should not include this file. * * $FreeBSD: src/sys/i386/include/globaldata.h,v 1.11.2.1 2000/05/16 06:58:10 dillon Exp $ - * $DragonFly: src/sys/i386/include/Attic/globaldata.h,v 1.18 2003/07/12 17:54:34 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/globaldata.h,v 1.19 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_GLOBALDATA_H_ @@ -41,10 +41,10 @@ #include /* struct thread */ #endif #ifndef _MACHINE_SEGMENTS_H_ -#include /* struct segment_descriptor */ +#include "segments.h" /* struct segment_descriptor */ #endif #ifndef _MACHINE_TSS_H_ -#include /* struct i386tss */ +#include "tss.h" /* struct i386tss */ #endif /* diff --git a/sys/i386/include/lock.h b/sys/i386/include/lock.h index 5054d244cb..5056ea3c9f 100644 --- a/sys/i386/include/lock.h +++ b/sys/i386/include/lock.h @@ -22,14 +22,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/lock.h,v 1.11.2.2 2000/09/30 02:49:34 ps Exp $ - * $DragonFly: src/sys/i386/include/Attic/lock.h,v 1.5 2003/07/13 05:45:10 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/lock.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_LOCK_H_ #define _MACHINE_LOCK_H_ #ifndef _MACHINE_PSL_H_ -#include +#include "psl.h" #endif /* diff --git a/sys/i386/include/mpapic.h b/sys/i386/include/mpapic.h index 8d49d9d233..ec5e694288 100644 --- a/sys/i386/include/mpapic.h +++ b/sys/i386/include/mpapic.h @@ -23,13 +23,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/mpapic.h,v 1.14.2.2 2000/09/30 02:49:34 ps Exp $ - * $DragonFly: src/sys/i386/include/Attic/mpapic.h,v 1.3 2003/07/04 00:32:26 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/mpapic.h,v 1.4 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_MPAPIC_H_ #define _MACHINE_MPAPIC_H_ -#include +#include "apic.h" #include diff --git a/sys/i386/include/pcb.h b/sys/i386/include/pcb.h index 93d7a38ee2..e2df507ddf 100644 --- a/sys/i386/include/pcb.h +++ b/sys/i386/include/pcb.h @@ -35,7 +35,7 @@ * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/include/pcb.h,v 1.32.2.1 2001/08/15 01:23:52 peter Exp $ - * $DragonFly: src/sys/i386/include/Attic/pcb.h,v 1.5 2003/06/28 04:16:03 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/pcb.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _I386_PCB_H_ @@ -44,7 +44,7 @@ /* * Intel 386 process control block */ -#include +#include "npx.h" struct pcb { int pcb_cr3; diff --git a/sys/i386/include/pcb_ext.h b/sys/i386/include/pcb_ext.h index 732a44f564..d2d1fb4e8d 100644 --- a/sys/i386/include/pcb_ext.h +++ b/sys/i386/include/pcb_ext.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/pcb_ext.h,v 1.4 1999/12/29 04:33:04 peter Exp $ - * $DragonFly: src/sys/i386/include/Attic/pcb_ext.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/pcb_ext.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _I386_PCB_EXT_H_ @@ -33,9 +33,9 @@ /* * Extension to the 386 process control block */ -#include -#include -#include +#include "tss.h" +#include "vm86.h" +#include "segments.h" struct pcb_ext { struct segment_descriptor ext_tssd; /* tss descriptor */ diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h index 6688b17c27..2a4fccb2b1 100644 --- a/sys/i386/include/signal.h +++ b/sys/i386/include/signal.h @@ -32,7 +32,7 @@ * * @(#)signal.h 8.1 (Berkeley) 6/11/93 * $FreeBSD: src/sys/i386/include/signal.h,v 1.12 1999/11/12 13:52:11 marcel Exp $ - * $DragonFly: src/sys/i386/include/Attic/signal.h,v 1.2 2003/06/17 04:28:36 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/signal.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_SIGNAL_H_ @@ -46,7 +46,7 @@ typedef int sig_atomic_t; #if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) -#include /* codes for SIGILL, SIGFPE */ +#include "trap.h" /* codes for SIGILL, SIGFPE */ /* * Information pushed on stack when a signal is delivered. diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h index efd23bc7b0..5e2677e1fa 100644 --- a/sys/i386/include/smp.h +++ b/sys/i386/include/smp.h @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/i386/include/smp.h,v 1.50.2.5 2001/02/13 22:32:45 tegge Exp $ - * $DragonFly: src/sys/i386/include/Attic/smp.h,v 1.5 2003/07/11 01:23:23 dillon Exp $ + * $DragonFly: src/sys/i386/include/Attic/smp.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ * */ @@ -39,7 +39,7 @@ extern int current_postcode; /** XXX currently in mp_machdep.c */ outb(0x80, current_postcode) -#include +#include "apic.h" /* global data in mpboot.s */ extern int bootMP_size; diff --git a/sys/i386/isa/README.stl b/sys/i386/isa/README.stl index 2f068bac5b..f8210b9cb5 100644 --- a/sys/i386/isa/README.stl +++ b/sys/i386/isa/README.stl @@ -1,5 +1,5 @@ $FreeBSD: src/sys/i386/isa/README.stl,v 1.3.6.2 2001/08/30 12:29:57 murray Exp $ -$DragonFly: src/sys/i386/isa/Attic/README.stl,v 1.2 2003/06/17 04:28:36 dillon Exp $ +$DragonFly: src/sys/i386/isa/Attic/README.stl,v 1.3 2003/08/07 21:17:23 dillon Exp $ Stallion Multiport Serial Driver Readme --------------------------------------- @@ -211,7 +211,7 @@ So there is a theoretical maximum of 512 ports. - add the following lines (in 2.1.0 I put them at line 729): /* Stallion Multiport Serial Driver */ -#include "stl.h" +#include "use_stl.h" #if NSTL > 0 d_open_t stlopen; d_close_t stlclose; @@ -257,7 +257,7 @@ d_ttycv_t stldevtotty; - add the following lines (in 2.1.0 I put them at line 729): /* Stallion Intelligent Multiport Serial Driver */ -#include "stl.h" +#include "use_stl.h" #if NSTL > 0 d_open_t stliopen; d_close_t stliclose; diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c index 6650f232cf..56cdaa41c6 100644 --- a/sys/i386/isa/asc.c +++ b/sys/i386/isa/asc.c @@ -35,10 +35,10 @@ */ /* * $FreeBSD: src/sys/i386/isa/asc.c,v 1.42.2.2 2001/03/01 03:22:39 jlemon Exp $ - * $DragonFly: src/sys/i386/isa/Attic/asc.c,v 1.5 2003/07/21 07:57:44 dillon Exp $ + * $DragonFly: src/sys/i386/isa/Attic/asc.c,v 1.6 2003/08/07 21:17:23 dillon Exp $ */ -#include "asc.h" +#include "use_asc.h" #include #include #include @@ -52,9 +52,9 @@ #include -#include -#include -#include +#include +#include +#include "ascreg.h" /*** *** CONSTANTS & DEFINES diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c index 7895f5a33a..cd7b51e1c6 100644 --- a/sys/i386/isa/atapi.c +++ b/sys/i386/isa/atapi.c @@ -14,7 +14,7 @@ * Version 1.9, Mon Oct 9 22:34:47 MSK 1995 * * $FreeBSD: src/sys/i386/isa/atapi.c,v 1.36.2.1 2000/04/03 20:13:06 n_hibma Exp $ - * $DragonFly: src/sys/i386/isa/Attic/atapi.c,v 1.3 2003/07/19 21:14:34 dillon Exp $ + * $DragonFly: src/sys/i386/isa/Attic/atapi.c,v 1.4 2003/08/07 21:17:23 dillon Exp $ */ /* @@ -102,11 +102,10 @@ */ #undef DEBUG -#include "wdc.h" - -#include "wcd.h" -#include "wfd.h" -#include "wst.h" +#include "use_wdc.h" +#include "use_wcd.h" +#include "use_wfd.h" +#include "use_wst.h" /* #include "wmd.h" -- add your driver here */ #if NWDC > 0 diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 1a79c4b7b3..68acd96baa 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -35,7 +35,7 @@ * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/isa/clock.c,v 1.149.2.6 2002/11/02 04:41:50 iwasaki Exp $ - * $DragonFly: src/sys/i386/isa/Attic/clock.c,v 1.4 2003/07/06 21:23:49 dillon Exp $ + * $DragonFly: src/sys/i386/isa/Attic/clock.c,v 1.5 2003/08/07 21:17:23 dillon Exp $ */ /* @@ -49,8 +49,9 @@ * reintroduced and updated by Chris Stenton 8/10/94 */ +#include "use_apm.h" +#include "use_mca.h" #include "opt_clock.h" -#include "apm.h" #include #include @@ -80,15 +81,14 @@ #include #include -#include -#include +#include +#include #include #include -#include "mca.h" #if NMCA > 0 -#include +#include #endif #ifdef APIC_IO diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c index a483812285..435e7bf271 100644 --- a/sys/i386/isa/intr_machdep.c +++ b/sys/i386/isa/intr_machdep.c @@ -35,7 +35,7 @@ * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * $FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.29.2.5 2001/10/14 06:54:27 luigi Exp $ - * $DragonFly: src/sys/i386/isa/Attic/intr_machdep.c,v 1.12 2003/07/23 02:30:19 dillon Exp $ + * $DragonFly: src/sys/i386/isa/Attic/intr_machdep.c,v 1.13 2003/08/07 21:17:23 dillon Exp $ */ /* * This file contains an aggregated module marked: @@ -44,10 +44,10 @@ * See the notice for details. */ +#include "use_isa.h" +#include "use_mca.h" #include "opt_auto_eoi.h" -#include "isa.h" - #include #ifndef SMP #include @@ -74,24 +74,23 @@ #include #include #else -#include +#include #endif #include #if NISA > 0 -#include +#include #endif #include -#include +#include #include #ifdef APIC_IO #include #endif #include -#include "mca.h" #if NMCA > 0 -#include +#include #endif /* XXX should be in suitable include files */ diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 0424d895df..a21f7555e6 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -33,7 +33,7 @@ * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/isa/npx.c,v 1.80.2.3 2001/10/20 19:04:38 tegge Exp $ - * $DragonFly: src/sys/i386/isa/Attic/npx.c,v 1.11 2003/08/01 10:58:59 rob Exp $ + * $DragonFly: src/sys/i386/isa/Attic/npx.c,v 1.12 2003/08/07 21:17:23 dillon Exp $ */ #include "opt_cpu.h" @@ -75,7 +75,7 @@ #ifndef SMP #include #include -#include +#include #endif /* diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h index cf8a2193f6..80a4cc9f8c 100644 --- a/sys/i386/isa/sound/local.h +++ b/sys/i386/isa/sound/local.h @@ -6,6 +6,7 @@ * will become more like that of standard bsd code. * lr 970714 * + * $DragonFly: src/sys/i386/isa/sound/Attic/local.h,v 1.2 2003/08/07 21:17:23 dillon Exp $ */ /* build hex2hex /tmp/foo.x trix_boot.h trix_boot */ @@ -16,7 +17,7 @@ */ #define ALLOW_BUFFER_MAPPING 1 -#include "snd.h" +#include "use_snd.h" #if NSND > 0 #include "opt_sound.h" @@ -25,18 +26,18 @@ #define CONFIG_SEQUENCER -#include "gus.h" +#include "use_gus.h" #if NGUS != 0 && !defined(CONFIG_GUS) #define CONFIG_GUS #define CONFIG_GUSMAX #endif -#include "sscape.h" +#include "use_sscape.h" #if NSSCAPE != 0 && !defined(CONFIG_SSCAPE) #define CONFIG_SSCAPE #endif -#include "trix.h" +#include "use_trix.h" #if NTRIX > 0 #define INCLUDE_TRIX_BOOT #define CONFIG_TRIX /* can use NTRIX > 0 instead */ @@ -51,58 +52,58 @@ #define CONFIG_MIDI #endif -#include "sb.h" +#include "use_sb.h" #if NSB > 0 #define CONFIG_SB #endif -#include "mss.h" +#include "use_mss.h" #if NMSS != 0 #define CONFIG_AD1848 #define CONFIG_MSS #undef CONFIG_CS4232 #endif -#include "css.h" +#include "use_css.h" #if NCSS != 0 #define CONFIG_AD1848 #undef CONFIG_MSS #define CONFIG_CS4232 #endif -#include "sbxvi.h" +#include "use_sbxvi.h" #if NSBXVI != 0 && !defined(CONFIG_SB16) #define CONFIG_SB16 #define CONFIG_SBPRO /* FIXME: Also needs to be a sep option */ #endif -#include "sbmidi.h" +#include "use_sbmidi.h" #if NSBMIDI != 0 && !defined(CONFIG_SB16MIDI) #define CONFIG_SB16MIDI #endif -#include "awe.h" +#include "use_awe.h" #if NAWE != 0 && !defined(CONFIG_AWE32) #define CONFIG_AWE32 #endif -#include "pas.h" +#include "use_pas.h" #if NPAS != 0 && !defined(CONFIG_PAS) #define CONFIG_PAS #endif -#include "mpu.h" +#include "use_mpu.h" #if NMPU != 0 && !defined(CONFIG_MPU401) #define CONFIG_MPU401 #endif -#include "opl.h" +#include "use_opl.h" #if NOPL != 0 && !defined(CONFIG_YM3812) #define CONFIG_YM3812 #endif #ifdef PC98 -#include "nss.h" +#include "use_nss.h" #if NNSS != 0 #define CONFIG_NSS #endif diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h index 08f1eabca9..31d5297147 100644 --- a/sys/i386/isa/sound/os.h +++ b/sys/i386/isa/sound/os.h @@ -2,7 +2,7 @@ * os.h -- only included by sound_config.h right after local.h * * $FreeBSD: src/sys/i386/isa/sound/os.h,v 1.40.2.1 2000/08/03 01:01:27 peter Exp $ - * $DragonFly: src/sys/i386/isa/sound/Attic/os.h,v 1.3 2003/07/19 21:14:36 dillon Exp $ + * $DragonFly: src/sys/i386/isa/sound/Attic/os.h,v 1.4 2003/08/07 21:17:23 dillon Exp $ */ #ifndef _OS_H_ @@ -23,7 +23,7 @@ #include -#include +#include #undef DELAY #define DELAY(x) tenmicrosec(x) diff --git a/sys/i386/isa/vector.s b/sys/i386/isa/vector.s index 08c87408d2..2de2e4db00 100644 --- a/sys/i386/isa/vector.s +++ b/sys/i386/isa/vector.s @@ -1,7 +1,7 @@ /* * from: vector.s, 386BSD 0.1 unknown origin * $FreeBSD: src/sys/i386/isa/vector.s,v 1.32 1999/08/28 00:45:04 peter Exp $ - * $DragonFly: src/sys/i386/isa/Attic/vector.s,v 1.4 2003/07/01 20:31:38 dillon Exp $ + * $DragonFly: src/sys/i386/isa/Attic/vector.s,v 1.5 2003/08/07 21:17:23 dillon Exp $ */ /* @@ -14,7 +14,7 @@ #ifdef PC98 #include #else -#include +#include #endif .data diff --git a/sys/kern/Make.tags.inc b/sys/kern/Make.tags.inc index bdfc20e05e..3173bc59e9 100644 --- a/sys/kern/Make.tags.inc +++ b/sys/kern/Make.tags.inc @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/kern/Make.tags.inc,v 1.6.2.2 2003/02/10 12:21:08 des Exp $ -# $DragonFly: src/sys/kern/Make.tags.inc,v 1.3 2003/07/28 05:59:10 hsu Exp $ +# $DragonFly: src/sys/kern/Make.tags.inc,v 1.4 2003/08/07 21:17:23 dillon Exp $ # @(#)Make.tags.inc 8.1 (Berkeley) 6/11/93 SYS?= /sys @@ -52,9 +52,8 @@ COMM= ${SYS}/conf/*.[ch] \ ${SYS}/nfs/*.[ch] \ ${SYS}/pci/*.[ch] \ ${SYS}/posix4/*.[ch] \ - ${SYS}/ufs/ffs/*.[ch] \ - ${SYS}/ufs/mfs/*.[ch] \ - ${SYS}/ufs/ufs/*.[ch] \ + ${SYS}/vfs/mfs/*.[ch] \ + ${SYS}/vfs/ufs/*.[ch] \ ${SYS}/vm/*.[ch] \ ${SYS}/sys/*.[ch] @@ -102,6 +101,5 @@ COMMDIR2= ${SYS}/dev/advansys \ ${SYS}/miscfs/specfs \ ${SYS}/miscfs/umapfs \ ${SYS}/miscfs/union \ - ${SYS}/ufs/ffs \ - ${SYS}/ufs/mfs \ - ${SYS}/ufs/ufs + ${SYS}/vfs/ufs \ + ${SYS}/vfs/mfs diff --git a/sys/kern/Makefile b/sys/kern/Makefile index b7aa34de67..fd045f2ca7 100644 --- a/sys/kern/Makefile +++ b/sys/kern/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.2 (Berkeley) 3/21/94 # $FreeBSD: src/sys/kern/Makefile,v 1.6.2.1 2003/02/10 12:21:08 des Exp $ -# $DragonFly: src/sys/kern/Makefile,v 1.4 2003/07/28 05:59:10 hsu Exp $ +# $DragonFly: src/sys/kern/Makefile,v 1.5 2003/08/07 21:17:23 dillon Exp $ # Makefile for kernel tags files, init_sysent, etc. @@ -37,11 +37,11 @@ MFLAGS=SYS=${SYSDIR} DGEN= conf \ dev \ kern libkern \ - miscfs miscfs/deadfs miscfs/fdesc miscfs/fifofs \ - miscfs/nullfs miscfs/portal miscfs/procfs \ - miscfs/specfs miscfs/umapfs miscfs/union \ - net netinet netns nfs sys \ - ufs ufs/ffs ufs/mfs ufs/ufs \ + vfs vfs/deadfs vfs/fdesc vfs/fifofs \ + vfs/nullfs vfs/portal vfs/procfs \ + vfs/specfs vfs/umapfs vfs/union \ + vfs/ufs vfs/mfs vfs/nfs \ + net netinet netns sys \ vm tags:: diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index 25013f1557..b4daeab3e3 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -35,7 +35,7 @@ * * @(#)ufs_lockf.c 8.3 (Berkeley) 1/6/94 * $FreeBSD: src/sys/kern/kern_lockf.c,v 1.25 1999/11/16 16:28:56 phk Exp $ - * $DragonFly: src/sys/kern/kern_lockf.c,v 1.4 2003/07/26 19:42:11 rob Exp $ + * $DragonFly: src/sys/kern/kern_lockf.c,v 1.5 2003/08/07 21:17:23 dillon Exp $ */ #include "opt_debug_lockf.h" @@ -62,8 +62,8 @@ static int maxlockdepth = MAXDEPTH; #include #include -#include -#include +#include +#include static int lockf_debug = 0; diff --git a/sys/kern/kern_p1003_1b.c b/sys/kern/kern_p1003_1b.c index a028329a91..39b73a8059 100644 --- a/sys/kern/kern_p1003_1b.c +++ b/sys/kern/kern_p1003_1b.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/posix4/p1003_1b.c,v 1.5.2.2 2003/03/25 06:13:35 rwatson Exp $ - * $DragonFly: src/sys/kern/kern_p1003_1b.c,v 1.5 2003/07/30 00:19:15 dillon Exp $ + * $DragonFly: src/sys/kern/kern_p1003_1b.c,v 1.6 2003/08/07 21:17:19 dillon Exp $ */ /* p1003_1b: Real Time common code. @@ -46,7 +46,7 @@ #include #include -#include +#include "posix4.h" MALLOC_DEFINE(M_P31B, "p1003.1b", "Posix 1003.1B"); diff --git a/sys/kern/kern_posix4_mib.c b/sys/kern/kern_posix4_mib.c index e66e85d975..d570411a2c 100644 --- a/sys/kern/kern_posix4_mib.c +++ b/sys/kern/kern_posix4_mib.c @@ -30,14 +30,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/posix4/posix4_mib.c,v 1.3.2.1 2000/08/03 01:09:59 peter Exp $ - * $DragonFly: src/sys/kern/kern_posix4_mib.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/kern/kern_posix4_mib.c,v 1.3 2003/08/07 21:17:19 dillon Exp $ */ #include #include #include #include -#include +#include "posix4.h" static int facility[CTL_P1003_1B_MAXID - 1]; diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c index e55ece5147..6b3e065c22 100644 --- a/sys/kern/kern_sched.c +++ b/sys/kern/kern_sched.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/posix4/ksched.c,v 1.7.2.1 2000/05/16 06:58:13 dillon Exp $ - * $DragonFly: src/sys/kern/kern_sched.c,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/kern/kern_sched.c,v 1.3 2003/08/07 21:17:19 dillon Exp $ */ /* ksched: Soft real time scheduling based on "rtprio". @@ -44,7 +44,7 @@ #include /* For need_resched */ #include /* For need_resched */ -#include +#include "posix4.h" /* ksched: Real-time extension to support POSIX priority scheduling. */ diff --git a/sys/kern/link_aout.c b/sys/kern/link_aout.c index 150e7cc8f6..39bc94d003 100644 --- a/sys/kern/link_aout.c +++ b/sys/kern/link_aout.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/link_aout.c,v 1.26 1999/12/24 15:33:36 bde Exp $ - * $DragonFly: src/sys/kern/link_aout.c,v 1.5 2003/07/18 05:12:39 dillon Exp $ + * $DragonFly: src/sys/kern/link_aout.c,v 1.6 2003/08/07 21:17:23 dillon Exp $ */ #ifndef __alpha__ @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -49,8 +50,12 @@ #include #endif -#include -#include +#include +#include +#include +#define _AOUT_INCLUDE_ +#include +#include static int link_aout_load_module(const char*, linker_file_t*); diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 273544b40a..9ac0638408 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -44,7 +44,7 @@ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ * $FreeBSD: src/sys/kern/subr_diskslice.c,v 1.82.2.6 2001/07/24 09:49:41 dd Exp $ - * $DragonFly: src/sys/kern/subr_diskslice.c,v 1.4 2003/07/22 17:03:33 dillon Exp $ + * $DragonFly: src/sys/kern/subr_diskslice.c,v 1.5 2003/08/07 21:17:23 dillon Exp $ */ #include @@ -60,7 +60,7 @@ #include #include -#include +#include #define TRACE(str) do { if (ds_debug) printf str; } while (0) diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 34ea5d9b98..fdb60c942b 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/sys_process.c,v 1.51.2.6 2003/01/08 03:06:45 kan Exp $ - * $DragonFly: src/sys/kern/sys_process.c,v 1.9 2003/07/30 00:19:14 dillon Exp $ + * $DragonFly: src/sys/kern/sys_process.c,v 1.10 2003/08/07 21:17:23 dillon Exp $ */ #include @@ -47,7 +47,7 @@ #include #include -#include +#include #include /* use the equivalent procfs code */ diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index 9ef33bfb2f..10ba8a0c84 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -32,15 +32,16 @@ * * @(#)tty_pty.c 8.4 (Berkeley) 2/20/95 * $FreeBSD: src/sys/kern/tty_pty.c,v 1.74.2.4 2002/02/20 19:58:13 dillon Exp $ - * $DragonFly: src/sys/kern/tty_pty.c,v 1.8 2003/07/26 19:42:11 rob Exp $ + * $DragonFly: src/sys/kern/tty_pty.c,v 1.9 2003/08/07 21:17:23 dillon Exp $ */ /* * Pseudo-teletype Driver * (Actually two drivers, requiring two entries in 'cdevsw') */ -#include "pty.h" /* XXX */ +#include "use_pty.h" /* XXX */ #include "opt_compat.h" + #include #include #if defined(COMPAT_43) || defined(COMPAT_SUNOS) diff --git a/sys/kern/vfs_conf.c b/sys/kern/vfs_conf.c index 1b771af777..03f5cd416c 100644 --- a/sys/kern/vfs_conf.c +++ b/sys/kern/vfs_conf.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/kern/vfs_conf.c,v 1.49.2.5 2003/01/07 11:56:53 joerg Exp $ - * $DragonFly: src/sys/kern/vfs_conf.c,v 1.5 2003/07/22 17:03:33 dillon Exp $ + * $DragonFly: src/sys/kern/vfs_conf.c,v 1.6 2003/08/07 21:17:23 dillon Exp $ */ /* @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include "opt_ddb.h" #ifdef DDB @@ -259,7 +259,7 @@ vfs_mountroot_ask(void) for(;;) { printf("\nManual root filesystem specification:\n"); printf(" : Mount using filesystem \n"); - printf(" eg. ufs:%sda0s1a\n", _PATH_DEV); + printf(" eg. ufs:%sda0s1a\n", __SYS_PATH_DEV); printf(" ? List valid disk boot devices\n"); printf(" Abort manual input\n"); printf("\nmountroot> "); @@ -331,8 +331,8 @@ getdiskbyname(char *name) { slice = 0; part = 0; - if (strncmp(name, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) - name += sizeof(_PATH_DEV) - 1; + if (strncmp(name, __SYS_PATH_DEV, sizeof(__SYS_PATH_DEV) - 1) == 0) + name += sizeof(__SYS_PATH_DEV) - 1; cp = name; while (*cp != '\0' && (*cp < '0' || *cp > '9') && *cp != '/') cp++; diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 3f2a19307f..6128799928 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -37,7 +37,7 @@ * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 * $FreeBSD: src/sys/kern/vfs_syscalls.c,v 1.151.2.18 2003/04/04 20:35:58 tegge Exp $ - * $DragonFly: src/sys/kern/vfs_syscalls.c,v 1.14 2003/08/03 10:07:41 hmp Exp $ + * $DragonFly: src/sys/kern/vfs_syscalls.c,v 1.15 2003/08/07 21:17:23 dillon Exp $ */ /* For 4.3 integer FS ID compatibility */ @@ -64,7 +64,7 @@ #include #include -#include +#include #include #include #include diff --git a/sys/libkern/quad.h b/sys/libkern/quad.h index 88295905ec..32e0843a01 100644 --- a/sys/libkern/quad.h +++ b/sys/libkern/quad.h @@ -36,7 +36,7 @@ * * @(#)quad.h 8.1 (Berkeley) 6/4/93 * $FreeBSD: src/sys/libkern/quad.h,v 1.9 1999/08/28 00:46:36 peter Exp $ - * $DragonFly: src/sys/libkern/quad.h,v 1.2 2003/06/17 04:28:42 dillon Exp $ + * $DragonFly: src/sys/libkern/quad.h,v 1.3 2003/08/07 21:17:23 dillon Exp $ */ /* @@ -57,7 +57,8 @@ #include #include -#include +#include +#include /* * Depending on the desired operation, we view a `long long' (aka quad_t) in diff --git a/sys/libkern/strcat.c b/sys/libkern/strcat.c index 10e31237a4..31a1308a18 100644 --- a/sys/libkern/strcat.c +++ b/sys/libkern/strcat.c @@ -31,15 +31,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/libkern/strcat.c,v 1.6 1999/08/28 00:46:37 peter Exp $ - * $DragonFly: src/sys/libkern/strcat.c,v 1.3 2003/07/26 20:04:12 rob Exp $ + * $DragonFly: src/sys/libkern/strcat.c,v 1.4 2003/08/07 21:17:23 dillon Exp $ */ -#include +#include char * -strcat(s, append) - char *s; - const char *append; +strcat(char *s, const char *append) { char *save = s; diff --git a/sys/libkern/strcmp.c b/sys/libkern/strcmp.c index 1a82073d53..f8b0bd6461 100644 --- a/sys/libkern/strcmp.c +++ b/sys/libkern/strcmp.c @@ -34,17 +34,16 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/libkern/strcmp.c,v 1.7 1999/08/28 00:46:37 peter Exp $ - * $DragonFly: src/sys/libkern/strcmp.c,v 1.3 2003/07/26 20:04:12 rob Exp $ + * $DragonFly: src/sys/libkern/strcmp.c,v 1.4 2003/08/07 21:17:23 dillon Exp $ */ -#include +#include /* * Compare strings. */ int -strcmp(s1, s2) - const char *s1, *s2; +strcmp(const char *s1, const char *s2) { while (*s1 == *s2++) if (*s1++ == 0) diff --git a/sys/libkern/strcpy.c b/sys/libkern/strcpy.c index b0ae371831..808c9a2590 100644 --- a/sys/libkern/strcpy.c +++ b/sys/libkern/strcpy.c @@ -31,10 +31,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/libkern/strcpy.c,v 1.7 1999/08/28 00:46:37 peter Exp $ - * $DragonFly: src/sys/libkern/strcpy.c,v 1.3 2003/07/26 20:04:12 rob Exp $ + * $DragonFly: src/sys/libkern/strcpy.c,v 1.4 2003/08/07 21:17:23 dillon Exp $ */ -#include +#include char * strcpy(to, from) diff --git a/sys/libkern/strlen.c b/sys/libkern/strlen.c index abeb202b39..4519c41b84 100644 --- a/sys/libkern/strlen.c +++ b/sys/libkern/strlen.c @@ -31,10 +31,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/libkern/strlen.c,v 1.6 1999/08/28 00:46:37 peter Exp $ - * $DragonFly: src/sys/libkern/strlen.c,v 1.3 2003/07/26 20:04:12 rob Exp $ + * $DragonFly: src/sys/libkern/strlen.c,v 1.4 2003/08/07 21:17:23 dillon Exp $ */ -#include +#include size_t strlen(str) diff --git a/sys/libkern/strncmp.c b/sys/libkern/strncmp.c index 7f796749df..bdfa3ceb5b 100644 --- a/sys/libkern/strncmp.c +++ b/sys/libkern/strncmp.c @@ -31,10 +31,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/libkern/strncmp.c,v 1.7 1999/08/28 00:46:38 peter Exp $ - * $DragonFly: src/sys/libkern/strncmp.c,v 1.3 2003/07/26 20:04:12 rob Exp $ + * $DragonFly: src/sys/libkern/strncmp.c,v 1.4 2003/08/07 21:17:23 dillon Exp $ */ -#include +#include int strncmp(s1, s2, n) diff --git a/sys/libkern/strncpy.c b/sys/libkern/strncpy.c index c0adc09bfc..b11d76d69b 100644 --- a/sys/libkern/strncpy.c +++ b/sys/libkern/strncpy.c @@ -34,10 +34,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/libkern/strncpy.c,v 1.6 1999/08/28 00:46:38 peter Exp $ - * $DragonFly: src/sys/libkern/strncpy.c,v 1.3 2003/07/26 20:04:12 rob Exp $ + * $DragonFly: src/sys/libkern/strncpy.c,v 1.4 2003/08/07 21:17:23 dillon Exp $ */ -#include +#include /* * Copy src to dst, truncating or null-padding to always copy n bytes. diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 65d637707d..593d24a327 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -38,10 +38,10 @@ * @(#)bpf.c 8.2 (Berkeley) 3/28/94 * * $FreeBSD: src/sys/net/bpf.c,v 1.59.2.12 2002/04/14 21:41:48 luigi Exp $ - * $DragonFly: src/sys/net/bpf.c,v 1.6 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/bpf.c,v 1.7 2003/08/07 21:17:24 dillon Exp $ */ -#include "bpf.h" +#include "use_bpf.h" #ifndef __GNUC__ #define inline diff --git a/sys/net/bridge/bridge.c b/sys/net/bridge/bridge.c index 6398fc2667..695dc373f6 100644 --- a/sys/net/bridge/bridge.c +++ b/sys/net/bridge/bridge.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/bridge.c,v 1.16.2.25 2003/01/23 21:06:44 sam Exp $ - * $DragonFly: src/sys/net/bridge/Attic/bridge.c,v 1.3 2003/07/29 12:51:29 hmp Exp $ + * $DragonFly: src/sys/net/bridge/Attic/bridge.c,v 1.4 2003/08/07 21:17:24 dillon Exp $ */ /* @@ -111,7 +111,7 @@ #include #include #include -#include +#include "bridge.h" /*--------------------*/ diff --git a/sys/net/dummynet/ip_dummynet.c b/sys/net/dummynet/ip_dummynet.c index c924f06d78..8b043c17c0 100644 --- a/sys/net/dummynet/ip_dummynet.c +++ b/sys/net/dummynet/ip_dummynet.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.24.2.22 2003/05/13 09:31:06 maxim Exp $ - * $DragonFly: src/sys/net/dummynet/ip_dummynet.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ + * $DragonFly: src/sys/net/dummynet/ip_dummynet.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ #if !defined(KLD_MODULE) @@ -79,12 +79,12 @@ #include #include #include -#include -#include +#include +#include "ip_dummynet.h" #include #include /* for struct arpcom */ -#include +#include /* * We keep a private variable for the simulation time, but we could diff --git a/sys/net/faith/if_faith.c b/sys/net/faith/if_faith.c index af87bc60a3..7eeb010a53 100644 --- a/sys/net/faith/if_faith.c +++ b/sys/net/faith/if_faith.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_faith.c,v 1.3.2.6 2002/04/28 05:40:25 suz Exp $ - * $DragonFly: src/sys/net/faith/if_faith.c,v 1.2 2003/06/17 04:28:47 dillon Exp $ + * $DragonFly: src/sys/net/faith/if_faith.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ /* * derived from @@ -45,7 +45,7 @@ * Loopback interface driver for protocol testing and timing. */ #ifndef NFAITH -#include "faith.h" +#include "use_faith.h" #endif #include "opt_inet.h" #include "opt_inet6.h" diff --git a/sys/net/gif/if_gif.c b/sys/net/gif/if_gif.c index 02a2e70326..2696cfb2be 100644 --- a/sys/net/gif/if_gif.c +++ b/sys/net/gif/if_gif.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/if_gif.c,v 1.4.2.15 2002/11/08 16:57:13 ume Exp $ */ -/* $DragonFly: src/sys/net/gif/if_gif.c,v 1.3 2003/07/23 02:30:21 dillon Exp $ */ +/* $DragonFly: src/sys/net/gif/if_gif.c,v 1.4 2003/08/07 21:17:24 dillon Exp $ */ /* $KAME: if_gif.c,v 1.87 2001/10/19 08:50:27 itojun Exp $ */ /* @@ -79,7 +79,7 @@ #endif /* INET6 */ #include -#include +#include "if_gif.h" #include diff --git a/sys/net/gre/if_gre.c b/sys/net/gre/if_gre.c index d7dfef01e5..43bc808647 100644 --- a/sys/net/gre/if_gre.c +++ b/sys/net/gre/if_gre.c @@ -1,6 +1,6 @@ /* $NetBSD: if_gre.c,v 1.42 2002/08/14 00:23:27 itojun Exp $ */ /* $FreeBSD: src/sys/net/if_gre.c,v 1.9.2.3 2003/01/23 21:06:44 sam Exp $ */ -/* $DragonFly: src/sys/net/gre/if_gre.c,v 1.4 2003/06/25 03:56:02 dillon Exp $ */ +/* $DragonFly: src/sys/net/gre/if_gre.c,v 1.5 2003/08/07 21:17:24 dillon Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -84,7 +84,7 @@ #include #include -#include +#include "if_gre.h" /* * It is not easy to calculate the right value for a GRE MTU. diff --git a/sys/net/i4b/capi/capi_l4if.c b/sys/net/i4b/capi/capi_l4if.c index a09385b496..4687616e4f 100644 --- a/sys/net/i4b/capi/capi_l4if.c +++ b/sys/net/i4b/capi/capi_l4if.c @@ -25,10 +25,10 @@ * capi/capi_l4if.c The CAPI i4b L4/device interface. * * $FreeBSD: src/sys/i4b/capi/capi_l4if.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/capi_l4if.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/capi_l4if.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ -#include "i4bcapi.h" +#include "use_i4bcapi.h" #if NI4BCAPI > 0 #include @@ -42,14 +42,13 @@ #include #include -#include -#include -#include +#include "../include/i4b_l3l4.h" +#include "../include/i4b_mbuf.h" +#include "../include/i4b_global.h" +#include "../layer4/i4b_l4.h" -#include - -#include -#include +#include "capi.h" +#include "capi_msgs.h" static void n_connect_request(u_int cdid); static void n_connect_response(u_int cdid, int response, int cause); diff --git a/sys/net/i4b/capi/capi_llif.c b/sys/net/i4b/capi/capi_llif.c index 0d48153aff..d8720db18e 100644 --- a/sys/net/i4b/capi/capi_llif.c +++ b/sys/net/i4b/capi/capi_llif.c @@ -25,10 +25,10 @@ * capi/capi_llif.c The i4b CAPI link layer interface. * * $FreeBSD: src/sys/i4b/capi/capi_llif.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/capi_llif.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/capi_llif.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ -#include "i4bcapi.h" +#include "use_i4bcapi.h" #if NI4BCAPI > 0 #include @@ -42,14 +42,13 @@ #include #include -#include -#include -#include +#include "../include/i4b_l3l4.h" +#include "../include/i4b_mbuf.h" +#include "../include/i4b_global.h" +#include "../layer4/i4b_l4.h" -#include - -#include -#include +#include "capi.h" +#include "capi_msgs.h" /* // capi_ll_control diff --git a/sys/net/i4b/capi/capi_msgs.c b/sys/net/i4b/capi/capi_msgs.c index a7f1256433..5df4e15718 100644 --- a/sys/net/i4b/capi/capi_msgs.c +++ b/sys/net/i4b/capi/capi_msgs.c @@ -25,10 +25,10 @@ * capi/capi_msgs.c The CAPI i4b message handlers. * * $FreeBSD: src/sys/i4b/capi/capi_msgs.c,v 1.1.2.2 2001/12/10 10:28:25 hm Exp $ - * $DragonFly: src/sys/net/i4b/capi/capi_msgs.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/capi_msgs.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ -#include "i4bcapi.h" +#include "use_i4bcapi.h" #if NI4BCAPI > 0 #include @@ -42,14 +42,13 @@ #include #include -#include -#include -#include +#include "../include/i4b_l3l4.h" +#include "../include/i4b_mbuf.h" +#include "../include/i4b_global.h" +#include "../layer4/i4b_l4.h" -#include - -#include -#include +#include "capi.h" +#include "capi_msgs.h" /* // Administrative messages: diff --git a/sys/net/i4b/capi/iavc/iavc_card.c b/sys/net/i4b/capi/iavc/iavc_card.c index ea43b635ec..89f8c96d55 100644 --- a/sys/net/i4b/capi/iavc/iavc_card.c +++ b/sys/net/i4b/capi/iavc/iavc_card.c @@ -26,12 +26,12 @@ * The AVM ISDN controllers' card specific support routines. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_card.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_card.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_card.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ -#include "iavc.h" -#include "i4bcapi.h" -#include "pci.h" +#include "use_iavc.h" +#include "use_i4bcapi.h" +#include "use_pci.h" #if (NIAVC > 0) && (NI4BCAPI > 0) @@ -53,13 +53,12 @@ #include #include -#include -#include -#include - -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_l3l4.h" +#include "../../include/i4b_mbuf.h" +#include "../capi.h" -#include +#include "iavc.h" /* // AVM B1 (active BRI, PIO mode) diff --git a/sys/net/i4b/capi/iavc/iavc_isa.c b/sys/net/i4b/capi/iavc/iavc_isa.c index 5b02921de7..cdeb939a28 100644 --- a/sys/net/i4b/capi/iavc/iavc_isa.c +++ b/sys/net/i4b/capi/iavc/iavc_isa.c @@ -23,11 +23,11 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_isa.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_isa.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_isa.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ -#include "iavc.h" -#include "i4bcapi.h" +#include "use_iavc.h" +#include "use_i4bcapi.h" #if (NIAVC > 0) && (NI4BCAPI > 0) @@ -46,19 +46,18 @@ #include #include #include -#include +#include #include #include #include -#include -#include -#include - -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_l3l4.h" +#include "../../include/i4b_mbuf.h" +#include "../capi.h" -#include +#include "iavc.h" /* ISA driver linkage */ diff --git a/sys/net/i4b/capi/iavc/iavc_lli.c b/sys/net/i4b/capi/iavc/iavc_lli.c index 15c974b4de..f9e36d300b 100644 --- a/sys/net/i4b/capi/iavc/iavc_lli.c +++ b/sys/net/i4b/capi/iavc/iavc_lli.c @@ -26,12 +26,12 @@ * The AVM ISDN controllers' Low Level Interface. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_lli.c,v 1.2.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_lli.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_lli.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ -#include "iavc.h" -#include "i4bcapi.h" -#include "pci.h" +#include "use_iavc.h" +#include "use_i4bcapi.h" +#include "use_pci.h" #if (NIAVC > 0) && (NI4BCAPI > 0) @@ -55,14 +55,13 @@ #include #include -#include -#include -#include - -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_l3l4.h" +#include "../../include/i4b_mbuf.h" +#include "../capi.h" +#include "../capi_msgs.h" -#include +#include "iavc.h" /* Forward declarations of local subroutines... */ diff --git a/sys/net/i4b/capi/iavc/iavc_pci.c b/sys/net/i4b/capi/iavc/iavc_pci.c index f827b0b8f6..c187a85e71 100644 --- a/sys/net/i4b/capi/iavc/iavc_pci.c +++ b/sys/net/i4b/capi/iavc/iavc_pci.c @@ -26,12 +26,12 @@ * The AVM ISDN controllers' PCI bus attachment handling. * * $FreeBSD: src/sys/i4b/capi/iavc/iavc_pci.c,v 1.1.2.1 2001/08/10 14:08:34 obrien Exp $ - * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_pci.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/capi/iavc/iavc_pci.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ -#include "iavc.h" -#include "i4bcapi.h" -#include "pci.h" +#include "use_iavc.h" +#include "use_i4bcapi.h" +#include "use_pci.h" #if (NIAVC > 0) && (NI4BCAPI > 0) && (NPCI > 0) @@ -51,20 +51,19 @@ #include #include -#include -#include +#include +#include #include #include #include -#include -#include -#include - -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_l3l4.h" +#include "../../include/i4b_mbuf.h" +#include "../capi.h" -#include +#include "iavc.h" /* PCI device ids */ diff --git a/sys/net/i4b/driver/i4b_bsdi_ibc.c b/sys/net/i4b/driver/i4b_bsdi_ibc.c index f30ac98f55..51d65464b0 100644 --- a/sys/net/i4b/driver/i4b_bsdi_ibc.c +++ b/sys/net/i4b/driver/i4b_bsdi_ibc.c @@ -33,7 +33,7 @@ * $Id: i4b_bsdi_ibc.c,v 1.3 2000/08/21 07:21:07 hm Exp $ * * $FreeBSD: src/sys/i4b/driver/i4b_bsdi_ibc.c,v 1.3.2.1 2001/08/10 14:08:35 obrien Exp $ - * $DragonFly: src/sys/net/i4b/driver/Attic/i4b_bsdi_ibc.c,v 1.3 2003/07/26 19:20:29 rob Exp $ + * $DragonFly: src/sys/net/i4b/driver/Attic/i4b_bsdi_ibc.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Tue Dec 14 21:55:24 1999] * @@ -65,12 +65,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" +#include "../../include/i4b_l3l4.h" +#include "../../layer4/i4b_l4.h" #define IFP2UNIT(ifp) (ifp)->if_unit diff --git a/sys/net/i4b/driver/i4b_ctl.c b/sys/net/i4b/driver/i4b_ctl.c index e48118fe38..7dd4346c93 100644 --- a/sys/net/i4b/driver/i4b_ctl.c +++ b/sys/net/i4b/driver/i4b_ctl.c @@ -30,13 +30,13 @@ * $Id: i4b_ctl.c,v 1.37 2000/05/31 08:04:43 hm Exp $ * * $FreeBSD: src/sys/i4b/driver/i4b_ctl.c,v 1.10.2.3 2001/08/12 16:22:48 hm Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_ctl.c,v 1.4 2003/07/21 07:57:46 dillon Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_ctl.c,v 1.5 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Sat Aug 11 18:06:38 2001] * *---------------------------------------------------------------------------*/ -#include "i4bctl.h" +#include "use_i4bctl.h" #if NI4BCTL > 1 #error "only 1 (one) i4bctl device allowed!" @@ -71,8 +71,8 @@ #endif /* __FreeBSD__ */ #ifdef __FreeBSD__ -#include -#include +#include +#include #elif defined(__bsdi__) #include #include @@ -83,10 +83,9 @@ #include #endif -#include -#include - -#include +#include "../include/i4b_global.h" +#include "../include/i4b_l3l4.h" +#include "../layer2/i4b_l2.h" static int openflag = 0; diff --git a/sys/net/i4b/driver/i4b_ing.c b/sys/net/i4b/driver/i4b_ing.c index 3b92275e00..db2eb0926c 100644 --- a/sys/net/i4b/driver/i4b_ing.c +++ b/sys/net/i4b/driver/i4b_ing.c @@ -28,13 +28,13 @@ * ------------------------------------------------- * * $FreeBSD: src/sys/i4b/driver/i4b_ing.c,v 1.10.2.4 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_ing.c,v 1.3 2003/07/26 19:20:29 rob Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_ing.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Tue Jan 1 10:43:58 2002] * *---------------------------------------------------------------------------*/ -#include "i4bing.h" +#include "use_i4bing.h" #if NI4BING > 0 @@ -57,14 +57,13 @@ #include #include -#include -#include +#include +#include -#include -#include -#include - -#include +#include "../include/i4b_global.h" +#include "../include/i4b_mbuf.h" +#include "../include/i4b_l3l4.h" +#include "../layer4/i4b_l4.h" #define I4BINGACCT 1 /* enable accounting messages */ #define I4BINGACCTINTVL 2 /* accounting msg interval in secs */ diff --git a/sys/net/i4b/driver/i4b_ipr.c b/sys/net/i4b/driver/i4b_ipr.c index 2de822c968..c2dbc83643 100644 --- a/sys/net/i4b/driver/i4b_ipr.c +++ b/sys/net/i4b/driver/i4b_ipr.c @@ -28,7 +28,7 @@ * --------------------------------------------------------- * * $FreeBSD: src/sys/i4b/driver/i4b_ipr.c,v 1.8.2.3 2001/10/27 15:48:17 hm Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_ipr.c,v 1.5 2003/07/26 19:20:29 rob Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_ipr.c,v 1.6 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Fri Oct 26 19:32:38 2001] * @@ -57,7 +57,7 @@ * *---------------------------------------------------------------------------*/ -#include "i4bipr.h" +#include "use_i4bipr.h" #if NI4BIPR > 0 @@ -116,7 +116,7 @@ #endif /* IPR_VJ */ #if defined(__FreeBSD_version) && __FreeBSD_version >= 400008 -#include "bpf.h" +#include "use_bpf.h" #else #include "bpfilter.h" #endif @@ -127,17 +127,17 @@ #endif #ifdef __FreeBSD__ -#include -#include +#include +#include #else #include #include #endif -#include -#include +#include "../include/i4b_global.h" +#include "../include/i4b_l3l4.h" -#include +#include "../layer4/i4b_l4.h" #ifndef __FreeBSD__ #include /* For softnet */ diff --git a/sys/net/i4b/driver/i4b_isppp.c b/sys/net/i4b/driver/i4b_isppp.c index 7e67d6e986..294f1b6cd3 100644 --- a/sys/net/i4b/driver/i4b_isppp.c +++ b/sys/net/i4b/driver/i4b_isppp.c @@ -37,7 +37,7 @@ * $Id: i4b_isppp.c,v 1.44 2000/08/31 07:07:26 hm Exp $ * * $FreeBSD: src/sys/i4b/driver/i4b_isppp.c,v 1.7.2.3 2003/02/06 14:50:53 gj Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_isppp.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_isppp.c,v 1.3 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Thu Aug 31 09:02:27 2000] * @@ -46,7 +46,7 @@ #ifndef __NetBSD__ #endif -#include "i4bisppp.h" +#include "use_i4bisppp.h" #ifndef __NetBSD__ #if NI4BISPPP == 0 @@ -69,7 +69,7 @@ #if defined(__FreeBSD_version) && __FreeBSD_version >= 400008 -#include "bpf.h" +#include "use_bpf.h" #else #include "bpfilter.h" #endif @@ -79,18 +79,17 @@ #endif #ifdef __FreeBSD__ -#include -#include +#include +#include #else #include #include #include #endif -#include -#include - -#include +#include "../include/i4b_global.h" +#include "../include/i4b_l3l4.h" +#include "../layer4/i4b_l4.h" #ifdef __FreeBSD__ #define ISPPP_FMT "isp%d: " diff --git a/sys/net/i4b/driver/i4b_rbch.c b/sys/net/i4b/driver/i4b_rbch.c index 7a1dbc8cb1..2db4954813 100644 --- a/sys/net/i4b/driver/i4b_rbch.c +++ b/sys/net/i4b/driver/i4b_rbch.c @@ -28,13 +28,13 @@ * --------------------------------------------------- * * $FreeBSD: src/sys/i4b/driver/i4b_rbch.c,v 1.10.2.3 2001/08/12 16:22:48 hm Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_rbch.c,v 1.6 2003/07/26 19:20:29 rob Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_rbch.c,v 1.7 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Sat Aug 11 18:06:57 2001] * *---------------------------------------------------------------------------*/ -#include "i4brbch.h" +#include "use_i4brbch.h" #if NI4BRBCH > 0 @@ -71,20 +71,19 @@ extern cc_t ttydefchars; #endif #ifdef __FreeBSD__ -#include -#include -#include +#include +#include +#include #else #include #include #include #endif -#include -#include -#include - -#include +#include "../include/i4b_global.h" +#include "../include/i4b_mbuf.h" +#include "../include/i4b_l3l4.h" +#include "../layer4/i4b_l4.h" #ifdef __bsdi__ #include diff --git a/sys/net/i4b/driver/i4b_tel.c b/sys/net/i4b/driver/i4b_tel.c index 42accdd8a3..5074a16ac6 100644 --- a/sys/net/i4b/driver/i4b_tel.c +++ b/sys/net/i4b/driver/i4b_tel.c @@ -28,13 +28,13 @@ * -------------------------------------------- * * $FreeBSD: src/sys/i4b/driver/i4b_tel.c,v 1.10.2.4 2001/12/16 15:12:57 hm Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_tel.c,v 1.6 2003/07/26 19:20:29 rob Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_tel.c,v 1.7 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Sat Aug 11 18:07:05 2001] * *---------------------------------------------------------------------------*/ -#include "i4btel.h" +#include "use_i4btel.h" #if NI4BTEL > 0 @@ -58,15 +58,14 @@ #include #endif -#include -#include -#include +#include +#include +#include -#include -#include -#include - -#include +#include "../include/i4b_global.h" +#include "../include/i4b_mbuf.h" +#include "../include/i4b_l3l4.h" +#include "../layer4/i4b_l4.h" /* minor number: lower 6 bits = unit number */ diff --git a/sys/net/i4b/driver/i4b_trace.c b/sys/net/i4b/driver/i4b_trace.c index cc610aa9a1..2575472e8f 100644 --- a/sys/net/i4b/driver/i4b_trace.c +++ b/sys/net/i4b/driver/i4b_trace.c @@ -30,13 +30,13 @@ * last edit-date: [Sat Aug 11 18:07:15 2001] * * $FreeBSD: src/sys/i4b/driver/i4b_trace.c,v 1.9.2.3 2001/08/12 16:22:48 hm Exp $ - * $DragonFly: src/sys/net/i4b/driver/i4b_trace.c,v 1.5 2003/07/21 07:57:46 dillon Exp $ + * $DragonFly: src/sys/net/i4b/driver/i4b_trace.c,v 1.6 2003/08/07 21:17:25 dillon Exp $ * * NOTE: the code assumes that SPLI4B >= splimp ! * *---------------------------------------------------------------------------*/ -#include "i4btrc.h" +#include "use_i4btrc.h" #if NI4BTRC > 0 @@ -63,8 +63,8 @@ #include #endif -#include -#include +#include +#include #else @@ -73,9 +73,9 @@ #endif -#include -#include -#include +#include "../include/i4b_mbuf.h" +#include "../include/i4b_global.h" +#include "../include/i4b_l3l4.h" #ifndef __FreeBSD__ #define memcpy(d,s,l) bcopy(s,d,l) diff --git a/sys/net/i4b/include/i4b_l1l2.h b/sys/net/i4b/include/i4b_l1l2.h index 34160706fe..9b863886e7 100644 --- a/sys/net/i4b/include/i4b_l1l2.h +++ b/sys/net/i4b/include/i4b_l1l2.h @@ -30,7 +30,7 @@ * $Id: i4b_l1l2.h,v 1.11 2000/06/02 16:14:35 hm Exp $ * * $FreeBSD: src/sys/i4b/include/i4b_l1l2.h,v 1.6.2.1 2001/08/10 14:08:36 obrien Exp $ - * $DragonFly: src/sys/net/i4b/include/i4b_l1l2.h,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/include/i4b_l1l2.h,v 1.3 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Fri Jun 2 14:35:03 2000] * @@ -40,7 +40,7 @@ #define _I4B_L1L2_H_ #ifdef __FreeBSD__ -#include +#include #else #include #endif diff --git a/sys/net/i4b/layer1/i4b_l1.h b/sys/net/i4b/layer1/i4b_l1.h index b2df9f6c4e..fc9c86ac90 100644 --- a/sys/net/i4b/layer1/i4b_l1.h +++ b/sys/net/i4b/layer1/i4b_l1.h @@ -28,7 +28,7 @@ * --------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/i4b_l1.h,v 1.7.2.3 2002/04/25 12:29:55 gj Exp $ - * $DragonFly: src/sys/net/i4b/layer1/i4b_l1.h,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/i4b_l1.h,v 1.3 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Tue Jan 23 17:04:57 2001] * @@ -37,7 +37,7 @@ #ifndef _I4B_L1_H_ #define _I4B_L1_H_ -#include +#include "../include/i4b_l3l4.h" #define SEC_DELAY 1000000 /* one second DELAY for DELAY*/ diff --git a/sys/net/i4b/layer1/i4b_l1dmux.c b/sys/net/i4b/layer1/i4b_l1dmux.c index e7bd4b4a23..e7d763032f 100644 --- a/sys/net/i4b/layer1/i4b_l1dmux.c +++ b/sys/net/i4b/layer1/i4b_l1dmux.c @@ -28,19 +28,19 @@ * -------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/i4b_l1dmux.c,v 1.3.2.2 2002/04/25 12:29:55 gj Exp $ - * $DragonFly: src/sys/net/i4b/layer1/i4b_l1dmux.c,v 1.3 2003/07/26 19:20:29 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/i4b_l1dmux.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Wed Jan 10 16:43:24 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" -#include "iwic.h" -#include "ifpi.h" -#include "ifpi2.h" -#include "ifpnp.h" -#include "ihfc.h" -#include "itjc.h" +#include "use_isic.h" +#include "use_iwic.h" +#include "use_ifpi.h" +#include "use_ifpi2.h" +#include "use_ifpnp.h" +#include "use_ihfc.h" +#include "use_itjc.h" #include #include @@ -49,10 +49,10 @@ #include #include -#include +#include "i4b_l1.h" -#include -#include +#include "../include/i4b_l1l2.h" +#include "../include/i4b_global.h" /* * this code is nothing but a big dynamic switch to multiplex and demultiplex diff --git a/sys/net/i4b/layer1/i4b_l1lib.c b/sys/net/i4b/layer1/i4b_l1lib.c index 1279db1c12..db2f69d42c 100644 --- a/sys/net/i4b/layer1/i4b_l1lib.c +++ b/sys/net/i4b/layer1/i4b_l1lib.c @@ -30,7 +30,7 @@ * $Id: i4b_l1lib.c,v 1.3 2000/05/29 15:41:41 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/i4b_l1lib.c,v 1.3.2.1 2001/08/10 14:08:36 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/i4b_l1lib.c,v 1.3 2003/07/26 19:20:29 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/i4b_l1lib.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Mon May 29 15:24:21 2000] * @@ -43,7 +43,7 @@ #include #include -#include +#include "i4b_l1.h" #define TEL_IDLE_MIN (BCH_MAX_DATALEN/2) diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_ext.h b/sys/net/i4b/layer1/ifpi/i4b_ifpi_ext.h index c41326dd52..ff5dda8c2a 100644 --- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_ext.h +++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_ext.h @@ -30,7 +30,7 @@ * $Id: i4b_ifpi_ext.h,v 1.2 2000/06/02 16:14:36 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h,v 1.1.2.1 2001/08/10 14:08:36 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_ext.h,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_ext.h,v 1.3 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Fri Jun 2 14:53:31 2000] * @@ -39,7 +39,7 @@ #ifndef _I4B_IFPI_EXT_H_ #define _I4B_IFPI_EXT_H_ -#include +#include "../../include/i4b_l3l4.h" void ifpi_set_linktab(int unit, int channel, drvr_link_t * dlt); isdn_link_t *ifpi_ret_linktab(int unit, int channel); diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c index 70e637c9e7..858e4f16ab 100644 --- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c +++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c @@ -30,14 +30,14 @@ * $Id: i4b_ifpi_isac.c,v 1.3 2000/05/29 15:41:41 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.4.2.1 2001/08/10 14:08:36 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.3 2003/07/26 19:20:30 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_isac.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Mon May 29 15:22:52 2000] * *---------------------------------------------------------------------------*/ -#include "ifpi.h" -#include "pci.h" +#include "use_ifpi.h" +#include "use_pci.h" #if (NIFPI > 0) && (NPCI > 0) @@ -55,16 +55,16 @@ #include #include -#include +#include "../i4b_l1.h" -#include -#include -#include +#include "../isic/i4b_isic.h" +#include "../isic/i4b_isac.h" +#include "../isic/i4b_hscx.h" -#include +#include "i4b_ifpi_ext.h" -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" static u_char ifpi_isac_exir_hdlr(struct l1_softc *sc, u_char exir); static void ifpi_isac_ind_hdlr(struct l1_softc *sc, int ind); diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c b/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c index 72b937fa59..8d51d6127a 100644 --- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c +++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c @@ -30,14 +30,14 @@ * $Id: i4b_ifpi_l1.c,v 1.4 2000/06/02 16:14:36 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.4.2.1 2001/08/10 14:08:36 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1.c,v 1.3 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Fri Jun 2 14:54:30 2000] * *---------------------------------------------------------------------------*/ -#include "ifpi.h" -#include "pci.h" +#include "use_ifpi.h" +#include "use_pci.h" #if (NIFPI > 0) && (NPCI > 0) @@ -53,15 +53,15 @@ #include #include -#include -#include +#include "../isic/i4b_isic.h" +#include "../isic/i4b_isac.h" -#include +#include "i4b_ifpi_ext.h" -#include +#include "../i4b_l1.h" -#include -#include +#include "../../include/i4b_mbuf.h" +#include "../../include/i4b_global.h" /*---------------------------------------------------------------------------* * diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c b/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c index 2b3e0abffa..865bfc8da2 100644 --- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c +++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c @@ -30,14 +30,14 @@ * $Id: i4b_ifpi_l1fsm.c,v 1.4 2000/05/29 15:41:41 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.4.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c,v 1.3 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Mon May 29 15:23:15 2000] * *---------------------------------------------------------------------------*/ -#include "ifpi.h" -#include "pci.h" +#include "use_ifpi.h" +#include "use_pci.h" #if (NIFPI > 0) && (NPCI > 0) @@ -53,15 +53,12 @@ #include #include -#include +#include "../isic/i4b_isic.h" +#include "../i4b_l1.h" +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" -#include - -#include - -#include - -#include +#include "i4b_ifpi_ext.h" #if DO_I4B_DEBUG static char *state_text[N_STATES] = { diff --git a/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c index 22114a6696..9773b3006b 100644 --- a/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c +++ b/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c @@ -36,15 +36,15 @@ * $Id: i4b_ifpi_pci.c,v 1.4 2000/06/02 11:58:56 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.6.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.3 2003/07/26 19:20:30 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi/i4b_ifpi_pci.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Fri Jan 12 17:01:26 2001] * *---------------------------------------------------------------------------*/ -#include "ifpi.h" +#include "use_ifpi.h" +#include "use_pci.h" #include "opt_i4b.h" -#include "pci.h" #if (NIFPI > 0) && (NPCI > 0) @@ -57,8 +57,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -67,15 +67,15 @@ #include #include -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" -#include -#include -#include -#include +#include "../i4b_l1.h" +#include "../isic/i4b_isic.h" +#include "../isic/i4b_isac.h" +#include "../isic/i4b_hscx.h" -#include +#include "i4b_ifpi_ext.h" #define PCI_AVMA1_VID 0x1244 #define PCI_AVMA1_DID 0x0a00 diff --git a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_ext.h b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_ext.h index b08ea87ade..8f1af268ec 100644 --- a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_ext.h +++ b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_ext.h @@ -30,7 +30,7 @@ * $Id$ * * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h,v 1.1.2.1 2002/04/25 20:26:50 gj Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_ext.h,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_ext.h,v 1.3 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Fri Jun 2 14:53:31 2000] * @@ -39,7 +39,7 @@ #ifndef _I4B_IFPI2_EXT_H_ #define _I4B_IFPI2_EXT_H_ -#include +#include "../../include/i4b_l3l4.h" void ifpi2_set_linktab(int , int , drvr_link_t * ); isdn_link_t *ifpi2_ret_linktab(int , int ); diff --git a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c index e0485ce656..9ae6816ef1 100644 --- a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c +++ b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c @@ -31,14 +31,14 @@ * $Id$ * * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.1.2.1 2002/04/25 20:26:50 gj Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.3 2003/07/26 19:20:30 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Mon May 29 15:22:52 2000] * *---------------------------------------------------------------------------*/ -#include "ifpi2.h" -#include "pci.h" +#include "use_ifpi2.h" +#include "use_pci.h" #if (NIFPI2 > 0) && (NPCI > 0) @@ -56,16 +56,15 @@ #include #include -#include +#include "../i4b_l1.h" +#include "../isic/i4b_isic.h" +#include "../isic/i4b_hscx.h" -#include -#include +#include "i4b_ifpi2_ext.h" +#include "i4b_ifpi2_isacsx.h" -#include -#include - -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" static u_char ifpi2_isacsx_exir_hdlr(struct l1_softc *sc, u_char exir); static void ifpi2_isacsx_ind_hdlr(struct l1_softc *sc, int ind); diff --git a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1.c b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1.c index 21992a198b..206807b6f6 100644 --- a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1.c +++ b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1.c @@ -31,14 +31,14 @@ * $Id$ * * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c,v 1.2.2.1 2002/04/25 20:26:50 gj Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1.c,v 1.3 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Fri Jun 2 14:54:30 2000] * *---------------------------------------------------------------------------*/ -#include "ifpi2.h" -#include "pci.h" +#include "use_ifpi2.h" +#include "use_pci.h" #if (NIFPI2 > 0) && (NPCI > 0) @@ -50,19 +50,19 @@ #include -#include -#include -#include +#include +#include +#include -#include -#include +#include "../isic/i4b_isic.h" +#include "../isic/i4b_isac.h" -#include +#include "i4b_ifpi2_ext.h" -#include +#include "../i4b_l1.h" -#include -#include +#include "../../include/i4b_mbuf.h" +#include "../../include/i4b_global.h" /*---------------------------------------------------------------------------* * diff --git a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c index 9811ecc257..9cce070a66 100644 --- a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c +++ b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c @@ -30,14 +30,14 @@ * $Id$ * * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c,v 1.1.2.1 2002/04/25 20:26:50 gj Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c,v 1.3 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Mon May 29 15:23:15 2000] * *---------------------------------------------------------------------------*/ -#include "ifpi2.h" -#include "pci.h" +#include "use_ifpi2.h" +#include "use_pci.h" #if (NIFPI2 > 0) && (NPCI > 0) @@ -49,19 +49,16 @@ #include -#include -#include -#include +#include +#include +#include -#include +#include "../isic/i4b_isic.h" +#include "../i4b_l1.h" +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" -#include - -#include - -#include - -#include +#include "i4b_ifpi2_ext.h" #if DO_I4B_DEBUG static char *state_text[N_STATES] = { diff --git a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c index 2bc0c3093c..96d0b5da0e 100644 --- a/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c +++ b/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c @@ -36,15 +36,15 @@ * $Id$ * * $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.6.2.2 2002/05/15 08:12:42 gj Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.3 2003/07/26 19:20:30 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpi2/i4b_ifpi2_pci.c,v 1.4 2003/08/07 21:17:25 dillon Exp $ * * last edit-date: [Fri Jan 12 17:01:26 2001] * *---------------------------------------------------------------------------*/ -#include "ifpi2.h" +#include "use_ifpi2.h" +#include "use_pci.h" #include "opt_i4b.h" -#include "pci.h" #if (NIFPI2 > 0) && (NPCI > 0) @@ -57,26 +57,26 @@ #include #include -#include -#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" -#include -#include -/*#include */ -#include +#include "../i4b_l1.h" +#include "../isic/i4b_isic.h" +/*#include "../isic/i4b_isac.h"*/ +#include "../isic/i4b_hscx.h" -#include -#include +#include "i4b_ifpi2_ext.h" +#include "i4b_ifpi2_isacsx.h" #define PCI_AVMA1_VID 0x1244 #define PCI_AVMA1_V2_DID 0x0e00 diff --git a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c index 59192db39b..06a0db18a2 100644 --- a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c +++ b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c @@ -34,13 +34,13 @@ * --------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.5.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.3 2003/07/26 19:20:31 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_avm.c,v 1.4 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Fri Jan 12 17:05:28 2001] * *---------------------------------------------------------------------------*/ -#include "ifpnp.h" +#include "use_ifpnp.h" #include "opt_i4b.h" #if (NIFPNP > 0) @@ -54,24 +54,24 @@ #include #include -#include +#include #include #include -#include -#include -#include +#include +#include +#include -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" -#include -#include -#include -#include +#include "../i4b_l1.h" +#include "../isic/i4b_isic.h" +#include "../isic/i4b_isac.h" +#include "../isic/i4b_hscx.h" -#include +#include "i4b_ifpnp_ext.h" /* prototypes */ static void avm_pnp_intr(void *); diff --git a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_ext.h b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_ext.h index 1d0c6426e3..35af5ac38e 100644 --- a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_ext.h +++ b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_ext.h @@ -31,7 +31,7 @@ * $Ust: src/i4b/layer1-nb/ifpnp/i4b_ifpnp_ext.h,v 1.4 2000/04/18 08:03:05 ust Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h,v 1.1.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_ext.h,v 1.2 2003/06/17 04:28:39 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_ext.h,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Fri Jun 2 14:54:57 2000] * @@ -40,7 +40,7 @@ #ifndef _I4B_IFPNP_EXT_H_ #define _I4B_IFPNP_EXT_H_ -#include +#include "../../include/i4b_l3l4.h" void ifpnp_set_linktab(int unit, int channel, drvr_link_t * dlt); isdn_link_t *ifpnp_ret_linktab(int unit, int channel); diff --git a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c index 647d689444..a63ef4c79e 100644 --- a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c +++ b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c @@ -31,13 +31,13 @@ * $Ust: src/i4b/layer1-nb/ifpnp/i4b_ifpnp_isac.c,v 1.4 2000/04/18 08:03:05 ust Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.4.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.3 2003/07/26 19:20:31 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_isac.c,v 1.4 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Mon May 29 15:24:49 2000] * *---------------------------------------------------------------------------*/ -#include "ifpnp.h" +#include "use_ifpnp.h" #if (NIFPNP > 0) @@ -51,20 +51,19 @@ #include -#include -#include -#include +#include +#include +#include -#include +#include "../i4b_l1.h" +#include "../isic/i4b_isic.h" +#include "../isic/i4b_isac.h" +#include "../isic/i4b_hscx.h" -#include -#include -#include +#include "i4b_ifpnp_ext.h" -#include - -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" static u_char ifpnp_isac_exir_hdlr(struct l1_softc *sc, u_char exir); static void ifpnp_isac_ind_hdlr(struct l1_softc *sc, int ind); diff --git a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1.c b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1.c index 9f17e3394c..47da725e01 100644 --- a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1.c +++ b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1.c @@ -31,13 +31,13 @@ * $Ust: src/i4b/layer1-nb/ifpnp/i4b_ifpnp_l1.c,v 1.4 2000/04/18 08:03:05 ust Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c,v 1.4.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Fri Jun 2 14:55:49 2000] * *---------------------------------------------------------------------------*/ -#include "ifpnp.h" +#include "use_ifpnp.h" #if (NIFPNP > 0) @@ -49,19 +49,19 @@ #include -#include -#include -#include +#include +#include +#include -#include -#include +#include "../isic/i4b_isic.h" +#include "../isic/i4b_isac.h" -#include +#include "i4b_ifpnp_ext.h" -#include +#include "../i4b_l1.h" -#include -#include +#include "../../include/i4b_mbuf.h" +#include "../../include/i4b_global.h" /*---------------------------------------------------------------------------* * diff --git a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c index de57d53f95..f5b30b5653 100644 --- a/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c +++ b/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c @@ -31,13 +31,13 @@ * $Ust: src/i4b/layer1-nb/ifpnp/i4b_ifpnp_l1fsm.c,v 1.4 2000/04/18 08:03:05 ust Exp $ * * $FreeBSD: src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c,v 1.4.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Mon May 29 15:25:04 2000] * *---------------------------------------------------------------------------*/ -#include "ifpnp.h" +#include "use_ifpnp.h" #if (NIFPNP > 0) @@ -49,19 +49,16 @@ #include -#include -#include -#include +#include +#include +#include -#include +#include "../isic/i4b_isic.h" +#include "../i4b_l1.h" +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" -#include - -#include - -#include - -#include +#include "i4b_ifpnp_ext.h" #if DO_I4B_DEBUG static char *state_text[N_STATES] = { diff --git a/sys/net/i4b/layer1/ihfc/i4b_ihfc.h b/sys/net/i4b/layer1/ihfc/i4b_ihfc.h index 6e80a740ee..20e600e4df 100644 --- a/sys/net/i4b/layer1/ihfc/i4b_ihfc.h +++ b/sys/net/i4b/layer1/ihfc/i4b_ihfc.h @@ -32,14 +32,14 @@ * $Id: i4b_ihfc.h,v 1.9 2000/09/19 13:50:36 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc.h,v 1.1.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc.h,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc.h,v 1.3 2003/08/07 21:17:26 dillon Exp $ * *---------------------------------------------------------------------------*/ #ifndef _I4B_IHFC_H_ #define _I4B_IHFC_H_ -#include +#include "../../include/i4b_l3l4.h" /*---------------------------------------------------------------------------* * global stuff (HFC-1/S/SP) diff --git a/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c index 013a1d1ef8..5e71088735 100644 --- a/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c +++ b/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c @@ -33,11 +33,11 @@ * last edit-date: [Fri Jan 12 17:06:52 2001] * * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.9.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.3 2003/07/26 19:20:31 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_drv.c,v 1.4 2003/08/07 21:17:26 dillon Exp $ * *---------------------------------------------------------------------------*/ -#include "ihfc.h" +#include "use_ihfc.h" #if (NIHFC > 0) @@ -48,17 +48,17 @@ #include -#include +#include "../../include/i4b_mbuf.h" -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include +#include "../i4b_l1.h" +#include "../i4b_hdlc.h" +#include "i4b_ihfc.h" +#include "i4b_ihfc_ext.h" +#include "i4b_ihfc_drv.h" #include #include diff --git a/sys/net/i4b/layer1/ihfc/i4b_ihfc_ext.h b/sys/net/i4b/layer1/ihfc/i4b_ihfc_ext.h index 288933cd13..bdbc8ad6e4 100644 --- a/sys/net/i4b/layer1/ihfc/i4b_ihfc_ext.h +++ b/sys/net/i4b/layer1/ihfc/i4b_ihfc_ext.h @@ -32,15 +32,14 @@ * $Id: i4b_ihfc_ext.h,v 1.6 2000/08/20 07:14:08 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h,v 1.1.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_ext.h,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_ext.h,v 1.3 2003/08/07 21:17:26 dillon Exp $ * *---------------------------------------------------------------------------*/ #ifndef I4B_IHFC_EXT_H_ #define I4B_IHFC_EXT_H_ -#include - +#include "../../include/i4b_l3l4.h" /* prototypes from i4b_ihfc_l1if.c */ diff --git a/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c index 4eec415165..7825b24619 100644 --- a/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c +++ b/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c @@ -37,11 +37,11 @@ * $Id: i4b_ihfc_l1if.c,v 1.10 2000/09/19 13:50:36 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.7.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.3 2003/07/26 19:20:31 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_l1if.c,v 1.4 2003/08/07 21:17:26 dillon Exp $ * *---------------------------------------------------------------------------*/ -#include "ihfc.h" +#include "use_ihfc.h" #if (NIHFC > 0) @@ -54,16 +54,16 @@ #include -#include -#include -#include +#include +#include +#include -#include -#include +#include "../../include/i4b_mbuf.h" +#include "../../include/i4b_global.h" -#include -#include -#include +#include "../i4b_l1.h" +#include "i4b_ihfc.h" +#include "i4b_ihfc_ext.h" /*---------------------------------------------------------------------------* * Local prototypes diff --git a/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c b/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c index dae6a38d44..8178161b61 100644 --- a/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c +++ b/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c @@ -36,11 +36,11 @@ * $Id: i4b_ihfc_pnp.c,v 1.9 2000/09/19 13:50:36 hm Exp $ * * $FreeBSD: src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.5.2.1 2001/08/10 14:08:37 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/ihfc/i4b_ihfc_pnp.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * *---------------------------------------------------------------------------*/ -#include "ihfc.h" +#include "use_ihfc.h" #if (NIHFC > 0) @@ -51,21 +51,20 @@ #include -#include +#include "../../include/i4b_global.h" +#include +#include -#include -#include - -#include -#include -#include +#include "../i4b_l1.h" +#include "i4b_ihfc.h" +#include "i4b_ihfc_ext.h" #include #include #include #include -#include +#include /*---------------------------------------------------------------------------* * Softc diff --git a/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c b/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c index 84ca063836..6fa00ad7fd 100644 --- a/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c +++ b/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c @@ -41,13 +41,13 @@ * Keil. * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_asuscom_ipac.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_asuscom_ipac.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:06:30 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if (NISIC > 0) && defined (ASUSCOM_IPAC) @@ -58,8 +58,8 @@ #include #include -#include -#include +#include "i4b_isic.h" +#include "i4b_ipac.h" /* masks for register encoded in base addr */ diff --git a/sys/net/i4b/layer1/isic/i4b_avm_a1.c b/sys/net/i4b/layer1/isic/i4b_avm_a1.c index 401f708a1f..15aa9839a1 100644 --- a/sys/net/i4b/layer1/isic/i4b_avm_a1.c +++ b/sys/net/i4b/layer1/isic/i4b_avm_a1.c @@ -36,13 +36,13 @@ * ------------------------------------------------------------ * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_avm_a1.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_avm_a1.c,v 1.3 2003/07/23 02:30:20 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_avm_a1.c,v 1.4 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:25:23 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if NISIC > 0 && defined(AVM_A1) @@ -52,13 +52,13 @@ #include #include -#include -#include +#include +#include #include -#include -#include -#include +#include "../i4b_l1.h" +#include "i4b_isic.h" +#include "i4b_hscx.h" /*---------------------------------------------------------------------------* * AVM A1 and AVM Fritz! Card special registers diff --git a/sys/net/i4b/layer1/isic/i4b_bchan.c b/sys/net/i4b/layer1/isic/i4b_bchan.c index 9196669e05..0cae687af0 100644 --- a/sys/net/i4b/layer1/isic/i4b_bchan.c +++ b/sys/net/i4b/layer1/isic/i4b_bchan.c @@ -28,13 +28,13 @@ * ---------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_bchan.c,v 1.7.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_bchan.c,v 1.3 2003/07/26 19:20:31 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_bchan.c,v 1.4 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:07:12 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #if NISIC > 0 @@ -44,17 +44,17 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include "../i4b_l1.h" -#include -#include +#include "i4b_isic.h" +#include "i4b_hscx.h" -#include -#include +#include "../../include/i4b_mbuf.h" +#include "../../include/i4b_global.h" static void isic_bchannel_start(int unit, int h_chan); static void isic_bchannel_stat(int unit, int h_chan, bchan_statistics_t *bsp); diff --git a/sys/net/i4b/layer1/isic/i4b_ctx_s0P.c b/sys/net/i4b/layer1/isic/i4b_ctx_s0P.c index c56c4623ad..0e936737cc 100644 --- a/sys/net/i4b/layer1/isic/i4b_ctx_s0P.c +++ b/sys/net/i4b/layer1/isic/i4b_ctx_s0P.c @@ -28,7 +28,7 @@ * ============================================================ * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_ctx_s0P.c,v 1.5.2.2 2001/12/10 12:18:11 hm Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_ctx_s0P.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_ctx_s0P.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:07:22 2001] * @@ -41,7 +41,7 @@ * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if (NISIC > 0) && (defined(CRTX_S0_P) || defined(TEL_S0_16_3_P) || defined(COMPAQ_M610)) @@ -51,12 +51,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "../i4b_l1.h" +#include "i4b_isic.h" +#include "i4b_hscx.h" /*---------------------------------------------------------------------------* * Creatix / Teles PnP ISAC get fifo routine diff --git a/sys/net/i4b/layer1/isic/i4b_diva.c b/sys/net/i4b/layer1/isic/i4b_diva.c index a0162f9129..b4e4c4c4cc 100644 --- a/sys/net/i4b/layer1/isic/i4b_diva.c +++ b/sys/net/i4b/layer1/isic/i4b_diva.c @@ -28,13 +28,13 @@ * -------------------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_diva.c,v 1.1.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_diva.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_diva.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Fri Jan 26 13:57:10 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if NISIC > 0 && defined EICON_DIVA @@ -47,10 +47,10 @@ #include -#include -#include -#include -#include +#include "i4b_isic.h" +#include "i4b_ipac.h" +#include "i4b_isic.h" +#include "i4b_hscx.h" /* offsets from base address */ diff --git a/sys/net/i4b/layer1/isic/i4b_drn_ngo.c b/sys/net/i4b/layer1/isic/i4b_drn_ngo.c index b0b3612c39..53c73343e1 100644 --- a/sys/net/i4b/layer1/isic/i4b_drn_ngo.c +++ b/sys/net/i4b/layer1/isic/i4b_drn_ngo.c @@ -28,13 +28,13 @@ * -------------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_drn_ngo.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_drn_ngo.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_drn_ngo.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:07:44 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if (NISIC > 0) && defined(DRN_NGO) @@ -46,8 +46,8 @@ #include -#include -#include +#include "i4b_isic.h" +#include "i4b_hscx.h" /*---------------------------------------------------------------------------* * Niccy GO@ definitions diff --git a/sys/net/i4b/layer1/isic/i4b_dynalink.c b/sys/net/i4b/layer1/isic/i4b_dynalink.c index 033b13cad7..ffa01f3a05 100644 --- a/sys/net/i4b/layer1/isic/i4b_dynalink.c +++ b/sys/net/i4b/layer1/isic/i4b_dynalink.c @@ -34,7 +34,7 @@ * ================================================== * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_dynalink.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_dynalink.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_dynalink.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:08:03 2001] * @@ -68,7 +68,7 @@ This driver might also work for Asuscom cards. */ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if (NISIC > 0) && defined(DYNALINK) @@ -78,12 +78,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "../i4b_l1.h" +#include "i4b_isic.h" +#include "i4b_hscx.h" /* io address mapping */ #define ISAC 0 diff --git a/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c index 20b9d32856..7afae1bbc6 100644 --- a/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c +++ b/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c @@ -28,13 +28,13 @@ * ================================================================ * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.5.2.2 2001/10/24 14:17:20 hm Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_pcc16.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Oct 24 16:15:26 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if (NISIC > 0) && defined(ELSA_PCC16) @@ -46,8 +46,8 @@ #include -#include -#include +#include "i4b_isic.h" +#include "i4b_hscx.h" static void i4b_epcc16_clrirq(struct l1_softc *sc); diff --git a/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c b/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c index aaa64d10e3..d09db00201 100644 --- a/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c +++ b/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c @@ -28,13 +28,13 @@ * ===================================================================== * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1i.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1i.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:09:03 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if (NISIC > 0) && defined(ELSA_QS1ISA) @@ -46,8 +46,8 @@ #include -#include -#include +#include "i4b_isic.h" +#include "i4b_hscx.h" static void i4b_eq1i_clrirq(struct l1_softc *sc); diff --git a/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c index 658cabe47e..a8db972ac0 100644 --- a/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c +++ b/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c @@ -28,7 +28,7 @@ * ================================================================== * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.6.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_elsa_qs1p.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:09:28 2001] * @@ -36,9 +36,9 @@ * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" +#include "use_pci.h" #include "opt_i4b.h" -#include "pci.h" #if (NISIC > 0) && (NPCI > 0) && defined(ELSA_QS1PCI) @@ -53,13 +53,13 @@ #include #include -#include -#include +#include +#include #include -#include -#include +#include "i4b_isic.h" +#include "i4b_ipac.h" #define MEM0_MAPOFF 0 #define PORT0_MAPOFF 4 diff --git a/sys/net/i4b/layer1/isic/i4b_hscx.c b/sys/net/i4b/layer1/isic/i4b_hscx.c index 3b95548c34..f4b926fc26 100644 --- a/sys/net/i4b/layer1/isic/i4b_hscx.c +++ b/sys/net/i4b/layer1/isic/i4b_hscx.c @@ -28,13 +28,13 @@ * -------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_hscx.c,v 1.7.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_hscx.c,v 1.3 2003/07/26 19:20:31 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_hscx.c,v 1.4 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:09:42 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #if NISIC > 0 @@ -45,17 +45,17 @@ #include -#include -#include -#include +#include +#include +#include -#include -#include +#include "i4b_isic.h" +#include "i4b_hscx.h" -#include +#include "../i4b_l1.h" -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" /*---------------------------------------------------------------------------* * HSCX IRQ Handler diff --git a/sys/net/i4b/layer1/isic/i4b_isac.c b/sys/net/i4b/layer1/isic/i4b_isac.c index 6b5aa4b62d..38b8a936f4 100644 --- a/sys/net/i4b/layer1/isic/i4b_isac.c +++ b/sys/net/i4b/layer1/isic/i4b_isac.c @@ -28,13 +28,13 @@ * --------------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isac.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isac.c,v 1.3 2003/07/26 19:20:31 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isac.c,v 1.4 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:10:36 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #if NISIC > 0 @@ -47,18 +47,18 @@ #include -#include -#include -#include +#include +#include +#include -#include +#include "../i4b_l1.h" -#include -#include -#include +#include "i4b_isic.h" +#include "i4b_isac.h" +#include "i4b_hscx.h" -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" static u_char isic_isac_exir_hdlr(struct l1_softc *sc, u_char exir); static void isic_isac_ind_hdlr(struct l1_softc *sc, int ind); diff --git a/sys/net/i4b/layer1/isic/i4b_isic.c b/sys/net/i4b/layer1/isic/i4b_isic.c index 024e375a1e..8cdaf54cb9 100644 --- a/sys/net/i4b/layer1/isic/i4b_isic.c +++ b/sys/net/i4b/layer1/isic/i4b_isic.c @@ -28,13 +28,13 @@ * ============================== * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic.c,v 1.4.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic.c,v 1.3 2003/07/26 19:20:31 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic.c,v 1.4 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:29:42 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if NISIC > 0 @@ -44,19 +44,19 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include "../i4b_l1.h" -#include -#include -#include -#include -#include +#include "i4b_isic.h" +#include "i4b_isic_ext.h" +#include "i4b_ipac.h" +#include "i4b_isac.h" +#include "i4b_hscx.h" -#include +#include "../../include/i4b_global.h" static char *ISACversion[] = { "2085 Version A1/A2 or 2086/2186 Version 1.1", diff --git a/sys/net/i4b/layer1/isic/i4b_isic.h b/sys/net/i4b/layer1/isic/i4b_isic.h index 853314c43a..4b95faffb9 100644 --- a/sys/net/i4b/layer1/isic/i4b_isic.h +++ b/sys/net/i4b/layer1/isic/i4b_isic.h @@ -28,7 +28,7 @@ * --------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic.h,v 1.3.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic.h,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic.h,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Fri Jan 26 13:55:12 2001] * @@ -43,9 +43,9 @@ #include #include -#include +#include "../../include/i4b_l3l4.h" -#include +#include "i4b_isic_ext.h" /*--------------------------------------------------------------------------- * isic driver: max no of units diff --git a/sys/net/i4b/layer1/isic/i4b_isic_ext.h b/sys/net/i4b/layer1/isic/i4b_isic_ext.h index 7ed03f1d72..0d68b09ea1 100644 --- a/sys/net/i4b/layer1/isic/i4b_isic_ext.h +++ b/sys/net/i4b/layer1/isic/i4b_isic_ext.h @@ -28,7 +28,7 @@ * --------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_ext.h,v 1.2.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_ext.h,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_ext.h,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:11:12 2001] * @@ -37,7 +37,7 @@ #ifndef _I4B_ISIC_EXT_H_ #define _I4B_ISIC_EXT_H_ -#include +#include "../../include/i4b_l3l4.h" int isic_ph_data_req(int unit, struct mbuf *m, int freeflag); int isic_ph_activate_req(int unit); diff --git a/sys/net/i4b/layer1/isic/i4b_isic_isa.c b/sys/net/i4b/layer1/isic/i4b_isic_isa.c index 21221ac104..f553359702 100644 --- a/sys/net/i4b/layer1/isic/i4b_isic_isa.c +++ b/sys/net/i4b/layer1/isic/i4b_isic_isa.c @@ -28,13 +28,13 @@ * ================================== * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_isa.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_isa.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_isa.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:30:19 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if NISIC > 0 @@ -47,10 +47,10 @@ #include -#include +#include "i4b_isic.h" #include -#include +#include struct l1_softc l1_sc[ISIC_MAXUNIT]; diff --git a/sys/net/i4b/layer1/isic/i4b_isic_pnp.c b/sys/net/i4b/layer1/isic/i4b_isic_pnp.c index 5c99df10ea..26c0c02c1b 100644 --- a/sys/net/i4b/layer1/isic/i4b_isic_pnp.c +++ b/sys/net/i4b/layer1/isic/i4b_isic_pnp.c @@ -38,13 +38,13 @@ * -------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_isic_pnp.c,v 1.5.2.2 2001/12/10 12:18:11 hm Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_pnp.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_isic_pnp.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Fri Jan 26 14:01:04 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if (NISIC > 0) @@ -56,9 +56,9 @@ #include #include -#include +#include "i4b_isic.h" -#include +#include #define VID_TEL163PNP 0x10212750 /* Teles 16.3 PnP */ #define VID_CREATIXPP 0x0000980e /* Creatix S0/16 P+P */ diff --git a/sys/net/i4b/layer1/isic/i4b_itk_ix1.c b/sys/net/i4b/layer1/isic/i4b_itk_ix1.c index 596819bd56..cf623701f9 100644 --- a/sys/net/i4b/layer1/isic/i4b_itk_ix1.c +++ b/sys/net/i4b/layer1/isic/i4b_itk_ix1.c @@ -29,7 +29,7 @@ * last edit-date: [Wed Jan 24 09:27:06 2001] * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_itk_ix1.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_itk_ix1.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_itk_ix1.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * *--------------------------------------------------------------------------- * @@ -61,7 +61,7 @@ * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if NISIC > 0 && defined(ITKIX1) @@ -71,11 +71,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include "../i4b_l1.h" +#include "i4b_isic.h" +#include "i4b_hscx.h" /* Register offsets */ #define ITK_ISAC_DATA 0 diff --git a/sys/net/i4b/layer1/isic/i4b_l1.c b/sys/net/i4b/layer1/isic/i4b_l1.c index 1e141e230e..00e01518dc 100644 --- a/sys/net/i4b/layer1/isic/i4b_l1.c +++ b/sys/net/i4b/layer1/isic/i4b_l1.c @@ -28,13 +28,13 @@ * ----------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_l1.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_l1.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_l1.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:12:03 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #if NISIC > 0 @@ -45,17 +45,17 @@ #include -#include -#include -#include +#include +#include +#include -#include -#include +#include "i4b_isic.h" +#include "i4b_isac.h" -#include +#include "../i4b_l1.h" -#include -#include +#include "../../include/i4b_mbuf.h" +#include "../../include/i4b_global.h" /*---------------------------------------------------------------------------* * diff --git a/sys/net/i4b/layer1/isic/i4b_l1fsm.c b/sys/net/i4b/layer1/isic/i4b_l1fsm.c index 69ba7a038e..7af1188fe2 100644 --- a/sys/net/i4b/layer1/isic/i4b_l1fsm.c +++ b/sys/net/i4b/layer1/isic/i4b_l1fsm.c @@ -28,13 +28,13 @@ * -------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_l1fsm.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_l1fsm.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_l1fsm.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:12:18 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #if NISIC > 0 @@ -45,17 +45,15 @@ #include -#include -#include -#include +#include +#include +#include -#include +#include "i4b_isic.h" -#include - -#include - -#include +#include "../i4b_l1.h" +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" #if DO_I4B_DEBUG static char *state_text[N_STATES] = { diff --git a/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c b/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c index 9ece30f2e3..f8f667b6c8 100644 --- a/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c +++ b/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c @@ -37,13 +37,13 @@ * In case of trouble please contact Udo Schweigert * $FreeBSD: src/sys/i4b/layer1/isic/i4b_siemens_isurf.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_siemens_isurf.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:13:25 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if NISIC > 0 && defined(SIEMENS_ISURF2) @@ -56,8 +56,8 @@ #include -#include -#include +#include "i4b_isic.h" +#include "i4b_ipac.h" /* masks for register encoded in base addr */ diff --git a/sys/net/i4b/layer1/isic/i4b_sws.c b/sys/net/i4b/layer1/isic/i4b_sws.c index 9bb90466e4..76acf59394 100644 --- a/sys/net/i4b/layer1/isic/i4b_sws.c +++ b/sys/net/i4b/layer1/isic/i4b_sws.c @@ -45,13 +45,13 @@ * ==================================================== * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_sws.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_sws.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_sws.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 08:58:57 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if defined (SEDLBAUER) && NISIC > 0 @@ -71,11 +71,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include "../i4b_l1.h" +#include "i4b_isic.h" +#include "i4b_hscx.h" /*---------------------------------------------------------------------------* * SWS P&P ISAC get fifo routine diff --git a/sys/net/i4b/layer1/isic/i4b_tel_s016.c b/sys/net/i4b/layer1/isic/i4b_tel_s016.c index af949e37cd..711b19e20a 100644 --- a/sys/net/i4b/layer1/isic/i4b_tel_s016.c +++ b/sys/net/i4b/layer1/isic/i4b_tel_s016.c @@ -38,13 +38,13 @@ * ================================================================= * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s016.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s016.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s016.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:27:24 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if NISIC > 0 && defined(TEL_S0_16) @@ -55,12 +55,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "../i4b_l1.h" +#include "i4b_isic.h" +#include "i4b_hscx.h" #define TELES_S016_MEMSIZE 0x1000 diff --git a/sys/net/i4b/layer1/isic/i4b_tel_s0163.c b/sys/net/i4b/layer1/isic/i4b_tel_s0163.c index 9c16738484..49ee07b69c 100644 --- a/sys/net/i4b/layer1/isic/i4b_tel_s0163.c +++ b/sys/net/i4b/layer1/isic/i4b_tel_s0163.c @@ -38,13 +38,13 @@ * ======================================================== * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s0163.c,v 1.5.2.1 2001/08/10 14:08:38 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s0163.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s0163.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:27:40 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if NISIC > 0 && defined(TEL_S0_16_3) @@ -54,12 +54,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "../i4b_l1.h" +#include "i4b_isic.h" +#include "i4b_hscx.h" static u_char intr_no[] = { 1, 1, 0, 2, 4, 6, 1, 1, 1, 0, 8, 10, 12, 1, 1, 14 }; diff --git a/sys/net/i4b/layer1/isic/i4b_tel_s08.c b/sys/net/i4b/layer1/isic/i4b_tel_s08.c index c34297814d..90e7969ed4 100644 --- a/sys/net/i4b/layer1/isic/i4b_tel_s08.c +++ b/sys/net/i4b/layer1/isic/i4b_tel_s08.c @@ -38,13 +38,13 @@ * ================================================================ * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_tel_s08.c,v 1.5.2.1 2001/08/10 14:08:39 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s08.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_tel_s08.c,v 1.3 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:27:58 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if NISIC > 0 && defined(TEL_S0_8) @@ -55,12 +55,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "../i4b_l1.h" +#include "i4b_isic.h" +#include "i4b_hscx.h" #define TELES_S08_MEMSIZE 0x1000 diff --git a/sys/net/i4b/layer1/isic/i4b_usr_sti.c b/sys/net/i4b/layer1/isic/i4b_usr_sti.c index e13a7a90b8..1af259c415 100644 --- a/sys/net/i4b/layer1/isic/i4b_usr_sti.c +++ b/sys/net/i4b/layer1/isic/i4b_usr_sti.c @@ -28,13 +28,13 @@ * ------------------------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/isic/i4b_usr_sti.c,v 1.5.2.1 2001/08/10 14:08:39 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_usr_sti.c,v 1.3 2003/07/26 19:20:31 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/isic/i4b_usr_sti.c,v 1.4 2003/08/07 21:17:26 dillon Exp $ * * last edit-date: [Wed Jan 24 09:28:12 2001] * *---------------------------------------------------------------------------*/ -#include "isic.h" +#include "use_isic.h" #include "opt_i4b.h" #if (NISIC > 0) && defined(USR_STI) @@ -48,12 +48,12 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include "../i4b_l1.h" +#include "i4b_isic.h" +#include "i4b_hscx.h" /*---------------------------------------------------------------------------* * USR Sportster TA intern special registers diff --git a/sys/net/i4b/layer1/itjc/i4b_itjc_ext.h b/sys/net/i4b/layer1/itjc/i4b_itjc_ext.h index 6406db48dc..5fcd0f018b 100644 --- a/sys/net/i4b/layer1/itjc/i4b_itjc_ext.h +++ b/sys/net/i4b/layer1/itjc/i4b_itjc_ext.h @@ -28,7 +28,7 @@ * ------------------------------------------ * * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_ext.h,v 1.1.2.1 2001/08/10 14:08:39 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_ext.h,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_ext.h,v 1.3 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Wed Jan 10 17:15:31 2001] * @@ -37,7 +37,7 @@ #ifndef _I4B_ITJC_EXT_H_ #define _I4B_ITJC_EXT_H_ -#include +#include "../../include/i4b_l3l4.h" void itjc_set_linktab(int unit, int channel, drvr_link_t * dlt); isdn_link_t *itjc_ret_linktab(int unit, int channel); diff --git a/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c b/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c index 369664ad43..4576d25e9e 100644 --- a/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c +++ b/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c @@ -28,14 +28,14 @@ * -------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_isac.c,v 1.1.2.1 2001/08/10 14:08:39 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c,v 1.3 2003/07/26 19:20:32 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_isac.c,v 1.4 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Wed Jan 10 17:15:54 2001] * *---------------------------------------------------------------------------*/ -#include "itjc.h" -#include "pci.h" +#include "use_itjc.h" +#include "use_pci.h" #if (NITJC > 0) @@ -52,19 +52,19 @@ #include -#include -#include -#include +#include +#include +#include -#include +#include "../i4b_l1.h" -#include -#include +#include "../isic/i4b_isic.h" +#include "../isic/i4b_isac.h" -#include +#include "i4b_itjc_ext.h" -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" static u_char itjc_isac_exir_hdlr(struct l1_softc *sc, u_char exir); static void itjc_isac_ind_hdlr(struct l1_softc *sc, int ind); diff --git a/sys/net/i4b/layer1/itjc/i4b_itjc_l1.c b/sys/net/i4b/layer1/itjc/i4b_itjc_l1.c index b46d280cd0..15e7a8857e 100644 --- a/sys/net/i4b/layer1/itjc/i4b_itjc_l1.c +++ b/sys/net/i4b/layer1/itjc/i4b_itjc_l1.c @@ -28,14 +28,14 @@ * --------------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_l1.c,v 1.1.2.1 2001/08/10 14:08:39 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_l1.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_l1.c,v 1.3 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Wed Jan 10 17:16:19 2001] * *---------------------------------------------------------------------------*/ -#include "itjc.h" -#include "pci.h" +#include "use_itjc.h" +#include "use_pci.h" #if (NITJC > 0) && (NPCI > 0) @@ -50,19 +50,19 @@ #include -#include -#include -#include +#include +#include +#include -#include -#include +#include "../isic/i4b_isic.h" +#include "../isic/i4b_isac.h" -#include +#include "i4b_itjc_ext.h" -#include +#include "../i4b_l1.h" -#include -#include +#include "../../include/i4b_mbuf.h" +#include "../../include/i4b_global.h" /*---------------------------------------------------------------------------* * diff --git a/sys/net/i4b/layer1/itjc/i4b_itjc_l1fsm.c b/sys/net/i4b/layer1/itjc/i4b_itjc_l1fsm.c index 2b32b199a7..5b09555b85 100644 --- a/sys/net/i4b/layer1/itjc/i4b_itjc_l1fsm.c +++ b/sys/net/i4b/layer1/itjc/i4b_itjc_l1fsm.c @@ -28,14 +28,14 @@ * ------------------------------------------------------------ * * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c,v 1.1.2.1 2001/08/10 14:08:39 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_l1fsm.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_l1fsm.c,v 1.3 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Wed Jan 10 17:16:33 2001] * *---------------------------------------------------------------------------*/ -#include "itjc.h" -#include "pci.h" +#include "use_itjc.h" +#include "use_pci.h" #if (NITJC > 0) && (NPCI > 0) @@ -50,21 +50,20 @@ #include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include "../isic/i4b_isic.h" +#include "../isic/i4b_isac.h" +#include "../isic/i4b_hscx.h" -#include +#include "../i4b_l1.h" -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" -#include - -#include +#include "i4b_itjc_ext.h" #if DO_I4B_DEBUG static char *state_text[N_STATES] = { diff --git a/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c index fcae6ce020..456e32e79c 100644 --- a/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c +++ b/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c @@ -34,15 +34,15 @@ * ---------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.1.2.1 2001/08/10 14:08:39 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.3 2003/07/23 07:14:18 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/itjc/i4b_itjc_pci.c,v 1.4 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Thu Jan 11 11:29:38 2001] * *---------------------------------------------------------------------------*/ -#include "itjc.h" +#include "use_itjc.h" +#include "use_pci.h" #include "opt_i4b.h" -#include "pci.h" #if (NITJC > 0) @@ -58,27 +58,27 @@ #include #include -#include -#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" -#include +#include "../i4b_l1.h" -#include /* XXXXXXXXXXXXXXXXXXXXXXXX */ +#include "i4b_hdlc.h" /* XXXXXXXXXXXXXXXXXXXXXXXX */ -#include -#include +#include "../isic/i4b_isic.h" +#include "../isic/i4b_isac.h" -#include +#include "i4b_itjc_ext.h" #define PCI_TJNET_VID (0xe159) #define PCI_TJ300_DID (0x0001) diff --git a/sys/net/i4b/layer1/iwic/i4b_iwic.h b/sys/net/i4b/layer1/iwic/i4b_iwic.h index 0658033332..16ad70ed1c 100644 --- a/sys/net/i4b/layer1/iwic/i4b_iwic.h +++ b/sys/net/i4b/layer1/iwic/i4b_iwic.h @@ -28,7 +28,7 @@ * ---------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic.h,v 1.2.2.1 2001/08/10 14:08:40 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic.h,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic.h,v 1.3 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Sun Jan 21 11:08:44 2001] * @@ -37,7 +37,7 @@ #ifndef _I4B_IWIC_H_ #define _I4B_IWIC_H_ -#include +#include "i4b_iwic_ext.h" /*---------------------------------------------------------------------------* * PCI resources used diff --git a/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c b/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c index 2d54045324..28dd06cace 100644 --- a/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c +++ b/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c @@ -30,15 +30,15 @@ * ---------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_bchan.c,v 1.7.2.1 2001/08/10 14:08:40 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c,v 1.3 2003/07/26 19:20:32 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_bchan.c,v 1.4 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Tue Jan 16 13:21:24 2001] * *---------------------------------------------------------------------------*/ -#include "iwic.h" +#include "use_iwic.h" +#include "use_pci.h" #include "opt_i4b.h" -#include "pci.h" #if (NIWIC > 0) && (NPCI > 0) @@ -49,18 +49,17 @@ #include +#include +#include +#include -#include -#include -#include +#include "../i4b_l1.h" -#include +#include "i4b_iwic.h" +#include "i4b_w6692.h" -#include -#include - -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_mbuf.h" static void iwic_bchan_init(struct iwic_softc *sc, int chan_no, int activate); diff --git a/sys/net/i4b/layer1/iwic/i4b_iwic_dchan.c b/sys/net/i4b/layer1/iwic/i4b_iwic_dchan.c index ff72ca77ee..2cc4acba73 100644 --- a/sys/net/i4b/layer1/iwic/i4b_iwic_dchan.c +++ b/sys/net/i4b/layer1/iwic/i4b_iwic_dchan.c @@ -28,15 +28,15 @@ * ---------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_dchan.c,v 1.4.2.1 2001/08/10 14:08:40 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_dchan.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_dchan.c,v 1.3 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Tue Jan 16 13:20:14 2001] * *---------------------------------------------------------------------------*/ -#include "iwic.h" +#include "use_iwic.h" +#include "use_pci.h" #include "opt_i4b.h" -#include "pci.h" #if (NIWIC > 0) && (NPCI > 0) @@ -47,19 +47,18 @@ #include +#include +#include +#include -#include -#include -#include +#include "../i4b_l1.h" -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_l3l4.h" +#include "../../include/i4b_mbuf.h" -#include -#include -#include - -#include -#include +#include "i4b_iwic.h" +#include "i4b_w6692.h" #define MAX_DFRAME_LEN 264 diff --git a/sys/net/i4b/layer1/iwic/i4b_iwic_ext.h b/sys/net/i4b/layer1/iwic/i4b_iwic_ext.h index 10fb82e29e..dcc017b304 100644 --- a/sys/net/i4b/layer1/iwic/i4b_iwic_ext.h +++ b/sys/net/i4b/layer1/iwic/i4b_iwic_ext.h @@ -28,7 +28,7 @@ * ---------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_ext.h,v 1.2.2.1 2001/08/10 14:08:40 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_ext.h,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_ext.h,v 1.3 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Sun Jan 21 11:09:14 2001] * @@ -37,7 +37,7 @@ #ifndef _I4B_IWIC_EXT_H_ #define _I4B_IWIC_EXT_H_ -#include +#include "../../include/i4b_l3l4.h" void iwic_set_linktab(int unit, int channel, drvr_link_t * dlt); isdn_link_t *iwic_ret_linktab(int unit, int channel); diff --git a/sys/net/i4b/layer1/iwic/i4b_iwic_fsm.c b/sys/net/i4b/layer1/iwic/i4b_iwic_fsm.c index a82376bc5f..7db00ba49f 100644 --- a/sys/net/i4b/layer1/iwic/i4b_iwic_fsm.c +++ b/sys/net/i4b/layer1/iwic/i4b_iwic_fsm.c @@ -28,15 +28,15 @@ * ---------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_fsm.c,v 1.4.2.1 2001/08/10 14:08:40 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_fsm.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_fsm.c,v 1.3 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Sun Jan 21 11:09:24 2001] * *---------------------------------------------------------------------------*/ -#include "iwic.h" +#include "use_iwic.h" +#include "use_pci.h" #include "opt_i4b.h" -#include "pci.h" #if (NIWIC > 0) && (NPCI > 0) @@ -45,17 +45,16 @@ #include #include +#include +#include +#include -#include -#include -#include +#include "../i4b_l1.h" -#include +#include "../../include/i4b_l3l4.h" -#include - -#include -#include +#include "i4b_iwic.h" +#include "i4b_w6692.h" #if DO_I4B_DEBUG static char *state_names[] = { diff --git a/sys/net/i4b/layer1/iwic/i4b_iwic_l1if.c b/sys/net/i4b/layer1/iwic/i4b_iwic_l1if.c index ff2fb124a4..030ab51460 100644 --- a/sys/net/i4b/layer1/iwic/i4b_iwic_l1if.c +++ b/sys/net/i4b/layer1/iwic/i4b_iwic_l1if.c @@ -28,15 +28,15 @@ * ---------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_l1if.c,v 1.5.2.1 2001/08/10 14:08:40 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_l1if.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_l1if.c,v 1.3 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Sun Jan 21 11:09:33 2001] * *---------------------------------------------------------------------------*/ -#include "iwic.h" +#include "use_iwic.h" +#include "use_pci.h" #include "opt_i4b.h" -#include "pci.h" #if (NIWIC > 0) && (NPCI > 0) @@ -45,20 +45,16 @@ #include #include +#include +#include +#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_l3l4.h" +#include "../i4b_l1.h" - -#include -#include -#include - -#include -#include - -#include - -#include -#include +#include "i4b_iwic.h" +#include "i4b_iwic_ext.h" /* jump table for multiplex routines */ diff --git a/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c b/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c index 2b5903a969..a52d341ebc 100644 --- a/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c +++ b/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c @@ -28,15 +28,15 @@ * ---------------------------------------- * * $FreeBSD: src/sys/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.6.2.1 2001/08/10 14:08:40 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer1/iwic/i4b_iwic_pci.c,v 1.3 2003/08/07 21:17:28 dillon Exp $ * * last edit-date: [Tue Jan 16 10:53:03 2001] * *---------------------------------------------------------------------------*/ -#include "iwic.h" +#include "use_iwic.h" +#include "use_pci.h" #include "opt_i4b.h" -#include "pci.h" #if (NIWIC > 0) && (NPCI > 0) @@ -52,19 +52,18 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include +#include "../../include/i4b_global.h" +#include "../../include/i4b_l3l4.h" +#include "../i4b_l1.h" -#include - -#include -#include +#include "i4b_iwic.h" +#include "i4b_w6692.h" extern struct i4b_l1mux_func iwic_l1mux_func; diff --git a/sys/net/i4b/layer2/i4b_iframe.c b/sys/net/i4b/layer2/i4b_iframe.c index ac01252c4c..8237c7f171 100644 --- a/sys/net/i4b/layer2/i4b_iframe.c +++ b/sys/net/i4b/layer2/i4b_iframe.c @@ -30,14 +30,14 @@ * $Id: i4b_iframe.c,v 1.25 2000/08/24 11:48:57 hm Exp $ * * $FreeBSD: src/sys/i4b/layer2/i4b_iframe.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_iframe.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_iframe.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Thu Aug 24 12:49:18 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq921.h" +#include "use_i4bq921.h" #else #define NI4BQ921 1 #endif @@ -55,21 +55,21 @@ #endif #ifdef __FreeBSD__ -#include -#include +#include +#include #else #include #include #include #endif -#include -#include -#include -#include +#include "../include/i4b_global.h" +#include "../include/i4b_l1l2.h" +#include "../include/i4b_l2l3.h" +#include "../include/i4b_mbuf.h" -#include -#include +#include "i4b_l2.h" +#include "i4b_l2fsm.h" /*---------------------------------------------------------------------------* * process i frame diff --git a/sys/net/i4b/layer2/i4b_l2.c b/sys/net/i4b/layer2/i4b_l2.c index bad0c53cb9..0cfdf2efa0 100644 --- a/sys/net/i4b/layer2/i4b_l2.c +++ b/sys/net/i4b/layer2/i4b_l2.c @@ -28,14 +28,14 @@ * ------------------------------- * * $FreeBSD: src/sys/i4b/layer2/i4b_l2.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_l2.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_l2.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Fri Jan 12 16:43:31 2001] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq921.h" +#include "use_i4bq921.h" #else #define NI4BQ921 1 #endif @@ -52,19 +52,19 @@ #endif #ifdef __FreeBSD__ -#include +#include #else #include #include #endif -#include -#include -#include -#include +#include "../include/i4b_l1l2.h" +#include "../include/i4b_l2l3.h" +#include "../include/i4b_mbuf.h" +#include "../include/i4b_global.h" -#include -#include +#include "i4b_l2.h" +#include "i4b_l2fsm.h" int i4b_dl_establish_ind(int); int i4b_dl_establish_cnf(int); diff --git a/sys/net/i4b/layer2/i4b_l2fsm.c b/sys/net/i4b/layer2/i4b_l2fsm.c index 0dfdbfc1fb..7f754fbc64 100644 --- a/sys/net/i4b/layer2/i4b_l2fsm.c +++ b/sys/net/i4b/layer2/i4b_l2fsm.c @@ -30,14 +30,14 @@ * $Id: i4b_l2fsm.c,v 1.22 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer2/i4b_l2fsm.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_l2fsm.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_l2fsm.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Tue May 30 15:48:20 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq921.h" +#include "use_i4bq921.h" #else #define NI4BQ921 1 #endif @@ -53,19 +53,19 @@ #endif #ifdef __FreeBSD__ -#include -#include +#include +#include #else #include #include #endif -#include -#include -#include +#include "../include/i4b_global.h" +#include "../include/i4b_l2l3.h" +#include "../include/i4b_mbuf.h" -#include -#include +#include "i4b_l2.h" +#include "i4b_l2fsm.h" l2_softc_t l2_softc[MAXL1UNITS]; diff --git a/sys/net/i4b/layer2/i4b_l2timer.c b/sys/net/i4b/layer2/i4b_l2timer.c index 48f90618c9..9d00b1418c 100644 --- a/sys/net/i4b/layer2/i4b_l2timer.c +++ b/sys/net/i4b/layer2/i4b_l2timer.c @@ -30,14 +30,14 @@ * $Id: i4b_l2timer.c,v 1.20 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer2/i4b_l2timer.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_l2timer.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_l2timer.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Thu Aug 24 12:48:52 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq921.h" +#include "use_i4bq921.h" #else #define NI4BQ921 1 #endif @@ -54,16 +54,16 @@ #endif #ifdef __FreeBSD__ -#include +#include #else #include #include #endif -#include +#include "../include/i4b_global.h" -#include -#include +#include "i4b_l2.h" +#include "i4b_l2fsm.h" /*---------------------------------------------------------------------------* * Q.921 timer T200 timeout function diff --git a/sys/net/i4b/layer2/i4b_lme.c b/sys/net/i4b/layer2/i4b_lme.c index dbc22d1f44..31437107a2 100644 --- a/sys/net/i4b/layer2/i4b_lme.c +++ b/sys/net/i4b/layer2/i4b_lme.c @@ -30,14 +30,14 @@ * $Id: i4b_lme.c,v 1.15 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer2/i4b_lme.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_lme.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_lme.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Mon May 29 16:55:12 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq921.h" +#include "use_i4bq921.h" #else #define NI4BQ921 1 #endif @@ -53,14 +53,14 @@ #endif #ifdef __FreeBSD__ -#include +#include #else #include #include #endif -#include +#include "i4b_l2.h" /*---------------------------------------------------------------------------* * mdl assign indication handler diff --git a/sys/net/i4b/layer2/i4b_mbuf.c b/sys/net/i4b/layer2/i4b_mbuf.c index c14c2f67e4..ba8fd7a3ec 100644 --- a/sys/net/i4b/layer2/i4b_mbuf.c +++ b/sys/net/i4b/layer2/i4b_mbuf.c @@ -28,7 +28,7 @@ * ------------------------------------ * * $FreeBSD: src/sys/i4b/layer2/i4b_mbuf.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_mbuf.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_mbuf.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Sat Jan 13 13:15:45 2001] * @@ -40,7 +40,7 @@ #include #include -#include +#include "../include/i4b_mbuf.h" #define I4B_MBUF_DEBUG #undef I4B_MBUF_TYPE_DEBUG diff --git a/sys/net/i4b/layer2/i4b_sframe.c b/sys/net/i4b/layer2/i4b_sframe.c index 71ed9d2485..e04d7a18b1 100644 --- a/sys/net/i4b/layer2/i4b_sframe.c +++ b/sys/net/i4b/layer2/i4b_sframe.c @@ -30,14 +30,14 @@ * $Id: i4b_sframe.c,v 1.15 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer2/i4b_sframe.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_sframe.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_sframe.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Mon May 29 16:55:23 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq921.h" +#include "use_i4bq921.h" #else #define NI4BQ921 1 #endif @@ -54,17 +54,17 @@ #endif #ifdef __FreeBSD__ -#include +#include #else #include #include #endif -#include -#include +#include "../include/i4b_l1l2.h" +#include "../include/i4b_mbuf.h" -#include -#include +#include "i4b_l2.h" +#include "i4b_l2fsm.h" /*---------------------------------------------------------------------------* * process s frame diff --git a/sys/net/i4b/layer2/i4b_tei.c b/sys/net/i4b/layer2/i4b_tei.c index e079177fcd..51989d78ef 100644 --- a/sys/net/i4b/layer2/i4b_tei.c +++ b/sys/net/i4b/layer2/i4b_tei.c @@ -30,14 +30,14 @@ * $Id: i4b_tei.c,v 1.25 2000/09/01 14:11:51 hm Exp $ * * $FreeBSD: src/sys/i4b/layer2/i4b_tei.c,v 1.6.2.2 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_tei.c,v 1.3 2003/07/26 19:20:32 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_tei.c,v 1.4 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Fri Oct 13 15:56:35 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq921.h" +#include "use_i4bq921.h" #else #define NI4BQ921 1 #endif @@ -55,19 +55,19 @@ #endif #ifdef __FreeBSD__ -#include +#include #else #include #include #endif -#include -#include -#include -#include +#include "../include/i4b_global.h" +#include "../include/i4b_l1l2.h" +#include "../include/i4b_l2l3.h" +#include "../include/i4b_mbuf.h" -#include -#include +#include "i4b_l2.h" +#include "i4b_l2fsm.h" /*---------------------------------------------------------------------------* * handle a received TEI management frame diff --git a/sys/net/i4b/layer2/i4b_uframe.c b/sys/net/i4b/layer2/i4b_uframe.c index d18705c6a5..2078ea0feb 100644 --- a/sys/net/i4b/layer2/i4b_uframe.c +++ b/sys/net/i4b/layer2/i4b_uframe.c @@ -30,14 +30,14 @@ * $Id: i4b_uframe.c,v 1.13 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer2/i4b_uframe.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_uframe.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_uframe.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Mon May 29 16:55:30 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq921.h" +#include "use_i4bq921.h" #else #define NI4BQ921 1 #endif @@ -54,18 +54,18 @@ #endif #ifdef __FreeBSD__ -#include +#include #else #include #include #endif -#include -#include -#include +#include "../include/i4b_l1l2.h" +#include "../include/i4b_l2l3.h" +#include "../include/i4b_mbuf.h" -#include -#include +#include "i4b_l2.h" +#include "i4b_l2fsm.h" /*---------------------------------------------------------------------------* * process a received U-frame diff --git a/sys/net/i4b/layer2/i4b_util.c b/sys/net/i4b/layer2/i4b_util.c index 117b91f035..512ed56401 100644 --- a/sys/net/i4b/layer2/i4b_util.c +++ b/sys/net/i4b/layer2/i4b_util.c @@ -30,14 +30,14 @@ * $Id: i4b_util.c,v 1.26 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer2/i4b_util.c,v 1.6.2.1 2001/08/10 14:08:41 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer2/i4b_util.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer2/i4b_util.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Mon May 29 16:55:35 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq921.h" +#include "use_i4bq921.h" #else #define NI4BQ921 1 #endif @@ -54,17 +54,17 @@ #endif #ifdef __FreeBSD__ -#include +#include #else #include #include #endif -#include -#include -#include +#include "../include/i4b_global.h" +#include "../include/i4b_l1l2.h" +#include "../include/i4b_mbuf.h" -#include +#include "i4b_l2.h" /*---------------------------------------------------------------------------* * routine ESTABLISH DATA LINK (Q.921 03/93 page 83) diff --git a/sys/net/i4b/layer3/i4b_l2if.c b/sys/net/i4b/layer3/i4b_l2if.c index 31f63a87c5..d97658d833 100644 --- a/sys/net/i4b/layer3/i4b_l2if.c +++ b/sys/net/i4b/layer3/i4b_l2if.c @@ -30,31 +30,31 @@ * $Id: i4b_l2if.c,v 1.23 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer3/i4b_l2if.c,v 1.6.2.2 2001/12/16 15:12:58 hm Exp $ - * $DragonFly: src/sys/net/i4b/layer3/i4b_l2if.c,v 1.3 2003/07/26 19:20:33 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer3/i4b_l2if.c,v 1.4 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Mon May 29 16:56:22 2000] * *---------------------------------------------------------------------------*/ -#include "i4bq931.h" +#include "use_i4bq931.h" #if NI4BQ931 > 0 #include #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include +#include "../include/i4b_isdnq931.h" +#include "../include/i4b_l2l3.h" +#include "../include/i4b_l3l4.h" +#include "../include/i4b_mbuf.h" -#include -#include -#include +#include "i4b_l3.h" +#include "i4b_l3fsm.h" +#include "i4b_q931.h" static unsigned char make_q931_cause(cause_t cause); diff --git a/sys/net/i4b/layer3/i4b_l3fsm.c b/sys/net/i4b/layer3/i4b_l3fsm.c index 17f88fcaff..2443dacd83 100644 --- a/sys/net/i4b/layer3/i4b_l3fsm.c +++ b/sys/net/i4b/layer3/i4b_l3fsm.c @@ -30,14 +30,14 @@ * $Id: i4b_l3fsm.c,v 1.22 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer3/i4b_l3fsm.c,v 1.6.2.1 2001/08/10 14:08:42 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer3/i4b_l3fsm.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer3/i4b_l3fsm.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Thu Oct 12 17:58:35 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq931.h" +#include "use_i4bq931.h" #else #define NI4BQ931 1 #endif @@ -52,23 +52,23 @@ #endif #ifdef __FreeBSD__ -#include -#include -#include +#include +#include +#include #else #include #include #include #endif -#include -#include -#include +#include "../include/i4b_l2l3.h" +#include "../include/i4b_l3l4.h" +#include "../include/i4b_global.h" -#include -#include +#include "i4b_l3.h" +#include "i4b_l3fsm.h" -#include +#include "../layer4/i4b_l4.h" static void F_00A(call_desc_t *cd), F_00H(call_desc_t *cd), F_00I(call_desc_t *cd); diff --git a/sys/net/i4b/layer3/i4b_l3timer.c b/sys/net/i4b/layer3/i4b_l3timer.c index b3c3e70240..2507fe5abf 100644 --- a/sys/net/i4b/layer3/i4b_l3timer.c +++ b/sys/net/i4b/layer3/i4b_l3timer.c @@ -30,14 +30,14 @@ * $Id: i4b_l3timer.c,v 1.17 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer3/i4b_l3timer.c,v 1.6.2.1 2001/08/10 14:08:42 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer3/i4b_l3timer.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer3/i4b_l3timer.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Thu Aug 24 12:49:50 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq931.h" +#include "use_i4bq931.h" #else #define NI4BQ931 1 #endif @@ -53,18 +53,18 @@ #endif #ifdef __FreeBSD__ -#include -#include +#include +#include #else #include #include #endif -#include -#include +#include "../include/i4b_global.h" +#include "../include/i4b_l3l4.h" -#include -#include +#include "i4b_l3.h" +#include "i4b_l3fsm.h" /*---------------------------------------------------------------------------* diff --git a/sys/net/i4b/layer3/i4b_l4if.c b/sys/net/i4b/layer3/i4b_l4if.c index a85a13d627..b0e6130589 100644 --- a/sys/net/i4b/layer3/i4b_l4if.c +++ b/sys/net/i4b/layer3/i4b_l4if.c @@ -30,14 +30,14 @@ * $Id: i4b_l4if.c,v 1.27 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer3/i4b_l4if.c,v 1.6.2.1 2001/08/10 14:08:42 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer3/i4b_l4if.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer3/i4b_l4if.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Fri Jun 2 14:32:19 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq931.h" +#include "use_i4bq931.h" #else #define NI4BQ931 1 #endif @@ -52,23 +52,23 @@ #endif #ifdef __FreeBSD__ -#include -#include -#include +#include +#include +#include #else #include #include #include #endif -#include -#include -#include +#include "../include/i4b_l2l3.h" +#include "../include/i4b_l3l4.h" +#include "../include/i4b_global.h" -#include -#include +#include "i4b_l3.h" +#include "i4b_l3fsm.h" -#include +#include "../layer4/i4b_l4.h" extern void isic_settrace(int unit, int val); /*XXX*/ extern int isic_gettrace(int unit); /*XXX*/ diff --git a/sys/net/i4b/layer3/i4b_q931.c b/sys/net/i4b/layer3/i4b_q931.c index 546374afce..27af527a8f 100644 --- a/sys/net/i4b/layer3/i4b_q931.c +++ b/sys/net/i4b/layer3/i4b_q931.c @@ -30,14 +30,14 @@ * $Id: i4b_q931.c,v 1.32 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer3/i4b_q931.c,v 1.6.2.1 2001/08/10 14:08:42 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer3/i4b_q931.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer3/i4b_q931.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Mon May 29 16:56:52 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq931.h" +#include "use_i4bq931.h" #else #define NI4BQ931 1 #endif @@ -53,24 +53,24 @@ #endif #ifdef __FreeBSD__ -#include -#include -#include +#include +#include +#include #else #include #include #include #endif -#include -#include -#include +#include "../include/i4b_isdnq931.h" +#include "../include/i4b_l3l4.h" +#include "../include/i4b_global.h" -#include -#include -#include +#include "i4b_l3.h" +#include "i4b_l3fsm.h" +#include "i4b_q931.h" -#include +#include "../layer4/i4b_l4.h" #ifndef __FreeBSD__ #define memcpy(d,s,l) bcopy(s,d,l) diff --git a/sys/net/i4b/layer3/i4b_q932fac.c b/sys/net/i4b/layer3/i4b_q932fac.c index 1d681d4f95..4bf185e01a 100644 --- a/sys/net/i4b/layer3/i4b_q932fac.c +++ b/sys/net/i4b/layer3/i4b_q932fac.c @@ -30,14 +30,14 @@ * $Id: i4b_q932fac.c,v 1.11 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer3/i4b_q932fac.c,v 1.6.2.1 2001/08/10 14:08:42 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer3/i4b_q932fac.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer3/i4b_q932fac.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Mon May 29 16:57:04 2000] * *---------------------------------------------------------------------------*/ #ifdef __FreeBSD__ -#include "i4bq931.h" +#include "use_i4bq931.h" #else #define NI4BQ931 1 #endif @@ -52,17 +52,17 @@ #endif #ifdef __FreeBSD__ -#include -#include +#include +#include #else #include #include #endif -#include +#include "../include/i4b_l3l4.h" -#include -#include +#include "i4b_l3.h" +#include "i4b_q932fac.h" static int do_component(int length); diff --git a/sys/net/i4b/layer4/i4b_i4bdrv.c b/sys/net/i4b/layer4/i4b_i4bdrv.c index b4fda927b3..42a1295d76 100644 --- a/sys/net/i4b/layer4/i4b_i4bdrv.c +++ b/sys/net/i4b/layer4/i4b_i4bdrv.c @@ -28,15 +28,15 @@ * -------------------------------------------- * * $FreeBSD: src/sys/i4b/layer4/i4b_i4bdrv.c,v 1.11.2.5 2001/12/16 15:12:59 hm Exp $ - * $DragonFly: src/sys/net/i4b/layer4/i4b_i4bdrv.c,v 1.5 2003/07/21 07:57:47 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer4/i4b_i4bdrv.c,v 1.6 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Sat Aug 11 18:08:10 2001] * *---------------------------------------------------------------------------*/ -#include "i4b.h" -#include "i4bipr.h" -#include "i4btel.h" +#include "use_i4b.h" +#include "use_i4bipr.h" +#include "use_i4btel.h" #if NI4B > 1 #error "only 1 (one) i4b device possible!" @@ -71,14 +71,14 @@ #endif #if defined(__FreeBSD__) -#include "i4bing.h" +#include "use_i4bing.h" #endif #ifdef __bsdi__ #include "ibc.h" #else #ifdef __FreeBSD__ -#include "i4bisppp.h" +#include "use_i4bisppp.h" #else #include #endif @@ -97,20 +97,20 @@ #endif /* __FreeBSD__*/ #ifdef __FreeBSD__ -#include -#include -#include +#include +#include +#include #else #include #include #include #endif -#include -#include -#include +#include "../include/i4b_l3l4.h" +#include "../include/i4b_mbuf.h" +#include "../include/i4b_global.h" -#include +#include "i4b_l4.h" #ifdef OS_USES_POLL #include diff --git a/sys/net/i4b/layer4/i4b_l4.c b/sys/net/i4b/layer4/i4b_l4.c index 6b5442cc58..00d4770c22 100644 --- a/sys/net/i4b/layer4/i4b_l4.c +++ b/sys/net/i4b/layer4/i4b_l4.c @@ -30,14 +30,14 @@ * $Id: i4b_l4.c,v 1.54 2000/08/28 07:24:59 hm Exp $ * * $FreeBSD: src/sys/i4b/layer4/i4b_l4.c,v 1.6.2.2 2001/12/16 15:12:59 hm Exp $ - * $DragonFly: src/sys/net/i4b/layer4/i4b_l4.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer4/i4b_l4.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Sun Aug 27 14:53:42 2000] * *---------------------------------------------------------------------------*/ -#include "i4b.h" -#include "i4bipr.h" +#include "use_i4b.h" +#include "use_i4bipr.h" #if NI4B > 0 @@ -55,33 +55,33 @@ #endif #if defined(__FreeBSD__) -#include "i4bing.h" +#include "use_i4bing.h" #endif #ifdef __bsdi__ #define NI4BISPPP 0 #include "ibc.h" #else -#include "i4bisppp.h" +#include "use_i4bisppp.h" #endif -#include "i4brbch.h" -#include "i4btel.h" +#include "use_i4brbch.h" +#include "use_i4btel.h" #ifdef __FreeBSD__ -#include -#include -#include +#include +#include +#include #else #include #include #include #endif -#include -#include -#include -#include +#include "../include/i4b_global.h" +#include "../include/i4b_l3l4.h" +#include "../include/i4b_mbuf.h" +#include "i4b_l4.h" #if !defined(__FreeBSD__) && !defined(__NetBSD__) #define memcpy(dst, src, len) bcopy((src), (dst), (len)) diff --git a/sys/net/i4b/layer4/i4b_l4mgmt.c b/sys/net/i4b/layer4/i4b_l4mgmt.c index 7c2c338b71..6592a3e54e 100644 --- a/sys/net/i4b/layer4/i4b_l4mgmt.c +++ b/sys/net/i4b/layer4/i4b_l4mgmt.c @@ -30,13 +30,13 @@ * $Id: i4b_l4mgmt.c,v 1.34 2000/09/01 14:11:51 hm Exp $ * * $FreeBSD: src/sys/i4b/layer4/i4b_l4mgmt.c,v 1.6.2.2 2001/08/10 14:08:43 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer4/i4b_l4mgmt.c,v 1.3 2003/07/26 19:20:33 rob Exp $ + * $DragonFly: src/sys/net/i4b/layer4/i4b_l4mgmt.c,v 1.4 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Fri Oct 13 15:58:34 2000] * *---------------------------------------------------------------------------*/ -#include "i4b.h" +#include "use_i4b.h" #if NI4B > 0 @@ -49,17 +49,17 @@ #endif #ifdef __FreeBSD__ -#include -#include +#include +#include #else #include #include #endif -#include -#include +#include "../include/i4b_l3l4.h" +#include "../include/i4b_global.h" -#include +#include "i4b_l4.h" call_desc_t call_desc[N_CALL_DESC]; /* call descriptor array */ diff --git a/sys/net/i4b/layer4/i4b_l4timer.c b/sys/net/i4b/layer4/i4b_l4timer.c index b30c474358..50f538c8de 100644 --- a/sys/net/i4b/layer4/i4b_l4timer.c +++ b/sys/net/i4b/layer4/i4b_l4timer.c @@ -30,13 +30,13 @@ * $Id: i4b_l4timer.c,v 1.18 2000/08/24 11:48:58 hm Exp $ * * $FreeBSD: src/sys/i4b/layer4/i4b_l4timer.c,v 1.6.2.1 2001/08/10 14:08:43 obrien Exp $ - * $DragonFly: src/sys/net/i4b/layer4/i4b_l4timer.c,v 1.2 2003/06/17 04:28:40 dillon Exp $ + * $DragonFly: src/sys/net/i4b/layer4/i4b_l4timer.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ * * last edit-date: [Thu Aug 24 12:50:17 2000] * *---------------------------------------------------------------------------*/ -#include "i4b.h" +#include "use_i4b.h" #if NI4B > 0 @@ -49,17 +49,17 @@ #endif #ifdef __FreeBSD__ -#include -#include +#include +#include #else #include #include #endif -#include -#include +#include "../include/i4b_global.h" +#include "../include/i4b_l3l4.h" -#include +#include "i4b_l4.h" /*---------------------------------------------------------------------------* * timer T400 timeout function diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 872cda7181..0b7696a87a 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -32,7 +32,7 @@ * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.70.2.33 2003/04/28 15:45:53 archie Exp $ - * $DragonFly: src/sys/net/if_ethersubr.c,v 1.4 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/if_ethersubr.c,v 1.5 2003/08/07 21:17:24 dillon Exp $ */ #include "opt_atalk.h" @@ -59,14 +59,14 @@ #include #include #include -#include +#include #if defined(INET) || defined(INET6) #include #include #include -#include -#include +#include +#include #endif #ifdef INET6 #include diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c index 796016fd79..4b674f7214 100644 --- a/sys/net/if_iso88025subr.c +++ b/sys/net/if_iso88025subr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.7.2.7 2002/06/18 00:15:31 kbyanc Exp $ - * $DragonFly: src/sys/net/Attic/if_iso88025subr.c,v 1.3 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/Attic/if_iso88025subr.c,v 1.4 2003/08/07 21:17:24 dillon Exp $ * */ @@ -74,7 +74,7 @@ #include #include -#include +#include #include #include diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c index 8d464520ac..b7c51356dd 100644 --- a/sys/net/if_loop.c +++ b/sys/net/if_loop.c @@ -32,13 +32,13 @@ * * @(#)if_loop.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/net/if_loop.c,v 1.47.2.8 2003/06/01 01:46:11 silby Exp $ - * $DragonFly: src/sys/net/if_loop.c,v 1.3 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/if_loop.c,v 1.4 2003/08/07 21:17:24 dillon Exp $ */ /* * Loopback interface driver for protocol testing and timing. */ -#include "loop.h" +#include "use_loop.h" #include "opt_atalk.h" #include "opt_inet.h" diff --git a/sys/net/intrq.c b/sys/net/intrq.c index b34f24f0fa..2ddb6b131d 100644 --- a/sys/net/intrq.c +++ b/sys/net/intrq.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/intrq.c,v 1.3 2000/01/29 16:13:08 peter Exp $ - * $DragonFly: src/sys/net/Attic/intrq.c,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * $DragonFly: src/sys/net/Attic/intrq.c,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ #include @@ -39,7 +39,7 @@ #include #ifdef __i386__ -#include /* XXX overkill, fixme! */ +#include /* XXX overkill, fixme! */ #endif /* diff --git a/sys/net/ip6fw/ip6_fw.c b/sys/net/ip6fw/ip6_fw.c index 12b34f522b..7c25f55358 100644 --- a/sys/net/ip6fw/ip6_fw.c +++ b/sys/net/ip6fw/ip6_fw.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6_fw.c,v 1.2.2.9 2002/04/28 05:40:27 suz Exp $ */ -/* $DragonFly: src/sys/net/ip6fw/ip6_fw.c,v 1.3 2003/07/29 12:51:30 hmp Exp $ */ +/* $DragonFly: src/sys/net/ip6fw/ip6_fw.c,v 1.4 2003/08/07 21:17:29 dillon Exp $ */ /* $KAME: ip6_fw.c,v 1.21 2001/01/24 01:25:32 itojun Exp $ */ /* @@ -86,7 +86,7 @@ #include -#include +#include "ip6_fw.h" #include #include #include diff --git a/sys/net/ip_mroute/ip_mroute.c b/sys/net/ip_mroute/ip_mroute.c index 229b2240ae..fa7447c96f 100644 --- a/sys/net/ip_mroute/ip_mroute.c +++ b/sys/net/ip_mroute/ip_mroute.c @@ -10,7 +10,7 @@ * * MROUTING Revision: 3.5 * $FreeBSD: src/sys/netinet/ip_mroute.c,v 1.56.2.7 2003/01/23 21:06:45 sam Exp $ - * $DragonFly: src/sys/net/ip_mroute/ip_mroute.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ + * $DragonFly: src/sys/net/ip_mroute/ip_mroute.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ */ #include "opt_mrouting.h" @@ -35,7 +35,7 @@ #include #include #include -#include +#include "ip_mroute.h" #include #include #include diff --git a/sys/net/ipfw/ip_fw.c b/sys/net/ipfw/ip_fw.c index 56f4dbac29..b4a6f09302 100644 --- a/sys/net/ipfw/ip_fw.c +++ b/sys/net/ipfw/ip_fw.c @@ -14,7 +14,7 @@ * This software is provided ``AS IS'' without any warranties of any kind. * * $FreeBSD: src/sys/netinet/ip_fw.c,v 1.131.2.39 2003/01/20 02:23:07 iedowse Exp $ - * $DragonFly: src/sys/net/ipfw/Attic/ip_fw.c,v 1.4 2003/07/29 12:51:30 hmp Exp $ + * $DragonFly: src/sys/net/ipfw/Attic/ip_fw.c,v 1.5 2003/08/07 21:17:29 dillon Exp $ */ #define DEB(x) @@ -56,8 +56,8 @@ #include #include #include -#include -#include +#include "ip_fw.h" +#include #include #include #include diff --git a/sys/net/ipfw/ip_fw.h b/sys/net/ipfw/ip_fw.h index 28725e78ca..aaf8cf9a15 100644 --- a/sys/net/ipfw/ip_fw.h +++ b/sys/net/ipfw/ip_fw.h @@ -12,14 +12,14 @@ * This software is provided ``AS IS'' without any warranties of any kind. * * $FreeBSD: src/sys/netinet/ip_fw.h,v 1.47.2.11 2002/07/09 09:11:42 luigi Exp $ - * $DragonFly: src/sys/net/ipfw/ip_fw.h,v 1.2 2003/06/17 04:28:51 dillon Exp $ + * $DragonFly: src/sys/net/ipfw/ip_fw.h,v 1.3 2003/08/07 21:17:29 dillon Exp $ */ #ifndef _IP_FW_H #define _IP_FW_H #if IPFW2 -#include +#include "ip_fw2.h" #else /* !IPFW2, good old ipfw */ #include diff --git a/sys/net/ipfw/ip_fw2.c b/sys/net/ipfw/ip_fw2.c index c1abc179ea..415ac3c170 100644 --- a/sys/net/ipfw/ip_fw2.c +++ b/sys/net/ipfw/ip_fw2.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netinet/ip_fw2.c,v 1.6.2.12 2003/04/08 10:42:32 maxim Exp $ - * $DragonFly: src/sys/net/ipfw/ip_fw2.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ + * $DragonFly: src/sys/net/ipfw/ip_fw2.c,v 1.3 2003/08/07 21:17:29 dillon Exp $ */ #define DEB(x) @@ -64,7 +64,7 @@ #include #include #include -#include +#include "ip_fw.h" #include #include #include diff --git a/sys/net/net_osdep.h b/sys/net/net_osdep.h index ce28b294b6..a0a965ef4e 100644 --- a/sys/net/net_osdep.h +++ b/sys/net/net_osdep.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/net_osdep.h,v 1.1.2.3 2002/04/28 05:40:25 suz Exp $ */ -/* $DragonFly: src/sys/net/net_osdep.h,v 1.2 2003/06/17 04:28:48 dillon Exp $ */ +/* $DragonFly: src/sys/net/net_osdep.h,v 1.3 2003/08/07 21:17:24 dillon Exp $ */ /* $KAME: net_osdep.h,v 1.68 2001/12/21 08:14:58 itojun Exp $ */ /* @@ -208,10 +208,10 @@ * * - number of bpf pseudo devices * others: bpfilter.h, NBPFILTER - * FreeBSD4: bpf.h, NBPF + * FreeBSD4: use_bpf.h, NBPF * solution: * #if defined(__FreeBSD__) && __FreeBSD__ >= 4 - * #include "bpf.h" + * #include "use_bpf.h" * #define NBPFILTER NBPF * #else * #include "bpfilter.h" diff --git a/sys/net/oldbridge/bridge.c b/sys/net/oldbridge/bridge.c index dcf8f62dba..18c6ac8659 100644 --- a/sys/net/oldbridge/bridge.c +++ b/sys/net/oldbridge/bridge.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/bridge.c,v 1.16.2.25 2003/01/23 21:06:44 sam Exp $ - * $DragonFly: src/sys/net/oldbridge/Attic/bridge.c,v 1.3 2003/07/29 12:51:29 hmp Exp $ + * $DragonFly: src/sys/net/oldbridge/Attic/bridge.c,v 1.4 2003/08/07 21:17:24 dillon Exp $ */ /* @@ -111,7 +111,7 @@ #include #include #include -#include +#include "bridge.h" /*--------------------*/ diff --git a/sys/net/ppp/if_ppp.c b/sys/net/ppp/if_ppp.c index 859a9885bf..2d4ba92f69 100644 --- a/sys/net/ppp/if_ppp.c +++ b/sys/net/ppp/if_ppp.c @@ -70,11 +70,11 @@ */ /* $FreeBSD: src/sys/net/if_ppp.c,v 1.67.2.4 2002/04/14 21:41:48 luigi Exp $ */ -/* $DragonFly: src/sys/net/ppp/if_ppp.c,v 1.5 2003/07/26 20:19:33 rob Exp $ */ +/* $DragonFly: src/sys/net/ppp/if_ppp.c,v 1.6 2003/08/07 21:17:30 dillon Exp $ */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ /* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */ -#include "ppp.h" +#include "use_ppp.h" #include "opt_inet.h" #include "opt_ipx.h" @@ -117,8 +117,8 @@ #include #endif -#include -#include +#include "if_ppp.h" +#include "if_pppvar.h" /* minimise diffs */ #ifndef splsoftnet @@ -127,7 +127,7 @@ #ifdef PPP_COMPRESS #define PACKETPTR struct mbuf * -#include +#include #endif struct ppp_softc ppp_softc[NPPP]; diff --git a/sys/net/ppp/if_ppp.h b/sys/net/ppp/if_ppp.h index 39b751f3ef..282bbe57c4 100644 --- a/sys/net/ppp/if_ppp.h +++ b/sys/net/ppp/if_ppp.h @@ -17,14 +17,14 @@ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * $FreeBSD: src/sys/net/if_ppp.h,v 1.14 1999/08/28 00:48:20 peter Exp $ - * $DragonFly: src/sys/net/ppp/if_ppp.h,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * $DragonFly: src/sys/net/ppp/if_ppp.h,v 1.3 2003/08/07 21:17:30 dillon Exp $ */ #ifndef _IF_PPP_H_ #define _IF_PPP_H_ /* XXX this used to be self-contained. */ -#include +#include #include /* diff --git a/sys/net/ppp_layer/ppp_deflate.c b/sys/net/ppp_layer/ppp_deflate.c index 59b3b93e53..0ede12b736 100644 --- a/sys/net/ppp_layer/ppp_deflate.c +++ b/sys/net/ppp_layer/ppp_deflate.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/ppp_deflate.c,v 1.12.2.1 2002/04/14 21:41:48 luigi Exp $ */ -/* $DragonFly: src/sys/net/ppp_layer/ppp_deflate.c,v 1.2 2003/06/17 04:28:48 dillon Exp $ */ +/* $DragonFly: src/sys/net/ppp_layer/ppp_deflate.c,v 1.3 2003/08/07 21:17:30 dillon Exp $ */ /* * ppp_deflate.c - interface the zlib procedures for Deflate compression @@ -34,11 +34,11 @@ #include #include #include -#include +#include "ppp_defs.h" #include #define PACKETPTR struct mbuf * -#include +#include "ppp_comp.h" #if DO_DEFLATE diff --git a/sys/net/ppp_layer/ppp_tty.c b/sys/net/ppp_layer/ppp_tty.c index 2565070be4..3637374465 100644 --- a/sys/net/ppp_layer/ppp_tty.c +++ b/sys/net/ppp_layer/ppp_tty.c @@ -71,7 +71,7 @@ */ /* $FreeBSD: src/sys/net/ppp_tty.c,v 1.43.2.1 2002/02/13 00:43:11 dillon Exp $ */ -/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.6 2003/07/26 20:19:33 rob Exp $ */ +/* $DragonFly: src/sys/net/ppp_layer/ppp_tty.c,v 1.7 2003/08/07 21:17:30 dillon Exp $ */ #include "opt_ppp.h" /* XXX for ppp_defs.h */ @@ -96,8 +96,8 @@ #ifdef PPP_FILTER #include #endif -#include -#include +#include +#include static int pppopen __P((dev_t dev, struct tty *tp)); static int pppclose __P((struct tty *tp, int flag)); diff --git a/sys/net/route.c b/sys/net/route.c index c88ba0dfba..eed2c5ed48 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -32,7 +32,7 @@ * * @(#)route.c 8.3 (Berkeley) 1/9/95 * $FreeBSD: src/sys/net/route.c,v 1.59.2.10 2003/01/17 08:04:00 ru Exp $ - * $DragonFly: src/sys/net/route.c,v 1.4 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/route.c,v 1.5 2003/08/07 21:17:24 dillon Exp $ */ #include "opt_inet.h" @@ -49,7 +49,7 @@ #include #include -#include +#include #define SA(p) ((struct sockaddr *)(p)) diff --git a/sys/net/sl/if_sl.c b/sys/net/sl/if_sl.c index b91ea8be11..8b7a8d0e85 100644 --- a/sys/net/sl/if_sl.c +++ b/sys/net/sl/if_sl.c @@ -32,7 +32,7 @@ * * @(#)if_sl.c 8.6 (Berkeley) 2/1/94 * $FreeBSD: src/sys/net/if_sl.c,v 1.84.2.2 2002/02/13 00:43:10 dillon Exp $ - * $DragonFly: src/sys/net/sl/if_sl.c,v 1.6 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/sl/if_sl.c,v 1.7 2003/08/07 21:17:30 dillon Exp $ */ /* @@ -66,7 +66,7 @@ * interrupts and network activity; thus, splimp must be >= spltty. */ -#include "sl.h" +#include "use_sl.h" #include "opt_inet.h" #if !defined(KLD_MODULE) @@ -101,7 +101,7 @@ #endif #include -#include +#include "if_slvar.h" #include #include diff --git a/sys/net/sppp/if_spppsubr.c b/sys/net/sppp/if_spppsubr.c index 594a3b43a1..f6381e5c28 100644 --- a/sys/net/sppp/if_spppsubr.c +++ b/sys/net/sppp/if_spppsubr.c @@ -18,7 +18,7 @@ * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997 * * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.59.2.13 2002/07/03 15:44:41 joerg Exp $ - * $DragonFly: src/sys/net/sppp/if_spppsubr.c,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * $DragonFly: src/sys/net/sppp/if_spppsubr.c,v 1.3 2003/08/07 21:17:30 dillon Exp $ */ #include @@ -95,7 +95,7 @@ #include #endif -#include +#include "if_sppp.h" #if defined(__FreeBSD__) && __FreeBSD__ >= 3 # define UNTIMEOUT(fun, arg, handle) untimeout(fun, arg, handle) diff --git a/sys/net/stf/if_stf.c b/sys/net/stf/if_stf.c index ed28744d48..490ceb57ed 100644 --- a/sys/net/stf/if_stf.c +++ b/sys/net/stf/if_stf.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/net/if_stf.c,v 1.1.2.11 2003/01/23 21:06:44 sam Exp $ */ -/* $DragonFly: src/sys/net/stf/if_stf.c,v 1.3 2003/07/23 02:30:21 dillon Exp $ */ +/* $DragonFly: src/sys/net/stf/if_stf.c,v 1.4 2003/08/07 21:17:30 dillon Exp $ */ /* $KAME: if_stf.c,v 1.73 2001/12/03 11:08:30 keiichi Exp $ */ /* @@ -94,7 +94,7 @@ #include #include #include -#include +#include "if_stf.h" #include #include diff --git a/sys/net/tap/if_tap.c b/sys/net/tap/if_tap.c index d241daac8c..b4e02ba77e 100644 --- a/sys/net/tap/if_tap.c +++ b/sys/net/tap/if_tap.c @@ -32,7 +32,7 @@ /* * $FreeBSD: src/sys/net/if_tap.c,v 1.3.2.3 2002/04/14 21:41:48 luigi Exp $ - * $DragonFly: src/sys/net/tap/if_tap.c,v 1.6 2003/07/21 05:50:43 dillon Exp $ + * $DragonFly: src/sys/net/tap/if_tap.c,v 1.7 2003/08/07 21:17:30 dillon Exp $ * $Id: if_tap.c,v 0.21 2000/07/23 21:46:02 max Exp $ */ @@ -64,8 +64,8 @@ #include -#include -#include +#include "if_tapvar.h" +#include "if_tap.h" #define CDEV_NAME "tap" diff --git a/sys/net/tun/if_tun.c b/sys/net/tun/if_tun.c index e5ec7447c5..e97666298f 100644 --- a/sys/net/tun/if_tun.c +++ b/sys/net/tun/if_tun.c @@ -14,7 +14,7 @@ * operation though. * * $FreeBSD: src/sys/net/if_tun.c,v 1.74.2.8 2002/02/13 00:43:11 dillon Exp $ - * $DragonFly: src/sys/net/tun/if_tun.c,v 1.7 2003/07/26 20:19:33 rob Exp $ + * $DragonFly: src/sys/net/tun/if_tun.c,v 1.8 2003/08/07 21:17:30 dillon Exp $ */ #include "opt_inet.h" @@ -48,8 +48,8 @@ #include -#include -#include +#include "if_tunvar.h" +#include "if_tun.h" static MALLOC_DEFINE(M_TUN, "tun", "Tunnel Interface"); diff --git a/sys/net/vlan/if_vlan.c b/sys/net/vlan/if_vlan.c index 2fbc36bcc3..56c51bbba2 100644 --- a/sys/net/vlan/if_vlan.c +++ b/sys/net/vlan/if_vlan.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_vlan.c,v 1.15.2.13 2003/02/14 22:25:58 fenner Exp $ - * $DragonFly: src/sys/net/vlan/if_vlan.c,v 1.3 2003/07/23 02:30:21 dillon Exp $ + * $DragonFly: src/sys/net/vlan/if_vlan.c,v 1.4 2003/08/07 21:17:30 dillon Exp $ */ /* @@ -56,7 +56,7 @@ */ #ifndef NVLAN -#include "vlan.h" +#include "use_vlan.h" #endif #include "opt_inet.h" @@ -79,7 +79,7 @@ #include #include #include -#include +#include "if_vlan_var.h" #ifdef INET #include diff --git a/sys/netgraph/UI/ng_UI.c b/sys/netgraph/UI/ng_UI.c index b400c08081..35b668cdeb 100644 --- a/sys/netgraph/UI/ng_UI.c +++ b/sys/netgraph/UI/ng_UI.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_UI.c,v 1.6.2.2 2000/10/24 18:36:44 julian Exp $ - * $DragonFly: src/sys/netgraph/UI/ng_UI.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * $DragonFly: src/sys/netgraph/UI/ng_UI.c,v 1.3 2003/08/07 21:17:30 dillon Exp $ * $Whistle: ng_UI.c,v 1.14 1999/11/01 09:24:51 julian Exp $ */ @@ -52,7 +52,7 @@ #include #include -#include +#include "ng_UI.h" /* * DEFINITIONS diff --git a/sys/netgraph/async/ng_async.c b/sys/netgraph/async/ng_async.c index a5695acc84..15a9b47991 100644 --- a/sys/netgraph/async/ng_async.c +++ b/sys/netgraph/async/ng_async.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_async.c,v 1.6.2.5 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/async/ng_async.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * $DragonFly: src/sys/netgraph/async/ng_async.c,v 1.3 2003/08/07 21:17:30 dillon Exp $ * $Whistle: ng_async.c,v 1.17 1999/11/01 09:24:51 julian Exp $ */ @@ -55,7 +55,7 @@ #include #include -#include +#include "ng_async.h" #include #include diff --git a/sys/netgraph/bpf/ng_bpf.c b/sys/netgraph/bpf/ng_bpf.c index 6c17e6d769..0d487a46b3 100644 --- a/sys/netgraph/bpf/ng_bpf.c +++ b/sys/netgraph/bpf/ng_bpf.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_bpf.c,v 1.2.4.4 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/bpf/ng_bpf.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * $DragonFly: src/sys/netgraph/bpf/ng_bpf.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ * $Whistle: ng_bpf.c,v 1.3 1999/12/03 20:30:23 archie Exp $ */ @@ -66,7 +66,7 @@ #include #include #include -#include +#include "ng_bpf.h" #define OFFSETOF(s, e) ((char *)&((s *)0)->e - (char *)((s *)0)) diff --git a/sys/netgraph/bridge/ng_bridge.c b/sys/netgraph/bridge/ng_bridge.c index 9d3350f256..0825942564 100644 --- a/sys/netgraph/bridge/ng_bridge.c +++ b/sys/netgraph/bridge/ng_bridge.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_bridge.c,v 1.1.2.5 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/bridge/ng_bridge.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * $DragonFly: src/sys/netgraph/bridge/ng_bridge.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ */ /* @@ -77,7 +77,7 @@ #include #include #include -#include +#include "ng_bridge.h" #include /* Per-link private data */ diff --git a/sys/netgraph/cisco/ng_cisco.c b/sys/netgraph/cisco/ng_cisco.c index a738988875..66ce53e2ed 100644 --- a/sys/netgraph/cisco/ng_cisco.c +++ b/sys/netgraph/cisco/ng_cisco.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_cisco.c,v 1.4.2.6 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/cisco/ng_cisco.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * $DragonFly: src/sys/netgraph/cisco/ng_cisco.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ * $Whistle: ng_cisco.c,v 1.25 1999/11/01 09:24:51 julian Exp $ */ @@ -63,7 +63,7 @@ #include #include #include -#include +#include "ng_cisco.h" #define CISCO_MULTICAST 0x8f /* Cisco multicast address */ #define CISCO_UNICAST 0x0f /* Cisco unicast address */ diff --git a/sys/netgraph/echo/ng_echo.c b/sys/netgraph/echo/ng_echo.c index d3978ac1b5..88a62ed5d3 100644 --- a/sys/netgraph/echo/ng_echo.c +++ b/sys/netgraph/echo/ng_echo.c @@ -37,7 +37,7 @@ * Author: Julian Elisher * * $FreeBSD: src/sys/netgraph/ng_echo.c,v 1.4.2.1 2000/10/24 18:36:44 julian Exp $ - * $DragonFly: src/sys/netgraph/echo/ng_echo.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * $DragonFly: src/sys/netgraph/echo/ng_echo.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ * $Whistle: ng_echo.c,v 1.13 1999/11/01 09:24:51 julian Exp $ */ @@ -53,7 +53,7 @@ #include #include #include -#include +#include "ng_echo.h" /* Netgraph methods */ static ng_rcvmsg_t nge_rcvmsg; diff --git a/sys/netgraph/eiface/ng_eiface.c b/sys/netgraph/eiface/ng_eiface.c index 2f4746b945..03d05b11b2 100644 --- a/sys/netgraph/eiface/ng_eiface.c +++ b/sys/netgraph/eiface/ng_eiface.c @@ -28,7 +28,7 @@ * * $Id: ng_eiface.c,v 1.14 2000/03/15 12:28:44 vitaly Exp $ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.4.2.5 2002/12/17 21:47:48 julian Exp $ - * $DragonFly: src/sys/netgraph/eiface/ng_eiface.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * $DragonFly: src/sys/netgraph/eiface/ng_eiface.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ */ #include @@ -50,7 +50,7 @@ #include #include #include -#include +#include "ng_eiface.h" #include #include diff --git a/sys/netgraph/etf/ng_etf.c b/sys/netgraph/etf/ng_etf.c index d1a3593ce9..9565da02ff 100644 --- a/sys/netgraph/etf/ng_etf.c +++ b/sys/netgraph/etf/ng_etf.c @@ -29,7 +29,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_etf.c,v 1.1.2.2 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/etf/ng_etf.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * $DragonFly: src/sys/netgraph/etf/ng_etf.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ */ #include @@ -46,7 +46,7 @@ #include #include -#include +#include "ng_etf.h" #include /* If you do complicated mallocs you may want to do this */ diff --git a/sys/netgraph/ether/ng_ether.c b/sys/netgraph/ether/ng_ether.c index 8cecce4e9b..2220f23382 100644 --- a/sys/netgraph/ether/ng_ether.c +++ b/sys/netgraph/ether/ng_ether.c @@ -38,7 +38,7 @@ * Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.2.2.13 2002/07/02 20:10:25 archie Exp $ - * $DragonFly: src/sys/netgraph/ether/ng_ether.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * $DragonFly: src/sys/netgraph/ether/ng_ether.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ */ /* @@ -63,7 +63,7 @@ #include #include #include -#include +#include "ng_ether.h" #define IFP2AC(IFP) ((struct arpcom *)IFP) #define IFP2NG(ifp) ((struct ng_node *)((struct arpcom *)(ifp))->ac_netgraph) diff --git a/sys/netgraph/fec/ng_fec.c b/sys/netgraph/fec/ng_fec.c index 631efd4cdc..3de14a4a97 100644 --- a/sys/netgraph/fec/ng_fec.c +++ b/sys/netgraph/fec/ng_fec.c @@ -33,7 +33,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/netgraph/ng_fec.c,v 1.1.2.1 2002/11/01 21:39:31 julian Exp $ - * $DragonFly: src/sys/netgraph/fec/ng_fec.c,v 1.2 2003/06/17 04:28:50 dillon Exp $ + * $DragonFly: src/sys/netgraph/fec/ng_fec.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ */ /* * Copyright (c) 1996-1999 Whistle Communications, Inc. @@ -125,7 +125,7 @@ #include #include #include -#include +#include "ng_fec.h" #define IFP2NG(ifp) ((struct ng_node *)((struct arpcom *)(ifp))->ac_netgraph) #define FEC_INC(x, y) (x) = (x + 1) % y diff --git a/sys/netgraph/frame_relay/ng_frame_relay.c b/sys/netgraph/frame_relay/ng_frame_relay.c index 16efa826b7..1c5e692fcd 100644 --- a/sys/netgraph/frame_relay/ng_frame_relay.c +++ b/sys/netgraph/frame_relay/ng_frame_relay.c @@ -37,7 +37,7 @@ * Author: Julian Elisher * * $FreeBSD: src/sys/netgraph/ng_frame_relay.c,v 1.9.2.2 2000/10/24 18:36:45 julian Exp $ - * $DragonFly: src/sys/netgraph/frame_relay/ng_frame_relay.c,v 1.2 2003/06/17 04:28:50 dillon Exp $ + * $DragonFly: src/sys/netgraph/frame_relay/ng_frame_relay.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ * $Whistle: ng_frame_relay.c,v 1.20 1999/11/01 09:24:51 julian Exp $ */ @@ -62,7 +62,7 @@ #include #include -#include +#include "ng_frame_relay.h" /* * Line info, and status per channel. diff --git a/sys/netgraph/hole/ng_hole.c b/sys/netgraph/hole/ng_hole.c index f55ad34d2c..2ea503ca16 100644 --- a/sys/netgraph/hole/ng_hole.c +++ b/sys/netgraph/hole/ng_hole.c @@ -37,7 +37,7 @@ * Author: Julian Elisher * * $FreeBSD: src/sys/netgraph/ng_hole.c,v 1.4.2.1 2000/10/24 18:36:45 julian Exp $ - * $DragonFly: src/sys/netgraph/hole/ng_hole.c,v 1.2 2003/06/17 04:28:50 dillon Exp $ + * $DragonFly: src/sys/netgraph/hole/ng_hole.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ * $Whistle: ng_hole.c,v 1.10 1999/11/01 09:24:51 julian Exp $ */ @@ -51,7 +51,7 @@ #include #include #include -#include +#include "ng_hole.h" /* Netgraph methods */ static ng_rcvdata_t ngh_rcvdata; diff --git a/sys/netgraph/iface/ng_iface.c b/sys/netgraph/iface/ng_iface.c index 78971d1083..342ef48ec3 100644 --- a/sys/netgraph/iface/ng_iface.c +++ b/sys/netgraph/iface/ng_iface.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_iface.c,v 1.7.2.5 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/iface/ng_iface.c,v 1.2 2003/06/17 04:28:50 dillon Exp $ + * $DragonFly: src/sys/netgraph/iface/ng_iface.c,v 1.3 2003/08/07 21:17:31 dillon Exp $ * $Whistle: ng_iface.c,v 1.33 1999/11/01 09:24:51 julian Exp $ */ @@ -74,7 +74,7 @@ #include #include #include -#include +#include "ng_iface.h" #include /* This struct describes one address family */ diff --git a/sys/netgraph/ksocket/ng_ksocket.c b/sys/netgraph/ksocket/ng_ksocket.c index 6502273770..782ae4e033 100644 --- a/sys/netgraph/ksocket/ng_ksocket.c +++ b/sys/netgraph/ksocket/ng_ksocket.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_ksocket.c,v 1.5.2.13 2003/04/28 20:41:09 archie Exp $ - * $DragonFly: src/sys/netgraph/ksocket/ng_ksocket.c,v 1.3 2003/06/25 03:56:03 dillon Exp $ + * $DragonFly: src/sys/netgraph/ksocket/ng_ksocket.c,v 1.4 2003/08/07 21:17:32 dillon Exp $ * $Whistle: ng_ksocket.c,v 1.1 1999/11/16 20:04:40 archie Exp $ */ @@ -63,7 +63,7 @@ #include #include #include -#include +#include "ng_ksocket.h" #include #include diff --git a/sys/netgraph/l2tp/ng_l2tp.c b/sys/netgraph/l2tp/ng_l2tp.c index 7442691dfb..1bdbf00b32 100644 --- a/sys/netgraph/l2tp/ng_l2tp.c +++ b/sys/netgraph/l2tp/ng_l2tp.c @@ -38,7 +38,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_l2tp.c,v 1.1.2.1 2002/08/20 23:48:15 archie Exp $ - * $DragonFly: src/sys/netgraph/l2tp/ng_l2tp.c,v 1.3 2003/07/29 12:51:29 hmp Exp $ + * $DragonFly: src/sys/netgraph/l2tp/ng_l2tp.c,v 1.4 2003/08/07 21:17:32 dillon Exp $ */ /* @@ -61,7 +61,7 @@ #include #include #include -#include +#include "ng_l2tp.h" #ifdef NG_SEPARATE_MALLOC MALLOC_DEFINE(M_NETGRAPH_L2TP, "netgraph_l2tp", "netgraph l2tp node"); diff --git a/sys/netgraph/lmi/ng_lmi.c b/sys/netgraph/lmi/ng_lmi.c index 148b2709f2..b95fe9bba0 100644 --- a/sys/netgraph/lmi/ng_lmi.c +++ b/sys/netgraph/lmi/ng_lmi.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_lmi.c,v 1.5.2.3 2002/07/02 22:17:18 archie Exp $ - * $DragonFly: src/sys/netgraph/lmi/ng_lmi.c,v 1.2 2003/06/17 04:28:50 dillon Exp $ + * $DragonFly: src/sys/netgraph/lmi/ng_lmi.c,v 1.3 2003/08/07 21:17:32 dillon Exp $ * $Whistle: ng_lmi.c,v 1.38 1999/11/01 09:24:52 julian Exp $ */ @@ -62,7 +62,7 @@ #include #include #include -#include +#include "ng_lmi.h" /* * Human readable names for LMI diff --git a/sys/netgraph/mppc/ng_mppc.c b/sys/netgraph/mppc/ng_mppc.c index 9a26e35f6c..634726cb14 100644 --- a/sys/netgraph/mppc/ng_mppc.c +++ b/sys/netgraph/mppc/ng_mppc.c @@ -38,7 +38,7 @@ * * $Whistle: ng_mppc.c,v 1.4 1999/11/25 00:10:12 archie Exp $ * $FreeBSD: src/sys/netgraph/ng_mppc.c,v 1.1.2.7 2002/12/16 17:58:42 archie Exp $ - * $DragonFly: src/sys/netgraph/mppc/ng_mppc.c,v 1.2 2003/06/17 04:28:50 dillon Exp $ + * $DragonFly: src/sys/netgraph/mppc/ng_mppc.c,v 1.3 2003/08/07 21:17:32 dillon Exp $ */ /* @@ -59,7 +59,7 @@ #include #include -#include +#include "ng_mppc.h" #include "opt_netgraph.h" diff --git a/sys/netgraph/netgraph/ng_base.c b/sys/netgraph/netgraph/ng_base.c index c76633aa92..d9be5df243 100644 --- a/sys/netgraph/netgraph/ng_base.c +++ b/sys/netgraph/netgraph/ng_base.c @@ -38,7 +38,7 @@ * Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.11.2.17 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/netgraph/ng_base.c,v 1.4 2003/07/26 20:40:10 rob Exp $ + * $DragonFly: src/sys/netgraph/netgraph/ng_base.c,v 1.5 2003/08/07 21:17:32 dillon Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ @@ -63,7 +63,7 @@ #include #include -#include +#include "ng_parse.h" /* List of all nodes */ static LIST_HEAD(, ng_node) nodelist; diff --git a/sys/netgraph/netgraph/ng_parse.c b/sys/netgraph/netgraph/ng_parse.c index 37c5b2e2f9..62e4b6db6f 100644 --- a/sys/netgraph/netgraph/ng_parse.c +++ b/sys/netgraph/netgraph/ng_parse.c @@ -38,7 +38,7 @@ * * $Whistle: ng_parse.c,v 1.3 1999/11/29 01:43:48 archie Exp $ * $FreeBSD: src/sys/netgraph/ng_parse.c,v 1.3.2.8 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/netgraph/ng_parse.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ + * $DragonFly: src/sys/netgraph/netgraph/ng_parse.c,v 1.3 2003/08/07 21:17:32 dillon Exp $ */ #include @@ -52,7 +52,7 @@ #include #include -#include +#include "ng_parse.h" /* Compute alignment for primitive integral types */ struct int16_temp { diff --git a/sys/netgraph/one2many/ng_one2many.c b/sys/netgraph/one2many/ng_one2many.c index 72b829695c..bfd8ce445e 100644 --- a/sys/netgraph/one2many/ng_one2many.c +++ b/sys/netgraph/one2many/ng_one2many.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_one2many.c,v 1.1.2.2 2002/07/02 23:44:02 archie Exp $ - * $DragonFly: src/sys/netgraph/one2many/ng_one2many.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ + * $DragonFly: src/sys/netgraph/one2many/ng_one2many.c,v 1.3 2003/08/07 21:17:32 dillon Exp $ */ /* @@ -59,7 +59,7 @@ #include #include #include -#include +#include "ng_one2many.h" /* Per-link private data */ struct ng_one2many_link { diff --git a/sys/netgraph/ppp/ng_ppp.c b/sys/netgraph/ppp/ng_ppp.c index 43171ce213..921e45e9ab 100644 --- a/sys/netgraph/ppp/ng_ppp.c +++ b/sys/netgraph/ppp/ng_ppp.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_ppp.c,v 1.15.2.10 2003/03/10 17:55:48 archie Exp $ - * $DragonFly: src/sys/netgraph/ppp/ng_ppp.c,v 1.3 2003/07/29 12:51:29 hmp Exp $ + * $DragonFly: src/sys/netgraph/ppp/ng_ppp.c,v 1.4 2003/08/07 21:17:32 dillon Exp $ * $Whistle: ng_ppp.c,v 1.24 1999/11/01 09:24:52 julian Exp $ */ @@ -59,7 +59,7 @@ #include #include #include -#include +#include "ng_ppp.h" #include #define PROT_VALID(p) (((p) & 0x0101) == 0x0001) diff --git a/sys/netgraph/pppoe/ng_pppoe.c b/sys/netgraph/pppoe/ng_pppoe.c index 99db132c62..a716118093 100644 --- a/sys/netgraph/pppoe/ng_pppoe.c +++ b/sys/netgraph/pppoe/ng_pppoe.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_pppoe.c,v 1.23.2.17 2002/07/02 22:17:18 archie Exp $ - * $DragonFly: src/sys/netgraph/pppoe/ng_pppoe.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ + * $DragonFly: src/sys/netgraph/pppoe/ng_pppoe.c,v 1.3 2003/08/07 21:17:32 dillon Exp $ * $Whistle: ng_pppoe.c,v 1.10 1999/11/01 09:24:52 julian Exp $ */ #if 0 @@ -59,7 +59,7 @@ #include #include -#include +#include "ng_pppoe.h" #define SIGNOFF "session closed" diff --git a/sys/netgraph/pptpgre/ng_pptpgre.c b/sys/netgraph/pptpgre/ng_pptpgre.c index 574476dd9d..e1dea024d7 100644 --- a/sys/netgraph/pptpgre/ng_pptpgre.c +++ b/sys/netgraph/pptpgre/ng_pptpgre.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_pptpgre.c,v 1.2.2.13 2002/10/10 18:27:54 archie Exp $ - * $DragonFly: src/sys/netgraph/pptpgre/ng_pptpgre.c,v 1.3 2003/07/29 12:51:29 hmp Exp $ + * $DragonFly: src/sys/netgraph/pptpgre/ng_pptpgre.c,v 1.4 2003/08/07 21:17:32 dillon Exp $ * $Whistle: ng_pptpgre.c,v 1.7 1999/12/08 00:10:06 archie Exp $ */ @@ -70,7 +70,7 @@ #include #include #include -#include +#include "ng_pptpgre.h" /* GRE packet format, as used by PPTP */ struct greheader { diff --git a/sys/netgraph/rfc1490/ng_rfc1490.c b/sys/netgraph/rfc1490/ng_rfc1490.c index bad561fb1e..7938d0701e 100644 --- a/sys/netgraph/rfc1490/ng_rfc1490.c +++ b/sys/netgraph/rfc1490/ng_rfc1490.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_rfc1490.c,v 1.6.2.4 2002/07/02 22:17:18 archie Exp $ - * $DragonFly: src/sys/netgraph/rfc1490/ng_rfc1490.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ + * $DragonFly: src/sys/netgraph/rfc1490/ng_rfc1490.c,v 1.3 2003/08/07 21:17:32 dillon Exp $ * $Whistle: ng_rfc1490.c,v 1.22 1999/11/01 09:24:52 julian Exp $ */ @@ -62,7 +62,7 @@ #include #include -#include +#include "ng_rfc1490.h" /* * DEFINITIONS diff --git a/sys/netgraph/socket/ng_socket.c b/sys/netgraph/socket/ng_socket.c index 9bebcf8133..f6d4fec9f6 100644 --- a/sys/netgraph/socket/ng_socket.c +++ b/sys/netgraph/socket/ng_socket.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_socket.c,v 1.11.2.6 2002/07/02 22:17:18 archie Exp $ - * $DragonFly: src/sys/netgraph/socket/ng_socket.c,v 1.4 2003/06/25 03:56:03 dillon Exp $ + * $DragonFly: src/sys/netgraph/socket/ng_socket.c,v 1.5 2003/08/07 21:17:32 dillon Exp $ * $Whistle: ng_socket.c,v 1.28 1999/11/01 09:24:52 julian Exp $ */ @@ -68,8 +68,8 @@ #endif #include #include -#include -#include +#include "ng_socketvar.h" +#include "ng_socket.h" /* * It's Ascii-art time! diff --git a/sys/netgraph/tee/ng_tee.c b/sys/netgraph/tee/ng_tee.c index c123a4d4ee..bc42f12141 100644 --- a/sys/netgraph/tee/ng_tee.c +++ b/sys/netgraph/tee/ng_tee.c @@ -37,7 +37,7 @@ * Author: Julian Elischer * * $FreeBSD: src/sys/netgraph/ng_tee.c,v 1.7.2.5 2002/07/02 23:44:03 archie Exp $ - * $DragonFly: src/sys/netgraph/tee/ng_tee.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ + * $DragonFly: src/sys/netgraph/tee/ng_tee.c,v 1.3 2003/08/07 21:17:33 dillon Exp $ * $Whistle: ng_tee.c,v 1.18 1999/11/01 09:24:52 julian Exp $ */ @@ -59,7 +59,7 @@ #include #include #include -#include +#include "ng_tee.h" /* Per hook info */ struct hookinfo { diff --git a/sys/netgraph/tty/ng_tty.c b/sys/netgraph/tty/ng_tty.c index 86522b391e..dc90c13151 100644 --- a/sys/netgraph/tty/ng_tty.c +++ b/sys/netgraph/tty/ng_tty.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_tty.c,v 1.7.2.3 2002/02/13 00:43:12 dillon Exp $ - * $DragonFly: src/sys/netgraph/tty/ng_tty.c,v 1.4 2003/06/25 03:56:03 dillon Exp $ + * $DragonFly: src/sys/netgraph/tty/ng_tty.c,v 1.5 2003/08/07 21:17:33 dillon Exp $ * $Whistle: ng_tty.c,v 1.21 1999/11/01 09:24:52 julian Exp $ */ @@ -75,7 +75,7 @@ #include #include -#include +#include "ng_tty.h" #ifdef __i386__ /* fiddle with the spl locking */ #include diff --git a/sys/netgraph/vjc/ng_vjc.c b/sys/netgraph/vjc/ng_vjc.c index a90f4e44da..56789752e7 100644 --- a/sys/netgraph/vjc/ng_vjc.c +++ b/sys/netgraph/vjc/ng_vjc.c @@ -37,7 +37,7 @@ * Author: Archie Cobbs * * $FreeBSD: src/sys/netgraph/ng_vjc.c,v 1.9.2.5 2002/07/02 23:44:03 archie Exp $ - * $DragonFly: src/sys/netgraph/vjc/ng_vjc.c,v 1.2 2003/06/17 04:28:51 dillon Exp $ + * $DragonFly: src/sys/netgraph/vjc/ng_vjc.c,v 1.3 2003/08/07 21:17:33 dillon Exp $ * $Whistle: ng_vjc.c,v 1.17 1999/11/01 09:24:52 julian Exp $ */ @@ -57,7 +57,7 @@ #include #include #include -#include +#include "ng_vjc.h" #include #include diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index b80a682776..578f2942d9 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet/in_gif.c,v 1.5.2.11 2003/01/23 21:06:45 sam Exp $ */ -/* $DragonFly: src/sys/netinet/in_gif.c,v 1.3 2003/06/23 17:55:46 dillon Exp $ */ +/* $DragonFly: src/sys/netinet/in_gif.c,v 1.4 2003/08/07 21:17:33 dillon Exp $ */ /* $KAME: in_gif.c,v 1.54 2001/05/14 14:02:16 itojun Exp $ */ /* @@ -62,7 +62,7 @@ #include #endif -#include +#include #include diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 57a362ca1e..2e3b9197c6 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -32,7 +32,7 @@ * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 * $FreeBSD: src/sys/netinet/ip_input.c,v 1.130.2.52 2003/03/07 07:01:28 silby Exp $ - * $DragonFly: src/sys/netinet/ip_input.c,v 1.3 2003/07/26 21:00:04 rob Exp $ + * $DragonFly: src/sys/netinet/ip_input.c,v 1.4 2003/08/07 21:17:33 dillon Exp $ */ #define _IP_VHL @@ -79,8 +79,8 @@ #include -#include -#include +#include +#include #ifdef IPSEC #include diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index fbb9b0abbb..34582a6fa9 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -32,7 +32,7 @@ * * @(#)ip_output.c 8.3 (Berkeley) 1/21/94 * $FreeBSD: src/sys/netinet/ip_output.c,v 1.99.2.37 2003/04/15 06:44:45 silby Exp $ - * $DragonFly: src/sys/netinet/ip_output.c,v 1.5 2003/07/26 21:00:04 rob Exp $ + * $DragonFly: src/sys/netinet/ip_output.c,v 1.6 2003/08/07 21:17:33 dillon Exp $ */ #define _IP_VHL @@ -86,8 +86,8 @@ static MALLOC_DEFINE(M_IPMOPTS, "ip_moptions", "internet multicast options"); #include #endif /*FAST_IPSEC*/ -#include -#include +#include +#include #define print_ip(x, a, y) printf("%s %d.%d.%d.%d%s",\ x, (ntohl(a.s_addr)>>24)&0xFF,\ diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c index acfb067aa6..54489a9b86 100644 --- a/sys/netinet/raw_ip.c +++ b/sys/netinet/raw_ip.c @@ -32,7 +32,7 @@ * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 * $FreeBSD: src/sys/netinet/raw_ip.c,v 1.64.2.15 2003/01/24 10:52:50 hsu Exp $ - * $DragonFly: src/sys/netinet/raw_ip.c,v 1.4 2003/06/25 03:56:04 dillon Exp $ + * $DragonFly: src/sys/netinet/raw_ip.c,v 1.5 2003/08/07 21:17:33 dillon Exp $ */ #include "opt_inet6.h" @@ -62,10 +62,10 @@ #include #include #include -#include -#include -#include +#include +#include +#include #ifdef FAST_IPSEC #include diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 5abeca0b79..e1a3a9eed7 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.6.2.13 2003/05/06 06:46:58 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/icmp6.c,v 1.3 2003/08/03 11:41:12 hmp Exp $ */ +/* $DragonFly: src/sys/netinet6/icmp6.c,v 1.4 2003/08/07 21:17:33 dillon Exp $ */ /* $KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $ */ /* @@ -105,7 +105,7 @@ #endif #ifdef FAST_IPSEC -#include +#include "ipsec.h" #include #define IPSEC #endif diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c index c49c088d28..80cfd1331c 100644 --- a/sys/netinet6/in6_gif.c +++ b/sys/netinet6/in6_gif.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/in6_gif.c,v 1.2.2.7 2003/01/23 21:06:47 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/in6_gif.c,v 1.3 2003/07/23 02:30:22 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/in6_gif.c,v 1.4 2003/08/07 21:17:33 dillon Exp $ */ /* $KAME: in6_gif.c,v 1.49 2001/05/14 14:02:17 itojun Exp $ */ /* @@ -67,7 +67,7 @@ #include #endif -#include +#include #include diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 0b6f6b5c25..3a14a7f9bf 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.10.2.9 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/in6_pcb.c,v 1.7 2003/07/26 21:04:50 rob Exp $ */ +/* $DragonFly: src/sys/netinet6/in6_pcb.c,v 1.8 2003/08/07 21:17:33 dillon Exp $ */ /* $KAME: in6_pcb.c,v 1.31 2001/05/21 05:45:10 jinmei Exp $ */ /* @@ -114,8 +114,8 @@ #endif /* IPSEC */ #ifdef FAST_IPSEC -#include -#include +#include "ipsec.h" +#include "ipsec6.h" #include #define IPSEC #endif /* FAST_IPSEC */ diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c index c929629a9f..a230d0fba5 100644 --- a/sys/netinet6/in6_proto.c +++ b/sys/netinet6/in6_proto.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/in6_proto.c,v 1.6.2.9 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/in6_proto.c,v 1.2 2003/06/17 04:28:52 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/in6_proto.c,v 1.3 2003/08/07 21:17:33 dillon Exp $ */ /* $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $ */ /* @@ -128,7 +128,7 @@ #endif /* IPSEC */ #ifdef FAST_IPSEC -#include +#include "ipsec6.h" #define IPSEC #define IPSEC_ESP #define ah6_input ipsec6_common_input diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index b75c4cdbd1..ed0de409e9 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/in6_src.c,v 1.1.2.3 2002/02/26 18:02:06 ume Exp $ */ -/* $DragonFly: src/sys/netinet6/in6_src.c,v 1.4 2003/06/25 03:56:04 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/in6_src.c,v 1.5 2003/08/07 21:17:33 dillon Exp $ */ /* $KAME: in6_src.c,v 1.37 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -99,7 +99,7 @@ #include -#include "loop.h" +#include "use_loop.h" /* * Return an IPv6 address, which is the most appropriate for a given diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 70728020e8..19454cc1da 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6_forward.c,v 1.4.2.7 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/ip6_forward.c,v 1.2 2003/06/17 04:28:52 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ip6_forward.c,v 1.3 2003/08/07 21:17:33 dillon Exp $ */ /* $KAME: ip6_forward.c,v 1.69 2001/05/17 03:48:30 itojun Exp $ */ /* @@ -73,13 +73,13 @@ #endif /* IPSEC */ #ifdef FAST_IPSEC -#include -#include +#include "ipsec.h" +#include "ipsec6.h" #include #define IPSEC #endif /* FAST_IPSEC */ -#include +#include #include diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index ef79ae4857..b967ddcbf7 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6_input.c,v 1.11.2.15 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/ip6_input.c,v 1.5 2003/07/29 12:51:30 hmp Exp $ */ +/* $DragonFly: src/sys/netinet6/ip6_input.c,v 1.6 2003/08/07 21:17:33 dillon Exp $ */ /* $KAME: ip6_input.c,v 1.259 2002/01/21 04:58:09 jinmei Exp $ */ /* @@ -115,17 +115,17 @@ #endif #ifdef FAST_IPSEC -#include -#include +#include "ipsec.h" +#include "ipsec6.h" #define IPSEC #endif /* FAST_IPSEC */ -#include +#include #include /* we need it for NLOOP. */ -#include "loop.h" +#include "use_loop.h" #include diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 8f01f8e78d..04eaeb57b1 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/ip6_output.c,v 1.13.2.18 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/ip6_output.c,v 1.5 2003/06/25 05:22:32 dillon Exp $ */ +/* $DragonFly: src/sys/netinet6/ip6_output.c,v 1.6 2003/08/07 21:17:33 dillon Exp $ */ /* $KAME: ip6_output.c,v 1.279 2002/01/26 06:12:30 jinmei Exp $ */ /* @@ -103,12 +103,12 @@ #endif /* IPSEC */ #ifdef FAST_IPSEC -#include -#include +#include "ipsec.h" +#include "ipsec6.h" #include #endif /* FAST_IPSEC */ -#include +#include #include diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index f5a4d261e9..9b575a6485 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/nd6.c,v 1.2.2.15 2003/05/06 06:46:58 suz Exp $ */ -/* $DragonFly: src/sys/netinet6/nd6.c,v 1.3 2003/07/27 01:49:52 hmp Exp $ */ +/* $DragonFly: src/sys/netinet6/nd6.c,v 1.4 2003/08/07 21:17:33 dillon Exp $ */ /* $KAME: nd6.c,v 1.144 2001/05/24 07:44:00 itojun Exp $ */ /* @@ -73,7 +73,7 @@ #include #include -#include "loop.h" +#include "use_loop.h" #include diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c index 91f50decec..42b25287dd 100644 --- a/sys/netinet6/raw_ip6.c +++ b/sys/netinet6/raw_ip6.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.7.2.7 2003/01/24 05:11:35 sam Exp $ - * $DragonFly: src/sys/netinet6/raw_ip6.c,v 1.6 2003/07/26 21:04:50 rob Exp $ + * $DragonFly: src/sys/netinet6/raw_ip6.c,v 1.7 2003/08/07 21:17:33 dillon Exp $ */ /* @@ -104,8 +104,8 @@ #endif /*IPSEC*/ #ifdef FAST_IPSEC -#include -#include +#include "ipsec.h" +#include "ipsec6.h" #endif /* FAST_IPSEC */ #include diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 59b63d8c54..bb602e09cb 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.6.2.13 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netinet6/udp6_usrreq.c,v 1.7 2003/07/26 21:04:50 rob Exp $ */ +/* $DragonFly: src/sys/netinet6/udp6_usrreq.c,v 1.8 2003/08/07 21:17:33 dillon Exp $ */ /* $KAME: udp6_usrreq.c,v 1.27 2001/05/21 05:45:10 jinmei Exp $ */ /* @@ -108,8 +108,8 @@ #endif /* IPSEC */ #ifdef FAST_IPSEC -#include -#include +#include "ipsec.h" +#include "ipsec6.h" #endif /* FAST_IPSEC */ /* diff --git a/sys/netproto/atalk/aarp.c b/sys/netproto/atalk/aarp.c index f95010a1cf..97afbe7ca0 100644 --- a/sys/netproto/atalk/aarp.c +++ b/sys/netproto/atalk/aarp.c @@ -3,7 +3,7 @@ * All Rights Reserved. * * $FreeBSD: src/sys/netatalk/aarp.c,v 1.12.2.2 2001/06/23 20:43:09 iedowse Exp $ - * $DragonFly: src/sys/netproto/atalk/aarp.c,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * $DragonFly: src/sys/netproto/atalk/aarp.c,v 1.3 2003/08/07 21:17:33 dillon Exp $ */ #include "opt_atalk.h" @@ -21,11 +21,11 @@ #undef s_net #include -#include -#include -#include -#include -#include +#include "at.h" +#include "at_var.h" +#include "aarp.h" +#include "phase2.h" +#include "at_extern.h" static void aarptfree( struct aarptab *aat); static void at_aarpinput( struct arpcom *ac, struct mbuf *m); diff --git a/sys/netproto/atalk/at_control.c b/sys/netproto/atalk/at_control.c index 61bc3e0a96..4088e24bfb 100644 --- a/sys/netproto/atalk/at_control.c +++ b/sys/netproto/atalk/at_control.c @@ -2,7 +2,7 @@ * Copyright (c) 1990,1991 Regents of The University of Michigan. * All Rights Reserved. * - * $DragonFly: src/sys/netproto/atalk/at_control.c,v 1.4 2003/07/21 07:57:48 dillon Exp $ + * $DragonFly: src/sys/netproto/atalk/at_control.c,v 1.5 2003/08/07 21:17:33 dillon Exp $ */ #include @@ -18,9 +18,9 @@ #undef s_net #include -#include -#include -#include +#include "at.h" +#include "at_var.h" +#include "at_extern.h" struct at_ifaddr *at_ifaddr; diff --git a/sys/netproto/atalk/at_proto.c b/sys/netproto/atalk/at_proto.c index 365e319e5a..090fd54008 100644 --- a/sys/netproto/atalk/at_proto.c +++ b/sys/netproto/atalk/at_proto.c @@ -19,6 +19,8 @@ * Ann Arbor, Michigan * +1-313-763-0525 * netatalk@itd.umich.edu + * + * $DragonFly: src/sys/netproto/atalk/at_proto.c,v 1.2 2003/08/07 21:17:33 dillon Exp $ */ #include @@ -30,9 +32,9 @@ #include -#include -#include -#include +#include "at.h" +#include "ddp_var.h" +#include "at_extern.h" extern struct domain atalkdomain; diff --git a/sys/netproto/atalk/ddp_input.c b/sys/netproto/atalk/ddp_input.c index 730ca0907f..83f7e55998 100644 --- a/sys/netproto/atalk/ddp_input.c +++ b/sys/netproto/atalk/ddp_input.c @@ -3,7 +3,7 @@ * All Rights Reserved. See COPYRIGHT. * * $FreeBSD: src/sys/netatalk/ddp_input.c,v 1.12 2000/02/13 03:31:58 peter Exp $ - * $DragonFly: src/sys/netproto/atalk/ddp_input.c,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * $DragonFly: src/sys/netproto/atalk/ddp_input.c,v 1.3 2003/08/07 21:17:33 dillon Exp $ */ #include @@ -17,11 +17,11 @@ #include #include -#include -#include -#include -#include -#include +#include "at.h" +#include "at_var.h" +#include "ddp.h" +#include "ddp_var.h" +#include "at_extern.h" static volatile int ddp_forward = 1; static volatile int ddp_firewall = 0; diff --git a/sys/netproto/atalk/ddp_output.c b/sys/netproto/atalk/ddp_output.c index 1e4ab069b5..9a8e535996 100644 --- a/sys/netproto/atalk/ddp_output.c +++ b/sys/netproto/atalk/ddp_output.c @@ -22,7 +22,7 @@ */ /* $FreeBSD: src/sys/netatalk/ddp_output.c,v 1.13.6.1 2000/06/02 22:39:07 archie Exp $ */ -/* $DragonFly: src/sys/netproto/atalk/ddp_output.c,v 1.2 2003/06/17 04:28:48 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/atalk/ddp_output.c,v 1.3 2003/08/07 21:17:33 dillon Exp $ */ #include #include @@ -35,11 +35,11 @@ #undef s_net -#include -#include -#include -#include -#include +#include "at.h" +#include "at_var.h" +#include "ddp.h" +#include "ddp_var.h" +#include "at_extern.h" int ddp_cksum = 1; diff --git a/sys/netproto/atalk/ddp_usrreq.c b/sys/netproto/atalk/ddp_usrreq.c index 0e58ce85b5..480fd61adc 100644 --- a/sys/netproto/atalk/ddp_usrreq.c +++ b/sys/netproto/atalk/ddp_usrreq.c @@ -2,7 +2,7 @@ * Copyright (c) 1990,1994 Regents of The University of Michigan. * All Rights Reserved. See COPYRIGHT. * - * $DragonFly: src/sys/netproto/atalk/ddp_usrreq.c,v 1.3 2003/07/21 07:57:48 dillon Exp $ + * $DragonFly: src/sys/netproto/atalk/ddp_usrreq.c,v 1.4 2003/08/07 21:17:33 dillon Exp $ */ #include @@ -16,10 +16,10 @@ #include #include -#include -#include -#include -#include +#include "at.h" +#include "at_var.h" +#include "ddp_var.h" +#include "at_extern.h" static void at_pcbdisconnect( struct ddpcb *ddp ); static void at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr); diff --git a/sys/netproto/atm/atm_aal5.c b/sys/netproto/atm/atm_aal5.c index 4b50d8a57f..f3d69757a0 100644 --- a/sys/netproto/atm/atm_aal5.c +++ b/sys/netproto/atm/atm_aal5.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/atm_aal5.c,v 1.6 1999/10/09 23:24:59 green Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/atm_aal5.c,v 1.3 2003/07/23 02:30:21 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/atm_aal5.c,v 1.4 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "kern_include.h" #include /* diff --git a/sys/netproto/atm/atm_cm.c b/sys/netproto/atm/atm_cm.c index d27231e647..060c70fb02 100644 --- a/sys/netproto/atm/atm_cm.c +++ b/sys/netproto/atm/atm_cm.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/atm_cm.c,v 1.6 1999/08/28 00:48:34 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/atm_cm.c,v 1.2 2003/06/17 04:28:48 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/atm_cm.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "kern_include.h" /* * Global variables diff --git a/sys/netproto/atm/atm_device.c b/sys/netproto/atm/atm_device.c index 1d89d86041..d7ed08d06f 100644 --- a/sys/netproto/atm/atm_device.c +++ b/sys/netproto/atm/atm_device.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/atm_device.c,v 1.5 1999/08/28 00:48:35 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/atm_device.c,v 1.3 2003/07/23 02:30:21 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/atm_device.c,v 1.4 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "kern_include.h" /* * Private structures for managing allocated kernel memory resources diff --git a/sys/netproto/atm/atm_if.c b/sys/netproto/atm/atm_if.c index ab55401940..d0602fae6a 100644 --- a/sys/netproto/atm/atm_if.c +++ b/sys/netproto/atm/atm_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/atm_if.c,v 1.5 1999/08/28 00:48:35 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/atm_if.c,v 1.3 2003/07/23 02:30:21 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/atm_if.c,v 1.4 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "kern_include.h" #if (defined(BSD) && (BSD < 199506)) extern int ifqmaxlen; diff --git a/sys/netproto/atm/atm_proto.c b/sys/netproto/atm/atm_proto.c index 94b3f634cb..547ff30e1d 100644 --- a/sys/netproto/atm/atm_proto.c +++ b/sys/netproto/atm/atm_proto.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/atm_proto.c,v 1.3 1999/08/28 00:48:36 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/atm_proto.c,v 1.3 2003/07/23 02:30:21 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/atm_proto.c,v 1.4 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "kern_include.h" struct protosw atmsw[] = { { SOCK_DGRAM, /* ioctl()-only */ diff --git a/sys/netproto/atm/atm_signal.c b/sys/netproto/atm/atm_signal.c index d7d58c894a..7903f6dd99 100644 --- a/sys/netproto/atm/atm_signal.c +++ b/sys/netproto/atm/atm_signal.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/atm_signal.c,v 1.4 1999/08/28 00:48:37 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/atm_signal.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/atm_signal.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "kern_include.h" /* * Local variables diff --git a/sys/netproto/atm/atm_socket.c b/sys/netproto/atm/atm_socket.c index 25afe5a021..6e7f8d7597 100644 --- a/sys/netproto/atm/atm_socket.c +++ b/sys/netproto/atm/atm_socket.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/atm_socket.c,v 1.4 1999/08/28 00:48:37 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/atm_socket.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/atm_socket.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "kern_include.h" /* * Local functions diff --git a/sys/netproto/atm/atm_subr.c b/sys/netproto/atm/atm_subr.c index 7e9fd2f3e1..4955d65cbe 100644 --- a/sys/netproto/atm/atm_subr.c +++ b/sys/netproto/atm/atm_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/atm_subr.c,v 1.7 2000/02/13 03:31:59 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/atm_subr.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/atm_subr.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "kern_include.h" #include /* diff --git a/sys/netproto/atm/atm_usrreq.c b/sys/netproto/atm/atm_usrreq.c index 5db37dfe52..33cc56e7da 100644 --- a/sys/netproto/atm/atm_usrreq.c +++ b/sys/netproto/atm/atm_usrreq.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/atm_usrreq.c,v 1.6 1999/08/28 00:48:39 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/atm_usrreq.c,v 1.3 2003/06/25 03:56:03 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/atm_usrreq.c,v 1.4 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -35,7 +35,7 @@ * */ -#include +#include "kern_include.h" /* * Local functions diff --git a/sys/netproto/atm/ipatm/ipatm_event.c b/sys/netproto/atm/ipatm/ipatm_event.c index 8989ece0cb..1cbe86d393 100644 --- a/sys/netproto/atm/ipatm/ipatm_event.c +++ b/sys/netproto/atm/ipatm/ipatm_event.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_event.c,v 1.4 1999/08/28 00:48:43 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_event.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_event.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "ipatm.h" +#include "ipatm_var.h" +#include "ipatm_serv.h" /* * Process an IP VCC timeout diff --git a/sys/netproto/atm/ipatm/ipatm_if.c b/sys/netproto/atm/ipatm/ipatm_if.c index 223d710279..7aa187a01a 100644 --- a/sys/netproto/atm/ipatm/ipatm_if.c +++ b/sys/netproto/atm/ipatm/ipatm_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_if.c,v 1.4 2000/01/17 20:49:43 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_if.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_if.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -37,8 +37,8 @@ #include -#include -#include +#include "ipatm_var.h" +#include "ipatm_serv.h" /* * Local functions diff --git a/sys/netproto/atm/ipatm/ipatm_input.c b/sys/netproto/atm/ipatm/ipatm_input.c index 1b57988bdc..974eab8d58 100644 --- a/sys/netproto/atm/ipatm/ipatm_input.c +++ b/sys/netproto/atm/ipatm/ipatm_input.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_input.c,v 1.4 2000/01/17 20:49:43 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_input.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_input.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -37,7 +37,7 @@ #include -#include +#include "ipatm_var.h" /* * Process VCC Input Data diff --git a/sys/netproto/atm/ipatm/ipatm_load.c b/sys/netproto/atm/ipatm/ipatm_load.c index adb4670ef1..f0db734e0e 100644 --- a/sys/netproto/atm/ipatm/ipatm_load.c +++ b/sys/netproto/atm/ipatm/ipatm_load.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_load.c,v 1.6 2000/01/17 20:49:43 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_load.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_load.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -41,8 +41,8 @@ #include -#include -#include +#include "ipatm.h" +#include "ipatm_var.h" /* * Global variables diff --git a/sys/netproto/atm/ipatm/ipatm_output.c b/sys/netproto/atm/ipatm/ipatm_output.c index 7bd4640b1e..86c31322c4 100644 --- a/sys/netproto/atm/ipatm/ipatm_output.c +++ b/sys/netproto/atm/ipatm/ipatm_output.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_output.c,v 1.4.2.1 2000/06/02 22:39:08 archie Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_output.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_output.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -37,8 +37,8 @@ #include -#include -#include +#include "ipatm_var.h" +#include "ipatm_serv.h" /* * Output an IP Packet diff --git a/sys/netproto/atm/ipatm/ipatm_usrreq.c b/sys/netproto/atm/ipatm/ipatm_usrreq.c index 319ca7ef37..bfba4f7ec4 100644 --- a/sys/netproto/atm/ipatm/ipatm_usrreq.c +++ b/sys/netproto/atm/ipatm/ipatm_usrreq.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_usrreq.c,v 1.5.2.1 2003/02/15 09:25:13 phk Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_usrreq.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_usrreq.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -37,8 +37,8 @@ #include -#include -#include +#include "ipatm_var.h" +#include "ipatm_serv.h" /* * Process IP PF_ATM ioctls diff --git a/sys/netproto/atm/ipatm/ipatm_vcm.c b/sys/netproto/atm/ipatm/ipatm_vcm.c index 2c61c41a7a..9641954287 100644 --- a/sys/netproto/atm/ipatm/ipatm_vcm.c +++ b/sys/netproto/atm/ipatm/ipatm_vcm.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/ipatm/ipatm_vcm.c,v 1.4 1999/08/28 00:48:45 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_vcm.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/ipatm/ipatm_vcm.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "ipatm.h" +#include "ipatm_var.h" +#include "ipatm_serv.h" Atm_attributes ipatm_aal5llc = { NULL, /* nif */ diff --git a/sys/netproto/atm/kern_include.h b/sys/netproto/atm/kern_include.h index 986dfcc9fe..f991268aa7 100644 --- a/sys/netproto/atm/kern_include.h +++ b/sys/netproto/atm/kern_include.h @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/kern_include.h,v 1.3 1999/08/28 00:48:40 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/kern_include.h,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/kern_include.h,v 1.3 2003/08/07 21:17:34 dillon Exp $ * */ @@ -93,22 +93,22 @@ /* * Porting fluff */ -#include +#include "port.h" /* * ATM core services */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "queue.h" +#include "atm.h" +#include "atm_sys.h" +#include "atm_sap.h" +#include "atm_cm.h" +#include "atm_if.h" +#include "atm_vc.h" +#include "atm_ioctl.h" +#include "atm_sigmgr.h" +#include "atm_stack.h" +#include "atm_pcb.h" +#include "atm_var.h" #endif /* _NETATM_KERN_INCLUDE_H */ diff --git a/sys/netproto/atm/sigpvc/sigpvc_if.c b/sys/netproto/atm/sigpvc/sigpvc_if.c index f793fa7723..c51c79f1e1 100644 --- a/sys/netproto/atm/sigpvc/sigpvc_if.c +++ b/sys/netproto/atm/sigpvc/sigpvc_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_if.c,v 1.7 2000/01/17 20:49:46 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/sigpvc/sigpvc_if.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/sigpvc/sigpvc_if.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -42,7 +42,7 @@ #include -#include +#include "sigpvc_var.h" /* * Global variables diff --git a/sys/netproto/atm/sigpvc/sigpvc_subr.c b/sys/netproto/atm/sigpvc/sigpvc_subr.c index b8b3d6eb84..4d937d999d 100644 --- a/sys/netproto/atm/sigpvc/sigpvc_subr.c +++ b/sys/netproto/atm/sigpvc/sigpvc_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/sigpvc/sigpvc_subr.c,v 1.4 2000/01/17 20:49:46 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/sigpvc/sigpvc_subr.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/sigpvc/sigpvc_subr.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -37,7 +37,7 @@ #include -#include +#include "sigpvc_var.h" extern struct sp_info sigpvc_vcpool; diff --git a/sys/netproto/atm/spans/spans_arp.c b/sys/netproto/atm/spans/spans_arp.c index ad47dbd2d0..65c0dd43e5 100644 --- a/sys/netproto/atm/spans/spans_arp.c +++ b/sys/netproto/atm/spans/spans_arp.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_arp.c,v 1.7 2000/01/15 20:34:55 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_arp.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_arp.c,v 1.3 2003/08/07 21:17:34 dillon Exp $ */ /* @@ -40,8 +40,8 @@ #include #include #include "spans_xdr.h" -#include -#include +#include "spans_var.h" +#include "spans_cls.h" /* * Global variables diff --git a/sys/netproto/atm/spans/spans_cls.c b/sys/netproto/atm/spans/spans_cls.c index fc29fa1661..2bf59d5cb4 100644 --- a/sys/netproto/atm/spans/spans_cls.c +++ b/sys/netproto/atm/spans/spans_cls.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_cls.c,v 1.6 1999/08/28 00:48:49 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_cls.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_cls.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -40,8 +40,8 @@ #include #include #include "spans_xdr.h" -#include -#include +#include "spans_var.h" +#include "spans_cls.h" /* * Global variables diff --git a/sys/netproto/atm/spans/spans_if.c b/sys/netproto/atm/spans/spans_if.c index 99ce81787c..fe1866ebc4 100644 --- a/sys/netproto/atm/spans/spans_if.c +++ b/sys/netproto/atm/spans/spans_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_if.c,v 1.6 1999/08/28 00:48:49 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_if.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_if.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -43,7 +43,7 @@ #include #include "spans_xdr.h" -#include +#include "spans_var.h" /* * Global variables diff --git a/sys/netproto/atm/spans/spans_msg.c b/sys/netproto/atm/spans/spans_msg.c index 8de977d75d..72d636301d 100644 --- a/sys/netproto/atm/spans/spans_msg.c +++ b/sys/netproto/atm/spans/spans_msg.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_msg.c,v 1.5 1999/08/28 00:48:50 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_msg.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_msg.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -39,7 +39,7 @@ #include #include "spans_xdr.h" -#include +#include "spans_var.h" /* * External functions diff --git a/sys/netproto/atm/spans/spans_print.c b/sys/netproto/atm/spans/spans_print.c index 82244f801f..fdb7a30180 100644 --- a/sys/netproto/atm/spans/spans_print.c +++ b/sys/netproto/atm/spans/spans_print.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_print.c,v 1.6 1999/08/28 00:48:50 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_print.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_print.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -38,7 +38,7 @@ #include #include "spans_xdr.h" -#include +#include "spans_var.h" /* * If LONGPRINT is defined, every field of the SPANS message will be diff --git a/sys/netproto/atm/spans/spans_proto.c b/sys/netproto/atm/spans/spans_proto.c index b7ec2636d7..105c385eeb 100644 --- a/sys/netproto/atm/spans/spans_proto.c +++ b/sys/netproto/atm/spans/spans_proto.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_proto.c,v 1.4 1999/08/28 00:48:51 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_proto.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_proto.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -38,7 +38,7 @@ #include #include "spans_xdr.h" -#include +#include "spans_var.h" /* * Internal functions diff --git a/sys/netproto/atm/spans/spans_subr.c b/sys/netproto/atm/spans/spans_subr.c index 273b5dee49..afe3c54bd2 100644 --- a/sys/netproto/atm/spans/spans_subr.c +++ b/sys/netproto/atm/spans/spans_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_subr.c,v 1.4 1999/08/28 00:48:52 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_subr.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_subr.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -38,7 +38,7 @@ #include #include "spans_xdr.h" -#include +#include "spans_var.h" /* * Open a SPANS VCC diff --git a/sys/netproto/atm/spans/spans_util.c b/sys/netproto/atm/spans/spans_util.c index 413c36d84a..043180cb37 100644 --- a/sys/netproto/atm/spans/spans_util.c +++ b/sys/netproto/atm/spans/spans_util.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/spans/spans_util.c,v 1.5 1999/08/29 10:28:10 bde Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_util.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/spans/spans_util.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -38,7 +38,7 @@ #include #include "spans_xdr.h" -#include +#include "spans_var.h" #ifdef NOTDEF /* XXX -- Remove all SAP checks? */ diff --git a/sys/netproto/atm/uni/q2110_sigaa.c b/sys/netproto/atm/uni/q2110_sigaa.c index ab7792865a..b2615b95d5 100644 --- a/sys/netproto/atm/uni/q2110_sigaa.c +++ b/sys/netproto/atm/uni/q2110_sigaa.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/q2110_sigaa.c,v 1.4 2000/01/17 20:49:48 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_sigaa.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_sigaa.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/q2110_sigcpcs.c b/sys/netproto/atm/uni/q2110_sigcpcs.c index 82b09df30f..c3b5e9ea93 100644 --- a/sys/netproto/atm/uni/q2110_sigcpcs.c +++ b/sys/netproto/atm/uni/q2110_sigcpcs.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/q2110_sigcpcs.c,v 1.4 2000/01/17 20:49:49 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_sigcpcs.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_sigcpcs.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_pdu.h" +#include "sscop_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/q2110_subr.c b/sys/netproto/atm/uni/q2110_subr.c index 421fe43733..def56a7622 100644 --- a/sys/netproto/atm/uni/q2110_subr.c +++ b/sys/netproto/atm/uni/q2110_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/q2110_subr.c,v 1.4 2000/01/17 20:49:49 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_subr.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/q2110_subr.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_var.h" /* * Conditionally Clear Transmission Queues diff --git a/sys/netproto/atm/uni/qsaal1_sigaa.c b/sys/netproto/atm/uni/qsaal1_sigaa.c index fcaf01c34d..8de259bcca 100644 --- a/sys/netproto/atm/uni/qsaal1_sigaa.c +++ b/sys/netproto/atm/uni/qsaal1_sigaa.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/qsaal1_sigaa.c,v 1.4 2000/01/17 20:49:49 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_sigaa.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_sigaa.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/qsaal1_sigcpcs.c b/sys/netproto/atm/uni/qsaal1_sigcpcs.c index 5bf505fc55..e169c73214 100644 --- a/sys/netproto/atm/uni/qsaal1_sigcpcs.c +++ b/sys/netproto/atm/uni/qsaal1_sigcpcs.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/qsaal1_sigcpcs.c,v 1.4 2000/01/17 20:49:49 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_sigcpcs.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_sigcpcs.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_pdu.h" +#include "sscop_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/qsaal1_subr.c b/sys/netproto/atm/uni/qsaal1_subr.c index dcdd089880..66034f7f85 100644 --- a/sys/netproto/atm/uni/qsaal1_subr.c +++ b/sys/netproto/atm/uni/qsaal1_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/qsaal1_subr.c,v 1.4 2000/01/17 20:49:50 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_subr.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/qsaal1_subr.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_var.h" /* * Re-establish a new SSCOP Connection diff --git a/sys/netproto/atm/uni/sscf_uni.c b/sys/netproto/atm/uni/sscf_uni.c index f73c095ac6..f985d1573f 100644 --- a/sys/netproto/atm/uni/sscf_uni.c +++ b/sys/netproto/atm/uni/sscf_uni.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscf_uni.c,v 1.7.2.1 2001/09/30 22:54:35 kris Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,8 +37,8 @@ #include -#include -#include +#include "uni.h" +#include "sscf_uni_var.h" /* * Global variables diff --git a/sys/netproto/atm/uni/sscf_uni_lower.c b/sys/netproto/atm/uni/sscf_uni_lower.c index 624a2a8a10..0f414e7cf1 100644 --- a/sys/netproto/atm/uni/sscf_uni_lower.c +++ b/sys/netproto/atm/uni/sscf_uni_lower.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscf_uni_lower.c,v 1.4 1999/08/28 00:48:56 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni_lower.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni_lower.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "uni.h" +#include "sscop.h" +#include "sscf_uni.h" +#include "sscf_uni_var.h" /* * Local variables diff --git a/sys/netproto/atm/uni/sscf_uni_upper.c b/sys/netproto/atm/uni/sscf_uni_upper.c index af2467bca5..651c6aecb6 100644 --- a/sys/netproto/atm/uni/sscf_uni_upper.c +++ b/sys/netproto/atm/uni/sscf_uni_upper.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscf_uni_upper.c,v 1.5 2000/01/17 20:49:50 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni_upper.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscf_uni_upper.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "uni.h" +#include "sscop.h" +#include "sscf_uni_var.h" /* * SSCF_UNI Upper Stack Command Handler diff --git a/sys/netproto/atm/uni/sscop.c b/sys/netproto/atm/uni/sscop.c index 8a880adfb8..fc81f4d3a1 100644 --- a/sys/netproto/atm/uni/sscop.c +++ b/sys/netproto/atm/uni/sscop.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop.c,v 1.6.2.1 2001/09/30 22:54:35 kris Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_pdu.h" +#include "sscop_var.h" /* * Global variables diff --git a/sys/netproto/atm/uni/sscop_lower.c b/sys/netproto/atm/uni/sscop_lower.c index a1153051de..61502dea27 100644 --- a/sys/netproto/atm/uni/sscop_lower.c +++ b/sys/netproto/atm/uni/sscop_lower.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_lower.c,v 1.5 2000/01/17 20:49:51 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_lower.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_lower.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_var.h" /* * Local variables diff --git a/sys/netproto/atm/uni/sscop_pdu.c b/sys/netproto/atm/uni/sscop_pdu.c index 6eef6d98a6..0a8f9dfffd 100644 --- a/sys/netproto/atm/uni/sscop_pdu.c +++ b/sys/netproto/atm/uni/sscop_pdu.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_pdu.c,v 1.5 2000/01/17 20:49:52 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_pdu.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_pdu.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_pdu.h" +#include "sscop_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/sscop_sigaa.c b/sys/netproto/atm/uni/sscop_sigaa.c index 2e7093a299..e372cae7a3 100644 --- a/sys/netproto/atm/uni/sscop_sigaa.c +++ b/sys/netproto/atm/uni/sscop_sigaa.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_sigaa.c,v 1.4 2000/01/17 20:49:52 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_sigaa.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_sigaa.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_var.h" /* * SSCOP_ESTABLISH_REQ / SOS_IDLE Command Processor diff --git a/sys/netproto/atm/uni/sscop_sigcpcs.c b/sys/netproto/atm/uni/sscop_sigcpcs.c index 13ca770718..78ac710012 100644 --- a/sys/netproto/atm/uni/sscop_sigcpcs.c +++ b/sys/netproto/atm/uni/sscop_sigcpcs.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_sigcpcs.c,v 1.4 2000/01/17 20:49:52 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_sigcpcs.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_sigcpcs.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_pdu.h" +#include "sscop_var.h" /* * No-op Processor diff --git a/sys/netproto/atm/uni/sscop_subr.c b/sys/netproto/atm/uni/sscop_subr.c index f21c8444a7..1eb8f849f9 100644 --- a/sys/netproto/atm/uni/sscop_subr.c +++ b/sys/netproto/atm/uni/sscop_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_subr.c,v 1.6 2000/01/17 20:49:52 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_subr.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_subr.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_pdu.h" +#include "sscop_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/sscop_timer.c b/sys/netproto/atm/uni/sscop_timer.c index 0b3343a3a8..9e83a6023e 100644 --- a/sys/netproto/atm/uni/sscop_timer.c +++ b/sys/netproto/atm/uni/sscop_timer.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_timer.c,v 1.6 2000/01/17 20:49:53 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_timer.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_timer.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/sscop_upper.c b/sys/netproto/atm/uni/sscop_upper.c index 0a6fc9cde5..cf1bf9bb8d 100644 --- a/sys/netproto/atm/uni/sscop_upper.c +++ b/sys/netproto/atm/uni/sscop_upper.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/sscop_upper.c,v 1.5 2000/01/17 20:49:54 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_upper.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/sscop_upper.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "sscop.h" +#include "sscop_misc.h" +#include "sscop_pdu.h" +#include "sscop_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/uniarp.c b/sys/netproto/atm/uni/uniarp.c index e8a41b7174..823f07e921 100644 --- a/sys/netproto/atm/uni/uniarp.c +++ b/sys/netproto/atm/uni/uniarp.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp.c,v 1.8 2000/01/15 20:46:07 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -39,8 +39,8 @@ #include #include -#include -#include +#include "unisig_var.h" +#include "uniip_var.h" /* * Global variables diff --git a/sys/netproto/atm/uni/uniarp_cache.c b/sys/netproto/atm/uni/uniarp_cache.c index 84a2f6af7e..1b3153421d 100644 --- a/sys/netproto/atm/uni/uniarp_cache.c +++ b/sys/netproto/atm/uni/uniarp_cache.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp_cache.c,v 1.4 1999/08/28 00:49:02 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_cache.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_cache.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -39,8 +39,8 @@ #include #include -#include -#include +#include "unisig_var.h" +#include "uniip_var.h" /* * Add data to the arp table cache diff --git a/sys/netproto/atm/uni/uniarp_input.c b/sys/netproto/atm/uni/uniarp_input.c index c60529dae2..6ac698a687 100644 --- a/sys/netproto/atm/uni/uniarp_input.c +++ b/sys/netproto/atm/uni/uniarp_input.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp_input.c,v 1.6 2000/01/17 20:49:55 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_input.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_input.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -39,7 +39,7 @@ #include #include -#include +#include "uniip_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/uniarp_output.c b/sys/netproto/atm/uni/uniarp_output.c index ad18c60bf3..03e4f6a38c 100644 --- a/sys/netproto/atm/uni/uniarp_output.c +++ b/sys/netproto/atm/uni/uniarp_output.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp_output.c,v 1.3 1999/08/28 00:49:03 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_output.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_output.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -39,7 +39,7 @@ #include #include -#include +#include "uniip_var.h" /* * Issue an ATMARP Request PDU diff --git a/sys/netproto/atm/uni/uniarp_timer.c b/sys/netproto/atm/uni/uniarp_timer.c index 13da08e4f6..386323e1e2 100644 --- a/sys/netproto/atm/uni/uniarp_timer.c +++ b/sys/netproto/atm/uni/uniarp_timer.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp_timer.c,v 1.4 2000/01/17 20:49:55 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_timer.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_timer.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -39,7 +39,7 @@ #include #include -#include +#include "uniip_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/uniarp_vcm.c b/sys/netproto/atm/uni/uniarp_vcm.c index 00b40eb3ef..f19efe9958 100644 --- a/sys/netproto/atm/uni/uniarp_vcm.c +++ b/sys/netproto/atm/uni/uniarp_vcm.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniarp_vcm.c,v 1.5 2000/01/17 20:49:55 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_vcm.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniarp_vcm.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -39,7 +39,7 @@ #include #include -#include +#include "uniip_var.h" /* * Local variables diff --git a/sys/netproto/atm/uni/uniip.c b/sys/netproto/atm/uni/uniip.c index d577840885..7bd0ec7d7c 100644 --- a/sys/netproto/atm/uni/uniip.c +++ b/sys/netproto/atm/uni/uniip.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/uniip.c,v 1.4 1999/08/28 00:49:03 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/uniip.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/uniip.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -39,7 +39,7 @@ #include #include -#include +#include "uniip_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/unisig_decode.c b/sys/netproto/atm/uni/unisig_decode.c index 20420cbbd2..e20a1e9e9f 100644 --- a/sys/netproto/atm/uni/unisig_decode.c +++ b/sys/netproto/atm/uni/unisig_decode.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_decode.c,v 1.5 2000/01/17 20:49:56 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_decode.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_decode.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "unisig_var.h" +#include "unisig_msg.h" +#include "unisig_mbuf.h" +#include "unisig_decode.h" #define ALLOC_IE(ie) \ (ie) = (struct ie_generic *) atm_allocate(&unisig_iepool); \ diff --git a/sys/netproto/atm/uni/unisig_encode.c b/sys/netproto/atm/uni/unisig_encode.c index b671ac0dcc..732558e9d2 100644 --- a/sys/netproto/atm/uni/unisig_encode.c +++ b/sys/netproto/atm/uni/unisig_encode.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_encode.c,v 1.5 2000/01/17 20:49:56 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_encode.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_encode.c,v 1.3 2003/08/07 21:17:35 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "unisig_var.h" +#include "unisig_msg.h" +#include "unisig_mbuf.h" +#include "unisig_decode.h" /* * Local functions diff --git a/sys/netproto/atm/uni/unisig_if.c b/sys/netproto/atm/uni/unisig_if.c index 809dee5cd3..6fc653fcb0 100644 --- a/sys/netproto/atm/uni/unisig_if.c +++ b/sys/netproto/atm/uni/unisig_if.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_if.c,v 1.8 2000/01/17 20:49:56 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_if.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_if.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ */ /* @@ -39,11 +39,11 @@ #include #include -#include +#include "uniip_var.h" -#include -#include -#include +#include "unisig.h" +#include "unisig_var.h" +#include "unisig_msg.h" /* * Global variables diff --git a/sys/netproto/atm/uni/unisig_mbuf.c b/sys/netproto/atm/uni/unisig_mbuf.c index ce6c42628f..96a1b8c83e 100644 --- a/sys/netproto/atm/uni/unisig_mbuf.c +++ b/sys/netproto/atm/uni/unisig_mbuf.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_mbuf.c,v 1.5 1999/08/28 00:49:05 peter Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_mbuf.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_mbuf.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "unisig_var.h" +#include "unisig_mbuf.h" +#include "unisig_msg.h" /* * Initialize a unisig formatting structure diff --git a/sys/netproto/atm/uni/unisig_msg.c b/sys/netproto/atm/uni/unisig_msg.c index b62887255e..49fae8650c 100644 --- a/sys/netproto/atm/uni/unisig_msg.c +++ b/sys/netproto/atm/uni/unisig_msg.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_msg.c,v 1.6 2000/01/17 20:49:56 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_msg.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_msg.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ */ /* @@ -37,10 +37,10 @@ #include -#include -#include -#include -#include +#include "unisig_var.h" +#include "unisig_msg.h" +#include "unisig_mbuf.h" +#include "unisig_print.h" /* * Local functions diff --git a/sys/netproto/atm/uni/unisig_print.c b/sys/netproto/atm/uni/unisig_print.c index 3700822d94..72ea432d65 100644 --- a/sys/netproto/atm/uni/unisig_print.c +++ b/sys/netproto/atm/uni/unisig_print.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_print.c,v 1.4 2000/01/17 20:49:57 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_print.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_print.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "unisig_var.h" +#include "unisig_msg.h" +#include "unisig_print.h" /* * Local declarations diff --git a/sys/netproto/atm/uni/unisig_proto.c b/sys/netproto/atm/uni/unisig_proto.c index 5dc804c8fb..e0eda6e545 100644 --- a/sys/netproto/atm/uni/unisig_proto.c +++ b/sys/netproto/atm/uni/unisig_proto.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_proto.c,v 1.5 2000/01/17 20:49:57 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_proto.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_proto.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ */ /* @@ -37,7 +37,7 @@ #include -#include +#include "unisig_var.h" /* * Process a UNISIG timeout diff --git a/sys/netproto/atm/uni/unisig_sigmgr_state.c b/sys/netproto/atm/uni/unisig_sigmgr_state.c index 3fbc4cdeb6..c8d7aa62fe 100644 --- a/sys/netproto/atm/uni/unisig_sigmgr_state.c +++ b/sys/netproto/atm/uni/unisig_sigmgr_state.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_sigmgr_state.c,v 1.6 2000/01/17 20:49:58 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_sigmgr_state.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_sigmgr_state.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ */ /* @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include "uni.h" +#include "unisig.h" +#include "unisig_var.h" /* * Local functions diff --git a/sys/netproto/atm/uni/unisig_subr.c b/sys/netproto/atm/uni/unisig_subr.c index e362d1b724..07c432618a 100644 --- a/sys/netproto/atm/uni/unisig_subr.c +++ b/sys/netproto/atm/uni/unisig_subr.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_subr.c,v 1.7 2000/01/17 20:49:58 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_subr.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_subr.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ */ /* @@ -37,8 +37,8 @@ #include -#include -#include +#include "unisig_var.h" +#include "unisig_msg.h" /* * External variables diff --git a/sys/netproto/atm/uni/unisig_util.c b/sys/netproto/atm/uni/unisig_util.c index 590fcc8b5f..46b9a72b3a 100644 --- a/sys/netproto/atm/uni/unisig_util.c +++ b/sys/netproto/atm/uni/unisig_util.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_util.c,v 1.6 2000/01/17 20:49:58 mks Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_util.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_util.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ */ /* @@ -37,8 +37,8 @@ #include -#include -#include +#include "unisig_var.h" +#include "unisig_msg.h" /* * Free a UNISIG signalling message diff --git a/sys/netproto/atm/uni/unisig_vc_state.c b/sys/netproto/atm/uni/unisig_vc_state.c index 60c4c68203..67ed8cac19 100644 --- a/sys/netproto/atm/uni/unisig_vc_state.c +++ b/sys/netproto/atm/uni/unisig_vc_state.c @@ -24,7 +24,7 @@ * notice must be reproduced on all copies. * * @(#) $FreeBSD: src/sys/netatm/uni/unisig_vc_state.c,v 1.6.2.1 2001/07/25 20:53:44 pirzyk Exp $ - * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_vc_state.c,v 1.2 2003/06/17 04:28:49 dillon Exp $ + * @(#) $DragonFly: src/sys/netproto/atm/uni/unisig_vc_state.c,v 1.3 2003/08/07 21:17:36 dillon Exp $ */ /* @@ -37,8 +37,8 @@ #include -#include -#include +#include "unisig_var.h" +#include "unisig_msg.h" /* * Local functions diff --git a/sys/netproto/ipsec/ipsec.c b/sys/netproto/ipsec/ipsec.c index 98936b7160..5e51ea6596 100644 --- a/sys/netproto/ipsec/ipsec.c +++ b/sys/netproto/ipsec/ipsec.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/ipsec.c,v 1.2.2.1 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/ipsec.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/ipsec.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */ /* @@ -76,20 +76,20 @@ #include #endif -#include +#include "ipsec.h" #ifdef INET6 -#include +#include "ipsec6.h" #endif -#include -#include -#include /*XXX*/ -#include +#include "ah_var.h" +#include "esp_var.h" +#include "ipcomp.h" /*XXX*/ +#include "ipcomp_var.h" -#include -#include -#include +#include "key.h" +#include "keydb.h" +#include "key_debug.h" -#include +#include "xform.h" #include diff --git a/sys/netproto/ipsec/ipsec.h b/sys/netproto/ipsec/ipsec.h index 0f955354c4..8b685776b0 100644 --- a/sys/netproto/ipsec/ipsec.h +++ b/sys/netproto/ipsec/ipsec.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/ipsec.h,v 1.2.4.1 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/ipsec.h,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/ipsec.h,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */ /* @@ -44,7 +44,7 @@ #endif #include -#include +#include "keydb.h" #ifdef _KERNEL diff --git a/sys/netproto/ipsec/ipsec6.h b/sys/netproto/ipsec/ipsec6.h index b2f9c2dd53..552c2b91ce 100644 --- a/sys/netproto/ipsec/ipsec6.h +++ b/sys/netproto/ipsec/ipsec6.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/ipsec6.h,v 1.1.4.1 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/ipsec6.h,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/ipsec6.h,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: ipsec.h,v 1.44 2001/03/23 08:08:47 itojun Exp $ */ /* @@ -39,7 +39,7 @@ #define _NETIPSEC_IPSEC6_H_ #include -#include +#include "keydb.h" #ifdef _KERNEL extern int ip6_esp_trans_deflev; diff --git a/sys/netproto/ipsec/ipsec_input.c b/sys/netproto/ipsec/ipsec_input.c index 528eade151..a82312df31 100644 --- a/sys/netproto/ipsec/ipsec_input.c +++ b/sys/netproto/ipsec/ipsec_input.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/ipsec_input.c,v 1.2.4.2 2003/03/28 20:32:53 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/ipsec_input.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/ipsec_input.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $OpenBSD: ipsec_input.c,v 1.63 2003/02/20 18:35:43 deraadt Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -74,19 +74,19 @@ #include #endif -#include +#include "ipsec.h" #ifdef INET6 -#include +#include "ipsec6.h" #endif -#include -#include -#include -#include +#include "ah_var.h" +#include "esp.h" +#include "esp_var.h" +#include "ipcomp_var.h" -#include -#include +#include "key.h" +#include "keydb.h" -#include +#include "xform.h" #include #include diff --git a/sys/netproto/ipsec/ipsec_mbuf.c b/sys/netproto/ipsec/ipsec_mbuf.c index 172dca623b..c23c30269e 100644 --- a/sys/netproto/ipsec/ipsec_mbuf.c +++ b/sys/netproto/ipsec/ipsec_mbuf.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netipsec/ipsec_mbuf.c,v 1.5.2.2 2003/03/28 20:32:53 sam Exp $ - * $DragonFly: src/sys/netproto/ipsec/ipsec_mbuf.c,v 1.3 2003/07/26 21:06:09 rob Exp $ + * $DragonFly: src/sys/netproto/ipsec/ipsec_mbuf.c,v 1.4 2003/08/07 21:17:37 dillon Exp $ */ /* @@ -41,7 +41,7 @@ #include #include -#include +#include "ipsec.h" extern struct mbuf *m_getptr(struct mbuf *, int, int *); diff --git a/sys/netproto/ipsec/ipsec_output.c b/sys/netproto/ipsec/ipsec_output.c index 7622ef9b0a..79c793da8e 100644 --- a/sys/netproto/ipsec/ipsec_output.c +++ b/sys/netproto/ipsec/ipsec_output.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netipsec/ipsec_output.c,v 1.3.2.2 2003/03/28 20:32:53 sam Exp $ - * $DragonFly: src/sys/netproto/ipsec/ipsec_output.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ + * $DragonFly: src/sys/netproto/ipsec/ipsec_output.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* @@ -65,19 +65,19 @@ #include #endif -#include +#include "ipsec.h" #ifdef INET6 -#include +#include "ipsec6.h" #endif -#include -#include -#include +#include "ah_var.h" +#include "esp_var.h" +#include "ipcomp_var.h" -#include +#include "xform.h" -#include -#include -#include +#include "key.h" +#include "keydb.h" +#include "key_debug.h" #include diff --git a/sys/netproto/ipsec/key.c b/sys/netproto/ipsec/key.c index bbd04d3499..d7899f556e 100644 --- a/sys/netproto/ipsec/key.c +++ b/sys/netproto/ipsec/key.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.1 2003/01/24 05:11:35 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/key.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/key.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ /* @@ -78,17 +78,17 @@ #endif /* INET6 */ #include -#include -#include -#include -#include +#include "keydb.h" +#include "key.h" +#include "keysock.h" +#include "key_debug.h" -#include +#include "ipsec.h" #ifdef INET6 -#include +#include "ipsec6.h" #endif -#include +#include "xform.h" #include diff --git a/sys/netproto/ipsec/key_debug.c b/sys/netproto/ipsec/key_debug.c index cb7e6f34ba..75b2133497 100644 --- a/sys/netproto/ipsec/key_debug.c +++ b/sys/netproto/ipsec/key_debug.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/key_debug.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/key_debug.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/key_debug.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $ */ /* @@ -48,11 +48,11 @@ #include -#include -#include +#include "key_var.h" +#include "key_debug.h" #include -#include +#include "ipsec.h" #ifndef _KERNEL #include diff --git a/sys/netproto/ipsec/keydb.h b/sys/netproto/ipsec/keydb.h index d1889af5a2..56c6ec6a28 100644 --- a/sys/netproto/ipsec/keydb.h +++ b/sys/netproto/ipsec/keydb.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/keydb.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/keydb.h,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/keydb.h,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $ */ /* @@ -36,7 +36,7 @@ #ifdef _KERNEL -#include +#include "key_var.h" /* * The union of all possible address formats we handle. diff --git a/sys/netproto/ipsec/keysock.c b/sys/netproto/ipsec/keysock.c index b4c8655f76..20a296a701 100644 --- a/sys/netproto/ipsec/keysock.c +++ b/sys/netproto/ipsec/keysock.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/keysock.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/keysock.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */ /* @@ -53,9 +53,9 @@ #include #include -#include -#include -#include +#include "key.h" +#include "keysock.h" +#include "key_debug.h" #include diff --git a/sys/netproto/ipsec/xform_ah.c b/sys/netproto/ipsec/xform_ah.c index 917d726af5..1159d8e0ea 100644 --- a/sys/netproto/ipsec/xform_ah.c +++ b/sys/netproto/ipsec/xform_ah.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.2 2003/02/26 00:14:05 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/xform_ah.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/xform_ah.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -57,19 +57,19 @@ #include #include -#include -#include -#include -#include +#include "ipsec.h" +#include "ah.h" +#include "ah_var.h" +#include "xform.h" #ifdef INET6 #include -#include +#include "ipsec6.h" #include #endif -#include -#include +#include "key.h" +#include "key_debug.h" #include diff --git a/sys/netproto/ipsec/xform_esp.c b/sys/netproto/ipsec/xform_esp.c index 2c1ef7c4d1..de05842282 100644 --- a/sys/netproto/ipsec/xform_esp.c +++ b/sys/netproto/ipsec/xform_esp.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.2 2003/02/26 00:14:05 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/xform_esp.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/xform_esp.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -57,21 +57,21 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "ipsec.h" +#include "ah.h" +#include "ah_var.h" +#include "esp.h" +#include "esp_var.h" +#include "xform.h" #ifdef INET6 #include -#include +#include "ipsec6.h" #include #endif -#include -#include +#include "key.h" +#include "key_debug.h" #include #include diff --git a/sys/netproto/ipsec/xform_ipcomp.c b/sys/netproto/ipsec/xform_ipcomp.c index 2e4887a806..f0d1af2a42 100644 --- a/sys/netproto/ipsec/xform_ipcomp.c +++ b/sys/netproto/ipsec/xform_ipcomp.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.1.4.2 2003/02/26 00:14:06 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/xform_ipcomp.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/xform_ipcomp.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */ /* @@ -47,19 +47,19 @@ #include #include -#include -#include +#include "ipsec.h" +#include "xform.h" #ifdef INET6 #include -#include +#include "ipsec6.h" #endif -#include -#include +#include "ipcomp.h" +#include "ipcomp_var.h" -#include -#include +#include "key.h" +#include "key_debug.h" #include #include diff --git a/sys/netproto/ipsec/xform_ipip.c b/sys/netproto/ipsec/xform_ipip.c index eda75fc37d..f77d853f13 100644 --- a/sys/netproto/ipsec/xform_ipip.c +++ b/sys/netproto/ipsec/xform_ipip.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */ -/* $DragonFly: src/sys/netproto/ipsec/xform_ipip.c,v 1.3 2003/07/26 21:06:09 rob Exp $ */ +/* $DragonFly: src/sys/netproto/ipsec/xform_ipip.c,v 1.4 2003/08/07 21:17:37 dillon Exp $ */ /* $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -65,10 +65,10 @@ #include #include -#include -#include +#include "ipsec.h" +#include "xform.h" -#include +#include "ipip_var.h" #ifdef MROUTING #include @@ -76,14 +76,14 @@ #ifdef INET6 #include -#include +#include "ipsec6.h" #include #include #include #endif -#include -#include +#include "key.h" +#include "key_debug.h" #include diff --git a/sys/netproto/ipx/ipx.c b/sys/netproto/ipx/ipx.c index bf795288c1..23a29d13a6 100644 --- a/sys/netproto/ipx/ipx.c +++ b/sys/netproto/ipx/ipx.c @@ -34,7 +34,7 @@ * @(#)ipx.c * * $FreeBSD: src/sys/netipx/ipx.c,v 1.17.2.3 2003/04/04 09:35:43 tjr Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx.c,v 1.4 2003/07/26 21:07:36 rob Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx.c,v 1.5 2003/08/07 21:17:37 dillon Exp $ */ #include @@ -47,9 +47,9 @@ #include #include -#include -#include -#include +#include "ipx.h" +#include "ipx_if.h" +#include "ipx_var.h" struct ipx_ifaddr *ipx_ifaddr; diff --git a/sys/netproto/ipx/ipx_cksum.c b/sys/netproto/ipx/ipx_cksum.c index e23599d721..a3ce05e045 100644 --- a/sys/netproto/ipx/ipx_cksum.c +++ b/sys/netproto/ipx/ipx_cksum.c @@ -34,15 +34,15 @@ * @(#)ipx_cksum.c * * $FreeBSD: src/sys/netipx/ipx_cksum.c,v 1.9 1999/08/28 18:21:53 jhay Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_cksum.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_cksum.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ #include #include #include -#include -#include +#include "ipx.h" +#include "ipx_var.h" #define SUMADV sum += *w++ diff --git a/sys/netproto/ipx/ipx_input.c b/sys/netproto/ipx/ipx_input.c index 49a7300c55..6149317bbb 100644 --- a/sys/netproto/ipx/ipx_input.c +++ b/sys/netproto/ipx/ipx_input.c @@ -34,7 +34,7 @@ * @(#)ipx_input.c * * $FreeBSD: src/sys/netipx/ipx_input.c,v 1.22.2.2 2001/02/22 09:44:18 bp Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_input.c,v 1.3 2003/07/26 21:07:36 rob Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_input.c,v 1.4 2003/08/07 21:17:37 dillon Exp $ */ #include @@ -51,11 +51,11 @@ #include #include -#include -#include -#include -#include -#include +#include "ipx.h" +#include "spx.h" +#include "ipx_if.h" +#include "ipx_pcb.h" +#include "ipx_var.h" int ipxcksum = 0; SYSCTL_INT(_net_ipx_ipx, OID_AUTO, checksum, CTLFLAG_RW, diff --git a/sys/netproto/ipx/ipx_ip.c b/sys/netproto/ipx/ipx_ip.c index 4c5ac8e17a..cd66888e12 100644 --- a/sys/netproto/ipx/ipx_ip.c +++ b/sys/netproto/ipx/ipx_ip.c @@ -34,7 +34,7 @@ * @(#)ipx_ip.c * * $FreeBSD: src/sys/netipx/ipx_ip.c,v 1.24.2.2 2003/01/23 21:06:48 sam Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_ip.c,v 1.5 2003/07/26 21:07:36 rob Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_ip.c,v 1.6 2003/08/07 21:17:37 dillon Exp $ */ /* @@ -68,10 +68,10 @@ #include #include -#include -#include -#include -#include +#include "ipx.h" +#include "ipx_if.h" +#include "ipx_ip.h" +#include "ipx_var.h" static struct ifnet ipxipif; diff --git a/sys/netproto/ipx/ipx_outputfl.c b/sys/netproto/ipx/ipx_outputfl.c index 68ce89e203..fc90d71573 100644 --- a/sys/netproto/ipx/ipx_outputfl.c +++ b/sys/netproto/ipx/ipx_outputfl.c @@ -34,7 +34,7 @@ * @(#)ipx_outputfl.c * * $FreeBSD: src/sys/netipx/ipx_outputfl.c,v 1.14.2.1 2000/05/01 01:10:24 bp Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_outputfl.c,v 1.3 2003/07/26 21:07:36 rob Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_outputfl.c,v 1.4 2003/08/07 21:17:37 dillon Exp $ */ #include @@ -45,9 +45,9 @@ #include #include -#include -#include -#include +#include "ipx.h" +#include "ipx_if.h" +#include "ipx_var.h" #ifdef vax #include diff --git a/sys/netproto/ipx/ipx_pcb.c b/sys/netproto/ipx/ipx_pcb.c index 4a488b0f8e..a90dd709f8 100644 --- a/sys/netproto/ipx/ipx_pcb.c +++ b/sys/netproto/ipx/ipx_pcb.c @@ -34,7 +34,7 @@ * @(#)ipx_pcb.c * * $FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.18.2.1 2001/02/22 09:44:18 bp Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_pcb.c,v 1.5 2003/07/26 21:07:36 rob Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_pcb.c,v 1.6 2003/08/07 21:17:37 dillon Exp $ */ #include @@ -47,10 +47,10 @@ #include #include -#include -#include -#include -#include +#include "ipx.h" +#include "ipx_if.h" +#include "ipx_pcb.h" +#include "ipx_var.h" static struct ipx_addr zeroipx_addr; diff --git a/sys/netproto/ipx/ipx_proto.c b/sys/netproto/ipx/ipx_proto.c index fb699a67bd..959a90621e 100644 --- a/sys/netproto/ipx/ipx_proto.c +++ b/sys/netproto/ipx/ipx_proto.c @@ -34,7 +34,7 @@ * @(#)ipx_proto.c * * $FreeBSD: src/sys/netipx/ipx_proto.c,v 1.15 1999/08/28 00:49:41 peter Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_proto.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_proto.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ #include "opt_ipx.h" @@ -49,9 +49,9 @@ #include -#include -#include -#include +#include "ipx.h" +#include "ipx_var.h" +#include "spx.h" extern struct domain ipxdomain; static struct pr_usrreqs nousrreqs; diff --git a/sys/netproto/ipx/ipx_usrreq.c b/sys/netproto/ipx/ipx_usrreq.c index da69e0734d..e319aedd3b 100644 --- a/sys/netproto/ipx/ipx_usrreq.c +++ b/sys/netproto/ipx/ipx_usrreq.c @@ -34,7 +34,7 @@ * @(#)ipx_usrreq.c * * $FreeBSD: src/sys/netipx/ipx_usrreq.c,v 1.26.2.1 2001/02/22 09:44:18 bp Exp $ - * $DragonFly: src/sys/netproto/ipx/ipx_usrreq.c,v 1.4 2003/07/26 21:07:36 rob Exp $ + * $DragonFly: src/sys/netproto/ipx/ipx_usrreq.c,v 1.5 2003/08/07 21:17:37 dillon Exp $ */ #include "opt_ipx.h" @@ -54,11 +54,11 @@ #include -#include -#include -#include -#include -#include +#include "ipx.h" +#include "ipx_pcb.h" +#include "ipx_if.h" +#include "ipx_var.h" +#include "ipx_ip.h" /* * IPX protocol implementation. diff --git a/sys/netproto/ipx/spx_debug.c b/sys/netproto/ipx/spx_debug.c index 294c3e4e84..b53637bc20 100644 --- a/sys/netproto/ipx/spx_debug.c +++ b/sys/netproto/ipx/spx_debug.c @@ -34,7 +34,7 @@ * @(#)spx_debug.c * * $FreeBSD: src/sys/netipx/spx_debug.c,v 1.14 1999/08/28 00:49:43 peter Exp $ - * $DragonFly: src/sys/netproto/ipx/spx_debug.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ + * $DragonFly: src/sys/netproto/ipx/spx_debug.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ #include "opt_inet.h" @@ -47,13 +47,13 @@ #include #include -#include -#include -#include +#include "ipx.h" +#include "ipx_var.h" +#include "spx.h" #define SPXTIMERS -#include +#include "spx_timer.h" #define SANAMES -#include +#include "spx_debug.h" #ifdef TCPDEBUG static int spxconsdebug = 0; diff --git a/sys/netproto/ipx/spx_usrreq.c b/sys/netproto/ipx/spx_usrreq.c index a59e7ac229..8b1cf6ac0c 100644 --- a/sys/netproto/ipx/spx_usrreq.c +++ b/sys/netproto/ipx/spx_usrreq.c @@ -34,7 +34,7 @@ * @(#)spx_usrreq.h * * $FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.27.2.1 2001/02/22 09:44:18 bp Exp $ - * $DragonFly: src/sys/netproto/ipx/spx_usrreq.c,v 1.4 2003/07/26 21:07:36 rob Exp $ + * $DragonFly: src/sys/netproto/ipx/spx_usrreq.c,v 1.5 2003/08/07 21:17:37 dillon Exp $ */ #include @@ -49,13 +49,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "ipx.h" +#include "ipx_pcb.h" +#include "ipx_var.h" +#include "spx.h" +#include "spx_timer.h" +#include "spx_var.h" +#include "spx_debug.h" /* * SPX protocol implementation. diff --git a/sys/netproto/key/key.c b/sys/netproto/key/key.c index 9d04c9aeba..71d79ebf99 100644 --- a/sys/netproto/key/key.c +++ b/sys/netproto/key/key.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netkey/key.c,v 1.16.2.13 2002/07/24 18:17:40 ume Exp $ */ -/* $DragonFly: src/sys/netproto/key/key.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/key/key.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ /* @@ -78,10 +78,10 @@ #endif /* INET6 */ #include -#include -#include -#include -#include +#include "keydb.h" +#include "key.h" +#include "keysock.h" +#include "key_debug.h" #include #ifdef INET6 diff --git a/sys/netproto/key/key_debug.c b/sys/netproto/key/key_debug.c index 2a8d9857fd..25082811fe 100644 --- a/sys/netproto/key/key_debug.c +++ b/sys/netproto/key/key_debug.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netkey/key_debug.c,v 1.10.2.5 2002/04/28 05:40:28 suz Exp $ */ -/* $DragonFly: src/sys/netproto/key/key_debug.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/key/key_debug.c,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $ */ /* @@ -48,8 +48,8 @@ #include -#include -#include +#include "key_var.h" +#include "key_debug.h" #include #include diff --git a/sys/netproto/key/keydb.c b/sys/netproto/key/keydb.c index 5692fef16a..d45603a9d4 100644 --- a/sys/netproto/key/keydb.c +++ b/sys/netproto/key/keydb.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netkey/keydb.c,v 1.1.2.1 2000/07/15 07:14:42 kris Exp $ */ -/* $DragonFly: src/sys/netproto/key/keydb.c,v 1.3 2003/07/21 07:57:51 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/key/keydb.c,v 1.4 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: keydb.c,v 1.64 2000/05/11 17:02:30 itojun Exp $ */ /* @@ -50,7 +50,7 @@ #include #include -#include +#include "keydb.h" #include #include diff --git a/sys/netproto/key/keydb.h b/sys/netproto/key/keydb.h index ba5f4b88b1..c401e27823 100644 --- a/sys/netproto/key/keydb.h +++ b/sys/netproto/key/keydb.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netkey/keydb.h,v 1.2.2.3 2003/01/11 19:10:59 ume Exp $ */ -/* $DragonFly: src/sys/netproto/key/keydb.h,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/key/keydb.h,v 1.3 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: keydb.h,v 1.14 2000/08/02 17:58:26 sakane Exp $ */ /* @@ -36,7 +36,7 @@ #ifdef _KERNEL -#include +#include "key_var.h" /* Security Assocciation Index */ /* NOTE: Ensure to be same address family */ diff --git a/sys/netproto/key/keysock.c b/sys/netproto/key/keysock.c index 792b892fad..f081327984 100644 --- a/sys/netproto/key/keysock.c +++ b/sys/netproto/key/keysock.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netkey/keysock.c,v 1.1.2.4 2003/01/11 19:10:59 ume Exp $ */ -/* $DragonFly: src/sys/netproto/key/keysock.c,v 1.4 2003/07/29 12:51:30 hmp Exp $ */ +/* $DragonFly: src/sys/netproto/key/keysock.c,v 1.5 2003/08/07 21:17:37 dillon Exp $ */ /* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */ /* @@ -55,10 +55,10 @@ #include #include -#include -#include -#include -#include +#include "keydb.h" +#include "key.h" +#include "keysock.h" +#include "key_debug.h" #include diff --git a/sys/netproto/natm/natm.c b/sys/netproto/natm/natm.c index 930575fb78..4944019bb1 100644 --- a/sys/netproto/natm/natm.c +++ b/sys/netproto/natm/natm.c @@ -1,6 +1,6 @@ /* $NetBSD: natm.c,v 1.5 1996/11/09 03:26:26 chuck Exp $ */ /* $FreeBSD: src/sys/netnatm/natm.c,v 1.12 2000/02/13 03:32:03 peter Exp $ */ -/* $DragonFly: src/sys/netproto/natm/natm.c,v 1.3 2003/07/21 07:57:51 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/natm/natm.c,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ /* * @@ -54,7 +54,7 @@ #include -#include +#include "natm.h" static u_long natm5_sendspace = 16*1024; static u_long natm5_recvspace = 16*1024; diff --git a/sys/netproto/natm/natm_pcb.c b/sys/netproto/natm/natm_pcb.c index 7fbf15ce7c..bdfe80f535 100644 --- a/sys/netproto/natm/natm_pcb.c +++ b/sys/netproto/natm/natm_pcb.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/netnatm/natm_pcb.c,v 1.6.6.1 2000/08/03 18:56:28 peter Exp $ */ -/* $DragonFly: src/sys/netproto/natm/natm_pcb.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ */ +/* $DragonFly: src/sys/netproto/natm/natm_pcb.c,v 1.3 2003/08/07 21:17:38 dillon Exp $ */ /* $NetBSD: natm_pcb.c,v 1.4 1996/11/09 03:26:27 chuck Exp $ */ /* @@ -49,7 +49,7 @@ #include -#include +#include "natm.h" struct npcblist natm_pcbs; diff --git a/sys/netproto/natm/natm_proto.c b/sys/netproto/natm/natm_proto.c index 90d6fc59ff..c8df7cf418 100644 --- a/sys/netproto/natm/natm_proto.c +++ b/sys/netproto/natm/natm_proto.c @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/netnatm/natm_proto.c,v 1.4.2.2 2000/08/03 18:56:28 peter Exp $ - * $DragonFly: src/sys/netproto/natm/natm_proto.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ + * $DragonFly: src/sys/netproto/natm/natm_proto.c,v 1.3 2003/08/07 21:17:38 dillon Exp $ */ /* @@ -51,7 +51,7 @@ #include -#include +#include "natm.h" extern struct domain natmdomain; diff --git a/sys/netproto/ncp/ncp_conn.c b/sys/netproto/ncp/ncp_conn.c index 3ce8e46196..35fb4ea488 100644 --- a/sys/netproto/ncp/ncp_conn.c +++ b/sys/netproto/ncp/ncp_conn.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * $FreeBSD: src/sys/netncp/ncp_conn.c,v 1.3.2.5 2001/02/22 08:54:11 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_conn.c,v 1.4 2003/07/19 21:14:44 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_conn.c,v 1.5 2003/08/07 21:17:38 dillon Exp $ * * Connection tables */ @@ -41,9 +41,9 @@ #include #include -#include -#include -#include +#include "ncp.h" +#include "ncp_subr.h" +#include "ncp_conn.h" SLIST_HEAD(ncp_handle_head,ncp_handle); diff --git a/sys/netproto/ncp/ncp_crypt.c b/sys/netproto/ncp/ncp_crypt.c index 106c691bff..ef22616662 100644 --- a/sys/netproto/ncp/ncp_crypt.c +++ b/sys/netproto/ncp/ncp_crypt.c @@ -1,11 +1,11 @@ /* * $FreeBSD: src/sys/netncp/ncp_crypt.c,v 1.3.2.1 2001/02/22 08:57:58 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_crypt.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_crypt.c,v 1.3 2003/08/07 21:17:38 dillon Exp $ */ #include #include -#include -#include +#include "ncp.h" +#include "ncp_subr.h" /* * Routines in this file based on work of Volker Lendecke diff --git a/sys/netproto/ncp/ncp_lib.h b/sys/netproto/ncp/ncp_lib.h index e4d01703fd..252c65cb4b 100644 --- a/sys/netproto/ncp/ncp_lib.h +++ b/sys/netproto/ncp/ncp_lib.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netncp/ncp_lib.h,v 1.2.2.1 2001/02/22 09:09:51 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_lib.h,v 1.2 2003/06/17 04:28:53 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_lib.h,v 1.3 2003/08/07 21:17:38 dillon Exp $ */ #ifndef _NETNCP_NCP_LIB_H_ @@ -39,10 +39,10 @@ #define IPX #define INET -#include -#include -#include -#include +#include "ncp.h" +#include "ncp_conn.h" +#include "ncp_user.h" +#include "ncp_rq.h" #define ncp_printf printf diff --git a/sys/netproto/ncp/ncp_login.c b/sys/netproto/ncp/ncp_login.c index 33d7b4b2c6..ce71109275 100644 --- a/sys/netproto/ncp/ncp_login.c +++ b/sys/netproto/ncp/ncp_login.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netncp/ncp_login.c,v 1.2 1999/10/12 10:36:59 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_login.c,v 1.3 2003/06/25 03:56:05 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_login.c,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ #include #include @@ -39,13 +39,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "ncp.h" +#include "ncp_conn.h" +#include "ncp_subr.h" +#include "ncp_ncp.h" +#include "ncp_rq.h" +#include "ncp_nls.h" +#include "nwerror.h" static int ncp_login_encrypted(struct ncp_conn *conn, struct ncp_bindery_object *object, unsigned char *key, unsigned char *passwd, diff --git a/sys/netproto/ncp/ncp_mod.c b/sys/netproto/ncp/ncp_mod.c index b2141b9807..a871d1f937 100644 --- a/sys/netproto/ncp/ncp_mod.c +++ b/sys/netproto/ncp/ncp_mod.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netncp/ncp_mod.c,v 1.2 1999/10/12 10:36:59 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_mod.c,v 1.6 2003/07/30 00:19:15 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_mod.c,v 1.7 2003/08/07 21:17:38 dillon Exp $ */ #include #include @@ -43,13 +43,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "ncp.h" +#include "ncp_conn.h" +#include "ncp_subr.h" +#include "ncp_ncp.h" +#include "ncp_user.h" +#include "ncp_rq.h" +#include "ncp_nls.h" int ncp_version = NCP_VERSION; diff --git a/sys/netproto/ncp/ncp_ncp.c b/sys/netproto/ncp/ncp_ncp.c index db4bd80067..4401fbf9f0 100644 --- a/sys/netproto/ncp/ncp_ncp.c +++ b/sys/netproto/ncp/ncp_ncp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netncp/ncp_ncp.c,v 1.3 1999/10/29 10:21:07 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_ncp.c,v 1.4 2003/06/26 02:17:46 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_ncp.c,v 1.5 2003/08/07 21:17:38 dillon Exp $ * * Core of NCP protocol */ @@ -50,13 +50,13 @@ #include #endif -#include -#include -#include -#include -#include -#include -#include +#include "ncp.h" +#include "ncp_conn.h" +#include "ncp_sock.h" +#include "ncp_subr.h" +#include "ncp_ncp.h" +#include "ncp_rq.h" +#include "nwerror.h" static int ncp_do_request(struct ncp_conn *,struct ncp_rq *rqp); static int ncp_negotiate_buffersize(struct ncp_conn *conn, int size, int *target); diff --git a/sys/netproto/ncp/ncp_nls.c b/sys/netproto/ncp/ncp_nls.c index 27e42d0184..1cfc4a085a 100644 --- a/sys/netproto/ncp/ncp_nls.c +++ b/sys/netproto/ncp/ncp_nls.c @@ -32,13 +32,13 @@ * Character conversion routines * * $FreeBSD: src/sys/netncp/ncp_nls.c,v 1.4 2000/01/29 02:10:37 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_nls.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_nls.c,v 1.3 2003/08/07 21:17:38 dillon Exp $ */ #include #include -#include -#include +#include "ncp.h" +#include "ncp_nls.h" /* * 0 - character disallowed in NetWare file name. diff --git a/sys/netproto/ncp/ncp_rq.c b/sys/netproto/ncp/ncp_rq.c index 352f721d98..4eb197138f 100644 --- a/sys/netproto/ncp/ncp_rq.c +++ b/sys/netproto/ncp/ncp_rq.c @@ -32,7 +32,7 @@ * Routines to prepare request and fetch reply * * $FreeBSD: src/sys/netncp/ncp_rq.c,v 1.1.2.1 2001/05/21 16:27:20 ru Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_rq.c,v 1.4 2003/07/26 21:09:10 rob Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_rq.c,v 1.5 2003/08/07 21:17:38 dillon Exp $ */ #include #include @@ -40,12 +40,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "ncp.h" +#include "ncp_conn.h" +#include "ncp_rq.h" +#include "ncp_subr.h" +#include "ncp_ncp.h" +#include "ncp_nls.h" int ncp_rq_head(struct ncp_rq *rqp, u_int32_t ptype, u_int8_t fn,struct thread *td, diff --git a/sys/netproto/ncp/ncp_sock.c b/sys/netproto/ncp/ncp_sock.c index 8c3efc967e..1af3e500ec 100644 --- a/sys/netproto/ncp/ncp_sock.c +++ b/sys/netproto/ncp/ncp_sock.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netncp/ncp_sock.c,v 1.2 1999/10/12 10:36:59 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_sock.c,v 1.5 2003/07/26 21:09:10 rob Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_sock.c,v 1.6 2003/08/07 21:17:38 dillon Exp $ * * Low level socket routines */ @@ -61,11 +61,11 @@ #include #endif -#include -#include -#include -#include -#include +#include "ncp.h" +#include "ncp_conn.h" +#include "ncp_sock.h" +#include "ncp_subr.h" +#include "ncp_rq.h" #ifdef IPX #define ipx_setnullnet(x) ((x).x_net.s_net[0]=0); ((x).x_net.s_net[1]=0); diff --git a/sys/netproto/ncp/ncp_subr.c b/sys/netproto/ncp/ncp_subr.c index 68bc5d0c99..afd79fb905 100644 --- a/sys/netproto/ncp/ncp_subr.c +++ b/sys/netproto/ncp/ncp_subr.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netncp/ncp_subr.c,v 1.2.2.1 2001/02/22 08:54:11 bp Exp $ - * $DragonFly: src/sys/netproto/ncp/ncp_subr.c,v 1.3 2003/06/25 03:56:05 dillon Exp $ + * $DragonFly: src/sys/netproto/ncp/ncp_subr.c,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ #include #include @@ -42,13 +42,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "ncp.h" +#include "ncp_conn.h" +#include "ncp_sock.h" +#include "ncp_subr.h" +#include "ncp_rq.h" +#include "ncp_ncp.h" +#include "nwerror.h" int ncp_debuglevel = 0; diff --git a/sys/netproto/ns/idp_usrreq.c b/sys/netproto/ns/idp_usrreq.c index 5fd6b15d5b..5691a18dc8 100644 --- a/sys/netproto/ns/idp_usrreq.c +++ b/sys/netproto/ns/idp_usrreq.c @@ -32,7 +32,7 @@ * * @(#)idp_usrreq.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/idp_usrreq.c,v 1.9 1999/08/28 00:49:47 peter Exp $ - * $DragonFly: src/sys/netproto/ns/idp_usrreq.c,v 1.3 2003/07/26 21:10:52 rob Exp $ + * $DragonFly: src/sys/netproto/ns/idp_usrreq.c,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ #include @@ -48,12 +48,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "ns.h" +#include "ns_pcb.h" +#include "ns_if.h" +#include "idp.h" +#include "idp_var.h" +#include "ns_error.h" /* * IDP protocol implementation. diff --git a/sys/netproto/ns/ns.c b/sys/netproto/ns/ns.c index 525b7ae899..d74d4daac8 100644 --- a/sys/netproto/ns/ns.c +++ b/sys/netproto/ns/ns.c @@ -32,7 +32,7 @@ * * @(#)ns.c 8.2 (Berkeley) 11/15/93 * $FreeBSD: src/sys/netns/ns.c,v 1.9 1999/08/28 00:49:47 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns.c,v 1.3 2003/07/26 21:10:52 rob Exp $ + * $DragonFly: src/sys/netproto/ns/ns.c,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ #include @@ -47,8 +47,8 @@ #include #include -#include -#include +#include "ns.h" +#include "ns_if.h" #ifdef NS diff --git a/sys/netproto/ns/ns_error.c b/sys/netproto/ns/ns_error.c index 8df7d8c95c..4bc06eeb4c 100644 --- a/sys/netproto/ns/ns_error.c +++ b/sys/netproto/ns/ns_error.c @@ -32,7 +32,7 @@ * * @(#)ns_error.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/ns_error.c,v 1.9 1999/08/28 00:49:49 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns_error.c,v 1.3 2003/07/26 21:10:52 rob Exp $ + * $DragonFly: src/sys/netproto/ns/ns_error.c,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ #include @@ -46,10 +46,10 @@ #include -#include -#include -#include -#include +#include "ns.h" +#include "ns_pcb.h" +#include "idp.h" +#include "ns_error.h" #ifdef lint #define NS_ERRPRINTFS 1 diff --git a/sys/netproto/ns/ns_input.c b/sys/netproto/ns/ns_input.c index e73f3ce289..8fc767f7e5 100644 --- a/sys/netproto/ns/ns_input.c +++ b/sys/netproto/ns/ns_input.c @@ -32,7 +32,7 @@ * * @(#)ns_input.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/ns_input.c,v 1.13 2000/02/13 03:32:04 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns_input.c,v 1.3 2003/07/26 21:10:52 rob Exp $ + * $DragonFly: src/sys/netproto/ns/ns_input.c,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ #include @@ -53,12 +53,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "ns.h" +#include "ns_if.h" +#include "ns_pcb.h" +#include "idp.h" +#include "idp_var.h" +#include "ns_error.h" /* * NS initialization. diff --git a/sys/netproto/ns/ns_ip.c b/sys/netproto/ns/ns_ip.c index d0842716d5..87196d44f5 100644 --- a/sys/netproto/ns/ns_ip.c +++ b/sys/netproto/ns/ns_ip.c @@ -32,7 +32,7 @@ * * @(#)ns_ip.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/ns_ip.c,v 1.9 1999/08/28 00:49:50 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns_ip.c,v 1.3 2003/07/26 21:10:52 rob Exp $ + * $DragonFly: src/sys/netproto/ns/ns_ip.c,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ /* @@ -62,9 +62,9 @@ #include -#include -#include -#include +#include "ns.h" +#include "ns_if.h" +#include "idp.h" struct ifnet_en { struct ifnet ifen_ifnet; diff --git a/sys/netproto/ns/ns_output.c b/sys/netproto/ns/ns_output.c index f90746a253..f333dcc094 100644 --- a/sys/netproto/ns/ns_output.c +++ b/sys/netproto/ns/ns_output.c @@ -32,7 +32,7 @@ * * @(#)ns_output.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/ns_output.c,v 1.7 1999/08/28 00:49:51 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns_output.c,v 1.3 2003/07/26 21:10:52 rob Exp $ + * $DragonFly: src/sys/netproto/ns/ns_output.c,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ #include @@ -45,10 +45,10 @@ #include #include -#include -#include -#include -#include +#include "ns.h" +#include "ns_if.h" +#include "idp.h" +#include "idp_var.h" #ifdef vax #include diff --git a/sys/netproto/ns/ns_pcb.c b/sys/netproto/ns/ns_pcb.c index 4d5b988b35..6fdc8798d4 100644 --- a/sys/netproto/ns/ns_pcb.c +++ b/sys/netproto/ns/ns_pcb.c @@ -32,7 +32,7 @@ * * @(#)ns_pcb.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/ns_pcb.c,v 1.9 1999/08/28 00:49:51 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns_pcb.c,v 1.3 2003/07/26 21:10:52 rob Exp $ + * $DragonFly: src/sys/netproto/ns/ns_pcb.c,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ #include @@ -46,9 +46,9 @@ #include #include -#include -#include -#include +#include "ns.h" +#include "ns_if.h" +#include "ns_pcb.h" struct ns_addr zerons_addr; diff --git a/sys/netproto/ns/ns_proto.c b/sys/netproto/ns/ns_proto.c index f583d0a88c..e214d6e694 100644 --- a/sys/netproto/ns/ns_proto.c +++ b/sys/netproto/ns/ns_proto.c @@ -32,7 +32,7 @@ * * From: @(#)ns_proto.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/ns_proto.c,v 1.10 1999/08/28 00:49:51 peter Exp $ - * $DragonFly: src/sys/netproto/ns/ns_proto.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ + * $DragonFly: src/sys/netproto/ns/ns_proto.c,v 1.3 2003/08/07 21:17:38 dillon Exp $ */ #include @@ -44,7 +44,7 @@ #include -#include +#include "ns.h" /* * NS protocol family: IDP, ERR, PE, SPP, ROUTE. diff --git a/sys/netproto/ns/spp_debug.c b/sys/netproto/ns/spp_debug.c index 87d68c3aed..508873cb64 100644 --- a/sys/netproto/ns/spp_debug.c +++ b/sys/netproto/ns/spp_debug.c @@ -32,7 +32,7 @@ * * @(#)spp_debug.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/spp_debug.c,v 1.10 1999/08/28 00:49:52 peter Exp $ - * $DragonFly: src/sys/netproto/ns/spp_debug.c,v 1.2 2003/06/17 04:28:53 dillon Exp $ + * $DragonFly: src/sys/netproto/ns/spp_debug.c,v 1.3 2003/08/07 21:17:38 dillon Exp $ */ #include "opt_inet.h" @@ -49,17 +49,17 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "ns.h" +#include "ns_pcb.h" +#include "idp.h" +#include "idp_var.h" +#include "sp.h" +#include "spidp.h" #define SPPTIMERS -#include -#include +#include "spp_timer.h" +#include "spp_var.h" #define SANAMES -#include +#include "spp_debug.h" int sppconsdebug = 0; /* diff --git a/sys/netproto/ns/spp_usrreq.c b/sys/netproto/ns/spp_usrreq.c index 478a35f654..51d364461e 100644 --- a/sys/netproto/ns/spp_usrreq.c +++ b/sys/netproto/ns/spp_usrreq.c @@ -32,7 +32,7 @@ * * @(#)spp_usrreq.c 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/netns/spp_usrreq.c,v 1.11 1999/08/28 00:49:53 peter Exp $ - * $DragonFly: src/sys/netproto/ns/spp_usrreq.c,v 1.3 2003/07/26 21:10:52 rob Exp $ + * $DragonFly: src/sys/netproto/ns/spp_usrreq.c,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ #include @@ -48,16 +48,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "ns.h" +#include "ns_pcb.h" +#include "idp.h" +#include "idp_var.h" +#include "ns_error.h" +#include "sp.h" +#include "spidp.h" +#include "spp_timer.h" +#include "spp_var.h" +#include "spp_debug.h" /* * SP protocol implementation. diff --git a/sys/netproto/smb/smb_conn.c b/sys/netproto/smb/smb_conn.c index 20d79cc7ff..d88fc42695 100644 --- a/sys/netproto/smb/smb_conn.c +++ b/sys/netproto/smb/smb_conn.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_conn.c,v 1.1.2.1 2001/05/22 08:32:33 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_conn.c,v 1.4 2003/07/19 21:14:45 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_conn.c,v 1.5 2003/08/07 21:17:38 dillon Exp $ */ /* @@ -48,11 +48,11 @@ #include -#include -#include -#include -#include -#include +#include "smb.h" +#include "smb_subr.h" +#include "smb_conn.h" +#include "smb_tran.h" +#include "smb_trantcp.h" static struct smb_connobj smb_vclist; static int smb_vcnext = 1; /* next unique id for VC */ diff --git a/sys/netproto/smb/smb_conn.h b/sys/netproto/smb/smb_conn.h index d2feb77069..e5c6ce7094 100644 --- a/sys/netproto/smb/smb_conn.h +++ b/sys/netproto/smb/smb_conn.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_conn.h,v 1.1.2.3 2002/04/23 03:45:01 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_conn.h,v 1.3 2003/06/25 03:56:06 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_conn.h,v 1.4 2003/08/07 21:17:38 dillon Exp $ */ #ifndef _NETINET_IN_H_ #include @@ -169,7 +169,7 @@ struct smb_share_info { #ifdef _KERNEL #include -#include +#include "smb_subr.h" #define CONNADDREQ(a1,a2) ((a1)->sa_len == (a2)->sa_len && \ bcmp(a1, a2, (a1)->sa_len) == 0) diff --git a/sys/netproto/smb/smb_crypt.c b/sys/netproto/smb/smb_crypt.c index d3bd128dfe..5542de9837 100644 --- a/sys/netproto/smb/smb_crypt.c +++ b/sys/netproto/smb/smb_crypt.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_crypt.c,v 1.1.2.3 2001/09/03 08:55:11 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_crypt.c,v 1.2 2003/06/17 04:28:54 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_crypt.c,v 1.3 2003/08/07 21:17:38 dillon Exp $ */ #include #include @@ -46,10 +46,10 @@ #include #include -#include -#include -#include -#include +#include "smb.h" +#include "smb_conn.h" +#include "smb_subr.h" +#include "smb_dev.h" #include "opt_netsmb.h" diff --git a/sys/netproto/smb/smb_dev.c b/sys/netproto/smb/smb_dev.c index 9840a5e0ff..f359dc6e98 100644 --- a/sys/netproto/smb/smb_dev.c +++ b/sys/netproto/smb/smb_dev.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_dev.c,v 1.2.2.1 2001/05/22 08:32:33 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_dev.c,v 1.5 2003/07/21 05:50:44 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_dev.c,v 1.6 2003/08/07 21:17:39 dillon Exp $ */ #include #include @@ -51,10 +51,10 @@ #include -#include -#include -#include -#include +#include "smb.h" +#include "smb_conn.h" +#include "smb_subr.h" +#include "smb_dev.h" #define SMB_GETDEV(dev) ((struct smb_dev*)(dev)->si_drv1) #define SMB_CHECKMINOR(dev) do { \ diff --git a/sys/netproto/smb/smb_dev.h b/sys/netproto/smb/smb_dev.h index 6ac3826432..f63405442b 100644 --- a/sys/netproto/smb/smb_dev.h +++ b/sys/netproto/smb/smb_dev.h @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_dev.h,v 1.3.2.1 2001/05/22 08:32:33 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_dev.h,v 1.2 2003/06/17 04:28:54 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_dev.h,v 1.3 2003/08/07 21:17:39 dillon Exp $ */ #ifndef _NETSMB_DEV_H_ #define _NETSMB_DEV_H_ @@ -40,7 +40,7 @@ #endif #include -#include +#include "smb.h" #define NSMB_NAME "nsmb" #define NSMB_MAJOR 144 diff --git a/sys/netproto/smb/smb_iod.c b/sys/netproto/smb/smb_iod.c index babe22c92d..8f8ac0e869 100644 --- a/sys/netproto/smb/smb_iod.c +++ b/sys/netproto/smb/smb_iod.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_iod.c,v 1.1.2.2 2002/04/23 03:45:01 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_iod.c,v 1.6 2003/07/19 21:14:45 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_iod.c,v 1.7 2003/08/07 21:17:39 dillon Exp $ */ #include @@ -42,11 +42,11 @@ #include #include -#include -#include -#include -#include -#include +#include "smb.h" +#include "smb_conn.h" +#include "smb_rq.h" +#include "smb_tran.h" +#include "smb_trantcp.h" #define SMBIOD_SLEEP_TIMO 2 diff --git a/sys/netproto/smb/smb_rq.c b/sys/netproto/smb/smb_rq.c index d52276bf90..fc58587081 100644 --- a/sys/netproto/smb/smb_rq.c +++ b/sys/netproto/smb/smb_rq.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_rq.c,v 1.1.2.2 2002/04/23 03:45:01 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_rq.c,v 1.5 2003/07/19 21:14:45 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_rq.c,v 1.6 2003/08/07 21:17:39 dillon Exp $ */ #include #include @@ -43,11 +43,11 @@ #include #include -#include -#include -#include -#include -#include +#include "smb.h" +#include "smb_conn.h" +#include "smb_rq.h" +#include "smb_subr.h" +#include "smb_tran.h" MALLOC_DEFINE(M_SMBRQ, "SMBRQ", "SMB request"); diff --git a/sys/netproto/smb/smb_smb.c b/sys/netproto/smb/smb_smb.c index 9b23073e5a..106e3aca30 100644 --- a/sys/netproto/smb/smb_smb.c +++ b/sys/netproto/smb/smb_smb.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_smb.c,v 1.1.2.3 2002/12/14 14:44:19 fjoe Exp $ - * $DragonFly: src/sys/netproto/smb/smb_smb.c,v 1.3 2003/06/25 03:56:06 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_smb.c,v 1.4 2003/08/07 21:17:39 dillon Exp $ */ /* * various SMB requests. Most of the routines merely packs data into mbufs. @@ -47,11 +47,11 @@ #include -#include -#include -#include -#include -#include +#include "smb.h" +#include "smb_subr.h" +#include "smb_rq.h" +#include "smb_conn.h" +#include "smb_tran.h" struct smb_dialect { int d_id; diff --git a/sys/netproto/smb/smb_subr.c b/sys/netproto/smb/smb_subr.c index 717260da43..02d3ab5623 100644 --- a/sys/netproto/smb/smb_subr.c +++ b/sys/netproto/smb/smb_subr.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_subr.c,v 1.1.2.2 2001/09/03 08:55:11 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_subr.c,v 1.7 2003/07/19 21:14:45 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_subr.c,v 1.8 2003/08/07 21:17:39 dillon Exp $ */ #include #include @@ -51,10 +51,10 @@ #include -#include -#include -#include -#include +#include "smb.h" +#include "smb_conn.h" +#include "smb_rq.h" +#include "smb_subr.h" MALLOC_DEFINE(M_SMBDATA, "SMBDATA", "Misc netsmb data"); MALLOC_DEFINE(M_SMBSTR, "SMBSTR", "netsmb string data"); diff --git a/sys/netproto/smb/smb_trantcp.c b/sys/netproto/smb/smb_trantcp.c index 8a2d61577c..5b65578ce6 100644 --- a/sys/netproto/smb/smb_trantcp.c +++ b/sys/netproto/smb/smb_trantcp.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_trantcp.c,v 1.3.2.1 2001/05/22 08:32:34 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_trantcp.c,v 1.5 2003/07/29 12:45:42 hmp Exp $ + * $DragonFly: src/sys/netproto/smb/smb_trantcp.c,v 1.6 2003/08/07 21:17:39 dillon Exp $ */ #include #include @@ -53,13 +53,13 @@ #include -#include +#include "netbios.h" -#include -#include -#include -#include -#include +#include "smb.h" +#include "smb_conn.h" +#include "smb_tran.h" +#include "smb_trantcp.h" +#include "smb_subr.h" #define M_NBDATA M_PCB diff --git a/sys/netproto/smb/smb_usr.c b/sys/netproto/smb/smb_usr.c index 0695320058..d0c4b88140 100644 --- a/sys/netproto/smb/smb_usr.c +++ b/sys/netproto/smb/smb_usr.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/netsmb/smb_usr.c,v 1.1.2.1 2001/05/22 08:32:34 bp Exp $ - * $DragonFly: src/sys/netproto/smb/smb_usr.c,v 1.2 2003/06/17 04:28:54 dillon Exp $ + * $DragonFly: src/sys/netproto/smb/smb_usr.c,v 1.3 2003/08/07 21:17:39 dillon Exp $ */ #include #include @@ -45,11 +45,11 @@ #include -#include -#include -#include -#include -#include +#include "smb.h" +#include "smb_conn.h" +#include "smb_rq.h" +#include "smb_subr.h" +#include "smb_dev.h" /* * helpers for nsmb device. Can be moved to the smb_dev.c file. diff --git a/sys/platform/pc32/apic/mpapic.h b/sys/platform/pc32/apic/mpapic.h index 24bf941c2b..4edcf9f364 100644 --- a/sys/platform/pc32/apic/mpapic.h +++ b/sys/platform/pc32/apic/mpapic.h @@ -23,13 +23,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/mpapic.h,v 1.14.2.2 2000/09/30 02:49:34 ps Exp $ - * $DragonFly: src/sys/platform/pc32/apic/mpapic.h,v 1.3 2003/07/04 00:32:26 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/apic/mpapic.h,v 1.4 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_MPAPIC_H_ #define _MACHINE_MPAPIC_H_ -#include +#include "apic.h" #include diff --git a/sys/platform/pc32/bios/mca_machdep.c b/sys/platform/pc32/bios/mca_machdep.c index b01e3cb567..6cb187129d 100644 --- a/sys/platform/pc32/bios/mca_machdep.c +++ b/sys/platform/pc32/bios/mca_machdep.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/bios/mca_machdep.c,v 1.4 2000/01/29 16:17:34 peter Exp $ - * $DragonFly: src/sys/platform/pc32/bios/Attic/mca_machdep.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/bios/Attic/mca_machdep.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ */ #include @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include "mca_machdep.h" /* Global MCA bus flag */ int MCA_system = 0; diff --git a/sys/platform/pc32/boot/biosboot/boot.h b/sys/platform/pc32/boot/biosboot/boot.h index 93ecfa030a..9f81a4ffa6 100644 --- a/sys/platform/pc32/boot/biosboot/boot.h +++ b/sys/platform/pc32/boot/biosboot/boot.h @@ -25,15 +25,15 @@ * * from: Mach, Revision 2.2 92/04/04 11:35:03 rpd * $FreeBSD: src/sys/i386/boot/biosboot/boot.h,v 1.25 1999/08/28 00:43:12 peter Exp $ - * $DragonFly: src/sys/platform/pc32/boot/biosboot/Attic/boot.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/boot/biosboot/Attic/boot.h,v 1.3 2003/08/07 21:17:20 dillon Exp $ */ #include #include -#include -#include -#include +#include +#include +#include #define RB_DUAL 0x40000 /* XXX */ #define RB_PROBEKBD 0x80000 /* XXX */ diff --git a/sys/platform/pc32/boot/biosboot/serial.S b/sys/platform/pc32/boot/biosboot/serial.S index bbc7ad9bfc..2cfb4e9aec 100644 --- a/sys/platform/pc32/boot/biosboot/serial.S +++ b/sys/platform/pc32/boot/biosboot/serial.S @@ -25,7 +25,7 @@ * * from: Mach, Revision 2.2 92/04/04 11:34:26 rpd * $FreeBSD: src/sys/i386/boot/biosboot/serial.S,v 1.13 1999/08/28 00:43:14 peter Exp $ - * $DragonFly: src/sys/platform/pc32/boot/biosboot/Attic/serial.S,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/boot/biosboot/Attic/serial.S,v 1.3 2003/08/07 21:17:20 dillon Exp $ */ /* @@ -68,7 +68,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .file "serial.S" -#include +#include #include "asm.h" .text diff --git a/sys/platform/pc32/boot/kzipboot/misc.c b/sys/platform/pc32/boot/kzipboot/misc.c index a971aeec8b..e264891064 100644 --- a/sys/platform/pc32/boot/kzipboot/misc.c +++ b/sys/platform/pc32/boot/kzipboot/misc.c @@ -5,9 +5,11 @@ * adapted for Linux. * * Ported to 386bsd by Serge Vakulenko + * + * $DragonFly: src/sys/platform/pc32/boot/kzipboot/Attic/misc.c,v 1.2 2003/08/07 21:17:20 dillon Exp $ */ -#include "gzip.h" +#include "use_gzip.h" unsigned outcnt; unsigned insize; diff --git a/sys/platform/pc32/boot/kzipboot/unzip.c b/sys/platform/pc32/boot/kzipboot/unzip.c index 93a2c8b842..069c809ea2 100644 --- a/sys/platform/pc32/boot/kzipboot/unzip.c +++ b/sys/platform/pc32/boot/kzipboot/unzip.c @@ -10,6 +10,8 @@ * * The code in this file is derived from the file funzip.c written * and put in the public domain by Mark Adler. + * + * $DragonFly: src/sys/platform/pc32/boot/kzipboot/Attic/unzip.c,v 1.2 2003/08/07 21:17:20 dillon Exp $ */ /* @@ -18,7 +20,7 @@ * either deflated or stored. */ -#include "gzip.h" +#include "use_gzip.h" #include #include diff --git a/sys/platform/pc32/gnu/fpemul/div_small.s b/sys/platform/pc32/gnu/fpemul/div_small.s index 7f5b3a14c8..a6c8d142bb 100644 --- a/sys/platform/pc32/gnu/fpemul/div_small.s +++ b/sys/platform/pc32/gnu/fpemul/div_small.s @@ -58,7 +58,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/div_small.s,v 1.8 1999/08/28 00:42:48 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/div_small.s,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/div_small.s,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -66,7 +66,7 @@ | unsigned long div_small(unsigned long long *x, unsigned long y) | +---------------------------------------------------------------------------*/ -#include +#include "fpu_asm.h" .text ENTRY(div_small) diff --git a/sys/platform/pc32/gnu/fpemul/errors.c b/sys/platform/pc32/gnu/fpemul/errors.c index 49ff03abd7..80404de525 100644 --- a/sys/platform/pc32/gnu/fpemul/errors.c +++ b/sys/platform/pc32/gnu/fpemul/errors.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/errors.c,v 1.10 1999/08/28 00:42:49 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/errors.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/errors.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -77,13 +77,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "status_w.h" +#include "control_w.h" +#include "reg_constant.h" +#include "version.h" /* */ #undef PRINT_MESSAGES diff --git a/sys/platform/pc32/gnu/fpemul/exception.h b/sys/platform/pc32/gnu/fpemul/exception.h index 7bb09169d1..0ba368e076 100644 --- a/sys/platform/pc32/gnu/fpemul/exception.h +++ b/sys/platform/pc32/gnu/fpemul/exception.h @@ -55,7 +55,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/exception.h,v 1.9 1999/08/28 00:42:49 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/exception.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/exception.h,v 1.3 2003/08/07 21:17:20 dillon Exp $ * * */ @@ -71,7 +71,7 @@ #endif #ifndef SW_C1 -#include +#include "fpu_emu.h" #endif /* SW_C1 */ #define FPU_BUSY Const_(0x8000) /* FPU busy bit (8087 compatibility) */ diff --git a/sys/platform/pc32/gnu/fpemul/fpu_arith.c b/sys/platform/pc32/gnu/fpemul/fpu_arith.c index b59f3fd4b6..b9854a50b9 100644 --- a/sys/platform/pc32/gnu/fpemul/fpu_arith.c +++ b/sys/platform/pc32/gnu/fpemul/fpu_arith.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_arith.c,v 1.9 1999/08/28 00:42:49 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_arith.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_arith.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -68,8 +68,8 @@ #include #include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" void diff --git a/sys/platform/pc32/gnu/fpemul/fpu_asm.h b/sys/platform/pc32/gnu/fpemul/fpu_asm.h index 1920b3e374..b28413e384 100644 --- a/sys/platform/pc32/gnu/fpemul/fpu_asm.h +++ b/sys/platform/pc32/gnu/fpemul/fpu_asm.h @@ -55,7 +55,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_asm.h,v 1.8 1999/08/28 00:42:50 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_asm.h,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_asm.h,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ @@ -63,7 +63,7 @@ #define _FPU_ASM_H_ #include -#include +#include "fpu_emu.h" #define EXCEPTION exception diff --git a/sys/platform/pc32/gnu/fpemul/fpu_aux.c b/sys/platform/pc32/gnu/fpemul/fpu_aux.c index 09b59a8a3f..b735287133 100644 --- a/sys/platform/pc32/gnu/fpemul/fpu_aux.c +++ b/sys/platform/pc32/gnu/fpemul/fpu_aux.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_aux.c,v 1.11 1999/10/12 02:23:14 msmith Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_aux.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_aux.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -70,10 +70,10 @@ #include #include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "status_w.h" static void diff --git a/sys/platform/pc32/gnu/fpemul/fpu_emu.h b/sys/platform/pc32/gnu/fpemul/fpu_emu.h index 34e6861700..4b50a0f3af 100644 --- a/sys/platform/pc32/gnu/fpemul/fpu_emu.h +++ b/sys/platform/pc32/gnu/fpemul/fpu_emu.h @@ -55,7 +55,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_emu.h,v 1.7 1999/08/28 00:42:50 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_emu.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_emu.h,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -81,7 +81,7 @@ #define PECULIAR_486 #ifdef LOCORE -#include +#include "fpu_asm.h" #define Const(x) $/**/x #else #define Const(x) x @@ -110,7 +110,7 @@ #ifndef LOCORE #include -#include +#include "math_emu.h" #ifdef PARANOID extern char emulating; @@ -181,7 +181,7 @@ polynomial(unsigned accum[], unsigned x[], unsigned int control_w); #ifndef MAKING_PROTO -#include +#include "fpu_proto.h" #endif #endif /* LOCORE */ diff --git a/sys/platform/pc32/gnu/fpemul/fpu_entry.c b/sys/platform/pc32/gnu/fpemul/fpu_entry.c index d41c8976a6..e463c9f87f 100644 --- a/sys/platform/pc32/gnu/fpemul/fpu_entry.c +++ b/sys/platform/pc32/gnu/fpemul/fpu_entry.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_entry.c,v 1.23 1999/10/12 02:23:14 msmith Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_entry.c,v 1.3 2003/06/26 20:27:51 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_entry.c,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ @@ -80,10 +80,10 @@ #include #include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "status_w.h" #define __BAD__ Un_impl /* Not implemented */ diff --git a/sys/platform/pc32/gnu/fpemul/fpu_etc.c b/sys/platform/pc32/gnu/fpemul/fpu_etc.c index 498b2898c8..8218bebf36 100644 --- a/sys/platform/pc32/gnu/fpemul/fpu_etc.c +++ b/sys/platform/pc32/gnu/fpemul/fpu_etc.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_etc.c,v 1.8 1999/08/28 00:42:51 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_etc.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_etc.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -68,10 +68,10 @@ #include #include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "status_w.h" static void diff --git a/sys/platform/pc32/gnu/fpemul/fpu_trig.c b/sys/platform/pc32/gnu/fpemul/fpu_trig.c index bfe4dba450..adf95a4ef9 100644 --- a/sys/platform/pc32/gnu/fpemul/fpu_trig.c +++ b/sys/platform/pc32/gnu/fpemul/fpu_trig.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/fpu_trig.c,v 1.10 1999/08/28 00:42:52 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_trig.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/fpu_trig.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -69,12 +69,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "status_w.h" +#include "reg_constant.h" +#include "control_w.h" static void convert_l2reg(long *arg, FPU_REG * dest); diff --git a/sys/platform/pc32/gnu/fpemul/get_address.c b/sys/platform/pc32/gnu/fpemul/get_address.c index 29f8035d36..57f5992b36 100644 --- a/sys/platform/pc32/gnu/fpemul/get_address.c +++ b/sys/platform/pc32/gnu/fpemul/get_address.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/get_address.c,v 1.10 1999/10/12 02:23:14 msmith Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/get_address.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/get_address.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -75,9 +75,9 @@ #include #include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" static int reg_offset[] = { tEAX, tECX, tEDX, tEBX, tESP, tEBP, tESI, tEDI}; diff --git a/sys/platform/pc32/gnu/fpemul/load_store.c b/sys/platform/pc32/gnu/fpemul/load_store.c index 66e30f6104..2b7ddeebdf 100644 --- a/sys/platform/pc32/gnu/fpemul/load_store.c +++ b/sys/platform/pc32/gnu/fpemul/load_store.c @@ -58,7 +58,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/load_store.c,v 1.13 1999/08/28 00:42:52 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/load_store.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/load_store.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -74,9 +74,9 @@ #include #include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "status_w.h" #define _NONE_ 0 /* FPU_st0_ptr etc not needed */ diff --git a/sys/platform/pc32/gnu/fpemul/poly_2xm1.c b/sys/platform/pc32/gnu/fpemul/poly_2xm1.c index 201dee5316..95e4dce60a 100644 --- a/sys/platform/pc32/gnu/fpemul/poly_2xm1.c +++ b/sys/platform/pc32/gnu/fpemul/poly_2xm1.c @@ -57,11 +57,11 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_2xm1.c,v 1.8 1999/08/28 00:42:53 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_2xm1.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_2xm1.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include +#include "reg_constant.h" diff --git a/sys/platform/pc32/gnu/fpemul/poly_atan.c b/sys/platform/pc32/gnu/fpemul/poly_atan.c index 368775515c..76694ce858 100644 --- a/sys/platform/pc32/gnu/fpemul/poly_atan.c +++ b/sys/platform/pc32/gnu/fpemul/poly_atan.c @@ -57,12 +57,12 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_atan.c,v 1.10 1999/08/28 00:42:53 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_atan.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_atan.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include -#include +#include "reg_constant.h" +#include "control_w.h" #define HIPOWERon 6 /* odd poly, negative terms */ diff --git a/sys/platform/pc32/gnu/fpemul/poly_div.s b/sys/platform/pc32/gnu/fpemul/poly_div.s index ee53af3eb8..1ea24b494b 100644 --- a/sys/platform/pc32/gnu/fpemul/poly_div.s +++ b/sys/platform/pc32/gnu/fpemul/poly_div.s @@ -58,11 +58,11 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_div.s,v 1.8 1999/08/28 00:42:53 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_div.s,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_div.s,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include +#include "fpu_asm.h" .text diff --git a/sys/platform/pc32/gnu/fpemul/poly_l2.c b/sys/platform/pc32/gnu/fpemul/poly_l2.c index eb1c9788d6..1f23cd02c3 100644 --- a/sys/platform/pc32/gnu/fpemul/poly_l2.c +++ b/sys/platform/pc32/gnu/fpemul/poly_l2.c @@ -57,13 +57,13 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_l2.c,v 1.10 1999/08/28 00:42:53 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_l2.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_l2.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include -#include +#include "reg_constant.h" +#include "control_w.h" diff --git a/sys/platform/pc32/gnu/fpemul/poly_mul64.s b/sys/platform/pc32/gnu/fpemul/poly_mul64.s index 8a0c708b45..1ac9ec8944 100644 --- a/sys/platform/pc32/gnu/fpemul/poly_mul64.s +++ b/sys/platform/pc32/gnu/fpemul/poly_mul64.s @@ -60,12 +60,12 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_mul64.s,v 1.8 1999/08/28 00:42:54 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_mul64.s,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_mul64.s,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include +#include "fpu_asm.h" .text ENTRY(mul64) diff --git a/sys/platform/pc32/gnu/fpemul/poly_sin.c b/sys/platform/pc32/gnu/fpemul/poly_sin.c index d1c00e7b15..b56448fe63 100644 --- a/sys/platform/pc32/gnu/fpemul/poly_sin.c +++ b/sys/platform/pc32/gnu/fpemul/poly_sin.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_sin.c,v 1.10 1999/08/28 00:42:54 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_sin.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_sin.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -66,9 +66,9 @@ #include /* for printf() in EXCEPTION() */ #endif -#include -#include -#include +#include "exception.h" +#include "reg_constant.h" +#include "control_w.h" #define HIPOWER 5 diff --git a/sys/platform/pc32/gnu/fpemul/poly_tan.c b/sys/platform/pc32/gnu/fpemul/poly_tan.c index 5ec39a39f2..284764cfc7 100644 --- a/sys/platform/pc32/gnu/fpemul/poly_tan.c +++ b/sys/platform/pc32/gnu/fpemul/poly_tan.c @@ -57,12 +57,12 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/poly_tan.c,v 1.10 1999/08/28 00:42:54 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_tan.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/poly_tan.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ -#include -#include +#include "reg_constant.h" +#include "control_w.h" #define HIPOWERop 3 /* odd poly, positive terms */ diff --git a/sys/platform/pc32/gnu/fpemul/polynomial.s b/sys/platform/pc32/gnu/fpemul/polynomial.s index 0ad5618ca1..3dc3c767ad 100644 --- a/sys/platform/pc32/gnu/fpemul/polynomial.s +++ b/sys/platform/pc32/gnu/fpemul/polynomial.s @@ -65,13 +65,13 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/polynomial.s,v 1.8 1999/08/28 00:42:55 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/polynomial.s,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/polynomial.s,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ .file "fpolynom.s" -#include +#include "fpu_asm.h" /* #define EXTRA_PRECISE*/ diff --git a/sys/platform/pc32/gnu/fpemul/reg_add_sub.c b/sys/platform/pc32/gnu/fpemul/reg_add_sub.c index 657d2fa068..7694e9884d 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_add_sub.c +++ b/sys/platform/pc32/gnu/fpemul/reg_add_sub.c @@ -56,7 +56,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_add_sub.c,v 1.8 1999/08/28 00:42:55 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_add_sub.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_add_sub.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -65,8 +65,8 @@ | the source FPU_REGs. | +---------------------------------------------------------------------------*/ -#include -#include +#include "reg_constant.h" +#include "control_w.h" void diff --git a/sys/platform/pc32/gnu/fpemul/reg_compare.c b/sys/platform/pc32/gnu/fpemul/reg_compare.c index ad01241c6c..357cc1de63 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_compare.c +++ b/sys/platform/pc32/gnu/fpemul/reg_compare.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_compare.c,v 1.11 1999/08/28 00:42:55 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_compare.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_compare.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -69,11 +69,11 @@ #include #include -#include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "control_w.h" +#include "status_w.h" int diff --git a/sys/platform/pc32/gnu/fpemul/reg_constant.c b/sys/platform/pc32/gnu/fpemul/reg_constant.c index a53fc79a4f..2f5327bdfb 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_constant.c +++ b/sys/platform/pc32/gnu/fpemul/reg_constant.c @@ -56,7 +56,7 @@ * W. Metzenthen June 1994. * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_constant.c,v 1.6.8.1 2000/08/03 00:53:55 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_constant.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_constant.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ */ @@ -65,9 +65,9 @@ #include #include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "status_w.h" FPU_REG CONST_1 = {SIGN_POS, TW_Valid, EXP_BIAS, diff --git a/sys/platform/pc32/gnu/fpemul/reg_constant.h b/sys/platform/pc32/gnu/fpemul/reg_constant.h index 57d3e29a59..99550f116b 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_constant.h +++ b/sys/platform/pc32/gnu/fpemul/reg_constant.h @@ -55,14 +55,14 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_constant.h,v 1.7 1999/08/28 00:42:55 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_constant.h,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_constant.h,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ #ifndef _REG_CONSTANT_H_ #define _REG_CONSTANT_H_ -#include +#include "fpu_emu.h" extern FPU_REG CONST_1; extern FPU_REG CONST_2; diff --git a/sys/platform/pc32/gnu/fpemul/reg_div.s b/sys/platform/pc32/gnu/fpemul/reg_div.s index dcdfdf67d2..a6dcfdf6df 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_div.s +++ b/sys/platform/pc32/gnu/fpemul/reg_div.s @@ -61,11 +61,11 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_div.s,v 1.9.2.1 2000/07/07 00:38:42 obrien Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_div.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_div.s,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ -#include +#include "fpu_asm.h" .text ENTRY(reg_div) diff --git a/sys/platform/pc32/gnu/fpemul/reg_ld_str.c b/sys/platform/pc32/gnu/fpemul/reg_ld_str.c index ddcfd189b0..6a019a6681 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_ld_str.c +++ b/sys/platform/pc32/gnu/fpemul/reg_ld_str.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_ld_str.c,v 1.13 1999/08/28 00:42:56 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_ld_str.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_ld_str.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -73,12 +73,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "fpu_emu.h" +#include "fpu_system.h" +#include "exception.h" +#include "reg_constant.h" +#include "control_w.h" +#include "status_w.h" #define EXTENDED_Emax 0x3fff /* largest valid exponent */ diff --git a/sys/platform/pc32/gnu/fpemul/reg_mul.c b/sys/platform/pc32/gnu/fpemul/reg_mul.c index 544ed112db..780f479e14 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_mul.c +++ b/sys/platform/pc32/gnu/fpemul/reg_mul.c @@ -57,7 +57,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_mul.c,v 1.8 1999/08/28 00:42:56 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_mul.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_mul.c,v 1.3 2003/08/07 21:17:20 dillon Exp $ * */ @@ -65,7 +65,7 @@ | The destination may be any FPU_REG, including one of the source FPU_REGs. | +---------------------------------------------------------------------------*/ -#include +#include "reg_constant.h" /* This routine must be called with non-empty source registers */ diff --git a/sys/platform/pc32/gnu/fpemul/reg_norm.s b/sys/platform/pc32/gnu/fpemul/reg_norm.s index 9d7e3a8e95..6ac1cf630b 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_norm.s +++ b/sys/platform/pc32/gnu/fpemul/reg_norm.s @@ -62,12 +62,12 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_norm.s,v 1.8 1999/08/28 00:42:57 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_norm.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_norm.s,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ -#include +#include "fpu_asm.h" .text diff --git a/sys/platform/pc32/gnu/fpemul/reg_round.s b/sys/platform/pc32/gnu/fpemul/reg_round.s index 379bc6b06e..49331c071e 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_round.s +++ b/sys/platform/pc32/gnu/fpemul/reg_round.s @@ -66,7 +66,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_round.s,v 1.9.2.1 2000/07/07 00:38:42 obrien Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_round.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_round.s,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ @@ -119,8 +119,8 @@ +---------------------------------------------------------------------------*/ -#include -#include +#include "exception.h" +#include "control_w.h" #define LOST_DOWN $1 #define LOST_UP $2 diff --git a/sys/platform/pc32/gnu/fpemul/reg_u_add.s b/sys/platform/pc32/gnu/fpemul/reg_u_add.s index 4168ba38e7..d393ab9e99 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_u_add.s +++ b/sys/platform/pc32/gnu/fpemul/reg_u_add.s @@ -63,7 +63,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_add.s,v 1.9 1999/08/28 00:42:57 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_u_add.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_u_add.s,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ @@ -77,7 +77,7 @@ | Basic checks are performed if PARANOID is defined. */ -#include +#include "fpu_asm.h" .text ENTRY(reg_u_add) diff --git a/sys/platform/pc32/gnu/fpemul/reg_u_div.s b/sys/platform/pc32/gnu/fpemul/reg_u_div.s index e3d25d23a6..a6ee3c1689 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_u_div.s +++ b/sys/platform/pc32/gnu/fpemul/reg_u_div.s @@ -58,7 +58,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_div.s,v 1.9 1999/08/28 00:42:58 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_u_div.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_u_div.s,v 1.4 2003/08/07 21:17:20 dillon Exp $ * */ @@ -71,7 +71,7 @@ | Does not compute the destination exponent, but does adjust it. | +---------------------------------------------------------------------------*/ -#include +#include "fpu_asm.h" /* #define dSIGL(x) (x) */ diff --git a/sys/platform/pc32/gnu/fpemul/reg_u_mul.s b/sys/platform/pc32/gnu/fpemul/reg_u_mul.s index b05b2f2932..7b6bfe4624 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_u_mul.s +++ b/sys/platform/pc32/gnu/fpemul/reg_u_mul.s @@ -58,7 +58,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_mul.s,v 1.9 1999/08/28 00:42:58 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_u_mul.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_u_mul.s,v 1.4 2003/08/07 21:17:21 dillon Exp $ * */ @@ -72,7 +72,7 @@ | Result is rounded to nearest 53 or 64 bits, using "nearest or even". | +---------------------------------------------------------------------------*/ -#include +#include "fpu_asm.h" .data diff --git a/sys/platform/pc32/gnu/fpemul/reg_u_sub.s b/sys/platform/pc32/gnu/fpemul/reg_u_sub.s index 4d2a0cec21..03b0a94ef8 100644 --- a/sys/platform/pc32/gnu/fpemul/reg_u_sub.s +++ b/sys/platform/pc32/gnu/fpemul/reg_u_sub.s @@ -62,7 +62,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/reg_u_sub.s,v 1.9 1999/08/28 00:42:58 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_u_sub.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/reg_u_sub.s,v 1.4 2003/08/07 21:17:21 dillon Exp $ * */ @@ -77,7 +77,7 @@ | Basic checks are performed if PARANOID is defined. */ -#include +#include "fpu_asm.h" .text ENTRY(reg_u_sub) diff --git a/sys/platform/pc32/gnu/fpemul/wm_shrx.s b/sys/platform/pc32/gnu/fpemul/wm_shrx.s index d927153cfb..c936777c8c 100644 --- a/sys/platform/pc32/gnu/fpemul/wm_shrx.s +++ b/sys/platform/pc32/gnu/fpemul/wm_shrx.s @@ -63,12 +63,12 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/wm_shrx.s,v 1.8 1999/08/28 00:42:59 peter Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/wm_shrx.s,v 1.3 2003/07/31 12:37:39 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/wm_shrx.s,v 1.4 2003/08/07 21:17:21 dillon Exp $ * */ -#include +#include "fpu_asm.h" .text diff --git a/sys/platform/pc32/gnu/fpemul/wm_sqrt.s b/sys/platform/pc32/gnu/fpemul/wm_sqrt.s index 660c964697..3a891f5b02 100644 --- a/sys/platform/pc32/gnu/fpemul/wm_sqrt.s +++ b/sys/platform/pc32/gnu/fpemul/wm_sqrt.s @@ -61,7 +61,7 @@ * * * $FreeBSD: src/sys/gnu/i386/fpemul/wm_sqrt.s,v 1.9.2.1 2000/07/07 00:38:42 obrien Exp $ - * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/wm_sqrt.s,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/gnu/fpemul/Attic/wm_sqrt.s,v 1.3 2003/08/07 21:17:21 dillon Exp $ * */ @@ -78,7 +78,7 @@ | The guess is kept in %esi:%edi | +---------------------------------------------------------------------------*/ -#include +#include "fpu_asm.h" .data diff --git a/sys/platform/pc32/gnu/isa/dgb.c b/sys/platform/pc32/gnu/isa/dgb.c index 446043f941..ff6a4715c6 100644 --- a/sys/platform/pc32/gnu/isa/dgb.c +++ b/sys/platform/pc32/gnu/isa/dgb.c @@ -1,6 +1,6 @@ /*- * dgb.c $FreeBSD: src/sys/gnu/i386/isa/dgb.c,v 1.56.2.1 2001/02/26 04:23:09 jlemon Exp $ - * dgb.c $DragonFly: src/sys/platform/pc32/gnu/isa/dgb.c,v 1.7 2003/07/23 02:30:18 dillon Exp $ + * dgb.c $DragonFly: src/sys/platform/pc32/gnu/isa/dgb.c,v 1.8 2003/08/07 21:17:21 dillon Exp $ * * Digiboard driver. * @@ -31,7 +31,7 @@ #include "opt_compat.h" #include "opt_dgb.h" -#include "dgb.h" +#include "use_dgb.h" /* Helg: i.e.25 times per sec board will be polled */ #define POLLSPERSEC 25 @@ -59,13 +59,13 @@ #include #include -#include +#include -#include -#include +#include "dgbios.h" +#include "dgfep.h" #define DGB_DEBUG /* Enable debugging info via sysctl */ -#include +#include "dgreg.h" #define CALLOUT_MASK 0x80 #define CONTROL_MASK 0x60 diff --git a/sys/platform/pc32/gnu/isa/sound/awe_wave.c b/sys/platform/pc32/gnu/isa/sound/awe_wave.c index 1bffbf5a46..cd94413925 100644 --- a/sys/platform/pc32/gnu/isa/sound/awe_wave.c +++ b/sys/platform/pc32/gnu/isa/sound/awe_wave.c @@ -19,12 +19,14 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $DragonFly: src/sys/platform/pc32/gnu/isa/sound/Attic/awe_wave.c,v 1.2 2003/08/07 21:17:21 dillon Exp $ */ #include #ifdef __FreeBSD__ -# include +# include "awe_config.h" #else # include "awe_config.h" #endif @@ -34,13 +36,13 @@ #ifdef CONFIG_AWE32_SYNTH #ifdef __FreeBSD__ -# include -# include -# include +# include "awe_hw.h" +# include "awe_version.h" +# include "awe_voice.h" #else # include "awe_hw.h" # include "awe_version.h" -# include +# include "awe_voice.h" #endif #ifdef AWE_HAS_GUS_COMPATIBILITY @@ -449,7 +451,7 @@ static int awe_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg); /* define macros for compatibility */ #ifdef __FreeBSD__ -# include +# include "awe_compat.h" #else # include "awe_compat.h" #endif diff --git a/sys/platform/pc32/i386/autoconf.c b/sys/platform/pc32/i386/autoconf.c index 408a31f154..539503e749 100644 --- a/sys/platform/pc32/i386/autoconf.c +++ b/sys/platform/pc32/i386/autoconf.c @@ -35,7 +35,7 @@ * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 * $FreeBSD: src/sys/i386/i386/autoconf.c,v 1.146.2.2 2001/06/07 06:05:58 dd Exp $ - * $DragonFly: src/sys/platform/pc32/i386/autoconf.c,v 1.8 2003/07/23 02:30:18 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/autoconf.c,v 1.9 2003/08/07 21:17:22 dillon Exp $ */ /* @@ -54,7 +54,7 @@ #include "opt_bus.h" #include "opt_rootdevname.h" -#include "isa.h" +#include "use_isa.h" #include #include @@ -86,7 +86,7 @@ #include #if NISA > 0 -#include +#include device_t isa_bus_device = 0; #endif @@ -364,10 +364,10 @@ setroot() #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include extern struct nfs_diskless nfs_diskless; diff --git a/sys/platform/pc32/i386/bios.c b/sys/platform/pc32/i386/bios.c index e9051ce588..8163c3df0f 100644 --- a/sys/platform/pc32/i386/bios.c +++ b/sys/platform/pc32/i386/bios.c @@ -25,17 +25,16 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/bios.c,v 1.29.2.3 2001/07/19 18:07:35 imp Exp $ - * $DragonFly: src/sys/platform/pc32/i386/bios.c,v 1.4 2003/06/28 04:16:02 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/bios.c,v 1.5 2003/08/07 21:17:22 dillon Exp $ */ /* * Code for dealing with the BIOS in x86 PC systems. */ +#include "use_isa.h" #include "opt_pnp.h" -#include "isa.h" - #include #include #include @@ -50,10 +49,10 @@ #include #include #include -#include -#include +#include +#include #if NISA > 0 -#include +#include #endif #define BIOS_START 0xe0000 diff --git a/sys/platform/pc32/i386/exception.s b/sys/platform/pc32/i386/exception.s index 9e959c4e2c..97e5914ee6 100644 --- a/sys/platform/pc32/i386/exception.s +++ b/sys/platform/pc32/i386/exception.s @@ -31,10 +31,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/exception.s,v 1.65.2.3 2001/08/15 01:23:49 peter Exp $ - * $DragonFly: src/sys/platform/pc32/i386/exception.s,v 1.17 2003/07/24 23:52:36 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/exception.s,v 1.18 2003/08/07 21:17:22 dillon Exp $ */ -#include "npx.h" +#include "use_npx.h" #include #include diff --git a/sys/platform/pc32/i386/genassym.c b/sys/platform/pc32/i386/genassym.c index 83ee37f5f0..05a9ac34ef 100644 --- a/sys/platform/pc32/i386/genassym.c +++ b/sys/platform/pc32/i386/genassym.c @@ -35,13 +35,11 @@ * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.86.2.3 2002/03/03 05:42:49 nyan Exp $ - * $DragonFly: src/sys/platform/pc32/i386/genassym.c,v 1.27 2003/07/24 01:41:16 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/genassym.c,v 1.28 2003/08/07 21:17:22 dillon Exp $ */ #include "opt_user_ldt.h" -#include - #include #include #include @@ -63,10 +61,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef SMP #include #endif diff --git a/sys/platform/pc32/i386/i386-gdbstub.c b/sys/platform/pc32/i386/i386-gdbstub.c index 80c9e54f12..885630bc43 100644 --- a/sys/platform/pc32/i386/i386-gdbstub.c +++ b/sys/platform/pc32/i386/i386-gdbstub.c @@ -92,7 +92,10 @@ * ****************************************************************************/ /* $FreeBSD: src/sys/i386/i386/i386-gdbstub.c,v 1.13.2.1 2000/08/03 00:54:41 peter Exp $ */ -/* $DragonFly: src/sys/platform/pc32/i386/Attic/i386-gdbstub.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ */ +/* $DragonFly: src/sys/platform/pc32/i386/Attic/i386-gdbstub.c,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ + +#include "use_sio.h" +#include "opt_ddb.h" #include #include @@ -103,9 +106,6 @@ #include -#include "sio.h" -#include "opt_ddb.h" - void gdb_handle_exception (db_regs_t *, int, int); #if NSIO == 0 diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c index 15d4dced32..5482134c84 100644 --- a/sys/platform/pc32/i386/machdep.c +++ b/sys/platform/pc32/i386/machdep.c @@ -36,12 +36,13 @@ * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $ - * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.31 2003/08/01 10:58:59 rob Exp $ + * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.32 2003/08/07 21:17:22 dillon Exp $ */ -#include "apm.h" -#include "ether.h" -#include "npx.h" +#include "use_apm.h" +#include "use_ether.h" +#include "use_npx.h" +#include "use_isa.h" #include "opt_atalk.h" #include "opt_compat.h" #include "opt_cpu.h" @@ -110,10 +111,10 @@ #include #ifdef OLD_BUS_ARCH -#include +#include #endif #include -#include +#include #include #include #include @@ -1977,7 +1978,6 @@ init386(int first) if (metadata_missing) printf("WARNING: loader(8) metadata is missing!\n"); -#include "isa.h" #if NISA >0 isa_defaultirq(); #endif diff --git a/sys/platform/pc32/i386/mp_clock.c b/sys/platform/pc32/i386/mp_clock.c index 2559551c6c..b5aee2e0f4 100644 --- a/sys/platform/pc32/i386/mp_clock.c +++ b/sys/platform/pc32/i386/mp_clock.c @@ -30,7 +30,7 @@ * directions. If we only cared about monosity two reads would be enough. * * $FreeBSD: src/sys/i386/i386/mp_clock.c,v 1.4.2.2 2000/09/30 02:49:32 ps Exp $ - * $DragonFly: src/sys/platform/pc32/i386/mp_clock.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/mp_clock.c,v 1.3 2003/08/07 21:17:22 dillon Exp $ * */ @@ -44,7 +44,7 @@ #include #include -#include +#include static unsigned piix_get_timecount(struct timecounter *tc); diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c index ff57e3ee0a..d4b42fb2bb 100644 --- a/sys/platform/pc32/i386/nexus.c +++ b/sys/platform/pc32/i386/nexus.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/nexus.c,v 1.26.2.10 2003/02/22 13:16:45 imp Exp $ - * $DragonFly: src/sys/platform/pc32/i386/nexus.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/nexus.c,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ /* @@ -41,7 +41,7 @@ * and I/O memory address space. */ -#include "mca.h" +#include "use_mca.h" #include #include @@ -66,7 +66,7 @@ #ifdef PC98 #include #else -#include +#include #endif #include diff --git a/sys/platform/pc32/i386/procfs_machdep.c b/sys/platform/pc32/i386/procfs_machdep.c index ad2346fd6b..4a5a5f9ae4 100644 --- a/sys/platform/pc32/i386/procfs_machdep.c +++ b/sys/platform/pc32/i386/procfs_machdep.c @@ -38,7 +38,7 @@ * * From: * $FreeBSD: src/sys/i386/i386/procfs_machdep.c,v 1.14 1999/10/11 14:50:03 peter Exp $ - * $DragonFly: src/sys/platform/pc32/i386/procfs_machdep.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/procfs_machdep.c,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ /* @@ -74,7 +74,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/platform/pc32/i386/support.s b/sys/platform/pc32/i386/support.s index e3e4119ddd..bb4a5148d3 100644 --- a/sys/platform/pc32/i386/support.s +++ b/sys/platform/pc32/i386/support.s @@ -31,10 +31,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/support.s,v 1.67.2.5 2001/08/15 01:23:50 peter Exp $ - * $DragonFly: src/sys/platform/pc32/i386/support.s,v 1.8 2003/07/20 07:29:20 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/support.s,v 1.9 2003/08/07 21:17:22 dillon Exp $ */ -#include "npx.h" +#include "use_npx.h" #include #include diff --git a/sys/platform/pc32/i386/swtch.s b/sys/platform/pc32/i386/swtch.s index 6cee6ec5b9..82d18d10c3 100644 --- a/sys/platform/pc32/i386/swtch.s +++ b/sys/platform/pc32/i386/swtch.s @@ -35,10 +35,10 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/i386/swtch.s,v 1.89.2.10 2003/01/23 03:36:24 ps Exp $ - * $DragonFly: src/sys/platform/pc32/i386/swtch.s,v 1.25 2003/07/20 04:20:29 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/swtch.s,v 1.26 2003/08/07 21:17:22 dillon Exp $ */ -#include "npx.h" +#include "use_npx.h" #include "opt_user_ldt.h" #include diff --git a/sys/platform/pc32/i386/trap.c b/sys/platform/pc32/i386/trap.c index 83d62a577b..facf69f2e6 100644 --- a/sys/platform/pc32/i386/trap.c +++ b/sys/platform/pc32/i386/trap.c @@ -36,13 +36,16 @@ * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 * $FreeBSD: src/sys/i386/i386/trap.c,v 1.147.2.11 2003/02/27 19:09:59 luoqi Exp $ - * $DragonFly: src/sys/platform/pc32/i386/trap.c,v 1.30 2003/07/30 00:19:13 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/i386/trap.c,v 1.31 2003/08/07 21:17:22 dillon Exp $ */ /* * 386 Trap and System call handling */ +#include "use_isa.h" +#include "use_npx.h" + #include "opt_cpu.h" #include "opt_ddb.h" #include "opt_ktrace.h" @@ -99,9 +102,6 @@ #include #include -#include "isa.h" -#include "npx.h" - int (*pmath_emulate) __P((struct trapframe *)); extern void trap __P((struct trapframe frame)); diff --git a/sys/platform/pc32/i386/userconfig.c b/sys/platform/pc32/i386/userconfig.c index 29962b24d1..3240724a74 100644 --- a/sys/platform/pc32/i386/userconfig.c +++ b/sys/platform/pc32/i386/userconfig.c @@ -47,7 +47,7 @@ ** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ** ** $FreeBSD: src/sys/i386/i386/userconfig.c,v 1.175.2.10 2002/10/05 18:31:48 scottl Exp $ - ** $DragonFly: src/sys/platform/pc32/i386/userconfig.c,v 1.2 2003/06/17 04:28:35 dillon Exp $ + ** $DragonFly: src/sys/platform/pc32/i386/userconfig.c,v 1.3 2003/08/07 21:17:22 dillon Exp $ **/ /** @@ -2428,7 +2428,7 @@ visuserconfig(void) * $FreeBSD: src/sys/i386/i386/userconfig.c,v 1.175.2.10 2002/10/05 18:31:48 scottl Exp $ */ -#include "scbus.h" +#include "use_scbus.h" #define PARM_DEVSPEC 0x1 #define PARM_INT 0x2 @@ -2489,11 +2489,11 @@ static int set_pnp_parms(CmdParm *); static int lineno; -#include "eisa.h" +#include "use_eisa.h" #if NEISA > 0 -#include +#include static int set_num_eisa_slots(CmdParm *); diff --git a/sys/platform/pc32/i386/vm_machdep.c b/sys/platform/pc32/i386/vm_machdep.c index 9983cfb8aa..9f509f30bb 100644 --- a/sys/platform/pc32/i386/vm_machdep.c +++ b/sys/platform/pc32/i386/vm_machdep.c @@ -39,10 +39,11 @@ * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $ - * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.22 2003/07/31 11:03:34 hmp Exp $ + * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.23 2003/08/07 21:17:22 dillon Exp $ */ -#include "npx.h" +#include "use_npx.h" +#include "use_isa.h" #include "opt_user_ldt.h" #ifdef PC98 #include "opt_pc98.h" @@ -87,7 +88,7 @@ #ifdef PC98 #include #else -#include +#include #endif static void cpu_reset_real __P((void)); @@ -630,8 +631,6 @@ SYSINIT(vm_setup, SI_SUB_CPU, SI_ORDER_ANY, swi_vm_setup, NULL); * or other unpredictable behaviour. */ -#include "isa.h" - int is_physical_memory(addr) vm_offset_t addr; diff --git a/sys/platform/pc32/include/bus.h b/sys/platform/pc32/include/bus.h index 790690db81..b696658e9a 100644 --- a/sys/platform/pc32/include/bus.h +++ b/sys/platform/pc32/include/bus.h @@ -29,7 +29,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/bus.h,v 1.7.2.2 2002/03/03 05:42:50 nyan Exp $ - * $DragonFly: src/sys/platform/pc32/include/Attic/bus.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/Attic/bus.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _I386_BUS_H_ @@ -37,11 +37,11 @@ #ifdef PC98 /* NEC PC-98 */ -#include +#include "bus_pc98.h" #else /* IBM-PC */ -#include +#include "bus_at386.h" #endif -#include +#include "bus_dma.h" #endif /* _I386_BUS_H_ */ diff --git a/sys/platform/pc32/include/bus_pc98.h b/sys/platform/pc32/include/bus_pc98.h index 993207bea8..f25b7b4d0e 100644 --- a/sys/platform/pc32/include/bus_pc98.h +++ b/sys/platform/pc32/include/bus_pc98.h @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/i386/include/bus_pc98.h,v 1.8.2.5 2002/03/03 05:42:50 nyan Exp $ */ -/* $DragonFly: src/sys/platform/pc32/include/Attic/bus_pc98.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ */ +/* $DragonFly: src/sys/platform/pc32/include/Attic/bus_pc98.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ /* $NecBSD: busio.h,v 3.25.4.2.2.1 2000/06/12 03:53:08 honda Exp $ */ /* $NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $ */ @@ -49,7 +49,7 @@ #include -#include +#include "cpufunc.h" /* * Bus address and size types diff --git a/sys/platform/pc32/include/globaldata.h b/sys/platform/pc32/include/globaldata.h index 1a52e63b34..0ca63f0c3b 100644 --- a/sys/platform/pc32/include/globaldata.h +++ b/sys/platform/pc32/include/globaldata.h @@ -28,7 +28,7 @@ * should not include this file. * * $FreeBSD: src/sys/i386/include/globaldata.h,v 1.11.2.1 2000/05/16 06:58:10 dillon Exp $ - * $DragonFly: src/sys/platform/pc32/include/globaldata.h,v 1.18 2003/07/12 17:54:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/globaldata.h,v 1.19 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_GLOBALDATA_H_ @@ -41,10 +41,10 @@ #include /* struct thread */ #endif #ifndef _MACHINE_SEGMENTS_H_ -#include /* struct segment_descriptor */ +#include "segments.h" /* struct segment_descriptor */ #endif #ifndef _MACHINE_TSS_H_ -#include /* struct i386tss */ +#include "tss.h" /* struct i386tss */ #endif /* diff --git a/sys/platform/pc32/include/lock.h b/sys/platform/pc32/include/lock.h index fdc8072dcf..29af16780d 100644 --- a/sys/platform/pc32/include/lock.h +++ b/sys/platform/pc32/include/lock.h @@ -22,14 +22,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/lock.h,v 1.11.2.2 2000/09/30 02:49:34 ps Exp $ - * $DragonFly: src/sys/platform/pc32/include/lock.h,v 1.5 2003/07/13 05:45:10 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/lock.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_LOCK_H_ #define _MACHINE_LOCK_H_ #ifndef _MACHINE_PSL_H_ -#include +#include "psl.h" #endif /* diff --git a/sys/platform/pc32/include/mpapic.h b/sys/platform/pc32/include/mpapic.h index 434ded38a0..f979f28bad 100644 --- a/sys/platform/pc32/include/mpapic.h +++ b/sys/platform/pc32/include/mpapic.h @@ -23,13 +23,13 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/mpapic.h,v 1.14.2.2 2000/09/30 02:49:34 ps Exp $ - * $DragonFly: src/sys/platform/pc32/include/Attic/mpapic.h,v 1.3 2003/07/04 00:32:26 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/Attic/mpapic.h,v 1.4 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _MACHINE_MPAPIC_H_ #define _MACHINE_MPAPIC_H_ -#include +#include "apic.h" #include diff --git a/sys/platform/pc32/include/pcb.h b/sys/platform/pc32/include/pcb.h index 3cdaccb192..b278ac6dbe 100644 --- a/sys/platform/pc32/include/pcb.h +++ b/sys/platform/pc32/include/pcb.h @@ -35,7 +35,7 @@ * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/include/pcb.h,v 1.32.2.1 2001/08/15 01:23:52 peter Exp $ - * $DragonFly: src/sys/platform/pc32/include/pcb.h,v 1.5 2003/06/28 04:16:03 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/pcb.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _I386_PCB_H_ @@ -44,7 +44,7 @@ /* * Intel 386 process control block */ -#include +#include "npx.h" struct pcb { int pcb_cr3; diff --git a/sys/platform/pc32/include/pcb_ext.h b/sys/platform/pc32/include/pcb_ext.h index 2457120930..36ebb51445 100644 --- a/sys/platform/pc32/include/pcb_ext.h +++ b/sys/platform/pc32/include/pcb_ext.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/pcb_ext.h,v 1.4 1999/12/29 04:33:04 peter Exp $ - * $DragonFly: src/sys/platform/pc32/include/pcb_ext.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/pcb_ext.h,v 1.3 2003/08/07 21:17:22 dillon Exp $ */ #ifndef _I386_PCB_EXT_H_ @@ -33,9 +33,9 @@ /* * Extension to the 386 process control block */ -#include -#include -#include +#include "tss.h" +#include "vm86.h" +#include "segments.h" struct pcb_ext { struct segment_descriptor ext_tssd; /* tss descriptor */ diff --git a/sys/platform/pc32/include/smp.h b/sys/platform/pc32/include/smp.h index 5a4af7acca..4fbe05b73d 100644 --- a/sys/platform/pc32/include/smp.h +++ b/sys/platform/pc32/include/smp.h @@ -7,7 +7,7 @@ * ---------------------------------------------------------------------------- * * $FreeBSD: src/sys/i386/include/smp.h,v 1.50.2.5 2001/02/13 22:32:45 tegge Exp $ - * $DragonFly: src/sys/platform/pc32/include/smp.h,v 1.5 2003/07/11 01:23:23 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/include/smp.h,v 1.6 2003/08/07 21:17:22 dillon Exp $ * */ @@ -39,7 +39,7 @@ extern int current_postcode; /** XXX currently in mp_machdep.c */ outb(0x80, current_postcode) -#include +#include "apic.h" /* global data in mpboot.s */ extern int bootMP_size; diff --git a/sys/platform/pc32/isa/README.stl b/sys/platform/pc32/isa/README.stl index 8afacebcc1..54d2f6e3d2 100644 --- a/sys/platform/pc32/isa/README.stl +++ b/sys/platform/pc32/isa/README.stl @@ -1,5 +1,5 @@ $FreeBSD: src/sys/i386/isa/README.stl,v 1.3.6.2 2001/08/30 12:29:57 murray Exp $ -$DragonFly: src/sys/platform/pc32/isa/README.stl,v 1.2 2003/06/17 04:28:36 dillon Exp $ +$DragonFly: src/sys/platform/pc32/isa/README.stl,v 1.3 2003/08/07 21:17:23 dillon Exp $ Stallion Multiport Serial Driver Readme --------------------------------------- @@ -211,7 +211,7 @@ So there is a theoretical maximum of 512 ports. - add the following lines (in 2.1.0 I put them at line 729): /* Stallion Multiport Serial Driver */ -#include "stl.h" +#include "use_stl.h" #if NSTL > 0 d_open_t stlopen; d_close_t stlclose; @@ -257,7 +257,7 @@ d_ttycv_t stldevtotty; - add the following lines (in 2.1.0 I put them at line 729): /* Stallion Intelligent Multiport Serial Driver */ -#include "stl.h" +#include "use_stl.h" #if NSTL > 0 d_open_t stliopen; d_close_t stliclose; diff --git a/sys/platform/pc32/isa/asc.c b/sys/platform/pc32/isa/asc.c index 306129dd14..b5082c9101 100644 --- a/sys/platform/pc32/isa/asc.c +++ b/sys/platform/pc32/isa/asc.c @@ -35,10 +35,10 @@ */ /* * $FreeBSD: src/sys/i386/isa/asc.c,v 1.42.2.2 2001/03/01 03:22:39 jlemon Exp $ - * $DragonFly: src/sys/platform/pc32/isa/asc.c,v 1.5 2003/07/21 07:57:44 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/asc.c,v 1.6 2003/08/07 21:17:23 dillon Exp $ */ -#include "asc.h" +#include "use_asc.h" #include #include #include @@ -52,9 +52,9 @@ #include -#include -#include -#include +#include +#include +#include "ascreg.h" /*** *** CONSTANTS & DEFINES diff --git a/sys/platform/pc32/isa/atapi.c b/sys/platform/pc32/isa/atapi.c index 77b9fec806..855089d8fc 100644 --- a/sys/platform/pc32/isa/atapi.c +++ b/sys/platform/pc32/isa/atapi.c @@ -14,7 +14,7 @@ * Version 1.9, Mon Oct 9 22:34:47 MSK 1995 * * $FreeBSD: src/sys/i386/isa/atapi.c,v 1.36.2.1 2000/04/03 20:13:06 n_hibma Exp $ - * $DragonFly: src/sys/platform/pc32/isa/Attic/atapi.c,v 1.3 2003/07/19 21:14:34 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/Attic/atapi.c,v 1.4 2003/08/07 21:17:23 dillon Exp $ */ /* @@ -102,11 +102,10 @@ */ #undef DEBUG -#include "wdc.h" - -#include "wcd.h" -#include "wfd.h" -#include "wst.h" +#include "use_wdc.h" +#include "use_wcd.h" +#include "use_wfd.h" +#include "use_wst.h" /* #include "wmd.h" -- add your driver here */ #if NWDC > 0 diff --git a/sys/platform/pc32/isa/clock.c b/sys/platform/pc32/isa/clock.c index 125ee2a449..8b2fbf8868 100644 --- a/sys/platform/pc32/isa/clock.c +++ b/sys/platform/pc32/isa/clock.c @@ -35,7 +35,7 @@ * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/isa/clock.c,v 1.149.2.6 2002/11/02 04:41:50 iwasaki Exp $ - * $DragonFly: src/sys/platform/pc32/isa/clock.c,v 1.4 2003/07/06 21:23:49 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/clock.c,v 1.5 2003/08/07 21:17:23 dillon Exp $ */ /* @@ -49,8 +49,9 @@ * reintroduced and updated by Chris Stenton 8/10/94 */ +#include "use_apm.h" +#include "use_mca.h" #include "opt_clock.h" -#include "apm.h" #include #include @@ -80,15 +81,14 @@ #include #include -#include -#include +#include +#include #include #include -#include "mca.h" #if NMCA > 0 -#include +#include #endif #ifdef APIC_IO diff --git a/sys/platform/pc32/isa/intr_machdep.c b/sys/platform/pc32/isa/intr_machdep.c index a5059636f5..adfaed0fa4 100644 --- a/sys/platform/pc32/isa/intr_machdep.c +++ b/sys/platform/pc32/isa/intr_machdep.c @@ -35,7 +35,7 @@ * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * $FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.29.2.5 2001/10/14 06:54:27 luigi Exp $ - * $DragonFly: src/sys/platform/pc32/isa/intr_machdep.c,v 1.12 2003/07/23 02:30:19 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/intr_machdep.c,v 1.13 2003/08/07 21:17:23 dillon Exp $ */ /* * This file contains an aggregated module marked: @@ -44,10 +44,10 @@ * See the notice for details. */ +#include "use_isa.h" +#include "use_mca.h" #include "opt_auto_eoi.h" -#include "isa.h" - #include #ifndef SMP #include @@ -74,24 +74,23 @@ #include #include #else -#include +#include #endif #include #if NISA > 0 -#include +#include #endif #include -#include +#include #include #ifdef APIC_IO #include #endif #include -#include "mca.h" #if NMCA > 0 -#include +#include #endif /* XXX should be in suitable include files */ diff --git a/sys/platform/pc32/isa/npx.c b/sys/platform/pc32/isa/npx.c index af7266a669..85b9de24fe 100644 --- a/sys/platform/pc32/isa/npx.c +++ b/sys/platform/pc32/isa/npx.c @@ -33,7 +33,7 @@ * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 * $FreeBSD: src/sys/i386/isa/npx.c,v 1.80.2.3 2001/10/20 19:04:38 tegge Exp $ - * $DragonFly: src/sys/platform/pc32/isa/npx.c,v 1.11 2003/08/01 10:58:59 rob Exp $ + * $DragonFly: src/sys/platform/pc32/isa/npx.c,v 1.12 2003/08/07 21:17:23 dillon Exp $ */ #include "opt_cpu.h" @@ -75,7 +75,7 @@ #ifndef SMP #include #include -#include +#include #endif /* diff --git a/sys/platform/pc32/isa/sound/local.h b/sys/platform/pc32/isa/sound/local.h index cf8a2193f6..78749d38c4 100644 --- a/sys/platform/pc32/isa/sound/local.h +++ b/sys/platform/pc32/isa/sound/local.h @@ -6,6 +6,7 @@ * will become more like that of standard bsd code. * lr 970714 * + * $DragonFly: src/sys/platform/pc32/isa/sound/Attic/local.h,v 1.2 2003/08/07 21:17:23 dillon Exp $ */ /* build hex2hex /tmp/foo.x trix_boot.h trix_boot */ @@ -16,7 +17,7 @@ */ #define ALLOW_BUFFER_MAPPING 1 -#include "snd.h" +#include "use_snd.h" #if NSND > 0 #include "opt_sound.h" @@ -25,18 +26,18 @@ #define CONFIG_SEQUENCER -#include "gus.h" +#include "use_gus.h" #if NGUS != 0 && !defined(CONFIG_GUS) #define CONFIG_GUS #define CONFIG_GUSMAX #endif -#include "sscape.h" +#include "use_sscape.h" #if NSSCAPE != 0 && !defined(CONFIG_SSCAPE) #define CONFIG_SSCAPE #endif -#include "trix.h" +#include "use_trix.h" #if NTRIX > 0 #define INCLUDE_TRIX_BOOT #define CONFIG_TRIX /* can use NTRIX > 0 instead */ @@ -51,58 +52,58 @@ #define CONFIG_MIDI #endif -#include "sb.h" +#include "use_sb.h" #if NSB > 0 #define CONFIG_SB #endif -#include "mss.h" +#include "use_mss.h" #if NMSS != 0 #define CONFIG_AD1848 #define CONFIG_MSS #undef CONFIG_CS4232 #endif -#include "css.h" +#include "use_css.h" #if NCSS != 0 #define CONFIG_AD1848 #undef CONFIG_MSS #define CONFIG_CS4232 #endif -#include "sbxvi.h" +#include "use_sbxvi.h" #if NSBXVI != 0 && !defined(CONFIG_SB16) #define CONFIG_SB16 #define CONFIG_SBPRO /* FIXME: Also needs to be a sep option */ #endif -#include "sbmidi.h" +#include "use_sbmidi.h" #if NSBMIDI != 0 && !defined(CONFIG_SB16MIDI) #define CONFIG_SB16MIDI #endif -#include "awe.h" +#include "use_awe.h" #if NAWE != 0 && !defined(CONFIG_AWE32) #define CONFIG_AWE32 #endif -#include "pas.h" +#include "use_pas.h" #if NPAS != 0 && !defined(CONFIG_PAS) #define CONFIG_PAS #endif -#include "mpu.h" +#include "use_mpu.h" #if NMPU != 0 && !defined(CONFIG_MPU401) #define CONFIG_MPU401 #endif -#include "opl.h" +#include "use_opl.h" #if NOPL != 0 && !defined(CONFIG_YM3812) #define CONFIG_YM3812 #endif #ifdef PC98 -#include "nss.h" +#include "use_nss.h" #if NNSS != 0 #define CONFIG_NSS #endif diff --git a/sys/platform/pc32/isa/sound/os.h b/sys/platform/pc32/isa/sound/os.h index 9fca967b56..89bc6b5f08 100644 --- a/sys/platform/pc32/isa/sound/os.h +++ b/sys/platform/pc32/isa/sound/os.h @@ -2,7 +2,7 @@ * os.h -- only included by sound_config.h right after local.h * * $FreeBSD: src/sys/i386/isa/sound/os.h,v 1.40.2.1 2000/08/03 01:01:27 peter Exp $ - * $DragonFly: src/sys/platform/pc32/isa/sound/Attic/os.h,v 1.3 2003/07/19 21:14:36 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/sound/Attic/os.h,v 1.4 2003/08/07 21:17:23 dillon Exp $ */ #ifndef _OS_H_ @@ -23,7 +23,7 @@ #include -#include +#include #undef DELAY #define DELAY(x) tenmicrosec(x) diff --git a/sys/platform/pc32/isa/vector.s b/sys/platform/pc32/isa/vector.s index 857f6d9107..afeb232a04 100644 --- a/sys/platform/pc32/isa/vector.s +++ b/sys/platform/pc32/isa/vector.s @@ -1,7 +1,7 @@ /* * from: vector.s, 386BSD 0.1 unknown origin * $FreeBSD: src/sys/i386/isa/vector.s,v 1.32 1999/08/28 00:45:04 peter Exp $ - * $DragonFly: src/sys/platform/pc32/isa/Attic/vector.s,v 1.4 2003/07/01 20:31:38 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/Attic/vector.s,v 1.5 2003/08/07 21:17:23 dillon Exp $ */ /* @@ -14,7 +14,7 @@ #ifdef PC98 #include #else -#include +#include #endif .data diff --git a/sys/platform/vkernel/i386/genassym.c b/sys/platform/vkernel/i386/genassym.c index 804b850a4a..40ba9b685d 100644 --- a/sys/platform/vkernel/i386/genassym.c +++ b/sys/platform/vkernel/i386/genassym.c @@ -35,13 +35,11 @@ * * from: @(#)genassym.c 5.11 (Berkeley) 5/10/91 * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.86.2.3 2002/03/03 05:42:49 nyan Exp $ - * $DragonFly: src/sys/platform/vkernel/i386/genassym.c,v 1.27 2003/07/24 01:41:16 dillon Exp $ + * $DragonFly: src/sys/platform/vkernel/i386/genassym.c,v 1.28 2003/08/07 21:17:22 dillon Exp $ */ #include "opt_user_ldt.h" -#include - #include #include #include @@ -63,10 +61,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef SMP #include #endif diff --git a/sys/sys/camlib.h b/sys/sys/camlib.h new file mode 100644 index 0000000000..6692349d5a --- /dev/null +++ b/sys/sys/camlib.h @@ -0,0 +1,179 @@ +/* + * Copyright (c) 1997, 1998 Kenneth D. Merry. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD: src/lib/libcam/camlib.h,v 1.2 1999/08/28 00:04:06 peter Exp $ + * $DragonFly: src/sys/sys/camlib.h,v 1.1 2003/08/07 21:17:40 dillon Exp $ + */ +/* + * Buffer encoding/decoding routines taken from the original FreeBSD SCSI + * library and slightly modified. The original header file had the following + * copyright: + */ +/* Copyright (c) 1994 HD Associates (hd@world.std.com) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by HD Associates + * 4. Neither the name of the HD Associaates nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL HD ASSOCIATES OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + + +#ifndef _SYS_CAMLIB_H +#define _SYS_CAMLIB_H + +#include +#include + +#include +#include + +#define CAM_ERRBUF_SIZE 2048 /* sizeof the CAM libarary error string */ + +/* + * Right now we hard code the transport layer device, but this will change + * if we ever get more than one transport layer. + */ +#define XPT_DEVICE "/dev/xpt0" + + +extern char cam_errbuf[]; + +struct cam_device { + char device_path[MAXPATHLEN+1];/* + * Pathname of the device + * given by the user. This + * may be null if the + * user states the device + * name and unit number + * separately. + */ + char given_dev_name[DEV_IDLEN+1];/* + * Device name given by + * the user. + */ + u_int32_t given_unit_number; /* + * Unit number given by + * the user. + */ + char device_name[DEV_IDLEN+1];/* + * Name of the device, + * e.g. 'pass' + */ + u_int32_t dev_unit_num; /* Unit number of the passthrough + * device associated with this + * particular device. + */ + + char sim_name[SIM_IDLEN+1]; /* Controller name, e.g. 'ahc' */ + u_int32_t sim_unit_number; /* Controller unit number */ + u_int32_t bus_id; /* Controller bus number */ + lun_id_t target_lun; /* Logical Unit Number */ + target_id_t target_id; /* Target ID */ + path_id_t path_id; /* System SCSI bus number */ + u_int16_t pd_type; /* type of peripheral device */ + struct scsi_inquiry_data inq_data; /* SCSI Inquiry data */ + u_int8_t serial_num[252]; /* device serial number */ + u_int8_t serial_num_len; /* length of the serial number */ + u_int8_t sync_period; /* Negotiated sync period */ + u_int8_t sync_offset; /* Negotiated sync offset */ + u_int8_t bus_width; /* Negotiated bus width */ + int fd; /* file descriptor for device */ +}; + +__BEGIN_DECLS +/* Basic utility commands */ +struct cam_device * cam_open_device(const char *path, int flags); +void cam_close_device(struct cam_device *dev); +void cam_close_spec_device(struct cam_device *dev); +struct cam_device * cam_open_spec_device(const char *dev_name, + int unit, int flags, + struct cam_device *device); +struct cam_device * cam_open_btl(path_id_t path_id, target_id_t target_id, + lun_id_t target_lun, int flags, + struct cam_device *device); +struct cam_device * cam_open_pass(const char *path, int flags, + struct cam_device *device); +union ccb * cam_getccb(struct cam_device *dev); +void cam_freeccb(union ccb *ccb); +int cam_send_ccb(struct cam_device *device, union ccb *ccb); +char * cam_path_string(struct cam_device *dev, char *str, + int len); +struct cam_device * cam_device_dup(struct cam_device *device); +void cam_device_copy(struct cam_device *src, + struct cam_device *dst); +int cam_get_device(const char *path, char *dev_name, + int devnamelen, int *unit); + +/* + * Buffer encoding/decoding routines, from the old SCSI library. + */ +int csio_decode(struct ccb_scsiio *csio, char *fmt, ...); +int csio_decode_visit(struct ccb_scsiio *csio, char *fmt, + void (*arg_put)(void *, int, void *, int, char *), + void *puthook); +int buff_decode(u_int8_t *buff, size_t len, char *fmt, ...); +int buff_decode_visit(u_int8_t *buff, size_t len, char *fmt, + void (*arg_put)(void *, int, void *, int, char *), + void *puthook); +int csio_build(struct ccb_scsiio *csio, u_int8_t *data_ptr, + u_int32_t dxfer_len, u_int32_t flags, int retry_count, + int timeout, char *cmd_spec, ...); +int csio_build_visit(struct ccb_scsiio *csio, u_int8_t *data_ptr, + u_int32_t dxfer_len, u_int32_t flags, int retry_count, + int timeout, char *cmd_spec, + int (*arg_get)(void *hook, char *field_name), + void *gethook); +int csio_encode(struct ccb_scsiio *csio, char *fmt, ...); +int buff_encode_visit(u_int8_t *buff, size_t len, char *fmt, + int (*arg_get)(void *hook, char *field_name), + void *gethook); +int csio_encode_visit(struct ccb_scsiio *csio, char *fmt, + int (*arg_get)(void *hook, char *field_name), + void *gethook); +__END_DECLS + +#endif /* _CAMLIB_H */ diff --git a/sys/libkern/strncmp.c b/sys/sys/paths.h similarity index 73% copy from sys/libkern/strncmp.c copy to sys/sys/paths.h index 7f796749df..a0c580093a 100644 --- a/sys/libkern/strncmp.c +++ b/sys/sys/paths.h @@ -30,26 +30,24 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/libkern/strncmp.c,v 1.7 1999/08/28 00:46:38 peter Exp $ - * $DragonFly: src/sys/libkern/strncmp.c,v 1.3 2003/07/26 20:04:12 rob Exp $ + * @(#)paths.h 8.1 (Berkeley) 6/2/93 + * $FreeBSD: src/include/paths.h,v 1.9.6.4 2002/07/19 07:53:41 jmallett Exp $ + * $DragonFly: src/sys/sys/paths.h,v 1.1 2003/08/07 21:17:40 dillon Exp $ */ -#include +#ifndef _SYS_PATHS_H_ +#define _SYS_PATHS_H_ -int -strncmp(s1, s2, n) - const char *s1, *s2; - size_t n; -{ +#define __SYS_PATH_CONSOLE "/dev/console" +#define __SYS_PATH_DEFTAPE "/dev/sa0" +#define __SYS_PATH_DEVNULL "/dev/null" +#define __SYS_PATH_DEVZERO "/dev/zero" +#define __SYS_PATH_DRUM "/dev/drum" +#define __SYS_PATH_KMEM "/dev/kmem" +#define __SYS_PATH_MEM "/dev/mem" +#define __SYS_PATH_TTY "/dev/tty" - if (n == 0) - return (0); - do { - if (*s1 != *s2++) - return (*(const unsigned char *)s1 - - *(const unsigned char *)(s2 - 1)); - if (*s1++ == 0) - break; - } while (--n != 0); - return (0); -} +/* Provide trailing slash, since mostly used for building pathnames. */ +#define __SYS_PATH_DEV "/dev/" + +#endif diff --git a/sys/sys/posix4.h b/sys/sys/posix4.h index a5b9d9e2e7..e3b4ff8669 100644 --- a/sys/sys/posix4.h +++ b/sys/sys/posix4.h @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/posix4/posix4.h,v 1.6 1999/12/27 10:22:09 bde Exp $ - * $DragonFly: src/sys/sys/posix4.h,v 1.2 2003/06/17 04:28:57 dillon Exp $ + * $DragonFly: src/sys/sys/posix4.h,v 1.3 2003/08/07 21:17:19 dillon Exp $ */ #include "opt_posix.h" @@ -40,7 +40,7 @@ #include #include #include -#include +#include "sched.h" /* Generate syscall stubs for when something is optionally * loadable as a module. References "syscall_not_present". diff --git a/sys/vfs/coda/cnode.h b/sys/vfs/coda/cnode.h index 7d272fe498..a03106056a 100644 --- a/sys/vfs/coda/cnode.h +++ b/sys/vfs/coda/cnode.h @@ -28,7 +28,7 @@ * * @(#) src/sys/coda/cnode.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ * $FreeBSD: src/sys/coda/cnode.h,v 1.7 1999/08/28 00:40:52 peter Exp $ - * $DragonFly: src/sys/vfs/coda/Attic/cnode.h,v 1.2 2003/06/17 04:28:19 dillon Exp $ + * $DragonFly: src/sys/vfs/coda/Attic/cnode.h,v 1.3 2003/08/07 21:17:40 dillon Exp $ * */ @@ -57,7 +57,7 @@ MALLOC_DECLARE(M_CODA); /* * tmp below since we need struct queue */ -#include +#include "coda_kernel.h" /* * Cnode lookup stuff. diff --git a/sys/vfs/coda/coda_fbsd.c b/sys/vfs/coda/coda_fbsd.c index 8e4c837bf3..1e088ddeca 100644 --- a/sys/vfs/coda/coda_fbsd.c +++ b/sys/vfs/coda/coda_fbsd.c @@ -28,11 +28,11 @@ * * @(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ * $FreeBSD: src/sys/coda/coda_fbsd.c,v 1.18 1999/09/25 18:23:43 phk Exp $ - * $DragonFly: src/sys/vfs/coda/Attic/coda_fbsd.c,v 1.3 2003/07/21 05:50:25 dillon Exp $ + * $DragonFly: src/sys/vfs/coda/Attic/coda_fbsd.c,v 1.4 2003/08/07 21:17:40 dillon Exp $ * */ -#include "vcoda.h" +#include "use_vcoda.h" #include #include @@ -47,10 +47,10 @@ #include #include -#include -#include -#include -#include +#include "coda.h" +#include "cnode.h" +#include "coda_vnops.h" +#include "coda_psdev.h" /* From: "Jordan K. Hubbard" diff --git a/sys/vfs/coda/coda_namecache.c b/sys/vfs/coda/coda_namecache.c index cbbc2f0885..c56dc15a32 100644 --- a/sys/vfs/coda/coda_namecache.c +++ b/sys/vfs/coda/coda_namecache.c @@ -28,7 +28,7 @@ * * @(#) src/sys/coda/coda_namecache.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ * $FreeBSD: src/sys/coda/coda_namecache.c,v 1.10 1999/08/28 00:40:53 peter Exp $ - * $DragonFly: src/sys/vfs/coda/Attic/coda_namecache.c,v 1.4 2003/06/26 02:17:44 dillon Exp $ + * $DragonFly: src/sys/vfs/coda/Attic/coda_namecache.c,v 1.5 2003/08/07 21:17:40 dillon Exp $ * */ @@ -90,12 +90,12 @@ #include #include -#include -#include -#include +#include "coda.h" +#include "cnode.h" +#include "coda_namecache.h" #ifdef DEBUG -#include +#include "coda_vnops.h" #endif /* diff --git a/sys/vfs/coda/coda_psdev.c b/sys/vfs/coda/coda_psdev.c index d0e9766ad0..e073ae101f 100644 --- a/sys/vfs/coda/coda_psdev.c +++ b/sys/vfs/coda/coda_psdev.c @@ -28,7 +28,7 @@ * * @(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ * $FreeBSD: src/sys/coda/coda_psdev.c,v 1.13 1999/09/29 15:03:46 marcel Exp $ - * $DragonFly: src/sys/vfs/coda/Attic/coda_psdev.c,v 1.6 2003/07/26 13:40:57 rob Exp $ + * $DragonFly: src/sys/vfs/coda/Attic/coda_psdev.c,v 1.7 2003/08/07 21:17:40 dillon Exp $ * */ @@ -55,7 +55,7 @@ extern int coda_nc_initialized; /* Set if cache has been initialized */ -#include +#include "use_vcoda.h" #include #include @@ -68,11 +68,11 @@ extern int coda_nc_initialized; /* Set if cache has been initialized */ #include #include -#include -#include -#include -#include -#include +#include "coda.h" +#include "cnode.h" +#include "coda_namecache.h" +#include "coda_io.h" +#include "coda_psdev.h" #define CTL_C diff --git a/sys/vfs/coda/coda_subr.c b/sys/vfs/coda/coda_subr.c index 1127e61edd..8b46c13b61 100644 --- a/sys/vfs/coda/coda_subr.c +++ b/sys/vfs/coda/coda_subr.c @@ -28,7 +28,7 @@ * * @(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ * $FreeBSD: src/sys/coda/coda_subr.c,v 1.11.2.1 2001/10/25 19:18:51 dillon Exp $ - * $DragonFly: src/sys/vfs/coda/Attic/coda_subr.c,v 1.3 2003/07/26 13:40:57 rob Exp $ + * $DragonFly: src/sys/vfs/coda/Attic/coda_subr.c,v 1.4 2003/08/07 21:17:40 dillon Exp $ * */ @@ -56,7 +56,7 @@ * 4. coda_cacheprint (under DEBUG) prints names with vnode/cnode address */ -#include +#include "use_vcoda.h" #include #include @@ -65,10 +65,10 @@ #include #include -#include -#include -#include -#include +#include "coda.h" +#include "cnode.h" +#include "coda_subr.h" +#include "coda_namecache.h" int coda_active = 0; int coda_reuse = 0; diff --git a/sys/vfs/coda/coda_venus.c b/sys/vfs/coda/coda_venus.c index 0927810039..c87859d5d6 100644 --- a/sys/vfs/coda/coda_venus.c +++ b/sys/vfs/coda/coda_venus.c @@ -28,7 +28,7 @@ * * @(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ * $FreeBSD: src/sys/coda/coda_venus.c,v 1.9 1999/08/28 00:40:56 peter Exp $ - * $DragonFly: src/sys/vfs/coda/Attic/coda_venus.c,v 1.3 2003/06/25 03:55:44 dillon Exp $ + * $DragonFly: src/sys/vfs/coda/Attic/coda_venus.c,v 1.4 2003/08/07 21:17:40 dillon Exp $ * */ @@ -40,10 +40,10 @@ #include #include -#include -#include -#include -#include +#include "coda.h" +#include "cnode.h" +#include "coda_venus.h" +#include "coda_pioctl.h" #define DECL_NO_IN(name) \ struct coda_in_hdr *inp; \ diff --git a/sys/vfs/coda/coda_vfsops.c b/sys/vfs/coda/coda_vfsops.c index c8aa0bfa07..1249259ac8 100644 --- a/sys/vfs/coda/coda_vfsops.c +++ b/sys/vfs/coda/coda_vfsops.c @@ -28,7 +28,7 @@ * * @(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ * $FreeBSD: src/sys/coda/coda_vfsops.c,v 1.24.2.1 2001/07/26 20:36:45 iedowse Exp $ - * $DragonFly: src/sys/vfs/coda/Attic/coda_vfsops.c,v 1.7 2003/07/26 13:40:57 rob Exp $ + * $DragonFly: src/sys/vfs/coda/Attic/coda_vfsops.c,v 1.8 2003/08/07 21:17:40 dillon Exp $ * */ @@ -45,7 +45,7 @@ * M. Satyanarayanan. */ -#include +#include "use_vcoda.h" #include #include @@ -59,12 +59,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "coda.h" +#include "cnode.h" +#include "coda_vfsops.h" +#include "coda_venus.h" +#include "coda_subr.h" +#include "coda_opstats.h" MALLOC_DEFINE(M_CODA, "CODA storage", "Various Coda Structures"); @@ -512,8 +512,8 @@ getNewVnode(vpp) NULL, NULL); } -#include -#include +#include +#include /* get the mount structure corresponding to a given device. Assume * device corresponds to a UFS. Return NULL if no device is found. */ diff --git a/sys/vfs/coda/coda_vnops.c b/sys/vfs/coda/coda_vnops.c index f350690a13..ffa0591ece 100644 --- a/sys/vfs/coda/coda_vnops.c +++ b/sys/vfs/coda/coda_vnops.c @@ -28,7 +28,7 @@ * * @(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ * $FreeBSD: src/sys/coda/coda_vnops.c,v 1.22.2.1 2001/06/29 16:26:22 shafeeq Exp $ - * $DragonFly: src/sys/vfs/coda/Attic/coda_vnops.c,v 1.8 2003/07/26 13:40:57 rob Exp $ + * $DragonFly: src/sys/vfs/coda/Attic/coda_vnops.c,v 1.9 2003/08/07 21:17:40 dillon Exp $ * */ @@ -66,14 +66,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "coda.h" +#include "cnode.h" +#include "coda_vnops.h" +#include "coda_venus.h" +#include "coda_opstats.h" +#include "coda_subr.h" +#include "coda_namecache.h" +#include "coda_pioctl.h" /* * These flags select various performance enhancements. diff --git a/sys/vfs/fdesc/fdesc_vfsops.c b/sys/vfs/fdesc/fdesc_vfsops.c index a1ad65a812..bd16f86709 100644 --- a/sys/vfs/fdesc/fdesc_vfsops.c +++ b/sys/vfs/fdesc/fdesc_vfsops.c @@ -36,7 +36,7 @@ * @(#)fdesc_vfsops.c 8.4 (Berkeley) 1/21/94 * * $FreeBSD: src/sys/miscfs/fdesc/fdesc_vfsops.c,v 1.22.2.3 2002/08/23 17:42:39 njl Exp $ - * $DragonFly: src/sys/vfs/fdesc/fdesc_vfsops.c,v 1.3 2003/06/25 03:55:58 dillon Exp $ + * $DragonFly: src/sys/vfs/fdesc/fdesc_vfsops.c,v 1.4 2003/08/07 21:17:40 dillon Exp $ */ /* @@ -55,7 +55,7 @@ #include #include -#include +#include "fdesc.h" static MALLOC_DEFINE(M_FDESCMNT, "FDESC mount", "FDESC mount structure"); diff --git a/sys/vfs/fdesc/fdesc_vnops.c b/sys/vfs/fdesc/fdesc_vnops.c index 56d85c81a5..d91fb2e17e 100644 --- a/sys/vfs/fdesc/fdesc_vnops.c +++ b/sys/vfs/fdesc/fdesc_vnops.c @@ -36,7 +36,7 @@ * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * * $FreeBSD: src/sys/miscfs/fdesc/fdesc_vnops.c,v 1.47.2.1 2001/10/22 22:49:26 chris Exp $ - * $DragonFly: src/sys/vfs/fdesc/fdesc_vnops.c,v 1.5 2003/07/19 21:14:40 dillon Exp $ + * $DragonFly: src/sys/vfs/fdesc/fdesc_vnops.c,v 1.6 2003/08/07 21:17:40 dillon Exp $ */ /* @@ -60,7 +60,7 @@ #include #include -#include +#include "fdesc.h" #define FDL_WANT 0x01 #define FDL_LOCKED 0x02 diff --git a/sys/vfs/fifofs/fifo_vnops.c b/sys/vfs/fifofs/fifo_vnops.c index 5ab684d67e..af79d640fe 100644 --- a/sys/vfs/fifofs/fifo_vnops.c +++ b/sys/vfs/fifofs/fifo_vnops.c @@ -32,7 +32,7 @@ * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 * $FreeBSD: src/sys/miscfs/fifofs/fifo_vnops.c,v 1.45.2.4 2003/04/22 10:11:24 bde Exp $ - * $DragonFly: src/sys/vfs/fifofs/fifo_vnops.c,v 1.6 2003/07/26 20:05:56 rob Exp $ + * $DragonFly: src/sys/vfs/fifofs/fifo_vnops.c,v 1.7 2003/08/07 21:17:40 dillon Exp $ */ #include @@ -50,7 +50,7 @@ #include #include #include -#include +#include "fifo.h" /* * This structure is associated with the FIFO vnode and stores diff --git a/sys/vfs/gnu/ext2fs/ext2_alloc.c b/sys/vfs/gnu/ext2fs/ext2_alloc.c index b00d27928d..533a975a9b 100644 --- a/sys/vfs/gnu/ext2fs/ext2_alloc.c +++ b/sys/vfs/gnu/ext2fs/ext2_alloc.c @@ -38,7 +38,7 @@ * * @(#)ext2_alloc.c 8.8 (Berkeley) 2/21/94 * $FreeBSD: src/sys/gnu/ext2fs/ext2_alloc.c,v 1.28.2.2 2002/07/01 00:18:51 iedowse Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_alloc.c,v 1.3 2003/07/26 18:53:21 rob Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_alloc.c,v 1.4 2003/08/07 21:17:40 dillon Exp $ */ #include "opt_quota.h" @@ -51,14 +51,14 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include +#include "ext2_fs.h" +#include "ext2_fs_sb.h" +#include "fs.h" +#include "ext2_extern.h" static void ext2_fserr __P((struct ext2_sb_info *, u_int, char *)); diff --git a/sys/vfs/gnu/ext2fs/ext2_balloc.c b/sys/vfs/gnu/ext2fs/ext2_balloc.c index b9e8f556b7..597592ebc8 100644 --- a/sys/vfs/gnu/ext2fs/ext2_balloc.c +++ b/sys/vfs/gnu/ext2fs/ext2_balloc.c @@ -38,7 +38,7 @@ * * @(#)ffs_balloc.c 8.4 (Berkeley) 9/23/93 * $FreeBSD: src/sys/gnu/ext2fs/ext2_balloc.c,v 1.9.2.1 2000/08/03 00:52:57 peter Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_balloc.c,v 1.4 2003/07/26 18:53:21 rob Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_balloc.c,v 1.5 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -48,14 +48,14 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include +#include "ext2_fs.h" +#include "ext2_fs_sb.h" +#include "fs.h" +#include "ext2_extern.h" /* * Balloc defines the structure of file system storage diff --git a/sys/vfs/gnu/ext2fs/ext2_fs.h b/sys/vfs/gnu/ext2fs/ext2_fs.h index c6492c9d40..cdcdb2b9df 100644 --- a/sys/vfs/gnu/ext2fs/ext2_fs.h +++ b/sys/vfs/gnu/ext2fs/ext2_fs.h @@ -5,7 +5,7 @@ * University of Utah, Department of Computer Science * * $FreeBSD: src/sys/gnu/ext2fs/ext2_fs.h,v 1.8.2.2 2001/09/29 12:52:47 iedowse Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_fs.h,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_fs.h,v 1.3 2003/08/07 21:17:41 dillon Exp $ */ /* * linux/include/linux/ext2_fs.h @@ -265,7 +265,7 @@ struct ext2_group_desc #define EXT2_IOC_SETVERSION _IOW('v', 2, long) /* - * Only declare `struct ext2_inode' if hasn't made things + * Only declare `struct ext2_inode' if hasn't made things * difficult by #defining i_mode and other struct members. The details of * the struct are only needed in ext2_inode_cnv.c where the ext2fs on-disk * inode is converted to a ufs in-core inode. diff --git a/sys/vfs/gnu/ext2fs/ext2_inode.c b/sys/vfs/gnu/ext2fs/ext2_inode.c index 4f70a2e356..168a12f025 100644 --- a/sys/vfs/gnu/ext2fs/ext2_inode.c +++ b/sys/vfs/gnu/ext2fs/ext2_inode.c @@ -38,7 +38,7 @@ * * @(#)ext2_inode.c 8.5 (Berkeley) 12/30/93 * $FreeBSD: src/sys/gnu/ext2fs/ext2_inode.c,v 1.24.2.1 2000/08/03 00:52:57 peter Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_inode.c,v 1.4 2003/07/26 18:53:21 rob Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_inode.c,v 1.5 2003/08/07 21:17:41 dillon Exp $ */ #include "opt_quota.h" @@ -53,15 +53,15 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include +#include "ext2_fs.h" +#include "ext2_fs_sb.h" +#include "fs.h" +#include "ext2_extern.h" static int ext2_indirtrunc __P((struct inode *, daddr_t, daddr_t, daddr_t, int, long *)); diff --git a/sys/vfs/gnu/ext2fs/ext2_inode_cnv.c b/sys/vfs/gnu/ext2fs/ext2_inode_cnv.c index 213d1a2253..7ad847b8da 100644 --- a/sys/vfs/gnu/ext2fs/ext2_inode_cnv.c +++ b/sys/vfs/gnu/ext2fs/ext2_inode_cnv.c @@ -20,7 +20,7 @@ * * Utah $Hdr$ * $FreeBSD: src/sys/gnu/ext2fs/ext2_inode_cnv.c,v 1.11 2000/01/01 17:39:21 bde Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_inode_cnv.c,v 1.2 2003/06/17 04:28:34 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_inode_cnv.c,v 1.3 2003/08/07 21:17:41 dillon Exp $ */ /* @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include /* * Undo the definitions in that would destroy the include @@ -55,8 +55,8 @@ #undef i_size #undef i_uid -#include -#include +#include "ext2_fs.h" +#include "ext2_extern.h" void ext2_print_dinode( di ) diff --git a/sys/vfs/gnu/ext2fs/ext2_linux_balloc.c b/sys/vfs/gnu/ext2fs/ext2_linux_balloc.c index 174fca5bce..0ca14ac9ae 100644 --- a/sys/vfs/gnu/ext2fs/ext2_linux_balloc.c +++ b/sys/vfs/gnu/ext2fs/ext2_linux_balloc.c @@ -5,7 +5,7 @@ * University of Utah, Department of Computer Science * * $FreeBSD: src/sys/gnu/ext2fs/ext2_linux_balloc.c,v 1.11.2.3 2001/08/14 18:03:19 gallatin Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_linux_balloc.c,v 1.3 2003/07/21 07:57:43 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_linux_balloc.c,v 1.4 2003/08/07 21:17:41 dillon Exp $ */ /* * linux/fs/ext2/balloc.c @@ -37,17 +37,17 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include "ext2_extern.h" +#include "ext2_fs.h" +#include "ext2_fs_sb.h" +#include "fs.h" #ifdef __i386__ -#include +#include "i386-bitops.h" #elif defined (__alpha__) -#include +#include "alpha-bitops.h" #else #error Provide an bitops.h file, please ! #endif diff --git a/sys/vfs/gnu/ext2fs/ext2_linux_ialloc.c b/sys/vfs/gnu/ext2fs/ext2_linux_ialloc.c index c076ef506d..1b32f104df 100644 --- a/sys/vfs/gnu/ext2fs/ext2_linux_ialloc.c +++ b/sys/vfs/gnu/ext2fs/ext2_linux_ialloc.c @@ -5,7 +5,7 @@ * University of Utah, Department of Computer Science * * $FreeBSD: src/sys/gnu/ext2fs/ext2_linux_ialloc.c,v 1.13.2.2 2001/08/14 18:03:19 gallatin Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_linux_ialloc.c,v 1.3 2003/07/21 07:57:43 dillon Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_linux_ialloc.c,v 1.4 2003/08/07 21:17:41 dillon Exp $ */ /* * linux/fs/ext2/ialloc.c @@ -37,20 +37,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include "ext2_extern.h" +#include "ext2_fs.h" +#include "ext2_fs_sb.h" +#include "fs.h" #include #include #ifdef __i386__ -#include +#include "i386-bitops.h" #elif defined(__alpha__) -#include +#include "alpha-bitops.h" #else #error please provide bit operation functions #endif diff --git a/sys/vfs/gnu/ext2fs/ext2_lookup.c b/sys/vfs/gnu/ext2fs/ext2_lookup.c index c4c5dba13c..efc92afe51 100644 --- a/sys/vfs/gnu/ext2fs/ext2_lookup.c +++ b/sys/vfs/gnu/ext2fs/ext2_lookup.c @@ -5,7 +5,7 @@ * University of Utah, Department of Computer Science * * $FreeBSD: src/sys/gnu/ext2fs/ext2_lookup.c,v 1.21.2.3 2002/11/17 02:02:42 bde Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_lookup.c,v 1.4 2003/07/26 18:53:21 rob Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_lookup.c,v 1.5 2003/08/07 21:17:41 dillon Exp $ */ /* * Copyright (c) 1989, 1993 @@ -56,15 +56,15 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include +#include "ext2_extern.h" +#include "ext2_fs.h" +#include "ext2_fs_sb.h" /* DIRBLKSIZE in ffs is DEV_BSIZE (in most cases 512) diff --git a/sys/vfs/gnu/ext2fs/ext2_subr.c b/sys/vfs/gnu/ext2fs/ext2_subr.c index efe354014e..6721704ff3 100644 --- a/sys/vfs/gnu/ext2fs/ext2_subr.c +++ b/sys/vfs/gnu/ext2fs/ext2_subr.c @@ -38,21 +38,21 @@ * * @(#)ext2_subr.c 8.2 (Berkeley) 9/21/93 * $FreeBSD: src/sys/gnu/ext2fs/ext2_subr.c,v 1.13.2.2 2000/08/03 18:48:27 peter Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_subr.c,v 1.4 2003/07/26 18:53:21 rob Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_subr.c,v 1.5 2003/08/07 21:17:41 dillon Exp $ */ #include -#include -#include +#include "ext2_fs_sb.h" +#include "fs.h" #include #include #include #include -#include +#include "ext2_extern.h" #include -#include -#include +#include +#include #include "opt_ddb.h" diff --git a/sys/vfs/gnu/ext2fs/ext2_vfsops.c b/sys/vfs/gnu/ext2fs/ext2_vfsops.c index bc296fec84..e4a0be97a1 100644 --- a/sys/vfs/gnu/ext2fs/ext2_vfsops.c +++ b/sys/vfs/gnu/ext2fs/ext2_vfsops.c @@ -38,7 +38,7 @@ * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 * $FreeBSD: src/sys/gnu/ext2fs/ext2_vfsops.c,v 1.63.2.7 2002/07/01 00:18:51 iedowse Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vfsops.c,v 1.8 2003/07/26 18:53:21 rob Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vfsops.c,v 1.9 2003/08/07 21:17:41 dillon Exp $ */ #include "opt_quota.h" @@ -58,17 +58,17 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include -#include +#include "fs.h" +#include "ext2_extern.h" +#include "ext2_fs.h" +#include "ext2_fs_sb.h" static int ext2_fhtovp __P((struct mount *, struct fid *, struct vnode **)); static int ext2_flushfiles __P((struct mount *mp, int flags, struct thread *td)); diff --git a/sys/vfs/gnu/ext2fs/ext2_vnops.c b/sys/vfs/gnu/ext2fs/ext2_vnops.c index 4ac72242c5..6f0865386e 100644 --- a/sys/vfs/gnu/ext2fs/ext2_vnops.c +++ b/sys/vfs/gnu/ext2fs/ext2_vnops.c @@ -44,7 +44,7 @@ * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 * @(#)ext2_vnops.c 8.7 (Berkeley) 2/3/94 * $FreeBSD: src/sys/gnu/ext2fs/ext2_vnops.c,v 1.51.2.2 2003/01/02 17:26:18 bde Exp $ - * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vnops.c,v 1.6 2003/07/26 18:53:21 rob Exp $ + * $DragonFly: src/sys/vfs/gnu/ext2fs/ext2_vnops.c,v 1.7 2003/08/07 21:17:41 dillon Exp $ */ #include "opt_quota.h" @@ -69,16 +69,16 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include "ext2_fs_sb.h" +#include "fs.h" +#include "ext2_extern.h" +#include "ext2_fs.h" static int ext2_makeinode __P((int mode, struct vnode *, struct vnode **, struct componentname *)); @@ -147,7 +147,7 @@ static struct vnodeopv_desc ext2fs_fifoop_opv_desc = VNODEOP_SET(ext2fs_specop_opv_desc); VNODEOP_SET(ext2fs_fifoop_opv_desc); -#include +#include "ext2_readwrite.c" /* * A virgin directory (no blushing please). diff --git a/sys/vfs/hpfs/hpfs_alsubr.c b/sys/vfs/hpfs/hpfs_alsubr.c index 164abc3d7d..2d95d80a2c 100644 --- a/sys/vfs/hpfs/hpfs_alsubr.c +++ b/sys/vfs/hpfs/hpfs_alsubr.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs_alsubr.c,v 1.1 1999/12/09 19:09:58 semenu Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs_alsubr.c,v 1.3 2003/06/26 05:55:12 dillon Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs_alsubr.c,v 1.4 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -40,8 +40,8 @@ #include #include -#include -#include +#include "hpfs.h" +#include "hpfs_subr.h" #define AE_DONE 0 /* Nothing to change */ #define AE_SPLIT 2 /* Split was done, ranp is valid */ diff --git a/sys/vfs/hpfs/hpfs_hash.c b/sys/vfs/hpfs/hpfs_hash.c index 2eb0954f55..66bfb09eb4 100644 --- a/sys/vfs/hpfs/hpfs_hash.c +++ b/sys/vfs/hpfs/hpfs_hash.c @@ -32,7 +32,7 @@ * * @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95 * $FreeBSD: src/sys/fs/hpfs/hpfs_hash.c,v 1.1 1999/12/09 19:09:58 semenu Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs_hash.c,v 1.5 2003/07/19 21:14:31 dillon Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs_hash.c,v 1.6 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -44,7 +44,7 @@ #include #include -#include +#include "hpfs.h" MALLOC_DEFINE(M_HPFSHASH, "HPFS hash", "HPFS node hash tables"); diff --git a/sys/vfs/hpfs/hpfs_lookup.c b/sys/vfs/hpfs/hpfs_lookup.c index cb18fdc305..530fb22a6d 100644 --- a/sys/vfs/hpfs/hpfs_lookup.c +++ b/sys/vfs/hpfs/hpfs_lookup.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs_lookup.c,v 1.1 1999/12/09 19:09:59 semenu Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs_lookup.c,v 1.3 2003/07/26 18:51:23 rob Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs_lookup.c,v 1.4 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -40,9 +40,9 @@ #include #include -#include -#include -#include +#include "hpfs.h" +#include "hpfsmount.h" +#include "hpfs_subr.h" int hpfs_removedirent (struct hpfsmount *, lsn_t, char *, int, int *); diff --git a/sys/vfs/hpfs/hpfs_subr.c b/sys/vfs/hpfs/hpfs_subr.c index 20fd25cdea..e1418aa5b2 100644 --- a/sys/vfs/hpfs/hpfs_subr.c +++ b/sys/vfs/hpfs/hpfs_subr.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs_subr.c,v 1.1 1999/12/09 19:09:59 semenu Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs_subr.c,v 1.4 2003/07/26 18:51:23 rob Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs_subr.c,v 1.5 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -40,9 +40,9 @@ #include #include -#include -#include -#include +#include "hpfs.h" +#include "hpfsmount.h" +#include "hpfs_subr.h" u_long hpfs_checksum( diff --git a/sys/vfs/hpfs/hpfs_vfsops.c b/sys/vfs/hpfs/hpfs_vfsops.c index 087cace3d4..dc1660e7db 100644 --- a/sys/vfs/hpfs/hpfs_vfsops.c +++ b/sys/vfs/hpfs/hpfs_vfsops.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs_vfsops.c,v 1.3.2.2 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.6 2003/07/26 18:51:23 rob Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs_vfsops.c,v 1.7 2003/08/07 21:17:41 dillon Exp $ */ @@ -53,9 +53,9 @@ #include #endif -#include -#include -#include +#include "hpfs.h" +#include "hpfsmount.h" +#include "hpfs_subr.h" #if defined(__FreeBSD__) MALLOC_DEFINE(M_HPFSMNT, "HPFS mount", "HPFS mount structure"); diff --git a/sys/vfs/hpfs/hpfs_vnops.c b/sys/vfs/hpfs/hpfs_vnops.c index aea743f940..6729720965 100644 --- a/sys/vfs/hpfs/hpfs_vnops.c +++ b/sys/vfs/hpfs/hpfs_vnops.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/hpfs/hpfs_vnops.c,v 1.2.2.2 2002/01/15 18:35:09 semenu Exp $ - * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.6 2003/07/26 18:51:23 rob Exp $ + * $DragonFly: src/sys/vfs/hpfs/hpfs_vnops.c,v 1.7 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -62,10 +62,10 @@ #include /* for pathconf(2) constants */ -#include -#include -#include -#include +#include "hpfs.h" +#include "hpfsmount.h" +#include "hpfs_subr.h" +#include "hpfs_ioctl.h" static int hpfs_de_uiomove __P((struct hpfsmount *, struct hpfsdirent *, struct uio *)); diff --git a/sys/vfs/isofs/cd9660/cd9660_bmap.c b/sys/vfs/isofs/cd9660/cd9660_bmap.c index 1bbc61b54c..a159996207 100644 --- a/sys/vfs/isofs/cd9660/cd9660_bmap.c +++ b/sys/vfs/isofs/cd9660/cd9660_bmap.c @@ -37,15 +37,15 @@ * * @(#)cd9660_bmap.c 8.3 (Berkeley) 1/23/94 * $FreeBSD: src/sys/isofs/cd9660/cd9660_bmap.c,v 1.8 1999/08/28 00:46:06 peter Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_bmap.c,v 1.2 2003/06/17 04:28:41 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_bmap.c,v 1.3 2003/08/07 21:17:41 dillon Exp $ */ #include #include #include -#include -#include +#include "iso.h" +#include "cd9660_node.h" /* * Bmap converts a the logical block number of a file to its physical block diff --git a/sys/vfs/isofs/cd9660/cd9660_lookup.c b/sys/vfs/isofs/cd9660/cd9660_lookup.c index 865c0d2a36..572dec0265 100644 --- a/sys/vfs/isofs/cd9660/cd9660_lookup.c +++ b/sys/vfs/isofs/cd9660/cd9660_lookup.c @@ -39,7 +39,7 @@ * * @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94 * $FreeBSD: src/sys/isofs/cd9660/cd9660_lookup.c,v 1.23.2.2 2001/11/04 06:19:47 dillon Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_lookup.c,v 1.5 2003/07/26 19:27:41 rob Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_lookup.c,v 1.6 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -50,9 +50,9 @@ #include #include -#include -#include -#include +#include "iso.h" +#include "cd9660_node.h" +#include "iso_rrip.h" /* * Convert a component of a pathname into a pointer to a locked inode. diff --git a/sys/vfs/isofs/cd9660/cd9660_node.c b/sys/vfs/isofs/cd9660/cd9660_node.c index 109d77c94e..b4875acf54 100644 --- a/sys/vfs/isofs/cd9660/cd9660_node.c +++ b/sys/vfs/isofs/cd9660/cd9660_node.c @@ -37,7 +37,7 @@ * * @(#)cd9660_node.c 8.2 (Berkeley) 1/23/94 * $FreeBSD: src/sys/isofs/cd9660/cd9660_node.c,v 1.29.2.1 2000/07/08 14:35:56 bp Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_node.c,v 1.5 2003/07/26 19:27:41 rob Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_node.c,v 1.6 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -49,9 +49,9 @@ #include #include -#include -#include -#include +#include "iso.h" +#include "cd9660_node.h" +#include "cd9660_mount.h" /* * Structures associated with iso_node caching. diff --git a/sys/vfs/isofs/cd9660/cd9660_rrip.c b/sys/vfs/isofs/cd9660/cd9660_rrip.c index 6ccd0a4670..63aa404a89 100644 --- a/sys/vfs/isofs/cd9660/cd9660_rrip.c +++ b/sys/vfs/isofs/cd9660/cd9660_rrip.c @@ -37,7 +37,7 @@ * * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 * $FreeBSD: src/sys/isofs/cd9660/cd9660_rrip.c,v 1.17 1999/08/28 00:46:06 peter Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_rrip.c,v 1.4 2003/07/26 19:27:41 rob Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_rrip.c,v 1.5 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -47,10 +47,10 @@ #include #include -#include -#include -#include -#include +#include "iso.h" +#include "cd9660_node.h" +#include "cd9660_rrip.h" +#include "iso_rrip.h" typedef int rrt_func_t __P((void *, ISO_RRIP_ANALYZE *ana)); diff --git a/sys/vfs/isofs/cd9660/cd9660_util.c b/sys/vfs/isofs/cd9660/cd9660_util.c index a24088ba9c..60ed407141 100644 --- a/sys/vfs/isofs/cd9660/cd9660_util.c +++ b/sys/vfs/isofs/cd9660/cd9660_util.c @@ -38,14 +38,14 @@ * * @(#)cd9660_util.c 8.3 (Berkeley) 12/5/94 * $FreeBSD: src/sys/isofs/cd9660/cd9660_util.c,v 1.13.2.1 2001/02/27 12:36:34 sobomax Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_util.c,v 1.2 2003/06/17 04:28:41 dillon Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_util.c,v 1.3 2003/08/07 21:17:41 dillon Exp $ */ #include #include #include -#include +#include "iso.h" /* * XXX: limited support for loading of Unicode diff --git a/sys/vfs/isofs/cd9660/cd9660_vfsops.c b/sys/vfs/isofs/cd9660/cd9660_vfsops.c index 094e40ae1e..8414de97bb 100644 --- a/sys/vfs/isofs/cd9660/cd9660_vfsops.c +++ b/sys/vfs/isofs/cd9660/cd9660_vfsops.c @@ -37,7 +37,7 @@ * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 * $FreeBSD: src/sys/isofs/cd9660/cd9660_vfsops.c,v 1.74.2.7 2002/04/08 09:39:29 bde Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vfsops.c,v 1.8 2003/07/26 19:27:41 rob Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vfsops.c,v 1.9 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -57,10 +57,10 @@ #include -#include -#include -#include -#include +#include "iso.h" +#include "iso_rrip.h" +#include "cd9660_node.h" +#include "cd9660_mount.h" MALLOC_DEFINE(M_ISOFSMNT, "ISOFS mount", "ISOFS mount structure"); MALLOC_DEFINE(M_ISOFSNODE, "ISOFS node", "ISOFS vnode private part"); diff --git a/sys/vfs/isofs/cd9660/cd9660_vnops.c b/sys/vfs/isofs/cd9660/cd9660_vnops.c index 4dd8090aa4..8f6d1a6cc7 100644 --- a/sys/vfs/isofs/cd9660/cd9660_vnops.c +++ b/sys/vfs/isofs/cd9660/cd9660_vnops.c @@ -37,7 +37,7 @@ * * @(#)cd9660_vnops.c 8.19 (Berkeley) 5/27/95 * $FreeBSD: src/sys/isofs/cd9660/cd9660_vnops.c,v 1.62 1999/12/15 23:01:51 eivind Exp $ - * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vnops.c,v 1.5 2003/07/26 19:27:41 rob Exp $ + * $DragonFly: src/sys/vfs/isofs/cd9660/cd9660_vnops.c,v 1.6 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include @@ -59,9 +59,9 @@ #include #include -#include -#include -#include +#include "iso.h" +#include "cd9660_node.h" +#include "iso_rrip.h" static int cd9660_setattr __P((struct vop_setattr_args *)); static int cd9660_access __P((struct vop_access_args *)); diff --git a/sys/vfs/mfs/mfs_vfsops.c b/sys/vfs/mfs/mfs_vfsops.c index 776a856c80..d5f9d9ebea 100644 --- a/sys/vfs/mfs/mfs_vfsops.c +++ b/sys/vfs/mfs/mfs_vfsops.c @@ -32,7 +32,7 @@ * * @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95 * $FreeBSD: src/sys/ufs/mfs/mfs_vfsops.c,v 1.81.2.3 2001/07/04 17:35:21 tegge Exp $ - * $DragonFly: src/sys/vfs/mfs/mfs_vfsops.c,v 1.9 2003/07/26 22:04:26 rob Exp $ + * $DragonFly: src/sys/vfs/mfs/mfs_vfsops.c,v 1.10 2003/08/07 21:17:41 dillon Exp $ */ @@ -52,16 +52,15 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include - -#include -#include +#include "mfsnode.h" +#include "mfs_extern.h" MALLOC_DEFINE(M_MFSNODE, "MFS node", "MFS vnode private part"); diff --git a/sys/vfs/mfs/mfs_vnops.c b/sys/vfs/mfs/mfs_vnops.c index 7be7a589f5..e36d737009 100644 --- a/sys/vfs/mfs/mfs_vnops.c +++ b/sys/vfs/mfs/mfs_vnops.c @@ -32,7 +32,7 @@ * * @(#)mfs_vnops.c 8.11 (Berkeley) 5/22/95 * $FreeBSD: src/sys/ufs/mfs/mfs_vnops.c,v 1.47.2.1 2001/05/22 02:06:43 bp Exp $ - * $DragonFly: src/sys/vfs/mfs/mfs_vnops.c,v 1.8 2003/07/26 22:04:27 rob Exp $ + * $DragonFly: src/sys/vfs/mfs/mfs_vnops.c,v 1.9 2003/08/07 21:17:41 dillon Exp $ */ #include @@ -48,8 +48,8 @@ #include -#include -#include +#include "mfsnode.h" +#include "mfs_extern.h" static int mfs_badop __P((struct vop_generic_args *)); static int mfs_bmap __P((struct vop_bmap_args *)); diff --git a/sys/vfs/msdosfs/msdosfs_conv.c b/sys/vfs/msdosfs/msdosfs_conv.c index ff468baac4..036deb4501 100644 --- a/sys/vfs/msdosfs/msdosfs_conv.c +++ b/sys/vfs/msdosfs/msdosfs_conv.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_conv.c,v 1.29.2.1 2002/11/08 22:01:22 semenu Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_conv.c,v 1.2 2003/06/17 04:28:47 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_conv.c,v 1.3 2003/08/07 21:17:41 dillon Exp $ */ /* $NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $ */ /*- @@ -62,7 +62,7 @@ /* * MSDOSFS include files. */ -#include +#include "direntry.h" /* * Total number of days that have passed for each month in a regular year. diff --git a/sys/vfs/msdosfs/msdosfs_denode.c b/sys/vfs/msdosfs/msdosfs_denode.c index aa0f62e8ec..34cf3b566c 100644 --- a/sys/vfs/msdosfs/msdosfs_denode.c +++ b/sys/vfs/msdosfs/msdosfs_denode.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_denode.c,v 1.47.2.3 2002/08/22 16:20:15 trhodes Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_denode.c,v 1.6 2003/07/19 21:14:43 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_denode.c,v 1.7 2003/08/07 21:17:41 dillon Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.28 1998/02/10 14:10:00 mrg Exp $ */ /*- @@ -61,11 +61,11 @@ #include #include -#include -#include -#include -#include -#include +#include "bpb.h" +#include "msdosfsmount.h" +#include "direntry.h" +#include "denode.h" +#include "fat.h" static MALLOC_DEFINE(M_MSDOSFSNODE, "MSDOSFS node", "MSDOSFS vnode private part"); diff --git a/sys/vfs/msdosfs/msdosfs_fat.c b/sys/vfs/msdosfs/msdosfs_fat.c index cf674cc4c0..b245f9d176 100644 --- a/sys/vfs/msdosfs/msdosfs_fat.c +++ b/sys/vfs/msdosfs/msdosfs_fat.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_fat.c,v 1.23 2000/01/27 14:43:06 nyan Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_fat.c,v 1.3 2003/06/26 05:55:17 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_fat.c,v 1.4 2003/08/07 21:17:41 dillon Exp $ */ /* $NetBSD: msdosfs_fat.c,v 1.28 1997/11/17 15:36:49 ws Exp $ */ /*- @@ -61,11 +61,11 @@ /* * msdosfs include files. */ -#include -#include -#include -#include -#include +#include "bpb.h" +#include "msdosfsmount.h" +#include "direntry.h" +#include "denode.h" +#include "fat.h" /* * Fat cache stats. diff --git a/sys/vfs/msdosfs/msdosfs_lookup.c b/sys/vfs/msdosfs/msdosfs_lookup.c index 136c6ead41..481953b009 100644 --- a/sys/vfs/msdosfs/msdosfs_lookup.c +++ b/sys/vfs/msdosfs/msdosfs_lookup.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_lookup.c,v 1.30.2.1 2000/11/03 15:55:39 bp Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_lookup.c,v 1.4 2003/06/26 05:55:17 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_lookup.c,v 1.5 2003/08/07 21:17:41 dillon Exp $ */ /* $NetBSD: msdosfs_lookup.c,v 1.37 1997/11/17 15:36:54 ws Exp $ */ /*- @@ -57,11 +57,11 @@ #include #include -#include -#include -#include -#include -#include +#include "bpb.h" +#include "direntry.h" +#include "denode.h" +#include "msdosfsmount.h" +#include "fat.h" /* * When we search a directory the blocks containing directory entries are diff --git a/sys/vfs/msdosfs/msdosfs_vfsops.c b/sys/vfs/msdosfs/msdosfs_vfsops.c index 9eed7f8984..3635410179 100644 --- a/sys/vfs/msdosfs/msdosfs_vfsops.c +++ b/sys/vfs/msdosfs/msdosfs_vfsops.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_vfsops.c,v 1.60.2.6 2002/09/12 21:33:38 trhodes Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vfsops.c,v 1.6 2003/07/26 20:08:38 rob Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vfsops.c,v 1.7 2003/08/07 21:17:41 dillon Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.51 1997/11/17 15:36:58 ws Exp $ */ /*- @@ -63,12 +63,12 @@ #include /* defines ALLPERMS */ #include -#include -#include -#include -#include -#include -#include +#include "bpb.h" +#include "bootsect.h" +#include "direntry.h" +#include "denode.h" +#include "msdosfsmount.h" +#include "fat.h" #define MSDOSFS_DFLTBSIZE 4096 diff --git a/sys/vfs/msdosfs/msdosfs_vnops.c b/sys/vfs/msdosfs/msdosfs_vnops.c index c4e7fc7f2b..f3411a87c2 100644 --- a/sys/vfs/msdosfs/msdosfs_vnops.c +++ b/sys/vfs/msdosfs/msdosfs_vnops.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_vnops.c,v 1.95.2.4 2003/06/13 15:05:47 trhodes Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.9 2003/07/26 20:08:38 rob Exp $ */ +/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.10 2003/08/07 21:17:41 dillon Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */ /*- @@ -71,11 +71,11 @@ #include -#include -#include -#include -#include -#include +#include "bpb.h" +#include "direntry.h" +#include "denode.h" +#include "msdosfsmount.h" +#include "fat.h" #define DOS_FILESIZE_MAX 0xffffffff diff --git a/sys/vfs/nfs/bootp_subr.c b/sys/vfs/nfs/bootp_subr.c index fac7c58b17..aa8ff0ef6b 100644 --- a/sys/vfs/nfs/bootp_subr.c +++ b/sys/vfs/nfs/bootp_subr.c @@ -1,5 +1,5 @@ /* $FreeBSD: src/sys/nfs/bootp_subr.c,v 1.20.2.9 2003/04/24 16:51:08 ambrisko Exp $ */ -/* $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.4 2003/07/21 07:57:51 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/nfs/bootp_subr.c,v 1.5 2003/08/07 21:17:42 dillon Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -65,12 +65,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "rpcv2.h" +#include "nfsproto.h" +#include "nfs.h" +#include "nfsdiskless.h" +#include "krpc.h" +#include "xdr_subs.h" #define BOOTP_MIN_LEN 300 /* Minimum size of bootp udp packet */ diff --git a/sys/vfs/nfs/krpc_subr.c b/sys/vfs/nfs/krpc_subr.c index 6d0f5e7031..d35056aeb0 100644 --- a/sys/vfs/nfs/krpc_subr.c +++ b/sys/vfs/nfs/krpc_subr.c @@ -1,6 +1,6 @@ /* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */ /* $FreeBSD: src/sys/nfs/krpc_subr.c,v 1.13.2.1 2000/11/20 21:17:14 tegge Exp $ */ -/* $DragonFly: src/sys/vfs/nfs/krpc_subr.c,v 1.3 2003/07/21 07:57:51 dillon Exp $ */ +/* $DragonFly: src/sys/vfs/nfs/krpc_subr.c,v 1.4 2003/08/07 21:17:42 dillon Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -55,9 +55,9 @@ #include #include -#include -#include -#include +#include "rpcv2.h" +#include "krpc.h" +#include "xdr_subs.h" /* * Kernel support for Sun RPC diff --git a/sys/vfs/nfs/nfs_bio.c b/sys/vfs/nfs/nfs_bio.c index 31d3b53b75..28c56223d3 100644 --- a/sys/vfs/nfs/nfs_bio.c +++ b/sys/vfs/nfs/nfs_bio.c @@ -35,7 +35,7 @@ * * @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_bio.c,v 1.83.2.4 2002/12/29 18:19:53 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_bio.c,v 1.9 2003/07/26 21:48:48 rob Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_bio.c,v 1.10 2003/08/07 21:17:42 dillon Exp $ */ @@ -58,12 +58,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "rpcv2.h" +#include "nfsproto.h" +#include "nfs.h" +#include "nfsmount.h" +#include "nqnfs.h" +#include "nfsnode.h" static struct buf *nfs_getcacheblk __P((struct vnode *vp, daddr_t bn, int size, struct thread *td)); diff --git a/sys/vfs/nfs/nfs_node.c b/sys/vfs/nfs/nfs_node.c index 5e51096855..cc401b7d3e 100644 --- a/sys/vfs/nfs/nfs_node.c +++ b/sys/vfs/nfs/nfs_node.c @@ -35,7 +35,7 @@ * * @(#)nfs_node.c 8.6 (Berkeley) 5/22/95 * $FreeBSD: src/sys/nfs/nfs_node.c,v 1.36.2.3 2002/01/05 22:25:04 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_node.c,v 1.6 2003/07/26 21:48:48 rob Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_node.c,v 1.7 2003/08/07 21:17:42 dillon Exp $ */ @@ -50,11 +50,11 @@ #include -#include -#include -#include -#include -#include +#include "rpcv2.h" +#include "nfsproto.h" +#include "nfs.h" +#include "nfsnode.h" +#include "nfsmount.h" static vm_zone_t nfsnode_zone; static LIST_HEAD(nfsnodehashhead, nfsnode) *nfsnodehashtbl; diff --git a/sys/vfs/nfs/nfs_nqlease.c b/sys/vfs/nfs/nfs_nqlease.c index 07787dbaba..a4ef83e9ea 100644 --- a/sys/vfs/nfs/nfs_nqlease.c +++ b/sys/vfs/nfs/nfs_nqlease.c @@ -35,7 +35,7 @@ * * @(#)nfs_nqlease.c 8.9 (Berkeley) 5/20/95 * $FreeBSD: src/sys/nfs/nfs_nqlease.c,v 1.50 2000/02/13 03:32:05 peter Exp $ - * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.7 2003/07/26 21:48:48 rob Exp $ + * $DragonFly: src/sys/vfs/nfs/Attic/nfs_nqlease.c,v 1.8 2003/08/07 21:17:42 dillon Exp $ */ @@ -67,14 +67,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "rpcv2.h" +#include "nfsproto.h" +#include "nfs.h" +#include "nfsm_subs.h" +#include "xdr_subs.h" +#include "nqnfs.h" +#include "nfsnode.h" +#include "nfsmount.h" static MALLOC_DEFINE(M_NQMHOST, "NQNFS Host", "Nqnfs host address table"); diff --git a/sys/vfs/nfs/nfs_serv.c b/sys/vfs/nfs/nfs_serv.c index f0b7fbe8df..2ea354b54d 100644 --- a/sys/vfs/nfs/nfs_serv.c +++ b/sys/vfs/nfs/nfs_serv.c @@ -35,7 +35,7 @@ * * @(#)nfs_serv.c 8.8 (Berkeley) 7/31/95 * $FreeBSD: src/sys/nfs/nfs_serv.c,v 1.93.2.6 2002/12/29 18:19:53 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_serv.c,v 1.6 2003/06/26 05:55:18 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_serv.c,v 1.7 2003/08/07 21:17:42 dillon Exp $ */ /* @@ -95,12 +95,12 @@ #include -#include -#include -#include -#include -#include -#include +#include "nfsproto.h" +#include "rpcv2.h" +#include "nfs.h" +#include "xdr_subs.h" +#include "nfsm_subs.h" +#include "nqnfs.h" #ifdef NFSRV_DEBUG #define nfsdbprintf(info) printf info diff --git a/sys/vfs/nfs/nfs_socket.c b/sys/vfs/nfs/nfs_socket.c index 42565e79d7..5a7c1a4eca 100644 --- a/sys/vfs/nfs/nfs_socket.c +++ b/sys/vfs/nfs/nfs_socket.c @@ -35,7 +35,7 @@ * * @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_socket.c,v 1.60.2.6 2003/03/26 01:44:46 alfred Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.6 2003/07/26 21:48:48 rob Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_socket.c,v 1.7 2003/08/07 21:17:42 dillon Exp $ */ /* @@ -61,15 +61,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "rpcv2.h" +#include "nfsproto.h" +#include "nfs.h" +#include "xdr_subs.h" +#include "nfsm_subs.h" +#include "nfsmount.h" +#include "nfsnode.h" +#include "nfsrtt.h" +#include "nqnfs.h" #define TRUE 1 #define FALSE 0 diff --git a/sys/vfs/nfs/nfs_srvcache.c b/sys/vfs/nfs/nfs_srvcache.c index 721e8029c0..e62ee0e500 100644 --- a/sys/vfs/nfs/nfs_srvcache.c +++ b/sys/vfs/nfs/nfs_srvcache.c @@ -35,7 +35,7 @@ * * @(#)nfs_srvcache.c 8.3 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_srvcache.c,v 1.21 2000/02/13 03:32:06 peter Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_srvcache.c,v 1.4 2003/07/26 21:48:48 rob Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_srvcache.c,v 1.5 2003/08/07 21:17:42 dillon Exp $ */ /* @@ -52,10 +52,10 @@ #include /* for dup_sockaddr */ #include -#include -#include -#include -#include +#include "rpcv2.h" +#include "nfsproto.h" +#include "nfs.h" +#include "nfsrvcache.h" #ifndef NFS_NOSERVER extern struct nfsstats nfsstats; diff --git a/sys/vfs/nfs/nfs_subs.c b/sys/vfs/nfs/nfs_subs.c index 2757ef8b8d..f74c3dcc66 100644 --- a/sys/vfs/nfs/nfs_subs.c +++ b/sys/vfs/nfs/nfs_subs.c @@ -35,7 +35,7 @@ * * @(#)nfs_subs.c 8.8 (Berkeley) 5/22/95 * $FreeBSD: src/sys/nfs/nfs_subs.c,v 1.90.2.2 2001/10/25 19:18:53 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_subs.c,v 1.6 2003/07/26 21:48:49 rob Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_subs.c,v 1.7 2003/08/07 21:17:42 dillon Exp $ */ /* @@ -66,15 +66,15 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "rpcv2.h" +#include "nfsproto.h" +#include "nfs.h" +#include "nfsnode.h" +#include "xdr_subs.h" +#include "nfsm_subs.h" +#include "nfsmount.h" +#include "nqnfs.h" +#include "nfsrtt.h" #include diff --git a/sys/vfs/nfs/nfs_syscalls.c b/sys/vfs/nfs/nfs_syscalls.c index d376ade5e2..33e94329dd 100644 --- a/sys/vfs/nfs/nfs_syscalls.c +++ b/sys/vfs/nfs/nfs_syscalls.c @@ -35,7 +35,7 @@ * * @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95 * $FreeBSD: src/sys/nfs/nfs_syscalls.c,v 1.58.2.1 2000/11/26 02:30:06 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.7 2003/07/26 21:48:49 rob Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_syscalls.c,v 1.8 2003/08/07 21:17:42 dillon Exp $ */ #include @@ -60,16 +60,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "xdr_subs.h" +#include "rpcv2.h" +#include "nfsproto.h" +#include "nfs.h" +#include "nfsm_subs.h" +#include "nfsrvcache.h" +#include "nfsmount.h" +#include "nfsnode.h" +#include "nqnfs.h" +#include "nfsrtt.h" static MALLOC_DEFINE(M_NFSSVC, "NFS srvsock", "Nfs server structure"); diff --git a/sys/vfs/nfs/nfs_vfsops.c b/sys/vfs/nfs/nfs_vfsops.c index a10e99cfbf..2eabf7f202 100644 --- a/sys/vfs/nfs/nfs_vfsops.c +++ b/sys/vfs/nfs/nfs_vfsops.c @@ -35,7 +35,7 @@ * * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95 * $FreeBSD: src/sys/nfs/nfs_vfsops.c,v 1.91.2.7 2003/01/27 20:04:08 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_vfsops.c,v 1.6 2003/07/26 21:48:49 rob Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_vfsops.c,v 1.7 2003/08/07 21:17:42 dillon Exp $ */ #include "opt_bootp.h" @@ -61,15 +61,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "rpcv2.h" +#include "nfsproto.h" +#include "nfs.h" +#include "nfsnode.h" +#include "nfsmount.h" +#include "xdr_subs.h" +#include "nfsm_subs.h" +#include "nfsdiskless.h" +#include "nqnfs.h" extern int nfs_mountroot __P((struct mount *mp)); diff --git a/sys/vfs/nfs/nfs_vnops.c b/sys/vfs/nfs/nfs_vnops.c index 635de566a2..6819a0411c 100644 --- a/sys/vfs/nfs/nfs_vnops.c +++ b/sys/vfs/nfs/nfs_vnops.c @@ -35,7 +35,7 @@ * * @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95 * $FreeBSD: src/sys/nfs/nfs_vnops.c,v 1.150.2.5 2001/12/20 19:56:28 dillon Exp $ - * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.8 2003/07/26 21:48:49 rob Exp $ + * $DragonFly: src/sys/vfs/nfs/nfs_vnops.c,v 1.9 2003/08/07 21:17:42 dillon Exp $ */ @@ -70,16 +70,16 @@ #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "rpcv2.h" +#include "nfsproto.h" +#include "nfs.h" +#include "nfsnode.h" +#include "nfsmount.h" +#include "xdr_subs.h" +#include "nfsm_subs.h" +#include "nqnfs.h" #include #include diff --git a/sys/vfs/nfs/nfsnode.h b/sys/vfs/nfs/nfsnode.h index e7cb7d8ada..91adec6644 100644 --- a/sys/vfs/nfs/nfsnode.h +++ b/sys/vfs/nfs/nfsnode.h @@ -35,7 +35,7 @@ * * @(#)nfsnode.h 8.9 (Berkeley) 5/14/95 * $FreeBSD: src/sys/nfs/nfsnode.h,v 1.32.2.1 2001/06/26 04:20:11 bp Exp $ - * $DragonFly: src/sys/vfs/nfs/nfsnode.h,v 1.3 2003/06/25 03:56:07 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfsnode.h,v 1.4 2003/08/07 21:17:42 dillon Exp $ */ @@ -43,7 +43,7 @@ #define _NFS_NFSNODE_H_ #if !defined(_NFS_NFS_H_) && !defined(_KERNEL) -#include +#include "nfs.h" #endif /* diff --git a/sys/vfs/nfs/nfsv2.h b/sys/vfs/nfs/nfsv2.h index a40d114df0..1fba39ad43 100644 --- a/sys/vfs/nfs/nfsv2.h +++ b/sys/vfs/nfs/nfsv2.h @@ -35,7 +35,7 @@ * * @(#)nfsv2.h 8.1 (Berkeley) 6/10/93 * $FreeBSD: src/sys/nfs/nfsv2.h,v 1.9 1999/08/28 00:50:04 peter Exp $ - * $DragonFly: src/sys/vfs/nfs/nfsv2.h,v 1.2 2003/06/17 04:28:54 dillon Exp $ + * $DragonFly: src/sys/vfs/nfs/nfsv2.h,v 1.3 2003/08/07 21:17:42 dillon Exp $ */ -#include +#include "nfsproto.h" diff --git a/sys/vfs/ntfs/ntfs_compr.c b/sys/vfs/ntfs/ntfs_compr.c index 72510f669e..9b3221554d 100644 --- a/sys/vfs/ntfs/ntfs_compr.c +++ b/sys/vfs/ntfs/ntfs_compr.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_compr.c,v 1.7 1999/12/03 20:37:38 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_compr.c,v 1.3 2003/06/25 03:56:07 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_compr.c,v 1.4 2003/08/07 21:17:42 dillon Exp $ */ #include @@ -44,8 +44,8 @@ #include #endif -#include -#include +#include "ntfs.h" +#include "ntfs_compr.h" #define GET_UINT16(addr) (*((u_int16_t *)(addr))) diff --git a/sys/vfs/ntfs/ntfs_ihash.c b/sys/vfs/ntfs/ntfs_ihash.c index d358287675..ca5547e5fc 100644 --- a/sys/vfs/ntfs/ntfs_ihash.c +++ b/sys/vfs/ntfs/ntfs_ihash.c @@ -34,7 +34,7 @@ * * @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95 * $FreeBSD: src/sys/ntfs/ntfs_ihash.c,v 1.7 1999/12/03 20:37:39 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_ihash.c,v 1.4 2003/07/19 21:14:46 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_ihash.c,v 1.5 2003/08/07 21:17:42 dillon Exp $ */ #include @@ -46,9 +46,9 @@ #include #include -#include -#include -#include +#include "ntfs.h" +#include "ntfs_inode.h" +#include "ntfs_ihash.h" MALLOC_DEFINE(M_NTFSNTHASH, "NTFS nthash", "NTFS ntnode hash tables"); diff --git a/sys/vfs/ntfs/ntfs_subr.c b/sys/vfs/ntfs/ntfs_subr.c index 8e8badcbd0..f9e6b69b54 100644 --- a/sys/vfs/ntfs/ntfs_subr.c +++ b/sys/vfs/ntfs/ntfs_subr.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_subr.c,v 1.7.2.4 2001/10/12 22:08:49 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.c,v 1.6 2003/07/19 21:14:46 dillon Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_subr.c,v 1.7 2003/08/07 21:17:42 dillon Exp $ */ #include @@ -47,13 +47,13 @@ #endif /* #define NTFS_DEBUG 1 */ -#include -#include -#include -#include -#include -#include -#include +#include "ntfs.h" +#include "ntfsmount.h" +#include "ntfs_inode.h" +#include "ntfs_vfsops.h" +#include "ntfs_subr.h" +#include "ntfs_compr.h" +#include "ntfs_ihash.h" #if defined(__FreeBSD__) MALLOC_DEFINE(M_NTFSNTVATTR, "NTFS vattr", "NTFS file attribute information"); diff --git a/sys/vfs/ntfs/ntfs_vfsops.c b/sys/vfs/ntfs/ntfs_vfsops.c index 5bae7aedb8..10aa6fc928 100644 --- a/sys/vfs/ntfs/ntfs_vfsops.c +++ b/sys/vfs/ntfs/ntfs_vfsops.c @@ -26,7 +26,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_vfsops.c,v 1.20.2.5 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_vfsops.c,v 1.7 2003/07/26 21:13:15 rob Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_vfsops.c,v 1.8 2003/08/07 21:17:42 dillon Exp $ */ @@ -61,12 +61,12 @@ #endif /*#define NTFS_DEBUG 1*/ -#include -#include -#include -#include -#include -#include +#include "ntfs.h" +#include "ntfs_inode.h" +#include "ntfs_subr.h" +#include "ntfs_vfsops.h" +#include "ntfs_ihash.h" +#include "ntfsmount.h" #if defined(__FreeBSD__) MALLOC_DEFINE(M_NTFSMNT, "NTFS mount", "NTFS mount structure"); diff --git a/sys/vfs/ntfs/ntfs_vnops.c b/sys/vfs/ntfs/ntfs_vnops.c index 60bcc6c497..fa5af03add 100644 --- a/sys/vfs/ntfs/ntfs_vnops.c +++ b/sys/vfs/ntfs/ntfs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ntfs/ntfs_vnops.c,v 1.9.2.4 2002/08/06 19:35:18 semenu Exp $ - * $DragonFly: src/sys/vfs/ntfs/ntfs_vnops.c,v 1.5 2003/07/26 21:13:15 rob Exp $ + * $DragonFly: src/sys/vfs/ntfs/ntfs_vnops.c,v 1.6 2003/08/07 21:17:42 dillon Exp $ * */ @@ -70,9 +70,9 @@ #include /*#define NTFS_DEBUG 1*/ -#include -#include -#include +#include "ntfs.h" +#include "ntfs_inode.h" +#include "ntfs_subr.h" #if defined(__NetBSD__) #include #include diff --git a/sys/vfs/nullfs/null_subr.c b/sys/vfs/nullfs/null_subr.c index a7aaf42b2e..b4de681554 100644 --- a/sys/vfs/nullfs/null_subr.c +++ b/sys/vfs/nullfs/null_subr.c @@ -36,7 +36,7 @@ * @(#)null_subr.c 8.7 (Berkeley) 5/14/95 * * $FreeBSD: src/sys/miscfs/nullfs/null_subr.c,v 1.21.2.4 2001/06/26 04:20:09 bp Exp $ - * $DragonFly: src/sys/vfs/nullfs/Attic/null_subr.c,v 1.4 2003/07/19 21:14:41 dillon Exp $ + * $DragonFly: src/sys/vfs/nullfs/Attic/null_subr.c,v 1.5 2003/08/07 21:17:43 dillon Exp $ */ #include @@ -46,7 +46,7 @@ #include #include #include -#include +#include "null.h" #define LOG2_SIZEVNODE 7 /* log2(sizeof struct vnode) */ #define NNULLNODECACHE 16 diff --git a/sys/vfs/nullfs/null_vfsops.c b/sys/vfs/nullfs/null_vfsops.c index 52c47bdabb..7c6a4bf807 100644 --- a/sys/vfs/nullfs/null_vfsops.c +++ b/sys/vfs/nullfs/null_vfsops.c @@ -37,7 +37,7 @@ * * @(#)lofs_vfsops.c 1.2 (Berkeley) 6/18/92 * $FreeBSD: src/sys/miscfs/nullfs/null_vfsops.c,v 1.35.2.3 2001/07/26 20:37:11 iedowse Exp $ - * $DragonFly: src/sys/vfs/nullfs/null_vfsops.c,v 1.4 2003/06/26 05:55:15 dillon Exp $ + * $DragonFly: src/sys/vfs/nullfs/null_vfsops.c,v 1.5 2003/08/07 21:17:43 dillon Exp $ */ /* @@ -53,7 +53,7 @@ #include #include #include -#include +#include "null.h" static MALLOC_DEFINE(M_NULLFSMNT, "NULLFS mount", "NULLFS mount structure"); diff --git a/sys/vfs/nullfs/null_vnops.c b/sys/vfs/nullfs/null_vnops.c index 4bcbef8237..50a707a2dc 100644 --- a/sys/vfs/nullfs/null_vnops.c +++ b/sys/vfs/nullfs/null_vnops.c @@ -38,7 +38,7 @@ * Ancestors: * @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92 * $FreeBSD: src/sys/miscfs/nullfs/null_vnops.c,v 1.38.2.6 2002/07/31 00:32:28 semenu Exp $ - * $DragonFly: src/sys/vfs/nullfs/null_vnops.c,v 1.5 2003/07/06 21:23:52 dillon Exp $ + * $DragonFly: src/sys/vfs/nullfs/null_vnops.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * @@ -185,7 +185,7 @@ #include #include #include -#include +#include "null.h" static int null_bug_bypass = 0; /* for debugging: enables bypass printf'ing */ SYSCTL_INT(_debug, OID_AUTO, nullfs_bug_bypass, CTLFLAG_RW, diff --git a/sys/vfs/nwfs/nwfs.h b/sys/vfs/nwfs/nwfs.h index 3c8e22f9a6..2d47c9cc72 100644 --- a/sys/vfs/nwfs/nwfs.h +++ b/sys/vfs/nwfs/nwfs.h @@ -30,14 +30,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs.h,v 1.3 1999/12/29 04:54:56 peter Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs.h,v 1.4 2003/06/26 05:55:19 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs.h,v 1.5 2003/08/07 21:17:43 dillon Exp $ */ #ifndef _NWFS_H_ #define _NWFS_H_ #include -#include +#include "nwfs_mount.h" #define NR_OPEN 0 #define NW_NSB_DOS (1 << NW_NS_DOS) diff --git a/sys/vfs/nwfs/nwfs_io.c b/sys/vfs/nwfs/nwfs_io.c index 53ac8bfdf1..65509cadbd 100644 --- a/sys/vfs/nwfs/nwfs_io.c +++ b/sys/vfs/nwfs/nwfs_io.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_io.c,v 1.6.2.1 2000/10/25 02:11:10 bp Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_io.c,v 1.5 2003/07/19 21:14:47 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_io.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ * */ #include @@ -57,9 +57,9 @@ #include #include -#include -#include -#include +#include "nwfs.h" +#include "nwfs_node.h" +#include "nwfs_subr.h" static int nwfs_fastlookup = 1; diff --git a/sys/vfs/nwfs/nwfs_ioctl.c b/sys/vfs/nwfs/nwfs_ioctl.c index 1216af51f7..a75d394bf0 100644 --- a/sys/vfs/nwfs/nwfs_ioctl.c +++ b/sys/vfs/nwfs/nwfs_ioctl.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_ioctl.c,v 1.2.2.1 2001/02/22 09:14:12 bp Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_ioctl.c,v 1.3 2003/06/25 03:56:08 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_ioctl.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ */ #include #include @@ -42,9 +42,9 @@ #include #include -#include -#include -#include +#include "nwfs.h" +#include "nwfs_node.h" +#include "nwfs_subr.h" int nwfs_ioctl(ap) diff --git a/sys/vfs/nwfs/nwfs_node.c b/sys/vfs/nwfs/nwfs_node.c index b0f6bb0139..dd7c5669c9 100644 --- a/sys/vfs/nwfs/nwfs_node.c +++ b/sys/vfs/nwfs/nwfs_node.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_node.c,v 1.3.2.8 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_node.c,v 1.6 2003/07/19 21:14:47 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_node.c,v 1.7 2003/08/07 21:17:43 dillon Exp $ */ #include #include @@ -51,10 +51,10 @@ #include #include -#include -#include -#include -#include +#include "nwfs.h" +#include "nwfs_mount.h" +#include "nwfs_node.h" +#include "nwfs_subr.h" #define NWNOHASH(fhsum) (&nwhashtbl[(fhsum.f_id) & nwnodehash]) diff --git a/sys/vfs/nwfs/nwfs_subr.c b/sys/vfs/nwfs/nwfs_subr.c index 6da1340702..857da22e8a 100644 --- a/sys/vfs/nwfs/nwfs_subr.c +++ b/sys/vfs/nwfs/nwfs_subr.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_subr.c,v 1.2.2.2 2000/10/25 02:11:10 bp Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_subr.c,v 1.3 2003/06/25 03:56:08 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_subr.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ */ #include #include @@ -46,9 +46,9 @@ #include #include -#include -#include -#include +#include "nwfs.h" +#include "nwfs_node.h" +#include "nwfs_subr.h" MALLOC_DEFINE(M_NWFSDATA, "NWFS data", "NWFS private data"); diff --git a/sys/vfs/nwfs/nwfs_vfsops.c b/sys/vfs/nwfs/nwfs_vfsops.c index 339b577e31..7e224d48a0 100644 --- a/sys/vfs/nwfs/nwfs_vfsops.c +++ b/sys/vfs/nwfs/nwfs_vfsops.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_vfsops.c,v 1.6.2.6 2001/10/25 19:18:54 dillon Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_vfsops.c,v 1.5 2003/06/26 05:55:19 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_vfsops.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ */ #include "opt_ncp.h" #ifndef NCP @@ -54,9 +54,9 @@ #include #include -#include -#include -#include +#include "nwfs.h" +#include "nwfs_node.h" +#include "nwfs_subr.h" int nwfs_debuglevel = 0; diff --git a/sys/vfs/nwfs/nwfs_vnops.c b/sys/vfs/nwfs/nwfs_vnops.c index af52df8ff8..68ec23b134 100644 --- a/sys/vfs/nwfs/nwfs_vnops.c +++ b/sys/vfs/nwfs/nwfs_vnops.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/nwfs/nwfs_vnops.c,v 1.6.2.3 2001/03/14 11:26:59 bp Exp $ - * $DragonFly: src/sys/vfs/nwfs/nwfs_vnops.c,v 1.5 2003/07/06 21:23:54 dillon Exp $ + * $DragonFly: src/sys/vfs/nwfs/nwfs_vnops.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ */ #include #include @@ -53,9 +53,9 @@ #include #include -#include -#include -#include +#include "nwfs.h" +#include "nwfs_node.h" +#include "nwfs_subr.h" /* * Prototypes for NWFS vnode operations diff --git a/sys/vfs/portal/portal_vfsops.c b/sys/vfs/portal/portal_vfsops.c index 00a05f75a9..34777138ec 100644 --- a/sys/vfs/portal/portal_vfsops.c +++ b/sys/vfs/portal/portal_vfsops.c @@ -36,7 +36,7 @@ * @(#)portal_vfsops.c 8.11 (Berkeley) 5/14/95 * * $FreeBSD: src/sys/miscfs/portal/portal_vfsops.c,v 1.26.2.2 2001/07/26 20:37:16 iedowse Exp $ - * $DragonFly: src/sys/vfs/portal/portal_vfsops.c,v 1.3 2003/06/25 03:55:59 dillon Exp $ + * $DragonFly: src/sys/vfs/portal/portal_vfsops.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ */ /* @@ -56,7 +56,7 @@ #include #include #include -#include +#include "portal.h" static MALLOC_DEFINE(M_PORTALFSMNT, "PORTAL mount", "PORTAL mount structure"); diff --git a/sys/vfs/portal/portal_vnops.c b/sys/vfs/portal/portal_vnops.c index d6ac0ae31b..4453729d50 100644 --- a/sys/vfs/portal/portal_vnops.c +++ b/sys/vfs/portal/portal_vnops.c @@ -36,7 +36,7 @@ * @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95 * * $FreeBSD: src/sys/miscfs/portal/portal_vnops.c,v 1.38 1999/12/21 06:29:00 chris Exp $ - * $DragonFly: src/sys/vfs/portal/portal_vnops.c,v 1.5 2003/07/19 21:14:41 dillon Exp $ + * $DragonFly: src/sys/vfs/portal/portal_vnops.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ */ /* @@ -62,7 +62,7 @@ #include #include #include -#include +#include "portal.h" static int portal_fileid = PORTAL_ROOTFILEID+1; diff --git a/sys/vfs/procfs/procfs_ctl.c b/sys/vfs/procfs/procfs_ctl.c index af25875fd0..172b2b08b1 100644 --- a/sys/vfs/procfs/procfs_ctl.c +++ b/sys/vfs/procfs/procfs_ctl.c @@ -38,7 +38,7 @@ * * From: * $FreeBSD: src/sys/miscfs/procfs/procfs_ctl.c,v 1.20.2.2 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_ctl.c,v 1.4 2003/07/19 21:14:42 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_ctl.c,v 1.5 2003/08/07 21:17:43 dillon Exp $ */ #include @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include diff --git a/sys/vfs/procfs/procfs_dbregs.c b/sys/vfs/procfs/procfs_dbregs.c index ccc5bf2209..92fceb659a 100644 --- a/sys/vfs/procfs/procfs_dbregs.c +++ b/sys/vfs/procfs/procfs_dbregs.c @@ -41,14 +41,14 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/miscfs/procfs/procfs_dbregs.c,v 1.4.2.3 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_dbregs.c,v 1.3 2003/06/23 17:55:44 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_dbregs.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ */ #include #include #include #include -#include +#include #include int diff --git a/sys/vfs/procfs/procfs_fpregs.c b/sys/vfs/procfs/procfs_fpregs.c index 2d8a240031..7254191a4f 100644 --- a/sys/vfs/procfs/procfs_fpregs.c +++ b/sys/vfs/procfs/procfs_fpregs.c @@ -38,14 +38,14 @@ * * From: * $FreeBSD: src/sys/miscfs/procfs/procfs_fpregs.c,v 1.11.2.3 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_fpregs.c,v 1.3 2003/06/23 17:55:44 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_fpregs.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ */ #include #include #include #include -#include +#include #include int diff --git a/sys/vfs/procfs/procfs_map.c b/sys/vfs/procfs/procfs_map.c index 42336deaa3..0bd8021ed4 100644 --- a/sys/vfs/procfs/procfs_map.c +++ b/sys/vfs/procfs/procfs_map.c @@ -37,14 +37,14 @@ * @(#)procfs_status.c 8.3 (Berkeley) 2/17/94 * * $FreeBSD: src/sys/miscfs/procfs/procfs_map.c,v 1.24.2.1 2001/08/04 13:12:24 rwatson Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_map.c,v 1.2 2003/06/17 04:28:42 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_map.c,v 1.3 2003/08/07 21:17:43 dillon Exp $ */ #include #include #include #include -#include +#include #include #include diff --git a/sys/vfs/procfs/procfs_mem.c b/sys/vfs/procfs/procfs_mem.c index b8779e7a22..96d2e78b79 100644 --- a/sys/vfs/procfs/procfs_mem.c +++ b/sys/vfs/procfs/procfs_mem.c @@ -38,7 +38,7 @@ * @(#)procfs_mem.c 8.5 (Berkeley) 6/15/94 * * $FreeBSD: src/sys/miscfs/procfs/procfs_mem.c,v 1.46.2.3 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_mem.c,v 1.3 2003/06/23 17:55:44 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_mem.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ */ /* @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sys/vfs/procfs/procfs_note.c b/sys/vfs/procfs/procfs_note.c index 7f80adf098..7191db5af3 100644 --- a/sys/vfs/procfs/procfs_note.c +++ b/sys/vfs/procfs/procfs_note.c @@ -37,12 +37,12 @@ * @(#)procfs_note.c 8.2 (Berkeley) 1/21/94 * * $FreeBSD: src/sys/miscfs/procfs/procfs_note.c,v 1.6 1999/08/28 00:46:55 peter Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_note.c,v 1.2 2003/06/17 04:28:42 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_note.c,v 1.3 2003/08/07 21:17:43 dillon Exp $ */ #include #include -#include +#include int procfs_donote(curp, p, pfs, uio) diff --git a/sys/vfs/procfs/procfs_regs.c b/sys/vfs/procfs/procfs_regs.c index 1b7d123331..66d3f3f52a 100644 --- a/sys/vfs/procfs/procfs_regs.c +++ b/sys/vfs/procfs/procfs_regs.c @@ -38,14 +38,14 @@ * * From: * $FreeBSD: src/sys/miscfs/procfs/procfs_regs.c,v 1.10.2.3 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_regs.c,v 1.3 2003/06/23 17:55:44 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_regs.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ */ #include #include #include #include -#include +#include #include #include diff --git a/sys/vfs/procfs/procfs_rlimit.c b/sys/vfs/procfs/procfs_rlimit.c index cd04411e95..7ba04e7c1e 100644 --- a/sys/vfs/procfs/procfs_rlimit.c +++ b/sys/vfs/procfs/procfs_rlimit.c @@ -37,7 +37,7 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 * * $FreeBSD: src/sys/miscfs/procfs/procfs_rlimit.c,v 1.5 1999/12/08 08:59:37 phk Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_rlimit.c,v 1.2 2003/06/17 04:28:42 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_rlimit.c,v 1.3 2003/08/07 21:17:43 dillon Exp $ */ /* @@ -53,7 +53,7 @@ #include #include #include -#include +#include int diff --git a/sys/vfs/procfs/procfs_status.c b/sys/vfs/procfs/procfs_status.c index 831bbea24d..36d3926349 100644 --- a/sys/vfs/procfs/procfs_status.c +++ b/sys/vfs/procfs/procfs_status.c @@ -38,7 +38,7 @@ * * From: * $FreeBSD: src/sys/miscfs/procfs/procfs_status.c,v 1.20.2.4 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_status.c,v 1.3 2003/06/23 17:55:44 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_status.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ */ #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/vfs/procfs/procfs_subr.c b/sys/vfs/procfs/procfs_subr.c index 849e662a69..ac40db882c 100644 --- a/sys/vfs/procfs/procfs_subr.c +++ b/sys/vfs/procfs/procfs_subr.c @@ -37,7 +37,7 @@ * @(#)procfs_subr.c 8.6 (Berkeley) 5/14/95 * * $FreeBSD: src/sys/miscfs/procfs/procfs_subr.c,v 1.26.2.3 2002/02/18 21:28:04 des Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_subr.c,v 1.4 2003/07/19 21:14:42 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_subr.c,v 1.5 2003/08/07 21:17:43 dillon Exp $ */ #include @@ -48,7 +48,7 @@ #include #include -#include +#include static struct pfsnode *pfshead; static int pfsvplock; diff --git a/sys/vfs/procfs/procfs_type.c b/sys/vfs/procfs/procfs_type.c index c080a94f6b..f87ccffabb 100644 --- a/sys/vfs/procfs/procfs_type.c +++ b/sys/vfs/procfs/procfs_type.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/miscfs/procfs/procfs_type.c,v 1.6 1999/08/28 00:46:56 peter Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_type.c,v 1.2 2003/06/17 04:28:42 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_type.c,v 1.3 2003/08/07 21:17:43 dillon Exp $ */ #include @@ -43,7 +43,7 @@ #include #include #include -#include +#include int procfs_dotype(curp, p, pfs, uio) diff --git a/sys/vfs/procfs/procfs_vfsops.c b/sys/vfs/procfs/procfs_vfsops.c index a1e8a9c04d..388f61447e 100644 --- a/sys/vfs/procfs/procfs_vfsops.c +++ b/sys/vfs/procfs/procfs_vfsops.c @@ -37,7 +37,7 @@ * @(#)procfs_vfsops.c 8.7 (Berkeley) 5/10/95 * * $FreeBSD: src/sys/miscfs/procfs/procfs_vfsops.c,v 1.32.2.1 2001/10/15 20:42:01 des Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_vfsops.c,v 1.3 2003/06/25 03:56:00 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_vfsops.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ */ /* @@ -50,7 +50,7 @@ #include #include #include -#include +#include static int procfs_mount __P((struct mount *mp, char *path, caddr_t data, struct nameidata *ndp, struct thread *td)); diff --git a/sys/vfs/procfs/procfs_vnops.c b/sys/vfs/procfs/procfs_vnops.c index abe4c914ce..d33efa3805 100644 --- a/sys/vfs/procfs/procfs_vnops.c +++ b/sys/vfs/procfs/procfs_vnops.c @@ -37,7 +37,7 @@ * @(#)procfs_vnops.c 8.18 (Berkeley) 5/21/95 * * $FreeBSD: src/sys/miscfs/procfs/procfs_vnops.c,v 1.76.2.7 2002/01/22 17:22:59 nectar Exp $ - * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.6 2003/07/19 21:14:42 dillon Exp $ + * $DragonFly: src/sys/vfs/procfs/procfs_vnops.c,v 1.7 2003/08/07 21:17:43 dillon Exp $ */ /* @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include static int procfs_access __P((struct vop_access_args *)); diff --git a/sys/vfs/smbfs/smbfs_io.c b/sys/vfs/smbfs/smbfs_io.c index a5c3e5acc9..1042ba2899 100644 --- a/sys/vfs/smbfs/smbfs_io.c +++ b/sys/vfs/smbfs/smbfs_io.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.3.2.3 2003/01/17 08:20:26 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_io.c,v 1.5 2003/07/19 21:14:32 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_io.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ * */ #include @@ -59,9 +59,9 @@ #include #include -#include -#include -#include +#include "smbfs.h" +#include "smbfs_node.h" +#include "smbfs_subr.h" #include diff --git a/sys/vfs/smbfs/smbfs_node.c b/sys/vfs/smbfs/smbfs_node.c index 8572f4944a..a6e89855a0 100644 --- a/sys/vfs/smbfs/smbfs_node.c +++ b/sys/vfs/smbfs/smbfs_node.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_node.c,v 1.2.2.3 2003/01/17 08:20:26 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_node.c,v 1.5 2003/07/19 21:14:32 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_node.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ */ #include #include @@ -51,9 +51,9 @@ #include #include -#include -#include -#include +#include "smbfs.h" +#include "smbfs_node.h" +#include "smbfs_subr.h" #define SMBFS_NOHASH(smp, hval) (&(smp)->sm_hash[(hval) & (smp)->sm_hashlen]) #define smbfs_hash_lock(smp, td) lockmgr(&smp->sm_hashlock, LK_EXCLUSIVE, NULL, td) diff --git a/sys/vfs/smbfs/smbfs_smb.c b/sys/vfs/smbfs/smbfs_smb.c index 293d2d94b2..564c383f6e 100644 --- a/sys/vfs/smbfs/smbfs_smb.c +++ b/sys/vfs/smbfs/smbfs_smb.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_smb.c,v 1.1.2.2 2003/01/17 08:20:26 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_smb.c,v 1.3 2003/07/19 21:14:32 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_smb.c,v 1.4 2003/08/07 21:17:43 dillon Exp $ */ #include #include @@ -51,9 +51,9 @@ #include #include -#include -#include -#include +#include "smbfs.h" +#include "smbfs_node.h" +#include "smbfs_subr.h" /* * Lack of inode numbers leads us to the problem of generating them. diff --git a/sys/vfs/smbfs/smbfs_subr.c b/sys/vfs/smbfs/smbfs_subr.c index 7e9a605237..d10a4a7356 100644 --- a/sys/vfs/smbfs/smbfs_subr.c +++ b/sys/vfs/smbfs/smbfs_subr.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_subr.c,v 1.1.2.2 2003/01/17 08:20:26 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_subr.c,v 1.2 2003/06/17 04:28:33 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_subr.c,v 1.3 2003/08/07 21:17:43 dillon Exp $ */ #include #include @@ -48,9 +48,9 @@ #include #include -#include -#include -#include +#include "smbfs.h" +#include "smbfs_node.h" +#include "smbfs_subr.h" MALLOC_DEFINE(M_SMBFSDATA, "SMBFS data", "SMBFS private data"); diff --git a/sys/vfs/smbfs/smbfs_vfsops.c b/sys/vfs/smbfs/smbfs_vfsops.c index 50d09378af..9dbb9e3c9a 100644 --- a/sys/vfs/smbfs/smbfs_vfsops.c +++ b/sys/vfs/smbfs/smbfs_vfsops.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_vfsops.c,v 1.2.2.5 2003/01/17 08:20:26 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_vfsops.c,v 1.5 2003/07/19 21:14:32 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_vfsops.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ */ #include "opt_netsmb.h" #ifndef NETSMB @@ -54,9 +54,9 @@ #include #include -#include -#include -#include +#include "smbfs.h" +#include "smbfs_node.h" +#include "smbfs_subr.h" #include diff --git a/sys/vfs/smbfs/smbfs_vnops.c b/sys/vfs/smbfs/smbfs_vnops.c index a00cd4b7a9..06b4781dcc 100644 --- a/sys/vfs/smbfs/smbfs_vnops.c +++ b/sys/vfs/smbfs/smbfs_vnops.c @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.2.2.8 2003/04/04 08:57:23 tjr Exp $ - * $DragonFly: src/sys/vfs/smbfs/smbfs_vnops.c,v 1.5 2003/06/26 05:55:12 dillon Exp $ + * $DragonFly: src/sys/vfs/smbfs/smbfs_vnops.c,v 1.6 2003/08/07 21:17:43 dillon Exp $ */ #include #include @@ -52,9 +52,9 @@ #include #include -#include -#include -#include +#include "smbfs.h" +#include "smbfs_node.h" +#include "smbfs_subr.h" #include diff --git a/sys/vfs/ufs/README b/sys/vfs/ufs/README index 63675b8ac1..9b170b7964 100644 --- a/sys/vfs/ufs/README +++ b/sys/vfs/ufs/README @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/ufs/ffs/README,v 1.4 1999/12/03 00:34:26 billf Exp $ -# $DragonFly: src/sys/vfs/ufs/README,v 1.2 2003/06/17 04:28:59 dillon Exp $ +# $DragonFly: src/sys/vfs/ufs/README,v 1.3 2003/08/07 21:17:44 dillon Exp $ Introduction @@ -206,8 +206,8 @@ BSD/OS versions of the files. Because BSD/OS recently had point for figuring out the changes. There are 40 files that require change plus the two new files. Most of these files have only a few lines of changes in them. However, four files have -fairly extensive changes: kern/vfs_subr.c, ufs/ufs/ufs_lookup.c, -ufs/ufs/ufs_vnops.c, and ufs/ffs/ffs_alloc.c. For these four +fairly extensive changes: kern/vfs_subr.c, vfs/ufs/ufs_lookup.c, +vfs/ufs/ufs_vnops.c, and vfs/ffs/ffs_alloc.c. For these four files, I have provided the original Lite2 version, the Lite2 version with the diffs merged in, and the diffs between the BSD/OS and merged version. Even so, I expect that there will diff --git a/sys/vfs/ufs/ffs_alloc.c b/sys/vfs/ufs/ffs_alloc.c index 1c974e3cc1..70ba9a7d22 100644 --- a/sys/vfs/ufs/ffs_alloc.c +++ b/sys/vfs/ufs/ffs_alloc.c @@ -32,7 +32,7 @@ * * @(#)ffs_alloc.c 8.18 (Berkeley) 5/26/95 * $FreeBSD: src/sys/ufs/ffs/ffs_alloc.c,v 1.64.2.2 2001/09/21 19:15:21 dillon Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_alloc.c,v 1.5 2003/07/26 22:04:26 rob Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_alloc.c,v 1.6 2003/08/07 21:17:44 dillon Exp $ */ #include "opt_quota.h" @@ -48,13 +48,13 @@ #include #include -#include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "ufs_extern.h" +#include "ufsmount.h" -#include -#include +#include "fs.h" +#include "ffs_extern.h" typedef ufs_daddr_t allocfcn_t __P((struct inode *ip, int cg, ufs_daddr_t bpref, int size)); diff --git a/sys/vfs/ufs/ffs_balloc.c b/sys/vfs/ufs/ffs_balloc.c index 7c40369b51..8086610906 100644 --- a/sys/vfs/ufs/ffs_balloc.c +++ b/sys/vfs/ufs/ffs_balloc.c @@ -32,7 +32,7 @@ * * @(#)ffs_balloc.c 8.8 (Berkeley) 6/16/95 * $FreeBSD: src/sys/ufs/ffs/ffs_balloc.c,v 1.26.2.1 2002/10/10 19:48:20 dillon Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_balloc.c,v 1.5 2003/06/26 05:55:20 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_balloc.c,v 1.6 2003/08/07 21:17:44 dillon Exp $ */ #include @@ -43,12 +43,12 @@ #include #include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "ufs_extern.h" -#include -#include +#include "fs.h" +#include "ffs_extern.h" /* * Balloc defines the structure of file system storage diff --git a/sys/vfs/ufs/ffs_inode.c b/sys/vfs/ufs/ffs_inode.c index 5d5d73f7be..662ee38949 100644 --- a/sys/vfs/ufs/ffs_inode.c +++ b/sys/vfs/ufs/ffs_inode.c @@ -32,7 +32,7 @@ * * @(#)ffs_inode.c 8.13 (Berkeley) 4/21/95 * $FreeBSD: src/sys/ufs/ffs/ffs_inode.c,v 1.56.2.5 2002/02/05 18:35:03 dillon Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_inode.c,v 1.7 2003/07/26 22:04:26 rob Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_inode.c,v 1.8 2003/08/07 21:17:44 dillon Exp $ */ #include "opt_quota.h" @@ -51,13 +51,13 @@ #include #include -#include -#include -#include -#include +#include "quota.h" +#include "ufsmount.h" +#include "inode.h" +#include "ufs_extern.h" -#include -#include +#include "fs.h" +#include "ffs_extern.h" #include diff --git a/sys/vfs/ufs/ffs_rawread.c b/sys/vfs/ufs/ffs_rawread.c index 89d1c6768a..fc1007e927 100644 --- a/sys/vfs/ufs/ffs_rawread.c +++ b/sys/vfs/ufs/ffs_rawread.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ufs/ffs/ffs_rawread.c,v 1.3.2.2 2003/05/29 06:15:35 alc Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_rawread.c,v 1.4 2003/07/19 21:14:51 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_rawread.c,v 1.5 2003/08/07 21:17:44 dillon Exp $ */ #include @@ -40,9 +40,9 @@ #include #include #include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "fs.h" #include #include diff --git a/sys/vfs/ufs/ffs_softdep.c b/sys/vfs/ufs/ffs_softdep.c index 554ef4d401..28216b1a0a 100644 --- a/sys/vfs/ufs/ffs_softdep.c +++ b/sys/vfs/ufs/ffs_softdep.c @@ -37,7 +37,7 @@ * * from: @(#)ffs_softdep.c 9.59 (McKusick) 6/21/00 * $FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.57.2.11 2002/02/05 18:46:53 dillon Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_softdep.c,v 1.9 2003/07/19 21:14:51 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_softdep.c,v 1.10 2003/08/07 21:17:44 dillon Exp $ */ /* @@ -61,14 +61,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include "dir.h" +#include "quota.h" +#include "inode.h" +#include "ufsmount.h" +#include "fs.h" +#include "softdep.h" +#include "ffs_extern.h" +#include "ufs_extern.h" /* * These definitions need to be adapted to the system to which diff --git a/sys/vfs/ufs/ffs_softdep_stub.c b/sys/vfs/ufs/ffs_softdep_stub.c index 1a82d33072..c9f5504e93 100644 --- a/sys/vfs/ufs/ffs_softdep_stub.c +++ b/sys/vfs/ufs/ffs_softdep_stub.c @@ -33,7 +33,7 @@ * * from: @(#)ffs_softdep_stub.c 9.1 (McKusick) 7/10/97 * $FreeBSD: src/sys/ufs/ffs/ffs_softdep_stub.c,v 1.7.2.1 2000/12/28 11:01:45 ps Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_softdep_stub.c,v 1.3 2003/07/24 20:42:33 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_softdep_stub.c,v 1.4 2003/08/07 21:17:44 dillon Exp $ */ /* @@ -50,10 +50,10 @@ #include #include #include -#include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "ffs_extern.h" +#include "ufs_extern.h" int softdep_flushfiles(struct mount *oldmnt, int flags, thread_t td) diff --git a/sys/vfs/ufs/ffs_subr.c b/sys/vfs/ufs/ffs_subr.c index 0f52bc883c..7e6d8b47cd 100644 --- a/sys/vfs/ufs/ffs_subr.c +++ b/sys/vfs/ufs/ffs_subr.c @@ -32,14 +32,14 @@ * * @(#)ffs_subr.c 8.5 (Berkeley) 3/21/95 * $FreeBSD: src/sys/ufs/ffs/ffs_subr.c,v 1.25 1999/12/29 04:55:04 peter Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_subr.c,v 1.4 2003/07/26 22:04:26 rob Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_subr.c,v 1.5 2003/08/07 21:17:44 dillon Exp $ */ #include -#include +#include "fs.h" #ifndef _KERNEL -#include +#include "dinode.h" #else #include "opt_ddb.h" @@ -49,9 +49,9 @@ #include #include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "ffs_extern.h" #ifdef DDB void ffs_checkoverlap __P((struct buf *, struct inode *)); diff --git a/sys/vfs/ufs/ffs_vfsops.c b/sys/vfs/ufs/ffs_vfsops.c index 5e0a55b7c0..61613e48d3 100644 --- a/sys/vfs/ufs/ffs_vfsops.c +++ b/sys/vfs/ufs/ffs_vfsops.c @@ -32,7 +32,7 @@ * * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 * $FreeBSD: src/sys/ufs/ffs/ffs_vfsops.c,v 1.117.2.10 2002/06/23 22:34:52 iedowse Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_vfsops.c,v 1.9 2003/07/26 22:04:26 rob Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_vfsops.c,v 1.10 2003/08/07 21:17:44 dillon Exp $ */ #include "opt_quota.h" @@ -50,13 +50,13 @@ #include #include -#include -#include -#include -#include +#include "quota.h" +#include "ufsmount.h" +#include "inode.h" +#include "ufs_extern.h" -#include -#include +#include "fs.h" +#include "ffs_extern.h" #include #include diff --git a/sys/vfs/ufs/ffs_vnops.c b/sys/vfs/ufs/ffs_vnops.c index 868d4ac3c2..13528f34b2 100644 --- a/sys/vfs/ufs/ffs_vnops.c +++ b/sys/vfs/ufs/ffs_vnops.c @@ -32,7 +32,7 @@ * * @(#)ffs_vnops.c 8.15 (Berkeley) 5/14/95 * $FreeBSD: src/sys/ufs/ffs/ffs_vnops.c,v 1.64 2000/01/10 12:04:25 phk Exp $ - * $DragonFly: src/sys/vfs/ufs/ffs_vnops.c,v 1.4 2003/07/19 21:14:51 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ffs_vnops.c,v 1.5 2003/08/07 21:17:44 dillon Exp $ */ #include @@ -56,13 +56,13 @@ #include -#include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "ufsmount.h" +#include "ufs_extern.h" -#include -#include +#include "fs.h" +#include "ffs_extern.h" static int ffs_fsync __P((struct vop_fsync_args *)); static int ffs_getpages __P((struct vop_getpages_args *)); @@ -108,7 +108,7 @@ VNODEOP_SET(ffs_vnodeop_opv_desc); VNODEOP_SET(ffs_specop_opv_desc); VNODEOP_SET(ffs_fifoop_opv_desc); -#include +#include "ufs_readwrite.c" /* * Synch an open file. diff --git a/sys/vfs/ufs/inode.h b/sys/vfs/ufs/inode.h index 217cb4b988..77b3f2880e 100644 --- a/sys/vfs/ufs/inode.h +++ b/sys/vfs/ufs/inode.h @@ -37,7 +37,7 @@ * * @(#)inode.h 8.9 (Berkeley) 5/14/95 * $FreeBSD: src/sys/ufs/ufs/inode.h,v 1.28.2.2 2001/09/29 12:52:52 iedowse Exp $ - * $DragonFly: src/sys/vfs/ufs/inode.h,v 1.2 2003/06/17 04:28:59 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/inode.h,v 1.3 2003/08/07 21:17:44 dillon Exp $ */ #ifndef _UFS_UFS_INODE_H_ @@ -45,7 +45,7 @@ #include #include -#include +#include "dinode.h" /* * The size of a logical block number. diff --git a/sys/vfs/ufs/ufs_bmap.c b/sys/vfs/ufs/ufs_bmap.c index 522ad2d968..dde8d38b68 100644 --- a/sys/vfs/ufs/ufs_bmap.c +++ b/sys/vfs/ufs/ufs_bmap.c @@ -37,7 +37,7 @@ * * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 * $FreeBSD: src/sys/ufs/ufs/ufs_bmap.c,v 1.34.2.1 2000/03/17 10:12:14 ps Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_bmap.c,v 1.4 2003/07/26 22:04:27 rob Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_bmap.c,v 1.5 2003/08/07 21:17:44 dillon Exp $ */ #include @@ -49,10 +49,10 @@ #include #include -#include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "ufsmount.h" +#include "ufs_extern.h" /* * Bmap converts a the logical block number of a file to its physical block diff --git a/sys/vfs/ufs/ufs_dirhash.c b/sys/vfs/ufs/ufs_dirhash.c index b8a6bc3b6a..26db2f5544 100644 --- a/sys/vfs/ufs/ufs_dirhash.c +++ b/sys/vfs/ufs/ufs_dirhash.c @@ -23,7 +23,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/ufs/ufs/ufs_dirhash.c,v 1.3.2.6 2002/04/10 21:41:14 dwmalone Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_dirhash.c,v 1.2 2003/06/17 04:28:59 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_dirhash.c,v 1.3 2003/08/07 21:17:44 dillon Exp $ */ /* * This implements a hash-based lookup scheme for UFS directories. @@ -45,12 +45,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "dir.h" +#include "dirhash.h" +#include "ufsmount.h" +#include "ufs_extern.h" #define WRAPINCR(val, limit) (((val) + 1 == (limit)) ? 0 : ((val) + 1)) #define WRAPDECR(val, limit) (((val) == 0) ? ((limit) - 1) : ((val) - 1)) diff --git a/sys/vfs/ufs/ufs_ihash.c b/sys/vfs/ufs/ufs_ihash.c index 34ecd5ae47..ff7ad7c364 100644 --- a/sys/vfs/ufs/ufs_ihash.c +++ b/sys/vfs/ufs/ufs_ihash.c @@ -32,7 +32,7 @@ * * @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95 * $FreeBSD: src/sys/ufs/ufs/ufs_ihash.c,v 1.20 1999/08/28 00:52:29 peter Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_ihash.c,v 1.5 2003/07/08 09:57:14 dillon Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_ihash.c,v 1.6 2003/08/07 21:17:44 dillon Exp $ */ #include @@ -43,9 +43,9 @@ #include #include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "ufs_extern.h" static MALLOC_DEFINE(M_UFSIHASH, "UFS ihash", "UFS Inode hash tables"); /* diff --git a/sys/vfs/ufs/ufs_inode.c b/sys/vfs/ufs/ufs_inode.c index 206c5ea08e..cdb0f273dc 100644 --- a/sys/vfs/ufs/ufs_inode.c +++ b/sys/vfs/ufs/ufs_inode.c @@ -37,7 +37,7 @@ * * @(#)ufs_inode.c 8.9 (Berkeley) 5/14/95 * $FreeBSD: src/sys/ufs/ufs/ufs_inode.c,v 1.25.2.3 2002/07/05 22:42:31 dillon Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_inode.c,v 1.5 2003/07/26 22:04:27 rob Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_inode.c,v 1.6 2003/08/07 21:17:44 dillon Exp $ */ #include "opt_quota.h" @@ -48,13 +48,13 @@ #include #include -#include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "ufsmount.h" +#include "ufs_extern.h" #ifdef UFS_DIRHASH -#include -#include +#include "dir.h" +#include "dirhash.h" #endif int prtactive = 0; /* 1 => print out reclaim of active vnodes */ diff --git a/sys/vfs/ufs/ufs_lookup.c b/sys/vfs/ufs/ufs_lookup.c index b522de9c52..f9cd8df79b 100644 --- a/sys/vfs/ufs/ufs_lookup.c +++ b/sys/vfs/ufs/ufs_lookup.c @@ -37,7 +37,7 @@ * * @(#)ufs_lookup.c 8.15 (Berkeley) 6/16/95 * $FreeBSD: src/sys/ufs/ufs/ufs_lookup.c,v 1.33.2.7 2001/09/22 19:22:13 iedowse Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_lookup.c,v 1.5 2003/07/26 22:04:27 rob Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_lookup.c,v 1.6 2003/08/07 21:17:44 dillon Exp $ */ #include "opt_ufs.h" @@ -56,14 +56,14 @@ #include #include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "dir.h" #ifdef UFS_DIRHASH -#include +#include "dirhash.h" #endif -#include -#include +#include "ufsmount.h" +#include "ufs_extern.h" #ifdef DIAGNOSTIC int dirchk = 1; diff --git a/sys/vfs/ufs/ufs_quota.c b/sys/vfs/ufs/ufs_quota.c index 44137dfc61..dd77f1e821 100644 --- a/sys/vfs/ufs/ufs_quota.c +++ b/sys/vfs/ufs/ufs_quota.c @@ -35,7 +35,7 @@ * * @(#)ufs_quota.c 8.5 (Berkeley) 5/20/95 * $FreeBSD: src/sys/ufs/ufs/ufs_quota.c,v 1.27.2.3 2002/01/15 10:33:32 phk Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_quota.c,v 1.8 2003/07/26 22:04:27 rob Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_quota.c,v 1.9 2003/08/07 21:17:44 dillon Exp $ */ #include @@ -49,9 +49,9 @@ #include #include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "ufsmount.h" static MALLOC_DEFINE(M_DQUOT, "UFS quota", "UFS quota entries"); diff --git a/sys/vfs/ufs/ufs_vfsops.c b/sys/vfs/ufs/ufs_vfsops.c index 1b0749908f..75b915dce6 100644 --- a/sys/vfs/ufs/ufs_vfsops.c +++ b/sys/vfs/ufs/ufs_vfsops.c @@ -37,7 +37,7 @@ * * @(#)ufs_vfsops.c 8.8 (Berkeley) 5/20/95 * $FreeBSD: src/sys/ufs/ufs/ufs_vfsops.c,v 1.17.2.3 2001/10/14 19:08:16 iedowse Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_vfsops.c,v 1.4 2003/07/26 22:04:27 rob Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_vfsops.c,v 1.5 2003/08/07 21:17:44 dillon Exp $ */ #include "opt_quota.h" @@ -49,10 +49,10 @@ #include #include -#include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "ufsmount.h" +#include "ufs_extern.h" MALLOC_DEFINE(M_UFSMNT, "UFS mount", "UFS mount structure"); /* diff --git a/sys/vfs/ufs/ufs_vnops.c b/sys/vfs/ufs/ufs_vnops.c index a2c80a059b..8b264ea368 100644 --- a/sys/vfs/ufs/ufs_vnops.c +++ b/sys/vfs/ufs/ufs_vnops.c @@ -37,7 +37,7 @@ * * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 * $FreeBSD: src/sys/ufs/ufs/ufs_vnops.c,v 1.131.2.8 2003/01/02 17:26:19 bde Exp $ - * $DragonFly: src/sys/vfs/ufs/ufs_vnops.c,v 1.7 2003/07/26 22:04:27 rob Exp $ + * $DragonFly: src/sys/vfs/ufs/ufs_vnops.c,v 1.8 2003/08/07 21:17:44 dillon Exp $ */ #include "opt_quota.h" @@ -66,15 +66,15 @@ #include #include -#include +#include -#include -#include -#include -#include -#include +#include "quota.h" +#include "inode.h" +#include "dir.h" +#include "ufsmount.h" +#include "ufs_extern.h" #ifdef UFS_DIRHASH -#include +#include "dirhash.h" #endif static int ufs_access __P((struct vop_access_args *)); diff --git a/sys/vfs/umapfs/umap_subr.c b/sys/vfs/umapfs/umap_subr.c index bc9172504c..7e2c15604b 100644 --- a/sys/vfs/umapfs/umap_subr.c +++ b/sys/vfs/umapfs/umap_subr.c @@ -36,7 +36,7 @@ * @(#)umap_subr.c 8.9 (Berkeley) 5/14/95 * * $FreeBSD: src/sys/miscfs/umapfs/umap_subr.c,v 1.19 1999/09/04 11:51:41 bde Exp $ - * $DragonFly: src/sys/vfs/umapfs/Attic/umap_subr.c,v 1.3 2003/06/25 03:56:00 dillon Exp $ + * $DragonFly: src/sys/vfs/umapfs/Attic/umap_subr.c,v 1.4 2003/08/07 21:17:44 dillon Exp $ */ #include @@ -45,7 +45,7 @@ #include #include #include -#include +#include "umap.h" #define LOG2_SIZEVNODE 7 /* log2(sizeof struct vnode) */ #define NUMAPNODECACHE 16 diff --git a/sys/vfs/umapfs/umap_vfsops.c b/sys/vfs/umapfs/umap_vfsops.c index 180412e93d..9197103a64 100644 --- a/sys/vfs/umapfs/umap_vfsops.c +++ b/sys/vfs/umapfs/umap_vfsops.c @@ -36,7 +36,7 @@ * @(#)umap_vfsops.c 8.8 (Berkeley) 5/14/95 * * $FreeBSD: src/sys/miscfs/umapfs/umap_vfsops.c,v 1.31.2.2 2001/09/11 09:49:53 kris Exp $ - * $DragonFly: src/sys/vfs/umapfs/Attic/umap_vfsops.c,v 1.5 2003/06/26 05:55:16 dillon Exp $ + * $DragonFly: src/sys/vfs/umapfs/Attic/umap_vfsops.c,v 1.6 2003/08/07 21:17:44 dillon Exp $ */ /* @@ -52,7 +52,7 @@ #include #include #include -#include +#include "umap.h" #include static MALLOC_DEFINE(M_UMAPFSMNT, "UMAP mount", "UMAP mount structure"); diff --git a/sys/vfs/umapfs/umap_vnops.c b/sys/vfs/umapfs/umap_vnops.c index d70f657dc9..1aa1336040 100644 --- a/sys/vfs/umapfs/umap_vnops.c +++ b/sys/vfs/umapfs/umap_vnops.c @@ -35,7 +35,7 @@ * * @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95 * $FreeBSD: src/sys/miscfs/umapfs/umap_vnops.c,v 1.30 1999/08/30 07:08:04 bde Exp $ - * $DragonFly: src/sys/vfs/umapfs/Attic/umap_vnops.c,v 1.3 2003/06/25 03:56:01 dillon Exp $ + * $DragonFly: src/sys/vfs/umapfs/Attic/umap_vnops.c,v 1.4 2003/08/07 21:17:44 dillon Exp $ */ /* @@ -52,8 +52,8 @@ #include #include #include -#include -#include +#include "umap.h" +#include static int umap_bug_bypass = 0; /* for debugging: enables bypass printf'ing */ SYSCTL_INT(_debug, OID_AUTO, umapfs_bug_bypass, CTLFLAG_RW, diff --git a/sys/vfs/union/union_subr.c b/sys/vfs/union/union_subr.c index 1dd768a50a..87a657b611 100644 --- a/sys/vfs/union/union_subr.c +++ b/sys/vfs/union/union_subr.c @@ -36,7 +36,7 @@ * * @(#)union_subr.c 8.20 (Berkeley) 5/20/95 * $FreeBSD: src/sys/miscfs/union/union_subr.c,v 1.43.2.2 2001/12/25 01:44:45 dillon Exp $ - * $DragonFly: src/sys/vfs/union/union_subr.c,v 1.5 2003/07/19 21:14:43 dillon Exp $ + * $DragonFly: src/sys/vfs/union/union_subr.c,v 1.6 2003/08/07 21:17:44 dillon Exp $ */ #include @@ -56,7 +56,7 @@ #include /* for vnode_pager_setsize */ #include #include /* for vm cache coherency */ -#include +#include "union.h" extern int union_init __P((void)); diff --git a/sys/vfs/union/union_vfsops.c b/sys/vfs/union/union_vfsops.c index 579a808cca..ec368d13b1 100644 --- a/sys/vfs/union/union_vfsops.c +++ b/sys/vfs/union/union_vfsops.c @@ -36,7 +36,7 @@ * * @(#)union_vfsops.c 8.20 (Berkeley) 5/20/95 * $FreeBSD: src/sys/miscfs/union/union_vfsops.c,v 1.39.2.2 2001/10/25 19:18:53 dillon Exp $ - * $DragonFly: src/sys/vfs/union/union_vfsops.c,v 1.3 2003/06/25 03:56:01 dillon Exp $ + * $DragonFly: src/sys/vfs/union/union_vfsops.c,v 1.4 2003/08/07 21:17:44 dillon Exp $ */ /* @@ -52,7 +52,7 @@ #include #include #include -#include +#include "union.h" #include static MALLOC_DEFINE(M_UNIONFSMNT, "UNION mount", "UNION mount structure"); diff --git a/sys/vfs/union/union_vnops.c b/sys/vfs/union/union_vnops.c index 3bc86ed6d0..0d550f55c6 100644 --- a/sys/vfs/union/union_vnops.c +++ b/sys/vfs/union/union_vnops.c @@ -36,7 +36,7 @@ * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 * $FreeBSD: src/sys/miscfs/union/union_vnops.c,v 1.72 1999/12/15 23:02:14 eivind Exp $ - * $DragonFly: src/sys/vfs/union/union_vnops.c,v 1.5 2003/07/26 20:05:56 rob Exp $ + * $DragonFly: src/sys/vfs/union/union_vnops.c,v 1.6 2003/08/07 21:17:45 dillon Exp $ */ #include @@ -52,7 +52,7 @@ #include #include #include -#include +#include "union.h" #include #include diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h index 1981ead083..91c687cb14 100644 --- a/usr.sbin/config/configvers.h +++ b/usr.sbin/config/configvers.h @@ -7,6 +7,6 @@ * and system. * * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.19.2.1 2001/12/19 18:09:32 silby Exp $ - * $DragonFly: src/usr.sbin/config/configvers.h,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/config/configvers.h,v 1.3 2003/08/07 21:19:25 dillon Exp $ */ -#define CONFIGVERS 400019 +#define CONFIGVERS 400020 diff --git a/usr.sbin/config/main.c b/usr.sbin/config/main.c index 97a75bf9f9..9beb644d3e 100644 --- a/usr.sbin/config/main.c +++ b/usr.sbin/config/main.c @@ -33,7 +33,7 @@ * @(#) Copyright (c) 1980, 1993 The Regents of the University of California. All rights reserved. * @(#)main.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/config/main.c,v 1.37.2.3 2001/06/13 00:25:53 cg Exp $ - * $DragonFly: src/usr.sbin/config/main.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/config/main.c,v 1.3 2003/08/07 21:19:25 dillon Exp $ */ #include @@ -183,6 +183,37 @@ main(argc, argv) srcdir, machinename); (void) symlink(xxx, path("machine")); } + + /* + * XXX check directory structure for architecture subdirectories and + * create the symlinks automatically XXX + */ + { + char xxx[MAXPATHLEN]; + if (*srcdir == '\0') + (void)snprintf(xxx, sizeof(xxx), "../../../../../net/i4b/include/%s", + machinename); + else + (void)snprintf(xxx, sizeof(xxx), "%s/net/i4b/include/%s", + srcdir, machinename); + (void) mkdir(path("net"), 0755); + (void) mkdir(path("net/i4b"), 0755); + (void) mkdir(path("net/i4b/include"), 0755); + (void) symlink(xxx, path("net/i4b/include/machine")); + } + { + char xxx[MAXPATHLEN]; + if (*srcdir == '\0') + (void)snprintf(xxx, sizeof(xxx), "../../../../emulation/linux/%s", + machinename); + else + (void)snprintf(xxx, sizeof(xxx), "%s/emulation/linux/%s", + srcdir, machinename); + (void) mkdir(path("emulation"), 0755); + (void) mkdir(path("emulation/linux"), 0755); + (void) symlink(xxx, path("emulation/linux/machine")); + } + options(); /* make options .h files */ makefile(); /* build Makefile */ headers(); /* make a lot of .h files */ diff --git a/usr.sbin/config/mkheaders.c b/usr.sbin/config/mkheaders.c index 27a94db6fb..e0dd4bbaa6 100644 --- a/usr.sbin/config/mkheaders.c +++ b/usr.sbin/config/mkheaders.c @@ -32,7 +32,7 @@ * * @(#)mkheaders.c 8.1 (Berkeley) 6/6/93 * $FreeBSD: src/usr.sbin/config/mkheaders.c,v 1.14.2.2 2001/01/23 00:09:32 peter Exp $ - * $DragonFly: src/usr.sbin/config/mkheaders.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/config/mkheaders.c,v 1.3 2003/08/07 21:19:25 dillon Exp $ */ /* @@ -222,8 +222,11 @@ toheader(dev) char *dev; { static char hbuf[MAXPATHLEN]; + static char udev[MAXPATHLEN]; - snprintf(hbuf, sizeof(hbuf), "%s.h", path(dev)); + snprintf(udev, sizeof(udev), "use_%s", dev); + + snprintf(hbuf, sizeof(hbuf), "%s.h", path(udev)); return (hbuf); } diff --git a/usr.sbin/config/mkioconf.c b/usr.sbin/config/mkioconf.c index c4a810c272..ef16dd300b 100644 --- a/usr.sbin/config/mkioconf.c +++ b/usr.sbin/config/mkioconf.c @@ -32,7 +32,7 @@ * * @(#)mkioconf.c 8.2 (Berkeley) 1/21/94 * $FreeBSD: src/usr.sbin/config/mkioconf.c,v 1.62 2000/01/29 18:14:59 peter Exp $ - * $DragonFly: src/usr.sbin/config/mkioconf.c,v 1.2 2003/06/17 04:29:53 dillon Exp $ + * $DragonFly: src/usr.sbin/config/mkioconf.c,v 1.3 2003/08/07 21:19:25 dillon Exp $ */ #include @@ -185,7 +185,7 @@ newbus_ioconf() if (machine == MACHINE_PC98) fprintf(fp, "#include \n"); else - fprintf(fp, "#include \n"); + fprintf(fp, "#include \n"); fprintf(fp, "#include \n"); fprintf(fp, "\n"); -- 2.41.0