summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsl <dsl@NetBSD.org>2009-03-14 14:45:51 +0000
committerdsl <dsl@NetBSD.org>2009-03-14 14:45:51 +0000
commit02cdf4d2c869ecfa1ae5484cf77eefe2fbcc6d94 (patch)
tree9a02e625d403e5fcedfdc6be4803e2404356bf31
parentdfbb3f921a23a1aba4463f31ef9233ac94ce606c (diff)
Remove all the __P() from sys (excluding sys/dist)
Diff checked with grep and MK1 eyeball. i386 and amd64 GENERIC and sys still build.
-rw-r--r--sys/arch/acorn32/acorn32/autoconf.c12
-rw-r--r--sys/arch/acorn32/dev/md_hooks.c6
-rw-r--r--sys/arch/acorn32/include/iic.h10
-rw-r--r--sys/arch/acorn32/include/irqhandler.h22
-rw-r--r--sys/arch/acorn32/include/loadfile_machdep.h8
-rw-r--r--sys/arch/acorn32/include/podulebus_machdep.h16
-rw-r--r--sys/arch/acorn32/mainbus/fd.c52
-rw-r--r--sys/arch/acorn32/mainbus/pioc.c20
-rw-r--r--sys/arch/acorn32/podulebus/esc.c32
-rw-r--r--sys/arch/acorn32/podulebus/escvar.h12
-rw-r--r--sys/arch/acorn32/podulebus/if_ie.c34
-rw-r--r--sys/arch/acorn32/podulebus/netslot.c6
-rw-r--r--sys/arch/acorn32/podulebus/podulebus.c8
-rw-r--r--sys/arch/acorn32/podulebus/ptsc.c8
-rw-r--r--sys/arch/acorn32/podulebus/sfasvar.h12
-rw-r--r--sys/arch/acorn32/stand/lib/srt1.c4
-rw-r--r--sys/arch/algor/pci/pci_alignstride_bus_io_chipdep.c186
-rw-r--r--sys/arch/algor/pci/pci_alignstride_bus_mem_chipdep.c186
-rw-r--r--sys/arch/alpha/a12/a12dc.c24
-rw-r--r--sys/arch/alpha/a12/a12dcreg.h4
-rw-r--r--sys/arch/alpha/a12/if_xb.c38
-rw-r--r--sys/arch/alpha/a12/if_xb.h14
-rw-r--r--sys/arch/alpha/alpha/api_up1000.c10
-rw-r--r--sys/arch/alpha/alpha/autoconf.c8
-rw-r--r--sys/arch/alpha/alpha/avalon_a12.c12
-rw-r--r--sys/arch/alpha/alpha/cpu.c6
-rw-r--r--sys/arch/alpha/alpha/cpuconf.c40
-rw-r--r--sys/arch/alpha/alpha/db_interface.c8
-rw-r--r--sys/arch/alpha/alpha/dec_1000a.c10
-rw-r--r--sys/arch/alpha/alpha/dec_2100_a50.c16
-rw-r--r--sys/arch/alpha/alpha/dec_3000_300.c10
-rw-r--r--sys/arch/alpha/alpha/dec_3000_500.c10
-rw-r--r--sys/arch/alpha/alpha/dec_550.c12
-rw-r--r--sys/arch/alpha/alpha/dec_6600.c10
-rw-r--r--sys/arch/alpha/alpha/dec_alphabook1.c10
-rw-r--r--sys/arch/alpha/alpha/dec_axppci_33.c12
-rw-r--r--sys/arch/alpha/alpha/dec_eb164.c10
-rw-r--r--sys/arch/alpha/alpha/dec_eb64plus.c10
-rw-r--r--sys/arch/alpha/alpha/dec_eb66.c10
-rw-r--r--sys/arch/alpha/alpha/dec_kn20aa.c16
-rw-r--r--sys/arch/alpha/alpha/dec_kn300.c20
-rw-r--r--sys/arch/alpha/alpha/dec_kn8ae.c26
-rw-r--r--sys/arch/alpha/alpha/disksubr.c8
-rw-r--r--sys/arch/alpha/alpha/machdep.c20
-rw-r--r--sys/arch/alpha/alpha/vm_machdep.c6
-rw-r--r--sys/arch/alpha/common/shared_intr.c6
-rw-r--r--sys/arch/alpha/isa/isa_machdep.c8
-rw-r--r--sys/arch/alpha/isa/isadma_bounce.c10
-rw-r--r--sys/arch/alpha/pci/a12c.c10
-rw-r--r--sys/arch/alpha/pci/a12c_bus_mem.c174
-rw-r--r--sys/arch/alpha/pci/a12c_dma.c22
-rw-r--r--sys/arch/alpha/pci/a12c_pci.c20
-rw-r--r--sys/arch/alpha/pci/a12cvar.h20
-rw-r--r--sys/arch/alpha/pci/apecs.c12
-rw-r--r--sys/arch/alpha/pci/apecs_dma.c24
-rw-r--r--sys/arch/alpha/pci/apecs_pci.c20
-rw-r--r--sys/arch/alpha/pci/apecsvar.h12
-rw-r--r--sys/arch/alpha/pci/cia.c12
-rw-r--r--sys/arch/alpha/pci/cia_dma.c34
-rw-r--r--sys/arch/alpha/pci/cia_pci.c20
-rw-r--r--sys/arch/alpha/pci/ciavar.h18
-rw-r--r--sys/arch/alpha/pci/dwlpx.c8
-rw-r--r--sys/arch/alpha/pci/dwlpx_dma.c24
-rw-r--r--sys/arch/alpha/pci/dwlpx_pci.c20
-rw-r--r--sys/arch/alpha/pci/dwlpxvar.h12
-rw-r--r--sys/arch/alpha/pci/irongate_pci.c20
-rw-r--r--sys/arch/alpha/pci/lca.c12
-rw-r--r--sys/arch/alpha/pci/lca_dma.c24
-rw-r--r--sys/arch/alpha/pci/lca_pci.c20
-rw-r--r--sys/arch/alpha/pci/lcavar.h12
-rw-r--r--sys/arch/alpha/pci/mcpcia.c14
-rw-r--r--sys/arch/alpha/pci/mcpcia_dma.c24
-rw-r--r--sys/arch/alpha/pci/mcpcia_pci.c18
-rw-r--r--sys/arch/alpha/pci/mcpciavar.h16
-rw-r--r--sys/arch/alpha/pci/pci_1000.c26
-rw-r--r--sys/arch/alpha/pci/pci_1000.h6
-rw-r--r--sys/arch/alpha/pci/pci_1000a.c28
-rw-r--r--sys/arch/alpha/pci/pci_1000a.h6
-rw-r--r--sys/arch/alpha/pci/pci_2100_a50.c18
-rw-r--r--sys/arch/alpha/pci/pci_2100_a50.h4
-rw-r--r--sys/arch/alpha/pci/pci_550.c32
-rw-r--r--sys/arch/alpha/pci/pci_550.h4
-rw-r--r--sys/arch/alpha/pci/pci_6600.c30
-rw-r--r--sys/arch/alpha/pci/pci_6600.h4
-rw-r--r--sys/arch/alpha/pci/pci_a12.c34
-rw-r--r--sys/arch/alpha/pci/pci_a12.h4
-rw-r--r--sys/arch/alpha/pci/pci_alphabook1.c18
-rw-r--r--sys/arch/alpha/pci/pci_alphabook1.h4
-rw-r--r--sys/arch/alpha/pci/pci_axppci_33.c18
-rw-r--r--sys/arch/alpha/pci/pci_axppci_33.h4
-rw-r--r--sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c186
-rw-r--r--sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c186
-rw-r--r--sys/arch/alpha/pci/pci_eb164.c30
-rw-r--r--sys/arch/alpha/pci/pci_eb164.h4
-rw-r--r--sys/arch/alpha/pci/pci_eb64plus.c26
-rw-r--r--sys/arch/alpha/pci/pci_eb64plus.h4
-rw-r--r--sys/arch/alpha/pci/pci_eb66.c26
-rw-r--r--sys/arch/alpha/pci/pci_eb66.h4
-rw-r--r--sys/arch/alpha/pci/pci_kn20aa.c26
-rw-r--r--sys/arch/alpha/pci/pci_kn20aa.h4
-rw-r--r--sys/arch/alpha/pci/pci_kn300.c26
-rw-r--r--sys/arch/alpha/pci/pci_kn300.h4
-rw-r--r--sys/arch/alpha/pci/pci_kn8ae.c24
-rw-r--r--sys/arch/alpha/pci/pci_kn8ae.h4
-rw-r--r--sys/arch/alpha/pci/pci_machdep.c8
-rw-r--r--sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c186
-rw-r--r--sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c202
-rw-r--r--sys/arch/alpha/pci/pci_up1000.h4
-rw-r--r--sys/arch/alpha/pci/pciide_machdep.c6
-rw-r--r--sys/arch/alpha/pci/sio.c24
-rw-r--r--sys/arch/alpha/pci/sio_pic.c28
-rw-r--r--sys/arch/alpha/pci/siovar.h18
-rw-r--r--sys/arch/alpha/pci/tsc.c18
-rw-r--r--sys/arch/alpha/pci/tsp_dma.c26
-rw-r--r--sys/arch/alpha/pci/tsp_pci.c20
-rw-r--r--sys/arch/alpha/pci/tsvar.h14
-rw-r--r--sys/arch/alpha/stand/common/blkdev.h8
-rw-r--r--sys/arch/alpha/stand/common/common.h16
-rw-r--r--sys/arch/alpha/stand/netboot/dev_net.c6
-rw-r--r--sys/arch/alpha/stand/netboot/dev_net.h10
-rw-r--r--sys/arch/alpha/tc/ioasic.c14
-rw-r--r--sys/arch/alpha/tc/tc_3000_300.c12
-rw-r--r--sys/arch/alpha/tc/tc_3000_300.h4
-rw-r--r--sys/arch/alpha/tc/tc_3000_500.c24
-rw-r--r--sys/arch/alpha/tc/tc_3000_500.h4
-rw-r--r--sys/arch/alpha/tc/tc_bus_mem.c172
-rw-r--r--sys/arch/alpha/tc/tc_conf.h28
-rw-r--r--sys/arch/alpha/tc/tc_dma_3000_300.h4
-rw-r--r--sys/arch/alpha/tc/tc_dma_3000_500.h30
-rw-r--r--sys/arch/alpha/tc/tcasic.c26
-rw-r--r--sys/arch/alpha/tlsb/gbus.c10
-rw-r--r--sys/arch/alpha/tlsb/kftxx.c10
-rw-r--r--sys/arch/alpha/tlsb/tlsb.c12
-rw-r--r--sys/arch/alpha/tlsb/tlsbmem.c8
-rw-r--r--sys/arch/amd64/include/db_machdep.h12
-rw-r--r--sys/arch/amd64/include/gdt.h8
-rw-r--r--sys/arch/amd64/include/proc.h4
-rw-r--r--sys/arch/amiga/include/bus.h6
-rw-r--r--sys/arch/amiga/include/cpu.h36
-rw-r--r--sys/arch/amiga/include/loadfile_machdep.h8
-rw-r--r--sys/arch/amigappc/amigappc/machdep.c6
-rw-r--r--sys/arch/amigappc/include/bus.h6
-rw-r--r--sys/arch/amigappc/include/cpu.h16
-rw-r--r--sys/arch/amigappc/include/intr.h14
-rw-r--r--sys/arch/amigappc/include/mtpr.h8
-rw-r--r--sys/arch/amigappc/include/param.h6
-rw-r--r--sys/arch/amigappc/include/powerpc.h12
-rw-r--r--sys/arch/arm/arm/cpufunc.c8
-rw-r--r--sys/arch/arm/arm/db_trace.c6
-rw-r--r--sys/arch/arm/arm/disksubr.c8
-rw-r--r--sys/arch/arm/arm/disksubr_acorn.c10
-rw-r--r--sys/arch/arm/arm/disksubr_mbr.c8
-rw-r--r--sys/arch/arm/arm32/arm32_machdep.c10
-rw-r--r--sys/arch/arm/arm32/db_interface.c14
-rw-r--r--sys/arch/arm/arm32/vm_machdep.c8
-rw-r--r--sys/arch/arm/ep93xx/epcom.c6
-rw-r--r--sys/arch/arm/footbridge/footbridge.c16
-rw-r--r--sys/arch/arm/footbridge/footbridge.h16
-rw-r--r--sys/arch/arm/footbridge/footbridge_com.c32
-rw-r--r--sys/arch/arm/footbridge/footbridge_pci.c38
-rw-r--r--sys/arch/arm/footbridge/isa/isa_machdep.c16
-rw-r--r--sys/arch/arm/footbridge/isa/isadma_machdep.c46
-rw-r--r--sys/arch/arm/footbridge/isa/sysbeep_isa.c10
-rw-r--r--sys/arch/arm/footbridge/todclock.c16
-rw-r--r--sys/arch/arm/footbridge/todclockvar.h6
-rw-r--r--sys/arch/arm/fpe-arm/armfpe.h52
-rw-r--r--sys/arch/arm/include/arm32/db_machdep.h6
-rw-r--r--sys/arch/arm/include/arm32/machdep.h22
-rw-r--r--sys/arch/arm/include/arm32/param.h4
-rw-r--r--sys/arch/arm/include/arm32/rtc.h6
-rw-r--r--sys/arch/arm/include/bootconfig.h4
-rw-r--r--sys/arch/arm/include/bus.h552
-rw-r--r--sys/arch/arm/include/db_machdep.h8
-rw-r--r--sys/arch/arm/include/disklabel.h10
-rw-r--r--sys/arch/arm/include/ofw.h28
-rw-r--r--sys/arch/arm/include/sysarch.h8
-rw-r--r--sys/arch/arm/include/undefined.h12
-rw-r--r--sys/arch/arm/iomd/iomd_dma.h16
-rw-r--r--sys/arch/arm/ixp12x0/ixp12x0_com.c6
-rw-r--r--sys/arch/arm/mainbus/cpu_mainbus.c8
-rw-r--r--sys/arch/arm/mainbus/mainbus.c14
-rw-r--r--sys/arch/arm/ofw/ofw_irqhandler.c10
-rw-r--r--sys/arch/arm/ofw/ofwgencfg_machdep.c16
-rw-r--r--sys/arch/atari/dev/atari5380.c94
-rw-r--r--sys/arch/atari/dev/clock.c12
-rw-r--r--sys/arch/atari/dev/dma.c8
-rw-r--r--sys/arch/atari/dev/event_var.h12
-rw-r--r--sys/arch/atari/dev/fd.c54
-rw-r--r--sys/arch/atari/dev/grf.c16
-rw-r--r--sys/arch/atari/dev/grfabs.c6
-rw-r--r--sys/arch/atari/dev/grfabs_et.c22
-rw-r--r--sys/arch/atari/dev/grfabs_et.h10
-rw-r--r--sys/arch/atari/dev/grfabs_fal.c30
-rw-r--r--sys/arch/atari/dev/grfabs_fal.h4
-rw-r--r--sys/arch/atari/dev/grfabs_reg.h34
-rw-r--r--sys/arch/atari/dev/grfabs_tt.c24
-rw-r--r--sys/arch/atari/dev/grfabs_tt.h4
-rw-r--r--sys/arch/atari/dev/grfvar.h28
-rw-r--r--sys/arch/atari/dev/hdfd.c60
-rw-r--r--sys/arch/atari/dev/ite.c68
-rw-r--r--sys/arch/atari/dev/ite_cc.c36
-rw-r--r--sys/arch/atari/dev/ite_et.c34
-rw-r--r--sys/arch/atari/dev/itevar.h36
-rw-r--r--sys/arch/atari/dev/kbd.c18
-rw-r--r--sys/arch/atari/dev/kbdvar.h14
-rw-r--r--sys/arch/atari/dev/md_root.c12
-rw-r--r--sys/arch/atari/dev/ms.c8
-rw-r--r--sys/arch/atari/dev/msvar.h6
-rw-r--r--sys/arch/atari/dev/ncr5380.c16
-rw-r--r--sys/arch/atari/dev/ncr5380reg.h60
-rw-r--r--sys/arch/atari/dev/nvram.c14
-rw-r--r--sys/arch/atari/dev/nvramvar.h4
-rw-r--r--sys/arch/atari/dev/ser.c60
-rw-r--r--sys/arch/atari/dev/view.c16
-rw-r--r--sys/arch/atari/dev/viewvar.h6
-rw-r--r--sys/arch/atari/dev/ym2149reg.h4
-rw-r--r--sys/arch/atari/dev/zs.c32
-rw-r--r--sys/arch/atari/isa/isa_dma.c46
-rw-r--r--sys/arch/atari/isa/isa_hades.c8
-rw-r--r--sys/arch/atari/isa/isa_machdep.c10
-rw-r--r--sys/arch/atari/isa/isa_milan.c6
-rw-r--r--sys/arch/atari/pci/pci_hades.c10
-rw-r--r--sys/arch/atari/pci/pci_machdep.c22
-rw-r--r--sys/arch/atari/pci/pci_milan.c6
-rw-r--r--sys/arch/atari/pci/pciide_machdep.c6
-rw-r--r--sys/arch/atari/stand/ahdilabel/privahdi.h36
-rw-r--r--sys/arch/atari/stand/bootpref/bootpref.c44
-rw-r--r--sys/arch/atari/stand/bootxxx/bootxxx.c6
-rw-r--r--sys/arch/atari/stand/edahdi/edahdi.c26
-rw-r--r--sys/arch/atari/stand/installboot/disklabel.c12
-rw-r--r--sys/arch/atari/stand/installboot/installboot.c26
-rw-r--r--sys/arch/atari/stand/installboot/installboot.h6
-rw-r--r--sys/arch/atari/stand/libsa/atari_stand.h4
-rw-r--r--sys/arch/atari/stand/libsa/diskio.c12
-rw-r--r--sys/arch/atari/stand/loadkmap/loadkmap.c4
-rw-r--r--sys/arch/atari/stand/tostools/libtos/cread.c14
-rw-r--r--sys/arch/atari/vme/et4000.c28
-rw-r--r--sys/arch/atari/vme/leo.c16
-rw-r--r--sys/arch/atari/vme/vme.c14
-rw-r--r--sys/arch/atari/vme/vme_machdep.c10
-rw-r--r--sys/arch/bebox/include/bootinfo.h4
-rw-r--r--sys/arch/bebox/include/powerpc.h6
-rw-r--r--sys/arch/bebox/stand/boot/cons.h12
-rw-r--r--sys/arch/bebox/stand/boot/ns16550.h12
-rw-r--r--sys/arch/cats/pci/pcib.c10
-rw-r--r--sys/arch/cats/pci/pciide_machdep.c6
-rw-r--r--sys/arch/cesfic/cesfic/autoconf.c12
-rw-r--r--sys/arch/cesfic/cesfic/isr.c6
-rw-r--r--sys/arch/cesfic/cesfic/isr.h12
-rw-r--r--sys/arch/cesfic/cesfic/machdep.c30
-rw-r--r--sys/arch/cesfic/cesfic/pmap_bootstrap.c6
-rw-r--r--sys/arch/cesfic/cesfic/sic6351.c10
-rw-r--r--sys/arch/cesfic/cesfic/trap.c20
-rw-r--r--sys/arch/cesfic/dev/zsvar.h16
-rw-r--r--sys/arch/cesfic/include/autoconf.h6
-rw-r--r--sys/arch/cesfic/include/cpu.h18
-rw-r--r--sys/arch/cesfic/include/intr.h4
-rw-r--r--sys/arch/cesfic/include/param.h4
-rw-r--r--sys/arch/cobalt/include/bootinfo.h4
-rw-r--r--sys/arch/cobalt/stand/boot/cons.h12
-rw-r--r--sys/arch/evbarm/ixdp425/ixdp425_machdep.c6
-rw-r--r--sys/arch/evbarm/ixm1200/ixm1200_machdep.c8
-rw-r--r--sys/arch/evbarm/nslu2/nslu2_machdep.c6
-rw-r--r--sys/arch/evbarm/tsarm/isa/isa_machdep.c6
-rw-r--r--sys/arch/evbarm/tsarm/tspld.c6
-rw-r--r--sys/arch/evbppc/ev64260/autoconf.c8
-rw-r--r--sys/arch/evbsh3/evbsh3/machdep.c12
-rw-r--r--sys/arch/hpcmips/include/bus_dma_hpcmips.h6
-rw-r--r--sys/arch/hpcmips/stand/libsa/devopen.c6
-rw-r--r--sys/arch/hpcmips/stand/libsa/winblk.h10
-rw-r--r--sys/arch/hpcmips/stand/libsa/winfs.h18
-rw-r--r--sys/arch/hpcmips/stand/pbsdboot/pbsdboot.h4
-rw-r--r--sys/arch/hpcmips/stand/pbsdboot/tx39xx.c4
-rw-r--r--sys/arch/hpcmips/stand/pbsdboot/vr41xx.c4
-rw-r--r--sys/arch/hpcmips/vr/vrdsiu_mouse.c20
-rw-r--r--sys/arch/hpcsh/include/bus.h48
-rw-r--r--sys/arch/i386/stand/libsa/nfs.c12
-rw-r--r--sys/arch/i386/stand/netboot/dev_net.c4
-rw-r--r--sys/arch/i386/stand/netboot/dev_net.h10
-rw-r--r--sys/arch/i386/stand/netboot/main.c8
-rw-r--r--sys/arch/i386/stand/pxeboot/dev_net.c6
-rw-r--r--sys/arch/i386/stand/pxeboot/dev_net.h10
-rw-r--r--sys/arch/i386/stand/pxeboot/main.c8
-rw-r--r--sys/arch/ia64/ia64/vm_machdep.c4
-rw-r--r--sys/arch/luna68k/dev/lcd.c14
-rw-r--r--sys/arch/luna68k/dev/lunafb.c34
-rw-r--r--sys/arch/luna68k/dev/lunaws.c36
-rw-r--r--sys/arch/luna68k/dev/omrasops.c22
-rw-r--r--sys/arch/luna68k/dev/sio.c14
-rw-r--r--sys/arch/luna68k/dev/siotty.c22
-rw-r--r--sys/arch/luna68k/dev/siovar.h8
-rw-r--r--sys/arch/luna68k/dev/timekeeper.c16
-rw-r--r--sys/arch/luna68k/include/bus.h84
-rw-r--r--sys/arch/luna68k/include/cpu.h16
-rw-r--r--sys/arch/luna68k/include/param.h4
-rw-r--r--sys/arch/luna68k/luna68k/disksubr.c12
-rw-r--r--sys/arch/luna68k/luna68k/isr.c16
-rw-r--r--sys/arch/luna68k/luna68k/isr.h18
-rw-r--r--sys/arch/luna68k/luna68k/machdep.c42
-rw-r--r--sys/arch/luna68k/luna68k/mainbus.c10
-rw-r--r--sys/arch/luna68k/luna68k/pmap_bootstrap.c6
-rw-r--r--sys/arch/luna68k/luna68k/trap.c16
-rw-r--r--sys/arch/m68k/fpe/fpu_arith_proto.h60
-rw-r--r--sys/arch/m68k/fpe/fpu_calcea.c18
-rw-r--r--sys/arch/m68k/fpe/fpu_emulate.c18
-rw-r--r--sys/arch/m68k/fpe/fpu_emulate.h40
-rw-r--r--sys/arch/m68k/fpe/fpu_explode.c12
-rw-r--r--sys/arch/m68k/fpe/fpu_implode.c12
-rw-r--r--sys/arch/m68k/fpe/fpu_log.c6
-rw-r--r--sys/arch/m68k/fpe/fpu_rem.c6
-rw-r--r--sys/arch/m68k/m68k/db_disasm.h4
-rw-r--r--sys/arch/macppc/dev/abtn.c10
-rw-r--r--sys/arch/macppc/dev/adb.c10
-rw-r--r--sys/arch/macppc/dev/adb_direct.c52
-rw-r--r--sys/arch/macppc/dev/adbvar.h34
-rw-r--r--sys/arch/macppc/dev/aed.c18
-rw-r--r--sys/arch/macppc/dev/aedvar.h4
-rw-r--r--sys/arch/macppc/dev/akbd.c26
-rw-r--r--sys/arch/macppc/dev/akbdvar.h6
-rw-r--r--sys/arch/macppc/dev/am79c950.c34
-rw-r--r--sys/arch/macppc/dev/amsvar.h6
-rw-r--r--sys/arch/macppc/dev/apm.c6
-rw-r--r--sys/arch/macppc/dev/if_mc.c26
-rw-r--r--sys/arch/macppc/dev/if_mcvar.h18
-rw-r--r--sys/arch/macppc/dev/ki2c.c4
-rw-r--r--sys/arch/macppc/dev/mediabay.c16
-rw-r--r--sys/arch/macppc/dev/mesh.c62
-rw-r--r--sys/arch/macppc/dev/nvram.c8
-rw-r--r--sys/arch/macppc/dev/ofcons.c8
-rw-r--r--sys/arch/macppc/dev/pm_direct.c28
-rw-r--r--sys/arch/macppc/dev/pm_direct.h30
-rw-r--r--sys/arch/macppc/dev/viareg.h24
-rw-r--r--sys/arch/macppc/dev/zs_kgdb.c16
-rw-r--r--sys/arch/macppc/include/adbsys.h4
-rw-r--r--sys/arch/macppc/include/openpicreg.h4
-rw-r--r--sys/arch/macppc/include/powerpc.h12
-rw-r--r--sys/arch/macppc/macppc/disksubr.c28
-rw-r--r--sys/arch/macppc/macppc/mainbus.c8
-rw-r--r--sys/arch/macppc/macppc/rbus_machdep.c6
-rw-r--r--sys/arch/mips/include/cachectl.h8
-rw-r--r--sys/arch/mipsco/include/autoconf.h6
-rw-r--r--sys/arch/mipsco/include/bootinfo.h4
-rw-r--r--sys/arch/mipsco/include/bus.h330
-rw-r--r--sys/arch/mipsco/include/intr.h4
-rw-r--r--sys/arch/mipsco/include/param.h4
-rw-r--r--sys/arch/mipsco/include/prom.h112
-rw-r--r--sys/arch/mipsco/include/sysconf.h12
-rw-r--r--sys/arch/mipsco/isa/isa_machdep.c18
-rw-r--r--sys/arch/mipsco/mipsco/autoconf.c8
-rw-r--r--sys/arch/mipsco/mipsco/bus_dma.c10
-rw-r--r--sys/arch/mipsco/mipsco/cpu.c6
-rw-r--r--sys/arch/mipsco/mipsco/disksubr.c18
-rw-r--r--sys/arch/mipsco/mipsco/machdep.c48
-rw-r--r--sys/arch/mipsco/mipsco/mainbus.c10
-rw-r--r--sys/arch/mipsco/obio/obio.c20
-rw-r--r--sys/arch/mipsco/obio/rambo.c10
-rw-r--r--sys/arch/mipsco/obio/zs_kgdb.c22
-rw-r--r--sys/arch/mipsco/stand/common/boot.c10
-rw-r--r--sys/arch/mipsco/stand/common/bootinfo.h6
-rw-r--r--sys/arch/mipsco/stand/common/bootxx.c10
-rw-r--r--sys/arch/mipsco/stand/common/callvec.c4
-rw-r--r--sys/arch/mipsco/stand/common/common.h12
-rw-r--r--sys/arch/mipsco/stand/common/saio.c10
-rw-r--r--sys/arch/mipsco/stand/common/saio.h10
-rw-r--r--sys/arch/mipsco/stand/installboot/installboot.c20
-rw-r--r--sys/arch/mmeye/mmeye/machdep.c14
-rw-r--r--sys/arch/mmeye/stand/bootcoff/osloader.c8
-rw-r--r--sys/arch/mmeye/stand/bootelf/boot.c4
-rw-r--r--sys/arch/mvmeppc/include/autoconf.h8
-rw-r--r--sys/arch/mvmeppc/include/powerpc.h8
-rw-r--r--sys/arch/netwinder/include/pci_machdep.h6
-rw-r--r--sys/arch/netwinder/pci/pcib.c10
-rw-r--r--sys/arch/netwinder/pci/pciide_machdep.c6
-rw-r--r--sys/arch/ofppc/include/powerpc.h8
-rw-r--r--sys/arch/pmax/ibus/ibus.c6
-rw-r--r--sys/arch/pmax/ibus/ibus_3max.c8
-rw-r--r--sys/arch/pmax/ibus/ibus_pmax.c8
-rw-r--r--sys/arch/pmax/ibus/ibusvar.h10
-rw-r--r--sys/arch/pmax/ibus/mcclock_ibus.c12
-rw-r--r--sys/arch/pmax/ibus/sii.c24
-rw-r--r--sys/arch/pmax/ibus/sii_ds.c28
-rw-r--r--sys/arch/pmax/ibus/siivar.h14
-rw-r--r--sys/arch/pmax/include/autoconf.h4
-rw-r--r--sys/arch/pmax/include/bootinfo.h4
-rw-r--r--sys/arch/pmax/include/bus.h216
-rw-r--r--sys/arch/pmax/include/dec_prom.h88
-rw-r--r--sys/arch/pmax/include/intr.h4
-rw-r--r--sys/arch/pmax/include/param.h4
-rw-r--r--sys/arch/pmax/include/sysconf.h24
-rw-r--r--sys/arch/pmax/pmax/bus_dma.c10
-rw-r--r--sys/arch/pmax/pmax/cpu.c8
-rw-r--r--sys/arch/pmax/pmax/dec_3100.c20
-rw-r--r--sys/arch/pmax/pmax/dec_3max.c22
-rw-r--r--sys/arch/pmax/pmax/dec_3maxplus.c22
-rw-r--r--sys/arch/pmax/pmax/dec_3min.c20
-rw-r--r--sys/arch/pmax/pmax/dec_5100.c20
-rw-r--r--sys/arch/pmax/pmax/dec_maxine.c20
-rw-r--r--sys/arch/pmax/pmax/disksubr.c14
-rw-r--r--sys/arch/pmax/pmax/machdep.c22
-rw-r--r--sys/arch/pmax/pmax/machdep.h16
-rw-r--r--sys/arch/pmax/pmax/mainbus.c10
-rw-r--r--sys/arch/pmax/pmax/memc.h8
-rw-r--r--sys/arch/pmax/pmax/promcall.c10
-rw-r--r--sys/arch/pmax/pmax/sysconf.c22
-rw-r--r--sys/arch/pmax/stand/common/boot.c6
-rw-r--r--sys/arch/pmax/stand/common/bootinfo.h6
-rw-r--r--sys/arch/pmax/stand/common/bootxx.c10
-rw-r--r--sys/arch/pmax/stand/common/callvec.c88
-rw-r--r--sys/arch/pmax/stand/common/common.h22
-rw-r--r--sys/arch/pmax/stand/common/if_prom.c18
-rw-r--r--sys/arch/pmax/stand/common/rz.h10
-rw-r--r--sys/arch/pmax/stand/smallnet/setnetimage/setnetimage.c4
-rw-r--r--sys/arch/pmax/stand/smallnet/smallnet.c6
-rw-r--r--sys/arch/pmax/tc/ioasic.c10
-rw-r--r--sys/arch/pmax/tc/mcclock_ioasic.c12
-rw-r--r--sys/arch/pmax/tc/tcbus.c22
-rw-r--r--sys/arch/powerpc/ibm4xx/pmap.c10
-rw-r--r--sys/arch/powerpc/ibm4xx/trap.c22
-rw-r--r--sys/arch/powerpc/include/db_machdep.h6
-rw-r--r--sys/arch/powerpc/include/ibm4xx/cpu.h8
-rw-r--r--sys/arch/powerpc/include/openpic.h10
-rw-r--r--sys/arch/powerpc/include/pio.h52
-rw-r--r--sys/arch/powerpc/marvell/bus_dma.c8
-rw-r--r--sys/arch/powerpc/marvell/extintr.c6
-rw-r--r--sys/arch/powerpc/marvell/marvell_intr.h32
-rw-r--r--sys/arch/powerpc/powerpc/ipkdb_glue.c6
-rw-r--r--sys/arch/prep/stand/boot/boot.c4
-rw-r--r--sys/arch/rs6000/stand/boot/boot.c4
-rw-r--r--sys/arch/sandpoint/include/powerpc.h8
-rw-r--r--sys/arch/sandpoint/isa/isaclock.c8
-rw-r--r--sys/arch/sbmips/stand/common/blkdev.h8
-rw-r--r--sys/arch/sbmips/stand/common/common.h6
-rw-r--r--sys/arch/sbmips/stand/netboot/dev_net.c6
-rw-r--r--sys/arch/shark/include/iic.h10
-rw-r--r--sys/arch/shark/include/kbd.h6
-rw-r--r--sys/arch/shark/isa/isa_shark_machdep.c6
-rw-r--r--sys/arch/shark/isa/isadma_machdep.c46
-rw-r--r--sys/arch/shark/ofw/lpt_ofisa_machdep.c6
-rw-r--r--sys/arch/shark/ofw/ofisapc.c8
-rw-r--r--sys/arch/shark/ofw/ofisascr.c8
-rw-r--r--sys/arch/shark/ofw/ofrom.c8
-rw-r--r--sys/arch/shark/ofw/ofw.c44
-rw-r--r--sys/arch/shark/shark/autoconf.c18
-rw-r--r--sys/arch/shark/shark/i8042reg.h18
-rw-r--r--sys/arch/shark/shark/opms.c14
-rw-r--r--sys/arch/shark/shark/scr.c54
-rw-r--r--sys/arch/shark/shark/sequoia.h38
-rw-r--r--sys/arch/shark/shark/shark_machdep.c22
-rw-r--r--sys/arch/vax/boot/boot/consio.c30
-rw-r--r--sys/arch/vax/boot/boot/ctu.c6
-rw-r--r--sys/arch/vax/vax/vm_machdep.c6
-rw-r--r--sys/arch/x68k/stand/aout2hux/aout2hux.c6
-rw-r--r--sys/arch/x68k/stand/boot_ufs/boot_ufs.h16
-rw-r--r--sys/arch/x68k/stand/boot_ufs/readufs.c12
-rw-r--r--sys/arch/x68k/stand/boot_ufs/readufs.h22
-rw-r--r--sys/arch/x68k/stand/boot_ufs/readufs_ffs.c4
-rw-r--r--sys/arch/x68k/stand/boot_ufs/readufs_lfs.c4
-rw-r--r--sys/arch/x68k/stand/common/exec_sub.c14
-rw-r--r--sys/arch/x68k/stand/common/execkern.h6
-rw-r--r--sys/arch/x68k/stand/common/xprintf.c4
-rw-r--r--sys/arch/x68k/stand/common/xprintf.h20
-rw-r--r--sys/arch/x68k/stand/libdos/dos.h378
-rw-r--r--sys/arch/x68k/stand/libdos/dos_errno.h4
-rw-r--r--sys/arch/x68k/stand/libiocs/iocs.h436
-rw-r--r--sys/arch/x68k/stand/loadbsd/loadbsd.c24
-rw-r--r--sys/arch/x68k/stand/newdisk/newdisk.c4
-rw-r--r--sys/arch/x68k/usr.bin/rtcalarm/rtcalarm.c18
-rw-r--r--sys/arch/x86/isa/isa_machdep.c6
-rw-r--r--sys/arch/x86/x86/bus_dma.c6
-rw-r--r--sys/arch/xen/xen/isa_machdep.c8
-rw-r--r--sys/arch/xen/xen/pciide_machdep.c6
-rw-r--r--sys/crypto/blowfish/blowfish.h8
-rw-r--r--sys/crypto/des/des.h44
-rw-r--r--sys/ddb/db_output.h4
-rw-r--r--sys/dev/ic/mb86950.c32
-rw-r--r--sys/dev/ic/mb86950var.h26
-rw-r--r--sys/dev/mca/if_tra_mca.c10
-rw-r--r--sys/dist/ipf/netinet/fil.c5
-rw-r--r--sys/fs/adosfs/adosfs.h24
-rw-r--r--sys/fs/adosfs/adutil.c6
-rw-r--r--sys/fs/adosfs/advfsops.c10
-rw-r--r--sys/fs/adosfs/advnops.c32
-rw-r--r--sys/fs/filecorefs/filecore_extern.h12
-rw-r--r--sys/fs/filecorefs/filecore_node.h50
-rw-r--r--sys/fs/filecorefs/filecore_vfsops.c8
-rw-r--r--sys/fs/filecorefs/filecore_vnops.c6
-rw-r--r--sys/fs/udf/udf_vnops.c6
-rw-r--r--sys/ipkdb/ipkdb.h42
-rw-r--r--sys/ipkdb/ipkdb_ipkdb.c52
-rw-r--r--sys/kern/subr_tftproot.c6
-rw-r--r--sys/lib/libkern/__main.c4
-rw-r--r--sys/lib/libkern/intoa.c4
-rw-r--r--sys/lib/libkern/libkern.h129
-rw-r--r--sys/net/bpfdesc.h4
-rw-r--r--sys/net/if_ether.h12
-rw-r--r--sys/net/zlib.c194
-rw-r--r--sys/net/zlib.h106
-rw-r--r--sys/netatalk/ddp_input.c8
-rw-r--r--sys/netatalk/ddp_usrreq.c16
-rw-r--r--sys/netinet6/ah.h26
-rw-r--r--sys/netinet6/ah_aesxcbcmac.h14
-rw-r--r--sys/netinet6/ah_core.c124
-rw-r--r--sys/netinet6/ah_output.c6
-rw-r--r--sys/netinet6/esp.h50
-rw-r--r--sys/netinet6/esp_aesctr.h18
-rw-r--r--sys/netinet6/esp_core.c90
-rw-r--r--sys/netinet6/esp_output.c8
-rw-r--r--sys/netinet6/esp_rijndael.h16
-rw-r--r--sys/netinet6/in6_gif.c8
-rw-r--r--sys/netinet6/ipsec.c68
-rw-r--r--sys/netinet6/ipsec.h108
-rw-r--r--sys/netipsec/keysock.c6
-rw-r--r--sys/netisdn/i4b_ctl.c12
-rw-r--r--sys/netisdn/i4b_i4bdrv.c20
-rw-r--r--sys/netisdn/i4b_ipr.c6
-rw-r--r--sys/netisdn/i4b_l2.h6
-rw-r--r--sys/netisdn/i4b_l2fsm.c154
-rw-r--r--sys/netisdn/i4b_rbch.c22
-rw-r--r--sys/netisdn/i4b_tel.c22
-rw-r--r--sys/netisdn/i4b_trace.c14
-rw-r--r--sys/netkey/key.c248
-rw-r--r--sys/netkey/key.h58
-rw-r--r--sys/netkey/key_debug.c30
-rw-r--r--sys/netkey/key_debug.h24
-rw-r--r--sys/netkey/keydb.h26
-rw-r--r--sys/netkey/keysock.c10
-rw-r--r--sys/netkey/keysock.h14
-rw-r--r--sys/netnatm/natm.h22
-rw-r--r--sys/netnatm/natm_pcb.c6
-rw-r--r--sys/nfs/krpc.h18
-rw-r--r--sys/nfs/krpc_subr.c6
-rw-r--r--sys/nfs/nfs_bio.c10
-rw-r--r--sys/nfs/nfs_srvsocket.c8
-rw-r--r--sys/nfs/nfs_subs.c16
-rw-r--r--sys/nfs/nfs_syscalls.c14
-rw-r--r--sys/nfs/nfs_var.h4
-rw-r--r--sys/nfs/nfs_vfsops.c8
-rw-r--r--sys/nfs/nfs_vnops.c10
-rw-r--r--sys/nfs/nfsmount.h18
-rw-r--r--sys/nfs/nfsnode.h80
-rw-r--r--sys/stand/ls.c8
-rw-r--r--sys/sys/exec_ecoff.h14
542 files changed, 6466 insertions, 6466 deletions
diff --git a/sys/arch/acorn32/acorn32/autoconf.c b/sys/arch/acorn32/acorn32/autoconf.c
index 7b56ad51ba0..60dac034c18 100644
--- a/sys/arch/acorn32/acorn32/autoconf.c
+++ b/sys/arch/acorn32/acorn32/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.13 2008/02/14 00:25:39 joerg Exp $ */
+/* $NetBSD: autoconf.c,v 1.14 2009/03/14 14:45:51 dsl Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.13 2008/02/14 00:25:39 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2009/03/14 14:45:51 dsl Exp $");
#include "opt_md.h"
@@ -65,12 +65,12 @@ extern char *booted_kernel;
extern dev_t dumpdev;
-void dumpconf __P((void));
-void isa_intr_init __P((void));
+void dumpconf(void);
+void isa_intr_init(void);
#ifndef MEMORY_DISK_IS_ROOT
-static void get_device __P((char *name));
-static void set_root_device __P((void));
+static void get_device(char *name);
+static void set_root_device(void);
#endif
#ifndef MEMORY_DISK_IS_ROOT
diff --git a/sys/arch/acorn32/dev/md_hooks.c b/sys/arch/acorn32/dev/md_hooks.c
index 6743be49c10..da45c8845be 100644
--- a/sys/arch/acorn32/dev/md_hooks.c
+++ b/sys/arch/acorn32/dev/md_hooks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md_hooks.c,v 1.8 2007/03/04 05:59:06 christos Exp $ */
+/* $NetBSD: md_hooks.c,v 1.9 2009/03/14 14:45:51 dsl Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md_hooks.c,v 1.8 2007/03/04 05:59:06 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md_hooks.c,v 1.9 2009/03/14 14:45:51 dsl Exp $");
#include "opt_md.h"
@@ -56,7 +56,7 @@ char md_root_image[ROOTBYTES] = "|This is the root ramdisk!\n";
size_t md_root_size = 0; /* set by machdep.c */
static struct md_conf *bootmd = NULL;
-extern int load_memory_disc_from_floppy __P((struct md_conf *md, dev_t dev));
+extern int load_memory_disc_from_floppy(struct md_conf *md, dev_t dev);
#include "fdc.h"
#endif /* MEMORY_DISK_ROOT_SIZE */
diff --git a/sys/arch/acorn32/include/iic.h b/sys/arch/acorn32/include/iic.h
index 936463aaf86..71812080b25 100644
--- a/sys/arch/acorn32/include/iic.h
+++ b/sys/arch/acorn32/include/iic.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iic.h,v 1.1 2001/10/05 22:27:50 reinoud Exp $ */
+/* $NetBSD: iic.h,v 1.2 2009/03/14 14:45:51 dsl Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -58,13 +58,13 @@ struct iicbus_attach_args {
/* Prototypes for assembly functions */
-void iic_set_state __P((int data, int clock));
-void iic_set_state_and_ack __P((int data, int clock));
-void iic_delay __P((int delay));
+void iic_set_state(int data, int clock);
+void iic_set_state_and_ack(int data, int clock);
+void iic_delay(int delay);
/* Prototype for kernel interface to IIC bus */
-int iic_control __P((u_char address, u_char *buffer, int count));
+int iic_control(u_char address, u_char *buffer, int count);
#endif /* _KERNEL */
diff --git a/sys/arch/acorn32/include/irqhandler.h b/sys/arch/acorn32/include/irqhandler.h
index 513197edcff..50d99639265 100644
--- a/sys/arch/acorn32/include/irqhandler.h
+++ b/sys/arch/acorn32/include/irqhandler.h
@@ -1,4 +1,4 @@
-/* $NetBSD: irqhandler.h,v 1.8 2008/04/29 17:09:47 matt Exp $ */
+/* $NetBSD: irqhandler.h,v 1.9 2009/03/14 14:45:51 dsl Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -184,7 +184,7 @@
#ifndef _LOCORE
typedef struct irqhandler {
- int (*ih_func) __P((void *arg));/* handler function */
+ int (*ih_func)(void *arg);/* handler function */
void *ih_arg; /* Argument to handler */
int ih_level; /* Interrupt level */
int ih_num; /* Interrupt number (for accounting) */
@@ -199,15 +199,15 @@ typedef struct irqhandler {
extern u_int irqmasks[NIPL];
extern irqhandler_t *irqhandlers[NIRQS];
-void irq_init __P((void));
-int irq_claim __P((int, irqhandler_t *));
-int irq_release __P((int, irqhandler_t *));
-void *intr_claim __P((int irq, int level, const char *name, int (*func) __P((void *)), void *arg));
-int intr_release __P((void *ih));
-void irq_setmasks __P((void));
-void disable_irq __P((int));
-void enable_irq __P((int));
-void stray_irqhandler __P((u_int));
+void irq_init(void);
+int irq_claim(int, irqhandler_t *);
+int irq_release(int, irqhandler_t *);
+void *intr_claim(int irq, int level, const char *name, int (*func)(void *), void *arg);
+int intr_release(void *ih);
+void irq_setmasks(void);
+void disable_irq(int);
+void enable_irq(int);
+void stray_irqhandler(u_int);
#endif /* _KERNEL */
#endif /* _LOCORE */
diff --git a/sys/arch/acorn32/include/loadfile_machdep.h b/sys/arch/acorn32/include/loadfile_machdep.h
index 658e5612b02..39a14423874 100644
--- a/sys/arch/acorn32/include/loadfile_machdep.h
+++ b/sys/arch/acorn32/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2008/04/28 20:23:09 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2009/03/14 14:45:51 dsl Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -69,9 +69,9 @@ extern void *boot32_memset(void *, int, size_t);
#define DEALLOC(a, b) free(a)
#define OKMAGIC(a) ((a) == OMAGIC)
-ssize_t vread __P((int, u_long, u_long *, size_t));
-void vcopy __P((u_long, u_long, u_long *, size_t));
-void vzero __P((u_long, u_long *, size_t));
+ssize_t vread(int, u_long, u_long *, size_t);
+void vcopy(u_long, u_long, u_long *, size_t);
+void vzero(u_long, u_long *, size_t);
#endif
#endif
diff --git a/sys/arch/acorn32/include/podulebus_machdep.h b/sys/arch/acorn32/include/podulebus_machdep.h
index eb71de5b950..4120b05b96b 100644
--- a/sys/arch/acorn32/include/podulebus_machdep.h
+++ b/sys/arch/acorn32/include/podulebus_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus_machdep.h,v 1.1 2001/10/05 22:27:52 reinoud Exp $ */
+/* $NetBSD: podulebus_machdep.h,v 1.2 2009/03/14 14:45:51 dsl Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -150,15 +150,15 @@ struct podule_attach_args {
extern podule_t podules[MAX_PODULES + MAX_NETSLOTS];
-int matchpodule __P((struct podule_attach_args *pa,
- int manufacturer, int product, int required_slot));
+int matchpodule(struct podule_attach_args *pa,
+ int manufacturer, int product, int required_slot);
-void netslot_ea __P((u_int8_t *buffer));
+void netslot_ea(u_int8_t *buffer);
-extern void *podulebus_irq_establish __P((podulebus_intr_handle_t, int,
- int (*)(void *), void *, struct evcnt *));
-extern void podulebus_shift_tag __P((bus_space_tag_t, u_int,
- bus_space_tag_t *));
+extern void *podulebus_irq_establish(podulebus_intr_handle_t, int,
+ int (*)(void *), void *, struct evcnt *);
+extern void podulebus_shift_tag(bus_space_tag_t, u_int,
+ bus_space_tag_t *);
/* Used internally by the podulebus code */
extern void netslotscan(struct device *);
diff --git a/sys/arch/acorn32/mainbus/fd.c b/sys/arch/acorn32/mainbus/fd.c
index a6fa34e6228..fead6d615d0 100644
--- a/sys/arch/acorn32/mainbus/fd.c
+++ b/sys/arch/acorn32/mainbus/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.42 2009/02/14 18:00:26 cegger Exp $ */
+/* $NetBSD: fd.c,v 1.43 2009/03/14 14:45:51 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.42 2009/02/14 18:00:26 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.43 2009/03/14 14:45:51 dsl Exp $");
#include "opt_ddb.h"
@@ -174,9 +174,9 @@ struct fdc_softc {
};
/* controller driver configuration */
-int fdcprobe __P((struct device *, struct cfdata *, void *));
-int fdprint __P((void *, const char *));
-void fdcattach __P((struct device *, struct device *, void *));
+int fdcprobe(struct device *, struct cfdata *, void *);
+int fdprint(void *, const char *);
+void fdcattach(struct device *, struct device *, void *);
CFATTACH_DECL(fdc, sizeof(struct fdc_softc),
fdcprobe, fdcattach, NULL, NULL);
@@ -249,8 +249,8 @@ struct fd_softc {
};
/* floppy driver configuration */
-int fdprobe __P((struct device *, struct cfdata *, void *));
-void fdattach __P((struct device *, struct device *, void *));
+int fdprobe(struct device *, struct cfdata *, void *);
+void fdattach(struct device *, struct device *, void *);
extern char floppy_read_fiq[], floppy_read_fiq_end[];
extern char floppy_write_fiq[], floppy_write_fiq_end[];
@@ -276,27 +276,27 @@ const struct cdevsw fd_cdevsw = {
nostop, notty, nopoll, nommap, nokqfilter, D_DISK
};
-void fdgetdisklabel __P((struct fd_softc *));
-int fd_get_parms __P((struct fd_softc *));
-void fdstart __P((struct fd_softc *));
+void fdgetdisklabel(struct fd_softc *);
+int fd_get_parms(struct fd_softc *);
+void fdstart(struct fd_softc *);
struct dkdriver fddkdriver = { fdstrategy };
-struct fd_type *fd_nvtotype __P((char *, int, int));
-void fd_set_motor __P((struct fdc_softc *fdc, int reset));
-void fd_motor_off __P((void *arg));
-void fd_motor_on __P((void *arg));
-int fdcresult __P((struct fdc_softc *fdc));
-int out_fdc __P((bus_space_tag_t iot, bus_space_handle_t ioh, u_char x));
-void fdcstart __P((struct fdc_softc *fdc));
-void fdcstatus __P((struct device *dv, int n, const char *s));
-void fdctimeout __P((void *arg));
-void fdcpseudointr __P((void *arg));
-int fdcintr __P((void *));
-void fdcretry __P((struct fdc_softc *fdc));
-void fdfinish __P((struct fd_softc *fd, struct buf *bp));
-inline struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t));
-int fdformat __P((dev_t, struct ne7_fd_formb *, struct lwp *));
+struct fd_type *fd_nvtotype(char *, int, int);
+void fd_set_motor(struct fdc_softc *fdc, int reset);
+void fd_motor_off(void *arg);
+void fd_motor_on(void *arg);
+int fdcresult(struct fdc_softc *fdc);
+int out_fdc(bus_space_tag_t iot, bus_space_handle_t ioh, u_char x);
+void fdcstart(struct fdc_softc *fdc);
+void fdcstatus(struct device *dv, int n, const char *s);
+void fdctimeout(void *arg);
+void fdcpseudointr(void *arg);
+int fdcintr(void *);
+void fdcretry(struct fdc_softc *fdc);
+void fdfinish(struct fd_softc *fd, struct buf *bp);
+inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
+int fdformat(dev_t, struct ne7_fd_formb *, struct lwp *);
int
fdcprobe(parent, cf, aux)
@@ -1524,7 +1524,7 @@ fdformat(dev_t dev, struct ne7_fd_formb *finfo, struct lwp *l)
#include <dev/md.h>
-int load_memory_disc_from_floppy __P((struct md_conf *md, dev_t dev));
+int load_memory_disc_from_floppy(struct md_conf *md, dev_t dev);
int
load_memory_disc_from_floppy(md, dev)
diff --git a/sys/arch/acorn32/mainbus/pioc.c b/sys/arch/acorn32/mainbus/pioc.c
index 8650faf80ef..5f95e034f43 100644
--- a/sys/arch/acorn32/mainbus/pioc.c
+++ b/sys/arch/acorn32/mainbus/pioc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pioc.c,v 1.12 2005/12/11 12:16:05 christos Exp $ */
+/* $NetBSD: pioc.c,v 1.13 2009/03/14 14:45:51 dsl Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -41,7 +41,7 @@
/*#define PIOC_DEBUG*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.12 2005/12/11 12:16:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pioc.c,v 1.13 2009/03/14 14:45:51 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -91,16 +91,16 @@ bus_space_tag_t comconstag = &mainbus_bs_tag;
/* Prototypes for functions */
-static int piocmatch __P((struct device *, struct cfdata *, void *));
-static void piocattach __P((struct device *, struct device *, void *));
-static int piocprint __P((void *aux, const char *name));
+static int piocmatch(struct device *, struct cfdata *, void *);
+static void piocattach(struct device *, struct device *, void *);
+static int piocprint(void *aux, const char *name);
#if 0
-static int piocsearch __P((struct device *, struct cfdata *, void *));
+static int piocsearch(struct device *, struct cfdata *, void *);
#endif
-static int piocsubmatch __P((struct device *, struct cfdata *,
- const int *, void *));
-static void piocgetid __P((bus_space_tag_t iot, bus_space_handle_t ioh,
- int config_entry, int *id, int *revision));
+static int piocsubmatch(struct device *, struct cfdata *,
+ const int *, void *);
+static void piocgetid(bus_space_tag_t iot, bus_space_handle_t ioh,
+ int config_entry, int *id, int *revision);
/* device attach and driver structure */
diff --git a/sys/arch/acorn32/podulebus/esc.c b/sys/arch/acorn32/podulebus/esc.c
index 87cc0c19945..eec75013287 100644
--- a/sys/arch/acorn32/podulebus/esc.c
+++ b/sys/arch/acorn32/podulebus/esc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esc.c,v 1.18 2006/03/08 23:46:22 lukem Exp $ */
+/* $NetBSD: esc.c,v 1.19 2009/03/14 14:45:51 dsl Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.18 2006/03/08 23:46:22 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.19 2009/03/14 14:45:51 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,21 +108,21 @@ __KERNEL_RCSID(0, "$NetBSD: esc.c,v 1.18 2006/03/08 23:46:22 lukem Exp $");
#include <acorn32/podulebus/escreg.h>
#include <acorn32/podulebus/escvar.h>
-void escinitialize __P((struct esc_softc *));
-void esc_minphys __P((struct buf *bp));
-void esc_scsi_request __P((struct scsipi_channel *,
- scsipi_adapter_req_t, void *));
-void esc_donextcmd __P((struct esc_softc *dev, struct esc_pending *pendp));
-void esc_scsidone __P((struct esc_softc *dev, struct scsipi_xfer *xs,
- int stat));
-void escintr __P((struct esc_softc *dev));
-void esciwait __P((struct esc_softc *dev));
-void escreset __P((struct esc_softc *dev, int how));
-int escselect __P((struct esc_softc *dev, struct esc_pending *pendp,
+void escinitialize(struct esc_softc *);
+void esc_minphys(struct buf *bp);
+void esc_scsi_request(struct scsipi_channel *,
+ scsipi_adapter_req_t, void *);
+void esc_donextcmd(struct esc_softc *dev, struct esc_pending *pendp);
+void esc_scsidone(struct esc_softc *dev, struct scsipi_xfer *xs,
+ int stat);
+void escintr(struct esc_softc *dev);
+void esciwait(struct esc_softc *dev);
+void escreset(struct esc_softc *dev, int how);
+int escselect(struct esc_softc *dev, struct esc_pending *pendp,
unsigned char *cbuf, int clen,
- unsigned char *buf, int len, int mode));
-void escicmd __P((struct esc_softc *dev, struct esc_pending *pendp));
-int escgo __P((struct esc_softc *dev, struct esc_pending *pendp));
+ unsigned char *buf, int len, int mode);
+void escicmd(struct esc_softc *dev, struct esc_pending *pendp);
+int escgo(struct esc_softc *dev, struct esc_pending *pendp);
void esc_init_nexus(struct esc_softc *, struct nexus *);
void esc_save_pointers(struct esc_softc *);
diff --git a/sys/arch/acorn32/podulebus/escvar.h b/sys/arch/acorn32/podulebus/escvar.h
index d3bebf815d1..196f30b6036 100644
--- a/sys/arch/acorn32/podulebus/escvar.h
+++ b/sys/arch/acorn32/podulebus/escvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: escvar.h,v 1.6 2005/12/11 12:16:05 christos Exp $ */
+/* $NetBSD: escvar.h,v 1.7 2009/03/14 14:45:51 dsl Exp $ */
/*
* Copyright (c) 1995 Daniel Widenfalk
@@ -259,10 +259,10 @@ struct esc_softc {
#define ESC_SLOW_CABLE 0x08 /* Cable is "unsafe" for fast scsi-2 */
#define ESC_SLOW_START 0x10 /* There are slow starters on the bus */
-void escinitialize __P((struct esc_softc *sc));
-void esc_minphys __P((struct buf *bp));
-void esc_scsi_request __P((struct scsipi_channel *,
- scsipi_adapter_req_t, void *));
-void escintr __P((struct esc_softc *dev));
+void escinitialize(struct esc_softc *sc);
+void esc_minphys(struct buf *bp);
+void esc_scsi_request(struct scsipi_channel *,
+ scsipi_adapter_req_t, void *);
+void escintr(struct esc_softc *dev);
#endif /* _ESCVAR_H_ */
diff --git a/sys/arch/acorn32/podulebus/if_ie.c b/sys/arch/acorn32/podulebus/if_ie.c
index 415f8f41998..71bce53e0d9 100644
--- a/sys/arch/acorn32/podulebus/if_ie.c
+++ b/sys/arch/acorn32/podulebus/if_ie.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.20 2008/11/07 00:20:01 dyoung Exp $ */
+/* $NetBSD: if_ie.c,v 1.21 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.20 2008/11/07 00:20:01 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie.c,v 1.21 2009/03/14 14:45:52 dsl Exp $");
#define IGNORE_ETHER1_IDROM_CHECKSUM
@@ -159,25 +159,25 @@ struct ie_softc {
/* Function and data prototypes */
-static void host2ie __P(( struct ie_softc *sc, void *src, u_long dest, int size ));
-static void ie2host __P(( struct ie_softc *sc, u_long src, void *dest, int size ));
-static void iezero __P(( struct ie_softc *sc, u_long p, int size ));
-void iereset __P(( struct ie_softc *sc ));
-void iewatchdog __P(( struct ifnet *ifp ));
-int ieioctl __P(( struct ifnet *ifp, u_long cmd, void *data ));
-void iestart __P(( struct ifnet *ifp ));
-int iestop __P(( struct ie_softc *sc ));
-int ieinit __P(( struct ie_softc *sc ));
-int ieintr __P(( void *arg ));
-void ietint __P(( struct ie_softc *sc ));
+static void host2ie( struct ie_softc *sc, void *src, u_long dest, int size );
+static void ie2host( struct ie_softc *sc, u_long src, void *dest, int size );
+static void iezero( struct ie_softc *sc, u_long p, int size );
+void iereset( struct ie_softc *sc );
+void iewatchdog( struct ifnet *ifp );
+int ieioctl( struct ifnet *ifp, u_long cmd, void *data );
+void iestart( struct ifnet *ifp );
+int iestop( struct ie_softc *sc );
+int ieinit( struct ie_softc *sc );
+int ieintr( void *arg );
+void ietint( struct ie_softc *sc );
/* A whopper of a function */
-static int command_and_wait __P(( struct ie_softc *sc, u_short cmd,
+static int command_and_wait( struct ie_softc *sc, u_short cmd,
struct ie_sys_ctl_block *pscb,
- void *pcmd, int ocmd, int scmd, int mask ));
+ void *pcmd, int ocmd, int scmd, int mask );
-int ieprobe __P((struct device *, struct cfdata *, void *));
-void ieattach __P((struct device *, struct device *, void *));
+int ieprobe(struct device *, struct cfdata *, void *);
+void ieattach(struct device *, struct device *, void *);
static inline void ie_cli(struct ie_softc *);
static inline void ieattn(struct ie_softc *);
diff --git a/sys/arch/acorn32/podulebus/netslot.c b/sys/arch/acorn32/podulebus/netslot.c
index 3dd56991fd1..1dee3a39ebd 100644
--- a/sys/arch/acorn32/podulebus/netslot.c
+++ b/sys/arch/acorn32/podulebus/netslot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: netslot.c,v 1.6 2002/10/05 17:16:34 chs Exp $ */
+/* $NetBSD: netslot.c,v 1.7 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -35,7 +35,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.6 2002/10/05 17:16:34 chs Exp $");
+__KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.7 2009/03/14 14:45:52 dsl Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(1, "$NetBSD: netslot.c,v 1.6 2002/10/05 17:16:34 chs Exp $");
#include <dev/podulebus/podulebus.h>
#include <dev/podulebus/podules.h>
-u_int netslotread __P((u_int, int));
+u_int netslotread(u_int, int);
u_int
netslotread(address, offset)
diff --git a/sys/arch/acorn32/podulebus/podulebus.c b/sys/arch/acorn32/podulebus/podulebus.c
index 83147362dbb..dc837722426 100644
--- a/sys/arch/acorn32/podulebus/podulebus.c
+++ b/sys/arch/acorn32/podulebus/podulebus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.20 2005/12/11 12:16:05 christos Exp $ */
+/* $NetBSD: podulebus.c,v 1.21 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -43,7 +43,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.20 2005/12/11 12:16:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: podulebus.c,v 1.21 2009/03/14 14:45:52 dsl Exp $");
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -72,7 +72,7 @@ extern struct bus_space podulebus_bs_tag;
/* Declare prototypes */
-u_int poduleread __P((u_int, int));
+u_int poduleread(u_int, int);
int podulebusmatch(struct device *, struct cfdata *, void *);
void podulebusattach(struct device *, struct device *, void *);
int podulebusprint(void *, const char *);
@@ -562,7 +562,7 @@ void *
podulebus_irq_establish(ih, ipl, func, arg, ev)
podulebus_intr_handle_t ih;
int ipl;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
struct evcnt *ev;
{
diff --git a/sys/arch/acorn32/podulebus/ptsc.c b/sys/arch/acorn32/podulebus/ptsc.c
index e82fcf17b83..49243d1b92e 100644
--- a/sys/arch/acorn32/podulebus/ptsc.c
+++ b/sys/arch/acorn32/podulebus/ptsc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ptsc.c,v 1.13 2005/12/11 12:16:05 christos Exp $ */
+/* $NetBSD: ptsc.c,v 1.14 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.13 2005/12/11 12:16:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.14 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,8 +98,8 @@ __KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.13 2005/12/11 12:16:05 christos Exp $");
#include <dev/podulebus/podules.h>
#include <dev/podulebus/powerromreg.h>
-int ptscmatch __P((struct device *, struct cfdata *, void *));
-void ptscattach __P((struct device *, struct device *, void *));
+int ptscmatch(struct device *, struct cfdata *, void *);
+void ptscattach(struct device *, struct device *, void *);
CFATTACH_DECL(ptsc, sizeof(struct ptsc_softc),
ptscmatch, ptscattach, NULL, NULL);
diff --git a/sys/arch/acorn32/podulebus/sfasvar.h b/sys/arch/acorn32/podulebus/sfasvar.h
index dc746f9ad45..fc2c11203ca 100644
--- a/sys/arch/acorn32/podulebus/sfasvar.h
+++ b/sys/arch/acorn32/podulebus/sfasvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sfasvar.h,v 1.5 2005/12/11 12:16:05 christos Exp $ */
+/* $NetBSD: sfasvar.h,v 1.6 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995 Daniel Widenfalk
@@ -259,10 +259,10 @@ struct sfas_softc {
#define SFAS_SLOW_CABLE 0x08 /* Cable is "unsafe" for fast scsi-2 */
#define SFAS_SLOW_START 0x10 /* There are slow starters on the bus */
-void sfasinitialize __P((struct sfas_softc *sc));
-void sfas_minphys __P((struct buf *bp));
-void sfas_scsi_request __P((struct scsipi_channel *,
- scsipi_adapter_req_t, void *));
-void sfasintr __P((struct sfas_softc *dev));
+void sfasinitialize(struct sfas_softc *sc);
+void sfas_minphys(struct buf *bp);
+void sfas_scsi_request(struct scsipi_channel *,
+ scsipi_adapter_req_t, void *);
+void sfasintr(struct sfas_softc *dev);
#endif /* _SFASVAR_H_ */
diff --git a/sys/arch/acorn32/stand/lib/srt1.c b/sys/arch/acorn32/stand/lib/srt1.c
index 2e271d8ae23..b5389ba784e 100644
--- a/sys/arch/acorn32/stand/lib/srt1.c
+++ b/sys/arch/acorn32/stand/lib/srt1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: srt1.c,v 1.5 2005/12/11 12:16:08 christos Exp $ */
+/* $NetBSD: srt1.c,v 1.6 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 2001 Ben Harris.
@@ -39,7 +39,7 @@
void *HIMEM = (void *) 0x12000;
-static int whitespace __P((char));
+static int whitespace(char);
static int whitespace(char c) {
if ((c == '\0') || (c == ' ') || (c == '\t')
diff --git a/sys/arch/algor/pci/pci_alignstride_bus_io_chipdep.c b/sys/arch/algor/pci/pci_alignstride_bus_io_chipdep.c
index 12167d112ac..947549aadda 100644
--- a/sys/arch/algor/pci/pci_alignstride_bus_io_chipdep.c
+++ b/sys/arch/algor/pci/pci_alignstride_bus_io_chipdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_alignstride_bus_io_chipdep.c,v 1.8 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: pci_alignstride_bus_io_chipdep.c,v 1.9 2009/03/14 14:45:52 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_alignstride_bus_io_chipdep.c,v 1.8 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_alignstride_bus_io_chipdep.c,v 1.9 2009/03/14 14:45:52 dsl Exp $");
#include <sys/extent.h>
@@ -84,124 +84,124 @@ __KERNEL_RCSID(1, "$NetBSD: pci_alignstride_bus_io_chipdep.c,v 1.8 2008/04/28 20
#define __S(S) __STRING(S)
/* mapping/unmapping */
-int __C(CHIP,_io_map) __P((void *, bus_addr_t, bus_size_t, int,
- bus_space_handle_t *, int));
-void __C(CHIP,_io_unmap) __P((void *, bus_space_handle_t,
- bus_size_t, int));
-int __C(CHIP,_io_subregion) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
-
-int __C(CHIP,_io_translate) __P((void *, bus_addr_t, bus_size_t,
- int, struct mips_bus_space_translation *));
-int __C(CHIP,_io_get_window) __P((void *, int,
- struct mips_bus_space_translation *));
+int __C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int,
+ bus_space_handle_t *, int);
+void __C(CHIP,_io_unmap)(void *, bus_space_handle_t,
+ bus_size_t, int);
+int __C(CHIP,_io_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
+
+int __C(CHIP,_io_translate)(void *, bus_addr_t, bus_size_t,
+ int, struct mips_bus_space_translation *);
+int __C(CHIP,_io_get_window)(void *, int,
+ struct mips_bus_space_translation *);
/* allocation/deallocation */
-int __C(CHIP,_io_alloc) __P((void *, bus_addr_t, bus_addr_t,
+int __C(CHIP,_io_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
- bus_space_handle_t *));
-void __C(CHIP,_io_free) __P((void *, bus_space_handle_t,
- bus_size_t));
+ bus_space_handle_t *);
+void __C(CHIP,_io_free)(void *, bus_space_handle_t,
+ bus_size_t);
/* get kernel virtual address */
-void * __C(CHIP,_io_vaddr) __P((void *, bus_space_handle_t));
+void * __C(CHIP,_io_vaddr)(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t __C(CHIP,_io_mmap) __P((void *, bus_addr_t, off_t, int, int));
+paddr_t __C(CHIP,_io_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-inline void __C(CHIP,_io_barrier) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int));
+inline void __C(CHIP,_io_barrier)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
/* read (single) */
-inline u_int8_t __C(CHIP,_io_read_1) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int16_t __C(CHIP,_io_read_2) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int32_t __C(CHIP,_io_read_4) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int64_t __C(CHIP,_io_read_8) __P((void *, bus_space_handle_t,
- bus_size_t));
+inline u_int8_t __C(CHIP,_io_read_1)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int32_t __C(CHIP,_io_read_4)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int64_t __C(CHIP,_io_read_8)(void *, bus_space_handle_t,
+ bus_size_t);
/* read multiple */
-void __C(CHIP,_io_read_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_io_read_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_io_read_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_io_read_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_io_read_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_io_read_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_io_read_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_io_read_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region */
-void __C(CHIP,_io_read_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_io_read_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_io_read_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_io_read_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_io_read_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_io_read_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_io_read_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_io_read_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
-inline void __C(CHIP,_io_write_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
-inline void __C(CHIP,_io_write_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
-inline void __C(CHIP,_io_write_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
-inline void __C(CHIP,_io_write_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t));
+inline void __C(CHIP,_io_write_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+inline void __C(CHIP,_io_write_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+inline void __C(CHIP,_io_write_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+inline void __C(CHIP,_io_write_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
/* write multiple */
-void __C(CHIP,_io_write_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_io_write_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_io_write_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_io_write_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_io_write_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_io_write_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_io_write_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_io_write_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* write region */
-void __C(CHIP,_io_write_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_io_write_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_io_write_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_io_write_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_io_write_region_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_io_write_region_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_io_write_region_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_io_write_region_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* set multiple */
-void __C(CHIP,_io_set_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_io_set_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_io_set_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_io_set_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_io_set_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_io_set_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_io_set_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_io_set_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* set region */
-void __C(CHIP,_io_set_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_io_set_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_io_set_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_io_set_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_io_set_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_io_set_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_io_set_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_io_set_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* copy */
-void __C(CHIP,_io_copy_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_io_copy_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_io_copy_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_io_copy_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void __C(CHIP,_io_copy_region_1)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_io_copy_region_2)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_io_copy_region_4)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_io_copy_region_8)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
#ifdef CHIP_IO_EXTENT
#ifndef CHIP_IO_EX_STORE
diff --git a/sys/arch/algor/pci/pci_alignstride_bus_mem_chipdep.c b/sys/arch/algor/pci/pci_alignstride_bus_mem_chipdep.c
index e53284a7cbe..359d6704068 100644
--- a/sys/arch/algor/pci/pci_alignstride_bus_mem_chipdep.c
+++ b/sys/arch/algor/pci/pci_alignstride_bus_mem_chipdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_alignstride_bus_mem_chipdep.c,v 1.7 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: pci_alignstride_bus_mem_chipdep.c,v 1.8 2009/03/14 14:45:52 dsl Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_alignstride_bus_mem_chipdep.c,v 1.7 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_alignstride_bus_mem_chipdep.c,v 1.8 2009/03/14 14:45:52 dsl Exp $");
#include <sys/extent.h>
@@ -83,124 +83,124 @@ __KERNEL_RCSID(1, "$NetBSD: pci_alignstride_bus_mem_chipdep.c,v 1.7 2008/04/28 2
#define __S(S) __STRING(S)
/* mapping/unmapping */
-int __C(CHIP,_mem_map) __P((void *, bus_addr_t, bus_size_t, int,
- bus_space_handle_t *, int));
-void __C(CHIP,_mem_unmap) __P((void *, bus_space_handle_t,
- bus_size_t, int));
-int __C(CHIP,_mem_subregion) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
-
-int __C(CHIP,_mem_translate) __P((void *, bus_addr_t, bus_size_t,
- int, struct mips_bus_space_translation *));
-int __C(CHIP,_mem_get_window) __P((void *, int,
- struct mips_bus_space_translation *));
+int __C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int,
+ bus_space_handle_t *, int);
+void __C(CHIP,_mem_unmap)(void *, bus_space_handle_t,
+ bus_size_t, int);
+int __C(CHIP,_mem_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
+
+int __C(CHIP,_mem_translate)(void *, bus_addr_t, bus_size_t,
+ int, struct mips_bus_space_translation *);
+int __C(CHIP,_mem_get_window)(void *, int,
+ struct mips_bus_space_translation *);
/* allocation/deallocation */
-int __C(CHIP,_mem_alloc) __P((void *, bus_addr_t, bus_addr_t,
+int __C(CHIP,_mem_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
- bus_space_handle_t *));
-void __C(CHIP,_mem_free) __P((void *, bus_space_handle_t,
- bus_size_t));
+ bus_space_handle_t *);
+void __C(CHIP,_mem_free)(void *, bus_space_handle_t,
+ bus_size_t);
/* get kernel virtual address */
-void * __C(CHIP,_mem_vaddr) __P((void *, bus_space_handle_t));
+void * __C(CHIP,_mem_vaddr)(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t __C(CHIP,_mem_mmap) __P((void *, bus_addr_t, off_t, int, int));
+paddr_t __C(CHIP,_mem_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-inline void __C(CHIP,_mem_barrier) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int));
+inline void __C(CHIP,_mem_barrier)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
/* read (single) */
-inline u_int8_t __C(CHIP,_mem_read_1) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int16_t __C(CHIP,_mem_read_2) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int32_t __C(CHIP,_mem_read_4) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int64_t __C(CHIP,_mem_read_8) __P((void *, bus_space_handle_t,
- bus_size_t));
+inline u_int8_t __C(CHIP,_mem_read_1)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int16_t __C(CHIP,_mem_read_2)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int32_t __C(CHIP,_mem_read_4)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int64_t __C(CHIP,_mem_read_8)(void *, bus_space_handle_t,
+ bus_size_t);
/* read multiple */
-void __C(CHIP,_mem_read_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_read_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_read_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_read_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_read_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_read_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_read_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_read_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region */
-void __C(CHIP,_mem_read_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_read_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_read_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_read_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_read_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_read_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_read_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_read_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
-inline void __C(CHIP,_mem_write_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
-inline void __C(CHIP,_mem_write_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
-inline void __C(CHIP,_mem_write_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
-inline void __C(CHIP,_mem_write_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t));
+inline void __C(CHIP,_mem_write_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+inline void __C(CHIP,_mem_write_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+inline void __C(CHIP,_mem_write_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+inline void __C(CHIP,_mem_write_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
/* write multiple */
-void __C(CHIP,_mem_write_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_write_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_write_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_write_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_write_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_write_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_write_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_write_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* write region */
-void __C(CHIP,_mem_write_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_write_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_write_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_write_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_write_region_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_write_region_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_write_region_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_write_region_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* set multiple */
-void __C(CHIP,_mem_set_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_mem_set_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_mem_set_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_mem_set_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_mem_set_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_mem_set_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_mem_set_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_mem_set_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* set region */
-void __C(CHIP,_mem_set_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_mem_set_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_mem_set_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_mem_set_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_mem_set_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_mem_set_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_mem_set_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_mem_set_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* copy */
-void __C(CHIP,_mem_copy_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_mem_copy_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_mem_copy_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_mem_copy_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void __C(CHIP,_mem_copy_region_1)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_mem_copy_region_2)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_mem_copy_region_4)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_mem_copy_region_8)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
#ifndef CHIP_MEM_EX_STORE
static long
diff --git a/sys/arch/alpha/a12/a12dc.c b/sys/arch/alpha/a12/a12dc.c
index 8f0dc7951e8..bcc8bbb47c3 100644
--- a/sys/arch/alpha/a12/a12dc.c
+++ b/sys/arch/alpha/a12/a12dc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: a12dc.c,v 1.19 2007/11/19 18:51:36 ad Exp $ */
+/* $NetBSD: a12dc.c,v 1.20 2009/03/14 14:45:52 dsl Exp $ */
/* [Notice revision 2.2]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -64,7 +64,7 @@
#ifndef BSIDE
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: a12dc.c,v 1.19 2007/11/19 18:51:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12dc.c,v 1.20 2009/03/14 14:45:52 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -95,8 +95,8 @@ __KERNEL_RCSID(0, "$NetBSD: a12dc.c,v 1.19 2007/11/19 18:51:36 ad Exp $");
#define MAX_MODULES 1
-int a12dcmatch __P((struct device *, struct cfdata *, void *));
-void a12dcattach __P((struct device *, struct device *, void *));
+int a12dcmatch(struct device *, struct cfdata *, void *);
+void a12dcattach(struct device *, struct device *, void *);
struct a12dc_softc {
struct device sc_dev;
@@ -127,17 +127,17 @@ struct a12dc_config { int im_not_used; } a12dc_configuration;
static struct tty *a12dc_tty[1];
-void a12dcstart __P((struct tty *));
-void a12dctimeout __P((void *));
-int a12dcparam __P((struct tty *, struct termios *));
+void a12dcstart(struct tty *);
+void a12dctimeout(void *);
+int a12dcparam(struct tty *, struct termios *);
void a12dc_init(struct a12dc_config *, int);
-static void a12cdrputc __P((int));
+static void a12cdrputc(int);
int a12dccngetc(dev_t);
void a12dccnputc(dev_t, int);
void a12dccnpollc(dev_t, int);
/* static int get_bc_char(int mn, int chan); */
/* static int get_bc_any(int,int *,int *); */
-int a12dcintr __P((void *));
+int a12dcintr(void *);
static void a12_worry(int worry_number);
static void A12InitBackDriver(int);
@@ -164,7 +164,7 @@ a12dcattach(parent, self, aux)
/* note that we've attached the chipset; can't have 2 A12Cs. */
a12dcfound = 1;
- printf(": driver %s\n", "$Revision: 1.19 $");
+ printf(": driver %s\n", "$Revision: 1.20 $");
tp = a12dc_tty[0] = ttymalloc();
tp->t_oproc = a12dcstart;
@@ -209,8 +209,8 @@ a12dc_init(ccp, mallocsafe)
#endif
-static int msgetput __P((register mstate_type *, int, int));
-static void checkinit __P((void));
+static int msgetput(register mstate_type *, int, int);
+static void checkinit(void);
static void
A12InitBackDriver(int m)
diff --git a/sys/arch/alpha/a12/a12dcreg.h b/sys/arch/alpha/a12/a12dcreg.h
index 63e428ff2ff..e9df28fc714 100644
--- a/sys/arch/alpha/a12/a12dcreg.h
+++ b/sys/arch/alpha/a12/a12dcreg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: a12dcreg.h,v 1.1 1998/09/23 21:14:02 ross Exp $ */
+/* $NetBSD: a12dcreg.h,v 1.2 2009/03/14 14:45:52 dsl Exp $ */
/* [Notice revision 2.2]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -141,4 +141,4 @@ mstate_type a12_mstate[MAX_MODULES];
int a12console_last_unexpected_error;
-int a12dccnattach __P((void));
+int a12dccnattach(void);
diff --git a/sys/arch/alpha/a12/if_xb.c b/sys/arch/alpha/a12/if_xb.c
index e914a6f04bb..9f20cb4dd17 100644
--- a/sys/arch/alpha/a12/if_xb.c
+++ b/sys/arch/alpha/a12/if_xb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xb.c,v 1.19 2008/11/07 00:20:01 dyoung Exp $ */
+/* $NetBSD: if_xb.c,v 1.20 2009/03/14 14:45:52 dsl Exp $ */
/* [Notice revision 2.2]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -74,7 +74,7 @@
#include "opt_avalon_a12.h" /* Config options headers */
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.19 2008/11/07 00:20:01 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.20 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -129,12 +129,12 @@ __KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.19 2008/11/07 00:20:01 dyoung Exp $");
#define FIFO_WORDCOUNT 60
-static int xb_put_blk __P((struct mbuf *));
-static int xb_put __P((struct mbuf *));
+static int xb_put_blk(struct mbuf *);
+static int xb_put(struct mbuf *);
static long xb_fifo_empty(void);
-int xbmatch __P((struct device *, struct cfdata *, void *));
-void xbattach __P((struct device *, struct device *, void *));
+int xbmatch(struct device *, struct cfdata *, void *);
+void xbattach(struct device *, struct device *, void *);
struct xb_softc {
struct device d;
@@ -190,20 +190,20 @@ Static struct ifnet xbi;
Static int frame_len;
static int xb_debug;
-Static void xb_start __P((struct ifnet *));
-Static void xb_mcrp_write __P((long *, int, int));
-static inline void xb_onefree __P((void));
+Static void xb_start(struct ifnet *);
+Static void xb_mcrp_write(long *, int, int);
+static inline void xb_onefree(void);
static long set_interrupt_on_fifo_empty(void);
static void xb_init(struct ifnet *);
-static int xb_intr __P((void *));
-static void xb_intr_rcv __P((void));
-Static void quickload __P((volatile long *, long *));
-static void xb_init_config __P((struct xb_config *, int));
-static int xb_output __P((struct ifnet *, struct mbuf *,
- const struct sockaddr *, struct rtentry *));
-static int xb_ioctl __P((struct ifnet *, u_long, void *));
-static void xb_stop __P((void));
-static void a12_xbar_setup __P((void));
+static int xb_intr(void *);
+static void xb_intr_rcv(void);
+Static void quickload(volatile long *, long *);
+static void xb_init_config(struct xb_config *, int);
+static int xb_output(struct ifnet *, struct mbuf *,
+ const struct sockaddr *, struct rtentry *);
+static int xb_ioctl(struct ifnet *, u_long, void *);
+static void xb_stop(void);
+static void a12_xbar_setup(void);
/* There Can Be Only One */
@@ -231,7 +231,7 @@ xbattach(parent, self, aux)
xbfound = 1;
ccp = &xb_configuration;
xb_init_config(ccp, 1);
- printf(": driver %s mtu %lu\n", "$Revision: 1.19 $", xbi.if_mtu);
+ printf(": driver %s mtu %lu\n", "$Revision: 1.20 $", xbi.if_mtu);
}
static void
diff --git a/sys/arch/alpha/a12/if_xb.h b/sys/arch/alpha/a12/if_xb.h
index ee7bd9f004b..4ebc010e0e5 100644
--- a/sys/arch/alpha/a12/if_xb.h
+++ b/sys/arch/alpha/a12/if_xb.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xb.h,v 1.1 1998/09/23 21:14:58 ross Exp $ */
+/* $NetBSD: if_xb.h,v 1.2 2009/03/14 14:45:52 dsl Exp $ */
/* [Notice revision 2.2]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -70,13 +70,13 @@ struct a12c_softc {
struct a12c_config *sc_ccp;
};
-void a12c_init __P((struct a12c_config *, int));
-void a12c_pci_init __P((pci_chipset_tag_t, void *));
-void a12c_dma_init __P((struct a12c_config *));
+void a12c_init(struct a12c_config *, int);
+void a12c_pci_init(pci_chipset_tag_t, void *);
+void a12c_dma_init(struct a12c_config *);
-bus_space_tag_t a12c_bus_io_init __P((void *));
-bus_space_tag_t a12c_bus_mem_init __P((void *));
+bus_space_tag_t a12c_bus_io_init(void *);
+bus_space_tag_t a12c_bus_mem_init(void *);
-void a12_xbar_intr __P((void));
+void a12_xbar_intr(void);
#endif
diff --git a/sys/arch/alpha/alpha/api_up1000.c b/sys/arch/alpha/alpha/api_up1000.c
index 8a7030a9047..e72cadeb93b 100644
--- a/sys/arch/alpha/alpha/api_up1000.c
+++ b/sys/arch/alpha/alpha/api_up1000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: api_up1000.c,v 1.23 2007/03/04 15:18:09 yamt Exp $ */
+/* $NetBSD: api_up1000.c,v 1.24 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.23 2007/03/04 15:18:09 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: api_up1000.c,v 1.24 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,9 +76,9 @@ static int comcnrate = CONSPEED;
#define DPRINTF(x) if (bootdev_debug) printf x
-void api_up1000_init __P((void));
-static void api_up1000_cons_init __P((void));
-static void api_up1000_device_register __P((struct device *, void *));
+void api_up1000_init(void);
+static void api_up1000_cons_init(void);
+static void api_up1000_device_register(struct device *, void *);
#ifdef KGDB
#include <machine/db_machdep.h>
diff --git a/sys/arch/alpha/alpha/autoconf.c b/sys/arch/alpha/alpha/autoconf.c
index e21dc826705..53ec6f34c47 100644
--- a/sys/arch/alpha/alpha/autoconf.c
+++ b/sys/arch/alpha/alpha/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.44 2007/12/03 15:33:04 ad Exp $ */
+/* $NetBSD: autoconf.c,v 1.45 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.44 2007/12/03 15:33:04 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.45 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -62,8 +62,8 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.44 2007/12/03 15:33:04 ad Exp $");
struct bootdev_data *bootdev_data;
-void parse_prom_bootdev __P((void));
-int atoi __P((char *));
+void parse_prom_bootdev(void);
+int atoi(char *);
/*
* cpu_configure:
diff --git a/sys/arch/alpha/alpha/avalon_a12.c b/sys/arch/alpha/alpha/avalon_a12.c
index 2e3b92745e3..2702d8759d2 100644
--- a/sys/arch/alpha/alpha/avalon_a12.c
+++ b/sys/arch/alpha/alpha/avalon_a12.c
@@ -1,4 +1,4 @@
-/* $NetBSD: avalon_a12.c,v 1.13 2006/02/25 17:32:43 thorpej Exp $ */
+/* $NetBSD: avalon_a12.c,v 1.14 2009/03/14 14:45:52 dsl Exp $ */
/* [Notice revision 2.2]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -64,7 +64,7 @@
#include "opt_avalon_a12.h" /* Config options headers */
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: avalon_a12.c,v 1.13 2006/02/25 17:32:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: avalon_a12.c,v 1.14 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,10 +98,10 @@ __KERNEL_RCSID(0, "$NetBSD: avalon_a12.c,v 1.13 2006/02/25 17:32:43 thorpej Exp
#define AVALON_A12() /* Generate ctags(1) key */
#endif
-void avalon_a12_init __P((void));
-static void avalon_a12_cons_init __P((void));
-static void avalon_a12_device_register __P((struct device *, void *));
-static int a12env __P((int));
+void avalon_a12_init(void);
+static void avalon_a12_cons_init(void);
+static void avalon_a12_device_register(struct device *, void *);
+static int a12env(int);
void
avalon_a12_init()
diff --git a/sys/arch/alpha/alpha/cpu.c b/sys/arch/alpha/alpha/cpu.c
index 8722d339066..4d0145262a1 100644
--- a/sys/arch/alpha/alpha/cpu.c
+++ b/sys/arch/alpha/alpha/cpu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.83 2008/12/16 22:35:22 christos Exp $ */
+/* $NetBSD: cpu.c,v 1.84 2009/03/14 14:45:52 dsl Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.83 2008/12/16 22:35:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.84 2009/03/14 14:45:52 dsl Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -98,7 +98,7 @@ volatile u_long cpus_booted;
volatile u_long cpus_running;
volatile u_long cpus_paused;
-void cpu_boot_secondary __P((struct cpu_info *));
+void cpu_boot_secondary(struct cpu_info *);
#endif /* MULTIPROCESSOR */
/*
diff --git a/sys/arch/alpha/alpha/cpuconf.c b/sys/arch/alpha/alpha/cpuconf.c
index f73940e00d7..6c913c054a0 100644
--- a/sys/arch/alpha/alpha/cpuconf.c
+++ b/sys/arch/alpha/alpha/cpuconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuconf.c,v 1.31 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: cpuconf.c,v 1.32 2009/03/14 14:45:52 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpuconf.c,v 1.31 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpuconf.c,v 1.32 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -70,77 +70,77 @@ __KERNEL_RCSID(0, "$NetBSD: cpuconf.c,v 1.31 2008/04/28 20:23:10 martin Exp $");
#include "opt_dec_3000_500.h"
#ifdef DEC_3000_500
-extern void dec_3000_500_init __P((void));
+extern void dec_3000_500_init(void);
#else
#define dec_3000_500_init platform_not_configured
#endif
#include "opt_dec_3000_300.h"
#ifdef DEC_3000_300
-extern void dec_3000_300_init __P((void));
+extern void dec_3000_300_init(void);
#else
#define dec_3000_300_init platform_not_configured
#endif
#include "opt_dec_axppci_33.h"
#ifdef DEC_AXPPCI_33
-extern void dec_axppci_33_init __P((void));
+extern void dec_axppci_33_init(void);
#else
#define dec_axppci_33_init platform_not_configured
#endif
#include "opt_dec_kn8ae.h"
#ifdef DEC_KN8AE
-extern void dec_kn8ae_init __P((void));
+extern void dec_kn8ae_init(void);
#else
#define dec_kn8ae_init platform_not_configured
#endif
#include "opt_dec_2100_a50.h"
#ifdef DEC_2100_A50
-extern void dec_2100_a50_init __P((void));
+extern void dec_2100_a50_init(void);
#else
#define dec_2100_a50_init platform_not_configured
#endif
#include "opt_dec_kn20aa.h"
#ifdef DEC_KN20AA
-extern void dec_kn20aa_init __P((void));
+extern void dec_kn20aa_init(void);
#else
#define dec_kn20aa_init platform_not_configured
#endif
#include "opt_dec_eb64plus.h"
#ifdef DEC_EB64PLUS
-extern void dec_eb64plus_init __P((void));
+extern void dec_eb64plus_init(void);
#else
#define dec_eb64plus_init platform_not_configured
#endif
#include "opt_dec_eb164.h"
#ifdef DEC_EB164
-extern void dec_eb164_init __P((void));
+extern void dec_eb164_init(void);
#else
#define dec_eb164_init platform_not_configured
#endif
#include "opt_avalon_a12.h"
#ifdef AVALON_A12
-extern void avalon_a12_init __P((void));
+extern void avalon_a12_init(void);
#else
#define avalon_a12_init platform_not_configured
#endif
#include "opt_dec_kn300.h"
#ifdef DEC_KN300
-extern void dec_kn300_init __P((void));
+extern void dec_kn300_init(void);
#else
#define dec_kn300_init platform_not_configured
#endif
#include "opt_dec_550.h"
#ifdef DEC_550
-extern void dec_550_init __P((void));
+extern void dec_550_init(void);
#else
#define dec_550_init platform_not_configured
#endif
@@ -148,7 +148,7 @@ extern void dec_550_init __P((void));
#include "opt_dec_1000.h"
#include "opt_dec_1000a.h"
#if defined(DEC_1000) || defined(DEC_1000A)
-extern void _dec_1000a_init __P((void));
+extern void _dec_1000a_init(void);
#endif
#ifdef DEC_1000A
#define dec_1000a_init _dec_1000a_init
@@ -163,21 +163,21 @@ extern void _dec_1000a_init __P((void));
#include "opt_dec_alphabook1.h"
#ifdef DEC_ALPHABOOK1
-extern void dec_alphabook1_init __P((void));
+extern void dec_alphabook1_init(void);
#else
#define dec_alphabook1_init platform_not_configured
#endif
#include "opt_dec_eb66.h"
#ifdef DEC_EB66
-extern void dec_eb66_init __P((void));
+extern void dec_eb66_init(void);
#else
#define dec_eb66_init platform_not_configured
#endif
#include "opt_dec_6600.h"
#ifdef DEC_6600
-extern void dec_6600_init __P((void));
+extern void dec_6600_init(void);
#else
#define dec_6600_init platform_not_configured
#endif
@@ -185,7 +185,7 @@ extern void dec_6600_init __P((void));
#include "opt_dec_2100_a500.h"
#include "opt_dec_2100a_a500.h"
#if defined(DEC_2100_A500) || defined(DEC_2100A_A500)
-extern void _dec_2100_a500_init __P((void));
+extern void _dec_2100_a500_init(void);
#endif
#ifdef DEC_2100_A500
#define dec_2100_a500_init _dec_2100_a500_init
@@ -200,14 +200,14 @@ extern void _dec_2100_a500_init __P((void));
#include "opt_api_up1000.h"
#ifdef API_UP1000
-extern void api_up1000_init __P((void));
+extern void api_up1000_init(void);
#else
#define api_up1000_init platform_not_configured
#endif
#include "opt_dec_2000_300.h"
#ifdef DEC_2000_300
-extern void dec_2000_300_init __P((void));
+extern void dec_2000_300_init(void);
#else
#define dec_2000_300_init platform_not_configured
#endif
diff --git a/sys/arch/alpha/alpha/db_interface.c b/sys/arch/alpha/alpha/db_interface.c
index c5d7ccfc39d..25b6f273ede 100644
--- a/sys/arch/alpha/alpha/db_interface.c
+++ b/sys/arch/alpha/alpha/db_interface.c
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.27 2007/10/17 19:52:55 garbled Exp $ */
+/* $NetBSD: db_interface.c,v 1.28 2009/03/14 14:45:52 dsl Exp $ */
/*
* Mach Operating System
@@ -52,7 +52,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.27 2007/10/17 19:52:55 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.28 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -89,7 +89,7 @@ int db_active = 0;
db_regs_t *ddb_regp;
#if defined(MULTIPROCESSOR)
-void db_mach_cpu __P((db_expr_t, bool, db_expr_t, const char *));
+void db_mach_cpu(db_expr_t, bool, db_expr_t, const char *);
#endif
const struct db_command db_machine_command_table[] = {
@@ -99,7 +99,7 @@ const struct db_command db_machine_command_table[] = {
{ DDB_ADD_CMD(NULL, NULL, 0,NULL,NULL,NULL) },
};
-static int db_alpha_regop __P((const struct db_variable *, db_expr_t *, int));
+static int db_alpha_regop(const struct db_variable *, db_expr_t *, int);
#define dbreg(xx) ((long *)(xx))
diff --git a/sys/arch/alpha/alpha/dec_1000a.c b/sys/arch/alpha/alpha/dec_1000a.c
index 1426c0534d1..dd2bcee642d 100644
--- a/sys/arch/alpha/alpha/dec_1000a.c
+++ b/sys/arch/alpha/alpha/dec_1000a.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_1000a.c,v 1.26 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: dec_1000a.c,v 1.27 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.26 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.27 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,9 +105,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,v 1.26 2008/04/28 20:23:10 martin Exp $"
#endif
static int comcnrate = CONSPEED;
-void _dec_1000a_init __P((void));
-static void dec_1000a_cons_init __P((void));
-static void dec_1000a_device_register __P((struct device *, void *));
+void _dec_1000a_init(void);
+static void dec_1000a_cons_init(void);
+static void dec_1000a_device_register(struct device *, void *);
#ifdef KGDB
#include <machine/db_machdep.h>
diff --git a/sys/arch/alpha/alpha/dec_2100_a50.c b/sys/arch/alpha/alpha/dec_2100_a50.c
index b30655cc2ca..f561c7c4f89 100644
--- a/sys/arch/alpha/alpha/dec_2100_a50.c
+++ b/sys/arch/alpha/alpha/dec_2100_a50.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_2100_a50.c,v 1.61 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_2100_a50.c,v 1.62 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.61 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.62 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,15 +74,15 @@ __KERNEL_RCSID(0, "$NetBSD: dec_2100_a50.c,v 1.61 2007/03/04 15:18:10 yamt Exp $
#endif
static int comcnrate = CONSPEED;
-void dec_2100_a50_init __P((void));
-static void dec_2100_a50_cons_init __P((void));
-static void dec_2100_a50_device_register __P((struct device *, void *));
+void dec_2100_a50_init(void);
+static void dec_2100_a50_cons_init(void);
+static void dec_2100_a50_device_register(struct device *, void *);
static void dec_2100_a50_mcheck_handler
- __P((unsigned long, struct trapframe *, unsigned long, unsigned long));
+(unsigned long, struct trapframe *, unsigned long, unsigned long);
-static void dec_2100_a50_mcheck __P((unsigned long, unsigned long,
- unsigned long, struct trapframe *));
+static void dec_2100_a50_mcheck(unsigned long, unsigned long,
+ unsigned long, struct trapframe *);
#ifdef KGDB
diff --git a/sys/arch/alpha/alpha/dec_3000_300.c b/sys/arch/alpha/alpha/dec_3000_300.c
index 823bb1f6d61..6710dd1ce2c 100644
--- a/sys/arch/alpha/alpha/dec_3000_300.c
+++ b/sys/arch/alpha/alpha/dec_3000_300.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3000_300.c,v 1.43 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_3000_300.c,v 1.44 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.43 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.44 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,9 +58,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3000_300.c,v 1.43 2007/03/04 15:18:10 yamt Exp $
#include "wsdisplay.h"
-void dec_3000_300_init __P((void));
-static void dec_3000_300_cons_init __P((void));
-static void dec_3000_300_device_register __P((struct device *, void *));
+void dec_3000_300_init(void);
+static void dec_3000_300_cons_init(void);
+static void dec_3000_300_device_register(struct device *, void *);
const struct alpha_variation_table dec_3000_300_variations[] = {
{ SV_ST_PELICAN, "DEC 3000/300 (\"Pelican\")" },
diff --git a/sys/arch/alpha/alpha/dec_3000_500.c b/sys/arch/alpha/alpha/dec_3000_500.c
index 206fd1cda4c..889a4558724 100644
--- a/sys/arch/alpha/alpha/dec_3000_500.c
+++ b/sys/arch/alpha/alpha/dec_3000_500.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3000_500.c,v 1.42 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_3000_500.c,v 1.43 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.42 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.43 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,9 +58,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3000_500.c,v 1.42 2007/03/04 15:18:10 yamt Exp $
#include "wsdisplay.h"
-void dec_3000_500_init __P((void));
-static void dec_3000_500_cons_init __P((void));
-static void dec_3000_500_device_register __P((struct device *, void *));
+void dec_3000_500_init(void);
+static void dec_3000_500_cons_init(void);
+static void dec_3000_500_device_register(struct device *, void *);
static const char dec_3000_500_sp[] = "DEC 3000/400 (\"Sandpiper\")";
static const char dec_3000_500_sf[] = "DEC 3000/500 (\"Flamingo\")";
diff --git a/sys/arch/alpha/alpha/dec_550.c b/sys/arch/alpha/alpha/dec_550.c
index 0e30646c418..1cd83ed834d 100644
--- a/sys/arch/alpha/alpha/dec_550.c
+++ b/sys/arch/alpha/alpha/dec_550.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_550.c,v 1.30 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_550.c,v 1.31 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.30 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_550.c,v 1.31 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,10 +80,10 @@ static int comcnrate = CONSPEED;
#define DR_VERBOSE(f) while (0)
-void dec_550_init __P((void));
-static void dec_550_cons_init __P((void));
-static void dec_550_device_register __P((struct device *, void *));
-static void dec_550_powerdown __P((void));
+void dec_550_init(void);
+static void dec_550_cons_init(void);
+static void dec_550_device_register(struct device *, void *);
+static void dec_550_powerdown(void);
#ifdef KGDB
#include <machine/db_machdep.h>
diff --git a/sys/arch/alpha/alpha/dec_6600.c b/sys/arch/alpha/alpha/dec_6600.c
index 78b77a3ad27..73b75cb3307 100644
--- a/sys/arch/alpha/alpha/dec_6600.c
+++ b/sys/arch/alpha/alpha/dec_6600.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_6600.c,v 1.26 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_6600.c,v 1.27 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.26 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.27 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,9 +73,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v 1.26 2007/03/04 15:18:10 yamt Exp $");
static int comcnrate __attribute__((unused)) = CONSPEED;
-void dec_6600_init __P((void));
-static void dec_6600_cons_init __P((void));
-static void dec_6600_device_register __P((struct device *, void *));
+void dec_6600_init(void);
+static void dec_6600_cons_init(void);
+static void dec_6600_device_register(struct device *, void *);
#ifdef KGDB
#include <machine/db_machdep.h>
diff --git a/sys/arch/alpha/alpha/dec_alphabook1.c b/sys/arch/alpha/alpha/dec_alphabook1.c
index f601acb5995..9f51877652e 100644
--- a/sys/arch/alpha/alpha/dec_alphabook1.c
+++ b/sys/arch/alpha/alpha/dec_alphabook1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_alphabook1.c,v 1.21 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_alphabook1.c,v 1.22 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.21 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.22 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,9 +72,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_alphabook1.c,v 1.21 2007/03/04 15:18:10 yamt Exp
#endif
static int comcnrate = CONSPEED;
-void dec_alphabook1_init __P((void));
-static void dec_alphabook1_cons_init __P((void));
-static void dec_alphabook1_device_register __P((struct device *, void *));
+void dec_alphabook1_init(void);
+static void dec_alphabook1_cons_init(void);
+static void dec_alphabook1_device_register(struct device *, void *);
#ifdef KGDB
#include <machine/db_machdep.h>
diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c
index b694f8c04ad..bc108cd00b3 100644
--- a/sys/arch/alpha/alpha/dec_axppci_33.c
+++ b/sys/arch/alpha/alpha/dec_axppci_33.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_axppci_33.c,v 1.61 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_axppci_33.c,v 1.62 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.61 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.62 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,9 +74,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_axppci_33.c,v 1.61 2007/03/04 15:18:10 yamt Exp
#endif
static int comcnrate = CONSPEED;
-void dec_axppci_33_init __P((void));
-static void dec_axppci_33_cons_init __P((void));
-static void dec_axppci_33_device_register __P((struct device *, void *));
+void dec_axppci_33_init(void);
+static void dec_axppci_33_cons_init(void);
+static void dec_axppci_33_device_register(struct device *, void *);
#ifdef KGDB
#include <machine/db_machdep.h>
@@ -92,7 +92,7 @@ const struct alpha_variation_table dec_axppci_33_variations[] = {
{ 0, NULL },
};
-static struct lca_config *lca_preinit __P((void));
+static struct lca_config *lca_preinit(void);
static struct lca_config *
lca_preinit()
diff --git a/sys/arch/alpha/alpha/dec_eb164.c b/sys/arch/alpha/alpha/dec_eb164.c
index 81a01a4475b..7adb1ef0c17 100644
--- a/sys/arch/alpha/alpha/dec_eb164.c
+++ b/sys/arch/alpha/alpha/dec_eb164.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb164.c,v 1.56 2007/03/04 14:46:45 yamt Exp $ */
+/* $NetBSD: dec_eb164.c,v 1.57 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.56 2007/03/04 14:46:45 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,v 1.57 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,9 +77,9 @@ static int comcnrate = CONSPEED;
#define DR_VERBOSE(f) while (0)
-void dec_eb164_init __P((void));
-static void dec_eb164_cons_init __P((void));
-static void dec_eb164_device_register __P((struct device *, void *));
+void dec_eb164_init(void);
+static void dec_eb164_cons_init(void);
+static void dec_eb164_device_register(struct device *, void *);
#ifdef KGDB
#include <machine/db_machdep.h>
diff --git a/sys/arch/alpha/alpha/dec_eb64plus.c b/sys/arch/alpha/alpha/dec_eb64plus.c
index ba1b3aa53eb..aa2df27fc44 100644
--- a/sys/arch/alpha/alpha/dec_eb64plus.c
+++ b/sys/arch/alpha/alpha/dec_eb64plus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb64plus.c,v 1.36 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_eb64plus.c,v 1.37 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.36 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.37 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,9 +74,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_eb64plus.c,v 1.36 2007/03/04 15:18:10 yamt Exp $
#endif
static int comcnrate = CONSPEED;
-void dec_eb64plus_init __P((void));
-static void dec_eb64plus_cons_init __P((void));
-static void dec_eb64plus_device_register __P((struct device *, void *));
+void dec_eb64plus_init(void);
+static void dec_eb64plus_cons_init(void);
+static void dec_eb64plus_device_register(struct device *, void *);
#ifdef KGDB
#include <machine/db_machdep.h>
diff --git a/sys/arch/alpha/alpha/dec_eb66.c b/sys/arch/alpha/alpha/dec_eb66.c
index 37fac255a52..3dcc459e903 100644
--- a/sys/arch/alpha/alpha/dec_eb66.c
+++ b/sys/arch/alpha/alpha/dec_eb66.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_eb66.c,v 1.22 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_eb66.c,v 1.23 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.22 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.23 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,9 +74,9 @@ __KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v 1.22 2007/03/04 15:18:10 yamt Exp $");
#endif
static int comcnrate = CONSPEED;
-void dec_eb66_init __P((void));
-static void dec_eb66_cons_init __P((void));
-static void dec_eb66_device_register __P((struct device *, void *));
+void dec_eb66_init(void);
+static void dec_eb66_cons_init(void);
+static void dec_eb66_device_register(struct device *, void *);
#ifdef KGDB
#include <machine/db_machdep.h>
diff --git a/sys/arch/alpha/alpha/dec_kn20aa.c b/sys/arch/alpha/alpha/dec_kn20aa.c
index 61edb2078e2..5e3ca8a9ecc 100644
--- a/sys/arch/alpha/alpha/dec_kn20aa.c
+++ b/sys/arch/alpha/alpha/dec_kn20aa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_kn20aa.c,v 1.59 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_kn20aa.c,v 1.60 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.59 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.60 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,15 +74,15 @@ __KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c,v 1.59 2007/03/04 15:18:10 yamt Exp $")
#endif
static int comcnrate = CONSPEED;
-void dec_kn20aa_init __P((void));
-static void dec_kn20aa_cons_init __P((void));
-static void dec_kn20aa_device_register __P((struct device *, void *));
+void dec_kn20aa_init(void);
+static void dec_kn20aa_cons_init(void);
+static void dec_kn20aa_device_register(struct device *, void *);
static void dec_kn20aa_mcheck_handler
- __P((unsigned long, struct trapframe *, unsigned long, unsigned long));
+(unsigned long, struct trapframe *, unsigned long, unsigned long);
-static void dec_kn20aa_mcheck __P((unsigned long, unsigned long,
- unsigned long, struct trapframe *));
+static void dec_kn20aa_mcheck(unsigned long, unsigned long,
+ unsigned long, struct trapframe *);
#ifdef KGDB
#include <machine/db_machdep.h>
diff --git a/sys/arch/alpha/alpha/dec_kn300.c b/sys/arch/alpha/alpha/dec_kn300.c
index 1d30d9680e4..e4af323929a 100644
--- a/sys/arch/alpha/alpha/dec_kn300.c
+++ b/sys/arch/alpha/alpha/dec_kn300.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_kn300.c,v 1.34 2007/03/04 15:18:10 yamt Exp $ */
+/* $NetBSD: dec_kn300.c,v 1.35 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.34 2007/03/04 15:18:10 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.35 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,11 +80,11 @@ __KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.34 2007/03/04 15:18:10 yamt Exp $");
#endif
static int comcnrate = CONSPEED;
-void dec_kn300_init __P((void));
-void dec_kn300_cons_init __P((void));
-static void dec_kn300_device_register __P((struct device *, void *));
+void dec_kn300_init(void);
+void dec_kn300_cons_init(void);
+static void dec_kn300_device_register(struct device *, void *);
static void dec_kn300_mcheck_handler
- __P((unsigned long, struct trapframe *, unsigned long, unsigned long));
+(unsigned long, struct trapframe *, unsigned long, unsigned long);
#ifdef KGDB
#include <machine/db_machdep.h>
@@ -353,11 +353,11 @@ dec_kn300_device_register(dev, aux)
/*
* KN300 Machine Check Handlers.
*/
-static void kn300_softerr __P((unsigned long, unsigned long,
- unsigned long, struct trapframe *));
+static void kn300_softerr(unsigned long, unsigned long,
+ unsigned long, struct trapframe *);
-static void kn300_mcheck __P((unsigned long, unsigned long,
- unsigned long, struct trapframe *));
+static void kn300_mcheck(unsigned long, unsigned long,
+ unsigned long, struct trapframe *);
/*
* "soft" error structure in system area for KN300 processor.
diff --git a/sys/arch/alpha/alpha/dec_kn8ae.c b/sys/arch/alpha/alpha/dec_kn8ae.c
index 14c7d90d505..ee6ec35e060 100644
--- a/sys/arch/alpha/alpha/dec_kn8ae.c
+++ b/sys/arch/alpha/alpha/dec_kn8ae.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_kn8ae.c,v 1.37 2007/03/04 05:59:10 christos Exp $ */
+/* $NetBSD: dec_kn8ae.c,v 1.38 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_kn8ae.c,v 1.37 2007/03/04 05:59:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_kn8ae.c,v 1.38 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -66,12 +66,12 @@ __KERNEL_RCSID(0, "$NetBSD: dec_kn8ae.c,v 1.37 2007/03/04 05:59:10 christos Exp
#define KV(_addr) ((void *)ALPHA_PHYS_TO_K0SEG((_addr)))
-void dec_kn8ae_init __P((void));
-void dec_kn8ae_cons_init __P((void));
-static void dec_kn8ae_device_register __P((struct device *, void *));
+void dec_kn8ae_init(void);
+void dec_kn8ae_cons_init(void);
+static void dec_kn8ae_device_register(struct device *, void *);
static void dec_kn8ae_mcheck_handler
- __P((unsigned long, struct trapframe *, unsigned long, unsigned long));
+(unsigned long, struct trapframe *, unsigned long, unsigned long);
const struct alpha_variation_table dec_kn8ae_variations[] = {
{ 0, "AlphaServer 8400" },
@@ -249,19 +249,19 @@ dec_kn8ae_device_register(dev, aux)
/*
* KN8AE Machine Check Handlers.
*/
-void kn8ae_harderr __P((unsigned long, unsigned long,
- unsigned long, struct trapframe *));
+void kn8ae_harderr(unsigned long, unsigned long,
+ unsigned long, struct trapframe *);
-static void kn8ae_softerr __P((unsigned long, unsigned long,
- unsigned long, struct trapframe *));
+static void kn8ae_softerr(unsigned long, unsigned long,
+ unsigned long, struct trapframe *);
-void kn8ae_mcheck __P((unsigned long, unsigned long,
- unsigned long, struct trapframe *));
+void kn8ae_mcheck(unsigned long, unsigned long,
+ unsigned long, struct trapframe *);
/*
* Support routine for clearing errors
*/
-static void clear_tlsb_ebits __P((int));
+static void clear_tlsb_ebits(int);
static void
clear_tlsb_ebits(cpuonly)
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c
index 7d5cf1633f3..93612674012 100644
--- a/sys/arch/alpha/alpha/disksubr.c
+++ b/sys/arch/alpha/alpha/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.36 2008/01/02 11:48:21 ad Exp $ */
+/* $NetBSD: disksubr.c,v 1.37 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.36 2008/01/02 11:48:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.37 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,7 +55,7 @@ extern struct device *bootdv;
const char *
readdisklabel(dev, strat, lp, clp)
dev_t dev;
- void (*strat) __P((struct buf *));
+ void (*strat)(struct buf *);
struct disklabel *lp;
struct cpu_disklabel *clp;
{
@@ -208,7 +208,7 @@ setdisklabel(olp, nlp, openmask, clp)
int
writedisklabel(dev, strat, lp, clp)
dev_t dev;
- void (*strat) __P((struct buf *));
+ void (*strat)(struct buf *);
struct disklabel *lp;
struct cpu_disklabel *clp;
{
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 6aa4973571a..e728fe2b87d 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.315 2009/02/13 22:41:00 apb Exp $ */
+/* $NetBSD: machdep.c,v 1.316 2009/03/14 14:45:52 dsl Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.315 2009/02/13 22:41:00 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.316 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -201,12 +201,12 @@ int alpha_fp_sync_complete = 0; /* fp fixup if sync even without /s */
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX]; /* low size bits overloaded */
int mem_cluster_cnt;
-int cpu_dump __P((void));
-int cpu_dumpsize __P((void));
-u_long cpu_dump_mempagecnt __P((void));
-void dumpsys __P((void));
-void identifycpu __P((void));
-void printregs __P((struct reg *));
+int cpu_dump(void);
+int cpu_dumpsize(void);
+u_long cpu_dump_mempagecnt(void);
+void dumpsys(void);
+void identifycpu(void);
+void printregs(struct reg *);
void
alpha_init(pfn, ptb, bim, bip, biv)
@@ -1099,7 +1099,7 @@ cpu_dump_mempagecnt()
int
cpu_dump()
{
- int (*dump) __P((dev_t, daddr_t, void *, size_t));
+ int (*dump)(dev_t, daddr_t, void *, size_t);
char buf[dbtob(1)];
kcore_seg_t *segp;
cpu_kcore_hdr_t *cpuhdrp;
@@ -1202,7 +1202,7 @@ dumpsys()
u_long maddr;
int psize;
daddr_t blkno;
- int (*dump) __P((dev_t, daddr_t, void *, size_t));
+ int (*dump)(dev_t, daddr_t, void *, size_t);
int error;
/* Save registers. */
diff --git a/sys/arch/alpha/alpha/vm_machdep.c b/sys/arch/alpha/alpha/vm_machdep.c
index 94ab80bd5f4..cf7637145e5 100644
--- a/sys/arch/alpha/alpha/vm_machdep.c
+++ b/sys/arch/alpha/alpha/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.97 2008/11/19 18:35:57 ad Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.98 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.97 2008/11/19 18:35:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.98 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -157,7 +157,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp *l2, void *stack, size_t stacksize,
void
cpu_setfunc(l, func, arg)
struct lwp *l;
- void (*func) __P((void *));
+ void (*func)(void *);
void *arg;
{
struct user *up = l->l_addr;
diff --git a/sys/arch/alpha/common/shared_intr.c b/sys/arch/alpha/common/shared_intr.c
index 3e74236c716..1a251d9e52e 100644
--- a/sys/arch/alpha/common/shared_intr.c
+++ b/sys/arch/alpha/common/shared_intr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: shared_intr.c,v 1.19 2008/03/10 14:01:35 ad Exp $ */
+/* $NetBSD: shared_intr.c,v 1.20 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.19 2008/03/10 14:01:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.20 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.19 2008/03/10 14:01:35 ad Exp $");
#include <sys/atomic.h>
#include <sys/intr.h>
-static const char *intr_typename __P((int));
+static const char *intr_typename(int);
static const char *
intr_typename(int type)
diff --git a/sys/arch/alpha/isa/isa_machdep.c b/sys/arch/alpha/isa/isa_machdep.c
index 3fa99588473..4409e293daf 100644
--- a/sys/arch/alpha/isa/isa_machdep.c
+++ b/sys/arch/alpha/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.15 2002/10/02 04:06:38 thorpej Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.16 2009/03/14 14:45:52 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.15 2002/10/02 04:06:38 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.16 2009/03/14 14:45:52 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.15 2002/10/02 04:06:38 thorpej Exp
#if (NPCPPI > 0)
#include <dev/isa/pcppivar.h>
-int isabeepmatch __P((struct device *, struct cfdata *, void *));
-void isabeepattach __P((struct device *, struct device *, void *));
+int isabeepmatch(struct device *, struct cfdata *, void *);
+void isabeepattach(struct device *, struct device *, void *);
CFATTACH_DECL(isabeep, sizeof(struct device),
isabeepmatch, isabeepattach, NULL, NULL);
diff --git a/sys/arch/alpha/isa/isadma_bounce.c b/sys/arch/alpha/isa/isadma_bounce.c
index 5bd197a1050..abe2c179418 100644
--- a/sys/arch/alpha/isa/isadma_bounce.c
+++ b/sys/arch/alpha/isa/isadma_bounce.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_bounce.c,v 1.8 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: isadma_bounce.c,v 1.9 2009/03/14 14:45:52 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.8 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_bounce.c,v 1.9 2009/03/14 14:45:52 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,9 +88,9 @@ struct isadma_bounce_cookie {
#define ID_BUFTYPE_UIO 3
#define ID_BUFTYPE_RAW 4
-int isadma_bounce_alloc_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t,
- bus_size_t, int));
-void isadma_bounce_free_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t));
+int isadma_bounce_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t,
+ bus_size_t, int);
+void isadma_bounce_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t);
/*
* Create an ISA DMA map.
diff --git a/sys/arch/alpha/pci/a12c.c b/sys/arch/alpha/pci/a12c.c
index 79af9962dd1..8a2d5c0dd5e 100644
--- a/sys/arch/alpha/pci/a12c.c
+++ b/sys/arch/alpha/pci/a12c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: a12c.c,v 1.18 2007/10/17 19:52:59 garbled Exp $ */
+/* $NetBSD: a12c.c,v 1.19 2009/03/14 14:45:53 dsl Exp $ */
/* [Notice revision 2.2]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -38,7 +38,7 @@
#include "opt_avalon_a12.h" /* Config options headers */
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: a12c.c,v 1.18 2007/10/17 19:52:59 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12c.c,v 1.19 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: a12c.c,v 1.18 2007/10/17 19:52:59 garbled Exp $");
#define A12C() /* Generate ctags(1) key */
-int a12cmatch __P((struct device *, struct cfdata *, void *));
-void a12cattach __P((struct device *, struct device *, void *));
+int a12cmatch(struct device *, struct cfdata *, void *);
+void a12cattach(struct device *, struct device *, void *);
CFATTACH_DECL(a12c, sizeof(struct a12c_softc),
a12cmatch, a12cattach, NULL, NULL);
@@ -141,7 +141,7 @@ a12cattach(parent, self, aux)
a12c_init(ccp, 1);
/* XXX print chipset information */
- printf(": driver %s over logic %x\n", "$Revision: 1.18 $",
+ printf(": driver %s over logic %x\n", "$Revision: 1.19 $",
A12_ALL_EXTRACT(REGVAL(A12_VERS)));
pci_a12_pickintr(ccp);
diff --git a/sys/arch/alpha/pci/a12c_bus_mem.c b/sys/arch/alpha/pci/a12c_bus_mem.c
index d0590e2d042..1b221e435ef 100644
--- a/sys/arch/alpha/pci/a12c_bus_mem.c
+++ b/sys/arch/alpha/pci/a12c_bus_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: a12c_bus_mem.c,v 1.5 2000/04/17 17:30:48 drochner Exp $ */
+/* $NetBSD: a12c_bus_mem.c,v 1.6 2009/03/14 14:45:53 dsl Exp $ */
/* [Notice revision 2.0]
* Copyright (c) 1997 Avalon Computer Systems, Inc.
@@ -46,121 +46,121 @@
#define A12C_BUS_MEM() /* Generate ctags(1) key */
-__KERNEL_RCSID(0, "$NetBSD: a12c_bus_mem.c,v 1.5 2000/04/17 17:30:48 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12c_bus_mem.c,v 1.6 2009/03/14 14:45:53 dsl Exp $");
/* Memory barrier */
-void pci_a12c_mem_barrier __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int));
+void pci_a12c_mem_barrier(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
/* Memory read (single) */
-u_int8_t pci_a12c_mem_read_1 __P((void *, bus_space_handle_t,
- bus_size_t));
-u_int16_t pci_a12c_mem_read_2 __P((void *, bus_space_handle_t,
- bus_size_t));
-u_int32_t pci_a12c_mem_read_4 __P((void *, bus_space_handle_t,
- bus_size_t));
-u_int64_t pci_a12c_mem_read_8 __P((void *, bus_space_handle_t,
- bus_size_t));
+u_int8_t pci_a12c_mem_read_1(void *, bus_space_handle_t,
+ bus_size_t);
+u_int16_t pci_a12c_mem_read_2(void *, bus_space_handle_t,
+ bus_size_t);
+u_int32_t pci_a12c_mem_read_4(void *, bus_space_handle_t,
+ bus_size_t);
+u_int64_t pci_a12c_mem_read_8(void *, bus_space_handle_t,
+ bus_size_t);
/* Memory read multiple */
-void pci_a12c_mem_read_multi_1 __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void pci_a12c_mem_read_multi_2 __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void pci_a12c_mem_read_multi_4 __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void pci_a12c_mem_read_multi_8 __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void pci_a12c_mem_read_multi_1(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void pci_a12c_mem_read_multi_2(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void pci_a12c_mem_read_multi_4(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void pci_a12c_mem_read_multi_8(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* Memory read region */
-void pci_a12c_mem_read_region_1 __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void pci_a12c_mem_read_region_2 __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void pci_a12c_mem_read_region_4 __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void pci_a12c_mem_read_region_8 __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void pci_a12c_mem_read_region_1(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void pci_a12c_mem_read_region_2(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void pci_a12c_mem_read_region_4(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void pci_a12c_mem_read_region_8(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* Memory write (single) */
-void pci_a12c_mem_write_1 __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
-void pci_a12c_mem_write_2 __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
-void pci_a12c_mem_write_4 __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
-void pci_a12c_mem_write_8 __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t));
+void pci_a12c_mem_write_1(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+void pci_a12c_mem_write_2(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+void pci_a12c_mem_write_4(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+void pci_a12c_mem_write_8(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
/* Memory write multiple */
-void pci_a12c_mem_write_multi_1 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void pci_a12c_mem_write_multi_2 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void pci_a12c_mem_write_multi_4 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void pci_a12c_mem_write_multi_8 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void pci_a12c_mem_write_multi_1(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void pci_a12c_mem_write_multi_2(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void pci_a12c_mem_write_multi_4(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void pci_a12c_mem_write_multi_8(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* Memory write region */
-void pci_a12c_mem_write_region_1 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void pci_a12c_mem_write_region_2 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void pci_a12c_mem_write_region_4 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void pci_a12c_mem_write_region_8 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void pci_a12c_mem_write_region_1(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void pci_a12c_mem_write_region_2(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void pci_a12c_mem_write_region_4(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void pci_a12c_mem_write_region_8(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* Memory set multiple */
-void pci_a12c_mem_set_multi_1 __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void pci_a12c_mem_set_multi_2 __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void pci_a12c_mem_set_multi_4 __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void pci_a12c_mem_set_multi_8 __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void pci_a12c_mem_set_multi_1(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void pci_a12c_mem_set_multi_2(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void pci_a12c_mem_set_multi_4(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void pci_a12c_mem_set_multi_8(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* Memory set region */
-void pci_a12c_mem_set_region_1 __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void pci_a12c_mem_set_region_2 __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void pci_a12c_mem_set_region_4 __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void pci_a12c_mem_set_region_8 __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void pci_a12c_mem_set_region_1(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void pci_a12c_mem_set_region_2(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void pci_a12c_mem_set_region_4(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void pci_a12c_mem_set_region_8(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* Memory copy */
-void pci_a12c_mem_copy_region_1 __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void pci_a12c_mem_copy_region_2 __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void pci_a12c_mem_copy_region_4 __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void pci_a12c_mem_copy_region_8 __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void pci_a12c_mem_copy_region_1(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void pci_a12c_mem_copy_region_2(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void pci_a12c_mem_copy_region_4(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void pci_a12c_mem_copy_region_8(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
#define __S(S) __STRING(S)
/* mapping/unmapping */
-int pci_a12c_mem_map __P((void *, bus_addr_t, bus_size_t, int,
- bus_space_handle_t *, int));
-void pci_a12c_mem_unmap __P((void *, bus_space_handle_t,
- bus_size_t, int));
-int pci_a12c_mem_subregion __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
+int pci_a12c_mem_map(void *, bus_addr_t, bus_size_t, int,
+ bus_space_handle_t *, int);
+void pci_a12c_mem_unmap(void *, bus_space_handle_t,
+ bus_size_t, int);
+int pci_a12c_mem_subregion(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
/* allocation/deallocation */
-int pci_a12c_mem_alloc __P((void *, bus_addr_t, bus_addr_t,
+int pci_a12c_mem_alloc(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
- bus_space_handle_t *));
-void pci_a12c_mem_free __P((void *, bus_space_handle_t,
- bus_size_t));
+ bus_space_handle_t *);
+void pci_a12c_mem_free(void *, bus_space_handle_t,
+ bus_size_t);
/* get kernel virtual address*/
-void *pci_a12c_mem_vaddr __P((void *, bus_space_handle_t));
+void *pci_a12c_mem_vaddr(void *, bus_space_handle_t);
static struct alpha_bus_space pci_a12c_mem_space = {
/* cookie */
diff --git a/sys/arch/alpha/pci/a12c_dma.c b/sys/arch/alpha/pci/a12c_dma.c
index 0f08ee535ec..fdd560a61a5 100644
--- a/sys/arch/alpha/pci/a12c_dma.c
+++ b/sys/arch/alpha/pci/a12c_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: a12c_dma.c,v 1.4 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: a12c_dma.c,v 1.5 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
#include "opt_avalon_a12.h" /* Config options headers */
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: a12c_dma.c,v 1.4 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12c_dma.c,v 1.5 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,20 +64,20 @@ __KERNEL_RCSID(0, "$NetBSD: a12c_dma.c,v 1.4 2008/04/28 20:23:11 martin Exp $");
#define A12C_DMA() /* Generate ctags(1) key */
-bus_dma_tag_t a12c_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t));
+bus_dma_tag_t a12c_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int a12c_bus_dmamap_load_direct __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
+int a12c_bus_dmamap_load_direct(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int a12c_bus_dmamap_load_mbuf_direct __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
+int a12c_bus_dmamap_load_mbuf_direct(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int a12c_bus_dmamap_load_uio_direct __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
+int a12c_bus_dmamap_load_uio_direct(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int a12c_bus_dmamap_load_raw_direct __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
+int a12c_bus_dmamap_load_raw_direct(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
void
a12c_dma_init(ccp)
diff --git a/sys/arch/alpha/pci/a12c_pci.c b/sys/arch/alpha/pci/a12c_pci.c
index f5f67887fce..dbaf2d6f896 100644
--- a/sys/arch/alpha/pci/a12c_pci.c
+++ b/sys/arch/alpha/pci/a12c_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: a12c_pci.c,v 1.3 2000/06/29 08:58:45 mrg Exp $ */
+/* $NetBSD: a12c_pci.c,v 1.4 2009/03/14 14:45:53 dsl Exp $ */
/* [Notice revision 2.0]
* Copyright (c) 1997 Avalon Computer Systems, Inc.
@@ -38,7 +38,7 @@
#include "opt_avalon_a12.h" /* Config options headers */
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: a12c_pci.c,v 1.3 2000/06/29 08:58:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12c_pci.c,v 1.4 2009/03/14 14:45:53 dsl Exp $");
__KERNEL_COPYRIGHT(0,
"Copyright (c) 1997 Christopher G. Demetriou. All rights reserved.");
@@ -58,14 +58,14 @@ __KERNEL_COPYRIGHT(0,
#define A12C_PCI() /* Generate ctags(1) key */
-void a12c_attach_hook __P((struct device *, struct device *,
- struct pcibus_attach_args *));
-int a12c_bus_maxdevs __P((void *, int));
-pcitag_t a12c_make_tag __P((void *, int, int, int));
-void a12c_decompose_tag __P((void *, pcitag_t, int *, int *,
- int *));
-pcireg_t a12c_conf_read __P((void *, pcitag_t, int));
-void a12c_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void a12c_attach_hook(struct device *, struct device *,
+ struct pcibus_attach_args *);
+int a12c_bus_maxdevs(void *, int);
+pcitag_t a12c_make_tag(void *, int, int, int);
+void a12c_decompose_tag(void *, pcitag_t, int *, int *,
+ int *);
+pcireg_t a12c_conf_read(void *, pcitag_t, int);
+void a12c_conf_write(void *, pcitag_t, int, pcireg_t);
void
a12c_pci_init(pc, v)
diff --git a/sys/arch/alpha/pci/a12cvar.h b/sys/arch/alpha/pci/a12cvar.h
index 1d8dda23fc8..662bedb8447 100644
--- a/sys/arch/alpha/pci/a12cvar.h
+++ b/sys/arch/alpha/pci/a12cvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: a12cvar.h,v 1.4 2005/12/11 12:16:17 christos Exp $ */
+/* $NetBSD: a12cvar.h,v 1.5 2009/03/14 14:45:53 dsl Exp $ */
/* [Notice revision 2.0]
* Copyright (c) 1997 Avalon Computer Systems, Inc.
@@ -70,12 +70,12 @@ struct a12c_softc {
struct a12c_config *sc_ccp;
};
-void a12c_init __P((struct a12c_config *, int));
-void a12c_pci_init __P((pci_chipset_tag_t, void *));
-void a12c_dma_init __P((struct a12c_config *));
+void a12c_init(struct a12c_config *, int);
+void a12c_pci_init(pci_chipset_tag_t, void *);
+void a12c_dma_init(struct a12c_config *);
-bus_space_tag_t a12c_bus_io_init __P((void *));
-bus_space_tag_t a12c_bus_mem_init __P((void *));
+bus_space_tag_t a12c_bus_io_init(void *);
+bus_space_tag_t a12c_bus_mem_init(void *);
/*
* The following two CPU numbers are relative to the local switch;
* in a multistage system these numbers will not be unique. a12_ethercpu
@@ -85,9 +85,9 @@ int a12_cpu_local; /* our CPU number relative to the local switch */
int a12_cpu_ether; /* relative CPU number with outside world access */
int a12_cpu_global; /* XXX used to construct MSN routing tables XXX */
-void a12_intr_register_xb __P((int (*)(void *)));
-void a12_intr_register_icw __P((int (*)(void *)));
-void configure_xb __P((void));
-void configure_a12dc __P((void));
+void a12_intr_register_xb(int (*)(void *));
+void a12_intr_register_icw(int (*)(void *));
+void configure_xb(void);
+void configure_a12dc(void);
#endif
diff --git a/sys/arch/alpha/pci/apecs.c b/sys/arch/alpha/pci/apecs.c
index a65c4159826..f2dd74aad3b 100644
--- a/sys/arch/alpha/pci/apecs.c
+++ b/sys/arch/alpha/pci/apecs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs.c,v 1.46 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: apecs.c,v 1.47 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.46 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.47 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -97,16 +97,16 @@ __KERNEL_RCSID(0, "$NetBSD: apecs.c,v 1.46 2008/04/28 20:23:11 martin Exp $");
#include <alpha/pci/pci_1000.h>
#endif
-int apecsmatch __P((struct device *, struct cfdata *, void *));
-void apecsattach __P((struct device *, struct device *, void *));
+int apecsmatch(struct device *, struct cfdata *, void *);
+void apecsattach(struct device *, struct device *, void *);
CFATTACH_DECL(apecs, sizeof(struct apecs_softc),
apecsmatch, apecsattach, NULL, NULL);
extern struct cfdriver apecs_cd;
-int apecs_bus_get_window __P((int, int,
- struct alpha_bus_space_translation *));
+int apecs_bus_get_window(int, int,
+ struct alpha_bus_space_translation *);
/* There can be only one. */
int apecsfound;
diff --git a/sys/arch/alpha/pci/apecs_dma.c b/sys/arch/alpha/pci/apecs_dma.c
index 95bd4b3d15f..a638f6e3406 100644
--- a/sys/arch/alpha/pci/apecs_dma.c
+++ b/sys/arch/alpha/pci/apecs_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_dma.c,v 1.16 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: apecs_dma.c,v 1.17 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.16 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.17 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,21 +50,21 @@ __KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,v 1.16 2008/04/28 20:23:11 martin Exp $"
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
-bus_dma_tag_t apecs_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t));
+bus_dma_tag_t apecs_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int apecs_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
+int apecs_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int apecs_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
+int apecs_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int apecs_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
+int apecs_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int apecs_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
+int apecs_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void apecs_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void apecs_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
/*
* Direct-mapped window: 1G at 1G
diff --git a/sys/arch/alpha/pci/apecs_pci.c b/sys/arch/alpha/pci/apecs_pci.c
index e6216719a24..f08977f44a8 100644
--- a/sys/arch/alpha/pci/apecs_pci.c
+++ b/sys/arch/alpha/pci/apecs_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apecs_pci.c,v 1.19 2002/05/15 16:57:42 thorpej Exp $ */
+/* $NetBSD: apecs_pci.c,v 1.20 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: apecs_pci.c,v 1.19 2002/05/15 16:57:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apecs_pci.c,v 1.20 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,14 +43,14 @@ __KERNEL_RCSID(0, "$NetBSD: apecs_pci.c,v 1.19 2002/05/15 16:57:42 thorpej Exp $
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
-void apecs_attach_hook __P((struct device *, struct device *,
- struct pcibus_attach_args *));
-int apecs_bus_maxdevs __P((void *, int));
-pcitag_t apecs_make_tag __P((void *, int, int, int));
-void apecs_decompose_tag __P((void *, pcitag_t, int *, int *,
- int *));
-pcireg_t apecs_conf_read __P((void *, pcitag_t, int));
-void apecs_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void apecs_attach_hook(struct device *, struct device *,
+ struct pcibus_attach_args *);
+int apecs_bus_maxdevs(void *, int);
+pcitag_t apecs_make_tag(void *, int, int, int);
+void apecs_decompose_tag(void *, pcitag_t, int *, int *,
+ int *);
+pcireg_t apecs_conf_read(void *, pcitag_t, int);
+void apecs_conf_write(void *, pcitag_t, int, pcireg_t);
void
apecs_pci_init(pc, v)
diff --git a/sys/arch/alpha/pci/apecsvar.h b/sys/arch/alpha/pci/apecsvar.h
index 1ff20f0e52f..9efb8356186 100644
--- a/sys/arch/alpha/pci/apecsvar.h
+++ b/sys/arch/alpha/pci/apecsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: apecsvar.h,v 1.8 1997/09/02 12:40:18 thorpej Exp $ */
+/* $NetBSD: apecsvar.h,v 1.9 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -64,9 +64,9 @@ struct apecs_softc {
struct apecs_config *sc_acp;
};
-void apecs_init __P((struct apecs_config *, int));
-void apecs_pci_init __P((pci_chipset_tag_t, void *));
-void apecs_dma_init __P((struct apecs_config *));
+void apecs_init(struct apecs_config *, int);
+void apecs_pci_init(pci_chipset_tag_t, void *);
+void apecs_dma_init(struct apecs_config *);
-void apecs_bus_io_init __P((bus_space_tag_t, void *));
-void apecs_bus_mem_init __P((bus_space_tag_t, void *));
+void apecs_bus_io_init(bus_space_tag_t, void *);
+void apecs_bus_mem_init(bus_space_tag_t, void *);
diff --git a/sys/arch/alpha/pci/cia.c b/sys/arch/alpha/pci/cia.c
index cb6c6849132..188eca38dae 100644
--- a/sys/arch/alpha/pci/cia.c
+++ b/sys/arch/alpha/pci/cia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia.c,v 1.66 2008/12/16 22:35:22 christos Exp $ */
+/* $NetBSD: cia.c,v 1.67 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.66 2008/12/16 22:35:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.67 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,16 +104,16 @@ __KERNEL_RCSID(0, "$NetBSD: cia.c,v 1.66 2008/12/16 22:35:22 christos Exp $");
#include <alpha/pci/pci_1000.h>
#endif
-int ciamatch __P((struct device *, struct cfdata *, void *));
-void ciaattach __P((struct device *, struct device *, void *));
+int ciamatch(struct device *, struct cfdata *, void *);
+void ciaattach(struct device *, struct device *, void *);
CFATTACH_DECL(cia, sizeof(struct cia_softc),
ciamatch, ciaattach, NULL, NULL);
extern struct cfdriver cia_cd;
-int cia_bus_get_window __P((int, int,
- struct alpha_bus_space_translation *));
+int cia_bus_get_window(int, int,
+ struct alpha_bus_space_translation *);
/* There can be only one. */
int ciafound;
diff --git a/sys/arch/alpha/pci/cia_dma.c b/sys/arch/alpha/pci/cia_dma.c
index 30a2d06cdeb..9d1a7dbfc78 100644
--- a/sys/arch/alpha/pci/cia_dma.c
+++ b/sys/arch/alpha/pci/cia_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_dma.c,v 1.22 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: cia_dma.c,v 1.23 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.22 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.23 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,24 +50,24 @@ __KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v 1.22 2008/04/28 20:23:11 martin Exp $");
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
-bus_dma_tag_t cia_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t));
+bus_dma_tag_t cia_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int cia_bus_dmamap_create_direct __P((bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *));
+int cia_bus_dmamap_create_direct(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
-int cia_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
+int cia_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int cia_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
+int cia_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int cia_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
+int cia_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int cia_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
+int cia_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void cia_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void cia_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
/*
* Direct-mapped window: 1G at 1G
@@ -84,10 +84,10 @@ void cia_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
/* ALCOR/ALGOR2/PYXIS have a 256-byte out-bound DMA prefetch threshold. */
#define CIA_SGMAP_PFTHRESH 256
-void cia_tlb_invalidate __P((void));
-void cia_broken_pyxis_tlb_invalidate __P((void));
+void cia_tlb_invalidate(void);
+void cia_broken_pyxis_tlb_invalidate(void);
-void (*cia_tlb_invalidate_fn) __P((void));
+void (*cia_tlb_invalidate_fn)(void);
#define CIA_TLB_INVALIDATE() (*cia_tlb_invalidate_fn)()
diff --git a/sys/arch/alpha/pci/cia_pci.c b/sys/arch/alpha/pci/cia_pci.c
index bf0a3a911ad..2835d8db080 100644
--- a/sys/arch/alpha/pci/cia_pci.c
+++ b/sys/arch/alpha/pci/cia_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cia_pci.c,v 1.26 2002/05/15 16:57:42 thorpej Exp $ */
+/* $NetBSD: cia_pci.c,v 1.27 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cia_pci.c,v 1.26 2002/05/15 16:57:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cia_pci.c,v 1.27 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,14 +43,14 @@ __KERNEL_RCSID(0, "$NetBSD: cia_pci.c,v 1.26 2002/05/15 16:57:42 thorpej Exp $")
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
-void cia_attach_hook __P((struct device *, struct device *,
- struct pcibus_attach_args *));
-int cia_bus_maxdevs __P((void *, int));
-pcitag_t cia_make_tag __P((void *, int, int, int));
-void cia_decompose_tag __P((void *, pcitag_t, int *, int *,
- int *));
-pcireg_t cia_conf_read __P((void *, pcitag_t, int));
-void cia_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void cia_attach_hook(struct device *, struct device *,
+ struct pcibus_attach_args *);
+int cia_bus_maxdevs(void *, int);
+pcitag_t cia_make_tag(void *, int, int, int);
+void cia_decompose_tag(void *, pcitag_t, int *, int *,
+ int *);
+pcireg_t cia_conf_read(void *, pcitag_t, int);
+void cia_conf_write(void *, pcitag_t, int, pcireg_t);
void
cia_pci_init(pc, v)
diff --git a/sys/arch/alpha/pci/ciavar.h b/sys/arch/alpha/pci/ciavar.h
index 1dc3ecb393b..9652b33baf3 100644
--- a/sys/arch/alpha/pci/ciavar.h
+++ b/sys/arch/alpha/pci/ciavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ciavar.h,v 1.17 2000/03/19 01:43:25 thorpej Exp $ */
+/* $NetBSD: ciavar.h,v 1.18 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -71,14 +71,14 @@ struct cia_softc {
struct cia_config *sc_ccp;
};
-void cia_init __P((struct cia_config *, int));
-void cia_pci_init __P((pci_chipset_tag_t, void *));
-void cia_dma_init __P((struct cia_config *));
+void cia_init(struct cia_config *, int);
+void cia_pci_init(pci_chipset_tag_t, void *);
+void cia_dma_init(struct cia_config *);
-void cia_bwx_bus_io_init __P((bus_space_tag_t, void *));
-void cia_bwx_bus_mem_init __P((bus_space_tag_t, void *));
+void cia_bwx_bus_io_init(bus_space_tag_t, void *);
+void cia_bwx_bus_mem_init(bus_space_tag_t, void *);
-void cia_swiz_bus_io_init __P((bus_space_tag_t, void *));
-void cia_swiz_bus_mem_init __P((bus_space_tag_t, void *));
+void cia_swiz_bus_io_init(bus_space_tag_t, void *);
+void cia_swiz_bus_mem_init(bus_space_tag_t, void *);
-void cia_pyxis_intr_enable __P((int, int));
+void cia_pyxis_intr_enable(int, int);
diff --git a/sys/arch/alpha/pci/dwlpx.c b/sys/arch/alpha/pci/dwlpx.c
index d640bf9a304..98f15d8389f 100644
--- a/sys/arch/alpha/pci/dwlpx.c
+++ b/sys/arch/alpha/pci/dwlpx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx.c,v 1.32 2007/03/04 05:59:11 christos Exp $ */
+/* $NetBSD: dwlpx.c,v 1.33 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dwlpx.c,v 1.32 2007/03/04 05:59:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx.c,v 1.33 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,8 +64,8 @@ __KERNEL_RCSID(0, "$NetBSD: dwlpx.c,v 1.32 2007/03/04 05:59:11 christos Exp $");
(1LL << 39))
-static int dwlpxmatch __P((struct device *, struct cfdata *, void *));
-static void dwlpxattach __P((struct device *, struct device *, void *));
+static int dwlpxmatch(struct device *, struct cfdata *, void *);
+static void dwlpxattach(struct device *, struct device *, void *);
CFATTACH_DECL(dwlpx, sizeof(struct dwlpx_softc),
dwlpxmatch, dwlpxattach, NULL, NULL);
diff --git a/sys/arch/alpha/pci/dwlpx_dma.c b/sys/arch/alpha/pci/dwlpx_dma.c
index 8527865f8c2..25df8ea6dfa 100644
--- a/sys/arch/alpha/pci/dwlpx_dma.c
+++ b/sys/arch/alpha/pci/dwlpx_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_dma.c,v 1.17 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: dwlpx_dma.c,v 1.18 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.17 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.18 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,21 +54,21 @@ __KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,v 1.17 2008/04/28 20:23:11 martin Exp $"
#include <alpha/pci/dwlpxvar.h>
#include <alpha/pci/pci_kn8ae.h>
-bus_dma_tag_t dwlpx_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t));
+bus_dma_tag_t dwlpx_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int dwlpx_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
+int dwlpx_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int dwlpx_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
+int dwlpx_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int dwlpx_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
+int dwlpx_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int dwlpx_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
+int dwlpx_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void dwlpx_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void dwlpx_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
/*
* Direct-mapped window: 2G at 2G
diff --git a/sys/arch/alpha/pci/dwlpx_pci.c b/sys/arch/alpha/pci/dwlpx_pci.c
index dad3b1ba3ec..eec3ddc1ff9 100644
--- a/sys/arch/alpha/pci/dwlpx_pci.c
+++ b/sys/arch/alpha/pci/dwlpx_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpx_pci.c,v 1.12 2007/03/04 05:59:11 christos Exp $ */
+/* $NetBSD: dwlpx_pci.c,v 1.13 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dwlpx_pci.c,v 1.12 2007/03/04 05:59:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwlpx_pci.c,v 1.13 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,14 +49,14 @@ __KERNEL_RCSID(0, "$NetBSD: dwlpx_pci.c,v 1.12 2007/03/04 05:59:11 christos Exp
#define KV(_addr) ((void *)ALPHA_PHYS_TO_K0SEG((_addr)))
-void dwlpx_attach_hook __P((struct device *, struct device *,
- struct pcibus_attach_args *));
-int dwlpx_bus_maxdevs __P((void *, int));
-pcitag_t dwlpx_make_tag __P((void *, int, int, int));
-void dwlpx_decompose_tag __P((void *, pcitag_t, int *, int *,
- int *));
-pcireg_t dwlpx_conf_read __P((void *, pcitag_t, int));
-void dwlpx_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void dwlpx_attach_hook(struct device *, struct device *,
+ struct pcibus_attach_args *);
+int dwlpx_bus_maxdevs(void *, int);
+pcitag_t dwlpx_make_tag(void *, int, int, int);
+void dwlpx_decompose_tag(void *, pcitag_t, int *, int *,
+ int *);
+pcireg_t dwlpx_conf_read(void *, pcitag_t, int);
+void dwlpx_conf_write(void *, pcitag_t, int, pcireg_t);
void
dwlpx_pci_init(pc, v)
diff --git a/sys/arch/alpha/pci/dwlpxvar.h b/sys/arch/alpha/pci/dwlpxvar.h
index 1e710e539d3..9bb9840cece 100644
--- a/sys/arch/alpha/pci/dwlpxvar.h
+++ b/sys/arch/alpha/pci/dwlpxvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dwlpxvar.h,v 1.8 2001/07/27 00:25:20 thorpej Exp $ */
+/* $NetBSD: dwlpxvar.h,v 1.9 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -72,12 +72,12 @@ struct dwlpx_softc {
#define DWLPX_SG64K 2
#define DWLPX_SG128K 3
-void dwlpx_init __P((struct dwlpx_softc *));
-void dwlpx_pci_init __P((pci_chipset_tag_t, void *));
-void dwlpx_dma_init __P((struct dwlpx_config *));
+void dwlpx_init(struct dwlpx_softc *);
+void dwlpx_pci_init(pci_chipset_tag_t, void *);
+void dwlpx_dma_init(struct dwlpx_config *);
-void dwlpx_bus_io_init __P((bus_space_tag_t, void *));
-void dwlpx_bus_mem_init __P((bus_space_tag_t, void *));
+void dwlpx_bus_io_init(bus_space_tag_t, void *);
+void dwlpx_bus_mem_init(bus_space_tag_t, void *);
/*
* Each DWLPX supports up to 15 devices, 12 of which are PCI slots.
diff --git a/sys/arch/alpha/pci/irongate_pci.c b/sys/arch/alpha/pci/irongate_pci.c
index 8be1c3bc43e..8bb55dad848 100644
--- a/sys/arch/alpha/pci/irongate_pci.c
+++ b/sys/arch/alpha/pci/irongate_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: irongate_pci.c,v 1.5 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: irongate_pci.c,v 1.6 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: irongate_pci.c,v 1.5 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irongate_pci.c,v 1.6 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,14 +50,14 @@ __KERNEL_RCSID(0, "$NetBSD: irongate_pci.c,v 1.5 2008/04/28 20:23:11 martin Exp
#include <alpha/pci/irongatereg.h>
#include <alpha/pci/irongatevar.h>
-void irongate_attach_hook __P((struct device *, struct device *,
- struct pcibus_attach_args *));
-int irongate_bus_maxdevs __P((void *, int));
-pcitag_t irongate_make_tag __P((void *, int, int, int));
-void irongate_decompose_tag __P((void *, pcitag_t, int *, int *,
- int *));
-pcireg_t irongate_conf_read __P((void *, pcitag_t, int));
-void irongate_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void irongate_attach_hook(struct device *, struct device *,
+ struct pcibus_attach_args *);
+int irongate_bus_maxdevs(void *, int);
+pcitag_t irongate_make_tag(void *, int, int, int);
+void irongate_decompose_tag(void *, pcitag_t, int *, int *,
+ int *);
+pcireg_t irongate_conf_read(void *, pcitag_t, int);
+void irongate_conf_write(void *, pcitag_t, int, pcireg_t);
/* AMD 751 systems are always single-processor, so this is easy. */
#define PCI_CONF_LOCK(s) (s) = splhigh()
diff --git a/sys/arch/alpha/pci/lca.c b/sys/arch/alpha/pci/lca.c
index c6a52e4cdf4..bddc4a4b191 100644
--- a/sys/arch/alpha/pci/lca.c
+++ b/sys/arch/alpha/pci/lca.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lca.c,v 1.44 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: lca.c,v 1.45 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.44 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.45 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,16 +93,16 @@ __KERNEL_RCSID(0, "$NetBSD: lca.c,v 1.44 2008/04/28 20:23:11 martin Exp $");
#include <alpha/pci/pci_eb66.h>
#endif
-int lcamatch __P((struct device *, struct cfdata *, void *));
-void lcaattach __P((struct device *, struct device *, void *));
+int lcamatch(struct device *, struct cfdata *, void *);
+void lcaattach(struct device *, struct device *, void *);
CFATTACH_DECL(lca, sizeof(struct lca_softc),
lcamatch, lcaattach, NULL, NULL);
extern struct cfdriver lca_cd;
-int lca_bus_get_window __P((int, int,
- struct alpha_bus_space_translation *));
+int lca_bus_get_window(int, int,
+ struct alpha_bus_space_translation *);
/* There can be only one. */
int lcafound;
diff --git a/sys/arch/alpha/pci/lca_dma.c b/sys/arch/alpha/pci/lca_dma.c
index 2556e70d856..cbe5f848dde 100644
--- a/sys/arch/alpha/pci/lca_dma.c
+++ b/sys/arch/alpha/pci/lca_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_dma.c,v 1.18 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: lca_dma.c,v 1.19 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.18 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.19 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,21 +50,21 @@ __KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v 1.18 2008/04/28 20:23:11 martin Exp $");
#include <alpha/pci/lcareg.h>
#include <alpha/pci/lcavar.h>
-bus_dma_tag_t lca_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t));
+bus_dma_tag_t lca_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int lca_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
+int lca_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int lca_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
+int lca_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int lca_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
+int lca_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int lca_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
+int lca_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void lca_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void lca_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
/*
* Direct-mapped window: 1G at 1G
diff --git a/sys/arch/alpha/pci/lca_pci.c b/sys/arch/alpha/pci/lca_pci.c
index b843fe4d206..23fe19c35c3 100644
--- a/sys/arch/alpha/pci/lca_pci.c
+++ b/sys/arch/alpha/pci/lca_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lca_pci.c,v 1.15 2002/05/15 16:57:42 thorpej Exp $ */
+/* $NetBSD: lca_pci.c,v 1.16 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lca_pci.c,v 1.15 2002/05/15 16:57:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lca_pci.c,v 1.16 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,14 +43,14 @@ __KERNEL_RCSID(0, "$NetBSD: lca_pci.c,v 1.15 2002/05/15 16:57:42 thorpej Exp $")
#include <alpha/pci/lcareg.h>
#include <alpha/pci/lcavar.h>
-void lca_attach_hook __P((struct device *, struct device *,
- struct pcibus_attach_args *));
-int lca_bus_maxdevs __P((void *, int));
-pcitag_t lca_make_tag __P((void *, int, int, int));
-void lca_decompose_tag __P((void *, pcitag_t, int *, int *,
- int *));
-pcireg_t lca_conf_read __P((void *, pcitag_t, int));
-void lca_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void lca_attach_hook(struct device *, struct device *,
+ struct pcibus_attach_args *);
+int lca_bus_maxdevs(void *, int);
+pcitag_t lca_make_tag(void *, int, int, int);
+void lca_decompose_tag(void *, pcitag_t, int *, int *,
+ int *);
+pcireg_t lca_conf_read(void *, pcitag_t, int);
+void lca_conf_write(void *, pcitag_t, int, pcireg_t);
void
lca_pci_init(pc, v)
diff --git a/sys/arch/alpha/pci/lcavar.h b/sys/arch/alpha/pci/lcavar.h
index f763c669108..90f51fa6406 100644
--- a/sys/arch/alpha/pci/lcavar.h
+++ b/sys/arch/alpha/pci/lcavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: lcavar.h,v 1.8 1997/09/02 12:40:22 thorpej Exp $ */
+/* $NetBSD: lcavar.h,v 1.9 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -60,9 +60,9 @@ struct lca_softc {
struct lca_config *sc_lcp;
};
-void lca_init __P((struct lca_config *, int));
-void lca_pci_init __P((pci_chipset_tag_t, void *));
-void lca_dma_init __P((struct lca_config *));
+void lca_init(struct lca_config *, int);
+void lca_pci_init(pci_chipset_tag_t, void *);
+void lca_dma_init(struct lca_config *);
-void lca_bus_io_init __P((bus_space_tag_t, void *));
-void lca_bus_mem_init __P((bus_space_tag_t, void *));
+void lca_bus_io_init(bus_space_tag_t, void *);
+void lca_bus_mem_init(bus_space_tag_t, void *);
diff --git a/sys/arch/alpha/pci/mcpcia.c b/sys/arch/alpha/pci/mcpcia.c
index 7198a60bf93..cf0196b415d 100644
--- a/sys/arch/alpha/pci/mcpcia.c
+++ b/sys/arch/alpha/pci/mcpcia.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia.c,v 1.22 2008/06/12 12:09:23 dogcow Exp $ */
+/* $NetBSD: mcpcia.c,v 1.23 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcpcia.c,v 1.22 2008/06/12 12:09:23 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia.c,v 1.23 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -96,12 +96,12 @@ __KERNEL_RCSID(0, "$NetBSD: mcpcia.c,v 1.22 2008/06/12 12:09:23 dogcow Exp $");
(MCBUS_IOSPACE) | MCPCIA_PCI_BRIDGE | _MCPCIA_PCI_REV)), \
sizeof(u_int32_t))
-static int mcpciamatch __P((struct device *, struct cfdata *, void *));
-static void mcpciaattach __P((struct device *, struct device *, void *));
+static int mcpciamatch(struct device *, struct cfdata *, void *);
+static void mcpciaattach(struct device *, struct device *, void *);
CFATTACH_DECL(mcpcia, sizeof(struct mcpcia_softc),
mcpciamatch, mcpciaattach, NULL, NULL);
-void mcpcia_init0 __P((struct mcpcia_config *, int));
+void mcpcia_init0(struct mcpcia_config *, int);
/*
* We have one statically-allocated mcpcia_config structure; this is
@@ -110,8 +110,8 @@ void mcpcia_init0 __P((struct mcpcia_config *, int));
*/
struct mcpcia_config mcpcia_console_configuration;
-int mcpcia_bus_get_window __P((int, int,
- struct alpha_bus_space_translation *abst));
+int mcpcia_bus_get_window(int, int,
+ struct alpha_bus_space_translation *abst);
static int
mcpciamatch(parent, cf, aux)
diff --git a/sys/arch/alpha/pci/mcpcia_dma.c b/sys/arch/alpha/pci/mcpcia_dma.c
index fe3bca1f7e4..92173a25a83 100644
--- a/sys/arch/alpha/pci/mcpcia_dma.c
+++ b/sys/arch/alpha/pci/mcpcia_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_dma.c,v 1.16 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: mcpcia_dma.c,v 1.17 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.16 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.17 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,21 +51,21 @@ __KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c,v 1.16 2008/04/28 20:23:11 martin Exp $
#include <alpha/pci/mcpciavar.h>
#include <alpha/pci/pci_kn300.h>
-bus_dma_tag_t mcpcia_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t));
+bus_dma_tag_t mcpcia_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int mcpcia_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
+int mcpcia_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int mcpcia_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
+int mcpcia_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int mcpcia_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
+int mcpcia_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int mcpcia_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
+int mcpcia_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void mcpcia_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void mcpcia_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
/*
* Direct-mapped window: 2G at 2G
diff --git a/sys/arch/alpha/pci/mcpcia_pci.c b/sys/arch/alpha/pci/mcpcia_pci.c
index 7d6919aba12..bc176d62fb0 100644
--- a/sys/arch/alpha/pci/mcpcia_pci.c
+++ b/sys/arch/alpha/pci/mcpcia_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpcia_pci.c,v 1.5 2007/03/04 05:59:11 christos Exp $ */
+/* $NetBSD: mcpcia_pci.c,v 1.6 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcpcia_pci.c,v 1.5 2007/03/04 05:59:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcpcia_pci.c,v 1.6 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,18 +48,18 @@ __KERNEL_RCSID(0, "$NetBSD: mcpcia_pci.c,v 1.5 2007/03/04 05:59:11 christos Exp
#define KV(_addr) ((void *)ALPHA_PHYS_TO_K0SEG((_addr)))
-static void mcpcia_attach_hook __P((struct device *, struct device *,
- struct pcibus_attach_args *));
+static void mcpcia_attach_hook(struct device *, struct device *,
+ struct pcibus_attach_args *);
static int
-mcpcia_bus_maxdevs __P((void *, int));
+mcpcia_bus_maxdevs(void *, int);
static pcitag_t
-mcpcia_make_tag __P((void *, int, int, int));
+mcpcia_make_tag(void *, int, int, int);
static void
-mcpcia_decompose_tag __P((void *, pcitag_t, int *, int *, int *));
+mcpcia_decompose_tag(void *, pcitag_t, int *, int *, int *);
static pcireg_t
-mcpcia_conf_read __P((void *, pcitag_t, int));
+mcpcia_conf_read(void *, pcitag_t, int);
static void
-mcpcia_conf_write __P((void *, pcitag_t, int, pcireg_t));
+mcpcia_conf_write(void *, pcitag_t, int, pcireg_t);
void
mcpcia_pci_init(pc, v)
diff --git a/sys/arch/alpha/pci/mcpciavar.h b/sys/arch/alpha/pci/mcpciavar.h
index f529b820bc9..aae36ce083b 100644
--- a/sys/arch/alpha/pci/mcpciavar.h
+++ b/sys/arch/alpha/pci/mcpciavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mcpciavar.h,v 1.4 1999/04/16 02:18:07 thorpej Exp $ */
+/* $NetBSD: mcpciavar.h,v 1.5 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -68,19 +68,19 @@ struct mcpcia_softc {
struct mcpcia_config *mcpcia_cc; /* config info */
};
-void mcpcia_init __P((void));
-void mcpcia_config_cleanup __P((void));
+void mcpcia_init(void);
+void mcpcia_config_cleanup(void);
-void mcpcia_pci_init __P((pci_chipset_tag_t, void *));
-void mcpcia_dma_init __P((struct mcpcia_config *));
+void mcpcia_pci_init(pci_chipset_tag_t, void *);
+void mcpcia_dma_init(struct mcpcia_config *);
-void mcpcia_bus_io_init __P((bus_space_tag_t, void *));
-void mcpcia_bus_mem_init __P((bus_space_tag_t, void *));
+void mcpcia_bus_io_init(bus_space_tag_t, void *);
+void mcpcia_bus_mem_init(bus_space_tag_t, void *);
/*
* IO Interrupt handler.
*/
-void mcpcia_iointr __P((void *, unsigned long));
+void mcpcia_iointr(void *, unsigned long);
/*
* There are four PCI slots per MCPCIA PCI bus here, but some are 'hidden'-
diff --git a/sys/arch/alpha/pci/pci_1000.c b/sys/arch/alpha/pci/pci_1000.c
index cb236d10c02..a6e03be4cab 100644
--- a/sys/arch/alpha/pci/pci_1000.c
+++ b/sys/arch/alpha/pci/pci_1000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_1000.c,v 1.18 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_1000.c,v 1.19 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.18 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.19 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -88,22 +88,22 @@ __KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.18 2008/04/28 20:23:11 martin Exp $")
static bus_space_tag_t another_mystery_icu_iot;
static bus_space_handle_t another_mystery_icu_ioh;
-int dec_1000_intr_map __P((struct pci_attach_args *, pci_intr_handle_t *));
-const char *dec_1000_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_1000_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_1000_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_1000_intr_disestablish __P((void *, void *));
+int dec_1000_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+const char *dec_1000_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_1000_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_1000_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_1000_intr_disestablish(void *, void *);
#define PCI_NIRQ 16
#define PCI_STRAY_MAX 5
struct alpha_shared_intr *dec_1000_pci_intr;
-static void dec_1000_iointr __P((void *arg, unsigned long vec));
-static void dec_1000_enable_intr __P((int irq));
-static void dec_1000_disable_intr __P((int irq));
-static void pci_1000_imi __P((void));
+static void dec_1000_iointr(void *arg, unsigned long vec);
+static void dec_1000_enable_intr(int irq);
+static void dec_1000_disable_intr(int irq);
+static void pci_1000_imi(void);
static pci_chipset_tag_t pc_tag;
void
@@ -214,7 +214,7 @@ dec_1000_intr_establish(ccv, ih, level, func, arg)
void *ccv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_1000.h b/sys/arch/alpha/pci/pci_1000.h
index 1b304e231ea..4c41543167e 100644
--- a/sys/arch/alpha/pci/pci_1000.h
+++ b/sys/arch/alpha/pci/pci_1000.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_1000.h,v 1.2 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_1000.h,v 1.3 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -29,5 +29,5 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-void pci_1000_pickintr __P((void *, bus_space_tag_t, bus_space_tag_t,
- pci_chipset_tag_t));
+void pci_1000_pickintr(void *, bus_space_tag_t, bus_space_tag_t,
+ pci_chipset_tag_t);
diff --git a/sys/arch/alpha/pci/pci_1000a.c b/sys/arch/alpha/pci/pci_1000a.c
index 92745655b55..e7c8d56f684 100644
--- a/sys/arch/alpha/pci/pci_1000a.c
+++ b/sys/arch/alpha/pci/pci_1000a.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_1000a.c,v 1.20 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_1000a.c,v 1.21 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.20 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.21 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -94,20 +94,20 @@ __KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.20 2008/04/28 20:23:11 martin Exp $"
static bus_space_tag_t mystery_icu_iot;
static bus_space_handle_t mystery_icu_ioh[2];
-int dec_1000a_intr_map __P((struct pci_attach_args *,
- pci_intr_handle_t *));
-const char *dec_1000a_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_1000a_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_1000a_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_1000a_intr_disestablish __P((void *, void *));
+int dec_1000a_intr_map(struct pci_attach_args *,
+ pci_intr_handle_t *);
+const char *dec_1000a_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_1000a_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_1000a_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_1000a_intr_disestablish(void *, void *);
struct alpha_shared_intr *dec_1000a_pci_intr;
-static void dec_1000a_iointr __P((void *arg, unsigned long vec));
-static void dec_1000a_enable_intr __P((int irq));
-static void dec_1000a_disable_intr __P((int irq));
-static void pci_1000a_imi __P((void));
+static void dec_1000a_iointr(void *arg, unsigned long vec);
+static void dec_1000a_enable_intr(int irq);
+static void dec_1000a_disable_intr(int irq);
+static void pci_1000a_imi(void);
static pci_chipset_tag_t pc_tag;
void
@@ -235,7 +235,7 @@ dec_1000a_intr_establish(ccv, ih, level, func, arg)
void *ccv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_1000a.h b/sys/arch/alpha/pci/pci_1000a.h
index f69c5909ab5..cfc6abfa967 100644
--- a/sys/arch/alpha/pci/pci_1000a.h
+++ b/sys/arch/alpha/pci/pci_1000a.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_1000a.h,v 1.3 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_1000a.h,v 1.4 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -29,5 +29,5 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-void pci_1000a_pickintr __P((void *, bus_space_tag_t, bus_space_tag_t,
- pci_chipset_tag_t));
+void pci_1000a_pickintr(void *, bus_space_tag_t, bus_space_tag_t,
+ pci_chipset_tag_t);
diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index 2bb74ae541e..78d820ab5a1 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_2100_a50.c,v 1.32 2002/09/27 15:35:37 provos Exp $ */
+/* $NetBSD: pci_2100_a50.c,v 1.33 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.32 2002/09/27 15:35:37 provos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.33 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -56,12 +56,12 @@ __KERNEL_RCSID(0, "$NetBSD: pci_2100_a50.c,v 1.32 2002/09/27 15:35:37 provos Exp
#include "sio.h"
-int dec_2100_a50_intr_map __P((struct pci_attach_args *, pci_intr_handle_t *));
-const char *dec_2100_a50_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_2100_a50_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_2100_a50_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_2100_a50_intr_disestablish __P((void *, void *));
+int dec_2100_a50_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+const char *dec_2100_a50_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_2100_a50_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_2100_a50_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_2100_a50_intr_disestablish(void *, void *);
#define APECS_SIO_DEVICE 7 /* XXX */
@@ -247,7 +247,7 @@ dec_2100_a50_intr_establish(acv, ih, level, func, arg)
void *acv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
#if 0
struct apecs_config *acp = acv;
diff --git a/sys/arch/alpha/pci/pci_2100_a50.h b/sys/arch/alpha/pci/pci_2100_a50.h
index 86c6a2f3736..69410c361d5 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.h
+++ b/sys/arch/alpha/pci/pci_2100_a50.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_2100_a50.h,v 1.4 1997/04/07 01:59:59 cgd Exp $ */
+/* $NetBSD: pci_2100_a50.h,v 1.5 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -27,4 +27,4 @@
* rights to redistribute these changes.
*/
-void pci_2100_a50_pickintr __P((struct apecs_config *));
+void pci_2100_a50_pickintr(struct apecs_config *);
diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c
index 276cefab786..d5445bffbbd 100644
--- a/sys/arch/alpha/pci/pci_550.c
+++ b/sys/arch/alpha/pci/pci_550.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_550.c,v 1.28 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_550.c,v 1.29 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.28 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.29 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -90,16 +90,16 @@ __KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.28 2008/04/28 20:23:11 martin Exp $");
#include <alpha/pci/siovar.h>
#endif
-int dec_550_intr_map __P((struct pci_attach_args *,
- pci_intr_handle_t *));
-const char *dec_550_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_550_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_550_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_550_intr_disestablish __P((void *, void *));
+int dec_550_intr_map(struct pci_attach_args *,
+ pci_intr_handle_t *);
+const char *dec_550_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_550_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_550_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_550_intr_disestablish(void *, void *);
-void *dec_550_pciide_compat_intr_establish __P((void *, struct device *,
- struct pci_attach_args *, int, int (*)(void *), void *));
+void *dec_550_pciide_compat_intr_establish(void *, struct device *,
+ struct pci_attach_args *, int, int (*)(void *), void *);
#define DEC_550_PCI_IRQ_BEGIN 8
#define DEC_550_MAX_IRQ (64 - DEC_550_PCI_IRQ_BEGIN)
@@ -121,9 +121,9 @@ void *dec_550_pciide_compat_intr_establish __P((void *, struct device *,
struct alpha_shared_intr *dec_550_pci_intr;
-void dec_550_iointr __P((void *arg, unsigned long vec));
-void dec_550_intr_enable __P((int irq));
-void dec_550_intr_disable __P((int irq));
+void dec_550_iointr(void *arg, unsigned long vec);
+void dec_550_intr_enable(int irq);
+void dec_550_intr_disable(int irq);
void
pci_550_pickintr(ccp)
@@ -299,7 +299,7 @@ dec_550_intr_establish(ccv, ih, level, func, arg)
void *ccv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
#if 0
struct cia_config *ccp = ccv;
@@ -369,7 +369,7 @@ dec_550_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
struct device *dev;
struct pci_attach_args *pa;
int chan;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
pci_chipset_tag_t pc = pa->pa_pc;
diff --git a/sys/arch/alpha/pci/pci_550.h b/sys/arch/alpha/pci/pci_550.h
index e9a3a1d8e5a..f257bbf7a6a 100644
--- a/sys/arch/alpha/pci/pci_550.h
+++ b/sys/arch/alpha/pci/pci_550.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_550.h,v 1.4 2000/06/05 21:47:23 thorpej Exp $ */
+/* $NetBSD: pci_550.h,v 1.5 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -27,4 +27,4 @@
* rights to redistribute these changes.
*/
-void pci_550_pickintr __P((struct cia_config *));
+void pci_550_pickintr(struct cia_config *);
diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c
index 410ad7c28a5..e07f3fae561 100644
--- a/sys/arch/alpha/pci/pci_6600.c
+++ b/sys/arch/alpha/pci/pci_6600.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_6600.c,v 1.15 2007/12/03 15:33:07 ad Exp $ */
+/* $NetBSD: pci_6600.c,v 1.16 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.15 2007/12/03 15:33:07 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.16 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,20 +80,20 @@ __KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.15 2007/12/03 15:33:07 ad Exp $");
static const char *irqtype = "6600 irq";
static struct tsp_config *sioprimary;
-void dec_6600_intr_disestablish __P((void *, void *));
-void *dec_6600_intr_establish __P((
- void *, pci_intr_handle_t, int, int (*func)(void *), void *));
-const char *dec_6600_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_6600_intr_evcnt __P((void *, pci_intr_handle_t));
-int dec_6600_intr_map __P((struct pci_attach_args *, pci_intr_handle_t *));
-void *dec_6600_pciide_compat_intr_establish __P((void *, struct device *,
- struct pci_attach_args *, int, int (*)(void *), void *));
+void dec_6600_intr_disestablish(void *, void *);
+void *dec_6600_intr_establish(
+ void *, pci_intr_handle_t, int, int (*func)(void *), void *);
+const char *dec_6600_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_6600_intr_evcnt(void *, pci_intr_handle_t);
+int dec_6600_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+void *dec_6600_pciide_compat_intr_establish(void *, struct device *,
+ struct pci_attach_args *, int, int (*)(void *), void *);
struct alpha_shared_intr *dec_6600_pci_intr;
-void dec_6600_iointr __P((void *arg, unsigned long vec));
-extern void dec_6600_intr_enable __P((int irq));
-extern void dec_6600_intr_disable __P((int irq));
+void dec_6600_iointr(void *arg, unsigned long vec);
+extern void dec_6600_intr_enable(int irq);
+extern void dec_6600_intr_disable(int irq);
void
pci_6600_pickintr(pcp)
@@ -225,7 +225,7 @@ dec_6600_intr_establish(acv, ih, level, func, arg)
void *acv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
void *cookie;
@@ -330,7 +330,7 @@ dec_6600_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
struct device *dev;
struct pci_attach_args *pa;
int chan;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
pci_chipset_tag_t pc = pa->pa_pc;
diff --git a/sys/arch/alpha/pci/pci_6600.h b/sys/arch/alpha/pci/pci_6600.h
index 4018de16ee3..6cb574c06fc 100644
--- a/sys/arch/alpha/pci/pci_6600.h
+++ b/sys/arch/alpha/pci/pci_6600.h
@@ -1,5 +1,5 @@
-/* $NetBSD: pci_6600.h,v 1.1 1999/06/29 06:46:46 ross Exp $ */
+/* $NetBSD: pci_6600.h,v 1.2 2009/03/14 14:45:53 dsl Exp $ */
/* Public Domain */
-void pci_6600_pickintr __P((struct tsp_config *));
+void pci_6600_pickintr(struct tsp_config *);
diff --git a/sys/arch/alpha/pci/pci_a12.c b/sys/arch/alpha/pci/pci_a12.c
index 7354cfc3890..899ebd3cc1c 100644
--- a/sys/arch/alpha/pci/pci_a12.c
+++ b/sys/arch/alpha/pci/pci_a12.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_a12.c,v 1.7 2000/06/29 08:58:48 mrg Exp $ */
+/* $NetBSD: pci_a12.c,v 1.8 2009/03/14 14:45:53 dsl Exp $ */
/* [Notice revision 2.0]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -38,7 +38,7 @@
#include "opt_avalon_a12.h" /* Config options headers */
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_a12.c,v 1.7 2000/06/29 08:58:48 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_a12.c,v 1.8 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -65,12 +65,12 @@ __KERNEL_RCSID(0, "$NetBSD: pci_a12.c,v 1.7 2000/06/29 08:58:48 mrg Exp $");
#define LOADGSR() (REGVAL(A12_GSR) & 0x7fc0)
-static int pci_serr __P((void *));
-static int a12_xbar_flag __P((void *));
+static int pci_serr(void *);
+static int a12_xbar_flag(void *);
struct a12_intr_vect_t {
int on;
- int (*f) __P((void *));
+ int (*f)(void *);
void *a;
} a12_intr_pci = { 0 },
a12_intr_serr = { 1, pci_serr },
@@ -101,18 +101,18 @@ static struct gintcall {
struct evcnt a12_intr_evcnt;
-int avalon_a12_intr_map __P((void *, pcitag_t, int, int,
- pci_intr_handle_t *));
-const char *avalon_a12_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *avalon_a12_intr_evcnt __P((void *, pci_intr_handle_t));
-void *avalon_a12_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void avalon_a12_intr_disestablish __P((void *, void *));
+int avalon_a12_intr_map(void *, pcitag_t, int, int,
+ pci_intr_handle_t *);
+const char *avalon_a12_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *avalon_a12_intr_evcnt(void *, pci_intr_handle_t);
+void *avalon_a12_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void avalon_a12_intr_disestablish(void *, void *);
-static void clear_gsr_interrupt __P((long));
+static void clear_gsr_interrupt(long);
static void a12_GInt(void);
-void a12_iointr __P((void *framep, unsigned long vec));
+void a12_iointr(void *framep, unsigned long vec);
void
pci_a12_pickintr(ccp)
@@ -170,7 +170,7 @@ avalon_a12_intr_establish(ccv, ih, level, func, arg)
void *ccv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
a12_intr_pci.f = func;
a12_intr_pci.a = arg;
@@ -195,14 +195,14 @@ avalon_a12_intr_disestablish(ccv, cookie)
}
void a12_intr_register_xb(f)
- int (*f) __P((void *));
+ int (*f)(void *);
{
a12_intr_xb.f = f;
a12_intr_xb.on = 1;
}
void a12_intr_register_icw(f)
- int (*f) __P((void *));
+ int (*f)(void *);
{
long t;
diff --git a/sys/arch/alpha/pci/pci_a12.h b/sys/arch/alpha/pci/pci_a12.h
index 03997b9edd1..7d204f096a7 100644
--- a/sys/arch/alpha/pci/pci_a12.h
+++ b/sys/arch/alpha/pci/pci_a12.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_a12.h,v 1.3 2000/06/05 21:47:23 thorpej Exp $ */
+/* $NetBSD: pci_a12.h,v 1.4 2009/03/14 14:45:53 dsl Exp $ */
/* [Notice revision 2.0]
* Copyright (c) 1997 Avalon Computer Systems, Inc.
@@ -39,6 +39,6 @@
#define PCI_A12_H() /* Generate ctags(1) key */
-void pci_a12_pickintr __P((struct a12c_config *));
+void pci_a12_pickintr(struct a12c_config *);
#endif
diff --git a/sys/arch/alpha/pci/pci_alphabook1.c b/sys/arch/alpha/pci/pci_alphabook1.c
index ded8604ed68..e775dd83feb 100644
--- a/sys/arch/alpha/pci/pci_alphabook1.c
+++ b/sys/arch/alpha/pci/pci_alphabook1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_alphabook1.c,v 1.9 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_alphabook1.c,v 1.10 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_alphabook1.c,v 1.9 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_alphabook1.c,v 1.10 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -86,12 +86,12 @@ __KERNEL_RCSID(0, "$NetBSD: pci_alphabook1.c,v 1.9 2008/04/28 20:23:11 martin Ex
#include "sio.h"
-int dec_alphabook1_intr_map __P((struct pci_attach_args *, pci_intr_handle_t *));
-const char *dec_alphabook1_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_alphabook1_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_alphabook1_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_alphabook1_intr_disestablish __P((void *, void *));
+int dec_alphabook1_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+const char *dec_alphabook1_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_alphabook1_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_alphabook1_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_alphabook1_intr_disestablish(void *, void *);
#define LCA_SIO_DEVICE 7 /* XXX */
@@ -206,7 +206,7 @@ dec_alphabook1_intr_establish(lcv, ih, level, func, arg)
void *lcv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
#if 0
struct lca_config *lcp = lcv;
diff --git a/sys/arch/alpha/pci/pci_alphabook1.h b/sys/arch/alpha/pci/pci_alphabook1.h
index 731f8a43639..d5a093c0eab 100644
--- a/sys/arch/alpha/pci/pci_alphabook1.h
+++ b/sys/arch/alpha/pci/pci_alphabook1.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_alphabook1.h,v 1.1 1998/06/26 05:42:35 thorpej Exp $ */
+/* $NetBSD: pci_alphabook1.h,v 1.2 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -27,4 +27,4 @@
* rights to redistribute these changes.
*/
-void pci_alphabook1_pickintr __P((struct lca_config *));
+void pci_alphabook1_pickintr(struct lca_config *);
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index da1ca191de5..04bb87c4b7d 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_axppci_33.c,v 1.29 2002/09/27 15:35:38 provos Exp $ */
+/* $NetBSD: pci_axppci_33.c,v 1.30 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.29 2002/09/27 15:35:38 provos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.30 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -56,12 +56,12 @@ __KERNEL_RCSID(0, "$NetBSD: pci_axppci_33.c,v 1.29 2002/09/27 15:35:38 provos Ex
#include "sio.h"
-int dec_axppci_33_intr_map __P((struct pci_attach_args *, pci_intr_handle_t *));
-const char *dec_axppci_33_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_axppci_33_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_axppci_33_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_axppci_33_intr_disestablish __P((void *, void *));
+int dec_axppci_33_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+const char *dec_axppci_33_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_axppci_33_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_axppci_33_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_axppci_33_intr_disestablish(void *, void *);
#define LCA_SIO_DEVICE 7 /* XXX */
@@ -247,7 +247,7 @@ dec_axppci_33_intr_establish(lcv, ih, level, func, arg)
void *lcv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
#if 0
struct lca_config *lcp = lcv;
diff --git a/sys/arch/alpha/pci/pci_axppci_33.h b/sys/arch/alpha/pci/pci_axppci_33.h
index 9473715b513..4a51a8d0e11 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.h
+++ b/sys/arch/alpha/pci/pci_axppci_33.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_axppci_33.h,v 1.4 1997/04/07 02:00:00 cgd Exp $ */
+/* $NetBSD: pci_axppci_33.h,v 1.5 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -27,4 +27,4 @@
* rights to redistribute these changes.
*/
-void pci_axppci_33_pickintr __P((struct lca_config *));
+void pci_axppci_33_pickintr(struct lca_config *);
diff --git a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
index f79019334a8..0c68db489c1 100644
--- a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
+++ b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.17 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_bwx_bus_io_chipdep.c,v 1.18 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_io_chipdep.c,v 1.17 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_io_chipdep.c,v 1.18 2009/03/14 14:45:53 dsl Exp $");
#include <sys/extent.h>
@@ -86,124 +86,124 @@ __KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_io_chipdep.c,v 1.17 2008/04/28 20:23:11
#define __S(S) __STRING(S)
/* mapping/unmapping */
-int __C(CHIP,_io_map) __P((void *, bus_addr_t, bus_size_t, int,
- bus_space_handle_t *, int));
-void __C(CHIP,_io_unmap) __P((void *, bus_space_handle_t,
- bus_size_t, int));
-int __C(CHIP,_io_subregion) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
-
-int __C(CHIP,_io_translate) __P((void *, bus_addr_t, bus_size_t,
- int, struct alpha_bus_space_translation *));
-int __C(CHIP,_io_get_window) __P((void *, int,
- struct alpha_bus_space_translation *));
+int __C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int,
+ bus_space_handle_t *, int);
+void __C(CHIP,_io_unmap)(void *, bus_space_handle_t,
+ bus_size_t, int);
+int __C(CHIP,_io_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
+
+int __C(CHIP,_io_translate)(void *, bus_addr_t, bus_size_t,
+ int, struct alpha_bus_space_translation *);
+int __C(CHIP,_io_get_window)(void *, int,
+ struct alpha_bus_space_translation *);
/* allocation/deallocation */
-int __C(CHIP,_io_alloc) __P((void *, bus_addr_t, bus_addr_t,
+int __C(CHIP,_io_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
- bus_space_handle_t *));
-void __C(CHIP,_io_free) __P((void *, bus_space_handle_t,
- bus_size_t));
+ bus_space_handle_t *);
+void __C(CHIP,_io_free)(void *, bus_space_handle_t,
+ bus_size_t);
/* get kernel virtual address */
-void * __C(CHIP,_io_vaddr) __P((void *, bus_space_handle_t));
+void * __C(CHIP,_io_vaddr)(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t __C(CHIP,_io_mmap) __P((void *, bus_addr_t, off_t, int, int));
+paddr_t __C(CHIP,_io_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-inline void __C(CHIP,_io_barrier) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int));
+inline void __C(CHIP,_io_barrier)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
/* read (single) */
-inline u_int8_t __C(CHIP,_io_read_1) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int16_t __C(CHIP,_io_read_2) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int32_t __C(CHIP,_io_read_4) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int64_t __C(CHIP,_io_read_8) __P((void *, bus_space_handle_t,
- bus_size_t));
+inline u_int8_t __C(CHIP,_io_read_1)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int32_t __C(CHIP,_io_read_4)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int64_t __C(CHIP,_io_read_8)(void *, bus_space_handle_t,
+ bus_size_t);
/* read multiple */
-void __C(CHIP,_io_read_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_io_read_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_io_read_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_io_read_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_io_read_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_io_read_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_io_read_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_io_read_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region */
-void __C(CHIP,_io_read_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_io_read_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_io_read_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_io_read_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_io_read_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_io_read_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_io_read_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_io_read_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
-inline void __C(CHIP,_io_write_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
-inline void __C(CHIP,_io_write_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
-inline void __C(CHIP,_io_write_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
-inline void __C(CHIP,_io_write_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t));
+inline void __C(CHIP,_io_write_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+inline void __C(CHIP,_io_write_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+inline void __C(CHIP,_io_write_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+inline void __C(CHIP,_io_write_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
/* write multiple */
-void __C(CHIP,_io_write_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_io_write_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_io_write_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_io_write_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_io_write_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_io_write_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_io_write_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_io_write_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* write region */
-void __C(CHIP,_io_write_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_io_write_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_io_write_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_io_write_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_io_write_region_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_io_write_region_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_io_write_region_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_io_write_region_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* set multiple */
-void __C(CHIP,_io_set_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_io_set_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_io_set_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_io_set_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_io_set_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_io_set_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_io_set_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_io_set_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* set region */
-void __C(CHIP,_io_set_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_io_set_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_io_set_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_io_set_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_io_set_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_io_set_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_io_set_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_io_set_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* copy */
-void __C(CHIP,_io_copy_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_io_copy_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_io_copy_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_io_copy_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void __C(CHIP,_io_copy_region_1)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_io_copy_region_2)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_io_copy_region_4)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_io_copy_region_8)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
#ifndef CHIP_IO_EX_STORE
static long
diff --git a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
index 14af6cc9f7e..49a848b07d7 100644
--- a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
+++ b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.21 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.22 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.21 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.22 2009/03/14 14:45:53 dsl Exp $");
#include <sys/extent.h>
@@ -86,124 +86,124 @@ __KERNEL_RCSID(1, "$NetBSD: pci_bwx_bus_mem_chipdep.c,v 1.21 2008/04/28 20:23:11
#define __S(S) __STRING(S)
/* mapping/unmapping */
-int __C(CHIP,_mem_map) __P((void *, bus_addr_t, bus_size_t, int,
- bus_space_handle_t *, int));
-void __C(CHIP,_mem_unmap) __P((void *, bus_space_handle_t,
- bus_size_t, int));
-int __C(CHIP,_mem_subregion) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
-
-int __C(CHIP,_mem_translate) __P((void *, bus_addr_t, bus_size_t,
- int, struct alpha_bus_space_translation *));
-int __C(CHIP,_mem_get_window) __P((void *, int,
- struct alpha_bus_space_translation *));
+int __C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int,
+ bus_space_handle_t *, int);
+void __C(CHIP,_mem_unmap)(void *, bus_space_handle_t,
+ bus_size_t, int);
+int __C(CHIP,_mem_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
+
+int __C(CHIP,_mem_translate)(void *, bus_addr_t, bus_size_t,
+ int, struct alpha_bus_space_translation *);
+int __C(CHIP,_mem_get_window)(void *, int,
+ struct alpha_bus_space_translation *);
/* allocation/deallocation */
-int __C(CHIP,_mem_alloc) __P((void *, bus_addr_t, bus_addr_t,
+int __C(CHIP,_mem_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
- bus_space_handle_t *));
-void __C(CHIP,_mem_free) __P((void *, bus_space_handle_t,
- bus_size_t));
+ bus_space_handle_t *);
+void __C(CHIP,_mem_free)(void *, bus_space_handle_t,
+ bus_size_t);
/* get kernel virtual address */
-void * __C(CHIP,_mem_vaddr) __P((void *, bus_space_handle_t));
+void * __C(CHIP,_mem_vaddr)(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t __C(CHIP,_mem_mmap) __P((void *, bus_addr_t, off_t, int, int));
+paddr_t __C(CHIP,_mem_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-inline void __C(CHIP,_mem_barrier) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int));
+inline void __C(CHIP,_mem_barrier)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
/* read (single) */
-inline u_int8_t __C(CHIP,_mem_read_1) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int16_t __C(CHIP,_mem_read_2) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int32_t __C(CHIP,_mem_read_4) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int64_t __C(CHIP,_mem_read_8) __P((void *, bus_space_handle_t,
- bus_size_t));
+inline u_int8_t __C(CHIP,_mem_read_1)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int16_t __C(CHIP,_mem_read_2)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int32_t __C(CHIP,_mem_read_4)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int64_t __C(CHIP,_mem_read_8)(void *, bus_space_handle_t,
+ bus_size_t);
/* read multiple */
-void __C(CHIP,_mem_read_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_read_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_read_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_read_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_read_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_read_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_read_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_read_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region */
-void __C(CHIP,_mem_read_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_read_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_read_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_read_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_read_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_read_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_read_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_read_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
-inline void __C(CHIP,_mem_write_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
-inline void __C(CHIP,_mem_write_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
-inline void __C(CHIP,_mem_write_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
-inline void __C(CHIP,_mem_write_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t));
+inline void __C(CHIP,_mem_write_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+inline void __C(CHIP,_mem_write_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+inline void __C(CHIP,_mem_write_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+inline void __C(CHIP,_mem_write_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
/* write multiple */
-void __C(CHIP,_mem_write_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_write_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_write_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_write_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_write_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_write_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_write_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_write_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* write region */
-void __C(CHIP,_mem_write_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_write_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_write_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_write_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_write_region_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_write_region_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_write_region_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_write_region_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* set multiple */
-void __C(CHIP,_mem_set_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_mem_set_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_mem_set_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_mem_set_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_mem_set_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_mem_set_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_mem_set_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_mem_set_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* set region */
-void __C(CHIP,_mem_set_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_mem_set_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_mem_set_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_mem_set_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_mem_set_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_mem_set_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_mem_set_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_mem_set_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* copy */
-void __C(CHIP,_mem_copy_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_mem_copy_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_mem_copy_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_mem_copy_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void __C(CHIP,_mem_copy_region_1)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_mem_copy_region_2)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_mem_copy_region_4)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_mem_copy_region_8)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
#ifndef CHIP_MEM_EX_STORE
static long
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index cb4d5f8d772..8100361c84e 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb164.c,v 1.36 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_eb164.c,v 1.37 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.36 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.37 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -90,15 +90,15 @@ __KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.36 2008/04/28 20:23:11 martin Exp $"
#include <alpha/pci/siovar.h>
#endif
-int dec_eb164_intr_map __P((struct pci_attach_args *, pci_intr_handle_t *));
-const char *dec_eb164_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_eb164_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_eb164_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_eb164_intr_disestablish __P((void *, void *));
+int dec_eb164_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
+const char *dec_eb164_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_eb164_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_eb164_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_eb164_intr_disestablish(void *, void *);
-void *dec_eb164_pciide_compat_intr_establish __P((void *, struct device *,
- struct pci_attach_args *, int, int (*)(void *), void *));
+void *dec_eb164_pciide_compat_intr_establish(void *, struct device *,
+ struct pci_attach_args *, int, int (*)(void *), void *);
#define EB164_SIO_IRQ 4
#define EB164_MAX_IRQ 24
@@ -109,9 +109,9 @@ struct alpha_shared_intr *eb164_pci_intr;
bus_space_tag_t eb164_intrgate_iot;
bus_space_handle_t eb164_intrgate_ioh;
-void eb164_iointr __P((void *arg, unsigned long vec));
-extern void eb164_intr_enable __P((int irq)); /* pci_eb164_intr.S */
-extern void eb164_intr_disable __P((int irq)); /* pci_eb164_intr.S */
+void eb164_iointr(void *arg, unsigned long vec);
+extern void eb164_intr_enable(int irq); /* pci_eb164_intr.S */
+extern void eb164_intr_disable(int irq); /* pci_eb164_intr.S */
void
pci_eb164_pickintr(ccp)
@@ -271,7 +271,7 @@ dec_eb164_intr_establish(ccv, ih, level, func, arg)
void *ccv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
#if 0
struct cia_config *ccp = ccv;
@@ -324,7 +324,7 @@ dec_eb164_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
struct device *dev;
struct pci_attach_args *pa;
int chan;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
pci_chipset_tag_t pc = pa->pa_pc;
diff --git a/sys/arch/alpha/pci/pci_eb164.h b/sys/arch/alpha/pci/pci_eb164.h
index a05358ee71d..0e0efe2e154 100644
--- a/sys/arch/alpha/pci/pci_eb164.h
+++ b/sys/arch/alpha/pci/pci_eb164.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb164.h,v 1.3 2000/06/05 21:47:25 thorpej Exp $ */
+/* $NetBSD: pci_eb164.h,v 1.4 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -27,4 +27,4 @@
* rights to redistribute these changes.
*/
-void pci_eb164_pickintr __P((struct cia_config *));
+void pci_eb164_pickintr(struct cia_config *);
diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c
index b8a42c2c9f0..ab944e6d9ee 100644
--- a/sys/arch/alpha/pci/pci_eb64plus.c
+++ b/sys/arch/alpha/pci/pci_eb64plus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb64plus.c,v 1.16 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_eb64plus.c,v 1.17 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.16 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.17 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -87,13 +87,13 @@ __KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.16 2008/04/28 20:23:11 martin Exp
#include <alpha/pci/siovar.h>
#endif
-int dec_eb64plus_intr_map __P((struct pci_attach_args *,
- pci_intr_handle_t *));
-const char *dec_eb64plus_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_eb64plus_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_eb64plus_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_eb64plus_intr_disestablish __P((void *, void *));
+int dec_eb64plus_intr_map(struct pci_attach_args *,
+ pci_intr_handle_t *);
+const char *dec_eb64plus_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_eb64plus_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_eb64plus_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_eb64plus_intr_disestablish(void *, void *);
#define EB64PLUS_MAX_IRQ 32
#define PCI_STRAY_MAX 5
@@ -103,9 +103,9 @@ struct alpha_shared_intr *eb64plus_pci_intr;
bus_space_tag_t eb64plus_intrgate_iot;
bus_space_handle_t eb64plus_intrgate_ioh;
-void eb64plus_iointr __P((void *arg, unsigned long vec));
-extern void eb64plus_intr_enable __P((int irq)); /* pci_eb64plus_intr.S */
-extern void eb64plus_intr_disable __P((int irq)); /* pci_eb64plus_intr.S */
+void eb64plus_iointr(void *arg, unsigned long vec);
+extern void eb64plus_intr_enable(int irq); /* pci_eb64plus_intr.S */
+extern void eb64plus_intr_disable(int irq); /* pci_eb64plus_intr.S */
void
pci_eb64plus_pickintr(acp)
@@ -218,7 +218,7 @@ dec_eb64plus_intr_establish(acv, ih, level, func, arg)
void *acv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_eb64plus.h b/sys/arch/alpha/pci/pci_eb64plus.h
index e98c17792dc..674108c51be 100644
--- a/sys/arch/alpha/pci/pci_eb64plus.h
+++ b/sys/arch/alpha/pci/pci_eb64plus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb64plus.h,v 1.2 2000/06/05 21:47:26 thorpej Exp $ */
+/* $NetBSD: pci_eb64plus.h,v 1.3 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -27,4 +27,4 @@
* rights to redistribute these changes.
*/
-void pci_eb64plus_pickintr __P((struct apecs_config *));
+void pci_eb64plus_pickintr(struct apecs_config *);
diff --git a/sys/arch/alpha/pci/pci_eb66.c b/sys/arch/alpha/pci/pci_eb66.c
index 98aca575096..aacb3a489e5 100644
--- a/sys/arch/alpha/pci/pci_eb66.c
+++ b/sys/arch/alpha/pci/pci_eb66.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb66.c,v 1.16 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_eb66.c,v 1.17 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.16 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.17 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -87,13 +87,13 @@ __KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.16 2008/04/28 20:23:11 martin Exp $")
#include <alpha/pci/siovar.h>
#endif
-int dec_eb66_intr_map __P((struct pci_attach_args *,
- pci_intr_handle_t *));
-const char *dec_eb66_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_eb66_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_eb66_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_eb66_intr_disestablish __P((void *, void *));
+int dec_eb66_intr_map(struct pci_attach_args *,
+ pci_intr_handle_t *);
+const char *dec_eb66_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_eb66_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_eb66_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_eb66_intr_disestablish(void *, void *);
#define EB66_MAX_IRQ 32
#define PCI_STRAY_MAX 5
@@ -103,9 +103,9 @@ struct alpha_shared_intr *eb66_pci_intr;
bus_space_tag_t eb66_intrgate_iot;
bus_space_handle_t eb66_intrgate_ioh;
-void eb66_iointr __P((void *arg, unsigned long vec));
-extern void eb66_intr_enable __P((int irq)); /* pci_eb66_intr.S */
-extern void eb66_intr_disable __P((int irq)); /* pci_eb66_intr.S */
+void eb66_iointr(void *arg, unsigned long vec);
+extern void eb66_intr_enable(int irq); /* pci_eb66_intr.S */
+extern void eb66_intr_disable(int irq); /* pci_eb66_intr.S */
void
pci_eb66_pickintr(lcp)
@@ -218,7 +218,7 @@ dec_eb66_intr_establish(lcv, ih, level, func, arg)
void *lcv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
void *cookie;
diff --git a/sys/arch/alpha/pci/pci_eb66.h b/sys/arch/alpha/pci/pci_eb66.h
index d832b26a344..30fa1b1b522 100644
--- a/sys/arch/alpha/pci/pci_eb66.h
+++ b/sys/arch/alpha/pci/pci_eb66.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_eb66.h,v 1.1 1998/06/27 10:10:51 thorpej Exp $ */
+/* $NetBSD: pci_eb66.h,v 1.2 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -27,4 +27,4 @@
* rights to redistribute these changes.
*/
-void pci_eb66_pickintr __P((struct lca_config *));
+void pci_eb66_pickintr(struct lca_config *);
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index 16a80e17700..5c962640ac9 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn20aa.c,v 1.47 2007/12/03 15:33:08 ad Exp $ */
+/* $NetBSD: pci_kn20aa.c,v 1.48 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.47 2007/12/03 15:33:08 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.48 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -57,13 +57,13 @@ __KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.47 2007/12/03 15:33:08 ad Exp $");
#include <alpha/pci/siovar.h>
#endif
-int dec_kn20aa_intr_map __P((struct pci_attach_args *,
- pci_intr_handle_t *));
-const char *dec_kn20aa_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_kn20aa_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_kn20aa_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_kn20aa_intr_disestablish __P((void *, void *));
+int dec_kn20aa_intr_map(struct pci_attach_args *,
+ pci_intr_handle_t *);
+const char *dec_kn20aa_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_kn20aa_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_kn20aa_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_kn20aa_intr_disestablish(void *, void *);
#define KN20AA_PCEB_IRQ 31
#define KN20AA_MAX_IRQ 32
@@ -71,9 +71,9 @@ void dec_kn20aa_intr_disestablish __P((void *, void *));
struct alpha_shared_intr *kn20aa_pci_intr;
-void kn20aa_iointr __P((void *arg, unsigned long vec));
-void kn20aa_enable_intr __P((int irq));
-void kn20aa_disable_intr __P((int irq));
+void kn20aa_iointr(void *arg, unsigned long vec);
+void kn20aa_enable_intr(int irq);
+void kn20aa_disable_intr(int irq);
void
pci_kn20aa_pickintr(ccp)
@@ -216,7 +216,7 @@ dec_kn20aa_intr_establish(ccv, ih, level, func, arg)
void *ccv, *arg;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
#if 0
struct cia_config *ccp = ccv;
diff --git a/sys/arch/alpha/pci/pci_kn20aa.h b/sys/arch/alpha/pci/pci_kn20aa.h
index a813daba618..2167a141001 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.h
+++ b/sys/arch/alpha/pci/pci_kn20aa.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn20aa.h,v 1.4 2000/06/05 21:47:27 thorpej Exp $ */
+/* $NetBSD: pci_kn20aa.h,v 1.5 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -27,4 +27,4 @@
* rights to redistribute these changes.
*/
-void pci_kn20aa_pickintr __P((struct cia_config *));
+void pci_kn20aa_pickintr(struct cia_config *);
diff --git a/sys/arch/alpha/pci/pci_kn300.c b/sys/arch/alpha/pci/pci_kn300.c
index fea1ae3e35d..a65098725ba 100644
--- a/sys/arch/alpha/pci/pci_kn300.c
+++ b/sys/arch/alpha/pci/pci_kn300.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn300.c,v 1.29 2007/12/03 15:33:08 ad Exp $ */
+/* $NetBSD: pci_kn300.c,v 1.30 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.29 2007/12/03 15:33:08 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.30 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -61,13 +61,13 @@ __KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.29 2007/12/03 15:33:08 ad Exp $");
#include <alpha/pci/siovar.h>
#endif
-int dec_kn300_intr_map __P((struct pci_attach_args *,
- pci_intr_handle_t *));
-const char *dec_kn300_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_kn300_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_kn300_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_kn300_intr_disestablish __P((void *, void *));
+int dec_kn300_intr_map(struct pci_attach_args *,
+ pci_intr_handle_t *);
+const char *dec_kn300_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_kn300_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_kn300_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_kn300_intr_disestablish(void *, void *);
#define KN300_PCEB_IRQ 16
#define NPIN 4
@@ -79,9 +79,9 @@ static struct alpha_shared_intr *kn300_pci_intr;
static struct mcpcia_config *mcpcia_eisaccp = NULL;
-void kn300_iointr __P((void *, unsigned long));
-void kn300_enable_intr __P((struct mcpcia_config *, int));
-void kn300_disable_intr __P((struct mcpcia_config *, int));
+void kn300_iointr(void *, unsigned long);
+void kn300_enable_intr(struct mcpcia_config *, int);
+void kn300_disable_intr(struct mcpcia_config *, int);
void
pci_kn300_pickintr(ccp, first)
@@ -206,7 +206,7 @@ dec_kn300_intr_establish(ccv, ih, level, func, arg)
void *ccv;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
struct mcpcia_config *ccp = ccv;
diff --git a/sys/arch/alpha/pci/pci_kn300.h b/sys/arch/alpha/pci/pci_kn300.h
index a8a5dff55fe..b53ac0228e3 100644
--- a/sys/arch/alpha/pci/pci_kn300.h
+++ b/sys/arch/alpha/pci/pci_kn300.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn300.h,v 1.2 2000/06/05 21:47:27 thorpej Exp $ */
+/* $NetBSD: pci_kn300.h,v 1.3 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1998 by Matthew Jacob
@@ -30,4 +30,4 @@
* SUCH DAMAGE.
*/
-void pci_kn300_pickintr __P((struct mcpcia_config *, int));
+void pci_kn300_pickintr(struct mcpcia_config *, int);
diff --git a/sys/arch/alpha/pci/pci_kn8ae.c b/sys/arch/alpha/pci/pci_kn8ae.c
index 56e81f86b20..1f48b1bd970 100644
--- a/sys/arch/alpha/pci/pci_kn8ae.c
+++ b/sys/arch/alpha/pci/pci_kn8ae.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn8ae.c,v 1.21 2002/05/15 16:57:43 thorpej Exp $ */
+/* $NetBSD: pci_kn8ae.c,v 1.22 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.21 2002/05/15 16:57:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.22 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -54,18 +54,18 @@ __KERNEL_RCSID(0, "$NetBSD: pci_kn8ae.c,v 1.21 2002/05/15 16:57:43 thorpej Exp $
#include <alpha/pci/dwlpxvar.h>
#include <alpha/pci/pci_kn8ae.h>
-int dec_kn8ae_intr_map __P((struct pci_attach_args *,
- pci_intr_handle_t *));
-const char *dec_kn8ae_intr_string __P((void *, pci_intr_handle_t));
-const struct evcnt *dec_kn8ae_intr_evcnt __P((void *, pci_intr_handle_t));
-void *dec_kn8ae_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*func)(void *), void *));
-void dec_kn8ae_intr_disestablish __P((void *, void *));
+int dec_kn8ae_intr_map(struct pci_attach_args *,
+ pci_intr_handle_t *);
+const char *dec_kn8ae_intr_string(void *, pci_intr_handle_t);
+const struct evcnt *dec_kn8ae_intr_evcnt(void *, pci_intr_handle_t);
+void *dec_kn8ae_intr_establish(void *, pci_intr_handle_t,
+ int, int (*func)(void *), void *);
+void dec_kn8ae_intr_disestablish(void *, void *);
static u_int32_t imaskcache[DWLPX_NIONODE][DWLPX_NHOSE][NHPC];
-void kn8ae_spurious __P((void *, u_long));
-void kn8ae_enadis_intr __P((struct dwlpx_config *, pci_intr_handle_t, int));
+void kn8ae_spurious(void *, u_long);
+void kn8ae_enadis_intr(struct dwlpx_config *, pci_intr_handle_t, int);
void
pci_kn8ae_pickintr(ccp, first)
@@ -165,7 +165,7 @@ dec_kn8ae_intr_establish(ccv, ih, level, func, arg)
void *ccv;
pci_intr_handle_t ih;
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
struct dwlpx_config *ccp = ccv;
diff --git a/sys/arch/alpha/pci/pci_kn8ae.h b/sys/arch/alpha/pci/pci_kn8ae.h
index 0dc772910e9..2b3e11223d1 100644
--- a/sys/arch/alpha/pci/pci_kn8ae.h
+++ b/sys/arch/alpha/pci/pci_kn8ae.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_kn8ae.h,v 1.4 2000/06/05 21:47:28 thorpej Exp $ */
+/* $NetBSD: pci_kn8ae.h,v 1.5 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -30,4 +30,4 @@
* SUCH DAMAGE.
*/
-void pci_kn8ae_pickintr __P((struct dwlpx_config *, int));
+void pci_kn8ae_pickintr(struct dwlpx_config *, int);
diff --git a/sys/arch/alpha/pci/pci_machdep.c b/sys/arch/alpha/pci/pci_machdep.c
index d81392f2615..06103f95f73 100644
--- a/sys/arch/alpha/pci/pci_machdep.c
+++ b/sys/arch/alpha/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.15 2001/07/16 00:55:17 elric Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.16 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.15 2001/07/16 00:55:17 elric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.16 2009/03/14 14:45:53 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -70,8 +70,8 @@ pci_display_console(iot, memt, pc, bus, device, function)
pcitag_t tag;
pcireg_t id, class;
int match, nmatch;
- int (*fn) __P((bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t,
- int, int, int));
+ int (*fn)(bus_space_tag_t, bus_space_tag_t, pci_chipset_tag_t,
+ int, int, int);
tag = pci_make_tag(pc, bus, device, function);
id = pci_conf_read(pc, tag, PCI_ID_REG);
diff --git a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
index 46e07be5b62..6747afa71cd 100644
--- a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_swiz_bus_io_chipdep.c,v 1.36 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_swiz_bus_io_chipdep.c,v 1.37 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_io_chipdep.c,v 1.36 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_io_chipdep.c,v 1.37 2009/03/14 14:45:53 dsl Exp $");
#include <sys/extent.h>
@@ -84,124 +84,124 @@ __KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_io_chipdep.c,v 1.36 2008/04/28 20:23:11
#define __S(S) __STRING(S)
/* mapping/unmapping */
-int __C(CHIP,_io_map) __P((void *, bus_addr_t, bus_size_t, int,
- bus_space_handle_t *, int));
-void __C(CHIP,_io_unmap) __P((void *, bus_space_handle_t,
- bus_size_t, int));
-int __C(CHIP,_io_subregion) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
-
-int __C(CHIP,_io_translate) __P((void *, bus_addr_t, bus_size_t,
- int, struct alpha_bus_space_translation *));
-int __C(CHIP,_io_get_window) __P((void *, int,
- struct alpha_bus_space_translation *));
+int __C(CHIP,_io_map)(void *, bus_addr_t, bus_size_t, int,
+ bus_space_handle_t *, int);
+void __C(CHIP,_io_unmap)(void *, bus_space_handle_t,
+ bus_size_t, int);
+int __C(CHIP,_io_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
+
+int __C(CHIP,_io_translate)(void *, bus_addr_t, bus_size_t,
+ int, struct alpha_bus_space_translation *);
+int __C(CHIP,_io_get_window)(void *, int,
+ struct alpha_bus_space_translation *);
/* allocation/deallocation */
-int __C(CHIP,_io_alloc) __P((void *, bus_addr_t, bus_addr_t,
+int __C(CHIP,_io_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
- bus_space_handle_t *));
-void __C(CHIP,_io_free) __P((void *, bus_space_handle_t,
- bus_size_t));
+ bus_space_handle_t *);
+void __C(CHIP,_io_free)(void *, bus_space_handle_t,
+ bus_size_t);
/* get kernel virtual address */
-void * __C(CHIP,_io_vaddr) __P((void *, bus_space_handle_t));
+void * __C(CHIP,_io_vaddr)(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t __C(CHIP,_io_mmap) __P((void *, bus_addr_t, off_t, int, int));
+paddr_t __C(CHIP,_io_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-inline void __C(CHIP,_io_barrier) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int));
+inline void __C(CHIP,_io_barrier)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
/* read (single) */
-inline u_int8_t __C(CHIP,_io_read_1) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int16_t __C(CHIP,_io_read_2) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int32_t __C(CHIP,_io_read_4) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int64_t __C(CHIP,_io_read_8) __P((void *, bus_space_handle_t,
- bus_size_t));
+inline u_int8_t __C(CHIP,_io_read_1)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int16_t __C(CHIP,_io_read_2)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int32_t __C(CHIP,_io_read_4)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int64_t __C(CHIP,_io_read_8)(void *, bus_space_handle_t,
+ bus_size_t);
/* read multiple */
-void __C(CHIP,_io_read_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_io_read_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_io_read_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_io_read_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_io_read_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_io_read_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_io_read_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_io_read_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region */
-void __C(CHIP,_io_read_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_io_read_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_io_read_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_io_read_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_io_read_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_io_read_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_io_read_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_io_read_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
-inline void __C(CHIP,_io_write_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
-inline void __C(CHIP,_io_write_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
-inline void __C(CHIP,_io_write_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
-inline void __C(CHIP,_io_write_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t));
+inline void __C(CHIP,_io_write_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+inline void __C(CHIP,_io_write_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+inline void __C(CHIP,_io_write_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+inline void __C(CHIP,_io_write_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
/* write multiple */
-void __C(CHIP,_io_write_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_io_write_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_io_write_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_io_write_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_io_write_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_io_write_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_io_write_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_io_write_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* write region */
-void __C(CHIP,_io_write_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_io_write_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_io_write_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_io_write_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_io_write_region_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_io_write_region_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_io_write_region_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_io_write_region_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* set multiple */
-void __C(CHIP,_io_set_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_io_set_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_io_set_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_io_set_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_io_set_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_io_set_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_io_set_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_io_set_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* set region */
-void __C(CHIP,_io_set_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_io_set_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_io_set_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_io_set_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_io_set_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_io_set_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_io_set_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_io_set_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* copy */
-void __C(CHIP,_io_copy_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_io_copy_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_io_copy_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_io_copy_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void __C(CHIP,_io_copy_region_1)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_io_copy_region_2)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_io_copy_region_4)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_io_copy_region_8)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
#ifndef CHIP_IO_EX_STORE
static long
diff --git a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
index 71332fd9a8f..ae357c67027 100644
--- a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.41 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.42 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.41 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.42 2009/03/14 14:45:53 dsl Exp $");
#include <sys/extent.h>
@@ -93,124 +93,124 @@ __KERNEL_RCSID(1, "$NetBSD: pci_swiz_bus_mem_chipdep.c,v 1.41 2008/04/28 20:23:1
#define __S(S) __STRING(S)
/* mapping/unmapping */
-int __C(CHIP,_mem_map) __P((void *, bus_addr_t, bus_size_t, int,
- bus_space_handle_t *, int));
-void __C(CHIP,_mem_unmap) __P((void *, bus_space_handle_t,
- bus_size_t, int));
-int __C(CHIP,_mem_subregion) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
-
-int __C(CHIP,_mem_translate) __P((void *, bus_addr_t, bus_size_t,
- int, struct alpha_bus_space_translation *));
-int __C(CHIP,_mem_get_window) __P((void *, int,
- struct alpha_bus_space_translation *));
+int __C(CHIP,_mem_map)(void *, bus_addr_t, bus_size_t, int,
+ bus_space_handle_t *, int);
+void __C(CHIP,_mem_unmap)(void *, bus_space_handle_t,
+ bus_size_t, int);
+int __C(CHIP,_mem_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
+
+int __C(CHIP,_mem_translate)(void *, bus_addr_t, bus_size_t,
+ int, struct alpha_bus_space_translation *);
+int __C(CHIP,_mem_get_window)(void *, int,
+ struct alpha_bus_space_translation *);
/* allocation/deallocation */
-int __C(CHIP,_mem_alloc) __P((void *, bus_addr_t, bus_addr_t,
+int __C(CHIP,_mem_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_addr_t, int, bus_addr_t *,
- bus_space_handle_t *));
-void __C(CHIP,_mem_free) __P((void *, bus_space_handle_t,
- bus_size_t));
+ bus_space_handle_t *);
+void __C(CHIP,_mem_free)(void *, bus_space_handle_t,
+ bus_size_t);
/* get kernel virtual address */
-void * __C(CHIP,_mem_vaddr) __P((void *, bus_space_handle_t));
+void * __C(CHIP,_mem_vaddr)(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t __C(CHIP,_mem_mmap) __P((void *, bus_addr_t, off_t, int, int));
+paddr_t __C(CHIP,_mem_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
-inline void __C(CHIP,_mem_barrier) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int));
+inline void __C(CHIP,_mem_barrier)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
/* read (single) */
-inline u_int8_t __C(CHIP,_mem_read_1) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int16_t __C(CHIP,_mem_read_2) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int32_t __C(CHIP,_mem_read_4) __P((void *, bus_space_handle_t,
- bus_size_t));
-inline u_int64_t __C(CHIP,_mem_read_8) __P((void *, bus_space_handle_t,
- bus_size_t));
+inline u_int8_t __C(CHIP,_mem_read_1)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int16_t __C(CHIP,_mem_read_2)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int32_t __C(CHIP,_mem_read_4)(void *, bus_space_handle_t,
+ bus_size_t);
+inline u_int64_t __C(CHIP,_mem_read_8)(void *, bus_space_handle_t,
+ bus_size_t);
/* read multiple */
-void __C(CHIP,_mem_read_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_read_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_read_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_read_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_read_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_read_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_read_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_read_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region */
-void __C(CHIP,_mem_read_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_read_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_read_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_read_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_read_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_read_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_read_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_read_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
-inline void __C(CHIP,_mem_write_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
-inline void __C(CHIP,_mem_write_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
-inline void __C(CHIP,_mem_write_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
-inline void __C(CHIP,_mem_write_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t));
+inline void __C(CHIP,_mem_write_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+inline void __C(CHIP,_mem_write_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+inline void __C(CHIP,_mem_write_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+inline void __C(CHIP,_mem_write_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
/* write multiple */
-void __C(CHIP,_mem_write_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_write_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_write_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_write_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_write_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_write_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_write_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_write_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* write region */
-void __C(CHIP,_mem_write_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void __C(CHIP,_mem_write_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void __C(CHIP,_mem_write_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void __C(CHIP,_mem_write_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void __C(CHIP,_mem_write_region_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void __C(CHIP,_mem_write_region_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void __C(CHIP,_mem_write_region_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void __C(CHIP,_mem_write_region_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* set multiple */
-void __C(CHIP,_mem_set_multi_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_mem_set_multi_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_mem_set_multi_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_mem_set_multi_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_mem_set_multi_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_mem_set_multi_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_mem_set_multi_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_mem_set_multi_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* set region */
-void __C(CHIP,_mem_set_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void __C(CHIP,_mem_set_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void __C(CHIP,_mem_set_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void __C(CHIP,_mem_set_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void __C(CHIP,_mem_set_region_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void __C(CHIP,_mem_set_region_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void __C(CHIP,_mem_set_region_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void __C(CHIP,_mem_set_region_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* copy */
-void __C(CHIP,_mem_copy_region_1) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_mem_copy_region_2) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_mem_copy_region_4) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void __C(CHIP,_mem_copy_region_8) __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void __C(CHIP,_mem_copy_region_1)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_mem_copy_region_2)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_mem_copy_region_4)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void __C(CHIP,_mem_copy_region_8)(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
#ifdef CHIP_D_MEM_W1_SYS_START
#ifndef CHIP_D_MEM_EX_STORE
@@ -409,15 +409,15 @@ __C(CHIP,_bus_mem_init)(t, v)
}
#ifdef CHIP_D_MEM_W1_SYS_START
-static int __C(CHIP,_xlate_addr_to_dense_handle) __P((void *,
- bus_addr_t, bus_space_handle_t *));
-static int __C(CHIP,_xlate_dense_handle_to_addr) __P((void *,
- bus_space_handle_t, bus_addr_t *));
+static int __C(CHIP,_xlate_addr_to_dense_handle)(void *,
+ bus_addr_t, bus_space_handle_t *);
+static int __C(CHIP,_xlate_dense_handle_to_addr)(void *,
+ bus_space_handle_t, bus_addr_t *);
#endif /* CHIP_D_MEM_W1_SYS_START */
-static int __C(CHIP,_xlate_addr_to_sparse_handle) __P((void *,
- bus_addr_t, bus_space_handle_t *));
-static int __C(CHIP,_xlate_sparse_handle_to_addr) __P((void *,
- bus_space_handle_t, bus_addr_t *));
+static int __C(CHIP,_xlate_addr_to_sparse_handle)(void *,
+ bus_addr_t, bus_space_handle_t *);
+static int __C(CHIP,_xlate_sparse_handle_to_addr)(void *,
+ bus_space_handle_t, bus_addr_t *);
#ifdef CHIP_D_MEM_W1_SYS_START
static int
diff --git a/sys/arch/alpha/pci/pci_up1000.h b/sys/arch/alpha/pci/pci_up1000.h
index e964a1aaa82..ef92e471b64 100644
--- a/sys/arch/alpha/pci/pci_up1000.h
+++ b/sys/arch/alpha/pci/pci_up1000.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_up1000.h,v 1.2 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: pci_up1000.h,v 1.3 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -29,4 +29,4 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-void pci_up1000_pickintr __P((struct irongate_config *));
+void pci_up1000_pickintr(struct irongate_config *);
diff --git a/sys/arch/alpha/pci/pciide_machdep.c b/sys/arch/alpha/pci/pciide_machdep.c
index 0192ef47443..e71fff7df7c 100644
--- a/sys/arch/alpha/pci/pciide_machdep.c
+++ b/sys/arch/alpha/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.2 1998/04/18 01:09:20 thorpej Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.3 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -42,7 +42,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.2 1998/04/18 01:09:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.3 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,7 +60,7 @@ pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
struct device *dev;
struct pci_attach_args *pa;
int chan;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
pci_chipset_tag_t pc = pa->pa_pc;
diff --git a/sys/arch/alpha/pci/sio.c b/sys/arch/alpha/pci/sio.c
index 3a2c562a2d5..66ddabde55b 100644
--- a/sys/arch/alpha/pci/sio.c
+++ b/sys/arch/alpha/pci/sio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sio.c,v 1.43 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: sio.c,v 1.44 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.43 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.44 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,14 +105,14 @@ struct sio_softc {
isa_chipset_tag_t sc_ic;
};
-int siomatch __P((struct device *, struct cfdata *, void *));
-void sioattach __P((struct device *, struct device *, void *));
+int siomatch(struct device *, struct cfdata *, void *);
+void sioattach(struct device *, struct device *, void *);
CFATTACH_DECL(sio, sizeof(struct sio_softc),
siomatch, sioattach, NULL, NULL);
#if NPCEB > 0
-int pcebmatch __P((struct device *, struct cfdata *, void *));
+int pcebmatch(struct device *, struct cfdata *, void *);
CFATTACH_DECL(pceb, sizeof(struct sio_softc),
pcebmatch, sioattach, NULL, NULL);
@@ -123,16 +123,16 @@ union sio_attach_args {
struct eisabus_attach_args sa_eba;
};
-void sio_isa_attach_hook __P((struct device *, struct device *,
- struct isabus_attach_args *));
+void sio_isa_attach_hook(struct device *, struct device *,
+ struct isabus_attach_args *);
#if NPCEB > 0
-void sio_eisa_attach_hook __P((struct device *, struct device *,
- struct eisabus_attach_args *));
-int sio_eisa_maxslots __P((void *));
-int sio_eisa_intr_map __P((void *, u_int, eisa_intr_handle_t *));
+void sio_eisa_attach_hook(struct device *, struct device *,
+ struct eisabus_attach_args *);
+int sio_eisa_maxslots(void *);
+int sio_eisa_intr_map(void *, u_int, eisa_intr_handle_t *);
#endif
-void sio_bridge_callback __P((struct device *));
+void sio_bridge_callback(struct device *);
int
siomatch(parent, match, aux)
diff --git a/sys/arch/alpha/pci/sio_pic.c b/sys/arch/alpha/pci/sio_pic.c
index f37b58906e3..765e9edce48 100644
--- a/sys/arch/alpha/pci/sio_pic.c
+++ b/sys/arch/alpha/pci/sio_pic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sio_pic.c,v 1.36 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: sio_pic.c,v 1.37 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v 1.36 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v 1.37 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,20 +118,20 @@ u_int8_t initial_ocw1[2];
u_int8_t initial_elcr[2];
#endif
-void sio_setirqstat __P((int, int, int));
+void sio_setirqstat(int, int, int);
-u_int8_t (*sio_read_elcr) __P((int));
-void (*sio_write_elcr) __P((int, u_int8_t));
-static void specific_eoi __P((int));
+u_int8_t (*sio_read_elcr)(int);
+void (*sio_write_elcr)(int, u_int8_t);
+static void specific_eoi(int);
#ifdef BROKEN_PROM_CONSOLE
-void sio_intr_shutdown __P((void *));
+void sio_intr_shutdown(void *);
#endif
/******************** i82378 SIO ELCR functions ********************/
-int i82378_setup_elcr __P((void));
-u_int8_t i82378_read_elcr __P((int));
-void i82378_write_elcr __P((int, u_int8_t));
+int i82378_setup_elcr(void);
+u_int8_t i82378_read_elcr(int);
+void i82378_write_elcr(int, u_int8_t);
bus_space_handle_t sio_ioh_elcr;
@@ -175,9 +175,9 @@ i82378_write_elcr(elcr, val)
/******************** Cypress CY82C693 ELCR functions ********************/
-int cy82c693_setup_elcr __P((void));
-u_int8_t cy82c693_read_elcr __P((int));
-void cy82c693_write_elcr __P((int, u_int8_t));
+int cy82c693_setup_elcr(void);
+u_int8_t cy82c693_read_elcr(int);
+void cy82c693_write_elcr(int, u_int8_t);
const struct cy82c693_handle *sio_cy82c693_handle;
@@ -265,7 +265,7 @@ cy82c693_write_elcr(elcr, val)
* they should panic.
*/
-int (*sio_elcr_setup_funcs[]) __P((void)) = {
+int (*sio_elcr_setup_funcs[])(void) = {
cy82c693_setup_elcr,
i82378_setup_elcr,
NULL,
diff --git a/sys/arch/alpha/pci/siovar.h b/sys/arch/alpha/pci/siovar.h
index 50f27ffe047..e660d7cd0e0 100644
--- a/sys/arch/alpha/pci/siovar.h
+++ b/sys/arch/alpha/pci/siovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: siovar.h,v 1.10 2000/06/05 21:47:29 thorpej Exp $ */
+/* $NetBSD: siovar.h,v 1.11 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -27,12 +27,12 @@
* rights to redistribute these changes.
*/
-void sio_intr_setup __P((pci_chipset_tag_t, bus_space_tag_t));
-void sio_iointr __P((void *framep, unsigned long vec));
+void sio_intr_setup(pci_chipset_tag_t, bus_space_tag_t);
+void sio_iointr(void *framep, unsigned long vec);
-const char *sio_intr_string __P((void *, int));
-const struct evcnt *sio_intr_evcnt __P((void *, int));
-void *sio_intr_establish __P((void *, int, int, int, int (*)(void *),
- void *));
-void sio_intr_disestablish __P((void *, void *));
-int sio_intr_alloc __P((void *, int, int, int *));
+const char *sio_intr_string(void *, int);
+const struct evcnt *sio_intr_evcnt(void *, int);
+void *sio_intr_establish(void *, int, int, int, int (*)(void *),
+ void *);
+void sio_intr_disestablish(void *, void *);
+int sio_intr_alloc(void *, int, int, int *);
diff --git a/sys/arch/alpha/pci/tsc.c b/sys/arch/alpha/pci/tsc.c
index dfcd83dba4d..1ab237ce802 100644
--- a/sys/arch/alpha/pci/tsc.c
+++ b/sys/arch/alpha/pci/tsc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tsc.c,v 1.13 2005/12/11 12:16:17 christos Exp $ */
+/* $NetBSD: tsc.c,v 1.14 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.13 2005/12/11 12:16:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.14 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,8 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.13 2005/12/11 12:16:17 christos Exp $");
#define tsc() { Generate ctags(1) key. }
-int tscmatch __P((struct device *, struct cfdata *, void *));
-void tscattach __P((struct device *, struct device *, void *));
+int tscmatch(struct device *, struct cfdata *, void *);
+void tscattach(struct device *, struct device *, void *);
CFATTACH_DECL(tsc, sizeof(struct tsc_softc),
tscmatch, tscattach, NULL, NULL);
@@ -69,18 +69,18 @@ extern struct cfdriver tsc_cd;
struct tsp_config tsp_configuration[2];
-static int tscprint __P((void *, const char *pnp));
+static int tscprint(void *, const char *pnp);
-int tspmatch __P((struct device *, struct cfdata *, void *));
-void tspattach __P((struct device *, struct device *, void *));
+int tspmatch(struct device *, struct cfdata *, void *);
+void tspattach(struct device *, struct device *, void *);
CFATTACH_DECL(tsp, sizeof(struct tsp_softc),
tspmatch, tspattach, NULL, NULL);
extern struct cfdriver tsp_cd;
-static int tsp_bus_get_window __P((int, int,
- struct alpha_bus_space_translation *));
+static int tsp_bus_get_window(int, int,
+ struct alpha_bus_space_translation *);
/* There can be only one */
static int tscfound;
diff --git a/sys/arch/alpha/pci/tsp_dma.c b/sys/arch/alpha/pci/tsp_dma.c
index ee65b66f367..0b4898a204d 100644
--- a/sys/arch/alpha/pci/tsp_dma.c
+++ b/sys/arch/alpha/pci/tsp_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_dma.c,v 1.7 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: tsp_dma.c,v 1.8 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.7 2008/04/28 20:23:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.8 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -86,23 +86,23 @@ __KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v 1.7 2008/04/28 20:23:11 martin Exp $");
#define EDIFF(a, b) (((a) | WSBA_ENA | WSBA_SG) != ((b) | WSBA_ENA | WSBA_SG))
-bus_dma_tag_t tsp_dma_get_tag __P((bus_dma_tag_t, alpha_bus_t));
+bus_dma_tag_t tsp_dma_get_tag(bus_dma_tag_t, alpha_bus_t);
-int tsp_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
+int tsp_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
-int tsp_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
+int tsp_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
-int tsp_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
+int tsp_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
-int tsp_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
+int tsp_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
-void tsp_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+void tsp_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
-void tsp_tlb_invalidate __P((struct tsp_config *));
+void tsp_tlb_invalidate(struct tsp_config *);
/*
* XXX Need to figure out what this is, if any. Initialize it to
diff --git a/sys/arch/alpha/pci/tsp_pci.c b/sys/arch/alpha/pci/tsp_pci.c
index 0b52a6bbc08..20830d6d39e 100644
--- a/sys/arch/alpha/pci/tsp_pci.c
+++ b/sys/arch/alpha/pci/tsp_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tsp_pci.c,v 1.3 2001/02/27 19:07:53 cgd Exp $ */
+/* $NetBSD: tsp_pci.c,v 1.4 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsp_pci.c,v 1.3 2001/02/27 19:07:53 cgd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsp_pci.c,v 1.4 2009/03/14 14:45:53 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,14 +53,14 @@ __KERNEL_RCSID(0, "$NetBSD: tsp_pci.c,v 1.3 2001/02/27 19:07:53 cgd Exp $");
#define tsp_pci() { Generate ctags(1) key. }
-void tsp_attach_hook __P((struct device *, struct device *,
- struct pcibus_attach_args *));
-int tsp_bus_maxdevs __P((void *, int));
-pcitag_t tsp_make_tag __P((void *, int, int, int));
-void tsp_decompose_tag __P((void *, pcitag_t, int *, int *,
- int *));
-pcireg_t tsp_conf_read __P((void *, pcitag_t, int));
-void tsp_conf_write __P((void *, pcitag_t, int, pcireg_t));
+void tsp_attach_hook(struct device *, struct device *,
+ struct pcibus_attach_args *);
+int tsp_bus_maxdevs(void *, int);
+pcitag_t tsp_make_tag(void *, int, int, int);
+void tsp_decompose_tag(void *, pcitag_t, int *, int *,
+ int *);
+pcireg_t tsp_conf_read(void *, pcitag_t, int);
+void tsp_conf_write(void *, pcitag_t, int, pcireg_t);
void
tsp_pci_init(pc, v)
diff --git a/sys/arch/alpha/pci/tsvar.h b/sys/arch/alpha/pci/tsvar.h
index e2ca681595c..d39600ff856 100644
--- a/sys/arch/alpha/pci/tsvar.h
+++ b/sys/arch/alpha/pci/tsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tsvar.h,v 1.5 2005/12/11 12:16:17 christos Exp $ */
+/* $NetBSD: tsvar.h,v 1.6 2009/03/14 14:45:53 dsl Exp $ */
/*-
* Copyright (c) 1999 by Ross Harvey. All rights reserved.
@@ -74,11 +74,11 @@ struct tsp_attach_args {
extern int tsp_console_hose;
-struct tsp_config *tsp_init __P((int, int));
-void tsp_pci_init __P((pci_chipset_tag_t, void *));
-void tsp_dma_init __P((struct tsp_config *));
+struct tsp_config *tsp_init(int, int);
+void tsp_pci_init(pci_chipset_tag_t, void *);
+void tsp_dma_init(struct tsp_config *);
-void tsp_bus_io_init __P((bus_space_tag_t, void *));
-void tsp_bus_mem_init __P((bus_space_tag_t, void *));
+void tsp_bus_io_init(bus_space_tag_t, void *);
+void tsp_bus_mem_init(bus_space_tag_t, void *);
-void tsp_bus_mem_init2 __P((bus_space_tag_t, void *));
+void tsp_bus_mem_init2(bus_space_tag_t, void *);
diff --git a/sys/arch/alpha/stand/common/blkdev.h b/sys/arch/alpha/stand/common/blkdev.h
index 91e55cf34b4..ffa7a8dfcdc 100644
--- a/sys/arch/alpha/stand/common/blkdev.h
+++ b/sys/arch/alpha/stand/common/blkdev.h
@@ -1,10 +1,10 @@
-/* $NetBSD: blkdev.h,v 1.1 1999/04/02 03:17:29 cgd Exp $ */
+/* $NetBSD: blkdev.h,v 1.2 2009/03/14 14:45:53 dsl Exp $ */
#if 0 /* folded into devopen */
-int blkdevopen __P((struct open_file *, ...));
+int blkdevopen(struct open_file *, ...);
#endif
-int blkdevstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
+int blkdevstrategy(void *, int, daddr_t, size_t, void *, size_t *);
#if defined(LIBSA_NO_FS_CLOSE)
-int blkdevclose __P((struct open_file *));
+int blkdevclose(struct open_file *);
#endif /* defined(LIBSA_NO_FS_CLOSE) */
diff --git a/sys/arch/alpha/stand/common/common.h b/sys/arch/alpha/stand/common/common.h
index 2c93bbf24b6..236908d8067 100644
--- a/sys/arch/alpha/stand/common/common.h
+++ b/sys/arch/alpha/stand/common/common.h
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.12 1999/11/30 22:32:08 thorpej Exp $ */
+/* $NetBSD: common.h,v 1.13 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -30,13 +30,13 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-void OSFpal __P((void));
-void init_prom_calls __P((void));
-void halt __P((void));
-u_int64_t prom_dispatch __P((int, ...));
-void putulong __P((unsigned long));
-void putstr __P((const char *));
-void switch_palcode __P((void));
+void OSFpal(void);
+void init_prom_calls(void);
+void halt(void);
+u_int64_t prom_dispatch(int, ...);
+void putulong(unsigned long);
+void putstr(const char *);
+void switch_palcode(void);
/*
diff --git a/sys/arch/alpha/stand/netboot/dev_net.c b/sys/arch/alpha/stand/netboot/dev_net.c
index d40006a6b4d..62650f8e8ca 100644
--- a/sys/arch/alpha/stand/netboot/dev_net.c
+++ b/sys/arch/alpha/stand/netboot/dev_net.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.12 2003/03/19 17:21:41 drochner Exp $ */
+/* $NetBSD: dev_net.c,v 1.13 2009/03/14 14:45:53 dsl Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -66,7 +66,7 @@
#include "dev_net.h"
#ifndef SUN_BOOTPARAMS
-void bootp __P((int));
+void bootp(int);
#endif
extern int debug;
@@ -95,7 +95,7 @@ char hostname[FNAME_SIZE];
static int netdev_sock = -1;
static int netdev_opens;
-int net_getparams __P((int));
+int net_getparams(int);
/*
* Called by devopen after it sets f->f_dev to our devsw entry.
diff --git a/sys/arch/alpha/stand/netboot/dev_net.h b/sys/arch/alpha/stand/netboot/dev_net.h
index f78e042e745..a035c63fb38 100644
--- a/sys/arch/alpha/stand/netboot/dev_net.h
+++ b/sys/arch/alpha/stand/netboot/dev_net.h
@@ -1,8 +1,8 @@
-/* $NetBSD: dev_net.h,v 1.3 2002/11/09 06:34:38 thorpej Exp $ */
+/* $NetBSD: dev_net.h,v 1.4 2009/03/14 14:45:53 dsl Exp $ */
-int net_open __P((struct open_file *, ...));
-int net_close __P((struct open_file *));
-int net_ioctl __P((struct open_file *, u_long, void *));
-int net_strategy __P((void *, int , daddr_t , size_t, void *, size_t *));
+int net_open(struct open_file *, ...);
+int net_close(struct open_file *);
+int net_ioctl(struct open_file *, u_long, void *);
+int net_strategy(void *, int , daddr_t , size_t, void *, size_t *);
diff --git a/sys/arch/alpha/tc/ioasic.c b/sys/arch/alpha/tc/ioasic.c
index e015796bba4..8093c01f72e 100644
--- a/sys/arch/alpha/tc/ioasic.c
+++ b/sys/arch/alpha/tc/ioasic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasic.c,v 1.39 2008/06/13 05:36:50 cegger Exp $ */
+/* $NetBSD: ioasic.c,v 1.40 2009/03/14 14:45:54 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.39 2008/06/13 05:36:50 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.40 2009/03/14 14:45:54 dsl Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -79,14 +79,14 @@ __KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.39 2008/06/13 05:36:50 cegger Exp $");
#include <dev/tc/ioasicvar.h>
/* Definition of the driver for autoconfig. */
-int ioasicmatch __P((struct device *, struct cfdata *, void *));
-void ioasicattach __P((struct device *, struct device *, void *));
+int ioasicmatch(struct device *, struct cfdata *, void *);
+void ioasicattach(struct device *, struct device *, void *);
CFATTACH_DECL(ioasic, sizeof(struct ioasic_softc),
ioasicmatch, ioasicattach, NULL, NULL);
-int ioasic_intr __P((void *));
-int ioasic_intrnull __P((void *));
+int ioasic_intr(void *);
+int ioasic_intrnull(void *);
#define C(x) ((void *)(x))
@@ -114,7 +114,7 @@ struct ioasic_dev ioasic_devs[] = {
int ioasic_ndevs = sizeof(ioasic_devs) / sizeof(ioasic_devs[0]);
struct ioasicintr {
- int (*iai_func) __P((void *));
+ int (*iai_func)(void *);
void *iai_arg;
struct evcnt iai_evcnt;
} ioasicintrs[IOASIC_NCOOKIES];
diff --git a/sys/arch/alpha/tc/tc_3000_300.c b/sys/arch/alpha/tc/tc_3000_300.c
index 738931ad9da..2dca442877d 100644
--- a/sys/arch/alpha/tc/tc_3000_300.c
+++ b/sys/arch/alpha/tc/tc_3000_300.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_300.c,v 1.27 2002/09/27 15:35:39 provos Exp $ */
+/* $NetBSD: tc_3000_300.c,v 1.28 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.27 2002/09/27 15:35:39 provos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.28 2009/03/14 14:45:54 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,10 +48,10 @@ __KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.27 2002/09/27 15:35:39 provos Exp
#include "sfb.h"
#if NSFB > 0
-extern int sfb_cnattach __P((tc_addr_t));
+extern int sfb_cnattach(tc_addr_t);
#endif
-int tc_3000_300_intrnull __P((void *));
+int tc_3000_300_intrnull(void *);
#define C(x) ((void *)(u_long)x)
#define KV(x) (ALPHA_PHYS_TO_K0SEG(x))
@@ -85,7 +85,7 @@ int tc_3000_300_nbuiltins =
sizeof(tc_3000_300_builtins) / sizeof(tc_3000_300_builtins[0]);
struct tcintr {
- int (*tci_func) __P((void *));
+ int (*tci_func)(void *);
void *tci_arg;
struct evcnt tci_evcnt;
} tc_3000_300_intr[TC_3000_300_NCOOKIES];
@@ -138,7 +138,7 @@ tc_3000_300_intr_establish(tcadev, cookie, level, func, arg)
struct device *tcadev;
void *cookie, *arg;
tc_intrlevel_t level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
volatile u_int32_t *imskp;
u_long dev = (u_long)cookie;
diff --git a/sys/arch/alpha/tc/tc_3000_300.h b/sys/arch/alpha/tc/tc_3000_300.h
index d752143e918..bd05631658e 100644
--- a/sys/arch/alpha/tc/tc_3000_300.h
+++ b/sys/arch/alpha/tc/tc_3000_300.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_300.h,v 1.4 1998/10/22 01:03:09 briggs Exp $ */
+/* $NetBSD: tc_3000_300.h,v 1.5 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -60,4 +60,4 @@
#define TC_3000_300_NCOOKIES 5
-extern int tc_3000_300_fb_cnattach __P((u_int64_t));
+extern int tc_3000_300_fb_cnattach(u_int64_t);
diff --git a/sys/arch/alpha/tc/tc_3000_500.c b/sys/arch/alpha/tc/tc_3000_500.c
index 3149712d4d5..f02102a0cd8 100644
--- a/sys/arch/alpha/tc/tc_3000_500.c
+++ b/sys/arch/alpha/tc/tc_3000_500.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_500.c,v 1.25 2002/09/27 15:35:39 provos Exp $ */
+/* $NetBSD: tc_3000_500.c,v 1.26 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.25 2002/09/27 15:35:39 provos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.26 2009/03/14 14:45:54 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -48,17 +48,17 @@ __KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.25 2002/09/27 15:35:39 provos Exp
#include "sfb.h"
#if NSFB > 0
-extern int sfb_cnattach __P((tc_addr_t));
+extern int sfb_cnattach(tc_addr_t);
#endif
-void tc_3000_500_intr_setup __P((void));
-void tc_3000_500_intr_establish __P((struct device *, void *,
- tc_intrlevel_t, int (*)(void *), void *));
-void tc_3000_500_intr_disestablish __P((struct device *, void *));
-void tc_3000_500_iointr __P((void *, unsigned long));
+void tc_3000_500_intr_setup(void);
+void tc_3000_500_intr_establish(struct device *, void *,
+ tc_intrlevel_t, int (*)(void *), void *);
+void tc_3000_500_intr_disestablish(struct device *, void *);
+void tc_3000_500_iointr(void *, unsigned long);
-int tc_3000_500_intrnull __P((void *));
-int tc_3000_500_fb_cnattach __P((u_int64_t));
+int tc_3000_500_intrnull(void *);
+int tc_3000_500_fb_cnattach(u_int64_t);
#define C(x) ((void *)(u_long)x)
#define KV(x) (ALPHA_PHYS_TO_K0SEG(x))
@@ -104,7 +104,7 @@ u_int32_t tc_3000_500_intrbits[TC_3000_500_NCOOKIES] = {
};
struct tcintr {
- int (*tci_func) __P((void *));
+ int (*tci_func)(void *);
void *tci_arg;
struct evcnt tci_evcnt;
} tc_3000_500_intr[TC_3000_500_NCOOKIES];
@@ -162,7 +162,7 @@ tc_3000_500_intr_establish(tcadev, cookie, level, func, arg)
struct device *tcadev;
void *cookie, *arg;
tc_intrlevel_t level;
- int (*func) __P((void *));
+ int (*func)(void *);
{
u_long dev = (u_long)cookie;
diff --git a/sys/arch/alpha/tc/tc_3000_500.h b/sys/arch/alpha/tc/tc_3000_500.h
index 349ad78d07b..cbad7db993c 100644
--- a/sys/arch/alpha/tc/tc_3000_500.h
+++ b/sys/arch/alpha/tc/tc_3000_500.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_500.h,v 1.4 1998/10/22 01:03:09 briggs Exp $ */
+/* $NetBSD: tc_3000_500.h,v 1.5 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -104,4 +104,4 @@
#define TC_3000_500_NCOOKIES 9
-extern int tc_3000_500_fb_cnattach __P((u_int64_t));
+extern int tc_3000_500_fb_cnattach(u_int64_t);
diff --git a/sys/arch/alpha/tc/tc_bus_mem.c b/sys/arch/alpha/tc/tc_bus_mem.c
index 72848bb3618..1cc4b95e65f 100644
--- a/sys/arch/alpha/tc/tc_bus_mem.c
+++ b/sys/arch/alpha/tc/tc_bus_mem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_bus_mem.c,v 1.27 2005/12/11 12:16:20 christos Exp $ */
+/* $NetBSD: tc_bus_mem.c,v 1.28 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.27 2005/12/11 12:16:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.28 2009/03/14 14:45:54 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,118 +49,118 @@ __KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c,v 1.27 2005/12/11 12:16:20 christos Exp
#define __C(A,B) __CONCAT(A,B)
/* mapping/unmapping */
-int tc_mem_map __P((void *, bus_addr_t, bus_size_t, int,
- bus_space_handle_t *, int));
-void tc_mem_unmap __P((void *, bus_space_handle_t, bus_size_t, int));
-int tc_mem_subregion __P((void *, bus_space_handle_t, bus_size_t,
- bus_size_t, bus_space_handle_t *));
+int tc_mem_map(void *, bus_addr_t, bus_size_t, int,
+ bus_space_handle_t *, int);
+void tc_mem_unmap(void *, bus_space_handle_t, bus_size_t, int);
+int tc_mem_subregion(void *, bus_space_handle_t, bus_size_t,
+ bus_size_t, bus_space_handle_t *);
-int tc_mem_translate __P((void *, bus_addr_t, bus_size_t,
- int, struct alpha_bus_space_translation *));
-int tc_mem_get_window __P((void *, int,
- struct alpha_bus_space_translation *));
+int tc_mem_translate(void *, bus_addr_t, bus_size_t,
+ int, struct alpha_bus_space_translation *);
+int tc_mem_get_window(void *, int,
+ struct alpha_bus_space_translation *);
/* allocation/deallocation */
-int tc_mem_alloc __P((void *, bus_addr_t, bus_addr_t, bus_size_t,
+int tc_mem_alloc(void *, bus_addr_t, bus_addr_t, bus_size_t,
bus_size_t, bus_addr_t, int, bus_addr_t *,
- bus_space_handle_t *));
-void tc_mem_free __P((void *, bus_space_handle_t, bus_size_t));
+ bus_space_handle_t *);
+void tc_mem_free(void *, bus_space_handle_t, bus_size_t);
/* get kernel virtual address */
-void * tc_mem_vaddr __P((void *, bus_space_handle_t));
+void * tc_mem_vaddr(void *, bus_space_handle_t);
/* mmap for user */
-paddr_t tc_mem_mmap __P((void *, bus_addr_t, off_t, int, int));
+paddr_t tc_mem_mmap(void *, bus_addr_t, off_t, int, int);
/* barrier */
-inline void tc_mem_barrier __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int));
+inline void tc_mem_barrier(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
/* read (single) */
-inline u_int8_t tc_mem_read_1 __P((void *, bus_space_handle_t, bus_size_t));
-inline u_int16_t tc_mem_read_2 __P((void *, bus_space_handle_t, bus_size_t));
-inline u_int32_t tc_mem_read_4 __P((void *, bus_space_handle_t, bus_size_t));
-inline u_int64_t tc_mem_read_8 __P((void *, bus_space_handle_t, bus_size_t));
+inline u_int8_t tc_mem_read_1(void *, bus_space_handle_t, bus_size_t);
+inline u_int16_t tc_mem_read_2(void *, bus_space_handle_t, bus_size_t);
+inline u_int32_t tc_mem_read_4(void *, bus_space_handle_t, bus_size_t);
+inline u_int64_t tc_mem_read_8(void *, bus_space_handle_t, bus_size_t);
/* read multiple */
-void tc_mem_read_multi_1 __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void tc_mem_read_multi_2 __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void tc_mem_read_multi_4 __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void tc_mem_read_multi_8 __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void tc_mem_read_multi_1(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void tc_mem_read_multi_2(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void tc_mem_read_multi_4(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void tc_mem_read_multi_8(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region */
-void tc_mem_read_region_1 __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
-void tc_mem_read_region_2 __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
-void tc_mem_read_region_4 __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
-void tc_mem_read_region_8 __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+void tc_mem_read_region_1(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+void tc_mem_read_region_2(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+void tc_mem_read_region_4(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+void tc_mem_read_region_8(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
-inline void tc_mem_write_1 __P((void *, bus_space_handle_t, bus_size_t,
- u_int8_t));
-inline void tc_mem_write_2 __P((void *, bus_space_handle_t, bus_size_t,
- u_int16_t));
-inline void tc_mem_write_4 __P((void *, bus_space_handle_t, bus_size_t,
- u_int32_t));
-inline void tc_mem_write_8 __P((void *, bus_space_handle_t, bus_size_t,
- u_int64_t));
+inline void tc_mem_write_1(void *, bus_space_handle_t, bus_size_t,
+ u_int8_t);
+inline void tc_mem_write_2(void *, bus_space_handle_t, bus_size_t,
+ u_int16_t);
+inline void tc_mem_write_4(void *, bus_space_handle_t, bus_size_t,
+ u_int32_t);
+inline void tc_mem_write_8(void *, bus_space_handle_t, bus_size_t,
+ u_int64_t);
/* write multiple */
-void tc_mem_write_multi_1 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void tc_mem_write_multi_2 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void tc_mem_write_multi_4 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void tc_mem_write_multi_8 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void tc_mem_write_multi_1(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void tc_mem_write_multi_2(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void tc_mem_write_multi_4(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void tc_mem_write_multi_8(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* write region */
-void tc_mem_write_region_1 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
-void tc_mem_write_region_2 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
-void tc_mem_write_region_4 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
-void tc_mem_write_region_8 __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+void tc_mem_write_region_1(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+void tc_mem_write_region_2(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+void tc_mem_write_region_4(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+void tc_mem_write_region_8(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* set multiple */
-void tc_mem_set_multi_1 __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void tc_mem_set_multi_2 __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void tc_mem_set_multi_4 __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void tc_mem_set_multi_8 __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void tc_mem_set_multi_1(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void tc_mem_set_multi_2(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void tc_mem_set_multi_4(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void tc_mem_set_multi_8(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* set region */
-void tc_mem_set_region_1 __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
-void tc_mem_set_region_2 __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
-void tc_mem_set_region_4 __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
-void tc_mem_set_region_8 __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+void tc_mem_set_region_1(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+void tc_mem_set_region_2(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+void tc_mem_set_region_4(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+void tc_mem_set_region_8(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* copy */
-void tc_mem_copy_region_1 __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void tc_mem_copy_region_2 __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void tc_mem_copy_region_4 __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
-void tc_mem_copy_region_8 __P((void *, bus_space_handle_t,
- bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t));
+void tc_mem_copy_region_1(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void tc_mem_copy_region_2(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void tc_mem_copy_region_4(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
+void tc_mem_copy_region_8(void *, bus_space_handle_t,
+ bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
static struct alpha_bus_space tc_mem_space = {
/* cookie */
diff --git a/sys/arch/alpha/tc/tc_conf.h b/sys/arch/alpha/tc/tc_conf.h
index a646336016d..834827e02f4 100644
--- a/sys/arch/alpha/tc/tc_conf.h
+++ b/sys/arch/alpha/tc/tc_conf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_conf.h,v 1.10 2000/06/04 19:14:29 cgd Exp $ */
+/* $NetBSD: tc_conf.h,v 1.11 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -37,14 +37,14 @@
#ifdef DEC_3000_500
#include <alpha/tc/tc_dma_3000_500.h>
-extern void tc_3000_500_intr_setup __P((void));
-extern void tc_3000_500_iointr __P((void *, unsigned long));
+extern void tc_3000_500_intr_setup(void);
+extern void tc_3000_500_iointr(void *, unsigned long);
extern const struct evcnt *
- tc_3000_500_intr_evcnt __P((struct device *, void *));
-extern void tc_3000_500_intr_establish __P((struct device *, void *,
- tc_intrlevel_t, int (*)(void *), void *));
-extern void tc_3000_500_intr_disestablish __P((struct device *, void *));
+ tc_3000_500_intr_evcnt(struct device *, void *);
+extern void tc_3000_500_intr_establish(struct device *, void *,
+ tc_intrlevel_t, int (*)(void *), void *);
+extern void tc_3000_500_intr_disestablish(struct device *, void *);
extern int tc_3000_500_nslots;
extern struct tc_slotdesc tc_3000_500_slots[];
@@ -57,14 +57,14 @@ extern struct tc_builtin tc_3000_500_nographics_builtins[];
#ifdef DEC_3000_300
#include <alpha/tc/tc_dma_3000_300.h>
-extern void tc_3000_300_intr_setup __P((void));
-extern void tc_3000_300_iointr __P((void *, unsigned long));
+extern void tc_3000_300_intr_setup(void);
+extern void tc_3000_300_iointr(void *, unsigned long);
extern const struct evcnt *
- tc_3000_300_intr_evcnt __P((struct device *, void *));
-extern void tc_3000_300_intr_establish __P((struct device *, void *,
- tc_intrlevel_t, int (*)(void *), void *));
-extern void tc_3000_300_intr_disestablish __P((struct device *, void *));
+ tc_3000_300_intr_evcnt(struct device *, void *);
+extern void tc_3000_300_intr_establish(struct device *, void *,
+ tc_intrlevel_t, int (*)(void *), void *);
+extern void tc_3000_300_intr_disestablish(struct device *, void *);
extern int tc_3000_300_nslots;
extern struct tc_slotdesc tc_3000_300_slots[];
@@ -72,5 +72,5 @@ extern int tc_3000_300_nbuiltins;
extern struct tc_builtin tc_3000_300_builtins[];
#endif /* DEC_3000_300 */
-extern int tc_fb_cnattach __P((tc_addr_t));
+extern int tc_fb_cnattach(tc_addr_t);
diff --git a/sys/arch/alpha/tc/tc_dma_3000_300.h b/sys/arch/alpha/tc/tc_dma_3000_300.h
index 6afb5c10ab1..0ca69e22371 100644
--- a/sys/arch/alpha/tc/tc_dma_3000_300.h
+++ b/sys/arch/alpha/tc/tc_dma_3000_300.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_dma_3000_300.h,v 1.3 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: tc_dma_3000_300.h,v 1.4 2009/03/14 14:45:54 dsl Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,4 +30,4 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-bus_dma_tag_t tc_dma_get_tag_3000_300 __P((int));
+bus_dma_tag_t tc_dma_get_tag_3000_300(int);
diff --git a/sys/arch/alpha/tc/tc_dma_3000_500.h b/sys/arch/alpha/tc/tc_dma_3000_500.h
index 6e97b4e6cbc..f2ac30528e2 100644
--- a/sys/arch/alpha/tc/tc_dma_3000_500.h
+++ b/sys/arch/alpha/tc/tc_dma_3000_500.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_dma_3000_500.h,v 1.3 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: tc_dma_3000_500.h,v 1.4 2009/03/14 14:45:54 dsl Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,18 +30,18 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-void tc_dma_init_3000_500 __P((int));
-bus_dma_tag_t tc_dma_get_tag_3000_500 __P((int));
+void tc_dma_init_3000_500(int);
+bus_dma_tag_t tc_dma_get_tag_3000_500(int);
-int tc_bus_dmamap_create_sgmap __P((bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *));
-void tc_bus_dmamap_destroy_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
-int tc_bus_dmamap_load_sgmap __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
-int tc_bus_dmamap_load_mbuf_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
-int tc_bus_dmamap_load_uio_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
-int tc_bus_dmamap_load_raw_sgmap __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
-void tc_bus_dmamap_unload_sgmap __P((bus_dma_tag_t, bus_dmamap_t));
+int tc_bus_dmamap_create_sgmap(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
+void tc_bus_dmamap_destroy_sgmap(bus_dma_tag_t, bus_dmamap_t);
+int tc_bus_dmamap_load_sgmap(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+int tc_bus_dmamap_load_mbuf_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+int tc_bus_dmamap_load_uio_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+int tc_bus_dmamap_load_raw_sgmap(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+void tc_bus_dmamap_unload_sgmap(bus_dma_tag_t, bus_dmamap_t);
diff --git a/sys/arch/alpha/tc/tcasic.c b/sys/arch/alpha/tc/tcasic.c
index 896d49e1fba..b1ae58d7bb9 100644
--- a/sys/arch/alpha/tc/tcasic.c
+++ b/sys/arch/alpha/tc/tcasic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcasic.c,v 1.40 2007/12/03 15:33:09 ad Exp $ */
+/* $NetBSD: tcasic.c,v 1.41 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.40 2007/12/03 15:33:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.41 2009/03/14 14:45:54 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,7 @@ CFATTACH_DECL(tcasic, sizeof (struct device),
extern struct cfdriver tcasic_cd;
-int tcasicprint __P((void *, const char *));
+int tcasicprint(void *, const char *);
/* There can be only one. */
int tcasicfound;
@@ -88,8 +88,8 @@ tcasicattach(parent, self, aux)
void *aux;
{
struct tcbus_attach_args tba;
- void (*intr_setup) __P((void));
- void (*iointr) __P((void *, unsigned long));
+ void (*intr_setup)(void);
+ void (*iointr)(void *, unsigned long);
printf("\n");
tcasicfound = 1;
@@ -180,14 +180,14 @@ tcasicprint(aux, pnp)
#include "px.h"
#include "pxg.h"
-extern void sfb_cnattach __P((tc_addr_t));
-extern void sfbp_cnattach __P((tc_addr_t));
-extern void cfb_cnattach __P((tc_addr_t));
-extern void mfb_cnattach __P((tc_addr_t));
-extern void tfb_cnattach __P((tc_addr_t));
-extern void px_cnattach __P((tc_addr_t));
-extern void pxg_cnattach __P((tc_addr_t));
-extern int tc_checkslot __P((tc_addr_t, char *));
+extern void sfb_cnattach(tc_addr_t);
+extern void sfbp_cnattach(tc_addr_t);
+extern void cfb_cnattach(tc_addr_t);
+extern void mfb_cnattach(tc_addr_t);
+extern void tfb_cnattach(tc_addr_t);
+extern void px_cnattach(tc_addr_t);
+extern void pxg_cnattach(tc_addr_t);
+extern int tc_checkslot(tc_addr_t, char *);
struct cnboards {
const char *cb_tcname;
diff --git a/sys/arch/alpha/tlsb/gbus.c b/sys/arch/alpha/tlsb/gbus.c
index 199b008f1de..88f8a9901cd 100644
--- a/sys/arch/alpha/tlsb/gbus.c
+++ b/sys/arch/alpha/tlsb/gbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: gbus.c,v 1.19 2007/03/04 05:59:12 christos Exp $ */
+/* $NetBSD: gbus.c,v 1.20 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -37,7 +37,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: gbus.c,v 1.19 2007/03/04 05:59:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gbus.c,v 1.20 2009/03/14 14:45:54 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,13 +61,13 @@ struct gbus_softc {
int sc_tlsbnode; /* node on the TurboLaser */
};
-static int gbusmatch __P((struct device *, struct cfdata *, void *));
-static void gbusattach __P((struct device *, struct device *, void *));
+static int gbusmatch(struct device *, struct cfdata *, void *);
+static void gbusattach(struct device *, struct device *, void *);
CFATTACH_DECL(gbus, sizeof(struct gbus_softc),
gbusmatch, gbusattach, NULL, NULL);
-static int gbusprint __P((void *, const char *));
+static int gbusprint(void *, const char *);
struct gbus_attach_args gbus_children[] = {
{ "zsc", GBUS_DUART0_OFFSET },
diff --git a/sys/arch/alpha/tlsb/kftxx.c b/sys/arch/alpha/tlsb/kftxx.c
index 5cf45c8a9de..012fbaa109b 100644
--- a/sys/arch/alpha/tlsb/kftxx.c
+++ b/sys/arch/alpha/tlsb/kftxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kftxx.c,v 1.13 2007/03/04 05:59:12 christos Exp $ */
+/* $NetBSD: kftxx.c,v 1.14 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: kftxx.c,v 1.13 2007/03/04 05:59:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kftxx.c,v 1.14 2009/03/14 14:45:54 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,12 +64,12 @@ struct kft_softc {
#define KV(_addr) ((void *)ALPHA_PHYS_TO_K0SEG((_addr)))
-static int kftmatch __P((struct device *, struct cfdata *, void *));
-static void kftattach __P((struct device *, struct device *, void *));
+static int kftmatch(struct device *, struct cfdata *, void *);
+static void kftattach(struct device *, struct device *, void *);
CFATTACH_DECL(kft, sizeof(struct kft_softc),
kftmatch, kftattach, NULL, NULL);
-static int kftprint __P((void *, const char *));
+static int kftprint(void *, const char *);
static int
kftprint(aux, pnp)
diff --git a/sys/arch/alpha/tlsb/tlsb.c b/sys/arch/alpha/tlsb/tlsb.c
index 1bc33ba5f36..cb9a8d3abd4 100644
--- a/sys/arch/alpha/tlsb/tlsb.c
+++ b/sys/arch/alpha/tlsb/tlsb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tlsb.c,v 1.32 2007/03/04 05:59:12 christos Exp $ */
+/* $NetBSD: tlsb.c,v 1.33 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
* NASA AMES Research Center.
@@ -39,7 +39,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tlsb.c,v 1.32 2007/03/04 05:59:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlsb.c,v 1.33 2009/03/14 14:45:54 dsl Exp $");
#include "opt_multiprocessor.h"
@@ -62,16 +62,16 @@ __KERNEL_RCSID(0, "$NetBSD: tlsb.c,v 1.32 2007/03/04 05:59:12 christos Exp $");
#define KV(_addr) ((void *)ALPHA_PHYS_TO_K0SEG((_addr)))
-static int tlsbmatch __P((struct device *, struct cfdata *, void *));
-static void tlsbattach __P((struct device *, struct device *, void *));
+static int tlsbmatch(struct device *, struct cfdata *, void *);
+static void tlsbattach(struct device *, struct device *, void *);
CFATTACH_DECL(tlsb, sizeof (struct device),
tlsbmatch, tlsbattach, NULL, NULL);
extern struct cfdriver tlsb_cd;
-static int tlsbprint __P((void *, const char *));
-static const char *tlsb_node_type_str __P((u_int32_t));
+static int tlsbprint(void *, const char *);
+static const char *tlsb_node_type_str(u_int32_t);
/*
* There can be only one TurboLaser, and we'll overload it
diff --git a/sys/arch/alpha/tlsb/tlsbmem.c b/sys/arch/alpha/tlsb/tlsbmem.c
index 13d021fa589..83e53d052b2 100644
--- a/sys/arch/alpha/tlsb/tlsbmem.c
+++ b/sys/arch/alpha/tlsb/tlsbmem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tlsbmem.c,v 1.8 2002/10/02 04:06:40 thorpej Exp $ */
+/* $NetBSD: tlsbmem.c,v 1.9 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1997 by Matthew Jacob
@@ -37,7 +37,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tlsbmem.c,v 1.8 2002/10/02 04:06:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlsbmem.c,v 1.9 2009/03/14 14:45:54 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,8 +57,8 @@ struct tlsbmem_softc {
u_int16_t sc_dtype; /* device type */
};
-static int tlsbmemmatch __P((struct device *, struct cfdata *, void *));
-static void tlsbmemattach __P((struct device *, struct device *, void *));
+static int tlsbmemmatch(struct device *, struct cfdata *, void *);
+static void tlsbmemattach(struct device *, struct device *, void *);
CFATTACH_DECL(tlsbmem, sizeof (struct tlsbmem_softc),
tlsbmemmatch, tlsbmemattach, NULL, NULL);
diff --git a/sys/arch/amd64/include/db_machdep.h b/sys/arch/amd64/include/db_machdep.h
index e4b0b85035e..3ba08cd7e78 100644
--- a/sys/arch/amd64/include/db_machdep.h
+++ b/sys/arch/amd64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.8 2009/03/11 04:16:43 yamt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.9 2009/03/14 14:45:54 dsl Exp $ */
/*
* Mach Operating System
@@ -97,8 +97,8 @@ extern db_regs_t *ddb_regp;
((user) && (addr) < VM_MAX_ADDRESS))
#if 0
-bool db_check_access __P((vaddr_t, int, task_t));
-bool db_phys_eq __P((task_t, vaddr_t, task_t, vaddr_t));
+bool db_check_access(vaddr_t, int, task_t);
+bool db_phys_eq(task_t, vaddr_t, task_t, vaddr_t);
#endif
/* macros for printing OS server dependent task name */
@@ -123,7 +123,7 @@ void db_task_name(/* task_t */);
#define db_thread_fp_used(thread) ((thread)->pcb->ims.ifps != 0)
-int kdb_trap __P((int, int, db_regs_t *));
+int kdb_trap(int, int, db_regs_t *);
/*
* We define some of our own commands
@@ -133,8 +133,8 @@ int kdb_trap __P((int, int, db_regs_t *));
#define DB_ELF_SYMBOLS
#define DB_ELFSIZE 64
-extern void db_machine_init __P((void));
+extern void db_machine_init(void);
-extern void cpu_debug_dump __P((void));
+extern void cpu_debug_dump(void);
#endif /* _X86_64_DB_MACHDEP_H_ */
diff --git a/sys/arch/amd64/include/gdt.h b/sys/arch/amd64/include/gdt.h
index 0e2dc919251..f757be11b34 100644
--- a/sys/arch/amd64/include/gdt.h
+++ b/sys/arch/amd64/include/gdt.h
@@ -1,4 +1,4 @@
-/* $NetBSD: gdt.h,v 1.5 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: gdt.h,v 1.6 2009/03/14 14:45:54 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -34,9 +34,9 @@ struct proc;
struct pmap;
void gdt_init(void);
-void gdt_init_cpu __P((struct cpu_info *));
-void gdt_reload_cpu __P((struct cpu_info *));
-void gdt_alloc_cpu __P((struct cpu_info *));
+void gdt_init_cpu(struct cpu_info *);
+void gdt_reload_cpu(struct cpu_info *);
+void gdt_alloc_cpu(struct cpu_info *);
struct x86_64_tss;
int tss_alloc(struct x86_64_tss *);
diff --git a/sys/arch/amd64/include/proc.h b/sys/arch/amd64/include/proc.h
index db27e89dcc1..66c1980e83c 100644
--- a/sys/arch/amd64/include/proc.h
+++ b/sys/arch/amd64/include/proc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.11 2008/10/26 00:08:15 mrg Exp $ */
+/* $NetBSD: proc.h,v 1.12 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1991 Regents of the University of California.
@@ -56,7 +56,7 @@ struct mdlwp {
struct mdproc {
int md_flags;
/* Syscall handling function */
- void (*md_syscall) __P((struct trapframe *));
+ void (*md_syscall)(struct trapframe *);
};
/* md_flags */
diff --git a/sys/arch/amiga/include/bus.h b/sys/arch/amiga/include/bus.h
index 6fb03c90fbd..c592710554c 100644
--- a/sys/arch/amiga/include/bus.h
+++ b/sys/arch/amiga/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.20 2005/12/11 12:16:36 christos Exp $ */
+/* $NetBSD: bus.h,v 1.21 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -237,9 +237,9 @@ struct amiga_bus_space_methods {
/*
* Bus read/write barrier methods.
*
- * void bus_space_barrier __P((bus_space_tag_t tag,
+ * void bus_space_barrier(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * bus_size_t len, int flags));
+ * bus_size_t len, int flags);
*
* Note: the 680x0 does not currently require barriers, but we must
* provide the flags to MI code.
diff --git a/sys/arch/amiga/include/cpu.h b/sys/arch/amiga/include/cpu.h
index e6734cc1dd5..f028dd6d5bc 100644
--- a/sys/arch/amiga/include/cpu.h
+++ b/sys/arch/amiga/include/cpu.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.70 2008/02/27 18:26:15 xtraeme Exp $ */
+/* $NetBSD: cpu.h,v 1.71 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -189,14 +189,14 @@ extern int machineid;
/*
* Prototypes from amiga_init.c
*/
-void *alloc_z2mem __P((long));
+void *alloc_z2mem(long);
/*
* Prototypes from autoconf.c
*/
-int is_a1200 __P((void));
-int is_a3000 __P((void));
-int is_a4000 __P((void));
+int is_a1200(void);
+int is_a3000(void);
+int is_a4000(void);
#ifdef DRACO
#define is_draco() ((machineid >> 24) == 0x7d ? (machineid >> 16) & 0xff : 0)
#endif
@@ -205,12 +205,12 @@ int is_a4000 __P((void));
/*
* Prototypes from kbd.c
*/
-void drkbdintr __P((void));
+void drkbdintr(void);
/*
* Prototypes from drsc.c
*/
-void drsc_handler __P((void));
+void drsc_handler(void);
#endif
/*
@@ -219,27 +219,27 @@ void drsc_handler __P((void));
struct fpframe;
struct user;
-void clearseg __P((vm_offset_t));
-void doboot __P((void)) __attribute__((__noreturn__));
-void loadustp __P((int));
+void clearseg(vm_offset_t);
+void doboot(void) __attribute__((__noreturn__));
+void loadustp(int);
#ifdef FPCOPROC
-void m68881_save __P((struct fpframe *));
-void m68881_restore __P((struct fpframe *));
+void m68881_save(struct fpframe *);
+void m68881_restore(struct fpframe *);
#endif
-void physcopyseg __P((vm_offset_t, vm_offset_t));
-u_int probeva __P((u_int, u_int));
+void physcopyseg(vm_offset_t, vm_offset_t);
+u_int probeva(u_int, u_int);
/*
* Prototypes from machdep.c
*/
-int badaddr __P((void *));
-int badbaddr __P((void *));
-void bootsync __P((void));
+int badaddr(void *);
+int badbaddr(void *);
+void bootsync(void);
/*
* Prototypes from pmap.c:
*/
-void pmap_bootstrap __P((vm_offset_t, vm_offset_t));
+void pmap_bootstrap(vm_offset_t, vm_offset_t);
#endif /* _KERNEL */
diff --git a/sys/arch/amiga/include/loadfile_machdep.h b/sys/arch/amiga/include/loadfile_machdep.h
index 69eba6f3eca..b5ebee7c467 100644
--- a/sys/arch/amiga/include/loadfile_machdep.h
+++ b/sys/arch/amiga/include/loadfile_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.h,v 1.4 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: loadfile_machdep.h,v 1.5 2009/03/14 14:45:54 dsl Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -71,9 +71,9 @@
#define DEALLOC(a, b) free(a)
#define OKMAGIC(a) ((a) == OMAGIC)
-ssize_t vread __P((int, u_long, u_long *, size_t));
-void vcopy __P((u_long, u_long, u_long *, size_t));
-void vzero __P((u_long, u_long *, size_t));
+ssize_t vread(int, u_long, u_long *, size_t);
+void vcopy(u_long, u_long, u_long *, size_t);
+void vzero(u_long, u_long *, size_t);
#endif
#endif /* ! _AMIGA_LOADFILE_MACHDEP_H_ */
diff --git a/sys/arch/amigappc/amigappc/machdep.c b/sys/arch/amigappc/amigappc/machdep.c
index 6cb7ef9894e..231c905aadf 100644
--- a/sys/arch/amigappc/amigappc/machdep.c
+++ b/sys/arch/amigappc/amigappc/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.33 2008/07/02 17:28:54 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.34 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.33 2008/07/02 17:28:54 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.34 2009/03/14 14:45:54 dsl Exp $");
#include "opt_ddb.h"
#include "opt_ipkdb.h"
@@ -554,7 +554,7 @@ remove_isr(isr)
*/
struct si_callback {
struct si_callback *next;
- void (*function) __P((void *rock1, void *rock2));
+ void (*function)(void *rock1, void *rock2);
void *rock1, *rock2;
};
static struct si_callback *si_callbacks;
diff --git a/sys/arch/amigappc/include/bus.h b/sys/arch/amigappc/include/bus.h
index fe9bcf811e1..2211918884f 100644
--- a/sys/arch/amigappc/include/bus.h
+++ b/sys/arch/amigappc/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.3 2006/02/16 20:17:13 perry Exp $ */
+/* $NetBSD: bus.h,v 1.4 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -273,9 +273,9 @@ bus_space_write_region_stream_1(t, h, o, a, c)
/*
* Bus read/write barrier methods.
*
- * void bus_space_barrier __P((bus_space_tag_t tag,
+ * void bus_space_barrier(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * bus_size_t len, int flags));
+ * bus_size_t len, int flags);
*
* Note: the 680x0 does not currently require barriers, but we must
* provide the flags to MI code.
diff --git a/sys/arch/amigappc/include/cpu.h b/sys/arch/amigappc/include/cpu.h
index 7e721c19327..6f91a53035c 100644
--- a/sys/arch/amigappc/include/cpu.h
+++ b/sys/arch/amigappc/include/cpu.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.14 2007/03/04 05:59:32 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.15 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (C) 1995-1997 Wolfgang Solfrank.
@@ -45,8 +45,8 @@
#ifdef _KERNEL
-u_long clkread __P((void));
-void physaccess __P((void *, void *, int, int));
+u_long clkread(void);
+void physaccess(void *, void *, int, int);
#endif /* _KERNEL */
@@ -62,7 +62,7 @@ void physaccess __P((void *, void *, int, int));
#define cpu_swapout(p) /* nothing */
#define cpu_number() 0
-extern void delay __P((unsigned));
+extern void delay(unsigned);
#define DELAY(n) delay(n)
extern char bootpath[];
@@ -96,14 +96,14 @@ int machineid;
/*
* Prototypes from amiga_init.c
*/
-void *alloc_z2mem __P((long));
+void *alloc_z2mem(long);
/*
* Prototypes from autoconf.c
*/
-int is_a1200 __P((void));
-int is_a3000 __P((void));
-int is_a4000 __P((void));
+int is_a1200(void);
+int is_a3000(void);
+int is_a4000(void);
#endif
#endif /* !_MACHINE_CPU_H_ */
diff --git a/sys/arch/amigappc/include/intr.h b/sys/arch/amigappc/include/intr.h
index 28ee4d3a0ee..0c5ce99d664 100644
--- a/sys/arch/amigappc/include/intr.h
+++ b/sys/arch/amigappc/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.20 2008/04/28 20:23:13 martin Exp $ */
+/* $NetBSD: intr.h,v 1.21 2009/03/14 14:45:54 dsl Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -84,7 +84,7 @@
* the list. The handler is called with its (single) argument.
*/
struct intrhand {
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
u_long ih_count;
struct intrhand *ih_next;
@@ -92,12 +92,12 @@ struct intrhand {
int ih_irq;
};
-void do_pending_int __P((void));
+void do_pending_int(void);
-static __inline int splraise __P((int));
-static __inline int spllower __P((int));
-static __inline void splx __P((int));
-static __inline void softintr __P((int));
+static __inline int splraise(int);
+static __inline int spllower(int);
+static __inline void splx(int);
+static __inline void softintr(int);
extern volatile int cpl, ipending, astpending, tickspending;
extern int imask[];
diff --git a/sys/arch/amigappc/include/mtpr.h b/sys/arch/amigappc/include/mtpr.h
index ef377c09b1c..f1339eaa823 100644
--- a/sys/arch/amigappc/include/mtpr.h
+++ b/sys/arch/amigappc/include/mtpr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mtpr.h,v 1.4 2005/12/11 12:16:36 christos Exp $ */
+/* $NetBSD: mtpr.h,v 1.5 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -121,9 +121,9 @@ extern unsigned char ssir;
#define setsoftclock() do {ssir |= SIR_CLOCK; setsoftint(); } while (0)
#define setsoftcback() do {ssir |= SIR_CBACK; setsoftint(); } while (0)
-void softintr_schedule __P((void *));
-void *softintr_establish __P((int, void (*)(void *), void *));
-void softintr_disestablish __P((void *));
+void softintr_schedule(void *);
+void *softintr_establish(int, void (*)(void *), void *);
+void softintr_disestablish(void *);
#endif /* _KERNEL */
diff --git a/sys/arch/amigappc/include/param.h b/sys/arch/amigappc/include/param.h
index ba438050ec3..018c3a84a7d 100644
--- a/sys/arch/amigappc/include/param.h
+++ b/sys/arch/amigappc/include/param.h
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.10 2006/08/28 13:43:35 yamt Exp $ */
+/* $NetBSD: param.h,v 1.11 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -161,8 +161,8 @@ extern volatile unsigned short *amiga_intena_read, *amiga_intena_write;
/* ADAM: redefiniton of cpu.h */
#if 0
#ifndef _LOCORE
-void delay __P((int));
-void DELAY __P((int));
+void delay(int);
+void DELAY(int);
#endif /* !_LOCORE */
#endif /* 0 */
#endif /* _KERNEL */
diff --git a/sys/arch/amigappc/include/powerpc.h b/sys/arch/amigappc/include/powerpc.h
index c3149edce32..d2a31294152 100644
--- a/sys/arch/amigappc/include/powerpc.h
+++ b/sys/arch/amigappc/include/powerpc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc.h,v 1.4 2005/12/11 12:16:37 christos Exp $ */
+/* $NetBSD: powerpc.h,v 1.5 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -38,18 +38,18 @@ struct mem_region {
psize_t size;
};
-void mem_regions __P((struct mem_region **, struct mem_region **));
+void mem_regions(struct mem_region **, struct mem_region **);
/*
* These two functions get used solely in boot() in machdep.c.
*
* Not sure whether boot itself should be implementation dependent instead. XXX
*/
-void ppc_exit __P((void)) __attribute__((__noreturn__));
-void ppc_boot __P((char *bootspec)) __attribute__((__noreturn__));
+void ppc_exit(void) __attribute__((__noreturn__));
+void ppc_boot(char *bootspec) __attribute__((__noreturn__));
-int dk_match __P((char *name));
+int dk_match(char *name);
-void ofrootfound __P((void));
+void ofrootfound(void);
#endif /* _MACHINE_POWERPC_H_ */
diff --git a/sys/arch/arm/arm/cpufunc.c b/sys/arch/arm/arm/cpufunc.c
index 1b3b4236572..21a104646b5 100644
--- a/sys/arch/arm/arm/cpufunc.c
+++ b/sys/arch/arm/arm/cpufunc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.90 2008/12/12 18:13:55 matt Exp $ */
+/* $NetBSD: cpufunc.c,v 1.91 2009/03/14 14:45:54 dsl Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.90 2008/12/12 18:13:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.91 2009/03/14 14:45:54 dsl Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -1246,7 +1246,7 @@ struct cachetab cachetab[] = {
{ 0, 0, 0, 0, 0, 0, 0, 0}
};
-static void get_cachetype_table __P((void));
+static void get_cachetype_table(void);
static void
get_cachetype_table()
@@ -2016,7 +2016,7 @@ struct cpu_option {
int co_value;
};
-static u_int parse_cpu_options __P((char *, struct cpu_option *, u_int));
+static u_int parse_cpu_options(char *, struct cpu_option *, u_int);
static u_int
parse_cpu_options(args, optlist, cpuctrl)
diff --git a/sys/arch/arm/arm/db_trace.c b/sys/arch/arm/arm/db_trace.c
index 2768711e804..de3f481d7c9 100644
--- a/sys/arch/arm/arm/db_trace.c
+++ b/sys/arch/arm/arm/db_trace.c
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.17 2008/07/02 19:49:58 rmind Exp $ */
+/* $NetBSD: db_trace.c,v 1.18 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.17 2008/07/02 19:49:58 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.18 2009/03/14 14:45:54 dsl Exp $");
#include <sys/proc.h>
#include <sys/user.h>
@@ -85,7 +85,7 @@ db_stack_trace_print(addr, have_addr, count, modif, pr)
bool have_addr;
db_expr_t count;
const char *modif;
- void (*pr) __P((const char *, ...));
+ void (*pr)(const char *, ...);
{
u_int32_t *frame, *lastframe;
const char *cp = modif;
diff --git a/sys/arch/arm/arm/disksubr.c b/sys/arch/arm/arm/disksubr.c
index 3ba6d916537..5c3dac3adf3 100644
--- a/sys/arch/arm/arm/disksubr.c
+++ b/sys/arch/arm/arm/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.20 2008/01/02 11:48:23 ad Exp $ */
+/* $NetBSD: disksubr.c,v 1.21 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.20 2008/01/02 11:48:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.21 2009/03/14 14:45:54 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,7 +127,7 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.20 2008/01/02 11:48:23 ad Exp $");
const char *
readdisklabel(dev, strat, lp, osdep)
dev_t dev;
- void (*strat) __P((struct buf *));
+ void (*strat)(struct buf *);
struct disklabel *lp;
struct cpu_disklabel *osdep;
{
@@ -328,7 +328,7 @@ setdisklabel(olp, nlp, openmask, osdep)
int
writedisklabel(dev, strat, lp, osdep)
dev_t dev;
- void (*strat) __P((struct buf *));
+ void (*strat)(struct buf *);
struct disklabel *lp;
struct cpu_disklabel *osdep;
{
diff --git a/sys/arch/arm/arm/disksubr_acorn.c b/sys/arch/arm/arm/disksubr_acorn.c
index b1c64dc61a5..0e2b80107fd 100644
--- a/sys/arch/arm/arm/disksubr_acorn.c
+++ b/sys/arch/arm/arm/disksubr_acorn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr_acorn.c,v 1.8 2008/01/02 11:48:23 ad Exp $ */
+/* $NetBSD: disksubr_acorn.c,v 1.9 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -97,14 +97,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr_acorn.c,v 1.8 2008/01/02 11:48:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr_acorn.c,v 1.9 2009/03/14 14:45:54 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/disklabel.h>
-static int filecore_checksum __P((u_char *));
+static int filecore_checksum(u_char *);
/*
* static int filecore_checksum(u_char *bootblock)
@@ -179,7 +179,7 @@ filecore_checksum(bootblock)
int
filecore_label_read(dev, strat, lp, osdep, msgp, cylp, netbsd_label_offp)
dev_t dev;
- void (*strat) __P((struct buf *));
+ void (*strat)(struct buf *);
struct disklabel *lp;
struct cpu_disklabel *osdep;
const char **msgp;
@@ -314,7 +314,7 @@ out:
int
filecore_label_locate(dev, strat, lp, osdep, cylp, netbsd_label_offp)
dev_t dev;
- void (*strat) __P((struct buf *));
+ void (*strat)(struct buf *);
struct disklabel *lp;
struct cpu_disklabel *osdep;
int *cylp, *netbsd_label_offp;
diff --git a/sys/arch/arm/arm/disksubr_mbr.c b/sys/arch/arm/arm/disksubr_mbr.c
index d9270fcf0d1..c650adadab9 100644
--- a/sys/arch/arm/arm/disksubr_mbr.c
+++ b/sys/arch/arm/arm/disksubr_mbr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr_mbr.c,v 1.10 2007/10/17 19:53:30 garbled Exp $ */
+/* $NetBSD: disksubr_mbr.c,v 1.11 2009/03/14 14:45:54 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr_mbr.c,v 1.10 2007/10/17 19:53:30 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr_mbr.c,v 1.11 2009/03/14 14:45:54 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,7 +90,7 @@ int fat_types[] = {
int
mbr_label_read(dev, strat, lp, osdep, msgp, cylp, netbsd_label_offp)
dev_t dev;
- void (*strat) __P((struct buf *));
+ void (*strat)(struct buf *);
struct disklabel *lp;
struct cpu_disklabel *osdep;
const char **msgp;
@@ -202,7 +202,7 @@ out:
int
mbr_label_locate(dev, strat, lp, osdep, cylp, netbsd_label_offp)
dev_t dev;
- void (*strat) __P((struct buf *));
+ void (*strat)(struct buf *);
struct disklabel *lp;
struct cpu_disklabel *osdep;
int *cylp, *netbsd_label_offp;
diff --git a/sys/arch/arm/arm32/arm32_machdep.c b/sys/arch/arm/arm32/arm32_machdep.c
index 159a7f3389a..8aaef7ad641 100644
--- a/sys/arch/arm/arm32/arm32_machdep.c
+++ b/sys/arch/arm/arm32/arm32_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.62 2009/01/17 14:14:56 bjh21 Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.63 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.62 2009/01/17 14:14:56 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.63 2009/03/14 14:45:55 dsl Exp $");
#include "opt_md.h"
#include "opt_pmap_debug.h"
@@ -94,9 +94,9 @@ char *booted_kernel;
/* Prototypes */
-void data_abort_handler __P((trapframe_t *frame));
-void prefetch_abort_handler __P((trapframe_t *frame));
-extern void configure __P((void));
+void data_abort_handler(trapframe_t *frame);
+void prefetch_abort_handler(trapframe_t *frame);
+extern void configure(void);
/*
* arm32_vector_init:
diff --git a/sys/arch/arm/arm32/db_interface.c b/sys/arch/arm/arm32/db_interface.c
index 61eb69f8ef5..ed15c24eb31 100644
--- a/sys/arch/arm/arm32/db_interface.c
+++ b/sys/arch/arm/arm32/db_interface.c
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.45 2008/03/26 13:01:13 chris Exp $ */
+/* $NetBSD: db_interface.c,v 1.46 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.45 2008/03/26 13:01:13 chris Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.46 2009/03/14 14:45:55 dsl Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -66,12 +66,12 @@ __KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.45 2008/03/26 13:01:13 chris Exp
static long nil;
-int db_access_und_sp __P((const struct db_variable *, db_expr_t *, int));
-int db_access_abt_sp __P((const struct db_variable *, db_expr_t *, int));
-int db_access_irq_sp __P((const struct db_variable *, db_expr_t *, int));
-u_int db_fetch_reg __P((int, db_regs_t *));
+int db_access_und_sp(const struct db_variable *, db_expr_t *, int);
+int db_access_abt_sp(const struct db_variable *, db_expr_t *, int);
+int db_access_irq_sp(const struct db_variable *, db_expr_t *, int);
+u_int db_fetch_reg(int, db_regs_t *);
-int db_trapper __P((u_int, u_int, trapframe_t *, int));
+int db_trapper(u_int, u_int, trapframe_t *, int);
const struct db_variable db_regs[] = {
{ "spsr", (long *)&DDB_REGS->tf_spsr, FCN_NULL, },
diff --git a/sys/arch/arm/arm32/vm_machdep.c b/sys/arch/arm/arm32/vm_machdep.c
index d72b7124d52..67b98f70555 100644
--- a/sys/arch/arm/arm32/vm_machdep.c
+++ b/sys/arch/arm/arm32/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.46 2008/10/21 19:01:00 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.47 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.46 2008/10/21 19:01:00 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.47 2009/03/14 14:45:55 dsl Exp $");
#include "opt_armfpe.h"
#include "opt_pmap_debug.h"
@@ -75,8 +75,8 @@ __KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.46 2008/10/21 19:01:00 matt Exp $")
extern pv_addr_t systempage;
-int process_read_regs __P((struct proc *p, struct reg *regs));
-int process_read_fpregs __P((struct proc *p, struct fpreg *regs));
+int process_read_regs(struct proc *p, struct reg *regs);
+int process_read_fpregs(struct proc *p, struct fpreg *regs);
void lwp_trampoline(void);
diff --git a/sys/arch/arm/ep93xx/epcom.c b/sys/arch/arm/ep93xx/epcom.c
index c68bf78cb4b..012854a0aab 100644
--- a/sys/arch/arm/ep93xx/epcom.c
+++ b/sys/arch/arm/ep93xx/epcom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: epcom.c,v 1.18 2008/06/11 22:37:21 cegger Exp $ */
+/* $NetBSD: epcom.c,v 1.19 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1998, 1999, 2001, 2002, 2004 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.18 2008/06/11 22:37:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.19 2009/03/14 14:45:55 dsl Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -898,7 +898,7 @@ epcom_txsoft(struct epcom_softc *sc, struct tty *tp)
inline static void
epcom_rxsoft(struct epcom_softc *sc, struct tty *tp)
{
- int (*rint) __P((int, struct tty *)) = tp->t_linesw->l_rint;
+ int (*rint)(int, struct tty *) = tp->t_linesw->l_rint;
u_char *get, *end;
u_int cc, scc;
u_char sts;
diff --git a/sys/arch/arm/footbridge/footbridge.c b/sys/arch/arm/footbridge/footbridge.c
index 19582451f15..c8a75621745 100644
--- a/sys/arch/arm/footbridge/footbridge.c
+++ b/sys/arch/arm/footbridge/footbridge.c
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge.c,v 1.18 2007/12/14 11:08:03 chris Exp $ */
+/* $NetBSD: footbridge.c,v 1.19 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge.c,v 1.18 2007/12/14 11:08:03 chris Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge.c,v 1.19 2009/03/14 14:45:55 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,12 +68,12 @@ __KERNEL_RCSID(0, "$NetBSD: footbridge.c,v 1.18 2007/12/14 11:08:03 chris Exp $"
/* Declare prototypes */
-static int footbridge_match __P((struct device *parent, struct cfdata *cf,
- void *aux));
-static void footbridge_attach __P((struct device *parent, struct device *self,
- void *aux));
-static int footbridge_print __P((void *aux, const char *pnp));
-static int footbridge_intr __P((void *arg));
+static int footbridge_match(struct device *parent, struct cfdata *cf,
+ void *aux);
+static void footbridge_attach(struct device *parent, struct device *self,
+ void *aux);
+static int footbridge_print(void *aux, const char *pnp);
+static int footbridge_intr(void *arg);
/* Driver and attach structures */
CFATTACH_DECL(footbridge, sizeof(struct footbridge_softc),
diff --git a/sys/arch/arm/footbridge/footbridge.h b/sys/arch/arm/footbridge/footbridge.h
index e88f669d2b5..ed399dc4534 100644
--- a/sys/arch/arm/footbridge/footbridge.h
+++ b/sys/arch/arm/footbridge/footbridge.h
@@ -1,16 +1,16 @@
-/* $NetBSD: footbridge.h,v 1.2 2002/05/04 10:04:42 chris Exp $ */
+/* $NetBSD: footbridge.h,v 1.3 2009/03/14 14:45:55 dsl Exp $ */
#ifndef _FOOTBRIDGE_H_
#define _FOOTBRIDGE_H_
#include <sys/termios.h>
#include <arm/bus.h>
-void footbridge_pci_bs_tag_init __P((void));
-void footbridge_sa110_cc_setup __P((void));
-void footbridge_create_io_bs_tag __P((struct bus_space *, void *));
-void footbridge_create_mem_bs_tag __P((struct bus_space *, void *));
-int fcomcnattach __P((u_int, int, tcflag_t));
-int fcomcndetach __P((void));
-void calibrate_delay __P((void));
+void footbridge_pci_bs_tag_init(void);
+void footbridge_sa110_cc_setup(void);
+void footbridge_create_io_bs_tag(struct bus_space *, void *);
+void footbridge_create_mem_bs_tag(struct bus_space *, void *);
+int fcomcnattach(u_int, int, tcflag_t);
+int fcomcndetach(void);
+void calibrate_delay(void);
#endif
diff --git a/sys/arch/arm/footbridge/footbridge_com.c b/sys/arch/arm/footbridge/footbridge_com.c
index d07f9d66146..b4baf641cd2 100644
--- a/sys/arch/arm/footbridge/footbridge_com.c
+++ b/sys/arch/arm/footbridge/footbridge_com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_com.c,v 1.28 2008/06/13 08:49:15 cegger Exp $ */
+/* $NetBSD: footbridge_com.c,v 1.29 2009/03/14 14:45:55 dsl Exp $ */
/*-
* Copyright (c) 1997 Mark Brinicombe
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_com.c,v 1.28 2008/06/13 08:49:15 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_com.c,v 1.29 2009/03/14 14:45:55 dsl Exp $");
#include "opt_ddb.h"
#include "opt_ddbparam.h"
@@ -100,19 +100,19 @@ struct fcom_softc {
#define RX_BUFFER_SIZE 0x100
-static int fcom_probe __P((struct device *, struct cfdata *, void *));
-static void fcom_attach __P((struct device *, struct device *, void *));
-static void fcom_softintr __P((void *));
+static int fcom_probe(struct device *, struct cfdata *, void *);
+static void fcom_attach(struct device *, struct device *, void *);
+static void fcom_softintr(void *);
-static int fcom_rxintr __P((void *));
-/*static int fcom_txintr __P((void *));*/
+static int fcom_rxintr(void *);
+/*static int fcom_txintr(void *);*/
/*struct consdev;*/
-/*void fcomcnprobe __P((struct consdev *));
-void fcomcninit __P((struct consdev *));*/
-int fcomcngetc __P((dev_t));
-void fcomcnputc __P((dev_t, int));
-void fcomcnpollc __P((dev_t, int));
+/*void fcomcnprobe(struct consdev *);
+void fcomcninit(struct consdev *);*/
+int fcomcngetc(dev_t);
+void fcomcnputc(dev_t, int);
+void fcomcnpollc(dev_t, int);
CFATTACH_DECL(fcom, sizeof(struct fcom_softc),
fcom_probe, fcom_attach, NULL, NULL);
@@ -132,8 +132,8 @@ const struct cdevsw fcom_cdevsw = {
nostop, fcomtty, fcompoll, nommap, ttykqfilter, D_TTY
};
-void fcominit __P((bus_space_tag_t, bus_space_handle_t, int, int));
-void fcominitcons __P((bus_space_tag_t, bus_space_handle_t));
+void fcominit(bus_space_tag_t, bus_space_handle_t, int, int);
+void fcominitcons(bus_space_tag_t, bus_space_handle_t);
bus_space_tag_t fcomconstag;
bus_space_handle_t fcomconsioh;
@@ -218,8 +218,8 @@ fcom_attach(parent, self, aux)
sc->sc_dev.dv_xname);
}
-static void fcomstart __P((struct tty *));
-static int fcomparam __P((struct tty *, struct termios *));
+static void fcomstart(struct tty *);
+static int fcomparam(struct tty *, struct termios *);
int
fcomopen(dev_t dev, int flag, int mode, struct lwp *l)
diff --git a/sys/arch/arm/footbridge/footbridge_pci.c b/sys/arch/arm/footbridge/footbridge_pci.c
index dbc79e35a9a..bc34cbfc3df 100644
--- a/sys/arch/arm/footbridge/footbridge_pci.c
+++ b/sys/arch/arm/footbridge/footbridge_pci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: footbridge_pci.c,v 1.15 2008/05/10 15:29:25 chris Exp $ */
+/* $NetBSD: footbridge_pci.c,v 1.16 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.15 2008/05/10 15:29:25 chris Exp $");
+__KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.16 2009/03/14 14:45:55 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,22 +58,22 @@ __KERNEL_RCSID(0, "$NetBSD: footbridge_pci.c,v 1.15 2008/05/10 15:29:25 chris Ex
#include <dev/isa/isavar.h>
#endif
-void footbridge_pci_attach_hook __P((struct device *,
- struct device *, struct pcibus_attach_args *));
-int footbridge_pci_bus_maxdevs __P((void *, int));
-pcitag_t footbridge_pci_make_tag __P((void *, int, int, int));
-void footbridge_pci_decompose_tag __P((void *, pcitag_t, int *,
- int *, int *));
-pcireg_t footbridge_pci_conf_read __P((void *, pcitag_t, int));
-void footbridge_pci_conf_write __P((void *, pcitag_t, int,
- pcireg_t));
-int footbridge_pci_intr_map __P((struct pci_attach_args *,
- pci_intr_handle_t *));
-const char *footbridge_pci_intr_string __P((void *, pci_intr_handle_t));
-void *footbridge_pci_intr_establish __P((void *, pci_intr_handle_t,
- int, int (*)(void *), void *));
-void footbridge_pci_intr_disestablish __P((void *, void *));
-const struct evcnt *footbridge_pci_intr_evcnt __P((void *, pci_intr_handle_t));
+void footbridge_pci_attach_hook(struct device *,
+ struct device *, struct pcibus_attach_args *);
+int footbridge_pci_bus_maxdevs(void *, int);
+pcitag_t footbridge_pci_make_tag(void *, int, int, int);
+void footbridge_pci_decompose_tag(void *, pcitag_t, int *,
+ int *, int *);
+pcireg_t footbridge_pci_conf_read(void *, pcitag_t, int);
+void footbridge_pci_conf_write(void *, pcitag_t, int,
+ pcireg_t);
+int footbridge_pci_intr_map(struct pci_attach_args *,
+ pci_intr_handle_t *);
+const char *footbridge_pci_intr_string(void *, pci_intr_handle_t);
+void *footbridge_pci_intr_establish(void *, pci_intr_handle_t,
+ int, int (*)(void *), void *);
+void footbridge_pci_intr_disestablish(void *, void *);
+const struct evcnt *footbridge_pci_intr_evcnt(void *, pci_intr_handle_t);
struct arm32_pci_chipset footbridge_pci_chipset = {
NULL, /* conf_v */
@@ -361,7 +361,7 @@ void *
footbridge_pci_intr_establish(pcv, ih, level, func, arg)
void *pcv;
pci_intr_handle_t ih;
- int level, (*func) __P((void *));
+ int level, (*func)(void *);
void *arg;
{
void *intr;
diff --git a/sys/arch/arm/footbridge/isa/isa_machdep.c b/sys/arch/arm/footbridge/isa/isa_machdep.c
index f8c759e2910..0ec014dd4f8 100644
--- a/sys/arch/arm/footbridge/isa/isa_machdep.c
+++ b/sys/arch/arm/footbridge/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.8 2008/04/28 20:23:14 martin Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.9 2009/03/14 14:45:55 dsl Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.8 2008/04/28 20:23:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.9 2009/03/14 14:45:55 dsl Exp $");
#include "opt_irqstats.h"
@@ -98,15 +98,15 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.8 2008/04/28 20:23:14 martin Exp $
#include "isadma.h"
/* prototypes */
-static void isa_icu_init __P((void));
+static void isa_icu_init(void);
struct arm32_isa_chipset isa_chipset_tag;
-void isa_strayintr __P((int));
-void intr_calculatemasks __P((void));
-int fakeintr __P((void *));
+void isa_strayintr(int);
+void intr_calculatemasks(void);
+int fakeintr(void *);
-int isa_irqdispatch __P((void *arg));
+int isa_irqdispatch(void *arg);
u_int imask[NIPL];
unsigned imen;
@@ -346,7 +346,7 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
int irq;
int type;
int level;
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
{
struct intrq *iq;
diff --git a/sys/arch/arm/footbridge/isa/isadma_machdep.c b/sys/arch/arm/footbridge/isa/isadma_machdep.c
index b97f40471f5..5fcf62a4343 100644
--- a/sys/arch/arm/footbridge/isa/isadma_machdep.c
+++ b/sys/arch/arm/footbridge/isa/isadma_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_machdep.c,v 1.10 2008/04/28 20:23:14 martin Exp $ */
+/* $NetBSD: isadma_machdep.c,v 1.11 2009/03/14 14:45:55 dsl Exp $ */
#define ISA_DMA_STATS
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.10 2008/04/28 20:23:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.11 2009/03/14 14:45:55 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,27 +65,27 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.10 2008/04/28 20:23:14 martin E
struct arm32_dma_range *footbridge_isa_dma_ranges;
int footbridge_isa_dma_nranges;
-int _isa_bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *));
-void _isa_bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int _isa_bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
-int _isa_bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
-int _isa_bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
-int _isa_bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
-void _isa_bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void _isa_bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int));
-
-int _isa_bus_dmamem_alloc __P((bus_dma_tag_t, bus_size_t, bus_size_t,
- bus_size_t, bus_dma_segment_t *, int, int *, int));
-
-int _isa_dma_alloc_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t,
- bus_size_t, int));
-void _isa_dma_free_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t));
+int _isa_bus_dmamap_create(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
+void _isa_bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int _isa_bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+int _isa_bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+int _isa_bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+int _isa_bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+void _isa_bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void _isa_bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
+
+int _isa_bus_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t,
+ bus_size_t, bus_dma_segment_t *, int, int *, int);
+
+int _isa_dma_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t,
+ bus_size_t, int);
+void _isa_dma_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t);
/*
* Entry points for ISA DMA. These are mostly wrappers around
diff --git a/sys/arch/arm/footbridge/isa/sysbeep_isa.c b/sys/arch/arm/footbridge/isa/sysbeep_isa.c
index 3123fc8dc57..a2f1b33cc0e 100644
--- a/sys/arch/arm/footbridge/isa/sysbeep_isa.c
+++ b/sys/arch/arm/footbridge/isa/sysbeep_isa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysbeep_isa.c,v 1.6 2008/04/28 20:23:14 martin Exp $ */
+/* $NetBSD: sysbeep_isa.c,v 1.7 2009/03/14 14:45:55 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysbeep_isa.c,v 1.6 2008/04/28 20:23:14 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysbeep_isa.c,v 1.7 2009/03/14 14:45:55 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,9 +40,9 @@ __KERNEL_RCSID(0, "$NetBSD: sysbeep_isa.c,v 1.6 2008/04/28 20:23:14 martin Exp $
#include <dev/isa/pcppivar.h>
/* Prototypes */
-int sysbeep_isa_match __P((struct device *parent, struct cfdata *cf, void *aux));
-void sysbeep_isa_attach __P((struct device *parent, struct device *self, void *aux));
-void sysbeep_isa __P((int pitch, int period));
+int sysbeep_isa_match(struct device *parent, struct cfdata *cf, void *aux);
+void sysbeep_isa_attach(struct device *parent, struct device *self, void *aux);
+void sysbeep_isa(int pitch, int period);
/* device attach structure */
CFATTACH_DECL(sysbeep_isa, sizeof(struct device),
diff --git a/sys/arch/arm/footbridge/todclock.c b/sys/arch/arm/footbridge/todclock.c
index 629c82ac1ca..5812fde4f1e 100644
--- a/sys/arch/arm/footbridge/todclock.c
+++ b/sys/arch/arm/footbridge/todclock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: todclock.c,v 1.11 2008/01/15 23:15:59 joerg Exp $ */
+/* $NetBSD: todclock.c,v 1.12 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: todclock.c,v 1.11 2008/01/15 23:15:59 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: todclock.c,v 1.12 2009/03/14 14:45:55 dsl Exp $");
/* Include header files */
@@ -75,16 +75,16 @@ static int tod_set_ymdhms(todr_chip_handle_t, struct clock_ymdhms *);
struct todclock_softc {
struct device sc_dev; /* device node */
void *sc_rtc_arg; /* arg to read/write */
- int (*sc_rtc_write) __P((void *, rtc_t *)); /* rtc write function */
- int (*sc_rtc_read) __P((void *, rtc_t *)); /* rtc read function */
+ int (*sc_rtc_write)(void *, rtc_t *); /* rtc write function */
+ int (*sc_rtc_read)(void *, rtc_t *); /* rtc read function */
};
/* prototypes for functions */
-static void todclockattach __P((struct device *parent, struct device *self,
- void *aux));
-static int todclockmatch __P((struct device *parent, struct cfdata *cf,
- void *aux));
+static void todclockattach(struct device *parent, struct device *self,
+ void *aux);
+static int todclockmatch(struct device *parent, struct cfdata *cf,
+ void *aux);
/*
* We need to remember our softc for functions like inittodr()
diff --git a/sys/arch/arm/footbridge/todclockvar.h b/sys/arch/arm/footbridge/todclockvar.h
index 798facd7636..7756c8a4c4f 100644
--- a/sys/arch/arm/footbridge/todclockvar.h
+++ b/sys/arch/arm/footbridge/todclockvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: todclockvar.h,v 1.1 2002/02/10 12:26:00 chris Exp $ */
+/* $NetBSD: todclockvar.h,v 1.2 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe.
@@ -46,8 +46,8 @@
struct todclock_attach_args {
const char *ta_name; /* device name */
void *ta_rtc_arg; /* arg to read/write */
- int (*ta_rtc_write) __P((void *, rtc_t *)); /* function to write rtc */
- int (*ta_rtc_read) __P((void *, rtc_t *)); /* function to read rtc */
+ int (*ta_rtc_write)(void *, rtc_t *); /* function to write rtc */
+ int (*ta_rtc_read)(void *, rtc_t *); /* function to read rtc */
int ta_flags; /* flags */
#define TODCLOCK_FLAG_FAKE 0x01 /* tod service is faked */
};
diff --git a/sys/arch/arm/fpe-arm/armfpe.h b/sys/arch/arm/fpe-arm/armfpe.h
index 569eea7d279..803036285b8 100644
--- a/sys/arch/arm/fpe-arm/armfpe.h
+++ b/sys/arch/arm/fpe-arm/armfpe.h
@@ -1,4 +1,4 @@
-/* $NetBSD: armfpe.h,v 1.4 2005/12/11 12:16:46 christos Exp $ */
+/* $NetBSD: armfpe.h,v 1.5 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1995 Neil A Carson.
@@ -109,31 +109,31 @@ typedef struct {
/* Prototypes */
-int arm_fpe_boot __P((void));
-int initialise_arm_fpe __P((void));
-void arm_fpe_postproc __P((u_int fpframe, struct trapframe *frame));
-void arm_fpe_exception __P((int exception, u_int fpframe, struct trapframe *frame));
-
-void arm_fpe_core_disable __P((void));
-void arm_fpe_core_enable __P((void));
-u_int arm_fpe_core_initws __P((u_int workspace, int handler1, int handler2));
-u_int arm_fpe_core_abort __P((u_int context, int r12, int pc));
-void arm_fpe_core_initcontext __P((u_int context));
-u_int arm_fpe_core_changecontext __P((u_int context));
-void arm_fpe_core_shutdown __P((void));
-void arm_fpe_core_activatecontext __P((u_int context));
-u_int arm_fpe_core_deactivatecontext __P((void));
-u_int arm_fpe_core_savecontext __P((u_int context, fp_context_frame_t *savearea, int pc));
-void arm_fpe_core_loadcontext __P((u_int context, const fp_context_frame_t *loadarea));
-void arm_fpe_copycontext __P((u_int c1, u_int c2));
-void arm_fpe_getcontext __P((struct proc *p, struct fpreg *fpregs));
-void arm_fpe_setcontext __P((struct proc *p, const struct fpreg *fpregs));
-
-void arm_fpe_exception_glue __P((int exception));
-void arm_fpe_panic __P((void));
-void undefined_entry __P((void));
-void arm_fpe_post_proc_glue __P((void));
-void arm_fpe_set_exception_mask __P((fp_except));
+int arm_fpe_boot(void);
+int initialise_arm_fpe(void);
+void arm_fpe_postproc(u_int fpframe, struct trapframe *frame);
+void arm_fpe_exception(int exception, u_int fpframe, struct trapframe *frame);
+
+void arm_fpe_core_disable(void);
+void arm_fpe_core_enable(void);
+u_int arm_fpe_core_initws(u_int workspace, int handler1, int handler2);
+u_int arm_fpe_core_abort(u_int context, int r12, int pc);
+void arm_fpe_core_initcontext(u_int context);
+u_int arm_fpe_core_changecontext(u_int context);
+void arm_fpe_core_shutdown(void);
+void arm_fpe_core_activatecontext(u_int context);
+u_int arm_fpe_core_deactivatecontext(void);
+u_int arm_fpe_core_savecontext(u_int context, fp_context_frame_t *savearea, int pc);
+void arm_fpe_core_loadcontext(u_int context, const fp_context_frame_t *loadarea);
+void arm_fpe_copycontext(u_int c1, u_int c2);
+void arm_fpe_getcontext(struct proc *p, struct fpreg *fpregs);
+void arm_fpe_setcontext(struct proc *p, const struct fpreg *fpregs);
+
+void arm_fpe_exception_glue(int exception);
+void arm_fpe_panic(void);
+void undefined_entry(void);
+void arm_fpe_post_proc_glue(void);
+void arm_fpe_set_exception_mask(fp_except);
#endif /* _KERNEL */
#endif /* _ARMFPE_H_ */
diff --git a/sys/arch/arm/include/arm32/db_machdep.h b/sys/arch/arm/include/arm32/db_machdep.h
index eaebecbbb1e..2f501c3e32d 100644
--- a/sys/arch/arm/include/arm32/db_machdep.h
+++ b/sys/arch/arm/include/arm32/db_machdep.h
@@ -1,11 +1,11 @@
-/* $NetBSD: db_machdep.h,v 1.4 2007/02/22 04:38:03 matt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.5 2009/03/14 14:45:55 dsl Exp $ */
#ifndef _ARM32_DB_MACHDEP_H_
#define _ARM32_DB_MACHDEP_H_
#include <arm/db_machdep.h>
-void db_show_panic_cmd __P((db_expr_t, bool, db_expr_t, const char *));
-void db_show_frame_cmd __P((db_expr_t, bool, db_expr_t, const char *));
+void db_show_panic_cmd(db_expr_t, bool, db_expr_t, const char *);
+void db_show_frame_cmd(db_expr_t, bool, db_expr_t, const char *);
#endif
diff --git a/sys/arch/arm/include/arm32/machdep.h b/sys/arch/arm/include/arm32/machdep.h
index 5ca0c3bb00d..3f16b9fee8c 100644
--- a/sys/arch/arm/include/arm32/machdep.h
+++ b/sys/arch/arm/include/arm32/machdep.h
@@ -1,26 +1,26 @@
-/* $NetBSD: machdep.h,v 1.8 2007/03/04 05:59:38 christos Exp $ */
+/* $NetBSD: machdep.h,v 1.9 2009/03/14 14:45:55 dsl Exp $ */
#ifndef _ARM32_BOOT_MACHDEP_H_
#define _ARM32_BOOT_MACHDEP_H_
/* misc prototypes used by the many arm machdeps */
-void halt __P((void));
-void parse_mi_bootargs __P((char *));
-void data_abort_handler __P((trapframe_t *));
-void prefetch_abort_handler __P((trapframe_t *));
-void undefinedinstruction_bounce __P((trapframe_t *));
-void dumpsys __P((void));
+void halt(void);
+void parse_mi_bootargs(char *);
+void data_abort_handler(trapframe_t *);
+void prefetch_abort_handler(trapframe_t *);
+void undefinedinstruction_bounce(trapframe_t *);
+void dumpsys(void);
/*
* note that we use void *as all the platforms have different ideas on what
* the structure is
*/
-u_int initarm __P((void *));
+u_int initarm(void *);
/* from arm/arm32/intr.c */
-void dosoftints __P((void));
-void set_spl_masks __P((void));
+void dosoftints(void);
+void set_spl_masks(void);
#ifdef DIAGNOSTIC
-void dump_spl_masks __P((void));
+void dump_spl_masks(void);
#endif
#endif
diff --git a/sys/arch/arm/include/arm32/param.h b/sys/arch/arm/include/arm32/param.h
index 8b112637d36..11615c0681c 100644
--- a/sys/arch/arm/include/arm32/param.h
+++ b/sys/arch/arm/include/arm32/param.h
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.13 2008/01/19 15:04:10 chris Exp $ */
+/* $NetBSD: param.h,v 1.14 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -112,7 +112,7 @@
#ifdef _KERNEL
#ifndef _LOCORE
-void delay __P((unsigned));
+void delay(unsigned);
#define DELAY(x) delay(x)
#endif
#endif
diff --git a/sys/arch/arm/include/arm32/rtc.h b/sys/arch/arm/include/arm32/rtc.h
index bd0f7977f36..87c97aaced8 100644
--- a/sys/arch/arm/include/arm32/rtc.h
+++ b/sys/arch/arm/include/arm32/rtc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.h,v 1.1 2001/02/23 21:23:50 reinoud Exp $ */
+/* $NetBSD: rtc.h,v 1.2 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -76,8 +76,8 @@ typedef struct {
#define RTC_ADDR_CENT 0xc1
#ifdef _KERNEL
-int cmos_read __P((int));
-int cmos_write __P((int, int));
+int cmos_read(int);
+int cmos_write(int, int);
#endif /* _KERNEL */
/* End of rtc.h */
diff --git a/sys/arch/arm/include/bootconfig.h b/sys/arch/arm/include/bootconfig.h
index 80d162323f0..e92acad107e 100644
--- a/sys/arch/arm/include/bootconfig.h
+++ b/sys/arch/arm/include/bootconfig.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bootconfig.h,v 1.4 2006/10/26 23:31:47 bjh21 Exp $ */
+/* $NetBSD: bootconfig.h,v 1.5 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -44,7 +44,7 @@
#define BOOTOPT_TYPE_HEXINT 4
#define BOOTOPT_TYPE_MASK 7
-int get_bootconf_option __P((char *, const char *, int, void *));
+int get_bootconf_option(char *, const char *, int, void *);
extern char *boot_args;
#endif /* _KERNEL */
diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h
index 400a250e588..1461f5d687d 100644
--- a/sys/arch/arm/include/bus.h
+++ b/sys/arch/arm/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.19 2008/04/28 20:23:14 martin Exp $ */
+/* $NetBSD: bus.h,v 1.20 2009/03/14 14:45:55 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -81,8 +81,8 @@ typedef struct bus_space *bus_space_tag_t;
typedef u_long bus_space_handle_t;
/*
- * int bus_space_map __P((bus_space_tag_t t, bus_addr_t addr,
- * bus_size_t size, int flags, bus_space_handle_t *bshp));
+ * int bus_space_map(bus_space_tag_t t, bus_addr_t addr,
+ * bus_size_t size, int flags, bus_space_handle_t *bshp);
*
* Map a region of bus space.
*/
@@ -96,180 +96,180 @@ struct bus_space {
void *bs_cookie;
/* mapping/unmapping */
- int (*bs_map) __P((void *, bus_addr_t, bus_size_t,
- int, bus_space_handle_t *));
- void (*bs_unmap) __P((void *, bus_space_handle_t,
- bus_size_t));
- int (*bs_subregion) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
+ int (*bs_map)(void *, bus_addr_t, bus_size_t,
+ int, bus_space_handle_t *);
+ void (*bs_unmap)(void *, bus_space_handle_t,
+ bus_size_t);
+ int (*bs_subregion)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
/* allocation/deallocation */
- int (*bs_alloc) __P((void *, bus_addr_t, bus_addr_t,
+ int (*bs_alloc)(void *, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_size_t, int,
- bus_addr_t *, bus_space_handle_t *));
- void (*bs_free) __P((void *, bus_space_handle_t,
- bus_size_t));
+ bus_addr_t *, bus_space_handle_t *);
+ void (*bs_free)(void *, bus_space_handle_t,
+ bus_size_t);
/* get kernel virtual address */
- void * (*bs_vaddr) __P((void *, bus_space_handle_t));
+ void * (*bs_vaddr)(void *, bus_space_handle_t);
/* mmap bus space for user */
- paddr_t (*bs_mmap) __P((void *, bus_addr_t, off_t, int, int));
+ paddr_t (*bs_mmap)(void *, bus_addr_t, off_t, int, int);
/* barrier */
- void (*bs_barrier) __P((void *, bus_space_handle_t,
- bus_size_t, bus_size_t, int));
+ void (*bs_barrier)(void *, bus_space_handle_t,
+ bus_size_t, bus_size_t, int);
/* read (single) */
- u_int8_t (*bs_r_1) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int16_t (*bs_r_2) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int32_t (*bs_r_4) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int64_t (*bs_r_8) __P((void *, bus_space_handle_t,
- bus_size_t));
+ u_int8_t (*bs_r_1)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int16_t (*bs_r_2)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int32_t (*bs_r_4)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int64_t (*bs_r_8)(void *, bus_space_handle_t,
+ bus_size_t);
/* read multiple */
- void (*bs_rm_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
- void (*bs_rm_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
- void (*bs_rm_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
- void (*bs_rm_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+ void (*bs_rm_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+ void (*bs_rm_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+ void (*bs_rm_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+ void (*bs_rm_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region */
- void (*bs_rr_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
- void (*bs_rr_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
- void (*bs_rr_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
- void (*bs_rr_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+ void (*bs_rr_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+ void (*bs_rr_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+ void (*bs_rr_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+ void (*bs_rr_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write (single) */
- void (*bs_w_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
- void (*bs_w_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
- void (*bs_w_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
- void (*bs_w_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t));
+ void (*bs_w_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+ void (*bs_w_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+ void (*bs_w_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+ void (*bs_w_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
/* write multiple */
- void (*bs_wm_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
- void (*bs_wm_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
- void (*bs_wm_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
- void (*bs_wm_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+ void (*bs_wm_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+ void (*bs_wm_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+ void (*bs_wm_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+ void (*bs_wm_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* write region */
- void (*bs_wr_1) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
- void (*bs_wr_2) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
- void (*bs_wr_4) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
- void (*bs_wr_8) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+ void (*bs_wr_1)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+ void (*bs_wr_2)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+ void (*bs_wr_4)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+ void (*bs_wr_8)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* set multiple */
- void (*bs_sm_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
- void (*bs_sm_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
- void (*bs_sm_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
- void (*bs_sm_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+ void (*bs_sm_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+ void (*bs_sm_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+ void (*bs_sm_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+ void (*bs_sm_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* set region */
- void (*bs_sr_1) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t, bus_size_t));
- void (*bs_sr_2) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t, bus_size_t));
- void (*bs_sr_4) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t, bus_size_t));
- void (*bs_sr_8) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t, bus_size_t));
+ void (*bs_sr_1)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t, bus_size_t);
+ void (*bs_sr_2)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t, bus_size_t);
+ void (*bs_sr_4)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t, bus_size_t);
+ void (*bs_sr_8)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t, bus_size_t);
/* copy */
- void (*bs_c_1) __P((void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t));
- void (*bs_c_2) __P((void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t));
- void (*bs_c_4) __P((void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t));
- void (*bs_c_8) __P((void *, bus_space_handle_t, bus_size_t,
- bus_space_handle_t, bus_size_t, bus_size_t));
+ void (*bs_c_1)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*bs_c_2)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*bs_c_4)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
+ void (*bs_c_8)(void *, bus_space_handle_t, bus_size_t,
+ bus_space_handle_t, bus_size_t, bus_size_t);
#ifdef __BUS_SPACE_HAS_STREAM_METHODS
/* read stream (single) */
- u_int8_t (*bs_r_1_s) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int16_t (*bs_r_2_s) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int32_t (*bs_r_4_s) __P((void *, bus_space_handle_t,
- bus_size_t));
- u_int64_t (*bs_r_8_s) __P((void *, bus_space_handle_t,
- bus_size_t));
+ u_int8_t (*bs_r_1_s)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int16_t (*bs_r_2_s)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int32_t (*bs_r_4_s)(void *, bus_space_handle_t,
+ bus_size_t);
+ u_int64_t (*bs_r_8_s)(void *, bus_space_handle_t,
+ bus_size_t);
/* read multiple stream */
- void (*bs_rm_1_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
- void (*bs_rm_2_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
- void (*bs_rm_4_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
- void (*bs_rm_8_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+ void (*bs_rm_1_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+ void (*bs_rm_2_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+ void (*bs_rm_4_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+ void (*bs_rm_8_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* read region stream */
- void (*bs_rr_1_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t *, bus_size_t));
- void (*bs_rr_2_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t *, bus_size_t));
- void (*bs_rr_4_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t *, bus_size_t));
- void (*bs_rr_8_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t *, bus_size_t));
+ void (*bs_rr_1_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t *, bus_size_t);
+ void (*bs_rr_2_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t *, bus_size_t);
+ void (*bs_rr_4_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t *, bus_size_t);
+ void (*bs_rr_8_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t *, bus_size_t);
/* write stream (single) */
- void (*bs_w_1_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int8_t));
- void (*bs_w_2_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int16_t));
- void (*bs_w_4_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int32_t));
- void (*bs_w_8_s) __P((void *, bus_space_handle_t,
- bus_size_t, u_int64_t));
+ void (*bs_w_1_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int8_t);
+ void (*bs_w_2_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int16_t);
+ void (*bs_w_4_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int32_t);
+ void (*bs_w_8_s)(void *, bus_space_handle_t,
+ bus_size_t, u_int64_t);
/* write multiple stream */
- void (*bs_wm_1_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
- void (*bs_wm_2_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
- void (*bs_wm_4_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
- void (*bs_wm_8_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+ void (*bs_wm_1_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+ void (*bs_wm_2_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+ void (*bs_wm_4_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+ void (*bs_wm_8_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
/* write region stream */
- void (*bs_wr_1_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int8_t *, bus_size_t));
- void (*bs_wr_2_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int16_t *, bus_size_t));
- void (*bs_wr_4_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int32_t *, bus_size_t));
- void (*bs_wr_8_s) __P((void *, bus_space_handle_t,
- bus_size_t, const u_int64_t *, bus_size_t));
+ void (*bs_wr_1_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int8_t *, bus_size_t);
+ void (*bs_wr_2_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int16_t *, bus_size_t);
+ void (*bs_wr_4_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int32_t *, bus_size_t);
+ void (*bs_wr_8_s)(void *, bus_space_handle_t,
+ bus_size_t, const u_int64_t *, bus_size_t);
#endif /* __BUS_SPACE_HAS_STREAM_METHODS */
};
@@ -510,185 +510,185 @@ struct bus_space {
*/
#define bs_map_proto(f) \
-int __bs_c(f,_bs_map) __P((void *t, bus_addr_t addr, \
- bus_size_t size, int cacheable, bus_space_handle_t *bshp));
+int __bs_c(f,_bs_map)(void *t, bus_addr_t addr, \
+ bus_size_t size, int cacheable, bus_space_handle_t *bshp);
#define bs_unmap_proto(f) \
-void __bs_c(f,_bs_unmap) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t size));
+void __bs_c(f,_bs_unmap)(void *t, bus_space_handle_t bsh, \
+ bus_size_t size);
#define bs_subregion_proto(f) \
-int __bs_c(f,_bs_subregion) __P((void *t, bus_space_handle_t bsh, \
+int __bs_c(f,_bs_subregion)(void *t, bus_space_handle_t bsh, \
bus_size_t offset, bus_size_t size, \
- bus_space_handle_t *nbshp));
+ bus_space_handle_t *nbshp);
#define bs_alloc_proto(f) \
-int __bs_c(f,_bs_alloc) __P((void *t, bus_addr_t rstart, \
+int __bs_c(f,_bs_alloc)(void *t, bus_addr_t rstart, \
bus_addr_t rend, bus_size_t size, bus_size_t align, \
bus_size_t boundary, int cacheable, bus_addr_t *addrp, \
- bus_space_handle_t *bshp));
+ bus_space_handle_t *bshp);
#define bs_free_proto(f) \
-void __bs_c(f,_bs_free) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t size));
+void __bs_c(f,_bs_free)(void *t, bus_space_handle_t bsh, \
+ bus_size_t size);
#define bs_vaddr_proto(f) \
-void * __bs_c(f,_bs_vaddr) __P((void *t, bus_space_handle_t bsh));
+void * __bs_c(f,_bs_vaddr)(void *t, bus_space_handle_t bsh);
#define bs_mmap_proto(f) \
-paddr_t __bs_c(f,_bs_mmap) __P((void *, bus_addr_t, off_t, int, int));
+paddr_t __bs_c(f,_bs_mmap)(void *, bus_addr_t, off_t, int, int);
#define bs_barrier_proto(f) \
-void __bs_c(f,_bs_barrier) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, bus_size_t len, int flags));
+void __bs_c(f,_bs_barrier)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, bus_size_t len, int flags);
#define bs_r_1_proto(f) \
-u_int8_t __bs_c(f,_bs_r_1) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset));
+u_int8_t __bs_c(f,_bs_r_1)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset);
#define bs_r_2_proto(f) \
-u_int16_t __bs_c(f,_bs_r_2) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset));
+u_int16_t __bs_c(f,_bs_r_2)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset);
#define bs_r_4_proto(f) \
-u_int32_t __bs_c(f,_bs_r_4) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset));
+u_int32_t __bs_c(f,_bs_r_4)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset);
#define bs_r_8_proto(f) \
-u_int64_t __bs_c(f,_bs_r_8) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset));
+u_int64_t __bs_c(f,_bs_r_8)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset);
#define bs_w_1_proto(f) \
-void __bs_c(f,_bs_w_1) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int8_t value));
+void __bs_c(f,_bs_w_1)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int8_t value);
#define bs_w_2_proto(f) \
-void __bs_c(f,_bs_w_2) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int16_t value));
+void __bs_c(f,_bs_w_2)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int16_t value);
#define bs_w_4_proto(f) \
-void __bs_c(f,_bs_w_4) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int32_t value));
+void __bs_c(f,_bs_w_4)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int32_t value);
#define bs_w_8_proto(f) \
-void __bs_c(f,_bs_w_8) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int64_t value));
+void __bs_c(f,_bs_w_8)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int64_t value);
#define bs_rm_1_proto(f) \
-void __bs_c(f,_bs_rm_1) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int8_t *addr, bus_size_t count));
+void __bs_c(f,_bs_rm_1)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int8_t *addr, bus_size_t count);
#define bs_rm_2_proto(f) \
-void __bs_c(f,_bs_rm_2) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int16_t *addr, bus_size_t count));
+void __bs_c(f,_bs_rm_2)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int16_t *addr, bus_size_t count);
#define bs_rm_4_proto(f) \
-void __bs_c(f,_bs_rm_4) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int32_t *addr, bus_size_t count));
+void __bs_c(f,_bs_rm_4)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int32_t *addr, bus_size_t count);
#define bs_rm_8_proto(f) \
-void __bs_c(f,_bs_rm_8) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int64_t *addr, bus_size_t count));
+void __bs_c(f,_bs_rm_8)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int64_t *addr, bus_size_t count);
#define bs_wm_1_proto(f) \
-void __bs_c(f,_bs_wm_1) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int8_t *addr, bus_size_t count));
+void __bs_c(f,_bs_wm_1)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, const u_int8_t *addr, bus_size_t count);
#define bs_wm_2_proto(f) \
-void __bs_c(f,_bs_wm_2) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int16_t *addr, bus_size_t count));
+void __bs_c(f,_bs_wm_2)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, const u_int16_t *addr, bus_size_t count);
#define bs_wm_4_proto(f) \
-void __bs_c(f,_bs_wm_4) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int32_t *addr, bus_size_t count));
+void __bs_c(f,_bs_wm_4)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, const u_int32_t *addr, bus_size_t count);
#define bs_wm_8_proto(f) \
-void __bs_c(f,_bs_wm_8) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int64_t *addr, bus_size_t count));
+void __bs_c(f,_bs_wm_8)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, const u_int64_t *addr, bus_size_t count);
#define bs_rr_1_proto(f) \
-void __bs_c(f, _bs_rr_1) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int8_t *addr, bus_size_t count));
+void __bs_c(f, _bs_rr_1)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int8_t *addr, bus_size_t count);
#define bs_rr_2_proto(f) \
-void __bs_c(f, _bs_rr_2) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int16_t *addr, bus_size_t count));
+void __bs_c(f, _bs_rr_2)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int16_t *addr, bus_size_t count);
#define bs_rr_4_proto(f) \
-void __bs_c(f, _bs_rr_4) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int32_t *addr, bus_size_t count));
+void __bs_c(f, _bs_rr_4)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int32_t *addr, bus_size_t count);
#define bs_rr_8_proto(f) \
-void __bs_c(f, _bs_rr_8) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int64_t *addr, bus_size_t count));
+void __bs_c(f, _bs_rr_8)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int64_t *addr, bus_size_t count);
#define bs_wr_1_proto(f) \
-void __bs_c(f, _bs_wr_1) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int8_t *addr, bus_size_t count));
+void __bs_c(f, _bs_wr_1)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, const u_int8_t *addr, bus_size_t count);
#define bs_wr_2_proto(f) \
-void __bs_c(f, _bs_wr_2) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int16_t *addr, bus_size_t count));
+void __bs_c(f, _bs_wr_2)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, const u_int16_t *addr, bus_size_t count);
#define bs_wr_4_proto(f) \
-void __bs_c(f, _bs_wr_4) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int32_t *addr, bus_size_t count));
+void __bs_c(f, _bs_wr_4)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, const u_int32_t *addr, bus_size_t count);
#define bs_wr_8_proto(f) \
-void __bs_c(f, _bs_wr_8) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, const u_int64_t *addr, bus_size_t count));
+void __bs_c(f, _bs_wr_8)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, const u_int64_t *addr, bus_size_t count);
#define bs_sm_1_proto(f) \
-void __bs_c(f,_bs_sm_1) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int8_t value, bus_size_t count));
+void __bs_c(f,_bs_sm_1)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int8_t value, bus_size_t count);
#define bs_sm_2_proto(f) \
-void __bs_c(f,_bs_sm_2) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int16_t value, bus_size_t count));
+void __bs_c(f,_bs_sm_2)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int16_t value, bus_size_t count);
#define bs_sm_4_proto(f) \
-void __bs_c(f,_bs_sm_4) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int32_t value, bus_size_t count));
+void __bs_c(f,_bs_sm_4)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int32_t value, bus_size_t count);
#define bs_sm_8_proto(f) \
-void __bs_c(f,_bs_sm_8) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int64_t value, bus_size_t count));
+void __bs_c(f,_bs_sm_8)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int64_t value, bus_size_t count);
#define bs_sr_1_proto(f) \
-void __bs_c(f,_bs_sr_1) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int8_t value, bus_size_t count));
+void __bs_c(f,_bs_sr_1)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int8_t value, bus_size_t count);
#define bs_sr_2_proto(f) \
-void __bs_c(f,_bs_sr_2) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int16_t value, bus_size_t count));
+void __bs_c(f,_bs_sr_2)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int16_t value, bus_size_t count);
#define bs_sr_4_proto(f) \
-void __bs_c(f,_bs_sr_4) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int32_t value, bus_size_t count));
+void __bs_c(f,_bs_sr_4)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int32_t value, bus_size_t count);
#define bs_sr_8_proto(f) \
-void __bs_c(f,_bs_sr_8) __P((void *t, bus_space_handle_t bsh, \
- bus_size_t offset, u_int64_t value, bus_size_t count));
+void __bs_c(f,_bs_sr_8)(void *t, bus_space_handle_t bsh, \
+ bus_size_t offset, u_int64_t value, bus_size_t count);
#define bs_c_1_proto(f) \
-void __bs_c(f,_bs_c_1) __P((void *t, bus_space_handle_t bsh1, \
+void __bs_c(f,_bs_c_1)(void *t, bus_space_handle_t bsh1, \
bus_size_t offset1, bus_space_handle_t bsh2, \
- bus_size_t offset2, bus_size_t count));
+ bus_size_t offset2, bus_size_t count);
#define bs_c_2_proto(f) \
-void __bs_c(f,_bs_c_2) __P((void *t, bus_space_handle_t bsh1, \
+void __bs_c(f,_bs_c_2)(void *t, bus_space_handle_t bsh1, \
bus_size_t offset1, bus_space_handle_t bsh2, \
- bus_size_t offset2, bus_size_t count));
+ bus_size_t offset2, bus_size_t count);
#define bs_c_4_proto(f) \
-void __bs_c(f,_bs_c_4) __P((void *t, bus_space_handle_t bsh1, \
+void __bs_c(f,_bs_c_4)(void *t, bus_space_handle_t bsh1, \
bus_size_t offset1, bus_space_handle_t bsh2, \
- bus_size_t offset2, bus_size_t count));
+ bus_size_t offset2, bus_size_t count);
#define bs_c_8_proto(f) \
-void __bs_c(f,_bs_c_8) __P((void *t, bus_space_handle_t bsh1, \
+void __bs_c(f,_bs_c_8)(void *t, bus_space_handle_t bsh1, \
bus_size_t offset1, bus_space_handle_t bsh2, \
- bus_size_t offset2, bus_size_t count));
+ bus_size_t offset2, bus_size_t count);
#define bs_protos(f) \
bs_map_proto(f); \
@@ -829,35 +829,35 @@ struct arm32_bus_dma_tag {
/*
* DMA mapping methods.
*/
- int (*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *));
- void (*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t));
- int (*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
- int (*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
- int (*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
- int (*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
- void (*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t));
- void (*_dmamap_sync_pre) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int));
- void (*_dmamap_sync_post) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int));
+ int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
+ void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t);
+ int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+ int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+ int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+ int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+ void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
+ void (*_dmamap_sync_pre)(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
+ void (*_dmamap_sync_post)(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
/*
* DMA memory utility functions.
*/
- int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t,
- bus_size_t, bus_dma_segment_t *, int, int *, int));
- void (*_dmamem_free) __P((bus_dma_tag_t,
- bus_dma_segment_t *, int));
- int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, size_t, void **, int));
- void (*_dmamem_unmap) __P((bus_dma_tag_t, void *, size_t));
- paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, off_t, int, int));
+ int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
+ bus_size_t, bus_dma_segment_t *, int, int *, int);
+ void (*_dmamem_free)(bus_dma_tag_t,
+ bus_dma_segment_t *, int);
+ int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, size_t, void **, int);
+ void (*_dmamem_unmap)(bus_dma_tag_t, void *, size_t);
+ paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, off_t, int, int);
};
#define bus_dmamap_create(t, s, n, m, b, f, p) \
@@ -940,37 +940,37 @@ struct arm32_bus_dmamap {
int arm32_dma_range_intersect(struct arm32_dma_range *, int,
paddr_t pa, psize_t size, paddr_t *pap, psize_t *sizep);
-int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t,
- bus_size_t, int, bus_dmamap_t *));
-void _bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int _bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
-int _bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
-int _bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
-int _bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
-void _bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void _bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
- bus_size_t, int));
-
-int _bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size,
+int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
+ bus_size_t, int, bus_dmamap_t *);
+void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+ bus_size_t, int);
+
+int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
- bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags));
-void _bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs));
-int _bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, size_t size, void **kvap, int flags));
-void _bus_dmamem_unmap __P((bus_dma_tag_t tag, void *kva,
- size_t size));
-paddr_t _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, off_t off, int prot, int flags));
-
-int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
+ bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
+void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs);
+int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, size_t size, void **kvap, int flags);
+void _bus_dmamem_unmap(bus_dma_tag_t tag, void *kva,
+ size_t size);
+paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, off_t off, int prot, int flags);
+
+int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
- vaddr_t low, vaddr_t high));
+ vaddr_t low, vaddr_t high);
#endif /* _ARM32_BUS_DMA_PRIVATE */
#endif /* _ARM32_BUS_H_ */
diff --git a/sys/arch/arm/include/db_machdep.h b/sys/arch/arm/include/db_machdep.h
index 441e6841e62..c6b4729302d 100644
--- a/sys/arch/arm/include/db_machdep.h
+++ b/sys/arch/arm/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.15 2008/08/29 19:08:29 matt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.16 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1996 Scott K Stevens
@@ -108,9 +108,9 @@ extern db_regs_t ddb_regs; /* register state */
#define SOFTWARE_SSTEP
-u_int branch_taken __P((u_int insn, u_int pc, db_regs_t *db_regs));
-int kdb_trap __P((int, db_regs_t *));
-void db_machine_init __P((void));
+u_int branch_taken(u_int insn, u_int pc, db_regs_t *db_regs);
+int kdb_trap(int, db_regs_t *);
+void db_machine_init(void);
int db_validate_address(vm_offset_t addr);
#define DB_ELF_SYMBOLS
diff --git a/sys/arch/arm/include/disklabel.h b/sys/arch/arm/include/disklabel.h
index 518e397b560..0a2192ca85d 100644
--- a/sys/arch/arm/include/disklabel.h
+++ b/sys/arch/arm/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.7 2005/12/11 12:16:46 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.8 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -71,12 +71,12 @@ struct buf;
struct disklabel;
/* for readdisklabel. rv != 0 -> matches, msg == NULL -> success */
-int mbr_label_read __P((dev_t, void (*)(struct buf *), struct disklabel *,
- struct cpu_disklabel *, const char **, int *, int *));
+int mbr_label_read(dev_t, void (*)(struct buf *), struct disklabel *,
+ struct cpu_disklabel *, const char **, int *, int *);
/* for writedisklabel. rv == 0 -> dosen't match, rv > 0 -> success */
-int mbr_label_locate __P((dev_t, void (*)(struct buf *),
- struct disklabel *, struct cpu_disklabel *, int *, int *));
+int mbr_label_locate(dev_t, void (*)(struct buf *),
+ struct disklabel *, struct cpu_disklabel *, int *, int *);
#endif /* _KERNEL */
#endif /* _ARM_DISKLABEL_H_ */
diff --git a/sys/arch/arm/include/ofw.h b/sys/arch/arm/include/ofw.h
index dc3288593aa..c41f4ffafde 100644
--- a/sys/arch/arm/include/ofw.h
+++ b/sys/arch/arm/include/ofw.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.h,v 1.2 2006/10/26 22:49:36 bjh21 Exp $ */
+/* $NetBSD: ofw.h,v 1.3 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright 1997
@@ -48,23 +48,23 @@ typedef int (*ofw_handle_t)(void *);
/* Implemented in <ofw/ofw.c> */
-void ofw_init __P((ofw_handle_t));
-void ofw_boot __P((int, char *));
-void ofw_getbootinfo __P((char **, char **));
-void ofw_configmem __P((void));
-void ofw_configisa __P((vm_offset_t *, vm_offset_t *));
-void ofw_configisadma __P((vm_offset_t *));
-int ofw_isadmarangeintersect __P((vm_offset_t, vm_offset_t,
- vm_offset_t *, vm_offset_t *));
-vm_offset_t ofw_gettranslation __P((vm_offset_t));
-vm_offset_t ofw_map __P((vm_offset_t, vm_size_t, int));
-vm_offset_t ofw_getcleaninfo __P((void));
+void ofw_init(ofw_handle_t);
+void ofw_boot(int, char *);
+void ofw_getbootinfo(char **, char **);
+void ofw_configmem(void);
+void ofw_configisa(vm_offset_t *, vm_offset_t *);
+void ofw_configisadma(vm_offset_t *);
+int ofw_isadmarangeintersect(vm_offset_t, vm_offset_t,
+ vm_offset_t *, vm_offset_t *);
+vm_offset_t ofw_gettranslation(vm_offset_t);
+vm_offset_t ofw_map(vm_offset_t, vm_size_t, int);
+vm_offset_t ofw_getcleaninfo(void);
#ifdef OFWGENCFG
/* Implemented in <ofw/ofwgencfg_machdep.c> */
extern int ofw_handleticks;
-extern void cpu_reboot __P((int, char *));
-extern void ofrootfound __P((void));
+extern void cpu_reboot(int, char *);
+extern void ofrootfound(void);
#endif
#endif /* !_MACHINE_OFW_H_ */
diff --git a/sys/arch/arm/include/sysarch.h b/sys/arch/arm/include/sysarch.h
index 28d41f61d16..0f4b0c44196 100644
--- a/sys/arch/arm/include/sysarch.h
+++ b/sys/arch/arm/include/sysarch.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sysarch.h,v 1.6 2005/12/11 12:16:47 christos Exp $ */
+/* $NetBSD: sysarch.h,v 1.7 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1996-1997 Mark Brinicombe.
@@ -56,9 +56,9 @@ struct arm_sync_icache_args {
#ifndef _KERNEL
__BEGIN_DECLS
-int arm_sync_icache __P((u_int addr, int len));
-int arm_drain_writebuf __P((void));
-int sysarch __P((int, void *));
+int arm_sync_icache(u_int addr, int len);
+int arm_drain_writebuf(void);
+int sysarch(int, void *);
__END_DECLS
#endif
diff --git a/sys/arch/arm/include/undefined.h b/sys/arch/arm/include/undefined.h
index b0770ad9742..17a4eb32102 100644
--- a/sys/arch/arm/include/undefined.h
+++ b/sys/arch/arm/include/undefined.h
@@ -1,4 +1,4 @@
-/* $NetBSD: undefined.h,v 1.11 2008/03/15 10:16:43 rearnsha Exp $ */
+/* $NetBSD: undefined.h,v 1.12 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1995-1996 Mark Brinicombe.
@@ -50,7 +50,7 @@
#include <sys/queue.h>
-typedef int (*undef_handler_t) __P((unsigned int, unsigned int, trapframe_t *, int));
+typedef int (*undef_handler_t)(unsigned int, unsigned int, trapframe_t *, int);
/*
* Enumeration of coprocessor numbers. Values may be duplicated
@@ -77,9 +77,9 @@ enum arm_coprocs {
/* Prototypes for undefined.c */
-void *install_coproc_handler __P((int, undef_handler_t));
-void remove_coproc_handler __P((void *));
-void undefined_init __P((void));
+void *install_coproc_handler(int, undef_handler_t);
+void remove_coproc_handler(void *);
+void undefined_init(void);
/*
* XXX Stuff below here is for use before malloc() is available. Most code
@@ -95,7 +95,7 @@ struct undefined_handler {
* Handlers installed using install_coproc_handler_static shouldn't be
* removed.
*/
-void install_coproc_handler_static __P((int, struct undefined_handler *));
+void install_coproc_handler_static(int, struct undefined_handler *);
/* Calls up to undefined.c from trap handlers */
void undefinedinstruction(struct trapframe *);
diff --git a/sys/arch/arm/iomd/iomd_dma.h b/sys/arch/arm/iomd/iomd_dma.h
index 96b3ead2373..1803c1354a6 100644
--- a/sys/arch/arm/iomd/iomd_dma.h
+++ b/sys/arch/arm/iomd/iomd_dma.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iomd_dma.h,v 1.2 2002/02/18 11:41:18 bjh21 Exp $ */
+/* $NetBSD: iomd_dma.h,v 1.3 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1997 Scott Stevens
@@ -71,10 +71,10 @@ struct dma_ctrl {
#define DMA_END_LAST 0x40000000
/* Prototypes */
-struct dma_ctrl *dma_init __P((int, int, int, int));
-void dma_go __P((struct dma_ctrl *));
-int dma_reset __P((struct dma_ctrl *));
-int dma_setup __P((struct dma_ctrl *, u_char *, int, int));
-int dma_isactive __P((struct dma_ctrl *));
-int dma_isintr __P((struct dma_ctrl *));
-int dma_intr __P((void *));
+struct dma_ctrl *dma_init(int, int, int, int);
+void dma_go(struct dma_ctrl *);
+int dma_reset(struct dma_ctrl *);
+int dma_setup(struct dma_ctrl *, u_char *, int, int);
+int dma_isactive(struct dma_ctrl *);
+int dma_isintr(struct dma_ctrl *);
+int dma_intr(void *);
diff --git a/sys/arch/arm/ixp12x0/ixp12x0_com.c b/sys/arch/arm/ixp12x0/ixp12x0_com.c
index 393d741dc84..341907c14f0 100644
--- a/sys/arch/arm/ixp12x0/ixp12x0_com.c
+++ b/sys/arch/arm/ixp12x0/ixp12x0_com.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_com.c,v 1.34 2008/06/11 22:37:21 cegger Exp $ */
+/* $NetBSD: ixp12x0_com.c,v 1.35 2009/03/14 14:45:55 dsl Exp $ */
/*
* Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.34 2008/06/11 22:37:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.c,v 1.35 2009/03/14 14:45:55 dsl Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -933,7 +933,7 @@ ixpcom_rxsoft(sc, tp)
struct ixpcom_softc *sc;
struct tty *tp;
{
- int (*rint) __P((int, struct tty *)) = tp->t_linesw->l_rint;
+ int (*rint)(int, struct tty *) = tp->t_linesw->l_rint;
u_char *get, *end;
u_int cc, scc;
u_char lsr;
diff --git a/sys/arch/arm/mainbus/cpu_mainbus.c b/sys/arch/arm/mainbus/cpu_mainbus.c
index 5654865b196..e29da3cc40d 100644
--- a/sys/arch/arm/mainbus/cpu_mainbus.c
+++ b/sys/arch/arm/mainbus/cpu_mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_mainbus.c,v 1.8 2005/12/11 12:16:51 christos Exp $ */
+/* $NetBSD: cpu_mainbus.c,v 1.9 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.8 2005/12/11 12:16:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.9 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,8 +63,8 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.8 2005/12/11 12:16:51 christos Exp
/*
* Prototypes
*/
-static int cpu_mainbus_match __P((struct device *, struct cfdata *, void *));
-static void cpu_mainbus_attach __P((struct device *, struct device *, void *));
+static int cpu_mainbus_match(struct device *, struct cfdata *, void *);
+static void cpu_mainbus_attach(struct device *, struct device *, void *);
/*
* int cpumatch(struct device *parent, struct cfdata *cf, void *aux)
diff --git a/sys/arch/arm/mainbus/mainbus.c b/sys/arch/arm/mainbus/mainbus.c
index 4906874e5b9..1f5a572488a 100644
--- a/sys/arch/arm/mainbus/mainbus.c
+++ b/sys/arch/arm/mainbus/mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.14 2008/04/27 18:58:45 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.15 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.14 2008/04/27 18:58:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.15 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,11 +68,11 @@ extern struct bus_space mainbus_bs_tag;
/* Prototypes for functions provided */
-static int mainbusmatch __P((struct device *, struct cfdata *, void *));
-static void mainbusattach __P((struct device *, struct device *, void *));
-static int mainbusprint __P((void *aux, const char *mainbus));
-static int mainbussearch __P((struct device *, struct cfdata *,
- const int *, void *));
+static int mainbusmatch(struct device *, struct cfdata *, void *);
+static void mainbusattach(struct device *, struct device *, void *);
+static int mainbusprint(void *aux, const char *mainbus);
+static int mainbussearch(struct device *, struct cfdata *,
+ const int *, void *);
/* attach and device structures for the device */
diff --git a/sys/arch/arm/ofw/ofw_irqhandler.c b/sys/arch/arm/ofw/ofw_irqhandler.c
index b786604b862..cae68fe113a 100644
--- a/sys/arch/arm/ofw/ofw_irqhandler.c
+++ b/sys/arch/arm/ofw/ofw_irqhandler.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_irqhandler.c,v 1.13 2008/01/06 03:45:27 matt Exp $ */
+/* $NetBSD: ofw_irqhandler.c,v 1.14 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw_irqhandler.c,v 1.13 2008/01/06 03:45:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_irqhandler.c,v 1.14 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,8 +67,8 @@ extern char *_intrnames;
/* Prototypes */
-int podule_irqhandler __P((void));
-extern void set_spl_masks __P((void));
+int podule_irqhandler(void);
+extern void set_spl_masks(void);
/*
* void irq_init(void)
@@ -302,7 +302,7 @@ void *
intr_claim(irq, level, ih_func, ih_arg, group, name)
int irq;
int level;
- int (*ih_func) __P((void *));
+ int (*ih_func)(void *);
void *ih_arg;
const char *group;
const char *name;
diff --git a/sys/arch/arm/ofw/ofwgencfg_machdep.c b/sys/arch/arm/ofw/ofwgencfg_machdep.c
index 6433225beef..e15b0295381 100644
--- a/sys/arch/arm/ofw/ofwgencfg_machdep.c
+++ b/sys/arch/arm/ofw/ofwgencfg_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwgencfg_machdep.c,v 1.15 2008/11/30 18:21:32 martin Exp $ */
+/* $NetBSD: ofwgencfg_machdep.c,v 1.16 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.15 2008/11/30 18:21:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.16 2009/03/14 14:45:56 dsl Exp $");
#include "opt_ddb.h"
@@ -85,14 +85,14 @@ extern u_int undefined_handler_address;
/*
* Imported routines
*/
-extern void data_abort_handler __P((trapframe_t *frame));
-extern void prefetch_abort_handler __P((trapframe_t *frame));
-extern void undefinedinstruction_bounce __P((trapframe_t *frame));
-int ofbus_match __P((struct device *, struct cfdata *, void *));
-void ofbus_attach __P((struct device *, struct device *, void *));
+extern void data_abort_handler(trapframe_t *frame);
+extern void prefetch_abort_handler(trapframe_t *frame);
+extern void undefinedinstruction_bounce(trapframe_t *frame);
+int ofbus_match(struct device *, struct cfdata *, void *);
+void ofbus_attach(struct device *, struct device *, void *);
/* Local routines */
-static void process_kernel_args __P((void));
+static void process_kernel_args(void);
/*
* Exported variables
diff --git a/sys/arch/atari/dev/atari5380.c b/sys/arch/atari/dev/atari5380.c
index 5bea80d6870..3495a3d1ea3 100644
--- a/sys/arch/atari/dev/atari5380.c
+++ b/sys/arch/atari/dev/atari5380.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atari5380.c,v 1.47 2009/01/24 02:02:38 tsutsui Exp $ */
+/* $NetBSD: atari5380.c,v 1.48 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.47 2009/01/24 02:02:38 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.48 2009/03/14 14:45:56 dsl Exp $");
#include "opt_atariscsi.h"
@@ -104,12 +104,12 @@ __KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.47 2009/01/24 02:02:38 tsutsui Exp $
/* fails on older atari's */
#define ENABLE_NCR5380(sc) cur_softc = sc;
-static u_char *alloc_bounceb __P((u_long));
-static void free_bounceb __P((u_char *));
-static int machine_match __P((struct device *, void *, void *,
- struct cfdriver *));
- void scsi_ctrl __P((int));
- void scsi_dma __P((int));
+static u_char *alloc_bounceb(u_long);
+static void free_bounceb(u_char *);
+static int machine_match(struct device *, void *, void *,
+ struct cfdriver *);
+ void scsi_ctrl(int);
+ void scsi_dma(int);
/*
* Functions that do nothing on the atari
@@ -118,7 +118,7 @@ static int machine_match __P((struct device *, void *, void *,
#if defined(TT_SCSI)
-void ncr5380_drq_intr __P((int));
+void ncr5380_drq_intr(int);
/*
* Define all the things we need of the DMA-controller
@@ -224,18 +224,18 @@ static struct ncr_softc *cur_softc;
* Prototype functions defined below
*/
#ifdef NO_TTRAM_DMA
-static int tt_wrong_dma_range __P((SC_REQ *, struct dma_chain *));
+static int tt_wrong_dma_range(SC_REQ *, struct dma_chain *);
#endif
-static void scsi_tt_init __P((struct ncr_softc *));
-static u_char get_tt_5380_reg __P((u_short));
-static void set_tt_5380_reg __P((u_short, u_short));
-static void scsi_tt_dmasetup __P((SC_REQ *, u_int, u_char));
-static int tt_poll_edma __P((SC_REQ *));
-static u_char *ptov __P((SC_REQ *, u_long*));
-static int tt_get_dma_result __P((SC_REQ *, u_long *));
- void scsi_tt_ienable __P((void));
- void scsi_tt_idisable __P((void));
- void scsi_tt_clr_ipend __P((void));
+static void scsi_tt_init(struct ncr_softc *);
+static u_char get_tt_5380_reg(u_short);
+static void set_tt_5380_reg(u_short, u_short);
+static void scsi_tt_dmasetup(SC_REQ *, u_int, u_char);
+static int tt_poll_edma(SC_REQ *);
+static u_char *ptov(SC_REQ *, u_long*);
+static int tt_get_dma_result(SC_REQ *, u_long *);
+ void scsi_tt_ienable(void);
+ void scsi_tt_idisable(void);
+ void scsi_tt_clr_ipend(void);
/*
* Define these too, so we can use them locally...
@@ -676,21 +676,21 @@ extern int *nofault;
/*
* Prototype functions defined below
*/
-static void scsi_falcon_init __P((struct ncr_softc *));
-static u_char get_falcon_5380_reg __P((u_short));
-static void set_falcon_5380_reg __P((u_short, u_short));
-static int falcon_wrong_dma_range __P((SC_REQ *, struct dma_chain *));
-static void fal1_dma __P((u_int, u_int, SC_REQ *));
-static void scsi_falcon_dmasetup __P((SC_REQ *, u_int, u_char));
-static int falcon_poll_edma __P((SC_REQ *));
-static int falcon_get_dma_result __P((SC_REQ *, u_long *));
- int falcon_can_access_5380 __P((void));
- void scsi_falcon_clr_ipend __P((void));
- void scsi_falcon_idisable __P((void));
- void scsi_falcon_ienable __P((void));
- int scsi_falcon_ipending __P((void));
- int falcon_claimed_dma __P((void));
- void falcon_reconsider_dma __P((void));
+static void scsi_falcon_init(struct ncr_softc *);
+static u_char get_falcon_5380_reg(u_short);
+static void set_falcon_5380_reg(u_short, u_short);
+static int falcon_wrong_dma_range(SC_REQ *, struct dma_chain *);
+static void fal1_dma(u_int, u_int, SC_REQ *);
+static void scsi_falcon_dmasetup(SC_REQ *, u_int, u_char);
+static int falcon_poll_edma(SC_REQ *);
+static int falcon_get_dma_result(SC_REQ *, u_long *);
+ int falcon_can_access_5380(void);
+ void scsi_falcon_clr_ipend(void);
+ void scsi_falcon_idisable(void);
+ void scsi_falcon_ienable(void);
+ int scsi_falcon_ipending(void);
+ int falcon_claimed_dma(void);
+ void falcon_reconsider_dma(void);
static void
scsi_falcon_init(sc)
@@ -958,22 +958,22 @@ falcon_can_access_5380()
/*
* The prototypes first...
*/
-static void scsi_mach_init __P((struct ncr_softc *));
- void scsi_ienable __P((void));
- void scsi_idisable __P((void));
- void scsi_clr_ipend __P((void));
- int scsi_ipending __P((void));
- void scsi_dma_setup __P((SC_REQ *, u_int, u_char));
- int wrong_dma_range __P((SC_REQ *, struct dma_chain *));
- int poll_edma __P((SC_REQ *));
- int get_dma_result __P((SC_REQ *, u_long *));
- int can_access_5380 __P((void));
+static void scsi_mach_init(struct ncr_softc *);
+ void scsi_ienable(void);
+ void scsi_idisable(void);
+ void scsi_clr_ipend(void);
+ int scsi_ipending(void);
+ void scsi_dma_setup(SC_REQ *, u_int, u_char);
+ int wrong_dma_range(SC_REQ *, struct dma_chain *);
+ int poll_edma(SC_REQ *);
+ int get_dma_result(SC_REQ *, u_long *);
+ int can_access_5380(void);
/*
* Register access will be done through the following 2 function pointers.
*/
-static u_char (*get_5380_reg) __P((u_short));
-static void (*set_5380_reg) __P((u_short, u_short));
+static u_char (*get_5380_reg)(u_short);
+static void (*set_5380_reg)(u_short, u_short);
#define GET_5380_REG (*get_5380_reg)
#define SET_5380_REG (*set_5380_reg)
diff --git a/sys/arch/atari/dev/clock.c b/sys/arch/atari/dev/clock.c
index b00d03cac7a..578392982c3 100644
--- a/sys/arch/atari/dev/clock.c
+++ b/sys/arch/atari/dev/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.42 2008/11/04 16:43:47 abs Exp $ */
+/* $NetBSD: clock.c,v 1.43 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.42 2008/11/04 16:43:47 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.43 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -149,8 +149,8 @@ dev_type_close(rtcclose);
dev_type_read(rtcread);
dev_type_write(rtcwrite);
-static void clockattach __P((struct device *, struct device *, void *));
-static int clockmatch __P((struct device *, struct cfdata *, void *));
+static void clockattach(struct device *, struct device *, void *);
+static int clockmatch(struct device *, struct cfdata *, void *);
CFATTACH_DECL(clock, sizeof(struct clock_softc),
clockmatch, clockattach, NULL, NULL);
@@ -162,9 +162,9 @@ const struct cdevsw rtc_cdevsw = {
nostop, notty, nopoll, nommap, nokqfilter,
};
-void statintr __P((struct clockframe));
+void statintr(struct clockframe);
-static int twodigits __P((char *, int));
+static int twodigits(char *, int);
static int divisor; /* Systemclock divisor */
diff --git a/sys/arch/atari/dev/dma.c b/sys/arch/atari/dev/dma.c
index 0a94ca84d84..10345b5aa48 100644
--- a/sys/arch/atari/dev/dma.c
+++ b/sys/arch/atari/dev/dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $ */
+/* $NetBSD: dma.c,v 1.19 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.19 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,9 +88,9 @@ static TAILQ_HEAD(acthead, dma_entry) dma_active;
static int must_init = 1; /* Must initialize */
-int cdmaint __P((void *, int));
+int cdmaint(void *, int);
-static void st_dma_init __P((void));
+static void st_dma_init(void);
static void
st_dma_init()
diff --git a/sys/arch/atari/dev/event_var.h b/sys/arch/atari/dev/event_var.h
index d4eaa16fad1..3afedfeacb0 100644
--- a/sys/arch/atari/dev/event_var.h
+++ b/sys/arch/atari/dev/event_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: event_var.h,v 1.7 2008/03/01 14:16:49 rmind Exp $ */
+/* $NetBSD: event_var.h,v 1.8 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -73,11 +73,11 @@ struct evvar {
psignal((ev)->ev_io, SIGIO); \
}
-void ev_init __P((struct evvar *));
-void ev_fini __P((struct evvar *));
-int ev_read __P((struct evvar *, struct uio *, int));
-int ev_poll __P((struct evvar *, int, struct lwp *));
-int ev_kqfilter __P((struct evvar *, struct knote *));
+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 lwp *);
+int ev_kqfilter(struct evvar *, struct knote *);
/*
* PEVENT is set just above PSOCK, which is just above TTIPRI, on the
diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c
index 32f375418d3..51faecc57f6 100644
--- a/sys/arch/atari/dev/fd.c
+++ b/sys/arch/atari/dev/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.63 2009/01/13 13:35:51 yamt Exp $ */
+/* $NetBSD: fd.c,v 1.64 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.63 2009/01/13 13:35:51 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.64 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -194,7 +194,7 @@ static short def_type = 0; /* Reflects config-switches */
#define FLP_DEFTYPE 1 /* 720Kb, reasonable default */
#define FLP_TYPE(dev) ( DISKPART(dev) == 0 ? def_type : DISKPART(dev) - 1 )
-typedef void (*FPV) __P((void *));
+typedef void (*FPV)(void *);
dev_type_open(fdopen);
dev_type_close(fdclose);
@@ -206,24 +206,24 @@ dev_type_strategy(fdstrategy);
/*
* Private drive functions....
*/
-static void fdstart __P((struct fd_softc *));
-static void fddone __P((struct fd_softc *));
-static void fdstatus __P((struct fd_softc *));
-static void fd_xfer __P((struct fd_softc *));
-static void fdcint __P((struct fd_softc *));
-static int fd_xfer_ok __P((struct fd_softc *));
-static void fdmotoroff __P((struct fd_softc *));
-static void fdminphys __P((struct buf *));
-static void fdtestdrv __P((struct fd_softc *));
-static void fdgetdefaultlabel __P((struct fd_softc *, struct disklabel *,
- int));
-static int fdgetdisklabel __P((struct fd_softc *, dev_t));
-static int fdselect __P((int, int, int));
-static void fddeselect __P((void));
-static void fdmoff __P((struct fd_softc *));
- u_char read_fdreg __P((u_short));
- void write_fdreg __P((u_short, u_short));
- u_char read_dmastat __P((void));
+static void fdstart(struct fd_softc *);
+static void fddone(struct fd_softc *);
+static void fdstatus(struct fd_softc *);
+static void fd_xfer(struct fd_softc *);
+static void fdcint(struct fd_softc *);
+static int fd_xfer_ok(struct fd_softc *);
+static void fdmotoroff(struct fd_softc *);
+static void fdminphys(struct buf *);
+static void fdtestdrv(struct fd_softc *);
+static void fdgetdefaultlabel(struct fd_softc *, struct disklabel *,
+ int);
+static int fdgetdisklabel(struct fd_softc *, dev_t);
+static int fdselect(int, int, int);
+static void fddeselect(void);
+static void fdmoff(struct fd_softc *);
+ u_char read_fdreg(u_short);
+ void write_fdreg(u_short, u_short);
+ u_char read_dmastat(void);
extern inline u_char read_fdreg(u_short regno)
{
@@ -250,7 +250,7 @@ extern inline u_char read_dmastat(void)
* Note: This location _must_ be read as an u_short. Failure to do so
* will return garbage!
*/
-static u_short rd_cfg_switch __P((void));
+static u_short rd_cfg_switch(void);
static u_short rd_cfg_switch(void)
{
return(*((u_short*)AD_CFG_SWITCH));
@@ -267,9 +267,9 @@ static u_short rd_cfg_switch(void)
*/
extern struct cfdriver fd_cd;
-static int fdcmatch __P((struct device *, struct cfdata *, void *));
-static int fdcprint __P((void *, const char *));
-static void fdcattach __P((struct device *, struct device *, void *));
+static int fdcmatch(struct device *, struct cfdata *, void *);
+static int fdcprint(void *, const char *);
+static void fdcattach(struct device *, struct device *, void *);
CFATTACH_DECL(fdc, sizeof(struct device),
fdcmatch, fdcattach, NULL, NULL);
@@ -359,8 +359,8 @@ const char *pnp;
return(UNCONF);
}
-static int fdmatch __P((struct device *, struct cfdata *, void *));
-static void fdattach __P((struct device *, struct device *, void *));
+static int fdmatch(struct device *, struct cfdata *, void *);
+static void fdattach(struct device *, struct device *, void *);
struct dkdriver fddkdriver = { fdstrategy };
diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c
index 20bc515c27f..6cc14491bf9 100644
--- a/sys/arch/atari/dev/grf.c
+++ b/sys/arch/atari/dev/grf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grf.c,v 1.36 2007/03/04 05:59:40 christos Exp $ */
+/* $NetBSD: grf.c,v 1.37 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.36 2007/03/04 05:59:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.37 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -123,13 +123,13 @@ __KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.36 2007/03/04 05:59:40 christos Exp $");
#define ite_reinit(d)
#endif
-int grfon __P((dev_t));
-int grfoff __P((dev_t));
-int grfsinfo __P((dev_t, struct grfdyninfo *));
+int grfon(dev_t);
+int grfoff(dev_t);
+int grfsinfo(dev_t, struct grfdyninfo *);
-int grfbusprint __P((void *auxp, const char *));
-int grfbusmatch __P((struct device *, struct cfdata *, void *));
-void grfbusattach __P((struct device *, struct device *, void *));
+int grfbusprint(void *auxp, const char *);
+int grfbusmatch(struct device *, struct cfdata *, void *);
+void grfbusattach(struct device *, struct device *, void *);
/*
* pointers to grf drivers device structs
diff --git a/sys/arch/atari/dev/grfabs.c b/sys/arch/atari/dev/grfabs.c
index b2cafa78bdc..091ed254aa3 100644
--- a/sys/arch/atari/dev/grfabs.c
+++ b/sys/arch/atari/dev/grfabs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs.c,v 1.13 2005/12/11 12:16:54 christos Exp $ */
+/* $NetBSD: grfabs.c,v 1.14 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs.c,v 1.13 2005/12/11 12:16:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs.c,v 1.14 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: grfabs.c,v 1.13 2005/12/11 12:16:54 christos Exp $")
/*
* Function decls
*/
-static dmode_t *get_best_display_mode __P((dimen_t *, int, dmode_t *));
+static dmode_t *get_best_display_mode(dimen_t *, int, dmode_t *);
/*
* List of available graphic modes
diff --git a/sys/arch/atari/dev/grfabs_et.c b/sys/arch/atari/dev/grfabs_et.c
index aaf0d80d4f7..a9056a20e57 100644
--- a/sys/arch/atari/dev/grfabs_et.c
+++ b/sys/arch/atari/dev/grfabs_et.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_et.c,v 1.27 2007/03/06 14:40:25 tsutsui Exp $ */
+/* $NetBSD: grfabs_et.c,v 1.28 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.27 2007/03/06 14:40:25 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.28 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -92,15 +92,15 @@ __KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.27 2007/03/06 14:40:25 tsutsui Exp $
/*
* Function decls
*/
-static void init_view __P((view_t *, bmap_t *, dmode_t *, box_t *));
-static colormap_t *alloc_colormap __P((dmode_t *));
-static void et_display_view __P((view_t *));
-static view_t *et_alloc_view __P((dmode_t *, dimen_t *, u_char));
-static void et_free_view __P((view_t *));
-static void et_loadmode __P((struct grfvideo_mode *, et_sv_reg_t *));
-static void et_remove_view __P((view_t *));
-static void et_save_view __P((view_t *));
-static int et_use_colormap __P((view_t *, colormap_t *));
+static void init_view(view_t *, bmap_t *, dmode_t *, box_t *);
+static colormap_t *alloc_colormap(dmode_t *);
+static void et_display_view(view_t *);
+static view_t *et_alloc_view(dmode_t *, dimen_t *, u_char);
+static void et_free_view(view_t *);
+static void et_loadmode(struct grfvideo_mode *, et_sv_reg_t *);
+static void et_remove_view(view_t *);
+static void et_save_view(view_t *);
+static int et_use_colormap(view_t *, colormap_t *);
/*
* Our function switch table
diff --git a/sys/arch/atari/dev/grfabs_et.h b/sys/arch/atari/dev/grfabs_et.h
index c6976d6fbac..2dc5eeb9491 100644
--- a/sys/arch/atari/dev/grfabs_et.h
+++ b/sys/arch/atari/dev/grfabs_et.h
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_et.h,v 1.1 1996/10/11 21:02:48 leo Exp $ */
+/* $NetBSD: grfabs_et.h,v 1.2 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -57,7 +57,7 @@ typedef struct {
/* actually longer... */
} save_area_t;
-void et_hwrest __P((et_sv_reg_t *));
-void et_hwsave __P((et_sv_reg_t *));
-int et_probe_card __P((void));
-void et_probe_video __P((MODES *));
+void et_hwrest(et_sv_reg_t *);
+void et_hwsave(et_sv_reg_t *);
+int et_probe_card(void);
+void et_probe_video(MODES *);
diff --git a/sys/arch/atari/dev/grfabs_fal.c b/sys/arch/atari/dev/grfabs_fal.c
index eb606234532..30e46d5ba62 100644
--- a/sys/arch/atari/dev/grfabs_fal.c
+++ b/sys/arch/atari/dev/grfabs_fal.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_fal.c,v 1.18 2005/12/11 12:16:54 christos Exp $ */
+/* $NetBSD: grfabs_fal.c,v 1.19 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Thomas Gerner.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.18 2005/12/11 12:16:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.19 2009/03/14 14:45:56 dsl Exp $");
#ifdef FALCON_VIDEO
/*
@@ -57,18 +57,18 @@ __KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.18 2005/12/11 12:16:54 christos Exp
/*
* Function decls
*/
-static void init_view __P((view_t *, bmap_t *, dmode_t *, box_t *));
-static bmap_t *alloc_bitmap __P((u_long, u_long, u_char));
-static colormap_t *alloc_colormap __P((dmode_t *));
-static void free_bitmap __P((bmap_t *));
-static void falcon_display_view __P((view_t *));
-static view_t *falcon_alloc_view __P((dmode_t *, dimen_t *, u_char));
-static void falcon_free_view __P((view_t *));
-static void falcon_remove_view __P((view_t *));
-static void falcon_save_view __P((view_t *));
-static int falcon_use_colormap __P((view_t *, colormap_t *));
-static void falcon_detect __P((dmode_t *));
-static struct videl *falcon_getreg __P((u_short));
+static void init_view(view_t *, bmap_t *, dmode_t *, box_t *);
+static bmap_t *alloc_bitmap(u_long, u_long, u_char);
+static colormap_t *alloc_colormap(dmode_t *);
+static void free_bitmap(bmap_t *);
+static void falcon_display_view(view_t *);
+static view_t *falcon_alloc_view(dmode_t *, dimen_t *, u_char);
+static void falcon_free_view(view_t *);
+static void falcon_remove_view(view_t *);
+static void falcon_save_view(view_t *);
+static int falcon_use_colormap(view_t *, colormap_t *);
+static void falcon_detect(dmode_t *);
+static struct videl *falcon_getreg(u_short);
/*
* Our function switch table
@@ -307,7 +307,7 @@ dmode_t *dm;
}
u_long falcon_needs_vbl;
-void falcon_display_switch __P((void));
+void falcon_display_switch(void);
static void
falcon_display_view(v)
diff --git a/sys/arch/atari/dev/grfabs_fal.h b/sys/arch/atari/dev/grfabs_fal.h
index abef3363cdb..ce73d5d8151 100644
--- a/sys/arch/atari/dev/grfabs_fal.h
+++ b/sys/arch/atari/dev/grfabs_fal.h
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_fal.h,v 1.3 1996/09/16 06:43:34 leo Exp $ */
+/* $NetBSD: grfabs_fal.h,v 1.4 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Thomas Gerner.
@@ -79,5 +79,5 @@ struct videl {
((((0x00000070 & (v)) * 0xff / 0x7) << 4) & 0x0000ff00) |\
(0x00000007 & (v)) * 0xff / 0x7)
-void falcon_probe_video __P((MODES *));
+void falcon_probe_video(MODES *);
#endif /* _GRFABS_FAL_H */
diff --git a/sys/arch/atari/dev/grfabs_reg.h b/sys/arch/atari/dev/grfabs_reg.h
index e37428de773..38658dd6fb3 100644
--- a/sys/arch/atari/dev/grfabs_reg.h
+++ b/sys/arch/atari/dev/grfabs_reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_reg.h,v 1.13 2005/12/11 12:16:54 christos Exp $ */
+/* $NetBSD: grfabs_reg.h,v 1.14 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -142,12 +142,12 @@ enum colormap_type {
#define MAKE_GREY_ENTRY(l) (l & 0xff)
struct grfabs_sw {
- void (*display_view) __P((view_t*));
- view_t * (*alloc_view) __P((dmode_t *, dimen_t *, u_char));
- void (*free_view) __P((view_t *));
- void (*remove_view) __P((view_t *));
- void (*save_view) __P((view_t *));
- int (*use_colormap) __P((view_t *, colormap_t *));
+ void (*display_view)(view_t*);
+ view_t * (*alloc_view)(dmode_t *, dimen_t *, u_char);
+ void (*free_view)(view_t *);
+ void (*remove_view)(view_t *);
+ void (*save_view)(view_t *);
+ int (*use_colormap)(view_t *, colormap_t *);
};
/* display mode */
@@ -181,7 +181,7 @@ typedef LIST_HEAD(modelist, display_mode) MODES;
/*
* Prototype for the probe function
*/
-typedef void (*grf_probe_t) __P((MODES *));
+typedef void (*grf_probe_t)(MODES *);
/*
* Common variables
@@ -194,14 +194,14 @@ extern u_long gra_def_color16[16];
/*
* Prototypes:
*/
-int grfabs_probe __P((grf_probe_t));
-view_t *grf_alloc_view __P((dmode_t *d, dimen_t *dim, u_char depth));
-dmode_t *grf_get_best_mode __P((dimen_t *dim, u_char depth));
-void grf_display_view __P((view_t *v));
-void grf_remove_view __P((view_t *v));
-void grf_free_view __P((view_t *v));
-int grf_get_colormap __P((view_t *, colormap_t *));
-int grf_use_colormap __P((view_t *, colormap_t *));
-void grf_save_view __P((view_t *v));
+int grfabs_probe(grf_probe_t);
+view_t *grf_alloc_view(dmode_t *d, dimen_t *dim, u_char depth);
+dmode_t *grf_get_best_mode(dimen_t *dim, u_char depth);
+void grf_display_view(view_t *v);
+void grf_remove_view(view_t *v);
+void grf_free_view(view_t *v);
+int grf_get_colormap(view_t *, colormap_t *);
+int grf_use_colormap(view_t *, colormap_t *);
+void grf_save_view(view_t *v);
#endif /* _GRFABS_REG_H */
diff --git a/sys/arch/atari/dev/grfabs_tt.c b/sys/arch/atari/dev/grfabs_tt.c
index 04b2e50a60d..d326750be6e 100644
--- a/sys/arch/atari/dev/grfabs_tt.c
+++ b/sys/arch/atari/dev/grfabs_tt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_tt.c,v 1.15 2005/12/11 12:16:54 christos Exp $ */
+/* $NetBSD: grfabs_tt.c,v 1.16 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: grfabs_tt.c,v 1.15 2005/12/11 12:16:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: grfabs_tt.c,v 1.16 2009/03/14 14:45:56 dsl Exp $");
#ifdef TT_VIDEO
/*
@@ -56,16 +56,16 @@ __KERNEL_RCSID(0, "$NetBSD: grfabs_tt.c,v 1.15 2005/12/11 12:16:54 christos Exp
/*
* Function decls
*/
-static void init_view __P((view_t *, bmap_t *, dmode_t *, box_t *));
-static bmap_t *alloc_bitmap __P((u_long, u_long, u_char));
-static colormap_t *alloc_colormap __P((dmode_t *));
-static void free_bitmap __P((bmap_t *));
-static void tt_display_view __P((view_t *));
-static view_t *tt_alloc_view __P((dmode_t *, dimen_t *, u_char));
-static void tt_free_view __P((view_t *));
-static void tt_remove_view __P((view_t *));
-static void tt_save_view __P((view_t *));
-static int tt_use_colormap __P((view_t *, colormap_t *));
+static void init_view(view_t *, bmap_t *, dmode_t *, box_t *);
+static bmap_t *alloc_bitmap(u_long, u_long, u_char);
+static colormap_t *alloc_colormap(dmode_t *);
+static void free_bitmap(bmap_t *);
+static void tt_display_view(view_t *);
+static view_t *tt_alloc_view(dmode_t *, dimen_t *, u_char);
+static void tt_free_view(view_t *);
+static void tt_remove_view(view_t *);
+static void tt_save_view(view_t *);
+static int tt_use_colormap(view_t *, colormap_t *);
/*
* Our function switch table
diff --git a/sys/arch/atari/dev/grfabs_tt.h b/sys/arch/atari/dev/grfabs_tt.h
index 5e9f4564a8b..f935c524313 100644
--- a/sys/arch/atari/dev/grfabs_tt.h
+++ b/sys/arch/atari/dev/grfabs_tt.h
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_tt.h,v 1.1 1996/09/16 06:50:34 leo Exp $ */
+/* $NetBSD: grfabs_tt.h,v 1.2 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -44,5 +44,5 @@
(((0x000000f0 & (v)) * 0xff / 0xf) << 4) |\
(0x0000000f & (v)) * 0xff / 0xf)
-void tt_probe_video __P((MODES *));
+void tt_probe_video(MODES *);
#endif /* _GRFABS_TT_H */
diff --git a/sys/arch/atari/dev/grfvar.h b/sys/arch/atari/dev/grfvar.h
index b3e03540698..d9220355925 100644
--- a/sys/arch/atari/dev/grfvar.h
+++ b/sys/arch/atari/dev/grfvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: grfvar.h,v 1.10 2007/03/04 05:59:40 christos Exp $ */
+/* $NetBSD: grfvar.h,v 1.11 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -101,18 +101,18 @@ struct grf_softc {
dev_t g_grfdev; /* grf device number */
dev_t g_viewdev; /* view device number */
void * g_data; /* device dependent data */
- int (*g_mode) __P((struct grf_softc *, int, void *,
- int, int));
+ int (*g_mode)(struct grf_softc *, int, void *,
+ int, int);
int g_conpri; /* priority of ite as console */
- void (*g_iteinit) __P((struct ite_softc *));
- void (*g_itedeinit) __P((struct ite_softc *));
- void (*g_iteclear) __P((struct ite_softc *, int, int,
- int, int));
- void (*g_iteputc) __P((struct ite_softc *, int, int,
- int, int));
- void (*g_itecursor) __P((struct ite_softc *, int));
- void (*g_itescroll) __P((struct ite_softc *, int, int,
- int, int));
+ void (*g_iteinit)(struct ite_softc *);
+ void (*g_itedeinit)(struct ite_softc *);
+ void (*g_iteclear)(struct ite_softc *, int, int,
+ int, int);
+ void (*g_iteputc)(struct ite_softc *, int, int,
+ int, int);
+ void (*g_itecursor)(struct ite_softc *, int);
+ void (*g_itescroll)(struct ite_softc *, int, int,
+ int, int);
};
/* flags */
@@ -145,8 +145,8 @@ struct grf_softc {
#ifdef _KERNEL
-int grf_mode __P((struct grf_softc *, int, void *, int, int));
-void grf_viewsync __P((struct grf_softc *));
+int grf_mode(struct grf_softc *, int, void *, int, int);
+void grf_viewsync(struct grf_softc *);
extern struct grf_softc *grfsp[]; /* XXX */
#endif /* _KERNEL */
diff --git a/sys/arch/atari/dev/hdfd.c b/sys/arch/atari/dev/hdfd.c
index fddb5596147..cdf2f873b20 100644
--- a/sys/arch/atari/dev/hdfd.c
+++ b/sys/arch/atari/dev/hdfd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.65 2009/01/13 13:35:51 yamt Exp $ */
+/* $NetBSD: hdfd.c,v 1.66 2009/03/14 14:45:56 dsl Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.65 2009/01/13 13:35:51 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.66 2009/03/14 14:45:56 dsl Exp $");
#include "opt_ddb.h"
@@ -151,7 +151,7 @@ void fddma_intr(void);
void * fddmaaddr = NULL;
int fddmalen = 0;
-extern void mfp_hdfd_nf __P((void)), mfp_hdfd_fifo __P((void));
+extern void mfp_hdfd_nf(void)), mfp_hdfd_fifo(void);
/*
* Argument to fdcintr.....
@@ -201,9 +201,9 @@ struct fdc_softc {
};
/* controller driver configuration */
-int fdcprobe __P((struct device *, struct cfdata *, void *));
-int fdprint __P((void *, const char *));
-void fdcattach __P((struct device *, struct device *, void *));
+int fdcprobe(struct device *, struct cfdata *, void *);
+int fdprint(void *, const char *);
+void fdcattach(struct device *, struct device *, void *);
CFATTACH_DECL(fdc, sizeof(struct fdc_softc),
fdcprobe, fdcattach, NULL, NULL);
@@ -278,8 +278,8 @@ struct fd_softc {
};
/* floppy driver configuration */
-int fdprobe __P((struct device *, struct cfdata *, void *));
-void fdattach __P((struct device *, struct device *, void *));
+int fdprobe(struct device *, struct cfdata *, void *);
+void fdattach(struct device *, struct device *, void *);
CFATTACH_DECL(hdfd, sizeof(struct fd_softc),
fdprobe, fdattach, NULL, NULL);
@@ -295,30 +295,30 @@ const struct cdevsw fd_cdevsw = {
nostop, notty, nopoll, nommap, nokqfilter, D_DISK
};
-void fdstart __P((struct fd_softc *));
+void fdstart(struct fd_softc *);
struct dkdriver fddkdriver = { fdstrategy };
-void fd_set_motor __P((struct fdc_softc *fdc, int reset));
-void fd_motor_off __P((void *arg));
-void fd_motor_on __P((void *arg));
-int fdcresult __P((struct fdc_softc *fdc));
-int out_fdc __P((u_char x));
-void fdc_ctrl_intr __P((struct clockframe));
-void fdcstart __P((struct fdc_softc *fdc));
-void fdcstatus __P((struct device *dv, int n, const char *s));
-void fdctimeout __P((void *arg));
-void fdcpseudointr __P((void *arg));
-int fdcintr __P((void *));
-void fdcretry __P((struct fdc_softc *fdc));
-void fdfinish __P((struct fd_softc *fd, struct buf *bp));
-int fdformat __P((dev_t, struct ne7_fd_formb *, struct proc *));
-
-static void fdgetdisklabel __P((struct fd_softc *, dev_t));
-static void fdgetdefaultlabel __P((struct fd_softc *, struct disklabel *,
- int));
-
-inline struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t));
+void fd_set_motor(struct fdc_softc *fdc, int reset);
+void fd_motor_off(void *arg);
+void fd_motor_on(void *arg);
+int fdcresult(struct fdc_softc *fdc);
+int out_fdc(u_char x);
+void fdc_ctrl_intr(struct clockframe);
+void fdcstart(struct fdc_softc *fdc);
+void fdcstatus(struct device *dv, int n, const char *s);
+void fdctimeout(void *arg);
+void fdcpseudointr(void *arg);
+int fdcintr(void *);
+void fdcretry(struct fdc_softc *fdc);
+void fdfinish(struct fd_softc *fd, struct buf *bp);
+int fdformat(dev_t, struct ne7_fd_formb *, struct proc *);
+
+static void fdgetdisklabel(struct fd_softc *, dev_t);
+static void fdgetdefaultlabel(struct fd_softc *, struct disklabel *,
+ int);
+
+inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
int
fdcprobe(parent, cfp, aux)
@@ -337,7 +337,7 @@ fdcprobe(parent, cfp, aux)
if (!atari_realconfig)
return 0;
- if ((mb_tag = mb_alloc_bus_space_tag()) == NULL)
+ if ((mb_tag = mb_alloc_bus_space_tag() == NULL)
return 0;
if (bus_space_map(mb_tag, FD_IOBASE, FD_IOSIZE, 0, &handle)) {
diff --git a/sys/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c
index 28b05298e02..c9471762906 100644
--- a/sys/arch/atari/dev/ite.c
+++ b/sys/arch/atari/dev/ite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.59 2008/06/11 14:35:53 tsutsui Exp $ */
+/* $NetBSD: ite.c,v 1.60 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.59 2008/06/11 14:35:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.60 2009/03/14 14:45:56 dsl Exp $");
#include "opt_ddb.h"
@@ -142,38 +142,38 @@ u_char cons_tabs[MAX_TABS];
struct ite_softc *kbd_ite;
int kbd_init;
-static inline int atoi __P((const char *));
-static inline int ite_argnum __P((struct ite_softc *));
-static inline int ite_zargnum __P((struct ite_softc *));
-static inline void ite_cr __P((struct ite_softc *));
-static inline void ite_crlf __P((struct ite_softc *));
-static inline void ite_clrline __P((struct ite_softc *));
-static inline void ite_clrscreen __P((struct ite_softc *));
-static inline void ite_clrtobos __P((struct ite_softc *));
-static inline void ite_clrtobol __P((struct ite_softc *));
-static inline void ite_clrtoeol __P((struct ite_softc *));
-static inline void ite_clrtoeos __P((struct ite_softc *));
-static inline void ite_dnchar __P((struct ite_softc *, int));
-static inline void ite_inchar __P((struct ite_softc *, int));
-static inline void ite_inline __P((struct ite_softc *, int));
-static inline void ite_lf __P((struct ite_softc *));
-static inline void ite_dnline __P((struct ite_softc *, int));
-static inline void ite_rlf __P((struct ite_softc *));
-static inline void ite_sendstr __P((const char *));
-static inline void snap_cury __P((struct ite_softc *));
-
-static void alignment_display __P((struct ite_softc *));
-static struct ite_softc *getitesp __P((dev_t));
-static void itecheckwrap __P((struct ite_softc *));
-static void iteprecheckwrap __P((struct ite_softc *));
-static void itestart __P((struct tty *));
-static void ite_switch __P((int));
-static void repeat_handler __P((void *));
-
-void iteputchar __P((int c, struct ite_softc *ip));
-void ite_putstr __P((const u_char * s, int len, dev_t dev));
-void iteattach __P((struct device *, struct device *, void *));
-int itematch __P((struct device *, struct cfdata *, void *));
+static inline int atoi(const char *);
+static inline int ite_argnum(struct ite_softc *);
+static inline int ite_zargnum(struct ite_softc *);
+static inline void ite_cr(struct ite_softc *);
+static inline void ite_crlf(struct ite_softc *);
+static inline void ite_clrline(struct ite_softc *);
+static inline void ite_clrscreen(struct ite_softc *);
+static inline void ite_clrtobos(struct ite_softc *);
+static inline void ite_clrtobol(struct ite_softc *);
+static inline void ite_clrtoeol(struct ite_softc *);
+static inline void ite_clrtoeos(struct ite_softc *);
+static inline void ite_dnchar(struct ite_softc *, int);
+static inline void ite_inchar(struct ite_softc *, int);
+static inline void ite_inline(struct ite_softc *, int);
+static inline void ite_lf(struct ite_softc *);
+static inline void ite_dnline(struct ite_softc *, int);
+static inline void ite_rlf(struct ite_softc *);
+static inline void ite_sendstr(const char *);
+static inline void snap_cury(struct ite_softc *);
+
+static void alignment_display(struct ite_softc *);
+static struct ite_softc *getitesp(dev_t);
+static void itecheckwrap(struct ite_softc *);
+static void iteprecheckwrap(struct ite_softc *);
+static void itestart(struct tty *);
+static void ite_switch(int);
+static void repeat_handler(void *);
+
+void iteputchar(int c, struct ite_softc *ip);
+void ite_putstr(const u_char * s, int len, dev_t dev);
+void iteattach(struct device *, struct device *, void *);
+int itematch(struct device *, struct cfdata *, void *);
/*
* Console specific types.
diff --git a/sys/arch/atari/dev/ite_cc.c b/sys/arch/atari/dev/ite_cc.c
index c4390d6de36..e254f8dc696 100644
--- a/sys/arch/atari/dev/ite_cc.c
+++ b/sys/arch/atari/dev/ite_cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_cc.c,v 1.27 2007/03/04 05:59:40 christos Exp $ */
+/* $NetBSD: ite_cc.c,v 1.28 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.27 2007/03/04 05:59:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.28 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -90,24 +90,24 @@ static ipriv_t con_ipriv;
extern font_info font_info_8x8;
extern font_info font_info_8x16;
-static void view_init __P((struct ite_softc *));
-static void view_deinit __P((struct ite_softc *));
-static int itecc_ioctl __P((struct ite_softc *, u_long, void *, int,
- struct lwp *));
-static int ite_newsize __P((struct ite_softc *, struct itewinsize *));
-static void cursor32 __P((struct ite_softc *, int));
-static void putc8 __P((struct ite_softc *, int, int, int, int));
-static void clear8 __P((struct ite_softc *, int, int, int, int));
-static void scroll8 __P((struct ite_softc *, int, int, int, int));
-static void scrollbmap __P((bmap_t *, u_short, u_short, u_short, u_short,
- short, short));
+static void view_init(struct ite_softc *);
+static void view_deinit(struct ite_softc *);
+static int itecc_ioctl(struct ite_softc *, u_long, void *, int,
+ struct lwp *);
+static int ite_newsize(struct ite_softc *, struct itewinsize *);
+static void cursor32(struct ite_softc *, int);
+static void putc8(struct ite_softc *, int, int, int, int);
+static void clear8(struct ite_softc *, int, int, int, int);
+static void scroll8(struct ite_softc *, int, int, int, int);
+static void scrollbmap(bmap_t *, u_short, u_short, u_short, u_short,
+ short, short);
/*
* grfcc config stuff
*/
-void grfccattach __P((struct device *, struct device *, void *));
-int grfccmatch __P((struct device *, struct cfdata *, void *));
-int grfccprint __P((void *, const char *));
+void grfccattach(struct device *, struct device *, void *);
+int grfccmatch(struct device *, struct cfdata *, void *);
+int grfccprint(void *, const char *);
CFATTACH_DECL(grfcc, sizeof(struct grf_softc),
grfccmatch, grfccattach, NULL, NULL);
@@ -121,10 +121,10 @@ static struct cfdata *cfdata_grf = NULL;
* Probe functions we can use:
*/
#ifdef TT_VIDEO
-void tt_probe_video __P((MODES *));
+void tt_probe_video(MODES *);
#endif /* TT_VIDEO */
#ifdef FALCON_VIDEO
-void falcon_probe_video __P((MODES *));
+void falcon_probe_video(MODES *);
#endif /* FALCON_VIDEO */
int
diff --git a/sys/arch/atari/dev/ite_et.c b/sys/arch/atari/dev/ite_et.c
index 1fd39ca6709..8fabd644e61 100644
--- a/sys/arch/atari/dev/ite_et.c
+++ b/sys/arch/atari/dev/ite_et.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_et.c,v 1.20 2007/03/04 05:59:40 christos Exp $ */
+/* $NetBSD: ite_et.c,v 1.21 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.20 2007/03/04 05:59:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.21 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,25 +79,25 @@ static u_char etconscolors[3][3] = { /* background, foreground, hilite */
extern font_info font_info_8x8;
extern font_info font_info_8x16;
-static void grfet_iteinit __P((struct grf_softc *));
-static void view_init __P((struct ite_softc *));
-static void view_deinit __P((struct ite_softc *));
-static int iteet_ioctl __P((struct ite_softc *, u_long, void *, int,
- struct lwp *));
-static int ite_newsize __P((struct ite_softc *, struct itewinsize *));
-static void et_inittextmode __P((struct ite_softc *, et_sv_reg_t *, int));
-void et_cursor __P((struct ite_softc *ip, int flag));
-void et_clear __P((struct ite_softc *ip, int sy, int sx, int h, int w));
-void et_putc __P((struct ite_softc *ip, int c, int dy, int dx, int mode));
-void et_scroll __P((struct ite_softc *ip, int sy, int sx, int count,
- int dir));
+static void grfet_iteinit(struct grf_softc *);
+static void view_init(struct ite_softc *);
+static void view_deinit(struct ite_softc *);
+static int iteet_ioctl(struct ite_softc *, u_long, void *, int,
+ struct lwp *);
+static int ite_newsize(struct ite_softc *, struct itewinsize *);
+static void et_inittextmode(struct ite_softc *, et_sv_reg_t *, int);
+void et_cursor(struct ite_softc *ip, int flag);
+void et_clear(struct ite_softc *ip, int sy, int sx, int h, int w);
+void et_putc(struct ite_softc *ip, int c, int dy, int dx, int mode);
+void et_scroll(struct ite_softc *ip, int sy, int sx, int count,
+ int dir);
/*
* grfet config stuff
*/
-void grfetattach __P((struct device *, struct device *, void *));
-int grfetmatch __P((struct device *, struct cfdata *, void *));
-int grfetprint __P((void *, const char *));
+void grfetattach(struct device *, struct device *, void *);
+int grfetmatch(struct device *, struct cfdata *, void *);
+int grfetprint(void *, const char *);
CFATTACH_DECL(grfet, sizeof(struct grf_softc),
grfetmatch, grfetattach, NULL, NULL);
diff --git a/sys/arch/atari/dev/itevar.h b/sys/arch/atari/dev/itevar.h
index b8f093f5a0f..c1602f3a6cc 100644
--- a/sys/arch/atari/dev/itevar.h
+++ b/sys/arch/atari/dev/itevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: itevar.h,v 1.12 2007/03/04 05:59:40 christos Exp $ */
+/* $NetBSD: itevar.h,v 1.13 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman (Atari modifications)
@@ -93,8 +93,8 @@ struct ite_softc {
int save_curx;
int cury;
int save_cury;
- int (*itexx_ioctl) __P((struct ite_softc *, u_long,
- void *, int, struct lwp *));
+ int (*itexx_ioctl)(struct ite_softc *, u_long,
+ void *, int, struct lwp *);
};
enum ite_flags {
@@ -185,27 +185,27 @@ struct consdev;
struct termios;
/* console related function */
-void ite_cnprobe __P((struct consdev *));
-void ite_cninit __P((struct consdev *));
-int ite_cngetc __P((dev_t));
-void ite_cnputc __P((dev_t, int));
-void ite_cnfinish __P((struct ite_softc *));
+void ite_cnprobe(struct consdev *);
+void ite_cninit(struct consdev *);
+int ite_cngetc(dev_t);
+void ite_cnputc(dev_t, int);
+void ite_cnfinish(struct ite_softc *);
/* standard ite device entry points. */
-void iteinit __P((dev_t));
+void iteinit(dev_t);
/* ite functions */
-void ite_on __P((dev_t, int));
-void ite_off __P((dev_t, int));
-void ite_reinit __P((dev_t));
-int ite_param __P((struct tty *, struct termios *));
-void ite_reset __P((struct ite_softc *));
-int ite_cnfilter __P((u_int, enum caller));
-void ite_filter __P((u_int ,enum caller));
+void ite_on(dev_t, int);
+void ite_off(dev_t, int);
+void ite_reinit(dev_t);
+int ite_param(struct tty *, struct termios *);
+void ite_reset(struct ite_softc *);
+int ite_cnfilter(u_int, enum caller);
+void ite_filter(u_int ,enum caller);
/* ite_cc functions */
-int grfcc_cnprobe __P((void));
-void grfcc_iteinit __P((struct grf_softc *));
+int grfcc_cnprobe(void);
+void grfcc_iteinit(struct grf_softc *);
#endif /* _KERNEL */
#endif /* _ITEVAR_H */
diff --git a/sys/arch/atari/dev/kbd.c b/sys/arch/atari/dev/kbd.c
index 6d3d6600f05..fb9f723f99f 100644
--- a/sys/arch/atari/dev/kbd.c
+++ b/sys/arch/atari/dev/kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.32 2009/01/17 05:23:28 tsutsui Exp $ */
+/* $NetBSD: kbd.c,v 1.33 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.32 2009/01/17 05:23:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.33 2009/03/14 14:45:56 dsl Exp $");
#include "mouse.h"
#include "ite.h"
@@ -115,16 +115,16 @@ dev_type_poll(kbdpoll);
dev_type_kqfilter(kbdkqfilter);
/* Interrupt handler */
-void kbdintr __P((int));
+void kbdintr(int);
-static void kbdsoft __P((void *, void *));
-static void kbdattach __P((struct device *, struct device *, void *));
-static int kbdmatch __P((struct device *, struct cfdata *, void *));
+static void kbdsoft(void *, void *);
+static void kbdattach(struct device *, struct device *, void *);
+static int kbdmatch(struct device *, struct cfdata *, void *);
#if NITE>0
-static int kbd_do_modifier __P((u_char));
+static int kbd_do_modifier(u_char);
#endif
-static int kbd_write_poll __P((u_char *, int));
-static void kbd_pkg_start __P((struct kbd_softc *, u_char));
+static int kbd_write_poll(u_char *, int);
+static void kbd_pkg_start(struct kbd_softc *, u_char);
CFATTACH_DECL(kbd, sizeof(struct device),
kbdmatch, kbdattach, NULL, NULL);
diff --git a/sys/arch/atari/dev/kbdvar.h b/sys/arch/atari/dev/kbdvar.h
index 93680997e62..0852d92f4e5 100644
--- a/sys/arch/atari/dev/kbdvar.h
+++ b/sys/arch/atari/dev/kbdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbdvar.h,v 1.5 2003/02/02 17:56:55 thomas Exp $ */
+/* $NetBSD: kbdvar.h,v 1.6 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -71,12 +71,12 @@ struct kbd_softc {
#ifdef _KERNEL
extern u_char kbd_modifier;
-void kbd_bell_gparms __P((u_int *, u_int *, u_int *));
-void kbd_bell_sparms __P((u_int, u_int, u_int));
-void kbd_write __P((u_char *, int));
-int kbdgetcn __P((void));
-void kbdbell __P((void));
-void kbdenable __P((void));
+void kbd_bell_gparms(u_int *, u_int *, u_int *);
+void kbd_bell_sparms(u_int, u_int, u_int);
+void kbd_write(u_char *, int);
+int kbdgetcn(void);
+void kbdbell(void);
+void kbdenable(void);
#endif /* _KERNEL */
#endif /* _KBDVAR_H */
diff --git a/sys/arch/atari/dev/md_root.c b/sys/arch/atari/dev/md_root.c
index 862f6d86cee..d6c98cd1f76 100644
--- a/sys/arch/atari/dev/md_root.c
+++ b/sys/arch/atari/dev/md_root.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md_root.c,v 1.28 2008/12/28 23:00:39 tsutsui Exp $ */
+/* $NetBSD: md_root.c,v 1.29 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.28 2008/12/28 23:00:39 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.29 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,12 +100,12 @@ struct read_info {
};
-static int loaddisk __P((struct md_conf *, dev_t ld_dev, struct lwp *));
-static int ramd_norm_read __P((struct read_info *));
+static int loaddisk(struct md_conf *, dev_t ld_dev, struct lwp *);
+static int ramd_norm_read(struct read_info *);
#ifdef support_compression
-static int cpy_uncompressed __P((void *, int, struct read_info *));
-static int md_compressed __P((void *, int, struct read_info *));
+static int cpy_uncompressed(void *, int, struct read_info *);
+static int md_compressed(void *, int, struct read_info *);
#endif
/*
diff --git a/sys/arch/atari/dev/ms.c b/sys/arch/atari/dev/ms.c
index 0007904e7c3..03e636e5c97 100644
--- a/sys/arch/atari/dev/ms.c
+++ b/sys/arch/atari/dev/ms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ms.c,v 1.21 2009/01/17 05:23:28 tsutsui Exp $ */
+/* $NetBSD: ms.c,v 1.22 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.21 2009/01/17 05:23:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.22 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -79,7 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.21 2009/01/17 05:23:28 tsutsui Exp $");
#define NMOUSE 1
#endif
-typedef void (*FPV) __P((void *));
+typedef void (*FPV)(void *);
static struct ms_softc ms_softc[NMOUSE];
@@ -95,7 +95,7 @@ const struct cdevsw ms_cdevsw = {
nostop, notty, mspoll, nommap, mskqfilter,
};
-static void ms_3b_delay __P((struct ms_softc *));
+static void ms_3b_delay(struct ms_softc *);
int
mouseattach(cnt)
diff --git a/sys/arch/atari/dev/msvar.h b/sys/arch/atari/dev/msvar.h
index 125629895a0..03beaa3797c 100644
--- a/sys/arch/atari/dev/msvar.h
+++ b/sys/arch/atari/dev/msvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: msvar.h,v 1.2 2000/03/23 06:36:04 thorpej Exp $ */
+/* $NetBSD: msvar.h,v 1.3 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -58,8 +58,8 @@ struct ms_softc {
};
#ifdef _KERNEL
-void mouse_soft __P((REL_MOUSE *, int, int));
-int mouseattach __P((int));
+void mouse_soft(REL_MOUSE *, int, int);
+int mouseattach(int);
#endif /* _KERNEL */
#endif /* _MSVAR_H */
diff --git a/sys/arch/atari/dev/ncr5380.c b/sys/arch/atari/dev/ncr5380.c
index 48d27e039dd..216891c5dc1 100644
--- a/sys/arch/atari/dev/ncr5380.c
+++ b/sys/arch/atari/dev/ncr5380.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380.c,v 1.57 2008/11/15 21:35:31 abs Exp $ */
+/* $NetBSD: ncr5380.c,v 1.58 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.57 2008/11/15 21:35:31 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.58 2009/03/14 14:45:56 dsl Exp $");
/*
* Bit mask of targets you want debugging to be shown
@@ -80,10 +80,10 @@ static volatile int main_running = 0;
*/
static u_char busy;
-static void ncr5380_minphys __P((struct buf *bp));
-static void ncr5380_scsi_request __P((struct scsipi_channel *,
- scsipi_adapter_req_t, void *));
-static void ncr5380_show_scsi_cmd __P((struct scsipi_xfer *xs));
+static void ncr5380_minphys(struct buf *bp);
+static void ncr5380_scsi_request(struct scsipi_channel *,
+ scsipi_adapter_req_t, void *);
+static void ncr5380_show_scsi_cmd(struct scsipi_xfer *xs);
static SC_REQ req_queue[NREQ];
static SC_REQ *free_head = NULL; /* Free request structures */
@@ -169,8 +169,8 @@ extern inline void finish_req(SC_REQ *reqp)
/*
* Auto config stuff....
*/
-void ncr_attach __P((struct device *, struct device *, void *));
-int ncr_match __P((struct device *, struct cfdata *, void *));
+void ncr_attach(struct device *, struct device *, void *);
+int ncr_match(struct device *, struct cfdata *, void *);
/*
* Tricks to make driver-name configurable
diff --git a/sys/arch/atari/dev/ncr5380reg.h b/sys/arch/atari/dev/ncr5380reg.h
index 17dc8d652b5..7c3c97061fe 100644
--- a/sys/arch/atari/dev/ncr5380reg.h
+++ b/sys/arch/atari/dev/ncr5380reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380reg.h,v 1.19 2005/12/11 12:16:54 christos Exp $ */
+/* $NetBSD: ncr5380reg.h,v 1.20 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -230,38 +230,38 @@ static SC_REQ *connected = NULL; /* Command currently connected */
/*
* Function decls:
*/
-static void ack_message __P((void));
-static int check_autosense __P((SC_REQ *, int));
-static int check_intr __P((struct ncr_softc *));
-static int dma_ready __P((void));
-static void finish_req __P((SC_REQ *));
-static int handle_message __P((SC_REQ *, u_int));
-static int information_transfer __P((struct ncr_softc *));
-static void nack_message __P((SC_REQ *, u_char));
-static void ncr_aprint __P((struct ncr_softc *, const char *, ...));
-static void ncr_ctrl_intr __P((struct ncr_softc *));
-static void ncr_dma_intr __P((struct ncr_softc *));
-static void ncr_tprint __P((SC_REQ *, const char *, ...));
-static int reach_msg_out __P((struct ncr_softc *, u_long));
-static void reselect __P((struct ncr_softc *));
-static void run_main __P((struct ncr_softc *));
-static int scsi_dmaok __P((SC_REQ *));
-static void scsi_main __P((struct ncr_softc *));
-static void scsi_reset_verbose __P((struct ncr_softc *, const char *));
-static int scsi_select __P((SC_REQ *, int));
-static void show_data_sense __P((struct scsipi_xfer *));
-static void show_phase __P((SC_REQ *, int));
-static void show_request __P((SC_REQ *, const char *));
-static void show_signals __P((u_char, u_char));
-static void transfer_dma __P((SC_REQ *, u_int, int));
-static int transfer_pio __P((u_char *, u_char *, u_long *, int));
-static int wait_req_false __P((void));
-static int wait_req_true __P((void));
+static void ack_message(void);
+static int check_autosense(SC_REQ *, int);
+static int check_intr(struct ncr_softc *);
+static int dma_ready(void);
+static void finish_req(SC_REQ *);
+static int handle_message(SC_REQ *, u_int);
+static int information_transfer(struct ncr_softc *);
+static void nack_message(SC_REQ *, u_char);
+static void ncr_aprint(struct ncr_softc *, const char *, ...);
+static void ncr_ctrl_intr(struct ncr_softc *);
+static void ncr_dma_intr(struct ncr_softc *);
+static void ncr_tprint(SC_REQ *, const char *, ...);
+static int reach_msg_out(struct ncr_softc *, u_long);
+static void reselect(struct ncr_softc *);
+static void run_main(struct ncr_softc *);
+static int scsi_dmaok(SC_REQ *);
+static void scsi_main(struct ncr_softc *);
+static void scsi_reset_verbose(struct ncr_softc *, const char *);
+static int scsi_select(SC_REQ *, int);
+static void show_data_sense(struct scsipi_xfer *);
+static void show_phase(SC_REQ *, int);
+static void show_request(SC_REQ *, const char *);
+static void show_signals(u_char, u_char);
+static void transfer_dma(SC_REQ *, u_int, int);
+static int transfer_pio(u_char *, u_char *, u_long *, int);
+static int wait_req_false(void);
+static int wait_req_true(void);
/*
* You might want to call these from the debugger...
*/
- void scsi_show __P((void));
- void scsi_reset __P((void));
+ void scsi_show(void);
+ void scsi_reset(void);
#endif /* _NCR5380REG_H */
diff --git a/sys/arch/atari/dev/nvram.c b/sys/arch/atari/dev/nvram.c
index 87cea82a870..500c61d6610 100644
--- a/sys/arch/atari/dev/nvram.c
+++ b/sys/arch/atari/dev/nvram.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nvram.c,v 1.13 2008/06/13 08:50:12 cegger Exp $ */
+/* $NetBSD: nvram.c,v 1.14 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.13 2008/06/13 08:50:12 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.14 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -57,15 +57,15 @@ __KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.13 2008/06/13 08:50:12 cegger Exp $");
#define MC_NVRAM_CSUM (MC_NVRAM_START + MC_NVRAM_SIZE - 2)
#if NNVR > 0
-static void nvram_set_csum __P((u_char csum));
-static int nvram_csum_valid __P((u_char csum));
-static u_char nvram_csum __P((void));
+static void nvram_set_csum(u_char csum);
+static int nvram_csum_valid(u_char csum);
+static u_char nvram_csum(void);
/*
* Auto config stuff....
*/
-static void nvr_attach __P((struct device *, struct device *, void *));
-static int nvr_match __P((struct device *, struct cfdata *, void *));
+static void nvr_attach(struct device *, struct device *, void *);
+static int nvr_match(struct device *, struct cfdata *, void *);
CFATTACH_DECL(nvr, sizeof(struct nvr_softc),
nvr_match, nvr_attach, NULL, NULL);
diff --git a/sys/arch/atari/dev/nvramvar.h b/sys/arch/atari/dev/nvramvar.h
index 0c905de4076..947605ef282 100644
--- a/sys/arch/atari/dev/nvramvar.h
+++ b/sys/arch/atari/dev/nvramvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nvramvar.h,v 1.1 1996/01/06 20:11:09 leo Exp $ */
+/* $NetBSD: nvramvar.h,v 1.2 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -48,7 +48,7 @@ struct nvr_softc {
/*
* Kernel internal interface to read config info from nvram
*/
-int nvr_get_byte __P((int));
+int nvr_get_byte(int);
/*
* Error return from nvr_get_byte
diff --git a/sys/arch/atari/dev/ser.c b/sys/arch/atari/dev/ser.c
index 933ea17ac3d..ed322df50b8 100644
--- a/sys/arch/atari/dev/ser.c
+++ b/sys/arch/atari/dev/ser.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.39 2008/06/11 14:35:53 tsutsui Exp $ */
+/* $NetBSD: ser.c,v 1.40 2009/03/14 14:45:56 dsl Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.39 2008/06/11 14:35:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.40 2009/03/14 14:45:56 dsl Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -207,41 +207,41 @@ struct ser_softc {
*/
#define SER_HW_CONSOLE 0x01
-void ser_break __P((struct ser_softc *, int));
-void ser_hwiflow __P((struct ser_softc *, int));
-void ser_iflush __P((struct ser_softc *));
-void ser_loadchannelregs __P((struct ser_softc *));
-void ser_modem __P((struct ser_softc *, int));
-void serdiag __P((void *));
-int serhwiflow __P((struct tty *, int));
-void serinit __P((int));
-void serinitcons __P((int));
-int sermintr __P((void *));
-int sertrintr __P((void *));
-int serparam __P((struct tty *, struct termios *));
-void serstart __P((struct tty *));
+void ser_break(struct ser_softc *, int);
+void ser_hwiflow(struct ser_softc *, int);
+void ser_iflush(struct ser_softc *);
+void ser_loadchannelregs(struct ser_softc *);
+void ser_modem(struct ser_softc *, int);
+void serdiag(void *);
+int serhwiflow(struct tty *, int);
+void serinit(int);
+void serinitcons(int);
+int sermintr(void *);
+int sertrintr(void *);
+int serparam(struct tty *, struct termios *);
+void serstart(struct tty *);
struct consdev;
-void sercnprobe __P((struct consdev *));
-void sercninit __P((struct consdev *));
-int sercngetc __P((dev_t));
-void sercnputc __P((dev_t, int));
-void sercnpollc __P((dev_t, int));
-
-static void sermsrint __P((struct ser_softc *, struct tty*));
-static void serrxint __P((struct ser_softc *, struct tty*));
-static void ser_shutdown __P((struct ser_softc *));
-static int serspeed __P((long));
-static void sersoft __P((void *));
-static void sertxint __P((struct ser_softc *, struct tty*));
+void sercnprobe(struct consdev *);
+void sercninit(struct consdev *);
+int sercngetc(dev_t);
+void sercnputc(dev_t, int);
+void sercnpollc(dev_t, int);
+
+static void sermsrint(struct ser_softc *, struct tty*);
+static void serrxint(struct ser_softc *, struct tty*);
+static void ser_shutdown(struct ser_softc *);
+static int serspeed(long);
+static void sersoft(void *);
+static void sertxint(struct ser_softc *, struct tty*);
static volatile int ser_softintr_scheduled = 0;
/*
* Autoconfig stuff
*/
-static void serattach __P((struct device *, struct device *, void *));
-static int sermatch __P((struct device *, struct cfdata *, void *));
+static void serattach(struct device *, struct device *, void *);
+static int sermatch(struct device *, struct cfdata *, void *);
CFATTACH_DECL(ser, sizeof(struct ser_softc),
sermatch, serattach, NULL, NULL);
@@ -332,7 +332,7 @@ void *auxp;
}
#ifdef SER_DEBUG
-void serstatus __P((struct ser_softc *, char *));
+void serstatus(struct ser_softc *, char *);
void
serstatus(sc, str)
struct ser_softc *sc;
diff --git a/sys/arch/atari/dev/view.c b/sys/arch/atari/dev/view.c
index 03ccd3fcb2c..ee6cd014567 100644
--- a/sys/arch/atari/dev/view.c
+++ b/sys/arch/atari/dev/view.c
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.25 2008/03/23 15:50:51 cube Exp $ */
+/* $NetBSD: view.c,v 1.26 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -38,7 +38,7 @@
* a interface to graphics. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.25 2008/03/23 15:50:51 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.26 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,11 +55,11 @@ __KERNEL_RCSID(0, "$NetBSD: view.c,v 1.25 2008/03/23 15:50:51 cube Exp $");
#include <atari/dev/viewvar.h>
#include "view.h"
-static void view_display __P((struct view_softc *));
-static void view_remove __P((struct view_softc *));
-static int view_setsize __P((struct view_softc *, struct view_size *));
-static int view_get_colormap __P((struct view_softc *, colormap_t *));
-static int view_set_colormap __P((struct view_softc *, colormap_t *));
+static void view_display(struct view_softc *);
+static void view_remove(struct view_softc *);
+static int view_setsize(struct view_softc *, struct view_size *);
+static int view_get_colormap(struct view_softc *, colormap_t *);
+static int view_set_colormap(struct view_softc *, colormap_t *);
struct view_softc views[NVIEW];
static int view_inited;
@@ -83,7 +83,7 @@ const struct cdevsw view_cdevsw = {
/*
* functions for probeing.
*/
-void viewattach __P((int));
+void viewattach(int);
void
viewattach(cnt)
diff --git a/sys/arch/atari/dev/viewvar.h b/sys/arch/atari/dev/viewvar.h
index 9125756b12d..a04e745f87a 100644
--- a/sys/arch/atari/dev/viewvar.h
+++ b/sys/arch/atari/dev/viewvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: viewvar.h,v 1.6 2005/12/11 12:16:54 christos Exp $ */
+/* $NetBSD: viewvar.h,v 1.7 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -61,7 +61,7 @@ enum view_unit_flags {
};
#ifdef _KERNEL
-view_t *viewview __P((dev_t));
-int viewprobe __P((void));
+view_t *viewview(dev_t);
+int viewprobe(void);
#endif /* _KERNEL */
diff --git a/sys/arch/atari/dev/ym2149reg.h b/sys/arch/atari/dev/ym2149reg.h
index e16d66b7675..c3acf3a1f67 100644
--- a/sys/arch/atari/dev/ym2149reg.h
+++ b/sys/arch/atari/dev/ym2149reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ym2149reg.h,v 1.5 2005/12/11 12:16:54 christos Exp $ */
+/* $NetBSD: ym2149reg.h,v 1.6 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -165,7 +165,7 @@ extern u_char ym2149_ioa; /* Soft-copy of port-A */
/*
* Prototypes
*/
-void ym2149_init __P((void));
+void ym2149_init(void);
#endif
#endif /* _YM2149REG_H */
diff --git a/sys/arch/atari/dev/zs.c b/sys/arch/atari/dev/zs.c
index 54c03277209..cfde6eaf414 100644
--- a/sys/arch/atari/dev/zs.c
+++ b/sys/arch/atari/dev/zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.58 2009/01/28 19:55:51 tjam Exp $ */
+/* $NetBSD: zs.c,v 1.59 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.58 2009/01/28 19:55:51 tjam Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.59 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -217,8 +217,8 @@ static u_long zs_freqs_generic[] = {
static u_long *zs_frequencies;
/* Definition of the driver for autoconfig. */
-static int zsmatch __P((struct device *, struct cfdata *, void *));
-static void zsattach __P((struct device *, struct device *, void *));
+static int zsmatch(struct device *, struct cfdata *, void *);
+static void zsattach(struct device *, struct device *, void *);
CFATTACH_DECL(zs, sizeof(struct zs_softc),
zsmatch, zsattach, NULL, NULL);
@@ -241,24 +241,24 @@ const struct cdevsw zs_cdevsw = {
};
/* Interrupt handlers. */
-int zshard __P((long));
-static int zssoft __P((long));
-static int zsrint __P((struct zs_chanstate *, volatile struct zschan *));
-static int zsxint __P((struct zs_chanstate *, volatile struct zschan *));
-static int zssint __P((struct zs_chanstate *, volatile struct zschan *));
+int zshard(long);
+static int zssoft(long);
+static int zsrint(struct zs_chanstate *, volatile struct zschan *);
+static int zsxint(struct zs_chanstate *, volatile struct zschan *);
+static int zssint(struct zs_chanstate *, volatile struct zschan *);
static struct zs_chanstate *zslist;
/* Routines called from other code. */
-static void zsstart __P((struct tty *));
+static void zsstart(struct tty *);
/* Routines purely local to this driver. */
-static void zsoverrun __P((int, long *, const char *));
-static int zsparam __P((struct tty *, struct termios *));
-static int zsbaudrate __P((int, int, int *, int *, int *, int *));
-static int zs_modem __P((struct zs_chanstate *, int, int));
-static void zs_loadchannelregs __P((volatile struct zschan *, u_char *));
-static void zs_shutdown __P((struct zs_chanstate *));
+static void zsoverrun(int, long *, const char *);
+static int zsparam(struct tty *, struct termios *);
+static int zsbaudrate(int, int, int *, int *, int *, int *);
+static int zs_modem(struct zs_chanstate *, int, int);
+static void zs_loadchannelregs(volatile struct zschan *, u_char *);
+static void zs_shutdown(struct zs_chanstate *);
static int
zsmatch(pdp, cfp, auxp)
diff --git a/sys/arch/atari/isa/isa_dma.c b/sys/arch/atari/isa/isa_dma.c
index 5d66227acb1..f8924505609 100644
--- a/sys/arch/atari/isa/isa_dma.c
+++ b/sys/arch/atari/isa/isa_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_dma.c,v 1.7 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: isa_dma.c,v 1.8 2009/03/14 14:45:56 dsl Exp $ */
#define ISA_DMA_STATS
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_dma.c,v 1.7 2008/04/28 20:23:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_dma.c,v 1.8 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -90,27 +90,27 @@ struct atari_isa_dma_cookie {
#define ID_BUFTYPE_UIO 3
#define ID_BUFTYPE_RAW 4
-int _isa_bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *));
-void _isa_bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int _isa_bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
-int _isa_bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
-int _isa_bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
-int _isa_bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
-void _isa_bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void _isa_bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int));
-
-int _isa_bus_dmamem_alloc __P((bus_dma_tag_t, bus_size_t, bus_size_t,
- bus_size_t, bus_dma_segment_t *, int, int *, int));
-
-int _isa_dma_alloc_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t,
- bus_size_t, int));
-void _isa_dma_free_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t));
+int _isa_bus_dmamap_create(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
+void _isa_bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int _isa_bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+int _isa_bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+int _isa_bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+int _isa_bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+void _isa_bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void _isa_bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
+
+int _isa_bus_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t,
+ bus_size_t, bus_dma_segment_t *, int, int *, int);
+
+int _isa_dma_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t,
+ bus_size_t, int);
+void _isa_dma_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t);
/*
* Entry points for ISA DMA. These are mostly wrappers around
diff --git a/sys/arch/atari/isa/isa_hades.c b/sys/arch/atari/isa/isa_hades.c
index b0adf3fc387..1a2e2113270 100644
--- a/sys/arch/atari/isa/isa_hades.c
+++ b/sys/arch/atari/isa/isa_hades.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_hades.c,v 1.5 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: isa_hades.c,v 1.6 2009/03/14 14:45:56 dsl Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_hades.c,v 1.5 2008/04/28 20:23:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_hades.c,v 1.6 2009/03/14 14:45:56 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -65,7 +65,7 @@ isa_bus_init()
static isa_intr_info_t iinfo[2] = { { -1 }, { -1 } };
-static int iifun __P((int, int));
+static int iifun(int, int);
static int
iifun(slot, sr)
@@ -158,7 +158,7 @@ void *
isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
isa_chipset_tag_t ic;
int irq, type, level;
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
{
isa_intr_info_t *iinfo_p;
diff --git a/sys/arch/atari/isa/isa_machdep.c b/sys/arch/atari/isa/isa_machdep.c
index 67ed0d08f36..fd8d0d0da0c 100644
--- a/sys/arch/atari/isa/isa_machdep.c
+++ b/sys/arch/atari/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.30 2007/01/24 13:08:13 hubertf Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.31 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1997 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.30 2007/01/24 13:08:13 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.31 2009/03/14 14:45:56 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -67,9 +67,9 @@ struct atari_bus_dma_tag isa_bus_dma_tag = {
};
#endif /* NISADMA == 0 */
-static int atariisabusprint __P((void *auxp, const char *));
-static int isabusmatch __P((struct device *, struct cfdata *, void *));
-static void isabusattach __P((struct device *, struct device *, void *));
+static int atariisabusprint(void *auxp, const char *);
+static int isabusmatch(struct device *, struct cfdata *, void *);
+static void isabusattach(struct device *, struct device *, void *);
struct isabus_softc {
struct device sc_dev;
diff --git a/sys/arch/atari/isa/isa_milan.c b/sys/arch/atari/isa/isa_milan.c
index b564de0410b..2343f808ac2 100644
--- a/sys/arch/atari/isa/isa_milan.c
+++ b/sys/arch/atari/isa/isa_milan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_milan.c,v 1.9 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: isa_milan.c,v 1.10 2009/03/14 14:45:56 dsl Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_milan.c,v 1.9 2008/04/28 20:23:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_milan.c,v 1.10 2009/03/14 14:45:56 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -204,7 +204,7 @@ void *
isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
isa_chipset_tag_t ic;
int irq, type, level;
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
{
isa_intr_info_t *iinfo_p;
diff --git a/sys/arch/atari/pci/pci_hades.c b/sys/arch/atari/pci/pci_hades.c
index 44f2f958363..ad922c5b5fd 100644
--- a/sys/arch/atari/pci/pci_hades.c
+++ b/sys/arch/atari/pci/pci_hades.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_hades.c,v 1.8 2008/05/30 19:26:35 ad Exp $ */
+/* $NetBSD: pci_hades.c,v 1.9 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_hades.c,v 1.8 2008/05/30 19:26:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_hades.c,v 1.9 2009/03/14 14:45:56 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -63,7 +63,7 @@ pci_bus_maxdevs(pc, busno)
return (4);
}
-static int pci_config_offset __P((pcitag_t));
+static int pci_config_offset(pcitag_t);
/*
* Atari_init.c maps the config areas PAGE_SIZE bytes apart....
@@ -108,7 +108,7 @@ pci_conf_write(pc, tag, reg, data)
*/
static pci_intr_info_t iinfo[4] = { { -1 }, { -1 }, { -1 }, { -1 } };
-static int iifun __P((int, int));
+static int iifun(int, int);
static int
iifun(slot, sr)
@@ -162,7 +162,7 @@ pci_intr_establish(pc, ih, level, ih_fun, ih_arg)
pci_chipset_tag_t pc;
pci_intr_handle_t ih;
int level;
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
{
pci_intr_info_t *iinfo_p;
diff --git a/sys/arch/atari/pci/pci_machdep.c b/sys/arch/atari/pci/pci_machdep.c
index 8515b4cb0bf..a5618946e2d 100644
--- a/sys/arch/atari/pci/pci_machdep.c
+++ b/sys/arch/atari/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.43 2005/12/11 12:16:59 christos Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.44 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.43 2005/12/11 12:16:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.44 2009/03/14 14:45:56 dsl Exp $");
#include "opt_mbtype.h"
@@ -101,8 +101,8 @@ typedef LIST_HEAD(pci_memreg_head, pci_memreg) PCI_MEMREG;
/*
* Entry points for PCI DMA. Use only the 'standard' functions.
*/
-int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t,
- bus_size_t, int, bus_dmamap_t *));
+int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
+ bus_size_t, int, bus_dmamap_t *);
struct atari_bus_dma_tag pci_bus_dma_tag = {
0,
#if defined(_ATARIHW_)
@@ -120,14 +120,14 @@ struct atari_bus_dma_tag pci_bus_dma_tag = {
_bus_dmamap_sync,
};
-int ataripcibusprint __P((void *auxp, const char *));
-int pcibusmatch __P((struct device *, struct cfdata *, void *));
-void pcibusattach __P((struct device *, struct device *, void *));
+int ataripcibusprint(void *auxp, const char *);
+int pcibusmatch(struct device *, struct cfdata *, void *);
+void pcibusattach(struct device *, struct device *, void *);
-static void enable_pci_devices __P((void));
-static void insert_into_list __P((PCI_MEMREG *head, struct pci_memreg *elem));
-static int overlap_pci_areas __P((struct pci_memreg *p,
- struct pci_memreg *self, u_int addr, u_int size, u_int what));
+static void enable_pci_devices(void);
+static void insert_into_list(PCI_MEMREG *head, struct pci_memreg *elem);
+static int overlap_pci_areas(struct pci_memreg *p,
+ struct pci_memreg *self, u_int addr, u_int size, u_int what);
CFATTACH_DECL(pcib, sizeof(struct device),
pcibusmatch, pcibusattach, NULL, NULL);
diff --git a/sys/arch/atari/pci/pci_milan.c b/sys/arch/atari/pci/pci_milan.c
index 18ce61a85e6..f015f65774b 100644
--- a/sys/arch/atari/pci/pci_milan.c
+++ b/sys/arch/atari/pci/pci_milan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_milan.c,v 1.9 2008/05/30 19:26:35 ad Exp $ */
+/* $NetBSD: pci_milan.c,v 1.10 2009/03/14 14:45:56 dsl Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_milan.c,v 1.9 2008/05/30 19:26:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_milan.c,v 1.10 2009/03/14 14:45:56 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -111,7 +111,7 @@ pci_intr_establish(pc, ih, level, ih_fun, ih_arg)
pci_chipset_tag_t pc;
pci_intr_handle_t ih;
int level;
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
{
if (ih == 0 || ih >= 16 || ih == 2)
diff --git a/sys/arch/atari/pci/pciide_machdep.c b/sys/arch/atari/pci/pciide_machdep.c
index 4db5b573a0c..bbe5d1a1a8a 100644
--- a/sys/arch/atari/pci/pciide_machdep.c
+++ b/sys/arch/atari/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.3 2005/12/11 12:17:00 christos Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.4 2009/03/14 14:45:56 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.3 2005/12/11 12:17:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.4 2009/03/14 14:45:56 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -59,7 +59,7 @@ pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
struct device *dev;
struct pci_attach_args *pa;
int chan;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
int irq;
diff --git a/sys/arch/atari/stand/ahdilabel/privahdi.h b/sys/arch/atari/stand/ahdilabel/privahdi.h
index db203cfe439..bcf5c5da01c 100644
--- a/sys/arch/atari/stand/ahdilabel/privahdi.h
+++ b/sys/arch/atari/stand/ahdilabel/privahdi.h
@@ -1,4 +1,4 @@
-/* $NetBSD: privahdi.h,v 1.2 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: privahdi.h,v 1.3 2009/03/14 14:45:57 dsl Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -64,24 +64,24 @@ struct ahdi_ptable {
struct ptable_part parts[MAXPARTITIONS];
};
-int ahdi_buildlabel __P((struct ahdi_ptable *));
-int ahdi_checklabel __P((struct ahdi_ptable *));
-int ahdi_readlabel __P((struct ahdi_ptable *, char *, int));
-int ahdi_writedisktab __P((struct ahdi_ptable *, char *, char *, char *));
-int ahdi_writelabel __P((struct ahdi_ptable *, char *, int));
+int ahdi_buildlabel(struct ahdi_ptable *);
+int ahdi_checklabel(struct ahdi_ptable *);
+int ahdi_readlabel(struct ahdi_ptable *, char *, int);
+int ahdi_writedisktab(struct ahdi_ptable *, char *, char *, char *);
+int ahdi_writelabel(struct ahdi_ptable *, char *, int);
extern int ahdi_errp1, ahdi_errp2;
/* Internal functions */
-u_int16_t ahdi_cksum __P((void *));
-void assign_letters __P((struct ahdi_ptable *));
-int check_magic __P((int, u_int, int));
-int dkcksum __P((struct disklabel *));
-void *disk_read __P((int, u_int, u_int));
-int disk_write __P((int, u_int, u_int, void *));
-int invalidate_netbsd_label __P((int, u_int32_t));
-int openraw __P((const char *, int));
-struct disklabel *read_dl __P((int));
-int read_rsec __P((int, struct ahdi_ptable *, u_int,
- u_int, int));
-int write_bsl __P((int));
+u_int16_t ahdi_cksum(void *);
+void assign_letters(struct ahdi_ptable *);
+int check_magic(int, u_int, int);
+int dkcksum(struct disklabel *);
+void *disk_read(int, u_int, u_int);
+int disk_write(int, u_int, u_int, void *);
+int invalidate_netbsd_label(int, u_int32_t);
+int openraw(const char *, int);
+struct disklabel *read_dl(int);
+int read_rsec(int, struct ahdi_ptable *, u_int,
+ u_int, int);
+int write_bsl(int);
diff --git a/sys/arch/atari/stand/bootpref/bootpref.c b/sys/arch/atari/stand/bootpref/bootpref.c
index 506d05ab3c8..ec212e13349 100644
--- a/sys/arch/atari/stand/bootpref/bootpref.c
+++ b/sys/arch/atari/stand/bootpref/bootpref.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bootpref.c,v 1.3 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: bootpref.c,v 1.4 2009/03/14 14:45:57 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,27 +38,27 @@
#include <sys/mman.h>
#include "bootpref.h"
-static void usage __P ((void));
-static int openNVRAM __P ((void));
-static void closeNVRAM __P ((int));
-static u_char readNVRAM __P ((int, int));
-static void writeNVRAM __P ((int, int, u_char));
-static void getNVpref __P ((int, u_char[]));
-static void setNVpref __P ((int, u_char[], int, int));
-static void showOS __P ((u_char));
-static void showLang __P ((u_char));
-static void showKbdLang __P ((u_char));
-static void showDateFmt __P ((u_char));
-static void showDateSep __P ((u_char));
-static void showVideo2 __P ((u_char));
-static void showVideo1 __P ((u_char, u_char));
-static int checkOS __P ((u_char *, char *));
-static int checkLang __P ((u_char *, char *));
-static int checkKbdLang __P ((u_char *, char *));
-static int checkInt __P ((u_char *, char *, int, int));
-static int checkDateFmt __P ((u_char *, char *));
-static void checkDateSep __P ((u_char *, char *));
-static int checkColours __P ((u_char *, char *));
+static void usage(void);
+static int openNVRAM(void);
+static void closeNVRAM(int);
+static u_char readNVRAM(int, int);
+static void writeNVRAM(int, int, u_char);
+static void getNVpref(int, u_char[]);
+static void setNVpref(int, u_char[], int, int);
+static void showOS(u_char);
+static void showLang(u_char);
+static void showKbdLang(u_char);
+static void showDateFmt(u_char);
+static void showDateSep(u_char);
+static void showVideo2(u_char);
+static void showVideo1(u_char, u_char);
+static int checkOS(u_char *, char *);
+static int checkLang(u_char *, char *);
+static int checkKbdLang(u_char *, char *);
+static int checkInt(u_char *, char *, int, int);
+static int checkDateFmt(u_char *, char *);
+static void checkDateSep(u_char *, char *);
+static int checkColours(u_char *, char *);
#define SET_OS 0x001
#define SET_LANG 0x002
diff --git a/sys/arch/atari/stand/bootxxx/bootxxx.c b/sys/arch/atari/stand/bootxxx/bootxxx.c
index 6f9ec2d8e8f..c1957c72bdc 100644
--- a/sys/arch/atari/stand/bootxxx/bootxxx.c
+++ b/sys/arch/atari/stand/bootxxx/bootxxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxxx.c,v 1.4 2009/01/06 13:35:30 tsutsui Exp $ */
+/* $NetBSD: bootxxx.c,v 1.5 2009/03/14 14:45:57 dsl Exp $ */
/*
* Copyright (c) 2001 Leo Weppelman.
@@ -44,7 +44,7 @@
#include <tosdefs.h>
int bootxxx(void *, void *, osdsc_t *);
-void boot_BSD __P((struct kparamb *)__attribute__((noreturn)));
+void boot_BSD(struct kparamb *)__attribute__((noreturn));
int
bootxxx(readsector, disklabel, od)
@@ -61,7 +61,7 @@ bootxxx(readsector, disklabel, od)
/* XXX: Limit should be 16MB */
setheap(end, (void*)0x1000000);
printf("\033v\nNetBSD/Atari tertiary bootloader "
- "($Revision: 1.4 $)\n\n");
+ "($Revision: 1.5 $)\n\n");
if (init_dskio(readsector, disklabel, od->rootfs))
return(-1);
diff --git a/sys/arch/atari/stand/edahdi/edahdi.c b/sys/arch/atari/stand/edahdi/edahdi.c
index ca84d545ade..5c9d8944d5a 100644
--- a/sys/arch/atari/stand/edahdi/edahdi.c
+++ b/sys/arch/atari/stand/edahdi/edahdi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: edahdi.c,v 1.5 2005/12/11 12:17:00 christos Exp $ */
+/* $NetBSD: edahdi.c,v 1.6 2009/03/14 14:45:57 dsl Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman, Waldi Ravens.
@@ -99,18 +99,18 @@ typedef struct {
*/
char *Clr_screen = "";
-void ahdi_cksum __P((void *));
-u_int ahdi_getparts __P((int, ptable_t *, u_int, u_int));
-int bsd_label __P((int, u_int));
-int dkcksum __P((struct disklabel *));
-int edit_parts __P((int, ptable_t *));
-void *disk_read __P((int, u_int, u_int));
-void disk_write __P((int, u_int, u_int, void *));
-char *get_id __P((void));
-void get_termcap __P((void));
-int lex __P((int *));
-int show_parts __P((ptable_t *, int));
-void update_disk __P((ptable_t *, int, int));
+void ahdi_cksum(void *);
+u_int ahdi_getparts(int, ptable_t *, u_int, u_int);
+int bsd_label(int, u_int);
+int dkcksum(struct disklabel *);
+int edit_parts(int, ptable_t *);
+void *disk_read(int, u_int, u_int);
+void disk_write(int, u_int, u_int, void *);
+char *get_id(void);
+void get_termcap(void);
+int lex(int *);
+int show_parts(ptable_t *, int);
+void update_disk(ptable_t *, int, int);
int
main(argc, argv)
diff --git a/sys/arch/atari/stand/installboot/disklabel.c b/sys/arch/atari/stand/installboot/disklabel.c
index 46b2127e567..895032b2fb0 100644
--- a/sys/arch/atari/stand/installboot/disklabel.c
+++ b/sys/arch/atari/stand/installboot/disklabel.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.3 2009/01/06 13:35:30 tsutsui Exp $ */
+/* $NetBSD: disklabel.c,v 1.4 2009/03/14 14:45:57 dsl Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -56,12 +56,12 @@ struct ahdilabel {
struct ahdi_part *parts;
};
-u_int dkcksum __P((struct disklabel *));
-u_int32_t readdisklabel __P((char *, struct disklabel *));
+u_int dkcksum(struct disklabel *);
+u_int32_t readdisklabel(char *, struct disklabel *);
-static int bsd_label __P((int, off_t, struct disklabel *));
-static int ahdi_label __P((int, u_int32_t *, struct disklabel *));
-static int ahdi_getparts __P((int, daddr_t, daddr_t, struct ahdilabel *));
+static int bsd_label(int, off_t, struct disklabel *);
+static int ahdi_label(int, u_int32_t *, struct disklabel *);
+static int ahdi_getparts(int, daddr_t, daddr_t, struct ahdilabel *);
u_int
dkcksum (dl)
diff --git a/sys/arch/atari/stand/installboot/installboot.c b/sys/arch/atari/stand/installboot/installboot.c
index 276b2e51ac8..c1174aceab6 100644
--- a/sys/arch/atari/stand/installboot/installboot.c
+++ b/sys/arch/atari/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.c,v 1.22 2009/01/06 13:35:30 tsutsui Exp $ */
+/* $NetBSD: installboot.c,v 1.23 2009/03/14 14:45:57 dsl Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -53,18 +53,18 @@
#include "installboot.h"
-static void usage __P((void));
-static void oscheck __P((void));
-static u_int abcksum __P((void *));
-static void setNVpref __P((void));
-static void setIDEpar __P((u_int8_t *, size_t));
-static void mkahdiboot __P((struct ahdi_root *, char *,
- char *, u_int32_t));
-static void mkbootblock __P((struct bootblock *, char *,
- char *, struct disklabel *, u_int));
-static void install_fd __P((char *, struct disklabel *));
-static void install_sd __P((char *, struct disklabel *));
-static void install_wd __P((char *, struct disklabel *));
+static void usage(void);
+static void oscheck(void);
+static u_int abcksum(void *);
+static void setNVpref(void);
+static void setIDEpar(u_int8_t *, size_t);
+static void mkahdiboot(struct ahdi_root *, char *,
+ char *, u_int32_t);
+static void mkbootblock(struct bootblock *, char *,
+ char *, struct disklabel *, u_int);
+static void install_fd(char *, struct disklabel *);
+static void install_sd(char *, struct disklabel *);
+static void install_wd(char *, struct disklabel *);
static struct bootblock bootarea;
static struct ahdi_root ahdiboot;
diff --git a/sys/arch/atari/stand/installboot/installboot.h b/sys/arch/atari/stand/installboot/installboot.h
index 7fe4f6fd1b3..3ecb9786de6 100644
--- a/sys/arch/atari/stand/installboot/installboot.h
+++ b/sys/arch/atari/stand/installboot/installboot.h
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.h,v 1.9 2009/01/06 13:35:30 tsutsui Exp $ */
+/* $NetBSD: installboot.h,v 1.10 2009/03/14 14:45:57 dsl Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens
@@ -45,5 +45,5 @@
*/
#define BOOTVERSION 0x03
-u_int dkcksum __P((struct disklabel *));
-u_int32_t readdisklabel __P((char *, struct disklabel *));
+u_int dkcksum(struct disklabel *);
+u_int32_t readdisklabel(char *, struct disklabel *);
diff --git a/sys/arch/atari/stand/libsa/atari_stand.h b/sys/arch/atari/stand/libsa/atari_stand.h
index a545d834636..833bab18d57 100644
--- a/sys/arch/atari/stand/libsa/atari_stand.h
+++ b/sys/arch/atari/stand/libsa/atari_stand.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atari_stand.h,v 1.1 1997/06/28 21:36:44 leo Exp $ */
+/* $NetBSD: atari_stand.h,v 1.2 2009/03/14 14:45:57 dsl Exp $ */
/*
* Copyright (c) 1997 Leo Weppelman.
@@ -31,4 +31,4 @@
*/
/* NetBSD/Atari specific functions */
-int init_dskio __P((void *, void *, int));
+int init_dskio(void *, void *, int);
diff --git a/sys/arch/atari/stand/libsa/diskio.c b/sys/arch/atari/stand/libsa/diskio.c
index 0623641b804..c2305305617 100644
--- a/sys/arch/atari/stand/libsa/diskio.c
+++ b/sys/arch/atari/stand/libsa/diskio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: diskio.c,v 1.5 2006/08/04 01:50:30 mhitch Exp $ */
+/* $NetBSD: diskio.c,v 1.6 2009/03/14 14:45:57 dsl Exp $ */
/*
* Copyright (c) 1995 Waldi Ravens.
@@ -34,13 +34,13 @@
#include "atari_stand.h"
#include <sys/disklabel.h>
-typedef int (*rdsec_f)__P((void *buffer, u_int offset, u_int count));
+typedef int (*rdsec_f)(void *buffer, u_int offset, u_int count);
typedef struct { rdsec_f rds; u_int rst; u_int rend; } bdevd_t;
-static int rootstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-static int rootopen __P((struct open_file *, ...));
-static int rootclose __P((struct open_file *));
-static int rootioctl __P((struct open_file *, u_long, void *));
+static int rootstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+static int rootopen(struct open_file *, ...);
+static int rootclose(struct open_file *);
+static int rootioctl(struct open_file *, u_long, void *);
struct devsw devsw[] = {
{ "root", rootstrategy, rootopen, rootclose, rootioctl }
diff --git a/sys/arch/atari/stand/loadkmap/loadkmap.c b/sys/arch/atari/stand/loadkmap/loadkmap.c
index ac6186273a7..9bb224b9342 100644
--- a/sys/arch/atari/stand/loadkmap/loadkmap.c
+++ b/sys/arch/atari/stand/loadkmap/loadkmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: loadkmap.c,v 1.4 2006/08/04 01:51:31 mhitch Exp $ */
+/* $NetBSD: loadkmap.c,v 1.5 2009/03/14 14:45:57 dsl Exp $ */
#include <sys/types.h>
#include <sys/stat.h>
@@ -9,7 +9,7 @@
#include <stdlib.h>
-int load_kmap __P((const char *, int));
+int load_kmap(const char *, int);
int dump_kmap();
int
diff --git a/sys/arch/atari/stand/tostools/libtos/cread.c b/sys/arch/atari/stand/tostools/libtos/cread.c
index 940668d4ef8..4f77596a878 100644
--- a/sys/arch/atari/stand/tostools/libtos/cread.c
+++ b/sys/arch/atari/stand/tostools/libtos/cread.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cread.c,v 1.4 2005/12/11 12:17:00 christos Exp $ */
+/* $NetBSD: cread.c,v 1.5 2009/03/14 14:45:57 dsl Exp $ */
/*
* Copyright (c) 1996
@@ -83,14 +83,14 @@ static struct sd {
int compressed; /* 1 if input file is a .gz file */
} *ss[SOPEN_MAX];
-static int get_byte __P((struct sd *));
-static unsigned long getLong __P((struct sd *));
-static void check_header __P((struct sd *));
+static int get_byte(struct sd *);
+static unsigned long getLong(struct sd *);
+static void check_header(struct sd *);
/* XXX - find suitable headerf ile for these: */
-void *zcalloc __P((void *, unsigned int, unsigned int));
-void zcfree __P((void *, void *));
-void zmemcpy __P((unsigned char *, unsigned char *, unsigned int));
+void *zcalloc(void *, unsigned int, unsigned int);
+void zcfree(void *, void *);
+void zmemcpy(unsigned char *, unsigned char *, unsigned int);
/*
diff --git a/sys/arch/atari/vme/et4000.c b/sys/arch/atari/vme/et4000.c
index b90d0f4f59a..4ec03dfdc81 100644
--- a/sys/arch/atari/vme/et4000.c
+++ b/sys/arch/atari/vme/et4000.c
@@ -1,4 +1,4 @@
-/* $NetBSD: et4000.c,v 1.15 2008/06/11 14:35:53 tsutsui Exp $ */
+/* $NetBSD: et4000.c,v 1.16 2009/03/14 14:45:57 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.15 2008/06/11 14:35:53 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.16 2009/03/14 14:45:57 dsl Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -76,18 +76,18 @@ __KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.15 2008/06/11 14:35:53 tsutsui Exp $");
#define VGA_MAPPABLE (128 * 1024) /* 0x20000 */
#define VGA_BASE 0xa0000
-static int et_vme_match __P((struct device *, struct cfdata *, void *));
-static void et_vme_attach __P((struct device *, struct device *, void *));
-static int et_probe_addresses __P((struct vme_attach_args *));
-static void et_start __P((bus_space_tag_t *, bus_space_handle_t *, int *,
- u_char *));
-static void et_stop __P((bus_space_tag_t *, bus_space_handle_t *, int *,
- u_char *));
-static int et_detect __P((bus_space_tag_t *, bus_space_tag_t *,
- bus_space_handle_t *, bus_space_handle_t *, u_int));
-
-int eton __P((dev_t));
-int etoff __P((dev_t));
+static int et_vme_match(struct device *, struct cfdata *, void *);
+static void et_vme_attach(struct device *, struct device *, void *);
+static int et_probe_addresses(struct vme_attach_args *);
+static void et_start(bus_space_tag_t *, bus_space_handle_t *, int *,
+ u_char *);
+static void et_stop(bus_space_tag_t *, bus_space_handle_t *, int *,
+ u_char *);
+static int et_detect(bus_space_tag_t *, bus_space_tag_t *,
+ bus_space_handle_t *, bus_space_handle_t *, u_int);
+
+int eton(dev_t);
+int etoff(dev_t);
/* Register and screen memory addresses for ET4000 based VME cards */
static struct et_addresses {
diff --git a/sys/arch/atari/vme/leo.c b/sys/arch/atari/vme/leo.c
index 42fa5e7b9d4..d6448b5de61 100644
--- a/sys/arch/atari/vme/leo.c
+++ b/sys/arch/atari/vme/leo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: leo.c,v 1.13 2008/06/13 08:50:12 cegger Exp $ */
+/* $NetBSD: leo.c,v 1.14 2009/03/14 14:45:57 dsl Exp $ */
/*-
* Copyright (c) 1997 maximum entropy <entropy@zippy.bernstein.com>
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.13 2008/06/13 08:50:12 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.14 2009/03/14 14:45:57 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -88,13 +88,13 @@ struct leo_softc {
#define LEO_SC_FLAGS_INUSE 1
-static int leo_match __P((struct device *, struct cfdata *, void *));
-static void leo_attach __P((struct device *, struct device *, void *));
-static int leo_probe __P((bus_space_tag_t *, bus_space_tag_t *,
+static int leo_match(struct device *, struct cfdata *, void *);
+static void leo_attach(struct device *, struct device *, void *);
+static int leo_probe(bus_space_tag_t *, bus_space_tag_t *,
bus_space_handle_t *, bus_space_handle_t *,
- u_int, u_int));
-static int leo_init __P((struct leo_softc *, int));
-static int leo_scroll __P((struct leo_softc *, int));
+ u_int, u_int);
+static int leo_init(struct leo_softc *, int);
+static int leo_scroll(struct leo_softc *, int);
CFATTACH_DECL(leo, sizeof(struct leo_softc),
leo_match, leo_attach, NULL, NULL);
diff --git a/sys/arch/atari/vme/vme.c b/sys/arch/atari/vme/vme.c
index d3a5360a9c4..4e857c379ad 100644
--- a/sys/arch/atari/vme/vme.c
+++ b/sys/arch/atari/vme/vme.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme.c,v 1.13 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: vme.c,v 1.14 2009/03/14 14:45:57 dsl Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.13 2008/04/28 20:23:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.14 2009/03/14 14:45:57 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -40,15 +40,15 @@ __KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.13 2008/04/28 20:23:15 martin Exp $");
#include <atari/vme/vmevar.h>
-int vmematch __P((struct device *, struct cfdata *, void *));
-void vmeattach __P((struct device *, struct device *, void *));
-int vmeprint __P((void *, const char *));
+int vmematch(struct device *, struct cfdata *, void *);
+void vmeattach(struct device *, struct device *, void *);
+int vmeprint(void *, const char *);
CFATTACH_DECL(vme, sizeof(struct vme_softc),
vmematch, vmeattach, NULL, NULL);
-int vmesearch __P((struct device *, struct cfdata *,
- const int *, void *));
+int vmesearch(struct device *, struct cfdata *,
+ const int *, void *);
int
vmematch(parent, cf, aux)
diff --git a/sys/arch/atari/vme/vme_machdep.c b/sys/arch/atari/vme/vme_machdep.c
index ffb4bb348a4..6c5d37e2870 100644
--- a/sys/arch/atari/vme/vme_machdep.c
+++ b/sys/arch/atari/vme/vme_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vme_machdep.c,v 1.15 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: vme_machdep.c,v 1.16 2009/03/14 14:45:57 dsl Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.15 2008/04/28 20:23:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.16 2009/03/14 14:45:57 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -46,9 +46,9 @@ __KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.15 2008/04/28 20:23:15 martin Exp
#include <atari/atari/device.h>
#include <atari/vme/vmevar.h>
-static int vmebusprint __P((void *auxp, const char *));
-static int vmebusmatch __P((struct device *, struct cfdata *, void *));
-static void vmebusattach __P((struct device *, struct device *, void *));
+static int vmebusprint(void *auxp, const char *);
+static int vmebusmatch(struct device *, struct cfdata *, void *);
+static void vmebusattach(struct device *, struct device *, void *);
CFATTACH_DECL(avmebus, sizeof(struct device),
vmebusmatch, vmebusattach, NULL, NULL);
diff --git a/sys/arch/bebox/include/bootinfo.h b/sys/arch/bebox/include/bootinfo.h
index 20a43c19241..b6bae787618 100644
--- a/sys/arch/bebox/include/bootinfo.h
+++ b/sys/arch/bebox/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.4 2005/12/11 12:17:03 christos Exp $ */
+/* $NetBSD: bootinfo.h,v 1.5 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1997
@@ -56,7 +56,7 @@ struct btinfo_clock {
};
#ifdef _KERNEL
-void *lookup_bootinfo __P((int));
+void *lookup_bootinfo(int);
#endif
#define BOOTINFO_MAXSIZE 0xd0
diff --git a/sys/arch/bebox/include/powerpc.h b/sys/arch/bebox/include/powerpc.h
index 1423f283383..57926a4ea8b 100644
--- a/sys/arch/bebox/include/powerpc.h
+++ b/sys/arch/bebox/include/powerpc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc.h,v 1.7 2007/10/17 19:54:00 garbled Exp $ */
+/* $NetBSD: powerpc.h,v 1.8 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -45,7 +45,7 @@ void mem_regions(struct mem_region **, struct mem_region **);
*
* Not sure whether boot itself should be implementation dependent instead. XXX
*/
-void ppc_exit __P((void)) __attribute__((__noreturn__));
-void ppc_boot __P((char *bootspec)) __attribute__((__noreturn__));
+void ppc_exit(void) __attribute__((__noreturn__));
+void ppc_boot(char *bootspec) __attribute__((__noreturn__));
#endif /* _MACHINE_POWERPC_H_ */
diff --git a/sys/arch/bebox/stand/boot/cons.h b/sys/arch/bebox/stand/boot/cons.h
index e726cb9048d..b3e5a3c1c2b 100644
--- a/sys/arch/bebox/stand/boot/cons.h
+++ b/sys/arch/bebox/stand/boot/cons.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.h,v 1.6 2005/12/11 12:17:04 christos Exp $ */
+/* $NetBSD: cons.h,v 1.7 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -81,15 +81,15 @@ struct consdev {
int address; /* address */
int speed; /* speed(serial only) */
void (*cn_probe) /* probe hardware and fill in consdev info */
- __P((struct consdev *));
+(struct consdev *);
void (*cn_init) /* turn on as console */
- __P((struct consdev *));
+(struct consdev *);
int (*cn_getc) /* getchar interface */
- __P((void *));
+(void *);
void (*cn_putc) /* putchar interface */
- __P((void *, int));
+(void *, int);
int (*cn_scan) /* scan interface */
- __P((void *));
+(void *);
int cn_pri; /* pecking order; the higher the better */
void *cn_dev; /* device data tag */
};
diff --git a/sys/arch/bebox/stand/boot/ns16550.h b/sys/arch/bebox/stand/boot/ns16550.h
index acb125a204c..4afe28a238a 100644
--- a/sys/arch/bebox/stand/boot/ns16550.h
+++ b/sys/arch/bebox/stand/boot/ns16550.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ns16550.h,v 1.4 1999/06/28 01:20:45 sakamoto Exp $ */
+/* $NetBSD: ns16550.h,v 1.5 2009/03/14 14:45:58 dsl Exp $ */
/*-
* Copyright (C) 1995-1997 Gary Thomas (gdt@linuxppc.org)
@@ -66,8 +66,8 @@ struct NS16550
#define COM3 0x380
#define COM4 0x388
-extern volatile struct NS16550 *NS16550_init __P((int, int));
-extern void NS16550_putc __P((volatile struct NS16550 *, int));
-extern int NS16550_getc __P((volatile struct NS16550 *));
-extern int NS16550_scankbd __P((volatile struct NS16550 *));
-extern int NS16550_test __P((volatile struct NS16550 *));
+extern volatile struct NS16550 *NS16550_init(int, int);
+extern void NS16550_putc(volatile struct NS16550 *, int);
+extern int NS16550_getc(volatile struct NS16550 *);
+extern int NS16550_scankbd(volatile struct NS16550 *);
+extern int NS16550_test(volatile struct NS16550 *);
diff --git a/sys/arch/cats/pci/pcib.c b/sys/arch/cats/pci/pcib.c
index ccd77b700af..869eb8f13bb 100644
--- a/sys/arch/cats/pci/pcib.c
+++ b/sys/arch/cats/pci/pcib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.9 2008/04/28 20:23:15 martin Exp $ */
+/* $NetBSD: pcib.c,v 1.10 2009/03/14 14:45:58 dsl Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.9 2008/04/28 20:23:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.10 2009/03/14 14:45:58 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,13 +49,13 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.9 2008/04/28 20:23:15 martin Exp $");
#include "isadma.h"
-int pcibmatch __P((struct device *, struct cfdata *, void *));
-void pcibattach __P((struct device *, struct device *, void *));
+int pcibmatch(struct device *, struct cfdata *, void *);
+void pcibattach(struct device *, struct device *, void *);
CFATTACH_DECL(pcib, sizeof(struct device),
pcibmatch, pcibattach, NULL, NULL);
-void pcib_callback __P((struct device *));
+void pcib_callback(struct device *);
int
pcibmatch(parent, match, aux)
diff --git a/sys/arch/cats/pci/pciide_machdep.c b/sys/arch/cats/pci/pciide_machdep.c
index 5b7c011e72c..86d46ed9a24 100644
--- a/sys/arch/cats/pci/pciide_machdep.c
+++ b/sys/arch/cats/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.4 2005/12/11 12:17:04 christos Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.5 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.4 2005/12/11 12:17:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.5 2009/03/14 14:45:58 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
struct device *dev;
struct pci_attach_args *pa;
int chan;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
#if NISA > 0
diff --git a/sys/arch/cesfic/cesfic/autoconf.c b/sys/arch/cesfic/cesfic/autoconf.c
index 79d91a6dc0e..3efb570dd29 100644
--- a/sys/arch/cesfic/cesfic/autoconf.c
+++ b/sys/arch/cesfic/cesfic/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.19 2008/06/22 16:34:15 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.20 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1997, 1999
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2008/06/22 16:34:15 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2009/03/14 14:45:58 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,10 +57,10 @@ u_int bootdev;
struct evcnt evcnt_fpsp_unimp, evcnt_fpsp_unsupp;
-int mainbusmatch __P((struct device *, struct cfdata *, void *));
-void mainbusattach __P((struct device *, struct device *, void *));
-int mainbussearch __P((struct device *, struct cfdata *,
- const int *, void *));
+int mainbusmatch(struct device *, struct cfdata *, void *);
+void mainbusattach(struct device *, struct device *, void *);
+int mainbussearch(struct device *, struct cfdata *,
+ const int *, void *);
CFATTACH_DECL(mainbus, sizeof(struct device),
mainbusmatch, mainbusattach, NULL, NULL);
diff --git a/sys/arch/cesfic/cesfic/isr.c b/sys/arch/cesfic/cesfic/isr.c
index 1940ce8d283..86f06e3e750 100644
--- a/sys/arch/cesfic/cesfic/isr.c
+++ b/sys/arch/cesfic/cesfic/isr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.c,v 1.10 2008/06/22 16:34:15 tsutsui Exp $ */
+/* $NetBSD: isr.c,v 1.11 2009/03/14 14:45:58 dsl Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.10 2008/06/22 16:34:15 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.11 2009/03/14 14:45:58 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -69,7 +69,7 @@ isrinit()
*/
void *
isrlink(func, arg, ipl, priority)
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
int ipl;
int priority;
diff --git a/sys/arch/cesfic/cesfic/isr.h b/sys/arch/cesfic/cesfic/isr.h
index ac906df5c15..8070f936b5d 100644
--- a/sys/arch/cesfic/cesfic/isr.h
+++ b/sys/arch/cesfic/cesfic/isr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.h,v 1.3 2008/06/22 16:34:15 tsutsui Exp $ */
+/* $NetBSD: isr.h,v 1.4 2009/03/14 14:45:58 dsl Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
struct isr {
LIST_ENTRY(isr) isr_link;
- int (*isr_func) __P((void *));
+ int (*isr_func)(void *);
void *isr_arg;
int isr_ipl;
int isr_priority;
@@ -63,7 +63,7 @@ struct isr {
#define PSLTOIPL(x) (((x) >> 8) & 0xf)
#define IPLTOPSL(x) ((((x) & 0xf) << 8) | PSL_S)
-void isrinit __P((void));
-void *isrlink __P((int (*)(void *), void *, int, int));
-void isrunlink __P((void *));
-void isrdispatch __P((int));
+void isrinit(void);
+void *isrlink(int (*)(void *), void *, int, int);
+void isrunlink(void *);
+void isrdispatch(int);
diff --git a/sys/arch/cesfic/cesfic/machdep.c b/sys/arch/cesfic/cesfic/machdep.c
index 53dd85ac088..4c00a6a4ea8 100644
--- a/sys/arch/cesfic/cesfic/machdep.c
+++ b/sys/arch/cesfic/cesfic/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.46 2009/01/17 07:17:35 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.47 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2009/01/17 07:17:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2009/03/14 14:45:58 dsl Exp $");
#include "opt_bufcache.h"
#include "opt_ddb.h"
@@ -163,21 +163,21 @@ int safepri = PSL_LOWIPL;
extern u_int lowram;
-void fic_init __P((void));
+void fic_init(void);
/* prototypes for local functions */
-void identifycpu __P((void));
-void dumpmem __P((int *, int, int));
-char *hexstr __P((int, int));
+void identifycpu(void);
+void dumpmem(int *, int, int);
+char *hexstr(int, int);
/* functions called from locore.s */
-void dumpsys __P((void));
-void straytrap __P((int, u_short));
-void nmihand __P((struct frame));
+void dumpsys(void);
+void straytrap(int, u_short);
+void nmihand(struct frame);
int delay_divisor; /* delay constant */
-extern void sicinit __P((void*));
+extern void sicinit(void*);
void fic_init()
{
@@ -228,14 +228,14 @@ zs_check_kgdb(cs, dev)
return (0);
}
-void zs_kgdb_cnputc __P((dev_t, int));
+void zs_kgdb_cnputc(dev_t, int);
void zs_kgdb_cnputc(dev, c)
dev_t dev;
int c;
{
zscnputc(dev, c);
}
-int zs_kgdb_cngetc __P((dev_t));
+int zs_kgdb_cngetc(dev_t);
int zs_kgdb_cngetc(dev)
dev_t dev;
{
@@ -247,7 +247,7 @@ dev_t dev;
* before vm init or startup. Do enough configuration
* to choose and initialize a console.
*/
-extern void sic_enable_int __P((int, int, int, int, int));
+extern void sic_enable_int(int, int, int, int, int);
void
consinit()
{
@@ -513,7 +513,7 @@ dumpsys()
const struct bdevsw *bdev;
daddr_t blkno; /* current block to write */
/* dump routine */
- int (*dump) __P((dev_t, daddr_t, void *, size_t));
+ int (*dump)(dev_t, daddr_t, void *, size_t);
int pg; /* page being dumped */
vm_offset_t maddr; /* PA being dumped */
int error; /* error code from (*dump)() */
@@ -640,7 +640,7 @@ badbaddr(addr)
int panicbutton = 1; /* non-zero if panic buttons are enabled */
int candbdiv = 2; /* give em half a second (hz / candbdiv) */
-void candbtimer __P((void *));
+void candbtimer(void *);
int crashandburn;
diff --git a/sys/arch/cesfic/cesfic/pmap_bootstrap.c b/sys/arch/cesfic/cesfic/pmap_bootstrap.c
index 16cdca8d833..0fda0ac0d9d 100644
--- a/sys/arch/cesfic/cesfic/pmap_bootstrap.c
+++ b/sys/arch/cesfic/cesfic/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.14 2009/01/17 07:17:35 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.15 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.14 2009/01/17 07:17:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.15 2009/03/14 14:45:58 dsl Exp $");
#include <sys/param.h>
#include <sys/msgbuf.h>
@@ -58,7 +58,7 @@ extern paddr_t avail_start, avail_end;
extern int physmem;
-void pmap_bootstrap __P((vm_offset_t, vm_offset_t));
+void pmap_bootstrap(vm_offset_t, vm_offset_t);
/*
* Special purpose kernel virtual addresses, used for mapping
diff --git a/sys/arch/cesfic/cesfic/sic6351.c b/sys/arch/cesfic/cesfic/sic6351.c
index 3deef88bfe9..fcaa8258fd1 100644
--- a/sys/arch/cesfic/cesfic/sic6351.c
+++ b/sys/arch/cesfic/cesfic/sic6351.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sic6351.c,v 1.3 2005/12/11 12:17:04 christos Exp $ */
+/* $NetBSD: sic6351.c,v 1.4 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1997, 1999
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sic6351.c,v 1.3 2005/12/11 12:17:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sic6351.c,v 1.4 2009/03/14 14:45:58 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -35,9 +35,9 @@ __KERNEL_RCSID(0, "$NetBSD: sic6351.c,v 1.3 2005/12/11 12:17:04 christos Exp $")
#include <machine/cpu.h>
#include <machine/pte.h>
-void sicinit __P((void*));
-int act2icr __P((int));
-void sic_enable_int __P((int, int, int, int, int));
+void sicinit(void*);
+int act2icr(int);
+void sic_enable_int(int, int, int, int, int);
static char *sicbase;
diff --git a/sys/arch/cesfic/cesfic/trap.c b/sys/arch/cesfic/cesfic/trap.c
index ad596e29fc9..af63d48d81e 100644
--- a/sys/arch/cesfic/cesfic/trap.c
+++ b/sys/arch/cesfic/cesfic/trap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.43 2009/01/27 20:30:13 martin Exp $ */
+/* $NetBSD: trap.c,v 1.44 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.43 2009/01/27 20:30:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.44 2009/03/14 14:45:58 dsl Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -122,18 +122,18 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.43 2009/01/27 20:30:13 martin Exp $");
extern struct emul emul_sunos;
#endif
-int writeback __P((struct frame *fp, int docachepush));
-void trap __P((struct frame *fp, int type, u_int code, u_int v));
-void syscall __P((register_t code, struct frame frame));
-void trap_kdebug __P((int, struct trapframe));
+int writeback(struct frame *fp, int docachepush);
+void trap(struct frame *fp, int type, u_int code, u_int v);
+void syscall(register_t code, struct frame frame);
+void trap_kdebug(int, struct trapframe);
#ifdef DEBUG
-void dumpssw __P((u_short));
-void dumpwb __P((int, u_short, u_int, u_int));
+void dumpssw(u_short);
+void dumpwb(int, u_short, u_int, u_int);
#endif
-static inline void userret __P((struct lwp *l, struct frame *fp,
- u_quad_t oticks, u_int faultaddr, int fromtrap));
+static inline void userret(struct lwp *l, struct frame *fp,
+ u_quad_t oticks, u_int faultaddr, int fromtrap);
int astpending;
diff --git a/sys/arch/cesfic/dev/zsvar.h b/sys/arch/cesfic/dev/zsvar.h
index 826667940b4..c217efe4486 100644
--- a/sys/arch/cesfic/dev/zsvar.h
+++ b/sys/arch/cesfic/dev/zsvar.h
@@ -1,16 +1,16 @@
-/* $NetBSD: zsvar.h,v 1.1 2001/05/14 18:23:08 drochner Exp $ */
+/* $NetBSD: zsvar.h,v 1.2 2009/03/14 14:45:58 dsl Exp $ */
#define ZS_DELAY()
-int zscngetc __P((dev_t));
-void zscnputc __P((dev_t, int));
-void zscnpollc __P((dev_t, int));
+int zscngetc(dev_t);
+void zscnputc(dev_t, int);
+void zscnpollc(dev_t, int);
-void zs_cnattach __P((void *));
-void zs_cninit __P((void *));
+void zs_cnattach(void *);
+void zs_cninit(void *);
-void zs_config __P((struct zsc_softc *, char*));
+void zs_config(struct zsc_softc *, char*);
-int zshard __P((void*));
+int zshard(void*);
#define ZSHARD_PRI 4
diff --git a/sys/arch/cesfic/include/autoconf.h b/sys/arch/cesfic/include/autoconf.h
index 6c6af58d0e5..61ffe5a3bd9 100644
--- a/sys/arch/cesfic/include/autoconf.h
+++ b/sys/arch/cesfic/include/autoconf.h
@@ -1,9 +1,9 @@
-/* $NetBSD: autoconf.h,v 1.1 2001/05/14 18:23:09 drochner Exp $ */
+/* $NetBSD: autoconf.h,v 1.2 2009/03/14 14:45:58 dsl Exp $ */
#ifdef _KERNEL
-int mainbus_map __P((u_long, int, int, void**));
+int mainbus_map(u_long, int, int, void**);
-int cesfic_getetheraddr __P((unsigned char *));
+int cesfic_getetheraddr(unsigned char *);
#endif /* _KERNEL */
diff --git a/sys/arch/cesfic/include/cpu.h b/sys/arch/cesfic/include/cpu.h
index cb9258f89f3..4d74918e4f9 100644
--- a/sys/arch/cesfic/include/cpu.h
+++ b/sys/arch/cesfic/include/cpu.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.21 2008/02/27 18:26:15 xtraeme Exp $ */
+/* $NetBSD: cpu.h,v 1.22 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -180,19 +180,19 @@ extern int astpending; /* need to trap before returning to user mode */
struct fpframe;
/* locore.s functions */
-void m68881_save __P((struct fpframe *));
-void m68881_restore __P((struct fpframe *));
-int suline __P((void *, void *));
-void loadustp __P((int));
+void m68881_save(struct fpframe *);
+void m68881_restore(struct fpframe *);
+int suline(void *, void *);
+void loadustp(int);
-void doboot __P((void))
+void doboot(void)
__attribute__((__noreturn__));
/* machdep.c functions */
-int badaddr __P((void *));
-int badbaddr __P((void *));
+int badaddr(void *);
+int badbaddr(void *);
-void kgdb_panic __P((void));
+void kgdb_panic(void);
/* what is this supposed to do? i.e. how is it different than startrtclock? */
#define enablertclock()
diff --git a/sys/arch/cesfic/include/intr.h b/sys/arch/cesfic/include/intr.h
index 3dd685f451d..04c34ae5de5 100644
--- a/sys/arch/cesfic/include/intr.h
+++ b/sys/arch/cesfic/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.10 2008/06/22 16:34:15 tsutsui Exp $ */
+/* $NetBSD: intr.h,v 1.11 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -106,7 +106,7 @@
/* watch out for side effects */
#define splx(s) (s & PSL_IPL ? _spl(s) : spl0())
-int spl0 __P((void));
+int spl0(void);
#define IPL_NONE 0
#define IPL_SOFTCLOCK 1
diff --git a/sys/arch/cesfic/include/param.h b/sys/arch/cesfic/include/param.h
index 8b7c1b7e861..f0be0b7ef8f 100644
--- a/sys/arch/cesfic/include/param.h
+++ b/sys/arch/cesfic/include/param.h
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.7 2005/12/11 12:17:05 christos Exp $ */
+/* $NetBSD: param.h,v 1.8 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -130,5 +130,5 @@
#define delay(us) _delay((us) << 8)
#define DELAY(us) delay(us)
-void _delay __P((u_int));
+void _delay(u_int);
#endif /* _KERNEL && !_LOCORE */
diff --git a/sys/arch/cobalt/include/bootinfo.h b/sys/arch/cobalt/include/bootinfo.h
index 343a790468a..f47f95372f6 100644
--- a/sys/arch/cobalt/include/bootinfo.h
+++ b/sys/arch/cobalt/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.6 2007/10/17 19:54:08 garbled Exp $ */
+/* $NetBSD: bootinfo.h,v 1.7 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1997, 2000-2004
@@ -75,7 +75,7 @@ struct btinfo_howto {
};
#ifdef _KERNEL
-void *lookup_bootinfo __P((int));
+void *lookup_bootinfo(int);
#endif
#endif /* !_COBALT_BOOTINFO_H_ */
diff --git a/sys/arch/cobalt/stand/boot/cons.h b/sys/arch/cobalt/stand/boot/cons.h
index c430bbc310b..573c949bfe6 100644
--- a/sys/arch/cobalt/stand/boot/cons.h
+++ b/sys/arch/cobalt/stand/boot/cons.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.h,v 1.3 2005/12/11 12:17:06 christos Exp $ */
+/* $NetBSD: cons.h,v 1.4 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -81,15 +81,15 @@ struct consdev {
int address; /* address */
int speed; /* speed(serial only) */
void (*cn_probe) /* probe hardware and fill in consdev info */
- __P((struct consdev *));
+(struct consdev *);
void (*cn_init) /* turn on as console */
- __P((struct consdev *));
+(struct consdev *);
int (*cn_getc) /* getchar interface */
- __P((void *));
+(void *);
void (*cn_putc) /* putchar interface */
- __P((void *, int));
+(void *, int);
int (*cn_scan) /* scan interface */
- __P((void *));
+(void *);
int cn_pri; /* pecking order; the higher the better */
void *cn_dev; /* device data tag */
};
diff --git a/sys/arch/evbarm/ixdp425/ixdp425_machdep.c b/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
index 7f0703ad4db..d82535951fd 100644
--- a/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
+++ b/sys/arch/evbarm/ixdp425/ixdp425_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_machdep.c,v 1.20 2008/11/30 18:21:33 martin Exp $ */
+/* $NetBSD: ixdp425_machdep.c,v 1.21 2009/03/14 14:45:58 dsl Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.20 2008/11/30 18:21:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.21 2009/03/14 14:45:58 dsl Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -188,7 +188,7 @@ struct user *proc0paddr;
/* Prototypes */
void consinit(void);
-u_int cpu_get_control __P((void));
+u_int cpu_get_control(void);
/*
* Define the default console speed for the board. This is generally
diff --git a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
index 43b53a13998..c46b6b8e841 100644
--- a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
+++ b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ixm1200_machdep.c,v 1.38 2009/02/13 22:41:01 apb Exp $ */
+/* $NetBSD: ixm1200_machdep.c,v 1.39 2009/03/14 14:45:59 dsl Exp $ */
/*
* Copyright (c) 2002, 2003
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.38 2009/02/13 22:41:01 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.39 2009/03/14 14:45:59 dsl Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -216,8 +216,8 @@ static vaddr_t ixp12x0_cc_base;
/* Prototypes */
-void consinit __P((void));
-u_int cpu_get_control __P((void));
+void consinit(void);
+u_int cpu_get_control(void);
void ixdp_ixp12x0_cc_setup(void);
diff --git a/sys/arch/evbarm/nslu2/nslu2_machdep.c b/sys/arch/evbarm/nslu2/nslu2_machdep.c
index 735ccc07067..852dab7f88c 100644
--- a/sys/arch/evbarm/nslu2/nslu2_machdep.c
+++ b/sys/arch/evbarm/nslu2/nslu2_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.10 2008/11/30 18:21:33 martin Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.11 2009/03/14 14:45:59 dsl Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.10 2008/11/30 18:21:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.11 2009/03/14 14:45:59 dsl Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -218,7 +218,7 @@ struct user *proc0paddr;
/* Prototypes */
void consinit(void);
-u_int cpu_get_control __P((void));
+u_int cpu_get_control(void);
/*
* Define the default console speed for the board. This is generally
diff --git a/sys/arch/evbarm/tsarm/isa/isa_machdep.c b/sys/arch/evbarm/tsarm/isa/isa_machdep.c
index 821d9724352..c08491444a2 100644
--- a/sys/arch/evbarm/tsarm/isa/isa_machdep.c
+++ b/sys/arch/evbarm/tsarm/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.4 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.5 2009/03/14 14:45:59 dsl Exp $ */
/*-
* Copyright (c) 1996-1998 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.4 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.5 2009/03/14 14:45:59 dsl Exp $");
#include "opt_irqstats.h"
@@ -152,7 +152,7 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
int irq;
int type;
int level;
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
{
int epirq = -1, i;
diff --git a/sys/arch/evbarm/tsarm/tspld.c b/sys/arch/evbarm/tsarm/tspld.c
index 35933711e45..8714d0a4e12 100644
--- a/sys/arch/evbarm/tsarm/tspld.c
+++ b/sys/arch/evbarm/tsarm/tspld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tspld.c,v 1.16 2009/01/01 03:34:42 kenh Exp $ */
+/* $NetBSD: tspld.c,v 1.17 2009/03/14 14:45:59 dsl Exp $ */
/*-
* Copyright (c) 2004 Jesse Off
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.16 2009/01/01 03:34:42 kenh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.17 2009/03/14 14:45:59 dsl Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -96,7 +96,7 @@ struct tspld_softc {
CFATTACH_DECL(tspld, sizeof(struct tspld_softc),
tspldmatch, tspldattach, NULL, NULL);
-void tspld_callback __P((struct device *));
+void tspld_callback(struct device *);
#define GPIO_GET(x) bus_space_read_4(sc->sc_iot, sc->sc_gpioh, \
(EP93XX_GPIO_ ## x))
diff --git a/sys/arch/evbppc/ev64260/autoconf.c b/sys/arch/evbppc/ev64260/autoconf.c
index 50d580b98f8..748fb6b3914 100644
--- a/sys/arch/evbppc/ev64260/autoconf.c
+++ b/sys/arch/evbppc/ev64260/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.10 2008/02/12 17:30:57 joerg Exp $ */
+/* $NetBSD: autoconf.c,v 1.11 2009/03/14 14:45:59 dsl Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2008/02/12 17:30:57 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.11 2009/03/14 14:45:59 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2008/02/12 17:30:57 joerg Exp $");
#include <sys/reboot.h>
#include <sys/device.h>
-void findroot __P((void));
+void findroot(void);
/*
* Determine i/o configuration for a machine.
@@ -62,7 +62,7 @@ void findroot __P((void));
void
cpu_configure()
{
- extern void init_interrupt __P((void));
+ extern void init_interrupt(void);
extintr_disable();
diff --git a/sys/arch/evbsh3/evbsh3/machdep.c b/sys/arch/evbsh3/evbsh3/machdep.c
index 9e9f17a386b..4d5bfc32cc1 100644
--- a/sys/arch/evbsh3/evbsh3/machdep.c
+++ b/sys/arch/evbsh3/evbsh3/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.63 2008/11/30 18:21:34 martin Exp $ */
+/* $NetBSD: machdep.c,v 1.64 2009/03/14 14:45:59 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.63 2008/11/30 18:21:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.64 2009/03/14 14:45:59 dsl Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -106,9 +106,9 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.63 2008/11/30 18:21:34 martin Exp $");
char machine[] = MACHINE; /* evbsh3 */
char machine_arch[] = MACHINE_ARCH; /* sh3eb or sh3el */
-void initSH3 __P((void *));
-void LoadAndReset __P((const char *));
-void XLoadAndReset __P((char *));
+void initSH3(void *);
+void LoadAndReset(const char *);
+void XLoadAndReset(char *);
/*
* Machine-dependent startup code
@@ -550,7 +550,7 @@ shpcmcia_memio_subregion(t, bsh, offset, size, nbshp)
* InitializeBsc
* : BSC(Bus State Controller)
*/
-void InitializeBsc __P((void));
+void InitializeBsc(void);
void
InitializeBsc()
diff --git a/sys/arch/hpcmips/include/bus_dma_hpcmips.h b/sys/arch/hpcmips/include/bus_dma_hpcmips.h
index 52113505116..f351cc8327b 100644
--- a/sys/arch/hpcmips/include/bus_dma_hpcmips.h
+++ b/sys/arch/hpcmips/include/bus_dma_hpcmips.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma_hpcmips.h,v 1.4 2005/12/11 12:17:33 christos Exp $ */
+/* $NetBSD: bus_dma_hpcmips.h,v 1.5 2009/03/14 14:45:59 dsl Exp $ */
/*-
* Copyright (c) 2001 TAKEMRUA Shin. All rights reserved.
@@ -73,9 +73,9 @@ struct bus_dmamap_hpcmips {
extern struct bus_dma_tag_hpcmips hpcmips_default_bus_dma_tag;
bus_dma_protos(_hpcmips)
-int _hpcmips_bd_mem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
+int _hpcmips_bd_mem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
- vaddr_t low, vaddr_t high));
+ vaddr_t low, vaddr_t high);
#endif /* _BUS_DMA_HPCMIPS_H_ */
diff --git a/sys/arch/hpcmips/stand/libsa/devopen.c b/sys/arch/hpcmips/stand/libsa/devopen.c
index 66f82a7d752..cc57943d7b1 100644
--- a/sys/arch/hpcmips/stand/libsa/devopen.c
+++ b/sys/arch/hpcmips/stand/libsa/devopen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.3 2000/01/16 03:07:24 takemura Exp $ */
+/* $NetBSD: devopen.c,v 1.4 2009/03/14 14:45:59 dsl Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@@ -41,8 +41,8 @@
#include <winfs.h>
#include <lib/libsa/ufs.h>
-extern int parsebootfile __P((const char *, char**, char**, unsigned int*,
- unsigned int*, const char**));
+extern int parsebootfile(const char *, char**, char**, unsigned int*,
+ unsigned int*, const char**);
struct devsw devsw[] = {
{"winblk", winblkstrategy, winblkopen, winblkclose, winblkioctl },
diff --git a/sys/arch/hpcmips/stand/libsa/winblk.h b/sys/arch/hpcmips/stand/libsa/winblk.h
index 095e33e718d..00beda2d7d7 100644
--- a/sys/arch/hpcmips/stand/libsa/winblk.h
+++ b/sys/arch/hpcmips/stand/libsa/winblk.h
@@ -1,4 +1,4 @@
-/* $NetBSD: winblk.h,v 1.2 2000/01/16 03:07:26 takemura Exp $ */
+/* $NetBSD: winblk.h,v 1.3 2009/03/14 14:45:59 dsl Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@@ -35,7 +35,7 @@
* SUCH DAMAGE.
*
*/
-int winblkstrategy __P((void*, int, daddr_t, size_t, void*, size_t*));
-int winblkopen __P((struct open_file*, ...));
-int winblkclose __P((struct open_file*));
-int winblkioctl __P((struct open_file*, u_long, void*));
+int winblkstrategy(void*, int, daddr_t, size_t, void*, size_t*);
+int winblkopen(struct open_file*, ...);
+int winblkclose(struct open_file*);
+int winblkioctl(struct open_file*, u_long, void*);
diff --git a/sys/arch/hpcmips/stand/libsa/winfs.h b/sys/arch/hpcmips/stand/libsa/winfs.h
index e2663318483..10ace59cd0f 100644
--- a/sys/arch/hpcmips/stand/libsa/winfs.h
+++ b/sys/arch/hpcmips/stand/libsa/winfs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: winfs.h,v 1.2 2000/01/16 03:07:27 takemura Exp $ */
+/* $NetBSD: winfs.h,v 1.3 2009/03/14 14:45:59 dsl Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@@ -35,11 +35,11 @@
* SUCH DAMAGE.
*
*/
-int win_open __P((char *path, struct open_file *f));
-int win_read __P((struct open_file *f,void *addr,
- size_t size, size_t *resid));
-int win_close __P((struct open_file *f));
-int win_write __P((struct open_file *f,void *addr,
- size_t size, size_t *resid));
-int win_stat __P((struct open_file *f, struct stat *sb));
-off_t win_seek __P((struct open_file *f, off_t offset, int where));
+int win_open(char *path, struct open_file *f);
+int win_read(struct open_file *f,void *addr,
+ size_t size, size_t *resid);
+int win_close(struct open_file *f);
+int win_write(struct open_file *f,void *addr,
+ size_t size, size_t *resid);
+int win_stat(struct open_file *f, struct stat *sb);
+off_t win_seek(struct open_file *f, off_t offset, int where);
diff --git a/sys/arch/hpcmips/stand/pbsdboot/pbsdboot.h b/sys/arch/hpcmips/stand/pbsdboot/pbsdboot.h
index 649ec8fbe14..4b18d09c728 100644
--- a/sys/arch/hpcmips/stand/pbsdboot/pbsdboot.h
+++ b/sys/arch/hpcmips/stand/pbsdboot/pbsdboot.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pbsdboot.h,v 1.11 2007/03/04 05:59:53 christos Exp $ */
+/* $NetBSD: pbsdboot.h,v 1.12 2009/03/14 14:45:59 dsl Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@@ -105,7 +105,7 @@ struct system_info {
DWORD si_pagesize;
unsigned char *si_asmcode;
int si_asmcodelen;
- int (*si_boot) __P((void *));
+ int (*si_boot)(void *);
int si_intrvec;
};
extern struct system_info system_info;
diff --git a/sys/arch/hpcmips/stand/pbsdboot/tx39xx.c b/sys/arch/hpcmips/stand/pbsdboot/tx39xx.c
index 1a782117a4f..418d4b54de6 100644
--- a/sys/arch/hpcmips/stand/pbsdboot/tx39xx.c
+++ b/sys/arch/hpcmips/stand/pbsdboot/tx39xx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tx39xx.c,v 1.6 2007/03/04 05:59:53 christos Exp $ */
+/* $NetBSD: tx39xx.c,v 1.7 2009/03/14 14:45:59 dsl Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura, UCHIYAMA Yasushi
@@ -40,7 +40,7 @@
extern void tx39xx_asm_code();
extern void tx39xx_asm_code_end();
-void tx39xx_asm_code_holder __P((void));
+void tx39xx_asm_code_holder(void);
#define TX39_SYSADDR_CONFIG_REG 0x10C00000
#define TX39_SYSADDR_CONFIG_REG_LEN 0x00200000
diff --git a/sys/arch/hpcmips/stand/pbsdboot/vr41xx.c b/sys/arch/hpcmips/stand/pbsdboot/vr41xx.c
index b138e52fb46..9e48000e4b8 100644
--- a/sys/arch/hpcmips/stand/pbsdboot/vr41xx.c
+++ b/sys/arch/hpcmips/stand/pbsdboot/vr41xx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vr41xx.c,v 1.5 2007/03/04 05:59:53 christos Exp $ */
+/* $NetBSD: vr41xx.c,v 1.6 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 1999 Shin Takemura.
@@ -39,7 +39,7 @@
extern void vr41xx_asm_code();
extern void vr41xx_asm_code_end();
-void vr41xx_asm_code_holder __P((void));
+void vr41xx_asm_code_holder(void);
void
vr41xx_init(SYSTEM_INFO *info)
diff --git a/sys/arch/hpcmips/vr/vrdsiu_mouse.c b/sys/arch/hpcmips/vr/vrdsiu_mouse.c
index 37f0d82afce..15e87c22c9d 100644
--- a/sys/arch/hpcmips/vr/vrdsiu_mouse.c
+++ b/sys/arch/hpcmips/vr/vrdsiu_mouse.c
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrdsiu_mouse.c,v 1.9 2007/03/04 05:59:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrdsiu_mouse.c,v 1.10 2009/03/14 14:46:00 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,20 +75,20 @@ struct vrdsiu_softc {
static int asimOld = 0;
-static int vrdsiu_match __P((struct device *, struct cfdata *, void *));
-static void vrdsiu_attach __P((struct device *, struct device *, void *));
+static int vrdsiu_match(struct device *, struct cfdata *, void *);
+static void vrdsiu_attach(struct device *, struct device *, void *);
-static void vrdsiu_write __P((struct vrdsiu_softc *, int, unsigned short));
-static unsigned short vrdsiu_read __P((struct vrdsiu_softc *, int));
+static void vrdsiu_write(struct vrdsiu_softc *, int, unsigned short);
+static unsigned short vrdsiu_read(struct vrdsiu_softc *, int);
/* Interrupt handlers */
-static int vrdsiu_intr __P((void *));
-static void vrdsiu_mouse_intr __P((struct vrdsiu_softc *));
+static int vrdsiu_intr(void *);
+static void vrdsiu_mouse_intr(struct vrdsiu_softc *);
/* Enable/disable DSIU handling */
-static int vrdsiu_mouse_enable __P((void *));
-static int vrdsiu_mouse_ioctl __P((void *, u_long, void *, int, struct lwp *));
-static void vrdsiu_mouse_disable __P((void *));
+static int vrdsiu_mouse_enable(void *);
+static int vrdsiu_mouse_ioctl(void *, u_long, void *, int, struct lwp *);
+static void vrdsiu_mouse_disable(void *);
/* wsmouse access ops */
const struct wsmouse_accessops vrdsiu_accessops = {
diff --git a/sys/arch/hpcsh/include/bus.h b/sys/arch/hpcsh/include/bus.h
index fdc6dbf4a4f..5b1d180a400 100644
--- a/sys/arch/hpcsh/include/bus.h
+++ b/sys/arch/hpcsh/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.16 2008/04/28 20:23:22 martin Exp $ */
+/* $NetBSD: bus.h,v 1.17 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -651,33 +651,33 @@ struct hpcsh_bus_dma_tag {
/*
* DMA mapping methods.
*/
- int (*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *));
- void (*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t));
- int (*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
- int (*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
- int (*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
- int (*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
- void (*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t));
- void (*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int));
+ int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
+ void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t);
+ int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+ int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+ int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+ int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+ void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
+ void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
/*
* DMA memory utility functions.
*/
- int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t,
- bus_size_t, bus_dma_segment_t *, int, int *, int));
- void (*_dmamem_free) __P((bus_dma_tag_t,
- bus_dma_segment_t *, int));
- int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, size_t, void **, int));
- void (*_dmamem_unmap) __P((bus_dma_tag_t, void *, size_t));
- paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, off_t, int, int));
+ int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
+ bus_size_t, bus_dma_segment_t *, int, int *, int);
+ void (*_dmamem_free)(bus_dma_tag_t,
+ bus_dma_segment_t *, int);
+ int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, size_t, void **, int);
+ void (*_dmamem_unmap)(bus_dma_tag_t, void *, size_t);
+ paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, off_t, int, int);
};
#define bus_dmamap_create(t, s, n, m, b, f, p) \
diff --git a/sys/arch/i386/stand/libsa/nfs.c b/sys/arch/i386/stand/libsa/nfs.c
index 67c9ba8144c..add41e3df8b 100644
--- a/sys/arch/i386/stand/libsa/nfs.c
+++ b/sys/arch/i386/stand/libsa/nfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs.c,v 1.14 2008/11/25 13:18:37 ad Exp $ */
+/* $NetBSD: nfs.c,v 1.15 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 1993 John Brezak
@@ -100,13 +100,13 @@ struct nfs_iodesc {
struct nfsv2_fattrs fa; /* all in network order */
};
-int nfs_getrootfh __P((struct iodesc *, char *, u_char *));
-int nfs_lookupfh __P((struct nfs_iodesc *, const char *, int,
- struct nfs_iodesc *));
+int nfs_getrootfh(struct iodesc *, char *, u_char *);
+int nfs_lookupfh(struct nfs_iodesc *, const char *, int,
+ struct nfs_iodesc *);
#ifndef NFS_NOSYMLINK
-int nfs_readlink __P((struct nfs_iodesc *, char *));
+int nfs_readlink(struct nfs_iodesc *, char *);
#endif
-ssize_t nfs_readdata __P((struct nfs_iodesc *, off_t, void *, size_t));
+ssize_t nfs_readdata(struct nfs_iodesc *, off_t, void *, size_t);
/*
* Fetch the root file handle (call mount daemon)
diff --git a/sys/arch/i386/stand/netboot/dev_net.c b/sys/arch/i386/stand/netboot/dev_net.c
index 79a324739f9..50ae4c53fa6 100644
--- a/sys/arch/i386/stand/netboot/dev_net.c
+++ b/sys/arch/i386/stand/netboot/dev_net.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.12 2002/02/24 01:51:04 thorpej Exp $ */
+/* $NetBSD: dev_net.c,v 1.13 2009/03/14 14:46:00 dsl Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -55,7 +55,7 @@
#include "dev_net.h"
#ifdef SUPPORT_BOOTP
-void bootp __P((int));
+void bootp(int);
#endif
static int netdev_sock = -1;
diff --git a/sys/arch/i386/stand/netboot/dev_net.h b/sys/arch/i386/stand/netboot/dev_net.h
index 1d134402ef7..3913a257da4 100644
--- a/sys/arch/i386/stand/netboot/dev_net.h
+++ b/sys/arch/i386/stand/netboot/dev_net.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.h,v 1.1.1.1 1997/03/14 02:40:31 perry Exp $ */
+/* $NetBSD: dev_net.h,v 1.2 2009/03/14 14:46:00 dsl Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -33,7 +33,7 @@
*/
-int net_open __P((struct open_file*, ...));
-int net_close __P((struct open_file*));
-int net_ioctl __P((struct open_file*, u_long, void*));
-int net_strategy __P((void*, int, daddr_t, size_t, void*, size_t*));
+int net_open(struct open_file*, ...);
+int net_close(struct open_file*);
+int net_ioctl(struct open_file*, u_long, void*);
+int net_strategy(void*, int, daddr_t, size_t, void*, size_t*);
diff --git a/sys/arch/i386/stand/netboot/main.c b/sys/arch/i386/stand/netboot/main.c
index 2f6763e8c30..4cc82176903 100644
--- a/sys/arch/i386/stand/netboot/main.c
+++ b/sys/arch/i386/stand/netboot/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.13 2008/12/13 23:30:54 christos Exp $ */
+/* $NetBSD: main.c,v 1.14 2009/03/14 14:46:00 dsl Exp $ */
/*
* Copyright (c) 1996
@@ -49,9 +49,9 @@ extern char bootprog_name[], bootprog_rev[], bootprog_kernrev[];
#define TIMEOUT 5
-void command_help __P((char *));
-void command_quit __P((char *));
-void command_boot __P((char *));
+void command_help(char *);
+void command_quit(char *);
+void command_boot(char *);
const struct bootblk_command commands[] = {
{ "help", command_help },
diff --git a/sys/arch/i386/stand/pxeboot/dev_net.c b/sys/arch/i386/stand/pxeboot/dev_net.c
index 9ab42edc060..4fc28bc1374 100644
--- a/sys/arch/i386/stand/pxeboot/dev_net.c
+++ b/sys/arch/i386/stand/pxeboot/dev_net.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.7 2008/05/11 11:42:02 chris Exp $ */
+/* $NetBSD: dev_net.c,v 1.8 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
static int netdev_sock = -1;
static int netdev_opens;
-static int net_getparams __P((int sock));
+static int net_getparams(int sock);
/*
* Called by devopen after it sets f->f_dev to our devsw entry.
@@ -161,7 +161,7 @@ net_strategy(devdata, rw, blk, size, buf, rsize)
* server IP address, and our root path on the server.
*/
#ifdef SUPPORT_BOOTP
-int bootp __P((int sock));
+int bootp(int sock);
#endif
static int
diff --git a/sys/arch/i386/stand/pxeboot/dev_net.h b/sys/arch/i386/stand/pxeboot/dev_net.h
index 443cf4a3b60..159cd7e1f91 100644
--- a/sys/arch/i386/stand/pxeboot/dev_net.h
+++ b/sys/arch/i386/stand/pxeboot/dev_net.h
@@ -1,6 +1,6 @@
-/* $NetBSD: dev_net.h,v 1.1 2002/02/16 16:26:23 thorpej Exp $ */
+/* $NetBSD: dev_net.h,v 1.2 2009/03/14 14:46:00 dsl Exp $ */
-int net_open __P((struct open_file *, ...));
-int net_close __P((struct open_file *));
-int net_ioctl __P((struct open_file *, u_long, void *));
-int net_strategy __P((void *, int , daddr_t , size_t, void *, size_t *));
+int net_open(struct open_file *, ...);
+int net_close(struct open_file *);
+int net_ioctl(struct open_file *, u_long, void *);
+int net_strategy(void *, int , daddr_t , size_t, void *, size_t *);
diff --git a/sys/arch/i386/stand/pxeboot/main.c b/sys/arch/i386/stand/pxeboot/main.c
index 1b8c028f7ac..c8298326027 100644
--- a/sys/arch/i386/stand/pxeboot/main.c
+++ b/sys/arch/i386/stand/pxeboot/main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.18 2009/01/30 14:09:44 christos Exp $ */
+/* $NetBSD: main.c,v 1.19 2009/03/14 14:46:00 dsl Exp $ */
/*
* Copyright (c) 1996
@@ -58,9 +58,9 @@ extern char bootprog_name[], bootprog_rev[], bootprog_kernrev[];
int main(void);
-void command_help __P((char *));
-void command_quit __P((char *));
-void command_boot __P((char *));
+void command_help(char *);
+void command_quit(char *);
+void command_boot(char *);
void command_consdev(char *);
void command_modules(char *);
diff --git a/sys/arch/ia64/ia64/vm_machdep.c b/sys/arch/ia64/ia64/vm_machdep.c
index 9e19fdc20bf..0beef37f7ff 100644
--- a/sys/arch/ia64/ia64/vm_machdep.c
+++ b/sys/arch/ia64/ia64/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.3 2008/04/28 20:23:25 martin Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.4 2009/03/14 14:46:00 dsl Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp *l2, void *stack, size_t stacksize,
void
cpu_setfunc(l, func, arg)
struct lwp *l;
- void (*func) __P((void *));
+ void (*func)(void *);
void *arg;
{
return;
diff --git a/sys/arch/luna68k/dev/lcd.c b/sys/arch/luna68k/dev/lcd.c
index be5f826c1ae..a0d9ea74fee 100644
--- a/sys/arch/luna68k/dev/lcd.c
+++ b/sys/arch/luna68k/dev/lcd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lcd.c,v 1.3 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: lcd.c,v 1.4 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lcd.c,v 1.3 2008/04/28 20:23:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lcd.c,v 1.4 2009/03/14 14:46:00 dsl Exp $");
/*
* XXX
@@ -70,11 +70,11 @@ struct pio {
volatile u_int8_t cntrl;
};
-void lcdbusywait __P((void));
-void lcdput __P((int));
-void lcdctrl __P((int));
-void lcdshow __P((char *));
-void greeting __P((void));
+void lcdbusywait(void);
+void lcdput(int);
+void lcdctrl(int);
+void lcdshow(char *);
+void greeting(void);
/* "1234567890123456" */
static char lcd_boot_message1[] = " NetBSD/luna68k ";
static char lcd_boot_message2[] = " SX-9100/DT ";
diff --git a/sys/arch/luna68k/dev/lunafb.c b/sys/arch/luna68k/dev/lunafb.c
index f9e1d96f8c8..8e857d7b5cc 100644
--- a/sys/arch/luna68k/dev/lunafb.c
+++ b/sys/arch/luna68k/dev/lunafb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lunafb.c,v 1.16 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: lunafb.c,v 1.17 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.16 2008/04/28 20:23:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunafb.c,v 1.17 2009/03/14 14:46:00 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,11 +104,11 @@ struct omfb_softc {
int nscreens;
};
-static int omgetcmap __P((struct omfb_softc *, struct wsdisplay_cmap *));
-static int omsetcmap __P((struct omfb_softc *, struct wsdisplay_cmap *));
+static int omgetcmap(struct omfb_softc *, struct wsdisplay_cmap *);
+static int omsetcmap(struct omfb_softc *, struct wsdisplay_cmap *);
static struct om_hwdevconfig omfb_console_dc;
-static void omfb_getdevconfig __P((paddr_t, struct om_hwdevconfig *));
+static void omfb_getdevconfig(paddr_t, struct om_hwdevconfig *);
extern struct wsdisplay_emulops omfb_emulops;
@@ -127,14 +127,14 @@ static const struct wsscreen_list omfb_screenlist = {
sizeof(_omfb_scrlist) / sizeof(struct wsscreen_descr *), _omfb_scrlist
};
-static int omfbioctl __P((void *, void *, u_long, void *, int,
- struct lwp *));
-static paddr_t omfbmmap __P((void *, void *, off_t, int));
-static int omfb_alloc_screen __P((void *, const struct wsscreen_descr *,
- void **, int *, int *, long *));
-static void omfb_free_screen __P((void *, void *));
-static int omfb_show_screen __P((void *, void *, int,
- void (*) (void *, int, int), void *));
+static int omfbioctl(void *, void *, u_long, void *, int,
+ struct lwp *);
+static paddr_t omfbmmap(void *, void *, off_t, int);
+static int omfb_alloc_screen(void *, const struct wsscreen_descr *,
+ void **, int *, int *, long *);
+static void omfb_free_screen(void *, void *);
+static int omfb_show_screen(void *, void *, int,
+ void (*) (void *, int, int), void *);
static const struct wsdisplay_accessops omfb_accessops = {
omfbioctl,
@@ -145,8 +145,8 @@ static const struct wsdisplay_accessops omfb_accessops = {
0 /* load_font */
};
-static int omfbmatch __P((struct device *, struct cfdata *, void *));
-static void omfbattach __P((struct device *, struct device *, void *));
+static int omfbmatch(struct device *, struct cfdata *, void *);
+static void omfbattach(struct device *, struct device *, void *);
CFATTACH_DECL(fb, sizeof(struct omfb_softc),
omfbmatch, omfbattach, NULL, NULL);
@@ -155,7 +155,7 @@ extern struct cfdriver fb_cd;
extern int hwplanemask; /* hardware planemask; retrieved at boot */
static int omfb_console;
-int omfb_cnattach __P((void));
+int omfb_cnattach(void);
static int
omfbmatch(parent, cf, aux)
@@ -493,7 +493,7 @@ omfb_show_screen(v, cookie, waitok, cb, cbarg)
void *v;
void *cookie;
int waitok;
- void (*cb) __P((void *, int, int));
+ void (*cb)(void *, int, int);
void *cbarg;
{
return 0;
diff --git a/sys/arch/luna68k/dev/lunaws.c b/sys/arch/luna68k/dev/lunaws.c
index 1f3a0d13a5d..68285c990b4 100644
--- a/sys/arch/luna68k/dev/lunaws.c
+++ b/sys/arch/luna68k/dev/lunaws.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lunaws.c,v 1.15 2008/06/13 09:58:06 cegger Exp $ */
+/* $NetBSD: lunaws.c,v 1.16 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.15 2008/06/13 09:58:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lunaws.c,v 1.16 2009/03/14 14:46:00 dsl Exp $");
#include "wsmouse.h"
@@ -70,11 +70,11 @@ struct ws_softc {
#endif
};
-static void omkbd_input __P((void *, int));
-static int omkbd_decode __P((void *, int, u_int *, int *));
-static int omkbd_enable __P((void *, int));
-static void omkbd_set_leds __P((void *, int));
-static int omkbd_ioctl __P((void *, u_long, void *, int, struct lwp *));
+static void omkbd_input(void *, int);
+static int omkbd_decode(void *, int, u_int *, int *);
+static int omkbd_enable(void *, int);
+static void omkbd_set_leds(void *, int);
+static int omkbd_ioctl(void *, u_long, void *, int, struct lwp *);
struct wscons_keydesc omkbd_keydesctab[];
@@ -88,18 +88,18 @@ static const struct wskbd_accessops omkbd_accessops = {
omkbd_ioctl,
};
-void ws_cnattach __P((void));
-static void ws_cngetc __P((void *, u_int *, int *));
-static void ws_cnpollc __P((void *, int));
+void ws_cnattach(void);
+static void ws_cngetc(void *, u_int *, int *);
+static void ws_cnpollc(void *, int);
static const struct wskbd_consops ws_consops = {
ws_cngetc,
ws_cnpollc,
};
#if NWSMOUSE > 0
-static int omms_enable __P((void *));
-static int omms_ioctl __P((void *, u_long, void *, int, struct lwp *));
-static void omms_disable __P((void *));
+static int omms_enable(void *);
+static int omms_ioctl(void *, u_long, void *, int, struct lwp *);
+static void omms_disable(void *);
static const struct wsmouse_accessops omms_accessops = {
omms_enable,
@@ -108,17 +108,17 @@ static const struct wsmouse_accessops omms_accessops = {
};
#endif
-static void wsintr __P((int));
+static void wsintr(int);
-static int wsmatch __P((struct device *, struct cfdata *, void *));
-static void wsattach __P((struct device *, struct device *, void *));
+static int wsmatch(struct device *, struct cfdata *, void *);
+static void wsattach(struct device *, struct device *, void *);
CFATTACH_DECL(ws, sizeof(struct ws_softc),
wsmatch, wsattach, NULL, NULL);
extern struct cfdriver ws_cd;
-extern int syscngetc __P((dev_t));
-extern void syscnputc __P((dev_t, int));
+extern int syscngetc(dev_t);
+extern void syscnputc(dev_t, int);
static int
wsmatch(parent, match, aux)
diff --git a/sys/arch/luna68k/dev/omrasops.c b/sys/arch/luna68k/dev/omrasops.c
index 0c0eb2da0c6..d42bae4e4b9 100644
--- a/sys/arch/luna68k/dev/omrasops.c
+++ b/sys/arch/luna68k/dev/omrasops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: omrasops.c,v 1.6 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: omrasops.c,v 1.7 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: omrasops.c,v 1.6 2008/04/28 20:23:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omrasops.c,v 1.7 2009/03/14 14:46:00 dsl Exp $");
/*
* Designed speficically for 'm68k bitorder';
@@ -51,17 +51,17 @@ __KERNEL_RCSID(0, "$NetBSD: omrasops.c,v 1.6 2008/04/28 20:23:26 martin Exp $");
#include <dev/wscons/wscons_rfont.h>
#include <dev/wscons/wsdisplayvar.h>
-void rcons_init __P((struct rcons *, int, int));
+void rcons_init(struct rcons *, int, int);
/* wscons emulator operations */
-static void om_cursor __P((void *, int, int, int));
-static int om_mapchar __P((void *, int, unsigned int *));
-static void om_putchar __P((void *, int, int, u_int, long));
-static void om_copycols __P((void *, int, int, int, int));
-static void om_copyrows __P((void *, int, int, int num));
-static void om_erasecols __P((void *, int, int, int, long));
-static void om_eraserows __P((void *, int, int, long));
-static int om_allocattr __P((void *, int, int, int, long *));
+static void om_cursor(void *, int, int, int);
+static int om_mapchar(void *, int, unsigned int *);
+static void om_putchar(void *, int, int, u_int, long);
+static void om_copycols(void *, int, int, int, int);
+static void om_copyrows(void *, int, int, int num);
+static void om_erasecols(void *, int, int, int, long);
+static void om_eraserows(void *, int, int, long);
+static int om_allocattr(void *, int, int, int, long *);
struct wsdisplay_emulops omfb_emulops = {
om_cursor,
diff --git a/sys/arch/luna68k/dev/sio.c b/sys/arch/luna68k/dev/sio.c
index b533e5fe5ba..cc69cf236ca 100644
--- a/sys/arch/luna68k/dev/sio.c
+++ b/sys/arch/luna68k/dev/sio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sio.c,v 1.5 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: sio.c,v 1.6 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.5 2008/04/28 20:23:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.6 2009/03/14 14:46:00 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,16 +43,16 @@ __KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.5 2008/04/28 20:23:26 martin Exp $");
#include <luna68k/luna68k/isr.h>
#include <luna68k/dev/siovar.h>
-static int sio_match __P((struct device *, struct cfdata *, void *));
-static void sio_attach __P((struct device *, struct device *, void *));
-static int sio_print __P((void *, const char *));
+static int sio_match(struct device *, struct cfdata *, void *);
+static void sio_attach(struct device *, struct device *, void *);
+static int sio_print(void *, const char *);
CFATTACH_DECL(sio, sizeof(struct sio_softc),
sio_match, sio_attach, NULL, NULL);
extern struct cfdriver sio_cd;
-static void nullintr __P((int));
-static int xsiointr __P((void *));
+static void nullintr(int);
+static int xsiointr(void *);
static int
sio_match(parent, cf, aux)
diff --git a/sys/arch/luna68k/dev/siotty.c b/sys/arch/luna68k/dev/siotty.c
index 654e8469c26..0ca65a3b7bb 100644
--- a/sys/arch/luna68k/dev/siotty.c
+++ b/sys/arch/luna68k/dev/siotty.c
@@ -1,4 +1,4 @@
-/* $NetBSD: siotty.c,v 1.23 2008/06/13 09:58:06 cegger Exp $ */
+/* $NetBSD: siotty.c,v 1.24 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.23 2008/06/13 09:58:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siotty.c,v 1.24 2009/03/14 14:46:00 dsl Exp $");
#include "opt_ddb.h"
@@ -81,13 +81,13 @@ struct siotty_softc {
};
#include "siotty.h"
-static void siostart __P((struct tty *));
-static int sioparam __P((struct tty *, struct termios *));
-static void siottyintr __P((int));
-static int siomctl __P((struct siotty_softc *, int, int));
+static void siostart(struct tty *);
+static int sioparam(struct tty *, struct termios *);
+static void siottyintr(int);
+static int siomctl(struct siotty_softc *, int, int);
-static int siotty_match __P((struct device *, struct cfdata *, void *));
-static void siotty_attach __P((struct device *, struct device *, void *));
+static int siotty_match(struct device *, struct cfdata *, void *);
+static void siotty_attach(struct device *, struct device *, void *);
CFATTACH_DECL(siotty, sizeof(struct siotty_softc),
siotty_match, siotty_attach, NULL, NULL);
@@ -534,9 +534,9 @@ getsiocsr(struct sioreg *sio)
/*--------------------- console interface ----------------------*/
-void syscnattach __P((int));
-int syscngetc __P((dev_t));
-void syscnputc __P((dev_t, int));
+void syscnattach(int);
+int syscngetc(dev_t);
+void syscnputc(dev_t, int);
struct consdev syscons = {
NULL,
diff --git a/sys/arch/luna68k/dev/siovar.h b/sys/arch/luna68k/dev/siovar.h
index 352061c0276..6014e479dc3 100644
--- a/sys/arch/luna68k/dev/siovar.h
+++ b/sys/arch/luna68k/dev/siovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: siovar.h,v 1.3 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: siovar.h,v 1.4 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
struct sio_softc {
struct device scp_dev;
void *scp_ctl;
- void (*scp_intr[2]) __P((int));
+ void (*scp_intr[2])(int);
};
struct sio_attach_args {
@@ -48,5 +48,5 @@ struct sioreg {
#define sio_stat sio_cmd
};
-int getsiocsr __P((struct sioreg *));
-void setsioreg __P((struct sioreg *, int, int));
+int getsiocsr(struct sioreg *);
+void setsioreg(struct sioreg *, int, int);
diff --git a/sys/arch/luna68k/dev/timekeeper.c b/sys/arch/luna68k/dev/timekeeper.c
index de288a9a4d2..be4873e3f5c 100644
--- a/sys/arch/luna68k/dev/timekeeper.c
+++ b/sys/arch/luna68k/dev/timekeeper.c
@@ -1,4 +1,4 @@
-/* $NetBSD: timekeeper.c,v 1.5 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: timekeeper.c,v 1.6 2009/03/14 14:46:00 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: timekeeper.c,v 1.5 2008/04/28 20:23:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timekeeper.c,v 1.6 2009/03/14 14:46:00 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,17 +54,17 @@ struct timekeeper_softc {
struct todr_chip_handle sc_todr;
};
-static int clock_match __P((struct device *, struct cfdata *, void *));
-static void clock_attach __P((struct device *, struct device *, void *));
+static int clock_match(struct device *, struct cfdata *, void *);
+static void clock_attach(struct device *, struct device *, void *);
CFATTACH_DECL(clock, sizeof (struct timekeeper_softc),
clock_match, clock_attach, NULL, NULL);
extern struct cfdriver clock_cd;
-static int mkclock_get __P((todr_chip_handle_t, struct clock_ymdhms *));
-static int mkclock_set __P((todr_chip_handle_t, struct clock_ymdhms *));
-static int dsclock_get __P((todr_chip_handle_t, struct clock_ymdhms *));
-static int dsclock_set __P((todr_chip_handle_t, struct clock_ymdhms *));
+static int mkclock_get(todr_chip_handle_t, struct clock_ymdhms *);
+static int mkclock_set(todr_chip_handle_t, struct clock_ymdhms *);
+static int dsclock_get(todr_chip_handle_t, struct clock_ymdhms *);
+static int dsclock_set(todr_chip_handle_t, struct clock_ymdhms *);
static int
clock_match(parent, match, aux)
diff --git a/sys/arch/luna68k/include/bus.h b/sys/arch/luna68k/include/bus.h
index 4b57c83e59e..5ad39b3f0b7 100644
--- a/sys/arch/luna68k/include/bus.h
+++ b/sys/arch/luna68k/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.9 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: bus.h,v 1.10 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -77,8 +77,8 @@ typedef int bus_space_tag_t;
typedef u_long bus_space_handle_t;
/*
- * int bus_space_map __P((bus_space_tag_t t, bus_addr_t addr,
- * bus_size_t size, int flags, bus_space_handle_t *bshp));
+ * int bus_space_map(bus_space_tag_t t, bus_addr_t addr,
+ * bus_size_t size, int flags, bus_space_handle_t *bshp);
*
* Map a region of bus space.
*/
@@ -87,56 +87,56 @@ typedef u_long bus_space_handle_t;
#define BUS_SPACE_MAP_LINEAR 0x02
#define BUS_SPACE_MAP_PREFETCHABLE 0x04
-int bus_space_map __P((bus_space_tag_t, bus_addr_t, bus_size_t,
- int, bus_space_handle_t *));
+int bus_space_map(bus_space_tag_t, bus_addr_t, bus_size_t,
+ int, bus_space_handle_t *);
/*
- * void bus_space_unmap __P((bus_space_tag_t t,
- * bus_space_handle_t bsh, bus_size_t size));
+ * void bus_space_unmap(bus_space_tag_t t,
+ * bus_space_handle_t bsh, bus_size_t size);
*
* Unmap a region of bus space.
*/
-void bus_space_unmap __P((bus_space_tag_t, bus_space_handle_t, bus_size_t));
+void bus_space_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t);
/*
- * int bus_space_subregion __P((bus_space_tag_t t,
+ * int bus_space_subregion(bus_space_tag_t t,
* bus_space_handle_t bsh, bus_size_t offset, bus_size_t size,
- * bus_space_handle_t *nbshp));
+ * bus_space_handle_t *nbshp);
*
* Get a new handle for a subregion of an already-mapped area of bus space.
*/
-int bus_space_subregion __P((bus_space_tag_t t, bus_space_handle_t bsh,
- bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp));
+int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
+ bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp);
/*
- * int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t, rstart,
+ * int bus_space_alloc(bus_space_tag_t t, bus_addr_t, rstart,
* bus_addr_t rend, bus_size_t size, bus_size_t align,
* bus_size_t boundary, int flags, bus_addr_t *addrp,
- * bus_space_handle_t *bshp));
+ * bus_space_handle_t *bshp);
*
* Allocate a region of bus space.
*/
-int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t rstart,
+int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart,
bus_addr_t rend, bus_size_t size, bus_size_t align,
bus_size_t boundary, int cacheable, bus_addr_t *addrp,
- bus_space_handle_t *bshp));
+ bus_space_handle_t *bshp);
/*
- * int bus_space_free __P((bus_space_tag_t t,
- * bus_space_handle_t bsh, bus_size_t size));
+ * int bus_space_free(bus_space_tag_t t,
+ * bus_space_handle_t bsh, bus_size_t size);
*
* Free a region of bus space.
*/
-void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
- bus_size_t size));
+void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh,
+ bus_size_t size);
/*
- * u_intN_t bus_space_read_N __P((bus_space_tag_t tag,
- * bus_space_handle_t bsh, bus_size_t offset));
+ * u_intN_t bus_space_read_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset);
*
* Read a 1, 2, 4, or 8 byte quantity from bus space
* described by tag/handle/offset.
@@ -156,9 +156,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
#endif
/*
- * void bus_space_read_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_read_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t *addr, size_t count));
+ * u_intN_t *addr, size_t count);
*
* Read `count' 1, 2, 4, or 8 byte quantities from bus space
* described by tag/handle/offset and copy into buffer provided.
@@ -211,9 +211,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
#endif
/*
- * void bus_space_read_region_N __P((bus_space_tag_t tag,
+ * void bus_space_read_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t *addr, size_t count));
+ * u_intN_t *addr, size_t count);
*
* Read `count' 1, 2, 4, or 8 byte quantities from bus space
* described by tag/handle and starting at `offset' and copy into
@@ -267,9 +267,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
#endif
/*
- * void bus_space_write_N __P((bus_space_tag_t tag,
+ * void bus_space_write_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t value));
+ * u_intN_t value);
*
* Write the 1, 2, 4, or 8 byte value `value' to bus space
* described by tag/handle/offset.
@@ -289,9 +289,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
#endif
/*
- * void bus_space_write_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_write_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * const u_intN_t *addr, size_t count));
+ * const u_intN_t *addr, size_t count);
*
* Write `count' 1, 2, 4, or 8 byte quantities from the buffer
* provided to bus space described by tag/handle/offset.
@@ -345,9 +345,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
#endif
/*
- * void bus_space_write_region_N __P((bus_space_tag_t tag,
+ * void bus_space_write_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * const u_intN_t *addr, size_t count));
+ * const u_intN_t *addr, size_t count);
*
* Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
* to bus space described by tag/handle starting at `offset'.
@@ -401,9 +401,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
#endif
/*
- * void bus_space_set_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_set_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
- * size_t count));
+ * size_t count);
*
* Write the 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle/offset `count' times.
@@ -460,9 +460,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
#endif
/*
- * void bus_space_set_region_N __P((bus_space_tag_t tag,
+ * void bus_space_set_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
- * size_t count));
+ * size_t count);
*
* Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle starting at `offset'.
@@ -519,10 +519,10 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
#endif
/*
- * void bus_space_copy_N __P((bus_space_tag_t tag,
+ * void bus_space_copy_N(bus_space_tag_t tag,
* bus_space_handle_t bsh1, bus_size_t off1,
* bus_space_handle_t bsh2, bus_size_t off2,
- * size_t count));
+ * size_t count);
*
* Copy `count' 1, 2, 4, or 8 byte values from bus space starting
* at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
@@ -530,10 +530,10 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
#define __MACHINE_copy_region_N(BYTES) \
static __inline void __CONCAT(bus_space_copy_region_,BYTES) \
- __P((bus_space_tag_t, \
+(bus_space_tag_t, \
bus_space_handle_t bsh1, bus_size_t off1, \
bus_space_handle_t bsh2, bus_size_t off2, \
- bus_size_t count)); \
+ bus_size_t count); \
\
static __inline void \
__CONCAT(bus_space_copy_region_,BYTES)(t, h1, o1, h2, o2, c) \
@@ -568,9 +568,9 @@ __MACHINE_copy_region_N(4)
/*
* Bus read/write barrier methods.
*
- * void bus_space_barrier __P((bus_space_tag_t tag,
+ * void bus_space_barrier(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * bus_size_t len, int flags));
+ * bus_size_t len, int flags);
*
* Note: the 680x0 does not currently require barriers, but we must
* provide the flags to MI code.
diff --git a/sys/arch/luna68k/include/cpu.h b/sys/arch/luna68k/include/cpu.h
index 87e6ccbb98a..5fea682a3b8 100644
--- a/sys/arch/luna68k/include/cpu.h
+++ b/sys/arch/luna68k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.25 2008/02/27 18:26:15 xtraeme Exp $ */
+/* $NetBSD: cpu.h,v 1.26 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -179,18 +179,18 @@ extern char *intiobase, *intiolimit; /* XXX */
extern u_int intiobase_phys, intiotop_phys; /* XXX */
/* machdep.c functions */
-void dumpconf __P((void));
-void dumpsys __P((void));
+void dumpconf(void);
+void dumpsys(void);
/* locore.s functions */
struct fpframe;
-int suline __P((void *, void *));
-void loadustp __P((int));
-void m68881_save __P((struct fpframe *));
-void m68881_restore __P((struct fpframe *));
+int suline(void *, void *);
+void loadustp(int);
+void m68881_save(struct fpframe *);
+void m68881_restore(struct fpframe *);
/* machdep.c functions */
-int badaddr __P((void *, int));
+int badaddr(void *, int);
#endif
diff --git a/sys/arch/luna68k/include/param.h b/sys/arch/luna68k/include/param.h
index eca2f0c98cc..77b130cb3fd 100644
--- a/sys/arch/luna68k/include/param.h
+++ b/sys/arch/luna68k/include/param.h
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.7 2005/12/11 12:17:52 christos Exp $ */
+/* $NetBSD: param.h,v 1.8 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -119,7 +119,7 @@
#define delay(us) _delay((us)<<8)
#define DELAY(n) delay(n)
-void _delay __P((unsigned));
+void _delay(unsigned);
#endif /* _KERNEL && !_LOCORE */
#endif /* !_MACHINE_PARAM_H_ */
diff --git a/sys/arch/luna68k/luna68k/disksubr.c b/sys/arch/luna68k/luna68k/disksubr.c
index 9fd7b324c30..7629141fcc1 100644
--- a/sys/arch/luna68k/luna68k/disksubr.c
+++ b/sys/arch/luna68k/luna68k/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.23 2007/10/17 19:55:04 garbled Exp $ */
+/* $NetBSD: disksubr.c,v 1.24 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -103,7 +103,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.23 2007/10/17 19:55:04 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.24 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -158,8 +158,8 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.23 2007/10/17 19:55:04 garbled Exp $"
#error "Default value of LABELSECTOR no longer zero?"
#endif
-static const char *disklabel_om_to_bsd __P((char *, struct disklabel *));
-static int disklabel_bsd_to_om __P((struct disklabel *, char *));
+static const char *disklabel_om_to_bsd(char *, struct disklabel *);
+static int disklabel_bsd_to_om(struct disklabel *, char *);
/*
* Attempt to read a disk label from a device
@@ -176,7 +176,7 @@ static int disklabel_bsd_to_om __P((struct disklabel *, char *));
const char *
readdisklabel(dev, strat, lp, clp)
dev_t dev;
- void (*strat) __P((struct buf *));
+ void (*strat)(struct buf *);
struct disklabel *lp;
struct cpu_disklabel *clp;
{
@@ -288,7 +288,7 @@ setdisklabel(olp, nlp, openmask, clp)
int
writedisklabel(dev, strat, lp, clp)
dev_t dev;
- void (*strat) __P((struct buf *));
+ void (*strat)(struct buf *);
struct disklabel *lp;
struct cpu_disklabel *clp;
{
diff --git a/sys/arch/luna68k/luna68k/isr.c b/sys/arch/luna68k/luna68k/isr.c
index 84d9ee1d732..1804fc54f37 100644
--- a/sys/arch/luna68k/luna68k/isr.c
+++ b/sys/arch/luna68k/luna68k/isr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.c,v 1.13 2008/07/10 16:14:16 tsutsui Exp $ */
+/* $NetBSD: isr.c,v 1.14 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.13 2008/07/10 16:14:16 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.14 2009/03/14 14:46:01 dsl Exp $");
/*
* Link and dispatch interrupts.
@@ -53,11 +53,11 @@ int idepth;
volatile int ssir;
extern int intrcnt[]; /* from locore.s */
-extern void (*vectab[]) __P((void));
-extern void badtrap __P((void));
-extern void intrhand_vectored __P((void));
+extern void (*vectab[])(void);
+extern void badtrap(void);
+extern void intrhand_vectored(void);
-extern int getsr __P((void)); /* in locore.s */
+extern int getsr(void); /* in locore.s */
void
isrinit()
@@ -76,7 +76,7 @@ isrinit()
*/
void
isrlink_autovec(func, arg, ipl, priority)
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
int ipl;
int priority;
@@ -151,7 +151,7 @@ isrlink_autovec(func, arg, ipl, priority)
*/
void
isrlink_vectored(func, arg, ipl, vec)
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
int ipl, vec;
{
diff --git a/sys/arch/luna68k/luna68k/isr.h b/sys/arch/luna68k/luna68k/isr.h
index bba1e03e287..10903b978cb 100644
--- a/sys/arch/luna68k/luna68k/isr.h
+++ b/sys/arch/luna68k/luna68k/isr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.h,v 1.3 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: isr.h,v 1.4 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
struct isr_autovec {
LIST_ENTRY(isr_autovec) isr_link;
- int (*isr_func) __P((void *));
+ int (*isr_func)(void *);
void *isr_arg;
int isr_ipl;
int isr_priority;
@@ -64,7 +64,7 @@ typedef LIST_HEAD(, isr_autovec) isr_autovec_list_t;
* when establishing the interrupt.
*/
struct isr_vectored {
- int (*isr_func) __P((void *));
+ int (*isr_func)(void *);
void *isr_arg;
int isr_ipl;
};
@@ -77,9 +77,9 @@ struct isr_vectored {
#define ISRPRI_TTY 2
#define ISRPRI_TTYNOBUF 3
-void isrinit __P((void));
-void isrlink_autovec __P((int (*)(void *), void *, int, int));
-void isrlink_vectored __P((int (*)(void *), void *, int, int));
-void isrunlink_vectored __P((int));
-void isrdispatch_autovec __P((int));
-void isrdispatch_vectored __P((int, int, void *));
+void isrinit(void);
+void isrlink_autovec(int (*)(void *), void *, int, int);
+void isrlink_vectored(int (*)(void *), void *, int, int);
+void isrunlink_vectored(int);
+void isrdispatch_autovec(int);
+void isrdispatch_vectored(int, int, void *);
diff --git a/sys/arch/luna68k/luna68k/machdep.c b/sys/arch/luna68k/luna68k/machdep.c
index 7415249ec2a..220e20f5e11 100644
--- a/sys/arch/luna68k/luna68k/machdep.c
+++ b/sys/arch/luna68k/luna68k/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.63 2009/02/13 22:41:02 apb Exp $ */
+/* $NetBSD: machdep.c,v 1.64 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.63 2009/02/13 22:41:02 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.64 2009/03/14 14:46:01 dsl Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -106,16 +106,16 @@ int physmem; /* set by locore */
*/
int safepri = PSL_LOWIPL;
-void luna68k_init __P((void));
-void identifycpu __P((void));
-void dumpsys __P((void));
+void luna68k_init(void);
+void identifycpu(void);
+void dumpsys(void);
-void straytrap __P((int, u_short));
-void nmihand __P((struct frame));
+void straytrap(int, u_short);
+void nmihand(struct frame);
-int cpu_dumpsize __P((void));
-int cpu_dump __P((int (*)(dev_t, daddr_t, void *, size_t), daddr_t *));
-void cpu_init_kcore_hdr __P((void));
+int cpu_dumpsize(void);
+int cpu_dump(int (*)(dev_t, daddr_t, void *, size_t), daddr_t *);
+void cpu_init_kcore_hdr(void);
/*
* Machine-independent crash dump header info.
@@ -126,9 +126,9 @@ int machtype; /* model: 1 for LUNA-1, 2 for LUNA-2 */
int sysconsole; /* console: 0 for ttya, 1 for video */
extern struct consdev syscons;
-extern void omfb_cnattach __P((void));
-extern void ws_cnattach __P((void));
-extern void syscnattach __P((int));
+extern void omfb_cnattach(void);
+extern void ws_cnattach(void);
+extern void syscnattach(int);
/*
* On the 68020/68030, the value of delay_divisor is roughly
@@ -237,7 +237,7 @@ cpu_startup()
{
vaddr_t minaddr, maxaddr;
char pbuf[9];
- extern void greeting __P((void));
+ extern void greeting(void);
if (fputype != FPU_NONE)
m68k_make_fpu_idle_frame();
@@ -371,7 +371,7 @@ cpu_reboot(howto, bootstr)
volatile int howto; /* XXX to shutup GCC XXX */
char *bootstr;
{
- extern void doboot __P((void));
+ extern void doboot(void);
/* take a snap shot before clobbering any registers */
if (curlwp->l_addr)
@@ -513,7 +513,7 @@ cpu_dumpsize()
*/
int
cpu_dump(dump, blknop)
- int (*dump) __P((dev_t, daddr_t, void *, size_t));
+ int (*dump)(dev_t, daddr_t, void *, size_t);
daddr_t *blknop;
{
int buf[MDHDRSIZE / sizeof(int)];
@@ -595,7 +595,7 @@ dumpsys()
const struct bdevsw *bdev;
daddr_t blkno; /* current block to write */
/* dump routine */
- int (*dump) __P((dev_t, daddr_t, void *, size_t));
+ int (*dump)(dev_t, daddr_t, void *, size_t);
int pg; /* page being dumped */
paddr_t maddr; /* PA being dumped */
int error; /* error code from (*dump)() */
@@ -728,7 +728,7 @@ badaddr(addr, nbytes)
return (0);
}
-void luna68k_abort __P((const char *));
+void luna68k_abort(const char *);
static int innmihand; /* simple mutex */
@@ -786,7 +786,7 @@ cpu_exec_aout_makecmds(l, epp)
int error = ENOEXEC;
#ifdef COMPAT_SUNOS
extern sunos_exec_aout_makecmds
- __P((struct proc *, struct exec_package *));
+(struct proc *, struct exec_package *);
if ((error = sunos_exec_aout_makecmds(l->l_proc, epp)) == 0)
return 0;
#endif
@@ -802,8 +802,8 @@ struct consdev *cn_tab = &syscons;
/*
* romcons is useful until m68k TC register is initialized.
*/
-int romcngetc __P((dev_t));
-void romcnputc __P((dev_t, int));
+int romcngetc(dev_t);
+void romcnputc(dev_t, int);
struct consdev romcons = {
NULL,
diff --git a/sys/arch/luna68k/luna68k/mainbus.c b/sys/arch/luna68k/luna68k/mainbus.c
index b5ffbfd2f75..189bd28f050 100644
--- a/sys/arch/luna68k/luna68k/mainbus.c
+++ b/sys/arch/luna68k/luna68k/mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.5 2008/04/28 20:23:26 martin Exp $ */
+/* $NetBSD: mainbus.c,v 1.6 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.5 2008/04/28 20:23:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.6 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -51,9 +51,9 @@ static struct mainbus_attach_args devs[] = {
#endif
};
-static void mainbus_attach __P((struct device *, struct device *, void *));
-static int mainbus_match __P((struct device *, struct cfdata *, void *));
-static int mainbus_print __P((void *, const char *));
+static void mainbus_attach(struct device *, struct device *, void *);
+static int mainbus_match(struct device *, struct cfdata *, void *);
+static int mainbus_print(void *, const char *);
CFATTACH_DECL(mainbus, sizeof(struct device),
mainbus_match, mainbus_attach, NULL, NULL);
diff --git a/sys/arch/luna68k/luna68k/pmap_bootstrap.c b/sys/arch/luna68k/luna68k/pmap_bootstrap.c
index 6e23ecf343b..a0baee9ba46 100644
--- a/sys/arch/luna68k/luna68k/pmap_bootstrap.c
+++ b/sys/arch/luna68k/luna68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.16 2009/01/17 07:17:35 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.17 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.16 2009/01/17 07:17:35 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.17 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -57,7 +57,7 @@ extern char *proc0paddr;
extern int maxmem, physmem;
extern paddr_t avail_start, avail_end;
-void pmap_bootstrap __P((paddr_t, paddr_t));
+void pmap_bootstrap(paddr_t, paddr_t);
/*
* Special purpose kernel virtual addresses, used for mapping
diff --git a/sys/arch/luna68k/luna68k/trap.c b/sys/arch/luna68k/luna68k/trap.c
index cf44cbc6105..d54ef873005 100644
--- a/sys/arch/luna68k/luna68k/trap.c
+++ b/sys/arch/luna68k/luna68k/trap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.55 2009/01/27 20:30:13 martin Exp $ */
+/* $NetBSD: trap.c,v 1.56 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.55 2009/01/27 20:30:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.56 2009/03/14 14:46:01 dsl Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -109,18 +109,18 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.55 2009/01/27 20:30:13 martin Exp $");
#include <dev/cons.h>
-int writeback __P((struct frame *fp, int docachepush));
-void trap __P((struct frame *fp, int type, u_int code, u_int v));
+int writeback(struct frame *fp, int docachepush);
+void trap(struct frame *fp, int type, u_int code, u_int v);
#if defined(M68040)
#ifdef DEBUG
-static void dumpssw __P((u_short));
-static void dumpwb __P((int, u_short, u_int, u_int));
+static void dumpssw(u_short);
+static void dumpwb(int, u_short, u_int, u_int);
#endif
#endif
-static inline void userret __P((struct lwp *l, struct frame *fp,
- u_quad_t oticks, u_int faultaddr, int fromtrap));
+static inline void userret(struct lwp *l, struct frame *fp,
+ u_quad_t oticks, u_int faultaddr, int fromtrap);
int astpending;
diff --git a/sys/arch/m68k/fpe/fpu_arith_proto.h b/sys/arch/m68k/fpe/fpu_arith_proto.h
index c85422c04a7..93c4b6c9bb0 100644
--- a/sys/arch/m68k/fpe/fpu_arith_proto.h
+++ b/sys/arch/m68k/fpe/fpu_arith_proto.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_arith_proto.h,v 1.1 1995/11/03 04:47:00 briggs Exp $ */
+/* $NetBSD: fpu_arith_proto.h,v 1.2 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -41,54 +41,54 @@
*/
/* fpu_add.c */
-struct fpn * fpu_add __P((struct fpemu *fe));
+struct fpn * fpu_add(struct fpemu *fe);
/* fpu_div.c */
-struct fpn * fpu_div __P((struct fpemu *fe));
+struct fpn * fpu_div(struct fpemu *fe);
/* fpu_exp.c */
-struct fpn * fpu_etox __P((struct fpemu *fe));
-struct fpn * fpu_etoxm1 __P((struct fpemu *fe));
-struct fpn * fpu_tentox __P((struct fpemu *fe));
-struct fpn * fpu_twotox __P((struct fpemu *fe));
+struct fpn * fpu_etox(struct fpemu *fe);
+struct fpn * fpu_etoxm1(struct fpemu *fe);
+struct fpn * fpu_tentox(struct fpemu *fe);
+struct fpn * fpu_twotox(struct fpemu *fe);
/* fpu_getexp.c */
-struct fpn * fpu_getexp __P((struct fpemu *fe));
-struct fpn * fpu_getman __P((struct fpemu *fe));
+struct fpn * fpu_getexp(struct fpemu *fe);
+struct fpn * fpu_getman(struct fpemu *fe);
/* fpu_hyperb.c */
-struct fpn * fpu_atanh __P((struct fpemu *fe));
-struct fpn * fpu_cosh __P((struct fpemu *fe));
-struct fpn * fpu_sinh __P((struct fpemu *fe));
-struct fpn * fpu_tanh __P((struct fpemu *fe));
+struct fpn * fpu_atanh(struct fpemu *fe);
+struct fpn * fpu_cosh(struct fpemu *fe);
+struct fpn * fpu_sinh(struct fpemu *fe);
+struct fpn * fpu_tanh(struct fpemu *fe);
/* fpu_int.c */
-struct fpn * fpu_intrz __P((struct fpemu *fe));
-struct fpn * fpu_int __P((struct fpemu *fe));
+struct fpn * fpu_intrz(struct fpemu *fe);
+struct fpn * fpu_int(struct fpemu *fe);
/* fpu_log.c */
-struct fpn * fpu_log10 __P((struct fpemu *fe));
-struct fpn * fpu_log2 __P((struct fpemu *fe));
-struct fpn * fpu_logn __P((struct fpemu *fe));
-struct fpn * fpu_lognp1 __P((struct fpemu *fe));
+struct fpn * fpu_log10(struct fpemu *fe);
+struct fpn * fpu_log2(struct fpemu *fe);
+struct fpn * fpu_logn(struct fpemu *fe);
+struct fpn * fpu_lognp1(struct fpemu *fe);
/* fpu_mulc */
-struct fpn * fpu_mul __P((struct fpemu *fe));
+struct fpn * fpu_mul(struct fpemu *fe);
/* fpu_rem.c */
-struct fpn * fpu_rem __P((struct fpemu *fe));
-struct fpn * fpu_mod __P((struct fpemu *fe));
+struct fpn * fpu_rem(struct fpemu *fe);
+struct fpn * fpu_mod(struct fpemu *fe);
/* fpu_sqrt.c */
-struct fpn * fpu_sqrt __P((struct fpemu *fe));
+struct fpn * fpu_sqrt(struct fpemu *fe);
/* fpu_trig.c */
-struct fpn * fpu_acos __P((struct fpemu *fe));
-struct fpn * fpu_asin __P((struct fpemu *fe));
-struct fpn * fpu_atan __P((struct fpemu *fe));
-struct fpn * fpu_cos __P((struct fpemu *fe));
-struct fpn * fpu_sin __P((struct fpemu *fe));
-struct fpn * fpu_tan __P((struct fpemu *fe));
-struct fpn * fpu_sincos __P((struct fpemu *fe, int regc));
+struct fpn * fpu_acos(struct fpemu *fe);
+struct fpn * fpu_asin(struct fpemu *fe);
+struct fpn * fpu_atan(struct fpemu *fe);
+struct fpn * fpu_cos(struct fpemu *fe);
+struct fpn * fpu_sin(struct fpemu *fe);
+struct fpn * fpu_tan(struct fpemu *fe);
+struct fpn * fpu_sincos(struct fpemu *fe, int regc);
#endif /* _FPU_ARITH_PROTO_H_ */
diff --git a/sys/arch/m68k/fpe/fpu_calcea.c b/sys/arch/m68k/fpe/fpu_calcea.c
index 975cc4e6435..b60570be223 100644
--- a/sys/arch/m68k/fpe/fpu_calcea.c
+++ b/sys/arch/m68k/fpe/fpu_calcea.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_calcea.c,v 1.18 2007/03/09 16:33:27 tsutsui Exp $ */
+/* $NetBSD: fpu_calcea.c,v 1.19 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_calcea.c,v 1.18 2007/03/09 16:33:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_calcea.c,v 1.19 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/signal.h>
@@ -45,13 +45,13 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_calcea.c,v 1.18 2007/03/09 16:33:27 tsutsui Exp
/*
* Prototypes of static functions
*/
-static int decode_ea6 __P((struct frame *frame, struct instruction *insn,
- struct insn_ea *ea, int modreg));
-static int fetch_immed __P((struct frame *frame, struct instruction *insn,
- int *dst));
-static int fetch_disp __P((struct frame *frame, struct instruction *insn,
- int size, int *res));
-static int calc_ea __P((struct insn_ea *ea, char *ptr, char **eaddr));
+static int decode_ea6(struct frame *frame, struct instruction *insn,
+ struct insn_ea *ea, int modreg);
+static int fetch_immed(struct frame *frame, struct instruction *insn,
+ int *dst);
+static int fetch_disp(struct frame *frame, struct instruction *insn,
+ int size, int *res);
+static int calc_ea(struct insn_ea *ea, char *ptr, char **eaddr);
/*
* Helper routines for dealing with "effective address" values.
diff --git a/sys/arch/m68k/fpe/fpu_emulate.c b/sys/arch/m68k/fpe/fpu_emulate.c
index db204083c54..07d55158bbc 100644
--- a/sys/arch/m68k/fpe/fpu_emulate.c
+++ b/sys/arch/m68k/fpe/fpu_emulate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emulate.c,v 1.28 2009/01/20 14:57:21 tsutsui Exp $ */
+/* $NetBSD: fpu_emulate.c,v 1.29 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_emulate.c,v 1.28 2009/01/20 14:57:21 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_emulate.c,v 1.29 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -59,13 +59,13 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_emulate.c,v 1.28 2009/01/20 14:57:21 tsutsui Exp
return -1; \
} while (/*CONSTCOND*/0)
-static int fpu_emul_fmovmcr __P((struct fpemu *fe, struct instruction *insn));
-static int fpu_emul_fmovm __P((struct fpemu *fe, struct instruction *insn));
-static int fpu_emul_arith __P((struct fpemu *fe, struct instruction *insn));
-static int fpu_emul_type1 __P((struct fpemu *fe, struct instruction *insn));
-static int fpu_emul_brcc __P((struct fpemu *fe, struct instruction *insn));
-static int test_cc __P((struct fpemu *fe, int pred));
-static struct fpn *fpu_cmp __P((struct fpemu *fe));
+static int fpu_emul_fmovmcr(struct fpemu *fe, struct instruction *insn);
+static int fpu_emul_fmovm(struct fpemu *fe, struct instruction *insn);
+static int fpu_emul_arith(struct fpemu *fe, struct instruction *insn);
+static int fpu_emul_type1(struct fpemu *fe, struct instruction *insn);
+static int fpu_emul_brcc(struct fpemu *fe, struct instruction *insn);
+static int test_cc(struct fpemu *fe, int pred);
+static struct fpn *fpu_cmp(struct fpemu *fe);
#if DEBUG_FPE
# define DUMP_INSN(insn) \
diff --git a/sys/arch/m68k/fpe/fpu_emulate.h b/sys/arch/m68k/fpe/fpu_emulate.h
index b379d597dbf..ca9c87288a4 100644
--- a/sys/arch/m68k/fpe/fpu_emulate.h
+++ b/sys/arch/m68k/fpe/fpu_emulate.h
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emulate.h,v 1.14 2009/01/27 20:12:19 martin Exp $ */
+/* $NetBSD: fpu_emulate.h,v 1.15 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1995 Gordon Ross
@@ -213,57 +213,57 @@ struct instruction {
*/
/* Build a new Quiet NaN (sign=0, frac=all 1's). */
-struct fpn *fpu_newnan __P((struct fpemu *fe));
+struct fpn *fpu_newnan(struct fpemu *fe);
/*
* Shift a number right some number of bits, taking care of round/sticky.
* Note that the result is probably not a well-formed number (it will lack
* the normal 1-bit mant[0]&FP_1).
*/
-int fpu_shr __P((struct fpn * fp, int shr));
+int fpu_shr(struct fpn * fp, int shr);
/*
* Round a number according to the round mode in FPCR
*/
-int fpu_round __P((register struct fpemu *fe, register struct fpn *fp));
+int fpu_round(register struct fpemu *fe, register struct fpn *fp);
/* type conversion */
-void fpu_explode __P((struct fpemu *fe, struct fpn *fp, int t, u_int *src));
-void fpu_implode __P((struct fpemu *fe, struct fpn *fp, int t, u_int *dst));
+void fpu_explode(struct fpemu *fe, struct fpn *fp, int t, u_int *src);
+void fpu_implode(struct fpemu *fe, struct fpn *fp, int t, u_int *dst);
/*
* non-static emulation functions
*/
/* type 0 */
-int fpu_emul_fmovecr __P((struct fpemu *fe, struct instruction *insn));
-int fpu_emul_fstore __P((struct fpemu *fe, struct instruction *insn));
-int fpu_emul_fscale __P((struct fpemu *fe, struct instruction *insn));
+int fpu_emul_fmovecr(struct fpemu *fe, struct instruction *insn);
+int fpu_emul_fstore(struct fpemu *fe, struct instruction *insn);
+int fpu_emul_fscale(struct fpemu *fe, struct instruction *insn);
/*
* include function declarations of those which are called by fpu_emul_arith()
*/
#include "fpu_arith_proto.h"
-int fpu_emulate __P((struct frame *frame, struct fpframe *fpf, ksiginfo_t *ksi));
+int fpu_emulate(struct frame *frame, struct fpframe *fpf, ksiginfo_t *ksi);
/*
* "helper" functions
*/
/* return values from constant rom */
-struct fpn *fpu_const __P((struct fpn *fp, u_int offset));
+struct fpn *fpu_const(struct fpn *fp, u_int offset);
/* update exceptions and FPSR */
-int fpu_upd_excp __P((struct fpemu *fe));
-u_int fpu_upd_fpsr __P((struct fpemu *fe, struct fpn *fp));
+int fpu_upd_excp(struct fpemu *fe);
+u_int fpu_upd_fpsr(struct fpemu *fe, struct fpn *fp);
/* address mode decoder, and load/store */
-int fpu_decode_ea __P((struct frame *frame, struct instruction *insn,
- struct insn_ea *ea, int modreg));
-int fpu_load_ea __P((struct frame *frame, struct instruction *insn,
- struct insn_ea *ea, char *dst));
-int fpu_store_ea __P((struct frame *frame, struct instruction *insn,
- struct insn_ea *ea, char *src));
+int fpu_decode_ea(struct frame *frame, struct instruction *insn,
+ struct insn_ea *ea, int modreg);
+int fpu_load_ea(struct frame *frame, struct instruction *insn,
+ struct insn_ea *ea, char *dst);
+int fpu_store_ea(struct frame *frame, struct instruction *insn,
+ struct insn_ea *ea, char *src);
/* fpu_subr.c */
-void fpu_norm __P((register struct fpn *fp));
+void fpu_norm(register struct fpn *fp);
#if !defined(FPE_DEBUG)
# define FPE_DEBUG 0
diff --git a/sys/arch/m68k/fpe/fpu_explode.c b/sys/arch/m68k/fpe/fpu_explode.c
index 9d3f1993a5b..a44b0cedb6e 100644
--- a/sys/arch/m68k/fpe/fpu_explode.c
+++ b/sys/arch/m68k/fpe/fpu_explode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_explode.c,v 1.7 2005/12/11 12:17:52 christos Exp $ */
+/* $NetBSD: fpu_explode.c,v 1.8 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.7 2005/12/11 12:17:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.8 2009/03/14 14:46:01 dsl Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -59,10 +59,10 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.7 2005/12/11 12:17:52 christos Exp
/* Conversion to internal format -- note asymmetry. */
-static int fpu_itof __P((struct fpn *fp, u_int i));
-static int fpu_stof __P((struct fpn *fp, u_int i));
-static int fpu_dtof __P((struct fpn *fp, u_int i, u_int j));
-static int fpu_xtof __P((struct fpn *fp, u_int i, u_int j, u_int k));
+static int fpu_itof(struct fpn *fp, u_int i);
+static int fpu_stof(struct fpn *fp, u_int i);
+static int fpu_dtof(struct fpn *fp, u_int i, u_int j);
+static int fpu_xtof(struct fpn *fp, u_int i, u_int j, u_int k);
/*
* N.B.: in all of the following, we assume the FP format is
diff --git a/sys/arch/m68k/fpe/fpu_implode.c b/sys/arch/m68k/fpe/fpu_implode.c
index 45dbd880322..c7defae1b9b 100644
--- a/sys/arch/m68k/fpe/fpu_implode.c
+++ b/sys/arch/m68k/fpe/fpu_implode.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_implode.c,v 1.9 2005/12/11 12:17:52 christos Exp $ */
+/* $NetBSD: fpu_implode.c,v 1.10 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.9 2005/12/11 12:17:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.10 2009/03/14 14:46:01 dsl Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -58,10 +58,10 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_implode.c,v 1.9 2005/12/11 12:17:52 christos Exp
#include "fpu_arith.h"
/* Conversion from internal format -- note asymmetry. */
-static u_int fpu_ftoi __P((struct fpemu *fe, struct fpn *fp));
-static u_int fpu_ftos __P((struct fpemu *fe, struct fpn *fp));
-static u_int fpu_ftod __P((struct fpemu *fe, struct fpn *fp, u_int *));
-static u_int fpu_ftox __P((struct fpemu *fe, struct fpn *fp, u_int *));
+static u_int fpu_ftoi(struct fpemu *fe, struct fpn *fp);
+static u_int fpu_ftos(struct fpemu *fe, struct fpn *fp);
+static u_int fpu_ftod(struct fpemu *fe, struct fpn *fp, u_int *);
+static u_int fpu_ftox(struct fpemu *fe, struct fpn *fp, u_int *);
/*
* Round a number (algorithm from Motorola MC68882 manual, modified for
diff --git a/sys/arch/m68k/fpe/fpu_log.c b/sys/arch/m68k/fpe/fpu_log.c
index 8073459f412..a46201a6d0a 100644
--- a/sys/arch/m68k/fpe/fpu_log.c
+++ b/sys/arch/m68k/fpe/fpu_log.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_log.c,v 1.9 2005/12/11 12:17:52 christos Exp $ */
+/* $NetBSD: fpu_log.c,v 1.10 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_log.c,v 1.9 2005/12/11 12:17:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_log.c,v 1.10 2009/03/14 14:46:01 dsl Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -187,7 +187,7 @@ static struct sfpn {
{ 0x3FFE - 0x3fff, 0xB07197A2U, 0x3C46C654U },
};
-static struct fpn *__fpu_logn __P((struct fpemu *fe));
+static struct fpn *__fpu_logn(struct fpemu *fe);
/*
* natural log - algorithm taken from Motorola FPSP,
diff --git a/sys/arch/m68k/fpe/fpu_rem.c b/sys/arch/m68k/fpe/fpu_rem.c
index ae4d6e5b770..f65d609ca05 100644
--- a/sys/arch/m68k/fpe/fpu_rem.c
+++ b/sys/arch/m68k/fpe/fpu_rem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_rem.c,v 1.6 2005/12/11 12:17:52 christos Exp $ */
+/* $NetBSD: fpu_rem.c,v 1.7 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1995 Ken Nakata
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu_rem.c,v 1.6 2005/12/11 12:17:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_rem.c,v 1.7 2009/03/14 14:46:01 dsl Exp $");
#include <sys/types.h>
#include <sys/signal.h>
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: fpu_rem.c,v 1.6 2005/12/11 12:17:52 christos Exp $")
* R := 0. Return signQ, last 7 bits of Q, and R.
*/
-static struct fpn * __fpu_modrem __P((struct fpemu *fe, int modrem));
+static struct fpn * __fpu_modrem(struct fpemu *fe, int modrem);
static struct fpn *
__fpu_modrem(fe, modrem)
diff --git a/sys/arch/m68k/m68k/db_disasm.h b/sys/arch/m68k/m68k/db_disasm.h
index e036fcefa51..b01bfc9f498 100644
--- a/sys/arch/m68k/m68k/db_disasm.h
+++ b/sys/arch/m68k/m68k/db_disasm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.h,v 1.8 2007/02/21 22:59:46 thorpej Exp $ */
+/* $NetBSD: db_disasm.h,v 1.9 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -425,4 +425,4 @@ typedef struct dis_buffer dis_buffer_t;
#define PRINT_DREG(dbuf, reg) addstr(dbuf, dregs[reg])
#define PRINT_AREG(dbuf, reg) addstr(dbuf, aregs[reg])
-db_addr_t db_disasm __P((db_addr_t loc, bool moto_syntax));
+db_addr_t db_disasm(db_addr_t loc, bool moto_syntax);
diff --git a/sys/arch/macppc/dev/abtn.c b/sys/arch/macppc/dev/abtn.c
index 60a1b22bf25..3f35f84bef7 100644
--- a/sys/arch/macppc/dev/abtn.c
+++ b/sys/arch/macppc/dev/abtn.c
@@ -1,4 +1,4 @@
-/* $NetBSD: abtn.c,v 1.14 2008/06/13 11:54:31 cegger Exp $ */
+/* $NetBSD: abtn.c,v 1.15 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1999 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: abtn.c,v 1.14 2008/06/13 11:54:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: abtn.c,v 1.15 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -61,9 +61,9 @@ struct abtn_softc {
int volume; /* speaker volume (not yet) */
};
-static int abtn_match __P((struct device *, struct cfdata *, void *));
-static void abtn_attach __P((struct device *, struct device *, void *));
-static void abtn_adbcomplete __P((uint8_t *, uint8_t *, int));
+static int abtn_match(struct device *, struct cfdata *, void *);
+static void abtn_attach(struct device *, struct device *, void *);
+static void abtn_adbcomplete(uint8_t *, uint8_t *, int);
CFATTACH_DECL(abtn, sizeof(struct abtn_softc),
abtn_match, abtn_attach, NULL, NULL);
diff --git a/sys/arch/macppc/dev/adb.c b/sys/arch/macppc/dev/adb.c
index 9156dfcc1d7..2d10db2fb9c 100644
--- a/sys/arch/macppc/dev/adb.c
+++ b/sys/arch/macppc/dev/adb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adb.c,v 1.24 2007/11/07 19:47:00 garbled Exp $ */
+/* $NetBSD: adb.c,v 1.25 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.24 2007/11/07 19:47:00 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.25 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -60,9 +60,9 @@ __KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.24 2007/11/07 19:47:00 garbled Exp $");
/*
* Function declarations.
*/
-static int adbmatch __P((struct device *, struct cfdata *, void *));
-static void adbattach __P((struct device *, struct device *, void *));
-static int adbprint __P((void *, const char *));
+static int adbmatch(struct device *, struct cfdata *, void *);
+static void adbattach(struct device *, struct device *, void *);
+static int adbprint(void *, const char *);
static void adb_todr_init(void);
/*
diff --git a/sys/arch/macppc/dev/adb_direct.c b/sys/arch/macppc/dev/adb_direct.c
index b326a688c2b..131cf5c84b9 100644
--- a/sys/arch/macppc/dev/adb_direct.c
+++ b/sys/arch/macppc/dev/adb_direct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_direct.c,v 1.39 2007/10/17 19:55:17 garbled Exp $ */
+/* $NetBSD: adb_direct.c,v 1.40 2009/03/14 14:46:01 dsl Exp $ */
/* From: adb_direct.c 2.02 4/18/97 jpw */
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.39 2007/10/17 19:55:17 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.40 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -153,7 +153,7 @@ __KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.39 2007/10/17 19:55:17 garbled Exp
* A structure for storing information about each ADB device.
*/
struct ADBDevEntry {
- void (*ServiceRtPtr) __P((void));
+ void (*ServiceRtPtr)(void);
void *DataAreaAddr;
int devType;
int origAddr;
@@ -227,38 +227,38 @@ struct callout adb_soft_intr_ch;
volatile u_char *Via1Base;
extern int adb_polling; /* Are we polling? */
-void pm_setup_adb __P((void));
-void pm_check_adb_devices __P((int));
-int pm_adb_op __P((u_char *, void *, volatile void *, int));
-void pm_init_adb_device __P((void));
+void pm_setup_adb(void);
+void pm_check_adb_devices(int);
+int pm_adb_op(u_char *, void *, volatile void *, int);
+void pm_init_adb_device(void);
/*
* The following are private routines.
*/
#ifdef ADB_DEBUG
-void print_single __P((u_char *));
+void print_single(u_char *);
#endif
-void adb_soft_intr __P((void));
-int send_adb_cuda __P((u_char *, u_char *, adbComp *, volatile void *, int));
-void adb_intr_cuda_test __P((void));
-void adb_cuda_tickle __P((void));
-void adb_pass_up __P((struct adbCommand *));
-void adb_op_comprout __P((void *, volatile int *, int));
-void adb_reinit __P((void));
-int count_adbs __P((void));
-int get_ind_adb_info __P((ADBDataBlock *, int));
-int get_adb_info __P((ADBDataBlock *, int));
-int set_adb_info __P((ADBSetInfoBlock *, int));
-void adb_setup_hw_type __P((void));
+void adb_soft_intr(void);
+int send_adb_cuda(u_char *, u_char *, adbComp *, volatile void *, int);
+void adb_intr_cuda_test(void);
+void adb_cuda_tickle(void);
+void adb_pass_up(struct adbCommand *);
+void adb_op_comprout(void *, volatile int *, int);
+void adb_reinit(void);
+int count_adbs(void);
+int get_ind_adb_info(ADBDataBlock *, int);
+int get_adb_info(ADBDataBlock *, int);
+int set_adb_info(ADBSetInfoBlock *, int);
+void adb_setup_hw_type(void);
int adb_op (Ptr, adbComp *, volatile void *, short);
-int adb_op_sync __P((Ptr, adbComp *, Ptr, short));
-void adb_hw_setup __P((void));
-int adb_cmd_result __P((u_char *));
-int adb_cmd_extra __P((u_char *));
+int adb_op_sync(Ptr, adbComp *, Ptr, short);
+void adb_hw_setup(void);
+int adb_cmd_result(u_char *);
+int adb_cmd_extra(u_char *);
/* we should create this and it will be the public version */
-int send_adb __P((u_char *, void *, void *));
+int send_adb(u_char *, void *, void *);
-int setsoftadb __P((void));
+int setsoftadb(void);
#ifdef ADB_DEBUG
/*
diff --git a/sys/arch/macppc/dev/adbvar.h b/sys/arch/macppc/dev/adbvar.h
index cd1160988a0..15eed1f66fb 100644
--- a/sys/arch/macppc/dev/adbvar.h
+++ b/sys/arch/macppc/dev/adbvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: adbvar.h,v 1.12 2007/03/04 06:00:10 christos Exp $ */
+/* $NetBSD: adbvar.h,v 1.13 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -95,19 +95,19 @@ extern int adbHardware;
#define ADBLISTEN(dev, reg) ((((u_int8_t)(dev) & 0x0f) << 4) | 0x08 | (reg))
#define ADBTALK(dev, reg) ((((u_int8_t)(dev) & 0x0f) << 4) | 0x0c | (reg))
-int adb_intr __P((void *));
-int adb_poweroff __P((void));
-void adb_restart __P((void));
-void adb_cuda_autopoll __P((void));
-int adb_intr_cuda __P((void *));
-int CountADBs __P((void));
-void ADBReInit __P((void));
-int GetIndADB __P((ADBDataBlock * info, int index));
-int GetADBInfo __P((ADBDataBlock * info, int adbAddr));
-int SetADBInfo __P((ADBSetInfoBlock * info, int adbAddr));
-int ADBOp __P((Ptr buffer, adbComp *compRout, Ptr data, short commandNum));
-int adb_read_date_time __P((unsigned long *t));
-int adb_set_date_time __P((unsigned long t));
-
-int adb_op_sync __P((Ptr, adbComp *, Ptr, short));
-void adb_op_comprout __P((void *, volatile int *, int));
+int adb_intr(void *);
+int adb_poweroff(void);
+void adb_restart(void);
+void adb_cuda_autopoll(void);
+int adb_intr_cuda(void *);
+int CountADBs(void);
+void ADBReInit(void);
+int GetIndADB(ADBDataBlock * info, int index);
+int GetADBInfo(ADBDataBlock * info, int adbAddr);
+int SetADBInfo(ADBSetInfoBlock * info, int adbAddr);
+int ADBOp(Ptr buffer, adbComp *compRout, Ptr data, short commandNum);
+int adb_read_date_time(unsigned long *t);
+int adb_set_date_time(unsigned long t);
+
+int adb_op_sync(Ptr, adbComp *, Ptr, short);
+void adb_op_comprout(void *, volatile int *, int);
diff --git a/sys/arch/macppc/dev/aed.c b/sys/arch/macppc/dev/aed.c
index f78704dbe53..eb568dfe52b 100644
--- a/sys/arch/macppc/dev/aed.c
+++ b/sys/arch/macppc/dev/aed.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aed.c,v 1.21 2008/03/01 14:16:49 rmind Exp $ */
+/* $NetBSD: aed.c,v 1.22 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.21 2008/03/01 14:16:49 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.22 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -56,13 +56,13 @@ __KERNEL_RCSID(0, "$NetBSD: aed.c,v 1.21 2008/03/01 14:16:49 rmind Exp $");
/*
* Function declarations.
*/
-static int aedmatch __P((struct device *, struct cfdata *, void *));
-static void aedattach __P((struct device *, struct device *, void *));
-static void aed_emulate_mouse __P((adb_event_t *event));
-static void aed_kbdrpt __P((void *kstate));
-static void aed_dokeyupdown __P((adb_event_t *event));
-static void aed_handoff __P((adb_event_t *event));
-static void aed_enqevent __P((adb_event_t *event));
+static int aedmatch(struct device *, struct cfdata *, void *);
+static void aedattach(struct device *, struct device *, void *);
+static void aed_emulate_mouse(adb_event_t *event);
+static void aed_kbdrpt(void *kstate);
+static void aed_dokeyupdown(adb_event_t *event);
+static void aed_handoff(adb_event_t *event);
+static void aed_enqevent(adb_event_t *event);
/*
* Global variables.
diff --git a/sys/arch/macppc/dev/aedvar.h b/sys/arch/macppc/dev/aedvar.h
index 5faefcb149e..09ed2254ed4 100644
--- a/sys/arch/macppc/dev/aedvar.h
+++ b/sys/arch/macppc/dev/aedvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: aedvar.h,v 1.3 2002/09/06 13:18:43 gehenna Exp $ */
+/* $NetBSD: aedvar.h,v 1.4 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1994 Bradley A. Grantham
@@ -72,4 +72,4 @@ struct aed_softc {
/* Options */
#define AED_MSEMUL 0x1 /* emulate mouse buttons */
-void aed_input __P((adb_event_t *event));
+void aed_input(adb_event_t *event);
diff --git a/sys/arch/macppc/dev/akbd.c b/sys/arch/macppc/dev/akbd.c
index bba35051813..eea664dbefd 100644
--- a/sys/arch/macppc/dev/akbd.c
+++ b/sys/arch/macppc/dev/akbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: akbd.c,v 1.39 2008/06/13 11:54:31 cegger Exp $ */
+/* $NetBSD: akbd.c,v 1.40 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.39 2008/06/13 11:54:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.40 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -64,13 +64,13 @@ __KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.39 2008/06/13 11:54:31 cegger Exp $");
/*
* Function declarations.
*/
-static int akbdmatch __P((struct device *, struct cfdata *, void *));
-static void akbdattach __P((struct device *, struct device *, void *));
-static void kbd_processevent __P((adb_event_t *event, struct akbd_softc *));
+static int akbdmatch(struct device *, struct cfdata *, void *);
+static void akbdattach(struct device *, struct device *, void *);
+static void kbd_processevent(adb_event_t *event, struct akbd_softc *);
#ifdef notyet
-static u_char getleds __P((int));
-static int setleds __P((struct akbd_softc *, u_char));
-static void blinkleds __P((struct akbd_softc *));
+static u_char getleds(int);
+static int setleds(struct akbd_softc *, u_char);
+static void blinkleds(struct akbd_softc *);
#endif
/* Driver definition. */
@@ -79,9 +79,9 @@ CFATTACH_DECL(akbd, sizeof(struct akbd_softc),
extern struct cfdriver akbd_cd;
-int akbd_enable __P((void *, int));
-void akbd_set_leds __P((void *, int));
-int akbd_ioctl __P((void *, u_long, void *, int, struct lwp *));
+int akbd_enable(void *, int);
+void akbd_set_leds(void *, int);
+int akbd_ioctl(void *, u_long, void *, int, struct lwp *);
struct wskbd_accessops akbd_accessops = {
akbd_enable,
@@ -89,8 +89,8 @@ struct wskbd_accessops akbd_accessops = {
akbd_ioctl,
};
-void akbd_cngetc __P((void *, u_int *, int *));
-void akbd_cnpollc __P((void *, int));
+void akbd_cngetc(void *, u_int *, int *);
+void akbd_cnpollc(void *, int);
struct wskbd_consops akbd_consops = {
akbd_cngetc,
diff --git a/sys/arch/macppc/dev/akbdvar.h b/sys/arch/macppc/dev/akbdvar.h
index 683a7885f55..db6ff50034e 100644
--- a/sys/arch/macppc/dev/akbdvar.h
+++ b/sys/arch/macppc/dev/akbdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: akbdvar.h,v 1.12 2007/03/05 10:47:06 tsutsui Exp $ */
+/* $NetBSD: akbdvar.h,v 1.13 2009/03/14 14:46:01 dsl Exp $ */
/* $OpenBSD: akbdvar.h,v 1.3 2002/03/27 21:48:12 drahn Exp $ */
@@ -67,7 +67,7 @@ struct akbd_softc {
#define LED_CAPSLOCK 0x2
#define LED_SCROLL_LOCK 0x4
-void kbd_adbcomplete __P((uint8_t *buffer, uint8_t *data_area, int adb_command));
-void kbd_passup __P((struct akbd_softc *sc, int));
+void kbd_adbcomplete(uint8_t *buffer, uint8_t *data_area, int adb_command);
+void kbd_passup(struct akbd_softc *sc, int);
#endif /* _MACPPC_KBDVAR_H_ */
diff --git a/sys/arch/macppc/dev/am79c950.c b/sys/arch/macppc/dev/am79c950.c
index 4be55fe7c5d..a09d64219a1 100644
--- a/sys/arch/macppc/dev/am79c950.c
+++ b/sys/arch/macppc/dev/am79c950.c
@@ -1,4 +1,4 @@
-/* $NetBSD: am79c950.c,v 1.24 2008/11/07 00:20:02 dyoung Exp $ */
+/* $NetBSD: am79c950.c,v 1.25 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 1997 David Huang <khym@bga.com>
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.24 2008/11/07 00:20:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.25 2009/03/14 14:46:01 dsl Exp $");
#include "opt_inet.h"
@@ -76,21 +76,21 @@ __KERNEL_RCSID(0, "$NetBSD: am79c950.c,v 1.24 2008/11/07 00:20:02 dyoung Exp $")
#include <macppc/dev/am79c950reg.h>
#include <macppc/dev/if_mcvar.h>
-hide void mcwatchdog __P((struct ifnet *));
-hide int mcinit __P((struct mc_softc *sc));
-hide int mcstop __P((struct mc_softc *sc));
-hide int mcioctl __P((struct ifnet *ifp, u_long cmd, void *data));
-hide void mcstart __P((struct ifnet *ifp));
-hide void mcreset __P((struct mc_softc *sc));
-
-integrate u_int maceput __P((struct mc_softc *sc, struct mbuf *m0));
-integrate void mc_tint __P((struct mc_softc *sc));
-integrate void mace_read __P((struct mc_softc *, uint8_t *, int));
-integrate struct mbuf *mace_get __P((struct mc_softc *, uint8_t *, int));
-static void mace_calcladrf __P((struct ethercom *ac, u_int8_t *af));
-static inline u_int16_t ether_cmp __P((void *, void *));
-static int mc_mediachange __P((struct ifnet *));
-static void mc_mediastatus __P((struct ifnet *, struct ifmediareq *));
+hide void mcwatchdog(struct ifnet *);
+hide int mcinit(struct mc_softc *sc);
+hide int mcstop(struct mc_softc *sc);
+hide int mcioctl(struct ifnet *ifp, u_long cmd, void *data);
+hide void mcstart(struct ifnet *ifp);
+hide void mcreset(struct mc_softc *sc);
+
+integrate u_int maceput(struct mc_softc *sc, struct mbuf *m0);
+integrate void mc_tint(struct mc_softc *sc);
+integrate void mace_read(struct mc_softc *, uint8_t *, int);
+integrate struct mbuf *mace_get(struct mc_softc *, uint8_t *, int);
+static void mace_calcladrf(struct ethercom *ac, u_int8_t *af);
+static inline u_int16_t ether_cmp(void *, void *);
+static int mc_mediachange(struct ifnet *);
+static void mc_mediastatus(struct ifnet *, struct ifmediareq *);
/*
* Compare two Ether/802 addresses for equality, inlined and
diff --git a/sys/arch/macppc/dev/amsvar.h b/sys/arch/macppc/dev/amsvar.h
index 3da4350014b..0a5e9dd33ed 100644
--- a/sys/arch/macppc/dev/amsvar.h
+++ b/sys/arch/macppc/dev/amsvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: amsvar.h,v 1.8 2007/03/05 10:47:06 tsutsui Exp $ */
+/* $NetBSD: amsvar.h,v 1.9 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -71,7 +71,7 @@ struct ams_softc {
#define MSCLASS_TRACKBALL 2
#define MSCLASS_TRACKPAD 3
-void ms_adbcomplete __P((uint8_t *buffer, uint8_t *data_area, int adb_command));
-void ms_handoff __P((adb_event_t *event, struct ams_softc *));
+void ms_adbcomplete(uint8_t *buffer, uint8_t *data_area, int adb_command);
+void ms_handoff(adb_event_t *event, struct ams_softc *);
#endif /* _MACPPC_AMSVAR_H_ */
diff --git a/sys/arch/macppc/dev/apm.c b/sys/arch/macppc/dev/apm.c
index 42ee15894e4..a53348f872a 100644
--- a/sys/arch/macppc/dev/apm.c
+++ b/sys/arch/macppc/dev/apm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: apm.c,v 1.20 2008/06/13 11:54:31 cegger Exp $ */
+/* $NetBSD: apm.c,v 1.21 2009/03/14 14:46:01 dsl Exp $ */
/* $OpenBSD: apm.c,v 1.5 2002/06/07 07:13:59 miod Exp $ */
/*-
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.20 2008/06/13 11:54:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apm.c,v 1.21 2009/03/14 14:46:01 dsl Exp $");
#include "apm.h"
@@ -107,7 +107,7 @@ void apmattach(struct device *, struct device *, void *);
#ifdef __NetBSD__
#if 0
-static int apm_record_event __P((struct apm_softc *, u_int));
+static int apm_record_event(struct apm_softc *, u_int);
#endif
#endif
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index 4a7fde6c9b3..09e6c2f64ab 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc.c,v 1.14 2008/10/05 05:01:08 macallan Exp $ */
+/* $NetBSD: if_mc.c,v 1.15 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 1997 David Huang <khym@bga.com>
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.14 2008/10/05 05:01:08 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.15 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -61,17 +61,17 @@ __KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.14 2008/10/05 05:01:08 macallan Exp $");
#define MC_BUFSIZE 0x800
-hide int mc_match __P((struct device *, struct cfdata *, void *));
-hide void mc_attach __P((struct device *, struct device *, void *));
-hide void mc_init __P((struct mc_softc *sc));
-hide void mc_putpacket __P((struct mc_softc *sc, u_int len));
-hide int mc_dmaintr __P((void *arg));
-hide void mc_reset_rxdma __P((struct mc_softc *sc));
-hide void mc_reset_txdma __P((struct mc_softc *sc));
-hide void mc_select_utp __P((struct mc_softc *sc));
-hide void mc_select_aui __P((struct mc_softc *sc));
-hide int mc_mediachange __P((struct mc_softc *sc));
-hide void mc_mediastatus __P((struct mc_softc *sc, struct ifmediareq *));
+hide int mc_match(struct device *, struct cfdata *, void *);
+hide void mc_attach(struct device *, struct device *, void *);
+hide void mc_init(struct mc_softc *sc);
+hide void mc_putpacket(struct mc_softc *sc, u_int len);
+hide int mc_dmaintr(void *arg);
+hide void mc_reset_rxdma(struct mc_softc *sc);
+hide void mc_reset_txdma(struct mc_softc *sc);
+hide void mc_select_utp(struct mc_softc *sc);
+hide void mc_select_aui(struct mc_softc *sc);
+hide int mc_mediachange(struct mc_softc *sc);
+hide void mc_mediastatus(struct mc_softc *sc, struct ifmediareq *);
int mc_supmedia[] = {
IFM_ETHER | IFM_10_T,
diff --git a/sys/arch/macppc/dev/if_mcvar.h b/sys/arch/macppc/dev/if_mcvar.h
index a8e8f6aaa7c..1badd1a810c 100644
--- a/sys/arch/macppc/dev/if_mcvar.h
+++ b/sys/arch/macppc/dev/if_mcvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mcvar.h,v 1.11 2007/03/05 10:50:01 tsutsui Exp $ */
+/* $NetBSD: if_mcvar.h,v 1.12 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 1997 David Huang <khym@bga.com>
@@ -74,11 +74,11 @@ struct mc_softc {
u_int8_t sc_enaddr[6];
u_int8_t sc_pad[2];
int sc_havecarrier; /* carrier status */
- void (*sc_bus_init) __P((struct mc_softc *));
- void (*sc_putpacket) __P((struct mc_softc *, u_int));
- int (*sc_mediachange) __P((struct mc_softc *));
- void (*sc_mediastatus) __P((struct mc_softc *,
- struct ifmediareq *));
+ void (*sc_bus_init)(struct mc_softc *);
+ void (*sc_putpacket)(struct mc_softc *, u_int);
+ int (*sc_mediachange)(struct mc_softc *);
+ void (*sc_mediastatus)(struct mc_softc *,
+ struct ifmediareq *);
bus_space_tag_t sc_regt;
bus_space_handle_t sc_regh;
@@ -94,6 +94,6 @@ struct mc_softc {
dbdma_command_t *sc_rxdmacmd;
};
-int mcsetup __P((struct mc_softc *, u_int8_t *));
-int mcintr __P((void *arg));
-void mc_rint __P((struct mc_softc *sc));
+int mcsetup(struct mc_softc *, u_int8_t *);
+int mcintr(void *arg);
+void mc_rint(struct mc_softc *sc);
diff --git a/sys/arch/macppc/dev/ki2c.c b/sys/arch/macppc/dev/ki2c.c
index 2196ad9af26..8f0fa41982e 100644
--- a/sys/arch/macppc/dev/ki2c.c
+++ b/sys/arch/macppc/dev/ki2c.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ki2c.c,v 1.12 2009/02/08 01:13:39 pgoyette Exp $ */
+/* $NetBSD: ki2c.c,v 1.13 2009/03/14 14:46:01 dsl Exp $ */
/* Id: ki2c.c,v 1.7 2002/10/05 09:56:05 tsubai Exp */
/*-
@@ -51,7 +51,7 @@ int ki2c_poll(struct ki2c_softc *, int);
int ki2c_start(struct ki2c_softc *, int, int, void *, int);
int ki2c_read(struct ki2c_softc *, int, int, void *, int);
int ki2c_write(struct ki2c_softc *, int, int, void *, int);
-int ki2c_print __P((void *, const char *));
+int ki2c_print(void *, const char *);
/* I2C glue */
static int ki2c_i2c_acquire_bus(void *, int);
diff --git a/sys/arch/macppc/dev/mediabay.c b/sys/arch/macppc/dev/mediabay.c
index 3a2365df764..0c4be30891e 100644
--- a/sys/arch/macppc/dev/mediabay.c
+++ b/sys/arch/macppc/dev/mediabay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mediabay.c,v 1.15 2008/08/28 04:05:50 jmcneill Exp $ */
+/* $NetBSD: mediabay.c,v 1.16 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1999 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.15 2008/08/28 04:05:50 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.16 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -64,12 +64,12 @@ static const char *mediabay_keylargo[] = {
NULL
};
-void mediabay_attach __P((struct device *, struct device *, void *));
-int mediabay_match __P((struct device *, struct cfdata *, void *));
-int mediabay_print __P((void *, const char *));
-void mediabay_attach_content __P((struct mediabay_softc *));
-int mediabay_intr __P((void *));
-void mediabay_kthread __P((void *));
+void mediabay_attach(struct device *, struct device *, void *);
+int mediabay_match(struct device *, struct cfdata *, void *);
+int mediabay_print(void *, const char *);
+void mediabay_attach_content(struct mediabay_softc *);
+int mediabay_intr(void *);
+void mediabay_kthread(void *);
CFATTACH_DECL(mediabay, sizeof(struct mediabay_softc),
mediabay_match, mediabay_attach, NULL, NULL);
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index 7bc2a5348fd..b54b712501b 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mesh.c,v 1.27 2008/12/16 22:35:24 christos Exp $ */
+/* $NetBSD: mesh.c,v 1.28 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.27 2008/12/16 22:35:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.28 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -133,35 +133,35 @@ struct mesh_softc {
#define SEND_IDENTIFY 2
#define SEND_SDTR 4
-static inline int mesh_read_reg __P((struct mesh_softc *, int));
-static inline void mesh_set_reg __P((struct mesh_softc *, int, int));
-
-int mesh_match __P((struct device *, struct cfdata *, void *));
-void mesh_attach __P((struct device *, struct device *, void *));
-void mesh_shutdownhook __P((void *));
-int mesh_intr __P((void *));
-void mesh_error __P((struct mesh_softc *, struct mesh_scb *, int, int));
-void mesh_select __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_identify __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_command __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_dma_setup __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_dataio __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_status __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_msgin __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_msgout __P((struct mesh_softc *, int));
-void mesh_bus_reset __P((struct mesh_softc *));
-void mesh_reset __P((struct mesh_softc *));
-int mesh_stp __P((struct mesh_softc *, int));
-void mesh_setsync __P((struct mesh_softc *, struct mesh_tinfo *));
-struct mesh_scb *mesh_get_scb __P((struct mesh_softc *));
-void mesh_free_scb __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_scsi_request __P((struct scsipi_channel *,
- scsipi_adapter_req_t, void *));
-void mesh_sched __P((struct mesh_softc *));
-int mesh_poll __P((struct mesh_softc *, struct scsipi_xfer *));
-void mesh_done __P((struct mesh_softc *, struct mesh_scb *));
-void mesh_timeout __P((void *));
-void mesh_minphys __P((struct buf *));
+static inline int mesh_read_reg(struct mesh_softc *, int);
+static inline void mesh_set_reg(struct mesh_softc *, int, int);
+
+int mesh_match(struct device *, struct cfdata *, void *);
+void mesh_attach(struct device *, struct device *, void *);
+void mesh_shutdownhook(void *);
+int mesh_intr(void *);
+void mesh_error(struct mesh_softc *, struct mesh_scb *, int, int);
+void mesh_select(struct mesh_softc *, struct mesh_scb *);
+void mesh_identify(struct mesh_softc *, struct mesh_scb *);
+void mesh_command(struct mesh_softc *, struct mesh_scb *);
+void mesh_dma_setup(struct mesh_softc *, struct mesh_scb *);
+void mesh_dataio(struct mesh_softc *, struct mesh_scb *);
+void mesh_status(struct mesh_softc *, struct mesh_scb *);
+void mesh_msgin(struct mesh_softc *, struct mesh_scb *);
+void mesh_msgout(struct mesh_softc *, int);
+void mesh_bus_reset(struct mesh_softc *);
+void mesh_reset(struct mesh_softc *);
+int mesh_stp(struct mesh_softc *, int);
+void mesh_setsync(struct mesh_softc *, struct mesh_tinfo *);
+struct mesh_scb *mesh_get_scb(struct mesh_softc *);
+void mesh_free_scb(struct mesh_softc *, struct mesh_scb *);
+void mesh_scsi_request(struct scsipi_channel *,
+ scsipi_adapter_req_t, void *);
+void mesh_sched(struct mesh_softc *);
+int mesh_poll(struct mesh_softc *, struct scsipi_xfer *);
+void mesh_done(struct mesh_softc *, struct mesh_scb *);
+void mesh_timeout(void *);
+void mesh_minphys(struct buf *);
#define MESH_DATAOUT 0
diff --git a/sys/arch/macppc/dev/nvram.c b/sys/arch/macppc/dev/nvram.c
index c6b8df46f3c..e34e101defe 100644
--- a/sys/arch/macppc/dev/nvram.c
+++ b/sys/arch/macppc/dev/nvram.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nvram.c,v 1.12 2008/06/13 11:54:31 cegger Exp $ */
+/* $NetBSD: nvram.c,v 1.13 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.12 2008/06/13 11:54:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.13 2009/03/14 14:46:01 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -52,8 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.12 2008/06/13 11:54:31 cegger Exp $");
#define NVRAM_SIZE 0x2000
-static void nvram_attach __P((struct device *, struct device *, void *));
-static int nvram_match __P((struct device *, struct cfdata *, void *));
+static void nvram_attach(struct device *, struct device *, void *);
+static int nvram_match(struct device *, struct cfdata *, void *);
struct nvram_softc {
struct device sc_dev;
diff --git a/sys/arch/macppc/dev/ofcons.c b/sys/arch/macppc/dev/ofcons.c
index 4c96c965e31..aef04af53c9 100644
--- a/sys/arch/macppc/dev/ofcons.c
+++ b/sys/arch/macppc/dev/ofcons.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofcons.c,v 1.23 2008/06/13 11:54:31 cegger Exp $ */
+/* $NetBSD: ofcons.c,v 1.24 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.23 2008/06/13 11:54:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofcons.c,v 1.24 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -63,8 +63,8 @@ struct ofcons_softc {
static int stdin, stdout;
-static int ofcmatch __P((struct device *, struct cfdata *, void *));
-static void ofcattach __P((struct device *, struct device *, void *));
+static int ofcmatch(struct device *, struct cfdata *, void *);
+static void ofcattach(struct device *, struct device *, void *);
CFATTACH_DECL(macofcons, sizeof(struct ofcons_softc),
ofcmatch, ofcattach, NULL, NULL);
diff --git a/sys/arch/macppc/dev/pm_direct.c b/sys/arch/macppc/dev/pm_direct.c
index 76738886215..5cf952b6059 100644
--- a/sys/arch/macppc/dev/pm_direct.c
+++ b/sys/arch/macppc/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_direct.c,v 1.33 2007/11/07 19:47:00 garbled Exp $ */
+/* $NetBSD: pm_direct.c,v 1.34 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1997 Takashi Hamada
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.33 2007/11/07 19:47:00 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.34 2009/03/14 14:46:01 dsl Exp $");
#ifdef DEBUG
#ifndef ADB_DEBUG
@@ -171,23 +171,23 @@ signed char pm_receive_cmd_type[] = {
/* for debugging */
#ifdef ADB_DEBUG
-void pm_printerr __P((const char *, int, int, const char *));
+void pm_printerr(const char *, int, int, const char *);
#endif
-int pm_wait_busy __P((int));
-int pm_wait_free __P((int));
+int pm_wait_busy(int);
+int pm_wait_free(int);
-static int pm_receive __P((u_char *));
-static int pm_send __P((u_char));
+static int pm_receive(u_char *);
+static int pm_send(u_char);
/* these functions are called from adb_direct.c */
-void pm_setup_adb __P((void));
-void pm_check_adb_devices __P((int));
-int pm_adb_op __P((u_char *, adbComp *, volatile int *, int));
+void pm_setup_adb(void);
+void pm_check_adb_devices(int);
+int pm_adb_op(u_char *, adbComp *, volatile int *, int);
/* these functions also use the variables of adb_direct.c */
-void pm_adb_get_TALK_result __P((PMData *));
-void pm_adb_get_ADB_data __P((PMData *));
+void pm_adb_get_TALK_result(PMData *);
+void pm_adb_get_ADB_data(PMData *);
/*
@@ -212,13 +212,13 @@ struct adbCommand {
u_int unsol; /* 1 if packet was unsolicited */
u_int ack_only; /* 1 for no special processing */
};
-extern void adb_pass_up __P((struct adbCommand *));
+extern void adb_pass_up(struct adbCommand *);
#if 0
/*
* Define the external functions
*/
-extern int zshard __P((int)); /* from zs.c */
+extern int zshard(int); /* from zs.c */
#endif
#ifdef ADB_DEBUG
diff --git a/sys/arch/macppc/dev/pm_direct.h b/sys/arch/macppc/dev/pm_direct.h
index 5b36fb394d7..7933c0955a0 100644
--- a/sys/arch/macppc/dev/pm_direct.h
+++ b/sys/arch/macppc/dev/pm_direct.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pm_direct.h,v 1.11 2005/12/11 12:18:03 christos Exp $ */
+/* $NetBSD: pm_direct.h,v 1.12 2009/03/14 14:46:01 dsl Exp $ */
/*
* Copyright (C) 1997 Takashi Hamada
@@ -45,13 +45,13 @@ typedef struct {
/* null command seen w/ 120 data bytes */
} PMData;
-int pmgrop __P((PMData *));
-int pm_intr __P((void *));
-void pm_init __P((void));
-void pm_adb_restart __P((void));
-void pm_adb_poweroff __P((void));
-void pm_read_date_time __P((u_long *));
-void pm_set_date_time __P((u_long));
+int pmgrop(PMData *);
+int pm_intr(void *);
+void pm_init(void);
+void pm_adb_restart(void);
+void pm_adb_poweroff(void);
+void pm_read_date_time(u_long *);
+void pm_set_date_time(u_long);
struct pmu_battery_info
{
@@ -63,14 +63,14 @@ struct pmu_battery_info
unsigned int secs_remaining;
};
-int pm_battery_info __P((int, struct pmu_battery_info *));
+int pm_battery_info(int, struct pmu_battery_info *);
-int pm_read_nvram __P((int));
-void pm_write_nvram __P((int, int));
-int pm_read_brightness __P((void));
-void pm_set_brightness __P((int));
-void pm_init_brightness __P((void));
-void pm_eject_pcmcia __P((int));
+int pm_read_nvram(int);
+void pm_write_nvram(int, int);
+int pm_read_brightness(void);
+void pm_set_brightness(int);
+void pm_init_brightness(void);
+void pm_eject_pcmcia(int);
/* PMU commands */
#define PMU_POWER_OFF 0x7e /* Turn Power off */
diff --git a/sys/arch/macppc/dev/viareg.h b/sys/arch/macppc/dev/viareg.h
index 25d2d5d5dd4..076515cc257 100644
--- a/sys/arch/macppc/dev/viareg.h
+++ b/sys/arch/macppc/dev/viareg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: viareg.h,v 1.7 2007/10/17 19:55:20 garbled Exp $ */
+/* $NetBSD: viareg.h,v 1.8 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo,
@@ -249,14 +249,14 @@ write_via_reg(ign, reg, val)
#define vDirA_ADBState 0x30
-void via_init __P((void));
-int rbv_vidstatus __P((void));
-void via_shutdown __P((void));
-void via_set_modem __P((int));
-int add_nubus_intr __P((int, void (*) __P((void *, int)), void *));
-void enable_nubus_intr __P((void));
-void via1_register_irq __P((int, void (*)(void *), void *));
-void via2_register_irq __P((int, void (*)(void *), void *));
-
-extern void (*via1itab[7]) __P((void *));
-extern void (*via2itab[7]) __P((void *));
+void via_init(void);
+int rbv_vidstatus(void);
+void via_shutdown(void);
+void via_set_modem(int);
+int add_nubus_intr(int, void (*)(void *, int), void *);
+void enable_nubus_intr(void);
+void via1_register_irq(int, void (*)(void *), void *);
+void via2_register_irq(int, void (*)(void *), void *);
+
+extern void (*via1itab[7])(void *);
+extern void (*via2itab[7])(void *);
diff --git a/sys/arch/macppc/dev/zs_kgdb.c b/sys/arch/macppc/dev/zs_kgdb.c
index 5052a06d9c5..b7a0eb83e3d 100644
--- a/sys/arch/macppc/dev/zs_kgdb.c
+++ b/sys/arch/macppc/dev/zs_kgdb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.8 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.9 2009/03/14 14:46:01 dsl Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.8 2008/04/28 20:23:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.9 2009/03/14 14:46:01 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.8 2008/04/28 20:23:27 martin Exp $");
#include <dev/ic/z8530reg.h>
#include <machine/z8530var.h>
-static void zs_setparam __P((struct zs_chanstate *, int, int));
-static void zskgdb __P((struct zs_chanstate *));
+static void zs_setparam(struct zs_chanstate *, int, int);
+static void zskgdb(struct zs_chanstate *);
struct zsops zsops_kgdb;
@@ -224,10 +224,10 @@ zskgdb(cs)
* Interface to the lower layer (zscc)
****************************************************************/
-static void zs_kgdb_rxint __P((struct zs_chanstate *));
-static void zs_kgdb_stint __P((struct zs_chanstate *, int));
-static void zs_kgdb_txint __P((struct zs_chanstate *));
-static void zs_kgdb_softint __P((struct zs_chanstate *));
+static void zs_kgdb_rxint(struct zs_chanstate *);
+static void zs_kgdb_stint(struct zs_chanstate *, int);
+static void zs_kgdb_txint(struct zs_chanstate *);
+static void zs_kgdb_softint(struct zs_chanstate *);
int kgdb_input_lost;
diff --git a/sys/arch/macppc/include/adbsys.h b/sys/arch/macppc/include/adbsys.h
index 6888f34019a..bb7f8a32500 100644
--- a/sys/arch/macppc/include/adbsys.h
+++ b/sys/arch/macppc/include/adbsys.h
@@ -1,4 +1,4 @@
-/* $NetBSD: adbsys.h,v 1.8 2007/01/17 23:36:37 macallan Exp $ */
+/* $NetBSD: adbsys.h,v 1.9 2009/03/14 14:46:02 dsl Exp $ */
/*-
* Copyright (C) 1993, 1994 Allen K. Briggs, Chris P. Caputo,
@@ -170,6 +170,6 @@ typedef struct adb_listencmd_s{
} adb_listencmd_t;
#define ADBIOCLISTENCMD _IOW('A', 133, adb_listencmd_t)
-void adb_init __P((void));
+void adb_init(void);
#endif /* _ADBSYS_MACHINE_ */
diff --git a/sys/arch/macppc/include/openpicreg.h b/sys/arch/macppc/include/openpicreg.h
index c80ca409392..2b2b3b86273 100644
--- a/sys/arch/macppc/include/openpicreg.h
+++ b/sys/arch/macppc/include/openpicreg.h
@@ -1,5 +1,5 @@
-/* $NetBSD: openpicreg.h,v 1.2 2001/02/05 19:22:24 briggs Exp $ */
+/* $NetBSD: openpicreg.h,v 1.3 2009/03/14 14:46:02 dsl Exp $ */
-void openpic_init __P((void));
+void openpic_init(void);
#include <powerpc/openpicreg.h>
diff --git a/sys/arch/macppc/include/powerpc.h b/sys/arch/macppc/include/powerpc.h
index 404b0fd904c..74c36ff5d47 100644
--- a/sys/arch/macppc/include/powerpc.h
+++ b/sys/arch/macppc/include/powerpc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc.h,v 1.6 2006/08/05 21:26:48 sanjayl Exp $ */
+/* $NetBSD: powerpc.h,v 1.7 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -41,18 +41,18 @@ struct mem_region {
psize_t size;
}__attribute__((packed));
-void mem_regions __P((struct mem_region **, struct mem_region **));
+void mem_regions(struct mem_region **, struct mem_region **);
/*
* These two functions get used solely in boot() in machdep.c.
*
* Not sure whether boot itself should be implementation dependent instead. XXX
*/
-void ppc_exit __P((void)) __attribute__((__noreturn__));
-void ppc_boot __P((char *bootspec)) __attribute__((__noreturn__));
+void ppc_exit(void) __attribute__((__noreturn__));
+void ppc_boot(char *bootspec) __attribute__((__noreturn__));
-int dk_match __P((char *name));
+int dk_match(char *name);
-void ofrootfound __P((void));
+void ofrootfound(void);
#endif /* _MACHINE_POWERPC_H_ */
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index 591714abcea..4c955cc50c6 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.43 2008/01/02 11:48:26 ad Exp $ */
+/* $NetBSD: disksubr.c,v 1.44 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.43 2008/01/02 11:48:26 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.44 2009/03/14 14:46:02 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,18 +127,18 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.43 2008/01/02 11:48:26 ad Exp $");
#define HFS_PART 4
#define SCRATCH_PART 5
-static int getFreeLabelEntry __P((struct disklabel *));
-static int whichType __P((struct part_map_entry *, u_int8_t *, int *));
-static void setpartition __P((struct part_map_entry *,
- struct partition *, int));
-static int getNamedType __P((struct part_map_entry *, int,
- struct disklabel *, int, int, int *));
-static const char *read_mac_label __P((dev_t, void (*)(struct buf *),
- struct disklabel *, struct cpu_disklabel *));
-static const char *read_dos_label __P((dev_t, void (*)(struct buf *),
- struct disklabel *, struct cpu_disklabel *));
-static int get_netbsd_label __P((dev_t, void (*)(struct buf *),
- struct disklabel *, struct cpu_disklabel *));
+static int getFreeLabelEntry(struct disklabel *);
+static int whichType(struct part_map_entry *, u_int8_t *, int *);
+static void setpartition(struct part_map_entry *,
+ struct partition *, int);
+static int getNamedType(struct part_map_entry *, int,
+ struct disklabel *, int, int, int *);
+static const char *read_mac_label(dev_t, void (*)(struct buf *),
+ struct disklabel *, struct cpu_disklabel *);
+static const char *read_dos_label(dev_t, void (*)(struct buf *),
+ struct disklabel *, struct cpu_disklabel *);
+static int get_netbsd_label(dev_t, void (*)(struct buf *),
+ struct disklabel *, struct cpu_disklabel *);
/*
* Find an entry in the disk label that is unused and return it
diff --git a/sys/arch/macppc/macppc/mainbus.c b/sys/arch/macppc/macppc/mainbus.c
index 8de550d863f..972ffd3d085 100644
--- a/sys/arch/macppc/macppc/mainbus.c
+++ b/sys/arch/macppc/macppc/mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.17 2007/10/17 19:55:33 garbled Exp $ */
+/* $NetBSD: mainbus.c,v 1.18 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2007/10/17 19:55:33 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.18 2009/03/14 14:46:02 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -44,8 +44,8 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.17 2007/10/17 19:55:33 garbled Exp $")
#include <powerpc/pic/picvar.h>
-int mainbus_match __P((struct device *, struct cfdata *, void *));
-void mainbus_attach __P((struct device *, struct device *, void *));
+int mainbus_match(struct device *, struct cfdata *, void *);
+void mainbus_attach(struct device *, struct device *, void *);
CFATTACH_DECL(mainbus, sizeof(struct device),
mainbus_match, mainbus_attach, NULL, NULL);
diff --git a/sys/arch/macppc/macppc/rbus_machdep.c b/sys/arch/macppc/macppc/rbus_machdep.c
index cfe862e90fb..2599edb593d 100644
--- a/sys/arch/macppc/macppc/rbus_machdep.c
+++ b/sys/arch/macppc/macppc/rbus_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_machdep.c,v 1.14 2007/10/17 19:55:34 garbled Exp $ */
+/* $NetBSD: rbus_machdep.c,v 1.15 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1999
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.14 2007/10/17 19:55:34 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.15 2009/03/14 14:46:02 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.14 2007/10/17 19:55:34 garbled Ex
#include <dev/cardbus/rbus.h>
#include <dev/ofw/openfirm.h>
-static void macppc_cardbus_init __P((pci_chipset_tag_t, pcitag_t));
+static void macppc_cardbus_init(pci_chipset_tag_t, pcitag_t);
#ifdef DEBUG_ALLOC
# define DPRINTF printf
diff --git a/sys/arch/mips/include/cachectl.h b/sys/arch/mips/include/cachectl.h
index 4af834bd942..a7a6c1e2da4 100644
--- a/sys/arch/mips/include/cachectl.h
+++ b/sys/arch/mips/include/cachectl.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cachectl.h,v 1.8 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: cachectl.h,v 1.9 2009/03/14 14:46:02 dsl Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -37,8 +37,8 @@
/*
* invalidate a range of addresses from the cache.
*/
-int _cacheflush __P((void *addr, int nbytes, int cacheflags));
-int cacheflush __P((void *addr, int nbytes, int cacheflags));
+int _cacheflush(void *addr, int nbytes, int cacheflags);
+int cacheflush(void *addr, int nbytes, int cacheflags);
/* cacheflush() flags: */
#define ICACHE 0x01 /* invalidate I-cache */
@@ -46,7 +46,7 @@ int cacheflush __P((void *addr, int nbytes, int cacheflags));
#define BCACHE (ICACHE|DCACHE) /* invalidate both caches, as above */
-int cachectl __P((void *addr, int nbytes, int cacheop));
+int cachectl(void *addr, int nbytes, int cacheop);
/* cachectl() cache operations: */
#define CACHEABLE 0x00 /* make page(s) cacheable */
diff --git a/sys/arch/mipsco/include/autoconf.h b/sys/arch/mipsco/include/autoconf.h
index 19c41d389be..17fbf97cb18 100644
--- a/sys/arch/mipsco/include/autoconf.h
+++ b/sys/arch/mipsco/include/autoconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.6 2005/12/11 12:18:13 christos Exp $ */
+/* $NetBSD: autoconf.h,v 1.7 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -49,7 +49,7 @@ struct confargs {
/* Locator aliases */
#define cf_addr cf_loc[OBIOCF_ADDR]
-int badaddr __P((void *, u_int));
-void makebootdev __P((char *));
+int badaddr(void *, u_int);
+void makebootdev(char *);
#endif /* !_MIPSCO_AUTOCONF_H_ */
diff --git a/sys/arch/mipsco/include/bootinfo.h b/sys/arch/mipsco/include/bootinfo.h
index c4b7b36693b..9bbc5ada3ca 100644
--- a/sys/arch/mipsco/include/bootinfo.h
+++ b/sys/arch/mipsco/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.3 2005/12/11 12:18:13 christos Exp $ */
+/* $NetBSD: bootinfo.h,v 1.4 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1997, 2000
@@ -66,7 +66,7 @@ struct btinfo_symtab {
};
#ifdef _KERNEL
-void *lookup_bootinfo __P((int));
+void *lookup_bootinfo(int);
#endif
#endif /* !_MIPSCO_BOOTINFO_H_ */
diff --git a/sys/arch/mipsco/include/bus.h b/sys/arch/mipsco/include/bus.h
index 08bf1a67e37..1d9a080b636 100644
--- a/sys/arch/mipsco/include/bus.h
+++ b/sys/arch/mipsco/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.19 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: bus.h,v 1.20 2009/03/14 14:46:02 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -133,42 +133,42 @@ struct mipsco_bus_space {
u_int8_t bs_offset_8;
/* compose a bus_space handle from tag/handle/addr/size/flags (MD) */
- int (*bs_compose_handle) __P((bus_space_tag_t, bus_addr_t,
- bus_size_t, int, bus_space_handle_t *));
+ int (*bs_compose_handle)(bus_space_tag_t, bus_addr_t,
+ bus_size_t, int, bus_space_handle_t *);
/* dispose a bus_space handle (MD) */
- int (*bs_dispose_handle) __P((bus_space_tag_t, bus_space_handle_t,
- bus_size_t));
+ int (*bs_dispose_handle)(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t);
/* convert bus_space tag/handle to physical address (MD) */
- int (*bs_paddr) __P((bus_space_tag_t, bus_space_handle_t,
- paddr_t *));
+ int (*bs_paddr)(bus_space_tag_t, bus_space_handle_t,
+ paddr_t *);
/* mapping/unmapping */
- int (*bs_map) __P((bus_space_tag_t, bus_addr_t, bus_size_t, int,
- bus_space_handle_t *));
- void (*bs_unmap) __P((bus_space_tag_t, bus_space_handle_t,
- bus_size_t));
- int (*bs_subregion) __P((bus_space_tag_t, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
- paddr_t (*bs_mmap) __P((bus_space_tag_t, bus_addr_t, off_t, int, int));
+ int (*bs_map)(bus_space_tag_t, bus_addr_t, bus_size_t, int,
+ bus_space_handle_t *);
+ void (*bs_unmap)(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t);
+ int (*bs_subregion)(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
+ paddr_t (*bs_mmap)(bus_space_tag_t, bus_addr_t, off_t, int, int);
/* allocation/deallocation */
- int (*bs_alloc) __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
+ int (*bs_alloc)(bus_space_tag_t, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_size_t, int,
- bus_addr_t *, bus_space_handle_t *));
- void (*bs_free) __P((bus_space_tag_t, bus_space_handle_t,
- bus_size_t));
+ bus_addr_t *, bus_space_handle_t *);
+ void (*bs_free)(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t);
/* interrupt attach */
- void (*bs_intr_establish) __P((
+ void (*bs_intr_establish)(
bus_space_tag_t,
int, /*bus-specific intr*/
int, /*priority/class*/
int, /*flags*/
- int (*) __P((void *)), /*handler*/
- void *)); /*handler arg*/
+ int (*)(void *), /*handler*/
+ void *); /*handler arg*/
void *bs_aux;
};
@@ -177,51 +177,51 @@ struct mipsco_bus_space {
#define MIPSCO_BUS_SPACE_UNMAPPED ((vaddr_t)0)
/* machine dependent utility function for bus_space users */
-void mipsco_bus_space_malloc_set_safe __P((void));
-void mipsco_bus_space_init __P((bus_space_tag_t, const char *,
- paddr_t, vaddr_t, bus_addr_t, bus_size_t));
-void mipsco_bus_space_init_extent __P((bus_space_tag_t, void *, size_t));
-void mipsco_bus_space_set_aligned_stride __P((bus_space_tag_t, unsigned int));
-void mipsco_sparse_bus_space_init __P((bus_space_tag_t, const char *,
- paddr_t, bus_addr_t, bus_size_t));
-void mipsco_large_bus_space_init __P((bus_space_tag_t, const char *,
- paddr_t, bus_addr_t, bus_size_t));
+void mipsco_bus_space_malloc_set_safe(void);
+void mipsco_bus_space_init(bus_space_tag_t, const char *,
+ paddr_t, vaddr_t, bus_addr_t, bus_size_t);
+void mipsco_bus_space_init_extent(bus_space_tag_t, void *, size_t);
+void mipsco_bus_space_set_aligned_stride(bus_space_tag_t, unsigned int);
+void mipsco_sparse_bus_space_init(bus_space_tag_t, const char *,
+ paddr_t, bus_addr_t, bus_size_t);
+void mipsco_large_bus_space_init(bus_space_tag_t, const char *,
+ paddr_t, bus_addr_t, bus_size_t);
/* machine dependent utility function for bus_space implementations */
-int mipsco_bus_space_extent_malloc_flag __P((void));
+int mipsco_bus_space_extent_malloc_flag(void);
/* these are provided for subclasses which override base bus_space. */
-int mipsco_bus_space_compose_handle __P((bus_space_tag_t,
- bus_addr_t, bus_size_t, int, bus_space_handle_t *));
-int mipsco_bus_space_dispose_handle __P((bus_space_tag_t,
- bus_space_handle_t, bus_size_t));
-int mipsco_bus_space_paddr __P((bus_space_tag_t,
- bus_space_handle_t, paddr_t *));
-
-int mipsco_sparse_bus_space_compose_handle __P((bus_space_tag_t,
- bus_addr_t, bus_size_t, int, bus_space_handle_t *));
-int mipsco_sparse_bus_space_dispose_handle __P((bus_space_tag_t,
- bus_space_handle_t, bus_size_t));
-int mipsco_sparse_bus_space_paddr __P((bus_space_tag_t,
- bus_space_handle_t, paddr_t *));
-
-int mipsco_bus_space_map __P((bus_space_tag_t, bus_addr_t, bus_size_t, int,
- bus_space_handle_t *));
-void mipsco_bus_space_unmap __P((bus_space_tag_t, bus_space_handle_t,
- bus_size_t));
-int mipsco_bus_space_subregion __P((bus_space_tag_t, bus_space_handle_t,
- bus_size_t, bus_size_t, bus_space_handle_t *));
-paddr_t mipsco_bus_space_mmap __P((bus_space_tag_t, bus_addr_t, off_t,
- int, int));
-int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
+int mipsco_bus_space_compose_handle(bus_space_tag_t,
+ bus_addr_t, bus_size_t, int, bus_space_handle_t *);
+int mipsco_bus_space_dispose_handle(bus_space_tag_t,
+ bus_space_handle_t, bus_size_t);
+int mipsco_bus_space_paddr(bus_space_tag_t,
+ bus_space_handle_t, paddr_t *);
+
+int mipsco_sparse_bus_space_compose_handle(bus_space_tag_t,
+ bus_addr_t, bus_size_t, int, bus_space_handle_t *);
+int mipsco_sparse_bus_space_dispose_handle(bus_space_tag_t,
+ bus_space_handle_t, bus_size_t);
+int mipsco_sparse_bus_space_paddr(bus_space_tag_t,
+ bus_space_handle_t, paddr_t *);
+
+int mipsco_bus_space_map(bus_space_tag_t, bus_addr_t, bus_size_t, int,
+ bus_space_handle_t *);
+void mipsco_bus_space_unmap(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t);
+int mipsco_bus_space_subregion(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, bus_size_t, bus_space_handle_t *);
+paddr_t mipsco_bus_space_mmap(bus_space_tag_t, bus_addr_t, off_t,
+ int, int);
+int mipsco_bus_space_alloc(bus_space_tag_t, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_size_t, int, bus_addr_t *,
- bus_space_handle_t *));
+ bus_space_handle_t *);
#define mipsco_bus_space_free mipsco_bus_space_unmap
/*
- * int bus_space_compose_handle __P((bus_space_tag_t t, bus_addr_t addr,
- * bus_size_t size, int flags, bus_space_handle_t *bshp));
+ * int bus_space_compose_handle(bus_space_tag_t t, bus_addr_t addr,
+ * bus_size_t size, int flags, bus_space_handle_t *bshp);
*
* MACHINE DEPENDENT, NOT PORTABLE INTERFACE:
* Compose a bus_space handle from tag/handle/addr/size/flags.
@@ -231,8 +231,8 @@ int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
(*(bst)->bs_compose_handle)(bst, addr, size, flags, bshp)
/*
- * int bus_space_dispose_handle __P((bus_space_tag_t t, bus_addr_t addr,
- * bus_space_handle_t bsh, bus_size_t size));
+ * int bus_space_dispose_handle(bus_space_tag_t t, bus_addr_t addr,
+ * bus_space_handle_t bsh, bus_size_t size);
*
* MACHINE DEPENDENT, NOT PORTABLE INTERFACE:
* Dispose a bus_space handle.
@@ -242,8 +242,8 @@ int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
(*(bst)->bs_dispose_handle)(bst, bsh, size)
/*
- * int bus_space_paddr __P((bus_space_tag_t tag,
- * bus_space_handle_t bsh, paddr_t *pap));
+ * int bus_space_paddr(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, paddr_t *pap);
*
* MACHINE DEPENDENT, NOT PORTABLE INTERFACE:
* (cannot be implemented on e.g. I/O space on i386, non-linear space on alpha)
@@ -254,7 +254,7 @@ int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
(*(bst)->bs_paddr)(bst, bsh, pap)
/*
- * void *bus_space_vaddr __P((bus_space_tag_t, bus_space_handle_t));
+ * void *bus_space_vaddr(bus_space_tag_t, bus_space_handle_t);
*
* Get the kernel virtual address for the mapped bus space.
* Only allowed for regions mapped with BUS_SPACE_MAP_LINEAR.
@@ -264,8 +264,8 @@ int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
((void *)(bsh))
/*
- * paddr_t bus_space_mmap __P((bus_space_tag_t, bus_addr_t, off_t,
- * int, int));
+ * paddr_t bus_space_mmap(bus_space_tag_t, bus_addr_t, off_t,
+ * int, int);
*
* Mmap bus space on behalf of the user.
*/
@@ -273,8 +273,8 @@ int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
(*(bst)->bs_mmap)((bst), (addr), (off), (prot), (flags))
/*
- * int bus_space_map __P((bus_space_tag_t t, bus_addr_t addr,
- * bus_size_t size, int flags, bus_space_handle_t *bshp));
+ * int bus_space_map(bus_space_tag_t t, bus_addr_t addr,
+ * bus_size_t size, int flags, bus_space_handle_t *bshp);
*
* Map a region of bus space.
*/
@@ -287,8 +287,8 @@ int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
(*(t)->bs_map)((t), (a), (s), (f), (hp))
/*
- * void bus_space_unmap __P((bus_space_tag_t t,
- * bus_space_handle_t bsh, bus_size_t size));
+ * void bus_space_unmap(bus_space_tag_t t,
+ * bus_space_handle_t bsh, bus_size_t size);
*
* Unmap a region of bus space.
*/
@@ -297,9 +297,9 @@ int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
(*(t)->bs_unmap)((t), (h), (s))
/*
- * int bus_space_subregion __P((bus_space_tag_t t,
+ * int bus_space_subregion(bus_space_tag_t t,
* bus_space_handle_t bsh, bus_size_t offset, bus_size_t size,
- * bus_space_handle_t *nbshp));
+ * bus_space_handle_t *nbshp);
*
* Get a new handle for a subregion of an already-mapped area of bus space.
*/
@@ -308,10 +308,10 @@ int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
(*(t)->bs_subregion)((t), (h), (o), (s), (hp))
/*
- * int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t, rstart,
+ * int bus_space_alloc(bus_space_tag_t t, bus_addr_t, rstart,
* bus_addr_t rend, bus_size_t size, bus_size_t align,
* bus_size_t boundary, int flags, bus_addr_t *addrp,
- * bus_space_handle_t *bshp));
+ * bus_space_handle_t *bshp);
*
* Allocate a region of bus space.
*/
@@ -320,8 +320,8 @@ int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
(*(t)->bs_alloc)((t), (rs), (re), (s), (a), (b), (f), (ap), (hp))
/*
- * int bus_space_free __P((bus_space_tag_t t,
- * bus_space_handle_t bsh, bus_size_t size));
+ * int bus_space_free(bus_space_tag_t t,
+ * bus_space_handle_t bsh, bus_size_t size);
*
* Free a region of bus space.
*/
@@ -330,9 +330,9 @@ int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
(*(t)->bs_free)((t), (h), (s))
/*
- * void bus_intr_establish __P((bus_space_tag_t bst,
- * int level, int pri, int flags, int (*func) __P((void *))
- * void *arg));
+ * void bus_intr_establish(bus_space_tag_t bst,
+ * int level, int pri, int flags, int (*func)(void *)
+ * void *arg);
*
* Attach interrupt handler and softc argument
*/
@@ -357,8 +357,8 @@ int mipsco_bus_space_alloc __P((bus_space_tag_t, bus_addr_t, bus_addr_t,
(t)->__CONCAT(bs_offset_,BYTES)))
/*
- * u_intN_t bus_space_read_N __P((bus_space_tag_t tag,
- * bus_space_handle_t bsh, bus_size_t offset));
+ * u_intN_t bus_space_read_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset);
*
* Read a 1, 2, 4, or 8 byte quantity from bus space
* described by tag/handle/offset.
@@ -378,9 +378,9 @@ __bus_space_read(4,32)
__bus_space_read(8,64)
/*
- * void bus_space_read_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_read_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t *addr, size_t count));
+ * u_intN_t *addr, size_t count);
*
* Read `count' 1, 2, 4, or 8 byte quantities from bus space
* described by tag/handle/offset and copy into buffer provided.
@@ -388,8 +388,8 @@ __bus_space_read(8,64)
#define __bus_space_read_multi(BYTES,BITS) \
static __inline void __BS_FUNCTION(bus_space_read_multi,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __BS_TYPENAME(BITS) *, size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __BS_TYPENAME(BITS) *, size_t); \
\
static __inline void \
__BS_FUNCTION(bus_space_read_multi,BYTES)(t, h, o, a, c) \
@@ -411,9 +411,9 @@ __bus_space_read_multi(8,64)
/*
- * void bus_space_read_region_N __P((bus_space_tag_t tag,
+ * void bus_space_read_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t *addr, size_t count));
+ * u_intN_t *addr, size_t count);
*
* Read `count' 1, 2, 4, or 8 byte quantities from bus space
* described by tag/handle and starting at `offset' and copy into
@@ -422,8 +422,8 @@ __bus_space_read_multi(8,64)
#define __bus_space_read_region(BYTES,BITS) \
static __inline void __BS_FUNCTION(bus_space_read_region,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __BS_TYPENAME(BITS) *, size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __BS_TYPENAME(BITS) *, size_t); \
\
static __inline void \
__BS_FUNCTION(bus_space_read_region,BYTES)(t, h, o, a, c) \
@@ -447,9 +447,9 @@ __bus_space_read_region(8,64)
/*
- * void bus_space_write_N __P((bus_space_tag_t tag,
+ * void bus_space_write_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t value));
+ * u_intN_t value);
*
* Write the 1, 2, 4, or 8 byte value `value' to bus space
* described by tag/handle/offset.
@@ -471,9 +471,9 @@ __bus_space_write(4,32)
__bus_space_write(8,64)
/*
- * void bus_space_write_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_write_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * const u_intN_t *addr, size_t count));
+ * const u_intN_t *addr, size_t count);
*
* Write `count' 1, 2, 4, or 8 byte quantities from the buffer
* provided to bus space described by tag/handle/offset.
@@ -481,8 +481,8 @@ __bus_space_write(8,64)
#define __bus_space_write_multi(BYTES,BITS) \
static __inline void __BS_FUNCTION(bus_space_write_multi,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __BS_TYPENAME(BITS) *, size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __BS_TYPENAME(BITS) *, size_t); \
\
static __inline void \
__BS_FUNCTION(bus_space_write_multi,BYTES)(t, h, o, a, c) \
@@ -504,9 +504,9 @@ __bus_space_write_multi(8,64)
/*
- * void bus_space_write_region_N __P((bus_space_tag_t tag,
+ * void bus_space_write_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * const u_intN_t *addr, size_t count));
+ * const u_intN_t *addr, size_t count);
*
* Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
* to bus space described by tag/handle starting at `offset'.
@@ -514,8 +514,8 @@ __bus_space_write_multi(8,64)
#define __bus_space_write_region(BYTES,BITS) \
static __inline void __BS_FUNCTION(bus_space_write_region,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- const __BS_TYPENAME(BITS) *, size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ const __BS_TYPENAME(BITS) *, size_t); \
\
static __inline void \
__BS_FUNCTION(bus_space_write_region,BYTES)(t, h, o, a, c) \
@@ -539,9 +539,9 @@ __bus_space_write_region(8,64)
/*
- * void bus_space_set_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_set_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
- * size_t count));
+ * size_t count);
*
* Write the 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle/offset `count' times.
@@ -549,8 +549,8 @@ __bus_space_write_region(8,64)
#define __bus_space_set_multi(BYTES,BITS) \
static __inline void __BS_FUNCTION(bus_space_set_multi,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __BS_TYPENAME(BITS), size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __BS_TYPENAME(BITS), size_t); \
\
static __inline void \
__BS_FUNCTION(bus_space_set_multi,BYTES)(t, h, o, v, c) \
@@ -572,9 +572,9 @@ __bus_space_set_multi(8,64)
/*
- * void bus_space_set_region_N __P((bus_space_tag_t tag,
+ * void bus_space_set_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
- * size_t count));
+ * size_t count);
*
* Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle starting at `offset'.
@@ -582,8 +582,8 @@ __bus_space_set_multi(8,64)
#define __bus_space_set_region(BYTES,BITS) \
static __inline void __BS_FUNCTION(bus_space_set_region,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __BS_TYPENAME(BITS), size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __BS_TYPENAME(BITS), size_t); \
\
static __inline void \
__BS_FUNCTION(bus_space_set_region,BYTES)(t, h, o, v, c) \
@@ -607,10 +607,10 @@ __bus_space_set_region(8,64)
/*
- * void bus_space_copy_region_N __P((bus_space_tag_t tag,
+ * void bus_space_copy_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh1, bus_size_t off1,
* bus_space_handle_t bsh2, bus_size_t off2,
- * bus_size_t count));
+ * bus_size_t count);
*
* Copy `count' 1, 2, 4, or 8 byte values from bus space starting
* at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
@@ -618,10 +618,10 @@ __bus_space_set_region(8,64)
#define __bus_space_copy_region(BYTES) \
static __inline void __BS_FUNCTION(bus_space_copy_region,BYTES) \
- __P((bus_space_tag_t, \
+(bus_space_tag_t, \
bus_space_handle_t bsh1, bus_size_t off1, \
bus_space_handle_t bsh2, bus_size_t off2, \
- bus_size_t count)); \
+ bus_size_t count); \
\
static __inline void \
__BS_FUNCTION(bus_space_copy_region,BYTES)(t, h1, o1, h2, o2, c) \
@@ -750,9 +750,9 @@ __bus_space_set_region(8, 64) /* bus_space_set_region_stream_8 */
/*
* Bus read/write barrier methods.
*
- * void bus_space_barrier __P((bus_space_tag_t tag,
+ * void bus_space_barrier(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * bus_size_t len, int flags));
+ * bus_size_t len, int flags);
*
* On the MIPS, we just flush the write buffer.
*/
@@ -831,33 +831,33 @@ struct mipsco_bus_dma_tag {
/*
* DMA mapping methods.
*/
- int (*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *));
- void (*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t));
- int (*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
- int (*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
- int (*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
- int (*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
- void (*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t));
- void (*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int));
+ int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
+ void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t);
+ int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+ int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+ int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+ int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+ void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
+ void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
/*
* DMA memory utility functions.
*/
- int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t,
- bus_size_t, bus_dma_segment_t *, int, int *, int));
- void (*_dmamem_free) __P((bus_dma_tag_t,
- bus_dma_segment_t *, int));
- int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, size_t, void **, int));
- void (*_dmamem_unmap) __P((bus_dma_tag_t, void *, size_t));
- paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, off_t, int, int));
+ int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
+ bus_size_t, bus_dma_segment_t *, int, int *, int);
+ void (*_dmamem_free)(bus_dma_tag_t,
+ bus_dma_segment_t *, int);
+ int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, size_t, void **, int);
+ void (*_dmamem_unmap)(bus_dma_tag_t, void *, size_t);
+ paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, off_t, int, int);
};
#define bus_dmamap_create(t, s, n, m, b, f, p) \
@@ -920,44 +920,44 @@ struct mipsco_bus_dmamap {
};
#ifdef _MIPSCO_BUS_DMA_PRIVATE
-int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t,
- bus_size_t, int, bus_dmamap_t *));
-void _bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int _bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
-int _bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
-int _bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
-int _bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
-void _bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void _bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
- bus_size_t, int));
-
-int _bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size,
+int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
+ bus_size_t, int, bus_dmamap_t *);
+void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+ bus_size_t, int);
+
+int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
- bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags));
-int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
+ bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
+int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
- paddr_t low, paddr_t high));
-void _bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs));
-int _bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, size_t size, void **kvap, int flags));
-void _bus_dmamem_unmap __P((bus_dma_tag_t tag, void *kva,
- size_t size));
-paddr_t _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, off_t off, int prot, int flags));
-
-int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
+ paddr_t low, paddr_t high);
+void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs);
+int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, size_t size, void **kvap, int flags);
+void _bus_dmamem_unmap(bus_dma_tag_t tag, void *kva,
+ size_t size);
+paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, off_t off, int prot, int flags);
+
+int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
- paddr_t low, paddr_t high));
+ paddr_t low, paddr_t high);
#endif /* _MIPSCO_BUS_DMA_PRIVATE */
-void _bus_dma_tag_init __P((bus_dma_tag_t tag));
+void _bus_dma_tag_init(bus_dma_tag_t tag);
#endif /* _KERNEL */
#endif /* _MIPSCO_BUS_H_ */
diff --git a/sys/arch/mipsco/include/intr.h b/sys/arch/mipsco/include/intr.h
index f53c2dcb824..92b7b9986c9 100644
--- a/sys/arch/mipsco/include/intr.h
+++ b/sys/arch/mipsco/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.16 2007/12/03 15:33:56 ad Exp $ */
+/* $NetBSD: intr.h,v 1.17 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -110,7 +110,7 @@ splraiseipl(ipl_cookie_t icookie)
struct mipsco_intrhand {
LIST_ENTRY(mipsco_intrhand)
ih_q;
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
struct mipsco_intr *ih_intrhead;
int ih_pending;
diff --git a/sys/arch/mipsco/include/param.h b/sys/arch/mipsco/include/param.h
index 4ea17007965..6cefc073cd9 100644
--- a/sys/arch/mipsco/include/param.h
+++ b/sys/arch/mipsco/include/param.h
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.9 2007/10/17 19:55:46 garbled Exp $ */
+/* $NetBSD: param.h,v 1.10 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -137,7 +137,7 @@
#include <machine/intr.h>
-extern void delay __P((int n));
+extern void delay(int n);
extern int cpuspeed;
static __inline void __attribute__((__unused__))
DELAY(int n)
diff --git a/sys/arch/mipsco/include/prom.h b/sys/arch/mipsco/include/prom.h
index f512fb2a618..87be79d3743 100644
--- a/sys/arch/mipsco/include/prom.h
+++ b/sys/arch/mipsco/include/prom.h
@@ -1,4 +1,4 @@
-/* $NetBSD: prom.h,v 1.11 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: prom.h,v 1.12 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@ struct mips_prom {
* runs diags, check for appropriate auto boot action in
* "bootmode" environment variable and performs that action.
*/
- void (*prom_reset) __P((void)) __attribute__((__noreturn__));
+ void (*prom_reset)(void) __attribute__((__noreturn__));
/*
* called to use prom to boot new image. After the booted
@@ -57,53 +57,53 @@ struct mips_prom {
* not destroy any text, data, or stack of the parent. the
* new programs stack continues on the parents stack.
*/
- int (*prom_exec) __P((void));
+ int (*prom_exec)(void);
/* re-enter the prom command parser, do not reset prom state */
- void (*prom_restart) __P((void)) __attribute__((__noreturn__));
+ void (*prom_restart)(void) __attribute__((__noreturn__));
/* reinitialize prom state and re-enter the prom command parser */
- void (*prom_reinit) __P((void)) __attribute__((__noreturn__));
+ void (*prom_reinit)(void) __attribute__((__noreturn__));
/* reboot machine using current bootmode setting. No diags */
- void (*prom_reboot) __P((void)) __attribute__((__noreturn__));
+ void (*prom_reboot)(void) __attribute__((__noreturn__));
/* perform an autoboot sequence, no configuration or diags run */
- void (*prom_autoboot) __P((void)) __attribute__((__noreturn__));
+ void (*prom_autoboot)(void) __attribute__((__noreturn__));
/*
* these routines access prom "saio" routines, and may be used
* by standalone programs that would like to use prom io
*/
- int (*prom_open) __P((char *, int, ...));
- int (*prom_read) __P((int, void *, int));
- int (*prom_write) __P((int, void *, int));
- int (*prom_ioctl) __P((int, long, ...));
- int (*prom_close) __P((int));
- int (*prom_getchar) __P((void));
- int (*prom_putchar) __P((int c));
- void (*prom_showchar) __P((int c));
- char * (*prom_gets) __P((char *s));
- void (*prom_puts) __P((const char *));
- int (*prom_printf) __P((const char *, ...));
+ int (*prom_open)(char *, int, ...);
+ int (*prom_read)(int, void *, int);
+ int (*prom_write)(int, void *, int);
+ int (*prom_ioctl)(int, long, ...);
+ int (*prom_close)(int);
+ int (*prom_getchar)(void);
+ int (*prom_putchar)(int c);
+ void (*prom_showchar)(int c);
+ char * (*prom_gets)(char *s);
+ void (*prom_puts)(const char *);
+ int (*prom_printf)(const char *, ...);
/* prom protocol entry points */
- void (*prom_initproto) __P((void)); /* ??? */
- void (*prom_protoenable) __P((void)); /* ??? */
- void (*prom_protodisable) __P((void)); /* ??? */
- void (*prom_getpkt) __P((void)); /* ??? */
- void (*prom_putpkt) __P((void)); /* ??? */
+ void (*prom_initproto)(void); /* ??? */
+ void (*prom_protoenable)(void); /* ??? */
+ void (*prom_protodisable)(void); /* ??? */
+ void (*prom_getpkt)(void); /* ??? */
+ void (*prom_putpkt)(void); /* ??? */
/*
* read-modify-write routine use special CPU board circuitry to
* accomplish vme bus r-m-w cycles.
*/
- void (*prom_orw_rmw) __P((void));
- void (*prom_orh_rmw) __P((void));
- void (*prom_orb_rmw) __P((void));
- void (*prom_andw_rmw) __P((void));
- void (*prom_andh_rmw) __P((void));
- void (*prom_andb_rmw) __P((void));
+ void (*prom_orw_rmw)(void);
+ void (*prom_orh_rmw)(void);
+ void (*prom_orb_rmw)(void);
+ void (*prom_andw_rmw)(void);
+ void (*prom_andh_rmw)(void);
+ void (*prom_andb_rmw)(void);
/*
* cache control entry points
@@ -114,40 +114,40 @@ struct mips_prom {
* i and d cache for entries that alias to specified address
* range.
*/
- void (*prom_flushcache) __P((void));
- void (*prom_clearcache) __P((void *, size_t));
+ void (*prom_flushcache)(void);
+ void (*prom_clearcache)(void *, size_t);
/*
* Libc compatible functions
*/
- void (*prom_setjmp) __P((void));
- void (*prom_longjmp) __P((void));
- void (*prom_bevutlb) __P((void));
- char * (*prom_getenv) __P((const char *name));
- int (*prom_setenv) __P((char *name, char *val));
- int (*prom_atob) __P((char *s));
- int (*prom_strcmp) __P((char *s1, char *s2));
- int (*prom_strlen) __P((char *s));
- char * (*prom_strcpy) __P((char *s1, char *s2));
- char * (*prom_strcat) __P((char *s1, char *s2));
+ void (*prom_setjmp)(void);
+ void (*prom_longjmp)(void);
+ void (*prom_bevutlb)(void);
+ char * (*prom_getenv)(const char *name);
+ int (*prom_setenv)(char *name, char *val);
+ int (*prom_atob)(char *s);
+ int (*prom_strcmp)(char *s1, char *s2);
+ int (*prom_strlen)(char *s);
+ char * (*prom_strcpy)(char *s1, char *s2);
+ char * (*prom_strcat)(char *s1, char *s2);
/*
* command parser entry points
*/
- void (*prom_parser) __P((void)); /* ??? */
- void (*prom_range) __P((void)); /* ??? */
- void (*prom_argvize) __P((void)); /* ??? */
- void (*prom_help) __P((void));
+ void (*prom_parser)(void); /* ??? */
+ void (*prom_range)(void); /* ??? */
+ void (*prom_argvize)(void); /* ??? */
+ void (*prom_help)(void);
/*
* prom commands
*/
- void (*prom_dumpcmd) __P((void));
- void (*prom_setenvcmd) __P((void));
- void (*prom_unsetenvcmd) __P((void));
- void (*prom_bevexcept) __P((void));
- void (*prom_enablecmd) __P((void));
- void (*prom_disablecmd) __P((void));
+ void (*prom_dumpcmd)(void);
+ void (*prom_setenvcmd)(void);
+ void (*prom_unsetenvcmd)(void);
+ void (*prom_bevexcept)(void);
+ void (*prom_enablecmd)(void);
+ void (*prom_disablecmd)(void);
/*
* clear existing fault handlers
@@ -155,22 +155,22 @@ struct mips_prom {
* interrupted out of prom code and wish to reenter without being
* tripped up by any pending prom timers set earlier.
*/
- void (*prom_clearnofault) __P((void));
+ void (*prom_clearnofault)(void);
- void (*prom_notimpl) __P((void));
+ void (*prom_notimpl)(void);
/*
* PROM_NVGET, PROM_NVSET will get/set information in the NVRAM.
* Both of these routines take indexes as opposed to addresses
* to guarantee portability between various platforms
*/
- int (*prom_nvget) __P((int));
- void (*prom_nvset) __P((void));
+ int (*prom_nvget)(int);
+ void (*prom_nvset)(void);
};
extern struct mips_prom *callv;
-extern void prom_init __P((void));
+extern void prom_init(void);
#endif /* _LOCORE */
diff --git a/sys/arch/mipsco/include/sysconf.h b/sys/arch/mipsco/include/sysconf.h
index 80247c4dffc..d7bc8581155 100644
--- a/sys/arch/mipsco/include/sysconf.h
+++ b/sys/arch/mipsco/include/sysconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sysconf.h,v 1.4 2007/03/04 06:00:13 christos Exp $ */
+/* $NetBSD: sysconf.h,v 1.5 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -53,11 +53,11 @@ struct platform {
* write_todr - Write TOD registers
* clkinit - Initialize clocks
*/
- void (*cons_init) __P((void));
- void (*iointr) __P((unsigned, unsigned, unsigned, unsigned));
- int (*memsize) __P((void *));
- void (*intr_establish) __P((int, int (*)__P((void *)), void *));
- void (*clkinit) __P((void));
+ void (*cons_init)(void);
+ void (*iointr)(unsigned, unsigned, unsigned, unsigned);
+ int (*memsize)(void *);
+ void (*intr_establish)(int, int (*)(void *), void *);
+ void (*clkinit)(void);
};
extern struct platform platform;
diff --git a/sys/arch/mipsco/isa/isa_machdep.c b/sys/arch/mipsco/isa/isa_machdep.c
index b8015dc5c21..cd89df13004 100644
--- a/sys/arch/mipsco/isa/isa_machdep.c
+++ b/sys/arch/mipsco/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.8 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.9 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.8 2008/04/28 20:23:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.9 2009/03/14 14:46:02 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,9 +46,9 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.8 2008/04/28 20:23:28 martin Exp $
#include <dev/isa/isavar.h>
#include <dev/isa/isareg.h>
-static int mipscoisabusprint __P((void *auxp, const char *));
-static int isabusmatch __P((struct device *, struct cfdata *, void *));
-static void isabusattach __P((struct device *, struct device *, void *));
+static int mipscoisabusprint(void *auxp, const char *);
+static int isabusmatch(struct device *, struct cfdata *, void *);
+static void isabusattach(struct device *, struct device *, void *);
struct isabus_softc {
struct device sc_dev;
@@ -63,9 +63,9 @@ extern struct cfdriver isabus_cd;
static struct mipsco_bus_space isa_io_bst, isa_mem_bst, isa_ctl_bst;
static struct mipsco_bus_dma_tag isa_dmatag;
-static void isa_bus_space_init __P((struct mipsco_bus_space *, const char *,
- paddr_t, size_t));
-int isa_intr __P((void *));
+static void isa_bus_space_init(struct mipsco_bus_space *, const char *,
+ paddr_t, size_t);
+int isa_intr(void *);
int
@@ -187,7 +187,7 @@ isa_intr_establish(ic, intr, type, level, ih_fun, ih_arg)
int intr;
int type; /* XXX not yet */
int level; /* XXX not yet */
- int (*ih_fun) __P((void*));
+ int (*ih_fun)(void*);
void *ih_arg;
{
struct mipsco_intrhand *ih;
diff --git a/sys/arch/mipsco/mipsco/autoconf.c b/sys/arch/mipsco/mipsco/autoconf.c
index a67b84bcb15..4a4d5be4ae7 100644
--- a/sys/arch/mipsco/mipsco/autoconf.c
+++ b/sys/arch/mipsco/mipsco/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.18 2007/12/03 15:33:57 ad Exp $ */
+/* $NetBSD: autoconf.c,v 1.19 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -85,7 +85,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2007/12/03 15:33:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2009/03/14 14:46:02 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -109,9 +109,9 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2007/12/03 15:33:57 ad Exp $");
*/
int cpuspeed = 25; /* approx # instr per usec. */
-extern int initcpu __P((void)); /*XXX*/
+extern int initcpu(void); /*XXX*/
-void findroot __P((struct device **, int *));
+void findroot(struct device **, int *);
struct mipsco_intrhand intrtab[MAX_INTR_COOKIES];
diff --git a/sys/arch/mipsco/mipsco/bus_dma.c b/sys/arch/mipsco/mipsco/bus_dma.c
index c2ee291ac34..d4358be3d31 100644
--- a/sys/arch/mipsco/mipsco/bus_dma.c
+++ b/sys/arch/mipsco/mipsco/bus_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.22 2008/06/04 12:41:41 ad Exp $ */
+/* $NetBSD: bus_dma.c,v 1.23 2009/03/14 14:46:02 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22 2008/06/04 12:41:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.23 2009/03/14 14:46:02 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,11 +46,11 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.22 2008/06/04 12:41:41 ad Exp $");
#include <mips/cache.h>
-paddr_t kvtophys __P((vaddr_t)); /* XXX */
+paddr_t kvtophys(vaddr_t); /* XXX */
-static int _bus_dmamap_load_buffer __P((bus_dma_tag_t, bus_dmamap_t,
+static int _bus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t,
void *, bus_size_t, struct vmspace *, int, paddr_t *,
- int *, int));
+ int *, int);
extern paddr_t avail_start, avail_end; /* from pmap.c */
diff --git a/sys/arch/mipsco/mipsco/cpu.c b/sys/arch/mipsco/mipsco/cpu.c
index 71bcffd592e..5098f759bc4 100644
--- a/sys/arch/mipsco/mipsco/cpu.c
+++ b/sys/arch/mipsco/mipsco/cpu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.7 2005/12/11 12:18:13 christos Exp $ */
+/* $NetBSD: cpu.c,v 1.8 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.7 2005/12/11 12:18:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.8 2009/03/14 14:46:02 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -48,7 +48,7 @@ CFATTACH_DECL(cpu, sizeof(struct device),
extern struct cfdriver cpu_cd;
-extern void cpu_identify __P((void));
+extern void cpu_identify(void);
static int
cpumatch(parent, cfdata, aux)
diff --git a/sys/arch/mipsco/mipsco/disksubr.c b/sys/arch/mipsco/mipsco/disksubr.c
index cdd1fcb616b..62f4dfcf8d5 100644
--- a/sys/arch/mipsco/mipsco/disksubr.c
+++ b/sys/arch/mipsco/mipsco/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.23 2008/01/02 11:48:26 ad Exp $ */
+/* $NetBSD: disksubr.c,v 1.24 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.23 2008/01/02 11:48:26 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.24 2009/03/14 14:46:02 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,11 +46,11 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.23 2008/01/02 11:48:26 ad Exp $");
#define b_cylin b_resid
-static const char *disklabel_mips_to_bsd __P((struct mips_volheader *,
- struct disklabel *));
-static int disklabel_bsd_to_mips __P((struct disklabel *,
- struct mips_volheader *));
-static int mipsvh_cksum __P((struct mips_volheader *));
+static const char *disklabel_mips_to_bsd(struct mips_volheader *,
+ struct disklabel *);
+static int disklabel_bsd_to_mips(struct disklabel *,
+ struct mips_volheader *);
+static int mipsvh_cksum(struct mips_volheader *);
#define LABELSIZE(lp) ((char *)&lp->d_partitions[lp->d_npartitions] - \
(char *)lp)
@@ -66,7 +66,7 @@ static int mipsvh_cksum __P((struct mips_volheader *));
const char *
readdisklabel(dev, strat, lp, clp)
dev_t dev;
- void (*strat) __P((struct buf *bp));
+ void (*strat)(struct buf *bp);
register struct disklabel *lp;
struct cpu_disklabel *clp;
{
@@ -194,7 +194,7 @@ setdisklabel(olp, nlp, openmask, clp)
int
writedisklabel(dev, strat, lp, clp)
dev_t dev;
- void (*strat) __P((struct buf *bp));
+ void (*strat)(struct buf *bp);
register struct disklabel *lp;
struct cpu_disklabel *clp;
{
diff --git a/sys/arch/mipsco/mipsco/machdep.c b/sys/arch/mipsco/mipsco/machdep.c
index c48809ac8a4..2fe8744527a 100644
--- a/sys/arch/mipsco/mipsco/machdep.c
+++ b/sys/arch/mipsco/mipsco/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.62 2009/02/13 22:41:02 apb Exp $ */
+/* $NetBSD: machdep.c,v 1.63 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.62 2009/02/13 22:41:02 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.63 2009/03/14 14:46:02 dsl Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -152,26 +152,26 @@ char *bootinfo = NULL; /* pointer to bootinfo structure */
phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
int mem_cluster_cnt;
-void to_monitor __P((int)) __attribute__((__noreturn__));
-void prom_halt __P((int)) __attribute__((__noreturn__));
+void to_monitor(int) __attribute__((__noreturn__));
+void prom_halt(int) __attribute__((__noreturn__));
#ifdef KGDB
-void zs_kgdb_init __P((void));
-void kgdb_connect __P((int));
+void zs_kgdb_init(void);
+void kgdb_connect(int);
#endif
/*
* Local functions.
*/
-int initcpu __P((void));
-void configure __P((void));
+int initcpu(void);
+void configure(void);
-void mach_init __P((int, char *[], char*[], u_int, char *));
-int memsize_scan __P((void *));
+void mach_init(int, char *[], char*[], u_int, char *);
+int memsize_scan(void *);
#ifdef DEBUG
/* stacktrace code violates prototypes to get callee's registers */
-extern void stacktrace __P((void)); /*XXX*/
+extern void stacktrace(void); /*XXX*/
#endif
/*
@@ -184,15 +184,15 @@ int safepri = MIPS3_PSL_LOWIPL; /* XXX */
extern struct user *proc0paddr;
/* locore callback-vector setup */
-extern void mips_vector_init __P((void));
-extern void prom_init __P((void));
-extern void pizazz_init __P((void));
+extern void mips_vector_init(void);
+extern void prom_init(void);
+extern void pizazz_init(void);
/* platform-specific initialization vector */
-static void unimpl_cons_init __P((void));
-static void unimpl_iointr __P((unsigned, unsigned, unsigned, unsigned));
-static int unimpl_memsize __P((void *));
-static void unimpl_intr_establish __P((int, int (*)__P((void *)), void *));
+static void unimpl_cons_init(void);
+static void unimpl_iointr(unsigned, unsigned, unsigned, unsigned);
+static int unimpl_memsize(void *);
+static void unimpl_intr_establish(int, int (*)(void *), void *);
struct platform platform = {
.iobus = "iobus not set",
@@ -207,11 +207,11 @@ struct consdev *cn_tab = NULL;
extern struct consdev consdev_prom;
extern struct consdev consdev_zs;
-static void null_cnprobe __P((struct consdev *));
-static void prom_cninit __P((struct consdev *));
-static int prom_cngetc __P((dev_t));
-static void prom_cnputc __P((dev_t, int));
-static void null_cnpollc __P((dev_t, int));
+static void null_cnprobe(struct consdev *);
+static void prom_cninit(struct consdev *);
+static int prom_cngetc(dev_t);
+static void prom_cnputc(dev_t, int);
+static void null_cnpollc(dev_t, int);
struct consdev consdev_prom = {
null_cnprobe,
@@ -575,7 +575,7 @@ void *first;
void
unimpl_intr_establish(level, func, arg)
int level;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
panic("sysconf.init didn't init intr_establish");
diff --git a/sys/arch/mipsco/mipsco/mainbus.c b/sys/arch/mipsco/mipsco/mainbus.c
index 0c0fb12a6a7..f1af848e9fa 100644
--- a/sys/arch/mipsco/mipsco/mainbus.c
+++ b/sys/arch/mipsco/mipsco/mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.7 2005/12/11 12:18:13 christos Exp $ */
+/* $NetBSD: mainbus.c,v 1.8 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.7 2005/12/11 12:18:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.8 2009/03/14 14:46:02 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,9 +43,9 @@ struct mainbus_softc {
};
/* Definition of the mainbus driver. */
-static int mbmatch __P((struct device *, struct cfdata *, void *));
-static void mbattach __P((struct device *, struct device *, void *));
-static int mbprint __P((void *, const char *));
+static int mbmatch(struct device *, struct cfdata *, void *);
+static void mbattach(struct device *, struct device *, void *);
+static int mbprint(void *, const char *);
CFATTACH_DECL(mainbus, sizeof(struct mainbus_softc),
mbmatch, mbattach, NULL, NULL);
diff --git a/sys/arch/mipsco/obio/obio.c b/sys/arch/mipsco/obio/obio.c
index b2b74a3c299..530cfbe546f 100644
--- a/sys/arch/mipsco/obio/obio.c
+++ b/sys/arch/mipsco/obio/obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.13 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: obio.c,v 1.14 2009/03/14 14:46:02 dsl Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.13 2008/04/28 20:23:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.14 2009/03/14 14:46:02 dsl Exp $");
#include "locators.h"
@@ -43,13 +43,13 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.13 2008/04/28 20:23:28 martin Exp $");
#include <machine/bus.h>
#include <machine/sysconf.h>
-static int obio_match __P((struct device *, struct cfdata *, void *));
-static void obio_attach __P((struct device *, struct device *, void *));
-static int obio_search __P((struct device *, struct cfdata *,
- const int *, void *));
-static int obio_print __P((void *, const char *));
-static void obio_intr_establish __P((bus_space_tag_t, int, int, int,
- int (*)(void *), void *));
+static int obio_match(struct device *, struct cfdata *, void *);
+static void obio_attach(struct device *, struct device *, void *);
+static int obio_search(struct device *, struct cfdata *,
+ const int *, void *);
+static int obio_print(void *, const char *);
+static void obio_intr_establish(bus_space_tag_t, int, int, int,
+ int (*)(void *), void *);
CFATTACH_DECL(obio, sizeof(struct device),
obio_match, obio_attach, NULL, NULL);
@@ -140,7 +140,7 @@ obio_intr_establish(bst, level, pri, flags, func, arg)
int level;
int pri;
int flags;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
(*platform.intr_establish)(level, func, arg);
diff --git a/sys/arch/mipsco/obio/rambo.c b/sys/arch/mipsco/obio/rambo.c
index 66cd6309403..15076f6e056 100644
--- a/sys/arch/mipsco/obio/rambo.c
+++ b/sys/arch/mipsco/obio/rambo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rambo.c,v 1.9 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: rambo.c,v 1.10 2009/03/14 14:46:02 dsl Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rambo.c,v 1.9 2008/04/28 20:23:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rambo.c,v 1.10 2009/03/14 14:46:02 dsl Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -50,10 +50,10 @@ __KERNEL_RCSID(0, "$NetBSD: rambo.c,v 1.9 2008/04/28 20:23:28 martin Exp $");
* Timer & Interrupt manipulation routines for the Rambo Custom ASIC
*/
-static int rambo_match __P((struct device *, struct cfdata *, void *));
-static void rambo_attach __P((struct device *, struct device *, void *));
+static int rambo_match(struct device *, struct cfdata *, void *);
+static void rambo_attach(struct device *, struct device *, void *);
static unsigned rambo_get_timecount(struct timecounter *);
-void rambo_clkintr __P((struct clockframe *));
+void rambo_clkintr(struct clockframe *);
static void rambo_tc_init(void);
struct rambo_softc {
diff --git a/sys/arch/mipsco/obio/zs_kgdb.c b/sys/arch/mipsco/obio/zs_kgdb.c
index d2b431d2d34..adfdbbb62ac 100644
--- a/sys/arch/mipsco/obio/zs_kgdb.c
+++ b/sys/arch/mipsco/obio/zs_kgdb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.7 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.8 2009/03/14 14:46:02 dsl Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.7 2008/04/28 20:23:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.8 2009/03/14 14:46:02 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,15 +67,15 @@ __KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.7 2008/04/28 20:23:28 martin Exp $");
* (gdb) target remote /dev/ttyb
*/
-void zs_kgdb_init __P((void));
-void zskgdb __P((struct zs_chanstate *cs));
+void zs_kgdb_init(void);
+void zskgdb(struct zs_chanstate *cs);
-static void zs_setparam __P((struct zs_chanstate *, int, int));
+static void zs_setparam(struct zs_chanstate *, int, int);
static struct zsops zsops_kgdb;
extern struct zschan *zs_get_chan_addr (int zs_unit, int channel);
-extern int zs_getc __P((void *arg));
-extern void zs_putc __P((void *arg, int c));
+extern int zs_getc(void *arg);
+extern void zs_putc(void *arg, int c);
static u_char zs_kgdb_regs[16] = {
0, /* 0: CMD (reset, etc.) */
@@ -196,10 +196,10 @@ zskgdb(cs)
* Interface to the lower layer (zscc)
****************************************************************/
-static void zs_kgdb_rxint __P((struct zs_chanstate *));
-static void zs_kgdb_stint __P((struct zs_chanstate *, int));
-static void zs_kgdb_txint __P((struct zs_chanstate *));
-static void zs_kgdb_softint __P((struct zs_chanstate *));
+static void zs_kgdb_rxint(struct zs_chanstate *);
+static void zs_kgdb_stint(struct zs_chanstate *, int);
+static void zs_kgdb_txint(struct zs_chanstate *);
+static void zs_kgdb_softint(struct zs_chanstate *);
static struct zsops zsops_kgdb = {
zs_kgdb_rxint, /* receive char available */
diff --git a/sys/arch/mipsco/stand/common/boot.c b/sys/arch/mipsco/stand/common/boot.c
index 18f85318067..10622fd4836 100644
--- a/sys/arch/mipsco/stand/common/boot.c
+++ b/sys/arch/mipsco/stand/common/boot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.5 2008/04/28 20:23:28 martin Exp $ */
+/* $NetBSD: boot.c,v 1.6 2009/03/14 14:46:03 dsl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -92,8 +92,8 @@ char *kernelnames[] = {
};
-static char *devsplit __P((char *, char *));
-int main __P((int, char **));
+static char *devsplit(char *, char *);
+int main(int, char **);
/*
* This gets arguments from the first stage boot lader, calls PROM routines
@@ -111,8 +111,8 @@ main(argc, argv)
u_long marks[MARK_MAX];
struct btinfo_symtab bi_syms;
struct btinfo_bootpath bi_bpath;
- extern void prom_init __P((void));
- void (*entry) __P((int, char **, char **, u_int, char *));
+ extern void prom_init(void);
+ void (*entry)(int, char **, char **, u_int, char *);
prom_init();
diff --git a/sys/arch/mipsco/stand/common/bootinfo.h b/sys/arch/mipsco/stand/common/bootinfo.h
index 3332278eced..b1399b8eb24 100644
--- a/sys/arch/mipsco/stand/common/bootinfo.h
+++ b/sys/arch/mipsco/stand/common/bootinfo.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.2 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: bootinfo.h,v 1.3 2009/03/14 14:46:03 dsl Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -31,5 +31,5 @@
#include <machine/bootinfo.h>
-void bi_init __P((paddr_t));
-void bi_add __P((void *, int, int));
+void bi_init(paddr_t);
+void bi_add(void *, int, int);
diff --git a/sys/arch/mipsco/stand/common/bootxx.c b/sys/arch/mipsco/stand/common/bootxx.c
index 43840a51785..dd74e7cbd5f 100644
--- a/sys/arch/mipsco/stand/common/bootxx.c
+++ b/sys/arch/mipsco/stand/common/bootxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.6 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: bootxx.c,v 1.7 2009/03/14 14:46:03 dsl Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -68,10 +68,10 @@
#include <lib/libsa/stand.h>
#include <machine/prom.h>
-typedef void (*entrypt) __P((int, char **, int, const void *));
+typedef void (*entrypt)(int, char **, int, const void *);
-int main __P((int, char **));
-entrypt loadfile __P((char *path, char *name));
+int main(int, char **);
+entrypt loadfile(char *path, char *name);
/*
* This gets arguments from the PROM, calls other routines to open
@@ -85,7 +85,7 @@ main(argc, argv)
{
entrypt entry;
char *cp;
- extern void prom_init __P((void));
+ extern void prom_init(void);
prom_init();
diff --git a/sys/arch/mipsco/stand/common/callvec.c b/sys/arch/mipsco/stand/common/callvec.c
index a97ebf45fe2..c96a979cbff 100644
--- a/sys/arch/mipsco/stand/common/callvec.c
+++ b/sys/arch/mipsco/stand/common/callvec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: callvec.c,v 1.4 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: callvec.c,v 1.5 2009/03/14 14:46:03 dsl Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@ static struct mips_prom callvec;
struct mips_prom *callv;
-typedef void (*funcp_t) __P((void));
+typedef void (*funcp_t)(void);
void
prom_init()
diff --git a/sys/arch/mipsco/stand/common/common.h b/sys/arch/mipsco/stand/common/common.h
index 99e7c8837c6..39e00174573 100644
--- a/sys/arch/mipsco/stand/common/common.h
+++ b/sys/arch/mipsco/stand/common/common.h
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.2 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: common.h,v 1.3 2009/03/14 14:46:03 dsl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -32,11 +32,11 @@
/* startprog.S */
/* PROM callbacks */
-char *getenv __P((const char *));
-int prom_close __P((int));
-int prom_open __P((const char *, ...));
-int prom_read __P((int, void *, int));
-int prom_write __P((int, void *, int));
+char *getenv(const char *);
+int prom_close(int);
+int prom_open(const char *, ...);
+int prom_read(int, void *, int);
+int prom_write(int, void *, int);
/*
* vers.c (generated by newvers.sh)
diff --git a/sys/arch/mipsco/stand/common/saio.c b/sys/arch/mipsco/stand/common/saio.c
index 7f8e433e216..96665884a3f 100644
--- a/sys/arch/mipsco/stand/common/saio.c
+++ b/sys/arch/mipsco/stand/common/saio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: saio.c,v 1.9 2006/09/20 13:03:49 he Exp $ */
+/* $NetBSD: saio.c,v 1.10 2009/03/14 14:46:03 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -66,10 +66,10 @@ struct io_arg {
struct device_table {
char *dt_string; /* device name */
int (*dt_init) (int); /* device init routine */
- int (*dt_open) __P((int)); /* device open routine */
- int (*dt_strategy) __P((int)); /* device strategy routine, returns cnt */
- int (*dt_close) __P((int)); /* device close routine */
- int (*dt_ioctl) __P((int)); /* device ioctl routine */
+ int (*dt_open)(int); /* device open routine */
+ int (*dt_strategy)(int); /* device strategy routine, returns cnt */
+ int (*dt_close)(int); /* device close routine */
+ int (*dt_ioctl)(int); /* device ioctl routine */
int dt_type; /* device "type" */
int dt_fs; /* file system type */
char *dt_desc; /* device description */
diff --git a/sys/arch/mipsco/stand/common/saio.h b/sys/arch/mipsco/stand/common/saio.h
index 82779037969..90f0badac68 100644
--- a/sys/arch/mipsco/stand/common/saio.h
+++ b/sys/arch/mipsco/stand/common/saio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: saio.h,v 1.2 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: saio.h,v 1.3 2009/03/14 14:46:03 dsl Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-int saioopen __P((struct open_file*, ...));
-int saioclose __P((struct open_file*));
-int saioioctl __P((struct open_file*, u_long, void*));
-int saiostrategy __P((void*, int, daddr_t, size_t, void*, size_t*));
+int saioopen(struct open_file*, ...);
+int saioclose(struct open_file*);
+int saioioctl(struct open_file*, u_long, void*);
+int saiostrategy(void*, int, daddr_t, size_t, void*, size_t*);
diff --git a/sys/arch/mipsco/stand/installboot/installboot.c b/sys/arch/mipsco/stand/installboot/installboot.c
index ca0f9890740..061ddc878ca 100644
--- a/sys/arch/mipsco/stand/installboot/installboot.c
+++ b/sys/arch/mipsco/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: installboot.c,v 1.4 2008/04/28 20:23:29 martin Exp $ */
+/* $NetBSD: installboot.c,v 1.5 2009/03/14 14:46:03 dsl Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -51,15 +51,15 @@
#define BOOTBLOCK_OFFSET BOOTBLOCK_NUMBER*DEV_BSIZE
#define DEFAULT_BOOTFILE "boot"
-static void usage __P((void));
-static void do_list __P((const char *));
-static void do_remove __P((const char *, const char *));
-static void do_install __P((const char *, const char *, const char *));
-static int mipsvh_cksum __P((struct mips_volheader *));
-static void read_volheader __P((const char *, struct mips_volheader *));
-static void write_volheader __P((const char *, struct mips_volheader *));
-static struct mips_voldir *voldir_findfile __P((struct mips_volheader *,
- const char *, int));
+static void usage(void);
+static void do_list(const char *);
+static void do_remove(const char *, const char *);
+static void do_install(const char *, const char *, const char *);
+static int mipsvh_cksum(struct mips_volheader *);
+static void read_volheader(const char *, struct mips_volheader *);
+static void write_volheader(const char *, struct mips_volheader *);
+static struct mips_voldir *voldir_findfile(struct mips_volheader *,
+ const char *, int);
int verbose, nowrite;
diff --git a/sys/arch/mmeye/mmeye/machdep.c b/sys/arch/mmeye/mmeye/machdep.c
index 912aa750120..63612e3fd48 100644
--- a/sys/arch/mmeye/mmeye/machdep.c
+++ b/sys/arch/mmeye/mmeye/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.47 2009/02/13 22:41:02 apb Exp $ */
+/* $NetBSD: machdep.c,v 1.48 2009/03/14 14:46:03 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2009/02/13 22:41:02 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.48 2009/03/14 14:46:03 dsl Exp $");
#include "opt_ddb.h"
#include "opt_memsize.h"
@@ -104,11 +104,11 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2009/02/13 22:41:02 apb Exp $");
char machine[] = MACHINE; /* mmeye */
char machine_arch[] = MACHINE_ARCH; /* sh3eb */
-void initSH3 __P((void *));
-void LoadAndReset __P((const char *));
-void XLoadAndReset __P((char *));
-void consinit __P((void));
-void sh3_cache_on __P((void));
+void initSH3(void *);
+void LoadAndReset(const char *);
+void XLoadAndReset(char *);
+void consinit(void);
+void sh3_cache_on(void);
void InitializeBsc(void);
struct mmeye_intrhand {
diff --git a/sys/arch/mmeye/stand/bootcoff/osloader.c b/sys/arch/mmeye/stand/bootcoff/osloader.c
index fd8047fa94f..3e3d8fed455 100644
--- a/sys/arch/mmeye/stand/bootcoff/osloader.c
+++ b/sys/arch/mmeye/stand/bootcoff/osloader.c
@@ -43,11 +43,11 @@ char *netbsd = "/netbsd";
struct coff_filehdr FileHdr;
struct coff_aouthdr AoutHdr;
-static int coff_find_section __P((FILE *, struct coff_filehdr *,
- struct coff_scnhdr *, int));
+static int coff_find_section(FILE *, struct coff_filehdr *,
+ struct coff_scnhdr *, int);
-void LoadAndReset __P((char *));
-int main __P((int, char **));
+void LoadAndReset(char *);
+int main(int, char **);
static int
coff_find_section(fd, fp, sh, s_type)
diff --git a/sys/arch/mmeye/stand/bootelf/boot.c b/sys/arch/mmeye/stand/bootelf/boot.c
index d9c5ef2ac88..b2ca69f3cfe 100644
--- a/sys/arch/mmeye/stand/bootelf/boot.c
+++ b/sys/arch/mmeye/stand/bootelf/boot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.3 2006/04/03 06:15:00 uebayasi Exp $ */
+/* $NetBSD: boot.c,v 1.4 2009/03/14 14:46:03 dsl Exp $ */
/*-
* Copyright (C) 1999 Tsubai Masanari. All rights reserved.
@@ -42,7 +42,7 @@
# define DPRINTF while (0) printf
#endif
-void LoadAndReset __P((void *));
+void LoadAndReset(void *);
char *netbsd = "/netbsd";
diff --git a/sys/arch/mvmeppc/include/autoconf.h b/sys/arch/mvmeppc/include/autoconf.h
index 08124a2967a..ba8fdf06b60 100644
--- a/sys/arch/mvmeppc/include/autoconf.h
+++ b/sys/arch/mvmeppc/include/autoconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.3 2007/03/04 06:00:24 christos Exp $ */
+/* $NetBSD: autoconf.h,v 1.4 2009/03/14 14:46:03 dsl Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -43,6 +43,6 @@ struct confargs {
/* bus_space_tag_t ca_tag; */
};
-void *mapiodev __P((paddr_t, psize_t));
-paddr_t kvtop __P((void *));
-void *intr_establish __P((int, int, int, int (*)(void *), void *));
+void *mapiodev(paddr_t, psize_t);
+paddr_t kvtop(void *);
+void *intr_establish(int, int, int, int (*)(void *), void *);
diff --git a/sys/arch/mvmeppc/include/powerpc.h b/sys/arch/mvmeppc/include/powerpc.h
index 1a4a1015874..3da652f2f01 100644
--- a/sys/arch/mvmeppc/include/powerpc.h
+++ b/sys/arch/mvmeppc/include/powerpc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc.h,v 1.3 2005/12/11 12:18:19 christos Exp $ */
+/* $NetBSD: powerpc.h,v 1.4 2009/03/14 14:46:03 dsl Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -38,14 +38,14 @@ struct mem_region {
psize_t size;
};
-void mem_regions __P((struct mem_region **, struct mem_region **));
+void mem_regions(struct mem_region **, struct mem_region **);
/*
* These two functions get used solely in boot() in machdep.c.
*
* Not sure whether boot itself should be implementation dependent instead. XXX
*/
-void ppc_exit __P((void)) __attribute__((__noreturn__));
-void ppc_boot __P((char *bootspec)) __attribute__((__noreturn__));
+void ppc_exit(void) __attribute__((__noreturn__));
+void ppc_boot(char *bootspec) __attribute__((__noreturn__));
#endif /* _MACHINE_POWERPC_H_ */
diff --git a/sys/arch/netwinder/include/pci_machdep.h b/sys/arch/netwinder/include/pci_machdep.h
index a4af8efdb64..2eaa9366dbd 100644
--- a/sys/arch/netwinder/include/pci_machdep.h
+++ b/sys/arch/netwinder/include/pci_machdep.h
@@ -1,12 +1,12 @@
-/* $NetBSD: pci_machdep.h,v 1.3 2002/10/09 00:33:39 thorpej Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.4 2009/03/14 14:46:03 dsl Exp $ */
#ifndef _NETWINDER_PCI_MACHDEP_H_
#define _NETWINDER_PCI_MACHDEP_H_
#include <arm/pci_machdep.h>
-void netwinder_pci_attach_hook __P((struct device *,
- struct device *, struct pcibus_attach_args *));
+void netwinder_pci_attach_hook(struct device *,
+ struct device *, struct pcibus_attach_args *);
#define __HAVE_PCIIDE_MACHDEP_COMPAT_INTR_ESTABLISH
diff --git a/sys/arch/netwinder/pci/pcib.c b/sys/arch/netwinder/pci/pcib.c
index 7a63f16b0c4..be37bed7ac9 100644
--- a/sys/arch/netwinder/pci/pcib.c
+++ b/sys/arch/netwinder/pci/pcib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.10 2008/04/28 20:23:30 martin Exp $ */
+/* $NetBSD: pcib.c,v 1.11 2009/03/14 14:46:03 dsl Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.10 2008/04/28 20:23:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.11 2009/03/14 14:46:03 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,13 +49,13 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.10 2008/04/28 20:23:30 martin Exp $");
#include "isadma.h"
-int pcibmatch __P((struct device *, struct cfdata *, void *));
-void pcibattach __P((struct device *, struct device *, void *));
+int pcibmatch(struct device *, struct cfdata *, void *);
+void pcibattach(struct device *, struct device *, void *);
CFATTACH_DECL(pcib, sizeof(struct device),
pcibmatch, pcibattach, NULL, NULL);
-void pcib_callback __P((struct device *));
+void pcib_callback(struct device *);
int
pcibmatch(parent, match, aux)
diff --git a/sys/arch/netwinder/pci/pciide_machdep.c b/sys/arch/netwinder/pci/pciide_machdep.c
index c94d9a2f4b8..befa0f01ecc 100644
--- a/sys/arch/netwinder/pci/pciide_machdep.c
+++ b/sys/arch/netwinder/pci/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.4 2005/12/11 12:18:20 christos Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.5 2009/03/14 14:46:03 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.4 2005/12/11 12:18:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.5 2009/03/14 14:46:03 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
struct device *dev;
struct pci_attach_args *pa;
int chan;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
#if NISA > 0
diff --git a/sys/arch/ofppc/include/powerpc.h b/sys/arch/ofppc/include/powerpc.h
index 59fbdb3ac7e..06654bd71c1 100644
--- a/sys/arch/ofppc/include/powerpc.h
+++ b/sys/arch/ofppc/include/powerpc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc.h,v 1.7 2005/12/11 12:18:29 christos Exp $ */
+/* $NetBSD: powerpc.h,v 1.8 2009/03/14 14:46:03 dsl Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -38,14 +38,14 @@ struct mem_region {
psize_t size;
};
-void mem_regions __P((struct mem_region **, struct mem_region **));
+void mem_regions(struct mem_region **, struct mem_region **);
/*
* These two functions get used solely in boot() in machdep.c.
*
* Not sure whether boot itself should be implementation dependent instead. XXX
*/
-void ppc_exit __P((void)) __attribute__((__noreturn__));
-void ppc_boot __P((char *bootspec)) __attribute__((__noreturn__));
+void ppc_exit(void) __attribute__((__noreturn__));
+void ppc_boot(char *bootspec) __attribute__((__noreturn__));
#endif /* _MACHINE_POWERPC_H_ */
diff --git a/sys/arch/pmax/ibus/ibus.c b/sys/arch/pmax/ibus/ibus.c
index 2fcdd0171ca..3bcbc70c388 100644
--- a/sys/arch/pmax/ibus/ibus.c
+++ b/sys/arch/pmax/ibus/ibus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus.c,v 1.14 2007/03/04 06:00:33 christos Exp $ */
+/* $NetBSD: ibus.c,v 1.15 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.14 2007/03/04 06:00:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.15 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -92,7 +92,7 @@ ibus_intr_establish(dev, cookie, level, handler, arg)
struct device *dev;
void *cookie;
int level;
- int (*handler) __P((void *));
+ int (*handler)(void *);
void *arg;
{
(*platform.intr_establish)(dev, cookie, level, handler, arg);
diff --git a/sys/arch/pmax/ibus/ibus_3max.c b/sys/arch/pmax/ibus/ibus_3max.c
index 460ea213b6f..37e76b4bdc6 100644
--- a/sys/arch/pmax/ibus/ibus_3max.c
+++ b/sys/arch/pmax/ibus/ibus_3max.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus_3max.c,v 1.11 2008/05/26 10:31:22 nisimura Exp $ */
+/* $NetBSD: ibus_3max.c,v 1.12 2009/03/14 14:46:04 dsl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.11 2008/05/26 10:31:22 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.12 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,8 +45,8 @@ static struct ibus_attach_args kn02sys_devs[] = {
{ "dc", SYS_DEV_SCC0, KV(KN02_SYS_DZ), 0 },
};
-static int kn02sys_match __P((struct device *, struct cfdata *, void *));
-static void kn02sys_attach __P((struct device *, struct device *, void *));
+static int kn02sys_match(struct device *, struct cfdata *, void *);
+static void kn02sys_attach(struct device *, struct device *, void *);
CFATTACH_DECL(kn02sys, sizeof(struct ibus_softc),
kn02sys_match, kn02sys_attach, NULL, NULL);
diff --git a/sys/arch/pmax/ibus/ibus_pmax.c b/sys/arch/pmax/ibus/ibus_pmax.c
index 4ec5a734fcb..aa9bbee1555 100644
--- a/sys/arch/pmax/ibus/ibus_pmax.c
+++ b/sys/arch/pmax/ibus/ibus_pmax.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus_pmax.c,v 1.18 2002/10/02 04:15:09 thorpej Exp $ */
+/* $NetBSD: ibus_pmax.c,v 1.19 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ibus_pmax.c,v 1.18 2002/10/02 04:15:09 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus_pmax.c,v 1.19 2009/03/14 14:46:04 dsl Exp $");
#include "opt_dec_3100.h"
#include "opt_dec_5100.h"
@@ -49,8 +49,8 @@ __KERNEL_RCSID(0, "$NetBSD: ibus_pmax.c,v 1.18 2002/10/02 04:15:09 thorpej Exp $
#include <pmax/pmax/kn230.h>
#include <pmax/pmax/pmaxtype.h>
-static int ibus_pmax_match __P((struct device *, struct cfdata *, void *));
-static void ibus_pmax_attach __P((struct device *, struct device *, void *));
+static int ibus_pmax_match(struct device *, struct cfdata *, void *);
+static void ibus_pmax_attach(struct device *, struct device *, void *);
CFATTACH_DECL(ibus_pmax, sizeof(struct ibus_softc),
ibus_pmax_match, ibus_pmax_attach, NULL, NULL);
diff --git a/sys/arch/pmax/ibus/ibusvar.h b/sys/arch/pmax/ibus/ibusvar.h
index 8d731711f36..2e4e0c3098f 100644
--- a/sys/arch/pmax/ibus/ibusvar.h
+++ b/sys/arch/pmax/ibus/ibusvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ibusvar.h,v 1.17 2007/03/04 06:00:33 christos Exp $ */
+/* $NetBSD: ibusvar.h,v 1.18 2009/03/14 14:46:04 dsl Exp $ */
#ifndef _PMAX_IBUS_IBUSVAR_H_
#define _PMAX_IBUS_IBUSVAR_H_
@@ -32,9 +32,9 @@ struct ibus_attach_args {
int ia_basz; /* badaddr() size */
};
-void ibusattach __P((struct device *, struct device *, void *));
-int ibusprint __P((void *, const char *));
-void ibus_intr_establish __P((struct device *, void *cookie, int level,
- int (*handler)(void *), void *arg));
+void ibusattach(struct device *, struct device *, void *);
+int ibusprint(void *, const char *);
+void ibus_intr_establish(struct device *, void *cookie, int level,
+ int (*handler)(void *), void *arg);
#endif /* !_PMAX_IBUS_IBUSVAR_H_ */
diff --git a/sys/arch/pmax/ibus/mcclock_ibus.c b/sys/arch/pmax/ibus/mcclock_ibus.c
index 8c0eace5285..98b7b8b4118 100644
--- a/sys/arch/pmax/ibus/mcclock_ibus.c
+++ b/sys/arch/pmax/ibus/mcclock_ibus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_ibus.c,v 1.13 2008/01/03 23:02:24 joerg Exp $ */
+/* $NetBSD: mcclock_ibus.c,v 1.14 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mcclock_ibus.c,v 1.13 2008/01/03 23:02:24 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_ibus.c,v 1.14 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -41,10 +41,10 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_ibus.c,v 1.13 2008/01/03 23:02:24 joerg Exp
#include <pmax/ibus/ibusvar.h>
-static int mcclock_ibus_match __P((struct device *, struct cfdata *,
- void *));
-static void mcclock_ibus_attach __P((struct device *, struct device *,
- void *));
+static int mcclock_ibus_match(struct device *, struct cfdata *,
+ void *);
+static void mcclock_ibus_attach(struct device *, struct device *,
+ void *);
CFATTACH_DECL(mcclock_ibus, sizeof (struct mcclock_pad32_softc),
mcclock_ibus_match, mcclock_ibus_attach, NULL, NULL);
diff --git a/sys/arch/pmax/ibus/sii.c b/sys/arch/pmax/ibus/sii.c
index 11962d58a01..b3294f45000 100644
--- a/sys/arch/pmax/ibus/sii.c
+++ b/sys/arch/pmax/ibus/sii.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sii.c,v 1.4 2007/10/17 19:56:15 garbled Exp $ */
+/* $NetBSD: sii.c,v 1.5 2009/03/14 14:46:04 dsl Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sii.c,v 1.4 2007/10/17 19:56:15 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sii.c,v 1.5 2009/03/14 14:46:04 dsl Exp $");
#include "sii.h"
/*
@@ -132,18 +132,18 @@ static u_char sii_buf[256]; /* used for extended messages */
* Forward references
*/
-static void sii_Reset __P((struct siisoftc *sc, int resetbus));
-static void sii_StartCmd __P((struct siisoftc *sc, int target));
-static void sii_CmdDone __P((struct siisoftc *sc, int target, int error));
-static void sii_DoIntr __P((struct siisoftc *sc, u_int dstat));
-static void sii_StateChg __P((struct siisoftc *sc, u_int cstat));
-static int sii_GetByte __P((SIIRegs *regs, int phase, int ack));
-static void sii_DoSync __P((SIIRegs *regs, State *state));
-static void sii_StartDMA __P((SIIRegs *regs, int phase, u_short *dmaAddr,
- int size));
+static void sii_Reset(struct siisoftc *sc, int resetbus);
+static void sii_StartCmd(struct siisoftc *sc, int target);
+static void sii_CmdDone(struct siisoftc *sc, int target, int error);
+static void sii_DoIntr(struct siisoftc *sc, u_int dstat);
+static void sii_StateChg(struct siisoftc *sc, u_int cstat);
+static int sii_GetByte(SIIRegs *regs, int phase, int ack);
+static void sii_DoSync(SIIRegs *regs, State *state);
+static void sii_StartDMA(SIIRegs *regs, int phase, u_short *dmaAddr,
+ int size);
#ifdef DEBUG
-static void sii_DumpLog __P((void));
+static void sii_DumpLog(void);
#endif
diff --git a/sys/arch/pmax/ibus/sii_ds.c b/sys/arch/pmax/ibus/sii_ds.c
index dd8cf513811..3ece4685894 100644
--- a/sys/arch/pmax/ibus/sii_ds.c
+++ b/sys/arch/pmax/ibus/sii_ds.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sii_ds.c,v 1.3 2007/03/04 06:00:33 christos Exp $ */
+/* $NetBSD: sii_ds.c,v 1.4 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@@ -16,7 +16,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sii_ds.c,v 1.3 2007/03/04 06:00:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sii_ds.c,v 1.4 2009/03/14 14:46:04 dsl Exp $");
#include "sii.h"
@@ -42,23 +42,23 @@ __KERNEL_RCSID(0, "$NetBSD: sii_ds.c,v 1.3 2007/03/04 06:00:33 christos Exp $");
#include <pmax/pmax/pmaxtype.h>
-static void kn230_copytobuf __P((u_short *src, /* NB: must be short aligned */
- volatile u_short *dst, int length));
-static void kn230_copyfrombuf __P((volatile u_short *src, char *dst,
- int length));
+static void kn230_copytobuf(u_short *src, /* NB: must be short aligned */
+ volatile u_short *dst, int length);
+static void kn230_copyfrombuf(volatile u_short *src, char *dst,
+ int length);
-static void kn01_copytobuf __P((u_short *src, /* NB: must be short aligned */
- volatile u_short *dst, int length));
-static void kn01_copyfrombuf __P((volatile u_short *src, char *dst,
- int length));
+static void kn01_copytobuf(u_short *src, /* NB: must be short aligned */
+ volatile u_short *dst, int length);
+static void kn01_copyfrombuf(volatile u_short *src, char *dst,
+ int length);
/*
* Autoconfig definition of driver front-end
*/
-static int sii_ds_match __P((struct device* parent, struct cfdata *match,
- void *aux));
-static void sii_ds_attach __P((struct device *parent, struct device *self,
- void *aux));
+static int sii_ds_match(struct device* parent, struct cfdata *match,
+ void *aux);
+static void sii_ds_attach(struct device *parent, struct device *self,
+ void *aux);
CFATTACH_DECL(sii_ds, sizeof(struct siisoftc),
sii_ds_match, sii_ds_attach, NULL, NULL);
diff --git a/sys/arch/pmax/ibus/siivar.h b/sys/arch/pmax/ibus/siivar.h
index 879699a2c94..6c527e1d882 100644
--- a/sys/arch/pmax/ibus/siivar.h
+++ b/sys/arch/pmax/ibus/siivar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: siivar.h,v 1.2 2006/07/29 19:10:57 ad Exp $ */
+/* $NetBSD: siivar.h,v 1.3 2009/03/14 14:46:04 dsl Exp $ */
#ifndef _SIIVAR_H
#define _SIIVAR_H
@@ -57,18 +57,18 @@ struct siisoftc {
int sc_flags;
int sc_target; /* target SCSI ID if connected */
ScsiCmd *sc_cmd[SII_NCMD]; /* active command indexed by ID */
- void (*sii_copytobuf) __P((u_short *src, volatile u_short *dst, int ln));
- void (*sii_copyfrombuf) __P((volatile u_short *src, char *dst, int len));
+ void (*sii_copytobuf)(u_short *src, volatile u_short *dst, int ln);
+ void (*sii_copyfrombuf)(volatile u_short *src, char *dst, int len);
State sc_st[SII_NCMD]; /* state info for each active command */
};
-int siiintr __P((void *sc));
+int siiintr(void *sc);
/* Machine-indepedent back-end attach entry point */
-void sii_scsi_request __P((struct scsipi_channel *,
- scsipi_adapter_req_t, void *));
-void siiattach __P((struct siisoftc *));
+void sii_scsi_request(struct scsipi_channel *,
+ scsipi_adapter_req_t, void *);
+void siiattach(struct siisoftc *);
#endif /* _SIIVAR_H */
diff --git a/sys/arch/pmax/include/autoconf.h b/sys/arch/pmax/include/autoconf.h
index bef86e21256..40b553a152a 100644
--- a/sys/arch/pmax/include/autoconf.h
+++ b/sys/arch/pmax/include/autoconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.18 2003/03/22 14:26:43 simonb Exp $ */
+/* $NetBSD: autoconf.h,v 1.19 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -40,6 +40,6 @@ struct mainbus_attach_args {
when attaching CPUs */
};
-void makebootdev __P((char *));
+void makebootdev(char *);
#endif /* !_PMAX_AUTOCONF_H_ */
diff --git a/sys/arch/pmax/include/bootinfo.h b/sys/arch/pmax/include/bootinfo.h
index 718fa465000..5141f77b6ae 100644
--- a/sys/arch/pmax/include/bootinfo.h
+++ b/sys/arch/pmax/include/bootinfo.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.7 2005/12/11 12:18:39 christos Exp $ */
+/* $NetBSD: bootinfo.h,v 1.8 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1997
@@ -66,7 +66,7 @@ struct btinfo_symtab {
};
#ifdef _KERNEL
-void *lookup_bootinfo __P((int));
+void *lookup_bootinfo(int);
#endif
#endif /* !_PMAX_BOOTINFO_H_ */
diff --git a/sys/arch/pmax/include/bus.h b/sys/arch/pmax/include/bus.h
index 3975c6ea036..24f94868c7d 100644
--- a/sys/arch/pmax/include/bus.h
+++ b/sys/arch/pmax/include/bus.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.28 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: bus.h,v 1.29 2009/03/14 14:46:04 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -54,8 +54,8 @@ typedef int bus_space_tag_t;
typedef u_long bus_space_handle_t;
/*
- * int bus_space_map __P((bus_space_tag_t t, bus_addr_t addr,
- * bus_size_t size, int flags, bus_space_handle_t *bshp));
+ * int bus_space_map(bus_space_tag_t t, bus_addr_t addr,
+ * bus_size_t size, int flags, bus_space_handle_t *bshp);
*
* Map a region of bus space.
*/
@@ -64,55 +64,55 @@ typedef u_long bus_space_handle_t;
#define BUS_SPACE_MAP_LINEAR 0x02
#define BUS_SPACE_MAP_PREFETCHABLE 0x04
-int bus_space_map __P((bus_space_tag_t, bus_addr_t, bus_size_t,
- int, bus_space_handle_t *));
+int bus_space_map(bus_space_tag_t, bus_addr_t, bus_size_t,
+ int, bus_space_handle_t *);
/*
- * void bus_space_unmap __P((bus_space_tag_t t,
- * bus_space_handle_t bsh, bus_size_t size));
+ * void bus_space_unmap(bus_space_tag_t t,
+ * bus_space_handle_t bsh, bus_size_t size);
*
* Unmap a region of bus space.
*/
-void bus_space_unmap __P((bus_space_tag_t, bus_space_handle_t, bus_size_t));
+void bus_space_unmap(bus_space_tag_t, bus_space_handle_t, bus_size_t);
/*
- * int bus_space_subregion __P((bus_space_tag_t t,
+ * int bus_space_subregion(bus_space_tag_t t,
* bus_space_handle_t bsh, bus_size_t offset, bus_size_t size,
- * bus_space_handle_t *nbshp));
+ * bus_space_handle_t *nbshp);
*
* Get a new handle for a subregion of an already-mapped area of bus space.
*/
-int bus_space_subregion __P((bus_space_tag_t t, bus_space_handle_t bsh,
- bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp));
+int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
+ bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp);
/*
- * int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t, rstart,
+ * int bus_space_alloc(bus_space_tag_t t, bus_addr_t, rstart,
* bus_addr_t rend, bus_size_t size, bus_size_t align,
* bus_size_t boundary, int flags, bus_addr_t *addrp,
- * bus_space_handle_t *bshp));
+ * bus_space_handle_t *bshp);
*
* Allocate a region of bus space.
*/
-int bus_space_alloc __P((bus_space_tag_t t, bus_addr_t rstart,
+int bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart,
bus_addr_t rend, bus_size_t size, bus_size_t align,
bus_size_t boundary, int cacheable, bus_addr_t *addrp,
- bus_space_handle_t *bshp));
+ bus_space_handle_t *bshp);
/*
- * int bus_space_free __P((bus_space_tag_t t,
- * bus_space_handle_t bsh, bus_size_t size));
+ * int bus_space_free(bus_space_tag_t t,
+ * bus_space_handle_t bsh, bus_size_t size);
*
* Free a region of bus space.
*/
-void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
- bus_size_t size));
+void bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh,
+ bus_size_t size);
/*
- * void *bus_space_vaddr __P((bus_space_tag_t, bus_space_handle_t));
+ * void *bus_space_vaddr(bus_space_tag_t, bus_space_handle_t);
*
* Get the kernel virtual address for the mapped bus space.
* Only allowed for regions mapped with BUS_SPACE_MAP_LINEAR.
@@ -122,8 +122,8 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
((void *)(h))
/*
- * u_intN_t bus_space_read_N __P((bus_space_tag_t tag,
- * bus_space_handle_t bsh, bus_size_t offset));
+ * u_intN_t bus_space_read_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset);
*
* Read a 1, 2, 4, or 8 byte quantity from bus space
* described by tag/handle/offset.
@@ -143,9 +143,9 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
#endif
/*
- * void bus_space_read_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_read_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t *addr, size_t count));
+ * u_intN_t *addr, size_t count);
*
* Read `count' 1, 2, 4, or 8 byte quantities from bus space
* described by tag/handle/offset and copy into buffer provided.
@@ -153,8 +153,8 @@ void bus_space_free __P((bus_space_tag_t t, bus_space_handle_t bsh,
#define __PMAX_bus_space_read_multi(BYTES,BITS) \
static __inline void __CONCAT(bus_space_read_multi_,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __PB_TYPENAME(BITS) *, size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS) *, size_t); \
\
static __inline void \
__CONCAT(bus_space_read_multi_,BYTES)(t, h, o, a, c) \
@@ -180,9 +180,9 @@ __PMAX_bus_space_read_multi(4,32)
#undef __PMAX_bus_space_read_multi
/*
- * void bus_space_read_region_N __P((bus_space_tag_t tag,
+ * void bus_space_read_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t *addr, size_t count));
+ * u_intN_t *addr, size_t count);
*
* Read `count' 1, 2, 4, or 8 byte quantities from bus space
* described by tag/handle and starting at `offset' and copy into
@@ -191,8 +191,8 @@ __PMAX_bus_space_read_multi(4,32)
#define __PMAX_bus_space_read_region(BYTES,BITS) \
static __inline void __CONCAT(bus_space_read_region_,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __PB_TYPENAME(BITS) *, size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS) *, size_t); \
\
static __inline void \
__CONCAT(bus_space_read_region_,BYTES)(t, h, o, a, c) \
@@ -220,9 +220,9 @@ __PMAX_bus_space_read_region(4,32)
#undef __PMAX_bus_space_read_region
/*
- * void bus_space_write_N __P((bus_space_tag_t tag,
+ * void bus_space_write_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t value));
+ * u_intN_t value);
*
* Write the 1, 2, 4, or 8 byte value `value' to bus space
* described by tag/handle/offset.
@@ -254,9 +254,9 @@ do { \
#endif
/*
- * void bus_space_write_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_write_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * const u_intN_t *addr, size_t count));
+ * const u_intN_t *addr, size_t count);
*
* Write `count' 1, 2, 4, or 8 byte quantities from the buffer
* provided to bus space described by tag/handle/offset.
@@ -264,8 +264,8 @@ do { \
#define __PMAX_bus_space_write_multi(BYTES,BITS) \
static __inline void __CONCAT(bus_space_write_multi_,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __PB_TYPENAME(BITS) *, size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS) *, size_t); \
\
static __inline void \
__CONCAT(bus_space_write_multi_,BYTES)(t, h, o, a, c) \
@@ -292,9 +292,9 @@ __PMAX_bus_space_write_multi(4,32)
#undef __PMAX_bus_space_write_multi
/*
- * void bus_space_write_region_N __P((bus_space_tag_t tag,
+ * void bus_space_write_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * const u_intN_t *addr, size_t count));
+ * const u_intN_t *addr, size_t count);
*
* Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
* to bus space described by tag/handle starting at `offset'.
@@ -302,8 +302,8 @@ __PMAX_bus_space_write_multi(4,32)
#define __PMAX_bus_space_write_region(BYTES,BITS) \
static __inline void __CONCAT(bus_space_write_region_,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __PB_TYPENAME(BITS) *, size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS) *, size_t); \
\
static __inline void \
__CONCAT(bus_space_write_region_,BYTES)(t, h, o, a, c) \
@@ -332,9 +332,9 @@ __PMAX_bus_space_write_region(4,32)
#undef __PMAX_bus_space_write_region
/*
- * void bus_space_set_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_set_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
- * size_t count));
+ * size_t count);
*
* Write the 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle/offset `count' times.
@@ -342,8 +342,8 @@ __PMAX_bus_space_write_region(4,32)
#define __PMAX_bus_space_set_multi(BYTES,BITS) \
static __inline void __CONCAT(bus_space_set_multi_,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __PB_TYPENAME(BITS), size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS), size_t); \
\
static __inline void \
__CONCAT(bus_space_set_multi_,BYTES)(t, h, o, v, c) \
@@ -370,9 +370,9 @@ __PMAX_bus_space_set_multi(4,32)
#undef __PMAX_bus_space_set_multi
/*
- * void bus_space_set_region_N __P((bus_space_tag_t tag,
+ * void bus_space_set_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
- * size_t count));
+ * size_t count);
*
* Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle starting at `offset'.
@@ -380,8 +380,8 @@ __PMAX_bus_space_set_multi(4,32)
#define __PMAX_bus_space_set_region(BYTES,BITS) \
static __inline void __CONCAT(bus_space_set_region_,BYTES) \
- __P((bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __PB_TYPENAME(BITS), size_t)); \
+(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS), size_t); \
\
static __inline void \
__CONCAT(bus_space_set_region_,BYTES)(t, h, o, v, c) \
@@ -410,10 +410,10 @@ __PMAX_bus_space_set_region(4,32)
#undef __PMAX_bus_space_set_region
/*
- * void bus_space_copy_region_N __P((bus_space_tag_t tag,
+ * void bus_space_copy_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh1, bus_size_t off1,
* bus_space_handle_t bsh2, bus_size_t off2,
- * bus_size_t count));
+ * bus_size_t count);
*
* Copy `count' 1, 2, 4, or 8 byte values from bus space starting
* at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
@@ -421,10 +421,10 @@ __PMAX_bus_space_set_region(4,32)
#define __PMAX_copy_region(BYTES) \
static __inline void __CONCAT(bus_space_copy_region_,BYTES) \
- __P((bus_space_tag_t, \
+(bus_space_tag_t, \
bus_space_handle_t bsh1, bus_size_t off1, \
bus_space_handle_t bsh2, bus_size_t off2, \
- bus_size_t count)); \
+ bus_size_t count); \
\
static __inline void \
__CONCAT(bus_space_copy_region_,BYTES)(t, h1, o1, h2, o2, c) \
@@ -461,9 +461,9 @@ __PMAX_copy_region(4)
/*
* Bus read/write barrier methods.
*
- * void bus_space_barrier __P((bus_space_tag_t tag,
+ * void bus_space_barrier(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * bus_size_t len, int flags));
+ * bus_size_t len, int flags);
*
* On the MIPS, we just flush the write buffer.
*/
@@ -537,33 +537,33 @@ struct pmax_bus_dma_tag {
/*
* DMA mapping methods.
*/
- int (*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *));
- void (*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t));
- int (*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
- int (*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
- int (*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
- int (*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
- void (*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t));
- void (*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int));
+ int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
+ void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t);
+ int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+ int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+ int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+ int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+ void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
+ void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
/*
* DMA memory utility functions.
*/
- int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t,
- bus_size_t, bus_dma_segment_t *, int, int *, int));
- void (*_dmamem_free) __P((bus_dma_tag_t,
- bus_dma_segment_t *, int));
- int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, size_t, void **, int));
- void (*_dmamem_unmap) __P((bus_dma_tag_t, void *, size_t));
- paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, off_t, int, int));
+ int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
+ bus_size_t, bus_dma_segment_t *, int, int *, int);
+ void (*_dmamem_free)(bus_dma_tag_t,
+ bus_dma_segment_t *, int);
+ int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, size_t, void **, int);
+ void (*_dmamem_unmap)(bus_dma_tag_t, void *, size_t);
+ paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, off_t, int, int);
};
#define bus_dmamap_create(t, s, n, m, b, f, p) \
@@ -625,39 +625,39 @@ struct pmax_bus_dmamap {
#ifdef _PMAX_BUS_DMA_PRIVATE
void pmax_bus_dma_init(void);
-int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t,
- bus_size_t, int, bus_dmamap_t *));
-void _bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int _bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
-int _bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
-int _bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
-int _bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
-void _bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void _bus_dmamap_sync_r3k __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
- bus_size_t, int));
-void _bus_dmamap_sync_r4k __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
- bus_size_t, int));
-
-int _bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size,
+int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
+ bus_size_t, int, bus_dmamap_t *);
+void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void _bus_dmamap_sync_r3k(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+ bus_size_t, int);
+void _bus_dmamap_sync_r4k(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+ bus_size_t, int);
+
+int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
- bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags));
-void _bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs));
-int _bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, size_t size, void **kvap, int flags));
-void _bus_dmamem_unmap __P((bus_dma_tag_t tag, void *kva,
- size_t size));
-paddr_t _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, off_t off, int prot, int flags));
-
-int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
+ bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
+void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs);
+int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, size_t size, void **kvap, int flags);
+void _bus_dmamem_unmap(bus_dma_tag_t tag, void *kva,
+ size_t size);
+paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, off_t off, int prot, int flags);
+
+int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
- vaddr_t low, vaddr_t high));
+ vaddr_t low, vaddr_t high);
extern struct pmax_bus_dma_tag pmax_default_bus_dma_tag;
#endif /* _PMAX_BUS_DMA_PRIVATE */
diff --git a/sys/arch/pmax/include/dec_prom.h b/sys/arch/pmax/include/dec_prom.h
index 7f8f1b3b228..97d8db392a9 100644
--- a/sys/arch/pmax/include/dec_prom.h
+++ b/sys/arch/pmax/include/dec_prom.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_prom.h,v 1.20 2005/12/11 12:18:39 christos Exp $ */
+/* $NetBSD: dec_prom.h,v 1.21 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -92,50 +92,50 @@ typedef int jmp_buf[12];
typedef void (*psig_t)(int);
struct callback {
- void *(*_memcpy) __P((void *, void *, int)); /* 00 */
- void *(*_memset) __P((void *, int, int)); /* 04 */
- char *(*_strcat) __P((char *, char *)); /* 08 */
- int (*_strcmp) __P((char *, char *)); /* 0c */
- char *(*_strcpy) __P((char *, char *)); /* 10 */
- int (*_strlen) __P((char *)); /* 14 */
- char *(*_strncat) __P((char *, char *, int)); /* 18 */
- char *(*_strncpy) __P((char *, char *, int)); /* 1c */
- int (*_strncmp) __P((char *, char *, int)); /* 20 */
- int (*_getchar) __P((void)); /* 24 */
- char *(*_gets) __P((char *)); /* 28 */
- int (*_puts) __P((char *)); /* 2c */
- int (*_printf) __P((const char *, ...)); /* 30 */
- int (*_sprintf) __P((char *, char *, ...)); /* 34 */
- int (*_io_poll) __P((void)); /* 38 */
- long (*_strtol) __P((char *, char **, int)); /* 3c */
- psig_t (*_signal) __P((int, psig_t)); /* 40 */
- int (*_raise) __P((int)); /* 44 */
- long (*_time) __P((long *)); /* 48 */
- int (*_setjmp) __P((jmp_buf)); /* 4c */
- void (*_longjmp) __P((jmp_buf, int)); /* 50 */
- int (*_bootinit) __P((char *)); /* 54 */
- int (*_bootread) __P((int, void *, int)); /* 58 */
- int (*_bootwrite) __P((int, void *, int)); /* 5c */
- int (*_setenv) __P((char *, char *)); /* 60 */
- char *(*_getenv) __P((const char *)); /* 64 */
- int (*_unsetenv) __P((char *)); /* 68 */
- u_long (*_slot_address) __P((int)); /* 6c */
- void (*_wbflush) __P((void)); /* 70 */
- void (*_msdelay) __P((int)); /* 74 */
- void (*_leds) __P((int)); /* 78 */
- void (*_clear_cache) __P((char *, int)); /* 7c */
- int (*_getsysid) __P((void)); /* 80 */
- int (*_getbitmap) __P((memmap *)); /* 84 */
- int (*_disableintr) __P((int)); /* 88 */
- int (*_enableintr) __P((int)); /* 8c */
- int (*_testintr) __P((int)); /* 90 */
+ void *(*_memcpy)(void *, void *, int); /* 00 */
+ void *(*_memset)(void *, int, int); /* 04 */
+ char *(*_strcat)(char *, char *); /* 08 */
+ int (*_strcmp)(char *, char *); /* 0c */
+ char *(*_strcpy)(char *, char *); /* 10 */
+ int (*_strlen)(char *); /* 14 */
+ char *(*_strncat)(char *, char *, int); /* 18 */
+ char *(*_strncpy)(char *, char *, int); /* 1c */
+ int (*_strncmp)(char *, char *, int); /* 20 */
+ int (*_getchar)(void); /* 24 */
+ char *(*_gets)(char *); /* 28 */
+ int (*_puts)(char *); /* 2c */
+ int (*_printf)(const char *, ...); /* 30 */
+ int (*_sprintf)(char *, char *, ...); /* 34 */
+ int (*_io_poll)(void); /* 38 */
+ long (*_strtol)(char *, char **, int); /* 3c */
+ psig_t (*_signal)(int, psig_t); /* 40 */
+ int (*_raise)(int); /* 44 */
+ long (*_time)(long *); /* 48 */
+ int (*_setjmp)(jmp_buf); /* 4c */
+ void (*_longjmp)(jmp_buf, int); /* 50 */
+ int (*_bootinit)(char *); /* 54 */
+ int (*_bootread)(int, void *, int); /* 58 */
+ int (*_bootwrite)(int, void *, int); /* 5c */
+ int (*_setenv)(char *, char *); /* 60 */
+ char *(*_getenv)(const char *); /* 64 */
+ int (*_unsetenv)(char *); /* 68 */
+ u_long (*_slot_address)(int); /* 6c */
+ void (*_wbflush)(void); /* 70 */
+ void (*_msdelay)(int); /* 74 */
+ void (*_leds)(int); /* 78 */
+ void (*_clear_cache)(char *, int); /* 7c */
+ int (*_getsysid)(void); /* 80 */
+ int (*_getbitmap)(memmap *); /* 84 */
+ int (*_disableintr)(int); /* 88 */
+ int (*_enableintr)(int); /* 8c */
+ int (*_testintr)(int); /* 90 */
void *_reserved_data; /* 94 */
- int (*_console_init) __P((void)); /* 98 */
- void (*_halt) __P((int *, int)); /* 9c */
- void (*_showfault) __P((void)); /* a0 */
- tcinfo *(*_gettcinfo) __P((void)); /*XXX* bogus proto */ /* a4 */
- int (*_execute_cmd) __P((char *)); /* a8 */
- void (*_rex) __P((char)); /* ac */
+ int (*_console_init)(void); /* 98 */
+ void (*_halt)(int *, int); /* 9c */
+ void (*_showfault)(void); /* a0 */
+ tcinfo *(*_gettcinfo)(void); /*XXX* bogus proto */ /* a4 */
+ int (*_execute_cmd)(char *); /* a8 */
+ void (*_rex)(char); /* ac */
/* b0 to d4 reserved */
};
diff --git a/sys/arch/pmax/include/intr.h b/sys/arch/pmax/include/intr.h
index 7835fcf6693..3ed42b66e5b 100644
--- a/sys/arch/pmax/include/intr.h
+++ b/sys/arch/pmax/include/intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.32 2008/01/04 21:54:05 ad Exp $ */
+/* $NetBSD: intr.h,v 1.33 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -103,7 +103,7 @@ splraiseipl(ipl_cookie_t icookie)
#define MIPS_SPL_0_1_2_3 (MIPS_INT_MASK_3|MIPS_SPL_0_1_2)
struct intrhand {
- int (*ih_func) __P((void *));
+ int (*ih_func)(void *);
void *ih_arg;
struct evcnt ih_count;
};
diff --git a/sys/arch/pmax/include/param.h b/sys/arch/pmax/include/param.h
index 996661c1ff0..0d5aa2e4259 100644
--- a/sys/arch/pmax/include/param.h
+++ b/sys/arch/pmax/include/param.h
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.38 2006/09/10 11:12:20 tsutsui Exp $ */
+/* $NetBSD: param.h,v 1.39 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -131,7 +131,7 @@
#ifdef _KERNEL
#ifndef _LOCORE
-void delay __P((int n));
+void delay(int n);
extern int cpuspeed;
static __inline void __attribute__((__unused__))
DELAY(int n)
diff --git a/sys/arch/pmax/include/sysconf.h b/sys/arch/pmax/include/sysconf.h
index 737d1cac6d7..820f0d14ac2 100644
--- a/sys/arch/pmax/include/sysconf.h
+++ b/sys/arch/pmax/include/sysconf.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sysconf.h,v 1.12 2008/01/03 23:02:24 joerg Exp $ */
+/* $NetBSD: sysconf.h,v 1.13 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -65,12 +65,12 @@ struct platform {
* intr_disestablish - disestablish interrupt handler
* tc_init - initialize timecounters
*/
- void (*bus_reset) __P((void));
- void (*cons_init) __P((void));
- void (*iointr) __P((unsigned, unsigned, unsigned, unsigned));
- void (*intr_establish) __P((struct device *, void *, int,
- int (*)(void *), void *));
- int (*memsize) __P((void *));
+ void (*bus_reset)(void);
+ void (*cons_init)(void);
+ void (*iointr)(unsigned, unsigned, unsigned, unsigned);
+ void (*intr_establish)(struct device *, void *, int,
+ int (*)(void *), void *);
+ int (*memsize)(void *);
void (*tc_init)(void);
};
@@ -78,7 +78,7 @@ struct platform {
* An array of functions to initialize the platform structure.
*/
struct sysinit {
- void (*init) __P((void));
+ void (*init)(void);
const char *option;
};
@@ -89,10 +89,10 @@ extern struct platform platform;
extern struct sysinit sysinit[];
extern int nsysinit;
-int memsize_scan __P((void *));
-int memsize_bitmap __P((void *));
-void platform_not_configured __P((void));
-void platform_not_supported __P((void));
+int memsize_scan(void *);
+int memsize_bitmap(void *);
+void platform_not_configured(void);
+void platform_not_supported(void);
#endif /* _KERNEL */
diff --git a/sys/arch/pmax/pmax/bus_dma.c b/sys/arch/pmax/pmax/bus_dma.c
index da86b260290..223225882aa 100644
--- a/sys/arch/pmax/pmax/bus_dma.c
+++ b/sys/arch/pmax/pmax/bus_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.49 2008/06/04 12:41:41 ad Exp $ */
+/* $NetBSD: bus_dma.c,v 1.50 2009/03/14 14:46:04 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.49 2008/06/04 12:41:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.50 2009/03/14 14:46:04 dsl Exp $");
#include "opt_cputype.h"
@@ -47,11 +47,11 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.49 2008/06/04 12:41:41 ad Exp $");
#include <mips/cache.h>
-static int _bus_dmamap_load_buffer __P((bus_dmamap_t,
+static int _bus_dmamap_load_buffer(bus_dmamap_t,
void *, bus_size_t, struct vmspace *, int, vaddr_t *,
- int *, int));
+ int *, int);
-paddr_t kvtophys __P((vaddr_t)); /* XXX */
+paddr_t kvtophys(vaddr_t); /* XXX */
/*
* The default DMA tag for all busses on the DECstation.
diff --git a/sys/arch/pmax/pmax/cpu.c b/sys/arch/pmax/pmax/cpu.c
index 79584878953..9299f36d547 100644
--- a/sys/arch/pmax/pmax/cpu.c
+++ b/sys/arch/pmax/pmax/cpu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.24 2005/12/11 12:18:39 christos Exp $ */
+/* $NetBSD: cpu.c,v 1.25 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.24 2005/12/11 12:18:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.25 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -38,8 +38,8 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.24 2005/12/11 12:18:39 christos Exp $");
#include <machine/autoconf.h>
-static int cpumatch __P((struct device *, struct cfdata *, void *));
-static void cpuattach __P((struct device *, struct device *, void *));
+static int cpumatch(struct device *, struct cfdata *, void *);
+static void cpuattach(struct device *, struct device *, void *);
CFATTACH_DECL(cpu, sizeof (struct device),
cpumatch, cpuattach, NULL, NULL);
diff --git a/sys/arch/pmax/pmax/dec_3100.c b/sys/arch/pmax/pmax/dec_3100.c
index 0b0ebd86397..e9b10e9ad54 100644
--- a/sys/arch/pmax/pmax/dec_3100.c
+++ b/sys/arch/pmax/pmax/dec_3100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3100.c,v 1.44 2007/12/03 15:34:09 ad Exp $ */
+/* $NetBSD: dec_3100.c,v 1.45 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dec_3100.c,v 1.44 2007/12/03 15:34:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3100.c,v 1.45 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -131,14 +131,14 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3100.c,v 1.44 2007/12/03 15:34:09 ad Exp $");
#include "pm.h"
-void dec_3100_init __P((void)); /* XXX */
-static void dec_3100_bus_reset __P((void));
+void dec_3100_init(void); /* XXX */
+static void dec_3100_bus_reset(void);
-static void dec_3100_cons_init __P((void));
-static void dec_3100_errintr __P((void));
-static void dec_3100_intr __P((unsigned, unsigned, unsigned, unsigned));
-static void dec_3100_intr_establish __P((struct device *, void *,
- int, int (*)(void *), void *));
+static void dec_3100_cons_init(void);
+static void dec_3100_errintr(void);
+static void dec_3100_intr(unsigned, unsigned, unsigned, unsigned);
+static void dec_3100_intr_establish(struct device *, void *,
+ int, int (*)(void *), void *);
#define kn01_wbflush() mips1_wbflush() /* XXX to be corrected XXX */
@@ -266,7 +266,7 @@ dec_3100_intr_establish(dev, cookie, level, handler, arg)
struct device *dev;
void *cookie;
int level;
- int (*handler) __P((void *));
+ int (*handler)(void *);
void *arg;
{
diff --git a/sys/arch/pmax/pmax/dec_3max.c b/sys/arch/pmax/pmax/dec_3max.c
index 4728c2e853c..14ff71ced0c 100644
--- a/sys/arch/pmax/pmax/dec_3max.c
+++ b/sys/arch/pmax/pmax/dec_3max.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3max.c,v 1.45 2007/12/03 15:34:09 ad Exp $ */
+/* $NetBSD: dec_3max.c,v 1.46 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -106,7 +106,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.45 2007/12/03 15:34:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.46 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,14 +132,14 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.45 2007/12/03 15:34:09 ad Exp $");
#include <pmax/pmax/cons.h>
#include "wsdisplay.h"
-void dec_3max_init __P((void)); /* XXX */
-static void dec_3max_bus_reset __P((void));
+void dec_3max_init(void); /* XXX */
+static void dec_3max_bus_reset(void);
-static void dec_3max_cons_init __P((void));
-static void dec_3max_errintr __P((void));
-static void dec_3max_intr __P((unsigned, unsigned, unsigned, unsigned));
-static void dec_3max_intr_establish __P((struct device *, void *,
- int, int (*)(void *), void *));
+static void dec_3max_cons_init(void);
+static void dec_3max_errintr(void);
+static void dec_3max_intr(unsigned, unsigned, unsigned, unsigned);
+static void dec_3max_intr_establish(struct device *, void *,
+ int, int (*)(void *), void *);
#define kn02_wbflush() mips1_wbflush() /* XXX to be corrected XXX */
@@ -208,7 +208,7 @@ static void
dec_3max_cons_init()
{
int kbd, crt, screen;
- extern int tcfb_cnattach __P((int)); /* XXX */
+ extern int tcfb_cnattach(int); /* XXX */
kbd = crt = screen = 0;
prom_findcons(&kbd, &crt, &screen);
@@ -252,7 +252,7 @@ dec_3max_intr_establish(dev, cookie, level, handler, arg)
struct device *dev;
void *cookie;
int level;
- int (*handler) __P((void *));
+ int (*handler)(void *);
void *arg;
{
int i;
diff --git a/sys/arch/pmax/pmax/dec_3maxplus.c b/sys/arch/pmax/pmax/dec_3maxplus.c
index 67e8277593c..3b96d6c9f38 100644
--- a/sys/arch/pmax/pmax/dec_3maxplus.c
+++ b/sys/arch/pmax/pmax/dec_3maxplus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3maxplus.c,v 1.58 2008/01/03 23:02:24 joerg Exp $ */
+/* $NetBSD: dec_3maxplus.c,v 1.59 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -106,7 +106,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.58 2008/01/03 23:02:24 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.59 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -132,15 +132,15 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.58 2008/01/03 23:02:24 joerg Exp
#include <pmax/pmax/cons.h>
#include "wsdisplay.h"
-void dec_3maxplus_init __P((void)); /* XXX */
-static void dec_3maxplus_bus_reset __P((void));
-static void dec_3maxplus_cons_init __P((void));
-static void dec_3maxplus_errintr __P((void));
-static void dec_3maxplus_intr __P((unsigned, unsigned, unsigned, unsigned));
-static void dec_3maxplus_intr_establish __P((struct device *, void *,
- int, int (*)(void *), void *));
+void dec_3maxplus_init(void); /* XXX */
+static void dec_3maxplus_bus_reset(void);
+static void dec_3maxplus_cons_init(void);
+static void dec_3maxplus_errintr(void);
+static void dec_3maxplus_intr(unsigned, unsigned, unsigned, unsigned);
+static void dec_3maxplus_intr_establish(struct device *, void *,
+ int, int (*)(void *), void *);
-static void kn03_wbflush __P((void));
+static void kn03_wbflush(void);
static void dec_3maxplus_tc_init(void);
@@ -267,7 +267,7 @@ dec_3maxplus_intr_establish(dev, cookie, level, handler, arg)
struct device *dev;
void *cookie;
int level;
- int (*handler) __P((void *));
+ int (*handler)(void *);
void *arg;
{
unsigned mask;
diff --git a/sys/arch/pmax/pmax/dec_3min.c b/sys/arch/pmax/pmax/dec_3min.c
index fca1890a9e5..c97e997e707 100644
--- a/sys/arch/pmax/pmax/dec_3min.c
+++ b/sys/arch/pmax/pmax/dec_3min.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3min.c,v 1.60 2008/03/15 08:50:08 tsutsui Exp $ */
+/* $NetBSD: dec_3min.c,v 1.61 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -106,7 +106,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.60 2008/03/15 08:50:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.61 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -133,14 +133,14 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.60 2008/03/15 08:50:08 tsutsui Exp $"
#include <dev/tc/zs_ioasicvar.h>
#include "wsdisplay.h"
-void dec_3min_init __P((void)); /* XXX */
-static void dec_3min_bus_reset __P((void));
-static void dec_3min_cons_init __P((void));
-static void dec_3min_intr __P((unsigned, unsigned, unsigned, unsigned));
-static void dec_3min_intr_establish __P((struct device *, void *,
- int, int (*)(void *), void *));
+void dec_3min_init(void); /* XXX */
+static void dec_3min_bus_reset(void);
+static void dec_3min_cons_init(void);
+static void dec_3min_intr(unsigned, unsigned, unsigned, unsigned);
+static void dec_3min_intr_establish(struct device *, void *,
+ int, int (*)(void *), void *);
-static void kn02ba_wbflush __P((void));
+static void kn02ba_wbflush(void);
static void dec_3min_tc_init(void);
@@ -268,7 +268,7 @@ dec_3min_intr_establish(dev, cookie, level, handler, arg)
struct device *dev;
void *cookie;
int level;
- int (*handler) __P((void *));
+ int (*handler)(void *);
void *arg;
{
unsigned mask;
diff --git a/sys/arch/pmax/pmax/dec_5100.c b/sys/arch/pmax/pmax/dec_5100.c
index 9e4012a341c..3269b4e407c 100644
--- a/sys/arch/pmax/pmax/dec_5100.c
+++ b/sys/arch/pmax/pmax/dec_5100.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_5100.c,v 1.40 2007/12/03 15:34:10 ad Exp $ */
+/* $NetBSD: dec_5100.c,v 1.41 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_5100.c,v 1.40 2007/12/03 15:34:10 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_5100.c,v 1.41 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,13 +55,13 @@ __KERNEL_RCSID(0, "$NetBSD: dec_5100.c,v 1.40 2007/12/03 15:34:10 ad Exp $");
#include <pmax/pmax/cons.h>
-void dec_5100_init __P((void)); /* XXX */
-static void dec_5100_bus_reset __P((void));
-static void dec_5100_cons_init __P((void));
-static void dec_5100_intr __P((unsigned, unsigned, unsigned, unsigned));
-static void dec_5100_intr_establish __P((struct device *, void *,
- int, int (*)(void *), void *));
-static void dec_5100_memintr __P((void));
+void dec_5100_init(void); /* XXX */
+static void dec_5100_bus_reset(void);
+static void dec_5100_cons_init(void);
+static void dec_5100_intr(unsigned, unsigned, unsigned, unsigned);
+static void dec_5100_intr_establish(struct device *, void *,
+ int, int (*)(void *), void *);
+static void dec_5100_memintr(void);
static const int dec_5100_ipl2spl_table[] = {
[IPL_NONE] = 0,
@@ -130,7 +130,7 @@ dec_5100_intr_establish(dev, cookie, level, handler, arg)
struct device *dev;
void *cookie;
int level;
- int (*handler) __P((void *));
+ int (*handler)(void *);
void *arg;
{
diff --git a/sys/arch/pmax/pmax/dec_maxine.c b/sys/arch/pmax/pmax/dec_maxine.c
index 685f65aec96..98b7809e916 100644
--- a/sys/arch/pmax/pmax/dec_maxine.c
+++ b/sys/arch/pmax/pmax/dec_maxine.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_maxine.c,v 1.52 2008/01/03 23:02:25 joerg Exp $ */
+/* $NetBSD: dec_maxine.c,v 1.53 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -106,7 +106,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.52 2008/01/03 23:02:25 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.53 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -131,16 +131,16 @@ __KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.52 2008/01/03 23:02:25 joerg Exp $"
#include "wsdisplay.h"
#include "xcfb.h"
-void dec_maxine_init __P((void)); /* XXX */
-static void dec_maxine_bus_reset __P((void));
-static void dec_maxine_cons_init __P((void));
-static void dec_maxine_intr __P((unsigned, unsigned, unsigned, unsigned));
-static void dec_maxine_intr_establish __P((struct device *, void *,
- int, int (*)(void *), void *));
+void dec_maxine_init(void); /* XXX */
+static void dec_maxine_bus_reset(void);
+static void dec_maxine_cons_init(void);
+static void dec_maxine_intr(unsigned, unsigned, unsigned, unsigned);
+static void dec_maxine_intr_establish(struct device *, void *,
+ int, int (*)(void *), void *);
static void dec_maxine_tc_init(void);
-static void kn02ca_wbflush __P((void));
+static void kn02ca_wbflush(void);
/*
* local declarations
@@ -260,7 +260,7 @@ dec_maxine_intr_establish(dev, cookie, level, handler, arg)
struct device *dev;
void *cookie;
int level;
- int (*handler) __P((void *));
+ int (*handler)(void *);
void *arg;
{
unsigned mask;
diff --git a/sys/arch/pmax/pmax/disksubr.c b/sys/arch/pmax/pmax/disksubr.c
index 19f012cd9ef..b8c65b8f765 100644
--- a/sys/arch/pmax/pmax/disksubr.c
+++ b/sys/arch/pmax/pmax/disksubr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.49 2008/11/15 11:19:07 ad Exp $ */
+/* $NetBSD: disksubr.c,v 1.50 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.49 2008/11/15 11:19:07 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.50 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,8 +44,8 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.49 2008/11/15 11:19:07 ad Exp $");
#include <ufs/ufs/dinode.h> /* XXX for fs.h */
#include <ufs/ffs/fs.h> /* XXX for BBSIZE & SBSIZE */
-const char *compat_label __P((dev_t dev, void (*strat) __P((struct buf *bp)),
- struct disklabel *lp, struct cpu_disklabel *osdep)); /* XXX */
+const char *compat_label(dev_t dev, void (*strat)(struct buf *bp),
+ struct disklabel *lp, struct cpu_disklabel *osdep); /* XXX */
/*
* Attempt to read a disk label from a device
@@ -58,7 +58,7 @@ const char *compat_label __P((dev_t dev, void (*strat) __P((struct buf *bp)),
const char *
readdisklabel(dev, strat, lp, osdep)
dev_t dev;
- void (*strat) __P((struct buf *bp));
+ void (*strat)(struct buf *bp);
struct disklabel *lp;
struct cpu_disklabel *osdep;
{
@@ -121,7 +121,7 @@ readdisklabel(dev, strat, lp, osdep)
const char *
compat_label(dev, strat, lp, osdep)
dev_t dev;
- void (*strat) __P((struct buf *bp));
+ void (*strat)(struct buf *bp);
struct disklabel *lp;
struct cpu_disklabel *osdep;
{
@@ -241,7 +241,7 @@ setdisklabel(olp, nlp, openmask, osdep)
int
writedisklabel(dev, strat, lp, osdep)
dev_t dev;
- void (*strat) __P((struct buf *bp));
+ void (*strat)(struct buf *bp);
struct disklabel *lp;
struct cpu_disklabel *osdep;
{
diff --git a/sys/arch/pmax/pmax/machdep.c b/sys/arch/pmax/pmax/machdep.c
index 461aaefa726..df2898b0dcb 100644
--- a/sys/arch/pmax/pmax/machdep.c
+++ b/sys/arch/pmax/pmax/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.227 2009/02/13 22:41:02 apb Exp $ */
+/* $NetBSD: machdep.c,v 1.228 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.227 2009/02/13 22:41:02 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.228 2009/03/14 14:46:04 dsl Exp $");
#include "fs_mfs.h"
#include "opt_ddb.h"
@@ -160,16 +160,16 @@ phys_ram_seg_t mem_clusters[VM_PHYSSEG_MAX];
*/
int safepri = MIPS3_PSL_LOWIPL; /* XXX */
-void mach_init __P((int, char *[], int, int, u_int, char *)); /* XXX */
+void mach_init(int, char *[], int, int, u_int, char *); /* XXX */
/* Motherboard or system-specific initialization vector */
-static void unimpl_bus_reset __P((void));
-static void unimpl_cons_init __P((void));
-static void unimpl_iointr __P((unsigned, unsigned, unsigned, unsigned));
-static void unimpl_intr_establish __P((struct device *, void *, int,
- int (*)(void *), void *));
-static int unimpl_memsize __P((void *));
-static unsigned nullwork __P((void));
+static void unimpl_bus_reset(void);
+static void unimpl_cons_init(void);
+static void unimpl_iointr(unsigned, unsigned, unsigned, unsigned);
+static void unimpl_intr_establish(struct device *, void *, int,
+ int (*)(void *), void *);
+static int unimpl_memsize(void *);
+static unsigned nullwork(void);
struct platform platform = {
"iobus not set",
@@ -680,7 +680,7 @@ unimpl_intr_establish(dev, cookie, level, handler, arg)
struct device *dev;
void *cookie;
int level;
- int (*handler) __P((void *));
+ int (*handler)(void *);
void *arg;
{
panic("sysconf.init didn't set intr_establish");
diff --git a/sys/arch/pmax/pmax/machdep.h b/sys/arch/pmax/pmax/machdep.h
index b7c983e3529..b688e375840 100644
--- a/sys/arch/pmax/pmax/machdep.h
+++ b/sys/arch/pmax/pmax/machdep.h
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.h,v 1.11 2005/12/11 12:18:39 christos Exp $ */
+/* $NetBSD: machdep.h,v 1.12 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -36,10 +36,10 @@ extern int physmem_boardmax; /* {model,simm}-specific bound on physmem */
struct memmap;
/* PROM callback routines - see pmax/promcall.c */
-void prom_findcons __P((int *, int *, int *));
-void prom_halt __P((int, char *)) __attribute__((__noreturn__));
-void prom_haltbutton __P((void));
-int prom_scsiid __P((int));
-char *prom_getenv __P((const char *));
-int prom_systype __P((void));
-int prom_getbitmap __P((struct memmap *));
+void prom_findcons(int *, int *, int *);
+void prom_halt(int, char *) __attribute__((__noreturn__));
+void prom_haltbutton(void);
+int prom_scsiid(int);
+char *prom_getenv(const char *);
+int prom_systype(void);
+int prom_getbitmap(struct memmap *);
diff --git a/sys/arch/pmax/pmax/mainbus.c b/sys/arch/pmax/pmax/mainbus.c
index cf4ff7ebb3f..6536c0a323f 100644
--- a/sys/arch/pmax/pmax/mainbus.c
+++ b/sys/arch/pmax/pmax/mainbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.36 2005/12/11 12:18:39 christos Exp $ */
+/* $NetBSD: mainbus.c,v 1.37 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.36 2005/12/11 12:18:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.37 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -39,9 +39,9 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.36 2005/12/11 12:18:39 christos Exp $"
#include <machine/autoconf.h>
/* Definition of the mainbus driver. */
-static int mbmatch __P((struct device *, struct cfdata *, void *));
-static void mbattach __P((struct device *, struct device *, void *));
-static int mbprint __P((void *, const char *));
+static int mbmatch(struct device *, struct cfdata *, void *);
+static void mbattach(struct device *, struct device *, void *);
+static int mbprint(void *, const char *);
CFATTACH_DECL(mainbus, sizeof(struct device),
mbmatch, mbattach, NULL, NULL);
diff --git a/sys/arch/pmax/pmax/memc.h b/sys/arch/pmax/pmax/memc.h
index d683c7d7c53..c7dbbf75920 100644
--- a/sys/arch/pmax/pmax/memc.h
+++ b/sys/arch/pmax/pmax/memc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: memc.h,v 1.3 2000/01/08 01:02:39 simonb Exp $ */
+/* $NetBSD: memc.h,v 1.4 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -35,8 +35,8 @@
#ifndef __PMAX_MEMC_H
#define __PMAX_MEMC_H
-void dec_mtasic_err __P((u_int32_t erradr, u_int32_t errsyn,
- u_int32_t bnk32m));
-void kn02ba_errintr __P((void));
+void dec_mtasic_err(u_int32_t erradr, u_int32_t errsyn,
+ u_int32_t bnk32m);
+void kn02ba_errintr(void);
#endif
diff --git a/sys/arch/pmax/pmax/promcall.c b/sys/arch/pmax/pmax/promcall.c
index a4ee019ab01..a8b4e193ed3 100644
--- a/sys/arch/pmax/pmax/promcall.c
+++ b/sys/arch/pmax/pmax/promcall.c
@@ -1,4 +1,4 @@
-/* $NetBSD: promcall.c,v 1.12 2006/09/09 08:27:13 tsutsui Exp $ */
+/* $NetBSD: promcall.c,v 1.13 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: promcall.c,v 1.12 2006/09/09 08:27:13 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: promcall.c,v 1.13 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -90,8 +90,8 @@ __KERNEL_RCSID(0, "$NetBSD: promcall.c,v 1.12 2006/09/09 08:27:13 tsutsui Exp $"
#include <pmax/pmax/pmaxtype.h>
#include <pmax/pmax/machdep.h>
-static int romgetc __P((dev_t));
-static void romputc __P((dev_t, int));
+static int romgetc(dev_t);
+static void romputc(dev_t, int);
#define DEFAULT_SCSIID 7 /* XXX - this should really live somewhere else */
@@ -242,7 +242,7 @@ prom_halt(howto, bootstr)
if (callv != &callvec)
(*callv->_rex)((howto & RB_HALT) ? 'h' : 'b');
else {
- void __attribute__((__noreturn__)) (*f) __P((void));
+ void __attribute__((__noreturn__)) (*f)(void);
f = (howto & RB_HALT)
? (void *)DEC_PROM_REINIT
diff --git a/sys/arch/pmax/pmax/sysconf.c b/sys/arch/pmax/pmax/sysconf.c
index 73d4a2352e3..a778596e525 100644
--- a/sys/arch/pmax/pmax/sysconf.c
+++ b/sys/arch/pmax/pmax/sysconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sysconf.c,v 1.10 2005/12/11 12:18:39 christos Exp $ */
+/* $NetBSD: sysconf.c,v 1.11 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysconf.c,v 1.10 2005/12/11 12:18:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysconf.c,v 1.11 2009/03/14 14:46:04 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,14 +41,14 @@ __KERNEL_RCSID(0, "$NetBSD: sysconf.c,v 1.10 2005/12/11 12:18:39 christos Exp $"
#include "opt_dec_3100.h"
#ifdef DEC_3100
- void dec_3100_init __P((void));
+ void dec_3100_init(void);
#else
# define dec_3100_init platform_not_configured
#endif
#include "opt_dec_3max.h"
#ifdef DEC_3MAX
- void dec_3max_init __P((void));
+ void dec_3max_init(void);
#else
# define dec_3max_init platform_not_configured
#endif
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: sysconf.c,v 1.10 2005/12/11 12:18:39 christos Exp $"
#include "opt_dec_3min.h"
#ifdef DEC_3MIN
- void dec_3min_init __P((void));
+ void dec_3min_init(void);
#else
# define dec_3min_init platform_not_configured
#endif
@@ -64,35 +64,35 @@ __KERNEL_RCSID(0, "$NetBSD: sysconf.c,v 1.10 2005/12/11 12:18:39 christos Exp $"
#include "opt_dec_maxine.h"
#ifdef DEC_MAXINE
- void dec_maxine_init __P((void));
+ void dec_maxine_init(void);
#else
# define dec_maxine_init platform_not_configured
#endif
#include "opt_dec_3maxplus.h"
#ifdef DEC_3MAXPLUS
- void dec_3maxplus_init __P((void));
+ void dec_3maxplus_init(void);
#else
# define dec_3maxplus_init platform_not_configured
#endif
#include "opt_dec_5100.h"
#ifdef DEC_5100
- void dec_5100_init __P((void));
+ void dec_5100_init(void);
#else
# define dec_5100_init platform_not_configured
#endif
#include "opt_dec_5400.h"
#ifdef DEC_5400
- void dec_5400_init __P((void));
+ void dec_5400_init(void);
#else
# define dec_5400_init platform_not_configured
#endif
#include "opt_dec_5500.h"
#ifdef DEC_5500
- void dec_5500_init __P((void));
+ void dec_5500_init(void);
#else
# define dec_5500_init platform_not_configured
#endif
@@ -100,7 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: sysconf.c,v 1.10 2005/12/11 12:18:39 christos Exp $"
#include "opt_dec_5800.h"
#ifdef DEC_5800
- void dec_5800_init __P((void));
+ void dec_5800_init(void);
#else
# define dec_5800_init platform_not_configured
#endif
diff --git a/sys/arch/pmax/stand/common/boot.c b/sys/arch/pmax/stand/common/boot.c
index 24cb5022a92..f4d7e5873e0 100644
--- a/sys/arch/pmax/stand/common/boot.c
+++ b/sys/arch/pmax/stand/common/boot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.16 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: boot.c,v 1.17 2009/03/14 14:46:04 dsl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -95,8 +95,8 @@ char *kernelnames[] = {
};
-static char *devname __P((char *));
-int main __P((int, char **));
+static char *devname(char *);
+int main(int, char **);
/*
* This gets arguments from the first stage boot lader, calls PROM routines
diff --git a/sys/arch/pmax/stand/common/bootinfo.h b/sys/arch/pmax/stand/common/bootinfo.h
index e6147f96b79..8ffcbf0414d 100644
--- a/sys/arch/pmax/stand/common/bootinfo.h
+++ b/sys/arch/pmax/stand/common/bootinfo.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bootinfo.h,v 1.3 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: bootinfo.h,v 1.4 2009/03/14 14:46:04 dsl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,5 +31,5 @@
#include <machine/bootinfo.h>
-void bi_init __P((paddr_t));
-void bi_add __P((void *, int, int));
+void bi_init(paddr_t);
+void bi_add(void *, int, int);
diff --git a/sys/arch/pmax/stand/common/bootxx.c b/sys/arch/pmax/stand/common/bootxx.c
index a75747ebeed..453e733bcfb 100644
--- a/sys/arch/pmax/stand/common/bootxx.c
+++ b/sys/arch/pmax/stand/common/bootxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bootxx.c,v 1.30 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: bootxx.c,v 1.31 2009/03/14 14:46:04 dsl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -69,12 +69,12 @@
#include <lib/libkern/libkern.h>
#include <machine/dec_prom.h>
-typedef void (*entrypt) __P((int, char **, int, const void *));
+typedef void (*entrypt)(int, char **, int, const void *);
-int main __P((int, char **));
-entrypt loadfile __P((char *path, char *name));
+int main(int, char **);
+entrypt loadfile(char *path, char *name);
-extern int clear_cache __P((char *addr, int len));
+extern int clear_cache(char *addr, int len);
/*
* This gets arguments from the PROM, calls other routines to open
diff --git a/sys/arch/pmax/stand/common/callvec.c b/sys/arch/pmax/stand/common/callvec.c
index 6d02eb9d949..4ba5fc22cad 100644
--- a/sys/arch/pmax/stand/common/callvec.c
+++ b/sys/arch/pmax/stand/common/callvec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: callvec.c,v 1.16 2005/12/11 12:18:39 christos Exp $ */
+/* $NetBSD: callvec.c,v 1.17 2009/03/14 14:46:04 dsl Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,50 +37,50 @@
#include <machine/dec_prom.h>
const struct callback callvec = {
- (void *(*) __P((void *, void *, int)))0,
- (void *(*) __P((void *, int, int)))0,
- (char *(*) __P((char *, char *)))DEC_PROM_STRCAT,
- (int (*) __P((char *, char *)))DEC_PROM_STRCMP,
- (char *(*) __P((char *, char *)))DEC_PROM_STRCPY,
- (int (*) __P((char *)))DEC_PROM_STRLEN,
- (char *(*) __P((char *, char *, int)))0,
- (char *(*) __P((char *, char *, int)))0,
- (int (*) __P((char *, char *, int)))0,
- (int (*) __P((void)))DEC_PROM_GETCHAR,
- (char *(*) __P((char *)))DEC_PROM_GETS,
- (int (*) __P((char *)))DEC_PROM_PUTS,
- (int (*) __P((const char *, ...)))DEC_PROM_PRINTF,
- (int (*) __P((char *, char *, ...)))0,
- (int (*) __P((void)))0,
- (long (*) __P((char *, char **, int)))0,
- (psig_t (*) __P((int, psig_t)))0,
- (int (*) __P((int)))0,
- (long (*) __P((long *)))0,
- (int (*) __P((jmp_buf)))0,
- (void (*) __P((jmp_buf, int)))0,
- (int (*) __P(( char *)))0,
- (int (*) __P((int, void *, int)))0,
- (int (*) __P((int, void *, int)))0,
- (int (*) __P((char *, char *)))DEC_PROM_SETENV2,
- (char *(*) __P((const char *)))DEC_PROM_GETENV2,
- (int (*) __P((char *)))DEC_PROM_UNSETENV,
- (u_long (*) __P((int)))0,
- (void (*) __P((void)))0,
- (void (*) __P((int)))0,
- (void (*) __P((int)))0,
- (void (*) __P((char *, int)))DEC_PROM_CLEARCACHE,
- (int (*) __P((void)))0,
- (int (*) __P((memmap *)))0,
- (int (*) __P((int)))0,
- (int (*) __P((int)))0,
- (int (*) __P((int)))0,
+ (void *(*)(void *, void *, int))0,
+ (void *(*)(void *, int, int))0,
+ (char *(*)(char *, char *))DEC_PROM_STRCAT,
+ (int (*)(char *, char *))DEC_PROM_STRCMP,
+ (char *(*)(char *, char *))DEC_PROM_STRCPY,
+ (int (*)(char *))DEC_PROM_STRLEN,
+ (char *(*)(char *, char *, int))0,
+ (char *(*)(char *, char *, int))0,
+ (int (*)(char *, char *, int))0,
+ (int (*)(void))DEC_PROM_GETCHAR,
+ (char *(*)(char *))DEC_PROM_GETS,
+ (int (*)(char *))DEC_PROM_PUTS,
+ (int (*)(const char *, ...))DEC_PROM_PRINTF,
+ (int (*)(char *, char *, ...))0,
+ (int (*)(void))0,
+ (long (*)(char *, char **, int))0,
+ (psig_t (*)(int, psig_t))0,
+ (int (*)(int))0,
+ (long (*)(long *))0,
+ (int (*)(jmp_buf))0,
+ (void (*)(jmp_buf, int))0,
+ (int (*)( char *))0,
+ (int (*)(int, void *, int))0,
+ (int (*)(int, void *, int))0,
+ (int (*)(char *, char *))DEC_PROM_SETENV2,
+ (char *(*)(const char *))DEC_PROM_GETENV2,
+ (int (*)(char *))DEC_PROM_UNSETENV,
+ (u_long (*)(int))0,
+ (void (*)(void))0,
+ (void (*)(int))0,
+ (void (*)(int))0,
+ (void (*)(char *, int))DEC_PROM_CLEARCACHE,
+ (int (*)(void))0,
+ (int (*)(memmap *))0,
+ (int (*)(int))0,
+ (int (*)(int))0,
+ (int (*)(int))0,
(void *)0,
- (int (*) __P((void)))0,
- (void (*) __P((int *, int)))0,
- (void (*) __P((void)))0,
- (tcinfo *(*) __P((void)))0, /* XXX what are the args for this?*/
- (int (*) __P((char *)))0,
- (void (*) __P((char)))0,
+ (int (*)(void))0,
+ (void (*)(int *, int))0,
+ (void (*)(void))0,
+ (tcinfo *(*)(void))0, /* XXX what are the args for this?*/
+ (int (*)(char *))0,
+ (void (*)(char))0,
};
const struct callback *callv = &callvec;
diff --git a/sys/arch/pmax/stand/common/common.h b/sys/arch/pmax/stand/common/common.h
index a8253aa45aa..dcd4c9a5de9 100644
--- a/sys/arch/pmax/stand/common/common.h
+++ b/sys/arch/pmax/stand/common/common.h
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.8 2009/01/12 11:32:44 tsutsui Exp $ */
+/* $NetBSD: common.h,v 1.9 2009/03/14 14:46:04 dsl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,18 +34,18 @@ extern int debug; /* only used for network debugging for now */
#endif
/* startprog.S */
-void startprog __P((int, int, int, char **, int, const void *, int, int));
+void startprog(int, int, int, char **, int, const void *, int, int);
/* PROM callbacks */
-int bootinit __P((const char *));
-int bootread __P((int, void *, int));
-int bootwrite __P((int, void *, int));
-char *getenv __P((const char *));
-int prom_close __P((int));
-int prom_lseek __P((int, int, int));
-int prom_open __P((const char *, int));
-int prom_read __P((int, void *, int));
-int prom_write __P((int, void *, int));
+int bootinit(const char *);
+int bootread(int, void *, int);
+int bootwrite(int, void *, int);
+char *getenv(const char *);
+int prom_close(int);
+int prom_lseek(int, int, int);
+int prom_open(const char *, int);
+int prom_read(int, void *, int);
+int prom_write(int, void *, int);
/*
diff --git a/sys/arch/pmax/stand/common/if_prom.c b/sys/arch/pmax/stand/common/if_prom.c
index 5bf6e36c767..70a2e1e1a32 100644
--- a/sys/arch/pmax/stand/common/if_prom.c
+++ b/sys/arch/pmax/stand/common/if_prom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_prom.c,v 1.5 2009/01/12 11:32:44 tsutsui Exp $ */
+/* $NetBSD: if_prom.c,v 1.6 2009/03/14 14:46:04 dsl Exp $ */
/* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -46,7 +46,7 @@
#include <stand/common/common.h>
#ifdef NET_DEBUG
-void dump_packet_info __P((void *, int));
+void dump_packet_info(void *, int);
#endif
/*
@@ -63,16 +63,16 @@ struct arp_list {
};
extern struct arp_list arp_list[8];
extern int arp_num;
-void fill_arpcache __P((void *, int));
+void fill_arpcache(void *, int);
#endif
/* forward declarations */
-int prom_probe __P((struct netif *, void *));
-int prom_match __P((struct netif *, void *));
-void prom_init __P((struct iodesc *, void *));
-int prom_get __P((struct iodesc *, void *, size_t, saseconds_t));
-int prom_put __P((struct iodesc *, void *, size_t));
-void prom_end __P((struct netif *));
+int prom_probe(struct netif *, void *);
+int prom_match(struct netif *, void *);
+void prom_init(struct iodesc *, void *);
+int prom_get(struct iodesc *, void *, size_t, saseconds_t);
+int prom_put(struct iodesc *, void *, size_t);
+void prom_end(struct netif *);
extern struct netif_stats prom_stats[];
struct netif_dif prom_ifs[] = {
diff --git a/sys/arch/pmax/stand/common/rz.h b/sys/arch/pmax/stand/common/rz.h
index 78ea73092dc..585dcb16f9b 100644
--- a/sys/arch/pmax/stand/common/rz.h
+++ b/sys/arch/pmax/stand/common/rz.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rz.h,v 1.2 1999/11/27 03:09:51 simonb Exp $ */
+/* $NetBSD: rz.h,v 1.3 2009/03/14 14:46:04 dsl Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*/
-int rzstrategy __P((void*, int, daddr_t, size_t, void*, size_t*));
-int rzopen __P((struct open_file*, ...));
-int rzclose __P((struct open_file*));
-int rzioctl __P((struct open_file*, u_long, void*));
+int rzstrategy(void*, int, daddr_t, size_t, void*, size_t*);
+int rzopen(struct open_file*, ...);
+int rzclose(struct open_file*);
+int rzioctl(struct open_file*, u_long, void*);
diff --git a/sys/arch/pmax/stand/smallnet/setnetimage/setnetimage.c b/sys/arch/pmax/stand/smallnet/setnetimage/setnetimage.c
index a953c1a3259..94106168bff 100644
--- a/sys/arch/pmax/stand/smallnet/setnetimage/setnetimage.c
+++ b/sys/arch/pmax/stand/smallnet/setnetimage/setnetimage.c
@@ -1,4 +1,4 @@
-/* $NetBSD: setnetimage.c,v 1.6 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: setnetimage.c,v 1.7 2009/03/14 14:46:05 dsl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@ struct seglist {
#define NLADDR(x) (mappedbfile + offsets[(x)])
#define NLVAR(x) (*(u_long *)(NLADDR(x)))
-int main __P((int, char **));
+int main(int, char **);
int
main(argc, argv)
diff --git a/sys/arch/pmax/stand/smallnet/smallnet.c b/sys/arch/pmax/stand/smallnet/smallnet.c
index b150f1a55e6..e75473f4859 100644
--- a/sys/arch/pmax/stand/smallnet/smallnet.c
+++ b/sys/arch/pmax/stand/smallnet/smallnet.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smallnet.c,v 1.5 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: smallnet.c,v 1.6 2009/03/14 14:46:04 dsl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -42,9 +42,9 @@
#include "../common/bootinfo.h"
-typedef void (*entrypt) __P((int, char **, int, const void *));
+typedef void (*entrypt)(int, char **, int, const void *);
-int main __P((int, char **));
+int main(int, char **);
/*
* These variables and array will be patched to contain a kernel image
diff --git a/sys/arch/pmax/tc/ioasic.c b/sys/arch/pmax/tc/ioasic.c
index 0ff24b14197..80ac90ca0d4 100644
--- a/sys/arch/pmax/tc/ioasic.c
+++ b/sys/arch/pmax/tc/ioasic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasic.c,v 1.15 2002/10/02 04:15:10 thorpej Exp $ */
+/* $NetBSD: ioasic.c,v 1.16 2009/03/14 14:46:05 dsl Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.15 2002/10/02 04:15:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1.16 2009/03/14 14:46:05 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -95,8 +95,8 @@ static int kn03_builtin_ndevs = ARRAY_SIZEOF(kn03_ioasic_devs) - 3;
static int kn03_ioasic_ndevs = ARRAY_SIZEOF(kn03_ioasic_devs);
#endif
-static int ioasicmatch __P((struct device *, struct cfdata *, void *));
-static void ioasicattach __P((struct device *, struct device *, void *));
+static int ioasicmatch(struct device *, struct cfdata *, void *);
+static void ioasicattach(struct device *, struct device *, void *);
CFATTACH_DECL(ioasic, sizeof(struct ioasic_softc),
ioasicmatch, ioasicattach, NULL, NULL);
@@ -206,7 +206,7 @@ ioasic_intr_establish(dev, cookie, level, handler, val)
struct device *dev;
void *cookie;
int level;
- int (*handler) __P((void *));
+ int (*handler)(void *);
void *val;
{
(*platform.intr_establish)(dev, cookie, level, handler, val);
diff --git a/sys/arch/pmax/tc/mcclock_ioasic.c b/sys/arch/pmax/tc/mcclock_ioasic.c
index efc061118b8..53252b15a09 100644
--- a/sys/arch/pmax/tc/mcclock_ioasic.c
+++ b/sys/arch/pmax/tc/mcclock_ioasic.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_ioasic.c,v 1.19 2008/01/03 23:02:25 joerg Exp $ */
+/* $NetBSD: mcclock_ioasic.c,v 1.20 2009/03/14 14:46:05 dsl Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.19 2008/01/03 23:02:25 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.20 2009/03/14 14:46:05 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -41,10 +41,10 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_ioasic.c,v 1.19 2008/01/03 23:02:25 joerg Ex
#include <dev/tc/tcvar.h>
#include <dev/tc/ioasicvar.h>
-static int mcclock_ioasic_match __P((struct device *, struct cfdata *,
- void *));
-static void mcclock_ioasic_attach __P((struct device *, struct device *,
- void *));
+static int mcclock_ioasic_match(struct device *, struct cfdata *,
+ void *);
+static void mcclock_ioasic_attach(struct device *, struct device *,
+ void *);
CFATTACH_DECL(mcclock_ioasic, sizeof (struct mcclock_pad32_softc),
mcclock_ioasic_match, mcclock_ioasic_attach, NULL, NULL);
diff --git a/sys/arch/pmax/tc/tcbus.c b/sys/arch/pmax/tc/tcbus.c
index 479e5b76d9d..4aa2adee770 100644
--- a/sys/arch/pmax/tc/tcbus.c
+++ b/sys/arch/pmax/tc/tcbus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tcbus.c,v 1.21 2008/05/26 10:31:22 nisimura Exp $ */
+/* $NetBSD: tcbus.c,v 1.22 2009/03/14 14:46:05 dsl Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.21 2008/05/26 10:31:22 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.22 2009/03/14 14:46:05 dsl Exp $");
/*
* Which system models were configured?
@@ -53,19 +53,19 @@ __KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.21 2008/05/26 10:31:22 nisimura Exp $");
#include <dev/tc/tcvar.h>
#include <pmax/pmax/pmaxtype.h>
-static const struct evcnt *tc_ds_intr_evcnt __P((struct device *, void *));
-static void tc_ds_intr_establish __P((struct device *, void *,
- int, int (*)(void *), void *));
-static void tc_ds_intr_disestablish __P((struct device *, void *));
-static bus_dma_tag_t tc_ds_get_dma_tag __P((int));
+static const struct evcnt *tc_ds_intr_evcnt(struct device *, void *);
+static void tc_ds_intr_establish(struct device *, void *,
+ int, int (*)(void *), void *);
+static void tc_ds_intr_disestablish(struct device *, void *);
+static bus_dma_tag_t tc_ds_get_dma_tag(int);
extern struct tcbus_attach_args kn02_tc_desc[]; /* XXX */
extern struct tcbus_attach_args kmin_tc_desc[]; /* XXX */
extern struct tcbus_attach_args xine_tc_desc[]; /* XXX */
extern struct tcbus_attach_args kn03_tc_desc[]; /* XXX */
-static int tcbus_match __P((struct device *, struct cfdata *, void *));
-static void tcbus_attach __P((struct device *, struct device *, void *));
+static int tcbus_match(struct device *, struct cfdata *, void *);
+static void tcbus_attach(struct device *, struct device *, void *);
CFATTACH_DECL(tcbus, sizeof(struct tc_softc),
tcbus_match, tcbus_attach, NULL, NULL);
@@ -147,7 +147,7 @@ tc_ds_intr_establish(dev, cookie, level, handler, val)
struct device *dev;
void *cookie;
int level;
- int (*handler) __P((void *));
+ int (*handler)(void *);
void *val;
{
@@ -192,7 +192,7 @@ tc_ds_get_dma_tag(slot)
#include <pmax/pmax/cons.h>
#include <machine/dec_prom.h>
-int tc_checkslot __P((tc_addr_t, char *));
+int tc_checkslot(tc_addr_t, char *);
struct cnboards {
const char *cb_tcname;
diff --git a/sys/arch/powerpc/ibm4xx/pmap.c b/sys/arch/powerpc/ibm4xx/pmap.c
index 908eb40fa32..eebdd651d35 100644
--- a/sys/arch/powerpc/ibm4xx/pmap.c
+++ b/sys/arch/powerpc/ibm4xx/pmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.52 2008/12/10 11:10:19 pooka Exp $ */
+/* $NetBSD: pmap.c,v 1.53 2009/03/14 14:46:05 dsl Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.52 2008/12/10 11:10:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.53 2009/03/14 14:46:05 dsl Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -518,8 +518,8 @@ pmap_virtual_space(vaddr_t *start, vaddr_t *end)
* This is not the most efficient technique but i don't
* expect it to be called that often.
*/
-extern struct vm_page *vm_page_alloc1 __P((void));
-extern void vm_page_free1 __P((struct vm_page *));
+extern struct vm_page *vm_page_alloc1(void);
+extern void vm_page_free1(struct vm_page *);
vaddr_t kbreak = VM_MIN_KERNEL_ADDRESS;
@@ -1636,7 +1636,7 @@ ctx_free(struct pmap *pm)
/*
* Test ref/modify handling.
*/
-void pmap_testout __P((void));
+void pmap_testout(void);
void
pmap_testout()
{
diff --git a/sys/arch/powerpc/ibm4xx/trap.c b/sys/arch/powerpc/ibm4xx/trap.c
index 8f804d63ec8..6dc2b24c5bd 100644
--- a/sys/arch/powerpc/ibm4xx/trap.c
+++ b/sys/arch/powerpc/ibm4xx/trap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.49 2008/10/15 06:51:18 wrstuden Exp $ */
+/* $NetBSD: trap.c,v 1.50 2009/03/14 14:46:05 dsl Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.49 2008/10/15 06:51:18 wrstuden Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.50 2009/03/14 14:46:05 dsl Exp $");
#include "opt_altivec.h"
#include "opt_ddb.h"
@@ -111,13 +111,13 @@ __KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.49 2008/10/15 06:51:18 wrstuden Exp $");
#define NARGREG 8 /* 8 args are in registers */
#define MOREARGS(sp) ((void *)((int)(sp) + 8)) /* more args go here */
-static int fix_unaligned __P((struct lwp *l, struct trapframe *frame));
+static int fix_unaligned(struct lwp *l, struct trapframe *frame);
-void trap __P((struct trapframe *)); /* Called from locore / trap_subr */
+void trap(struct trapframe *); /* Called from locore / trap_subr */
/* Why are these not defined in a header? */
-int badaddr __P((void *, size_t));
-int badaddr_read __P((void *, size_t, int *));
-int ctx_setup __P((int, int));
+int badaddr(void *, size_t);
+int badaddr_read(void *, size_t, int *);
+int ctx_setup(int, int);
#ifdef DEBUG
#define TDB_ALL 0x1
@@ -407,10 +407,10 @@ ctx_setup(int ctx, int srr1)
/*
* Used by copyin()/copyout()
*/
-extern vaddr_t vmaprange __P((struct proc *, vaddr_t, vsize_t, int));
-extern void vunmaprange __P((vaddr_t, vsize_t));
-static int bigcopyin __P((const void *, void *, size_t ));
-static int bigcopyout __P((const void *, void *, size_t ));
+extern vaddr_t vmaprange(struct proc *, vaddr_t, vsize_t, int);
+extern void vunmaprange(vaddr_t, vsize_t);
+static int bigcopyin(const void *, void *, size_t );
+static int bigcopyout(const void *, void *, size_t );
int
copyin(const void *udaddr, void *kaddr, size_t len)
diff --git a/sys/arch/powerpc/include/db_machdep.h b/sys/arch/powerpc/include/db_machdep.h
index 8da08e6d26a..8c9a77dec52 100644
--- a/sys/arch/powerpc/include/db_machdep.h
+++ b/sys/arch/powerpc/include/db_machdep.h
@@ -1,5 +1,5 @@
/* $OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $ */
-/* $NetBSD: db_machdep.h,v 1.19 2006/05/14 21:56:32 elad Exp $ */
+/* $NetBSD: db_machdep.h,v 1.20 2009/03/14 14:46:05 dsl Exp $ */
/*
* Mach Operating System
@@ -147,8 +147,8 @@ typedef long kgdb_reg_t;
#ifdef _KERNEL
-void kdb_kintr __P((void *));
-int kdb_trap __P((int, void *));
+void kdb_kintr(void *);
+int kdb_trap(int, void *);
#ifdef PPC_IBM4XX
/*
diff --git a/sys/arch/powerpc/include/ibm4xx/cpu.h b/sys/arch/powerpc/include/ibm4xx/cpu.h
index c1e64f87604..3c7753be248 100644
--- a/sys/arch/powerpc/include/ibm4xx/cpu.h
+++ b/sys/arch/powerpc/include/ibm4xx/cpu.h
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.13 2006/08/31 21:32:27 freza Exp $ */
+/* $NetBSD: cpu.h,v 1.14 2009/03/14 14:46:05 dsl Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -68,11 +68,11 @@ extern char bootpath[];
#include <prop/proplib.h>
/* export from ibm4xx/autoconf.c */
-extern void (*md_device_register) __P((struct device *dev, void *aux));
+extern void (*md_device_register)(struct device *dev, void *aux);
/* export from ibm4xx/machdep.c */
-extern void (*md_consinit) __P((void));
-extern void (*md_cpu_startup) __P((void));
+extern void (*md_consinit)(void);
+extern void (*md_cpu_startup)(void);
/* export from ibm4xx/ibm40x_machdep.c */
extern void ibm40x_memsize_init(u_int, u_int);
diff --git a/sys/arch/powerpc/include/openpic.h b/sys/arch/powerpc/include/openpic.h
index c51dbd244cf..e9ffd91a16e 100644
--- a/sys/arch/powerpc/include/openpic.h
+++ b/sys/arch/powerpc/include/openpic.h
@@ -1,4 +1,4 @@
-/* $NetBSD: openpic.h,v 1.6 2007/10/17 19:56:41 garbled Exp $ */
+/* $NetBSD: openpic.h,v 1.7 2009/03/14 14:46:05 dsl Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -32,10 +32,10 @@
extern volatile unsigned char *openpic_base;
-static __inline u_int openpic_read __P((int));
-static __inline void openpic_write __P((int, u_int));
-static __inline int openpic_read_irq __P((int));
-static __inline void openpic_eoi __P((int));
+static __inline u_int openpic_read(int);
+static __inline void openpic_write(int, u_int);
+static __inline int openpic_read_irq(int);
+static __inline void openpic_eoi(int);
static __inline u_int
openpic_read(reg)
diff --git a/sys/arch/powerpc/include/pio.h b/sys/arch/powerpc/include/pio.h
index e66185bbfd3..fc6b21218a7 100644
--- a/sys/arch/powerpc/include/pio.h
+++ b/sys/arch/powerpc/include/pio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pio.h,v 1.5 2006/02/16 20:17:14 perry Exp $ */
+/* $NetBSD: pio.h,v 1.6 2009/03/14 14:46:05 dsl Exp $ */
/* $OpenBSD: pio.h,v 1.1 1997/10/13 10:53:47 pefo Exp $ */
/*
@@ -39,31 +39,31 @@
* I/O macros.
*/
-static __inline void __outb __P((volatile u_int8_t *a, u_int8_t v));
-static __inline void __outw __P((volatile u_int16_t *a, u_int16_t v));
-static __inline void __outl __P((volatile u_int32_t *a, u_int32_t v));
-static __inline void __outwrb __P((volatile u_int16_t *a, u_int16_t v));
-static __inline void __outlrb __P((volatile u_int32_t *a, u_int32_t v));
-static __inline u_int8_t __inb __P((volatile u_int8_t *a));
-static __inline u_int16_t __inw __P((volatile u_int16_t *a));
-static __inline u_int32_t __inl __P((volatile u_int32_t *a));
-static __inline u_int16_t __inwrb __P((volatile u_int16_t *a));
-static __inline u_int32_t __inlrb __P((volatile u_int32_t *a));
-static __inline void __outsb __P((volatile u_int8_t *, const u_int8_t *,
- size_t));
-static __inline void __outsw __P((volatile u_int16_t *, const u_int16_t *,
- size_t));
-static __inline void __outsl __P((volatile u_int32_t *, const u_int32_t *,
- size_t));
-static __inline void __outswrb __P((volatile u_int16_t *, const u_int16_t *,
- size_t));
-static __inline void __outslrb __P((volatile u_int32_t *, const u_int32_t *,
- size_t));
-static __inline void __insb __P((volatile u_int8_t *, u_int8_t *, size_t));
-static __inline void __insw __P((volatile u_int16_t *, u_int16_t *, size_t));
-static __inline void __insl __P((volatile u_int32_t *, u_int32_t *, size_t));
-static __inline void __inswrb __P((volatile u_int16_t *, u_int16_t *, size_t));
-static __inline void __inslrb __P((volatile u_int32_t *, u_int32_t *, size_t));
+static __inline void __outb(volatile u_int8_t *a, u_int8_t v);
+static __inline void __outw(volatile u_int16_t *a, u_int16_t v);
+static __inline void __outl(volatile u_int32_t *a, u_int32_t v);
+static __inline void __outwrb(volatile u_int16_t *a, u_int16_t v);
+static __inline void __outlrb(volatile u_int32_t *a, u_int32_t v);
+static __inline u_int8_t __inb(volatile u_int8_t *a);
+static __inline u_int16_t __inw(volatile u_int16_t *a);
+static __inline u_int32_t __inl(volatile u_int32_t *a);
+static __inline u_int16_t __inwrb(volatile u_int16_t *a);
+static __inline u_int32_t __inlrb(volatile u_int32_t *a);
+static __inline void __outsb(volatile u_int8_t *, const u_int8_t *,
+ size_t);
+static __inline void __outsw(volatile u_int16_t *, const u_int16_t *,
+ size_t);
+static __inline void __outsl(volatile u_int32_t *, const u_int32_t *,
+ size_t);
+static __inline void __outswrb(volatile u_int16_t *, const u_int16_t *,
+ size_t);
+static __inline void __outslrb(volatile u_int32_t *, const u_int32_t *,
+ size_t);
+static __inline void __insb(volatile u_int8_t *, u_int8_t *, size_t);
+static __inline void __insw(volatile u_int16_t *, u_int16_t *, size_t);
+static __inline void __insl(volatile u_int32_t *, u_int32_t *, size_t);
+static __inline void __inswrb(volatile u_int16_t *, u_int16_t *, size_t);
+static __inline void __inslrb(volatile u_int32_t *, u_int32_t *, size_t);
static __inline void
__outb(a,v)
diff --git a/sys/arch/powerpc/marvell/bus_dma.c b/sys/arch/powerpc/marvell/bus_dma.c
index 1b0624c2292..dd738c727d5 100644
--- a/sys/arch/powerpc/marvell/bus_dma.c
+++ b/sys/arch/powerpc/marvell/bus_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.17 2008/06/04 12:41:41 ad Exp $ */
+/* $NetBSD: bus_dma.c,v 1.18 2009/03/14 14:46:05 dsl Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.17 2008/06/04 12:41:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.18 2009/03/14 14:46:05 dsl Exp $");
#define DEBUG 1
@@ -125,8 +125,8 @@ storedcache(vaddr_t va, bus_size_t sz)
__asm volatile("sync;");
}
-int _bus_dmamap_load_buffer __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct vmspace *, int, paddr_t *, int *, int));
+int _bus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct vmspace *, int, paddr_t *, int *, int);
/*
* Common function for DMA map creation. May be called by bus-specific
diff --git a/sys/arch/powerpc/marvell/extintr.c b/sys/arch/powerpc/marvell/extintr.c
index 31d1b207c54..26ba6945b8f 100644
--- a/sys/arch/powerpc/marvell/extintr.c
+++ b/sys/arch/powerpc/marvell/extintr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: extintr.c,v 1.18 2007/12/03 15:34:13 ad Exp $ */
+/* $NetBSD: extintr.c,v 1.19 2009/03/14 14:46:05 dsl Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: extintr.c,v 1.18 2007/12/03 15:34:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: extintr.c,v 1.19 2009/03/14 14:46:05 dsl Exp $");
#include "opt_marvell.h"
#include "opt_kgdb.h"
@@ -285,7 +285,7 @@ intr_establish(
int irq,
int type,
int level,
- int (*ih_fun) __P((void *)),
+ int (*ih_fun)(void *),
void *ih_arg)
{
struct intrsource *is = &intr_sources[irq];
diff --git a/sys/arch/powerpc/marvell/marvell_intr.h b/sys/arch/powerpc/marvell/marvell_intr.h
index 095b0c9766b..42667c4adf5 100644
--- a/sys/arch/powerpc/marvell/marvell_intr.h
+++ b/sys/arch/powerpc/marvell/marvell_intr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: marvell_intr.h,v 1.15 2008/04/28 20:23:32 martin Exp $ */
+/* $NetBSD: marvell_intr.h,v 1.16 2009/03/14 14:46:05 dsl Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -231,16 +231,16 @@ extern int ext_intr_stats_enb;
extern ext_intr_stat_t ext_intr_stats[];
extern ext_intr_stat_t *ext_intr_statp;
-extern void ext_intr_stats_init __P((void));
+extern void ext_intr_stats_init(void);
extern void ext_intr_stats_cause
- __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t));
+(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
extern void ext_intr_stats_pend
- __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t));
-extern void ext_intr_stats_commit __P((imask_t *));
-extern void ext_intr_stats_commit_m __P((imask_t *));
-extern void ext_intr_stats_commit_irq __P((u_int));
-extern u_int64_t ext_intr_stats_pre __P((int));
-extern void ext_intr_stats_post __P((int, u_int64_t));
+(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+extern void ext_intr_stats_commit(imask_t *);
+extern void ext_intr_stats_commit_m(imask_t *);
+extern void ext_intr_stats_commit_irq(u_int);
+extern u_int64_t ext_intr_stats_pre(int);
+extern void ext_intr_stats_post(int, u_int64_t);
#define EXT_INTR_STATS_INIT() ext_intr_stats_init()
#define EXT_INTR_STATS_CAUSE(l, h, g, s) ext_intr_stats_cause(l, h, g, s)
@@ -293,15 +293,15 @@ extern unsigned int spl_stats_enb;
#endif /* SPL_STATS */
-void intr_dispatch __P((void));
+void intr_dispatch(void);
#ifdef SPL_INLINE
-static inline int splraise __P((int));
-static inline int spllower __P((int));
-static inline void splx __P((int));
+static inline int splraise(int);
+static inline int spllower(int);
+static inline void splx(int);
#else
-extern int splraise __P((int));
-extern int spllower __P((int));
-extern void splx __P((int));
+extern int splraise(int);
+extern int spllower(int);
+extern void splx(int);
#endif
extern volatile int tickspending;
diff --git a/sys/arch/powerpc/powerpc/ipkdb_glue.c b/sys/arch/powerpc/powerpc/ipkdb_glue.c
index ee66975dd1d..9f92e572103 100644
--- a/sys/arch/powerpc/powerpc/ipkdb_glue.c
+++ b/sys/arch/powerpc/powerpc/ipkdb_glue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ipkdb_glue.c,v 1.9 2007/01/24 13:08:14 hubertf Exp $ */
+/* $NetBSD: ipkdb_glue.c,v 1.10 2009/03/14 14:46:05 dsl Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipkdb_glue.c,v 1.9 2007/01/24 13:08:14 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipkdb_glue.c,v 1.10 2009/03/14 14:46:05 dsl Exp $");
#include <sys/param.h>
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: ipkdb_glue.c,v 1.9 2007/01/24 13:08:14 hubertf Exp $
int ipkdbregs[NREG];
-int ipkdb_trap_glue __P((struct trapframe *));
+int ipkdb_trap_glue(struct trapframe *);
#ifdef IPKDBUSERHACK
int ipkdbsr; /* TEMPRORARY (Really needs some better mechanism) XXX */
diff --git a/sys/arch/prep/stand/boot/boot.c b/sys/arch/prep/stand/boot/boot.c
index d98dbfc30f4..945717d46f7 100644
--- a/sys/arch/prep/stand/boot/boot.c
+++ b/sys/arch/prep/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.15 2006/06/10 07:49:29 tsutsui Exp $ */
+/* $NetBSD: boot.c,v 1.16 2009/03/14 14:46:05 dsl Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -159,7 +159,7 @@ exec_kernel(char *name)
u_long marks[MARK_MAX];
#ifdef DBMONITOR
int go_monitor;
- extern int db_monitor __P((void));
+ extern int db_monitor(void);
ret:
#endif /* DBMONITOR */
diff --git a/sys/arch/rs6000/stand/boot/boot.c b/sys/arch/rs6000/stand/boot/boot.c
index 0757810b653..65db30d7760 100644
--- a/sys/arch/rs6000/stand/boot/boot.c
+++ b/sys/arch/rs6000/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.2 2007/12/17 19:54:32 garbled Exp $ */
+/* $NetBSD: boot.c,v 1.3 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -235,7 +235,7 @@ exec_kernel(char *name)
u_long marks[MARK_MAX];
#ifdef DBMONITOR
int go_monitor;
- extern int db_monitor __P((void));
+ extern int db_monitor(void);
ret:
#endif /* DBMONITOR */
diff --git a/sys/arch/sandpoint/include/powerpc.h b/sys/arch/sandpoint/include/powerpc.h
index 57892061f8a..805eac70b0b 100644
--- a/sys/arch/sandpoint/include/powerpc.h
+++ b/sys/arch/sandpoint/include/powerpc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc.h,v 1.3 2005/12/11 12:18:51 christos Exp $ */
+/* $NetBSD: powerpc.h,v 1.4 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -38,14 +38,14 @@ struct mem_region {
psize_t size;
};
-void mem_regions __P((struct mem_region **, struct mem_region **));
+void mem_regions(struct mem_region **, struct mem_region **);
/*
* These two functions get used solely in boot() in machdep.c.
*
* Not sure whether boot itself should be implementation dependent instead. XXX
*/
-void ppc_exit __P((void)) __attribute__((__noreturn__));
-void ppc_boot __P((char *bootspec)) __attribute__((__noreturn__));
+void ppc_exit(void) __attribute__((__noreturn__));
+void ppc_boot(char *bootspec) __attribute__((__noreturn__));
#endif /* _MACHINE_POWERPC_H_ */
diff --git a/sys/arch/sandpoint/isa/isaclock.c b/sys/arch/sandpoint/isa/isaclock.c
index cb54bd6b5b0..9dcaf475cbc 100644
--- a/sys/arch/sandpoint/isa/isaclock.c
+++ b/sys/arch/sandpoint/isa/isaclock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isaclock.c,v 1.10 2007/10/17 19:56:57 garbled Exp $ */
+/* $NetBSD: isaclock.c,v 1.11 2009/03/14 14:46:06 dsl Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -121,7 +121,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isaclock.c,v 1.10 2007/10/17 19:56:57 garbled Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isaclock.c,v 1.11 2009/03/14 14:46:06 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -143,8 +143,8 @@ __KERNEL_RCSID(0, "$NetBSD: isaclock.c,v 1.10 2007/10/17 19:56:57 garbled Exp $"
extern void disable_intr(void); /* In locore.S */
extern void enable_intr(void); /* In locore.S */
-void sysbeepstop __P((void *));
-void sysbeep __P((int, int));
+void sysbeepstop(void *);
+void sysbeep(int, int);
static int beeping;
diff --git a/sys/arch/sbmips/stand/common/blkdev.h b/sys/arch/sbmips/stand/common/blkdev.h
index 880043e4fbe..20d32860f91 100644
--- a/sys/arch/sbmips/stand/common/blkdev.h
+++ b/sys/arch/sbmips/stand/common/blkdev.h
@@ -1,10 +1,10 @@
-/* $NetBSD: blkdev.h,v 1.1 2002/11/09 06:20:39 cgd Exp $ */
+/* $NetBSD: blkdev.h,v 1.2 2009/03/14 14:46:06 dsl Exp $ */
#if 0 /* folded into devopen */
-int blkdevopen __P((struct open_file *, ...));
+int blkdevopen(struct open_file *, ...);
#endif
-int blkdevstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
+int blkdevstrategy(void *, int, daddr_t, size_t, void *, size_t *);
#if defined(LIBSA_NO_FS_CLOSE)
-int blkdevclose __P((struct open_file *));
+int blkdevclose(struct open_file *);
#endif /* defined(LIBSA_NO_FS_CLOSE) */
diff --git a/sys/arch/sbmips/stand/common/common.h b/sys/arch/sbmips/stand/common/common.h
index 867305077f6..4fa390ba9a4 100644
--- a/sys/arch/sbmips/stand/common/common.h
+++ b/sys/arch/sbmips/stand/common/common.h
@@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.1 2002/11/09 06:20:40 cgd Exp $ */
+/* $NetBSD: common.h,v 1.2 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -30,8 +30,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-void halt __P((void));
-void putstr __P((const char *));
+void halt(void);
+void putstr(const char *);
void init_console(void);
void putchar(int);
int getchar(void);
diff --git a/sys/arch/sbmips/stand/netboot/dev_net.c b/sys/arch/sbmips/stand/netboot/dev_net.c
index be09c502e6b..c9f98c069a0 100644
--- a/sys/arch/sbmips/stand/netboot/dev_net.c
+++ b/sys/arch/sbmips/stand/netboot/dev_net.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.2 2003/03/19 17:21:42 drochner Exp $ */
+/* $NetBSD: dev_net.c,v 1.3 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -66,7 +66,7 @@
#include <lib/libsa/dev_net.h>
#ifndef SUN_BOOTPARAMS
-void bootp __P((int));
+void bootp(int);
#endif
extern int debug;
@@ -95,7 +95,7 @@ char hostname[FNAME_SIZE];
static int netdev_sock = -1;
static int netdev_opens;
-int net_getparams __P((int));
+int net_getparams(int);
/*
* Called by devopen after it sets f->f_dev to our devsw entry.
diff --git a/sys/arch/shark/include/iic.h b/sys/arch/shark/include/iic.h
index 26fda8f0c55..c6de72f39d3 100644
--- a/sys/arch/shark/include/iic.h
+++ b/sys/arch/shark/include/iic.h
@@ -1,4 +1,4 @@
-/* $NetBSD: iic.h,v 1.1 2002/02/10 01:57:17 thorpej Exp $ */
+/* $NetBSD: iic.h,v 1.2 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -58,13 +58,13 @@ struct iicbus_attach_args {
/* Prototypes for assembly functions */
-void iic_set_state __P((int data, int clock));
-void iic_set_state_and_ack __P((int data, int clock));
-void iic_delay __P((int delay));
+void iic_set_state(int data, int clock);
+void iic_set_state_and_ack(int data, int clock);
+void iic_delay(int delay);
/* Prototype for kernel interface to IIC bus */
-int iic_control __P((u_char address, u_char *buffer, int count));
+int iic_control(u_char address, u_char *buffer, int count);
#endif /* _KERNEL */
diff --git a/sys/arch/shark/include/kbd.h b/sys/arch/shark/include/kbd.h
index 808753b42e4..e90f2e01a0c 100644
--- a/sys/arch/shark/include/kbd.h
+++ b/sys/arch/shark/include/kbd.h
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.h,v 1.1 2002/02/10 01:57:25 thorpej Exp $ */
+/* $NetBSD: kbd.h,v 1.2 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -59,8 +59,8 @@ struct kbd_autorepeat {
#define KBD_LED_CAPS_LOCK 0x04
#ifdef _KERNEL
-void kbdsetstate __P((int /*state*/));
-int kbdgetstate __P((void));
+void kbdsetstate(int /*state*/);
+int kbdgetstate(void);
#endif
/* End of kbd.h */
diff --git a/sys/arch/shark/isa/isa_shark_machdep.c b/sys/arch/shark/isa/isa_shark_machdep.c
index 3653f7fc895..feca64f489b 100644
--- a/sys/arch/shark/isa/isa_shark_machdep.c
+++ b/sys/arch/shark/isa/isa_shark_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_shark_machdep.c,v 1.8 2007/03/08 20:48:39 matt Exp $ */
+/* $NetBSD: isa_shark_machdep.c,v 1.9 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright 1997
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_shark_machdep.c,v 1.8 2007/03/08 20:48:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_shark_machdep.c,v 1.9 2009/03/14 14:46:06 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -168,7 +168,7 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
int irq;
int type;
int level;
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
{
irqhandler_t *ih;
diff --git a/sys/arch/shark/isa/isadma_machdep.c b/sys/arch/shark/isa/isadma_machdep.c
index af7dfe7bf91..3f837ba3468 100644
--- a/sys/arch/shark/isa/isadma_machdep.c
+++ b/sys/arch/shark/isa/isadma_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma_machdep.c,v 1.11 2008/04/28 20:23:35 martin Exp $ */
+/* $NetBSD: isadma_machdep.c,v 1.12 2009/03/14 14:46:06 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.11 2008/04/28 20:23:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.12 2009/03/14 14:46:06 dsl Exp $");
#define ISA_DMA_STATS
@@ -63,27 +63,27 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_machdep.c,v 1.11 2008/04/28 20:23:35 martin E
extern struct arm32_dma_range *shark_isa_dma_ranges;
extern int shark_isa_dma_nranges;
-int _isa_bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *));
-void _isa_bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int _isa_bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
-int _isa_bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
-int _isa_bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
-int _isa_bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
-void _isa_bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void _isa_bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int));
-
-int _isa_bus_dmamem_alloc __P((bus_dma_tag_t, bus_size_t, bus_size_t,
- bus_size_t, bus_dma_segment_t *, int, int *, int));
-
-int _isa_dma_alloc_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t,
- bus_size_t, int));
-void _isa_dma_free_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t));
+int _isa_bus_dmamap_create(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
+void _isa_bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int _isa_bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+int _isa_bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+int _isa_bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+int _isa_bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+void _isa_bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void _isa_bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
+
+int _isa_bus_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t,
+ bus_size_t, bus_dma_segment_t *, int, int *, int);
+
+int _isa_dma_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t,
+ bus_size_t, int);
+void _isa_dma_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t);
/*
* Entry points for ISA DMA. These are mostly wrappers around
diff --git a/sys/arch/shark/ofw/lpt_ofisa_machdep.c b/sys/arch/shark/ofw/lpt_ofisa_machdep.c
index cf1f4da0701..af1bc7d68f0 100644
--- a/sys/arch/shark/ofw/lpt_ofisa_machdep.c
+++ b/sys/arch/shark/ofw/lpt_ofisa_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_ofisa_machdep.c,v 1.4 2005/12/11 12:19:04 christos Exp $ */
+/* $NetBSD: lpt_ofisa_machdep.c,v 1.5 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright 1998
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa_machdep.c,v 1.4 2005/12/11 12:19:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_ofisa_machdep.c,v 1.5 2009/03/14 14:46:06 dsl Exp $");
#include "opt_compat_old_ofw.h"
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_ofisa_machdep.c,v 1.4 2005/12/11 12:19:04 christ
#ifdef COMPAT_OLD_OFW
-extern int i87307PrinterConfig __P((bus_space_tag_t, u_int)); /* XXX */
+extern int i87307PrinterConfig(bus_space_tag_t, u_int); /* XXX */
int
lpt_ofisa_md_match(parent, cf, aux)
diff --git a/sys/arch/shark/ofw/ofisapc.c b/sys/arch/shark/ofw/ofisapc.c
index 51d503852f1..0f8f54d5c3f 100644
--- a/sys/arch/shark/ofw/ofisapc.c
+++ b/sys/arch/shark/ofw/ofisapc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisapc.c,v 1.7 2007/03/08 20:48:39 matt Exp $ */
+/* $NetBSD: ofisapc.c,v 1.8 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisapc.c,v 1.7 2007/03/08 20:48:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisapc.c,v 1.8 2009/03/14 14:46:06 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: ofisapc.c,v 1.7 2007/03/08 20:48:39 matt Exp $");
#include <shark/shark/ns87307reg.h>
-int ofisapcprobe __P((struct device *, struct cfdata *, void *));
-void ofisapcattach __P((struct device *, struct device *, void *));
+int ofisapcprobe(struct device *, struct cfdata *, void *);
+void ofisapcattach(struct device *, struct device *, void *);
CFATTACH_DECL(ofisapc, sizeof(struct device),
diff --git a/sys/arch/shark/ofw/ofisascr.c b/sys/arch/shark/ofw/ofisascr.c
index eb2a5e2f934..1470d321b77 100644
--- a/sys/arch/shark/ofw/ofisascr.c
+++ b/sys/arch/shark/ofw/ofisascr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofisascr.c,v 1.6 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: ofisascr.c,v 1.7 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.6 2005/12/11 12:19:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.7 2009/03/14 14:46:06 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -50,8 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: ofisascr.c,v 1.6 2005/12/11 12:19:05 christos Exp $"
#include <dev/isa/isavar.h>
#include <shark/shark/sequoia.h>
-int ofisascrprobe __P((struct device *, struct cfdata *, void *));
-void ofisascrattach __P((struct device *, struct device *, void *));
+int ofisascrprobe(struct device *, struct cfdata *, void *);
+void ofisascrattach(struct device *, struct device *, void *);
CFATTACH_DECL(ofisascr, sizeof(struct device),
diff --git a/sys/arch/shark/ofw/ofrom.c b/sys/arch/shark/ofw/ofrom.c
index 2a7226a3fa3..241626f701e 100644
--- a/sys/arch/shark/ofw/ofrom.c
+++ b/sys/arch/shark/ofw/ofrom.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofrom.c,v 1.17 2008/11/08 10:18:10 he Exp $ */
+/* $NetBSD: ofrom.c,v 1.18 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright 1998
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofrom.c,v 1.17 2008/11/08 10:18:10 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofrom.c,v 1.18 2009/03/14 14:46:06 dsl Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -58,8 +58,8 @@ struct ofrom_softc {
paddr_t size;
};
-int ofromprobe __P((struct device *, struct cfdata *, void *));
-void ofromattach __P((struct device *, struct device *, void *));
+int ofromprobe(struct device *, struct cfdata *, void *);
+void ofromattach(struct device *, struct device *, void *);
CFATTACH_DECL(ofrom, sizeof(struct ofrom_softc),
ofromprobe, ofromattach, NULL, NULL);
diff --git a/sys/arch/shark/ofw/ofw.c b/sys/arch/shark/ofw/ofw.c
index 022de868534..1cc89ef6a9e 100644
--- a/sys/arch/shark/ofw/ofw.c
+++ b/sys/arch/shark/ofw/ofw.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw.c,v 1.44 2008/11/11 06:46:44 dyoung Exp $ */
+/* $NetBSD: ofw.c,v 1.45 2009/03/14 14:46:06 dsl Exp $ */
/*
* Copyright 1997
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.44 2008/11/11 06:46:44 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw.c,v 1.45 2009/03/14 14:46:06 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -111,9 +111,9 @@ extern int ofw_handleticks;
/*
* Imported routines
*/
-extern void dump_spl_masks __P((void));
-extern void dumpsys __P((void));
-extern void dotickgrovelling __P((vaddr_t));
+extern void dump_spl_masks(void);
+extern void dumpsys(void);
+extern void dotickgrovelling(vaddr_t);
#define WriteWord(a, b) \
*((volatile unsigned int *)(a)) = (b)
@@ -221,25 +221,25 @@ static struct dma_range *OFdmaranges;
static ofw_handle_t ofw_client_services_handle;
-static void ofw_callbackhandler __P((void *));
-static void ofw_construct_proc0_addrspace __P((void));
-static void ofw_getphysmeminfo __P((void));
-static void ofw_getvirttranslations __P((void));
+static void ofw_callbackhandler(void *);
+static void ofw_construct_proc0_addrspace(void);
+static void ofw_getphysmeminfo(void);
+static void ofw_getvirttranslations(void);
static void *ofw_malloc(vsize_t size);
-static void ofw_claimpages __P((vaddr_t *, pv_addr_t *, vsize_t));
-static void ofw_discardmappings __P ((vaddr_t, vaddr_t, vsize_t));
-static int ofw_mem_ihandle __P((void));
-static int ofw_mmu_ihandle __P((void));
-static paddr_t ofw_claimphys __P((paddr_t, psize_t, paddr_t));
+static void ofw_claimpages(vaddr_t *, pv_addr_t *, vsize_t);
+static void ofw_discardmappings(vaddr_t, vaddr_t, vsize_t);
+static int ofw_mem_ihandle(void);
+static int ofw_mmu_ihandle(void);
+static paddr_t ofw_claimphys(paddr_t, psize_t, paddr_t);
#if 0
-static paddr_t ofw_releasephys __P((paddr_t, psize_t));
+static paddr_t ofw_releasephys(paddr_t, psize_t);
#endif
-static vaddr_t ofw_claimvirt __P((vaddr_t, vsize_t, vaddr_t));
-static void ofw_settranslation __P ((vaddr_t, paddr_t, vsize_t, int));
-static void ofw_initallocator __P((void));
-static void ofw_configisaonly __P((paddr_t *, paddr_t *));
-static void ofw_configvl __P((int, paddr_t *, paddr_t *));
-static vaddr_t ofw_valloc __P((vsize_t, vaddr_t));
+static vaddr_t ofw_claimvirt(vaddr_t, vsize_t, vaddr_t);
+static void ofw_settranslation(vaddr_t, paddr_t, vsize_t, int);
+static void ofw_initallocator(void);
+static void ofw_configisaonly(paddr_t *, paddr_t *);
+static void ofw_configvl(int, paddr_t *, paddr_t *);
+static vaddr_t ofw_valloc(vsize_t, vaddr_t);
/*
@@ -428,7 +428,7 @@ ofw_exit:
#if BOOT_FW_DHCP
-extern char *ip2dotted __P((struct in_addr));
+extern char *ip2dotted(struct in_addr);
/*
* Get DHCP data from OFW
diff --git a/sys/arch/shark/shark/autoconf.c b/sys/arch/shark/shark/autoconf.c
index 12aa56b2f4c..7a39db340c1 100644
--- a/sys/arch/shark/shark/autoconf.c
+++ b/sys/arch/shark/shark/autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.14 2008/06/11 23:31:35 rafal Exp $ */
+/* $NetBSD: autoconf.c,v 1.15 2009/03/14 14:46:07 dsl Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2008/06/11 23:31:35 rafal Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2009/03/14 14:46:07 dsl Exp $");
#include "opt_md.h"
@@ -64,9 +64,9 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.14 2008/06/11 23:31:35 rafal Exp $");
#ifdef SHARK
#include <shark/shark/sequoia.h>
-extern void ofrootfound __P((void));
-extern void ofw_device_register __P((struct device *, void *aux));
-extern void startrtclock __P((void));
+extern void ofrootfound(void);
+extern void ofw_device_register(struct device *, void *aux);
+extern void startrtclock(void);
#endif
#if defined(OFWGENCFG) || defined(SHARK)
@@ -77,12 +77,12 @@ extern void ofw_device_register(struct device *dev, void *aux);
extern dev_t dumpdev;
-void dumpconf __P((void));
-void isa_intr_init __P((void));
+void dumpconf(void);
+void isa_intr_init(void);
#ifndef MEMORY_DISK_IS_ROOT
-static void get_device __P((char *name));
-static void set_root_device __P((void));
+static void get_device(char *name);
+static void set_root_device(void);
#endif
#ifndef MEMORY_DISK_IS_ROOT
diff --git a/sys/arch/shark/shark/i8042reg.h b/sys/arch/shark/shark/i8042reg.h
index 911639f6450..2fa00217623 100644
--- a/sys/arch/shark/shark/i8042reg.h
+++ b/sys/arch/shark/shark/i8042reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i8042reg.h,v 1.4 2005/12/11 12:19:05 christos Exp $ */
+/* $NetBSD: i8042reg.h,v 1.5 2009/03/14 14:46:07 dsl Exp $ */
/*
* Copyright 1997
@@ -139,19 +139,19 @@
/*
** Forward routine declarations
*/
-extern void i8042_flush __P((bus_space_tag_t,
- bus_space_handle_t));
-extern int i8042_cmd __P((bus_space_tag_t,
+extern void i8042_flush(bus_space_tag_t,
+ bus_space_handle_t);
+extern int i8042_cmd(bus_space_tag_t,
bus_space_handle_t,
u_char,
u_char,
u_char,
- u_char));
-extern int i8042_wait_output __P((bus_space_tag_t,
- bus_space_handle_t));
-extern int i8042_wait_input __P((bus_space_tag_t,
+ u_char);
+extern int i8042_wait_output(bus_space_tag_t,
+ bus_space_handle_t);
+extern int i8042_wait_input(bus_space_tag_t,
bus_space_handle_t,
- u_char));
+ u_char);
/* Macro to map bus space for the 8042 device.
** Returns 0 on success.
diff --git a/sys/arch/shark/shark/opms.c b/sys/arch/shark/shark/opms.c
index adef9a96fa1..b658b91df6b 100644
--- a/sys/arch/shark/shark/opms.c
+++ b/sys/arch/shark/shark/opms.c
@@ -1,4 +1,4 @@
-/* $NetBSD: opms.c,v 1.21 2008/06/13 13:09:55 cegger Exp $ */
+/* $NetBSD: opms.c,v 1.22 2009/03/14 14:46:07 dsl Exp $ */
/*
* Copyright 1997
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.21 2008/06/13 13:09:55 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.22 2009/03/14 14:46:07 dsl Exp $");
#include "opms.h"
#if NOPMS > 1
@@ -182,13 +182,13 @@ struct opms_softc
/*
** Forward routine declarations
*/
-int opmsprobe __P((struct device *,
+int opmsprobe(struct device *,
struct cfdata *,
- void *));
-void opmsattach __P((struct device *,
+ void *);
+void opmsattach(struct device *,
struct device *,
- void *));
-int opmsintr __P((void *));
+ void *);
+int opmsintr(void *);
/*
** Global variables
diff --git a/sys/arch/shark/shark/scr.c b/sys/arch/shark/shark/scr.c
index 13c088cd6bd..f3e979091f0 100644
--- a/sys/arch/shark/shark/scr.c
+++ b/sys/arch/shark/shark/scr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: scr.c,v 1.23 2008/06/11 21:16:28 cegger Exp $ */
+/* $NetBSD: scr.c,v 1.24 2009/03/14 14:46:07 dsl Exp $ */
/*
* Copyright 1997
@@ -102,7 +102,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scr.c,v 1.23 2008/06/11 21:16:28 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scr.c,v 1.24 2009/03/14 14:46:07 dsl Exp $");
#include "opt_ddb.h"
@@ -482,7 +482,7 @@ struct scr_softc
int dataMax; /* max number of data bytes to send/recv */
/* extra stuff kept for t0RecvByteS, t0SendByteS machines */
- void (*t0ByteParent) __P((struct scr_softc *,int)); /* state machine that is controlling this SM */
+ void (*t0ByteParent)(struct scr_softc *,int); /* state machine that is controlling this SM */
int shiftBits; /* number of bits shifted */
BYTE shiftByte; /* intermediate value of bit being shifted */
BYTE dataByte; /* actual value of byte */
@@ -532,7 +532,7 @@ typedef struct callout_t
struct callout_t *c_next; /* next callout in queue */
struct scr_softc *c_sc; /* soft c */
int c_arg; /* function argument */
- void (*c_func) __P((struct scr_softc*,int)); /* function to call */
+ void (*c_func)(struct scr_softc*,int); /* function to call */
int c_time; /* ticks to the event */
}Callout;
@@ -578,10 +578,10 @@ static unsigned char hatStack[HATSTACKSIZE]; /* actual stack used during a FIQ
*/
/* configure routines */
-int scrprobe __P((struct device *, struct cfdata *, void *));
-void scrattach __P((struct device *, struct device *, void *));
+int scrprobe(struct device *, struct cfdata *, void *);
+void scrattach(struct device *, struct device *, void *);
-static void initStates __P((struct scr_softc * sc));
+static void initStates(struct scr_softc * sc);
@@ -593,40 +593,40 @@ static void initStates __P((struct scr_softc * sc));
*/
/* top level state machine */
-static void masterSM __P((struct scr_softc * sc,int cmd));
+static void masterSM(struct scr_softc * sc,int cmd);
/* mid level state machines, ie protocols */
-static void t0SendSM __P((struct scr_softc * sc,int cnd));
-static void t0RecvSM __P((struct scr_softc * sc,int cnd));
-static void ATRSM __P((struct scr_softc * sc,int cnd));
+static void t0SendSM(struct scr_softc * sc,int cnd);
+static void t0RecvSM(struct scr_softc * sc,int cnd);
+static void ATRSM(struct scr_softc * sc,int cnd);
/* low level state machines, ie bash hardware bits */
-static void coldResetSM __P((struct scr_softc * sc,int cnd));
+static void coldResetSM(struct scr_softc * sc,int cnd);
-static void t0SendByteSM __P((struct scr_softc * sc,int cnd));
-static void t0RecvByteSM __P((struct scr_softc * sc,int cnd));
+static void t0SendByteSM(struct scr_softc * sc,int cnd);
+static void t0RecvByteSM(struct scr_softc * sc,int cnd);
-static void cardOff __P((struct scr_softc * sc));
+static void cardOff(struct scr_softc * sc);
/*
** functions used for our own timeout routines.
** we cannot use system ones as we are running at a spl level
** that can interrupt the system timeout routines
*/
-static void scrClkInit __P((void));
-static void scrClkStart __P((struct scr_softc* sc,int countPerTick));
-static void scrClkAdj __P((int count));
-static void scrClkStop __P((void));
-static void hatClkIrq __P((int count));
+static void scrClkInit(void);
+static void scrClkStart(struct scr_softc* sc,int countPerTick);
+static void scrClkAdj(int count);
+static void scrClkStop(void);
+static void hatClkIrq(int count);
-static void scrTimeout __P((void (*func)(struct scr_softc*,int), struct scr_softc*, int arg, int count));
-static void scrUntimeout __P((void (*func)(struct scr_softc*,int), struct scr_softc*, int arg));
+static void scrTimeout(void (*func)(struct scr_softc*,int), struct scr_softc*, int arg, int count);
+static void scrUntimeout(void (*func)(struct scr_softc*,int), struct scr_softc*, int arg);
/* debug functions */
#ifdef SCR_DEBUG
- static void invalidStateCmd __P((struct scr_softc* sc,int state,int cmd, int line));
- static char * getText __P((int x));
+ static void invalidStateCmd(struct scr_softc* sc,int state,int cmd, int line);
+ static char * getText(int x);
#endif
@@ -3587,7 +3587,7 @@ static void hatClkIrq(int x)
register int needsoft =0;
register Callout *c;
register int arg;
- register void (*func) __P((struct scr_softc*,int));
+ register void (*func)(struct scr_softc*,int);
struct scr_softc * sc;
ASSERT(scrClkEnable);
@@ -3697,7 +3697,7 @@ static void myHatWedge(int nFIQs)
*/
static void scrTimeout(ftn, sc, arg, count)
- void (*ftn) __P((struct scr_softc*,int));
+ void (*ftn)(struct scr_softc*,int);
struct scr_softc* sc;
int arg;
register int count;
@@ -3785,7 +3785,7 @@ static void scrTimeout(ftn, sc, arg, count)
**--
*/
static void scrUntimeout(ftn, sc, arg)
-void (*ftn) __P((struct scr_softc*,int));
+void (*ftn)(struct scr_softc*,int);
struct scr_softc* sc;
int arg;
{
diff --git a/sys/arch/shark/shark/sequoia.h b/sys/arch/shark/shark/sequoia.h
index 7d4fed102e2..ea6a5e15b34 100644
--- a/sys/arch/shark/shark/sequoia.h
+++ b/sys/arch/shark/shark/sequoia.h
@@ -1,4 +1,4 @@
-/* $NetBSD: sequoia.h,v 1.1 2002/02/10 01:58:10 thorpej Exp $ */
+/* $NetBSD: sequoia.h,v 1.2 2009/03/14 14:46:07 dsl Exp $ */
/*
* Copyright 1997
@@ -5064,38 +5064,38 @@
#ifndef _LOCORE
void sequoiaInit(void);
-void sequoiaWrite __P((int reg,u_int16_t value));
-void sequoiaRead __P((int reg,u_int16_t * value_ptr));
+void sequoiaWrite(int reg,u_int16_t value);
+void sequoiaRead(int reg,u_int16_t * value_ptr);
/* x console functions */
-void consXTvOn __P((void));
-void consXTvOff __P((void));
+void consXTvOn(void);
+void consXTvOff(void);
/* smart card reader functions */
-int scrGetDetect __P((void));
-void scrSetPower __P((int value));
-void scrSetClock __P((int value));
-void scrSetReset __P((int value));
-void scrSetDataHighZ __P((void));
-void scrSetData __P((int value));
-int scrGetData __P((void));
+int scrGetDetect(void);
+void scrSetPower(int value);
+void scrSetClock(int value);
+void scrSetReset(int value);
+void scrSetDataHighZ(void);
+void scrSetData(int value);
+int scrGetData(void);
/* just used to debug scr - remove when done - ejg */
-void scrToggleTestPin __P((void));
+void scrToggleTestPin(void);
void sequoiaOneAccess(void);
/* biled functions */
-void ledNetActive __P((void));
-void ledNetBlock __P((void));
-void ledNetUnblock __P((void));
-void ledPanic __P((void));
+void ledNetActive(void);
+void ledNetBlock(void);
+void ledNetUnblock(void);
+void ledPanic(void);
/* function to get the hw rev */
-int hwGetRev __P((void));
+int hwGetRev(void);
/* debug led functions */
#define LED_DEBUG_STATE_0 0
@@ -5110,7 +5110,7 @@ int hwGetRev __P((void));
#define LED_DEBUG_GREEN_ON 7
-void ledSetDebug __P((int command));
+void ledSetDebug(int command);
diff --git a/sys/arch/shark/shark/shark_machdep.c b/sys/arch/shark/shark/shark_machdep.c
index 81bff08318e..c6fb8ba4c48 100644
--- a/sys/arch/shark/shark/shark_machdep.c
+++ b/sys/arch/shark/shark/shark_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: shark_machdep.c,v 1.35 2009/02/13 22:41:03 apb Exp $ */
+/* $NetBSD: shark_machdep.c,v 1.36 2009/03/14 14:46:07 dsl Exp $ */
/*
* Copyright 1997
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.35 2009/02/13 22:41:03 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.36 2009/03/14 14:46:07 dsl Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -109,12 +109,12 @@ extern u_int undefined_handler_address;
/*
* Imported routines
*/
-extern void data_abort_handler __P((trapframe_t *frame));
-extern void prefetch_abort_handler __P((trapframe_t *frame));
-extern void undefinedinstruction_bounce __P((trapframe_t *frame));
-extern void consinit __P((void));
-int ofbus_match __P((struct device *, struct cfdata *, void *));
-void ofbus_attach __P((struct device *, struct device *, void *));
+extern void data_abort_handler(trapframe_t *frame);
+extern void prefetch_abort_handler(trapframe_t *frame);
+extern void undefinedinstruction_bounce(trapframe_t *frame);
+extern void consinit(void);
+int ofbus_match(struct device *, struct cfdata *, void *);
+void ofbus_attach(struct device *, struct device *, void *);
paddr_t isa_io_physaddr, isa_mem_physaddr;
@@ -150,11 +150,11 @@ CFATTACH_DECL(ofbus_root, sizeof(struct device),
* Exported routines
*/
/* Move to header file? */
-extern void cpu_reboot __P((int, char *));
-extern void ofrootfound __P((void));
+extern void cpu_reboot(int, char *);
+extern void ofrootfound(void);
/* Local routines */
-static void process_kernel_args __P((void));
+static void process_kernel_args(void);
void ofw_device_register(struct device *, void *);
/* Kernel text starts at the base of the kernel address space. */
diff --git a/sys/arch/vax/boot/boot/consio.c b/sys/arch/vax/boot/boot/consio.c
index 630191a6e0c..9d45e3c3283 100644
--- a/sys/arch/vax/boot/boot/consio.c
+++ b/sys/arch/vax/boot/boot/consio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: consio.c,v 1.14 2006/07/01 05:55:34 mrg Exp $ */
+/* $NetBSD: consio.c,v 1.15 2009/03/14 14:46:07 dsl Exp $ */
/*
* Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -44,19 +44,19 @@
#include "data.h"
-void setup __P((void));
+void setup(void);
-static void (*put_fp) __P((int)) = NULL;
-static int (*get_fp) __P((void)) = NULL;
-static int (*test_fp) __P((void)) = NULL;
+static void (*put_fp)(int) = NULL;
+static int (*get_fp)(void) = NULL;
+static int (*test_fp)(void) = NULL;
-void pr_putchar __P((int c)); /* putchar() using mtpr/mfpr */
-int pr_getchar __P((void));
-int pr_testchar __P((void));
+void pr_putchar(int c); /* putchar() using mtpr/mfpr */
+int pr_getchar(void);
+int pr_testchar(void);
-void rom_putchar __P((int c)); /* putchar() using ROM routines */
-int rom_getchar __P((void));
-int rom_testchar __P((void));
+void rom_putchar(int c); /* putchar() using ROM routines */
+int rom_getchar(void);
+int rom_testchar(void);
int rom_putc; /* ROM-address of put-routine */
int rom_getc; /* ROM-address of get-routine */
@@ -65,12 +65,12 @@ int rom_getc; /* ROM-address of get-routine */
unsigned char *ka630_conspage;
/* Function that initializes things for KA630 ROM console I/O */
-void ka630_consinit __P((void));
+void ka630_consinit(void);
/* Functions that use KA630 ROM for console I/O */
-void ka630_rom_putchar __P((int c));
-int ka630_rom_getchar __P((void));
-int ka630_rom_testchar __P((void));
+void ka630_rom_putchar(int c);
+int ka630_rom_getchar(void);
+int ka630_rom_testchar(void);
/* Also added such a thing for KA53 - MK-991208 */
unsigned char *ka53_conspage;
diff --git a/sys/arch/vax/boot/boot/ctu.c b/sys/arch/vax/boot/boot/ctu.c
index 060020ffa98..5c5d88af19f 100644
--- a/sys/arch/vax/boot/boot/ctu.c
+++ b/sys/arch/vax/boot/boot/ctu.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ctu.c,v 1.3 2000/05/20 13:30:03 ragge Exp $ */
+/* $NetBSD: ctu.c,v 1.4 2009/03/14 14:46:07 dsl Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -62,8 +62,8 @@ volatile struct tu_softc {
int sc_bbytes; /* Number of xfer'd bytes this block */
} tu_sc;
-void ctutintr __P((void));
-void cturintr __P((void));
+void ctutintr(void);
+void cturintr(void);
int
ctuopen(f, adapt, ctlr, unit, part)
diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c
index b864d5bf305..03569bc6aba 100644
--- a/sys/arch/vax/vax/vm_machdep.c
+++ b/sys/arch/vax/vax/vm_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.105 2008/11/24 13:45:37 cegger Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.106 2009/03/14 14:46:07 dsl Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.105 2008/11/24 13:45:37 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.106 2009/03/14 14:46:07 dsl Exp $");
#include "opt_compat_ultrix.h"
#include "opt_multiprocessor.h"
@@ -175,7 +175,7 @@ cpu_lwp_fork(struct lwp *l1, struct lwp *l2, void *stack, size_t stacksize,
#if KERN_SA > 0
void
-cpu_setfunc(struct lwp *l, void (*func) __P((void *)), void *arg)
+cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
{
struct pcb *pcb = &l->l_addr->u_pcb;
struct trapframe *tf = (struct trapframe *)((u_int)l->l_addr + USPACE) - 1;
diff --git a/sys/arch/x68k/stand/aout2hux/aout2hux.c b/sys/arch/x68k/stand/aout2hux/aout2hux.c
index 899303f9e90..dcbd578d824 100644
--- a/sys/arch/x68k/stand/aout2hux/aout2hux.c
+++ b/sys/arch/x68k/stand/aout2hux/aout2hux.c
@@ -21,7 +21,7 @@
* % cc -N -static -Wl,-Ttext,10203040 -o aout2 *.o
* % aout2hux -o foo.x aout1 0 aout2 10203040
*
- * $NetBSD: aout2hux.c,v 1.5 1999/11/19 03:54:08 itohy Exp $
+ * $NetBSD: aout2hux.c,v 1.6 2009/03/14 14:46:07 dsl Exp $
*/
#include <sys/types.h>
@@ -67,8 +67,8 @@ void put_uint16 PROTO((be_uint16_t *be, unsigned v));
void put_uint32 PROTO((be_uint32_t *be, u_int32_t v));
void *do_realloc PROTO((void *p, size_t s));
-static int open_aout __P((const char *fn, struct aout_m68k *hdr,
- struct exec_info *inf));
+static int open_aout(const char *fn, struct aout_m68k *hdr,
+ struct exec_info *inf);
static int open_elf PROTO((const char *fn, FILE *fp, struct elf_m68k_hdr *hdr,
struct exec_info *inf));
FILE *open_exec PROTO((const char *fn, struct exec_info *inf));
diff --git a/sys/arch/x68k/stand/boot_ufs/boot_ufs.h b/sys/arch/x68k/stand/boot_ufs/boot_ufs.h
index a4bf0fb14c5..a5c9cb675bd 100644
--- a/sys/arch/x68k/stand/boot_ufs/boot_ufs.h
+++ b/sys/arch/x68k/stand/boot_ufs/boot_ufs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: boot_ufs.h,v 1.4 2007/12/24 15:46:45 perry Exp $ */
+/* $NetBSD: boot_ufs.h,v 1.5 2009/03/14 14:46:07 dsl Exp $ */
/***************************************************************
*
@@ -9,15 +9,15 @@
*/
/* xxboot.S */
-__dead void BOOT_ERROR __P((const char *msg));
-int badbaddr __P((volatile void *adr));
+__dead void BOOT_ERROR(const char *msg);
+int badbaddr(volatile void *adr);
#ifdef SCSI_ADHOC_BOOTPART
-void RAW_READ0 __P((void *buf, u_int32_t blkpos, size_t bytelen));
+void RAW_READ0(void *buf, u_int32_t blkpos, size_t bytelen);
#endif
-unsigned B_KEYINP __P((void));
-void B_PUTC __P((unsigned int c));
-void B_PRINT __P((const char *p));
-unsigned B_COLOR __P((unsigned int w));
+unsigned B_KEYINP(void);
+void B_PUTC(unsigned int c);
+void B_PRINT(const char *p);
+unsigned B_COLOR(unsigned int w);
extern unsigned ID; /* target SCSI ID */
extern unsigned BOOT_INFO; /* result of IOCS(__BOOTINF) */
diff --git a/sys/arch/x68k/stand/boot_ufs/readufs.c b/sys/arch/x68k/stand/boot_ufs/readufs.c
index 86234366e84..4855d31aad4 100644
--- a/sys/arch/x68k/stand/boot_ufs/readufs.c
+++ b/sys/arch/x68k/stand/boot_ufs/readufs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs.c,v 1.9 2009/01/12 07:56:31 tsutsui Exp $ */
+/* $NetBSD: readufs.c,v 1.10 2009/03/14 14:46:07 dsl Exp $ */
/* from Id: readufs.c,v 1.8 2003/04/08 09:19:32 itohy Exp */
/*
@@ -15,13 +15,13 @@
#define fs ufs_info
-static void raw_read_queue __P((void *buf, daddr_t blkpos, size_t bytelen));
-static int ufs_read_indirect __P((daddr_t blk, int level, uint8_t **buf,
- unsigned *poff, size_t count));
+static void raw_read_queue(void *buf, daddr_t blkpos, size_t bytelen);
+static int ufs_read_indirect(daddr_t blk, int level, uint8_t **buf,
+ unsigned *poff, size_t count);
#ifdef DEBUG_WITH_STDIO
-void ufs_list_dir __P((ino32_t dirino));
-int main __P((int argc, char *argv[]));
+void ufs_list_dir(ino32_t dirino);
+int main(int argc, char *argv[]);
#endif
#ifdef DEBUG_WITH_STDIO
diff --git a/sys/arch/x68k/stand/boot_ufs/readufs.h b/sys/arch/x68k/stand/boot_ufs/readufs.h
index 364fe5aa151..262733006a2 100644
--- a/sys/arch/x68k/stand/boot_ufs/readufs.h
+++ b/sys/arch/x68k/stand/boot_ufs/readufs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs.h,v 1.8 2005/12/11 12:19:44 christos Exp $ */
+/* $NetBSD: readufs.h,v 1.9 2009/03/14 14:46:07 dsl Exp $ */
/* from Id: readufs.h,v 1.9 2003/10/15 14:16:58 itohy Exp */
/*
@@ -71,7 +71,7 @@ struct ufs_info {
UFSTYPE_UFS1, UFSTYPE_UFS2
} ufstype;
#endif
- int (*get_inode) __P((ino32_t ino, union ufs_dinode *dibuf));
+ int (*get_inode)(ino32_t ino, union ufs_dinode *dibuf);
/* superblock information */
u_int32_t bsize; /* fs block size */
@@ -108,21 +108,21 @@ struct ufs_info {
extern struct ufs_info ufs_info;
#define ufs_get_inode(ino, di) ((*ufs_info.get_inode)((ino), (di)))
-void RAW_READ __P((void *buf, daddr_t blkpos, size_t bytelen));
+void RAW_READ(void *buf, daddr_t blkpos, size_t bytelen);
-size_t ufs_read __P((union ufs_dinode *di, void *buf, unsigned off,
- size_t count));
-ino32_t ufs_lookup __P((ino32_t dirino, const char *fn));
-ino32_t ufs_lookup_path __P((const char *path));
-size_t ufs_load_file __P((void *buf, ino32_t dirino, const char *fn));
-int ufs_init __P((void));
+size_t ufs_read(union ufs_dinode *di, void *buf, unsigned off,
+ size_t count);
+ino32_t ufs_lookup(ino32_t dirino, const char *fn);
+ino32_t ufs_lookup_path(const char *path);
+size_t ufs_load_file(void *buf, ino32_t dirino, const char *fn);
+int ufs_init(void);
#ifdef USE_FFS
-int try_ffs __P((void));
+int try_ffs(void);
#endif
#ifdef USE_LFS
-int try_lfs __P((void));
+int try_lfs(void);
#endif
#ifdef DEBUG_WITH_STDIO
diff --git a/sys/arch/x68k/stand/boot_ufs/readufs_ffs.c b/sys/arch/x68k/stand/boot_ufs/readufs_ffs.c
index f2676c6d1bb..e1b656c12b2 100644
--- a/sys/arch/x68k/stand/boot_ufs/readufs_ffs.c
+++ b/sys/arch/x68k/stand/boot_ufs/readufs_ffs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_ffs.c,v 1.9 2005/12/11 12:19:44 christos Exp $ */
+/* $NetBSD: readufs_ffs.c,v 1.10 2009/03/14 14:46:07 dsl Exp $ */
/* from Id: readufs_ffs.c,v 1.6 2003/04/08 09:19:32 itohy Exp */
/*
@@ -15,7 +15,7 @@
#include <ufs/ffs/fs.h>
-static int get_ffs_inode __P((ino32_t ino, union ufs_dinode *dibuf));
+static int get_ffs_inode(ino32_t ino, union ufs_dinode *dibuf);
#define fsi (*ufsinfo)
#define fsi_ffs fsi.fs_u.u_ffs
diff --git a/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c b/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
index 320fc3d596d..a90a2dfd21b 100644
--- a/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
+++ b/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_lfs.c,v 1.8 2005/12/11 12:19:44 christos Exp $ */
+/* $NetBSD: readufs_lfs.c,v 1.9 2009/03/14 14:46:07 dsl Exp $ */
/* from Id: readufs_lfs.c,v 1.7 2003/10/15 14:16:58 itohy Exp */
/*
@@ -20,7 +20,7 @@
#error LFS currently requires USE_UFS1
#endif
-static int get_lfs_inode __P((ino32_t ino, union ufs_dinode *dibuf));
+static int get_lfs_inode(ino32_t ino, union ufs_dinode *dibuf);
static struct ufs1_dinode ifile_dinode;
diff --git a/sys/arch/x68k/stand/common/exec_sub.c b/sys/arch/x68k/stand/common/exec_sub.c
index dcefce9ce6a..a0cda185a83 100644
--- a/sys/arch/x68k/stand/common/exec_sub.c
+++ b/sys/arch/x68k/stand/common/exec_sub.c
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_sub.c,v 1.3 2005/12/24 20:07:41 perry Exp $ */
+/* $NetBSD: exec_sub.c,v 1.4 2009/03/14 14:46:07 dsl Exp $ */
#include <sys/cdefs.h>
@@ -7,16 +7,16 @@
#include <sys/param.h>
#ifdef BOOT
-void B_PRINT __P((const unsigned char *p));
+void B_PRINT(const unsigned char *p);
#endif
-static inline void bzero4 __P((void *ptr, size_t siz));
-static void xk_aout __P((struct execkern_arg *xarg, struct exec *hdr));
-static void xk_elf __P((struct execkern_arg *xarg, Elf32_Ehdr *hdr));
+static inline void bzero4(void *ptr, size_t siz);
+static void xk_aout(struct execkern_arg *xarg, struct exec *hdr);
+static void xk_elf(struct execkern_arg *xarg, Elf32_Ehdr *hdr);
#ifdef LOADBSD
-static void DPRINT_SEC __P((const char *ident,
- const struct execkern_section *sec));
+static void DPRINT_SEC(const char *ident,
+ const struct execkern_section *sec);
extern int opt_v;
extern const char *kernel_fn;
diff --git a/sys/arch/x68k/stand/common/execkern.h b/sys/arch/x68k/stand/common/execkern.h
index 30d38630c06..59259ada634 100644
--- a/sys/arch/x68k/stand/common/execkern.h
+++ b/sys/arch/x68k/stand/common/execkern.h
@@ -4,7 +4,7 @@
* written by Yasha (ITOH Yasufumi)
* public domain
*
- * $NetBSD: execkern.h,v 1.3 2007/12/24 15:46:45 perry Exp $
+ * $NetBSD: execkern.h,v 1.4 2009/03/14 14:46:07 dsl Exp $
*/
#ifndef X68K_BOOT_EXECKERN_H
@@ -51,8 +51,8 @@ struct execkern_arg {
char shstrtab_fake[SIZE_SHSTRTAB_FAKE_WITH_STAB];
};
-int xk_load __P((struct execkern_arg *, void *, u_long));
-void __dead exec_kernel __P((struct execkern_arg *));
+int xk_load(struct execkern_arg *, void *, u_long);
+void __dead exec_kernel(struct execkern_arg *);
#endif /* __ASSEMBLER__ */
diff --git a/sys/arch/x68k/stand/common/xprintf.c b/sys/arch/x68k/stand/common/xprintf.c
index 3fc1f2f0976..5420ccad2cd 100644
--- a/sys/arch/x68k/stand/common/xprintf.c
+++ b/sys/arch/x68k/stand/common/xprintf.c
@@ -4,7 +4,7 @@
* written by Yasha (ITOH Yasufumi)
* public domain
*
- * $NetBSD: xprintf.c,v 1.1 1998/09/01 19:51:57 itohy Exp $
+ * $NetBSD: xprintf.c,v 1.2 2009/03/14 14:46:07 dsl Exp $
*/
#include <sys/types.h>
@@ -52,7 +52,7 @@
extern const char *const __progname;
-static char * numstr __P((char *buf, long val, int base, int sign));
+static char * numstr(char *buf, long val, int base, int sign);
/*
* convert number to string
diff --git a/sys/arch/x68k/stand/common/xprintf.h b/sys/arch/x68k/stand/common/xprintf.h
index 792140a2d20..f1e3978e11a 100644
--- a/sys/arch/x68k/stand/common/xprintf.h
+++ b/sys/arch/x68k/stand/common/xprintf.h
@@ -4,7 +4,7 @@
* written by Yasha (ITOH Yasufumi)
* public domain
*
- * $NetBSD: xprintf.h,v 1.1 1998/09/01 19:51:57 itohy Exp $
+ * $NetBSD: xprintf.h,v 1.2 2009/03/14 14:46:07 dsl Exp $
*/
#include <sys/cdefs.h>
@@ -12,14 +12,14 @@
#include <stdarg.h>
#endif
-size_t xvsnprintf __P((char *buf, size_t len, const char *fmt, va_list ap));
-size_t xsnprintf __P((char *buf, size_t len, const char *fmt, ...));
-size_t xvfdprintf __P((int fd, const char *fmt, va_list ap));
-size_t xprintf __P((const char *fmt, ...));
-size_t xerrprintf __P((const char *fmt, ...));
-__dead void xerr __P((int eval, const char *fmt, ...))
+size_t xvsnprintf(char *buf, size_t len, const char *fmt, va_list ap);
+size_t xsnprintf(char *buf, size_t len, const char *fmt, ...);
+size_t xvfdprintf(int fd, const char *fmt, va_list ap);
+size_t xprintf(const char *fmt, ...);
+size_t xerrprintf(const char *fmt, ...);
+__dead void xerr(int eval, const char *fmt, ...)
__attribute__((noreturn));
-__dead void xerrx __P((int eval, const char *fmt, ...))
+__dead void xerrx(int eval, const char *fmt, ...)
__attribute__((noreturn));
-void xwarn __P((const char *fmt, ...));
-void xwarnx __P((const char *fmt, ...));
+void xwarn(const char *fmt, ...);
+void xwarnx(const char *fmt, ...);
diff --git a/sys/arch/x68k/stand/libdos/dos.h b/sys/arch/x68k/stand/libdos/dos.h
index fd19ee2c082..228aec70c4e 100644
--- a/sys/arch/x68k/stand/libdos/dos.h
+++ b/sys/arch/x68k/stand/libdos/dos.h
@@ -6,7 +6,7 @@
* (based on PD libc 1.1.32 by PROJECT C Library)
* public domain
*
- * $NetBSD: dos.h,v 1.5 2007/12/24 15:46:46 perry Exp $
+ * $NetBSD: dos.h,v 1.6 2009/03/14 14:46:07 dsl Exp $
*/
/*
* PROJECT C Library, X68000 PROGRAMMING INTERFACE DEFINITION
@@ -272,194 +272,194 @@ struct dos_prcptr {
* super_jsr special for DOS_SUPER_JSR
*/
-/* ff00 ; noret */ __dead void DOS_EXIT __P((void));
-/* ff01 */ int DOS_GETCHAR __P((void));
-/* ff02 w */ void DOS_PUTCHAR __P((int));
-/* ff03 */ int DOS_COMINP __P((void));
-/* ff04 w */ void DOS_COMOUT __P((int));
-/* ff05 w */ void DOS_PRNOUT __P((int));
-/* ff06 w */ int DOS_INPOUT __P((int));
-/* ff07 */ int DOS_INKEY __P((void));
-/* ff08 */ int DOS_GETC __P((void));
-/* ff09 l */ void DOS_PRINT __P((const char *));
-/* ff0a l */ int DOS_GETS __P((struct dos_inpptr *));
-/* ff0b */ int DOS_KEYSNS __P((void));
-/* ff0c 1.w */ int DOS_KFLUSHGP __P((void));
-/* ff0c 6.w w */ int DOS_KFLUSHIO __P((int));
-/* ff0c 7.w */ int DOS_KFLUSHIN __P((void));
-/* ff0c 8.w */ int DOS_KFLUSHGC __P((void));
-/* ff0c 10.w l */ int DOS_KFLUSHGS __P((struct dos_inpptr *));
-/* ff0d */ void DOS_FFLUSH __P((void));
-/* ff0e w */ int DOS_CHGDRV __P((int));
-/* ff0f drvctrl */ int DOS_DRVCTRL __P((int, int));
-/* ff10 */ int DOS_CONSNS __P((void));
-/* ff11 */ int DOS_PRNSNS __P((void));
-/* ff12 */ int DOS_CINSNS __P((void));
-/* ff13 */ int DOS_COUTSNS __P((void));
-/* ff17 l l ; e */ int DOS_FATCHK __P((const char *, unsigned short *));
-/* ff17 l lb31 w ; e */ int DOS_FATCHK2 __P((const char *, unsigned short *, int));
-/* ff18 0.w */ int DOS_HENDSPMO __P((void));
-/* ff18 1.w w l */ int DOS_HENDSPMP __P((int, const char *));
-/* ff18 2.w w l */ int DOS_HENDSPMR __P((int, const char *));
-/* ff18 3.w */ void DOS_HENDSPMC __P((void));
-/* ff18 4.w */ int DOS_HENDSPIO __P((void));
-/* ff18 5.w w l */ int DOS_HENDSPIP __P((int, const char *));
-/* ff18 6.w w l */ int DOS_HENDSPIR __P((int, const char *));
-/* ff18 7.w w */ void DOS_HENDSPIC __P((int));
-/* ff18 8.w */ int DOS_HENDSPSO __P((void));
-/* ff18 9.w w l */ int DOS_HENDSPSP __P((int, const char *));
-/* ff18 10.w w l */ int DOS_HENDSPSR __P((int, const char *));
-/* ff18 11.w */ void DOS_HENDSPSC __P((void));
-/* ff19 */ int DOS_CURDRV __P((void));
-/* ff1a l */ int DOS_GETSS __P((struct dos_inpptr *));
-/* ff1b w */ int DOS_FGETC __P((int));
-/* ff1c l w */ int DOS_FGETS __P((struct dos_inpptr *, int));
-/* ff1d w w */ void DOS_FPUTC __P((int, int));
-/* ff1e l w */ void DOS_FPUTS __P((const char *, int));
-/* ff1f */ void DOS_ALLCLOSE __P((void));
-/* ff20 super ; super e */ int DOS_SUPER __P((int));
-/* ff21 w l ; e */ void DOS_FNCKEYGT __P((int, char *));
-/* ff21 wb8 l ; e */ void DOS_FNCKEYST __P((int, const char *));
-/* ff23 0.w w */ int DOS_C_PUTC __P((int));
-/* ff23 1.w l */ int DOS_C_PRINT __P((const char *));
-/* ff23 2.w w */ int DOS_C_COLOR __P((int));
-/* ff23 3.w w w */ int DOS_C_LOCATE __P((int, int));
-/* ff23 4.w */ int DOS_C_DOWN_S __P((void));
-/* ff23 5.w */ int DOS_C_UP_S __P((void));
-/* ff23 6.w w */ int DOS_C_UP __P((int));
-/* ff23 7.w w */ int DOS_C_DOWN __P((int));
-/* ff23 8.w w */ int DOS_C_RIGHT __P((int));
-/* ff23 9.w w */ int DOS_C_LEFT __P((int));
-/* ff23 10.w 0.w */ int DOS_C_CLS_ED __P((void));
-/* ff23 10.w 1.w */ int DOS_C_CLS_ST __P((void));
-/* ff23 10.w 2.w */ int DOS_C_CLS_AL __P((void));
-/* ff23 11.w 0.w */ int DOS_C_ERA_ED __P((void));
-/* ff23 11.w 1.w */ int DOS_C_ERA_ST __P((void));
-/* ff23 11.w 2.w */ int DOS_C_ERA_AL __P((void));
-/* ff23 12.w w */ int DOS_C_INS __P((int));
-/* ff23 13.w w */ int DOS_C_DEL __P((int));
-/* ff23 14.w w */ int DOS_C_FNKMOD __P((int));
-/* ff23 15.w w w */ int DOS_C_WINDOW __P((int, int));
-/* ff23 16.w w */ int DOS_C_WIDTH __P((int));
-/* ff23 17.w */ int DOS_C_CURON __P((void));
-/* ff23 18.w */ int DOS_C_CUROFF __P((void));
-/* ff24 0.w */ int DOS_K_KEYINP __P((void));
-/* ff24 1.w */ int DOS_K_KEYSNS __P((void));
-/* ff24 2.w */ int DOS_K_SFTSNS __P((void));
-/* ff24 3.w w */ int DOS_K_KEYBIT __P((int));
-/* ff24 4.w w */ void DOS_K_INSMOD __P((int));
-/* ff25 w l */ void *DOS_INTVCS __P((int, void *));
-/* ff26 l */ void DOS_PSPSET __P((struct dos_psp *));
-/* ff27 */ int DOS_GETTIM2 __P((void));
-/* ff28 l ; e */ int DOS_SETTIM2 __P((int));
-/* ff29 l l ; e */ int DOS_NAMESTS __P((const char *, struct dos_namestbuf *));
-/* ff2a */ int DOS_GETDATE __P((void));
-/* ff2b w ; e */ int DOS_SETDATE __P((int));
-/* ff2c */ int DOS_GETTIME __P((void));
-/* ff2d w ; e */ int DOS_SETTIME __P((int));
-/* ff2e w */ void DOS_VERIFY __P((int));
-/* ff2f w w ; e */ int DOS_DUP0 __P((int, int));
-/* ff30 */ int __pure DOS_VERNUM __P((void));
-/* ff31 l w ; noret */ __dead void DOS_KEEPPR __P((int, int));
-/* ff32 w l ; e */ int DOS_GETDPB __P((int, struct dos_dpbptr *));
-/* ff33 w */ int DOS_BREAKCK __P((int));
-/* ff34 w w ; e */ void DOS_DRVXCHG __P((int, int));
-/* ff35 w */ void *DOS_INTVCG __P((int));
-/* ff36 w l ; estrct */ int DOS_DSKFRE __P((int, struct dos_freeinf *));
-/* ff37 l l ; e */ int DOS_NAMECK __P((const char *, struct dos_nameckbuf *));
-/* ff39 l ; e */ int DOS_MKDIR __P((const char *));
-/* ff3a l ; e */ int DOS_RMDIR __P((const char *));
-/* ff3b l ; e */ int DOS_CHDIR __P((const char *));
-/* ff3c l w ; e */ int DOS_CREATE __P((const char *, dos_mode_t));
-/* ff3d l w ; e */ int DOS_OPEN __P((const char *, int));
-/* ff3e w ; e */ int DOS_CLOSE __P((int));
-/* ff3f w l l ; e */ int DOS_READ __P((int, char *, int));
-/* ff40 w l l ; e */ int DOS_WRITE __P((int, const char *, int));
-/* ff41 l ; e */ int DOS_DELETE __P((const char *));
-/* ff42 w l w ; e */ long DOS_SEEK __P((int, int, int));
-/* ff43 l w ; e */ dos_mode_t DOS_CHMOD __P((const char *, dos_mode_t));
-/* ff44 0.w w ; e */ int DOS_IOCTRLGT __P((int));
-/* ff44 1.w w w ; e */ int DOS_IOCTRLST __P((int, int));
-/* ff44 2.w w l l ; e */ int DOS_IOCTRLRH __P((int, char *, int));
-/* ff44 3.w w l l ; e */ int DOS_IOCTRLWH __P((int, const char *, int));
-/* ff44 4.w w l l ; e */ int DOS_IOCTRLRD __P((int, char *, int));
-/* ff44 5.w w l l ; e */ int DOS_IOCTRLWD __P((int, const char *, int));
-/* ff44 6.w w ; e */ int DOS_IOCTRLIS __P((int));
-/* ff44 7.w w ; e */ int DOS_IOCTRLOS __P((int));
-/* ff44 9.w w ; e */ int DOS_IOCTRLDVGT __P((int));
-/* ff44 10.w w ; e */ int DOS_IOCTRLFDGT __P((int));
-/* ff44 11.w w w ; e */ int DOS_IOCTRLRTSET __P((int, int));
-/* ff44 12.w w w l ; e */ int DOS_IOCTRLDVCTL __P((int, int, char *));
-/* ff44 13.w w w l ; e */ int DOS_IOCTRLFDCTL __P((int, int, char *));
-/* ff45 w ; e */ int DOS_DUP __P((int));
-/* ff46 w w ; e */ int DOS_DUP2 __P((int, int));
-/* ff47 w l ; e */ int DOS_CURDIR __P((int, char *));
-/* ff48 l ; ealloc */ void *DOS_MALLOC __P((int));
-/* ff49 l ; e */ int DOS_MFREE __P((void *));
-/* ff4a l l ; ealloc */ int DOS_SETBLOCK __P((void *, int));
-/* ff4b 0.w l l l ; sv e */ int DOS_LOADEXEC __P((const char *, const struct dos_comline *, const char *));
-/* ff4b 1.w l l l ; sv e */ int DOS_LOAD __P((const char *, const struct dos_comline *, const char *));
-/* ff4b 2.w l l l ; e */ int DOS_PATHCHK __P((const char *, const struct dos_comline *, const char *));
-/* ff4b 3.w l l l ; e */ int DOS_LOADONLY __P((const char *, const void *, const void *));
-/* ff4b 4.w l ; sv e */ int DOS_EXECONLY __P((void *));
-/* ff4b 5.w l l 0.l ; sv e */ int DOS_BINDNO __P((const char *, const char *));
+/* ff00 ; noret */ __dead void DOS_EXIT(void);
+/* ff01 */ int DOS_GETCHAR(void);
+/* ff02 w */ void DOS_PUTCHAR(int);
+/* ff03 */ int DOS_COMINP(void);
+/* ff04 w */ void DOS_COMOUT(int);
+/* ff05 w */ void DOS_PRNOUT(int);
+/* ff06 w */ int DOS_INPOUT(int);
+/* ff07 */ int DOS_INKEY(void);
+/* ff08 */ int DOS_GETC(void);
+/* ff09 l */ void DOS_PRINT(const char *);
+/* ff0a l */ int DOS_GETS(struct dos_inpptr *);
+/* ff0b */ int DOS_KEYSNS(void);
+/* ff0c 1.w */ int DOS_KFLUSHGP(void);
+/* ff0c 6.w w */ int DOS_KFLUSHIO(int);
+/* ff0c 7.w */ int DOS_KFLUSHIN(void);
+/* ff0c 8.w */ int DOS_KFLUSHGC(void);
+/* ff0c 10.w l */ int DOS_KFLUSHGS(struct dos_inpptr *);
+/* ff0d */ void DOS_FFLUSH(void);
+/* ff0e w */ int DOS_CHGDRV(int);
+/* ff0f drvctrl */ int DOS_DRVCTRL(int, int);
+/* ff10 */ int DOS_CONSNS(void);
+/* ff11 */ int DOS_PRNSNS(void);
+/* ff12 */ int DOS_CINSNS(void);
+/* ff13 */ int DOS_COUTSNS(void);
+/* ff17 l l ; e */ int DOS_FATCHK(const char *, unsigned short *);
+/* ff17 l lb31 w ; e */ int DOS_FATCHK2(const char *, unsigned short *, int);
+/* ff18 0.w */ int DOS_HENDSPMO(void);
+/* ff18 1.w w l */ int DOS_HENDSPMP(int, const char *);
+/* ff18 2.w w l */ int DOS_HENDSPMR(int, const char *);
+/* ff18 3.w */ void DOS_HENDSPMC(void);
+/* ff18 4.w */ int DOS_HENDSPIO(void);
+/* ff18 5.w w l */ int DOS_HENDSPIP(int, const char *);
+/* ff18 6.w w l */ int DOS_HENDSPIR(int, const char *);
+/* ff18 7.w w */ void DOS_HENDSPIC(int);
+/* ff18 8.w */ int DOS_HENDSPSO(void);
+/* ff18 9.w w l */ int DOS_HENDSPSP(int, const char *);
+/* ff18 10.w w l */ int DOS_HENDSPSR(int, const char *);
+/* ff18 11.w */ void DOS_HENDSPSC(void);
+/* ff19 */ int DOS_CURDRV(void);
+/* ff1a l */ int DOS_GETSS(struct dos_inpptr *);
+/* ff1b w */ int DOS_FGETC(int);
+/* ff1c l w */ int DOS_FGETS(struct dos_inpptr *, int);
+/* ff1d w w */ void DOS_FPUTC(int, int);
+/* ff1e l w */ void DOS_FPUTS(const char *, int);
+/* ff1f */ void DOS_ALLCLOSE(void);
+/* ff20 super ; super e */ int DOS_SUPER(int);
+/* ff21 w l ; e */ void DOS_FNCKEYGT(int, char *);
+/* ff21 wb8 l ; e */ void DOS_FNCKEYST(int, const char *);
+/* ff23 0.w w */ int DOS_C_PUTC(int);
+/* ff23 1.w l */ int DOS_C_PRINT(const char *);
+/* ff23 2.w w */ int DOS_C_COLOR(int);
+/* ff23 3.w w w */ int DOS_C_LOCATE(int, int);
+/* ff23 4.w */ int DOS_C_DOWN_S(void);
+/* ff23 5.w */ int DOS_C_UP_S(void);
+/* ff23 6.w w */ int DOS_C_UP(int);
+/* ff23 7.w w */ int DOS_C_DOWN(int);
+/* ff23 8.w w */ int DOS_C_RIGHT(int);
+/* ff23 9.w w */ int DOS_C_LEFT(int);
+/* ff23 10.w 0.w */ int DOS_C_CLS_ED(void);
+/* ff23 10.w 1.w */ int DOS_C_CLS_ST(void);
+/* ff23 10.w 2.w */ int DOS_C_CLS_AL(void);
+/* ff23 11.w 0.w */ int DOS_C_ERA_ED(void);
+/* ff23 11.w 1.w */ int DOS_C_ERA_ST(void);
+/* ff23 11.w 2.w */ int DOS_C_ERA_AL(void);
+/* ff23 12.w w */ int DOS_C_INS(int);
+/* ff23 13.w w */ int DOS_C_DEL(int);
+/* ff23 14.w w */ int DOS_C_FNKMOD(int);
+/* ff23 15.w w w */ int DOS_C_WINDOW(int, int);
+/* ff23 16.w w */ int DOS_C_WIDTH(int);
+/* ff23 17.w */ int DOS_C_CURON(void);
+/* ff23 18.w */ int DOS_C_CUROFF(void);
+/* ff24 0.w */ int DOS_K_KEYINP(void);
+/* ff24 1.w */ int DOS_K_KEYSNS(void);
+/* ff24 2.w */ int DOS_K_SFTSNS(void);
+/* ff24 3.w w */ int DOS_K_KEYBIT(int);
+/* ff24 4.w w */ void DOS_K_INSMOD(int);
+/* ff25 w l */ void *DOS_INTVCS(int, void *);
+/* ff26 l */ void DOS_PSPSET(struct dos_psp *);
+/* ff27 */ int DOS_GETTIM2(void);
+/* ff28 l ; e */ int DOS_SETTIM2(int);
+/* ff29 l l ; e */ int DOS_NAMESTS(const char *, struct dos_namestbuf *);
+/* ff2a */ int DOS_GETDATE(void);
+/* ff2b w ; e */ int DOS_SETDATE(int);
+/* ff2c */ int DOS_GETTIME(void);
+/* ff2d w ; e */ int DOS_SETTIME(int);
+/* ff2e w */ void DOS_VERIFY(int);
+/* ff2f w w ; e */ int DOS_DUP0(int, int);
+/* ff30 */ int __pure DOS_VERNUM(void);
+/* ff31 l w ; noret */ __dead void DOS_KEEPPR(int, int);
+/* ff32 w l ; e */ int DOS_GETDPB(int, struct dos_dpbptr *);
+/* ff33 w */ int DOS_BREAKCK(int);
+/* ff34 w w ; e */ void DOS_DRVXCHG(int, int);
+/* ff35 w */ void *DOS_INTVCG(int);
+/* ff36 w l ; estrct */ int DOS_DSKFRE(int, struct dos_freeinf *);
+/* ff37 l l ; e */ int DOS_NAMECK(const char *, struct dos_nameckbuf *);
+/* ff39 l ; e */ int DOS_MKDIR(const char *);
+/* ff3a l ; e */ int DOS_RMDIR(const char *);
+/* ff3b l ; e */ int DOS_CHDIR(const char *);
+/* ff3c l w ; e */ int DOS_CREATE(const char *, dos_mode_t);
+/* ff3d l w ; e */ int DOS_OPEN(const char *, int);
+/* ff3e w ; e */ int DOS_CLOSE(int);
+/* ff3f w l l ; e */ int DOS_READ(int, char *, int);
+/* ff40 w l l ; e */ int DOS_WRITE(int, const char *, int);
+/* ff41 l ; e */ int DOS_DELETE(const char *);
+/* ff42 w l w ; e */ long DOS_SEEK(int, int, int);
+/* ff43 l w ; e */ dos_mode_t DOS_CHMOD(const char *, dos_mode_t);
+/* ff44 0.w w ; e */ int DOS_IOCTRLGT(int);
+/* ff44 1.w w w ; e */ int DOS_IOCTRLST(int, int);
+/* ff44 2.w w l l ; e */ int DOS_IOCTRLRH(int, char *, int);
+/* ff44 3.w w l l ; e */ int DOS_IOCTRLWH(int, const char *, int);
+/* ff44 4.w w l l ; e */ int DOS_IOCTRLRD(int, char *, int);
+/* ff44 5.w w l l ; e */ int DOS_IOCTRLWD(int, const char *, int);
+/* ff44 6.w w ; e */ int DOS_IOCTRLIS(int);
+/* ff44 7.w w ; e */ int DOS_IOCTRLOS(int);
+/* ff44 9.w w ; e */ int DOS_IOCTRLDVGT(int);
+/* ff44 10.w w ; e */ int DOS_IOCTRLFDGT(int);
+/* ff44 11.w w w ; e */ int DOS_IOCTRLRTSET(int, int);
+/* ff44 12.w w w l ; e */ int DOS_IOCTRLDVCTL(int, int, char *);
+/* ff44 13.w w w l ; e */ int DOS_IOCTRLFDCTL(int, int, char *);
+/* ff45 w ; e */ int DOS_DUP(int);
+/* ff46 w w ; e */ int DOS_DUP2(int, int);
+/* ff47 w l ; e */ int DOS_CURDIR(int, char *);
+/* ff48 l ; ealloc */ void *DOS_MALLOC(int);
+/* ff49 l ; e */ int DOS_MFREE(void *);
+/* ff4a l l ; ealloc */ int DOS_SETBLOCK(void *, int);
+/* ff4b 0.w l l l ; sv e */ int DOS_LOADEXEC(const char *, const struct dos_comline *, const char *);
+/* ff4b 1.w l l l ; sv e */ int DOS_LOAD(const char *, const struct dos_comline *, const char *);
+/* ff4b 2.w l l l ; e */ int DOS_PATHCHK(const char *, const struct dos_comline *, const char *);
+/* ff4b 3.w l l l ; e */ int DOS_LOADONLY(const char *, const void *, const void *);
+/* ff4b 4.w l ; sv e */ int DOS_EXECONLY(void *);
+/* ff4b 5.w l l 0.l ; sv e */ int DOS_BINDNO(const char *, const char *);
/*^ 0.l is required?? */
-/* ff4b w l l l ; sv e */ int DOS_EXEC2 __P((int, const char *, const char *, const char *));
-/* ff4c w ; noret */ __dead void DOS_EXIT2 __P((int));
-/* ff4d */ int DOS_WAIT __P((void));
-/* ff4e l l w ; e */ int DOS_FILES __P((struct dos_filbuf *, const char *, int));
-/* ff4e lb31 l w ; e */ int DOS_EXFILES __P((struct dos_exfilbuf *, const char *, int));
-/* ff4f l ; e */ int DOS_NFILES __P((struct dos_filbuf *));
-/* ff4f lb31 ; e */ int DOS_EXNFILES __P((struct dos_exfilbuf *));
-/* ff80 l */ struct dos_psp *DOS_SETPDB __P((struct dos_psp *));
-/* ff81 */ struct dos_psp *DOS_GETPDB __P((void));
-/* ff82 l l l ; e */ int DOS_SETENV __P((const char *, const char *, const char *));
-/* ff83 l l l ; e */ int DOS_GETENV __P((const char *, const char *, char *));
-/* ff84 */ int DOS_VERIFYG __P((void));
-/* ff85 0.w l ; e */ int DOS_COMMON_CK __P((const char *));
-/* ff85 1.w l l l l ; e */ int DOS_COMMON_RD __P((const char *, int, char *, int));
-/* ff85 2.w l l l l ; e */ int DOS_COMMON_WT __P((const char *, int, const char *, int));
-/* ff85 3.w l l l l ; e */ int DOS_COMMON_LK __P((const char *, int, int, int));
-/* ff85 4.w l l l l ; e */ int DOS_COMMON_FRE __P((const char *, int, int, int));
-/* ff85 5.w l ; e */ int DOS_COMMON_DEL __P((const char *));
-/* ff86 l l ; e */ int DOS_MOVE __P((const char *, const char *));
- int DOS_RENAME __P((const char *, const char *));
-/* ff87 w l ; estrct */ int DOS_FILEDATE __P((int, int));
-/* ff88 w l ; ealloc */ void *DOS_MALLOC2 __P((int, int));
-/* ff88 wb15 l l ; ealloc */ void *DOS_MALLOC0 __P((int, int, int));
-/* ff8a l w ; e */ int DOS_MAKETMP __P((const char *, int));
-/* ff8b l w ; e */ int DOS_NEWFILE __P((const char *, dos_mode_t));
-/* ff8c 0.w w l l ; e */ int DOS_LOCK __P((int, int, int));
-/* ff8c 1.w w l l ; e */ int DOS_UNLOCK __P((int, int, int));
-/* ff8f 0.w l l ; e */ int DOS_GETASSIGN __P((const char *, char *));
-/* ff8f 1.w l l w ; e */ int DOS_MAKEASSIGN __P((const char *, const char *, int));
-/* ff8f 4.w l ; e */ int DOS_RASSIGN __P((const char *));
-/* ffaa w */ int DOS_FFLUSH_SET __P((int));
-/* ffab w l ; e */ void *DOS_OS_PATCH __P((unsigned int, void *));
-/* ffac w ; e */ union dos_fcb *DOS_GET_FCB_ADR __P((unsigned int));
-/* ffad w l ; ealloc */ void *DOS_S_MALLOC __P((int, int));
-/* ffad wb15 l l ; ealloc */ void *DOS_S_MALLOC0 __P((int, int));
-/* ffae l ; e */ int DOS_S_MFREE __P((void *));
-/* ffaf w l l l ; ep */ int DOS_S_PROCESS __P((int, int, int, int));
-/* fff0 ; alias DOS_EXITVC noret */ __dead void DOS_RETSHELL __P((void));
- __dead void DOS_EXITVC __P((void));
-/* fff1 ; noret */ __dead void DOS_CTLABORT __P((void));
-/* fff2 ; noret */ __dead void DOS_ERRABORT __P((void));
-/* fff3 l w w w */ void DOS_DISKRED __P((void *, int, int, int));
-/* fff3 lb31 w l l */ void DOS_DISKRED2 __P((void *, int, int, int));
-/* fff4 l w w w */ void DOS_DISKWRT __P((const void *, int, int, int));
-/* fff4 lb31 w l l */ void DOS_DISKWRT2 __P((const void *, int, int, int));
-/* fff5 */ struct dos_indos *DOS_INDOSFLG __P((void));
-/* fff6 l ; super_jsr sv */ void DOS_SUPER_JSR __P((void (*) __P((void)), struct dos_dregs *, struct dos_dregs *));
-/* fff7 l l w ; alias DOS_BUS_ERR e */ int DOS_MEMCPY __P((void *, void *, int));
- int DOS_BUS_ERR __P((void *, void *, int));
-/* fff8 l w l l w l l l ; e */ int DOS_OPEN_PR __P((const char *, int, int, int, int, int, struct dos_prcctrl *, long));
-/* fff9 ; e */ int DOS_KILL_PR __P((void));
-/* fffa w l ; e */ int DOS_GET_PR __P((int, struct dos_prcptr *));
-/* fffb w ; ep */ int DOS_SUSPEND_PR __P((int));
-/* fffc l */ int DOS_SLEEP_PR __P((long));
-/* fffd w w w l l ; ep */ int DOS_SEND_PR __P((int, int, int, char *, long));
-/* fffe */ long DOS_TIME_PR __P((void));
-/* ffff */ void DOS_CHANGE_PR __P((void));
+/* ff4b w l l l ; sv e */ int DOS_EXEC2(int, const char *, const char *, const char *);
+/* ff4c w ; noret */ __dead void DOS_EXIT2(int);
+/* ff4d */ int DOS_WAIT(void);
+/* ff4e l l w ; e */ int DOS_FILES(struct dos_filbuf *, const char *, int);
+/* ff4e lb31 l w ; e */ int DOS_EXFILES(struct dos_exfilbuf *, const char *, int);
+/* ff4f l ; e */ int DOS_NFILES(struct dos_filbuf *);
+/* ff4f lb31 ; e */ int DOS_EXNFILES(struct dos_exfilbuf *);
+/* ff80 l */ struct dos_psp *DOS_SETPDB(struct dos_psp *);
+/* ff81 */ struct dos_psp *DOS_GETPDB(void);
+/* ff82 l l l ; e */ int DOS_SETENV(const char *, const char *, const char *);
+/* ff83 l l l ; e */ int DOS_GETENV(const char *, const char *, char *);
+/* ff84 */ int DOS_VERIFYG(void);
+/* ff85 0.w l ; e */ int DOS_COMMON_CK(const char *);
+/* ff85 1.w l l l l ; e */ int DOS_COMMON_RD(const char *, int, char *, int);
+/* ff85 2.w l l l l ; e */ int DOS_COMMON_WT(const char *, int, const char *, int);
+/* ff85 3.w l l l l ; e */ int DOS_COMMON_LK(const char *, int, int, int);
+/* ff85 4.w l l l l ; e */ int DOS_COMMON_FRE(const char *, int, int, int);
+/* ff85 5.w l ; e */ int DOS_COMMON_DEL(const char *);
+/* ff86 l l ; e */ int DOS_MOVE(const char *, const char *);
+ int DOS_RENAME(const char *, const char *);
+/* ff87 w l ; estrct */ int DOS_FILEDATE(int, int);
+/* ff88 w l ; ealloc */ void *DOS_MALLOC2(int, int);
+/* ff88 wb15 l l ; ealloc */ void *DOS_MALLOC0(int, int, int);
+/* ff8a l w ; e */ int DOS_MAKETMP(const char *, int);
+/* ff8b l w ; e */ int DOS_NEWFILE(const char *, dos_mode_t);
+/* ff8c 0.w w l l ; e */ int DOS_LOCK(int, int, int);
+/* ff8c 1.w w l l ; e */ int DOS_UNLOCK(int, int, int);
+/* ff8f 0.w l l ; e */ int DOS_GETASSIGN(const char *, char *);
+/* ff8f 1.w l l w ; e */ int DOS_MAKEASSIGN(const char *, const char *, int);
+/* ff8f 4.w l ; e */ int DOS_RASSIGN(const char *);
+/* ffaa w */ int DOS_FFLUSH_SET(int);
+/* ffab w l ; e */ void *DOS_OS_PATCH(unsigned int, void *);
+/* ffac w ; e */ union dos_fcb *DOS_GET_FCB_ADR(unsigned int);
+/* ffad w l ; ealloc */ void *DOS_S_MALLOC(int, int);
+/* ffad wb15 l l ; ealloc */ void *DOS_S_MALLOC0(int, int);
+/* ffae l ; e */ int DOS_S_MFREE(void *);
+/* ffaf w l l l ; ep */ int DOS_S_PROCESS(int, int, int, int);
+/* fff0 ; alias DOS_EXITVC noret */ __dead void DOS_RETSHELL(void);
+ __dead void DOS_EXITVC(void);
+/* fff1 ; noret */ __dead void DOS_CTLABORT(void);
+/* fff2 ; noret */ __dead void DOS_ERRABORT(void);
+/* fff3 l w w w */ void DOS_DISKRED(void *, int, int, int);
+/* fff3 lb31 w l l */ void DOS_DISKRED2(void *, int, int, int);
+/* fff4 l w w w */ void DOS_DISKWRT(const void *, int, int, int);
+/* fff4 lb31 w l l */ void DOS_DISKWRT2(const void *, int, int, int);
+/* fff5 */ struct dos_indos *DOS_INDOSFLG(void);
+/* fff6 l ; super_jsr sv */ void DOS_SUPER_JSR(void (*)(void), struct dos_dregs *, struct dos_dregs *);
+/* fff7 l l w ; alias DOS_BUS_ERR e */ int DOS_MEMCPY(void *, void *, int);
+ int DOS_BUS_ERR(void *, void *, int);
+/* fff8 l w l l w l l l ; e */ int DOS_OPEN_PR(const char *, int, int, int, int, int, struct dos_prcctrl *, long);
+/* fff9 ; e */ int DOS_KILL_PR(void);
+/* fffa w l ; e */ int DOS_GET_PR(int, struct dos_prcptr *);
+/* fffb w ; ep */ int DOS_SUSPEND_PR(int);
+/* fffc l */ int DOS_SLEEP_PR(long);
+/* fffd w w w l l ; ep */ int DOS_SEND_PR(int, int, int, char *, long);
+/* fffe */ long DOS_TIME_PR(void);
+/* ffff */ void DOS_CHANGE_PR(void);
#endif /* __X68K_DOS_H__ */
diff --git a/sys/arch/x68k/stand/libdos/dos_errno.h b/sys/arch/x68k/stand/libdos/dos_errno.h
index 83f2e7790d2..3d062337207 100644
--- a/sys/arch/x68k/stand/libdos/dos_errno.h
+++ b/sys/arch/x68k/stand/libdos/dos_errno.h
@@ -5,7 +5,7 @@
* written by Yasha (ITOH Yasufumi)
* public domain
*
- * $NetBSD: dos_errno.h,v 1.4 2005/12/24 23:24:07 perry Exp $
+ * $NetBSD: dos_errno.h,v 1.5 2009/03/14 14:46:07 dsl Exp $
*/
#ifndef X68K_DOS_ERRNO_H
@@ -17,7 +17,7 @@
extern int dos_errno;
extern const int dos_nerr;
-const char * __pure dos_strerror __P((int)) __attribute__((const));
+const char * __pure dos_strerror(int) __attribute__((const));
#endif
/*
diff --git a/sys/arch/x68k/stand/libiocs/iocs.h b/sys/arch/x68k/stand/libiocs/iocs.h
index 86b7b31dba9..d76f9106fb0 100644
--- a/sys/arch/x68k/stand/libiocs/iocs.h
+++ b/sys/arch/x68k/stand/libiocs/iocs.h
@@ -6,7 +6,7 @@
* (based on PD libc 1.1.32 by PROJECT C Library)
* public domain
*
- * $NetBSD: iocs.h,v 1.5 2007/12/24 15:46:46 perry Exp $
+ * $NetBSD: iocs.h,v 1.6 2009/03/14 14:46:07 dsl Exp $
*/
/*
* PROJECT C Library, X68000 PROGRAMMING INTERFACE DEFINITION
@@ -249,180 +249,180 @@ struct iocs_inquiry {
* trap15 special for IOCS_TRAP15
*/
-/* (none) ; trap15 */ int IOCS_TRAP15 __P((const struct iocs_regs *, struct iocs_regs *));
-/* 00 */ int IOCS_B_KEYINP __P((void));
-/* 01 */ int IOCS_B_KEYSNS __P((void));
-/* 02 */ int IOCS_B_SFTSNS __P((void));
-/* 04 d1 */ int IOCS_BITSNS __P((int));
-/* 05 d1 */ void IOCS_SKEYSET __P((int));
-/* 0c d1 */ void IOCS_TVCTRL __P((int));
-/* 0d d1 d2 */ void IOCS_LEDMOD __P((int, int));
-/* 0e d1 d2 */ int IOCS_TGUSEMD __P((int, int));
-/* 0f d1=ww a1 */ int IOCS_DEFCHR __P((int, int, const void *));
-/* 10 d1 */ int IOCS_CRTMOD __P((int));
-/* 11 d1 */ int IOCS_CONTRAST __P((int));
-/* 12 d1=hsv */ int __pure IOCS_HSVTORGB __P((int, int, int)) __attribute__((const));
-/* 13 d1 d2 */ int IOCS_TPALET __P((int, int));
-/* 14 d1 d2 */ int IOCS_TPALET2 __P((int, int));
-/* 15 d1 */ void IOCS_TCOLOR __P((int));
-/* 19 d1=ww a1 */ int IOCS_FNTGET __P((int, int, struct iocs_fntbuf *));
-/* 1a d1 d2 a1 */ void IOCS_TEXTGET __P((int, int, struct iocs_fntbuf *));
-/* 1b d1 d2 a1 */ void IOCS_TEXTPUT __P((int, int, const struct iocs_fntbuf *));
-/* 1c d1 d2 a1 a2 */ void IOCS_CLIPPUT __P((int, int, const struct iocs_fntbuf *, const struct iocs_clipxy *));
-/* 1d d1 d2 d3 */ void IOCS_SCROLL __P((int, int, int));
-/* 1e */ void IOCS_B_CURON __P((void));
-/* 1f */ void IOCS_B_CUROFF __P((void));
-/* 20 d1 */ int IOCS_B_PUTC __P((int));
-/* 21 a1 */ int IOCS_B_PRINT __P((const char *));
-/* 22 d1 */ int IOCS_B_COLOR __P((int));
-/* 23 d1 d2 */ int IOCS_B_LOCATE __P((int, int));
-/* 24 */ void IOCS_B_DOWN_S __P((void));
-/* 25 */ void IOCS_B_UP_S __P((void));
-/* 26 d1 */ void IOCS_B_UP __P((int));
-/* 27 d1 */ void IOCS_B_DOWN __P((int));
-/* 28 d1 */ void IOCS_B_RIGHT __P((int));
-/* 29 d1 */ void IOCS_B_LEFT __P((int));
-/* 2a d1=0 */ void IOCS_B_CLR_ED __P((void));
-/* 2a d1=1 */ void IOCS_B_CLR_ST __P((void));
-/* 2a d1=2 */ void IOCS_B_CLR_AL __P((void));
-/* 2b d1=0 */ void IOCS_B_ERA_ED __P((void));
-/* 2b d1=1 */ void IOCS_B_ERA_ST __P((void));
-/* 2b d1=2 */ void IOCS_B_ERA_AL __P((void));
-/* 2c d1 */ void IOCS_B_INS __P((int));
-/* 2d d1 */ void IOCS_B_DEL __P((int));
-/* 2e d1=ww d2=ww ; retd2 */ int IOCS_B_CONSOL __P((int, int, int, int));
-/* 2f d1 d2 d3 d4 a1 ; retd2 */ int IOCS_B_PUTMES __P((int, int, int, int, const char *));
-/* 30 d1 */ int IOCS_SET232C __P((int));
-/* 31 */ int IOCS_LOF232C __P((void));
-/* 32 */ int IOCS_INP232C __P((void));
-/* 33 */ int IOCS_ISNS232C __P((void));
-/* 34 */ int IOCS_OSNS232C __P((void));
-/* 35 d1 */ void IOCS_OUT232C __P((int));
-/* 3b d1 */ int IOCS_JOYGET __P((int));
-/* 3c d1=bb */ int IOCS_INIT_PRN __P((int, int));
-/* 3d */ int IOCS_SNSPRN __P((void));
-/* 3e d1 */ void IOCS_OUTLPT __P((int));
-/* 3f d1 */ void IOCS_OUTPRN __P((int));
-/* 40 d1 d2 */ int IOCS_B_SEEK __P((int, int));
-/* 41 d1 d2 d3 a1 */ int IOCS_B_VERIFY __P((int, int, int, const void *));
-/* 42 d1 d2 d3 a1 */ int IOCS_B_READDI __P((int, int, int, void *));
-/* 43 d1 a1 d2 */ int IOCS_B_DSKINI __P((int, const void *, int));
-/* 44 d1 */ int IOCS_B_DRVSNS __P((int));
-/* 45 d1 d2 d3 a1 */ int IOCS_B_WRITE __P((int, int, int, const void *));
-/* 46 d1 d2 d3 a1 */ int IOCS_B_READ __P((int, int, int, void *));
-/* 47 d1 */ int IOCS_B_RECALI __P((int));
-/* 48 d1 d2 d3 a1 */ int IOCS_B_ASSIGN __P((int, int, int, const void *));
-/* 49 d1 d2 d3 a1 */ int IOCS_B_WRITED __P((int, int, int, const void *));
-/* 4a d1 d2 od2 */ int IOCS_B_READID __P((int, int, void *));
-/* 4b d1 d2 d3 */ int IOCS_B_BADFMT __P((int, int, int));
-/* 4c d1 d2 d3 a1 */ int IOCS_B_READDL __P((int, int, int, void *));
-/* 4d d1 d2 d3 a1 */ int IOCS_B_FORMAT __P((int, int, int, const void *));
-/* 4e d1 d2 */ int IOCS_B_DRVCHK __P((int, int));
-/* 4f d1 */ int IOCS_B_EJECT __P((int));
-/* 50 d1 */ int IOCS_BINDATEBCD __P((int));
-/* 51 d1 */ void IOCS_BINDATESET __P((int));
-/* 52 d1 */ int IOCS_TIMEBCD __P((int));
-/* 53 d1 */ void IOCS_TIMESET __P((int));
-/* 54 */ int IOCS_BINDATEGET __P((void));
-/* 55 d1 */ int IOCS_DATEBIN __P((int));
-/* 56 */ int IOCS_TIMEGET __P((void));
-/* 57 d1 */ int IOCS_TIMEBIN __P((int));
-/* 58 a1 */ int IOCS_DATECNV __P((const char *));
-/* 59 a1 */ int IOCS_TIMECNV __P((const char *));
-/* 5a d1 a1 */ int IOCS_DATEASC __P((int, char *));
-/* 5b d1 a1 */ int IOCS_TIMEASC __P((int, char *));
-/* 5c d1 a1 */ void IOCS_DAYASC __P((int, char *));
-/* 5d d1 */ int IOCS_ALARMMOD __P((int));
-/* 5e d1 d2 a1 */ int IOCS_ALARMSET __P((int, int, int));
-/* 5f od1 od2 od0 */ int IOCS_ALARMGET __P((int *, int *, int *));
-/* 60 a1 d1 d2 */ void IOCS_ADPCMOUT __P((const void *, int, int));
-/* 61 a1 d1 d2 */ void IOCS_ADPCMINP __P((void *, int, int));
-/* 62 a1 d1 d2 */ void IOCS_ADPCMAOT __P((const struct iocs_chain *, int, int));
-/* 63 a1 d1 d2 */ void IOCS_ADPCMAIN __P((const struct iocs_chain *, int, int));
-/* 64 a1 d1 */ void IOCS_ADPCMLOT __P((const struct iocs_chain2 *, int));
-/* 65 a1 d1 */ void IOCS_ADPCMLIN __P((const struct iocs_chain2 *, int));
-/* 66 */ int IOCS_ADPCMSNS __P((void));
-/* 67 d1 */ void IOCS_ADPCMMOD __P((int));
-/* 68 d1 d2 */ void IOCS_OPMSET __P((int, int));
-/* 69 */ int IOCS_OPMSNS __P((void));
-/* 6a a1 */ int IOCS_OPMINTST __P((const void *));
-/* 6b a1 d1=bb */ int IOCS_TIMERDST __P((const void *, int, int));
-/* 6c a1 d1=bb */ int IOCS_VDISPST __P((const void *, int, int));
-/* 6d a1 d1 */ int IOCS_CRTCRAS __P((const void *, int));
-/* 6e a1 */ int IOCS_HSYNCST __P((const void *));
-/* 6f a1 */ int IOCS_PRNINTST __P((const void *));
-/* 70 */ void IOCS_MS_INIT __P((void));
-/* 71 */ void IOCS_MS_CURON __P((void));
-/* 72 */ void IOCS_MS_CUROF __P((void));
-/* 73 */ int IOCS_MS_STAT __P((void));
-/* 74 */ int IOCS_MS_GETDT __P((void));
-/* 75 */ int IOCS_MS_CURGT __P((void));
-/* 76 d1=ww */ int IOCS_MS_CURST __P((int, int));
-/* 77 d1=ww d2=ww */ int IOCS_MS_LIMIT __P((int, int, int, int));
-/* 78 d1 d2 */ int IOCS_MS_OFFTM __P((int, int));
-/* 79 d1 d2 */ int IOCS_MS_ONTM __P((int, int));
-/* 7a d1 a1 */ void IOCS_MS_PATST __P((int, const struct iocs_patst *));
-/* 7b d1 */ void IOCS_MS_SEL __P((int));
-/* 7c a1 */ void IOCS_MS_SEL2 __P((const short *));
-/* 7d d1 d2=ww */ int IOCS_SKEY_MOD __P((int, int, int));
-/* 7e */ void IOCS_DENSNS __P((void));
-/* 7f */ int IOCS_ONTIME __P((void));
-/* 80 d1 a1 */ int IOCS_B_INTVCS __P((int, int));
-/* 81 ; b_super */ int IOCS_B_SUPER __P((int));
-/* 82 a1 */ int IOCS_B_BPEEK __P((const void *));
-/* 83 a1 */ int IOCS_B_WPEEK __P((const void *));
-/* 84 a1 */ int IOCS_B_LPEEK __P((const void *));
-/* 85 a1 a2 d1 */ void IOCS_B_MEMSTR __P((const void *, void *, int));
-/* 86 a1 d1 */ void IOCS_B_BPOKE __P((void *, int));
-/* 87 a1 d1 */ void IOCS_B_WPOKE __P((void *, int));
-/* 88 a1 d1 */ void IOCS_B_LPOKE __P((void *, int));
-/* 89 a1 a2 d1 */ void IOCS_B_MEMSET __P((void *, const void *, int));
-/* 8a a1 a2 d1 d2 */ void IOCS_DMAMOVE __P((void *, void *, int, int));
-/* 8b a1 a2 d1 d2 */ void IOCS_DMAMOV_A __P((const struct iocs_chain *, void *, int, int));
-/* 8c a1 a2 d1 */ void IOCS_DMAMOV_L __P((const struct iocs_chain2 *, void *, int));
-/* 8d */ int IOCS_DMAMODE __P((void));
-/* 8e */ int __pure IOCS_BOOTINF __P((void)) __attribute__((const));
-/* 8f */ int __pure IOCS_ROMVER __P((void)) __attribute__((const));
-/* 90 */ void IOCS_G_CLR_ON __P((void));
-/* 94 d1 d2 */ int IOCS_GPALET __P((int, int));
-/* a0 d1 */ int __pure IOCS_SFTJIS __P((int)) __attribute__((const));
-/* a1 d1 */ int __pure IOCS_JISSFT __P((int)) __attribute__((const));
-/* a2 d1=ww */ int __pure IOCS_AKCONV __P((int, int)) __attribute__((const));
-/* a3 d1 a1 a2 */ int IOCS_RMACNV __P((int, char *, char *));
-/* a4 a1 */ int IOCS_DAKJOB __P((char *));
-/* a5 a1 */ int IOCS_HANJOB __P((char *));
-/* ac d1=0 */ int IOCS_MPU_STAT __P((void)); /* ROM 1.3 only */
-/* ac d1=1 */ int IOCS_CACHE_ST __P((void)); /* ROM 1.3 only */
-/* ac d1=3 d2 ; c_md */ int IOCS_CACHE_MD __P((int)); /* ROM 1.3 only */
-/* ad d1 ; b_curmod */ void IOCS_B_CURMOD __P((int)); /*1.3/IOCS.X*/
-/* ad d1=2 d2 ; b_curpat */ void IOCS_B_CURPAT __P((int)); /*1.3/IOCS.X*/
-/* ad d1=2 d2=0 */ void IOCS_B_CURPAT1 __P((void)); /*1.3/IOCS.X*/
-/* ad d1=3 d2 */ void IOCS_B_CURDEF __P((void *)); /*1.3/IOCS.X*/
-/* ad d1=16 d2 ; b_scroll */ void IOCS_B_SCROLL __P((int)); /*1.3/IOCS.X*/
-/* ae */ void IOCS_OS_CURON __P((void));
-/* af */ void IOCS_OS_CUROF __P((void));
-/* b0 d1 */ int IOCS_DRAWMODE __P((int)); /* ROM 1.3, IOCS.X */
-/* b1 d1 */ int IOCS_APAGE __P((int));
-/* b2 d1 */ int IOCS_VPAGE __P((int));
-/* b3 d1 d2 d3 */ int IOCS_HOME __P((int, int, int));
-/* b4 d1 d2 d3 d4 */ int IOCS_WINDOW __P((int, int, int, int));
-/* b5 */ int IOCS_WIPE __P((void));
-/* b6 a1 */ int IOCS_PSET __P((const struct iocs_psetptr *));
-/* b7 a1 */ int IOCS_POINT __P((const struct iocs_pointptr *));
-/* b8 a1 */ int IOCS_LINE __P((const struct iocs_lineptr *));
-/* b9 a1 */ int IOCS_BOX __P((const struct iocs_boxptr *));
-/* ba a1 */ int IOCS_FILL __P((const struct iocs_fillptr *));
-/* bb a1 */ int IOCS_CIRCLE __P((const struct iocs_circleptr *));
-/* bc a1 */ int IOCS_PAINT __P((struct iocs_paintptr *));
-/* bd a1 */ int IOCS_SYMBOL __P((const struct iocs_symbolptr *));
-/* be a1 */ int IOCS_GETGRM __P((struct iocs_getptr *));
-/* bf a1 */ int IOCS_PUTGRM __P((const struct iocs_putptr *));
-/* c0 */ int IOCS_SP_INIT __P((void));
-/* c1 */ int IOCS_SP_ON __P((void));
-/* c2 */ void IOCS_SP_OFF __P((void));
-/* c3 d1 */ int IOCS_SP_CGCLR __P((int));
-/* c4 d1 d2 a1 */ int IOCS_SP_DEFCG __P((int, int, const void *));
-/* c5 d1 d2 a1 */ int IOCS_SP_GTPCG __P((int, int, void *));
+/* (none) ; trap15 */ int IOCS_TRAP15(const struct iocs_regs *, struct iocs_regs *);
+/* 00 */ int IOCS_B_KEYINP(void);
+/* 01 */ int IOCS_B_KEYSNS(void);
+/* 02 */ int IOCS_B_SFTSNS(void);
+/* 04 d1 */ int IOCS_BITSNS(int);
+/* 05 d1 */ void IOCS_SKEYSET(int);
+/* 0c d1 */ void IOCS_TVCTRL(int);
+/* 0d d1 d2 */ void IOCS_LEDMOD(int, int);
+/* 0e d1 d2 */ int IOCS_TGUSEMD(int, int);
+/* 0f d1=ww a1 */ int IOCS_DEFCHR(int, int, const void *);
+/* 10 d1 */ int IOCS_CRTMOD(int);
+/* 11 d1 */ int IOCS_CONTRAST(int);
+/* 12 d1=hsv */ int __pure IOCS_HSVTORGB(int, int, int) __attribute__((const));
+/* 13 d1 d2 */ int IOCS_TPALET(int, int);
+/* 14 d1 d2 */ int IOCS_TPALET2(int, int);
+/* 15 d1 */ void IOCS_TCOLOR(int);
+/* 19 d1=ww a1 */ int IOCS_FNTGET(int, int, struct iocs_fntbuf *);
+/* 1a d1 d2 a1 */ void IOCS_TEXTGET(int, int, struct iocs_fntbuf *);
+/* 1b d1 d2 a1 */ void IOCS_TEXTPUT(int, int, const struct iocs_fntbuf *);
+/* 1c d1 d2 a1 a2 */ void IOCS_CLIPPUT(int, int, const struct iocs_fntbuf *, const struct iocs_clipxy *);
+/* 1d d1 d2 d3 */ void IOCS_SCROLL(int, int, int);
+/* 1e */ void IOCS_B_CURON(void);
+/* 1f */ void IOCS_B_CUROFF(void);
+/* 20 d1 */ int IOCS_B_PUTC(int);
+/* 21 a1 */ int IOCS_B_PRINT(const char *);
+/* 22 d1 */ int IOCS_B_COLOR(int);
+/* 23 d1 d2 */ int IOCS_B_LOCATE(int, int);
+/* 24 */ void IOCS_B_DOWN_S(void);
+/* 25 */ void IOCS_B_UP_S(void);
+/* 26 d1 */ void IOCS_B_UP(int);
+/* 27 d1 */ void IOCS_B_DOWN(int);
+/* 28 d1 */ void IOCS_B_RIGHT(int);
+/* 29 d1 */ void IOCS_B_LEFT(int);
+/* 2a d1=0 */ void IOCS_B_CLR_ED(void);
+/* 2a d1=1 */ void IOCS_B_CLR_ST(void);
+/* 2a d1=2 */ void IOCS_B_CLR_AL(void);
+/* 2b d1=0 */ void IOCS_B_ERA_ED(void);
+/* 2b d1=1 */ void IOCS_B_ERA_ST(void);
+/* 2b d1=2 */ void IOCS_B_ERA_AL(void);
+/* 2c d1 */ void IOCS_B_INS(int);
+/* 2d d1 */ void IOCS_B_DEL(int);
+/* 2e d1=ww d2=ww ; retd2 */ int IOCS_B_CONSOL(int, int, int, int);
+/* 2f d1 d2 d3 d4 a1 ; retd2 */ int IOCS_B_PUTMES(int, int, int, int, const char *);
+/* 30 d1 */ int IOCS_SET232C(int);
+/* 31 */ int IOCS_LOF232C(void);
+/* 32 */ int IOCS_INP232C(void);
+/* 33 */ int IOCS_ISNS232C(void);
+/* 34 */ int IOCS_OSNS232C(void);
+/* 35 d1 */ void IOCS_OUT232C(int);
+/* 3b d1 */ int IOCS_JOYGET(int);
+/* 3c d1=bb */ int IOCS_INIT_PRN(int, int);
+/* 3d */ int IOCS_SNSPRN(void);
+/* 3e d1 */ void IOCS_OUTLPT(int);
+/* 3f d1 */ void IOCS_OUTPRN(int);
+/* 40 d1 d2 */ int IOCS_B_SEEK(int, int);
+/* 41 d1 d2 d3 a1 */ int IOCS_B_VERIFY(int, int, int, const void *);
+/* 42 d1 d2 d3 a1 */ int IOCS_B_READDI(int, int, int, void *);
+/* 43 d1 a1 d2 */ int IOCS_B_DSKINI(int, const void *, int);
+/* 44 d1 */ int IOCS_B_DRVSNS(int);
+/* 45 d1 d2 d3 a1 */ int IOCS_B_WRITE(int, int, int, const void *);
+/* 46 d1 d2 d3 a1 */ int IOCS_B_READ(int, int, int, void *);
+/* 47 d1 */ int IOCS_B_RECALI(int);
+/* 48 d1 d2 d3 a1 */ int IOCS_B_ASSIGN(int, int, int, const void *);
+/* 49 d1 d2 d3 a1 */ int IOCS_B_WRITED(int, int, int, const void *);
+/* 4a d1 d2 od2 */ int IOCS_B_READID(int, int, void *);
+/* 4b d1 d2 d3 */ int IOCS_B_BADFMT(int, int, int);
+/* 4c d1 d2 d3 a1 */ int IOCS_B_READDL(int, int, int, void *);
+/* 4d d1 d2 d3 a1 */ int IOCS_B_FORMAT(int, int, int, const void *);
+/* 4e d1 d2 */ int IOCS_B_DRVCHK(int, int);
+/* 4f d1 */ int IOCS_B_EJECT(int);
+/* 50 d1 */ int IOCS_BINDATEBCD(int);
+/* 51 d1 */ void IOCS_BINDATESET(int);
+/* 52 d1 */ int IOCS_TIMEBCD(int);
+/* 53 d1 */ void IOCS_TIMESET(int);
+/* 54 */ int IOCS_BINDATEGET(void);
+/* 55 d1 */ int IOCS_DATEBIN(int);
+/* 56 */ int IOCS_TIMEGET(void);
+/* 57 d1 */ int IOCS_TIMEBIN(int);
+/* 58 a1 */ int IOCS_DATECNV(const char *);
+/* 59 a1 */ int IOCS_TIMECNV(const char *);
+/* 5a d1 a1 */ int IOCS_DATEASC(int, char *);
+/* 5b d1 a1 */ int IOCS_TIMEASC(int, char *);
+/* 5c d1 a1 */ void IOCS_DAYASC(int, char *);
+/* 5d d1 */ int IOCS_ALARMMOD(int);
+/* 5e d1 d2 a1 */ int IOCS_ALARMSET(int, int, int);
+/* 5f od1 od2 od0 */ int IOCS_ALARMGET(int *, int *, int *);
+/* 60 a1 d1 d2 */ void IOCS_ADPCMOUT(const void *, int, int);
+/* 61 a1 d1 d2 */ void IOCS_ADPCMINP(void *, int, int);
+/* 62 a1 d1 d2 */ void IOCS_ADPCMAOT(const struct iocs_chain *, int, int);
+/* 63 a1 d1 d2 */ void IOCS_ADPCMAIN(const struct iocs_chain *, int, int);
+/* 64 a1 d1 */ void IOCS_ADPCMLOT(const struct iocs_chain2 *, int);
+/* 65 a1 d1 */ void IOCS_ADPCMLIN(const struct iocs_chain2 *, int);
+/* 66 */ int IOCS_ADPCMSNS(void);
+/* 67 d1 */ void IOCS_ADPCMMOD(int);
+/* 68 d1 d2 */ void IOCS_OPMSET(int, int);
+/* 69 */ int IOCS_OPMSNS(void);
+/* 6a a1 */ int IOCS_OPMINTST(const void *);
+/* 6b a1 d1=bb */ int IOCS_TIMERDST(const void *, int, int);
+/* 6c a1 d1=bb */ int IOCS_VDISPST(const void *, int, int);
+/* 6d a1 d1 */ int IOCS_CRTCRAS(const void *, int);
+/* 6e a1 */ int IOCS_HSYNCST(const void *);
+/* 6f a1 */ int IOCS_PRNINTST(const void *);
+/* 70 */ void IOCS_MS_INIT(void);
+/* 71 */ void IOCS_MS_CURON(void);
+/* 72 */ void IOCS_MS_CUROF(void);
+/* 73 */ int IOCS_MS_STAT(void);
+/* 74 */ int IOCS_MS_GETDT(void);
+/* 75 */ int IOCS_MS_CURGT(void);
+/* 76 d1=ww */ int IOCS_MS_CURST(int, int);
+/* 77 d1=ww d2=ww */ int IOCS_MS_LIMIT(int, int, int, int);
+/* 78 d1 d2 */ int IOCS_MS_OFFTM(int, int);
+/* 79 d1 d2 */ int IOCS_MS_ONTM(int, int);
+/* 7a d1 a1 */ void IOCS_MS_PATST(int, const struct iocs_patst *);
+/* 7b d1 */ void IOCS_MS_SEL(int);
+/* 7c a1 */ void IOCS_MS_SEL2(const short *);
+/* 7d d1 d2=ww */ int IOCS_SKEY_MOD(int, int, int);
+/* 7e */ void IOCS_DENSNS(void);
+/* 7f */ int IOCS_ONTIME(void);
+/* 80 d1 a1 */ int IOCS_B_INTVCS(int, int);
+/* 81 ; b_super */ int IOCS_B_SUPER(int);
+/* 82 a1 */ int IOCS_B_BPEEK(const void *);
+/* 83 a1 */ int IOCS_B_WPEEK(const void *);
+/* 84 a1 */ int IOCS_B_LPEEK(const void *);
+/* 85 a1 a2 d1 */ void IOCS_B_MEMSTR(const void *, void *, int);
+/* 86 a1 d1 */ void IOCS_B_BPOKE(void *, int);
+/* 87 a1 d1 */ void IOCS_B_WPOKE(void *, int);
+/* 88 a1 d1 */ void IOCS_B_LPOKE(void *, int);
+/* 89 a1 a2 d1 */ void IOCS_B_MEMSET(void *, const void *, int);
+/* 8a a1 a2 d1 d2 */ void IOCS_DMAMOVE(void *, void *, int, int);
+/* 8b a1 a2 d1 d2 */ void IOCS_DMAMOV_A(const struct iocs_chain *, void *, int, int);
+/* 8c a1 a2 d1 */ void IOCS_DMAMOV_L(const struct iocs_chain2 *, void *, int);
+/* 8d */ int IOCS_DMAMODE(void);
+/* 8e */ int __pure IOCS_BOOTINF(void) __attribute__((const));
+/* 8f */ int __pure IOCS_ROMVER(void) __attribute__((const));
+/* 90 */ void IOCS_G_CLR_ON(void);
+/* 94 d1 d2 */ int IOCS_GPALET(int, int);
+/* a0 d1 */ int __pure IOCS_SFTJIS(int) __attribute__((const));
+/* a1 d1 */ int __pure IOCS_JISSFT(int) __attribute__((const));
+/* a2 d1=ww */ int __pure IOCS_AKCONV(int, int) __attribute__((const));
+/* a3 d1 a1 a2 */ int IOCS_RMACNV(int, char *, char *);
+/* a4 a1 */ int IOCS_DAKJOB(char *);
+/* a5 a1 */ int IOCS_HANJOB(char *);
+/* ac d1=0 */ int IOCS_MPU_STAT(void); /* ROM 1.3 only */
+/* ac d1=1 */ int IOCS_CACHE_ST(void); /* ROM 1.3 only */
+/* ac d1=3 d2 ; c_md */ int IOCS_CACHE_MD(int); /* ROM 1.3 only */
+/* ad d1 ; b_curmod */ void IOCS_B_CURMOD(int); /*1.3/IOCS.X*/
+/* ad d1=2 d2 ; b_curpat */ void IOCS_B_CURPAT(int); /*1.3/IOCS.X*/
+/* ad d1=2 d2=0 */ void IOCS_B_CURPAT1(void); /*1.3/IOCS.X*/
+/* ad d1=3 d2 */ void IOCS_B_CURDEF(void *); /*1.3/IOCS.X*/
+/* ad d1=16 d2 ; b_scroll */ void IOCS_B_SCROLL(int); /*1.3/IOCS.X*/
+/* ae */ void IOCS_OS_CURON(void);
+/* af */ void IOCS_OS_CUROF(void);
+/* b0 d1 */ int IOCS_DRAWMODE(int); /* ROM 1.3, IOCS.X */
+/* b1 d1 */ int IOCS_APAGE(int);
+/* b2 d1 */ int IOCS_VPAGE(int);
+/* b3 d1 d2 d3 */ int IOCS_HOME(int, int, int);
+/* b4 d1 d2 d3 d4 */ int IOCS_WINDOW(int, int, int, int);
+/* b5 */ int IOCS_WIPE(void);
+/* b6 a1 */ int IOCS_PSET(const struct iocs_psetptr *);
+/* b7 a1 */ int IOCS_POINT(const struct iocs_pointptr *);
+/* b8 a1 */ int IOCS_LINE(const struct iocs_lineptr *);
+/* b9 a1 */ int IOCS_BOX(const struct iocs_boxptr *);
+/* ba a1 */ int IOCS_FILL(const struct iocs_fillptr *);
+/* bb a1 */ int IOCS_CIRCLE(const struct iocs_circleptr *);
+/* bc a1 */ int IOCS_PAINT(struct iocs_paintptr *);
+/* bd a1 */ int IOCS_SYMBOL(const struct iocs_symbolptr *);
+/* be a1 */ int IOCS_GETGRM(struct iocs_getptr *);
+/* bf a1 */ int IOCS_PUTGRM(const struct iocs_putptr *);
+/* c0 */ int IOCS_SP_INIT(void);
+/* c1 */ int IOCS_SP_ON(void);
+/* c2 */ void IOCS_SP_OFF(void);
+/* c3 d1 */ int IOCS_SP_CGCLR(int);
+/* c4 d1 d2 a1 */ int IOCS_SP_DEFCG(int, int, const void *);
+/* c5 d1 d2 a1 */ int IOCS_SP_GTPCG(int, int, void *);
/*
* XXX SP_REGST in XC iocslib: args: int, int, int, int, int
@@ -431,50 +431,50 @@ struct iocs_inquiry {
* (c6 d0 d1 d2 d3 d4 d5 ; sp_regst)
* we use the latter interface...
*/
-/* c6 d0 d1 d2 d3 d4 d5 ; sp_regst */ int IOCS_SP_REGST __P((int, int, int, int, int, int));
-/* c7 d1 od2 od3 od4 od5 ; err_d0 */ int IOCS_SP_REGGT __P((int, int *, int *, int *, int *));
-/* c8 d1 d2 d3 */ int IOCS_BGSCRLST __P((int, int, int));
-/* c9 d1 od2 od3 ; err_d0 */ int IOCS_BGSCRLGT __P((int, int *, int *));
-/* ca d1 d2 d3 */ int IOCS_BGCTRLST __P((int, int, int));
-/* cb d1 */ int IOCS_BGCTRLGT __P((int));
-/* cc d1 d2 */ int IOCS_BGTEXTCL __P((int, int));
-/* cd d1 d2 d3 d4 */ int IOCS_BGTEXTST __P((int, int, int, int));
-/* ce d1 d2 d3 */ int IOCS_BGTEXTGT __P((int, int, int));
-/* cf d1 d2 d3 */ int IOCS_SPALET __P((int, int, int));
-/* d3 a1 */ void IOCS_TXXLINE __P((const struct iocs_xlineptr *));
-/* d4 a1 */ void IOCS_TXYLINE __P((const struct iocs_ylineptr *));
-/* d5 a1 */ void IOCS_TXLINE __P((struct iocs_tlineptr)); /* 1.3, IOCS.X */
-/* d6 a1 */ void IOCS_TXBOX __P((const struct iocs_tboxptr *));
-/* d7 a1 */ void IOCS_TXFILL __P((const struct iocs_txfillptr *));
-/* d8 a1 */ void IOCS_TXREV __P((const struct iocs_trevptr *));
-/* df d1 d2 d3 */ void IOCS_TXRASCPY __P((int, int, int));
-/* fd */ void IOCS_ABORTRST __P((void));
-/* fe ; noret */ __dead void IOCS_IPLERR __P((void));
-/* ff ; noret */ __dead void IOCS_ABORTJOB __P((void));
+/* c6 d0 d1 d2 d3 d4 d5 ; sp_regst */ int IOCS_SP_REGST(int, int, int, int, int, int);
+/* c7 d1 od2 od3 od4 od5 ; err_d0 */ int IOCS_SP_REGGT(int, int *, int *, int *, int *);
+/* c8 d1 d2 d3 */ int IOCS_BGSCRLST(int, int, int);
+/* c9 d1 od2 od3 ; err_d0 */ int IOCS_BGSCRLGT(int, int *, int *);
+/* ca d1 d2 d3 */ int IOCS_BGCTRLST(int, int, int);
+/* cb d1 */ int IOCS_BGCTRLGT(int);
+/* cc d1 d2 */ int IOCS_BGTEXTCL(int, int);
+/* cd d1 d2 d3 d4 */ int IOCS_BGTEXTST(int, int, int, int);
+/* ce d1 d2 d3 */ int IOCS_BGTEXTGT(int, int, int);
+/* cf d1 d2 d3 */ int IOCS_SPALET(int, int, int);
+/* d3 a1 */ void IOCS_TXXLINE(const struct iocs_xlineptr *);
+/* d4 a1 */ void IOCS_TXYLINE(const struct iocs_ylineptr *);
+/* d5 a1 */ void IOCS_TXLINE(struct iocs_tlineptr); /* 1.3, IOCS.X */
+/* d6 a1 */ void IOCS_TXBOX(const struct iocs_tboxptr *);
+/* d7 a1 */ void IOCS_TXFILL(const struct iocs_txfillptr *);
+/* d8 a1 */ void IOCS_TXREV(const struct iocs_trevptr *);
+/* df d1 d2 d3 */ void IOCS_TXRASCPY(int, int, int);
+/* fd */ void IOCS_ABORTRST(void);
+/* fe ; noret */ __dead void IOCS_IPLERR(void);
+/* ff ; noret */ __dead void IOCS_ABORTJOB(void);
/* SCSI calls */
-/* f5 d1=0 */ void IOCS_S_RESET __P((void));
-/* f5 d1=1 d4 */ int IOCS_S_SELECT __P((int));
-/* f5 d1=3 d3 a1 */ int IOCS_S_CMDOUT __P((int, void *));
-/* f5 d1=4 d3 a1 */ int IOCS_S_DATAIN __P((int, void *));
-/* f5 d1=5 d3 a1 */ int IOCS_S_DATAOUT __P((int, void *));
-/* f5 d1=6 a1 */ int IOCS_S_STSIN __P((void *));
-/* f5 d1=7 a1 */ int IOCS_S_MSGIN __P((void *));
-/* f5 d1=8 a1 */ int IOCS_S_MSGOUT __P((void *));
-/* f5 d1=9 */ int IOCS_S_PHASE __P((void));
-/* f5 d1=32 d3 d4 a1 */ int IOCS_S_INQUIRY __P((int, int, struct iocs_inquiry *));
-/* f5 d1=33 d2 d3 d4 d5 a1 */ int IOCS_S_READ __P((int, int, int, int, void *));
-/* f5 d1=34 d2 d3 d4 d5 a1 */ int IOCS_S_WRITE __P((int, int, int, int, void *));
-/* f5 d1=35 d3 d4 */ int IOCS_S_FORMAT __P((int, int));
-/* f5 d1=36 d4 */ int IOCS_S_TESTUNIT __P((int));
-/* f5 d1=37 d4 a1 */ int IOCS_S_READCAP __P((int, struct iocs_readcap *));
-/* f5 d1=38 d2 d3 d4 d5 a1 */ int IOCS_S_READEXT __P((int, int, int, int, void *));
-/* f5 d1=39 d2 d3 d4 d5 a1 */ int IOCS_S_WRITEEXT __P((int, int, int, int, void *));
-/* f5 d1=43 d4 */ int IOCS_S_REZEROUNIT __P((int));
-/* f5 d1=44 d3 d4 a1 */ int IOCS_S_REQUEST __P((int, int, void *));
-/* f5 d1=45 d2 d4 */ int IOCS_S_SEEK __P((int, int));
-/* f5 d1=47 d3 d4 */ int IOCS_S_STARTSTOP __P((int, int));
-/* f5 d1=49 d3 d4 a1 */ int IOCS_S_REASSIGN __P((int, int, void *));
-/* f5 d1=50 d3 d4 */ int IOCS_S_PAMEDIUM __P((int, int));
+/* f5 d1=0 */ void IOCS_S_RESET(void);
+/* f5 d1=1 d4 */ int IOCS_S_SELECT(int);
+/* f5 d1=3 d3 a1 */ int IOCS_S_CMDOUT(int, void *);
+/* f5 d1=4 d3 a1 */ int IOCS_S_DATAIN(int, void *);
+/* f5 d1=5 d3 a1 */ int IOCS_S_DATAOUT(int, void *);
+/* f5 d1=6 a1 */ int IOCS_S_STSIN(void *);
+/* f5 d1=7 a1 */ int IOCS_S_MSGIN(void *);
+/* f5 d1=8 a1 */ int IOCS_S_MSGOUT(void *);
+/* f5 d1=9 */ int IOCS_S_PHASE(void);
+/* f5 d1=32 d3 d4 a1 */ int IOCS_S_INQUIRY(int, int, struct iocs_inquiry *);
+/* f5 d1=33 d2 d3 d4 d5 a1 */ int IOCS_S_READ(int, int, int, int, void *);
+/* f5 d1=34 d2 d3 d4 d5 a1 */ int IOCS_S_WRITE(int, int, int, int, void *);
+/* f5 d1=35 d3 d4 */ int IOCS_S_FORMAT(int, int);
+/* f5 d1=36 d4 */ int IOCS_S_TESTUNIT(int);
+/* f5 d1=37 d4 a1 */ int IOCS_S_READCAP(int, struct iocs_readcap *);
+/* f5 d1=38 d2 d3 d4 d5 a1 */ int IOCS_S_READEXT(int, int, int, int, void *);
+/* f5 d1=39 d2 d3 d4 d5 a1 */ int IOCS_S_WRITEEXT(int, int, int, int, void *);
+/* f5 d1=43 d4 */ int IOCS_S_REZEROUNIT(int);
+/* f5 d1=44 d3 d4 a1 */ int IOCS_S_REQUEST(int, int, void *);
+/* f5 d1=45 d2 d4 */ int IOCS_S_SEEK(int, int);
+/* f5 d1=47 d3 d4 */ int IOCS_S_STARTSTOP(int, int);
+/* f5 d1=49 d3 d4 a1 */ int IOCS_S_REASSIGN(int, int, void *);
+/* f5 d1=50 d3 d4 */ int IOCS_S_PAMEDIUM(int, int);
#endif /* __X68K_IOCS_H__ */
diff --git a/sys/arch/x68k/stand/loadbsd/loadbsd.c b/sys/arch/x68k/stand/loadbsd/loadbsd.c
index 12f4e2b34e7..d8e51b233c2 100644
--- a/sys/arch/x68k/stand/loadbsd/loadbsd.c
+++ b/sys/arch/x68k/stand/loadbsd/loadbsd.c
@@ -19,13 +19,13 @@
* -q quiet boot
* -v verbose boot (also turn on verbosity of loadbsd)
*
- * $NetBSD: loadbsd.c,v 1.9 2005/12/24 22:45:40 perry Exp $
+ * $NetBSD: loadbsd.c,v 1.10 2009/03/14 14:46:07 dsl Exp $
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: loadbsd.c,v 1.9 2005/12/24 22:45:40 perry Exp $");
-#define VERSION "$Revision: 1.9 $ $Date: 2005/12/24 22:45:40 $"
+__RCSID("$NetBSD: loadbsd.c,v 1.10 2009/03/14 14:46:07 dsl Exp $");
+#define VERSION "$Revision: 1.10 $ $Date: 2009/03/14 14:46:07 $"
#include <sys/types.h> /* ntohl */
#include <sys/reboot.h>
@@ -47,16 +47,16 @@ __RCSID("$NetBSD: loadbsd.c,v 1.9 2005/12/24 22:45:40 perry Exp $");
#define GETDECIMAL(var, str) \
do { var *= 10; var += *str++ - '0'; } while (ISDIGIT(*str))
-static const char *lookupif __P((const char *name,
- unsigned *pif, unsigned *punit));
-static void get_current_scsi_interface __P((unsigned *pif, unsigned *punit));
-static int bootdev __P((const char *devstr));
-static struct tramparg *read_kernel __P((const char *fn));
-static int chkmpu __P((void));
-static __dead void usage __P((int status, const char *msg))
+static const char *lookupif(const char *name,
+ unsigned *pif, unsigned *punit);
+static void get_current_scsi_interface(unsigned *pif, unsigned *punit);
+static int bootdev(const char *devstr);
+static struct tramparg *read_kernel(const char *fn);
+static int chkmpu(void);
+static __dead void usage(int status, const char *msg)
__attribute__((noreturn));
-int main __P((int argc, char *argv[]));
+int main(int argc, char *argv[]);
int opt_v;
int opt_N;
@@ -567,7 +567,7 @@ main(argc, argv)
if (opt_N)
xerrx(0, "But don't actually do it.");
- DOS_SUPER_JSR((void (*) __P((void))) tramp, &regs, &regs);
+ DOS_SUPER_JSR((void (*)(void)) tramp, &regs, &regs);
/* NOTREACHED */
diff --git a/sys/arch/x68k/stand/newdisk/newdisk.c b/sys/arch/x68k/stand/newdisk/newdisk.c
index c2121632304..02c104bc5f9 100644
--- a/sys/arch/x68k/stand/newdisk/newdisk.c
+++ b/sys/arch/x68k/stand/newdisk/newdisk.c
@@ -55,8 +55,8 @@ const char copyright[] = "NetBSD/x68k SCSI Primary Boot. ";
int verbose = 0, dry_run = 0, force = 0, check_only = 0, mark_only = 0;
-void usage __P((void)) __attribute__((__noreturn__));
-int main __P((int, char *[]));
+void usage(void) __attribute__((__noreturn__));
+int main(int, char *[]);
void
usage(void)
diff --git a/sys/arch/x68k/usr.bin/rtcalarm/rtcalarm.c b/sys/arch/x68k/usr.bin/rtcalarm/rtcalarm.c
index d4665012db7..990241e8c2a 100644
--- a/sys/arch/x68k/usr.bin/rtcalarm/rtcalarm.c
+++ b/sys/arch/x68k/usr.bin/rtcalarm/rtcalarm.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtcalarm.c,v 1.6 2008/12/20 13:20:59 isaki Exp $ */
+/* $NetBSD: rtcalarm.c,v 1.7 2009/03/14 14:46:08 dsl Exp $ */
/*
* Copyright (c) 1995 MINOURA Makoto.
* All rights reserved.
@@ -46,17 +46,17 @@
char *prog;
-static void usage __P((void)) __attribute__((__noreturn__));
-static void myperror __P((const char *, int)) __attribute__((__noreturn__));
+static void usage(void) __attribute__((__noreturn__));
+static void myperror(const char *, int) __attribute__((__noreturn__));
-static void showinfo __P((void));
-static char *numstr __P((unsigned int));
-static void showontime __P((unsigned int));
+static void showinfo(void);
+static char *numstr(unsigned int);
+static void showontime(unsigned int);
-static void disablealarm __P((void));
+static void disablealarm(void);
-static void setinfo __P((int, char **));
-static int strnum __P((const char *, int));
+static void setinfo(int, char **);
+static int strnum(const char *, int);
int
main(argc, argv)
diff --git a/sys/arch/x86/isa/isa_machdep.c b/sys/arch/x86/isa/isa_machdep.c
index 5bbe3452c5e..df7e834c5f1 100644
--- a/sys/arch/x86/isa/isa_machdep.c
+++ b/sys/arch/x86/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.24 2008/12/18 12:18:20 cegger Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.25 2009/03/14 14:46:08 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.24 2008/12/18 12:18:20 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.25 2009/03/14 14:46:08 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,7 +119,7 @@ struct x86_bus_dma_tag isa_bus_dma_tag = {
};
#define IDTVEC(name) __CONCAT(X,name)
-typedef void (vector) __P((void));
+typedef void (vector)(void);
extern vector *IDTVEC(intr)[];
#define LEGAL_IRQ(x) ((x) >= 0 && (x) < NUM_LEGACY_IRQS && (x) != 2)
diff --git a/sys/arch/x86/x86/bus_dma.c b/sys/arch/x86/x86/bus_dma.c
index 6945ed6f475..cc623f133dc 100644
--- a/sys/arch/x86/x86/bus_dma.c
+++ b/sys/arch/x86/x86/bus_dma.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.48 2009/02/20 05:54:40 cegger Exp $ */
+/* $NetBSD: bus_dma.c,v 1.49 2009/03/14 14:46:08 dsl Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.48 2009/02/20 05:54:40 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.49 2009/03/14 14:46:08 dsl Exp $");
/*
* The following is included because _bus_dma_uiomove is derived from
@@ -106,7 +106,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.48 2009/02/20 05:54:40 cegger Exp $");
extern paddr_t avail_end;
#define IDTVEC(name) __CONCAT(X,name)
-typedef void (vector) __P((void));
+typedef void (vector)(void);
extern vector *IDTVEC(intr)[];
#define BUSDMA_BOUNCESTATS
diff --git a/sys/arch/xen/xen/isa_machdep.c b/sys/arch/xen/xen/isa_machdep.c
index f5f1d7b4f7a..13c0e7bd1a4 100644
--- a/sys/arch/xen/xen/isa_machdep.c
+++ b/sys/arch/xen/xen/isa_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.14 2009/03/10 17:21:57 bouyer Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.15 2009/03/14 14:46:08 dsl Exp $ */
/* NetBSD isa_machdep.c,v 1.11 2004/06/20 18:04:08 thorpej Exp */
/*-
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.14 2009/03/10 17:21:57 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.15 2009/03/14 14:46:08 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -122,7 +122,7 @@ struct x86_bus_dma_tag isa_bus_dma_tag = {
};
#define IDTVEC(name) __CONCAT(X,name)
-typedef void (vector) __P((void));
+typedef void (vector)(void);
extern vector *IDTVEC(intr)[];
#define LEGAL_IRQ(x) ((x) >= 0 && (x) < NUM_LEGACY_IRQS && (x) != 2)
@@ -148,7 +148,7 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg)
int irq;
int type;
int level;
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
{
int evtch;
diff --git a/sys/arch/xen/xen/pciide_machdep.c b/sys/arch/xen/xen/pciide_machdep.c
index 52c226a5e5e..26e49e7e949 100644
--- a/sys/arch/xen/xen/pciide_machdep.c
+++ b/sys/arch/xen/xen/pciide_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_machdep.c,v 1.12 2009/03/10 17:21:57 bouyer Exp $ */
+/* $NetBSD: pciide_machdep.c,v 1.13 2009/03/14 14:46:08 dsl Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.12 2009/03/10 17:21:57 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.13 2009/03/14 14:46:08 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,7 +68,7 @@ pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
struct device *dev;
struct pci_attach_args *pa;
int chan;
- int (*func) __P((void *));
+ int (*func)(void *);
void *arg;
{
struct pintrhand *ih;
diff --git a/sys/crypto/blowfish/blowfish.h b/sys/crypto/blowfish/blowfish.h
index 676123df66e..3cf2f4a1177 100644
--- a/sys/crypto/blowfish/blowfish.h
+++ b/sys/crypto/blowfish/blowfish.h
@@ -1,4 +1,4 @@
-/* $NetBSD: blowfish.h,v 1.7 2005/12/11 12:20:48 christos Exp $ */
+/* $NetBSD: blowfish.h,v 1.8 2009/03/14 14:46:08 dsl Exp $ */
/* $KAME: blowfish.h,v 1.10 2000/09/18 21:21:20 itojun Exp $ */
/* crypto/bf/blowfish.h */
@@ -80,9 +80,9 @@ typedef struct bf_key_st {
BF_LONG S[4*256];
} BF_KEY;
-void BF_set_key __P((BF_KEY *, int, const unsigned char *));
-void BF_encrypt __P((BF_LONG *, const BF_KEY *));
-void BF_decrypt __P((BF_LONG *, const BF_KEY *));
+void BF_set_key(BF_KEY *, int, const unsigned char *);
+void BF_encrypt(BF_LONG *, const BF_KEY *);
+void BF_decrypt(BF_LONG *, const BF_KEY *);
void BF_cbc_encrypt(const unsigned char *, unsigned char *, long,
const BF_KEY *, unsigned char *, int);
void BF_ecb_encrypt(const unsigned char *, unsigned char *,
diff --git a/sys/crypto/des/des.h b/sys/crypto/des/des.h
index 30e09e7dad1..0810db1f121 100644
--- a/sys/crypto/des/des.h
+++ b/sys/crypto/des/des.h
@@ -1,4 +1,4 @@
-/* $NetBSD: des.h,v 1.7 2005/12/11 12:20:52 christos Exp $ */
+/* $NetBSD: des.h,v 1.8 2009/03/14 14:46:08 dsl Exp $ */
/* $KAME: des.h,v 1.7 2000/09/18 20:59:21 itojun Exp $ */
/* lib/des/des.h */
@@ -81,35 +81,35 @@ typedef struct des_ks_struct
extern int des_check_key; /* defaults to false */
-char *des_options __P((void));
-void des_ecb_encrypt __P((des_cblock *, des_cblock *,
- des_key_schedule, int));
+char *des_options(void);
+void des_ecb_encrypt(des_cblock *, des_cblock *,
+ des_key_schedule, int);
-void des_encrypt1 __P((DES_LONG *, des_key_schedule, int));
-void des_encrypt2 __P((DES_LONG *, des_key_schedule, int));
-void des_encrypt3 __P((DES_LONG *, des_key_schedule, des_key_schedule,
- des_key_schedule));
-void des_decrypt3 __P((DES_LONG *, des_key_schedule, des_key_schedule,
- des_key_schedule));
+void des_encrypt1(DES_LONG *, des_key_schedule, int);
+void des_encrypt2(DES_LONG *, des_key_schedule, int);
+void des_encrypt3(DES_LONG *, des_key_schedule, des_key_schedule,
+ des_key_schedule);
+void des_decrypt3(DES_LONG *, des_key_schedule, des_key_schedule,
+ des_key_schedule);
-void des_ecb3_encrypt __P((des_cblock *, des_cblock *, des_key_schedule,
- des_key_schedule, des_key_schedule, int));
+void des_ecb3_encrypt(des_cblock *, des_cblock *, des_key_schedule,
+ des_key_schedule, des_key_schedule, int);
-void des_ncbc_encrypt __P((const unsigned char *, unsigned char *, long,
- des_key_schedule, des_cblock *, int));
+void des_ncbc_encrypt(const unsigned char *, unsigned char *, long,
+ des_key_schedule, des_cblock *, int);
void des_ede3_cbc_encrypt(const unsigned char *, unsigned char *, long,
des_key_schedule, des_key_schedule,
des_key_schedule, des_cblock *, int);
-void des_set_odd_parity __P((des_cblock *));
-void des_fixup_key_parity __P((des_cblock *));
-int des_is_weak_key __P((des_cblock *));
-int des_set_key __P((des_cblock *, des_key_schedule));
-int des_key_sched __P((des_cblock *, des_key_schedule));
-int des_set_key_checked __P((des_cblock *, des_key_schedule));
-void des_set_key_unchecked __P((des_cblock *, des_key_schedule));
-int des_check_key_parity __P((des_cblock *));
+void des_set_odd_parity(des_cblock *);
+void des_fixup_key_parity(des_cblock *);
+int des_is_weak_key(des_cblock *);
+int des_set_key(des_cblock *, des_key_schedule);
+int des_key_sched(des_cblock *, des_key_schedule);
+int des_set_key_checked(des_cblock *, des_key_schedule);
+void des_set_key_unchecked(des_cblock *, des_key_schedule);
+int des_check_key_parity(des_cblock *);
#ifdef __cplusplus
}
diff --git a/sys/ddb/db_output.h b/sys/ddb/db_output.h
index 3d848c690dd..694afc26234 100644
--- a/sys/ddb/db_output.h
+++ b/sys/ddb/db_output.h
@@ -1,4 +1,4 @@
-/* $NetBSD: db_output.h,v 1.17 2002/06/05 17:53:52 drochner Exp $ */
+/* $NetBSD: db_output.h,v 1.18 2009/03/14 14:46:08 dsl Exp $ */
/*
* Mach Operating System
@@ -37,7 +37,7 @@ void db_putchar(int);
int db_print_position(void);
void db_printf(const char *, ...)
__attribute__((__format__(__printf__,1,2)));
-void db_vprintf __P((const char *, _BSD_VA_LIST_));
+void db_vprintf(const char *, _BSD_VA_LIST_);
void db_format_radix(char *, size_t, quad_t, int);
void db_format_hex(char *, size_t, quad_t, int);
void db_end_line(void);
diff --git a/sys/dev/ic/mb86950.c b/sys/dev/ic/mb86950.c
index 62081069c0a..8eed45836cd 100644
--- a/sys/dev/ic/mb86950.c
+++ b/sys/dev/ic/mb86950.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86950.c,v 1.12 2008/11/07 00:20:02 dyoung Exp $ */
+/* $NetBSD: mb86950.c,v 1.13 2009/03/14 14:46:08 dsl 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.12 2008/11/07 00:20:02 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.13 2009/03/14 14:46:08 dsl Exp $");
/*
* Device driver for Fujitsu mb86950 based Ethernet cards.
@@ -167,26 +167,26 @@ __KERNEL_RCSID(0, "$NetBSD: mb86950.c,v 1.12 2008/11/07 00:20:02 dyoung Exp $");
#endif /* __BUS_SPACE_HAS_STREAM_METHODS */
/* Standard driver entry points. These can be static. */
-int mb86950_ioctl __P((struct ifnet *, u_long, void *));
-void mb86950_init __P((struct mb86950_softc *));
-void mb86950_start __P((struct ifnet *));
-void mb86950_watchdog __P((struct ifnet *));
-void mb86950_reset __P((struct mb86950_softc *));
+int mb86950_ioctl(struct ifnet *, u_long, void *);
+void mb86950_init(struct mb86950_softc *);
+void mb86950_start(struct ifnet *);
+void mb86950_watchdog(struct ifnet *);
+void mb86950_reset(struct mb86950_softc *);
/* Local functions. */
-void mb86950_stop __P((struct mb86950_softc *));
-void mb86950_tint __P((struct mb86950_softc *, u_int8_t));
-void mb86950_rint __P((struct mb86950_softc *, u_int8_t));
-int mb86950_get_fifo __P((struct mb86950_softc *, u_int));
-ushort mb86950_put_fifo __P((struct mb86950_softc *, struct mbuf *));
-void mb86950_drain_fifo __P((struct mb86950_softc *));
+void mb86950_stop(struct mb86950_softc *);
+void mb86950_tint(struct mb86950_softc *, u_int8_t);
+void mb86950_rint(struct mb86950_softc *, u_int8_t);
+int mb86950_get_fifo(struct mb86950_softc *, u_int);
+ushort mb86950_put_fifo(struct mb86950_softc *, struct mbuf *);
+void mb86950_drain_fifo(struct mb86950_softc *);
-int mb86950_mediachange __P((struct ifnet *));
-void mb86950_mediastatus __P((struct ifnet *, struct ifmediareq *));
+int mb86950_mediachange(struct ifnet *);
+void mb86950_mediastatus(struct ifnet *, struct ifmediareq *);
#if ESTAR_DEBUG >= 1
-void mb86950_dump __P((int, struct mb86950_softc *));
+void mb86950_dump(int, struct mb86950_softc *);
#endif
/********************************************************************/
diff --git a/sys/dev/ic/mb86950var.h b/sys/dev/ic/mb86950var.h
index dd855354b7a..cd95b7dfe25 100644
--- a/sys/dev/ic/mb86950var.h
+++ b/sys/dev/ic/mb86950var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86950var.h,v 1.3 2005/12/11 12:21:27 christos Exp $ */
+/* $NetBSD: mb86950var.h,v 1.4 2009/03/14 14:46:09 dsl Exp $ */
/*
* Copyright (c) 1995 Mika Kortelainen
@@ -68,12 +68,12 @@ struct mb86950_softc {
#define ESTAR_STAT_ENABLED 0x0001 /* power enabled on interface */
#define ESTAR_STAT_ATTACHED 0x0002 /* attach has succeeded */
- int (*sc_enable) __P((struct mb86950_softc *));
- void (*sc_disable) __P((struct mb86950_softc *));
+ int (*sc_enable)(struct mb86950_softc *);
+ void (*sc_disable)(struct mb86950_softc *);
- int (*sc_mediachange) __P((struct mb86950_softc *));
- void (*sc_mediastatus) __P((struct mb86950_softc *,
- struct ifmediareq *));
+ int (*sc_mediachange)(struct mb86950_softc *);
+ void (*sc_mediastatus)(struct mb86950_softc *,
+ struct ifmediareq *);
};
@@ -82,10 +82,10 @@ struct mb86950_softc {
#define GOOD_PKT 0x20
-void mb86950_attach __P((struct mb86950_softc *, u_int8_t *));
-void mb86950_config __P((struct mb86950_softc *, int *, int, int));
-int mb86950_intr __P((void *));
-int mb86950_enable __P((struct mb86950_softc *));
-void mb86950_disable __P((struct mb86950_softc *));
-int mb86950_activate __P((struct device *, enum devact));
-int mb86950_detach __P((struct mb86950_softc *));
+void mb86950_attach(struct mb86950_softc *, u_int8_t *);
+void mb86950_config(struct mb86950_softc *, int *, int, int);
+int mb86950_intr(void *);
+int mb86950_enable(struct mb86950_softc *);
+void mb86950_disable(struct mb86950_softc *);
+int mb86950_activate(struct device *, enum devact);
+int mb86950_detach(struct mb86950_softc *);
diff --git a/sys/dev/mca/if_tra_mca.c b/sys/dev/mca/if_tra_mca.c
index 16ae75794ef..fdd3dddf0a7 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.10 2008/04/28 20:23:53 martin Exp $ */
+/* $NetBSD: if_tra_mca.c,v 1.11 2009/03/14 14:46:09 dsl Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.10 2008/04/28 20:23:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.11 2009/03/14 14:46:09 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,8 +56,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_tra_mca.c,v 1.10 2008/04/28 20:23:53 martin Exp $
#include <dev/mca/mcavar.h>
#include <dev/mca/mcadevs.h>
-int tiara_mca_match __P((struct device *, struct cfdata *, void *));
-void tiara_mca_attach __P((struct device *, struct device *, void *));
+int tiara_mca_match(struct device *, struct cfdata *, void *);
+void tiara_mca_attach(struct device *, struct device *, void *);
#define TIARA_NPORTS 0x20 /* 32 */
#define TIARA_PROM_ID 24 /* offset to mac addr stored in prom */
@@ -82,7 +82,7 @@ static const struct tiara_mca_product {
{ 0, NULL },
};
-static const struct tiara_mca_product *tiara_mca_lookup __P((u_int32_t));
+static const struct tiara_mca_product *tiara_mca_lookup(u_int32_t);
static const struct tiara_mca_product *
tiara_mca_lookup(id)
diff --git a/sys/dist/ipf/netinet/fil.c b/sys/dist/ipf/netinet/fil.c
index 1ed4079555b..cce93e9fc68 100644
--- a/sys/dist/ipf/netinet/fil.c
+++ b/sys/dist/ipf/netinet/fil.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fil.c,v 1.43 2008/05/20 07:08:07 darrenr Exp $ */
+/* $NetBSD: fil.c,v 1.44 2009/03/14 14:46:09 dsl Exp $ */
/*
* Copyright (C) 1993-2003 by Darren Reed.
@@ -20,6 +20,7 @@
# if (__NetBSD_Version__ < 301000000)
# include "opt_ipfilter_log.h"
# else
+# include <sys/cdefs.h>
# include "opt_ipfilter.h"
# endif
# endif
@@ -154,7 +155,7 @@ struct file;
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.43 2008/05/20 07:08:07 darrenr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fil.c,v 1.44 2009/03/14 14:46:09 dsl Exp $");
#else
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: fil.c,v 2.243.2.131 2008/04/09 10:47:28 darrenr Exp";
diff --git a/sys/fs/adosfs/adosfs.h b/sys/fs/adosfs/adosfs.h
index 899bb6f26e8..eeb4e0120a4 100644
--- a/sys/fs/adosfs/adosfs.h
+++ b/sys/fs/adosfs/adosfs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: adosfs.h,v 1.9 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: adosfs.h,v 1.10 2009/03/14 14:46:09 dsl Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -159,24 +159,24 @@ extern struct pool adosfs_node_pool;
* utility protos
*/
#if BYTE_ORDER != BIG_ENDIAN
-u_int32_t adoswordn __P((struct buf *, int));
+u_int32_t adoswordn(struct buf *, int);
#else
#define adoswordn(bp,wn) (*((u_int32_t *)(bp)->b_data + (wn)))
#endif
-u_int32_t adoscksum __P((struct buf *, int));
-int adoscaseequ __P((const u_char *, const u_char *, int, int));
-int adoshash __P((const u_char *, int, int, int));
-int adunixprot __P((int));
-int adosfs_getblktype __P((struct adosfsmount *, struct buf *));
+u_int32_t adoscksum(struct buf *, int);
+int adoscaseequ(const u_char *, const u_char *, int, int);
+int adoshash(const u_char *, int, int, int);
+int adunixprot(int);
+int adosfs_getblktype(struct adosfsmount *, struct buf *);
-struct vnode *adosfs_ahashget __P((struct mount *, ino_t));
-void adosfs_ainshash __P((struct adosfsmount *, struct anode *));
-void adosfs_aremhash __P((struct anode *));
+struct vnode *adosfs_ahashget(struct mount *, ino_t);
+void adosfs_ainshash(struct adosfsmount *, struct anode *);
+void adosfs_aremhash(struct anode *);
-int adosfs_lookup __P((void *));
+int adosfs_lookup(void *);
-extern int (**adosfs_vnodeop_p) __P((void *));
+extern int (**adosfs_vnodeop_p)(void *);
#endif /* _KERNEL */
#endif /* _ADOSFS_ADOSFS_H_ */
diff --git a/sys/fs/adosfs/adutil.c b/sys/fs/adosfs/adutil.c
index 487e37ec905..fd8e4772804 100644
--- a/sys/fs/adosfs/adutil.c
+++ b/sys/fs/adosfs/adutil.c
@@ -1,4 +1,4 @@
-/* $NetBSD: adutil.c,v 1.8 2008/01/30 09:50:19 ad Exp $ */
+/* $NetBSD: adutil.c,v 1.9 2009/03/14 14:46:09 dsl Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adutil.c,v 1.8 2008/01/30 09:50:19 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adutil.c,v 1.9 2009/03/14 14:46:09 dsl Exp $");
#include <sys/param.h>
#include <sys/vnode.h>
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: adutil.c,v 1.8 2008/01/30 09:50:19 ad Exp $");
* look for anode in the mount's hash table, return locked.
*/
#define AHASH(an) ((an) & (ANODEHASHSZ - 1))
-static int CapitalChar __P((int, int));
+static int CapitalChar(int, int);
extern struct simplelock adosfs_hashlock;
diff --git a/sys/fs/adosfs/advfsops.c b/sys/fs/adosfs/advfsops.c
index f0fde2fe0d8..e0400f139ab 100644
--- a/sys/fs/adosfs/advfsops.c
+++ b/sys/fs/adosfs/advfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.53 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: advfsops.c,v 1.54 2009/03/14 14:46:09 dsl Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.53 2008/06/28 01:34:05 rumble Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advfsops.c,v 1.54 2009/03/14 14:46:09 dsl Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -67,8 +67,8 @@ VFS_PROTOS(adosfs);
static struct sysctllog *adosfs_sysctl_log;
-int adosfs_mountfs __P((struct vnode *, struct mount *, struct lwp *));
-int adosfs_loadbitmap __P((struct adosfsmount *));
+int adosfs_mountfs(struct vnode *, struct mount *, struct lwp *);
+int adosfs_loadbitmap(struct adosfsmount *);
struct simplelock adosfs_hashlock;
@@ -82,7 +82,7 @@ static const struct genfs_ops adosfs_genfsops = {
.gop_size = genfs_size,
};
-int (**adosfs_vnodeop_p) __P((void *));
+int (**adosfs_vnodeop_p)(void *);
int
adosfs_mount(mp, path, data, data_len)
diff --git a/sys/fs/adosfs/advnops.c b/sys/fs/adosfs/advnops.c
index 04db8eec303..cf3d0f6b84c 100644
--- a/sys/fs/adosfs/advnops.c
+++ b/sys/fs/adosfs/advnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: advnops.c,v 1.31 2008/12/16 16:18:25 pooka Exp $ */
+/* $NetBSD: advnops.c,v 1.32 2009/03/14 14:46:09 dsl Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.31 2008/12/16 16:18:25 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.32 2009/03/14 14:46:09 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,24 +58,24 @@ __KERNEL_RCSID(0, "$NetBSD: advnops.c,v 1.31 2008/12/16 16:18:25 pooka Exp $");
extern struct vnodeops adosfs_vnodeops;
#define adosfs_open genfs_nullop
-int adosfs_getattr __P((void *));
-int adosfs_read __P((void *));
-int adosfs_write __P((void *));
+int adosfs_getattr(void *);
+int adosfs_read(void *);
+int adosfs_write(void *);
#define adosfs_fcntl genfs_fcntl
#define adosfs_ioctl genfs_enoioctl
#define adosfs_poll genfs_poll
-int adosfs_strategy __P((void *));
-int adosfs_link __P((void *));
-int adosfs_symlink __P((void *));
+int adosfs_strategy(void *);
+int adosfs_link(void *);
+int adosfs_symlink(void *);
#define adosfs_abortop genfs_abortop
-int adosfs_bmap __P((void *));
-int adosfs_print __P((void *));
-int adosfs_readdir __P((void *));
-int adosfs_access __P((void *));
-int adosfs_readlink __P((void *));
-int adosfs_inactive __P((void *));
-int adosfs_reclaim __P((void *));
-int adosfs_pathconf __P((void *));
+int adosfs_bmap(void *);
+int adosfs_print(void *);
+int adosfs_readdir(void *);
+int adosfs_access(void *);
+int adosfs_readlink(void *);
+int adosfs_inactive(void *);
+int adosfs_reclaim(void *);
+int adosfs_pathconf(void *);
#define adosfs_close genfs_nullop
#define adosfs_fsync genfs_nullop
diff --git a/sys/fs/filecorefs/filecore_extern.h b/sys/fs/filecorefs/filecore_extern.h
index 743cfca29a6..f63cdd23fcb 100644
--- a/sys/fs/filecorefs/filecore_extern.h
+++ b/sys/fs/filecorefs/filecore_extern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_extern.h,v 1.18 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: filecore_extern.h,v 1.19 2009/03/14 14:46:09 dsl Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@@ -110,9 +110,9 @@ extern struct pool filecore_node_pool;
VFS_PROTOS(filecore);
-extern int (**filecore_vnodeop_p) __P((void *));
+extern int (**filecore_vnodeop_p)(void *);
-int filecore_bbchecksum __P((void *));
-int filecore_bread __P((struct filecore_mnt *, u_int32_t, int,
- kauth_cred_t, struct buf **));
-int filecore_map __P((struct filecore_mnt *, u_int32_t, daddr_t, daddr_t *));
+int filecore_bbchecksum(void *);
+int filecore_bread(struct filecore_mnt *, u_int32_t, int,
+ kauth_cred_t, struct buf **);
+int filecore_map(struct filecore_mnt *, u_int32_t, daddr_t, daddr_t *);
diff --git a/sys/fs/filecorefs/filecore_node.h b/sys/fs/filecorefs/filecore_node.h
index 24fe2c81860..16371a0d9b9 100644
--- a/sys/fs/filecorefs/filecore_node.h
+++ b/sys/fs/filecorefs/filecore_node.h
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_node.h,v 1.4 2005/12/03 17:34:43 christos Exp $ */
+/* $NetBSD: filecore_node.h,v 1.5 2009/03/14 14:46:09 dsl Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@@ -113,35 +113,35 @@ struct filecore_node {
/*
* Prototypes for Filecore vnode operations
*/
-int filecore_lookup __P((void *));
+int filecore_lookup(void *);
#define filecore_open genfs_nullop
#define filecore_close genfs_nullop
-int filecore_access __P((void *));
-int filecore_getattr __P((void *));
-int filecore_read __P((void *));
+int filecore_access(void *);
+int filecore_getattr(void *);
+int filecore_read(void *);
#define filecore_poll genfs_poll
#define filecore_mmap genfs_mmap
#define filecore_seek genfs_seek
-int filecore_readdir __P((void *));
-int filecore_readlink __P((void *));
+int filecore_readdir(void *);
+int filecore_readlink(void *);
#define filecore_abortop genfs_abortop
-int filecore_inactive __P((void *));
-int filecore_reclaim __P((void *));
-int filecore_link __P((void *));
-int filecore_symlink __P((void *));
-int filecore_bmap __P((void *));
-int filecore_strategy __P((void *));
-int filecore_print __P((void *));
-int filecore_pathconf __P((void *));
-int filecore_blkatoff __P((void *));
+int filecore_inactive(void *);
+int filecore_reclaim(void *);
+int filecore_link(void *);
+int filecore_symlink(void *);
+int filecore_bmap(void *);
+int filecore_strategy(void *);
+int filecore_print(void *);
+int filecore_pathconf(void *);
+int filecore_blkatoff(void *);
-struct vnode *filecore_ihashget __P((dev_t, ino_t));
-void filecore_ihashins __P((struct filecore_node *));
-void filecore_ihashrem __P((struct filecore_node *));
+struct vnode *filecore_ihashget(dev_t, ino_t);
+void filecore_ihashins(struct filecore_node *);
+void filecore_ihashrem(struct filecore_node *);
-mode_t filecore_mode __P((struct filecore_node *));
-struct timespec filecore_time __P((struct filecore_node *));
-ino_t filecore_getparent __P((struct filecore_node *));
-int filecore_fn2unix __P((char *, char *, u_int16_t *));
-int filecore_fncmp __P((const char *, const char *, u_short));
-int filecore_dbread __P((struct filecore_node *, struct buf **));
+mode_t filecore_mode(struct filecore_node *);
+struct timespec filecore_time(struct filecore_node *);
+ino_t filecore_getparent(struct filecore_node *);
+int filecore_fn2unix(char *, char *, u_int16_t *);
+int filecore_fncmp(const char *, const char *, u_short);
+int filecore_dbread(struct filecore_node *, struct buf **);
diff --git a/sys/fs/filecorefs/filecore_vfsops.c b/sys/fs/filecorefs/filecore_vfsops.c
index de89a5de9e9..e05c359b138 100644
--- a/sys/fs/filecorefs/filecore_vfsops.c
+++ b/sys/fs/filecorefs/filecore_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_vfsops.c,v 1.55 2008/06/28 01:34:05 rumble Exp $ */
+/* $NetBSD: filecore_vfsops.c,v 1.56 2009/03/14 14:46:09 dsl Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.55 2008/06/28 01:34:05 rumble Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vfsops.c,v 1.56 2009/03/14 14:46:09 dsl Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -191,8 +191,8 @@ filecorefs_modcmd(modcmd_t cmd, void *arg)
* Name is updated by mount(8) after booting.
*/
-static int filecore_mountfs __P((struct vnode *devvp, struct mount *mp,
- struct lwp *l, struct filecore_args *argp));
+static int filecore_mountfs(struct vnode *devvp, struct mount *mp,
+ struct lwp *l, struct filecore_args *argp);
#if 0
int
diff --git a/sys/fs/filecorefs/filecore_vnops.c b/sys/fs/filecorefs/filecore_vnops.c
index 6b83d801439..0200ae98536 100644
--- a/sys/fs/filecorefs/filecore_vnops.c
+++ b/sys/fs/filecorefs/filecore_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: filecore_vnops.c,v 1.28 2008/11/26 20:17:33 pooka Exp $ */
+/* $NetBSD: filecore_vnops.c,v 1.29 2009/03/14 14:46:09 dsl Exp $ */
/*-
* Copyright (c) 1994 The Regents of the University of California.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.28 2008/11/26 20:17:33 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: filecore_vnops.c,v 1.29 2009/03/14 14:46:09 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -546,7 +546,7 @@ filecore_pathconf(v)
/*
* Global vfs data structures for filecore
*/
-int (**filecore_vnodeop_p) __P((void *));
+int (**filecore_vnodeop_p)(void *);
const struct vnodeopv_entry_desc filecore_vnodeop_entries[] = {
{ &vop_default_desc, vn_default_error },
{ &vop_lookup_desc, filecore_lookup }, /* lookup */
diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c
index 8434e58fb80..5ddc5507c4a 100644
--- a/sys/fs/udf/udf_vnops.c
+++ b/sys/fs/udf/udf_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vnops.c,v 1.36 2009/02/11 13:08:08 reinoud Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.37 2009/03/14 14:46:09 dsl Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.36 2009/02/11 13:08:08 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.37 2009/03/14 14:46:09 dsl Exp $");
#endif /* not lint */
@@ -2202,7 +2202,7 @@ udf_advlock(void *v)
/* Global vfs vnode data structures for udfs */
-int (**udf_vnodeop_p) __P((void *));
+int (**udf_vnodeop_p)(void *);
const struct vnodeopv_entry_desc udf_vnodeop_entries[] = {
{ &vop_default_desc, vn_default_error },
diff --git a/sys/ipkdb/ipkdb.h b/sys/ipkdb/ipkdb.h
index c6ec1b9d155..e152caebb43 100644
--- a/sys/ipkdb/ipkdb.h
+++ b/sys/ipkdb/ipkdb.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ipkdb.h,v 1.5 2007/01/13 18:54:43 cube Exp $ */
+/* $NetBSD: ipkdb.h,v 1.6 2009/03/14 14:46:09 dsl Exp $ */
/*
* Copyright (C) 1993-2000 Wolfgang Solfrank.
@@ -56,10 +56,10 @@ struct ipkdb_if {
/* Data from here on is to be filled by the driver */
const char *name;
void *port;
- void (*start) __P((struct ipkdb_if *));
- void (*leave) __P((struct ipkdb_if *));
- int (*receive) __P((struct ipkdb_if *, u_char *, int));
- void (*send) __P((struct ipkdb_if *, u_char *, int));
+ void (*start)(struct ipkdb_if *);
+ void (*leave)(struct ipkdb_if *);
+ int (*receive)(struct ipkdb_if *, u_char *, int);
+ void (*send)(struct ipkdb_if *, u_char *, int);
};
/* flags: */
@@ -72,10 +72,10 @@ struct ipkdb_if {
/*
* Interface routines, to be called by machine dependent code.
*/
-extern void ipkdb_init __P((void));
-extern void ipkdb_connect __P((int));
-extern void ipkdb_panic __P((void));
-extern int ipkdbcmds __P((void));
+extern void ipkdb_init(void);
+extern void ipkdb_connect(int);
+extern void ipkdb_panic(void);
+extern int ipkdbcmds(void);
/* Return values from ipkdbcmds: */
#define IPKDB_CMD_RUN 0
#define IPKDB_CMD_STEP 1
@@ -84,31 +84,31 @@ extern int ipkdbcmds __P((void));
/* To be called by udp_input on receipt of a possible debugging packet */
struct in_addr;
struct mbuf;
-extern int checkipkdb __P((struct in_addr *, u_short, u_short,
- struct mbuf *, int, int));
+extern int checkipkdb(struct in_addr *, u_short, u_short,
+ struct mbuf *, int, int);
/*
* Interface routines, to be called by ipkdb itself.
*/
-extern int ipkdbifinit __P((struct ipkdb_if *));
+extern int ipkdbifinit(struct ipkdb_if *);
/*
* Utilities (used to avoid calling system routines during debugging).
*/
-extern void ipkdbcopy __P((const void *, void *, int));
-extern void ipkdbzero __P((void *, int));
-extern int ipkdbcmp __P((void *, void *, int));
+extern void ipkdbcopy(const void *, void *, int);
+extern void ipkdbzero(void *, int);
+extern int ipkdbcmp(void *, void *, int);
/*
* Machine dependent routines for IPKDB.
*/
-extern void ipkdbinit __P((void));
-extern void ipkdb_trap __P((void));
-extern int ipkdb_poll __P((void));
+extern void ipkdbinit(void);
+extern void ipkdb_trap(void);
+extern int ipkdb_poll(void);
-extern int ipkdbif_init __P((struct ipkdb_if *));
+extern int ipkdbif_init(struct ipkdb_if *);
-extern int ipkdbfbyte __P((u_char *));
-extern int ipkdbsbyte __P((u_char *, int));
+extern int ipkdbfbyte(u_char *);
+extern int ipkdbsbyte(u_char *, int);
#endif /* _IPKDB_H */
diff --git a/sys/ipkdb/ipkdb_ipkdb.c b/sys/ipkdb/ipkdb_ipkdb.c
index 6402d6ebd2f..6a337bca8bb 100644
--- a/sys/ipkdb/ipkdb_ipkdb.c
+++ b/sys/ipkdb/ipkdb_ipkdb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ipkdb_ipkdb.c,v 1.21 2007/11/24 14:20:41 elad Exp $ */
+/* $NetBSD: ipkdb_ipkdb.c,v 1.22 2009/03/14 14:46:09 dsl Exp $ */
/*
* Copyright (C) 1993-2000 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipkdb_ipkdb.c,v 1.21 2007/11/24 14:20:41 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipkdb_ipkdb.c,v 1.22 2009/03/14 14:46:09 dsl Exp $");
#include "opt_ipkdb.h"
@@ -70,24 +70,24 @@ static char ipkdbkey[] = IPKDBKEY;
static struct ipkdb_if ipkdb_if;
-static u_char *ipkdbaddr __P((u_char *, int *, void **));
-static void peekmem __P((struct ipkdb_if *, u_char *, void *, long));
-static void pokemem __P((struct ipkdb_if *, u_char *, void *, long));
-static u_int32_t getnl __P((void *));
-static u_int getns __P((void *));
-static void setnl __P((void *, u_int32_t));
-static void setns __P((void *, int));
-static u_short cksum __P((u_short, void *, int));
-static int assemble __P((struct ipkdb_if *, void *));
-static char *inpkt __P((struct ipkdb_if *, char *, int));
-static void outpkt __P((struct ipkdb_if *, char *, int, int, int));
-static void init __P((struct ipkdb_if *));
-static void *chksum __P((void *, int));
-static void getpkt __P((struct ipkdb_if *, char *, int *));
-static void putpkt __P((struct ipkdb_if *, const char *, int));
-static int check_ipkdb __P((struct ipkdb_if *, struct in_addr *, char *, int));
-static int connectipkdb __P((struct ipkdb_if *, char *, int));
-static int hmac_init __P((void));
+static u_char *ipkdbaddr(u_char *, int *, void **);
+static void peekmem(struct ipkdb_if *, u_char *, void *, long);
+static void pokemem(struct ipkdb_if *, u_char *, void *, long);
+static u_int32_t getnl(void *);
+static u_int getns(void *);
+static void setnl(void *, u_int32_t);
+static void setns(void *, int);
+static u_short cksum(u_short, void *, int);
+static int assemble(struct ipkdb_if *, void *);
+static char *inpkt(struct ipkdb_if *, char *, int);
+static void outpkt(struct ipkdb_if *, char *, int, int, int);
+static void init(struct ipkdb_if *);
+static void *chksum(void *, int);
+static void getpkt(struct ipkdb_if *, char *, int *);
+static void putpkt(struct ipkdb_if *, const char *, int);
+static int check_ipkdb(struct ipkdb_if *, struct in_addr *, char *, int);
+static int connectipkdb(struct ipkdb_if *, char *, int);
+static int hmac_init(void);
void
ipkdb_init()
@@ -723,12 +723,12 @@ static struct ipkdb_MD5Context {
u_char in[64];
} icontext, ocontext;
-static u_int32_t getNl __P((void *));
-static void setNl __P((void *, u_int32_t));
-static void ipkdb_MD5Transform __P((struct ipkdb_MD5Context *));
-static void ipkdb_MD5Init __P((struct ipkdb_MD5Context *));
-static void ipkdb_MD5Update __P((struct ipkdb_MD5Context *, u_char *, u_int));
-static u_char *ipkdb_MD5Final __P((struct ipkdb_MD5Context *));
+static u_int32_t getNl(void *);
+static void setNl(void *, u_int32_t);
+static void ipkdb_MD5Transform(struct ipkdb_MD5Context *);
+static void ipkdb_MD5Init(struct ipkdb_MD5Context *);
+static void ipkdb_MD5Update(struct ipkdb_MD5Context *, u_char *, u_int);
+static u_char *ipkdb_MD5Final(struct ipkdb_MD5Context *);
inline static u_int32_t
getNl(vs)
diff --git a/sys/kern/subr_tftproot.c b/sys/kern/subr_tftproot.c
index b221669f670..dee17cd59fa 100644
--- a/sys/kern/subr_tftproot.c
+++ b/sys/kern/subr_tftproot.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_tftproot.c,v 1.5 2008/04/24 11:38:36 ad Exp $ */
+/* $NetBSD: subr_tftproot.c,v 1.6 2009/03/14 14:46:09 dsl Exp $ */
/*-
* Copyright (c) 2007 Emmanuel Dreyfus, all rights reserved.
@@ -39,7 +39,7 @@
#include "opt_md.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.5 2008/04/24 11:38:36 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.6 2009/03/14 14:46:09 dsl Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -117,7 +117,7 @@ struct tftproot_handle {
int tftproot_dhcpboot(struct device *);
static int tftproot_getfile(struct tftproot_handle *, struct lwp *);
-static int tftproot_recv __P((struct mbuf*, void*));
+static int tftproot_recv(struct mbuf*, void*);
int
tftproot_dhcpboot(bootdv)
diff --git a/sys/lib/libkern/__main.c b/sys/lib/libkern/__main.c
index 6da8f9229ec..c4a9f9f9619 100644
--- a/sys/lib/libkern/__main.c
+++ b/sys/lib/libkern/__main.c
@@ -1,4 +1,4 @@
-/* $NetBSD: __main.c,v 1.4 1996/03/14 18:52:03 christos Exp $ */
+/* $NetBSD: __main.c,v 1.5 2009/03/14 14:46:10 dsl Exp $ */
/*
* Copyright (c) 1993 Christopher G. Demetriou
@@ -32,7 +32,7 @@
#include <sys/types.h>
-void __main __P((void));
+void __main(void);
void
__main()
diff --git a/sys/lib/libkern/intoa.c b/sys/lib/libkern/intoa.c
index 1c6ba88f522..ab4422acb54 100644
--- a/sys/lib/libkern/intoa.c
+++ b/sys/lib/libkern/intoa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: intoa.c,v 1.1 1999/05/07 14:49:52 drochner Exp $ */
+/* $NetBSD: intoa.c,v 1.2 2009/03/14 14:46:10 dsl Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -44,7 +44,7 @@
#if defined(_KERNEL) || defined(_STANDALONE)
#include <lib/libkern/libkern.h>
#else
-char *intoa __P((u_int32_t)); /* XXX */
+char *intoa(u_int32_t); /* XXX */
#endif
/* Similar to inet_ntoa() */
diff --git a/sys/lib/libkern/libkern.h b/sys/lib/libkern/libkern.h
index 9a6bbe8907e..52d195c6367 100644
--- a/sys/lib/libkern/libkern.h
+++ b/sys/lib/libkern/libkern.h
@@ -1,4 +1,4 @@
-/* $NetBSD: libkern.h,v 1.85 2008/12/16 22:35:38 christos Exp $ */
+/* $NetBSD: libkern.h,v 1.86 2009/03/14 14:46:10 dsl Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -43,25 +43,25 @@
#define LIBKERN_BODY
#endif
-LIBKERN_INLINE int imax __P((int, int)) __unused;
-LIBKERN_INLINE int imin __P((int, int)) __unused;
-LIBKERN_INLINE u_int max __P((u_int, u_int)) __unused;
-LIBKERN_INLINE u_int min __P((u_int, u_int)) __unused;
-LIBKERN_INLINE long lmax __P((long, long)) __unused;
-LIBKERN_INLINE long lmin __P((long, long)) __unused;
-LIBKERN_INLINE u_long ulmax __P((u_long, u_long)) __unused;
-LIBKERN_INLINE u_long ulmin __P((u_long, u_long)) __unused;
-LIBKERN_INLINE int abs __P((int)) __unused;
-
-LIBKERN_INLINE int isspace __P((int)) __unused;
-LIBKERN_INLINE int isascii __P((int)) __unused;
-LIBKERN_INLINE int isupper __P((int)) __unused;
-LIBKERN_INLINE int islower __P((int)) __unused;
-LIBKERN_INLINE int isalpha __P((int)) __unused;
-LIBKERN_INLINE int isdigit __P((int)) __unused;
-LIBKERN_INLINE int isxdigit __P((int)) __unused;
-LIBKERN_INLINE int toupper __P((int)) __unused;
-LIBKERN_INLINE int tolower __P((int)) __unused;
+LIBKERN_INLINE int imax(int, int) __unused;
+LIBKERN_INLINE int imin(int, int) __unused;
+LIBKERN_INLINE u_int max(u_int, u_int) __unused;
+LIBKERN_INLINE u_int min(u_int, u_int) __unused;
+LIBKERN_INLINE long lmax(long, long) __unused;
+LIBKERN_INLINE long lmin(long, long) __unused;
+LIBKERN_INLINE u_long ulmax(u_long, u_long) __unused;
+LIBKERN_INLINE u_long ulmin(u_long, u_long) __unused;
+LIBKERN_INLINE int abs(int) __unused;
+
+LIBKERN_INLINE int isspace(int) __unused;
+LIBKERN_INLINE int isascii(int) __unused;
+LIBKERN_INLINE int isupper(int) __unused;
+LIBKERN_INLINE int islower(int) __unused;
+LIBKERN_INLINE int isalpha(int) __unused;
+LIBKERN_INLINE int isdigit(int) __unused;
+LIBKERN_INLINE int isxdigit(int) __unused;
+LIBKERN_INLINE int toupper(int) __unused;
+LIBKERN_INLINE int tolower(int) __unused;
#ifdef LIBKERN_BODY
LIBKERN_INLINE int
@@ -253,17 +253,16 @@ struct mtprng_state {
uint32_t mt_sparse[3];
};
-/* Prototypes for non-quad routines. */
-/* XXX notyet #ifdef _STANDALONE */
-int bcmp __P((const void *, const void *, size_t));
-void bcopy __P((const void *, void *, size_t));
-void bzero __P((void *, size_t));
-/* #endif */
+#ifdef _STANDALONE
+int bcmp(const void *, const void *, size_t);
+void bcopy(const void *, void *, size_t);
+void bzero(void *, size_t);
+#endif
/* Prototypes for which GCC built-ins exist. */
-void *memcpy __P((void *, const void *, size_t));
-int memcmp __P((const void *, const void *, size_t));
-void *memset __P((void *, int, size_t));
+void *memcpy(void *, const void *, size_t);
+int memcmp(const void *, const void *, size_t);
+void *memset(void *, int, size_t);
#if __GNUC_PREREQ__(2, 95) && (__GNUC_PREREQ__(4, 0) || !defined(__vax__))
#define memcpy(d, s, l) __builtin_memcpy(d, s, l)
#define memcmp(a, b, l) __builtin_memcmp(a, b, l)
@@ -272,9 +271,9 @@ void *memset __P((void *, int, size_t));
#define memset(d, v, l) __builtin_memset(d, v, l)
#endif
-char *strcpy __P((char *, const char *));
-int strcmp __P((const char *, const char *));
-size_t strlen __P((const char *));
+char *strcpy(char *, const char *);
+int strcmp(const char *, const char *);
+size_t strlen(const char *);
char *strsep(char **, const char *);
#if __GNUC_PREREQ__(2, 95)
#define strcpy(d, s) __builtin_strcpy(d, s)
@@ -288,59 +287,59 @@ char *strsep(char **, const char *);
#endif
/* These exist in GCC 3.x, but we don't bother. */
-char *strcat __P((char *, const char *));
-char *strncpy __P((char *, const char *, size_t));
-int strncmp __P((const char *, const char *, size_t));
-char *strchr __P((const char *, int));
-char *strrchr __P((const char *, int));
+char *strcat(char *, const char *);
+char *strncpy(char *, const char *, size_t);
+int strncmp(const char *, const char *, size_t);
+char *strchr(const char *, int);
+char *strrchr(const char *, int);
-char *strstr __P((const char *, const char *));
+char *strstr(const char *, const char *);
/*
* ffs is an instruction on vax.
*/
-int ffs __P((int));
+int ffs(int);
#if __GNUC_PREREQ__(2, 95) && (!defined(__vax__) || __GNUC_PREREQ__(4,1))
#define ffs(x) __builtin_ffs(x)
#endif
-void __kernassert __P((const char *, const char *, int, const char *));
+void __kernassert(const char *, const char *, int, const char *);
unsigned int
- bcdtobin __P((unsigned int));
+ bcdtobin(unsigned int);
unsigned int
- bintobcd __P((unsigned int));
+ bintobcd(unsigned int);
u_int32_t
- inet_addr __P((const char *));
+ inet_addr(const char *);
struct in_addr;
-int inet_aton __P((const char *, struct in_addr *));
-char *intoa __P((u_int32_t));
+int inet_aton(const char *, struct in_addr *);
+char *intoa(u_int32_t);
#define inet_ntoa(a) intoa((a).s_addr)
-void *memchr __P((const void *, int, size_t));
-void *memmove __P((void *, const void *, size_t));
-int pmatch __P((const char *, const char *, const char **));
-u_int32_t arc4random __P((void));
-void arc4randbytes __P((void *, size_t));
+void *memchr(const void *, int, size_t);
+void *memmove(void *, const void *, size_t);
+int pmatch(const char *, const char *, const char **);
+u_int32_t arc4random(void);
+void arc4randbytes(void *, size_t);
#ifndef SMALL_RANDOM
-void srandom __P((unsigned long));
-char *initstate __P((unsigned long, char *, size_t));
-char *setstate __P((char *));
+void srandom(unsigned long);
+char *initstate(unsigned long, char *, size_t);
+char *setstate(char *);
#endif /* SMALL_RANDOM */
-long random __P((void));
+long random(void);
void mtprng_init32(struct mtprng_state *, uint32_t);
void mtprng_initarray(struct mtprng_state *, const uint32_t *, size_t);
uint32_t mtprng_rawrandom(struct mtprng_state *);
uint32_t mtprng_random(struct mtprng_state *);
-int scanc __P((u_int, const u_char *, const u_char *, int));
-int skpc __P((int, size_t, u_char *));
-int strcasecmp __P((const char *, const char *));
-size_t strlcpy __P((char *, const char *, size_t));
-size_t strlcat __P((char *, const char *, size_t));
-int strncasecmp __P((const char *, const char *, size_t));
-u_long strtoul __P((const char *, char **, int));
-long long strtoll __P((const char *, char **, int));
-unsigned long long strtoull __P((const char *, char **, int));
-uintmax_t strtoumax __P((const char *, char **, int));
-int snprintb __P((char *, size_t, const char *, uint64_t));
+int scanc(u_int, const u_char *, const u_char *, int);
+int skpc(int, size_t, u_char *);
+int strcasecmp(const char *, const char *);
+size_t strlcpy(char *, const char *, size_t);
+size_t strlcat(char *, const char *, size_t);
+int strncasecmp(const char *, const char *, size_t);
+u_long strtoul(const char *, char **, int);
+long long strtoll(const char *, char **, int);
+unsigned long long strtoull(const char *, char **, int);
+uintmax_t strtoumax(const char *, char **, int);
+int snprintb(char *, size_t, const char *, uint64_t);
int kheapsort(void *, size_t, size_t, int (*)(const void *, const void *),
void *);
#endif /* !_LIB_LIBKERN_LIBKERN_H_ */
diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h
index fb6c5a18b44..2931beb9c28 100644
--- a/sys/net/bpfdesc.h
+++ b/sys/net/bpfdesc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: bpfdesc.h,v 1.28 2008/04/24 15:35:30 ad Exp $ */
+/* $NetBSD: bpfdesc.h,v 1.29 2009/03/14 14:46:10 dsl Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -133,7 +133,7 @@ struct bpf_if {
};
#ifdef _KERNEL
-int bpf_setf __P((struct bpf_d *, struct bpf_program *));
+int bpf_setf(struct bpf_d *, struct bpf_program *);
#endif
#endif /* !_NET_BPFDESC_H_ */
diff --git a/sys/net/if_ether.h b/sys/net/if_ether.h
index 787ea3e9637..b4507cd2e4a 100644
--- a/sys/net/if_ether.h
+++ b/sys/net/if_ether.h
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ether.h,v 1.54 2008/11/07 00:20:13 dyoung Exp $ */
+/* $NetBSD: if_ether.h,v 1.55 2009/03/14 14:46:10 dsl Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -317,12 +317,12 @@ int ether_nonstatic_aton(u_char *, char *);
*/
#include <sys/cdefs.h>
__BEGIN_DECLS
-char * ether_ntoa __P((const struct ether_addr *));
+char * ether_ntoa(const struct ether_addr *);
struct ether_addr *
- ether_aton __P((const char *));
-int ether_ntohost __P((char *, const struct ether_addr *));
-int ether_hostton __P((const char *, struct ether_addr *));
-int ether_line __P((const char *, struct ether_addr *, char *));
+ ether_aton(const char *);
+int ether_ntohost(char *, const struct ether_addr *);
+int ether_hostton(const char *, struct ether_addr *);
+int ether_line(const char *, struct ether_addr *, char *);
__END_DECLS
#endif
diff --git a/sys/net/zlib.c b/sys/net/zlib.c
index c15395ec79a..a3f33657c7f 100644
--- a/sys/net/zlib.c
+++ b/sys/net/zlib.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zlib.c,v 1.30 2008/05/05 13:41:30 ad Exp $ */
+/* $NetBSD: zlib.c,v 1.31 2009/03/14 14:46:10 dsl Exp $ */
/*
* This file is derived from various .h and .c files from the zlib-1.0.4
* distribution by Jean-loup Gailly and Mark Adler, with some additions
@@ -11,7 +11,7 @@
* - added inflateIncomp and deflateOutputPending
* - allow strm->next_out to be NULL, meaning discard the output
*
- * $Id: zlib.c,v 1.30 2008/05/05 13:41:30 ad Exp $
+ * $Id: zlib.c,v 1.31 2009/03/14 14:46:10 dsl Exp $
*/
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.30 2008/05/05 13:41:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.31 2009/03/14 14:46:10 dsl Exp $");
#define NO_DUMMY_DECL
#define NO_ZCFUNCS
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: zlib.c,v 1.30 2008/05/05 13:41:30 ad Exp $");
subject to change. Applications should only use zlib.h.
*/
-/* @(#) $Id: zlib.c,v 1.30 2008/05/05 13:41:30 ad Exp $ */
+/* @(#) $Id: zlib.c,v 1.31 2009/03/14 14:46:10 dsl Exp $ */
#ifndef _Z_UTIL_H
#define _Z_UTIL_H
@@ -213,7 +213,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
/* functions */
#ifdef HAVE_STRERROR
- extern char *strerror __P((int));
+ extern char *strerror(int);
# define zstrerror(errnum) strerror(errnum)
#else
# define zstrerror(errnum) ""
@@ -243,16 +243,16 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
# define zmemzero(dest, len) memset(dest, 0, len)
# endif
#else
- extern void zmemcpy __P((Bytef* dest, const Bytef* source, uInt len));
- extern int zmemcmp __P((const Bytef* s1, const Bytef* s2, uInt len));
- extern void zmemzero __P((Bytef* dest, uInt len));
+ extern void zmemcpy(Bytef* dest, const Bytef* source, uInt len);
+ extern int zmemcmp(const Bytef* s1, const Bytef* s2, uInt len);
+ extern void zmemzero(Bytef* dest, uInt len);
#endif
/* Diagnostic functions */
#if defined(DEBUG_ZLIB) && !defined(_KERNEL) && !defined(_STANDALONE)
# include <stdio.h>
extern int z_verbose;
- extern void z_error __P((char *m));
+ extern void z_error(char *m);
# define Assert(cond,msg) {if(!(cond)) z_error(msg);}
# define Trace(x) {if (z_verbose>=0) fprintf x ;}
# define Tracev(x) {if (z_verbose>0) fprintf x ;}
@@ -269,10 +269,10 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
#endif
-typedef uLong (ZEXPORT *check_func) __P((uLong check, const Bytef *buf,
- uInt len));
-voidpf zcalloc __P((voidpf opaque, unsigned items, unsigned size));
-void zcfree __P((voidpf opaque, voidpf ptr));
+typedef uLong (ZEXPORT *check_func)(uLong check, const Bytef *buf,
+ uInt len);
+voidpf zcalloc(voidpf opaque, unsigned items, unsigned size);
+void zcfree(voidpf opaque, voidpf ptr);
#define ZALLOC(strm, items, size) \
(*((strm)->zalloc))((strm)->opaque, (items), (size))
@@ -294,7 +294,7 @@ void zcfree __P((voidpf opaque, voidpf ptr));
subject to change. Applications should only use zlib.h.
*/
-/* @(#) $Id: zlib.c,v 1.30 2008/05/05 13:41:30 ad Exp $ */
+/* @(#) $Id: zlib.c,v 1.31 2009/03/14 14:46:10 dsl Exp $ */
#ifndef _DEFLATE_H
#define _DEFLATE_H
@@ -552,14 +552,14 @@ typedef struct deflate_state {
*/
/* in trees.c */
-void _tr_init __P((deflate_state *s));
-int _tr_tally __P((deflate_state *s, unsigned dist, unsigned lc));
-void _tr_flush_block __P((deflate_state *s, charf *buf, ulg stored_len,
- int eof));
-void _tr_align __P((deflate_state *s));
-void _tr_stored_block __P((deflate_state *s, charf *buf, ulg stored_len,
- int eof));
-void _tr_stored_type_only __P((deflate_state *));
+void _tr_init(deflate_state *s);
+int _tr_tally(deflate_state *s, unsigned dist, unsigned lc);
+void _tr_flush_block(deflate_state *s, charf *buf, ulg stored_len,
+ int eof);
+void _tr_align(deflate_state *s);
+void _tr_stored_block(deflate_state *s, charf *buf, ulg stored_len,
+ int eof);
+void _tr_stored_type_only(deflate_state *);
#define d_code(dist) \
((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
@@ -656,7 +656,7 @@ void _tr_stored_type_only __P((deflate_state *));
*
*/
-/* @(#) $Id: zlib.c,v 1.30 2008/05/05 13:41:30 ad Exp $ */
+/* @(#) $Id: zlib.c,v 1.31 2009/03/14 14:46:10 dsl Exp $ */
/* #include "deflate.h" */
@@ -679,27 +679,27 @@ typedef enum {
finish_done /* finish done, accept no more input or output */
} block_state;
-typedef block_state (*compress_func) __P((deflate_state *s, int flush));
+typedef block_state (*compress_func)(deflate_state *s, int flush);
/* Compression function. Returns the block state after the call. */
-local void fill_window __P((deflate_state *s));
-local block_state deflate_stored __P((deflate_state *s, int flush));
-local block_state deflate_fast __P((deflate_state *s, int flush));
-local block_state deflate_slow __P((deflate_state *s, int flush));
-local void lm_init __P((deflate_state *s));
-local void putShortMSB __P((deflate_state *s, uInt b));
-local void flush_pending __P((z_streamp strm));
-local int read_buf __P((z_streamp strm, Bytef *buf, unsigned size));
+local void fill_window(deflate_state *s);
+local block_state deflate_stored(deflate_state *s, int flush);
+local block_state deflate_fast(deflate_state *s, int flush);
+local block_state deflate_slow(deflate_state *s, int flush);
+local void lm_init(deflate_state *s);
+local void putShortMSB(deflate_state *s, uInt b);
+local void flush_pending(z_streamp strm);
+local int read_buf(z_streamp strm, Bytef *buf, unsigned size);
#ifdef ASMV
- void match_init __P((void)); /* asm code initialization */
- uInt longest_match __P((deflate_state *s, IPos cur_match));
+ void match_init(void); /* asm code initialization */
+ uInt longest_match(deflate_state *s, IPos cur_match);
#else
-local uInt longest_match __P((deflate_state *s, IPos cur_match));
+local uInt longest_match(deflate_state *s, IPos cur_match);
#endif
#ifdef DEBUG_ZLIB
-local void check_match __P((deflate_state *s, IPos start, IPos match,
- int length));
+local void check_match(deflate_state *s, IPos start, IPos match,
+ int length);
#endif
/* ===========================================================================
@@ -2030,7 +2030,7 @@ local block_state deflate_slow(s, flush)
* Addison-Wesley, 1983. ISBN 0-201-06672-6.
*/
-/* @(#) $Id: zlib.c,v 1.30 2008/05/05 13:41:30 ad Exp $ */
+/* @(#) $Id: zlib.c,v 1.31 2009/03/14 14:46:10 dsl Exp $ */
/* #define GEN_TREES_H */
@@ -2270,28 +2270,28 @@ local static_tree_desc static_bl_desc =
* Local (static) routines in this file.
*/
-local void tr_static_init __P((void));
-local void init_block __P((deflate_state *s));
-local void pqdownheap __P((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen __P((deflate_state *s, tree_desc *desc));
-local void gen_codes __P((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree __P((deflate_state *s, tree_desc *desc));
-local void scan_tree __P((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree __P((deflate_state *s, ct_data *tree, int max_code));
-local int build_bl_tree __P((deflate_state *s));
-local void send_all_trees __P((deflate_state *s, int lcodes, int dcodes,
- int blcodes));
-local void compress_block __P((deflate_state *s, const ct_data *ltree,
- const ct_data *dtree));
-local void set_data_type __P((deflate_state *s));
-local unsigned bi_reverse __P((unsigned value, int length));
-local void bi_windup __P((deflate_state *s));
-local void bi_flush __P((deflate_state *s));
-local void copy_block __P((deflate_state *s, charf *buf, unsigned len,
- int header));
+local void tr_static_init(void);
+local void init_block(deflate_state *s);
+local void pqdownheap(deflate_state *s, ct_data *tree, int k);
+local void gen_bitlen(deflate_state *s, tree_desc *desc);
+local void gen_codes(ct_data *tree, int max_code, ushf *bl_count);
+local void build_tree(deflate_state *s, tree_desc *desc);
+local void scan_tree(deflate_state *s, ct_data *tree, int max_code);
+local void send_tree(deflate_state *s, ct_data *tree, int max_code);
+local int build_bl_tree(deflate_state *s);
+local void send_all_trees(deflate_state *s, int lcodes, int dcodes,
+ int blcodes);
+local void compress_block(deflate_state *s, const ct_data *ltree,
+ const ct_data *dtree);
+local void set_data_type(deflate_state *s);
+local unsigned bi_reverse(unsigned value, int length);
+local void bi_windup(deflate_state *s);
+local void bi_flush(deflate_state *s);
+local void copy_block(deflate_state *s, charf *buf, unsigned len,
+ int header);
#ifdef GEN_TREES_H
-local void gen_trees_header __P((void));
+local void gen_trees_header(void);
#endif
#ifndef DEBUG_ZLIB
@@ -2318,7 +2318,7 @@ local void gen_trees_header __P((void));
* IN assertion: length <= 16 and value fits in length bits.
*/
#ifdef DEBUG_ZLIB
-local void send_bits __P((deflate_state *s, int value, int length));
+local void send_bits(deflate_state *s, int value, int length);
local void send_bits(s, value, length)
deflate_state *s;
@@ -3380,38 +3380,38 @@ local void copy_block(s, buf, len, header)
struct inflate_blocks_state;
typedef struct inflate_blocks_state FAR inflate_blocks_statef;
-extern inflate_blocks_statef * inflate_blocks_new __P((
+extern inflate_blocks_statef * inflate_blocks_new(
z_streamp z,
check_func c, /* check function */
- uInt w)); /* window size */
+ uInt w); /* window size */
-extern int inflate_blocks __P((
+extern int inflate_blocks(
inflate_blocks_statef *,
z_streamp ,
- int)); /* initial return code */
+ int); /* initial return code */
-extern void inflate_blocks_reset __P((
+extern void inflate_blocks_reset(
inflate_blocks_statef *,
z_streamp ,
- uLongf *)); /* check value on output */
+ uLongf *); /* check value on output */
-extern int inflate_blocks_free __P((
+extern int inflate_blocks_free(
inflate_blocks_statef *,
- z_streamp));
+ z_streamp);
-extern void inflate_set_dictionary __P((
+extern void inflate_set_dictionary(
inflate_blocks_statef *s,
const Bytef *d, /* dictionary */
- uInt n)); /* dictionary length */
+ uInt n); /* dictionary length */
-extern int inflate_blocks_sync_point __P((
- inflate_blocks_statef *s));
-extern int inflate_addhistory __P((
+extern int inflate_blocks_sync_point(
+ inflate_blocks_statef *s);
+extern int inflate_addhistory(
inflate_blocks_statef *,
- z_streamp));
+ z_streamp);
-extern int inflate_packet_flush __P((
- inflate_blocks_statef *));
+extern int inflate_packet_flush(
+ inflate_blocks_statef *);
/* --- infblock.h */
@@ -3857,14 +3857,14 @@ struct inflate_huft_s {
value below is more than safe. */
#define MANY 1440
-extern int inflate_trees_bits __P((
+extern int inflate_trees_bits(
uIntf *, /* 19 code lengths */
uIntf *, /* bits tree desired/actual depth */
inflate_huft * FAR *, /* bits tree result */
inflate_huft *, /* space for trees */
- z_streamp)); /* for messages */
+ z_streamp); /* for messages */
-extern int inflate_trees_dynamic __P((
+extern int inflate_trees_dynamic(
uInt, /* number of literal/length codes */
uInt, /* number of distance codes */
uIntf *, /* that many (total) code lengths */
@@ -3873,14 +3873,14 @@ extern int inflate_trees_dynamic __P((
inflate_huft * FAR *, /* literal/length tree result */
inflate_huft * FAR *, /* distance tree result */
inflate_huft *, /* space for trees */
- z_streamp)); /* for messages */
+ z_streamp); /* for messages */
-extern int inflate_trees_fixed __P((
+extern int inflate_trees_fixed(
uIntf *, /* literal desired/actual bit depth */
uIntf *, /* distance desired/actual bit depth */
inflate_huft * FAR *, /* literal/length tree result */
inflate_huft * FAR *, /* distance tree result */
- z_streamp)); /* for memory allocation */
+ z_streamp); /* for memory allocation */
/* --- inftrees.h */
/* +++ infcodes.h */
@@ -3898,19 +3898,19 @@ extern int inflate_trees_fixed __P((
struct inflate_codes_state;
typedef struct inflate_codes_state FAR inflate_codes_statef;
-extern inflate_codes_statef *inflate_codes_new __P((
+extern inflate_codes_statef *inflate_codes_new(
uInt, uInt,
inflate_huft *, inflate_huft *,
- z_streamp ));
+ z_streamp );
-extern int inflate_codes __P((
+extern int inflate_codes(
inflate_blocks_statef *,
z_streamp ,
- int));
+ int);
-extern void inflate_codes_free __P((
+extern void inflate_codes_free(
inflate_codes_statef *,
- z_streamp ));
+ z_streamp );
/* --- infcodes.h */
@@ -4006,10 +4006,10 @@ struct inflate_blocks_state {
extern uInt inflate_mask[17];
/* copy as much as possible from the sliding window to the output area */
-extern int inflate_flush __P((
+extern int inflate_flush(
inflate_blocks_statef *,
z_streamp ,
- int));
+ int);
#ifndef NO_DUMMY_DECL
struct internal_state {int dummy;}; /* for buggy compilers */
@@ -4517,7 +4517,7 @@ struct internal_state {int dummy;}; /* for buggy compilers */
#define bits word.what.Bits
-local int huft_build __P((
+local int huft_build(
uIntf *, /* code lengths in bits */
uInt, /* number of codes */
uInt, /* number of "simple" codes */
@@ -4527,7 +4527,7 @@ local int huft_build __P((
uIntf *, /* maximum lookup bits (returns actual) */
inflate_huft *, /* space for trees */
uInt *, /* hufts used in space */
- uIntf * )); /* space for values */
+ uIntf * ); /* space for values */
/* Tables for deflate from PKZIP's appnote.txt. */
local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
@@ -5128,13 +5128,13 @@ z_streamp z) /* for memory allocation */
subject to change. Applications should only use zlib.h.
*/
-extern int inflate_fast __P((
+extern int inflate_fast(
uInt,
uInt,
inflate_huft *,
inflate_huft *,
inflate_blocks_statef *,
- z_streamp ));
+ z_streamp );
/* --- inffast.h */
/* simplify the use of the inflate_huft type with some defines */
@@ -5684,7 +5684,7 @@ struct internal_state {int dummy;}; /* for buggy compilers */
#endif
#ifndef STDC
-extern void exit __P((int));
+extern void exit(int);
#endif
const char *z_errmsg[10] = {
@@ -5879,8 +5879,8 @@ void zcfree (voidpf opaque, voidpf ptr)
#ifndef MY_ZCALLOC /* Any system without a special alloc function */
#ifndef STDC
-extern voidp calloc __P((uInt items, uInt size));
-extern void free __P((voidpf ptr));
+extern voidp calloc(uInt items, uInt size);
+extern void free(voidpf ptr);
#endif
voidpf zcalloc (opaque, items, size)
@@ -5909,7 +5909,7 @@ void zcfree (opaque, ptr)
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-/* @(#) $Id: zlib.c,v 1.30 2008/05/05 13:41:30 ad Exp $ */
+/* @(#) $Id: zlib.c,v 1.31 2009/03/14 14:46:10 dsl Exp $ */
/* #include "zlib.h" */
diff --git a/sys/net/zlib.h b/sys/net/zlib.h
index aadafd4af4e..9efd3c25a33 100644
--- a/sys/net/zlib.h
+++ b/sys/net/zlib.h
@@ -1,4 +1,4 @@
-/* $NetBSD: zlib.h,v 1.12 2006/01/14 20:17:12 christos Exp $ */
+/* $NetBSD: zlib.h,v 1.13 2009/03/14 14:46:10 dsl Exp $ */
/* zlib.h -- interface of the 'zlib' general purpose compression library
version 1.1.4, March 11th, 2002
@@ -43,7 +43,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-/* @(#) $Id: zlib.h,v 1.12 2006/01/14 20:17:12 christos Exp $ */
+/* @(#) $Id: zlib.h,v 1.13 2009/03/14 14:46:10 dsl Exp $ */
#ifndef ZCONF_H
#define ZCONF_H
@@ -353,8 +353,8 @@ extern "C" {
crash even in case of corrupted input.
*/
-typedef voidpf (*alloc_func) __P((voidpf, uInt, uInt));
-typedef void (*free_func) __P((voidpf, voidpf));
+typedef voidpf (*alloc_func)(voidpf, uInt, uInt);
+typedef void (*free_func)(voidpf, voidpf);
struct internal_state;
@@ -462,7 +462,7 @@ typedef z_stream FAR *z_streamp;
/* basic functions */
-ZEXTERN const char * ZEXPORT zlibVersion __P((void));
+ZEXTERN const char * ZEXPORT zlibVersion(void);
/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
If the first character differs, the library code actually used is
not compatible with the zlib.h header file used by the application.
@@ -470,7 +470,7 @@ ZEXTERN const char * ZEXPORT zlibVersion __P((void));
*/
/*
-ZEXTERN int ZEXPORT deflateInit __P((z_streamp, int));
+ZEXTERN int ZEXPORT deflateInit(z_streamp, int);
Initializes the internal stream state for compression. The fields
zalloc, zfree and opaque must be initialized before by the caller.
@@ -492,7 +492,7 @@ ZEXTERN int ZEXPORT deflateInit __P((z_streamp, int));
*/
-ZEXTERN int ZEXPORT deflate __P((z_streamp, int));
+ZEXTERN int ZEXPORT deflate(z_streamp, int);
/*
deflate compresses as much data as possible, and stops when the input
buffer becomes empty or the output buffer becomes full. It may introduce some
@@ -577,7 +577,7 @@ ZEXTERN int ZEXPORT deflate __P((z_streamp, int));
*/
-ZEXTERN int ZEXPORT deflateEnd __P((z_streamp));
+ZEXTERN int ZEXPORT deflateEnd(z_streamp);
/*
All dynamically allocated data structures for this stream are freed.
This function discards any unprocessed input and does not flush any
@@ -592,7 +592,7 @@ ZEXTERN int ZEXPORT deflateEnd __P((z_streamp));
/*
-ZEXTERN int ZEXPORT inflateInit __P((z_streamp));
+ZEXTERN int ZEXPORT inflateInit(z_streamp);
Initializes the internal stream state for decompression. The fields
next_in, avail_in, zalloc, zfree and opaque must be initialized before by
@@ -612,7 +612,7 @@ ZEXTERN int ZEXPORT inflateInit __P((z_streamp));
*/
-ZEXTERN int ZEXPORT inflate __P((z_streamp, int));
+ZEXTERN int ZEXPORT inflate(z_streamp, int);
/*
inflate decompresses as much data as possible, and stops when the input
buffer becomes empty or the output buffer becomes full. It may some
@@ -684,7 +684,7 @@ ZEXTERN int ZEXPORT inflate __P((z_streamp, int));
*/
-ZEXTERN int ZEXPORT inflateEnd __P((z_streamp));
+ZEXTERN int ZEXPORT inflateEnd(z_streamp);
/*
All dynamically allocated data structures for this stream are freed.
This function discards any unprocessed input and does not flush any
@@ -702,7 +702,7 @@ ZEXTERN int ZEXPORT inflateEnd __P((z_streamp));
*/
/*
-ZEXTERN int ZEXPORT deflateInit2 __P((z_streamp, int, int, int, int, int));
+ZEXTERN int ZEXPORT deflateInit2(z_streamp, int, int, int, int, int);
This is another version of deflateInit with more compression options. The
fields next_in, zalloc, zfree and opaque must be initialized before by
@@ -740,7 +740,7 @@ ZEXTERN int ZEXPORT deflateInit2 __P((z_streamp, int, int, int, int, int));
not perform any compression: this will be done by deflate().
*/
-ZEXTERN int ZEXPORT deflateSetDictionary __P((z_streamp, const Bytef *, uInt));
+ZEXTERN int ZEXPORT deflateSetDictionary(z_streamp, const Bytef *, uInt);
/*
Initializes the compression dictionary from the given byte sequence
without producing any compressed output. This function must be called
@@ -774,7 +774,7 @@ ZEXTERN int ZEXPORT deflateSetDictionary __P((z_streamp, const Bytef *, uInt));
perform any compression: this will be done by deflate().
*/
-ZEXTERN int ZEXPORT deflateCopy __P((z_streamp, z_streamp));
+ZEXTERN int ZEXPORT deflateCopy(z_streamp, z_streamp);
/*
Sets the destination stream as a complete copy of the source stream.
@@ -791,7 +791,7 @@ ZEXTERN int ZEXPORT deflateCopy __P((z_streamp, z_streamp));
destination.
*/
-extern int inflateIncomp __P((z_stream *));
+extern int inflateIncomp(z_stream *);
/*
This function adds the data at next_in (avail_in bytes) to the output
history without performing any output. There must be no pending output,
@@ -800,7 +800,7 @@ extern int inflateIncomp __P((z_stream *));
containing the data at next_in (except that the data is not output).
*/
-ZEXTERN int ZEXPORT deflateReset __P((z_streamp));
+ZEXTERN int ZEXPORT deflateReset(z_streamp);
/*
This function is equivalent to deflateEnd followed by deflateInit,
but does not free and reallocate all the internal compression state.
@@ -811,7 +811,7 @@ ZEXTERN int ZEXPORT deflateReset __P((z_streamp));
stream state was inconsistent (such as zalloc or state being NULL).
*/
-ZEXTERN int ZEXPORT deflateParams __P((z_streamp, int, int));
+ZEXTERN int ZEXPORT deflateParams(z_streamp, int, int);
/*
Dynamically update the compression level and compression strategy. The
interpretation of level and strategy is as in deflateInit2. This can be
@@ -830,7 +830,7 @@ ZEXTERN int ZEXPORT deflateParams __P((z_streamp, int, int));
if strm->avail_out was zero.
*/
-ZEXTERN int ZEXPORT deflateOutputPending __P((z_streamp));
+ZEXTERN int ZEXPORT deflateOutputPending(z_streamp);
/*
Returns the number of bytes of output which are immediately
available from the compressor (i.e. without any further input
@@ -838,7 +838,7 @@ ZEXTERN int ZEXPORT deflateOutputPending __P((z_streamp));
*/
/*
-ZEXTERN int ZEXPORT inflateInit2 __P((z_streamp, int));
+ZEXTERN int ZEXPORT inflateInit2(z_streamp, int);
This is another version of inflateInit with an extra parameter. The
fields next_in, avail_in, zalloc, zfree and opaque must be initialized
@@ -859,7 +859,7 @@ ZEXTERN int ZEXPORT inflateInit2 __P((z_streamp, int));
modified, but next_out and avail_out are unchanged.)
*/
-ZEXTERN int ZEXPORT inflateSetDictionary __P((z_streamp, const Bytef *, uInt));
+ZEXTERN int ZEXPORT inflateSetDictionary(z_streamp, const Bytef *, uInt);
/*
Initializes the decompression dictionary from the given uncompressed byte
sequence. This function must be called immediately after a call of inflate
@@ -876,7 +876,7 @@ ZEXTERN int ZEXPORT inflateSetDictionary __P((z_streamp, const Bytef *, uInt));
inflate().
*/
-ZEXTERN int ZEXPORT inflateSync __P((z_streamp));
+ZEXTERN int ZEXPORT inflateSync(z_streamp);
/*
Skips invalid compressed data until a full flush point (see above the
description of deflate with Z_FULL_FLUSH) can be found, or until all
@@ -891,7 +891,7 @@ ZEXTERN int ZEXPORT inflateSync __P((z_streamp));
until success or end of the input data.
*/
-ZEXTERN int ZEXPORT inflateReset __P((z_streamp));
+ZEXTERN int ZEXPORT inflateReset(z_streamp);
/*
This function is equivalent to inflateEnd followed by inflateInit,
but does not free and reallocate all the internal decompression state.
@@ -912,7 +912,7 @@ ZEXTERN int ZEXPORT inflateReset __P((z_streamp));
utility functions can easily be modified if you need special options.
*/
-ZEXTERN int ZEXPORT compress __P((Bytef *, uLongf *, const Bytef *, uLong));
+ZEXTERN int ZEXPORT compress(Bytef *, uLongf *, const Bytef *, uLong);
/*
Compresses the source buffer into the destination buffer. sourceLen is
the byte length of the source buffer. Upon entry, destLen is the total
@@ -926,8 +926,8 @@ ZEXTERN int ZEXPORT compress __P((Bytef *, uLongf *, const Bytef *, uLong));
buffer.
*/
-ZEXTERN int ZEXPORT compress2 __P((Bytef *, uLongf *, const Bytef *,
- uLong, int));
+ZEXTERN int ZEXPORT compress2(Bytef *, uLongf *, const Bytef *,
+ uLong, int);
/*
Compresses the source buffer into the destination buffer. The level
parameter has the same meaning as in deflateInit. sourceLen is the byte
@@ -940,7 +940,7 @@ ZEXTERN int ZEXPORT compress2 __P((Bytef *, uLongf *, const Bytef *,
Z_STREAM_ERROR if the level parameter is invalid.
*/
-ZEXTERN int ZEXPORT uncompress __P((Bytef *, uLongf *, const Bytef *, uLong));
+ZEXTERN int ZEXPORT uncompress(Bytef *, uLongf *, const Bytef *, uLong);
/*
Decompresses the source buffer into the destination buffer. sourceLen is
the byte length of the source buffer. Upon entry, destLen is the total
@@ -960,7 +960,7 @@ ZEXTERN int ZEXPORT uncompress __P((Bytef *, uLongf *, const Bytef *, uLong));
typedef voidp gzFile;
-ZEXTERN gzFile ZEXPORT gzopen __P((const char *, const char *));
+ZEXTERN gzFile ZEXPORT gzopen(const char *, const char *);
/*
Opens a gzip (.gz) file for reading or writing. The mode parameter
is as in fopen ("rb" or "wb") but can also include a compression level
@@ -976,7 +976,7 @@ ZEXTERN gzFile ZEXPORT gzopen __P((const char *, const char *));
can be checked to distinguish the two cases (if errno is zero, the
zlib error is Z_MEM_ERROR). */
-ZEXTERN gzFile ZEXPORT gzdopen __P((int, const char *));
+ZEXTERN gzFile ZEXPORT gzdopen(int, const char *);
/*
gzdopen() associates a gzFile with the file descriptor fd. File
descriptors are obtained from calls like open, dup, creat, pipe or
@@ -989,7 +989,7 @@ ZEXTERN gzFile ZEXPORT gzdopen __P((int, const char *));
the (de)compression state.
*/
-ZEXTERN int ZEXPORT gzsetparams __P((gzFile, int, int));
+ZEXTERN int ZEXPORT gzsetparams(gzFile, int, int);
/*
Dynamically update the compression level or strategy. See the description
of deflateInit2 for the meaning of these parameters.
@@ -997,7 +997,7 @@ ZEXTERN int ZEXPORT gzsetparams __P((gzFile, int, int));
opened for writing.
*/
-ZEXTERN int ZEXPORT gzread __P((gzFile, voidp, unsigned));
+ZEXTERN int ZEXPORT gzread(gzFile, voidp, unsigned);
/*
Reads the given number of uncompressed bytes from the compressed file.
If the input file was not in gzip format, gzread copies the given number
@@ -1005,14 +1005,14 @@ ZEXTERN int ZEXPORT gzread __P((gzFile, voidp, unsigned));
gzread returns the number of uncompressed bytes actually read (0 for
end of file, -1 for error). */
-ZEXTERN int ZEXPORT gzwrite __P((gzFile, const voidp, unsigned));
+ZEXTERN int ZEXPORT gzwrite(gzFile, const voidp, unsigned);
/*
Writes the given number of uncompressed bytes into the compressed file.
gzwrite returns the number of uncompressed bytes actually written
(0 in case of error).
*/
-ZEXTERN int ZEXPORTVA gzprintf __P((gzFile, const char *, ...))
+ZEXTERN int ZEXPORTVA gzprintf(gzFile, const char *, ...)
__attribute__((__format__(__printf__, 2, 3)));
/*
Converts, formats, and writes the args to the compressed file under
@@ -1020,14 +1020,14 @@ ZEXTERN int ZEXPORTVA gzprintf __P((gzFile, const char *, ...))
uncompressed bytes actually written (0 in case of error).
*/
-ZEXTERN int ZEXPORT gzputs __P((gzFile, const char *));
+ZEXTERN int ZEXPORT gzputs(gzFile, const char *);
/*
Writes the given null-terminated string to the compressed file, excluding
the terminating null character.
gzputs returns the number of characters written, or -1 in case of error.
*/
-ZEXTERN char * ZEXPORT gzgets __P((gzFile, char *, int));
+ZEXTERN char * ZEXPORT gzgets(gzFile, char *, int);
/*
Reads bytes from the compressed file until len-1 characters are read, or
a newline character is read and transferred to buf, or an end-of-file
@@ -1036,19 +1036,19 @@ ZEXTERN char * ZEXPORT gzgets __P((gzFile, char *, int));
gzgets returns buf, or Z_NULL in case of error.
*/
-ZEXTERN int ZEXPORT gzputc __P((gzFile, int));
+ZEXTERN int ZEXPORT gzputc(gzFile, int);
/*
Writes c, converted to an unsigned char, into the compressed file.
gzputc returns the value that was written, or -1 in case of error.
*/
-ZEXTERN int ZEXPORT gzgetc __P((gzFile));
+ZEXTERN int ZEXPORT gzgetc(gzFile);
/*
Reads one byte from the compressed file. gzgetc returns this byte
or -1 in case of end of file or error.
*/
-ZEXTERN int ZEXPORT gzflush __P((gzFile, int));
+ZEXTERN int ZEXPORT gzflush(gzFile, int);
/*
Flushes all pending output into the compressed file. The parameter
flush is as in the deflate() function. The return value is the zlib
@@ -1063,7 +1063,7 @@ ZEXTERN int ZEXPORT gzflush __P((gzFile, int));
* NetBSD note:
* "long" gzseek has been there till Oct 1999 (1.4L), which was wrong.
*/
-ZEXTERN z_off_t ZEXPORT gzseek __P((gzFile, z_off_t, int));
+ZEXTERN z_off_t ZEXPORT gzseek(gzFile, z_off_t, int);
/*
Sets the starting position for the next gzread or gzwrite on the
given compressed file. The offset represents a number of bytes in the
@@ -1080,7 +1080,7 @@ ZEXTERN z_off_t ZEXPORT gzseek __P((gzFile, z_off_t, int));
would be before the current position.
*/
-ZEXTERN int ZEXPORT gzrewind __P((gzFile));
+ZEXTERN int ZEXPORT gzrewind(gzFile);
/*
Rewinds the given file. This function is supported only for reading.
@@ -1091,7 +1091,7 @@ ZEXTERN int ZEXPORT gzrewind __P((gzFile));
* NetBSD note:
* "long" gztell has been there till Oct 1999 (1.4L), which was wrong.
*/
-ZEXTERN z_off_t ZEXPORT gztell __P((gzFile));
+ZEXTERN z_off_t ZEXPORT gztell(gzFile);
/*
Returns the starting position for the next gzread or gzwrite on the
given compressed file. This position represents a number of bytes in the
@@ -1100,20 +1100,20 @@ ZEXTERN z_off_t ZEXPORT gztell __P((gzFile));
gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
*/
-ZEXTERN int ZEXPORT gzeof __P((gzFile));
+ZEXTERN int ZEXPORT gzeof(gzFile);
/*
Returns 1 when EOF has previously been detected reading the given
input stream, otherwise zero.
*/
-ZEXTERN int ZEXPORT gzclose __P((gzFile));
+ZEXTERN int ZEXPORT gzclose(gzFile);
/*
Flushes all pending output if necessary, closes the compressed file
and deallocates all the (de)compression state. The return value is the zlib
error number (see function gzerror below).
*/
-ZEXTERN const char * ZEXPORT gzerror __P((gzFile, int *));
+ZEXTERN const char * ZEXPORT gzerror(gzFile, int *);
/*
Returns the error message for the last error which occurred on the
given compressed file. errnum is set to zlib error number. If an
@@ -1130,7 +1130,7 @@ ZEXTERN const char * ZEXPORT gzerror __P((gzFile, int *));
compression library.
*/
-ZEXTERN uLong ZEXPORT adler32 __P((uLong, const Bytef *, uInt));
+ZEXTERN uLong ZEXPORT adler32(uLong, const Bytef *, uInt);
/*
Update a running Adler-32 checksum with the bytes buf[0..len-1] and
@@ -1147,7 +1147,7 @@ ZEXTERN uLong ZEXPORT adler32 __P((uLong, const Bytef *, uInt));
if (adler != original_adler) error();
*/
-ZEXTERN uLong ZEXPORT crc32 __P((uLong, const Bytef *, uInt));
+ZEXTERN uLong ZEXPORT crc32(uLong, const Bytef *, uInt);
/*
Update a running crc with the bytes buf[0..len-1] and return the updated
crc. If buf is NULL, this function returns the required initial value
@@ -1169,11 +1169,11 @@ ZEXTERN uLong ZEXPORT crc32 __P((uLong, const Bytef *, uInt));
/* deflateInit and inflateInit are macros to allow checking the zlib version
* and the compiler's view of z_stream:
*/
-ZEXTERN int ZEXPORT deflateInit_ __P((z_streamp, int, const char *, int));
-ZEXTERN int ZEXPORT inflateInit_ __P((z_streamp, const char *, int));
-ZEXTERN int ZEXPORT deflateInit2_ __P((z_streamp, int, int, int, int,
- int, const char *, int));
-ZEXTERN int ZEXPORT inflateInit2_ __P((z_streamp, int, const char *, int));
+ZEXTERN int ZEXPORT deflateInit_(z_streamp, int, const char *, int);
+ZEXTERN int ZEXPORT inflateInit_(z_streamp, const char *, int);
+ZEXTERN int ZEXPORT deflateInit2_(z_streamp, int, int, int, int,
+ int, const char *, int);
+ZEXTERN int ZEXPORT inflateInit2_(z_streamp, int, const char *, int);
#define deflateInit(strm, level) \
deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))
#define inflateInit(strm) \
@@ -1189,9 +1189,9 @@ ZEXTERN int ZEXPORT inflateInit2_ __P((z_streamp, int, const char *, int));
struct internal_state {int dummy;}; /* hack for buggy compilers */
#endif
-ZEXTERN const char * ZEXPORT zError __P((int));
-ZEXTERN int ZEXPORT inflateSyncPoint __P((z_streamp));
-ZEXTERN const uLongf * ZEXPORT get_crc_table __P((void));
+ZEXTERN const char * ZEXPORT zError(int);
+ZEXTERN int ZEXPORT inflateSyncPoint(z_streamp);
+ZEXTERN const uLongf * ZEXPORT get_crc_table(void);
#ifdef __cplusplus
}
diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c
index 46d6144b019..89a5ba13470 100644
--- a/sys/netatalk/ddp_input.c
+++ b/sys/netatalk/ddp_input.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_input.c,v 1.19 2008/04/24 11:38:37 ad Exp $ */
+/* $NetBSD: ddp_input.c,v 1.20 2009/03/14 14:46:10 dsl Exp $ */
/*
* Copyright (c) 1990,1994 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.19 2008/04/24 11:38:37 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.20 2009/03/14 14:46:10 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,8 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: ddp_input.c,v 1.19 2008/04/24 11:38:37 ad Exp $");
int ddp_forward = 1;
int ddp_firewall = 0;
extern int ddp_cksum;
-void ddp_input __P((struct mbuf *, struct ifnet *,
- struct elaphdr *, int));
+void ddp_input(struct mbuf *, struct ifnet *,
+ struct elaphdr *, int);
/*
* Could probably merge these two code segments a little better...
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index 7c57081ed90..f7d1c467c5d 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_usrreq.c,v 1.34 2008/12/17 20:51:37 cegger Exp $ */
+/* $NetBSD: ddp_usrreq.c,v 1.35 2009/03/14 14:46:10 dsl Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.34 2008/12/17 20:51:37 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.35 2009/03/14 14:46:10 dsl Exp $");
#include "opt_mbuftrace.h"
@@ -56,12 +56,12 @@ __KERNEL_RCSID(0, "$NetBSD: ddp_usrreq.c,v 1.34 2008/12/17 20:51:37 cegger Exp $
#include <netatalk/aarp.h>
#include <netatalk/at_extern.h>
-static void at_pcbdisconnect __P((struct ddpcb *));
-static void at_sockaddr __P((struct ddpcb *, struct mbuf *));
-static int at_pcbsetaddr __P((struct ddpcb *, struct mbuf *, struct lwp *));
-static int at_pcbconnect __P((struct ddpcb *, struct mbuf *, struct lwp *));
-static void at_pcbdetach __P((struct socket *, struct ddpcb *));
-static int at_pcballoc __P((struct socket *));
+static void at_pcbdisconnect(struct ddpcb *);
+static void at_sockaddr(struct ddpcb *, struct mbuf *);
+static int at_pcbsetaddr(struct ddpcb *, struct mbuf *, struct lwp *);
+static int at_pcbconnect(struct ddpcb *, struct mbuf *, struct lwp *);
+static void at_pcbdetach(struct socket *, struct ddpcb *);
+static int at_pcballoc(struct socket *);
struct ifqueue atintrq1, atintrq2;
struct ddpcb *ddp_ports[ATPORT_LAST];
diff --git a/sys/netinet6/ah.h b/sys/netinet6/ah.h
index 3110198e258..24d51727471 100644
--- a/sys/netinet6/ah.h
+++ b/sys/netinet6/ah.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ah.h,v 1.25 2008/04/24 11:38:38 ad Exp $ */
+/* $NetBSD: ah.h,v 1.26 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: ah.h,v 1.16 2001/09/04 08:43:19 itojun Exp $ */
/*
@@ -67,28 +67,28 @@ struct ah_algorithm_state {
};
struct ah_algorithm {
- int (*sumsiz) __P((struct secasvar *));
- int (*mature) __P((struct secasvar *));
+ int (*sumsiz)(struct secasvar *);
+ int (*mature)(struct secasvar *);
int keymin; /* in bits */
int keymax; /* in bits */
const char *name;
- int (*init) __P((struct ah_algorithm_state *, struct secasvar *));
- void (*update) __P((struct ah_algorithm_state *, u_int8_t *, size_t));
- void (*result) __P((struct ah_algorithm_state *, u_int8_t *, size_t));
+ int (*init)(struct ah_algorithm_state *, struct secasvar *);
+ void (*update)(struct ah_algorithm_state *, u_int8_t *, size_t);
+ void (*result)(struct ah_algorithm_state *, u_int8_t *, size_t);
};
#define AH_MAXSUMSIZE (512 / 8)
-extern const struct ah_algorithm *ah_algorithm_lookup __P((int));
+extern const struct ah_algorithm *ah_algorithm_lookup(int);
/* cksum routines */
-extern int ah_hdrlen __P((struct secasvar *));
+extern int ah_hdrlen(struct secasvar *);
-extern size_t ah_hdrsiz __P((struct ipsecrequest *));
-extern void ah4_input __P((struct mbuf *, ...));
-extern int ah4_output __P((struct mbuf *, struct ipsecrequest *));
-extern int ah4_calccksum __P((struct mbuf *, u_int8_t *, size_t,
- const struct ah_algorithm *, struct secasvar *));
+extern size_t ah_hdrsiz(struct ipsecrequest *);
+extern void ah4_input(struct mbuf *, ...);
+extern int ah4_output(struct mbuf *, struct ipsecrequest *);
+extern int ah4_calccksum(struct mbuf *, u_int8_t *, size_t,
+ const struct ah_algorithm *, struct secasvar *);
extern void ah4_init(void);
extern void *ah4_ctlinput(int, const struct sockaddr *, void *);
diff --git a/sys/netinet6/ah_aesxcbcmac.h b/sys/netinet6/ah_aesxcbcmac.h
index d6b60a0e023..5600c0e84c1 100644
--- a/sys/netinet6/ah_aesxcbcmac.h
+++ b/sys/netinet6/ah_aesxcbcmac.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ah_aesxcbcmac.h,v 1.2 2005/12/10 23:39:56 elad Exp $ */
+/* $NetBSD: ah_aesxcbcmac.h,v 1.3 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: ah_aesxcbcmac.h,v 1.2 2003/07/20 00:29:37 itojun Exp $ */
/*
@@ -33,11 +33,11 @@
#ifndef _NETINET6_AH_AESXCBCMAC_H_
#define _NETINET6_AH_AESXCBCMAC_H_
-extern int ah_aes_xcbc_mac_init __P((struct ah_algorithm_state *,
- struct secasvar *));
-extern void ah_aes_xcbc_mac_loop __P((struct ah_algorithm_state *, u_int8_t *,
- size_t));
-extern void ah_aes_xcbc_mac_result __P((struct ah_algorithm_state *,
- u_int8_t *, size_t));
+extern int ah_aes_xcbc_mac_init(struct ah_algorithm_state *,
+ struct secasvar *);
+extern void ah_aes_xcbc_mac_loop(struct ah_algorithm_state *, u_int8_t *,
+ size_t);
+extern void ah_aes_xcbc_mac_result(struct ah_algorithm_state *,
+ u_int8_t *, size_t);
#endif /* !_NETINET6_AH_AESXCBCMAC_H_ */
diff --git a/sys/netinet6/ah_core.c b/sys/netinet6/ah_core.c
index 140ffb16c11..e24d9e1db79 100644
--- a/sys/netinet6/ah_core.c
+++ b/sys/netinet6/ah_core.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ah_core.c,v 1.44 2007/05/23 17:15:00 christos Exp $ */
+/* $NetBSD: ah_core.c,v 1.45 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: ah_core.c,v 1.57 2003/07/25 09:33:36 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ah_core.c,v 1.44 2007/05/23 17:15:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ah_core.c,v 1.45 2009/03/14 14:46:10 dsl Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -86,66 +86,66 @@ __KERNEL_RCSID(0, "$NetBSD: ah_core.c,v 1.44 2007/05/23 17:15:00 christos Exp $"
#include <net/net_osdep.h>
-static int ah_sumsiz_1216 __P((struct secasvar *));
-static int ah_sumsiz_zero __P((struct secasvar *));
-static int ah_common_mature __P((struct secasvar *));
-static int ah_none_mature __P((struct secasvar *));
-static int ah_none_init __P((struct ah_algorithm_state *, struct secasvar *));
-static void ah_none_loop __P((struct ah_algorithm_state *, u_int8_t *, size_t));
-static void ah_none_result __P((struct ah_algorithm_state *,
- u_int8_t *, size_t));
-static int ah_keyed_md5_mature __P((struct secasvar *));
-static int ah_keyed_md5_init __P((struct ah_algorithm_state *,
- struct secasvar *));
-static void ah_keyed_md5_loop __P((struct ah_algorithm_state *, u_int8_t *,
- size_t));
-static void ah_keyed_md5_result __P((struct ah_algorithm_state *,
- u_int8_t *, size_t));
-static int ah_keyed_sha1_init __P((struct ah_algorithm_state *,
- struct secasvar *));
-static void ah_keyed_sha1_loop __P((struct ah_algorithm_state *, u_int8_t *,
- size_t));
-static void ah_keyed_sha1_result __P((struct ah_algorithm_state *, u_int8_t *,
- size_t));
-static int ah_hmac_md5_init __P((struct ah_algorithm_state *,
- struct secasvar *));
-static void ah_hmac_md5_loop __P((struct ah_algorithm_state *, u_int8_t *,
- size_t));
-static void ah_hmac_md5_result __P((struct ah_algorithm_state *,
- u_int8_t *, size_t));
-static int ah_hmac_sha1_init __P((struct ah_algorithm_state *,
- struct secasvar *));
-static void ah_hmac_sha1_loop __P((struct ah_algorithm_state *, u_int8_t *,
- size_t));
-static void ah_hmac_sha1_result __P((struct ah_algorithm_state *,
- u_int8_t *, size_t));
-static int ah_hmac_sha2_256_init __P((struct ah_algorithm_state *,
- struct secasvar *));
-static void ah_hmac_sha2_256_loop __P((struct ah_algorithm_state *, u_int8_t *,
- size_t));
-static void ah_hmac_sha2_256_result __P((struct ah_algorithm_state *,
- u_int8_t *, size_t));
-static int ah_hmac_sha2_384_init __P((struct ah_algorithm_state *,
- struct secasvar *));
-static void ah_hmac_sha2_384_loop __P((struct ah_algorithm_state *, u_int8_t *,
- size_t));
-static void ah_hmac_sha2_384_result __P((struct ah_algorithm_state *,
- u_int8_t *, size_t));
-static int ah_hmac_sha2_512_init __P((struct ah_algorithm_state *,
- struct secasvar *));
-static void ah_hmac_sha2_512_loop __P((struct ah_algorithm_state *, u_int8_t *,
- size_t));
-static void ah_hmac_sha2_512_result __P((struct ah_algorithm_state *,
- u_int8_t *, size_t));
-static int ah_hmac_ripemd160_init __P((struct ah_algorithm_state *,
- struct secasvar *));
-static void ah_hmac_ripemd160_loop __P((struct ah_algorithm_state *, u_int8_t *,
- size_t));
-static void ah_hmac_ripemd160_result __P((struct ah_algorithm_state *,
- u_int8_t *, size_t));
-
-static void ah_update_mbuf __P((struct mbuf *, int, int,
- const struct ah_algorithm *, struct ah_algorithm_state *));
+static int ah_sumsiz_1216(struct secasvar *);
+static int ah_sumsiz_zero(struct secasvar *);
+static int ah_common_mature(struct secasvar *);
+static int ah_none_mature(struct secasvar *);
+static int ah_none_init(struct ah_algorithm_state *, struct secasvar *);
+static void ah_none_loop(struct ah_algorithm_state *, u_int8_t *, size_t);
+static void ah_none_result(struct ah_algorithm_state *,
+ u_int8_t *, size_t);
+static int ah_keyed_md5_mature(struct secasvar *);
+static int ah_keyed_md5_init(struct ah_algorithm_state *,
+ struct secasvar *);
+static void ah_keyed_md5_loop(struct ah_algorithm_state *, u_int8_t *,
+ size_t);
+static void ah_keyed_md5_result(struct ah_algorithm_state *,
+ u_int8_t *, size_t);
+static int ah_keyed_sha1_init(struct ah_algorithm_state *,
+ struct secasvar *);
+static void ah_keyed_sha1_loop(struct ah_algorithm_state *, u_int8_t *,
+ size_t);
+static void ah_keyed_sha1_result(struct ah_algorithm_state *, u_int8_t *,
+ size_t);
+static int ah_hmac_md5_init(struct ah_algorithm_state *,
+ struct secasvar *);
+static void ah_hmac_md5_loop(struct ah_algorithm_state *, u_int8_t *,
+ size_t);
+static void ah_hmac_md5_result(struct ah_algorithm_state *,
+ u_int8_t *, size_t);
+static int ah_hmac_sha1_init(struct ah_algorithm_state *,
+ struct secasvar *);
+static void ah_hmac_sha1_loop(struct ah_algorithm_state *, u_int8_t *,
+ size_t);
+static void ah_hmac_sha1_result(struct ah_algorithm_state *,
+ u_int8_t *, size_t);
+static int ah_hmac_sha2_256_init(struct ah_algorithm_state *,
+ struct secasvar *);
+static void ah_hmac_sha2_256_loop(struct ah_algorithm_state *, u_int8_t *,
+ size_t);
+static void ah_hmac_sha2_256_result(struct ah_algorithm_state *,
+ u_int8_t *, size_t);
+static int ah_hmac_sha2_384_init(struct ah_algorithm_state *,
+ struct secasvar *);
+static void ah_hmac_sha2_384_loop(struct ah_algorithm_state *, u_int8_t *,
+ size_t);
+static void ah_hmac_sha2_384_result(struct ah_algorithm_state *,
+ u_int8_t *, size_t);
+static int ah_hmac_sha2_512_init(struct ah_algorithm_state *,
+ struct secasvar *);
+static void ah_hmac_sha2_512_loop(struct ah_algorithm_state *, u_int8_t *,
+ size_t);
+static void ah_hmac_sha2_512_result(struct ah_algorithm_state *,
+ u_int8_t *, size_t);
+static int ah_hmac_ripemd160_init(struct ah_algorithm_state *,
+ struct secasvar *);
+static void ah_hmac_ripemd160_loop(struct ah_algorithm_state *, u_int8_t *,
+ size_t);
+static void ah_hmac_ripemd160_result(struct ah_algorithm_state *,
+ u_int8_t *, size_t);
+
+static void ah_update_mbuf(struct mbuf *, int, int,
+ const struct ah_algorithm *, struct ah_algorithm_state *);
/* checksum algorithms */
static const struct ah_algorithm ah_algorithms[] = {
diff --git a/sys/netinet6/ah_output.c b/sys/netinet6/ah_output.c
index 5cdb746c52f..d594640c32d 100644
--- a/sys/netinet6/ah_output.c
+++ b/sys/netinet6/ah_output.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ah_output.c,v 1.31 2008/04/23 06:09:05 thorpej Exp $ */
+/* $NetBSD: ah_output.c,v 1.32 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: ah_output.c,v 1.31 2001/07/26 06:53:15 jinmei Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ah_output.c,v 1.31 2008/04/23 06:09:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ah_output.c,v 1.32 2009/03/14 14:46:10 dsl Exp $");
#include "opt_inet.h"
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: ah_output.c,v 1.31 2008/04/23 06:09:05 thorpej Exp $
#include <net/net_osdep.h>
#ifdef INET
-static struct in_addr *ah4_finaldst __P((struct mbuf *));
+static struct in_addr *ah4_finaldst(struct mbuf *);
#endif
/*
diff --git a/sys/netinet6/esp.h b/sys/netinet6/esp.h
index 40657607dc2..c875827ceb0 100644
--- a/sys/netinet6/esp.h
+++ b/sys/netinet6/esp.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.h,v 1.25 2008/04/24 11:38:38 ad Exp $ */
+/* $NetBSD: esp.h,v 1.26 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: esp.h,v 1.19 2001/09/04 08:43:19 itojun Exp $ */
/*
@@ -73,48 +73,48 @@ struct secasvar;
struct esp_algorithm {
size_t padbound; /* pad boundary, in byte */
int ivlenval; /* iv length, in byte */
- int (*mature) __P((struct secasvar *));
+ int (*mature)(struct secasvar *);
int keymin; /* in bits */
int keymax; /* in bits */
- size_t (*schedlen) __P((const struct esp_algorithm *));
+ size_t (*schedlen)(const struct esp_algorithm *);
const char *name;
- int (*ivlen) __P((const struct esp_algorithm *, struct secasvar *));
- int (*decrypt) __P((struct mbuf *, size_t,
- struct secasvar *, const struct esp_algorithm *, int));
- int (*encrypt) __P((struct mbuf *, size_t, size_t,
- struct secasvar *, const struct esp_algorithm *, int));
+ int (*ivlen)(const struct esp_algorithm *, struct secasvar *);
+ int (*decrypt)(struct mbuf *, size_t,
+ struct secasvar *, const struct esp_algorithm *, int);
+ int (*encrypt)(struct mbuf *, size_t, size_t,
+ struct secasvar *, const struct esp_algorithm *, int);
/* not supposed to be called directly */
- int (*schedule) __P((const struct esp_algorithm *, struct secasvar *));
- int (*blockdecrypt) __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
- int (*blockencrypt) __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
+ int (*schedule)(const struct esp_algorithm *, struct secasvar *);
+ int (*blockdecrypt)(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
+ int (*blockencrypt)(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
};
-extern const struct esp_algorithm *esp_algorithm_lookup __P((int));
-extern int esp_max_padbound __P((void));
-extern int esp_max_ivlen __P((void));
+extern const struct esp_algorithm *esp_algorithm_lookup(int);
+extern int esp_max_padbound(void);
+extern int esp_max_ivlen(void);
/* crypt routines */
-extern int esp4_output __P((struct mbuf *, struct ipsecrequest *));
-extern void esp4_input __P((struct mbuf *, ...));
-extern size_t esp_hdrsiz __P((struct ipsecrequest *));
+extern int esp4_output(struct mbuf *, struct ipsecrequest *);
+extern void esp4_input(struct mbuf *, ...);
+extern size_t esp_hdrsiz(struct ipsecrequest *);
extern void esp4_init(void);
extern void *esp4_ctlinput(int, const struct sockaddr *, void *);
#ifdef INET6
-extern int esp6_output __P((struct mbuf *, u_char *, struct mbuf *,
- struct ipsecrequest *));
-extern int esp6_input __P((struct mbuf **, int *, int));
+extern int esp6_output(struct mbuf *, u_char *, struct mbuf *,
+ struct ipsecrequest *);
+extern int esp6_input(struct mbuf **, int *, int);
extern void esp6_init(void);
extern void *esp6_ctlinput(int, const struct sockaddr *, void *);
#endif /* INET6 */
-extern int esp_schedule __P((const struct esp_algorithm *, struct secasvar *));
-extern int esp_auth __P((struct mbuf *, size_t, size_t,
- struct secasvar *, u_char *));
+extern int esp_schedule(const struct esp_algorithm *, struct secasvar *);
+extern int esp_auth(struct mbuf *, size_t, size_t,
+ struct secasvar *, u_char *);
#endif /* _KERNEL */
#endif /* !_NETINET6_ESP_H_ */
diff --git a/sys/netinet6/esp_aesctr.h b/sys/netinet6/esp_aesctr.h
index 642ea6ff834..1484ee9dc46 100644
--- a/sys/netinet6/esp_aesctr.h
+++ b/sys/netinet6/esp_aesctr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_aesctr.h,v 1.2 2005/12/10 23:39:56 elad Exp $ */
+/* $NetBSD: esp_aesctr.h,v 1.3 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: esp_aesctr.h,v 1.2 2003/07/20 00:29:38 itojun Exp $ */
/*
@@ -33,13 +33,13 @@
#ifndef _NETINET6_ESP_AESCTR_H_
#define _NETINET6_ESP_AESCTR_H_
-extern int esp_aesctr_mature __P((struct secasvar *));
-extern size_t esp_aesctr_schedlen __P((const struct esp_algorithm *));
-extern int esp_aesctr_schedule __P((const struct esp_algorithm *,
- struct secasvar *));
-extern int esp_aesctr_decrypt __P((struct mbuf *, size_t,
- struct secasvar *, const struct esp_algorithm *, int));
-extern int esp_aesctr_encrypt __P((struct mbuf *, size_t, size_t,
- struct secasvar *, const struct esp_algorithm *, int));
+extern int esp_aesctr_mature(struct secasvar *);
+extern size_t esp_aesctr_schedlen(const struct esp_algorithm *);
+extern int esp_aesctr_schedule(const struct esp_algorithm *,
+ struct secasvar *);
+extern int esp_aesctr_decrypt(struct mbuf *, size_t,
+ struct secasvar *, const struct esp_algorithm *, int);
+extern int esp_aesctr_encrypt(struct mbuf *, size_t, size_t,
+ struct secasvar *, const struct esp_algorithm *, int);
#endif /* !_NETINET6_ESP_AESCTR_H_ */
diff --git a/sys/netinet6/esp_core.c b/sys/netinet6/esp_core.c
index 95d72216c6c..69cd7ac6662 100644
--- a/sys/netinet6/esp_core.c
+++ b/sys/netinet6/esp_core.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_core.c,v 1.40 2007/05/23 17:15:00 christos Exp $ */
+/* $NetBSD: esp_core.c,v 1.41 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: esp_core.c,v 1.53 2001/11/27 09:47:30 sakane Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_core.c,v 1.40 2007/05/23 17:15:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_core.c,v 1.41 2009/03/14 14:46:10 dsl Exp $");
#include "opt_inet.h"
@@ -66,49 +66,49 @@ __KERNEL_RCSID(0, "$NetBSD: esp_core.c,v 1.40 2007/05/23 17:15:00 christos Exp $
#include <net/net_osdep.h>
-static int esp_null_mature __P((struct secasvar *));
-static int esp_null_decrypt __P((struct mbuf *, size_t,
- struct secasvar *, const struct esp_algorithm *, int));
-static int esp_null_encrypt __P((struct mbuf *, size_t, size_t,
- struct secasvar *, const struct esp_algorithm *, int));
-static int esp_descbc_mature __P((struct secasvar *));
-static int esp_descbc_ivlen __P((const struct esp_algorithm *,
- struct secasvar *));
-static int esp_des_schedule __P((const struct esp_algorithm *,
- struct secasvar *));
-static size_t esp_des_schedlen __P((const struct esp_algorithm *));
-static int esp_des_blockdecrypt __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
-static int esp_des_blockencrypt __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
-static int esp_cbc_mature __P((struct secasvar *));
-static int esp_blowfish_schedule __P((const struct esp_algorithm *,
- struct secasvar *));
-static size_t esp_blowfish_schedlen __P((const struct esp_algorithm *));
-static int esp_blowfish_blockdecrypt __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
-static int esp_blowfish_blockencrypt __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
-static int esp_cast128_schedule __P((const struct esp_algorithm *,
- struct secasvar *));
-static size_t esp_cast128_schedlen __P((const struct esp_algorithm *));
-static int esp_cast128_blockdecrypt __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
-static int esp_cast128_blockencrypt __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
-static int esp_3des_schedule __P((const struct esp_algorithm *,
- struct secasvar *));
-static size_t esp_3des_schedlen __P((const struct esp_algorithm *));
-static int esp_3des_blockdecrypt __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
-static int esp_3des_blockencrypt __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
-static int esp_common_ivlen __P((const struct esp_algorithm *,
- struct secasvar *));
-static int esp_cbc_decrypt __P((struct mbuf *, size_t,
- struct secasvar *, const struct esp_algorithm *, int));
-static int esp_cbc_encrypt __P((struct mbuf *, size_t, size_t,
- struct secasvar *, const struct esp_algorithm *, int));
+static int esp_null_mature(struct secasvar *);
+static int esp_null_decrypt(struct mbuf *, size_t,
+ struct secasvar *, const struct esp_algorithm *, int);
+static int esp_null_encrypt(struct mbuf *, size_t, size_t,
+ struct secasvar *, const struct esp_algorithm *, int);
+static int esp_descbc_mature(struct secasvar *);
+static int esp_descbc_ivlen(const struct esp_algorithm *,
+ struct secasvar *);
+static int esp_des_schedule(const struct esp_algorithm *,
+ struct secasvar *);
+static size_t esp_des_schedlen(const struct esp_algorithm *);
+static int esp_des_blockdecrypt(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
+static int esp_des_blockencrypt(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
+static int esp_cbc_mature(struct secasvar *);
+static int esp_blowfish_schedule(const struct esp_algorithm *,
+ struct secasvar *);
+static size_t esp_blowfish_schedlen(const struct esp_algorithm *);
+static int esp_blowfish_blockdecrypt(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
+static int esp_blowfish_blockencrypt(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
+static int esp_cast128_schedule(const struct esp_algorithm *,
+ struct secasvar *);
+static size_t esp_cast128_schedlen(const struct esp_algorithm *);
+static int esp_cast128_blockdecrypt(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
+static int esp_cast128_blockencrypt(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
+static int esp_3des_schedule(const struct esp_algorithm *,
+ struct secasvar *);
+static size_t esp_3des_schedlen(const struct esp_algorithm *);
+static int esp_3des_blockdecrypt(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
+static int esp_3des_blockencrypt(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
+static int esp_common_ivlen(const struct esp_algorithm *,
+ struct secasvar *);
+static int esp_cbc_decrypt(struct mbuf *, size_t,
+ struct secasvar *, const struct esp_algorithm *, int);
+static int esp_cbc_encrypt(struct mbuf *, size_t, size_t,
+ struct secasvar *, const struct esp_algorithm *, int);
#define MAXIVLEN 16
diff --git a/sys/netinet6/esp_output.c b/sys/netinet6/esp_output.c
index aed83bd8675..f3eb0096565 100644
--- a/sys/netinet6/esp_output.c
+++ b/sys/netinet6/esp_output.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_output.c,v 1.32 2008/04/23 06:09:05 thorpej Exp $ */
+/* $NetBSD: esp_output.c,v 1.33 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: esp_output.c,v 1.44 2001/07/26 06:53:15 jinmei Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_output.c,v 1.32 2008/04/23 06:09:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp_output.c,v 1.33 2009/03/14 14:46:10 dsl Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -79,8 +79,8 @@ __KERNEL_RCSID(0, "$NetBSD: esp_output.c,v 1.32 2008/04/23 06:09:05 thorpej Exp
#include <net/net_osdep.h>
-static int esp_output __P((struct mbuf *, u_char *, struct mbuf *,
- struct ipsecrequest *, int));
+static int esp_output(struct mbuf *, u_char *, struct mbuf *,
+ struct ipsecrequest *, int);
/*
* compute ESP header size.
diff --git a/sys/netinet6/esp_rijndael.h b/sys/netinet6/esp_rijndael.h
index 898c0edadff..417dd6784a0 100644
--- a/sys/netinet6/esp_rijndael.h
+++ b/sys/netinet6/esp_rijndael.h
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_rijndael.h,v 1.3 2005/12/10 23:39:56 elad Exp $ */
+/* $NetBSD: esp_rijndael.h,v 1.4 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: esp_rijndael.h,v 1.1 2000/09/20 18:15:22 itojun Exp $ */
/*
@@ -33,12 +33,12 @@
#ifndef _NETINET6_ESP_RIJNDAEL_H_
#define _NETINET6_ESP_RIJNDAEL_H_
-size_t esp_rijndael_schedlen __P((const struct esp_algorithm *));
-int esp_rijndael_schedule __P((const struct esp_algorithm *,
- struct secasvar *));
-int esp_rijndael_blockdecrypt __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
-int esp_rijndael_blockencrypt __P((const struct esp_algorithm *,
- struct secasvar *, u_int8_t *, u_int8_t *));
+size_t esp_rijndael_schedlen(const struct esp_algorithm *);
+int esp_rijndael_schedule(const struct esp_algorithm *,
+ struct secasvar *);
+int esp_rijndael_blockdecrypt(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
+int esp_rijndael_blockencrypt(const struct esp_algorithm *,
+ struct secasvar *, u_int8_t *, u_int8_t *);
#endif /* !_NETINET6_ESP_RIJNDAEL_H_ */
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index d141410e8f2..649943ba75e 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_gif.c,v 1.57 2008/11/07 00:20:18 dyoung Exp $ */
+/* $NetBSD: in6_gif.c,v 1.58 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.57 2008/11/07 00:20:18 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.58 2009/03/14 14:46:10 dsl Exp $");
#include "opt_inet.h"
#include "opt_iso.h"
@@ -71,8 +71,8 @@ __KERNEL_RCSID(0, "$NetBSD: in6_gif.c,v 1.57 2008/11/07 00:20:18 dyoung Exp $");
#include <net/net_osdep.h>
-static int gif_validate6 __P((const struct ip6_hdr *, struct gif_softc *,
- struct ifnet *));
+static int gif_validate6(const struct ip6_hdr *, struct gif_softc *,
+ struct ifnet *);
int ip6_gif_hlim = GIF_HLIM;
diff --git a/sys/netinet6/ipsec.c b/sys/netinet6/ipsec.c
index 2dc8399b0a7..942c4df3bff 100644
--- a/sys/netinet6/ipsec.c
+++ b/sys/netinet6/ipsec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.133 2008/10/11 13:40:58 pooka Exp $ */
+/* $NetBSD: ipsec.c,v 1.134 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: ipsec.c,v 1.136 2002/05/19 00:36:39 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.133 2008/10/11 13:40:58 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.134 2009/03/14 14:46:10 dsl Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -127,56 +127,56 @@ int ip6_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */
u_int ipsec_spdgen = 1; /* SPD generation # */
#ifdef SADB_X_EXT_TAG
-static struct pf_tag *ipsec_get_tag __P((struct mbuf *));
+static struct pf_tag *ipsec_get_tag(struct mbuf *);
#endif
-static struct secpolicy *ipsec_checkpcbcache __P((struct mbuf *,
- struct inpcbpolicy *, int));
-static int ipsec_fillpcbcache __P((struct inpcbpolicy *, struct mbuf *,
- struct secpolicy *, int));
-static int ipsec_invalpcbcache __P((struct inpcbpolicy *, int));
+static struct secpolicy *ipsec_checkpcbcache(struct mbuf *,
+ struct inpcbpolicy *, int);
+static int ipsec_fillpcbcache(struct inpcbpolicy *, struct mbuf *,
+ struct secpolicy *, int);
+static int ipsec_invalpcbcache(struct inpcbpolicy *, int);
static int ipsec_setspidx_mbuf
- __P((struct secpolicyindex *, int, struct mbuf *, int));
-static int ipsec_setspidx __P((struct mbuf *, struct secpolicyindex *, int));
-static void ipsec4_get_ulp __P((struct mbuf *, struct secpolicyindex *, int));
-static int ipsec4_setspidx_ipaddr __P((struct mbuf *, struct secpolicyindex *));
+(struct secpolicyindex *, int, struct mbuf *, int);
+static int ipsec_setspidx(struct mbuf *, struct secpolicyindex *, int);
+static void ipsec4_get_ulp(struct mbuf *, struct secpolicyindex *, int);
+static int ipsec4_setspidx_ipaddr(struct mbuf *, struct secpolicyindex *);
#ifdef INET6
-static void ipsec6_get_ulp __P((struct mbuf *, struct secpolicyindex *, int));
-static int ipsec6_setspidx_ipaddr __P((struct mbuf *, struct secpolicyindex *));
+static void ipsec6_get_ulp(struct mbuf *, struct secpolicyindex *, int);
+static int ipsec6_setspidx_ipaddr(struct mbuf *, struct secpolicyindex *);
#endif
-static struct inpcbpolicy *ipsec_newpcbpolicy __P((void));
-static void ipsec_delpcbpolicy __P((struct inpcbpolicy *));
+static struct inpcbpolicy *ipsec_newpcbpolicy(void);
+static void ipsec_delpcbpolicy(struct inpcbpolicy *);
#if 0
-static int ipsec_deepcopy_pcbpolicy __P((struct inpcbpolicy *));
+static int ipsec_deepcopy_pcbpolicy(struct inpcbpolicy *);
#endif
-static struct secpolicy *ipsec_deepcopy_policy __P((struct secpolicy *));
+static struct secpolicy *ipsec_deepcopy_policy(struct secpolicy *);
static int ipsec_set_policy
- __P((struct secpolicy **, int, void *, size_t, int));
-static int ipsec_get_policy __P((struct secpolicy *, struct mbuf **));
-static void vshiftl __P((unsigned char *, int, int));
-static int ipsec_in_reject __P((struct secpolicy *, struct mbuf *));
-static size_t ipsec_hdrsiz __P((struct secpolicy *));
+(struct secpolicy **, int, void *, size_t, int);
+static int ipsec_get_policy(struct secpolicy *, struct mbuf **);
+static void vshiftl(unsigned char *, int, int);
+static int ipsec_in_reject(struct secpolicy *, struct mbuf *);
+static size_t ipsec_hdrsiz(struct secpolicy *);
#ifdef INET
-static struct mbuf *ipsec4_splithdr __P((struct mbuf *));
+static struct mbuf *ipsec4_splithdr(struct mbuf *);
#endif
#ifdef INET6
-static struct mbuf *ipsec6_splithdr __P((struct mbuf *));
+static struct mbuf *ipsec6_splithdr(struct mbuf *);
#endif
#ifdef INET
-static int ipsec4_encapsulate __P((struct mbuf *, struct secasvar *));
+static int ipsec4_encapsulate(struct mbuf *, struct secasvar *);
#endif
#ifdef INET6
-static int ipsec6_encapsulate __P((struct mbuf *, struct secasvar *));
+static int ipsec6_encapsulate(struct mbuf *, struct secasvar *);
#endif
-static struct m_tag *ipsec_addaux __P((struct mbuf *));
-static struct m_tag *ipsec_findaux __P((struct mbuf *));
-static void ipsec_optaux __P((struct mbuf *, struct m_tag *));
+static struct m_tag *ipsec_addaux(struct mbuf *);
+static struct m_tag *ipsec_findaux(struct mbuf *);
+static void ipsec_optaux(struct mbuf *, struct m_tag *);
#ifdef INET
-static int ipsec4_checksa __P((struct ipsecrequest *,
- struct ipsec_output_state *));
+static int ipsec4_checksa(struct ipsecrequest *,
+ struct ipsec_output_state *);
#endif
#ifdef INET6
-static int ipsec6_checksa __P((struct ipsecrequest *,
- struct ipsec_output_state *, int));
+static int ipsec6_checksa(struct ipsecrequest *,
+ struct ipsec_output_state *, int);
#endif
#ifdef INET
diff --git a/sys/netinet6/ipsec.h b/sys/netinet6/ipsec.h
index fd7bc2e7ca3..e2924b761f8 100644
--- a/sys/netinet6/ipsec.h
+++ b/sys/netinet6/ipsec.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.49 2009/02/14 20:53:04 christos Exp $ */
+/* $NetBSD: ipsec.h,v 1.50 2009/03/14 14:46:10 dsl Exp $ */
/* $KAME: ipsec.h,v 1.51 2001/08/05 04:52:58 itojun Exp $ */
/*
@@ -350,108 +350,108 @@ extern int ip6_ipsec_ecn;
#define ipseclog(x) do { if (ipsec_debug) log x; } while (/*CONSTCOND*/ 0)
-extern int ipsec_pcbconn __P((struct inpcbpolicy *));
-extern int ipsec_pcbdisconn __P((struct inpcbpolicy *));
-extern void ipsec_invalpcbcacheall __P((void));
+extern int ipsec_pcbconn(struct inpcbpolicy *);
+extern int ipsec_pcbdisconn(struct inpcbpolicy *);
+extern void ipsec_invalpcbcacheall(void);
extern u_int ipsec_spdgen;
extern struct secpolicy *ipsec4_getpolicybysock
- __P((struct mbuf *, u_int, struct socket *, int *));
+(struct mbuf *, u_int, struct socket *, int *);
extern struct secpolicy *ipsec4_getpolicybyaddr
- __P((struct mbuf *, u_int, int, int *));
+(struct mbuf *, u_int, int, int *);
#ifdef INET6
extern struct secpolicy *ipsec6_getpolicybysock
- __P((struct mbuf *, u_int, struct socket *, int *));
+(struct mbuf *, u_int, struct socket *, int *);
extern struct secpolicy *ipsec6_getpolicybyaddr
- __P((struct mbuf *, u_int, int, int *));
+(struct mbuf *, u_int, int, int *);
#endif /* INET6 */
struct inpcb;
#ifdef INET6
struct in6pcb;
#endif
-extern int ipsec_init_pcbpolicy __P((struct socket *, struct inpcbpolicy **));
+extern int ipsec_init_pcbpolicy(struct socket *, struct inpcbpolicy **);
extern int ipsec_copy_pcbpolicy
- __P((struct inpcbpolicy *, struct inpcbpolicy *));
-extern u_int ipsec_get_reqlevel __P((struct ipsecrequest *, int));
+(struct inpcbpolicy *, struct inpcbpolicy *);
+extern u_int ipsec_get_reqlevel(struct ipsecrequest *, int);
-extern int ipsec4_set_policy __P((struct inpcb *, int, void *, size_t, int));
-extern int ipsec4_get_policy __P((struct inpcb *, void *, size_t,
- struct mbuf **));
-extern int ipsec4_delete_pcbpolicy __P((struct inpcb *));
-extern int ipsec4_in_reject_so __P((struct mbuf *, struct socket *));
-extern int ipsec4_in_reject __P((struct mbuf *, struct inpcb *));
+extern int ipsec4_set_policy(struct inpcb *, int, void *, size_t, int);
+extern int ipsec4_get_policy(struct inpcb *, void *, size_t,
+ struct mbuf **);
+extern int ipsec4_delete_pcbpolicy(struct inpcb *);
+extern int ipsec4_in_reject_so(struct mbuf *, struct socket *);
+extern int ipsec4_in_reject(struct mbuf *, struct inpcb *);
#ifdef INET6
-extern int ipsec6_in_reject_so __P((struct mbuf *, struct socket *));
-extern int ipsec6_delete_pcbpolicy __P((struct in6pcb *));
-extern int ipsec6_set_policy __P((struct in6pcb *, int, void *, size_t, int));
-extern int ipsec6_get_policy __P((struct in6pcb *, void *, size_t,
- struct mbuf **));
-extern int ipsec6_in_reject __P((struct mbuf *, struct in6pcb *));
+extern int ipsec6_in_reject_so(struct mbuf *, struct socket *);
+extern int ipsec6_delete_pcbpolicy(struct in6pcb *);
+extern int ipsec6_set_policy(struct in6pcb *, int, void *, size_t, int);
+extern int ipsec6_get_policy(struct in6pcb *, void *, size_t,
+ struct mbuf **);
+extern int ipsec6_in_reject(struct mbuf *, struct in6pcb *);
#endif /* INET6 */
struct secas;
struct tcpcb;
struct tcp6cb;
-extern int ipsec_chkreplay __P((u_int32_t, struct secasvar *));
-extern int ipsec_updatereplay __P((u_int32_t, struct secasvar *));
+extern int ipsec_chkreplay(u_int32_t, struct secasvar *);
+extern int ipsec_updatereplay(u_int32_t, struct secasvar *);
extern void ipsec4_init(void);
-extern size_t ipsec4_hdrsiz __P((struct mbuf *, u_int, struct inpcb *));
-extern size_t ipsec4_hdrsiz_tcp __P((struct tcpcb *));
+extern size_t ipsec4_hdrsiz(struct mbuf *, u_int, struct inpcb *);
+extern size_t ipsec4_hdrsiz_tcp(struct tcpcb *);
#ifdef INET6
extern void ipsec6_init(void);
-extern size_t ipsec6_hdrsiz __P((struct mbuf *, u_int, struct in6pcb *));
-extern size_t ipsec6_hdrsiz_tcp __P((struct tcpcb *));
+extern size_t ipsec6_hdrsiz(struct mbuf *, u_int, struct in6pcb *);
+extern size_t ipsec6_hdrsiz_tcp(struct tcpcb *);
#endif
struct ip;
#ifdef INET6
struct ip6_hdr;
#endif
-extern const char *ipsec4_logpacketstr __P((struct ip *, u_int32_t));
+extern const char *ipsec4_logpacketstr(struct ip *, u_int32_t);
#ifdef INET6
-extern const char *ipsec6_logpacketstr __P((struct ip6_hdr *, u_int32_t));
+extern const char *ipsec6_logpacketstr(struct ip6_hdr *, u_int32_t);
#endif
-extern const char *ipsec_logsastr __P((struct secasvar *));
+extern const char *ipsec_logsastr(struct secasvar *);
-extern void ipsec_dumpmbuf __P((struct mbuf *));
+extern void ipsec_dumpmbuf(struct mbuf *);
-extern int ipsec4_output __P((struct ipsec_output_state *, struct secpolicy *,
- int));
+extern int ipsec4_output(struct ipsec_output_state *, struct secpolicy *,
+ int);
#ifdef INET6
-extern int ipsec6_output_trans __P((struct ipsec_output_state *, u_char *,
- struct mbuf *, struct secpolicy *, int, int *));
-extern int ipsec6_output_tunnel __P((struct ipsec_output_state *,
- struct secpolicy *, int));
+extern int ipsec6_output_trans(struct ipsec_output_state *, u_char *,
+ struct mbuf *, struct secpolicy *, int, int *);
+extern int ipsec6_output_tunnel(struct ipsec_output_state *,
+ struct secpolicy *, int);
#endif
-extern int ipsec4_tunnel_validate __P((struct ip *, u_int, struct secasvar *));
+extern int ipsec4_tunnel_validate(struct ip *, u_int, struct secasvar *);
#ifdef INET6
-extern int ipsec6_tunnel_validate __P((struct ip6_hdr *, u_int,
- struct secasvar *));
+extern int ipsec6_tunnel_validate(struct ip6_hdr *, u_int,
+ struct secasvar *);
#endif
-extern struct mbuf *ipsec_copypkt __P((struct mbuf *));
-extern void ipsec_delaux __P((struct mbuf *));
-extern int ipsec_addhist __P((struct mbuf *, int, u_int32_t));
-extern int ipsec_getnhist __P((struct mbuf *));
-extern struct ipsec_history *ipsec_gethist __P((struct mbuf *, int *));
-extern void ipsec_clearhist __P((struct mbuf *));
+extern struct mbuf *ipsec_copypkt(struct mbuf *);
+extern void ipsec_delaux(struct mbuf *);
+extern int ipsec_addhist(struct mbuf *, int, u_int32_t);
+extern int ipsec_getnhist(struct mbuf *);
+extern struct ipsec_history *ipsec_gethist(struct mbuf *, int *);
+extern void ipsec_clearhist(struct mbuf *);
-extern int ipsec_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
-extern int ipsec6_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
+extern int ipsec_sysctl(int *, u_int, void *, size_t *, void *, size_t);
+extern int ipsec6_sysctl(int *, u_int, void *, size_t *, void *, size_t);
#endif /* _KERNEL */
#ifndef _KERNEL
typedef void *ipsec_policy_t;
-extern ipsec_policy_t ipsec_set_policy __P((const char *, int));
-extern int ipsec_get_policylen __P((ipsec_policy_t));
-extern char *ipsec_dump_policy __P((ipsec_policy_t, const char *));
+extern ipsec_policy_t ipsec_set_policy(const char *, int);
+extern int ipsec_get_policylen(ipsec_policy_t);
+extern char *ipsec_dump_policy(ipsec_policy_t, const char *);
-extern const char *ipsec_strerror __P((void));
+extern const char *ipsec_strerror(void);
#endif /* !_KERNEL */
#endif /* !_NETINET6_IPSEC_H_ */
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c
index 927501fde51..3d3278b95e5 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.c,v 1.16 2008/04/24 11:38:38 ad Exp $ */
+/* $NetBSD: keysock.c,v 1.17 2009/03/14 14:46:10 dsl Exp $ */
/* $FreeBSD: src/sys/netipsec/keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.16 2008/04/24 11:38:38 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.17 2009/03/14 14:46:10 dsl Exp $");
#include "opt_ipsec.h"
@@ -83,7 +83,7 @@ static struct sockaddr key_src = {
};
-static int key_sendup0 __P((struct rawcb *, struct mbuf *, int, int));
+static int key_sendup0(struct rawcb *, struct mbuf *, int, int);
int key_registered_sb_max = (NMBCLUSTERS * MHLEN); /* XXX arbitrary */
diff --git a/sys/netisdn/i4b_ctl.c b/sys/netisdn/i4b_ctl.c
index 04c29be2e3c..cdc38f82a65 100644
--- a/sys/netisdn/i4b_ctl.c
+++ b/sys/netisdn/i4b_ctl.c
@@ -27,7 +27,7 @@
* i4b_ctl.c - i4b system control port driver
* ------------------------------------------
*
- * $Id: i4b_ctl.c,v 1.19 2007/10/19 12:16:47 ad Exp $
+ * $Id: i4b_ctl.c,v 1.20 2009/03/14 14:46:10 dsl Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_ctl.c,v 1.19 2007/10/19 12:16:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_ctl.c,v 1.20 2009/03/14 14:46:10 dsl Exp $");
#include "isdnctl.h"
@@ -146,10 +146,10 @@ static void *devfs_token;
#ifndef __FreeBSD__
#define PDEVSTATIC /* */
-void isdnctlattach __P((void));
-int isdnctlopen __P((dev_t dev, int flag, int fmt, struct lwp *l));
-int isdnctlclose __P((dev_t dev, int flag, int fmt, struct lwp *l));
-int isdnctlioctl __P((dev_t dev, u_long cmd, void *data, int flag, struct lwp *l));
+void isdnctlattach(void);
+int isdnctlopen(dev_t dev, int flag, int fmt, struct lwp *l);
+int isdnctlclose(dev_t dev, int flag, int fmt, struct lwp *l);
+int isdnctlioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l);
#endif /* !FreeBSD */
#ifdef __NetBSD__
diff --git a/sys/netisdn/i4b_i4bdrv.c b/sys/netisdn/i4b_i4bdrv.c
index bf3dabcf3bc..e3825bbf48f 100644
--- a/sys/netisdn/i4b_i4bdrv.c
+++ b/sys/netisdn/i4b_i4bdrv.c
@@ -27,7 +27,7 @@
* i4b_i4bdrv.c - i4b userland interface driver
* --------------------------------------------
*
- * $Id: i4b_i4bdrv.c,v 1.34 2008/03/01 18:59:45 veego Exp $
+ * $Id: i4b_i4bdrv.c,v 1.35 2009/03/14 14:46:10 dsl Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_i4bdrv.c,v 1.34 2008/03/01 18:59:45 veego Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_i4bdrv.c,v 1.35 2009/03/14 14:46:10 dsl Exp $");
#include "isdn.h"
@@ -110,17 +110,17 @@ static void *devfs_token;
#ifndef __FreeBSD__
#define PDEVSTATIC /* - not static - */
-PDEVSTATIC void isdnattach __P((void));
-PDEVSTATIC int isdnopen __P((dev_t dev, int flag, int fmt, struct lwp *l));
-PDEVSTATIC int isdnclose __P((dev_t dev, int flag, int fmt, struct lwp *l));
-PDEVSTATIC int isdnread __P((dev_t dev, struct uio *uio, int ioflag));
-PDEVSTATIC int isdnioctl __P((dev_t dev, u_long cmd, void *data, int flag, struct lwp *l));
+PDEVSTATIC void isdnattach(void);
+PDEVSTATIC int isdnopen(dev_t dev, int flag, int fmt, struct lwp *l);
+PDEVSTATIC int isdnclose(dev_t dev, int flag, int fmt, struct lwp *l);
+PDEVSTATIC int isdnread(dev_t dev, struct uio *uio, int ioflag);
+PDEVSTATIC int isdnioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l);
#ifdef OS_USES_POLL
-PDEVSTATIC int isdnpoll __P((dev_t dev, int events, struct lwp *l));
-PDEVSTATIC int isdnkqfilter __P((dev_t dev, struct knote *kn));
+PDEVSTATIC int isdnpoll(dev_t dev, int events, struct lwp *l);
+PDEVSTATIC int isdnkqfilter(dev_t dev, struct knote *kn);
#else
-PDEVSTATIC int isdnselect __P((dev_t dev, int rw, struct lwp *l));
+PDEVSTATIC int isdnselect(dev_t dev, int rw, struct lwp *l);
#endif
#endif /* #ifndef __FreeBSD__ */
diff --git a/sys/netisdn/i4b_ipr.c b/sys/netisdn/i4b_ipr.c
index d3cc9a8e3c5..4df1b286375 100644
--- a/sys/netisdn/i4b_ipr.c
+++ b/sys/netisdn/i4b_ipr.c
@@ -27,7 +27,7 @@
* i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
* ---------------------------------------------------------
*
- * $Id: i4b_ipr.c,v 1.31 2008/11/09 15:48:13 martin Exp $
+ * $Id: i4b_ipr.c,v 1.32 2009/03/14 14:46:10 dsl Exp $
*
* $FreeBSD$
*
@@ -59,7 +59,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.31 2008/11/09 15:48:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.32 2009/03/14 14:46:10 dsl Exp $");
#include "irip.h"
#include "opt_irip.h"
@@ -247,7 +247,7 @@ PDEVSTATIC void iripattach(void *);
PSEUDO_SET(iripattach, i4b_ipr);
static int irpioctl(struct ifnet *ifp, IOCTL_CMD_T cmd, void *data);
#else
-PDEVSTATIC void iripattach __P((void));
+PDEVSTATIC void iripattach(void);
static int iripioctl(struct ifnet *ifp, u_long cmd, void *data);
#endif
diff --git a/sys/netisdn/i4b_l2.h b/sys/netisdn/i4b_l2.h
index 95128a2a526..b1ccc7db6ae 100644
--- a/sys/netisdn/i4b_l2.h
+++ b/sys/netisdn/i4b_l2.h
@@ -1,4 +1,4 @@
-/* $NetBSD: i4b_l2.h,v 1.13 2007/03/04 06:03:31 christos Exp $ */
+/* $NetBSD: i4b_l2.h,v 1.14 2009/03/14 14:46:11 dsl Exp $ */
/*
* Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
@@ -29,7 +29,7 @@
* i4b_l2.h - ISDN layer 2 (Q.921) definitions
* ---------------------------------------------
*
- * $Id: i4b_l2.h,v 1.13 2007/03/04 06:03:31 christos Exp $
+ * $Id: i4b_l2.h,v 1.14 2009/03/14 14:46:11 dsl Exp $
*
* $FreeBSD$
*
@@ -362,6 +362,6 @@ extern int i4b_dl_unit_data_ind ( struct isdn_l3_driver *drv, struct mbuf *m );
extern int i4b_dl_data_ind ( struct isdn_l3_driver *drv, struct mbuf *m );
int i4b_mdl_command_req(struct isdn_l3_driver *drv, int, void *);
void *isdn_find_softc_by_isdnif(int isdnif);
-extern int isdn_bchan_silence __P(( unsigned char *data, int len ));
+extern int isdn_bchan_silence( unsigned char *data, int len );
#endif /* !_NETISDN_I4B_L2_H_ */
diff --git a/sys/netisdn/i4b_l2fsm.c b/sys/netisdn/i4b_l2fsm.c
index e2b609bdec0..595588cf750 100644
--- a/sys/netisdn/i4b_l2fsm.c
+++ b/sys/netisdn/i4b_l2fsm.c
@@ -27,7 +27,7 @@
* i4b_l2fsm.c - layer 2 FSM
* -------------------------
*
- * $Id: i4b_l2fsm.c,v 1.12 2007/01/24 13:08:15 hubertf Exp $
+ * $Id: i4b_l2fsm.c,v 1.13 2009/03/14 14:46:11 dsl Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_l2fsm.c,v 1.12 2007/01/24 13:08:15 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_l2fsm.c,v 1.13 2009/03/14 14:46:11 dsl Exp $");
#ifdef __FreeBSD__
#include "i4bq921.h"
@@ -114,80 +114,80 @@ static const char *l2event_text[N_EVENTS] = {
};
#endif
-static void F_TU01 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TU03 __P((l2_softc_t *, struct isdn_l3_driver *));
-
-static void F_TA03 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TA04 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TA05 __P((l2_softc_t *, struct isdn_l3_driver *));
-
-static void F_TE03 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TE04 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TE05 __P((l2_softc_t *, struct isdn_l3_driver *));
-
-static void F_T01 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_T05 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_T06 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_T07 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_T08 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_T09 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_T10 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_T13 __P((l2_softc_t *, struct isdn_l3_driver *));
-
-static void F_AE01 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AE05 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AE06 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AE07 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AE08 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AE09 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AE10 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AE11 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AE12 __P((l2_softc_t *, struct isdn_l3_driver *));
-
-static void F_AR05 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AR06 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AR07 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AR08 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AR09 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AR10 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_AR11 __P((l2_softc_t *, struct isdn_l3_driver *));
-
-static void F_MF01 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF05 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF06 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF07 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF08 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF09 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF10 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF11 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF12 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF13 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF14 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF15 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF16 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF17 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF18 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF19 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_MF20 __P((l2_softc_t *, struct isdn_l3_driver *));
-
-static void F_TR01 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR05 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR06 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR07 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR08 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR09 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR10 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR11 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR12 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR13 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR15 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR16 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR17 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR18 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR19 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_TR20 __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_ILL __P((l2_softc_t *, struct isdn_l3_driver *));
-static void F_NCNA __P((l2_softc_t *, struct isdn_l3_driver *));
+static void F_TU01(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TU03(l2_softc_t *, struct isdn_l3_driver *);
+
+static void F_TA03(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TA04(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TA05(l2_softc_t *, struct isdn_l3_driver *);
+
+static void F_TE03(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TE04(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TE05(l2_softc_t *, struct isdn_l3_driver *);
+
+static void F_T01(l2_softc_t *, struct isdn_l3_driver *);
+static void F_T05(l2_softc_t *, struct isdn_l3_driver *);
+static void F_T06(l2_softc_t *, struct isdn_l3_driver *);
+static void F_T07(l2_softc_t *, struct isdn_l3_driver *);
+static void F_T08(l2_softc_t *, struct isdn_l3_driver *);
+static void F_T09(l2_softc_t *, struct isdn_l3_driver *);
+static void F_T10(l2_softc_t *, struct isdn_l3_driver *);
+static void F_T13(l2_softc_t *, struct isdn_l3_driver *);
+
+static void F_AE01(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AE05(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AE06(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AE07(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AE08(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AE09(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AE10(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AE11(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AE12(l2_softc_t *, struct isdn_l3_driver *);
+
+static void F_AR05(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AR06(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AR07(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AR08(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AR09(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AR10(l2_softc_t *, struct isdn_l3_driver *);
+static void F_AR11(l2_softc_t *, struct isdn_l3_driver *);
+
+static void F_MF01(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF05(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF06(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF07(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF08(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF09(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF10(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF11(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF12(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF13(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF14(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF15(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF16(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF17(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF18(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF19(l2_softc_t *, struct isdn_l3_driver *);
+static void F_MF20(l2_softc_t *, struct isdn_l3_driver *);
+
+static void F_TR01(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR05(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR06(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR07(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR08(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR09(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR10(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR11(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR12(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR13(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR15(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR16(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR17(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR18(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR19(l2_softc_t *, struct isdn_l3_driver *);
+static void F_TR20(l2_softc_t *, struct isdn_l3_driver *);
+static void F_ILL(l2_softc_t *, struct isdn_l3_driver *);
+static void F_NCNA(l2_softc_t *, struct isdn_l3_driver *);
/*---------------------------------------------------------------------------*
* FSM illegal state default action
@@ -211,7 +211,7 @@ F_NCNA(l2_softc_t *l2sc, struct isdn_l3_driver *drv)
* layer 2 state transition table
*---------------------------------------------------------------------------*/
struct l2state_tab {
- void (*func) __P((l2_softc_t *, struct isdn_l3_driver *)); /* function to execute */
+ void (*func)(l2_softc_t *, struct isdn_l3_driver *); /* function to execute */
int newstate; /* next state */
} l2state_tab[N_EVENTS][N_STATES] = {
diff --git a/sys/netisdn/i4b_rbch.c b/sys/netisdn/i4b_rbch.c
index 405c2c8f227..fde8c864bcc 100644
--- a/sys/netisdn/i4b_rbch.c
+++ b/sys/netisdn/i4b_rbch.c
@@ -27,7 +27,7 @@
* i4b_rbch.c - device driver for raw B channel data
* ---------------------------------------------------
*
- * $Id: i4b_rbch.c,v 1.23 2008/03/01 14:16:52 rmind Exp $
+ * $Id: i4b_rbch.c,v 1.24 2009/03/14 14:46:11 dsl Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_rbch.c,v 1.23 2008/03/01 14:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_rbch.c,v 1.24 2009/03/14 14:46:11 dsl Exp $");
#include "isdnbchan.h"
@@ -174,17 +174,17 @@ static void* rbch_get_softc(int unit);
#ifndef __FreeBSD__
#define PDEVSTATIC /* - not static - */
#define IOCTL_CMD_T u_long
-void isdnbchanattach __P((void));
-int isdnbchanopen __P((dev_t dev, int flag, int fmt, struct lwp *l));
-int isdnbchanclose __P((dev_t dev, int flag, int fmt, struct lwp *l));
-int isdnbchanread __P((dev_t dev, struct uio *uio, int ioflag));
-int isdnbchanwrite __P((dev_t dev, struct uio *uio, int ioflag));
-int isdnbchanioctl __P((dev_t dev, IOCTL_CMD_T cmd, void *arg, int flag, struct lwp* l));
+void isdnbchanattach(void);
+int isdnbchanopen(dev_t dev, int flag, int fmt, struct lwp *l);
+int isdnbchanclose(dev_t dev, int flag, int fmt, struct lwp *l);
+int isdnbchanread(dev_t dev, struct uio *uio, int ioflag);
+int isdnbchanwrite(dev_t dev, struct uio *uio, int ioflag);
+int isdnbchanioctl(dev_t dev, IOCTL_CMD_T cmd, void *arg, int flag, struct lwp* l);
#ifdef OS_USES_POLL
-int isdnbchanpoll __P((dev_t dev, int events, struct lwp *l));
-int isdnbchankqfilter __P((dev_t dev, struct knote *kn));
+int isdnbchanpoll(dev_t dev, int events, struct lwp *l);
+int isdnbchankqfilter(dev_t dev, struct knote *kn);
#else
-PDEVSTATIC int isdnbchanselect __P((dev_t dev, int rw, struct lwp *l));
+PDEVSTATIC int isdnbchanselect(dev_t dev, int rw, struct lwp *l);
#endif
#endif
diff --git a/sys/netisdn/i4b_tel.c b/sys/netisdn/i4b_tel.c
index f37c3a791f8..13c49424074 100644
--- a/sys/netisdn/i4b_tel.c
+++ b/sys/netisdn/i4b_tel.c
@@ -27,7 +27,7 @@
* i4b_tel.c - device driver for ISDN telephony
* --------------------------------------------
*
- * $Id: i4b_tel.c,v 1.22 2008/03/01 14:16:52 rmind Exp $
+ * $Id: i4b_tel.c,v 1.23 2009/03/14 14:46:11 dsl Exp $
*
* $FreeBSD$
*
@@ -36,7 +36,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_tel.c,v 1.22 2008/03/01 14:16:52 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_tel.c,v 1.23 2009/03/14 14:46:11 dsl Exp $");
#include "isdntel.h"
@@ -175,19 +175,19 @@ static u_char sinetab[];
#ifndef __FreeBSD__
#define PDEVSTATIC /* - not static - */
-PDEVSTATIC void isdntelattach __P((void));
-PDEVSTATIC int isdntelioctl __P((dev_t dev, u_long cmd, void *data, int flag, struct lwp *l));
+PDEVSTATIC void isdntelattach(void);
+PDEVSTATIC int isdntelioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l);
-int isdntelopen __P((dev_t dev, int flag, int fmt, struct lwp *l));
-int isdntelclose __P((dev_t dev, int flag, int fmt, struct lwp *l));
-int isdntelread __P((dev_t dev, struct uio *uio, int ioflag));
-int isdntelwrite __P((dev_t dev, struct uio * uio, int ioflag));
+int isdntelopen(dev_t dev, int flag, int fmt, struct lwp *l);
+int isdntelclose(dev_t dev, int flag, int fmt, struct lwp *l);
+int isdntelread(dev_t dev, struct uio *uio, int ioflag);
+int isdntelwrite(dev_t dev, struct uio * uio, int ioflag);
#ifdef OS_USES_POLL
-int isdntelpoll __P((dev_t dev, int events, struct lwp *l));
-int isdntelkqfilter __P((dev_t dev, struct knote *kn));
+int isdntelpoll(dev_t dev, int events, struct lwp *l);
+int isdntelkqfilter(dev_t dev, struct knote *kn);
#else
-int isdntelsel __P((dev_t dev, int rw, struct lwp *l));
+int isdntelsel(dev_t dev, int rw, struct lwp *l);
#endif
#endif /* __FreeBSD__ */
diff --git a/sys/netisdn/i4b_trace.c b/sys/netisdn/i4b_trace.c
index afa026c8f2e..a48dfaa0ad3 100644
--- a/sys/netisdn/i4b_trace.c
+++ b/sys/netisdn/i4b_trace.c
@@ -27,7 +27,7 @@
* i4btrc - device driver for trace data read device
* ---------------------------------------------------
*
- * $Id: i4b_trace.c,v 1.18 2007/03/04 06:03:31 christos Exp $
+ * $Id: i4b_trace.c,v 1.19 2009/03/14 14:46:11 dsl Exp $
*
* last edit-date: [Fri Jan 5 11:33:47 2001]
*
@@ -35,7 +35,7 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i4b_trace.c,v 1.18 2007/03/04 06:03:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i4b_trace.c,v 1.19 2009/03/14 14:46:11 dsl Exp $");
#include "isdntrc.h"
@@ -81,11 +81,11 @@ static int txunit = -1; /* l2 isdnif of transmitting driver */
static int outunit = -1; /* output device for trace data */
#define PDEVSTATIC /* - not static - */
-void isdntrcattach __P((void));
-int isdntrcopen __P((dev_t dev, int flag, int fmt, struct lwp *l));
-int isdntrcclose __P((dev_t dev, int flag, int fmt, struct lwp *l));
-int isdntrcread __P((dev_t dev, struct uio * uio, int ioflag));
-int isdntrcioctl __P((dev_t dev, u_long cmd, void *data, int flag, struct lwp *l));
+void isdntrcattach(void);
+int isdntrcopen(dev_t dev, int flag, int fmt, struct lwp *l);
+int isdntrcclose(dev_t dev, int flag, int fmt, struct lwp *l);
+int isdntrcread(dev_t dev, struct uio * uio, int ioflag);
+int isdntrcioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l);
#ifdef __NetBSD__
const struct cdevsw isdntrc_cdevsw = {
diff --git a/sys/netkey/key.c b/sys/netkey/key.c
index 840298f3a54..94471b1c797 100644
--- a/sys/netkey/key.c
+++ b/sys/netkey/key.c
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.165 2009/02/14 20:51:39 christos Exp $ */
+/* $NetBSD: key.c,v 1.166 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: key.c,v 1.310 2003/09/08 02:23:44 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.165 2009/02/14 20:51:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.166 2009/03/14 14:46:11 dsl Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -332,151 +332,151 @@ struct sadb_msghdr {
int extlen[SADB_EXT_MAX + 1];
};
-static struct secasvar *key_allocsa_policy __P((struct secasindex *));
-static struct secasvar *key_do_allocsa_policy __P((struct secashead *, u_int));
-static void key_delsav __P((struct secasvar *));
-static void key_delsp __P((struct secpolicy *));
-static struct secpolicy *key_getsp __P((struct secpolicyindex *, int));
+static struct secasvar *key_allocsa_policy(struct secasindex *);
+static struct secasvar *key_do_allocsa_policy(struct secashead *, u_int);
+static void key_delsav(struct secasvar *);
+static void key_delsp(struct secpolicy *);
+static struct secpolicy *key_getsp(struct secpolicyindex *, int);
#ifdef SADB_X_EXT_TAG
-static struct secpolicy *key_getspbytag __P((u_int16_t, int));
+static struct secpolicy *key_getspbytag(u_int16_t, int);
#endif
-static u_int16_t key_newreqid __P((void));
-static struct mbuf *key_gather_mbuf __P((struct mbuf *,
- const struct sadb_msghdr *, int, int, ...));
-static int key_spdadd __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_spddelete __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_spddelete2 __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_spdget __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_spdflush __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_spddump __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
+static u_int16_t key_newreqid(void);
+static struct mbuf *key_gather_mbuf(struct mbuf *,
+ const struct sadb_msghdr *, int, int, ...);
+static int key_spdadd(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_spddelete(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_spddelete2(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_spdget(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_spdflush(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_spddump(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
#ifdef IPSEC_NAT_T
-static int key_nat_map __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
+static int key_nat_map(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
#endif
-static struct mbuf *key_setspddump __P((int *));
-static u_int key_getspreqmsglen __P((struct secpolicy *));
-static int key_spdexpire __P((struct secpolicy *));
-static struct secashead *key_newsah __P((struct secasindex *));
-static void key_delsah __P((struct secashead *));
-static struct secasvar *key_newsav __P((struct mbuf *,
- const struct sadb_msghdr *, struct secashead *, int *));
-static struct secashead *key_getsah __P((struct secasindex *));
-static struct secasvar *key_checkspidup __P((struct secasindex *, u_int32_t));
-static void key_setspi __P((struct secasvar *, u_int32_t));
-static struct secasvar *key_getsavbyspi __P((struct secashead *, u_int32_t));
-static int key_setsaval __P((struct secasvar *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_mature __P((struct secasvar *));
-static struct mbuf *key_setdumpsa __P((struct secasvar *, u_int8_t,
- u_int8_t, u_int32_t, u_int32_t));
-static struct mbuf *key_setsadbmsg __P((u_int8_t, u_int16_t, u_int8_t,
- u_int32_t, pid_t, u_int16_t));
-static struct mbuf *key_setsadbsa __P((struct secasvar *));
-static struct mbuf *key_setsadbaddr __P((u_int16_t,
- struct sockaddr *, u_int8_t, u_int16_t));
+static struct mbuf *key_setspddump(int *);
+static u_int key_getspreqmsglen(struct secpolicy *);
+static int key_spdexpire(struct secpolicy *);
+static struct secashead *key_newsah(struct secasindex *);
+static void key_delsah(struct secashead *);
+static struct secasvar *key_newsav(struct mbuf *,
+ const struct sadb_msghdr *, struct secashead *, int *);
+static struct secashead *key_getsah(struct secasindex *);
+static struct secasvar *key_checkspidup(struct secasindex *, u_int32_t);
+static void key_setspi(struct secasvar *, u_int32_t);
+static struct secasvar *key_getsavbyspi(struct secashead *, u_int32_t);
+static int key_setsaval(struct secasvar *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_mature(struct secasvar *);
+static struct mbuf *key_setdumpsa(struct secasvar *, u_int8_t,
+ u_int8_t, u_int32_t, u_int32_t);
+static struct mbuf *key_setsadbmsg(u_int8_t, u_int16_t, u_int8_t,
+ u_int32_t, pid_t, u_int16_t);
+static struct mbuf *key_setsadbsa(struct secasvar *);
+static struct mbuf *key_setsadbaddr(u_int16_t,
+ struct sockaddr *, u_int8_t, u_int16_t);
#if 0
-static struct mbuf *key_setsadbident __P((u_int16_t, u_int16_t, void *,
- int, u_int64_t));
+static struct mbuf *key_setsadbident(u_int16_t, u_int16_t, void *,
+ int, u_int64_t);
#endif
-static struct mbuf *key_setsadbxsa2 __P((u_int8_t, u_int32_t, u_int16_t));
+static struct mbuf *key_setsadbxsa2(u_int8_t, u_int32_t, u_int16_t);
#ifdef SADB_X_EXT_TAG
-static struct mbuf *key_setsadbxtag __P((u_int16_t));
+static struct mbuf *key_setsadbxtag(u_int16_t);
#endif
#ifdef IPSEC_NAT_T
-static struct mbuf *key_setsadbxport __P((u_int16_t, u_int16_t));
-static struct mbuf *key_setsadbxtype __P((u_int16_t));
+static struct mbuf *key_setsadbxport(u_int16_t, u_int16_t);
+static struct mbuf *key_setsadbxtype(u_int16_t);
#endif
-static void key_porttosaddr __P((struct sockaddr *, u_int16_t));
+static void key_porttosaddr(struct sockaddr *, u_int16_t);
#define KEY_PORTTOSADDR(saddr, port) \
key_porttosaddr((struct sockaddr *)(saddr), (port))
-static int key_checksalen __P((const struct sockaddr *));
+static int key_checksalen(const struct sockaddr *);
#define KEY_CHECKSALEN(saddr) key_checksalen((const struct sockaddr *)(saddr))
-static struct mbuf *key_setsadblifetime __P((u_int16_t, u_int32_t,
- u_int64_t, u_int64_t, u_int64_t));
-static struct mbuf *key_setsadbxpolicy __P((u_int16_t, u_int8_t,
- u_int32_t));
-static void *key_newbuf __P((const void *, u_int));
-static int key_ismyaddr __P((struct sockaddr *));
+static struct mbuf *key_setsadblifetime(u_int16_t, u_int32_t,
+ u_int64_t, u_int64_t, u_int64_t);
+static struct mbuf *key_setsadbxpolicy(u_int16_t, u_int8_t,
+ u_int32_t);
+static void *key_newbuf(const void *, u_int);
+static int key_ismyaddr(struct sockaddr *);
#ifdef INET6
-static int key_ismyaddr6 __P((struct sockaddr_in6 *));
+static int key_ismyaddr6(struct sockaddr_in6 *);
#endif
static int key_cmpsaidx_exactly
- __P((struct secasindex *, struct secasindex *));
+(struct secasindex *, struct secasindex *);
static int key_cmpsaidx_withmode
- __P((struct secasindex *, struct secasindex *));
+(struct secasindex *, struct secasindex *);
static int key_cmpsaidx_withoutmode
- __P((struct secasindex *, struct secasindex *));
-static int key_sockaddrcmp __P((struct sockaddr *, struct sockaddr *, int));
-static int key_bbcmp __P((void *, void *, u_int));
-static u_long key_random __P((void));
-static u_int16_t key_satype2proto __P((u_int8_t));
-static u_int8_t key_proto2satype __P((u_int16_t));
-
-static int key_getspi __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static u_int32_t key_do_getnewspi __P((struct sadb_spirange *,
- struct secasindex *));
-static int key_update __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
+(struct secasindex *, struct secasindex *);
+static int key_sockaddrcmp(struct sockaddr *, struct sockaddr *, int);
+static int key_bbcmp(void *, void *, u_int);
+static u_long key_random(void);
+static u_int16_t key_satype2proto(u_int8_t);
+static u_int8_t key_proto2satype(u_int16_t);
+
+static int key_getspi(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static u_int32_t key_do_getnewspi(struct sadb_spirange *,
+ struct secasindex *);
+static int key_update(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
#ifdef IPSEC_DOSEQCHECK
-static struct secasvar *key_getsavbyseq __P((struct secashead *, u_int32_t));
+static struct secasvar *key_getsavbyseq(struct secashead *, u_int32_t);
#endif
-static int key_add __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_setident __P((struct secashead *, struct mbuf *,
- const struct sadb_msghdr *));
-static struct mbuf *key_getmsgbuf_x1 __P((struct mbuf *,
- const struct sadb_msghdr *));
-static int key_delete __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_get __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-
-static void key_getcomb_setlifetime __P((struct sadb_comb *));
+static int key_add(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_setident(struct secashead *, struct mbuf *,
+ const struct sadb_msghdr *);
+static struct mbuf *key_getmsgbuf_x1(struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_delete(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_get(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+
+static void key_getcomb_setlifetime(struct sadb_comb *);
#ifdef IPSEC_ESP
-static struct mbuf *key_getcomb_esp __P((void));
+static struct mbuf *key_getcomb_esp(void);
#endif
-static struct mbuf *key_getcomb_ah __P((void));
-static struct mbuf *key_getcomb_ipcomp __P((void));
-static struct mbuf *key_getprop __P((const struct secasindex *));
+static struct mbuf *key_getcomb_ah(void);
+static struct mbuf *key_getcomb_ipcomp(void);
+static struct mbuf *key_getprop(const struct secasindex *);
-static int key_acquire __P((struct secasindex *, struct secpolicy *));
+static int key_acquire(struct secasindex *, struct secpolicy *);
#ifndef IPSEC_NONBLOCK_ACQUIRE
-static struct secacq *key_newacq __P((struct secasindex *));
-static struct secacq *key_getacq __P((struct secasindex *));
-static struct secacq *key_getacqbyseq __P((u_int32_t));
+static struct secacq *key_newacq(struct secasindex *);
+static struct secacq *key_getacq(struct secasindex *);
+static struct secacq *key_getacqbyseq(u_int32_t);
#endif
-static struct secspacq *key_newspacq __P((struct secpolicyindex *));
-static struct secspacq *key_getspacq __P((struct secpolicyindex *));
-static int key_acquire2 __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_register __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_expire __P((struct secasvar *));
-static int key_flush __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_dump __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static struct mbuf *key_setdump __P((u_int8_t, int *));
-static int key_promisc __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *));
-static int key_senderror __P((struct socket *, struct mbuf *, int));
-static int key_validate_ext __P((const struct sadb_ext *, int));
-static int key_align __P((struct mbuf *, struct sadb_msghdr *));
+static struct secspacq *key_newspacq(struct secpolicyindex *);
+static struct secspacq *key_getspacq(struct secpolicyindex *);
+static int key_acquire2(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_register(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_expire(struct secasvar *);
+static int key_flush(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_dump(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static struct mbuf *key_setdump(u_int8_t, int *);
+static int key_promisc(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *);
+static int key_senderror(struct socket *, struct mbuf *, int);
+static int key_validate_ext(const struct sadb_ext *, int);
+static int key_align(struct mbuf *, struct sadb_msghdr *);
#if 0
-static const char *key_getfqdn __P((void));
-static const char *key_getuserfqdn __P((void));
+static const char *key_getfqdn(void);
+static const char *key_getuserfqdn(void);
#endif
-static void key_sa_chgstate __P((struct secasvar *, u_int8_t));
-static void key_sp_dead __P((struct secpolicy *));
-static void key_sp_unlink __P((struct secpolicy *));
-static struct mbuf *key_alloc_mbuf __P((int));
+static void key_sa_chgstate(struct secasvar *, u_int8_t);
+static void key_sp_dead(struct secpolicy *);
+static void key_sp_unlink(struct secpolicy *);
+static struct mbuf *key_alloc_mbuf(int);
struct callout key_timehandler_ch;
/* %%% IPsec policy management */
@@ -5833,8 +5833,8 @@ key_getmsgbuf_x1(m, mhp)
return n;
}
-static int key_delete_all __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *, u_int16_t));
+static int key_delete_all(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *, u_int16_t);
/*
* SADB_DELETE processing
@@ -7534,8 +7534,8 @@ key_promisc(so, m, mhp)
}
}
-static int (*key_typesw[]) __P((struct socket *, struct mbuf *,
- const struct sadb_msghdr *)) = {
+static int (*key_typesw[])(struct socket *, struct mbuf *,
+ const struct sadb_msghdr *) = {
NULL, /* SADB_RESERVED */
key_getspi, /* SADB_GETSPI */
key_update, /* SADB_UPDATE */
diff --git a/sys/netkey/key.h b/sys/netkey/key.h
index ebc0cebf0ce..858cefdfa1e 100644
--- a/sys/netkey/key.h
+++ b/sys/netkey/key.h
@@ -1,4 +1,4 @@
-/* $NetBSD: key.h,v 1.22 2007/03/04 06:03:34 christos Exp $ */
+/* $NetBSD: key.h,v 1.23 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: key.h,v 1.32 2003/09/07 05:25:20 itojun Exp $ */
/*
@@ -55,41 +55,41 @@ struct socket;
struct sadb_msg;
struct sadb_x_policy;
-extern struct secpolicy *key_allocsp __P((u_int16_t, struct secpolicyindex *,
- u_int));
+extern struct secpolicy *key_allocsp(u_int16_t, struct secpolicyindex *,
+ u_int);
extern int key_checkrequest
- __P((struct ipsecrequest *isr, struct secasindex *));
+(struct ipsecrequest *isr, struct secasindex *);
extern struct secasvar *key_allocsa(u_int, const void *, const void *, u_int,
u_int32_t, u_int16_t, u_int16_t);
-extern struct secpolicy *key_getspbyid __P((u_int32_t));
-extern void key_freesp __P((struct secpolicy *));
-extern void key_freesav __P((struct secasvar *));
-extern struct secpolicy *key_newsp __P((u_int32_t));
-extern struct secpolicy *key_msg2sp __P((struct sadb_x_policy *,
- size_t, int *));
-extern struct mbuf *key_sp2msg __P((struct secpolicy *));
+extern struct secpolicy *key_getspbyid(u_int32_t);
+extern void key_freesp(struct secpolicy *);
+extern void key_freesav(struct secasvar *);
+extern struct secpolicy *key_newsp(u_int32_t);
+extern struct secpolicy *key_msg2sp(struct sadb_x_policy *,
+ size_t, int *);
+extern struct mbuf *key_sp2msg(struct secpolicy *);
extern int key_cmpspidx_exactly
- __P((struct secpolicyindex *, struct secpolicyindex *));
+(struct secpolicyindex *, struct secpolicyindex *);
extern int key_cmpspidx_withmask
- __P((struct secpolicyindex *, struct secpolicyindex *));
-extern int key_spdacquire __P((struct secpolicy *));
-extern struct mbuf *key_setdumpsp __P((struct secpolicy *,
- u_int8_t, u_int32_t, u_int32_t));
-extern void key_timehandler __P((void *));
-extern void key_randomfill __P((void *, size_t));
-extern void key_freereg __P((struct socket *));
-struct mbuf *key_setdumpsa_spi __P((u_int32_t));
-extern int key_parse __P((struct mbuf *, struct socket *));
-extern void key_init __P((void));
-extern int key_checktunnelsanity __P((struct secasvar *, u_int,
- void *, void *));
-extern void key_sa_recordxfer __P((struct secasvar *, struct mbuf *));
-extern void key_sa_routechange __P((struct sockaddr *));
-extern void key_sa_stir_iv __P((struct secasvar *));
+(struct secpolicyindex *, struct secpolicyindex *);
+extern int key_spdacquire(struct secpolicy *);
+extern struct mbuf *key_setdumpsp(struct secpolicy *,
+ u_int8_t, u_int32_t, u_int32_t);
+extern void key_timehandler(void *);
+extern void key_randomfill(void *, size_t);
+extern void key_freereg(struct socket *);
+struct mbuf *key_setdumpsa_spi(u_int32_t);
+extern int key_parse(struct mbuf *, struct socket *);
+extern void key_init(void);
+extern int key_checktunnelsanity(struct secasvar *, u_int,
+ void *, void *);
+extern void key_sa_recordxfer(struct secasvar *, struct mbuf *);
+extern void key_sa_routechange(struct sockaddr *);
+extern void key_sa_stir_iv(struct secasvar *);
-extern int key_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
+extern int key_sysctl(int *, u_int, void *, size_t *, void *, size_t);
#ifdef IPSEC_NAT_T
-u_int16_t key_portfromsaddr __P((struct sockaddr *));
+u_int16_t key_portfromsaddr(struct sockaddr *);
#define KEY_PORTFROMSADDR(saddr) key_portfromsaddr((struct sockaddr *)(saddr))
#endif
diff --git a/sys/netkey/key_debug.c b/sys/netkey/key_debug.c
index 1f61eeffee5..458fb231715 100644
--- a/sys/netkey/key_debug.c
+++ b/sys/netkey/key_debug.c
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.c,v 1.33 2007/03/04 06:03:34 christos Exp $ */
+/* $NetBSD: key_debug.c,v 1.34 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: key_debug.c,v 1.36 2003/06/27 06:46:01 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.33 2007/03/04 06:03:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.34 2009/03/14 14:46:11 dsl Exp $");
#ifdef _KERNEL
#include "opt_inet.h"
@@ -64,23 +64,23 @@ struct typestr {
};
#define TYPESTR(x) { "SADB_" #x, SADB_ ## x }
-static const char *kdebug_typestr __P((u_int, const struct typestr *));
-static const char *kdebug_sadb_msg_typestr __P((u_int));
-static const char *kdebug_sadb_ext_typestr __P((u_int));
-static void kdebug_sadb_prop __P((struct sadb_ext *));
-static void kdebug_sadb_identity __P((struct sadb_ext *));
-static void kdebug_sadb_supported __P((struct sadb_ext *));
-static void kdebug_sadb_lifetime __P((struct sadb_ext *));
-static void kdebug_sadb_sa __P((struct sadb_ext *));
-static void kdebug_sadb_address __P((struct sadb_ext *));
-static void kdebug_sadb_key __P((struct sadb_ext *));
-static void kdebug_sadb_x_sa2 __P((struct sadb_ext *));
+static const char *kdebug_typestr(u_int, const struct typestr *);
+static const char *kdebug_sadb_msg_typestr(u_int);
+static const char *kdebug_sadb_ext_typestr(u_int);
+static void kdebug_sadb_prop(struct sadb_ext *);
+static void kdebug_sadb_identity(struct sadb_ext *);
+static void kdebug_sadb_supported(struct sadb_ext *);
+static void kdebug_sadb_lifetime(struct sadb_ext *);
+static void kdebug_sadb_sa(struct sadb_ext *);
+static void kdebug_sadb_address(struct sadb_ext *);
+static void kdebug_sadb_key(struct sadb_ext *);
+static void kdebug_sadb_x_sa2(struct sadb_ext *);
#ifdef SADB_X_EXT_TAG
-static void kdebug_sadb_x_tag __P((struct sadb_ext *));
+static void kdebug_sadb_x_tag(struct sadb_ext *);
#endif
#ifdef _KERNEL
-static void kdebug_secreplay __P((struct secreplay *));
+static void kdebug_secreplay(struct secreplay *);
#endif
#ifndef _KERNEL
diff --git a/sys/netkey/key_debug.h b/sys/netkey/key_debug.h
index 164825c31a6..f8dee11be8a 100644
--- a/sys/netkey/key_debug.h
+++ b/sys/netkey/key_debug.h
@@ -1,4 +1,4 @@
-/* $NetBSD: key_debug.h,v 1.11 2007/03/04 06:03:35 christos Exp $ */
+/* $NetBSD: key_debug.h,v 1.12 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: key_debug.h,v 1.10 2001/08/05 08:37:52 itojun Exp $ */
/*
@@ -61,8 +61,8 @@ extern u_int32_t key_debug_level;
struct sadb_msg;
struct sadb_ext;
-extern void kdebug_sadb __P((struct sadb_msg *));
-extern void kdebug_sadb_x_policy __P((struct sadb_ext *));
+extern void kdebug_sadb(struct sadb_msg *);
+extern void kdebug_sadb_x_policy(struct sadb_ext *);
#ifdef _KERNEL
struct secpolicy;
@@ -71,18 +71,18 @@ struct secasindex;
struct secasvar;
struct secreplay;
struct mbuf;
-extern void kdebug_secpolicy __P((struct secpolicy *));
-extern void kdebug_secpolicyindex __P((struct secpolicyindex *));
-extern void kdebug_secasindex __P((struct secasindex *));
-extern void kdebug_secasv __P((struct secasvar *));
-extern void kdebug_mbufhdr __P((struct mbuf *));
-extern void kdebug_mbuf __P((struct mbuf *));
+extern void kdebug_secpolicy(struct secpolicy *);
+extern void kdebug_secpolicyindex(struct secpolicyindex *);
+extern void kdebug_secasindex(struct secasindex *);
+extern void kdebug_secasv(struct secasvar *);
+extern void kdebug_mbufhdr(struct mbuf *);
+extern void kdebug_mbuf(struct mbuf *);
#endif /*_KERNEL*/
struct sockaddr;
-extern void kdebug_sockaddr __P((struct sockaddr *));
+extern void kdebug_sockaddr(struct sockaddr *);
-extern void ipsec_hexdump __P((void *, int));
-extern void ipsec_bindump __P((void *, int));
+extern void ipsec_hexdump(void *, int);
+extern void ipsec_bindump(void *, int);
#endif /* !_NETKEY_KEY_DEBUG_H_ */
diff --git a/sys/netkey/keydb.h b/sys/netkey/keydb.h
index d551c7446fd..45f78142c9e 100644
--- a/sys/netkey/keydb.h
+++ b/sys/netkey/keydb.h
@@ -1,4 +1,4 @@
-/* $NetBSD: keydb.h,v 1.28 2007/05/02 20:40:29 dyoung Exp $ */
+/* $NetBSD: keydb.h,v 1.29 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: keydb.h,v 1.23 2003/09/07 05:25:20 itojun Exp $ */
/*
@@ -157,23 +157,23 @@ struct key_cb {
/* secpolicy */
struct secpolicy;
struct secpolicyindex;
-extern struct secpolicy *keydb_newsecpolicy __P((void));
-extern u_int32_t keydb_newspid __P((void));
-extern void keydb_delsecpolicy __P((struct secpolicy *));
+extern struct secpolicy *keydb_newsecpolicy(void);
+extern u_int32_t keydb_newspid(void);
+extern void keydb_delsecpolicy(struct secpolicy *);
extern int keydb_setsecpolicyindex
- __P((struct secpolicy *, struct secpolicyindex *));
+(struct secpolicy *, struct secpolicyindex *);
/* secashead */
-extern struct secashead *keydb_newsecashead __P((void));
-extern void keydb_delsecashead __P((struct secashead *));
+extern struct secashead *keydb_newsecashead(void);
+extern void keydb_delsecashead(struct secashead *);
/* secasvar */
-extern struct secasvar *keydb_newsecasvar __P((void));
-extern void keydb_delsecasvar __P((struct secasvar *));
+extern struct secasvar *keydb_newsecasvar(void);
+extern void keydb_delsecasvar(struct secasvar *);
/* secreplay */
-extern struct secreplay *keydb_newsecreplay __P((size_t));
-extern void keydb_delsecreplay __P((struct secreplay *));
+extern struct secreplay *keydb_newsecreplay(size_t);
+extern void keydb_delsecreplay(struct secreplay *);
/* secreg */
-extern struct secreg *keydb_newsecreg __P((void));
-extern void keydb_delsecreg __P((struct secreg *));
+extern struct secreg *keydb_newsecreg(void);
+extern void keydb_delsecreg(struct secreg *);
#endif /* _KERNEL */
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c
index ca93a37664d..d9b628c8c9a 100644
--- a/sys/netkey/keysock.c
+++ b/sys/netkey/keysock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.c,v 1.48 2008/04/28 15:18:43 ad Exp $ */
+/* $NetBSD: keysock.c,v 1.49 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: keysock.c,v 1.32 2003/08/22 05:45:08 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.48 2008/04/28 15:18:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.49 2009/03/14 14:46:11 dsl Exp $");
#include "opt_inet.h"
@@ -65,10 +65,10 @@ __KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.48 2008/04/28 15:18:43 ad Exp $");
struct sockaddr key_dst = { .sa_len = 2, .sa_family = PF_KEY, };
struct sockaddr key_src = { .sa_len = 2, .sa_family = PF_KEY, };
-static int key_receive __P((struct socket *, struct mbuf **, struct uio *,
- struct mbuf **, struct mbuf **, int *));
+static int key_receive(struct socket *, struct mbuf **, struct uio *,
+ struct mbuf **, struct mbuf **, int *);
-static int key_sendup0 __P((struct rawcb *, struct mbuf *, int, int));
+static int key_sendup0(struct rawcb *, struct mbuf *, int, int);
static int
key_receive(struct socket *so, struct mbuf **paddr, struct uio *uio,
diff --git a/sys/netkey/keysock.h b/sys/netkey/keysock.h
index 43f5074fc34..6584e1f8a56 100644
--- a/sys/netkey/keysock.h
+++ b/sys/netkey/keysock.h
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.h,v 1.14 2008/04/23 07:29:47 thorpej Exp $ */
+/* $NetBSD: keysock.h,v 1.15 2009/03/14 14:46:11 dsl Exp $ */
/* $KAME: keysock.h,v 1.8 2000/03/27 05:11:06 sumikawa Exp $ */
/*
@@ -73,16 +73,16 @@ struct keycb {
struct mbuf *kp_queue; /* queued mbufs, linked by m_nextpkt */
};
-extern int key_output __P((struct mbuf *, ...));
+extern int key_output(struct mbuf *, ...);
#ifndef __NetBSD__
-extern int key_usrreq __P((struct socket *,
- int, struct mbuf *, struct mbuf *, struct mbuf *));
+extern int key_usrreq(struct socket *,
+ int, struct mbuf *, struct mbuf *, struct mbuf *);
#else
-extern int key_usrreq __P((struct socket *,
- int, struct mbuf *, struct mbuf *, struct mbuf *, struct lwp *));
+extern int key_usrreq(struct socket *,
+ int, struct mbuf *, struct mbuf *, struct mbuf *, struct lwp *);
#endif
-extern int key_sendup_mbuf __P((struct socket *, struct mbuf *, int));
+extern int key_sendup_mbuf(struct socket *, struct mbuf *, int);
#endif /* _KERNEL */
#endif /* !_NETKEY_KEYSOCK_H_ */
diff --git a/sys/netnatm/natm.h b/sys/netnatm/natm.h
index 911bf740c2c..3921e36abe6 100644
--- a/sys/netnatm/natm.h
+++ b/sys/netnatm/natm.h
@@ -1,4 +1,4 @@
-/* $NetBSD: natm.h,v 1.9 2005/12/11 12:25:16 christos Exp $ */
+/* $NetBSD: natm.h,v 1.10 2009/03/14 14:46:11 dsl Exp $ */
/*
*
@@ -136,21 +136,21 @@ struct atm_rawioctl {
/* external functions */
/* natm_pcb.c */
-struct natmpcb *npcb_alloc __P((int));
-void npcb_free __P((struct natmpcb *, int));
-struct natmpcb *npcb_add __P((struct natmpcb *, struct ifnet *, int, int));
+struct natmpcb *npcb_alloc(int);
+void npcb_free(struct natmpcb *, int);
+struct natmpcb *npcb_add(struct natmpcb *, struct ifnet *, int, int);
/* natm.c */
#if defined(__NetBSD__) || defined(__OpenBSD__)
-int natm_usrreq __P((struct socket *, int, struct mbuf *,
- struct mbuf *, struct mbuf *, struct lwp *));
+int natm_usrreq(struct socket *, int, struct mbuf *,
+ struct mbuf *, struct mbuf *, struct lwp *);
#elif defined(__FreeBSD__)
-int natm_usrreq __P((struct socket *, int, struct mbuf *,
- struct mbuf *, struct mbuf *));
+int natm_usrreq(struct socket *, int, struct mbuf *,
+ struct mbuf *, struct mbuf *);
#endif
-int natm0_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
-int natm5_sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
-void natmintr __P((void));
+int natm0_sysctl(int *, u_int, void *, size_t *, void *, size_t);
+int natm5_sysctl(int *, u_int, void *, size_t *, void *, size_t);
+void natmintr(void);
#endif
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index b87c6c68efc..9e47114c4b5 100644
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@@ -1,4 +1,4 @@
-/* $NetBSD: natm_pcb.c,v 1.10 2008/12/17 20:51:38 cegger Exp $ */
+/* $NetBSD: natm_pcb.c,v 1.11 2009/03/14 14:46:11 dsl Exp $ */
/*
*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.10 2008/12/17 20:51:38 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: natm_pcb.c,v 1.11 2009/03/14 14:46:11 dsl Exp $");
#include "opt_ddb.h"
@@ -177,7 +177,7 @@ done:
#ifdef DDB
-int npcb_dump __P((void));
+int npcb_dump(void);
int npcb_dump()
diff --git a/sys/nfs/krpc.h b/sys/nfs/krpc.h
index 892ed52e9d7..279e1608497 100644
--- a/sys/nfs/krpc.h
+++ b/sys/nfs/krpc.h
@@ -1,20 +1,20 @@
-/* $NetBSD: krpc.h,v 1.8 2005/12/11 12:25:16 christos Exp $ */
+/* $NetBSD: krpc.h,v 1.9 2009/03/14 14:46:11 dsl Exp $ */
#include <sys/cdefs.h>
#ifdef _KERNEL
-int krpc_call __P((struct sockaddr_in *sin,
+int krpc_call(struct sockaddr_in *sin,
u_int prog, u_int vers, u_int func,
- struct mbuf **data, struct mbuf **from, struct lwp *l));
+ struct mbuf **data, struct mbuf **from, struct lwp *l);
-int krpc_portmap __P((struct sockaddr_in *sin,
+int krpc_portmap(struct sockaddr_in *sin,
u_int prog, u_int vers, u_int proto, u_int16_t *portp,
- struct lwp *l));
+ struct lwp *l);
-struct mbuf *xdr_string_encode __P((char *str, int len));
-struct mbuf *xdr_string_decode __P((struct mbuf *m, char *str, int *len_p));
-struct mbuf *xdr_inaddr_encode __P((struct in_addr *ia));
-struct mbuf *xdr_inaddr_decode __P((struct mbuf *m, struct in_addr *ia));
+struct mbuf *xdr_string_encode(char *str, int len);
+struct mbuf *xdr_string_decode(struct mbuf *m, char *str, int *len_p);
+struct mbuf *xdr_inaddr_encode(struct in_addr *ia);
+struct mbuf *xdr_inaddr_decode(struct mbuf *m, struct in_addr *ia);
#endif /* _KERNEL */
diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c
index 11257aafccd..6d05aa35f14 100644
--- a/sys/nfs/krpc_subr.c
+++ b/sys/nfs/krpc_subr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: krpc_subr.c,v 1.33 2008/04/24 11:38:39 ad Exp $ */
+/* $NetBSD: krpc_subr.c,v 1.34 2009/03/14 14:46:11 dsl Exp $ */
/*
* Copyright (c) 1995 Gordon Ross, Adam Glass
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: krpc_subr.c,v 1.33 2008/04/24 11:38:39 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: krpc_subr.c,v 1.34 2009/03/14 14:46:11 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -124,7 +124,7 @@ struct rpc_reply {
#define MIN_REPLY_HDR 16 /* xid, dir, astat, errno */
-static int krpccheck __P((struct mbuf*, void*));
+static int krpccheck(struct mbuf*, void*);
/*
* Call portmap to lookup a port number for a particular rpc program
diff --git a/sys/nfs/nfs_bio.c b/sys/nfs/nfs_bio.c
index b35f15d6394..12037fd84f0 100644
--- a/sys/nfs/nfs_bio.c
+++ b/sys/nfs/nfs_bio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bio.c,v 1.182 2009/03/13 15:00:34 yamt Exp $ */
+/* $NetBSD: nfs_bio.c,v 1.183 2009/03/14 14:46:11 dsl Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.182 2009/03/13 15:00:34 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.183 2009/03/14 14:46:11 dsl Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -69,9 +69,9 @@ extern int nfs_numasync;
extern int nfs_commitsize;
extern struct nfsstats nfsstats;
-static int nfs_doio_read __P((struct buf *, struct uio *));
-static int nfs_doio_write __P((struct buf *, struct uio *));
-static int nfs_doio_phys __P((struct buf *, struct uio *));
+static int nfs_doio_read(struct buf *, struct uio *);
+static int nfs_doio_write(struct buf *, struct uio *);
+static int nfs_doio_phys(struct buf *, struct uio *);
/*
* Vnode op for read using bio
diff --git a/sys/nfs/nfs_srvsocket.c b/sys/nfs/nfs_srvsocket.c
index 5f777d8408e..8771f69c8ae 100644
--- a/sys/nfs/nfs_srvsocket.c
+++ b/sys/nfs/nfs_srvsocket.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_srvsocket.c,v 1.1 2008/11/19 18:36:09 ad Exp $ */
+/* $NetBSD: nfs_srvsocket.c,v 1.2 2009/03/14 14:46:11 dsl Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_srvsocket.c,v 1.1 2008/11/19 18:36:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_srvsocket.c,v 1.2 2009/03/14 14:46:11 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,9 +77,9 @@ __KERNEL_RCSID(0, "$NetBSD: nfs_srvsocket.c,v 1.1 2008/11/19 18:36:09 ad Exp $")
static void nfsrv_wakenfsd_locked(struct nfssvc_sock *);
-int (*nfsrv3_procs[NFS_NPROCS]) __P((struct nfsrv_descript *,
+int (*nfsrv3_procs[NFS_NPROCS])(struct nfsrv_descript *,
struct nfssvc_sock *, struct lwp *,
- struct mbuf **)) = {
+ struct mbuf **) = {
nfsrv_null,
nfsrv_getattr,
nfsrv_setattr,
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 1cc1a922c77..ed353c2b09a 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_subs.c,v 1.212 2008/12/17 20:51:38 cegger Exp $ */
+/* $NetBSD: nfs_subs.c,v 1.213 2009/03/14 14:46:11 dsl Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.212 2008/12/17 20:51:38 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.213 2009/03/14 14:46:11 dsl Exp $");
#ifdef _KERNEL_OPT
#include "fs_nfs.h"
@@ -564,7 +564,7 @@ extern struct nfsrtt nfsrtt;
u_long nfsdirhashmask;
-int nfs_webnamei __P((struct nameidata *, struct vnode *, struct proc *));
+int nfs_webnamei(struct nameidata *, struct vnode *, struct proc *);
/*
* Create the header for an rpc request packet
@@ -1234,9 +1234,9 @@ nfs_initdirxlatecookie(vp)
static const struct nfsdircache dzero;
-static void nfs_unlinkdircache __P((struct nfsnode *np, struct nfsdircache *));
-static void nfs_putdircache_unlocked __P((struct nfsnode *,
- struct nfsdircache *));
+static void nfs_unlinkdircache(struct nfsnode *np, struct nfsdircache *);
+static void nfs_putdircache_unlocked(struct nfsnode *,
+ struct nfsdircache *);
static void
nfs_unlinkdircache(np, ndp)
@@ -1654,7 +1654,7 @@ nfs_loadattrcache(vpp, fp, vaper, flags)
struct timespec ctime;
int32_t rdev;
struct nfsnode *np;
- extern int (**spec_nfsv2nodeop_p) __P((void *));
+ extern int (**spec_nfsv2nodeop_p)(void *);
uid_t uid;
gid_t gid;
@@ -1696,7 +1696,7 @@ nfs_loadattrcache(vpp, fp, vaper, flags)
if (vp->v_type == VNON) {
vp->v_type = vtyp;
if (vp->v_type == VFIFO) {
- extern int (**fifo_nfsv2nodeop_p) __P((void *));
+ extern int (**fifo_nfsv2nodeop_p)(void *);
vp->v_op = fifo_nfsv2nodeop_p;
} else if (vp->v_type == VREG) {
mutex_init(&np->n_commitlock, MUTEX_DEFAULT, IPL_NONE);
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index 64b0e04109d..23df88b5974 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_syscalls.c,v 1.143 2008/11/28 06:47:08 pooka Exp $ */
+/* $NetBSD: nfs_syscalls.c,v 1.144 2009/03/14 14:46:11 dsl Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_syscalls.c,v 1.143 2008/11/28 06:47:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_syscalls.c,v 1.144 2009/03/14 14:46:11 dsl Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,9 +75,9 @@ __KERNEL_RCSID(0, "$NetBSD: nfs_syscalls.c,v 1.143 2008/11/28 06:47:08 pooka Exp
#include <nfs/nfsrtt.h>
#include <nfs/nfs_var.h>
-extern int32_t (*nfsrv3_procs[NFS_NPROCS]) __P((struct nfsrv_descript *,
+extern int32_t (*nfsrv3_procs[NFS_NPROCS])(struct nfsrv_descript *,
struct nfssvc_sock *,
- struct lwp *, struct mbuf **));
+ struct lwp *, struct mbuf **);
extern int nfsrvw_procrastinate;
extern int nuidhash_max;
@@ -96,9 +96,9 @@ int nfsd_head_flag;
struct nfssvc_sock *nfs_udpsock;
struct nfssvc_sock *nfs_udp6sock;
-static struct nfssvc_sock *nfsrv_sockalloc __P((void));
-static void nfsrv_sockfree __P((struct nfssvc_sock *));
-static void nfsd_rt __P((int, struct nfsrv_descript *, int));
+static struct nfssvc_sock *nfsrv_sockalloc(void);
+static void nfsrv_sockfree(struct nfssvc_sock *);
+static void nfsd_rt(int, struct nfsrv_descript *, int);
/*
* NFS server system calls
diff --git a/sys/nfs/nfs_var.h b/sys/nfs/nfs_var.h
index 9db72efd914..83a3e4dd837 100644
--- a/sys/nfs/nfs_var.h
+++ b/sys/nfs/nfs_var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_var.h,v 1.85 2008/11/28 06:47:08 pooka Exp $ */
+/* $NetBSD: nfs_var.h,v 1.86 2009/03/14 14:46:11 dsl Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -251,7 +251,7 @@ void nfsm_srvpostopattr(struct nfsrv_descript *, int, struct vattr *,
void nfsm_srvfattr(struct nfsrv_descript *, struct vattr *, struct nfs_fattr *);
int nfsrv_fhtovp(nfsrvfh_t *, int, struct vnode **, kauth_cred_t,
struct nfssvc_sock *, struct mbuf *, int *, int, int);
-int nfs_ispublicfh __P((const nfsrvfh_t *));
+int nfs_ispublicfh(const nfsrvfh_t *);
int netaddr_match(int, union nethostaddr *, struct mbuf *);
time_t nfs_attrtimeo(struct nfsmount *, struct nfsnode *);
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c
index 054d82ef4e5..24847667e0e 100644
--- a/sys/nfs/nfs_vfsops.c
+++ b/sys/nfs/nfs_vfsops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vfsops.c,v 1.206 2008/12/17 20:51:38 cegger Exp $ */
+/* $NetBSD: nfs_vfsops.c,v 1.207 2009/03/14 14:46:11 dsl Exp $ */
/*
* Copyright (c) 1989, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.206 2008/12/17 20:51:38 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vfsops.c,v 1.207 2009/03/14 14:46:11 dsl Exp $");
#if defined(_KERNEL_OPT)
#include "opt_nfs.h"
@@ -133,8 +133,8 @@ extern u_int32_t nfs_procids[NFS_NPROCS];
extern u_int32_t nfs_prog, nfs_vers;
static struct sysctllog *nfs_clog;
-static int nfs_mount_diskless __P((struct nfs_dlmount *, const char *,
- struct mount **, struct vnode **, struct lwp *));
+static int nfs_mount_diskless(struct nfs_dlmount *, const char *,
+ struct mount **, struct vnode **, struct lwp *);
static void nfs_sysctl_init(void);
static void nfs_sysctl_fini(void);
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 8a99b41cd94..e634bb3aaaf 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.270 2009/03/13 15:01:29 yamt Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.271 2009/03/14 14:46:11 dsl Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.270 2009/03/13 15:01:29 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.271 2009/03/14 14:46:11 dsl Exp $");
#ifdef _KERNEL_OPT
#include "opt_nfs.h"
@@ -93,7 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.270 2009/03/13 15:01:29 yamt Exp $")
/*
* Global vfs data structures for nfs
*/
-int (**nfsv2_vnodeop_p) __P((void *));
+int (**nfsv2_vnodeop_p)(void *);
const struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
{ &vop_default_desc, vn_default_error },
{ &vop_lookup_desc, nfs_lookup }, /* lookup */
@@ -144,7 +144,7 @@ const struct vnodeopv_desc nfsv2_vnodeop_opv_desc =
/*
* Special device vnode ops
*/
-int (**spec_nfsv2nodeop_p) __P((void *));
+int (**spec_nfsv2nodeop_p)(void *);
const struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = {
{ &vop_default_desc, vn_default_error },
{ &vop_lookup_desc, spec_lookup }, /* lookup */
@@ -192,7 +192,7 @@ const struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = {
const struct vnodeopv_desc spec_nfsv2nodeop_opv_desc =
{ &spec_nfsv2nodeop_p, spec_nfsv2nodeop_entries };
-int (**fifo_nfsv2nodeop_p) __P((void *));
+int (**fifo_nfsv2nodeop_p)(void *);
const struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
{ &vop_default_desc, vn_default_error },
{ &vop_lookup_desc, fifo_lookup }, /* lookup */
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index 6c8f890f02d..728d5c71cc8 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nfsmount.h,v 1.48 2008/10/22 12:29:35 matt Exp $ */
+/* $NetBSD: nfsmount.h,v 1.49 2009/03/14 14:46:11 dsl Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -188,16 +188,16 @@ struct nfsmount {
*/
VFS_PROTOS(nfs);
-int mountnfs __P((struct nfs_args *argp, struct mount *mp,
+int mountnfs(struct nfs_args *argp, struct mount *mp,
struct mbuf *nam, const char *pth, const char *hst,
- struct vnode **vpp, struct lwp *p));
-void nfs_decode_args __P((struct nfsmount *, struct nfs_args *,
- struct lwp *l));
-int nfs_fsinfo __P((struct nfsmount *, struct vnode *, kauth_cred_t,
- struct lwp *));
+ struct vnode **vpp, struct lwp *p);
+void nfs_decode_args(struct nfsmount *, struct nfs_args *,
+ struct lwp *l);
+int nfs_fsinfo(struct nfsmount *, struct vnode *, kauth_cred_t,
+ struct lwp *);
-void nfs_vfs_init __P((void));
-void nfs_vfs_done __P((void));
+void nfs_vfs_init(void);
+void nfs_vfs_done(void);
#endif /* _KERNEL */
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index 3d3860dfe59..e6d649daa73 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -1,4 +1,4 @@
-/* $NetBSD: nfsnode.h,v 1.70 2009/01/02 21:06:11 christos Exp $ */
+/* $NetBSD: nfsnode.h,v 1.71 2009/03/14 14:46:11 dsl Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -239,53 +239,53 @@ extern u_long nfsdirhashmask;
/*
* Prototypes for NFS vnode operations
*/
-int nfs_lookup __P((void *));
-int nfs_create __P((void *));
-int nfs_mknod __P((void *));
-int nfs_open __P((void *));
-int nfs_close __P((void *));
-int nfsspec_close __P((void *));
-int nfsfifo_close __P((void *));
-int nfs_access __P((void *));
-int nfsspec_access __P((void *));
-int nfs_getattr __P((void *));
-int nfs_setattr __P((void *));
-int nfs_read __P((void *));
-int nfs_write __P((void *));
-int nfsspec_read __P((void *));
-int nfsspec_write __P((void *));
-int nfsfifo_read __P((void *));
-int nfsfifo_write __P((void *));
+int nfs_lookup(void *);
+int nfs_create(void *);
+int nfs_mknod(void *);
+int nfs_open(void *);
+int nfs_close(void *);
+int nfsspec_close(void *);
+int nfsfifo_close(void *);
+int nfs_access(void *);
+int nfsspec_access(void *);
+int nfs_getattr(void *);
+int nfs_setattr(void *);
+int nfs_read(void *);
+int nfs_write(void *);
+int nfsspec_read(void *);
+int nfsspec_write(void *);
+int nfsfifo_read(void *);
+int nfsfifo_write(void *);
#define nfs_ioctl genfs_enoioctl
#define nfs_poll genfs_poll
#define nfs_revoke genfs_revoke
#define nfs_mmap genfs_mmap
-int nfs_fsync __P((void *));
+int nfs_fsync(void *);
#define nfs_seek genfs_seek
-int nfs_remove __P((void *));
-int nfs_link __P((void *));
-int nfs_rename __P((void *));
-int nfs_mkdir __P((void *));
-int nfs_rmdir __P((void *));
-int nfs_symlink __P((void *));
-int nfs_readdir __P((void *));
-int nfs_readlink __P((void *));
+int nfs_remove(void *);
+int nfs_link(void *);
+int nfs_rename(void *);
+int nfs_mkdir(void *);
+int nfs_rmdir(void *);
+int nfs_symlink(void *);
+int nfs_readdir(void *);
+int nfs_readlink(void *);
#define nfs_abortop genfs_abortop
-int nfs_inactive __P((void *));
-int nfs_reclaim __P((void *));
+int nfs_inactive(void *);
+int nfs_reclaim(void *);
#define nfs_lock genfs_lock
-int nfs_unlock __P((void *));
+int nfs_unlock(void *);
#define nfs_islocked genfs_islocked
-int nfs_bmap __P((void *));
-int nfs_strategy __P((void *));
-int nfs_print __P((void *));
-int nfs_pathconf __P((void *));
-int nfs_advlock __P((void *));
-int nfs_getpages __P((void *));
-int nfs_putpages __P((void *));
-int nfs_kqfilter __P((void *));
-
-extern int (**nfsv2_vnodeop_p) __P((void *));
+int nfs_bmap(void *);
+int nfs_strategy(void *);
+int nfs_print(void *);
+int nfs_pathconf(void *);
+int nfs_advlock(void *);
+int nfs_getpages(void *);
+int nfs_putpages(void *);
+int nfs_kqfilter(void *);
+
+extern int (**nfsv2_vnodeop_p)(void *);
#define NFS_INVALIDATE_ATTRCACHE(np) (np)->n_attrstamp = 0
diff --git a/sys/stand/ls.c b/sys/stand/ls.c
index 1cb8ff1c814..ac845bb35f6 100644
--- a/sys/stand/ls.c
+++ b/sys/stand/ls.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ls.c,v 1.13 2005/12/11 12:25:20 christos Exp $ */
+/* $NetBSD: ls.c,v 1.14 2009/03/14 14:46:11 dsl Exp $ */
/*-
* Copyright (c) 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
#if 0
static char sccsid[] = "@(#)ls.c 8.1 (Berkeley) 6/11/93";
#else
-__RCSID("$NetBSD: ls.c,v 1.13 2005/12/11 12:25:20 christos Exp $");
+__RCSID("$NetBSD: ls.c,v 1.14 2009/03/14 14:46:11 dsl Exp $");
#endif
#endif /* not lint */
@@ -51,8 +51,8 @@ __RCSID("$NetBSD: ls.c,v 1.13 2005/12/11 12:25:20 christos Exp $");
#include <sys/ttychars.h>
#include <lib/libsa/stand.h>
-int main __P((void));
-static void ls __P((int));
+int main(void);
+static void ls(int);
int
main()
diff --git a/sys/sys/exec_ecoff.h b/sys/sys/exec_ecoff.h
index 36a1d6075ac..9b45e3e0178 100644
--- a/sys/sys/exec_ecoff.h
+++ b/sys/sys/exec_ecoff.h
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_ecoff.h,v 1.18 2005/12/11 12:25:20 christos Exp $ */
+/* $NetBSD: exec_ecoff.h,v 1.19 2009/03/14 14:46:11 dsl Exp $ */
/*
* Copyright (c) 1994 Adam Glass
@@ -107,12 +107,12 @@ int exec_ecoff_makecmds(struct lwp *, struct exec_package *);
int cpu_exec_ecoff_probe(struct lwp *, struct exec_package *);
void cpu_exec_ecoff_setregs(struct lwp *, struct exec_package *, u_long);
-int exec_ecoff_prep_omagic __P((struct lwp *, struct exec_package *,
- struct ecoff_exechdr *, struct vnode *));
-int exec_ecoff_prep_nmagic __P((struct lwp *, struct exec_package *,
- struct ecoff_exechdr *, struct vnode *));
-int exec_ecoff_prep_zmagic __P((struct lwp *, struct exec_package *,
- struct ecoff_exechdr *, struct vnode *));
+int exec_ecoff_prep_omagic(struct lwp *, struct exec_package *,
+ struct ecoff_exechdr *, struct vnode *);
+int exec_ecoff_prep_nmagic(struct lwp *, struct exec_package *,
+ struct ecoff_exechdr *, struct vnode *);
+int exec_ecoff_prep_zmagic(struct lwp *, struct exec_package *,
+ struct ecoff_exechdr *, struct vnode *);
#endif /* _KERNEL */
#endif /* !_SYS_EXEC_ECOFF_H_ */