PERFORCE change 64145 for review
Robert Watson
rwatson at FreeBSD.org
Wed Nov 3 05:37:03 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=64145
Change 64145 by rwatson at rwatson_zoo on 2004/11/03 13:36:26
Integrate netperf_socket:
- audit system call stubs added
- geom_vfs
- specfs goes away
- bufobj turns up
- file systems talk directly to geom
- hptmv driver
- pf locking fixes
- more aicisms
- if_bfe locking fixes
- various and sundry other and minor changes
- KTR tracing for geom
- KTR tracing for busdma
- more vm locking and optimization
- MAC locking fixes for early boot
- locking fixen for dynamically loaded protocols
- T/TCP gone!
- mac_bsdextended API leakage improvements
loop back:
- further /dev/random optimization and cleanup
- accept lock fix for soaccept()
- getsock() optimizations to avoid lots of socket reference count mutex
operations
- ABI hardening for ifnet: if_handoff() a function, spare fields in
struct ifnet.
Affected files ...
.. //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#5 integrate
.. //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#9 integrate
.. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#12 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#6 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#7 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#19 integrate
.. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#19 integrate
.. //depot/projects/netperf_socket/sys/amd64/include/vmparam.h#2 integrate
.. //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#6 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#5 integrate
.. //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#6 integrate
.. //depot/projects/netperf_socket/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/netperf_socket/sys/arm/conf/SIMICS#4 integrate
.. //depot/projects/netperf_socket/sys/boot/alpha/libalpha/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/arc/lib/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/common/Makefile.inc#4 integrate
.. //depot/projects/netperf_socket/sys/boot/efi/libefi/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/ficl/Makefile#5 integrate
.. //depot/projects/netperf_socket/sys/boot/forth/beastie.4th#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/libi386/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/libi386/biospci.c#2 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/libi386/libi386.h#3 integrate
.. //depot/projects/netperf_socket/sys/boot/i386/loader/main.c#3 integrate
.. //depot/projects/netperf_socket/sys/boot/ofw/libofw/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/btx/lib/btxcsu.s#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/libpc98/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/loader/conf.c#2 integrate
.. //depot/projects/netperf_socket/sys/boot/pc98/loader/main.c#3 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_proto.h#9 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscall.h#9 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_syscalls.c#9 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_sysent.c#9 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/syscalls.master#8 integrate
.. //depot/projects/netperf_socket/sys/conf/Makefile.arm#4 integrate
.. //depot/projects/netperf_socket/sys/conf/Makefile.powerpc#5 integrate
.. //depot/projects/netperf_socket/sys/conf/NOTES#44 integrate
.. //depot/projects/netperf_socket/sys/conf/files#55 integrate
.. //depot/projects/netperf_socket/sys/conf/files.i386#29 integrate
.. //depot/projects/netperf_socket/sys/conf/files.sparc64#11 integrate
.. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#16 integrate
.. //depot/projects/netperf_socket/sys/conf/kmod.mk#17 integrate
.. //depot/projects/netperf_socket/sys/conf/options#32 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/access601.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/array.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/atapi.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/command.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/gui_lib.c#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/hptproc.c#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/i386-elf.raid.o.uu#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/ioctl.c#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/mvSata.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/mvStorageDev.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/raid5n.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/readme.txt#1 branch
.. //depot/projects/netperf_socket/sys/contrib/dev/hptmv/vdevice.h#1 branch
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#15 integrate
.. //depot/projects/netperf_socket/sys/crypto/rijndael/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/ddb/db_output.c#4 integrate
.. //depot/projects/netperf_socket/sys/ddb/db_ps.c#6 integrate
.. //depot/projects/netperf_socket/sys/ddb/db_thread.c#2 integrate
.. //depot/projects/netperf_socket/sys/ddb/db_variables.c#3 integrate
.. //depot/projects/netperf_socket/sys/ddb/ddb.h#4 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_acpi.c#11 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.h#4 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/aicasm/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#17 integrate
.. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#11 integrate
.. //depot/projects/netperf_socket/sys/dev/bfe/if_bfereg.h#5 integrate
.. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#12 integrate
.. //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#5 integrate
.. //depot/projects/netperf_socket/sys/dev/dcons/dcons.h#4 integrate
.. //depot/projects/netperf_socket/sys/dev/dcons/dcons_os.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ed/if_ed_pccard.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/em/if_em.c#11 integrate
.. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#13 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwcrom.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/iec13213.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/hptmv/entry.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/hptmv/global.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/hptmv/hptintf.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/hptmv/mv.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/hptmv/mvOs.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/hptmv/osbsd.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/mcd/mcd.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/md/md.c#23 integrate
.. //depot/projects/netperf_socket/sys/dev/patm/genrtab/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/dev/pci/pci.c#12 integrate
.. //depot/projects/netperf_socket/sys/dev/random/randomdev_soft.c#7 integrate
.. //depot/projects/netperf_socket/sys/dev/scd/scd.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/sbus/apcdmareg.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/sound/sbus/cs4231.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/sound/sbus/cs4231.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/usb/ehci.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ehcireg.h#6 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ehcivar.h#4 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uftdi.c#9 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uhci.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uhub.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usb_subr.c#11 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#27 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/usbdivar.h#3 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uscanner.c#8 integrate
.. //depot/projects/netperf_socket/sys/dev/zs/zs.c#12 integrate
.. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vfsops.c#4 integrate
.. //depot/projects/netperf_socket/sys/fs/devfs/devfs_vnops.c#6 integrate
.. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs.h#3 integrate
.. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vfsops.c#5 integrate
.. //depot/projects/netperf_socket/sys/fs/hpfs/hpfs_vnops.c#4 integrate
.. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_denode.c#4 integrate
.. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate
.. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfs_vnops.c#5 integrate
.. //depot/projects/netperf_socket/sys/fs/msdosfs/msdosfsmount.h#5 integrate
.. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vfsops.c#5 integrate
.. //depot/projects/netperf_socket/sys/fs/ntfs/ntfs_vnops.c#3 integrate
.. //depot/projects/netperf_socket/sys/fs/specfs/spec_vnops.c#10 delete
.. //depot/projects/netperf_socket/sys/fs/udf/udf.h#4 integrate
.. //depot/projects/netperf_socket/sys/fs/udf/udf_vfsops.c#6 integrate
.. //depot/projects/netperf_socket/sys/fs/udf/udf_vnops.c#6 integrate
.. //depot/projects/netperf_socket/sys/fs/unionfs/union_vnops.c#5 integrate
.. //depot/projects/netperf_socket/sys/geom/geom.h#8 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_ctl.c#4 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_dev.c#7 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_event.c#5 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_int.h#4 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_io.c#11 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_mbr.c#5 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_slice.c#8 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_subr.c#10 integrate
.. //depot/projects/netperf_socket/sys/geom/geom_vfs.c#1 branch
.. //depot/projects/netperf_socket/sys/geom/geom_vfs.h#1 branch
.. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_plex.c#8 integrate
.. //depot/projects/netperf_socket/sys/geom/vinum/geom_vinum_var.h#3 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_bmap.c#3 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_inode.c#4 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_mount.h#5 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_subr.c#4 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vfsops.c#10 integrate
.. //depot/projects/netperf_socket/sys/gnu/ext2fs/ext2_vnops.c#8 integrate
.. //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#9 integrate
.. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#11 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#16 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/NOTES#30 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/busdma_machdep.c#6 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/db_trace.c#5 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#7 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#14 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/mp_machdep.c#11 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#30 integrate
.. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#9 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/db_trace.c#5 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/sscdisk.c#4 integrate
.. //depot/projects/netperf_socket/sys/isa/vga_isa.c#5 integrate
.. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_bmap.c#3 integrate
.. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_node.c#5 integrate
.. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_node.h#4 integrate
.. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vfsops.c#9 integrate
.. //depot/projects/netperf_socket/sys/isofs/cd9660/cd9660_vnops.c#6 integrate
.. //depot/projects/netperf_socket/sys/isofs/cd9660/iso.h#4 integrate
.. //depot/projects/netperf_socket/sys/kern/imgact_shell.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/init_sysent.c#12 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_conf.c#11 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_environment.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_exit.c#21 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_intr.c#12 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_ktr.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_mac.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_physio.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_sig.c#22 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_xxx.c#6 integrate
.. //depot/projects/netperf_socket/sys/kern/sched_ule.c#23 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_bus.c#16 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_kdb.c#8 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_trap.c#11 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_unit.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.c#12 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.master#12 integrate
.. //depot/projects/netperf_socket/sys/kern/sysv_ipc.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_domain.c#7 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#42 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#24 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#27 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_aio.c#10 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#12 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_cluster.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_default.c#7 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#16 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_subr.c#25 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_vnops.c#12 integrate
.. //depot/projects/netperf_socket/sys/kern/vnode_if.src#4 integrate
.. //depot/projects/netperf_socket/sys/modules/Makefile#22 integrate
.. //depot/projects/netperf_socket/sys/modules/aic7xxx/ahc/Makefile#3 integrate
.. //depot/projects/netperf_socket/sys/modules/aic7xxx/ahd/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/hptmv/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/ipdivert/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/ipfw/Makefile#5 integrate
.. //depot/projects/netperf_socket/sys/modules/netgraph/Makefile#8 integrate
.. //depot/projects/netperf_socket/sys/modules/smbfs/Makefile#4 integrate
.. //depot/projects/netperf_socket/sys/modules/sound/driver/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/sound/driver/audiocs/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/net/if.c#23 integrate
.. //depot/projects/netperf_socket/sys/net/if_tap.c#11 integrate
.. //depot/projects/netperf_socket/sys/net/if_tun.c#12 integrate
.. //depot/projects/netperf_socket/sys/net/if_var.h#21 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#7 integrate
.. //depot/projects/netperf_socket/sys/netgraph/netflow/netflow.c#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/netgraph.h#9 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_base.c#12 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_cisco.c#4 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_device.c#8 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_pppoe.c#7 integrate
.. //depot/projects/netperf_socket/sys/netgraph/ng_source.c#5 integrate
.. //depot/projects/netperf_socket/sys/netinet/if_ether.c#12 integrate
.. //depot/projects/netperf_socket/sys/netinet/in.h#7 integrate
.. //depot/projects/netperf_socket/sys/netinet/in_proto.c#8 integrate
.. //depot/projects/netperf_socket/sys/netinet/in_var.h#5 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_divert.c#16 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_divert.h#4 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#20 integrate
.. //depot/projects/netperf_socket/sys/netinet/ip_fw_pfil.c#5 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp.h#6 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_hostcache.c#5 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#20 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#13 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_sack.c#4 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_seq.h#4 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#23 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#15 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_timer.c#5 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_usrreq.c#15 integrate
.. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#12 integrate
.. //depot/projects/netperf_socket/sys/netinet6/ipsec.c#5 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vfsops.c#8 integrate
.. //depot/projects/netperf_socket/sys/nfs4client/nfs4_vnops.c#8 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#11 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_node.c#4 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_subs.c#11 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_vfsops.c#10 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_vnops.c#9 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfsnode.h#5 integrate
.. //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#11 integrate
.. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#6 integrate
.. //depot/projects/netperf_socket/sys/pc98/i386/machdep.c#12 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#15 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/wd.c#5 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/wd_cd.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/agp.c#9 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_i810.c#7 integrate
.. //depot/projects/netperf_socket/sys/pci/if_sk.c#13 integrate
.. //depot/projects/netperf_socket/sys/pci/if_skreg.h#4 integrate
.. //depot/projects/netperf_socket/sys/pci/if_vr.c#16 integrate
.. //depot/projects/netperf_socket/sys/powerpc/conf/GENERIC#12 integrate
.. //depot/projects/netperf_socket/sys/powerpc/include/elf.h#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_kauai.c#6 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_macio.c#4 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/db_trace.c#5 integrate
.. //depot/projects/netperf_socket/sys/security/mac/mac_internal.h#3 integrate
.. //depot/projects/netperf_socket/sys/security/mac/mac_label.c#3 integrate
.. //depot/projects/netperf_socket/sys/security/mac_biba/mac_biba.c#7 integrate
.. //depot/projects/netperf_socket/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate
.. //depot/projects/netperf_socket/sys/security/mac_bsdextended/mac_bsdextended.h#3 integrate
.. //depot/projects/netperf_socket/sys/security/mac_test/mac_test.c#7 integrate
.. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#14 integrate
.. //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#8 integrate
.. //depot/projects/netperf_socket/sys/sparc64/ebus/ebusreg.h#1 branch
.. //depot/projects/netperf_socket/sys/sparc64/isa/isa_dma.c#1 branch
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/db_trace.c#5 integrate
.. //depot/projects/netperf_socket/sys/sys/buf.h#6 integrate
.. //depot/projects/netperf_socket/sys/sys/bufobj.h#1 branch
.. //depot/projects/netperf_socket/sys/sys/conf.h#11 integrate
.. //depot/projects/netperf_socket/sys/sys/kernel.h#7 integrate
.. //depot/projects/netperf_socket/sys/sys/ktr.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/mac_policy.h#6 integrate
.. //depot/projects/netperf_socket/sys/sys/mount.h#14 integrate
.. //depot/projects/netperf_socket/sys/sys/proc.h#29 integrate
.. //depot/projects/netperf_socket/sys/sys/syscall.h#12 integrate
.. //depot/projects/netperf_socket/sys/sys/syscall.mk#12 integrate
.. //depot/projects/netperf_socket/sys/sys/sysproto.h#12 integrate
.. //depot/projects/netperf_socket/sys/sys/systm.h#12 integrate
.. //depot/projects/netperf_socket/sys/sys/vnode.h#12 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_alloc.c#8 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_balloc.c#3 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_extern.h#5 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_inode.c#4 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_rawread.c#3 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_snapshot.c#9 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_softdep.c#8 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#11 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#9 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/dinode.h#4 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/inode.h#4 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_bmap.c#3 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/ufs_vnops.c#10 integrate
.. //depot/projects/netperf_socket/sys/ufs/ufs/ufsmount.h#4 integrate
.. //depot/projects/netperf_socket/sys/vm/swap_pager.c#10 integrate
.. //depot/projects/netperf_socket/sys/vm/uma_core.c#15 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_contig.c#11 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_glue.c#14 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_kern.c#8 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#14 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_page.c#16 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_page.h#9 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#11 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_pager.c#4 integrate
.. //depot/projects/netperf_socket/sys/vm/vm_zeroidle.c#7 integrate
.. //depot/projects/netperf_socket/sys/vm/vnode_pager.c#7 integrate
Differences ...
==== //depot/projects/netperf_socket/sys/alpha/alpha/db_trace.c#5 (text+ko) ====
@@ -42,7 +42,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
/*__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.9 2000/12/13 03:16:36 mycroft Exp $");*/
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.21 2004/09/20 19:05:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_trace.c,v 1.22 2004/11/01 22:15:13 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -221,7 +221,7 @@
last_ipl = ~0L;
tf = NULL;
quit = 0;
- db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE);
+ db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
while (count-- && !quit) {
sym = db_search_symbol(pc, DB_STGY_ANY, &diff);
if (sym == DB_SYM_NULL)
==== //depot/projects/netperf_socket/sys/alpha/alpha/promcons.c#9 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.42 2004/10/18 21:51:24 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.43 2004/10/20 16:22:53 jhb Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -107,7 +107,7 @@
tp->t_dev = dev;
if ((tp->t_state & TS_ISOPEN) == 0) {
tp->t_state |= TS_CARR_ON;
- ttyconsmode(tp, 0);
+ ttyconsolemode(tp, 0);
ttsetwater(tp);
setuptimeout = 1;
==== //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#12 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.179 2004/09/11 07:26:50 alc Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.180 2004/11/02 20:57:19 andre Exp $
machine alpha
cpu EV4
@@ -66,7 +66,7 @@
options GEOM_GPT #GUID Partition Tables.
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
options COMPAT_FREEBSD4 #Compatible with FreeBSD4
-options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
+options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
options KTRACE #ktrace(1) syscall trace support
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
==== //depot/projects/netperf_socket/sys/amd64/amd64/db_trace.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.63 2004/09/20 19:05:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.64 2004/11/01 22:15:13 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -381,7 +381,7 @@
first = TRUE;
quit = 0;
- db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE);
+ db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
while (count-- && !quit) {
sym = db_search_symbol(pc, DB_STGY_ANY, &offset);
db_symbol_values(sym, &name, NULL);
==== //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#7 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.9 2004/08/16 23:12:29 peter Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.10 2004/11/01 22:15:13 jhb Exp $
*/
/*
@@ -313,7 +313,7 @@
else
verbose = 0;
isrc = interrupt_sources;
- db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE);
+ db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
for (i = 0; i < NUM_IO_INTS && !quit; i++, isrc++)
if (*isrc != NULL)
db_dump_ithread((*isrc)->is_ithread, verbose);
==== //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#19 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.621 2004/09/24 01:11:11 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.622 2004/10/28 12:16:03 simokawa Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -823,6 +823,7 @@
char *cp;
struct bios_smap *smapbase, *smap, *smapend;
u_int32_t smapsize;
+ quad_t dcons_addr, dcons_size;
bzero(physmap, sizeof(physmap));
basemem = 0;
@@ -968,6 +969,13 @@
pte = CMAP1;
/*
+ * Get dcons buffer address
+ */
+ if (getenv_quad("dcons.addr", &dcons_addr) == 0 ||
+ getenv_quad("dcons.size", &dcons_size) == 0)
+ dcons_addr = 0;
+
+ /*
* physmap is in bytes, so when converting to page boundaries,
* round up the start address and round down the end address.
*/
@@ -987,6 +995,14 @@
if (pa >= 0x100000 && pa < first)
continue;
+ /*
+ * block out dcons buffer
+ */
+ if (dcons_addr > 0
+ && pa >= trunc_page(dcons_addr)
+ && pa < dcons_addr + dcons_size)
+ continue;
+
page_bad = FALSE;
/*
==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#19 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.425 2004/09/22 00:44:13 peter Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.426 2004/11/02 20:57:19 andre Exp $
machine amd64
cpu HAMMER
@@ -48,7 +48,7 @@
options GEOM_GPT # GUID Partition Tables.
options COMPAT_IA32 # Compatible with i386 binaries
options COMPAT_FREEBSD4 # Compatible with FreeBSD4
-options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI
+options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI
options KTRACE # ktrace(1) support
options SYSVSHM # SYSV-style shared memory
options SYSVMSG # SYSV-style message queues
==== //depot/projects/netperf_socket/sys/amd64/include/vmparam.h#2 (text+ko) ====
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*
* from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.44 2003/12/07 04:51:04 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.45 2004/10/27 17:21:15 peter Exp $
*/
@@ -57,7 +57,7 @@
#define DFLDSIZ (128UL*1024*1024) /* initial data size limit */
#endif
#ifndef MAXDSIZ
-#define MAXDSIZ (8192UL*1024*1024) /* max data size */
+#define MAXDSIZ (32768UL*1024*1024) /* max data size */
#endif
#ifndef DFLSSIZ
#define DFLSSIZ (8UL*1024*1024) /* initial stack size limit */
==== //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.110 2004/10/11 21:51:27 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.112 2004/10/31 15:50:32 des Exp $");
#include "opt_cpu.h"
@@ -117,7 +117,7 @@
* via some other means. If we have, bail since otherwise
* we're going to end up duplicating it.
*/
- if ((pci_devclass = devclass_find("pci")) &&
+ if ((pci_devclass = devclass_find("pci")) &&
devclass_get_device(pci_devclass, 0))
return;
@@ -136,7 +136,7 @@
*/
if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE)
continue;
- if ((hdrtype & PCIM_MFDEV) &&
+ if ((hdrtype & PCIM_MFDEV) &&
(!found_orion || hdrtype != 0xff))
pcifunchigh = PCI_FUNCMAX;
else
@@ -266,10 +266,9 @@
SYSCTL_DECL(_hw_pci);
-static int legacy_host_mem_start = 0x80000000;
-/* No TUNABLE_ULONG :-( */
-TUNABLE_INT("hw.pci.host_mem_start", &legacy_host_mem_start);
-SYSCTL_INT(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN,
+static unsigned long legacy_host_mem_start = 0x80000000;
+TUNABLE_ULONG("hw.pci.host_mem_start", &legacy_host_mem_start);
+SYSCTL_ULONG(_hw_pci, OID_AUTO, host_mem_start, CTLFLAG_RDTUN,
&legacy_host_mem_start, 0x80000000,
"Limit the host bridge memory to being above this address. Must be\n\
set at boot via a tunable.");
@@ -394,12 +393,12 @@
/*
* Install placeholder to claim the resources owned by the
- * PCI bus interface. This could be used to extract the
+ * PCI bus interface. This could be used to extract the
* config space registers in the extreme case where the PnP
* ID is available and the PCI BIOS isn't, but for now we just
* eat the PnP ID and do nothing else.
*
- * XXX we should silence this probe, as it will generally confuse
+ * XXX we should silence this probe, as it will generally confuse
* people.
*/
static struct isa_pnp_id pcibus_pnp_ids[] = {
@@ -411,7 +410,7 @@
pcibus_pnp_probe(device_t dev)
{
int result;
-
+
if ((result = ISA_PNP_PROBE(device_get_parent(dev), dev, pcibus_pnp_ids)) <= 0)
device_quiet(dev);
return(result);
==== //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#5 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.4 2004/09/23 21:57:47 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.5 2004/10/21 11:59:33 cognet Exp $");
/*
* MacPPC bus dma support routines
@@ -687,7 +687,7 @@
int resid;
struct iovec *iov;
- if (op == BUS_DMASYNC_POSTREAD)
+ if (op == BUS_DMASYNC_POSTWRITE)
return;
if (map->flags & DMAMAP_COHERENT)
return;
==== //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#6 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.6 2004/09/23 22:02:59 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/db_trace.c,v 1.7 2004/11/01 22:15:13 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -138,7 +138,7 @@
scp_offset = -(get_pc_str_offset() >> 2);
quit = 0;
- db_setup_paging(db_simple_pager, &quit, DB_LINES_PER_PAGE);
+ db_setup_paging(db_simple_pager, &quit, db_lines_per_page);
while (count-- && frame != NULL && !quit) {
db_addr_t scp;
u_int32_t savecode;
==== //depot/projects/netperf_socket/sys/arm/conf/IQ31244#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.2 2004/10/01 16:51:37 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.3 2004/11/02 20:57:19 andre Exp $
machine arm
ident IQ31244
@@ -50,7 +50,7 @@
#options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
-options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
+options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
options KTRACE #ktrace(1) support
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
==== //depot/projects/netperf_socket/sys/arm/conf/SIMICS#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.4 2004/10/11 14:42:06 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.5 2004/11/02 20:57:19 andre Exp $
machine arm
ident SIMICS
@@ -50,7 +50,7 @@
#options PROCFS #Process filesystem (requires PSEUDOFS)
options PSEUDOFS #Pseudo-filesystem framework
options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!]
-options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI
+options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI
#options KTRACE #ktrace(1) support
options SYSVSHM #SYSV-style shared memory
options SYSVMSG #SYSV-style message queues
==== //depot/projects/netperf_socket/sys/boot/alpha/libalpha/Makefile#3 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.14 2004/02/11 22:01:17 ru Exp $
+# $FreeBSD: src/sys/boot/alpha/libalpha/Makefile,v 1.15 2004/10/24 15:32:49 ru Exp $
LIB= alpha
-INTERNALLIB= true
+INTERNALLIB=
#CFLAGS+= -DDISK_DEBUG
==== //depot/projects/netperf_socket/sys/boot/arc/lib/Makefile#2 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/boot/arc/lib/Makefile,v 1.9 2002/05/13 10:53:24 ru Exp $
+# $FreeBSD: src/sys/boot/arc/lib/Makefile,v 1.10 2004/10/24 15:32:49 ru Exp $
LIB= arc
-INTERNALLIB= true
+INTERNALLIB=
CFLAGS+= -ffreestanding
.PATH: ${.CURDIR}/arch/${MACHINE_ARCH}
==== //depot/projects/netperf_socket/sys/boot/common/Makefile.inc#4 (text+ko) ====
@@ -1,17 +1,18 @@
-# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.19 2004/08/29 00:48:41 iedowse Exp $
+# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.21 2004/10/24 12:32:41 ru Exp $
SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c
SRCS+= interp_backslash.c interp_parse.c ls.c misc.c
SRCS+= module.c panic.c
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-SRCS+= load_elf32.c load_elf32_obj.c load_elf64.c load_elf64_obj.c
-SRCS+= reloc_elf32.c reloc_elf64.c
-.endif
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE} == "i386" || ${MACHINE_ARCH} == "amd64"
+SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c
+SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c
+.elif ${MACHINE} == "pc98"
+SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c
+.elif ${MACHINE_ARCH} == "powerpc"
SRCS+= load_elf32.c reloc_elf32.c
-.endif
-.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "alpha"
+.elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" || \
+ ${MACHINE_ARCH} == "alpha"
SRCS+= load_elf64.c reloc_elf64.c
.endif
==== //depot/projects/netperf_socket/sys/boot/efi/libefi/Makefile#3 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.14 2004/02/13 04:43:41 marcel Exp $
+# $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.15 2004/10/24 15:32:49 ru Exp $
.PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH}
LIB= efi
-INTERNALLIB= true
+INTERNALLIB=
SRCS= libefi.c efi_console.c time.c copy.c devicename.c module.c
SRCS+= delay.c efifs.c efinet.c elf_freebsd.c bootinfo.c pal.S
==== //depot/projects/netperf_socket/sys/boot/ficl/Makefile#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.39 2004/08/23 16:25:07 obrien Exp $
+# $FreeBSD: src/sys/boot/ficl/Makefile,v 1.40 2004/10/24 15:32:49 ru Exp $
#
.PATH: ${.CURDIR}/${MACHINE_ARCH:S/amd64/i386/}
BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \
@@ -29,7 +29,7 @@
.include <bsd.prog.mk>
.else
LIB= ficl
-INTERNALLIB= yes
+INTERNALLIB=
.include <bsd.lib.mk>
.endif
==== //depot/projects/netperf_socket/sys/boot/forth/beastie.4th#2 (text+ko) ====
@@ -23,7 +23,7 @@
\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
\ SUCH DAMAGE.
\
-\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.8 2004/01/09 19:20:47 scottl Exp $
+\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.9 2004/10/30 13:45:13 brooks Exp $
marker task-beastie.4th
@@ -40,6 +40,7 @@
variable bootkey
variable bootacpikey
+variable bootusbkey
variable bootsafekey
variable bootverbosekey
variable bootsinglekey
@@ -159,6 +160,11 @@
printmenuitem ." Boot FreeBSD in single user mode" bootsinglekey !
printmenuitem ." Boot FreeBSD with verbose logging" bootverbosekey !
printmenuitem ." Escape to loader prompt" escapekey !
+ s" arch-i386" environment? if
+ printmenuitem ." Boot FreeBSD with USB keyboard" bootusbkey !
+ else
+ -2 bootacpikey !
+ then
printmenuitem ." Reboot" rebootkey !
menuX @ 20 at-xy
." Select option, [Enter] for default"
@@ -223,6 +229,10 @@
then
0 boot
then
+ dup bootusbkey @ = if
+ s" 0x1" s" hint.atkbd.0.flags" setenv
+ 0 boot
+ then
dup bootsafekey @ = if
s" arch-i386" environment? if
s" acpi_load" unsetenv
==== //depot/projects/netperf_socket/sys/boot/i386/libi386/Makefile#3 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.36 2004/02/07 23:30:45 ru Exp $
+# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.37 2004/10/24 15:32:49 ru Exp $
#
LIB= i386
-INTERNALLIB= true
+INTERNALLIB=
SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \
biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \
==== //depot/projects/netperf_socket/sys/boot/i386/libi386/biospci.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.4 2003/08/25 23:28:31 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.5 2004/10/22 14:56:23 simokawa Exp $");
/*
* PnP enumerator using the PCI BIOS.
@@ -112,6 +112,10 @@
{-1, NULL}
};
+static struct pci_progif progif_firewire[] = {
+ {0x10, "OHCI"},
+ {-1, NULL}
+};
struct pci_subclass
{
@@ -160,7 +164,7 @@
};
static struct pci_subclass subclass_serial[] = {
- {0x0, "Firewire", progif_null},
+ {0x0, "FireWire", progif_firewire},
{0x1, "ACCESS.bus", progif_null},
{0x2, "SSA", progif_null},
{0x3, "USB", progif_null},
@@ -199,7 +203,8 @@
static void
biospci_enumerate(void)
{
- int device_index, locator, devid;
+ int device_index, err;
+ uint32_t locator, devid;
struct pci_class *pc;
struct pci_subclass *psc;
struct pci_progif *ppi;
@@ -231,34 +236,19 @@
/* Scan for matches */
for (device_index = 0; ; device_index++) {
-
/* Look for a match */
- v86.ctl = V86_FLAGS;
- v86.addr = 0x1a;
- v86.eax = 0xb103;
- v86.ecx = (pc->pc_class << 16) + (psc->ps_subclass << 8) + ppi->pi_code;
- v86.esi = device_index;
- v86int();
- /* error/end of matches */
- if ((v86.efl & 1) || (v86.eax & 0xff00))
+ err = biospci_find_devclass((pc->pc_class << 16)
+ + (psc->ps_subclass << 8) + ppi->pi_code,
+ device_index, &locator);
+ if (err != 0)
break;
- /* Got something */
- locator = v86.ebx;
-
/* Read the device identifier from the nominated device */
- v86.ctl = V86_FLAGS;
- v86.addr = 0x1a;
- v86.eax = 0xb10a;
- v86.ebx = locator;
- v86.edi = 0x0;
- v86int();
- /* error */
- if ((v86.efl & 1) || (v86.eax & 0xff00))
+ err = biospci_read_config(locator, 0, 2, &devid);
+ if (err != 0)
break;
/* We have the device ID, create a PnP object and save everything */
- devid = v86.ecx;
biospci_addinfo(devid, pc, psc, ppi);
}
}
@@ -292,3 +282,61 @@
pnp_addident(pi, desc);
pnp_addinfo(pi);
}
+
+int
+biospci_find_devclass(uint32_t class, int index, uint32_t *locator)
+{
+ v86.ctl = V86_FLAGS;
+ v86.addr = 0x1a;
+ v86.eax = 0xb103;
+ v86.ecx = class;
+ v86.esi = index;
+ v86int();
+
+ /* error */
+ if ((v86.efl & 1) || (v86.eax & 0xff00))
+ return (-1);
+
+ *locator = v86.ebx;
+ return (0);
+}
+/*
+ * Configuration space access methods.
+ * width = 0(byte), 1(word) or 2(dword).
+ */
+int
+biospci_write_config(uint32_t locator, int offset, int width, uint32_t val)
+{
+ v86.ctl = V86_FLAGS;
+ v86.addr = 0x1a;
+ v86.eax = 0xb10b + width;
+ v86.ebx = locator;
+ v86.edi = offset;
+ v86.ecx = val;
+ v86int();
+
+ /* error */
+ if ((v86.efl & 1) || (v86.eax & 0xff00))
+ return (-1);
+
+ return(0);
+}
+
+int
+biospci_read_config(uint32_t locator, int offset, int width, uint32_t *val)
+{
+ v86.ctl = V86_FLAGS;
+ v86.addr = 0x1a;
+ v86.eax = 0xb108 + width;
+ v86.ebx = locator;
+ v86.edi = offset;
+ v86int();
+
+ /* error */
+ if ((v86.efl & 1) || (v86.eax & 0xff00))
+ return (-1);
+
+ *val = v86.ecx;
+ return (0);
+}
+
==== //depot/projects/netperf_socket/sys/boot/i386/libi386/libi386.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.18 2004/06/16 18:21:22 phk Exp $
+ * $FreeBSD: src/sys/boot/i386/libi386/libi386.h,v 1.19 2004/10/22 14:56:23 simokawa Exp $
*/
@@ -93,6 +93,10 @@
extern u_int32_t bios_extmem; /* extended memory in bytes */
extern vm_offset_t memtop;
+int biospci_find_devclass(uint32_t class, int index);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list