Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys split device_t/softc for all remaining drivers.
details: https://anonhg.NetBSD.org/src/rev/c232b2254fed
branches: trunk
changeset: 782310:c232b2254fed
user: chs <chs%NetBSD.org@localhost>
date: Sat Oct 27 17:17:22 2012 +0000
description:
split device_t/softc for all remaining drivers.
replace "struct device *" with "device_t".
use device_xname(), device_unit(), etc.
diffstat:
sys/arch/acorn26/acorn26/fpu.c | 8 +-
sys/arch/acorn26/acorn26/fpuvar.h | 3 +-
sys/arch/acorn26/iobus/upc_iobus.c | 7 +-
sys/arch/acorn26/ioc/ioeb.c | 7 +-
sys/arch/acorn26/ioc/ssn.c | 7 +-
sys/arch/acorn32/eb7500atx/rsbus.c | 6 +-
sys/arch/acorn32/eb7500atx/rsbus.h | 3 +-
sys/arch/acorn32/mainbus/fd.c | 45 ++--
sys/arch/acorn32/mainbus/pioc.c | 9 +-
sys/arch/acorn32/podulebus/amps.c | 11 +-
sys/arch/acorn32/podulebus/asc.c | 32 +-
sys/arch/acorn32/podulebus/cosc.c | 9 +-
sys/arch/acorn32/podulebus/csa.c | 6 +-
sys/arch/acorn32/podulebus/csc.c | 25 +-
sys/arch/acorn32/podulebus/esc.c | 6 +-
sys/arch/acorn32/podulebus/escvar.h | 4 +-
sys/arch/acorn32/podulebus/if_ie.c | 26 +-
sys/arch/acorn32/podulebus/ptsc.c | 9 +-
sys/arch/acorn32/podulebus/sbic.c | 34 ++--
sys/arch/acorn32/podulebus/sbicvar.h | 4 +-
sys/arch/acorn32/podulebus/sfas.c | 6 +-
sys/arch/acorn32/podulebus/sfasvar.h | 4 +-
sys/arch/algor/algor/autoconf.c | 10 +-
sys/arch/algor/dev/bonito_mainbus.c | 17 +-
sys/arch/algor/dev/vtpbc_mainbus.c | 21 +-
sys/arch/algor/pci/vtpbc.c | 8 +-
sys/arch/alpha/alpha/dec_3000_300.c | 6 +-
sys/arch/alpha/alpha/dec_3000_500.c | 6 +-
sys/arch/amiga/amiga/autoconf.c | 82 ++++----
sys/arch/amiga/amiga/device.h | 4 +-
sys/arch/amiga/clockport/a1k2cp.c | 9 +-
sys/arch/amiga/clockport/clockport.c | 20 +-
sys/arch/amiga/clockport/gencp_xsurf.c | 13 +-
sys/arch/amiga/dev/a2kbbc.c | 10 +-
sys/arch/amiga/dev/a34kbbc.c | 10 +-
sys/arch/amiga/dev/afsc.c | 29 +-
sys/arch/amiga/dev/ahsc.c | 28 +-
sys/arch/amiga/dev/amidisplaycc.c | 24 +-
sys/arch/amiga/dev/aster.c | 28 +-
sys/arch/amiga/dev/atzsc.c | 27 +-
sys/arch/amiga/dev/aucc.c | 20 +-
sys/arch/amiga/dev/bppcsc.c | 23 +-
sys/arch/amiga/dev/cbiiisc.c | 23 +-
sys/arch/amiga/dev/clock.c | 28 +-
sys/arch/amiga/dev/drbbc.c | 19 +-
sys/arch/amiga/dev/drsc.c | 27 +-
sys/arch/amiga/dev/drsupio.c | 26 +-
sys/arch/amiga/dev/empsc.c | 25 +-
sys/arch/amiga/dev/fd.c | 34 ++--
sys/arch/amiga/dev/gayle_pcmcia.c | 84 ++++-----
sys/arch/amiga/dev/grf.c | 31 ++-
sys/arch/amiga/dev/grf_cc.c | 46 ++--
sys/arch/amiga/dev/grf_cl.c | 37 ++-
sys/arch/amiga/dev/grf_cv.c | 48 +++--
sys/arch/amiga/dev/grf_cv3d.c | 47 +++--
sys/arch/amiga/dev/grf_et.c | 39 ++--
sys/arch/amiga/dev/grf_rh.c | 44 ++--
sys/arch/amiga/dev/grf_rt.c | 45 ++--
sys/arch/amiga/dev/grf_ul.c | 49 +++--
sys/arch/amiga/dev/grfvar.h | 4 +-
sys/arch/amiga/dev/gtsc.c | 27 +-
sys/arch/amiga/dev/gvpbus.c | 23 +-
sys/arch/amiga/dev/gvpio.c | 36 ++--
sys/arch/amiga/dev/hyper.c | 28 +-
sys/arch/amiga/dev/if_bah_zbus.c | 19 +-
sys/arch/amiga/dev/if_es.c | 91 +++++-----
sys/arch/amiga/dev/if_qn.c | 24 +-
sys/arch/amiga/dev/ioblix_zbus.c | 27 +-
sys/arch/amiga/dev/isic_supio.c | 20 +-
sys/arch/amiga/dev/ite.c | 24 +-
sys/arch/amiga/dev/itevar.h | 3 +-
sys/arch/amiga/dev/ivsc.c | 26 +-
sys/arch/amiga/dev/kbd.c | 14 +-
sys/arch/amiga/dev/melody.c | 17 +-
sys/arch/amiga/dev/mfc.c | 68 ++++---
sys/arch/amiga/dev/mgnsc.c | 26 +-
sys/arch/amiga/dev/mlhsc.c | 27 +-
sys/arch/amiga/dev/ms.c | 23 +-
sys/arch/amiga/dev/msc.c | 14 +-
sys/arch/amiga/dev/otgsc.c | 27 +-
sys/arch/amiga/dev/p5bus.c | 11 +-
sys/arch/amiga/dev/par.c | 26 +-
sys/arch/amiga/dev/repulse.c | 29 +-
sys/arch/amiga/dev/sbic.c | 36 ++--
sys/arch/amiga/dev/sbicvar.h | 4 +-
sys/arch/amiga/dev/sci.c | 12 +-
sys/arch/amiga/dev/scivar.h | 4 +-
sys/arch/amiga/dev/ser.c | 21 +-
sys/arch/amiga/dev/siop.c | 90 +++++-----
sys/arch/amiga/dev/siop2.c | 98 +++++-----
sys/arch/amiga/dev/siopvar.h | 4 +-
sys/arch/amiga/dev/wesc.c | 25 +-
sys/arch/amiga/dev/wstsc.c | 26 +-
sys/arch/amiga/dev/zbus.c | 18 +-
sys/arch/amiga/dev/zssc.c | 24 +-
sys/arch/amiga/pci/cv3dpb.c | 6 +-
sys/arch/amiga/pci/emmem.c | 6 +-
sys/arch/amiga/pci/empb.c | 40 ++--
sys/arch/amiga/pci/mppb.c | 30 +-
sys/arch/amiga/pci/p5membar.c | 6 +-
sys/arch/amiga/pci/p5pb.c | 57 +++---
sys/arch/amigappc/amigappc/autoconf.c | 36 ++--
sys/arch/arc/arc/autoconf.c | 18 +-
sys/arch/arc/arc/timer.c | 8 +-
sys/arch/arc/arc/timervar.h | 6 +-
sys/arch/arc/dti/btl.c | 6 +-
sys/arch/arc/include/isa_machdep.h | 4 +-
sys/arch/arc/include/pci_machdep.h | 6 +-
sys/arch/arc/isa/isabus.c | 6 +-
sys/arch/arc/jazz/asc.c | 6 +-
sys/arch/arc/jazz/timer_jazzio.c | 6 +-
sys/arch/arc/pci/necpb.c | 12 +-
sys/arch/arm/arm32/arm32_machdep.c | 8 +-
sys/arch/arm/at91/at91emac.c | 10 +-
sys/arch/arm/at91/at91pio.c | 21 +-
sys/arch/arm/at91/at91st.c | 13 +-
sys/arch/arm/at91/at91twi.c | 10 +-
sys/arch/arm/at91/at91usart.c | 8 +-
sys/arch/arm/ep93xx/ep93xxvar.h | 8 +-
sys/arch/arm/ep93xx/epclk.c | 21 +-
sys/arch/arm/ep93xx/epcom.c | 20 +-
sys/arch/arm/ep93xx/epcomvar.h | 4 +-
sys/arch/arm/ep93xx/epe.c | 8 +-
sys/arch/arm/ep93xx/epgpio.c | 31 +--
sys/arch/arm/ep93xx/epled.c | 19 +-
sys/arch/arm/ep93xx/epohci.c | 16 +-
sys/arch/arm/ep93xx/eppcic.c | 23 +-
sys/arch/arm/ep93xx/eppcicvar.h | 6 +-
sys/arch/arm/ep93xx/eprtc.c | 21 +-
sys/arch/arm/ep93xx/epsoc.c | 34 +--
sys/arch/arm/ep93xx/epsocvar.h | 3 +-
sys/arch/arm/ep93xx/epwdog.c | 23 +-
sys/arch/arm/footbridge/footbridge_pci.c | 10 +-
sys/arch/arm/footbridge/isa/isa_machdep.c | 6 +-
sys/arch/arm/footbridge/isa/sysbeep_isa.c | 12 +-
sys/arch/arm/fpe-arm/armfpe_init.c | 12 +-
sys/arch/arm/gemini/gemini_ipi.c | 14 +-
sys/arch/arm/gemini/gemini_ipivar.h | 4 +-
sys/arch/arm/gemini/gemini_ipm.c | 10 +-
sys/arch/arm/gemini/gemini_lpc.c | 12 +-
sys/arch/arm/gemini/gemini_lpcvar.h | 3 +-
sys/arch/arm/gemini/gemini_pci.c | 9 +-
sys/arch/arm/gemini/gemini_timervar.h | 3 +-
sys/arch/arm/gemini/obio_lpchc.c | 12 +-
sys/arch/arm/gemini/obio_wdt.c | 12 +-
sys/arch/arm/imx/imx31_ahb.c | 17 +-
sys/arch/arm/imx/imx31_aips.c | 11 +-
sys/arch/arm/imx/imx31_clock.c | 4 +-
sys/arch/arm/imx/imx31_gpio.c | 13 +-
sys/arch/arm/imx/imx31_icu.c | 15 +-
sys/arch/arm/imx/imx51_clock.c | 6 +-
sys/arch/arm/imx/imx51_iomux.c | 5 +-
sys/arch/arm/imx/imx_pcic.c | 16 +-
sys/arch/arm/imx/imx_pcic.h | 8 +-
sys/arch/arm/imx/imxgpio.c | 8 +-
sys/arch/arm/imx/imxuartvar.h | 6 +-
sys/arch/arm/include/isa_machdep.h | 5 +-
sys/arch/arm/include/ofisa_machdep.h | 29 +-
sys/arch/arm/ixp12x0/ixp12x0.c | 12 +-
sys/arch/arm/ixp12x0/ixp12x0_clk.c | 23 +-
sys/arch/arm/ixp12x0/ixp12x0_com.c | 20 +-
sys/arch/arm/ixp12x0/ixp12x0_comvar.h | 4 +-
sys/arch/arm/ixp12x0/ixp12x0_pci.c | 10 +-
sys/arch/arm/ixp12x0/ixp12x0var.h | 4 +-
sys/arch/arm/ixp12x0/ixpsip.c | 25 +-
sys/arch/arm/ixp12x0/ixpsipvar.h | 3 +-
sys/arch/arm/ofw/ofw_irqhandler.c | 18 +-
sys/arch/arm/ofw/ofwgencfg_machdep.c | 6 +-
sys/arch/arm/omap/obio_ohci.c | 12 +-
sys/arch/arm/omap/omap2_gpio.c | 6 +-
sys/arch/arm/omap/omap2_nand.c | 10 +-
sys/arch/arm/omap/omap3_ehci.c | 12 +-
sys/arch/arm/s3c2xx0/s3c2410.c | 24 +-
sys/arch/arm/s3c2xx0/s3c2410_extint.c | 28 +-
sys/arch/arm/s3c2xx0/s3c2410_spi.c | 27 +-
sys/arch/arm/s3c2xx0/s3c2440.c | 18 +-
sys/arch/arm/s3c2xx0/s3c2440_extint.c | 18 +-
sys/arch/arm/s3c2xx0/s3c2440_i2s.c | 14 +-
sys/arch/arm/s3c2xx0/s3c2440_sdi.c | 9 +-
sys/arch/arm/s3c2xx0/s3c2440_spi.c | 25 +-
sys/arch/arm/s3c2xx0/s3c2440_touch.c | 12 +-
sys/arch/arm/s3c2xx0/s3c24x0_lcd.c | 8 +-
sys/arch/arm/s3c2xx0/s3c2800.c | 20 +-
sys/arch/arm/s3c2xx0/s3c2800_pci.c | 32 +-
sys/arch/arm/s3c2xx0/sscom.c | 18 +-
sys/arch/arm/s3c2xx0/sscom_s3c2410.c | 12 +-
sys/arch/arm/s3c2xx0/sscom_s3c2440.c | 8 +-
sys/arch/arm/s3c2xx0/sscom_s3c2800.c | 17 +-
sys/arch/arm/s3c2xx0/sscom_var.h | 8 +-
sys/arch/arm/sa11x0/sa1111_kbc.c | 8 +-
sys/arch/arm/sa11x0/sa11x0.c | 14 +-
sys/arch/arm/xscale/pxa2x0.c | 8 +-
sys/arch/arm/xscale/pxa2x0_ac97.c | 4 +-
sys/arch/arm/xscale/pxa2x0_apm.c | 16 +-
sys/arch/arm/xscale/pxa2x0_apm.h | 4 +-
sys/arch/arm/xscale/pxa2x0_i2s.h | 3 +-
sys/arch/arm/xscale/pxa2x0_ohci.c | 9 +-
sys/arch/arm/xscale/pxa2x0_pcic.c | 8 +-
sys/arch/arm/xscale/pxa2x0_pcic.h | 4 +-
sys/arch/arm/xscale/pxa2x0_rtc.c | 12 +-
sys/arch/atari/atari/autoconf.c | 32 +-
sys/arch/atari/atari/device.h | 4 +-
sys/arch/atari/dev/grfvar.h | 4 +-
sys/arch/atari/dev/ite_cc.c | 6 +-
sys/arch/atari/dev/kbdvar.h | 4 +-
sys/arch/atari/dev/lpt.c | 16 +-
sys/arch/atari/dev/ncr5380.c | 8 +-
sys/arch/atari/include/isa_machdep.h | 4 +-
sys/arch/atari/include/pci_machdep.h | 4 +-
sys/arch/atari/pci/pciide_machdep.c | 8 +-
sys/arch/cats/cats/autoconf.c | 13 +-
sys/arch/cats/pci/pcib.c | 6 +-
sys/arch/cats/pci/pciide_machdep.c | 8 +-
sys/arch/cobalt/cobalt/autoconf.c | 8 +-
sys/arch/cobalt/include/pci_machdep.h | 4 +-
sys/arch/cobalt/pci/pci_machdep.c | 7 +-
sys/arch/cobalt/pci/pciide_machdep.c | 8 +-
sys/arch/dreamcast/dev/g2/g2busvar.h | 4 +-
sys/arch/dreamcast/dev/maple/maple.c | 12 +-
sys/arch/dreamcast/dev/maple/maplevar.h | 4 +-
sys/arch/dreamcast/dev/maple/mms.c | 6 +-
sys/arch/dreamcast/include/pci_machdep.h | 6 +-
sys/arch/emips/ebus/ace_ebus.c | 17 +-
sys/arch/emips/ebus/flash_ebus.c | 28 +-
sys/arch/emips/ebus/icap_ebus.c | 12 +-
sys/arch/emips/ebus/stub_ebus.c | 15 +-
sys/arch/emips/emips/clock.c | 6 +-
sys/arch/emips/emips/interrupt.c | 6 +-
sys/arch/emips/emips/machdep.c | 8 +-
sys/arch/emips/include/sysconf.h | 6 +-
sys/arch/evbarm/adi_brh/becc_mainbus.c | 18 +-
sys/arch/evbarm/armadillo/armadillo9_com.c | 17 +-
sys/arch/evbarm/armadillo/armadillo9_iic.c | 21 +-
sys/arch/evbarm/armadillo/armadillo9_machdep.c | 6 +-
sys/arch/evbarm/armadillo/armadillo9_pcic.c | 22 +-
sys/arch/evbarm/evbarm/autoconf.c | 10 +-
sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c | 8 +-
sys/arch/evbarm/g42xxeb/gb225_pcic.c | 18 +-
sys/arch/evbarm/g42xxeb/gb225_slhci.c | 26 +-
sys/arch/evbarm/g42xxeb/if_ne_obio.c | 8 +-
sys/arch/evbarm/g42xxeb/obio.c | 6 +-
sys/arch/evbarm/gumstix/gumstix_machdep.c | 8 +-
sys/arch/evbarm/gumstix/if_sm_gxio.c | 7 +-
sys/arch/evbarm/hdl_g/btn_obio.c | 27 +-
sys/arch/evbarm/imx31/imx31lk_pcic.c | 24 +-
sys/arch/evbarm/include/autoconf.h | 5 +-
sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c | 18 +-
sys/arch/evbarm/ixm1200/ixpcom_ixm.c | 7 +-
sys/arch/evbarm/ixm1200/nappi_nppb.c | 15 +-
sys/arch/evbarm/ixm1200/nappi_nr.c | 29 +-
sys/arch/evbarm/lubbock/if_sm_obio.c | 13 +-
sys/arch/evbarm/lubbock/lubbock_lcd.c | 8 +-
sys/arch/evbarm/mini2440/if_dm_mini2440.c | 8 +-
sys/arch/evbarm/mini2440/mini2440_lcd.c | 10 +-
sys/arch/evbarm/mpcsa/mpcsa_cf.c | 14 +-
sys/arch/evbarm/mpcsa/mpcsa_leds.c | 9 +-
sys/arch/evbarm/mpcsa/mpcsa_machdep.c | 13 +-
sys/arch/evbarm/mpcsa/mpcsa_spi.c | 24 +-
sys/arch/evbarm/mpcsa/mpcsa_usart.c | 20 +-
sys/arch/evbarm/nslu2/nslu2_mainbus.c | 8 +-
sys/arch/evbarm/osk5912/if_sm_emifs.c | 20 +-
sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c | 26 +-
sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c | 12 +-
sys/arch/evbarm/stand/boot2440/s3csdi.c | 2 +-
sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c | 19 +-
sys/arch/evbarm/tsarm/epcom_ts.c | 7 +-
sys/arch/evbarm/tsarm/isa/isa_machdep.c | 6 +-
sys/arch/evbarm/tsarm/toastersensors.c | 37 ++--
sys/arch/evbarm/tsarm/tskp.c | 19 +-
sys/arch/evbarm/tsarm/tslcd.c | 21 +-
sys/arch/evbarm/tsarm/tspld.c | 71 ++++----
sys/arch/evbarm/viper/if_sm_pxaip.c | 17 +-
sys/arch/evbmips/adm5120/autoconf.c | 10 +-
sys/arch/evbmips/alchemy/autoconf.c | 8 +-
sys/arch/evbmips/gdium/autoconf.c | 8 +-
sys/arch/evbmips/loongson/autoconf.c | 8 +-
sys/arch/evbmips/loongson/autoconf.h | 3 +-
sys/arch/evbmips/loongson/dev/kb3310.c | 13 +-
sys/arch/evbmips/loongson/gdium_machdep.c | 8 +-
sys/arch/evbmips/loongson/generic2e_machdep.c | 14 +-
sys/arch/evbmips/loongson/loongson_intr.c | 8 +-
sys/arch/evbmips/loongson/yeeloong_machdep.c | 16 +-
sys/arch/evbmips/malta/autoconf.c | 8 +-
sys/arch/evbmips/malta/malta_intr.c | 10 +-
sys/arch/evbmips/malta/pci/pchb.c | 6 +-
sys/arch/evbmips/malta/pci/pcib.c | 20 +-
sys/arch/evbmips/rasoc/autoconf.c | 6 +-
sys/arch/evbmips/rmixl/autoconf.c | 6 +-
sys/arch/evbppc/virtex/dev/pstwo.c | 6 +-
sys/arch/evbsh3/ap_ms104_sh4/if_sm_mainbus.c | 7 +-
sys/arch/evbsh3/ap_ms104_sh4/shpcmcia.c | 6 +-
sys/arch/evbsh3/evbsh3/mainbus.c | 10 +-
sys/arch/hp700/hp700/autoconf.c | 9 +-
sys/arch/hpcarm/dev/sed_saip.c | 6 +-
sys/arch/hpcarm/dev/wzero3_kbd.c | 8 +-
sys/arch/hpcarm/dev/wzero3_keypad.c | 8 +-
sys/arch/hpcarm/dev/wzero3_lcd.c | 12 +-
sys/arch/hpcarm/dev/wzero3_tp.c | 6 +-
sys/arch/hpcarm/hpcarm/autoconf.c | 8 +-
sys/arch/hpcmips/dev/it8368.c | 27 +-
sys/arch/hpcmips/dev/ite8181.c | 16 +-
sys/arch/hpcmips/dev/ite8181var.h | 4 +-
sys/arch/hpcmips/dev/m38813c.c | 17 +-
sys/arch/hpcmips/dev/mq200.c | 16 +-
sys/arch/hpcmips/dev/mq200_pci.c | 23 +-
sys/arch/hpcmips/dev/mq200var.h | 4 +-
sys/arch/hpcmips/dev/optpoint.c | 57 +++---
sys/arch/hpcmips/dev/plum.c | 24 +-
sys/arch/hpcmips/dev/plumicu.c | 17 +-
sys/arch/hpcmips/dev/plumiobus.c | 25 +-
sys/arch/hpcmips/dev/plumohci.c | 12 +-
sys/arch/hpcmips/dev/plumpcmcia.c | 47 ++--
sys/arch/hpcmips/dev/plumpower.c | 17 +-
sys/arch/hpcmips/dev/plumvideo.c | 27 +-
sys/arch/hpcmips/dev/tc5165buf.c | 17 +-
sys/arch/hpcmips/dev/teliosio.c | 17 +-
sys/arch/hpcmips/dev/ucb1200.c | 35 +--
sys/arch/hpcmips/dev/ucb1200var.h | 10 +-
sys/arch/hpcmips/dev/ucbio.c | 23 +-
sys/arch/hpcmips/dev/ucbsnd.c | 47 ++--
sys/arch/hpcmips/dev/ucbtp.c | 27 +-
sys/arch/hpcmips/hpcmips/autoconf.c | 6 +-
sys/arch/hpcmips/include/isa_machdep.h | 10 +-
sys/arch/hpcmips/include/pci_machdep.h | 8 +-
sys/arch/hpcmips/isa/isa_machdep.c | 23 +-
sys/arch/hpcmips/isa/plumisa_machdep.c | 19 +-
sys/arch/hpcmips/tx/tx3912video.c | 23 +-
sys/arch/hpcmips/tx/tx39biu.c | 23 +-
sys/arch/hpcmips/tx/tx39clock.c | 15 +-
sys/arch/hpcmips/tx/tx39icu.c | 17 +-
sys/arch/hpcmips/tx/tx39io.c | 23 +-
sys/arch/hpcmips/tx/tx39iovar.h | 4 +-
sys/arch/hpcmips/tx/tx39ir.c | 19 +-
sys/arch/hpcmips/tx/tx39irvar.h | 6 +-
sys/arch/hpcmips/tx/tx39power.c | 23 +-
sys/arch/hpcmips/tx/tx39sib.c | 41 ++--
sys/arch/hpcmips/tx/tx39sibvar.h | 10 +-
sys/arch/hpcmips/tx/tx39spi.c | 25 +-
sys/arch/hpcmips/tx/tx39uart.c | 25 +-
sys/arch/hpcmips/tx/txcom.c | 25 +-
sys/arch/hpcmips/tx/txcsbus.c | 25 +-
sys/arch/hpcmips/tx/txsim.c | 25 +-
sys/arch/hpcmips/vr/bcu_vrip.c | 23 +-
sys/arch/hpcmips/vr/bcuvar.h | 4 +-
sys/arch/hpcmips/vr/cmu.c | 17 +-
sys/arch/hpcmips/vr/com_vrip.c | 6 +-
sys/arch/hpcmips/vr/flash_vrip.c | 16 +-
sys/arch/hpcmips/vr/flashvar.h | 3 +-
sys/arch/hpcmips/vr/ite8181_vrip.c | 17 +-
sys/arch/hpcmips/vr/mq200_vrip.c | 17 +-
sys/arch/hpcmips/vr/vr4102ip.c | 12 +-
sys/arch/hpcmips/vr/vr4122ip.c | 12 +-
sys/arch/hpcmips/vr/vr4181aiu.c | 19 +-
sys/arch/hpcmips/vr/vr4181giu.c | 47 ++--
sys/arch/hpcmips/vr/vr4181ip.c | 12 +-
sys/arch/hpcmips/vr/vraiu.c | 41 ++--
sys/arch/hpcmips/vr/vrc4172gpio.c | 45 ++--
sys/arch/hpcmips/vr/vrc4172pci.c | 41 ++--
sys/arch/hpcmips/vr/vrc4172pwm.c | 16 +-
sys/arch/hpcmips/vr/vrc4172pwmvar.h | 3 +-
sys/arch/hpcmips/vr/vrc4173bcu.c | 58 +++---
sys/arch/hpcmips/vr/vrdcu.c | 17 +-
sys/arch/hpcmips/vr/vrdmaau.c | 19 +-
sys/arch/hpcmips/vr/vrdsiu_mouse.c | 17 +-
sys/arch/hpcmips/vr/vrdsu.c | 17 +-
sys/arch/hpcmips/vr/vrecu.c | 15 +-
sys/arch/hpcmips/vr/vrgiu.c | 46 ++--
sys/arch/hpcmips/vr/vrip.c | 28 +-
sys/arch/hpcmips/vr/vripvar.h | 7 +-
sys/arch/hpcmips/vr/vrkiu.c | 16 +-
sys/arch/hpcmips/vr/vrkiuvar.h | 3 +-
sys/arch/hpcmips/vr/vrled.c | 16 +-
sys/arch/hpcmips/vr/vrledvar.h | 3 +-
sys/arch/hpcmips/vr/vrpciu.c | 107 ++++++------
sys/arch/hpcmips/vr/vrpiu.c | 32 ++-
sys/arch/hpcmips/vr/vrpiuvar.h | 6 +-
sys/arch/hpcmips/vr/vrpmu.c | 16 +-
sys/arch/hpcmips/vr/vrpmuvar.h | 3 +-
sys/arch/hpcsh/dev/hd64465/hd64465.c | 6 +-
sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c | 31 +--
sys/arch/hpcsh/dev/psh3pwr.c | 8 +-
sys/arch/hpcsh/hpcsh/autoconf.c | 6 +-
sys/arch/i386/pci/pcic_pci_machdep.c | 6 +-
sys/arch/ia64/ia64/ssc.c | 6 +-
sys/arch/iyonix/include/autoconf.h | 4 +-
sys/arch/iyonix/iyonix/autoconf.c | 12 +-
sys/arch/landisk/include/pci_machdep.h | 4 +-
sys/arch/landisk/landisk/autoconf.c | 22 +-
sys/arch/landisk/landisk/shpcic_machdep.c | 6 +-
sys/arch/mac68k/dev/adb.c | 6 +-
sys/arch/mac68k/dev/aed.c | 18 +-
sys/arch/mac68k/dev/aedvar.h | 4 +-
sys/arch/mac68k/dev/akbd.c | 16 +-
sys/arch/mac68k/dev/akbdvar.h | 6 +-
sys/arch/mac68k/dev/ams.c | 16 +-
sys/arch/mac68k/dev/amsvar.h | 6 +-
sys/arch/mac68k/dev/grf_subr.c | 8 +-
sys/arch/mac68k/dev/grfvar.h | 4 +-
sys/arch/mac68k/dev/if_mc.c | 32 +-
sys/arch/mac68k/dev/if_mcvar.h | 4 +-
sys/arch/mac68k/dev/mac68k5380.c | 8 +-
sys/arch/mac68k/dev/macfb.c | 16 +-
sys/arch/mac68k/dev/macfbvar.h | 4 +-
sys/arch/mac68k/dev/ncr5380.c | 28 +-
sys/arch/mac68k/dev/ncr5380reg.h | 4 +-
sys/arch/mac68k/mac68k/autoconf.c | 6 +-
sys/arch/mac68k/nubus/cpi_nubus.c | 10 +-
sys/arch/mac68k/nubus/cpi_nubusvar.h | 4 +-
sys/arch/mac68k/nubus/grf_nubus.c | 20 +-
sys/arch/mac68k/nubus/if_netdock_nubus.c | 19 +-
sys/arch/mac68k/nubus/if_sm_nubus.c | 7 +-
sys/arch/mac68k/nubus/nubus.c | 16 +-
sys/arch/mac68k/nubus/nubus.h | 4 +-
sys/arch/mac68k/obio/asc.c | 17 +-
sys/arch/mac68k/obio/ascvar.h | 4 +-
sys/arch/mac68k/obio/grf_obio.c | 19 +-
sys/arch/mac68k/obio/if_mc_obio.c | 27 +-
sys/arch/mac68k/obio/iwm_fd.c | 192 ++--------------------
sys/arch/mac68k/obio/iwm_fdvar.h | 5 +-
sys/arch/macppc/dev/abtn.c | 18 +-
sys/arch/macppc/dev/adb.c | 6 +-
sys/arch/macppc/dev/adbvar.h | 3 +-
sys/arch/macppc/dev/aed.c | 8 +-
sys/arch/macppc/dev/aedvar.h | 4 +-
sys/arch/macppc/dev/akbd.c | 6 +-
sys/arch/macppc/dev/akbdvar.h | 6 +-
sys/arch/macppc/dev/ams.c | 9 +-
sys/arch/macppc/dev/amsvar.h | 6 +-
sys/arch/macppc/dev/apm.c | 9 +-
sys/arch/macppc/dev/com_mainbus.c | 2 +
sys/arch/macppc/dev/gpio.c | 9 +-
sys/arch/macppc/dev/if_wi_obio.c | 6 +-
sys/arch/macppc/dev/nvram.c | 7 +-
sys/arch/macppc/dev/obio.c | 6 +-
sys/arch/macppc/dev/ofb.c | 18 +-
sys/arch/macppc/dev/ofcons.c | 7 +-
sys/arch/macppc/dev/pbms.c | 4 +-
sys/arch/macppc/macppc/cpu.c | 6 +-
sys/arch/macppc/pci/u3.c | 8 +-
sys/arch/mips/adm5120/adm5120_extio.c | 37 ++--
sys/arch/mips/adm5120/dev/admwdog.c | 6 +-
sys/arch/mips/adm5120/dev/ahci.c | 8 +-
sys/arch/mips/adm5120/dev/ahcivar.h | 4 +-
sys/arch/mips/adm5120/dev/if_admsw.c | 75 ++++----
sys/arch/mips/adm5120/dev/if_admswvar.h | 6 +-
sys/arch/mips/adm5120/include/adm5120_extiovar.h | 4 +-
sys/arch/mips/alchemy/dev/auaudio.c | 6 +-
sys/arch/mips/atheros/ar5312.c | 7 +-
sys/arch/mips/atheros/ar5315.c | 6 +-
sys/arch/mips/atheros/ar9344.c | 8 +-
sys/arch/mips/atheros/dev/aevar.h | 4 +-
sys/arch/mips/atheros/dev/arspi.c | 21 +-
sys/arch/mips/atheros/dev/athflash.c | 17 +-
sys/arch/mips/atheros/dev/if_ae.c | 100 ++++++-----
sys/arch/mips/ralink/ralink_gpio.c | 8 +-
sys/arch/mips/ralink/ralink_i2c.c | 8 +-
sys/arch/mips/ralink/ralink_usbhcvar.h | 6 +-
sys/arch/mips/rmi/rmixl_cpu.c | 7 +-
sys/arch/mips/rmi/rmixl_pcie.c | 8 +-
sys/arch/mips/rmi/rmixl_pcix.c | 8 +-
sys/arch/mipsco/include/isa_machdep.h | 6 +-
sys/arch/mipsco/isa/isa_machdep.c | 33 +--
sys/arch/mipsco/mipsco/autoconf.c | 6 +-
sys/arch/mipsco/mipsco/cpu.c | 6 +-
sys/arch/mipsco/obio/i82072.c | 22 +-
sys/arch/mipsco/obio/mkclock.c | 17 +-
sys/arch/mipsco/obio/rambo.c | 17 +-
sys/arch/mmeye/dev/mmeyepcmcia.c | 51 +++--
sys/arch/mmeye/mmeye/autoconf.c | 6 +-
sys/arch/mmeye/mmeye/machdep.c | 6 +-
sys/arch/mvme68k/dev/clock_pcc.c | 17 +-
sys/arch/mvme68k/dev/memc_68k.c | 17 +-
sys/arch/mvme68k/dev/pcc.c | 18 +-
sys/arch/mvme68k/dev/pcctwo_68k.c | 20 +-
sys/arch/mvme68k/dev/pccvar.h | 3 +-
sys/arch/mvme68k/dev/sbic.c | 32 +-
sys/arch/mvme68k/dev/sbicvar.h | 4 +-
sys/arch/mvme68k/dev/vme_pcc.c | 19 +-
sys/arch/mvme68k/dev/vme_two_68k.c | 17 +-
sys/arch/mvme68k/dev/wdsc.c | 26 +-
sys/arch/mvme68k/mvme68k/autoconf.c | 12 +-
sys/arch/mvme68k/mvme68k/clock.c | 10 +-
sys/arch/netwinder/include/pci_machdep.h | 6 +-
sys/arch/netwinder/netwinder/autoconf.c | 8 +-
sys/arch/netwinder/pci/pci_machdep.c | 8 +-
sys/arch/netwinder/pci/pcib.c | 6 +-
sys/arch/netwinder/pci/pciide_machdep.c | 8 +-
sys/arch/next68k/dev/esp.c | 12 +-
sys/arch/next68k/dev/if_xe.c | 98 +++++-----
sys/arch/next68k/dev/mb8795.c | 68 ++++----
sys/arch/next68k/dev/mb8795var.h | 4 +-
sys/arch/next68k/dev/nextdisplay.c | 18 +-
sys/arch/next68k/dev/nextdisplayvar.h | 4 +-
sys/arch/next68k/dev/nextdma.c | 21 +-
sys/arch/next68k/dev/nextdmavar.h | 4 +-
sys/arch/next68k/dev/nextkbd.c | 18 +-
sys/arch/next68k/dev/nextkbdvar.h | 5 +-
sys/arch/next68k/next68k/autoconf.c | 10 +-
sys/arch/powerpc/include/isa_machdep.h | 3 +-
sys/arch/prep/include/nvram.h | 4 +-
sys/arch/prep/pnpbus/if_we_pnpbus.c | 8 +-
sys/arch/prep/pnpbus/nvram_pnpbus.c | 6 +-
sys/arch/sbmips/sbmips/autoconf.c | 6 +-
sys/arch/sgimips/dev/dpclock.c | 16 +-
sys/arch/sgimips/dev/imc.c | 16 +-
sys/arch/sgimips/dev/int.c | 25 +-
sys/arch/sgimips/dev/pic.c | 17 +-
sys/arch/sgimips/dev/scn.c | 8 +-
sys/arch/sgimips/dev/scnvar.h | 3 +-
sys/arch/sgimips/dev/zs_kbd.c | 6 +-
sys/arch/sgimips/dev/zs_ms.c | 6 +-
sys/arch/sgimips/eisa/eisa_machdep.c | 6 +-
sys/arch/sgimips/gio/gio.c | 30 +--
sys/arch/sgimips/gio/grtwo.c | 20 +-
sys/arch/sgimips/gio/light.c | 20 +-
sys/arch/sgimips/gio/pci_gio.c | 19 +-
sys/arch/sgimips/hpc/hpc.c | 7 +-
sys/arch/sgimips/hpc/wdsc.c | 8 +-
sys/arch/sgimips/include/eisa_machdep.h | 4 +-
sys/arch/sgimips/include/pci_machdep.h | 4 +-
sys/arch/sgimips/ioc/ioc.c | 28 +-
sys/arch/sgimips/ioc/oioc.c | 18 +-
sys/arch/sgimips/mace/mace.c | 20 +-
sys/arch/sgimips/mace/macekbc.c | 19 +-
sys/arch/sgimips/mace/mavb.c | 34 ++-
sys/arch/sgimips/mace/pci_mace.c | 18 +-
sys/arch/sgimips/pci/pci_machdep.c | 6 +-
sys/arch/sgimips/sgimips/autoconf.c | 20 +-
sys/arch/sgimips/sgimips/machdep.c | 6 +-
sys/arch/sh3/dev/sci.c | 38 ++--
sys/arch/shark/isa/isa_shark_machdep.c | 6 +-
sys/arch/shark/ofw/com_ofisa_machdep.c | 8 +-
sys/arch/shark/ofw/igsfb_ofbus.c | 6 +-
sys/arch/shark/ofw/lpt_ofisa_machdep.c | 8 +-
sys/arch/shark/ofw/ofisa_machdep.c | 6 +-
sys/arch/shark/ofw/wdc_ofisa_machdep.c | 8 +-
sys/arch/shark/shark/autoconf.c | 12 +-
sys/arch/sparc/dev/cgfour.c | 8 +-
sys/arch/sparc/dev/cgfourteen.c | 6 +-
sys/arch/sparc/dev/cgsix_obio.c | 16 +-
sys/arch/sparc/dev/kd.c | 5 +-
sys/arch/sparc/dev/ms_pckbport.c | 12 +-
sys/arch/sparc/dev/obio.c | 17 +-
sys/arch/sparc/dev/tctrl.c | 6 +-
sys/arch/sparc/dev/ts102.c | 12 +-
sys/arch/sparc/dev/vme_machdep.c | 6 +-
sys/arch/sparc/dev/zs.c | 8 +-
sys/arch/sparc/include/autoconf.h | 13 +-
sys/arch/sparc/include/pci_machdep.h | 4 +-
sys/arch/sparc/sparc/autoconf.c | 40 ++--
sys/arch/sparc/sparc/cpu.c | 12 +-
sys/arch/sparc/sparc/pci_machdep.c | 6 +-
sys/arch/sparc64/dev/ebus_mainbus.c | 8 +-
sys/arch/sparc64/dev/kd.c | 5 +-
sys/arch/sparc64/dev/mkclock.c | 8 +-
sys/arch/sparc64/dev/pci_machdep.c | 8 +-
sys/arch/sparc64/dev/pld_wdog.c | 6 +-
sys/arch/sparc64/dev/psm.c | 8 +-
sys/arch/sparc64/dev/pyro.c | 8 +-
sys/arch/sparc64/dev/schizo.c | 8 +-
sys/arch/sparc64/dev/tda.c | 12 +-
sys/arch/sparc64/dev/zs.c | 8 +-
sys/arch/sparc64/include/autoconf.h | 8 +-
sys/arch/sparc64/include/pci_machdep.h | 6 +-
sys/arch/sparc64/sparc64/autoconf.c | 12 +-
sys/arch/sparc64/sparc64/cpu.c | 12 +-
sys/arch/sun2/dev/kd.c | 5 +-
sys/arch/sun3/dev/kd.c | 5 +-
sys/arch/vax/include/cpu.h | 3 +-
sys/arch/vax/vax/autoconf.c | 6 +-
sys/arch/vax/vsa/asc_vsbus.c | 6 +-
sys/arch/x68k/dev/grf_machdep.c | 6 +-
sys/arch/x86/include/cpu.h | 3 +-
sys/arch/x86/pci/pci_ranges.c | 6 +-
sys/arch/zaurus/dev/scoop.c | 10 +-
sys/arch/zaurus/dev/zaudio.c | 6 +-
sys/arch/zaurus/dev/zkbd.c | 6 +-
sys/arch/zaurus/dev/zrc.c | 10 +-
sys/arch/zaurus/dev/ztp.c | 6 +-
sys/dev/adb/adb_ms.c | 6 +-
sys/dev/ata/ata_raid.c | 10 +-
sys/dev/bluetooth/btkbd.c | 20 +-
sys/dev/bluetooth/btms.c | 19 +-
sys/dev/cardbus/adv_cardbus.c | 19 +-
sys/dev/cardbus/cardslot.c | 10 +-
sys/dev/clockctl.c | 8 +-
sys/dev/dec/dzkbd.c | 8 +-
sys/dev/dec/dzms.c | 7 +-
sys/dev/dec/vsxxxvar.h | 3 +-
sys/dev/dkwedge/dk.c | 9 +-
sys/dev/eisa/ahb.c | 58 +++---
sys/dev/eisa/bha_eisa.c | 17 +-
sys/dev/eisa/cac_eisa.c | 7 +-
sys/dev/eisa/depca_eisa.c | 14 +-
sys/dev/eisa/dpt_eisa.c | 12 +-
sys/dev/eisa/if_fea.c | 25 +-
sys/dev/eisa/mlx_eisa.c | 7 +-
sys/dev/eisa/uha_eisa.c | 19 +-
sys/dev/gpib/cs80bus.c | 15 +-
sys/dev/gpib/cs80busvar.h | 4 +-
sys/dev/gpib/ct.c | 48 ++--
sys/dev/gpib/gpib.c | 25 +-
sys/dev/gpib/gpibvar.h | 4 +-
sys/dev/gpib/hil_gpib.c | 9 +-
sys/dev/gpib/mt.c | 54 +++---
sys/dev/gpib/ppi.c | 14 +-
sys/dev/gpib/rd.c | 51 +++--
sys/dev/gpio/gpioiic.c | 8 +-
sys/dev/hpc/bivideo.c | 9 +-
sys/dev/hpc/btnmgr.c | 7 +-
sys/dev/hpc/button.c | 11 +-
sys/dev/hpc/hpcapm.c | 13 +-
sys/dev/hpc/hpcbatteryvar.h | 3 +-
sys/dev/hpc/hpcin.c | 7 +-
sys/dev/hpc/hpcioman.c | 17 +-
sys/dev/hpc/hpckbd.c | 8 +-
sys/dev/hpc/hpcout.c | 7 +-
sys/dev/hpc/hpf1275a_tty.c | 26 +-
sys/dev/hpc/pwctl.c | 9 +-
sys/dev/i2c/adm1021.c | 19 +-
sys/dev/i2c/lm75.c | 6 +-
sys/dev/i2o/dpti.c | 67 ++++---
sys/dev/i2o/dptivar.h | 4 +-
sys/dev/i2o/iop.c | 140 ++++++++--------
sys/dev/i2o/iopsp.c | 48 ++--
sys/dev/i2o/iopspvar.h | 4 +-
sys/dev/i2o/iopvar.h | 6 +-
sys/dev/ic/aac.c | 84 +++++-----
sys/dev/ic/aacvar.h | 6 +-
sys/dev/ic/ac97.c | 8 +-
sys/dev/ic/ac97var.h | 3 +-
sys/dev/ic/adv.c | 48 ++--
sys/dev/ic/advlib.h | 6 +-
sys/dev/ic/adw.c | 104 ++++++------
sys/dev/ic/adwlib.h | 4 +-
sys/dev/ic/aic6915.c | 56 +++---
sys/dev/ic/aic6915var.h | 4 +-
sys/dev/ic/awi.c | 32 +-
sys/dev/ic/awivar.h | 4 +-
sys/dev/ic/bha.c | 76 ++++----
sys/dev/ic/bhavar.h | 4 +-
sys/dev/ic/cac.c | 56 +++---
sys/dev/ic/cacvar.h | 6 +-
sys/dev/ic/cd18xx.c | 50 ++---
sys/dev/ic/cd18xxvar.h | 4 +-
sys/dev/ic/ciss.c | 36 ++--
sys/dev/ic/cissvar.h | 4 +-
sys/dev/ic/clmpcc.c | 12 +-
sys/dev/ic/clmpccvar.h | 4 +-
sys/dev/ic/daic.c | 54 +++---
sys/dev/ic/daicvar.h | 4 +-
sys/dev/ic/dpt.c | 76 ++++----
sys/dev/ic/dptvar.h | 4 +-
sys/dev/ic/elink3.c | 8 +-
sys/dev/ic/hd64570var.h | 4 +-
sys/dev/ic/hscx.c | 6 +-
sys/dev/ic/i82365.c | 14 +-
sys/dev/ic/i82365var.h | 4 +-
sys/dev/ic/iavc.c | 56 +++---
sys/dev/ic/iavcvar.h | 4 +-
sys/dev/ic/icp.c | 90 +++++-----
sys/dev/ic/icpsp.c | 35 ++--
sys/dev/ic/icpvar.h | 8 +-
sys/dev/ic/iic_cpcbus.c | 9 +-
sys/dev/ic/interwave.c | 10 +-
sys/dev/ic/interwavevar.h | 4 +-
sys/dev/ic/isac.c | 14 +-
sys/dev/ic/isacsx.c | 22 +-
sys/dev/ic/isic.c | 8 +-
sys/dev/ic/isic_bchan.c | 6 +-
sys/dev/ic/isic_l1.c | 14 +-
sys/dev/ic/isic_l1.h | 4 +-
sys/dev/ic/ld_aac.c | 10 +-
sys/dev/ic/ld_icp.c | 8 +-
sys/dev/ic/lemac.c | 8 +-
sys/dev/ic/lemacvar.h | 4 +-
sys/dev/ic/lsi64854.c | 6 +-
sys/dev/ic/mb86950.c | 30 +-
sys/dev/ic/mb86950var.h | 4 +-
sys/dev/ic/midwayvar.h | 4 +-
sys/dev/ic/mlx.c | 116 ++++++------
sys/dev/ic/mlxvar.h | 8 +-
sys/dev/ic/mtd803.c | 58 +++---
sys/dev/ic/mtd803var.h | 4 +-
sys/dev/ic/ne2000.c | 8 +-
sys/dev/ic/ninjascsi32var.h | 4 +-
sys/dev/ic/pdq_ifsubr.c | 12 +-
sys/dev/ic/pdqvar.h | 4 +-
sys/dev/ic/rrunner.c | 104 ++++++------
sys/dev/ic/rrunnervar.h | 4 +-
sys/dev/ic/sl811hsvar.h | 4 +-
sys/dev/ic/smc90cx6.c | 46 ++--
sys/dev/ic/smc90cx6var.h | 4 +-
sys/dev/ic/smc91cxx.c | 32 +-
sys/dev/ic/smc91cxxvar.h | 4 +-
sys/dev/ic/spdmem.c | 6 +-
sys/dev/ic/tcic2.c | 46 ++--
sys/dev/ic/tcic2var.h | 5 +-
sys/dev/ic/timer_cpcbus.c | 9 +-
sys/dev/ic/tms320av110.c | 8 +-
sys/dev/ic/tms320av110var.h | 4 +-
sys/dev/ic/tpmvar.h | 4 +-
sys/dev/ic/tropic.c | 80 ++++----
sys/dev/ic/tropicvar.h | 4 +-
sys/dev/ic/uha.c | 38 ++--
sys/dev/ic/uhavar.h | 4 +-
sys/dev/ic/upc.c | 10 +-
sys/dev/ic/upcvar.h | 4 +-
sys/dev/if_ndis/if_ndis.c | 7 +-
sys/dev/if_ndis/if_ndis_pci.c | 6 +-
sys/dev/if_ndis/if_ndisvar.h | 10 +-
sys/dev/isa/addcom_isa.c | 13 +-
sys/dev/isa/adv_isa.c | 17 +-
sys/dev/isa/aria.c | 13 +-
sys/dev/isa/ast.c | 9 +-
sys/dev/isa/aztech.c | 16 +-
sys/dev/isa/bha_isa.c | 19 +-
sys/dev/isa/boca.c | 15 +-
sys/dev/isa/cec.c | 19 +-
sys/dev/isa/daic_isa.c | 19 +-
sys/dev/isa/depca_isa.c | 10 +-
sys/dev/isa/dpt_isa.c | 9 +-
sys/dev/isa/ega.c | 9 +-
sys/dev/isa/gus.c | 40 ++--
sys/dev/isa/i82365_isa.c | 8 +-
sys/dev/isa/i82365_isasubr.c | 12 +-
sys/dev/isa/if_eg.c | 42 ++--
sys/dev/isa/if_el.c | 24 +-
sys/dev/isa/if_iy.c | 70 ++++----
sys/dev/isa/if_lc_isa.c | 26 +-
sys/dev/isa/if_ntwoc_isa.c | 33 ++-
sys/dev/isa/if_sm_isa.c | 11 +-
sys/dev/isa/if_tr_isa.c | 11 +-
sys/dev/isa/ioat66.c | 15 +-
sys/dev/isa/isic_isa.c | 15 +-
sys/dev/isa/isic_isa_itk_ix1.c | 8 +-
sys/dev/isa/isic_isa_tel_s0163.c | 6 +-
sys/dev/isa/mcd.c | 62 +++---
sys/dev/isa/moxa_isa.c | 11 +-
sys/dev/isa/nca_isa.c | 5 +-
sys/dev/isa/pcdisplay.c | 11 +-
sys/dev/isa/radiotrack.c | 14 +-
sys/dev/isa/radiotrack2.c | 12 +-
sys/dev/isa/rtfps.c | 15 +-
sys/dev/isa/satlink.c | 21 +-
sys/dev/isa/seagate.c | 62 +++---
sys/dev/isa/sf16fmr2.c | 12 +-
sys/dev/isa/smscvar.h | 4 +-
sys/dev/isa/tcic2_isa.c | 22 +-
sys/dev/isa/toasterlcd.c | 18 +-
sys/dev/isa/tsdio.c | 12 +-
sys/dev/isa/tsdiovar.h | 3 +-
sys/dev/isa/uha_isa.c | 23 +-
sys/dev/isa/wds.c | 70 ++++----
sys/dev/isa/wt.c | 22 +-
sys/dev/isapnp/gus_isapnp.c | 19 +-
sys/dev/isapnp/i82365_isapnp.c | 8 +-
sys/dev/isapnp/if_tr_isapnp.c | 11 +-
sys/dev/isapnp/isic_isapnp.c | 14 +-
sys/dev/isapnp/isic_isapnp_dynalink.c | 12 +-
sys/dev/isapnp/isic_isapnp_sws.c | 10 +-
sys/dev/ld.c | 6 +-
sys/dev/marvell/pchb.c | 10 +-
sys/dev/mca/ed_mca.c | 30 +-
sys/dev/mca/edc_mca.c | 68 ++++---
sys/dev/mca/edvar.h | 4 +-
sys/dev/mca/if_tr_mca.c | 15 +-
sys/dev/mca/if_tra_mca.c | 18 +-
sys/dev/mca/mcavar.h | 3 +-
sys/dev/mscp/mscp.c | 14 +-
sys/dev/mscp/mscp_disk.c | 40 ++--
sys/dev/mscp/mscp_subr.c | 39 ++--
sys/dev/mscp/mscp_tape.c | 23 +-
sys/dev/mscp/mscpvar.h | 6 +-
sys/dev/mvme/clmpcc_pcctwo.c | 11 +-
sys/dev/mvme/clock_pcctwo.c | 7 +-
sys/dev/mvme/memc.c | 14 +-
sys/dev/mvme/memcvar.h | 4 +-
sys/dev/mvme/mvmebus.c | 26 +-
sys/dev/mvme/mvmebus.h | 4 +-
sys/dev/mvme/pcctwo.c | 6 +-
sys/dev/mvme/pcctwovar.h | 4 +-
sys/dev/mvme/vme_two_isr.c | 6 +-
sys/dev/ofisa/com_ofisa.c | 8 +-
sys/dev/ofisa/lpt_ofisa.c | 8 +-
sys/dev/ofw/ofnet.c | 6 +-
sys/dev/pci/aac_pci.c | 9 +-
sys/dev/pci/adv_pci.c | 17 +-
sys/dev/pci/adw_pci.c | 20 +-
sys/dev/pci/amdpm.c | 30 +-
sys/dev/pci/amdpm_smbus.c | 6 +-
sys/dev/pci/amdpmvar.h | 4 +-
sys/dev/pci/atppc_puc.c | 14 +-
sys/dev/pci/auacer.c | 29 +-
sys/dev/pci/auixp.c | 67 ++++---
sys/dev/pci/auixpvar.h | 4 +-
sys/dev/pci/bha_pci.c | 16 +-
sys/dev/pci/bktr/bktr_core.c | 6 +-
sys/dev/pci/bktr/bktr_os.c | 15 +-
sys/dev/pci/bktr/bktr_reg.h | 4 +-
sys/dev/pci/btvmei.c | 19 +-
sys/dev/pci/btvmeii.c | 7 +-
sys/dev/pci/btvmeivar.h | 4 +-
sys/dev/pci/cac_pci.c | 9 +-
sys/dev/pci/ciss_pci.c | 14 +-
sys/dev/pci/cmpci.c | 23 +-
sys/dev/pci/cmpcivar.h | 6 +-
sys/dev/pci/cs4280.c | 51 +++--
sys/dev/pci/cs4281.c | 49 ++--
sys/dev/pci/cs428x.c | 18 +-
sys/dev/pci/cs428x.h | 4 +-
sys/dev/pci/cxdtv.c | 14 +-
sys/dev/pci/cxgb/cxgb_adapter.h | 2 -
sys/dev/pci/cxgb/cxgb_main.c | 18 +-
sys/dev/pci/cz.c | 57 +++---
sys/dev/pci/dpt_pci.c | 9 +-
sys/dev/pci/esavar.h | 4 +-
sys/dev/pci/eso.c | 63 +++---
sys/dev/pci/esovar.h | 4 +-
sys/dev/pci/fms.c | 29 +-
sys/dev/pci/fmsvar.h | 4 +-
sys/dev/pci/gtp.c | 12 +-
sys/dev/pci/hifn7751.c | 67 ++++---
sys/dev/pci/hifn7751var.h | 4 +-
sys/dev/pci/i82365_pci.c | 8 +-
sys/dev/pci/iavc_pci.c | 41 ++--
sys/dev/pci/icp_pci.c | 7 +-
sys/dev/pci/if_de.c | 41 ++--
sys/dev/pci/if_devar.h | 8 +-
sys/dev/pci/if_dge.c | 163 +++++++++---------
sys/dev/pci/if_esh_pci.c | 13 +-
sys/dev/pci/if_fpa.c | 11 +-
sys/dev/pci/if_ipw.c | 111 ++++++------
sys/dev/pci/if_ipwvar.h | 4 +-
sys/dev/pci/if_kse.c | 57 +++---
sys/dev/pci/if_lmc.c | 22 +-
sys/dev/pci/if_lmc.h | 13 +-
sys/dev/pci/if_mtd_pci.c | 15 +-
sys/dev/pci/if_ntwoc_pci.c | 34 ++--
sys/dev/pci/if_sf_pci.c | 17 +-
sys/dev/pci/if_ste.c | 70 ++++----
sys/dev/pci/if_ti.c | 103 ++++++------
sys/dev/pci/if_tireg.h | 4 +-
sys/dev/pci/if_txp.c | 19 +-
sys/dev/pci/if_txpreg.h | 6 +-
sys/dev/pci/if_xge.c | 20 +-
sys/dev/pci/ifpci.c | 28 +-
sys/dev/pci/ifpci2.c | 28 +-
sys/dev/pci/iop_pci.c | 13 +-
sys/dev/pci/isic_pci.c | 31 ++-
sys/dev/pci/isic_pci_elsa_qs1p.c | 10 +-
sys/dev/pci/iteide.c | 6 +-
sys/dev/pci/iwic_bchan.c | 18 +-
sys/dev/pci/iwic_dchan.c | 10 +-
sys/dev/pci/iwic_pci.c | 17 +-
sys/dev/pci/iwicvar.h | 4 +-
sys/dev/pci/ixgbe/ixv.h | 4 +-
sys/dev/pci/machfb.c | 6 +-
sys/dev/pci/mlx_pci.c | 7 +-
sys/dev/pci/mly.c | 95 +++++-----
sys/dev/pci/mlyvar.h | 4 +-
sys/dev/pci/n8/n8_memory_bsd.c | 10 +-
sys/dev/pci/n8/nsp.c | 13 +-
sys/dev/pci/n8/nsp.h | 2 +-
sys/dev/pci/neo.c | 28 +-
sys/dev/pci/oboe.c | 19 +-
sys/dev/pci/pci_subr.c | 6 +-
sys/dev/pci/satalink.c | 8 +-
sys/dev/pci/sv.c | 24 +-
sys/dev/pci/svvar.h | 3 +-
sys/dev/pci/twavar.h | 4 +-
sys/dev/pci/twe.c | 124 +++++++-------
sys/dev/pci/twevar.h | 4 +-
sys/dev/pci/ubsec.c | 51 +++--
sys/dev/pci/ubsecvar.h | 4 +-
sys/dev/pcmcia/if_an_pcmcia.c | 10 +-
sys/dev/pcmcia/if_awi_pcmcia.c | 7 +-
sys/dev/pcmcia/if_cnw.c | 46 ++--
sys/dev/pcmcia/if_cs_pcmcia.c | 13 +-
sys/dev/pcmcia/if_ray.c | 135 ++++++++--------
sys/dev/pcmcia/if_sm_pcmcia.c | 11 +-
sys/dev/pcmcia/if_tr_pcmcia.c | 12 +-
sys/dev/pcmcia/isic_pcmcia.c | 23 +-
sys/dev/pcmcia/mhzc.c | 11 +-
sys/dev/pcmcia/pcmcom.c | 8 +-
sys/dev/podulebus/hcsc.c | 6 +-
sys/dev/podulebus/oak.c | 6 +-
sys/dev/ppbus/ppbus_conf.c | 18 +-
sys/dev/qbus/dl.c | 17 +-
sys/dev/qbus/if_dmc.c | 49 ++--
sys/dev/qbus/if_il.c | 41 ++--
sys/dev/qbus/qd.c | 14 +-
sys/dev/qbus/rf.c | 10 +-
sys/dev/sbus/magma.c | 28 +-
sys/dev/sbus/magmareg.h | 7 +-
sys/dev/sbus/p9100.c | 8 +-
sys/dev/sbus/stp4020.c | 6 +-
sys/dev/scsipi/ch.c | 29 +-
sys/dev/scsipi/if_se.c | 32 ++-
sys/dev/scsipi/ses.c | 18 +-
sys/dev/sdmmc/sbt.c | 6 +-
sys/dev/sequencervar.h | 4 +-
sys/dev/tc/ascvar.h | 8 +-
sys/dev/tc/if_fta.c | 27 +-
sys/dev/tc/px.c | 8 +-
sys/dev/tc/sticvar.h | 4 +-
sys/dev/usb/if_otus.c | 6 +-
sys/dev/usb/uark.c | 20 +-
sys/dev/usb/utoppy.c | 6 +-
sys/dev/vme/vme.c | 29 +--
sys/dev/vme/vmevar.h | 4 +-
sys/dev/vme/xd.c | 99 ++++++-----
sys/dev/vme/xdvar.h | 6 +-
sys/dev/vme/xy.c | 91 +++++-----
sys/dev/vme/xyvar.h | 6 +-
sys/kern/init_sysctl.c | 6 +-
sys/kern/kern_drvctl.c | 10 +-
sys/kern/kern_hook.c | 6 +-
sys/kern/subr_autoconf.c | 8 +-
sys/kern/subr_disk_open.c | 6 +-
sys/kern/subr_tftproot.c | 13 +-
sys/kern/vfs_mount.c | 6 +-
sys/net/if_tap.c | 13 +-
sys/netisdn/i4b_ctl.c | 10 +-
sys/netisdn/i4b_debug.h | 4 +-
sys/netisdn/i4b_i4bdrv.c | 10 +-
sys/netisdn/i4b_rbch.c | 10 +-
sys/netisdn/i4b_tel.c | 10 +-
sys/rump/dev/lib/libscsitest/scsitest.c | 12 +-
sys/rump/dev/lib/libugenhc/ugenhc.c | 12 +-
sys/rump/librump/rumpdev/autoconf.c | 18 +-
sys/rump/librump/rumpdev/rump_dev.c | 8 +-
sys/rump/librump/rumpkern/emul.c | 8 +-
sys/sys/conf.h | 6 +-
sys/sys/device.h | 17 +-
935 files changed, 8108 insertions(+), 8384 deletions(-)
diffs (truncated from 63567 to 300 lines):
diff -r 88089d633b8a -r c232b2254fed sys/arch/acorn26/acorn26/fpu.c
--- a/sys/arch/acorn26/acorn26/fpu.c Sat Oct 27 16:50:13 2012 +0000
+++ b/sys/arch/acorn26/acorn26/fpu.c Sat Oct 27 17:17:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.13 2011/06/03 07:08:48 matt Exp $ */
+/* $NetBSD: fpu.c,v 1.14 2012/10/27 17:17:22 chs Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -32,7 +32,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.13 2011/06/03 07:08:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.14 2012/10/27 17:17:22 chs Exp $");
#include <sys/device.h>
#include <sys/proc.h>
@@ -50,7 +50,7 @@
static void fpu_attach(device_t, device_t, void *);
static register_t fpu_identify(void);
-CFATTACH_DECL(fpu, sizeof(struct fpu_softc),
+CFATTACH_DECL_NEW(fpu, sizeof(struct fpu_softc),
fpu_match, fpu_attach, NULL, NULL);
struct fpu_softc *the_fpu;
@@ -65,8 +65,8 @@
static void
fpu_attach(device_t parent, device_t self, void *aux)
{
+ struct fpu_softc *sc = device_private(self);
int supported;
- struct fpu_softc *sc = device_private(self);
the_fpu = sc;
printf(": ");
diff -r 88089d633b8a -r c232b2254fed sys/arch/acorn26/acorn26/fpuvar.h
--- a/sys/arch/acorn26/acorn26/fpuvar.h Sat Oct 27 16:50:13 2012 +0000
+++ b/sys/arch/acorn26/acorn26/fpuvar.h Sat Oct 27 17:17:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fpuvar.h,v 1.3 2011/01/14 02:06:22 rmind Exp $ */
+/* $NetBSD: fpuvar.h,v 1.4 2012/10/27 17:17:22 chs Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -36,7 +36,6 @@
struct proc;
struct fpu_softc {
- struct device sc_dev;
register_t sc_fputype;
void (*sc_ctxload)(struct fpframe *);
void (*sc_ctxsave)(struct fpframe *);
diff -r 88089d633b8a -r c232b2254fed sys/arch/acorn26/iobus/upc_iobus.c
--- a/sys/arch/acorn26/iobus/upc_iobus.c Sat Oct 27 16:50:13 2012 +0000
+++ b/sys/arch/acorn26/iobus/upc_iobus.c Sat Oct 27 17:17:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: upc_iobus.c,v 1.9 2009/01/06 23:51:34 bjh21 Exp $ */
+/* $NetBSD: upc_iobus.c,v 1.10 2012/10/27 17:17:22 chs Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: upc_iobus.c,v 1.9 2009/01/06 23:51:34 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: upc_iobus.c,v 1.10 2012/10/27 17:17:22 chs Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -60,7 +60,7 @@
struct evcnt sc_intrcntp;
};
-CFATTACH_DECL(upc_iobus, sizeof(struct upc_iobus_softc),
+CFATTACH_DECL_NEW(upc_iobus, sizeof(struct upc_iobus_softc),
upc_iobus_match, upc_iobus_attach, NULL, NULL);
static device_t the_upc_iobus;
@@ -88,6 +88,7 @@
struct upc_iobus_softc *sc = device_private(self);
struct upc_softc *upc = &sc->sc_upc;
+ upc->sc_dev = self;
upc->sc_iot = ioa->ioa_tag;
bus_space_map(ioa->ioa_tag, ioa->ioa_base, UPC_BUS_SIZE, 0,
&upc->sc_ioh);
diff -r 88089d633b8a -r c232b2254fed sys/arch/acorn26/ioc/ioeb.c
--- a/sys/arch/acorn26/ioc/ioeb.c Sat Oct 27 16:50:13 2012 +0000
+++ b/sys/arch/acorn26/ioc/ioeb.c Sat Oct 27 17:17:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ioeb.c,v 1.7 2011/07/19 16:05:11 dyoung Exp $ */
+/* $NetBSD: ioeb.c,v 1.8 2012/10/27 17:17:22 chs Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
@@ -29,7 +29,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: ioeb.c,v 1.7 2011/07/19 16:05:11 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioeb.c,v 1.8 2012/10/27 17:17:22 chs Exp $");
#include <sys/device.h>
#include <sys/systm.h>
@@ -40,7 +40,6 @@
#include <arch/acorn26/ioc/ioebvar.h>
struct ioeb_softc {
- struct device sc_dev;
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
};
@@ -48,7 +47,7 @@
static int ioeb_match(device_t, cfdata_t, void *);
static void ioeb_attach(device_t, device_t, void *);
-CFATTACH_DECL(ioeb, sizeof(struct ioeb_softc),
+CFATTACH_DECL_NEW(ioeb, sizeof(struct ioeb_softc),
ioeb_match, ioeb_attach, NULL, NULL);
device_t the_ioeb;
diff -r 88089d633b8a -r c232b2254fed sys/arch/acorn26/ioc/ssn.c
--- a/sys/arch/acorn26/ioc/ssn.c Sat Oct 27 16:50:13 2012 +0000
+++ b/sys/arch/acorn26/ioc/ssn.c Sat Oct 27 17:17:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ssn.c,v 1.11 2012/05/11 15:39:18 skrll Exp $ */
+/* $NetBSD: ssn.c,v 1.12 2012/10/27 17:17:23 chs Exp $ */
/*-
* Copyright (c) 2002 Ben Harris
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ssn.c,v 1.11 2012/05/11 15:39:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ssn.c,v 1.12 2012/10/27 17:17:23 chs Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -41,7 +41,6 @@
#include <dev/ic/ds.h>
struct ssn_softc {
- struct device sc_dev;
struct ds_handle sc_dsh;
device_t sc_ioc;
int sc_timebase;
@@ -50,7 +49,7 @@
static int ssn_match(device_t, cfdata_t, void *);
static void ssn_attach(device_t, device_t, void *);
-CFATTACH_DECL(ssn, sizeof(struct ssn_softc),
+CFATTACH_DECL_NEW(ssn, sizeof(struct ssn_softc),
ssn_match, ssn_attach, NULL, NULL);
static int ds_ioc_read_bit(void *);
diff -r 88089d633b8a -r c232b2254fed sys/arch/acorn32/eb7500atx/rsbus.c
--- a/sys/arch/acorn32/eb7500atx/rsbus.c Sat Oct 27 16:50:13 2012 +0000
+++ b/sys/arch/acorn32/eb7500atx/rsbus.c Sat Oct 27 17:17:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus.c,v 1.9 2011/07/19 15:59:52 dyoung Exp $ */
+/* $NetBSD: rsbus.c,v 1.10 2012/10/27 17:17:23 chs Exp $ */
/*
* Copyright (c) 2002
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.9 2011/07/19 15:59:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsbus.c,v 1.10 2012/10/27 17:17:23 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@
static int rsbus_search(device_t, cfdata_t,
const int *, void *);
-CFATTACH_DECL(rsbus, sizeof(struct rsbus_softc),
+CFATTACH_DECL_NEW(rsbus, sizeof(struct rsbus_softc),
rsbus_match, rsbus_attach, NULL, NULL);
static int
diff -r 88089d633b8a -r c232b2254fed sys/arch/acorn32/eb7500atx/rsbus.h
--- a/sys/arch/acorn32/eb7500atx/rsbus.h Sat Oct 27 16:50:13 2012 +0000
+++ b/sys/arch/acorn32/eb7500atx/rsbus.h Sat Oct 27 17:17:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rsbus.h,v 1.3 2011/07/19 15:59:52 dyoung Exp $ */
+/* $NetBSD: rsbus.h,v 1.4 2012/10/27 17:17:23 chs Exp $ */
#ifndef _RSBUS_H_
#define _RSBUS_H_
@@ -9,7 +9,6 @@
#include <sys/bus.h>
struct rsbus_softc {
- struct device sc_dev;
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
};
diff -r 88089d633b8a -r c232b2254fed sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c Sat Oct 27 16:50:13 2012 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c Sat Oct 27 17:17:22 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.51 2011/07/19 15:59:53 dyoung Exp $ */
+/* $NetBSD: fd.c,v 1.52 2012/10/27 17:17:23 chs Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.51 2011/07/19 15:59:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.52 2012/10/27 17:17:23 chs Exp $");
#include "opt_ddb.h"
@@ -152,7 +152,7 @@
/* software state, per controller */
struct fdc_softc {
- struct device sc_dev; /* boilerplate */
+ device_t sc_dev; /* boilerplate */
void *sc_ih;
bus_space_tag_t sc_iot; /* ISA i/o space identifier */
@@ -178,7 +178,7 @@
int fdprint(void *, const char *);
void fdcattach(device_t, device_t, void *);
-CFATTACH_DECL(fdc, sizeof(struct fdc_softc),
+CFATTACH_DECL_NEW(fdc, sizeof(struct fdc_softc),
fdcprobe, fdcattach, NULL, NULL);
/*
@@ -216,7 +216,7 @@
/* software state, per disk (with up to 4 disks per ctlr) */
struct fd_softc {
- struct device sc_dev;
+ device_t sc_dev;
struct disk sc_dk;
struct fd_type *sc_deftype; /* default type descriptor */
@@ -255,7 +255,7 @@
extern char floppy_read_fiq[], floppy_read_fiq_end[];
extern char floppy_write_fiq[], floppy_write_fiq_end[];
-CFATTACH_DECL(fd, sizeof(struct fd_softc),
+CFATTACH_DECL_NEW(fd, sizeof(struct fd_softc),
fdprobe, fdattach, NULL, NULL);
extern struct cfdriver fd_cd;
@@ -376,6 +376,7 @@
if (bus_space_map(iot, pa->pa_iobase + pa->pa_offset, FDC_NPORT, 0, &ioh))
panic("fdcattach: couldn't map I/O ports");
+ fdc->sc_dev = self;
fdc->sc_iot = iot;
fdc->sc_ioh = ioh;
@@ -398,7 +399,7 @@
* The NVRAM info only tells us about the first two disks on the
* `primary' floppy controller.
*/
- if (device_unit(&fdc->sc_dev) == 0)
+ if (device_unit(fdc->sc_dev) == 0)
type = mc146818_read(NULL, NVRAM_DISKETTE); /* XXX softc */
else
type = -1;
@@ -408,7 +409,7 @@
/* physical limit: four drives per controller. */
for (fa.fa_drive = 0; fa.fa_drive < 4; fa.fa_drive++) {
if (type >= 0 && fa.fa_drive < 2)
- fa.fa_deftype = fd_nvtotype(device_xname(&fdc->sc_dev),
+ fa.fa_deftype = fd_nvtotype(device_xname(fdc->sc_dev),
type, fa.fa_drive);
else
fa.fa_deftype = NULL; /* unknown */
@@ -480,6 +481,8 @@
struct fd_type *type = fa->fa_deftype;
int drive = fa->fa_drive;
+ fd->sc_dev = self;
+
callout_init(&fd->sc_motoron_ch, 0);
callout_init(&fd->sc_motoroff_ch, 0);
@@ -500,7 +503,7 @@
/*
* Initialize and attach the disk structure.
*/
- disk_init(&fd->sc_dk, device_xname(&fd->sc_dev), &fddkdriver);
+ disk_init(&fd->sc_dk, device_xname(fd->sc_dev), &fddkdriver);
disk_attach(&fd->sc_dk);
Home |
Main Index |
Thread Index |
Old Index