Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/jmcneill-usbmp]: src/sys sync to latest -current.
details: https://anonhg.NetBSD.org/src/rev/d5b08dc2031e
branches: jmcneill-usbmp
changeset: 771852:d5b08dc2031e
user: mrg <mrg%NetBSD.org@localhost>
date: Sat Jun 02 11:08:41 2012 +0000
description:
sync to latest -current.
diffstat:
sys/arch/acorn26/acorn26/except.c | 8 +-
sys/arch/acorn26/acorn26/irq.c | 12 +-
sys/arch/acorn26/acorn26/machdep.c | 10 +-
sys/arch/acorn26/acorn26/pmap.c | 14 +-
sys/arch/acorn26/include/boot.h | 44 +-
sys/arch/acorn26/include/memcreg.h | 4 +-
sys/arch/acorn26/iobus/ioc.c | 10 +-
sys/arch/acorn26/iobus/iocvar.h | 10 +-
sys/arch/acorn26/ioc/if_eca.c | 6 +-
sys/arch/acorn26/ioc/if_ecavar.h | 16 +-
sys/arch/acorn26/ioc/latches.c | 12 +-
sys/arch/acorn26/ioc/latchvar.h | 6 +-
sys/arch/acorn26/ioc/ssn.c | 12 +-
sys/arch/acorn26/podulebus/if_eh.c | 46 +-
sys/arch/acorn26/podulebus/podulebus.c | 20 +-
sys/arch/acorn26/stand/lib/riscoscalls.h | 42 +-
sys/arch/acorn26/vidc/arcvideo.c | 14 +-
sys/arch/acorn26/vidc/vidcreg.h | 4 +-
sys/arch/acorn32/acorn32/rpc_machdep.c | 6 +-
sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c | 6 +-
sys/arch/acorn32/eb7500atx/if_cs.c | 8 +-
sys/arch/acorn32/eb7500atx/rsbus_io.c | 16 +-
sys/arch/acorn32/include/podulebus_machdep.h | 4 +-
sys/arch/acorn32/podulebus/if_ie.c | 6 +-
sys/arch/acorn32/podulebus/if_ne_pbus.c | 18 +-
sys/arch/acorn32/podulebus/netslot.c | 6 +-
sys/arch/acorn32/podulebus/podulebus_io.c | 16 +-
sys/arch/acorn32/stand/boot32/boot32.c | 4 +-
sys/arch/acorn32/stand/lib/riscoscalls.h | 42 +-
sys/arch/acorn32/stand/lib/riscospart.c | 8 +-
sys/arch/acorn32/stand/nbfs/nbfs.c | 47 +-
sys/arch/alpha/alpha/machdep.c | 22 +-
sys/arch/amd64/amd64/db_memrw.c | 203 -
sys/arch/amd64/amd64/machdep.c | 32 +-
sys/arch/amd64/amd64/netbsd32_machdep.c | 11 +-
sys/arch/amd64/amd64/process_machdep.c | 6 +-
sys/arch/amd64/amd64/trap.c | 114 +-
sys/arch/amd64/amd64/vector.S | 224 +-
sys/arch/amd64/conf/GENERIC | 5 +-
sys/arch/amd64/conf/files.amd64 | 3 +-
sys/arch/amd64/include/frameasm.h | 85 +-
sys/arch/amd64/include/mcontext.h | 6 +-
sys/arch/amd64/include/vmparam.h | 6 +-
sys/arch/amiga/conf/DRACO | 13 +-
sys/arch/amiga/conf/GENERIC | 17 +-
sys/arch/amiga/conf/GENERIC.in | 19 +-
sys/arch/amiga/conf/INSTALL | 13 +-
sys/arch/amiga/conf/files.amiga | 24 +-
sys/arch/amiga/dev/if_ne_xsurf.c | 175 +
sys/arch/amiga/dev/if_ne_zbus.c | 19 +-
sys/arch/amiga/dev/xsurf.c | 156 +
sys/arch/amiga/dev/xsurfvar.h | 44 +
sys/arch/amiga/include/bus.h | 9 +-
sys/arch/amiga/include/pci_machdep.h | 6 +-
sys/arch/amiga/pci/emmem.c | 105 +
sys/arch/amiga/pci/emmemvar.h | 41 +
sys/arch/amiga/pci/empb.c | 429 +
sys/arch/amiga/pci/empb_bsm.c | 110 +
sys/arch/amiga/pci/empbreg.h | 91 +
sys/arch/amiga/pci/empbvar.h | 64 +
sys/arch/arm/arm/cpufunc.c | 8 +-
sys/arch/arm/arm/cpufunc_asm_arm11.S | 4 +-
sys/arch/arm/arm/sig_machdep.c | 22 +-
sys/arch/arm/arm32/cpu.c | 11 +-
sys/arch/arm/conf/Makefile.arm | 4 +-
sys/arch/arm/imx/imxclock.c | 6 +-
sys/arch/arm/include/armreg.h | 5 +-
sys/arch/arm/iomd/iomd.c | 71 +-
sys/arch/arm/iomd/iomd_clock.c | 52 +-
sys/arch/arm/iomd/iomdiic.c | 22 +-
sys/arch/arm/iomd/iomdkbc.c | 29 +-
sys/arch/arm/iomd/iomdvar.h | 4 +-
sys/arch/arm/iomd/qms.c | 31 +-
sys/arch/arm/iomd/vidc20.c | 31 +-
sys/arch/arm/iomd/vidcaudio.c | 25 +-
sys/arch/arm/iomd/vidcvideo.c | 26 +-
sys/arch/cesfic/include/bus.h | 7 +-
sys/arch/evbarm/dev/plcom.c | 316 +-
sys/arch/evbarm/dev/plcomreg.h | 118 +-
sys/arch/evbarm/dev/plcomvar.h | 10 +-
sys/arch/evbarm/ifpga/plcom_ifpga.c | 31 +-
sys/arch/evbarm/ifpga/plcom_ifpgavar.h | 5 +-
sys/arch/evbmips/conf/CPMBR1400 | 2 +-
sys/arch/evbmips/conf/LOONGSON | 12 +-
sys/arch/hp300/include/bus.h | 7 +-
sys/arch/hp700/conf/GENERIC | 21 +-
sys/arch/hp700/conf/GENERIC.MP | 7 +
sys/arch/hp700/dev/apic.c | 21 +-
sys/arch/hp700/dev/asp.c | 30 +-
sys/arch/hp700/dev/cpu.c | 66 +-
sys/arch/hp700/dev/dino.c | 16 +-
sys/arch/hp700/dev/lasi.c | 18 +-
sys/arch/hp700/dev/mongoose.c | 17 +-
sys/arch/hp700/dev/power.c | 3 +-
sys/arch/hp700/dev/siop_sgc.c | 17 +-
sys/arch/hp700/dev/wax.c | 14 +-
sys/arch/hp700/gsc/gscbus.c | 7 +-
sys/arch/hp700/gsc/gscbusvar.h | 4 +-
sys/arch/hp700/hp700/autoconf.c | 11 +-
sys/arch/hp700/hp700/genassym.cf | 11 +-
sys/arch/hp700/hp700/intr.c | 327 +-
sys/arch/hp700/hp700/intr.h | 96 -
sys/arch/hp700/hp700/locore.S | 112 +-
sys/arch/hp700/hp700/machdep.c | 10 +-
sys/arch/hp700/hp700/mainbus.c | 8 +-
sys/arch/hp700/include/Makefile | 4 +-
sys/arch/hp700/include/cpu.h | 25 +-
sys/arch/hp700/include/intr.h | 109 +-
sys/arch/hppa/hppa/hppa_machdep.c | 76 +-
sys/arch/hppa/include/cpufunc.h | 14 +-
sys/arch/i386/conf/GENERIC | 5 +-
sys/arch/i386/conf/files.i386 | 3 +-
sys/arch/i386/i386/db_memrw.c | 214 -
sys/arch/i386/i386/machdep.c | 43 +-
sys/arch/i386/include/vmparam.h | 4 +-
sys/arch/i386/stand/lib/exec.c | 9 +-
sys/arch/luna68k/include/bus.h | 7 +-
sys/arch/m68k/m68k/sig_machdep.c | 24 +-
sys/arch/macppc/dev/dbdma.c | 10 +-
sys/arch/macppc/dev/valkyriefb.c | 27 +-
sys/arch/macppc/macppc/pic_heathrow.c | 9 +-
sys/arch/mips/alchemy/dev/if_aumac.c | 10 +-
sys/arch/mips/mips/cpu_subr.c | 18 +-
sys/arch/mips/mips/netbsd32_machdep.c | 18 +-
sys/arch/news68k/include/bus.h | 7 +-
sys/arch/powerpc/booke/dev/pq3etsec.c | 6 +-
sys/arch/powerpc/booke/dev/pq3gpio.c | 140 +-
sys/arch/powerpc/booke/spe_subr.S | 8 +-
sys/arch/powerpc/booke/trap.c | 10 +-
sys/arch/powerpc/include/booke/etsecreg.h | 4 +-
sys/arch/powerpc/include/types.h | 5 +-
sys/arch/powerpc/include/userret.h | 19 +-
sys/arch/powerpc/oea/ofw_autoconf.c | 13 +-
sys/arch/powerpc/oea/ofwoea_machdep.c | 5 +-
sys/arch/powerpc/powerpc/sig_machdep.c | 15 +-
sys/arch/powerpc/stand/mkbootimage/mkbootimage.c | 42 +-
sys/arch/prep/stand/boot/Makefile | 3 +-
sys/arch/prep/stand/boot/boot.c | 17 +-
sys/arch/prep/stand/boot/boot.h | 22 +-
sys/arch/prep/stand/boot/conf.c | 10 +-
sys/arch/prep/stand/boot/devopen.c | 30 +-
sys/arch/prep/stand/boot/filesystem.c | 8 +-
sys/arch/prep/stand/boot/io.c | 163 +-
sys/arch/prep/stand/boot/pci.c | 192 +
sys/arch/prep/stand/boot/sd.c | 740 ++
sys/arch/prep/stand/boot/sdvar.h | 164 +
sys/arch/prep/stand/boot/siop.c | 1233 +++
sys/arch/prep/stand/boot/version | 4 +-
sys/arch/sandpoint/conf/KUROBOX | 22 +-
sys/arch/sandpoint/sandpoint/autoconf.c | 60 +-
sys/arch/sandpoint/sandpoint/iic_eumb.c | 54 +-
sys/arch/sandpoint/sandpoint/satmgr.c | 250 +-
sys/arch/sandpoint/stand/altboot/main.c | 7 +-
sys/arch/sh3/sh3/sh3_machdep.c | 22 +-
sys/arch/shark/conf/GENERIC | 6 +-
sys/arch/sparc/include/bootinfo.h | 8 +-
sys/arch/sparc/include/cpu.h | 4 +-
sys/arch/sparc/sparc/autoconf.c | 20 +-
sys/arch/sparc/sparc/emul.c | 14 +-
sys/arch/sparc/sparc/machdep.c | 37 +-
sys/arch/sparc/sparc/trap.c | 8 +-
sys/arch/sparc/stand/boot/boot.c | 7 +-
sys/arch/sparc/stand/ofwboot/boot.c | 20 +-
sys/arch/sparc64/sparc64/autoconf.c | 19 +-
sys/arch/sparc64/sparc64/machdep.c | 35 +-
sys/arch/sparc64/sparc64/netbsd32_machdep.c | 36 +-
sys/arch/sun3/conf/files.sun3 | 3 +-
sys/arch/vax/include/asm.h | 14 +-
sys/arch/vax/include/types.h | 5 +-
sys/arch/vax/include/userret.h | 12 +-
sys/arch/vax/vax/machdep.c | 26 +-
sys/arch/vax/vsa/spx.c | 8 +-
sys/arch/x68k/dev/fd.c | 306 +-
sys/arch/x68k/dev/fdreg.h | 3 +-
sys/arch/x68k/x68k/clock.c | 6 +-
sys/arch/x68k/x68k/locore.s | 10 +-
sys/arch/x68k/x68k/machdep.c | 23 +-
sys/arch/x68k/x68k/mainbus.c | 6 +-
sys/arch/x86/conf/files.x86 | 3 +-
sys/arch/x86/include/specialreg.h | 37 +-
sys/arch/x86/x86/cpu_ucode_amd.c | 21 +-
sys/arch/x86/x86/db_memrw.c | 207 +
sys/arch/x86/x86/identcpu.c | 30 +-
sys/arch/xen/conf/files.xen | 5 +-
sys/arch/xen/xen/xbd_xenbus.c | 66 +-
sys/arch/xen/xen/xbdback_xenbus.c | 6 +-
sys/arch/zaurus/dev/zkbdmap.h | 6 +-
sys/coda/cnode.h | 14 +-
sys/coda/coda_vfsops.c | 6 +-
sys/coda/coda_vnops.c | 102 +-
sys/common/pmap/tlb/pmap.c | 48 +-
sys/common/pmap/tlb/pmap.h | 3 +-
sys/compat/linux32/arch/amd64/linux32_syscall.h | 6 +-
sys/compat/linux32/arch/amd64/linux32_syscallargs.h | 10 +-
sys/compat/linux32/arch/amd64/linux32_syscalls.c | 6 +-
sys/compat/linux32/arch/amd64/linux32_sysent.c | 6 +-
sys/compat/linux32/arch/amd64/syscalls.master | 8 +-
sys/compat/linux32/common/linux32_signal.c | 11 +-
sys/compat/linux32/common/linux32_socketcall.c | 6 +-
sys/compat/netbsd32/netbsd32_ioctl.c | 188 +-
sys/compat/netbsd32/netbsd32_ioctl.h | 46 +-
sys/compat/netbsd32/netbsd32_lwp.c | 42 +-
sys/compat/sys/ucontext.h | 3 +-
sys/conf/files | 5 +-
sys/dev/ata/sata_subr.c | 16 +-
sys/dev/cgd.c | 20 +-
sys/dev/cgdvar.h | 3 +-
sys/dev/dksubr.c | 68 +-
sys/dev/dkvar.h | 8 +-
sys/dev/firmload.c | 6 +-
sys/dev/i2c/dbcool.c | 13 +-
sys/dev/i2c/spdmem_i2c.c | 9 +-
sys/dev/ic/com.c | 5 +-
sys/dev/ic/ct65550.c | 13 +-
sys/dev/ic/rt2860reg.h | 1253 +++
sys/dev/ic/seeq8005.c | 6 +-
sys/dev/ic/siisata.c | 101 +-
sys/dev/ic/spdmem.c | 14 +-
sys/dev/ieee1394/sbp.c | 5 +-
sys/dev/isa/isadmavar.h | 7 +-
sys/dev/iscsi/iscsi_main.c | 16 +-
sys/dev/ldvar.h | 4 +-
sys/dev/microcode/Makefile | 4 +-
sys/dev/microcode/rum/microcode.h | 1 +
sys/dev/pci/eso.c | 6 +-
sys/dev/pci/if_wm.c | 121 +-
sys/dev/pci/if_wmreg.h | 18 +-
sys/dev/pci/if_wmvar.h | 4 +-
sys/dev/pci/if_wpi.c | 6 +-
sys/dev/pci/machfb.c | 6 +-
sys/dev/pci/pcidevs | 6 +-
sys/dev/pci/pcidevs.h | 8 +-
sys/dev/pci/pcidevs_data.h | 6773 +++++++++---------
sys/dev/pci/pm2fb.c | 14 +-
sys/dev/pci/r128fb.c | 10 +-
sys/dev/pci/trm.c | 22 +-
sys/dev/pci/trmreg.h | 6 +-
sys/dev/pci/voyager/voyagerfb.c | 20 +-
sys/dev/rndpseudo.c | 23 +-
sys/dev/scsipi/cd.c | 38 +-
sys/dev/scsipi/scsiconf.c | 13 +-
sys/dev/sun/kbd.c | 33 +-
sys/dev/usb/files.usb | 12 +-
sys/dev/usb/if_axe.c | 6 +-
sys/dev/usb/if_rum.c | 7 +-
sys/dev/usb/if_run.c | 3762 ++++++++++
sys/dev/usb/if_runvar.h | 217 +
sys/dev/usb/if_ural.c | 5 +-
sys/dev/usb/if_urtw.c | 4089 +++++++++++
sys/dev/usb/if_urtwn.c | 28 +-
sys/dev/usb/if_urtwreg.h | 400 +
sys/dev/usb/uaudio.c | 12 +-
sys/dev/usb/uaudioreg.h | 4 +-
sys/dev/usb/uhid.c | 9 +-
sys/dev/usb/umidi.c | 5 +-
sys/dev/usb/umidi_quirks.c | 5 +-
sys/dev/usb/ums.c | 70 +-
sys/dev/usb/usb_quirks.c | 6 +-
sys/dev/usb/usb_subr.c | 5 +-
sys/dev/usb/usbdevices.config | 3 +-
sys/dev/usb/usbdevs | 223 +-
sys/dev/usb/usbdevs.h | 223 +-
sys/dev/usb/usbdevs_data.h | 794 ++-
sys/dev/wscons/wsevent.c | 5 +-
sys/dev/wsfont/DejaVu_Sans_Mono_12x22.h | 85 +
sys/fs/efs/efs_ihash.c | 6 +-
sys/fs/msdosfs/msdosfs_vnops.c | 9 +-
sys/fs/ntfs/ntfs_vnops.c | 8 +-
sys/fs/sysvbfs/bfs.c | 20 +-
sys/fs/sysvbfs/bfs.h | 3 +-
sys/fs/sysvbfs/sysvbfs_vnops.c | 29 +-
sys/fs/tmpfs/files.tmpfs | 3 +-
sys/fs/tmpfs/tmpfs_rename.c | 591 +
sys/fs/tmpfs/tmpfs_vnops.c | 1272 +---
sys/fs/udf/udf_subr.c | 12 +-
sys/fs/udf/udf_vnops.c | 10 +-
sys/fs/union/union_vfsops.c | 13 +-
sys/fs/v7fs/v7fs_vnops.c | 7 +-
sys/kern/exec_elf.c | 69 +-
sys/kern/init_sysent.c | 10 +-
sys/kern/kern_malloc.c | 25 +-
sys/kern/kern_syscall.c | 5 +-
sys/kern/makesyscalls.sh | 10 +-
sys/kern/subr_cprng.c | 46 +-
sys/kern/subr_pool.c | 240 +-
sys/kern/sys_lwp.c | 84 +-
sys/kern/sys_pipe.c | 18 +-
sys/kern/sys_syscall.c | 9 +-
sys/kern/syscalls.c | 8 +-
sys/kern/syscalls.master | 6 +-
sys/kern/vfs_mount.c | 14 +-
sys/kern/vfs_subr.c | 20 +-
sys/kern/vfs_syscalls.c | 35 +-
sys/kern/vfs_wapbl.c | 5 +-
sys/kern/vfs_xattr.c | 6 +-
sys/lib/libsa/ext2fs.c | 6 +-
sys/lib/libsa/ffsv1.c | 4 +-
sys/lib/libsa/ffsv2.c | 4 +-
sys/lib/libsa/globals.c | 5 +-
sys/lib/libsa/lfsv1.c | 3 +-
sys/lib/libsa/lfsv2.c | 3 +-
sys/lib/libsa/stand.h | 3 +-
sys/lib/libsa/ufs.c | 10 +-
sys/miscfs/genfs/genfs.h | 70 +-
sys/miscfs/genfs/genfs_io.c | 43 +-
sys/miscfs/genfs/genfs_rename.c | 1154 +++
sys/miscfs/genfs/layer_vfsops.c | 28 +-
sys/miscfs/nullfs/null_vfsops.c | 10 +-
sys/miscfs/overlay/overlay_vfsops.c | 14 +-
sys/miscfs/procfs/procfs.h | 3 +-
sys/miscfs/procfs/procfs_map.c | 19 +-
sys/miscfs/procfs/procfs_subr.c | 14 +-
sys/miscfs/procfs/procfs_vfsops.c | 11 +-
sys/miscfs/procfs/procfs_vnops.c | 108 +-
sys/miscfs/specfs/spec_vnops.c | 6 +-
sys/miscfs/umapfs/umap_vfsops.c | 17 +-
sys/modules/ext2fs/Makefile | 6 +-
sys/modules/ffs/Makefile | 6 +-
sys/modules/tmpfs/Makefile | 6 +-
sys/net/if_ethersubr.c | 5 +-
sys/net/npf/npf_ctl.c | 32 +-
sys/net/npf/npf_handler.c | 52 +-
sys/net/npf/npf_impl.h | 12 +-
sys/net/npf/npf_sendpkt.c | 51 +-
sys/net/npf/npf_state.c | 5 +-
sys/net/npf/npf_state_tcp.c | 15 +-
sys/netinet/ip_mroute.c | 13 +-
sys/netinet/ip_output.c | 21 +-
sys/netsmb/smb_conn.c | 5 +-
sys/netsmb/smb_dev.c | 6 +-
sys/netsmb/smb_iod.c | 7 +-
sys/netsmb/subr_mchain.c | 84 +-
sys/rump/dev/lib/libnpf/Makefile | 3 +-
sys/rump/dev/lib/libscsitest/scsitest.c | 7 +-
sys/rump/fs/lib/libext2fs/Makefile | 6 +-
sys/rump/fs/lib/libffs/Makefile | 4 +-
sys/rump/fs/lib/libtmpfs/Makefile | 4 +-
sys/rump/librump/rumpkern/memalloc.c | 18 +-
sys/rump/librump/rumpkern/vm.c | 14 +-
sys/rump/librump/rumpvfs/Makefile.rumpvfs | 4 +-
sys/sys/bus.h | 23 +-
sys/sys/cdefs.h | 4 +-
sys/sys/exec_elf.h | 27 +-
sys/sys/lwp.h | 3 +-
sys/sys/malloc.h | 10 +-
sys/sys/mallocvar.h | 41 +-
sys/sys/param.h | 4 +-
sys/sys/pool.h | 29 +-
sys/sys/spawn.h | 10 +-
sys/sys/syscall.h | 7 +-
sys/sys/syscallargs.h | 17 +-
sys/sys/ucontext.h | 3 +-
sys/ufs/chfs/chfs_vfsops.c | 40 +-
sys/ufs/chfs/chfs_vnops.c | 6 +-
sys/ufs/ext2fs/ext2fs_dir.h | 4 +-
sys/ufs/ext2fs/ext2fs_extern.h | 3 +-
sys/ufs/ext2fs/ext2fs_readwrite.c | 7 +-
sys/ufs/ext2fs/ext2fs_rename.c | 1012 ++
sys/ufs/ext2fs/ext2fs_vfsops.c | 26 +-
sys/ufs/ext2fs/ext2fs_vnops.c | 426 +-
sys/ufs/ffs/ffs_vfsops.c | 6 +-
sys/ufs/ffs/ffs_vnops.c | 46 +-
sys/ufs/files.ufs | 4 +-
sys/ufs/lfs/lfs_vfsops.c | 19 +-
sys/ufs/lfs/lfs_vnops.c | 933 +--
sys/ufs/ufs/inode.h | 5 +-
sys/ufs/ufs/ufs_extattr.c | 18 +-
sys/ufs/ufs/ufs_extern.h | 25 +-
sys/ufs/ufs/ufs_lookup.c | 62 +-
sys/ufs/ufs/ufs_readwrite.c | 6 +-
sys/ufs/ufs/ufs_rename.c | 1080 +++
sys/ufs/ufs/ufs_vnops.c | 1022 +--
sys/ufs/ufs/ufsmount.h | 8 +-
sys/uvm/uvm_km.c | 30 +-
sys/uvm/uvm_page.h | 90 +-
sys/uvm/uvm_pager.h | 3 +-
sys/uvm/uvm_vnode.c | 7 +-
377 files changed, 26795 insertions(+), 11094 deletions(-)
diffs (truncated from 54313 to 300 lines):
diff -r cdbebabc5f78 -r d5b08dc2031e sys/arch/acorn26/acorn26/except.c
--- a/sys/arch/acorn26/acorn26/except.c Sat Jun 02 08:07:25 2012 +0000
+++ b/sys/arch/acorn26/acorn26/except.c Sat Jun 02 11:08:41 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: except.c,v 1.27 2010/12/20 00:25:23 matt Exp $ */
+/* $NetBSD: except.c,v 1.27.12.1 2012/06/02 11:08:41 mrg Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 Ben Harris
* All rights reserved.
@@ -31,7 +31,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.27 2010/12/20 00:25:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.27.12.1 2012/06/02 11:08:41 mrg Exp $");
#include "opt_ddb.h"
@@ -81,10 +81,10 @@
void
checkvectors(void)
{
- u_int32_t *ptr;
+ uint32_t *ptr;
/* Check that the vectors are valid */
- for (ptr = (u_int32_t *)0; ptr < (u_int32_t *)0x1c; ptr++)
+ for (ptr = (uint32_t *)0; ptr < (uint32_t *)0x1c; ptr++)
if (*ptr != 0xe59ff114)
panic("CPU vectors mangled");
}
diff -r cdbebabc5f78 -r d5b08dc2031e sys/arch/acorn26/acorn26/irq.c
--- a/sys/arch/acorn26/acorn26/irq.c Sat Jun 02 08:07:25 2012 +0000
+++ b/sys/arch/acorn26/acorn26/irq.c Sat Jun 02 11:08:41 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: irq.c,v 1.16 2010/12/20 00:25:23 matt Exp $ */
+/* $NetBSD: irq.c,v 1.16.12.1 2012/06/02 11:08:41 mrg Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irq.c,v 1.16 2010/12/20 00:25:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irq.c,v 1.16.12.1 2012/06/02 11:08:41 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -87,7 +87,7 @@
* be represented eventually.
*/
-static u_int32_t irqmask[NIPL];
+static uint32_t irqmask[NIPL];
LIST_HEAD(irq_handler_head, irq_handler) irq_list_head =
LIST_HEAD_INITIALIZER(irq_list_head);
@@ -96,7 +96,7 @@
LIST_ENTRY(irq_handler) link;
int (*func)(void *);
void *arg;
- u_int32_t mask;
+ uint32_t mask;
int irqnum;
int ipl;
int enabled;
@@ -355,7 +355,7 @@
hardsplx(int s)
{
int was;
- u_int32_t mask;
+ uint32_t mask;
KASSERT(s < IPL_HIGH);
int_off();
@@ -426,7 +426,7 @@
{
struct irq_handler *h;
int i;
- u_int32_t last;
+ uint32_t last;
for (h = irq_list_head.lh_first; h != NULL; h = h->link.le_next)
(*pr)("%12s: ipl %2d, IRQ %2d, mask 0x%05x, count %llu\n",
diff -r cdbebabc5f78 -r d5b08dc2031e sys/arch/acorn26/acorn26/machdep.c
--- a/sys/arch/acorn26/acorn26/machdep.c Sat Jun 02 08:07:25 2012 +0000
+++ b/sys/arch/acorn26/acorn26/machdep.c Sat Jun 02 11:08:41 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.35 2011/06/15 15:03:51 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.35.6.1 2012/06/02 11:08:41 mrg Exp $ */
/*-
* Copyright (c) 1998 Ben Harris
@@ -32,7 +32,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.35 2011/06/15 15:03:51 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.35.6.1 2012/06/02 11:08:41 mrg Exp $");
#include <sys/buf.h>
#include <sys/kernel.h>
@@ -124,9 +124,9 @@
* anyone can tell me how to fake a control-reset in
* software, I'd be most grateful.
*/
- *(volatile u_int8_t *)0x9c2 = 2; /* Zero page magic */
- *(volatile u_int32_t *)0
- = *(volatile u_int32_t *)MEMC_ROM_LOW_BASE;
+ *(volatile uint8_t *)0x9c2 = 2; /* Zero page magic */
+ *(volatile uint32_t *)0
+ = *(volatile uint32_t *)MEMC_ROM_LOW_BASE;
/* reboot in SVC mode, IRQs and FIQs disabled */
__asm volatile("movs pc, %0" : :
"r" (R15_MODE_SVC | R15_FIQ_DISABLE | R15_IRQ_DISABLE));
diff -r cdbebabc5f78 -r d5b08dc2031e sys/arch/acorn26/acorn26/pmap.c
--- a/sys/arch/acorn26/acorn26/pmap.c Sat Jun 02 08:07:25 2012 +0000
+++ b/sys/arch/acorn26/acorn26/pmap.c Sat Jun 02 11:08:41 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.33.12.1 2012/02/18 07:30:42 mrg Exp $ */
+/* $NetBSD: pmap.c,v 1.33.12.2 2012/06/02 11:08:41 mrg Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 Ben Harris
* All rights reserved.
@@ -102,7 +102,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.33.12.1 2012/02/18 07:30:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.33.12.2 2012/06/02 11:08:41 mrg Exp $");
#include <sys/kernel.h> /* for cold */
#include <sys/kmem.h>
@@ -136,15 +136,15 @@
pmap_t pv_pmap;
int pv_ppn;
int pv_lpn;
- u_int32_t pv_activate; /* MEMC command to activate mapping */
- u_int32_t pv_deactivate;/* MEMC command to deactivate mapping */
+ uint32_t pv_activate; /* MEMC command to activate mapping */
+ uint32_t pv_deactivate;/* MEMC command to deactivate mapping */
vm_prot_t pv_prot; /* requested protection */
- u_int8_t pv_ppl; /* Actual PPL */
- u_int8_t pv_vflags; /* Per-mapping flags */
+ uint8_t pv_ppl; /* Actual PPL */
+ uint8_t pv_vflags; /* Per-mapping flags */
#define PV_WIRED 0x01 /* This is a wired mapping */
#define PV_UNMANAGED 0x02 /* Mapping was entered by pmap_kenter_*() */
/* From pv_pflags onwards is per-physical-page state. */
- u_int8_t pv_pflags; /* Per-physical-page flags */
+ uint8_t pv_pflags; /* Per-physical-page flags */
#define PV_REFERENCED 0x01
#define PV_MODIFIED 0x02
#ifdef PMAP_DEBUG_MODIFIED
diff -r cdbebabc5f78 -r d5b08dc2031e sys/arch/acorn26/include/boot.h
--- a/sys/arch/acorn26/include/boot.h Sat Jun 02 08:07:25 2012 +0000
+++ b/sys/arch/acorn26/include/boot.h Sat Jun 02 11:08:41 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.h,v 1.3 2009/01/14 23:14:48 bjh21 Exp $ */
+/* $NetBSD: boot.h,v 1.3.18.1 2012/06/02 11:08:42 mrg Exp $ */
/*-
* Copyright (c) 1998 Ben Harris
* All rights reserved.
@@ -50,31 +50,31 @@
#define BOOT_MAGIC 0x942B7DFE
struct bootconfig {
- u_int32_t magic; /* BOOT_MAGIC */
- u_int32_t version; /* minor version of structure */
+ uint32_t magic; /* BOOT_MAGIC */
+ uint32_t version; /* minor version of structure */
/* Standard NetBSD boot parameters */
- u_int32_t boothowto; /* Reboot flags (single-user etc) */
- u_int32_t bootdev; /* Boot device */
- u_int32_t ssym; /* Start of debugging symbols */
- u_int32_t esym; /* End of debugging symbols */
+ uint32_t boothowto; /* Reboot flags (single-user etc) */
+ uint32_t bootdev; /* Boot device */
+ uint32_t ssym; /* Start of debugging symbols */
+ uint32_t esym; /* End of debugging symbols */
/* Parameters gathered by OS_ReadMemMapInfo */
- u_int32_t nbpp; /* Machine page size in bytes */
- u_int32_t npages; /* Number of pages */
+ uint32_t nbpp; /* Machine page size in bytes */
+ uint32_t npages; /* Number of pages */
/* Layout of physical memory. */
- u_int32_t txtbase; /* Kernel text base */
- u_int32_t txtsize; /* ... and size */
- u_int32_t database; /* Ditto for data */
- u_int32_t datasize; /* and bss */
- u_int32_t bssbase; /* Note that base addresses are */
- u_int32_t bsssize; /* "physical" ie bytes above 0x02000000 */
- u_int32_t freebase; /* Start of free space */
+ uint32_t txtbase; /* Kernel text base */
+ uint32_t txtsize; /* ... and size */
+ uint32_t database; /* Ditto for data */
+ uint32_t datasize; /* and bss */
+ uint32_t bssbase; /* Note that base addresses are */
+ uint32_t bsssize; /* "physical" ie bytes above 0x02000000 */
+ uint32_t freebase; /* Start of free space */
/* Framebuffer state -- used to initialise raster console */
- u_int32_t xpixels; /* Pixels across screen (XWindLimit + 1) */
- u_int32_t ypixels; /* Pixels down screen (YWindLimit + 1) */
- u_int32_t bpp; /* Bits per pixel (1 << Log2BPP) */
- u_int32_t screenbase; /* Physical base of screen */
- u_int32_t screensize; /* Size of framebuffer (TotalScreenSize) */
- u_int32_t cpixelrow; /* first free pixel row on screen */
+ uint32_t xpixels; /* Pixels across screen (XWindLimit + 1) */
+ uint32_t ypixels; /* Pixels down screen (YWindLimit + 1) */
+ uint32_t bpp; /* Bits per pixel (1 << Log2BPP) */
+ uint32_t screenbase; /* Physical base of screen */
+ uint32_t screensize; /* Size of framebuffer (TotalScreenSize) */
+ uint32_t cpixelrow; /* first free pixel row on screen */
/* Version 0 ends here */
};
diff -r cdbebabc5f78 -r d5b08dc2031e sys/arch/acorn26/include/memcreg.h
--- a/sys/arch/acorn26/include/memcreg.h Sat Jun 02 08:07:25 2012 +0000
+++ b/sys/arch/acorn26/include/memcreg.h Sat Jun 02 11:08:41 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: memcreg.h,v 1.3 2007/03/04 05:59:04 christos Exp $ */
+/* $NetBSD: memcreg.h,v 1.3.82.1 2012/06/02 11:08:42 mrg Exp $ */
/*-
* Copyright (c) 1997, 1998 Ben Harris
* All rights reserved.
@@ -40,7 +40,7 @@
* new value, and write any word to the resultant address.
*/
-#define MEMC_WRITE(value) *(volatile u_int32_t *)value = 0
+#define MEMC_WRITE(value) *(volatile uint32_t *)value = 0
/*
* This information is mostly derived from:
diff -r cdbebabc5f78 -r d5b08dc2031e sys/arch/acorn26/iobus/ioc.c
--- a/sys/arch/acorn26/iobus/ioc.c Sat Jun 02 08:07:25 2012 +0000
+++ b/sys/arch/acorn26/iobus/ioc.c Sat Jun 02 11:08:41 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ioc.c,v 1.20 2011/07/19 16:05:10 dyoung Exp $ */
+/* $NetBSD: ioc.c,v 1.20.6.1 2012/06/02 11:08:42 mrg Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 Ben Harris
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.20 2011/07/19 16:05:10 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.20.6.1 2012/06/02 11:08:42 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -191,7 +191,7 @@
IOC_IRQB_BIT(irq)) != 0;
}
-u_int32_t
+uint32_t
ioc_irq_status_full(void)
{
struct ioc_softc *sc = device_private(the_ioc);
@@ -208,7 +208,7 @@
}
void
-ioc_irq_setmask(u_int32_t mask)
+ioc_irq_setmask(uint32_t mask)
{
struct ioc_softc *sc = device_private(the_ioc);
bus_space_tag_t bst = sc->sc_bst;
@@ -268,7 +268,7 @@
*/
void
-ioc_fiq_setmask(u_int32_t mask)
+ioc_fiq_setmask(uint32_t mask)
{
struct ioc_softc *sc = device_private(the_ioc);
bus_space_tag_t bst = sc->sc_bst;
diff -r cdbebabc5f78 -r d5b08dc2031e sys/arch/acorn26/iobus/iocvar.h
--- a/sys/arch/acorn26/iobus/iocvar.h Sat Jun 02 08:07:25 2012 +0000
+++ b/sys/arch/acorn26/iobus/iocvar.h Sat Jun 02 11:08:41 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iocvar.h,v 1.6 2009/01/18 20:31:08 bjh21 Exp $ */
+/* $NetBSD: iocvar.h,v 1.6.18.1 2012/06/02 11:08:42 mrg Exp $ */
/*-
* Copyright (c) 1998, 1999 Ben Harris
* All rights reserved.
@@ -61,7 +61,7 @@
struct evcnt sc_sclkev;
struct timecounter sc_tc;
u_int sc_tcbase;
- u_int8_t sc_ctl;
+ uint8_t sc_ctl;
};
extern device_t the_ioc;
@@ -71,10 +71,10 @@
extern int ioc_irq_status(int);
Home |
Main Index |
Thread Index |
Old Index