summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2005-12-11 12:16:03 +0000
committerchristos <christos@NetBSD.org>2005-12-11 12:16:03 +0000
commit95e1ffb15694e54f29f8baaa4232152b703c2a5a (patch)
treed6510e195bc06092a8057e34c6442eba4e77d09a /sys/dev
parent4f17ba81bcaf3f5086d88a346cbfd12506a5e3e6 (diff)
merge ktrace-lwp.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/Makefile2
-rw-r--r--sys/dev/acpi/Makefile.acpidevs2
-rw-r--r--sys/dev/acpi/acpi.c4
-rw-r--r--sys/dev/acpi/acpi_acad.c4
-rw-r--r--sys/dev/acpi/acpi_bat.c4
-rw-r--r--sys/dev/acpi/acpi_button.c4
-rw-r--r--sys/dev/acpi/acpi_ec.c4
-rw-r--r--sys/dev/acpi/acpi_ecreg.h2
-rw-r--r--sys/dev/acpi/acpi_lid.c4
-rw-r--r--sys/dev/acpi/acpi_madt.c4
-rw-r--r--sys/dev/acpi/acpi_madt.h2
-rw-r--r--sys/dev/acpi/acpi_powerres.c4
-rw-r--r--sys/dev/acpi/acpi_quirks.c4
-rw-r--r--sys/dev/acpi/acpi_resource.c4
-rw-r--r--sys/dev/acpi/acpi_tz.c4
-rw-r--r--sys/dev/acpi/acpica/Osd/OsdEnvironment.c4
-rw-r--r--sys/dev/acpi/acpica/Osd/OsdHardware.c4
-rw-r--r--sys/dev/acpi/acpica/Osd/OsdInterrupt.c4
-rw-r--r--sys/dev/acpi/acpica/Osd/OsdMemory.c4
-rw-r--r--sys/dev/acpi/acpica/Osd/OsdMisc.c4
-rw-r--r--sys/dev/acpi/acpica/Osd/OsdSchedule.c6
-rw-r--r--sys/dev/acpi/acpica/Osd/OsdSynch.c4
-rw-r--r--sys/dev/acpi/acpica/Subsystem/acnetbsd.h2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dbcmds.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dbdisply.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dbexec.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dbfileio.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dbhistry.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dbinput.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dbstats.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dbutils.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dbxface.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dmbuffer.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dmnames.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dmobject.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dmopcode.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dmresrc.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dmresrcl.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dmresrcs.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dmutils.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dmwalk.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dsfield.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dsinit.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dsmethod.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dsmthdat.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dsobject.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dsopcode.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dsutils.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dswexec.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dswload.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dswscope.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/dswstate.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/evevent.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/evgpe.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/evgpeblk.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/evmisc.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/evregion.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/evrgnini.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/evsci.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/evxface.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/evxfevnt.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/evxfregn.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exconfig.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exconvrt.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/excreate.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exdump.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exfield.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exfldio.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exmisc.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exmutex.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exnames.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exoparg1.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exoparg2.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exoparg3.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exoparg6.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exprep.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exregion.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exresnte.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exresolv.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exresop.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exstore.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exstoren.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exstorob.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exsystem.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/exutils.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/hwacpi.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/hwgpe.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/hwregs.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/hwsleep.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/hwtimer.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsaccess.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsalloc.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsdump.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsdumpdv.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nseval.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsinit.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsload.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsnames.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsobject.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsparse.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nssearch.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsutils.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nswalk.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsxfeval.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsxfname.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/nsxfobj.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/psargs.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/psopcode.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/psparse.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/psscope.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/pstree.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/psutils.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/pswalk.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/psxface.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/rsaddr.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/rscalc.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/rscreate.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/rsdump.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/rsio.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/rsirq.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/rslist.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/rsmemory.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/rsmisc.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/rsutils.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/rsxface.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/tbconvrt.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/tbget.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/tbgetall.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/tbinstal.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/tbrsdt.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/tbutils.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/tbxface.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/tbxfroot.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/utalloc.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/utcopy.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/utdebug.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/utdelete.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/uteval.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/utglobal.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/utinit.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/utmath.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/utmisc.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/utobject.c2
-rw-r--r--sys/dev/acpi/acpica/Subsystem/utxface.c2
-rw-r--r--sys/dev/acpi/acpica/files.acpica2
-rw-r--r--sys/dev/acpi/acpireg.h2
-rw-r--r--sys/dev/acpi/acpivar.h2
-rw-r--r--sys/dev/acpi/atppc_acpi.c4
-rw-r--r--sys/dev/acpi/attimer_acpi.c4
-rw-r--r--sys/dev/acpi/com_acpi.c4
-rw-r--r--sys/dev/acpi/devlist2h.awk2
-rw-r--r--sys/dev/acpi/fdc_acpi.c4
-rw-r--r--sys/dev/acpi/files.acpi2
-rw-r--r--sys/dev/acpi/joy_acpi.c4
-rw-r--r--sys/dev/acpi/lpt_acpi.c4
-rw-r--r--sys/dev/acpi/mpu_acpi.c4
-rw-r--r--sys/dev/acpi/pckbc_acpi.c4
-rw-r--r--sys/dev/acpi/pcppi_acpi.c4
-rw-r--r--sys/dev/acpi/wss_acpi.c4
-rw-r--r--sys/dev/apm/apmbios.h2
-rw-r--r--sys/dev/apm/apmio.h2
-rw-r--r--sys/dev/arcbios/arcbios.c4
-rw-r--r--sys/dev/arcbios/arcbios.h2
-rw-r--r--sys/dev/arcbios/arcbios_tty.c20
-rw-r--r--sys/dev/arcbios/arcbiosvar.h2
-rw-r--r--sys/dev/ata/Makefile2
-rw-r--r--sys/dev/ata/ata.c10
-rw-r--r--sys/dev/ata/ata_raid.c4
-rw-r--r--sys/dev/ata/ata_raid_adaptec.c4
-rw-r--r--sys/dev/ata/ata_raid_promise.c4
-rw-r--r--sys/dev/ata/ata_raidreg.h2
-rw-r--r--sys/dev/ata/ata_raidvar.h2
-rw-r--r--sys/dev/ata/ata_wdc.c4
-rw-r--r--sys/dev/ata/atareg.h2
-rw-r--r--sys/dev/ata/atavar.h2
-rw-r--r--sys/dev/ata/files.ata2
-rw-r--r--sys/dev/ata/ld_ataraid.c6
-rw-r--r--sys/dev/ata/sata_subr.c2
-rw-r--r--sys/dev/ata/satapmpreg.h2
-rw-r--r--sys/dev/ata/satareg.h2
-rw-r--r--sys/dev/ata/satavar.h2
-rw-r--r--sys/dev/ata/wd.c18
-rw-r--r--sys/dev/ata/wdvar.h2
-rw-r--r--sys/dev/auconv.c4
-rw-r--r--sys/dev/auconv.h2
-rw-r--r--sys/dev/audio.c77
-rw-r--r--sys/dev/audio_if.h4
-rw-r--r--sys/dev/audiobell.c6
-rw-r--r--sys/dev/audiobellvar.h2
-rw-r--r--sys/dev/audiovar.h2
-rw-r--r--sys/dev/aurateconv.c4
-rw-r--r--sys/dev/bi/bi.c4
-rw-r--r--sys/dev/bi/bireg.h2
-rw-r--r--sys/dev/bi/bivar.h2
-rw-r--r--sys/dev/bi/if_ni.c4
-rw-r--r--sys/dev/bi/if_nireg.h2
-rw-r--r--sys/dev/bi/kdb.c4
-rw-r--r--sys/dev/bi/kdbreg.h2
-rw-r--r--sys/dev/bi/uba_bi.c4
-rw-r--r--sys/dev/bluetooth/bluetooth.c4
-rw-r--r--sys/dev/bluetooth/bluetooth.h2
-rw-r--r--sys/dev/bluetooth/bthci.c4
-rw-r--r--sys/dev/bluetooth/files.bluetooth2
-rw-r--r--sys/dev/cardbus/adv_cardbus.c4
-rw-r--r--sys/dev/cardbus/ahc_cardbus.c4
-rw-r--r--sys/dev/cardbus/cardbus.c4
-rw-r--r--sys/dev/cardbus/cardbus_exrom.c4
-rw-r--r--sys/dev/cardbus/cardbus_exrom.h2
-rw-r--r--sys/dev/cardbus/cardbus_map.c4
-rw-r--r--sys/dev/cardbus/cardbusvar.h2
-rw-r--r--sys/dev/cardbus/cardslot.c4
-rw-r--r--sys/dev/cardbus/cardslotvar.h2
-rw-r--r--sys/dev/cardbus/com_cardbus.c4
-rw-r--r--sys/dev/cardbus/ehci_cardbus.c4
-rw-r--r--sys/dev/cardbus/files.cardbus2
-rw-r--r--sys/dev/cardbus/fwohci_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_ath_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_atw_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_ex_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_fxp_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_ral_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_re_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_rtk_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_rtw_cardbus.c4
-rw-r--r--sys/dev/cardbus/if_tlp_cardbus.c4
-rw-r--r--sys/dev/cardbus/njs_cardbus.c4
-rw-r--r--sys/dev/cardbus/ohci_cardbus.c4
-rw-r--r--sys/dev/cardbus/rbus.c4
-rw-r--r--sys/dev/cardbus/rbus.h2
-rw-r--r--sys/dev/cardbus/rbus_ppb.c4
-rw-r--r--sys/dev/cardbus/uhci_cardbus.c4
-rw-r--r--sys/dev/cardbus/usb_cardbus.h2
-rw-r--r--sys/dev/ccd.c52
-rw-r--r--sys/dev/ccdvar.h2
-rw-r--r--sys/dev/cgd.c46
-rw-r--r--sys/dev/cgd_crypto.c4
-rw-r--r--sys/dev/cgd_crypto.h2
-rw-r--r--sys/dev/cgdvar.h2
-rw-r--r--sys/dev/clock_subr.c4
-rw-r--r--sys/dev/clock_subr.h2
-rw-r--r--sys/dev/clockctl.c14
-rw-r--r--sys/dev/cninit.c4
-rw-r--r--sys/dev/cons.c22
-rw-r--r--sys/dev/cons.h2
-rw-r--r--sys/dev/dec/clockvar.h2
-rw-r--r--sys/dev/dec/dec_boot.h2
-rw-r--r--sys/dev/dec/dz.c21
-rw-r--r--sys/dev/dec/dzkbd.c10
-rw-r--r--sys/dev/dec/dzms.c10
-rw-r--r--sys/dev/dec/dzreg.h2
-rw-r--r--sys/dev/dec/dzvar.h2
-rw-r--r--sys/dev/dec/if_le_dec.c4
-rw-r--r--sys/dev/dec/lk201.h2
-rw-r--r--sys/dev/dec/lk201_ws.c4
-rw-r--r--sys/dev/dec/lk201reg.h2
-rw-r--r--sys/dev/dec/lk201var.h2
-rw-r--r--sys/dev/dec/mcclock.c4
-rw-r--r--sys/dev/dec/mcclock_pad32.c4
-rw-r--r--sys/dev/dec/mcclockvar.h2
-rw-r--r--sys/dev/dec/vsxxx.c4
-rw-r--r--sys/dev/dec/vsxxxvar.h2
-rw-r--r--sys/dev/dksubr.c30
-rw-r--r--sys/dev/dkvar.h14
-rw-r--r--sys/dev/dkwedge/dk.c24
-rw-r--r--sys/dev/dkwedge/dkwedge_bsdlabel.c4
-rw-r--r--sys/dev/dkwedge/dkwedge_gpt.c4
-rw-r--r--sys/dev/dkwedge/dkwedge_mbr.c4
-rw-r--r--sys/dev/dmover/dmover_io.c21
-rw-r--r--sys/dev/dmover/dmover_io.h2
-rw-r--r--sys/dev/dmover/dmover_session.c4
-rw-r--r--sys/dev/dmover/dmover_util.c4
-rw-r--r--sys/dev/dmover/dmovervar.h2
-rw-r--r--sys/dev/dmover/swdmover.c4
-rw-r--r--sys/dev/ebus/cs4231_ebus.c4
-rw-r--r--sys/dev/ebus/ebusreg.h2
-rw-r--r--sys/dev/ebus/ebusvar.h2
-rw-r--r--sys/dev/eisa/ahb.c4
-rw-r--r--sys/dev/eisa/ahbreg.h2
-rw-r--r--sys/dev/eisa/ahc_eisa.c4
-rw-r--r--sys/dev/eisa/bha_eisa.c4
-rw-r--r--sys/dev/eisa/cac_eisa.c4
-rw-r--r--sys/dev/eisa/depca_eisa.c4
-rw-r--r--sys/dev/eisa/devlist2h.awk2
-rw-r--r--sys/dev/eisa/dpt_eisa.c4
-rw-r--r--sys/dev/eisa/eisa.c4
-rw-r--r--sys/dev/eisa/eisabusprint.c3
-rw-r--r--sys/dev/eisa/eisadevs2
-rw-r--r--sys/dev/eisa/eisadevs.h2
-rw-r--r--sys/dev/eisa/eisadevs_data.h2
-rw-r--r--sys/dev/eisa/eisareg.h2
-rw-r--r--sys/dev/eisa/eisavar.h2
-rw-r--r--sys/dev/eisa/files.eisa2
-rw-r--r--sys/dev/eisa/if_ep_eisa.c4
-rw-r--r--sys/dev/eisa/if_fea.c4
-rw-r--r--sys/dev/eisa/if_tlp_eisa.c4
-rw-r--r--sys/dev/eisa/mlx_eisa.c4
-rw-r--r--sys/dev/eisa/uha_eisa.c4
-rw-r--r--sys/dev/fss.c57
-rw-r--r--sys/dev/fssvar.h2
-rw-r--r--sys/dev/gpib/cs80bus.c4
-rw-r--r--sys/dev/gpib/cs80busvar.h2
-rw-r--r--sys/dev/gpib/ct.c4
-rw-r--r--sys/dev/gpib/ctreg.h2
-rw-r--r--sys/dev/gpib/gpib.c4
-rw-r--r--sys/dev/gpib/gpibio.h2
-rw-r--r--sys/dev/gpib/gpibvar.h2
-rw-r--r--sys/dev/gpib/hil_gpib.c4
-rw-r--r--sys/dev/gpib/mt.c4
-rw-r--r--sys/dev/gpib/mtreg.h2
-rw-r--r--sys/dev/gpib/ppi.c4
-rw-r--r--sys/dev/gpib/ppiio.h2
-rw-r--r--sys/dev/gpib/rd.c4
-rw-r--r--sys/dev/gpib/rdreg.h2
-rw-r--r--sys/dev/gpio/files.gpio2
-rw-r--r--sys/dev/gpio/gpio.c10
-rw-r--r--sys/dev/gpio/gpiovar.h2
-rw-r--r--sys/dev/hpc/apm/apmdev.c18
-rw-r--r--sys/dev/hpc/apm/apmvar.h2
-rw-r--r--sys/dev/hpc/apm/files.apm2
-rw-r--r--sys/dev/hpc/bicons.c4
-rw-r--r--sys/dev/hpc/biconsdev.c20
-rw-r--r--sys/dev/hpc/bivideo.c8
-rw-r--r--sys/dev/hpc/btnmgr.c14
-rw-r--r--sys/dev/hpc/button.c4
-rw-r--r--sys/dev/hpc/files.hpcio2
-rw-r--r--sys/dev/hpc/files.hpckbd2
-rw-r--r--sys/dev/hpc/files.hpctp2
-rw-r--r--sys/dev/hpc/hpcapm.c4
-rw-r--r--sys/dev/hpc/hpcbatterytable.h2
-rw-r--r--sys/dev/hpc/hpcbatteryvar.h2
-rw-r--r--sys/dev/hpc/hpccmap_gen.c4
-rw-r--r--sys/dev/hpc/hpcfb.c12
-rw-r--r--sys/dev/hpc/hpcfbvar.h4
-rw-r--r--sys/dev/hpc/hpcioman.c4
-rw-r--r--sys/dev/hpc/hpciovar.h2
-rw-r--r--sys/dev/hpc/hpckbd.c8
-rw-r--r--sys/dev/hpc/hpckbdkeymap.h2
-rw-r--r--sys/dev/hpc/hpcout.c4
-rw-r--r--sys/dev/hpc/hpctpanel.c8
-rw-r--r--sys/dev/hpc/hpctpanelvar.h4
-rw-r--r--sys/dev/hpc/pckbd_encode.c4
-rw-r--r--sys/dev/hpc/pwctl.c4
-rw-r--r--sys/dev/hpc/video_subr.c4
-rw-r--r--sys/dev/hpc/video_subr.h2
-rw-r--r--sys/dev/i2c/adm1030.c4
-rw-r--r--sys/dev/i2c/adm1030var.h4
-rw-r--r--sys/dev/i2c/adt7467.c4
-rw-r--r--sys/dev/i2c/adt7467var.h4
-rw-r--r--sys/dev/i2c/at24cxx.c2
-rw-r--r--sys/dev/i2c/at24cxxvar.h2
-rw-r--r--sys/dev/i2c/ds1307.c2
-rw-r--r--sys/dev/i2c/ds1307reg.h2
-rw-r--r--sys/dev/i2c/files.i2c2
-rw-r--r--sys/dev/i2c/i2c.c2
-rw-r--r--sys/dev/i2c/i2c_bitbang.c2
-rw-r--r--sys/dev/i2c/i2c_bitbang.h2
-rw-r--r--sys/dev/i2c/i2c_exec.c2
-rw-r--r--sys/dev/i2c/i2c_io.h2
-rw-r--r--sys/dev/i2c/i2cvar.h2
-rw-r--r--sys/dev/i2c/lm75.c2
-rw-r--r--sys/dev/i2c/lm75reg.h2
-rw-r--r--sys/dev/i2c/m41st84.c2
-rw-r--r--sys/dev/i2c/m41st84reg.h2
-rw-r--r--sys/dev/i2c/m41t00.c6
-rw-r--r--sys/dev/i2c/m41t00reg.h2
-rw-r--r--sys/dev/i2c/max6900.c2
-rw-r--r--sys/dev/i2c/max6900reg.h2
-rw-r--r--sys/dev/i2c/pcf8583.c6
-rw-r--r--sys/dev/i2c/pcf8583reg.h2
-rw-r--r--sys/dev/i2c/pcf8583var.h2
-rw-r--r--sys/dev/i2c/rs5c372.c2
-rw-r--r--sys/dev/i2c/rs5c372reg.h2
-rw-r--r--sys/dev/i2c/x1226.c8
-rw-r--r--sys/dev/i2c/x1226reg.h2
-rw-r--r--sys/dev/i2o/dpti.c12
-rw-r--r--sys/dev/i2o/dptivar.h2
-rw-r--r--sys/dev/i2o/i2o.h2
-rw-r--r--sys/dev/i2o/i2odpt.h2
-rw-r--r--sys/dev/i2o/iop.c12
-rw-r--r--sys/dev/i2o/iopl.c4
-rw-r--r--sys/dev/i2o/ioplvar.h2
-rw-r--r--sys/dev/i2o/iopsp.c4
-rw-r--r--sys/dev/i2o/iopvar.h2
-rw-r--r--sys/dev/i2o/ld_iop.c4
-rw-r--r--sys/dev/ic/Makefile2
-rw-r--r--sys/dev/ic/aac_tables.h2
-rw-r--r--sys/dev/ic/aacreg.h2
-rw-r--r--sys/dev/ic/aacvar.h2
-rw-r--r--sys/dev/ic/ac97.c4
-rw-r--r--sys/dev/ic/ac97reg.h2
-rw-r--r--sys/dev/ic/ac97var.h2
-rw-r--r--sys/dev/ic/ad1848.c4
-rw-r--r--sys/dev/ic/ad1848var.h2
-rw-r--r--sys/dev/ic/adv.c4
-rw-r--r--sys/dev/ic/adv.h2
-rw-r--r--sys/dev/ic/advlib.c4
-rw-r--r--sys/dev/ic/advlib.h2
-rw-r--r--sys/dev/ic/advmcode.c4
-rw-r--r--sys/dev/ic/advmcode.h2
-rw-r--r--sys/dev/ic/adw.c4
-rw-r--r--sys/dev/ic/adw.h2
-rw-r--r--sys/dev/ic/adwlib.c4
-rw-r--r--sys/dev/ic/adwlib.h2
-rw-r--r--sys/dev/ic/adwmcode.c4
-rw-r--r--sys/dev/ic/adwmcode.h2
-rw-r--r--sys/dev/ic/aha.c4
-rw-r--r--sys/dev/ic/ahareg.h2
-rw-r--r--sys/dev/ic/ahavar.h2
-rw-r--r--sys/dev/ic/aic6360.c4
-rw-r--r--sys/dev/ic/aic6360reg.h2
-rw-r--r--sys/dev/ic/aic6360var.h2
-rw-r--r--sys/dev/ic/aic6915.c4
-rw-r--r--sys/dev/ic/aic6915reg.h2
-rw-r--r--sys/dev/ic/aic77xx.c4
-rw-r--r--sys/dev/ic/aic77xxvar.h2
-rw-r--r--sys/dev/ic/aic79xx_inline.h2
-rw-r--r--sys/dev/ic/aic79xx_osm.h6
-rw-r--r--sys/dev/ic/aic7xxx_osm.h2
-rw-r--r--sys/dev/ic/aic7xxx_seeprom.c6
-rw-r--r--sys/dev/ic/al2210reg.h2
-rw-r--r--sys/dev/ic/am7930.c4
-rw-r--r--sys/dev/ic/am7930reg.h2
-rw-r--r--sys/dev/ic/am7930var.h2
-rw-r--r--sys/dev/ic/am7990.c4
-rw-r--r--sys/dev/ic/am79900.c4
-rw-r--r--sys/dev/ic/am79900reg.h2
-rw-r--r--sys/dev/ic/am79900var.h2
-rw-r--r--sys/dev/ic/am7990reg.h2
-rw-r--r--sys/dev/ic/am7990var.h2
-rw-r--r--sys/dev/ic/am79c930.c4
-rw-r--r--sys/dev/ic/am79c930reg.h2
-rw-r--r--sys/dev/ic/am79c930var.h2
-rw-r--r--sys/dev/ic/am9513reg.h2
-rw-r--r--sys/dev/ic/an.c4
-rw-r--r--sys/dev/ic/anreg.h2
-rw-r--r--sys/dev/ic/anvar.h2
-rw-r--r--sys/dev/ic/apcdmareg.h2
-rw-r--r--sys/dev/ic/atppc.c4
-rw-r--r--sys/dev/ic/atppcreg.h2
-rw-r--r--sys/dev/ic/atppcvar.h2
-rw-r--r--sys/dev/ic/attimer.c4
-rw-r--r--sys/dev/ic/attimervar.h2
-rw-r--r--sys/dev/ic/atwreg.h2
-rw-r--r--sys/dev/ic/atwvar.h2
-rw-r--r--sys/dev/ic/awi.c4
-rw-r--r--sys/dev/ic/awireg.h2
-rw-r--r--sys/dev/ic/awivar.h2
-rw-r--r--sys/dev/ic/ax88190.c4
-rw-r--r--sys/dev/ic/ax88190reg.h2
-rw-r--r--sys/dev/ic/bha.c4
-rw-r--r--sys/dev/ic/bhareg.h2
-rw-r--r--sys/dev/ic/bhavar.h2
-rw-r--r--sys/dev/ic/bt431reg.h2
-rw-r--r--sys/dev/ic/bt459reg.h2
-rw-r--r--sys/dev/ic/bt463.c4
-rw-r--r--sys/dev/ic/bt463var.h2
-rw-r--r--sys/dev/ic/bt485.c4
-rw-r--r--sys/dev/ic/bt485reg.h2
-rw-r--r--sys/dev/ic/bt485var.h2
-rw-r--r--sys/dev/ic/cac.c4
-rw-r--r--sys/dev/ic/cacreg.h2
-rw-r--r--sys/dev/ic/cacvar.h2
-rw-r--r--sys/dev/ic/cd1190reg.h2
-rw-r--r--sys/dev/ic/cd1400reg.h2
-rw-r--r--sys/dev/ic/cd18xx.c4
-rw-r--r--sys/dev/ic/cd18xxreg.h2
-rw-r--r--sys/dev/ic/clmpcc.c30
-rw-r--r--sys/dev/ic/clmpccvar.h2
-rw-r--r--sys/dev/ic/com.c21
-rw-r--r--sys/dev/ic/com_cpcbus.c4
-rw-r--r--sys/dev/ic/com_upc.c4
-rw-r--r--sys/dev/ic/comreg.h2
-rw-r--r--sys/dev/ic/comvar.h2
-rw-r--r--sys/dev/ic/cpc700.c4
-rw-r--r--sys/dev/ic/cpc700reg.h2
-rw-r--r--sys/dev/ic/cpc700uic.h2
-rw-r--r--sys/dev/ic/cs4215reg.h2
-rw-r--r--sys/dev/ic/cs4215var.h2
-rw-r--r--sys/dev/ic/cs4231.c4
-rw-r--r--sys/dev/ic/cs4231reg.h2
-rw-r--r--sys/dev/ic/cs4231var.h2
-rw-r--r--sys/dev/ic/cs4237reg.h2
-rw-r--r--sys/dev/ic/cs89x0.c4
-rw-r--r--sys/dev/ic/cs89x0reg.h2
-rw-r--r--sys/dev/ic/cs89x0var.h2
-rw-r--r--sys/dev/ic/cy.c25
-rw-r--r--sys/dev/ic/cyreg.h2
-rw-r--r--sys/dev/ic/daic.c2
-rw-r--r--sys/dev/ic/daicreg.h2
-rw-r--r--sys/dev/ic/daicvar.h2
-rw-r--r--sys/dev/ic/dc21040reg.h2
-rw-r--r--sys/dev/ic/depca.c4
-rw-r--r--sys/dev/ic/depcareg.h2
-rw-r--r--sys/dev/ic/depcavar.h2
-rw-r--r--sys/dev/ic/dp8390.c4
-rw-r--r--sys/dev/ic/dp83905.c4
-rw-r--r--sys/dev/ic/dp83905var.h2
-rw-r--r--sys/dev/ic/dp8390reg.h2
-rw-r--r--sys/dev/ic/dp8390var.h2
-rw-r--r--sys/dev/ic/dp83932.c4
-rw-r--r--sys/dev/ic/dp83932reg.h2
-rw-r--r--sys/dev/ic/dpt.c16
-rw-r--r--sys/dev/ic/dptreg.h2
-rw-r--r--sys/dev/ic/dptvar.h2
-rw-r--r--sys/dev/ic/ds.h2
-rw-r--r--sys/dev/ic/ds1286reg.h2
-rw-r--r--sys/dev/ic/ds1687reg.h2
-rw-r--r--sys/dev/ic/elink3.c4
-rw-r--r--sys/dev/ic/elink3reg.h2
-rw-r--r--sys/dev/ic/elink3var.h2
-rw-r--r--sys/dev/ic/elinkxl.c4
-rw-r--r--sys/dev/ic/elinkxlvar.h2
-rw-r--r--sys/dev/ic/fmv.c4
-rw-r--r--sys/dev/ic/fmvvar.h2
-rw-r--r--sys/dev/ic/gem.c4
-rw-r--r--sys/dev/ic/gemreg.h2
-rw-r--r--sys/dev/ic/gemvar.h2
-rw-r--r--sys/dev/ic/hd44780_subr.c10
-rw-r--r--sys/dev/ic/hd44780reg.h2
-rw-r--r--sys/dev/ic/hd44780var.h2
-rw-r--r--sys/dev/ic/hd64570.c4
-rw-r--r--sys/dev/ic/hd64570reg.h2
-rw-r--r--sys/dev/ic/hd64570var.h2
-rw-r--r--sys/dev/ic/hme.c4
-rw-r--r--sys/dev/ic/hmereg.h2
-rw-r--r--sys/dev/ic/hmevar.h2
-rw-r--r--sys/dev/ic/hscx.c4
-rw-r--r--sys/dev/ic/hscx.h2
-rw-r--r--sys/dev/ic/i82365.c4
-rw-r--r--sys/dev/ic/i82365reg.h2
-rw-r--r--sys/dev/ic/i82365var.h2
-rw-r--r--sys/dev/ic/i8237reg.h2
-rw-r--r--sys/dev/ic/i8253reg.h2
-rw-r--r--sys/dev/ic/i82557.c4
-rw-r--r--sys/dev/ic/i82557reg.h2
-rw-r--r--sys/dev/ic/i82557var.h2
-rw-r--r--sys/dev/ic/i82586.c4
-rw-r--r--sys/dev/ic/i82586reg.h2
-rw-r--r--sys/dev/ic/i82586var.h2
-rw-r--r--sys/dev/ic/i82595reg.h2
-rw-r--r--sys/dev/ic/i82596.c4
-rw-r--r--sys/dev/ic/i82596reg.h2
-rw-r--r--sys/dev/ic/i82596var.h2
-rw-r--r--sys/dev/ic/i82801lpcreg.h2
-rw-r--r--sys/dev/ic/iavc.c4
-rw-r--r--sys/dev/ic/iavcreg.h2
-rw-r--r--sys/dev/ic/iavcvar.h2
-rw-r--r--sys/dev/ic/ibm561.c4
-rw-r--r--sys/dev/ic/ibm561var.h2
-rw-r--r--sys/dev/ic/icp.c4
-rw-r--r--sys/dev/ic/icp_ioctl.c8
-rw-r--r--sys/dev/ic/icp_ioctl.h2
-rw-r--r--sys/dev/ic/icpreg.h2
-rw-r--r--sys/dev/ic/icpsp.c4
-rw-r--r--sys/dev/ic/icpvar.h2
-rw-r--r--sys/dev/ic/ics2101reg.h2
-rw-r--r--sys/dev/ic/igsfb.c10
-rw-r--r--sys/dev/ic/igsfb_subr.c4
-rw-r--r--sys/dev/ic/igsfbreg.h2
-rw-r--r--sys/dev/ic/igsfbvar.h2
-rw-r--r--sys/dev/ic/iha.c4
-rw-r--r--sys/dev/ic/ihareg.h2
-rw-r--r--sys/dev/ic/ihavar.h2
-rw-r--r--sys/dev/ic/iic_cpcbus.c4
-rw-r--r--sys/dev/ic/ims332reg.h2
-rw-r--r--sys/dev/ic/intersil7170.c4
-rw-r--r--sys/dev/ic/interwave.c4
-rw-r--r--sys/dev/ic/interwavereg.h2
-rw-r--r--sys/dev/ic/interwavevar.h2
-rw-r--r--sys/dev/ic/ipac.h2
-rw-r--r--sys/dev/ic/isac.c4
-rw-r--r--sys/dev/ic/isac.h2
-rw-r--r--sys/dev/ic/isacsx.c6
-rw-r--r--sys/dev/ic/isacsx.h2
-rw-r--r--sys/dev/ic/isic.c4
-rw-r--r--sys/dev/ic/isic_bchan.c4
-rw-r--r--sys/dev/ic/isic_l1.c4
-rw-r--r--sys/dev/ic/isic_l1.h2
-rw-r--r--sys/dev/ic/isic_l1fsm.c4
-rw-r--r--sys/dev/ic/isp.c4
-rw-r--r--sys/dev/ic/isp_inline.h2
-rw-r--r--sys/dev/ic/isp_ioctl.h2
-rw-r--r--sys/dev/ic/isp_netbsd.c4
-rw-r--r--sys/dev/ic/isp_netbsd.h2
-rw-r--r--sys/dev/ic/isp_target.c4
-rw-r--r--sys/dev/ic/isp_target.h2
-rw-r--r--sys/dev/ic/isp_tpublic.h2
-rw-r--r--sys/dev/ic/ispmbox.h2
-rw-r--r--sys/dev/ic/ispreg.h2
-rw-r--r--sys/dev/ic/ispvar.h2
-rw-r--r--sys/dev/ic/joy.c16
-rw-r--r--sys/dev/ic/joyvar.h2
-rw-r--r--sys/dev/ic/lance.c4
-rw-r--r--sys/dev/ic/lancereg.h2
-rw-r--r--sys/dev/ic/lancevar.h2
-rw-r--r--sys/dev/ic/lcdkp_subr.c4
-rw-r--r--sys/dev/ic/ld_aac.c4
-rw-r--r--sys/dev/ic/ld_cac.c4
-rw-r--r--sys/dev/ic/ld_icp.c4
-rw-r--r--sys/dev/ic/ld_mlx.c4
-rw-r--r--sys/dev/ic/lemac.c4
-rw-r--r--sys/dev/ic/lemacreg.h2
-rw-r--r--sys/dev/ic/lemacvar.h2
-rw-r--r--sys/dev/ic/lm700x.c4
-rw-r--r--sys/dev/ic/lpt.c16
-rw-r--r--sys/dev/ic/lpt_upc.c4
-rw-r--r--sys/dev/ic/lptreg.h2
-rw-r--r--sys/dev/ic/lptvar.h2
-rw-r--r--sys/dev/ic/lsi64854.c4
-rw-r--r--sys/dev/ic/lsi64854var.h2
-rw-r--r--sys/dev/ic/matrixkp_subr.c2
-rw-r--r--sys/dev/ic/max2820reg.h2
-rw-r--r--sys/dev/ic/mb86950.c4
-rw-r--r--sys/dev/ic/mb86950reg.h2
-rw-r--r--sys/dev/ic/mb86950var.h2
-rw-r--r--sys/dev/ic/mb86960.c4
-rw-r--r--sys/dev/ic/mb86960reg.h2
-rw-r--r--sys/dev/ic/mb86960var.h2
-rw-r--r--sys/dev/ic/mb89352.c4
-rw-r--r--sys/dev/ic/mb89352reg.h2
-rw-r--r--sys/dev/ic/mb89352var.h2
-rw-r--r--sys/dev/ic/mc146818.c4
-rw-r--r--sys/dev/ic/mc146818reg.h2
-rw-r--r--sys/dev/ic/mc146818var.h2
-rw-r--r--sys/dev/ic/mc68450reg.h2
-rw-r--r--sys/dev/ic/mc6845reg.h2
-rw-r--r--sys/dev/ic/midway.c4
-rw-r--r--sys/dev/ic/midwayreg.h2
-rw-r--r--sys/dev/ic/midwayvar.h2
-rw-r--r--sys/dev/ic/mk48txx.c4
-rw-r--r--sys/dev/ic/mk48txxreg.h2
-rw-r--r--sys/dev/ic/mk48txxvar.h2
-rw-r--r--sys/dev/ic/mlx.c10
-rw-r--r--sys/dev/ic/mlxreg.h2
-rw-r--r--sys/dev/ic/mlxvar.h2
-rw-r--r--sys/dev/ic/mm58167.c4
-rw-r--r--sys/dev/ic/mm58167var.h2
-rw-r--r--sys/dev/ic/mpt.c4
-rw-r--r--sys/dev/ic/mpt.h2
-rw-r--r--sys/dev/ic/mpt_debug.c4
-rw-r--r--sys/dev/ic/mpt_netbsd.c4
-rw-r--r--sys/dev/ic/mpt_netbsd.h2
-rw-r--r--sys/dev/ic/mpu.c4
-rw-r--r--sys/dev/ic/mpuvar.h2
-rw-r--r--sys/dev/ic/msm6258.c4
-rw-r--r--sys/dev/ic/msm6258var.h2
-rw-r--r--sys/dev/ic/mtd803.c4
-rw-r--r--sys/dev/ic/mtd803var.h2
-rw-r--r--sys/dev/ic/mx98905.c4
-rw-r--r--sys/dev/ic/ncr5380.doc2
-rw-r--r--sys/dev/ic/ncr5380reg.h2
-rw-r--r--sys/dev/ic/ncr5380sbc.c4
-rw-r--r--sys/dev/ic/ncr5380var.h2
-rw-r--r--sys/dev/ic/ncr53c9x.c4
-rw-r--r--sys/dev/ic/ncr53c9xreg.h2
-rw-r--r--sys/dev/ic/ncr53c9xvar.h2
-rw-r--r--sys/dev/ic/ne2000.c4
-rw-r--r--sys/dev/ic/ne2000var.h2
-rw-r--r--sys/dev/ic/nec7210reg.h2
-rw-r--r--sys/dev/ic/nec765reg.h2
-rw-r--r--sys/dev/ic/ninjascsi32.c4
-rw-r--r--sys/dev/ic/ninjascsi32reg.h2
-rw-r--r--sys/dev/ic/ninjascsi32var.h2
-rw-r--r--sys/dev/ic/ns16450reg.h2
-rw-r--r--sys/dev/ic/ns16550reg.h2
-rw-r--r--sys/dev/ic/nslm7x.c4
-rw-r--r--sys/dev/ic/nslm7xvar.h2
-rw-r--r--sys/dev/ic/oosiop.c4
-rw-r--r--sys/dev/ic/oosiopreg.h2
-rw-r--r--sys/dev/ic/oosiopvar.h2
-rw-r--r--sys/dev/ic/opl.c4
-rw-r--r--sys/dev/ic/opl3sa3reg.h2
-rw-r--r--sys/dev/ic/oplinstrs.c4
-rw-r--r--sys/dev/ic/oplreg.h2
-rw-r--r--sys/dev/ic/oplvar.h2
-rw-r--r--sys/dev/ic/osiop.c4
-rw-r--r--sys/dev/ic/osiopreg.h2
-rw-r--r--sys/dev/ic/osiopvar.h2
-rw-r--r--sys/dev/ic/pcdisplay_chars.c4
-rw-r--r--sys/dev/ic/pcdisplay_subr.c4
-rw-r--r--sys/dev/ic/pcdisplayvar.h2
-rw-r--r--sys/dev/ic/pckbc.c4
-rw-r--r--sys/dev/ic/pckbcvar.h2
-rw-r--r--sys/dev/ic/pdq.c4
-rw-r--r--sys/dev/ic/pdq_ifsubr.c4
-rw-r--r--sys/dev/ic/pdqreg.h2
-rw-r--r--sys/dev/ic/pdqvar.h2
-rw-r--r--sys/dev/ic/ralreg.h2
-rw-r--r--sys/dev/ic/ralvar.h2
-rw-r--r--sys/dev/ic/ramdac.h2
-rw-r--r--sys/dev/ic/rf3000reg.h2
-rw-r--r--sys/dev/ic/rrunner.c23
-rw-r--r--sys/dev/ic/rrunnerreg.h2
-rw-r--r--sys/dev/ic/rrunnervar.h2
-rw-r--r--sys/dev/ic/rtl80x9.c4
-rw-r--r--sys/dev/ic/rtl80x9reg.h2
-rw-r--r--sys/dev/ic/rtl80x9var.h2
-rw-r--r--sys/dev/ic/rtl8169.c2
-rw-r--r--sys/dev/ic/rtl8169var.h2
-rw-r--r--sys/dev/ic/rtl81x9reg.h2
-rw-r--r--sys/dev/ic/rtl81x9var.h2
-rw-r--r--sys/dev/ic/rtwphy.c4
-rw-r--r--sys/dev/ic/rtwphy.h2
-rw-r--r--sys/dev/ic/rtwphyio.c4
-rw-r--r--sys/dev/ic/rtwphyio.h2
-rw-r--r--sys/dev/ic/sa2400reg.h2
-rw-r--r--sys/dev/ic/seeq8005.c4
-rw-r--r--sys/dev/ic/sgec.c4
-rw-r--r--sys/dev/ic/sgecreg.h2
-rw-r--r--sys/dev/ic/sgecvar.h2
-rw-r--r--sys/dev/ic/si4136reg.h2
-rw-r--r--sys/dev/ic/siopreg.h2
-rw-r--r--sys/dev/ic/sl811hs.c4
-rw-r--r--sys/dev/ic/smc83c170.c4
-rw-r--r--sys/dev/ic/smc83c170reg.h2
-rw-r--r--sys/dev/ic/smc83c170var.h2
-rw-r--r--sys/dev/ic/smc90cx6.c4
-rw-r--r--sys/dev/ic/smc90cx6reg.h2
-rw-r--r--sys/dev/ic/smc90cx6var.h2
-rw-r--r--sys/dev/ic/smc91cxx.c4
-rw-r--r--sys/dev/ic/smc91cxxvar.h2
-rw-r--r--sys/dev/ic/smc93cx6.c4
-rw-r--r--sys/dev/ic/smc93cx6var.h2
-rw-r--r--sys/dev/ic/st16650reg.h2
-rw-r--r--sys/dev/ic/sti.c8
-rw-r--r--sys/dev/ic/stireg.h2
-rw-r--r--sys/dev/ic/stivar.h2
-rw-r--r--sys/dev/ic/sunscpal.c4
-rw-r--r--sys/dev/ic/sunscpalvar.h2
-rw-r--r--sys/dev/ic/tcic2.c4
-rw-r--r--sys/dev/ic/tcic2reg.h2
-rw-r--r--sys/dev/ic/tcic2var.h2
-rw-r--r--sys/dev/ic/tea5757.c4
-rw-r--r--sys/dev/ic/timer_cpcbus.c4
-rw-r--r--sys/dev/ic/tms320av110.c4
-rw-r--r--sys/dev/ic/tms320av110var.h2
-rw-r--r--sys/dev/ic/tropic.c4
-rw-r--r--sys/dev/ic/tropicreg.h2
-rw-r--r--sys/dev/ic/tropicvar.h2
-rw-r--r--sys/dev/ic/tulip.c4
-rw-r--r--sys/dev/ic/tulipreg.h2
-rw-r--r--sys/dev/ic/tulipvar.h2
-rw-r--r--sys/dev/ic/uha.c4
-rw-r--r--sys/dev/ic/uhareg.h2
-rw-r--r--sys/dev/ic/uhavar.h2
-rw-r--r--sys/dev/ic/upc.c4
-rw-r--r--sys/dev/ic/upcvar.h2
-rw-r--r--sys/dev/ic/vga.c10
-rw-r--r--sys/dev/ic/vga_common.c4
-rw-r--r--sys/dev/ic/vga_raster.c4
-rw-r--r--sys/dev/ic/vga_subr.c4
-rw-r--r--sys/dev/ic/vgareg.h2
-rw-r--r--sys/dev/ic/vgavar.h4
-rw-r--r--sys/dev/ic/videomode.h2
-rw-r--r--sys/dev/ic/wdc_upc.c4
-rw-r--r--sys/dev/ic/wdcreg.h2
-rw-r--r--sys/dev/ic/wdcvar.h2
-rw-r--r--sys/dev/ic/we.c4
-rw-r--r--sys/dev/ic/wevar.h2
-rw-r--r--sys/dev/ic/wi_ieee.h2
-rw-r--r--sys/dev/ic/wireg.h2
-rw-r--r--sys/dev/ic/z8530reg.h2
-rw-r--r--sys/dev/ic/z8530sc.c4
-rw-r--r--sys/dev/ic/z8530sc.h2
-rw-r--r--sys/dev/ic/z8530tty.c29
-rw-r--r--sys/dev/ieee1394/Makefile2
-rw-r--r--sys/dev/ieee1394/files.ieee13942
-rw-r--r--sys/dev/ieee1394/firewire.c4
-rw-r--r--sys/dev/ieee1394/firewire.h2
-rw-r--r--sys/dev/ieee1394/firewire_phy.h2
-rw-r--r--sys/dev/ieee1394/firewirereg.h2
-rw-r--r--sys/dev/ieee1394/fw_port.h8
-rw-r--r--sys/dev/ieee1394/fwcrom.c2
-rw-r--r--sys/dev/ieee1394/fwdev.c2
-rw-r--r--sys/dev/ieee1394/fwdma.c2
-rw-r--r--sys/dev/ieee1394/fwdma.h2
-rw-r--r--sys/dev/ieee1394/fwmem.c2
-rw-r--r--sys/dev/ieee1394/fwmem.h2
-rw-r--r--sys/dev/ieee1394/fwohci.c6
-rw-r--r--sys/dev/ieee1394/fwohcireg.h3
-rw-r--r--sys/dev/ieee1394/fwohcivar.h3
-rw-r--r--sys/dev/ieee1394/fwphyreg.h2
-rw-r--r--sys/dev/ieee1394/iec13213.h2
-rw-r--r--sys/dev/ieee1394/iec68113.h2
-rw-r--r--sys/dev/ieee1394/if_fwip.c2
-rw-r--r--sys/dev/ieee1394/if_fwipvar.h2
-rw-r--r--sys/dev/ieee1394/sbp.c2
-rw-r--r--sys/dev/ieee1394/sbp.h2
-rw-r--r--sys/dev/ir/cir.c4
-rw-r--r--sys/dev/ir/cirvar.h2
-rw-r--r--sys/dev/ir/ir.c4
-rw-r--r--sys/dev/ir/ir.h2
-rw-r--r--sys/dev/ir/irframe.c18
-rw-r--r--sys/dev/ir/irframe_tty.c28
-rw-r--r--sys/dev/ir/irframevar.h8
-rw-r--r--sys/dev/ir/sir.c4
-rw-r--r--sys/dev/ir/sir.h2
-rw-r--r--sys/dev/isa/README.seagate2
-rw-r--r--sys/dev/isa/ad1848_isa.c4
-rw-r--r--sys/dev/isa/ad1848var.h2
-rw-r--r--sys/dev/isa/addcom_isa.c4
-rw-r--r--sys/dev/isa/adv_isa.c4
-rw-r--r--sys/dev/isa/aha_isa.c4
-rw-r--r--sys/dev/isa/aic_isa.c4
-rw-r--r--sys/dev/isa/aria.c4
-rw-r--r--sys/dev/isa/ariareg.h2
-rw-r--r--sys/dev/isa/ast.c4
-rw-r--r--sys/dev/isa/atppc_isa.c4
-rw-r--r--sys/dev/isa/atppc_isadma.c4
-rw-r--r--sys/dev/isa/atppc_isadma.h2
-rw-r--r--sys/dev/isa/attimer_isa.c4
-rw-r--r--sys/dev/isa/aztech.c4
-rw-r--r--sys/dev/isa/bha_isa.c4
-rw-r--r--sys/dev/isa/boca.c4
-rw-r--r--sys/dev/isa/cec.c4
-rw-r--r--sys/dev/isa/cms.c4
-rw-r--r--sys/dev/isa/cmsreg.h2
-rw-r--r--sys/dev/isa/com_isa.c4
-rw-r--r--sys/dev/isa/com_multi.c4
-rw-r--r--sys/dev/isa/com_multi.h2
-rw-r--r--sys/dev/isa/commultiprint.c2
-rw-r--r--sys/dev/isa/cs4231var.h2
-rw-r--r--sys/dev/isa/cs89x0isa.c4
-rw-r--r--sys/dev/isa/cs89x0isavar.h2
-rw-r--r--sys/dev/isa/cy_isa.c4
-rw-r--r--sys/dev/isa/daic_isa.c2
-rw-r--r--sys/dev/isa/depca_isa.c4
-rw-r--r--sys/dev/isa/dpt_isa.c4
-rw-r--r--sys/dev/isa/ega.c4
-rw-r--r--sys/dev/isa/egavar.h2
-rw-r--r--sys/dev/isa/elink.h2
-rw-r--r--sys/dev/isa/esp_isa.c4
-rw-r--r--sys/dev/isa/esp_isavar.h2
-rw-r--r--sys/dev/isa/ess.c4
-rw-r--r--sys/dev/isa/ess_isa.c4
-rw-r--r--sys/dev/isa/essreg.h4
-rw-r--r--sys/dev/isa/essvar.h4
-rw-r--r--sys/dev/isa/fd.c26
-rw-r--r--sys/dev/isa/fdc_isa.c4
-rw-r--r--sys/dev/isa/fdcvar.h2
-rw-r--r--sys/dev/isa/fdreg.h2
-rw-r--r--sys/dev/isa/fdvar.h2
-rw-r--r--sys/dev/isa/files.isa2
-rw-r--r--sys/dev/isa/gus.c4
-rw-r--r--sys/dev/isa/gusreg.h2
-rw-r--r--sys/dev/isa/i82365_isa.c4
-rw-r--r--sys/dev/isa/i82365_isasubr.c4
-rw-r--r--sys/dev/isa/i82365_isavar.h2
-rw-r--r--sys/dev/isa/ics2101.c4
-rw-r--r--sys/dev/isa/ics2101var.h2
-rw-r--r--sys/dev/isa/if_ai.c4
-rw-r--r--sys/dev/isa/if_ate.c4
-rw-r--r--sys/dev/isa/if_cs_isa.c4
-rw-r--r--sys/dev/isa/if_ec.c4
-rw-r--r--sys/dev/isa/if_ef.c4
-rw-r--r--sys/dev/isa/if_eg.c4
-rw-r--r--sys/dev/isa/if_egreg.h2
-rw-r--r--sys/dev/isa/if_el.c4
-rw-r--r--sys/dev/isa/if_ep_isa.c4
-rw-r--r--sys/dev/isa/if_fmv_isa.c4
-rw-r--r--sys/dev/isa/if_hp.c4
-rw-r--r--sys/dev/isa/if_ix.c4
-rw-r--r--sys/dev/isa/if_iy.c4
-rw-r--r--sys/dev/isa/if_lc_isa.c4
-rw-r--r--sys/dev/isa/if_le_isa.c4
-rw-r--r--sys/dev/isa/if_ne_isa.c4
-rw-r--r--sys/dev/isa/if_ntwoc_isa.c6
-rw-r--r--sys/dev/isa/if_sm_isa.c4
-rw-r--r--sys/dev/isa/if_tr_isa.c4
-rw-r--r--sys/dev/isa/if_tribm_isa.c4
-rw-r--r--sys/dev/isa/if_trtcm_isa.c4
-rw-r--r--sys/dev/isa/if_tscs_isa.c4
-rw-r--r--sys/dev/isa/if_we_isa.c4
-rw-r--r--sys/dev/isa/ioat66.c4
-rw-r--r--sys/dev/isa/isa.c4
-rw-r--r--sys/dev/isa/isabusprint.c3
-rw-r--r--sys/dev/isa/isadma.c4
-rw-r--r--sys/dev/isa/isadmavar.h2
-rw-r--r--sys/dev/isa/isareg.h2
-rw-r--r--sys/dev/isa/isavar.h2
-rw-r--r--sys/dev/isa/isic_isa.c2
-rw-r--r--sys/dev/isa/isic_isa_avm_a1.c4
-rw-r--r--sys/dev/isa/isic_isa_itk_ix1.c2
-rw-r--r--sys/dev/isa/isic_isa_tel_s016.c4
-rw-r--r--sys/dev/isa/isic_isa_tel_s0163.c4
-rw-r--r--sys/dev/isa/isic_isa_tel_s08.c4
-rw-r--r--sys/dev/isa/isic_isa_usr_sti.c4
-rw-r--r--sys/dev/isa/joy_ess.c2
-rw-r--r--sys/dev/isa/joy_isa.c4
-rw-r--r--sys/dev/isa/lm_isa.c4
-rw-r--r--sys/dev/isa/lpt_isa.c4
-rw-r--r--sys/dev/isa/mcd.c16
-rw-r--r--sys/dev/isa/midi_pcppi.c4
-rw-r--r--sys/dev/isa/moxa_isa.c4
-rw-r--r--sys/dev/isa/mpu_isa.c4
-rw-r--r--sys/dev/isa/mpu_sb.c4
-rw-r--r--sys/dev/isa/mpu_ym.c4
-rw-r--r--sys/dev/isa/nca_isa.c4
-rw-r--r--sys/dev/isa/nsclpcsio_isa.c4
-rw-r--r--sys/dev/isa/opl_ess.c4
-rw-r--r--sys/dev/isa/opl_isa.c4
-rw-r--r--sys/dev/isa/opl_sb.c4
-rw-r--r--sys/dev/isa/opl_wss.c4
-rw-r--r--sys/dev/isa/opl_ym.c4
-rw-r--r--sys/dev/isa/pas.c4
-rw-r--r--sys/dev/isa/pasreg.h2
-rw-r--r--sys/dev/isa/pcdisplay.c10
-rw-r--r--sys/dev/isa/pcdisplayvar.h2
-rw-r--r--sys/dev/isa/pckbc_isa.c4
-rw-r--r--sys/dev/isa/pcppi.c4
-rw-r--r--sys/dev/isa/pcppivar.h2
-rw-r--r--sys/dev/isa/radiotrack.c4
-rw-r--r--sys/dev/isa/radiotrack2.c4
-rw-r--r--sys/dev/isa/rtfps.c4
-rw-r--r--sys/dev/isa/satlink.c4
-rw-r--r--sys/dev/isa/sb.c4
-rw-r--r--sys/dev/isa/sb_isa.c4
-rw-r--r--sys/dev/isa/sbdsp.c4
-rw-r--r--sys/dev/isa/sbdspvar.h2
-rw-r--r--sys/dev/isa/sbreg.h2
-rw-r--r--sys/dev/isa/sbvar.h2
-rw-r--r--sys/dev/isa/seagate.c4
-rw-r--r--sys/dev/isa/sf16fmr2.c4
-rw-r--r--sys/dev/isa/spkr.c16
-rw-r--r--sys/dev/isa/tcic2_isa.c4
-rw-r--r--sys/dev/isa/tcom.c4
-rw-r--r--sys/dev/isa/toaster.c4
-rw-r--r--sys/dev/isa/toasterlcd.c4
-rw-r--r--sys/dev/isa/tsdio.c4
-rw-r--r--sys/dev/isa/tsdioreg.h2
-rw-r--r--sys/dev/isa/tsdiovar.h2
-rw-r--r--sys/dev/isa/uha_isa.c4
-rw-r--r--sys/dev/isa/vga_isa.c4
-rw-r--r--sys/dev/isa/vga_isavar.h2
-rw-r--r--sys/dev/isa/wdc_isa.c4
-rw-r--r--sys/dev/isa/wds.c4
-rw-r--r--sys/dev/isa/wdsreg.h2
-rw-r--r--sys/dev/isa/weasel_isa.c4
-rw-r--r--sys/dev/isa/wss.c4
-rw-r--r--sys/dev/isa/wss_isa.c4
-rw-r--r--sys/dev/isa/wssvar.h2
-rw-r--r--sys/dev/isa/wt.c4
-rw-r--r--sys/dev/isa/wtreg.h2
-rw-r--r--sys/dev/isa/ym.c4
-rw-r--r--sys/dev/isa/ymvar.h2
-rw-r--r--sys/dev/isapnp/aha_isapnp.c4
-rw-r--r--sys/dev/isapnp/aic_isapnp.c4
-rw-r--r--sys/dev/isapnp/atppc_isapnp.c4
-rw-r--r--sys/dev/isapnp/com_isapnp.c4
-rw-r--r--sys/dev/isapnp/devlist2h.awk2
-rw-r--r--sys/dev/isapnp/ess_isapnp.c4
-rw-r--r--sys/dev/isapnp/files.isapnp2
-rw-r--r--sys/dev/isapnp/gus_isapnp.c4
-rw-r--r--sys/dev/isapnp/i82365_isapnp.c4
-rw-r--r--sys/dev/isapnp/if_an_isapnp.c4
-rw-r--r--sys/dev/isapnp/if_cs_isapnp.c4
-rw-r--r--sys/dev/isapnp/if_ep_isapnp.c4
-rw-r--r--sys/dev/isapnp/if_fmv_isapnp.c4
-rw-r--r--sys/dev/isapnp/if_le_isapnp.c4
-rw-r--r--sys/dev/isapnp/if_ne_isapnp.c4
-rw-r--r--sys/dev/isapnp/if_tr_isapnp.c4
-rw-r--r--sys/dev/isapnp/isapnp.c4
-rw-r--r--sys/dev/isapnp/isapnpdebug.c4
-rw-r--r--sys/dev/isapnp/isapnpdevs2
-rw-r--r--sys/dev/isapnp/isapnpdevs.c4
-rw-r--r--sys/dev/isapnp/isapnpdevs.h2
-rw-r--r--sys/dev/isapnp/isapnpres.c4
-rw-r--r--sys/dev/isapnp/isapnpvar.h2
-rw-r--r--sys/dev/isapnp/isic_isapnp.c2
-rw-r--r--sys/dev/isapnp/isic_isapnp_ctx_s0P.c4
-rw-r--r--sys/dev/isapnp/isic_isapnp_drn_ngo.c4
-rw-r--r--sys/dev/isapnp/isic_isapnp_dynalink.c4
-rw-r--r--sys/dev/isapnp/isic_isapnp_elsa_qs1i.c4
-rw-r--r--sys/dev/isapnp/isic_isapnp_itkix.c4
-rw-r--r--sys/dev/isapnp/isic_isapnp_siemens_isurf.c4
-rw-r--r--sys/dev/isapnp/isic_isapnp_sws.c4
-rw-r--r--sys/dev/isapnp/isic_isapnp_tel_s0P.c4
-rw-r--r--sys/dev/isapnp/joy_isapnp.c4
-rw-r--r--sys/dev/isapnp/mpu_isapnp.c4
-rw-r--r--sys/dev/isapnp/sb_isapnp.c4
-rw-r--r--sys/dev/isapnp/wdc_isapnp.c4
-rw-r--r--sys/dev/isapnp/wss_isapnp.c4
-rw-r--r--sys/dev/isapnp/ym_isapnp.c4
-rw-r--r--sys/dev/kloader.c18
-rw-r--r--sys/dev/kloader.h2
-rw-r--r--sys/dev/kttcp.c51
-rw-r--r--sys/dev/ld.c12
-rw-r--r--sys/dev/ldvar.h2
-rw-r--r--sys/dev/marvell/files.discovery2
-rw-r--r--sys/dev/marvell/gt.c4
-rw-r--r--sys/dev/marvell/gtethreg.h2
-rw-r--r--sys/dev/marvell/gti2c.c4
-rw-r--r--sys/dev/marvell/gti2creg.h2
-rw-r--r--sys/dev/marvell/gtidma.c4
-rw-r--r--sys/dev/marvell/gtidmareg.h2
-rw-r--r--sys/dev/marvell/gtidmavar.h2
-rw-r--r--sys/dev/marvell/gtintrreg.h2
-rw-r--r--sys/dev/marvell/gtmpsc.c20
-rw-r--r--sys/dev/marvell/gtmpscreg.h2
-rw-r--r--sys/dev/marvell/gtmpscvar.h2
-rw-r--r--sys/dev/marvell/gtpci.c4
-rw-r--r--sys/dev/marvell/gtpcireg.h2
-rw-r--r--sys/dev/marvell/gtreg.h2
-rw-r--r--sys/dev/marvell/gtsdmareg.h2
-rw-r--r--sys/dev/marvell/gtvar.h2
-rw-r--r--sys/dev/marvell/if_gfe.c4
-rw-r--r--sys/dev/marvell/if_gfevar.h2
-rw-r--r--sys/dev/marvell/obio.c4
-rw-r--r--sys/dev/mca/aha_mca.c4
-rw-r--r--sys/dev/mca/com_mca.c4
-rw-r--r--sys/dev/mca/devlist2h.awk2
-rw-r--r--sys/dev/mca/ed_mca.c20
-rw-r--r--sys/dev/mca/edc_mca.c4
-rw-r--r--sys/dev/mca/edcreg.h2
-rw-r--r--sys/dev/mca/edcvar.h2
-rw-r--r--sys/dev/mca/edvar.h2
-rw-r--r--sys/dev/mca/esp_mca.c4
-rw-r--r--sys/dev/mca/files.mca2
-rw-r--r--sys/dev/mca/if_ate_mca.c4
-rw-r--r--sys/dev/mca/if_elmc_mca.c4
-rw-r--r--sys/dev/mca/if_ep_mca.c4
-rw-r--r--sys/dev/mca/if_le_mca.c4
-rw-r--r--sys/dev/mca/if_ne_mca.c4
-rw-r--r--sys/dev/mca/if_tr_mca.c4
-rw-r--r--sys/dev/mca/if_tra_mca.c4
-rw-r--r--sys/dev/mca/if_we_mca.c4
-rw-r--r--sys/dev/mca/mca.c4
-rw-r--r--sys/dev/mca/mca_subr.c4
-rw-r--r--sys/dev/mca/mcabusprint.c3
-rw-r--r--sys/dev/mca/mcadevs2
-rw-r--r--sys/dev/mca/mcadevs.h2
-rw-r--r--sys/dev/mca/mcadevs_data.h2
-rw-r--r--sys/dev/mca/mcavar.h2
-rw-r--r--sys/dev/md.c22
-rw-r--r--sys/dev/microcode/aic7xxx/aic79xx.reg2
-rw-r--r--sys/dev/microcode/aic7xxx/aic79xx.seq2
-rw-r--r--sys/dev/microcode/aic7xxx/aic7xxx.reg2
-rw-r--r--sys/dev/microcode/aic7xxx/aic7xxx.seq2
-rw-r--r--sys/dev/microcode/aic7xxx/aicasm.c4
-rw-r--r--sys/dev/microcode/aic7xxx/aicasm.h2
-rw-r--r--sys/dev/microcode/aic7xxx/aicasm_gram.y2
-rw-r--r--sys/dev/microcode/aic7xxx/aicasm_macro_scan.l2
-rw-r--r--sys/dev/microcode/aic7xxx/aicasm_scan.l2
-rw-r--r--sys/dev/microcode/aic7xxx/aicasm_symbol.c4
-rw-r--r--sys/dev/microcode/cyclades-z/cyzfirm.h2
-rw-r--r--sys/dev/microcode/cyclades-z/cyzfirm2h.c6
-rw-r--r--sys/dev/microcode/daic/dnload.h-dist2
-rw-r--r--sys/dev/microcode/i8255x/rcvbundl.h2
-rw-r--r--sys/dev/microcode/isp/asm_1040.h2
-rw-r--r--sys/dev/microcode/isp/asm_1080.h2
-rw-r--r--sys/dev/microcode/isp/asm_12160.h2
-rw-r--r--sys/dev/microcode/isp/asm_2100.h2
-rw-r--r--sys/dev/microcode/isp/asm_2200.h2
-rw-r--r--sys/dev/microcode/isp/asm_2300.h2
-rw-r--r--sys/dev/microcode/isp/asm_sbus.h2
-rw-r--r--sys/dev/microcode/siop/ncr53cxxx.c6
-rw-r--r--sys/dev/microcode/tigon/ti_fw.h2
-rw-r--r--sys/dev/microcode/tigon/ti_fw2.h2
-rw-r--r--sys/dev/microcode/typhoon/3c990img.h2
-rw-r--r--sys/dev/microcode/wi/spectrum24t_cf.h2
-rw-r--r--sys/dev/midi.c22
-rw-r--r--sys/dev/midi_if.h4
-rw-r--r--sys/dev/midisyn.c10
-rw-r--r--sys/dev/midisynvar.h4
-rw-r--r--sys/dev/midivar.h2
-rw-r--r--sys/dev/mii/acphy.c4
-rw-r--r--sys/dev/mii/amhphy.c4
-rw-r--r--sys/dev/mii/bmtphy.c4
-rw-r--r--sys/dev/mii/ciphyreg.h2
-rw-r--r--sys/dev/mii/devlist2h.awk2
-rw-r--r--sys/dev/mii/dmphy.c4
-rw-r--r--sys/dev/mii/exphy.c4
-rw-r--r--sys/dev/mii/files.mii2
-rw-r--r--sys/dev/mii/gentbi.c4
-rw-r--r--sys/dev/mii/glxtphy.c4
-rw-r--r--sys/dev/mii/gphyter.c4
-rw-r--r--sys/dev/mii/icsphy.c4
-rw-r--r--sys/dev/mii/igphy.c4
-rw-r--r--sys/dev/mii/igphyreg.h2
-rw-r--r--sys/dev/mii/inphy.c4
-rw-r--r--sys/dev/mii/inphyreg.h2
-rw-r--r--sys/dev/mii/iophy.c4
-rw-r--r--sys/dev/mii/lxtphy.c4
-rw-r--r--sys/dev/mii/makphy.c4
-rw-r--r--sys/dev/mii/mii.c4
-rw-r--r--sys/dev/mii/mii.h2
-rw-r--r--sys/dev/mii/mii_bitbang.c4
-rw-r--r--sys/dev/mii/mii_bitbang.h2
-rw-r--r--sys/dev/mii/mii_physubr.c4
-rw-r--r--sys/dev/mii/miivar.h2
-rw-r--r--sys/dev/mii/nsphy.c4
-rw-r--r--sys/dev/mii/nsphyter.c4
-rw-r--r--sys/dev/mii/nsphyterreg.h2
-rw-r--r--sys/dev/mii/pnaphy.c4
-rw-r--r--sys/dev/mii/qsphy.c4
-rw-r--r--sys/dev/mii/qsphyreg.h2
-rw-r--r--sys/dev/mii/rgephy.c4
-rw-r--r--sys/dev/mii/sqphy.c4
-rw-r--r--sys/dev/mii/sqphyreg.h2
-rw-r--r--sys/dev/mii/tlphy.c4
-rw-r--r--sys/dev/mii/tlphyreg.h2
-rw-r--r--sys/dev/mii/tqphy.c4
-rw-r--r--sys/dev/mii/tqphyreg.h2
-rw-r--r--sys/dev/mii/ukphy.c4
-rw-r--r--sys/dev/mii/ukphy_subr.c4
-rw-r--r--sys/dev/mii/urlphy.c4
-rw-r--r--sys/dev/mii/urlphyreg.h2
-rw-r--r--sys/dev/mm.c8
-rw-r--r--sys/dev/mscp/mscp.c4
-rw-r--r--sys/dev/mscp/mscp.h2
-rw-r--r--sys/dev/mscp/mscp_disk.c26
-rw-r--r--sys/dev/mscp/mscp_subr.c4
-rw-r--r--sys/dev/mscp/mscp_tape.c16
-rw-r--r--sys/dev/mscp/mscpreg.h2
-rw-r--r--sys/dev/mscp/mscpvar.h2
-rw-r--r--sys/dev/mulaw.c4
-rw-r--r--sys/dev/mulaw.h2
-rw-r--r--sys/dev/mvme/clmpcc_pcctwo.c4
-rw-r--r--sys/dev/mvme/clock_pcctwo.c4
-rw-r--r--sys/dev/mvme/clockvar.h2
-rw-r--r--sys/dev/mvme/files.mvme2
-rw-r--r--sys/dev/mvme/if_ie_mvme.c4
-rw-r--r--sys/dev/mvme/lpt_mvme.c16
-rw-r--r--sys/dev/mvme/lpt_pcctwo.c4
-rw-r--r--sys/dev/mvme/lptvar.h2
-rw-r--r--sys/dev/mvme/memc.c4
-rw-r--r--sys/dev/mvme/memcreg.h2
-rw-r--r--sys/dev/mvme/mvmebus.c4
-rw-r--r--sys/dev/mvme/osiop_pcctwo.c4
-rw-r--r--sys/dev/mvme/pcctwo.c4
-rw-r--r--sys/dev/mvme/pcctwovar.h2
-rw-r--r--sys/dev/mvme/vme_two.c4
-rw-r--r--sys/dev/mvme/vme_two_isr.c4
-rw-r--r--sys/dev/nullcons_subr.c12
-rw-r--r--sys/dev/ofisa/atppc_ofisa.c4
-rw-r--r--sys/dev/ofisa/com_ofisa.c4
-rw-r--r--sys/dev/ofisa/ess_ofisa.c4
-rw-r--r--sys/dev/ofisa/files.ofisa2
-rw-r--r--sys/dev/ofisa/if_cs_ofisa.c4
-rw-r--r--sys/dev/ofisa/joy_ofisa.c4
-rw-r--r--sys/dev/ofisa/lpt_ofisa.c4
-rw-r--r--sys/dev/ofisa/ofisa.c4
-rw-r--r--sys/dev/ofisa/ofisavar.h2
-rw-r--r--sys/dev/ofisa/pckbc_ofisa.c4
-rw-r--r--sys/dev/ofisa/sb_ofisa.c4
-rw-r--r--sys/dev/ofisa/wdc_ofisa.c4
-rw-r--r--sys/dev/ofw/ofbus.c4
-rw-r--r--sys/dev/ofw/ofcons.c29
-rw-r--r--sys/dev/ofw/ofdisk.c16
-rw-r--r--sys/dev/ofw/ofnet.c4
-rw-r--r--sys/dev/ofw/ofrtc.c6
-rw-r--r--sys/dev/ofw/ofw_network_subr.c4
-rw-r--r--sys/dev/ofw/ofw_pci.h2
-rw-r--r--sys/dev/ofw/ofw_subr.c4
-rw-r--r--sys/dev/ofw/openfirm.h2
-rw-r--r--sys/dev/ofw/openfirmio.c6
-rw-r--r--sys/dev/ofw/openfirmio.h2
-rw-r--r--sys/dev/pci/Makefile.pcidevs2
-rw-r--r--sys/dev/pci/aac_pci.c4
-rw-r--r--sys/dev/pci/acardide.c4
-rw-r--r--sys/dev/pci/aceride.c4
-rw-r--r--sys/dev/pci/adv_pci.c4
-rw-r--r--sys/dev/pci/adw_pci.c4
-rw-r--r--sys/dev/pci/agp.c10
-rw-r--r--sys/dev/pci/agp_ali.c4
-rw-r--r--sys/dev/pci/agp_amd.c4
-rw-r--r--sys/dev/pci/agp_i810.c4
-rw-r--r--sys/dev/pci/agp_intel.c4
-rw-r--r--sys/dev/pci/agp_sis.c4
-rw-r--r--sys/dev/pci/agp_via.c4
-rw-r--r--sys/dev/pci/agpbusprint.c3
-rw-r--r--sys/dev/pci/agpreg.h2
-rw-r--r--sys/dev/pci/agpvar.h2
-rw-r--r--sys/dev/pci/ahc_pci.c4
-rw-r--r--sys/dev/pci/ahd_pci.c4
-rw-r--r--sys/dev/pci/amr.c4
-rw-r--r--sys/dev/pci/amrvar.h2
-rw-r--r--sys/dev/pci/artsata.c2
-rw-r--r--sys/dev/pci/atppc_puc.c4
-rw-r--r--sys/dev/pci/auacer.c4
-rw-r--r--sys/dev/pci/auacerreg.h2
-rw-r--r--sys/dev/pci/auixp.c4
-rw-r--r--sys/dev/pci/auixpreg.h2
-rw-r--r--sys/dev/pci/auixpvar.h2
-rw-r--r--sys/dev/pci/autri.c4
-rw-r--r--sys/dev/pci/auviavar.h2
-rw-r--r--sys/dev/pci/azalia.c4
-rw-r--r--sys/dev/pci/azalia.h2
-rw-r--r--sys/dev/pci/azalia_codec.c4
-rw-r--r--sys/dev/pci/bha_pci.c4
-rw-r--r--sys/dev/pci/bktr/bktr_audio.h2
-rw-r--r--sys/dev/pci/bktr/bktr_core.c10
-rw-r--r--sys/dev/pci/bktr/bktr_core.h6
-rw-r--r--sys/dev/pci/bktr/bktr_os.c26
-rw-r--r--sys/dev/pci/bktr/bktr_reg.h2
-rw-r--r--sys/dev/pci/btvmei.c4
-rw-r--r--sys/dev/pci/btvmeii.c4
-rw-r--r--sys/dev/pci/btvmeireg.h2
-rw-r--r--sys/dev/pci/btvmeivar.h2
-rw-r--r--sys/dev/pci/cac_pci.c4
-rw-r--r--sys/dev/pci/cmdide.c4
-rw-r--r--sys/dev/pci/cmpci.c4
-rw-r--r--sys/dev/pci/cmpcireg.h2
-rw-r--r--sys/dev/pci/cmpcivar.h2
-rw-r--r--sys/dev/pci/com_puc.c4
-rw-r--r--sys/dev/pci/cs4280.c4
-rw-r--r--sys/dev/pci/cs4280_image.h2
-rw-r--r--sys/dev/pci/cs4280reg.h2
-rw-r--r--sys/dev/pci/cs4281.c4
-rw-r--r--sys/dev/pci/cs4281reg.h2
-rw-r--r--sys/dev/pci/cs428x.c4
-rw-r--r--sys/dev/pci/cs428x.h2
-rw-r--r--sys/dev/pci/cs428xreg.h2
-rw-r--r--sys/dev/pci/cy_pci.c4
-rw-r--r--sys/dev/pci/cyber.c4
-rw-r--r--sys/dev/pci/cyberreg.h2
-rw-r--r--sys/dev/pci/cybervar.h2
-rw-r--r--sys/dev/pci/cypide.c4
-rw-r--r--sys/dev/pci/cz.c21
-rw-r--r--sys/dev/pci/devlist2h.awk2
-rw-r--r--sys/dev/pci/dpt_pci.c4
-rw-r--r--sys/dev/pci/eap.c4
-rw-r--r--sys/dev/pci/eapreg.h2
-rw-r--r--sys/dev/pci/eapvar.h2
-rw-r--r--sys/dev/pci/emuxki.c4
-rw-r--r--sys/dev/pci/emuxkireg.h2
-rw-r--r--sys/dev/pci/emuxkivar.h2
-rw-r--r--sys/dev/pci/esa.c4
-rw-r--r--sys/dev/pci/esadsp.h2
-rw-r--r--sys/dev/pci/esareg.h2
-rw-r--r--sys/dev/pci/esavar.h2
-rw-r--r--sys/dev/pci/esiop_pci.c4
-rw-r--r--sys/dev/pci/esm.c4
-rw-r--r--sys/dev/pci/esmreg.h2
-rw-r--r--sys/dev/pci/esmvar.h2
-rw-r--r--sys/dev/pci/eso.c4
-rw-r--r--sys/dev/pci/esoreg.h2
-rw-r--r--sys/dev/pci/esovar.h2
-rw-r--r--sys/dev/pci/files.agp2
-rw-r--r--sys/dev/pci/fms.c4
-rw-r--r--sys/dev/pci/fmsvar.h2
-rw-r--r--sys/dev/pci/fwlynx_pci.c4
-rw-r--r--sys/dev/pci/fwohci_pci.c4
-rw-r--r--sys/dev/pci/geodeide.c4
-rw-r--r--sys/dev/pci/gtp.c4
-rw-r--r--sys/dev/pci/hifn7751reg.h2
-rw-r--r--sys/dev/pci/hifn7751var.h2
-rw-r--r--sys/dev/pci/hptide.c4
-rw-r--r--sys/dev/pci/i82365_pci.c4
-rw-r--r--sys/dev/pci/i82365_pcivar.h2
-rw-r--r--sys/dev/pci/iavc_pci.c4
-rw-r--r--sys/dev/pci/icp_pci.c4
-rw-r--r--sys/dev/pci/if_an_pci.c4
-rw-r--r--sys/dev/pci/if_ath_pci.c4
-rw-r--r--sys/dev/pci/if_atw_pci.c4
-rw-r--r--sys/dev/pci/if_bce.c2
-rw-r--r--sys/dev/pci/if_bcereg.h2
-rw-r--r--sys/dev/pci/if_devar.h2
-rw-r--r--sys/dev/pci/if_dge.c4
-rw-r--r--sys/dev/pci/if_dgereg.h2
-rw-r--r--sys/dev/pci/if_en_pci.c4
-rw-r--r--sys/dev/pci/if_ep_pci.c4
-rw-r--r--sys/dev/pci/if_epic_pci.c4
-rw-r--r--sys/dev/pci/if_esh_pci.c4
-rw-r--r--sys/dev/pci/if_ex_pci.c4
-rw-r--r--sys/dev/pci/if_fpa.c4
-rw-r--r--sys/dev/pci/if_fxp_pci.c4
-rw-r--r--sys/dev/pci/if_gem_pci.c4
-rw-r--r--sys/dev/pci/if_hme_pci.c4
-rw-r--r--sys/dev/pci/if_ipw.c4
-rw-r--r--sys/dev/pci/if_ipwreg.h2
-rw-r--r--sys/dev/pci/if_ipwvar.h2
-rw-r--r--sys/dev/pci/if_le_pci.c4
-rw-r--r--sys/dev/pci/if_mtd_pci.c4
-rw-r--r--sys/dev/pci/if_ne_pci.c4
-rw-r--r--sys/dev/pci/if_ntwoc_pci.c4
-rw-r--r--sys/dev/pci/if_ntwoc_pcireg.h2
-rw-r--r--sys/dev/pci/if_pcn.c4
-rw-r--r--sys/dev/pci/if_ral_pci.c4
-rw-r--r--sys/dev/pci/if_rtk_pci.c4
-rw-r--r--sys/dev/pci/if_sf_pci.c4
-rw-r--r--sys/dev/pci/if_sip.c4
-rw-r--r--sys/dev/pci/if_sipreg.h2
-rw-r--r--sys/dev/pci/if_skreg.h2
-rw-r--r--sys/dev/pci/if_skvar.h2
-rw-r--r--sys/dev/pci/if_ste.c4
-rw-r--r--sys/dev/pci/if_stge.c4
-rw-r--r--sys/dev/pci/if_ti.c4
-rw-r--r--sys/dev/pci/if_tireg.h2
-rw-r--r--sys/dev/pci/if_tl.c4
-rw-r--r--sys/dev/pci/if_tlregs.h2
-rw-r--r--sys/dev/pci/if_tlvar.h2
-rw-r--r--sys/dev/pci/if_txp.c4
-rw-r--r--sys/dev/pci/if_txpreg.h2
-rw-r--r--sys/dev/pci/if_vr.c4
-rw-r--r--sys/dev/pci/if_vrreg.h2
-rw-r--r--sys/dev/pci/if_wi_pci.c4
-rw-r--r--sys/dev/pci/if_wm.c4
-rw-r--r--sys/dev/pci/if_wmreg.h2
-rw-r--r--sys/dev/pci/if_xge.c4
-rw-r--r--sys/dev/pci/if_xgereg.h2
-rw-r--r--sys/dev/pci/ifpci.c4
-rw-r--r--sys/dev/pci/ifpci2.c6
-rw-r--r--sys/dev/pci/igsfb_pci.c4
-rw-r--r--sys/dev/pci/iha_pci.c4
-rw-r--r--sys/dev/pci/iop_pci.c4
-rw-r--r--sys/dev/pci/isic_pci.c4
-rw-r--r--sys/dev/pci/isic_pci.h2
-rw-r--r--sys/dev/pci/isic_pci_elsa_qs1p.c4
-rw-r--r--sys/dev/pci/isp_pci.c4
-rw-r--r--sys/dev/pci/iteide.c4
-rw-r--r--sys/dev/pci/iwic_bchan.c4
-rw-r--r--sys/dev/pci/iwic_dchan.c4
-rw-r--r--sys/dev/pci/iwic_fsm.c4
-rw-r--r--sys/dev/pci/iwic_pci.c4
-rw-r--r--sys/dev/pci/iwicvar.h2
-rw-r--r--sys/dev/pci/ixpide.c4
-rw-r--r--sys/dev/pci/joy_eap.c2
-rw-r--r--sys/dev/pci/joy_eso.c4
-rw-r--r--sys/dev/pci/joy_pci.c4
-rw-r--r--sys/dev/pci/ld_amr.c4
-rw-r--r--sys/dev/pci/ld_twe.c4
-rw-r--r--sys/dev/pci/lpt_puc.c4
-rw-r--r--sys/dev/pci/machfb.c8
-rw-r--r--sys/dev/pci/machfbreg.h2
-rw-r--r--sys/dev/pci/mlx_pci.c4
-rw-r--r--sys/dev/pci/mly.c10
-rw-r--r--sys/dev/pci/mly_tables.h2
-rw-r--r--sys/dev/pci/mlyio.h2
-rw-r--r--sys/dev/pci/mlyreg.h2
-rw-r--r--sys/dev/pci/mpt_pci.c4
-rw-r--r--sys/dev/pci/mpu_cmpci.c4
-rw-r--r--sys/dev/pci/mpu_eso.c4
-rw-r--r--sys/dev/pci/mpu_fms.c4
-rw-r--r--sys/dev/pci/mpu_yds.c4
-rw-r--r--sys/dev/pci/neo.c4
-rw-r--r--sys/dev/pci/njs_pci.c4
-rw-r--r--sys/dev/pci/oboe.c18
-rw-r--r--sys/dev/pci/ohci_pci.c4
-rw-r--r--sys/dev/pci/opl_cmpci.c4
-rw-r--r--sys/dev/pci/opl_eso.c4
-rw-r--r--sys/dev/pci/opl_fms.c4
-rw-r--r--sys/dev/pci/opl_sv.c4
-rw-r--r--sys/dev/pci/opl_yds.c4
-rw-r--r--sys/dev/pci/optiide.c4
-rw-r--r--sys/dev/pci/pccbb.c4
-rw-r--r--sys/dev/pci/pccbbreg.h2
-rw-r--r--sys/dev/pci/pccbbvar.h2
-rw-r--r--sys/dev/pci/pci.c4
-rw-r--r--sys/dev/pci/pci_map.c4
-rw-r--r--sys/dev/pci/pci_quirks.c4
-rw-r--r--sys/dev/pci/pci_subr.c4
-rw-r--r--sys/dev/pci/pci_usrreq.c10
-rw-r--r--sys/dev/pci/pcibusprint.c3
-rw-r--r--sys/dev/pci/pciconf.c4
-rw-r--r--sys/dev/pci/pciconf.h2
-rw-r--r--sys/dev/pci/pciide.c4
-rw-r--r--sys/dev/pci/pciide_acard_reg.h2
-rw-r--r--sys/dev/pci/pciide_acer_reg.h2
-rw-r--r--sys/dev/pci/pciide_apollo_reg.h2
-rw-r--r--sys/dev/pci/pciide_cmd_reg.h2
-rw-r--r--sys/dev/pci/pciide_common.c4
-rw-r--r--sys/dev/pci/pciide_cy693_reg.h2
-rw-r--r--sys/dev/pci/pciide_geode_reg.h2
-rw-r--r--sys/dev/pci/pciide_hpt_reg.h2
-rw-r--r--sys/dev/pci/pciide_i31244_reg.h2
-rw-r--r--sys/dev/pci/pciide_ite_reg.h2
-rw-r--r--sys/dev/pci/pciide_ixp_reg.h2
-rw-r--r--sys/dev/pci/pciide_opti_reg.h2
-rw-r--r--sys/dev/pci/pciide_pdc202xx_reg.h2
-rw-r--r--sys/dev/pci/pciide_piix_reg.h2
-rw-r--r--sys/dev/pci/pciide_sii3112_reg.h2
-rw-r--r--sys/dev/pci/pciide_sis_reg.h2
-rw-r--r--sys/dev/pci/pciide_sl82c105_reg.h2
-rw-r--r--sys/dev/pci/pciidereg.h2
-rw-r--r--sys/dev/pci/pciidevar.h2
-rw-r--r--sys/dev/pci/pcireg.h2
-rw-r--r--sys/dev/pci/pcivar.h4
-rw-r--r--sys/dev/pci/pcscp.c4
-rw-r--r--sys/dev/pci/pdcide.c4
-rw-r--r--sys/dev/pci/piixide.c4
-rw-r--r--sys/dev/pci/plx9060var.h2
-rw-r--r--sys/dev/pci/ppb.c4
-rw-r--r--sys/dev/pci/ppbreg.h2
-rw-r--r--sys/dev/pci/puc.c4
-rw-r--r--sys/dev/pci/puccn.c4
-rw-r--r--sys/dev/pci/puccn.h2
-rw-r--r--sys/dev/pci/pucdata.c4
-rw-r--r--sys/dev/pci/pucvar.h2
-rw-r--r--sys/dev/pci/rccide.c4
-rw-r--r--sys/dev/pci/satalink.c2
-rw-r--r--sys/dev/pci/siop_pci.c4
-rw-r--r--sys/dev/pci/siop_pci_common.c4
-rw-r--r--sys/dev/pci/siop_pci_common.h2
-rw-r--r--sys/dev/pci/siside.c4
-rw-r--r--sys/dev/pci/slide.c4
-rw-r--r--sys/dev/pci/stpcide.c4
-rw-r--r--sys/dev/pci/sv.c4
-rw-r--r--sys/dev/pci/svreg.h2
-rw-r--r--sys/dev/pci/svvar.h2
-rw-r--r--sys/dev/pci/tga.c10
-rw-r--r--sys/dev/pci/tgareg.h2
-rw-r--r--sys/dev/pci/tgavar.h2
-rw-r--r--sys/dev/pci/trm.c4
-rw-r--r--sys/dev/pci/twe.c10
-rw-r--r--sys/dev/pci/tweio.h2
-rw-r--r--sys/dev/pci/twereg.h2
-rw-r--r--sys/dev/pci/twevar.h2
-rw-r--r--sys/dev/pci/ubsecreg.h2
-rw-r--r--sys/dev/pci/ubsecvar.h2
-rw-r--r--sys/dev/pci/uhci_pci.c4
-rw-r--r--sys/dev/pci/universe_pci.c4
-rw-r--r--sys/dev/pci/universe_pci_var.h2
-rw-r--r--sys/dev/pci/usb_pci.c4
-rw-r--r--sys/dev/pci/vga_pci.c10
-rw-r--r--sys/dev/pci/vga_pcivar.h2
-rw-r--r--sys/dev/pci/viaenv.c4
-rw-r--r--sys/dev/pci/viaide.c4
-rw-r--r--sys/dev/pci/viapm.c4
-rw-r--r--sys/dev/pci/viapmvar.h2
-rw-r--r--sys/dev/pci/weasel_pci.c4
-rw-r--r--sys/dev/pci/yds.c4
-rw-r--r--sys/dev/pci/ydsreg.h2
-rw-r--r--sys/dev/pci/ydsvar.h2
-rw-r--r--sys/dev/pckbport/Makefile2
-rw-r--r--sys/dev/pckbport/files.pckbport2
-rw-r--r--sys/dev/pckbport/pckbd.c8
-rw-r--r--sys/dev/pckbport/pckbdreg.h2
-rw-r--r--sys/dev/pckbport/pckbdvar.h2
-rw-r--r--sys/dev/pckbport/pckbport.c4
-rw-r--r--sys/dev/pckbport/pckbportvar.h2
-rw-r--r--sys/dev/pckbport/pms.c8
-rw-r--r--sys/dev/pckbport/pmsreg.h2
-rw-r--r--sys/dev/pckbport/pmsvar.h2
-rw-r--r--sys/dev/pckbport/synaptics.c2
-rw-r--r--sys/dev/pckbport/synapticsreg.h2
-rw-r--r--sys/dev/pckbport/synapticsvar.h2
-rw-r--r--sys/dev/pckbport/wskbdmap_mfii.c4
-rw-r--r--sys/dev/pckbport/wskbdmap_mfii.h2
-rw-r--r--sys/dev/pcmcia/aic_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/com_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/devlist2h.awk2
-rw-r--r--sys/dev/pcmcia/esl.c4
-rw-r--r--sys/dev/pcmcia/esl_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/eslvar.h2
-rw-r--r--sys/dev/pcmcia/esp_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/fdc_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/files.pcmcia2
-rw-r--r--sys/dev/pcmcia/if_an_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/if_awi_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/if_cnw.c4
-rw-r--r--sys/dev/pcmcia/if_cnwioctl.h2
-rw-r--r--sys/dev/pcmcia/if_cnwreg.h2
-rw-r--r--sys/dev/pcmcia/if_cs_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/if_ep_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/if_mbe_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/if_ne_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/if_ray.c4
-rw-r--r--sys/dev/pcmcia/if_rayreg.h2
-rw-r--r--sys/dev/pcmcia/if_sm_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/if_tr_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/if_wi_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/if_xi.c4
-rw-r--r--sys/dev/pcmcia/if_xireg.h2
-rw-r--r--sys/dev/pcmcia/if_xivar.h2
-rw-r--r--sys/dev/pcmcia/isic_pcmcia.c2
-rw-r--r--sys/dev/pcmcia/isic_pcmcia_avm_fritz.c4
-rw-r--r--sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c2
-rw-r--r--sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c2
-rw-r--r--sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c2
-rw-r--r--sys/dev/pcmcia/mhzc.c4
-rw-r--r--sys/dev/pcmcia/nca_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/opl_esl.c4
-rw-r--r--sys/dev/pcmcia/pcmcia.c4
-rw-r--r--sys/dev/pcmcia/pcmcia_cis.c4
-rw-r--r--sys/dev/pcmcia/pcmcia_cis_quirks.c4
-rw-r--r--sys/dev/pcmcia/pcmciachip.h2
-rw-r--r--sys/dev/pcmcia/pcmciadevs2
-rw-r--r--sys/dev/pcmcia/pcmciadevs.h2
-rw-r--r--sys/dev/pcmcia/pcmciadevs_data.h2
-rw-r--r--sys/dev/pcmcia/pcmciareg.h2
-rw-r--r--sys/dev/pcmcia/pcmciavar.h2
-rw-r--r--sys/dev/pcmcia/pcmcom.c4
-rw-r--r--sys/dev/pcmcia/spc_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/wdc_pcmcia.c4
-rw-r--r--sys/dev/pcmcia/xirc.c4
-rw-r--r--sys/dev/podulebus/acemidi.c4
-rw-r--r--sys/dev/podulebus/dtide.c4
-rw-r--r--sys/dev/podulebus/dtidereg.h2
-rw-r--r--sys/dev/podulebus/files.podulebus2
-rw-r--r--sys/dev/podulebus/hcide.c4
-rw-r--r--sys/dev/podulebus/hcsc.c4
-rw-r--r--sys/dev/podulebus/if_ea.c4
-rw-r--r--sys/dev/podulebus/if_eb.c4
-rw-r--r--sys/dev/podulebus/if_ei.c4
-rw-r--r--sys/dev/podulebus/if_eireg.h2
-rw-r--r--sys/dev/podulebus/oak.c4
-rw-r--r--sys/dev/podulebus/podule_data.h2
-rw-r--r--sys/dev/podulebus/podulebus.h2
-rw-r--r--sys/dev/podulebus/podulelist2h.awk2
-rw-r--r--sys/dev/podulebus/podules2
-rw-r--r--sys/dev/podulebus/podules.h2
-rw-r--r--sys/dev/ppbus/files.ppbus2
-rw-r--r--sys/dev/ppbus/if_plip.c4
-rw-r--r--sys/dev/ppbus/lpt.c4
-rw-r--r--sys/dev/ppbus/lptio.h2
-rw-r--r--sys/dev/ppbus/lptreg.h2
-rw-r--r--sys/dev/ppbus/lptvar.h2
-rw-r--r--sys/dev/ppbus/ppbus_1284.c4
-rw-r--r--sys/dev/ppbus/ppbus_1284.h2
-rw-r--r--sys/dev/ppbus/ppbus_base.c4
-rw-r--r--sys/dev/ppbus/ppbus_base.h2
-rw-r--r--sys/dev/ppbus/ppbus_conf.c4
-rw-r--r--sys/dev/ppbus/ppbus_conf.h2
-rw-r--r--sys/dev/ppbus/ppbus_device.h2
-rw-r--r--sys/dev/ppbus/ppbus_io.h2
-rw-r--r--sys/dev/ppbus/ppbus_msq.c4
-rw-r--r--sys/dev/ppbus/ppbus_msq.h2
-rw-r--r--sys/dev/ppbus/ppbus_var.h2
-rw-r--r--sys/dev/ppbus/pps_ppbus.c4
-rw-r--r--sys/dev/qbus/dhu.c26
-rw-r--r--sys/dev/qbus/dl.c19
-rw-r--r--sys/dev/qbus/dlreg.h2
-rw-r--r--sys/dev/qbus/dz_uba.c4
-rw-r--r--sys/dev/qbus/files.uba2
-rw-r--r--sys/dev/qbus/if_de.c4
-rw-r--r--sys/dev/qbus/if_dereg.h2
-rw-r--r--sys/dev/qbus/if_dmc.c4
-rw-r--r--sys/dev/qbus/if_dmcreg.h2
-rw-r--r--sys/dev/qbus/if_il.c4
-rw-r--r--sys/dev/qbus/if_il.h2
-rw-r--r--sys/dev/qbus/if_ilreg.h2
-rw-r--r--sys/dev/qbus/if_qe.c4
-rw-r--r--sys/dev/qbus/if_qereg.h2
-rw-r--r--sys/dev/qbus/if_qt.c4
-rw-r--r--sys/dev/qbus/if_qtreg.h2
-rw-r--r--sys/dev/qbus/if_uba.c4
-rw-r--r--sys/dev/qbus/if_uba.h2
-rw-r--r--sys/dev/qbus/qd.c4
-rw-r--r--sys/dev/qbus/qdioctl.h2
-rw-r--r--sys/dev/qbus/qdreg.h2
-rw-r--r--sys/dev/qbus/qduser.h2
-rw-r--r--sys/dev/qbus/qevent.h2
-rw-r--r--sys/dev/qbus/qfont.c4
-rw-r--r--sys/dev/qbus/rf.c10
-rw-r--r--sys/dev/qbus/rfreg.h2
-rw-r--r--sys/dev/qbus/rl.c12
-rw-r--r--sys/dev/qbus/rlreg.h2
-rw-r--r--sys/dev/qbus/rlvar.h4
-rw-r--r--sys/dev/qbus/ts.c4
-rw-r--r--sys/dev/qbus/tsreg.h2
-rw-r--r--sys/dev/qbus/uba.c4
-rw-r--r--sys/dev/qbus/ubavar.h2
-rw-r--r--sys/dev/qbus/uda.c4
-rw-r--r--sys/dev/radio.c14
-rw-r--r--sys/dev/radio_if.h2
-rw-r--r--sys/dev/radiovar.h2
-rw-r--r--sys/dev/raidframe/files.raidframe2
-rw-r--r--sys/dev/raidframe/raidframeio.h2
-rw-r--r--sys/dev/raidframe/raidframevar.h2
-rw-r--r--sys/dev/raidframe/rf_acctrace.c4
-rw-r--r--sys/dev/raidframe/rf_acctrace.h2
-rw-r--r--sys/dev/raidframe/rf_alloclist.c4
-rw-r--r--sys/dev/raidframe/rf_archs.h2
-rw-r--r--sys/dev/raidframe/rf_aselect.c4
-rw-r--r--sys/dev/raidframe/rf_aselect.h2
-rw-r--r--sys/dev/raidframe/rf_callback.c4
-rw-r--r--sys/dev/raidframe/rf_callback.h2
-rw-r--r--sys/dev/raidframe/rf_chaindecluster.c4
-rw-r--r--sys/dev/raidframe/rf_chaindecluster.h2
-rw-r--r--sys/dev/raidframe/rf_copyback.c15
-rw-r--r--sys/dev/raidframe/rf_copyback.h2
-rw-r--r--sys/dev/raidframe/rf_cvscan.c4
-rw-r--r--sys/dev/raidframe/rf_cvscan.h2
-rw-r--r--sys/dev/raidframe/rf_dag.h2
-rw-r--r--sys/dev/raidframe/rf_dagdegrd.c4
-rw-r--r--sys/dev/raidframe/rf_dagdegrd.h2
-rw-r--r--sys/dev/raidframe/rf_dagdegwr.c4
-rw-r--r--sys/dev/raidframe/rf_dagffrd.c4
-rw-r--r--sys/dev/raidframe/rf_dagffrd.h2
-rw-r--r--sys/dev/raidframe/rf_dagffwr.c4
-rw-r--r--sys/dev/raidframe/rf_dagffwr.h2
-rw-r--r--sys/dev/raidframe/rf_dagflags.h2
-rw-r--r--sys/dev/raidframe/rf_dagfuncs.c4
-rw-r--r--sys/dev/raidframe/rf_dagfuncs.h2
-rw-r--r--sys/dev/raidframe/rf_dagutils.c4
-rw-r--r--sys/dev/raidframe/rf_dagutils.h2
-rw-r--r--sys/dev/raidframe/rf_debugMem.c4
-rw-r--r--sys/dev/raidframe/rf_debugMem.h2
-rw-r--r--sys/dev/raidframe/rf_debugprint.c4
-rw-r--r--sys/dev/raidframe/rf_debugprint.h2
-rw-r--r--sys/dev/raidframe/rf_decluster.c4
-rw-r--r--sys/dev/raidframe/rf_decluster.h2
-rw-r--r--sys/dev/raidframe/rf_declusterPQ.c4
-rw-r--r--sys/dev/raidframe/rf_declusterPQ.h2
-rw-r--r--sys/dev/raidframe/rf_desc.h2
-rw-r--r--sys/dev/raidframe/rf_diskqueue.c4
-rw-r--r--sys/dev/raidframe/rf_diskqueue.h2
-rw-r--r--sys/dev/raidframe/rf_disks.c15
-rw-r--r--sys/dev/raidframe/rf_disks.h2
-rw-r--r--sys/dev/raidframe/rf_driver.c4
-rw-r--r--sys/dev/raidframe/rf_driver.h2
-rw-r--r--sys/dev/raidframe/rf_engine.c4
-rw-r--r--sys/dev/raidframe/rf_engine.h2
-rw-r--r--sys/dev/raidframe/rf_etimer.h2
-rw-r--r--sys/dev/raidframe/rf_evenodd.c4
-rw-r--r--sys/dev/raidframe/rf_evenodd.h2
-rw-r--r--sys/dev/raidframe/rf_evenodd_dagfuncs.c4
-rw-r--r--sys/dev/raidframe/rf_evenodd_dagfuncs.h2
-rw-r--r--sys/dev/raidframe/rf_fifo.c4
-rw-r--r--sys/dev/raidframe/rf_fifo.h2
-rw-r--r--sys/dev/raidframe/rf_general.h2
-rw-r--r--sys/dev/raidframe/rf_interdecluster.c4
-rw-r--r--sys/dev/raidframe/rf_interdecluster.h2
-rw-r--r--sys/dev/raidframe/rf_kintf.h4
-rw-r--r--sys/dev/raidframe/rf_layout.c4
-rw-r--r--sys/dev/raidframe/rf_layout.h2
-rw-r--r--sys/dev/raidframe/rf_map.c4
-rw-r--r--sys/dev/raidframe/rf_map.h2
-rw-r--r--sys/dev/raidframe/rf_mcpair.c4
-rw-r--r--sys/dev/raidframe/rf_mcpair.h2
-rw-r--r--sys/dev/raidframe/rf_netbsd.h2
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c32
-rw-r--r--sys/dev/raidframe/rf_nwayxor.c4
-rw-r--r--sys/dev/raidframe/rf_options.c4
-rw-r--r--sys/dev/raidframe/rf_options.h2
-rw-r--r--sys/dev/raidframe/rf_optnames.h2
-rw-r--r--sys/dev/raidframe/rf_paritylog.c4
-rw-r--r--sys/dev/raidframe/rf_paritylogDiskMgr.c4
-rw-r--r--sys/dev/raidframe/rf_paritylogging.c4
-rw-r--r--sys/dev/raidframe/rf_paritylogging.h2
-rw-r--r--sys/dev/raidframe/rf_parityloggingdags.c4
-rw-r--r--sys/dev/raidframe/rf_parityloggingdags.h2
-rw-r--r--sys/dev/raidframe/rf_parityscan.c4
-rw-r--r--sys/dev/raidframe/rf_parityscan.h2
-rw-r--r--sys/dev/raidframe/rf_pq.c4
-rw-r--r--sys/dev/raidframe/rf_pq.h2
-rw-r--r--sys/dev/raidframe/rf_pqdeg.c4
-rw-r--r--sys/dev/raidframe/rf_pqdegdags.c4
-rw-r--r--sys/dev/raidframe/rf_psstatus.c4
-rw-r--r--sys/dev/raidframe/rf_psstatus.h2
-rw-r--r--sys/dev/raidframe/rf_raid.h2
-rw-r--r--sys/dev/raidframe/rf_raid0.c4
-rw-r--r--sys/dev/raidframe/rf_raid0.h2
-rw-r--r--sys/dev/raidframe/rf_raid1.c4
-rw-r--r--sys/dev/raidframe/rf_raid1.h2
-rw-r--r--sys/dev/raidframe/rf_raid4.c4
-rw-r--r--sys/dev/raidframe/rf_raid4.h2
-rw-r--r--sys/dev/raidframe/rf_raid5.c4
-rw-r--r--sys/dev/raidframe/rf_raid5.h2
-rw-r--r--sys/dev/raidframe/rf_raid5_rotatedspare.c4
-rw-r--r--sys/dev/raidframe/rf_raid5_rotatedspare.h2
-rw-r--r--sys/dev/raidframe/rf_reconbuffer.c4
-rw-r--r--sys/dev/raidframe/rf_reconbuffer.h2
-rw-r--r--sys/dev/raidframe/rf_reconmap.c4
-rw-r--r--sys/dev/raidframe/rf_reconmap.h2
-rw-r--r--sys/dev/raidframe/rf_reconstruct.c14
-rw-r--r--sys/dev/raidframe/rf_reconstruct.h2
-rw-r--r--sys/dev/raidframe/rf_reconutil.c4
-rw-r--r--sys/dev/raidframe/rf_reconutil.h2
-rw-r--r--sys/dev/raidframe/rf_revent.c4
-rw-r--r--sys/dev/raidframe/rf_revent.h2
-rw-r--r--sys/dev/raidframe/rf_shutdown.c4
-rw-r--r--sys/dev/raidframe/rf_shutdown.h2
-rw-r--r--sys/dev/raidframe/rf_sstf.c4
-rw-r--r--sys/dev/raidframe/rf_sstf.h2
-rw-r--r--sys/dev/raidframe/rf_states.c4
-rw-r--r--sys/dev/raidframe/rf_stripelocks.c4
-rw-r--r--sys/dev/raidframe/rf_stripelocks.h2
-rw-r--r--sys/dev/raidframe/rf_threadstuff.h2
-rw-r--r--sys/dev/raidframe/rf_utils.c4
-rw-r--r--sys/dev/rasops/files.rasops2
-rw-r--r--sys/dev/rasops/rasops.c4
-rw-r--r--sys/dev/rasops/rasops.h2
-rw-r--r--sys/dev/rasops/rasops1.c4
-rw-r--r--sys/dev/rasops/rasops15.c4
-rw-r--r--sys/dev/rasops/rasops2.c4
-rw-r--r--sys/dev/rasops/rasops24.c4
-rw-r--r--sys/dev/rasops/rasops32.c4
-rw-r--r--sys/dev/rasops/rasops4.c4
-rw-r--r--sys/dev/rasops/rasops8.c4
-rw-r--r--sys/dev/rcons/files.rcons2
-rw-r--r--sys/dev/rcons/raster.h2
-rw-r--r--sys/dev/rcons/raster_op.c4
-rw-r--r--sys/dev/rcons/raster_text.c4
-rw-r--r--sys/dev/rcons/rcons.h2
-rw-r--r--sys/dev/rcons/rcons_kern.c4
-rw-r--r--sys/dev/rcons/rcons_subr.c4
-rw-r--r--sys/dev/rnd.c14
-rw-r--r--sys/dev/rndpool.c4
-rw-r--r--sys/dev/sbus/be.c4
-rw-r--r--sys/dev/sbus/bereg.h2
-rw-r--r--sys/dev/sbus/bpp.c25
-rw-r--r--sys/dev/sbus/bwtwo_sbus.c4
-rw-r--r--sys/dev/sbus/cgsix_sbus.c4
-rw-r--r--sys/dev/sbus/cgthree_sbus.c4
-rw-r--r--sys/dev/sbus/cs4231_sbus.c4
-rw-r--r--sys/dev/sbus/dbri.c4
-rw-r--r--sys/dev/sbus/dbrireg.h2
-rw-r--r--sys/dev/sbus/dbrivar.h2
-rw-r--r--sys/dev/sbus/dma_sbus.c4
-rw-r--r--sys/dev/sbus/esp_sbus.c4
-rw-r--r--sys/dev/sbus/files.sbus2
-rw-r--r--sys/dev/sbus/if_en.c4
-rw-r--r--sys/dev/sbus/if_hme_sbus.c4
-rw-r--r--sys/dev/sbus/if_le.c4
-rw-r--r--sys/dev/sbus/if_le_lebuffer.c4
-rw-r--r--sys/dev/sbus/if_le_ledma.c4
-rw-r--r--sys/dev/sbus/isp_sbus.c4
-rw-r--r--sys/dev/sbus/lebuffer.c4
-rw-r--r--sys/dev/sbus/lebuffervar.h2
-rw-r--r--sys/dev/sbus/magma.c42
-rw-r--r--sys/dev/sbus/magmareg.h2
-rw-r--r--sys/dev/sbus/p9100.c8
-rw-r--r--sys/dev/sbus/qe.c4
-rw-r--r--sys/dev/sbus/qec.c4
-rw-r--r--sys/dev/sbus/qecvar.h2
-rw-r--r--sys/dev/sbus/sbusvar.h2
-rw-r--r--sys/dev/sbus/sio16.c4
-rw-r--r--sys/dev/sbus/spif.c48
-rw-r--r--sys/dev/sbus/spifreg.h2
-rw-r--r--sys/dev/sbus/spifvar.h2
-rw-r--r--sys/dev/sbus/stp4020reg.h2
-rw-r--r--sys/dev/sbus/tcx.c16
-rw-r--r--sys/dev/sbus/tcxreg.h2
-rw-r--r--sys/dev/sbus/xbox.c4
-rw-r--r--sys/dev/sbus/xboxvar.h2
-rw-r--r--sys/dev/sbus/zx.c10
-rw-r--r--sys/dev/sbus/zxreg.h2
-rw-r--r--sys/dev/scsipi/Makefile2
-rw-r--r--sys/dev/scsipi/atapi_base.c4
-rw-r--r--sys/dev/scsipi/atapi_tape.h2
-rw-r--r--sys/dev/scsipi/atapi_wdc.c4
-rw-r--r--sys/dev/scsipi/atapiconf.c4
-rw-r--r--sys/dev/scsipi/atapiconf.h2
-rw-r--r--sys/dev/scsipi/cd.c12
-rw-r--r--sys/dev/scsipi/cdvar.h2
-rw-r--r--sys/dev/scsipi/ch.c16
-rw-r--r--sys/dev/scsipi/files.scsipi2
-rw-r--r--sys/dev/scsipi/if_se.c18
-rw-r--r--sys/dev/scsipi/scsi_all.h2
-rw-r--r--sys/dev/scsipi/scsi_base.c4
-rw-r--r--sys/dev/scsipi/scsi_changer.h2
-rw-r--r--sys/dev/scsipi/scsi_ctron_ether.h2
-rw-r--r--sys/dev/scsipi/scsi_disk.h2
-rw-r--r--sys/dev/scsipi/scsi_iu.h2
-rw-r--r--sys/dev/scsipi/scsi_message.h2
-rw-r--r--sys/dev/scsipi/scsi_scanner.h2
-rw-r--r--sys/dev/scsipi/scsi_spc.h2
-rw-r--r--sys/dev/scsipi/scsi_tape.h2
-rw-r--r--sys/dev/scsipi/scsiconf.c12
-rw-r--r--sys/dev/scsipi/scsiconf.h2
-rw-r--r--sys/dev/scsipi/scsipi_all.h2
-rw-r--r--sys/dev/scsipi/scsipi_base.c4
-rw-r--r--sys/dev/scsipi/scsipi_base.h2
-rw-r--r--sys/dev/scsipi/scsipi_cd.h2
-rw-r--r--sys/dev/scsipi/scsipi_debug.h2
-rw-r--r--sys/dev/scsipi/scsipi_disk.h2
-rw-r--r--sys/dev/scsipi/scsipi_ioctl.c10
-rw-r--r--sys/dev/scsipi/scsipi_verbose.c4
-rw-r--r--sys/dev/scsipi/scsipiconf.c4
-rw-r--r--sys/dev/scsipi/scsipiconf.h4
-rw-r--r--sys/dev/scsipi/sd.c14
-rw-r--r--sys/dev/scsipi/sdvar.h2
-rw-r--r--sys/dev/scsipi/ses.c12
-rw-r--r--sys/dev/scsipi/ses.h2
-rw-r--r--sys/dev/scsipi/ss.c12
-rw-r--r--sys/dev/scsipi/ss_mustek.c4
-rw-r--r--sys/dev/scsipi/ss_mustek.h2
-rw-r--r--sys/dev/scsipi/ss_scanjet.c4
-rw-r--r--sys/dev/scsipi/ssvar.h2
-rw-r--r--sys/dev/scsipi/st.c12
-rw-r--r--sys/dev/scsipi/st_atapi.c4
-rw-r--r--sys/dev/scsipi/st_scsi.c4
-rw-r--r--sys/dev/scsipi/stvar.h2
-rw-r--r--sys/dev/scsipi/uk.c12
-rw-r--r--sys/dev/sequencer.c36
-rw-r--r--sys/dev/sequencervar.h2
-rw-r--r--sys/dev/smbus/m41t81reg.h2
-rw-r--r--sys/dev/std/ieee1212.c4
-rw-r--r--sys/dev/std/ieee1212reg.h2
-rw-r--r--sys/dev/std/ieee1212var.h2
-rw-r--r--sys/dev/sun/Makefile2
-rw-r--r--sys/dev/sun/bt_subr.c4
-rw-r--r--sys/dev/sun/btreg.h2
-rw-r--r--sys/dev/sun/btvar.h2
-rw-r--r--sys/dev/sun/bwtwo.c12
-rw-r--r--sys/dev/sun/bwtworeg.h2
-rw-r--r--sys/dev/sun/bwtwovar.h2
-rw-r--r--sys/dev/sun/cgsix.c10
-rw-r--r--sys/dev/sun/cgsixreg.h2
-rw-r--r--sys/dev/sun/cgsixvar.h2
-rw-r--r--sys/dev/sun/cgthree.c12
-rw-r--r--sys/dev/sun/cgthreereg.h2
-rw-r--r--sys/dev/sun/cgthreevar.h2
-rw-r--r--sys/dev/sun/disklabel.h2
-rw-r--r--sys/dev/sun/disksubr.c4
-rw-r--r--sys/dev/sun/eeprom.h2
-rw-r--r--sys/dev/sun/event.c10
-rw-r--r--sys/dev/sun/event_var.h4
-rw-r--r--sys/dev/sun/fb.c28
-rw-r--r--sys/dev/sun/fbio.h2
-rw-r--r--sys/dev/sun/fbvar.h10
-rw-r--r--sys/dev/sun/files.sun2
-rw-r--r--sys/dev/sun/idprom.h2
-rw-r--r--sys/dev/sun/kbd.c24
-rw-r--r--sys/dev/sun/kbd_ms_ttyvar.h2
-rw-r--r--sys/dev/sun/kbd_reg.h2
-rw-r--r--sys/dev/sun/kbd_tables.c4
-rw-r--r--sys/dev/sun/kbd_xlate.h2
-rw-r--r--sys/dev/sun/kbd_zs.c4
-rw-r--r--sys/dev/sun/kbdsun.c4
-rw-r--r--sys/dev/sun/kbdsunvar.h2
-rw-r--r--sys/dev/sun/kbdvar.h2
-rw-r--r--sys/dev/sun/kbio.h2
-rw-r--r--sys/dev/sun/ms.c24
-rw-r--r--sys/dev/sun/ms_zs.c4
-rw-r--r--sys/dev/sun/msvar.h2
-rw-r--r--sys/dev/sun/pfour_subr.c4
-rw-r--r--sys/dev/sun/pfourreg.h2
-rw-r--r--sys/dev/sun/sunkbd.c8
-rw-r--r--sys/dev/sun/sunms.c14
-rw-r--r--sys/dev/sun/vuid_event.h2
-rw-r--r--sys/dev/sun/wskbdmap_sun.c4
-rw-r--r--sys/dev/sysmon/files.sysmon2
-rw-r--r--sys/dev/sysmon/swwdog.c4
-rw-r--r--sys/dev/sysmon/sysmon.c32
-rw-r--r--sys/dev/sysmon/sysmon_envsys.c12
-rw-r--r--sys/dev/sysmon/sysmon_power.c16
-rw-r--r--sys/dev/sysmon/sysmon_taskq.c4
-rw-r--r--sys/dev/sysmon/sysmon_wdog.c12
-rw-r--r--sys/dev/sysmon/sysmonvar.h29
-rw-r--r--sys/dev/tc/asc_tc.c4
-rw-r--r--sys/dev/tc/asc_tcds.c4
-rw-r--r--sys/dev/tc/ascvar.h2
-rw-r--r--sys/dev/tc/cfb.c10
-rw-r--r--sys/dev/tc/devlist2h.awk2
-rw-r--r--sys/dev/tc/files.tc2
-rw-r--r--sys/dev/tc/if_le_ioasic.c4
-rw-r--r--sys/dev/tc/if_le_tc.c4
-rw-r--r--sys/dev/tc/if_levar.h2
-rw-r--r--sys/dev/tc/ioasic_subr.c4
-rw-r--r--sys/dev/tc/ioasicreg.h2
-rw-r--r--sys/dev/tc/ioasicvar.h2
-rw-r--r--sys/dev/tc/mfb.c10
-rw-r--r--sys/dev/tc/nvrreg.h2
-rw-r--r--sys/dev/tc/px.c8
-rw-r--r--sys/dev/tc/pxg.c9
-rw-r--r--sys/dev/tc/pxgvar.h2
-rw-r--r--sys/dev/tc/sfb.c10
-rw-r--r--sys/dev/tc/sfbplus.c4
-rw-r--r--sys/dev/tc/stic.c16
-rw-r--r--sys/dev/tc/sticio.h2
-rw-r--r--sys/dev/tc/sticvar.h4
-rw-r--r--sys/dev/tc/tc.c4
-rw-r--r--sys/dev/tc/tcdevs2
-rw-r--r--sys/dev/tc/tcdevs.h2
-rw-r--r--sys/dev/tc/tcdevs_data.h2
-rw-r--r--sys/dev/tc/tcds.c4
-rw-r--r--sys/dev/tc/tcdsreg.h2
-rw-r--r--sys/dev/tc/tcdsvar.h2
-rw-r--r--sys/dev/tc/tcreg.h2
-rw-r--r--sys/dev/tc/tcvar.h2
-rw-r--r--sys/dev/tc/tfb.c10
-rw-r--r--sys/dev/tc/xcfb.c10
-rw-r--r--sys/dev/tc/zs_ioasic.c4
-rw-r--r--sys/dev/tc/zs_ioasicvar.h2
-rw-r--r--sys/dev/tc/zskbd.c10
-rw-r--r--sys/dev/tc/zsms.c10
-rw-r--r--sys/dev/usb/Makefile2
-rw-r--r--sys/dev/usb/devlist2h.awk2
-rw-r--r--sys/dev/usb/ezload.c4
-rw-r--r--sys/dev/usb/ezload.h2
-rw-r--r--sys/dev/usb/files.usb2
-rw-r--r--sys/dev/usb/hid.h2
-rw-r--r--sys/dev/usb/if_atureg.h2
-rw-r--r--sys/dev/usb/if_axereg.h2
-rw-r--r--sys/dev/usb/if_cdcereg.h2
-rw-r--r--sys/dev/usb/if_udavreg.h2
-rw-r--r--sys/dev/usb/if_uralreg.h2
-rw-r--r--sys/dev/usb/if_uralvar.h2
-rw-r--r--sys/dev/usb/if_urlreg.h2
-rw-r--r--sys/dev/usb/ohcireg.h2
-rw-r--r--sys/dev/usb/uaudio.c4
-rw-r--r--sys/dev/usb/uaudioreg.h2
-rw-r--r--sys/dev/usb/ubsa.c4
-rw-r--r--sys/dev/usb/ubt.c4
-rw-r--r--sys/dev/usb/ubtbcmfw.c6
-rw-r--r--sys/dev/usb/ucom.c28
-rw-r--r--sys/dev/usb/ucomvar.h2
-rw-r--r--sys/dev/usb/ucycom.c24
-rw-r--r--sys/dev/usb/udsbr.c4
-rw-r--r--sys/dev/usb/uep.c10
-rw-r--r--sys/dev/usb/uftdi.c4
-rw-r--r--sys/dev/usb/ugen.c26
-rw-r--r--sys/dev/usb/ugensa.c2
-rw-r--r--sys/dev/usb/ugraphire_rdesc.h2
-rw-r--r--sys/dev/usb/uhci.c4
-rw-r--r--sys/dev/usb/uhcivar.h2
-rw-r--r--sys/dev/usb/uhid.c24
-rw-r--r--sys/dev/usb/uhub.c4
-rw-r--r--sys/dev/usb/uipaq.c2
-rw-r--r--sys/dev/usb/uirda.c18
-rw-r--r--sys/dev/usb/ukbd.c8
-rw-r--r--sys/dev/usb/ukbdmap.c4
-rw-r--r--sys/dev/usb/ukyopon.c4
-rw-r--r--sys/dev/usb/ukyopon.h2
-rw-r--r--sys/dev/usb/ulpt.c10
-rw-r--r--sys/dev/usb/umass.c4
-rw-r--r--sys/dev/usb/umass_isdata.c4
-rw-r--r--sys/dev/usb/umass_quirks.c4
-rw-r--r--sys/dev/usb/umass_scsipi.c4
-rw-r--r--sys/dev/usb/umassvar.h2
-rw-r--r--sys/dev/usb/umct.c4
-rw-r--r--sys/dev/usb/umidi.c4
-rw-r--r--sys/dev/usb/umidi_quirks.c4
-rw-r--r--sys/dev/usb/umidi_quirks.h2
-rw-r--r--sys/dev/usb/umidireg.h2
-rw-r--r--sys/dev/usb/umidivar.h2
-rw-r--r--sys/dev/usb/umodem.c4
-rw-r--r--sys/dev/usb/umodem_common.c4
-rw-r--r--sys/dev/usb/umodemvar.h2
-rw-r--r--sys/dev/usb/ums.c8
-rw-r--r--sys/dev/usb/uplcom.c4
-rw-r--r--sys/dev/usb/urio.c14
-rw-r--r--sys/dev/usb/usb.c18
-rw-r--r--sys/dev/usb/usb.h2
-rw-r--r--sys/dev/usb/usb_mem.c4
-rw-r--r--sys/dev/usb/usb_mem.h2
-rw-r--r--sys/dev/usb/usb_port.h2
-rw-r--r--sys/dev/usb/usbcdc.h2
-rw-r--r--sys/dev/usb/usbdi.c4
-rw-r--r--sys/dev/usb/usbdi_util.c4
-rw-r--r--sys/dev/usb/usbdi_util.h2
-rw-r--r--sys/dev/usb/usbdivar.h2
-rw-r--r--sys/dev/usb/uscanner.c12
-rw-r--r--sys/dev/usb/usscanner.c4
-rw-r--r--sys/dev/usb/ustir.c24
-rw-r--r--sys/dev/usb/uvisor.c4
-rw-r--r--sys/dev/usb/uvscom.c4
-rw-r--r--sys/dev/usb/uyap.c4
-rw-r--r--sys/dev/usb/uyap_firmware.h2
-rw-r--r--sys/dev/verified_exec.c20
-rw-r--r--sys/dev/vinum/Makefile2
-rw-r--r--sys/dev/vinum/files.vinum4
-rw-r--r--sys/dev/vinum/makestatetext2
-rw-r--r--sys/dev/vinum/request.h2
-rw-r--r--sys/dev/vinum/vinum.c2
-rw-r--r--sys/dev/vinum/vinumconfig.c2
-rw-r--r--sys/dev/vinum/vinumdaemon.c2
-rw-r--r--sys/dev/vinum/vinumext.h2
-rw-r--r--sys/dev/vinum/vinumhdr.h2
-rw-r--r--sys/dev/vinum/vinuminterrupt.c2
-rw-r--r--sys/dev/vinum/vinumio.c2
-rw-r--r--sys/dev/vinum/vinumio.h2
-rw-r--r--sys/dev/vinum/vinumioctl.c2
-rw-r--r--sys/dev/vinum/vinumkw.h2
-rw-r--r--sys/dev/vinum/vinumlock.c2
-rw-r--r--sys/dev/vinum/vinummemory.c2
-rw-r--r--sys/dev/vinum/vinumobj.h2
-rw-r--r--sys/dev/vinum/vinumparser.c2
-rw-r--r--sys/dev/vinum/vinumqsort.c2
-rw-r--r--sys/dev/vinum/vinumraid5.c2
-rw-r--r--sys/dev/vinum/vinumrequest.c2
-rw-r--r--sys/dev/vinum/vinumrevive.c2
-rw-r--r--sys/dev/vinum/vinumstate.c2
-rw-r--r--sys/dev/vinum/vinumstate.h2
-rw-r--r--sys/dev/vinum/vinumutil.c2
-rw-r--r--sys/dev/vinum/vinumutil.h2
-rw-r--r--sys/dev/vinum/vinumvar.h2
-rw-r--r--sys/dev/vme/if_ie_vme.c4
-rw-r--r--sys/dev/vme/sc_vme.c4
-rw-r--r--sys/dev/vme/si.c4
-rw-r--r--sys/dev/vme/vme.c4
-rw-r--r--sys/dev/vme/vmereg.h2
-rw-r--r--sys/dev/vme/vmevar.h2
-rw-r--r--sys/dev/vme/xd.c18
-rw-r--r--sys/dev/vme/xdreg.h2
-rw-r--r--sys/dev/vme/xdvar.h2
-rw-r--r--sys/dev/vme/xy.c18
-rw-r--r--sys/dev/vme/xyreg.h2
-rw-r--r--sys/dev/vme/xyvar.h2
-rw-r--r--sys/dev/vnd.c41
-rw-r--r--sys/dev/vndvar.h2
-rw-r--r--sys/dev/wscons/files.wscons2
-rw-r--r--sys/dev/wscons/mra.c4
-rw-r--r--sys/dev/wscons/tpcalib.c6
-rw-r--r--sys/dev/wscons/tpcalibvar.h4
-rw-r--r--sys/dev/wscons/wscons_raster.h2
-rw-r--r--sys/dev/wscons/wscons_rfont.h2
-rw-r--r--sys/dev/wscons/wscons_rinit.c4
-rw-r--r--sys/dev/wscons/wscons_rops.c4
-rw-r--r--sys/dev/wscons/wsdisplay.c54
-rw-r--r--sys/dev/wscons/wsdisplay_compat_usl.c11
-rw-r--r--sys/dev/wscons/wsdisplayvar.h14
-rw-r--r--sys/dev/wscons/wsemul_dumb.c4
-rw-r--r--sys/dev/wscons/wsemul_sun.c4
-rw-r--r--sys/dev/wscons/wsemul_vt100.c4
-rw-r--r--sys/dev/wscons/wsemul_vt100_chars.c4
-rw-r--r--sys/dev/wscons/wsemul_vt100_keys.c4
-rw-r--r--sys/dev/wscons/wsemul_vt100_subr.c4
-rw-r--r--sys/dev/wscons/wsemul_vt100var.h2
-rw-r--r--sys/dev/wscons/wsemulconf.c4
-rw-r--r--sys/dev/wscons/wsemulvar.h2
-rw-r--r--sys/dev/wscons/wsevent.c8
-rw-r--r--sys/dev/wscons/wseventvar.h4
-rw-r--r--sys/dev/wscons/wskbd.c41
-rw-r--r--sys/dev/wscons/wskbdutil.c4
-rw-r--r--sys/dev/wscons/wskbdvar.h4
-rw-r--r--sys/dev/wscons/wsksymdef.h2
-rw-r--r--sys/dev/wscons/wsmouse.c32
-rw-r--r--sys/dev/wscons/wsmousevar.h4
-rw-r--r--sys/dev/wscons/wsmux.c30
-rw-r--r--sys/dev/wscons/wsmuxvar.h14
-rw-r--r--sys/dev/wsfont/bold8x16.h2
-rw-r--r--sys/dev/wsfont/files.wsfont2
-rw-r--r--sys/dev/wsfont/gallant12x22.h2
-rw-r--r--sys/dev/wsfont/lucida16x29.h2
-rw-r--r--sys/dev/wsfont/omron12x20.h2
-rw-r--r--sys/dev/wsfont/qvss8x15.h2
-rw-r--r--sys/dev/wsfont/sony12x24.h2
-rw-r--r--sys/dev/wsfont/sony8x16.h2
-rw-r--r--sys/dev/wsfont/vt220iso8x16.h2
-rw-r--r--sys/dev/wsfont/vt220koi8x10.h2
-rw-r--r--sys/dev/wsfont/vt220l8x10.h2
-rw-r--r--sys/dev/wsfont/vt220l8x16.h2
-rw-r--r--sys/dev/wsfont/vt220l8x8.h2
-rw-r--r--sys/dev/wsfont/wsfont.c4
-rw-r--r--sys/dev/wsfont/wsfontdev.c10
-rw-r--r--sys/dev/xmi/xmi.c4
2030 files changed, 4148 insertions, 4117 deletions
diff --git a/sys/dev/Makefile b/sys/dev/Makefile
index 2a49821b7ab..143a3fe79ed 100644
--- a/sys/dev/Makefile
+++ b/sys/dev/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/03/13 17:31:34 bjh21 Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/11 12:20:53 christos Exp $
SUBDIR= apm ata dec dmover hpc i2o ic ieee1394 ir isa ofw \
pci pckbport pcmcia raidframe sbus scsipi sun tc usb vme wscons vinum
diff --git a/sys/dev/acpi/Makefile.acpidevs b/sys/dev/acpi/Makefile.acpidevs
index 8ed813dcdce..95dd30157ec 100644
--- a/sys/dev/acpi/Makefile.acpidevs
+++ b/sys/dev/acpi/Makefile.acpidevs
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.acpidevs,v 1.3 2003/12/12 06:51:47 jmc Exp $
+# $NetBSD: Makefile.acpidevs,v 1.4 2005/12/11 12:21:01 christos Exp $
#
# As per tron@NetBSD.org, the proper procedure is
#
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 661f33b761e..86ca73b0599 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.76 2005/06/30 22:28:03 sekiya Exp $ */
+/* $NetBSD: acpi.c,v 1.77 2005/12/11 12:21:01 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.76 2005/06/30 22:28:03 sekiya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.77 2005/12/11 12:21:01 christos Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
diff --git a/sys/dev/acpi/acpi_acad.c b/sys/dev/acpi/acpi_acad.c
index 97d1ef2e50b..a3ae303bd03 100644
--- a/sys/dev/acpi/acpi_acad.c
+++ b/sys/dev/acpi/acpi_acad.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_acad.c,v 1.16 2004/05/03 07:44:36 kochi Exp $ */
+/* $NetBSD: acpi_acad.c,v 1.17 2005/12/11 12:21:01 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.16 2004/05/03 07:44:36 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.17 2005/12/11 12:21:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/acpi_bat.c b/sys/dev/acpi/acpi_bat.c
index f23fe2d858f..baaa0c72613 100644
--- a/sys/dev/acpi/acpi_bat.c
+++ b/sys/dev/acpi/acpi_bat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.40 2004/06/25 13:47:04 mycroft Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.41 2005/12/11 12:21:01 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.40 2004/06/25 13:47:04 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.41 2005/12/11 12:21:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/acpi_button.c b/sys/dev/acpi/acpi_button.c
index 09c3d62f39d..1876794deab 100644
--- a/sys/dev/acpi/acpi_button.c
+++ b/sys/dev/acpi/acpi_button.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_button.c,v 1.17 2005/05/02 14:54:00 kochi Exp $ */
+/* $NetBSD: acpi_button.c,v 1.18 2005/12/11 12:21:01 christos Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.17 2005/05/02 14:54:00 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.18 2005/12/11 12:21:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/acpi_ec.c b/sys/dev/acpi/acpi_ec.c
index b35dc4f9069..f2c19076ee8 100644
--- a/sys/dev/acpi/acpi_ec.c
+++ b/sys/dev/acpi/acpi_ec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.33 2005/05/02 14:54:00 kochi Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.34 2005/12/11 12:21:01 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -172,7 +172,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.33 2005/05/02 14:54:00 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_ec.c,v 1.34 2005/12/11 12:21:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/acpi_ecreg.h b/sys/dev/acpi/acpi_ecreg.h
index 7da4455dfe4..3562febf905 100644
--- a/sys/dev/acpi/acpi_ecreg.h
+++ b/sys/dev/acpi/acpi_ecreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ecreg.h,v 1.2 2004/04/10 11:48:10 kochi Exp $ */
+/* $NetBSD: acpi_ecreg.h,v 1.3 2005/12/11 12:21:01 christos Exp $ */
/******************************************************************************
*
diff --git a/sys/dev/acpi/acpi_lid.c b/sys/dev/acpi/acpi_lid.c
index 1814ccca870..24f2fdfe377 100644
--- a/sys/dev/acpi/acpi_lid.c
+++ b/sys/dev/acpi/acpi_lid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.16 2005/05/02 14:54:00 kochi Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.17 2005/12/11 12:21:01 christos Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.16 2005/05/02 14:54:00 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.17 2005/12/11 12:21:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/acpi_madt.c b/sys/dev/acpi/acpi_madt.c
index bf58b6c07e2..00c9e1449f2 100644
--- a/sys/dev/acpi/acpi_madt.c
+++ b/sys/dev/acpi/acpi_madt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_madt.c,v 1.13 2004/05/01 12:03:48 kochi Exp $ */
+/* $NetBSD: acpi_madt.c,v 1.14 2005/12/11 12:21:01 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.13 2004/05/01 12:03:48 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_madt.c,v 1.14 2005/12/11 12:21:01 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
diff --git a/sys/dev/acpi/acpi_madt.h b/sys/dev/acpi/acpi_madt.h
index 0234642dc04..5702e76b0d8 100644
--- a/sys/dev/acpi/acpi_madt.h
+++ b/sys/dev/acpi/acpi_madt.h
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_madt.h,v 1.5 2004/03/24 12:49:45 kochi Exp $ */
+/* $NetBSD: acpi_madt.h,v 1.6 2005/12/11 12:21:01 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/acpi/acpi_powerres.c b/sys/dev/acpi/acpi_powerres.c
index c148e3586fb..fab31536a87 100644
--- a/sys/dev/acpi/acpi_powerres.c
+++ b/sys/dev/acpi/acpi_powerres.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_powerres.c,v 1.2 2005/05/29 20:56:02 christos Exp $ */
+/* $NetBSD: acpi_powerres.c,v 1.3 2005/12/11 12:21:01 christos Exp $ */
/*-
* Copyright (c) 2001 Michael Smith
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.2 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_powerres.c,v 1.3 2005/12/11 12:21:01 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/acpi/acpi_quirks.c b/sys/dev/acpi/acpi_quirks.c
index 28923f2abe3..3f31c87d3f8 100644
--- a/sys/dev/acpi/acpi_quirks.c
+++ b/sys/dev/acpi/acpi_quirks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_quirks.c,v 1.5 2004/04/10 11:48:10 kochi Exp $ */
+/* $NetBSD: acpi_quirks.c,v 1.6 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_quirks.c,v 1.5 2004/04/10 11:48:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_quirks.c,v 1.6 2005/12/11 12:21:02 christos Exp $");
#include "opt_acpi.h"
diff --git a/sys/dev/acpi/acpi_resource.c b/sys/dev/acpi/acpi_resource.c
index aa3e59616d6..56ec561a113 100644
--- a/sys/dev/acpi/acpi_resource.c
+++ b/sys/dev/acpi/acpi_resource.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_resource.c,v 1.17 2005/05/29 20:56:02 christos Exp $ */
+/* $NetBSD: acpi_resource.c,v 1.18 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.17 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_resource.c,v 1.18 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/acpi_tz.c b/sys/dev/acpi/acpi_tz.c
index b9673b2d851..0686acc5883 100644
--- a/sys/dev/acpi/acpi_tz.c
+++ b/sys/dev/acpi/acpi_tz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.16 2005/05/29 20:56:02 christos Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.17 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <jmcneill@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.16 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.17 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/acpica/Osd/OsdEnvironment.c b/sys/dev/acpi/acpica/Osd/OsdEnvironment.c
index 21d8990ff63..cae16d9485e 100644
--- a/sys/dev/acpi/acpica/Osd/OsdEnvironment.c
+++ b/sys/dev/acpi/acpica/Osd/OsdEnvironment.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdEnvironment.c,v 1.4 2004/04/11 06:52:38 kochi Exp $ */
+/* $NetBSD: OsdEnvironment.c,v 1.5 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdEnvironment.c,v 1.4 2004/04/11 06:52:38 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdEnvironment.c,v 1.5 2005/12/11 12:21:02 christos Exp $");
#include <sys/types.h>
diff --git a/sys/dev/acpi/acpica/Osd/OsdHardware.c b/sys/dev/acpi/acpica/Osd/OsdHardware.c
index ed973cdb12c..64eff1d9a04 100644
--- a/sys/dev/acpi/acpica/Osd/OsdHardware.c
+++ b/sys/dev/acpi/acpica/Osd/OsdHardware.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdHardware.c,v 1.9 2004/04/11 06:52:38 kochi Exp $ */
+/* $NetBSD: OsdHardware.c,v 1.10 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdHardware.c,v 1.9 2004/04/11 06:52:38 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdHardware.c,v 1.10 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/acpi/acpica/Osd/OsdInterrupt.c b/sys/dev/acpi/acpica/Osd/OsdInterrupt.c
index a2f3f1d602e..d7681c00815 100644
--- a/sys/dev/acpi/acpica/Osd/OsdInterrupt.c
+++ b/sys/dev/acpi/acpica/Osd/OsdInterrupt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdInterrupt.c,v 1.6 2005/05/02 14:53:04 kochi Exp $ */
+/* $NetBSD: OsdInterrupt.c,v 1.7 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdInterrupt.c,v 1.6 2005/05/02 14:53:04 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdInterrupt.c,v 1.7 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
diff --git a/sys/dev/acpi/acpica/Osd/OsdMemory.c b/sys/dev/acpi/acpica/Osd/OsdMemory.c
index 0be5ad8c36c..35bc3b9a6fd 100644
--- a/sys/dev/acpi/acpica/Osd/OsdMemory.c
+++ b/sys/dev/acpi/acpica/Osd/OsdMemory.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdMemory.c,v 1.7 2004/04/11 06:52:38 kochi Exp $ */
+/* $NetBSD: OsdMemory.c,v 1.8 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdMemory.c,v 1.7 2004/04/11 06:52:38 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdMemory.c,v 1.8 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
diff --git a/sys/dev/acpi/acpica/Osd/OsdMisc.c b/sys/dev/acpi/acpica/Osd/OsdMisc.c
index 0ec85beae89..4a4fc3ff9a9 100644
--- a/sys/dev/acpi/acpica/Osd/OsdMisc.c
+++ b/sys/dev/acpi/acpica/Osd/OsdMisc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdMisc.c,v 1.11 2005/05/29 20:56:02 christos Exp $ */
+/* $NetBSD: OsdMisc.c,v 1.12 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.11 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdMisc.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/acpi/acpica/Osd/OsdSchedule.c b/sys/dev/acpi/acpica/Osd/OsdSchedule.c
index af730fdff7e..f858b5df46e 100644
--- a/sys/dev/acpi/acpica/Osd/OsdSchedule.c
+++ b/sys/dev/acpi/acpica/Osd/OsdSchedule.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdSchedule.c,v 1.11 2005/05/02 14:53:04 kochi Exp $ */
+/* $NetBSD: OsdSchedule.c,v 1.12 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdSchedule.c,v 1.11 2005/05/02 14:53:04 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdSchedule.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -105,7 +105,7 @@ AcpiOsGetThreadId(void)
return 1;
/* XXX Bleh, we're not allowed to return 0 (how stupid!) */
- return (curproc->p_pid + 2);
+ return (curlwp->l_proc->p_pid + 1);
}
/*
diff --git a/sys/dev/acpi/acpica/Osd/OsdSynch.c b/sys/dev/acpi/acpica/Osd/OsdSynch.c
index 6403824dbdc..86c51196ef6 100644
--- a/sys/dev/acpi/acpica/Osd/OsdSynch.c
+++ b/sys/dev/acpi/acpica/Osd/OsdSynch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: OsdSynch.c,v 1.7 2004/04/10 11:48:11 kochi Exp $ */
+/* $NetBSD: OsdSynch.c,v 1.8 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: OsdSynch.c,v 1.7 2004/04/10 11:48:11 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: OsdSynch.c,v 1.8 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
diff --git a/sys/dev/acpi/acpica/Subsystem/acnetbsd.h b/sys/dev/acpi/acpica/Subsystem/acnetbsd.h
index 6339facf0a6..f861d500b56 100644
--- a/sys/dev/acpi/acpica/Subsystem/acnetbsd.h
+++ b/sys/dev/acpi/acpica/Subsystem/acnetbsd.h
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Name: acnetbsd.h - OS specific defines, etc.
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
*****************************************************************************/
diff --git a/sys/dev/acpi/acpica/Subsystem/dbcmds.c b/sys/dev/acpi/acpica/Subsystem/dbcmds.c
index 8b56ca74d74..f2b65e2198d 100644
--- a/sys/dev/acpi/acpica/Subsystem/dbcmds.c
+++ b/sys/dev/acpi/acpica/Subsystem/dbcmds.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcmds.c,v 1.14 2005/05/31 21:08:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcmds.c,v 1.15 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acdispat.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dbdisply.c b/sys/dev/acpi/acpica/Subsystem/dbdisply.c
index 3ed9ab28d6a..2a2eb04b4cd 100644
--- a/sys/dev/acpi/acpica/Subsystem/dbdisply.c
+++ b/sys/dev/acpi/acpica/Subsystem/dbdisply.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbdisply.c,v 1.13 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbdisply.c,v 1.14 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "amlcode.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dbexec.c b/sys/dev/acpi/acpica/Subsystem/dbexec.c
index 47c8a2e5429..d06018a3245 100644
--- a/sys/dev/acpi/acpica/Subsystem/dbexec.c
+++ b/sys/dev/acpi/acpica/Subsystem/dbexec.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbexec.c,v 1.13 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbexec.c,v 1.14 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acdebug.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dbfileio.c b/sys/dev/acpi/acpica/Subsystem/dbfileio.c
index e76a56ff74c..dc94e1bfd26 100644
--- a/sys/dev/acpi/acpica/Subsystem/dbfileio.c
+++ b/sys/dev/acpi/acpica/Subsystem/dbfileio.c
@@ -117,7 +117,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbfileio.c,v 1.12 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbfileio.c,v 1.13 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acdebug.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dbhistry.c b/sys/dev/acpi/acpica/Subsystem/dbhistry.c
index 20f4e7417bb..54cf7da1a94 100644
--- a/sys/dev/acpi/acpica/Subsystem/dbhistry.c
+++ b/sys/dev/acpi/acpica/Subsystem/dbhistry.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbhistry.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbhistry.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acdebug.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dbinput.c b/sys/dev/acpi/acpica/Subsystem/dbinput.c
index 8c13ed080a8..78741bfd36a 100644
--- a/sys/dev/acpi/acpica/Subsystem/dbinput.c
+++ b/sys/dev/acpi/acpica/Subsystem/dbinput.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbinput.c,v 1.13 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbinput.c,v 1.14 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acdebug.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dbstats.c b/sys/dev/acpi/acpica/Subsystem/dbstats.c
index 532b3440b99..8783280e2bd 100644
--- a/sys/dev/acpi/acpica/Subsystem/dbstats.c
+++ b/sys/dev/acpi/acpica/Subsystem/dbstats.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbstats.c,v 1.14 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbstats.c,v 1.15 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acdebug.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dbutils.c b/sys/dev/acpi/acpica/Subsystem/dbutils.c
index 871ab1c6581..3a81650df46 100644
--- a/sys/dev/acpi/acpica/Subsystem/dbutils.c
+++ b/sys/dev/acpi/acpica/Subsystem/dbutils.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbutils.c,v 1.12 2005/05/31 21:08:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbutils.c,v 1.13 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acparser.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dbxface.c b/sys/dev/acpi/acpica/Subsystem/dbxface.c
index ce145b5fbe2..328727617cb 100644
--- a/sys/dev/acpi/acpica/Subsystem/dbxface.c
+++ b/sys/dev/acpi/acpica/Subsystem/dbxface.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbxface.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbxface.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "amlcode.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dmbuffer.c b/sys/dev/acpi/acpica/Subsystem/dmbuffer.c
index 0b8c9b08f7a..991b7d6923d 100644
--- a/sys/dev/acpi/acpica/Subsystem/dmbuffer.c
+++ b/sys/dev/acpi/acpica/Subsystem/dmbuffer.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmbuffer.c,v 1.6 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmbuffer.c,v 1.7 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acdisasm.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dmnames.c b/sys/dev/acpi/acpica/Subsystem/dmnames.c
index 89a33d470c2..f6de6f1d16b 100644
--- a/sys/dev/acpi/acpica/Subsystem/dmnames.c
+++ b/sys/dev/acpi/acpica/Subsystem/dmnames.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmnames.c,v 1.6 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmnames.c,v 1.7 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acparser.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dmobject.c b/sys/dev/acpi/acpica/Subsystem/dmobject.c
index 0085a6a5c9b..ea854f1637a 100644
--- a/sys/dev/acpi/acpica/Subsystem/dmobject.c
+++ b/sys/dev/acpi/acpica/Subsystem/dmobject.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmobject.c,v 1.6 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmobject.c,v 1.7 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "amlcode.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dmopcode.c b/sys/dev/acpi/acpica/Subsystem/dmopcode.c
index 0117643ddc8..20a9b0ac875 100644
--- a/sys/dev/acpi/acpica/Subsystem/dmopcode.c
+++ b/sys/dev/acpi/acpica/Subsystem/dmopcode.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmopcode.c,v 1.7 2005/05/31 21:08:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmopcode.c,v 1.8 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acparser.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dmresrc.c b/sys/dev/acpi/acpica/Subsystem/dmresrc.c
index b02c74682f2..ac34681e518 100644
--- a/sys/dev/acpi/acpica/Subsystem/dmresrc.c
+++ b/sys/dev/acpi/acpica/Subsystem/dmresrc.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmresrc.c,v 1.8 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmresrc.c,v 1.9 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "amlcode.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dmresrcl.c b/sys/dev/acpi/acpica/Subsystem/dmresrcl.c
index 2d66d8b8672..6e0f5591e2d 100644
--- a/sys/dev/acpi/acpica/Subsystem/dmresrcl.c
+++ b/sys/dev/acpi/acpica/Subsystem/dmresrcl.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmresrcl.c,v 1.6 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmresrcl.c,v 1.7 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acdisasm.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dmresrcs.c b/sys/dev/acpi/acpica/Subsystem/dmresrcs.c
index 8c9950580e9..81496f9f38b 100644
--- a/sys/dev/acpi/acpica/Subsystem/dmresrcs.c
+++ b/sys/dev/acpi/acpica/Subsystem/dmresrcs.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmresrcs.c,v 1.6 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmresrcs.c,v 1.7 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acdisasm.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dmutils.c b/sys/dev/acpi/acpica/Subsystem/dmutils.c
index 19271ea3627..9ed7c5b82a4 100644
--- a/sys/dev/acpi/acpica/Subsystem/dmutils.c
+++ b/sys/dev/acpi/acpica/Subsystem/dmutils.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmutils.c,v 1.6 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmutils.c,v 1.7 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "amlcode.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dmwalk.c b/sys/dev/acpi/acpica/Subsystem/dmwalk.c
index 7f813e3990d..cdbf9c10f14 100644
--- a/sys/dev/acpi/acpica/Subsystem/dmwalk.c
+++ b/sys/dev/acpi/acpica/Subsystem/dmwalk.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmwalk.c,v 1.6 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmwalk.c,v 1.7 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acparser.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/dsfield.c b/sys/dev/acpi/acpica/Subsystem/dsfield.c
index 693cdaa9c01..29f884a4483 100644
--- a/sys/dev/acpi/acpica/Subsystem/dsfield.c
+++ b/sys/dev/acpi/acpica/Subsystem/dsfield.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dsfield.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dsfield.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __DSFIELD_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/dsinit.c b/sys/dev/acpi/acpica/Subsystem/dsinit.c
index 64af25631a9..c695b371851 100644
--- a/sys/dev/acpi/acpica/Subsystem/dsinit.c
+++ b/sys/dev/acpi/acpica/Subsystem/dsinit.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dsinit.c,v 1.7 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dsinit.c,v 1.8 2005/12/11 12:21:02 christos Exp $");
#define __DSINIT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/dsmethod.c b/sys/dev/acpi/acpica/Subsystem/dsmethod.c
index 26261f3d359..c23d59f7d8c 100644
--- a/sys/dev/acpi/acpica/Subsystem/dsmethod.c
+++ b/sys/dev/acpi/acpica/Subsystem/dsmethod.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dsmethod.c,v 1.12 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dsmethod.c,v 1.13 2005/12/11 12:21:02 christos Exp $");
#define __DSMETHOD_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/dsmthdat.c b/sys/dev/acpi/acpica/Subsystem/dsmthdat.c
index 5621f27db91..3b210b88bf9 100644
--- a/sys/dev/acpi/acpica/Subsystem/dsmthdat.c
+++ b/sys/dev/acpi/acpica/Subsystem/dsmthdat.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dsmthdat.c,v 1.12 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dsmthdat.c,v 1.13 2005/12/11 12:21:02 christos Exp $");
#define __DSMTHDAT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/dsobject.c b/sys/dev/acpi/acpica/Subsystem/dsobject.c
index 9730ca66061..c24d54128ff 100644
--- a/sys/dev/acpi/acpica/Subsystem/dsobject.c
+++ b/sys/dev/acpi/acpica/Subsystem/dsobject.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dsobject.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dsobject.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __DSOBJECT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/dsopcode.c b/sys/dev/acpi/acpica/Subsystem/dsopcode.c
index 00ef3e4feba..ac6199c7a73 100644
--- a/sys/dev/acpi/acpica/Subsystem/dsopcode.c
+++ b/sys/dev/acpi/acpica/Subsystem/dsopcode.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dsopcode.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dsopcode.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __DSOPCODE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/dsutils.c b/sys/dev/acpi/acpica/Subsystem/dsutils.c
index 5af9c7de5cc..56c145a2a23 100644
--- a/sys/dev/acpi/acpica/Subsystem/dsutils.c
+++ b/sys/dev/acpi/acpica/Subsystem/dsutils.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dsutils.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dsutils.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __DSUTILS_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/dswexec.c b/sys/dev/acpi/acpica/Subsystem/dswexec.c
index 2dc5c95dfe6..30d1908085d 100644
--- a/sys/dev/acpi/acpica/Subsystem/dswexec.c
+++ b/sys/dev/acpi/acpica/Subsystem/dswexec.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dswexec.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dswexec.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __DSWEXEC_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/dswload.c b/sys/dev/acpi/acpica/Subsystem/dswload.c
index f219576822a..ba6ed81f2e9 100644
--- a/sys/dev/acpi/acpica/Subsystem/dswload.c
+++ b/sys/dev/acpi/acpica/Subsystem/dswload.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dswload.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dswload.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __DSWLOAD_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/dswscope.c b/sys/dev/acpi/acpica/Subsystem/dswscope.c
index 87c2efb3499..a27e9bc8fa2 100644
--- a/sys/dev/acpi/acpica/Subsystem/dswscope.c
+++ b/sys/dev/acpi/acpica/Subsystem/dswscope.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dswscope.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dswscope.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __DSWSCOPE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/dswstate.c b/sys/dev/acpi/acpica/Subsystem/dswstate.c
index d91325d59eb..4867d592368 100644
--- a/sys/dev/acpi/acpica/Subsystem/dswstate.c
+++ b/sys/dev/acpi/acpica/Subsystem/dswstate.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dswstate.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dswstate.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __DSWSTATE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/evevent.c b/sys/dev/acpi/acpica/Subsystem/evevent.c
index e5fe89d967b..6ddc8e265e1 100644
--- a/sys/dev/acpi/acpica/Subsystem/evevent.c
+++ b/sys/dev/acpi/acpica/Subsystem/evevent.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evevent.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evevent.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acevents.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/evgpe.c b/sys/dev/acpi/acpica/Subsystem/evgpe.c
index c35608cd128..a52fb14e207 100644
--- a/sys/dev/acpi/acpica/Subsystem/evgpe.c
+++ b/sys/dev/acpi/acpica/Subsystem/evgpe.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evgpe.c,v 1.8 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evgpe.c,v 1.9 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acevents.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/evgpeblk.c b/sys/dev/acpi/acpica/Subsystem/evgpeblk.c
index d3fb675cffa..564fab28302 100644
--- a/sys/dev/acpi/acpica/Subsystem/evgpeblk.c
+++ b/sys/dev/acpi/acpica/Subsystem/evgpeblk.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evgpeblk.c,v 1.8 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evgpeblk.c,v 1.9 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acevents.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/evmisc.c b/sys/dev/acpi/acpica/Subsystem/evmisc.c
index 19f551faf61..65e9de52925 100644
--- a/sys/dev/acpi/acpica/Subsystem/evmisc.c
+++ b/sys/dev/acpi/acpica/Subsystem/evmisc.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evmisc.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evmisc.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acevents.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/evregion.c b/sys/dev/acpi/acpica/Subsystem/evregion.c
index 6a412ecf2ef..4f6a86540f1 100644
--- a/sys/dev/acpi/acpica/Subsystem/evregion.c
+++ b/sys/dev/acpi/acpica/Subsystem/evregion.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evregion.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evregion.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EVREGION_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/evrgnini.c b/sys/dev/acpi/acpica/Subsystem/evrgnini.c
index 80a80eb3d0a..9b263e72c25 100644
--- a/sys/dev/acpi/acpica/Subsystem/evrgnini.c
+++ b/sys/dev/acpi/acpica/Subsystem/evrgnini.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evrgnini.c,v 1.12 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evrgnini.c,v 1.13 2005/12/11 12:21:02 christos Exp $");
#define __EVRGNINI_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/evsci.c b/sys/dev/acpi/acpica/Subsystem/evsci.c
index 96a2f17e0c1..a09409a682c 100644
--- a/sys/dev/acpi/acpica/Subsystem/evsci.c
+++ b/sys/dev/acpi/acpica/Subsystem/evsci.c
@@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evsci.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evsci.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acevents.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/evxface.c b/sys/dev/acpi/acpica/Subsystem/evxface.c
index 2dc8c8f9cbd..badc82c24b5 100644
--- a/sys/dev/acpi/acpica/Subsystem/evxface.c
+++ b/sys/dev/acpi/acpica/Subsystem/evxface.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evxface.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evxface.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EVXFACE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/evxfevnt.c b/sys/dev/acpi/acpica/Subsystem/evxfevnt.c
index fcf8236ddfc..f53c930ad26 100644
--- a/sys/dev/acpi/acpica/Subsystem/evxfevnt.c
+++ b/sys/dev/acpi/acpica/Subsystem/evxfevnt.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evxfevnt.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evxfevnt.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EVXFEVNT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/evxfregn.c b/sys/dev/acpi/acpica/Subsystem/evxfregn.c
index 22a06ace073..5b590256939 100644
--- a/sys/dev/acpi/acpica/Subsystem/evxfregn.c
+++ b/sys/dev/acpi/acpica/Subsystem/evxfregn.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: evxfregn.c,v 1.12 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evxfregn.c,v 1.13 2005/12/11 12:21:02 christos Exp $");
#define __EVXFREGN_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exconfig.c b/sys/dev/acpi/acpica/Subsystem/exconfig.c
index 5b242e005ba..3ff791b392a 100644
--- a/sys/dev/acpi/acpica/Subsystem/exconfig.c
+++ b/sys/dev/acpi/acpica/Subsystem/exconfig.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exconfig.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exconfig.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXCONFIG_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exconvrt.c b/sys/dev/acpi/acpica/Subsystem/exconvrt.c
index 86e2dd1c1c4..a9740bb60d2 100644
--- a/sys/dev/acpi/acpica/Subsystem/exconvrt.c
+++ b/sys/dev/acpi/acpica/Subsystem/exconvrt.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exconvrt.c,v 1.13 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exconvrt.c,v 1.14 2005/12/11 12:21:02 christos Exp $");
#define __EXCONVRT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/excreate.c b/sys/dev/acpi/acpica/Subsystem/excreate.c
index 7604cdea4cf..4186c294ccf 100644
--- a/sys/dev/acpi/acpica/Subsystem/excreate.c
+++ b/sys/dev/acpi/acpica/Subsystem/excreate.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: excreate.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: excreate.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXCREATE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exdump.c b/sys/dev/acpi/acpica/Subsystem/exdump.c
index c7c04b4db6c..0c9651130f3 100644
--- a/sys/dev/acpi/acpica/Subsystem/exdump.c
+++ b/sys/dev/acpi/acpica/Subsystem/exdump.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exdump.c,v 1.12 2005/05/31 21:08:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exdump.c,v 1.13 2005/12/11 12:21:02 christos Exp $");
#define __EXDUMP_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exfield.c b/sys/dev/acpi/acpica/Subsystem/exfield.c
index 696c3d7eaf9..0ffe357d973 100644
--- a/sys/dev/acpi/acpica/Subsystem/exfield.c
+++ b/sys/dev/acpi/acpica/Subsystem/exfield.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exfield.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exfield.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXFIELD_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exfldio.c b/sys/dev/acpi/acpica/Subsystem/exfldio.c
index 393a5664415..233010cdcf7 100644
--- a/sys/dev/acpi/acpica/Subsystem/exfldio.c
+++ b/sys/dev/acpi/acpica/Subsystem/exfldio.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exfldio.c,v 1.12 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exfldio.c,v 1.13 2005/12/11 12:21:02 christos Exp $");
#define __EXFLDIO_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exmisc.c b/sys/dev/acpi/acpica/Subsystem/exmisc.c
index e8201471b7a..2d05cf7ea3d 100644
--- a/sys/dev/acpi/acpica/Subsystem/exmisc.c
+++ b/sys/dev/acpi/acpica/Subsystem/exmisc.c
@@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exmisc.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exmisc.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXMISC_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exmutex.c b/sys/dev/acpi/acpica/Subsystem/exmutex.c
index ffa71993741..2f12ef0227f 100644
--- a/sys/dev/acpi/acpica/Subsystem/exmutex.c
+++ b/sys/dev/acpi/acpica/Subsystem/exmutex.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exmutex.c,v 1.14 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exmutex.c,v 1.15 2005/12/11 12:21:02 christos Exp $");
#define __EXMUTEX_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exnames.c b/sys/dev/acpi/acpica/Subsystem/exnames.c
index d4e895816e4..8e89ef5828f 100644
--- a/sys/dev/acpi/acpica/Subsystem/exnames.c
+++ b/sys/dev/acpi/acpica/Subsystem/exnames.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exnames.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exnames.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXNAMES_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exoparg1.c b/sys/dev/acpi/acpica/Subsystem/exoparg1.c
index b4da0c07546..ef56f179d59 100644
--- a/sys/dev/acpi/acpica/Subsystem/exoparg1.c
+++ b/sys/dev/acpi/acpica/Subsystem/exoparg1.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exoparg1.c,v 1.10 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exoparg1.c,v 1.11 2005/12/11 12:21:02 christos Exp $");
#define __EXOPARG1_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exoparg2.c b/sys/dev/acpi/acpica/Subsystem/exoparg2.c
index a895d713355..87814d77076 100644
--- a/sys/dev/acpi/acpica/Subsystem/exoparg2.c
+++ b/sys/dev/acpi/acpica/Subsystem/exoparg2.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exoparg2.c,v 1.10 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exoparg2.c,v 1.11 2005/12/11 12:21:02 christos Exp $");
#define __EXOPARG2_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exoparg3.c b/sys/dev/acpi/acpica/Subsystem/exoparg3.c
index ede2973ff26..32d0e18e5a7 100644
--- a/sys/dev/acpi/acpica/Subsystem/exoparg3.c
+++ b/sys/dev/acpi/acpica/Subsystem/exoparg3.c
@@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exoparg3.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exoparg3.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXOPARG3_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exoparg6.c b/sys/dev/acpi/acpica/Subsystem/exoparg6.c
index 1bbfc46baa4..4a066aacf9f 100644
--- a/sys/dev/acpi/acpica/Subsystem/exoparg6.c
+++ b/sys/dev/acpi/acpica/Subsystem/exoparg6.c
@@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exoparg6.c,v 1.10 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exoparg6.c,v 1.11 2005/12/11 12:21:02 christos Exp $");
#define __EXOPARG6_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exprep.c b/sys/dev/acpi/acpica/Subsystem/exprep.c
index ddd56a91a95..5fb37413706 100644
--- a/sys/dev/acpi/acpica/Subsystem/exprep.c
+++ b/sys/dev/acpi/acpica/Subsystem/exprep.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exprep.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exprep.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXPREP_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exregion.c b/sys/dev/acpi/acpica/Subsystem/exregion.c
index 3e5a1ca2dee..b1851b8972c 100644
--- a/sys/dev/acpi/acpica/Subsystem/exregion.c
+++ b/sys/dev/acpi/acpica/Subsystem/exregion.c
@@ -117,7 +117,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exregion.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exregion.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXREGION_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exresnte.c b/sys/dev/acpi/acpica/Subsystem/exresnte.c
index a2e6d4e1b43..7a0a444af7c 100644
--- a/sys/dev/acpi/acpica/Subsystem/exresnte.c
+++ b/sys/dev/acpi/acpica/Subsystem/exresnte.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exresnte.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exresnte.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXRESNTE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exresolv.c b/sys/dev/acpi/acpica/Subsystem/exresolv.c
index 249a95a756b..5d528359fc3 100644
--- a/sys/dev/acpi/acpica/Subsystem/exresolv.c
+++ b/sys/dev/acpi/acpica/Subsystem/exresolv.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exresolv.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exresolv.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXRESOLV_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exresop.c b/sys/dev/acpi/acpica/Subsystem/exresop.c
index 24fb46e13c5..afe05a23177 100644
--- a/sys/dev/acpi/acpica/Subsystem/exresop.c
+++ b/sys/dev/acpi/acpica/Subsystem/exresop.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exresop.c,v 1.13 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exresop.c,v 1.14 2005/12/11 12:21:02 christos Exp $");
#define __EXRESOP_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exstore.c b/sys/dev/acpi/acpica/Subsystem/exstore.c
index a7a5dd3518e..01d60a382d4 100644
--- a/sys/dev/acpi/acpica/Subsystem/exstore.c
+++ b/sys/dev/acpi/acpica/Subsystem/exstore.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exstore.c,v 1.12 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exstore.c,v 1.13 2005/12/11 12:21:02 christos Exp $");
#define __EXSTORE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exstoren.c b/sys/dev/acpi/acpica/Subsystem/exstoren.c
index 44d6faab348..483d183d604 100644
--- a/sys/dev/acpi/acpica/Subsystem/exstoren.c
+++ b/sys/dev/acpi/acpica/Subsystem/exstoren.c
@@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exstoren.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exstoren.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXSTOREN_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exstorob.c b/sys/dev/acpi/acpica/Subsystem/exstorob.c
index d2e445ccd7c..d55dfe68e21 100644
--- a/sys/dev/acpi/acpica/Subsystem/exstorob.c
+++ b/sys/dev/acpi/acpica/Subsystem/exstorob.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exstorob.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exstorob.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXSTOROB_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exsystem.c b/sys/dev/acpi/acpica/Subsystem/exsystem.c
index 1c6f69a7963..9e95b719aa1 100644
--- a/sys/dev/acpi/acpica/Subsystem/exsystem.c
+++ b/sys/dev/acpi/acpica/Subsystem/exsystem.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exsystem.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exsystem.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXSYSTEM_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/exutils.c b/sys/dev/acpi/acpica/Subsystem/exutils.c
index 7bc1fbd891f..963290cf4a0 100644
--- a/sys/dev/acpi/acpica/Subsystem/exutils.c
+++ b/sys/dev/acpi/acpica/Subsystem/exutils.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exutils.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exutils.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __EXUTILS_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/hwacpi.c b/sys/dev/acpi/acpica/Subsystem/hwacpi.c
index 9f5bfe0d4b0..3ccf6342816 100644
--- a/sys/dev/acpi/acpica/Subsystem/hwacpi.c
+++ b/sys/dev/acpi/acpica/Subsystem/hwacpi.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hwacpi.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hwacpi.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#define __HWACPI_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/hwgpe.c b/sys/dev/acpi/acpica/Subsystem/hwgpe.c
index 8a0bb35377f..3da1711cd77 100644
--- a/sys/dev/acpi/acpica/Subsystem/hwgpe.c
+++ b/sys/dev/acpi/acpica/Subsystem/hwgpe.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hwgpe.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hwgpe.c,v 1.12 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
#include "acevents.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/hwregs.c b/sys/dev/acpi/acpica/Subsystem/hwregs.c
index 926aeaed0ca..40932beda60 100644
--- a/sys/dev/acpi/acpica/Subsystem/hwregs.c
+++ b/sys/dev/acpi/acpica/Subsystem/hwregs.c
@@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hwregs.c,v 1.15 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hwregs.c,v 1.16 2005/12/11 12:21:02 christos Exp $");
#define __HWREGS_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/hwsleep.c b/sys/dev/acpi/acpica/Subsystem/hwsleep.c
index 49b78a36de3..c3f5864c4d4 100644
--- a/sys/dev/acpi/acpica/Subsystem/hwsleep.c
+++ b/sys/dev/acpi/acpica/Subsystem/hwsleep.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hwsleep.c,v 1.14 2005/10/23 16:39:29 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hwsleep.c,v 1.15 2005/12/11 12:21:02 christos Exp $");
#include "acpi.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/hwtimer.c b/sys/dev/acpi/acpica/Subsystem/hwtimer.c
index fd323354d0e..fd287ac8fa7 100644
--- a/sys/dev/acpi/acpica/Subsystem/hwtimer.c
+++ b/sys/dev/acpi/acpica/Subsystem/hwtimer.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hwtimer.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hwtimer.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#include "acpi.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/nsaccess.c b/sys/dev/acpi/acpica/Subsystem/nsaccess.c
index 2e866c4e0f9..7edddde7ac5 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsaccess.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsaccess.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsaccess.c,v 1.12 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsaccess.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __NSACCESS_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsalloc.c b/sys/dev/acpi/acpica/Subsystem/nsalloc.c
index 1360ee6ab43..e79fb4fdae4 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsalloc.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsalloc.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsalloc.c,v 1.15 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsalloc.c,v 1.16 2005/12/11 12:21:03 christos Exp $");
#define __NSALLOC_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsdump.c b/sys/dev/acpi/acpica/Subsystem/nsdump.c
index a3785fa729c..df5f8d0ea4c 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsdump.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsdump.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsdump.c,v 1.14 2005/05/31 21:08:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsdump.c,v 1.15 2005/12/11 12:21:03 christos Exp $");
#define __NSDUMP_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsdumpdv.c b/sys/dev/acpi/acpica/Subsystem/nsdumpdv.c
index 814914162ae..9b4dc0ddf48 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsdumpdv.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsdumpdv.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsdumpdv.c,v 1.6 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsdumpdv.c,v 1.7 2005/12/11 12:21:03 christos Exp $");
#define __NSDUMPDV_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nseval.c b/sys/dev/acpi/acpica/Subsystem/nseval.c
index 93ba68f1e75..eb7c1f02d47 100644
--- a/sys/dev/acpi/acpica/Subsystem/nseval.c
+++ b/sys/dev/acpi/acpica/Subsystem/nseval.c
@@ -117,7 +117,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nseval.c,v 1.13 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nseval.c,v 1.14 2005/12/11 12:21:03 christos Exp $");
#define __NSEVAL_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsinit.c b/sys/dev/acpi/acpica/Subsystem/nsinit.c
index 479f74d0962..c732ec05bd8 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsinit.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsinit.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsinit.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsinit.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __NSXFINIT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsload.c b/sys/dev/acpi/acpica/Subsystem/nsload.c
index a1569ba8510..14886ca730c 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsload.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsload.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsload.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsload.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __NSLOAD_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsnames.c b/sys/dev/acpi/acpica/Subsystem/nsnames.c
index b91f3db77aa..dc0ebf43105 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsnames.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsnames.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsnames.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsnames.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __NSNAMES_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsobject.c b/sys/dev/acpi/acpica/Subsystem/nsobject.c
index 05b96ecc3e0..070932e085e 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsobject.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsobject.c
@@ -117,7 +117,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsobject.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsobject.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __NSOBJECT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsparse.c b/sys/dev/acpi/acpica/Subsystem/nsparse.c
index a045a7e7bad..46ea9fbcfe4 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsparse.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsparse.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsparse.c,v 1.6 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsparse.c,v 1.7 2005/12/11 12:21:03 christos Exp $");
#define __NSPARSE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nssearch.c b/sys/dev/acpi/acpica/Subsystem/nssearch.c
index f32bb812fe4..037e4a7eb1d 100644
--- a/sys/dev/acpi/acpica/Subsystem/nssearch.c
+++ b/sys/dev/acpi/acpica/Subsystem/nssearch.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nssearch.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nssearch.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __NSSEARCH_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsutils.c b/sys/dev/acpi/acpica/Subsystem/nsutils.c
index 9d496f96fcf..581787527c1 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsutils.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsutils.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsutils.c,v 1.13 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsutils.c,v 1.14 2005/12/11 12:21:03 christos Exp $");
#define __NSUTILS_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nswalk.c b/sys/dev/acpi/acpica/Subsystem/nswalk.c
index bcd7e1a25a2..a78947c815b 100644
--- a/sys/dev/acpi/acpica/Subsystem/nswalk.c
+++ b/sys/dev/acpi/acpica/Subsystem/nswalk.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nswalk.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nswalk.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __NSWALK_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsxfeval.c b/sys/dev/acpi/acpica/Subsystem/nsxfeval.c
index eed925b4c9a..0c51d9d7e80 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsxfeval.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsxfeval.c
@@ -117,7 +117,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsxfeval.c,v 1.7 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsxfeval.c,v 1.8 2005/12/11 12:21:03 christos Exp $");
#define __NSXFEVAL_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsxfname.c b/sys/dev/acpi/acpica/Subsystem/nsxfname.c
index 4909cd1404c..97615bc0a31 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsxfname.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsxfname.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsxfname.c,v 1.12 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsxfname.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __NSXFNAME_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/nsxfobj.c b/sys/dev/acpi/acpica/Subsystem/nsxfobj.c
index bb7714d3986..c4b878b68fb 100644
--- a/sys/dev/acpi/acpica/Subsystem/nsxfobj.c
+++ b/sys/dev/acpi/acpica/Subsystem/nsxfobj.c
@@ -117,7 +117,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsxfobj.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsxfobj.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __NSXFOBJ_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/psargs.c b/sys/dev/acpi/acpica/Subsystem/psargs.c
index 74457d554b2..15b003655cc 100644
--- a/sys/dev/acpi/acpica/Subsystem/psargs.c
+++ b/sys/dev/acpi/acpica/Subsystem/psargs.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psargs.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psargs.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __PSARGS_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/psopcode.c b/sys/dev/acpi/acpica/Subsystem/psopcode.c
index 594043bc282..5b9daedba34 100644
--- a/sys/dev/acpi/acpica/Subsystem/psopcode.c
+++ b/sys/dev/acpi/acpica/Subsystem/psopcode.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psopcode.c,v 1.12 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psopcode.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#include "acpi.h"
#include "acparser.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/psparse.c b/sys/dev/acpi/acpica/Subsystem/psparse.c
index 11834898d30..87773429575 100644
--- a/sys/dev/acpi/acpica/Subsystem/psparse.c
+++ b/sys/dev/acpi/acpica/Subsystem/psparse.c
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psparse.c,v 1.12 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psparse.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#include "acpi.h"
#include "acparser.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/psscope.c b/sys/dev/acpi/acpica/Subsystem/psscope.c
index 2c88ac1c787..a58d80d0ab0 100644
--- a/sys/dev/acpi/acpica/Subsystem/psscope.c
+++ b/sys/dev/acpi/acpica/Subsystem/psscope.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psscope.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psscope.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#include "acpi.h"
#include "acparser.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/pstree.c b/sys/dev/acpi/acpica/Subsystem/pstree.c
index 7d53b175e1e..f09a18a7d36 100644
--- a/sys/dev/acpi/acpica/Subsystem/pstree.c
+++ b/sys/dev/acpi/acpica/Subsystem/pstree.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pstree.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pstree.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __PSTREE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/psutils.c b/sys/dev/acpi/acpica/Subsystem/psutils.c
index d73fbcda2ca..a15f36baefa 100644
--- a/sys/dev/acpi/acpica/Subsystem/psutils.c
+++ b/sys/dev/acpi/acpica/Subsystem/psutils.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psutils.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psutils.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#include "acpi.h"
#include "acparser.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/pswalk.c b/sys/dev/acpi/acpica/Subsystem/pswalk.c
index e24d75b0580..fdff025afd8 100644
--- a/sys/dev/acpi/acpica/Subsystem/pswalk.c
+++ b/sys/dev/acpi/acpica/Subsystem/pswalk.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pswalk.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pswalk.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#include "acpi.h"
#include "acparser.h"
diff --git a/sys/dev/acpi/acpica/Subsystem/psxface.c b/sys/dev/acpi/acpica/Subsystem/psxface.c
index d7a6cbaff01..6e85831b76a 100644
--- a/sys/dev/acpi/acpica/Subsystem/psxface.c
+++ b/sys/dev/acpi/acpica/Subsystem/psxface.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psxface.c,v 1.11 2005/05/02 14:52:09 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psxface.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __PSXFACE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/rsaddr.c b/sys/dev/acpi/acpica/Subsystem/rsaddr.c
index 07bac298210..430992a2df7 100644
--- a/sys/dev/acpi/acpica/Subsystem/rsaddr.c
+++ b/sys/dev/acpi/acpica/Subsystem/rsaddr.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsaddr.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsaddr.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __RSADDR_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/rscalc.c b/sys/dev/acpi/acpica/Subsystem/rscalc.c
index f064b941811..6952a71593e 100644
--- a/sys/dev/acpi/acpica/Subsystem/rscalc.c
+++ b/sys/dev/acpi/acpica/Subsystem/rscalc.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rscalc.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rscalc.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __RSCALC_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/rscreate.c b/sys/dev/acpi/acpica/Subsystem/rscreate.c
index 260defba0ff..8b66103061c 100644
--- a/sys/dev/acpi/acpica/Subsystem/rscreate.c
+++ b/sys/dev/acpi/acpica/Subsystem/rscreate.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rscreate.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rscreate.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __RSCREATE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/rsdump.c b/sys/dev/acpi/acpica/Subsystem/rsdump.c
index 543ecb6ade0..610641b5ced 100644
--- a/sys/dev/acpi/acpica/Subsystem/rsdump.c
+++ b/sys/dev/acpi/acpica/Subsystem/rsdump.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsdump.c,v 1.13 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsdump.c,v 1.14 2005/12/11 12:21:03 christos Exp $");
#define __RSDUMP_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/rsio.c b/sys/dev/acpi/acpica/Subsystem/rsio.c
index 3407d3a4f3a..1424b3cba13 100644
--- a/sys/dev/acpi/acpica/Subsystem/rsio.c
+++ b/sys/dev/acpi/acpica/Subsystem/rsio.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsio.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsio.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __RSIO_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/rsirq.c b/sys/dev/acpi/acpica/Subsystem/rsirq.c
index 53ffa79b1b9..9830cd48756 100644
--- a/sys/dev/acpi/acpica/Subsystem/rsirq.c
+++ b/sys/dev/acpi/acpica/Subsystem/rsirq.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsirq.c,v 1.12 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsirq.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __RSIRQ_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/rslist.c b/sys/dev/acpi/acpica/Subsystem/rslist.c
index 58e5dc9b1e0..f825291ba60 100644
--- a/sys/dev/acpi/acpica/Subsystem/rslist.c
+++ b/sys/dev/acpi/acpica/Subsystem/rslist.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rslist.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rslist.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __RSLIST_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/rsmemory.c b/sys/dev/acpi/acpica/Subsystem/rsmemory.c
index 5e550ce47eb..492db2179d9 100644
--- a/sys/dev/acpi/acpica/Subsystem/rsmemory.c
+++ b/sys/dev/acpi/acpica/Subsystem/rsmemory.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsmemory.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsmemory.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __RSMEMORY_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/rsmisc.c b/sys/dev/acpi/acpica/Subsystem/rsmisc.c
index 5a24a747adf..e49fc824510 100644
--- a/sys/dev/acpi/acpica/Subsystem/rsmisc.c
+++ b/sys/dev/acpi/acpica/Subsystem/rsmisc.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsmisc.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsmisc.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __RSMISC_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/rsutils.c b/sys/dev/acpi/acpica/Subsystem/rsutils.c
index b1fcfad5e8f..b1f88f64bd9 100644
--- a/sys/dev/acpi/acpica/Subsystem/rsutils.c
+++ b/sys/dev/acpi/acpica/Subsystem/rsutils.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsutils.c,v 1.12 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsutils.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __RSUTILS_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/rsxface.c b/sys/dev/acpi/acpica/Subsystem/rsxface.c
index 7e66fb4155f..d1c8d6cb2a2 100644
--- a/sys/dev/acpi/acpica/Subsystem/rsxface.c
+++ b/sys/dev/acpi/acpica/Subsystem/rsxface.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rsxface.c,v 1.12 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rsxface.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __RSXFACE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/tbconvrt.c b/sys/dev/acpi/acpica/Subsystem/tbconvrt.c
index 1074e8769df..adac354eb4b 100644
--- a/sys/dev/acpi/acpica/Subsystem/tbconvrt.c
+++ b/sys/dev/acpi/acpica/Subsystem/tbconvrt.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tbconvrt.c,v 1.12 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tbconvrt.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __TBCONVRT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/tbget.c b/sys/dev/acpi/acpica/Subsystem/tbget.c
index 57bc40d69ee..1305f63d2dd 100644
--- a/sys/dev/acpi/acpica/Subsystem/tbget.c
+++ b/sys/dev/acpi/acpica/Subsystem/tbget.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tbget.c,v 1.12 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tbget.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __TBGET_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/tbgetall.c b/sys/dev/acpi/acpica/Subsystem/tbgetall.c
index 7c2d65c7396..21b2b99832d 100644
--- a/sys/dev/acpi/acpica/Subsystem/tbgetall.c
+++ b/sys/dev/acpi/acpica/Subsystem/tbgetall.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tbgetall.c,v 1.7 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tbgetall.c,v 1.8 2005/12/11 12:21:03 christos Exp $");
#define __TBGETALL_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/tbinstal.c b/sys/dev/acpi/acpica/Subsystem/tbinstal.c
index b8a77580833..5943dce791d 100644
--- a/sys/dev/acpi/acpica/Subsystem/tbinstal.c
+++ b/sys/dev/acpi/acpica/Subsystem/tbinstal.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tbinstal.c,v 1.12 2005/05/31 21:08:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tbinstal.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __TBINSTAL_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/tbrsdt.c b/sys/dev/acpi/acpica/Subsystem/tbrsdt.c
index d7516245d1f..7a275ca2479 100644
--- a/sys/dev/acpi/acpica/Subsystem/tbrsdt.c
+++ b/sys/dev/acpi/acpica/Subsystem/tbrsdt.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tbrsdt.c,v 1.7 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tbrsdt.c,v 1.8 2005/12/11 12:21:03 christos Exp $");
#define __TBRSDT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/tbutils.c b/sys/dev/acpi/acpica/Subsystem/tbutils.c
index b7175abd8da..f1873f2aaf8 100644
--- a/sys/dev/acpi/acpica/Subsystem/tbutils.c
+++ b/sys/dev/acpi/acpica/Subsystem/tbutils.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tbutils.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tbutils.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __TBUTILS_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/tbxface.c b/sys/dev/acpi/acpica/Subsystem/tbxface.c
index 8b7ee78faa8..0b746de51bb 100644
--- a/sys/dev/acpi/acpica/Subsystem/tbxface.c
+++ b/sys/dev/acpi/acpica/Subsystem/tbxface.c
@@ -116,7 +116,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tbxface.c,v 1.11 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tbxface.c,v 1.12 2005/12/11 12:21:03 christos Exp $");
#define __TBXFACE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/tbxfroot.c b/sys/dev/acpi/acpica/Subsystem/tbxfroot.c
index d3bb50579eb..b915c964b62 100644
--- a/sys/dev/acpi/acpica/Subsystem/tbxfroot.c
+++ b/sys/dev/acpi/acpica/Subsystem/tbxfroot.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tbxfroot.c,v 1.13 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tbxfroot.c,v 1.14 2005/12/11 12:21:03 christos Exp $");
#define __TBXFROOT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/utalloc.c b/sys/dev/acpi/acpica/Subsystem/utalloc.c
index 47a80c00831..e6ff2f589d5 100644
--- a/sys/dev/acpi/acpica/Subsystem/utalloc.c
+++ b/sys/dev/acpi/acpica/Subsystem/utalloc.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utalloc.c,v 1.13 2005/05/31 21:08:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utalloc.c,v 1.14 2005/12/11 12:21:03 christos Exp $");
#define __UTALLOC_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/utcopy.c b/sys/dev/acpi/acpica/Subsystem/utcopy.c
index 3fa18095b66..083b05fbc00 100644
--- a/sys/dev/acpi/acpica/Subsystem/utcopy.c
+++ b/sys/dev/acpi/acpica/Subsystem/utcopy.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utcopy.c,v 1.13 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utcopy.c,v 1.14 2005/12/11 12:21:03 christos Exp $");
#define __UTCOPY_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/utdebug.c b/sys/dev/acpi/acpica/Subsystem/utdebug.c
index 742333d17ce..3c4065f74cc 100644
--- a/sys/dev/acpi/acpica/Subsystem/utdebug.c
+++ b/sys/dev/acpi/acpica/Subsystem/utdebug.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utdebug.c,v 1.12 2005/05/31 21:08:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utdebug.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __UTDEBUG_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/utdelete.c b/sys/dev/acpi/acpica/Subsystem/utdelete.c
index 791a457454f..b0715dc6464 100644
--- a/sys/dev/acpi/acpica/Subsystem/utdelete.c
+++ b/sys/dev/acpi/acpica/Subsystem/utdelete.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utdelete.c,v 1.13 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utdelete.c,v 1.14 2005/12/11 12:21:03 christos Exp $");
#define __UTDELETE_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/uteval.c b/sys/dev/acpi/acpica/Subsystem/uteval.c
index b100933e312..9cd5b263cc6 100644
--- a/sys/dev/acpi/acpica/Subsystem/uteval.c
+++ b/sys/dev/acpi/acpica/Subsystem/uteval.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uteval.c,v 1.12 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uteval.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __UTEVAL_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/utglobal.c b/sys/dev/acpi/acpica/Subsystem/utglobal.c
index 13c6e006960..9c23e848e2c 100644
--- a/sys/dev/acpi/acpica/Subsystem/utglobal.c
+++ b/sys/dev/acpi/acpica/Subsystem/utglobal.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utglobal.c,v 1.14 2005/05/31 21:08:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utglobal.c,v 1.15 2005/12/11 12:21:03 christos Exp $");
#define __UTGLOBAL_C__
#define DEFINE_ACPI_GLOBALS
diff --git a/sys/dev/acpi/acpica/Subsystem/utinit.c b/sys/dev/acpi/acpica/Subsystem/utinit.c
index e8216fc95a4..f561b3434bc 100644
--- a/sys/dev/acpi/acpica/Subsystem/utinit.c
+++ b/sys/dev/acpi/acpica/Subsystem/utinit.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utinit.c,v 1.12 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utinit.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __UTINIT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/utmath.c b/sys/dev/acpi/acpica/Subsystem/utmath.c
index 7e9938c3297..e11d8b4ce08 100644
--- a/sys/dev/acpi/acpica/Subsystem/utmath.c
+++ b/sys/dev/acpi/acpica/Subsystem/utmath.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utmath.c,v 1.10 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utmath.c,v 1.11 2005/12/11 12:21:03 christos Exp $");
#define __UTMATH_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/utmisc.c b/sys/dev/acpi/acpica/Subsystem/utmisc.c
index 9abd44abe50..2855027044a 100644
--- a/sys/dev/acpi/acpica/Subsystem/utmisc.c
+++ b/sys/dev/acpi/acpica/Subsystem/utmisc.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utmisc.c,v 1.13 2005/05/31 21:08:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utmisc.c,v 1.14 2005/12/11 12:21:03 christos Exp $");
#define __UTMISC_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/utobject.c b/sys/dev/acpi/acpica/Subsystem/utobject.c
index 637c7bd778c..d49f7528ce6 100644
--- a/sys/dev/acpi/acpica/Subsystem/utobject.c
+++ b/sys/dev/acpi/acpica/Subsystem/utobject.c
@@ -115,7 +115,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utobject.c,v 1.14 2005/05/29 20:56:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utobject.c,v 1.15 2005/12/11 12:21:03 christos Exp $");
#define __UTOBJECT_C__
diff --git a/sys/dev/acpi/acpica/Subsystem/utxface.c b/sys/dev/acpi/acpica/Subsystem/utxface.c
index 17bb42f59e6..2b0a14f6bba 100644
--- a/sys/dev/acpi/acpica/Subsystem/utxface.c
+++ b/sys/dev/acpi/acpica/Subsystem/utxface.c
@@ -116,7 +116,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utxface.c,v 1.12 2005/05/02 14:52:10 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utxface.c,v 1.13 2005/12/11 12:21:03 christos Exp $");
#define __UTXFACE_C__
diff --git a/sys/dev/acpi/acpica/files.acpica b/sys/dev/acpi/acpica/files.acpica
index f64efee2f08..b79ac7f1123 100644
--- a/sys/dev/acpi/acpica/files.acpica
+++ b/sys/dev/acpi/acpica/files.acpica
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpica,v 1.9 2003/12/13 18:10:59 kochi Exp $
+# $NetBSD: files.acpica,v 1.10 2005/12/11 12:21:02 christos Exp $
file dev/acpi/acpica/Osd/OsdEnvironment.c acpi
file dev/acpi/acpica/Osd/OsdHardware.c acpi
diff --git a/sys/dev/acpi/acpireg.h b/sys/dev/acpi/acpireg.h
index ada7d0a505c..b301ebde823 100644
--- a/sys/dev/acpi/acpireg.h
+++ b/sys/dev/acpi/acpireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: acpireg.h,v 1.4 2005/01/29 18:06:18 jmcneill Exp $ */
+/* $NetBSD: acpireg.h,v 1.5 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
diff --git a/sys/dev/acpi/acpivar.h b/sys/dev/acpi/acpivar.h
index e2cb051c7e5..5ee40fe87f1 100644
--- a/sys/dev/acpi/acpivar.h
+++ b/sys/dev/acpi/acpivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.23 2005/06/01 16:44:38 drochner Exp $ */
+/* $NetBSD: acpivar.h,v 1.24 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
diff --git a/sys/dev/acpi/atppc_acpi.c b/sys/dev/acpi/atppc_acpi.c
index 843b963bfb7..134463a1348 100644
--- a/sys/dev/acpi/atppc_acpi.c
+++ b/sys/dev/acpi/atppc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_acpi.c,v 1.5 2004/05/01 12:03:48 kochi Exp $ */
+/* $NetBSD: atppc_acpi.c,v 1.6 2005/12/11 12:21:02 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.5 2004/05/01 12:03:48 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.6 2005/12/11 12:21:02 christos Exp $");
#include "opt_atppc.h"
diff --git a/sys/dev/acpi/attimer_acpi.c b/sys/dev/acpi/attimer_acpi.c
index 48b0d367bdc..0e18eeaa717 100644
--- a/sys/dev/acpi/attimer_acpi.c
+++ b/sys/dev/acpi/attimer_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: attimer_acpi.c,v 1.1 2005/03/25 23:06:19 cube Exp $ */
+/* $NetBSD: attimer_acpi.c,v 1.2 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.1 2005/03/25 23:06:19 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: attimer_acpi.c,v 1.2 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/com_acpi.c b/sys/dev/acpi/com_acpi.c
index 364770ef4fd..2877bc598d8 100644
--- a/sys/dev/acpi/com_acpi.c
+++ b/sys/dev/acpi/com_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_acpi.c,v 1.15 2004/05/01 12:03:48 kochi Exp $ */
+/* $NetBSD: com_acpi.c,v 1.16 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.15 2004/05/01 12:03:48 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_acpi.c,v 1.16 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/devlist2h.awk b/sys/dev/acpi/devlist2h.awk
index b7cb2ad108a..ec74ae7d574 100644
--- a/sys/dev/acpi/devlist2h.awk
+++ b/sys/dev/acpi/devlist2h.awk
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: devlist2h.awk,v 1.5 2005/02/27 05:18:32 perry Exp $
+# $NetBSD: devlist2h.awk,v 1.6 2005/12/11 12:21:02 christos Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
# All rights reserved.
diff --git a/sys/dev/acpi/fdc_acpi.c b/sys/dev/acpi/fdc_acpi.c
index af089331d49..6d08fe0d686 100644
--- a/sys/dev/acpi/fdc_acpi.c
+++ b/sys/dev/acpi/fdc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.26 2005/07/11 18:31:12 drochner Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.27 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.26 2005/07/11 18:31:12 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.27 2005/12/11 12:21:02 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/acpi/files.acpi b/sys/dev/acpi/files.acpi
index df02e8b826c..5a16de3506c 100644
--- a/sys/dev/acpi/files.acpi
+++ b/sys/dev/acpi/files.acpi
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.32 2005/06/21 08:19:25 sekiya Exp $
+# $NetBSD: files.acpi,v 1.33 2005/12/11 12:21:02 christos Exp $
include "dev/acpi/acpica/files.acpica"
diff --git a/sys/dev/acpi/joy_acpi.c b/sys/dev/acpi/joy_acpi.c
index 3477066024f..70708b2ea0a 100644
--- a/sys/dev/acpi/joy_acpi.c
+++ b/sys/dev/acpi/joy_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_acpi.c,v 1.1 2004/12/02 14:33:31 xtraeme Exp $ */
+/* $NetBSD: joy_acpi.c,v 1.2 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.1 2004/12/02 14:33:31 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_acpi.c,v 1.2 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/lpt_acpi.c b/sys/dev/acpi/lpt_acpi.c
index 4451269bcd8..b7fd9e9f64b 100644
--- a/sys/dev/acpi/lpt_acpi.c
+++ b/sys/dev/acpi/lpt_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_acpi.c,v 1.10 2004/05/01 12:03:48 kochi Exp $ */
+/* $NetBSD: lpt_acpi.c,v 1.11 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.10 2004/05/01 12:03:48 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.11 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/mpu_acpi.c b/sys/dev/acpi/mpu_acpi.c
index faf96374c5c..26c1769f1f1 100644
--- a/sys/dev/acpi/mpu_acpi.c
+++ b/sys/dev/acpi/mpu_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_acpi.c,v 1.1 2004/12/02 09:50:42 xtraeme Exp $ */
+/* $NetBSD: mpu_acpi.c,v 1.2 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.1 2004/12/02 09:50:42 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.2 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/pckbc_acpi.c b/sys/dev/acpi/pckbc_acpi.c
index c98029d5c79..b0c94fc267d 100644
--- a/sys/dev/acpi/pckbc_acpi.c
+++ b/sys/dev/acpi/pckbc_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_acpi.c,v 1.15 2004/05/01 12:03:48 kochi Exp $ */
+/* $NetBSD: pckbc_acpi.c,v 1.16 2005/12/11 12:21:02 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.15 2004/05/01 12:03:48 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.16 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/pcppi_acpi.c b/sys/dev/acpi/pcppi_acpi.c
index 1780c8080ab..9c216482f40 100644
--- a/sys/dev/acpi/pcppi_acpi.c
+++ b/sys/dev/acpi/pcppi_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi_acpi.c,v 1.1 2005/03/21 14:06:46 xtraeme Exp $ */
+/* $NetBSD: pcppi_acpi.c,v 1.2 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.1 2005/03/21 14:06:46 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi_acpi.c,v 1.2 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/acpi/wss_acpi.c b/sys/dev/acpi/wss_acpi.c
index 7b47de1b550..082d1c5e9a8 100644
--- a/sys/dev/acpi/wss_acpi.c
+++ b/sys/dev/acpi/wss_acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_acpi.c,v 1.13 2004/05/01 12:03:48 kochi Exp $ */
+/* $NetBSD: wss_acpi.c,v 1.14 2005/12/11 12:21:02 christos Exp $ */
/*
* Copyright (c) 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.13 2004/05/01 12:03:48 kochi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_acpi.c,v 1.14 2005/12/11 12:21:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/apm/apmbios.h b/sys/dev/apm/apmbios.h
index 5cae74da8b7..6ff3ce5c587 100644
--- a/sys/dev/apm/apmbios.h
+++ b/sys/dev/apm/apmbios.h
@@ -1,4 +1,4 @@
-/* $NetBSD: apmbios.h,v 1.2 2004/05/11 22:44:24 wiz Exp $ */
+/* $NetBSD: apmbios.h,v 1.3 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/apm/apmio.h b/sys/dev/apm/apmio.h
index 1898bffdefe..541f0a2f058 100644
--- a/sys/dev/apm/apmio.h
+++ b/sys/dev/apm/apmio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: apmio.h,v 1.2 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: apmio.h,v 1.3 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/arcbios/arcbios.c b/sys/dev/arcbios/arcbios.c
index 139605cddde..8e3b80a6101 100644
--- a/sys/dev/arcbios/arcbios.c
+++ b/sys/dev/arcbios/arcbios.c
@@ -1,4 +1,4 @@
-/* $NetBSD: arcbios.c,v 1.10 2005/04/18 15:38:01 tsutsui Exp $ */
+/* $NetBSD: arcbios.c,v 1.11 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcbios.c,v 1.10 2005/04/18 15:38:01 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcbios.c,v 1.11 2005/12/11 12:21:14 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/arcbios/arcbios.h b/sys/dev/arcbios/arcbios.h
index c8435fafc87..77d4f7e10a2 100644
--- a/sys/dev/arcbios/arcbios.h
+++ b/sys/dev/arcbios/arcbios.h
@@ -1,4 +1,4 @@
-/* $NetBSD: arcbios.h,v 1.9 2005/06/03 18:58:40 martin Exp $ */
+/* $NetBSD: arcbios.h,v 1.10 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/arcbios/arcbios_tty.c b/sys/dev/arcbios/arcbios_tty.c
index 482ca05bce9..a33aaa6026c 100644
--- a/sys/dev/arcbios/arcbios_tty.c
+++ b/sys/dev/arcbios/arcbios_tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: arcbios_tty.c,v 1.10 2005/09/06 21:40:39 kleink Exp $ */
+/* $NetBSD: arcbios_tty.c,v 1.11 2005/12/11 12:21:14 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcbios_tty.c,v 1.10 2005/09/06 21:40:39 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcbios_tty.c,v 1.11 2005/12/11 12:21:14 christos Exp $");
#include <sys/param.h>
#include <sys/user.h>
@@ -70,7 +70,7 @@ const struct cdevsw arcbios_cdevsw = {
};
int
-arcbios_ttyopen(dev_t dev, int flag, int mode, struct proc *p)
+arcbios_ttyopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = minor(dev);
struct tty *tp;
@@ -102,7 +102,7 @@ arcbios_ttyopen(dev_t dev, int flag, int mode, struct proc *p)
setuptimeout = 1;
} else if (tp->t_state & TS_XCLUDE &&
- suser(p->p_ucred, &p->p_acflag) != 0) {
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0) {
splx(s);
return (EBUSY);
}
@@ -117,7 +117,7 @@ arcbios_ttyopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-arcbios_ttyclose(dev_t dev, int flag, int mode, struct proc *p)
+arcbios_ttyclose(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = minor(dev);
struct tty *tp = arcbios_tty[unit];
@@ -145,24 +145,24 @@ arcbios_ttywrite(dev_t dev, struct uio *uio, int flag)
}
int
-arcbios_ttypoll(dev_t dev, int events, struct proc *p)
+arcbios_ttypoll(dev_t dev, int events, struct lwp *l)
{
struct tty *tp = arcbios_tty[minor(dev)];
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
int
-arcbios_ttyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+arcbios_ttyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int unit = minor(dev);
struct tty *tp = arcbios_tty[unit];
int error;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- return (ttioctl(tp, cmd, data, flag, p));
+ return (ttioctl(tp, cmd, data, flag, l));
}
int
diff --git a/sys/dev/arcbios/arcbiosvar.h b/sys/dev/arcbios/arcbiosvar.h
index 5a0fe52b603..b721949d5dd 100644
--- a/sys/dev/arcbios/arcbiosvar.h
+++ b/sys/dev/arcbios/arcbiosvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: arcbiosvar.h,v 1.4 2004/04/10 19:32:53 pooka Exp $ */
+/* $NetBSD: arcbiosvar.h,v 1.5 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ata/Makefile b/sys/dev/ata/Makefile
index 00fe60cfa01..709805f4f47 100644
--- a/sys/dev/ata/Makefile
+++ b/sys/dev/ata/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/14 17:14:47 thorpej Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 12:21:14 christos Exp $
INCSDIR= /usr/include/dev/ata
diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c
index 1a6b6127b1d..64185dfb67b 100644
--- a/sys/dev/ata/ata.c
+++ b/sys/dev/ata/ata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.71 2005/07/07 17:51:31 drochner Exp $ */
+/* $NetBSD: ata.c,v 1.72 2005/12/11 12:21:14 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.71 2005/07/07 17:51:31 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.72 2005/12/11 12:21:14 christos Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -1318,7 +1318,7 @@ ata_probe_caps(struct ata_drive_datas *drvp)
/* management of the /dev/atabus* devices */
int
-atabusopen(dev_t dev, int flag, int fmt, struct proc *p)
+atabusopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct atabus_softc *sc;
int error, unit = minor(dev);
@@ -1340,7 +1340,7 @@ atabusopen(dev_t dev, int flag, int fmt, struct proc *p)
int
-atabusclose(dev_t dev, int flag, int fmt, struct proc *p)
+atabusclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct atabus_softc *sc = atabus_cd.cd_devs[minor(dev)];
@@ -1352,7 +1352,7 @@ atabusclose(dev_t dev, int flag, int fmt, struct proc *p)
}
int
-atabusioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+atabusioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct atabus_softc *sc = atabus_cd.cd_devs[minor(dev)];
struct ata_channel *chp = sc->sc_chan;
diff --git a/sys/dev/ata/ata_raid.c b/sys/dev/ata/ata_raid.c
index e01baa56699..2f3a63a7798 100644
--- a/sys/dev/ata/ata_raid.c
+++ b/sys/dev/ata/ata_raid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid.c,v 1.16 2005/08/25 22:33:18 drochner Exp $ */
+/* $NetBSD: ata_raid.c,v 1.17 2005/12/11 12:21:14 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.16 2005/08/25 22:33:18 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid.c,v 1.17 2005/12/11 12:21:14 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
diff --git a/sys/dev/ata/ata_raid_adaptec.c b/sys/dev/ata/ata_raid_adaptec.c
index 487af18bee2..f3b0fab9292 100644
--- a/sys/dev/ata/ata_raid_adaptec.c
+++ b/sys/dev/ata/ata_raid_adaptec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_adaptec.c,v 1.1 2005/06/20 02:11:57 briggs Exp $ */
+/* $NetBSD: ata_raid_adaptec.c,v 1.2 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_adaptec.c,v 1.1 2005/06/20 02:11:57 briggs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_adaptec.c,v 1.2 2005/12/11 12:21:14 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
diff --git a/sys/dev/ata/ata_raid_promise.c b/sys/dev/ata/ata_raid_promise.c
index b871c0132f4..af17319b522 100644
--- a/sys/dev/ata/ata_raid_promise.c
+++ b/sys/dev/ata/ata_raid_promise.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_promise.c,v 1.5 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: ata_raid_promise.c,v 1.6 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_promise.c,v 1.5 2005/02/27 00:26:58 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_promise.c,v 1.6 2005/12/11 12:21:14 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
diff --git a/sys/dev/ata/ata_raidreg.h b/sys/dev/ata/ata_raidreg.h
index 5466529447e..c88be7db7ea 100644
--- a/sys/dev/ata/ata_raidreg.h
+++ b/sys/dev/ata/ata_raidreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raidreg.h,v 1.2 2005/06/20 02:11:57 briggs Exp $ */
+/* $NetBSD: ata_raidreg.h,v 1.3 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 2000,2001,2002 Søren Schmidt <sos@FreeBSD.org>
diff --git a/sys/dev/ata/ata_raidvar.h b/sys/dev/ata/ata_raidvar.h
index 90b68882d0f..6ffd4ed5baa 100644
--- a/sys/dev/ata/ata_raidvar.h
+++ b/sys/dev/ata/ata_raidvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raidvar.h,v 1.3 2005/07/18 15:21:48 briggs Exp $ */
+/* $NetBSD: ata_raidvar.h,v 1.4 2005/12/11 12:21:14 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 360625ef1b2..0762dbc7507 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_wdc.c,v 1.82 2005/07/06 01:46:52 thorpej Exp $ */
+/* $NetBSD: ata_wdc.c,v 1.83 2005/12/11 12:21:14 christos Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.82 2005/07/06 01:46:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_wdc.c,v 1.83 2005/12/11 12:21:14 christos Exp $");
#ifndef ATADEBUG
#define ATADEBUG
diff --git a/sys/dev/ata/atareg.h b/sys/dev/ata/atareg.h
index 2439cc7b118..505d92d1d5c 100644
--- a/sys/dev/ata/atareg.h
+++ b/sys/dev/ata/atareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atareg.h,v 1.23 2005/04/12 11:45:40 drochner Exp $ */
+/* $NetBSD: atareg.h,v 1.24 2005/12/11 12:21:14 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h
index 5073aa20129..96fe3d0fd56 100644
--- a/sys/dev/ata/atavar.h
+++ b/sys/dev/ata/atavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atavar.h,v 1.69 2005/06/07 13:45:11 peter Exp $ */
+/* $NetBSD: atavar.h,v 1.70 2005/12/11 12:21:14 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
diff --git a/sys/dev/ata/files.ata b/sys/dev/ata/files.ata
index 806fef5da6e..72ea2741ccf 100644
--- a/sys/dev/ata/files.ata
+++ b/sys/dev/ata/files.ata
@@ -1,4 +1,4 @@
-# $NetBSD: files.ata,v 1.12 2005/06/20 02:11:57 briggs Exp $
+# $NetBSD: files.ata,v 1.13 2005/12/11 12:21:14 christos Exp $
#
# Config file and device description for machine-independent devices
# which attach to ATA busses. Included by ports that need it. Ports
diff --git a/sys/dev/ata/ld_ataraid.c b/sys/dev/ata/ld_ataraid.c
index e18f82dfa1e..0445a77559f 100644
--- a/sys/dev/ata/ld_ataraid.c
+++ b/sys/dev/ata/ld_ataraid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_ataraid.c,v 1.13 2004/10/28 07:07:39 yamt Exp $ */
+/* $NetBSD: ld_ataraid.c,v 1.14 2005/12/11 12:21:14 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.13 2004/10/28 07:07:39 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_ataraid.c,v 1.14 2005/12/11 12:21:14 christos Exp $");
#include "rnd.h"
@@ -227,7 +227,7 @@ ld_ataraid_attach(struct device *parent, struct device *self, void *aux)
vp = sc->sc_vnodes[i];
sc->sc_vnodes[i] = NULL;
if (vp != NULL)
- (void) vn_close(vp, FREAD|FWRITE, NOCRED, curproc);
+ (void) vn_close(vp, FREAD|FWRITE, NOCRED, curlwp);
}
finish:
diff --git a/sys/dev/ata/sata_subr.c b/sys/dev/ata/sata_subr.c
index 3b96665d576..d125ea396ec 100644
--- a/sys/dev/ata/sata_subr.c
+++ b/sys/dev/ata/sata_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sata_subr.c,v 1.1 2004/05/28 23:26:27 thorpej Exp $ */
+/* $NetBSD: sata_subr.c,v 1.2 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ata/satapmpreg.h b/sys/dev/ata/satapmpreg.h
index 5d2c536c040..208b7abfdf3 100644
--- a/sys/dev/ata/satapmpreg.h
+++ b/sys/dev/ata/satapmpreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: satapmpreg.h,v 1.1 2004/08/21 02:25:26 thorpej Exp $ */
+/* $NetBSD: satapmpreg.h,v 1.2 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ata/satareg.h b/sys/dev/ata/satareg.h
index 324af26c4e0..17e3455a091 100644
--- a/sys/dev/ata/satareg.h
+++ b/sys/dev/ata/satareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: satareg.h,v 1.3 2004/05/23 23:07:59 wiz Exp $ */
+/* $NetBSD: satareg.h,v 1.4 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ata/satavar.h b/sys/dev/ata/satavar.h
index e72c97b5106..7277f5f2284 100644
--- a/sys/dev/ata/satavar.h
+++ b/sys/dev/ata/satavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: satavar.h,v 1.1 2004/05/28 23:26:27 thorpej Exp $ */
+/* $NetBSD: satavar.h,v 1.2 2005/12/11 12:21:14 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 27e2c875ddc..644c1750939 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.313 2005/11/01 20:44:04 martin Exp $ */
+/* $NetBSD: wd.c,v 1.314 2005/12/11 12:21:14 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.313 2005/11/01 20:44:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.314 2005/12/11 12:21:14 christos Exp $");
#ifndef ATADEBUG
#define ATADEBUG
@@ -874,7 +874,7 @@ wdwrite(dev_t dev, struct uio *uio, int flags)
}
int
-wdopen(dev_t dev, int flag, int fmt, struct proc *p)
+wdopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct wd_softc *wd;
int part, error;
@@ -962,7 +962,7 @@ wdopen(dev_t dev, int flag, int fmt, struct proc *p)
}
int
-wdclose(dev_t dev, int flag, int fmt, struct proc *p)
+wdclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct wd_softc *wd = device_lookup(&wd_cd, WDUNIT(dev));
int part = WDPART(dev);
@@ -1134,7 +1134,7 @@ wdperror(const struct wd_softc *wd)
}
int
-wdioctl(dev_t dev, u_long xfer, caddr_t addr, int flag, struct proc *p)
+wdioctl(dev_t dev, u_long xfer, caddr_t addr, int flag, struct lwp *l)
{
struct wd_softc *wd = device_lookup(&wd_cd, WDUNIT(dev));
int error = 0, s;
@@ -1344,7 +1344,7 @@ bad:
auio.uio_segflg = 0;
auio.uio_offset =
fop->df_startblk * wd->sc_dk.dk_label->d_secsize;
- auio.uio_procp = p;
+ auio.uio_lwp = l;
error = physio(wdformat, NULL, dev, B_WRITE, minphys,
&auio);
fop->df_count -= auio.uio_resid;
@@ -1389,7 +1389,7 @@ bad:
wi->wi_uio.uio_segflg = UIO_USERSPACE;
wi->wi_uio.uio_rw =
(atareq->flags & ATACMD_READ) ? B_READ : B_WRITE;
- wi->wi_uio.uio_procp = p;
+ wi->wi_uio.uio_lwp = l;
error1 = physio(wdioctlstrategy, &wi->wi_bp, dev,
(atareq->flags & ATACMD_READ) ? B_READ : B_WRITE,
minphys, &wi->wi_uio);
@@ -1400,7 +1400,7 @@ bad:
wi->wi_bp.b_data = 0;
wi->wi_bp.b_bcount = 0;
wi->wi_bp.b_dev = 0;
- wi->wi_bp.b_proc = p;
+ wi->wi_bp.b_proc = l->l_proc;
wdioctlstrategy(&wi->wi_bp);
error1 = wi->wi_bp.b_error;
}
@@ -1437,7 +1437,7 @@ bad:
{
struct dkwedge_list *dkwl = (void *) addr;
- return (dkwedge_list(&wd->sc_dk, dkwl, p));
+ return (dkwedge_list(&wd->sc_dk, dkwl, l));
}
default:
diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h
index 5d4a4b9e5ee..5bd337fda8b 100644
--- a/sys/dev/ata/wdvar.h
+++ b/sys/dev/ata/wdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wdvar.h,v 1.31 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: wdvar.h,v 1.32 2005/12/11 12:21:14 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
diff --git a/sys/dev/auconv.c b/sys/dev/auconv.c
index 99e468876b7..06009822b5e 100644
--- a/sys/dev/auconv.c
+++ b/sys/dev/auconv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auconv.c,v 1.12 2005/01/10 22:01:36 kent Exp $ */
+/* $NetBSD: auconv.c,v 1.13 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.12 2005/01/10 22:01:36 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.13 2005/12/11 12:20:53 christos Exp $");
#include <sys/types.h>
#include <sys/audioio.h>
diff --git a/sys/dev/auconv.h b/sys/dev/auconv.h
index 11c1c8a8b79..2f2764b58d7 100644
--- a/sys/dev/auconv.h
+++ b/sys/dev/auconv.h
@@ -1,4 +1,4 @@
-/* $NetBSD: auconv.h,v 1.13 2005/06/18 11:22:12 kent Exp $ */
+/* $NetBSD: auconv.h,v 1.14 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 7940d4b3e67..0084fd19313 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.197 2005/06/21 14:01:11 ws Exp $ */
+/* $NetBSD: audio.c,v 1.198 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.197 2005/06/21 14:01:11 ws Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.198 2005/12/11 12:20:53 christos Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -106,19 +106,19 @@ int audio_blk_ms = AUDIO_BLK_MS;
int audiosetinfo(struct audio_softc *, struct audio_info *);
int audiogetinfo(struct audio_softc *, struct audio_info *);
-int audio_open(dev_t, struct audio_softc *, int, int, struct proc *);
-int audio_close(struct audio_softc *, int, int, struct proc *);
+int audio_open(dev_t, struct audio_softc *, int, int, struct lwp *);
+int audio_close(struct audio_softc *, int, int, struct lwp *);
int audio_read(struct audio_softc *, struct uio *, int);
int audio_write(struct audio_softc *, struct uio *, int);
-int audio_ioctl(struct audio_softc *, u_long, caddr_t, int, struct proc *);
-int audio_poll(struct audio_softc *, int, struct proc *);
+int audio_ioctl(struct audio_softc *, u_long, caddr_t, int, struct lwp *);
+int audio_poll(struct audio_softc *, int, struct lwp *);
int audio_kqfilter(struct audio_softc *, struct knote *);
paddr_t audio_mmap(struct audio_softc *, off_t, int);
-int mixer_open(dev_t, struct audio_softc *, int, int, struct proc *);
-int mixer_close(struct audio_softc *, int, int, struct proc *);
-int mixer_ioctl(struct audio_softc *, u_long, caddr_t, int, struct proc *);
-static void mixer_remove(struct audio_softc *, struct proc *);
+int mixer_open(dev_t, struct audio_softc *, int, int, struct lwp *);
+int mixer_close(struct audio_softc *, int, int, struct lwp *);
+int mixer_ioctl(struct audio_softc *, u_long, caddr_t, int, struct lwp *);
+static void mixer_remove(struct audio_softc *, struct lwp *);
static void mixer_signal(struct audio_softc *);
void audio_init_record(struct audio_softc *);
@@ -888,7 +888,7 @@ stream_filter_list_prepend(stream_filter_list_t *list,
}
int
-audioopen(dev_t dev, int flags, int ifmt, struct proc *p)
+audioopen(dev_t dev, int flags, int ifmt, struct lwp *l)
{
struct audio_softc *sc;
int error;
@@ -904,13 +904,13 @@ audioopen(dev_t dev, int flags, int ifmt, struct proc *p)
switch (AUDIODEV(dev)) {
case SOUND_DEVICE:
case AUDIO_DEVICE:
- error = audio_open(dev, sc, flags, ifmt, p);
+ error = audio_open(dev, sc, flags, ifmt, l);
break;
case AUDIOCTL_DEVICE:
error = 0;
break;
case MIXER_DEVICE:
- error = mixer_open(dev, sc, flags, ifmt, p);
+ error = mixer_open(dev, sc, flags, ifmt, l);
break;
default:
error = ENXIO;
@@ -922,7 +922,7 @@ audioopen(dev_t dev, int flags, int ifmt, struct proc *p)
}
int
-audioclose(dev_t dev, int flags, int ifmt, struct proc *p)
+audioclose(dev_t dev, int flags, int ifmt, struct lwp *l)
{
struct audio_softc *sc;
int unit;
@@ -933,10 +933,10 @@ audioclose(dev_t dev, int flags, int ifmt, struct proc *p)
switch (AUDIODEV(dev)) {
case SOUND_DEVICE:
case AUDIO_DEVICE:
- error = audio_close(sc, flags, ifmt, p);
+ error = audio_close(sc, flags, ifmt, l);
break;
case MIXER_DEVICE:
- error = mixer_close(sc, flags, ifmt, p);
+ error = mixer_close(sc, flags, ifmt, l);
break;
case AUDIOCTL_DEVICE:
error = 0;
@@ -1013,7 +1013,7 @@ audiowrite(dev_t dev, struct uio *uio, int ioflag)
}
int
-audioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+audioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct audio_softc *sc;
int error;
@@ -1027,10 +1027,10 @@ audioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
case SOUND_DEVICE:
case AUDIO_DEVICE:
case AUDIOCTL_DEVICE:
- error = audio_ioctl(sc, cmd, addr, flag, p);
+ error = audio_ioctl(sc, cmd, addr, flag, l);
break;
case MIXER_DEVICE:
- error = mixer_ioctl(sc, cmd, addr, flag, p);
+ error = mixer_ioctl(sc, cmd, addr, flag, l);
break;
default:
error = ENXIO;
@@ -1042,7 +1042,7 @@ audioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
}
int
-audiopoll(dev_t dev, int events, struct proc *p)
+audiopoll(dev_t dev, int events, struct lwp *l)
{
struct audio_softc *sc;
int revents;
@@ -1055,7 +1055,7 @@ audiopoll(dev_t dev, int events, struct proc *p)
switch (AUDIODEV(dev)) {
case SOUND_DEVICE:
case AUDIO_DEVICE:
- revents = audio_poll(sc, events, p);
+ revents = audio_poll(sc, events, l);
break;
case AUDIOCTL_DEVICE:
case MIXER_DEVICE:
@@ -1275,7 +1275,7 @@ audio_wakeup(int *chan)
int
audio_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt,
- struct proc *p)
+ struct lwp *l)
{
int error;
u_int mode;
@@ -1469,7 +1469,7 @@ audio_drain(struct audio_softc *sc)
*/
/* ARGSUSED */
int
-audio_close(struct audio_softc *sc, int flags, int ifmt, struct proc *p)
+audio_close(struct audio_softc *sc, int flags, int ifmt, struct lwp *l)
{
const struct audio_hw_if *hw;
int s;
@@ -1942,7 +1942,7 @@ audio_write(struct audio_softc *sc, struct uio *uio, int ioflag)
int
audio_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
- struct proc *p)
+ struct lwp *l)
{
const struct audio_hw_if *hw;
struct audio_offset *ao;
@@ -1967,8 +1967,8 @@ audio_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
if (*(int *)addr) {
if (sc->sc_async_audio)
return EBUSY;
- sc->sc_async_audio = p;
- DPRINTF(("audio_ioctl: FIOASYNC %p\n", p));
+ sc->sc_async_audio = l->l_proc;
+ DPRINTF(("audio_ioctl: FIOASYNC %p\n", l->l_proc));
} else
sc->sc_async_audio = 0;
break;
@@ -2108,7 +2108,7 @@ audio_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
default:
if (hw->dev_ioctl) {
- error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, p);
+ error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, l);
} else {
DPRINTF(("audio_ioctl: unknown ioctl\n"));
error = EINVAL;
@@ -2121,7 +2121,7 @@ audio_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
}
int
-audio_poll(struct audio_softc *sc, int events, struct proc *p)
+audio_poll(struct audio_softc *sc, int events, struct lwp *l)
{
int revents;
int s;
@@ -2159,10 +2159,10 @@ audio_poll(struct audio_softc *sc, int events, struct proc *p)
if (revents == 0) {
if (events & (POLLIN | POLLRDNORM))
- selrecord(p, &sc->sc_rsel);
+ selrecord(l, &sc->sc_rsel);
if (events & (POLLOUT | POLLWRNORM))
- selrecord(p, &sc->sc_wsel);
+ selrecord(l, &sc->sc_wsel);
}
splx(s);
@@ -3517,7 +3517,7 @@ audiogetinfo(struct audio_softc *sc, struct audio_info *ai)
*/
int
mixer_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt,
- struct proc *p)
+ struct lwp *l)
{
if (sc->hw_if == NULL)
return ENXIO;
@@ -3531,9 +3531,10 @@ mixer_open(dev_t dev, struct audio_softc *sc, int flags, int ifmt,
* Remove a process from those to be signalled on mixer activity.
*/
static void
-mixer_remove(struct audio_softc *sc, struct proc *p)
+mixer_remove(struct audio_softc *sc, struct lwp *l)
{
struct mixer_asyncs **pm, *m;
+ struct proc *p = l->l_proc;
for (pm = &sc->sc_async_mixer; *pm; pm = &(*pm)->next) {
if ((*pm)->proc == p) {
@@ -3562,17 +3563,17 @@ mixer_signal(struct audio_softc *sc)
*/
/* ARGSUSED */
int
-mixer_close(struct audio_softc *sc, int flags, int ifmt, struct proc *p)
+mixer_close(struct audio_softc *sc, int flags, int ifmt, struct lwp *l)
{
DPRINTF(("mixer_close: sc %p\n", sc));
- mixer_remove(sc, p);
+ mixer_remove(sc, l);
return 0;
}
int
mixer_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
- struct proc *p)
+ struct lwp *l)
{
const struct audio_hw_if *hw;
int error;
@@ -3583,13 +3584,13 @@ mixer_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
error = EINVAL;
switch (cmd) {
case FIOASYNC:
- mixer_remove(sc, p); /* remove old entry */
+ mixer_remove(sc, l); /* remove old entry */
if (*(int *)addr) {
struct mixer_asyncs *ma;
ma = malloc(sizeof (struct mixer_asyncs),
M_DEVBUF, M_WAITOK);
ma->next = sc->sc_async_mixer;
- ma->proc = p;
+ ma->proc = l->l_proc;
sc->sc_async_mixer = ma;
}
error = 0;
@@ -3622,7 +3623,7 @@ mixer_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
default:
if (hw->dev_ioctl)
- error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, p);
+ error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, l);
else
error = EINVAL;
break;
diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h
index beb66c24cc8..2a17e80107a 100644
--- a/sys/dev/audio_if.h
+++ b/sys/dev/audio_if.h
@@ -1,4 +1,4 @@
-/* $NetBSD: audio_if.h,v 1.55 2005/01/10 22:01:37 kent Exp $ */
+/* $NetBSD: audio_if.h,v 1.56 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1994 Havard Eidnes.
@@ -235,7 +235,7 @@ struct audio_hw_if {
void (*)(void *), void *, const audio_params_t *);
int (*trigger_input)(void *, void *, void *, int,
void (*)(void *), void *, const audio_params_t *);
- int (*dev_ioctl)(void *, u_long, caddr_t, int, struct proc *);
+ int (*dev_ioctl)(void *, u_long, caddr_t, int, struct lwp *);
};
struct audio_attach_args {
diff --git a/sys/dev/audiobell.c b/sys/dev/audiobell.c
index f45cd4a90e7..7d2a91211f9 100644
--- a/sys/dev/audiobell.c
+++ b/sys/dev/audiobell.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audiobell.c,v 1.1 2004/01/17 20:55:59 bjh21 Exp $ */
+/* $NetBSD: audiobell.c,v 1.2 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1999 Richard Earnshaw
@@ -31,7 +31,7 @@
*/
#include <sys/types.h>
-__KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.1 2004/01/17 20:55:59 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audiobell.c,v 1.2 2005/12/11 12:20:53 christos Exp $");
#include <sys/audioio.h>
#include <sys/conf.h>
@@ -160,7 +160,7 @@ audiobell(void *arg, u_int pitch, u_int period, u_int volume, int poll)
auio.uio_resid = period * 8;
auio.uio_segflg = UIO_SYSSPACE;
auio.uio_rw = UIO_WRITE;
- auio.uio_procp = NULL;
+ auio.uio_lwp = NULL;
audiowrite(AUDIO_DEVICE | audio->dv_unit, &auio, 0);
diff --git a/sys/dev/audiobellvar.h b/sys/dev/audiobellvar.h
index a6060ce4617..cc105f897fa 100644
--- a/sys/dev/audiobellvar.h
+++ b/sys/dev/audiobellvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: audiobellvar.h,v 1.3 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: audiobellvar.h,v 1.4 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2004 Ben Harris
diff --git a/sys/dev/audiovar.h b/sys/dev/audiovar.h
index 6704eb4ac3e..95fbbbd9bef 100644
--- a/sys/dev/audiovar.h
+++ b/sys/dev/audiovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: audiovar.h,v 1.32 2005/01/10 22:01:37 kent Exp $ */
+/* $NetBSD: audiovar.h,v 1.33 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/aurateconv.c b/sys/dev/aurateconv.c
index e5d31279d0b..5eeea47bf0e 100644
--- a/sys/dev/aurateconv.c
+++ b/sys/dev/aurateconv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aurateconv.c,v 1.14 2005/05/31 00:48:57 christos Exp $ */
+/* $NetBSD: aurateconv.c,v 1.15 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aurateconv.c,v 1.14 2005/05/31 00:48:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aurateconv.c,v 1.15 2005/12/11 12:20:53 christos Exp $");
#include <sys/systm.h>
#include <sys/types.h>
diff --git a/sys/dev/bi/bi.c b/sys/dev/bi/bi.c
index 52b1089fe02..864e542f689 100644
--- a/sys/dev/bi/bi.c
+++ b/sys/dev/bi/bi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bi.c,v 1.20 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: bi.c,v 1.21 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.20 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bi.c,v 1.21 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/bi/bireg.h b/sys/dev/bi/bireg.h
index 6e703d94120..ea56da50dae 100644
--- a/sys/dev/bi/bireg.h
+++ b/sys/dev/bi/bireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bireg.h,v 1.9 2004/02/13 11:36:20 wiz Exp $ */
+/* $NetBSD: bireg.h,v 1.10 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/bi/bivar.h b/sys/dev/bi/bivar.h
index afe0fe76dd5..9bc3adcbdd0 100644
--- a/sys/dev/bi/bivar.h
+++ b/sys/dev/bi/bivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bivar.h,v 1.11 2005/06/27 11:05:24 ragge Exp $ */
+/* $NetBSD: bivar.h,v 1.12 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
diff --git a/sys/dev/bi/if_ni.c b/sys/dev/bi/if_ni.c
index 1845e2bb29c..26f4ace894d 100644
--- a/sys/dev/bi/if_ni.c
+++ b/sys/dev/bi/if_ni.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ni.c,v 1.26 2005/06/27 11:05:24 ragge Exp $ */
+/* $NetBSD: if_ni.c,v 1.27 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.26 2005/06/27 11:05:24 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ni.c,v 1.27 2005/12/11 12:21:15 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/bi/if_nireg.h b/sys/dev/bi/if_nireg.h
index 691d59f167d..a257d3845c1 100644
--- a/sys/dev/bi/if_nireg.h
+++ b/sys/dev/bi/if_nireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nireg.h,v 1.5 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: if_nireg.h,v 1.6 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/bi/kdb.c b/sys/dev/bi/kdb.c
index 2614542c281..1183ec727a1 100644
--- a/sys/dev/bi/kdb.c
+++ b/sys/dev/bi/kdb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kdb.c,v 1.37 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: kdb.c,v 1.38 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.37 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kdb.c,v 1.38 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/bi/kdbreg.h b/sys/dev/bi/kdbreg.h
index 4427e9e05f9..f978f31c455 100644
--- a/sys/dev/bi/kdbreg.h
+++ b/sys/dev/bi/kdbreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kdbreg.h,v 1.4 2003/08/07 16:30:53 agc Exp $ */
+/* $NetBSD: kdbreg.h,v 1.5 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/bi/uba_bi.c b/sys/dev/bi/uba_bi.c
index 13e18203631..62ea3bbc09d 100644
--- a/sys/dev/bi/uba_bi.c
+++ b/sys/dev/bi/uba_bi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uba_bi.c,v 1.10 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: uba_bi.c,v 1.11 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba_bi.c,v 1.10 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba_bi.c,v 1.11 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/bluetooth/bluetooth.c b/sys/dev/bluetooth/bluetooth.c
index fb7f4c9602b..9f582c65885 100644
--- a/sys/dev/bluetooth/bluetooth.c
+++ b/sys/dev/bluetooth/bluetooth.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bluetooth.c,v 1.3 2003/07/14 15:47:03 lukem Exp $ */
+/* $NetBSD: bluetooth.c,v 1.4 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bluetooth.c,v 1.3 2003/07/14 15:47:03 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bluetooth.c,v 1.4 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/bluetooth/bluetooth.h b/sys/dev/bluetooth/bluetooth.h
index 330cad05a1a..85a87c235e5 100644
--- a/sys/dev/bluetooth/bluetooth.h
+++ b/sys/dev/bluetooth/bluetooth.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bluetooth.h,v 1.5 2004/01/04 05:47:43 dsainty Exp $ */
+/* $NetBSD: bluetooth.h,v 1.6 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/bluetooth/bthci.c b/sys/dev/bluetooth/bthci.c
index 4d149d53fac..c325058feae 100644
--- a/sys/dev/bluetooth/bthci.c
+++ b/sys/dev/bluetooth/bthci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bthci.c,v 1.16 2005/07/02 07:50:34 dsainty Exp $ */
+/* $NetBSD: bthci.c,v 1.17 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bthci.c,v 1.16 2005/07/02 07:50:34 dsainty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bthci.c,v 1.17 2005/12/11 12:21:15 christos Exp $");
#include "bthcidrv.h"
diff --git a/sys/dev/bluetooth/files.bluetooth b/sys/dev/bluetooth/files.bluetooth
index 95b25027157..c981c8c1f71 100644
--- a/sys/dev/bluetooth/files.bluetooth
+++ b/sys/dev/bluetooth/files.bluetooth
@@ -1,4 +1,4 @@
-# $NetBSD: files.bluetooth,v 1.4 2004/06/22 10:37:00 soren Exp $
+# $NetBSD: files.bluetooth,v 1.5 2005/12/11 12:21:15 christos Exp $
define btbus { }
diff --git a/sys/dev/cardbus/adv_cardbus.c b/sys/dev/cardbus/adv_cardbus.c
index 9e959e8ffff..a6110dff12b 100644
--- a/sys/dev/cardbus/adv_cardbus.c
+++ b/sys/dev/cardbus/adv_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_cardbus.c,v 1.11 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: adv_cardbus.c,v 1.12 2005/12/11 12:21:15 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.11 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_cardbus.c,v 1.12 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/cardbus/ahc_cardbus.c b/sys/dev/cardbus/ahc_cardbus.c
index 96346e243cd..5724ed8b8cb 100644
--- a/sys/dev/cardbus/ahc_cardbus.c
+++ b/sys/dev/cardbus/ahc_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_cardbus.c,v 1.17 2005/05/12 06:21:01 augustss Exp $ */
+/* $NetBSD: ahc_cardbus.c,v 1.18 2005/12/11 12:21:15 christos Exp $ */
/*-
* Copyright (c) 2000, 2005 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.17 2005/05/12 06:21:01 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_cardbus.c,v 1.18 2005/12/11 12:21:15 christos Exp $");
#include "opt_ahc_cardbus.h"
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 59f56fb2456..267bfefd245 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus.c,v 1.67 2005/10/25 16:37:50 drochner Exp $ */
+/* $NetBSD: cardbus.c,v 1.68 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.67 2005/10/25 16:37:50 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.68 2005/12/11 12:21:15 christos Exp $");
#include "opt_cardbus.h"
diff --git a/sys/dev/cardbus/cardbus_exrom.c b/sys/dev/cardbus/cardbus_exrom.c
index 9390927ef1d..c1ea0b85d13 100644
--- a/sys/dev/cardbus/cardbus_exrom.c
+++ b/sys/dev/cardbus/cardbus_exrom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus_exrom.c,v 1.8 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: cardbus_exrom.c,v 1.9 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus_exrom.c,v 1.8 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus_exrom.c,v 1.9 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/cardbus/cardbus_exrom.h b/sys/dev/cardbus/cardbus_exrom.h
index caac7ac4609..07eeffbbb1c 100644
--- a/sys/dev/cardbus/cardbus_exrom.h
+++ b/sys/dev/cardbus/cardbus_exrom.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus_exrom.h,v 1.4 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: cardbus_exrom.h,v 1.5 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cardbus/cardbus_map.c b/sys/dev/cardbus/cardbus_map.c
index 617ea273239..bbf9a7ec18b 100644
--- a/sys/dev/cardbus/cardbus_map.c
+++ b/sys/dev/cardbus/cardbus_map.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbus_map.c,v 1.17 2005/09/09 14:50:58 drochner Exp $ */
+/* $NetBSD: cardbus_map.c,v 1.18 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.17 2005/09/09 14:50:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardbus_map.c,v 1.18 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index 2082e53106d..0947637608f 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cardbusvar.h,v 1.34 2005/09/09 14:50:58 drochner Exp $ */
+/* $NetBSD: cardbusvar.h,v 1.35 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index 36b71bd5bdd..29490e7b911 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cardslot.c,v 1.27 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: cardslot.c,v 1.28 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1999 and 2000
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.27 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cardslot.c,v 1.28 2005/12/11 12:21:15 christos Exp $");
#include "opt_cardslot.h"
diff --git a/sys/dev/cardbus/cardslotvar.h b/sys/dev/cardbus/cardslotvar.h
index dc76b0dd2b4..4d69cbcb64d 100644
--- a/sys/dev/cardbus/cardslotvar.h
+++ b/sys/dev/cardbus/cardslotvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cardslotvar.h,v 1.9 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: cardslotvar.h,v 1.10 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1999
diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c
index 8c8f5d21bd5..1ed8cbdf120 100644
--- a/sys/dev/cardbus/com_cardbus.c
+++ b/sys/dev/cardbus/com_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_cardbus.c,v 1.14 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: com_cardbus.c,v 1.15 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -40,7 +40,7 @@
updated below. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_cardbus.c,v 1.14 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_cardbus.c,v 1.15 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c
index 7ab07bac724..83660909c77 100644
--- a/sys/dev/cardbus/ehci_cardbus.c
+++ b/sys/dev/cardbus/ehci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_cardbus.c,v 1.12 2005/09/09 14:50:58 drochner Exp $ */
+/* $NetBSD: ehci_cardbus.c,v 1.13 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.12 2005/09/09 14:50:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_cardbus.c,v 1.13 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/cardbus/files.cardbus b/sys/dev/cardbus/files.cardbus
index c9b83728491..d2e918332c2 100644
--- a/sys/dev/cardbus/files.cardbus
+++ b/sys/dev/cardbus/files.cardbus
@@ -1,4 +1,4 @@
-# $NetBSD: files.cardbus,v 1.31 2005/10/25 16:37:50 drochner Exp $
+# $NetBSD: files.cardbus,v 1.32 2005/12/11 12:21:15 christos Exp $
#
# files.cardbus
#
diff --git a/sys/dev/cardbus/fwohci_cardbus.c b/sys/dev/cardbus/fwohci_cardbus.c
index 9bcecdd323f..d30047c1a62 100644
--- a/sys/dev/cardbus/fwohci_cardbus.c
+++ b/sys/dev/cardbus/fwohci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci_cardbus.c,v 1.14 2005/07/11 15:37:04 kiyohara Exp $ */
+/* $NetBSD: fwohci_cardbus.c,v 1.15 2005/12/11 12:21:15 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.14 2005/07/11 15:37:04 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_cardbus.c,v 1.15 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c
index 92917709b9b..f02e53bfb8b 100644
--- a/sys/dev/cardbus/if_ath_cardbus.c
+++ b/sys/dev/cardbus/if_ath_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.7 2005/06/22 06:15:37 dyoung Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.8 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.7 2005/06/22 06:15:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.8 2005/12/11 12:21:15 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c
index 03aca93b2b0..b9e1124f93e 100644
--- a/sys/dev/cardbus/if_atw_cardbus.c
+++ b/sys/dev/cardbus/if_atw_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_cardbus.c,v 1.12 2005/06/22 06:15:37 dyoung Exp $ */
+/* $NetBSD: if_atw_cardbus.c,v 1.13 2005/12/11 12:21:15 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.12 2005/06/22 06:15:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.13 2005/12/11 12:21:15 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/cardbus/if_ex_cardbus.c b/sys/dev/cardbus/if_ex_cardbus.c
index 18cf643c385..29dea1206a9 100644
--- a/sys/dev/cardbus/if_ex_cardbus.c
+++ b/sys/dev/cardbus/if_ex_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_cardbus.c,v 1.35 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: if_ex_cardbus.c,v 1.36 2005/12/11 12:21:15 christos Exp $ */
/*
* CardBus specific routines for 3Com 3C575-family CardBus ethernet adapter
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.35 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.36 2005/12/11 12:21:15 christos Exp $");
/* #define EX_DEBUG 4 */ /* define to report information for debugging */
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index 57d16b70092..4696bcf53e5 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_cardbus.c,v 1.20 2005/09/09 14:50:58 drochner Exp $ */
+/* $NetBSD: if_fxp_cardbus.c,v 1.21 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.20 2005/09/09 14:50:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.21 2005/12/11 12:21:15 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/cardbus/if_ral_cardbus.c b/sys/dev/cardbus/if_ral_cardbus.c
index c04d98b22d9..f285f3fe934 100644
--- a/sys/dev/cardbus/if_ral_cardbus.c
+++ b/sys/dev/cardbus/if_ral_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ral_cardbus.c,v 1.2 2005/07/04 17:50:09 drochner Exp $ */
+/* $NetBSD: if_ral_cardbus.c,v 1.3 2005/12/11 12:21:15 christos Exp $ */
/* $OpenBSD: if_ral_cardbus.c,v 1.5 2005/05/16 01:36:25 brad Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.2 2005/07/04 17:50:09 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_cardbus.c,v 1.3 2005/12/11 12:21:15 christos Exp $");
#include "bpfilter.h"
diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c
index f7f547667c8..7ad360f1079 100644
--- a/sys/dev/cardbus/if_re_cardbus.c
+++ b/sys/dev/cardbus/if_re_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_re_cardbus.c,v 1.5 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: if_re_cardbus.c,v 1.6 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 2004 Jonathan Stone
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.5 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.6 2005/12/11 12:21:15 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/cardbus/if_rtk_cardbus.c b/sys/dev/cardbus/if_rtk_cardbus.c
index fb54c150a7d..eaa6525afed 100644
--- a/sys/dev/cardbus/if_rtk_cardbus.c
+++ b/sys/dev/cardbus/if_rtk_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_cardbus.c,v 1.25 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: if_rtk_cardbus.c,v 1.26 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 2000 Masanori Kanaoka
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.25 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_cardbus.c,v 1.26 2005/12/11 12:21:15 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index 836fc02554f..8e3c4eddeec 100644
--- a/sys/dev/cardbus/if_rtw_cardbus.c
+++ b/sys/dev/cardbus/if_rtw_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_cardbus.c,v 1.7 2005/06/22 06:15:37 dyoung Exp $ */
+/* $NetBSD: if_rtw_cardbus.c,v 1.8 2005/12/11 12:21:15 christos Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.7 2005/06/22 06:15:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.8 2005/12/11 12:21:15 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/cardbus/if_tlp_cardbus.c b/sys/dev/cardbus/if_tlp_cardbus.c
index 765b837ad85..a2ea24e9376 100644
--- a/sys/dev/cardbus/if_tlp_cardbus.c
+++ b/sys/dev/cardbus/if_tlp_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_cardbus.c,v 1.47 2005/09/09 14:50:58 drochner Exp $ */
+/* $NetBSD: if_tlp_cardbus.c,v 1.48 2005/12/11 12:21:15 christos Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.47 2005/09/09 14:50:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_cardbus.c,v 1.48 2005/12/11 12:21:15 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/cardbus/njs_cardbus.c b/sys/dev/cardbus/njs_cardbus.c
index cab58742d0c..29bb7bedf63 100644
--- a/sys/dev/cardbus/njs_cardbus.c
+++ b/sys/dev/cardbus/njs_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: njs_cardbus.c,v 1.2 2004/08/26 18:38:19 thorpej Exp $ */
+/* $NetBSD: njs_cardbus.c,v 1.3 2005/12/11 12:21:15 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njs_cardbus.c,v 1.2 2004/08/26 18:38:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njs_cardbus.c,v 1.3 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index a1b215ac42b..9793484b1c0 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_cardbus.c,v 1.20 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: ohci_cardbus.c,v 1.21 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.20 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_cardbus.c,v 1.21 2005/12/11 12:21:15 christos Exp $");
#include "ehci_cardbus.h"
diff --git a/sys/dev/cardbus/rbus.c b/sys/dev/cardbus/rbus.c
index 7399d46fe96..a3dddc951b8 100644
--- a/sys/dev/cardbus/rbus.c
+++ b/sys/dev/cardbus/rbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus.c,v 1.22 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: rbus.c,v 1.23 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1999 and 2000
* HAYAKAWA Koichi. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.22 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus.c,v 1.23 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/cardbus/rbus.h b/sys/dev/cardbus/rbus.h
index e6b27f36627..ef272df89b3 100644
--- a/sys/dev/cardbus/rbus.h
+++ b/sys/dev/cardbus/rbus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus.h,v 1.8 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: rbus.h,v 1.9 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1999
* HAYAKAWA Koichi. All rights reserved.
diff --git a/sys/dev/cardbus/rbus_ppb.c b/sys/dev/cardbus/rbus_ppb.c
index 9de2ea2d185..e04d6d4ec96 100644
--- a/sys/dev/cardbus/rbus_ppb.c
+++ b/sys/dev/cardbus/rbus_ppb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_ppb.c,v 1.16 2005/09/09 13:48:10 drochner Exp $ */
+/* $NetBSD: rbus_ppb.c,v 1.17 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.16 2005/09/09 13:48:10 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_ppb.c,v 1.17 2005/12/11 12:21:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c
index 9b2096d03ef..37dae52a008 100644
--- a/sys/dev/cardbus/uhci_cardbus.c
+++ b/sys/dev/cardbus/uhci_cardbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_cardbus.c,v 1.1 2005/07/24 08:48:03 augustss Exp $ */
+/* $NetBSD: uhci_cardbus.c,v 1.2 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 1998-2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.1 2005/07/24 08:48:03 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_cardbus.c,v 1.2 2005/12/11 12:21:15 christos Exp $");
#include "ehci_cardbus.h"
diff --git a/sys/dev/cardbus/usb_cardbus.h b/sys/dev/cardbus/usb_cardbus.h
index 68f4afcd345..33048f75741 100644
--- a/sys/dev/cardbus/usb_cardbus.h
+++ b/sys/dev/cardbus/usb_cardbus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_cardbus.h,v 1.2 2005/09/09 14:50:58 drochner Exp $ */
+/* $NetBSD: usb_cardbus.h,v 1.3 2005/12/11 12:21:15 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index a1eb7c98918..3f6dbe21e94 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.106 2005/10/15 17:29:11 yamt Exp $ */
+/* $NetBSD: ccd.c,v 1.107 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.106 2005/10/15 17:29:11 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.107 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -192,8 +192,8 @@ static void ccdstart(struct ccd_softc *);
static void ccdinterleave(struct ccd_softc *);
static void ccdintr(struct ccd_softc *, struct buf *);
static int ccdinit(struct ccd_softc *, char **, struct vnode **,
- struct proc *);
-static int ccdlookup(char *, struct proc *p, struct vnode **);
+ struct lwp *);
+static int ccdlookup(char *, struct lwp *, struct vnode **);
static struct ccdbuf *ccdbuffer(struct ccd_softc *, struct buf *,
daddr_t, caddr_t, long);
static void ccdgetdefaultlabel(struct ccd_softc *, struct disklabel *);
@@ -267,7 +267,7 @@ ccdattach(int num)
static int
ccdinit(struct ccd_softc *cs, char **cpaths, struct vnode **vpp,
- struct proc *p)
+ struct lwp *l)
{
struct ccdcinfo *ci = NULL;
size_t size;
@@ -322,7 +322,7 @@ ccdinit(struct ccd_softc *cs, char **cpaths, struct vnode **vpp,
/*
* XXX: Cache the component's dev_t.
*/
- if ((error = VOP_GETATTR(vpp[ix], &va, p->p_ucred, p)) != 0) {
+ if ((error = VOP_GETATTR(vpp[ix], &va, l->l_proc->p_ucred, l)) != 0) {
#ifdef DEBUG
if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
printf("%s: %s: getattr failed %s = %d\n",
@@ -337,7 +337,7 @@ ccdinit(struct ccd_softc *cs, char **cpaths, struct vnode **vpp,
* Get partition information for the component.
*/
error = VOP_IOCTL(vpp[ix], DIOCGPART, &dpart,
- FREAD, p->p_ucred, p);
+ FREAD, l->l_proc->p_ucred, l);
if (error) {
#ifdef DEBUG
if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
@@ -541,7 +541,7 @@ ccdinterleave(struct ccd_softc *cs)
/* ARGSUSED */
static int
-ccdopen(dev_t dev, int flags, int fmt, struct proc *p)
+ccdopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit = ccdunit(dev);
struct ccd_softc *cs;
@@ -604,7 +604,7 @@ ccdopen(dev_t dev, int flags, int fmt, struct proc *p)
/* ARGSUSED */
static int
-ccdclose(dev_t dev, int flags, int fmt, struct proc *p)
+ccdclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit = ccdunit(dev);
struct ccd_softc *cs;
@@ -980,7 +980,7 @@ ccdwrite(dev_t dev, struct uio *uio, int flags)
}
static int
-ccdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+ccdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int unit = ccdunit(dev);
int s, i, j, lookedup = 0, error;
@@ -990,6 +990,7 @@ ccdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
struct ucred *uc;
char **cpp;
struct vnode **vpp;
+ struct proc *p = l->l_proc;
#ifdef __HAVE_OLD_DISKLABEL
struct disklabel newlabel;
#endif
@@ -1092,10 +1093,10 @@ ccdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
if (ccddebug & CCDB_INIT)
printf("ccdioctl: lookedup = %d\n", lookedup);
#endif
- if ((error = ccdlookup(cpp[i], p, &vpp[i])) != 0) {
+ if ((error = ccdlookup(cpp[i], l, &vpp[i])) != 0) {
for (j = 0; j < lookedup; ++j)
(void)vn_close(vpp[j], FREAD|FWRITE,
- p->p_ucred, p);
+ p->p_ucred, l);
free(vpp, M_DEVBUF);
free(cpp, M_DEVBUF);
goto out;
@@ -1106,10 +1107,10 @@ ccdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
/*
* Initialize the ccd. Fills in the softc for us.
*/
- if ((error = ccdinit(cs, cpp, vpp, p)) != 0) {
+ if ((error = ccdinit(cs, cpp, vpp, l)) != 0) {
for (j = 0; j < lookedup; ++j)
(void)vn_close(vpp[j], FREAD|FWRITE,
- p->p_ucred, p);
+ p->p_ucred, l);
free(vpp, M_DEVBUF);
free(cpp, M_DEVBUF);
goto out;
@@ -1177,7 +1178,7 @@ ccdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
cs->sc_cinfo[i].ci_vp);
#endif
(void)vn_close(cs->sc_cinfo[i].ci_vp, FREAD|FWRITE,
- p->p_ucred, p);
+ p->p_ucred, l);
free(cs->sc_cinfo[i].ci_path, M_DEVBUF);
}
@@ -1227,7 +1228,7 @@ ccdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
uc = (p != NULL) ? p->p_ucred : NOCRED;
for (error = 0, i = 0; i < cs->sc_nccdisks; i++) {
j = VOP_IOCTL(cs->sc_cinfo[i].ci_vp, cmd, data,
- flag, uc, p);
+ flag, uc, l);
if (j != 0 && error == 0)
error = j;
}
@@ -1324,7 +1325,7 @@ ccdsize(dev_t dev)
omask = cs->sc_dkdev.dk_openmask & (1 << part);
lp = cs->sc_dkdev.dk_label;
- if (omask == 0 && ccdopen(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && ccdopen(dev, 0, S_IFBLK, curlwp))
return (-1);
if (lp->d_partitions[part].p_fstype != FS_SWAP)
@@ -1333,7 +1334,7 @@ ccdsize(dev_t dev)
size = lp->d_partitions[part].p_size *
(lp->d_secsize / DEV_BSIZE);
- if (omask == 0 && ccdclose(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && ccdclose(dev, 0, S_IFBLK, curlwp))
return (-1);
return (size);
@@ -1353,14 +1354,17 @@ ccddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
* set *vpp to the file's vnode.
*/
static int
-ccdlookup(char *path, struct proc *p, struct vnode **vpp /* result */)
+ccdlookup(char *path, struct lwp *l, struct vnode **vpp /* result */)
{
struct nameidata nd;
struct vnode *vp;
struct vattr va;
+ struct proc *p;
int error;
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, path, p);
+ p = l->l_proc;
+
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, path, l);
if ((error = vn_open(&nd, FREAD|FWRITE, 0)) != 0) {
#ifdef DEBUG
if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
@@ -1372,24 +1376,24 @@ ccdlookup(char *path, struct proc *p, struct vnode **vpp /* result */)
if (vp->v_usecount > 1) {
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (EBUSY);
}
- if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0) {
+ if ((error = VOP_GETATTR(vp, &va, p->p_ucred, l)) != 0) {
#ifdef DEBUG
if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
printf("ccdlookup: getattr error = %d\n", error);
#endif
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (error);
}
/* XXX: eventually we should handle VREG, too. */
if (va.va_type != VBLK) {
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (ENOTBLK);
}
diff --git a/sys/dev/ccdvar.h b/sys/dev/ccdvar.h
index f83dd3790c3..f934b0c4841 100644
--- a/sys/dev/ccdvar.h
+++ b/sys/dev/ccdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ccdvar.h,v 1.27 2005/10/15 17:29:11 yamt Exp $ */
+/* $NetBSD: ccdvar.h,v 1.28 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cgd.c b/sys/dev/cgd.c
index 2be40b8b643..ca58066aa7d 100644
--- a/sys/dev/cgd.c
+++ b/sys/dev/cgd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.31 2005/10/18 00:14:43 yamt Exp $ */
+/* $NetBSD: cgd.c,v 1.32 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.31 2005/10/18 00:14:43 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.32 2005/12/11 12:20:53 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -88,10 +88,10 @@ const struct cdevsw cgd_cdevsw = {
static int cgdstart(struct dk_softc *, struct buf *);
static void cgdiodone(struct buf *);
-static int cgd_ioctl_set(struct cgd_softc *, void *, struct proc *);
-static int cgd_ioctl_clr(struct cgd_softc *, void *, struct proc *);
+static int cgd_ioctl_set(struct cgd_softc *, void *, struct lwp *);
+static int cgd_ioctl_clr(struct cgd_softc *, void *, struct lwp *);
static int cgdinit(struct cgd_softc *, const char *, struct vnode *,
- struct proc *);
+ struct lwp *);
static void cgd_cipher(struct cgd_softc *, caddr_t, caddr_t,
size_t, daddr_t, size_t, int);
@@ -205,23 +205,23 @@ cgdattach(int num)
}
static int
-cgdopen(dev_t dev, int flags, int fmt, struct proc *p)
+cgdopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct cgd_softc *cs;
DPRINTF_FOLLOW(("cgdopen(%d, %d)\n", dev, flags));
GETCGD_SOFTC(cs, dev);
- return dk_open(di, &cs->sc_dksc, dev, flags, fmt, p);
+ return dk_open(di, &cs->sc_dksc, dev, flags, fmt, l);
}
static int
-cgdclose(dev_t dev, int flags, int fmt, struct proc *p)
+cgdclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct cgd_softc *cs;
DPRINTF_FOLLOW(("cgdclose(%d, %d)\n", dev, flags));
GETCGD_SOFTC(cs, dev);
- return dk_close(di, &cs->sc_dksc, dev, flags, fmt, p);
+ return dk_close(di, &cs->sc_dksc, dev, flags, fmt, l);
}
static void
@@ -434,7 +434,7 @@ cgdwrite(dev_t dev, struct uio *uio, int flags)
}
static int
-cgdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+cgdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct cgd_softc *cs;
struct dk_softc *dksc;
@@ -444,7 +444,7 @@ cgdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
int pmask = 1 << part;
DPRINTF_FOLLOW(("cgdioctl(%d, %ld, %p, %d, %p)\n",
- dev, cmd, data, flag, p));
+ dev, cmd, data, flag, l));
GETCGD_SOFTC(cs, dev);
dksc = &cs->sc_dksc;
dk = &dksc->sc_dkdev;
@@ -460,7 +460,7 @@ cgdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
if (dksc->sc_flags & DKF_INITED)
ret = EBUSY;
else
- ret = cgd_ioctl_set(cs, data, p);
+ ret = cgd_ioctl_set(cs, data, l);
break;
case CGDIOCCLR:
if (!(dksc->sc_flags & DKF_INITED)) {
@@ -471,10 +471,10 @@ cgdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
ret = EBUSY;
break;
}
- ret = cgd_ioctl_clr(cs, data, p);
+ ret = cgd_ioctl_clr(cs, data, l);
break;
default:
- ret = dk_ioctl(di, dksc, dev, cmd, data, flag, p);
+ ret = dk_ioctl(di, dksc, dev, cmd, data, flag, l);
break;
}
@@ -500,7 +500,7 @@ cgddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
/* ARGSUSED */
static int
-cgd_ioctl_set(struct cgd_softc *cs, void *data, struct proc *p)
+cgd_ioctl_set(struct cgd_softc *cs, void *data, struct lwp *l)
{
struct cgd_ioctl *ci = data;
struct vnode *vp;
@@ -510,10 +510,10 @@ cgd_ioctl_set(struct cgd_softc *cs, void *data, struct proc *p)
char inbuf[MAX_KEYSIZE];
cp = ci->ci_disk;
- if ((ret = dk_lookup(cp, p, &vp)) != 0)
+ if ((ret = dk_lookup(cp, l, &vp)) != 0)
return ret;
- if ((ret = cgdinit(cs, cp, vp, p)) != 0)
+ if ((ret = cgdinit(cs, cp, vp, l)) != 0)
goto bail;
memset(inbuf, 0x0, sizeof(inbuf));
@@ -576,13 +576,13 @@ cgd_ioctl_set(struct cgd_softc *cs, void *data, struct proc *p)
return 0;
bail:
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, l->l_proc->p_ucred, l);
return ret;
}
/* ARGSUSED */
static int
-cgd_ioctl_clr(struct cgd_softc *cs, void *data, struct proc *p)
+cgd_ioctl_clr(struct cgd_softc *cs, void *data, struct lwp *l)
{
int s;
@@ -595,7 +595,7 @@ cgd_ioctl_clr(struct cgd_softc *cs, void *data, struct proc *p)
splx(s);
bufq_free(cs->sc_dksc.sc_bufq);
- (void)vn_close(cs->sc_tvn, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(cs->sc_tvn, FREAD|FWRITE, l->l_proc->p_ucred, l);
cs->sc_cfuncs->cf_destroy(cs->sc_cdata.cf_priv);
free(cs->sc_tpath, M_DEVBUF);
free(cs->sc_data, M_DEVBUF);
@@ -608,7 +608,7 @@ cgd_ioctl_clr(struct cgd_softc *cs, void *data, struct proc *p)
static int
cgdinit(struct cgd_softc *cs, const char *cpath, struct vnode *vp,
- struct proc *p)
+ struct lwp *l)
{
struct dk_geom *pdg;
struct partinfo dpart;
@@ -628,12 +628,12 @@ cgdinit(struct cgd_softc *cs, const char *cpath, struct vnode *vp,
cs->sc_tpath = malloc(cs->sc_tpathlen, M_DEVBUF, M_WAITOK);
memcpy(cs->sc_tpath, tmppath, cs->sc_tpathlen);
- if ((ret = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0)
+ if ((ret = VOP_GETATTR(vp, &va, l->l_proc->p_ucred, l)) != 0)
goto bail;
cs->sc_tdev = va.va_rdev;
- ret = VOP_IOCTL(vp, DIOCGPART, &dpart, FREAD, p->p_ucred, p);
+ ret = VOP_IOCTL(vp, DIOCGPART, &dpart, FREAD, l->l_proc->p_ucred, l);
if (ret)
goto bail;
diff --git a/sys/dev/cgd_crypto.c b/sys/dev/cgd_crypto.c
index f1e15fef358..2f617838512 100644
--- a/sys/dev/cgd_crypto.c
+++ b/sys/dev/cgd_crypto.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd_crypto.c,v 1.4 2005/03/19 21:39:17 dan Exp $ */
+/* $NetBSD: cgd_crypto.c,v 1.5 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c,v 1.4 2005/03/19 21:39:17 dan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c,v 1.5 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/cgd_crypto.h b/sys/dev/cgd_crypto.h
index 9be9ff66323..d53696cc67d 100644
--- a/sys/dev/cgd_crypto.h
+++ b/sys/dev/cgd_crypto.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd_crypto.h,v 1.2 2004/08/23 04:51:22 thorpej Exp $ */
+/* $NetBSD: cgd_crypto.h,v 1.3 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/cgdvar.h b/sys/dev/cgdvar.h
index af021c704d5..7bb95e853ed 100644
--- a/sys/dev/cgdvar.h
+++ b/sys/dev/cgdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgdvar.h,v 1.4 2005/06/27 03:00:03 christos Exp $ */
+/* $NetBSD: cgdvar.h,v 1.5 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/clock_subr.c b/sys/dev/clock_subr.c
index 43e56267001..0aa9fc3a836 100644
--- a/sys/dev/clock_subr.c
+++ b/sys/dev/clock_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_subr.c,v 1.11 2005/02/04 02:10:35 perry Exp $ */
+/* $NetBSD: clock_subr.c,v 1.12 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -84,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.11 2005/02/04 02:10:35 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock_subr.c,v 1.12 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/clock_subr.h b/sys/dev/clock_subr.h
index a46aa34b9aa..a1910f1a350 100644
--- a/sys/dev/clock_subr.h
+++ b/sys/dev/clock_subr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_subr.h,v 1.12 2005/06/04 20:14:25 he Exp $ */
+/* $NetBSD: clock_subr.h,v 1.13 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/clockctl.c b/sys/dev/clockctl.c
index 558d8b9219b..f69ca18548c 100644
--- a/sys/dev/clockctl.c
+++ b/sys/dev/clockctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.14 2005/12/05 00:16:34 christos Exp $ */
+/* $NetBSD: clockctl.c,v 1.15 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.14 2005/12/05 00:16:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.15 2005/12/11 12:20:53 christos Exp $");
#include "opt_ntp.h"
@@ -69,12 +69,12 @@ clockctlattach(int num)
}
int
-clockctlioctl(dev, cmd, data, flags, p)
+clockctlioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
int error = 0;
@@ -84,7 +84,7 @@ clockctlioctl(dev, cmd, data, flags, p)
(struct sys_settimeofday_args *)data;
error = settimeofday1(SCARG(args, tv),
- SCARG(args, tzp), p);
+ SCARG(args, tzp), l->l_proc);
if (error)
return (error);
break;
@@ -94,7 +94,7 @@ clockctlioctl(dev, cmd, data, flags, p)
(struct sys_adjtime_args *)data;
error = adjtime1(SCARG(args, delta),
- SCARG(args, olddelta), p);
+ SCARG(args, olddelta), l->l_proc);
if (error)
return (error);
break;
@@ -103,7 +103,7 @@ clockctlioctl(dev, cmd, data, flags, p)
struct sys_clock_settime_args *args =
(struct sys_clock_settime_args *)data;
- error = clock_settime1(p, SCARG(args, clock_id),
+ error = clock_settime1(l->l_proc, SCARG(args, clock_id),
SCARG(args, tp));
if (error)
return (error);
diff --git a/sys/dev/cninit.c b/sys/dev/cninit.c
index e1fc920b27c..d5d6af4056f 100644
--- a/sys/dev/cninit.c
+++ b/sys/dev/cninit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cninit.c,v 1.7 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: cninit.c,v 1.8 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cninit.c,v 1.7 2005/02/27 00:26:58 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cninit.c,v 1.8 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
diff --git a/sys/dev/cons.c b/sys/dev/cons.c
index cbf64dcb818..1512f1968ef 100644
--- a/sys/dev/cons.c
+++ b/sys/dev/cons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.56 2005/06/21 14:01:11 ws Exp $ */
+/* $NetBSD: cons.c,v 1.57 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.56 2005/06/21 14:01:11 ws Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cons.c,v 1.57 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -114,7 +114,7 @@ struct consdev *cn_tab; /* physical console device info */
struct vnode *cn_devvp[2]; /* vnode for underlying device. */
int
-cnopen(dev_t dev, int flag, int mode, struct proc *p)
+cnopen(dev_t dev, int flag, int mode, struct lwp *l)
{
const struct cdevsw *cdev;
dev_t cndev;
@@ -158,11 +158,11 @@ cnopen(dev_t dev, int flag, int mode, struct proc *p)
/* try to get a reference on its vnode, but fail silently */
cdevvp(cndev, &cn_devvp[unit]);
}
- return ((*cdev->d_open)(cndev, flag, mode, p));
+ return ((*cdev->d_open)(cndev, flag, mode, l));
}
int
-cnclose(dev_t dev, int flag, int mode, struct proc *p)
+cnclose(dev_t dev, int flag, int mode, struct lwp *l)
{
const struct cdevsw *cdev;
struct vnode *vp;
@@ -189,7 +189,7 @@ cnclose(dev_t dev, int flag, int mode, struct proc *p)
}
if (vfinddev(dev, VCHR, &vp) && vcount(vp))
return (0);
- return ((*cdev->d_close)(dev, flag, mode, p));
+ return ((*cdev->d_close)(dev, flag, mode, l));
}
int
@@ -226,7 +226,7 @@ cnwrite(dev_t dev, struct uio *uio, int flag)
}
int
-cnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+cnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
const struct cdevsw *cdev;
int error;
@@ -236,7 +236,7 @@ cnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
* output from the "virtual" console.
*/
if (cmd == TIOCCONS && constty != NULL) {
- error = suser(p->p_ucred, (u_short *) NULL);
+ error = suser(l->l_proc->p_ucred, (u_short *) NULL);
if (error)
return (error);
constty = NULL;
@@ -252,12 +252,12 @@ cnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
cdev = cn_redirect(&dev, 0, &error);
if (cdev == NULL)
return error;
- return ((*cdev->d_ioctl)(dev, cmd, data, flag, p));
+ return ((*cdev->d_ioctl)(dev, cmd, data, flag, l));
}
/*ARGSUSED*/
int
-cnpoll(dev_t dev, int events, struct proc *p)
+cnpoll(dev_t dev, int events, struct lwp *l)
{
const struct cdevsw *cdev;
int error;
@@ -270,7 +270,7 @@ cnpoll(dev_t dev, int events, struct proc *p)
cdev = cn_redirect(&dev, 0, &error);
if (cdev == NULL)
return POLLHUP;
- return ((*cdev->d_poll)(dev, events, p));
+ return ((*cdev->d_poll)(dev, events, l));
}
/*ARGSUSED*/
diff --git a/sys/dev/cons.h b/sys/dev/cons.h
index 83ac9e2d61c..f13f3026c8b 100644
--- a/sys/dev/cons.h
+++ b/sys/dev/cons.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.h,v 1.23 2005/02/04 02:10:35 perry Exp $ */
+/* $NetBSD: cons.h,v 1.24 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1990, 1993
diff --git a/sys/dev/dec/clockvar.h b/sys/dev/dec/clockvar.h
index 14c05219fff..331a56a26fd 100644
--- a/sys/dev/dec/clockvar.h
+++ b/sys/dev/dec/clockvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: clockvar.h,v 1.7 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: clockvar.h,v 1.8 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
diff --git a/sys/dev/dec/dec_boot.h b/sys/dev/dec/dec_boot.h
index d8e86a4d483..642daffced5 100644
--- a/sys/dev/dec/dec_boot.h
+++ b/sys/dev/dec/dec_boot.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_boot.h,v 1.6 2003/08/07 16:30:54 agc Exp $ */
+/* $NetBSD: dec_boot.h,v 1.7 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/dec/dz.c b/sys/dev/dec/dz.c
index 5604eddfd9f..67300b946c2 100644
--- a/sys/dev/dec/dz.c
+++ b/sys/dev/dec/dz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dz.c,v 1.17 2005/09/06 21:40:39 kleink Exp $ */
+/* $NetBSD: dz.c,v 1.18 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.17 2005/09/06 21:40:39 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz.c,v 1.18 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -319,8 +319,9 @@ dzxint(void *arg)
}
int
-dzopen(dev_t dev, int flag, int mode, struct proc *p)
+dzopen(dev_t dev, int flag, int mode, struct lwp *l)
{
+ struct proc *p = l->l_proc;
struct tty *tp;
int unit, line;
struct dz_softc *sc;
@@ -381,7 +382,7 @@ dzopen(dev_t dev, int flag, int mode, struct proc *p)
/*ARGSUSED*/
int
-dzclose(dev_t dev, int flag, int mode, struct proc *p)
+dzclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct dz_softc *sc;
struct tty *tp;
@@ -431,10 +432,10 @@ dzwrite(dev_t dev, struct uio *uio, int flag)
}
int
-dzpoll(dev, events, p)
+dzpoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct tty *tp;
struct dz_softc *sc;
@@ -442,12 +443,12 @@ dzpoll(dev, events, p)
sc = dz_cd.cd_devs[DZ_I2C(minor(dev))];
tp = sc->sc_dz[DZ_PORT(minor(dev))].dz_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
/*ARGSUSED*/
int
-dzioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+dzioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct dz_softc *sc;
struct tty *tp;
@@ -459,11 +460,11 @@ dzioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
sc = dz_cd.cd_devs[unit];
tp = sc->sc_dz[line].dz_tty;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error >= 0)
return (error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error >= 0)
return (error);
diff --git a/sys/dev/dec/dzkbd.c b/sys/dev/dec/dzkbd.c
index 830d1a35f87..84229c0d620 100644
--- a/sys/dev/dec/dzkbd.c
+++ b/sys/dev/dec/dzkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dzkbd.c,v 1.14 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: dzkbd.c,v 1.15 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.14 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzkbd.c,v 1.15 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,7 +98,7 @@ CFATTACH_DECL(dzkbd, sizeof(struct dzkbd_softc),
static int dzkbd_enable(void *, int);
static void dzkbd_set_leds(void *, int);
-static int dzkbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int dzkbd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
const struct wskbd_accessops dzkbd_accessops = {
dzkbd_enable,
@@ -269,12 +269,12 @@ dzkbd_set_leds(v, leds)
}
static int
-dzkbd_ioctl(v, cmd, data, flag, p)
+dzkbd_ioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct dzkbd_softc *sc = (struct dzkbd_softc *)v;
diff --git a/sys/dev/dec/dzms.c b/sys/dev/dec/dzms.c
index b545ac8b127..baa23f01c91 100644
--- a/sys/dev/dec/dzms.c
+++ b/sys/dev/dec/dzms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dzms.c,v 1.12 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: dzms.c,v 1.13 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.12 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dzms.c,v 1.13 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@ CFATTACH_DECL(dzms, sizeof(struct dzms_softc),
dzms_match, dzms_attach, NULL, NULL);
static int dzms_enable(void *);
-static int dzms_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int dzms_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static void dzms_disable(void *);
const struct wsmouse_accessops dzms_accessops = {
@@ -177,12 +177,12 @@ dzms_disable(v)
}
static int
-dzms_ioctl(v, cmd, data, flag, p)
+dzms_ioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
if (cmd == WSMOUSEIO_GTYPE) {
*(u_int *)data = WSMOUSE_TYPE_VSXXX;
diff --git a/sys/dev/dec/dzreg.h b/sys/dev/dec/dzreg.h
index ed9545479ab..b292f45047b 100644
--- a/sys/dev/dec/dzreg.h
+++ b/sys/dev/dec/dzreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dzreg.h,v 1.3 2003/12/13 23:02:33 ad Exp $ */
+/* $NetBSD: dzreg.h,v 1.4 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
*
diff --git a/sys/dev/dec/dzvar.h b/sys/dev/dec/dzvar.h
index e2f0dac6471..b0b49c7e214 100644
--- a/sys/dev/dec/dzvar.h
+++ b/sys/dev/dec/dzvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dzvar.h,v 1.7 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: dzvar.h,v 1.8 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/dev/dec/if_le_dec.c b/sys/dev/dec/if_le_dec.c
index 380131d00d7..5dceb9906e1 100644
--- a/sys/dev/dec/if_le_dec.c
+++ b/sys/dev/dec/if_le_dec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_dec.c,v 1.15 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: if_le_dec.c,v 1.16 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.15 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.16 2005/12/11 12:21:20 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/dec/lk201.h b/sys/dev/dec/lk201.h
index 7e93ac6025e..2c20603f699 100644
--- a/sys/dev/dec/lk201.h
+++ b/sys/dev/dec/lk201.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lk201.h,v 1.8 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: lk201.h,v 1.9 2005/12/11 12:21:20 christos Exp $ */
/*
diff --git a/sys/dev/dec/lk201_ws.c b/sys/dev/dec/lk201_ws.c
index 87d629448de..5b0cdbee3e3 100644
--- a/sys/dev/dec/lk201_ws.c
+++ b/sys/dev/dec/lk201_ws.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lk201_ws.c,v 1.6 2004/03/24 17:26:53 drochner Exp $ */
+/* $NetBSD: lk201_ws.c,v 1.7 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.6 2004/03/24 17:26:53 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lk201_ws.c,v 1.7 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/dec/lk201reg.h b/sys/dev/dec/lk201reg.h
index 828f69da325..7c319ff6319 100644
--- a/sys/dev/dec/lk201reg.h
+++ b/sys/dev/dec/lk201reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lk201reg.h,v 1.2 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: lk201reg.h,v 1.3 2005/12/11 12:21:20 christos Exp $ */
/*
* command keycodes for Digital LK200/LK400 series keyboards.
diff --git a/sys/dev/dec/lk201var.h b/sys/dev/dec/lk201var.h
index 924173813c3..df4d109fd8c 100644
--- a/sys/dev/dec/lk201var.h
+++ b/sys/dev/dec/lk201var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lk201var.h,v 1.5 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: lk201var.h,v 1.6 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1998
diff --git a/sys/dev/dec/mcclock.c b/sys/dev/dec/mcclock.c
index 0a2633e4641..7e2ee64dd54 100644
--- a/sys/dev/dec/mcclock.c
+++ b/sys/dev/dec/mcclock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock.c,v 1.16 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: mcclock.c,v 1.17 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.16 2005/02/04 02:10:36 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock.c,v 1.17 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/dec/mcclock_pad32.c b/sys/dev/dec/mcclock_pad32.c
index dd830617821..d7ea12311f0 100644
--- a/sys/dev/dec/mcclock_pad32.c
+++ b/sys/dev/dec/mcclock_pad32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_pad32.c,v 1.12 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: mcclock_pad32.c,v 1.13 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_pad32.c,v 1.12 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_pad32.c,v 1.13 2005/12/11 12:21:20 christos Exp $");
/*
diff --git a/sys/dev/dec/mcclockvar.h b/sys/dev/dec/mcclockvar.h
index b974bf3fb1a..1fa5abba443 100644
--- a/sys/dev/dec/mcclockvar.h
+++ b/sys/dev/dec/mcclockvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclockvar.h,v 1.5 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: mcclockvar.h,v 1.6 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
diff --git a/sys/dev/dec/vsxxx.c b/sys/dev/dec/vsxxx.c
index c9015c356cd..736a008703b 100644
--- a/sys/dev/dec/vsxxx.c
+++ b/sys/dev/dec/vsxxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vsxxx.c,v 1.5 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: vsxxx.c,v 1.6 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vsxxx.c,v 1.5 2005/02/04 02:10:36 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vsxxx.c,v 1.6 2005/12/11 12:21:20 christos Exp $");
/*
* Common machinary for VSXXX mice and tablet
diff --git a/sys/dev/dec/vsxxxvar.h b/sys/dev/dec/vsxxxvar.h
index e4eeb157ff8..60782b9f540 100644
--- a/sys/dev/dec/vsxxxvar.h
+++ b/sys/dev/dec/vsxxxvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vsxxxvar.h,v 1.2 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: vsxxxvar.h,v 1.3 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1999 Tohru Nishimura. All rights reserved.
diff --git a/sys/dev/dksubr.c b/sys/dev/dksubr.c
index 14fcf5467c8..2c690e67cee 100644
--- a/sys/dev/dksubr.c
+++ b/sys/dev/dksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.18 2005/10/18 00:14:43 yamt Exp $ */
+/* $NetBSD: dksubr.c,v 1.19 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.18 2005/10/18 00:14:43 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.19 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,7 @@ dk_sc_init(struct dk_softc *dksc, void *osc, char *xname)
/* ARGSUSED */
int
dk_open(struct dk_intf *di, struct dk_softc *dksc, dev_t dev,
- int flags, int fmt, struct proc *p)
+ int flags, int fmt, struct lwp *l)
{
struct disklabel *lp = dksc->sc_dkdev.dk_label;
int part = DISKPART(dev);
@@ -156,7 +156,7 @@ done:
/* ARGSUSED */
int
dk_close(struct dk_intf *di, struct dk_softc *dksc, dev_t dev,
- int flags, int fmt, struct proc *p)
+ int flags, int fmt, struct lwp *l)
{
int part = DISKPART(dev);
int pmask = 1 << part;
@@ -279,7 +279,7 @@ dk_size(struct dk_intf *di, struct dk_softc *dksc, dev_t dev)
part = DISKPART(dev);
is_open = dksc->sc_dkdev.dk_openmask & (1 << part);
- if (!is_open && di->di_open(dev, 0, S_IFBLK, curproc))
+ if (!is_open && di->di_open(dev, 0, S_IFBLK, curlwp))
return -1;
lp = dksc->sc_dkdev.dk_label;
@@ -289,7 +289,7 @@ dk_size(struct dk_intf *di, struct dk_softc *dksc, dev_t dev)
size = lp->d_partitions[part].p_size *
(lp->d_secsize / DEV_BSIZE);
- if (!is_open && di->di_close(dev, 0, S_IFBLK, curproc))
+ if (!is_open && di->di_close(dev, 0, S_IFBLK, curlwp))
return 1;
return size;
@@ -297,7 +297,7 @@ dk_size(struct dk_intf *di, struct dk_softc *dksc, dev_t dev)
int
dk_ioctl(struct dk_intf *di, struct dk_softc *dksc, dev_t dev,
- u_long cmd, caddr_t data, int flag, struct proc *p)
+ u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct disklabel *lp;
struct disk *dk;
@@ -592,17 +592,19 @@ dk_makedisklabel(struct dk_intf *di, struct dk_softc *dksc)
* set *vpp to the file's vnode.
*/
int
-dk_lookup(path, p, vpp)
+dk_lookup(path, l, vpp)
const char *path;
- struct proc *p;
+ struct lwp *l;
struct vnode **vpp; /* result */
{
struct nameidata nd;
struct vnode *vp;
struct vattr va;
+ struct proc *p;
int error;
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, path, p);
+ p = l->l_proc;
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, path, l);
if ((error = vn_open(&nd, FREAD|FWRITE, 0)) != 0) {
DPRINTF((DKDB_FOLLOW|DKDB_INIT),
("dk_lookup: vn_open error = %d\n", error));
@@ -612,22 +614,22 @@ dk_lookup(path, p, vpp)
if (vp->v_usecount > 1) {
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (EBUSY);
}
- if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0) {
+ if ((error = VOP_GETATTR(vp, &va, p->p_ucred, l)) != 0) {
DPRINTF((DKDB_FOLLOW|DKDB_INIT),
("dk_lookup: getattr error = %d\n", error));
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (error);
}
/* XXX: eventually we should handle VREG, too. */
if (va.va_type != VBLK) {
VOP_UNLOCK(vp, 0);
- (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, p);
+ (void)vn_close(vp, FREAD|FWRITE, p->p_ucred, l);
return (ENOTBLK);
}
diff --git a/sys/dev/dkvar.h b/sys/dev/dkvar.h
index 9950eb840d1..2f31a2c857a 100644
--- a/sys/dev/dkvar.h
+++ b/sys/dev/dkvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dkvar.h,v 1.8 2005/10/15 17:29:11 yamt Exp $ */
+/* $NetBSD: dkvar.h,v 1.9 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -85,8 +85,8 @@ struct dk_softc {
struct dk_intf {
int di_dtype; /* disk type */
const char *di_dkname; /* disk type name */
- int (*di_open)(dev_t, int, int, struct proc *);
- int (*di_close)(dev_t, int, int, struct proc *);
+ int (*di_open)(dev_t, int, int, struct lwp *);
+ int (*di_close)(dev_t, int, int, struct lwp *);
void (*di_strategy)(struct buf *);
int (*di_diskstart)(struct dk_softc *, struct buf *);
};
@@ -103,19 +103,19 @@ struct dk_intf {
void dk_sc_init(struct dk_softc *, void *, char *);
int dk_open(struct dk_intf *, struct dk_softc *, dev_t,
- int, int, struct proc *);
+ int, int, struct lwp *);
int dk_close(struct dk_intf *, struct dk_softc *, dev_t,
- int, int, struct proc *);
+ int, int, struct lwp *);
void dk_strategy(struct dk_intf *, struct dk_softc *, struct buf *);
void dk_start(struct dk_intf *, struct dk_softc *);
void dk_iodone(struct dk_intf *, struct dk_softc *);
int dk_size(struct dk_intf *, struct dk_softc *, dev_t);
int dk_ioctl(struct dk_intf *, struct dk_softc *, dev_t,
- u_long, caddr_t, int, struct proc *);
+ u_long, caddr_t, int, struct lwp *);
int dk_dump(struct dk_intf *, struct dk_softc *, dev_t,
daddr_t, caddr_t, size_t);
void dk_getdisklabel(struct dk_intf *, struct dk_softc *, dev_t);
void dk_getdefaultlabel(struct dk_intf *, struct dk_softc *,
struct disklabel *);
-int dk_lookup(const char *, struct proc *, struct vnode **);
+int dk_lookup(const char *, struct lwp *, struct vnode **);
diff --git a/sys/dev/dkwedge/dk.c b/sys/dev/dkwedge/dk.c
index d29674ad988..8c5fdd8dda7 100644
--- a/sys/dev/dkwedge/dk.c
+++ b/sys/dev/dkwedge/dk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.9 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: dk.c,v 1.10 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.9 2005/10/15 17:29:12 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.10 2005/12/11 12:21:20 christos Exp $");
#include "opt_dkwedge.h"
@@ -510,7 +510,7 @@ dkwedge_del(struct dkwedge_info *dkw)
if (sc->sc_parent->dk_rawopens-- == 1) {
KASSERT(sc->sc_parent->dk_rawvp != NULL);
(void) vn_close(sc->sc_parent->dk_rawvp, FREAD | FWRITE,
- NOCRED, curproc);
+ NOCRED, curlwp);
sc->sc_parent->dk_rawvp = NULL;
}
sc->sc_dk.dk_openmask = 0;
@@ -582,7 +582,7 @@ dkwedge_delall(struct disk *pdk)
* in user space of the specified process.
*/
int
-dkwedge_list(struct disk *pdk, struct dkwedge_list *dkwl, struct proc *p)
+dkwedge_list(struct disk *pdk, struct dkwedge_list *dkwl, struct lwp *l)
{
struct uio uio;
struct iovec iov;
@@ -597,9 +597,9 @@ dkwedge_list(struct disk *pdk, struct dkwedge_list *dkwl, struct proc *p)
uio.uio_iovcnt = 1;
uio.uio_offset = 0;
uio.uio_resid = dkwl->dkwl_bufsize;
- uio.uio_segflg = p != NULL ? UIO_USERSPACE : UIO_SYSSPACE;
+ uio.uio_segflg = l != NULL ? UIO_USERSPACE : UIO_SYSSPACE;
uio.uio_rw = UIO_READ;
- uio.uio_procp = p;
+ uio.uio_lwp = l;
dkwl->dkwl_ncopied = 0;
@@ -810,7 +810,7 @@ dkwedge_discover(struct disk *pdk)
}
}
- error = vn_close(vp, FREAD | FWRITE, NOCRED, curproc);
+ error = vn_close(vp, FREAD | FWRITE, NOCRED, curlwp);
if (error) {
aprint_error("%s: unable to close device, error = %d\n",
pdk->dk_name, error);
@@ -870,7 +870,7 @@ dkwedge_lookup(dev_t dev)
* Open a wedge.
*/
static int
-dkopen(dev_t dev, int flags, int fmt, struct proc *p)
+dkopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct dkwedge_softc *sc = dkwedge_lookup(dev);
struct vnode *vp;
@@ -934,7 +934,7 @@ dkopen(dev_t dev, int flags, int fmt, struct proc *p)
* Close a wedge.
*/
static int
-dkclose(dev_t dev, int flags, int fmt, struct proc *p)
+dkclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct dkwedge_softc *sc = dkwedge_lookup(dev);
int error = 0;
@@ -955,7 +955,7 @@ dkclose(dev_t dev, int flags, int fmt, struct proc *p)
if (sc->sc_parent->dk_rawopens-- == 1) {
KASSERT(sc->sc_parent->dk_rawvp != NULL);
error = vn_close(sc->sc_parent->dk_rawvp,
- FREAD | FWRITE, NOCRED, p);
+ FREAD | FWRITE, NOCRED, l);
sc->sc_parent->dk_rawvp = NULL;
}
}
@@ -1158,7 +1158,7 @@ dkwrite(dev_t dev, struct uio *uio, int flags)
* Perform an ioctl request on a wedge.
*/
static int
-dkioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+dkioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct dkwedge_softc *sc = dkwedge_lookup(dev);
int error = 0;
@@ -1177,7 +1177,7 @@ dkioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
else
error = VOP_IOCTL(sc->sc_parent->dk_rawvp,
cmd, data, flag,
- p != NULL ? p->p_ucred : NOCRED, p);
+ l != NULL ? l->l_proc->p_ucred : NOCRED, l);
break;
case DIOCGWEDGEINFO:
{
diff --git a/sys/dev/dkwedge/dkwedge_bsdlabel.c b/sys/dev/dkwedge/dkwedge_bsdlabel.c
index 3886259ee12..729bece604d 100644
--- a/sys/dev/dkwedge/dkwedge_bsdlabel.c
+++ b/sys/dev/dkwedge/dkwedge_bsdlabel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_bsdlabel.c,v 1.3 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: dkwedge_bsdlabel.c,v 1.4 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_bsdlabel.c,v 1.3 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_bsdlabel.c,v 1.4 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/dkwedge/dkwedge_gpt.c b/sys/dev/dkwedge/dkwedge_gpt.c
index 8cf56f1d12a..6d246b8fd9b 100644
--- a/sys/dev/dkwedge/dkwedge_gpt.c
+++ b/sys/dev/dkwedge/dkwedge_gpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_gpt.c,v 1.1 2004/10/04 01:07:25 thorpej Exp $ */
+/* $NetBSD: dkwedge_gpt.c,v 1.2 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.1 2004/10/04 01:07:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.2 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/dkwedge/dkwedge_mbr.c b/sys/dev/dkwedge/dkwedge_mbr.c
index f8f68796a7b..1810e880724 100644
--- a/sys/dev/dkwedge/dkwedge_mbr.c
+++ b/sys/dev/dkwedge/dkwedge_mbr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_mbr.c,v 1.2 2005/01/01 19:29:59 thorpej Exp $ */
+/* $NetBSD: dkwedge_mbr.c,v 1.3 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_mbr.c,v 1.2 2005/01/01 19:29:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_mbr.c,v 1.3 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/dmover/dmover_io.c b/sys/dev/dmover/dmover_io.c
index 0e933467996..fd13478f9ab 100644
--- a/sys/dev/dmover/dmover_io.c
+++ b/sys/dev/dmover/dmover_io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmover_io.c,v 1.17 2005/02/12 23:14:03 christos Exp $ */
+/* $NetBSD: dmover_io.c,v 1.18 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.17 2005/02/12 23:14:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_io.c,v 1.18 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -171,7 +171,7 @@ dmio_usrreq_init(struct file *fp, struct dmio_usrreq_state *dus,
uio_out->uio_resid = len;
uio_out->uio_rw = UIO_READ;
uio_out->uio_segflg = UIO_USERSPACE;
- uio_out->uio_procp = curproc;
+ uio_out->uio_lwp = curlwp;
dreq->dreq_outbuf_type = DMOVER_BUF_UIO;
dreq->dreq_outbuf.dmbuf_uio = uio_out;
} else {
@@ -237,7 +237,7 @@ dmio_usrreq_init(struct file *fp, struct dmio_usrreq_state *dus,
uio_in->uio_resid = len;
uio_in->uio_rw = UIO_WRITE;
uio_in->uio_segflg = UIO_USERSPACE;
- uio_in->uio_procp = curproc;
+ uio_in->uio_lwp = curlwp;
dreq->dreq_inbuf[i].dmbuf_uio = uio_in;
}
@@ -525,7 +525,7 @@ dmio_write(struct file *fp, off_t *offp, struct uio *uio,
* Ioctl file op.
*/
static int
-dmio_ioctl(struct file *fp, u_long cmd, void *data, struct proc *p)
+dmio_ioctl(struct file *fp, u_long cmd, void *data, struct lwp *l)
{
struct dmio_state *ds = (struct dmio_state *) fp->f_data;
int error, s;
@@ -585,7 +585,7 @@ dmio_ioctl(struct file *fp, u_long cmd, void *data, struct proc *p)
* Poll file op.
*/
static int
-dmio_poll(struct file *fp, int events, struct proc *p)
+dmio_poll(struct file *fp, int events, struct lwp *l)
{
struct dmio_state *ds = (struct dmio_state *) fp->f_data;
int s, revents = 0;
@@ -617,7 +617,7 @@ dmio_poll(struct file *fp, int events, struct proc *p)
revents |= events & (POLLOUT | POLLWRNORM);
if (revents == 0) {
- selrecord(p, &ds->ds_selq);
+ selrecord(l, &ds->ds_selq);
ds->ds_flags |= DMIO_STATE_SEL;
}
@@ -634,7 +634,7 @@ dmio_poll(struct file *fp, int events, struct proc *p)
* Close file op.
*/
static int
-dmio_close(struct file *fp, struct proc *p)
+dmio_close(struct file *fp, struct lwp *l)
{
struct dmio_state *ds = (struct dmio_state *) fp->f_data;
struct dmio_usrreq_state *dus;
@@ -694,11 +694,12 @@ static const struct fileops dmio_fileops = {
* Device switch open routine.
*/
int
-dmoverioopen(dev_t dev, int flag, int mode, struct proc *p)
+dmoverioopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct dmio_state *ds;
struct file *fp;
int error, fd, s;
+ struct proc *p = l->l_proc;
/* falloc() will use the descriptor for us. */
if ((error = falloc(p, &fp, &fd)) != 0)
@@ -712,5 +713,5 @@ dmoverioopen(dev_t dev, int flag, int mode, struct proc *p)
TAILQ_INIT(&ds->ds_pending);
TAILQ_INIT(&ds->ds_complete);
- return fdclone(p, fp, fd, flag, &dmio_fileops, ds);
+ return fdclone(l, fp, fd, flag, &dmio_fileops, ds);
}
diff --git a/sys/dev/dmover/dmover_io.h b/sys/dev/dmover/dmover_io.h
index 76b122f4846..dfb01dcf91d 100644
--- a/sys/dev/dmover/dmover_io.h
+++ b/sys/dev/dmover/dmover_io.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dmover_io.h,v 1.2 2003/07/19 02:00:18 thorpej Exp $ */
+/* $NetBSD: dmover_io.h,v 1.3 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/dmover/dmover_session.c b/sys/dev/dmover/dmover_session.c
index c59445f9b70..2c9f0792005 100644
--- a/sys/dev/dmover/dmover_session.c
+++ b/sys/dev/dmover/dmover_session.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmover_session.c,v 1.2 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: dmover_session.c,v 1.3 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_session.c,v 1.2 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_session.c,v 1.3 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/lock.h>
diff --git a/sys/dev/dmover/dmover_util.c b/sys/dev/dmover/dmover_util.c
index 23a699894d8..6ba12d4a761 100644
--- a/sys/dev/dmover/dmover_util.c
+++ b/sys/dev/dmover/dmover_util.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmover_util.c,v 1.4 2003/07/19 02:03:11 thorpej Exp $ */
+/* $NetBSD: dmover_util.c,v 1.5 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmover_util.c,v 1.4 2003/07/19 02:03:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmover_util.c,v 1.5 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/dmover/dmovervar.h b/sys/dev/dmover/dmovervar.h
index 8e66b01f67d..52f85ec3932 100644
--- a/sys/dev/dmover/dmovervar.h
+++ b/sys/dev/dmover/dmovervar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dmovervar.h,v 1.8 2003/11/07 22:04:59 briggs Exp $ */
+/* $NetBSD: dmovervar.h,v 1.9 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/dmover/swdmover.c b/sys/dev/dmover/swdmover.c
index 6a2ae63f27a..a4506151682 100644
--- a/sys/dev/dmover/swdmover.c
+++ b/sys/dev/dmover/swdmover.c
@@ -1,4 +1,4 @@
-/* $NetBSD: swdmover.c,v 1.8 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: swdmover.c,v 1.9 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swdmover.c,v 1.8 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swdmover.c,v 1.9 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/lock.h>
diff --git a/sys/dev/ebus/cs4231_ebus.c b/sys/dev/ebus/cs4231_ebus.c
index 7bffc31cd6f..4b559b36116 100644
--- a/sys/dev/ebus/cs4231_ebus.c
+++ b/sys/dev/ebus/cs4231_ebus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231_ebus.c,v 1.18 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: cs4231_ebus.c,v 1.19 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.18 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.19 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ebus/ebusreg.h b/sys/dev/ebus/ebusreg.h
index 975f2d1b4f7..7a4cb6f7588 100644
--- a/sys/dev/ebus/ebusreg.h
+++ b/sys/dev/ebus/ebusreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ebusreg.h,v 1.6 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: ebusreg.h,v 1.7 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1999 Matthew R. Green
diff --git a/sys/dev/ebus/ebusvar.h b/sys/dev/ebus/ebusvar.h
index a47878969e8..332730a8836 100644
--- a/sys/dev/ebus/ebusvar.h
+++ b/sys/dev/ebus/ebusvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ebusvar.h,v 1.3 2005/01/11 04:23:15 kent Exp $ */
+/* $NetBSD: ebusvar.h,v 1.4 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
diff --git a/sys/dev/eisa/ahb.c b/sys/dev/eisa/ahb.c
index 9fc803ad0d8..286f27a09cb 100644
--- a/sys/dev/eisa/ahb.c
+++ b/sys/dev/eisa/ahb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahb.c,v 1.42 2005/02/21 00:29:07 thorpej Exp $ */
+/* $NetBSD: ahb.c,v 1.43 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.42 2005/02/21 00:29:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahb.c,v 1.43 2005/12/11 12:21:20 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/eisa/ahbreg.h b/sys/dev/eisa/ahbreg.h
index b49f07a5b6a..ee8ebd42ae8 100644
--- a/sys/dev/eisa/ahbreg.h
+++ b/sys/dev/eisa/ahbreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ahbreg.h,v 1.14 2005/02/21 00:29:07 thorpej Exp $ */
+/* $NetBSD: ahbreg.h,v 1.15 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c
index 0ec294a9d2a..1543b018a83 100644
--- a/sys/dev/eisa/ahc_eisa.c
+++ b/sys/dev/eisa/ahc_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahc_eisa.c,v 1.29 2004/08/23 06:03:19 thorpej Exp $ */
+/* $NetBSD: ahc_eisa.c,v 1.30 2005/12/11 12:21:20 christos Exp $ */
/*
* Product specific probe and attach routines for:
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.29 2004/08/23 06:03:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_eisa.c,v 1.30 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/eisa/bha_eisa.c b/sys/dev/eisa/bha_eisa.c
index df59666fba3..c6668c6a75e 100644
--- a/sys/dev/eisa/bha_eisa.c
+++ b/sys/dev/eisa/bha_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_eisa.c,v 1.24 2004/08/23 06:03:19 thorpej Exp $ */
+/* $NetBSD: bha_eisa.c,v 1.25 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.24 2004/08/23 06:03:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_eisa.c,v 1.25 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/eisa/cac_eisa.c b/sys/dev/eisa/cac_eisa.c
index 6d9a3b2eaa6..1f17cff6a74 100644
--- a/sys/dev/eisa/cac_eisa.c
+++ b/sys/dev/eisa/cac_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cac_eisa.c,v 1.10 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: cac_eisa.c,v 1.11 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.10 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac_eisa.c,v 1.11 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/eisa/depca_eisa.c b/sys/dev/eisa/depca_eisa.c
index a2af6de97ac..19e1c98a158 100644
--- a/sys/dev/eisa/depca_eisa.c
+++ b/sys/dev/eisa/depca_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: depca_eisa.c,v 1.7 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: depca_eisa.c,v 1.8 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca_eisa.c,v 1.7 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca_eisa.c,v 1.8 2005/12/11 12:21:20 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/eisa/devlist2h.awk b/sys/dev/eisa/devlist2h.awk
index ffc343df05e..4f1d3a85199 100644
--- a/sys/dev/eisa/devlist2h.awk
+++ b/sys/dev/eisa/devlist2h.awk
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: devlist2h.awk,v 1.8 2005/02/27 05:29:05 perry Exp $
+# $NetBSD: devlist2h.awk,v 1.9 2005/12/11 12:21:20 christos Exp $
#
# Copyright (c) 1995, 1996 Christopher G. Demetriou
# All rights reserved.
diff --git a/sys/dev/eisa/dpt_eisa.c b/sys/dev/eisa/dpt_eisa.c
index 7e254aa3a70..decffce87c7 100644
--- a/sys/dev/eisa/dpt_eisa.c
+++ b/sys/dev/eisa/dpt_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_eisa.c,v 1.12 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: dpt_eisa.c,v 1.13 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.12 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_eisa.c,v 1.13 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/eisa/eisa.c b/sys/dev/eisa/eisa.c
index 135cd2aeb01..20b2c4f4ad5 100644
--- a/sys/dev/eisa/eisa.c
+++ b/sys/dev/eisa/eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eisa.c,v 1.38 2005/08/25 22:33:18 drochner Exp $ */
+/* $NetBSD: eisa.c,v 1.39 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.38 2005/08/25 22:33:18 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisa.c,v 1.39 2005/12/11 12:21:20 christos Exp $");
#include "opt_eisaverbose.h"
diff --git a/sys/dev/eisa/eisabusprint.c b/sys/dev/eisa/eisabusprint.c
index d59f8c15cf5..fe33fad9d06 100644
--- a/sys/dev/eisa/eisabusprint.c
+++ b/sys/dev/eisa/eisabusprint.c
@@ -1,7 +1,6 @@
-/* $NetBSD: eisabusprint.c,v 1.2 2005/05/24 05:14:37 lukem Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eisabusprint.c,v 1.2 2005/05/24 05:14:37 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eisabusprint.c,v 1.3 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/eisa/eisadevs b/sys/dev/eisa/eisadevs
index 24427b376e0..e23659d8a92 100644
--- a/sys/dev/eisa/eisadevs
+++ b/sys/dev/eisa/eisadevs
@@ -1,4 +1,4 @@
-$NetBSD: eisadevs,v 1.27 2005/02/27 00:26:59 perry Exp $
+$NetBSD: eisadevs,v 1.28 2005/12/11 12:21:20 christos Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
diff --git a/sys/dev/eisa/eisadevs.h b/sys/dev/eisa/eisadevs.h
index bffb4789fb5..3abae10526c 100644
--- a/sys/dev/eisa/eisadevs.h
+++ b/sys/dev/eisa/eisadevs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: eisadevs.h,v 1.29 2005/02/27 05:29:24 perry Exp $ */
+/* $NetBSD: eisadevs.h,v 1.30 2005/12/11 12:21:20 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
diff --git a/sys/dev/eisa/eisadevs_data.h b/sys/dev/eisa/eisadevs_data.h
index 582e06ed24c..7cec4d8812b 100644
--- a/sys/dev/eisa/eisadevs_data.h
+++ b/sys/dev/eisa/eisadevs_data.h
@@ -1,4 +1,4 @@
-/* $NetBSD: eisadevs_data.h,v 1.30 2005/02/27 05:29:24 perry Exp $ */
+/* $NetBSD: eisadevs_data.h,v 1.31 2005/12/11 12:21:20 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
diff --git a/sys/dev/eisa/eisareg.h b/sys/dev/eisa/eisareg.h
index 4dfbfbdddda..0f71e1596fd 100644
--- a/sys/dev/eisa/eisareg.h
+++ b/sys/dev/eisa/eisareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: eisareg.h,v 1.6 2005/05/17 04:14:57 christos Exp $ */
+/* $NetBSD: eisareg.h,v 1.7 2005/12/11 12:21:20 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
diff --git a/sys/dev/eisa/eisavar.h b/sys/dev/eisa/eisavar.h
index 613a328cfc1..b7832eab726 100644
--- a/sys/dev/eisa/eisavar.h
+++ b/sys/dev/eisa/eisavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: eisavar.h,v 1.21 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: eisavar.h,v 1.22 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/eisa/files.eisa b/sys/dev/eisa/files.eisa
index 88d123d64c1..2e8e06ac9b5 100644
--- a/sys/dev/eisa/files.eisa
+++ b/sys/dev/eisa/files.eisa
@@ -1,4 +1,4 @@
-# $NetBSD: files.eisa,v 1.26 2004/08/30 10:30:38 drochner Exp $
+# $NetBSD: files.eisa,v 1.27 2005/12/11 12:21:20 christos Exp $
#
# Config file and device description for machine-independent EISA code.
# Included by ports that need it. Requires that the SCSI files be
diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c
index be552e12a5f..f9417e2b9f1 100644
--- a/sys/dev/eisa/if_ep_eisa.c
+++ b/sys/dev/eisa/if_ep_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_eisa.c,v 1.30 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: if_ep_eisa.c,v 1.31 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.30 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_eisa.c,v 1.31 2005/12/11 12:21:20 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/eisa/if_fea.c b/sys/dev/eisa/if_fea.c
index f668f8240f5..bdd3bfae4b3 100644
--- a/sys/dev/eisa/if_fea.c
+++ b/sys/dev/eisa/if_fea.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fea.c,v 1.29 2005/05/30 04:36:52 christos Exp $ */
+/* $NetBSD: if_fea.c,v 1.30 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.29 2005/05/30 04:36:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fea.c,v 1.30 2005/12/11 12:21:20 christos Exp $");
#include "opt_inet.h"
diff --git a/sys/dev/eisa/if_tlp_eisa.c b/sys/dev/eisa/if_tlp_eisa.c
index 78d03fc9409..78aeefdb57d 100644
--- a/sys/dev/eisa/if_tlp_eisa.c
+++ b/sys/dev/eisa/if_tlp_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_eisa.c,v 1.13 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: if_tlp_eisa.c,v 1.14 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.13 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.14 2005/12/11 12:21:20 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/eisa/mlx_eisa.c b/sys/dev/eisa/mlx_eisa.c
index 675fcca7815..1133b43a407 100644
--- a/sys/dev/eisa/mlx_eisa.c
+++ b/sys/dev/eisa/mlx_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx_eisa.c,v 1.13 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: mlx_eisa.c,v 1.14 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.13 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_eisa.c,v 1.14 2005/12/11 12:21:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c
index b44d97c0380..e43cfceabef 100644
--- a/sys/dev/eisa/uha_eisa.c
+++ b/sys/dev/eisa/uha_eisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uha_eisa.c,v 1.22 2004/08/23 06:03:19 thorpej Exp $ */
+/* $NetBSD: uha_eisa.c,v 1.23 2005/12/11 12:21:20 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.22 2004/08/23 06:03:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_eisa.c,v 1.23 2005/12/11 12:21:20 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/fss.c b/sys/dev/fss.c
index 44971d7c8fc..ffe57842d0f 100644
--- a/sys/dev/fss.c
+++ b/sys/dev/fss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.17 2005/10/24 14:25:06 hannken Exp $ */
+/* $NetBSD: fss.c,v 1.18 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.17 2005/10/24 14:25:06 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.18 2005/12/11 12:20:53 christos Exp $");
#include "fss.h"
@@ -128,10 +128,10 @@ dev_type_size(fss_size);
static int fss_copy_on_write(void *, struct buf *);
static inline void fss_error(struct fss_softc *, const char *, ...);
static int fss_create_files(struct fss_softc *, struct fss_set *,
- off_t *, struct proc *);
+ off_t *, struct lwp *);
static int fss_create_snapshot(struct fss_softc *, struct fss_set *,
- struct proc *);
-static int fss_delete_snapshot(struct fss_softc *, struct proc *);
+ struct lwp *);
+static int fss_delete_snapshot(struct fss_softc *, struct lwp *);
static int fss_softc_alloc(struct fss_softc *);
static void fss_softc_free(struct fss_softc *);
static void fss_cluster_iodone(struct buf *);
@@ -167,7 +167,7 @@ fssattach(int num)
}
int
-fss_open(dev_t dev, int flags, int mode, struct proc *p)
+fss_open(dev_t dev, int flags, int mode, struct lwp *l)
{
int s, mflag;
struct fss_softc *sc;
@@ -187,7 +187,7 @@ fss_open(dev_t dev, int flags, int mode, struct proc *p)
}
int
-fss_close(dev_t dev, int flags, int mode, struct proc *p)
+fss_close(dev_t dev, int flags, int mode, struct lwp *l)
{
int s, mflag, error;
struct fss_softc *sc;
@@ -203,7 +203,7 @@ fss_close(dev_t dev, int flags, int mode, struct proc *p)
if ((sc->sc_uflags & FSS_UNCONFIG_ON_CLOSE) != 0 &&
(sc->sc_flags & FSS_ACTIVE) != 0) {
FSS_UNLOCK(sc, s);
- error = fss_ioctl(dev, FSSIOCCLR, NULL, FWRITE, p);
+ error = fss_ioctl(dev, FSSIOCCLR, NULL, FWRITE, l);
if (error)
return error;
FSS_LOCK(sc, s);
@@ -260,7 +260,7 @@ fss_write(dev_t dev, struct uio *uio, int flags)
}
int
-fss_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+fss_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int s, error;
struct fss_softc *sc;
@@ -288,7 +288,7 @@ fss_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
else if ((sc->sc_flags & FSS_ACTIVE) != 0)
error = EBUSY;
else
- error = fss_create_snapshot(sc, fss, p);
+ error = fss_create_snapshot(sc, fss, l);
break;
case FSSIOCCLR:
@@ -297,7 +297,7 @@ fss_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
else if ((sc->sc_flags & FSS_ACTIVE) == 0)
error = ENXIO;
else
- error = fss_delete_snapshot(sc, p);
+ error = fss_delete_snapshot(sc, l);
break;
case FSSIOCGET:
@@ -536,7 +536,7 @@ fss_copy_on_write(void *v, struct buf *bp)
*/
static int
fss_create_files(struct fss_softc *sc, struct fss_set *fss,
- off_t *bsize, struct proc *p)
+ off_t *bsize, struct lwp *l)
{
int error, bits, fsbsize;
struct timespec ts;
@@ -548,7 +548,7 @@ fss_create_files(struct fss_softc *sc, struct fss_set *fss,
* Get the mounted file system.
*/
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, fss->fss_mount, p);
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, fss->fss_mount, l);
if ((error = namei(&nd)) != 0)
return error;
@@ -566,7 +566,7 @@ fss_create_files(struct fss_softc *sc, struct fss_set *fss,
* Check for file system internal snapshot.
*/
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, fss->fss_bstore, p);
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, fss->fss_bstore, l);
if ((error = namei(&nd)) != 0)
return error;
@@ -574,7 +574,7 @@ fss_create_files(struct fss_softc *sc, struct fss_set *fss,
vrele(nd.ni_vp);
sc->sc_flags |= FSS_PERSISTENT;
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, fss->fss_bstore, p);
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, fss->fss_bstore, l);
if ((error = vn_open(&nd, FREAD, 0)) != 0)
return error;
sc->sc_bs_vp = nd.ni_vp;
@@ -607,7 +607,7 @@ fss_create_files(struct fss_softc *sc, struct fss_set *fss,
*/
NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE,
- sc->sc_mount->mnt_stat.f_mntfromname, p);
+ sc->sc_mount->mnt_stat.f_mntfromname, l);
if ((error = namei(&nd)) != 0)
return error;
@@ -616,7 +616,8 @@ fss_create_files(struct fss_softc *sc, struct fss_set *fss,
return EINVAL;
}
- error = VOP_IOCTL(nd.ni_vp, DIOCGPART, &dpart, FREAD, p->p_ucred, p);
+ error = VOP_IOCTL(nd.ni_vp, DIOCGPART, &dpart, FREAD,
+ l->l_proc->p_ucred, l);
if (error) {
vrele(nd.ni_vp);
return error;
@@ -631,7 +632,7 @@ fss_create_files(struct fss_softc *sc, struct fss_set *fss,
* Get the backing store
*/
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, fss->fss_bstore, p);
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, fss->fss_bstore, l);
if ((error = vn_open(&nd, FREAD|FWRITE, 0)) != 0)
return error;
VOP_UNLOCK(nd.ni_vp, 0);
@@ -642,7 +643,7 @@ fss_create_files(struct fss_softc *sc, struct fss_set *fss,
return EINVAL;
if (sc->sc_bs_vp->v_type == VREG) {
- error = VOP_GETATTR(sc->sc_bs_vp, &va, p->p_ucred, p);
+ error = VOP_GETATTR(sc->sc_bs_vp, &va, l->l_proc->p_ucred, l);
if (error != 0)
return error;
sc->sc_bs_size = va.va_size;
@@ -666,7 +667,7 @@ fss_create_files(struct fss_softc *sc, struct fss_set *fss,
* VOP_STRATEGY() clean the buffer cache to prevent
* cache incoherencies.
*/
- if ((error = vinvalbuf(sc->sc_bs_vp, V_SAVE, p->p_ucred, p, 0, 0)) != 0)
+ if ((error = vinvalbuf(sc->sc_bs_vp, V_SAVE, l->l_proc->p_ucred, l, 0, 0)) != 0)
return error;
return 0;
@@ -676,7 +677,7 @@ fss_create_files(struct fss_softc *sc, struct fss_set *fss,
* Create a snapshot.
*/
static int
-fss_create_snapshot(struct fss_softc *sc, struct fss_set *fss, struct proc *p)
+fss_create_snapshot(struct fss_softc *sc, struct fss_set *fss, struct lwp *l)
{
int len, error;
u_int32_t csize;
@@ -685,7 +686,7 @@ fss_create_snapshot(struct fss_softc *sc, struct fss_set *fss, struct proc *p)
/*
* Open needed files.
*/
- if ((error = fss_create_files(sc, fss, &bsize, p)) != 0)
+ if ((error = fss_create_files(sc, fss, &bsize, l)) != 0)
goto bad;
if (sc->sc_flags & FSS_PERSISTENT) {
@@ -775,9 +776,9 @@ bad:
fss_softc_free(sc);
if (sc->sc_bs_vp != NULL) {
if (sc->sc_flags & FSS_PERSISTENT)
- vn_close(sc->sc_bs_vp, FREAD, p->p_ucred, p);
+ vn_close(sc->sc_bs_vp, FREAD, l->l_proc->p_ucred, l);
else
- vn_close(sc->sc_bs_vp, FREAD|FWRITE, p->p_ucred, p);
+ vn_close(sc->sc_bs_vp, FREAD|FWRITE, l->l_proc->p_ucred, l);
}
sc->sc_bs_vp = NULL;
@@ -788,7 +789,7 @@ bad:
* Delete a snapshot.
*/
static int
-fss_delete_snapshot(struct fss_softc *sc, struct proc *p)
+fss_delete_snapshot(struct fss_softc *sc, struct lwp *l)
{
int s;
@@ -803,9 +804,9 @@ fss_delete_snapshot(struct fss_softc *sc, struct proc *p)
fss_softc_free(sc);
if (sc->sc_flags & FSS_PERSISTENT)
- vn_close(sc->sc_bs_vp, FREAD, p->p_ucred, p);
+ vn_close(sc->sc_bs_vp, FREAD, l->l_proc->p_ucred, l);
else
- vn_close(sc->sc_bs_vp, FREAD|FWRITE, p->p_ucred, p);
+ vn_close(sc->sc_bs_vp, FREAD|FWRITE, l->l_proc->p_ucred, l);
sc->sc_bs_vp = NULL;
sc->sc_flags &= ~FSS_PERSISTENT;
@@ -966,7 +967,7 @@ fss_bs_io(struct fss_softc *sc, fss_io_type rw,
error = vn_rdwr((rw == FSS_READ ? UIO_READ : UIO_WRITE), sc->sc_bs_vp,
data, len, off, UIO_SYSSPACE, IO_UNIT|IO_NODELOCKED,
- sc->sc_bs_proc->p_ucred, NULL, sc->sc_bs_proc);
+ sc->sc_bs_proc->p_ucred, NULL, NULL);
if (error == 0) {
simple_lock(&sc->sc_bs_vp->v_interlock);
error = VOP_PUTPAGES(sc->sc_bs_vp, trunc_page(off),
diff --git a/sys/dev/fssvar.h b/sys/dev/fssvar.h
index 4657467898e..87ead9e1f27 100644
--- a/sys/dev/fssvar.h
+++ b/sys/dev/fssvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fssvar.h,v 1.11 2005/10/24 14:25:06 hannken Exp $ */
+/* $NetBSD: fssvar.h,v 1.12 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/gpib/cs80bus.c b/sys/dev/gpib/cs80bus.c
index 6ac329d88b2..8069f6fe7d9 100644
--- a/sys/dev/gpib/cs80bus.c
+++ b/sys/dev/gpib/cs80bus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs80bus.c,v 1.3 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: cs80bus.c,v 1.4 2005/12/11 12:21:21 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs80bus.c,v 1.3 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs80bus.c,v 1.4 2005/12/11 12:21:21 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/gpib/cs80busvar.h b/sys/dev/gpib/cs80busvar.h
index 5a1fff927a3..f1ec59aabd8 100644
--- a/sys/dev/gpib/cs80busvar.h
+++ b/sys/dev/gpib/cs80busvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs80busvar.h,v 1.2 2004/04/19 12:44:10 wiz Exp $ */
+/* $NetBSD: cs80busvar.h,v 1.3 2005/12/11 12:21:21 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/gpib/ct.c b/sys/dev/gpib/ct.c
index 5d9b44fda06..508a685f3ba 100644
--- a/sys/dev/gpib/ct.c
+++ b/sys/dev/gpib/ct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ct.c,v 1.5 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: ct.c,v 1.6 2005/12/11 12:21:21 christos Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -128,7 +128,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.5 2005/10/15 17:29:12 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.6 2005/12/11 12:21:21 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/gpib/ctreg.h b/sys/dev/gpib/ctreg.h
index 88389ac6d90..268f3f964b5 100644
--- a/sys/dev/gpib/ctreg.h
+++ b/sys/dev/gpib/ctreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ctreg.h,v 1.2 2003/08/07 16:30:56 agc Exp $ */
+/* $NetBSD: ctreg.h,v 1.3 2005/12/11 12:21:21 christos Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
diff --git a/sys/dev/gpib/gpib.c b/sys/dev/gpib/gpib.c
index 309a86ae8e6..175bfb4c96c 100644
--- a/sys/dev/gpib/gpib.c
+++ b/sys/dev/gpib/gpib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gpib.c,v 1.5 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: gpib.c,v 1.6 2005/12/11 12:21:21 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.5 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpib.c,v 1.6 2005/12/11 12:21:21 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/gpib/gpibio.h b/sys/dev/gpib/gpibio.h
index d9261299078..3bb86f5832b 100644
--- a/sys/dev/gpib/gpibio.h
+++ b/sys/dev/gpib/gpibio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gpibio.h,v 1.2 2005/03/11 23:41:02 nathanw Exp $ */
+/* $NetBSD: gpibio.h,v 1.3 2005/12/11 12:21:21 christos Exp $ */
#ifndef _SYS_GPIBIO_H_
#define _SYS_GPIBIO_H_
diff --git a/sys/dev/gpib/gpibvar.h b/sys/dev/gpib/gpibvar.h
index c8ed647cb0b..f8ee8cd2a66 100644
--- a/sys/dev/gpib/gpibvar.h
+++ b/sys/dev/gpib/gpibvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gpibvar.h,v 1.2 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: gpibvar.h,v 1.3 2005/12/11 12:21:21 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/gpib/hil_gpib.c b/sys/dev/gpib/hil_gpib.c
index 98d1b8bb704..6cc23b1538a 100644
--- a/sys/dev/gpib/hil_gpib.c
+++ b/sys/dev/gpib/hil_gpib.c
@@ -1,7 +1,7 @@
-/* $NetBSD: hil_gpib.c,v 1.3 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: hil_gpib.c,v 1.4 2005/12/11 12:21:21 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hil_gpib.c,v 1.3 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hil_gpib.c,v 1.4 2005/12/11 12:21:21 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/gpib/mt.c b/sys/dev/gpib/mt.c
index 4802f3b13ff..20d2cda24c1 100644
--- a/sys/dev/gpib/mt.c
+++ b/sys/dev/gpib/mt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mt.c,v 1.4 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: mt.c,v 1.5 2005/12/11 12:21:21 christos Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -121,7 +121,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.4 2005/10/15 17:29:12 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.5 2005/12/11 12:21:21 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/gpib/mtreg.h b/sys/dev/gpib/mtreg.h
index fef6c60fb62..08b6352a558 100644
--- a/sys/dev/gpib/mtreg.h
+++ b/sys/dev/gpib/mtreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mtreg.h,v 1.3 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: mtreg.h,v 1.4 2005/12/11 12:21:21 christos Exp $ */
/*
* Copyright (c) 1992, The University of Utah and
diff --git a/sys/dev/gpib/ppi.c b/sys/dev/gpib/ppi.c
index 543d21003a1..9932913f288 100644
--- a/sys/dev/gpib/ppi.c
+++ b/sys/dev/gpib/ppi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ppi.c,v 1.3 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: ppi.c,v 1.4 2005/12/11 12:21:21 christos Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.3 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.4 2005/12/11 12:21:21 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/gpib/ppiio.h b/sys/dev/gpib/ppiio.h
index 8c5f6d8aad6..03902152f81 100644
--- a/sys/dev/gpib/ppiio.h
+++ b/sys/dev/gpib/ppiio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppiio.h,v 1.2 2003/08/07 16:30:56 agc Exp $ */
+/* $NetBSD: ppiio.h,v 1.3 2005/12/11 12:21:21 christos Exp $ */
/*
* Copyright (c) 1990, 1993
diff --git a/sys/dev/gpib/rd.c b/sys/dev/gpib/rd.c
index e1d40fec98e..f016de8bde2 100644
--- a/sys/dev/gpib/rd.c
+++ b/sys/dev/gpib/rd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.6 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: rd.c,v 1.7 2005/12/11 12:21:21 christos Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.6 2005/10/15 17:29:12 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rd.c,v 1.7 2005/12/11 12:21:21 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/gpib/rdreg.h b/sys/dev/gpib/rdreg.h
index 521459f4f92..64c7c185df1 100644
--- a/sys/dev/gpib/rdreg.h
+++ b/sys/dev/gpib/rdreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rdreg.h,v 1.3 2003/11/02 10:31:06 wiz Exp $ */
+/* $NetBSD: rdreg.h,v 1.4 2005/12/11 12:21:21 christos Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
diff --git a/sys/dev/gpio/files.gpio b/sys/dev/gpio/files.gpio
index af0d8607457..b1da3c4bf3f 100644
--- a/sys/dev/gpio/files.gpio
+++ b/sys/dev/gpio/files.gpio
@@ -1,4 +1,4 @@
-# $NetBSD: files.gpio,v 1.1 2005/09/27 02:34:02 jmcneill Exp $
+# $NetBSD: files.gpio,v 1.2 2005/12/11 12:21:22 christos Exp $
define gpio {pin, mask}
diff --git a/sys/dev/gpio/gpio.c b/sys/dev/gpio/gpio.c
index 7f351a41c09..9c036f8b265 100644
--- a/sys/dev/gpio/gpio.c
+++ b/sys/dev/gpio/gpio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.3 2005/10/11 16:01:03 drochner Exp $ */
+/* $NetBSD: gpio.c,v 1.4 2005/12/11 12:21:22 christos Exp $ */
/* $OpenBSD: gpio.c,v 1.4 2004/11/23 21:18:37 grange Exp $ */
/*
* Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.3 2005/10/11 16:01:03 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.4 2005/12/11 12:21:22 christos Exp $");
/*
* General Purpose Input/Output framework.
@@ -170,7 +170,7 @@ gpiobus_print(void *aux, const char *pnp)
}
int
-gpioopen(dev_t dev, int flag, int mode, struct proc *p)
+gpioopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct gpio_softc *sc;
@@ -186,7 +186,7 @@ gpioopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-gpioclose(dev_t dev, int flag, int mode, struct proc *p)
+gpioclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct gpio_softc *sc;
@@ -197,7 +197,7 @@ gpioclose(dev_t dev, int flag, int mode, struct proc *p)
}
int
-gpioioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+gpioioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct gpio_softc *sc;
gpio_chipset_tag_t gc;
diff --git a/sys/dev/gpio/gpiovar.h b/sys/dev/gpio/gpiovar.h
index 9675c1b626e..47362fd3577 100644
--- a/sys/dev/gpio/gpiovar.h
+++ b/sys/dev/gpio/gpiovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiovar.h,v 1.2 2005/10/11 16:01:03 drochner Exp $ */
+/* $NetBSD: gpiovar.h,v 1.3 2005/12/11 12:21:22 christos Exp $ */
/* $OpenBSD: gpiovar.h,v 1.1 2004/06/03 18:08:00 grange Exp $ */
/*
* Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
diff --git a/sys/dev/hpc/apm/apmdev.c b/sys/dev/hpc/apm/apmdev.c
index 6372e785e4a..8d6df73a4f4 100644
--- a/sys/dev/hpc/apm/apmdev.c
+++ b/sys/dev/hpc/apm/apmdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apmdev.c,v 1.3 2005/05/31 23:05:47 uwe Exp $ */
+/* $NetBSD: apmdev.c,v 1.4 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.3 2005/05/31 23:05:47 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apmdev.c,v 1.4 2005/12/11 12:21:22 christos Exp $");
#include "opt_apmdev.h"
@@ -763,7 +763,7 @@ apm_thread(void *arg)
}
int
-apmdevopen(dev_t dev, int flag, int mode, struct proc *p)
+apmdevopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = APMUNIT(dev);
int ctl = APMDEV(dev);
@@ -780,7 +780,7 @@ apmdevopen(dev_t dev, int flag, int mode, struct proc *p)
return ENXIO;
DPRINTF(APMDEBUG_DEVICE,
- ("apmopen: pid %d flag %x mode %x\n", p->p_pid, flag, mode));
+ ("apmopen: pid %d flag %x mode %x\n", l->l_proc->p_pid, flag, mode));
APM_LOCK(sc);
switch (ctl) {
@@ -812,13 +812,13 @@ apmdevopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-apmdevclose(dev_t dev, int flag, int mode, struct proc *p)
+apmdevclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct apm_softc *sc = apmdev_cd.cd_devs[APMUNIT(dev)];
int ctl = APMDEV(dev);
DPRINTF(APMDEBUG_DEVICE,
- ("apmclose: pid %d flag %x mode %x\n", p->p_pid, flag, mode));
+ ("apmclose: pid %d flag %x mode %x\n", l->l_proc->p_pid, flag, mode));
APM_LOCK(sc);
switch (ctl) {
@@ -838,7 +838,7 @@ apmdevclose(dev_t dev, int flag, int mode, struct proc *p)
}
int
-apmdevioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+apmdevioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct apm_softc *sc = apmdev_cd.cd_devs[APMUNIT(dev)];
struct apm_power_info *powerp;
@@ -921,7 +921,7 @@ apmdevioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
}
int
-apmdevpoll(dev_t dev, int events, struct proc *p)
+apmdevpoll(dev_t dev, int events, struct lwp *l)
{
struct apm_softc *sc = apmdev_cd.cd_devs[APMUNIT(dev)];
int revents = 0;
@@ -931,7 +931,7 @@ apmdevpoll(dev_t dev, int events, struct proc *p)
if (sc->event_count)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sc->sc_rsel);
+ selrecord(l, &sc->sc_rsel);
}
APM_UNLOCK(sc);
diff --git a/sys/dev/hpc/apm/apmvar.h b/sys/dev/hpc/apm/apmvar.h
index 03f75470f9f..ac52205a840 100644
--- a/sys/dev/hpc/apm/apmvar.h
+++ b/sys/dev/hpc/apm/apmvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: apmvar.h,v 1.1 2004/07/03 12:46:57 uch Exp $ */
+/* $NetBSD: apmvar.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/hpc/apm/files.apm b/sys/dev/hpc/apm/files.apm
index 69db7cd4d19..c893cf742e0 100644
--- a/sys/dev/hpc/apm/files.apm
+++ b/sys/dev/hpc/apm/files.apm
@@ -1,4 +1,4 @@
-# $NetBSD: files.apm,v 1.1 2004/07/03 12:46:57 uch Exp $
+# $NetBSD: files.apm,v 1.2 2005/12/11 12:21:22 christos Exp $
#
# Common APM support files
diff --git a/sys/dev/hpc/bicons.c b/sys/dev/hpc/bicons.c
index dc044ee7f7b..ef93d272f43 100644
--- a/sys/dev/hpc/bicons.c
+++ b/sys/dev/hpc/bicons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bicons.c,v 1.9 2005/06/02 21:36:25 uwe Exp $ */
+/* $NetBSD: bicons.c,v 1.10 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bicons.c,v 1.9 2005/06/02 21:36:25 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bicons.c,v 1.10 2005/12/11 12:21:22 christos Exp $");
#define HALF_FONT
diff --git a/sys/dev/hpc/biconsdev.c b/sys/dev/hpc/biconsdev.c
index 2bba0353cb1..9aa2df5f83d 100644
--- a/sys/dev/hpc/biconsdev.c
+++ b/sys/dev/hpc/biconsdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: biconsdev.c,v 1.12 2005/11/27 05:35:52 thorpej Exp $ */
+/* $NetBSD: biconsdev.c,v 1.13 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.12 2005/11/27 05:35:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: biconsdev.c,v 1.13 2005/12/11 12:21:22 christos Exp $");
#include "biconsdev.h"
#include <sys/param.h>
@@ -164,7 +164,7 @@ biconsdev_output(struct tty *tp)
int
-biconsdevopen(dev_t dev, int flag, int mode, struct proc *p)
+biconsdevopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct tty *tp = &biconsdev_tty[0];
int status;
@@ -182,7 +182,7 @@ biconsdevopen(dev_t dev, int flag, int mode, struct proc *p)
(void)(*tp->t_param)(tp, &tp->t_termios);
ttsetwater(tp);
} else if (tp->t_state & TS_XCLUDE &&
- suser(p->p_ucred, &p->p_acflag) != 0)
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0)
return (EBUSY);
status = (*tp->t_linesw->l_open)(dev, tp);
@@ -191,7 +191,7 @@ biconsdevopen(dev_t dev, int flag, int mode, struct proc *p)
int
-biconsdevclose(dev_t dev, int flag, int mode, struct proc *p)
+biconsdevclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct tty *tp = &biconsdev_tty[0];
@@ -221,11 +221,11 @@ biconsdevwrite(dev_t dev, struct uio *uio, int flag)
int
-biconsdevpoll(dev_t dev, int events, struct proc *p)
+biconsdevpoll(dev_t dev, int events, struct lwp *l)
{
struct tty *tp = &biconsdev_tty[0];
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
@@ -238,13 +238,13 @@ biconsdevtty(dev_t dev)
}
int
-biconsdevioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+biconsdevioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct tty *tp = &biconsdev_tty[0];
int error;
- if ((error = tp->t_linesw->l_ioctl(tp, cmd, data, flag, p)) !=
+ if ((error = tp->t_linesw->l_ioctl(tp, cmd, data, flag, l)) !=
EPASSTHROUGH)
return (error);
- return (ttioctl(tp, cmd, data, flag, p));
+ return (ttioctl(tp, cmd, data, flag, l));
}
diff --git a/sys/dev/hpc/bivideo.c b/sys/dev/hpc/bivideo.c
index 9c495875c99..19787270086 100644
--- a/sys/dev/hpc/bivideo.c
+++ b/sys/dev/hpc/bivideo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bivideo.c,v 1.20 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: bivideo.c,v 1.21 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.20 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bivideo.c,v 1.21 2005/12/11 12:21:22 christos Exp $");
#define FBDEBUG
static const char _copyright[] __attribute__ ((unused)) =
@@ -77,7 +77,7 @@ int bivideo_dont_attach = 0;
*/
int bivideomatch(struct device *, struct cfdata *, void *);
void bivideoattach(struct device *, struct device *, void *);
-int bivideo_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int bivideo_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t bivideo_mmap(void *, off_t, int);
struct bivideo_softc {
@@ -369,7 +369,7 @@ bivideo_update_powerstate(struct bivideo_softc *sc, int updates)
}
int
-bivideo_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+bivideo_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct bivideo_softc *sc = (struct bivideo_softc *)v;
struct hpcfb_fbconf *fbconf;
diff --git a/sys/dev/hpc/btnmgr.c b/sys/dev/hpc/btnmgr.c
index 9300a0bbce8..202ad28b944 100644
--- a/sys/dev/hpc/btnmgr.c
+++ b/sys/dev/hpc/btnmgr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btnmgr.c,v 1.14 2005/05/31 23:04:10 uwe Exp $ */
+/* $NetBSD: btnmgr.c,v 1.15 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.14 2005/05/31 23:04:10 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btnmgr.c,v 1.15 2005/12/11 12:21:22 christos Exp $");
#define BTNMGRDEBUG
@@ -108,7 +108,7 @@ const struct cdevsw btnmgr_cdevsw = {
/* wskbd accessopts */
int btnmgr_wskbd_enable(void *, int);
void btnmgr_wskbd_set_leds(void *, int);
-int btnmgr_wskbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int btnmgr_wskbd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
const struct wskbd_accessops btnmgr_wskbd_accessops = {
btnmgr_wskbd_enable,
@@ -277,7 +277,7 @@ btnmgr_wskbd_set_leds(void *scx, int leds)
int
btnmgr_wskbd_ioctl(void *scx, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
#ifdef WSDISPLAY_COMPAT_RAWKBD
struct btnmgr_softc *sc = scx;
@@ -306,13 +306,13 @@ btnmgr_wskbd_ioctl(void *scx, u_long cmd, caddr_t data, int flag,
#ifdef notyet
int
-btnmgropen(dev_t dev, int flag, int mode, struct proc *p)
+btnmgropen(dev_t dev, int flag, int mode, struct lwp *l)
{
return (EINVAL);
}
int
-btnmgrclose(dev_t dev, int flag, int mode, struct proc *p)
+btnmgrclose(dev_t dev, int flag, int mode, struct lwp *l)
{
return (EINVAL);
}
@@ -330,7 +330,7 @@ btnmgrwrite(dev_t dev, struct uio *uio, int flag)
}
int
-btnmgrioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+btnmgrioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
return (EINVAL);
}
diff --git a/sys/dev/hpc/button.c b/sys/dev/hpc/button.c
index 599ca83917a..e2bd788f1e8 100644
--- a/sys/dev/hpc/button.c
+++ b/sys/dev/hpc/button.c
@@ -1,4 +1,4 @@
-/* $NetBSD: button.c,v 1.10 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: button.c,v 1.11 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.10 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: button.c,v 1.11 2005/12/11 12:21:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/hpc/files.hpcio b/sys/dev/hpc/files.hpcio
index 8dad63cbe95..d35888eb330 100644
--- a/sys/dev/hpc/files.hpcio
+++ b/sys/dev/hpc/files.hpcio
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcio,v 1.4 2005/02/27 00:26:59 perry Exp $
+# $NetBSD: files.hpcio,v 1.5 2005/12/11 12:21:22 christos Exp $
# H/PC GPIO interface
# platform:
diff --git a/sys/dev/hpc/files.hpckbd b/sys/dev/hpc/files.hpckbd
index 08af22ac31b..eef0243448e 100644
--- a/sys/dev/hpc/files.hpckbd
+++ b/sys/dev/hpc/files.hpckbd
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpckbd,v 1.5 2004/06/23 21:50:22 uwe Exp $
+# $NetBSD: files.hpckbd,v 1.6 2005/12/11 12:21:22 christos Exp $
# H/PC keyboard interface for wskbd
defparam PCKBD_LAYOUT
diff --git a/sys/dev/hpc/files.hpctp b/sys/dev/hpc/files.hpctp
index 70debda9ed8..b86e0c14c1d 100644
--- a/sys/dev/hpc/files.hpctp
+++ b/sys/dev/hpc/files.hpctp
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpctp,v 1.2 2004/05/28 17:52:07 tsarna Exp $
+# $NetBSD: files.hpctp,v 1.3 2005/12/11 12:21:22 christos Exp $
# H/PC touch panel interface.
define hpctpanel: tpcalib
diff --git a/sys/dev/hpc/hpcapm.c b/sys/dev/hpc/hpcapm.c
index fab8e1c77cd..41e1228203a 100644
--- a/sys/dev/hpc/hpcapm.c
+++ b/sys/dev/hpc/hpcapm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcapm.c,v 1.3 2005/07/30 22:51:42 nakayama Exp $ */
+/* $NetBSD: hpcapm.c,v 1.4 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2000 Takemura Shin
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.3 2005/07/30 22:51:42 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.4 2005/12/11 12:21:22 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/hpc/hpcbatterytable.h b/sys/dev/hpc/hpcbatterytable.h
index 37eb1659497..5652680a53f 100644
--- a/sys/dev/hpc/hpcbatterytable.h
+++ b/sys/dev/hpc/hpcbatterytable.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcbatterytable.h,v 1.5 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: hpcbatterytable.h,v 1.6 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2000-2001 SATO Kazumi
diff --git a/sys/dev/hpc/hpcbatteryvar.h b/sys/dev/hpc/hpcbatteryvar.h
index d0fee02017b..02f1596f2c1 100644
--- a/sys/dev/hpc/hpcbatteryvar.h
+++ b/sys/dev/hpc/hpcbatteryvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcbatteryvar.h,v 1.2 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: hpcbatteryvar.h,v 1.3 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2000-2001 SATO Kazumi
diff --git a/sys/dev/hpc/hpccmap_gen.c b/sys/dev/hpc/hpccmap_gen.c
index c992f293b3a..fffb30239c3 100644
--- a/sys/dev/hpc/hpccmap_gen.c
+++ b/sys/dev/hpc/hpccmap_gen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpccmap_gen.c,v 1.4 2003/07/14 15:40:37 lukem Exp $ */
+/* $NetBSD: hpccmap_gen.c,v 1.5 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: hpccmap_gen.c,v 1.4 2003/07/14 15:40:37 lukem Exp $");
+__RCSID("$NetBSD: hpccmap_gen.c,v 1.5 2005/12/11 12:21:22 christos Exp $");
typedef unsigned char u_char;
typedef void (*output_func)(void*, int, u_char, u_char, u_char);
diff --git a/sys/dev/hpc/hpcfb.c b/sys/dev/hpc/hpcfb.c
index c74bf44c340..224786894f2 100644
--- a/sys/dev/hpc/hpcfb.c
+++ b/sys/dev/hpc/hpcfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfb.c,v 1.33 2005/09/04 00:54:42 uwe Exp $ */
+/* $NetBSD: hpcfb.c,v 1.34 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999
@@ -43,13 +43,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.33 2005/09/04 00:54:42 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.34 2005/12/11 12:21:22 christos Exp $");
#define FBDEBUG
static const char _copyright[] __attribute__ ((unused)) =
"Copyright (c) 1999 Shin Takemura. All rights reserved.";
static const char _rcsid[] __attribute__ ((unused)) =
- "$NetBSD: hpcfb.c,v 1.33 2005/09/04 00:54:42 uwe Exp $";
+ "$NetBSD: hpcfb.c,v 1.34 2005/12/11 12:21:22 christos Exp $";
#include <sys/param.h>
#include <sys/systm.h>
@@ -182,7 +182,7 @@ int hpcfbmatch(struct device *, struct cfdata *, void *);
void hpcfbattach(struct device *, struct device *, void *);
int hpcfbprint(void *, const char *);
-int hpcfb_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int hpcfb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t hpcfb_mmap(void *, off_t, int);
void hpcfb_refresh_screen(struct hpcfb_softc *);
@@ -550,7 +550,7 @@ hpcfb_cmap_reorder(struct hpcfb_fbconf *fbconf, struct hpcfb_devconfig *dc)
}
int
-hpcfb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+hpcfb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct hpcfb_softc *sc = v;
struct hpcfb_devconfig *dc = sc->sc_dc;
@@ -610,7 +610,7 @@ hpcfb_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
case HPCFBIO_GOP:
case HPCFBIO_SOP:
return ((*sc->sc_accessops->ioctl)(sc->sc_accessctx,
- cmd, data, flag, p));
+ cmd, data, flag, l));
default:
if (IOCGROUP(cmd) != 't')
diff --git a/sys/dev/hpc/hpcfbvar.h b/sys/dev/hpc/hpcfbvar.h
index 793d583bdf4..f8d567e765b 100644
--- a/sys/dev/hpc/hpcfbvar.h
+++ b/sys/dev/hpc/hpcfbvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcfbvar.h,v 1.2 2001/06/04 18:59:31 uch Exp $ */
+/* $NetBSD: hpcfbvar.h,v 1.3 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999
@@ -40,7 +40,7 @@
* video access functions (must be provided by all video).
*/
struct hpcfb_accessops {
- int (*ioctl)(void *, u_long, caddr_t, int, struct proc *);
+ int (*ioctl)(void *, u_long, caddr_t, int, struct lwp *);
paddr_t (*mmap)(void *, off_t, int);
void (*cursor)(void *, int, int, int, int, int);
void (*bitblit)(void *, int, int, int, int, int, int);
diff --git a/sys/dev/hpc/hpcioman.c b/sys/dev/hpc/hpcioman.c
index be68f50fe13..f20fb657aba 100644
--- a/sys/dev/hpc/hpcioman.c
+++ b/sys/dev/hpc/hpcioman.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcioman.c,v 1.13 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: hpcioman.c,v 1.14 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.13 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcioman.c,v 1.14 2005/12/11 12:21:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/hpc/hpciovar.h b/sys/dev/hpc/hpciovar.h
index d53c8f54bb4..e502c3d9cef 100644
--- a/sys/dev/hpc/hpciovar.h
+++ b/sys/dev/hpc/hpciovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hpciovar.h,v 1.5 2005/06/07 11:43:01 he Exp $ */
+/* $NetBSD: hpciovar.h,v 1.6 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 2001 TAKEMURA Shin.
diff --git a/sys/dev/hpc/hpckbd.c b/sys/dev/hpc/hpckbd.c
index f63ee062d1c..cd1dec30979 100644
--- a/sys/dev/hpc/hpckbd.c
+++ b/sys/dev/hpc/hpckbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpckbd.c,v 1.13 2005/06/08 07:49:45 he Exp $ */
+/* $NetBSD: hpckbd.c,v 1.14 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.13 2005/06/08 07:49:45 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpckbd.c,v 1.14 2005/12/11 12:21:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@ CFATTACH_DECL(hpckbd, sizeof(struct hpckbd_softc),
/* wskbd accessopts */
int hpckbd_enable(void *, int);
void hpckbd_set_leds(void *, int);
-int hpckbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int hpckbd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
/* consopts */
struct hpckbd_core hpckbd_consdata;
@@ -465,7 +465,7 @@ hpckbd_set_leds(void *arg, int leds)
}
int
-hpckbd_ioctl(void *arg, u_long cmd, caddr_t data, int flag, struct proc *p)
+hpckbd_ioctl(void *arg, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
#ifdef WSDISPLAY_COMPAT_RAWKBD
struct hpckbd_core *hc = arg;
diff --git a/sys/dev/hpc/hpckbdkeymap.h b/sys/dev/hpc/hpckbdkeymap.h
index a936e479ebd..2d25d1e05dc 100644
--- a/sys/dev/hpc/hpckbdkeymap.h
+++ b/sys/dev/hpc/hpckbdkeymap.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hpckbdkeymap.h,v 1.37 2005/09/05 18:54:10 kiyohara Exp $ */
+/* $NetBSD: hpckbdkeymap.h,v 1.38 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/hpc/hpcout.c b/sys/dev/hpc/hpcout.c
index 8b7ec4898e1..cca2ce48b3d 100644
--- a/sys/dev/hpc/hpcout.c
+++ b/sys/dev/hpc/hpcout.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpcout.c,v 1.8 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: hpcout.c,v 1.9 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.8 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcout.c,v 1.9 2005/12/11 12:21:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/hpc/hpctpanel.c b/sys/dev/hpc/hpctpanel.c
index 6b89e49d1a2..0b757fd608b 100644
--- a/sys/dev/hpc/hpctpanel.c
+++ b/sys/dev/hpc/hpctpanel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hpctpanel.c,v 1.3 2005/05/31 23:14:02 uwe Exp $ */
+/* $NetBSD: hpctpanel.c,v 1.4 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 1999-2003 TAKEMURA Shin All rights reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpctpanel.c,v 1.3 2005/05/31 23:14:02 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpctpanel.c,v 1.4 2005/12/11 12:21:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpctpanel.c,v 1.3 2005/05/31 23:14:02 uwe Exp $");
int
hpc_tpanel_ioctl(struct tpcalib_softc *sc, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct wsmouse_id *id;
const char *idstr;
@@ -72,7 +72,7 @@ hpc_tpanel_ioctl(struct tpcalib_softc *sc, u_long cmd, caddr_t data, int flag,
case WSMOUSEIO_SCALIBCOORDS:
case WSMOUSEIO_GCALIBCOORDS:
- return tpcalib_ioctl(sc, cmd, data, flag, p);
+ return tpcalib_ioctl(sc, cmd, data, flag, l);
default:
return EPASSTHROUGH;
diff --git a/sys/dev/hpc/hpctpanelvar.h b/sys/dev/hpc/hpctpanelvar.h
index 34392530588..e0f9407f353 100644
--- a/sys/dev/hpc/hpctpanelvar.h
+++ b/sys/dev/hpc/hpctpanelvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hpctpanelvar.h,v 1.1 2004/05/28 17:52:07 tsarna Exp $ */
+/* $NetBSD: hpctpanelvar.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,4 +39,4 @@
#include <dev/wscons/tpcalibvar.h>
int hpc_tpanel_ioctl(struct tpcalib_softc *, u_long, caddr_t, int,
- struct proc *);
+ struct lwp *);
diff --git a/sys/dev/hpc/pckbd_encode.c b/sys/dev/hpc/pckbd_encode.c
index 82c71542a4b..e4262582ea8 100644
--- a/sys/dev/hpc/pckbd_encode.c
+++ b/sys/dev/hpc/pckbd_encode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd_encode.c,v 1.3 2004/03/13 17:31:34 bjh21 Exp $ */
+/* $NetBSD: pckbd_encode.c,v 1.4 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 2000 TAKEMRUA, Shin All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd_encode.c,v 1.3 2004/03/13 17:31:34 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd_encode.c,v 1.4 2005/12/11 12:21:22 christos Exp $");
#include "opt_wsdisplay_compat.h"
diff --git a/sys/dev/hpc/pwctl.c b/sys/dev/hpc/pwctl.c
index 88af9d0957a..5da9d5b9091 100644
--- a/sys/dev/hpc/pwctl.c
+++ b/sys/dev/hpc/pwctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pwctl.c,v 1.12 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: pwctl.c,v 1.13 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.12 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pwctl.c,v 1.13 2005/12/11 12:21:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/hpc/video_subr.c b/sys/dev/hpc/video_subr.c
index 2d89e1ce68a..685b99ef6d0 100644
--- a/sys/dev/hpc/video_subr.c
+++ b/sys/dev/hpc/video_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: video_subr.c,v 1.7 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: video_subr.c,v 1.8 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: video_subr.c,v 1.7 2005/02/27 00:26:59 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: video_subr.c,v 1.8 2005/12/11 12:21:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/hpc/video_subr.h b/sys/dev/hpc/video_subr.h
index 4a336e9b7b9..e23de345269 100644
--- a/sys/dev/hpc/video_subr.h
+++ b/sys/dev/hpc/video_subr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: video_subr.h,v 1.3 2005/02/27 00:26:59 perry Exp $ */
+/* $NetBSD: video_subr.h,v 1.4 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/i2c/adm1030.c b/sys/dev/i2c/adm1030.c
index b2cd8df173f..418c15d17ea 100644
--- a/sys/dev/i2c/adm1030.c
+++ b/sys/dev/i2c/adm1030.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adm1030.c,v 1.2 2005/09/11 20:26:15 macallan Exp $ */
+/* $NetBSD: adm1030.c,v 1.3 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (C) 2005 Michael Lorenz.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm1030.c,v 1.2 2005/09/11 20:26:15 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1030.c,v 1.3 2005/12/11 12:21:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/i2c/adm1030var.h b/sys/dev/i2c/adm1030var.h
index 88168345c93..e14477d0685 100644
--- a/sys/dev/i2c/adm1030var.h
+++ b/sys/dev/i2c/adm1030var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: adm1030var.h,v 1.1 2005/08/10 14:18:28 macallan Exp $ */
+/* $NetBSD: adm1030var.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (C) 2005 Michael Lorenz.
@@ -35,7 +35,7 @@
#define ADM1030VAR_H
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adm1030var.h,v 1.1 2005/08/10 14:18:28 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adm1030var.h,v 1.2 2005/12/11 12:21:22 christos Exp $");
#include <dev/i2c/i2cvar.h>
diff --git a/sys/dev/i2c/adt7467.c b/sys/dev/i2c/adt7467.c
index 15f70bf36c1..3157808170e 100644
--- a/sys/dev/i2c/adt7467.c
+++ b/sys/dev/i2c/adt7467.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adt7467.c,v 1.2 2005/09/11 20:26:15 macallan Exp $ */
+/* $NetBSD: adt7467.c,v 1.3 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (C) 2005 Michael Lorenz
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adt7467.c,v 1.2 2005/09/11 20:26:15 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adt7467.c,v 1.3 2005/12/11 12:21:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/i2c/adt7467var.h b/sys/dev/i2c/adt7467var.h
index 89985a0096a..da3ad6187a3 100644
--- a/sys/dev/i2c/adt7467var.h
+++ b/sys/dev/i2c/adt7467var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: adt7467var.h,v 1.1 2005/08/10 14:18:28 macallan Exp $ */
+/* $NetBSD: adt7467var.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
/*-
* Copyright (C) 2005 Michael Lorenz
@@ -35,7 +35,7 @@
#define ADT7456VAR_H
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adt7467var.h,v 1.1 2005/08/10 14:18:28 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adt7467var.h,v 1.2 2005/12/11 12:21:22 christos Exp $");
#include <dev/i2c/i2cvar.h>
diff --git a/sys/dev/i2c/at24cxx.c b/sys/dev/i2c/at24cxx.c
index 4a987ef3fac..9319052482c 100644
--- a/sys/dev/i2c/at24cxx.c
+++ b/sys/dev/i2c/at24cxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: at24cxx.c,v 1.2 2004/03/11 15:11:53 christos Exp $ */
+/* $NetBSD: at24cxx.c,v 1.3 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/at24cxxvar.h b/sys/dev/i2c/at24cxxvar.h
index 2c6fb71aace..c97f9fcd2df 100644
--- a/sys/dev/i2c/at24cxxvar.h
+++ b/sys/dev/i2c/at24cxxvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: at24cxxvar.h,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
+/* $NetBSD: at24cxxvar.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/ds1307.c b/sys/dev/i2c/ds1307.c
index c96f84244b6..97d876beeb0 100644
--- a/sys/dev/i2c/ds1307.c
+++ b/sys/dev/i2c/ds1307.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1307.c,v 1.2 2005/06/04 20:14:25 he Exp $ */
+/* $NetBSD: ds1307.c,v 1.3 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/ds1307reg.h b/sys/dev/i2c/ds1307reg.h
index d5844bd3edb..f5ed7884cdc 100644
--- a/sys/dev/i2c/ds1307reg.h
+++ b/sys/dev/i2c/ds1307reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1307reg.h,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
+/* $NetBSD: ds1307reg.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/files.i2c b/sys/dev/i2c/files.i2c
index 948ed91e87a..f29d1946403 100644
--- a/sys/dev/i2c/files.i2c
+++ b/sys/dev/i2c/files.i2c
@@ -1,4 +1,4 @@
-# $NetBSD: files.i2c,v 1.5 2005/08/16 11:09:12 nonaka Exp $
+# $NetBSD: files.i2c,v 1.6 2005/12/11 12:21:22 christos Exp $
define i2cbus { }
define i2cexec
diff --git a/sys/dev/i2c/i2c.c b/sys/dev/i2c/i2c.c
index 6a24d583e11..0f018cfaca0 100644
--- a/sys/dev/i2c/i2c.c
+++ b/sys/dev/i2c/i2c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c.c,v 1.4 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: i2c.c,v 1.5 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/i2c_bitbang.c b/sys/dev/i2c/i2c_bitbang.c
index 804f6c8f38d..278dd633920 100644
--- a/sys/dev/i2c/i2c_bitbang.c
+++ b/sys/dev/i2c/i2c_bitbang.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c_bitbang.c,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
+/* $NetBSD: i2c_bitbang.c,v 1.2 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/i2c_bitbang.h b/sys/dev/i2c/i2c_bitbang.h
index b865ee8e4f1..f9d9043b784 100644
--- a/sys/dev/i2c/i2c_bitbang.h
+++ b/sys/dev/i2c/i2c_bitbang.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c_bitbang.h,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
+/* $NetBSD: i2c_bitbang.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/i2c_exec.c b/sys/dev/i2c/i2c_exec.c
index 6b2483b07b4..590f9732895 100644
--- a/sys/dev/i2c/i2c_exec.c
+++ b/sys/dev/i2c/i2c_exec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c_exec.c,v 1.3 2003/10/29 00:34:58 mycroft Exp $ */
+/* $NetBSD: i2c_exec.c,v 1.4 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/i2c_io.h b/sys/dev/i2c/i2c_io.h
index c8333c052fa..02e9c359c88 100644
--- a/sys/dev/i2c/i2c_io.h
+++ b/sys/dev/i2c/i2c_io.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c_io.h,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
+/* $NetBSD: i2c_io.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/i2cvar.h b/sys/dev/i2c/i2cvar.h
index 92d69ec42a5..7702de2a89b 100644
--- a/sys/dev/i2c/i2cvar.h
+++ b/sys/dev/i2c/i2cvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i2cvar.h,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
+/* $NetBSD: i2cvar.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/lm75.c b/sys/dev/i2c/lm75.c
index 345a64dd587..560e2f3a705 100644
--- a/sys/dev/i2c/lm75.c
+++ b/sys/dev/i2c/lm75.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lm75.c,v 1.2 2004/08/03 13:40:20 scw Exp $ */
+/* $NetBSD: lm75.c,v 1.3 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/lm75reg.h b/sys/dev/i2c/lm75reg.h
index b34005df293..75de5fdc110 100644
--- a/sys/dev/i2c/lm75reg.h
+++ b/sys/dev/i2c/lm75reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lm75reg.h,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
+/* $NetBSD: lm75reg.h,v 1.2 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/m41st84.c b/sys/dev/i2c/m41st84.c
index 86954e27941..d65e6b4f2d6 100644
--- a/sys/dev/i2c/m41st84.c
+++ b/sys/dev/i2c/m41st84.c
@@ -1,4 +1,4 @@
-/* $NetBSD: m41st84.c,v 1.4 2005/06/04 20:14:25 he Exp $ */
+/* $NetBSD: m41st84.c,v 1.5 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/m41st84reg.h b/sys/dev/i2c/m41st84reg.h
index 68af963af12..2050c461d11 100644
--- a/sys/dev/i2c/m41st84reg.h
+++ b/sys/dev/i2c/m41st84reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: m41st84reg.h,v 1.2 2004/01/20 19:12:54 briggs Exp $ */
+/* $NetBSD: m41st84reg.h,v 1.3 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/m41t00.c b/sys/dev/i2c/m41t00.c
index 96df2c591bd..552de07f2d9 100644
--- a/sys/dev/i2c/m41t00.c
+++ b/sys/dev/i2c/m41t00.c
@@ -1,4 +1,4 @@
-/* $NetBSD: m41t00.c,v 1.4 2005/06/04 20:14:25 he Exp $ */
+/* $NetBSD: m41t00.c,v 1.5 2005/12/11 12:21:22 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -121,7 +121,7 @@ m41t00_attach(struct device *parent, struct device *self, void *aux)
/*ARGSUSED*/
int
-m41t00_open(dev_t dev, int flag, int fmt, struct proc *p)
+m41t00_open(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct m41t00_softc *sc;
@@ -139,7 +139,7 @@ m41t00_open(dev_t dev, int flag, int fmt, struct proc *p)
/*ARGSUSED*/
int
-m41t00_close(dev_t dev, int flag, int fmt, struct proc *p)
+m41t00_close(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct m41t00_softc *sc;
diff --git a/sys/dev/i2c/m41t00reg.h b/sys/dev/i2c/m41t00reg.h
index a4178c64bbb..12f3a58a1c9 100644
--- a/sys/dev/i2c/m41t00reg.h
+++ b/sys/dev/i2c/m41t00reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: m41t00reg.h,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
+/* $NetBSD: m41t00reg.h,v 1.2 2005/12/11 12:21:23 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/max6900.c b/sys/dev/i2c/max6900.c
index 82865e16e97..561020a6e76 100644
--- a/sys/dev/i2c/max6900.c
+++ b/sys/dev/i2c/max6900.c
@@ -1,4 +1,4 @@
-/* $NetBSD: max6900.c,v 1.2 2005/06/04 20:14:25 he Exp $ */
+/* $NetBSD: max6900.c,v 1.3 2005/12/11 12:21:23 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/max6900reg.h b/sys/dev/i2c/max6900reg.h
index 54186e2644c..d4105748a1b 100644
--- a/sys/dev/i2c/max6900reg.h
+++ b/sys/dev/i2c/max6900reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: max6900reg.h,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
+/* $NetBSD: max6900reg.h,v 1.2 2005/12/11 12:21:23 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/pcf8583.c b/sys/dev/i2c/pcf8583.c
index ae83a664577..07dc43ff972 100644
--- a/sys/dev/i2c/pcf8583.c
+++ b/sys/dev/i2c/pcf8583.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8583.c,v 1.2 2005/06/04 20:14:25 he Exp $ */
+/* $NetBSD: pcf8583.c,v 1.3 2005/12/11 12:21:23 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -159,7 +159,7 @@ pcfrtc_attach(struct device *parent, struct device *self, void *aux)
/*ARGSUSED*/
int
-pcfrtc_open(dev_t dev, int flag, int fmt, struct proc *p)
+pcfrtc_open(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct pcfrtc_softc *sc;
@@ -177,7 +177,7 @@ pcfrtc_open(dev_t dev, int flag, int fmt, struct proc *p)
/*ARGSUSED*/
int
-pcfrtc_close(dev_t dev, int flag, int fmt, struct proc *p)
+pcfrtc_close(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct pcfrtc_softc *sc;
diff --git a/sys/dev/i2c/pcf8583reg.h b/sys/dev/i2c/pcf8583reg.h
index a93a4f58b23..fc6625c5ba9 100644
--- a/sys/dev/i2c/pcf8583reg.h
+++ b/sys/dev/i2c/pcf8583reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8583reg.h,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
+/* $NetBSD: pcf8583reg.h,v 1.2 2005/12/11 12:21:23 christos Exp $ */
/*
* Ben Harris, 2000
diff --git a/sys/dev/i2c/pcf8583var.h b/sys/dev/i2c/pcf8583var.h
index a2db09bc550..e6ef8ea56d3 100644
--- a/sys/dev/i2c/pcf8583var.h
+++ b/sys/dev/i2c/pcf8583var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8583var.h,v 1.1 2003/09/30 00:35:31 thorpej Exp $ */
+/* $NetBSD: pcf8583var.h,v 1.2 2005/12/11 12:21:23 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/i2c/rs5c372.c b/sys/dev/i2c/rs5c372.c
index b0de495d4b7..eb29793b9a0 100644
--- a/sys/dev/i2c/rs5c372.c
+++ b/sys/dev/i2c/rs5c372.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rs5c372.c,v 1.3 2005/10/22 15:12:28 nonaka Exp $ */
+/* $NetBSD: rs5c372.c,v 1.4 2005/12/11 12:21:23 christos Exp $ */
/*
* Copyright (c) 2005 Kimihiro Nonaka
diff --git a/sys/dev/i2c/rs5c372reg.h b/sys/dev/i2c/rs5c372reg.h
index 8bb8247ddbc..56af70c7ada 100644
--- a/sys/dev/i2c/rs5c372reg.h
+++ b/sys/dev/i2c/rs5c372reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rs5c372reg.h,v 1.1 2005/08/16 11:09:12 nonaka Exp $ */
+/* $NetBSD: rs5c372reg.h,v 1.2 2005/12/11 12:21:23 christos Exp $ */
/*
* Copyright (c) 2005 Kimihiro Nonaka
diff --git a/sys/dev/i2c/x1226.c b/sys/dev/i2c/x1226.c
index 5a80130a994..56a243896f7 100644
--- a/sys/dev/i2c/x1226.c
+++ b/sys/dev/i2c/x1226.c
@@ -1,4 +1,4 @@
-/* $NetBSD: x1226.c,v 1.6 2005/06/04 20:14:25 he Exp $ */
+/* $NetBSD: x1226.c,v 1.7 2005/12/11 12:21:23 christos Exp $ */
/*
* Copyright (c) 2003 Shigeyuki Fukushima.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x1226.c,v 1.6 2005/06/04 20:14:25 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x1226.c,v 1.7 2005/12/11 12:21:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +128,7 @@ xrtc_attach(struct device *parent, struct device *self, void *arg)
/*ARGSUSED*/
int
-xrtc_open(dev_t dev, int flag, int fmt, struct proc *p)
+xrtc_open(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct xrtc_softc *sc;
@@ -146,7 +146,7 @@ xrtc_open(dev_t dev, int flag, int fmt, struct proc *p)
/*ARGSUSED*/
int
-xrtc_close(dev_t dev, int flag, int fmt, struct proc *p)
+xrtc_close(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct xrtc_softc *sc;
diff --git a/sys/dev/i2c/x1226reg.h b/sys/dev/i2c/x1226reg.h
index df46ebaa925..aa99bcf3389 100644
--- a/sys/dev/i2c/x1226reg.h
+++ b/sys/dev/i2c/x1226reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: x1226reg.h,v 1.2 2004/02/04 12:03:07 shige Exp $ */
+/* $NetBSD: x1226reg.h,v 1.3 2005/12/11 12:21:23 christos Exp $ */
/*
* Copyright (c) 2003 Shigeyuki Fukushima.
diff --git a/sys/dev/i2o/dpti.c b/sys/dev/i2o/dpti.c
index bf5cfccd8a0..bd7d72305a3 100644
--- a/sys/dev/i2o/dpti.c
+++ b/sys/dev/i2o/dpti.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpti.c,v 1.20 2005/11/24 13:34:55 fredb Exp $ */
+/* $NetBSD: dpti.c,v 1.21 2005/12/11 12:21:23 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.20 2005/11/24 13:34:55 fredb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpti.c,v 1.21 2005/12/11 12:21:23 christos Exp $");
#include "opt_i2o.h"
@@ -206,7 +206,7 @@ dpti_attach(struct device *parent, struct device *self, void *aux)
}
int
-dptiopen(dev_t dev, int flag, int mode, struct proc *p)
+dptiopen(dev_t dev, int flag, int mode, struct lwp *l)
{
if (securelevel > 1)
@@ -218,7 +218,7 @@ dptiopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-dptiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+dptiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct iop_softc *iop;
struct dpti_softc *sc;
@@ -281,9 +281,9 @@ dptiioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
tsleep(&sc->sc_nactive, PRIBIO, "dptislp", 0);
if (linux)
- rv = dpti_passthrough(sc, data, p);
+ rv = dpti_passthrough(sc, data, l->l_proc);
else
- rv = dpti_passthrough(sc, *(caddr_t *)data, p);
+ rv = dpti_passthrough(sc, *(caddr_t *)data, l->l_proc);
sc->sc_nactive--;
wakeup_one(&sc->sc_nactive);
diff --git a/sys/dev/i2o/dptivar.h b/sys/dev/i2o/dptivar.h
index 182b1c9eb85..c5e5ae64648 100644
--- a/sys/dev/i2o/dptivar.h
+++ b/sys/dev/i2o/dptivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dptivar.h,v 1.4 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: dptivar.h,v 1.5 2005/12/11 12:21:23 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/i2o/i2o.h b/sys/dev/i2o/i2o.h
index 76c5e22e101..f4638901990 100644
--- a/sys/dev/i2o/i2o.h
+++ b/sys/dev/i2o/i2o.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i2o.h,v 1.12 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: i2o.h,v 1.13 2005/12/11 12:21:23 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/i2o/i2odpt.h b/sys/dev/i2o/i2odpt.h
index 088b18b8390..6b979b1ded5 100644
--- a/sys/dev/i2o/i2odpt.h
+++ b/sys/dev/i2o/i2odpt.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i2odpt.h,v 1.2 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: i2odpt.h,v 1.3 2005/12/11 12:21:23 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/i2o/iop.c b/sys/dev/i2o/iop.c
index cfe0c213b9c..9ccf8d93eb1 100644
--- a/sys/dev/i2o/iop.c
+++ b/sys/dev/i2o/iop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iop.c,v 1.50 2005/08/25 22:33:18 drochner Exp $ */
+/* $NetBSD: iop.c,v 1.51 2005/12/11 12:21:23 christos Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.50 2005/08/25 22:33:18 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.51 2005/12/11 12:21:23 christos Exp $");
#include "opt_i2o.h"
#include "iop.h"
@@ -2481,7 +2481,7 @@ int iop_util_eventreg(struct iop_softc *sc, struct iop_initiator *ii, int mask)
}
int
-iopopen(dev_t dev, int flag, int mode, struct proc *p)
+iopopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct iop_softc *sc;
@@ -2497,7 +2497,7 @@ iopopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-iopclose(dev_t dev, int flag, int mode, struct proc *p)
+iopclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct iop_softc *sc;
@@ -2508,7 +2508,7 @@ iopclose(dev_t dev, int flag, int mode, struct proc *p)
}
int
-iopioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+iopioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct iop_softc *sc;
struct iovec *iov;
@@ -2521,7 +2521,7 @@ iopioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
switch (cmd) {
case IOPIOCPT:
- return (iop_passthrough(sc, (struct ioppt *)data, p));
+ return (iop_passthrough(sc, (struct ioppt *)data, l->l_proc));
case IOPIOCGSTATUS:
iov = (struct iovec *)data;
diff --git a/sys/dev/i2o/iopl.c b/sys/dev/i2o/iopl.c
index 12747030a4c..95b2c4f7cc5 100644
--- a/sys/dev/i2o/iopl.c
+++ b/sys/dev/i2o/iopl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iopl.c,v 1.18 2005/05/02 15:34:31 yamt Exp $ */
+/* $NetBSD: iopl.c,v 1.19 2005/12/11 12:21:23 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iopl.c,v 1.18 2005/05/02 15:34:31 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopl.c,v 1.19 2005/12/11 12:21:23 christos Exp $");
#include "opt_i2o.h"
#include "opt_inet.h"
diff --git a/sys/dev/i2o/ioplvar.h b/sys/dev/i2o/ioplvar.h
index 9e12ea94e73..0362e5e56d0 100644
--- a/sys/dev/i2o/ioplvar.h
+++ b/sys/dev/i2o/ioplvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ioplvar.h,v 1.4 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: ioplvar.h,v 1.5 2005/12/11 12:21:23 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/i2o/iopsp.c b/sys/dev/i2o/iopsp.c
index 796d96e69eb..f9712c146a1 100644
--- a/sys/dev/i2o/iopsp.c
+++ b/sys/dev/i2o/iopsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iopsp.c,v 1.19 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: iopsp.c,v 1.20 2005/12/11 12:21:23 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.19 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iopsp.c,v 1.20 2005/12/11 12:21:23 christos Exp $");
#include "opt_i2o.h"
diff --git a/sys/dev/i2o/iopvar.h b/sys/dev/i2o/iopvar.h
index 977857bfc59..1b3b2f6e2df 100644
--- a/sys/dev/i2o/iopvar.h
+++ b/sys/dev/i2o/iopvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iopvar.h,v 1.15 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: iopvar.h,v 1.16 2005/12/11 12:21:23 christos Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/i2o/ld_iop.c b/sys/dev/i2o/ld_iop.c
index 8df902390c2..757390a021f 100644
--- a/sys/dev/i2o/ld_iop.c
+++ b/sys/dev/i2o/ld_iop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_iop.c,v 1.17 2005/05/30 04:37:57 christos Exp $ */
+/* $NetBSD: ld_iop.c,v 1.18 2005/12/11 12:21:23 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.17 2005/05/30 04:37:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_iop.c,v 1.18 2005/12/11 12:21:23 christos Exp $");
#include "opt_i2o.h"
#include "rnd.h"
diff --git a/sys/dev/ic/Makefile b/sys/dev/ic/Makefile
index 47a6f8629dc..e853501e60f 100644
--- a/sys/dev/ic/Makefile
+++ b/sys/dev/ic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/01/11 00:57:56 joff Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/11 12:21:25 christos Exp $
INCSDIR= /usr/include/dev/ic
diff --git a/sys/dev/ic/aac_tables.h b/sys/dev/ic/aac_tables.h
index 592b6433103..92ff59b6d92 100644
--- a/sys/dev/ic/aac_tables.h
+++ b/sys/dev/ic/aac_tables.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aac_tables.h,v 1.3 2005/02/15 04:49:31 briggs Exp $ */
+/* $NetBSD: aac_tables.h,v 1.4 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
diff --git a/sys/dev/ic/aacreg.h b/sys/dev/ic/aacreg.h
index 02bf53c3c74..a3071df355d 100644
--- a/sys/dev/ic/aacreg.h
+++ b/sys/dev/ic/aacreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aacreg.h,v 1.4 2005/03/01 03:31:45 briggs Exp $ */
+/* $NetBSD: aacreg.h,v 1.5 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/aacvar.h b/sys/dev/ic/aacvar.h
index a3fedf000dd..bf3cd8922e9 100644
--- a/sys/dev/ic/aacvar.h
+++ b/sys/dev/ic/aacvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aacvar.h,v 1.7 2005/05/30 04:43:46 christos Exp $ */
+/* $NetBSD: aacvar.h,v 1.8 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/ac97.c b/sys/dev/ic/ac97.c
index 13581610a4f..88fb14f628f 100644
--- a/sys/dev/ic/ac97.c
+++ b/sys/dev/ic/ac97.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ac97.c,v 1.78 2005/11/06 10:08:24 rpaulo Exp $ */
+/* $NetBSD: ac97.c,v 1.79 2005/12/11 12:21:25 christos Exp $ */
/* $OpenBSD: ac97.c,v 1.8 2000/07/19 09:01:35 csapuntz Exp $ */
/*
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ac97.c,v 1.78 2005/11/06 10:08:24 rpaulo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ac97.c,v 1.79 2005/12/11 12:21:25 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/ac97reg.h b/sys/dev/ic/ac97reg.h
index 4678a904505..8c8a8ed7ffc 100644
--- a/sys/dev/ic/ac97reg.h
+++ b/sys/dev/ic/ac97reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ac97reg.h,v 1.12 2005/04/08 15:27:19 jmcneill Exp $ */
+/* $NetBSD: ac97reg.h,v 1.13 2005/12/11 12:21:25 christos Exp $ */
/*
* Copyright (c) 1999 Constantine Sapuntzakis
diff --git a/sys/dev/ic/ac97var.h b/sys/dev/ic/ac97var.h
index 7ea853610b8..8ca83e55fab 100644
--- a/sys/dev/ic/ac97var.h
+++ b/sys/dev/ic/ac97var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ac97var.h,v 1.16 2005/04/11 18:26:48 jmcneill Exp $ */
+/* $NetBSD: ac97var.h,v 1.17 2005/12/11 12:21:25 christos Exp $ */
/* $OpenBSD: ac97.h,v 1.4 2000/07/19 09:01:35 csapuntz Exp $ */
/*
diff --git a/sys/dev/ic/ad1848.c b/sys/dev/ic/ad1848.c
index 86c0953e124..97ae612f1eb 100644
--- a/sys/dev/ic/ad1848.c
+++ b/sys/dev/ic/ad1848.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848.c,v 1.20 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: ad1848.c,v 1.21 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.20 2005/01/15 15:19:52 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ad1848.c,v 1.21 2005/12/11 12:21:25 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/ad1848var.h b/sys/dev/ic/ad1848var.h
index f616dd3042b..7e13a76370b 100644
--- a/sys/dev/ic/ad1848var.h
+++ b/sys/dev/ic/ad1848var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848var.h,v 1.13 2005/05/29 22:10:28 christos Exp $ */
+/* $NetBSD: ad1848var.h,v 1.14 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/adv.c b/sys/dev/ic/adv.c
index 3300b000352..6338908a45a 100644
--- a/sys/dev/ic/adv.c
+++ b/sys/dev/ic/adv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv.c,v 1.36 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: adv.c,v 1.37 2005/12/11 12:21:25 christos Exp $ */
/*
* Generic driver for the Advanced Systems Inc. Narrow SCSI controllers
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.36 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv.c,v 1.37 2005/12/11 12:21:25 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/adv.h b/sys/dev/ic/adv.h
index 0e1a9641698..d85a8e3a581 100644
--- a/sys/dev/ic/adv.h
+++ b/sys/dev/ic/adv.h
@@ -1,4 +1,4 @@
-/* $NetBSD: adv.h,v 1.12 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: adv.h,v 1.13 2005/12/11 12:21:25 christos Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
diff --git a/sys/dev/ic/advlib.c b/sys/dev/ic/advlib.c
index d0af03ddf79..31c2b2b82c5 100644
--- a/sys/dev/ic/advlib.c
+++ b/sys/dev/ic/advlib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: advlib.c,v 1.22 2005/05/31 00:46:05 christos Exp $ */
+/* $NetBSD: advlib.c,v 1.23 2005/12/11 12:21:25 christos Exp $ */
/*
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.22 2005/05/31 00:46:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advlib.c,v 1.23 2005/12/11 12:21:25 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/advlib.h b/sys/dev/ic/advlib.h
index c8d4a27db97..1d5938e158f 100644
--- a/sys/dev/ic/advlib.h
+++ b/sys/dev/ic/advlib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: advlib.h,v 1.16 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: advlib.h,v 1.17 2005/12/11 12:21:25 christos Exp $ */
/*
* Definitions for low level routines and data structures
diff --git a/sys/dev/ic/advmcode.c b/sys/dev/ic/advmcode.c
index 6de885ab972..1608c06fd3e 100644
--- a/sys/dev/ic/advmcode.c
+++ b/sys/dev/ic/advmcode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: advmcode.c,v 1.8 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: advmcode.c,v 1.9 2005/12/11 12:21:25 christos Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
@@ -55,7 +55,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advmcode.c,v 1.8 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advmcode.c,v 1.9 2005/12/11 12:21:25 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/ic/advmcode.h b/sys/dev/ic/advmcode.h
index 2d31cd4882e..bab6771db35 100644
--- a/sys/dev/ic/advmcode.h
+++ b/sys/dev/ic/advmcode.h
@@ -1,4 +1,4 @@
-/* $NetBSD: advmcode.h,v 1.5 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: advmcode.h,v 1.6 2005/12/11 12:21:25 christos Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c
index ecf3e162192..f7b996a7978 100644
--- a/sys/dev/ic/adw.c
+++ b/sys/dev/ic/adw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adw.c,v 1.45 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: adw.c,v 1.46 2005/12/11 12:21:25 christos Exp $ */
/*
* Generic driver for the Advanced Systems Inc. SCSI controllers
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.45 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adw.c,v 1.46 2005/12/11 12:21:25 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/adw.h b/sys/dev/ic/adw.h
index 6e1ce6eeb0f..c4fd6a0aa55 100644
--- a/sys/dev/ic/adw.h
+++ b/sys/dev/ic/adw.h
@@ -1,4 +1,4 @@
-/* $NetBSD: adw.h,v 1.13 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: adw.h,v 1.14 2005/12/11 12:21:25 christos Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c
index a8419432402..abaedcca0f0 100644
--- a/sys/dev/ic/adwlib.c
+++ b/sys/dev/ic/adwlib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adwlib.c,v 1.34 2005/05/30 04:43:46 christos Exp $ */
+/* $NetBSD: adwlib.c,v 1.35 2005/12/11 12:21:25 christos Exp $ */
/*
* Low level routines for the Advanced Systems Inc. SCSI controllers chips
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.34 2005/05/30 04:43:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adwlib.c,v 1.35 2005/12/11 12:21:25 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/adwlib.h b/sys/dev/ic/adwlib.h
index 463b1782097..80e8943384d 100644
--- a/sys/dev/ic/adwlib.h
+++ b/sys/dev/ic/adwlib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: adwlib.h,v 1.18 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: adwlib.h,v 1.19 2005/12/11 12:21:25 christos Exp $ */
/*
* Definitions for low level routines and data structures
diff --git a/sys/dev/ic/adwmcode.c b/sys/dev/ic/adwmcode.c
index 32605bc5943..ad8d833a89d 100644
--- a/sys/dev/ic/adwmcode.c
+++ b/sys/dev/ic/adwmcode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adwmcode.c,v 1.13 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: adwmcode.c,v 1.14 2005/12/11 12:21:25 christos Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adwmcode.c,v 1.13 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adwmcode.c,v 1.14 2005/12/11 12:21:25 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/adwmcode.h b/sys/dev/ic/adwmcode.h
index 54a72715709..1904d71f207 100644
--- a/sys/dev/ic/adwmcode.h
+++ b/sys/dev/ic/adwmcode.h
@@ -1,4 +1,4 @@
-/* $NetBSD: adwmcode.h,v 1.10 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: adwmcode.h,v 1.11 2005/12/11 12:21:25 christos Exp $ */
/*
* Generic driver definitions and exported functions for the Advanced
diff --git a/sys/dev/ic/aha.c b/sys/dev/ic/aha.c
index 57b49285fe2..72a4a341285 100644
--- a/sys/dev/ic/aha.c
+++ b/sys/dev/ic/aha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha.c,v 1.47 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: aha.c,v 1.48 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.47 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.48 2005/12/11 12:21:25 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/ic/ahareg.h b/sys/dev/ic/ahareg.h
index e16a00a35dc..dfc85424127 100644
--- a/sys/dev/ic/ahareg.h
+++ b/sys/dev/ic/ahareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ahareg.h,v 1.11 2005/02/21 00:29:07 thorpej Exp $ */
+/* $NetBSD: ahareg.h,v 1.12 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1997-99 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/ahavar.h b/sys/dev/ic/ahavar.h
index 2efd782241d..771af97fa0b 100644
--- a/sys/dev/ic/ahavar.h
+++ b/sys/dev/ic/ahavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ahavar.h,v 1.12 2004/08/24 00:53:29 thorpej Exp $ */
+/* $NetBSD: ahavar.h,v 1.13 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index c7b7d8138f7..61e23ef7434 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6360.c,v 1.84 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: aic6360.c,v 1.85 2005/12/11 12:21:25 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic6360.c,v 1.84 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6360.c,v 1.85 2005/12/11 12:21:25 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/ic/aic6360reg.h b/sys/dev/ic/aic6360reg.h
index c392cf1c0fb..49893920601 100644
--- a/sys/dev/ic/aic6360reg.h
+++ b/sys/dev/ic/aic6360reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6360reg.h,v 1.2 2003/11/17 11:16:10 wiz Exp $ */
+/* $NetBSD: aic6360reg.h,v 1.3 2005/12/11 12:21:25 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
diff --git a/sys/dev/ic/aic6360var.h b/sys/dev/ic/aic6360var.h
index 098f19c177a..b9933e70dc8 100644
--- a/sys/dev/ic/aic6360var.h
+++ b/sys/dev/ic/aic6360var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6360var.h,v 1.11 2004/12/07 22:23:45 thorpej Exp $ */
+/* $NetBSD: aic6360var.h,v 1.12 2005/12/11 12:21:25 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
diff --git a/sys/dev/ic/aic6915.c b/sys/dev/ic/aic6915.c
index f669dc32c5d..8ed38a438b4 100644
--- a/sys/dev/ic/aic6915.c
+++ b/sys/dev/ic/aic6915.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6915.c,v 1.13 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: aic6915.c,v 1.14 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.13 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.14 2005/12/11 12:21:25 christos Exp $");
#include "bpfilter.h"
diff --git a/sys/dev/ic/aic6915reg.h b/sys/dev/ic/aic6915reg.h
index ed60edaffa6..22b9eddd20a 100644
--- a/sys/dev/ic/aic6915reg.h
+++ b/sys/dev/ic/aic6915reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6915reg.h,v 1.3 2005/07/07 19:02:11 thorpej Exp $ */
+/* $NetBSD: aic6915reg.h,v 1.4 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/aic77xx.c b/sys/dev/ic/aic77xx.c
index f7a94afbb56..5ca5b93bc3b 100644
--- a/sys/dev/ic/aic77xx.c
+++ b/sys/dev/ic/aic77xx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic77xx.c,v 1.5 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: aic77xx.c,v 1.6 2005/12/11 12:21:25 christos Exp $ */
/*
* Common routines for AHA-27/284X and aic7770 motherboard SCSI controllers.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic77xx.c,v 1.5 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic77xx.c,v 1.6 2005/12/11 12:21:25 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/aic77xxvar.h b/sys/dev/ic/aic77xxvar.h
index f06581d2f06..39ee5a0762b 100644
--- a/sys/dev/ic/aic77xxvar.h
+++ b/sys/dev/ic/aic77xxvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic77xxvar.h,v 1.2 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: aic77xxvar.h,v 1.3 2005/12/11 12:21:25 christos Exp $ */
/*
* Common routines for AHA-27/284X and aic7770 motherboard SCSI controllers.
diff --git a/sys/dev/ic/aic79xx_inline.h b/sys/dev/ic/aic79xx_inline.h
index 36ee8470768..88aa789a538 100644
--- a/sys/dev/ic/aic79xx_inline.h
+++ b/sys/dev/ic/aic79xx_inline.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_inline.h,v 1.10 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: aic79xx_inline.h,v 1.11 2005/12/11 12:21:25 christos Exp $ */
/*
* Inline routines shareable across OS platforms.
diff --git a/sys/dev/ic/aic79xx_osm.h b/sys/dev/ic/aic79xx_osm.h
index 372752ca1e7..e135bdcfd7f 100644
--- a/sys/dev/ic/aic79xx_osm.h
+++ b/sys/dev/ic/aic79xx_osm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx_osm.h,v 1.7 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: aic79xx_osm.h,v 1.8 2005/12/11 12:21:25 christos Exp $ */
/*
* NetBSD platform specific driver option settings, data structures,
@@ -32,9 +32,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $NetBSD: aic79xx_osm.h,v 1.7 2005/02/27 00:27:00 perry Exp $
+ * $NetBSD: aic79xx_osm.h,v 1.8 2005/12/11 12:21:25 christos Exp $
*
- * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.7 2005/02/27 00:27:00 perry Exp $
+ * //depot/aic7xxx/freebsd/dev/aic7xxx/aic79xx_osm.h#19 $$NetBSD: aic79xx_osm.h,v 1.8 2005/12/11 12:21:25 christos Exp $
*
* $FreeBSD: src/sys/dev/aic7xxx/aic79xx_osm.h,v 1.9 2003/05/26 21:43:29 gibbs Exp $
*/
diff --git a/sys/dev/ic/aic7xxx_osm.h b/sys/dev/ic/aic7xxx_osm.h
index d416fb3504b..859824cadaf 100644
--- a/sys/dev/ic/aic7xxx_osm.h
+++ b/sys/dev/ic/aic7xxx_osm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx_osm.h,v 1.9 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: aic7xxx_osm.h,v 1.10 2005/12/11 12:21:25 christos Exp $ */
/*
* NetBSD platform specific driver option settings, data structures,
diff --git a/sys/dev/ic/aic7xxx_seeprom.c b/sys/dev/ic/aic7xxx_seeprom.c
index 336a4de87ca..1661a1b06e7 100644
--- a/sys/dev/ic/aic7xxx_seeprom.c
+++ b/sys/dev/ic/aic7xxx_seeprom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx_seeprom.c,v 1.10 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: aic7xxx_seeprom.c,v 1.11 2005/12/11 12:21:25 christos Exp $ */
/*
* Product specific probe and attach routines for:
@@ -46,13 +46,13 @@
* from the FreeBSD source file aic7xxx_pci.c by Frank van der Linden
* <fvdl@NetBSD.org>
*
- * $Id: aic7xxx_seeprom.c,v 1.10 2005/02/27 00:27:00 perry Exp $
+ * $Id: aic7xxx_seeprom.c,v 1.11 2005/12/11 12:21:25 christos Exp $
*
* $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_pci.c,v 1.22 2003/01/20 20:44:55 gibbs Exp $
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic7xxx_seeprom.c,v 1.10 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic7xxx_seeprom.c,v 1.11 2005/12/11 12:21:25 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/al2210reg.h b/sys/dev/ic/al2210reg.h
index 37471abadd8..96e19d08c29 100644
--- a/sys/dev/ic/al2210reg.h
+++ b/sys/dev/ic/al2210reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: al2210reg.h,v 1.2 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: al2210reg.h,v 1.3 2005/12/11 12:21:25 christos Exp $ */
/*
* Copyright (c) 2004 David Young. All rights reserved.
diff --git a/sys/dev/ic/am7930.c b/sys/dev/ic/am7930.c
index 58a54127f88..246970c5677 100644
--- a/sys/dev/ic/am7930.c
+++ b/sys/dev/ic/am7930.c
@@ -1,4 +1,4 @@
-/* $NetBSD: am7930.c,v 1.48 2005/05/22 15:54:46 christos Exp $ */
+/* $NetBSD: am7930.c,v 1.49 2005/12/11 12:21:25 christos Exp $ */
/*
* Copyright (c) 1995 Rolf Grossmann
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am7930.c,v 1.48 2005/05/22 15:54:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am7930.c,v 1.49 2005/12/11 12:21:25 christos Exp $");
#include "audio.h"
#if NAUDIO > 0
diff --git a/sys/dev/ic/am7930reg.h b/sys/dev/ic/am7930reg.h
index 2275afd72ba..ae293f5498a 100644
--- a/sys/dev/ic/am7930reg.h
+++ b/sys/dev/ic/am7930reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: am7930reg.h,v 1.6 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: am7930reg.h,v 1.7 2005/12/11 12:21:25 christos Exp $ */
/*
* Am79C30A direct registers
diff --git a/sys/dev/ic/am7930var.h b/sys/dev/ic/am7930var.h
index c8160cc93f6..cb5f5efea64 100644
--- a/sys/dev/ic/am7930var.h
+++ b/sys/dev/ic/am7930var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: am7930var.h,v 1.10 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: am7930var.h,v 1.11 2005/12/11 12:21:25 christos Exp $ */
struct am7930_softc;
diff --git a/sys/dev/ic/am7990.c b/sys/dev/ic/am7990.c
index e6ed799dadb..2d8afe839d1 100644
--- a/sys/dev/ic/am7990.c
+++ b/sys/dev/ic/am7990.c
@@ -1,4 +1,4 @@
-/* $NetBSD: am7990.c,v 1.67 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: am7990.c,v 1.68 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.67 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am7990.c,v 1.68 2005/12/11 12:21:25 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
diff --git a/sys/dev/ic/am79900.c b/sys/dev/ic/am79900.c
index 6a764601540..73af75c8a16 100644
--- a/sys/dev/ic/am79900.c
+++ b/sys/dev/ic/am79900.c
@@ -1,4 +1,4 @@
-/* $NetBSD: am79900.c,v 1.15 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: am79900.c,v 1.16 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79900.c,v 1.15 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79900.c,v 1.16 2005/12/11 12:21:25 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
diff --git a/sys/dev/ic/am79900reg.h b/sys/dev/ic/am79900reg.h
index 763e627e3fd..7a242c19253 100644
--- a/sys/dev/ic/am79900reg.h
+++ b/sys/dev/ic/am79900reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: am79900reg.h,v 1.7 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: am79900reg.h,v 1.8 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/am79900var.h b/sys/dev/ic/am79900var.h
index 7ab7449edb5..a2ce0f721fe 100644
--- a/sys/dev/ic/am79900var.h
+++ b/sys/dev/ic/am79900var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: am79900var.h,v 1.3 2004/08/24 00:53:29 thorpej Exp $ */
+/* $NetBSD: am79900var.h,v 1.4 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/am7990reg.h b/sys/dev/ic/am7990reg.h
index 212c8c794a6..fa5a97895bb 100644
--- a/sys/dev/ic/am7990reg.h
+++ b/sys/dev/ic/am7990reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: am7990reg.h,v 1.10 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: am7990reg.h,v 1.11 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/am7990var.h b/sys/dev/ic/am7990var.h
index 3884c39cbde..3a70814baa7 100644
--- a/sys/dev/ic/am7990var.h
+++ b/sys/dev/ic/am7990var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: am7990var.h,v 1.22 2004/08/24 00:53:29 thorpej Exp $ */
+/* $NetBSD: am7990var.h,v 1.23 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/am79c930.c b/sys/dev/ic/am79c930.c
index 316f52b60a2..4f0526e195d 100644
--- a/sys/dev/ic/am79c930.c
+++ b/sys/dev/ic/am79c930.c
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c930.c,v 1.13 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: am79c930.c,v 1.14 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include <sys/cdefs.h>
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: am79c930.c,v 1.13 2005/02/27 00:27:00 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79c930.c,v 1.14 2005/12/11 12:21:25 christos Exp $");
#endif
#ifdef __FreeBSD__
__FBSDID("$FreeBSD$");
diff --git a/sys/dev/ic/am79c930reg.h b/sys/dev/ic/am79c930reg.h
index 2816f3efd22..7574b93f07c 100644
--- a/sys/dev/ic/am79c930reg.h
+++ b/sys/dev/ic/am79c930reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c930reg.h,v 1.5 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: am79c930reg.h,v 1.6 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/am79c930var.h b/sys/dev/ic/am79c930var.h
index 3bdf8f7f85e..6281e58d9bc 100644
--- a/sys/dev/ic/am79c930var.h
+++ b/sys/dev/ic/am79c930var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c930var.h,v 1.4 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: am79c930var.h,v 1.5 2005/12/11 12:21:25 christos Exp $ */
/* $FreeBSD$ */
/*-
diff --git a/sys/dev/ic/am9513reg.h b/sys/dev/ic/am9513reg.h
index 06d319b89dd..5eac3b8799f 100644
--- a/sys/dev/ic/am9513reg.h
+++ b/sys/dev/ic/am9513reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: am9513reg.h,v 1.2 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: am9513reg.h,v 1.3 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index 49d2ed077c0..18b1d11738e 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/* $NetBSD: an.c,v 1.37 2005/07/10 19:04:00 dyoung Exp $ */
+/* $NetBSD: an.c,v 1.38 2005/12/11 12:21:25 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.37 2005/07/10 19:04:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: an.c,v 1.38 2005/12/11 12:21:25 christos Exp $");
#include "bpfilter.h"
diff --git a/sys/dev/ic/anreg.h b/sys/dev/ic/anreg.h
index d8a58788a6c..d903f829e38 100644
--- a/sys/dev/ic/anreg.h
+++ b/sys/dev/ic/anreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: anreg.h,v 1.11 2005/01/15 11:01:46 dyoung Exp $ */
+/* $NetBSD: anreg.h,v 1.12 2005/12/11 12:21:25 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
diff --git a/sys/dev/ic/anvar.h b/sys/dev/ic/anvar.h
index 2f5e1e249a7..00f188d0e18 100644
--- a/sys/dev/ic/anvar.h
+++ b/sys/dev/ic/anvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: anvar.h,v 1.11 2005/06/22 06:15:51 dyoung Exp $ */
+/* $NetBSD: anvar.h,v 1.12 2005/12/11 12:21:25 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
diff --git a/sys/dev/ic/apcdmareg.h b/sys/dev/ic/apcdmareg.h
index b001818f0fd..c9eca8b2f77 100644
--- a/sys/dev/ic/apcdmareg.h
+++ b/sys/dev/ic/apcdmareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: apcdmareg.h,v 1.4 2003/09/10 11:37:13 uwe Exp $ */
+/* $NetBSD: apcdmareg.h,v 1.5 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/atppc.c b/sys/dev/ic/atppc.c
index e901016894a..8464b485d32 100644
--- a/sys/dev/ic/atppc.c
+++ b/sys/dev/ic/atppc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc.c,v 1.18 2004/09/13 12:55:47 drochner Exp $ */
+/* $NetBSD: atppc.c,v 1.19 2005/12/11 12:21:25 christos Exp $ */
/*
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc.c,v 1.18 2004/09/13 12:55:47 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc.c,v 1.19 2005/12/11 12:21:25 christos Exp $");
#include "opt_atppc.h"
diff --git a/sys/dev/ic/atppcreg.h b/sys/dev/ic/atppcreg.h
index 55cc4ac686d..4ea905571e0 100644
--- a/sys/dev/ic/atppcreg.h
+++ b/sys/dev/ic/atppcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atppcreg.h,v 1.4 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: atppcreg.h,v 1.5 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
diff --git a/sys/dev/ic/atppcvar.h b/sys/dev/ic/atppcvar.h
index 03e1e24f782..43e5670dcfc 100644
--- a/sys/dev/ic/atppcvar.h
+++ b/sys/dev/ic/atppcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atppcvar.h,v 1.6 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: atppcvar.h,v 1.7 2005/12/11 12:21:25 christos Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
diff --git a/sys/dev/ic/attimer.c b/sys/dev/ic/attimer.c
index bf1cf21f8bc..fdd6cb41832 100644
--- a/sys/dev/ic/attimer.c
+++ b/sys/dev/ic/attimer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: attimer.c,v 1.1 2005/03/25 23:06:19 cube Exp $ */
+/* $NetBSD: attimer.c,v 1.2 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: attimer.c,v 1.1 2005/03/25 23:06:19 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: attimer.c,v 1.2 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/attimervar.h b/sys/dev/ic/attimervar.h
index 02fe634cffb..0984d0f74bb 100644
--- a/sys/dev/ic/attimervar.h
+++ b/sys/dev/ic/attimervar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: attimervar.h,v 1.1 2005/03/25 23:06:19 cube Exp $ */
+/* $NetBSD: attimervar.h,v 1.2 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation.
diff --git a/sys/dev/ic/atwreg.h b/sys/dev/ic/atwreg.h
index b8c8c18b346..21c41d2218b 100644
--- a/sys/dev/ic/atwreg.h
+++ b/sys/dev/ic/atwreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atwreg.h,v 1.11 2005/02/27 00:27:00 perry Exp $ */
+/* $NetBSD: atwreg.h,v 1.12 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved.
diff --git a/sys/dev/ic/atwvar.h b/sys/dev/ic/atwvar.h
index 310cf6878d4..dd45d3b1e90 100644
--- a/sys/dev/ic/atwvar.h
+++ b/sys/dev/ic/atwvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atwvar.h,v 1.16 2005/06/22 06:15:51 dyoung Exp $ */
+/* $NetBSD: atwvar.h,v 1.17 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. All rights reserved.
diff --git a/sys/dev/ic/awi.c b/sys/dev/ic/awi.c
index 47d6f020c95..b1c7eaa8b0d 100644
--- a/sys/dev/ic/awi.c
+++ b/sys/dev/ic/awi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: awi.c,v 1.68 2005/06/22 06:15:51 dyoung Exp $ */
+/* $NetBSD: awi.c,v 1.69 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
#include <sys/cdefs.h>
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.68 2005/06/22 06:15:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.69 2005/12/11 12:21:26 christos Exp $");
#endif
#ifdef __FreeBSD__
__FBSDID("$FreeBSD: src/sys/dev/awi/awi.c,v 1.30 2004/01/15 13:30:06 onoe Exp $");
diff --git a/sys/dev/ic/awireg.h b/sys/dev/ic/awireg.h
index e725ce4d6b7..b48ee524f9b 100644
--- a/sys/dev/ic/awireg.h
+++ b/sys/dev/ic/awireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: awireg.h,v 1.9 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: awireg.h,v 1.10 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/awivar.h b/sys/dev/ic/awivar.h
index 6d74078f95c..2fcf834fbdf 100644
--- a/sys/dev/ic/awivar.h
+++ b/sys/dev/ic/awivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: awivar.h,v 1.21 2005/06/22 06:15:51 dyoung Exp $ */
+/* $NetBSD: awivar.h,v 1.22 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/ax88190.c b/sys/dev/ic/ax88190.c
index 1f72c1dbfe3..bdbc2d36ad5 100644
--- a/sys/dev/ic/ax88190.c
+++ b/sys/dev/ic/ax88190.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ax88190.c,v 1.4 2004/08/24 00:53:29 thorpej Exp $ */
+/* $NetBSD: ax88190.c,v 1.5 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.4 2004/08/24 00:53:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ax88190.c,v 1.5 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/ax88190reg.h b/sys/dev/ic/ax88190reg.h
index cb3f55c080b..cec78f4460c 100644
--- a/sys/dev/ic/ax88190reg.h
+++ b/sys/dev/ic/ax88190reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ax88190reg.h,v 1.2 2003/10/22 00:12:36 christos Exp $ */
+/* $NetBSD: ax88190reg.h,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index aa840d9b865..fe2b23af862 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha.c,v 1.63 2005/05/22 15:54:46 christos Exp $ */
+/* $NetBSD: bha.c,v 1.64 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.63 2005/05/22 15:54:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha.c,v 1.64 2005/12/11 12:21:26 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/ic/bhareg.h b/sys/dev/ic/bhareg.h
index 66dcdae26d3..5df8c38ddd0 100644
--- a/sys/dev/ic/bhareg.h
+++ b/sys/dev/ic/bhareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bhareg.h,v 1.18 2005/02/21 00:29:07 thorpej Exp $ */
+/* $NetBSD: bhareg.h,v 1.19 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/bhavar.h b/sys/dev/ic/bhavar.h
index 062f0fcedf0..ff57f75dae3 100644
--- a/sys/dev/ic/bhavar.h
+++ b/sys/dev/ic/bhavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bhavar.h,v 1.22 2004/08/24 00:53:29 thorpej Exp $ */
+/* $NetBSD: bhavar.h,v 1.23 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/bt431reg.h b/sys/dev/ic/bt431reg.h
index f78f891e2e2..97af277a767 100644
--- a/sys/dev/ic/bt431reg.h
+++ b/sys/dev/ic/bt431reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bt431reg.h,v 1.2 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: bt431reg.h,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*
* Mach Operating System
diff --git a/sys/dev/ic/bt459reg.h b/sys/dev/ic/bt459reg.h
index e11269d476e..1d62c26af97 100644
--- a/sys/dev/ic/bt459reg.h
+++ b/sys/dev/ic/bt459reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bt459reg.h,v 1.3 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: bt459reg.h,v 1.4 2005/12/11 12:21:26 christos Exp $ */
/*
* Mach Operating System
diff --git a/sys/dev/ic/bt463.c b/sys/dev/ic/bt463.c
index f1e0b3137e0..3eb75226b28 100644
--- a/sys/dev/ic/bt463.c
+++ b/sys/dev/ic/bt463.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt463.c,v 1.11 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: bt463.c,v 1.12 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.11 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.12 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/bt463var.h b/sys/dev/ic/bt463var.h
index 3356fdac711..e37cc6a8aaa 100644
--- a/sys/dev/ic/bt463var.h
+++ b/sys/dev/ic/bt463var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bt463var.h,v 1.2 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: bt463var.h,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/bt485.c b/sys/dev/ic/bt485.c
index 02c62355888..afea22f2dbf 100644
--- a/sys/dev/ic/bt485.c
+++ b/sys/dev/ic/bt485.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt485.c,v 1.12 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: bt485.c,v 1.13 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.12 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.13 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/bt485reg.h b/sys/dev/ic/bt485reg.h
index fd6753bab62..b8bd92368d6 100644
--- a/sys/dev/ic/bt485reg.h
+++ b/sys/dev/ic/bt485reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bt485reg.h,v 1.2 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: bt485reg.h,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/dev/ic/bt485var.h b/sys/dev/ic/bt485var.h
index 308bd401269..592f33a6c42 100644
--- a/sys/dev/ic/bt485var.h
+++ b/sys/dev/ic/bt485var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bt485var.h,v 1.2 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: bt485var.h,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index 8acd9bd263d..89f5ddba40c 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cac.c,v 1.32 2005/08/25 22:33:18 drochner Exp $ */
+/* $NetBSD: cac.c,v 1.33 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.32 2005/08/25 22:33:18 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac.c,v 1.33 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/cacreg.h b/sys/dev/ic/cacreg.h
index 2ec3728c121..992e8bd8cdb 100644
--- a/sys/dev/ic/cacreg.h
+++ b/sys/dev/ic/cacreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cacreg.h,v 1.6 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: cacreg.h,v 1.7 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/cacvar.h b/sys/dev/ic/cacvar.h
index 03af03fcaed..e842ac5a787 100644
--- a/sys/dev/ic/cacvar.h
+++ b/sys/dev/ic/cacvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cacvar.h,v 1.11 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: cacvar.h,v 1.12 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/cd1190reg.h b/sys/dev/ic/cd1190reg.h
index a030a8ec19f..818635dc1e7 100644
--- a/sys/dev/ic/cd1190reg.h
+++ b/sys/dev/ic/cd1190reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cd1190reg.h,v 1.3 2003/11/02 11:07:45 wiz Exp $ */
+/* $NetBSD: cd1190reg.h,v 1.4 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1998 Iain Hibbert.
* All rights reserved.
diff --git a/sys/dev/ic/cd1400reg.h b/sys/dev/ic/cd1400reg.h
index bdf348c379e..e574d8e08d0 100644
--- a/sys/dev/ic/cd1400reg.h
+++ b/sys/dev/ic/cd1400reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cd1400reg.h,v 1.5 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: cd1400reg.h,v 1.6 2005/12/11 12:21:26 christos Exp $ */
/*-
* cyclades cyclom-y serial driver
diff --git a/sys/dev/ic/cd18xx.c b/sys/dev/ic/cd18xx.c
index 386c37b3f05..bb968b68b64 100644
--- a/sys/dev/ic/cd18xx.c
+++ b/sys/dev/ic/cd18xx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd18xx.c,v 1.11 2005/09/06 21:40:39 kleink Exp $ */
+/* $NetBSD: cd18xx.c,v 1.12 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -101,7 +101,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.11 2005/09/06 21:40:39 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.12 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
diff --git a/sys/dev/ic/cd18xxreg.h b/sys/dev/ic/cd18xxreg.h
index 07411430046..8daca575b8f 100644
--- a/sys/dev/ic/cd18xxreg.h
+++ b/sys/dev/ic/cd18xxreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cd18xxreg.h,v 1.2 2003/11/02 11:07:45 wiz Exp $ */
+/* $NetBSD: cd18xxreg.h,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
diff --git a/sys/dev/ic/clmpcc.c b/sys/dev/ic/clmpcc.c
index 25612dede39..14b5b40ab59 100644
--- a/sys/dev/ic/clmpcc.c
+++ b/sys/dev/ic/clmpcc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clmpcc.c,v 1.25 2005/09/06 21:36:54 kleink Exp $ */
+/* $NetBSD: clmpcc.c,v 1.26 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.25 2005/09/06 21:36:54 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clmpcc.c,v 1.26 2005/12/11 12:21:26 christos Exp $");
#include "opt_ddb.h"
@@ -507,10 +507,10 @@ clmpcc_shutdown(ch)
}
int
-clmpccopen(dev, flag, mode, p)
+clmpccopen(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
struct clmpcc_softc *sc;
struct clmpcc_chan *ch;
@@ -528,7 +528,7 @@ clmpccopen(dev, flag, mode, p)
if ( ISSET(tp->t_state, TS_ISOPEN) &&
ISSET(tp->t_state, TS_XCLUDE) &&
- suser(p->p_ucred, &p->p_acflag) != 0 )
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0 )
return EBUSY;
/*
@@ -613,10 +613,10 @@ bad:
}
int
-clmpccclose(dev, flag, mode, p)
+clmpccclose(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
struct clmpcc_softc *sc =
device_lookup(&clmpcc_cd, CLMPCCUNIT(dev));
@@ -672,15 +672,15 @@ clmpccwrite(dev, uio, flag)
}
int
-clmpccpoll(dev, events, p)
+clmpccpoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct clmpcc_softc *sc = device_lookup(&clmpcc_cd, CLMPCCUNIT(dev));
struct tty *tp = sc->sc_chans[CLMPCCCHAN(dev)].ch_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
struct tty *
@@ -693,23 +693,23 @@ clmpcctty(dev)
}
int
-clmpccioctl(dev, cmd, data, flag, p)
+clmpccioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct clmpcc_softc *sc = device_lookup(&clmpcc_cd, CLMPCCUNIT(dev));
struct clmpcc_chan *ch = &sc->sc_chans[CLMPCCCHAN(dev)];
struct tty *tp = ch->ch_tty;
int error;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return error;
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return error;
@@ -755,7 +755,7 @@ clmpccioctl(dev, cmd, data, flag, p)
break;
case TIOCSFLAGS:
- error = suser(p->p_ucred, &p->p_acflag);
+ error = suser(l->l_proc->p_ucred, &l->l_proc->p_acflag);
if ( error )
break;
ch->ch_openflags = *((int *)data) &
diff --git a/sys/dev/ic/clmpccvar.h b/sys/dev/ic/clmpccvar.h
index d24bca63bba..80925a2d64a 100644
--- a/sys/dev/ic/clmpccvar.h
+++ b/sys/dev/ic/clmpccvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: clmpccvar.h,v 1.9 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: clmpccvar.h,v 1.10 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 6376433633d..4c2927b6196 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.237 2005/11/06 21:34:37 dsl Exp $ */
+/* $NetBSD: com.c,v 1.238 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.237 2005/11/06 21:34:37 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com.c,v 1.238 2005/12/11 12:21:26 christos Exp $");
#include "opt_com.h"
#include "opt_ddb.h"
@@ -811,7 +811,7 @@ com_shutdown(struct com_softc *sc)
}
int
-comopen(dev_t dev, int flag, int mode, struct proc *p)
+comopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct com_softc *sc;
struct tty *tp;
@@ -838,7 +838,7 @@ comopen(dev_t dev, int flag, int mode, struct proc *p)
if (ISSET(tp->t_state, TS_ISOPEN) &&
ISSET(tp->t_state, TS_XCLUDE) &&
- suser(p->p_ucred, &p->p_acflag) != 0)
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0)
return (EBUSY);
s = spltty();
@@ -965,7 +965,7 @@ bad:
}
int
-comclose(dev_t dev, int flag, int mode, struct proc *p)
+comclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct com_softc *sc = device_lookup(&com_cd, COMUNIT(dev));
struct tty *tp = sc->sc_tty;
@@ -1017,7 +1017,7 @@ comwrite(dev_t dev, struct uio *uio, int flag)
}
int
-compoll(dev_t dev, int events, struct proc *p)
+compoll(dev_t dev, int events, struct lwp *l)
{
struct com_softc *sc = device_lookup(&com_cd, COMUNIT(dev));
struct tty *tp = sc->sc_tty;
@@ -1025,7 +1025,7 @@ compoll(dev_t dev, int events, struct proc *p)
if (COM_ISALIVE(sc) == 0)
return (POLLHUP);
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
struct tty *
@@ -1038,21 +1038,22 @@ comtty(dev_t dev)
}
int
-comioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+comioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct com_softc *sc = device_lookup(&com_cd, COMUNIT(dev));
struct tty *tp = sc->sc_tty;
+ struct proc *p = l->l_proc;
int error;
int s;
if (COM_ISALIVE(sc) == 0)
return (EIO);
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
diff --git a/sys/dev/ic/com_cpcbus.c b/sys/dev/ic/com_cpcbus.c
index aecd477834d..e387729ac14 100644
--- a/sys/dev/ic/com_cpcbus.c
+++ b/sys/dev/ic/com_cpcbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_cpcbus.c,v 1.5 2003/07/14 15:47:10 lukem Exp $ */
+/* $NetBSD: com_cpcbus.c,v 1.6 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_cpcbus.c,v 1.5 2003/07/14 15:47:10 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_cpcbus.c,v 1.6 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/com_upc.c b/sys/dev/ic/com_upc.c
index 5457a6d5b55..bb2ec17f981 100644
--- a/sys/dev/ic/com_upc.c
+++ b/sys/dev/ic/com_upc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_upc.c,v 1.6 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: com_upc.c,v 1.7 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@@ -28,7 +28,7 @@
/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_upc.c,v 1.6 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_upc.c,v 1.7 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/comreg.h b/sys/dev/ic/comreg.h
index 9a94c908a11..899b7a21fab 100644
--- a/sys/dev/ic/comreg.h
+++ b/sys/dev/ic/comreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: comreg.h,v 1.13 2003/08/07 16:31:01 agc Exp $ */
+/* $NetBSD: comreg.h,v 1.14 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
diff --git a/sys/dev/ic/comvar.h b/sys/dev/ic/comvar.h
index 146b74fade5..433c6c097d8 100644
--- a/sys/dev/ic/comvar.h
+++ b/sys/dev/ic/comvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: comvar.h,v 1.48 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: comvar.h,v 1.49 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
diff --git a/sys/dev/ic/cpc700.c b/sys/dev/ic/cpc700.c
index 9b3b2d57c19..d84614cb86e 100644
--- a/sys/dev/ic/cpc700.c
+++ b/sys/dev/ic/cpc700.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpc700.c,v 1.10 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: cpc700.c,v 1.11 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.10 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpc700.c,v 1.11 2005/12/11 12:21:26 christos Exp $");
#include "pci.h"
#include "opt_pci.h"
diff --git a/sys/dev/ic/cpc700reg.h b/sys/dev/ic/cpc700reg.h
index c8e877df2d3..2a8718a629f 100644
--- a/sys/dev/ic/cpc700reg.h
+++ b/sys/dev/ic/cpc700reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cpc700reg.h,v 1.3 2003/11/07 17:03:42 augustss Exp $ */
+/* $NetBSD: cpc700reg.h,v 1.4 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/cpc700uic.h b/sys/dev/ic/cpc700uic.h
index 34d4bc65b94..d192bb48ac9 100644
--- a/sys/dev/ic/cpc700uic.h
+++ b/sys/dev/ic/cpc700uic.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cpc700uic.h,v 1.2 2003/07/08 10:06:30 itojun Exp $ */
+/* $NetBSD: cpc700uic.h,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/cs4215reg.h b/sys/dev/ic/cs4215reg.h
index 5451cad91ba..66c70c07784 100644
--- a/sys/dev/ic/cs4215reg.h
+++ b/sys/dev/ic/cs4215reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4215reg.h,v 1.1 2005/07/16 18:58:49 macallan Exp $ */
+/* $NetBSD: cs4215reg.h,v 1.2 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2001 Jared D. McNeill <jmcneill@invisible.yi.org>
diff --git a/sys/dev/ic/cs4215var.h b/sys/dev/ic/cs4215var.h
index 0498313840c..10ff2d8a1df 100644
--- a/sys/dev/ic/cs4215var.h
+++ b/sys/dev/ic/cs4215var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4215var.h,v 1.1 2005/07/16 18:58:49 macallan Exp $ */
+/* $NetBSD: cs4215var.h,v 1.2 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2001 Jared D. McNeill <jmcneill@invisible.yi.org>
diff --git a/sys/dev/ic/cs4231.c b/sys/dev/ic/cs4231.c
index 804a0fb7ca4..8f7527ac425 100644
--- a/sys/dev/ic/cs4231.c
+++ b/sys/dev/ic/cs4231.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231.c,v 1.17 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: cs4231.c,v 1.18 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.17 2005/01/15 15:19:52 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.18 2005/12/11 12:21:26 christos Exp $");
#include "audio.h"
#if NAUDIO > 0
diff --git a/sys/dev/ic/cs4231reg.h b/sys/dev/ic/cs4231reg.h
index f306d34c151..d2c35870a5b 100644
--- a/sys/dev/ic/cs4231reg.h
+++ b/sys/dev/ic/cs4231reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231reg.h,v 1.9 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: cs4231reg.h,v 1.10 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/cs4231var.h b/sys/dev/ic/cs4231var.h
index b2ed09a6812..e0bbfb379e6 100644
--- a/sys/dev/ic/cs4231var.h
+++ b/sys/dev/ic/cs4231var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231var.h,v 1.5 2004/07/09 02:08:33 mycroft Exp $ */
+/* $NetBSD: cs4231var.h,v 1.6 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/cs4237reg.h b/sys/dev/ic/cs4237reg.h
index be22ee76e3a..f370fc443b1 100644
--- a/sys/dev/ic/cs4237reg.h
+++ b/sys/dev/ic/cs4237reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4237reg.h,v 1.3 2003/12/04 13:57:30 keihan Exp $ */
+/* $NetBSD: cs4237reg.h,v 1.4 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/cs89x0.c b/sys/dev/ic/cs89x0.c
index f180671e416..a3dea967f60 100644
--- a/sys/dev/ic/cs89x0.c
+++ b/sys/dev/ic/cs89x0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0.c,v 1.17 2005/05/30 04:43:46 christos Exp $ */
+/* $NetBSD: cs89x0.c,v 1.18 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2004 Christopher Gilbert
@@ -212,7 +212,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.17 2005/05/30 04:43:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs89x0.c,v 1.18 2005/12/11 12:21:26 christos Exp $");
#include "opt_inet.h"
diff --git a/sys/dev/ic/cs89x0reg.h b/sys/dev/ic/cs89x0reg.h
index b7733d3bd7f..dec4304e1bd 100644
--- a/sys/dev/ic/cs89x0reg.h
+++ b/sys/dev/ic/cs89x0reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0reg.h,v 1.2 2004/02/04 15:43:14 augustss Exp $ */
+/* $NetBSD: cs89x0reg.h,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright 1997
diff --git a/sys/dev/ic/cs89x0var.h b/sys/dev/ic/cs89x0var.h
index 6727f6085d0..1ca2cf6dd2c 100644
--- a/sys/dev/ic/cs89x0var.h
+++ b/sys/dev/ic/cs89x0var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0var.h,v 1.8 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: cs89x0var.h,v 1.9 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright 1997
diff --git a/sys/dev/ic/cy.c b/sys/dev/ic/cy.c
index 18651e6f9dd..98f2e47295d 100644
--- a/sys/dev/ic/cy.c
+++ b/sys/dev/ic/cy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy.c,v 1.38 2005/09/06 21:40:39 kleink Exp $ */
+/* $NetBSD: cy.c,v 1.39 2005/12/11 12:21:26 christos Exp $ */
/*
* cy.c
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.38 2005/09/06 21:40:39 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy.c,v 1.39 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -269,7 +269,7 @@ cy_getport(dev_t dev)
* open routine. returns zero if successful, else error code
*/
int
-cyopen(dev_t dev, int flag, int mode, struct proc *p)
+cyopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct cy_softc *sc;
struct cy_port *cy;
@@ -370,7 +370,7 @@ cyopen(dev_t dev, int flag, int mode, struct proc *p)
else
CLR(tp->t_state, TS_CARR_ON);
} else if (ISSET(tp->t_state, TS_XCLUDE) &&
- suser(p->p_ucred, &p->p_acflag) != 0) {
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0) {
return EBUSY;
} else {
s = spltty();
@@ -399,7 +399,7 @@ cyopen(dev_t dev, int flag, int mode, struct proc *p)
* close routine. returns zero if successful, else error code
*/
int
-cyclose(dev_t dev, int flag, int mode, struct proc *p)
+cyclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct cy_softc *sc;
struct cy_port *cy;
@@ -467,10 +467,7 @@ cywrite(dev_t dev, struct uio *uio, int flag)
* Poll routine
*/
int
-cypoll(dev, events, p)
- dev_t dev;
- int events;
- struct proc *p;
+cypoll(dev_t dev, int events, struct lwp *l)
{
struct cy_port *cy;
struct tty *tp;
@@ -478,7 +475,7 @@ cypoll(dev, events, p)
cy = CY_PORT(dev);
tp = cy->cy_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
/*
@@ -498,22 +495,24 @@ cytty(dev_t dev)
* ioctl routine
*/
int
-cyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+cyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct cy_softc *sc;
struct cy_port *cy;
+ struct proc *p;
struct tty *tp;
int error;
+ p = l ? l->l_proc : NULL;
cy = CY_PORT(dev);
sc = CY_BOARD(cy);
tp = cy->cy_tty;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return error;
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return error;
diff --git a/sys/dev/ic/cyreg.h b/sys/dev/ic/cyreg.h
index e0c26335378..f7d6fc1744f 100644
--- a/sys/dev/ic/cyreg.h
+++ b/sys/dev/ic/cyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cyreg.h,v 1.4 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: cyreg.h,v 1.5 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1995 Bruce Evans.
diff --git a/sys/dev/ic/daic.c b/sys/dev/ic/daic.c
index 6bf0e2bcec1..17d4482bf66 100644
--- a/sys/dev/ic/daic.c
+++ b/sys/dev/ic/daic.c
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: daic.c,v 1.22 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: daic.c,v 1.23 2005/12/11 12:21:26 christos Exp $");
/*
* daic.c: MI driver for Diehl active ISDN cards (S, SX, SXn, SCOM, QUADRO)
diff --git a/sys/dev/ic/daicreg.h b/sys/dev/ic/daicreg.h
index 9c6d64fe9ff..4bec6d4249a 100644
--- a/sys/dev/ic/daicreg.h
+++ b/sys/dev/ic/daicreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: daicreg.h,v 1.4 2003/12/04 13:57:30 keihan Exp $ */
+/* $NetBSD: daicreg.h,v 1.5 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/daicvar.h b/sys/dev/ic/daicvar.h
index 3e2585d3bbc..34b3d704508 100644
--- a/sys/dev/ic/daicvar.h
+++ b/sys/dev/ic/daicvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: daicvar.h,v 1.8 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: daicvar.h,v 1.9 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/dc21040reg.h b/sys/dev/ic/dc21040reg.h
index 26cbb650224..07d8b371f65 100644
--- a/sys/dev/ic/dc21040reg.h
+++ b/sys/dev/ic/dc21040reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dc21040reg.h,v 1.18 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: dc21040reg.h,v 1.19 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1994, 1995, 1996 Matt Thomas <matt@3am-software.com>
diff --git a/sys/dev/ic/depca.c b/sys/dev/ic/depca.c
index 2dbdc5082d2..e0d68169c20 100644
--- a/sys/dev/ic/depca.c
+++ b/sys/dev/ic/depca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: depca.c,v 1.10 2003/08/07 16:31:01 agc Exp $ */
+/* $NetBSD: depca.c,v 1.11 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.10 2003/08/07 16:31:01 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca.c,v 1.11 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/depcareg.h b/sys/dev/ic/depcareg.h
index d0df5d0f5e0..31f0a8c557e 100644
--- a/sys/dev/ic/depcareg.h
+++ b/sys/dev/ic/depcareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: depcareg.h,v 1.2 2003/08/07 16:31:01 agc Exp $ */
+/* $NetBSD: depcareg.h,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/depcavar.h b/sys/dev/ic/depcavar.h
index 89dc2541289..5ebd1fc0d74 100644
--- a/sys/dev/ic/depcavar.h
+++ b/sys/dev/ic/depcavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: depcavar.h,v 1.3 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: depcavar.h,v 1.4 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index c7d3c0627a6..2a5515d57ab 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390.c,v 1.55 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: dp8390.c,v 1.56 2005/12/11 12:21:26 christos Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -14,7 +14,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.55 2005/02/04 02:10:36 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp8390.c,v 1.56 2005/12/11 12:21:26 christos Exp $");
#include "opt_ipkdb.h"
#include "opt_inet.h"
diff --git a/sys/dev/ic/dp83905.c b/sys/dev/ic/dp83905.c
index 635078abd9b..aa98d9730e9 100644
--- a/sys/dev/ic/dp83905.c
+++ b/sys/dev/ic/dp83905.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dp83905.c,v 1.2 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: dp83905.c,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -35,7 +35,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: dp83905.c,v 1.2 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp83905.c,v 1.3 2005/12/11 12:21:26 christos Exp $");
#include <sys/device.h>
#include <sys/mbuf.h>
diff --git a/sys/dev/ic/dp83905var.h b/sys/dev/ic/dp83905var.h
index 3aa55ca9c8f..585b518f321 100644
--- a/sys/dev/ic/dp83905var.h
+++ b/sys/dev/ic/dp83905var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dp83905var.h,v 1.2 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: dp83905var.h,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
diff --git a/sys/dev/ic/dp8390reg.h b/sys/dev/ic/dp8390reg.h
index 598488d2883..c4a150f0ef4 100644
--- a/sys/dev/ic/dp8390reg.h
+++ b/sys/dev/ic/dp8390reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390reg.h,v 1.7 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: dp8390reg.h,v 1.8 2005/12/11 12:21:26 christos Exp $ */
/*
* National Semiconductor DS8390 NIC register definitions.
diff --git a/sys/dev/ic/dp8390var.h b/sys/dev/ic/dp8390var.h
index e85b512438e..f839e5c645e 100644
--- a/sys/dev/ic/dp8390var.h
+++ b/sys/dev/ic/dp8390var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390var.h,v 1.26 2005/02/26 10:29:20 bsh Exp $ */
+/* $NetBSD: dp8390var.h,v 1.27 2005/12/11 12:21:26 christos Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
diff --git a/sys/dev/ic/dp83932.c b/sys/dev/ic/dp83932.c
index e270ca47eb9..258b12fdc3f 100644
--- a/sys/dev/ic/dp83932.c
+++ b/sys/dev/ic/dp83932.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dp83932.c,v 1.12 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: dp83932.c,v 1.13 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.12 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dp83932.c,v 1.13 2005/12/11 12:21:26 christos Exp $");
#include "bpfilter.h"
diff --git a/sys/dev/ic/dp83932reg.h b/sys/dev/ic/dp83932reg.h
index 5dc92c8adaf..91b4b2507cf 100644
--- a/sys/dev/ic/dp83932reg.h
+++ b/sys/dev/ic/dp83932reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dp83932reg.h,v 1.3 2003/11/10 08:51:52 wiz Exp $ */
+/* $NetBSD: dp83932reg.h,v 1.4 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c
index b555c6576d3..f57cdfaf691 100644
--- a/sys/dev/ic/dpt.c
+++ b/sys/dev/ic/dpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt.c,v 1.44 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: dpt.c,v 1.45 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.44 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt.c,v 1.45 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -197,7 +197,7 @@ static void dpt_ctlrinfo(struct dpt_softc *, struct dpt_eata_ctlrinfo *);
static void dpt_hba_inquire(struct dpt_softc *, struct eata_inquiry_data **);
static void dpt_minphys(struct buf *);
static int dpt_passthrough(struct dpt_softc *, struct eata_ucp *,
- struct proc *);
+ struct lwp *);
static void dpt_scsipi_request(struct scsipi_channel *,
scsipi_adapter_req_t, void *);
static void dpt_shutdown(void *);
@@ -1110,7 +1110,7 @@ dpt_hba_inquire(struct dpt_softc *sc, struct eata_inquiry_data **ei)
}
int
-dptopen(dev_t dev, int flag, int mode, struct proc *p)
+dptopen(dev_t dev, int flag, int mode, struct lwp *l)
{
if (securelevel > 1)
@@ -1122,7 +1122,7 @@ dptopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-dptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+dptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct dpt_softc *sc;
int rv;
@@ -1162,7 +1162,7 @@ dptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
if (sc->sc_uactive++)
tsleep(&sc->sc_uactive, PRIBIO, "dptslp", 0);
- rv = dpt_passthrough(sc, (struct eata_ucp *)data, p);
+ rv = dpt_passthrough(sc, (struct eata_ucp *)data, l);
sc->sc_uactive--;
wakeup_one(&sc->sc_uactive);
@@ -1268,7 +1268,7 @@ dpt_sysinfo(struct dpt_softc *sc, struct dpt_sysinfo *info)
}
int
-dpt_passthrough(struct dpt_softc *sc, struct eata_ucp *ucp, struct proc *proc)
+dpt_passthrough(struct dpt_softc *sc, struct eata_ucp *ucp, struct lwp *l)
{
struct dpt_ccb *ccb;
struct eata_sp sp;
@@ -1308,7 +1308,7 @@ dpt_passthrough(struct dpt_softc *sc, struct eata_ucp *ucp, struct proc *proc)
return (EFBIG);
}
rv = bus_dmamap_load(sc->sc_dmat, xfer,
- ucp->ucp_dataaddr, ucp->ucp_datalen, proc,
+ ucp->ucp_dataaddr, ucp->ucp_datalen, l->l_proc,
BUS_DMA_WAITOK | BUS_DMA_STREAMING |
(datain ? BUS_DMA_READ : BUS_DMA_WRITE));
if (rv != 0) {
diff --git a/sys/dev/ic/dptreg.h b/sys/dev/ic/dptreg.h
index 8057e7f0647..297a78507ec 100644
--- a/sys/dev/ic/dptreg.h
+++ b/sys/dev/ic/dptreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dptreg.h,v 1.16 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: dptreg.h,v 1.17 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
diff --git a/sys/dev/ic/dptvar.h b/sys/dev/ic/dptvar.h
index 961df32d5f6..cb725f8a34b 100644
--- a/sys/dev/ic/dptvar.h
+++ b/sys/dev/ic/dptvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dptvar.h,v 1.12 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: dptvar.h,v 1.13 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
diff --git a/sys/dev/ic/ds.h b/sys/dev/ic/ds.h
index 498d4ec1ab7..40bb39455b9 100644
--- a/sys/dev/ic/ds.h
+++ b/sys/dev/ic/ds.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ds.h,v 1.6 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: ds.h,v 1.7 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/ds1286reg.h b/sys/dev/ic/ds1286reg.h
index 257ea9c77a6..310abc7f401 100644
--- a/sys/dev/ic/ds1286reg.h
+++ b/sys/dev/ic/ds1286reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1286reg.h,v 1.7 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: ds1286reg.h,v 1.8 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2001 Rafal K. Boni
diff --git a/sys/dev/ic/ds1687reg.h b/sys/dev/ic/ds1687reg.h
index 5cb95ba7f25..075c6b585b0 100644
--- a/sys/dev/ic/ds1687reg.h
+++ b/sys/dev/ic/ds1687reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1687reg.h,v 1.7 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: ds1687reg.h,v 1.8 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 3fc2a2b47b3..32bd5e45506 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.112 2005/05/30 04:43:46 christos Exp $ */
+/* $NetBSD: elink3.c,v 1.113 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.112 2005/05/30 04:43:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.113 2005/12/11 12:21:26 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/ic/elink3reg.h b/sys/dev/ic/elink3reg.h
index 3003291b150..5bce6f5d00c 100644
--- a/sys/dev/ic/elink3reg.h
+++ b/sys/dev/ic/elink3reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3reg.h,v 1.28 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: elink3reg.h,v 1.29 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1995 Herb Peyerl <hpeyerl@beer.org>
diff --git a/sys/dev/ic/elink3var.h b/sys/dev/ic/elink3var.h
index 9974b2d0aaf..875fa0294ab 100644
--- a/sys/dev/ic/elink3var.h
+++ b/sys/dev/ic/elink3var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3var.h,v 1.32 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: elink3var.h,v 1.33 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1994 Herb Peyerl <hpeyerl@beer.org>
diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c
index f154e124e23..c2969702d95 100644
--- a/sys/dev/ic/elinkxl.c
+++ b/sys/dev/ic/elinkxl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.85 2005/10/23 20:03:04 christos Exp $ */
+/* $NetBSD: elinkxl.c,v 1.86 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.85 2005/10/23 20:03:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.86 2005/12/11 12:21:26 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
diff --git a/sys/dev/ic/elinkxlvar.h b/sys/dev/ic/elinkxlvar.h
index 4de3e657862..0c51b205058 100644
--- a/sys/dev/ic/elinkxlvar.h
+++ b/sys/dev/ic/elinkxlvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxlvar.h,v 1.16 2005/02/06 03:15:14 kim Exp $ */
+/* $NetBSD: elinkxlvar.h,v 1.17 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/fmv.c b/sys/dev/ic/fmv.c
index ea74aa03132..9ab8e2f0e88 100644
--- a/sys/dev/ic/fmv.c
+++ b/sys/dev/ic/fmv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fmv.c,v 1.6 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: fmv.c,v 1.7 2005/12/11 12:21:26 christos Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fmv.c,v 1.6 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fmv.c,v 1.7 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/fmvvar.h b/sys/dev/ic/fmvvar.h
index 2c7df4fa696..4e30816e897 100644
--- a/sys/dev/ic/fmvvar.h
+++ b/sys/dev/ic/fmvvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fmvvar.h,v 1.3 2005/01/02 12:22:19 tsutsui Exp $ */
+/* $NetBSD: fmvvar.h,v 1.4 2005/12/11 12:21:26 christos Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index eb2f978bd36..84f1fe21e14 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.43 2005/10/28 20:56:13 christos Exp $ */
+/* $NetBSD: gem.c,v 1.44 2005/12/11 12:21:26 christos Exp $ */
/*
*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.43 2005/10/28 20:56:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.44 2005/12/11 12:21:26 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/ic/gemreg.h b/sys/dev/ic/gemreg.h
index da5663a201a..a2f33e4cb19 100644
--- a/sys/dev/ic/gemreg.h
+++ b/sys/dev/ic/gemreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gemreg.h,v 1.7 2005/02/18 01:39:18 heas Exp $ */
+/* $NetBSD: gemreg.h,v 1.8 2005/12/11 12:21:26 christos Exp $ */
/*
*
diff --git a/sys/dev/ic/gemvar.h b/sys/dev/ic/gemvar.h
index ed99f18e73d..6196ccb0e01 100644
--- a/sys/dev/ic/gemvar.h
+++ b/sys/dev/ic/gemvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gemvar.h,v 1.13 2005/10/28 14:36:15 christos Exp $ */
+/* $NetBSD: gemvar.h,v 1.14 2005/12/11 12:21:26 christos Exp $ */
/*
*
diff --git a/sys/dev/ic/hd44780_subr.c b/sys/dev/ic/hd44780_subr.c
index f2aa6288fef..d98c7955978 100644
--- a/sys/dev/ic/hd44780_subr.c
+++ b/sys/dev/ic/hd44780_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hd44780_subr.c,v 1.7 2005/08/14 02:56:06 joff Exp $ */
+/* $NetBSD: hd44780_subr.c,v 1.8 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.7 2005/08/14 02:56:06 joff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.8 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,7 +88,7 @@ const struct wsdisplay_emulops hlcd_emulops = {
hlcd_allocattr
};
-static int hlcd_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int hlcd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t hlcd_mmap(void *, off_t, int);
static int hlcd_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@@ -228,12 +228,12 @@ hlcd_allocattr(id, fg, bg, flags, attrp)
}
static int
-hlcd_ioctl(v, cmd, data, flag, p)
+hlcd_ioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
switch (cmd) {
diff --git a/sys/dev/ic/hd44780reg.h b/sys/dev/ic/hd44780reg.h
index b72b04cc81b..26f54f95a9c 100644
--- a/sys/dev/ic/hd44780reg.h
+++ b/sys/dev/ic/hd44780reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hd44780reg.h,v 1.2 2005/01/08 20:19:08 joff Exp $ */
+/* $NetBSD: hd44780reg.h,v 1.3 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
diff --git a/sys/dev/ic/hd44780var.h b/sys/dev/ic/hd44780var.h
index dab866275be..92ddcc5eb16 100644
--- a/sys/dev/ic/hd44780var.h
+++ b/sys/dev/ic/hd44780var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hd44780var.h,v 1.3 2005/08/14 02:56:06 joff Exp $ */
+/* $NetBSD: hd44780var.h,v 1.4 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
diff --git a/sys/dev/ic/hd64570.c b/sys/dev/ic/hd64570.c
index d8e67f253f8..b9df9bddccc 100644
--- a/sys/dev/ic/hd64570.c
+++ b/sys/dev/ic/hd64570.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.29 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: hd64570.c,v 1.30 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.29 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.30 2005/12/11 12:21:26 christos Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
diff --git a/sys/dev/ic/hd64570reg.h b/sys/dev/ic/hd64570reg.h
index 74c35529322..508cd13b0b0 100644
--- a/sys/dev/ic/hd64570reg.h
+++ b/sys/dev/ic/hd64570reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570reg.h,v 1.10 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: hd64570reg.h,v 1.11 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1998 Vixie Enterprises
diff --git a/sys/dev/ic/hd64570var.h b/sys/dev/ic/hd64570var.h
index ffc8279415b..8e3f61d4923 100644
--- a/sys/dev/ic/hd64570var.h
+++ b/sys/dev/ic/hd64570var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570var.h,v 1.6 2003/07/08 10:06:31 itojun Exp $ */
+/* $NetBSD: hd64570var.h,v 1.7 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c
index 48b62e70854..5677e0aba97 100644
--- a/sys/dev/ic/hme.c
+++ b/sys/dev/ic/hme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.51 2005/05/02 15:34:31 yamt Exp $ */
+/* $NetBSD: hme.c,v 1.52 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.51 2005/05/02 15:34:31 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.52 2005/12/11 12:21:26 christos Exp $");
/* #define HMEDEBUG */
diff --git a/sys/dev/ic/hmereg.h b/sys/dev/ic/hmereg.h
index 04359db8b83..3de40392bc3 100644
--- a/sys/dev/ic/hmereg.h
+++ b/sys/dev/ic/hmereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hmereg.h,v 1.17 2005/02/13 19:12:06 heas Exp $ */
+/* $NetBSD: hmereg.h,v 1.18 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/hmevar.h b/sys/dev/ic/hmevar.h
index b7ea25407fe..f3294e239a1 100644
--- a/sys/dev/ic/hmevar.h
+++ b/sys/dev/ic/hmevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hmevar.h,v 1.13 2005/02/18 00:22:11 heas Exp $ */
+/* $NetBSD: hmevar.h,v 1.14 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/hscx.c b/sys/dev/ic/hscx.c
index 9d465f8bb62..d2725096bca 100644
--- a/sys/dev/ic/hscx.c
+++ b/sys/dev/ic/hscx.c
@@ -27,14 +27,14 @@
* i4b - Siemens HSCX chip (B-channel) handling
* --------------------------------------------
*
- * $Id: hscx.c,v 1.11 2005/06/01 18:16:22 drochner Exp $
+ * $Id: hscx.c,v 1.12 2005/12/11 12:21:26 christos Exp $
*
* last edit-date: [Fri Jan 5 11:36:10 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hscx.c,v 1.11 2005/06/01 18:16:22 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hscx.c,v 1.12 2005/12/11 12:21:26 christos Exp $");
#include <sys/param.h>
#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001
diff --git a/sys/dev/ic/hscx.h b/sys/dev/ic/hscx.h
index af93ff29490..e8ffd5bf488 100644
--- a/sys/dev/ic/hscx.h
+++ b/sys/dev/ic/hscx.h
@@ -30,7 +30,7 @@
*
*---------------------------------------------------------------------------
*
- * $Id: hscx.h,v 1.2 2005/02/27 00:27:01 perry Exp $
+ * $Id: hscx.h,v 1.3 2005/12/11 12:21:26 christos Exp $
*
* last edit-date: [Sun Feb 14 10:26:56 1999]
*
diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c
index 6b3999943a2..15ee8b997ac 100644
--- a/sys/dev/ic/i82365.c
+++ b/sys/dev/ic/i82365.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365.c,v 1.92 2005/08/25 22:33:19 drochner Exp $ */
+/* $NetBSD: i82365.c,v 1.93 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.92 2005/08/25 22:33:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.93 2005/12/11 12:21:26 christos Exp $");
#define PCICDEBUG
diff --git a/sys/dev/ic/i82365reg.h b/sys/dev/ic/i82365reg.h
index 74d8cd132ca..e9bc978a456 100644
--- a/sys/dev/ic/i82365reg.h
+++ b/sys/dev/ic/i82365reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365reg.h,v 1.9 2004/07/06 14:04:51 mycroft Exp $ */
+/* $NetBSD: i82365reg.h,v 1.10 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
diff --git a/sys/dev/ic/i82365var.h b/sys/dev/ic/i82365var.h
index 5ededf5071c..2ec390f3e42 100644
--- a/sys/dev/ic/i82365var.h
+++ b/sys/dev/ic/i82365var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365var.h,v 1.23 2005/05/30 04:43:46 christos Exp $ */
+/* $NetBSD: i82365var.h,v 1.24 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
diff --git a/sys/dev/ic/i8237reg.h b/sys/dev/ic/i8237reg.h
index 8ab2e971fa0..e74eee3681a 100644
--- a/sys/dev/ic/i8237reg.h
+++ b/sys/dev/ic/i8237reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i8237reg.h,v 1.7 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: i8237reg.h,v 1.8 2005/12/11 12:21:26 christos Exp $ */
/*
* Intel 8237 DMA Controller
diff --git a/sys/dev/ic/i8253reg.h b/sys/dev/ic/i8253reg.h
index da303b316d1..cabb4758c5b 100644
--- a/sys/dev/ic/i8253reg.h
+++ b/sys/dev/ic/i8253reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i8253reg.h,v 1.8 2003/08/07 16:31:01 agc Exp $ */
+/* $NetBSD: i8253reg.h,v 1.9 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1993 The Regents of the University of California.
diff --git a/sys/dev/ic/i82557.c b/sys/dev/ic/i82557.c
index 573f5169c85..ea29d2e26fe 100644
--- a/sys/dev/ic/i82557.c
+++ b/sys/dev/ic/i82557.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557.c,v 1.94 2005/10/15 19:32:36 jdolecek Exp $ */
+/* $NetBSD: i82557.c,v 1.95 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.94 2005/10/15 19:32:36 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.95 2005/12/11 12:21:26 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
diff --git a/sys/dev/ic/i82557reg.h b/sys/dev/ic/i82557reg.h
index b1171ee9b11..4404c517a7f 100644
--- a/sys/dev/ic/i82557reg.h
+++ b/sys/dev/ic/i82557reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557reg.h,v 1.17 2005/05/29 22:10:28 christos Exp $ */
+/* $NetBSD: i82557reg.h,v 1.18 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/i82557var.h b/sys/dev/ic/i82557var.h
index 131fa3137a2..6bc725dfc34 100644
--- a/sys/dev/ic/i82557var.h
+++ b/sys/dev/ic/i82557var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557var.h,v 1.34 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: i82557var.h,v 1.35 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/i82586.c b/sys/dev/ic/i82586.c
index 8834afed7b7..7a79779cda0 100644
--- a/sys/dev/ic/i82586.c
+++ b/sys/dev/ic/i82586.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82586.c,v 1.52 2005/05/30 04:43:46 christos Exp $ */
+/* $NetBSD: i82586.c,v 1.53 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -144,7 +144,7 @@ Mode of operation:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.52 2005/05/30 04:43:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82586.c,v 1.53 2005/12/11 12:21:26 christos Exp $");
#include "bpfilter.h"
diff --git a/sys/dev/ic/i82586reg.h b/sys/dev/ic/i82586reg.h
index 2f69838c467..4d7d67ab7dc 100644
--- a/sys/dev/ic/i82586reg.h
+++ b/sys/dev/ic/i82586reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82586reg.h,v 1.10 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: i82586reg.h,v 1.11 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/i82586var.h b/sys/dev/ic/i82586var.h
index 8d3181b40d7..2642c0c5c90 100644
--- a/sys/dev/ic/i82586var.h
+++ b/sys/dev/ic/i82586var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82586var.h,v 1.20 2005/05/30 04:43:46 christos Exp $ */
+/* $NetBSD: i82586var.h,v 1.21 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/i82595reg.h b/sys/dev/ic/i82595reg.h
index 04d53a81956..0b96f9e52f6 100644
--- a/sys/dev/ic/i82595reg.h
+++ b/sys/dev/ic/i82595reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82595reg.h,v 1.7 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: i82595reg.h,v 1.8 2005/12/11 12:21:26 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c
index 2c7b8d4393b..664252466fa 100644
--- a/sys/dev/ic/i82596.c
+++ b/sys/dev/ic/i82596.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82596.c,v 1.10 2005/06/07 06:27:17 skrll Exp $ */
+/* $NetBSD: i82596.c,v 1.11 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2003 Jochen Kunz.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.10 2005/06/07 06:27:17 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82596.c,v 1.11 2005/12/11 12:21:26 christos Exp $");
/* autoconfig and device stuff */
#include <sys/param.h>
diff --git a/sys/dev/ic/i82596reg.h b/sys/dev/ic/i82596reg.h
index 05fc8f322e5..ec8a0c997c0 100644
--- a/sys/dev/ic/i82596reg.h
+++ b/sys/dev/ic/i82596reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82596reg.h,v 1.1 2004/03/12 11:37:17 jkunz Exp $ */
+/* $NetBSD: i82596reg.h,v 1.2 2005/12/11 12:21:26 christos Exp $ */
/*
* Copyright (c) 2003 Jochen Kunz.
diff --git a/sys/dev/ic/i82596var.h b/sys/dev/ic/i82596var.h
index a011196b42f..9ba46758e92 100644
--- a/sys/dev/ic/i82596var.h
+++ b/sys/dev/ic/i82596var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82596var.h,v 1.4 2005/06/03 07:03:22 skrll Exp $ */
+/* $NetBSD: i82596var.h,v 1.5 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2003 Jochen Kunz.
diff --git a/sys/dev/ic/i82801lpcreg.h b/sys/dev/ic/i82801lpcreg.h
index 68f93a7e067..f029fc2772f 100644
--- a/sys/dev/ic/i82801lpcreg.h
+++ b/sys/dev/ic/i82801lpcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82801lpcreg.h,v 1.2 2004/07/31 17:28:36 mrg Exp $ */
+/* $NetBSD: i82801lpcreg.h,v 1.3 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/iavc.c b/sys/dev/ic/iavc.c
index ec663a0ee7f..cf6a93df736 100644
--- a/sys/dev/ic/iavc.c
+++ b/sys/dev/ic/iavc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iavc.c,v 1.3 2005/07/09 02:05:09 christos Exp $ */
+/* $NetBSD: iavc.c,v 1.4 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.3 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.4 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/ic/iavcreg.h b/sys/dev/ic/iavcreg.h
index 1ef0cc6239f..34379c89925 100644
--- a/sys/dev/ic/iavcreg.h
+++ b/sys/dev/ic/iavcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iavcreg.h,v 1.1 2003/09/25 15:53:26 pooka Exp $ */
+/* $NetBSD: iavcreg.h,v 1.2 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved.
diff --git a/sys/dev/ic/iavcvar.h b/sys/dev/ic/iavcvar.h
index 45b91fcb35a..56a2fabd9a8 100644
--- a/sys/dev/ic/iavcvar.h
+++ b/sys/dev/ic/iavcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iavcvar.h,v 1.2 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: iavcvar.h,v 1.3 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved.
diff --git a/sys/dev/ic/ibm561.c b/sys/dev/ic/ibm561.c
index ef6f5b66c51..c29304fd517 100644
--- a/sys/dev/ic/ibm561.c
+++ b/sys/dev/ic/ibm561.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm561.c,v 1.6 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: ibm561.c,v 1.7 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibm561.c,v 1.6 2005/02/04 02:10:36 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibm561.c,v 1.7 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/ibm561var.h b/sys/dev/ic/ibm561var.h
index 4abc8a2c1c7..674120872f4 100644
--- a/sys/dev/ic/ibm561var.h
+++ b/sys/dev/ic/ibm561var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ibm561var.h,v 1.3 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: ibm561var.h,v 1.4 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/icp.c b/sys/dev/ic/icp.c
index 92d14a893e7..e9f6b0cda51 100644
--- a/sys/dev/ic/icp.c
+++ b/sys/dev/ic/icp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icp.c,v 1.16 2005/08/25 22:33:19 drochner Exp $ */
+/* $NetBSD: icp.c,v 1.17 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.16 2005/08/25 22:33:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp.c,v 1.17 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/icp_ioctl.c b/sys/dev/ic/icp_ioctl.c
index 4379bb548c5..56ebdb0be6b 100644
--- a/sys/dev/ic/icp_ioctl.c
+++ b/sys/dev/ic/icp_ioctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icp_ioctl.c,v 1.7 2005/05/30 04:43:46 christos Exp $ */
+/* $NetBSD: icp_ioctl.c,v 1.8 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp_ioctl.c,v 1.7 2005/05/30 04:43:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp_ioctl.c,v 1.8 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,7 +109,7 @@ static struct lock icp_ioctl_mutex =
LOCK_INITIALIZER(PRIBIO|PCATCH, "icplk", 0, 0);
static int
-icpopen(dev_t dev, int flag, int mode, struct proc *p)
+icpopen(dev_t dev, int flag, int mode, struct lwp *l)
{
if (securelevel > 1)
@@ -121,7 +121,7 @@ icpopen(dev_t dev, int flag, int mode, struct proc *p)
}
static int
-icpioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+icpioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int error;
diff --git a/sys/dev/ic/icp_ioctl.h b/sys/dev/ic/icp_ioctl.h
index 825f127f196..3c65cd8576f 100644
--- a/sys/dev/ic/icp_ioctl.h
+++ b/sys/dev/ic/icp_ioctl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: icp_ioctl.h,v 1.4 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: icp_ioctl.h,v 1.5 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2000-03 Intel Corporation
diff --git a/sys/dev/ic/icpreg.h b/sys/dev/ic/icpreg.h
index 7d371c6b5ec..4e0137a8ce1 100644
--- a/sys/dev/ic/icpreg.h
+++ b/sys/dev/ic/icpreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: icpreg.h,v 1.4 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: icpreg.h,v 1.5 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/icpsp.c b/sys/dev/ic/icpsp.c
index 04da3ae203d..1f118a2d55d 100644
--- a/sys/dev/ic/icpsp.c
+++ b/sys/dev/ic/icpsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icpsp.c,v 1.11 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: icpsp.c,v 1.12 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.11 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icpsp.c,v 1.12 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/icpvar.h b/sys/dev/ic/icpvar.h
index 80ea7e6b038..c6aa1eb3b0a 100644
--- a/sys/dev/ic/icpvar.h
+++ b/sys/dev/ic/icpvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: icpvar.h,v 1.6 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: icpvar.h,v 1.7 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/ics2101reg.h b/sys/dev/ic/ics2101reg.h
index ea98a7a08fe..759e5f02d31 100644
--- a/sys/dev/ic/ics2101reg.h
+++ b/sys/dev/ic/ics2101reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ics2101reg.h,v 1.5 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: ics2101reg.h,v 1.6 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/igsfb.c b/sys/dev/ic/igsfb.c
index 47ef333e841..2c801253204 100644
--- a/sys/dev/ic/igsfb.c
+++ b/sys/dev/ic/igsfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfb.c,v 1.25 2005/10/01 01:10:50 macallan Exp $ */
+/* $NetBSD: igsfb.c,v 1.26 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Valeriy E. Ushakov
@@ -31,7 +31,7 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.25 2005/10/01 01:10:50 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb.c,v 1.26 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,7 +82,7 @@ static const struct wsscreen_list igsfb_screenlist = {
* wsdisplay_accessops
*/
-static int igsfb_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int igsfb_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t igsfb_mmap(void *, off_t, int);
static int igsfb_alloc_screen(void *, const struct wsscreen_descr *,
@@ -600,12 +600,12 @@ igsfb_mmap(v, offset, prot)
* wsdisplay_accessops: ioctl()
*/
static int
-igsfb_ioctl(v, cmd, data, flag, p)
+igsfb_ioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct igsfb_devconfig *dc = v;
struct rasops_info *ri;
diff --git a/sys/dev/ic/igsfb_subr.c b/sys/dev/ic/igsfb_subr.c
index eaaccb22f75..07b0ec65461 100644
--- a/sys/dev/ic/igsfb_subr.c
+++ b/sys/dev/ic/igsfb_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfb_subr.c,v 1.4 2004/11/26 22:29:36 uwe Exp $ */
+/* $NetBSD: igsfb_subr.c,v 1.5 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -31,7 +31,7 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb_subr.c,v 1.4 2004/11/26 22:29:36 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb_subr.c,v 1.5 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/igsfbreg.h b/sys/dev/ic/igsfbreg.h
index 953fbc58182..a3d7ed56719 100644
--- a/sys/dev/ic/igsfbreg.h
+++ b/sys/dev/ic/igsfbreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfbreg.h,v 1.6 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: igsfbreg.h,v 1.7 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
diff --git a/sys/dev/ic/igsfbvar.h b/sys/dev/ic/igsfbvar.h
index 45087f025e6..a1366546092 100644
--- a/sys/dev/ic/igsfbvar.h
+++ b/sys/dev/ic/igsfbvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfbvar.h,v 1.9 2004/11/26 22:29:36 uwe Exp $ */
+/* $NetBSD: igsfbvar.h,v 1.10 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Valeriy E. Ushakov
diff --git a/sys/dev/ic/iha.c b/sys/dev/ic/iha.c
index a1083e0c49c..9d75dfa8c60 100644
--- a/sys/dev/ic/iha.c
+++ b/sys/dev/ic/iha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iha.c,v 1.29 2005/05/30 04:43:46 christos Exp $ */
+/* $NetBSD: iha.c,v 1.30 2005/12/11 12:21:27 christos Exp $ */
/*-
* Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.29 2005/05/30 04:43:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iha.c,v 1.30 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/ihareg.h b/sys/dev/ic/ihareg.h
index b08ddcf1472..dfb572fb80c 100644
--- a/sys/dev/ic/ihareg.h
+++ b/sys/dev/ic/ihareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ihareg.h,v 1.7 2003/11/02 11:07:45 wiz Exp $ */
+/* $NetBSD: ihareg.h,v 1.8 2005/12/11 12:21:27 christos Exp $ */
/*-
* Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller.
diff --git a/sys/dev/ic/ihavar.h b/sys/dev/ic/ihavar.h
index 0e744eab7fd..a38b0bf71a0 100644
--- a/sys/dev/ic/ihavar.h
+++ b/sys/dev/ic/ihavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ihavar.h,v 1.9 2005/01/02 12:22:19 tsutsui Exp $ */
+/* $NetBSD: ihavar.h,v 1.10 2005/12/11 12:21:27 christos Exp $ */
/*-
* Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller.
diff --git a/sys/dev/ic/iic_cpcbus.c b/sys/dev/ic/iic_cpcbus.c
index 9999da52445..0d06ec79232 100644
--- a/sys/dev/ic/iic_cpcbus.c
+++ b/sys/dev/ic/iic_cpcbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iic_cpcbus.c,v 1.6 2003/07/14 15:47:10 lukem Exp $ */
+/* $NetBSD: iic_cpcbus.c,v 1.7 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iic_cpcbus.c,v 1.6 2003/07/14 15:47:10 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iic_cpcbus.c,v 1.7 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/ims332reg.h b/sys/dev/ic/ims332reg.h
index 6ab971905f9..44396c40fd0 100644
--- a/sys/dev/ic/ims332reg.h
+++ b/sys/dev/ic/ims332reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ims332reg.h,v 1.2 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: ims332reg.h,v 1.3 2005/12/11 12:21:27 christos Exp $ */
/*
* Mach Operating System
diff --git a/sys/dev/ic/intersil7170.c b/sys/dev/ic/intersil7170.c
index 8ce1885e1fb..0cec7585d18 100644
--- a/sys/dev/ic/intersil7170.c
+++ b/sys/dev/ic/intersil7170.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intersil7170.c,v 1.4 2005/06/04 20:14:25 he Exp $ */
+/* $NetBSD: intersil7170.c,v 1.5 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intersil7170.c,v 1.4 2005/06/04 20:14:25 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intersil7170.c,v 1.5 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
diff --git a/sys/dev/ic/interwave.c b/sys/dev/ic/interwave.c
index 8caa0c8daac..687c317546e 100644
--- a/sys/dev/ic/interwave.c
+++ b/sys/dev/ic/interwave.c
@@ -1,4 +1,4 @@
-/* $NetBSD: interwave.c,v 1.26 2005/05/30 04:43:46 christos Exp $ */
+/* $NetBSD: interwave.c,v 1.27 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.26 2005/05/30 04:43:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interwave.c,v 1.27 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/interwavereg.h b/sys/dev/ic/interwavereg.h
index af77bb43e86..b853f21a9d5 100644
--- a/sys/dev/ic/interwavereg.h
+++ b/sys/dev/ic/interwavereg.h
@@ -1,7 +1,7 @@
#ifndef INTERWAVEREG_H
#define INTERWAVEREG_H
-/* $NetBSD: interwavereg.h,v 1.7 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: interwavereg.h,v 1.8 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/interwavevar.h b/sys/dev/ic/interwavevar.h
index fd1113daeb5..9241b17a6d0 100644
--- a/sys/dev/ic/interwavevar.h
+++ b/sys/dev/ic/interwavevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: interwavevar.h,v 1.14 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: interwavevar.h,v 1.15 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/ipac.h b/sys/dev/ic/ipac.h
index aa370fa9036..8e6fc5b43c4 100644
--- a/sys/dev/ic/ipac.h
+++ b/sys/dev/ic/ipac.h
@@ -27,7 +27,7 @@
* i4b_ipac.h - definitions for the Siemens IPAC PSB2115 chip
* ==========================================================
*
- * $Id: ipac.h,v 1.2 2005/02/27 00:27:01 perry Exp $
+ * $Id: ipac.h,v 1.3 2005/12/11 12:21:27 christos Exp $
*
* last edit-date: [Thu Jan 6 14:54:19 2000]
*
diff --git a/sys/dev/ic/isac.c b/sys/dev/ic/isac.c
index ec4d9feb7b8..37aab8ab380 100644
--- a/sys/dev/ic/isac.c
+++ b/sys/dev/ic/isac.c
@@ -27,14 +27,14 @@
* i4b_isac.c - i4b siemens isdn chipset driver ISAC handler
* ---------------------------------------------------------
*
- * $Id: isac.c,v 1.19 2005/02/27 00:27:01 perry Exp $
+ * $Id: isac.c,v 1.20 2005/12/11 12:21:27 christos Exp $
*
* last edit-date: [Fri Jan 5 11:36:10 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isac.c,v 1.19 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isac.c,v 1.20 2005/12/11 12:21:27 christos Exp $");
#ifdef __FreeBSD__
#include "opt_i4b.h"
diff --git a/sys/dev/ic/isac.h b/sys/dev/ic/isac.h
index 93ae2aac20b..3108076b040 100644
--- a/sys/dev/ic/isac.h
+++ b/sys/dev/ic/isac.h
@@ -30,7 +30,7 @@
*
*---------------------------------------------------------------------------
*
- * $Id: isac.h,v 1.2 2005/02/27 00:27:01 perry Exp $
+ * $Id: isac.h,v 1.3 2005/12/11 12:21:27 christos Exp $
*
* last edit-date: [Sun Feb 14 10:27:13 1999]
*
diff --git a/sys/dev/ic/isacsx.c b/sys/dev/ic/isacsx.c
index cd6da177126..aeb9d9a0682 100644
--- a/sys/dev/ic/isacsx.c
+++ b/sys/dev/ic/isacsx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isacsx.c,v 1.3 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: isacsx.c,v 1.4 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
* Copyright (c) 2001 Gary Jennejohn. All rights reserved.
@@ -29,7 +29,7 @@
* i4b_ifpi2_isac.c - i4b Fritz PCI Version 2 ISACSX handler
* --------------------------------------------
*
- * $Id: isacsx.c,v 1.3 2005/02/27 00:27:01 perry Exp $
+ * $Id: isacsx.c,v 1.4 2005/12/11 12:21:27 christos Exp $
*
* $FreeBSD: src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c,v 1.3 2002/09/02 00:52:07 brooks Exp $
*
@@ -37,7 +37,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isacsx.c,v 1.3 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isacsx.c,v 1.4 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/isacsx.h b/sys/dev/ic/isacsx.h
index f10fe4d149b..44e825f3e3e 100644
--- a/sys/dev/ic/isacsx.h
+++ b/sys/dev/ic/isacsx.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isacsx.h,v 1.2 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: isacsx.h,v 1.3 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2001 Gary Jennejohn. All rights reserved.
*
diff --git a/sys/dev/ic/isic.c b/sys/dev/ic/isic.c
index 79561cb3fcc..d62f993f8da 100644
--- a/sys/dev/ic/isic.c
+++ b/sys/dev/ic/isic.c
@@ -27,14 +27,14 @@
* i4b_isic.c - global isic stuff
* ==============================
*
- * $Id: isic.c,v 1.21 2005/02/27 00:27:01 perry Exp $
+ * $Id: isic.c,v 1.22 2005/12/11 12:21:27 christos Exp $
*
* last edit-date: [Fri Jan 5 11:36:10 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic.c,v 1.21 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic.c,v 1.22 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/ioccom.h>
diff --git a/sys/dev/ic/isic_bchan.c b/sys/dev/ic/isic_bchan.c
index 75e239be6e3..14b66dde45b 100644
--- a/sys/dev/ic/isic_bchan.c
+++ b/sys/dev/ic/isic_bchan.c
@@ -27,14 +27,14 @@
* i4b_bchan.c - B channel handling L1 procedures
* ----------------------------------------------
*
- * $Id: isic_bchan.c,v 1.10 2005/02/27 00:27:01 perry Exp $
+ * $Id: isic_bchan.c,v 1.11 2005/12/11 12:21:27 christos Exp $
*
* last edit-date: [Fri Jan 5 11:36:11 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_bchan.c,v 1.10 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_bchan.c,v 1.11 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
diff --git a/sys/dev/ic/isic_l1.c b/sys/dev/ic/isic_l1.c
index 58f99100a04..ef548d299f5 100644
--- a/sys/dev/ic/isic_l1.c
+++ b/sys/dev/ic/isic_l1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_l1.c,v 1.15 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: isic_l1.c,v 1.16 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_l1.c,v 1.15 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_l1.c,v 1.16 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
diff --git a/sys/dev/ic/isic_l1.h b/sys/dev/ic/isic_l1.h
index 17e045a8ef7..ff2757568e2 100644
--- a/sys/dev/ic/isic_l1.h
+++ b/sys/dev/ic/isic_l1.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_l1.h,v 1.19 2005/06/13 20:32:58 jmc Exp $ */
+/* $NetBSD: isic_l1.h,v 1.20 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
diff --git a/sys/dev/ic/isic_l1fsm.c b/sys/dev/ic/isic_l1fsm.c
index f367a7d8afe..cd4e05f424f 100644
--- a/sys/dev/ic/isic_l1fsm.c
+++ b/sys/dev/ic/isic_l1fsm.c
@@ -27,14 +27,14 @@
* i4b_l1fsm.c - isdn4bsd layer 1 I.430 state machine
* --------------------------------------------------
*
- * $Id: isic_l1fsm.c,v 1.11 2005/06/01 18:16:22 drochner Exp $
+ * $Id: isic_l1fsm.c,v 1.12 2005/12/11 12:21:27 christos Exp $
*
* last edit-date: [Fri Jan 5 11:36:11 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_l1fsm.c,v 1.11 2005/06/01 18:16:22 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_l1fsm.c,v 1.12 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#if defined(__FreeBSD__) && __FreeBSD__ >= 3
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c
index fa038f7cf55..cca3524f7a6 100644
--- a/sys/dev/ic/isp.c
+++ b/sys/dev/ic/isp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp.c,v 1.107 2005/05/30 04:43:46 christos Exp $ */
+/* $NetBSD: isp.c,v 1.108 2005/12/11 12:21:27 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.107 2005/05/30 04:43:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.108 2005/12/11 12:21:27 christos Exp $");
#ifdef __NetBSD__
#include <dev/ic/isp_netbsd.h>
diff --git a/sys/dev/ic/isp_inline.h b/sys/dev/ic/isp_inline.h
index 8d2be568982..ab7ce03e9a4 100644
--- a/sys/dev/ic/isp_inline.h
+++ b/sys/dev/ic/isp_inline.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_inline.h,v 1.26 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: isp_inline.h,v 1.27 2005/12/11 12:21:27 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
diff --git a/sys/dev/ic/isp_ioctl.h b/sys/dev/ic/isp_ioctl.h
index b2585447326..2195e6af7cc 100644
--- a/sys/dev/ic/isp_ioctl.h
+++ b/sys/dev/ic/isp_ioctl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_ioctl.h,v 1.6 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: isp_ioctl.h,v 1.7 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2001 by Matthew Jacob
*
diff --git a/sys/dev/ic/isp_netbsd.c b/sys/dev/ic/isp_netbsd.c
index f5eb4c4a71c..77477193769 100644
--- a/sys/dev/ic/isp_netbsd.c
+++ b/sys/dev/ic/isp_netbsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_netbsd.c,v 1.66 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: isp_netbsd.c,v 1.67 2005/12/11 12:21:27 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.66 2005/05/30 04:43:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_netbsd.c,v 1.67 2005/12/11 12:21:27 christos Exp $");
#include <dev/ic/isp_netbsd.h>
#include <sys/scsiio.h>
diff --git a/sys/dev/ic/isp_netbsd.h b/sys/dev/ic/isp_netbsd.h
index 87e4fb05f7f..001cab6fa31 100644
--- a/sys/dev/ic/isp_netbsd.h
+++ b/sys/dev/ic/isp_netbsd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_netbsd.h,v 1.53 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: isp_netbsd.h,v 1.54 2005/12/11 12:21:27 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
diff --git a/sys/dev/ic/isp_target.c b/sys/dev/ic/isp_target.c
index 16c29670146..1cb9daf8369 100644
--- a/sys/dev/ic/isp_target.c
+++ b/sys/dev/ic/isp_target.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_target.c,v 1.27 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: isp_target.c,v 1.28 2005/12/11 12:21:27 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_target.c,v 1.27 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_target.c,v 1.28 2005/12/11 12:21:27 christos Exp $");
#ifdef __NetBSD__
#include <dev/ic/isp_netbsd.h>
diff --git a/sys/dev/ic/isp_target.h b/sys/dev/ic/isp_target.h
index 1a866e2fbc7..d035e96818d 100644
--- a/sys/dev/ic/isp_target.h
+++ b/sys/dev/ic/isp_target.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_target.h,v 1.21 2003/12/04 13:57:30 keihan Exp $ */
+/* $NetBSD: isp_target.h,v 1.22 2005/12/11 12:21:27 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
diff --git a/sys/dev/ic/isp_tpublic.h b/sys/dev/ic/isp_tpublic.h
index a7b5ebe159a..ca3086b9233 100644
--- a/sys/dev/ic/isp_tpublic.h
+++ b/sys/dev/ic/isp_tpublic.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_tpublic.h,v 1.13 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: isp_tpublic.h,v 1.14 2005/12/11 12:21:27 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
diff --git a/sys/dev/ic/ispmbox.h b/sys/dev/ic/ispmbox.h
index addba6bf897..485d6e90478 100644
--- a/sys/dev/ic/ispmbox.h
+++ b/sys/dev/ic/ispmbox.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ispmbox.h,v 1.48 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: ispmbox.h,v 1.49 2005/12/11 12:21:27 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
diff --git a/sys/dev/ic/ispreg.h b/sys/dev/ic/ispreg.h
index 34453e9a49d..16faf7afb34 100644
--- a/sys/dev/ic/ispreg.h
+++ b/sys/dev/ic/ispreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ispreg.h,v 1.29 2003/12/04 13:57:30 keihan Exp $ */
+/* $NetBSD: ispreg.h,v 1.30 2005/12/11 12:21:27 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
diff --git a/sys/dev/ic/ispvar.h b/sys/dev/ic/ispvar.h
index 210e9b2d772..eb95adb7349 100644
--- a/sys/dev/ic/ispvar.h
+++ b/sys/dev/ic/ispvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ispvar.h,v 1.63 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: ispvar.h,v 1.64 2005/12/11 12:21:27 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
diff --git a/sys/dev/ic/joy.c b/sys/dev/ic/joy.c
index 2624c9696e8..f9a6e7d86ca 100644
--- a/sys/dev/ic/joy.c
+++ b/sys/dev/ic/joy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy.c,v 1.8 2004/08/03 18:35:21 drochner Exp $ */
+/* $NetBSD: joy.c,v 1.9 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 1995 Jean-Marc Zucconi
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy.c,v 1.8 2004/08/03 18:35:21 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy.c,v 1.9 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -106,10 +106,10 @@ joydetach(sc, flags)
}
int
-joyopen(dev, flag, mode, p)
+joyopen(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = JOYUNIT(dev);
int i = JOYPART(dev);
@@ -130,10 +130,10 @@ joyopen(dev, flag, mode, p)
}
int
-joyclose(dev, flag, mode, p)
+joyclose(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = JOYUNIT(dev);
int i = JOYPART(dev);
@@ -189,12 +189,12 @@ joyread(dev, uio, flag)
}
int
-joyioctl(dev, cmd, data, flag, p)
+joyioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int unit = JOYUNIT(dev);
struct joy_softc *sc = joy_cd.cd_devs[unit];
diff --git a/sys/dev/ic/joyvar.h b/sys/dev/ic/joyvar.h
index f4c04c4f331..c454a644fae 100644
--- a/sys/dev/ic/joyvar.h
+++ b/sys/dev/ic/joyvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: joyvar.h,v 1.4 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: joyvar.h,v 1.5 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 1995 Jean-Marc Zucconi
diff --git a/sys/dev/ic/lance.c b/sys/dev/ic/lance.c
index abd51870dd1..bfca13daff4 100644
--- a/sys/dev/ic/lance.c
+++ b/sys/dev/ic/lance.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lance.c,v 1.32 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: lance.c,v 1.33 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.32 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lance.c,v 1.33 2005/12/11 12:21:27 christos Exp $");
#include "opt_ccitt.h"
#include "opt_llc.h"
diff --git a/sys/dev/ic/lancereg.h b/sys/dev/ic/lancereg.h
index 20c7c01e5ca..eee1d7993d8 100644
--- a/sys/dev/ic/lancereg.h
+++ b/sys/dev/ic/lancereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lancereg.h,v 1.11 2003/11/02 11:07:45 wiz Exp $ */
+/* $NetBSD: lancereg.h,v 1.12 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/lancevar.h b/sys/dev/ic/lancevar.h
index d07683887f0..c6ed21c9761 100644
--- a/sys/dev/ic/lancevar.h
+++ b/sys/dev/ic/lancevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lancevar.h,v 1.9 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: lancevar.h,v 1.10 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/lcdkp_subr.c b/sys/dev/ic/lcdkp_subr.c
index b44d516aaa3..cfe8e249d99 100644
--- a/sys/dev/ic/lcdkp_subr.c
+++ b/sys/dev/ic/lcdkp_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lcdkp_subr.c,v 1.3 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: lcdkp_subr.c,v 1.4 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lcdkp_subr.c,v 1.3 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lcdkp_subr.c,v 1.4 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/ld_aac.c b/sys/dev/ic/ld_aac.c
index 4031c3efbcf..a04d4a69c3c 100644
--- a/sys/dev/ic/ld_aac.c
+++ b/sys/dev/ic/ld_aac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_aac.c,v 1.8 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: ld_aac.c,v 1.9 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.8 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_aac.c,v 1.9 2005/12/11 12:21:27 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/ic/ld_cac.c b/sys/dev/ic/ld_cac.c
index a02f46147bd..539d3d33e73 100644
--- a/sys/dev/ic/ld_cac.c
+++ b/sys/dev/ic/ld_cac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_cac.c,v 1.11 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: ld_cac.c,v 1.12 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.11 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_cac.c,v 1.12 2005/12/11 12:21:27 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/ic/ld_icp.c b/sys/dev/ic/ld_icp.c
index f843cb467b7..2d7c2bab0b5 100644
--- a/sys/dev/ic/ld_icp.c
+++ b/sys/dev/ic/ld_icp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_icp.c,v 1.11 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: ld_icp.c,v 1.12 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.11 2005/02/27 00:27:01 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_icp.c,v 1.12 2005/12/11 12:21:27 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/ic/ld_mlx.c b/sys/dev/ic/ld_mlx.c
index aa6dc24a607..64bf83b94fd 100644
--- a/sys/dev/ic/ld_mlx.c
+++ b/sys/dev/ic/ld_mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_mlx.c,v 1.9 2005/02/08 05:16:17 briggs Exp $ */
+/* $NetBSD: ld_mlx.c,v 1.10 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.9 2005/02/08 05:16:17 briggs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_mlx.c,v 1.10 2005/12/11 12:21:27 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c
index 914a56a7cfd..35022745195 100644
--- a/sys/dev/ic/lemac.c
+++ b/sys/dev/ic/lemac.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lemac.c,v 1.28 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: lemac.c,v 1.29 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.28 2005/05/30 04:43:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lemac.c,v 1.29 2005/12/11 12:21:27 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/ic/lemacreg.h b/sys/dev/ic/lemacreg.h
index 6b8061d17bd..6fccab9fe1d 100644
--- a/sys/dev/ic/lemacreg.h
+++ b/sys/dev/ic/lemacreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lemacreg.h,v 1.4 2005/02/27 00:27:01 perry Exp $ */
+/* $NetBSD: lemacreg.h,v 1.5 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com>
diff --git a/sys/dev/ic/lemacvar.h b/sys/dev/ic/lemacvar.h
index dd12e8fd54c..0300026c5c1 100644
--- a/sys/dev/ic/lemacvar.h
+++ b/sys/dev/ic/lemacvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lemacvar.h,v 1.8 2003/11/02 11:07:45 wiz Exp $ */
+/* $NetBSD: lemacvar.h,v 1.9 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1997 Matt Thomas <matt@3am-software.com>
diff --git a/sys/dev/ic/lm700x.c b/sys/dev/ic/lm700x.c
index aa79026ec84..66b6738a388 100644
--- a/sys/dev/ic/lm700x.c
+++ b/sys/dev/ic/lm700x.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lm700x.c,v 1.2 2003/07/14 15:47:11 lukem Exp $ */
+/* $NetBSD: lm700x.c,v 1.3 2005/12/11 12:21:27 christos Exp $ */
/* $OpenBSD: lm700x.c,v 1.2 2001/12/06 16:28:18 mickey Exp $ */
/*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm700x.c,v 1.2 2003/07/14 15:47:11 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm700x.c,v 1.3 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/radioio.h>
diff --git a/sys/dev/ic/lpt.c b/sys/dev/ic/lpt.c
index bd55ab7e165..75a3968f41b 100644
--- a/sys/dev/ic/lpt.c
+++ b/sys/dev/ic/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.64 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: lpt.c,v 1.65 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.64 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.65 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,11 +127,11 @@ lpt_attach_subr(sc)
* Reset the printer, then wait until it's selected and not busy.
*/
int
-lptopen(dev, flag, mode, p)
+lptopen(dev, flag, mode, l)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct lwp *l;
{
u_char flags = LPTFLAGS(dev);
struct lpt_softc *sc;
@@ -252,11 +252,11 @@ lptwakeup(arg)
* Close the device, and free the local line buffer.
*/
int
-lptclose(dev, flag, mode, p)
+lptclose(dev, flag, mode, l)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct lpt_softc *sc = device_lookup(&lpt_cd, LPTUNIT(dev));
bus_space_tag_t iot = sc->sc_iot;
@@ -419,12 +419,12 @@ lptintr(arg)
}
int
-lptioctl(dev, cmd, data, flag, p)
+lptioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int error = 0;
diff --git a/sys/dev/ic/lpt_upc.c b/sys/dev/ic/lpt_upc.c
index dac125c70fd..98ae8ccffcf 100644
--- a/sys/dev/ic/lpt_upc.c
+++ b/sys/dev/ic/lpt_upc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_upc.c,v 1.6 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: lpt_upc.c,v 1.7 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@@ -28,7 +28,7 @@
/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_upc.c,v 1.6 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_upc.c,v 1.7 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/lptreg.h b/sys/dev/ic/lptreg.h
index 735907abdf1..5651f64d142 100644
--- a/sys/dev/ic/lptreg.h
+++ b/sys/dev/ic/lptreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lptreg.h,v 1.8 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: lptreg.h,v 1.9 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
diff --git a/sys/dev/ic/lptvar.h b/sys/dev/ic/lptvar.h
index 0b2678ce5cf..acfd977e5f5 100644
--- a/sys/dev/ic/lptvar.h
+++ b/sys/dev/ic/lptvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lptvar.h,v 1.52 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: lptvar.h,v 1.53 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1993, 1994 Charles M. Hannum.
diff --git a/sys/dev/ic/lsi64854.c b/sys/dev/ic/lsi64854.c
index 2dc1c429bd6..0ac90bacd4e 100644
--- a/sys/dev/ic/lsi64854.c
+++ b/sys/dev/ic/lsi64854.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lsi64854.c,v 1.26 2005/05/31 00:46:05 christos Exp $ */
+/* $NetBSD: lsi64854.c,v 1.27 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.26 2005/05/31 00:46:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.27 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/lsi64854var.h b/sys/dev/ic/lsi64854var.h
index 18cc4f0d4ac..a64a925d0a9 100644
--- a/sys/dev/ic/lsi64854var.h
+++ b/sys/dev/ic/lsi64854var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lsi64854var.h,v 1.7 2005/05/31 00:46:05 christos Exp $ */
+/* $NetBSD: lsi64854var.h,v 1.8 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/matrixkp_subr.c b/sys/dev/ic/matrixkp_subr.c
index 6b926fdb4bc..0c672f68053 100644
--- a/sys/dev/ic/matrixkp_subr.c
+++ b/sys/dev/ic/matrixkp_subr.c
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: matrixkp_subr.c,v 1.2 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: matrixkp_subr.c,v 1.3 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/max2820reg.h b/sys/dev/ic/max2820reg.h
index 9337b8a27c6..e47595c6291 100644
--- a/sys/dev/ic/max2820reg.h
+++ b/sys/dev/ic/max2820reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: max2820reg.h,v 1.2 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: max2820reg.h,v 1.3 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2004 David Young. All rights reserved.
diff --git a/sys/dev/ic/mb86950.c b/sys/dev/ic/mb86950.c
index 389deeb0992..ea4c12e4beb 100644
--- a/sys/dev/ic/mb86950.c
+++ b/sys/dev/ic/mb86950.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86950.c,v 1.2 2005/04/03 11:37:19 jdolecek Exp $ */
+/* $NetBSD: mb86950.c,v 1.3 2005/12/11 12:21:27 christos Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.2 2005/04/03 11:37:19 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.3 2005/12/11 12:21:27 christos Exp $");
/*
* Device driver for Fujitsu mb86950 based Ethernet cards.
diff --git a/sys/dev/ic/mb86950reg.h b/sys/dev/ic/mb86950reg.h
index 2029472c6bd..8c8bb64e39b 100644
--- a/sys/dev/ic/mb86950reg.h
+++ b/sys/dev/ic/mb86950reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86950reg.h,v 1.2 2005/04/03 11:37:19 jdolecek Exp $ */
+/* $NetBSD: mb86950reg.h,v 1.3 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
diff --git a/sys/dev/ic/mb86950var.h b/sys/dev/ic/mb86950var.h
index 9a15fde2e80..dd855354b7a 100644
--- a/sys/dev/ic/mb86950var.h
+++ b/sys/dev/ic/mb86950var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86950var.h,v 1.2 2005/04/03 11:37:19 jdolecek Exp $ */
+/* $NetBSD: mb86950var.h,v 1.3 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
diff --git a/sys/dev/ic/mb86960.c b/sys/dev/ic/mb86960.c
index ce4923771ae..5bb2ffae648 100644
--- a/sys/dev/ic/mb86960.c
+++ b/sys/dev/ic/mb86960.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960.c,v 1.60 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: mb86960.c,v 1.61 2005/12/11 12:21:27 christos Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.60 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86960.c,v 1.61 2005/12/11 12:21:27 christos Exp $");
/*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
diff --git a/sys/dev/ic/mb86960reg.h b/sys/dev/ic/mb86960reg.h
index 862288fcf6a..8daa2887eb5 100644
--- a/sys/dev/ic/mb86960reg.h
+++ b/sys/dev/ic/mb86960reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960reg.h,v 1.9 2003/11/02 11:07:45 wiz Exp $ */
+/* $NetBSD: mb86960reg.h,v 1.10 2005/12/11 12:21:27 christos Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
diff --git a/sys/dev/ic/mb86960var.h b/sys/dev/ic/mb86960var.h
index c2c1183375e..b99dfa0bbcf 100644
--- a/sys/dev/ic/mb86960var.h
+++ b/sys/dev/ic/mb86960var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960var.h,v 1.34 2005/01/02 12:41:03 tsutsui Exp $ */
+/* $NetBSD: mb86960var.h,v 1.35 2005/12/11 12:21:27 christos Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
diff --git a/sys/dev/ic/mb89352.c b/sys/dev/ic/mb89352.c
index 7a3613fe20e..f804db90b1c 100644
--- a/sys/dev/ic/mb89352.c
+++ b/sys/dev/ic/mb89352.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb89352.c,v 1.38 2005/01/02 12:22:18 tsutsui Exp $ */
+/* $NetBSD: mb89352.c,v 1.39 2005/12/11 12:21:27 christos Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
/*-
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.38 2005/01/02 12:22:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.39 2005/12/11 12:21:27 christos Exp $");
#ifdef DDB
#define integrate
diff --git a/sys/dev/ic/mb89352reg.h b/sys/dev/ic/mb89352reg.h
index 075d3937b94..2dd025104ee 100644
--- a/sys/dev/ic/mb89352reg.h
+++ b/sys/dev/ic/mb89352reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mb89352reg.h,v 1.5 2004/03/24 15:38:42 wiz Exp $ */
+/* $NetBSD: mb89352reg.h,v 1.6 2005/12/11 12:21:27 christos Exp $ */
/* NecBSD: mb89352reg.h,v 1.3 1998/03/14 07:04:34 kmatsuda Exp */
/*-
diff --git a/sys/dev/ic/mb89352var.h b/sys/dev/ic/mb89352var.h
index 725a0d96032..d0fc99789bf 100644
--- a/sys/dev/ic/mb89352var.h
+++ b/sys/dev/ic/mb89352var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mb89352var.h,v 1.9 2004/12/07 22:23:45 thorpej Exp $ */
+/* $NetBSD: mb89352var.h,v 1.10 2005/12/11 12:21:27 christos Exp $ */
/* NecBSD: mb89352var.h,v 1.4 1998/03/14 07:31:22 kmatsuda Exp */
/*-
diff --git a/sys/dev/ic/mc146818.c b/sys/dev/ic/mc146818.c
index 2092d3c8dd1..431e84184ca 100644
--- a/sys/dev/ic/mc146818.c
+++ b/sys/dev/ic/mc146818.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mc146818.c,v 1.6 2005/06/04 20:14:25 he Exp $ */
+/* $NetBSD: mc146818.c,v 1.7 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2003 Izumi Tsutsui. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mc146818.c,v 1.6 2005/06/04 20:14:25 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mc146818.c,v 1.7 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/mc146818reg.h b/sys/dev/ic/mc146818reg.h
index 3d09e4c8588..b7c2a03f0e1 100644
--- a/sys/dev/ic/mc146818reg.h
+++ b/sys/dev/ic/mc146818reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mc146818reg.h,v 1.7 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: mc146818reg.h,v 1.8 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
diff --git a/sys/dev/ic/mc146818var.h b/sys/dev/ic/mc146818var.h
index 279d33f2de4..94ace6b0e35 100644
--- a/sys/dev/ic/mc146818var.h
+++ b/sys/dev/ic/mc146818var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mc146818var.h,v 1.3 2003/11/24 06:20:40 tsutsui Exp $ */
+/* $NetBSD: mc146818var.h,v 1.4 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2003 Izumi Tsutsui. All rights reserved.
diff --git a/sys/dev/ic/mc68450reg.h b/sys/dev/ic/mc68450reg.h
index 40efe1b7f58..c30ca3a9fc1 100644
--- a/sys/dev/ic/mc68450reg.h
+++ b/sys/dev/ic/mc68450reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mc68450reg.h,v 1.3 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: mc68450reg.h,v 1.4 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/mc6845reg.h b/sys/dev/ic/mc6845reg.h
index a735a05750d..5c88e3d3ccb 100644
--- a/sys/dev/ic/mc6845reg.h
+++ b/sys/dev/ic/mc6845reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mc6845reg.h,v 1.3 2004/03/24 17:26:53 drochner Exp $ */
+/* $NetBSD: mc6845reg.h,v 1.4 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 1998
diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c
index eace6ba94b5..3504f3faf89 100644
--- a/sys/dev/ic/midway.c
+++ b/sys/dev/ic/midway.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midway.c,v 1.67 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: midway.c,v 1.68 2005/12/11 12:21:27 christos Exp $ */
/* (sync'd to midway.c 1.68) */
/*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.67 2005/05/30 04:43:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.68 2005/12/11 12:21:27 christos Exp $");
#include "opt_natm.h"
diff --git a/sys/dev/ic/midwayreg.h b/sys/dev/ic/midwayreg.h
index 481d8ed50bf..624f994d595 100644
--- a/sys/dev/ic/midwayreg.h
+++ b/sys/dev/ic/midwayreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: midwayreg.h,v 1.12 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: midwayreg.h,v 1.13 2005/12/11 12:21:27 christos Exp $ */
/*
* m i d w a y r e g . h
diff --git a/sys/dev/ic/midwayvar.h b/sys/dev/ic/midwayvar.h
index 2cc717941d8..fc4784a191d 100644
--- a/sys/dev/ic/midwayvar.h
+++ b/sys/dev/ic/midwayvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: midwayvar.h,v 1.15 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: midwayvar.h,v 1.16 2005/12/11 12:21:27 christos Exp $ */
/*
*
diff --git a/sys/dev/ic/mk48txx.c b/sys/dev/ic/mk48txx.c
index 88834109a29..0a595b9597f 100644
--- a/sys/dev/ic/mk48txx.c
+++ b/sys/dev/ic/mk48txx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mk48txx.c,v 1.17 2005/06/04 20:14:25 he Exp $ */
+/* $NetBSD: mk48txx.c,v 1.18 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mk48txx.c,v 1.17 2005/06/04 20:14:25 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mk48txx.c,v 1.18 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/mk48txxreg.h b/sys/dev/ic/mk48txxreg.h
index f3debf1069c..a284203e644 100644
--- a/sys/dev/ic/mk48txxreg.h
+++ b/sys/dev/ic/mk48txxreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mk48txxreg.h,v 1.8 2004/12/30 12:36:29 bjh21 Exp $ */
+/* $NetBSD: mk48txxreg.h,v 1.9 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/ic/mk48txxvar.h b/sys/dev/ic/mk48txxvar.h
index 8c5742bf61c..ef288dcf09e 100644
--- a/sys/dev/ic/mk48txxvar.h
+++ b/sys/dev/ic/mk48txxvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mk48txxvar.h,v 1.1 2003/11/01 22:41:42 tsutsui Exp $ */
+/* $NetBSD: mk48txxvar.h,v 1.2 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/ic/mlx.c b/sys/dev/ic/mlx.c
index 12d9d1a3fdf..eb21ef9f5c4 100644
--- a/sys/dev/ic/mlx.c
+++ b/sys/dev/ic/mlx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx.c,v 1.36 2005/08/25 22:33:19 drochner Exp $ */
+/* $NetBSD: mlx.c,v 1.37 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.36 2005/08/25 22:33:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx.c,v 1.37 2005/12/11 12:21:27 christos Exp $");
#include "ld.h"
@@ -711,7 +711,7 @@ mlx_adjqparam(struct mlx_softc *mlx, int mpu, int slop)
* Accept an open operation on the control device.
*/
int
-mlxopen(dev_t dev, int flag, int mode, struct proc *p)
+mlxopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct mlx_softc *mlx;
@@ -730,7 +730,7 @@ mlxopen(dev_t dev, int flag, int mode, struct proc *p)
* Accept the last close on the control device.
*/
int
-mlxclose(dev_t dev, int flag, int mode, struct proc *p)
+mlxclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct mlx_softc *mlx;
@@ -743,7 +743,7 @@ mlxclose(dev_t dev, int flag, int mode, struct proc *p)
* Handle control operations.
*/
int
-mlxioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+mlxioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct mlx_softc *mlx;
struct mlx_rebuild_request *rb;
diff --git a/sys/dev/ic/mlxreg.h b/sys/dev/ic/mlxreg.h
index 6465197bc1f..e19c63c5f7f 100644
--- a/sys/dev/ic/mlxreg.h
+++ b/sys/dev/ic/mlxreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mlxreg.h,v 1.5 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: mlxreg.h,v 1.6 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/mlxvar.h b/sys/dev/ic/mlxvar.h
index 21e3d4a2cdd..ca3cce10011 100644
--- a/sys/dev/ic/mlxvar.h
+++ b/sys/dev/ic/mlxvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mlxvar.h,v 1.9 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: mlxvar.h,v 1.10 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/mm58167.c b/sys/dev/ic/mm58167.c
index 508d6ffaa24..238fbc2eebe 100644
--- a/sys/dev/ic/mm58167.c
+++ b/sys/dev/ic/mm58167.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mm58167.c,v 1.6 2005/06/04 20:14:25 he Exp $ */
+/* $NetBSD: mm58167.c,v 1.7 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mm58167.c,v 1.6 2005/06/04 20:14:25 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mm58167.c,v 1.7 2005/12/11 12:21:27 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
diff --git a/sys/dev/ic/mm58167var.h b/sys/dev/ic/mm58167var.h
index 19efb099b4e..56ec72183d5 100644
--- a/sys/dev/ic/mm58167var.h
+++ b/sys/dev/ic/mm58167var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mm58167var.h,v 1.3 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: mm58167var.h,v 1.4 2005/12/11 12:21:27 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/mpt.c b/sys/dev/ic/mpt.c
index 7771d369ae1..c963afe0afc 100644
--- a/sys/dev/ic/mpt.c
+++ b/sys/dev/ic/mpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt.c,v 1.5 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: mpt.c,v 1.6 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2000, 2001 by Greg Ansley
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt.c,v 1.5 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt.c,v 1.6 2005/12/11 12:21:27 christos Exp $");
#include <dev/ic/mpt.h>
diff --git a/sys/dev/ic/mpt.h b/sys/dev/ic/mpt.h
index c3d22fbe633..a40aeb3b940 100644
--- a/sys/dev/ic/mpt.h
+++ b/sys/dev/ic/mpt.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt.h,v 1.4 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: mpt.h,v 1.5 2005/12/11 12:21:27 christos Exp $ */
/*
* Copyright (c) 2000, 2001 by Greg Ansley
diff --git a/sys/dev/ic/mpt_debug.c b/sys/dev/ic/mpt_debug.c
index 45d8639744a..9d718d7c773 100644
--- a/sys/dev/ic/mpt_debug.c
+++ b/sys/dev/ic/mpt_debug.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_debug.c,v 1.3 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: mpt_debug.c,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2000, 2001 by Greg Ansley
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_debug.c,v 1.3 2005/05/30 04:43:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_debug.c,v 1.4 2005/12/11 12:21:28 christos Exp $");
#include <dev/ic/mpt.h>
diff --git a/sys/dev/ic/mpt_netbsd.c b/sys/dev/ic/mpt_netbsd.c
index c73af9e7784..ba94c0a0058 100644
--- a/sys/dev/ic/mpt_netbsd.c
+++ b/sys/dev/ic/mpt_netbsd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_netbsd.c,v 1.9 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: mpt_netbsd.c,v 1.10 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.9 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_netbsd.c,v 1.10 2005/12/11 12:21:28 christos Exp $");
#include <dev/ic/mpt.h> /* pulls in all headers */
diff --git a/sys/dev/ic/mpt_netbsd.h b/sys/dev/ic/mpt_netbsd.h
index 52733bdbb1b..dc16353e072 100644
--- a/sys/dev/ic/mpt_netbsd.h
+++ b/sys/dev/ic/mpt_netbsd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_netbsd.h,v 1.3 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: mpt_netbsd.h,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/ic/mpu.c b/sys/dev/ic/mpu.c
index 68de78a09b0..21b8bb4726c 100644
--- a/sys/dev/ic/mpu.c
+++ b/sys/dev/ic/mpu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu.c,v 1.10 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: mpu.c,v 1.11 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu.c,v 1.10 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu.c,v 1.11 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/mpuvar.h b/sys/dev/ic/mpuvar.h
index 69c2d661375..4b7b29f8414 100644
--- a/sys/dev/ic/mpuvar.h
+++ b/sys/dev/ic/mpuvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mpuvar.h,v 1.7 2005/05/29 22:10:28 christos Exp $ */
+/* $NetBSD: mpuvar.h,v 1.8 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/msm6258.c b/sys/dev/ic/msm6258.c
index 2b10027458f..8ea83d9f1d1 100644
--- a/sys/dev/ic/msm6258.c
+++ b/sys/dev/ic/msm6258.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msm6258.c,v 1.13 2005/06/08 13:54:38 he Exp $ */
+/* $NetBSD: msm6258.c,v 1.14 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msm6258.c,v 1.13 2005/06/08 13:54:38 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msm6258.c,v 1.14 2005/12/11 12:21:28 christos Exp $");
#include <sys/systm.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/msm6258var.h b/sys/dev/ic/msm6258var.h
index bb742e46139..a20edd47353 100644
--- a/sys/dev/ic/msm6258var.h
+++ b/sys/dev/ic/msm6258var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: msm6258var.h,v 1.6 2005/01/10 22:01:37 kent Exp $ */
+/* $NetBSD: msm6258var.h,v 1.7 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
diff --git a/sys/dev/ic/mtd803.c b/sys/dev/ic/mtd803.c
index 3b0568f4ab6..ffe50ae4ac0 100644
--- a/sys/dev/ic/mtd803.c
+++ b/sys/dev/ic/mtd803.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mtd803.c,v 1.8 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: mtd803.c,v 1.9 2005/12/11 12:21:28 christos Exp $ */
/*-
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.8 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mtd803.c,v 1.9 2005/12/11 12:21:28 christos Exp $");
#include "bpfilter.h"
diff --git a/sys/dev/ic/mtd803var.h b/sys/dev/ic/mtd803var.h
index a3d77d6cd98..b204a308067 100644
--- a/sys/dev/ic/mtd803var.h
+++ b/sys/dev/ic/mtd803var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mtd803var.h,v 1.3 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: mtd803var.h,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/mx98905.c b/sys/dev/ic/mx98905.c
index 9f161a0078e..9ab3bc9d5dc 100644
--- a/sys/dev/ic/mx98905.c
+++ b/sys/dev/ic/mx98905.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mx98905.c,v 1.6 2004/03/18 23:38:17 he Exp $ */
+/* $NetBSD: mx98905.c,v 1.7 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: mx98905.c,v 1.6 2004/03/18 23:38:17 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mx98905.c,v 1.7 2005/12/11 12:21:28 christos Exp $");
#include <sys/device.h>
#include <sys/mbuf.h>
diff --git a/sys/dev/ic/ncr5380.doc b/sys/dev/ic/ncr5380.doc
index 74ac4bce3ac..2e679bf767a 100644
--- a/sys/dev/ic/ncr5380.doc
+++ b/sys/dev/ic/ncr5380.doc
@@ -1,4 +1,4 @@
-# $NetBSD: ncr5380.doc,v 1.4 2005/02/27 00:27:02 perry Exp $
+# $NetBSD: ncr5380.doc,v 1.5 2005/12/11 12:21:28 christos Exp $
MI 5380 driver
==============
diff --git a/sys/dev/ic/ncr5380reg.h b/sys/dev/ic/ncr5380reg.h
index c61c030abce..10b0e748682 100644
--- a/sys/dev/ic/ncr5380reg.h
+++ b/sys/dev/ic/ncr5380reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380reg.h,v 1.6 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: ncr5380reg.h,v 1.7 2005/12/11 12:21:28 christos Exp $ */
/*
* Mach Operating System
diff --git a/sys/dev/ic/ncr5380sbc.c b/sys/dev/ic/ncr5380sbc.c
index 3389692e3e3..6be40c7b531 100644
--- a/sys/dev/ic/ncr5380sbc.c
+++ b/sys/dev/ic/ncr5380sbc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380sbc.c,v 1.56 2005/06/02 14:03:20 tsutsui Exp $ */
+/* $NetBSD: ncr5380sbc.c,v 1.57 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.56 2005/06/02 14:03:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr5380sbc.c,v 1.57 2005/12/11 12:21:28 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/ic/ncr5380var.h b/sys/dev/ic/ncr5380var.h
index 623fa8ebb1e..b5c51200a26 100644
--- a/sys/dev/ic/ncr5380var.h
+++ b/sys/dev/ic/ncr5380var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380var.h,v 1.28 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: ncr5380var.h,v 1.29 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1995 David Jones, Gordon W. Ross
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 51075c01fbf..20362117d47 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9x.c,v 1.116 2005/11/06 10:31:46 tsutsui Exp $ */
+/* $NetBSD: ncr53c9x.c,v 1.117 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.116 2005/11/06 10:31:46 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.117 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/ncr53c9xreg.h b/sys/dev/ic/ncr53c9xreg.h
index 2588aefc72e..480fc4ff9e4 100644
--- a/sys/dev/ic/ncr53c9xreg.h
+++ b/sys/dev/ic/ncr53c9xreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9xreg.h,v 1.14 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: ncr53c9xreg.h,v 1.15 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1994 Peter Galbavy. All rights reserved.
diff --git a/sys/dev/ic/ncr53c9xvar.h b/sys/dev/ic/ncr53c9xvar.h
index e88966f900e..b0e8b151adb 100644
--- a/sys/dev/ic/ncr53c9xvar.h
+++ b/sys/dev/ic/ncr53c9xvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53c9xvar.h,v 1.46 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: ncr53c9xvar.h,v 1.47 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/ne2000.c b/sys/dev/ic/ne2000.c
index e7103b1b074..8331d974c2c 100644
--- a/sys/dev/ic/ne2000.c
+++ b/sys/dev/ic/ne2000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ne2000.c,v 1.46 2005/02/26 10:29:20 bsh Exp $ */
+/* $NetBSD: ne2000.c,v 1.47 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.46 2005/02/26 10:29:20 bsh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ne2000.c,v 1.47 2005/12/11 12:21:28 christos Exp $");
#include "opt_ipkdb.h"
diff --git a/sys/dev/ic/ne2000var.h b/sys/dev/ic/ne2000var.h
index d10a9845ac2..47558ba68b7 100644
--- a/sys/dev/ic/ne2000var.h
+++ b/sys/dev/ic/ne2000var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ne2000var.h,v 1.16 2005/02/04 02:10:36 perry Exp $ */
+/* $NetBSD: ne2000var.h,v 1.17 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/nec7210reg.h b/sys/dev/ic/nec7210reg.h
index f3e6899f5b0..80c22294ee8 100644
--- a/sys/dev/ic/nec7210reg.h
+++ b/sys/dev/ic/nec7210reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nec7210reg.h,v 1.2 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: nec7210reg.h,v 1.3 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/nec765reg.h b/sys/dev/ic/nec765reg.h
index adb2d5bd082..a1485a08287 100644
--- a/sys/dev/ic/nec765reg.h
+++ b/sys/dev/ic/nec765reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nec765reg.h,v 1.6 2003/08/07 16:31:02 agc Exp $ */
+/* $NetBSD: nec765reg.h,v 1.7 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
diff --git a/sys/dev/ic/ninjascsi32.c b/sys/dev/ic/ninjascsi32.c
index b9b9e093a9f..521e1665cce 100644
--- a/sys/dev/ic/ninjascsi32.c
+++ b/sys/dev/ic/ninjascsi32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ninjascsi32.c,v 1.3 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: ninjascsi32.c,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.3 2005/05/30 04:43:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ninjascsi32.c,v 1.4 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/ninjascsi32reg.h b/sys/dev/ic/ninjascsi32reg.h
index f543714a051..739a39d1ea4 100644
--- a/sys/dev/ic/ninjascsi32reg.h
+++ b/sys/dev/ic/ninjascsi32reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ninjascsi32reg.h,v 1.1 2004/08/26 14:13:46 itohy Exp $ */
+/* $NetBSD: ninjascsi32reg.h,v 1.2 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/ninjascsi32var.h b/sys/dev/ic/ninjascsi32var.h
index 5b07f156556..7ea11231be3 100644
--- a/sys/dev/ic/ninjascsi32var.h
+++ b/sys/dev/ic/ninjascsi32var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ninjascsi32var.h,v 1.2 2004/08/26 18:38:19 thorpej Exp $ */
+/* $NetBSD: ninjascsi32var.h,v 1.3 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/ns16450reg.h b/sys/dev/ic/ns16450reg.h
index 0b23414b326..cefb7c84d1c 100644
--- a/sys/dev/ic/ns16450reg.h
+++ b/sys/dev/ic/ns16450reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ns16450reg.h,v 1.5 2003/08/07 16:31:02 agc Exp $ */
+/* $NetBSD: ns16450reg.h,v 1.6 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
diff --git a/sys/dev/ic/ns16550reg.h b/sys/dev/ic/ns16550reg.h
index e7e9b670c87..4295647df0e 100644
--- a/sys/dev/ic/ns16550reg.h
+++ b/sys/dev/ic/ns16550reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ns16550reg.h,v 1.6 2003/08/07 16:31:02 agc Exp $ */
+/* $NetBSD: ns16550reg.h,v 1.7 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
diff --git a/sys/dev/ic/nslm7x.c b/sys/dev/ic/nslm7x.c
index 79f79bdfe5e..f8592767a81 100644
--- a/sys/dev/ic/nslm7x.c
+++ b/sys/dev/ic/nslm7x.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.23 2005/10/15 00:41:48 xtraeme Exp $ */
+/* $NetBSD: nslm7x.c,v 1.24 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.23 2005/10/15 00:41:48 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.24 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/nslm7xvar.h b/sys/dev/ic/nslm7xvar.h
index b835b251f2f..08260ed2ff8 100644
--- a/sys/dev/ic/nslm7xvar.h
+++ b/sys/dev/ic/nslm7xvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7xvar.h,v 1.16 2005/10/15 00:41:48 xtraeme Exp $ */
+/* $NetBSD: nslm7xvar.h,v 1.17 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/oosiop.c b/sys/dev/ic/oosiop.c
index 7f3077069e1..2a8d8dcea48 100644
--- a/sys/dev/ic/oosiop.c
+++ b/sys/dev/ic/oosiop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiop.c,v 1.7 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: oosiop.c,v 1.8 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2001 Shuichiro URATA. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oosiop.c,v 1.7 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oosiop.c,v 1.8 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/oosiopreg.h b/sys/dev/ic/oosiopreg.h
index cd736daab0f..514c5889b3f 100644
--- a/sys/dev/ic/oosiopreg.h
+++ b/sys/dev/ic/oosiopreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiopreg.h,v 1.3 2003/11/02 11:07:45 wiz Exp $ */
+/* $NetBSD: oosiopreg.h,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
diff --git a/sys/dev/ic/oosiopvar.h b/sys/dev/ic/oosiopvar.h
index 385b885920b..6e6ba4c7570 100644
--- a/sys/dev/ic/oosiopvar.h
+++ b/sys/dev/ic/oosiopvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiopvar.h,v 1.3 2005/01/02 12:22:19 tsutsui Exp $ */
+/* $NetBSD: oosiopvar.h,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2001 Shuichiro URATA. All rights reserved.
diff --git a/sys/dev/ic/opl.c b/sys/dev/ic/opl.c
index d3f3bab7c25..19f6c1357db 100644
--- a/sys/dev/ic/opl.c
+++ b/sys/dev/ic/opl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl.c,v 1.22 2005/02/04 02:10:37 perry Exp $ */
+/* $NetBSD: opl.c,v 1.23 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.22 2005/02/04 02:10:37 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl.c,v 1.23 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/opl3sa3reg.h b/sys/dev/ic/opl3sa3reg.h
index b8ee002e1fb..8daa7d3c428 100644
--- a/sys/dev/ic/opl3sa3reg.h
+++ b/sys/dev/ic/opl3sa3reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: opl3sa3reg.h,v 1.3 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: opl3sa3reg.h,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/oplinstrs.c b/sys/dev/ic/oplinstrs.c
index 66ad0b47431..186d3fcceee 100644
--- a/sys/dev/ic/oplinstrs.c
+++ b/sys/dev/ic/oplinstrs.c
@@ -1,7 +1,7 @@
-/* $NetBSD: oplinstrs.c,v 1.5 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: oplinstrs.c,v 1.6 2005/12/11 12:21:28 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oplinstrs.c,v 1.5 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oplinstrs.c,v 1.6 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/oplreg.h b/sys/dev/ic/oplreg.h
index 776290a3a85..9b10f6a02da 100644
--- a/sys/dev/ic/oplreg.h
+++ b/sys/dev/ic/oplreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: oplreg.h,v 1.4 2003/12/04 13:57:30 keihan Exp $ */
+/* $NetBSD: oplreg.h,v 1.5 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/oplvar.h b/sys/dev/ic/oplvar.h
index ba833cd9065..f8baacf9dbb 100644
--- a/sys/dev/ic/oplvar.h
+++ b/sys/dev/ic/oplvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: oplvar.h,v 1.10 2005/02/04 02:10:37 perry Exp $ */
+/* $NetBSD: oplvar.h,v 1.11 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/osiop.c b/sys/dev/ic/osiop.c
index 507d831e12f..4b5f8efe38c 100644
--- a/sys/dev/ic/osiop.c
+++ b/sys/dev/ic/osiop.c
@@ -1,4 +1,4 @@
-/* $NetBSD: osiop.c,v 1.24 2005/04/30 02:18:43 tsutsui Exp $ */
+/* $NetBSD: osiop.c,v 1.25 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.24 2005/04/30 02:18:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osiop.c,v 1.25 2005/12/11 12:21:28 christos Exp $");
/* #define OSIOP_DEBUG */
diff --git a/sys/dev/ic/osiopreg.h b/sys/dev/ic/osiopreg.h
index 20aebb78d33..578d137a20f 100644
--- a/sys/dev/ic/osiopreg.h
+++ b/sys/dev/ic/osiopreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: osiopreg.h,v 1.4 2003/11/02 11:07:45 wiz Exp $ */
+/* $NetBSD: osiopreg.h,v 1.5 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
diff --git a/sys/dev/ic/osiopvar.h b/sys/dev/ic/osiopvar.h
index f33b667a250..631fea2a19a 100644
--- a/sys/dev/ic/osiopvar.h
+++ b/sys/dev/ic/osiopvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: osiopvar.h,v 1.8 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: osiopvar.h,v 1.9 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
diff --git a/sys/dev/ic/pcdisplay_chars.c b/sys/dev/ic/pcdisplay_chars.c
index 59ce304173c..9532cdb0744 100644
--- a/sys/dev/ic/pcdisplay_chars.c
+++ b/sys/dev/ic/pcdisplay_chars.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay_chars.c,v 1.9 2004/03/24 17:26:53 drochner Exp $ */
+/* $NetBSD: pcdisplay_chars.c,v 1.10 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay_chars.c,v 1.9 2004/03/24 17:26:53 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay_chars.c,v 1.10 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/pcdisplay_subr.c b/sys/dev/ic/pcdisplay_subr.c
index d7fff7fa6db..cd55455ee65 100644
--- a/sys/dev/ic/pcdisplay_subr.c
+++ b/sys/dev/ic/pcdisplay_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay_subr.c,v 1.28 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: pcdisplay_subr.c,v 1.29 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay_subr.c,v 1.28 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay_subr.c,v 1.29 2005/12/11 12:21:28 christos Exp $");
#include "opt_wsdisplay_compat.h" /* for WSDISPLAY_CHARFUNCS */
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
diff --git a/sys/dev/ic/pcdisplayvar.h b/sys/dev/ic/pcdisplayvar.h
index 11415421a71..729fee9264a 100644
--- a/sys/dev/ic/pcdisplayvar.h
+++ b/sys/dev/ic/pcdisplayvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplayvar.h,v 1.14 2004/07/28 12:34:04 jmmv Exp $ */
+/* $NetBSD: pcdisplayvar.h,v 1.15 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1998
diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index 196fd8fb5fc..c0d3f26b32d 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc.c,v 1.34 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: pckbc.c,v 1.35 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2004 Ben Harris.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.34 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc.c,v 1.35 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/pckbcvar.h b/sys/dev/ic/pckbcvar.h
index d3ddec8f927..aac2d483393 100644
--- a/sys/dev/ic/pckbcvar.h
+++ b/sys/dev/ic/pckbcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbcvar.h,v 1.11 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: pckbcvar.h,v 1.12 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1998
diff --git a/sys/dev/ic/pdq.c b/sys/dev/ic/pdq.c
index 4a9ead4b3a9..301b33bcf31 100644
--- a/sys/dev/ic/pdq.c
+++ b/sys/dev/ic/pdq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pdq.c,v 1.38 2005/05/17 04:14:57 christos Exp $ */
+/* $NetBSD: pdq.c,v 1.39 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1995,1996 Matt Thomas <matt@3am-software.com>
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdq.c,v 1.38 2005/05/17 04:14:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdq.c,v 1.39 2005/12/11 12:21:28 christos Exp $");
#define PDQ_HWSUPPORT /* for pdq.h */
diff --git a/sys/dev/ic/pdq_ifsubr.c b/sys/dev/ic/pdq_ifsubr.c
index e2e66cc70d0..7f385567e21 100644
--- a/sys/dev/ic/pdq_ifsubr.c
+++ b/sys/dev/ic/pdq_ifsubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pdq_ifsubr.c,v 1.42 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: pdq_ifsubr.c,v 1.43 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.42 2005/05/30 04:43:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdq_ifsubr.c,v 1.43 2005/12/11 12:21:28 christos Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
diff --git a/sys/dev/ic/pdqreg.h b/sys/dev/ic/pdqreg.h
index 2e19e947d1b..5eac1202ebf 100644
--- a/sys/dev/ic/pdqreg.h
+++ b/sys/dev/ic/pdqreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pdqreg.h,v 1.17 2005/05/30 04:41:57 christos Exp $ */
+/* $NetBSD: pdqreg.h,v 1.18 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
diff --git a/sys/dev/ic/pdqvar.h b/sys/dev/ic/pdqvar.h
index a150e117ecb..117ceea77ff 100644
--- a/sys/dev/ic/pdqvar.h
+++ b/sys/dev/ic/pdqvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pdqvar.h,v 1.35 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: pdqvar.h,v 1.36 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
diff --git a/sys/dev/ic/ralreg.h b/sys/dev/ic/ralreg.h
index 35f3d5f8dc5..654b57a49bd 100644
--- a/sys/dev/ic/ralreg.h
+++ b/sys/dev/ic/ralreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ralreg.h,v 1.1 2005/07/01 20:06:56 drochner Exp $ */
+/* $NetBSD: ralreg.h,v 1.2 2005/12/11 12:21:28 christos Exp $ */
/* $OpenBSD: ralreg.h,v 1.5 2005/04/01 11:12:57 damien Exp $ */
/*-
diff --git a/sys/dev/ic/ralvar.h b/sys/dev/ic/ralvar.h
index b0a6aa5c0c3..4b0aa7d702f 100644
--- a/sys/dev/ic/ralvar.h
+++ b/sys/dev/ic/ralvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ralvar.h,v 1.2 2005/07/04 17:50:10 drochner Exp $ */
+/* $NetBSD: ralvar.h,v 1.3 2005/12/11 12:21:28 christos Exp $ */
/* $OpenBSD: ralvar.h,v 1.7 2005/03/11 19:39:35 damien Exp $ */
/*-
diff --git a/sys/dev/ic/ramdac.h b/sys/dev/ic/ramdac.h
index aca4d8e44c9..2b9717a0abd 100644
--- a/sys/dev/ic/ramdac.h
+++ b/sys/dev/ic/ramdac.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ramdac.h,v 1.6 2005/06/01 18:18:52 drochner Exp $ */
+/* $NetBSD: ramdac.h,v 1.7 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/rf3000reg.h b/sys/dev/ic/rf3000reg.h
index e147b28cbba..85111c8c750 100644
--- a/sys/dev/ic/rf3000reg.h
+++ b/sys/dev/ic/rf3000reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf3000reg.h,v 1.3 2004/07/21 04:25:22 dyoung Exp $ */
+/* $NetBSD: rf3000reg.h,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2005 David Young. All rights reserved.
diff --git a/sys/dev/ic/rrunner.c b/sys/dev/ic/rrunner.c
index ab16a8787ef..42f4fecf377 100644
--- a/sys/dev/ic/rrunner.c
+++ b/sys/dev/ic/rrunner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rrunner.c,v 1.50 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: rrunner.c,v 1.51 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.50 2005/10/15 17:29:12 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rrunner.c,v 1.51 2005/12/11 12:21:28 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -708,12 +708,8 @@ bad_init:
* intervening memcpy's to slow us down.
*/
-int
-esh_fpopen(dev, oflags, devtype, p)
- dev_t dev;
- int oflags;
- int devtype;
- struct proc *p;
+int
+esh_fpopen(dev_t dev, int oflags, int devtype, struct lwp *l)
{
struct esh_softc *sc;
struct rr_ring_ctl *ring_ctl;
@@ -929,12 +925,8 @@ bad_fp_dmamem_alloc:
}
-int
-esh_fpclose(dev, fflag, devtype, p)
- dev_t dev;
- int fflag;
- int devtype;
- struct proc *p;
+int
+esh_fpclose(dev_t dev, int fflag, int devtype, struct lwp *l)
{
struct esh_softc *sc;
struct rr_ring_ctl *ring_ctl;
@@ -2036,7 +2028,8 @@ eshstart(ifp)
*/
error = bus_dmamap_load(sc->sc_dmat, send->ec_dma,
- bp->b_data, bp->b_bcount, bp->b_proc,
+ bp->b_data, bp->b_bcount,
+ bp->b_proc,
BUS_DMA_WRITE|BUS_DMA_NOWAIT);
if (error)
diff --git a/sys/dev/ic/rrunnerreg.h b/sys/dev/ic/rrunnerreg.h
index cbed301bd95..8ca8568607f 100644
--- a/sys/dev/ic/rrunnerreg.h
+++ b/sys/dev/ic/rrunnerreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rrunnerreg.h,v 1.6 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: rrunnerreg.h,v 1.7 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/rrunnervar.h b/sys/dev/ic/rrunnervar.h
index 391ab80cc04..7c343314171 100644
--- a/sys/dev/ic/rrunnervar.h
+++ b/sys/dev/ic/rrunnervar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rrunnervar.h,v 1.10 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: rrunnervar.h,v 1.11 2005/12/11 12:21:28 christos Exp $ */
/* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/ic/rtl80x9.c b/sys/dev/ic/rtl80x9.c
index 18547ead44e..46ac5784566 100644
--- a/sys/dev/ic/rtl80x9.c
+++ b/sys/dev/ic/rtl80x9.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl80x9.c,v 1.10 2003/10/28 22:22:28 mycroft Exp $ */
+/* $NetBSD: rtl80x9.c,v 1.11 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl80x9.c,v 1.10 2003/10/28 22:22:28 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl80x9.c,v 1.11 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/rtl80x9reg.h b/sys/dev/ic/rtl80x9reg.h
index 3115454b4f5..30451beb493 100644
--- a/sys/dev/ic/rtl80x9reg.h
+++ b/sys/dev/ic/rtl80x9reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl80x9reg.h,v 1.5 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: rtl80x9reg.h,v 1.6 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/rtl80x9var.h b/sys/dev/ic/rtl80x9var.h
index 9ee9a839131..41960fbabf5 100644
--- a/sys/dev/ic/rtl80x9var.h
+++ b/sys/dev/ic/rtl80x9var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl80x9var.h,v 1.4 2005/02/04 02:10:37 perry Exp $ */
+/* $NetBSD: rtl80x9var.h,v 1.5 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/rtl8169.c b/sys/dev/ic/rtl8169.c
index 26c13ee4b4c..f276b957a41 100644
--- a/sys/dev/ic/rtl8169.c
+++ b/sys/dev/ic/rtl8169.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.21 2005/07/11 21:42:58 yamt Exp $ */
+/* $NetBSD: rtl8169.c,v 1.22 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1997, 1998-2003
diff --git a/sys/dev/ic/rtl8169var.h b/sys/dev/ic/rtl8169var.h
index 681ed9efe02..8d6f667be79 100644
--- a/sys/dev/ic/rtl8169var.h
+++ b/sys/dev/ic/rtl8169var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169var.h,v 1.2 2005/01/13 14:24:24 kanaoka Exp $ */
+/* $NetBSD: rtl8169var.h,v 1.3 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2004 Jonathan Stone
diff --git a/sys/dev/ic/rtl81x9reg.h b/sys/dev/ic/rtl81x9reg.h
index 5777b15299e..0a752822200 100644
--- a/sys/dev/ic/rtl81x9reg.h
+++ b/sys/dev/ic/rtl81x9reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9reg.h,v 1.12 2005/03/23 20:23:08 yamt Exp $ */
+/* $NetBSD: rtl81x9reg.h,v 1.13 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1997, 1998
diff --git a/sys/dev/ic/rtl81x9var.h b/sys/dev/ic/rtl81x9var.h
index 8f7bfd79c2b..32929daa7e1 100644
--- a/sys/dev/ic/rtl81x9var.h
+++ b/sys/dev/ic/rtl81x9var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9var.h,v 1.19 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: rtl81x9var.h,v 1.20 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1997, 1998
diff --git a/sys/dev/ic/rtwphy.c b/sys/dev/ic/rtwphy.c
index 816e54afc7f..e97a0f47fa8 100644
--- a/sys/dev/ic/rtwphy.c
+++ b/sys/dev/ic/rtwphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphy.c,v 1.6 2005/06/22 06:15:51 dyoung Exp $ */
+/* $NetBSD: rtwphy.c,v 1.7 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtwphy.c,v 1.6 2005/06/22 06:15:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtwphy.c,v 1.7 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/rtwphy.h b/sys/dev/ic/rtwphy.h
index c027ae8d0ce..8871989a2a7 100644
--- a/sys/dev/ic/rtwphy.h
+++ b/sys/dev/ic/rtwphy.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphy.h,v 1.3 2005/01/02 04:23:03 dyoung Exp $ */
+/* $NetBSD: rtwphy.h,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
diff --git a/sys/dev/ic/rtwphyio.c b/sys/dev/ic/rtwphyio.c
index 3d834c16786..359a8e16dbc 100644
--- a/sys/dev/ic/rtwphyio.c
+++ b/sys/dev/ic/rtwphyio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphyio.c,v 1.7 2005/06/22 06:15:51 dyoung Exp $ */
+/* $NetBSD: rtwphyio.c,v 1.8 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.7 2005/06/22 06:15:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.8 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/rtwphyio.h b/sys/dev/ic/rtwphyio.h
index 6808f4ed543..366f3d02c6d 100644
--- a/sys/dev/ic/rtwphyio.h
+++ b/sys/dev/ic/rtwphyio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphyio.h,v 1.2 2005/01/02 04:23:03 dyoung Exp $ */
+/* $NetBSD: rtwphyio.h,v 1.3 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
diff --git a/sys/dev/ic/sa2400reg.h b/sys/dev/ic/sa2400reg.h
index 65fa19e8085..1425208947a 100644
--- a/sys/dev/ic/sa2400reg.h
+++ b/sys/dev/ic/sa2400reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sa2400reg.h,v 1.3 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: sa2400reg.h,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2005 David Young. All rights reserved.
diff --git a/sys/dev/ic/seeq8005.c b/sys/dev/ic/seeq8005.c
index 0524e62a161..92897f5aeb5 100644
--- a/sys/dev/ic/seeq8005.c
+++ b/sys/dev/ic/seeq8005.c
@@ -1,4 +1,4 @@
-/* $NetBSD: seeq8005.c,v 1.37 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: seeq8005.c,v 1.38 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.37 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: seeq8005.c,v 1.38 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/sgec.c b/sys/dev/ic/sgec.c
index a35d56aab3d..5c251c3e69d 100644
--- a/sys/dev/ic/sgec.c
+++ b/sys/dev/ic/sgec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sgec.c,v 1.26 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: sgec.c,v 1.27 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.26 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sgec.c,v 1.27 2005/12/11 12:21:28 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/ic/sgecreg.h b/sys/dev/ic/sgecreg.h
index 712d4d79775..30ccb5a100e 100644
--- a/sys/dev/ic/sgecreg.h
+++ b/sys/dev/ic/sgecreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sgecreg.h,v 1.3 2003/08/07 16:31:03 agc Exp $ */
+/* $NetBSD: sgecreg.h,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/ic/sgecvar.h b/sys/dev/ic/sgecvar.h
index b6d9c968ddf..201143faf6d 100644
--- a/sys/dev/ic/sgecvar.h
+++ b/sys/dev/ic/sgecvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sgecvar.h,v 1.5 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: sgecvar.h,v 1.6 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
diff --git a/sys/dev/ic/si4136reg.h b/sys/dev/ic/si4136reg.h
index 57691a476a0..9973adb7367 100644
--- a/sys/dev/ic/si4136reg.h
+++ b/sys/dev/ic/si4136reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: si4136reg.h,v 1.1 2004/02/17 21:20:55 dyoung Exp $ */
+/* $NetBSD: si4136reg.h,v 1.2 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2005 David Young. All rights reserved.
diff --git a/sys/dev/ic/siopreg.h b/sys/dev/ic/siopreg.h
index be891a4ac55..6526c81aa6a 100644
--- a/sys/dev/ic/siopreg.h
+++ b/sys/dev/ic/siopreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: siopreg.h,v 1.16 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: siopreg.h,v 1.17 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
diff --git a/sys/dev/ic/sl811hs.c b/sys/dev/ic/sl811hs.c
index 734691d66c4..8064036442c 100644
--- a/sys/dev/ic/sl811hs.c
+++ b/sys/dev/ic/sl811hs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.6 2005/06/01 19:40:58 drochner Exp $ */
+/* $NetBSD: sl811hs.c,v 1.7 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.6 2005/06/01 19:40:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.7 2005/12/11 12:21:28 christos Exp $");
#include "opt_slhci.h"
diff --git a/sys/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c
index 87db51c1b02..eb92b090ad8 100644
--- a/sys/dev/ic/smc83c170.c
+++ b/sys/dev/ic/smc83c170.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc83c170.c,v 1.59 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: smc83c170.c,v 1.60 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.59 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.60 2005/12/11 12:21:28 christos Exp $");
#include "bpfilter.h"
diff --git a/sys/dev/ic/smc83c170reg.h b/sys/dev/ic/smc83c170reg.h
index 7f74847b62a..861789df14e 100644
--- a/sys/dev/ic/smc83c170reg.h
+++ b/sys/dev/ic/smc83c170reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: smc83c170reg.h,v 1.9 2003/11/08 16:08:13 tsutsui Exp $ */
+/* $NetBSD: smc83c170reg.h,v 1.10 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/smc83c170var.h b/sys/dev/ic/smc83c170var.h
index 6d9b3eaa31a..22cf19b62e8 100644
--- a/sys/dev/ic/smc83c170var.h
+++ b/sys/dev/ic/smc83c170var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: smc83c170var.h,v 1.9 2005/02/04 02:10:37 perry Exp $ */
+/* $NetBSD: smc83c170var.h,v 1.10 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/smc90cx6.c b/sys/dev/ic/smc90cx6.c
index 0edbfc94936..2f704b05515 100644
--- a/sys/dev/ic/smc90cx6.c
+++ b/sys/dev/ic/smc90cx6.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc90cx6.c,v 1.43 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: smc90cx6.c,v 1.44 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.43 2005/02/27 00:27:02 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.44 2005/12/11 12:21:28 christos Exp $");
/* #define BAHSOFTCOPY */
#define BAHRETRANSMIT /**/
diff --git a/sys/dev/ic/smc90cx6reg.h b/sys/dev/ic/smc90cx6reg.h
index 06d8f4b7170..967c96b2a72 100644
--- a/sys/dev/ic/smc90cx6reg.h
+++ b/sys/dev/ic/smc90cx6reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: smc90cx6reg.h,v 1.8 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: smc90cx6reg.h,v 1.9 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/smc90cx6var.h b/sys/dev/ic/smc90cx6var.h
index 34763ac35ef..8b698cebf4e 100644
--- a/sys/dev/ic/smc90cx6var.h
+++ b/sys/dev/ic/smc90cx6var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: smc90cx6var.h,v 1.7 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: smc90cx6var.h,v 1.8 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index 6cdf0b0a9dc..e1fc1b61065 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxx.c,v 1.52 2005/06/06 20:20:09 pooka Exp $ */
+/* $NetBSD: smc91cxx.c,v 1.53 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.52 2005/06/06 20:20:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.53 2005/12/11 12:21:28 christos Exp $");
#include "opt_inet.h"
#include "opt_ccitt.h"
diff --git a/sys/dev/ic/smc91cxxvar.h b/sys/dev/ic/smc91cxxvar.h
index 2d462ff0a06..b50342834b2 100644
--- a/sys/dev/ic/smc91cxxvar.h
+++ b/sys/dev/ic/smc91cxxvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxxvar.h,v 1.12 2005/02/04 02:10:37 perry Exp $ */
+/* $NetBSD: smc91cxxvar.h,v 1.13 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/smc93cx6.c b/sys/dev/ic/smc93cx6.c
index 83fe5154ea9..90abeeade11 100644
--- a/sys/dev/ic/smc93cx6.c
+++ b/sys/dev/ic/smc93cx6.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc93cx6.c,v 1.11 2005/06/22 06:15:51 dyoung Exp $ */
+/* $NetBSD: smc93cx6.c,v 1.12 2005/12/11 12:21:28 christos Exp $ */
/*
* Interface for the 93C66/56/46/26/06 serial eeprom parts.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc93cx6.c,v 1.11 2005/06/22 06:15:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc93cx6.c,v 1.12 2005/12/11 12:21:28 christos Exp $");
#ifndef __NetBSD__
#include "opt_aic7xxx.h"
diff --git a/sys/dev/ic/smc93cx6var.h b/sys/dev/ic/smc93cx6var.h
index 56ce0706905..28d3ab35649 100644
--- a/sys/dev/ic/smc93cx6var.h
+++ b/sys/dev/ic/smc93cx6var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: smc93cx6var.h,v 1.8 2005/06/22 06:15:51 dyoung Exp $ */
+/* $NetBSD: smc93cx6var.h,v 1.9 2005/12/11 12:21:28 christos Exp $ */
/*
* Interface to the 93C46 serial EEPROM that is used to store BIOS
diff --git a/sys/dev/ic/st16650reg.h b/sys/dev/ic/st16650reg.h
index 4e47f45467c..ee5c3bad5f8 100644
--- a/sys/dev/ic/st16650reg.h
+++ b/sys/dev/ic/st16650reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: st16650reg.h,v 1.2 2003/08/07 16:31:03 agc Exp $ */
+/* $NetBSD: st16650reg.h,v 1.3 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1991 The Regents of the University of California.
diff --git a/sys/dev/ic/sti.c b/sys/dev/ic/sti.c
index 9ef635366fe..260440b4e5d 100644
--- a/sys/dev/ic/sti.c
+++ b/sys/dev/ic/sti.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sti.c,v 1.4 2005/04/01 11:59:37 yamt Exp $ */
+/* $NetBSD: sti.c,v 1.5 2005/12/11 12:21:28 christos Exp $ */
/* $OpenBSD: sti.c,v 1.35 2003/12/16 06:07:13 mickey Exp $ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.4 2005/04/01 11:59:37 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti.c,v 1.5 2005/12/11 12:21:28 christos Exp $");
#include "wsdisplay.h"
@@ -74,7 +74,7 @@ struct wsdisplay_emulops sti_emulops = {
sti_alloc_attr
};
-int sti_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int sti_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t sti_mmap(void *, off_t, int);
int sti_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@@ -582,7 +582,7 @@ sti_setcment(struct sti_softc *sc, u_int i, u_char r, u_char g, u_char b)
}
int
-sti_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+sti_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct sti_softc *sc = v;
struct wsdisplay_fbinfo *wdf;
diff --git a/sys/dev/ic/stireg.h b/sys/dev/ic/stireg.h
index 134ba97d566..14238b36249 100644
--- a/sys/dev/ic/stireg.h
+++ b/sys/dev/ic/stireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stireg.h,v 1.1 2004/08/26 16:48:06 jkunz Exp $ */
+/* $NetBSD: stireg.h,v 1.2 2005/12/11 12:21:28 christos Exp $ */
/* $OpenBSD: stireg.h,v 1.8 2003/08/19 02:52:38 mickey Exp $ */
diff --git a/sys/dev/ic/stivar.h b/sys/dev/ic/stivar.h
index d53afa5dbbb..db08db09a69 100644
--- a/sys/dev/ic/stivar.h
+++ b/sys/dev/ic/stivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stivar.h,v 1.1 2004/08/26 16:48:06 jkunz Exp $ */
+/* $NetBSD: stivar.h,v 1.2 2005/12/11 12:21:28 christos Exp $ */
/* $OpenBSD: stivar.h,v 1.15 2003/12/16 06:07:13 mickey Exp $ */
diff --git a/sys/dev/ic/sunscpal.c b/sys/dev/ic/sunscpal.c
index 103a50d9447..4fd31a7186c 100644
--- a/sys/dev/ic/sunscpal.c
+++ b/sys/dev/ic/sunscpal.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunscpal.c,v 1.18 2005/06/03 21:20:51 tsutsui Exp $ */
+/* $NetBSD: sunscpal.c,v 1.19 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2001 Matthew Fredette
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.18 2005/06/03 21:20:51 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunscpal.c,v 1.19 2005/12/11 12:21:28 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/ic/sunscpalvar.h b/sys/dev/ic/sunscpalvar.h
index 649dcce09b5..ef04a7a7951 100644
--- a/sys/dev/ic/sunscpalvar.h
+++ b/sys/dev/ic/sunscpalvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sunscpalvar.h,v 1.6 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: sunscpalvar.h,v 1.7 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2001 Matthew Fredette
diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c
index a0c80f51cab..6749b43bea6 100644
--- a/sys/dev/ic/tcic2.c
+++ b/sys/dev/ic/tcic2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2.c,v 1.22 2005/08/25 22:33:19 drochner Exp $ */
+/* $NetBSD: tcic2.c,v 1.23 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.22 2005/08/25 22:33:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2.c,v 1.23 2005/12/11 12:21:28 christos Exp $");
#undef TCICDEBUG
diff --git a/sys/dev/ic/tcic2reg.h b/sys/dev/ic/tcic2reg.h
index 09dec31c20a..fd5927d8337 100644
--- a/sys/dev/ic/tcic2reg.h
+++ b/sys/dev/ic/tcic2reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2reg.h,v 1.3 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: tcic2reg.h,v 1.4 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/tcic2var.h b/sys/dev/ic/tcic2var.h
index c1f6ed7f5a2..ff54d12754c 100644
--- a/sys/dev/ic/tcic2var.h
+++ b/sys/dev/ic/tcic2var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2var.h,v 1.5 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: tcic2var.h,v 1.6 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
diff --git a/sys/dev/ic/tea5757.c b/sys/dev/ic/tea5757.c
index f6ec6139f11..37588a3230d 100644
--- a/sys/dev/ic/tea5757.c
+++ b/sys/dev/ic/tea5757.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tea5757.c,v 1.4 2005/06/02 14:32:12 christos Exp $ */
+/* $NetBSD: tea5757.c,v 1.5 2005/12/11 12:21:28 christos Exp $ */
/* $OpenBSD: tea5757.c,v 1.3 2002/01/07 18:32:19 mickey Exp $ */
/*
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tea5757.c,v 1.4 2005/06/02 14:32:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tea5757.c,v 1.5 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/radioio.h>
diff --git a/sys/dev/ic/timer_cpcbus.c b/sys/dev/ic/timer_cpcbus.c
index 35782276762..9dedeb8a5bd 100644
--- a/sys/dev/ic/timer_cpcbus.c
+++ b/sys/dev/ic/timer_cpcbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: timer_cpcbus.c,v 1.6 2003/07/14 15:47:12 lukem Exp $ */
+/* $NetBSD: timer_cpcbus.c,v 1.7 2005/12/11 12:21:28 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_cpcbus.c,v 1.6 2003/07/14 15:47:12 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_cpcbus.c,v 1.7 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/tms320av110.c b/sys/dev/ic/tms320av110.c
index 34bedd4314c..095a5728efb 100644
--- a/sys/dev/ic/tms320av110.c
+++ b/sys/dev/ic/tms320av110.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tms320av110.c,v 1.17 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: tms320av110.c,v 1.18 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tms320av110.c,v 1.17 2005/01/15 15:19:52 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tms320av110.c,v 1.18 2005/12/11 12:21:28 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/tms320av110var.h b/sys/dev/ic/tms320av110var.h
index 82bad1bc337..9934c9dba0e 100644
--- a/sys/dev/ic/tms320av110var.h
+++ b/sys/dev/ic/tms320av110var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tms320av110var.h,v 1.5 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: tms320av110var.h,v 1.6 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/tropic.c b/sys/dev/ic/tropic.c
index dedc0001d98..5aafa1aebf9 100644
--- a/sys/dev/ic/tropic.c
+++ b/sys/dev/ic/tropic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tropic.c,v 1.25 2005/05/30 04:43:47 christos Exp $ */
+/* $NetBSD: tropic.c,v 1.26 2005/12/11 12:21:28 christos Exp $ */
/*
* Ported to NetBSD by Onno van der Linden
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.25 2005/05/30 04:43:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tropic.c,v 1.26 2005/12/11 12:21:28 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/ic/tropicreg.h b/sys/dev/ic/tropicreg.h
index 8d74b724ba3..2008095bec4 100644
--- a/sys/dev/ic/tropicreg.h
+++ b/sys/dev/ic/tropicreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tropicreg.h,v 1.5 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: tropicreg.h,v 1.6 2005/12/11 12:21:28 christos Exp $ */
/*
* Mach Operating System
diff --git a/sys/dev/ic/tropicvar.h b/sys/dev/ic/tropicvar.h
index dba5de1fafc..8cf322c53b7 100644
--- a/sys/dev/ic/tropicvar.h
+++ b/sys/dev/ic/tropicvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tropicvar.h,v 1.10 2005/02/27 00:27:02 perry Exp $ */
+/* $NetBSD: tropicvar.h,v 1.11 2005/12/11 12:21:28 christos Exp $ */
/*
* Mach Operating System
diff --git a/sys/dev/ic/tulip.c b/sys/dev/ic/tulip.c
index edfc8eb35bf..5630e3fc5f0 100644
--- a/sys/dev/ic/tulip.c
+++ b/sys/dev/ic/tulip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tulip.c,v 1.139 2005/07/17 18:11:36 he Exp $ */
+/* $NetBSD: tulip.c,v 1.140 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.139 2005/07/17 18:11:36 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.140 2005/12/11 12:21:28 christos Exp $");
#include "bpfilter.h"
diff --git a/sys/dev/ic/tulipreg.h b/sys/dev/ic/tulipreg.h
index 75249827486..b4fad4ffca7 100644
--- a/sys/dev/ic/tulipreg.h
+++ b/sys/dev/ic/tulipreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tulipreg.h,v 1.31 2005/06/23 23:51:42 rpaulo Exp $ */
+/* $NetBSD: tulipreg.h,v 1.32 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/tulipvar.h b/sys/dev/ic/tulipvar.h
index 0f7fed6ff09..95ac6af7fb3 100644
--- a/sys/dev/ic/tulipvar.h
+++ b/sys/dev/ic/tulipvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tulipvar.h,v 1.56 2005/07/17 18:11:36 he Exp $ */
+/* $NetBSD: tulipvar.h,v 1.57 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 6f7bfba25e2..b4df305139e 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uha.c,v 1.35 2005/02/21 00:29:07 thorpej Exp $ */
+/* $NetBSD: uha.c,v 1.36 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.35 2005/02/21 00:29:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha.c,v 1.36 2005/12/11 12:21:28 christos Exp $");
#undef UHADEBUG
#ifdef DDB
diff --git a/sys/dev/ic/uhareg.h b/sys/dev/ic/uhareg.h
index 6d9dfb142a1..f52d2285508 100644
--- a/sys/dev/ic/uhareg.h
+++ b/sys/dev/ic/uhareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: uhareg.h,v 1.11 2005/02/21 00:29:07 thorpej Exp $ */
+/* $NetBSD: uhareg.h,v 1.12 2005/12/11 12:21:28 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/uhavar.h b/sys/dev/ic/uhavar.h
index 8f7e8ece480..534c63febe3 100644
--- a/sys/dev/ic/uhavar.h
+++ b/sys/dev/ic/uhavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: uhavar.h,v 1.13 2005/02/04 02:10:37 perry Exp $ */
+/* $NetBSD: uhavar.h,v 1.14 2005/12/11 12:21:29 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/upc.c b/sys/dev/ic/upc.c
index a1af80d0ab1..01931be7f2e 100644
--- a/sys/dev/ic/upc.c
+++ b/sys/dev/ic/upc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: upc.c,v 1.11 2005/08/25 22:33:19 drochner Exp $ */
+/* $NetBSD: upc.c,v 1.12 2005/12/11 12:21:29 christos Exp $ */
/*-
* Copyright (c) 2000, 2003 Ben Harris
* All rights reserved.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: upc.c,v 1.11 2005/08/25 22:33:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: upc.c,v 1.12 2005/12/11 12:21:29 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/upcvar.h b/sys/dev/ic/upcvar.h
index cf946f527b4..5cb52eb0605 100644
--- a/sys/dev/ic/upcvar.h
+++ b/sys/dev/ic/upcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: upcvar.h,v 1.3 2005/02/27 00:27:03 perry Exp $ */
+/* $NetBSD: upcvar.h,v 1.4 2005/12/11 12:21:29 christos Exp $ */
/*-
* Copyright (c) 2000, 2003 Ben Harris
* All rights reserved.
diff --git a/sys/dev/ic/vga.c b/sys/dev/ic/vga.c
index 20c6af8a67b..924142affe7 100644
--- a/sys/dev/ic/vga.c
+++ b/sys/dev/ic/vga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.82 2005/10/21 14:44:08 dbj Exp $ */
+/* $NetBSD: vga.c,v 1.83 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -35,7 +35,7 @@
#include "opt_wsmsgattrs.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.82 2005/10/21 14:44:08 dbj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga.c,v 1.83 2005/12/11 12:21:29 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -262,7 +262,7 @@ const struct wsscreen_list vga_screenlist = {
_vga_scrlist_mono
};
-static int vga_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int vga_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t vga_mmap(void *, off_t, int);
static int vga_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@@ -760,7 +760,7 @@ vga_set_video(struct vga_config *vc, int state)
}
int
-vga_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+vga_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct vga_config *vc = v;
const struct vga_funcs *vf = vc->vc_funcs;
@@ -800,7 +800,7 @@ vga_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
if (vf->vf_ioctl == NULL)
return (EPASSTHROUGH);
- return ((*vf->vf_ioctl)(v, cmd, data, flag, p));
+ return ((*vf->vf_ioctl)(v, cmd, data, flag, l));
}
static paddr_t
diff --git a/sys/dev/ic/vga_common.c b/sys/dev/ic/vga_common.c
index f4c2d1780e8..3c1c93e40e9 100644
--- a/sys/dev/ic/vga_common.c
+++ b/sys/dev/ic/vga_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_common.c,v 1.5 2005/02/27 00:27:03 perry Exp $ */
+/* $NetBSD: vga_common.c,v 1.6 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_common.c,v 1.5 2005/02/27 00:27:03 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_common.c,v 1.6 2005/12/11 12:21:29 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/vga_raster.c b/sys/dev/ic/vga_raster.c
index 32f3d08f970..5097299a944 100644
--- a/sys/dev/ic/vga_raster.c
+++ b/sys/dev/ic/vga_raster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_raster.c,v 1.18 2005/10/21 14:44:08 dbj Exp $ */
+/* $NetBSD: vga_raster.c,v 1.19 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.18 2005/10/21 14:44:08 dbj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_raster.c,v 1.19 2005/12/11 12:21:29 christos Exp $");
#include "opt_wsmsgattrs.h" /* for WSDISPLAY_CUSTOM_OUTPUT */
diff --git a/sys/dev/ic/vga_subr.c b/sys/dev/ic/vga_subr.c
index e0123c2ef12..29427803ac5 100644
--- a/sys/dev/ic/vga_subr.c
+++ b/sys/dev/ic/vga_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_subr.c,v 1.19 2004/12/27 14:20:43 tsutsui Exp $ */
+/* $NetBSD: vga_subr.c,v 1.20 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 1998
@@ -30,7 +30,7 @@
#include "opt_wsdisplay_border.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_subr.c,v 1.19 2004/12/27 14:20:43 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_subr.c,v 1.20 2005/12/11 12:21:29 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/vgareg.h b/sys/dev/ic/vgareg.h
index b85476f5ced..5c6dba8d81c 100644
--- a/sys/dev/ic/vgareg.h
+++ b/sys/dev/ic/vgareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vgareg.h,v 1.8 2004/07/29 22:29:37 jmmv Exp $ */
+/* $NetBSD: vgareg.h,v 1.9 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 1998
diff --git a/sys/dev/ic/vgavar.h b/sys/dev/ic/vgavar.h
index 9f852d784b5..5b6077a458e 100644
--- a/sys/dev/ic/vgavar.h
+++ b/sys/dev/ic/vgavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vgavar.h,v 1.22 2005/02/27 00:27:03 perry Exp $ */
+/* $NetBSD: vgavar.h,v 1.23 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -42,7 +42,7 @@ struct vga_handle {
#define vh_memh vh_ph.ph_memh
struct vga_funcs {
- int (*vf_ioctl)(void *, u_long, caddr_t, int, struct proc *);
+ int (*vf_ioctl)(void *, u_long, caddr_t, int, struct lwp *);
paddr_t (*vf_mmap)(void *, off_t, int);
};
diff --git a/sys/dev/ic/videomode.h b/sys/dev/ic/videomode.h
index 594525136d4..d4baf923ad7 100644
--- a/sys/dev/ic/videomode.h
+++ b/sys/dev/ic/videomode.h
@@ -1,4 +1,4 @@
-/* $NetBSD: videomode.h,v 1.3 2005/02/27 00:27:03 perry Exp $ */
+/* $NetBSD: videomode.h,v 1.4 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 2001, 2002 Bang Jun-Young
diff --git a/sys/dev/ic/wdc_upc.c b/sys/dev/ic/wdc_upc.c
index 9fd6ecd66b2..cc0bb4f6831 100644
--- a/sys/dev/ic/wdc_upc.c
+++ b/sys/dev/ic/wdc_upc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_upc.c,v 1.20 2005/02/27 00:27:03 perry Exp $ */
+/* $NetBSD: wdc_upc.c,v 1.21 2005/12/11 12:21:29 christos Exp $ */
/*-
* Copyright (c) 2000 Ben Harris
* All rights reserved.
@@ -28,7 +28,7 @@
/* This file is part of NetBSD/arm26 -- a port of NetBSD to ARM2/3 machines. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_upc.c,v 1.20 2005/02/27 00:27:03 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_upc.c,v 1.21 2005/12/11 12:21:29 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/ic/wdcreg.h b/sys/dev/ic/wdcreg.h
index f7d5f130144..2d28e5ccee1 100644
--- a/sys/dev/ic/wdcreg.h
+++ b/sys/dev/ic/wdcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wdcreg.h,v 1.33 2004/05/25 20:42:41 thorpej Exp $ */
+/* $NetBSD: wdcreg.h,v 1.34 2005/12/11 12:21:29 christos Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
diff --git a/sys/dev/ic/wdcvar.h b/sys/dev/ic/wdcvar.h
index f3b9b91582e..63c5dbd5c75 100644
--- a/sys/dev/ic/wdcvar.h
+++ b/sys/dev/ic/wdcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wdcvar.h,v 1.83 2005/08/06 22:07:24 bouyer Exp $ */
+/* $NetBSD: wdcvar.h,v 1.84 2005/12/11 12:21:29 christos Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ic/we.c b/sys/dev/ic/we.c
index 82a7b7c448d..7c93a834e32 100644
--- a/sys/dev/ic/we.c
+++ b/sys/dev/ic/we.c
@@ -1,4 +1,4 @@
-/* $NetBSD: we.c,v 1.7 2005/04/03 10:56:59 jdolecek Exp $ */
+/* $NetBSD: we.c,v 1.8 2005/12/11 12:21:29 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: we.c,v 1.7 2005/04/03 10:56:59 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: we.c,v 1.8 2005/12/11 12:21:29 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/wevar.h b/sys/dev/ic/wevar.h
index 09459dc1986..72b49fba32d 100644
--- a/sys/dev/ic/wevar.h
+++ b/sys/dev/ic/wevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wevar.h,v 1.3 2005/04/03 10:56:59 jdolecek Exp $ */
+/* $NetBSD: wevar.h,v 1.4 2005/12/11 12:21:29 christos Exp $ */
/*
* National Semiconductor DS8390 NIC register definitions.
diff --git a/sys/dev/ic/wi_ieee.h b/sys/dev/ic/wi_ieee.h
index 3c872f8eb37..c9651283405 100644
--- a/sys/dev/ic/wi_ieee.h
+++ b/sys/dev/ic/wi_ieee.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wi_ieee.h,v 1.23 2005/02/27 00:27:03 perry Exp $ */
+/* $NetBSD: wi_ieee.h,v 1.24 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/ic/wireg.h b/sys/dev/ic/wireg.h
index 1bd4c2d90c5..6b2af314a81 100644
--- a/sys/dev/ic/wireg.h
+++ b/sys/dev/ic/wireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wireg.h,v 1.51 2005/02/27 00:27:03 perry Exp $ */
+/* $NetBSD: wireg.h,v 1.52 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/ic/z8530reg.h b/sys/dev/ic/z8530reg.h
index 088264ef1ff..8aa13ad8b87 100644
--- a/sys/dev/ic/z8530reg.h
+++ b/sys/dev/ic/z8530reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530reg.h,v 1.11 2003/11/02 11:07:46 wiz Exp $ */
+/* $NetBSD: z8530reg.h,v 1.12 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/ic/z8530sc.c b/sys/dev/ic/z8530sc.c
index 23c74ca4d90..fddb7d8b56f 100644
--- a/sys/dev/ic/z8530sc.c
+++ b/sys/dev/ic/z8530sc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530sc.c,v 1.21 2005/02/27 00:27:03 perry Exp $ */
+/* $NetBSD: z8530sc.c,v 1.22 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: z8530sc.c,v 1.21 2005/02/27 00:27:03 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: z8530sc.c,v 1.22 2005/12/11 12:21:29 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ic/z8530sc.h b/sys/dev/ic/z8530sc.h
index 4a2be442503..65f3981fb54 100644
--- a/sys/dev/ic/z8530sc.h
+++ b/sys/dev/ic/z8530sc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530sc.h,v 1.21 2005/02/04 02:10:37 perry Exp $ */
+/* $NetBSD: z8530sc.h,v 1.22 2005/12/11 12:21:29 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/ic/z8530tty.c b/sys/dev/ic/z8530tty.c
index c59e568ca7a..c561bb3a9be 100644
--- a/sys/dev/ic/z8530tty.c
+++ b/sys/dev/ic/z8530tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: z8530tty.c,v 1.100 2005/09/06 21:40:39 kleink Exp $ */
+/* $NetBSD: z8530tty.c,v 1.101 2005/12/11 12:21:29 christos Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
@@ -137,7 +137,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.100 2005/09/06 21:40:39 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.101 2005/12/11 12:21:29 christos Exp $");
#include "opt_kgdb.h"
#include "opt_ntp.h"
@@ -555,15 +555,16 @@ zs_shutdown(zst)
* Open a zs serial (tty) port.
*/
int
-zsopen(dev, flags, mode, p)
+zsopen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct zstty_softc *zst;
struct zs_chanstate *cs;
struct tty *tp;
+ struct proc *p;
int s, s2;
int error;
@@ -573,6 +574,7 @@ zsopen(dev, flags, mode, p)
tp = zst->zst_tty;
cs = zst->zst_cs;
+ p = l->l_proc;
/* If KGDB took the line, then tp==NULL */
if (tp == NULL)
@@ -709,11 +711,11 @@ bad:
* Close a zs serial port.
*/
int
-zsclose(dev, flags, mode, p)
+zsclose(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct zstty_softc *zst = device_lookup(&zstty_cd, ZSUNIT(dev));
struct tty *tp = zst->zst_tty;
@@ -765,36 +767,37 @@ zswrite(dev, uio, flags)
}
int
-zspoll(dev, events, p)
+zspoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct zstty_softc *zst = device_lookup(&zstty_cd, ZSUNIT(dev));
struct tty *tp = zst->zst_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
int
-zsioctl(dev, cmd, data, flag, p)
+zsioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct zstty_softc *zst = device_lookup(&zstty_cd, ZSUNIT(dev));
struct zs_chanstate *cs = zst->zst_cs;
struct tty *tp = zst->zst_tty;
+ struct proc *p = l->l_proc;
int error;
int s;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
diff --git a/sys/dev/ieee1394/Makefile b/sys/dev/ieee1394/Makefile
index f18522937fa..d73db52f68a 100644
--- a/sys/dev/ieee1394/Makefile
+++ b/sys/dev/ieee1394/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/11 15:37:00 kiyohara Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/11 12:22:02 christos Exp $
INCSDIR= /usr/include/dev/ieee1394
diff --git a/sys/dev/ieee1394/files.ieee1394 b/sys/dev/ieee1394/files.ieee1394
index a0e0a34bebb..113d57cfcca 100644
--- a/sys/dev/ieee1394/files.ieee1394
+++ b/sys/dev/ieee1394/files.ieee1394
@@ -1,4 +1,4 @@
-# $NetBSD: files.ieee1394,v 1.8 2005/07/11 15:37:00 kiyohara Exp $
+# $NetBSD: files.ieee1394,v 1.9 2005/12/11 12:22:02 christos Exp $
file dev/ieee1394/fwohci.c fwohci
diff --git a/sys/dev/ieee1394/firewire.c b/sys/dev/ieee1394/firewire.c
index e3d91e57ef2..01dd142293e 100644
--- a/sys/dev/ieee1394/firewire.c
+++ b/sys/dev/ieee1394/firewire.c
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.c,v 1.4 2005/08/26 11:20:33 drochner Exp $ */
+/* $NetBSD: firewire.c,v 1.5 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -1471,7 +1471,7 @@ static void
fw_kthread_create0(void *arg)
{
struct firewire_comm *fc = (struct firewire_comm *)arg;
- fw_proc *p;
+ fw_thread *p;
config_pending_incr();
diff --git a/sys/dev/ieee1394/firewire.h b/sys/dev/ieee1394/firewire.h
index 5a2c16df777..296bdde1f3a 100644
--- a/sys/dev/ieee1394/firewire.h
+++ b/sys/dev/ieee1394/firewire.h
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.h,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: firewire.h,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
diff --git a/sys/dev/ieee1394/firewire_phy.h b/sys/dev/ieee1394/firewire_phy.h
index 117c964ae2b..d2c7412d2fd 100644
--- a/sys/dev/ieee1394/firewire_phy.h
+++ b/sys/dev/ieee1394/firewire_phy.h
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire_phy.h,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: firewire_phy.h,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
* All rights reserved.
diff --git a/sys/dev/ieee1394/firewirereg.h b/sys/dev/ieee1394/firewirereg.h
index cc83e1b913c..4370c33f5e7 100644
--- a/sys/dev/ieee1394/firewirereg.h
+++ b/sys/dev/ieee1394/firewirereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: firewirereg.h,v 1.2 2005/07/20 15:11:57 drochner Exp $ */
+/* $NetBSD: firewirereg.h,v 1.3 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
diff --git a/sys/dev/ieee1394/fw_port.h b/sys/dev/ieee1394/fw_port.h
index 9223b27848f..c8e8c252d0e 100644
--- a/sys/dev/ieee1394/fw_port.h
+++ b/sys/dev/ieee1394/fw_port.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fw_port.h,v 1.5 2005/12/04 19:15:21 christos Exp $ */
+/* $NetBSD: fw_port.h,v 1.6 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2004 KIYOHARA Takashi
* All rights reserved.
@@ -51,12 +51,15 @@
#ifdef __DragonFly__
typedef d_thread_t fw_proc;
+typedef d_thread_t fw_thread;
#include <sys/select.h>
#define M_DONTWAIT MB_DONTWAIT
#elif __FreeBSD_version >= 500000
typedef struct thread fw_proc;
+typedef struct thread fw_thread;
#include <sys/selinfo.h>
#else
+typedef struct proc fw_thread;
typedef struct proc fw_proc;
#include <sys/select.h>
#endif
@@ -556,7 +559,8 @@ typedef struct device * device_t;
#define dev2unit minor
#define unit2minor(x) (((x) & 0xff) | (((x) << 12) & ~0xfffff)) /* XXX */
-typedef struct proc fw_proc;
+typedef struct lwp fw_proc;
+typedef struct proc fw_thread;
#include <sys/select.h>
#define CALLOUT_INIT(x) callout_init(x)
diff --git a/sys/dev/ieee1394/fwcrom.c b/sys/dev/ieee1394/fwcrom.c
index ca06d45ff12..fd3ca345a76 100644
--- a/sys/dev/ieee1394/fwcrom.c
+++ b/sys/dev/ieee1394/fwcrom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwcrom.c,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: fwcrom.c,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
diff --git a/sys/dev/ieee1394/fwdev.c b/sys/dev/ieee1394/fwdev.c
index 6b0e292f08b..123317a7beb 100644
--- a/sys/dev/ieee1394/fwdev.c
+++ b/sys/dev/ieee1394/fwdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdev.c,v 1.2 2005/07/20 15:11:57 drochner Exp $ */
+/* $NetBSD: fwdev.c,v 1.3 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
diff --git a/sys/dev/ieee1394/fwdma.c b/sys/dev/ieee1394/fwdma.c
index 35bd0dea2c8..52cce6a29fb 100644
--- a/sys/dev/ieee1394/fwdma.c
+++ b/sys/dev/ieee1394/fwdma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdma.c,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: fwdma.c,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2003
* Hidetoshi Shimokawa. All rights reserved.
diff --git a/sys/dev/ieee1394/fwdma.h b/sys/dev/ieee1394/fwdma.h
index de7b2094156..3a935c483ac 100644
--- a/sys/dev/ieee1394/fwdma.h
+++ b/sys/dev/ieee1394/fwdma.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fwdma.h,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: fwdma.h,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
diff --git a/sys/dev/ieee1394/fwmem.c b/sys/dev/ieee1394/fwmem.c
index 23841c97b5e..1fe395342fa 100644
--- a/sys/dev/ieee1394/fwmem.c
+++ b/sys/dev/ieee1394/fwmem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwmem.c,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: fwmem.c,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
diff --git a/sys/dev/ieee1394/fwmem.h b/sys/dev/ieee1394/fwmem.h
index b8908f44639..125a16dfb3f 100644
--- a/sys/dev/ieee1394/fwmem.h
+++ b/sys/dev/ieee1394/fwmem.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fwmem.h,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: fwmem.h,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (C) 2002-2003
* Hidetoshi Shimokawa. All rights reserved.
diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c
index d3debd9895b..449aeeb8a62 100644
--- a/sys/dev/ieee1394/fwohci.c
+++ b/sys/dev/ieee1394/fwohci.c
@@ -1,4 +1,5 @@
-/* $NetBSD: fwohci.c,v 1.90 2005/07/20 15:11:57 drochner Exp $ */
+/* $NetBSD: fwohci.c,v 1.91 2005/12/11 12:22:02 christos Exp $ */
+
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -56,7 +57,8 @@
#include <sys/endian.h>
#include <sys/ktr.h>
-#include <machine/bus.h>
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.91 2005/12/11 12:22:02 christos Exp $");
#if defined(__DragonFly__) || __FreeBSD_version < 500000
#include <machine/clock.h> /* for DELAY() */
diff --git a/sys/dev/ieee1394/fwohcireg.h b/sys/dev/ieee1394/fwohcireg.h
index 7e0b806225b..542c6592742 100644
--- a/sys/dev/ieee1394/fwohcireg.h
+++ b/sys/dev/ieee1394/fwohcireg.h
@@ -1,4 +1,5 @@
-/* $NetBSD: fwohcireg.h,v 1.14 2005/07/11 15:37:00 kiyohara Exp $ */
+/* $NetBSD: fwohcireg.h,v 1.15 2005/12/11 12:22:02 christos Exp $ */
+
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
diff --git a/sys/dev/ieee1394/fwohcivar.h b/sys/dev/ieee1394/fwohcivar.h
index 2162a5a9c6a..a02cde6d327 100644
--- a/sys/dev/ieee1394/fwohcivar.h
+++ b/sys/dev/ieee1394/fwohcivar.h
@@ -1,4 +1,5 @@
-/* $NetBSD: fwohcivar.h,v 1.24 2005/07/11 15:37:00 kiyohara Exp $ */
+/* $NetBSD: fwohcivar.h,v 1.25 2005/12/11 12:22:02 christos Exp $ */
+
/*-
* Copyright (c) 2003 Hidetoshi SHimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi SHimokawa
diff --git a/sys/dev/ieee1394/fwphyreg.h b/sys/dev/ieee1394/fwphyreg.h
index 94268638603..07bb1442957 100644
--- a/sys/dev/ieee1394/fwphyreg.h
+++ b/sys/dev/ieee1394/fwphyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fwphyreg.h,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: fwphyreg.h,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (C) 2003
* Hidetoshi Shimokawa. All rights reserved.
diff --git a/sys/dev/ieee1394/iec13213.h b/sys/dev/ieee1394/iec13213.h
index 70b34a1b4e6..23cf3c7ac35 100644
--- a/sys/dev/ieee1394/iec13213.h
+++ b/sys/dev/ieee1394/iec13213.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iec13213.h,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: iec13213.h,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
diff --git a/sys/dev/ieee1394/iec68113.h b/sys/dev/ieee1394/iec68113.h
index 95d3209d95d..91949cccac5 100644
--- a/sys/dev/ieee1394/iec68113.h
+++ b/sys/dev/ieee1394/iec68113.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iec68113.h,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: iec68113.h,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
diff --git a/sys/dev/ieee1394/if_fwip.c b/sys/dev/ieee1394/if_fwip.c
index 3f4eff19a9b..8e27bf10cab 100644
--- a/sys/dev/ieee1394/if_fwip.c
+++ b/sys/dev/ieee1394/if_fwip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fwip.c,v 1.2 2005/07/23 16:55:13 kiyohara Exp $ */
+/* $NetBSD: if_fwip.c,v 1.3 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2004
* Doug Rabson
diff --git a/sys/dev/ieee1394/if_fwipvar.h b/sys/dev/ieee1394/if_fwipvar.h
index 8088971aec5..dc4bf5da8b9 100644
--- a/sys/dev/ieee1394/if_fwipvar.h
+++ b/sys/dev/ieee1394/if_fwipvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fwipvar.h,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: if_fwipvar.h,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2004
* Doug Rabson
diff --git a/sys/dev/ieee1394/sbp.c b/sys/dev/ieee1394/sbp.c
index 90b2435c3c1..0af7b692812 100644
--- a/sys/dev/ieee1394/sbp.c
+++ b/sys/dev/ieee1394/sbp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbp.c,v 1.2 2005/08/29 17:20:31 kiyohara Exp $ */
+/* $NetBSD: sbp.c,v 1.3 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
diff --git a/sys/dev/ieee1394/sbp.h b/sys/dev/ieee1394/sbp.h
index 958f377b6c0..efa7562d2b7 100644
--- a/sys/dev/ieee1394/sbp.h
+++ b/sys/dev/ieee1394/sbp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sbp.h,v 1.1 2005/07/11 15:29:05 kiyohara Exp $ */
+/* $NetBSD: sbp.h,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
diff --git a/sys/dev/ir/cir.c b/sys/dev/ir/cir.c
index 532a049c33e..5531aeab949 100644
--- a/sys/dev/ir/cir.c
+++ b/sys/dev/ir/cir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cir.c,v 1.9 2003/07/14 15:47:14 lukem Exp $ */
+/* $NetBSD: cir.c,v 1.10 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.9 2003/07/14 15:47:14 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cir.c,v 1.10 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ir/cirvar.h b/sys/dev/ir/cirvar.h
index d8b03991e7c..98dd8e9a498 100644
--- a/sys/dev/ir/cirvar.h
+++ b/sys/dev/ir/cirvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cirvar.h,v 1.5 2003/07/08 10:06:31 itojun Exp $ */
+/* $NetBSD: cirvar.h,v 1.6 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ir/ir.c b/sys/dev/ir/ir.c
index 99c92cdd337..eb90769b01d 100644
--- a/sys/dev/ir/ir.c
+++ b/sys/dev/ir/ir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ir.c,v 1.3 2003/07/14 15:47:14 lukem Exp $ */
+/* $NetBSD: ir.c,v 1.4 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ir.c,v 1.3 2003/07/14 15:47:14 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ir.c,v 1.4 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ir/ir.h b/sys/dev/ir/ir.h
index 861048c394c..27ef72c0880 100644
--- a/sys/dev/ir/ir.h
+++ b/sys/dev/ir/ir.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ir.h,v 1.3 2003/07/08 10:06:31 itojun Exp $ */
+/* $NetBSD: ir.h,v 1.4 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ir/irframe.c b/sys/dev/ir/irframe.c
index 830c5cb44f8..d29bfdefa19 100644
--- a/sys/dev/ir/irframe.c
+++ b/sys/dev/ir/irframe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe.c,v 1.29 2005/06/21 14:01:12 ws Exp $ */
+/* $NetBSD: irframe.c,v 1.30 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe.c,v 1.29 2005/06/21 14:01:12 ws Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe.c,v 1.30 2005/12/11 12:22:02 christos Exp $");
#include "irframe.h"
@@ -184,7 +184,7 @@ irframe_detach(struct device *self, int flags)
}
int
-irframeopen(dev_t dev, int flag, int mode, struct proc *p)
+irframeopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct irframe_softc *sc;
int error;
@@ -197,7 +197,7 @@ irframeopen(dev_t dev, int flag, int mode, struct proc *p)
if (sc->sc_open)
return (EBUSY);
if (sc->sc_methods->im_open != NULL) {
- error = sc->sc_methods->im_open(sc->sc_handle, flag, mode, p);
+ error = sc->sc_methods->im_open(sc->sc_handle, flag, mode, l);
if (error)
return (error);
}
@@ -210,7 +210,7 @@ irframeopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-irframeclose(dev_t dev, int flag, int mode, struct proc *p)
+irframeclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct irframe_softc *sc;
int error;
@@ -220,7 +220,7 @@ irframeclose(dev_t dev, int flag, int mode, struct proc *p)
return (ENXIO);
sc->sc_open = 0;
if (sc->sc_methods->im_close != NULL)
- error = sc->sc_methods->im_close(sc->sc_handle, flag, mode, p);
+ error = sc->sc_methods->im_close(sc->sc_handle, flag, mode, l);
else
error = 0;
return (error);
@@ -338,7 +338,7 @@ irf_reset_params(struct irframe_softc *sc)
}
int
-irframeioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+irframeioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct irframe_softc *sc;
void *vaddr = addr;
@@ -380,7 +380,7 @@ irframeioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
}
int
-irframepoll(dev_t dev, int events, struct proc *p)
+irframepoll(dev_t dev, int events, struct lwp *l)
{
struct irframe_softc *sc;
@@ -390,7 +390,7 @@ irframepoll(dev_t dev, int events, struct proc *p)
if ((sc->sc_dev.dv_flags & DVF_ACTIVE) == 0 || !sc->sc_open)
return (POLLHUP);
- return (sc->sc_methods->im_poll(sc->sc_handle, events, p));
+ return (sc->sc_methods->im_poll(sc->sc_handle, events, l));
}
int
diff --git a/sys/dev/ir/irframe_tty.c b/sys/dev/ir/irframe_tty.c
index f5bf1f1259d..b4990908174 100644
--- a/sys/dev/ir/irframe_tty.c
+++ b/sys/dev/ir/irframe_tty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irframe_tty.c,v 1.30 2005/11/27 05:35:52 thorpej Exp $ */
+/* $NetBSD: irframe_tty.c,v 1.31 2005/12/11 12:22:02 christos Exp $ */
/*
* TODO
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.30 2005/11/27 05:35:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irframe_tty.c,v 1.31 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -130,7 +130,7 @@ struct irframet_softc {
/* line discipline methods */
int irframetopen(dev_t, struct tty *);
int irframetclose(struct tty *, int);
-int irframetioctl(struct tty *, u_long, caddr_t, int, struct proc *);
+int irframetioctl(struct tty *, u_long, caddr_t, int, struct lwp *);
int irframetinput(int, struct tty *);
int irframetstart(struct tty *);
@@ -138,11 +138,11 @@ int irframetstart(struct tty *);
void irframettyattach(int);
/* irframe methods */
-static int irframet_open(void *, int, int, struct proc *);
-static int irframet_close(void *, int, int, struct proc *);
+static int irframet_open(void *, int, int, struct lwp *);
+static int irframet_close(void *, int, int, struct lwp *);
static int irframet_read(void *, struct uio *, int);
static int irframet_write(void *, struct uio *, int);
-static int irframet_poll(void *, int, struct proc *);
+static int irframet_poll(void *, int, struct lwp *);
static int irframet_kqfilter(void *, struct knote *);
static int irframet_set_params(void *, struct irda_params *);
@@ -220,10 +220,12 @@ irframettyattach(int n)
int
irframetopen(dev_t dev, struct tty *tp)
{
- struct proc *p = curproc; /* XXX */
+ struct lwp *l = curlwp; /* XXX */
struct irframet_softc *sc;
+ struct proc *p;
int error, s;
+ p = l->l_proc;
DPRINTF(("%s\n", __FUNCTION__));
if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
@@ -299,7 +301,7 @@ irframetclose(struct tty *tp, int flag)
/* ARGSUSED */
int
irframetioctl(struct tty *tp, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
int error;
@@ -473,7 +475,7 @@ irframetinput(int c, struct tty *tp)
/*** irframe methods ***/
int
-irframet_open(void *h, int flag, int mode, struct proc *p)
+irframet_open(void *h, int flag, int mode, struct lwp *l)
{
struct tty *tp = h;
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
@@ -494,7 +496,7 @@ irframet_open(void *h, int flag, int mode, struct proc *p)
}
int
-irframet_close(void *h, int flag, int mode, struct proc *p)
+irframet_close(void *h, int flag, int mode, struct lwp *l)
{
struct tty *tp = h;
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
@@ -652,7 +654,7 @@ irt_write_frame(struct tty *tp, u_int8_t *tbuf, size_t len)
}
int
-irframet_poll(void *h, int events, struct proc *p)
+irframet_poll(void *h, int events, struct lwp *l)
{
struct tty *tp = h;
struct irframet_softc *sc = (struct irframet_softc *)tp->t_sc;
@@ -673,7 +675,7 @@ irframet_poll(void *h, int events, struct proc *p)
revents |= events & (POLLIN | POLLRDNORM);
} else {
DPRINTF(("%s: recording select\n", __FUNCTION__));
- selrecord(p, &sc->sc_rsel);
+ selrecord(l, &sc->sc_rsel);
}
}
splx(s);
@@ -849,7 +851,7 @@ irt_ioctl(struct tty *tp, u_long cmd, void *arg)
dev = tp->t_dev;
cdev = cdevsw_lookup(dev);
if (cdev != NULL)
- error = (*cdev->d_ioctl)(dev, cmd, arg, 0, curproc);
+ error = (*cdev->d_ioctl)(dev, cmd, arg, 0, curlwp);
else
error = ENXIO;
#ifdef DIAGNOSTIC
diff --git a/sys/dev/ir/irframevar.h b/sys/dev/ir/irframevar.h
index 2796eae585d..f0f74ed89a3 100644
--- a/sys/dev/ir/irframevar.h
+++ b/sys/dev/ir/irframevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: irframevar.h,v 1.13 2003/07/08 10:06:31 itojun Exp $ */
+/* $NetBSD: irframevar.h,v 1.14 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,11 +37,11 @@
*/
struct irframe_methods {
- int (*im_open)(void *, int, int, struct proc *);
- int (*im_close)(void *, int, int, struct proc *);
+ int (*im_open)(void *, int, int, struct lwp *);
+ int (*im_close)(void *, int, int, struct lwp *);
int (*im_read)(void *, struct uio *, int);
int (*im_write)(void *, struct uio *, int);
- int (*im_poll)(void *, int, struct proc *);
+ int (*im_poll)(void *, int, struct lwp *);
int (*im_kqfilter)(void *, struct knote *);
int (*im_set_params)(void *, struct irda_params *);
int (*im_get_speeds)(void *, int *);
diff --git a/sys/dev/ir/sir.c b/sys/dev/ir/sir.c
index b76f6387f7f..03c15e4955e 100644
--- a/sys/dev/ir/sir.c
+++ b/sys/dev/ir/sir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sir.c,v 1.3 2003/07/14 15:47:15 lukem Exp $ */
+/* $NetBSD: sir.c,v 1.4 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sir.c,v 1.3 2003/07/14 15:47:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sir.c,v 1.4 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
diff --git a/sys/dev/ir/sir.h b/sys/dev/ir/sir.h
index 9ff4428ba81..5d39811762c 100644
--- a/sys/dev/ir/sir.h
+++ b/sys/dev/ir/sir.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sir.h,v 1.3 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: sir.h,v 1.4 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/README.seagate b/sys/dev/isa/README.seagate
index 0cf5c65628e..b3e995b0558 100644
--- a/sys/dev/isa/README.seagate
+++ b/sys/dev/isa/README.seagate
@@ -1,4 +1,4 @@
-# $NetBSD: README.seagate,v 1.4 2005/02/27 00:27:17 perry Exp $
+# $NetBSD: README.seagate,v 1.5 2005/12/11 12:22:02 christos Exp $
The hardware:
diff --git a/sys/dev/isa/ad1848_isa.c b/sys/dev/isa/ad1848_isa.c
index c3781527466..3d23aaacc5d 100644
--- a/sys/dev/isa/ad1848_isa.c
+++ b/sys/dev/isa/ad1848_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848_isa.c,v 1.29 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: ad1848_isa.c,v 1.30 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.29 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ad1848_isa.c,v 1.30 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/ad1848var.h b/sys/dev/isa/ad1848var.h
index 0a82df73e9e..846f70e5f37 100644
--- a/sys/dev/isa/ad1848var.h
+++ b/sys/dev/isa/ad1848var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848var.h,v 1.41 2005/06/28 10:16:33 wiz Exp $ */
+/* $NetBSD: ad1848var.h,v 1.42 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/addcom_isa.c b/sys/dev/isa/addcom_isa.c
index c7165b6a9ab..43a6f5b54c2 100644
--- a/sys/dev/isa/addcom_isa.c
+++ b/sys/dev/isa/addcom_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: addcom_isa.c,v 1.12 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: addcom_isa.c,v 1.13 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2000 Michael Graff. All rights reserved.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.12 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: addcom_isa.c,v 1.13 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/adv_isa.c b/sys/dev/isa/adv_isa.c
index 40ed4549d98..2dc31dbc009 100644
--- a/sys/dev/isa/adv_isa.c
+++ b/sys/dev/isa/adv_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_isa.c,v 1.10 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: adv_isa.c,v 1.11 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.10 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_isa.c,v 1.11 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/aha_isa.c b/sys/dev/isa/aha_isa.c
index b3293e31254..3d5559767f5 100644
--- a/sys/dev/isa/aha_isa.c
+++ b/sys/dev/isa/aha_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_isa.c,v 1.19 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: aha_isa.c,v 1.20 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.19 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_isa.c,v 1.20 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c
index 67a78a189d1..0a8d1807501 100644
--- a/sys/dev/isa/aic_isa.c
+++ b/sys/dev/isa/aic_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_isa.c,v 1.15 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: aic_isa.c,v 1.16 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Charles M. Hannum. All rights reserved.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.15 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_isa.c,v 1.16 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/aria.c b/sys/dev/isa/aria.c
index 2308628e876..a4b3d1d71f3 100644
--- a/sys/dev/isa/aria.c
+++ b/sys/dev/isa/aria.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aria.c,v 1.23 2005/01/12 17:43:19 kent Exp $ */
+/* $NetBSD: aria.c,v 1.24 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1995, 1996, 1998 Roland C. Dowdeswell. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.23 2005/01/12 17:43:19 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.24 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/ariareg.h b/sys/dev/isa/ariareg.h
index 384698d4da1..a531e7a4d0b 100644
--- a/sys/dev/isa/ariareg.h
+++ b/sys/dev/isa/ariareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ariareg.h,v 1.4 2005/01/13 15:01:27 kent Exp $ */
+/* $NetBSD: ariareg.h,v 1.5 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Roland C. Dowdeswell. All rights reserved.
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index a0a68bc60ec..a6b3b7e8a1b 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ast.c,v 1.55 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: ast.c,v 1.56 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.55 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.56 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/atppc_isa.c b/sys/dev/isa/atppc_isa.c
index cede480158e..b087652eaeb 100644
--- a/sys/dev/isa/atppc_isa.c
+++ b/sys/dev/isa/atppc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_isa.c,v 1.7 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: atppc_isa.c,v 1.8 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.7 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_isa.c,v 1.8 2005/12/11 12:22:02 christos Exp $");
#include "opt_atppc.h"
diff --git a/sys/dev/isa/atppc_isadma.c b/sys/dev/isa/atppc_isadma.c
index 652821ad3d7..0a7006e3067 100644
--- a/sys/dev/isa/atppc_isadma.c
+++ b/sys/dev/isa/atppc_isadma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_isadma.c,v 1.2 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: atppc_isadma.c,v 1.3 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_isadma.c,v 1.2 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_isadma.c,v 1.3 2005/12/11 12:22:02 christos Exp $");
#include "opt_atppc.h"
diff --git a/sys/dev/isa/atppc_isadma.h b/sys/dev/isa/atppc_isadma.h
index f25823aae87..597095cea26 100644
--- a/sys/dev/isa/atppc_isadma.h
+++ b/sys/dev/isa/atppc_isadma.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_isadma.h,v 1.3 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: atppc_isadma.h,v 1.4 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2003 Bruce J.A. Nourish
diff --git a/sys/dev/isa/attimer_isa.c b/sys/dev/isa/attimer_isa.c
index c7a8b03d25e..3bec92fa0b4 100644
--- a/sys/dev/isa/attimer_isa.c
+++ b/sys/dev/isa/attimer_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: attimer_isa.c,v 1.1 2005/03/25 23:06:19 cube Exp $ */
+/* $NetBSD: attimer_isa.c,v 1.2 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: attimer_isa.c,v 1.1 2005/03/25 23:06:19 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: attimer_isa.c,v 1.2 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/aztech.c b/sys/dev/isa/aztech.c
index 2fd698377e2..b7a289b2034 100644
--- a/sys/dev/isa/aztech.c
+++ b/sys/dev/isa/aztech.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aztech.c,v 1.9 2004/10/29 12:57:17 yamt Exp $ */
+/* $NetBSD: aztech.c,v 1.10 2005/12/11 12:22:02 christos Exp $ */
/* $OpenBSD: aztech.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: aztech.c,v 1.11 2001/10/20 13:23:47 pva Exp $ */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aztech.c,v 1.9 2004/10/29 12:57:17 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aztech.c,v 1.10 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/bha_isa.c b/sys/dev/isa/bha_isa.c
index f929e4d2dc1..124ebc91868 100644
--- a/sys/dev/isa/bha_isa.c
+++ b/sys/dev/isa/bha_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_isa.c,v 1.26 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: bha_isa.c,v 1.27 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.26 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_isa.c,v 1.27 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c
index 8a7376071ad..a1e3ea723b9 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: boca.c,v 1.44 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: boca.c,v 1.45 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.44 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: boca.c,v 1.45 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/cec.c b/sys/dev/isa/cec.c
index db00b7908a5..c763cb11ab3 100644
--- a/sys/dev/isa/cec.c
+++ b/sys/dev/isa/cec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cec.c,v 1.3 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: cec.c,v 1.4 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cec.c,v 1.3 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cec.c,v 1.4 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/cms.c b/sys/dev/isa/cms.c
index 924aebd8a76..f5c54afc875 100644
--- a/sys/dev/isa/cms.c
+++ b/sys/dev/isa/cms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cms.c,v 1.10 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: cms.c,v 1.11 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.10 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.11 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/cmsreg.h b/sys/dev/isa/cmsreg.h
index 3607901bab7..dcad4a8913d 100644
--- a/sys/dev/isa/cmsreg.h
+++ b/sys/dev/isa/cmsreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cmsreg.h,v 1.2 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: cmsreg.h,v 1.3 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/com_isa.c b/sys/dev/isa/com_isa.c
index 9f3c8c94300..7775a59004f 100644
--- a/sys/dev/isa/com_isa.c
+++ b/sys/dev/isa/com_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_isa.c,v 1.23 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: com_isa.c,v 1.24 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.23 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isa.c,v 1.24 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/com_multi.c b/sys/dev/isa/com_multi.c
index 477d62de57f..c1efff21bac 100644
--- a/sys/dev/isa/com_multi.c
+++ b/sys/dev/isa/com_multi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_multi.c,v 1.20 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: com_multi.c,v 1.21 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.20 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_multi.c,v 1.21 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/com_multi.h b/sys/dev/isa/com_multi.h
index 41c932ed1bc..9d9ca65b0c7 100644
--- a/sys/dev/isa/com_multi.h
+++ b/sys/dev/isa/com_multi.h
@@ -1,4 +1,4 @@
-/* $NetBSD: com_multi.h,v 1.2 2004/09/14 17:19:34 drochner Exp $ */
+/* $NetBSD: com_multi.h,v 1.3 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
diff --git a/sys/dev/isa/commultiprint.c b/sys/dev/isa/commultiprint.c
index 77388569e81..f8ba7699c25 100644
--- a/sys/dev/isa/commultiprint.c
+++ b/sys/dev/isa/commultiprint.c
@@ -1,4 +1,4 @@
-/* $NetBSD: commultiprint.c,v 1.1 2004/09/14 17:19:34 drochner Exp $ */
+/* $NetBSD: commultiprint.c,v 1.2 2005/12/11 12:22:02 christos Exp $ */
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/cs4231var.h b/sys/dev/isa/cs4231var.h
index 3fb21816102..58db6b5b5e9 100644
--- a/sys/dev/isa/cs4231var.h
+++ b/sys/dev/isa/cs4231var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231var.h,v 1.5 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: cs4231var.h,v 1.6 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/cs89x0isa.c b/sys/dev/isa/cs89x0isa.c
index df701735b90..98227f0f845 100644
--- a/sys/dev/isa/cs89x0isa.c
+++ b/sys/dev/isa/cs89x0isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0isa.c,v 1.10 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: cs89x0isa.c,v 1.11 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright 1997
@@ -36,7 +36,7 @@
/* isa DMA routines for cs89x0 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.10 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs89x0isa.c,v 1.11 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/cs89x0isavar.h b/sys/dev/isa/cs89x0isavar.h
index 33f3423ce3f..9602e12fbbb 100644
--- a/sys/dev/isa/cs89x0isavar.h
+++ b/sys/dev/isa/cs89x0isavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs89x0isavar.h,v 1.3 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: cs89x0isavar.h,v 1.4 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
diff --git a/sys/dev/isa/cy_isa.c b/sys/dev/isa/cy_isa.c
index d69f8517dd8..3dccfa4aee3 100644
--- a/sys/dev/isa/cy_isa.c
+++ b/sys/dev/isa/cy_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy_isa.c,v 1.18 2004/09/14 20:20:46 drochner Exp $ */
+/* $NetBSD: cy_isa.c,v 1.19 2005/12/11 12:22:02 christos Exp $ */
/*
* cy.c
@@ -10,7 +10,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy_isa.c,v 1.18 2004/09/14 20:20:46 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy_isa.c,v 1.19 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/daic_isa.c b/sys/dev/isa/daic_isa.c
index 559d47f89bd..880720f487f 100644
--- a/sys/dev/isa/daic_isa.c
+++ b/sys/dev/isa/daic_isa.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: daic_isa.c,v 1.12 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: daic_isa.c,v 1.13 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/sys/dev/isa/depca_isa.c b/sys/dev/isa/depca_isa.c
index 7fe1a47e91d..b38bb70a271 100644
--- a/sys/dev/isa/depca_isa.c
+++ b/sys/dev/isa/depca_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: depca_isa.c,v 1.8 2004/09/14 20:20:46 drochner Exp $ */
+/* $NetBSD: depca_isa.c,v 1.9 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: depca_isa.c,v 1.8 2004/09/14 20:20:46 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: depca_isa.c,v 1.9 2005/12/11 12:22:02 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/isa/dpt_isa.c b/sys/dev/isa/dpt_isa.c
index 705b7c1dff0..d470d35844e 100644
--- a/sys/dev/isa/dpt_isa.c
+++ b/sys/dev/isa/dpt_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_isa.c,v 1.14 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: dpt_isa.c,v 1.15 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.14 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_isa.c,v 1.15 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/ega.c b/sys/dev/isa/ega.c
index 26aa85cd559..05e0012367a 100644
--- a/sys/dev/isa/ega.c
+++ b/sys/dev/isa/ega.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ega.c,v 1.18 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: ega.c,v 1.19 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1999
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.18 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ega.c,v 1.19 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/egavar.h b/sys/dev/isa/egavar.h
index e480ee7ffa5..9e3b7807b3a 100644
--- a/sys/dev/isa/egavar.h
+++ b/sys/dev/isa/egavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: egavar.h,v 1.3 2004/03/24 17:26:53 drochner Exp $ */
+/* $NetBSD: egavar.h,v 1.4 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1999
diff --git a/sys/dev/isa/elink.h b/sys/dev/isa/elink.h
index a1cfb14e2a8..218682835e2 100644
--- a/sys/dev/isa/elink.h
+++ b/sys/dev/isa/elink.h
@@ -1,4 +1,4 @@
-/* $NetBSD: elink.h,v 1.9 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: elink.h,v 1.10 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/esp_isa.c b/sys/dev/isa/esp_isa.c
index e6f2829e7b4..79badd1198f 100644
--- a/sys/dev/isa/esp_isa.c
+++ b/sys/dev/isa/esp_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_isa.c,v 1.30 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: esp_isa.c,v 1.31 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -113,7 +113,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_isa.c,v 1.30 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_isa.c,v 1.31 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/esp_isavar.h b/sys/dev/isa/esp_isavar.h
index 227f3f90850..0e0e44c9f7c 100644
--- a/sys/dev/isa/esp_isavar.h
+++ b/sys/dev/isa/esp_isavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_isavar.h,v 1.3 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: esp_isavar.h,v 1.4 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1997 Allen Briggs.
diff --git a/sys/dev/isa/ess.c b/sys/dev/isa/ess.c
index aa9ebe241c4..727e867b9f3 100644
--- a/sys/dev/isa/ess.c
+++ b/sys/dev/isa/ess.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess.c,v 1.68 2005/05/30 04:32:38 christos Exp $ */
+/* $NetBSD: ess.c,v 1.69 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright 1997
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.68 2005/05/30 04:32:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess.c,v 1.69 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/ess_isa.c b/sys/dev/isa/ess_isa.c
index 35b0134679d..220944de8e9 100644
--- a/sys/dev/isa/ess_isa.c
+++ b/sys/dev/isa/ess_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_isa.c,v 1.13 2005/01/13 15:01:27 kent Exp $ */
+/* $NetBSD: ess_isa.c,v 1.14 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.13 2005/01/13 15:01:27 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_isa.c,v 1.14 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/essreg.h b/sys/dev/isa/essreg.h
index 631c5c1edd0..878ed3a22a7 100644
--- a/sys/dev/isa/essreg.h
+++ b/sys/dev/isa/essreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: essreg.h,v 1.15 2005/01/13 15:01:27 kent Exp $ */
+/* $NetBSD: essreg.h,v 1.16 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright 1997
* Digital Equipment Corporation. All rights reserved.
@@ -33,7 +33,7 @@
*/
/*
-** @(#) $RCSfile: essreg.h,v $ $Revision: 1.15 $ (SHARK) $Date: 2005/01/13 15:01:27 $
+** @(#) $RCSfile: essreg.h,v $ $Revision: 1.16 $ (SHARK) $Date: 2005/12/11 12:22:02 $
**
**++
**
diff --git a/sys/dev/isa/essvar.h b/sys/dev/isa/essvar.h
index 55480245c3c..c747f5a8dc0 100644
--- a/sys/dev/isa/essvar.h
+++ b/sys/dev/isa/essvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: essvar.h,v 1.23 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: essvar.h,v 1.24 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright 1997
* Digital Equipment Corporation. All rights reserved.
@@ -33,7 +33,7 @@
*/
/*
-** @(#) $RCSfile: essvar.h,v $ $Revision: 1.23 $ (SHARK) $Date: 2005/02/27 00:27:17 $
+** @(#) $RCSfile: essvar.h,v $ $Revision: 1.24 $ (SHARK) $Date: 2005/12/11 12:22:02 $
**
**++
**
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 683b32dde55..4adecc312ee 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.60 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: fd.c,v 1.61 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.60 2005/10/15 17:29:12 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.61 2005/12/11 12:22:02 christos Exp $");
#include "rnd.h"
#include "opt_ddb.h"
@@ -253,7 +253,7 @@ void fdcpseudointr(void *arg);
void fdcretry(struct fdc_softc *fdc);
void fdfinish(struct fd_softc *fd, struct buf *bp);
__inline const struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
-int fdformat(dev_t, struct ne7_fd_formb *, struct proc *);
+int fdformat(dev_t, struct ne7_fd_formb *, struct lwp *);
void fd_mountroot_hook(struct device *);
@@ -815,11 +815,11 @@ out_fdc(iot, ioh, x)
}
int
-fdopen(dev, flags, mode, p)
+fdopen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct fd_softc *fd;
const struct fd_type *type;
@@ -845,11 +845,11 @@ fdopen(dev, flags, mode, p)
}
int
-fdclose(dev, flags, mode, p)
+fdclose(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct fd_softc *fd = device_lookup(&fd_cd, FDUNIT(dev));
@@ -1308,12 +1308,12 @@ fdcretry(fdc)
}
int
-fdioctl(dev, cmd, addr, flag, p)
+fdioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct fd_softc *fd = device_lookup(&fd_cd, FDUNIT(dev));
struct fdformat_parms *form_parms;
@@ -1495,7 +1495,7 @@ fdioctl(dev, cmd, addr, flag, p)
fd_formb->fd_formb_secsize(i) = fd->sc_type->secsize;
}
- error = fdformat(dev, fd_formb, p);
+ error = fdformat(dev, fd_formb, l);
free(fd_formb, M_TEMP);
return error;
@@ -1517,10 +1517,10 @@ fdioctl(dev, cmd, addr, flag, p)
}
int
-fdformat(dev, finfo, p)
+fdformat(dev, finfo, l)
dev_t dev;
struct ne7_fd_formb *finfo;
- struct proc *p;
+ struct lwp *l;
{
int rv = 0, s;
struct fd_softc *fd = device_lookup(&fd_cd, FDUNIT(dev));
@@ -1537,7 +1537,7 @@ fdformat(dev, finfo, p)
memset((void *)bp, 0, sizeof(struct buf));
BUF_INIT(bp);
bp->b_flags = B_BUSY | B_PHYS | B_FORMAT;
- bp->b_proc = p;
+ bp->b_proc = l->l_proc;
bp->b_dev = dev;
/*
diff --git a/sys/dev/isa/fdc_isa.c b/sys/dev/isa/fdc_isa.c
index f68c87cc31f..f7e789bc78b 100644
--- a/sys/dev/isa/fdc_isa.c
+++ b/sys/dev/isa/fdc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_isa.c,v 1.11 2004/09/14 20:20:47 drochner Exp $ */
+/* $NetBSD: fdc_isa.c,v 1.12 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.11 2004/09/14 20:20:47 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_isa.c,v 1.12 2005/12/11 12:22:02 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/isa/fdcvar.h b/sys/dev/isa/fdcvar.h
index 51009447724..57017b5e458 100644
--- a/sys/dev/isa/fdcvar.h
+++ b/sys/dev/isa/fdcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fdcvar.h,v 1.6 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: fdcvar.h,v 1.7 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/fdreg.h b/sys/dev/isa/fdreg.h
index 26abfa48a61..a16452a09e7 100644
--- a/sys/dev/isa/fdreg.h
+++ b/sys/dev/isa/fdreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fdreg.h,v 1.5 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: fdreg.h,v 1.6 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
diff --git a/sys/dev/isa/fdvar.h b/sys/dev/isa/fdvar.h
index 8ee6ce438dd..8fc0c42933b 100644
--- a/sys/dev/isa/fdvar.h
+++ b/sys/dev/isa/fdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fdvar.h,v 1.2 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: fdvar.h,v 1.3 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index cbc43c29400..66e2b0dac52 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.141 2005/09/27 02:56:27 jmcneill Exp $
+# $NetBSD: files.isa,v 1.142 2005/12/11 12:22:02 christos Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 48b969bd888..25510d19a20 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gus.c,v 1.89 2005/05/30 04:32:38 christos Exp $ */
+/* $NetBSD: gus.c,v 1.90 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1996, 1999 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.89 2005/05/30 04:32:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus.c,v 1.90 2005/12/11 12:22:02 christos Exp $");
#include "gus.h"
#if NGUS > 0
diff --git a/sys/dev/isa/gusreg.h b/sys/dev/isa/gusreg.h
index 86b0d56a4cc..9c0d6178a28 100644
--- a/sys/dev/isa/gusreg.h
+++ b/sys/dev/isa/gusreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gusreg.h,v 1.7 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: gusreg.h,v 1.8 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c
index 2f21a69037d..86f652075ac 100644
--- a/sys/dev/isa/i82365_isa.c
+++ b/sys/dev/isa/i82365_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isa.c,v 1.23 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: i82365_isa.c,v 1.24 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.23 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_isa.c,v 1.24 2005/12/11 12:22:02 christos Exp $");
#define PCICISADEBUG
diff --git a/sys/dev/isa/i82365_isasubr.c b/sys/dev/isa/i82365_isasubr.c
index 8f7ee542355..ebe155e118e 100644
--- a/sys/dev/isa/i82365_isasubr.c
+++ b/sys/dev/isa/i82365_isasubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isasubr.c,v 1.36 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: i82365_isasubr.c,v 1.37 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.36 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_isasubr.c,v 1.37 2005/12/11 12:22:02 christos Exp $");
#define PCICISADEBUG
diff --git a/sys/dev/isa/i82365_isavar.h b/sys/dev/isa/i82365_isavar.h
index fc854a2a42d..86e250ff786 100644
--- a/sys/dev/isa/i82365_isavar.h
+++ b/sys/dev/isa/i82365_isavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isavar.h,v 1.5 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: i82365_isavar.h,v 1.6 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1998 Bill Sommerfeld. All rights reserved.
diff --git a/sys/dev/isa/ics2101.c b/sys/dev/isa/ics2101.c
index c2f7f84a726..d2fdcb263de 100644
--- a/sys/dev/isa/ics2101.c
+++ b/sys/dev/isa/ics2101.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ics2101.c,v 1.11 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: ics2101.c,v 1.12 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ics2101.c,v 1.11 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ics2101.c,v 1.12 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/ics2101var.h b/sys/dev/isa/ics2101var.h
index 59eea51548f..c2e5ca94667 100644
--- a/sys/dev/isa/ics2101var.h
+++ b/sys/dev/isa/ics2101var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ics2101var.h,v 1.7 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: ics2101var.h,v 1.8 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/if_ai.c b/sys/dev/isa/if_ai.c
index 183349fb89b..995eec901b3 100644
--- a/sys/dev/isa/if_ai.c
+++ b/sys/dev/isa/if_ai.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ai.c,v 1.22 2005/05/30 04:32:38 christos Exp $ */
+/* $NetBSD: if_ai.c,v 1.23 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.22 2005/05/30 04:32:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ai.c,v 1.23 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_ate.c b/sys/dev/isa/if_ate.c
index ca71faedd53..87fa8bf122c 100644
--- a/sys/dev/isa/if_ate.c
+++ b/sys/dev/isa/if_ate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ate.c,v 1.42 2005/01/09 16:59:41 tsutsui Exp $ */
+/* $NetBSD: if_ate.c,v 1.43 2005/12/11 12:22:02 christos Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.42 2005/01/09 16:59:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ate.c,v 1.43 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_cs_isa.c b/sys/dev/isa/if_cs_isa.c
index 99cad359a02..c3820de6a20 100644
--- a/sys/dev/isa/if_cs_isa.c
+++ b/sys/dev/isa/if_cs_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_isa.c,v 1.15 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: if_cs_isa.c,v 1.16 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright 1997
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.15 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_isa.c,v 1.16 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c
index c85089dffa8..c7057b1a3c3 100644
--- a/sys/dev/isa/if_ec.c
+++ b/sys/dev/isa/if_ec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ec.c,v 1.24 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: if_ec.c,v 1.25 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.24 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.25 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_ef.c b/sys/dev/isa/if_ef.c
index 1cd93116e74..787fb40df6c 100644
--- a/sys/dev/isa/if_ef.c
+++ b/sys/dev/isa/if_ef.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ef.c,v 1.19 2005/05/30 04:32:38 christos Exp $ */
+/* $NetBSD: if_ef.c,v 1.20 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.19 2005/05/30 04:32:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ef.c,v 1.20 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index 6873c5978ed..c52329440f7 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eg.c,v 1.65 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: if_eg.c,v 1.66 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.65 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eg.c,v 1.66 2005/12/11 12:22:02 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/isa/if_egreg.h b/sys/dev/isa/if_egreg.h
index 14fdacfccfc..ae765db1339 100644
--- a/sys/dev/isa/if_egreg.h
+++ b/sys/dev/isa/if_egreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_egreg.h,v 1.4 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: if_egreg.h,v 1.5 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1993 Dean Huxley (dean@fsa.ca)
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 4ac9084a5df..b976e4fb70e 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_el.c,v 1.72 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: if_el.c,v 1.73 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.72 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_el.c,v 1.73 2005/12/11 12:22:02 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c
index b398dcf810f..73d269d5521 100644
--- a/sys/dev/isa/if_ep_isa.c
+++ b/sys/dev/isa/if_ep_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_isa.c,v 1.36 2005/05/12 18:53:08 christos Exp $ */
+/* $NetBSD: if_ep_isa.c,v 1.37 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.36 2005/05/12 18:53:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_isa.c,v 1.37 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_fmv_isa.c b/sys/dev/isa/if_fmv_isa.c
index 747b5349d55..be3efcfa87a 100644
--- a/sys/dev/isa/if_fmv_isa.c
+++ b/sys/dev/isa/if_fmv_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fmv_isa.c,v 1.4 2005/01/09 16:59:41 tsutsui Exp $ */
+/* $NetBSD: if_fmv_isa.c,v 1.5 2005/12/11 12:22:02 christos Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fmv_isa.c,v 1.4 2005/01/09 16:59:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fmv_isa.c,v 1.5 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_hp.c b/sys/dev/isa/if_hp.c
index bfde67d72b2..909c64222ef 100644
--- a/sys/dev/isa/if_hp.c
+++ b/sys/dev/isa/if_hp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hp.c,v 1.38 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: if_hp.c,v 1.39 2005/12/11 12:22:02 christos Exp $ */
/* XXX THIS DRIVER IS BROKEN. IT WILL NOT EVEN COMPILE. */
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hp.c,v 1.38 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hp.c,v 1.39 2005/12/11 12:22:02 christos Exp $");
#include "hp.h"
#if NHP > 0
diff --git a/sys/dev/isa/if_ix.c b/sys/dev/isa/if_ix.c
index 71085055e2b..a017a1bc2ca 100644
--- a/sys/dev/isa/if_ix.c
+++ b/sys/dev/isa/if_ix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ix.c,v 1.22 2005/05/30 04:32:38 christos Exp $ */
+/* $NetBSD: if_ix.c,v 1.23 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.22 2005/05/30 04:32:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ix.c,v 1.23 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_iy.c b/sys/dev/isa/if_iy.c
index ef998702b13..d0bbab8eef8 100644
--- a/sys/dev/isa/if_iy.c
+++ b/sys/dev/isa/if_iy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iy.c,v 1.68 2005/05/22 15:54:46 christos Exp $ */
+/* $NetBSD: if_iy.c,v 1.69 2005/12/11 12:22:02 christos Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.68 2005/05/22 15:54:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.69 2005/12/11 12:22:02 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/isa/if_lc_isa.c b/sys/dev/isa/if_lc_isa.c
index aec3e402ff3..55a9fbef691 100644
--- a/sys/dev/isa/if_lc_isa.c
+++ b/sys/dev/isa/if_lc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lc_isa.c,v 1.22 2005/05/30 04:32:38 christos Exp $ */
+/* $NetBSD: if_lc_isa.c,v 1.23 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1994, 1995, 1997 Matt Thomas <matt@3am-software.com>
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.22 2005/05/30 04:32:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lc_isa.c,v 1.23 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c
index 631dbdb75ad..ff57d7c2dc2 100644
--- a/sys/dev/isa/if_le_isa.c
+++ b/sys/dev/isa/if_le_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_isa.c,v 1.39 2005/05/30 04:32:38 christos Exp $ */
+/* $NetBSD: if_le_isa.c,v 1.40 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.39 2005/05/30 04:32:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_isa.c,v 1.40 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c
index 81196b416e9..452ed5cf320 100644
--- a/sys/dev/isa/if_ne_isa.c
+++ b/sys/dev/isa/if_ne_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_isa.c,v 1.20 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: if_ne_isa.c,v 1.21 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.20 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_isa.c,v 1.21 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_ntwoc_isa.c b/sys/dev/isa/if_ntwoc_isa.c
index c1e1dfbcb75..4882f894615 100644
--- a/sys/dev/isa/if_ntwoc_isa.c
+++ b/sys/dev/isa/if_ntwoc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ntwoc_isa.c,v 1.10 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: if_ntwoc_isa.c,v 1.11 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
* Copyright (c) 1996 John Hay.
@@ -29,11 +29,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: if_ntwoc_isa.c,v 1.10 2005/02/27 00:27:17 perry Exp $
+ * $Id: if_ntwoc_isa.c,v 1.11 2005/12/11 12:22:02 christos Exp $
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.10 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_isa.c,v 1.11 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_sm_isa.c b/sys/dev/isa/if_sm_isa.c
index 239d216d422..b1d3d714e4f 100644
--- a/sys/dev/isa/if_sm_isa.c
+++ b/sys/dev/isa/if_sm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_isa.c,v 1.14 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: if_sm_isa.c,v 1.15 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.14 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_isa.c,v 1.15 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_tr_isa.c b/sys/dev/isa/if_tr_isa.c
index 297a6af8878..0d931a07217 100644
--- a/sys/dev/isa/if_tr_isa.c
+++ b/sys/dev/isa/if_tr_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_isa.c,v 1.13 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: if_tr_isa.c,v 1.14 2005/12/11 12:22:02 christos Exp $ */
/* XXXJRT changes isa_attach_args too early!! */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.13 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_isa.c,v 1.14 2005/12/11 12:22:02 christos Exp $");
#undef TRISADEBUG
diff --git a/sys/dev/isa/if_tribm_isa.c b/sys/dev/isa/if_tribm_isa.c
index 9867d098a08..f9d1e9ec888 100644
--- a/sys/dev/isa/if_tribm_isa.c
+++ b/sys/dev/isa/if_tribm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tribm_isa.c,v 1.7 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: if_tribm_isa.c,v 1.8 2005/12/11 12:22:02 christos Exp $ */
/* XXXJRT changes isa_attach_args too early */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.7 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tribm_isa.c,v 1.8 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_trtcm_isa.c b/sys/dev/isa/if_trtcm_isa.c
index d91e27e0fd1..985b185afb2 100644
--- a/sys/dev/isa/if_trtcm_isa.c
+++ b/sys/dev/isa/if_trtcm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_trtcm_isa.c,v 1.9 2005/05/30 04:32:38 christos Exp $ */
+/* $NetBSD: if_trtcm_isa.c,v 1.10 2005/12/11 12:22:02 christos Exp $ */
/* XXXJRT verify doens't change isa_attach_args too early */
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.9 2005/05/30 04:32:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_trtcm_isa.c,v 1.10 2005/12/11 12:22:02 christos Exp $");
#undef TRTCMISADEBUG
diff --git a/sys/dev/isa/if_tscs_isa.c b/sys/dev/isa/if_tscs_isa.c
index 49b88d45d38..95059a1b628 100644
--- a/sys/dev/isa/if_tscs_isa.c
+++ b/sys/dev/isa/if_tscs_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tscs_isa.c,v 1.3 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: if_tscs_isa.c,v 1.4 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.3 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tscs_isa.c,v 1.4 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/if_we_isa.c b/sys/dev/isa/if_we_isa.c
index e33cc0cd6dc..af9b439ff91 100644
--- a/sys/dev/isa/if_we_isa.c
+++ b/sys/dev/isa/if_we_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_we_isa.c,v 1.12 2005/04/03 10:56:59 jdolecek Exp $ */
+/* $NetBSD: if_we_isa.c,v 1.13 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.12 2005/04/03 10:56:59 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_we_isa.c,v 1.13 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/ioat66.c b/sys/dev/isa/ioat66.c
index bc0a1a80ac7..0382b97ff74 100644
--- a/sys/dev/isa/ioat66.c
+++ b/sys/dev/isa/ioat66.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ioat66.c,v 1.11 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: ioat66.c,v 1.12 2005/12/11 12:22:02 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.11 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioat66.c,v 1.12 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index cc80d91aa15..d6091009767 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa.c,v 1.123 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: isa.c,v 1.124 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.123 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa.c,v 1.124 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/isabusprint.c b/sys/dev/isa/isabusprint.c
index 2a7aaf9e92b..7ab4485c5a9 100644
--- a/sys/dev/isa/isabusprint.c
+++ b/sys/dev/isa/isabusprint.c
@@ -1,7 +1,6 @@
-/* $NetBSD: isabusprint.c,v 1.2 2005/05/24 05:14:37 lukem Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isabusprint.c,v 1.2 2005/05/24 05:14:37 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isabusprint.c,v 1.3 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c
index 637e16fe0c7..f8b9a5d3336 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma.c,v 1.53 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: isadma.c,v 1.54 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.53 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.54 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/isadmavar.h b/sys/dev/isa/isadmavar.h
index 93c489e3f27..9c1bc3d9e68 100644
--- a/sys/dev/isa/isadmavar.h
+++ b/sys/dev/isa/isadmavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isadmavar.h,v 1.20 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: isadmavar.h,v 1.21 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/isareg.h b/sys/dev/isa/isareg.h
index 9ba78af07fe..ec185dd6f98 100644
--- a/sys/dev/isa/isareg.h
+++ b/sys/dev/isa/isareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isareg.h,v 1.8 2003/08/07 16:31:07 agc Exp $ */
+/* $NetBSD: isareg.h,v 1.9 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index 09aefda6cd0..b6f8a690efd 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isavar.h,v 1.47 2005/05/29 22:12:37 christos Exp $ */
+/* $NetBSD: isavar.h,v 1.48 2005/12/11 12:22:02 christos Exp $ */
/*-
* Copyright (c) 1997, 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/isic_isa.c b/sys/dev/isa/isic_isa.c
index 0261b0b30fe..b4f173e4193 100644
--- a/sys/dev/isa/isic_isa.c
+++ b/sys/dev/isa/isic_isa.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.23 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa.c,v 1.24 2005/12/11 12:22:02 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/sys/dev/isa/isic_isa_avm_a1.c b/sys/dev/isa/isic_isa_avm_a1.c
index 017e9855fc9..523f7bf4d45 100644
--- a/sys/dev/isa/isic_isa_avm_a1.c
+++ b/sys/dev/isa/isic_isa_avm_a1.c
@@ -35,14 +35,14 @@
* i4b_avm_a1.c - AVM A1/Fritz passive card driver for isdn4bsd
* ------------------------------------------------------------
*
- * $Id: isic_isa_avm_a1.c,v 1.7 2005/07/09 02:05:09 christos Exp $
+ * $Id: isic_isa_avm_a1.c,v 1.8 2005/12/11 12:22:03 christos Exp $
*
* last edit-date: [Fri Jan 5 11:37:22 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_avm_a1.c,v 1.7 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_avm_a1.c,v 1.8 2005/12/11 12:22:03 christos Exp $");
#include "opt_isicisa.h"
#ifdef ISICISA_AVM_A1
diff --git a/sys/dev/isa/isic_isa_itk_ix1.c b/sys/dev/isa/isic_isa_itk_ix1.c
index a9f04d5c22a..5710e0374ca 100644
--- a/sys/dev/isa/isic_isa_itk_ix1.c
+++ b/sys/dev/isa/isic_isa_itk_ix1.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_itk_ix1.c,v 1.11 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_itk_ix1.c,v 1.12 2005/12/11 12:22:03 christos Exp $");
#include "opt_isicisa.h"
diff --git a/sys/dev/isa/isic_isa_tel_s016.c b/sys/dev/isa/isic_isa_tel_s016.c
index 79ef1f16175..15080be1aa5 100644
--- a/sys/dev/isa/isic_isa_tel_s016.c
+++ b/sys/dev/isa/isic_isa_tel_s016.c
@@ -37,7 +37,7 @@
* isic - I4B Siemens ISDN Chipset Driver for Teles S0/16 and clones
* =================================================================
*
- * $Id: isic_isa_tel_s016.c,v 1.6 2005/02/27 00:27:17 perry Exp $
+ * $Id: isic_isa_tel_s016.c,v 1.7 2005/12/11 12:22:03 christos Exp $
*
* last edit-date: [Fri Jan 5 11:37:22 2001]
*
@@ -50,7 +50,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s016.c,v 1.6 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s016.c,v 1.7 2005/12/11 12:22:03 christos Exp $");
#include "opt_isicisa.h"
#ifdef ISICISA_TEL_S0_16
diff --git a/sys/dev/isa/isic_isa_tel_s0163.c b/sys/dev/isa/isic_isa_tel_s0163.c
index efa08af181f..ce038ae8d77 100644
--- a/sys/dev/isa/isic_isa_tel_s0163.c
+++ b/sys/dev/isa/isic_isa_tel_s0163.c
@@ -37,7 +37,7 @@
* isic - I4B Siemens ISDN Chipset Driver for Teles S0/16.3
* ========================================================
*
- * $Id: isic_isa_tel_s0163.c,v 1.7 2005/07/09 02:05:09 christos Exp $
+ * $Id: isic_isa_tel_s0163.c,v 1.8 2005/12/11 12:22:03 christos Exp $
*
* last edit-date: [Fri Jan 5 11:37:22 2001]
*
@@ -49,7 +49,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.7 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s0163.c,v 1.8 2005/12/11 12:22:03 christos Exp $");
#include "opt_isicisa.h"
#ifdef ISICISA_TEL_S0_16_3
diff --git a/sys/dev/isa/isic_isa_tel_s08.c b/sys/dev/isa/isic_isa_tel_s08.c
index e6012661aaa..485aa99d7e7 100644
--- a/sys/dev/isa/isic_isa_tel_s08.c
+++ b/sys/dev/isa/isic_isa_tel_s08.c
@@ -37,7 +37,7 @@
* isic - I4B Siemens ISDN Chipset Driver for Teles S0/8 and clones
* ================================================================
*
- * $Id: isic_isa_tel_s08.c,v 1.6 2005/02/27 00:27:17 perry Exp $
+ * $Id: isic_isa_tel_s08.c,v 1.7 2005/12/11 12:22:03 christos Exp $
*
* last edit-date: [Fri Jan 5 11:37:22 2001]
*
@@ -50,7 +50,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s08.c,v 1.6 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_tel_s08.c,v 1.7 2005/12/11 12:22:03 christos Exp $");
#include "opt_isicisa.h"
#ifdef ISICISA_TEL_S0_8
diff --git a/sys/dev/isa/isic_isa_usr_sti.c b/sys/dev/isa/isic_isa_usr_sti.c
index 96cb7077fd6..17ca887560d 100644
--- a/sys/dev/isa/isic_isa_usr_sti.c
+++ b/sys/dev/isa/isic_isa_usr_sti.c
@@ -27,14 +27,14 @@
* i4b_usr_sti.c - USRobotics Sportster ISDN TA intern (Tina-pp)
* -------------------------------------------------------------
*
- * $Id: isic_isa_usr_sti.c,v 1.5 2005/02/27 00:27:17 perry Exp $
+ * $Id: isic_isa_usr_sti.c,v 1.6 2005/12/11 12:22:03 christos Exp $
*
* last edit-date: [Fri Jan 5 11:37:22 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isa_usr_sti.c,v 1.5 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isa_usr_sti.c,v 1.6 2005/12/11 12:22:03 christos Exp $");
#include "opt_isicisa.h"
#ifdef ISICISA_USR_STI
diff --git a/sys/dev/isa/joy_ess.c b/sys/dev/isa/joy_ess.c
index ef4a7506fb3..debe1c54dbd 100644
--- a/sys/dev/isa/joy_ess.c
+++ b/sys/dev/isa/joy_ess.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_ess.c,v 1.1 2004/08/04 18:53:55 drochner Exp $ */
+/* $NetBSD: joy_ess.c,v 1.2 2005/12/11 12:22:03 christos Exp $ */
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/joy_isa.c b/sys/dev/isa/joy_isa.c
index eb53e379006..bcb73e192e4 100644
--- a/sys/dev/isa/joy_isa.c
+++ b/sys/dev/isa/joy_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_isa.c,v 1.7 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: joy_isa.c,v 1.8 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1995 Jean-Marc Zucconi
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.7 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_isa.c,v 1.8 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/lm_isa.c b/sys/dev/isa/lm_isa.c
index 1aef985d00f..bac7bc34800 100644
--- a/sys/dev/isa/lm_isa.c
+++ b/sys/dev/isa/lm_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lm_isa.c,v 1.10 2004/09/14 20:20:48 drochner Exp $ */
+/* $NetBSD: lm_isa.c,v 1.11 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.10 2004/09/14 20:20:48 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lm_isa.c,v 1.11 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c
index 1557e71061b..8b326639ab3 100644
--- a/sys/dev/isa/lpt_isa.c
+++ b/sys/dev/isa/lpt_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_isa.c,v 1.60 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: lpt_isa.c,v 1.61 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_isa.c,v 1.60 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_isa.c,v 1.61 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/mcd.c b/sys/dev/isa/mcd.c
index 4e73e6912b1..7d101399861 100644
--- a/sys/dev/isa/mcd.c
+++ b/sys/dev/isa/mcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcd.c,v 1.91 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: mcd.c,v 1.92 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1993, 1994, 1995 Charles M. Hannum. All rights reserved.
@@ -56,7 +56,7 @@
/*static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.91 2005/10/15 17:29:12 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcd.c,v 1.92 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -290,10 +290,10 @@ mcdattach(parent, self, aux)
}
int
-mcdopen(dev, flag, fmt, p)
+mcdopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
int error, part;
struct mcd_softc *sc;
@@ -392,10 +392,10 @@ bad3:
}
int
-mcdclose(dev, flag, fmt, p)
+mcdclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct mcd_softc *sc = device_lookup(&mcd_cd, MCDUNIT(dev));
int part = MCDPART(dev);
@@ -566,12 +566,12 @@ mcdwrite(dev, uio, flags)
}
int
-mcdioctl(dev, cmd, addr, flag, p)
+mcdioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct mcd_softc *sc = device_lookup(&mcd_cd, MCDUNIT(dev));
int error;
diff --git a/sys/dev/isa/midi_pcppi.c b/sys/dev/isa/midi_pcppi.c
index af0c4d4525c..4ec55e23945 100644
--- a/sys/dev/isa/midi_pcppi.c
+++ b/sys/dev/isa/midi_pcppi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midi_pcppi.c,v 1.11 2005/03/21 18:27:32 xtraeme Exp $ */
+/* $NetBSD: midi_pcppi.c,v 1.12 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c,v 1.11 2005/03/21 18:27:32 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi_pcppi.c,v 1.12 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/moxa_isa.c b/sys/dev/isa/moxa_isa.c
index 1171c010b45..faad762a711 100644
--- a/sys/dev/isa/moxa_isa.c
+++ b/sys/dev/isa/moxa_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: moxa_isa.c,v 1.11 2005/02/04 02:10:40 perry Exp $ */
+/* $NetBSD: moxa_isa.c,v 1.12 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.11 2005/02/04 02:10:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moxa_isa.c,v 1.12 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/mpu_isa.c b/sys/dev/isa/mpu_isa.c
index 5975caf5090..ddf99a341ee 100644
--- a/sys/dev/isa/mpu_isa.c
+++ b/sys/dev/isa/mpu_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_isa.c,v 1.13 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: mpu_isa.c,v 1.14 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.13 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_isa.c,v 1.14 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/mpu_sb.c b/sys/dev/isa/mpu_sb.c
index 00d3845410e..53530ed0be2 100644
--- a/sys/dev/isa/mpu_sb.c
+++ b/sys/dev/isa/mpu_sb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_sb.c,v 1.8 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: mpu_sb.c,v 1.9 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.8 2005/02/04 02:10:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_sb.c,v 1.9 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/mpu_ym.c b/sys/dev/isa/mpu_ym.c
index 36c37f83a92..c5b842fb9a1 100644
--- a/sys/dev/isa/mpu_ym.c
+++ b/sys/dev/isa/mpu_ym.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_ym.c,v 1.9 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: mpu_ym.c,v 1.10 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.9 2005/02/04 02:10:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_ym.c,v 1.10 2005/12/11 12:22:03 christos Exp $");
#define NMPU_YM 1
diff --git a/sys/dev/isa/nca_isa.c b/sys/dev/isa/nca_isa.c
index bb9e32371c1..f3a5ba68f6b 100644
--- a/sys/dev/isa/nca_isa.c
+++ b/sys/dev/isa/nca_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nca_isa.c,v 1.15 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: nca_isa.c,v 1.16 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nca_isa.c,v 1.15 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nca_isa.c,v 1.16 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c
index 82749d4b2ea..28907a39061 100644
--- a/sys/dev/isa/nsclpcsio_isa.c
+++ b/sys/dev/isa/nsclpcsio_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsclpcsio_isa.c,v 1.12 2005/10/11 15:58:38 drochner Exp $ */
+/* $NetBSD: nsclpcsio_isa.c,v 1.13 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 2002
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.12 2005/10/11 15:58:38 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.13 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/opl_ess.c b/sys/dev/isa/opl_ess.c
index abb47e481c4..9eb6bab6daa 100644
--- a/sys/dev/isa/opl_ess.c
+++ b/sys/dev/isa/opl_ess.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_ess.c,v 1.9 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: opl_ess.c,v 1.10 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.9 2005/02/04 02:10:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_ess.c,v 1.10 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/opl_isa.c b/sys/dev/isa/opl_isa.c
index 97c9447fbaa..a49b803091e 100644
--- a/sys/dev/isa/opl_isa.c
+++ b/sys/dev/isa/opl_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_isa.c,v 1.11 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: opl_isa.c,v 1.12 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.11 2005/02/04 02:10:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_isa.c,v 1.12 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/opl_sb.c b/sys/dev/isa/opl_sb.c
index a3152afec32..4827dfd5d00 100644
--- a/sys/dev/isa/opl_sb.c
+++ b/sys/dev/isa/opl_sb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_sb.c,v 1.10 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: opl_sb.c,v 1.11 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.10 2005/02/04 02:10:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_sb.c,v 1.11 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/opl_wss.c b/sys/dev/isa/opl_wss.c
index 9ae1795b6a6..e3986e6324c 100644
--- a/sys/dev/isa/opl_wss.c
+++ b/sys/dev/isa/opl_wss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_wss.c,v 1.6 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: opl_wss.c,v 1.7 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.6 2005/02/04 02:10:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_wss.c,v 1.7 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/opl_ym.c b/sys/dev/isa/opl_ym.c
index f47bc08c0f2..f0e49ff819c 100644
--- a/sys/dev/isa/opl_ym.c
+++ b/sys/dev/isa/opl_ym.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_ym.c,v 1.8 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: opl_ym.c,v 1.9 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.8 2005/02/04 02:10:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_ym.c,v 1.9 2005/12/11 12:22:03 christos Exp $");
#include "mpu_ym.h"
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index 691e6521448..01e75f59044 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pas.c,v 1.61 2005/01/14 03:41:45 kent Exp $ */
+/* $NetBSD: pas.c,v 1.62 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.61 2005/01/14 03:41:45 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.62 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/pasreg.h b/sys/dev/isa/pasreg.h
index 3c721ef830b..0a927ff7a14 100644
--- a/sys/dev/isa/pasreg.h
+++ b/sys/dev/isa/pasreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pasreg.h,v 1.3 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: pasreg.h,v 1.4 2005/12/11 12:22:03 christos Exp $ */
/* Port addresses and bit fields for the Media Vision Pro AudioSpectrum
* second generation sound cards.
diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c
index 1b04f057e24..9a3f66b2793 100644
--- a/sys/dev/isa/pcdisplay.c
+++ b/sys/dev/isa/pcdisplay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplay.c,v 1.27 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: pcdisplay.c,v 1.28 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.27 2005/02/04 02:10:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcdisplay.c,v 1.28 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -112,7 +112,7 @@ const struct wsscreen_list pcdisplay_screenlist = {
_pcdisplay_scrlist
};
-static int pcdisplay_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int pcdisplay_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t pcdisplay_mmap(void *, off_t, int);
static int pcdisplay_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@@ -375,12 +375,12 @@ pcdisplay_is_console(iot)
}
static int
-pcdisplay_ioctl(v, cmd, data, flag, p)
+pcdisplay_ioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
/*
* XXX "do something!"
diff --git a/sys/dev/isa/pcdisplayvar.h b/sys/dev/isa/pcdisplayvar.h
index 514ebcac981..5d898d4af60 100644
--- a/sys/dev/isa/pcdisplayvar.h
+++ b/sys/dev/isa/pcdisplayvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcdisplayvar.h,v 1.3 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: pcdisplayvar.h,v 1.4 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1998
diff --git a/sys/dev/isa/pckbc_isa.c b/sys/dev/isa/pckbc_isa.c
index d57ba1f6633..f5ba9299881 100644
--- a/sys/dev/isa/pckbc_isa.c
+++ b/sys/dev/isa/pckbc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_isa.c,v 1.16 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: pckbc_isa.c,v 1.17 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1998
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.16 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_isa.c,v 1.17 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c
index eb7c9454455..f228d883c85 100644
--- a/sys/dev/isa/pcppi.c
+++ b/sys/dev/isa/pcppi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi.c,v 1.16 2005/03/25 23:09:00 cube Exp $ */
+/* $NetBSD: pcppi.c,v 1.17 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.16 2005/03/25 23:09:00 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.17 2005/12/11 12:22:03 christos Exp $");
#include "attimer.h"
diff --git a/sys/dev/isa/pcppivar.h b/sys/dev/isa/pcppivar.h
index 290ce09ff6d..5917f6a288f 100644
--- a/sys/dev/isa/pcppivar.h
+++ b/sys/dev/isa/pcppivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppivar.h,v 1.6 2005/03/25 23:09:00 cube Exp $ */
+/* $NetBSD: pcppivar.h,v 1.7 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
diff --git a/sys/dev/isa/radiotrack.c b/sys/dev/isa/radiotrack.c
index e6fe07c2c02..f6f1df75ccb 100644
--- a/sys/dev/isa/radiotrack.c
+++ b/sys/dev/isa/radiotrack.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radiotrack.c,v 1.11 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: radiotrack.c,v 1.12 2005/12/11 12:22:03 christos Exp $ */
/* $OpenBSD: radiotrack.c,v 1.1 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radiotrack.c,v 1.3 2001/10/18 16:51:36 pva Exp $ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radiotrack.c,v 1.11 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radiotrack.c,v 1.12 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/radiotrack2.c b/sys/dev/isa/radiotrack2.c
index 9bf030dfcf0..0c7175056ac 100644
--- a/sys/dev/isa/radiotrack2.c
+++ b/sys/dev/isa/radiotrack2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radiotrack2.c,v 1.10 2004/10/29 12:57:17 yamt Exp $ */
+/* $NetBSD: radiotrack2.c,v 1.11 2005/12/11 12:22:03 christos Exp $ */
/* $OpenBSD: radiotrack2.c,v 1.1 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radiotrack2.c,v 1.2 2001/10/18 16:51:36 pva Exp $ */
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radiotrack2.c,v 1.10 2004/10/29 12:57:17 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radiotrack2.c,v 1.11 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/rtfps.c b/sys/dev/isa/rtfps.c
index 34cffac94a0..3ed23fafb3b 100644
--- a/sys/dev/isa/rtfps.c
+++ b/sys/dev/isa/rtfps.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtfps.c,v 1.49 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: rtfps.c,v 1.50 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.49 2005/02/04 02:10:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtfps.c,v 1.50 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/satlink.c b/sys/dev/isa/satlink.c
index adc9c4f7467..daebfacf2ac 100644
--- a/sys/dev/isa/satlink.c
+++ b/sys/dev/isa/satlink.c
@@ -1,4 +1,4 @@
-/* $NetBSD: satlink.c,v 1.25 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: satlink.c,v 1.26 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.25 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satlink.c,v 1.26 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index ab9fd799d29..ec680b3460e 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sb.c,v 1.80 2005/01/13 15:01:28 kent Exp $ */
+/* $NetBSD: sb.c,v 1.81 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.80 2005/01/13 15:01:28 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.81 2005/12/11 12:22:03 christos Exp $");
#include "midi.h"
diff --git a/sys/dev/isa/sb_isa.c b/sys/dev/isa/sb_isa.c
index 0369a87f3c9..eed73e9584b 100644
--- a/sys/dev/isa/sb_isa.c
+++ b/sys/dev/isa/sb_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_isa.c,v 1.31 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: sb_isa.c,v 1.32 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.31 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isa.c,v 1.32 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/sbdsp.c b/sys/dev/isa/sbdsp.c
index 30a1a12af26..474fbb5c402 100644
--- a/sys/dev/isa/sbdsp.c
+++ b/sys/dev/isa/sbdsp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sbdsp.c,v 1.117 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: sbdsp.c,v 1.118 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.117 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.118 2005/12/11 12:22:03 christos Exp $");
#include "midi.h"
#include "mpu.h"
diff --git a/sys/dev/isa/sbdspvar.h b/sys/dev/isa/sbdspvar.h
index b19c70e53ee..e3196f063ad 100644
--- a/sys/dev/isa/sbdspvar.h
+++ b/sys/dev/isa/sbdspvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sbdspvar.h,v 1.56 2005/01/13 15:01:28 kent Exp $ */
+/* $NetBSD: sbdspvar.h,v 1.57 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
diff --git a/sys/dev/isa/sbreg.h b/sys/dev/isa/sbreg.h
index e02e39cc742..db12f185b8e 100644
--- a/sys/dev/isa/sbreg.h
+++ b/sys/dev/isa/sbreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sbreg.h,v 1.30 2005/01/13 15:01:28 kent Exp $ */
+/* $NetBSD: sbreg.h,v 1.31 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
diff --git a/sys/dev/isa/sbvar.h b/sys/dev/isa/sbvar.h
index a92e879422a..8239bbeda26 100644
--- a/sys/dev/isa/sbvar.h
+++ b/sys/dev/isa/sbvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sbvar.h,v 1.3 2005/01/13 15:01:28 kent Exp $ */
+/* $NetBSD: sbvar.h,v 1.4 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 90e436fe806..c9e43961984 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: seagate.c,v 1.58 2005/05/30 04:32:38 christos Exp $ */
+/* $NetBSD: seagate.c,v 1.59 2005/12/11 12:22:03 christos Exp $ */
/*
* ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.58 2005/05/30 04:32:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: seagate.c,v 1.59 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/sf16fmr2.c b/sys/dev/isa/sf16fmr2.c
index 21ce37b08ab..8b5782e41d1 100644
--- a/sys/dev/isa/sf16fmr2.c
+++ b/sys/dev/isa/sf16fmr2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sf16fmr2.c,v 1.10 2004/10/29 12:57:17 yamt Exp $ */
+/* $NetBSD: sf16fmr2.c,v 1.11 2005/12/11 12:22:03 christos Exp $ */
/* $OpenBSD: sf16fmr2.c,v 1.3 2001/12/18 18:48:08 mickey Exp $ */
/* $RuOBSD: sf16fmr2.c,v 1.12 2001/10/18 16:51:36 pva Exp $ */
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sf16fmr2.c,v 1.10 2004/10/29 12:57:17 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sf16fmr2.c,v 1.11 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index 2cdb2fab2ad..ad9e3277652 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.18 2005/05/29 22:12:26 christos Exp $ */
+/* $NetBSD: spkr.c,v 1.19 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (esr@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.18 2005/05/29 22:12:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.19 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -431,11 +431,11 @@ spkrattach(parent, self, aux)
}
int
-spkropen(dev, flags, mode, p)
+spkropen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
#ifdef SPKRDEBUG
printf("spkropen: entering with dev = %x\n", dev);
@@ -479,11 +479,11 @@ spkrwrite(dev, uio, flags)
}
}
-int spkrclose(dev, flags, mode, p)
+int spkrclose(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
#ifdef SPKRDEBUG
printf("spkrclose: entering with dev = %x\n", dev);
@@ -500,12 +500,12 @@ int spkrclose(dev, flags, mode, p)
return(0);
}
-int spkrioctl(dev, cmd, data, flag, p)
+int spkrioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
#ifdef SPKRDEBUG
printf("spkrioctl: entering with dev = %x, cmd = %lx\n", dev, cmd);
diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c
index 25e90fbeed3..9ca55bb4635 100644
--- a/sys/dev/isa/tcic2_isa.c
+++ b/sys/dev/isa/tcic2_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2_isa.c,v 1.13 2005/02/27 00:27:17 perry Exp $ */
+/* $NetBSD: tcic2_isa.c,v 1.14 2005/12/11 12:22:03 christos Exp $ */
/*
*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.13 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcic2_isa.c,v 1.14 2005/12/11 12:22:03 christos Exp $");
#undef TCICISADEBUG
diff --git a/sys/dev/isa/tcom.c b/sys/dev/isa/tcom.c
index 9c6cc0f27ca..a31db0eae62 100644
--- a/sys/dev/isa/tcom.c
+++ b/sys/dev/isa/tcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcom.c,v 1.10 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: tcom.c,v 1.11 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.10 2005/02/04 02:10:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcom.c,v 1.11 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/toaster.c b/sys/dev/isa/toaster.c
index 0d14d655ebc..1953da50d03 100644
--- a/sys/dev/isa/toaster.c
+++ b/sys/dev/isa/toaster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: toaster.c,v 1.1 2005/08/14 04:14:35 joff Exp $ */
+/* $NetBSD: toaster.c,v 1.2 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.1 2005/08/14 04:14:35 joff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toaster.c,v 1.2 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/toasterlcd.c b/sys/dev/isa/toasterlcd.c
index f2353032383..4f87c1188a0 100644
--- a/sys/dev/isa/toasterlcd.c
+++ b/sys/dev/isa/toasterlcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: toasterlcd.c,v 1.1 2005/08/14 04:15:18 joff Exp $ */
+/* $NetBSD: toasterlcd.c,v 1.2 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toasterlcd.c,v 1.1 2005/08/14 04:15:18 joff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toasterlcd.c,v 1.2 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/tsdio.c b/sys/dev/isa/tsdio.c
index e3be11589fe..bb6878e097c 100644
--- a/sys/dev/isa/tsdio.c
+++ b/sys/dev/isa/tsdio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tsdio.c,v 1.2 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: tsdio.c,v 1.3 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsdio.c,v 1.2 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsdio.c,v 1.3 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/tsdioreg.h b/sys/dev/isa/tsdioreg.h
index d9c152b52ca..c1f65cec812 100644
--- a/sys/dev/isa/tsdioreg.h
+++ b/sys/dev/isa/tsdioreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tsdioreg.h,v 1.1 2005/08/14 03:50:34 joff Exp $ */
+/* $NetBSD: tsdioreg.h,v 1.2 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 2004 Jesse Off
diff --git a/sys/dev/isa/tsdiovar.h b/sys/dev/isa/tsdiovar.h
index e0d953b1f1f..cb0df5e9d0d 100644
--- a/sys/dev/isa/tsdiovar.h
+++ b/sys/dev/isa/tsdiovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tsdiovar.h,v 1.1 2005/08/14 03:50:34 joff Exp $ */
+/* $NetBSD: tsdiovar.h,v 1.2 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 2004 Jesse Off
diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c
index 0c1e11ab46c..942dce78620 100644
--- a/sys/dev/isa/uha_isa.c
+++ b/sys/dev/isa/uha_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uha_isa.c,v 1.28 2005/02/04 02:10:41 perry Exp $ */
+/* $NetBSD: uha_isa.c,v 1.29 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.28 2005/02/04 02:10:41 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uha_isa.c,v 1.29 2005/12/11 12:22:03 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/isa/vga_isa.c b/sys/dev/isa/vga_isa.c
index aaddb1f008c..f03d8600c5e 100644
--- a/sys/dev/isa/vga_isa.c
+++ b/sys/dev/isa/vga_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_isa.c,v 1.17 2005/02/27 00:27:18 perry Exp $ */
+/* $NetBSD: vga_isa.c,v 1.18 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_isa.c,v 1.17 2005/02/27 00:27:18 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_isa.c,v 1.18 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/vga_isavar.h b/sys/dev/isa/vga_isavar.h
index 37671282b6b..627427e2b28 100644
--- a/sys/dev/isa/vga_isavar.h
+++ b/sys/dev/isa/vga_isavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_isavar.h,v 1.3 2005/02/27 00:27:18 perry Exp $ */
+/* $NetBSD: vga_isavar.h,v 1.4 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
diff --git a/sys/dev/isa/wdc_isa.c b/sys/dev/isa/wdc_isa.c
index 17a9ad852e1..b1f1a33faa4 100644
--- a/sys/dev/isa/wdc_isa.c
+++ b/sys/dev/isa/wdc_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_isa.c,v 1.46 2004/09/14 20:20:49 drochner Exp $ */
+/* $NetBSD: wdc_isa.c,v 1.47 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.46 2004/09/14 20:20:49 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_isa.c,v 1.47 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 6364c6f661a..1c91ca36d67 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wds.c,v 1.61 2005/02/27 00:27:18 perry Exp $ */
+/* $NetBSD: wds.c,v 1.62 2005/12/11 12:22:03 christos Exp $ */
/*
* XXX
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.61 2005/02/27 00:27:18 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wds.c,v 1.62 2005/12/11 12:22:03 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/isa/wdsreg.h b/sys/dev/isa/wdsreg.h
index 28391f8b105..6649d445fea 100644
--- a/sys/dev/isa/wdsreg.h
+++ b/sys/dev/isa/wdsreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wdsreg.h,v 1.7 2005/02/21 00:29:07 thorpej Exp $ */
+/* $NetBSD: wdsreg.h,v 1.8 2005/12/11 12:22:03 christos Exp $ */
typedef u_char physaddr[3];
typedef u_char physlen[3];
diff --git a/sys/dev/isa/weasel_isa.c b/sys/dev/isa/weasel_isa.c
index c42fd7d7a5f..429768b0b7c 100644
--- a/sys/dev/isa/weasel_isa.c
+++ b/sys/dev/isa/weasel_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: weasel_isa.c,v 1.2 2005/02/27 00:27:18 perry Exp $ */
+/* $NetBSD: weasel_isa.c,v 1.3 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: weasel_isa.c,v 1.2 2005/02/27 00:27:18 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: weasel_isa.c,v 1.3 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/wss.c b/sys/dev/isa/wss.c
index 2de744a1af7..3aa32d6fb47 100644
--- a/sys/dev/isa/wss.c
+++ b/sys/dev/isa/wss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss.c,v 1.62 2005/01/14 03:41:45 kent Exp $ */
+/* $NetBSD: wss.c,v 1.63 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.62 2005/01/14 03:41:45 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss.c,v 1.63 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/wss_isa.c b/sys/dev/isa/wss_isa.c
index a303079bb52..c8a6e89b906 100644
--- a/sys/dev/isa/wss_isa.c
+++ b/sys/dev/isa/wss_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_isa.c,v 1.18 2005/01/14 03:41:45 kent Exp $ */
+/* $NetBSD: wss_isa.c,v 1.19 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1994 John Brezak
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.18 2005/01/14 03:41:45 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isa.c,v 1.19 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/wssvar.h b/sys/dev/isa/wssvar.h
index da0d42bc243..d1a66e137d5 100644
--- a/sys/dev/isa/wssvar.h
+++ b/sys/dev/isa/wssvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wssvar.h,v 1.8 2005/01/14 03:41:45 kent Exp $ */
+/* $NetBSD: wssvar.h,v 1.9 2005/12/11 12:22:03 christos Exp $ */
/*
* Copyright (c) 1994 John Brezak
diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c
index 37e26433d9f..48b4c024ca7 100644
--- a/sys/dev/isa/wt.c
+++ b/sys/dev/isa/wt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wt.c,v 1.65 2005/02/28 05:05:02 simonb Exp $ */
+/* $NetBSD: wt.c,v 1.66 2005/12/11 12:22:03 christos Exp $ */
/*
* Streamer tape driver.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.65 2005/02/28 05:05:02 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wt.c,v 1.66 2005/12/11 12:22:03 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isa/wtreg.h b/sys/dev/isa/wtreg.h
index 4c6f2815afe..635dc5015da 100644
--- a/sys/dev/isa/wtreg.h
+++ b/sys/dev/isa/wtreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wtreg.h,v 1.7 2005/02/27 00:27:18 perry Exp $ */
+/* $NetBSD: wtreg.h,v 1.8 2005/12/11 12:22:03 christos Exp $ */
/*
* Streamer tape driver.
diff --git a/sys/dev/isa/ym.c b/sys/dev/isa/ym.c
index e3609900757..c46520d7256 100644
--- a/sys/dev/isa/ym.c
+++ b/sys/dev/isa/ym.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ym.c,v 1.25 2005/05/30 04:32:38 christos Exp $ */
+/* $NetBSD: ym.c,v 1.26 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.25 2005/05/30 04:32:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym.c,v 1.26 2005/12/11 12:22:03 christos Exp $");
#include "mpu_ym.h"
#include "opt_ym.h"
diff --git a/sys/dev/isa/ymvar.h b/sys/dev/isa/ymvar.h
index 8914e565b28..0d9110c8c51 100644
--- a/sys/dev/isa/ymvar.h
+++ b/sys/dev/isa/ymvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ymvar.h,v 1.9 2005/01/14 03:41:45 kent Exp $ */
+/* $NetBSD: ymvar.h,v 1.10 2005/12/11 12:22:03 christos Exp $ */
/*-
* Copyright (c) 1999-2000, 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isapnp/aha_isapnp.c b/sys/dev/isapnp/aha_isapnp.c
index 0336fd36cd2..2f7bbb069fd 100644
--- a/sys/dev/isapnp/aha_isapnp.c
+++ b/sys/dev/isapnp/aha_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_isapnp.c,v 1.8 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: aha_isapnp.c,v 1.9 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.8 2005/02/04 02:10:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_isapnp.c,v 1.9 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/aic_isapnp.c b/sys/dev/isapnp/aic_isapnp.c
index 74295434253..42e0d6663d3 100644
--- a/sys/dev/isapnp/aic_isapnp.c
+++ b/sys/dev/isapnp/aic_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_isapnp.c,v 1.10 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: aic_isapnp.c,v 1.11 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.10 2005/02/04 02:10:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_isapnp.c,v 1.11 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/atppc_isapnp.c b/sys/dev/isapnp/atppc_isapnp.c
index 09c40690383..eab586b83cb 100644
--- a/sys/dev/isapnp/atppc_isapnp.c
+++ b/sys/dev/isapnp/atppc_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_isapnp.c,v 1.3 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: atppc_isapnp.c,v 1.4 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_isapnp.c,v 1.3 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_isapnp.c,v 1.4 2005/12/11 12:22:16 christos Exp $");
#include "opt_atppc.h"
diff --git a/sys/dev/isapnp/com_isapnp.c b/sys/dev/isapnp/com_isapnp.c
index 0666b7a61fa..d74f13b292a 100644
--- a/sys/dev/isapnp/com_isapnp.c
+++ b/sys/dev/isapnp/com_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_isapnp.c,v 1.21 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: com_isapnp.c,v 1.22 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.21 2005/02/04 02:10:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_isapnp.c,v 1.22 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/devlist2h.awk b/sys/dev/isapnp/devlist2h.awk
index daccee8d541..13b52d3a286 100644
--- a/sys/dev/isapnp/devlist2h.awk
+++ b/sys/dev/isapnp/devlist2h.awk
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: devlist2h.awk,v 1.7 2005/02/27 05:33:35 perry Exp $
+# $NetBSD: devlist2h.awk,v 1.8 2005/12/11 12:22:16 christos Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
# All rights reserved.
diff --git a/sys/dev/isapnp/ess_isapnp.c b/sys/dev/isapnp/ess_isapnp.c
index 6d1c7faea24..607d2551f5a 100644
--- a/sys/dev/isapnp/ess_isapnp.c
+++ b/sys/dev/isapnp/ess_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_isapnp.c,v 1.12 2005/01/13 15:14:03 kent Exp $ */
+/* $NetBSD: ess_isapnp.c,v 1.13 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.12 2005/01/13 15:14:03 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_isapnp.c,v 1.13 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/files.isapnp b/sys/dev/isapnp/files.isapnp
index d499edf5304..fcfbc6dce1b 100644
--- a/sys/dev/isapnp/files.isapnp
+++ b/sys/dev/isapnp/files.isapnp
@@ -1,4 +1,4 @@
-# $NetBSD: files.isapnp,v 1.37 2004/01/31 14:48:15 jdolecek Exp $
+# $NetBSD: files.isapnp,v 1.38 2005/12/11 12:22:16 christos Exp $
#
# Config file and device description for machine-independent ISAPnP code.
# Included by ports that need it.
diff --git a/sys/dev/isapnp/gus_isapnp.c b/sys/dev/isapnp/gus_isapnp.c
index 67c1f665351..f9a13d6d886 100644
--- a/sys/dev/isapnp/gus_isapnp.c
+++ b/sys/dev/isapnp/gus_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gus_isapnp.c,v 1.24 2005/01/13 15:14:03 kent Exp $ */
+/* $NetBSD: gus_isapnp.c,v 1.25 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.24 2005/01/13 15:14:03 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gus_isapnp.c,v 1.25 2005/12/11 12:22:16 christos Exp $");
#include "guspnp.h"
#if NGUSPNP > 0
diff --git a/sys/dev/isapnp/i82365_isapnp.c b/sys/dev/isapnp/i82365_isapnp.c
index e898bdc40e5..b8589cabfc8 100644
--- a/sys/dev/isapnp/i82365_isapnp.c
+++ b/sys/dev/isapnp/i82365_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_isapnp.c,v 1.18 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: i82365_isapnp.c,v 1.19 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 1998 Bill Sommerfeld. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.18 2005/02/04 02:10:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_isapnp.c,v 1.19 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/if_an_isapnp.c b/sys/dev/isapnp/if_an_isapnp.c
index 72881dc1329..9da86fea6dc 100644
--- a/sys/dev/isapnp/if_an_isapnp.c
+++ b/sys/dev/isapnp/if_an_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_isapnp.c,v 1.10 2005/06/22 06:16:02 dyoung Exp $ */
+/* $NetBSD: if_an_isapnp.c,v 1.11 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_isapnp.c,v 1.10 2005/06/22 06:16:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_isapnp.c,v 1.11 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/if_cs_isapnp.c b/sys/dev/isapnp/if_cs_isapnp.c
index 6accaf6371c..dca759444ef 100644
--- a/sys/dev/isapnp/if_cs_isapnp.c
+++ b/sys/dev/isapnp/if_cs_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_isapnp.c,v 1.7 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: if_cs_isapnp.c,v 1.8 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.7 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_isapnp.c,v 1.8 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/if_ep_isapnp.c b/sys/dev/isapnp/if_ep_isapnp.c
index 49e0706f826..3de4ad081c3 100644
--- a/sys/dev/isapnp/if_ep_isapnp.c
+++ b/sys/dev/isapnp/if_ep_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_isapnp.c,v 1.27 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: if_ep_isapnp.c,v 1.28 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone <jonathan@NetBSD.org>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.27 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_isapnp.c,v 1.28 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/if_fmv_isapnp.c b/sys/dev/isapnp/if_fmv_isapnp.c
index 6121ca0ddb8..a9862794099 100644
--- a/sys/dev/isapnp/if_fmv_isapnp.c
+++ b/sys/dev/isapnp/if_fmv_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fmv_isapnp.c,v 1.4 2005/01/09 16:59:41 tsutsui Exp $ */
+/* $NetBSD: if_fmv_isapnp.c,v 1.5 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fmv_isapnp.c,v 1.4 2005/01/09 16:59:41 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fmv_isapnp.c,v 1.5 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/if_le_isapnp.c b/sys/dev/isapnp/if_le_isapnp.c
index 36834e9373c..c955af96582 100644
--- a/sys/dev/isapnp/if_le_isapnp.c
+++ b/sys/dev/isapnp/if_le_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_isapnp.c,v 1.26 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: if_le_isapnp.c,v 1.27 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.26 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_isapnp.c,v 1.27 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/if_ne_isapnp.c b/sys/dev/isapnp/if_ne_isapnp.c
index 6a0a1595464..60fd7e3e713 100644
--- a/sys/dev/isapnp/if_ne_isapnp.c
+++ b/sys/dev/isapnp/if_ne_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_isapnp.c,v 1.19 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: if_ne_isapnp.c,v 1.20 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.19 2005/02/04 02:10:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_isapnp.c,v 1.20 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/if_tr_isapnp.c b/sys/dev/isapnp/if_tr_isapnp.c
index 96388c46210..973871fe84b 100644
--- a/sys/dev/isapnp/if_tr_isapnp.c
+++ b/sys/dev/isapnp/if_tr_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_isapnp.c,v 1.11 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: if_tr_isapnp.c,v 1.12 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.11 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_isapnp.c,v 1.12 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/isapnp.c b/sys/dev/isapnp/isapnp.c
index 005da7629e5..fd5b89f1aa2 100644
--- a/sys/dev/isapnp/isapnp.c
+++ b/sys/dev/isapnp/isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnp.c,v 1.47 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: isapnp.c,v 1.48 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.47 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnp.c,v 1.48 2005/12/11 12:22:16 christos Exp $");
#include "isadma.h"
diff --git a/sys/dev/isapnp/isapnpdebug.c b/sys/dev/isapnp/isapnpdebug.c
index 5cd6333ee49..18abd3398d3 100644
--- a/sys/dev/isapnp/isapnpdebug.c
+++ b/sys/dev/isapnp/isapnpdebug.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnpdebug.c,v 1.8 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: isapnpdebug.c,v 1.9 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnpdebug.c,v 1.8 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnpdebug.c,v 1.9 2005/12/11 12:22:16 christos Exp $");
#ifdef DEBUG_ISAPNP
diff --git a/sys/dev/isapnp/isapnpdevs b/sys/dev/isapnp/isapnpdevs
index 22728224ec0..64add7fd64e 100644
--- a/sys/dev/isapnp/isapnpdevs
+++ b/sys/dev/isapnp/isapnpdevs
@@ -1,4 +1,4 @@
-$NetBSD: isapnpdevs,v 1.56 2005/02/27 00:27:21 perry Exp $
+$NetBSD: isapnpdevs,v 1.57 2005/12/11 12:22:16 christos Exp $
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isapnp/isapnpdevs.c b/sys/dev/isapnp/isapnpdevs.c
index e7d6fe8599b..7814b63d77f 100644
--- a/sys/dev/isapnp/isapnpdevs.c
+++ b/sys/dev/isapnp/isapnpdevs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnpdevs.c,v 1.60 2005/02/27 05:35:40 perry Exp $ */
+/* $NetBSD: isapnpdevs.c,v 1.61 2005/12/11 12:22:16 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnpdevs.c,v 1.60 2005/02/27 05:35:40 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnpdevs.c,v 1.61 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <dev/isapnp/isapnpdevs.h>
diff --git a/sys/dev/isapnp/isapnpdevs.h b/sys/dev/isapnp/isapnpdevs.h
index 2c3411bb798..5640c578985 100644
--- a/sys/dev/isapnp/isapnpdevs.h
+++ b/sys/dev/isapnp/isapnpdevs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnpdevs.h,v 1.56 2005/02/27 05:35:40 perry Exp $ */
+/* $NetBSD: isapnpdevs.h,v 1.57 2005/12/11 12:22:16 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
diff --git a/sys/dev/isapnp/isapnpres.c b/sys/dev/isapnp/isapnpres.c
index 2c2aa18b4cf..64a105a6cff 100644
--- a/sys/dev/isapnp/isapnpres.c
+++ b/sys/dev/isapnp/isapnpres.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnpres.c,v 1.14 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: isapnpres.c,v 1.15 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isapnpres.c,v 1.14 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isapnpres.c,v 1.15 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/isapnpvar.h b/sys/dev/isapnp/isapnpvar.h
index 838f179c761..626dfc5abbe 100644
--- a/sys/dev/isapnp/isapnpvar.h
+++ b/sys/dev/isapnp/isapnpvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isapnpvar.h,v 1.21 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: isapnpvar.h,v 1.22 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/isapnp/isic_isapnp.c b/sys/dev/isapnp/isic_isapnp.c
index 8c0e57b7973..83ec0dced8d 100644
--- a/sys/dev/isapnp/isic_isapnp.c
+++ b/sys/dev/isapnp/isic_isapnp.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.20 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp.c,v 1.21 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/sys/dev/isapnp/isic_isapnp_ctx_s0P.c b/sys/dev/isapnp/isic_isapnp_ctx_s0P.c
index 1bc40868fc9..86e94094ba2 100644
--- a/sys/dev/isapnp/isic_isapnp_ctx_s0P.c
+++ b/sys/dev/isapnp/isic_isapnp_ctx_s0P.c
@@ -27,14 +27,14 @@
* isic - I4B Siemens ISDN Chipset Driver for Creatix PnP cards
* ============================================================
*
- * $Id: isic_isapnp_ctx_s0P.c,v 1.7 2005/07/09 02:05:09 christos Exp $
+ * $Id: isic_isapnp_ctx_s0P.c,v 1.8 2005/12/11 12:22:16 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.7 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_ctx_s0P.c,v 1.8 2005/12/11 12:22:16 christos Exp $");
#include "opt_isicpnp.h"
#if ISICPNP_CRTX_S0_P
diff --git a/sys/dev/isapnp/isic_isapnp_drn_ngo.c b/sys/dev/isapnp/isic_isapnp_drn_ngo.c
index 7227f7a53a8..21867f72118 100644
--- a/sys/dev/isapnp/isic_isapnp_drn_ngo.c
+++ b/sys/dev/isapnp/isic_isapnp_drn_ngo.c
@@ -27,14 +27,14 @@
* i4b_drn_ngo.c - Dr. Neuhaus Niccy GO@ and SAGEM Cybermod
* --------------------------------------------------------
*
- * $Id: isic_isapnp_drn_ngo.c,v 1.7 2005/07/09 02:05:09 christos Exp $
+ * $Id: isic_isapnp_drn_ngo.c,v 1.8 2005/12/11 12:22:16 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_drn_ngo.c,v 1.7 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_drn_ngo.c,v 1.8 2005/12/11 12:22:16 christos Exp $");
#include "opt_isicpnp.h"
#ifdef ISICPNP_DRN_NGO
diff --git a/sys/dev/isapnp/isic_isapnp_dynalink.c b/sys/dev/isapnp/isic_isapnp_dynalink.c
index eb682cd195d..cb209fa1b34 100644
--- a/sys/dev/isapnp/isic_isapnp_dynalink.c
+++ b/sys/dev/isapnp/isic_isapnp_dynalink.c
@@ -33,7 +33,7 @@
* isdn4bsd layer1 driver for Dynalink IS64PH isdn TA
* ==================================================
*
- * $Id: isic_isapnp_dynalink.c,v 1.6 2005/07/09 02:05:09 christos Exp $
+ * $Id: isic_isapnp_dynalink.c,v 1.7 2005/12/11 12:22:16 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_dynalink.c,v 1.6 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_dynalink.c,v 1.7 2005/12/11 12:22:16 christos Exp $");
#include "opt_isicpnp.h"
#ifdef ISICPNP_DYNALINK
diff --git a/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c b/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c
index a6e7e0e17c8..ca5411594ac 100644
--- a/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c
+++ b/sys/dev/isapnp/isic_isapnp_elsa_qs1i.c
@@ -27,14 +27,14 @@
* isic - I4B Siemens ISDN Chipset Driver for ELSA Quickstep 1000pro ISA
* =====================================================================
*
- * $Id: isic_isapnp_elsa_qs1i.c,v 1.12 2005/07/09 02:05:09 christos Exp $
+ * $Id: isic_isapnp_elsa_qs1i.c,v 1.13 2005/12/11 12:22:16 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_elsa_qs1i.c,v 1.12 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_elsa_qs1i.c,v 1.13 2005/12/11 12:22:16 christos Exp $");
#include "opt_isicpnp.h"
#if defined(ISICPNP_ELSA_QS1ISA) || defined(ISICPNP_ELSA_PCC16)
diff --git a/sys/dev/isapnp/isic_isapnp_itkix.c b/sys/dev/isapnp/isic_isapnp_itkix.c
index c9162bea6f1..1ebc5f2d29b 100644
--- a/sys/dev/isapnp/isic_isapnp_itkix.c
+++ b/sys/dev/isapnp/isic_isapnp_itkix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_isapnp_itkix.c,v 1.5 2003/12/04 13:57:30 keihan Exp $ */
+/* $NetBSD: isic_isapnp_itkix.c,v 1.6 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_itkix.c,v 1.5 2003/12/04 13:57:30 keihan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_itkix.c,v 1.6 2005/12/11 12:22:16 christos Exp $");
#include "opt_isicpnp.h"
diff --git a/sys/dev/isapnp/isic_isapnp_siemens_isurf.c b/sys/dev/isapnp/isic_isapnp_siemens_isurf.c
index 3d63b7a6ac0..d699df17937 100644
--- a/sys/dev/isapnp/isic_isapnp_siemens_isurf.c
+++ b/sys/dev/isapnp/isic_isapnp_siemens_isurf.c
@@ -37,14 +37,14 @@
* Siemens I-Surf 2.0 PnP specific routines for isic driver
* --------------------------------------------------------
*
- * $Id: isic_isapnp_siemens_isurf.c,v 1.7 2005/07/09 02:05:09 christos Exp $
+ * $Id: isic_isapnp_siemens_isurf.c,v 1.8 2005/12/11 12:22:16 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_siemens_isurf.c,v 1.7 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_siemens_isurf.c,v 1.8 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/isapnp/isic_isapnp_sws.c b/sys/dev/isapnp/isic_isapnp_sws.c
index ff9f1340c47..956ea7b136f 100644
--- a/sys/dev/isapnp/isic_isapnp_sws.c
+++ b/sys/dev/isapnp/isic_isapnp_sws.c
@@ -47,7 +47,7 @@
* EXPERIMENTAL !!!!
* =================
*
- * $Id: isic_isapnp_sws.c,v 1.8 2005/07/09 02:05:09 christos Exp $
+ * $Id: isic_isapnp_sws.c,v 1.9 2005/12/11 12:22:16 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
@@ -57,7 +57,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_sws.c,v 1.8 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_sws.c,v 1.9 2005/12/11 12:22:16 christos Exp $");
#include "opt_isicpnp.h"
#ifdef ISICPNP_SEDLBAUER
diff --git a/sys/dev/isapnp/isic_isapnp_tel_s0P.c b/sys/dev/isapnp/isic_isapnp_tel_s0P.c
index 45b5ece4906..59152f11175 100644
--- a/sys/dev/isapnp/isic_isapnp_tel_s0P.c
+++ b/sys/dev/isapnp/isic_isapnp_tel_s0P.c
@@ -38,14 +38,14 @@
* EXPERIMENTAL !!!
* ================
*
- * $Id: isic_isapnp_tel_s0P.c,v 1.7 2005/07/09 02:05:09 christos Exp $
+ * $Id: isic_isapnp_tel_s0P.c,v 1.8 2005/12/11 12:22:16 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:29 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_tel_s0P.c,v 1.7 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_isapnp_tel_s0P.c,v 1.8 2005/12/11 12:22:16 christos Exp $");
#include "opt_isicpnp.h"
#ifdef ISICPNP_TEL_S0_16_3_P
diff --git a/sys/dev/isapnp/joy_isapnp.c b/sys/dev/isapnp/joy_isapnp.c
index 9aa6547918c..ca1d613df0c 100644
--- a/sys/dev/isapnp/joy_isapnp.c
+++ b/sys/dev/isapnp/joy_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_isapnp.c,v 1.5 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: joy_isapnp.c,v 1.6 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.5 2005/02/04 02:10:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_isapnp.c,v 1.6 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/mpu_isapnp.c b/sys/dev/isapnp/mpu_isapnp.c
index 3e1c8fb6e2e..68fc8173dab 100644
--- a/sys/dev/isapnp/mpu_isapnp.c
+++ b/sys/dev/isapnp/mpu_isapnp.c
@@ -1,7 +1,7 @@
-/* $NetBSD: mpu_isapnp.c,v 1.10 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: mpu_isapnp.c,v 1.11 2005/12/11 12:22:16 christos Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.10 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_isapnp.c,v 1.11 2005/12/11 12:22:16 christos Exp $");
#include "midi.h"
diff --git a/sys/dev/isapnp/sb_isapnp.c b/sys/dev/isapnp/sb_isapnp.c
index 96d4e871621..2a6793fac8f 100644
--- a/sys/dev/isapnp/sb_isapnp.c
+++ b/sys/dev/isapnp/sb_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_isapnp.c,v 1.43 2005/01/13 15:14:03 kent Exp $ */
+/* $NetBSD: sb_isapnp.c,v 1.44 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.43 2005/01/13 15:14:03 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_isapnp.c,v 1.44 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/wdc_isapnp.c b/sys/dev/isapnp/wdc_isapnp.c
index a5e3e8a7d2f..94b1876155e 100644
--- a/sys/dev/isapnp/wdc_isapnp.c
+++ b/sys/dev/isapnp/wdc_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_isapnp.c,v 1.31 2004/09/21 02:46:46 thorpej Exp $ */
+/* $NetBSD: wdc_isapnp.c,v 1.32 2005/12/11 12:22:16 christos Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_isapnp.c,v 1.31 2004/09/21 02:46:46 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_isapnp.c,v 1.32 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/wss_isapnp.c b/sys/dev/isapnp/wss_isapnp.c
index 5a121f609c2..70094912d0d 100644
--- a/sys/dev/isapnp/wss_isapnp.c
+++ b/sys/dev/isapnp/wss_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wss_isapnp.c,v 1.16 2005/01/13 15:14:03 kent Exp $ */
+/* $NetBSD: wss_isapnp.c,v 1.17 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.16 2005/01/13 15:14:03 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wss_isapnp.c,v 1.17 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/isapnp/ym_isapnp.c b/sys/dev/isapnp/ym_isapnp.c
index 079074207de..05bd6e4f7b3 100644
--- a/sys/dev/isapnp/ym_isapnp.c
+++ b/sys/dev/isapnp/ym_isapnp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ym_isapnp.c,v 1.17 2005/01/13 15:14:03 kent Exp $ */
+/* $NetBSD: ym_isapnp.c,v 1.18 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.17 2005/01/13 15:14:03 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ym_isapnp.c,v 1.18 2005/12/11 12:22:16 christos Exp $");
#include "mpu_ym.h"
diff --git a/sys/dev/kloader.c b/sys/dev/kloader.c
index 5c511eb38c4..42e80c6fdbe 100644
--- a/sys/dev/kloader.c
+++ b/sys/dev/kloader.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.c,v 1.6 2005/09/24 17:00:20 peter Exp $ */
+/* $NetBSD: kloader.c,v 1.7 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kloader.c,v 1.6 2005/09/24 17:00:20 peter Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kloader.c,v 1.7 2005/12/11 12:20:53 christos Exp $");
#include "debug_kloader.h"
@@ -93,7 +93,7 @@ struct kloader {
};
#define BUCKET_SIZE (PAGE_SIZE - sizeof(struct kloader_page_tag))
-#define KLOADER_PROC (&proc0)
+#define KLOADER_LWP (&lwp0)
STATIC struct kloader kloader;
#define ROUND4(x) (((x) + 3) & ~3)
@@ -596,10 +596,10 @@ kloader_load_segment(Elf_Phdr *p)
struct vnode *
kloader_open(const char *filename)
{
- struct proc *p = KLOADER_PROC;
+ struct lwp *l = KLOADER_LWP;
struct nameidata nid;
- NDINIT(&nid, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, p);
+ NDINIT(&nid, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, l);
if (namei(&nid) != 0) {
PRINTF("namei failed (%s)\n", filename);
@@ -617,23 +617,23 @@ kloader_open(const char *filename)
void
kloader_close()
{
- struct proc *p = KLOADER_PROC;
+ struct lwp *l = KLOADER_LWP;
struct vnode *vp = kloader.vp;
VOP_UNLOCK(vp, 0);
- vn_close(vp, FREAD, p->p_ucred, p);
+ vn_close(vp, FREAD, l->l_proc->p_ucred, l);
}
int
kloader_read(size_t ofs, size_t size, void *buf)
{
- struct proc *p = KLOADER_PROC;
+ struct lwp *l = KLOADER_LWP;
struct vnode *vp = kloader.vp;
size_t resid;
int error;
error = vn_rdwr(UIO_READ, vp, buf, size, ofs, UIO_SYSSPACE,
- IO_NODELOCKED | IO_SYNC, p->p_ucred, &resid, NULL);
+ IO_NODELOCKED | IO_SYNC, l->l_proc->p_ucred, &resid, NULL);
if (error)
PRINTF("read error.\n");
diff --git a/sys/dev/kloader.h b/sys/dev/kloader.h
index 2f3ef50afd5..e57d8cb33ac 100644
--- a/sys/dev/kloader.h
+++ b/sys/dev/kloader.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kloader.h,v 1.2 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: kloader.h,v 1.3 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/kttcp.c b/sys/dev/kttcp.c
index 554502a7294..1b822656908 100644
--- a/sys/dev/kttcp.c
+++ b/sys/dev/kttcp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kttcp.c,v 1.16 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: kttcp.c,v 1.17 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.16 2005/02/27 00:26:58 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.17 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -86,12 +86,12 @@ __KERNEL_RCSID(0, "$NetBSD: kttcp.c,v 1.16 2005/02/27 00:26:58 perry Exp $");
#include <dev/kttcpio.h>
-static int kttcp_send(struct proc *p, struct kttcp_io_args *);
-static int kttcp_recv(struct proc *p, struct kttcp_io_args *);
+static int kttcp_send(struct lwp *l, struct kttcp_io_args *);
+static int kttcp_recv(struct lwp *l, struct kttcp_io_args *);
static int kttcp_sosend(struct socket *, unsigned long long,
- unsigned long long *, struct proc *, int);
+ unsigned long long *, struct lwp *, int);
static int kttcp_soreceive(struct socket *, unsigned long long,
- unsigned long long *, struct proc *, int *);
+ unsigned long long *, struct lwp *, int *);
void kttcpattach(int);
@@ -109,7 +109,7 @@ kttcpattach(int count)
}
int
-kttcpioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+kttcpioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int error;
@@ -118,11 +118,11 @@ kttcpioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
switch (cmd) {
case KTTCP_IO_SEND:
- error = kttcp_send(p, (struct kttcp_io_args *) data);
+ error = kttcp_send(l, (struct kttcp_io_args *) data);
break;
case KTTCP_IO_RECV:
- error = kttcp_recv(p, (struct kttcp_io_args *) data);
+ error = kttcp_recv(l, (struct kttcp_io_args *) data);
break;
default:
@@ -133,7 +133,7 @@ kttcpioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
}
static int
-kttcp_send(struct proc *p, struct kttcp_io_args *kio)
+kttcp_send(struct lwp *l, struct kttcp_io_args *kio)
{
struct file *fp;
int error;
@@ -143,12 +143,12 @@ kttcp_send(struct proc *p, struct kttcp_io_args *kio)
if (kio->kio_totalsize >= KTTCP_MAX_XMIT)
return EINVAL;
- fp = fd_getfile(p->p_fd, kio->kio_socket);
+ fp = fd_getfile(l->l_proc->p_fd, kio->kio_socket);
if (fp == NULL)
return EBADF;
FILE_USE(fp);
if (fp->f_type != DTYPE_SOCKET) {
- FILE_UNUSE(fp, p);
+ FILE_UNUSE(fp, l);
return EFTYPE;
}
@@ -156,11 +156,11 @@ kttcp_send(struct proc *p, struct kttcp_io_args *kio)
microtime(&t0);
do {
error = kttcp_sosend((struct socket *)fp->f_data, len,
- &done, p, 0);
+ &done, l, 0);
len -= done;
} while (error == 0 && len > 0);
- FILE_UNUSE(fp, p);
+ FILE_UNUSE(fp, l);
microtime(&t1);
if (error != 0)
@@ -173,7 +173,7 @@ kttcp_send(struct proc *p, struct kttcp_io_args *kio)
}
static int
-kttcp_recv(struct proc *p, struct kttcp_io_args *kio)
+kttcp_recv(struct lwp *l, struct kttcp_io_args *kio)
{
struct file *fp;
int error;
@@ -183,23 +183,23 @@ kttcp_recv(struct proc *p, struct kttcp_io_args *kio)
if (kio->kio_totalsize > KTTCP_MAX_XMIT)
return EINVAL;
- fp = fd_getfile(p->p_fd, kio->kio_socket);
+ fp = fd_getfile(l->l_proc->p_fd, kio->kio_socket);
if (fp == NULL)
return EBADF;
FILE_USE(fp);
if (fp->f_type != DTYPE_SOCKET) {
- FILE_UNUSE(fp, p);
+ FILE_UNUSE(fp, l);
return EBADF;
}
len = kio->kio_totalsize;
microtime(&t0);
do {
error = kttcp_soreceive((struct socket *)fp->f_data,
- len, &done, p, NULL);
+ len, &done, l, NULL);
len -= done;
} while (error == 0 && len > 0 && done > 0);
- FILE_UNUSE(fp, p);
+ FILE_UNUSE(fp, l);
microtime(&t1);
if (error == EPIPE)
@@ -220,7 +220,7 @@ kttcp_recv(struct proc *p, struct kttcp_io_args *kio)
*/
static int
kttcp_sosend(struct socket *so, unsigned long long slen,
- unsigned long long *done, struct proc *p, int flags)
+ unsigned long long *done, struct lwp *l, int flags)
{
struct mbuf **mp, *m, *top;
long space, len, mlen;
@@ -244,7 +244,8 @@ kttcp_sosend(struct socket *so, unsigned long long slen,
dontroute =
(flags & MSG_DONTROUTE) && (so->so_options & SO_DONTROUTE) == 0 &&
(so->so_proto->pr_flags & PR_ATOMIC);
- p->p_stats->p_ru.ru_msgsnd++;
+ /* WRS XXX - are we doing per-lwp or per-proc stats? */
+ l->l_proc->p_stats->p_ru.ru_msgsnd++;
#define snderr(errno) { error = errno; splx(s); goto release; }
restart:
@@ -351,7 +352,7 @@ nopages:
so->so_state |= SS_MORETOCOME;
error = (*so->so_proto->pr_usrreq)(so,
(flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND,
- top, NULL, NULL, p);
+ top, NULL, NULL, l);
if (dontroute)
so->so_options &= ~SO_DONTROUTE;
if (resid > 0)
@@ -379,7 +380,7 @@ nopages:
static int
kttcp_soreceive(struct socket *so, unsigned long long slen,
- unsigned long long *done, struct proc *p, int *flagsp)
+ unsigned long long *done, struct lwp *l, int *flagsp)
{
struct mbuf *m, **mp;
int flags, len, error, s, offset, moff, type;
@@ -485,8 +486,8 @@ kttcp_soreceive(struct socket *so, unsigned long long slen,
* info, we save a copy of m->m_nextpkt into nextrecord.
*/
#ifdef notyet /* XXXX */
- if (uio->uio_procp)
- uio->uio_procp->p_stats->p_ru.ru_msgrcv++;
+ if (uio->uio_lwp)
+ uio->uio_lwp->l_proc->p_stats->p_ru.ru_msgrcv++;
#endif
KASSERT(m == so->so_rcv.sb_mb);
SBLASTRECORDCHK(&so->so_rcv, "kttcp_soreceive 1");
diff --git a/sys/dev/ld.c b/sys/dev/ld.c
index 19f89120259..78f68345ec2 100644
--- a/sys/dev/ld.c
+++ b/sys/dev/ld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld.c,v 1.38 2005/10/15 17:29:11 yamt Exp $ */
+/* $NetBSD: ld.c,v 1.39 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.38 2005/10/15 17:29:11 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld.c,v 1.39 2005/12/11 12:20:53 christos Exp $");
#include "rnd.h"
@@ -272,7 +272,7 @@ ldshutdown(void *cookie)
/* ARGSUSED */
static int
-ldopen(dev_t dev, int flags, int fmt, struct proc *p)
+ldopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ld_softc *sc;
int error, unit, part;
@@ -322,7 +322,7 @@ ldopen(dev_t dev, int flags, int fmt, struct proc *p)
/* ARGSUSED */
static int
-ldclose(dev_t dev, int flags, int fmt, struct proc *p)
+ldclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ld_softc *sc;
int error, part, unit;
@@ -375,7 +375,7 @@ ldwrite(dev_t dev, struct uio *uio, int ioflag)
/* ARGSUSED */
static int
-ldioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
+ldioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct lwp *l)
{
struct ld_softc *sc;
int part, unit, error;
@@ -520,7 +520,7 @@ ldioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct proc *p)
{
struct dkwedge_list *dkwl = (void *) addr;
- return (dkwedge_list(&sc->sc_dk, dkwl, p));
+ return (dkwedge_list(&sc->sc_dk, dkwl, l));
}
default:
diff --git a/sys/dev/ldvar.h b/sys/dev/ldvar.h
index 0397634cfce..25523e9dc94 100644
--- a/sys/dev/ldvar.h
+++ b/sys/dev/ldvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ldvar.h,v 1.10 2005/10/15 17:29:11 yamt Exp $ */
+/* $NetBSD: ldvar.h,v 1.11 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/marvell/files.discovery b/sys/dev/marvell/files.discovery
index 25c0cbe32ea..77d41049c83 100644
--- a/sys/dev/marvell/files.discovery
+++ b/sys/dev/marvell/files.discovery
@@ -1,4 +1,4 @@
-# $NetBSD: files.discovery,v 1.9 2005/02/01 20:59:15 matt Exp $
+# $NetBSD: files.discovery,v 1.10 2005/12/11 12:22:16 christos Exp $
#
# Config file and device description for machine-independent support for
# the Marvell (formerly Galileo Technology) Discovery system controllers.
diff --git a/sys/dev/marvell/gt.c b/sys/dev/marvell/gt.c
index acf5234a149..ed8222f95d1 100644
--- a/sys/dev/marvell/gt.c
+++ b/sys/dev/marvell/gt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gt.c,v 1.10 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: gt.c,v 1.11 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.10 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.11 2005/12/11 12:22:16 christos Exp $");
#include "opt_marvell.h"
#include "locators.h"
diff --git a/sys/dev/marvell/gtethreg.h b/sys/dev/marvell/gtethreg.h
index 4842706a8e5..af8957bf396 100644
--- a/sys/dev/marvell/gtethreg.h
+++ b/sys/dev/marvell/gtethreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gtethreg.h,v 1.3 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gtethreg.h,v 1.4 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
diff --git a/sys/dev/marvell/gti2c.c b/sys/dev/marvell/gti2c.c
index dba07656220..cca5eb521b2 100644
--- a/sys/dev/marvell/gti2c.c
+++ b/sys/dev/marvell/gti2c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gti2c.c,v 1.2 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gti2c.c,v 1.3 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2005 Brocade Communcations, inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.2 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gti2c.c,v 1.3 2005/12/11 12:22:16 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/marvell/gti2creg.h b/sys/dev/marvell/gti2creg.h
index 33e566f5bce..fa054461999 100644
--- a/sys/dev/marvell/gti2creg.h
+++ b/sys/dev/marvell/gti2creg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gti2creg.h,v 1.2 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gti2creg.h,v 1.3 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2005 Brocade Communcations, inc.
diff --git a/sys/dev/marvell/gtidma.c b/sys/dev/marvell/gtidma.c
index 456d407b892..90e3d9b8dd8 100644
--- a/sys/dev/marvell/gtidma.c
+++ b/sys/dev/marvell/gtidma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gtidma.c,v 1.5 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gtidma.c,v 1.6 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.5 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtidma.c,v 1.6 2005/12/11 12:22:16 christos Exp $");
#include "opt_idma.h"
#include "opt_ddb.h"
diff --git a/sys/dev/marvell/gtidmareg.h b/sys/dev/marvell/gtidmareg.h
index bf584fecef3..783e90ee0fb 100644
--- a/sys/dev/marvell/gtidmareg.h
+++ b/sys/dev/marvell/gtidmareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gtidmareg.h,v 1.2 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gtidmareg.h,v 1.3 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
diff --git a/sys/dev/marvell/gtidmavar.h b/sys/dev/marvell/gtidmavar.h
index f3bc88b73e2..085a05218d8 100644
--- a/sys/dev/marvell/gtidmavar.h
+++ b/sys/dev/marvell/gtidmavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gtidmavar.h,v 1.3 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gtidmavar.h,v 1.4 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
diff --git a/sys/dev/marvell/gtintrreg.h b/sys/dev/marvell/gtintrreg.h
index 1c4cd528f0b..410f574f455 100644
--- a/sys/dev/marvell/gtintrreg.h
+++ b/sys/dev/marvell/gtintrreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gtintrreg.h,v 1.3 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gtintrreg.h,v 1.4 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
diff --git a/sys/dev/marvell/gtmpsc.c b/sys/dev/marvell/gtmpsc.c
index cd243400ffb..4fe020a212a 100644
--- a/sys/dev/marvell/gtmpsc.c
+++ b/sys/dev/marvell/gtmpsc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmpsc.c,v 1.12 2005/09/06 21:40:39 kleink Exp $ */
+/* $NetBSD: gtmpsc.c,v 1.13 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.12 2005/09/06 21:40:39 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmpsc.c,v 1.13 2005/12/11 12:22:16 christos Exp $");
#include "opt_kgdb.h"
@@ -587,7 +587,7 @@ gtmpscshutdown(struct gtmpsc_softc *sc)
}
int
-gtmpscopen(dev_t dev, int flag, int mode, struct proc *p)
+gtmpscopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct gtmpsc_softc *sc;
int unit = GTMPSCUNIT(dev);
@@ -611,7 +611,7 @@ gtmpscopen(dev_t dev, int flag, int mode, struct proc *p)
tp = sc->gtmpsc_tty;
if (ISSET(tp->t_state, TS_ISOPEN) &&
ISSET(tp->t_state, TS_XCLUDE) &&
- suser(p->p_ucred, &p->p_acflag) != 0)
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0)
return (EBUSY);
s = spltty();
@@ -670,7 +670,7 @@ bad:
}
int
-gtmpscclose(dev_t dev, int flag, int mode, struct proc *p)
+gtmpscclose(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = GTMPSCUNIT(dev);
struct gtmpsc_softc *sc = gtmpsc_cd.cd_devs[unit];
@@ -717,24 +717,24 @@ gtmpscwrite(dev_t dev, struct uio *uio, int flag)
}
int
-gtmpscpoll(dev_t dev, int events, struct proc *p)
+gtmpscpoll(dev_t dev, int events, struct lwp *l)
{
struct gtmpsc_softc *sc = gtmpsc_cd.cd_devs[GTMPSCUNIT(dev)];
struct tty *tp = sc->gtmpsc_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
int
-gtmpscioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+gtmpscioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct gtmpsc_softc *sc = gtmpsc_cd.cd_devs[GTMPSCUNIT(dev)];
struct tty *tp = sc->gtmpsc_tty;
int error;
- if ((error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p)) >= 0)
+ if ((error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l)) >= 0)
return error;
- if ((error = ttioctl(tp, cmd, data, flag, p)) >= 0)
+ if ((error = ttioctl(tp, cmd, data, flag, l)) >= 0)
return error;
return ENOTTY;
}
diff --git a/sys/dev/marvell/gtmpscreg.h b/sys/dev/marvell/gtmpscreg.h
index 87613002b5e..a52a496d649 100644
--- a/sys/dev/marvell/gtmpscreg.h
+++ b/sys/dev/marvell/gtmpscreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmpscreg.h,v 1.2 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gtmpscreg.h,v 1.3 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
diff --git a/sys/dev/marvell/gtmpscvar.h b/sys/dev/marvell/gtmpscvar.h
index 1388f14a0d6..a19246dbea7 100644
--- a/sys/dev/marvell/gtmpscvar.h
+++ b/sys/dev/marvell/gtmpscvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmpscvar.h,v 1.5 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gtmpscvar.h,v 1.6 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
diff --git a/sys/dev/marvell/gtpci.c b/sys/dev/marvell/gtpci.c
index a14c703b785..13ba5151901 100644
--- a/sys/dev/marvell/gtpci.c
+++ b/sys/dev/marvell/gtpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gtpci.c,v 1.12 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gtpci.c,v 1.13 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.12 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtpci.c,v 1.13 2005/12/11 12:22:16 christos Exp $");
#include "opt_marvell.h"
#include <sys/param.h>
diff --git a/sys/dev/marvell/gtpcireg.h b/sys/dev/marvell/gtpcireg.h
index 132585816c0..d01fc702ace 100644
--- a/sys/dev/marvell/gtpcireg.h
+++ b/sys/dev/marvell/gtpcireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gtpcireg.h,v 1.3 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gtpcireg.h,v 1.4 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
diff --git a/sys/dev/marvell/gtreg.h b/sys/dev/marvell/gtreg.h
index 3941210d7c7..83c0761e489 100644
--- a/sys/dev/marvell/gtreg.h
+++ b/sys/dev/marvell/gtreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gtreg.h,v 1.2 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gtreg.h,v 1.3 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
diff --git a/sys/dev/marvell/gtsdmareg.h b/sys/dev/marvell/gtsdmareg.h
index c9039ab1625..1b2e7c40fc5 100644
--- a/sys/dev/marvell/gtsdmareg.h
+++ b/sys/dev/marvell/gtsdmareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gtsdmareg.h,v 1.3 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: gtsdmareg.h,v 1.4 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
diff --git a/sys/dev/marvell/gtvar.h b/sys/dev/marvell/gtvar.h
index 668dc1753bb..848e70ca4ba 100644
--- a/sys/dev/marvell/gtvar.h
+++ b/sys/dev/marvell/gtvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gtvar.h,v 1.8 2005/02/01 20:37:09 matt Exp $ */
+/* $NetBSD: gtvar.h,v 1.9 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
diff --git a/sys/dev/marvell/if_gfe.c b/sys/dev/marvell/if_gfe.c
index 1ae834e8ea4..9e9b74e88bf 100644
--- a/sys/dev/marvell/if_gfe.c
+++ b/sys/dev/marvell/if_gfe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gfe.c,v 1.16 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: if_gfe.c,v 1.17 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.16 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.17 2005/12/11 12:22:16 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/marvell/if_gfevar.h b/sys/dev/marvell/if_gfevar.h
index b8221f4e7f1..de3c4ee9798 100644
--- a/sys/dev/marvell/if_gfevar.h
+++ b/sys/dev/marvell/if_gfevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gfevar.h,v 1.6 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: if_gfevar.h,v 1.7 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
diff --git a/sys/dev/marvell/obio.c b/sys/dev/marvell/obio.c
index 025863b47d2..2c6c5934b9f 100644
--- a/sys/dev/marvell/obio.c
+++ b/sys/dev/marvell/obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.6 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: obio.c,v 1.7 2005/12/11 12:22:16 christos Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.6 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.7 2005/12/11 12:22:16 christos Exp $");
#include "opt_marvell.h"
diff --git a/sys/dev/mca/aha_mca.c b/sys/dev/mca/aha_mca.c
index e1fbc85a30e..a8653606992 100644
--- a/sys/dev/mca/aha_mca.c
+++ b/sys/dev/mca/aha_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aha_mca.c,v 1.12 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: aha_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $ */
/*
* Copyright (c) 2000-2002 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.12 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/com_mca.c b/sys/dev/mca/com_mca.c
index 25eee1863c7..b22aed09aa5 100644
--- a/sys/dev/mca/com_mca.c
+++ b/sys/dev/mca/com_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mca.c,v 1.12 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: com_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.12 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/devlist2h.awk b/sys/dev/mca/devlist2h.awk
index 5c7a8ce02bc..354f720fb22 100644
--- a/sys/dev/mca/devlist2h.awk
+++ b/sys/dev/mca/devlist2h.awk
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: devlist2h.awk,v 1.3 2005/02/27 05:39:56 perry Exp $
+# $NetBSD: devlist2h.awk,v 1.4 2005/12/11 12:22:18 christos Exp $
#
# Copyright (c) 1995, 1996 Christopher G. Demetriou
# All rights reserved.
diff --git a/sys/dev/mca/ed_mca.c b/sys/dev/mca/ed_mca.c
index 63eca7b411f..09c943a201d 100644
--- a/sys/dev/mca/ed_mca.c
+++ b/sys/dev/mca/ed_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ed_mca.c,v 1.30 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: ed_mca.c,v 1.31 2005/12/11 12:22:18 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.30 2005/10/15 17:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ed_mca.c,v 1.31 2005/12/11 12:22:18 christos Exp $");
#include "rnd.h"
@@ -293,10 +293,10 @@ edmcawrite(dev, uio, flags)
}
int
-edmcaopen(dev, flag, fmt, p)
+edmcaopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct ed_softc *wd;
int part, error;
@@ -374,10 +374,10 @@ edmcaopen(dev, flag, fmt, p)
}
int
-edmcaclose(dev, flag, fmt, p)
+edmcaclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct ed_softc *wd = device_lookup(&ed_cd, DISKUNIT(dev));
int part = DISKPART(dev);
@@ -488,12 +488,12 @@ edgetdisklabel(dev, ed)
}
int
-edmcaioctl(dev, xfer, addr, flag, p)
+edmcaioctl(dev, xfer, addr, flag, l)
dev_t dev;
u_long xfer;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct ed_softc *ed = device_lookup(&ed_cd, DISKUNIT(dev));
int error;
@@ -586,7 +586,7 @@ edmcaioctl(dev, xfer, addr, flag, p)
auio.uio_segflg = 0;
auio.uio_offset =
fop->df_startblk * wd->sc_dk.dk_label->d_secsize;
- auio.uio_procp = p;
+ auio.uio_lwp = l;
error = physio(wdformat, NULL, dev, B_WRITE, minphys,
&auio);
fop->df_count -= auio.uio_resid;
@@ -624,7 +624,7 @@ edmcaioctl(dev, xfer, addr, flag, p)
{
struct dkwedge_list *dkwl = (void *) addr;
- return (dkwedge_list(&ed->sc_dk, dkwl, p));
+ return (dkwedge_list(&ed->sc_dk, dkwl, l));
}
default:
diff --git a/sys/dev/mca/edc_mca.c b/sys/dev/mca/edc_mca.c
index 2971b4dff7c..684f887b970 100644
--- a/sys/dev/mca/edc_mca.c
+++ b/sys/dev/mca/edc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edc_mca.c,v 1.31 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: edc_mca.c,v 1.32 2005/12/11 12:22:18 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.31 2005/10/15 17:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: edc_mca.c,v 1.32 2005/12/11 12:22:18 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/mca/edcreg.h b/sys/dev/mca/edcreg.h
index cf83d1a495d..9f88a802df2 100644
--- a/sys/dev/mca/edcreg.h
+++ b/sys/dev/mca/edcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: edcreg.h,v 1.3 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: edcreg.h,v 1.4 2005/12/11 12:22:18 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mca/edcvar.h b/sys/dev/mca/edcvar.h
index 67f14ad15b0..fb06be62355 100644
--- a/sys/dev/mca/edcvar.h
+++ b/sys/dev/mca/edcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: edcvar.h,v 1.6 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: edcvar.h,v 1.7 2005/12/11 12:22:18 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mca/edvar.h b/sys/dev/mca/edvar.h
index 03c28d7896f..5cb356aacc3 100644
--- a/sys/dev/mca/edvar.h
+++ b/sys/dev/mca/edvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: edvar.h,v 1.10 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: edvar.h,v 1.11 2005/12/11 12:22:18 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mca/esp_mca.c b/sys/dev/mca/esp_mca.c
index c2968b3e999..453fde9fa7c 100644
--- a/sys/dev/mca/esp_mca.c
+++ b/sys/dev/mca/esp_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_mca.c,v 1.9 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: esp_mca.c,v 1.10 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.9 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_mca.c,v 1.10 2005/12/11 12:22:18 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
diff --git a/sys/dev/mca/files.mca b/sys/dev/mca/files.mca
index cc4fb08e952..802ea0d9b4a 100644
--- a/sys/dev/mca/files.mca
+++ b/sys/dev/mca/files.mca
@@ -1,4 +1,4 @@
-# $NetBSD: files.mca,v 1.21 2005/04/03 11:21:44 jdolecek Exp $
+# $NetBSD: files.mca,v 1.22 2005/12/11 12:22:18 christos Exp $
#
# Config.new file and device description for machine-independent MCA code.
# Included by ports that need it.
diff --git a/sys/dev/mca/if_ate_mca.c b/sys/dev/mca/if_ate_mca.c
index b159111e585..02660d9855f 100644
--- a/sys/dev/mca/if_ate_mca.c
+++ b/sys/dev/mca/if_ate_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ate_mca.c,v 1.12 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: if_ate_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.12 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ate_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/if_elmc_mca.c b/sys/dev/mca/if_elmc_mca.c
index 0cff086d72f..ed1b86854c6 100644
--- a/sys/dev/mca/if_elmc_mca.c
+++ b/sys/dev/mca/if_elmc_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_elmc_mca.c,v 1.18 2005/05/30 04:30:56 christos Exp $ */
+/* $NetBSD: if_elmc_mca.c,v 1.19 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.18 2005/05/30 04:30:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_elmc_mca.c,v 1.19 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/if_ep_mca.c b/sys/dev/mca/if_ep_mca.c
index b3016e4cd85..3aa92ccba26 100644
--- a/sys/dev/mca/if_ep_mca.c
+++ b/sys/dev/mca/if_ep_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_mca.c,v 1.13 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: if_ep_mca.c,v 1.14 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.13 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_mca.c,v 1.14 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/if_le_mca.c b/sys/dev/mca/if_le_mca.c
index eea4e07e3f1..f70892b354f 100644
--- a/sys/dev/mca/if_le_mca.c
+++ b/sys/dev/mca/if_le_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_mca.c,v 1.10 2005/02/28 07:36:48 jdolecek Exp $ */
+/* $NetBSD: if_le_mca.c,v 1.11 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.10 2005/02/28 07:36:48 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_mca.c,v 1.11 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/if_ne_mca.c b/sys/dev/mca/if_ne_mca.c
index 1df4d9bc68f..afc1f271bbc 100644
--- a/sys/dev/mca/if_ne_mca.c
+++ b/sys/dev/mca/if_ne_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_mca.c,v 1.8 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: if_ne_mca.c,v 1.9 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.8 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_mca.c,v 1.9 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/if_tr_mca.c b/sys/dev/mca/if_tr_mca.c
index ce64d527173..bf0a9196822 100644
--- a/sys/dev/mca/if_tr_mca.c
+++ b/sys/dev/mca/if_tr_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_mca.c,v 1.12 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: if_tr_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $ */
/*_
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.12 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_mca.c,v 1.13 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/if_tra_mca.c b/sys/dev/mca/if_tra_mca.c
index b5271e8311c..16c50f27ee2 100644
--- a/sys/dev/mca/if_tra_mca.c
+++ b/sys/dev/mca/if_tra_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tra_mca.c,v 1.2 2005/04/03 11:36:32 jdolecek Exp $ */
+/* $NetBSD: if_tra_mca.c,v 1.3 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.2 2005/04/03 11:36:32 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.3 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/if_we_mca.c b/sys/dev/mca/if_we_mca.c
index f1f850c7bd7..77b61762ae1 100644
--- a/sys/dev/mca/if_we_mca.c
+++ b/sys/dev/mca/if_we_mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_we_mca.c,v 1.13 2005/04/03 10:56:59 jdolecek Exp $ */
+/* $NetBSD: if_we_mca.c,v 1.14 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.13 2005/04/03 10:56:59 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_we_mca.c,v 1.14 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/mca.c b/sys/dev/mca/mca.c
index 010d893431a..0bba118241f 100644
--- a/sys/dev/mca/mca.c
+++ b/sys/dev/mca/mca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mca.c,v 1.19 2005/08/25 22:33:19 drochner Exp $ */
+/* $NetBSD: mca.c,v 1.20 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.19 2005/08/25 22:33:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca.c,v 1.20 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/mca_subr.c b/sys/dev/mca/mca_subr.c
index d0d896a9623..c3600e5c175 100644
--- a/sys/dev/mca/mca_subr.c
+++ b/sys/dev/mca/mca_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mca_subr.c,v 1.7 2005/02/27 00:27:21 perry Exp $ */
+/* $NetBSD: mca_subr.c,v 1.8 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mca_subr.c,v 1.7 2005/02/27 00:27:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mca_subr.c,v 1.8 2005/12/11 12:22:18 christos Exp $");
#include "opt_mcaverbose.h"
diff --git a/sys/dev/mca/mcabusprint.c b/sys/dev/mca/mcabusprint.c
index 2dcc3feef73..e2641370bf8 100644
--- a/sys/dev/mca/mcabusprint.c
+++ b/sys/dev/mca/mcabusprint.c
@@ -1,7 +1,6 @@
-/* $NetBSD: mcabusprint.c,v 1.2 2005/05/24 05:14:37 lukem Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcabusprint.c,v 1.2 2005/05/24 05:14:37 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcabusprint.c,v 1.3 2005/12/11 12:22:18 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mca/mcadevs b/sys/dev/mca/mcadevs
index 83204ff9f34..b4301762441 100644
--- a/sys/dev/mca/mcadevs
+++ b/sys/dev/mca/mcadevs
@@ -1,4 +1,4 @@
-$NetBSD: mcadevs,v 1.19 2005/04/03 11:17:49 jdolecek Exp $
+$NetBSD: mcadevs,v 1.20 2005/12/11 12:22:18 christos Exp $
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mca/mcadevs.h b/sys/dev/mca/mcadevs.h
index c422311dae4..605f5301ef9 100644
--- a/sys/dev/mca/mcadevs.h
+++ b/sys/dev/mca/mcadevs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mcadevs.h,v 1.21 2005/04/03 11:19:30 jdolecek Exp $ */
+/* $NetBSD: mcadevs.h,v 1.22 2005/12/11 12:22:18 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
diff --git a/sys/dev/mca/mcadevs_data.h b/sys/dev/mca/mcadevs_data.h
index 86e2f111310..eeac69811d8 100644
--- a/sys/dev/mca/mcadevs_data.h
+++ b/sys/dev/mca/mcadevs_data.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mcadevs_data.h,v 1.21 2005/04/03 11:19:30 jdolecek Exp $ */
+/* $NetBSD: mcadevs_data.h,v 1.22 2005/12/11 12:22:18 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
diff --git a/sys/dev/mca/mcavar.h b/sys/dev/mca/mcavar.h
index 04fc8b95e70..3362b2eae91 100644
--- a/sys/dev/mca/mcavar.h
+++ b/sys/dev/mca/mcavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mcavar.h,v 1.8 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: mcavar.h,v 1.9 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/md.c b/sys/dev/md.c
index 062767e2e70..b526221ef64 100644
--- a/sys/dev/md.c
+++ b/sys/dev/md.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.42 2005/10/15 17:29:11 yamt Exp $ */
+/* $NetBSD: md.c,v 1.43 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.42 2005/10/15 17:29:11 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.43 2005/12/11 12:20:53 christos Exp $");
#include "opt_md.h"
@@ -192,10 +192,10 @@ md_attach(struct device *parent, struct device *self, void *aux)
#if MEMORY_DISK_SERVER
static int md_server_loop(struct md_softc *sc);
static int md_ioctl_server(struct md_softc *sc, struct md_conf *umd,
- struct proc *proc);
+ struct lwp *l);
#endif /* MEMORY_DISK_SERVER */
static int md_ioctl_kalloc(struct md_softc *sc, struct md_conf *umd,
- struct proc *proc);
+ struct lwp *l);
static int
mdsize(dev_t dev)
@@ -217,7 +217,7 @@ mdsize(dev_t dev)
}
static int
-mdopen(dev_t dev, int flag, int fmt, struct proc *proc)
+mdopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
int unit;
struct md_softc *sc;
@@ -251,7 +251,7 @@ mdopen(dev_t dev, int flag, int fmt, struct proc *proc)
}
static int
-mdclose(dev_t dev, int flag, int fmt, struct proc *proc)
+mdclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
int unit;
@@ -366,7 +366,7 @@ mdstrategy(struct buf *bp)
}
static int
-mdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *proc)
+mdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int unit;
struct md_softc *sc;
@@ -391,10 +391,10 @@ mdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *proc)
break;
switch (umd->md_type) {
case MD_KMEM_ALLOCATED:
- return md_ioctl_kalloc(sc, umd, proc);
+ return md_ioctl_kalloc(sc, umd, l);
#if MEMORY_DISK_SERVER
case MD_UMEM_SERVER:
- return md_ioctl_server(sc, umd, proc);
+ return md_ioctl_server(sc, umd, l);
#endif /* MEMORY_DISK_SERVER */
default:
break;
@@ -409,7 +409,7 @@ mdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *proc)
* Just allocate some kernel memory and return.
*/
static int
-md_ioctl_kalloc(struct md_softc *sc, struct md_conf *umd, struct proc *proc)
+md_ioctl_kalloc(struct md_softc *sc, struct md_conf *umd, struct lwp *l)
{
vaddr_t addr;
vsize_t size;
@@ -434,7 +434,7 @@ md_ioctl_kalloc(struct md_softc *sc, struct md_conf *umd, struct proc *proc)
* Set config, then become the I/O server for this unit.
*/
static int
-md_ioctl_server(struct md_softc *sc, struct md_conf *umd, struct proc *proc)
+md_ioctl_server(struct md_softc *sc, struct md_conf *umd, struct lwp *l)
{
vaddr_t end;
int error;
diff --git a/sys/dev/microcode/aic7xxx/aic79xx.reg b/sys/dev/microcode/aic7xxx/aic79xx.reg
index edab97414d5..2537d919a59 100644
--- a/sys/dev/microcode/aic7xxx/aic79xx.reg
+++ b/sys/dev/microcode/aic7xxx/aic79xx.reg
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.reg,v 1.10 2005/02/27 00:27:23 perry Exp $ */
+/* $NetBSD: aic79xx.reg,v 1.11 2005/12/11 12:22:18 christos Exp $ */
/*
* Aic79xx register and scratch ram definitions.
diff --git a/sys/dev/microcode/aic7xxx/aic79xx.seq b/sys/dev/microcode/aic7xxx/aic79xx.seq
index 97671a156aa..82ea0f3c02e 100644
--- a/sys/dev/microcode/aic7xxx/aic79xx.seq
+++ b/sys/dev/microcode/aic7xxx/aic79xx.seq
@@ -1,4 +1,4 @@
-/* $NetBSD: aic79xx.seq,v 1.9 2005/02/27 00:27:23 perry Exp $ */
+/* $NetBSD: aic79xx.seq,v 1.10 2005/12/11 12:22:18 christos Exp $ */
/*
* Adaptec U320 device driver firmware for Linux and FreeBSD.
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.reg b/sys/dev/microcode/aic7xxx/aic7xxx.reg
index a30829cb033..5af1034c74f 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx.reg
+++ b/sys/dev/microcode/aic7xxx/aic7xxx.reg
@@ -39,7 +39,7 @@
*
* $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.reg,v 1.43 2003/01/20 20:44:55 gibbs Exp $
*/
-VERSION = "$NetBSD: aic7xxx.reg,v 1.3 2005/02/27 00:27:23 perry Exp $"
+VERSION = "$NetBSD: aic7xxx.reg,v 1.4 2005/12/11 12:22:18 christos Exp $"
/*
* This file is processed by the aic7xxx_asm utility for use in assembling
diff --git a/sys/dev/microcode/aic7xxx/aic7xxx.seq b/sys/dev/microcode/aic7xxx/aic7xxx.seq
index b1b5dd74c0d..caca26c6ae4 100644
--- a/sys/dev/microcode/aic7xxx/aic7xxx.seq
+++ b/sys/dev/microcode/aic7xxx/aic7xxx.seq
@@ -40,7 +40,7 @@
* $FreeBSD: /repoman/r/ncvs/src/sys/dev/aic7xxx/aic7xxx.seq,v 1.123 2003/01/20 20:44:55 gibbs Exp $
*/
-VERSION = "$NetBSD: aic7xxx.seq,v 1.16 2005/02/27 00:27:23 perry Exp $"
+VERSION = "$NetBSD: aic7xxx.seq,v 1.17 2005/12/11 12:22:18 christos Exp $"
PATCH_ARG_LIST = "struct ahc_softc *ahc"
PREFIX = "ahc_"
diff --git a/sys/dev/microcode/aic7xxx/aicasm.c b/sys/dev/microcode/aic7xxx/aicasm.c
index 7a524748c32..e04387910c8 100644
--- a/sys/dev/microcode/aic7xxx/aicasm.c
+++ b/sys/dev/microcode/aic7xxx/aicasm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aicasm.c,v 1.5 2003/07/14 15:42:39 lukem Exp $ */
+/* $NetBSD: aicasm.c,v 1.6 2005/12/11 12:22:18 christos Exp $ */
/*
* Aic7xxx SCSI host adapter firmware asssembler
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: aicasm.c,v 1.5 2003/07/14 15:42:39 lukem Exp $");
+__RCSID("$NetBSD: aicasm.c,v 1.6 2005/12/11 12:22:18 christos Exp $");
#include <sys/types.h>
#include <sys/mman.h>
diff --git a/sys/dev/microcode/aic7xxx/aicasm.h b/sys/dev/microcode/aic7xxx/aicasm.h
index 6af7fe97391..880f32ed8d4 100644
--- a/sys/dev/microcode/aic7xxx/aicasm.h
+++ b/sys/dev/microcode/aic7xxx/aicasm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aicasm.h,v 1.3 2005/02/27 00:27:23 perry Exp $ */
+/* $NetBSD: aicasm.h,v 1.4 2005/12/11 12:22:18 christos Exp $ */
/*
* Assembler for the sequencer program downloaded to Aic7xxx SCSI host adapters
diff --git a/sys/dev/microcode/aic7xxx/aicasm_gram.y b/sys/dev/microcode/aic7xxx/aicasm_gram.y
index f1d02b37403..3c0110fff34 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_gram.y
+++ b/sys/dev/microcode/aic7xxx/aicasm_gram.y
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: aicasm_gram.y,v 1.4 2005/02/27 00:27:23 perry Exp $ */
+/* $NetBSD: aicasm_gram.y,v 1.5 2005/12/11 12:22:18 christos Exp $ */
/*
* Parser for the Aic7xxx SCSI Host adapter sequencer assembler.
diff --git a/sys/dev/microcode/aic7xxx/aicasm_macro_scan.l b/sys/dev/microcode/aic7xxx/aicasm_macro_scan.l
index 305af46dccc..c638d261132 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_macro_scan.l
+++ b/sys/dev/microcode/aic7xxx/aicasm_macro_scan.l
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: aicasm_macro_scan.l,v 1.2 2005/02/27 00:27:23 perry Exp $ */
+/* $NetBSD: aicasm_macro_scan.l,v 1.3 2005/12/11 12:22:18 christos Exp $ */
/*
* Sub-Lexical Analyzer for macro invokation in
diff --git a/sys/dev/microcode/aic7xxx/aicasm_scan.l b/sys/dev/microcode/aic7xxx/aicasm_scan.l
index cf47619eca0..d9cb42ba4b8 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_scan.l
+++ b/sys/dev/microcode/aic7xxx/aicasm_scan.l
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: aicasm_scan.l,v 1.4 2005/02/27 00:27:23 perry Exp $ */
+/* $NetBSD: aicasm_scan.l,v 1.5 2005/12/11 12:22:18 christos Exp $ */
/*
* Lexical Analyzer for the Aic7xxx SCSI Host adapter sequencer assembler.
*
diff --git a/sys/dev/microcode/aic7xxx/aicasm_symbol.c b/sys/dev/microcode/aic7xxx/aicasm_symbol.c
index c2176919cc7..377bba7bc14 100644
--- a/sys/dev/microcode/aic7xxx/aicasm_symbol.c
+++ b/sys/dev/microcode/aic7xxx/aicasm_symbol.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aicasm_symbol.c,v 1.4 2003/07/14 15:42:40 lukem Exp $ */
+/* $NetBSD: aicasm_symbol.c,v 1.5 2005/12/11 12:22:18 christos Exp $ */
/*
* Aic7xxx SCSI host adapter firmware asssembler symbol table implementation
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: aicasm_symbol.c,v 1.4 2003/07/14 15:42:40 lukem Exp $");
+__RCSID("$NetBSD: aicasm_symbol.c,v 1.5 2005/12/11 12:22:18 christos Exp $");
#include <sys/types.h>
diff --git a/sys/dev/microcode/cyclades-z/cyzfirm.h b/sys/dev/microcode/cyclades-z/cyzfirm.h
index dbd5cbfe8b6..9d43c07ffb4 100644
--- a/sys/dev/microcode/cyclades-z/cyzfirm.h
+++ b/sys/dev/microcode/cyclades-z/cyzfirm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cyzfirm.h,v 1.5 2005/06/27 03:36:25 thorpej Exp $ */
+/* $NetBSD: cyzfirm.h,v 1.6 2005/12/11 12:22:18 christos Exp $ */
/*
* Firmware for Cyclades Z series multiport serial boards.
diff --git a/sys/dev/microcode/cyclades-z/cyzfirm2h.c b/sys/dev/microcode/cyclades-z/cyzfirm2h.c
index 4afce9952e1..dfad90527cc 100644
--- a/sys/dev/microcode/cyclades-z/cyzfirm2h.c
+++ b/sys/dev/microcode/cyclades-z/cyzfirm2h.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cyzfirm2h.c,v 1.4 2005/06/27 03:36:25 thorpej Exp $ */
+/* $NetBSD: cyzfirm2h.c,v 1.5 2005/12/11 12:22:18 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: cyzfirm2h.c,v 1.4 2005/06/27 03:36:25 thorpej Exp $");
+__RCSID("$NetBSD: cyzfirm2h.c,v 1.5 2005/12/11 12:22:18 christos Exp $");
#include <sys/types.h>
#include <sys/mman.h>
@@ -99,7 +99,7 @@ main(int argc, char *argv[])
err(1, "unable to mmap input file");
(void) close(i);
- fprintf(out_file, "/*\t$NetBSD: cyzfirm2h.c,v 1.4 2005/06/27 03:36:25 thorpej Exp $\t*/\n\n");
+ fprintf(out_file, "/*\t$NetBSD: cyzfirm2h.c,v 1.5 2005/12/11 12:22:18 christos Exp $\t*/\n\n");
fprintf(out_file, "\
/*
* Firmware for Cyclades Z series multiport serial boards.
diff --git a/sys/dev/microcode/daic/dnload.h-dist b/sys/dev/microcode/daic/dnload.h-dist
index af778909f65..637d49b62c1 100644
--- a/sys/dev/microcode/daic/dnload.h-dist
+++ b/sys/dev/microcode/daic/dnload.h-dist
@@ -1,4 +1,4 @@
-/* $NetBSD: dnload.h-dist,v 1.4 2003/12/04 13:57:31 keihan Exp $ */
+/* $NetBSD: dnload.h-dist,v 1.5 2005/12/11 12:22:27 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/microcode/i8255x/rcvbundl.h b/sys/dev/microcode/i8255x/rcvbundl.h
index b78ca02f1ca..337c2e13924 100644
--- a/sys/dev/microcode/i8255x/rcvbundl.h
+++ b/sys/dev/microcode/i8255x/rcvbundl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rcvbundl.h,v 1.2 2005/02/27 00:27:23 perry Exp $ */
+/* $NetBSD: rcvbundl.h,v 1.3 2005/12/11 12:22:27 christos Exp $ */
/*
Copyright (c) 1999-2001, Intel Corporation
diff --git a/sys/dev/microcode/isp/asm_1040.h b/sys/dev/microcode/isp/asm_1040.h
index c9719ad8f99..42a2dbf7995 100644
--- a/sys/dev/microcode/isp/asm_1040.h
+++ b/sys/dev/microcode/isp/asm_1040.h
@@ -1,4 +1,4 @@
-/* $NetBSD: asm_1040.h,v 1.3 2005/02/27 00:27:23 perry Exp $ */
+/* $NetBSD: asm_1040.h,v 1.4 2005/12/11 12:22:27 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
diff --git a/sys/dev/microcode/isp/asm_1080.h b/sys/dev/microcode/isp/asm_1080.h
index f657ec04171..a6d0e508bb7 100644
--- a/sys/dev/microcode/isp/asm_1080.h
+++ b/sys/dev/microcode/isp/asm_1080.h
@@ -1,4 +1,4 @@
-/* $NetBSD: asm_1080.h,v 1.3 2005/02/27 00:27:23 perry Exp $ */
+/* $NetBSD: asm_1080.h,v 1.4 2005/12/11 12:22:27 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
diff --git a/sys/dev/microcode/isp/asm_12160.h b/sys/dev/microcode/isp/asm_12160.h
index 0d72559f9d6..6848d5cdc81 100644
--- a/sys/dev/microcode/isp/asm_12160.h
+++ b/sys/dev/microcode/isp/asm_12160.h
@@ -1,4 +1,4 @@
-/* $NetBSD: asm_12160.h,v 1.5 2005/02/27 00:27:23 perry Exp $ */
+/* $NetBSD: asm_12160.h,v 1.6 2005/12/11 12:22:27 christos Exp $ */
/* @(#)asm_12160.h 1.4 */
/*
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
diff --git a/sys/dev/microcode/isp/asm_2100.h b/sys/dev/microcode/isp/asm_2100.h
index 6d3c9157b55..0b47046ebd0 100644
--- a/sys/dev/microcode/isp/asm_2100.h
+++ b/sys/dev/microcode/isp/asm_2100.h
@@ -1,4 +1,4 @@
-/* $NetBSD: asm_2100.h,v 1.6 2005/02/27 00:27:23 perry Exp $ */
+/* $NetBSD: asm_2100.h,v 1.7 2005/12/11 12:22:27 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 Qlogic, Inc.
* All rights reserved.
diff --git a/sys/dev/microcode/isp/asm_2200.h b/sys/dev/microcode/isp/asm_2200.h
index bfd8a6bbed0..c9bbb78fbf5 100644
--- a/sys/dev/microcode/isp/asm_2200.h
+++ b/sys/dev/microcode/isp/asm_2200.h
@@ -1,4 +1,4 @@
-/* $NetBSD: asm_2200.h,v 1.6 2005/02/27 00:27:24 perry Exp $ */
+/* $NetBSD: asm_2200.h,v 1.7 2005/12/11 12:22:27 christos Exp $ */
/* @(#)asm_2200.h 1.6 */
/*
* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 by Qlogic, Inc.
diff --git a/sys/dev/microcode/isp/asm_2300.h b/sys/dev/microcode/isp/asm_2300.h
index 7123723b247..539a5b73088 100644
--- a/sys/dev/microcode/isp/asm_2300.h
+++ b/sys/dev/microcode/isp/asm_2300.h
@@ -1,4 +1,4 @@
-/* $NetBSD: asm_2300.h,v 1.6 2005/02/27 00:27:24 perry Exp $ */
+/* $NetBSD: asm_2300.h,v 1.7 2005/12/11 12:22:27 christos Exp $ */
/* @(#)asm_2300.h 1.7 */
/*
* Copyright (C) 2001 Qlogic, Inc.
diff --git a/sys/dev/microcode/isp/asm_sbus.h b/sys/dev/microcode/isp/asm_sbus.h
index 998799f9772..910534ba8cf 100644
--- a/sys/dev/microcode/isp/asm_sbus.h
+++ b/sys/dev/microcode/isp/asm_sbus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: asm_sbus.h,v 1.19 2005/05/31 00:49:12 christos Exp $ */
+/* $NetBSD: asm_sbus.h,v 1.20 2005/12/11 12:22:28 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, 1998, 1999 Qlogic, Inc.
* All rights reserved.
diff --git a/sys/dev/microcode/siop/ncr53cxxx.c b/sys/dev/microcode/siop/ncr53cxxx.c
index e6dd4655d79..506c9991726 100644
--- a/sys/dev/microcode/siop/ncr53cxxx.c
+++ b/sys/dev/microcode/siop/ncr53cxxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr53cxxx.c,v 1.14 2005/02/11 06:21:22 simonb Exp $ */
+/* $NetBSD: ncr53cxxx.c,v 1.15 2005/12/11 12:22:36 christos Exp $ */
/*
* Copyright (c) 1995,1999 Michael L. Hitch
@@ -33,7 +33,7 @@
/* ncr53cxxx.c - SCSI SCRIPTS Assembler */
#include <sys/cdefs.h>
-__RCSID("$NetBSD: ncr53cxxx.c,v 1.14 2005/02/11 06:21:22 simonb Exp $");
+__RCSID("$NetBSD: ncr53cxxx.c,v 1.15 2005/12/11 12:22:36 christos Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -418,7 +418,7 @@ main (int argc, char *argv[])
if (outfp) {
time_t cur_time;
- fprintf(outfp, "/*\t$NetBSD: ncr53cxxx.c,v 1.14 2005/02/11 06:21:22 simonb Exp $\t*/\n");
+ fprintf(outfp, "/*\t$NetBSD: ncr53cxxx.c,v 1.15 2005/12/11 12:22:36 christos Exp $\t*/\n");
fprintf(outfp, "/*\n");
fprintf(outfp, " *\tDO NOT EDIT - this file is automatically generated.\n");
time(&cur_time);
diff --git a/sys/dev/microcode/tigon/ti_fw.h b/sys/dev/microcode/tigon/ti_fw.h
index 0cec9937dcd..3726bd9da58 100644
--- a/sys/dev/microcode/tigon/ti_fw.h
+++ b/sys/dev/microcode/tigon/ti_fw.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_fw.h,v 1.2 2005/02/27 00:27:29 perry Exp $ */
+/* $NetBSD: ti_fw.h,v 1.3 2005/12/11 12:22:36 christos Exp $ */
/*
* Firmware for Alteon Tigon 1 chip.
diff --git a/sys/dev/microcode/tigon/ti_fw2.h b/sys/dev/microcode/tigon/ti_fw2.h
index c7010df888a..7be56b46e90 100644
--- a/sys/dev/microcode/tigon/ti_fw2.h
+++ b/sys/dev/microcode/tigon/ti_fw2.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_fw2.h,v 1.2 2005/02/27 00:27:29 perry Exp $ */
+/* $NetBSD: ti_fw2.h,v 1.3 2005/12/11 12:22:36 christos Exp $ */
/*
* Generated by genfw.c
diff --git a/sys/dev/microcode/typhoon/3c990img.h b/sys/dev/microcode/typhoon/3c990img.h
index cb5dd139157..afa1e807fef 100644
--- a/sys/dev/microcode/typhoon/3c990img.h
+++ b/sys/dev/microcode/typhoon/3c990img.h
@@ -1,4 +1,4 @@
-/* $NetBSD: 3c990img.h,v 1.2 2005/02/27 00:27:29 perry Exp $ */
+/* $NetBSD: 3c990img.h,v 1.3 2005/12/11 12:22:36 christos Exp $ */
/*
* Copyright 1999-2002 3Com Corporation. All Rights Reserved.
diff --git a/sys/dev/microcode/wi/spectrum24t_cf.h b/sys/dev/microcode/wi/spectrum24t_cf.h
index 5d8cfd5ec07..cc8450bcade 100644
--- a/sys/dev/microcode/wi/spectrum24t_cf.h
+++ b/sys/dev/microcode/wi/spectrum24t_cf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: spectrum24t_cf.h,v 1.2 2005/02/27 00:27:29 perry Exp $ */
+/* $NetBSD: spectrum24t_cf.h,v 1.3 2005/12/11 12:22:37 christos Exp $ */
/*
* Copyright (c) 2001 Symbol Technologies Inc. -- http://www.symbol.com
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index c458e17cef4..655725674ab 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midi.c,v 1.41 2005/06/21 14:01:11 ws Exp $ */
+/* $NetBSD: midi.c,v 1.42 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.41 2005/06/21 14:01:11 ws Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.42 2005/12/11 12:20:53 christos Exp $");
#include "midi.h"
#include "sequencer.h"
@@ -389,7 +389,7 @@ midi_out(void *addr)
}
int
-midiopen(dev_t dev, int flags, int ifmt, struct proc *p)
+midiopen(dev_t dev, int flags, int ifmt, struct lwp *l)
{
struct midi_softc *sc;
const struct midi_hw_if *hw;
@@ -433,7 +433,7 @@ midiopen(dev_t dev, int flags, int ifmt, struct proc *p)
}
int
-midiclose(dev_t dev, int flags, int ifmt, struct proc *p)
+midiclose(dev_t dev, int flags, int ifmt, struct lwp *l)
{
int unit = MIDIUNIT(dev);
struct midi_softc *sc = midi_cd.cd_devs[unit];
@@ -692,7 +692,7 @@ midi_writebytes(int unit, u_char *bf, int cc)
}
int
-midiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+midiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
int unit = MIDIUNIT(dev);
struct midi_softc *sc = midi_cd.cd_devs[unit];
@@ -714,8 +714,8 @@ midiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
if (*(int *)addr) {
if (sc->async)
return EBUSY;
- sc->async = p;
- DPRINTF(("midi_ioctl: FIOASYNC %p\n", p));
+ sc->async = l->l_proc;
+ DPRINTF(("midi_ioctl: FIOASYNC %p\n", l->l_proc));
} else
sc->async = 0;
break;
@@ -737,7 +737,7 @@ midiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
default:
if (hw->ioctl)
- error = hw->ioctl(sc->hw_hdl, cmd, addr, flag, p);
+ error = hw->ioctl(sc->hw_hdl, cmd, addr, flag, l);
else
error = EINVAL;
break;
@@ -746,7 +746,7 @@ midiioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
}
int
-midipoll(dev_t dev, int events, struct proc *p)
+midipoll(dev_t dev, int events, struct lwp *l)
{
int unit = MIDIUNIT(dev);
struct midi_softc *sc = midi_cd.cd_devs[unit];
@@ -770,10 +770,10 @@ midipoll(dev_t dev, int events, struct proc *p)
if (revents == 0) {
if (events & (POLLIN | POLLRDNORM))
- selrecord(p, &sc->rsel);
+ selrecord(l, &sc->rsel);
if (events & (POLLOUT | POLLWRNORM))
- selrecord(p, &sc->wsel);
+ selrecord(l, &sc->wsel);
}
splx(s);
diff --git a/sys/dev/midi_if.h b/sys/dev/midi_if.h
index e596f690dbd..56d16105c20 100644
--- a/sys/dev/midi_if.h
+++ b/sys/dev/midi_if.h
@@ -1,4 +1,4 @@
-/* $NetBSD: midi_if.h,v 1.16 2005/05/29 22:18:25 christos Exp $ */
+/* $NetBSD: midi_if.h,v 1.17 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@ struct midi_hw_if {
void (*close)(void *); /* close hardware */
int (*output)(void *, int); /* output a byte */
void (*getinfo)(void *, struct midi_info *);
- int (*ioctl)(void *, u_long, caddr_t, int, struct proc *);
+ int (*ioctl)(void *, u_long, caddr_t, int, struct lwp *);
};
void midi_attach(struct midi_softc *, struct device *);
diff --git a/sys/dev/midisyn.c b/sys/dev/midisyn.c
index f823e1f5bc0..40e04c3d4ff 100644
--- a/sys/dev/midisyn.c
+++ b/sys/dev/midisyn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midisyn.c,v 1.15 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: midisyn.c,v 1.16 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midisyn.c,v 1.15 2005/02/27 00:26:58 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midisyn.c,v 1.16 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -79,7 +79,7 @@ int midisyn_open(void *, int,
void midisyn_close(void *);
int midisyn_output(void *, int);
void midisyn_getinfo(void *, struct midi_info *);
-int midisyn_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int midisyn_ioctl(void *, u_long, caddr_t, int, struct lwp *);
const struct midi_hw_if midisyn_hw_if = {
midisyn_open,
@@ -134,12 +134,12 @@ midisyn_getinfo(void *addr, struct midi_info *mi)
}
int
-midisyn_ioctl(void *maddr, u_long cmd, caddr_t addr, int flag, struct proc *p)
+midisyn_ioctl(void *maddr, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
midisyn *ms = maddr;
if (ms->mets->ioctl)
- return (ms->mets->ioctl(ms, cmd, addr, flag, p));
+ return (ms->mets->ioctl(ms, cmd, addr, flag, l));
else
return (EINVAL);
}
diff --git a/sys/dev/midisynvar.h b/sys/dev/midisynvar.h
index c508ddcac77..9c57674fde8 100644
--- a/sys/dev/midisynvar.h
+++ b/sys/dev/midisynvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: midisynvar.h,v 1.8 2004/10/29 12:57:16 yamt Exp $ */
+/* $NetBSD: midisynvar.h,v 1.9 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@ typedef struct midisyn midisyn;
struct midisyn_methods {
int (*open) (midisyn *, int);
void (*close) (midisyn *);
- int (*ioctl) (midisyn *, u_long, caddr_t, int, struct proc *);
+ int (*ioctl) (midisyn *, u_long, caddr_t, int, struct lwp *);
int (*allocv) (midisyn *, u_int32_t, u_int32_t);
void (*noteon) (midisyn *, u_int32_t, u_int32_t, u_int32_t);
void (*noteoff) (midisyn *, u_int32_t, u_int32_t, u_int32_t);
diff --git a/sys/dev/midivar.h b/sys/dev/midivar.h
index 895df773487..424378f2e37 100644
--- a/sys/dev/midivar.h
+++ b/sys/dev/midivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: midivar.h,v 1.10 2004/10/29 12:57:16 yamt Exp $ */
+/* $NetBSD: midivar.h,v 1.11 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 53332fe71e3..e8f2147f2ad 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acphy.c,v 1.14 2004/08/23 06:16:06 thorpej Exp $ */
+/* $NetBSD: acphy.c,v 1.15 2005/12/11 12:22:42 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.14 2004/08/23 06:16:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acphy.c,v 1.15 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/amhphy.c b/sys/dev/mii/amhphy.c
index 33ebc79014c..bddc7771d88 100644
--- a/sys/dev/mii/amhphy.c
+++ b/sys/dev/mii/amhphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amhphy.c,v 1.10 2004/08/23 06:16:06 thorpej Exp $ */
+/* $NetBSD: amhphy.c,v 1.11 2005/12/11 12:22:42 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amhphy.c,v 1.10 2004/08/23 06:16:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amhphy.c,v 1.11 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index b07de74d0c8..3d6d1f17f4b 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bmtphy.c,v 1.17 2005/01/17 13:17:45 scw Exp $ */
+/* $NetBSD: bmtphy.c,v 1.18 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bmtphy.c,v 1.17 2005/01/17 13:17:45 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bmtphy.c,v 1.18 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/ciphyreg.h b/sys/dev/mii/ciphyreg.h
index 784caa920e2..ae27a6738d8 100644
--- a/sys/dev/mii/ciphyreg.h
+++ b/sys/dev/mii/ciphyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ciphyreg.h,v 1.2 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: ciphyreg.h,v 1.3 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 2004
diff --git a/sys/dev/mii/devlist2h.awk b/sys/dev/mii/devlist2h.awk
index 6fa356edda8..31c532b0422 100644
--- a/sys/dev/mii/devlist2h.awk
+++ b/sys/dev/mii/devlist2h.awk
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: devlist2h.awk,v 1.5 2005/02/27 14:29:18 perry Exp $
+# $NetBSD: devlist2h.awk,v 1.6 2005/12/11 12:22:42 christos Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
# All rights reserved.
diff --git a/sys/dev/mii/dmphy.c b/sys/dev/mii/dmphy.c
index ddfe62775ae..6ba1f647208 100644
--- a/sys/dev/mii/dmphy.c
+++ b/sys/dev/mii/dmphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dmphy.c,v 1.21 2005/08/28 14:59:34 kiyohara Exp $ */
+/* $NetBSD: dmphy.c,v 1.22 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.21 2005/08/28 14:59:34 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dmphy.c,v 1.22 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 4371726a6ac..6bf529bd27e 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exphy.c,v 1.36 2004/08/23 06:16:06 thorpej Exp $ */
+/* $NetBSD: exphy.c,v 1.37 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exphy.c,v 1.36 2004/08/23 06:16:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exphy.c,v 1.37 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/files.mii b/sys/dev/mii/files.mii
index a385f358ec3..0e23f8d61af 100644
--- a/sys/dev/mii/files.mii
+++ b/sys/dev/mii/files.mii
@@ -1,4 +1,4 @@
-# $NetBSD: files.mii,v 1.36 2005/02/20 16:35:56 jdolecek Exp $
+# $NetBSD: files.mii,v 1.37 2005/12/11 12:22:42 christos Exp $
defflag opt_mii.h MIIVERBOSE
diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c
index fca36154554..ffda08afe35 100644
--- a/sys/dev/mii/gentbi.c
+++ b/sys/dev/mii/gentbi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gentbi.c,v 1.13 2004/08/23 06:16:06 thorpej Exp $ */
+/* $NetBSD: gentbi.c,v 1.14 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gentbi.c,v 1.13 2004/08/23 06:16:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gentbi.c,v 1.14 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/glxtphy.c b/sys/dev/mii/glxtphy.c
index 6711ad85315..0e57e833d47 100644
--- a/sys/dev/mii/glxtphy.c
+++ b/sys/dev/mii/glxtphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: glxtphy.c,v 1.12 2004/08/23 06:16:06 thorpej Exp $ */
+/* $NetBSD: glxtphy.c,v 1.13 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: glxtphy.c,v 1.12 2004/08/23 06:16:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: glxtphy.c,v 1.13 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/gphyter.c b/sys/dev/mii/gphyter.c
index ea7eeb6525c..d5bc3cceee9 100644
--- a/sys/dev/mii/gphyter.c
+++ b/sys/dev/mii/gphyter.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gphyter.c,v 1.15 2004/08/23 06:16:06 thorpej Exp $ */
+/* $NetBSD: gphyter.c,v 1.16 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gphyter.c,v 1.15 2004/08/23 06:16:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gphyter.c,v 1.16 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index 2827bf76008..2b7803d6977 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icsphy.c,v 1.35 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: icsphy.c,v 1.36 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icsphy.c,v 1.35 2005/02/27 00:27:31 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icsphy.c,v 1.36 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/igphy.c b/sys/dev/mii/igphy.c
index 46c828cbc32..4390601c3d0 100644
--- a/sys/dev/mii/igphy.c
+++ b/sys/dev/mii/igphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: igphy.c,v 1.5 2004/10/05 20:20:00 thorpej Exp $ */
+/* $NetBSD: igphy.c,v 1.6 2005/12/11 12:22:42 christos Exp $ */
/*
* The Intel copyright applies to the analog register setup, and the
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.5 2004/10/05 20:20:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igphy.c,v 1.6 2005/12/11 12:22:42 christos Exp $");
#include "opt_mii.h"
diff --git a/sys/dev/mii/igphyreg.h b/sys/dev/mii/igphyreg.h
index cbcbddf7874..fac7f3108b6 100644
--- a/sys/dev/mii/igphyreg.h
+++ b/sys/dev/mii/igphyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: igphyreg.h,v 1.3 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: igphyreg.h,v 1.4 2005/12/11 12:22:42 christos Exp $ */
/*******************************************************************************
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index 19c22b9733a..9d999d0954d 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inphy.c,v 1.36 2004/08/23 06:16:06 thorpej Exp $ */
+/* $NetBSD: inphy.c,v 1.37 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.36 2004/08/23 06:16:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: inphy.c,v 1.37 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/inphyreg.h b/sys/dev/mii/inphyreg.h
index 78e6f3d8937..84047f735c7 100644
--- a/sys/dev/mii/inphyreg.h
+++ b/sys/dev/mii/inphyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: inphyreg.h,v 1.3 2003/11/02 11:10:36 wiz Exp $ */
+/* $NetBSD: inphyreg.h,v 1.4 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/iophy.c b/sys/dev/mii/iophy.c
index 7af024ddd2c..d439e4950c5 100644
--- a/sys/dev/mii/iophy.c
+++ b/sys/dev/mii/iophy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iophy.c,v 1.22 2004/08/23 06:16:06 thorpej Exp $ */
+/* $NetBSD: iophy.c,v 1.23 2005/12/11 12:22:42 christos Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iophy.c,v 1.22 2004/08/23 06:16:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iophy.c,v 1.23 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index 07c231470cd..b542593c766 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lxtphy.c,v 1.35 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: lxtphy.c,v 1.36 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lxtphy.c,v 1.35 2005/02/27 00:27:31 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lxtphy.c,v 1.36 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/makphy.c b/sys/dev/mii/makphy.c
index 9d39855b42d..38d49d3b8a7 100644
--- a/sys/dev/mii/makphy.c
+++ b/sys/dev/mii/makphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: makphy.c,v 1.16 2005/06/23 19:21:26 briggs Exp $ */
+/* $NetBSD: makphy.c,v 1.17 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.16 2005/06/23 19:21:26 briggs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: makphy.c,v 1.17 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index 7878933cacf..48c18bdf650 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mii.c,v 1.39 2005/08/25 22:33:19 drochner Exp $ */
+/* $NetBSD: mii.c,v 1.40 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii.c,v 1.39 2005/08/25 22:33:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii.c,v 1.40 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/mii/mii.h b/sys/dev/mii/mii.h
index 5f8f8b7cfc0..b6fee0883eb 100644
--- a/sys/dev/mii/mii.h
+++ b/sys/dev/mii/mii.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mii.h,v 1.12 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: mii.h,v 1.13 2005/12/11 12:22:42 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
diff --git a/sys/dev/mii/mii_bitbang.c b/sys/dev/mii/mii_bitbang.c
index 43b54ec32fa..7ba8d0ba913 100644
--- a/sys/dev/mii/mii_bitbang.c
+++ b/sys/dev/mii/mii_bitbang.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_bitbang.c,v 1.9 2005/08/09 19:26:24 chris Exp $ */
+/* $NetBSD: mii_bitbang.c,v 1.10 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_bitbang.c,v 1.9 2005/08/09 19:26:24 chris Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_bitbang.c,v 1.10 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/mii/mii_bitbang.h b/sys/dev/mii/mii_bitbang.h
index 21bfd32fc3b..0d49e5ab704 100644
--- a/sys/dev/mii/mii_bitbang.h
+++ b/sys/dev/mii/mii_bitbang.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_bitbang.h,v 1.2 2004/08/23 06:05:30 thorpej Exp $ */
+/* $NetBSD: mii_bitbang.h,v 1.3 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 374c899029d..3fc4f555c5a 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mii_physubr.c,v 1.44 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: mii_physubr.c,v 1.45 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.44 2005/02/27 00:27:31 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mii_physubr.c,v 1.45 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/mii/miivar.h b/sys/dev/mii/miivar.h
index e37e9f8516d..f47db5ee49c 100644
--- a/sys/dev/mii/miivar.h
+++ b/sys/dev/mii/miivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: miivar.h,v 1.43 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: miivar.h,v 1.44 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 949bd79f1a6..578c31a2cda 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsphy.c,v 1.43 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: nsphy.c,v 1.44 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsphy.c,v 1.43 2005/02/27 00:27:31 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsphy.c,v 1.44 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index 09b48d8f743..dae782f8d39 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nsphyter.c,v 1.21 2004/08/23 06:16:06 thorpej Exp $ */
+/* $NetBSD: nsphyter.c,v 1.22 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsphyter.c,v 1.21 2004/08/23 06:16:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsphyter.c,v 1.22 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/nsphyterreg.h b/sys/dev/mii/nsphyterreg.h
index 9dee3d17615..cb005b4a9ae 100644
--- a/sys/dev/mii/nsphyterreg.h
+++ b/sys/dev/mii/nsphyterreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nsphyterreg.h,v 1.3 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: nsphyterreg.h,v 1.4 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1999, 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index cec7a812352..e47abe55c28 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pnaphy.c,v 1.11 2004/08/23 06:16:06 thorpej Exp $ */
+/* $NetBSD: pnaphy.c,v 1.12 2005/12/11 12:22:42 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnaphy.c,v 1.11 2004/08/23 06:16:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnaphy.c,v 1.12 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index a787cf390a2..636be542d26 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qsphy.c,v 1.34 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: qsphy.c,v 1.35 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qsphy.c,v 1.34 2005/02/27 00:27:31 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qsphy.c,v 1.35 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/qsphyreg.h b/sys/dev/mii/qsphyreg.h
index 1bf0aa60185..c0b489ece11 100644
--- a/sys/dev/mii/qsphyreg.h
+++ b/sys/dev/mii/qsphyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qsphyreg.h,v 1.2 2003/11/02 11:10:36 wiz Exp $ */
+/* $NetBSD: qsphyreg.h,v 1.3 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index 0fd35eacb3b..7527c24a22e 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephy.c,v 1.6 2005/03/23 13:27:20 wiz Exp $ */
+/* $NetBSD: rgephy.c,v 1.7 2005/12/11 12:22:42 christos Exp $ */
/*
* Copyright (c) 2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.6 2005/03/23 13:27:20 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.7 2005/12/11 12:22:42 christos Exp $");
/*
diff --git a/sys/dev/mii/sqphy.c b/sys/dev/mii/sqphy.c
index fe8645089dd..4bb7967ae43 100644
--- a/sys/dev/mii/sqphy.c
+++ b/sys/dev/mii/sqphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sqphy.c,v 1.36 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: sqphy.c,v 1.37 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sqphy.c,v 1.36 2005/02/27 00:27:31 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sqphy.c,v 1.37 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/sqphyreg.h b/sys/dev/mii/sqphyreg.h
index 417d224c1e2..2b7ca665277 100644
--- a/sys/dev/mii/sqphyreg.h
+++ b/sys/dev/mii/sqphyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sqphyreg.h,v 1.3 2003/11/02 11:10:36 wiz Exp $ */
+/* $NetBSD: sqphyreg.h,v 1.4 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index e1a4220c705..16684577565 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tlphy.c,v 1.42 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: tlphy.c,v 1.43 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.42 2005/02/27 00:27:31 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlphy.c,v 1.43 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/tlphyreg.h b/sys/dev/mii/tlphyreg.h
index 8531621ae3a..f60e90e87be 100644
--- a/sys/dev/mii/tlphyreg.h
+++ b/sys/dev/mii/tlphyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tlphyreg.h,v 1.2 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: tlphyreg.h,v 1.3 2005/12/11 12:22:42 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
diff --git a/sys/dev/mii/tqphy.c b/sys/dev/mii/tqphy.c
index 24e87eff2b3..661e749de2f 100644
--- a/sys/dev/mii/tqphy.c
+++ b/sys/dev/mii/tqphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tqphy.c,v 1.25 2005/02/27 00:27:31 perry Exp $ */
+/* $NetBSD: tqphy.c,v 1.26 2005/12/11 12:22:42 christos Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tqphy.c,v 1.25 2005/02/27 00:27:31 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tqphy.c,v 1.26 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/tqphyreg.h b/sys/dev/mii/tqphyreg.h
index 7bc0c3f936a..94c2ddd72ef 100644
--- a/sys/dev/mii/tqphyreg.h
+++ b/sys/dev/mii/tqphyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tqphyreg.h,v 1.3 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: tqphyreg.h,v 1.4 2005/12/11 12:22:42 christos Exp $ */
/*
* Copyright (c) 1999 Soren S. Jorvang.
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 8d0d0949130..dc5b52b85f2 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ukphy.c,v 1.24 2004/08/23 06:16:07 thorpej Exp $ */
+/* $NetBSD: ukphy.c,v 1.25 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.24 2004/08/23 06:16:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukphy.c,v 1.25 2005/12/11 12:22:42 christos Exp $");
#include "opt_mii.h"
diff --git a/sys/dev/mii/ukphy_subr.c b/sys/dev/mii/ukphy_subr.c
index f5be0e6459f..4e1b3a8c47d 100644
--- a/sys/dev/mii/ukphy_subr.c
+++ b/sys/dev/mii/ukphy_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ukphy_subr.c,v 1.8 2004/05/17 00:17:28 thorpej Exp $ */
+/* $NetBSD: ukphy_subr.c,v 1.9 2005/12/11 12:22:42 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukphy_subr.c,v 1.8 2004/05/17 00:17:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukphy_subr.c,v 1.9 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/urlphy.c b/sys/dev/mii/urlphy.c
index bad712e81fb..72573d985cc 100644
--- a/sys/dev/mii/urlphy.c
+++ b/sys/dev/mii/urlphy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: urlphy.c,v 1.10 2004/08/23 06:16:07 thorpej Exp $ */
+/* $NetBSD: urlphy.c,v 1.11 2005/12/11 12:22:42 christos Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.10 2004/08/23 06:16:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urlphy.c,v 1.11 2005/12/11 12:22:42 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mii/urlphyreg.h b/sys/dev/mii/urlphyreg.h
index 47e1feba38e..bf8a875101e 100644
--- a/sys/dev/mii/urlphyreg.h
+++ b/sys/dev/mii/urlphyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: urlphyreg.h,v 1.2 2003/09/04 15:17:38 tsutsui Exp $ */
+/* $NetBSD: urlphyreg.h,v 1.3 2005/12/11 12:22:42 christos Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
diff --git a/sys/dev/mm.c b/sys/dev/mm.c
index 069659022dc..beb0900c7f2 100644
--- a/sys/dev/mm.c
+++ b/sys/dev/mm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mm.c,v 1.6 2003/12/20 16:22:14 jdolecek Exp $ */
+/* $NetBSD: mm.c,v 1.7 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.6 2003/12/20 16:22:14 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.7 2005/12/11 12:20:53 christos Exp $");
/*
* Memory special file
@@ -56,12 +56,12 @@ __KERNEL_RCSID(0, "$NetBSD: mm.c,v 1.6 2003/12/20 16:22:14 jdolecek Exp $");
dev_type_ioctl(mmioctl);
int
-mmioctl(dev, cmd, data, flag, p)
+mmioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
switch (minor(dev)) {
default:
diff --git a/sys/dev/mscp/mscp.c b/sys/dev/mscp/mscp.c
index bfc73dcffe5..08416efa620 100644
--- a/sys/dev/mscp/mscp.c
+++ b/sys/dev/mscp/mscp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp.c,v 1.22 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: mscp.c,v 1.23 2005/12/11 12:22:47 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.22 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp.c,v 1.23 2005/12/11 12:22:47 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
diff --git a/sys/dev/mscp/mscp.h b/sys/dev/mscp/mscp.h
index fd3980af2cb..940846bec71 100644
--- a/sys/dev/mscp/mscp.h
+++ b/sys/dev/mscp/mscp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp.h,v 1.7 2003/08/07 16:31:09 agc Exp $ */
+/* $NetBSD: mscp.h,v 1.8 2005/12/11 12:22:47 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
diff --git a/sys/dev/mscp/mscp_disk.c b/sys/dev/mscp/mscp_disk.c
index 022910c33ae..da76bc93be5 100644
--- a/sys/dev/mscp/mscp_disk.c
+++ b/sys/dev/mscp/mscp_disk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.48 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.49 2005/12/11 12:22:47 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.48 2005/10/15 17:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.49 2005/12/11 12:22:47 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -226,10 +226,10 @@ ra_putonline(ra)
*/
/*ARGSUSED*/
int
-raopen(dev, flag, fmt, p)
+raopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct ra_softc *ra;
int error, part, unit, mask;
@@ -311,10 +311,10 @@ raopen(dev, flag, fmt, p)
/* ARGSUSED */
int
-raclose(dev, flags, fmt, p)
+raclose(dev, flags, fmt, l)
dev_t dev;
int flags, fmt;
- struct proc *p;
+ struct lwp *l;
{
int unit = DISKUNIT(dev);
struct ra_softc *ra = ra_cd.cd_devs[unit];
@@ -436,12 +436,12 @@ rawrite(dev, uio, flags)
* I/O controls.
*/
int
-raioctl(dev, cmd, data, flag, p)
+raioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int unit = DISKUNIT(dev);
struct disklabel *lp, *tp;
@@ -571,7 +571,7 @@ raioctl(dev, cmd, data, flag, p)
{
struct dkwedge_list *dkwl = (void *) data;
- return (dkwedge_list(&ra->ra_disk, dkwl, p));
+ return (dkwedge_list(&ra->ra_disk, dkwl, l));
}
default:
@@ -766,10 +766,10 @@ rx_putonline(rx)
*/
/*ARGSUSED*/
int
-rxopen(dev, flag, fmt, p)
+rxopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct rx_softc *rx;
int unit;
@@ -872,12 +872,12 @@ rxwrite(dev, uio, flag)
* I/O controls.
*/
int
-rxioctl(dev, cmd, data, flag, p)
+rxioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int unit = DISKUNIT(dev);
struct disklabel *lp;
diff --git a/sys/dev/mscp/mscp_subr.c b/sys/dev/mscp/mscp_subr.c
index f6863710057..a4786763009 100644
--- a/sys/dev/mscp/mscp_subr.c
+++ b/sys/dev/mscp/mscp_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_subr.c,v 1.29 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: mscp_subr.c,v 1.30 2005/12/11 12:22:47 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.29 2005/10/15 17:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_subr.c,v 1.30 2005/12/11 12:22:47 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/mscp/mscp_tape.c b/sys/dev/mscp/mscp_tape.c
index 8d924452d32..35f0d6de110 100644
--- a/sys/dev/mscp/mscp_tape.c
+++ b/sys/dev/mscp/mscp_tape.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_tape.c,v 1.25 2005/06/27 11:05:24 ragge Exp $ */
+/* $NetBSD: mscp_tape.c,v 1.26 2005/12/11 12:22:47 christos Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.25 2005/06/27 11:05:24 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_tape.c,v 1.26 2005/12/11 12:22:47 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -206,10 +206,10 @@ mt_putonline(mt)
*/
/*ARGSUSED*/
int
-mtopen(dev, flag, fmt, p)
+mtopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct mt_softc *mt;
int unit;
@@ -238,10 +238,10 @@ mtopen(dev, flag, fmt, p)
/* ARGSUSED */
int
-mtclose(dev, flags, fmt, p)
+mtclose(dev, flags, fmt, l)
dev_t dev;
int flags, fmt;
- struct proc *p;
+ struct lwp *l;
{
int unit = mtunit(dev);
struct mt_softc *mt = mt_cd.cd_devs[unit];
@@ -434,12 +434,12 @@ mtioerror(usc, mp, bp)
* I/O controls.
*/
int
-mtioctl(dev, cmd, data, flag, p)
+mtioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int unit = mtunit(dev);
struct mt_softc *mt = mt_cd.cd_devs[unit];
diff --git a/sys/dev/mscp/mscpreg.h b/sys/dev/mscp/mscpreg.h
index 5c124042f7c..02546f0508d 100644
--- a/sys/dev/mscp/mscpreg.h
+++ b/sys/dev/mscp/mscpreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mscpreg.h,v 1.6 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: mscpreg.h,v 1.7 2005/12/11 12:22:47 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/mscp/mscpvar.h b/sys/dev/mscp/mscpvar.h
index ccc790a11b7..07b19154f73 100644
--- a/sys/dev/mscp/mscpvar.h
+++ b/sys/dev/mscp/mscpvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mscpvar.h,v 1.13 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: mscpvar.h,v 1.14 2005/12/11 12:22:47 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/mulaw.c b/sys/dev/mulaw.c
index 625d4425ae4..bc6c3d6a225 100644
--- a/sys/dev/mulaw.c
+++ b/sys/dev/mulaw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mulaw.c,v 1.23 2005/01/10 22:01:37 kent Exp $ */
+/* $NetBSD: mulaw.c,v 1.24 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mulaw.c,v 1.23 2005/01/10 22:01:37 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mulaw.c,v 1.24 2005/12/11 12:20:53 christos Exp $");
#include <sys/types.h>
#include <sys/systm.h>
diff --git a/sys/dev/mulaw.h b/sys/dev/mulaw.h
index ceed08a9b64..23d7f765dbd 100644
--- a/sys/dev/mulaw.h
+++ b/sys/dev/mulaw.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mulaw.h,v 1.18 2005/01/10 22:01:37 kent Exp $ */
+/* $NetBSD: mulaw.h,v 1.19 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mvme/clmpcc_pcctwo.c b/sys/dev/mvme/clmpcc_pcctwo.c
index 910846bd955..e699e7ec8d3 100644
--- a/sys/dev/mvme/clmpcc_pcctwo.c
+++ b/sys/dev/mvme/clmpcc_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clmpcc_pcctwo.c,v 1.9 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: clmpcc_pcctwo.c,v 1.10 2005/12/11 12:22:47 christos Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.9 2005/02/04 02:10:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clmpcc_pcctwo.c,v 1.10 2005/12/11 12:22:47 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mvme/clock_pcctwo.c b/sys/dev/mvme/clock_pcctwo.c
index 9be2cc6168e..8f573815e22 100644
--- a/sys/dev/mvme/clock_pcctwo.c
+++ b/sys/dev/mvme/clock_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_pcctwo.c,v 1.8 2005/06/03 08:42:54 scw Exp $ */
+/* $NetBSD: clock_pcctwo.c,v 1.9 2005/12/11 12:22:47 christos Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.8 2005/06/03 08:42:54 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock_pcctwo.c,v 1.9 2005/12/11 12:22:47 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/mvme/clockvar.h b/sys/dev/mvme/clockvar.h
index b29205d2eb1..076e7566ec4 100644
--- a/sys/dev/mvme/clockvar.h
+++ b/sys/dev/mvme/clockvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: clockvar.h,v 1.5 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: clockvar.h,v 1.6 2005/12/11 12:22:47 christos Exp $ */
/*-
* Copyright (c) 1996, 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mvme/files.mvme b/sys/dev/mvme/files.mvme
index f7aff54c4c4..7adb40b813a 100644
--- a/sys/dev/mvme/files.mvme
+++ b/sys/dev/mvme/files.mvme
@@ -1,4 +1,4 @@
-# $NetBSD: files.mvme,v 1.2 2004/01/30 09:42:01 he Exp $
+# $NetBSD: files.mvme,v 1.3 2005/12/11 12:22:48 christos Exp $
#
# Config file and device description for drivers shared between all
# Motorola MVME boards.
diff --git a/sys/dev/mvme/if_ie_mvme.c b/sys/dev/mvme/if_ie_mvme.c
index f0a589e6c51..05affd49dd3 100644
--- a/sys/dev/mvme/if_ie_mvme.c
+++ b/sys/dev/mvme/if_ie_mvme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_mvme.c,v 1.7 2005/02/04 02:10:43 perry Exp $ */
+/* $NetBSD: if_ie_mvme.c,v 1.8 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.7 2005/02/04 02:10:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_mvme.c,v 1.8 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mvme/lpt_mvme.c b/sys/dev/mvme/lpt_mvme.c
index cb8a8ef4f76..1596c81b983 100644
--- a/sys/dev/mvme/lpt_mvme.c
+++ b/sys/dev/mvme/lpt_mvme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_mvme.c,v 1.6 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: lpt_mvme.c,v 1.7 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_mvme.c,v 1.6 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_mvme.c,v 1.7 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -155,11 +155,11 @@ lpt_attach_subr(sc)
* Reset the printer, then wait until it's selected and not busy.
*/
int
-lptopen(dev, flag, mode, p)
+lptopen(dev, flag, mode, l)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct lwp *l;
{
int unit;
u_char flags;
@@ -247,11 +247,11 @@ lpt_wakeup(arg)
* Close the device, and free the local line buffer.
*/
int
-lptclose(dev, flag, mode, p)
+lptclose(dev, flag, mode, l)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct lpt_softc *sc;
int unit;
@@ -389,12 +389,12 @@ lpt_intr(sc)
/* ARGSUSED */
int
-lptioctl(dev, cmd, data, flag, p)
+lptioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
return (ENODEV);
diff --git a/sys/dev/mvme/lpt_pcctwo.c b/sys/dev/mvme/lpt_pcctwo.c
index 70d2917086e..f8ea536acc2 100644
--- a/sys/dev/mvme/lpt_pcctwo.c
+++ b/sys/dev/mvme/lpt_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_pcctwo.c,v 1.6 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: lpt_pcctwo.c,v 1.7 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_pcctwo.c,v 1.6 2005/02/04 02:10:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_pcctwo.c,v 1.7 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/mvme/lptvar.h b/sys/dev/mvme/lptvar.h
index cd70e3aaca9..f5c7f370f3b 100644
--- a/sys/dev/mvme/lptvar.h
+++ b/sys/dev/mvme/lptvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lptvar.h,v 1.2 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: lptvar.h,v 1.3 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mvme/memc.c b/sys/dev/mvme/memc.c
index 6f62a8c41c7..d7ec3bc6007 100644
--- a/sys/dev/mvme/memc.c
+++ b/sys/dev/mvme/memc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memc.c,v 1.5 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: memc.c,v 1.6 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: memc.c,v 1.5 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: memc.c,v 1.6 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/mvme/memcreg.h b/sys/dev/mvme/memcreg.h
index 4fa4cd91cd3..b159c1286f3 100644
--- a/sys/dev/mvme/memcreg.h
+++ b/sys/dev/mvme/memcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: memcreg.h,v 1.2 2004/02/13 11:36:22 wiz Exp $ */
+/* $NetBSD: memcreg.h,v 1.3 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mvme/mvmebus.c b/sys/dev/mvme/mvmebus.c
index 5837d608eeb..5b698f31bb9 100644
--- a/sys/dev/mvme/mvmebus.c
+++ b/sys/dev/mvme/mvmebus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mvmebus.c,v 1.9 2004/06/06 13:34:36 he Exp $ */
+/* $NetBSD: mvmebus.c,v 1.10 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.9 2004/06/06 13:34:36 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvmebus.c,v 1.10 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/mvme/osiop_pcctwo.c b/sys/dev/mvme/osiop_pcctwo.c
index 0ed919368a9..4dd547b1e23 100644
--- a/sys/dev/mvme/osiop_pcctwo.c
+++ b/sys/dev/mvme/osiop_pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: osiop_pcctwo.c,v 1.8 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: osiop_pcctwo.c,v 1.9 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.8 2005/02/04 02:10:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osiop_pcctwo.c,v 1.9 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/mvme/pcctwo.c b/sys/dev/mvme/pcctwo.c
index 140a30e7d1b..f3d9072cf9b 100644
--- a/sys/dev/mvme/pcctwo.c
+++ b/sys/dev/mvme/pcctwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcctwo.c,v 1.5 2005/06/03 08:49:03 scw Exp $ */
+/* $NetBSD: pcctwo.c,v 1.6 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcctwo.c,v 1.5 2005/06/03 08:49:03 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcctwo.c,v 1.6 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/mvme/pcctwovar.h b/sys/dev/mvme/pcctwovar.h
index 3083e44d391..0540625356d 100644
--- a/sys/dev/mvme/pcctwovar.h
+++ b/sys/dev/mvme/pcctwovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcctwovar.h,v 1.2 2005/06/03 08:49:03 scw Exp $ */
+/* $NetBSD: pcctwovar.h,v 1.3 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/mvme/vme_two.c b/sys/dev/mvme/vme_two.c
index 576f92c3838..2041c46a323 100644
--- a/sys/dev/mvme/vme_two.c
+++ b/sys/dev/mvme/vme_two.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_two.c,v 1.4 2004/04/02 14:14:18 scw Exp $ */
+/* $NetBSD: vme_two.c,v 1.5 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_two.c,v 1.4 2004/04/02 14:14:18 scw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_two.c,v 1.5 2005/12/11 12:22:48 christos Exp $");
#include "vmetwo.h"
diff --git a/sys/dev/mvme/vme_two_isr.c b/sys/dev/mvme/vme_two_isr.c
index 27ada557159..8e8afc68474 100644
--- a/sys/dev/mvme/vme_two_isr.c
+++ b/sys/dev/mvme/vme_two_isr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_two_isr.c,v 1.5 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: vme_two_isr.c,v 1.6 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.5 2005/02/04 02:10:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_two_isr.c,v 1.6 2005/12/11 12:22:48 christos Exp $");
#include "vmetwo.h"
diff --git a/sys/dev/nullcons_subr.c b/sys/dev/nullcons_subr.c
index 2b0ad903720..2a9bbf2cfa5 100644
--- a/sys/dev/nullcons_subr.c
+++ b/sys/dev/nullcons_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nullcons_subr.c,v 1.3 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: nullcons_subr.c,v 1.4 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nullcons_subr.c,v 1.3 2005/02/27 00:26:58 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nullcons_subr.c,v 1.4 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -85,20 +85,20 @@ nullcndev_read(dev, uio, flag)
}
int
-nullcndev_ioctl(dev, cmd, data, flag, p)
+nullcndev_ioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
int error;
- error = (*nulltty->t_linesw->l_ioctl)(nulltty, cmd, data, flag, p);
+ error = (*nulltty->t_linesw->l_ioctl)(nulltty, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- error = ttioctl(nulltty, cmd, data, flag, p);
+ error = ttioctl(nulltty, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
diff --git a/sys/dev/ofisa/atppc_ofisa.c b/sys/dev/ofisa/atppc_ofisa.c
index 03baff0fd1e..b901e141bad 100644
--- a/sys/dev/ofisa/atppc_ofisa.c
+++ b/sys/dev/ofisa/atppc_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_ofisa.c,v 1.2 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: atppc_ofisa.c,v 1.3 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_ofisa.c,v 1.2 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_ofisa.c,v 1.3 2005/12/11 12:22:48 christos Exp $");
#include "opt_atppc.h"
diff --git a/sys/dev/ofisa/com_ofisa.c b/sys/dev/ofisa/com_ofisa.c
index 6b48aa0b115..1d3e350daef 100644
--- a/sys/dev/ofisa/com_ofisa.c
+++ b/sys/dev/ofisa/com_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_ofisa.c,v 1.8 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: com_ofisa.c,v 1.9 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright 1997, 1998
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_ofisa.c,v 1.8 2005/02/04 02:10:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ofisa.c,v 1.9 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/ofisa/ess_ofisa.c b/sys/dev/ofisa/ess_ofisa.c
index 1d9f7b4245f..8cdbdcd85ce 100644
--- a/sys/dev/ofisa/ess_ofisa.c
+++ b/sys/dev/ofisa/ess_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ess_ofisa.c,v 1.15 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: ess_ofisa.c,v 1.16 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.15 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_ofisa.c,v 1.16 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ofisa/files.ofisa b/sys/dev/ofisa/files.ofisa
index 957db3c0d8b..287f0706c48 100644
--- a/sys/dev/ofisa/files.ofisa
+++ b/sys/dev/ofisa/files.ofisa
@@ -1,4 +1,4 @@
-# $NetBSD: files.ofisa,v 1.13 2004/01/31 13:59:20 jdolecek Exp $
+# $NetBSD: files.ofisa,v 1.14 2005/12/11 12:22:48 christos Exp $
# OFW ISA bus support
# XXX eventually we should do something with these locators
diff --git a/sys/dev/ofisa/if_cs_ofisa.c b/sys/dev/ofisa/if_cs_ofisa.c
index f21d4907b24..7eeabd3718c 100644
--- a/sys/dev/ofisa/if_cs_ofisa.c
+++ b/sys/dev/ofisa/if_cs_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_ofisa.c,v 1.13 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: if_cs_ofisa.c,v 1.14 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.13 2005/02/04 02:10:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_ofisa.c,v 1.14 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ofisa/joy_ofisa.c b/sys/dev/ofisa/joy_ofisa.c
index 962f87c510e..5481f0b6e5e 100644
--- a/sys/dev/ofisa/joy_ofisa.c
+++ b/sys/dev/ofisa/joy_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_ofisa.c,v 1.8 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: joy_ofisa.c,v 1.9 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_ofisa.c,v 1.8 2005/02/04 02:10:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_ofisa.c,v 1.9 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ofisa/lpt_ofisa.c b/sys/dev/ofisa/lpt_ofisa.c
index a96c728b027..b09f2dcf326 100644
--- a/sys/dev/ofisa/lpt_ofisa.c
+++ b/sys/dev/ofisa/lpt_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_ofisa.c,v 1.9 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: lpt_ofisa.c,v 1.10 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright 1997, 1998
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa.c,v 1.9 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa.c,v 1.10 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/ofisa/ofisa.c b/sys/dev/ofisa/ofisa.c
index 12bbaf57055..d6233466cff 100644
--- a/sys/dev/ofisa/ofisa.c
+++ b/sys/dev/ofisa/ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisa.c,v 1.15 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: ofisa.c,v 1.16 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright 1997, 1998
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.15 2005/02/04 02:10:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisa.c,v 1.16 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ofisa/ofisavar.h b/sys/dev/ofisa/ofisavar.h
index 868c703d6a3..6c0606ea44c 100644
--- a/sys/dev/ofisa/ofisavar.h
+++ b/sys/dev/ofisa/ofisavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisavar.h,v 1.5 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: ofisavar.h,v 1.6 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright 1998
diff --git a/sys/dev/ofisa/pckbc_ofisa.c b/sys/dev/ofisa/pckbc_ofisa.c
index a625ca7e0b3..69aaf89343d 100644
--- a/sys/dev/ofisa/pckbc_ofisa.c
+++ b/sys/dev/ofisa/pckbc_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_ofisa.c,v 1.9 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: pckbc_ofisa.c,v 1.10 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1998
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbc_ofisa.c,v 1.9 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_ofisa.c,v 1.10 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ofisa/sb_ofisa.c b/sys/dev/ofisa/sb_ofisa.c
index 08364cac461..e7630d83545 100644
--- a/sys/dev/ofisa/sb_ofisa.c
+++ b/sys/dev/ofisa/sb_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_ofisa.c,v 1.12 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: sb_ofisa.c,v 1.13 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.12 2005/02/04 02:10:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_ofisa.c,v 1.13 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ofisa/wdc_ofisa.c b/sys/dev/ofisa/wdc_ofisa.c
index 2e13c6d5833..d5e2b911e04 100644
--- a/sys/dev/ofisa/wdc_ofisa.c
+++ b/sys/dev/ofisa/wdc_ofisa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_ofisa.c,v 1.25 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: wdc_ofisa.c,v 1.26 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright 1997, 1998
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_ofisa.c,v 1.25 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_ofisa.c,v 1.26 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/ofw/ofbus.c b/sys/dev/ofw/ofbus.c
index 68d22dd374d..7202b4e4c11 100644
--- a/sys/dev/ofw/ofbus.c
+++ b/sys/dev/ofw/ofbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofbus.c,v 1.19 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: ofbus.c,v 1.20 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.19 2005/02/04 02:10:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofbus.c,v 1.20 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ofw/ofcons.c b/sys/dev/ofw/ofcons.c
index 2d1ccf5e02d..0fa4d129bab 100644
--- a/sys/dev/ofw/ofcons.c
+++ b/sys/dev/ofw/ofcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofcons.c,v 1.23 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: ofcons.c,v 1.24 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.23 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.24 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -117,10 +117,10 @@ static int ofcons_param(struct tty *, struct termios *);
static void ofcons_pollin(void *);
int
-ofcons_open(dev, flag, mode, p)
+ofcons_open(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
struct ofcons_softc *sc;
int unit = minor(dev);
@@ -145,7 +145,8 @@ ofcons_open(dev, flag, mode, p)
tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
ofcons_param(tp, &tp->t_termios);
ttsetwater(tp);
- } else if ((tp->t_state&TS_XCLUDE) && suser(p->p_ucred, &p->p_acflag))
+ } else if ((tp->t_state&TS_XCLUDE) &&
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag))
return EBUSY;
tp->t_state |= TS_CARR_ON;
@@ -158,10 +159,10 @@ ofcons_open(dev, flag, mode, p)
}
int
-ofcons_close(dev, flag, mode, p)
+ofcons_close(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
struct ofcons_softc *sc = ofcons_cd.cd_devs[minor(dev)];
struct tty *tp = sc->of_tty;
@@ -198,31 +199,31 @@ ofcons_write(dev, uio, flag)
}
int
-ofcons_poll(dev, events, p)
+ofcons_poll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct ofcons_softc *sc = ofcons_cd.cd_devs[minor(dev)];
struct tty *tp = sc->of_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
int
-ofcons_ioctl(dev, cmd, data, flag, p)
+ofcons_ioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct ofcons_softc *sc = ofcons_cd.cd_devs[minor(dev)];
struct tty *tp = sc->of_tty;
int error;
- if ((error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p)) != EPASSTHROUGH)
+ if ((error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l)) != EPASSTHROUGH)
return error;
- return ttioctl(tp, cmd, data, flag, p);
+ return ttioctl(tp, cmd, data, flag, l);
}
struct tty *
diff --git a/sys/dev/ofw/ofdisk.c b/sys/dev/ofw/ofdisk.c
index fa95d3df3c8..a9e1d88f1b0 100644
--- a/sys/dev/ofw/ofdisk.c
+++ b/sys/dev/ofw/ofdisk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdisk.c,v 1.31 2005/06/09 12:23:23 he Exp $ */
+/* $NetBSD: ofdisk.c,v 1.32 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.31 2005/06/09 12:23:23 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.32 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -149,7 +149,7 @@ ofdisk_attach(struct device *parent, struct device *self, void *aux)
}
int
-ofdisk_open(dev_t dev, int flags, int fmt, struct proc *p)
+ofdisk_open(dev_t dev, int flags, int fmt, struct lwp *lwp)
{
int unit = DISKUNIT(dev);
struct ofdisk_softc *of;
@@ -235,7 +235,7 @@ ofdisk_open(dev_t dev, int flags, int fmt, struct proc *p)
}
int
-ofdisk_close(dev_t dev, int flags, int fmt, struct proc *p)
+ofdisk_close(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ofdisk_softc *of = ofdisk_cd.cd_devs[DISKUNIT(dev)];
int error;
@@ -340,7 +340,7 @@ ofdisk_write(dev_t dev, struct uio *uio, int flags)
}
int
-ofdisk_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+ofdisk_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct ofdisk_softc *of = ofdisk_cd.cd_devs[DISKUNIT(dev)];
int error;
@@ -458,7 +458,7 @@ ofdisk_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
if (OFDISK_FLOPPY_P(of))
return (ENOTTY);
- return (dkwedge_list(&of->sc_dk, dkwl, p));
+ return (dkwedge_list(&of->sc_dk, dkwl, l));
}
default:
@@ -488,7 +488,7 @@ ofdisk_size(dev_t dev)
omask = of->sc_dk.dk_openmask & (1 << part);
lp = of->sc_dk.dk_label;
- if (omask == 0 && ofdisk_open(dev, 0, S_IFBLK, curproc) != 0)
+ if (omask == 0 && ofdisk_open(dev, 0, S_IFBLK, curlwp) != 0)
return -1;
if (lp->d_partitions[part].p_fstype != FS_SWAP)
@@ -497,7 +497,7 @@ ofdisk_size(dev_t dev)
size = lp->d_partitions[part].p_size *
(lp->d_secsize / DEV_BSIZE);
- if (omask == 0 && ofdisk_close(dev, 0, S_IFBLK, curproc) != 0)
+ if (omask == 0 && ofdisk_close(dev, 0, S_IFBLK, curlwp) != 0)
return -1;
return size;
diff --git a/sys/dev/ofw/ofnet.c b/sys/dev/ofw/ofnet.c
index aeb964b034a..b5c759f1c3c 100644
--- a/sys/dev/ofw/ofnet.c
+++ b/sys/dev/ofw/ofnet.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofnet.c,v 1.33 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: ofnet.c,v 1.34 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.33 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofnet.c,v 1.34 2005/12/11 12:22:48 christos Exp $");
#include "ofnet.h"
#include "opt_inet.h"
diff --git a/sys/dev/ofw/ofrtc.c b/sys/dev/ofw/ofrtc.c
index aecf5329118..b0b96201cc2 100644
--- a/sys/dev/ofw/ofrtc.c
+++ b/sys/dev/ofw/ofrtc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofrtc.c,v 1.17 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: ofrtc.c,v 1.18 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.17 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofrtc.c,v 1.18 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -102,7 +102,7 @@ ofrtc_attach(struct device *parent, struct device *self, void *aux)
}
int
-ofrtc_open(dev_t dev, int flags, int fmt, struct proc *p)
+ofrtc_open(dev_t dev, int flags, int fmt, struct lwp *lwp)
{
struct ofrtc_softc *of;
int unit = minor(dev);
diff --git a/sys/dev/ofw/ofw_network_subr.c b/sys/dev/ofw/ofw_network_subr.c
index 1fb9b3252ec..ff5d8f31b91 100644
--- a/sys/dev/ofw/ofw_network_subr.c
+++ b/sys/dev/ofw/ofw_network_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_network_subr.c,v 1.3 2005/02/04 02:10:44 perry Exp $ */
+/* $NetBSD: ofw_network_subr.c,v 1.4 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_network_subr.c,v 1.3 2005/02/04 02:10:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_network_subr.c,v 1.4 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ofw/ofw_pci.h b/sys/dev/ofw/ofw_pci.h
index 1740b0043b8..111532b4c18 100644
--- a/sys/dev/ofw/ofw_pci.h
+++ b/sys/dev/ofw/ofw_pci.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_pci.h,v 1.5 2003/10/22 09:04:39 mjl Exp $ */
+/* $NetBSD: ofw_pci.h,v 1.6 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ofw/ofw_subr.c b/sys/dev/ofw/ofw_subr.c
index 530399762ab..c4af56ce6b5 100644
--- a/sys/dev/ofw/ofw_subr.c
+++ b/sys/dev/ofw/ofw_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_subr.c,v 1.10 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: ofw_subr.c,v 1.11 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright 1998
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.10 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_subr.c,v 1.11 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index 7c2f5fbc73c..211878bd7c3 100644
--- a/sys/dev/ofw/openfirm.h
+++ b/sys/dev/ofw/openfirm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirm.h,v 1.20 2005/05/31 00:47:05 christos Exp $ */
+/* $NetBSD: openfirm.h,v 1.21 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
diff --git a/sys/dev/ofw/openfirmio.c b/sys/dev/ofw/openfirmio.c
index 6150cdc55b1..a43e9cca813 100644
--- a/sys/dev/ofw/openfirmio.c
+++ b/sys/dev/ofw/openfirmio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirmio.c,v 1.8 2003/08/07 16:31:10 agc Exp $ */
+/* $NetBSD: openfirmio.c,v 1.9 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: openfirmio.c,v 1.8 2003/08/07 16:31:10 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: openfirmio.c,v 1.9 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,7 +108,7 @@ openfirmgetstr(int len, char *user, char **cpp)
}
int
-openfirmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
+openfirmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct lwp *l)
{
struct ofiocdesc *of;
int node, len, ok, error, s;
diff --git a/sys/dev/ofw/openfirmio.h b/sys/dev/ofw/openfirmio.h
index 12784bbfd4e..d74de76d62e 100644
--- a/sys/dev/ofw/openfirmio.h
+++ b/sys/dev/ofw/openfirmio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: openfirmio.h,v 1.5 2003/08/07 16:31:10 agc Exp $ */
+/* $NetBSD: openfirmio.h,v 1.6 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/pci/Makefile.pcidevs b/sys/dev/pci/Makefile.pcidevs
index 1f6dcbab0c5..2bcb62b3514 100644
--- a/sys/dev/pci/Makefile.pcidevs
+++ b/sys/dev/pci/Makefile.pcidevs
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.pcidevs,v 1.3 2003/12/04 13:57:31 keihan Exp $
+# $NetBSD: Makefile.pcidevs,v 1.4 2005/12/11 12:22:48 christos Exp $
#
# As per tron@NetBSD.org, the proper procedure is
#
diff --git a/sys/dev/pci/aac_pci.c b/sys/dev/pci/aac_pci.c
index 6f8dca58043..5fea1188268 100644
--- a/sys/dev/pci/aac_pci.c
+++ b/sys/dev/pci/aac_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aac_pci.c,v 1.15 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: aac_pci.c,v 1.16 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.15 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.16 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/acardide.c b/sys/dev/pci/acardide.c
index 22d5f9a63f0..38abe04050b 100644
--- a/sys/dev/pci/acardide.c
+++ b/sys/dev/pci/acardide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acardide.c,v 1.17 2005/05/24 18:43:29 tsutsui Exp $ */
+/* $NetBSD: acardide.c,v 1.18 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 2001 Izumi Tsutsui.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acardide.c,v 1.17 2005/05/24 18:43:29 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acardide.c,v 1.18 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/aceride.c b/sys/dev/pci/aceride.c
index 957b43bb539..996ac280e85 100644
--- a/sys/dev/pci/aceride.c
+++ b/sys/dev/pci/aceride.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aceride.c,v 1.18 2005/08/07 10:12:39 bouyer Exp $ */
+/* $NetBSD: aceride.c,v 1.19 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.18 2005/08/07 10:12:39 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.19 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/adv_pci.c b/sys/dev/pci/adv_pci.c
index eef5e426bb3..cba44e13472 100644
--- a/sys/dev/pci/adv_pci.c
+++ b/sys/dev/pci/adv_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_pci.c,v 1.17 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: adv_pci.c,v 1.18 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.17 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.18 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/adw_pci.c b/sys/dev/pci/adw_pci.c
index 9f286e58029..0310d5ad905 100644
--- a/sys/dev/pci/adw_pci.c
+++ b/sys/dev/pci/adw_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adw_pci.c,v 1.16 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: adw_pci.c,v 1.17 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.16 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.17 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/agp.c b/sys/dev/pci/agp.c
index afd3df368d5..91613694f95 100644
--- a/sys/dev/pci/agp.c
+++ b/sys/dev/pci/agp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp.c,v 1.35 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: agp.c,v 1.36 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -65,7 +65,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.35 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp.c,v 1.36 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -781,7 +781,7 @@ agp_unbind_user(struct agp_softc *sc, agp_unbind *unbind)
}
static int
-agpopen(dev_t dev, int oflags, int devtype, struct proc *p)
+agpopen(dev_t dev, int oflags, int devtype, struct lwp *l)
{
struct agp_softc *sc = device_lookup(&agp_cd, AGPUNIT(dev));
@@ -800,7 +800,7 @@ agpopen(dev_t dev, int oflags, int devtype, struct proc *p)
}
static int
-agpclose(dev_t dev, int fflag, int devtype, struct proc *p)
+agpclose(dev_t dev, int fflag, int devtype, struct lwp *l)
{
struct agp_softc *sc = device_lookup(&agp_cd, AGPUNIT(dev));
struct agp_memory *mem;
@@ -834,7 +834,7 @@ agpclose(dev_t dev, int fflag, int devtype, struct proc *p)
}
static int
-agpioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct proc *p)
+agpioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct lwp *l)
{
struct agp_softc *sc = device_lookup(&agp_cd, AGPUNIT(dev));
diff --git a/sys/dev/pci/agp_ali.c b/sys/dev/pci/agp_ali.c
index b41e9faa7fa..69c4b4a6ae6 100644
--- a/sys/dev/pci/agp_ali.c
+++ b/sys/dev/pci/agp_ali.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_ali.c,v 1.7 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: agp_ali.c,v 1.8 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.7 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_ali.c,v 1.8 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/agp_amd.c b/sys/dev/pci/agp_amd.c
index 82be3466604..c78de5cfeab 100644
--- a/sys/dev/pci/agp_amd.c
+++ b/sys/dev/pci/agp_amd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_amd.c,v 1.12 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: agp_amd.c,v 1.13 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_amd.c,v 1.12 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_amd.c,v 1.13 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/agp_i810.c b/sys/dev/pci/agp_i810.c
index 1502f584481..8ed457f2bff 100644
--- a/sys/dev/pci/agp_i810.c
+++ b/sys/dev/pci/agp_i810.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_i810.c,v 1.26 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: agp_i810.c,v 1.27 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.26 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.27 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/agp_intel.c b/sys/dev/pci/agp_intel.c
index dce1441b639..bdf7b0c0d3b 100644
--- a/sys/dev/pci/agp_intel.c
+++ b/sys/dev/pci/agp_intel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_intel.c,v 1.15 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: agp_intel.c,v 1.16 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.15 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_intel.c,v 1.16 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/agp_sis.c b/sys/dev/pci/agp_sis.c
index b6ad69552bd..7084007caa6 100644
--- a/sys/dev/pci/agp_sis.c
+++ b/sys/dev/pci/agp_sis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_sis.c,v 1.6 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: agp_sis.c,v 1.7 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.6 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_sis.c,v 1.7 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/agp_via.c b/sys/dev/pci/agp_via.c
index 9835b9dc000..e3eb1310d1b 100644
--- a/sys/dev/pci/agp_via.c
+++ b/sys/dev/pci/agp_via.c
@@ -1,4 +1,4 @@
-/* $NetBSD: agp_via.c,v 1.7 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: agp_via.c,v 1.8 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.7 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agp_via.c,v 1.8 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/agpbusprint.c b/sys/dev/pci/agpbusprint.c
index b9775a1a0d8..03a9fd44716 100644
--- a/sys/dev/pci/agpbusprint.c
+++ b/sys/dev/pci/agpbusprint.c
@@ -1,7 +1,6 @@
-/* $NetBSD: agpbusprint.c,v 1.2 2005/05/24 05:14:37 lukem Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: agpbusprint.c,v 1.2 2005/05/24 05:14:37 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: agpbusprint.c,v 1.3 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/agpreg.h b/sys/dev/pci/agpreg.h
index caf8c2724cb..8a3a540c483 100644
--- a/sys/dev/pci/agpreg.h
+++ b/sys/dev/pci/agpreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: agpreg.h,v 1.8 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: agpreg.h,v 1.9 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
diff --git a/sys/dev/pci/agpvar.h b/sys/dev/pci/agpvar.h
index 7c42b37058c..62e50fe2e5f 100644
--- a/sys/dev/pci/agpvar.h
+++ b/sys/dev/pci/agpvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: agpvar.h,v 1.9 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: agpvar.h,v 1.10 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000 Doug Rabson
diff --git a/sys/dev/pci/ahc_pci.c b/sys/dev/pci/ahc_pci.c
index ec90835c693..531b4ee2851 100644
--- a/sys/dev/pci/ahc_pci.c
+++ b/sys/dev/pci/ahc_pci.c
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: ahc_pci.c,v 1.51 2005/06/28 00:28:41 thorpej Exp $
+ * $Id: ahc_pci.c,v 1.52 2005/12/11 12:22:48 christos Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.51 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.52 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/ahd_pci.c b/sys/dev/pci/ahd_pci.c
index 373c4a0dbee..9bae84fd34b 100644
--- a/sys/dev/pci/ahd_pci.c
+++ b/sys/dev/pci/ahd_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ahd_pci.c,v 1.19 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: ahd_pci.c,v 1.20 2005/12/11 12:22:48 christos Exp $ */
/*
* Product specific probe and attach routines for:
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.19 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.20 2005/12/11 12:22:48 christos Exp $");
#define AHD_PCI_IOADDR PCI_MAPREG_START /* I/O Address */
#define AHD_PCI_MEMADDR (PCI_MAPREG_START + 4) /* Mem I/O Address */
diff --git a/sys/dev/pci/amr.c b/sys/dev/pci/amr.c
index ccadcd0abd1..f39be3c50fc 100644
--- a/sys/dev/pci/amr.c
+++ b/sys/dev/pci/amr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: amr.c,v 1.29 2005/08/26 11:20:33 drochner Exp $ */
+/* $NetBSD: amr.c,v 1.30 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.29 2005/08/26 11:20:33 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.30 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/amrvar.h b/sys/dev/pci/amrvar.h
index aedc1bd849a..d7c80cdd2f8 100644
--- a/sys/dev/pci/amrvar.h
+++ b/sys/dev/pci/amrvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: amrvar.h,v 1.4 2004/09/13 12:55:48 drochner Exp $ */
+/* $NetBSD: amrvar.h,v 1.5 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/artsata.c b/sys/dev/pci/artsata.c
index 83cf5ecb688..8fd6ed2d949 100644
--- a/sys/dev/pci/artsata.c
+++ b/sys/dev/pci/artsata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: artsata.c,v 1.7 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: artsata.c,v 1.8 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/atppc_puc.c b/sys/dev/pci/atppc_puc.c
index 1d7659c1f2d..e668523de56 100644
--- a/sys/dev/pci/atppc_puc.c
+++ b/sys/dev/pci/atppc_puc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_puc.c,v 1.3 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: atppc_puc.c,v 1.4 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include "opt_atppc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.3 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.4 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/auacer.c b/sys/dev/pci/auacer.c
index f18c71f7867..bc68a4146be 100644
--- a/sys/dev/pci/auacer.c
+++ b/sys/dev/pci/auacer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auacer.c,v 1.10 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: auacer.c,v 1.11 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.10 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.11 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/auacerreg.h b/sys/dev/pci/auacerreg.h
index 6af698cb23f..a37993a0cb2 100644
--- a/sys/dev/pci/auacerreg.h
+++ b/sys/dev/pci/auacerreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: auacerreg.h,v 1.2 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: auacerreg.h,v 1.3 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index 1cd768aca5c..d95f6f799ad 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
+/* $NetBSD: auixp.c,v 1.10 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud@netbsd.org>
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.10 2005/12/11 12:22:48 christos Exp $");
#include <sys/types.h>
#include <sys/errno.h>
diff --git a/sys/dev/pci/auixpreg.h b/sys/dev/pci/auixpreg.h
index 21bf6f01f44..a7a0fd44afd 100644
--- a/sys/dev/pci/auixpreg.h
+++ b/sys/dev/pci/auixpreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: auixpreg.h,v 1.2 2005/01/12 00:28:03 reinoud Exp $ */
+/* $NetBSD: auixpreg.h,v 1.3 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud@netbsd.org>
diff --git a/sys/dev/pci/auixpvar.h b/sys/dev/pci/auixpvar.h
index 7c7ec9a1705..3b23fd92838 100644
--- a/sys/dev/pci/auixpvar.h
+++ b/sys/dev/pci/auixpvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: auixpvar.h,v 1.3 2005/01/12 15:54:34 kent Exp $*/
+/* $NetBSD: auixpvar.h,v 1.4 2005/12/11 12:22:48 christos Exp $*/
/*
* Copyright (c) 2004, 2005 Reinoud Zandijk <reinoud@netbsd.org>
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
index 7d7054ee520..a26589c194b 100644
--- a/sys/dev/pci/autri.c
+++ b/sys/dev/pci/autri.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autri.c,v 1.26 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: autri.c,v 1.27 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.26 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autri.c,v 1.27 2005/12/11 12:22:48 christos Exp $");
#include "midi.h"
diff --git a/sys/dev/pci/auviavar.h b/sys/dev/pci/auviavar.h
index 536bb21c1b8..8e79b8553f6 100644
--- a/sys/dev/pci/auviavar.h
+++ b/sys/dev/pci/auviavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: auviavar.h,v 1.8 2004/11/13 15:00:48 kent Exp $ */
+/* $NetBSD: auviavar.h,v 1.9 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index 9677a456da1..c011a4d3c45 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia.c,v 1.15 2005/09/29 04:14:03 kent Exp $ */
+/* $NetBSD: azalia.c,v 1.16 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.15 2005/09/29 04:14:03 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.16 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/pci/azalia.h b/sys/dev/pci/azalia.h
index 27ef0877b98..a53cef43087 100644
--- a/sys/dev/pci/azalia.h
+++ b/sys/dev/pci/azalia.h
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia.h,v 1.3 2005/09/29 04:14:03 kent Exp $ */
+/* $NetBSD: azalia.h,v 1.4 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/azalia_codec.c b/sys/dev/pci/azalia_codec.c
index f858e8546bf..edf9ce4dca9 100644
--- a/sys/dev/pci/azalia_codec.c
+++ b/sys/dev/pci/azalia_codec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia_codec.c,v 1.3 2005/09/29 04:14:03 kent Exp $ */
+/* $NetBSD: azalia_codec.c,v 1.4 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia_codec.c,v 1.3 2005/09/29 04:14:03 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia_codec.c,v 1.4 2005/12/11 12:22:48 christos Exp $");
#include <sys/null.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/bha_pci.c b/sys/dev/pci/bha_pci.c
index 31072e1339c..082582b1137 100644
--- a/sys/dev/pci/bha_pci.c
+++ b/sys/dev/pci/bha_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_pci.c,v 1.27 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: bha_pci.c,v 1.28 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.27 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.28 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/bktr/bktr_audio.h b/sys/dev/pci/bktr/bktr_audio.h
index 6c576595d40..e1935e8993f 100644
--- a/sys/dev/pci/bktr/bktr_audio.h
+++ b/sys/dev/pci/bktr/bktr_audio.h
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_audio.h,v 1.4 2003/03/11 23:11:21 thomasklausner Exp $ */
-/* $NetBSD: bktr_audio.h,v 1.3 2004/05/12 20:43:17 wiz Exp $ */
+/* $NetBSD: bktr_audio.h,v 1.4 2005/12/11 12:23:22 christos Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_audio.h,v 1.2 1999/10/28 13:58:14 roger Exp$ */
/*
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index 6074b4bc8d1..c41c75b6a0e 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_core.c,v 1.6 2003/03/11 23:11:22 thomasklausner Exp $ */
-/* $NetBSD: bktr_core.c,v 1.35 2005/05/30 06:41:55 wiz Exp $ */
+/* $NetBSD: bktr_core.c,v 1.36 2005/12/11 12:23:22 christos Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp$ */
/*
@@ -98,7 +98,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.35 2005/05/30 06:41:55 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_core.c,v 1.36 2005/12/11 12:23:22 christos Exp $");
#include "opt_bktr.h" /* Include any kernel config options */
@@ -1281,7 +1281,7 @@ int
video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct thread* td)
#else
int
-video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct proc* pr)
+video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct lwp* l)
#endif
{
volatile u_char c_temp;
@@ -1577,7 +1577,7 @@ video_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct proc
#ifdef __FreeBSD__
bktr->proc = td->td_proc;
#else
- bktr->proc = pr;
+ bktr->proc = l->l_proc;
#endif
break;
@@ -1903,7 +1903,7 @@ int
tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct thread* td)
#else
int
-tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct proc* pr)
+tuner_ioctl(bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct lwp* l)
#endif
{
int tmp_int;
diff --git a/sys/dev/pci/bktr/bktr_core.h b/sys/dev/pci/bktr/bktr_core.h
index 6b796f5704f..541542b0192 100644
--- a/sys/dev/pci/bktr/bktr_core.h
+++ b/sys/dev/pci/bktr/bktr_core.h
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_core.h,v 1.3 2003/03/11 23:11:23 thomasklausner Exp $ */
-/* $NetBSD: bktr_core.h,v 1.6 2003/06/29 22:30:30 fvdl Exp $ */
+/* $NetBSD: bktr_core.h,v 1.7 2005/12/11 12:23:22 christos Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_core.h,v 1.4 2000/06/26 09:41:32 roger Exp$ */
/*
@@ -85,13 +85,13 @@ int video_open(bktr_ptr_t bktr);
int video_close(bktr_ptr_t bktr);
int video_read(bktr_ptr_t bktr, int unit, dev_t dev, struct uio *uio);
int video_ioctl(bktr_ptr_t bktr, int unit,
- ioctl_cmd_t cmd, caddr_t arg, struct proc* pr);
+ ioctl_cmd_t cmd, caddr_t arg, struct lwp* pr);
int tuner_open(bktr_ptr_t bktr);
int tuner_close(bktr_ptr_t bktr);
int tuner_ioctl(bktr_ptr_t bktr, int unit,
- ioctl_cmd_t cmd, caddr_t arg, struct proc* pr);
+ ioctl_cmd_t cmd, caddr_t arg, struct lwp* pr);
int vbi_open(bktr_ptr_t bktr);
int vbi_close(bktr_ptr_t bktr);
diff --git a/sys/dev/pci/bktr/bktr_os.c b/sys/dev/pci/bktr/bktr_os.c
index 8dfa4b16065..ffd80d8cdd8 100644
--- a/sys/dev/pci/bktr/bktr_os.c
+++ b/sys/dev/pci/bktr/bktr_os.c
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_os.c,v 1.5 2003/03/11 23:11:25 thomasklausner Exp $ */
-/* $NetBSD: bktr_os.c,v 1.38 2004/10/29 12:57:26 yamt Exp $ */
+/* $NetBSD: bktr_os.c,v 1.39 2005/12/11 12:23:22 christos Exp $ */
/* $FreeBSD: src/sys/dev/bktr/bktr_os.c,v 1.20 2000/10/20 08:16:53 roger Exp$ */
/*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.38 2004/10/29 12:57:26 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bktr_os.c,v 1.39 2005/12/11 12:23:22 christos Exp $");
#ifdef __FreeBSD__
#include "bktr.h"
@@ -581,7 +581,7 @@ get_bktr_mem(int unit, unsigned size)
*
*/
int
-bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_open(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -661,7 +661,7 @@ bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
*
*/
int
-bktr_close(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_close(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -799,7 +799,7 @@ bktr_mmap(dev_t dev, vm_offset_t offset, int nprot)
return(atop(vtophys(bktr->bigbuf) + offset));
}
-int bktr_poll(dev_t dev, int events, struct proc *p)
+int bktr_poll(dev_t dev, int events, struct lwp *l)
{
int unit;
bktr_ptr_t bktr;
@@ -1086,7 +1086,7 @@ get_bktr_mem(int unit, unsigned size)
*
*/
int
-bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_open(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1149,7 +1149,7 @@ bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
*
*/
int
-bktr_close(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_close(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1264,7 +1264,7 @@ int bktr_mmap(dev_t dev, vm_offset_t offset, int nprot)
return(i386_btop(vtophys(bktr->bigbuf) + offset));
}
-int bktr_poll(dev_t dev, int events, struct proc *p)
+int bktr_poll(dev_t dev, int events, struct lwp *l)
{
int unit;
bktr_ptr_t bktr;
@@ -1652,7 +1652,7 @@ free_bktr_mem(bktr, dmap, kva)
*
*/
int
-bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_open(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1685,7 +1685,7 @@ bktr_open(dev_t dev, int flags, int fmt, struct proc *p)
*
*/
int
-bktr_close(dev_t dev, int flags, int fmt, struct proc *p)
+bktr_close(dev_t dev, int flags, int fmt, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1744,7 +1744,7 @@ bktr_write(dev_t dev, struct uio *uio, int ioflag)
*
*/
int
-bktr_ioctl(dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr)
+bktr_ioctl(dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct lwp *l)
{
bktr_ptr_t bktr;
int unit;
@@ -1758,9 +1758,9 @@ bktr_ioctl(dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct proc* pr)
switch (FUNCTION(dev)) {
case VIDEO_DEV:
- return(video_ioctl(bktr, unit, cmd, arg, pr));
+ return(video_ioctl(bktr, unit, cmd, arg, l));
case TUNER_DEV:
- return(tuner_ioctl(bktr, unit, cmd, arg, pr));
+ return(tuner_ioctl(bktr, unit, cmd, arg, l));
}
return(ENXIO);
diff --git a/sys/dev/pci/bktr/bktr_reg.h b/sys/dev/pci/bktr/bktr_reg.h
index 0a8f42450a4..2cd252a0e97 100644
--- a/sys/dev/pci/bktr/bktr_reg.h
+++ b/sys/dev/pci/bktr/bktr_reg.h
@@ -1,6 +1,6 @@
/* $SourceForge: bktr_reg.h,v 1.3 2003/03/11 23:11:27 thomasklausner Exp $ */
-/* $NetBSD: bktr_reg.h,v 1.14 2005/05/30 04:30:18 christos Exp $ */
+/* $NetBSD: bktr_reg.h,v 1.15 2005/12/11 12:23:22 christos Exp $ */
/*
* $FreeBSD: src/sys/dev/bktr/bktr_reg.h,v 1.42 2000/10/31 13:09:56 roger Exp$
*
diff --git a/sys/dev/pci/btvmei.c b/sys/dev/pci/btvmei.c
index 18dfc93b35c..b69827f2d53 100644
--- a/sys/dev/pci/btvmei.c
+++ b/sys/dev/pci/btvmei.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmei.c,v 1.13 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: btvmei.c,v 1.14 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1999
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.13 2005/02/04 02:10:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.14 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/btvmeii.c b/sys/dev/pci/btvmeii.c
index c2e762e7a67..b40c1835727 100644
--- a/sys/dev/pci/btvmeii.c
+++ b/sys/dev/pci/btvmeii.c
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmeii.c,v 1.10 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: btvmeii.c,v 1.11 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1999
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.10 2005/02/04 02:10:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmeii.c,v 1.11 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/btvmeireg.h b/sys/dev/pci/btvmeireg.h
index 27e555293ab..067442f406f 100644
--- a/sys/dev/pci/btvmeireg.h
+++ b/sys/dev/pci/btvmeireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmeireg.h,v 1.4 2004/02/24 15:16:05 wiz Exp $ */
+/* $NetBSD: btvmeireg.h,v 1.5 2005/12/11 12:22:48 christos Exp $ */
#ifndef _bit3reg_h_
#define _bit3reg_h_
diff --git a/sys/dev/pci/btvmeivar.h b/sys/dev/pci/btvmeivar.h
index 10fe96ed646..78560edc366 100644
--- a/sys/dev/pci/btvmeivar.h
+++ b/sys/dev/pci/btvmeivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmeivar.h,v 1.3 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: btvmeivar.h,v 1.4 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1999
diff --git a/sys/dev/pci/cac_pci.c b/sys/dev/pci/cac_pci.c
index f56ddc9aca2..ac43d9674ef 100644
--- a/sys/dev/pci/cac_pci.c
+++ b/sys/dev/pci/cac_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cac_pci.c,v 1.19 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: cac_pci.c,v 1.20 2005/12/11 12:22:48 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.19 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.20 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/cmdide.c b/sys/dev/pci/cmdide.c
index d4200085d4d..362b6232a93 100644
--- a/sys/dev/pci/cmdide.c
+++ b/sys/dev/pci/cmdide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmdide.c,v 1.20 2005/09/21 14:32:46 christos Exp $ */
+/* $NetBSD: cmdide.c,v 1.21 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmdide.c,v 1.20 2005/09/21 14:32:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmdide.c,v 1.21 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c
index a83bd107933..068e6b79371 100644
--- a/sys/dev/pci/cmpci.c
+++ b/sys/dev/pci/cmpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cmpci.c,v 1.28 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: cmpci.c,v 1.29 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.28 2005/01/15 15:19:52 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.29 2005/12/11 12:22:48 christos Exp $");
#if defined(AUDIO_DEBUG) || defined(DEBUG)
#define DPRINTF(x) if (cmpcidebug) printf x
diff --git a/sys/dev/pci/cmpcireg.h b/sys/dev/pci/cmpcireg.h
index 61c56ae7eb0..0742a1ddaeb 100644
--- a/sys/dev/pci/cmpcireg.h
+++ b/sys/dev/pci/cmpcireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cmpcireg.h,v 1.6 2003/12/04 13:57:31 keihan Exp $ */
+/* $NetBSD: cmpcireg.h,v 1.7 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/cmpcivar.h b/sys/dev/pci/cmpcivar.h
index 3ad0171b3ca..5fcedab7184 100644
--- a/sys/dev/pci/cmpcivar.h
+++ b/sys/dev/pci/cmpcivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cmpcivar.h,v 1.8 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: cmpcivar.h,v 1.9 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/com_puc.c b/sys/dev/pci/com_puc.c
index a291333892c..2539822e8d0 100644
--- a/sys/dev/pci/com_puc.c
+++ b/sys/dev/pci/com_puc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_puc.c,v 1.12 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: com_puc.c,v 1.13 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.12 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_puc.c,v 1.13 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/cs4280.c b/sys/dev/pci/cs4280.c
index c37e25a5450..50a453e9d4c 100644
--- a/sys/dev/pci/cs4280.c
+++ b/sys/dev/pci/cs4280.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280.c,v 1.35 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: cs4280.c,v 1.36 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.35 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.36 2005/12/11 12:22:48 christos Exp $");
#include "midi.h"
diff --git a/sys/dev/pci/cs4280_image.h b/sys/dev/pci/cs4280_image.h
index cd889e5dcb2..b4b8d9abd1d 100644
--- a/sys/dev/pci/cs4280_image.h
+++ b/sys/dev/pci/cs4280_image.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280_image.h,v 1.3 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: cs4280_image.h,v 1.4 2005/12/11 12:22:48 christos Exp $ */
/* This source is based on cwcimage.h in cwcealdr1.zip, the
* sample source by Crystal Semiconductor.
diff --git a/sys/dev/pci/cs4280reg.h b/sys/dev/pci/cs4280reg.h
index fc07e4c8ede..f37914fb771 100644
--- a/sys/dev/pci/cs4280reg.h
+++ b/sys/dev/pci/cs4280reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280reg.h,v 1.5 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: cs4280reg.h,v 1.6 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c
index 28ddc89996b..ecef3024472 100644
--- a/sys/dev/pci/cs4281.c
+++ b/sys/dev/pci/cs4281.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4281.c,v 1.26 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: cs4281.c,v 1.27 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.26 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.27 2005/12/11 12:22:48 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/cs4281reg.h b/sys/dev/pci/cs4281reg.h
index 9857f7a2cfc..c0be28183ab 100644
--- a/sys/dev/pci/cs4281reg.h
+++ b/sys/dev/pci/cs4281reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4281reg.h,v 1.5 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: cs4281reg.h,v 1.6 2005/12/11 12:22:48 christos Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
diff --git a/sys/dev/pci/cs428x.c b/sys/dev/pci/cs428x.c
index 7bd8348d98f..4c97133999a 100644
--- a/sys/dev/pci/cs428x.c
+++ b/sys/dev/pci/cs428x.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs428x.c,v 1.9 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: cs428x.c,v 1.10 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -33,7 +33,7 @@
/* Common functions for CS4280 and CS4281 */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.9 2005/01/15 15:19:52 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs428x.c,v 1.10 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/cs428x.h b/sys/dev/pci/cs428x.h
index f4ef513086b..4f8f611869d 100644
--- a/sys/dev/pci/cs428x.h
+++ b/sys/dev/pci/cs428x.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs428x.h,v 1.8 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: cs428x.h,v 1.9 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
diff --git a/sys/dev/pci/cs428xreg.h b/sys/dev/pci/cs428xreg.h
index 0ba604dddc3..1a4ee7a781f 100644
--- a/sys/dev/pci/cs428xreg.h
+++ b/sys/dev/pci/cs428xreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cs428xreg.h,v 1.3 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: cs428xreg.h,v 1.4 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
diff --git a/sys/dev/pci/cy_pci.c b/sys/dev/pci/cy_pci.c
index 901b219933a..eb0553569c8 100644
--- a/sys/dev/pci/cy_pci.c
+++ b/sys/dev/pci/cy_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cy_pci.c,v 1.18 2005/06/28 00:28:41 thorpej Exp $ */
+/* $NetBSD: cy_pci.c,v 1.19 2005/12/11 12:22:49 christos Exp $ */
/*
* cy_pci.c
@@ -10,7 +10,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.18 2005/06/28 00:28:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.19 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/cyber.c b/sys/dev/pci/cyber.c
index 715835e8434..c89715a8c64 100644
--- a/sys/dev/pci/cyber.c
+++ b/sys/dev/pci/cyber.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cyber.c,v 1.2 2004/02/04 01:58:44 fredb Exp $ */
+/* $NetBSD: cyber.c,v 1.3 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
/* Store one "Usr" register on an SIIG Cyberserial multiport PCI card. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cyber.c,v 1.2 2004/02/04 01:58:44 fredb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cyber.c,v 1.3 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/pci/cyberreg.h b/sys/dev/pci/cyberreg.h
index 4016268c38d..60ebfe53ea4 100644
--- a/sys/dev/pci/cyberreg.h
+++ b/sys/dev/pci/cyberreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cyberreg.h,v 1.1 2004/02/03 19:51:39 fredb Exp $ */
+/* $NetBSD: cyberreg.h,v 1.2 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/cybervar.h b/sys/dev/pci/cybervar.h
index 3a3907e224a..e484c74e16f 100644
--- a/sys/dev/pci/cybervar.h
+++ b/sys/dev/pci/cybervar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cybervar.h,v 1.1 2004/02/03 19:51:39 fredb Exp $ */
+/* $NetBSD: cybervar.h,v 1.2 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/cypide.c b/sys/dev/pci/cypide.c
index c183273432b..804d8997b17 100644
--- a/sys/dev/pci/cypide.c
+++ b/sys/dev/pci/cypide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cypide.c,v 1.15 2005/05/24 05:25:15 lukem Exp $ */
+/* $NetBSD: cypide.c,v 1.16 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cypide.c,v 1.15 2005/05/24 05:25:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cypide.c,v 1.16 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c
index 93a380996f6..2c43bc3f49e 100644
--- a/sys/dev/pci/cz.c
+++ b/sys/dev/pci/cz.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cz.c,v 1.33 2005/09/06 21:40:39 kleink Exp $ */
+/* $NetBSD: cz.c,v 1.34 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.33 2005/09/06 21:40:39 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.34 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -948,7 +948,7 @@ cztty_shutdown(struct cztty_softc *sc)
* Open a Cyclades-Z serial port.
*/
static int
-czttyopen(dev_t dev, int flags, int mode, struct proc *p)
+czttyopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct cztty_softc *sc = CZTTY_SOFTC(dev);
struct cz_softc *cz;
@@ -966,7 +966,7 @@ czttyopen(dev_t dev, int flags, int mode, struct proc *p)
if (ISSET(tp->t_state, TS_ISOPEN) &&
ISSET(tp->t_state, TS_XCLUDE) &&
- suser(p->p_ucred, &p->p_acflag) != 0)
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0)
return (EBUSY);
s = spltty();
@@ -1068,7 +1068,7 @@ czttyopen(dev_t dev, int flags, int mode, struct proc *p)
* Close a Cyclades-Z serial port.
*/
static int
-czttyclose(dev_t dev, int flags, int mode, struct proc *p)
+czttyclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct cztty_softc *sc = CZTTY_SOFTC(dev);
struct tty *tp = sc->sc_tty;
@@ -1126,12 +1126,12 @@ czttywrite(dev_t dev, struct uio *uio, int flags)
* Poll a Cyclades-Z serial port.
*/
static int
-czttypoll(dev_t dev, int events, struct proc *p)
+czttypoll(dev_t dev, int events, struct lwp *l)
{
struct cztty_softc *sc = CZTTY_SOFTC(dev);
struct tty *tp = sc->sc_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
/*
@@ -1140,17 +1140,18 @@ czttypoll(dev_t dev, int events, struct proc *p)
* Perform a control operation on a Cyclades-Z serial port.
*/
static int
-czttyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+czttyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct cztty_softc *sc = CZTTY_SOFTC(dev);
struct tty *tp = sc->sc_tty;
+ struct proc *p = l->l_proc;
int s, error;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
diff --git a/sys/dev/pci/devlist2h.awk b/sys/dev/pci/devlist2h.awk
index d0e76565ad5..e549eb8fb21 100644
--- a/sys/dev/pci/devlist2h.awk
+++ b/sys/dev/pci/devlist2h.awk
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: devlist2h.awk,v 1.11 2005/06/28 00:29:48 thorpej Exp $
+# $NetBSD: devlist2h.awk,v 1.12 2005/12/11 12:22:49 christos Exp $
#
# Copyright (c) 1995, 1996 Christopher G. Demetriou
# All rights reserved.
diff --git a/sys/dev/pci/dpt_pci.c b/sys/dev/pci/dpt_pci.c
index ac23a44d234..0a4d4a62f37 100644
--- a/sys/dev/pci/dpt_pci.c
+++ b/sys/dev/pci/dpt_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_pci.c,v 1.16 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: dpt_pci.c,v 1.17 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <ad@NetBSD.org>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.16 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.17 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index 1a1ebc6202e..9ae12167f33 100644
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eap.c,v 1.79 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: eap.c,v 1.80 2005/12/11 12:22:49 christos Exp $ */
/* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */
/*
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.79 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.80 2005/12/11 12:22:49 christos Exp $");
#include "midi.h"
#include "joy_eap.h"
diff --git a/sys/dev/pci/eapreg.h b/sys/dev/pci/eapreg.h
index 9067c47b30a..78e041148bb 100644
--- a/sys/dev/pci/eapreg.h
+++ b/sys/dev/pci/eapreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: eapreg.h,v 1.10 2005/02/13 23:58:38 fredb Exp $ */
+/* $NetBSD: eapreg.h,v 1.11 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/eapvar.h b/sys/dev/pci/eapvar.h
index d3ff0672e9a..98d2081167b 100644
--- a/sys/dev/pci/eapvar.h
+++ b/sys/dev/pci/eapvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: eapvar.h,v 1.1 2004/07/08 19:39:00 drochner Exp $ */
+/* $NetBSD: eapvar.h,v 1.2 2005/12/11 12:22:49 christos Exp $ */
struct eap_gameport_args {
bus_space_tag_t gpa_iot;
diff --git a/sys/dev/pci/emuxki.c b/sys/dev/pci/emuxki.c
index df51c2e823b..516fb96346f 100644
--- a/sys/dev/pci/emuxki.c
+++ b/sys/dev/pci/emuxki.c
@@ -1,4 +1,4 @@
-/* $NetBSD: emuxki.c,v 1.42 2005/10/11 19:36:48 jdolecek Exp $ */
+/* $NetBSD: emuxki.c,v 1.43 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.42 2005/10/11 19:36:48 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.43 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/pci/emuxkireg.h b/sys/dev/pci/emuxkireg.h
index ea97bf1a3d7..45cc1d2f13e 100644
--- a/sys/dev/pci/emuxkireg.h
+++ b/sys/dev/pci/emuxkireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: emuxkireg.h,v 1.6 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: emuxkireg.h,v 1.7 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/emuxkivar.h b/sys/dev/pci/emuxkivar.h
index f5bb6e78e5c..f2249dc11a5 100644
--- a/sys/dev/pci/emuxkivar.h
+++ b/sys/dev/pci/emuxkivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: emuxkivar.h,v 1.8 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: emuxkivar.h,v 1.9 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c
index 2897cdb511e..92732539f3f 100644
--- a/sys/dev/pci/esa.c
+++ b/sys/dev/pci/esa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esa.c,v 1.30 2005/10/29 17:44:34 jmcneill Exp $ */
+/* $NetBSD: esa.c,v 1.31 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2001, 2002 Jared D. McNeill <jmcneill@invisible.ca>
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.30 2005/10/29 17:44:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.31 2005/12/11 12:22:49 christos Exp $");
#include <sys/types.h>
#include <sys/errno.h>
diff --git a/sys/dev/pci/esadsp.h b/sys/dev/pci/esadsp.h
index 37669c0824e..49c057c6843 100644
--- a/sys/dev/pci/esadsp.h
+++ b/sys/dev/pci/esadsp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esadsp.h,v 1.5 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: esadsp.h,v 1.6 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2002 Lennart Augustsson
diff --git a/sys/dev/pci/esareg.h b/sys/dev/pci/esareg.h
index 11f819f6431..cf1cafdc487 100644
--- a/sys/dev/pci/esareg.h
+++ b/sys/dev/pci/esareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esareg.h,v 1.9 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: esareg.h,v 1.10 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2002 Lennart Augustsson
diff --git a/sys/dev/pci/esavar.h b/sys/dev/pci/esavar.h
index 340854eadfe..3be838a04b4 100644
--- a/sys/dev/pci/esavar.h
+++ b/sys/dev/pci/esavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esavar.h,v 1.6 2005/03/24 22:35:12 jmcneill Exp $ */
+/* $NetBSD: esavar.h,v 1.7 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2001, 2002 Jared D. McNeill <jmcneill@invisible.ca>
diff --git a/sys/dev/pci/esiop_pci.c b/sys/dev/pci/esiop_pci.c
index 0a994efa17a..5c006cb6f7b 100644
--- a/sys/dev/pci/esiop_pci.c
+++ b/sys/dev/pci/esiop_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esiop_pci.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: esiop_pci.c,v 1.10 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2002 Manuel Bouyer.
@@ -32,7 +32,7 @@
/* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop_pci.c,v 1.10 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/esm.c b/sys/dev/pci/esm.c
index 6e9c93a11f8..e5e052012cd 100644
--- a/sys/dev/pci/esm.c
+++ b/sys/dev/pci/esm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esm.c,v 1.30 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: esm.c,v 1.31 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.30 2005/01/15 15:19:52 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.31 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/esmreg.h b/sys/dev/pci/esmreg.h
index 9618ac10fa1..8ad44be2c43 100644
--- a/sys/dev/pci/esmreg.h
+++ b/sys/dev/pci/esmreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esmreg.h,v 1.5 2003/12/04 13:57:31 keihan Exp $ */
+/* $NetBSD: esmreg.h,v 1.6 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 Rene Hexel <rh@NetBSD.org>
diff --git a/sys/dev/pci/esmvar.h b/sys/dev/pci/esmvar.h
index 8ae6a0ce02c..79a4401cee2 100644
--- a/sys/dev/pci/esmvar.h
+++ b/sys/dev/pci/esmvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esmvar.h,v 1.12 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: esmvar.h,v 1.13 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 Matt Fredette
diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c
index 621f7d7763a..5f428f4810f 100644
--- a/sys/dev/pci/eso.c
+++ b/sys/dev/pci/eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.40 2005/01/26 21:28:55 kleink Exp $ */
+/* $NetBSD: eso.c,v 1.41 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2004 Klaus J. Klein
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.40 2005/01/26 21:28:55 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.41 2005/12/11 12:22:49 christos Exp $");
#include "mpu.h"
diff --git a/sys/dev/pci/esoreg.h b/sys/dev/pci/esoreg.h
index 76f8ad1d5b4..67c41fc7d94 100644
--- a/sys/dev/pci/esoreg.h
+++ b/sys/dev/pci/esoreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esoreg.h,v 1.7 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: esoreg.h,v 1.8 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1999 Klaus J. Klein
diff --git a/sys/dev/pci/esovar.h b/sys/dev/pci/esovar.h
index e1c223844f9..f3e5d0f2d4c 100644
--- a/sys/dev/pci/esovar.h
+++ b/sys/dev/pci/esovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esovar.h,v 1.6 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: esovar.h,v 1.7 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2004 Klaus J. Klein
diff --git a/sys/dev/pci/files.agp b/sys/dev/pci/files.agp
index 5737b103e3a..af490a874f1 100644
--- a/sys/dev/pci/files.agp
+++ b/sys/dev/pci/files.agp
@@ -1,4 +1,4 @@
-# $NetBSD: files.agp,v 1.3 2004/08/30 10:30:38 drochner Exp $
+# $NetBSD: files.agp,v 1.4 2005/12/11 12:22:49 christos Exp $
define agpbus { }
diff --git a/sys/dev/pci/fms.c b/sys/dev/pci/fms.c
index a008a38a995..f79ba0ac2d3 100644
--- a/sys/dev/pci/fms.c
+++ b/sys/dev/pci/fms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fms.c,v 1.24 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: fms.c,v 1.25 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.24 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.25 2005/12/11 12:22:49 christos Exp $");
#include "mpu.h"
diff --git a/sys/dev/pci/fmsvar.h b/sys/dev/pci/fmsvar.h
index f0bf9f6ff7d..6cd49067f49 100644
--- a/sys/dev/pci/fmsvar.h
+++ b/sys/dev/pci/fmsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fmsvar.h,v 1.2 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: fmsvar.h,v 1.3 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/fwlynx_pci.c b/sys/dev/pci/fwlynx_pci.c
index 27d9d70ea44..3b89a00104c 100644
--- a/sys/dev/pci/fwlynx_pci.c
+++ b/sys/dev/pci/fwlynx_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwlynx_pci.c,v 1.10 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: fwlynx_pci.c,v 1.11 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwlynx_pci.c,v 1.10 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwlynx_pci.c,v 1.11 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/fwohci_pci.c b/sys/dev/pci/fwohci_pci.c
index 5b7ac00ddfe..7dd28b2104d 100644
--- a/sys/dev/pci/fwohci_pci.c
+++ b/sys/dev/pci/fwohci_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci_pci.c,v 1.22 2005/07/11 15:37:04 kiyohara Exp $ */
+/* $NetBSD: fwohci_pci.c,v 1.23 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.22 2005/07/11 15:37:04 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.23 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/geodeide.c b/sys/dev/pci/geodeide.c
index 66e78e6b235..0acfa150ca8 100644
--- a/sys/dev/pci/geodeide.c
+++ b/sys/dev/pci/geodeide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: geodeide.c,v 1.10 2005/07/06 01:46:52 thorpej Exp $ */
+/* $NetBSD: geodeide.c,v 1.11 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2004 Manuel Bouyer.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: geodeide.c,v 1.10 2005/07/06 01:46:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geodeide.c,v 1.11 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/gtp.c b/sys/dev/pci/gtp.c
index 46c1a58655a..e46fd2da397 100644
--- a/sys/dev/pci/gtp.c
+++ b/sys/dev/pci/gtp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gtp.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: gtp.c,v 1.10 2005/12/11 12:22:49 christos Exp $ */
/* $OpenBSD: gtp.c,v 1.1 2002/06/03 16:13:21 mickey Exp $ */
/*
@@ -29,7 +29,7 @@
/* Gemtek PCI Radio Card Device Driver */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtp.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtp.c,v 1.10 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/hifn7751reg.h b/sys/dev/pci/hifn7751reg.h
index 55d9101851a..2bca6ace892 100644
--- a/sys/dev/pci/hifn7751reg.h
+++ b/sys/dev/pci/hifn7751reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hifn7751reg.h,v 1.7 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: hifn7751reg.h,v 1.8 2005/12/11 12:22:49 christos Exp $ */
/* $OpenBSD: hifn7751reg.h,v 1.43 2003/06/02 15:58:41 deraadt Exp $ */
/*
diff --git a/sys/dev/pci/hifn7751var.h b/sys/dev/pci/hifn7751var.h
index 6979aa77319..d3ed8ede489 100644
--- a/sys/dev/pci/hifn7751var.h
+++ b/sys/dev/pci/hifn7751var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hifn7751var.h,v 1.6 2005/10/15 08:58:15 tls Exp $ */
+/* $NetBSD: hifn7751var.h,v 1.7 2005/12/11 12:22:49 christos Exp $ */
/* $OpenBSD: hifn7751var.h,v 1.18 2000/06/02 22:36:45 deraadt Exp $ */
/*
diff --git a/sys/dev/pci/hptide.c b/sys/dev/pci/hptide.c
index 9456e1cb3b0..2bf32db37ea 100644
--- a/sys/dev/pci/hptide.c
+++ b/sys/dev/pci/hptide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hptide.c,v 1.18 2005/05/24 05:25:15 lukem Exp $ */
+/* $NetBSD: hptide.c,v 1.19 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hptide.c,v 1.18 2005/05/24 05:25:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hptide.c,v 1.19 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/i82365_pci.c b/sys/dev/pci/i82365_pci.c
index fbf319b3e37..51697b0c20e 100644
--- a/sys/dev/pci/i82365_pci.c
+++ b/sys/dev/pci/i82365_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_pci.c,v 1.20 2005/05/30 04:35:22 christos Exp $ */
+/* $NetBSD: i82365_pci.c,v 1.21 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365_pci.c,v 1.20 2005/05/30 04:35:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365_pci.c,v 1.21 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/i82365_pcivar.h b/sys/dev/pci/i82365_pcivar.h
index c87a893fe2a..81623ec6528 100644
--- a/sys/dev/pci/i82365_pcivar.h
+++ b/sys/dev/pci/i82365_pcivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i82365_pcivar.h,v 1.4 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: i82365_pcivar.h,v 1.5 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/iavc_pci.c b/sys/dev/pci/iavc_pci.c
index fb115c30920..336848d1aca 100644
--- a/sys/dev/pci/iavc_pci.c
+++ b/sys/dev/pci/iavc_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iavc_pci.c,v 1.3 2005/05/11 12:47:47 martin Exp $ */
+/* $NetBSD: iavc_pci.c,v 1.4 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2001-2003 Cubical Solutions Ltd.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.3 2005/05/11 12:47:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iavc_pci.c,v 1.4 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/icp_pci.c b/sys/dev/pci/icp_pci.c
index 288f2f932d9..fb831dce4a4 100644
--- a/sys/dev/pci/icp_pci.c
+++ b/sys/dev/pci/icp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: icp_pci.c,v 1.10 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: icp_pci.c,v 1.11 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.10 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.11 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_an_pci.c b/sys/dev/pci/if_an_pci.c
index 5a1aee4aa7f..c2678d424df 100644
--- a/sys/dev/pci/if_an_pci.c
+++ b/sys/dev/pci/if_an_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pci.c,v 1.18 2005/06/22 06:16:02 dyoung Exp $ */
+/* $NetBSD: if_an_pci.c,v 1.19 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.18 2005/06/22 06:16:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.19 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c
index ae17fedc168..614372c90eb 100644
--- a/sys/dev/pci/if_ath_pci.c
+++ b/sys/dev/pci/if_ath_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_pci.c,v 1.10 2005/06/22 22:07:48 martin Exp $ */
+/* $NetBSD: if_ath_pci.c,v 1.11 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath_pci.c,v 1.11 2005/01/18 18:08:16 sam Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.10 2005/06/22 22:07:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.11 2005/12/11 12:22:49 christos Exp $");
#endif
/*
diff --git a/sys/dev/pci/if_atw_pci.c b/sys/dev/pci/if_atw_pci.c
index a894f912735..ba3bf6b1fa3 100644
--- a/sys/dev/pci/if_atw_pci.c
+++ b/sys/dev/pci/if_atw_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_pci.c,v 1.10 2005/06/22 06:16:02 dyoung Exp $ */
+/* $NetBSD: if_atw_pci.c,v 1.11 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.10 2005/06/22 06:16:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.11 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c
index ad77fcdab3e..a8cc0b77b0a 100644
--- a/sys/dev/pci/if_bce.c
+++ b/sys/dev/pci/if_bce.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.8 2005/02/02 13:26:06 christos Exp $ */
+/* $NetBSD: if_bce.c,v 1.9 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
diff --git a/sys/dev/pci/if_bcereg.h b/sys/dev/pci/if_bcereg.h
index 725b3829834..a9867580aef 100644
--- a/sys/dev/pci/if_bcereg.h
+++ b/sys/dev/pci/if_bcereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bcereg.h,v 1.3 2003/09/29 01:53:02 mrg Exp $ */
+/* $NetBSD: if_bcereg.h,v 1.4 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
diff --git a/sys/dev/pci/if_devar.h b/sys/dev/pci/if_devar.h
index 69b0b647469..9dc5bedbdc7 100644
--- a/sys/dev/pci/if_devar.h
+++ b/sys/dev/pci/if_devar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_devar.h,v 1.40 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: if_devar.h,v 1.41 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
diff --git a/sys/dev/pci/if_dge.c b/sys/dev/pci/if_dge.c
index 8b67d61acd7..9454792f066 100644
--- a/sys/dev/pci/if_dge.c
+++ b/sys/dev/pci/if_dge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dge.c,v 1.11 2005/05/02 15:34:32 yamt Exp $ */
+/* $NetBSD: if_dge.c,v 1.12 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.11 2005/05/02 15:34:32 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.12 2005/12/11 12:22:49 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
diff --git a/sys/dev/pci/if_dgereg.h b/sys/dev/pci/if_dgereg.h
index 1a96414ffc1..1d074ec1204 100644
--- a/sys/dev/pci/if_dgereg.h
+++ b/sys/dev/pci/if_dgereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dgereg.h,v 1.1 2004/03/12 13:46:52 ragge Exp $ */
+/* $NetBSD: if_dgereg.h,v 1.2 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
diff --git a/sys/dev/pci/if_en_pci.c b/sys/dev/pci/if_en_pci.c
index 4715924a24e..f2d61a16c9a 100644
--- a/sys/dev/pci/if_en_pci.c
+++ b/sys/dev/pci/if_en_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_en_pci.c,v 1.22 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: if_en_pci.c,v 1.23 2005/12/11 12:22:49 christos Exp $ */
/*
*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.22 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_en_pci.c,v 1.23 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c
index 9e186cd0c1b..87c340f4a55 100644
--- a/sys/dev/pci/if_ep_pci.c
+++ b/sys/dev/pci/if_ep_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_pci.c,v 1.42 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: if_ep_pci.c,v 1.43 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.42 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.43 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_epic_pci.c b/sys/dev/pci/if_epic_pci.c
index c8615c08770..ae36cdeb36e 100644
--- a/sys/dev/pci/if_epic_pci.c
+++ b/sys/dev/pci/if_epic_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_epic_pci.c,v 1.28 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: if_epic_pci.c,v 1.29 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.28 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.29 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_esh_pci.c b/sys/dev/pci/if_esh_pci.c
index 18c54d86093..b6181a8c97c 100644
--- a/sys/dev/pci/if_esh_pci.c
+++ b/sys/dev/pci/if_esh_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_esh_pci.c,v 1.18 2005/05/30 04:35:22 christos Exp $ */
+/* $NetBSD: if_esh_pci.c,v 1.19 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.18 2005/05/30 04:35:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.19 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_ex_pci.c b/sys/dev/pci/if_ex_pci.c
index b216f60dfb9..47a6717de20 100644
--- a/sys/dev/pci/if_ex_pci.c
+++ b/sys/dev/pci/if_ex_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_pci.c,v 1.39 2005/02/27 00:27:32 perry Exp $ */
+/* $NetBSD: if_ex_pci.c,v 1.40 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.39 2005/02/27 00:27:32 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.40 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_fpa.c b/sys/dev/pci/if_fpa.c
index 7009706e646..a1d73af9231 100644
--- a/sys/dev/pci/if_fpa.c
+++ b/sys/dev/pci/if_fpa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fpa.c,v 1.44 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: if_fpa.c,v 1.45 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.44 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.45 2005/12/11 12:22:49 christos Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
diff --git a/sys/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c
index c4056b409a6..22c2d4da6dd 100644
--- a/sys/dev/pci/if_fxp_pci.c
+++ b/sys/dev/pci/if_fxp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_pci.c,v 1.42 2005/07/29 13:13:34 cube Exp $ */
+/* $NetBSD: if_fxp_pci.c,v 1.43 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.42 2005/07/29 13:13:34 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.43 2005/12/11 12:22:49 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/pci/if_gem_pci.c b/sys/dev/pci/if_gem_pci.c
index fb26a2e074e..9d0160456a9 100644
--- a/sys/dev/pci/if_gem_pci.c
+++ b/sys/dev/pci/if_gem_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gem_pci.c,v 1.19 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: if_gem_pci.c,v 1.20 2005/12/11 12:22:49 christos Exp $ */
/*
*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.19 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.20 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c
index 8786ee722a6..7447e7efbdb 100644
--- a/sys/dev/pci/if_hme_pci.c
+++ b/sys/dev/pci/if_hme_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_pci.c,v 1.19 2005/04/26 13:02:06 atatat Exp $ */
+/* $NetBSD: if_hme_pci.c,v 1.20 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2000 Matthew R. Green
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.19 2005/04/26 13:02:06 atatat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.20 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 9ee67552742..cb0dd1b09c1 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipw.c,v 1.13 2005/07/06 23:44:15 dyoung Exp $ */
+/* $NetBSD: if_ipw.c,v 1.14 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2004
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.13 2005/07/06 23:44:15 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.14 2005/12/11 12:22:49 christos Exp $");
/*-
* Intel(R) PRO/Wireless 2100 MiniPCI driver
diff --git a/sys/dev/pci/if_ipwreg.h b/sys/dev/pci/if_ipwreg.h
index 9e2941e0be9..25fb4152e48 100644
--- a/sys/dev/pci/if_ipwreg.h
+++ b/sys/dev/pci/if_ipwreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipwreg.h,v 1.3 2004/09/14 00:27:26 lukem Exp $ */
+/* $NetBSD: if_ipwreg.h,v 1.4 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2004
diff --git a/sys/dev/pci/if_ipwvar.h b/sys/dev/pci/if_ipwvar.h
index 3c5e9d4217b..7252469b2f0 100644
--- a/sys/dev/pci/if_ipwvar.h
+++ b/sys/dev/pci/if_ipwvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipwvar.h,v 1.6 2005/06/22 06:16:02 dyoung Exp $ */
+/* $NetBSD: if_ipwvar.h,v 1.7 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2004
diff --git a/sys/dev/pci/if_le_pci.c b/sys/dev/pci/if_le_pci.c
index 04ca3fdebdc..8535d71bdac 100644
--- a/sys/dev/pci/if_le_pci.c
+++ b/sys/dev/pci/if_le_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_pci.c,v 1.42 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: if_le_pci.c,v 1.43 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.42 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.43 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_mtd_pci.c b/sys/dev/pci/if_mtd_pci.c
index 477d5d600aa..d6024574ef9 100644
--- a/sys/dev/pci/if_mtd_pci.c
+++ b/sys/dev/pci/if_mtd_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mtd_pci.c,v 1.6 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: if_mtd_pci.c,v 1.7 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
/* TODO: Check why in IO space, the MII won't work. Memory mapped works */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.6 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.7 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/pci/if_ne_pci.c b/sys/dev/pci/if_ne_pci.c
index 3de2cc15b64..87cd41f9061 100644
--- a/sys/dev/pci/if_ne_pci.c
+++ b/sys/dev/pci/if_ne_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pci.c,v 1.26 2004/08/21 23:48:33 thorpej Exp $ */
+/* $NetBSD: if_ne_pci.c,v 1.27 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.26 2004/08/21 23:48:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.27 2005/12/11 12:22:49 christos Exp $");
#include "opt_ipkdb.h"
diff --git a/sys/dev/pci/if_ntwoc_pci.c b/sys/dev/pci/if_ntwoc_pci.c
index a249d527050..242cc9172c8 100644
--- a/sys/dev/pci/if_ntwoc_pci.c
+++ b/sys/dev/pci/if_ntwoc_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ntwoc_pci.c,v 1.15 2005/05/30 04:35:22 christos Exp $ */
+/* $NetBSD: if_ntwoc_pci.c,v 1.16 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1998 Vixie Enterprises
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.15 2005/05/30 04:35:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.16 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_ntwoc_pcireg.h b/sys/dev/pci/if_ntwoc_pcireg.h
index 0559d2cd919..a070268fc20 100644
--- a/sys/dev/pci/if_ntwoc_pcireg.h
+++ b/sys/dev/pci/if_ntwoc_pcireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ntwoc_pcireg.h,v 1.4 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: if_ntwoc_pcireg.h,v 1.5 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1998 Vixie Enterprises
diff --git a/sys/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index 4e023e57cba..7867e823631 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $ */
+/* $NetBSD: if_pcn.c,v 1.27 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
#include "opt_pcn.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pcn.c,v 1.27 2005/12/11 12:22:49 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
diff --git a/sys/dev/pci/if_ral_pci.c b/sys/dev/pci/if_ral_pci.c
index 379f41dbf02..6d8e8e236df 100644
--- a/sys/dev/pci/if_ral_pci.c
+++ b/sys/dev/pci/if_ral_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ral_pci.c,v 1.2 2005/07/04 17:50:10 drochner Exp $ */
+/* $NetBSD: if_ral_pci.c,v 1.3 2005/12/11 12:22:49 christos Exp $ */
/* $OpenBSD: if_ral_pci.c,v 1.4 2005/02/22 10:41:30 damien Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.2 2005/07/04 17:50:10 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.3 2005/12/11 12:22:49 christos Exp $");
#include "bpfilter.h"
diff --git a/sys/dev/pci/if_rtk_pci.c b/sys/dev/pci/if_rtk_pci.c
index e931b2f280e..1a931a492d6 100644
--- a/sys/dev/pci/if_rtk_pci.c
+++ b/sys/dev/pci/if_rtk_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_pci.c,v 1.22 2005/01/27 02:42:35 jmcneill Exp $ */
+/* $NetBSD: if_rtk_pci.c,v 1.23 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.22 2005/01/27 02:42:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.23 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_sf_pci.c b/sys/dev/pci/if_sf_pci.c
index 652b876594c..01fb9c1fba0 100644
--- a/sys/dev/pci/if_sf_pci.c
+++ b/sys/dev/pci/if_sf_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sf_pci.c,v 1.8 2004/08/21 23:48:33 thorpej Exp $ */
+/* $NetBSD: if_sf_pci.c,v 1.9 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.8 2004/08/21 23:48:33 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.9 2005/12/11 12:22:49 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_sip.c b/sys/dev/pci/if_sip.c
index 749bc981a08..83711652b7e 100644
--- a/sys/dev/pci/if_sip.c
+++ b/sys/dev/pci/if_sip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sip.c,v 1.102 2005/05/02 15:34:32 yamt Exp $ */
+/* $NetBSD: if_sip.c,v 1.103 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.102 2005/05/02 15:34:32 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.103 2005/12/11 12:22:49 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
diff --git a/sys/dev/pci/if_sipreg.h b/sys/dev/pci/if_sipreg.h
index 16949e625d5..dc498c007eb 100644
--- a/sys/dev/pci/if_sipreg.h
+++ b/sys/dev/pci/if_sipreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sipreg.h,v 1.14 2004/04/11 16:57:44 thorpej Exp $ */
+/* $NetBSD: if_sipreg.h,v 1.15 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/if_skreg.h b/sys/dev/pci/if_skreg.h
index 09e609495a1..5af05914b7f 100644
--- a/sys/dev/pci/if_skreg.h
+++ b/sys/dev/pci/if_skreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_skreg.h,v 1.4 2005/05/30 04:35:22 christos Exp $ */
+/* $NetBSD: if_skreg.h,v 1.5 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/if_skvar.h b/sys/dev/pci/if_skvar.h
index ff5c37bd283..52bd3a04826 100644
--- a/sys/dev/pci/if_skvar.h
+++ b/sys/dev/pci/if_skvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_skvar.h,v 1.6 2005/05/30 04:35:22 christos Exp $ */
+/* $NetBSD: if_skvar.h,v 1.7 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index 778dff631bc..e269c095e74 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ste.c,v 1.21 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: if_ste.c,v 1.22 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.21 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.22 2005/12/11 12:22:49 christos Exp $");
#include "bpfilter.h"
diff --git a/sys/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index ef5b0ee8f43..ea69581700b 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stge.c,v 1.31 2005/07/28 16:04:24 christos Exp $ */
+/* $NetBSD: if_stge.c,v 1.32 2005/12/11 12:22:49 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.31 2005/07/28 16:04:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.32 2005/12/11 12:22:49 christos Exp $");
#include "bpfilter.h"
diff --git a/sys/dev/pci/if_ti.c b/sys/dev/pci/if_ti.c
index 8936068ad32..a115ef52cb3 100644
--- a/sys/dev/pci/if_ti.c
+++ b/sys/dev/pci/if_ti.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.68 2005/05/30 04:35:22 christos Exp $ */
+/* $NetBSD: if_ti.c,v 1.69 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.68 2005/05/30 04:35:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.69 2005/12/11 12:22:49 christos Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
diff --git a/sys/dev/pci/if_tireg.h b/sys/dev/pci/if_tireg.h
index 616eb5d5893..71774382791 100644
--- a/sys/dev/pci/if_tireg.h
+++ b/sys/dev/pci/if_tireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tireg.h,v 1.16 2005/05/30 04:35:22 christos Exp $ */
+/* $NetBSD: if_tireg.h,v 1.17 2005/12/11 12:22:49 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
diff --git a/sys/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 873a960bd84..bdb80e91660 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.70 2005/05/30 04:35:22 christos Exp $ */
+/* $NetBSD: if_tl.c,v 1.71 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.70 2005/05/30 04:35:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.71 2005/12/11 12:22:50 christos Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
diff --git a/sys/dev/pci/if_tlregs.h b/sys/dev/pci/if_tlregs.h
index f78b5478a89..daa19e6a625 100644
--- a/sys/dev/pci/if_tlregs.h
+++ b/sys/dev/pci/if_tlregs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlregs.h,v 1.7 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: if_tlregs.h,v 1.8 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
diff --git a/sys/dev/pci/if_tlvar.h b/sys/dev/pci/if_tlvar.h
index be175344b2e..068d36a12dc 100644
--- a/sys/dev/pci/if_tlvar.h
+++ b/sys/dev/pci/if_tlvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlvar.h,v 1.11 2005/01/23 10:53:19 dan Exp $ */
+/* $NetBSD: if_tlvar.h,v 1.12 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
diff --git a/sys/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index a9f239fa2d1..2bdac9ea5e0 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.12 2005/06/18 16:10:44 chs Exp $ */
+/* $NetBSD: if_txp.c,v 1.13 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2001
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.12 2005/06/18 16:10:44 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.13 2005/12/11 12:22:50 christos Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
diff --git a/sys/dev/pci/if_txpreg.h b/sys/dev/pci/if_txpreg.h
index ba84612c703..3b9f5f14708 100644
--- a/sys/dev/pci/if_txpreg.h
+++ b/sys/dev/pci/if_txpreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txpreg.h,v 1.2 2003/07/07 15:18:24 drochner Exp $ */
+/* $NetBSD: if_txpreg.h,v 1.3 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2001 Aaron Campbell <aaron@monkey.org>.
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index df85760dc74..fc82676d06d 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vr.c,v 1.74 2005/01/30 17:36:49 thorpej Exp $ */
+/* $NetBSD: if_vr.c,v 1.75 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -104,7 +104,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.74 2005/01/30 17:36:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.75 2005/12/11 12:22:50 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/pci/if_vrreg.h b/sys/dev/pci/if_vrreg.h
index 4c3709038d4..4a9fad08922 100644
--- a/sys/dev/pci/if_vrreg.h
+++ b/sys/dev/pci/if_vrreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vrreg.h,v 1.12 2003/10/17 17:42:35 tsutsui Exp $ */
+/* $NetBSD: if_vrreg.h,v 1.13 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1997, 1998
diff --git a/sys/dev/pci/if_wi_pci.c b/sys/dev/pci/if_wi_pci.c
index 5cfe97acfa4..00473a1bcf3 100644
--- a/sys/dev/pci/if_wi_pci.c
+++ b/sys/dev/pci/if_wi_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pci.c,v 1.37 2005/06/22 06:16:02 dyoung Exp $ */
+/* $NetBSD: if_wi_pci.c,v 1.38 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.37 2005/06/22 06:16:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.38 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/if_wm.c b/sys/dev/pci/if_wm.c
index 72c9108ead2..e7be10b5eea 100644
--- a/sys/dev/pci/if_wm.c
+++ b/sys/dev/pci/if_wm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.108 2005/10/29 13:24:41 yamt Exp $ */
+/* $NetBSD: if_wm.c,v 1.109 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.108 2005/10/29 13:24:41 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.109 2005/12/11 12:22:50 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
diff --git a/sys/dev/pci/if_wmreg.h b/sys/dev/pci/if_wmreg.h
index 90883649055..92c2dd24e7b 100644
--- a/sys/dev/pci/if_wmreg.h
+++ b/sys/dev/pci/if_wmreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmreg.h,v 1.15 2005/08/07 04:56:25 yamt Exp $ */
+/* $NetBSD: if_wmreg.h,v 1.16 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index a87ac711b90..1a5be9c533f 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $ */
+/* $NetBSD: if_xge.c,v 1.2 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.2 2005/12/11 12:22:50 christos Exp $");
#include "bpfilter.h"
#include "rnd.h"
diff --git a/sys/dev/pci/if_xgereg.h b/sys/dev/pci/if_xgereg.h
index 5ae524476f1..240db0bfd5c 100644
--- a/sys/dev/pci/if_xgereg.h
+++ b/sys/dev/pci/if_xgereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xgereg.h,v 1.1 2005/09/09 10:30:27 ragge Exp $ */
+/* $NetBSD: if_xgereg.h,v 1.2 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
diff --git a/sys/dev/pci/ifpci.c b/sys/dev/pci/ifpci.c
index cd2b4087d09..6bf5b8cc1c2 100644
--- a/sys/dev/pci/ifpci.c
+++ b/sys/dev/pci/ifpci.c
@@ -35,14 +35,14 @@
* Fritz!Card PCI driver
* ------------------------------------------------
*
- * $Id: ifpci.c,v 1.17 2005/07/09 02:05:09 christos Exp $
+ * $Id: ifpci.c,v 1.18 2005/12/11 12:22:50 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:58 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.17 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpci.c,v 1.18 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/pci/ifpci2.c b/sys/dev/pci/ifpci2.c
index 2b059e40c15..2b665013d51 100644
--- a/sys/dev/pci/ifpci2.c
+++ b/sys/dev/pci/ifpci2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ifpci2.c,v 1.6 2005/06/01 18:16:22 drochner Exp $ */
+/* $NetBSD: ifpci2.c,v 1.7 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999 Gary Jennejohn. All rights reserved.
*
@@ -36,14 +36,14 @@
* Fritz!Card PCI driver
* ------------------------------------------------
*
- * $Id: ifpci2.c,v 1.6 2005/06/01 18:16:22 drochner Exp $
+ * $Id: ifpci2.c,v 1.7 2005/12/11 12:22:50 christos Exp $
*
* last edit-date: [Fri Jan 5 11:38:58 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.6 2005/06/01 18:16:22 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpci2.c,v 1.7 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/pci/igsfb_pci.c b/sys/dev/pci/igsfb_pci.c
index 68a53191de2..a9e7bb619c3 100644
--- a/sys/dev/pci/igsfb_pci.c
+++ b/sys/dev/pci/igsfb_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: igsfb_pci.c,v 1.8 2004/04/23 21:13:06 itojun Exp $ */
+/* $NetBSD: igsfb_pci.c,v 1.9 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2002, 2003 Valeriy E. Ushakov
@@ -31,7 +31,7 @@
* Integraphics Systems IGA 168x and CyberPro series.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: igsfb_pci.c,v 1.8 2004/04/23 21:13:06 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: igsfb_pci.c,v 1.9 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/iha_pci.c b/sys/dev/pci/iha_pci.c
index db980a0b6ed..101c9475a19 100644
--- a/sys/dev/pci/iha_pci.c
+++ b/sys/dev/pci/iha_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iha_pci.c,v 1.10 2005/06/16 14:32:09 tsutsui Exp $ */
+/* $NetBSD: iha_pci.c,v 1.11 2005/12/11 12:22:50 christos Exp $ */
/*-
* Device driver for the INI-9XXXU/UW or INIC-940/950 PCI SCSI Controller.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.10 2005/06/16 14:32:09 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.11 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/iop_pci.c b/sys/dev/pci/iop_pci.c
index 1a684f1513e..ea1518aa1b5 100644
--- a/sys/dev/pci/iop_pci.c
+++ b/sys/dev/pci/iop_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iop_pci.c,v 1.15 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: iop_pci.c,v 1.16 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.15 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.16 2005/12/11 12:22:50 christos Exp $");
#include "opt_i2o.h"
diff --git a/sys/dev/pci/isic_pci.c b/sys/dev/pci/isic_pci.c
index aee980547e2..cd5c89de81e 100644
--- a/sys/dev/pci/isic_pci.c
+++ b/sys/dev/pci/isic_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_pci.c,v 1.24 2005/06/01 18:16:22 drochner Exp $ */
+/* $NetBSD: isic_pci.c,v 1.25 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.24 2005/06/01 18:16:22 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pci.c,v 1.25 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/sys/dev/pci/isic_pci.h b/sys/dev/pci/isic_pci.h
index 463bc3fa601..e758d716612 100644
--- a/sys/dev/pci/isic_pci.h
+++ b/sys/dev/pci/isic_pci.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_pci.h,v 1.9 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: isic_pci.h,v 1.10 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/isic_pci_elsa_qs1p.c b/sys/dev/pci/isic_pci_elsa_qs1p.c
index acb6ad37420..69eb7e51d99 100644
--- a/sys/dev/pci/isic_pci_elsa_qs1p.c
+++ b/sys/dev/pci/isic_pci_elsa_qs1p.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isic_pci_elsa_qs1p.c,v 1.14 2005/06/01 18:16:22 drochner Exp $ */
+/* $NetBSD: isic_pci_elsa_qs1p.c,v 1.15 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
@@ -32,7 +32,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pci_elsa_qs1p.c,v 1.14 2005/06/01 18:16:22 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pci_elsa_qs1p.c,v 1.15 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index 194393d8612..edc28af829b 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_pci.c,v 1.93 2005/05/30 04:35:22 christos Exp $ */
+/* $NetBSD: isp_pci.c,v 1.94 2005/12/11 12:22:50 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.93 2005/05/30 04:35:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.94 2005/12/11 12:22:50 christos Exp $");
#include <dev/ic/isp_netbsd.h>
#include <dev/pci/pcireg.h>
diff --git a/sys/dev/pci/iteide.c b/sys/dev/pci/iteide.c
index 443ff8e87f6..d68e0f8d379 100644
--- a/sys/dev/pci/iteide.c
+++ b/sys/dev/pci/iteide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iteide.c,v 1.3 2005/05/24 05:25:15 lukem Exp $ */
+/* $NetBSD: iteide.c,v 1.4 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iteide.c,v 1.3 2005/05/24 05:25:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iteide.c,v 1.4 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/iwic_bchan.c b/sys/dev/pci/iwic_bchan.c
index 35323579874..3859ba1f1f8 100644
--- a/sys/dev/pci/iwic_bchan.c
+++ b/sys/dev/pci/iwic_bchan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_bchan.c,v 1.4 2005/07/09 02:05:09 christos Exp $ */
+/* $NetBSD: iwic_bchan.c,v 1.5 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -38,7 +38,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_bchan.c,v 1.4 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_bchan.c,v 1.5 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/iwic_dchan.c b/sys/dev/pci/iwic_dchan.c
index ee4f26227e8..67244c9abb3 100644
--- a/sys/dev/pci/iwic_dchan.c
+++ b/sys/dev/pci/iwic_dchan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_dchan.c,v 1.3 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: iwic_dchan.c,v 1.4 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_dchan.c,v 1.3 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_dchan.c,v 1.4 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/iwic_fsm.c b/sys/dev/pci/iwic_fsm.c
index 57653dca2dc..39602ba78a9 100644
--- a/sys/dev/pci/iwic_fsm.c
+++ b/sys/dev/pci/iwic_fsm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_fsm.c,v 1.2 2005/07/09 02:05:09 christos Exp $ */
+/* $NetBSD: iwic_fsm.c,v 1.3 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_fsm.c,v 1.2 2005/07/09 02:05:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_fsm.c,v 1.3 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/iwic_pci.c b/sys/dev/pci/iwic_pci.c
index 1bcf946461a..bfc0d3c588b 100644
--- a/sys/dev/pci/iwic_pci.c
+++ b/sys/dev/pci/iwic_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: iwic_pci.c,v 1.7 2003/10/03 16:38:44 pooka Exp $ */
+/* $NetBSD: iwic_pci.c,v 1.8 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.7 2003/10/03 16:38:44 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwic_pci.c,v 1.8 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/pci/iwicvar.h b/sys/dev/pci/iwicvar.h
index a893de84515..d8bda4afeac 100644
--- a/sys/dev/pci/iwicvar.h
+++ b/sys/dev/pci/iwicvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iwicvar.h,v 1.3 2005/07/09 02:05:09 christos Exp $ */
+/* $NetBSD: iwicvar.h,v 1.4 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999, 2000 Dave Boyce. All rights reserved.
diff --git a/sys/dev/pci/ixpide.c b/sys/dev/pci/ixpide.c
index 5ddf01f3c31..bc59970a348 100644
--- a/sys/dev/pci/ixpide.c
+++ b/sys/dev/pci/ixpide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixpide.c,v 1.4 2005/07/04 01:20:37 augustss Exp $ */
+/* $NetBSD: ixpide.c,v 1.5 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixpide.c,v 1.4 2005/07/04 01:20:37 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixpide.c,v 1.5 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/joy_eap.c b/sys/dev/pci/joy_eap.c
index 8f3ee3cd7b4..5f4dca98516 100644
--- a/sys/dev/pci/joy_eap.c
+++ b/sys/dev/pci/joy_eap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_eap.c,v 1.3 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: joy_eap.c,v 1.4 2005/12/11 12:22:50 christos Exp $ */
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/joy_eso.c b/sys/dev/pci/joy_eso.c
index d610bc3964e..0160934a6c9 100644
--- a/sys/dev/pci/joy_eso.c
+++ b/sys/dev/pci/joy_eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_eso.c,v 1.8 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: joy_eso.c,v 1.9 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.8 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_eso.c,v 1.9 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/joy_pci.c b/sys/dev/pci/joy_pci.c
index f36e5eb3f6a..7484ed6b41b 100644
--- a/sys/dev/pci/joy_pci.c
+++ b/sys/dev/pci/joy_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: joy_pci.c,v 1.11 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: joy_pci.c,v 1.12 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.11 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.12 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/ld_amr.c b/sys/dev/pci/ld_amr.c
index dfcea289089..c28597a3721 100644
--- a/sys/dev/pci/ld_amr.c
+++ b/sys/dev/pci/ld_amr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_amr.c,v 1.7 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: ld_amr.c,v 1.8 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.7 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_amr.c,v 1.8 2005/12/11 12:22:50 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/pci/ld_twe.c b/sys/dev/pci/ld_twe.c
index 86a49ae3928..dec6354bbb5 100644
--- a/sys/dev/pci/ld_twe.c
+++ b/sys/dev/pci/ld_twe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_twe.c,v 1.22 2005/02/08 05:16:17 briggs Exp $ */
+/* $NetBSD: ld_twe.c,v 1.23 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.22 2005/02/08 05:16:17 briggs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_twe.c,v 1.23 2005/12/11 12:22:50 christos Exp $");
#include "rnd.h"
diff --git a/sys/dev/pci/lpt_puc.c b/sys/dev/pci/lpt_puc.c
index 1eb786adabd..185451dace0 100644
--- a/sys/dev/pci/lpt_puc.c
+++ b/sys/dev/pci/lpt_puc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_puc.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: lpt_puc.c,v 1.10 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_puc.c,v 1.10 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/machfb.c b/sys/dev/pci/machfb.c
index e97b9d27125..529cf492704 100644
--- a/sys/dev/pci/machfb.c
+++ b/sys/dev/pci/machfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machfb.c,v 1.35 2005/10/03 11:22:06 macallan Exp $ */
+/* $NetBSD: machfb.c,v 1.36 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2002 Bang Jun-Young
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0,
- "$NetBSD: machfb.c,v 1.35 2005/10/03 11:22:06 macallan Exp $");
+ "$NetBSD: machfb.c,v 1.36 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -383,7 +383,7 @@ static struct wsscreen_list mach64_screenlist = {
_mach64_scrlist
};
-static int mach64_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int mach64_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t mach64_mmap(void *, off_t, int);
static int mach64_alloc_screen(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@@ -1593,7 +1593,7 @@ mach64_allocattr(void *cookie, int fg, int bg, int flags, long *attrp)
*/
static int
-mach64_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+mach64_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct mach64_softc *sc = v;
struct wsdisplay_fbinfo *wdf;
diff --git a/sys/dev/pci/machfbreg.h b/sys/dev/pci/machfbreg.h
index 33eb4fb382b..5668802c458 100644
--- a/sys/dev/pci/machfbreg.h
+++ b/sys/dev/pci/machfbreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: machfbreg.h,v 1.2 2005/10/03 10:26:24 macallan Exp $ */
+/* $NetBSD: machfbreg.h,v 1.3 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright 1992,1993,1994,1995,1996,1997 by Kevin E. Martin, Chapel Hill, North Carolina.
diff --git a/sys/dev/pci/mlx_pci.c b/sys/dev/pci/mlx_pci.c
index ba3c54d160a..ec15c450f3a 100644
--- a/sys/dev/pci/mlx_pci.c
+++ b/sys/dev/pci/mlx_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx_pci.c,v 1.12 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: mlx_pci.c,v 1.13 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.12 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.13 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/mly.c b/sys/dev/pci/mly.c
index 284e013e4af..204d5ef99e7 100644
--- a/sys/dev/pci/mly.c
+++ b/sys/dev/pci/mly.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mly.c,v 1.23 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: mly.c,v 1.24 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.23 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.24 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2272,7 +2272,7 @@ mly_dmamem_free(struct mly_softc *mly, int size, bus_dmamap_t dmamap,
* Accept an open operation on the control device.
*/
int
-mlyopen(dev_t dev, int flag, int mode, struct proc *p)
+mlyopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct mly_softc *mly;
@@ -2291,7 +2291,7 @@ mlyopen(dev_t dev, int flag, int mode, struct proc *p)
* Accept the last close on the control device.
*/
int
-mlyclose(dev_t dev, int flag, int mode, struct proc *p)
+mlyclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct mly_softc *mly;
@@ -2304,7 +2304,7 @@ mlyclose(dev_t dev, int flag, int mode, struct proc *p)
* Handle control operations.
*/
int
-mlyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+mlyioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct mly_softc *mly;
int rv;
diff --git a/sys/dev/pci/mly_tables.h b/sys/dev/pci/mly_tables.h
index a43c903360e..cde27f48c12 100644
--- a/sys/dev/pci/mly_tables.h
+++ b/sys/dev/pci/mly_tables.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mly_tables.h,v 1.4 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: mly_tables.h,v 1.5 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/mlyio.h b/sys/dev/pci/mlyio.h
index 36ac928b17e..e093c726aac 100644
--- a/sys/dev/pci/mlyio.h
+++ b/sys/dev/pci/mlyio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mlyio.h,v 1.2 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: mlyio.h,v 1.3 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/mlyreg.h b/sys/dev/pci/mlyreg.h
index d311461eb3a..3d3df5d5116 100644
--- a/sys/dev/pci/mlyreg.h
+++ b/sys/dev/pci/mlyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mlyreg.h,v 1.2 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: mlyreg.h,v 1.3 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/mpt_pci.c b/sys/dev/pci/mpt_pci.c
index decbec5b451..dd437abd01d 100644
--- a/sys/dev/pci/mpt_pci.c
+++ b/sys/dev/pci/mpt_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpt_pci.c,v 1.5 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: mpt_pci.c,v 1.6 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.5 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.6 2005/12/11 12:22:50 christos Exp $");
#include <dev/ic/mpt.h> /* pulls in all headers */
diff --git a/sys/dev/pci/mpu_cmpci.c b/sys/dev/pci/mpu_cmpci.c
index e6e65c1e72c..df299968537 100644
--- a/sys/dev/pci/mpu_cmpci.c
+++ b/sys/dev/pci/mpu_cmpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_cmpci.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: mpu_cmpci.c,v 1.10 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_cmpci.c,v 1.10 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/mpu_eso.c b/sys/dev/pci/mpu_eso.c
index 70cc183d85a..846bda11321 100644
--- a/sys/dev/pci/mpu_eso.c
+++ b/sys/dev/pci/mpu_eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_eso.c,v 1.10 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: mpu_eso.c,v 1.11 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.10 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_eso.c,v 1.11 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/mpu_fms.c b/sys/dev/pci/mpu_fms.c
index ae298c6c8df..17bdf4c3a11 100644
--- a/sys/dev/pci/mpu_fms.c
+++ b/sys/dev/pci/mpu_fms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_fms.c,v 1.10 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: mpu_fms.c,v 1.11 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.10 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_fms.c,v 1.11 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/mpu_yds.c b/sys/dev/pci/mpu_yds.c
index 967559558ca..2bdaf3e7d9b 100644
--- a/sys/dev/pci/mpu_yds.c
+++ b/sys/dev/pci/mpu_yds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_yds.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: mpu_yds.c,v 1.10 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_yds.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_yds.c,v 1.10 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/neo.c b/sys/dev/pci/neo.c
index 79c8f46b418..df929703cf8 100644
--- a/sys/dev/pci/neo.c
+++ b/sys/dev/pci/neo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: neo.c,v 1.29 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: neo.c,v 1.30 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999 Cameron Grant <gandalf@vilnya.demon.co.uk>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.29 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.30 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/njs_pci.c b/sys/dev/pci/njs_pci.c
index 576f2ab0f9b..d8a60914e15 100644
--- a/sys/dev/pci/njs_pci.c
+++ b/sys/dev/pci/njs_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: njs_pci.c,v 1.2 2004/08/26 18:38:19 thorpej Exp $ */
+/* $NetBSD: njs_pci.c,v 1.3 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njs_pci.c,v 1.2 2004/08/26 18:38:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njs_pci.c,v 1.3 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/oboe.c b/sys/dev/pci/oboe.c
index b1d95c10df3..787ff70bb3b 100644
--- a/sys/dev/pci/oboe.c
+++ b/sys/dev/pci/oboe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.19 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: oboe.c,v 1.20 2005/12/11 12:22:50 christos Exp $ */
/* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.19 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.20 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,14 +75,14 @@ static void oboe_attach(struct device *parent, struct device *self, void *aux);
static int oboe_activate(struct device *self, enum devact act);
static int oboe_detach(struct device *self, int flags);
-static int oboe_open(void *h, int flag, int mode, struct proc *p);
-static int oboe_close(void *h, int flag, int mode, struct proc *p);
+static int oboe_open(void *h, int flag, int mode, struct lwp *l);
+static int oboe_close(void *h, int flag, int mode, struct lwp *l);
static int oboe_read(void *h, struct uio *uio, int flag);
static int oboe_write(void *h, struct uio *uio, int flag);
static int oboe_set_params(void *h, struct irda_params *params);
static int oboe_get_speeds(void *h, int *speeds);
static int oboe_get_turnarounds(void *h, int *times);
-static int oboe_poll(void *h, int events, struct proc *p);
+static int oboe_poll(void *h, int events, struct lwp *l);
static int oboe_kqfilter(void *h, struct knote *kn);
#ifdef OBOE_DEBUG
@@ -280,7 +280,7 @@ oboe_detach(struct device *self, int flags)
}
static int
-oboe_open(void *h, int flag, int mode, struct proc *p)
+oboe_open(void *h, int flag, int mode, struct lwp *l)
{
struct oboe_softc *sc = h;
@@ -295,7 +295,7 @@ oboe_open(void *h, int flag, int mode, struct proc *p)
}
static int
-oboe_close(void *h, int flag, int mode, struct proc *p)
+oboe_close(void *h, int flag, int mode, struct lwp *l)
{
struct oboe_softc *sc = h;
int error = 0;
@@ -458,7 +458,7 @@ oboe_get_turnarounds(void *h, int *turnarounds)
}
static int
-oboe_poll(void *h, int events, struct proc *p)
+oboe_poll(void *h, int events, struct lwp *l)
{
struct oboe_softc *sc = h;
int revents = 0;
@@ -475,7 +475,7 @@ oboe_poll(void *h, int events, struct proc *p)
revents |= events & (POLLIN | POLLRDNORM);
} else {
DPRINTF(("%s: recording select\n", __FUNCTION__));
- selrecord(p, &sc->sc_rsel);
+ selrecord(l, &sc->sc_rsel);
}
}
splx(s);
diff --git a/sys/dev/pci/ohci_pci.c b/sys/dev/pci/ohci_pci.c
index f300b258eea..a82738472cd 100644
--- a/sys/dev/pci/ohci_pci.c
+++ b/sys/dev/pci/ohci_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_pci.c,v 1.28 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: ohci_pci.c,v 1.29 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.28 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.29 2005/12/11 12:22:50 christos Exp $");
#include "ehci.h"
diff --git a/sys/dev/pci/opl_cmpci.c b/sys/dev/pci/opl_cmpci.c
index acf2e69d3f0..1cb09f86abc 100644
--- a/sys/dev/pci/opl_cmpci.c
+++ b/sys/dev/pci/opl_cmpci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_cmpci.c,v 1.8 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: opl_cmpci.c,v 1.9 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.8 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_cmpci.c,v 1.9 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/opl_eso.c b/sys/dev/pci/opl_eso.c
index 853710ce878..cca2baa4ab3 100644
--- a/sys/dev/pci/opl_eso.c
+++ b/sys/dev/pci/opl_eso.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_eso.c,v 1.10 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: opl_eso.c,v 1.11 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.10 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_eso.c,v 1.11 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/opl_fms.c b/sys/dev/pci/opl_fms.c
index de5cc05f090..7ba6d845be5 100644
--- a/sys/dev/pci/opl_fms.c
+++ b/sys/dev/pci/opl_fms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_fms.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: opl_fms.c,v 1.10 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_fms.c,v 1.10 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/opl_sv.c b/sys/dev/pci/opl_sv.c
index b8f03551dc2..ccc66fa924e 100644
--- a/sys/dev/pci/opl_sv.c
+++ b/sys/dev/pci/opl_sv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_sv.c,v 1.8 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: opl_sv.c,v 1.9 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.8 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_sv.c,v 1.9 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/opl_yds.c b/sys/dev/pci/opl_yds.c
index 3ac965282d4..e1dd86ff82d 100644
--- a/sys/dev/pci/opl_yds.c
+++ b/sys/dev/pci/opl_yds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_yds.c,v 1.8 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: opl_yds.c,v 1.9 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.8 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_yds.c,v 1.9 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/optiide.c b/sys/dev/pci/optiide.c
index ea0364a9281..c1d50b4a2d6 100644
--- a/sys/dev/pci/optiide.c
+++ b/sys/dev/pci/optiide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: optiide.c,v 1.11 2005/05/24 05:25:15 lukem Exp $ */
+/* $NetBSD: optiide.c,v 1.12 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: optiide.c,v 1.11 2005/05/24 05:25:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: optiide.c,v 1.12 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index 30b469dcfc1..c6397b47c64 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.125 2005/09/09 14:50:58 drochner Exp $ */
+/* $NetBSD: pccbb.c,v 1.126 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.125 2005/09/09 14:50:58 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.126 2005/12/11 12:22:50 christos Exp $");
/*
#define CBB_DEBUG
diff --git a/sys/dev/pci/pccbbreg.h b/sys/dev/pci/pccbbreg.h
index 2e11dccf53d..111ea1835d2 100644
--- a/sys/dev/pci/pccbbreg.h
+++ b/sys/dev/pci/pccbbreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbbreg.h,v 1.8 2003/12/10 02:55:48 briggs Exp $ */
+/* $NetBSD: pccbbreg.h,v 1.9 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999 HAYAKAWA Koichi. All rights reserved.
*
diff --git a/sys/dev/pci/pccbbvar.h b/sys/dev/pci/pccbbvar.h
index 5951319d780..38c0d368b3b 100644
--- a/sys/dev/pci/pccbbvar.h
+++ b/sys/dev/pci/pccbbvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbbvar.h,v 1.24 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: pccbbvar.h,v 1.25 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999 HAYAKAWA Koichi. All rights reserved.
*
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 067a297449d..59570bfd096 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci.c,v 1.96 2005/08/26 11:01:43 drochner Exp $ */
+/* $NetBSD: pci.c,v 1.97 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.96 2005/08/26 11:01:43 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci.c,v 1.97 2005/12/11 12:22:50 christos Exp $");
#include "opt_pci.h"
diff --git a/sys/dev/pci/pci_map.c b/sys/dev/pci/pci_map.c
index 57665d5a20a..b7e4c6584a8 100644
--- a/sys/dev/pci/pci_map.c
+++ b/sys/dev/pci/pci_map.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_map.c,v 1.13 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pci_map.c,v 1.14 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_map.c,v 1.13 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_map.c,v 1.14 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/pci_quirks.c b/sys/dev/pci/pci_quirks.c
index 074b83dfbaa..08bfa731360 100644
--- a/sys/dev/pci/pci_quirks.c
+++ b/sys/dev/pci/pci_quirks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_quirks.c,v 1.5 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: pci_quirks.c,v 1.6 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_quirks.c,v 1.5 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_quirks.c,v 1.6 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c
index 58009dcd95e..57924c5030b 100644
--- a/sys/dev/pci/pci_subr.c
+++ b/sys/dev/pci/pci_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.62 2005/10/30 23:34:04 simonb Exp $ */
+/* $NetBSD: pci_subr.c,v 1.63 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.62 2005/10/30 23:34:04 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.63 2005/12/11 12:22:50 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
diff --git a/sys/dev/pci/pci_usrreq.c b/sys/dev/pci/pci_usrreq.c
index 5844d2d5e50..431e6c6b06c 100644
--- a/sys/dev/pci/pci_usrreq.c
+++ b/sys/dev/pci/pci_usrreq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_usrreq.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: pci_usrreq.c,v 1.10 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.10 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_usrreq.c,v 1.9 2005/06/28 00:28:42 thorpej Exp $
#include <dev/pci/pciio.h>
static int
-pciopen(dev_t dev, int flags, int mode, struct proc *p)
+pciopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct pci_softc *sc;
int unit;
@@ -70,7 +70,7 @@ pciopen(dev_t dev, int flags, int mode, struct proc *p)
}
static int
-pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+pciioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct pci_softc *sc = device_lookup(&pci_cd, minor(dev));
struct pciio_bdf_cfgreg *bdfr = (void *) data;
@@ -140,7 +140,7 @@ const struct cdevsw pci_cdevsw = {
*/
int
pci_devioctl(pci_chipset_tag_t pc, pcitag_t tag, u_long cmd, caddr_t data,
- int flag, struct proc *p)
+ int flag, struct lwp *l)
{
struct pciio_cfgreg *r = (void *) data;
diff --git a/sys/dev/pci/pcibusprint.c b/sys/dev/pci/pcibusprint.c
index d6fb944d2be..c1c4c39c28f 100644
--- a/sys/dev/pci/pcibusprint.c
+++ b/sys/dev/pci/pcibusprint.c
@@ -1,7 +1,6 @@
-/* $NetBSD: pcibusprint.c,v 1.2 2005/05/24 05:14:37 lukem Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcibusprint.c,v 1.2 2005/05/24 05:14:37 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcibusprint.c,v 1.3 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/pciconf.c b/sys/dev/pci/pciconf.c
index 9cad63a8ac7..aae1b797ce6 100644
--- a/sys/dev/pci/pciconf.c
+++ b/sys/dev/pci/pciconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciconf.c,v 1.26 2005/03/25 14:51:39 tsutsui Exp $ */
+/* $NetBSD: pciconf.c,v 1.27 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.26 2005/03/25 14:51:39 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciconf.c,v 1.27 2005/12/11 12:22:50 christos Exp $");
#include "opt_pci.h"
diff --git a/sys/dev/pci/pciconf.h b/sys/dev/pci/pciconf.h
index f716e88940f..ddc9eeb66ff 100644
--- a/sys/dev/pci/pciconf.h
+++ b/sys/dev/pci/pciconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciconf.h,v 1.9 2005/03/25 14:51:39 tsutsui Exp $ */
+/* $NetBSD: pciconf.h,v 1.10 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index c1fe57c7aaa..340e14a1167 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide.c,v 1.212 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciide.c,v 1.213 2005/12/11 12:22:50 christos Exp $ */
/*
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.212 2005/02/27 00:27:33 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.213 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/pci/pciide_acard_reg.h b/sys/dev/pci/pciide_acard_reg.h
index 9f1f80bf790..2416eddf925 100644
--- a/sys/dev/pci/pciide_acard_reg.h
+++ b/sys/dev/pci/pciide_acard_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_acard_reg.h,v 1.5 2005/05/08 11:26:17 tsutsui Exp $ */
+/* $NetBSD: pciide_acard_reg.h,v 1.6 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2001 Izumi Tsutsui.
diff --git a/sys/dev/pci/pciide_acer_reg.h b/sys/dev/pci/pciide_acer_reg.h
index dee1c19706e..9256e97a7e4 100644
--- a/sys/dev/pci/pciide_acer_reg.h
+++ b/sys/dev/pci/pciide_acer_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_acer_reg.h,v 1.9 2005/08/06 22:07:24 bouyer Exp $ */
+/* $NetBSD: pciide_acer_reg.h,v 1.10 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999 Manuel Bouyer.
diff --git a/sys/dev/pci/pciide_apollo_reg.h b/sys/dev/pci/pciide_apollo_reg.h
index a04426dc189..792072b32eb 100644
--- a/sys/dev/pci/pciide_apollo_reg.h
+++ b/sys/dev/pci/pciide_apollo_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_apollo_reg.h,v 1.15 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciide_apollo_reg.h,v 1.16 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
diff --git a/sys/dev/pci/pciide_cmd_reg.h b/sys/dev/pci/pciide_cmd_reg.h
index 7194d16a10d..5bde61922a1 100644
--- a/sys/dev/pci/pciide_cmd_reg.h
+++ b/sys/dev/pci/pciide_cmd_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_cmd_reg.h,v 1.14 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciide_cmd_reg.h,v 1.15 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
diff --git a/sys/dev/pci/pciide_common.c b/sys/dev/pci/pciide_common.c
index 4b79fa7f6c1..b4263e18989 100644
--- a/sys/dev/pci/pciide_common.c
+++ b/sys/dev/pci/pciide_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_common.c,v 1.27 2005/05/29 22:16:00 christos Exp $ */
+/* $NetBSD: pciide_common.c,v 1.28 2005/12/11 12:22:50 christos Exp $ */
/*
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.27 2005/05/29 22:16:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.28 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
diff --git a/sys/dev/pci/pciide_cy693_reg.h b/sys/dev/pci/pciide_cy693_reg.h
index dd9eafe9bc9..ec062027bd9 100644
--- a/sys/dev/pci/pciide_cy693_reg.h
+++ b/sys/dev/pci/pciide_cy693_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_cy693_reg.h,v 1.8 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciide_cy693_reg.h,v 1.9 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
diff --git a/sys/dev/pci/pciide_geode_reg.h b/sys/dev/pci/pciide_geode_reg.h
index 65bfe82a8b6..a2d201d4691 100644
--- a/sys/dev/pci/pciide_geode_reg.h
+++ b/sys/dev/pci/pciide_geode_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_geode_reg.h,v 1.3 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciide_geode_reg.h,v 1.4 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2004 Manuel Bouyer.
diff --git a/sys/dev/pci/pciide_hpt_reg.h b/sys/dev/pci/pciide_hpt_reg.h
index dcaa8113763..b05e3677ca8 100644
--- a/sys/dev/pci/pciide_hpt_reg.h
+++ b/sys/dev/pci/pciide_hpt_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_hpt_reg.h,v 1.12 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciide_hpt_reg.h,v 1.13 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
diff --git a/sys/dev/pci/pciide_i31244_reg.h b/sys/dev/pci/pciide_i31244_reg.h
index 31743465713..1d2f64a2943 100644
--- a/sys/dev/pci/pciide_i31244_reg.h
+++ b/sys/dev/pci/pciide_i31244_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_i31244_reg.h,v 1.2 2005/02/11 21:12:32 rearnsha Exp $ */
+/* $NetBSD: pciide_i31244_reg.h,v 1.3 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
diff --git a/sys/dev/pci/pciide_ite_reg.h b/sys/dev/pci/pciide_ite_reg.h
index e1e5e739634..c64d1904277 100644
--- a/sys/dev/pci/pciide_ite_reg.h
+++ b/sys/dev/pci/pciide_ite_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_ite_reg.h,v 1.1 2004/12/01 22:27:45 grant Exp $ */
+/* $NetBSD: pciide_ite_reg.h,v 1.2 2005/12/11 12:22:50 christos Exp $ */
/* OpenBSD: pciide_ite_reg.h,v 1.1 2003/12/20 08:03:55 grange Exp */
/*
* Copyright (c) 2003 Alexander Yurchenko <grange@openbsd.org>
diff --git a/sys/dev/pci/pciide_ixp_reg.h b/sys/dev/pci/pciide_ixp_reg.h
index 8a8ce0ee5f8..6d033a32063 100644
--- a/sys/dev/pci/pciide_ixp_reg.h
+++ b/sys/dev/pci/pciide_ixp_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_ixp_reg.h,v 1.2 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciide_ixp_reg.h,v 1.3 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation.
diff --git a/sys/dev/pci/pciide_opti_reg.h b/sys/dev/pci/pciide_opti_reg.h
index 80c270d55c9..62f1eb5f35e 100644
--- a/sys/dev/pci/pciide_opti_reg.h
+++ b/sys/dev/pci/pciide_opti_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_opti_reg.h,v 1.7 2004/08/19 23:25:35 thorpej Exp $ */
+/* $NetBSD: pciide_opti_reg.h,v 1.8 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/pciide_pdc202xx_reg.h b/sys/dev/pci/pciide_pdc202xx_reg.h
index 2230e6aa655..07993ef8021 100644
--- a/sys/dev/pci/pciide_pdc202xx_reg.h
+++ b/sys/dev/pci/pciide_pdc202xx_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_pdc202xx_reg.h,v 1.12 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciide_pdc202xx_reg.h,v 1.13 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999 Manuel Bouyer.
diff --git a/sys/dev/pci/pciide_piix_reg.h b/sys/dev/pci/pciide_piix_reg.h
index c6f9be4186c..4ccc9d3cf7a 100644
--- a/sys/dev/pci/pciide_piix_reg.h
+++ b/sys/dev/pci/pciide_piix_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_piix_reg.h,v 1.9 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciide_piix_reg.h,v 1.10 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
diff --git a/sys/dev/pci/pciide_sii3112_reg.h b/sys/dev/pci/pciide_sii3112_reg.h
index 1dcb55bcf08..f77de62f037 100644
--- a/sys/dev/pci/pciide_sii3112_reg.h
+++ b/sys/dev/pci/pciide_sii3112_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_sii3112_reg.h,v 1.2 2003/12/20 03:51:27 thorpej Exp $ */
+/* $NetBSD: pciide_sii3112_reg.h,v 1.3 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
diff --git a/sys/dev/pci/pciide_sis_reg.h b/sys/dev/pci/pciide_sis_reg.h
index 4ed98319770..7c82ded93a8 100644
--- a/sys/dev/pci/pciide_sis_reg.h
+++ b/sys/dev/pci/pciide_sis_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_sis_reg.h,v 1.13 2005/06/16 19:30:02 bouyer Exp $ */
+/* $NetBSD: pciide_sis_reg.h,v 1.14 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
diff --git a/sys/dev/pci/pciide_sl82c105_reg.h b/sys/dev/pci/pciide_sl82c105_reg.h
index 75b7ef67410..2d2e97dff60 100644
--- a/sys/dev/pci/pciide_sl82c105_reg.h
+++ b/sys/dev/pci/pciide_sl82c105_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_sl82c105_reg.h,v 1.2 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciide_sl82c105_reg.h,v 1.3 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/pciidereg.h b/sys/dev/pci/pciidereg.h
index 499fb76da11..1a8d6045aa3 100644
--- a/sys/dev/pci/pciidereg.h
+++ b/sys/dev/pci/pciidereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciidereg.h,v 1.9 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciidereg.h,v 1.10 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
diff --git a/sys/dev/pci/pciidevar.h b/sys/dev/pci/pciidevar.h
index d76fef568e6..39c1790b18d 100644
--- a/sys/dev/pci/pciidevar.h
+++ b/sys/dev/pci/pciidevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pciidevar.h,v 1.30 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: pciidevar.h,v 1.31 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index ec99b790c6e..889824b4d0a 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.46 2004/08/02 14:50:36 joda Exp $ */
+/* $NetBSD: pcireg.h,v 1.47 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index 00861baeb0f..0823dde5284 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcivar.h,v 1.69 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: pcivar.h,v 1.70 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -209,7 +209,7 @@ const struct pci_quirkdata *
*/
struct proc;
int pci_devioctl(pci_chipset_tag_t, pcitag_t, u_long, caddr_t,
- int flag, struct proc *);
+ int flag, struct lwp *);
/*
* Power Management (PCI 2.2)
diff --git a/sys/dev/pci/pcscp.c b/sys/dev/pci/pcscp.c
index 7949cfa74e3..de566547f64 100644
--- a/sys/dev/pci/pcscp.c
+++ b/sys/dev/pci/pcscp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcscp.c,v 1.33 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: pcscp.c,v 1.34 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.33 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.34 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/pdcide.c b/sys/dev/pci/pdcide.c
index aeabf7bd4b3..814dc911e0e 100644
--- a/sys/dev/pci/pdcide.c
+++ b/sys/dev/pci/pdcide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pdcide.c,v 1.21 2005/05/24 05:25:15 lukem Exp $ */
+/* $NetBSD: pdcide.c,v 1.22 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdcide.c,v 1.21 2005/05/24 05:25:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdcide.c,v 1.22 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/piixide.c b/sys/dev/pci/piixide.c
index 772dce212ff..09bdb9fbebd 100644
--- a/sys/dev/pci/piixide.c
+++ b/sys/dev/pci/piixide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: piixide.c,v 1.24 2005/08/10 13:23:38 bouyer Exp $ */
+/* $NetBSD: piixide.c,v 1.25 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.24 2005/08/10 13:23:38 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.25 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/plx9060var.h b/sys/dev/pci/plx9060var.h
index bcbc8a7ae11..6e9c7f14db9 100644
--- a/sys/dev/pci/plx9060var.h
+++ b/sys/dev/pci/plx9060var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: plx9060var.h,v 1.2 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: plx9060var.h,v 1.3 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
diff --git a/sys/dev/pci/ppb.c b/sys/dev/pci/ppb.c
index 36c6c2b47d8..75a65bcc2d8 100644
--- a/sys/dev/pci/ppb.c
+++ b/sys/dev/pci/ppb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ppb.c,v 1.31 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: ppb.c,v 1.32 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.31 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.32 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/ppbreg.h b/sys/dev/pci/ppbreg.h
index c04a6c958d8..77bd4679198 100644
--- a/sys/dev/pci/ppbreg.h
+++ b/sys/dev/pci/ppbreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbreg.h,v 1.5 2005/02/27 00:27:33 perry Exp $ */
+/* $NetBSD: ppbreg.h,v 1.6 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
diff --git a/sys/dev/pci/puc.c b/sys/dev/pci/puc.c
index b5a85049f84..9ffcaddaf26 100644
--- a/sys/dev/pci/puc.c
+++ b/sys/dev/pci/puc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: puc.c,v 1.26 2005/08/26 11:20:33 drochner Exp $ */
+/* $NetBSD: puc.c,v 1.27 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1996, 1998, 1999
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.26 2005/08/26 11:20:33 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puc.c,v 1.27 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/puccn.c b/sys/dev/pci/puccn.c
index cb0537dd712..7813370a3c5 100644
--- a/sys/dev/pci/puccn.c
+++ b/sys/dev/pci/puccn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: puccn.c,v 1.7 2005/02/27 00:27:34 perry Exp $ */
+/* $NetBSD: puccn.c,v 1.8 2005/12/11 12:22:50 christos Exp $ */
/*
* Derived from pci.c
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puccn.c,v 1.7 2005/02/27 00:27:34 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puccn.c,v 1.8 2005/12/11 12:22:50 christos Exp $");
#include "opt_kgdb.h"
diff --git a/sys/dev/pci/puccn.h b/sys/dev/pci/puccn.h
index f84e16427ba..ca0d137b8c3 100644
--- a/sys/dev/pci/puccn.h
+++ b/sys/dev/pci/puccn.h
@@ -1,4 +1,4 @@
-/* $NetBSD: puccn.h,v 1.3 2003/07/08 10:06:32 itojun Exp $ */
+/* $NetBSD: puccn.h,v 1.4 2005/12/11 12:22:50 christos Exp $ */
/*
* Derived from pci.c
diff --git a/sys/dev/pci/pucdata.c b/sys/dev/pci/pucdata.c
index 32869cdd4f8..17f0f9e9618 100644
--- a/sys/dev/pci/pucdata.c
+++ b/sys/dev/pci/pucdata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.40 2005/02/27 00:27:34 perry Exp $ */
+/* $NetBSD: pucdata.c,v 1.41 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.40 2005/02/27 00:27:34 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.41 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/pucvar.h b/sys/dev/pci/pucvar.h
index 3b2b07570b8..5d6eb4027c9 100644
--- a/sys/dev/pci/pucvar.h
+++ b/sys/dev/pci/pucvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pucvar.h,v 1.7 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: pucvar.h,v 1.8 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
diff --git a/sys/dev/pci/rccide.c b/sys/dev/pci/rccide.c
index 362ee04fc80..3ea71d75b71 100644
--- a/sys/dev/pci/rccide.c
+++ b/sys/dev/pci/rccide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rccide.c,v 1.12 2004/08/21 00:28:34 thorpej Exp $ */
+/* $NetBSD: rccide.c,v 1.13 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2003 By Noon Software, Inc. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rccide.c,v 1.12 2004/08/21 00:28:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rccide.c,v 1.13 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/satalink.c b/sys/dev/pci/satalink.c
index 4f4ff2f5b7b..5e8f2c864b5 100644
--- a/sys/dev/pci/satalink.c
+++ b/sys/dev/pci/satalink.c
@@ -1,4 +1,4 @@
-/* $NetBSD: satalink.c,v 1.25 2005/06/01 10:00:35 ragge Exp $ */
+/* $NetBSD: satalink.c,v 1.26 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/siop_pci.c b/sys/dev/pci/siop_pci.c
index 60e1d4b86e3..35c01bea609 100644
--- a/sys/dev/pci/siop_pci.c
+++ b/sys/dev/pci/siop_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_pci.c,v 1.18 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: siop_pci.c,v 1.19 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -32,7 +32,7 @@
/* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.18 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_pci.c,v 1.19 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/siop_pci_common.c b/sys/dev/pci/siop_pci_common.c
index 6aca980c8b7..491aea843ab 100644
--- a/sys/dev/pci/siop_pci_common.c
+++ b/sys/dev/pci/siop_pci_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_pci_common.c,v 1.25 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: siop_pci_common.c,v 1.26 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -32,7 +32,7 @@
/* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.25 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.26 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/siop_pci_common.h b/sys/dev/pci/siop_pci_common.h
index f1ffe5a22fb..e3ccd6cec26 100644
--- a/sys/dev/pci/siop_pci_common.h
+++ b/sys/dev/pci/siop_pci_common.h
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_pci_common.h,v 1.6 2005/02/27 00:27:34 perry Exp $ */
+/* $NetBSD: siop_pci_common.h,v 1.7 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
diff --git a/sys/dev/pci/siside.c b/sys/dev/pci/siside.c
index de34c547c13..81f051dbc52 100644
--- a/sys/dev/pci/siside.c
+++ b/sys/dev/pci/siside.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siside.c,v 1.17 2005/06/16 19:30:02 bouyer Exp $ */
+/* $NetBSD: siside.c,v 1.18 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siside.c,v 1.17 2005/06/16 19:30:02 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siside.c,v 1.18 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/slide.c b/sys/dev/pci/slide.c
index 4286a1a637d..a04c7909464 100644
--- a/sys/dev/pci/slide.c
+++ b/sys/dev/pci/slide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: slide.c,v 1.11 2005/05/24 05:25:15 lukem Exp $ */
+/* $NetBSD: slide.c,v 1.12 2005/12/11 12:22:50 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slide.c,v 1.11 2005/05/24 05:25:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slide.c,v 1.12 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/stpcide.c b/sys/dev/pci/stpcide.c
index c51f953e163..a10188c97c4 100644
--- a/sys/dev/pci/stpcide.c
+++ b/sys/dev/pci/stpcide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: stpcide.c,v 1.13 2005/05/24 05:25:15 lukem Exp $ */
+/* $NetBSD: stpcide.c,v 1.14 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 2003 Tohru Nishimura
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stpcide.c,v 1.13 2005/05/24 05:25:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stpcide.c,v 1.14 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/sv.c b/sys/dev/pci/sv.c
index a025a701dc0..f60db21d5e9 100644
--- a/sys/dev/pci/sv.c
+++ b/sys/dev/pci/sv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sv.c,v 1.30 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: sv.c,v 1.31 2005/12/11 12:22:50 christos Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/*
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.30 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.31 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/svreg.h b/sys/dev/pci/svreg.h
index d0b33e8b19c..f766bc85d42 100644
--- a/sys/dev/pci/svreg.h
+++ b/sys/dev/pci/svreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: svreg.h,v 1.3 2005/02/27 00:27:34 perry Exp $ */
+/* $NetBSD: svreg.h,v 1.4 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 Constantine Paul Sapuntzakis
* All rights reserved
diff --git a/sys/dev/pci/svvar.h b/sys/dev/pci/svvar.h
index 3bfda33799a..3176d8d3631 100644
--- a/sys/dev/pci/svvar.h
+++ b/sys/dev/pci/svvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: svvar.h,v 1.5 2005/02/27 00:27:34 perry Exp $ */
+/* $NetBSD: svvar.h,v 1.6 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1998 Constantine Paul Sapuntzakis
diff --git a/sys/dev/pci/tga.c b/sys/dev/pci/tga.c
index ec68c322cdd..e20f9a6eac9 100644
--- a/sys/dev/pci/tga.c
+++ b/sys/dev/pci/tga.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tga.c,v 1.60 2005/02/27 00:27:34 perry Exp $ */
+/* $NetBSD: tga.c,v 1.61 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.60 2005/02/27 00:27:34 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.61 2005/12/11 12:22:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,7 @@ unsigned tga_getdotclock(struct tga_devconfig *dc);
struct tga_devconfig tga_console_dc;
-int tga_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int tga_ioctl(void *, u_long, caddr_t, int, struct lwp *);
paddr_t tga_mmap(void *, off_t, int);
static void tga_copyrows(void *, int, int, int);
static void tga_copycols(void *, int, int, int, int);
@@ -528,12 +528,12 @@ tga_config_interrupts (d)
}
int
-tga_ioctl(v, cmd, data, flag, p)
+tga_ioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct tga_softc *sc = v;
struct tga_devconfig *dc = sc->sc_dc;
diff --git a/sys/dev/pci/tgareg.h b/sys/dev/pci/tgareg.h
index a1c35e02452..aea08218fd8 100644
--- a/sys/dev/pci/tgareg.h
+++ b/sys/dev/pci/tgareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tgareg.h,v 1.5 2005/02/27 00:27:34 perry Exp $ */
+/* $NetBSD: tgareg.h,v 1.6 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/dev/pci/tgavar.h b/sys/dev/pci/tgavar.h
index 259b2af7952..93cf20bb2a1 100644
--- a/sys/dev/pci/tgavar.h
+++ b/sys/dev/pci/tgavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tgavar.h,v 1.15 2005/06/01 18:18:52 drochner Exp $ */
+/* $NetBSD: tgavar.h,v 1.16 2005/12/11 12:22:50 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/dev/pci/trm.c b/sys/dev/pci/trm.c
index 01bc6a0137e..a01774da31d 100644
--- a/sys/dev/pci/trm.c
+++ b/sys/dev/pci/trm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trm.c,v 1.20 2005/05/30 04:35:23 christos Exp $ */
+/* $NetBSD: trm.c,v 1.21 2005/12/11 12:22:50 christos Exp $ */
/*
* Device Driver for Tekram DC395U/UW/F, DC315/U
* PCI SCSI Bus Master Host Adapter
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.20 2005/05/30 04:35:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.21 2005/12/11 12:22:50 christos Exp $");
/* #define TRM_DEBUG */
#ifdef TRM_DEBUG
diff --git a/sys/dev/pci/twe.c b/sys/dev/pci/twe.c
index 1a07b130a98..7ffa33e03c6 100644
--- a/sys/dev/pci/twe.c
+++ b/sys/dev/pci/twe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: twe.c,v 1.70 2005/08/26 11:20:33 drochner Exp $ */
+/* $NetBSD: twe.c,v 1.71 2005/12/11 12:22:51 christos Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.70 2005/08/26 11:20:33 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.71 2005/12/11 12:22:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1711,7 +1711,7 @@ twe_ccb_submit(struct twe_softc *sc, struct twe_ccb *ccb)
* Accept an open operation on the control device.
*/
static int
-tweopen(dev_t dev, int flag, int mode, struct proc *p)
+tweopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct twe_softc *twe;
@@ -1728,7 +1728,7 @@ tweopen(dev_t dev, int flag, int mode, struct proc *p)
* Accept the last close on the control device.
*/
static int
-tweclose(dev_t dev, int flag, int mode, struct proc *p)
+tweclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct twe_softc *twe;
@@ -1749,7 +1749,7 @@ twe_ccb_wait_handler(struct twe_ccb *ccb, int error)
* Handle control operations.
*/
static int
-tweioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+tweioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct twe_softc *twe;
struct twe_ccb *ccb;
diff --git a/sys/dev/pci/tweio.h b/sys/dev/pci/tweio.h
index 0f9f5d7dd0c..5db26b666ec 100644
--- a/sys/dev/pci/tweio.h
+++ b/sys/dev/pci/tweio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tweio.h,v 1.4 2003/09/25 18:05:40 thorpej Exp $ */
+/* $NetBSD: tweio.h,v 1.5 2005/12/11 12:22:51 christos Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
diff --git a/sys/dev/pci/twereg.h b/sys/dev/pci/twereg.h
index 76f3944be4c..2d1b7f2b984 100644
--- a/sys/dev/pci/twereg.h
+++ b/sys/dev/pci/twereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: twereg.h,v 1.11 2005/02/15 05:56:34 lukem Exp $ */
+/* $NetBSD: twereg.h,v 1.12 2005/12/11 12:22:51 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/twevar.h b/sys/dev/pci/twevar.h
index 41fdde7ea3b..22a091253bf 100644
--- a/sys/dev/pci/twevar.h
+++ b/sys/dev/pci/twevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: twevar.h,v 1.22 2004/09/13 12:55:48 drochner Exp $ */
+/* $NetBSD: twevar.h,v 1.23 2005/12/11 12:22:51 christos Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pci/ubsecreg.h b/sys/dev/pci/ubsecreg.h
index 0612b726a10..0bc13a8a471 100644
--- a/sys/dev/pci/ubsecreg.h
+++ b/sys/dev/pci/ubsecreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsecreg.h,v 1.1 2003/08/01 00:08:55 jonathan Exp $ */
+/* $NetBSD: ubsecreg.h,v 1.2 2005/12/11 12:22:51 christos Exp $ */
/* $OpenBSD: ubsecreg.h,v 1.28 2003/06/04 16:02:41 jason Exp $ */
/*
diff --git a/sys/dev/pci/ubsecvar.h b/sys/dev/pci/ubsecvar.h
index c7cc649ae44..994aec51280 100644
--- a/sys/dev/pci/ubsecvar.h
+++ b/sys/dev/pci/ubsecvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsecvar.h,v 1.1 2003/08/01 00:08:56 jonathan Exp $ */
+/* $NetBSD: ubsecvar.h,v 1.2 2005/12/11 12:22:51 christos Exp $ */
/* $OpenBSD: ubsecvar.h,v 1.36 2003/06/04 16:02:41 jason Exp $ */
/*
diff --git a/sys/dev/pci/uhci_pci.c b/sys/dev/pci/uhci_pci.c
index ed78b4b5a1c..954b6bdf60c 100644
--- a/sys/dev/pci/uhci_pci.c
+++ b/sys/dev/pci/uhci_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_pci.c,v 1.29 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: uhci_pci.c,v 1.30 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.29 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.30 2005/12/11 12:22:51 christos Exp $");
#include "ehci.h"
diff --git a/sys/dev/pci/universe_pci.c b/sys/dev/pci/universe_pci.c
index 1822a5ac4fa..9b764542c44 100644
--- a/sys/dev/pci/universe_pci.c
+++ b/sys/dev/pci/universe_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: universe_pci.c,v 1.6 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: universe_pci.c,v 1.7 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 1999
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.6 2005/02/04 02:10:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.7 2005/12/11 12:22:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/universe_pci_var.h b/sys/dev/pci/universe_pci_var.h
index ffd436444f9..778830670f6 100644
--- a/sys/dev/pci/universe_pci_var.h
+++ b/sys/dev/pci/universe_pci_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: universe_pci_var.h,v 1.3 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: universe_pci_var.h,v 1.4 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 1999
diff --git a/sys/dev/pci/usb_pci.c b/sys/dev/pci/usb_pci.c
index 353fe923280..c6e58be28da 100644
--- a/sys/dev/pci/usb_pci.c
+++ b/sys/dev/pci/usb_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_pci.c,v 1.4 2004/12/21 16:41:24 fvdl Exp $ */
+/* $NetBSD: usb_pci.c,v 1.5 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_pci.c,v 1.4 2004/12/21 16:41:24 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_pci.c,v 1.5 2005/12/11 12:22:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/vga_pci.c b/sys/dev/pci/vga_pci.c
index 4a44d5bfd24..4105d3b86dc 100644
--- a/sys/dev/pci/vga_pci.c
+++ b/sys/dev/pci/vga_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_pci.c,v 1.27 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: vga_pci.c,v 1.28 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.27 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_pci.c,v 1.28 2005/12/11 12:22:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -78,7 +78,7 @@ static int vga_pci_lookup_quirks(struct pci_attach_args *);
CFATTACH_DECL(vga_pci, sizeof(struct vga_pci_softc),
vga_pci_match, vga_pci_attach, NULL, NULL);
-static int vga_pci_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int vga_pci_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t vga_pci_mmap(void *, off_t, int);
static const struct vga_funcs vga_pci_funcs = {
@@ -224,7 +224,7 @@ vga_pci_cnattach(bus_space_tag_t iot, bus_space_tag_t memt,
}
static int
-vga_pci_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+vga_pci_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct vga_config *vc = v;
struct vga_pci_softc *psc = (void *) vc->softc;
@@ -234,7 +234,7 @@ vga_pci_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
case PCI_IOC_CFGREAD:
case PCI_IOC_CFGWRITE:
return (pci_devioctl(psc->sc_pc, psc->sc_pcitag,
- cmd, data, flag, p));
+ cmd, data, flag, l));
default:
return (EPASSTHROUGH);
diff --git a/sys/dev/pci/vga_pcivar.h b/sys/dev/pci/vga_pcivar.h
index 9c7535ab8d9..bfa807db806 100644
--- a/sys/dev/pci/vga_pcivar.h
+++ b/sys/dev/pci/vga_pcivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_pcivar.h,v 1.3 2005/02/27 00:27:34 perry Exp $ */
+/* $NetBSD: vga_pcivar.h,v 1.4 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/dev/pci/viaenv.c b/sys/dev/pci/viaenv.c
index 89dc5e13f4f..5616b6910af 100644
--- a/sys/dev/pci/viaenv.c
+++ b/sys/dev/pci/viaenv.c
@@ -1,4 +1,4 @@
-/* $NetBSD: viaenv.c,v 1.12 2005/10/23 14:01:36 jmcneill Exp $ */
+/* $NetBSD: viaenv.c,v 1.13 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -35,7 +35,7 @@
/* driver for the hardware monitoring part of the VIA VT82C686A */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.12 2005/10/23 14:01:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.13 2005/12/11 12:22:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/viaide.c b/sys/dev/pci/viaide.c
index 9de28d9dce8..bc347ecca93 100644
--- a/sys/dev/pci/viaide.c
+++ b/sys/dev/pci/viaide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: viaide.c,v 1.25 2005/05/24 05:25:15 lukem Exp $ */
+/* $NetBSD: viaide.c,v 1.26 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.25 2005/05/24 05:25:15 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.26 2005/12/11 12:22:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/viapm.c b/sys/dev/pci/viapm.c
index 01582c77b4f..e2e7d257fa0 100644
--- a/sys/dev/pci/viapm.c
+++ b/sys/dev/pci/viapm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: viapm.c,v 1.13 2004/09/14 18:57:35 drochner Exp $ */
+/* $NetBSD: viapm.c,v 1.14 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viapm.c,v 1.13 2004/09/14 18:57:35 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viapm.c,v 1.14 2005/12/11 12:22:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/viapmvar.h b/sys/dev/pci/viapmvar.h
index 78835f3ab86..b8b6b892788 100644
--- a/sys/dev/pci/viapmvar.h
+++ b/sys/dev/pci/viapmvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: viapmvar.h,v 1.3 2005/02/27 00:27:34 perry Exp $ */
+/* $NetBSD: viapmvar.h,v 1.4 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
diff --git a/sys/dev/pci/weasel_pci.c b/sys/dev/pci/weasel_pci.c
index 2ad64b8e554..dc66d282c57 100644
--- a/sys/dev/pci/weasel_pci.c
+++ b/sys/dev/pci/weasel_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: weasel_pci.c,v 1.6 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: weasel_pci.c,v 1.7 2005/12/11 12:22:51 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: weasel_pci.c,v 1.6 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: weasel_pci.c,v 1.7 2005/12/11 12:22:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pci/yds.c b/sys/dev/pci/yds.c
index 6c87636d1b5..54f0da30b58 100644
--- a/sys/dev/pci/yds.c
+++ b/sys/dev/pci/yds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: yds.c,v 1.29 2005/06/28 00:28:42 thorpej Exp $ */
+/* $NetBSD: yds.c,v 1.30 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.29 2005/06/28 00:28:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.30 2005/12/11 12:22:51 christos Exp $");
#include "mpu.h"
diff --git a/sys/dev/pci/ydsreg.h b/sys/dev/pci/ydsreg.h
index 81ee9544541..9b3788605df 100644
--- a/sys/dev/pci/ydsreg.h
+++ b/sys/dev/pci/ydsreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ydsreg.h,v 1.5 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: ydsreg.h,v 1.6 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
diff --git a/sys/dev/pci/ydsvar.h b/sys/dev/pci/ydsvar.h
index f436ecddae1..ec46ad2273e 100644
--- a/sys/dev/pci/ydsvar.h
+++ b/sys/dev/pci/ydsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ydsvar.h,v 1.5 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: ydsvar.h,v 1.6 2005/12/11 12:22:51 christos Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
diff --git a/sys/dev/pckbport/Makefile b/sys/dev/pckbport/Makefile
index 546a71a219a..be3eceb4f4c 100644
--- a/sys/dev/pckbport/Makefile
+++ b/sys/dev/pckbport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2004/03/13 17:31:33 bjh21 Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/11 12:23:22 christos Exp $
# This is arguably wrong, but it's where it's been installed historically.
INCSDIR= /usr/include/dev/pckbc
diff --git a/sys/dev/pckbport/files.pckbport b/sys/dev/pckbport/files.pckbport
index bef1993840e..5146c9cb45c 100644
--- a/sys/dev/pckbport/files.pckbport
+++ b/sys/dev/pckbport/files.pckbport
@@ -1,4 +1,4 @@
-# $NetBSD: files.pckbport,v 1.4 2005/05/04 02:35:22 augustss Exp $
+# $NetBSD: files.pckbport,v 1.5 2005/12/11 12:23:22 christos Exp $
# devices attached at pckbport, for use with wscons
file dev/pckbport/pckbport.c pckbport | pckbport_machdep_cnattach
diff --git a/sys/dev/pckbport/pckbd.c b/sys/dev/pckbport/pckbd.c
index e002280ab03..bd4f53079f8 100644
--- a/sys/dev/pckbport/pckbd.c
+++ b/sys/dev/pckbport/pckbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbd.c,v 1.8 2005/05/29 22:16:36 christos Exp $ */
+/* $NetBSD: pckbd.c,v 1.9 2005/12/11 12:23:22 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.8 2005/05/29 22:16:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.9 2005/12/11 12:23:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -138,7 +138,7 @@ CFATTACH_DECL(pckbd, sizeof(struct pckbd_softc),
int pckbd_enable(void *, int);
void pckbd_set_leds(void *, int);
-int pckbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int pckbd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
const struct wskbd_accessops pckbd_accessops = {
pckbd_enable,
@@ -536,7 +536,7 @@ pckbd_input(void *vsc, int data)
}
int
-pckbd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+pckbd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct pckbd_softc *sc = v;
diff --git a/sys/dev/pckbport/pckbdreg.h b/sys/dev/pckbport/pckbdreg.h
index 818a48f0121..12e18e6f167 100644
--- a/sys/dev/pckbport/pckbdreg.h
+++ b/sys/dev/pckbport/pckbdreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbdreg.h,v 1.1 2004/03/13 17:31:33 bjh21 Exp $ */
+/* $NetBSD: pckbdreg.h,v 1.2 2005/12/11 12:23:22 christos Exp $ */
/*
* Keyboard definitions
diff --git a/sys/dev/pckbport/pckbdvar.h b/sys/dev/pckbport/pckbdvar.h
index 104b050bef7..bf8bda4fd79 100644
--- a/sys/dev/pckbport/pckbdvar.h
+++ b/sys/dev/pckbport/pckbdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbdvar.h,v 1.2 2004/03/18 21:05:19 bjh21 Exp $ */
+/* $NetBSD: pckbdvar.h,v 1.3 2005/12/11 12:23:22 christos Exp $ */
#include <dev/pckbport/pckbportvar.h>
diff --git a/sys/dev/pckbport/pckbport.c b/sys/dev/pckbport/pckbport.c
index c3711d7bf94..7abd0e085fc 100644
--- a/sys/dev/pckbport/pckbport.c
+++ b/sys/dev/pckbport/pckbport.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbport.c,v 1.6 2005/08/25 22:33:19 drochner Exp $ */
+/* $NetBSD: pckbport.c,v 1.7 2005/12/11 12:23:22 christos Exp $ */
/*
* Copyright (c) 2004 Ben Harris
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbport.c,v 1.6 2005/08/25 22:33:19 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbport.c,v 1.7 2005/12/11 12:23:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pckbport/pckbportvar.h b/sys/dev/pckbport/pckbportvar.h
index 04d81e287da..30c2715b047 100644
--- a/sys/dev/pckbport/pckbportvar.h
+++ b/sys/dev/pckbport/pckbportvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbportvar.h,v 1.5 2005/04/22 14:49:49 yamt Exp $ */
+/* $NetBSD: pckbportvar.h,v 1.6 2005/12/11 12:23:22 christos Exp $ */
/*
* Copyright (c) 2004 Ben Harris
diff --git a/sys/dev/pckbport/pms.c b/sys/dev/pckbport/pms.c
index f28f72dd437..74f7b5a62a1 100644
--- a/sys/dev/pckbport/pms.c
+++ b/sys/dev/pckbport/pms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.8 2005/11/08 22:12:16 rpaulo Exp $ */
+/* $NetBSD: pms.c,v 1.9 2005/12/11 12:23:22 christos Exp $ */
/*-
* Copyright (c) 2004 Kentaro Kurahone.
@@ -28,7 +28,7 @@
#include "opt_pms.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.8 2005/11/08 22:12:16 rpaulo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.9 2005/12/11 12:23:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,7 +84,7 @@ static void do_disable(struct pms_softc *);
static void pms_reset_thread(void*);
static void pms_spawn_reset_thread(void*);
int pms_enable(void *);
-int pms_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int pms_ioctl(void *, u_long, caddr_t, int, struct lwp *);
void pms_disable(void *);
#ifndef PMS_DISABLE_POWERHOOK
void pms_power(int, void *);
@@ -371,7 +371,7 @@ pms_power(int why, void *v)
#endif /* !PMS_DISABLE_POWERHOOK */
int
-pms_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+pms_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct pms_softc *sc = v;
u_char kbcmd[2];
diff --git a/sys/dev/pckbport/pmsreg.h b/sys/dev/pckbport/pmsreg.h
index 5918618e806..e752ef5a695 100644
--- a/sys/dev/pckbport/pmsreg.h
+++ b/sys/dev/pckbport/pmsreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pmsreg.h,v 1.1 2004/03/13 17:31:33 bjh21 Exp $ */
+/* $NetBSD: pmsreg.h,v 1.2 2005/12/11 12:23:22 christos Exp $ */
/* mouse commands */
#define PMS_SET_SCALE11 0xe6 /* set scaling 1:1 */
diff --git a/sys/dev/pckbport/pmsvar.h b/sys/dev/pckbport/pmsvar.h
index 0cb16d86ce6..90a6093721c 100644
--- a/sys/dev/pckbport/pmsvar.h
+++ b/sys/dev/pckbport/pmsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pmsvar.h,v 1.3 2005/02/27 00:27:42 perry Exp $ */
+/* $NetBSD: pmsvar.h,v 1.4 2005/12/11 12:23:22 christos Exp $ */
/*-
* Copyright (c) 2004 Kentaro Kurahone.
diff --git a/sys/dev/pckbport/synaptics.c b/sys/dev/pckbport/synaptics.c
index 2e53cea32d0..fbebe3be426 100644
--- a/sys/dev/pckbport/synaptics.c
+++ b/sys/dev/pckbport/synaptics.c
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.7 2005/10/26 17:20:19 rpaulo Exp $ */
+/* $NetBSD: synaptics.c,v 1.8 2005/12/11 12:23:22 christos Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
diff --git a/sys/dev/pckbport/synapticsreg.h b/sys/dev/pckbport/synapticsreg.h
index 5d5fbf27ead..6851b8d3b55 100644
--- a/sys/dev/pckbport/synapticsreg.h
+++ b/sys/dev/pckbport/synapticsreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: synapticsreg.h,v 1.3 2005/02/27 00:27:42 perry Exp $ */
+/* $NetBSD: synapticsreg.h,v 1.4 2005/12/11 12:23:22 christos Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
diff --git a/sys/dev/pckbport/synapticsvar.h b/sys/dev/pckbport/synapticsvar.h
index 741ac6089dd..6f96aa5a755 100644
--- a/sys/dev/pckbport/synapticsvar.h
+++ b/sys/dev/pckbport/synapticsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: synapticsvar.h,v 1.3 2005/02/27 00:27:42 perry Exp $ */
+/* $NetBSD: synapticsvar.h,v 1.4 2005/12/11 12:23:22 christos Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
diff --git a/sys/dev/pckbport/wskbdmap_mfii.c b/sys/dev/pckbport/wskbdmap_mfii.c
index bed42a529f5..e69f06efbc6 100644
--- a/sys/dev/pckbport/wskbdmap_mfii.c
+++ b/sys/dev/pckbport/wskbdmap_mfii.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_mfii.c,v 1.9 2005/05/05 22:31:13 abs Exp $ */
+/* $NetBSD: wskbdmap_mfii.c,v 1.10 2005/12/11 12:23:22 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.9 2005/05/05 22:31:13 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.10 2005/12/11 12:23:22 christos Exp $");
#include <sys/types.h>
#include <dev/wscons/wsksymdef.h>
diff --git a/sys/dev/pckbport/wskbdmap_mfii.h b/sys/dev/pckbport/wskbdmap_mfii.h
index 90aa98d7fc3..39dab166ea0 100644
--- a/sys/dev/pckbport/wskbdmap_mfii.h
+++ b/sys/dev/pckbport/wskbdmap_mfii.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_mfii.h,v 1.1 2004/03/13 17:31:33 bjh21 Exp $ */
+/* $NetBSD: wskbdmap_mfii.h,v 1.2 2005/12/11 12:23:22 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c
index 81e5ca58121..e43a8b53f07 100644
--- a/sys/dev/pcmcia/aic_pcmcia.c
+++ b/sys/dev/pcmcia/aic_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic_pcmcia.c,v 1.32 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: aic_pcmcia.c,v 1.33 2005/12/11 12:23:22 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.32 2005/02/04 02:10:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.33 2005/12/11 12:23:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index 766d2bf7a3f..dde82e2571e 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: com_pcmcia.c,v 1.50 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: com_pcmcia.c,v 1.51 2005/12/11 12:23:22 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.50 2005/02/04 02:10:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_pcmcia.c,v 1.51 2005/12/11 12:23:22 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/devlist2h.awk b/sys/dev/pcmcia/devlist2h.awk
index 48ec5a1edf8..fbd56a91934 100644
--- a/sys/dev/pcmcia/devlist2h.awk
+++ b/sys/dev/pcmcia/devlist2h.awk
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: devlist2h.awk,v 1.10 2005/02/27 15:29:09 perry Exp $
+# $NetBSD: devlist2h.awk,v 1.11 2005/12/11 12:23:23 christos Exp $
#
# Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
# All rights reserved.
diff --git a/sys/dev/pcmcia/esl.c b/sys/dev/pcmcia/esl.c
index b2e4be46ed3..a4a5475df85 100644
--- a/sys/dev/pcmcia/esl.c
+++ b/sys/dev/pcmcia/esl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esl.c,v 1.17 2005/05/31 19:25:18 drochner Exp $ */
+/* $NetBSD: esl.c,v 1.18 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 2001 Jared D. McNeill <jmcneill@invisible.ca>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esl.c,v 1.17 2005/05/31 19:25:18 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esl.c,v 1.18 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/esl_pcmcia.c b/sys/dev/pcmcia/esl_pcmcia.c
index 86f91efb40c..dc99b383ad7 100644
--- a/sys/dev/pcmcia/esl_pcmcia.c
+++ b/sys/dev/pcmcia/esl_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esl_pcmcia.c,v 1.14 2005/03/24 22:34:39 jmcneill Exp $ */
+/* $NetBSD: esl_pcmcia.c,v 1.15 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 2000 Jared D. McNeill <jmcneill@invisible.ca>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esl_pcmcia.c,v 1.14 2005/03/24 22:34:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esl_pcmcia.c,v 1.15 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/eslvar.h b/sys/dev/pcmcia/eslvar.h
index 3667124b740..69a482d0811 100644
--- a/sys/dev/pcmcia/eslvar.h
+++ b/sys/dev/pcmcia/eslvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: eslvar.h,v 1.7 2005/03/24 22:34:39 jmcneill Exp $ */
+/* $NetBSD: eslvar.h,v 1.8 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 2001 Jared D. McNeill <jmcneill@invisible.ca>
diff --git a/sys/dev/pcmcia/esp_pcmcia.c b/sys/dev/pcmcia/esp_pcmcia.c
index edfea722be9..bb8282ade56 100644
--- a/sys/dev/pcmcia/esp_pcmcia.c
+++ b/sys/dev/pcmcia/esp_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_pcmcia.c,v 1.26 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: esp_pcmcia.c,v 1.27 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.26 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_pcmcia.c,v 1.27 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/fdc_pcmcia.c b/sys/dev/pcmcia/fdc_pcmcia.c
index 3d8ba817883..0c584284209 100644
--- a/sys/dev/pcmcia/fdc_pcmcia.c
+++ b/sys/dev/pcmcia/fdc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_pcmcia.c,v 1.16 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: fdc_pcmcia.c,v 1.17 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.16 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_pcmcia.c,v 1.17 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/files.pcmcia b/sys/dev/pcmcia/files.pcmcia
index c3bf5470b70..b4bfd0ef096 100644
--- a/sys/dev/pcmcia/files.pcmcia
+++ b/sys/dev/pcmcia/files.pcmcia
@@ -1,4 +1,4 @@
-# $NetBSD: files.pcmcia,v 1.46 2004/08/08 05:56:08 mycroft Exp $
+# $NetBSD: files.pcmcia,v 1.47 2005/12/11 12:23:23 christos Exp $
#
# Config.new file and device description for machine-independent PCMCIA code.
# Included by ports that need it.
diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c
index 1a31b6a264d..48d14a5542f 100644
--- a/sys/dev/pcmcia/if_an_pcmcia.c
+++ b/sys/dev/pcmcia/if_an_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pcmcia.c,v 1.27 2005/06/22 06:16:02 dyoung Exp $ */
+/* $NetBSD: if_an_pcmcia.c,v 1.28 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.27 2005/06/22 06:16:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pcmcia.c,v 1.28 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/if_awi_pcmcia.c b/sys/dev/pcmcia/if_awi_pcmcia.c
index 079d31eb6f9..4c2b509e150 100644
--- a/sys/dev/pcmcia/if_awi_pcmcia.c
+++ b/sys/dev/pcmcia/if_awi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_awi_pcmcia.c,v 1.34 2005/06/22 06:16:02 dyoung Exp $ */
+/* $NetBSD: if_awi_pcmcia.c,v 1.35 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 1999, 2004 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.34 2005/06/22 06:16:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.35 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/if_cnw.c b/sys/dev/pcmcia/if_cnw.c
index 5416e0d419a..fc4aaae0e6c 100644
--- a/sys/dev/pcmcia/if_cnw.c
+++ b/sys/dev/pcmcia/if_cnw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnw.c,v 1.31 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: if_cnw.c,v 1.32 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -112,7 +112,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.31 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cnw.c,v 1.32 2005/12/11 12:23:23 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/pcmcia/if_cnwioctl.h b/sys/dev/pcmcia/if_cnwioctl.h
index f11f1f61c18..0c85de4a3a5 100644
--- a/sys/dev/pcmcia/if_cnwioctl.h
+++ b/sys/dev/pcmcia/if_cnwioctl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnwioctl.h,v 1.3 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: if_cnwioctl.h,v 1.4 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Berkeley Software Design, Inc.
diff --git a/sys/dev/pcmcia/if_cnwreg.h b/sys/dev/pcmcia/if_cnwreg.h
index 065dd88ce6f..fa38c8220bf 100644
--- a/sys/dev/pcmcia/if_cnwreg.h
+++ b/sys/dev/pcmcia/if_cnwreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cnwreg.h,v 1.4 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: if_cnwreg.h,v 1.5 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/pcmcia/if_cs_pcmcia.c b/sys/dev/pcmcia/if_cs_pcmcia.c
index bc79dae6627..81d84f5fd2f 100644
--- a/sys/dev/pcmcia/if_cs_pcmcia.c
+++ b/sys/dev/pcmcia/if_cs_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs_pcmcia.c,v 1.11 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: if_cs_pcmcia.c,v 1.12 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c)2001 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.11 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs_pcmcia.c,v 1.12 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index f346e53bac1..5eb48b467bd 100644
--- a/sys/dev/pcmcia/if_ep_pcmcia.c
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_pcmcia.c,v 1.53 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: if_ep_pcmcia.c,v 1.54 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.53 2005/02/04 02:10:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_pcmcia.c,v 1.54 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/if_mbe_pcmcia.c b/sys/dev/pcmcia/if_mbe_pcmcia.c
index 9b349db64c6..014cc817345 100644
--- a/sys/dev/pcmcia/if_mbe_pcmcia.c
+++ b/sys/dev/pcmcia/if_mbe_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mbe_pcmcia.c,v 1.37 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: if_mbe_pcmcia.c,v 1.38 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.37 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mbe_pcmcia.c,v 1.38 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index 9c4a9b944cc..d867d63e439 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pcmcia.c,v 1.140 2005/05/30 04:28:49 christos Exp $ */
+/* $NetBSD: if_ne_pcmcia.c,v 1.141 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.140 2005/05/30 04:28:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pcmcia.c,v 1.141 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c
index 50bd3610c55..cda4f652785 100644
--- a/sys/dev/pcmcia/if_ray.c
+++ b/sys/dev/pcmcia/if_ray.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ray.c,v 1.58 2005/09/08 18:41:50 christos Exp $ */
+/* $NetBSD: if_ray.c,v 1.59 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.58 2005/09/08 18:41:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.59 2005/12/11 12:23:23 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/pcmcia/if_rayreg.h b/sys/dev/pcmcia/if_rayreg.h
index ebfac8ee961..d8220dd66b2 100644
--- a/sys/dev/pcmcia/if_rayreg.h
+++ b/sys/dev/pcmcia/if_rayreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rayreg.h,v 1.8 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: if_rayreg.h,v 1.9 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 2000 Christian E. Hopps
* All rights reserved.
diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c
index 3a2d05acf18..6b7fed5c2c3 100644
--- a/sys/dev/pcmcia/if_sm_pcmcia.c
+++ b/sys/dev/pcmcia/if_sm_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sm_pcmcia.c,v 1.45 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: if_sm_pcmcia.c,v 1.46 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.45 2005/02/04 02:10:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_pcmcia.c,v 1.46 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/if_tr_pcmcia.c b/sys/dev/pcmcia/if_tr_pcmcia.c
index 388d92b2ef0..46e660a88a7 100644
--- a/sys/dev/pcmcia/if_tr_pcmcia.c
+++ b/sys/dev/pcmcia/if_tr_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tr_pcmcia.c,v 1.15 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: if_tr_pcmcia.c,v 1.16 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.15 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.16 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index 3a737b58dcc..7453c1440bc 100644
--- a/sys/dev/pcmcia/if_wi_pcmcia.c
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.67 2005/07/06 07:16:00 dyoung Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.68 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.67 2005/07/06 07:16:00 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.68 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/if_xi.c b/sys/dev/pcmcia/if_xi.c
index 4b225e63484..04bacfc08c0 100644
--- a/sys/dev/pcmcia/if_xi.c
+++ b/sys/dev/pcmcia/if_xi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xi.c,v 1.52 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: if_xi.c,v 1.53 2005/12/11 12:23:23 christos Exp $ */
/* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */
/*
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.52 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.53 2005/12/11 12:23:23 christos Exp $");
#include "opt_inet.h"
#include "opt_ipx.h"
diff --git a/sys/dev/pcmcia/if_xireg.h b/sys/dev/pcmcia/if_xireg.h
index 5f9c21576c8..2659b8e07cf 100644
--- a/sys/dev/pcmcia/if_xireg.h
+++ b/sys/dev/pcmcia/if_xireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xireg.h,v 1.7 2004/08/12 19:42:03 mycroft Exp $ */
+/* $NetBSD: if_xireg.h,v 1.8 2005/12/11 12:23:23 christos Exp $ */
/* OpenBSD: if_xereg.h,v 1.1 1999/05/18 19:18:21 niklas Exp */
/*
diff --git a/sys/dev/pcmcia/if_xivar.h b/sys/dev/pcmcia/if_xivar.h
index 16b29244b45..46a5724afec 100644
--- a/sys/dev/pcmcia/if_xivar.h
+++ b/sys/dev/pcmcia/if_xivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xivar.h,v 1.3 2005/02/04 02:10:45 perry Exp $ */
+/* $NetBSD: if_xivar.h,v 1.4 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
diff --git a/sys/dev/pcmcia/isic_pcmcia.c b/sys/dev/pcmcia/isic_pcmcia.c
index bec2f37df7f..1a83b69d4be 100644
--- a/sys/dev/pcmcia/isic_pcmcia.c
+++ b/sys/dev/pcmcia/isic_pcmcia.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.28 2005/07/01 15:05:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia.c,v 1.29 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
diff --git a/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c b/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c
index 62cd677bcfd..e358a277bcb 100644
--- a/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c
+++ b/sys/dev/pcmcia/isic_pcmcia_avm_fritz.c
@@ -33,7 +33,7 @@
* Fritz!Card pcmcia specific routines for isic driver
* ---------------------------------------------------
*
- * $Id: isic_pcmcia_avm_fritz.c,v 1.9 2005/07/01 15:05:07 martin Exp $
+ * $Id: isic_pcmcia_avm_fritz.c,v 1.10 2005/12/11 12:23:23 christos Exp $
*
* last edit-date: [Fri Jan 5 11:39:32 2001]
*
@@ -43,7 +43,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_avm_fritz.c,v 1.9 2005/07/01 15:05:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_avm_fritz.c,v 1.10 2005/12/11 12:23:23 christos Exp $");
#include "opt_isicpcmcia.h"
#ifdef ISICPCMCIA_AVM_A1
diff --git a/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c b/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c
index cdd2144fc35..7cf7b55ee6b 100644
--- a/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c
+++ b/sys/dev/pcmcia/isic_pcmcia_elsa_isdnmc.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_isdnmc.c,v 1.10 2005/07/01 15:05:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_isdnmc.c,v 1.11 2005/12/11 12:23:23 christos Exp $");
#include "opt_isicpcmcia.h"
#ifdef ISICPCMCIA_ELSA_ISDNMC
diff --git a/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c b/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c
index 3428d05f381..8de16bd6277 100644
--- a/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c
+++ b/sys/dev/pcmcia/isic_pcmcia_elsa_mcall.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_mcall.c,v 1.9 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_elsa_mcall.c,v 1.10 2005/12/11 12:23:23 christos Exp $");
#include "opt_isicpcmcia.h"
#ifdef ISICPCMCIA_ELSA_MCALL
diff --git a/sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c b/sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c
index 0185a493738..21b9965780a 100644
--- a/sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c
+++ b/sys/dev/pcmcia/isic_pcmcia_sbspeedstar2.c
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_sbspeedstar2.c,v 1.9 2005/07/09 02:05:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isic_pcmcia_sbspeedstar2.c,v 1.10 2005/12/11 12:23:23 christos Exp $");
#include "opt_isicpcmcia.h"
#ifdef ISICPCMCIA_SBSPEEDSTAR2
diff --git a/sys/dev/pcmcia/mhzc.c b/sys/dev/pcmcia/mhzc.c
index 4195beae401..8c94839f770 100644
--- a/sys/dev/pcmcia/mhzc.c
+++ b/sys/dev/pcmcia/mhzc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mhzc.c,v 1.33 2005/10/06 20:54:31 jdc Exp $ */
+/* $NetBSD: mhzc.c,v 1.34 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.33 2005/10/06 20:54:31 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mhzc.c,v 1.34 2005/12/11 12:23:23 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/pcmcia/nca_pcmcia.c b/sys/dev/pcmcia/nca_pcmcia.c
index 840c7685268..81a574a425d 100644
--- a/sys/dev/pcmcia/nca_pcmcia.c
+++ b/sys/dev/pcmcia/nca_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nca_pcmcia.c,v 1.20 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: nca_pcmcia.c,v 1.21 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nca_pcmcia.c,v 1.20 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nca_pcmcia.c,v 1.21 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/opl_esl.c b/sys/dev/pcmcia/opl_esl.c
index 03bad4e857e..ffc843a3033 100644
--- a/sys/dev/pcmcia/opl_esl.c
+++ b/sys/dev/pcmcia/opl_esl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opl_esl.c,v 1.10 2005/03/24 22:34:39 jmcneill Exp $ */
+/* $NetBSD: opl_esl.c,v 1.11 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 2001 Jared D. McNeill <jmcneill@invisible.ca>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opl_esl.c,v 1.10 2005/03/24 22:34:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opl_esl.c,v 1.11 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index ee274c4a62b..0cf5af1b0c0 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia.c,v 1.77 2005/08/26 11:01:43 drochner Exp $ */
+/* $NetBSD: pcmcia.c,v 1.78 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 2004 Charles M. Hannum. All rights reserved.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.77 2005/08/26 11:01:43 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia.c,v 1.78 2005/12/11 12:23:23 christos Exp $");
#include "opt_pcmciaverbose.h"
diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c
index b5e360d5b77..d1e989dfd72 100644
--- a/sys/dev/pcmcia/pcmcia_cis.c
+++ b/sys/dev/pcmcia/pcmcia_cis.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia_cis.c,v 1.39 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: pcmcia_cis.c,v 1.40 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.39 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis.c,v 1.40 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/pcmcia_cis_quirks.c b/sys/dev/pcmcia/pcmcia_cis_quirks.c
index 3340fd7ebd6..8d1d30d56de 100644
--- a/sys/dev/pcmcia/pcmcia_cis_quirks.c
+++ b/sys/dev/pcmcia/pcmcia_cis_quirks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia_cis_quirks.c,v 1.25 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: pcmcia_cis_quirks.c,v 1.26 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 1998 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis_quirks.c,v 1.25 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcia_cis_quirks.c,v 1.26 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/pcmciachip.h b/sys/dev/pcmcia/pcmciachip.h
index 450ab53fc75..d63c55a5f16 100644
--- a/sys/dev/pcmcia/pcmciachip.h
+++ b/sys/dev/pcmcia/pcmciachip.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciachip.h,v 1.12 2005/05/30 04:28:49 christos Exp $ */
+/* $NetBSD: pcmciachip.h,v 1.13 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
diff --git a/sys/dev/pcmcia/pcmciadevs b/sys/dev/pcmcia/pcmciadevs
index 195461c73d5..504ee7ff066 100644
--- a/sys/dev/pcmcia/pcmciadevs
+++ b/sys/dev/pcmcia/pcmciadevs
@@ -1,4 +1,4 @@
-$NetBSD: pcmciadevs,v 1.213 2005/11/07 16:37:28 tsutsui Exp $
+$NetBSD: pcmciadevs,v 1.214 2005/12/11 12:23:23 christos Exp $
/* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
/*-
diff --git a/sys/dev/pcmcia/pcmciadevs.h b/sys/dev/pcmcia/pcmciadevs.h
index 58e0feb003c..68684a7c7f0 100644
--- a/sys/dev/pcmcia/pcmciadevs.h
+++ b/sys/dev/pcmcia/pcmciadevs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciadevs.h,v 1.215 2005/11/07 16:39:16 tsutsui Exp $ */
+/* $NetBSD: pcmciadevs.h,v 1.216 2005/12/11 12:23:23 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
diff --git a/sys/dev/pcmcia/pcmciadevs_data.h b/sys/dev/pcmcia/pcmciadevs_data.h
index 11d13351d06..005fc6de7f0 100644
--- a/sys/dev/pcmcia/pcmciadevs_data.h
+++ b/sys/dev/pcmcia/pcmciadevs_data.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciadevs_data.h,v 1.215 2005/11/07 16:39:16 tsutsui Exp $ */
+/* $NetBSD: pcmciadevs_data.h,v 1.216 2005/12/11 12:23:23 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
diff --git a/sys/dev/pcmcia/pcmciareg.h b/sys/dev/pcmcia/pcmciareg.h
index 19ed3b5ae37..4dfd9c90bd5 100644
--- a/sys/dev/pcmcia/pcmciareg.h
+++ b/sys/dev/pcmcia/pcmciareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciareg.h,v 1.9 2004/08/12 16:04:20 mycroft Exp $ */
+/* $NetBSD: pcmciareg.h,v 1.10 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
diff --git a/sys/dev/pcmcia/pcmciavar.h b/sys/dev/pcmcia/pcmciavar.h
index a0cb1b96bb5..aed45d626b8 100644
--- a/sys/dev/pcmcia/pcmciavar.h
+++ b/sys/dev/pcmcia/pcmciavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmciavar.h,v 1.30 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: pcmciavar.h,v 1.31 2005/12/11 12:23:23 christos Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
diff --git a/sys/dev/pcmcia/pcmcom.c b/sys/dev/pcmcia/pcmcom.c
index a40b1e75dfd..42264b7a407 100644
--- a/sys/dev/pcmcia/pcmcom.c
+++ b/sys/dev/pcmcia/pcmcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcom.c,v 1.24 2005/08/26 11:20:34 drochner Exp $ */
+/* $NetBSD: pcmcom.c,v 1.25 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.24 2005/08/26 11:20:34 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcmcom.c,v 1.25 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/spc_pcmcia.c b/sys/dev/pcmcia/spc_pcmcia.c
index 36ae5a9c786..273006b4bc1 100644
--- a/sys/dev/pcmcia/spc_pcmcia.c
+++ b/sys/dev/pcmcia/spc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spc_pcmcia.c,v 1.14 2005/02/27 00:27:43 perry Exp $ */
+/* $NetBSD: spc_pcmcia.c,v 1.15 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 2000, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spc_pcmcia.c,v 1.14 2005/02/27 00:27:43 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spc_pcmcia.c,v 1.15 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c
index 6d346cbc70d..f9884cb4279 100644
--- a/sys/dev/pcmcia/wdc_pcmcia.c
+++ b/sys/dev/pcmcia/wdc_pcmcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pcmcia.c,v 1.100 2005/06/19 18:19:19 bouyer Exp $ */
+/* $NetBSD: wdc_pcmcia.c,v 1.101 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.100 2005/06/19 18:19:19 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.101 2005/12/11 12:23:23 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/pcmcia/xirc.c b/sys/dev/pcmcia/xirc.c
index a8a60d4334a..93febcc35cc 100644
--- a/sys/dev/pcmcia/xirc.c
+++ b/sys/dev/pcmcia/xirc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xirc.c,v 1.14 2005/05/30 04:28:49 christos Exp $ */
+/* $NetBSD: xirc.c,v 1.15 2005/12/11 12:23:23 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.14 2005/05/30 04:28:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xirc.c,v 1.15 2005/12/11 12:23:23 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/podulebus/acemidi.c b/sys/dev/podulebus/acemidi.c
index 445a40bcf76..65503a4141f 100644
--- a/sys/dev/podulebus/acemidi.c
+++ b/sys/dev/podulebus/acemidi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acemidi.c,v 1.9 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: acemidi.c,v 1.10 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.9 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acemidi.c,v 1.10 2005/12/11 12:23:28 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/podulebus/dtide.c b/sys/dev/podulebus/dtide.c
index 0f5efa0228d..fc08fe50921 100644
--- a/sys/dev/podulebus/dtide.c
+++ b/sys/dev/podulebus/dtide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dtide.c,v 1.19 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: dtide.c,v 1.20 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dtide.c,v 1.19 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtide.c,v 1.20 2005/12/11 12:23:28 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/podulebus/dtidereg.h b/sys/dev/podulebus/dtidereg.h
index 20091e55f94..133dc45084d 100644
--- a/sys/dev/podulebus/dtidereg.h
+++ b/sys/dev/podulebus/dtidereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dtidereg.h,v 1.3 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: dtidereg.h,v 1.4 2005/12/11 12:23:28 christos Exp $ */
/* This file is in the public domain */
diff --git a/sys/dev/podulebus/files.podulebus b/sys/dev/podulebus/files.podulebus
index e5b0f79a03f..5168d94244b 100644
--- a/sys/dev/podulebus/files.podulebus
+++ b/sys/dev/podulebus/files.podulebus
@@ -1,4 +1,4 @@
-# $NetBSD: files.podulebus,v 1.15 2003/10/08 20:58:00 bouyer Exp $
+# $NetBSD: files.podulebus,v 1.16 2005/12/11 12:23:28 christos Exp $
device podulebus { [slot = -1] }
define podloader
diff --git a/sys/dev/podulebus/hcide.c b/sys/dev/podulebus/hcide.c
index 197eebe915b..a4b3a34c0d8 100644
--- a/sys/dev/podulebus/hcide.c
+++ b/sys/dev/podulebus/hcide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hcide.c,v 1.16 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: hcide.c,v 1.17 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hcide.c,v 1.16 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hcide.c,v 1.17 2005/12/11 12:23:28 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/podulebus/hcsc.c b/sys/dev/podulebus/hcsc.c
index 19339335da1..c78f55f27ef 100644
--- a/sys/dev/podulebus/hcsc.c
+++ b/sys/dev/podulebus/hcsc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hcsc.c,v 1.14 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: hcsc.c,v 1.15 2005/12/11 12:23:28 christos Exp $ */
/*
* Copyright (c) 2001 Ben Harris
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hcsc.c,v 1.14 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hcsc.c,v 1.15 2005/12/11 12:23:28 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/podulebus/if_ea.c b/sys/dev/podulebus/if_ea.c
index 99e5d54c422..28a04ccc0dc 100644
--- a/sys/dev/podulebus/if_ea.c
+++ b/sys/dev/podulebus/if_ea.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ea.c,v 1.10 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: if_ea.c,v 1.11 2005/12/11 12:23:28 christos Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ea.c,v 1.10 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ea.c,v 1.11 2005/12/11 12:23:28 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/podulebus/if_eb.c b/sys/dev/podulebus/if_eb.c
index f398431ab65..81f271c93a0 100644
--- a/sys/dev/podulebus/if_eb.c
+++ b/sys/dev/podulebus/if_eb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eb.c,v 1.8 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: if_eb.c,v 1.9 2005/12/11 12:23:28 christos Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_eb.c,v 1.8 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eb.c,v 1.9 2005/12/11 12:23:28 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/podulebus/if_ei.c b/sys/dev/podulebus/if_ei.c
index 5b6d2540ca4..1cc5964d365 100644
--- a/sys/dev/podulebus/if_ei.c
+++ b/sys/dev/podulebus/if_ei.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ei.c,v 1.9 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: if_ei.c,v 1.10 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ei.c,v 1.9 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ei.c,v 1.10 2005/12/11 12:23:28 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/podulebus/if_eireg.h b/sys/dev/podulebus/if_eireg.h
index 43b56d1a7cd..9ea82c5e510 100644
--- a/sys/dev/podulebus/if_eireg.h
+++ b/sys/dev/podulebus/if_eireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eireg.h,v 1.3 2004/04/23 02:58:29 simonb Exp $ */
+/* $NetBSD: if_eireg.h,v 1.4 2005/12/11 12:23:28 christos Exp $ */
/*
* 2000 Ben Harris
diff --git a/sys/dev/podulebus/oak.c b/sys/dev/podulebus/oak.c
index 3e160175466..2025570cef4 100644
--- a/sys/dev/podulebus/oak.c
+++ b/sys/dev/podulebus/oak.c
@@ -1,4 +1,4 @@
-/* $NetBSD: oak.c,v 1.14 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: oak.c,v 1.15 2005/12/11 12:23:28 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oak.c,v 1.14 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oak.c,v 1.15 2005/12/11 12:23:28 christos Exp $");
#include <sys/param.h>
diff --git a/sys/dev/podulebus/podule_data.h b/sys/dev/podulebus/podule_data.h
index c74025ec7a3..c421b96c62f 100644
--- a/sys/dev/podulebus/podule_data.h
+++ b/sys/dev/podulebus/podule_data.h
@@ -1,4 +1,4 @@
-/* $NetBSD: podule_data.h,v 1.15 2005/02/27 15:32:15 perry Exp $ */
+/* $NetBSD: podule_data.h,v 1.16 2005/12/11 12:23:28 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
diff --git a/sys/dev/podulebus/podulebus.h b/sys/dev/podulebus/podulebus.h
index 850a8db3f1c..4a58c0a879b 100644
--- a/sys/dev/podulebus/podulebus.h
+++ b/sys/dev/podulebus/podulebus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.h,v 1.7 2005/06/09 09:15:28 he Exp $ */
+/* $NetBSD: podulebus.h,v 1.8 2005/12/11 12:23:28 christos Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
diff --git a/sys/dev/podulebus/podulelist2h.awk b/sys/dev/podulebus/podulelist2h.awk
index bf12b8bd81b..a024b8b1092 100644
--- a/sys/dev/podulebus/podulelist2h.awk
+++ b/sys/dev/podulebus/podulelist2h.awk
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: podulelist2h.awk,v 1.3 2005/02/27 15:31:01 perry Exp $
+# $NetBSD: podulelist2h.awk,v 1.4 2005/12/11 12:23:28 christos Exp $
# from: devlist2h.awk,v 1.2 1996/01/22 21:08:09 cgd Exp
#
# Copyright (c) 1996 Mark Brinicombe
diff --git a/sys/dev/podulebus/podules b/sys/dev/podulebus/podules
index 372f7a9ec2d..40802ac72b3 100644
--- a/sys/dev/podulebus/podules
+++ b/sys/dev/podulebus/podules
@@ -1,4 +1,4 @@
-$NetBSD: podules,v 1.16 2004/01/07 22:00:51 bjh21 Exp $
+$NetBSD: podules,v 1.17 2005/12/11 12:23:28 christos Exp $
/*
* Copyright (c) 1996 Mark Brinicombe
diff --git a/sys/dev/podulebus/podules.h b/sys/dev/podulebus/podules.h
index b87b4b7374f..690b90cd1b4 100644
--- a/sys/dev/podulebus/podules.h
+++ b/sys/dev/podulebus/podules.h
@@ -1,4 +1,4 @@
-/* $NetBSD: podules.h,v 1.15 2005/02/27 15:32:15 perry Exp $ */
+/* $NetBSD: podules.h,v 1.16 2005/12/11 12:23:28 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
diff --git a/sys/dev/ppbus/files.ppbus b/sys/dev/ppbus/files.ppbus
index 43affa53993..fe94b41551b 100644
--- a/sys/dev/ppbus/files.ppbus
+++ b/sys/dev/ppbus/files.ppbus
@@ -1,4 +1,4 @@
-# $NetBSD: files.ppbus,v 1.6 2005/02/27 00:27:44 perry Exp $
+# $NetBSD: files.ppbus,v 1.7 2005/12/11 12:23:28 christos Exp $
#
# Config file and device description for machine-independent parallel port bus
# code.
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 5b5bcdae195..40cf13dd767 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.6 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: if_plip.c,v 1.7 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.6 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.7 2005/12/11 12:23:28 christos Exp $");
/*
* Parallel port TCP/IP interfaces added. I looked at the driver from
diff --git a/sys/dev/ppbus/lpt.c b/sys/dev/ppbus/lpt.c
index ab4587fb75c..abf9a9f20af 100644
--- a/sys/dev/ppbus/lpt.c
+++ b/sys/dev/ppbus/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.13 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: lpt.c,v 1.14 2005/12/11 12:23:28 christos Exp $ */
/*
* Copyright (c) 1990 William F. Jolitz, TeleMuse
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.13 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.14 2005/12/11 12:23:28 christos Exp $");
#include "opt_ppbus_lpt.h"
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index 9628e48e554..ded601fa6df 100644
--- a/sys/dev/ppbus/lptio.h
+++ b/sys/dev/ppbus/lptio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lptio.h,v 1.6 2004/02/03 21:15:03 jdolecek Exp $ */
+/* $NetBSD: lptio.h,v 1.7 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ppbus/lptreg.h b/sys/dev/ppbus/lptreg.h
index 6748e447c87..5fa79787eea 100644
--- a/sys/dev/ppbus/lptreg.h
+++ b/sys/dev/ppbus/lptreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lptreg.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: lptreg.h,v 1.6 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
diff --git a/sys/dev/ppbus/lptvar.h b/sys/dev/ppbus/lptvar.h
index 6b9eb64cd09..69c6fcd3b56 100644
--- a/sys/dev/ppbus/lptvar.h
+++ b/sys/dev/ppbus/lptvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lptvar.h,v 1.7 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: lptvar.h,v 1.8 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/ppbus/ppbus_1284.c b/sys/dev/ppbus/ppbus_1284.c
index 46d4a61d5e9..8ff9b5e735d 100644
--- a/sys/dev/ppbus/ppbus_1284.c
+++ b/sys/dev/ppbus/ppbus_1284.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_1284.c,v 1.7 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: ppbus_1284.c,v 1.8 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 1997 Nicolas Souchu
@@ -32,7 +32,7 @@
/* General purpose routines for the IEEE1284-1994 Standard */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppbus_1284.c,v 1.7 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppbus_1284.c,v 1.8 2005/12/11 12:23:28 christos Exp $");
#include "opt_ppbus_1284.h"
diff --git a/sys/dev/ppbus/ppbus_1284.h b/sys/dev/ppbus/ppbus_1284.h
index b83bfe3458c..05129347caf 100644
--- a/sys/dev/ppbus/ppbus_1284.h
+++ b/sys/dev/ppbus/ppbus_1284.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_1284.h,v 1.5 2004/01/28 17:11:48 jdolecek Exp $ */
+/* $NetBSD: ppbus_1284.h,v 1.6 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 1997 Nicolas Souchu
diff --git a/sys/dev/ppbus/ppbus_base.c b/sys/dev/ppbus/ppbus_base.c
index 3cde916e732..a2387190bb5 100644
--- a/sys/dev/ppbus/ppbus_base.c
+++ b/sys/dev/ppbus/ppbus_base.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_base.c,v 1.10 2005/06/01 18:41:51 drochner Exp $ */
+/* $NetBSD: ppbus_base.c,v 1.11 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppbus_base.c,v 1.10 2005/06/01 18:41:51 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppbus_base.c,v 1.11 2005/12/11 12:23:28 christos Exp $");
#include "opt_ppbus_1284.h"
#include "opt_ppbus.h"
diff --git a/sys/dev/ppbus/ppbus_base.h b/sys/dev/ppbus/ppbus_base.h
index 112e00ff560..0330b1f178d 100644
--- a/sys/dev/ppbus/ppbus_base.h
+++ b/sys/dev/ppbus/ppbus_base.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_base.h,v 1.4 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: ppbus_base.h,v 1.5 2005/12/11 12:23:28 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
diff --git a/sys/dev/ppbus/ppbus_conf.c b/sys/dev/ppbus/ppbus_conf.c
index fc6f2379eb5..934628ecfe3 100644
--- a/sys/dev/ppbus/ppbus_conf.c
+++ b/sys/dev/ppbus/ppbus_conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_conf.c,v 1.8 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: ppbus_conf.c,v 1.9 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppbus_conf.c,v 1.8 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppbus_conf.c,v 1.9 2005/12/11 12:23:28 christos Exp $");
#include "opt_ppbus.h"
#include "opt_ppbus_1284.h"
diff --git a/sys/dev/ppbus/ppbus_conf.h b/sys/dev/ppbus/ppbus_conf.h
index dbb6555837a..9c185968553 100644
--- a/sys/dev/ppbus/ppbus_conf.h
+++ b/sys/dev/ppbus/ppbus_conf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_conf.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: ppbus_conf.h,v 1.6 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 Nicolas Souchu
diff --git a/sys/dev/ppbus/ppbus_device.h b/sys/dev/ppbus/ppbus_device.h
index 6124e183b67..5def1b302e1 100644
--- a/sys/dev/ppbus/ppbus_device.h
+++ b/sys/dev/ppbus/ppbus_device.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_device.h,v 1.4 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: ppbus_device.h,v 1.5 2005/12/11 12:23:28 christos Exp $ */
#ifndef __PPBUS_DEVICE_H
#define __PPBUS_DEVICE_H
diff --git a/sys/dev/ppbus/ppbus_io.h b/sys/dev/ppbus/ppbus_io.h
index c31711f2873..8026e7ae950 100644
--- a/sys/dev/ppbus/ppbus_io.h
+++ b/sys/dev/ppbus/ppbus_io.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_io.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: ppbus_io.h,v 1.6 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 1999 Nicolas Souchu
diff --git a/sys/dev/ppbus/ppbus_msq.c b/sys/dev/ppbus/ppbus_msq.c
index bdcd697daa9..dbb893fc9bb 100644
--- a/sys/dev/ppbus/ppbus_msq.c
+++ b/sys/dev/ppbus/ppbus_msq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_msq.c,v 1.6 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: ppbus_msq.c,v 1.7 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 Nicolas Souchu
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppbus_msq.c,v 1.6 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppbus_msq.c,v 1.7 2005/12/11 12:23:28 christos Exp $");
#include <machine/stdarg.h>
diff --git a/sys/dev/ppbus/ppbus_msq.h b/sys/dev/ppbus/ppbus_msq.h
index caacc5c0bd2..5183843adbf 100644
--- a/sys/dev/ppbus/ppbus_msq.h
+++ b/sys/dev/ppbus/ppbus_msq.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_msq.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: ppbus_msq.h,v 1.6 2005/12/11 12:23:28 christos Exp $ */
/*-
* Copyright (c) 1998 Nicolas Souchu
diff --git a/sys/dev/ppbus/ppbus_var.h b/sys/dev/ppbus/ppbus_var.h
index 2113e1d0d29..37cc6d5c7df 100644
--- a/sys/dev/ppbus/ppbus_var.h
+++ b/sys/dev/ppbus/ppbus_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ppbus_var.h,v 1.4 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: ppbus_var.h,v 1.5 2005/12/11 12:23:28 christos Exp $ */
#ifndef __PPBUS_VAR_H
#define __PPBUS_VAR_H
diff --git a/sys/dev/ppbus/pps_ppbus.c b/sys/dev/ppbus/pps_ppbus.c
index ee24071e724..28e4fe5714d 100644
--- a/sys/dev/ppbus/pps_ppbus.c
+++ b/sys/dev/ppbus/pps_ppbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pps_ppbus.c,v 1.2 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: pps_ppbus.c,v 1.3 2005/12/11 12:23:28 christos Exp $ */
/*
* Copyright (c) 2004
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pps_ppbus.c,v 1.2 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pps_ppbus.c,v 1.3 2005/12/11 12:23:28 christos Exp $");
#include "opt_ntp.h"
diff --git a/sys/dev/qbus/dhu.c b/sys/dev/qbus/dhu.c
index 887f1b99caa..5a1aaf8ccd7 100644
--- a/sys/dev/qbus/dhu.c
+++ b/sys/dev/qbus/dhu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dhu.c,v 1.39 2005/09/06 20:46:38 kleink Exp $ */
+/* $NetBSD: dhu.c,v 1.40 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 2003, Hugh Graham.
* Copyright (c) 1992, 1993
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.39 2005/09/06 20:46:38 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dhu.c,v 1.40 2005/12/11 12:23:29 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -416,10 +416,10 @@ dhuxint(arg)
}
int
-dhuopen(dev, flag, mode, p)
+dhuopen(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
struct tty *tp;
int unit, line;
@@ -490,10 +490,10 @@ dhuopen(dev, flag, mode, p)
/*ARGSUSED*/
int
-dhuclose(dev, flag, mode, p)
+dhuclose(dev, flag, mode, l)
dev_t dev;
int flag, mode;
- struct proc *p;
+ struct lwp *l;
{
struct tty *tp;
int unit, line;
@@ -552,10 +552,10 @@ dhuwrite(dev, uio, flag)
}
int
-dhupoll(dev, events, p)
+dhupoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct dhu_softc *sc;
struct tty *tp;
@@ -563,17 +563,17 @@ dhupoll(dev, events, p)
sc = dhu_cd.cd_devs[DHU_M2U(minor(dev))];
tp = sc->sc_dhu[DHU_LINE(minor(dev))].dhu_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
/*ARGSUSED*/
int
-dhuioctl(dev, cmd, data, flag, p)
+dhuioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct dhu_softc *sc;
struct tty *tp;
@@ -585,11 +585,11 @@ dhuioctl(dev, cmd, data, flag, p)
sc = dhu_cd.cd_devs[unit];
tp = sc->sc_dhu[line].dhu_tty;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
diff --git a/sys/dev/qbus/dl.c b/sys/dev/qbus/dl.c
index 2a1a08b9944..d591f733e1e 100644
--- a/sys/dev/qbus/dl.c
+++ b/sys/dev/qbus/dl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dl.c,v 1.30 2005/09/06 21:40:39 kleink Exp $ */
+/* $NetBSD: dl.c,v 1.31 2005/12/11 12:23:29 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.30 2005/09/06 21:40:39 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dl.c,v 1.31 2005/12/11 12:23:29 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -323,8 +323,9 @@ dlxint(void *arg)
}
int
-dlopen(dev_t dev, int flag, int mode, struct proc *p)
+dlopen(dev_t dev, int flag, int mode, struct lwp *l)
{
+ struct proc *p = l->l_proc;
struct tty *tp;
struct dl_softc *sc;
int unit;
@@ -363,7 +364,7 @@ dlopen(dev_t dev, int flag, int mode, struct proc *p)
/*ARGSUSED*/
int
-dlclose(dev_t dev, int flag, int mode, struct proc *p)
+dlclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct dl_softc *sc = dl_cd.cd_devs[minor(dev)];
struct tty *tp = sc->sc_tty;
@@ -395,27 +396,27 @@ dlwrite(dev_t dev, struct uio *uio, int flag)
}
int
-dlpoll(dev_t dev, int events, struct proc *p)
+dlpoll(dev_t dev, int events, struct lwp *l)
{
struct dl_softc *sc = dl_cd.cd_devs[minor(dev)];
struct tty *tp = sc->sc_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
int
-dlioctl(dev_t dev, unsigned long cmd, caddr_t data, int flag, struct proc *p)
+dlioctl(dev_t dev, unsigned long cmd, caddr_t data, int flag, struct lwp *l)
{
struct dl_softc *sc = dl_cd.cd_devs[minor(dev)];
struct tty *tp = sc->sc_tty;
int error;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
diff --git a/sys/dev/qbus/dlreg.h b/sys/dev/qbus/dlreg.h
index 2f466f16d3e..c13de32937b 100644
--- a/sys/dev/qbus/dlreg.h
+++ b/sys/dev/qbus/dlreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dlreg.h,v 1.5 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: dlreg.h,v 1.6 2005/12/11 12:23:29 christos Exp $ */
/*
* Ben Harris, 1997
*
diff --git a/sys/dev/qbus/dz_uba.c b/sys/dev/qbus/dz_uba.c
index 8f303f14493..bebf6125773 100644
--- a/sys/dev/qbus/dz_uba.c
+++ b/sys/dev/qbus/dz_uba.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_uba.c,v 1.22 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: dz_uba.c,v 1.23 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden. All rights reserved.
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.22 2005/02/26 12:45:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_uba.c,v 1.23 2005/12/11 12:23:29 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/qbus/files.uba b/sys/dev/qbus/files.uba
index 33a162ca8e3..e44d8377f56 100644
--- a/sys/dev/qbus/files.uba
+++ b/sys/dev/qbus/files.uba
@@ -1,4 +1,4 @@
-# $NetBSD: files.uba,v 1.15 2003/08/29 13:50:45 ragge Exp $
+# $NetBSD: files.uba,v 1.16 2005/12/11 12:23:29 christos Exp $
#
# Config file and device description for machine-independent
# code for devices Digital Equipment Corp. Unibus and Q22 bus.
diff --git a/sys/dev/qbus/if_de.c b/sys/dev/qbus/if_de.c
index 537722d86d0..161b99b37e5 100644
--- a/sys/dev/qbus/if_de.c
+++ b/sys/dev/qbus/if_de.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.17 2005/06/27 11:05:24 ragge Exp $ */
+/* $NetBSD: if_de.c,v 1.18 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989 Regents of the University of California.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.17 2005/06/27 11:05:24 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.18 2005/12/11 12:23:29 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/qbus/if_dereg.h b/sys/dev/qbus/if_dereg.h
index d9f390b0e5b..815003eafae 100644
--- a/sys/dev/qbus/if_dereg.h
+++ b/sys/dev/qbus/if_dereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dereg.h,v 1.3 2003/08/07 16:31:14 agc Exp $ */
+/* $NetBSD: if_dereg.h,v 1.4 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
diff --git a/sys/dev/qbus/if_dmc.c b/sys/dev/qbus/if_dmc.c
index fc69ded312f..e97397cd849 100644
--- a/sys/dev/qbus/if_dmc.c
+++ b/sys/dev/qbus/if_dmc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dmc.c,v 1.9 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: if_dmc.c,v 1.10 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.9 2005/02/26 12:45:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dmc.c,v 1.10 2005/12/11 12:23:29 christos Exp $");
#undef DMCDEBUG /* for base table dump on fatal error */
diff --git a/sys/dev/qbus/if_dmcreg.h b/sys/dev/qbus/if_dmcreg.h
index c9b9ce92290..36f34820db2 100644
--- a/sys/dev/qbus/if_dmcreg.h
+++ b/sys/dev/qbus/if_dmcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dmcreg.h,v 1.3 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: if_dmcreg.h,v 1.4 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/qbus/if_il.c b/sys/dev/qbus/if_il.c
index e8918756e47..3bd32e6966b 100644
--- a/sys/dev/qbus/if_il.c
+++ b/sys/dev/qbus/if_il.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_il.c,v 1.11 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: if_il.c,v 1.12 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.11 2005/02/26 12:45:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_il.c,v 1.12 2005/12/11 12:23:29 christos Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
diff --git a/sys/dev/qbus/if_il.h b/sys/dev/qbus/if_il.h
index 78b403beed0..84e2df130ec 100644
--- a/sys/dev/qbus/if_il.h
+++ b/sys/dev/qbus/if_il.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_il.h,v 1.2 2003/08/07 16:31:15 agc Exp $ */
+/* $NetBSD: if_il.h,v 1.3 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/qbus/if_ilreg.h b/sys/dev/qbus/if_ilreg.h
index c8999a02c4c..d9d9f31cbfb 100644
--- a/sys/dev/qbus/if_ilreg.h
+++ b/sys/dev/qbus/if_ilreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ilreg.h,v 1.4 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: if_ilreg.h,v 1.5 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/qbus/if_qe.c b/sys/dev/qbus/if_qe.c
index 18971dfbfef..12433b06688 100644
--- a/sys/dev/qbus/if_qe.c
+++ b/sys/dev/qbus/if_qe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qe.c,v 1.59 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: if_qe.c,v 1.60 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.59 2005/02/26 12:45:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qe.c,v 1.60 2005/12/11 12:23:29 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/qbus/if_qereg.h b/sys/dev/qbus/if_qereg.h
index 975e34097e4..43776ae881a 100644
--- a/sys/dev/qbus/if_qereg.h
+++ b/sys/dev/qbus/if_qereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qereg.h,v 1.8 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: if_qereg.h,v 1.9 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/qbus/if_qt.c b/sys/dev/qbus/if_qt.c
index 97f3b91164c..ea365b20386 100644
--- a/sys/dev/qbus/if_qt.c
+++ b/sys/dev/qbus/if_qt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qt.c,v 1.6 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: if_qt.c,v 1.7 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1992 Steven M. Schultz
* All rights reserved.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.6 2005/02/26 12:45:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_qt.c,v 1.7 2005/12/11 12:23:29 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/qbus/if_qtreg.h b/sys/dev/qbus/if_qtreg.h
index a36cf096074..e2716ffac77 100644
--- a/sys/dev/qbus/if_qtreg.h
+++ b/sys/dev/qbus/if_qtreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qtreg.h,v 1.4 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: if_qtreg.h,v 1.5 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1992 Steven M. Schultz
* All rights reserved.
diff --git a/sys/dev/qbus/if_uba.c b/sys/dev/qbus/if_uba.c
index 50d90ea1404..bcbf833b5ac 100644
--- a/sys/dev/qbus/if_uba.c
+++ b/sys/dev/qbus/if_uba.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_uba.c,v 1.25 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: if_uba.c,v 1.26 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_uba.c,v 1.25 2005/02/26 12:45:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_uba.c,v 1.26 2005/12/11 12:23:29 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/qbus/if_uba.h b/sys/dev/qbus/if_uba.h
index 93c1394ec2b..2f44a174ca2 100644
--- a/sys/dev/qbus/if_uba.h
+++ b/sys/dev/qbus/if_uba.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_uba.h,v 1.13 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: if_uba.h,v 1.14 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
diff --git a/sys/dev/qbus/qd.c b/sys/dev/qbus/qd.c
index 30cc974a22e..e8ae07af943 100644
--- a/sys/dev/qbus/qd.c
+++ b/sys/dev/qbus/qd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qd.c,v 1.33 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: qd.c,v 1.34 2005/12/11 12:23:29 christos Exp $ */
/*-
* Copyright (c) 1988 Regents of the University of California.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.33 2005/02/26 12:45:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.34 2005/12/11 12:23:29 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/qbus/qdioctl.h b/sys/dev/qbus/qdioctl.h
index 3de48c3feda..161188fe391 100644
--- a/sys/dev/qbus/qdioctl.h
+++ b/sys/dev/qbus/qdioctl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qdioctl.h,v 1.5 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: qdioctl.h,v 1.6 2005/12/11 12:23:29 christos Exp $ */
/*-
* Copyright (c) 1982, 1986
* The Regents of the University of California. All rights reserved.
diff --git a/sys/dev/qbus/qdreg.h b/sys/dev/qbus/qdreg.h
index a57bdaf7c04..eb085794fa3 100644
--- a/sys/dev/qbus/qdreg.h
+++ b/sys/dev/qbus/qdreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qdreg.h,v 1.7 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: qdreg.h,v 1.8 2005/12/11 12:23:29 christos Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/qbus/qduser.h b/sys/dev/qbus/qduser.h
index 7cf1fb03c5b..667c46f7b98 100644
--- a/sys/dev/qbus/qduser.h
+++ b/sys/dev/qbus/qduser.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qduser.h,v 1.6 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: qduser.h,v 1.7 2005/12/11 12:23:29 christos Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/qbus/qevent.h b/sys/dev/qbus/qevent.h
index f59a13f0ffe..90022abe0b0 100644
--- a/sys/dev/qbus/qevent.h
+++ b/sys/dev/qbus/qevent.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qevent.h,v 1.5 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: qevent.h,v 1.6 2005/12/11 12:23:29 christos Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
diff --git a/sys/dev/qbus/qfont.c b/sys/dev/qbus/qfont.c
index 5ac39e4b5cc..1acca00421a 100644
--- a/sys/dev/qbus/qfont.c
+++ b/sys/dev/qbus/qfont.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qfont.c,v 1.7 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: qfont.c,v 1.8 2005/12/11 12:23:29 christos Exp $ */
/*-
* Copyright (c) 1982, 1986
* The Regents of the University of California. All rights reserved.
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qfont.c,v 1.7 2005/02/26 12:45:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qfont.c,v 1.8 2005/12/11 12:23:29 christos Exp $");
unsigned short q_key[]={
0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 /* 0 */
diff --git a/sys/dev/qbus/rf.c b/sys/dev/qbus/rf.c
index ce6c9074910..d8eb3276ae6 100644
--- a/sys/dev/qbus/rf.c
+++ b/sys/dev/qbus/rf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf.c,v 1.9 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: rf.c,v 1.10 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 2002 Jochen Kunz.
* All rights reserved.
@@ -36,7 +36,7 @@ TODO:
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.9 2005/10/15 17:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.10 2005/12/11 12:23:29 christos Exp $");
/* autoconfig stuff */
#include <sys/param.h>
@@ -957,7 +957,7 @@ rfsize(dev_t dev)
int
-rfopen(dev_t dev, int oflags, int devtype, struct proc *p)
+rfopen(dev_t dev, int oflags, int devtype, struct lwp *l)
{
struct rf_softc *rf_sc;
struct rfc_softc *rfc_sc;
@@ -1050,7 +1050,7 @@ rfopen(dev_t dev, int oflags, int devtype, struct proc *p)
int
-rfclose(dev_t dev, int fflag, int devtype, struct proc *p)
+rfclose(dev_t dev, int fflag, int devtype, struct lwp *l)
{
struct rf_softc *rf_sc;
int unit;
@@ -1090,7 +1090,7 @@ rfwrite(dev_t dev, struct uio *uio, int ioflag)
int
-rfioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct proc *p)
+rfioctl(dev_t dev, u_long cmd, caddr_t data, int fflag, struct lwp *l)
{
struct rf_softc *rf_sc;
int unit;
diff --git a/sys/dev/qbus/rfreg.h b/sys/dev/qbus/rfreg.h
index 60fb5aeaf15..d33a54aa945 100644
--- a/sys/dev/qbus/rfreg.h
+++ b/sys/dev/qbus/rfreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rfreg.h,v 1.3 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: rfreg.h,v 1.4 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 2002 Jochen Kunz.
* All rights reserved.
diff --git a/sys/dev/qbus/rl.c b/sys/dev/qbus/rl.c
index f70b3a886c4..c9e2e7c963a 100644
--- a/sys/dev/qbus/rl.c
+++ b/sys/dev/qbus/rl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rl.c,v 1.26 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: rl.c,v 1.27 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.26 2005/10/15 17:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rl.c,v 1.27 2005/12/11 12:23:29 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -286,7 +286,7 @@ rlattach(struct device *parent, struct device *self, void *aux)
}
int
-rlopen(dev_t dev, int flag, int fmt, struct proc *p)
+rlopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
int error, part, unit, mask;
struct disklabel *dl;
@@ -372,7 +372,7 @@ rlopen(dev_t dev, int flag, int fmt, struct proc *p)
}
int
-rlclose(dev_t dev, int flag, int fmt, struct proc *p)
+rlclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
int error, unit = DISKUNIT(dev);
struct rl_softc *rc = rl_cd.cd_devs[unit];
@@ -440,7 +440,7 @@ done: biodone(bp);
}
int
-rlioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+rlioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct rl_softc *rc = rl_cd.cd_devs[DISKUNIT(dev)];
struct disklabel *lp = rc->rc_disk.dk_label;
@@ -539,7 +539,7 @@ rlioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
{
struct dkwedge_list *dkwl = (void *) addr;
- return (dkwedge_list(&rc->rc_disk, dkwl, p));
+ return (dkwedge_list(&rc->rc_disk, dkwl, l));
}
default:
diff --git a/sys/dev/qbus/rlreg.h b/sys/dev/qbus/rlreg.h
index 75a149197b4..a47117d4de1 100644
--- a/sys/dev/qbus/rlreg.h
+++ b/sys/dev/qbus/rlreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rlreg.h,v 1.3 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: rlreg.h,v 1.4 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
diff --git a/sys/dev/qbus/rlvar.h b/sys/dev/qbus/rlvar.h
index b9ced812e9e..944ce6ec5d2 100644
--- a/sys/dev/qbus/rlvar.h
+++ b/sys/dev/qbus/rlvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rlvar.h,v 1.5 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: rlvar.h,v 1.6 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rlvar.h,v 1.5 2005/10/15 17:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rlvar.h,v 1.6 2005/12/11 12:23:29 christos Exp $");
struct rlc_softc {
struct device sc_dev;
diff --git a/sys/dev/qbus/ts.c b/sys/dev/qbus/ts.c
index 4439672f605..bf6f90a07f3 100644
--- a/sys/dev/qbus/ts.c
+++ b/sys/dev/qbus/ts.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ts.c,v 1.14 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: ts.c,v 1.15 2005/12/11 12:23:29 christos Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.14 2005/10/15 17:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ts.c,v 1.15 2005/12/11 12:23:29 christos Exp $");
#undef TSDEBUG
diff --git a/sys/dev/qbus/tsreg.h b/sys/dev/qbus/tsreg.h
index 28ac12cdd14..f52dd03aab4 100644
--- a/sys/dev/qbus/tsreg.h
+++ b/sys/dev/qbus/tsreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tsreg.h,v 1.3 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: tsreg.h,v 1.4 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1995 Ludd, University of Lule}, Sweden.
* All rights reserved.
diff --git a/sys/dev/qbus/uba.c b/sys/dev/qbus/uba.c
index ee58b415299..dff75ef3df8 100644
--- a/sys/dev/qbus/uba.c
+++ b/sys/dev/qbus/uba.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uba.c,v 1.72 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: uba.c,v 1.73 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.72 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba.c,v 1.73 2005/12/11 12:23:29 christos Exp $");
#include <sys/param.h>
#include <sys/time.h>
diff --git a/sys/dev/qbus/ubavar.h b/sys/dev/qbus/ubavar.h
index ee62798f541..6eecb50f614 100644
--- a/sys/dev/qbus/ubavar.h
+++ b/sys/dev/qbus/ubavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ubavar.h,v 1.36 2005/02/26 12:45:06 simonb Exp $ */
+/* $NetBSD: ubavar.h,v 1.37 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1982, 1986 Regents of the University of California.
diff --git a/sys/dev/qbus/uda.c b/sys/dev/qbus/uda.c
index 5c18a8f938f..5975f6fac7c 100644
--- a/sys/dev/qbus/uda.c
+++ b/sys/dev/qbus/uda.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uda.c,v 1.52 2005/06/27 11:05:24 ragge Exp $ */
+/* $NetBSD: uda.c,v 1.53 2005/12/11 12:23:29 christos Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.52 2005/06/27 11:05:24 ragge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uda.c,v 1.53 2005/12/11 12:23:29 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/radio.c b/sys/dev/radio.c
index 485dff402d1..561faf30952 100644
--- a/sys/dev/radio.c
+++ b/sys/dev/radio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: radio.c,v 1.14 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: radio.c,v 1.15 2005/12/11 12:20:53 christos Exp $ */
/* $OpenBSD: radio.c,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */
@@ -30,7 +30,7 @@
/* This is the /dev/radio driver from OpenBSD */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.14 2005/02/27 00:26:58 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radio.c,v 1.15 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,7 +86,7 @@ radioattach(struct device *parent, struct device *self, void *aux)
}
int
-radioopen(dev_t dev, int flags, int fmt, struct proc *p)
+radioopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit;
struct radio_softc *sc;
@@ -98,26 +98,26 @@ radioopen(dev_t dev, int flags, int fmt, struct proc *p)
return (ENXIO);
if (sc->hw_if->open != NULL)
- return (sc->hw_if->open(sc->hw_hdl, flags, fmt, p));
+ return (sc->hw_if->open(sc->hw_hdl, flags, fmt, l->l_proc));
else
return (0);
}
int
-radioclose(dev_t dev, int flags, int fmt, struct proc *p)
+radioclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct radio_softc *sc;
sc = radio_cd.cd_devs[RADIOUNIT(dev)];
if (sc->hw_if->close != NULL)
- return (sc->hw_if->close(sc->hw_hdl, flags, fmt, p));
+ return (sc->hw_if->close(sc->hw_hdl, flags, fmt, l->l_proc));
else
return (0);
}
int
-radioioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
+radioioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct lwp *l)
{
struct radio_softc *sc;
int unit, error;
diff --git a/sys/dev/radio_if.h b/sys/dev/radio_if.h
index aba57907a57..0dae4db31f4 100644
--- a/sys/dev/radio_if.h
+++ b/sys/dev/radio_if.h
@@ -1,4 +1,4 @@
-/* $NetBSD: radio_if.h,v 1.3 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: radio_if.h,v 1.4 2005/12/11 12:20:53 christos Exp $ */
/* $OpenBSD: radio_if.h,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radio_if.h,v 1.6 2001/10/18 16:51:36 pva Exp $ */
diff --git a/sys/dev/radiovar.h b/sys/dev/radiovar.h
index 9f573203978..42b9c5b34d2 100644
--- a/sys/dev/radiovar.h
+++ b/sys/dev/radiovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: radiovar.h,v 1.3 2004/10/29 12:57:16 yamt Exp $ */
+/* $NetBSD: radiovar.h,v 1.4 2005/12/11 12:20:53 christos Exp $ */
/* $OpenBSD: radiovar.h,v 1.2 2001/12/05 10:27:06 mickey Exp $ */
/* $RuOBSD: radiovar.h,v 1.3 2001/09/29 17:10:16 pva Exp $ */
diff --git a/sys/dev/raidframe/files.raidframe b/sys/dev/raidframe/files.raidframe
index e1fc8310b96..921a7a4e757 100644
--- a/sys/dev/raidframe/files.raidframe
+++ b/sys/dev/raidframe/files.raidframe
@@ -1,4 +1,4 @@
-# $NetBSD: files.raidframe,v 1.3 2003/12/29 06:37:47 oster Exp $
+# $NetBSD: files.raidframe,v 1.4 2005/12/11 12:23:37 christos Exp $
defflag RAID_AUTOCONFIG
defflag RAID_DIAGNOSTIC
diff --git a/sys/dev/raidframe/raidframeio.h b/sys/dev/raidframe/raidframeio.h
index 4bfedfcfd91..056771d2370 100644
--- a/sys/dev/raidframe/raidframeio.h
+++ b/sys/dev/raidframe/raidframeio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframeio.h,v 1.2 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: raidframeio.h,v 1.3 2005/12/11 12:23:37 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/raidframe/raidframevar.h b/sys/dev/raidframe/raidframevar.h
index 86bc6ca9aaf..380e2325769 100644
--- a/sys/dev/raidframe/raidframevar.h
+++ b/sys/dev/raidframe/raidframevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframevar.h,v 1.8 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: raidframevar.h,v 1.9 2005/12/11 12:23:37 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_acctrace.c b/sys/dev/raidframe/rf_acctrace.c
index 2f5ce8d7366..683dc8f8b30 100644
--- a/sys/dev/raidframe/rf_acctrace.c
+++ b/sys/dev/raidframe/rf_acctrace.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_acctrace.c,v 1.20 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_acctrace.c,v 1.21 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_acctrace.c,v 1.20 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_acctrace.c,v 1.21 2005/12/11 12:23:37 christos Exp $");
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/sys/dev/raidframe/rf_acctrace.h b/sys/dev/raidframe/rf_acctrace.h
index 8529690c0ae..1e82317b6f3 100644
--- a/sys/dev/raidframe/rf_acctrace.h
+++ b/sys/dev/raidframe/rf_acctrace.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_acctrace.h,v 1.7 2004/02/29 04:03:50 oster Exp $ */
+/* $NetBSD: rf_acctrace.h,v 1.8 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_alloclist.c b/sys/dev/raidframe/rf_alloclist.c
index 95d062627d1..e6d30408f39 100644
--- a/sys/dev/raidframe/rf_alloclist.c
+++ b/sys/dev/raidframe/rf_alloclist.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_alloclist.c,v 1.22 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_alloclist.c,v 1.23 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -37,7 +37,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.22 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.23 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_archs.h b/sys/dev/raidframe/rf_archs.h
index aba4668f261..a8e0c76d7f7 100644
--- a/sys/dev/raidframe/rf_archs.h
+++ b/sys/dev/raidframe/rf_archs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_archs.h,v 1.25 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_archs.h,v 1.26 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_aselect.c b/sys/dev/raidframe/rf_aselect.c
index 5d4b86f536a..b2a216619be 100644
--- a/sys/dev/raidframe/rf_aselect.c
+++ b/sys/dev/raidframe/rf_aselect.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_aselect.c,v 1.21 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_aselect.c,v 1.22 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_aselect.c,v 1.21 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_aselect.c,v 1.22 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_aselect.h b/sys/dev/raidframe/rf_aselect.h
index 48bd1d2692e..61024dc7deb 100644
--- a/sys/dev/raidframe/rf_aselect.h
+++ b/sys/dev/raidframe/rf_aselect.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_aselect.h,v 1.4 2004/03/04 02:25:13 oster Exp $ */
+/* $NetBSD: rf_aselect.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_callback.c b/sys/dev/raidframe/rf_callback.c
index 1b284ab7c55..98c0fe2b955 100644
--- a/sys/dev/raidframe/rf_callback.c
+++ b/sys/dev/raidframe/rf_callback.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_callback.c,v 1.17 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_callback.c,v 1.18 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.17 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.18 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
#include <sys/pool.h>
diff --git a/sys/dev/raidframe/rf_callback.h b/sys/dev/raidframe/rf_callback.h
index 9ab0bbbc8e0..1437c856f27 100644
--- a/sys/dev/raidframe/rf_callback.h
+++ b/sys/dev/raidframe/rf_callback.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_callback.h,v 1.5 2004/03/03 13:29:00 oster Exp $ */
+/* $NetBSD: rf_callback.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_chaindecluster.c b/sys/dev/raidframe/rf_chaindecluster.c
index ef5a599c968..65613eed823 100644
--- a/sys/dev/raidframe/rf_chaindecluster.c
+++ b/sys/dev/raidframe/rf_chaindecluster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_chaindecluster.c,v 1.12 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_chaindecluster.c,v 1.13 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_chaindecluster.c,v 1.12 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_chaindecluster.c,v 1.13 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
diff --git a/sys/dev/raidframe/rf_chaindecluster.h b/sys/dev/raidframe/rf_chaindecluster.h
index fea4992c975..aa0a6d70cfb 100644
--- a/sys/dev/raidframe/rf_chaindecluster.h
+++ b/sys/dev/raidframe/rf_chaindecluster.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_chaindecluster.h,v 1.6 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_chaindecluster.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_copyback.c b/sys/dev/raidframe/rf_copyback.c
index 78378c3291f..cd0180ee907 100644
--- a/sys/dev/raidframe/rf_copyback.c
+++ b/sys/dev/raidframe/rf_copyback.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_copyback.c,v 1.31 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_copyback.c,v 1.32 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -38,7 +38,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.31 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.32 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -97,7 +97,7 @@ rf_CopybackReconstructedData(RF_Raid_t *raidPtr)
struct partinfo dpart;
struct vnode *vp;
struct vattr va;
- struct proc *proc;
+ struct lwp *l;
int ac;
@@ -118,7 +118,7 @@ rf_CopybackReconstructedData(RF_Raid_t *raidPtr)
badDisk = &raidPtr->Disks[fcol];
- proc = raidPtr->engine_thread;
+ l = LIST_FIRST(&raidPtr->engine_thread->p_lwps);
/* This device may have been opened successfully the first time. Close
* it before trying to open it again.. */
@@ -138,7 +138,7 @@ rf_CopybackReconstructedData(RF_Raid_t *raidPtr)
printf("About to (re-)open the device: %s\n",
raidPtr->Disks[fcol].devname);
- retcode = raidlookup(raidPtr->Disks[fcol].devname, proc, &vp);
+ retcode = raidlookup(raidPtr->Disks[fcol].devname, l, &vp);
if (retcode) {
printf("raid%d: copyback: raidlookup on device: %s failed: %d!\n",
@@ -154,11 +154,12 @@ rf_CopybackReconstructedData(RF_Raid_t *raidPtr)
/* Ok, so we can at least do a lookup... How about actually
* getting a vp for it? */
- if ((retcode = VOP_GETATTR(vp, &va, proc->p_ucred, proc)) != 0) {
+ if ((retcode = VOP_GETATTR(vp, &va,
+ l->l_proc->p_ucred, l)) != 0) {
return;
}
retcode = VOP_IOCTL(vp, DIOCGPART, &dpart,
- FREAD, proc->p_ucred, proc);
+ FREAD, l->l_proc->p_ucred, l);
if (retcode) {
return;
}
diff --git a/sys/dev/raidframe/rf_copyback.h b/sys/dev/raidframe/rf_copyback.h
index 600f87075c0..9112fa211af 100644
--- a/sys/dev/raidframe/rf_copyback.h
+++ b/sys/dev/raidframe/rf_copyback.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_copyback.h,v 1.5 2004/01/01 19:32:55 oster Exp $ */
+/* $NetBSD: rf_copyback.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* rf_copyback.h
*/
diff --git a/sys/dev/raidframe/rf_cvscan.c b/sys/dev/raidframe/rf_cvscan.c
index 8a8c4a2ecb5..26472a4f970 100644
--- a/sys/dev/raidframe/rf_cvscan.c
+++ b/sys/dev/raidframe/rf_cvscan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_cvscan.c,v 1.12 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_cvscan.c,v 1.13 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -35,7 +35,7 @@
******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_cvscan.c,v 1.12 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_cvscan.c,v 1.13 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
#include "rf_alloclist.h"
diff --git a/sys/dev/raidframe/rf_cvscan.h b/sys/dev/raidframe/rf_cvscan.h
index 774ea834766..f0f67c47ada 100644
--- a/sys/dev/raidframe/rf_cvscan.h
+++ b/sys/dev/raidframe/rf_cvscan.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_cvscan.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_cvscan.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_dag.h b/sys/dev/raidframe/rf_dag.h
index 35d1301e6da..5b08809e18c 100644
--- a/sys/dev/raidframe/rf_dag.h
+++ b/sys/dev/raidframe/rf_dag.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dag.h,v 1.18 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_dag.h,v 1.19 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_dagdegrd.c b/sys/dev/raidframe/rf_dagdegrd.c
index 7f5b9f39ef7..6aa95e3fc67 100644
--- a/sys/dev/raidframe/rf_dagdegrd.c
+++ b/sys/dev/raidframe/rf_dagdegrd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegrd.c,v 1.23 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_dagdegrd.c,v 1.24 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.23 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.24 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_dagdegrd.h b/sys/dev/raidframe/rf_dagdegrd.h
index b1f0556c880..653d89b2534 100644
--- a/sys/dev/raidframe/rf_dagdegrd.h
+++ b/sys/dev/raidframe/rf_dagdegrd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegrd.h,v 1.6 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_dagdegrd.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_dagdegwr.c b/sys/dev/raidframe/rf_dagdegwr.c
index a3b5698e1cf..e63a27d423c 100644
--- a/sys/dev/raidframe/rf_dagdegwr.c
+++ b/sys/dev/raidframe/rf_dagdegwr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegwr.c,v 1.26 2005/09/24 20:24:11 oster Exp $ */
+/* $NetBSD: rf_dagdegwr.c,v 1.27 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.26 2005/09/24 20:24:11 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.27 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_dagffrd.c b/sys/dev/raidframe/rf_dagffrd.c
index ffaf70d1cd1..eee6c6f57d9 100644
--- a/sys/dev/raidframe/rf_dagffrd.c
+++ b/sys/dev/raidframe/rf_dagffrd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagffrd.c,v 1.15 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_dagffrd.c,v 1.16 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.15 2005/05/29 22:03:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.16 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_dagffrd.h b/sys/dev/raidframe/rf_dagffrd.h
index df2982ded9a..55e205d994f 100644
--- a/sys/dev/raidframe/rf_dagffrd.h
+++ b/sys/dev/raidframe/rf_dagffrd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagffrd.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_dagffrd.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_dagffwr.c b/sys/dev/raidframe/rf_dagffwr.c
index 01b3741ecb6..8ee66547f26 100644
--- a/sys/dev/raidframe/rf_dagffwr.c
+++ b/sys/dev/raidframe/rf_dagffwr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagffwr.c,v 1.30 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_dagffwr.c,v 1.31 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.30 2005/05/29 22:03:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.31 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_dagffwr.h b/sys/dev/raidframe/rf_dagffwr.h
index 4f4a5c10ae4..93ddb3d03ce 100644
--- a/sys/dev/raidframe/rf_dagffwr.h
+++ b/sys/dev/raidframe/rf_dagffwr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagffwr.h,v 1.6 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_dagffwr.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_dagflags.h b/sys/dev/raidframe/rf_dagflags.h
index f6d9b93c8ed..777037e7d86 100644
--- a/sys/dev/raidframe/rf_dagflags.h
+++ b/sys/dev/raidframe/rf_dagflags.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagflags.h,v 1.4 2004/01/01 23:35:08 oster Exp $ */
+/* $NetBSD: rf_dagflags.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_dagfuncs.c b/sys/dev/raidframe/rf_dagfuncs.c
index 369250c3c47..ac932d305b2 100644
--- a/sys/dev/raidframe/rf_dagfuncs.c
+++ b/sys/dev/raidframe/rf_dagfuncs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagfuncs.c,v 1.24 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_dagfuncs.c,v 1.25 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.24 2005/05/29 22:03:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.25 2005/12/11 12:23:37 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
diff --git a/sys/dev/raidframe/rf_dagfuncs.h b/sys/dev/raidframe/rf_dagfuncs.h
index 240d68da740..40176b1f801 100644
--- a/sys/dev/raidframe/rf_dagfuncs.h
+++ b/sys/dev/raidframe/rf_dagfuncs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagfuncs.h,v 1.8 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_dagfuncs.h,v 1.9 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_dagutils.c b/sys/dev/raidframe/rf_dagutils.c
index ed5093836fd..40d6a5157e8 100644
--- a/sys/dev/raidframe/rf_dagutils.c
+++ b/sys/dev/raidframe/rf_dagutils.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagutils.c,v 1.46 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_dagutils.c,v 1.47 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagutils.c,v 1.46 2005/05/29 22:03:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagutils.c,v 1.47 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_dagutils.h b/sys/dev/raidframe/rf_dagutils.h
index d704a123b1c..d69ed8311a3 100644
--- a/sys/dev/raidframe/rf_dagutils.h
+++ b/sys/dev/raidframe/rf_dagutils.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagutils.h,v 1.19 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_dagutils.h,v 1.20 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_debugMem.c b/sys/dev/raidframe/rf_debugMem.c
index f76351cb1b2..3cecdf2e1d6 100644
--- a/sys/dev/raidframe/rf_debugMem.c
+++ b/sys/dev/raidframe/rf_debugMem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_debugMem.c,v 1.15 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_debugMem.c,v 1.16 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_debugMem.c,v 1.15 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_debugMem.c,v 1.16 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_debugMem.h b/sys/dev/raidframe/rf_debugMem.h
index ffd7d5b0043..e17a7ffd0e3 100644
--- a/sys/dev/raidframe/rf_debugMem.h
+++ b/sys/dev/raidframe/rf_debugMem.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_debugMem.h,v 1.11 2003/12/29 03:33:47 oster Exp $ */
+/* $NetBSD: rf_debugMem.h,v 1.12 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_debugprint.c b/sys/dev/raidframe/rf_debugprint.c
index f470d720fcf..1ed565b0ad7 100644
--- a/sys/dev/raidframe/rf_debugprint.c
+++ b/sys/dev/raidframe/rf_debugprint.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_debugprint.c,v 1.9 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_debugprint.c,v 1.10 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_debugprint.c,v 1.9 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_debugprint.c,v 1.10 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_debugprint.h b/sys/dev/raidframe/rf_debugprint.h
index 11324b83478..1272c9cb1ab 100644
--- a/sys/dev/raidframe/rf_debugprint.h
+++ b/sys/dev/raidframe/rf_debugprint.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_debugprint.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_debugprint.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* rf_debugprint.h
*/
diff --git a/sys/dev/raidframe/rf_decluster.c b/sys/dev/raidframe/rf_decluster.c
index 672108c1f25..58f0c8a236d 100644
--- a/sys/dev/raidframe/rf_decluster.c
+++ b/sys/dev/raidframe/rf_decluster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_decluster.c,v 1.17 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_decluster.c,v 1.18 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -48,7 +48,7 @@
*--------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.17 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.18 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_decluster.h b/sys/dev/raidframe/rf_decluster.h
index afda37b28d6..438b77c5b4b 100644
--- a/sys/dev/raidframe/rf_decluster.h
+++ b/sys/dev/raidframe/rf_decluster.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_decluster.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_decluster.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_declusterPQ.c b/sys/dev/raidframe/rf_declusterPQ.c
index 9c14ede0ca6..d87eb984159 100644
--- a/sys/dev/raidframe/rf_declusterPQ.c
+++ b/sys/dev/raidframe/rf_declusterPQ.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_declusterPQ.c,v 1.11 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_declusterPQ.c,v 1.12 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -35,7 +35,7 @@
*--------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_declusterPQ.c,v 1.11 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_declusterPQ.c,v 1.12 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_declusterPQ.h b/sys/dev/raidframe/rf_declusterPQ.h
index 3ec963d63d6..c8bd77ad1a4 100644
--- a/sys/dev/raidframe/rf_declusterPQ.h
+++ b/sys/dev/raidframe/rf_declusterPQ.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_declusterPQ.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_declusterPQ.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_desc.h b/sys/dev/raidframe/rf_desc.h
index a1141bedb97..c2c35e9d644 100644
--- a/sys/dev/raidframe/rf_desc.h
+++ b/sys/dev/raidframe/rf_desc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_desc.h,v 1.18 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_desc.h,v 1.19 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c
index df166fb0438..a25154c3f3d 100644
--- a/sys/dev/raidframe/rf_diskqueue.c
+++ b/sys/dev/raidframe/rf_diskqueue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_diskqueue.c,v 1.41 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_diskqueue.c,v 1.42 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -66,7 +66,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.41 2005/05/29 22:03:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.42 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_diskqueue.h b/sys/dev/raidframe/rf_diskqueue.h
index c593915c5cb..cef1e8ef889 100644
--- a/sys/dev/raidframe/rf_diskqueue.h
+++ b/sys/dev/raidframe/rf_diskqueue.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_diskqueue.h,v 1.20 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_diskqueue.h,v 1.21 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c
index 143e1fc139d..0332a98301f 100644
--- a/sys/dev/raidframe/rf_disks.c
+++ b/sys/dev/raidframe/rf_disks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.c,v 1.58 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_disks.c,v 1.59 2005/12/11 12:23:37 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -67,7 +67,7 @@
***************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.58 2005/05/29 22:03:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.59 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -577,7 +577,7 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, char *bf, RF_RaidDisk_t *diskPtr,
struct partinfo dpart;
struct vnode *vp;
struct vattr va;
- struct proc *proc;
+ struct lwp *l;
int error;
p = rf_find_non_white(bf);
@@ -587,7 +587,7 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, char *bf, RF_RaidDisk_t *diskPtr,
}
(void) strcpy(diskPtr->devname, p);
- proc = raidPtr->engine_thread;
+ l = LIST_FIRST(&raidPtr->engine_thread->p_lwps);
/* Let's start by claiming the component is fine and well... */
diskPtr->status = rf_ds_optimal;
@@ -602,7 +602,7 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, char *bf, RF_RaidDisk_t *diskPtr,
return (0);
}
- error = raidlookup(diskPtr->devname, proc, &vp);
+ error = raidlookup(diskPtr->devname, l, &vp);
if (error) {
printf("raidlookup on device: %s failed!\n", diskPtr->devname);
if (error == ENXIO) {
@@ -614,11 +614,12 @@ rf_ConfigureDisk(RF_Raid_t *raidPtr, char *bf, RF_RaidDisk_t *diskPtr,
}
if (diskPtr->status == rf_ds_optimal) {
- if ((error = VOP_GETATTR(vp, &va, proc->p_ucred, proc)) != 0) {
+ if ((error = VOP_GETATTR(vp, &va,
+ l->l_proc->p_ucred, l)) != 0) {
return (error);
}
error = VOP_IOCTL(vp, DIOCGPART, &dpart,
- FREAD, proc->p_ucred, proc);
+ FREAD, l->l_proc->p_ucred, l);
if (error) {
return (error);
}
diff --git a/sys/dev/raidframe/rf_disks.h b/sys/dev/raidframe/rf_disks.h
index d63704edd93..8690a10af6b 100644
--- a/sys/dev/raidframe/rf_disks.h
+++ b/sys/dev/raidframe/rf_disks.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.h,v 1.13 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_disks.h,v 1.14 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c
index 15f18309b15..3fee97290b7 100644
--- a/sys/dev/raidframe/rf_driver.c
+++ b/sys/dev/raidframe/rf_driver.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_driver.c,v 1.108 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_driver.c,v 1.109 2005/12/11 12:23:37 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.108 2005/05/29 22:03:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.109 2005/12/11 12:23:37 christos Exp $");
#include "opt_raid_diagnostic.h"
diff --git a/sys/dev/raidframe/rf_driver.h b/sys/dev/raidframe/rf_driver.h
index a46710e5782..1b0580d5ab3 100644
--- a/sys/dev/raidframe/rf_driver.h
+++ b/sys/dev/raidframe/rf_driver.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_driver.h,v 1.15 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_driver.h,v 1.16 2005/12/11 12:23:37 christos Exp $ */
/*
* rf_driver.h
*/
diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c
index d850f90f549..b82545cc774 100644
--- a/sys/dev/raidframe/rf_engine.c
+++ b/sys/dev/raidframe/rf_engine.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_engine.c,v 1.36 2005/09/25 19:47:17 oster Exp $ */
+/* $NetBSD: rf_engine.c,v 1.37 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -55,7 +55,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.36 2005/09/25 19:47:17 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.37 2005/12/11 12:23:37 christos Exp $");
#include <sys/errno.h>
diff --git a/sys/dev/raidframe/rf_engine.h b/sys/dev/raidframe/rf_engine.h
index f4f5b89046d..0d7b353b46b 100644
--- a/sys/dev/raidframe/rf_engine.h
+++ b/sys/dev/raidframe/rf_engine.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_engine.h,v 1.5 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_engine.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_etimer.h b/sys/dev/raidframe/rf_etimer.h
index f035e0688f1..140918e22a7 100644
--- a/sys/dev/raidframe/rf_etimer.h
+++ b/sys/dev/raidframe/rf_etimer.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_etimer.h,v 1.9 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_etimer.h,v 1.10 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_evenodd.c b/sys/dev/raidframe/rf_evenodd.c
index e3cf5b8b7a3..6e146739d8e 100644
--- a/sys/dev/raidframe/rf_evenodd.c
+++ b/sys/dev/raidframe/rf_evenodd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_evenodd.c,v 1.14 2005/02/27 00:27:44 perry Exp $ */
+/* $NetBSD: rf_evenodd.c,v 1.15 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
****************************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.14 2005/02/27 00:27:44 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.15 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
diff --git a/sys/dev/raidframe/rf_evenodd.h b/sys/dev/raidframe/rf_evenodd.h
index b130b9a18ff..38f5f734c33 100644
--- a/sys/dev/raidframe/rf_evenodd.h
+++ b/sys/dev/raidframe/rf_evenodd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_evenodd.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_evenodd.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_evenodd_dagfuncs.c b/sys/dev/raidframe/rf_evenodd_dagfuncs.c
index 6abce0a607d..bf4361d9c31 100644
--- a/sys/dev/raidframe/rf_evenodd_dagfuncs.c
+++ b/sys/dev/raidframe/rf_evenodd_dagfuncs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.14 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.15 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_evenodd_dagfuncs.c,v 1.14 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_evenodd_dagfuncs.c,v 1.15 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
#include "opt_raid_diagnostic.h"
diff --git a/sys/dev/raidframe/rf_evenodd_dagfuncs.h b/sys/dev/raidframe/rf_evenodd_dagfuncs.h
index ef191945c01..b4c69e260c6 100644
--- a/sys/dev/raidframe/rf_evenodd_dagfuncs.h
+++ b/sys/dev/raidframe/rf_evenodd_dagfuncs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_evenodd_dagfuncs.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_evenodd_dagfuncs.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */
/*
* rf_evenodd_dagfuncs.h
*/
diff --git a/sys/dev/raidframe/rf_fifo.c b/sys/dev/raidframe/rf_fifo.c
index 6aac80827f4..e877b647646 100644
--- a/sys/dev/raidframe/rf_fifo.c
+++ b/sys/dev/raidframe/rf_fifo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_fifo.c,v 1.12 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_fifo.c,v 1.13 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -36,7 +36,7 @@
***************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_fifo.c,v 1.12 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_fifo.c,v 1.13 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_fifo.h b/sys/dev/raidframe/rf_fifo.h
index 3d9cb1e50df..7f64fa195d2 100644
--- a/sys/dev/raidframe/rf_fifo.h
+++ b/sys/dev/raidframe/rf_fifo.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_fifo.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_fifo.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_general.h b/sys/dev/raidframe/rf_general.h
index 35dfc2061c2..d1a5180ecdc 100644
--- a/sys/dev/raidframe/rf_general.h
+++ b/sys/dev/raidframe/rf_general.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_general.h,v 1.15 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_general.h,v 1.16 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_interdecluster.c b/sys/dev/raidframe/rf_interdecluster.c
index 59f2dd67517..4181f87c550 100644
--- a/sys/dev/raidframe/rf_interdecluster.c
+++ b/sys/dev/raidframe/rf_interdecluster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_interdecluster.c,v 1.10 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_interdecluster.c,v 1.11 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_interdecluster.c,v 1.10 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_interdecluster.c,v 1.11 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
diff --git a/sys/dev/raidframe/rf_interdecluster.h b/sys/dev/raidframe/rf_interdecluster.h
index 9480120e4f7..bcd4324fac4 100644
--- a/sys/dev/raidframe/rf_interdecluster.h
+++ b/sys/dev/raidframe/rf_interdecluster.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_interdecluster.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_interdecluster.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_kintf.h b/sys/dev/raidframe/rf_kintf.h
index 566ed472418..3833fc97cd3 100644
--- a/sys/dev/raidframe/rf_kintf.h
+++ b/sys/dev/raidframe/rf_kintf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_kintf.h,v 1.18 2003/06/29 22:30:32 fvdl Exp $ */
+/* $NetBSD: rf_kintf.h,v 1.19 2005/12/11 12:23:37 christos Exp $ */
/*
* rf_kintf.h
*
@@ -47,7 +47,7 @@ int raidread_component_label(dev_t, struct vnode *, RF_ComponentLabel_t *);
#define RF_NORMAL_COMPONENT_UPDATE 0
#define RF_FINAL_COMPONENT_UPDATE 1
void rf_update_component_labels(RF_Raid_t *, int);
-int raidlookup(char *, struct proc *, struct vnode **);
+int raidlookup(char *, struct lwp *, struct vnode **);
int raidmarkclean(dev_t dev, struct vnode *b_vp, int);
int raidmarkdirty(dev_t dev, struct vnode *b_vp, int);
void raid_init_component_label(RF_Raid_t *, RF_ComponentLabel_t *);
diff --git a/sys/dev/raidframe/rf_layout.c b/sys/dev/raidframe/rf_layout.c
index 844be162832..a6769498867 100644
--- a/sys/dev/raidframe/rf_layout.c
+++ b/sys/dev/raidframe/rf_layout.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_layout.c,v 1.17 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_layout.c,v 1.18 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_layout.c,v 1.17 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_layout.c,v 1.18 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_layout.h b/sys/dev/raidframe/rf_layout.h
index 48aa8cbf7ec..5901f3a35f2 100644
--- a/sys/dev/raidframe/rf_layout.h
+++ b/sys/dev/raidframe/rf_layout.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_layout.h,v 1.15 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_layout.h,v 1.16 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_map.c b/sys/dev/raidframe/rf_map.c
index 0342ff7a975..a25933d9595 100644
--- a/sys/dev/raidframe/rf_map.c
+++ b/sys/dev/raidframe/rf_map.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_map.c,v 1.38 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_map.c,v 1.39 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.38 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.39 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_map.h b/sys/dev/raidframe/rf_map.h
index cc177ba3dd1..2ff35b3e046 100644
--- a/sys/dev/raidframe/rf_map.h
+++ b/sys/dev/raidframe/rf_map.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_map.h,v 1.11 2004/03/20 04:22:05 oster Exp $ */
+/* $NetBSD: rf_map.h,v 1.12 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_mcpair.c b/sys/dev/raidframe/rf_mcpair.c
index 39f2fb50fda..6051e510826 100644
--- a/sys/dev/raidframe/rf_mcpair.c
+++ b/sys/dev/raidframe/rf_mcpair.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_mcpair.c,v 1.18 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_mcpair.c,v 1.19 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_mcpair.c,v 1.18 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_mcpair.c,v 1.19 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_mcpair.h b/sys/dev/raidframe/rf_mcpair.h
index 54106fecf57..063545d757f 100644
--- a/sys/dev/raidframe/rf_mcpair.h
+++ b/sys/dev/raidframe/rf_mcpair.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_mcpair.h,v 1.8 2004/03/04 03:02:01 oster Exp $ */
+/* $NetBSD: rf_mcpair.h,v 1.9 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_netbsd.h b/sys/dev/raidframe/rf_netbsd.h
index bf58444669f..7ee021a7f92 100644
--- a/sys/dev/raidframe/rf_netbsd.h
+++ b/sys/dev/raidframe/rf_netbsd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsd.h,v 1.24 2005/09/25 19:47:17 oster Exp $ */
+/* $NetBSD: rf_netbsd.h,v 1.25 2005/12/11 12:23:37 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 0c6057302d5..e6ed808e388 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.191 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.192 2005/12/11 12:23:37 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -146,7 +146,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.191 2005/10/15 17:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.192 2005/12/11 12:23:37 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -527,7 +527,7 @@ raidsize(dev_t dev)
omask = rs->sc_dkdev.dk_openmask & (1 << part);
lp = rs->sc_dkdev.dk_label;
- if (omask == 0 && raidopen(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && raidopen(dev, 0, S_IFBLK, curlwp))
return (-1);
if (lp->d_partitions[part].p_fstype != FS_SWAP)
@@ -536,7 +536,7 @@ raidsize(dev_t dev)
size = lp->d_partitions[part].p_size *
(lp->d_secsize / DEV_BSIZE);
- if (omask == 0 && raidclose(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && raidclose(dev, 0, S_IFBLK, curlwp))
return (-1);
return (size);
@@ -551,7 +551,7 @@ raiddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
}
/* ARGSUSED */
int
-raidopen(dev_t dev, int flags, int fmt, struct proc *p)
+raidopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit = raidunit(dev);
struct raid_softc *rs;
@@ -621,7 +621,7 @@ raidopen(dev_t dev, int flags, int fmt, struct proc *p)
}
/* ARGSUSED */
int
-raidclose(dev_t dev, int flags, int fmt, struct proc *p)
+raidclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit = raidunit(dev);
struct raid_softc *rs;
@@ -776,7 +776,7 @@ raidwrite(dev_t dev, struct uio *uio, int flags)
}
int
-raidioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+raidioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int unit = raidunit(dev);
int error = 0;
@@ -2136,32 +2136,34 @@ raidmakedisklabel(struct raid_softc *rs)
* You'll find the original of this in ccd.c
*/
int
-raidlookup(char *path, struct proc *p, struct vnode **vpp)
+raidlookup(char *path, struct lwp *l, struct vnode **vpp)
{
struct nameidata nd;
struct vnode *vp;
+ struct proc *p;
struct vattr va;
int error;
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, p);
+ p = l ? l->l_proc : NULL;
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, path, l);
if ((error = vn_open(&nd, FREAD | FWRITE, 0)) != 0) {
return (error);
}
vp = nd.ni_vp;
if (vp->v_usecount > 1) {
VOP_UNLOCK(vp, 0);
- (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p);
+ (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l);
return (EBUSY);
}
- if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0) {
+ if ((error = VOP_GETATTR(vp, &va, p->p_ucred, l)) != 0) {
VOP_UNLOCK(vp, 0);
- (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p);
+ (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l);
return (error);
}
/* XXX: eventually we should handle VREG, too. */
if (va.va_type != VBLK) {
VOP_UNLOCK(vp, 0);
- (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p);
+ (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l);
return (ENOTBLK);
}
VOP_UNLOCK(vp, 0);
@@ -2478,8 +2480,10 @@ void
rf_close_component(RF_Raid_t *raidPtr, struct vnode *vp, int auto_configured)
{
struct proc *p;
+ struct lwp *l;
p = raidPtr->engine_thread;
+ l = LIST_FIRST(&p->p_lwps);
if (vp != NULL) {
if (auto_configured == 1) {
@@ -2488,7 +2492,7 @@ rf_close_component(RF_Raid_t *raidPtr, struct vnode *vp, int auto_configured)
vput(vp);
} else {
- (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, p);
+ (void) vn_close(vp, FREAD | FWRITE, p->p_ucred, l);
}
}
}
diff --git a/sys/dev/raidframe/rf_nwayxor.c b/sys/dev/raidframe/rf_nwayxor.c
index a430f9859b3..f7c26bc2451 100644
--- a/sys/dev/raidframe/rf_nwayxor.c
+++ b/sys/dev/raidframe/rf_nwayxor.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_nwayxor.c,v 1.8 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_nwayxor.c,v 1.9 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -36,7 +36,7 @@
************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_nwayxor.c,v 1.8 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_nwayxor.c,v 1.9 2005/12/11 12:23:37 christos Exp $");
#include "rf_nwayxor.h"
#include "rf_shutdown.h"
diff --git a/sys/dev/raidframe/rf_options.c b/sys/dev/raidframe/rf_options.c
index 547496a0960..a78a9e523d3 100644
--- a/sys/dev/raidframe/rf_options.c
+++ b/sys/dev/raidframe/rf_options.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_options.c,v 1.6 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_options.c,v 1.7 2005/12/11 12:23:37 christos Exp $ */
/*
* rf_options.c
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_options.c,v 1.6 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_options.c,v 1.7 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_options.h b/sys/dev/raidframe/rf_options.h
index 41fd9ce295a..212b54de7b0 100644
--- a/sys/dev/raidframe/rf_options.h
+++ b/sys/dev/raidframe/rf_options.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_options.h,v 1.4 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_options.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */
/*
* rf_options.h
*/
diff --git a/sys/dev/raidframe/rf_optnames.h b/sys/dev/raidframe/rf_optnames.h
index 61e8b0f0803..501927c4f89 100644
--- a/sys/dev/raidframe/rf_optnames.h
+++ b/sys/dev/raidframe/rf_optnames.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_optnames.h,v 1.10 2004/01/09 23:26:17 oster Exp $ */
+/* $NetBSD: rf_optnames.h,v 1.11 2005/12/11 12:23:37 christos Exp $ */
/*
* rf_optnames.h
*/
diff --git a/sys/dev/raidframe/rf_paritylog.c b/sys/dev/raidframe/rf_paritylog.c
index 788c93240c5..51632bc73e2 100644
--- a/sys/dev/raidframe/rf_paritylog.c
+++ b/sys/dev/raidframe/rf_paritylog.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritylog.c,v 1.10 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_paritylog.c,v 1.11 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritylog.c,v 1.10 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritylog.c,v 1.11 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
diff --git a/sys/dev/raidframe/rf_paritylogDiskMgr.c b/sys/dev/raidframe/rf_paritylogDiskMgr.c
index 867884893ef..86a35217d23 100644
--- a/sys/dev/raidframe/rf_paritylogDiskMgr.c
+++ b/sys/dev/raidframe/rf_paritylogDiskMgr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritylogDiskMgr.c,v 1.17 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_paritylogDiskMgr.c,v 1.18 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritylogDiskMgr.c,v 1.17 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritylogDiskMgr.c,v 1.18 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
diff --git a/sys/dev/raidframe/rf_paritylogging.c b/sys/dev/raidframe/rf_paritylogging.c
index 98ce06f009d..c855d84aeba 100644
--- a/sys/dev/raidframe/rf_paritylogging.c
+++ b/sys/dev/raidframe/rf_paritylogging.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritylogging.c,v 1.23 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_paritylogging.c,v 1.24 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.23 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.24 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
diff --git a/sys/dev/raidframe/rf_paritylogging.h b/sys/dev/raidframe/rf_paritylogging.h
index eaced38eb2f..076835bec95 100644
--- a/sys/dev/raidframe/rf_paritylogging.h
+++ b/sys/dev/raidframe/rf_paritylogging.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritylogging.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_paritylogging.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_parityloggingdags.c b/sys/dev/raidframe/rf_parityloggingdags.c
index 8bbccffa43d..8e917bbaa7e 100644
--- a/sys/dev/raidframe/rf_parityloggingdags.c
+++ b/sys/dev/raidframe/rf_parityloggingdags.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_parityloggingdags.c,v 1.14 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_parityloggingdags.c,v 1.15 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.14 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.15 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
#include "opt_raid_diagnostic.h"
diff --git a/sys/dev/raidframe/rf_parityloggingdags.h b/sys/dev/raidframe/rf_parityloggingdags.h
index 2374c851a85..412465acb17 100644
--- a/sys/dev/raidframe/rf_parityloggingdags.h
+++ b/sys/dev/raidframe/rf_parityloggingdags.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_parityloggingdags.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_parityloggingdags.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_parityscan.c b/sys/dev/raidframe/rf_parityscan.c
index 874481e06d8..427d0381f20 100644
--- a/sys/dev/raidframe/rf_parityscan.c
+++ b/sys/dev/raidframe/rf_parityscan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_parityscan.c,v 1.29 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_parityscan.c,v 1.30 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_parityscan.c,v 1.29 2005/05/29 22:03:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_parityscan.c,v 1.30 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_parityscan.h b/sys/dev/raidframe/rf_parityscan.h
index 9f8743f606f..1eab84437e9 100644
--- a/sys/dev/raidframe/rf_parityscan.h
+++ b/sys/dev/raidframe/rf_parityscan.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_parityscan.h,v 1.6 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_parityscan.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_pq.c b/sys/dev/raidframe/rf_pq.c
index 42dd3d81bad..cf46eeb34d6 100644
--- a/sys/dev/raidframe/rf_pq.c
+++ b/sys/dev/raidframe/rf_pq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_pq.c,v 1.14 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_pq.c,v 1.15 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_pq.c,v 1.14 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_pq.c,v 1.15 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
diff --git a/sys/dev/raidframe/rf_pq.h b/sys/dev/raidframe/rf_pq.h
index 3601b0f49f8..8992bb5565d 100644
--- a/sys/dev/raidframe/rf_pq.h
+++ b/sys/dev/raidframe/rf_pq.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_pq.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_pq.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */
/*
* rf_pq.h
*/
diff --git a/sys/dev/raidframe/rf_pqdeg.c b/sys/dev/raidframe/rf_pqdeg.c
index c2ce030e396..b1d4daa2e99 100644
--- a/sys/dev/raidframe/rf_pqdeg.c
+++ b/sys/dev/raidframe/rf_pqdeg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_pqdeg.c,v 1.8 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_pqdeg.c,v 1.9 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_pqdeg.c,v 1.8 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_pqdeg.c,v 1.9 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
diff --git a/sys/dev/raidframe/rf_pqdegdags.c b/sys/dev/raidframe/rf_pqdegdags.c
index 001798aa530..ccfb5aca39b 100644
--- a/sys/dev/raidframe/rf_pqdegdags.c
+++ b/sys/dev/raidframe/rf_pqdegdags.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_pqdegdags.c,v 1.10 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_pqdegdags.c,v 1.11 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_pqdegdags.c,v 1.10 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_pqdegdags.c,v 1.11 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
diff --git a/sys/dev/raidframe/rf_psstatus.c b/sys/dev/raidframe/rf_psstatus.c
index 9d6d57dd8f4..cbb24fb57ea 100644
--- a/sys/dev/raidframe/rf_psstatus.c
+++ b/sys/dev/raidframe/rf_psstatus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_psstatus.c,v 1.29 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_psstatus.c,v 1.30 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -37,7 +37,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.29 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.30 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_psstatus.h b/sys/dev/raidframe/rf_psstatus.h
index 428fdf6d4e1..cb62196e00e 100644
--- a/sys/dev/raidframe/rf_psstatus.h
+++ b/sys/dev/raidframe/rf_psstatus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_psstatus.h,v 1.11 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_psstatus.h,v 1.12 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_raid.h b/sys/dev/raidframe/rf_raid.h
index fa1fee6f4ad..a10feb4511f 100644
--- a/sys/dev/raidframe/rf_raid.h
+++ b/sys/dev/raidframe/rf_raid.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid.h,v 1.34 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_raid.h,v 1.35 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_raid0.c b/sys/dev/raidframe/rf_raid0.c
index 2507cec624e..1a33c8bb575 100644
--- a/sys/dev/raidframe/rf_raid0.c
+++ b/sys/dev/raidframe/rf_raid0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid0.c,v 1.12 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_raid0.c,v 1.13 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
***************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid0.c,v 1.12 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid0.c,v 1.13 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_raid0.h b/sys/dev/raidframe/rf_raid0.h
index 03d7e51c02a..ffb9d06735f 100644
--- a/sys/dev/raidframe/rf_raid0.h
+++ b/sys/dev/raidframe/rf_raid0.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid0.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_raid0.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_raid1.c b/sys/dev/raidframe/rf_raid1.c
index a9343ebc065..bc7d68dfe36 100644
--- a/sys/dev/raidframe/rf_raid1.c
+++ b/sys/dev/raidframe/rf_raid1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid1.c,v 1.26 2005/05/29 22:03:09 christos Exp $ */
+/* $NetBSD: rf_raid1.c,v 1.27 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.26 2005/05/29 22:03:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.27 2005/12/11 12:23:37 christos Exp $");
#include "rf_raid.h"
#include "rf_raid1.h"
diff --git a/sys/dev/raidframe/rf_raid1.h b/sys/dev/raidframe/rf_raid1.h
index 2d37845df39..9728706759a 100644
--- a/sys/dev/raidframe/rf_raid1.h
+++ b/sys/dev/raidframe/rf_raid1.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid1.h,v 1.6 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_raid1.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_raid4.c b/sys/dev/raidframe/rf_raid4.c
index 19119219e82..baffd718e02 100644
--- a/sys/dev/raidframe/rf_raid4.c
+++ b/sys/dev/raidframe/rf_raid4.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid4.c,v 1.9 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_raid4.c,v 1.10 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
***************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid4.c,v 1.9 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid4.c,v 1.10 2005/12/11 12:23:37 christos Exp $");
#include "rf_raid.h"
#include "rf_dag.h"
diff --git a/sys/dev/raidframe/rf_raid4.h b/sys/dev/raidframe/rf_raid4.h
index 6d6632efddf..c1a9fbc5c9a 100644
--- a/sys/dev/raidframe/rf_raid4.h
+++ b/sys/dev/raidframe/rf_raid4.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid4.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_raid4.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_raid5.c b/sys/dev/raidframe/rf_raid5.c
index 01e3705cb78..aefca978dce 100644
--- a/sys/dev/raidframe/rf_raid5.c
+++ b/sys/dev/raidframe/rf_raid5.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid5.c,v 1.15 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_raid5.c,v 1.16 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.15 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.16 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_raid5.h b/sys/dev/raidframe/rf_raid5.h
index 46bbc08df26..d4b779d253b 100644
--- a/sys/dev/raidframe/rf_raid5.h
+++ b/sys/dev/raidframe/rf_raid5.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid5.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_raid5.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_raid5_rotatedspare.c b/sys/dev/raidframe/rf_raid5_rotatedspare.c
index 822346247c8..f38c93715aa 100644
--- a/sys/dev/raidframe/rf_raid5_rotatedspare.c
+++ b/sys/dev/raidframe/rf_raid5_rotatedspare.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid5_rotatedspare.c,v 1.9 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_raid5_rotatedspare.c,v 1.10 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid5_rotatedspare.c,v 1.9 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid5_rotatedspare.c,v 1.10 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
diff --git a/sys/dev/raidframe/rf_raid5_rotatedspare.h b/sys/dev/raidframe/rf_raid5_rotatedspare.h
index a8b3dd6cd02..98456eb4e00 100644
--- a/sys/dev/raidframe/rf_raid5_rotatedspare.h
+++ b/sys/dev/raidframe/rf_raid5_rotatedspare.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid5_rotatedspare.h,v 1.5 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_raid5_rotatedspare.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_reconbuffer.c b/sys/dev/raidframe/rf_reconbuffer.c
index fdf534bbafd..b117c3ec9ed 100644
--- a/sys/dev/raidframe/rf_reconbuffer.c
+++ b/sys/dev/raidframe/rf_reconbuffer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconbuffer.c,v 1.22 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_reconbuffer.c,v 1.23 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
***************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconbuffer.c,v 1.22 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconbuffer.c,v 1.23 2005/12/11 12:23:37 christos Exp $");
#include "rf_raid.h"
#include "rf_reconbuffer.h"
diff --git a/sys/dev/raidframe/rf_reconbuffer.h b/sys/dev/raidframe/rf_reconbuffer.h
index f7b48f2be34..98c683a38aa 100644
--- a/sys/dev/raidframe/rf_reconbuffer.h
+++ b/sys/dev/raidframe/rf_reconbuffer.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconbuffer.h,v 1.7 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_reconbuffer.h,v 1.8 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_reconmap.c b/sys/dev/raidframe/rf_reconmap.c
index b68bc6b7ece..f71acb7e756 100644
--- a/sys/dev/raidframe/rf_reconmap.c
+++ b/sys/dev/raidframe/rf_reconmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconmap.c,v 1.26 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_reconmap.c,v 1.27 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.26 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.27 2005/12/11 12:23:37 christos Exp $");
#include "rf_raid.h"
#include <sys/time.h>
diff --git a/sys/dev/raidframe/rf_reconmap.h b/sys/dev/raidframe/rf_reconmap.h
index b03d812bf9e..5950af61021 100644
--- a/sys/dev/raidframe/rf_reconmap.h
+++ b/sys/dev/raidframe/rf_reconmap.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconmap.h,v 1.9 2004/03/18 16:54:54 oster Exp $ */
+/* $NetBSD: rf_reconmap.h,v 1.10 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c
index 913a956d59a..bf47a1c9d49 100644
--- a/sys/dev/raidframe/rf_reconstruct.c
+++ b/sys/dev/raidframe/rf_reconstruct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconstruct.c,v 1.89 2005/07/18 15:32:01 oster Exp $ */
+/* $NetBSD: rf_reconstruct.c,v 1.90 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.89 2005/07/18 15:32:01 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.90 2005/12/11 12:23:37 christos Exp $");
#include <sys/time.h>
#include <sys/buf.h>
@@ -358,7 +358,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col)
struct partinfo dpart;
struct vnode *vp;
struct vattr va;
- struct proc *proc;
+ struct lwp *lwp;
int retcode;
int ac;
@@ -413,7 +413,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col)
return (EINVAL);
}
#endif
- proc = raidPtr->engine_thread;
+ lwp = LIST_FIRST(&raidPtr->engine_thread->p_lwps);
/* This device may have been opened successfully the
first time. Close it before trying to open it again.. */
@@ -438,7 +438,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col)
raidPtr->Disks[col].devname);
#endif
RF_UNLOCK_MUTEX(raidPtr->mutex);
- retcode = raidlookup(raidPtr->Disks[col].devname, proc, &vp);
+ retcode = raidlookup(raidPtr->Disks[col].devname, lwp, &vp);
if (retcode) {
printf("raid%d: rebuilding: raidlookup on device: %s failed: %d!\n",raidPtr->raidid,
@@ -456,7 +456,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col)
/* Ok, so we can at least do a lookup...
How about actually getting a vp for it? */
- if ((retcode = VOP_GETATTR(vp, &va, proc->p_ucred, proc)) != 0) {
+ if ((retcode = VOP_GETATTR(vp, &va, lwp->l_proc->p_ucred, lwp)) != 0) {
RF_LOCK_MUTEX(raidPtr->mutex);
raidPtr->reconInProgress--;
RF_UNLOCK_MUTEX(raidPtr->mutex);
@@ -464,7 +464,7 @@ rf_ReconstructInPlace(RF_Raid_t *raidPtr, RF_RowCol_t col)
return(retcode);
}
- retcode = VOP_IOCTL(vp, DIOCGPART, &dpart, FREAD, proc->p_ucred, proc);
+ retcode = VOP_IOCTL(vp, DIOCGPART, &dpart, FREAD, lwp->l_proc->p_ucred, lwp);
if (retcode) {
RF_LOCK_MUTEX(raidPtr->mutex);
raidPtr->reconInProgress--;
diff --git a/sys/dev/raidframe/rf_reconstruct.h b/sys/dev/raidframe/rf_reconstruct.h
index 0ee2ca0aa67..1d941bbb984 100644
--- a/sys/dev/raidframe/rf_reconstruct.h
+++ b/sys/dev/raidframe/rf_reconstruct.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconstruct.h,v 1.21 2005/06/08 02:00:53 oster Exp $ */
+/* $NetBSD: rf_reconstruct.h,v 1.22 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_reconutil.c b/sys/dev/raidframe/rf_reconutil.c
index ed88aec95f3..ec92004e7b8 100644
--- a/sys/dev/raidframe/rf_reconutil.c
+++ b/sys/dev/raidframe/rf_reconutil.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconutil.c,v 1.25 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_reconutil.c,v 1.26 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,7 +31,7 @@
********************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconutil.c,v 1.25 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconutil.c,v 1.26 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_reconutil.h b/sys/dev/raidframe/rf_reconutil.h
index 6670fce5448..19b1a378540 100644
--- a/sys/dev/raidframe/rf_reconutil.h
+++ b/sys/dev/raidframe/rf_reconutil.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconutil.h,v 1.5 2003/12/29 02:38:18 oster Exp $ */
+/* $NetBSD: rf_reconutil.h,v 1.6 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_revent.c b/sys/dev/raidframe/rf_revent.c
index 6251dddbd18..6cdef859891 100644
--- a/sys/dev/raidframe/rf_revent.c
+++ b/sys/dev/raidframe/rf_revent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_revent.c,v 1.21 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_revent.c,v 1.22 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_revent.c,v 1.21 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_revent.c,v 1.22 2005/12/11 12:23:37 christos Exp $");
#include <sys/errno.h>
diff --git a/sys/dev/raidframe/rf_revent.h b/sys/dev/raidframe/rf_revent.h
index 23d8e21449d..522e8ba972b 100644
--- a/sys/dev/raidframe/rf_revent.h
+++ b/sys/dev/raidframe/rf_revent.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_revent.h,v 1.9 2005/02/05 23:35:33 oster Exp $ */
+/* $NetBSD: rf_revent.h,v 1.10 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_shutdown.c b/sys/dev/raidframe/rf_shutdown.c
index 0967acea1ee..29b3fdec1ab 100644
--- a/sys/dev/raidframe/rf_shutdown.c
+++ b/sys/dev/raidframe/rf_shutdown.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_shutdown.c,v 1.18 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_shutdown.c,v 1.19 2005/12/11 12:23:37 christos Exp $ */
/*
* rf_shutdown.c
*/
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_shutdown.c,v 1.18 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_shutdown.c,v 1.19 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_shutdown.h b/sys/dev/raidframe/rf_shutdown.h
index 0921952edd4..05b42010bb1 100644
--- a/sys/dev/raidframe/rf_shutdown.h
+++ b/sys/dev/raidframe/rf_shutdown.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_shutdown.h,v 1.6 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_shutdown.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */
/*
* rf_shutdown.h
*/
diff --git a/sys/dev/raidframe/rf_sstf.c b/sys/dev/raidframe/rf_sstf.c
index fc4ef4eadac..374ad8acdd5 100644
--- a/sys/dev/raidframe/rf_sstf.c
+++ b/sys/dev/raidframe/rf_sstf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_sstf.c,v 1.12 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_sstf.c,v 1.13 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_sstf.c,v 1.12 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_sstf.c,v 1.13 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_sstf.h b/sys/dev/raidframe/rf_sstf.h
index a3ac53fb158..ae890a2bac6 100644
--- a/sys/dev/raidframe/rf_sstf.h
+++ b/sys/dev/raidframe/rf_sstf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_sstf.h,v 1.4 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_sstf.h,v 1.5 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_states.c b/sys/dev/raidframe/rf_states.c
index 06c9c816f36..1c8739b1678 100644
--- a/sys/dev/raidframe/rf_states.c
+++ b/sys/dev/raidframe/rf_states.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_states.c,v 1.39 2005/09/25 19:47:17 oster Exp $ */
+/* $NetBSD: rf_states.c,v 1.40 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_states.c,v 1.39 2005/09/25 19:47:17 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_states.c,v 1.40 2005/12/11 12:23:37 christos Exp $");
#include <sys/errno.h>
diff --git a/sys/dev/raidframe/rf_stripelocks.c b/sys/dev/raidframe/rf_stripelocks.c
index c00e6bf96fc..663013edde8 100644
--- a/sys/dev/raidframe/rf_stripelocks.c
+++ b/sys/dev/raidframe/rf_stripelocks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_stripelocks.c,v 1.26 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_stripelocks.c,v 1.27 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_stripelocks.c,v 1.26 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_stripelocks.c,v 1.27 2005/12/11 12:23:37 christos Exp $");
#include <dev/raidframe/raidframevar.h>
diff --git a/sys/dev/raidframe/rf_stripelocks.h b/sys/dev/raidframe/rf_stripelocks.h
index abbb18909a3..6581d093e57 100644
--- a/sys/dev/raidframe/rf_stripelocks.h
+++ b/sys/dev/raidframe/rf_stripelocks.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_stripelocks.h,v 1.6 2004/03/04 02:55:58 oster Exp $ */
+/* $NetBSD: rf_stripelocks.h,v 1.7 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_threadstuff.h b/sys/dev/raidframe/rf_threadstuff.h
index eb593bb93d1..1df767bba3b 100644
--- a/sys/dev/raidframe/rf_threadstuff.h
+++ b/sys/dev/raidframe/rf_threadstuff.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_threadstuff.h,v 1.20 2003/12/29 06:30:42 oster Exp $ */
+/* $NetBSD: rf_threadstuff.h,v 1.21 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
diff --git a/sys/dev/raidframe/rf_utils.c b/sys/dev/raidframe/rf_utils.c
index 0f5e0f9bd4b..1dc429a8b5f 100644
--- a/sys/dev/raidframe/rf_utils.c
+++ b/sys/dev/raidframe/rf_utils.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_utils.c,v 1.13 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_utils.c,v 1.14 2005/12/11 12:23:37 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
****************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_utils.c,v 1.13 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_utils.c,v 1.14 2005/12/11 12:23:37 christos Exp $");
#include "rf_archs.h"
#include "rf_utils.h"
diff --git a/sys/dev/rasops/files.rasops b/sys/dev/rasops/files.rasops
index e8b1c6d72bb..edba1034877 100644
--- a/sys/dev/rasops/files.rasops
+++ b/sys/dev/rasops/files.rasops
@@ -1,4 +1,4 @@
-# $NetBSD: files.rasops,v 1.10 2005/02/27 00:27:47 perry Exp $
+# $NetBSD: files.rasops,v 1.11 2005/12/11 12:23:43 christos Exp $
# Note: `rasops_glue' is only here to force the header file's name
# hence it must be mentioned first (shudder...)
diff --git a/sys/dev/rasops/rasops.c b/sys/dev/rasops/rasops.c
index 2f3d47f74b0..5c597668fd8 100644
--- a/sys/dev/rasops/rasops.c
+++ b/sys/dev/rasops/rasops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.c,v 1.48 2005/05/02 00:00:33 macallan Exp $ */
+/* $NetBSD: rasops.c,v 1.49 2005/12/11 12:23:43 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.48 2005/05/02 00:00:33 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops.c,v 1.49 2005/12/11 12:23:43 christos Exp $");
#include "opt_rasops.h"
#include "rasops_glue.h"
diff --git a/sys/dev/rasops/rasops.h b/sys/dev/rasops/rasops.h
index 6af90fe741e..e86c19aff61 100644
--- a/sys/dev/rasops/rasops.h
+++ b/sys/dev/rasops/rasops.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.h,v 1.17 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: rasops.h,v 1.18 2005/12/11 12:23:43 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/rasops/rasops1.c b/sys/dev/rasops/rasops1.c
index 0ac41c71229..7190ad76e98 100644
--- a/sys/dev/rasops/rasops1.c
+++ b/sys/dev/rasops/rasops1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops1.c,v 1.16 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: rasops1.c,v 1.17 2005/12/11 12:23:43 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops1.c,v 1.16 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops1.c,v 1.17 2005/12/11 12:23:43 christos Exp $");
#include "opt_rasops.h"
diff --git a/sys/dev/rasops/rasops15.c b/sys/dev/rasops/rasops15.c
index 6de06b20526..e31e5b9e724 100644
--- a/sys/dev/rasops/rasops15.c
+++ b/sys/dev/rasops/rasops15.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops15.c,v 1.12 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: rasops15.c,v 1.13 2005/12/11 12:23:43 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops15.c,v 1.12 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops15.c,v 1.13 2005/12/11 12:23:43 christos Exp $");
#include "opt_rasops.h"
diff --git a/sys/dev/rasops/rasops2.c b/sys/dev/rasops/rasops2.c
index bfee62cff70..e6af9f6011f 100644
--- a/sys/dev/rasops/rasops2.c
+++ b/sys/dev/rasops/rasops2.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops2.c,v 1.10 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: rasops2.c,v 1.11 2005/12/11 12:23:43 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops2.c,v 1.10 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops2.c,v 1.11 2005/12/11 12:23:43 christos Exp $");
#include "opt_rasops.h"
diff --git a/sys/dev/rasops/rasops24.c b/sys/dev/rasops/rasops24.c
index fe0de5b6acc..903c54b2bdb 100644
--- a/sys/dev/rasops/rasops24.c
+++ b/sys/dev/rasops/rasops24.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops24.c,v 1.20 2005/05/30 22:18:19 christos Exp $ */
+/* $NetBSD: rasops24.c,v 1.21 2005/12/11 12:23:43 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops24.c,v 1.20 2005/05/30 22:18:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops24.c,v 1.21 2005/12/11 12:23:43 christos Exp $");
#include "opt_rasops.h"
diff --git a/sys/dev/rasops/rasops32.c b/sys/dev/rasops/rasops32.c
index 33503b3197a..3aa4c14e4b7 100644
--- a/sys/dev/rasops/rasops32.c
+++ b/sys/dev/rasops/rasops32.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops32.c,v 1.13 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: rasops32.c,v 1.14 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops32.c,v 1.13 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops32.c,v 1.14 2005/12/11 12:23:44 christos Exp $");
#include "opt_rasops.h"
diff --git a/sys/dev/rasops/rasops4.c b/sys/dev/rasops/rasops4.c
index c03f3bc6a5f..8c1445a396b 100644
--- a/sys/dev/rasops/rasops4.c
+++ b/sys/dev/rasops/rasops4.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops4.c,v 1.5 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: rasops4.c,v 1.6 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops4.c,v 1.5 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops4.c,v 1.6 2005/12/11 12:23:44 christos Exp $");
#include "opt_rasops.h"
diff --git a/sys/dev/rasops/rasops8.c b/sys/dev/rasops/rasops8.c
index 2b153361718..aa5a770574e 100644
--- a/sys/dev/rasops/rasops8.c
+++ b/sys/dev/rasops/rasops8.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops8.c,v 1.19 2005/09/03 22:55:55 uwe Exp $ */
+/* $NetBSD: rasops8.c,v 1.20 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rasops8.c,v 1.19 2005/09/03 22:55:55 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rasops8.c,v 1.20 2005/12/11 12:23:44 christos Exp $");
#include "opt_rasops.h"
diff --git a/sys/dev/rcons/files.rcons b/sys/dev/rcons/files.rcons
index d41edf2d836..9d65f810e75 100644
--- a/sys/dev/rcons/files.rcons
+++ b/sys/dev/rcons/files.rcons
@@ -1,4 +1,4 @@
-# $NetBSD: files.rcons,v 1.13 2005/02/27 00:27:47 perry Exp $
+# $NetBSD: files.rcons,v 1.14 2005/12/11 12:23:44 christos Exp $
#
# Configuration file for RASTER Console.
#
diff --git a/sys/dev/rcons/raster.h b/sys/dev/rcons/raster.h
index 5ec7692f37a..28f1c2271a9 100644
--- a/sys/dev/rcons/raster.h
+++ b/sys/dev/rcons/raster.h
@@ -1,4 +1,4 @@
-/* $NetBSD: raster.h,v 1.6 2003/08/07 16:31:20 agc Exp $ */
+/* $NetBSD: raster.h,v 1.7 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
diff --git a/sys/dev/rcons/raster_op.c b/sys/dev/rcons/raster_op.c
index 0a974c1b641..5065d8a4e7b 100644
--- a/sys/dev/rcons/raster_op.c
+++ b/sys/dev/rcons/raster_op.c
@@ -1,4 +1,4 @@
-/* $NetBSD: raster_op.c,v 1.14 2005/02/27 00:27:47 perry Exp $ */
+/* $NetBSD: raster_op.c,v 1.15 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raster_op.c,v 1.14 2005/02/27 00:27:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raster_op.c,v 1.15 2005/12/11 12:23:44 christos Exp $");
#include <sys/types.h>
#ifdef _KERNEL
diff --git a/sys/dev/rcons/raster_text.c b/sys/dev/rcons/raster_text.c
index 1cdf78d1297..30d14977fcf 100644
--- a/sys/dev/rcons/raster_text.c
+++ b/sys/dev/rcons/raster_text.c
@@ -1,4 +1,4 @@
-/* $NetBSD: raster_text.c,v 1.7 2003/08/07 16:31:20 agc Exp $ */
+/* $NetBSD: raster_text.c,v 1.8 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: raster_text.c,v 1.7 2003/08/07 16:31:20 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raster_text.c,v 1.8 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#ifdef _KERNEL
diff --git a/sys/dev/rcons/rcons.h b/sys/dev/rcons/rcons.h
index c7b34188783..b99c9c212f3 100644
--- a/sys/dev/rcons/rcons.h
+++ b/sys/dev/rcons/rcons.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rcons.h,v 1.15 2005/06/01 17:05:16 drochner Exp $ */
+/* $NetBSD: rcons.h,v 1.16 2005/12/11 12:23:44 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/rcons/rcons_kern.c b/sys/dev/rcons/rcons_kern.c
index 77261dc1e45..a91603803b3 100644
--- a/sys/dev/rcons/rcons_kern.c
+++ b/sys/dev/rcons/rcons_kern.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rcons_kern.c,v 1.16 2005/02/27 00:27:47 perry Exp $ */
+/* $NetBSD: rcons_kern.c,v 1.17 2005/12/11 12:23:44 christos Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rcons_kern.c,v 1.16 2005/02/27 00:27:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rcons_kern.c,v 1.17 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/rcons/rcons_subr.c b/sys/dev/rcons/rcons_subr.c
index 23b77e0d679..4ec2e6d0b67 100644
--- a/sys/dev/rcons/rcons_subr.c
+++ b/sys/dev/rcons/rcons_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rcons_subr.c,v 1.14 2005/06/01 17:05:16 drochner Exp $ */
+/* $NetBSD: rcons_subr.c,v 1.15 2005/12/11 12:23:44 christos Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rcons_subr.c,v 1.14 2005/06/01 17:05:16 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rcons_subr.c,v 1.15 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#ifdef _KERNEL
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c
index 5d5a939e4c5..0782d20f684 100644
--- a/sys/dev/rnd.c
+++ b/sys/dev/rnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rnd.c,v 1.48 2005/05/29 22:18:25 christos Exp $ */
+/* $NetBSD: rnd.c,v 1.49 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.48 2005/05/29 22:18:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rnd.c,v 1.49 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -340,7 +340,7 @@ rnd_init(void)
}
int
-rndopen(dev_t dev, int flags, int ifmt, struct proc *p)
+rndopen(dev_t dev, int flags, int ifmt, struct lwp *l)
{
if (rnd_ready == 0)
@@ -480,7 +480,7 @@ rndwrite(dev_t dev, struct uio *uio, int ioflag)
}
int
-rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
rndsource_element_t *rse;
rndstat_t *rst;
@@ -488,9 +488,11 @@ rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
rndctl_t *rctl;
rnddata_t *rnddata;
u_int32_t count, start;
+ struct proc *p;
int ret, s;
ret = 0;
+ p = l->l_proc;
switch (cmd) {
@@ -650,7 +652,7 @@ rndioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
}
int
-rndpoll(dev_t dev, int events, struct proc *p)
+rndpoll(dev_t dev, int events, struct lwp *l)
{
u_int32_t entcnt;
int revents, s;
@@ -684,7 +686,7 @@ rndpoll(dev_t dev, int events, struct proc *p)
if (entcnt >= RND_ENTROPY_THRESHOLD * 8)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &rnd_selq);
+ selrecord(l, &rnd_selq);
return (revents);
}
diff --git a/sys/dev/rndpool.c b/sys/dev/rndpool.c
index d0c1a8fef67..2046ec521d7 100644
--- a/sys/dev/rndpool.c
+++ b/sys/dev/rndpool.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rndpool.c,v 1.18 2005/02/27 00:26:58 perry Exp $ */
+/* $NetBSD: rndpool.c,v 1.19 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rndpool.c,v 1.18 2005/02/27 00:26:58 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rndpool.c,v 1.19 2005/12/11 12:20:53 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/be.c b/sys/dev/sbus/be.c
index 0eb086b9dc1..151c3192765 100644
--- a/sys/dev/sbus/be.c
+++ b/sys/dev/sbus/be.c
@@ -1,4 +1,4 @@
-/* $NetBSD: be.c,v 1.46 2005/11/05 16:01:52 bouyer Exp $ */
+/* $NetBSD: be.c,v 1.47 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.46 2005/11/05 16:01:52 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be.c,v 1.47 2005/12/11 12:23:44 christos Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
diff --git a/sys/dev/sbus/bereg.h b/sys/dev/sbus/bereg.h
index 3b96c5d9383..1e83782667d 100644
--- a/sys/dev/sbus/bereg.h
+++ b/sys/dev/sbus/bereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bereg.h,v 1.6 2003/10/16 07:20:54 pk Exp $ */
+/* $NetBSD: bereg.h,v 1.7 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sbus/bpp.c b/sys/dev/sbus/bpp.c
index 4d4c8cd1b4c..62a3e4aa716 100644
--- a/sys/dev/sbus/bpp.c
+++ b/sys/dev/sbus/bpp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bpp.c,v 1.24 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: bpp.c,v 1.25 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.24 2005/02/27 00:27:48 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpp.c,v 1.25 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -256,10 +256,10 @@ bpp_setparams(sc, hw)
}
int
-bppopen(dev, flags, mode, p)
+bppopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = BPPUNIT(dev);
struct bpp_softc *sc;
@@ -290,10 +290,10 @@ bppopen(dev, flags, mode, p)
}
int
-bppclose(dev, flags, mode, p)
+bppclose(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
struct bpp_softc *sc = bpp_cd.cd_devs[BPPUNIT(dev)];
struct lsi64854_softc *lsi = &sc->sc_lsi64854;
@@ -409,14 +409,15 @@ out:
#define BPPIOCGPARAM _IOR('P', 0x2, struct hwstate)
int
-bppioctl(dev, cmd, data, flag, p)
+bppioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct bpp_softc *sc = bpp_cd.cd_devs[BPPUNIT(dev)];
+ struct proc *p = l->l_proc;
struct hwstate *hw, *chw;
int error = 0;
int s;
@@ -477,10 +478,10 @@ bppioctl(dev, cmd, data, flag, p)
}
int
-bpppoll(dev, events, p)
+bpppoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct bpp_softc *sc = bpp_cd.cd_devs[BPPUNIT(dev)];
int revents = 0;
@@ -496,9 +497,9 @@ bpppoll(dev, events, p)
if (revents == 0) {
if (events & (POLLIN | POLLRDNORM))
- selrecord(p, &sc->sc_rsel);
+ selrecord(l, &sc->sc_rsel);
if (events & (POLLOUT | POLLWRNORM))
- selrecord(p, &sc->sc_wsel);
+ selrecord(l, &sc->sc_wsel);
}
return (revents);
diff --git a/sys/dev/sbus/bwtwo_sbus.c b/sys/dev/sbus/bwtwo_sbus.c
index f5a7cedeac7..5dccc3b24a5 100644
--- a/sys/dev/sbus/bwtwo_sbus.c
+++ b/sys/dev/sbus/bwtwo_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo_sbus.c,v 1.16 2005/06/03 22:06:25 tsutsui Exp $ */
+/* $NetBSD: bwtwo_sbus.c,v 1.17 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.16 2005/06/03 22:06:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo_sbus.c,v 1.17 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/cgsix_sbus.c b/sys/dev/sbus/cgsix_sbus.c
index 25447bb8975..38cc11c709e 100644
--- a/sys/dev/sbus/cgsix_sbus.c
+++ b/sys/dev/sbus/cgsix_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix_sbus.c,v 1.17 2005/06/04 04:41:40 tsutsui Exp $ */
+/* $NetBSD: cgsix_sbus.c,v 1.18 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.17 2005/06/04 04:41:40 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix_sbus.c,v 1.18 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/cgthree_sbus.c b/sys/dev/sbus/cgthree_sbus.c
index 3f59419d197..a45438e291d 100644
--- a/sys/dev/sbus/cgthree_sbus.c
+++ b/sys/dev/sbus/cgthree_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree_sbus.c,v 1.15 2005/06/04 04:37:21 tsutsui Exp $ */
+/* $NetBSD: cgthree_sbus.c,v 1.16 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.15 2005/06/04 04:37:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree_sbus.c,v 1.16 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/cs4231_sbus.c b/sys/dev/sbus/cs4231_sbus.c
index ea9484ffdd5..90e84c1a000 100644
--- a/sys/dev/sbus/cs4231_sbus.c
+++ b/sys/dev/sbus/cs4231_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231_sbus.c,v 1.32 2005/01/15 15:19:52 kent Exp $ */
+/* $NetBSD: cs4231_sbus.c,v 1.33 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.32 2005/01/15 15:19:52 kent Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.33 2005/12/11 12:23:44 christos Exp $");
#include "audio.h"
#if NAUDIO > 0
diff --git a/sys/dev/sbus/dbri.c b/sys/dev/sbus/dbri.c
index 1486fe567c7..9af919869a7 100644
--- a/sys/dev/sbus/dbri.c
+++ b/sys/dev/sbus/dbri.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dbri.c,v 1.2 2005/07/28 21:36:48 macallan Exp $ */
+/* $NetBSD: dbri.c,v 1.3 2005/12/11 12:23:44 christos Exp $ */
/*
* Copyright (C) 1997 Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de)
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.2 2005/07/28 21:36:48 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbri.c,v 1.3 2005/12/11 12:23:44 christos Exp $");
#include "audio.h"
#if NAUDIO > 0
diff --git a/sys/dev/sbus/dbrireg.h b/sys/dev/sbus/dbrireg.h
index 6b4008ee219..81d45df4383 100644
--- a/sys/dev/sbus/dbrireg.h
+++ b/sys/dev/sbus/dbrireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dbrireg.h,v 1.2 2005/07/28 21:36:48 macallan Exp $ */
+/* $NetBSD: dbrireg.h,v 1.3 2005/12/11 12:23:44 christos Exp $ */
/*
* Copyright (C) 1997 Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de)
diff --git a/sys/dev/sbus/dbrivar.h b/sys/dev/sbus/dbrivar.h
index d6dc24ea1f5..25d335ca3e1 100644
--- a/sys/dev/sbus/dbrivar.h
+++ b/sys/dev/sbus/dbrivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dbrivar.h,v 1.2 2005/07/28 21:36:48 macallan Exp $ */
+/* $NetBSD: dbrivar.h,v 1.3 2005/12/11 12:23:44 christos Exp $ */
/*
* Copyright (C) 1997 Rudolf Koenig (rfkoenig@immd4.informatik.uni-erlangen.de)
diff --git a/sys/dev/sbus/dma_sbus.c b/sys/dev/sbus/dma_sbus.c
index b7e8caed82b..324b1214b19 100644
--- a/sys/dev/sbus/dma_sbus.c
+++ b/sys/dev/sbus/dma_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dma_sbus.c,v 1.25 2005/05/30 22:17:47 christos Exp $ */
+/* $NetBSD: dma_sbus.c,v 1.26 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.25 2005/05/30 22:17:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma_sbus.c,v 1.26 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c
index cbc16e5461c..736c52ee209 100644
--- a/sys/dev/sbus/esp_sbus.c
+++ b/sys/dev/sbus/esp_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_sbus.c,v 1.32 2005/06/01 21:24:05 jdc Exp $ */
+/* $NetBSD: esp_sbus.c,v 1.33 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.32 2005/06/01 21:24:05 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.33 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/files.sbus b/sys/dev/sbus/files.sbus
index 0b86067ce11..cc4996c25aa 100644
--- a/sys/dev/sbus/files.sbus
+++ b/sys/dev/sbus/files.sbus
@@ -1,4 +1,4 @@
-# $NetBSD: files.sbus,v 1.22 2005/07/16 18:58:50 macallan Exp $
+# $NetBSD: files.sbus,v 1.23 2005/12/11 12:23:44 christos Exp $
#
# Config file and device description for machine-independent SBUS code.
# Included by ports that need it.
diff --git a/sys/dev/sbus/if_en.c b/sys/dev/sbus/if_en.c
index d0b259b5301..61275a8fac7 100644
--- a/sys/dev/sbus/if_en.c
+++ b/sys/dev/sbus/if_en.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_en.c,v 1.20 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: if_en.c,v 1.21 2005/12/11 12:23:44 christos Exp $ */
/*
*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.20 2005/02/27 00:27:48 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_en.c,v 1.21 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/if_hme_sbus.c b/sys/dev/sbus/if_hme_sbus.c
index e65b9a4ac66..6cdb5f589a8 100644
--- a/sys/dev/sbus/if_hme_sbus.c
+++ b/sys/dev/sbus/if_hme_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_sbus.c,v 1.20 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: if_hme_sbus.c,v 1.21 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.20 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_sbus.c,v 1.21 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/if_le.c b/sys/dev/sbus/if_le.c
index 1c1b406c1ce..8c0b852dddd 100644
--- a/sys/dev/sbus/if_le.c
+++ b/sys/dev/sbus/if_le.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.31 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: if_le.c,v 1.32 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.31 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le.c,v 1.32 2005/12/11 12:23:44 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c
index 8ed74065c2d..51b23df34f5 100644
--- a/sys/dev/sbus/if_le_lebuffer.c
+++ b/sys/dev/sbus/if_le_lebuffer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_lebuffer.c,v 1.20 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: if_le_lebuffer.c,v 1.21 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.20 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_lebuffer.c,v 1.21 2005/12/11 12:23:44 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/sbus/if_le_ledma.c b/sys/dev/sbus/if_le_ledma.c
index 4be7a1cc2da..44eb7cec17e 100644
--- a/sys/dev/sbus/if_le_ledma.c
+++ b/sys/dev/sbus/if_le_ledma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_ledma.c,v 1.25 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: if_le_ledma.c,v 1.26 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.25 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ledma.c,v 1.26 2005/12/11 12:23:44 christos Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
diff --git a/sys/dev/sbus/isp_sbus.c b/sys/dev/sbus/isp_sbus.c
index d81ba355365..dd6efae8b86 100644
--- a/sys/dev/sbus/isp_sbus.c
+++ b/sys/dev/sbus/isp_sbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_sbus.c,v 1.63 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: isp_sbus.c,v 1.64 2005/12/11 12:23:44 christos Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.63 2005/02/27 00:27:48 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_sbus.c,v 1.64 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/lebuffer.c b/sys/dev/sbus/lebuffer.c
index a4abb2cd69c..9b706c4a74e 100644
--- a/sys/dev/sbus/lebuffer.c
+++ b/sys/dev/sbus/lebuffer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffer.c,v 1.24 2005/05/30 22:17:47 christos Exp $ */
+/* $NetBSD: lebuffer.c,v 1.25 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.24 2005/05/30 22:17:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lebuffer.c,v 1.25 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/lebuffervar.h b/sys/dev/sbus/lebuffervar.h
index 22715341675..155b53a7e10 100644
--- a/sys/dev/sbus/lebuffervar.h
+++ b/sys/dev/sbus/lebuffervar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lebuffervar.h,v 1.3 2004/07/19 13:33:35 pk Exp $ */
+/* $NetBSD: lebuffervar.h,v 1.4 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c
index 3ee74d03ec0..16295e97d4e 100644
--- a/sys/dev/sbus/magma.c
+++ b/sys/dev/sbus/magma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: magma.c,v 1.30 2005/09/06 21:40:39 kleink Exp $ */
+/* $NetBSD: magma.c,v 1.31 2005/12/11 12:23:44 christos Exp $ */
/*
* magma.c
*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.30 2005/09/06 21:40:39 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: magma.c,v 1.31 2005/12/11 12:23:44 christos Exp $");
#if 0
#define MAGMA_DEBUG
@@ -902,11 +902,11 @@ mtty_attach(parent, dev, args)
* open routine. returns zero if successful, else error code
*/
int
-mttyopen(dev, flags, mode, p)
+mttyopen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
int card = MAGMA_CARD(dev);
int port = MAGMA_PORT(dev);
@@ -926,7 +926,7 @@ mttyopen(dev, flags, mode, p)
if (ISSET(tp->t_state, TS_ISOPEN) &&
ISSET(tp->t_state, TS_XCLUDE) &&
- suser(p->p_ucred, &p->p_acflag) != 0)
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0)
return (EBUSY);
s = spltty();
@@ -1001,11 +1001,11 @@ bad:
* close routine. returns zero if successful, else error code
*/
int
-mttyclose(dev, flag, mode, p)
+mttyclose(dev, flag, mode, l)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct mtty_softc *ms = mtty_cd.cd_devs[MAGMA_CARD(dev)];
struct mtty_port *mp = &ms->ms_port[MAGMA_PORT(dev)];
@@ -1075,16 +1075,16 @@ mttywrite(dev, uio, flags)
* Poll routine
*/
int
-mttypoll(dev, events, p)
+mttypoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct mtty_softc *ms = mtty_cd.cd_devs[MAGMA_CARD(dev)];
struct mtty_port *mp = &ms->ms_port[MAGMA_PORT(dev)];
struct tty *tp = mp->mp_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
/*
@@ -1104,22 +1104,22 @@ mttytty(dev)
* ioctl routine
*/
int
-mttyioctl(dev, cmd, data, flags, p)
+mttyioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
struct mtty_softc *ms = mtty_cd.cd_devs[MAGMA_CARD(dev)];
struct mtty_port *mp = &ms->ms_port[MAGMA_PORT(dev)];
struct tty *tp = mp->mp_tty;
int error;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flags, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flags, l);
if( error != EPASSTHROUGH ) return(error);
- error = ttioctl(tp, cmd, data, flags, p);
+ error = ttioctl(tp, cmd, data, flags, l);
if( error != EPASSTHROUGH ) return(error);
error = 0;
@@ -1164,7 +1164,7 @@ mttyioctl(dev, cmd, data, flags, p)
break;
case TIOCSFLAGS:
- if( suser(p->p_ucred, &p->p_acflag) )
+ if( suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) )
error = EPERM;
else
mp->mp_openflags = *((int *)data) &
@@ -1501,11 +1501,11 @@ mbpp_attach(parent, dev, args)
* open routine. returns zero if successful, else error code
*/
int
-mbppopen(dev, flags, mode, p)
+mbppopen(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
int card = MAGMA_CARD(dev);
int port = MAGMA_PORT(dev);
@@ -1554,11 +1554,11 @@ mbppopen(dev, flags, mode, p)
* close routine. returns zero if successful, else error code
*/
int
-mbppclose(dev, flag, mode, p)
+mbppclose(dev, flag, mode, l)
dev_t dev;
int flag;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct mbpp_softc *ms = mbpp_cd.cd_devs[MAGMA_CARD(dev)];
struct mbpp_port *mp = &ms->ms_port[MAGMA_PORT(dev)];
@@ -1571,12 +1571,12 @@ mbppclose(dev, flag, mode, p)
* ioctl routine
*/
int
-mbppioctl(dev, cmd, data, flags, p)
+mbppioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
struct mbpp_softc *ms = mbpp_cd.cd_devs[MAGMA_CARD(dev)];
struct mbpp_port *mp = &ms->ms_port[MAGMA_PORT(dev)];
diff --git a/sys/dev/sbus/magmareg.h b/sys/dev/sbus/magmareg.h
index 535c15a725c..b343f3452ee 100644
--- a/sys/dev/sbus/magmareg.h
+++ b/sys/dev/sbus/magmareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: magmareg.h,v 1.8 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: magmareg.h,v 1.9 2005/12/11 12:23:44 christos Exp $ */
/* magmareg.h
*
* Copyright (c) 1998 Iain Hibbert
diff --git a/sys/dev/sbus/p9100.c b/sys/dev/sbus/p9100.c
index b8fa791d10c..87ef6bae287 100644
--- a/sys/dev/sbus/p9100.c
+++ b/sys/dev/sbus/p9100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: p9100.c,v 1.24 2005/11/12 23:25:46 macallan Exp $ */
+/* $NetBSD: p9100.c,v 1.25 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.24 2005/11/12 23:25:46 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: p9100.c,v 1.25 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -521,7 +521,7 @@ p9100_shutdown(arg)
}
int
-p9100open(dev_t dev, int flags, int mode, struct proc *p)
+p9100open(dev_t dev, int flags, int mode, struct lwp *l)
{
int unit = minor(dev);
@@ -531,7 +531,7 @@ p9100open(dev_t dev, int flags, int mode, struct proc *p)
}
int
-p9100ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
+p9100ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct lwp *l)
{
struct p9100_softc *sc = pnozz_cd.cd_devs[minor(dev)];
struct fbgattr *fba;
diff --git a/sys/dev/sbus/qe.c b/sys/dev/sbus/qe.c
index d9f36971c24..b22b4ead523 100644
--- a/sys/dev/sbus/qe.c
+++ b/sys/dev/sbus/qe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qe.c,v 1.36 2005/05/30 22:17:47 christos Exp $ */
+/* $NetBSD: qe.c,v 1.37 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.36 2005/05/30 22:17:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qe.c,v 1.37 2005/12/11 12:23:44 christos Exp $");
#define QEDEBUG
diff --git a/sys/dev/sbus/qec.c b/sys/dev/sbus/qec.c
index ec13305cece..8ff7857c32b 100644
--- a/sys/dev/sbus/qec.c
+++ b/sys/dev/sbus/qec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: qec.c,v 1.33 2005/05/30 22:17:47 christos Exp $ */
+/* $NetBSD: qec.c,v 1.34 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.33 2005/05/30 22:17:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: qec.c,v 1.34 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sbus/qecvar.h b/sys/dev/sbus/qecvar.h
index 691ebc78007..f6c5be0db34 100644
--- a/sys/dev/sbus/qecvar.h
+++ b/sys/dev/sbus/qecvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qecvar.h,v 1.8 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: qecvar.h,v 1.9 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sbus/sbusvar.h b/sys/dev/sbus/sbusvar.h
index c4e0108eb15..7e75e99e1b3 100644
--- a/sys/dev/sbus/sbusvar.h
+++ b/sys/dev/sbus/sbusvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sbusvar.h,v 1.23 2005/06/04 04:40:57 tsutsui Exp $ */
+/* $NetBSD: sbusvar.h,v 1.24 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sbus/sio16.c b/sys/dev/sbus/sio16.c
index 78d80a81212..35732709fe8 100644
--- a/sys/dev/sbus/sio16.c
+++ b/sys/dev/sbus/sio16.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sio16.c,v 1.14 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: sio16.c,v 1.15 2005/12/11 12:23:44 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.14 2005/02/27 00:27:48 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio16.c,v 1.15 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c
index 3c7b5c73558..e8d3509c68c 100644
--- a/sys/dev/sbus/spif.c
+++ b/sys/dev/sbus/spif.c
@@ -1,4 +1,4 @@
-/* $NetBSD: spif.c,v 1.3 2005/09/06 21:40:39 kleink Exp $ */
+/* $NetBSD: spif.c,v 1.4 2005/12/11 12:23:44 christos Exp $ */
/* $OpenBSD: spif.c,v 1.12 2003/10/03 16:44:51 miod Exp $ */
/*
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.3 2005/09/06 21:40:39 kleink Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spif.c,v 1.4 2005/12/11 12:23:44 christos Exp $");
#include "spif.h"
#if NSPIF > 0
@@ -322,11 +322,11 @@ stty_attach(parent, dev, aux)
}
int
-stty_open(dev, flags, mode, p)
+stty_open(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct spif_softc *csc;
struct stty_softc *sc;
@@ -385,7 +385,7 @@ stty_open(dev, flags, mode, p)
CLR(tp->t_state, TS_CARR_ON);
}
else if (ISSET(tp->t_state, TS_XCLUDE) &&
- suser(p->p_ucred, &p->p_acflag) != 0) {
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0) {
return (EBUSY);
} else {
s = spltty();
@@ -410,11 +410,11 @@ stty_open(dev, flags, mode, p)
}
int
-stty_close(dev, flags, mode, p)
+stty_close(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
struct stty_softc *sc = stty_cd.cd_devs[SPIF_CARD(dev)];
struct stty_port *sp = &sc->sc_port[SPIF_PORT(dev)];
@@ -439,12 +439,12 @@ stty_close(dev, flags, mode, p)
}
int
-stty_ioctl(dev, cmd, data, flags, p)
+stty_ioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
struct stty_softc *stc = stty_cd.cd_devs[SPIF_CARD(dev)];
struct stty_port *sp = &stc->sc_port[SPIF_PORT(dev)];
@@ -452,11 +452,11 @@ stty_ioctl(dev, cmd, data, flags, p)
struct tty *tp = sp->sp_tty;
int error;
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flags, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flags, l);
if (error >= 0)
return (error);
- error = ttioctl(tp, cmd, data, flags, p);
+ error = ttioctl(tp, cmd, data, flags, l);
if (error >= 0)
return (error);
@@ -497,7 +497,7 @@ stty_ioctl(dev, cmd, data, flags, p)
*((int *)data) = sp->sp_openflags;
break;
case TIOCSFLAGS:
- if( suser(p->p_ucred, &p->p_acflag) )
+ if( suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) )
error = EPERM;
else
sp->sp_openflags = *((int *)data) &
@@ -692,16 +692,16 @@ stty_write(dev, uio, flags)
}
int
-stty_poll(dev, events, p)
+stty_poll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct stty_softc *sc = stty_cd.cd_devs[SPIF_CARD(dev)];
struct stty_port *sp = &sc->sc_port[SPIF_PORT(dev)];
struct tty *tp = sp->sp_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
struct tty *
@@ -1069,21 +1069,21 @@ sbpp_attach(parent, dev, aux)
}
int
-sbpp_open(dev, flags, mode, p)
+sbpp_open(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
return (ENXIO);
}
int
-sbpp_close(dev, flags, mode, p)
+sbpp_close(dev, flags, mode, l)
dev_t dev;
int flags;
int mode;
- struct proc *p;
+ struct lwp *l;
{
return (ENXIO);
}
@@ -1122,21 +1122,21 @@ sbpp_rw(dev, uio)
}
int
-sbpp_poll(dev, events, p)
+sbpp_poll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
- return (seltrue(dev, events, p));
+ return (seltrue(dev, events, l));
}
int
-sbpp_ioctl(dev, cmd, data, flags, p)
+sbpp_ioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
int error;
diff --git a/sys/dev/sbus/spifreg.h b/sys/dev/sbus/spifreg.h
index 5824a1e22e2..c37acbcedf4 100644
--- a/sys/dev/sbus/spifreg.h
+++ b/sys/dev/sbus/spifreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: spifreg.h,v 1.1 2004/07/24 12:37:20 mrg Exp $ */
+/* $NetBSD: spifreg.h,v 1.2 2005/12/11 12:23:44 christos Exp $ */
/* $OpenBSD: spifreg.h,v 1.5 2003/06/02 18:32:41 jason Exp $ */
/*
diff --git a/sys/dev/sbus/spifvar.h b/sys/dev/sbus/spifvar.h
index 337e0ea1c2c..0e6da870791 100644
--- a/sys/dev/sbus/spifvar.h
+++ b/sys/dev/sbus/spifvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: spifvar.h,v 1.1 2004/07/24 12:37:20 mrg Exp $ */
+/* $NetBSD: spifvar.h,v 1.2 2005/12/11 12:23:44 christos Exp $ */
/* $OpenBSD: spifvar.h,v 1.3 2003/06/02 18:32:41 jason Exp $ */
/*
diff --git a/sys/dev/sbus/stp4020reg.h b/sys/dev/sbus/stp4020reg.h
index 9541095f7b8..071fcd28d30 100644
--- a/sys/dev/sbus/stp4020reg.h
+++ b/sys/dev/sbus/stp4020reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stp4020reg.h,v 1.2 2003/12/23 13:46:18 martin Exp $ */
+/* $NetBSD: stp4020reg.h,v 1.3 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sbus/tcx.c b/sys/dev/sbus/tcx.c
index 79402b41138..a90fe153244 100644
--- a/sys/dev/sbus/tcx.c
+++ b/sys/dev/sbus/tcx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcx.c,v 1.17 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: tcx.c,v 1.18 2005/12/11 12:23:44 christos Exp $ */
/*
* Copyright (c) 1996,1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.17 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcx.c,v 1.18 2005/12/11 12:23:44 christos Exp $");
/*
* define for cg8 emulation on S24 (24-bit version of tcx) for the SS5;
@@ -348,10 +348,10 @@ static int tcx_opens = 0;
#endif
int
-tcxopen(dev, flags, mode, p)
+tcxopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = minor(dev);
#ifdef TCX_CG8
@@ -386,10 +386,10 @@ tcxopen(dev, flags, mode, p)
}
int
-tcxclose(dev, flags, mode, p)
+tcxclose(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
struct tcx_softc *sc = tcx_cd.cd_devs[minor(dev)];
#ifdef TCX_CG8
@@ -424,12 +424,12 @@ tcxclose(dev, flags, mode, p)
}
int
-tcxioctl(dev, cmd, data, flags, p)
+tcxioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
struct tcx_softc *sc = tcx_cd.cd_devs[minor(dev)];
int error;
diff --git a/sys/dev/sbus/tcxreg.h b/sys/dev/sbus/tcxreg.h
index 41c92bbe425..0f81e226c1d 100644
--- a/sys/dev/sbus/tcxreg.h
+++ b/sys/dev/sbus/tcxreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcxreg.h,v 1.2 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: tcxreg.h,v 1.3 2005/12/11 12:23:44 christos Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/sbus/xbox.c b/sys/dev/sbus/xbox.c
index 99f08d70baa..ea6172c90ba 100644
--- a/sys/dev/sbus/xbox.c
+++ b/sys/dev/sbus/xbox.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xbox.c,v 1.12 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: xbox.c,v 1.13 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.12 2005/02/04 02:10:47 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.13 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
diff --git a/sys/dev/sbus/xboxvar.h b/sys/dev/sbus/xboxvar.h
index 36f254da223..b8bbf371a4b 100644
--- a/sys/dev/sbus/xboxvar.h
+++ b/sys/dev/sbus/xboxvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: xboxvar.h,v 1.3 2005/06/04 04:40:57 tsutsui Exp $ */
+/* $NetBSD: xboxvar.h,v 1.4 2005/12/11 12:23:44 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sbus/zx.c b/sys/dev/sbus/zx.c
index 32959ee20c9..f694490a7de 100644
--- a/sys/dev/sbus/zx.c
+++ b/sys/dev/sbus/zx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zx.c,v 1.15 2005/06/04 04:36:32 tsutsui Exp $ */
+/* $NetBSD: zx.c,v 1.16 2005/12/11 12:23:44 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.15 2005/06/04 04:36:32 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zx.c,v 1.16 2005/12/11 12:23:44 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -277,7 +277,7 @@ zx_attach(struct device *parent, struct device *self, void *args)
}
int
-zxopen(dev_t dev, int flags, int mode, struct proc *p)
+zxopen(dev_t dev, int flags, int mode, struct lwp *l)
{
if (device_lookup(&zx_cd, minor(dev)) == NULL)
@@ -286,7 +286,7 @@ zxopen(dev_t dev, int flags, int mode, struct proc *p)
}
int
-zxclose(dev_t dev, int flags, int mode, struct proc *p)
+zxclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct zx_softc *sc;
@@ -298,7 +298,7 @@ zxclose(dev_t dev, int flags, int mode, struct proc *p)
}
int
-zxioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
+zxioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct lwp *l)
{
struct zx_softc *sc;
struct fbcmap *cm;
diff --git a/sys/dev/sbus/zxreg.h b/sys/dev/sbus/zxreg.h
index 8ec62fc2bff..c435c1b48be 100644
--- a/sys/dev/sbus/zxreg.h
+++ b/sys/dev/sbus/zxreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: zxreg.h,v 1.2 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: zxreg.h,v 1.3 2005/12/11 12:23:44 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
diff --git a/sys/dev/scsipi/Makefile b/sys/dev/scsipi/Makefile
index c3868342176..edcdbbb5c5a 100644
--- a/sys/dev/scsipi/Makefile
+++ b/sys/dev/scsipi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/02/21 00:29:07 thorpej Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/11 12:23:50 christos Exp $
INCSDIR= /usr/include/dev/scsipi
diff --git a/sys/dev/scsipi/atapi_base.c b/sys/dev/scsipi/atapi_base.c
index f34e3acc6f3..83526872ac8 100644
--- a/sys/dev/scsipi/atapi_base.c
+++ b/sys/dev/scsipi/atapi_base.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atapi_base.c,v 1.25 2005/05/29 22:00:50 christos Exp $ */
+/* $NetBSD: atapi_base.c,v 1.26 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapi_base.c,v 1.25 2005/05/29 22:00:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapi_base.c,v 1.26 2005/12/11 12:23:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/scsipi/atapi_tape.h b/sys/dev/scsipi/atapi_tape.h
index 5b5b0370bf3..ed7bedb7ffc 100644
--- a/sys/dev/scsipi/atapi_tape.h
+++ b/sys/dev/scsipi/atapi_tape.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atapi_tape.h,v 1.5 2005/02/21 00:29:07 thorpej Exp $ */
+/* $NetBSD: atapi_tape.h,v 1.6 2005/12/11 12:23:50 christos Exp $ */
/*-
diff --git a/sys/dev/scsipi/atapi_wdc.c b/sys/dev/scsipi/atapi_wdc.c
index 10e8d41ec14..0e58976e135 100644
--- a/sys/dev/scsipi/atapi_wdc.c
+++ b/sys/dev/scsipi/atapi_wdc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atapi_wdc.c,v 1.96 2005/07/07 17:51:32 drochner Exp $ */
+/* $NetBSD: atapi_wdc.c,v 1.97 2005/12/11 12:23:50 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.96 2005/07/07 17:51:32 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapi_wdc.c,v 1.97 2005/12/11 12:23:50 christos Exp $");
#ifndef ATADEBUG
#define ATADEBUG
diff --git a/sys/dev/scsipi/atapiconf.c b/sys/dev/scsipi/atapiconf.c
index a2ea71bacd1..92df1a3672e 100644
--- a/sys/dev/scsipi/atapiconf.c
+++ b/sys/dev/scsipi/atapiconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atapiconf.c,v 1.68 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: atapiconf.c,v 1.69 2005/12/11 12:23:50 christos Exp $ */
/*
* Copyright (c) 1996, 2001 Manuel Bouyer. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.68 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.69 2005/12/11 12:23:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/scsipi/atapiconf.h b/sys/dev/scsipi/atapiconf.h
index d05a7a276a3..4744440ac20 100644
--- a/sys/dev/scsipi/atapiconf.h
+++ b/sys/dev/scsipi/atapiconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atapiconf.h,v 1.19 2004/09/17 23:30:22 mycroft Exp $ */
+/* $NetBSD: atapiconf.h,v 1.20 2005/12/11 12:23:50 christos Exp $ */
/*
* Copyright (c) 1996, 2001 Manuel Bouyer. All rights reserved.
diff --git a/sys/dev/scsipi/cd.c b/sys/dev/scsipi/cd.c
index 8135d22059d..a959c4be39a 100644
--- a/sys/dev/scsipi/cd.c
+++ b/sys/dev/scsipi/cd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.230 2005/12/11 00:01:54 reinoud Exp $ */
+/* $NetBSD: cd.c,v 1.231 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.230 2005/12/11 00:01:54 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.231 2005/12/11 12:23:50 christos Exp $");
#include "rnd.h"
@@ -348,7 +348,7 @@ cddetach(struct device *self, int flags)
* open the device. Make sure the partition info is a up-to-date as can be.
*/
static int
-cdopen(dev_t dev, int flag, int fmt, struct proc *p)
+cdopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct cd_softc *cd;
struct scsipi_periph *periph;
@@ -510,7 +510,7 @@ bad4:
* occurence of an open device
*/
static int
-cdclose(dev_t dev, int flag, int fmt, struct proc *p)
+cdclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct cd_softc *cd = cd_cd.cd_devs[CDUNIT(dev)];
struct scsipi_periph *periph = cd->sc_periph;
@@ -1153,7 +1153,7 @@ cdcachesync(struct scsipi_periph *periph, int flags) {
* Knows about the internals of this device
*/
static int
-cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct cd_softc *cd = cd_cd.cd_devs[CDUNIT(dev)];
struct scsipi_periph *periph = cd->sc_periph;
@@ -1515,7 +1515,7 @@ bad:
default:
if (part != RAW_PART)
return (ENOTTY);
- return (scsipi_do_ioctl(periph, dev, cmd, addr, flag, p));
+ return (scsipi_do_ioctl(periph, dev, cmd, addr, flag, l));
}
#ifdef DIAGNOSTIC
diff --git a/sys/dev/scsipi/cdvar.h b/sys/dev/scsipi/cdvar.h
index b389277b1b4..b23c5a098f3 100644
--- a/sys/dev/scsipi/cdvar.h
+++ b/sys/dev/scsipi/cdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cdvar.h,v 1.25 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: cdvar.h,v 1.26 2005/12/11 12:23:50 christos Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
diff --git a/sys/dev/scsipi/ch.c b/sys/dev/scsipi/ch.c
index 5b26fc57994..9ce847b09e8 100644
--- a/sys/dev/scsipi/ch.c
+++ b/sys/dev/scsipi/ch.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ch.c,v 1.71 2005/05/30 04:25:32 christos Exp $ */
+/* $NetBSD: ch.c,v 1.72 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.71 2005/05/30 04:25:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ch.c,v 1.72 2005/12/11 12:23:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -253,7 +253,7 @@ chattach(struct device *parent, struct device *self, void *aux)
}
static int
-chopen(dev_t dev, int flags, int fmt, struct proc *p)
+chopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ch_softc *sc;
struct scsipi_periph *periph;
@@ -306,7 +306,7 @@ chopen(dev_t dev, int flags, int fmt, struct proc *p)
}
static int
-chclose(dev_t dev, int flags, int fmt, struct proc *p)
+chclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ch_softc *sc = ch_cd.cd_devs[CHUNIT(dev)];
struct scsipi_periph *periph = sc->sc_periph;
@@ -342,7 +342,7 @@ chread(dev_t dev, struct uio *uio, int flags)
}
static int
-chioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
+chioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct lwp *l)
{
struct ch_softc *sc = ch_cd.cd_devs[CHUNIT(dev)];
int error = 0;
@@ -434,7 +434,7 @@ chioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
default:
error = scsipi_do_ioctl(sc->sc_periph, dev, cmd, data,
- flags, p);
+ flags, l);
break;
}
@@ -442,7 +442,7 @@ chioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
}
static int
-chpoll(dev_t dev, int events, struct proc *p)
+chpoll(dev_t dev, int events, struct lwp *l)
{
struct ch_softc *sc = ch_cd.cd_devs[CHUNIT(dev)];
int revents;
@@ -455,7 +455,7 @@ chpoll(dev_t dev, int events, struct proc *p)
if (sc->sc_events == 0)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sc->sc_selq);
+ selrecord(l, &sc->sc_selq);
return (revents);
}
diff --git a/sys/dev/scsipi/files.scsipi b/sys/dev/scsipi/files.scsipi
index 9200d0a5e43..2b9f6f07225 100644
--- a/sys/dev/scsipi/files.scsipi
+++ b/sys/dev/scsipi/files.scsipi
@@ -1,4 +1,4 @@
-# $NetBSD: files.scsipi,v 1.40 2005/04/15 19:20:24 drochner Exp $
+# $NetBSD: files.scsipi,v 1.41 2005/12/11 12:23:50 christos Exp $
#
# Config file and device description for machine-independent SCSI code.
# Included by ports that need it. Ports that use it must provide
diff --git a/sys/dev/scsipi/if_se.c b/sys/dev/scsipi/if_se.c
index 4725172bcce..4f5a823644c 100644
--- a/sys/dev/scsipi/if_se.c
+++ b/sys/dev/scsipi/if_se.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_se.c,v 1.58 2005/06/03 13:44:11 jdc Exp $ */
+/* $NetBSD: if_se.c,v 1.59 2005/12/11 12:23:50 christos Exp $ */
/*
* Copyright (c) 1997 Ian W. Dall <ian.dall@dsto.defence.gov.au>
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.58 2005/06/03 13:44:11 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_se.c,v 1.59 2005/12/11 12:23:50 christos Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@@ -1156,10 +1156,10 @@ se_disable(sc)
* open the device.
*/
int
-seopen(dev, flag, fmt, p)
+seopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
int unit, error;
struct se_softc *sc;
@@ -1194,10 +1194,10 @@ seopen(dev, flag, fmt, p)
* occurence of an open device
*/
int
-seclose(dev, flag, fmt, p)
+seclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct se_softc *sc = se_cd.cd_devs[SEUNIT(dev)];
struct scsipi_periph *periph = sc->sc_periph;
@@ -1218,14 +1218,14 @@ seclose(dev, flag, fmt, p)
* Only does generic scsi ioctls.
*/
int
-seioctl(dev, cmd, addr, flag, p)
+seioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct se_softc *sc = se_cd.cd_devs[SEUNIT(dev)];
- return (scsipi_do_ioctl(sc->sc_periph, dev, cmd, addr, flag, p));
+ return (scsipi_do_ioctl(sc->sc_periph, dev, cmd, addr, flag, l));
}
diff --git a/sys/dev/scsipi/scsi_all.h b/sys/dev/scsipi/scsi_all.h
index b63b33fdba1..7e1c8331d2b 100644
--- a/sys/dev/scsipi/scsi_all.h
+++ b/sys/dev/scsipi/scsi_all.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_all.h,v 1.23 2005/02/21 00:29:07 thorpej Exp $ */
+/* $NetBSD: scsi_all.h,v 1.24 2005/12/11 12:23:50 christos Exp $ */
/*
* SCSI-specific interface description.
diff --git a/sys/dev/scsipi/scsi_base.c b/sys/dev/scsipi/scsi_base.c
index 4a33cf7ebd6..19c907b2eba 100644
--- a/sys/dev/scsipi/scsi_base.c
+++ b/sys/dev/scsipi/scsi_base.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_base.c,v 1.84 2004/09/18 00:08:16 mycroft Exp $ */
+/* $NetBSD: scsi_base.c,v 1.85 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsi_base.c,v 1.84 2004/09/18 00:08:16 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsi_base.c,v 1.85 2005/12/11 12:23:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/scsipi/scsi_changer.h b/sys/dev/scsipi/scsi_changer.h
index a7e13466139..2eb33bf3646 100644
--- a/sys/dev/scsipi/scsi_changer.h
+++ b/sys/dev/scsipi/scsi_changer.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_changer.h,v 1.19 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: scsi_changer.h,v 1.20 2005/12/11 12:23:50 christos Exp $ */
/*
* Copyright (c) 1996, 1999 Jason R. Thorpe <thorpej@and.com>
diff --git a/sys/dev/scsipi/scsi_ctron_ether.h b/sys/dev/scsipi/scsi_ctron_ether.h
index c736620527d..66358f915be 100644
--- a/sys/dev/scsipi/scsi_ctron_ether.h
+++ b/sys/dev/scsipi/scsi_ctron_ether.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_ctron_ether.h,v 1.8 2005/02/01 00:19:34 reinoud Exp $ */
+/* $NetBSD: scsi_ctron_ether.h,v 1.9 2005/12/11 12:23:50 christos Exp $ */
/*
* SCSI interface description
diff --git a/sys/dev/scsipi/scsi_disk.h b/sys/dev/scsipi/scsi_disk.h
index 492baafc280..06cefdae4ec 100644
--- a/sys/dev/scsipi/scsi_disk.h
+++ b/sys/dev/scsipi/scsi_disk.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_disk.h,v 1.30 2005/02/01 00:19:34 reinoud Exp $ */
+/* $NetBSD: scsi_disk.h,v 1.31 2005/12/11 12:23:50 christos Exp $ */
/*
* SCSI-specific interface description
diff --git a/sys/dev/scsipi/scsi_iu.h b/sys/dev/scsipi/scsi_iu.h
index 0bebebc2afe..d3257a542a4 100644
--- a/sys/dev/scsipi/scsi_iu.h
+++ b/sys/dev/scsipi/scsi_iu.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_iu.h,v 1.4 2005/02/01 00:19:34 reinoud Exp $ */
+/* $NetBSD: scsi_iu.h,v 1.5 2005/12/11 12:23:50 christos Exp $ */
/*
* This file is in the public domain.
diff --git a/sys/dev/scsipi/scsi_message.h b/sys/dev/scsipi/scsi_message.h
index 9f7e8a91c88..c81283074a5 100644
--- a/sys/dev/scsipi/scsi_message.h
+++ b/sys/dev/scsipi/scsi_message.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_message.h,v 1.15 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: scsi_message.h,v 1.16 2005/12/11 12:23:50 christos Exp $ */
/* Messages (1 byte) */ /* I/T (M)andatory or (O)ptional */
#define MSG_CMDCOMPLETE 0x00 /* M/M */
diff --git a/sys/dev/scsipi/scsi_scanner.h b/sys/dev/scsipi/scsi_scanner.h
index 00767038714..a7a94998f3a 100644
--- a/sys/dev/scsipi/scsi_scanner.h
+++ b/sys/dev/scsipi/scsi_scanner.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_scanner.h,v 1.10 2005/02/01 00:19:34 reinoud Exp $ */
+/* $NetBSD: scsi_scanner.h,v 1.11 2005/12/11 12:23:50 christos Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
diff --git a/sys/dev/scsipi/scsi_spc.h b/sys/dev/scsipi/scsi_spc.h
index 555d3521278..244663aec44 100644
--- a/sys/dev/scsipi/scsi_spc.h
+++ b/sys/dev/scsipi/scsi_spc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_spc.h,v 1.2 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: scsi_spc.h,v 1.3 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
diff --git a/sys/dev/scsipi/scsi_tape.h b/sys/dev/scsipi/scsi_tape.h
index 189e1c509d9..c2c729f8906 100644
--- a/sys/dev/scsipi/scsi_tape.h
+++ b/sys/dev/scsipi/scsi_tape.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_tape.h,v 1.23 2005/02/28 22:56:15 soren Exp $ */
+/* $NetBSD: scsi_tape.h,v 1.24 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/scsipi/scsiconf.c b/sys/dev/scsipi/scsiconf.c
index 72577a0dd3b..7961fc331aa 100644
--- a/sys/dev/scsipi/scsiconf.c
+++ b/sys/dev/scsipi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.233 2005/11/26 13:54:18 tsutsui Exp $ */
+/* $NetBSD: scsiconf.c,v 1.234 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.233 2005/11/26 13:54:18 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.234 2005/12/11 12:23:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -965,7 +965,7 @@ bad:
/****** Entry points for user control of the SCSI bus. ******/
static int
-scsibusopen(dev_t dev, int flag, int fmt, struct proc *p)
+scsibusopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct scsibus_softc *sc;
int error, unit = minor(dev);
@@ -986,7 +986,7 @@ scsibusopen(dev_t dev, int flag, int fmt, struct proc *p)
}
static int
-scsibusclose(dev_t dev, int flag, int fmt, struct proc *p)
+scsibusclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct scsibus_softc *sc = scsibus_cd.cd_devs[minor(dev)];
@@ -998,7 +998,7 @@ scsibusclose(dev_t dev, int flag, int fmt, struct proc *p)
}
static int
-scsibusioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+scsibusioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct scsibus_softc *sc = scsibus_cd.cd_devs[minor(dev)];
struct scsipi_channel *chan = sc->sc_channel;
@@ -1044,7 +1044,7 @@ scsibusioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
error = ENOTTY;
else
error = (*chan->chan_adapter->adapt_ioctl)(chan,
- cmd, addr, flag, p);
+ cmd, addr, flag, l->l_proc);
break;
}
diff --git a/sys/dev/scsipi/scsiconf.h b/sys/dev/scsipi/scsiconf.h
index eaede3f8d92..64573d40ef8 100644
--- a/sys/dev/scsipi/scsiconf.h
+++ b/sys/dev/scsipi/scsiconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.h,v 1.53 2004/09/17 23:30:22 mycroft Exp $ */
+/* $NetBSD: scsiconf.h,v 1.54 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/scsipi/scsipi_all.h b/sys/dev/scsipi/scsipi_all.h
index 8a6742759e4..f732721b4b4 100644
--- a/sys/dev/scsipi/scsipi_all.h
+++ b/sys/dev/scsipi/scsipi_all.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_all.h,v 1.28 2005/02/21 00:29:07 thorpej Exp $ */
+/* $NetBSD: scsipi_all.h,v 1.29 2005/12/11 12:23:50 christos Exp $ */
/*
* SCSI and SCSI-like general interface description
diff --git a/sys/dev/scsipi/scsipi_base.c b/sys/dev/scsipi/scsipi_base.c
index dd94925a7bf..3ff74ea2281 100644
--- a/sys/dev/scsipi/scsipi_base.c
+++ b/sys/dev/scsipi/scsipi_base.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_base.c,v 1.131 2005/05/31 02:56:54 xtraeme Exp $ */
+/* $NetBSD: scsipi_base.c,v 1.132 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.131 2005/05/31 02:56:54 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.132 2005/12/11 12:23:50 christos Exp $");
#include "opt_scsi.h"
diff --git a/sys/dev/scsipi/scsipi_base.h b/sys/dev/scsipi/scsipi_base.h
index 7cd883025b4..9cb52f6a5a8 100644
--- a/sys/dev/scsipi/scsipi_base.h
+++ b/sys/dev/scsipi/scsipi_base.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_base.h,v 1.17 2005/02/01 00:19:34 reinoud Exp $ */
+/* $NetBSD: scsipi_base.h,v 1.18 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/scsipi/scsipi_cd.h b/sys/dev/scsipi/scsipi_cd.h
index 7afa15c60ed..092d449d35e 100644
--- a/sys/dev/scsipi/scsipi_cd.h
+++ b/sys/dev/scsipi/scsipi_cd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_cd.h,v 1.10 2005/02/01 00:19:34 reinoud Exp $ */
+/* $NetBSD: scsipi_cd.h,v 1.11 2005/12/11 12:23:50 christos Exp $ */
/*
* Written by Julian Elischer (julian@tfs.com)
diff --git a/sys/dev/scsipi/scsipi_debug.h b/sys/dev/scsipi/scsipi_debug.h
index 6596ed8b1ea..2d99ec7cbdb 100644
--- a/sys/dev/scsipi/scsipi_debug.h
+++ b/sys/dev/scsipi/scsipi_debug.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_debug.h,v 1.15 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: scsipi_debug.h,v 1.16 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/scsipi/scsipi_disk.h b/sys/dev/scsipi/scsipi_disk.h
index 728f7bfa9fa..d82d80164a1 100644
--- a/sys/dev/scsipi/scsipi_disk.h
+++ b/sys/dev/scsipi/scsipi_disk.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_disk.h,v 1.15 2005/02/01 00:19:34 reinoud Exp $ */
+/* $NetBSD: scsipi_disk.h,v 1.16 2005/12/11 12:23:50 christos Exp $ */
/*
* SCSI and SCSI-like interfaces description
diff --git a/sys/dev/scsipi/scsipi_ioctl.c b/sys/dev/scsipi/scsipi_ioctl.c
index 14818595bec..5bf359eb8fe 100644
--- a/sys/dev/scsipi/scsipi_ioctl.c
+++ b/sys/dev/scsipi/scsipi_ioctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_ioctl.c,v 1.55 2005/11/01 20:44:04 martin Exp $ */
+/* $NetBSD: scsipi_ioctl.c,v 1.56 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.55 2005/11/01 20:44:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_ioctl.c,v 1.56 2005/12/11 12:23:50 christos Exp $");
#include "opt_compat_freebsd.h"
#include "opt_compat_netbsd.h"
@@ -299,7 +299,7 @@ bad:
*/
int
scsipi_do_ioctl(struct scsipi_periph *periph, dev_t dev, u_long cmd,
- caddr_t addr, int flag, struct proc *p)
+ caddr_t addr, int flag, struct lwp *l)
{
int error;
@@ -340,7 +340,7 @@ scsipi_do_ioctl(struct scsipi_periph *periph, dev_t dev, u_long cmd,
si->si_uio.uio_segflg = UIO_USERSPACE;
si->si_uio.uio_rw =
(screq->flags & SCCMD_READ) ? UIO_READ : UIO_WRITE;
- si->si_uio.uio_procp = p;
+ si->si_uio.uio_lwp = l;
error = physio(scsistrategy, &si->si_bp, dev,
(screq->flags & SCCMD_READ) ? B_READ : B_WRITE,
periph->periph_channel->chan_adapter->adapt_minphys,
@@ -351,7 +351,7 @@ scsipi_do_ioctl(struct scsipi_periph *periph, dev_t dev, u_long cmd,
si->si_bp.b_data = 0;
si->si_bp.b_bcount = 0;
si->si_bp.b_dev = dev;
- si->si_bp.b_proc = p;
+ si->si_bp.b_proc = l->l_proc;
scsistrategy(&si->si_bp);
error = si->si_bp.b_error;
}
diff --git a/sys/dev/scsipi/scsipi_verbose.c b/sys/dev/scsipi/scsipi_verbose.c
index cc58ea81987..222e3e10d37 100644
--- a/sys/dev/scsipi/scsipi_verbose.c
+++ b/sys/dev/scsipi/scsipi_verbose.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipi_verbose.c,v 1.27 2005/05/29 22:00:50 christos Exp $ */
+/* $NetBSD: scsipi_verbose.c,v 1.28 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.27 2005/05/29 22:00:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_verbose.c,v 1.28 2005/12/11 12:23:50 christos Exp $");
#include <sys/param.h>
#include <sys/time.h>
diff --git a/sys/dev/scsipi/scsipiconf.c b/sys/dev/scsipi/scsipiconf.c
index 72d8fcbbb8a..1a62518146a 100644
--- a/sys/dev/scsipi/scsipiconf.c
+++ b/sys/dev/scsipi/scsipiconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.c,v 1.33 2005/05/30 04:25:32 christos Exp $ */
+/* $NetBSD: scsipiconf.c,v 1.34 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.33 2005/05/30 04:25:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipiconf.c,v 1.34 2005/12/11 12:23:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/scsipi/scsipiconf.h b/sys/dev/scsipi/scsipiconf.h
index 751237296f8..7833f849b7f 100644
--- a/sys/dev/scsipi/scsipiconf.h
+++ b/sys/dev/scsipi/scsipiconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: scsipiconf.h,v 1.100 2005/05/30 04:25:32 christos Exp $ */
+/* $NetBSD: scsipiconf.h,v 1.101 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2004 The NetBSD Foundation, Inc.
@@ -670,7 +670,7 @@ int scsipi_thread_call_callback(struct scsipi_channel *,
void scsipi_async_event(struct scsipi_channel *,
scsipi_async_event_t, void *);
int scsipi_do_ioctl(struct scsipi_periph *, dev_t, u_long, caddr_t,
- int, struct proc *);
+ int, struct lwp *);
void scsipi_print_xfer_mode(struct scsipi_periph *);
void scsipi_set_xfer_mode(struct scsipi_channel *, int, int);
diff --git a/sys/dev/scsipi/sd.c b/sys/dev/scsipi/sd.c
index 2255325b63b..e4af02b30f4 100644
--- a/sys/dev/scsipi/sd.c
+++ b/sys/dev/scsipi/sd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.243 2005/12/09 09:24:30 bouyer Exp $ */
+/* $NetBSD: sd.c,v 1.244 2005/12/11 12:23:50 christos Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.243 2005/12/09 09:24:30 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.244 2005/12/11 12:23:50 christos Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -395,7 +395,7 @@ sddetach(struct device *self, int flags)
* open the device. Make sure the partition info is a up-to-date as can be.
*/
static int
-sdopen(dev_t dev, int flag, int fmt, struct proc *p)
+sdopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct sd_softc *sd;
struct scsipi_periph *periph;
@@ -579,7 +579,7 @@ sdopen(dev_t dev, int flag, int fmt, struct proc *p)
* device. Convenient now but usually a pain.
*/
static int
-sdclose(dev_t dev, int flag, int fmt, struct proc *p)
+sdclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct sd_softc *sd = sd_cd.cd_devs[SDUNIT(dev)];
struct scsipi_periph *periph = sd->sc_periph;
@@ -993,7 +993,7 @@ sdwrite(dev_t dev, struct uio *uio, int ioflag)
* Knows about the internals of this device
*/
static int
-sdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+sdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct sd_softc *sd = sd_cd.cd_devs[SDUNIT(dev)];
struct scsipi_periph *periph = sd->sc_periph;
@@ -1230,13 +1230,13 @@ bad:
{
struct dkwedge_list *dkwl = (void *) addr;
- return (dkwedge_list(&sd->sc_dk, dkwl, p));
+ return (dkwedge_list(&sd->sc_dk, dkwl, l));
}
default:
if (part != RAW_PART)
return (ENOTTY);
- return (scsipi_do_ioctl(periph, dev, cmd, addr, flag, p));
+ return (scsipi_do_ioctl(periph, dev, cmd, addr, flag, l));
}
#ifdef DIAGNOSTIC
diff --git a/sys/dev/scsipi/sdvar.h b/sys/dev/scsipi/sdvar.h
index 887a7215c65..059fb647f20 100644
--- a/sys/dev/scsipi/sdvar.h
+++ b/sys/dev/scsipi/sdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sdvar.h,v 1.27 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: sdvar.h,v 1.28 2005/12/11 12:23:51 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/scsipi/ses.c b/sys/dev/scsipi/ses.c
index b926a1c7fec..6459ebf39ba 100644
--- a/sys/dev/scsipi/ses.c
+++ b/sys/dev/scsipi/ses.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ses.c,v 1.31 2005/05/30 04:25:32 christos Exp $ */
+/* $NetBSD: ses.c,v 1.32 2005/12/11 12:23:51 christos Exp $ */
/*
* Copyright (C) 2000 National Aeronautics & Space Administration
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.31 2005/05/30 04:25:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ses.c,v 1.32 2005/12/11 12:23:51 christos Exp $");
#include "opt_scsi.h"
@@ -289,7 +289,7 @@ ses_device_type(struct scsipibus_attach_args *sa)
}
static int
-sesopen(dev_t dev, int flags, int fmt, struct proc *p)
+sesopen(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ses_softc *softc;
int error, unit;
@@ -333,7 +333,7 @@ out:
}
static int
-sesclose(dev_t dev, int flags, int fmt, struct proc *p)
+sesclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
struct ses_softc *softc;
int unit;
@@ -352,7 +352,7 @@ sesclose(dev_t dev, int flags, int fmt, struct proc *p)
}
static int
-sesioctl(dev_t dev, u_long cmd, caddr_t arg_addr, int flag, struct proc *p)
+sesioctl(dev_t dev, u_long cmd, caddr_t arg_addr, int flag, struct lwp *l)
{
ses_encstat tmp;
ses_objstat objs;
@@ -470,7 +470,7 @@ sesioctl(dev_t dev, u_long cmd, caddr_t arg_addr, int flag, struct proc *p)
default:
error = scsipi_do_ioctl(ssc->sc_periph,
- dev, cmd, arg_addr, flag, p);
+ dev, cmd, arg_addr, flag, l);
break;
}
return (error);
diff --git a/sys/dev/scsipi/ses.h b/sys/dev/scsipi/ses.h
index a847574d7bd..6e9f62d3b32 100644
--- a/sys/dev/scsipi/ses.h
+++ b/sys/dev/scsipi/ses.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ses.h,v 1.2 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: ses.h,v 1.3 2005/12/11 12:23:51 christos Exp $ */
/*
* Copyright (C) 2000 National Aeronautics & Space Administration
* All rights reserved.
diff --git a/sys/dev/scsipi/ss.c b/sys/dev/scsipi/ss.c
index e0e0e3f19dc..b4398b38207 100644
--- a/sys/dev/scsipi/ss.c
+++ b/sys/dev/scsipi/ss.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.62 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: ss.c,v 1.63 2005/12/11 12:23:51 christos Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.62 2005/10/15 17:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.63 2005/12/11 12:23:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -238,7 +238,7 @@ ssactivate(struct device *self, enum devact act)
* open the device.
*/
static int
-ssopen(dev_t dev, int flag, int mode, struct proc *p)
+ssopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit;
u_int ssmode;
@@ -310,7 +310,7 @@ bad:
* occurence of an open device
*/
static int
-ssclose(dev_t dev, int flag, int mode, struct proc *p)
+ssclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ss_softc *ss = ss_cd.cd_devs[SSUNIT(dev)];
struct scsipi_periph *periph = ss->sc_periph;
@@ -536,7 +536,7 @@ ssdone(struct scsipi_xfer *xs, int error)
* knows about the internals of this device
*/
int
-ssioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+ssioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct ss_softc *ss = ss_cd.cd_devs[SSUNIT(dev)];
int error = 0;
@@ -588,7 +588,7 @@ ssioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
#endif
default:
return (scsipi_do_ioctl(ss->sc_periph, dev, cmd, addr,
- flag, p));
+ flag, l));
}
return (error);
}
diff --git a/sys/dev/scsipi/ss_mustek.c b/sys/dev/scsipi/ss_mustek.c
index 09119c1cae2..b584b59e5cb 100644
--- a/sys/dev/scsipi/ss_mustek.c
+++ b/sys/dev/scsipi/ss_mustek.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ss_mustek.c,v 1.31 2005/10/15 17:29:25 yamt Exp $ */
+/* $NetBSD: ss_mustek.c,v 1.32 2005/12/11 12:23:51 christos Exp $ */
/*
* Copyright (c) 1995 Joachim Koenig-Baltes. All rights reserved.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.31 2005/10/15 17:29:25 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss_mustek.c,v 1.32 2005/12/11 12:23:51 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/scsipi/ss_mustek.h b/sys/dev/scsipi/ss_mustek.h
index 52548c3722f..6bcb6f920b5 100644
--- a/sys/dev/scsipi/ss_mustek.h
+++ b/sys/dev/scsipi/ss_mustek.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ss_mustek.h,v 1.8 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: ss_mustek.h,v 1.9 2005/12/11 12:23:51 christos Exp $ */
/*
* Copyright (c) 1995 Joachim Koenig-Baltes. All rights reserved.
diff --git a/sys/dev/scsipi/ss_scanjet.c b/sys/dev/scsipi/ss_scanjet.c
index 063f5e3aa41..455aa3f83ff 100644
--- a/sys/dev/scsipi/ss_scanjet.c
+++ b/sys/dev/scsipi/ss_scanjet.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ss_scanjet.c,v 1.43 2005/10/15 17:29:26 yamt Exp $ */
+/* $NetBSD: ss_scanjet.c,v 1.44 2005/12/11 12:23:51 christos Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.43 2005/10/15 17:29:26 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss_scanjet.c,v 1.44 2005/12/11 12:23:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/scsipi/ssvar.h b/sys/dev/scsipi/ssvar.h
index 748fc5a1237..78d9ff00cf2 100644
--- a/sys/dev/scsipi/ssvar.h
+++ b/sys/dev/scsipi/ssvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ssvar.h,v 1.16 2005/10/15 17:29:26 yamt Exp $ */
+/* $NetBSD: ssvar.h,v 1.17 2005/12/11 12:23:51 christos Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
diff --git a/sys/dev/scsipi/st.c b/sys/dev/scsipi/st.c
index 7d5d9db61de..f164e99ec9c 100644
--- a/sys/dev/scsipi/st.c
+++ b/sys/dev/scsipi/st.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st.c,v 1.185 2005/10/15 17:29:26 yamt Exp $ */
+/* $NetBSD: st.c,v 1.186 2005/12/11 12:23:51 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.185 2005/10/15 17:29:26 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.186 2005/12/11 12:23:51 christos Exp $");
#include "opt_scsi.h"
@@ -559,7 +559,7 @@ st_loadquirks(struct st_softc *st)
* open the device.
*/
static int
-stopen(dev_t dev, int flags, int mode, struct proc *p)
+stopen(dev_t dev, int flags, int mode, struct lwp *l)
{
u_int stmode, dsty;
int error, sflags, unit, tries, ntries;
@@ -746,7 +746,7 @@ bad:
* occurence of an open device
*/
static int
-stclose(dev_t dev, int flags, int mode, struct proc *p)
+stclose(dev_t dev, int flags, int mode, struct lwp *l)
{
int stxx, error = 0;
struct st_softc *st = st_cd.cd_devs[STUNIT(dev)];
@@ -1439,7 +1439,7 @@ stwrite(dev_t dev, struct uio *uio, int iomode)
* knows about the internals of this device
*/
static int
-stioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *p)
+stioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct lwp *l)
{
int error = 0;
int unit;
@@ -1637,7 +1637,7 @@ stioctl(dev_t dev, u_long cmd, caddr_t arg, int flag, struct proc *p)
default:
error = scsipi_do_ioctl(st->sc_periph, dev, cmd, arg,
- flag, p);
+ flag, l);
break;
}
return (error);
diff --git a/sys/dev/scsipi/st_atapi.c b/sys/dev/scsipi/st_atapi.c
index a6a98c04400..aa37a28498f 100644
--- a/sys/dev/scsipi/st_atapi.c
+++ b/sys/dev/scsipi/st_atapi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st_atapi.c,v 1.16 2005/05/29 22:00:50 christos Exp $ */
+/* $NetBSD: st_atapi.c,v 1.17 2005/12/11 12:23:51 christos Exp $ */
/*
* Copyright (c) 2001 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.16 2005/05/29 22:00:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.17 2005/12/11 12:23:51 christos Exp $");
#include "opt_scsi.h"
#include "rnd.h"
diff --git a/sys/dev/scsipi/st_scsi.c b/sys/dev/scsipi/st_scsi.c
index 7902ab477c3..f31c6818c49 100644
--- a/sys/dev/scsipi/st_scsi.c
+++ b/sys/dev/scsipi/st_scsi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: st_scsi.c,v 1.22 2005/05/30 04:25:32 christos Exp $ */
+/* $NetBSD: st_scsi.c,v 1.23 2005/12/11 12:23:51 christos Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.22 2005/05/30 04:25:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.23 2005/12/11 12:23:51 christos Exp $");
#include "opt_scsi.h"
#include "rnd.h"
diff --git a/sys/dev/scsipi/stvar.h b/sys/dev/scsipi/stvar.h
index 75ade8a23a5..32bdb6e4c34 100644
--- a/sys/dev/scsipi/stvar.h
+++ b/sys/dev/scsipi/stvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: stvar.h,v 1.15 2005/10/15 17:29:26 yamt Exp $ */
+/* $NetBSD: stvar.h,v 1.16 2005/12/11 12:23:51 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/scsipi/uk.c b/sys/dev/scsipi/uk.c
index 752c9cbb89e..dc6d439f987 100644
--- a/sys/dev/scsipi/uk.c
+++ b/sys/dev/scsipi/uk.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uk.c,v 1.45 2005/02/27 00:27:48 perry Exp $ */
+/* $NetBSD: uk.c,v 1.46 2005/12/11 12:23:51 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.45 2005/02/27 00:27:48 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.46 2005/12/11 12:23:51 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -153,7 +153,7 @@ ukdetach(struct device *self, int flags)
* open the device.
*/
static int
-ukopen(dev_t dev, int flag, int fmt, struct proc *p)
+ukopen(dev_t dev, int flag, int fmt, struct lwp *l)
{
int unit, error;
struct uk_softc *uk;
@@ -195,7 +195,7 @@ ukopen(dev_t dev, int flag, int fmt, struct proc *p)
* occurence of an open device
*/
static int
-ukclose(dev_t dev, int flag, int fmt, struct proc *p)
+ukclose(dev_t dev, int flag, int fmt, struct lwp *l)
{
struct uk_softc *uk = uk_cd.cd_devs[UKUNIT(dev)];
struct scsipi_periph *periph = uk->sc_periph;
@@ -216,9 +216,9 @@ ukclose(dev_t dev, int flag, int fmt, struct proc *p)
* Only does generic scsi ioctls.
*/
static int
-ukioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
+ukioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
register struct uk_softc *uk = uk_cd.cd_devs[UKUNIT(dev)];
- return (scsipi_do_ioctl(uk->sc_periph, dev, cmd, addr, flag, p));
+ return (scsipi_do_ioctl(uk->sc_periph, dev, cmd, addr, flag, l));
}
diff --git a/sys/dev/sequencer.c b/sys/dev/sequencer.c
index 4226db4211e..db0c908e27c 100644
--- a/sys/dev/sequencer.c
+++ b/sys/dev/sequencer.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sequencer.c,v 1.29 2005/06/01 18:41:51 drochner Exp $ */
+/* $NetBSD: sequencer.c,v 1.30 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.29 2005/06/01 18:41:51 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sequencer.c,v 1.30 2005/12/11 12:20:53 christos Exp $");
#include "sequencer.h"
@@ -171,10 +171,10 @@ sequencerattach(n)
}
int
-sequenceropen(dev, flags, ifmt, p)
+sequenceropen(dev, flags, ifmt, l)
dev_t dev;
int flags, ifmt;
- struct proc *p;
+ struct lwp *l;
{
int unit = SEQUENCERUNIT(dev);
struct sequencer_softc *sc;
@@ -319,10 +319,10 @@ seq_startoutput(sc)
}
int
-sequencerclose(dev, flags, ifmt, p)
+sequencerclose(dev, flags, ifmt, l)
dev_t dev;
int flags, ifmt;
- struct proc *p;
+ struct lwp *l;
{
struct sequencer_softc *sc = &seqdevs[SEQUENCERUNIT(dev)];
int n, s;
@@ -488,12 +488,12 @@ sequencerwrite(dev, uio, ioflag)
}
int
-sequencerioctl(dev, cmd, addr, flag, p)
+sequencerioctl(dev, cmd, addr, flag, l)
dev_t dev;
u_long cmd;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct sequencer_softc *sc = &seqdevs[SEQUENCERUNIT(dev)];
struct synth_info *si;
@@ -514,8 +514,8 @@ sequencerioctl(dev, cmd, addr, flag, p)
if (*(int *)addr) {
if (sc->async)
return EBUSY;
- sc->async = p;
- DPRINTF(("sequencer_ioctl: FIOASYNC %p\n", p));
+ sc->async = l->l_proc;
+ DPRINTF(("sequencer_ioctl: FIOASYNC %p\n", l));
} else
sc->async = 0;
break;
@@ -643,10 +643,10 @@ sequencerioctl(dev, cmd, addr, flag, p)
}
int
-sequencerpoll(dev, events, p)
+sequencerpoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct sequencer_softc *sc = &seqdevs[SEQUENCERUNIT(dev)];
int revents = 0;
@@ -663,10 +663,10 @@ sequencerpoll(dev, events, p)
if (revents == 0) {
if (events & (POLLIN | POLLRDNORM))
- selrecord(p, &sc->rsel);
+ selrecord(l, &sc->rsel);
if (events & (POLLOUT | POLLWRNORM))
- selrecord(p, &sc->wsel);
+ selrecord(l, &sc->wsel);
}
return revents;
@@ -1454,10 +1454,10 @@ midi_unit_count()
}
int
-midiopen(dev, flags, ifmt, p)
+midiopen(dev, flags, ifmt, l)
dev_t dev;
int flags, ifmt;
- struct proc *p;
+ struct lwp *l;
{
return (ENXIO);
}
@@ -1472,10 +1472,10 @@ midi_getinfo(dev, mi)
}
int
-midiclose(dev, flags, ifmt, p)
+midiclose(dev, flags, ifmt, l)
dev_t dev;
int flags, ifmt;
- struct proc *p;
+ struct lwp *l;
{
return (ENXIO);
}
diff --git a/sys/dev/sequencervar.h b/sys/dev/sequencervar.h
index 80ac12af9b0..5c6759c1663 100644
--- a/sys/dev/sequencervar.h
+++ b/sys/dev/sequencervar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sequencervar.h,v 1.9 2005/05/29 22:18:25 christos Exp $ */
+/* $NetBSD: sequencervar.h,v 1.10 2005/12/11 12:20:53 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/smbus/m41t81reg.h b/sys/dev/smbus/m41t81reg.h
index 8fb8c3588ca..dc5dbb110ee 100644
--- a/sys/dev/smbus/m41t81reg.h
+++ b/sys/dev/smbus/m41t81reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: m41t81reg.h,v 1.3 2003/10/25 15:00:38 simonb Exp $ */
+/* $NetBSD: m41t81reg.h,v 1.4 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
diff --git a/sys/dev/std/ieee1212.c b/sys/dev/std/ieee1212.c
index 1f38c6931ed..e1b35a42fb1 100644
--- a/sys/dev/std/ieee1212.c
+++ b/sys/dev/std/ieee1212.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee1212.c,v 1.9 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: ieee1212.c,v 1.10 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ieee1212.c,v 1.9 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee1212.c,v 1.10 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/std/ieee1212reg.h b/sys/dev/std/ieee1212reg.h
index 35be26d9cc0..9c55a14b3f4 100644
--- a/sys/dev/std/ieee1212reg.h
+++ b/sys/dev/std/ieee1212reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee1212reg.h,v 1.9 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: ieee1212reg.h,v 1.10 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/std/ieee1212var.h b/sys/dev/std/ieee1212var.h
index 74648aa223a..30a99018e43 100644
--- a/sys/dev/std/ieee1212var.h
+++ b/sys/dev/std/ieee1212var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee1212var.h,v 1.2 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: ieee1212var.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/Makefile b/sys/dev/sun/Makefile
index 27fbe67417f..c903cc756bc 100644
--- a/sys/dev/sun/Makefile
+++ b/sys/dev/sun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/20 02:01:30 thorpej Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/11 12:23:56 christos Exp $
INCSDIR= /usr/include/dev/sun
diff --git a/sys/dev/sun/bt_subr.c b/sys/dev/sun/bt_subr.c
index a200065c4d0..530415c05d1 100644
--- a/sys/dev/sun/bt_subr.c
+++ b/sys/dev/sun/bt_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt_subr.c,v 1.8 2003/11/13 03:09:29 chs Exp $ */
+/* $NetBSD: bt_subr.c,v 1.9 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.8 2003/11/13 03:09:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt_subr.c,v 1.9 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/btreg.h b/sys/dev/sun/btreg.h
index bae1be90523..c44760f6d07 100644
--- a/sys/dev/sun/btreg.h
+++ b/sys/dev/sun/btreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: btreg.h,v 1.2 2003/08/07 16:31:22 agc Exp $ */
+/* $NetBSD: btreg.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1993
diff --git a/sys/dev/sun/btvar.h b/sys/dev/sun/btvar.h
index c9a32b7290a..0533c1badfe 100644
--- a/sys/dev/sun/btvar.h
+++ b/sys/dev/sun/btvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: btvar.h,v 1.2 2003/08/07 16:31:22 agc Exp $ */
+/* $NetBSD: btvar.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1993
diff --git a/sys/dev/sun/bwtwo.c b/sys/dev/sun/bwtwo.c
index 2d4a27d2bf0..d1031e50d51 100644
--- a/sys/dev/sun/bwtwo.c
+++ b/sys/dev/sun/bwtwo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwo.c,v 1.13 2005/06/03 22:06:24 tsutsui Exp $ */
+/* $NetBSD: bwtwo.c,v 1.14 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.13 2005/06/03 22:06:24 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo.c,v 1.14 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -215,10 +215,10 @@ bwtwoattach(sc, name, isconsole)
}
int
-bwtwoopen(dev, flags, mode, p)
+bwtwoopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = minor(dev);
@@ -229,12 +229,12 @@ bwtwoopen(dev, flags, mode, p)
}
int
-bwtwoioctl(dev, cmd, data, flags, p)
+bwtwoioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
struct bwtwo_softc *sc = bwtwo_cd.cd_devs[minor(dev)];
diff --git a/sys/dev/sun/bwtworeg.h b/sys/dev/sun/bwtworeg.h
index f0749189eb9..e2955564935 100644
--- a/sys/dev/sun/bwtworeg.h
+++ b/sys/dev/sun/bwtworeg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtworeg.h,v 1.2 2003/08/07 16:31:23 agc Exp $ */
+/* $NetBSD: bwtworeg.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/bwtwovar.h b/sys/dev/sun/bwtwovar.h
index 36e4b2c6ee5..09141246d97 100644
--- a/sys/dev/sun/bwtwovar.h
+++ b/sys/dev/sun/bwtwovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bwtwovar.h,v 1.4 2005/06/03 22:06:24 tsutsui Exp $ */
+/* $NetBSD: bwtwovar.h,v 1.5 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/cgsix.c b/sys/dev/sun/cgsix.c
index 46789a5e0b1..167e9b0175b 100644
--- a/sys/dev/sun/cgsix.c
+++ b/sys/dev/sun/cgsix.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.27 2005/06/28 20:55:21 macallan Exp $ */
+/* $NetBSD: cgsix.c,v 1.28 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.27 2005/06/28 20:55:21 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix.c,v 1.28 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -741,7 +741,7 @@ cg6attach(struct cgsix_softc *sc, const char *name, int isconsole)
int
-cgsixopen(dev_t dev, int flags, int mode, struct proc *p)
+cgsixopen(dev_t dev, int flags, int mode, struct lwp *l)
{
int unit = minor(dev);
@@ -751,7 +751,7 @@ cgsixopen(dev_t dev, int flags, int mode, struct proc *p)
}
int
-cgsixclose(dev_t dev, int flags, int mode, struct proc *p)
+cgsixclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct cgsix_softc *sc = cgsix_cd.cd_devs[minor(dev)];
@@ -770,7 +770,7 @@ cgsixclose(dev_t dev, int flags, int mode, struct proc *p)
}
int
-cgsixioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
+cgsixioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct lwp *l)
{
struct cgsix_softc *sc = cgsix_cd.cd_devs[minor(dev)];
union cursor_cmap tcm;
diff --git a/sys/dev/sun/cgsixreg.h b/sys/dev/sun/cgsixreg.h
index 9c3f31dbf63..e7a4c23af62 100644
--- a/sys/dev/sun/cgsixreg.h
+++ b/sys/dev/sun/cgsixreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsixreg.h,v 1.6 2005/05/16 14:29:11 macallan Exp $ */
+/* $NetBSD: cgsixreg.h,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1993
diff --git a/sys/dev/sun/cgsixvar.h b/sys/dev/sun/cgsixvar.h
index d987772c94a..0b17a124d77 100644
--- a/sys/dev/sun/cgsixvar.h
+++ b/sys/dev/sun/cgsixvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsixvar.h,v 1.6 2005/06/04 04:41:40 tsutsui Exp $ */
+/* $NetBSD: cgsixvar.h,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/cgthree.c b/sys/dev/sun/cgthree.c
index e58be10a965..89816ae46fd 100644
--- a/sys/dev/sun/cgthree.c
+++ b/sys/dev/sun/cgthree.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthree.c,v 1.11 2005/06/04 04:37:21 tsutsui Exp $ */
+/* $NetBSD: cgthree.c,v 1.12 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.11 2005/06/04 04:37:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgthree.c,v 1.12 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,10 +162,10 @@ cgthreeattach(sc, name, isconsole)
int
-cgthreeopen(dev, flags, mode, p)
+cgthreeopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit = minor(dev);
@@ -175,12 +175,12 @@ cgthreeopen(dev, flags, mode, p)
}
int
-cgthreeioctl(dev, cmd, data, flags, p)
+cgthreeioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
struct cgthree_softc *sc = cgthree_cd.cd_devs[minor(dev)];
struct fbgattr *fba;
diff --git a/sys/dev/sun/cgthreereg.h b/sys/dev/sun/cgthreereg.h
index a6e9af0ef52..d4dec1c4b54 100644
--- a/sys/dev/sun/cgthreereg.h
+++ b/sys/dev/sun/cgthreereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthreereg.h,v 1.2 2003/08/07 16:31:23 agc Exp $ */
+/* $NetBSD: cgthreereg.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/cgthreevar.h b/sys/dev/sun/cgthreevar.h
index fa04d592fd4..12567761fc6 100644
--- a/sys/dev/sun/cgthreevar.h
+++ b/sys/dev/sun/cgthreevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cgthreevar.h,v 1.3 2005/06/04 04:37:21 tsutsui Exp $ */
+/* $NetBSD: cgthreevar.h,v 1.4 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/disklabel.h b/sys/dev/sun/disklabel.h
index c58fa375fea..fa6dceabbf2 100644
--- a/sys/dev/sun/disklabel.h
+++ b/sys/dev/sun/disklabel.h
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.3 2003/08/07 16:31:23 agc Exp $ */
+/* $NetBSD: disklabel.h,v 1.4 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/disksubr.c b/sys/dev/sun/disksubr.c
index be1a26a49f9..70cf1f543ef 100644
--- a/sys/dev/sun/disksubr.c
+++ b/sys/dev/sun/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.6 2005/05/31 00:47:54 christos Exp $ */
+/* $NetBSD: disksubr.c,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.6 2005/05/31 00:47:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.7 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/eeprom.h b/sys/dev/sun/eeprom.h
index 10ea1cc788d..f79b700b6e4 100644
--- a/sys/dev/sun/eeprom.h
+++ b/sys/dev/sun/eeprom.h
@@ -1,4 +1,4 @@
-/* $NetBSD: eeprom.h,v 1.1 2005/06/19 20:23:48 thorpej Exp $ */
+/* $NetBSD: eeprom.h,v 1.2 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/event.c b/sys/dev/sun/event.c
index 46b043013d6..de620facccb 100644
--- a/sys/dev/sun/event.c
+++ b/sys/dev/sun/event.c
@@ -1,4 +1,4 @@
-/* $NetBSD: event.c,v 1.17 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: event.c,v 1.18 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.17 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: event.c,v 1.18 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -153,16 +153,16 @@ ev_read(ev, uio, flags)
}
int
-ev_poll(ev, events, p)
+ev_poll(ev, events, l)
struct evvar *ev;
int events;
- struct proc *p;
+ struct lwp *l;
{
int s = splev(), revents = 0;
if (events & (POLLIN | POLLRDNORM)) {
if (ev->ev_get == ev->ev_put)
- selrecord(p, &ev->ev_sel);
+ selrecord(l, &ev->ev_sel);
else
revents |= events & (POLLIN | POLLRDNORM);
}
diff --git a/sys/dev/sun/event_var.h b/sys/dev/sun/event_var.h
index 26fb7a3e9a6..57899afc306 100644
--- a/sys/dev/sun/event_var.h
+++ b/sys/dev/sun/event_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: event_var.h,v 1.8 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: event_var.h,v 1.9 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -75,7 +75,7 @@ struct evvar {
void ev_init(struct evvar *);
void ev_fini(struct evvar *);
int ev_read(struct evvar *, struct uio *, int);
-int ev_poll(struct evvar *, int, struct proc *);
+int ev_poll(struct evvar *, int, struct lwp *);
int ev_kqfilter(struct evvar *, struct knote *);
/*
diff --git a/sys/dev/sun/fb.c b/sys/dev/sun/fb.c
index e0e5322231f..39ddff49c8a 100644
--- a/sys/dev/sun/fb.c
+++ b/sys/dev/sun/fb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fb.c,v 1.22 2005/10/08 00:46:44 macallan Exp $ */
+/* $NetBSD: fb.c,v 1.23 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.22 2005/10/08 00:46:44 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fb.c,v 1.23 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -207,10 +207,10 @@ fb_attach(fb, isconsole)
}
int
-fbopen(dev, flags, mode, p)
+fbopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit, nunit;
struct fbdevlist *fbl = &fblist;
@@ -223,14 +223,14 @@ fbopen(dev, flags, mode, p)
nunit = fbl->fb_dev->fb_device->dv_unit;
return (fbl->fb_dev->fb_driver->fbd_open)(makedev(0, nunit), flags,
- mode, p);
+ mode, l);
}
int
-fbclose(dev, flags, mode, p)
+fbclose(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
int unit, nunit;
struct fbdevlist *fbl = &fblist;
@@ -243,16 +243,16 @@ fbclose(dev, flags, mode, p)
nunit = fbl->fb_dev->fb_device->dv_unit;
return (fbl->fb_dev->fb_driver->fbd_close)(makedev(0, nunit), flags,
- mode, p);
+ mode, l);
}
int
-fbioctl(dev, cmd, data, flags, p)
+fbioctl(dev, cmd, data, flags, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flags;
- struct proc *p;
+ struct lwp *l;
{
int unit, nunit;
struct fbdevlist *fbl = &fblist;
@@ -265,14 +265,14 @@ fbioctl(dev, cmd, data, flags, p)
nunit = fbl->fb_dev->fb_device->dv_unit;
return (fbl->fb_dev->fb_driver->fbd_ioctl)(makedev(0, nunit), cmd,
- data, flags, p);
+ data, flags, l);
}
int
-fbpoll(dev, events, p)
+fbpoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
int unit, nunit;
struct fbdevlist *fbl = &fblist;
@@ -285,7 +285,7 @@ fbpoll(dev, events, p)
nunit = fbl->fb_dev->fb_device->dv_unit;
return (fbl->fb_dev->fb_driver->fbd_poll)(makedev(0, nunit), events,
- p);
+ l);
}
int
diff --git a/sys/dev/sun/fbio.h b/sys/dev/sun/fbio.h
index 25a6a413578..b60e98f2bf1 100644
--- a/sys/dev/sun/fbio.h
+++ b/sys/dev/sun/fbio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fbio.h,v 1.6 2005/10/15 15:41:22 macallan Exp $ */
+/* $NetBSD: fbio.h,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
diff --git a/sys/dev/sun/fbvar.h b/sys/dev/sun/fbvar.h
index fab6cdbac8e..ee2f435bd2c 100644
--- a/sys/dev/sun/fbvar.h
+++ b/sys/dev/sun/fbvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fbvar.h,v 1.9 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: fbvar.h,v 1.10 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -54,10 +54,10 @@
struct fbdriver {
/* device unblank function (force kernel output to display) */
void (*fbd_unblank)(struct device *);
- int (*fbd_open)(dev_t, int, int, struct proc *);
- int (*fbd_close)(dev_t, int, int, struct proc *);
- int (*fbd_ioctl)(dev_t, u_long, caddr_t, int, struct proc *);
- int (*fbd_poll)(dev_t, int, struct proc *);
+ int (*fbd_open)(dev_t, int, int, struct lwp *);
+ int (*fbd_close)(dev_t, int, int, struct lwp *);
+ int (*fbd_ioctl)(dev_t, u_long, caddr_t, int, struct lwp *);
+ int (*fbd_poll)(dev_t, int, struct lwp *);
paddr_t (*fbd_mmap)(dev_t, off_t, int);
int (*fbd_kqfilter)(dev_t, struct knote *);
#ifdef notyet
diff --git a/sys/dev/sun/files.sun b/sys/dev/sun/files.sun
index 1b85a09bceb..d00269e869c 100644
--- a/sys/dev/sun/files.sun
+++ b/sys/dev/sun/files.sun
@@ -1,4 +1,4 @@
-# $NetBSD: files.sun,v 1.9 2005/02/25 16:03:09 martin Exp $
+# $NetBSD: files.sun,v 1.10 2005/12/11 12:23:56 christos Exp $
#
# Configuration file for devices found on Sun machines.
#
diff --git a/sys/dev/sun/idprom.h b/sys/dev/sun/idprom.h
index 9a28e5c5808..cce20fb33ff 100644
--- a/sys/dev/sun/idprom.h
+++ b/sys/dev/sun/idprom.h
@@ -1,4 +1,4 @@
-/* $NetBSD: idprom.h,v 1.1 2005/06/19 20:00:28 thorpej Exp $ */
+/* $NetBSD: idprom.h,v 1.2 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/kbd.c b/sys/dev/sun/kbd.c
index a6b46e1fa0d..8ae48459c68 100644
--- a/sys/dev/sun/kbd.c
+++ b/sys/dev/sun/kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.52 2005/09/28 21:36:23 martin Exp $ */
+/* $NetBSD: kbd.c,v 1.53 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.52 2005/09/28 21:36:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.53 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -167,10 +167,10 @@ static void kbd_input_event(struct kbd_softc *, int);
* setup event channel, clear ASCII repeat stuff.
*/
int
-kbdopen(dev, flags, mode, p)
+kbdopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
struct kbd_softc *k;
int error, unit;
@@ -197,7 +197,7 @@ kbdopen(dev, flags, mode, p)
/* exclusive open required for /dev/kbd */
if (k->k_events.ev_io)
return (EBUSY);
- k->k_events.ev_io = p;
+ k->k_events.ev_io = l->l_proc;
/* stop pending autorepeat of console input */
if (k->k_repeating) {
@@ -225,10 +225,10 @@ kbdopen(dev, flags, mode, p)
* unless it is supplying console input.
*/
int
-kbdclose(dev, flags, mode, p)
+kbdclose(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
struct kbd_softc *k;
@@ -260,15 +260,15 @@ kbdread(dev, uio, flags)
int
-kbdpoll(dev, events, p)
+kbdpoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct kbd_softc *k;
k = kbd_cd.cd_devs[minor(dev)];
- return (ev_poll(&k->k_events, events, p));
+ return (ev_poll(&k->k_events, events, l));
}
int
@@ -283,12 +283,12 @@ kbdkqfilter(dev, kn)
}
int
-kbdioctl(dev, cmd, data, flag, p)
+kbdioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct kbd_softc *k;
struct kbd_state *ks;
diff --git a/sys/dev/sun/kbd_ms_ttyvar.h b/sys/dev/sun/kbd_ms_ttyvar.h
index 5cc5b0f661b..9f1eb77f1e7 100644
--- a/sys/dev/sun/kbd_ms_ttyvar.h
+++ b/sys/dev/sun/kbd_ms_ttyvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_ms_ttyvar.h,v 1.3 2005/05/30 22:17:11 christos Exp $ */
+/* $NetBSD: kbd_ms_ttyvar.h,v 1.4 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/kbd_reg.h b/sys/dev/sun/kbd_reg.h
index 23eec8d2524..f520f65a14a 100644
--- a/sys/dev/sun/kbd_reg.h
+++ b/sys/dev/sun/kbd_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_reg.h,v 1.4 2005/02/20 20:04:46 heas Exp $ */
+/* $NetBSD: kbd_reg.h,v 1.5 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/kbd_tables.c b/sys/dev/sun/kbd_tables.c
index 4fa6131bec4..184355f9a70 100644
--- a/sys/dev/sun/kbd_tables.c
+++ b/sys/dev/sun/kbd_tables.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_tables.c,v 1.8 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: kbd_tables.c,v 1.9 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1996 Gordon W. Ross
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd_tables.c,v 1.8 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd_tables.c,v 1.9 2005/12/11 12:23:56 christos Exp $");
#include <sys/types.h>
diff --git a/sys/dev/sun/kbd_xlate.h b/sys/dev/sun/kbd_xlate.h
index 35ae7faa852..8d23f8442a6 100644
--- a/sys/dev/sun/kbd_xlate.h
+++ b/sys/dev/sun/kbd_xlate.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_xlate.h,v 1.6 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: kbd_xlate.h,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/kbd_zs.c b/sys/dev/sun/kbd_zs.c
index 93038cef91a..4ee2bff9dab 100644
--- a/sys/dev/sun/kbd_zs.c
+++ b/sys/dev/sun/kbd_zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd_zs.c,v 1.19 2005/04/28 15:03:48 martin Exp $ */
+/* $NetBSD: kbd_zs.c,v 1.20 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.19 2005/04/28 15:03:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd_zs.c,v 1.20 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/kbdsun.c b/sys/dev/sun/kbdsun.c
index 8b532bd5251..427bfe7242c 100644
--- a/sys/dev/sun/kbdsun.c
+++ b/sys/dev/sun/kbdsun.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdsun.c,v 1.8 2005/05/30 22:17:03 christos Exp $ */
+/* $NetBSD: kbdsun.c,v 1.9 2005/12/11 12:23:56 christos Exp $ */
/* NetBSD: kbd.c,v 1.29 2001/11/13 06:54:32 lukem Exp */
/*
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbdsun.c,v 1.8 2005/05/30 22:17:03 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbdsun.c,v 1.9 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/kbdsunvar.h b/sys/dev/sun/kbdsunvar.h
index 41bca4b4a29..09d81609d82 100644
--- a/sys/dev/sun/kbdsunvar.h
+++ b/sys/dev/sun/kbdsunvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdsunvar.h,v 1.4 2005/02/20 22:17:28 heas Exp $ */
+/* $NetBSD: kbdsunvar.h,v 1.5 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/kbdvar.h b/sys/dev/sun/kbdvar.h
index e20042840b6..70c5b8f7a70 100644
--- a/sys/dev/sun/kbdvar.h
+++ b/sys/dev/sun/kbdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdvar.h,v 1.17 2005/05/16 18:28:28 martin Exp $ */
+/* $NetBSD: kbdvar.h,v 1.18 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/kbio.h b/sys/dev/sun/kbio.h
index 18dc17900c3..513e2ac7fb8 100644
--- a/sys/dev/sun/kbio.h
+++ b/sys/dev/sun/kbio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbio.h,v 1.2 2003/08/07 16:31:26 agc Exp $ */
+/* $NetBSD: kbio.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/ms.c b/sys/dev/sun/ms.c
index a72a7cde6b2..a8f0f7c8283 100644
--- a/sys/dev/sun/ms.c
+++ b/sys/dev/sun/ms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ms.c,v 1.29 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: ms.c,v 1.30 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.29 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.30 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -101,10 +101,10 @@ const struct cdevsw ms_cdevsw = {
****************************************************************/
int
-msopen(dev, flags, mode, p)
+msopen(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
struct ms_softc *ms;
int unit;
@@ -126,7 +126,7 @@ msopen(dev, flags, mode, p)
if (err)
return (err);
}
- ms->ms_events.ev_io = p;
+ ms->ms_events.ev_io = l->l_proc;
ev_init(&ms->ms_events); /* may cause sleep */
ms->ms_ready = 1; /* start accepting events */
@@ -134,10 +134,10 @@ msopen(dev, flags, mode, p)
}
int
-msclose(dev, flags, mode, p)
+msclose(dev, flags, mode, l)
dev_t dev;
int flags, mode;
- struct proc *p;
+ struct lwp *l;
{
struct ms_softc *ms;
@@ -168,12 +168,12 @@ msread(dev, uio, flags)
}
int
-msioctl(dev, cmd, data, flag, p)
+msioctl(dev, cmd, data, flag, l)
dev_t dev;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct ms_softc *ms;
@@ -213,15 +213,15 @@ msioctl(dev, cmd, data, flag, p)
}
int
-mspoll(dev, events, p)
+mspoll(dev, events, l)
dev_t dev;
int events;
- struct proc *p;
+ struct lwp *l;
{
struct ms_softc *ms;
ms = ms_cd.cd_devs[minor(dev)];
- return (ev_poll(&ms->ms_events, events, p));
+ return (ev_poll(&ms->ms_events, events, l));
}
int
diff --git a/sys/dev/sun/ms_zs.c b/sys/dev/sun/ms_zs.c
index 9418948c7bd..5ddc0e16f4c 100644
--- a/sys/dev/sun/ms_zs.c
+++ b/sys/dev/sun/ms_zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ms_zs.c,v 1.12 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: ms_zs.c,v 1.13 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.12 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms_zs.c,v 1.13 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/msvar.h b/sys/dev/sun/msvar.h
index 0af11bcb2e5..a427441356e 100644
--- a/sys/dev/sun/msvar.h
+++ b/sys/dev/sun/msvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: msvar.h,v 1.6 2005/02/04 02:10:47 perry Exp $ */
+/* $NetBSD: msvar.h,v 1.7 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/pfour_subr.c b/sys/dev/sun/pfour_subr.c
index a3fe9b6dc45..cb03957a029 100644
--- a/sys/dev/sun/pfour_subr.c
+++ b/sys/dev/sun/pfour_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pfour_subr.c,v 1.4 2003/10/28 16:25:29 chs Exp $ */
+/* $NetBSD: pfour_subr.c,v 1.5 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pfour_subr.c,v 1.4 2003/10/28 16:25:29 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pfour_subr.c,v 1.5 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/sun/pfourreg.h b/sys/dev/sun/pfourreg.h
index 33112311cbf..fbc8c13cbb4 100644
--- a/sys/dev/sun/pfourreg.h
+++ b/sys/dev/sun/pfourreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pfourreg.h,v 1.2 2003/12/10 12:06:25 agc Exp $ */
+/* $NetBSD: pfourreg.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/sun/sunkbd.c b/sys/dev/sun/sunkbd.c
index 42954d1c5a9..2e1e726d280 100644
--- a/sys/dev/sun/sunkbd.c
+++ b/sys/dev/sun/sunkbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunkbd.c,v 1.22 2005/11/27 05:35:52 thorpej Exp $ */
+/* $NetBSD: sunkbd.c,v 1.23 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.22 2005/11/27 05:35:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunkbd.c,v 1.23 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -218,7 +218,7 @@ sunkbdiopen(dev, flags)
{
struct kbd_sun_softc *k = (void *) dev;
struct tty *tp = (struct tty *)k->k_priv;
- struct proc *p = curproc ? curproc : &proc0;
+ struct lwp *l = curlwp ? curlwp : &lwp0;
struct termios t;
const struct cdevsw *cdev;
int error;
@@ -229,7 +229,7 @@ sunkbdiopen(dev, flags)
/* Open the lower device */
if ((error = (*cdev->d_open)(tp->t_dev, O_NONBLOCK|flags,
- 0/* ignored? */, p)) != 0)
+ 0/* ignored? */, l)) != 0)
return (error);
/* Now configure it for the console. */
diff --git a/sys/dev/sun/sunms.c b/sys/dev/sun/sunms.c
index d0ee48373fb..c9160b2264e 100644
--- a/sys/dev/sun/sunms.c
+++ b/sys/dev/sun/sunms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunms.c,v 1.20 2005/11/27 05:35:52 thorpej Exp $ */
+/* $NetBSD: sunms.c,v 1.21 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.20 2005/11/27 05:35:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunms.c,v 1.21 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,7 +111,7 @@ struct linesw sunms_disc = {
};
int sunms_enable(void *);
-int sunms_ioctl(void *, u_long, caddr_t, int, struct proc *);
+int sunms_ioctl(void *, u_long, caddr_t, int, struct lwp *);
void sunms_disable(void *);
const struct wsmouse_accessops sunms_accessops = {
@@ -199,7 +199,7 @@ sunmsiopen(dev, flags)
{
struct ms_softc *ms = (void *) dev;
struct tty *tp = (struct tty *)ms->ms_cs;
- struct proc *p = curproc ? curproc : &proc0;
+ struct lwp *l = curlwp ? curlwp : &lwp0;
struct termios t;
const struct cdevsw *cdev;
int error;
@@ -210,7 +210,7 @@ sunmsiopen(dev, flags)
/* Open the lower device */
if ((error = (*cdev->d_open)(tp->t_dev, O_NONBLOCK|flags,
- 0/* ignored? */, p)) != 0)
+ 0/* ignored? */, l)) != 0)
return (error);
/* Now configure it for the console. */
@@ -239,12 +239,12 @@ sunmsinput(c, tp)
}
int
-sunms_ioctl(v, cmd, data, flag, p)
+sunms_ioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
/* struct ms_softc *sc = v; */
diff --git a/sys/dev/sun/vuid_event.h b/sys/dev/sun/vuid_event.h
index 792a7ca498d..a337757856a 100644
--- a/sys/dev/sun/vuid_event.h
+++ b/sys/dev/sun/vuid_event.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vuid_event.h,v 1.2 2003/08/07 16:31:27 agc Exp $ */
+/* $NetBSD: vuid_event.h,v 1.3 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/sun/wskbdmap_sun.c b/sys/dev/sun/wskbdmap_sun.c
index 7c5e4daf56e..cdf6751cccf 100644
--- a/sys/dev/sun/wskbdmap_sun.c
+++ b/sys/dev/sun/wskbdmap_sun.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_sun.c,v 1.11 2005/08/25 06:55:03 jdc Exp $ */
+/* $NetBSD: wskbdmap_sun.c,v 1.12 2005/12/11 12:23:56 christos Exp $ */
/* $OpenBSD: sunkbd.c,v 1.9 2002/09/08 23:22:00 miod Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbdmap_sun.c,v 1.11 2005/08/25 06:55:03 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_sun.c,v 1.12 2005/12/11 12:23:56 christos Exp $");
#include <sys/types.h>
#include <dev/wscons/wsksymdef.h>
diff --git a/sys/dev/sysmon/files.sysmon b/sys/dev/sysmon/files.sysmon
index 5171957ba07..77d50815683 100644
--- a/sys/dev/sysmon/files.sysmon
+++ b/sys/dev/sysmon/files.sysmon
@@ -1,4 +1,4 @@
-# $NetBSD: files.sysmon,v 1.4 2005/01/09 22:51:32 smb Exp $
+# $NetBSD: files.sysmon,v 1.5 2005/12/11 12:23:56 christos Exp $
define sysmon_envsys
file dev/sysmon/sysmon_envsys.c sysmon_envsys needs-flag
diff --git a/sys/dev/sysmon/swwdog.c b/sys/dev/sysmon/swwdog.c
index 1e43936b52e..0fb2092d439 100644
--- a/sys/dev/sysmon/swwdog.c
+++ b/sys/dev/sysmon/swwdog.c
@@ -1,4 +1,4 @@
-/* $NetBSD: swwdog.c,v 1.3 2005/10/17 03:08:24 simonb Exp $ */
+/* $NetBSD: swwdog.c,v 1.4 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 2004, 2005 Steven M. Bellovin
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.3 2005/10/17 03:08:24 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.4 2005/12/11 12:23:56 christos Exp $");
/*
*
diff --git a/sys/dev/sysmon/sysmon.c b/sys/dev/sysmon/sysmon.c
index 9c04b37bde2..770806b5a5c 100644
--- a/sys/dev/sysmon/sysmon.c
+++ b/sys/dev/sysmon/sysmon.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.10 2003/06/29 22:30:50 fvdl Exp $ */
+/* $NetBSD: sysmon.c,v 1.11 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.10 2003/06/29 22:30:50 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.11 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -72,24 +72,24 @@ const struct cdevsw sysmon_cdevsw = {
* Open the system monitor device.
*/
int
-sysmonopen(dev_t dev, int flag, int mode, struct proc *p)
+sysmonopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int error;
switch (minor(dev)) {
#if NSYSMON_ENVSYS > 0
case SYSMON_MINOR_ENVSYS:
- error = sysmonopen_envsys(dev, flag, mode, p);
+ error = sysmonopen_envsys(dev, flag, mode, l);
break;
#endif
#if NSYSMON_WDOG > 0
case SYSMON_MINOR_WDOG:
- error = sysmonopen_wdog(dev, flag, mode, p);
+ error = sysmonopen_wdog(dev, flag, mode, l);
break;
#endif
#if NSYSMON_POWER > 0
case SYSMON_MINOR_POWER:
- error = sysmonopen_power(dev, flag, mode, p);
+ error = sysmonopen_power(dev, flag, mode, l);
break;
#endif
default:
@@ -105,24 +105,24 @@ sysmonopen(dev_t dev, int flag, int mode, struct proc *p)
* Close the system monitor device.
*/
int
-sysmonclose(dev_t dev, int flag, int mode, struct proc *p)
+sysmonclose(dev_t dev, int flag, int mode, struct lwp *l)
{
int error;
switch (minor(dev)) {
#if NSYSMON_ENVSYS > 0
case SYSMON_MINOR_ENVSYS:
- error = sysmonclose_envsys(dev, flag, mode, p);
+ error = sysmonclose_envsys(dev, flag, mode, l);
break;
#endif
#if NSYSMON_WDOG > 0
case SYSMON_MINOR_WDOG:
- error = sysmonclose_wdog(dev, flag, mode, p);
+ error = sysmonclose_wdog(dev, flag, mode, l);
break;
#endif
#if NSYSMON_POWER > 0
case SYSMON_MINOR_POWER:
- error = sysmonclose_power(dev, flag, mode, p);
+ error = sysmonclose_power(dev, flag, mode, l);
break;
#endif
default:
@@ -138,24 +138,24 @@ sysmonclose(dev_t dev, int flag, int mode, struct proc *p)
* Perform a control request.
*/
int
-sysmonioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+sysmonioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int error;
switch (minor(dev)) {
#if NSYSMON_ENVSYS > 0
case SYSMON_MINOR_ENVSYS:
- error = sysmonioctl_envsys(dev, cmd, data, flag, p);
+ error = sysmonioctl_envsys(dev, cmd, data, flag, l);
break;
#endif
#if NSYSMON_WDOG > 0
case SYSMON_MINOR_WDOG:
- error = sysmonioctl_wdog(dev, cmd, data, flag, p);
+ error = sysmonioctl_wdog(dev, cmd, data, flag, l);
break;
#endif
#if NSYSMON_POWER > 0
case SYSMON_MINOR_POWER:
- error = sysmonioctl_power(dev, cmd, data, flag, p);
+ error = sysmonioctl_power(dev, cmd, data, flag, l);
break;
#endif
default:
@@ -194,14 +194,14 @@ sysmonread(dev_t dev, struct uio *uio, int flags)
* Poll the system monitor device.
*/
int
-sysmonpoll(dev_t dev, int events, struct proc *p)
+sysmonpoll(dev_t dev, int events, struct lwp *l)
{
int rv;
switch (minor(dev)) {
#if NSYSMON_POWER > 0
case SYSMON_MINOR_POWER:
- rv = sysmonpoll_power(dev, events, p);
+ rv = sysmonpoll_power(dev, events, l);
break;
#endif
default:
diff --git a/sys/dev/sysmon/sysmon_envsys.c b/sys/dev/sysmon/sysmon_envsys.c
index ba2150715bc..2361fefa144 100644
--- a/sys/dev/sysmon/sysmon_envsys.c
+++ b/sys/dev/sysmon/sysmon_envsys.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_envsys.c,v 1.8 2003/08/11 15:07:14 yamt Exp $ */
+/* $NetBSD: sysmon_envsys.c,v 1.9 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.8 2003/08/11 15:07:14 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_envsys.c,v 1.9 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -75,7 +75,7 @@ struct simplelock sysmon_envsys_initialized_slock = SIMPLELOCK_INITIALIZER;
#define SYSMON_ENVSYS_UNLOCK() \
lockmgr(&sysmon_envsys_lock, LK_RELEASE, NULL)
-int sysmonioctl_envsys(dev_t, u_long, caddr_t, int, struct proc *);
+int sysmonioctl_envsys(dev_t, u_long, caddr_t, int, struct lwp *);
struct sysmon_envsys *sysmon_envsys_find(u_int);
void sysmon_envsys_release(struct sysmon_envsys *);
@@ -86,7 +86,7 @@ void sysmon_envsys_release(struct sysmon_envsys *);
* Open the system monitor device.
*/
int
-sysmonopen_envsys(dev_t dev, int flag, int mode, struct proc *p)
+sysmonopen_envsys(dev_t dev, int flag, int mode, struct lwp *l)
{
simple_lock(&sysmon_envsys_initialized_slock);
if (sysmon_envsys_initialized == 0) {
@@ -104,7 +104,7 @@ sysmonopen_envsys(dev_t dev, int flag, int mode, struct proc *p)
* Close the system monitor device.
*/
int
-sysmonclose_envsys(dev_t dev, int flag, int mode, struct proc *p)
+sysmonclose_envsys(dev_t dev, int flag, int mode, struct lwp *l)
{
/* Nothing to do */
@@ -118,7 +118,7 @@ sysmonclose_envsys(dev_t dev, int flag, int mode, struct proc *p)
*/
int
sysmonioctl_envsys(dev_t dev, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct sysmon_envsys *sme;
int error = 0;
diff --git a/sys/dev/sysmon/sysmon_power.c b/sys/dev/sysmon/sysmon_power.c
index f2d3aeb52e1..95c946819db 100644
--- a/sys/dev/sysmon/sysmon_power.c
+++ b/sys/dev/sysmon/sysmon_power.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.10 2004/05/22 11:32:50 cube Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.11 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.10 2004/05/22 11:32:50 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.11 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/reboot.h>
@@ -146,7 +146,7 @@ sysmon_power_event_queue_flush(void)
* Open the system monitor device.
*/
int
-sysmonopen_power(dev_t dev, int flag, int mode, struct proc *p)
+sysmonopen_power(dev_t dev, int flag, int mode, struct lwp *l)
{
int error = 0;
@@ -154,7 +154,7 @@ sysmonopen_power(dev_t dev, int flag, int mode, struct proc *p)
if (sysmon_power_daemon != NULL)
error = EBUSY;
else {
- sysmon_power_daemon = p;
+ sysmon_power_daemon = l->l_proc;
sysmon_power_event_queue_flush();
}
simple_unlock(&sysmon_power_event_queue_slock);
@@ -168,7 +168,7 @@ sysmonopen_power(dev_t dev, int flag, int mode, struct proc *p)
* Close the system monitor device.
*/
int
-sysmonclose_power(dev_t dev, int flag, int mode, struct proc *p)
+sysmonclose_power(dev_t dev, int flag, int mode, struct lwp *l)
{
int count;
@@ -228,7 +228,7 @@ sysmonread_power(dev_t dev, struct uio *uio, int flags)
* Poll the system monitor device.
*/
int
-sysmonpoll_power(dev_t dev, int events, struct proc *p)
+sysmonpoll_power(dev_t dev, int events, struct lwp *l)
{
int revents;
@@ -242,7 +242,7 @@ sysmonpoll_power(dev_t dev, int events, struct proc *p)
if (sysmon_power_event_queue_count)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sysmon_power_event_queue_selinfo);
+ selrecord(l, &sysmon_power_event_queue_selinfo);
simple_unlock(&sysmon_power_event_queue_slock);
return (revents);
@@ -313,7 +313,7 @@ sysmonkqfilter_power(dev_t dev, struct knote *kn)
* Perform a power managmenet control request.
*/
int
-sysmonioctl_power(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+sysmonioctl_power(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int error = 0;
diff --git a/sys/dev/sysmon/sysmon_taskq.c b/sys/dev/sysmon/sysmon_taskq.c
index 074bf0b5404..4f6f8183ac8 100644
--- a/sys/dev/sysmon/sysmon_taskq.c
+++ b/sys/dev/sysmon/sysmon_taskq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_taskq.c,v 1.4 2005/05/29 22:18:25 christos Exp $ */
+/* $NetBSD: sysmon_taskq.c,v 1.5 2005/12/11 12:23:56 christos Exp $ */
/*
* Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_taskq.c,v 1.4 2005/05/29 22:18:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_taskq.c,v 1.5 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
diff --git a/sys/dev/sysmon/sysmon_wdog.c b/sys/dev/sysmon/sysmon_wdog.c
index 1cf2a627237..052c9713773 100644
--- a/sys/dev/sysmon/sysmon_wdog.c
+++ b/sys/dev/sysmon/sysmon_wdog.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_wdog.c,v 1.11 2005/01/12 16:14:35 drochner Exp $ */
+/* $NetBSD: sysmon_wdog.c,v 1.12 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.11 2005/01/12 16:14:35 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_wdog.c,v 1.12 2005/12/11 12:23:56 christos Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -89,7 +89,7 @@ void sysmon_wdog_shutdown(void *);
* Open the system monitor device.
*/
int
-sysmonopen_wdog(dev_t dev, int flag, int mode, struct proc *p)
+sysmonopen_wdog(dev_t dev, int flag, int mode, struct lwp *l)
{
simple_lock(&sysmon_wdog_list_slock);
@@ -111,7 +111,7 @@ sysmonopen_wdog(dev_t dev, int flag, int mode, struct proc *p)
* Close the system monitor device.
*/
int
-sysmonclose_wdog(dev_t dev, int flag, int mode, struct proc *p)
+sysmonclose_wdog(dev_t dev, int flag, int mode, struct lwp *l)
{
struct sysmon_wdog *smw;
int s, error = 0;
@@ -149,7 +149,7 @@ sysmonclose_wdog(dev_t dev, int flag, int mode, struct proc *p)
* Perform a watchdog control request.
*/
int
-sysmonioctl_wdog(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+sysmonioctl_wdog(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct sysmon_wdog *smw;
int s, error = 0;
@@ -226,7 +226,7 @@ sysmonioctl_wdog(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
if ((smw = sysmon_armed_wdog) != NULL) {
error = (*smw->smw_tickle)(smw);
if (error == 0)
- smw->smw_tickler = p->p_pid;
+ smw->smw_tickler = l->l_proc->p_pid;
} else
error = ESRCH;
SYSMON_WDOG_UNLOCK(s);
diff --git a/sys/dev/sysmon/sysmonvar.h b/sys/dev/sysmon/sysmonvar.h
index f24635b5d43..5576eef6692 100644
--- a/sys/dev/sysmon/sysmonvar.h
+++ b/sys/dev/sysmon/sysmonvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmonvar.h,v 1.10 2003/08/11 15:07:14 yamt Exp $ */
+/* $NetBSD: sysmonvar.h,v 1.11 2005/12/11 12:23:56 christos Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -41,6 +41,7 @@
#include <sys/power.h>
#include <sys/queue.h>
+struct lwp;
struct proc;
struct knote;
struct uio;
@@ -77,9 +78,9 @@ struct sysmon_envsys {
#define SME_SENSOR_IDX(sme, idx) ((idx) - (sme)->sme_fsensor)
-int sysmonopen_envsys(dev_t, int, int, struct proc *);
-int sysmonclose_envsys(dev_t, int, int, struct proc *);
-int sysmonioctl_envsys(dev_t, u_long, caddr_t, int, struct proc *);
+int sysmonopen_envsys(dev_t, int, int, struct lwp *);
+int sysmonclose_envsys(dev_t, int, int, struct lwp *);
+int sysmonioctl_envsys(dev_t, u_long, caddr_t, int, struct lwp *);
int sysmon_envsys_register(struct sysmon_envsys *);
void sysmon_envsys_unregister(struct sysmon_envsys *);
@@ -102,12 +103,12 @@ struct sysmon_wdog {
pid_t smw_tickler; /* last process to tickle */
};
-int sysmonopen_wdog(dev_t, int, int, struct proc *);
-int sysmonclose_wdog(dev_t, int, int, struct proc *);
-int sysmonioctl_wdog(dev_t, u_long, caddr_t, int, struct proc *);
+int sysmonopen_wdog(dev_t, int, int, struct lwp *);
+int sysmonclose_wdog(dev_t, int, int, struct lwp *);
+int sysmonioctl_wdog(dev_t, u_long, caddr_t, int, struct lwp *);
-int sysmon_wdog_register(struct sysmon_wdog *);
-void sysmon_wdog_unregister(struct sysmon_wdog *);
+int sysmon_wdog_register(struct sysmon_wdog *);
+void sysmon_wdog_unregister(struct sysmon_wdog *);
/*****************************************************************************
* Power management support
@@ -120,12 +121,12 @@ struct sysmon_pswitch {
LIST_ENTRY(sysmon_pswitch) smpsw_list;
};
-int sysmonopen_power(dev_t, int, int, struct proc *);
-int sysmonclose_power(dev_t, int, int, struct proc *);
+int sysmonopen_power(dev_t, int, int, struct lwp *);
+int sysmonclose_power(dev_t, int, int, struct lwp *);
int sysmonread_power(dev_t, struct uio *, int);
-int sysmonpoll_power(dev_t, int, struct proc *);
+int sysmonpoll_power(dev_t, int, struct lwp *);
int sysmonkqfilter_power(dev_t, struct knote *);
-int sysmonioctl_power(dev_t, u_long, caddr_t, int, struct proc *);
+int sysmonioctl_power(dev_t, u_long, caddr_t, int, struct lwp *);
void sysmon_power_settype(const char *);
@@ -133,5 +134,5 @@ int sysmon_pswitch_register(struct sysmon_pswitch *);
void sysmon_pswitch_unregister(struct sysmon_pswitch *);
void sysmon_pswitch_event(struct sysmon_pswitch *, int);
-
+
#endif /* _DEV_SYSMON_SYSMONVAR_H_ */
diff --git a/sys/dev/tc/asc_tc.c b/sys/dev/tc/asc_tc.c
index 746fa7abad1..2b819e89d63 100644
--- a/sys/dev/tc/asc_tc.c
+++ b/sys/dev/tc/asc_tc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: asc_tc.c,v 1.25 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: asc_tc.c,v 1.26 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asc_tc.c,v 1.25 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_tc.c,v 1.26 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/tc/asc_tcds.c b/sys/dev/tc/asc_tcds.c
index 39100fb6844..fdac66f5f76 100644
--- a/sys/dev/tc/asc_tcds.c
+++ b/sys/dev/tc/asc_tcds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: asc_tcds.c,v 1.13 2005/05/22 15:54:46 christos Exp $ */
+/* $NetBSD: asc_tcds.c,v 1.14 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.13 2005/05/22 15:54:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc_tcds.c,v 1.14 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/tc/ascvar.h b/sys/dev/tc/ascvar.h
index ef37e95c123..f2adc210fc8 100644
--- a/sys/dev/tc/ascvar.h
+++ b/sys/dev/tc/ascvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ascvar.h,v 1.9 2005/02/04 02:10:48 perry Exp $ */
+/* $NetBSD: ascvar.h,v 1.10 2005/12/11 12:24:00 christos Exp $ */
/*
diff --git a/sys/dev/tc/cfb.c b/sys/dev/tc/cfb.c
index ada4188104c..e22c4e0f404 100644
--- a/sys/dev/tc/cfb.c
+++ b/sys/dev/tc/cfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.46 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: cfb.c,v 1.47 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.46 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.47 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -163,7 +163,7 @@ static const struct wsscreen_list cfb_screenlist = {
sizeof(_cfb_scrlist) / sizeof(struct wsscreen_descr *), _cfb_scrlist
};
-static int cfbioctl(void *, u_long, caddr_t, int, struct proc *);
+static int cfbioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t cfbmmap(void *, off_t, int);
static int cfb_alloc_screen(void *, const struct wsscreen_descr *,
@@ -366,12 +366,12 @@ cfb_common_init(ri)
}
static int
-cfbioctl(v, cmd, data, flag, p)
+cfbioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct cfb_softc *sc = v;
struct rasops_info *ri = sc->sc_ri;
diff --git a/sys/dev/tc/devlist2h.awk b/sys/dev/tc/devlist2h.awk
index 75cf36d73eb..3249803acb8 100644
--- a/sys/dev/tc/devlist2h.awk
+++ b/sys/dev/tc/devlist2h.awk
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: devlist2h.awk,v 1.8 2005/02/27 15:33:58 perry Exp $
+# $NetBSD: devlist2h.awk,v 1.9 2005/12/11 12:24:00 christos Exp $
#
# Copyright (c) 1995, 1996 Christopher G. Demetriou
# All rights reserved.
diff --git a/sys/dev/tc/files.tc b/sys/dev/tc/files.tc
index 74fdf8990b7..27a9acf546a 100644
--- a/sys/dev/tc/files.tc
+++ b/sys/dev/tc/files.tc
@@ -1,4 +1,4 @@
-# $NetBSD: files.tc,v 1.28 2005/01/10 22:01:37 kent Exp $
+# $NetBSD: files.tc,v 1.29 2005/12/11 12:24:00 christos Exp $
#
# Config file and device description for machine-independent
# TURBOchannel code. Included by ports that need it.
diff --git a/sys/dev/tc/if_le_ioasic.c b/sys/dev/tc/if_le_ioasic.c
index 177f601d53b..7e14ccceb2e 100644
--- a/sys/dev/tc/if_le_ioasic.c
+++ b/sys/dev/tc/if_le_ioasic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_ioasic.c,v 1.23 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: if_le_ioasic.c,v 1.24 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_ioasic.c,v 1.23 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ioasic.c,v 1.24 2005/12/11 12:24:00 christos Exp $");
#include "opt_inet.h"
diff --git a/sys/dev/tc/if_le_tc.c b/sys/dev/tc/if_le_tc.c
index 858fd580b8b..ac3cae4c718 100644
--- a/sys/dev/tc/if_le_tc.c
+++ b/sys/dev/tc/if_le_tc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_tc.c,v 1.17 2005/02/04 02:10:48 perry Exp $ */
+/* $NetBSD: if_le_tc.c,v 1.18 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_tc.c,v 1.17 2005/02/04 02:10:48 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_tc.c,v 1.18 2005/12/11 12:24:00 christos Exp $");
#include "opt_inet.h"
diff --git a/sys/dev/tc/if_levar.h b/sys/dev/tc/if_levar.h
index a2d647095bb..1277d4bec86 100644
--- a/sys/dev/tc/if_levar.h
+++ b/sys/dev/tc/if_levar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_levar.h,v 1.6 2005/02/04 02:10:48 perry Exp $ */
+/* $NetBSD: if_levar.h,v 1.7 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
diff --git a/sys/dev/tc/ioasic_subr.c b/sys/dev/tc/ioasic_subr.c
index fc550d5b05d..1549223a665 100644
--- a/sys/dev/tc/ioasic_subr.c
+++ b/sys/dev/tc/ioasic_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasic_subr.c,v 1.10 2005/08/26 10:14:05 drochner Exp $ */
+/* $NetBSD: ioasic_subr.c,v 1.11 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioasic_subr.c,v 1.10 2005/08/26 10:14:05 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioasic_subr.c,v 1.11 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/tc/ioasicreg.h b/sys/dev/tc/ioasicreg.h
index 1da2e00ac85..faa13c8ee3b 100644
--- a/sys/dev/tc/ioasicreg.h
+++ b/sys/dev/tc/ioasicreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasicreg.h,v 1.8 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: ioasicreg.h,v 1.9 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1991,1990,1989,1994,1995 Carnegie Mellon University
diff --git a/sys/dev/tc/ioasicvar.h b/sys/dev/tc/ioasicvar.h
index cf8b81caedd..56c0e92e699 100644
--- a/sys/dev/tc/ioasicvar.h
+++ b/sys/dev/tc/ioasicvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasicvar.h,v 1.18 2005/06/01 16:17:40 drochner Exp $ */
+/* $NetBSD: ioasicvar.h,v 1.19 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
diff --git a/sys/dev/tc/mfb.c b/sys/dev/tc/mfb.c
index 45af79a5fd9..a845f527aa5 100644
--- a/sys/dev/tc/mfb.c
+++ b/sys/dev/tc/mfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mfb.c,v 1.43 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: mfb.c,v 1.44 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.43 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfb.c,v 1.44 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -150,7 +150,7 @@ static const struct wsscreen_list mfb_screenlist = {
sizeof(_mfb_scrlist) / sizeof(struct wsscreen_descr *), _mfb_scrlist
};
-static int mfbioctl(void *, u_long, caddr_t, int, struct proc *);
+static int mfbioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t mfbmmap(void *, off_t, int);
static int mfb_alloc_screen(void *, const struct wsscreen_descr *,
@@ -328,12 +328,12 @@ mfb_common_init(ri)
}
static int
-mfbioctl(v, cmd, data, flag, p)
+mfbioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct mfb_softc *sc = v;
struct rasops_info *ri = sc->sc_ri;
diff --git a/sys/dev/tc/nvrreg.h b/sys/dev/tc/nvrreg.h
index 9464427baaa..bd03de91e2d 100644
--- a/sys/dev/tc/nvrreg.h
+++ b/sys/dev/tc/nvrreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nvrreg.h,v 1.3 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: nvrreg.h,v 1.4 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1999 Andy Doran <ad@NetBSD.org>
diff --git a/sys/dev/tc/px.c b/sys/dev/tc/px.c
index 9cf5f3b0593..61bbab9dd70 100644
--- a/sys/dev/tc/px.c
+++ b/sys/dev/tc/px.c
@@ -1,4 +1,4 @@
-/* $NetBSD: px.c,v 1.25 2005/12/08 22:41:45 yamt Exp $ */
+/* $NetBSD: px.c,v 1.26 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.25 2005/12/08 22:41:45 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: px.c,v 1.26 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,7 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: px.c,v 1.25 2005/12/08 22:41:45 yamt Exp $");
void px_attach(struct device *, struct device *, void *);
void px_init(struct stic_info *, int);
-int px_ioctl(struct stic_info *, u_long, caddr_t, int, struct proc *);
+int px_ioctl(struct stic_info *, u_long, caddr_t, int, struct lwp *);
int px_match(struct device *, struct cfdata *, void *);
int px_intr(void *);
@@ -360,7 +360,7 @@ px_pbuf_post(struct stic_info *si, u_int32_t *buf)
int
px_ioctl(struct stic_info *si, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
volatile struct stic_xcomm *sxc;
volatile struct stic_regs *sr;
diff --git a/sys/dev/tc/pxg.c b/sys/dev/tc/pxg.c
index 24afe8f9f74..9ab632a8626 100644
--- a/sys/dev/tc/pxg.c
+++ b/sys/dev/tc/pxg.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pxg.c,v 1.18 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: pxg.c,v 1.19 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.18 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxg.c,v 1.19 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,7 +91,7 @@ int pxg_intr(void *);
int pxg_match(struct device *, struct cfdata *, void *);
void pxg_init(struct stic_info *);
-int pxg_ioctl(struct stic_info *, u_long, caddr_t, int, struct proc *);
+int pxg_ioctl(struct stic_info *, u_long, caddr_t, int, struct lwp *);
u_int32_t *pxg_pbuf_get(struct stic_info *);
int pxg_pbuf_post(struct stic_info *, u_int32_t *);
int pxg_probe_planes(struct stic_info *);
@@ -357,10 +357,11 @@ pxg_pbuf_post(struct stic_info *si, u_int32_t *buf)
int
pxg_ioctl(struct stic_info *si, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct stic_xinfo *sxi;
volatile u_int32_t *ptr = NULL;
+ struct proc *p = l->l_proc;
int rv, s;
switch (cmd) {
diff --git a/sys/dev/tc/pxgvar.h b/sys/dev/tc/pxgvar.h
index 4765a3860b1..260e5b53032 100644
--- a/sys/dev/tc/pxgvar.h
+++ b/sys/dev/tc/pxgvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pxgvar.h,v 1.2 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: pxgvar.h,v 1.3 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/tc/sfb.c b/sys/dev/tc/sfb.c
index 50caf347543..d292140811d 100644
--- a/sys/dev/tc/sfb.c
+++ b/sys/dev/tc/sfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sfb.c,v 1.67 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: sfb.c,v 1.68 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.67 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfb.c,v 1.68 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -175,7 +175,7 @@ static const struct wsscreen_list sfb_screenlist = {
sizeof(_sfb_scrlist) / sizeof(struct wsscreen_descr *), _sfb_scrlist
};
-static int sfbioctl(void *, u_long, caddr_t, int, struct proc *);
+static int sfbioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t sfbmmap(void *, off_t, int);
static int sfb_alloc_screen(void *, const struct wsscreen_descr *,
@@ -400,12 +400,12 @@ sfb_common_init(ri)
}
static int
-sfbioctl(v, cmd, data, flag, p)
+sfbioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct sfb_softc *sc = v;
struct rasops_info *ri = sc->sc_ri;
diff --git a/sys/dev/tc/sfbplus.c b/sys/dev/tc/sfbplus.c
index 0b3d4210b8a..db12c3f3899 100644
--- a/sys/dev/tc/sfbplus.c
+++ b/sys/dev/tc/sfbplus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sfbplus.c,v 1.22 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: sfbplus.c,v 1.23 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.22 2005/02/27 00:27:49 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sfbplus.c,v 1.23 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/tc/stic.c b/sys/dev/tc/stic.c
index 5f15eeb0f12..028b38c16cd 100644
--- a/sys/dev/tc/stic.c
+++ b/sys/dev/tc/stic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: stic.c,v 1.29 2005/06/02 13:11:39 drochner Exp $ */
+/* $NetBSD: stic.c,v 1.30 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.29 2005/06/02 13:11:39 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.30 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -157,7 +157,7 @@ __KERNEL_RCSID(0, "$NetBSD: stic.c,v 1.29 2005/06/02 13:11:39 drochner Exp $");
tc_wmb(); \
} while (0)
-int sticioctl(void *, u_long, caddr_t, int, struct proc *);
+int sticioctl(void *, u_long, caddr_t, int, struct lwp *);
int stic_alloc_screen(void *, const struct wsscreen_descr *, void **,
int *, int *, long *);
void stic_free_screen(void *, void *);
@@ -558,7 +558,7 @@ stic_clear_screen(struct stic_info *si)
}
int
-sticioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
+sticioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct stic_info *si;
int s;
@@ -622,7 +622,7 @@ sticioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
case WSDISPLAYIO_SMODE:
si->si_dispmode = *(int *)data;
if (si->si_dispmode == WSDISPLAYIO_MODE_EMUL) {
- (*si->si_ioctl)(si, STICIO_STOPQ, NULL, flag, p);
+ (*si->si_ioctl)(si, STICIO_STOPQ, NULL, flag, l);
stic_setup_vdac(si);
s = spltty();
stic_flush(si);
@@ -638,7 +638,7 @@ sticioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
}
if (si->si_ioctl != NULL)
- return ((*si->si_ioctl)(si, cmd, data, flag, p));
+ return ((*si->si_ioctl)(si, cmd, data, flag, l));
return (EPASSTHROUGH);
}
@@ -1453,7 +1453,7 @@ stic_set_hwcurpos(struct stic_info *si)
* the securelevel mechanism.
*/
int
-sticopen(dev_t dev, int flag, int mode, struct proc *p)
+sticopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct stic_info *si;
int s;
@@ -1477,7 +1477,7 @@ sticopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-sticclose(dev_t dev, int flag, int mode, struct proc *p)
+sticclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct stic_info *si;
int s;
diff --git a/sys/dev/tc/sticio.h b/sys/dev/tc/sticio.h
index a206c591243..0f3238413ac 100644
--- a/sys/dev/tc/sticio.h
+++ b/sys/dev/tc/sticio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sticio.h,v 1.2 2005/02/27 00:27:49 perry Exp $ */
+/* $NetBSD: sticio.h,v 1.3 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/tc/sticvar.h b/sys/dev/tc/sticvar.h
index 91ed4644c15..d6f077851e5 100644
--- a/sys/dev/tc/sticvar.h
+++ b/sys/dev/tc/sticvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sticvar.h,v 1.14 2003/11/13 03:09:29 chs Exp $ */
+/* $NetBSD: sticvar.h,v 1.15 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@ struct stic_info {
u_int32_t *(*si_pbuf_get)(struct stic_info *);
int (*si_pbuf_post)(struct stic_info *, u_int32_t *);
int (*si_ioctl)(struct stic_info *, u_long, caddr_t, int,
- struct proc *);
+ struct lwp *);
int si_pbuf_select;
int si_hwflags;
diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c
index 620c3169a0b..e9e681123b9 100644
--- a/sys/dev/tc/tc.c
+++ b/sys/dev/tc/tc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tc.c,v 1.42 2005/08/26 10:14:05 drochner Exp $ */
+/* $NetBSD: tc.c,v 1.43 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.42 2005/08/26 10:14:05 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.43 2005/12/11 12:24:00 christos Exp $");
#include "opt_tcverbose.h"
diff --git a/sys/dev/tc/tcdevs b/sys/dev/tc/tcdevs
index 3fba581e021..e49d4acb0f7 100644
--- a/sys/dev/tc/tcdevs
+++ b/sys/dev/tc/tcdevs
@@ -1,4 +1,4 @@
-$NetBSD: tcdevs,v 1.19 2003/10/25 16:24:30 chs Exp $
+$NetBSD: tcdevs,v 1.20 2005/12/11 12:24:00 christos Exp $
/*
* Copyright (c) 1996 Christopher G. Demetriou
diff --git a/sys/dev/tc/tcdevs.h b/sys/dev/tc/tcdevs.h
index 153b4e3fdcd..6fe66f6787e 100644
--- a/sys/dev/tc/tcdevs.h
+++ b/sys/dev/tc/tcdevs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcdevs.h,v 1.21 2005/02/27 15:34:22 perry Exp $ */
+/* $NetBSD: tcdevs.h,v 1.22 2005/12/11 12:24:00 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
diff --git a/sys/dev/tc/tcdevs_data.h b/sys/dev/tc/tcdevs_data.h
index 88ff5b09525..c16e3452339 100644
--- a/sys/dev/tc/tcdevs_data.h
+++ b/sys/dev/tc/tcdevs_data.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcdevs_data.h,v 1.21 2005/02/27 15:34:22 perry Exp $ */
+/* $NetBSD: tcdevs_data.h,v 1.22 2005/12/11 12:24:00 christos Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
diff --git a/sys/dev/tc/tcds.c b/sys/dev/tc/tcds.c
index 73fa6739129..d8a4cdedf6f 100644
--- a/sys/dev/tc/tcds.c
+++ b/sys/dev/tc/tcds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcds.c,v 1.16 2005/08/26 10:14:05 drochner Exp $ */
+/* $NetBSD: tcds.c,v 1.17 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.16 2005/08/26 10:14:05 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcds.c,v 1.17 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
diff --git a/sys/dev/tc/tcdsreg.h b/sys/dev/tc/tcdsreg.h
index 0e1b2e9064d..42c51dbc29d 100644
--- a/sys/dev/tc/tcdsreg.h
+++ b/sys/dev/tc/tcdsreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcdsreg.h,v 1.6 2005/02/27 00:27:50 perry Exp $ */
+/* $NetBSD: tcdsreg.h,v 1.7 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
diff --git a/sys/dev/tc/tcdsvar.h b/sys/dev/tc/tcdsvar.h
index 75b8b3d987c..2baa8cd8926 100644
--- a/sys/dev/tc/tcdsvar.h
+++ b/sys/dev/tc/tcdsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcdsvar.h,v 1.4 2005/02/27 00:27:50 perry Exp $ */
+/* $NetBSD: tcdsvar.h,v 1.5 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
diff --git a/sys/dev/tc/tcreg.h b/sys/dev/tc/tcreg.h
index 62416d78346..514319c6647 100644
--- a/sys/dev/tc/tcreg.h
+++ b/sys/dev/tc/tcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcreg.h,v 1.2 2005/02/27 00:27:50 perry Exp $ */
+/* $NetBSD: tcreg.h,v 1.3 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
diff --git a/sys/dev/tc/tcvar.h b/sys/dev/tc/tcvar.h
index ab53b09f507..4e896db2ab2 100644
--- a/sys/dev/tc/tcvar.h
+++ b/sys/dev/tc/tcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcvar.h,v 1.21 2005/06/01 16:17:40 drochner Exp $ */
+/* $NetBSD: tcvar.h,v 1.22 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
diff --git a/sys/dev/tc/tfb.c b/sys/dev/tc/tfb.c
index b187bf47256..998dd5a553b 100644
--- a/sys/dev/tc/tfb.c
+++ b/sys/dev/tc/tfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tfb.c,v 1.46 2005/02/27 00:27:50 perry Exp $ */
+/* $NetBSD: tfb.c,v 1.47 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.46 2005/02/27 00:27:50 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tfb.c,v 1.47 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -202,7 +202,7 @@ static const struct wsscreen_list tfb_screenlist = {
sizeof(_tfb_scrlist) / sizeof(struct wsscreen_descr *), _tfb_scrlist
};
-static int tfbioctl(void *, u_long, caddr_t, int, struct proc *);
+static int tfbioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t tfbmmap(void *, off_t, int);
static int tfb_alloc_screen(void *, const struct wsscreen_descr *,
@@ -400,12 +400,12 @@ tfb_cmap_init(sc)
}
static int
-tfbioctl(v, cmd, data, flag, p)
+tfbioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct tfb_softc *sc = v;
struct rasops_info *ri = sc->sc_ri;
diff --git a/sys/dev/tc/xcfb.c b/sys/dev/tc/xcfb.c
index 01594bfe98f..d44b162891c 100644
--- a/sys/dev/tc/xcfb.c
+++ b/sys/dev/tc/xcfb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xcfb.c,v 1.38 2005/02/27 00:27:50 perry Exp $ */
+/* $NetBSD: xcfb.c,v 1.39 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1998, 1999 Tohru Nishimura. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.38 2005/02/27 00:27:50 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xcfb.c,v 1.39 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -123,7 +123,7 @@ static const struct wsscreen_list xcfb_screenlist = {
sizeof(_xcfb_scrlist) / sizeof(struct wsscreen_descr *), _xcfb_scrlist
};
-static int xcfbioctl(void *, u_long, caddr_t, int, struct proc *);
+static int xcfbioctl(void *, u_long, caddr_t, int, struct lwp *);
static paddr_t xcfbmmap(void *, off_t, int);
static int xcfb_alloc_screen(void *, const struct wsscreen_descr *,
@@ -401,12 +401,12 @@ xcfbhwinit(base)
}
static int
-xcfbioctl(v, cmd, data, flag, p)
+xcfbioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct xcfb_softc *sc = v;
struct rasops_info *ri = sc->sc_ri;
diff --git a/sys/dev/tc/zs_ioasic.c b/sys/dev/tc/zs_ioasic.c
index 0b54bbc093d..7c318835295 100644
--- a/sys/dev/tc/zs_ioasic.c
+++ b/sys/dev/tc/zs_ioasic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_ioasic.c,v 1.28 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: zs_ioasic.c,v 1.29 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.28 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_ioasic.c,v 1.29 2005/12/11 12:24:00 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
diff --git a/sys/dev/tc/zs_ioasicvar.h b/sys/dev/tc/zs_ioasicvar.h
index dafddaa6ab2..e3ce2942750 100644
--- a/sys/dev/tc/zs_ioasicvar.h
+++ b/sys/dev/tc/zs_ioasicvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_ioasicvar.h,v 1.4 2005/02/04 02:10:48 perry Exp $ */
+/* $NetBSD: zs_ioasicvar.h,v 1.5 2005/12/11 12:24:00 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/tc/zskbd.c b/sys/dev/tc/zskbd.c
index 0a10c12aa46..74e03a13a12 100644
--- a/sys/dev/tc/zskbd.c
+++ b/sys/dev/tc/zskbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zskbd.c,v 1.11 2005/02/27 00:27:50 perry Exp $ */
+/* $NetBSD: zskbd.c,v 1.12 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.11 2005/02/27 00:27:50 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zskbd.c,v 1.12 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +128,7 @@ CFATTACH_DECL(zskbd, sizeof(struct zskbd_softc),
static int zskbd_enable(void *, int);
static void zskbd_set_leds(void *, int);
-static int zskbd_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int zskbd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
const struct wskbd_accessops zskbd_accessops = {
zskbd_enable,
@@ -316,12 +316,12 @@ zskbd_set_leds(v, leds)
}
static int
-zskbd_ioctl(v, cmd, data, flag, p)
+zskbd_ioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct zskbd_softc *sc = (struct zskbd_softc *)v;
diff --git a/sys/dev/tc/zsms.c b/sys/dev/tc/zsms.c
index 895fcb079c7..882960222b3 100644
--- a/sys/dev/tc/zsms.c
+++ b/sys/dev/tc/zsms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zsms.c,v 1.11 2005/02/04 02:10:48 perry Exp $ */
+/* $NetBSD: zsms.c,v 1.12 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.11 2005/02/04 02:10:48 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zsms.c,v 1.12 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@ CFATTACH_DECL(zsms, sizeof(struct zsms_softc),
zsms_match, zsms_attach, NULL, NULL);
static int zsms_enable(void *);
-static int zsms_ioctl(void *, u_long, caddr_t, int, struct proc *);
+static int zsms_ioctl(void *, u_long, caddr_t, int, struct lwp *);
static void zsms_disable(void *);
const struct wsmouse_accessops zsms_accessops = {
@@ -222,12 +222,12 @@ zsms_disable(v)
}
static int
-zsms_ioctl(v, cmd, data, flag, p)
+zsms_ioctl(v, cmd, data, flag, l)
void *v;
u_long cmd;
caddr_t data;
int flag;
- struct proc *p;
+ struct lwp *l;
{
if (cmd == WSMOUSEIO_GTYPE) {
diff --git a/sys/dev/usb/Makefile b/sys/dev/usb/Makefile
index 689b5971bc5..b733eb645db 100644
--- a/sys/dev/usb/Makefile
+++ b/sys/dev/usb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/15 17:18:18 itohy Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/11 12:24:00 christos Exp $
# use 'make -f Makefile.usbdevs' to make usbdevs.h and usbdevs_data.h
# _after_ you committed usbdevs. See comment in Makefile.usbdevs
diff --git a/sys/dev/usb/devlist2h.awk b/sys/dev/usb/devlist2h.awk
index 0c1e3ce36fe..a45547136f7 100644
--- a/sys/dev/usb/devlist2h.awk
+++ b/sys/dev/usb/devlist2h.awk
@@ -1,5 +1,5 @@
#! /usr/bin/awk -f
-# $NetBSD: devlist2h.awk,v 1.13 2005/03/04 05:03:19 mycroft Exp $
+# $NetBSD: devlist2h.awk,v 1.14 2005/12/11 12:24:00 christos Exp $
#
# Copyright (c) 1995, 1996 Christopher G. Demetriou
# All rights reserved.
diff --git a/sys/dev/usb/ezload.c b/sys/dev/usb/ezload.c
index 1933b263668..e13d25f902e 100644
--- a/sys/dev/usb/ezload.c
+++ b/sys/dev/usb/ezload.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ezload.c,v 1.9 2005/05/30 04:55:35 christos Exp $ */
+/* $NetBSD: ezload.c,v 1.10 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.9 2005/05/30 04:55:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.10 2005/12/11 12:24:00 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/ezload.h b/sys/dev/usb/ezload.h
index 1b18f23363a..fcff9e8e22c 100644
--- a/sys/dev/usb/ezload.h
+++ b/sys/dev/usb/ezload.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ezload.h,v 1.3 2005/05/30 04:21:39 christos Exp $ */
+/* $NetBSD: ezload.h,v 1.4 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index db94e25c8bc..9d3c05af8ba 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.64 2005/07/30 06:14:50 skrll Exp $
+# $NetBSD: files.usb,v 1.65 2005/12/11 12:24:00 christos Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
diff --git a/sys/dev/usb/hid.h b/sys/dev/usb/hid.h
index 8d527c8e794..8c192b48bd6 100644
--- a/sys/dev/usb/hid.h
+++ b/sys/dev/usb/hid.h
@@ -1,4 +1,4 @@
-/* $NetBSD: hid.h,v 1.9 2005/05/30 04:21:39 christos Exp $ */
+/* $NetBSD: hid.h,v 1.10 2005/12/11 12:24:00 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/hid.h,v 1.7 1999/11/17 22:33:40 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/if_atureg.h b/sys/dev/usb/if_atureg.h
index 0f3f1acf26d..3a87f195615 100644
--- a/sys/dev/usb/if_atureg.h
+++ b/sys/dev/usb/if_atureg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atureg.h,v 1.3 2005/06/22 06:16:02 dyoung Exp $ */
+/* $NetBSD: if_atureg.h,v 1.4 2005/12/11 12:24:00 christos Exp $ */
/* $OpenBSD: if_atureg.h,v 1.21 2004/12/23 13:19:38 dlg Exp $ */
/*
* Copyright (c) 2003
diff --git a/sys/dev/usb/if_axereg.h b/sys/dev/usb/if_axereg.h
index e98dabe1fc2..22eefaa0413 100644
--- a/sys/dev/usb/if_axereg.h
+++ b/sys/dev/usb/if_axereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axereg.h,v 1.2 2004/10/26 17:28:52 augustss Exp $ */
+/* $NetBSD: if_axereg.h,v 1.3 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003
diff --git a/sys/dev/usb/if_cdcereg.h b/sys/dev/usb/if_cdcereg.h
index 8e236e21709..495805ad221 100644
--- a/sys/dev/usb/if_cdcereg.h
+++ b/sys/dev/usb/if_cdcereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cdcereg.h,v 1.1 2004/10/22 13:08:23 augustss Exp $ */
+/* $NetBSD: if_cdcereg.h,v 1.2 2005/12/11 12:24:00 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
diff --git a/sys/dev/usb/if_udavreg.h b/sys/dev/usb/if_udavreg.h
index e474fe1dad3..137a6554f9a 100644
--- a/sys/dev/usb/if_udavreg.h
+++ b/sys/dev/usb/if_udavreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udavreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $ */
+/* $NetBSD: if_udavreg.h,v 1.3 2005/12/11 12:24:01 christos Exp $ */
/* $nabe: if_udavreg.h,v 1.2 2003/08/21 16:26:40 nabe Exp $ */
/*
* Copyright (c) 2003
diff --git a/sys/dev/usb/if_uralreg.h b/sys/dev/usb/if_uralreg.h
index a52637c6ee1..c7830e4abc0 100644
--- a/sys/dev/usb/if_uralreg.h
+++ b/sys/dev/usb/if_uralreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_uralreg.h,v 1.1 2005/07/01 20:06:56 drochner Exp $ */
+/* $NetBSD: if_uralreg.h,v 1.2 2005/12/11 12:24:01 christos Exp $ */
/* $OpenBSD: if_ralreg.h,v 1.5 2005/04/01 13:13:43 damien Exp $ */
/*-
diff --git a/sys/dev/usb/if_uralvar.h b/sys/dev/usb/if_uralvar.h
index dc7c387f41a..2ac6a8dba5c 100644
--- a/sys/dev/usb/if_uralvar.h
+++ b/sys/dev/usb/if_uralvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_uralvar.h,v 1.3 2005/07/12 12:46:37 drochner Exp $ */
+/* $NetBSD: if_uralvar.h,v 1.4 2005/12/11 12:24:01 christos Exp $ */
/* $OpenBSD: if_ralvar.h,v 1.2 2005/05/13 18:42:50 damien Exp $ */
/*-
diff --git a/sys/dev/usb/if_urlreg.h b/sys/dev/usb/if_urlreg.h
index 63807dafd40..bf9651b025e 100644
--- a/sys/dev/usb/if_urlreg.h
+++ b/sys/dev/usb/if_urlreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urlreg.h,v 1.2 2003/09/04 15:17:39 tsutsui Exp $ */
+/* $NetBSD: if_urlreg.h,v 1.3 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001, 2002
* Shingo WATANABE <nabe@nabechan.org>. All rights reserved.
diff --git a/sys/dev/usb/ohcireg.h b/sys/dev/usb/ohcireg.h
index 73899db8b69..e3f7aac9cab 100644
--- a/sys/dev/usb/ohcireg.h
+++ b/sys/dev/usb/ohcireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ohcireg.h,v 1.20 2005/04/17 14:46:49 toshii Exp $ */
+/* $NetBSD: ohcireg.h,v 1.21 2005/12/11 12:24:01 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohcireg.h,v 1.8 1999/11/17 22:33:40 n_hibma Exp $ */
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index e0b2085783f..9b62e2c1262 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.99 2005/05/30 04:21:39 christos Exp $ */
+/* $NetBSD: uaudio.c,v 1.100 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.99 2005/05/30 04:21:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.100 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/uaudioreg.h b/sys/dev/usb/uaudioreg.h
index 6de356f57ae..e8c4a9198ef 100644
--- a/sys/dev/usb/uaudioreg.h
+++ b/sys/dev/usb/uaudioreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudioreg.h,v 1.12 2004/11/05 19:08:29 kent Exp $ */
+/* $NetBSD: uaudioreg.h,v 1.13 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ubsa.c b/sys/dev/usb/ubsa.c
index 5a8965f4639..60d07d98730 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/dev/usb/ubsa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa.c,v 1.12 2005/05/11 10:02:28 augustss Exp $ */
+/* $NetBSD: ubsa.c,v 1.13 2005/12/11 12:24:01 christos Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.12 2005/05/11 10:02:28 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.13 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/ubt.c b/sys/dev/usb/ubt.c
index d20ad88913f..811b2abc439 100644
--- a/sys/dev/usb/ubt.c
+++ b/sys/dev/usb/ubt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ubt.c,v 1.12 2005/05/11 10:02:28 augustss Exp $ */
+/* $NetBSD: ubt.c,v 1.13 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.12 2005/05/11 10:02:28 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.13 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/ubtbcmfw.c b/sys/dev/usb/ubtbcmfw.c
index c456f6028af..f6abe08fda3 100644
--- a/sys/dev/usb/ubtbcmfw.c
+++ b/sys/dev/usb/ubtbcmfw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ubtbcmfw.c,v 1.10 2005/05/11 10:02:28 augustss Exp $ */
+/* $NetBSD: ubtbcmfw.c,v 1.11 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubtbcmfw.c,v 1.10 2005/05/11 10:02:28 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubtbcmfw.c,v 1.11 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -222,7 +222,7 @@ ubtbcmfw_load_file(usbd_device_handle dev, usbd_pipe_handle out,
char buf[1024];
struct timeval delta;
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, p);
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, curlwp);
/* Loop until we are well passed boot */
for (;;) {
error = vn_open(&nd, FREAD, 0);
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index 046b6ca03cd..09354f1d389 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.59 2005/09/23 14:15:30 itohy Exp $ */
+/* $NetBSD: ucom.c,v 1.60 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.59 2005/09/23 14:15:30 itohy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.60 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -155,7 +155,7 @@ Static int ucomparam(struct tty *, struct termios *);
Static void ucomstart(struct tty *);
Static void ucom_shutdown(struct ucom_softc *);
Static int ucom_do_ioctl(struct ucom_softc *, u_long, caddr_t,
- int, usb_proc_ptr);
+ int, struct lwp *);
Static void ucom_dtr(struct ucom_softc *, int);
Static void ucom_rts(struct ucom_softc *, int);
Static void ucom_break(struct ucom_softc *, int);
@@ -300,10 +300,11 @@ ucom_shutdown(struct ucom_softc *sc)
}
int
-ucomopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ucomopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = UCOMUNIT(dev);
usbd_status err;
+ struct proc *p = l->l_proc;
struct ucom_softc *sc;
struct tty *tp;
int s;
@@ -495,7 +496,7 @@ bad:
}
int
-ucomclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ucomclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ucom_softc *sc = ucom_cd.cd_devs[UCOMUNIT(dev)];
struct tty *tp = sc->sc_tty;
@@ -562,7 +563,7 @@ ucomwrite(dev_t dev, struct uio *uio, int flag)
}
int
-ucompoll(dev_t dev, int events, usb_proc_ptr p)
+ucompoll(dev_t dev, int events, struct lwp *l)
{
struct ucom_softc *sc = ucom_cd.cd_devs[UCOMUNIT(dev)];
struct tty *tp = sc->sc_tty;
@@ -572,7 +573,7 @@ ucompoll(dev_t dev, int events, usb_proc_ptr p)
return (POLLHUP);
sc->sc_refcnt++;
- revents = ((*tp->t_linesw->l_poll)(tp, events, p));
+ revents = ((*tp->t_linesw->l_poll)(tp, events, l));
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
return (revents);
@@ -588,13 +589,13 @@ ucomtty(dev_t dev)
}
int
-ucomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ucomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct ucom_softc *sc = ucom_cd.cd_devs[UCOMUNIT(dev)];
int error;
sc->sc_refcnt++;
- error = ucom_do_ioctl(sc, cmd, data, flag, p);
+ error = ucom_do_ioctl(sc, cmd, data, flag, l);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
return (error);
@@ -602,9 +603,10 @@ ucomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
Static int
ucom_do_ioctl(struct ucom_softc *sc, u_long cmd, caddr_t data,
- int flag, usb_proc_ptr p)
+ int flag, struct lwp *l)
{
struct tty *tp = sc->sc_tty;
+ struct proc *p = l->l_proc;
int error;
int s;
@@ -613,17 +615,17 @@ ucom_do_ioctl(struct ucom_softc *sc, u_long cmd, caddr_t data,
DPRINTF(("ucomioctl: cmd=0x%08lx\n", cmd));
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
if (sc->sc_methods->ucom_ioctl != NULL) {
error = sc->sc_methods->ucom_ioctl(sc->sc_parent,
- sc->sc_portno, cmd, data, flag, p);
+ sc->sc_portno, cmd, data, flag, l->l_proc);
if (error != EPASSTHROUGH)
return (error);
}
diff --git a/sys/dev/usb/ucomvar.h b/sys/dev/usb/ucomvar.h
index a90d32c31c5..26792f28503 100644
--- a/sys/dev/usb/ucomvar.h
+++ b/sys/dev/usb/ucomvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ucomvar.h,v 1.12 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: ucomvar.h,v 1.13 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ucycom.c b/sys/dev/usb/ucycom.c
index 15ea9bc93aa..11123a8cdde 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/dev/usb/ucycom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ucycom.c,v 1.5 2005/09/06 21:40:45 kleink Exp $ */
+/* $NetBSD: ucycom.c,v 1.6 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: ucycom.c,v 1.5 2005/09/06 21:40:45 kleink Exp $");
+__RCSID("$NetBSD: ucycom.c,v 1.6 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -308,7 +308,7 @@ ucycom_shutdown(struct ucycom_softc *sc)
#endif
int
-ucycomopen(dev_t dev, int flag, int mode, struct proc *p)
+ucycomopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = UCYCOMUNIT(dev);
struct ucycom_softc *sc;
@@ -338,7 +338,7 @@ ucycomopen(dev_t dev, int flag, int mode, struct proc *p)
if (ISSET(tp->t_state, TS_ISOPEN) &&
ISSET(tp->t_state, TS_XCLUDE) &&
- suser(p->p_ucred, &p->p_acflag) != 0)
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0)
return (EBUSY);
s = spltty();
@@ -429,7 +429,7 @@ bad:
int
-ucycomclose(dev_t dev, int flag, int mode, struct proc *p)
+ucycomclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ucycom_softc *sc = ucycom_cd.cd_devs[UCYCOMUNIT(dev)];
struct tty *tp = sc->sc_tty;
@@ -727,7 +727,7 @@ ucycomtty(dev_t dev)
}
int
-ucycomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+ucycomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct ucycom_softc *sc = ucycom_cd.cd_devs[UCYCOMUNIT(dev)];
struct tty *tp = sc->sc_tty;
@@ -739,11 +739,11 @@ ucycomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
DPRINTF(("ucycomioctl: sc=%p, tp=%p, data=%p\n", sc, tp, data));
- err = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ err = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (err != EPASSTHROUGH)
return (err);
- err = ttioctl(tp, cmd, data, flag, p);
+ err = ttioctl(tp, cmd, data, flag, l);
if (err != EPASSTHROUGH)
return (err);
@@ -774,7 +774,7 @@ ucycomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
break;
case TIOCSFLAGS:
- err = suser(p->p_ucred, &p->p_acflag);
+ err = suser(l->l_proc->p_ucred, &l->l_proc->p_acflag);
if (err)
break;
sc->sc_swflags = *(int *)data;
@@ -801,18 +801,18 @@ ucycomioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
}
int
-ucycompoll(dev_t dev, int events, struct proc *p)
+ucycompoll(dev_t dev, int events, struct lwp *l)
{
struct ucycom_softc *sc = ucycom_cd.cd_devs[UCYCOMUNIT(dev)];
struct tty *tp = sc->sc_tty;
int err;
- DPRINTF(("ucycompoll: sc=%p, tp=%p, events=%d, proc=%p\n", sc, tp, events, p));
+ DPRINTF(("ucycompoll: sc=%p, tp=%p, events=%d, lwp=%p\n", sc, tp, events, l));
if (sc->sc_dying)
return (EIO);
- err = ((*tp->t_linesw->l_poll)(tp, events, p));
+ err = ((*tp->t_linesw->l_poll)(tp, events, l));
return (err);
}
diff --git a/sys/dev/usb/udsbr.c b/sys/dev/usb/udsbr.c
index 4ca934e6910..d9348c8a01e 100644
--- a/sys/dev/usb/udsbr.c
+++ b/sys/dev/usb/udsbr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: udsbr.c,v 1.10 2005/05/11 10:02:28 augustss Exp $ */
+/* $NetBSD: udsbr.c,v 1.11 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.10 2005/05/11 10:02:28 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.11 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/uep.c b/sys/dev/usb/uep.c
index bd76456fe54..ced6a6f273d 100644
--- a/sys/dev/usb/uep.c
+++ b/sys/dev/usb/uep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uep.c,v 1.4 2005/05/11 10:02:28 augustss Exp $ */
+/* $NetBSD: uep.c,v 1.5 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.4 2005/05/11 10:02:28 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.5 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -94,7 +94,7 @@ Static void uep_intr(usbd_xfer_handle, usbd_private_handle, usbd_status);
Static int uep_enable(void *);
Static void uep_disable(void *);
-Static int uep_ioctl(void *, u_long, caddr_t, int, usb_proc_ptr);
+Static int uep_ioctl(void *, u_long, caddr_t, int, struct lwp *);
const struct wsmouse_accessops uep_accessops = {
uep_enable,
@@ -319,7 +319,7 @@ uep_disable(void *v)
}
Static int
-uep_ioctl(void *v, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+uep_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct uep_softc *sc = v;
struct wsmouse_id *id;
@@ -345,7 +345,7 @@ uep_ioctl(void *v, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
case WSMOUSEIO_SCALIBCOORDS:
case WSMOUSEIO_GCALIBCOORDS:
- return tpcalib_ioctl(&sc->sc_tpcalib, cmd, data, flag, p);
+ return tpcalib_ioctl(&sc->sc_tpcalib, cmd, data, flag, l);
}
return EPASSTHROUGH;
diff --git a/sys/dev/usb/uftdi.c b/sys/dev/usb/uftdi.c
index 10bda02d3bf..17f9d7401f5 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/dev/usb/uftdi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.24 2005/05/11 10:02:28 augustss Exp $ */
+/* $NetBSD: uftdi.c,v 1.25 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.24 2005/05/11 10:02:28 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.25 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index dc914b554fb..9ad75337f76 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.77 2005/11/28 13:14:48 augustss Exp $ */
+/* $NetBSD: ugen.c,v 1.78 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.77 2005/11/28 13:14:48 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.78 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,7 +171,7 @@ Static void ugen_isoc_rintr(usbd_xfer_handle xfer, usbd_private_handle addr,
Static int ugen_do_read(struct ugen_softc *, int, struct uio *, int);
Static int ugen_do_write(struct ugen_softc *, int, struct uio *, int);
Static int ugen_do_ioctl(struct ugen_softc *, int, u_long,
- caddr_t, int, usb_proc_ptr);
+ caddr_t, int, struct lwp *);
Static int ugen_set_config(struct ugen_softc *sc, int configno);
Static usb_config_descriptor_t *ugen_get_cdesc(struct ugen_softc *sc,
int index, int *lenp);
@@ -310,7 +310,7 @@ ugen_set_config(struct ugen_softc *sc, int configno)
}
int
-ugenopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ugenopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ugen_softc *sc;
int unit = UGENUNIT(dev);
@@ -451,7 +451,7 @@ ugenopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
}
int
-ugenclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ugenclose(dev_t dev, int flag, int mode, struct lwp *l)
{
int endpt = UGENENDPOINT(dev);
struct ugen_softc *sc;
@@ -1044,7 +1044,7 @@ ugen_get_alt_index(struct ugen_softc *sc, int ifaceidx)
Static int
ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
- caddr_t addr, int flag, usb_proc_ptr p)
+ caddr_t addr, int flag, struct lwp *l)
{
struct ugen_endpoint *sce;
usbd_status err;
@@ -1227,7 +1227,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
uio.uio_offset = 0;
uio.uio_segflg = UIO_USERSPACE;
uio.uio_rw = UIO_READ;
- uio.uio_procp = p;
+ uio.uio_lwp = l;
error = uiomove((void *)cdesc, len, &uio);
free(cdesc, M_TEMP);
return (error);
@@ -1275,7 +1275,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
uio.uio_rw =
ur->ucr_request.bmRequestType & UT_READ ?
UIO_READ : UIO_WRITE;
- uio.uio_procp = p;
+ uio.uio_lwp = l;
ptr = malloc(len, M_TEMP, M_WAITOK);
if (uio.uio_rw == UIO_WRITE) {
error = uiomove(ptr, len, &uio);
@@ -1313,7 +1313,7 @@ ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
}
int
-ugenioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+ugenioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
int endpt = UGENENDPOINT(dev);
struct ugen_softc *sc;
@@ -1322,14 +1322,14 @@ ugenioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
USB_GET_SC(ugen, UGENUNIT(dev), sc);
sc->sc_refcnt++;
- error = ugen_do_ioctl(sc, endpt, cmd, addr, flag, p);
+ error = ugen_do_ioctl(sc, endpt, cmd, addr, flag, l);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
return (error);
}
int
-ugenpoll(dev_t dev, int events, usb_proc_ptr p)
+ugenpoll(dev_t dev, int events, struct lwp *l)
{
struct ugen_softc *sc;
struct ugen_endpoint *sce;
@@ -1362,7 +1362,7 @@ ugenpoll(dev_t dev, int events, usb_proc_ptr p)
if (sce->q.c_cc > 0)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sce->rsel);
+ selrecord(l, &sce->rsel);
}
break;
case UE_ISOCHRONOUS:
@@ -1370,7 +1370,7 @@ ugenpoll(dev_t dev, int events, usb_proc_ptr p)
if (sce->cur != sce->fill)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sce->rsel);
+ selrecord(l, &sce->rsel);
}
break;
case UE_BULK:
diff --git a/sys/dev/usb/ugensa.c b/sys/dev/usb/ugensa.c
index 0dfc5165f63..c2a7f9dc80b 100644
--- a/sys/dev/usb/ugensa.c
+++ b/sys/dev/usb/ugensa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ugensa.c,v 1.3 2005/05/11 10:02:28 augustss Exp $ */
+/* $NetBSD: ugensa.c,v 1.4 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ugraphire_rdesc.h b/sys/dev/usb/ugraphire_rdesc.h
index fe5aaeb3f5a..101941c671c 100644
--- a/sys/dev/usb/ugraphire_rdesc.h
+++ b/sys/dev/usb/ugraphire_rdesc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ugraphire_rdesc.h,v 1.3 2004/01/04 08:35:52 jdolecek Exp $ */
+/* $NetBSD: ugraphire_rdesc.h,v 1.4 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2000 Nick Hibma <n_hibma@freebsd.org>
* All rights reserved.
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 5fdad28c5a0..c3aacc82615 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.190 2005/07/18 11:08:00 augustss Exp $ */
+/* $NetBSD: uhci.c,v 1.191 2005/12/11 12:24:01 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.190 2005/07/18 11:08:00 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.191 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h
index b68ec1d9eaa..2c4e428b20b 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/dev/usb/uhcivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: uhcivar.h,v 1.38 2005/01/11 07:45:34 imp Exp $ */
+/* $NetBSD: uhcivar.h,v 1.39 2005/12/11 12:24:01 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhcivar.h,v 1.14 1999/11/17 22:33:42 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
index a9fee0af73e..e52d95d2406 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/dev/usb/uhid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.67 2005/11/28 13:14:48 augustss Exp $ */
+/* $NetBSD: uhid.c,v 1.68 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.67 2005/11/28 13:14:48 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.68 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -120,7 +120,7 @@ Static void uhid_intr(struct uhidev *, void *, u_int len);
Static int uhid_do_read(struct uhid_softc *, struct uio *uio, int);
Static int uhid_do_write(struct uhid_softc *, struct uio *uio, int);
-Static int uhid_do_ioctl(struct uhid_softc*, u_long, caddr_t, int, usb_proc_ptr);
+Static int uhid_do_ioctl(struct uhid_softc*, u_long, caddr_t, int, struct lwp *);
USB_DECLARE_DRIVER(uhid);
@@ -254,7 +254,7 @@ uhid_intr(struct uhidev *addr, void *data, u_int len)
}
int
-uhidopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uhidopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct uhid_softc *sc;
int error;
@@ -282,7 +282,7 @@ uhidopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
}
int
-uhidclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uhidclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct uhid_softc *sc;
@@ -415,7 +415,7 @@ uhidwrite(dev_t dev, struct uio *uio, int flag)
int
uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr,
- int flag, usb_proc_ptr p)
+ int flag, struct lwp *l)
{
struct usb_ctl_report_desc *rd;
struct usb_ctl_report *re;
@@ -438,8 +438,8 @@ uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr,
if (*(int *)addr) {
if (sc->sc_async != NULL)
return (EBUSY);
- sc->sc_async = p;
- DPRINTF(("uhid_do_ioctl: FIOASYNC %p\n", p));
+ sc->sc_async = l->l_proc;
+ DPRINTF(("uhid_do_ioctl: FIOASYNC %p\n", l->l_proc));
} else
sc->sc_async = NULL;
break;
@@ -553,7 +553,7 @@ uhid_do_ioctl(struct uhid_softc *sc, u_long cmd, caddr_t addr,
}
int
-uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct uhid_softc *sc;
int error;
@@ -561,14 +561,14 @@ uhidioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
USB_GET_SC(uhid, UHIDUNIT(dev), sc);
sc->sc_refcnt++;
- error = uhid_do_ioctl(sc, cmd, addr, flag, p);
+ error = uhid_do_ioctl(sc, cmd, addr, flag, l);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_hdev.sc_dev));
return (error);
}
int
-uhidpoll(dev_t dev, int events, usb_proc_ptr p)
+uhidpoll(dev_t dev, int events, struct lwp *l)
{
struct uhid_softc *sc;
int revents = 0;
@@ -586,7 +586,7 @@ uhidpoll(dev_t dev, int events, usb_proc_ptr p)
if (sc->sc_q.c_cc > 0)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &sc->sc_rsel);
+ selrecord(l, &sc->sc_rsel);
}
splx(s);
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index e99d5eb453f..bae5805f9af 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.76 2005/05/11 10:02:28 augustss Exp $ */
+/* $NetBSD: uhub.c,v 1.77 2005/12/11 12:24:01 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.76 2005/05/11 10:02:28 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.77 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/uipaq.c b/sys/dev/usb/uipaq.c
index 809f8730502..4bfcbdee857 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/dev/usb/uipaq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uipaq.c,v 1.1 2005/07/18 11:42:28 augustss Exp $ */
+/* $NetBSD: uipaq.c,v 1.2 2005/12/11 12:24:01 christos Exp $ */
/* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */
/*
diff --git a/sys/dev/usb/uirda.c b/sys/dev/usb/uirda.c
index ba06aaabffd..a7b4dcbfa47 100644
--- a/sys/dev/usb/uirda.c
+++ b/sys/dev/usb/uirda.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.19 2005/05/11 10:02:28 augustss Exp $ */
+/* $NetBSD: uirda.c,v 1.20 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.19 2005/05/11 10:02:28 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.20 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -227,14 +227,14 @@ struct uirda_softc {
#define UIRDA_WR_TIMEOUT 200
-int uirda_open(void *h, int flag, int mode, usb_proc_ptr p);
-int uirda_close(void *h, int flag, int mode, usb_proc_ptr p);
+int uirda_open(void *h, int flag, int mode, struct lwp *l);
+int uirda_close(void *h, int flag, int mode, struct lwp *l);
int uirda_read(void *h, struct uio *uio, int flag);
int uirda_write(void *h, struct uio *uio, int flag);
int uirda_set_params(void *h, struct irda_params *params);
int uirda_get_speeds(void *h, int *speeds);
int uirda_get_turnarounds(void *h, int *times);
-int uirda_poll(void *h, int events, usb_proc_ptr p);
+int uirda_poll(void *h, int events, struct lwp *l);
int uirda_kqfilter(void *h, struct knote *kn);
struct irframe_methods uirda_methods = {
@@ -441,7 +441,7 @@ uirda_activate(device_ptr_t self, enum devact act)
}
int
-uirda_open(void *h, int flag, int mode, usb_proc_ptr p)
+uirda_open(void *h, int flag, int mode, struct lwp *l)
{
struct uirda_softc *sc = h;
int error;
@@ -510,7 +510,7 @@ bad1:
}
int
-uirda_close(void *h, int flag, int mode, usb_proc_ptr p)
+uirda_close(void *h, int flag, int mode, struct lwp *l)
{
struct uirda_softc *sc = h;
@@ -657,7 +657,7 @@ uirda_write(void *h, struct uio *uio, int flag)
}
int
-uirda_poll(void *h, int events, usb_proc_ptr p)
+uirda_poll(void *h, int events, struct lwp *l)
{
struct uirda_softc *sc = h;
int revents = 0;
@@ -674,7 +674,7 @@ uirda_poll(void *h, int events, usb_proc_ptr p)
revents |= events & (POLLIN | POLLRDNORM);
} else {
DPRINTFN(2,("%s: recording select\n", __func__));
- selrecord(p, &sc->sc_rd_sel);
+ selrecord(l, &sc->sc_rd_sel);
}
}
splx(s);
diff --git a/sys/dev/usb/ukbd.c b/sys/dev/usb/ukbd.c
index fff706ebc28..c5d6034ccf1 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/dev/usb/ukbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.89 2005/06/13 16:41:44 cube Exp $ */
+/* $NetBSD: ukbd.c,v 1.90 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.89 2005/06/13 16:41:44 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.90 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -249,7 +249,7 @@ Static int ukbd_enable(void *, int);
Static void ukbd_set_leds(void *, int);
#if defined(__NetBSD__)
-Static int ukbd_ioctl(void *, u_long, caddr_t, int, usb_proc_ptr );
+Static int ukbd_ioctl(void *, u_long, caddr_t, int, struct lwp *);
#if defined(WSDISPLAY_COMPAT_RAWKBD) && defined(UKBD_REPEAT)
Static void ukbd_rawrepeat(void *v);
#endif
@@ -695,7 +695,7 @@ ukbd_rawrepeat(void *v)
#endif /* defined(WSDISPLAY_COMPAT_RAWKBD) && defined(UKBD_REPEAT) */
int
-ukbd_ioctl(void *v, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ukbd_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct ukbd_softc *sc = v;
diff --git a/sys/dev/usb/ukbdmap.c b/sys/dev/usb/ukbdmap.c
index d40c284c5ba..b985b41a2e2 100644
--- a/sys/dev/usb/ukbdmap.c
+++ b/sys/dev/usb/ukbdmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbdmap.c,v 1.15 2005/06/08 09:11:09 martin Exp $ */
+/* $NetBSD: ukbdmap.c,v 1.16 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.15 2005/06/08 09:11:09 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbdmap.c,v 1.16 2005/12/11 12:24:01 christos Exp $");
#include <sys/types.h>
#include <dev/wscons/wsksymdef.h>
diff --git a/sys/dev/usb/ukyopon.c b/sys/dev/usb/ukyopon.c
index 7926a8f3b82..c21cd2ad1ea 100644
--- a/sys/dev/usb/ukyopon.c
+++ b/sys/dev/usb/ukyopon.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ukyopon.c,v 1.3 2005/09/24 12:00:18 itohy Exp $ */
+/* $NetBSD: ukyopon.c,v 1.4 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.3 2005/09/24 12:00:18 itohy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.4 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/ukyopon.h b/sys/dev/usb/ukyopon.h
index 6fdfcb86173..8aeb124a245 100644
--- a/sys/dev/usb/ukyopon.h
+++ b/sys/dev/usb/ukyopon.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ukyopon.h,v 1.2 2005/09/24 12:03:31 itohy Exp $ */
+/* $NetBSD: ukyopon.h,v 1.3 2005/12/11 12:24:01 christos Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
index 8686fdf2755..f5771a7ac09 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/dev/usb/ulpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.70 2005/11/13 10:47:39 rpaulo Exp $ */
+/* $NetBSD: ulpt.c,v 1.71 2005/12/11 12:24:01 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
/*
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.70 2005/11/13 10:47:39 rpaulo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.71 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -500,7 +500,7 @@ int ulptusein = 1;
* Reset the printer, then wait until it's selected and not busy.
*/
int
-ulptopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ulptopen(dev_t dev, int flag, int mode, struct lwp *l)
{
u_char flags = ULPTFLAGS(dev);
struct ulpt_softc *sc;
@@ -646,7 +646,7 @@ ulpt_statusmsg(u_char status, struct ulpt_softc *sc)
}
int
-ulptclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+ulptclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct ulpt_softc *sc;
@@ -832,7 +832,7 @@ ulpt_tick(void *xsc)
}
int
-ulptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ulptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int error = 0;
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 4eb1c7a63f7..01042586d27 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.119 2005/05/31 19:26:22 drochner Exp $ */
+/* $NetBSD: umass.c,v 1.120 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -131,7 +131,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.119 2005/05/31 19:26:22 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.120 2005/12/11 12:24:01 christos Exp $");
#include "atapibus.h"
#include "scsibus.h"
diff --git a/sys/dev/usb/umass_isdata.c b/sys/dev/usb/umass_isdata.c
index dd4304c397b..b01ad7946ba 100644
--- a/sys/dev/usb/umass_isdata.c
+++ b/sys/dev/usb/umass_isdata.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_isdata.c,v 1.13 2004/08/20 23:26:54 thorpej Exp $ */
+/* $NetBSD: umass_isdata.c,v 1.14 2005/12/11 12:24:01 christos Exp $ */
/*
* TODO:
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.13 2004/08/20 23:26:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.14 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c
index cd622c8572f..4f25d7ed3cc 100644
--- a/sys/dev/usb/umass_quirks.c
+++ b/sys/dev/usb/umass_quirks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_quirks.c,v 1.69 2005/09/21 21:19:27 cube Exp $ */
+/* $NetBSD: umass_quirks.c,v 1.70 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.69 2005/09/21 21:19:27 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.70 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/umass_scsipi.c b/sys/dev/usb/umass_scsipi.c
index 8f0b9f3eb70..120a256cb93 100644
--- a/sys/dev/usb/umass_scsipi.c
+++ b/sys/dev/usb/umass_scsipi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.26 2005/09/22 22:39:37 nathanw Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.27 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001, 2003 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.26 2005/09/22 22:39:37 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.27 2005/12/11 12:24:01 christos Exp $");
#include "atapibus.h"
#include "scsibus.h"
diff --git a/sys/dev/usb/umassvar.h b/sys/dev/usb/umassvar.h
index 0bf9c09c330..ba5d7988a1d 100644
--- a/sys/dev/usb/umassvar.h
+++ b/sys/dev/usb/umassvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: umassvar.h,v 1.23 2004/03/22 14:55:42 tls Exp $ */
+/* $NetBSD: umassvar.h,v 1.24 2005/12/11 12:24:01 christos Exp $ */
/*-
* Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
* Nick Hibma <n_hibma@freebsd.org>
diff --git a/sys/dev/usb/umct.c b/sys/dev/usb/umct.c
index 4bd3aa40009..a09b42a6a73 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/dev/usb/umct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umct.c,v 1.17 2005/05/30 04:21:39 christos Exp $ */
+/* $NetBSD: umct.c,v 1.18 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.17 2005/05/30 04:21:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.18 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index d919de74e53..fe356e0dcb5 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.23 2005/05/11 10:02:28 augustss Exp $ */
+/* $NetBSD: umidi.c,v 1.24 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.23 2005/05/11 10:02:28 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi.c,v 1.24 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/umidi_quirks.c b/sys/dev/usb/umidi_quirks.c
index ba0947f80c9..739e64cd2f3 100644
--- a/sys/dev/usb/umidi_quirks.c
+++ b/sys/dev/usb/umidi_quirks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.c,v 1.8 2005/08/14 21:08:45 augustss Exp $ */
+/* $NetBSD: umidi_quirks.c,v 1.9 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.8 2005/08/14 21:08:45 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umidi_quirks.c,v 1.9 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/umidi_quirks.h b/sys/dev/usb/umidi_quirks.h
index e070516a88b..9ac61d09da4 100644
--- a/sys/dev/usb/umidi_quirks.h
+++ b/sys/dev/usb/umidi_quirks.h
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi_quirks.h,v 1.3 2003/12/04 13:57:31 keihan Exp $ */
+/* $NetBSD: umidi_quirks.h,v 1.4 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/umidireg.h b/sys/dev/usb/umidireg.h
index e2a51b40f4a..f202878c445 100644
--- a/sys/dev/usb/umidireg.h
+++ b/sys/dev/usb/umidireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: umidireg.h,v 1.3 2003/12/04 13:57:31 keihan Exp $ */
+/* $NetBSD: umidireg.h,v 1.4 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/umidivar.h b/sys/dev/usb/umidivar.h
index 7a55f9cb2be..4f010611bb2 100644
--- a/sys/dev/usb/umidivar.h
+++ b/sys/dev/usb/umidivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: umidivar.h,v 1.7 2003/12/05 06:05:53 gson Exp $ */
+/* $NetBSD: umidivar.h,v 1.8 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
diff --git a/sys/dev/usb/umodem.c b/sys/dev/usb/umodem.c
index 4d3cf7dc839..99063f836de 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/dev/usb/umodem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem.c,v 1.53 2005/04/18 18:45:02 drochner Exp $ */
+/* $NetBSD: umodem.c,v 1.54 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.53 2005/04/18 18:45:02 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.54 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/umodem_common.c b/sys/dev/usb/umodem_common.c
index 9e09120ccff..fded6a72f09 100644
--- a/sys/dev/usb/umodem_common.c
+++ b/sys/dev/usb/umodem_common.c
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem_common.c,v 1.5 2005/05/30 04:21:39 christos Exp $ */
+/* $NetBSD: umodem_common.c,v 1.6 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.5 2005/05/30 04:21:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.6 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/umodemvar.h b/sys/dev/usb/umodemvar.h
index 465eab8b02e..21ada9badd6 100644
--- a/sys/dev/usb/umodemvar.h
+++ b/sys/dev/usb/umodemvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: umodemvar.h,v 1.2 2005/04/15 14:43:05 itohy Exp $ */
+/* $NetBSD: umodemvar.h,v 1.3 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/ums.c b/sys/dev/usb/ums.c
index e1718fb9753..f2017df4df2 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/dev/usb/ums.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.63 2005/11/23 09:41:28 augustss Exp $ */
+/* $NetBSD: ums.c,v 1.64 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.63 2005/11/23 09:41:28 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.64 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,7 @@ Static void ums_intr(struct uhidev *addr, void *ibuf, u_int len);
Static int ums_enable(void *);
Static void ums_disable(void *);
-Static int ums_ioctl(void *, u_long, caddr_t, int, usb_proc_ptr );
+Static int ums_ioctl(void *, u_long, caddr_t, int, struct lwp * );
const struct wsmouse_accessops ums_accessops = {
ums_enable,
@@ -377,7 +377,7 @@ ums_disable(void *v)
}
Static int
-ums_ioctl(void *v, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+ums_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct lwp * p)
{
switch (cmd) {
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 1d86ab03a02..9acaf78a658 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.46 2005/10/09 02:16:35 sekiya Exp $ */
+/* $NetBSD: uplcom.c,v 1.47 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.46 2005/10/09 02:16:35 sekiya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.47 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/urio.c b/sys/dev/usb/urio.c
index 8c6b7a58ea4..af67f6c736f 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/dev/usb/urio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.20 2005/05/11 10:02:28 augustss Exp $ */
+/* $NetBSD: urio.c,v 1.21 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.20 2005/05/11 10:02:28 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.21 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -312,7 +312,7 @@ urio_activate(device_ptr_t self, enum devact act)
#endif
int
-urioopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+urioopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct urio_softc *sc;
usbd_status err;
@@ -345,7 +345,7 @@ urioopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
}
int
-urioclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+urioclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct urio_softc *sc;
USB_GET_SC(urio, URIOUNIT(dev), sc);
@@ -487,7 +487,7 @@ uriowrite(dev_t dev, struct uio *uio, int flag)
int
-urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct urio_softc * sc;
int unit = URIOUNIT(dev);
@@ -551,7 +551,7 @@ urioioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
uio.uio_segflg = UIO_USERSPACE;
uio.uio_rw = req.bmRequestType & UT_READ ?
UIO_READ : UIO_WRITE;
- uio.uio_procp = p;
+ uio.uio_lwp = l;
ptr = malloc(len, M_TEMP, M_WAITOK);
if (uio.uio_rw == UIO_WRITE) {
error = uiomove(ptr, len, &uio);
@@ -583,7 +583,7 @@ ret:
#if defined(__OpenBSD__)
int
-urioselect(dev_t dev, int events, usb_proc_ptr p)
+urioselect(dev_t dev, int events, struct lwp *l)
{
return (0);
}
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index c05095b37ff..05236c0ce50 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.c,v 1.83 2005/09/09 12:04:30 drochner Exp $ */
+/* $NetBSD: usb.c,v 1.84 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.83 2005/09/09 12:04:30 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb.c,v 1.84 2005/12/11 12:24:01 christos Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -381,7 +381,7 @@ usbctlprint(void *aux, const char *pnp)
#endif /* defined(__NetBSD__) || defined(__OpenBSD__) */
int
-usbopen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+usbopen(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = minor(dev);
struct usb_softc *sc;
@@ -436,7 +436,7 @@ usbread(dev_t dev, struct uio *uio, int flag)
}
int
-usbclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+usbclose(dev_t dev, int flag, int mode, struct lwp *l)
{
int unit = minor(dev);
@@ -449,7 +449,7 @@ usbclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
}
int
-usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
+usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct usb_softc *sc;
int unit = minor(devt);
@@ -462,7 +462,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
case FIOASYNC:
if (*(int *)data)
- usb_async_proc = p;
+ usb_async_proc = l->l_proc;
else
usb_async_proc = 0;
return (0);
@@ -522,7 +522,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
uio.uio_rw =
ur->ucr_request.bmRequestType & UT_READ ?
UIO_READ : UIO_WRITE;
- uio.uio_procp = p;
+ uio.uio_lwp = l;
ptr = malloc(len, M_TEMP, M_WAITOK);
if (uio.uio_rw == UIO_WRITE) {
error = uiomove(ptr, len, &uio);
@@ -576,7 +576,7 @@ usbioctl(dev_t devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
}
int
-usbpoll(dev_t dev, int events, usb_proc_ptr p)
+usbpoll(dev_t dev, int events, struct lwp *l)
{
int revents, mask, s;
@@ -588,7 +588,7 @@ usbpoll(dev_t dev, int events, usb_proc_ptr p)
if (events & mask && usb_nevents > 0)
revents |= events & mask;
if (revents == 0 && events & mask)
- selrecord(p, &usb_selevent);
+ selrecord(l, &usb_selevent);
splx(s);
return (revents);
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index 3f32296af65..3b4e50f10ea 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.h,v 1.72 2005/05/02 15:32:18 augustss Exp $ */
+/* $NetBSD: usb.h,v 1.73 2005/12/11 12:24:01 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/usb_mem.c b/sys/dev/usb/usb_mem.c
index c3b16000fa4..c5795a98a3f 100644
--- a/sys/dev/usb/usb_mem.c
+++ b/sys/dev/usb/usb_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.28 2004/12/21 16:41:24 fvdl Exp $ */
+/* $NetBSD: usb_mem.c,v 1.29 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.28 2004/12/21 16:41:24 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.29 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index d562f2b09e9..7ccd18bc15e 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.h,v 1.22 2004/12/21 19:49:56 fvdl Exp $ */
+/* $NetBSD: usb_mem.h,v 1.23 2005/12/11 12:24:01 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.9 1999/11/17 22:33:47 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index ed591ee2bc1..e2d83410397 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,5 +1,5 @@
/* $OpenBSD: usb_port.h,v 1.18 2000/09/06 22:42:10 rahnds Exp $ */
-/* $NetBSD: usb_port.h,v 1.68 2005/07/30 06:14:50 skrll Exp $ */
+/* $NetBSD: usb_port.h,v 1.69 2005/12/11 12:24:01 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/usbcdc.h b/sys/dev/usb/usbcdc.h
index 0602821bddf..9727e5ab70e 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/dev/usb/usbcdc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usbcdc.h,v 1.9 2004/10/23 13:24:24 augustss Exp $ */
+/* $NetBSD: usbcdc.h,v 1.10 2005/12/11 12:24:01 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbcdc.h,v 1.7 1999/11/17 22:33:48 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index c89c5a2fc87..fd25dd4d846 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.108 2005/05/30 04:21:39 christos Exp $ */
+/* $NetBSD: usbdi.c,v 1.109 2005/12/11 12:24:01 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.108 2005/05/30 04:21:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.109 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index 94ddf054544..d5e3563afc0 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.c,v 1.44 2005/05/30 04:56:13 christos Exp $ */
+/* $NetBSD: usbdi_util.c,v 1.45 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.44 2005/05/30 04:56:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.45 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/usbdi_util.h b/sys/dev/usb/usbdi_util.h
index 789c3af9771..e2cc70ceef3 100644
--- a/sys/dev/usb/usbdi_util.h
+++ b/sys/dev/usb/usbdi_util.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.h,v 1.34 2005/05/30 04:21:39 christos Exp $ */
+/* $NetBSD: usbdi_util.h,v 1.35 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 93325455f52..563a7f912df 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.74 2005/04/30 14:38:40 augustss Exp $ */
+/* $NetBSD: usbdivar.h,v 1.75 2005/12/11 12:24:01 christos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */
/*
diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c
index ce3b4a64169..bd5556963d3 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/dev/usb/uscanner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.49 2005/06/21 14:01:12 ws Exp $ */
+/* $NetBSD: uscanner.c,v 1.50 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.49 2005/06/21 14:01:12 ws Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.50 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -394,7 +394,7 @@ USB_ATTACH(uscanner)
}
int
-uscanneropen(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uscanneropen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct uscanner_softc *sc;
int unit = USCANNERUNIT(dev);
@@ -457,7 +457,7 @@ uscanneropen(dev_t dev, int flag, int mode, usb_proc_ptr p)
}
int
-uscannerclose(dev_t dev, int flag, int mode, usb_proc_ptr p)
+uscannerclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct uscanner_softc *sc;
@@ -699,7 +699,7 @@ USB_DETACH(uscanner)
}
int
-uscannerpoll(dev_t dev, int events, usb_proc_ptr p)
+uscannerpoll(dev_t dev, int events, struct lwp *l)
{
struct uscanner_softc *sc;
int revents = 0;
@@ -766,7 +766,7 @@ uscannerkqfilter(dev_t dev, struct knote *kn)
}
int
-uscannerioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+uscannerioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
return (EINVAL);
}
diff --git a/sys/dev/usb/usscanner.c b/sys/dev/usb/usscanner.c
index f2cf565567c..b88e8b94433 100644
--- a/sys/dev/usb/usscanner.c
+++ b/sys/dev/usb/usscanner.c
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.17 2005/05/11 10:02:29 augustss Exp $ */
+/* $NetBSD: usscanner.c,v 1.18 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.17 2005/05/11 10:02:29 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.18 2005/12/11 12:24:01 christos Exp $");
#include "scsibus.h"
#include <sys/param.h>
diff --git a/sys/dev/usb/ustir.c b/sys/dev/usb/ustir.c
index 4d53f3af505..ba194bb89cb 100644
--- a/sys/dev/usb/ustir.c
+++ b/sys/dev/usb/ustir.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.14 2005/05/11 10:02:29 augustss Exp $ */
+/* $NetBSD: ustir.c,v 1.15 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.14 2005/05/11 10:02:29 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.15 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -209,18 +209,18 @@ struct ustir_softc {
#define USTIR_WR_TIMEOUT 200
Static int ustir_activate(device_ptr_t self, enum devact act);
-Static int ustir_open(void *h, int flag, int mode, usb_proc_ptr p);
-Static int ustir_close(void *h, int flag, int mode, usb_proc_ptr p);
+Static int ustir_open(void *h, int flag, int mode, struct lwp *l);
+Static int ustir_close(void *h, int flag, int mode, struct lwp *l);
Static int ustir_read(void *h, struct uio *uio, int flag);
Static int ustir_write(void *h, struct uio *uio, int flag);
Static int ustir_set_params(void *h, struct irda_params *params);
Static int ustir_get_speeds(void *h, int *speeds);
Static int ustir_get_turnarounds(void *h, int *times);
-Static int ustir_poll(void *h, int events, usb_proc_ptr p);
+Static int ustir_poll(void *h, int events, struct lwp *l);
Static int ustir_kqfilter(void *h, struct knote *kn);
#ifdef USTIR_DEBUG_IOCTLS
-Static int ustir_ioctl(void *h, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p);
+Static int ustir_ioctl(void *h, u_long cmd, caddr_t addr, int flag, struct lwp *l);
#endif
Static struct irframe_methods const ustir_methods = {
@@ -857,7 +857,7 @@ ustir_activate(device_ptr_t self, enum devact act)
/* ARGSUSED */
Static int
-ustir_open(void *h, int flag, int mode, usb_proc_ptr p)
+ustir_open(void *h, int flag, int mode, struct lwp *l)
{
struct ustir_softc *sc = h;
int error;
@@ -946,7 +946,7 @@ ustir_open(void *h, int flag, int mode, usb_proc_ptr p)
/* ARGSUSED */
Static int
-ustir_close(void *h, int flag, int mode, usb_proc_ptr p)
+ustir_close(void *h, int flag, int mode, struct lwp *l)
{
struct ustir_softc *sc = h;
@@ -1186,7 +1186,7 @@ ustir_write(void *h, struct uio *uio, int flag)
}
Static int
-ustir_poll(void *h, int events, usb_proc_ptr p)
+ustir_poll(void *h, int events, struct lwp *l)
{
struct ustir_softc *sc = h;
int revents = 0;
@@ -1199,7 +1199,7 @@ ustir_poll(void *h, int events, usb_proc_ptr p)
} else {
DPRINTFN(2,("%s: recording write select\n",
__func__));
- selrecord(p, &sc->sc_wr_sel);
+ selrecord(l, &sc->sc_wr_sel);
}
}
@@ -1210,7 +1210,7 @@ ustir_poll(void *h, int events, usb_proc_ptr p)
} else {
DPRINTFN(2,("%s: recording read select\n",
__func__));
- selrecord(p, &sc->sc_rd_sel);
+ selrecord(l, &sc->sc_rd_sel);
}
}
@@ -1294,7 +1294,7 @@ ustir_kqfilter(void *h, struct knote *kn)
}
#ifdef USTIR_DEBUG_IOCTLS
-Static int ustir_ioctl(void *h, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
+Static int ustir_ioctl(void *h, u_long cmd, caddr_t addr, int flag, struct lwp *l)
{
struct ustir_softc *sc = h;
int error;
diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c
index c3996743308..d9cf1c4f299 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/dev/usb/uvisor.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uvisor.c,v 1.30 2005/05/30 04:21:39 christos Exp $ */
+/* $NetBSD: uvisor.c,v 1.31 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.30 2005/05/30 04:21:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.31 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/uvscom.c b/sys/dev/usb/uvscom.c
index b0c751a1499..a9674ff009d 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/dev/usb/uvscom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uvscom.c,v 1.15 2005/05/11 10:02:29 augustss Exp $ */
+/* $NetBSD: uvscom.c,v 1.16 2005/12/11 12:24:01 christos Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.15 2005/05/11 10:02:29 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.16 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/uyap.c b/sys/dev/usb/uyap.c
index aa356f5e0b1..b83cb64bf77 100644
--- a/sys/dev/usb/uyap.c
+++ b/sys/dev/usb/uyap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uyap.c,v 1.8 2005/05/11 10:02:29 augustss Exp $ */
+/* $NetBSD: uyap.c,v 1.9 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.8 2005/05/11 10:02:29 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uyap.c,v 1.9 2005/12/11 12:24:01 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/usb/uyap_firmware.h b/sys/dev/usb/uyap_firmware.h
index e474546eefc..9eeb3a4b189 100644
--- a/sys/dev/usb/uyap_firmware.h
+++ b/sys/dev/usb/uyap_firmware.h
@@ -1,4 +1,4 @@
-/* $NetBSD: uyap_firmware.h,v 1.4 2005/05/30 04:21:39 christos Exp $ */
+/* $NetBSD: uyap_firmware.h,v 1.5 2005/12/11 12:24:01 christos Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
diff --git a/sys/dev/verified_exec.c b/sys/dev/verified_exec.c
index dfb7def2fb1..46d59e1df17 100644
--- a/sys/dev/verified_exec.c
+++ b/sys/dev/verified_exec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: verified_exec.c,v 1.28 2005/12/10 02:10:00 elad Exp $ */
+/* $NetBSD: verified_exec.c,v 1.29 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright 2005 Elad Efrat <elad@bsd.org.il>
@@ -31,9 +31,9 @@
#include <sys/cdefs.h>
#if defined(__NetBSD__)
-__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.28 2005/12/10 02:10:00 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: verified_exec.c,v 1.29 2005/12/11 12:20:53 christos Exp $");
#else
-__RCSID("$Id: verified_exec.c,v 1.28 2005/12/10 02:10:00 elad Exp $\n$NetBSD: verified_exec.c,v 1.28 2005/12/10 02:10:00 elad Exp $");
+__RCSID("$Id: verified_exec.c,v 1.29 2005/12/11 12:20:53 christos Exp $\n$NetBSD: verified_exec.c,v 1.29 2005/12/11 12:20:53 christos Exp $");
#endif
#include <sys/param.h>
@@ -103,10 +103,10 @@ const struct cdevsw veriexec_cdevsw = {
/* Autoconfiguration glue */
void veriexecattach(DEVPORT_DEVICE *parent, DEVPORT_DEVICE *self,
void *aux);
-int veriexecopen(dev_t dev, int flags, int fmt, struct proc *p);
-int veriexecclose(dev_t dev, int flags, int fmt, struct proc *p);
+int veriexecopen(dev_t dev, int flags, int fmt, struct lwp *l);
+int veriexecclose(dev_t dev, int flags, int fmt, struct lwp *l);
int veriexecioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
- struct proc *p);
+ struct lwp *l);
void
veriexecattach(DEVPORT_DEVICE *parent, DEVPORT_DEVICE *self,
@@ -121,15 +121,15 @@ veriexecattach(DEVPORT_DEVICE *parent, DEVPORT_DEVICE *self,
int
veriexecopen(dev_t dev __unused, int flags __unused,
- int fmt __unused, struct proc *p __unused)
+ int fmt __unused, struct lwp *l __unused)
{
if (veriexec_verbose >= 2) {
printf("Veriexec: veriexecopen: Veriexec load device "
"open attempt by uid=%u, pid=%u. (dev=%u)\n",
- p->p_ucred->cr_uid, p->p_pid, dev);
+ l->l_proc->p_ucred->cr_uid, l->l_proc->p_pid, dev);
}
- if (suser(p->p_ucred, &p->p_acflag) != 0)
+ if (suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0)
return (EPERM);
if (veriexec_dev_usage > 0) {
@@ -154,7 +154,7 @@ veriexecclose(dev_t dev __unused, int flags __unused,
int
veriexecioctl(dev_t dev __unused, u_long cmd, caddr_t data,
- int flags __unused, struct proc *p)
+ int flags __unused, struct lwp *l)
{
int error = 0;
diff --git a/sys/dev/vinum/Makefile b/sys/dev/vinum/Makefile
index 30b7397eb69..d78c366892a 100644
--- a/sys/dev/vinum/Makefile
+++ b/sys/dev/vinum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/10/10 03:07:27 grog Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/11 12:24:07 christos Exp $
INCSDIR= /usr/include/dev/vinum
diff --git a/sys/dev/vinum/files.vinum b/sys/dev/vinum/files.vinum
index d3ab1984369..3d4fb3041a0 100644
--- a/sys/dev/vinum/files.vinum
+++ b/sys/dev/vinum/files.vinum
@@ -1,5 +1,5 @@
-# $NetBSD: files.vinum,v 1.2 2005/02/27 00:27:51 perry Exp $
-# $Id: files.vinum,v 1.2 2005/02/27 00:27:51 perry Exp $
+# $NetBSD: files.vinum,v 1.3 2005/12/11 12:24:07 christos Exp $
+# $Id: files.vinum,v 1.3 2005/12/11 12:24:07 christos Exp $
#
# Configuration file for Vinum
diff --git a/sys/dev/vinum/makestatetext b/sys/dev/vinum/makestatetext
index 2b71a927726..314ac6565db 100644
--- a/sys/dev/vinum/makestatetext
+++ b/sys/dev/vinum/makestatetext
@@ -1,7 +1,7 @@
#!/bin/sh
# Make statetexts.h from vinumstate.h
# $FreeBSD$
-# $Id: makestatetext,v 1.2 2005/02/27 00:27:51 perry Exp $
+# $Id: makestatetext,v 1.3 2005/12/11 12:24:07 christos Exp $
infile=vinumstate.h
ofile=statetexts.h
echo >$ofile "/* Created by $0 on" `date`. "Do not edit */"
diff --git a/sys/dev/vinum/request.h b/sys/dev/vinum/request.h
index 20e69442321..74defa56e8a 100644
--- a/sys/dev/vinum/request.h
+++ b/sys/dev/vinum/request.h
@@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: request.h,v 1.1.1.1 2003/10/10 03:07:33 grog Exp $
+ * $Id: request.h,v 1.2 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c
index 30cecbf3336..353f256293e 100644
--- a/sys/dev/vinum/vinum.c
+++ b/sys/dev/vinum/vinum.c
@@ -35,7 +35,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinum.c,v 1.1.1.1 2003/10/10 03:07:37 grog Exp $
+ * $Id: vinum.c,v 1.2 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index 4238258e946..e5f48b9b0f0 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumconfig.c,v 1.3 2004/06/22 14:00:54 itojun Exp $
+ * $Id: vinumconfig.c,v 1.4 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumdaemon.c b/sys/dev/vinum/vinumdaemon.c
index 132e4bd48a4..30d5339fb22 100644
--- a/sys/dev/vinum/vinumdaemon.c
+++ b/sys/dev/vinum/vinumdaemon.c
@@ -34,7 +34,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumdaemon.c,v 1.3 2004/09/19 12:22:22 yamt Exp $
+ * $Id: vinumdaemon.c,v 1.4 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h
index d84f0a594d8..bc093496e8b 100644
--- a/sys/dev/vinum/vinumext.h
+++ b/sys/dev/vinum/vinumext.h
@@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumext.h,v 1.4 2005/06/26 22:32:30 christos Exp $
+ * $Id: vinumext.h,v 1.5 2005/12/11 12:24:07 christos Exp $
*/
/* vinumext.h: external definitions */
diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h
index cd9a5761fdd..8d059c9997b 100644
--- a/sys/dev/vinum/vinumhdr.h
+++ b/sys/dev/vinum/vinumhdr.h
@@ -36,7 +36,7 @@
/* Header files used by all modules */
/*
- * $Id: vinumhdr.h,v 1.2 2005/02/27 00:27:51 perry Exp $
+ * $Id: vinumhdr.h,v 1.3 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c
index efb334dfa98..fdab969497f 100644
--- a/sys/dev/vinum/vinuminterrupt.c
+++ b/sys/dev/vinum/vinuminterrupt.c
@@ -39,7 +39,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinuminterrupt.c,v 1.4 2004/11/08 21:30:05 explorer Exp $
+ * $Id: vinuminterrupt.c,v 1.5 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index c6120ae920f..796274da62c 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumio.c,v 1.1.1.1 2003/10/10 03:08:25 grog Exp $
+ * $Id: vinumio.c,v 1.2 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumio.h b/sys/dev/vinum/vinumio.h
index d3b21739214..c95220fd371 100644
--- a/sys/dev/vinum/vinumio.h
+++ b/sys/dev/vinum/vinumio.h
@@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumio.h,v 1.1.1.1 2003/10/10 03:08:28 grog Exp $
+ * $Id: vinumio.h,v 1.2 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c
index 04ddb7e8190..1fd679f32c8 100644
--- a/sys/dev/vinum/vinumioctl.c
+++ b/sys/dev/vinum/vinumioctl.c
@@ -41,7 +41,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumioctl.c,v 1.3 2004/09/18 07:38:26 jdolecek Exp $
+ * $Id: vinumioctl.c,v 1.4 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumkw.h b/sys/dev/vinum/vinumkw.h
index a23128b4ca2..3786bf59061 100644
--- a/sys/dev/vinum/vinumkw.h
+++ b/sys/dev/vinum/vinumkw.h
@@ -29,7 +29,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumkw.h,v 1.2 2005/06/26 22:32:47 christos Exp $
+ * $Id: vinumkw.h,v 1.3 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumlock.c b/sys/dev/vinum/vinumlock.c
index 658ba634f3a..042f65b980b 100644
--- a/sys/dev/vinum/vinumlock.c
+++ b/sys/dev/vinum/vinumlock.c
@@ -37,7 +37,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumlock.c,v 1.1.1.1 2003/10/10 03:08:41 grog Exp $
+ * $Id: vinumlock.c,v 1.2 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c
index 5d9df3d00d3..154bc016ab1 100644
--- a/sys/dev/vinum/vinummemory.c
+++ b/sys/dev/vinum/vinummemory.c
@@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinummemory.c,v 1.2 2005/05/22 15:54:47 christos Exp $
+ * $Id: vinummemory.c,v 1.3 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumobj.h b/sys/dev/vinum/vinumobj.h
index 942b27e35ba..992f1613497 100644
--- a/sys/dev/vinum/vinumobj.h
+++ b/sys/dev/vinum/vinumobj.h
@@ -37,7 +37,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumobj.h,v 1.1.1.1 2003/10/10 03:08:48 grog Exp $
+ * $Id: vinumobj.h,v 1.2 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c
index 804f70f4d97..483a0cf021e 100644
--- a/sys/dev/vinum/vinumparser.c
+++ b/sys/dev/vinum/vinumparser.c
@@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumparser.c,v 1.2 2005/06/26 22:33:31 christos Exp $
+ * $Id: vinumparser.c,v 1.3 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumqsort.c b/sys/dev/vinum/vinumqsort.c
index c248efeffe9..505a3556f7a 100644
--- a/sys/dev/vinum/vinumqsort.c
+++ b/sys/dev/vinum/vinumqsort.c
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* $FreeBSD: src/sys/libkern/qsort.c,v 1.12 2002/11/09 12:55:06 alfred Exp $
- * $NetBSD: vinumqsort.c,v 1.1.1.1 2003/10/10 03:08:52 grog Exp $
+ * $NetBSD: vinumqsort.c,v 1.2 2005/12/11 12:24:07 christos Exp $
*/
#include <sys/cdefs.h>
diff --git a/sys/dev/vinum/vinumraid5.c b/sys/dev/vinum/vinumraid5.c
index 28f829f58f5..c7f85972bc1 100644
--- a/sys/dev/vinum/vinumraid5.c
+++ b/sys/dev/vinum/vinumraid5.c
@@ -38,7 +38,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumraid5.c,v 1.1.1.1 2003/10/10 03:09:06 grog Exp $
+ * $Id: vinumraid5.c,v 1.2 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
#include <dev/vinum/vinumhdr.h>
diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c
index 8a09f9b43e0..ed51e14fb35 100644
--- a/sys/dev/vinum/vinumrequest.c
+++ b/sys/dev/vinum/vinumrequest.c
@@ -37,7 +37,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumrequest.c,v 1.2 2004/11/08 21:30:05 explorer Exp $
+ * $Id: vinumrequest.c,v 1.3 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c
index 0392b4c2521..05d27932810 100644
--- a/sys/dev/vinum/vinumrevive.c
+++ b/sys/dev/vinum/vinumrevive.c
@@ -37,7 +37,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumrevive.c,v 1.3 2004/11/08 21:30:05 explorer Exp $
+ * $Id: vinumrevive.c,v 1.4 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c
index 480227d8f10..bacae39324a 100644
--- a/sys/dev/vinum/vinumstate.c
+++ b/sys/dev/vinum/vinumstate.c
@@ -37,7 +37,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumstate.c,v 1.1.1.1 2003/10/10 03:09:32 grog Exp $
+ * $Id: vinumstate.c,v 1.2 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumstate.h b/sys/dev/vinum/vinumstate.h
index 0c7afcedf9a..9a52d788abe 100644
--- a/sys/dev/vinum/vinumstate.h
+++ b/sys/dev/vinum/vinumstate.h
@@ -33,7 +33,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumstate.h,v 1.1.1.1 2003/10/10 03:09:35 grog Exp $
+ * $Id: vinumstate.h,v 1.2 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumutil.c b/sys/dev/vinum/vinumutil.c
index 64aa2182241..2c734e34fb5 100644
--- a/sys/dev/vinum/vinumutil.c
+++ b/sys/dev/vinum/vinumutil.c
@@ -35,7 +35,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumutil.c,v 1.3 2005/07/05 22:20:47 he Exp $
+ * $Id: vinumutil.c,v 1.4 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumutil.h b/sys/dev/vinum/vinumutil.h
index 9dbff285016..10c25977822 100644
--- a/sys/dev/vinum/vinumutil.h
+++ b/sys/dev/vinum/vinumutil.h
@@ -35,7 +35,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumutil.h,v 1.3 2005/07/05 22:20:47 he Exp $
+ * $Id: vinumutil.h,v 1.4 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h
index 38504f225c8..ba3aa3e5cae 100644
--- a/sys/dev/vinum/vinumvar.h
+++ b/sys/dev/vinum/vinumvar.h
@@ -37,7 +37,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumvar.h,v 1.2 2004/09/05 15:10:25 jdolecek Exp $
+ * $Id: vinumvar.h,v 1.3 2005/12/11 12:24:07 christos Exp $
* $FreeBSD$
*/
diff --git a/sys/dev/vme/if_ie_vme.c b/sys/dev/vme/if_ie_vme.c
index 91189f60620..9d9cf8730fe 100644
--- a/sys/dev/vme/if_ie_vme.c
+++ b/sys/dev/vme/if_ie_vme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie_vme.c,v 1.21 2005/06/03 22:00:34 tsutsui Exp $ */
+/* $NetBSD: if_ie_vme.c,v 1.22 2005/12/11 12:24:07 christos Exp $ */
/*-
* Copyright (c) 1995 Charles D. Cranor
@@ -145,7 +145,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.21 2005/06/03 22:00:34 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_vme.c,v 1.22 2005/12/11 12:24:07 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/vme/sc_vme.c b/sys/dev/vme/sc_vme.c
index c1db03ffa6e..61c6bfcfcd5 100644
--- a/sys/dev/vme/sc_vme.c
+++ b/sys/dev/vme/sc_vme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sc_vme.c,v 1.11 2005/02/27 00:27:51 perry Exp $ */
+/* $NetBSD: sc_vme.c,v 1.12 2005/12/11 12:24:07 christos Exp $ */
/*-
* Copyright (c) 1996,2000,2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sc_vme.c,v 1.11 2005/02/27 00:27:51 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sc_vme.c,v 1.12 2005/12/11 12:24:07 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/vme/si.c b/sys/dev/vme/si.c
index 85d4953d534..a5705869099 100644
--- a/sys/dev/vme/si.c
+++ b/sys/dev/vme/si.c
@@ -1,4 +1,4 @@
-/* $NetBSD: si.c,v 1.15 2005/02/27 00:27:51 perry Exp $ */
+/* $NetBSD: si.c,v 1.16 2005/12/11 12:24:07 christos Exp $ */
/*-
* Copyright (c) 1996,2000 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.15 2005/02/27 00:27:51 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: si.c,v 1.16 2005/12/11 12:24:07 christos Exp $");
#include "opt_ddb.h"
diff --git a/sys/dev/vme/vme.c b/sys/dev/vme/vme.c
index 62db54fc5e9..5432534a029 100644
--- a/sys/dev/vme/vme.c
+++ b/sys/dev/vme/vme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme.c,v 1.16 2005/08/26 12:42:11 drochner Exp $ */
+/* $NetBSD: vme.c,v 1.17 2005/12/11 12:24:07 christos Exp $ */
/*
* Copyright (c) 1999
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.16 2005/08/26 12:42:11 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.17 2005/12/11 12:24:07 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/vme/vmereg.h b/sys/dev/vme/vmereg.h
index 6e22df70baf..2ce9c3cbfe9 100644
--- a/sys/dev/vme/vmereg.h
+++ b/sys/dev/vme/vmereg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vmereg.h,v 1.2 2003/10/28 18:21:49 matt Exp $ */
+/* $NetBSD: vmereg.h,v 1.3 2005/12/11 12:24:07 christos Exp $ */
/* constants for address modifiers */
diff --git a/sys/dev/vme/vmevar.h b/sys/dev/vme/vmevar.h
index d5446d761a3..80af616ff26 100644
--- a/sys/dev/vme/vmevar.h
+++ b/sys/dev/vme/vmevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vmevar.h,v 1.11 2005/02/27 00:27:51 perry Exp $ */
+/* $NetBSD: vmevar.h,v 1.12 2005/12/11 12:24:07 christos Exp $ */
/*
* Copyright (c) 1999
diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c
index 58689c2922f..fe04eaaa385 100644
--- a/sys/dev/vme/xd.c
+++ b/sys/dev/vme/xd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xd.c,v 1.58 2005/10/15 17:29:26 yamt Exp $ */
+/* $NetBSD: xd.c,v 1.59 2005/12/11 12:24:07 christos Exp $ */
/*
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.58 2005/10/15 17:29:26 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xd.c,v 1.59 2005/12/11 12:24:07 christos Exp $");
#undef XDC_DEBUG /* full debug */
#define XDC_DIAG /* extra sanity checks */
@@ -940,10 +940,10 @@ done:
* xdclose: close device
*/
int
-xdclose(dev, flag, fmt, p)
+xdclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct xd_softc *xd = xd_cd.cd_devs[DISKUNIT(dev)];
int part = DISKPART(dev);
@@ -1006,12 +1006,12 @@ xddump(dev, blkno, va, size)
* xdioctl: ioctls on XD drives. based on ioctl's of other netbsd disks.
*/
int
-xdioctl(dev, command, addr, flag, p)
+xdioctl(dev, command, addr, flag, l)
dev_t dev;
u_long command;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct xd_softc *xd;
@@ -1120,7 +1120,7 @@ xdioctl(dev, command, addr, flag, p)
case DIOSXDCMD:
xio = (struct xd_iocmd *) addr;
- if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+ if ((error = suser(l->l_proc->p_ucred, &l->l_proc->p_acflag)) != 0)
return (error);
return (xdc_ioctlcmd(xd, dev, xio));
@@ -1133,10 +1133,10 @@ xdioctl(dev, command, addr, flag, p)
*/
int
-xdopen(dev, flag, fmt, p)
+xdopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
int unit, part;
struct xd_softc *xd;
diff --git a/sys/dev/vme/xdreg.h b/sys/dev/vme/xdreg.h
index 648c4b83366..ef762786f32 100644
--- a/sys/dev/vme/xdreg.h
+++ b/sys/dev/vme/xdreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: xdreg.h,v 1.4 2004/04/19 12:44:10 wiz Exp $ */
+/* $NetBSD: xdreg.h,v 1.5 2005/12/11 12:24:07 christos Exp $ */
/*
*
diff --git a/sys/dev/vme/xdvar.h b/sys/dev/vme/xdvar.h
index dda4c88f6a4..86ef4d3b442 100644
--- a/sys/dev/vme/xdvar.h
+++ b/sys/dev/vme/xdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: xdvar.h,v 1.9 2005/10/15 17:29:26 yamt Exp $ */
+/* $NetBSD: xdvar.h,v 1.10 2005/12/11 12:24:07 christos Exp $ */
/*
*
diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c
index 5b21c4fa059..43501123586 100644
--- a/sys/dev/vme/xy.c
+++ b/sys/dev/vme/xy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xy.c,v 1.60 2005/10/15 17:29:26 yamt Exp $ */
+/* $NetBSD: xy.c,v 1.61 2005/12/11 12:24:07 christos Exp $ */
/*
*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.60 2005/10/15 17:29:26 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xy.c,v 1.61 2005/12/11 12:24:07 christos Exp $");
#undef XYC_DEBUG /* full debug */
#undef XYC_DIAG /* extra sanity checks */
@@ -851,10 +851,10 @@ done:
* xyclose: close device
*/
int
-xyclose(dev, flag, fmt, p)
+xyclose(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
struct xy_softc *xy = xy_cd.cd_devs[DISKUNIT(dev)];
@@ -918,12 +918,12 @@ xydump(dev, blkno, va, size)
* xyioctl: ioctls on XY drives. based on ioctl's of other netbsd disks.
*/
int
-xyioctl(dev, command, addr, flag, p)
+xyioctl(dev, command, addr, flag, l)
dev_t dev;
u_long command;
caddr_t addr;
int flag;
- struct proc *p;
+ struct lwp *l;
{
struct xy_softc *xy;
@@ -1031,7 +1031,7 @@ xyioctl(dev, command, addr, flag, p)
case DIOSXDCMD:
xio = (struct xd_iocmd *) addr;
- if ((error = suser(p->p_ucred, &p->p_acflag)) != 0)
+ if ((error = suser(l->l_proc->p_ucred, &l->l_proc->p_acflag)) != 0)
return (error);
return (xyc_ioctlcmd(xy, dev, xio));
@@ -1045,10 +1045,10 @@ xyioctl(dev, command, addr, flag, p)
*/
int
-xyopen(dev, flag, fmt, p)
+xyopen(dev, flag, fmt, l)
dev_t dev;
int flag, fmt;
- struct proc *p;
+ struct lwp *l;
{
int unit, part;
struct xy_softc *xy;
diff --git a/sys/dev/vme/xyreg.h b/sys/dev/vme/xyreg.h
index 0a1134f23bb..40ba73c34ff 100644
--- a/sys/dev/vme/xyreg.h
+++ b/sys/dev/vme/xyreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: xyreg.h,v 1.4 2004/04/19 12:44:10 wiz Exp $ */
+/* $NetBSD: xyreg.h,v 1.5 2005/12/11 12:24:07 christos Exp $ */
/*
*
diff --git a/sys/dev/vme/xyvar.h b/sys/dev/vme/xyvar.h
index 7fc814bdcaf..0720e4d26dc 100644
--- a/sys/dev/vme/xyvar.h
+++ b/sys/dev/vme/xyvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: xyvar.h,v 1.10 2005/10/15 17:29:26 yamt Exp $ */
+/* $NetBSD: xyvar.h,v 1.11 2005/12/11 12:24:07 christos Exp $ */
/*
*
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index f66b96c32be..0c73a475399 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vnd.c,v 1.123 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: vnd.c,v 1.124 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.123 2005/10/15 17:29:12 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.124 2005/12/11 12:20:53 christos Exp $");
#if defined(_KERNEL_OPT)
#include "fs_nfs.h"
@@ -301,7 +301,7 @@ vnddetach(void)
}
static int
-vndopen(dev_t dev, int flags, int mode, struct proc *p)
+vndopen(dev_t dev, int flags, int mode, struct lwp *l)
{
int unit = vndunit(dev);
struct vnd_softc *sc;
@@ -310,7 +310,7 @@ vndopen(dev_t dev, int flags, int mode, struct proc *p)
#ifdef DEBUG
if (vnddebug & VDB_FOLLOW)
- printf("vndopen(0x%x, 0x%x, 0x%x, %p)\n", dev, flags, mode, p);
+ printf("vndopen(0x%x, 0x%x, 0x%x, %p)\n", dev, flags, mode, l);
#endif
if (unit >= numvnd)
return (ENXIO);
@@ -363,7 +363,7 @@ vndopen(dev_t dev, int flags, int mode, struct proc *p)
}
static int
-vndclose(dev_t dev, int flags, int mode, struct proc *p)
+vndclose(dev_t dev, int flags, int mode, struct lwp *l)
{
int unit = vndunit(dev);
struct vnd_softc *sc;
@@ -371,7 +371,7 @@ vndclose(dev_t dev, int flags, int mode, struct proc *p)
#ifdef DEBUG
if (vnddebug & VDB_FOLLOW)
- printf("vndclose(0x%x, 0x%x, 0x%x, %p)\n", dev, flags, mode, p);
+ printf("vndclose(0x%x, 0x%x, 0x%x, %p)\n", dev, flags, mode, l);
#endif
if (unit >= numvnd)
@@ -803,7 +803,7 @@ vndwrite(dev_t dev, struct uio *uio, int flags)
}
static int
-vnd_cget(struct proc *p, int unit, int *un, struct vattr *va)
+vnd_cget(struct lwp *l, int unit, int *un, struct vattr *va)
{
struct vnd_softc *vnd;
@@ -819,12 +819,12 @@ vnd_cget(struct proc *p, int unit, int *un, struct vattr *va)
if ((vnd->sc_flags & VNF_INITED) == 0)
return -1;
- return VOP_GETATTR(vnd->sc_vp, va, p->p_ucred, p);
+ return VOP_GETATTR(vnd->sc_vp, va, l->l_proc->p_ucred, l);
}
/* ARGSUSED */
static int
-vndioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+vndioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int unit = vndunit(dev);
struct vnd_softc *vnd;
@@ -833,6 +833,7 @@ vndioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
struct nameidata nd;
int error, part, pmask;
size_t geomsize;
+ struct proc *p = l->l_proc;
int fflags;
#ifdef __HAVE_OLD_DISKLABEL
struct disklabel newlabel;
@@ -896,10 +897,10 @@ vndioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
fflags = FREAD;
if ((vio->vnd_flags & VNDIOF_READONLY) == 0)
fflags |= FWRITE;
- NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, vio->vnd_file, p);
+ NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, vio->vnd_file, l);
if ((error = vn_open(&nd, fflags, 0)) != 0)
goto unlock_and_exit;
- error = VOP_GETATTR(nd.ni_vp, &vattr, p->p_ucred, p);
+ error = VOP_GETATTR(nd.ni_vp, &vattr, l->l_proc->p_ucred, l);
if (!error && nd.ni_vp->v_type != VREG)
error = EOPNOTSUPP;
if (error) {
@@ -1125,7 +1126,7 @@ vndioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
break;
close_and_exit:
- (void) vn_close(nd.ni_vp, fflags, p->p_ucred, p);
+ (void) vn_close(nd.ni_vp, fflags, p->p_ucred, l);
unlock_and_exit:
#ifdef VND_COMPRESSION
/* free any allocated memory (for compressed file) */
@@ -1189,7 +1190,7 @@ unlock_and_exit:
struct vnd_ouser *vnu;
struct vattr va;
vnu = (struct vnd_ouser *)data;
- switch (error = vnd_cget(p, unit, &vnu->vnu_unit, &va)) {
+ switch (error = vnd_cget(l, unit, &vnu->vnu_unit, &va)) {
case 0:
vnu->vnu_dev = va.va_fsid;
vnu->vnu_ino = va.va_fileid;
@@ -1209,7 +1210,7 @@ unlock_and_exit:
struct vnd_user *vnu;
struct vattr va;
vnu = (struct vnd_user *)data;
- switch (error = vnd_cget(p, unit, &vnu->vnu_unit, &va)) {
+ switch (error = vnd_cget(l, unit, &vnu->vnu_unit, &va)) {
case 0:
vnu->vnu_dev = va.va_fsid;
vnu->vnu_ino = va.va_fileid;
@@ -1360,7 +1361,7 @@ vndsetcred(struct vnd_softc *vnd, struct ucred *cred)
* buffers back to stable storage.
*/
error = vinvalbuf(vnd->sc_vp, V_SAVE, vnd->sc_cred,
- curproc, 0, 0);
+ curlwp, 0, 0);
}
VOP_UNLOCK(vnd->sc_vp, 0);
@@ -1403,7 +1404,7 @@ static void
vndclear(struct vnd_softc *vnd, int myminor)
{
struct vnode *vp = vnd->sc_vp;
- struct proc *p = curproc; /* XXX */
+ struct lwp *l = curlwp;
int fflags = FREAD;
int bmaj, cmaj, i, mn;
int s;
@@ -1458,7 +1459,7 @@ vndclear(struct vnd_softc *vnd, int myminor)
| VNF_VUNCONF | VNF_COMP);
if (vp == (struct vnode *)0)
panic("vndclear: null vp");
- (void) vn_close(vp, fflags, vnd->sc_cred, p);
+ (void) vn_close(vp, fflags, vnd->sc_cred, l);
crfree(vnd->sc_cred);
vnd->sc_vp = (struct vnode *)0;
vnd->sc_cred = (struct ucred *)0;
@@ -1485,7 +1486,7 @@ vndsize(dev_t dev)
omask = sc->sc_dkdev.dk_openmask & (1 << part);
lp = sc->sc_dkdev.dk_label;
- if (omask == 0 && vndopen(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && vndopen(dev, 0, S_IFBLK, curlwp)) /* XXX */
return (-1);
if (lp->d_partitions[part].p_fstype != FS_SWAP)
@@ -1494,7 +1495,7 @@ vndsize(dev_t dev)
size = lp->d_partitions[part].p_size *
(lp->d_secsize / DEV_BSIZE);
- if (omask == 0 && vndclose(dev, 0, S_IFBLK, curproc))
+ if (omask == 0 && vndclose(dev, 0, S_IFBLK, curlwp)) /* XXX */
return (-1);
return (size);
@@ -1647,7 +1648,7 @@ compstrategy(struct buf *bp, off_t bn)
/* set up constants for data move */
auio.uio_rw = UIO_READ;
auio.uio_segflg = bp->b_flags & B_PHYS ? UIO_USERSPACE : UIO_SYSSPACE;
- auio.uio_procp = bp->b_proc;
+ auio.uio_lwp = LIST_FIRST(&bp->b_proc->p_lwps);
/* read, and transfer the data */
addr = bp->b_data;
diff --git a/sys/dev/vndvar.h b/sys/dev/vndvar.h
index a12d66e5e52..45989677ca3 100644
--- a/sys/dev/vndvar.h
+++ b/sys/dev/vndvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vndvar.h,v 1.17 2005/10/15 17:29:12 yamt Exp $ */
+/* $NetBSD: vndvar.h,v 1.18 2005/12/11 12:20:53 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
diff --git a/sys/dev/wscons/files.wscons b/sys/dev/wscons/files.wscons
index 601b70d0207..11820e39e02 100644
--- a/sys/dev/wscons/files.wscons
+++ b/sys/dev/wscons/files.wscons
@@ -1,4 +1,4 @@
-# $NetBSD: files.wscons,v 1.34 2005/05/04 01:52:16 augustss Exp $
+# $NetBSD: files.wscons,v 1.35 2005/12/11 12:24:12 christos Exp $
#
# "Workstation Console" glue; attaches frame buffer to emulator & keyboard,
diff --git a/sys/dev/wscons/mra.c b/sys/dev/wscons/mra.c
index f93c6f93087..4ccc955809f 100644
--- a/sys/dev/wscons/mra.c
+++ b/sys/dev/wscons/mra.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mra.c,v 1.2 2005/06/01 00:02:17 uwe Exp $ */
+/* $NetBSD: mra.c,v 1.3 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1999 Shin Takemura All rights reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mra.c,v 1.2 2005/06/01 00:02:17 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mra.c,v 1.3 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/wscons/tpcalib.c b/sys/dev/wscons/tpcalib.c
index 4fe0d6fea07..a383bc230a3 100644
--- a/sys/dev/wscons/tpcalib.c
+++ b/sys/dev/wscons/tpcalib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tpcalib.c,v 1.5 2005/06/01 00:02:17 uwe Exp $ */
+/* $NetBSD: tpcalib.c,v 1.6 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1999-2003 TAKEMURA Shin All rights reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpcalib.c,v 1.5 2005/06/01 00:02:17 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpcalib.c,v 1.6 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -87,7 +87,7 @@ tpcalib_trans(struct tpcalib_softc *sc, int rawx, int rawy, int *x, int *y)
int
tpcalib_ioctl(struct tpcalib_softc *sc, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
const struct wsmouse_calibcoords *d;
int s;
diff --git a/sys/dev/wscons/tpcalibvar.h b/sys/dev/wscons/tpcalibvar.h
index b997dc11a9c..9192c1f3801 100644
--- a/sys/dev/wscons/tpcalibvar.h
+++ b/sys/dev/wscons/tpcalibvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tpcalibvar.h,v 1.1 2004/05/28 17:52:07 tsarna Exp $ */
+/* $NetBSD: tpcalibvar.h,v 1.2 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1999 Shin Takemura All rights reserved.
@@ -40,4 +40,4 @@ int tpcalib_init(struct tpcalib_softc *);
void tpcalib_reset(struct tpcalib_softc *);
void tpcalib_trans(struct tpcalib_softc*, int, int, int*, int*);
int tpcalib_ioctl(struct tpcalib_softc *, u_long, caddr_t, int,
- struct proc *);
+ struct lwp *);
diff --git a/sys/dev/wscons/wscons_raster.h b/sys/dev/wscons/wscons_raster.h
index 5951f861824..d5ccdbc6749 100644
--- a/sys/dev/wscons/wscons_raster.h
+++ b/sys/dev/wscons/wscons_raster.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wscons_raster.h,v 1.8 2003/08/07 16:31:28 agc Exp $ */
+/* $NetBSD: wscons_raster.h,v 1.9 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/wscons/wscons_rfont.h b/sys/dev/wscons/wscons_rfont.h
index 98dcfec34e4..ad133050c5a 100644
--- a/sys/dev/wscons/wscons_rfont.h
+++ b/sys/dev/wscons/wscons_rfont.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wscons_rfont.h,v 1.2 2003/08/07 16:31:28 agc Exp $ */
+/* $NetBSD: wscons_rfont.h,v 1.3 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/wscons/wscons_rinit.c b/sys/dev/wscons/wscons_rinit.c
index ebd7ed0eea3..06f806d38e4 100644
--- a/sys/dev/wscons/wscons_rinit.c
+++ b/sys/dev/wscons/wscons_rinit.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wscons_rinit.c,v 1.5 2003/08/07 16:31:29 agc Exp $ */
+/* $NetBSD: wscons_rinit.c,v 1.6 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wscons_rinit.c,v 1.5 2003/08/07 16:31:29 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wscons_rinit.c,v 1.6 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/wscons/wscons_rops.c b/sys/dev/wscons/wscons_rops.c
index 7a032d34fb6..31c3bca78e9 100644
--- a/sys/dev/wscons/wscons_rops.c
+++ b/sys/dev/wscons/wscons_rops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wscons_rops.c,v 1.10 2003/08/07 16:31:29 agc Exp $ */
+/* $NetBSD: wscons_rops.c,v 1.11 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wscons_rops.c,v 1.10 2003/08/07 16:31:29 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wscons_rops.c,v 1.11 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index cfddf6b0a9a..ed98c0fac3e 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.86 2005/11/11 07:07:42 simonb Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.87 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.86 2005/11/11 07:07:42 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.87 2005/12/11 12:24:12 christos Exp $");
#include "opt_wsdisplay_border.h"
#include "opt_wsdisplay_compat.h"
@@ -714,7 +714,7 @@ wsdisplay_cnattach(const struct wsscreen_descr *type, void *cookie,
* Tty and cdevsw functions.
*/
int
-wsdisplayopen(dev_t dev, int flag, int mode, struct proc *p)
+wsdisplayopen(dev_t dev, int flag, int mode, struct lwp *l)
{
struct wsdisplay_softc *sc;
struct tty *tp;
@@ -727,7 +727,7 @@ wsdisplayopen(dev_t dev, int flag, int mode, struct proc *p)
if (ISWSDISPLAYSTAT(dev)) {
wsevent_init(&sc->evar);
- sc->evar.io = p;
+ sc->evar.io = l->l_proc;
return (0);
}
@@ -755,7 +755,7 @@ wsdisplayopen(dev_t dev, int flag, int mode, struct proc *p)
wsdisplayparam(tp, &tp->t_termios);
ttsetwater(tp);
} else if ((tp->t_state & TS_XCLUDE) != 0 &&
- suser(p->p_ucred, &p->p_acflag) != 0)
+ suser(l->l_proc->p_ucred, &l->l_proc->p_acflag) != 0)
return EBUSY;
tp->t_state |= TS_CARR_ON;
@@ -778,7 +778,7 @@ wsdisplayopen(dev_t dev, int flag, int mode, struct proc *p)
}
int
-wsdisplayclose(dev_t dev, int flag, int mode, struct proc *p)
+wsdisplayclose(dev_t dev, int flag, int mode, struct lwp *l)
{
struct wsdisplay_softc *sc;
struct tty *tp;
@@ -828,7 +828,7 @@ wsdisplayclose(dev_t dev, int flag, int mode, struct proc *p)
if (scr->scr_rawkbd) {
int kbmode = WSKBD_TRANSLATED;
(void)wsdisplay_internal_ioctl(sc, scr, WSKBDIO_SETMODE,
- (caddr_t)&kbmode, 0, p);
+ (caddr_t)&kbmode, 0, l);
}
#endif
@@ -892,7 +892,7 @@ wsdisplaywrite(dev_t dev, struct uio *uio, int flag)
}
int
-wsdisplaypoll(dev_t dev, int events, struct proc *p)
+wsdisplaypoll(dev_t dev, int events, struct lwp *l)
{
struct wsdisplay_softc *sc;
struct tty *tp;
@@ -901,7 +901,7 @@ wsdisplaypoll(dev_t dev, int events, struct proc *p)
sc = device_lookup(&wsdisplay_cd, WSDISPLAYUNIT(dev));
if (ISWSDISPLAYSTAT(dev))
- return (wsevent_poll(&sc->evar, events, p));
+ return (wsevent_poll(&sc->evar, events, l));
if (ISWSDISPLAYCTL(dev))
return (0);
@@ -913,7 +913,7 @@ wsdisplaypoll(dev_t dev, int events, struct proc *p)
return (POLLERR);
tp = scr->scr_tty;
- return ((*tp->t_linesw->l_poll)(tp, events, p));
+ return ((*tp->t_linesw->l_poll)(tp, events, l));
}
int
@@ -959,7 +959,7 @@ wsdisplaytty(dev_t dev)
}
int
-wsdisplayioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+wsdisplayioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
struct wsdisplay_softc *sc;
struct tty *tp;
@@ -969,16 +969,16 @@ wsdisplayioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
sc = device_lookup(&wsdisplay_cd, WSDISPLAYUNIT(dev));
#ifdef WSDISPLAY_COMPAT_USL
- error = wsdisplay_usl_ioctl1(sc, cmd, data, flag, p);
+ error = wsdisplay_usl_ioctl1(sc, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
#endif
if (ISWSDISPLAYSTAT(dev))
- return (wsdisplay_stat_ioctl(sc, cmd, data, flag, p));
+ return (wsdisplay_stat_ioctl(sc, cmd, data, flag, l));
if (ISWSDISPLAYCTL(dev))
- return (wsdisplay_cfg_ioctl(sc, cmd, data, flag, p));
+ return (wsdisplay_cfg_ioctl(sc, cmd, data, flag, l));
if ((scr = sc->sc_scr[WSDISPLAYSCREEN(dev)]) == NULL)
return (ENXIO);
@@ -988,24 +988,24 @@ wsdisplayioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
/* printf("disc\n"); */
/* do the line discipline ioctls first */
- error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, p);
+ error = (*tp->t_linesw->l_ioctl)(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
/* printf("tty\n"); */
/* then the tty ioctls */
- error = ttioctl(tp, cmd, data, flag, p);
+ error = ttioctl(tp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
}
#ifdef WSDISPLAY_COMPAT_USL
- error = wsdisplay_usl_ioctl2(sc, scr, cmd, data, flag, p);
+ error = wsdisplay_usl_ioctl2(sc, scr, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
#endif
- return (wsdisplay_internal_ioctl(sc, scr, cmd, data, flag, p));
+ return (wsdisplay_internal_ioctl(sc, scr, cmd, data, flag, l));
}
int
@@ -1018,7 +1018,7 @@ wsdisplay_param(struct device *dev, u_long cmd, struct wsdisplay_param *dp)
int
wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *scr,
- u_long cmd, caddr_t data, int flag, struct proc *p)
+ u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int error;
char namebuf[16];
@@ -1044,7 +1044,7 @@ wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *scr,
inp = sc->sc_input;
if (inp == NULL)
return (ENXIO);
- error = wsevsrc_display_ioctl(inp, cmd, data, flag, p);
+ error = wsevsrc_display_ioctl(inp, cmd, data, flag, l);
if (error != EPASSTHROUGH)
return (error);
#endif /* NWSKBD > 0 */
@@ -1077,7 +1077,7 @@ wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *scr,
return (EINVAL);
(void)(*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd, data,
- flag, p);
+ flag, l);
return (0);
#undef d
@@ -1202,12 +1202,12 @@ wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *scr,
/* check ioctls for display */
return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd, data,
- flag, p));
+ flag, l));
}
int
wsdisplay_stat_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p)
+ int flag, struct lwp *l)
{
switch (cmd) {
case WSDISPLAYIO_GETACTIVESCREEN:
@@ -1220,7 +1220,7 @@ wsdisplay_stat_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
int
wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p)
+ int flag, struct lwp *l)
{
int error;
char *type, typebuf[16], *emul, emulbuf[16];
@@ -1305,12 +1305,12 @@ wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
wsmuxdata.type = WSMUX_KBD;
wsmuxdata.idx = d->idx;
return (wsevsrc_ioctl(inp, WSMUX_ADD_DEVICE,
- &wsmuxdata, flag, p));
+ &wsmuxdata, flag, l));
case _O_WSDISPLAY_KBD_DEL:
wsmuxdata.type = WSMUX_KBD;
wsmuxdata.idx = d->idx;
return (wsevsrc_ioctl(inp, WSMUX_REMOVE_DEVICE,
- &wsmuxdata, flag, p));
+ &wsmuxdata, flag, l));
default:
return (EINVAL);
}
@@ -1329,7 +1329,7 @@ wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
inp = sc->sc_input;
if (inp == NULL)
return (ENXIO);
- return (wsevsrc_ioctl(inp, cmd, data, flag, p));
+ return (wsevsrc_ioctl(inp, cmd, data, flag, l));
#endif /* NWSKBD > 0 */
}
diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c
index 7959eb99e34..f56b47bae9b 100644
--- a/sys/dev/wscons/wsdisplay_compat_usl.c
+++ b/sys/dev/wscons/wsdisplay_compat_usl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_compat_usl.c,v 1.29 2005/12/05 18:27:59 macallan Exp $ */
+/* $NetBSD: wsdisplay_compat_usl.c,v 1.30 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.29 2005/12/05 18:27:59 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.30 2005/12/11 12:24:12 christos Exp $");
#include "opt_compat_freebsd.h"
#include "opt_compat_netbsd.h"
@@ -281,7 +281,7 @@ usl_attachtimeout(void *arg)
int
wsdisplay_usl_ioctl1(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p)
+ int flag, struct lwp *l)
{
int idx, maxidx;
@@ -351,8 +351,9 @@ wsdisplay_usl_ioctl1(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
int
wsdisplay_usl_ioctl2(struct wsdisplay_softc *sc, struct wsscreen *scr,
- u_long cmd, caddr_t data, int flag, struct proc *p)
+ u_long cmd, caddr_t data, int flag, struct lwp *l)
{
+ struct proc *p = l->l_proc;
int intarg, res;
u_long req;
void *arg;
@@ -505,7 +506,7 @@ wsdisplay_usl_ioctl2(struct wsdisplay_softc *sc, struct wsscreen *scr,
#endif
}
- res = wsdisplay_internal_ioctl(sc, scr, req, arg, flag, p);
+ res = wsdisplay_internal_ioctl(sc, scr, req, arg, flag, l);
if (res != EPASSTHROUGH)
return (res);
diff --git a/sys/dev/wscons/wsdisplayvar.h b/sys/dev/wscons/wsdisplayvar.h
index 8445017aaa5..a3b637b83f6 100644
--- a/sys/dev/wscons/wsdisplayvar.h
+++ b/sys/dev/wscons/wsdisplayvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplayvar.h,v 1.33 2005/05/29 21:56:35 christos Exp $ */
+/* $NetBSD: wsdisplayvar.h,v 1.34 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -109,7 +109,7 @@ struct wsdisplay_char;
*/
struct wsdisplay_accessops {
int (*ioctl)(void *v, u_long cmd, caddr_t data, int flag,
- struct proc *p);
+ struct lwp *l);
paddr_t (*mmap)(void *v, off_t off, int prot);
int (*alloc_screen)(void *, const struct wsscreen_descr *,
void **, int *, int *, long *);
@@ -194,19 +194,19 @@ int wsdisplay_getactivescreen(struct wsdisplay_softc *);
int wsscreen_switchwait(struct wsdisplay_softc *, int);
int wsdisplay_internal_ioctl(struct wsdisplay_softc *sc, struct wsscreen *,
- u_long cmd, caddr_t data,int flag, struct proc *p);
+ u_long cmd, caddr_t data,int flag, struct lwp *l);
int wsdisplay_usl_ioctl1(struct wsdisplay_softc *,
- u_long, caddr_t, int, struct proc *);
+ u_long, caddr_t, int, struct lwp *);
int wsdisplay_usl_ioctl2(struct wsdisplay_softc *, struct wsscreen *,
- u_long, caddr_t, int, struct proc *);
+ u_long, caddr_t, int, struct lwp *);
int wsdisplay_stat_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p);
+ int flag, struct lwp *l);
int wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p);
+ int flag, struct lwp *l);
#ifdef WSDISPLAY_SCROLLSUPPORT
void wsdisplay_scroll (void *v, int op);
diff --git a/sys/dev/wscons/wsemul_dumb.c b/sys/dev/wscons/wsemul_dumb.c
index 88cb6b231bc..32faddbb307 100644
--- a/sys/dev/wscons/wsemul_dumb.c
+++ b/sys/dev/wscons/wsemul_dumb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_dumb.c,v 1.10 2005/05/29 21:56:35 christos Exp $ */
+/* $NetBSD: wsemul_dumb.c,v 1.11 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_dumb.c,v 1.10 2005/05/29 21:56:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_dumb.c,v 1.11 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/wscons/wsemul_sun.c b/sys/dev/wscons/wsemul_sun.c
index ab147ea709c..5390e18c855 100644
--- a/sys/dev/wscons/wsemul_sun.c
+++ b/sys/dev/wscons/wsemul_sun.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_sun.c,v 1.22 2005/05/30 22:16:27 christos Exp $ */
+/* $NetBSD: wsemul_sun.c,v 1.23 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -33,7 +33,7 @@
/* XXX DESCRIPTION/SOURCE OF INFORMATION */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.22 2005/05/30 22:16:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_sun.c,v 1.23 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/wscons/wsemul_vt100.c b/sys/dev/wscons/wsemul_vt100.c
index 69144e93f87..1a1ec043c5e 100644
--- a/sys/dev/wscons/wsemul_vt100.c
+++ b/sys/dev/wscons/wsemul_vt100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100.c,v 1.27 2005/02/27 00:27:52 perry Exp $ */
+/* $NetBSD: wsemul_vt100.c,v 1.28 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.27 2005/02/27 00:27:52 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.28 2005/12/11 12:24:12 christos Exp $");
#include "opt_wsmsgattrs.h"
diff --git a/sys/dev/wscons/wsemul_vt100_chars.c b/sys/dev/wscons/wsemul_vt100_chars.c
index d845a295e5a..1f2a6bad4f6 100644
--- a/sys/dev/wscons/wsemul_vt100_chars.c
+++ b/sys/dev/wscons/wsemul_vt100_chars.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100_chars.c,v 1.10 2004/07/28 12:34:05 jmmv Exp $ */
+/* $NetBSD: wsemul_vt100_chars.c,v 1.11 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_chars.c,v 1.10 2004/07/28 12:34:05 jmmv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_chars.c,v 1.11 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/wscons/wsemul_vt100_keys.c b/sys/dev/wscons/wsemul_vt100_keys.c
index 4dc07ffd0f0..d8690610259 100644
--- a/sys/dev/wscons/wsemul_vt100_keys.c
+++ b/sys/dev/wscons/wsemul_vt100_keys.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100_keys.c,v 1.8 2005/05/29 21:56:35 christos Exp $ */
+/* $NetBSD: wsemul_vt100_keys.c,v 1.9 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_keys.c,v 1.8 2005/05/29 21:56:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_keys.c,v 1.9 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/wscons/wsemul_vt100_subr.c b/sys/dev/wscons/wsemul_vt100_subr.c
index 272c6cf3b55..750feb00d6e 100644
--- a/sys/dev/wscons/wsemul_vt100_subr.c
+++ b/sys/dev/wscons/wsemul_vt100_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100_subr.c,v 1.18 2005/05/29 21:56:35 christos Exp $ */
+/* $NetBSD: wsemul_vt100_subr.c,v 1.19 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_subr.c,v 1.18 2005/05/29 21:56:35 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_subr.c,v 1.19 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/wscons/wsemul_vt100var.h b/sys/dev/wscons/wsemul_vt100var.h
index 1529ef6fd36..fcb3cc715b4 100644
--- a/sys/dev/wscons/wsemul_vt100var.h
+++ b/sys/dev/wscons/wsemul_vt100var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100var.h,v 1.10 2005/05/29 21:56:35 christos Exp $ */
+/* $NetBSD: wsemul_vt100var.h,v 1.11 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1998
diff --git a/sys/dev/wscons/wsemulconf.c b/sys/dev/wscons/wsemulconf.c
index 2b14db15450..cf573491793 100644
--- a/sys/dev/wscons/wsemulconf.c
+++ b/sys/dev/wscons/wsemulconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemulconf.c,v 1.6 2004/07/28 12:34:05 jmmv Exp $ */
+/* $NetBSD: wsemulconf.c,v 1.7 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsemulconf.c,v 1.6 2004/07/28 12:34:05 jmmv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemulconf.c,v 1.7 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/wscons/wsemulvar.h b/sys/dev/wscons/wsemulvar.h
index 77290dbde14..82484694e2c 100644
--- a/sys/dev/wscons/wsemulvar.h
+++ b/sys/dev/wscons/wsemulvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemulvar.h,v 1.11 2005/05/29 21:56:35 christos Exp $ */
+/* $NetBSD: wsemulvar.h,v 1.12 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
diff --git a/sys/dev/wscons/wsevent.c b/sys/dev/wscons/wsevent.c
index df30808deed..b21cf34450a 100644
--- a/sys/dev/wscons/wsevent.c
+++ b/sys/dev/wscons/wsevent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $ */
+/* $NetBSD: wsevent.c,v 1.17 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.16 2003/08/07 16:31:29 agc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.17 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -183,7 +183,7 @@ wsevent_read(struct wseventvar *ev, struct uio *uio, int flags)
}
int
-wsevent_poll(struct wseventvar *ev, int events, struct proc *p)
+wsevent_poll(struct wseventvar *ev, int events, struct lwp *l)
{
int revents = 0;
int s = splwsevent();
@@ -192,7 +192,7 @@ wsevent_poll(struct wseventvar *ev, int events, struct proc *p)
if (ev->get != ev->put)
revents |= events & (POLLIN | POLLRDNORM);
else
- selrecord(p, &ev->sel);
+ selrecord(l, &ev->sel);
}
splx(s);
diff --git a/sys/dev/wscons/wseventvar.h b/sys/dev/wscons/wseventvar.h
index 55af835217c..f4cb1161e50 100644
--- a/sys/dev/wscons/wseventvar.h
+++ b/sys/dev/wscons/wseventvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wseventvar.h,v 1.8 2003/08/07 16:31:29 agc Exp $ */
+/* $NetBSD: wseventvar.h,v 1.9 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -104,7 +104,7 @@ struct wseventvar {
void wsevent_init(struct wseventvar *);
void wsevent_fini(struct wseventvar *);
int wsevent_read(struct wseventvar *, struct uio *, int);
-int wsevent_poll(struct wseventvar *, int, struct proc *);
+int wsevent_poll(struct wseventvar *, int, struct lwp *);
int wsevent_kqfilter(struct wseventvar *ev, struct knote *kn);
/*
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index e8764a61385..6021df42dd2 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.84 2005/11/11 07:07:42 simonb Exp $ */
+/* $NetBSD: wskbd.c,v 1.85 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.84 2005/11/11 07:07:42 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.85 2005/12/11 12:24:12 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -218,7 +218,7 @@ static int wskbd_detach(struct device *, int);
static int wskbd_activate(struct device *, enum devact);
static int wskbd_displayioctl(struct device *, u_long, caddr_t, int,
- struct proc *);
+ struct lwp *);
#if NWSDISPLAY > 0
static int wskbd_set_display(struct device *, struct wsevsrc *);
#else
@@ -236,7 +236,7 @@ static void wskbd_holdscreen(struct wskbd_softc *, int);
#endif
static int wskbd_do_ioctl_sc(struct wskbd_softc *, u_long, caddr_t, int,
- struct proc *);
+ struct lwp *);
static void wskbd_deliver_event(struct wskbd_softc *sc, u_int type, int value);
#if NWSMUX > 0
@@ -248,7 +248,7 @@ static int wskbd_mux_close(struct wsevsrc *);
#endif
static int wskbd_do_open(struct wskbd_softc *, struct wseventvar *);
-static int wskbd_do_ioctl(struct device *, u_long, caddr_t, int, struct proc *);
+static int wskbd_do_ioctl(struct device *, u_long, caddr_t, int, struct lwp *);
CFATTACH_DECL(wskbd, sizeof (struct wskbd_softc),
wskbd_match, wskbd_attach, wskbd_detach, wskbd_activate);
@@ -786,7 +786,7 @@ wskbd_mux_open(struct wsevsrc *me, struct wseventvar *evp)
#endif
int
-wskbdopen(dev_t dev, int flags, int mode, struct proc *p)
+wskbdopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wskbd_softc *sc;
struct wseventvar *evar;
@@ -822,7 +822,7 @@ wskbdopen(dev_t dev, int flags, int mode, struct proc *p)
evar = &sc->sc_base.me_evar;
wsevent_init(evar);
- evar->io = p;
+ evar->io = l->l_proc;
error = wskbd_do_open(sc, evar);
if (error) {
@@ -844,7 +844,7 @@ wskbd_do_open(struct wskbd_softc *sc, struct wseventvar *evp)
}
int
-wskbdclose(dev_t dev, int flags, int mode, struct proc *p)
+wskbdclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wskbd_softc *sc =
(struct wskbd_softc *)wskbd_cd.cd_devs[minor(dev)];
@@ -902,21 +902,21 @@ wskbdread(dev_t dev, struct uio *uio, int flags)
}
int
-wskbdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+wskbdioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
- return (wskbd_do_ioctl(wskbd_cd.cd_devs[minor(dev)], cmd, data, flag,p));
+ return (wskbd_do_ioctl(wskbd_cd.cd_devs[minor(dev)], cmd, data, flag,l));
}
/* A wrapper around the ioctl() workhorse to make reference counting easy. */
int
wskbd_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct wskbd_softc *sc = (struct wskbd_softc *)dv;
int error;
sc->sc_refcnt++;
- error = wskbd_do_ioctl_sc(sc, cmd, data, flag, p);
+ error = wskbd_do_ioctl_sc(sc, cmd, data, flag, l);
if (--sc->sc_refcnt < 0)
wakeup(sc);
return (error);
@@ -924,7 +924,7 @@ wskbd_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
int
wskbd_do_ioctl_sc(struct wskbd_softc *sc, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
/*
@@ -960,7 +960,7 @@ wskbd_do_ioctl_sc(struct wskbd_softc *sc, u_long cmd, caddr_t data, int flag,
* Try the keyboard driver for WSKBDIO ioctls. It returns EPASSTHROUGH
* if it didn't recognize the request.
*/
- return (wskbd_displayioctl(&sc->sc_base.me_dv, cmd, data, flag, p));
+ return (wskbd_displayioctl(&sc->sc_base.me_dv, cmd, data, flag, l));
}
/*
@@ -969,7 +969,7 @@ wskbd_do_ioctl_sc(struct wskbd_softc *sc, u_long cmd, caddr_t data, int flag,
*/
static int
wskbd_displayioctl(struct device *dev, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
#ifdef WSDISPLAY_SCROLLSUPPORT
struct wskbd_scroll_data *usdp, *ksdp;
@@ -979,6 +979,7 @@ wskbd_displayioctl(struct device *dev, u_long cmd, caddr_t data, int flag,
struct wskbd_keyrepeat_data *ukdp, *kkdp;
struct wskbd_map_data *umdp;
struct wskbd_mapdata md;
+ struct proc *p = l ? l->l_proc : NULL;
kbd_t enc;
void *tbuf;
int len, error;
@@ -999,7 +1000,7 @@ wskbd_displayioctl(struct device *dev, u_long cmd, caddr_t data, int flag,
if ((flag & FWRITE) == 0)
return (EACCES);
return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie,
- WSKBDIO_COMPLEXBELL, (caddr_t)&sc->sc_bell_data, flag, p));
+ WSKBDIO_COMPLEXBELL, (caddr_t)&sc->sc_bell_data, flag, l));
case WSKBDIO_COMPLEXBELL:
if ((flag & FWRITE) == 0)
@@ -1007,7 +1008,7 @@ wskbd_displayioctl(struct device *dev, u_long cmd, caddr_t data, int flag,
ubdp = (struct wskbd_bell_data *)data;
SETBELL(ubdp, ubdp, &sc->sc_bell_data);
return ((*sc->sc_accessops->ioctl)(sc->sc_accesscookie,
- WSKBDIO_COMPLEXBELL, (caddr_t)ubdp, flag, p));
+ WSKBDIO_COMPLEXBELL, (caddr_t)ubdp, flag, l));
case WSKBDIO_SETBELL:
if ((flag & FWRITE) == 0)
@@ -1168,7 +1169,7 @@ getkeyrepeat:
*/
/* printf("kbdaccess\n"); */
error = (*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd, data,
- flag, p);
+ flag, l);
#ifdef WSDISPLAY_COMPAT_RAWKBD
if (!error && cmd == WSKBDIO_SETMODE && *(int *)data == WSKBD_RAW) {
int s = spltty();
@@ -1188,13 +1189,13 @@ getkeyrepeat:
}
int
-wskbdpoll(dev_t dev, int events, struct proc *p)
+wskbdpoll(dev_t dev, int events, struct lwp *l)
{
struct wskbd_softc *sc = wskbd_cd.cd_devs[minor(dev)];
if (sc->sc_base.me_evp == NULL)
return (POLLERR);
- return (wsevent_poll(sc->sc_base.me_evp, events, p));
+ return (wsevent_poll(sc->sc_base.me_evp, events, l));
}
int
diff --git a/sys/dev/wscons/wskbdutil.c b/sys/dev/wscons/wskbdutil.c
index a6798e4f991..1d8900037a9 100644
--- a/sys/dev/wscons/wskbdutil.c
+++ b/sys/dev/wscons/wskbdutil.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdutil.c,v 1.11 2005/02/27 00:27:52 perry Exp $ */
+/* $NetBSD: wskbdutil.c,v 1.12 2005/12/11 12:24:12 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbdutil.c,v 1.11 2005/02/27 00:27:52 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdutil.c,v 1.12 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/cdefs.h>
diff --git a/sys/dev/wscons/wskbdvar.h b/sys/dev/wscons/wskbdvar.h
index dbc99153230..a3a61caec70 100644
--- a/sys/dev/wscons/wskbdvar.h
+++ b/sys/dev/wscons/wskbdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdvar.h,v 1.11 2001/10/13 15:56:16 augustss Exp $ */
+/* $NetBSD: wskbdvar.h,v 1.12 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -44,7 +44,7 @@ struct wskbd_accessops {
int (*enable)(void *, int);
void (*set_leds)(void *, int);
int (*ioctl)(void *v, u_long cmd, caddr_t data, int flag,
- struct proc *p);
+ struct lwp *l);
};
/*
diff --git a/sys/dev/wscons/wsksymdef.h b/sys/dev/wscons/wsksymdef.h
index be654a74ab6..49fd726ea7a 100644
--- a/sys/dev/wscons/wsksymdef.h
+++ b/sys/dev/wscons/wsksymdef.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsksymdef.h,v 1.54 2005/06/08 09:11:09 martin Exp $ */
+/* $NetBSD: wsksymdef.h,v 1.55 2005/12/11 12:24:12 christos Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c
index 819345115d0..7f78d73b7de 100644
--- a/sys/dev/wscons/wsmouse.c
+++ b/sys/dev/wscons/wsmouse.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmouse.c,v 1.37 2005/11/23 09:38:02 augustss Exp $ */
+/* $NetBSD: wsmouse.c,v 1.38 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.37 2005/11/23 09:38:02 augustss Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmouse.c,v 1.38 2005/12/11 12:24:12 christos Exp $");
#include "wsmouse.h"
#include "wsdisplay.h"
@@ -140,14 +140,14 @@ static int wsmouse_detach(struct device *, int);
static int wsmouse_activate(struct device *, enum devact);
static int wsmouse_do_ioctl(struct wsmouse_softc *, u_long, caddr_t,
- int, struct proc *);
+ int, struct lwp *);
#if NWSMUX > 0
static int wsmouse_mux_open(struct wsevsrc *, struct wseventvar *);
static int wsmouse_mux_close(struct wsevsrc *);
#endif
-static int wsmousedoioctl(struct device *, u_long, caddr_t, int, struct proc *);
+static int wsmousedoioctl(struct device *, u_long, caddr_t, int, struct lwp *);
static int wsmousedoopen(struct wsmouse_softc *, struct wseventvar *);
@@ -466,7 +466,7 @@ out:
}
int
-wsmouseopen(dev_t dev, int flags, int mode, struct proc *p)
+wsmouseopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wsmouse_softc *sc;
struct wseventvar *evar;
@@ -479,7 +479,7 @@ wsmouseopen(dev_t dev, int flags, int mode, struct proc *p)
#if NWSMUX > 0
DPRINTF(("wsmouseopen: %s mux=%p p=%p\n", sc->sc_base.me_dv.dv_xname,
- sc->sc_base.me_parent, p));
+ sc->sc_base.me_parent, l));
#endif
if (sc->sc_dying)
@@ -495,7 +495,7 @@ wsmouseopen(dev_t dev, int flags, int mode, struct proc *p)
evar = &sc->sc_base.me_evar;
wsevent_init(evar);
sc->sc_base.me_evp = evar;
- evar->io = p;
+ evar->io = l->l_proc;
error = wsmousedoopen(sc, evar);
if (error) {
@@ -508,7 +508,7 @@ wsmouseopen(dev_t dev, int flags, int mode, struct proc *p)
}
int
-wsmouseclose(dev_t dev, int flags, int mode, struct proc *p)
+wsmouseclose(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wsmouse_softc *sc =
(struct wsmouse_softc *)wsmouse_cd.cd_devs[minor(dev)];
@@ -562,22 +562,22 @@ wsmouseread(dev_t dev, struct uio *uio, int flags)
}
int
-wsmouseioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+wsmouseioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
return (wsmousedoioctl(wsmouse_cd.cd_devs[minor(dev)],
- cmd, data, flag, p));
+ cmd, data, flag, l));
}
/* A wrapper around the ioctl() workhorse to make reference counting easy. */
int
wsmousedoioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct wsmouse_softc *sc = (struct wsmouse_softc *)dv;
int error;
sc->sc_refcnt++;
- error = wsmouse_do_ioctl(sc, cmd, data, flag, p);
+ error = wsmouse_do_ioctl(sc, cmd, data, flag, l);
if (--sc->sc_refcnt < 0)
wakeup(sc);
return (error);
@@ -585,7 +585,7 @@ wsmousedoioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
int
wsmouse_do_ioctl(struct wsmouse_softc *sc, u_long cmd, caddr_t data,
- int flag, struct proc *p)
+ int flag, struct lwp *l)
{
int error;
@@ -626,18 +626,18 @@ wsmouse_do_ioctl(struct wsmouse_softc *sc, u_long cmd, caddr_t data,
* if it didn't recognize the request.
*/
error = (*sc->sc_accessops->ioctl)(sc->sc_accesscookie, cmd,
- data, flag, p);
+ data, flag, l);
return (error); /* may be EPASSTHROUGH */
}
int
-wsmousepoll(dev_t dev, int events, struct proc *p)
+wsmousepoll(dev_t dev, int events, struct lwp *l)
{
struct wsmouse_softc *sc = wsmouse_cd.cd_devs[minor(dev)];
if (sc->sc_base.me_evp == NULL)
return (POLLERR);
- return (wsevent_poll(sc->sc_base.me_evp, events, p));
+ return (wsevent_poll(sc->sc_base.me_evp, events, l));
}
int
diff --git a/sys/dev/wscons/wsmousevar.h b/sys/dev/wscons/wsmousevar.h
index 8ea774d7c5e..dd2d7521be6 100644
--- a/sys/dev/wscons/wsmousevar.h
+++ b/sys/dev/wscons/wsmousevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmousevar.h,v 1.6 2005/11/23 09:38:02 augustss Exp $ */
+/* $NetBSD: wsmousevar.h,v 1.7 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -43,7 +43,7 @@
struct wsmouse_accessops {
int (*enable)(void *);
int (*ioctl)(void *v, u_long cmd, caddr_t data, int flag,
- struct proc *p);
+ struct lwp *l);
void (*disable)(void *);
};
diff --git a/sys/dev/wscons/wsmux.c b/sys/dev/wscons/wsmux.c
index 2d4e75c3ab3..c55c07af623 100644
--- a/sys/dev/wscons/wsmux.c
+++ b/sys/dev/wscons/wsmux.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmux.c,v 1.39 2005/11/11 07:07:42 simonb Exp $ */
+/* $NetBSD: wsmux.c,v 1.40 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.39 2005/11/11 07:07:42 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsmux.c,v 1.40 2005/12/11 12:24:12 christos Exp $");
#include "wsdisplay.h"
#include "wsmux.h"
@@ -110,8 +110,8 @@ static int wsmux_evsrc_set_display(struct device *, struct wsevsrc *);
#endif
static int wsmux_do_displayioctl(struct device *dev, u_long cmd,
- caddr_t data, int flag, struct proc *p);
-static int wsmux_do_ioctl(struct device *, u_long, caddr_t,int,struct proc *);
+ caddr_t data, int flag, struct lwp *l);
+static int wsmux_do_ioctl(struct device *, u_long, caddr_t,int,struct lwp *);
static int wsmux_add_mux(int, struct wsmux_softc *);
@@ -191,7 +191,7 @@ wsmux_getmux(int n)
* open() of the pseudo device from device table.
*/
int
-wsmuxopen(dev_t dev, int flags, int mode, struct proc *p)
+wsmuxopen(dev_t dev, int flags, int mode, struct lwp *l)
{
struct wsmux_softc *sc;
struct wseventvar *evar;
@@ -228,7 +228,7 @@ wsmuxopen(dev_t dev, int flags, int mode, struct proc *p)
evar = &sc->sc_base.me_evar;
wsevent_init(evar);
- evar->io = p;
+ evar->io = l->l_proc;
#ifdef WSDISPLAY_COMPAT_RAWKBD
sc->sc_rawkbd = 0;
#endif
@@ -300,7 +300,7 @@ wsmux_do_open(struct wsmux_softc *sc, struct wseventvar *evar)
* close() of the pseudo device from device table.
*/
int
-wsmuxclose(dev_t dev, int flags, int mode, struct proc *p)
+wsmuxclose(dev_t dev, int flags, int mode, struct lwp *l)
{
int minr = minor(dev);
struct wsmux_softc *sc = wsmuxdevs[WSMUXDEV(minr)];
@@ -390,11 +390,11 @@ wsmuxread(dev_t dev, struct uio *uio, int flags)
* ioctl of the pseudo device from device table.
*/
int
-wsmuxioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+wsmuxioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
int u = WSMUXDEV(minor(dev));
- return wsmux_do_ioctl(&wsmuxdevs[u]->sc_base.me_dv, cmd, data, flag, p);
+ return wsmux_do_ioctl(&wsmuxdevs[u]->sc_base.me_dv, cmd, data, flag, l);
}
/*
@@ -402,7 +402,7 @@ wsmuxioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
*/
int
wsmux_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *lwp)
{
struct wsmux_softc *sc = (struct wsmux_softc *)dv;
struct wsevsrc *me;
@@ -547,7 +547,7 @@ wsmux_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
continue;
}
#endif
- error = wsevsrc_ioctl(me, cmd, data, flag, p);
+ error = wsevsrc_ioctl(me, cmd, data, flag, lwp);
DPRINTF(("wsmux_do_ioctl: %s: me=%p dev=%s ==> %d\n",
sc->sc_base.me_dv.dv_xname, me, me->me_dv.dv_xname,
error));
@@ -569,7 +569,7 @@ wsmux_do_ioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
* poll() of the pseudo device from device table.
*/
int
-wsmuxpoll(dev_t dev, int events, struct proc *p)
+wsmuxpoll(dev_t dev, int events, struct lwp *l)
{
int minr = minor(dev);
struct wsmux_softc *sc = wsmuxdevs[WSMUXDEV(minr)];
@@ -586,7 +586,7 @@ wsmuxpoll(dev_t dev, int events, struct proc *p)
return (POLLHUP);
}
- return (wsevent_poll(sc->sc_base.me_evp, events, p));
+ return (wsevent_poll(sc->sc_base.me_evp, events, l));
}
/*
@@ -767,7 +767,7 @@ wsmux_detach_sc(struct wsevsrc *me)
*/
int
wsmux_do_displayioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
- struct proc *p)
+ struct lwp *l)
{
struct wsmux_softc *sc = (struct wsmux_softc *)dv;
struct wsevsrc *me;
@@ -798,7 +798,7 @@ wsmux_do_displayioctl(struct device *dv, u_long cmd, caddr_t data, int flag,
}
#endif
if (me->me_ops->ddispioctl != NULL) {
- error = wsevsrc_display_ioctl(me, cmd, data, flag, p);
+ error = wsevsrc_display_ioctl(me, cmd, data, flag, l);
DPRINTF(("wsmux_displayioctl: me=%p dev=%s ==> %d\n",
me, me->me_dv.dv_xname, error));
if (!error)
diff --git a/sys/dev/wscons/wsmuxvar.h b/sys/dev/wscons/wsmuxvar.h
index d5bd97528e7..2859286ee20 100644
--- a/sys/dev/wscons/wsmuxvar.h
+++ b/sys/dev/wscons/wsmuxvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wsmuxvar.h,v 1.10 2005/04/30 03:47:12 augustss Exp $ */
+/* $NetBSD: wsmuxvar.h,v 1.11 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,8 +61,8 @@ struct wssrcops {
int type; /* device type: WSMUX_{MOUSE,KBD,MUX} */
int (*dopen)(struct wsevsrc *, struct wseventvar *);
int (*dclose)(struct wsevsrc *);
- int (*dioctl)(struct device *, u_long, caddr_t, int, struct proc *);
- int (*ddispioctl)(struct device *, u_long, caddr_t, int, struct proc *);
+ int (*dioctl)(struct device *, u_long, caddr_t, int, struct lwp *);
+ int (*ddispioctl)(struct device *, u_long, caddr_t, int, struct lwp *);
int (*dsetdisplay)(struct device *, struct wsevsrc *);
};
@@ -70,10 +70,10 @@ struct wssrcops {
((me)->me_ops->dopen((me), evp))
#define wsevsrc_close(me) \
((me)->me_ops->dclose((me)))
-#define wsevsrc_ioctl(me, cmd, data, flag, p) \
- ((me)->me_ops->dioctl(&(me)->me_dv, cmd, (caddr_t)data, flag, p))
-#define wsevsrc_display_ioctl(me, cmd, data, flag, p) \
- ((me)->me_ops->ddispioctl(&(me)->me_dv, cmd, (caddr_t)data, flag, p))
+#define wsevsrc_ioctl(me, cmd, data, flag, l) \
+ ((me)->me_ops->dioctl(&(me)->me_dv, cmd, (caddr_t)data, flag, l))
+#define wsevsrc_display_ioctl(me, cmd, data, flag, l) \
+ ((me)->me_ops->ddispioctl(&(me)->me_dv, cmd, (caddr_t)data, flag, l))
#define wsevsrc_set_display(me, arg) \
((me)->me_ops->dsetdisplay(&(me)->me_dv, arg))
diff --git a/sys/dev/wsfont/bold8x16.h b/sys/dev/wsfont/bold8x16.h
index bccba347824..59c40606889 100644
--- a/sys/dev/wsfont/bold8x16.h
+++ b/sys/dev/wsfont/bold8x16.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bold8x16.h,v 1.11 2005/06/28 00:44:22 thorpej Exp $ */
+/* $NetBSD: bold8x16.h,v 1.12 2005/12/11 12:24:12 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
diff --git a/sys/dev/wsfont/files.wsfont b/sys/dev/wsfont/files.wsfont
index 07c3bc033a8..3b295fb0450 100644
--- a/sys/dev/wsfont/files.wsfont
+++ b/sys/dev/wsfont/files.wsfont
@@ -1,4 +1,4 @@
-# $NetBSD: files.wsfont,v 1.13 2003/07/14 18:30:41 uwe Exp $
+# $NetBSD: files.wsfont,v 1.14 2005/12/11 12:24:12 christos Exp $
defpseudo wsfont
diff --git a/sys/dev/wsfont/gallant12x22.h b/sys/dev/wsfont/gallant12x22.h
index 20b0faff901..1ce9755843f 100644
--- a/sys/dev/wsfont/gallant12x22.h
+++ b/sys/dev/wsfont/gallant12x22.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gallant12x22.h,v 1.10 2005/09/19 19:27:31 martin Exp $ */
+/* $NetBSD: gallant12x22.h,v 1.11 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1992, 1993
diff --git a/sys/dev/wsfont/lucida16x29.h b/sys/dev/wsfont/lucida16x29.h
index c9d0271abfd..139d4639fb7 100644
--- a/sys/dev/wsfont/lucida16x29.h
+++ b/sys/dev/wsfont/lucida16x29.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lucida16x29.h,v 1.9 2005/06/28 00:44:22 thorpej Exp $ */
+/* $NetBSD: lucida16x29.h,v 1.10 2005/12/11 12:24:12 christos Exp $ */
/*
diff --git a/sys/dev/wsfont/omron12x20.h b/sys/dev/wsfont/omron12x20.h
index da90428007f..99d9918ddf1 100644
--- a/sys/dev/wsfont/omron12x20.h
+++ b/sys/dev/wsfont/omron12x20.h
@@ -1,4 +1,4 @@
-/* $NetBSD: omron12x20.h,v 1.6 2005/06/28 00:44:22 thorpej Exp $ */
+/* $NetBSD: omron12x20.h,v 1.7 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/dev/wsfont/qvss8x15.h b/sys/dev/wsfont/qvss8x15.h
index bcbae9745d0..6be55a2bf22 100644
--- a/sys/dev/wsfont/qvss8x15.h
+++ b/sys/dev/wsfont/qvss8x15.h
@@ -1,4 +1,4 @@
-/* $NetBSD: qvss8x15.h,v 1.10 2005/06/28 00:44:22 thorpej Exp $ */
+/* $NetBSD: qvss8x15.h,v 1.11 2005/12/11 12:24:12 christos Exp $ */
/*-
* Copyright (c) 1982, 1986
diff --git a/sys/dev/wsfont/sony12x24.h b/sys/dev/wsfont/sony12x24.h
index 349a8fba411..ca6ef7b392a 100644
--- a/sys/dev/wsfont/sony12x24.h
+++ b/sys/dev/wsfont/sony12x24.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sony12x24.h,v 1.8 2005/06/28 00:44:22 thorpej Exp $ */
+/* $NetBSD: sony12x24.h,v 1.9 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/dev/wsfont/sony8x16.h b/sys/dev/wsfont/sony8x16.h
index cea76eae0d7..e25ec4d26f5 100644
--- a/sys/dev/wsfont/sony8x16.h
+++ b/sys/dev/wsfont/sony8x16.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sony8x16.h,v 1.7 2005/04/22 14:46:01 yamt Exp $ */
+/* $NetBSD: sony8x16.h,v 1.8 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
diff --git a/sys/dev/wsfont/vt220iso8x16.h b/sys/dev/wsfont/vt220iso8x16.h
index fc03f812a1a..10aab260c4f 100644
--- a/sys/dev/wsfont/vt220iso8x16.h
+++ b/sys/dev/wsfont/vt220iso8x16.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vt220iso8x16.h,v 1.6 2005/06/28 00:44:22 thorpej Exp $ */
+/* $NetBSD: vt220iso8x16.h,v 1.7 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1994 Hellmuth Michaelis and Joerg Wunsch
diff --git a/sys/dev/wsfont/vt220koi8x10.h b/sys/dev/wsfont/vt220koi8x10.h
index 952cb47b2af..dc0109e9576 100644
--- a/sys/dev/wsfont/vt220koi8x10.h
+++ b/sys/dev/wsfont/vt220koi8x10.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vt220koi8x10.h,v 1.3 2005/06/28 00:44:22 thorpej Exp $ */
+/* $NetBSD: vt220koi8x10.h,v 1.4 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch
diff --git a/sys/dev/wsfont/vt220l8x10.h b/sys/dev/wsfont/vt220l8x10.h
index 0219a6bce40..f78f60fd805 100644
--- a/sys/dev/wsfont/vt220l8x10.h
+++ b/sys/dev/wsfont/vt220l8x10.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vt220l8x10.h,v 1.8 2005/06/28 00:44:22 thorpej Exp $ */
+/* $NetBSD: vt220l8x10.h,v 1.9 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch
diff --git a/sys/dev/wsfont/vt220l8x16.h b/sys/dev/wsfont/vt220l8x16.h
index 26bb9cff8fd..d3e540589be 100644
--- a/sys/dev/wsfont/vt220l8x16.h
+++ b/sys/dev/wsfont/vt220l8x16.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vt220l8x16.h,v 1.5 2005/06/28 00:44:22 thorpej Exp $ */
+/* $NetBSD: vt220l8x16.h,v 1.6 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch
diff --git a/sys/dev/wsfont/vt220l8x8.h b/sys/dev/wsfont/vt220l8x8.h
index 9e29d348692..a6112c07d6e 100644
--- a/sys/dev/wsfont/vt220l8x8.h
+++ b/sys/dev/wsfont/vt220l8x8.h
@@ -1,4 +1,4 @@
-/* $NetBSD: vt220l8x8.h,v 1.8 2005/06/28 00:44:22 thorpej Exp $ */
+/* $NetBSD: vt220l8x8.h,v 1.9 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch
diff --git a/sys/dev/wsfont/wsfont.c b/sys/dev/wsfont/wsfont.c
index fffdbaf3f74..e2741a82162 100644
--- a/sys/dev/wsfont/wsfont.c
+++ b/sys/dev/wsfont/wsfont.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.38 2005/05/29 22:18:25 christos Exp $ */
+/* $NetBSD: wsfont.c,v 1.39 2005/12/11 12:24:12 christos Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.38 2005/05/29 22:18:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.39 2005/12/11 12:24:12 christos Exp $");
#include "opt_wsfont.h"
diff --git a/sys/dev/wsfont/wsfontdev.c b/sys/dev/wsfont/wsfontdev.c
index 8d3c651709f..6d50b0645eb 100644
--- a/sys/dev/wsfont/wsfontdev.c
+++ b/sys/dev/wsfont/wsfontdev.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfontdev.c,v 1.9 2005/06/28 00:44:22 thorpej Exp $ */
+/* $NetBSD: wsfontdev.c,v 1.10 2005/12/11 12:24:12 christos Exp $ */
/*
* Copyright (c) 2001
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.9 2005/06/28 00:44:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfontdev.c,v 1.10 2005/12/11 12:24:12 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ wsfontattach(int n)
}
static int
-wsfontopen(dev_t dev, int flag, int mode, struct proc *p)
+wsfontopen(dev_t dev, int flag, int mode, struct lwp *l)
{
if (wsfont_isopen)
@@ -61,7 +61,7 @@ wsfontopen(dev_t dev, int flag, int mode, struct proc *p)
}
static int
-wsfontclose(dev_t dev, int flag, int mode, struct proc *p)
+wsfontclose(dev_t dev, int flag, int mode, struct lwp *l)
{
wsfont_isopen = 0;
@@ -69,7 +69,7 @@ wsfontclose(dev_t dev, int flag, int mode, struct proc *p)
}
static int
-wsfontioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
+wsfontioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct lwp *l)
{
char nbuf[16];
void *buf;
diff --git a/sys/dev/xmi/xmi.c b/sys/dev/xmi/xmi.c
index 257343f34de..b9af12ac0b0 100644
--- a/sys/dev/xmi/xmi.c
+++ b/sys/dev/xmi/xmi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: xmi.c,v 1.6 2005/02/27 00:27:54 perry Exp $ */
+/* $NetBSD: xmi.c,v 1.7 2005/12/11 12:24:20 christos Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xmi.c,v 1.6 2005/02/27 00:27:54 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xmi.c,v 1.7 2005/12/11 12:24:20 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>