From owner-p4-projects@FreeBSD.ORG Mon May 3 19:26:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B03A16A4D0; Mon, 3 May 2004 19:26:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59CDF16A4CE for ; Mon, 3 May 2004 19:26:54 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E02643D39 for ; Mon, 3 May 2004 19:26:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i442QqGe009550 for ; Mon, 3 May 2004 19:26:52 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i442QnCO009547 for perforce@freebsd.org; Mon, 3 May 2004 19:26:49 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 3 May 2004 19:26:49 -0700 (PDT) Message-Id: <200405040226.i442QnCO009547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 52192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 May 2004 02:26:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=52192 Change 52192 by rwatson@rwatson_tislabs on 2004/05/03 19:25:57 Integrate netperf_socket forward to FreeBSD CVS HEAD. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#3 integrate .. //depot/projects/netperf_socket/sys/alpha/include/float.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/netperf_socket/sys/amd64/include/float.h#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.s#3 delete .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0ext.s#3 delete .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0sio.s#3 delete .. //depot/projects/netperf_socket/sys/boot/i386/boot0ext/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0sio/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot2/sio.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/btx.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/cdboot/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/amd64_tramp.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/mbr/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/pxeldr.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/serial_16550.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/serial_8251.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/btxldr.S#2 integrate .. //depot/projects/netperf_socket/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/kern_ndis.c#13 integrate .. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#12 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#15 integrate .. //depot/projects/netperf_socket/sys/conf/files#19 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#5 integrate .. //depot/projects/netperf_socket/sys/conf/files.i386#14 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#8 integrate .. //depot/projects/netperf_socket/sys/conf/files.sparc64#3 integrate .. //depot/projects/netperf_socket/sys/conf/kern.pre.mk#10 integrate .. //depot/projects/netperf_socket/sys/conf/majors#4 integrate .. //depot/projects/netperf_socket/sys/conf/options#11 integrate .. //depot/projects/netperf_socket/sys/conf/options.sparc64#2 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#5 integrate .. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#17 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#10 integrate .. //depot/projects/netperf_socket/sys/dev/asr/asr.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-commands.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-disk.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-fd.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/cissreg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#1 branch .. //depot/projects/netperf_socket/sys/dev/cy/cy_isa.c#1 branch .. //depot/projects/netperf_socket/sys/dev/cy/cy_pci.c#1 branch .. //depot/projects/netperf_socket/sys/dev/cy/cyreg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/cy/cyvar.h#1 branch .. //depot/projects/netperf_socket/sys/dev/gem/if_gem.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/ic/cd1400.h#1 branch .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#10 integrate .. //depot/projects/netperf_socket/sys/dev/led/led.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/dcphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/mii.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/mii_physubr.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/mlphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/rgephy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/ruephy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/tlphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/mii/xmphy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/sio/sio_ebus.c#2 delete .. //depot/projects/netperf_socket/sys/dev/sound/pci/cmi.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/buffer.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_sab82532.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#10 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#10 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvscom.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/vinum/vinumio.c#4 integrate .. //depot/projects/netperf_socket/sys/geom/gate/g_gate.c#1 branch .. //depot/projects/netperf_socket/sys/geom/gate/g_gate.h#1 branch .. //depot/projects/netperf_socket/sys/geom/geom_gpt.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_asus.c#1 branch .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#17 integrate .. //depot/projects/netperf_socket/sys/i386/i386/elan-mmcr.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/float.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/legacyvar.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/mpapic.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/atpic.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/clock.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/cy.c#4 delete .. //depot/projects/netperf_socket/sys/i386/isa/cyreg.h#2 delete .. //depot/projects/netperf_socket/sys/i386/isa/ic/cd1400.h#2 delete .. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/acpica/madt.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/conf/GENERIC#3 integrate .. //depot/projects/netperf_socket/sys/ia64/conf/SKI#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/trap.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/include/float.h#3 integrate .. //depot/projects/netperf_socket/sys/isa/fd.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/imgact_elf.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_clock.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_environment.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_jail.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_mac.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/link_elf_obj.c#1 branch .. //depot/projects/netperf_socket/sys/kern/sched_ule.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_export.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#8 integrate .. //depot/projects/netperf_socket/sys/modules/acpi/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/acpi/acpi_asus/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/asr/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/geom/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/modules/geom/geom_gate/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/netgraph/Makefile#5 integrate .. //depot/projects/netperf_socket/sys/modules/sio/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/net/bridge.c#5 integrate .. //depot/projects/netperf_socket/sys/net/if.c#8 integrate .. //depot/projects/netperf_socket/sys/net/if.h#4 integrate .. //depot/projects/netperf_socket/sys/net/if_arcsubr.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/netperf_socket/sys/net/if_ethersubr.c#12 integrate .. //depot/projects/netperf_socket/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_gre.c#4 integrate .. //depot/projects/netperf_socket/sys/net/if_iso88025subr.c#6 integrate .. //depot/projects/netperf_socket/sys/net/if_var.h#10 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan.c#2 integrate .. //depot/projects/netperf_socket/sys/net/radix.c#5 integrate .. //depot/projects/netperf_socket/sys/net/route.c#9 integrate .. //depot/projects/netperf_socket/sys/net/route.h#9 integrate .. //depot/projects/netperf_socket/sys/net/rtsock.c#7 integrate .. //depot/projects/netperf_socket/sys/netatalk/aarp.c#8 integrate .. //depot/projects/netperf_socket/sys/netatalk/at_extern.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/common/ng_bluetooth.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_cmds.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_evnt.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_main.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_misc.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/hci/ng_hci_ulpi.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_parse.c#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pptpgre.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_pptpgre.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/if_ether.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fw2.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_var.h#5 integrate .. //depot/projects/netperf_socket/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_output.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/netperf_socket/sys/netinet/udp_usrreq.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet6/nd6.c#5 integrate .. //depot/projects/netperf_socket/sys/netipsec/key.c#4 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC#6 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#6 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/agp.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/agp_i810.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/cy_pci.c#3 delete .. //depot/projects/netperf_socket/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/float.h#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/param.h#3 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/netperf_socket/sys/powerpc/powermac/ata_macio.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac/mac_net.c#4 integrate .. //depot/projects/netperf_socket/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/float.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/nexusvar.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/isa/ofw_isa.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/psychoreg.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/psychovar.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/ofw_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sys/imgact.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/jail.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#7 integrate .. //depot/projects/netperf_socket/sys/sys/mman.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/proc.h#7 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/device_pager.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/phys_pager.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_kern.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#6 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.h#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#6 integrate .. //depot/projects/netperf_socket/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#6 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.143 2004/04/11 05:08:26 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.146 2004/04/26 17:49:05 gallatin Exp $"); #include #include @@ -1074,7 +1074,7 @@ */ VM_OBJECT_LOCK(pmap->pm_pteobj); lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, - VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED); + VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED | VM_ALLOC_ZERO); vm_page_lock_queues(); vm_page_flag_clear(lev1pg, PG_BUSY); @@ -1083,10 +1083,7 @@ VM_OBJECT_UNLOCK(pmap->pm_pteobj); pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); - if ((lev1pg->flags & PG_ZERO) == 0) - bzero(pmap->pm_lev1, PAGE_SIZE); - /* install self-referential address mapping entry (not PG_ASM) */ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) | PG_V | PG_KRE | PG_KWE; @@ -1194,8 +1191,6 @@ VM_OBJECT_LOCK(pmap->pm_pteobj); m = vm_page_grab(pmap->pm_pteobj, ptepindex, VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); - if ((m->flags & PG_ZERO) == 0) - pmap_zero_page(m); KASSERT(m->queue == PQ_NONE, ("_pmap_allocpte: %p->queue != PQ_NONE", m)); @@ -1242,7 +1237,6 @@ vm_page_lock_queues(); m->valid = VM_PAGE_BITS_ALL; - vm_page_flag_clear(m, PG_ZERO); vm_page_wakeup(m); vm_page_unlock_queues(); if (!is_object_locked) @@ -1906,7 +1900,8 @@ * raise IPL while manipulating pv_table since pmap_enter can be * called at interrupt time. */ - if (pmap_initialized && (m->flags & PG_FICTITIOUS) == 0) { + if (pmap_initialized && + (m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { pmap_insert_entry(pmap, va, mpte, m); managed |= PG_MANAGED; } @@ -1966,7 +1961,7 @@ pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte) { register pt_entry_t *pte; - + int managed; /* * In the case that a page table page is not @@ -2031,7 +2026,11 @@ * raise IPL while manipulating pv_table since pmap_enter can be * called at interrupt time. */ - pmap_insert_entry(pmap, va, mpte, m); + managed = 0; + if ((m->flags & (PG_FICTITIOUS|PG_UNMANAGED)) == 0) { + pmap_insert_entry(pmap, va, mpte, m); + managed = PG_MANAGED | PG_FOR | PG_FOW | PG_FOE; + } /* * Increment counters @@ -2041,7 +2040,7 @@ /* * Now validate mapping with RO protection */ - *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | PG_MANAGED | PG_FOR | PG_FOE | PG_FOW; + *pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed; alpha_pal_imb(); /* XXX overkill? */ return mpte; ==== //depot/projects/netperf_socket/sys/alpha/conf/GENERIC#3 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.168 2004/01/24 21:45:25 jeff Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.170 2004/05/02 20:40:17 marcel Exp $ machine alpha cpu EV4 @@ -60,6 +60,7 @@ options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework +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 @@ -194,10 +195,10 @@ device umass # Disks/Mass storage - Requires scbus and da0 device ums # Mouse # USB Ethernet -device aue # ADMtek USB ethernet -device axe # ASIX Electronics USB ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet +device aue # ADMtek USB Ethernet +device axe # ASIX Electronics USB Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet # FireWire support device firewire # FireWire bus code ==== //depot/projects/netperf_socket/sys/alpha/include/float.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/float.h,v 1.5 2004/04/05 21:00:50 imp Exp $ */ +/* $FreeBSD: src/sys/alpha/include/float.h,v 1.6 2004/04/25 02:36:28 das Exp $ */ /* From: NetBSD: float.h,v 1.6 1997/07/17 21:36:03 thorpej Exp */ /* @@ -41,8 +41,10 @@ #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS __flt_rounds() +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD 0 /* no promotions */ #define DECIMAL_DIG 17 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ ==== //depot/projects/netperf_socket/sys/amd64/acpica/acpi_machdep.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.12 2003/09/22 22:12:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.13 2004/04/21 02:10:58 njl Exp $"); #include #include @@ -40,8 +40,7 @@ { struct acpi_softc *sc; - if ((sc = device_get_softc(dev)) == NULL) - return (ENXIO); + sc = device_get_softc(dev); acpi_install_wakeup_handler(sc); ==== //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#5 (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.405 2004/03/25 03:19:28 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.407 2004/05/02 20:40:18 marcel Exp $ machine amd64 cpu HAMMER @@ -44,6 +44,7 @@ options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework +options GEOM_GPT # GUID Partition Tables. options IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options SCSI_DELAY=15000 # Delay (in ms) before probing SCSI @@ -180,7 +181,7 @@ # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support -device bfe # Broadcom BCM440x 10/100 ethernet +device bfe # Broadcom BCM440x 10/100 Ethernet device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) @@ -189,9 +190,9 @@ device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 -device sk # SysKonnect SK-984x & SK-982x gigabit ethernet +device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet device ste # Sundance ST201 (D-Link DFE-550TX) -device ti # Alteon Networks Tigon I/II gigabit ethernet +device ti # Alteon Networks Tigon I/II gigabit Ethernet device tl # Texas Instruments ThunderLAN device tx # SMC EtherPower II (83c170 ``EPIC'') device vr # VIA Rhine, Rhine II @@ -210,8 +211,8 @@ #device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. # XXX kvtop brokenness, pointer/int warnings #device lnc # NE2100, NE32-VL Lance Ethernet cards -device sn # SMC's 9000 series of ethernet chips -device xe # Xircom pccard ethernet +device sn # SMC's 9000 series of Ethernet chips +device xe # Xircom pccard Ethernet # ISA devices that use the old ISA shims #device le @@ -253,10 +254,10 @@ device urio # Diamond Rio 500 MP3 player device uscanner # Scanners # USB Ethernet, requires mii -device aue # ADMtek USB ethernet -device axe # ASIX Electronics USB ethernet -device cue # CATC USB ethernet -device kue # Kawasaki LSI USB ethernet +device aue # ADMtek USB Ethernet +device axe # ASIX Electronics USB Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet # FireWire support device firewire # FireWire bus code ==== //depot/projects/netperf_socket/sys/amd64/include/float.h#3 (text+ko) ==== @@ -27,16 +27,20 @@ * SUCH DAMAGE. * * from: @(#)float.h 7.1 (Berkeley) 5/8/90 - * $FreeBSD: src/sys/amd64/include/float.h,v 1.11 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/include/float.h,v 1.12 2004/04/25 02:36:28 das Exp $ */ #ifndef _MACHINE_FLOAT_H_ #define _MACHINE_FLOAT_H_ 1 +#include + #define FLT_RADIX 2 /* b */ #define FLT_ROUNDS 1 /* FP addition rounds to nearest */ +#if __ISO_C_VISIBLE >= 1999 #define FLT_EVAL_METHOD (-1) /* i387 semantics are...interesting */ #define DECIMAL_DIG 21 /* max precision in decimal digits */ +#endif #define FLT_MANT_DIG 24 /* p */ #define FLT_EPSILON 1.19209290E-07F /* b**(1-p) */ ==== //depot/projects/netperf_socket/sys/boot/i386/boot0/Makefile#3 (text+ko) ==== @@ -1,13 +1,10 @@ -# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.23 2004/02/09 14:11:56 ru Exp $ +# $FreeBSD: src/sys/boot/i386/boot0/Makefile,v 1.29 2004/04/28 21:31:19 ru Exp $ -PROG= ${BOOT}.out -INTERNALPROG= -FILES= ${BOOT} +PROG?= boot0 +STRIP= +BINMODE=${NOBINMODE} NOMAN= -SRCS= ${BOOT}.s -CLEANFILES= ${BOOT} - -BOOT?= boot0 +SRCS= ${PROG}.S # The default set of flags compiled into boot0. This enables update (writing # the modified boot0 back to disk after running so that the selection made is @@ -30,13 +27,10 @@ # command line BOOT_BOOT0_COMCONSOLE_SPEED?= 0xE3 -AFLAGS+=--defsym FLAGS=${BOOT_BOOT0_FLAGS} \ - --defsym TICKS=${BOOT_BOOT0_TICKS} \ - --defsym COMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED} +CFLAGS+=-DFLAGS=${BOOT_BOOT0_FLAGS} \ + -DTICKS=${BOOT_BOOT0_TICKS} \ + -DCOMSPEED=${BOOT_BOOT0_COMCONSOLE_SPEED} -LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} - -${BOOT}: ${BOOT}.out - objcopy -S -O binary ${BOOT}.out ${.TARGET} +LDFLAGS=-N -e start -Ttext ${BOOT_BOOT0_ORG} -Wl,-S,--oformat,binary .include ==== //depot/projects/netperf_socket/sys/boot/i386/boot0ext/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.1 2004/03/26 18:46:31 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/boot0ext/Makefile,v 1.2 2004/04/28 21:31:20 ru Exp $ .PATH: ${.CURDIR}/../boot0 -BOOT= boot0ext +PROG= boot0ext .include "${.CURDIR}/../boot0/Makefile" ==== //depot/projects/netperf_socket/sys/boot/i386/boot0sio/Makefile#3 (text+ko) ==== @@ -1,7 +1,8 @@ -# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.2 2004/02/06 21:58:31 ru Exp $ +# $FreeBSD: src/sys/boot/i386/boot0sio/Makefile,v 1.4 2004/04/28 21:31:20 ru Exp $ .PATH: ${.CURDIR}/../boot0 -BOOT= boot0sio +PROGNAME= boot0sio +CFLAGS+= -DSIO .include "${.CURDIR}/../boot0/Makefile" ==== //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.S#2 (text+ko) ==== @@ -1,21 +1,21 @@ -// -// Copyright (c) 1998 Robert Nordier -// All rights reserved. -// -// Redistribution and use in source and binary forms are freely -// permitted provided that the above copyright notice and this -// paragraph and the following disclaimer are duplicated in all -// such forms. -// -// This software is provided "AS IS" and without any express or -// implied warranties, including, without limitation, the implied -// warranties of merchantability and fitness for a particular -// purpose. -// +/* + * Copyright (c) 1998 Robert Nordier + * All rights reserved. + * + * Redistribution and use in source and binary forms are freely + * permitted provided that the above copyright notice and this + * paragraph and the following disclaimer are duplicated in all + * such forms. + * + * This software is provided "AS IS" and without any express or + * implied warranties, including, without limitation, the implied + * warranties of merchantability and fitness for a particular + * purpose. + * + * $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.26 2004/04/28 14:31:43 ru Exp $ + */ -// $FreeBSD: src/sys/boot/i386/boot2/boot1.S,v 1.24 2004/02/17 07:13:04 ru Exp $ - -// Memory Locations +/* Memory Locations */ .set MEM_REL,0x700 // Relocation address .set MEM_ARG,0x900 // Arguments .set MEM_ORG,0x7c00 // Origin @@ -25,15 +25,15 @@ .set MEM_USR,0xa000 // Client start .set BDA_BOOT,0x472 // Boot howto flag -// Partition Constants +/* Partition Constants */ .set PRT_OFF,0x1be // Partition offset .set PRT_NUM,0x4 // Partitions .set PRT_BSD,0xa5 // Partition type -// Flag Bits +/* Flag Bits */ .set FL_PACKET,0x80 // Packet mode -// Misc. Constants +/* Misc. Constants */ .set SIZ_PAG,0x1000 // Page size .set SIZ_SEC,0x200 // Sector size @@ -44,19 +44,20 @@ start: jmp main // Start recognizably -// This is the start of a standard BIOS Parameter Block (BPB). Most bootable -// FAT disks have this at the start of their MBR. While normal BIOS's will -// work fine without this section, IBM's El Torito emulation "fixes" up the -// BPB by writing into the memory copy of the MBR. Rather than have data -// written into our xread routine, we'll define a BPB to work around it. -// The data marked with (T) indicates a field required for a ThinkPad to -// recognize the disk and (W) indicates fields written from IBM BIOS code. -// The use of the BPB is based on what OpenBSD and NetBSD implemented in -// their boot code but the required fields were determined by trial and error. -// -// Note: If additional space is needed in boot1, one solution would be to -// move the "prompt" message data (below) to replace the OEM ID. - +/* + * This is the start of a standard BIOS Parameter Block (BPB). Most bootable + * FAT disks have this at the start of their MBR. While normal BIOS's will + * work fine without this section, IBM's El Torito emulation "fixes" up the + * BPB by writing into the memory copy of the MBR. Rather than have data + * written into our xread routine, we'll define a BPB to work around it. + * The data marked with (T) indicates a field required for a ThinkPad to + * recognize the disk and (W) indicates fields written from IBM BIOS code. + * The use of the BPB is based on what OpenBSD and NetBSD implemented in + * their boot code but the required fields were determined by trial and error. + * + * Note: If additional space is needed in boot1, one solution would be to + * move the "prompt" message data (below) to replace the OEM ID. + */ .org 0x03, 0x00 oemid: .space 0x08, 0x00 // OEM ID @@ -78,21 +79,21 @@ ebpb: .byte 0 // BIOS physical drive number (W) .org 0x25,0x90 -// -// Trampoline used by boot2 to call read to read data from the disk via -// the BIOS. Call with: -// -// %cx:%ax - long - LBA to read in -// %es:(%bx) - caddr_t - buffer to read data into -// %dl - byte - drive to read from -// %dh - byte - num sectors to read -// +/* + * Trampoline used by boot2 to call read to read data from the disk via + * the BIOS. Call with: + * + * %cx:%ax - long - LBA to read in + * %es:(%bx) - caddr_t - buffer to read data into + * %dl - byte - drive to read from + * %dh - byte - num sectors to read + */ xread: push %ss // Address pop %ds // data -// -// Setup an EDD disk packet and pass it to read -// +/* + * Setup an EDD disk packet and pass it to read + */ xread.1: // Starting pushl $0x0 // absolute push %cx // block @@ -107,37 +108,37 @@ callw read // Read from disk lea 0x10(%bp),%sp // Clear stack lret // To far caller -// -// Load the rest of boot2 and BTX up, copy the parts to the right locations, -// and start it all up. -// +/* + * Load the rest of boot2 and BTX up, copy the parts to the right locations, + * and start it all up. + */ -// -// Setup the segment registers to flat addressing (segment 0) and setup the -// stack to end just below the start of our code. -// +/* + * Setup the segment registers to flat addressing (segment 0) and setup the + * stack to end just below the start of our code. + */ main: cld // String ops inc xor %cx,%cx // Zero mov %cx,%es // Address mov %cx,%ds // data mov %cx,%ss // Set up mov $start,%sp // stack -// -// Relocate ourself to MEM_REL. Since %cx == 0, the inc %ch sets -// %cx == 0x100. -// +/* + * Relocate ourself to MEM_REL. Since %cx == 0, the inc %ch sets + * %cx == 0x100. + */ mov %sp,%si // Source mov $MEM_REL,%di // Destination incb %ch // Word count rep // Copy movsw // code -// -// If we are on a hard drive, then load the MBR and look for the first -// FreeBSD slice. We use the fake partition entry below that points to -// the MBR when we call nread. The first pass looks for the first active -// FreeBSD slice. The second pass looks for the first non-active FreeBSD -// slice if the first one fails. -// +/* + * If we are on a hard drive, then load the MBR and look for the first + * FreeBSD slice. We use the fake partition entry below that points to + * the MBR when we call nread. The first pass looks for the first active + * FreeBSD slice. The second pass looks for the first non-active FreeBSD + * slice if the first one fails. + */ mov $part4,%si // Partition cmpb $0x80,%dl // Hard drive? jb main.4 // No @@ -157,30 +158,30 @@ jb main.2 // Yes dec %cx // Do two jcxz main.1 // passes -// -// If we get here, we didn't find any FreeBSD slices at all, so print an -// error message and die. -// +/* + * If we get here, we didn't find any FreeBSD slices at all, so print an + * error message and die. + */ mov $msg_part,%si // Message jmp error // Error -// -// Floppies use partition 0 of drive 0. -// +/* + * Floppies use partition 0 of drive 0. + */ main.4: xor %dx,%dx // Partition:drive -// -// Ok, we have a slice and drive in %dx now, so use that to locate and load -// boot2. %si references the start of the slice we are looking for, so go -// ahead and load up the first 16 sectors (boot1 + boot2) from that. When -// we read it in, we conveniently use 0x8cec as our transfer buffer. Thus, -// boot1 ends up at 0x8cec, and boot2 starts at 0x8cec + 0x200 = 0x8eec. -// The first part of boot2 is the disklabel, which is 0x114 bytes long. -// The second part is BTX, which is thus loaded into 0x9000, which is where -// it also runs from. The boot2.bin binary starts right after the end of -// BTX, so we have to figure out where the start of it is and then move the -// binary to 0xc000. Normally, BTX clients start at MEM_USR, or 0xa000, but -// when we use btxld to create boot2, we use an entry point of 0x2000. That -// entry point is relative to MEM_USR; thus boot2.bin starts at 0xc000. -// +/* + * Ok, we have a slice and drive in %dx now, so use that to locate and load + * boot2. %si references the start of the slice we are looking for, so go + * ahead and load up the first 16 sectors (boot1 + boot2) from that. When + * we read it in, we conveniently use 0x8cec as our transfer buffer. Thus, + * boot1 ends up at 0x8cec, and boot2 starts at 0x8cec + 0x200 = 0x8eec. + * The first part of boot2 is the disklabel, which is 0x114 bytes long. + * The second part is BTX, which is thus loaded into 0x9000, which is where + * it also runs from. The boot2.bin binary starts right after the end of + * BTX, so we have to figure out where the start of it is and then move the + * binary to 0xc000. Normally, BTX clients start at MEM_USR, or 0xa000, but + * when we use btxld to create boot2, we use an entry point of 0x2000. That + * entry point is relative to MEM_USR; thus boot2.bin starts at 0xc000. + */ main.5: mov %dx,MEM_ARG // Save args movb $NSECT,%dh // Sector count callw nread // Read disk @@ -198,9 +199,9 @@ stosb // up to 0x10000 callw seta20 // Enable A20 jmp start+MEM_JMP-MEM_ORG // Start BTX -// -// Enable A20 so we can access memory above 1 meg. -// +/* + * Enable A20 so we can access memory above 1 meg. + */ seta20: cli // Disable interrupts seta20.1: inb $0x64,%al // Get status testb $0x2,%al // Busy? @@ -214,9 +215,9 @@ outb %al,$0x60 // A20 sti // Enable interrupts retw // To caller -// -// Trampoline used to call read from within boot1. -// +/* + * Trampoline used to call read from within boot1. + */ nread: mov $MEM_BUF,%bx // Transfer buffer mov 0x8(%si),%ax // Get mov 0xa(%si),%cx // LBA @@ -226,10 +227,10 @@ mov $msg_read,%si // Otherwise, set the error // message and fall through to // the error routine -// -// Print out the error message pointed to by %ds:(%si) followed -// by a prompt, wait for a keypress, and then reboot the machine. -// +/* + * Print out the error message pointed to by %ds:(%si) followed + * by a prompt, wait for a keypress, and then reboot the machine. + */ error: callw putstr // Display message mov $prompt,%si // Display callw putstr // prompt @@ -237,9 +238,9 @@ int $0x16 // keypress movw $0x1234, BDA_BOOT // Do a warm boot ljmp $0xffff,$0x0 // reboot the machine -// -// Display a null-terminated string using the BIOS output. -// +/* + * Display a null-terminated string using the BIOS output. + */ putstr.0: mov $0x7,%bx // Page:attribute movb $0xe,%ah // BIOS: Display int $0x10 // character @@ -247,24 +248,24 @@ testb %al,%al // End of string? jne putstr.0 // No -// -// Overused return code. ereturn is used to return an error from the -// read function. Since we assume putstr succeeds, we (ab)use the -// same code when we return from putstr. -// +/* + * Overused return code. ereturn is used to return an error from the + * read function. Since we assume putstr succeeds, we (ab)use the + * same code when we return from putstr. + */ ereturn: movb $0x1,%ah // Invalid stc // argument return: retw // To caller -// -// Reads sectors from the disk. If EDD is enabled, then check if it is -// installed and use it if it is. If it is not installed or not enabled, then -// fall back to using CHS. Since we use a LBA, if we are using CHS, we have to -// fetch the drive parameters from the BIOS and divide it out ourselves. -// Call with: -// -// %dl - byte - drive number -// stack - 10 bytes - EDD Packet -// +/* + * Reads sectors from the disk. If EDD is enabled, then check if it is + * installed and use it if it is. If it is not installed or not enabled, then + * fall back to using CHS. Since we use a LBA, if we are using CHS, we have to + * fetch the drive parameters from the BIOS and divide it out ourselves. + * Call with: + * + * %dl - byte - drive number + * stack - 10 bytes - EDD Packet + */ read: push %dx // Save movb $0x8,%ah // BIOS: Get drive int $0x13 // parameters @@ -343,7 +344,7 @@ int $0x13 // read retw // To caller -// Messages +/* Messages */ msg_read: .asciz "Read" msg_part: .asciz "Boot" @@ -354,7 +355,7 @@ .org PRT_OFF,0x90 -// Partition table +/* Partition table */ .fill 0x30,0x1,0x0 part4: .byte 0x80, 0x00, 0x01, 0x00 ==== //depot/projects/netperf_socket/sys/boot/i386/boot2/sio.S#2 (text+ko) ==== @@ -1,23 +1,23 @@ -# -# Copyright (c) 1998 Robert Nordier -# All rights reserved. -# -# Redistribution and use in source and binary forms are freely -# permitted provided that the above copyright notice and this -# paragraph and the following disclaimer are duplicated in all -# such forms. -# -# This software is provided "AS IS" and without any express or -# implied warranties, including, without limitation, the implied -# warranties of merchantability and fitness for a particular -# purpose. -# +/* + * Copyright (c) 1998 Robert Nordier + * All rights reserved. + * + * Redistribution and use in source and binary forms are freely + * permitted provided that the above copyright notice and this + * paragraph and the following disclaimer are duplicated in all + * such forms. + * + * This software is provided "AS IS" and without any express or + * implied warranties, including, without limitation, the implied + * warranties of merchantability and fitness for a particular + * purpose. + * + * $FreeBSD: src/sys/boot/i386/boot2/sio.S,v 1.8 2004/04/28 14:31:43 ru Exp $ + */ -# $FreeBSD: src/sys/boot/i386/boot2/sio.S,v 1.6 2004/02/17 07:13:04 ru Exp $ - - .set SIO_PRT,SIOPRT # Base port - .set SIO_FMT,SIOFMT # 8N1 - .set SIO_DIV,(115200/SIOSPD) # 115200 / SPD + .set SIO_PRT,SIOPRT // Base port + .set SIO_FMT,SIOFMT // 8N1 + .set SIO_DIV,(115200/SIOSPD) // 115200 / SPD .globl sio_init .globl sio_flush @@ -25,56 +25,56 @@ .globl sio_getc .globl sio_ischar -# void sio_init(void) +/* void sio_init(void) */ -sio_init: movw $SIO_PRT+0x3,%dx # Data format reg - movb $SIO_FMT|0x80,%al # Set format - outb %al,(%dx) # and DLAB - pushl %edx # Save - subb $0x3,%dl # Divisor latch reg - movw $SIO_DIV,%ax # Set - outw %ax,(%dx) # BPS - popl %edx # Restore - movb $SIO_FMT,%al # Clear - outb %al,(%dx) # DLAB - incl %edx # Modem control reg - movb $0x3,%al # Set RTS, - outb %al,(%dx) # DTR - incl %edx # Line status reg +sio_init: movw $SIO_PRT+0x3,%dx // Data format reg >>> TRUNCATED FOR MAIL (1000 lines) <<<