From owner-p4-projects@FreeBSD.ORG Sun May 23 09:46:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 82EC216A4D0; Sun, 23 May 2004 09:46:36 -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 59B8616A4CE for ; Sun, 23 May 2004 09:46:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50C9B43D3F for ; Sun, 23 May 2004 09:46:36 -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.11/8.12.11) with ESMTP id i4NGkYh2016085 for ; Sun, 23 May 2004 09:46:34 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NGkVRJ016082 for perforce@freebsd.org; Sun, 23 May 2004 09:46:31 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 23 May 2004 09:46:31 -0700 (PDT) Message-Id: <200405231646.i4NGkVRJ016082@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 53295 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: Sun, 23 May 2004 16:46:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=53295 Change 53295 by rwatson@rwatson_paprika on 2004/05/23 09:45:52 Integrate netperf_socket to CVS HEAD. Many changes, the ones of primary interest for the netperf work are: - Thundering herd problem in soisconnected() fixed. - mbuf arithmetic fix. - Loopback of sendfile() Giant fix. - Loopback of netatalk soisdisconnected() pruning. - Optional IP option processing. Affected files ... .. //depot/projects/netperf_socket/sys/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/elf_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/fp_emulate.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/alpha/ieee_float.c#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/_stdint.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/fpu.h#2 integrate .. //depot/projects/netperf_socket/sys/alpha/include/profile.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/apic_vector.S#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/elf_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/intr_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/legacy.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mptable.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/nexus.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/amd64/support.S#5 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/netperf_socket/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/netperf_socket/sys/amd64/include/_stdint.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/acpica_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/netperf_socket/sys/amd64/include/pmap.h#6 integrate .. //depot/projects/netperf_socket/sys/amd64/include/profile.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/include/smp.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#4 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/atpic_vector.S#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/clock.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/netperf_socket/sys/amd64/isa/icu.h#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/nmi.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/netperf_socket/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/blockio.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/copystr.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm3.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm67.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/critical.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/disassem.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/exception.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/fiq.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/fusu.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/genassym.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/intr.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/locore.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/machdep.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/nexus.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/pmap.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/setstack.s#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/support.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/swtch.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/trap.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/undefined.c#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/vectors.S#1 branch .. //depot/projects/netperf_socket/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/arm/conf/SIMICS#1 branch .. //depot/projects/netperf_socket/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/_stdint.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/_types.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/armreg.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/asm.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/asmacros.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/atomic.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/blockio.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/bus.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/clock.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/cpu.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/critical.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/disassem.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/elf.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/endian.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/fiq.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/float.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/fp.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/frame.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/ieee.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/intr.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/katelib.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/machdep.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/md_var.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/metadata.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/mutex.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/param.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/pcb.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/pcpu.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/pmap.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/proc.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/profile.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/psl.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/pte.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/ptrace.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/reg.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/reloc.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/resource.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/runq.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/setjmp.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/sigframe.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/signal.h#3 integrate .. //depot/projects/netperf_socket/sys/arm/include/smp.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/stdarg.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/swi.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/trap.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/ucontext.h#2 integrate .. //depot/projects/netperf_socket/sys/arm/include/undefined.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/utrap.h#1 branch .. //depot/projects/netperf_socket/sys/arm/include/vmparam.h#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/netperf_socket/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/netperf_socket/sys/boot/Makefile#3 integrate .. //depot/projects/netperf_socket/sys/boot/common/loader.8#4 integrate .. //depot/projects/netperf_socket/sys/boot/forth/loader.conf.5#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot2/boot1.S#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/boot2/sio.S#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/btx/btxldr/btxldr.S#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/amd64_tramp.S#3 integrate .. //depot/projects/netperf_socket/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/netperf_socket/sys/boot/i386/pxeldr/pxeldr.S#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/serial_16550.S#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/boot2/serial_8251.S#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btx/btx.S#3 integrate .. //depot/projects/netperf_socket/sys/boot/pc98/btx/btxldr/btxldr.S#3 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.alpha#3 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.arm#1 branch .. //depot/projects/netperf_socket/sys/conf/Makefile.i386#2 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/netperf_socket/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/netperf_socket/sys/conf/NOTES#16 integrate .. //depot/projects/netperf_socket/sys/conf/files#20 integrate .. //depot/projects/netperf_socket/sys/conf/files.alpha#3 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#6 integrate .. //depot/projects/netperf_socket/sys/conf/files.arm#1 branch .. //depot/projects/netperf_socket/sys/conf/files.i386#15 integrate .. //depot/projects/netperf_socket/sys/conf/files.ia64#3 integrate .. //depot/projects/netperf_socket/sys/conf/files.pc98#9 integrate .. //depot/projects/netperf_socket/sys/conf/files.sparc64#4 integrate .. //depot/projects/netperf_socket/sys/conf/kern.mk#5 integrate .. //depot/projects/netperf_socket/sys/conf/kmod.mk#6 integrate .. //depot/projects/netperf_socket/sys/conf/ldscript.arm#1 branch .. //depot/projects/netperf_socket/sys/conf/majors#5 integrate .. //depot/projects/netperf_socket/sys/conf/options#12 integrate .. //depot/projects/netperf_socket/sys/conf/options.arm#1 branch .. //depot/projects/netperf_socket/sys/conf/options.pc98#4 integrate .. //depot/projects/netperf_socket/sys/conf/options.sparc64#3 integrate .. //depot/projects/netperf_socket/sys/contrib/dev/acpica/acfreebsd.h#6 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src.diff#1 branch .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_env.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_self-new.c#1 branch .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_self.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_self_context.s#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_step.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_str.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_ttrace.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_ttrace.h#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_utable.c#2 integrate .. //depot/projects/netperf_socket/sys/contrib/ia64/libuwx/src/uwx_utable.h#2 integrate .. //depot/projects/netperf_socket/sys/ddb/db_elf.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#18 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_acad.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pci.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpi_thermal.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.reg#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx.seq#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_inline.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/aic7xxx/aic_osm_lib.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/arl/if_arl.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/asr/asr.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/awi/if_awi_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/cnw/if_cnw.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/cp/cpddk.c#1 branch .. //depot/projects/netperf_socket/sys/dev/cp/cpddk.h#1 branch .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#1 branch .. //depot/projects/netperf_socket/sys/dev/cp/ng_cp.h#1 branch .. //depot/projects/netperf_socket/sys/dev/cs/if_cs.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ctau/if_ct.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/cx/if_cx.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/cy/cy.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/ed/if_ed_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/em/if_em.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/fdc/fdc.c#1 branch .. //depot/projects/netperf_socket/sys/dev/fdc/fdcreg.h#1 branch .. //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/firewire.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwcrom.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwmem.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwmem.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohcireg.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwohcivar.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwphyreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/iec13213.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/iec68113.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/sbp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/gx/if_gx.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hmereg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/ichwd/ichwd.c#1 branch .. //depot/projects/netperf_socket/sys/dev/ichwd/ichwd.h#1 branch .. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis.c#11 integrate .. //depot/projects/netperf_socket/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/iicbus/iicbus.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/iir/iir_ctrl.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/led/led.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/md/md.c#14 integrate .. //depot/projects/netperf_socket/sys/dev/my/if_my.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/ofw/openfirmio.h#3 integrate .. //depot/projects/netperf_socket/sys/dev/owi/if_owi.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/files.pccard#2 delete .. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/netperf_socket/sys/dev/pccard/pccarddevs.h#5 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/pccbb/pccbbvar.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/smbus/smb.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/smbus/smb.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sn/if_sn.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/snc/if_snc_pccard.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sb16.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/sound/isa/sbc.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/sound/pcm/ac97.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa_cam.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/twa/twa_freebsd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twe.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twereg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/twe/twevar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_core.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/uart/uart_dev_z8530.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ohcireg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umass.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/usb/umodem.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usb.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs#11 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs.h#11 integrate .. //depot/projects/netperf_socket/sys/dev/usb/usbdevs_data.h#11 integrate .. //depot/projects/netperf_socket/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/vx/if_vx.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/wi/if_wi_pccard.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/wl/if_wl.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/xe/if_xe.c#5 integrate .. //depot/projects/netperf_socket/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/netperf_socket/sys/fs/nwfs/nwfs_io.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/netperf_socket/sys/fs/specfs/spec_vnops.c#6 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.c#7 integrate .. //depot/projects/netperf_socket/sys/geom/concat/g_concat.h#6 integrate .. //depot/projects/netperf_socket/sys/geom/gate/g_gate.c#2 integrate .. //depot/projects/netperf_socket/sys/geom/geom_disk.c#3 integrate .. //depot/projects/netperf_socket/sys/geom/nop/g_nop.c#1 branch .. //depot/projects/netperf_socket/sys/geom/nop/g_nop.h#1 branch .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.c#1 branch .. //depot/projects/netperf_socket/sys/geom/stripe/g_stripe.h#1 branch .. //depot/projects/netperf_socket/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_machdep.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/acpica/madt.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/conf/NOTES#18 integrate .. //depot/projects/netperf_socket/sys/i386/conf/PAE#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/elf_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/io_apic.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/local_apic.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mptable.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/support.s#4 integrate .. //depot/projects/netperf_socket/sys/i386/include/_stdint.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/bus_pc98.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/i386/include/pci_cfgreg.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/include/profile.h#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic_vector.s#5 integrate .. //depot/projects/netperf_socket/sys/i386/isa/clock.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/isa/elcr.c#1 branch .. //depot/projects/netperf_socket/sys/i386/isa/icu.h#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/npx.c#5 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/netperf_socket/sys/i386/pci/pci_pir.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/netperf_socket/sys/ia64/include/_stdint.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/acpica_machdep.h#2 integrate .. //depot/projects/netperf_socket/sys/ia64/include/profile.h#2 integrate .. //depot/projects/netperf_socket/sys/isa/fd.c#7 delete .. //depot/projects/netperf_socket/sys/isa/fdreg.h#3 delete .. //depot/projects/netperf_socket/sys/kern/kern_exec.c#9 integrate .. //depot/projects/netperf_socket/sys/kern/kern_exit.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_jail.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_linker.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/kern_proc.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/kern_resource.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/kern_sig.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/kern_synch.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/kern_thread.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/link_elf.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/netperf_socket/sys/kern/subr_prof.c#4 integrate .. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#6 integrate .. //depot/projects/netperf_socket/sys/kern/subr_smp.c#7 integrate .. //depot/projects/netperf_socket/sys/kern/tty_compat.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_mbuf2.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#8 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#7 integrate .. //depot/projects/netperf_socket/sys/libkern/arm/divsi3.S#1 branch .. //depot/projects/netperf_socket/sys/libkern/arm/ffs.S#1 branch .. //depot/projects/netperf_socket/sys/libkern/arm/muldi3.c#1 branch .. //depot/projects/netperf_socket/sys/libkern/quad.h#4 integrate .. //depot/projects/netperf_socket/sys/modules/Makefile#9 integrate .. //depot/projects/netperf_socket/sys/modules/cp/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/fdc/Makefile#2 integrate .. //depot/projects/netperf_socket/sys/modules/geom/Makefile#4 integrate .. //depot/projects/netperf_socket/sys/modules/geom/geom_nop/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/geom/geom_stripe/Makefile#1 branch .. //depot/projects/netperf_socket/sys/modules/ichwd/Makefile#1 branch .. //depot/projects/netperf_socket/sys/net/if_vlan.c#3 integrate .. //depot/projects/netperf_socket/sys/net/rtsock.c#8 integrate .. //depot/projects/netperf_socket/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#9 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/include/ng_bt3c.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/include/ng_btsocket.h#3 integrate .. //depot/projects/netperf_socket/sys/netgraph/bluetooth/include/ng_h4.h#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_ether.c#4 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_hole.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_hole.h#2 integrate .. //depot/projects/netperf_socket/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_fastfwd.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_icmp.c#6 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_input.c#11 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_output.c#10 integrate .. //depot/projects/netperf_socket/sys/netinet/ip_var.h#6 integrate .. //depot/projects/netperf_socket/sys/netinet6/ip6_output.c#5 integrate .. //depot/projects/netperf_socket/sys/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/netperf_socket/sys/pc98/conf/NOTES#11 integrate .. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/agp.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/agp_ali.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/agp_amd.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/agp_i810.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/agp_intel.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/agp_nvidia.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/agp_sis.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/agp_via.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/agppriv.h#2 integrate .. //depot/projects/netperf_socket/sys/pci/agpreg.h#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_sk.c#8 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/_stdint.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/include/profile.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/elf_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/trap.c#2 integrate .. //depot/projects/netperf_socket/sys/security/mac_portacl/mac_portacl.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/conf/NOTES#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/ebus/ebus.c#4 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/_stdint.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/cpufunc.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/ofw_bus.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/pmap.h#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/isa/isa.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/isa/ofw_isa.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/isa/ofw_isa.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pci.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/pci/psychovar.h#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/counter.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/elf_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/ofw_bus.c#2 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/ofw_machdep.c#3 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/vm_machdep.c#6 integrate .. //depot/projects/netperf_socket/sys/sys/_label.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/acl.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/ata.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/condvar.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/elf_common.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/gmon.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/imgact_aout.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/linker.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mac.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/mac_policy.h#3 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#8 integrate .. //depot/projects/netperf_socket/sys/sys/regression.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/socket.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/sysctl.h#5 integrate .. //depot/projects/netperf_socket/sys/sys/ttycom.h#4 integrate .. //depot/projects/netperf_socket/sys/sys/user.h#4 integrate .. //depot/projects/netperf_socket/sys/tools/miidevs2h.awk#1 branch .. //depot/projects/netperf_socket/sys/tools/pccarddevs2h.awk#1 branch .. //depot/projects/netperf_socket/sys/tools/usbdevs2h.awk#1 branch .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/netperf_socket/sys/vm/swap_pager.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_extern.h#6 integrate .. //depot/projects/netperf_socket/sys/vm/vm_fault.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_glue.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/vm_map.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/vm_mmap.c#8 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#7 integrate .. //depot/projects/netperf_socket/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/vnode_pager.c#4 integrate Differences ... ==== //depot/projects/netperf_socket/sys/Makefile#2 (text+ko) ==== @@ -1,7 +1,9 @@ -# $FreeBSD: src/sys/Makefile,v 1.29 2004/01/17 03:28:27 ru Exp $ +# $FreeBSD: src/sys/Makefile,v 1.30 2004/05/16 00:19:12 cognet Exp $ # The boot loader +.if ${MACHINE_ARCH} != "arm" SUBDIR= boot +.endif # Loadable kernel modules .if defined(MODULES_WITH_WORLD) ==== //depot/projects/netperf_socket/sys/alpha/alpha/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.17 2003/12/23 02:42:38 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.18 2004/05/16 20:00:27 peter Exp $"); #include #include @@ -108,9 +108,9 @@ /* Process one elf relocation with addend. */ static int -elf_reloc_internal(linker_file_t lf, const void *data, int type, int local) +elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data, + int type, int local, elf_lookup_fn lookup) { - Elf_Addr relocbase = (Elf_Addr) lf->address; Elf_Addr *where; Elf_Addr addr; Elf_Addr addend; @@ -152,7 +152,7 @@ break; case R_ALPHA_REFQUAD: - addr = elf_lookup(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; addr += addend; @@ -161,7 +161,7 @@ break; case R_ALPHA_GLOB_DAT: - addr = elf_lookup(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; addr += addend; @@ -171,7 +171,7 @@ case R_ALPHA_JMP_SLOT: /* No point in lazy binding for kernel modules. */ - addr = elf_lookup(lf, symidx, 1); + addr = lookup(lf, symidx, 1); if (addr == 0) return -1; if (*where != addr) @@ -198,17 +198,19 @@ } int -elf_reloc(linker_file_t lf, const void *data, int type) +elf_reloc(linker_file_t lf, Elf_Addr relocbase, const void *data, int type, + elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, data, type, 0)); + return (elf_reloc_internal(lf, relocbase, data, type, 0, lookup)); } int -elf_reloc_local(linker_file_t lf, const void *data, int type) +elf_reloc_local(linker_file_t lf, Elf_Addr relocbase, const void *data, + int type, elf_lookup_fn lookup) { - return (elf_reloc_internal(lf, data, type, 1)); + return (elf_reloc_internal(lf, relocbase, data, type, 1, lookup)); } int ==== //depot/projects/netperf_socket/sys/alpha/alpha/fp_emulate.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.13 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/fp_emulate.c,v 1.14 2004/05/06 09:35:57 das Exp $"); #include #include @@ -296,7 +296,7 @@ td->td_pcb->pcb_fp_control = control; /* Regenerate the control register */ - fpcr = fpregs->fpr_cr & FPCR_DYN_MASK; + fpcr = fpregs->fpr_cr & (FPCR_DYN_MASK | FPCR_STATUS_MASK); fpcr |= ((control & IEEE_STATUS_MASK) << IEEE_STATUS_TO_FPCR_SHIFT); if (!(control & IEEE_TRAP_ENABLE_INV)) ==== //depot/projects/netperf_socket/sys/alpha/alpha/ieee_float.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.9 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.10 2004/05/06 09:36:11 das Exp $"); #include #ifdef TEST @@ -312,6 +312,9 @@ break; } + if (frac == 0) + *status |= FPCR_UNF; + /* * Rounding up may take us to TWO if * fraclo == (TWO - epsilon). Also If fraclo has been ==== //depot/projects/netperf_socket/sys/alpha/include/_stdint.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/_stdint.h,v 1.1 2002/07/29 17:41:06 mike Exp $ + * $FreeBSD: src/sys/alpha/include/_stdint.h,v 1.2 2004/05/18 16:04:56 stefanf Exp $ */ #ifndef _MACHINE__STDINT_H_ @@ -160,11 +160,11 @@ /* Limits of wchar_t. */ #define WCHAR_MIN INT32_MIN #define WCHAR_MAX INT32_MAX +#endif /* Limits of wint_t. */ #define WINT_MIN INT32_MIN #define WINT_MAX INT32_MAX -#endif #endif /* !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) */ ==== //depot/projects/netperf_socket/sys/alpha/include/fpu.h#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/alpha/include/fpu.h,v 1.6 2002/11/16 06:35:51 deischen Exp $ + * $FreeBSD: src/sys/alpha/include/fpu.h,v 1.7 2004/05/06 09:35:57 das Exp $ */ #ifndef _MACHINE_FPU_H_ @@ -56,6 +56,8 @@ #define FPCR_INED (1LL << 62) /* Inexact Disable */ #define FPCR_SUM (1LL << 63) /* Summary Bit */ #define FPCR_MASK (~0LL << 49) +#define FPCR_STATUS_MASK (FPCR_INV | FPCR_DZE | FPCR_OVF | \ + FPCR_UNF | FPCR_INE | FPCR_IOV) /* * Exception summary bits. ==== //depot/projects/netperf_socket/sys/alpha/include/profile.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/profile.h,v 1.5 2002/03/20 18:58:45 obrien Exp $ */ +/* $FreeBSD: src/sys/alpha/include/profile.h,v 1.6 2004/05/19 15:41:25 bde Exp $ */ /* From: NetBSD: profile.h,v 1.9 1997/04/06 08:47:37 cgd Exp */ /* @@ -220,18 +220,6 @@ #define MCOUNT_EXIT(s) \ (void)_alpha_pal_swpipl(s); #define MCOUNT_DECL(s) u_long s; -#ifdef GUPROF -struct gmonparam; - -void nullfunc_loop_profiled(void); -void nullfunc_profiled(void); -void startguprof(struct gmonparam *p); -void stopguprof(struct gmonparam *p); -#else -#define startguprof(p) -#define stopguprof(p) -#endif /* GUPROF */ - #else /* !_KERNEL */ typedef u_long uintfptr_t; #endif ==== //depot/projects/netperf_socket/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.11 2003/08/28 16:30:31 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.12 2004/05/06 02:18:57 njl Exp $"); /* * 6.1 : Environmental support @@ -37,7 +37,7 @@ #include "acpi.h" -u_long amd64_acpi_root; +static u_long amd64_acpi_root; SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0, "The physical address of the RSDP"); ==== //depot/projects/netperf_socket/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.11 2004/01/30 00:24:45 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.12 2004/05/16 20:30:46 peter Exp $"); #include #include @@ -49,6 +49,7 @@ #include #include "acpi.h" +#include #include #include @@ -69,14 +70,15 @@ u_int la_apic_id:8; } lapics[NLAPICS + 1]; +static int madt_found_sci_override; static MULTIPLE_APIC_TABLE *madt; static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; MALLOC_DEFINE(M_MADT, "MADT Table", "ACPI MADT Table Items"); -static u_char interrupt_polarity(UINT16 Polarity); -static u_char interrupt_trigger(UINT16 TriggerMode); +static enum intr_polarity interrupt_polarity(UINT16 Polarity, UINT8 Source); +static enum intr_trigger interrupt_trigger(UINT16 TriggerMode, UINT8 Source); static int madt_find_cpu(u_int acpi_id, u_int *apic_id); static int madt_find_interrupt(int intr, void **apic, u_int *pin); static void *madt_map(vm_paddr_t pa, int offset, vm_offset_t length); @@ -157,6 +159,7 @@ { ACPI_TABLE_HEADER *header; vm_offset_t length; + void *table; header = madt_map(pa, offset, sizeof(ACPI_TABLE_HEADER)); if (strncmp(header->Signature, sig, 4) != 0) { @@ -165,7 +168,14 @@ } length = header->Length; madt_unmap(header, sizeof(ACPI_TABLE_HEADER)); - return (madt_map(pa, offset, length)); + table = madt_map(pa, offset, length); + if (ACPI_FAILURE(AcpiTbVerifyTableChecksum(table))) { + if (bootverbose) + printf("MADT: Failed checksum for table %s\n", sig); + madt_unmap(table, length); + return (NULL); + } + return (table); } static void @@ -215,6 +225,16 @@ * Page 0 is used to map in the headers of candidate ACPI tables. */ if (rsdp->Revision >= 2) { + /* + * AcpiOsGetRootPointer only verifies the checksum for + * the version 1.0 portion of the RSDP. Version 2.0 has + * an additional checksum that we verify first. + */ + if (AcpiTbChecksum(rsdp, ACPI_RSDP_XCHECKSUM_LENGTH) != 0) { + if (bootverbose) + printf("MADT: RSDP failed extended checksum\n"); + return (ENXIO); + } xsdt = madt_map_table(rsdp->XsdtPhysicalAddress, 1, XSDT_SIG); if (xsdt == NULL) { if (bootverbose) @@ -251,6 +271,16 @@ printf("MADT: Found table at 0x%jx\n", (uintmax_t)madt_physaddr); + /* + * Verify that we can map the full table and that its checksum is + * correct, etc. + */ + madt = madt_map_table(madt_physaddr, 0, APIC_SIG); + if (madt == NULL) + return (ENXIO); + madt_unmap_table(madt); + madt = NULL; + return (0); } @@ -273,7 +303,6 @@ printf("Table '%.4s' at 0x%jx\n", table->Signature, (uintmax_t)address); - /* XXX: Verify checksum? */ if (strncmp(table->Signature, APIC_SIG, 4) != 0) { madt_unmap(table, sizeof(ACPI_TABLE_HEADER)); return (0); @@ -325,6 +354,8 @@ static int madt_setup_io(void) { + void *ioapic; + u_int pin; int i; /* Try to initialize ACPI so that we can access the FADT. */ @@ -337,11 +368,30 @@ } /* First, we run through adding I/O APIC's. */ + if (madt->PCATCompat) + ioapic_enable_mixed_mode(); madt_walk_table(madt_parse_apics, NULL); /* Second, we run through the table tweaking interrupt sources. */ madt_walk_table(madt_parse_ints, NULL); + /* + * If there was not an explicit override entry for the SCI, + * force it to use level trigger and active-low polarity. + */ + if (!madt_found_sci_override) { + if (madt_find_interrupt(AcpiGbl_FADT->SciInt, &ioapic, &pin) + != 0) + printf("MADT: Could not find APIC for SCI IRQ %d\n", + AcpiGbl_FADT->SciInt); + else { + printf( + "MADT: Forcing active-low polarity and level trigger for SCI\n"); + ioapic_set_polarity(ioapic, pin, INTR_POLARITY_LOW); + ioapic_set_triggermode(ioapic, pin, INTR_TRIGGER_LEVEL); + } + } + /* Third, we register all the I/O APIC's. */ for (i = 0; i < NIOAPICS; i++) if (ioapics[i].io_apic != NULL) @@ -446,35 +496,44 @@ } /* - * Determine properties of an interrupt source. Note that for ACPI, - * these are only used for ISA interrupts, so we assume ISA bus values - * (Active Hi, Edge Triggered) for conforming values. + * Determine properties of an interrupt source. Note that for ACPI these + * functions are only used for ISA interrupts, so we assume ISA bus values + * (Active Hi, Edge Triggered) for conforming values except for the ACPI + * SCI for which we use Active Lo, Level Triggered. */ -static u_char -interrupt_polarity(UINT16 Polarity) +static enum intr_polarity +interrupt_polarity(UINT16 Polarity, UINT8 Source) { switch (Polarity) { case POLARITY_CONFORMS: + if (Source == AcpiGbl_FADT->SciInt) + return (INTR_POLARITY_LOW); + else + return (INTR_POLARITY_HIGH); case POLARITY_ACTIVE_HIGH: - return (1); + return (INTR_POLARITY_HIGH); case POLARITY_ACTIVE_LOW: - return (0); + return (INTR_POLARITY_LOW); default: panic("Bogus Interrupt Polarity"); } } -static u_char -interrupt_trigger(UINT16 TriggerMode) +static enum intr_trigger +interrupt_trigger(UINT16 TriggerMode, UINT8 Source) { switch (TriggerMode) { case TRIGGER_CONFORMS: + if (Source == AcpiGbl_FADT->SciInt) + return (INTR_TRIGGER_LEVEL); + else + return (INTR_TRIGGER_EDGE); case TRIGGER_EDGE: - return (1); + return (INTR_TRIGGER_EDGE); case TRIGGER_LEVEL: - return (0); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 23 10:08:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 13C6516A4D0; Sun, 23 May 2004 10:08:30 -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 E2E0F16A4CE for ; Sun, 23 May 2004 10:08:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C703A43D48 for ; Sun, 23 May 2004 10:08:29 -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.11/8.12.11) with ESMTP id i4NH8BJi021559 for ; Sun, 23 May 2004 10:08:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NH8BeK021556 for perforce@freebsd.org; Sun, 23 May 2004 10:08:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 23 May 2004 10:08:11 -0700 (PDT) Message-Id: <200405231708.i4NH8BeK021556@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 53301 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: Sun, 23 May 2004 17:08:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=53301 Change 53301 by rwatson@rwatson_paprika on 2004/05/23 10:08:02 Top-up integrate of netperf_socket. Affected files ... .. //depot/projects/netperf_socket/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/apic_vector.s#5 integrate .. //depot/projects/netperf_socket/sys/i386/i386/exception.s#4 integrate .. //depot/projects/netperf_socket/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/isa/atpic_vector.s#6 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/usb/uhid.c#3 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.67 2004/02/21 21:10:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.68 2004/05/23 16:55:28 le Exp $"); /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ /* - * HID spec: http://www.usb.org/developers/data/usbhid10.pdf + * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf */ #include ==== //depot/projects/netperf_socket/sys/i386/i386/apic_vector.s#5 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.99 2004/04/16 19:26:36 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.100 2004/05/23 16:50:55 bde Exp $ */ /* @@ -77,7 +77,7 @@ movl %eax, %es ; \ movl $KPSEL, %eax ; /* reload with per-CPU data segment */ \ movl %eax, %fs ; \ - FAKE_MCOUNT(13*4(%esp)) ; \ + FAKE_MCOUNT(TF_EIP(%esp)) ; \ movl lapic, %edx ; /* pointer to local APIC */ \ movl LA_ISR + 16 * (index)(%edx), %eax ; /* load ISR */ \ bsrl %eax, %eax ; /* index of highset set bit in ISR */ \ @@ -263,7 +263,7 @@ movl lapic, %edx movl $0, LA_EOI(%edx) /* End Of Interrupt to APIC */ - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_EIP(%esp)) pushl $0 /* XXX convert trapframe to clockframe */ call forwarded_statclock @@ -292,7 +292,7 @@ movl lapic, %edx movl $0, LA_EOI(%edx) /* End Of Interrupt to APIC */ - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_EIP(%esp)) MEXITCOUNT jmp doreti ==== //depot/projects/netperf_socket/sys/i386/i386/exception.s#4 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/exception.s,v 1.108 2004/04/16 19:26:36 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/exception.s,v 1.109 2004/05/23 16:50:55 bde Exp $ */ #include "opt_npx.h" @@ -134,7 +134,7 @@ movl %eax,%es movl $KPSEL,%eax movl %eax,%fs - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_EIP(%esp)) calltrap: FAKE_MCOUNT(btrap) /* init "from" btrap -> calltrap */ call trap @@ -172,7 +172,7 @@ movl %eax,%es movl $KPSEL,%eax movl %eax,%fs - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_EIP(%esp)) call syscall MEXITCOUNT jmp doreti @@ -197,7 +197,7 @@ movl %eax,%es movl $KPSEL,%eax movl %eax,%fs - FAKE_MCOUNT(13*4(%esp)) + FAKE_MCOUNT(TF_EIP(%esp)) call syscall MEXITCOUNT jmp doreti ==== //depot/projects/netperf_socket/sys/i386/i386/genassym.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.147 2004/04/07 20:46:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/genassym.c,v 1.148 2004/05/23 16:50:55 bde Exp $"); #include "opt_apic.h" #include "opt_compat.h" @@ -148,6 +148,7 @@ ASSYM(TF_TRAPNO, offsetof(struct trapframe, tf_trapno)); ASSYM(TF_ERR, offsetof(struct trapframe, tf_err)); +ASSYM(TF_EIP, offsetof(struct trapframe, tf_eip)); ASSYM(TF_CS, offsetof(struct trapframe, tf_cs)); ASSYM(TF_EFLAGS, offsetof(struct trapframe, tf_eflags)); ASSYM(SIGF_HANDLER, offsetof(struct sigframe, sf_ahu.sf_handler)); ==== //depot/projects/netperf_socket/sys/i386/isa/atpic_vector.s#6 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.45 2004/05/11 20:14:53 jhb Exp $ + * $FreeBSD: src/sys/i386/isa/atpic_vector.s,v 1.46 2004/05/23 16:50:55 bde Exp $ */ /* @@ -59,7 +59,7 @@ movl $KPSEL, %eax ; /* reload with per-CPU data segment */ \ movl %eax, %fs ; \ ; \ - FAKE_MCOUNT(13*4(%esp)) ; \ + FAKE_MCOUNT(TF_EIP(%esp)) ; \ pushl $irq_num; /* pass the IRQ */ \ call atpic_handle_intr ; \ addl $4, %esp ; /* discard the parameter */ \ From owner-p4-projects@FreeBSD.ORG Sun May 23 12:41:18 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE7DF16A4D0; Sun, 23 May 2004 12:41:17 -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 7023C16A4CE for ; Sun, 23 May 2004 12:41:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 66C4043D31 for ; Sun, 23 May 2004 12:41:17 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NJefVo056317 for ; Sun, 23 May 2004 12:40:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NJefLc056314 for perforce@freebsd.org; Sun, 23 May 2004 12:40:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 12:40:41 -0700 (PDT) Message-Id: <200405231940.i4NJefLc056314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53326 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: Sun, 23 May 2004 19:41:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=53326 Change 53326 by marcel@marcel_nfs on 2004/05/23 12:40:00 Now that uart(4) can be used as a debug port, cut the lifeline by removing NO_SIO. This means that alpha unconditionally calls cninit() in machdep.c, like all the other platforms. Likewise, the need for DEV_SC is pretty much gone as well. We now use the RB_SERIAL flag of bootinfo to signal whether to use sc(4) on the on hand or sio(4), uart(4) or zs(4) on the other hand. When sio(4) is used, hints needs to be added if sio(4) is to be used as a debug port. Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/api_up1000.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/dec_1000a.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/dec_2100_a50.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/dec_2100_a500.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/dec_axppci_33.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/dec_eb164.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/dec_eb64plus.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/dec_kn20aa.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/dec_kn300.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/dec_st550.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/dec_st6600.c#2 edit .. //depot/projects/gdb/sys/alpha/alpha/machdep.c#9 edit .. //depot/projects/gdb/sys/conf/options.alpha#2 edit Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/api_up1000.c#2 (text+ko) ==== @@ -27,9 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.10 2003/08/25 03:43:07 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -49,18 +46,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void api_up1000_init(void); static void api_up1000_cons_init(void); @@ -85,40 +70,15 @@ irongate_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/gdb/sys/alpha/alpha/dec_1000a.c#2 (text+ko) ==== @@ -74,9 +74,6 @@ #include __FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.17 2003/08/25 03:43:07 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -94,18 +91,6 @@ #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void dec_1000a_init(int); static void dec_1000a_cons_init(void); @@ -185,45 +170,15 @@ apecs_init(); } -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)). - */ - DELAY(160000000 / comcnrate); - - /* - * Force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/gdb/sys/alpha/alpha/dec_2100_a50.c#2 (text+ko) ==== @@ -35,9 +35,6 @@ #include __FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.18 2003/08/25 03:43:07 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -54,18 +51,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void dec_2100_a50_init(void); static void dec_2100_a50_cons_init(void); static void dec_2100_a50_intr_map(void *); @@ -110,43 +95,15 @@ apecs_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)). - */ - DELAY(160000000 / comcnrate); - /* - * Force a comconsole on com1 if the SRM has a serial console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/gdb/sys/alpha/alpha/dec_2100_a500.c#2 (text+ko) ==== @@ -27,9 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.17 2003/08/25 03:43:07 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -47,18 +44,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void dec_2100_a500_init(int); static void dec_2100_a500_cons_init(void); static void dec_2100_a500_intr_init(void); @@ -101,43 +86,15 @@ struct ctb *ctb; t2_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - /* - * force a comconsole on com1 if the SRM has a serial console - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/gdb/sys/alpha/alpha/dec_axppci_33.c#2 (text+ko) ==== @@ -32,9 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.21 2003/08/25 03:43:07 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -51,18 +48,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void dec_axppci_33_init(void); static void dec_axppci_33_cons_init(void); static int dec_axppci_33_intr_route (device_t, device_t, int); @@ -125,43 +110,15 @@ lca_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - /* - * force a comconsole on com1 if the SRM has a serial console - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/gdb/sys/alpha/alpha/dec_eb164.c#2 (text+ko) ==== @@ -32,9 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.19 2003/08/25 03:43:07 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -48,18 +45,6 @@ #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void dec_eb164_init(void); static void dec_eb164_cons_init(void); static void eb164_intr_init(void); @@ -98,45 +83,15 @@ cia_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - - /* - * Force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/gdb/sys/alpha/alpha/dec_eb64plus.c#2 (text+ko) ==== @@ -48,9 +48,6 @@ #include __FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.16 2003/08/25 03:43:07 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -68,17 +65,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -#endif - -extern int sccnattach(void); - void dec_eb64plus_init(void); static void dec_eb64plus_cons_init(void); static void dec_eb64plus_intr_init(void); @@ -132,34 +118,11 @@ switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - - /* - * force a comconsole on com1 if the SRM has a serial - * console. - */ - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: -#ifdef DEV_SC - /* graphics adapter console */ - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/gdb/sys/alpha/alpha/dec_kn20aa.c#2 (text+ko) ==== @@ -32,9 +32,6 @@ #include __FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.18 2003/08/25 03:43:07 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -51,18 +48,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void dec_kn20aa_init(void); static void dec_kn20aa_cons_init(void); static void dec_kn20aa_intr_init(void); @@ -108,40 +93,15 @@ cia_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 9600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/gdb/sys/alpha/alpha/dec_kn300.c#2 (text+ko) ==== @@ -31,9 +31,6 @@ #include __FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.13 2003/08/25 03:43:07 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -54,18 +51,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void dec_kn300_init(void); void dec_kn300_cons_init(void); @@ -102,38 +87,15 @@ mcbus_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/gdb/sys/alpha/alpha/dec_st550.c#2 (text+ko) ==== @@ -34,9 +34,6 @@ #include __FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.16 2003/08/25 03:43:07 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -56,18 +53,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void st550_init(void); static void st550_cons_init(void); static void st550_intr_init(void); @@ -105,41 +90,15 @@ cia_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* XXX */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/gdb/sys/alpha/alpha/dec_st6600.c#2 (text+ko) ==== @@ -27,9 +27,6 @@ #include __FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.17 2003/08/25 03:43:07 marcel Exp $"); -#include "opt_ddb.h" -#include "opt_dev_sc.h" - #include #include #include @@ -48,18 +45,6 @@ #include #include -#ifndef NO_SIO -#ifndef CONSPEED -#define CONSPEED TTYDEF_SPEED -#endif -static int comcnrate = CONSPEED; -extern int comconsole; -extern int siocnattach(int, int); -extern int siogdbattach(int, int); -#endif - -extern int sccnattach(void); - void st6600_init(void); static void st6600_cons_init(void); static void st6600_intr_init(void); @@ -89,40 +74,15 @@ tsunami_init(); -#ifndef NO_SIO -#ifdef DDB - siogdbattach(0x2f8, 57600); -#endif -#endif - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); switch (ctb->ctb_term_type) { case 2: -#ifndef NO_SIO - /* serial console ... */ - /* - * Delay to allow PROM putchars to complete. - * FIFO depth * character time, - * character time = (1000000 / (defaultrate / 10)) - */ - DELAY(160000000 / comcnrate); - comconsole = 0; - if (siocnattach(0x3f8, comcnrate)) - panic("can't init serial console"); - boothowto |= RB_SERIAL; -#endif break; case 3: - /* display console ... */ - /* XXX */ -#ifdef DEV_SC - sccnattach(); -#else - panic("not configured to use display && keyboard console"); -#endif + boothowto &= ~RB_SERIAL; break; default: ==== //depot/projects/gdb/sys/alpha/alpha/machdep.c#9 (text+ko) ==== @@ -879,17 +879,10 @@ * of some operations so needs to be after proc0/thread0/curthread * become valid. */ -#ifndef NO_SIO - if (platform.cons_init) { - platform.cons_init(); - promcndetach(); - } -#else if (platform.cons_init) platform.cons_init(); promcndetach(); cninit(); -#endif /* * Check to see if promcons needs to make_dev() now, ==== //depot/projects/gdb/sys/conf/options.alpha#2 (text+ko) ==== @@ -16,15 +16,11 @@ DEC_1000A opt_cpu.h API_UP1000 opt_cpu.h -NO_SIO opt_global.h - MAXMEM PPC_PROBE_CHIPSET opt_ppc.h PPC_DEBUG opt_ppc.h -DEV_SC - VGA_ALT_SEQACCESS opt_vga.h VGA_DEBUG opt_vga.h VGA_NO_FONT_LOADING opt_vga.h From owner-p4-projects@FreeBSD.ORG Sun May 23 12:57:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDF2716A4D0; Sun, 23 May 2004 12:57:10 -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 A210616A4CE for ; Sun, 23 May 2004 12:57:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BD9B43D1D for ; Sun, 23 May 2004 12:57:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NJv37T066233 for ; Sun, 23 May 2004 12:57:03 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NJv2HN066230 for perforce@freebsd.org; Sun, 23 May 2004 12:57:02 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 12:57:02 -0700 (PDT) Message-Id: <200405231957.i4NJv2HN066230@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53327 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: Sun, 23 May 2004 19:57:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=53327 Change 53327 by marcel@marcel_nfs on 2004/05/23 12:56:26 s/DDB/KDB/g in comments. Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/trap.c#7 edit Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/trap.c#7 (text+ko) ==== @@ -376,7 +376,7 @@ if (!user) { #ifdef KDB /* - * ...unless, of course, DDB is configured; BUGCHK + * ...unless, of course, KDB is configured; BUGCHK * is used to invoke the kernel debugger, and we * might have set a breakpoint. */ @@ -387,7 +387,7 @@ } /* - * If we get here, DDB did _not_ handle the + * If we get here, KDB did _not_ handle the * trap, and we need to PANIC! */ #endif From owner-p4-projects@FreeBSD.ORG Sun May 23 13:02:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E48DC16A4D0; Sun, 23 May 2004 13:02:25 -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 A019F16A4CF for ; Sun, 23 May 2004 13:02:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C10A43D45 for ; Sun, 23 May 2004 13:02:25 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NK2AMV067664 for ; Sun, 23 May 2004 13:02:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NK29Ln067658 for perforce@freebsd.org; Sun, 23 May 2004 13:02:09 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:02:09 -0700 (PDT) Message-Id: <200405232002.i4NK29Ln067658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53328 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: Sun, 23 May 2004 20:02:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=53328 Change 53328 by marcel@marcel_nfs on 2004/05/23 13:01:47 Remove the duplicate declaration of ksym_start & ksym_end. Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/machdep.c#11 edit Differences ... ==== //depot/projects/gdb/sys/amd64/amd64/machdep.c#11 (text+ko) ==== @@ -166,10 +166,6 @@ struct mtx icu_lock; -#ifdef DDB -void *ksym_start, *ksym_end; -#endif - static void cpu_startup(dummy) void *dummy; From owner-p4-projects@FreeBSD.ORG Sun May 23 13:04:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5BF916A4D0; Sun, 23 May 2004 13:04:42 -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 9FCB516A4CE for ; Sun, 23 May 2004 13:04:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 997D843D1F for ; Sun, 23 May 2004 13:04:42 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NK4DpC069153 for ; Sun, 23 May 2004 13:04:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NK4DG2069150 for perforce@freebsd.org; Sun, 23 May 2004 13:04:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:04:13 -0700 (PDT) Message-Id: <200405232004.i4NK4DG2069150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53329 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: Sun, 23 May 2004 20:04:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=53329 Change 53329 by marcel@marcel_nfs on 2004/05/23 13:03:29 We don't have any code dependent on DDB. Affected files ... .. //depot/projects/gdb/sys/alpha/alpha/interrupt.c#7 edit Differences ... ==== //depot/projects/gdb/sys/alpha/alpha/interrupt.c#7 (text+ko) ==== @@ -31,8 +31,6 @@ * notice. */ -#include "opt_ddb.h" - #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.23 1998/02/24 07:38:01 thorpej Exp $");*/ __FBSDID("$FreeBSD: src/sys/alpha/alpha/interrupt.c,v 1.78 2004/04/16 20:09:53 jhb Exp $"); @@ -68,10 +66,6 @@ #include #endif -#ifdef DDB -#include -#endif - volatile int mc_expected, mc_received; static void From owner-p4-projects@FreeBSD.ORG Sun May 23 13:05:42 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5D1E16A4D0; Sun, 23 May 2004 13:05:41 -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 9127516A4CE for ; Sun, 23 May 2004 13:05:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B26E43D31 for ; Sun, 23 May 2004 13:05:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NK5F6w069214 for ; Sun, 23 May 2004 13:05:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NK5FFp069211 for perforce@freebsd.org; Sun, 23 May 2004 13:05:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:05:15 -0700 (PDT) Message-Id: <200405232005.i4NK5FFp069211@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53330 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: Sun, 23 May 2004 20:05:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=53330 Change 53330 by marcel@marcel_nfs on 2004/05/23 13:05:11 setjmp() and longjmp() are not specific to and dependent upon DDB. Affected files ... .. //depot/projects/gdb/sys/amd64/amd64/support.S#7 edit Differences ... ==== //depot/projects/gdb/sys/amd64/amd64/support.S#7 (text+ko) ==== @@ -620,7 +620,6 @@ pushq %rax lretq -#ifdef DDB /*****************************************************************************/ /* setjump, longjump */ /*****************************************************************************/ @@ -651,4 +650,3 @@ xorl %eax,%eax /* return(1); */ incl %eax ret -#endif From owner-p4-projects@FreeBSD.ORG Sun May 23 13:11:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B79416A4D0; Sun, 23 May 2004 13:11:40 -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 E1BEA16A4CE; Sun, 23 May 2004 13:11:39 -0700 (PDT) Received: from critter.freebsd.dk (critter.freebsd.dk [212.242.86.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id F32E643D41; Sun, 23 May 2004 13:11:38 -0700 (PDT) (envelope-from phk@phk.freebsd.dk) Received: from critter.freebsd.dk (localhost [127.0.0.1]) by critter.freebsd.dk (8.12.11/8.12.11) with ESMTP id i4NKB8Yx006802; Sun, 23 May 2004 22:11:08 +0200 (CEST) (envelope-from phk@phk.freebsd.dk) To: Marcel Moolenaar From: "Poul-Henning Kamp" In-Reply-To: Your message of "Sun, 23 May 2004 12:40:41 PDT." <200405231940.i4NJefLc056314@repoman.freebsd.org> Date: Sun, 23 May 2004 22:11:08 +0200 Message-ID: <6801.1085343068@critter.freebsd.dk> cc: Perforce Change Reviews Subject: Re: PERFORCE change 53326 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: Sun, 23 May 2004 20:11:40 -0000 In message <200405231940.i4NJefLc056314@repoman.freebsd.org>, Marcel Moolenaar writes: >http://perforce.freebsd.org/chv.cgi?CH=53326 > >Change 53326 by marcel@marcel_nfs on 2004/05/23 12:40:00 > > Now that uart(4) can be used as a debug port, cut the lifeline > by removing NO_SIO. This means that alpha unconditionally calls > cninit() in machdep.c, like all the other platforms. Does this mean that we can use the same console code for alpha as for all the other platforms ? -- Poul-Henning Kamp | UNIX since Zilog Zeus 3.20 phk@FreeBSD.ORG | TCP/IP since RFC 956 FreeBSD committer | BSD since 4.3-tahoe Never attribute to malice what can adequately be explained by incompetence. From owner-p4-projects@FreeBSD.ORG Sun May 23 13:18:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2875716A4D0; Sun, 23 May 2004 13:18:02 -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 018EE16A4CE for ; Sun, 23 May 2004 13:18:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D93FB43D2D for ; Sun, 23 May 2004 13:18:01 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKHVmt071319 for ; Sun, 23 May 2004 13:17:31 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKHVtH071316 for perforce@freebsd.org; Sun, 23 May 2004 13:17:31 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:17:31 -0700 (PDT) Message-Id: <200405232017.i4NKHVtH071316@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53332 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: Sun, 23 May 2004 20:18:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=53332 Change 53332 by marcel@marcel_nfs on 2004/05/23 13:16:47 s/DDB/KDB/g Affected files ... .. //depot/projects/gdb/sys/dev/ct/ct.c#3 edit Differences ... ==== //depot/projects/gdb/sys/dev/ct/ct.c#3 (text+ko) ==== @@ -1003,10 +1003,10 @@ scsi_low_print(slp, NULL); printf("%s: scsi_status 0x%x\n\n", slp->sl_xname, (u_int) scsi_status); -#ifdef DDB +#ifdef KDB if (ct_debug > 1) SCSI_LOW_DEBUGGER("ct"); -#endif /* DDB */ +#endif /* KDB */ } #endif /* CT_DEBUG */ From owner-p4-projects@FreeBSD.ORG Sun May 23 13:20:57 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1711E16A4D0; Sun, 23 May 2004 13:20:57 -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 E77D416A4CE for ; Sun, 23 May 2004 13:20:56 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E133E43D46 for ; Sun, 23 May 2004 13:20:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKKZqv071461 for ; Sun, 23 May 2004 13:20:35 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKKZni071458 for perforce@freebsd.org; Sun, 23 May 2004 13:20:35 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:20:35 -0700 (PDT) Message-Id: <200405232020.i4NKKZni071458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53333 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: Sun, 23 May 2004 20:20:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=53333 Change 53333 by marcel@marcel_nfs on 2004/05/23 13:20:23 s/DDB/KDB/g Affected files ... .. //depot/projects/gdb/sys/dev/ncv/ncr53c500.c#3 edit Differences ... ==== //depot/projects/gdb/sys/dev/ncv/ncr53c500.c#3 (text+ko) ==== @@ -38,7 +38,6 @@ #include __FBSDID("$FreeBSD: src/sys/dev/ncv/ncr53c500.c,v 1.9 2004/03/13 19:46:27 peter Exp $"); -#include "opt_ddb.h" #include #include @@ -1036,10 +1035,10 @@ scsi_low_print(slp, NULL); printf("%s st %x ist %x\n\n", slp->sl_xname, status, ireason); -#ifdef DDB +#ifdef KDB if (ncv_debug > 1) SCSI_LOW_DEBUGGER("ncv"); -#endif /* DDB */ +#endif /* KDB */ } #endif /* NCV_DEBUG */ From owner-p4-projects@FreeBSD.ORG Sun May 23 13:21:52 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C605C16A4D0; Sun, 23 May 2004 13:21:51 -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 9FAF416A4CE for ; Sun, 23 May 2004 13:21:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 98EE543D1D for ; Sun, 23 May 2004 13:21:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKLbZp072629 for ; Sun, 23 May 2004 13:21:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKLbCi072623 for perforce@freebsd.org; Sun, 23 May 2004 13:21:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:21:37 -0700 (PDT) Message-Id: <200405232021.i4NKLbCi072623@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53334 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: Sun, 23 May 2004 20:21:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=53334 Change 53334 by marcel@marcel_nfs on 2004/05/23 13:21:36 s/DDB/KDB/g Affected files ... .. //depot/projects/gdb/sys/dev/nsp/nsp.c#3 edit Differences ... ==== //depot/projects/gdb/sys/dev/nsp/nsp.c#3 (text+ko) ==== @@ -41,7 +41,6 @@ #include __FBSDID("$FreeBSD: src/sys/dev/nsp/nsp.c,v 1.11 2004/03/13 19:46:27 peter Exp $"); -#include "opt_ddb.h" #include #include @@ -1534,10 +1533,10 @@ { nsp_error(sc, "current status", isrc, ph, irqphs); scsi_low_print(slp, NULL); -#ifdef DDB +#ifdef KDB if (nsp_debug > 1) SCSI_LOW_DEBUGGER("nsp"); -#endif /* DDB */ +#endif /* KDB */ } #endif /* NSP_DEBUG */ From owner-p4-projects@FreeBSD.ORG Sun May 23 13:33:51 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 655EA16A4D0; Sun, 23 May 2004 13:33:51 -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 4127A16A4CE for ; Sun, 23 May 2004 13:33:51 -0700 (PDT) Received: from ns1.xcllnt.net (209-128-86-226.BAYAREA.NET [209.128.86.226]) by mx1.FreeBSD.org (Postfix) with ESMTP id A8B7E43D31 for ; Sun, 23 May 2004 13:33:49 -0700 (PDT) (envelope-from marcel@xcllnt.net) Received: from dhcp50.pn.xcllnt.net (dhcp50.pn.xcllnt.net [192.168.4.250]) by ns1.xcllnt.net (8.12.11/8.12.11) with ESMTP id i4NKXnxl036345; Sun, 23 May 2004 13:33:49 -0700 (PDT) (envelope-from marcel@piii.pn.xcllnt.net) Received: from dhcp50.pn.xcllnt.net (localhost [127.0.0.1]) i4NKXnHe037795; Sun, 23 May 2004 13:33:49 -0700 (PDT) (envelope-from marcel@dhcp50.pn.xcllnt.net) Received: (from marcel@localhost) by dhcp50.pn.xcllnt.net (8.12.11/8.12.11/Submit) id i4NKXmr2037794; Sun, 23 May 2004 13:33:48 -0700 (PDT) (envelope-from marcel) Date: Sun, 23 May 2004 13:33:48 -0700 From: Marcel Moolenaar To: Poul-Henning Kamp Message-ID: <20040523203348.GA37629@dhcp50.pn.xcllnt.net> References: <200405231940.i4NJefLc056314@repoman.freebsd.org> <6801.1085343068@critter.freebsd.dk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6801.1085343068@critter.freebsd.dk> User-Agent: Mutt/1.4.2.1i cc: Perforce Change Reviews Subject: Re: PERFORCE change 53326 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: Sun, 23 May 2004 20:33:51 -0000 On Sun, May 23, 2004 at 10:11:08PM +0200, Poul-Henning Kamp wrote: > In message <200405231940.i4NJefLc056314@repoman.freebsd.org>, Marcel Moolenaar > writes: > >http://perforce.freebsd.org/chv.cgi?CH=53326 > > > >Change 53326 by marcel@marcel_nfs on 2004/05/23 12:40:00 > > > > Now that uart(4) can be used as a debug port, cut the lifeline > > by removing NO_SIO. This means that alpha unconditionally calls > > cninit() in machdep.c, like all the other platforms. > > Does this mean that we can use the same console code for alpha as for > all the other platforms ? Yes, that's the intend. The console handling on alpha is preventing other unification. -- Marcel Moolenaar USPA: A-39004 marcel@xcllnt.net From owner-p4-projects@FreeBSD.ORG Sun May 23 13:36:00 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D095E16A4CF; Sun, 23 May 2004 13:35:59 -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 AAC2516A4D0 for ; Sun, 23 May 2004 13:35:59 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B93643D31 for ; Sun, 23 May 2004 13:35:59 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKZuFf075429 for ; Sun, 23 May 2004 13:35:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKZuUa075426 for perforce@freebsd.org; Sun, 23 May 2004 13:35:56 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:35:56 -0700 (PDT) Message-Id: <200405232035.i4NKZuUa075426@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53336 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: Sun, 23 May 2004 20:36:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=53336 Change 53336 by marcel@marcel_nfs on 2004/05/23 13:34:57 Remove the now unused inclusion of opt_ddb.h Affected files ... .. //depot/projects/gdb/sys/dev/ct/ct.c#4 edit Differences ... ==== //depot/projects/gdb/sys/dev/ct/ct.c#4 (text+ko) ==== @@ -39,8 +39,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_ddb.h" - #include #include #include From owner-p4-projects@FreeBSD.ORG Sun May 23 13:40:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB9CB16A4D0; Sun, 23 May 2004 13:40:14 -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 B258C16A4CE for ; Sun, 23 May 2004 13:40:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC1CD43D31 for ; Sun, 23 May 2004 13:40:14 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKe20m075541 for ; Sun, 23 May 2004 13:40:02 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKe2B9075538 for perforce@freebsd.org; Sun, 23 May 2004 13:40:02 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:40:02 -0700 (PDT) Message-Id: <200405232040.i4NKe2B9075538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53338 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: Sun, 23 May 2004 20:40:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=53338 Change 53338 by marcel@marcel_nfs on 2004/05/23 13:39:45 s/DDB/KDB/g s/db_alt_break()/kdb_alt_break()/g s/breakpoint()/kdb_enter()/g include Affected files ... .. //depot/projects/gdb/sys/dev/ofw/ofw_console.c#3 edit Differences ... ==== //depot/projects/gdb/sys/dev/ofw/ofw_console.c#3 (text+ko) ==== @@ -29,10 +29,10 @@ #include __FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.20 2004/02/21 21:10:45 phk Exp $"); -#include "opt_ddb.h" #include "opt_comconsole.h" #include +#include #include #include #include @@ -65,7 +65,7 @@ static struct callout_handle ofw_timeouthandle = CALLOUT_HANDLE_INITIALIZER(&ofw_timeouthandle); -#if defined(DDB) && defined(ALT_BREAK_TO_DEBUGGER) +#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) static int alt_break_state; #endif @@ -299,9 +299,9 @@ } } -#if defined(DDB) && defined(ALT_BREAK_TO_DEBUGGER) - if (db_alt_break(ch, &alt_break_state)) - breakpoint(); +#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) + if (kdb_alt_break(ch, &alt_break_state)) + kdb_enter("Break sequence on console"); #endif return (ch); @@ -313,9 +313,9 @@ unsigned char ch; if (OF_read(stdin, &ch, 1) > 0) { -#if defined(DDB) && defined(ALT_BREAK_TO_DEBUGGER) - if (db_alt_break(ch, &alt_break_state)) - breakpoint(); +#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) + if (kdb_alt_break(ch, &alt_break_state)) + kdb_enter("Break sequence on console"); #endif return (ch); } From owner-p4-projects@FreeBSD.ORG Sun May 23 13:43:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E67D16A4D0; Sun, 23 May 2004 13:43:40 -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 2973816A4CE for ; Sun, 23 May 2004 13:43:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 22B3943D3F for ; Sun, 23 May 2004 13:43:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKh7Gi077361 for ; Sun, 23 May 2004 13:43:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKh79u077358 for perforce@freebsd.org; Sun, 23 May 2004 13:43:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:43:07 -0700 (PDT) Message-Id: <200405232043.i4NKh79u077358@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53339 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: Sun, 23 May 2004 20:43:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=53339 Change 53339 by marcel@marcel_nfs on 2004/05/23 13:42:08 s/DDB/KDB/g s/db_alt_break()/kdb_alt_break()/g include Affected files ... .. //depot/projects/gdb/sys/dev/sab/sab.c#5 edit Differences ... ==== //depot/projects/gdb/sys/dev/sab/sab.c#5 (text+ko) ==== @@ -42,7 +42,6 @@ * SAB82532 Dual UART driver */ -#include "opt_ddb.h" #include "opt_comconsole.h" #include @@ -52,6 +51,7 @@ #include #include #include +#include #include #include #include @@ -62,8 +62,6 @@ #include #include -#include - #include #include @@ -554,9 +552,10 @@ if (len != 0) { for (i = 0; i < len; i++) { c = SAB_READ(sc, SAB_RFIFO); -#if defined(DDB) && defined(ALT_BREAK_TO_DEBUGGER) +#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) if (sc->sc_console != 0 && (i & 1) == 0) - brk = db_alt_break(c, &sc->sc_alt_break_state); + brk = kdb_alt_break(c, + &sc->sc_alt_break_state); #endif *sc->sc_iput++ = c; if (sc->sc_iput == sc->sc_ibuf + sizeof(sc->sc_ibuf)) @@ -597,7 +596,7 @@ if (brk != 0) breakpoint(); - + return (needsoft); } From owner-p4-projects@FreeBSD.ORG Sun May 23 13:46:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A14516A4D0; Sun, 23 May 2004 13:46:32 -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 23E3216A4CE for ; Sun, 23 May 2004 13:46:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0538E43D2D for ; Sun, 23 May 2004 13:46:32 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKkBW3077514 for ; Sun, 23 May 2004 13:46:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKkB9w077511 for perforce@freebsd.org; Sun, 23 May 2004 13:46:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:46:11 -0700 (PDT) Message-Id: <200405232046.i4NKkB9w077511@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53340 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: Sun, 23 May 2004 20:46:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=53340 Change 53340 by marcel@marcel_nfs on 2004/05/23 13:45:40 Remove broken and bogus redefinition of DDB. Affected files ... .. //depot/projects/gdb/sys/dev/sound/isa/uartsio.c#3 edit Differences ... ==== //depot/projects/gdb/sys/dev/sound/isa/uartsio.c#3 (text+ko) ==== @@ -54,11 +54,6 @@ static devclass_t midi_devclass; -#ifndef DDB -#undef DDB -#define DDB(x) -#endif /* DDB */ - #define TX_FIFO_SIZE 16 extern synthdev_info midisynth_op_desc; From owner-p4-projects@FreeBSD.ORG Sun May 23 13:47:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4145616A4D0; Sun, 23 May 2004 13:47:31 -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 1CC8B16A4CE for ; Sun, 23 May 2004 13:47:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F151543D1F for ; Sun, 23 May 2004 13:47:30 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKlDcQ077541 for ; Sun, 23 May 2004 13:47:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKlD70077538 for perforce@freebsd.org; Sun, 23 May 2004 13:47:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:47:13 -0700 (PDT) Message-Id: <200405232047.i4NKlD70077538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53341 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: Sun, 23 May 2004 20:47:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=53341 Change 53341 by marcel@marcel_nfs on 2004/05/23 13:46:44 Remove broken and bogus redefinition of DDB. Affected files ... .. //depot/projects/gdb/sys/dev/sound/isa/opl.c#2 edit Differences ... ==== //depot/projects/gdb/sys/dev/sound/isa/opl.c#2 (text+ko) ==== @@ -51,11 +51,6 @@ static devclass_t midi_devclass; -#ifndef DDB -#undef DDB -#define DDB(x) -#endif /* DDB */ - /* * The OPL-3 mode is switched on by writing 0x01, to the offset 5 * of the right side. From owner-p4-projects@FreeBSD.ORG Sun May 23 13:50:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5A46B16A4D0; Sun, 23 May 2004 13:50:17 -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 3487716A4CE for ; Sun, 23 May 2004 13:50:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 17EC643D1D for ; Sun, 23 May 2004 13:50:17 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKnGcx077581 for ; Sun, 23 May 2004 13:49:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKnG6F077578 for perforce@freebsd.org; Sun, 23 May 2004 13:49:16 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:49:16 -0700 (PDT) Message-Id: <200405232049.i4NKnG6F077578@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53342 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: Sun, 23 May 2004 20:50:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=53342 Change 53342 by marcel@marcel_nfs on 2004/05/23 13:48:45 s/DDB/BVDDB/g Affected files ... .. //depot/projects/gdb/sys/dev/sound/isa/mss.c#4 edit Differences ... ==== //depot/projects/gdb/sys/dev/sound/isa/mss.c#4 (text+ko) ==== @@ -1104,7 +1104,7 @@ if (reason & 1) { DEB(printf("one more try...\n");) if (--loops) goto again; - else DDB(printf("intr, but mc11 not set\n");) + else BVDDB(printf("intr, but mc11 not set\n");) } if (loops == 0) BVDDB(printf("intr, nothing in mcir11 0x%02x\n", mc11)); mss_unlock(mss); From owner-p4-projects@FreeBSD.ORG Sun May 23 13:50:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0C8716A4D1; Sun, 23 May 2004 13:50:53 -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 AA74516A4CE for ; Sun, 23 May 2004 13:50:53 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8DBE243D2D for ; Sun, 23 May 2004 13:50:53 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKoIKl077612 for ; Sun, 23 May 2004 13:50:18 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKoIDw077609 for perforce@freebsd.org; Sun, 23 May 2004 13:50:18 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:50:18 -0700 (PDT) Message-Id: <200405232050.i4NKoIDw077609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53343 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: Sun, 23 May 2004 20:50:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=53343 Change 53343 by marcel@marcel_nfs on 2004/05/23 13:50:03 Remove broken and bogus redefinition of DDB. Affected files ... .. //depot/projects/gdb/sys/dev/sound/isa/mpu.c#3 edit Differences ... ==== //depot/projects/gdb/sys/dev/sound/isa/mpu.c#3 (text+ko) ==== @@ -46,11 +46,6 @@ static devclass_t midi_devclass; -#ifndef DDB -#undef DDB -#define DDB(x) -#endif /* DDB */ - #define MPU_DATAPORT 0 #define MPU_CMDPORT 1 #define MPU_STATPORT 1 From owner-p4-projects@FreeBSD.ORG Sun May 23 13:51:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A78216A4D0; Sun, 23 May 2004 13:51:32 -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 51F7F16A4CE for ; Sun, 23 May 2004 13:51:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3219C43D1D for ; Sun, 23 May 2004 13:51:32 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKpLlU078483 for ; Sun, 23 May 2004 13:51:21 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKpL2J078474 for perforce@freebsd.org; Sun, 23 May 2004 13:51:21 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:51:21 -0700 (PDT) Message-Id: <200405232051.i4NKpL2J078474@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53344 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: Sun, 23 May 2004 20:51:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=53344 Change 53344 by marcel@marcel_nfs on 2004/05/23 13:51:18 Remove broken and bogus redefinition of DDB. Affected files ... .. //depot/projects/gdb/sys/dev/sound/isa/emu8000.c#2 edit Differences ... ==== //depot/projects/gdb/sys/dev/sound/isa/emu8000.c#2 (text+ko) ==== @@ -38,11 +38,6 @@ static devclass_t midi_devclass; -#ifndef DDB -#undef DDB -#define DDB(x) -#endif /* DDB */ - /* These are the specs of EMU8000. */ #define EMU8K_MAXVOICE 32 #define EMU8K_MAXINFO 256 From owner-p4-projects@FreeBSD.ORG Sun May 23 13:53:26 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE16C16A4D0; Sun, 23 May 2004 13:53:25 -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 B515916A4CE for ; Sun, 23 May 2004 13:53:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9649F43D3F for ; Sun, 23 May 2004 13:53:25 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKrOXK079478 for ; Sun, 23 May 2004 13:53:24 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKrOHT079475 for perforce@freebsd.org; Sun, 23 May 2004 13:53:24 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:53:24 -0700 (PDT) Message-Id: <200405232053.i4NKrOHT079475@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53345 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: Sun, 23 May 2004 20:53:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=53345 Change 53345 by marcel@marcel_nfs on 2004/05/23 13:53:07 Remove broken and bogus redefinition of DDB. Affected files ... .. //depot/projects/gdb/sys/dev/sound/pci/csamidi.c#3 edit Differences ... ==== //depot/projects/gdb/sys/dev/sound/pci/csamidi.c#3 (text+ko) ==== @@ -36,11 +36,6 @@ static devclass_t midi_devclass; -#ifndef DDB -#undef DDB -#define DDB(x) -#endif /* DDB */ - #define CSAMIDI_RESET 0xff #define CSAMIDI_UART 0x3f #define CSAMIDI_ACK 0xfe From owner-p4-projects@FreeBSD.ORG Sun May 23 13:55:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5E8316A4D0; Sun, 23 May 2004 13:55:46 -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 B02A616A4CE for ; Sun, 23 May 2004 13:55:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 91E9243D1D for ; Sun, 23 May 2004 13:55:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKtRip079567 for ; Sun, 23 May 2004 13:55:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKtRxE079564 for perforce@freebsd.org; Sun, 23 May 2004 13:55:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:55:27 -0700 (PDT) Message-Id: <200405232055.i4NKtRxE079564@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53346 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: Sun, 23 May 2004 20:55:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=53346 Change 53346 by marcel@marcel_nfs on 2004/05/23 13:55:15 Remove broken redefinition of DDB. All (=1) uses have been changed to BVDDB. Affected files ... .. //depot/projects/gdb/sys/dev/sound/pcm/sound.h#5 edit Differences ... ==== //depot/projects/gdb/sys/dev/sound/pcm/sound.h#5 (text+ko) ==== @@ -196,7 +196,6 @@ * DDB/DEB to enable/disable debugging stuff * BVDDB to enable debugging when bootverbose */ -#define DDB(x) x /* XXX */ #define BVDDB(x) if (bootverbose) x #ifndef DEB From owner-p4-projects@FreeBSD.ORG Sun May 23 13:57:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E49016A4D0; Sun, 23 May 2004 13:57:25 -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 699E116A4CE for ; Sun, 23 May 2004 13:57:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63A4243D31 for ; Sun, 23 May 2004 13:57:25 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NKuT1S079613 for ; Sun, 23 May 2004 13:56:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NKuTkZ079610 for perforce@freebsd.org; Sun, 23 May 2004 13:56:29 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 13:56:29 -0700 (PDT) Message-Id: <200405232056.i4NKuTkZ079610@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53347 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: Sun, 23 May 2004 20:57:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=53347 Change 53347 by marcel@marcel_nfs on 2004/05/23 13:56:24 s/DDB/KDB/g Affected files ... .. //depot/projects/gdb/sys/dev/stg/tmc18c30.c#3 edit Differences ... ==== //depot/projects/gdb/sys/dev/stg/tmc18c30.c#3 (text+ko) ==== @@ -40,7 +40,6 @@ #include __FBSDID("$FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.11 2004/03/13 19:46:27 peter Exp $"); -#include "opt_ddb.h" #include #include @@ -1068,10 +1067,10 @@ scsi_low_print(slp, NULL); printf("%s: st %x ist %x\n\n", slp->sl_xname, status, astatus); -#ifdef DDB +#ifdef KDB if (stg_debug > 1) SCSI_LOW_DEBUGGER("stg"); -#endif /* DDB */ +#endif /* KDB */ } #endif /* STG_DEBUG */ From owner-p4-projects@FreeBSD.ORG Sun May 23 14:00:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EF7416A4D2; Sun, 23 May 2004 14:00:41 -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 DC0B016A4CF for ; Sun, 23 May 2004 14:00:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D584843D2D for ; Sun, 23 May 2004 14:00:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NL0aLY079790 for ; Sun, 23 May 2004 14:00:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NL0as1079787 for perforce@freebsd.org; Sun, 23 May 2004 14:00:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 14:00:36 -0700 (PDT) Message-Id: <200405232100.i4NL0as1079787@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53350 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: Sun, 23 May 2004 21:00:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=53350 Change 53350 by marcel@marcel_nfs on 2004/05/23 14:00:33 s/DDB/KDB/g s/db_alt_break()/kdb_alt_break()/g include Affected files ... .. //depot/projects/gdb/sys/dev/zs/zs.c#5 edit Differences ... ==== //depot/projects/gdb/sys/dev/zs/zs.c#5 (text+ko) ==== @@ -72,7 +72,6 @@ * Zilog Z8530 Dual UART driver. */ -#include "opt_ddb.h" #include "opt_comconsole.h" #include @@ -82,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -92,8 +92,6 @@ #include #include -#include - #include #include @@ -360,9 +358,10 @@ if ((rr1 & (ZSRR1_FE | ZSRR1_DO | ZSRR1_PE)) != 0) ZS_WRITE(sc, sc->sc_csr, ZSWR0_RESET_ERRORS); -#if defined(DDB) && defined(ALT_BREAK_TO_DEBUGGER) +#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) if (sc->sc_console != 0) - brk = db_alt_break(c, &sc->sc_alt_break_state); + brk = kdb_alt_break(c, + &sc->sc_alt_break_state); #endif *sc->sc_iput++ = c; *sc->sc_iput++ = rr1; @@ -374,7 +373,7 @@ if ((rr3 & ZSRR3_IP_B_STAT) != 0) { rr0 = ZS_READ(sc, sc->sc_csr); ZS_WRITE(sc, sc->sc_csr, ZSWR0_RESET_STATUS); -#if defined(DDB) && defined(BREAK_TO_DEBUGGER) +#if defined(KDB) && defined(BREAK_TO_DEBUGGER) if (sc->sc_console != 0 && (rr0 & ZSRR0_BREAK) != 0) brk = 1; #endif From owner-p4-projects@FreeBSD.ORG Sun May 23 14:03:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DB5216A4D0; Sun, 23 May 2004 14:03:28 -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 250DB16A4CE for ; Sun, 23 May 2004 14:03:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0618943D1D for ; Sun, 23 May 2004 14:03:28 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NL2d8L081512 for ; Sun, 23 May 2004 14:02:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NL2dhO081506 for perforce@freebsd.org; Sun, 23 May 2004 14:02:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 14:02:39 -0700 (PDT) Message-Id: <200405232102.i4NL2dhO081506@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53351 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: Sun, 23 May 2004 21:03:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=53351 Change 53351 by marcel@marcel_nfs on 2004/05/23 14:02:02 s/DDB/KDB/ Affected files ... .. //depot/projects/gdb/sys/fs/nullfs/null_subr.c#3 edit Differences ... ==== //depot/projects/gdb/sys/fs/nullfs/null_subr.c#3 (text+ko) ==== @@ -304,9 +304,8 @@ } #ifdef DIAGNOSTIC -#include "opt_ddb.h" -#ifdef DDB +#ifdef KDB #define null_checkvp_barrier 1 #else #define null_checkvp_barrier 0 From owner-p4-projects@FreeBSD.ORG Sun May 23 14:05:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E089716A4D2; Sun, 23 May 2004 14:05:04 -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 A2D2C16A4D0 for ; Sun, 23 May 2004 14:05:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BAF943D3F for ; Sun, 23 May 2004 14:05:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NL4hrO082624 for ; Sun, 23 May 2004 14:04:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NL4h6q082621 for perforce@freebsd.org; Sun, 23 May 2004 14:04:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 14:04:43 -0700 (PDT) Message-Id: <200405232104.i4NL4h6q082621@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53353 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: Sun, 23 May 2004 21:05:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=53353 Change 53353 by marcel@marcel_nfs on 2004/05/23 14:03:50 s/DDB/KDB/g Affected files ... .. //depot/projects/gdb/sys/gnu/ext2fs/ext2_subr.c#3 edit Differences ... ==== //depot/projects/gdb/sys/gnu/ext2fs/ext2_subr.c#3 (text+ko) ==== @@ -51,9 +51,7 @@ #include #include -#include "opt_ddb.h" - -#ifdef DDB +#ifdef KDB void ext2_checkoverlap(struct buf *, struct inode *); #endif @@ -91,7 +89,7 @@ return (0); } -#ifdef DDB +#ifdef KDB void ext2_checkoverlap(bp, ip) struct buf *bp; @@ -120,4 +118,4 @@ panic("Disk buffer overlap"); } } -#endif /* DDB */ +#endif /* KDB */ From owner-p4-projects@FreeBSD.ORG Sun May 23 14:22:27 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 797CA16A4D0; Sun, 23 May 2004 14:22:27 -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 53BAC16A4CE for ; Sun, 23 May 2004 14:22:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 34FB943D31 for ; Sun, 23 May 2004 14:22:27 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NLM72b086516 for ; Sun, 23 May 2004 14:22:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NLM6GX086510 for perforce@freebsd.org; Sun, 23 May 2004 14:22:06 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 14:22:06 -0700 (PDT) Message-Id: <200405232122.i4NLM6GX086510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53357 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: Sun, 23 May 2004 21:22:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=53357 Change 53357 by marcel@marcel_nfs on 2004/05/23 14:22:00 Remove support for GDB in its entirety. The GDB backend has its own way for ports to register itself. The dcons(4) driver needs to be rewritten to make use of that. Affected files ... .. //depot/projects/gdb/sys/dev/dcons/dcons.c#4 edit Differences ... ==== //depot/projects/gdb/sys/dev/dcons/dcons.c#4 (text+ko) ==== @@ -36,6 +36,7 @@ */ #include +#include #include #include #include @@ -72,10 +73,6 @@ #define DCONS_FORCE_CONSOLE 0 /* mostly for FreeBSD-4 */ #endif -#ifndef DCONS_FORCE_GDB -#define DCONS_FORCE_GDB 1 -#endif - #if __FreeBSD_version >= 500101 #define CONS_NODEV 1 /* for latest current */ static struct consdev gdbconsdev; @@ -133,7 +130,6 @@ dev_t dev; struct dcons_ch o, i; int brk_state; -#define DC_GDB 1 int flags; } sc[DCONS_NPORT]; static void dcons_tty_start(struct tty *); @@ -397,26 +393,9 @@ ch->pos = 0; } -#if DDB && ALT_BREAK_TO_DEBUGGER - switch (dc->brk_state) { - case STATE1: - if (c == KEY_TILDE) - dc->brk_state = STATE2; - else - dc->brk_state = STATE0; - break; - case STATE2: - dc->brk_state = STATE0; - if (c == KEY_CTRLB) { -#if DCONS_FORCE_GDB - if (dc->flags & DC_GDB) - boothowto |= RB_GDB; -#endif - breakpoint(); - } - } - if (c == KEY_CR) - dc->brk_state = STATE1; +#if KDB && ALT_BREAK_TO_DEBUGGER + if (kdb_alt_break(c, &dc->brk_state)) + breakpoint(); #endif return (c); } @@ -510,20 +489,6 @@ dcons_init_port(1, offset, size - size0); dg.buf->version = htonl(DCONS_VERSION); dg.buf->magic = ntohl(DCONS_MAGIC); - -#if DDB && DCONS_FORCE_GDB -#if CONS_NODEV - gdbconsdev.cn_arg = (void *)&sc[DCONS_GDB]; -#if __FreeBSD_version >= 501109 - sprintf(gdbconsdev.cn_name, "dgdb"); -#endif - gdb_arg = &gdbconsdev; -#else - gdbdev = makedev(CDEV_MAJOR, DCONS_GDB); -#endif - gdb_getc = dcons_cngetc; - gdb_putc = dcons_cnputc; -#endif drv_init = 1; return 0; @@ -559,7 +524,6 @@ int polltime; dcons_attach_port(DCONS_CON, "dcons", 0); - dcons_attach_port(DCONS_GDB, "dgdb", DC_GDB); #if __FreeBSD_version < 500000 callout_init(&dcons_callout); #else @@ -621,18 +585,10 @@ case MOD_UNLOAD: printf("dcons: unload\n"); callout_stop(&dcons_callout); -#if DDB && DCONS_FORCE_GDB -#if CONS_NODEV - gdb_arg = NULL; -#else - gdbdev = NODEV; -#endif -#endif #if __FreeBSD_version >= 500000 cnremove(&dcons_consdev); #endif dcons_detach(DCONS_CON); - dcons_detach(DCONS_GDB); dg.buf->magic = 0; contigfree(dg.buf, DCONS_BUF_SIZE, M_DEVBUF); From owner-p4-projects@FreeBSD.ORG Sun May 23 16:50:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A33EE16A4D0; Sun, 23 May 2004 16:50:43 -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 7CF7616A4CE for ; Sun, 23 May 2004 16:50:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76A9443D39 for ; Sun, 23 May 2004 16:50:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4NNoDPL023764 for ; Sun, 23 May 2004 16:50:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4NNoCYQ023761 for perforce@freebsd.org; Sun, 23 May 2004 16:50:12 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 16:50:12 -0700 (PDT) Message-Id: <200405232350.i4NNoCYQ023761@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53365 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: Sun, 23 May 2004 23:50:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=53365 Change 53365 by marcel@marcel_nfs on 2004/05/23 16:49:52 If db_trace_thread() returns an error, make sure to print a new line to preserve the layout of the listing. Affected files ... .. //depot/projects/gdb/sys/ddb/db_thread.c#5 edit Differences ... ==== //depot/projects/gdb/sys/ddb/db_thread.c#5 (text+ko) ==== @@ -96,8 +96,10 @@ while (!pager_quit && thr != NULL) { db_printf(" %6d (%p) ", (int)thr->td_tid, thr); prev_jb = kdb_jmpbuf(jb); - if (setjmp(jb) == 0) - db_trace_thread(thr, 1); + if (setjmp(jb) == 0) { + if (db_trace_thread(thr, 1) != 0) + db_printf("***\n"); + } kdb_jmpbuf(prev_jb); thr = kdb_thr_next(thr); } From owner-p4-projects@FreeBSD.ORG Sun May 23 18:14:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58D7D16A4D0; Sun, 23 May 2004 18:14:39 -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 181F816A4CE for ; Sun, 23 May 2004 18:14:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EF8FF43D1F for ; Sun, 23 May 2004 18:14:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4O1Dsv3043509 for ; Sun, 23 May 2004 18:13:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4O1DsOe043506 for perforce@freebsd.org; Sun, 23 May 2004 18:13:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Sun, 23 May 2004 18:13:54 -0700 (PDT) Message-Id: <200405240113.i4O1DsOe043506@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53366 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: Mon, 24 May 2004 01:14:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=53366 Change 53366 by marcel@marcel_nfs on 2004/05/23 18:13:48 Remove all alpha specific console code. A serial console based on sio(4) does not need it on my Alpha. This may not hold for all the various models, but in that case it should be handled in a way less gross. Affected files ... .. //depot/projects/gdb/sys/dev/sio/sio.c#10 edit Differences ... ==== //depot/projects/gdb/sys/dev/sio/sio.c#10 (text+ko) ==== @@ -2746,28 +2746,20 @@ sprintf(cd->cn_name, "ttyd%d", unit); } -#ifndef __alpha__ static speed_t siocngetspeed(Port_t, u_long rclk); -#endif static void siocnclose(struct siocnstate *sp, Port_t iobase); static void siocnopen(struct siocnstate *sp, Port_t iobase, int speed); static void siocntxwait(Port_t iobase); -#ifdef __alpha__ -int siocnattach(int port, int speed); -#else static cn_probe_t siocnprobe; static cn_init_t siocninit; static cn_term_t siocnterm; -#endif static cn_checkc_t siocncheckc; static cn_getc_t siocngetc; static cn_putc_t siocnputc; -#ifndef __alpha__ CONS_DRIVER(sio, siocnprobe, siocninit, siocnterm, siocngetc, siocncheckc, siocnputc, NULL); -#endif static void siocntxwait(iobase) @@ -2786,8 +2778,6 @@ ; } -#ifndef __alpha__ - /* * Read the serial port specified and try to figure out what speed * it's currently running at. We're assuming the serial port has @@ -2823,8 +2813,6 @@ return (rclk / (16UL * divisor)); } -#endif - static void siocnopen(sp, iobase, speed) struct siocnstate *sp; @@ -2892,8 +2880,6 @@ outb(iobase + com_ier, sp->ier); } -#ifndef __alpha__ - static void siocnprobe(cp) struct consdev *cp; @@ -2991,56 +2977,6 @@ comconsole = -1; } -#endif - -#ifdef __alpha__ - -CONS_DRIVER(sio, NULL, NULL, NULL, siocngetc, siocncheckc, siocnputc, NULL); - -int -siocnattach(port, speed) - int port; - int speed; -{ - int s; - u_char cfcr; - u_int divisor; - struct siocnstate sp; - int unit = 0; /* XXX random value! */ - - siocniobase = port; - siocnunit = unit; - comdefaultrate = speed; - sio_consdev.cn_pri = CN_NORMAL; - siocnset(&sio_consdev, unit); - - s = spltty(); - - /* - * Initialize the divisor latch. We can't rely on - * siocnopen() to do this the first time, since it - * avoids writing to the latch if the latch appears - * to have the correct value. Also, if we didn't - * just read the speed from the hardware, then we - * need to set the speed in hardware so that - * switching it later is null. - */ - cfcr = inb(siocniobase + com_cfcr); - outb(siocniobase + com_cfcr, CFCR_DLAB | cfcr); - divisor = siodivisor(comdefaultrclk, comdefaultrate); - outb(siocniobase + com_dlbl, divisor & 0xff); - outb(siocniobase + com_dlbh, divisor >> 8); - outb(siocniobase + com_cfcr, cfcr); - - siocnopen(&sp, siocniobase, comdefaultrate); - splx(s); - - cnadd(&sio_consdev); - return (0); -} - -#endif - static int siocncheckc(struct consdev *cd) { From owner-p4-projects@FreeBSD.ORG Sun May 23 21:11:54 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DE7216A4D0; Sun, 23 May 2004 21:11: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 2D4FB16A4CF for ; Sun, 23 May 2004 21:11:54 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24D4943D31 for ; Sun, 23 May 2004 21:11:54 -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.11/8.12.11) with ESMTP id i4O4BaCT087819 for ; Sun, 23 May 2004 21:11:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4O4Ba9p087810 for perforce@freebsd.org; Sun, 23 May 2004 21:11:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 23 May 2004 21:11:36 -0700 (PDT) Message-Id: <200405240411.i4O4Ba9p087810@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 53377 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: Mon, 24 May 2004 04:11:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=53377 Change 53377 by rwatson@rwatson_paprika on 2004/05/23 21:11:05 Integ netperf_socket branch to CVS HEAD: - bde makes kernel profiling work on amd64 more to his satisfaction. - if_capenable mixups cleaned up. - if_sis locking nit: don't mark its callouts as MPSAFE unless running debug.mpsafenet=1. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#2 integrate .. //depot/projects/netperf_socket/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#7 integrate .. //depot/projects/netperf_socket/sys/dev/firewire/fwdev.c#5 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#9 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/usb/ums.c#3 integrate .. //depot/projects/netperf_socket/sys/i386/i386/exception.s#5 integrate .. //depot/projects/netperf_socket/sys/net/if_vlan.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/if_dc.c#5 integrate .. //depot/projects/netperf_socket/sys/pci/if_rl.c#8 integrate .. //depot/projects/netperf_socket/sys/pci/if_sis.c#6 integrate .. //depot/projects/netperf_socket/sys/pci/if_ste.c#13 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/amd64/exception.S#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.116 2004/04/05 21:25:51 imp Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.117 2004/05/23 17:18:48 bde Exp $ */ #include @@ -163,8 +163,10 @@ movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) alltraps_with_regs_pushed: + FAKE_MCOUNT(TF_RIP(%rsp)) calltrap: call trap + MEXITCOUNT jmp doreti /* Handle any pending ASTs */ /* @@ -239,6 +241,7 @@ movq %r13,TF_R13(%rsp) /* C preserved */ movq %r14,TF_R14(%rsp) /* C preserved */ movq %r15,TF_R15(%rsp) /* C preserved */ + FAKE_MCOUNT(TF_RIP(%rsp)) call syscall movq PCPU(CURPCB),%rax testq $PCB_FULLCTX,PCB_FLAGS(%rax) @@ -253,6 +256,7 @@ call ast jmp 1b 2: /* restore preserved registers */ + MEXITCOUNT movq TF_RDI(%rsp),%rdi /* bonus; preserve arg 1 */ movq TF_RSI(%rsp),%rsi /* bonus: preserve arg 2 */ movq TF_RDX(%rsp),%rdx /* return value 2 */ @@ -271,6 +275,7 @@ sysretq 3: /* Requested full context restore, use doreti for that */ andq $~PCB_FULLCTX,PCB_FLAGS(%rax) + MEXITCOUNT jmp doreti /* @@ -286,6 +291,7 @@ movq %rbx, %rsi /* arg1 */ movq %rsp, %rdx /* trapframe pointer */ call fork_exit + MEXITCOUNT jmp doreti /* Handle any ASTs */ .data @@ -301,6 +307,7 @@ .globl doreti .type doreti,@function doreti: + FAKE_MCOUNT($bintr) /* init "from" bintr -> doreti */ /* * Check if ASTs can be handled now. */ @@ -330,6 +337,7 @@ * registers. The fault is handled in trap.c. */ doreti_exit: + MEXITCOUNT movq TF_RDI(%rsp),%rdi movq TF_RSI(%rsp),%rsi movq TF_RDX(%rsp),%rdx ==== //depot/projects/netperf_socket/sys/amd64/amd64/prof_machdep.c#2 (text+ko) ==== @@ -25,11 +25,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.19 2004/03/12 21:45:31 trhodes Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.20 2004/05/23 18:27:14 bde Exp $"); #ifdef GUPROF +#if 0 #include "opt_i586_guprof.h" #include "opt_perfmon.h" +#endif #include #include @@ -38,7 +40,9 @@ #include #include +#if 0 #include +#endif #include #undef MCOUNT #endif @@ -89,7 +93,14 @@ # hasn't changed the stack except to call here, so the \n\ # caller's raddr is above our raddr. \n\ # \n\ - movl 4(%esp),%edx \n\ + pushq %rax \n\ + pushq %rdx \n\ + pushq %rcx \n\ + pushq %rsi \n\ + pushq %rdi \n\ + pushq %r8 \n\ + pushq %r9 \n\ + movq 7*8+8(%rsp),%rdi \n\ jmp .got_frompc \n\ \n\ .p2align 4,0x90 \n\ @@ -101,24 +112,35 @@ je .mcount_exit \n\ # \n\ # The caller's stack frame has already been built, so \n\ - # %ebp is the caller's frame pointer. The caller's \n\ + # %rbp is the caller's frame pointer. The caller's \n\ # raddr is in the caller's frame following the caller's \n\ # caller's frame pointer. \n\ # \n\ - movl 4(%ebp),%edx \n\ + pushq %rax \n\ + pushq %rdx \n\ + pushq %rcx \n\ + pushq %rsi \n\ + pushq %rdi \n\ + pushq %r8 \n\ + pushq %r9 \n\ + movq 8(%rbp),%rdi \n\ .got_frompc: \n\ # \n\ # Our raddr is the caller's pc. \n\ # \n\ - movl (%esp),%eax \n\ + movq 7*8(%rsp),%rsi \n\ \n\ - pushfl \n\ - pushl %eax \n\ - pushl %edx \n\ + pushfq \n\ cli \n\ call " __XSTRING(CNAME(mcount)) " \n\ - addl $8,%esp \n\ - popfl \n\ + popfq \n\ + popq %r9 \n\ + popq %r8 \n\ + popq %rdi \n\ + popq %rsi \n\ + popq %rcx \n\ + popq %rdx \n\ + popq %rax \n\ .mcount_exit: \n\ ret \n\ "); @@ -154,17 +176,25 @@ __cyg_profile_func_exit: \n\ cmpl $GMON_PROF_HIRES," __XSTRING(CNAME(_gmonparam)) "+GM_STATE \n\ jne .mexitcount_exit \n\ - pushl %edx \n\ - pushl %eax \n\ - movl 8(%esp),%eax \n\ - pushfl \n\ - pushl %eax \n\ + pushq %rax \n\ + pushq %rdx \n\ + pushq %rcx \n\ + pushq %rsi \n\ + pushq %rdi \n\ + pushq %r8 \n\ + pushq %r9 \n\ + movq 7*8(%rsp),%rdi \n\ + pushfq \n\ cli \n\ call " __XSTRING(CNAME(mexitcount)) " \n\ - addl $4,%esp \n\ - popfl \n\ - popl %eax \n\ - popl %edx \n\ + popfq \n\ + popq %r9 \n\ + popq %r8 \n\ + popq %rdi \n\ + popq %rsi \n\ + popq %rcx \n\ + popq %rdx \n\ + popq %rax \n\ .mexitcount_exit: \n\ ret \n\ "); @@ -188,7 +218,7 @@ u_char high, low; static u_int prev_count; -#if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP) +#ifndef SMP if (cputime_clock == CPUTIME_CLOCK_TSC) { count = (u_int)rdtsc(); delta = (int)(count - prev_count); @@ -210,7 +240,7 @@ return (delta); } #endif /* PERFMON && I586_PMC_GUPROF */ -#endif /* (I586_CPU || I686_CPU) && !SMP */ +#endif /* !SMP */ /* * Read the current value of the 8254 timer counter 0. @@ -292,13 +322,13 @@ { if (cputime_clock == CPUTIME_CLOCK_UNINITIALIZED) { cputime_clock = CPUTIME_CLOCK_I8254; -#if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP) +#ifndef SMP if (tsc_freq != 0) cputime_clock = CPUTIME_CLOCK_TSC; #endif } gp->profrate = timer_freq << CPUTIME_CLOCK_I8254_SHIFT; -#if (defined(I586_CPU) || defined(I686_CPU)) && !defined(SMP) +#ifndef SMP if (cputime_clock == CPUTIME_CLOCK_TSC) gp->profrate = tsc_freq; #if defined(PERFMON) && defined(I586_PMC_GUPROF) @@ -327,7 +357,7 @@ } } #endif /* PERFMON && I586_PMC_GUPROF */ -#endif /* (I586_CPU || I686_CPU) && !SMP */ +#endif /* !SMP */ cputime_bias = 0; cputime(); } ==== //depot/projects/netperf_socket/sys/amd64/ia32/ia32_exception.S#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/amd64/ia32/ia32_exception.S,v 1.2 2003/11/13 02:38:33 peter Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.3 2004/05/23 19:06:15 bde Exp $ */ #include @@ -63,5 +63,7 @@ movq %r13,TF_R13(%rsp) movq %r14,TF_R14(%rsp) movq %r15,TF_R15(%rsp) + FAKE_MCOUNT(TF_RIP(%rsp)) call ia32_syscall + MEXITCOUNT jmp doreti ==== //depot/projects/netperf_socket/sys/conf/files.amd64#7 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.34 2004/05/17 05:46:15 imp Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.35 2004/05/23 18:38:27 bde Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -69,6 +69,7 @@ amd64/amd64/mptable.c optional mptable amd64/amd64/mptable_pci.c optional mptable pci amd64/amd64/nexus.c standard +amd64/amd64/prof_machdep.c optional profiling-routine amd64/amd64/pmap.c standard amd64/amd64/sigtramp.S standard amd64/amd64/support.S standard ==== //depot/projects/netperf_socket/sys/dev/firewire/fwdev.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.41 2004/05/22 16:14:17 dfr Exp $ + * $FreeBSD: src/sys/dev/firewire/fwdev.c,v 1.42 2004/05/23 18:43:44 dfr Exp $ * */ @@ -594,13 +594,21 @@ /* copy response */ tinfo = &sc->fc->tcode[xfer->recv.hdr.mode.hdr.tcode]; - if (asyreq->req.len >= xfer->recv.pay_len + tinfo->hdr_len) - asyreq->req.len = xfer->recv.pay_len; - else - err = EINVAL; + if (xfer->recv.hdr.mode.hdr.tcode == FWTCODE_RRESB || + xfer->recv.hdr.mode.hdr.tcode == FWTCODE_LRES) { + pay_len = xfer->recv.pay_len; + if (asyreq->req.len >= xfer->recv.pay_len + tinfo->hdr_len) { + asyreq->req.len = xfer->recv.pay_len + + tinfo->hdr_len; + } else { + err = EINVAL; + pay_len = 0; + } + } else { + pay_len = 0; + } bcopy(&xfer->recv.hdr, fp, tinfo->hdr_len); - bcopy(xfer->recv.payload, (char *)fp + tinfo->hdr_len, - MAX(0, asyreq->req.len - tinfo->hdr_len)); + bcopy(xfer->recv.payload, (char *)fp + tinfo->hdr_len, pay_len); out: fw_xfer_free_buf(xfer); break; ==== //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.206 2004/05/23 16:11:48 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.207 2004/05/23 21:05:07 yar Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -2496,7 +2496,8 @@ break; case SIOCSIFCAP: - ifp->if_capenable = ifr->ifr_reqcap; + ifp->if_capenable &= ~IFCAP_POLLING; + ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING; break; default: ==== //depot/projects/netperf_socket/sys/dev/hme/if_hme.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.21 2004/05/23 16:11:49 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/hme/if_hme.c,v 1.22 2004/05/23 19:21:47 yar Exp $"); /* * HME Ethernet module driver. @@ -319,6 +319,7 @@ */ ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); ifp->if_capabilities |= IFCAP_VLAN_MTU; + ifp->if_capenable |= IFCAP_VLAN_MTU; callout_init(&sc->sc_tick_ch, 0); return (0); ==== //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.59 2004/05/23 16:11:50 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.61 2004/05/23 21:05:07 yar Exp $"); /* * National Semiconductor DP83820/DP83821 gigabit ethernet driver @@ -2114,10 +2114,13 @@ * 8152 (TX FIFO size minus 64 minus 18), turn off * TX checksum offloading. */ - if (ifr->ifr_mtu >= 8152) + if (ifr->ifr_mtu >= 8152) { + ifp->if_capenable &= ~IFCAP_TXCSUM; ifp->if_hwassist = 0; - else + } else { + ifp->if_capenable |= IFCAP_TXCSUM; ifp->if_hwassist = NGE_CSUM_FEATURES; + } } break; case SIOCSIFFLAGS: @@ -2164,7 +2167,8 @@ } break; case SIOCSIFCAP: - ifp->if_capenable = ifr->ifr_reqcap; + ifp->if_capenable &= ~IFCAP_POLLING; + ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING; break; default: error = ether_ioctl(ifp, command, data); ==== //depot/projects/netperf_socket/sys/dev/re/if_re.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.21 2004/05/23 16:11:50 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.22 2004/05/23 21:05:08 yar Exp $"); /* * RealTek 8139C+/8169/8169S/8110S PCI NIC driver @@ -2315,7 +2315,9 @@ error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command); break; case SIOCSIFCAP: - ifp->if_capenable = ifr->ifr_reqcap; + ifp->if_capenable &= ~(IFCAP_HWCSUM | IFCAP_POLLING); + ifp->if_capenable |= + ifr->ifr_reqcap & (IFCAP_HWCSUM | IFCAP_POLLING); if (ifp->if_capenable & IFCAP_TXCSUM) ifp->if_hwassist = RE_CSUM_FEATURES; else ==== //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.82 2004/03/17 17:50:46 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.83 2004/05/23 19:21:48 yar Exp $"); /* * EtherPower II 10/100 Fast Ethernet (SMC 9432 serie) @@ -413,6 +413,7 @@ ifp->if_hdrlen = sizeof(struct ether_vlan_header); ifp->if_capabilities |= IFCAP_VLAN_MTU; + ifp->if_capenable |= IFCAP_VLAN_MTU; callout_handle_init(&sc->stat_ch); /* Activate our interrupt handler. */ ==== //depot/projects/netperf_socket/sys/dev/usb/ums.c#3 (text+ko) ==== @@ -37,10 +37,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.66 2004/02/21 21:10:49 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.67 2004/05/23 17:09:07 le Exp $"); /* - * HID spec: http://www.usb.org/developers/data/devclass/hid1_1.pdf + * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf */ #include ==== //depot/projects/netperf_socket/sys/i386/i386/exception.s#5 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/exception.s,v 1.109 2004/05/23 16:50:55 bde Exp $ + * $FreeBSD: src/sys/i386/i386/exception.s,v 1.110 2004/05/23 17:25:46 bde Exp $ */ #include "opt_npx.h" @@ -136,7 +136,6 @@ movl %eax,%fs FAKE_MCOUNT(TF_EIP(%esp)) calltrap: - FAKE_MCOUNT(btrap) /* init "from" btrap -> calltrap */ call trap /* @@ -235,7 +234,7 @@ .globl doreti .type doreti,@function doreti: - FAKE_MCOUNT(bintr) /* init "from" bintr -> doreti */ + FAKE_MCOUNT($bintr) /* init "from" bintr -> doreti */ doreti_next: /* * Check if ASTs can be handled now. PSL_VM must be checked first ==== //depot/projects/netperf_socket/sys/net/if_vlan.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_vlan.c,v 1.61 2004/05/21 08:43:38 ru Exp $ + * $FreeBSD: src/sys/net/if_vlan.c,v 1.62 2004/05/23 22:32:15 yar Exp $ */ /* @@ -338,7 +338,7 @@ * knows how to find the VLAN tag to use, so we attach a * packet tag that holds it. */ - if (p->if_capabilities & IFCAP_VLAN_HWTAGGING) { + if (p->if_capenable & IFCAP_VLAN_HWTAGGING) { struct m_tag *mtag = m_tag_alloc(MTAG_VLAN, MTAG_VLAN_TAG, sizeof (u_int), @@ -542,13 +542,20 @@ (IFF_BROADCAST | IFF_MULTICAST | IFF_SIMPLEX | IFF_POINTOPOINT)); ifv->ifv_if.if_link_state = p->if_link_state; +#if 0 /* + * Not ready yet. We need notification from the parent + * when hw checksumming flags in its if_capenable change. + * Flags set in if_capabilities only are useless. + */ + /* * If the parent interface can do hardware-assisted * VLAN encapsulation, then propagate its hardware- * assisted checksumming flags. */ if (p->if_capabilities & IFCAP_VLAN_HWTAGGING) ifv->ifv_if.if_capabilities |= p->if_capabilities & IFCAP_HWCSUM; +#endif /* * Set up our ``Ethernet address'' to reflect the underlying ==== //depot/projects/netperf_socket/sys/pci/if_dc.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_dc.c,v 1.142 2004/04/11 13:47:15 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_dc.c,v 1.143 2004/05/23 21:05:06 yar Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -3708,7 +3708,8 @@ #endif break; case SIOCSIFCAP: - ifp->if_capenable = ifr->ifr_reqcap; + ifp->if_capenable &= ~IFCAP_POLLING; + ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING; break; default: error = ether_ioctl(ifp, command, data); ==== //depot/projects/netperf_socket/sys/pci/if_rl.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.135 2004/04/11 16:23:16 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.136 2004/05/23 21:05:07 yar Exp $"); /* * RealTek 8129/8139 PCI NIC driver @@ -1830,7 +1830,8 @@ error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command); break; case SIOCSIFCAP: - ifp->if_capenable = ifr->ifr_reqcap; + ifp->if_capenable &= ~IFCAP_POLLING; + ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING; break; default: error = ether_ioctl(ifp, command, data); ==== //depot/projects/netperf_socket/sys/pci/if_sis.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.97 2004/04/11 20:34:08 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.99 2004/05/23 22:22:29 rwatson Exp $"); /* * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are @@ -1234,7 +1234,10 @@ } sc->sis_unit = unit; - callout_init(&sc->sis_stat_ch, CALLOUT_MPSAFE); + if (debug_mpsafenet) + callout_init(&sc->sis_stat_ch, CALLOUT_MPSAFE); + else + callout_init(&sc->sis_stat_ch, 0); bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); /* @@ -2340,7 +2343,8 @@ SIS_UNLOCK(sc); break; case SIOCSIFCAP: - ifp->if_capenable = ifr->ifr_reqcap; + ifp->if_capenable &= ~IFCAP_POLLING; + ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING; break; default: error = ether_ioctl(ifp, command, data); ==== //depot/projects/netperf_socket/sys/pci/if_ste.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_ste.c,v 1.72 2004/04/11 14:42:25 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_ste.c,v 1.73 2004/05/23 21:05:07 yar Exp $"); #include #include @@ -1555,7 +1555,8 @@ error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command); break; case SIOCSIFCAP: - ifp->if_capenable = ifr->ifr_reqcap; + ifp->if_capenable &= ~IFCAP_POLLING; + ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING; break; default: error = ether_ioctl(ifp, command, data); From owner-p4-projects@FreeBSD.ORG Sun May 23 21:39:37 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9BE716A4D1; Sun, 23 May 2004 21:39:36 -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 C440C16A4CF for ; Sun, 23 May 2004 21:39:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB99143D1F for ; Sun, 23 May 2004 21:39:36 -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.11/8.12.11) with ESMTP id i4O4dBE0092733 for ; Sun, 23 May 2004 21:39:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4O4dAOj092730 for perforce@freebsd.org; Sun, 23 May 2004 21:39:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 23 May 2004 21:39:10 -0700 (PDT) Message-Id: <200405240439.i4O4dAOj092730@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 53379 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: Mon, 24 May 2004 04:39:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=53379 Change 53379 by rwatson@rwatson_paprika on 2004/05/23 21:38:10 Integrate netperf_socket from FreeBSD CVS HEAD: - Loop back the NFS server subsystem lock merged from rwatson_netperf to CVS. Affected files ... .. //depot/projects/netperf_socket/sys/nfsserver/nfs.h#7 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvcache.c#5 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfs_syscalls.c#6 integrate .. //depot/projects/netperf_socket/sys/nfsserver/nfsm_subs.h#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/nfsserver/nfs.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)nfs.h 8.4 (Berkeley) 5/1/95 - * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.74 2004/04/11 13:33:34 peadar Exp $ + * $FreeBSD: src/sys/nfsserver/nfs.h,v 1.75 2004/05/24 04:06:14 rwatson Exp $ */ #ifndef _NFSSERVER_NFS_H_ @@ -116,6 +116,13 @@ #ifdef _KERNEL +extern struct mtx nfsd_mtx; +#define NFSD_LOCK_ASSERT() mtx_assert(&nfsd_mtx, MA_OWNED) +#define NFSD_UNLOCK_ASSERT() mtx_assert(&nfsd_mtx, MA_NOTOWNED) +#define NFSD_LOCK_DONTCARE() +#define NFSD_LOCK() mtx_lock(&nfsd_mtx) +#define NFSD_UNLOCK() mtx_unlock(&nfsd_mtx) + #ifdef MALLOC_DECLARE MALLOC_DECLARE(M_NFSRVDESC); MALLOC_DECLARE(M_NFSD); @@ -145,8 +152,8 @@ nfsrv_rpc_autherr; /* Procedure table data */ -extern int nfsrvv2_procid[NFS_NPROCS]; -extern int nfsrv_nfsv3_procid[NFS_NPROCS]; +extern const int nfsrvv2_procid[NFS_NPROCS]; +extern const int nfsrv_nfsv3_procid[NFS_NPROCS]; extern int32_t (*nfsrv3_procs[NFS_NPROCS])(struct nfsrv_descript *nd, struct nfssvc_sock *slp, struct thread *td, struct mbuf **mreqp); ==== //depot/projects/netperf_socket/sys/nfsserver/nfs_serv.c#5 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.140 2004/04/12 13:02:21 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/nfsserver/nfs_serv.c,v 1.141 2004/05/24 04:06:14 rwatson Exp $"); /* * nfs version 2 and 3 server calls to vnode ops @@ -179,6 +179,8 @@ u_long testmode, nfsmode; int v3 = (nfsd->nd_flag & ND_NFSV3); + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); if (!v3) panic("nfsrv3_access: v3 proc called on a v2 connection"); @@ -211,9 +213,13 @@ if ((nfsmode & testmode) && nfsrv_access(vp, VEXEC, cred, rdonly, td, 0)) nfsmode &= ~testmode; + NFSD_UNLOCK(); + mtx_lock(&Giant); getret = VOP_GETATTR(vp, vap, cred, td); vput(vp); + mtx_unlock(&Giant); vp = NULL; + NFSD_LOCK(); nfsm_reply(NFSX_POSTOPATTR(1) + NFSX_UNSIGNED); nfsm_srvpostop_attr(getret, vap); tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED); @@ -245,6 +251,8 @@ int error = 0, rdonly; struct mbuf *mb, *mreq; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); fhp = &nfh.fh_generic; nfsm_srvmtofh(fhp); @@ -254,9 +262,13 @@ error = 0; goto nfsmout; } + NFSD_UNLOCK(); + mtx_lock(&Giant); error = VOP_GETATTR(vp, vap, cred, td); vput(vp); + mtx_unlock(&Giant); vp = NULL; + NFSD_LOCK(); nfsm_reply(NFSX_FATTR(nfsd->nd_flag & ND_NFSV3)); if (error) { error = 0; @@ -299,6 +311,8 @@ struct timespec guard; struct mount *mp = NULL; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); fhp = &nfh.fh_generic; nfsm_srvmtofh(fhp); @@ -306,7 +320,11 @@ error = ESTALE; goto out; } + NFSD_UNLOCK(); + mtx_lock(&Giant); (void) vn_start_write(NULL, &mp, V_WAIT); + mtx_unlock(&Giant); + NFSD_LOCK(); VATTR_NULL(vap); if (v3) { nfsm_srvsattr(vap); @@ -363,20 +381,26 @@ * vp now an active resource, pay careful attention to cleanup */ if (v3) { + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ error = preat_ret = VOP_GETATTR(vp, &preat, cred, td); if (!error && gcheck && (preat.va_ctime.tv_sec != guard.tv_sec || preat.va_ctime.tv_nsec != guard.tv_nsec)) error = NFSERR_NOT_SYNC; if (error) { + mtx_unlock(&Giant); /* VFS */ vput(vp); vp = NULL; + NFSD_LOCK(); nfsm_reply(NFSX_WCCDATA(v3)); if (v3) nfsm_srvwcc_data(preat_ret, &preat, postat_ret, vap); error = 0; goto nfsmout; } + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); } /* @@ -396,13 +420,23 @@ td, 0)) != 0) goto out; } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ error = VOP_SETATTR(vp, vap, cred, td); postat_ret = VOP_GETATTR(vp, vap, cred, td); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); if (!error) error = postat_ret; out: - if (vp != NULL) + if (vp != NULL) { + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ vput(vp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); + } + vp = NULL; nfsm_reply(NFSX_WCCORFATTR(v3)); if (v3) { @@ -416,9 +450,13 @@ /* fall through */ nfsmout: + NFSD_UNLOCK(); + mtx_lock(&Giant); if (vp) vput(vp); vn_finished_write(mp); + mtx_unlock(&Giant); + NFSD_LOCK(); return(error); } @@ -444,6 +482,8 @@ struct mbuf *mb, *mreq; struct vattr va, dirattr, *vap = &va; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); ndclear(&nd); @@ -464,11 +504,15 @@ * structure in case macros jump to nfsmout. */ + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (error) { if (dirp) { vrele(dirp); dirp = NULL; } + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_reply(NFSX_POSTOPATTR(v3)); if (v3) nfsm_srvpostop_attr(dirattr_ret, &dirattr); @@ -549,6 +593,8 @@ */ if (error) { + mtx_unlock(&Giant); + NFSD_LOCK(); nfsm_reply(NFSX_POSTOPATTR(v3)); if (v3) nfsm_srvpostop_attr(dirattr_ret, &dirattr); @@ -577,7 +623,9 @@ error = VOP_GETATTR(vp, vap, cred, td); vput(vp); + mtx_unlock(&Giant); /* VFS */ ndp->ni_vp = NULL; + NFSD_LOCK(); nfsm_reply(NFSX_SRVFH(v3) + NFSX_POSTOPORFATTR(v3) + NFSX_POSTOPATTR(v3)); if (error) { if (v3) @@ -595,6 +643,8 @@ } nfsmout: + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (dirp) vrele(dirp); NDFREE(&nd, NDF_ONLY_PNBUF); @@ -602,6 +652,8 @@ vrele(ndp->ni_startdir); if (ndp->ni_vp) vput(ndp->ni_vp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); return (error); } @@ -630,6 +682,8 @@ fhandle_t *fhp; struct uio io, *uiop = &io; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); #ifndef nolint mp = NULL; @@ -639,6 +693,7 @@ nfsm_srvmtofh(fhp); len = 0; i = 0; + NFSD_UNLOCK(); while (len < NFS_MAXPATHLEN) { MGET(nmp, M_TRYWAIT, MT_DATA); MCLGET(nmp, M_TRYWAIT); @@ -666,6 +721,7 @@ uiop->uio_rw = UIO_READ; uiop->uio_segflg = UIO_SYSSPACE; uiop->uio_td = NULL; + NFSD_LOCK(); error = nfsrv_fhtovp(fhp, 1, &vp, cred, slp, nam, &rdonly, TRUE); if (error) { nfsm_reply(2 * NFSX_UNSIGNED); @@ -674,18 +730,20 @@ error = 0; goto nfsmout; } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (vp->v_type != VLNK) { if (v3) error = EINVAL; else error = ENXIO; - goto out; - } - error = VOP_READLINK(vp, uiop, cred); -out: + } else + error = VOP_READLINK(vp, uiop, cred); getret = VOP_GETATTR(vp, &attr, cred, td); vput(vp); + mtx_unlock(&Giant); /* VFS */ vp = NULL; + NFSD_LOCK(); nfsm_reply(NFSX_POSTOPATTR(v3) + NFSX_UNSIGNED); if (v3) nfsm_srvpostop_attr(getret, &attr); @@ -705,8 +763,13 @@ nfsmout: if (mp3) m_freem(mp3); - if (vp) + if (vp) { + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ vput(vp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); + } return(error); } @@ -741,6 +804,8 @@ off_t off; int ioflag = 0; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); fhp = &nfh.fh_generic; nfsm_srvmtofh(fhp); @@ -779,18 +844,24 @@ if ((error = nfsrv_access(vp, VREAD, cred, rdonly, td, 1)) != 0) error = nfsrv_access(vp, VEXEC, cred, rdonly, td, 1); } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ getret = VOP_GETATTR(vp, vap, cred, td); if (!error) error = getret; if (error) { vput(vp); + mtx_unlock(&Giant); /* VFS */ vp = NULL; + NFSD_LOCK(); nfsm_reply(NFSX_POSTOPATTR(v3)); if (v3) nfsm_srvpostop_attr(getret, vap); error = 0; goto nfsmout; } + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); /* * Calculate byte count to read @@ -870,6 +941,7 @@ tl += (NFSX_V2FATTR / sizeof (u_int32_t)); } len = left = nfsm_rndup(cnt); + NFSD_UNLOCK(); if (cnt > 0) { /* * Generate the mbuf list with the uio_iov ref. to it. @@ -915,6 +987,7 @@ uiop->uio_resid = len; uiop->uio_rw = UIO_READ; uiop->uio_segflg = UIO_SYSSPACE; + mtx_lock(&Giant); /* VFS */ error = VOP_READ(vp, uiop, IO_NODELOCKED | ioflag, cred); off = uiop->uio_offset; nh->nh_nextr = off; @@ -924,6 +997,8 @@ error = getret; m_freem(mreq); vput(vp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); vp = NULL; nfsm_reply(NFSX_POSTOPATTR(v3)); if (v3) @@ -933,9 +1008,13 @@ } } else { uiop->uio_resid = 0; + mtx_lock(&Giant); /* VFS */ } + mtx_assert(&Giant, MA_OWNED); /* VFS */ vput(vp); + mtx_unlock(&Giant); /* VFS */ vp = NULL; + NFSD_LOCK(); nfsm_srvfillattr(vap, fp); tlen = len - uiop->uio_resid; cnt = cnt < tlen ? cnt : tlen; @@ -951,8 +1030,13 @@ } *tl = txdr_unsigned(cnt); nfsmout: - if (vp) + if (vp) { + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ vput(vp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); + } return(error); } @@ -988,6 +1072,8 @@ off_t off; struct mount *mntp = NULL; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); if (mrep == NULL) { *mrq = NULL; @@ -1000,7 +1086,11 @@ error = ESTALE; goto ereply; } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ (void) vn_start_write(NULL, &mntp, V_WAIT); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); if (v3) { tl = nfsm_dissect(u_int32_t *, 5 * NFSX_UNSIGNED); off = fxdr_hyper(tl); @@ -1063,8 +1153,13 @@ error = 0; goto nfsmout; } - if (v3) + if (v3) { + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ forat_ret = VOP_GETATTR(vp, &forat, cred, td); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); + } if (vp->v_type != VREG) { if (v3) error = EINVAL; @@ -1074,7 +1169,11 @@ if (!error) error = nfsrv_access(vp, VWRITE, cred, rdonly, td, 1); if (error) { + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ vput(vp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); vp = NULL; nfsm_reply(NFSX_WCCDATA(v3)); if (v3) @@ -1083,6 +1182,7 @@ goto nfsmout; } + NFSD_UNLOCK(); if (len > 0) { MALLOC(ivp, struct iovec *, cnt * sizeof (struct iovec), M_TEMP, M_WAITOK); @@ -1116,12 +1216,18 @@ uiop->uio_segflg = UIO_SYSSPACE; uiop->uio_td = NULL; uiop->uio_offset = off; + mtx_lock(&Giant); /* VFS */ error = VOP_WRITE(vp, uiop, ioflags, cred); + /* XXXRW: unlocked write. */ nfsrvstats.srvvop_writes++; FREE((caddr_t)iv, M_TEMP); - } + } else + mtx_lock(&Giant); /* VFS */ + mtx_assert(&Giant, MA_OWNED); /* VFS */ aftat_ret = VOP_GETATTR(vp, vap, cred, td); vput(vp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); vp = NULL; if (!error) error = aftat_ret; @@ -1159,9 +1265,13 @@ } error = 0; nfsmout: + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (vp) vput(vp); vn_finished_write(mntp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); return(error); } @@ -1195,6 +1305,8 @@ u_quad_t cur_usec; struct mount *mntp = NULL; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); #ifndef nolint i = 0; @@ -1348,8 +1460,13 @@ error = nfsrv_fhtovp(&nfsd->nd_fh, 1, &vp, cred, slp, nfsd->nd_nam, &rdonly, TRUE); if (!error) { - if (v3) + if (v3) { + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ forat_ret = VOP_GETATTR(vp, &forat, cred, td); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); + } if (vp->v_type != VREG) { if (v3) error = EINVAL; @@ -1361,6 +1478,7 @@ } if (!error) error = nfsrv_access(vp, VWRITE, cred, rdonly, td, 1); + NFSD_UNLOCK(); if (nfsd->nd_stable == NFSV3WRITE_UNSTABLE) ioflags = IO_NODELOCKED; else if (nfsd->nd_stable == NFSV3WRITE_DATASYNC) @@ -1372,6 +1490,7 @@ uiop->uio_td = NULL; uiop->uio_offset = nfsd->nd_off; uiop->uio_resid = nfsd->nd_eoff - nfsd->nd_off; + mtx_lock(&Giant); /* VFS */ if (uiop->uio_resid > 0) { mp = mrep; i = 0; @@ -1402,6 +1521,7 @@ } if (!error) { error = VOP_WRITE(vp, uiop, ioflags, cred); + /* XXXRW: unlocked write. */ nfsrvstats.srvvop_writes++; vn_finished_write(mntp); } @@ -1413,6 +1533,8 @@ vput(vp); vp = NULL; } + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); /* * Loop around generating replies for all write rpcs that have @@ -1507,6 +1629,8 @@ struct mbuf *mp; struct nfsrv_descript *p; + NFSD_LOCK_ASSERT(); + NFS_DPF(WG, ("C%03x-%03x", nfsd->nd_retxid & 0xfff, owp->nd_retxid & 0xfff)); LIST_REMOVE(nfsd, nd_hash); @@ -1573,6 +1697,8 @@ u_char cverf[NFSX_V3CREATEVERF]; struct mount *mp = NULL; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); #ifndef nolint rdev = 0; @@ -1585,7 +1711,11 @@ error = ESTALE; goto ereply; } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ (void) vn_start_write(NULL, &mp, V_WAIT); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_srvnamesiz(len); nd.ni_cnd.cn_cred = cred; @@ -1604,7 +1734,11 @@ error = nfs_namei(&nd, fhp, len, slp, nam, &md, &dpos, &dirp, v3, &dirfor, &dirfor_ret, td, FALSE); if (dirp && !v3) { + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ vrele(dirp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); dirp = NULL; } if (error) { @@ -1679,6 +1813,8 @@ * The only possible error we can have at this point is EEXIST. * nd.ni_vp will also be non-NULL in that case. */ + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (nd.ni_vp == NULL) { if (vap->va_mode == (mode_t)VNOVAL) vap->va_mode = 0; @@ -1797,6 +1933,8 @@ } } ereply: + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_reply(NFSX_SRVFH(v3) + NFSX_FATTR(v3) + NFSX_WCCDATA(v3)); if (v3) { if (!error) { @@ -1813,6 +1951,8 @@ error = 0; nfsmout: + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (nd.ni_startdir) { vrele(nd.ni_startdir); nd.ni_startdir = NULL; @@ -1829,6 +1969,8 @@ if (nd.ni_vp) vput(nd.ni_vp); vn_finished_write(mp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); return (error); } @@ -1858,6 +2000,8 @@ struct mount *mp = NULL; int v3 = (nfsd->nd_flag & ND_NFSV3); + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); if (!v3) panic("nfsrv_mknod: v3 proc called on a v2 connection"); @@ -1869,7 +2013,11 @@ error = ESTALE; goto ereply; } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ (void) vn_start_write(NULL, &mp, V_WAIT); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_srvnamesiz(len); nd.ni_cnd.cn_cred = cred; @@ -1915,6 +2063,8 @@ vap->va_type = vtyp; if (vap->va_mode == (mode_t)VNOVAL) vap->va_mode = 0; + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (vtyp == VSOCK) { vrele(nd.ni_startdir); nd.ni_startdir = NULL; @@ -1987,6 +2137,8 @@ VOP_UNLOCK(dirp, 0, td); } ereply: + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_reply(NFSX_SRVFH(1) + NFSX_POSTOPATTR(1) + NFSX_WCCDATA(1)); if (v3) { if (!error) { @@ -1995,9 +2147,15 @@ } nfsm_srvwcc_data(dirfor_ret, &dirfor, diraft_ret, &diraft); } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ vn_finished_write(mp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); return (0); nfsmout: + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (dirp) vrele(dirp); if (nd.ni_startdir) @@ -2012,6 +2170,8 @@ if (nd.ni_vp) vput(nd.ni_vp); vn_finished_write(mp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); return (error); } @@ -2037,6 +2197,8 @@ fhandle_t *fhp; struct mount *mp = NULL; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); ndclear(&nd); @@ -2046,7 +2208,11 @@ error = ESTALE; goto ereply; } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ (void) vn_start_write(NULL, &mp, V_WAIT); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_srvnamesiz(len); nd.ni_cnd.cn_cred = cred; @@ -2054,6 +2220,8 @@ nd.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF; error = nfs_namei(&nd, fhp, len, slp, nam, &md, &dpos, &dirp, v3, &dirfor, &dirfor_ret, td, FALSE); + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (dirp && !v3) { vrele(dirp); dirp = NULL; @@ -2099,6 +2267,8 @@ vrele(dirp); dirp = NULL; } + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); ereply: nfsm_reply(NFSX_WCCDATA(v3)); if (v3) { @@ -2106,6 +2276,8 @@ error = 0; } nfsmout: + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ NDFREE(&nd, NDF_ONLY_PNBUF); if (nd.ni_dvp) { if (nd.ni_dvp == nd.ni_vp) @@ -2116,6 +2288,8 @@ if (nd.ni_vp) vput(nd.ni_vp); vn_finished_write(mp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); return(error); } @@ -2144,6 +2318,8 @@ uid_t saved_uid; struct mount *mp = NULL; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); #ifndef nolint fvp = NULL; @@ -2176,7 +2352,11 @@ error = nfs_namei(&fromnd, ffhp, len, slp, nam, &md, &dpos, &fdirp, v3, &fdirfor, &fdirfor_ret, td, FALSE); if (fdirp && !v3) { + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ vrele(fdirp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); fdirp = NULL; } if (error) { @@ -2197,6 +2377,8 @@ tond.ni_cnd.cn_flags = LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART; error = nfs_namei(&tond, tfhp, len2, slp, nam, &md, &dpos, &tdirp, v3, &tdirfor, &tdirfor_ret, td, FALSE); + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (tdirp && !v3) { vrele(tdirp); tdirp = NULL; @@ -2282,9 +2464,13 @@ /* fall through */ out1: + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_reply(2 * NFSX_WCCDATA(v3)); if (v3) { /* Release existing locks to prevent deadlock. */ + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (tond.ni_dvp) { if (tond.ni_dvp == tond.ni_vp) vrele(tond.ni_dvp); @@ -2306,6 +2492,8 @@ tdiraft_ret = VOP_GETATTR(tdirp, &tdiraft, cred, td); VOP_UNLOCK(tdirp, 0, td); } + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_srvwcc_data(fdirfor_ret, &fdirfor, fdiraft_ret, &fdiraft); nfsm_srvwcc_data(tdirfor_ret, &tdirfor, tdiraft_ret, &tdiraft); } @@ -2316,6 +2504,8 @@ /* * Clear out tond related fields */ + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (tdirp) vrele(tdirp); if (tond.ni_startdir) @@ -2344,6 +2534,8 @@ vrele(fromnd.ni_vp); vn_finished_write(mp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); return (error); } @@ -2369,6 +2561,8 @@ fhandle_t *fhp, *dfhp; struct mount *mp = NULL; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); ndclear(&nd); @@ -2379,7 +2573,11 @@ error = ESTALE; goto ereply; } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ (void) vn_start_write(NULL, &mp, V_WAIT); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_srvmtofh(dfhp); nfsm_srvnamesiz(len); @@ -2394,6 +2592,8 @@ error = 0; goto nfsmout; } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (v3) getret = VOP_GETATTR(vp, &at, cred, td); if (vp->v_type == VDIR) { @@ -2404,8 +2604,12 @@ nd.ni_cnd.cn_cred = cred; nd.ni_cnd.cn_nameiop = CREATE; nd.ni_cnd.cn_flags = LOCKPARENT; + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); error = nfs_namei(&nd, dfhp, len, slp, nam, &md, &dpos, &dirp, v3, &dirfor, &dirfor_ret, td, FALSE); + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (dirp && !v3) { vrele(dirp); dirp = NULL; @@ -2459,6 +2663,8 @@ VOP_UNLOCK(dirp, 0, td); } } + mtx_lock(&Giant); /* VFS */ + NFSD_LOCK(); ereply: nfsm_reply(NFSX_POSTOPATTR(v3) + NFSX_WCCDATA(v3)); if (v3) { @@ -2469,6 +2675,8 @@ /* fall through */ nfsmout: + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ NDFREE(&nd, NDF_ONLY_PNBUF); if (dirp) vrele(dirp); @@ -2483,6 +2691,8 @@ if (nd.ni_vp) vrele(nd.ni_vp); vn_finished_write(mp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); return(error); } @@ -2512,6 +2722,8 @@ fhandle_t *fhp; struct mount *mp = NULL; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); ndclear(&nd); @@ -2521,13 +2733,19 @@ error = ESTALE; goto out; } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ (void) vn_start_write(NULL, &mp, V_WAIT); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_srvnamesiz(len); nd.ni_cnd.cn_cred = cred; nd.ni_cnd.cn_nameiop = CREATE; nd.ni_cnd.cn_flags = LOCKPARENT | SAVESTART; error = nfs_namei(&nd, fhp, len, slp, nam, &md, &dpos, &dirp, v3, &dirfor, &dirfor_ret, td, FALSE); + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ if (dirp && !v3) { vrele(dirp); dirp = NULL; @@ -2626,6 +2844,8 @@ vrele(nd.ni_startdir); nd.ni_startdir = NULL; } + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_reply(NFSX_SRVFH(v3) + NFSX_POSTOPATTR(v3) + NFSX_WCCDATA(v3)); if (v3) { if (!error) { @@ -2638,6 +2858,8 @@ /* fall through */ nfsmout: + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ NDFREE(&nd, NDF_ONLY_PNBUF); if (nd.ni_dvp) { if (nd.ni_dvp == nd.ni_vp) @@ -2655,6 +2877,8 @@ FREE(pathcp, M_TEMP); vn_finished_write(mp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); return (error); } @@ -2684,6 +2908,8 @@ fhandle_t *fhp; struct mount *mp = NULL; + NFSD_LOCK_ASSERT(); + nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); ndclear(&nd); @@ -2693,7 +2919,11 @@ error = ESTALE; goto out; } + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ (void) vn_start_write(NULL, &mp, V_WAIT); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); nfsm_srvnamesiz(len); nd.ni_cnd.cn_cred = cred; nd.ni_cnd.cn_nameiop = CREATE; @@ -2702,7 +2932,11 @@ error = nfs_namei(&nd, fhp, len, slp, nam, &md, &dpos, &dirp, v3, &dirfor, &dirfor_ret, td, FALSE); if (dirp && !v3) { + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ vrele(dirp); + mtx_unlock(&Giant); /* VFS */ + NFSD_LOCK(); dirp = NULL; } if (error) { @@ -2725,6 +2959,8 @@ * nd.ni_vp, if it exists, is referenced but not locked. */ + NFSD_UNLOCK(); + mtx_lock(&Giant); /* VFS */ vap->va_type = VDIR; if (nd.ni_vp != NULL) { NDFREE(&nd, NDF_ONLY_PNBUF); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 24 13:23:40 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21DBC16A4D0; Mon, 24 May 2004 13:23:40 -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 ED51116A4CE for ; Mon, 24 May 2004 13:23:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E4FAB43D1D for ; Mon, 24 May 2004 13:23:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4OKNdp5028006 for ; Mon, 24 May 2004 13:23:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4OKNdJi028003 for perforce@freebsd.org; Mon, 24 May 2004 13:23:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Mon, 24 May 2004 13:23:39 -0700 (PDT) Message-Id: <200405242023.i4OKNdJi028003@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53414 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: Mon, 24 May 2004 20:23:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=53414 Change 53414 by marcel@marcel_nfs on 2004/05/24 13:23:02 Remove alpha specific code. This appears to work, but since the TGA driver panics on my box as it does with CVS HEAD, testing was limited. Note that the panic is caused by not having a proper virtual address for the memory resource. This is a fundamental problem. Affected files ... .. //depot/projects/gdb/sys/dev/gfb/gfb_pci.c#3 edit .. //depot/projects/gdb/sys/dev/syscons/syscons.c#7 edit Differences ... ==== //depot/projects/gdb/sys/dev/gfb/gfb_pci.c#3 (text+ko) ==== @@ -32,9 +32,6 @@ #include "opt_fb.h" -#include -__FBSDID("$FreeBSD: src/sys/dev/gfb/gfb_pci.c,v 1.11 2004/03/17 17:50:33 njl Exp $"); - #include #include #include @@ -66,23 +63,10 @@ #include #include -#ifdef __alpha__ - -#include -#include - -#endif /* __alpha__ */ - #if 0 static devclass_t gfb_devclass; #endif -#ifdef __alpha__ - -extern void sccnattach(void); - -#endif /* __alpha__ */ - extern struct gfb_font bold8x16; extern struct gfb_softc *gfb_device_softcs[2][16]; @@ -93,9 +77,6 @@ gfb_softc_t sc; video_adapter_t *adp; int unit, flags, error, rid, va_index; -#ifdef __alpha__ - struct ctb *ctb; -#endif /* __alpha__ */ s = splimp(); error = 0; @@ -136,7 +117,7 @@ adp->va_mem_base = (vm_offset_t)rman_get_virtual(sc->res); adp->va_mem_size = rman_get_end(sc->res) - rman_get_start(sc->res); - adp->va_io_base = 0; + adp->va_io_base = (vm_offset_t)sc->res; /* XXX */ adp->va_io_size = 0; adp->va_crtc_addr = 0; gfb_device_softcs[sc->model][unit] = sc; @@ -191,19 +172,6 @@ gfb_device_softcs[sc->model][unit] = sc; } - /* - This is a back-door for PCI devices--since FreeBSD no longer supports - PCI configuration-space accesses during the *configure() phase for - video adapters, we cannot identify a PCI device as the console during - the first call to sccnattach(). There must be a second chance for PCI - adapters to be recognized as the console, and this is it... - */ -#ifdef __alpha__ - ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); - if (ctb->ctb_term_type == 3) /* Display adapter */ - sccnattach(); -#endif /* __alpha__ */ - device_printf(dev, "Board type %s\n", sc->gfbc->name); device_printf(dev, "%d x %d, %dbpp, %s RAMDAC\n", sc->adp->va_info.vi_width, sc->adp->va_info.vi_height, ==== //depot/projects/gdb/sys/dev/syscons/syscons.c#7 (text+ko) ==== @@ -155,9 +155,7 @@ static void scstart(struct tty *tp); static void scinit(int unit, int flags); static scr_stat *sc_get_stat(dev_t devptr); -#if !__alpha__ static void scterm(int unit, int flags); -#endif static void scshutdown(void *arg, int howto); static u_int scgetc(sc_softc_t *sc, u_int flags); #define SCGETC_CN 1 @@ -206,10 +204,6 @@ static cn_dbctl_t sccndbctl; static cn_term_t sccnterm; -#if __alpha__ -void sccnattach(void); -#endif - CONS_DRIVER(sc, sccnprobe, sccninit, sccnterm, sccngetc, sccncheckc, sccnputc, sccndbctl); @@ -1384,7 +1378,6 @@ static void sccnprobe(struct consdev *cp) { -#if !__alpha__ int unit; int flags; @@ -1402,22 +1395,11 @@ /* initialize required fields */ sprintf(cp->cn_name, "consolectl"); -#endif /* !__alpha__ */ - -#if __alpha__ - /* - * alpha use sccnattach() rather than cnprobe()/cninit()/cnterm() - * interface to install the console. Always return CN_DEAD from - * here. - */ - cp->cn_pri = CN_DEAD; -#endif /* __alpha__ */ } static void sccninit(struct consdev *cp) { -#if !__alpha__ int unit; int flags; @@ -1426,11 +1408,6 @@ sc_console_unit = unit; sc_console = sc_get_stat(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]); sc_consptr = cp; -#endif /* !__alpha__ */ - -#if __alpha__ - /* SHOULDN'T REACH HERE */ -#endif /* __alpha__ */ } static void @@ -1441,54 +1418,16 @@ if (sc_console_unit < 0) return; /* shouldn't happen */ -#if !__alpha__ #if 0 /* XXX */ sc_clear_screen(sc_console); sccnupdate(sc_console); #endif + scterm(sc_console_unit, SC_KERNEL_CONSOLE); sc_console_unit = -1; sc_console = NULL; -#endif /* !__alpha__ */ - -#if __alpha__ - /* do nothing XXX */ -#endif /* __alpha__ */ } -#ifdef __alpha__ - -void -sccnattach(void) -{ - static struct consdev consdev; - int unit; - int flags; - - bcopy(&sc_consdev, &consdev, sizeof(sc_consdev)); - consdev.cn_pri = sc_get_cons_priority(&unit, &flags); - - /* a video card is always required */ - if (!scvidprobe(unit, flags, TRUE)) - consdev.cn_pri = CN_DEAD; - - /* alpha doesn't allow the console being without a keyboard... Why? */ - if (!sckbdprobe(unit, flags, TRUE)) - consdev.cn_pri = CN_DEAD; - - if (consdev.cn_pri == CN_DEAD) - return; - - scinit(unit, flags | SC_KERNEL_CONSOLE); - sc_console_unit = unit; - sc_consptr = &consdev; - sc_console = sc_get_stat(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]); - sprintf(consdev.cn_name, "ttyv%r", 0); - cnadd(&consdev); -} - -#endif /* __alpha__ */ - static void sccnputc(struct consdev *cd, int c) { @@ -2853,7 +2792,6 @@ sc->flags |= SC_INIT_DONE; } -#if !__alpha__ static void scterm(int unit, int flags) { @@ -2909,7 +2847,6 @@ sc->keyboard = -1; sc->adapter = -1; } -#endif /* !__alpha__ */ static void scshutdown(void *arg, int howto) From owner-p4-projects@FreeBSD.ORG Mon May 24 18:26:11 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93C9016A4D1; Mon, 24 May 2004 18:26:11 -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 6250016A4CE for ; Mon, 24 May 2004 18:26:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58C2843D4C for ; Mon, 24 May 2004 18:26:11 -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.11/8.12.11) with ESMTP id i4P1Q6ox002296 for ; Mon, 24 May 2004 18:26:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4P1Q6sF002293 for perforce@freebsd.org; Mon, 24 May 2004 18:26:06 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 May 2004 18:26:06 -0700 (PDT) Message-Id: <200405250126.i4P1Q6sF002293@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 53440 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, 25 May 2004 01:26:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=53440 Change 53440 by rwatson@rwatson_paprika on 2004/05/24 18:25:23 Integrate netperf_socket forward to FreeBSD CVS HEAD. Changes include: - bde fixes more of amd64 profiling - PCI changes to avoid writing to read-only registers. - ISP driver grows target mode. Affected files ... .. //depot/projects/netperf_socket/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/netperf_socket/sys/amd64/ia32/ia32_exception.S#3 integrate .. //depot/projects/netperf_socket/sys/amd64/isa/atpic_vector.S#4 integrate .. //depot/projects/netperf_socket/sys/conf/files.amd64#8 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_inline.h#2 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/netperf_socket/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/netperf_socket/sys/dev/musycc/musycc.c#3 integrate .. //depot/projects/netperf_socket/sys/dev/pcf/pcf.c#1 branch .. //depot/projects/netperf_socket/sys/dev/pci/pci.c#7 integrate .. //depot/projects/netperf_socket/sys/dev/re/if_re.c#7 integrate .. //depot/projects/netperf_socket/sys/i386/i386/mptable.c#3 integrate .. //depot/projects/netperf_socket/sys/net/if_ef.c#2 integrate .. //depot/projects/netperf_socket/sys/netgraph/ng_hole.c#3 integrate .. //depot/projects/netperf_socket/sys/pci/if_rl.c#9 integrate .. //depot/projects/netperf_socket/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/netperf_socket/sys/sys/mbuf.h#9 integrate Differences ... ==== //depot/projects/netperf_socket/sys/amd64/amd64/apic_vector.S#4 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.99 2004/05/23 16:23:29 bde Exp $ + * $FreeBSD: src/sys/amd64/amd64/apic_vector.S,v 1.100 2004/05/24 12:08:56 bde Exp $ */ /* @@ -129,7 +129,6 @@ iretq -MCOUNT_LABEL(bintr2) ISR_VEC(1, apic_isr1) ISR_VEC(2, apic_isr2) ISR_VEC(3, apic_isr3) @@ -137,7 +136,6 @@ ISR_VEC(5, apic_isr5) ISR_VEC(6, apic_isr6) ISR_VEC(7, apic_isr7) -MCOUNT_LABEL(eintr2) #ifdef SMP /* ==== //depot/projects/netperf_socket/sys/amd64/amd64/exception.S#4 (text+ko) ==== @@ -27,9 +27,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.117 2004/05/23 17:18:48 bde Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.119 2004/05/24 12:42:16 bde Exp $ */ +#include "opt_atpic.h" +#include "opt_ia32.h" + #include #include #include @@ -294,8 +297,44 @@ MEXITCOUNT jmp doreti /* Handle any ASTs */ +/* + * To efficiently implement classification of trap and interrupt handlers + * for profiling, there must be only trap handlers between the labels btrap + * and bintr, and only interrupt handlers between the labels bintr and + * eintr. This is implemented (partly) by including files that contain + * some of the handlers. Before including the files, set up a normal asm + * environment so that the included files doen't need to know that they are + * included. + */ + +#ifdef IA32 + .data + .p2align 4 + .text + SUPERALIGN_TEXT + +#include +#endif + + .data + .p2align 4 + .text + SUPERALIGN_TEXT +MCOUNT_LABEL(bintr) + +#include + +#ifdef DEV_ATPIC .data - ALIGN_DATA + .p2align 4 + .text + SUPERALIGN_TEXT + +#include +#endif + + .text +MCOUNT_LABEL(eintr) /* * void doreti(struct trapframe) @@ -304,7 +343,6 @@ */ .text SUPERALIGN_TEXT - .globl doreti .type doreti,@function doreti: FAKE_MCOUNT($bintr) /* init "from" bintr -> doreti */ ==== //depot/projects/netperf_socket/sys/amd64/ia32/ia32_exception.S#3 (text+ko) ==== @@ -23,16 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.3 2004/05/23 19:06:15 bde Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_exception.S,v 1.4 2004/05/24 11:28:11 bde Exp $ */ #include #include "assym.s" -#define IDTVEC(name) ALIGN_TEXT; .globl __CONCAT(X,name); \ - .type __CONCAT(X,name),@function; __CONCAT(X,name): - .text /* * Call gate entry for FreeBSD ELF and Linux/NetBSD syscall (int 0x80) ==== //depot/projects/netperf_socket/sys/amd64/isa/atpic_vector.S#4 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.44 2004/05/23 16:23:29 bde Exp $ + * $FreeBSD: src/sys/amd64/isa/atpic_vector.S,v 1.45 2004/05/24 12:08:56 bde Exp $ */ /* @@ -72,7 +72,6 @@ MEXITCOUNT ; \ jmp doreti -MCOUNT_LABEL(bintr) INTR(0, atpic_intr0) INTR(1, atpic_intr1) INTR(2, atpic_intr2) @@ -89,4 +88,3 @@ INTR(13, atpic_intr13) INTR(14, atpic_intr14) INTR(15, atpic_intr15) -MCOUNT_LABEL(eintr) ==== //depot/projects/netperf_socket/sys/conf/files.amd64#8 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.35 2004/05/23 18:38:27 bde Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.37 2004/05/24 12:08:56 bde Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -41,7 +41,7 @@ amd64/acpica/madt.c optional acpi amd64/amd64/amd64-gdbstub.c optional ddb amd64/amd64/amd64_mem.c standard -amd64/amd64/apic_vector.S standard +#amd64/amd64/apic_vector.S standard amd64/amd64/atomic.c standard amd64/amd64/autoconf.c standard amd64/amd64/busdma_machdep.c standard @@ -69,8 +69,8 @@ amd64/amd64/mptable.c optional mptable amd64/amd64/mptable_pci.c optional mptable pci amd64/amd64/nexus.c standard +amd64/amd64/pmap.c standard amd64/amd64/prof_machdep.c optional profiling-routine -amd64/amd64/pmap.c standard amd64/amd64/sigtramp.S standard amd64/amd64/support.S standard amd64/amd64/sys_machdep.c standard @@ -80,7 +80,7 @@ amd64/amd64/uma_machdep.c standard amd64/amd64/vm_machdep.c standard amd64/isa/atpic.c optional atpic isa -amd64/isa/atpic_vector.S optional atpic isa +#amd64/isa/atpic_vector.S optional atpic isa amd64/isa/clock.c standard amd64/isa/elcr.c standard amd64/isa/isa.c standard @@ -88,11 +88,11 @@ amd64/isa/nmi.c standard amd64/pci/pci_bus.c optional pci amd64/pci/pci_cfgreg.c optional pci +crypto/blowfish/bf_enc.c optional crypto crypto/blowfish/bf_enc.c optional ipsec ipsec_esp +crypto/des/des_ecb.c optional netsmbcrypto +crypto/des/des_enc.c optional crypto crypto/des/des_enc.c optional ipsec ipsec_esp -crypto/blowfish/bf_enc.c optional crypto -crypto/des/des_enc.c optional crypto -crypto/des/des_ecb.c optional netsmbcrypto crypto/des/des_enc.c optional netsmbcrypto crypto/des/des_setkey.c optional netsmbcrypto dev/fb/fb.c optional fb @@ -140,7 +140,7 @@ # # IA32 binary support # -amd64/ia32/ia32_exception.S optional ia32 +#amd64/ia32/ia32_exception.S optional ia32 amd64/ia32/ia32_signal.c optional ia32 amd64/ia32/ia32_sigtramp.S optional ia32 amd64/ia32/ia32_syscall.c optional ia32 ==== //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#6 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.67 2004/05/23 16:11:45 mux Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.68 2004/05/24 04:46:54 ps Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -148,6 +148,8 @@ "Broadcom BCM5704S Dual Gigabit Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5705, "Broadcom BCM5705 Gigabit Ethernet" }, + { BCOM_VENDORID, BCOM_DEVICEID_BCM5705K, + "Broadcom BCM5705K Gigabit Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5705M, "Broadcom BCM5705M Gigabit Ethernet" }, { BCOM_VENDORID, BCOM_DEVICEID_BCM5705M_ALT, ==== //depot/projects/netperf_socket/sys/dev/bge/if_bgereg.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.26 2004/01/08 17:19:11 wpaul Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.27 2004/05/24 04:46:54 ps Exp $ */ /* @@ -1819,6 +1819,7 @@ #define BCOM_DEVICEID_BCM5704C 0x1648 #define BCOM_DEVICEID_BCM5704S 0x16A8 #define BCOM_DEVICEID_BCM5705 0x1653 +#define BCOM_DEVICEID_BCM5705K 0x1654 #define BCOM_DEVICEID_BCM5705M 0x165D #define BCOM_DEVICEID_BCM5705M_ALT 0x165E #define BCOM_DEVICEID_BCM5782 0x1696 ==== //depot/projects/netperf_socket/sys/dev/cp/if_cp.c#2 (text+ko) ==== @@ -22,7 +22,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.1 2004/05/05 16:11:45 rik Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cp/if_cp.c,v 1.2 2004/05/24 19:39:56 jhb Exp $"); #include @@ -368,7 +368,7 @@ #else bd->board = b; b->sys = bd; - rid = PCIR_MAPS; + rid = PCIR_BAR(0); bd->cp_res = bus_alloc_resource (dev, SYS_RES_MEMORY, &rid, 0, ~0, 1, RF_ACTIVE); if (! bd->cp_res) { @@ -384,7 +384,7 @@ if (res) { printf ("cp%d: can't init, error code:%x\n", unit, res); #if __FreeBSD_version >= 400000 - bus_release_resource (dev, SYS_RES_MEMORY, PCIR_MAPS, bd->cp_res); + bus_release_resource (dev, SYS_RES_MEMORY, PCIR_BAR(0), bd->cp_res); #endif free (b, M_DEVBUF); splx (s); @@ -418,7 +418,7 @@ if (! bd->cp_irq) { printf ("cp%d: cannot map interrupt\n", unit); bus_release_resource (dev, SYS_RES_MEMORY, - PCIR_MAPS, bd->cp_res); + PCIR_BAR(0), bd->cp_res); free (b, M_DEVBUF); splx (s); return (ENXIO); @@ -428,7 +428,7 @@ if (error) { printf ("cp%d: cannot set up irq\n", unit); bus_release_resource (dev, SYS_RES_MEMORY, - PCIR_MAPS, bd->cp_res); + PCIR_BAR(0), bd->cp_res); bus_release_resource (dev, SYS_RES_IRQ, 0, bd->cp_irq); free (b, M_DEVBUF); splx (s); @@ -601,7 +601,7 @@ bus_teardown_intr (dev, bd->cp_irq, bd->cp_intrhand); bus_deactivate_resource (dev, SYS_RES_IRQ, 0, bd->cp_irq); bus_release_resource (dev, SYS_RES_IRQ, 0, bd->cp_irq); - bus_release_resource (dev, SYS_RES_MEMORY, PCIR_MAPS, bd->cp_res); + bus_release_resource (dev, SYS_RES_MEMORY, PCIR_BAR(0), bd->cp_res); cp_led_off (b); if (led_timo[b->num].callout) untimeout (cp_led_off, b, led_timo[b->num]); ==== //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.207 2004/05/23 21:05:07 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.208 2004/05/24 18:31:56 mux Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -864,8 +864,8 @@ int i; mtx_assert(&sc->sc_mtx, MA_NOTOWNED); - if (sc->ih) - panic("fxp_release() called with intr handle still active"); + KASSERT(sc->ih == NULL, + ("fxp_release() called with intr handle still active")); if (sc->miibus) device_delete_child(sc->dev, sc->miibus); bus_generic_detach(sc->dev); ==== //depot/projects/netperf_socket/sys/dev/isp/isp.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.110 2004/02/07 03:42:17 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.111 2004/05/24 07:02:24 njl Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -5843,7 +5843,7 @@ isp_reinit(struct ispsoftc *isp) { XS_T *xs; - u_int16_t handle; + int i; if (IS_FC(isp)) { isp_mark_getpdb_all(isp); @@ -5863,11 +5863,13 @@ } isp->isp_nactive = 0; - for (handle = 1; (int) handle <= isp->isp_maxcmds; handle++) { - xs = isp_find_xs(isp, handle); + for (i = 0; i < isp->isp_maxcmds; i++) { + u_int16_t handle; + xs = isp->isp_xflist[i]; if (xs == NULL) { continue; } + handle = isp_index_handle(i); isp_destroy_handle(isp, handle); if (XS_XFRLEN(xs)) { ISP_DMAFREE(isp, xs, handle); ==== //depot/projects/netperf_socket/sys/dev/isp/isp_freebsd.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.100 2004/02/21 21:10:43 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_freebsd.c,v 1.101 2004/05/24 07:02:25 njl Exp $"); #include #include @@ -545,6 +545,7 @@ static int isp_handle_platform_atio(struct ispsoftc *, at_entry_t *); static int isp_handle_platform_atio2(struct ispsoftc *, at2_entry_t *); static int isp_handle_platform_ctio(struct ispsoftc *, void *); +static void isp_handle_platform_ctio_fastpost(struct ispsoftc *, u_int32_t); static int isp_handle_platform_notify_scsi(struct ispsoftc *, in_entry_t *); static int isp_handle_platform_notify_fc(struct ispsoftc *, in_fcentry_t *); @@ -1272,7 +1273,7 @@ hp = &cto->ct_syshandle; } - if (isp_save_xs(isp, (XS_T *)ccb, hp)) { + if (isp_save_xs_tgt(isp, ccb, hp)) { xpt_print_path(ccb->ccb_h.path); printf("No XFLIST pointers for isp_target_start_ctio\n"); return (CAM_RESRC_UNAVAIL); @@ -1297,11 +1298,11 @@ case CMD_EAGAIN: ccb->ccb_h.status = CAM_RESRC_UNAVAIL; - isp_destroy_handle(isp, save_handle); + isp_destroy_tgt_handle(isp, save_handle); return (CAM_RESRC_UNAVAIL); default: - isp_destroy_handle(isp, save_handle); + isp_destroy_tgt_handle(isp, save_handle); return (XS_ERR(ccb)); } } @@ -1637,9 +1638,9 @@ * CTIO and CTIO2 are close enough.... */ - ccb = (union ccb *) isp_find_xs(isp, ((ct_entry_t *)arg)->ct_syshandle); + ccb = isp_find_xs_tgt(isp, ((ct_entry_t *)arg)->ct_syshandle); KASSERT((ccb != NULL), ("null ccb in isp_handle_platform_ctio")); - isp_destroy_handle(isp, ((ct_entry_t *)arg)->ct_syshandle); + isp_destroy_tgt_handle(isp, ((ct_entry_t *)arg)->ct_syshandle); if (IS_FC(isp)) { ct2_entry_t *ct = arg; @@ -1734,6 +1735,19 @@ return (0); } +static void +isp_handle_platform_ctio_fastpost(struct ispsoftc *isp, u_int32_t token) +{ + union ccb *ccb; + ccb = isp_find_xs_tgt(isp, token & 0xffff); + KASSERT((ccb != NULL), + ("null ccb in isp_handle_platform_ctio_fastpost")); + isp_destroy_tgt_handle(isp, token & 0xffff); + isp_prt(isp, ISP_LOGTDEBUG1, "CTIOx[%x] fastpost complete", + token & 0xffff); + isp_complete_ctio(ccb); +} + static int isp_handle_platform_notify_scsi(struct ispsoftc *isp, in_entry_t *inp) { @@ -3019,6 +3033,15 @@ case ISPASYNC_TARGET_EVENT: { tmd_event_t *ep = arg; + if (ep->ev_event == ASYNC_CTIO_DONE) { + /* + * ACK the interrupt first + */ + ISP_WRITE(isp, BIU_SEMA, 0); + ISP_WRITE(isp, HCCR, HCCR_CMD_CLEAR_RISC_INT); + isp_handle_platform_ctio_fastpost(isp, ep->ev_bus); + break; + } isp_prt(isp, ISP_LOGALL, "bus %d event code 0x%x", ep->ev_bus, ep->ev_event); break; ==== //depot/projects/netperf_socket/sys/dev/isp/isp_inline.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.29 2003/09/13 01:57:31 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_inline.h,v 1.30 2004/05/24 07:02:25 njl Exp $ */ /* * Qlogic Host Adapter Inline Functions * @@ -43,8 +43,8 @@ static INLINE XS_T *isp_find_xs(struct ispsoftc *, u_int16_t); static INLINE u_int16_t isp_find_handle(struct ispsoftc *, XS_T *); static INLINE int isp_handle_index(u_int16_t); +static INLINE u_int16_t isp_index_handle(int); static INLINE void isp_destroy_handle(struct ispsoftc *, u_int16_t); -static INLINE void isp_remove_handle(struct ispsoftc *, XS_T *); static INLINE int isp_save_xs(struct ispsoftc *isp, XS_T *xs, u_int16_t *handlep) @@ -100,19 +100,76 @@ return (handle-1); } +static INLINE u_int16_t +isp_index_handle(int index) +{ + return (index+1); +} + static INLINE void isp_destroy_handle(struct ispsoftc *isp, u_int16_t handle) { if (handle > 0 && handle <= (u_int16_t) isp->isp_maxcmds) { - isp->isp_xflist[isp_handle_index(handle)] = NULL; + isp->isp_xflist[handle - 1] = NULL; + } +} + +#ifdef ISP_TARGET_MODE +static INLINE int isp_save_xs_tgt(struct ispsoftc *, void *, u_int16_t *); +static INLINE void *isp_find_xs_tgt(struct ispsoftc *, u_int16_t); +static INLINE void isp_destroy_tgt_handle(struct ispsoftc *, u_int16_t); + +static INLINE int +isp_save_xs_tgt(struct ispsoftc *isp, void *xs, u_int16_t *handlep) +{ + int i; + + for (i = 0; i < (int) isp->isp_maxcmds; i++) { + if (isp->isp_tgtlist[i] == NULL) { + break; + } + } + if (i == isp->isp_maxcmds) { + return (-1); + } + isp->isp_tgtlist[i] = xs; + *handlep = i+1; + return (0); +} + +static INLINE void * +isp_find_xs_tgt(struct ispsoftc *isp, u_int16_t handle) +{ + if (handle < 1 || handle > (u_int16_t) isp->isp_maxcmds) { + return (NULL); + } else { + return (isp->isp_tgtlist[handle - 1]); + } +} + +static INLINE u_int16_t +isp_find_tgt_handle(struct ispsoftc *isp, void *xs) +{ + int i; + if (xs != NULL) { + for (i = 0; i < isp->isp_maxcmds; i++) { + if (isp->isp_tgtlist[i] == xs) { + return ((u_int16_t) i+1); + } + } } + return (0); } static INLINE void -isp_remove_handle(struct ispsoftc *isp, XS_T *xs) +isp_destroy_tgt_handle(struct ispsoftc *isp, u_int16_t handle) { - isp_destroy_handle(isp, isp_find_handle(isp, xs)); + if (handle > 0 && handle <= (u_int16_t) isp->isp_maxcmds) { + isp->isp_tgtlist[handle - 1] = NULL; + } } +#endif + static INLINE int isp_getrqentry(struct ispsoftc *, u_int16_t *, u_int16_t *, void **); ==== //depot/projects/netperf_socket/sys/dev/isp/isp_pci.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.97 2004/03/17 17:50:36 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.98 2004/05/24 07:02:25 njl Exp $"); #include #include @@ -1113,11 +1113,23 @@ ISP_LOCK(isp); return (1); } +#ifdef ISP_TARGET_MODE + len = sizeof (void **) * isp->isp_maxcmds; + isp->isp_tgtlist = (void **) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO); + if (isp->isp_tgtlist == NULL) { + isp_prt(isp, ISP_LOGERR, "cannot alloc tgtlist array"); + ISP_LOCK(isp); + return (1); + } +#endif len = sizeof (bus_dmamap_t) * isp->isp_maxcmds; pcs->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF, M_WAITOK); if (pcs->dmaps == NULL) { isp_prt(isp, ISP_LOGERR, "can't alloc dma map storage"); free(isp->isp_xflist, M_DEVBUF); +#ifdef ISP_TARGET_MODE + free(isp->isp_tgtlist, M_DEVBUF); +#endif ISP_LOCK(isp); return (1); } @@ -1139,6 +1151,9 @@ "cannot create a dma tag for control spaces"); free(pcs->dmaps, M_DEVBUF); free(isp->isp_xflist, M_DEVBUF); +#ifdef ISP_TARGET_MODE + free(isp->isp_tgtlist, M_DEVBUF); +#endif ISP_LOCK(isp); return (1); } @@ -1149,6 +1164,9 @@ "cannot allocate %d bytes of CCB memory", len); bus_dma_tag_destroy(isp->isp_cdmat); free(isp->isp_xflist, M_DEVBUF); +#ifdef ISP_TARGET_MODE + free(isp->isp_tgtlist, M_DEVBUF); +#endif free(pcs->dmaps, M_DEVBUF); ISP_LOCK(isp); return (1); @@ -1189,6 +1207,9 @@ bus_dmamem_free(isp->isp_cdmat, base, isp->isp_cdmap); bus_dma_tag_destroy(isp->isp_cdmat); free(isp->isp_xflist, M_DEVBUF); +#ifdef ISP_TARGET_MODE + free(isp->isp_tgtlist, M_DEVBUF); +#endif free(pcs->dmaps, M_DEVBUF); ISP_LOCK(isp); isp->isp_rquest = NULL; ==== //depot/projects/netperf_socket/sys/dev/isp/isp_target.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp_target.c,v 1.29 2004/01/29 06:36:30 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp_target.c,v 1.30 2004/05/24 07:02:25 njl Exp $ */ /* * Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters. * @@ -882,7 +882,7 @@ char *fmsg = NULL; if (ct->ct_syshandle) { - xs = isp_find_xs(isp, ct->ct_syshandle); + xs = isp_find_xs_tgt(isp, ct->ct_syshandle); if (xs == NULL) pl = ISP_LOGALL; } else { @@ -1042,7 +1042,7 @@ char *fmsg = NULL; if (ct->ct_syshandle) { - xs = isp_find_xs(isp, ct->ct_syshandle); + xs = isp_find_xs_tgt(isp, ct->ct_syshandle); if (xs == NULL) pl = ISP_LOGALL; } else { ==== //depot/projects/netperf_socket/sys/dev/isp/ispvar.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.65 2004/03/12 21:45:27 trhodes Exp $ */ +/* $FreeBSD: src/sys/dev/isp/ispvar.h,v 1.66 2004/05/24 07:02:25 njl Exp $ */ /* * Soft Definitions for for Qlogic ISP SCSI adapters. * @@ -54,7 +54,7 @@ #endif #define ISP_CORE_VERSION_MAJOR 2 -#define ISP_CORE_VERSION_MINOR 7 +#define ISP_CORE_VERSION_MINOR 8 /* * Vector for bus specific code to provide specific services. @@ -426,6 +426,13 @@ */ XS_T **isp_xflist; +#ifdef ISP_TARGET_MODE + /* + * Active target commands are stored here, indexed by handle function. + */ + void **isp_tgtlist; +#endif + /* * request/result queue pointers and DMA handles for them. */ ==== //depot/projects/netperf_socket/sys/dev/musycc/musycc.c#3 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/musycc/musycc.c,v 1.31 2004/03/17 17:50:37 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/musycc/musycc.c,v 1.32 2004/05/24 20:45:53 julian Exp $"); /* * Card state machine: @@ -222,7 +222,7 @@ struct mdesc *mdt[NHDLC]; struct mdesc *mdr[NHDLC]; node_p node; /* NG node */ - char nodename[NG_NODELEN + 1]; /* NG nodename */ + char nodename[NG_NODESIZ]; /* NG nodename */ struct schan *chan[NHDLC]; u_long cnt_ferr; u_long cnt_cerr; ==== //depot/projects/netperf_socket/sys/dev/pci/pci.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/pci/pci.c,v 1.259 2004/05/21 19:47:55 imp Exp $ + * $FreeBSD: src/sys/dev/pci/pci.c,v 1.261 2004/05/24 17:41:05 imp Exp $ * */ @@ -183,15 +183,6 @@ "Power down devices into D3 state when no driver attaches to them.\n\ Otherwise, leave the device in D0 state when no driver attaches."); -/* - * Enable restoring all the registers, even the ones that are nominally - * read-only. If this causes problems for you, please report them to - * imp@freebsd.org and remove this line in your local tree. The problems - * would be seen if the device is transitioning from D3 to D0 or has ever - * made that transition under FreeBSD this boot. - */ -#define PCI_RESTORE_EXTRA - /* Find a device_t by bus/slot/function */ device_t @@ -1843,14 +1834,8 @@ pci_set_powerstate(dev, PCI_POWERSTATE_D0); } for (i = 0; i < dinfo->cfg.nummaps; i++) - pci_write_config(dev, PCIR_MAPS + i * 4, dinfo->cfg.bar[i], 4); + pci_write_config(dev, PCIR_BAR(i), dinfo->cfg.bar[i], 4); pci_write_config(dev, PCIR_BIOS, dinfo->cfg.bios, 4); -#ifdef PCI_RESTORE_EXTRA - pci_write_config(dev, PCIR_SUBVEND_0, dinfo->cfg.subvendor, 2); - pci_write_config(dev, PCIR_SUBDEV_0, dinfo->cfg.subdevice, 2); - pci_write_config(dev, PCIR_VENDOR, dinfo->cfg.vendor, 2); - pci_write_config(dev, PCIR_DEVICE, dinfo->cfg.device, 2); -#endif pci_write_config(dev, PCIR_COMMAND, dinfo->cfg.cmdreg, 2); pci_write_config(dev, PCIR_INTLINE, dinfo->cfg.intline, 1); pci_write_config(dev, PCIR_INTPIN, dinfo->cfg.intpin, 1); @@ -1858,11 +1843,7 @@ pci_write_config(dev, PCIR_MAXLAT, dinfo->cfg.maxlat, 1); pci_write_config(dev, PCIR_CACHELNSZ, dinfo->cfg.cachelnsz, 1); pci_write_config(dev, PCIR_LATTIMER, dinfo->cfg.lattimer, 1); -#ifdef PCI_RESTORE_EXTRA - pci_write_config(dev, PCIR_CLASS, dinfo->cfg.baseclass, 1); - pci_write_config(dev, PCIR_SUBCLASS, dinfo->cfg.subclass, 1); pci_write_config(dev, PCIR_PROGIF, dinfo->cfg.progif, 1); -#endif pci_write_config(dev, PCIR_REVID, dinfo->cfg.revid, 1); } @@ -1883,7 +1864,7 @@ if (dinfo->cfg.hdrtype != 0) return; for (i = 0; i < dinfo->cfg.nummaps; i++) - dinfo->cfg.bar[i] = pci_read_config(dev, PCIR_MAPS + i * 4, 4); + dinfo->cfg.bar[i] = pci_read_config(dev, PCIR_BAR(i), 4); dinfo->cfg.bios = pci_read_config(dev, PCIR_BIOS, 4); /* ==== //depot/projects/netperf_socket/sys/dev/re/if_re.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.22 2004/05/23 21:05:08 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.23 2004/05/24 19:39:23 jhb Exp $"); /* * RealTek 8139C+/8169/8169S/8110S PCI NIC driver @@ -2420,19 +2420,23 @@ re_suspend(dev) device_t dev; { +#ifndef BURN_BRIDGES register int i; +#endif struct rl_softc *sc; sc = device_get_softc(dev); re_stop(sc); +#ifndef BURN_BRIDGES for (i = 0; i < 5; i++) sc->saved_maps[i] = pci_read_config(dev, PCIR_MAPS + i * 4, 4); sc->saved_biosaddr = pci_read_config(dev, PCIR_BIOS, 4); sc->saved_intline = pci_read_config(dev, PCIR_INTLINE, 1); sc->saved_cachelnsz = pci_read_config(dev, PCIR_CACHELNSZ, 1); sc->saved_lattimer = pci_read_config(dev, PCIR_LATTIMER, 1); +#endif sc->suspended = 1; @@ -2448,13 +2452,16 @@ re_resume(dev) device_t dev; { +#ifndef BURN_BRIDGES register int i; +#endif struct rl_softc *sc; struct ifnet *ifp; sc = device_get_softc(dev); ifp = &sc->arpcom.ac_if; +#ifndef BURN_BRIDGES /* better way to do this? */ for (i = 0; i < 5; i++) pci_write_config(dev, PCIR_MAPS + i * 4, sc->saved_maps[i], 4); @@ -2466,6 +2473,7 @@ /* reenable busmastering */ pci_enable_busmaster(dev); pci_enable_io(dev, RL_RES); +#endif /* reinitialize interface if necessary */ if (ifp->if_flags & IFF_UP) ==== //depot/projects/netperf_socket/sys/i386/i386/mptable.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.232 2004/05/10 18:49:58 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.233 2004/05/24 15:51:46 jhb Exp $"); #include "opt_mptable_force_htt.h" #include @@ -549,17 +549,10 @@ KASSERT(src_bus <= mptable_maxbusid, ("bus id %d too large", src_bus)); switch (busses[src_bus].bus_type) { case ISA: + case EISA: return (INTR_POLARITY_HIGH); case PCI: return (INTR_POLARITY_LOW); -#ifndef PC98 - case EISA: - KASSERT(src_bus_irq < 16, ("Invalid EISA IRQ %d", src_bus_irq)); - if (elcr_read_trigger(src_bus_irq) == INTR_TRIGGER_LEVEL) - return (INTR_POLARITY_LOW); - else - return (INTR_POLARITY_HIGH); -#endif default: panic("%s: unknown bus type %d", __func__, busses[src_bus].bus_type); ==== //depot/projects/netperf_socket/sys/net/if_ef.c#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/net/if_ef.c,v 1.28 2003/12/28 03:55:59 sam Exp $ + * $FreeBSD: src/sys/net/if_ef.c,v 1.29 2004/05/24 11:01:45 mux Exp $ */ #include "opt_inet.h" @@ -120,7 +120,6 @@ struct ifaddr *ifa2; struct sockaddr_dl *sdl2; - ifp->if_output = ether_output; ifp->if_start = ef_start; ifp->if_watchdog = NULL; ifp->if_init = ef_init; ==== //depot/projects/netperf_socket/sys/netgraph/ng_hole.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ * * Author: Julian Elisher * - * $FreeBSD: src/sys/netgraph/ng_hole.c,v 1.11 2004/05/19 11:26:33 ru Exp $ + * $FreeBSD: src/sys/netgraph/ng_hole.c,v 1.12 2004/05/24 20:41:40 julian Exp $ * $Whistle: ng_hole.c,v 1.10 1999/11/01 09:24:51 julian Exp $ */ @@ -162,7 +162,7 @@ case NGM_HOLE_CLR_STATS: case NGM_HOLE_GETCLR_STATS: /* Sanity check. */ - if (msg->header.arglen != NG_HOOKLEN + 1) { + if (msg->header.arglen != NG_HOOKSIZ) { error = EINVAL; break; } ==== //depot/projects/netperf_socket/sys/pci/if_rl.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.136 2004/05/23 21:05:07 yar Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.137 2004/05/24 19:39:23 jhb Exp $"); /* * RealTek 8129/8139 PCI NIC driver @@ -1916,19 +1916,23 @@ rl_suspend(dev) device_t dev; { +#ifndef BURN_BRIDGES register int i; +#endif struct rl_softc *sc; sc = device_get_softc(dev); rl_stop(sc); +#ifndef BURN_BRIDGES for (i = 0; i < 5; i++) sc->saved_maps[i] = pci_read_config(dev, PCIR_MAPS + i * 4, 4); sc->saved_biosaddr = pci_read_config(dev, PCIR_BIOS, 4); sc->saved_intline = pci_read_config(dev, PCIR_INTLINE, 1); sc->saved_cachelnsz = pci_read_config(dev, PCIR_CACHELNSZ, 1); sc->saved_lattimer = pci_read_config(dev, PCIR_LATTIMER, 1); +#endif sc->suspended = 1; @@ -1944,13 +1948,16 @@ rl_resume(dev) device_t dev; { +#ifndef BURN_BRIDGES register int i; +#endif struct rl_softc *sc; struct ifnet *ifp; sc = device_get_softc(dev); ifp = &sc->arpcom.ac_if; +#ifndef BURN_BRIDGES /* better way to do this? */ for (i = 0; i < 5; i++) pci_write_config(dev, PCIR_MAPS + i * 4, sc->saved_maps[i], 4); @@ -1962,6 +1969,7 @@ /* reenable busmastering */ pci_enable_busmaster(dev); pci_enable_io(dev, RL_RES); +#endif /* reinitialize interface if necessary */ if (ifp->if_flags & IFF_UP) ==== //depot/projects/netperf_socket/sys/pci/if_rlreg.h#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 26 16:49:02 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D87D16A4D0; Wed, 26 May 2004 16:49:02 -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 F1DD016A4CE for ; Wed, 26 May 2004 16:49:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D3B3B43D1F for ; Wed, 26 May 2004 16:49:01 -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.11/8.12.11) with ESMTP id i4QNm5q7003050 for ; Wed, 26 May 2004 16:48:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4QNm5Dl003047 for perforce@freebsd.org; Wed, 26 May 2004 16:48:05 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 16:48:05 -0700 (PDT) Message-Id: <200405262348.i4QNm5Dl003047@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 53565 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: Wed, 26 May 2004 23:49:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=53565 Change 53565 by rwatson@rwatson_paprika on 2004/05/26 16:47:46 Import Apple bsm-2.10: BSM utilities, library, configuration, and test tools under a Berkeley-style license. This bsm drop corresponds to Mac OS X 10.3.4. Affected files ... .. //depot/projects/trustedbsd/audit2/contrib/bsm/Makefile#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/bin/Makefile#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/bin/auditreduce.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/bin/auditreduce.h#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/bin/praudit.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/etc/Makefile#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/etc/audit_class#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/etc/audit_control#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/etc/audit_event#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/etc/audit_user#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/etc/audit_warn#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/Makefile#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/audit_uevents.h#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/bsm_audit.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/bsm_class.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/bsm_control.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/bsm_event.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/bsm_flags.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/bsm_io.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/bsm_mask.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/bsm_notify.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/bsm_token.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/bsm_user.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/lib_wrappers.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/libbsm.h#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/man/Makefile#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/man/audit_class.5#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/man/audit_control.5#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/man/audit_event.5#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/man/audit_user.5#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/man/audit_warn.5#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/man/auditreduce.1#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/man/praudit.1#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/test/Makefile#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/test/bsm_lib_test.c#1 add .. //depot/projects/trustedbsd/audit2/contrib/bsm/test/bsm_tok_test.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 26 16:57:47 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 04D1716A4D0; Wed, 26 May 2004 16:57:47 -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 85DB516A4CF for ; Wed, 26 May 2004 16:57:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6688D43D3F for ; Wed, 26 May 2004 16:57:46 -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.11/8.12.11) with ESMTP id i4QNvHkW005011 for ; Wed, 26 May 2004 16:57:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4QNvHEL005008 for perforce@freebsd.org; Wed, 26 May 2004 16:57:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 16:57:17 -0700 (PDT) Message-Id: <200405262357.i4QNvHEL005008@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 53566 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: Wed, 26 May 2004 23:57:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=53566 Change 53566 by rwatson@rwatson_paprika on 2004/05/26 16:56:36 First pass at Makefile to build libbsm from its contrib location. At least two concerns to address in the short term: - It doesn't build on FreeBSD yet. - It is installing include files into /usr/include instead of /usr/include/bsm. Both to be corrected shortly. Affected files ... .. //depot/projects/trustedbsd/audit2/lib/libbsm/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 26 17:12:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57A3516A4D0; Wed, 26 May 2004 17:12:01 -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 2DD0416A4CE for ; Wed, 26 May 2004 17:12:01 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0EC8A43D46 for ; Wed, 26 May 2004 17:12:01 -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.11/8.12.11) with ESMTP id i4R0Bafu009109 for ; Wed, 26 May 2004 17:11:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R0BZEP009103 for perforce@freebsd.org; Wed, 26 May 2004 17:11:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 17:11:35 -0700 (PDT) Message-Id: <200405270011.i4R0BZEP009103@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 53567 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: Thu, 27 May 2004 00:12:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=53567 Change 53567 by rwatson@rwatson_paprika on 2004/05/26 17:10:50 Makefile template for praudit. Not sure how to deal with Apple placing man pages in another subdirectory than the source, but I'm sure I'll find a model in usr.bin or usr.sbin somewhere. Affected files ... .. //depot/projects/trustedbsd/audit2/usr.sbin/praudit/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 26 17:13:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F9A316A4D0; Wed, 26 May 2004 17:13:09 -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 38FBF16A4CE for ; Wed, 26 May 2004 17:13:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B0BA43D31 for ; Wed, 26 May 2004 17:13:09 -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.11/8.12.11) with ESMTP id i4R0CcZd009913 for ; Wed, 26 May 2004 17:12:38 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R0CbSj009910 for perforce@freebsd.org; Wed, 26 May 2004 17:12:37 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 17:12:37 -0700 (PDT) Message-Id: <200405270012.i4R0CbSj009910@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 53568 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: Thu, 27 May 2004 00:13:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=53568 Change 53568 by rwatson@rwatson_paprika on 2004/05/26 17:12:11 Add template Makefile for auditreduce. Similar problems to praudit template. Affected files ... .. //depot/projects/trustedbsd/audit2/usr.sbin/auditreduce/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 26 17:26:39 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D99516A4D0; Wed, 26 May 2004 17:26:39 -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 51C2C16A4CE for ; Wed, 26 May 2004 17:26:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B03A43D3F for ; Wed, 26 May 2004 17:26:39 -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.11/8.12.11) with ESMTP id i4R0PsaK012012 for ; Wed, 26 May 2004 17:25:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R0Ps33012009 for perforce@freebsd.org; Wed, 26 May 2004 17:25:54 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 17:25:54 -0700 (PDT) Message-Id: <200405270025.i4R0Ps33012009@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 53569 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: Thu, 27 May 2004 00:26:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=53569 Change 53569 by rwatson@rwatson_paprika on 2004/05/26 17:25:39 Add /usr/include/bsm and /etc/security to the mtree definitions. Note that /etc/security used to be a file, and is now a directory, so this may be a conflict that somehow has to be handled. Note also that /etc/security is used by SELinux/SEBSD/ SEDarwin, and may also be somewhat in conflict. Affected files ... .. //depot/projects/trustedbsd/audit2/etc/mtree/BSD.include.dist#3 edit .. //depot/projects/trustedbsd/audit2/etc/mtree/BSD.root.dist#2 edit Differences ... ==== //depot/projects/trustedbsd/audit2/etc/mtree/BSD.include.dist#3 (text+ko) ==== @@ -7,6 +7,8 @@ . arpa .. + bsm + .. bsnmp .. c++ ==== //depot/projects/trustedbsd/audit2/etc/mtree/BSD.root.dist#2 (text+ko) ==== @@ -54,6 +54,8 @@ .. rc.d .. + security + .. skel .. ssh From owner-p4-projects@FreeBSD.ORG Wed May 26 18:04:31 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 882DC16A4D0; Wed, 26 May 2004 18:04:31 -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 5DAA216A4CE for ; Wed, 26 May 2004 18:04:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 40C8143D39 for ; Wed, 26 May 2004 18:04:31 -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.11/8.12.11) with ESMTP id i4R13fYc020981 for ; Wed, 26 May 2004 18:03:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R13fAs020978 for perforce@freebsd.org; Wed, 26 May 2004 18:03:41 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 18:03:41 -0700 (PDT) Message-Id: <200405270103.i4R13fAs020978@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 53571 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: Thu, 27 May 2004 01:04:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=53571 Change 53571 by rwatson@rwatson_paprika on 2004/05/26 18:02:53 Makefile to install /etc BSM-related files. Affected files ... .. //depot/projects/trustedbsd/audit2/etc/security/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed May 26 18:47:04 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74DF516A4D0; Wed, 26 May 2004 18:47:04 -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 4DCDD16A4CE for ; Wed, 26 May 2004 18:47:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46D1743D1F for ; Wed, 26 May 2004 18:47:04 -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.11/8.12.11) with ESMTP id i4R1ka4t029268 for ; Wed, 26 May 2004 18:46:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R1kaU8029265 for perforce@freebsd.org; Wed, 26 May 2004 18:46:36 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 18:46:36 -0700 (PDT) Message-Id: <200405270146.i4R1kaU8029265@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 53575 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: Thu, 27 May 2004 01:47:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=53575 Change 53575 by rwatson@rwatson_paprika on 2004/05/26 18:46:13 Add the contrib/bsm/man directory to the build source for praudit and auditreduce. Affected files ... .. //depot/projects/trustedbsd/audit2/usr.sbin/auditreduce/Makefile#2 edit .. //depot/projects/trustedbsd/audit2/usr.sbin/praudit/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/audit2/usr.sbin/auditreduce/Makefile#2 (text+ko) ==== @@ -1,14 +1,9 @@ # $FreeBSD$ -BSMBINDIR= ${.CURDIR}/../../contrib/bsm/bin -.PATH: {$BSMBINDIR} +BSMDIR= ${.CURDIR}/../../contrib/bsm +.PATH: ${BSMDIR}/bin ${BSMDIR}/man PROG= auditreduce LDADD= -lbsm -# -# There are man pages, but they're in bsm/man, and I'm not sure how to -# get bsd.bin.mk to do the right thing yet. -# -NOMAN= true .include ==== //depot/projects/trustedbsd/audit2/usr.sbin/praudit/Makefile#2 (text+ko) ==== @@ -1,14 +1,9 @@ # $FreeBSD$ -BSMBINDIR= ${.CURDIR}/../../contrib/bsm/bin -.PATH: {$BSMBINDIR} +BSMDIR= ${.CURDIR}/../../contrib/bsm +.PATH: ${BSMDIR}/bin ${BSMDIR}/man PROG= praudit LDADD= -lbsm -# -# There are man pages, but they're in bsm/man, and I'm not sure how to -# get bsd.bin.mk to do the right thing yet. -# -NOMAN= true .include From owner-p4-projects@FreeBSD.ORG Wed May 26 19:03:43 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33E3B16A4D0; Wed, 26 May 2004 19:03:43 -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 087F516A4CE for ; Wed, 26 May 2004 19:03:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 016CC43D3F for ; Wed, 26 May 2004 19:03:43 -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.11/8.12.11) with ESMTP id i4R22uUF033146 for ; Wed, 26 May 2004 19:02:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R22uqx033143 for perforce@freebsd.org; Wed, 26 May 2004 19:02:56 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 19:02:56 -0700 (PDT) Message-Id: <200405270202.i4R22uqx033143@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 53576 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: Thu, 27 May 2004 02:03:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=53576 Change 53576 by rwatson@rwatson_paprika on 2004/05/26 19:01:56 Update CFLAGS. Affected files ... .. //depot/projects/trustedbsd/audit2/lib/libbsm/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/audit2/lib/libbsm/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD$ -LIBBSMDIR= ${.CURDIR}/../../contrib/bsm/lib -.PATH: ${LIBBSMDIR} +BSMDIR= ${.CURDIR}/../../contrib/bsm +.PATH: ${BSMDIR}/lib ${BSMDIR}/man LIB= bsm SHLIB_MAJOR= 1 @@ -9,6 +9,6 @@ bsm_event.c bsm_flags.c bsm_io.c bsm_mask.c bsm_notify.c \ bsm_token.c bsm_user.c lib_wrappers.c INCS= audit_uevents.h libbsm.h -CFLAGS+= -I${LIBBSMDIR} +CFLAGS+= -I${BSMDIR}/lib .include From owner-p4-projects@FreeBSD.ORG Wed May 26 19:31:15 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E31FF16A4D0; Wed, 26 May 2004 19:31:14 -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 B1CDC16A4CE for ; Wed, 26 May 2004 19:31:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 931EA43D2D for ; Wed, 26 May 2004 19:31:14 -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.11/8.12.11) with ESMTP id i4R2UUxt038403 for ; Wed, 26 May 2004 19:30:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R2UU1G038400 for perforce@freebsd.org; Wed, 26 May 2004 19:30:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 19:30:30 -0700 (PDT) Message-Id: <200405270230.i4R2UU1G038400@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 53577 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: Thu, 27 May 2004 02:31:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=53577 Change 53577 by rwatson@rwatson_paprika on 2004/05/26 19:29:58 Export sys/security/audit to /usr/include so it can be used by applications. Affected files ... .. //depot/projects/trustedbsd/audit2/etc/mtree/BSD.include.dist#4 edit Differences ... ==== //depot/projects/trustedbsd/audit2/etc/mtree/BSD.include.dist#4 (text+ko) ==== @@ -164,6 +164,8 @@ rpcsvc .. security + audit + .. mac_biba .. mac_bsdextended From owner-p4-projects@FreeBSD.ORG Wed May 26 19:32:01 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AF2916A4D0; Wed, 26 May 2004 19:32:01 -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 E8A9916A4CE for ; Wed, 26 May 2004 19:32:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E14FA43D58 for ; Wed, 26 May 2004 19:32:00 -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.11/8.12.11) with ESMTP id i4R2VWrc039288 for ; Wed, 26 May 2004 19:31:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R2VWQI039282 for perforce@freebsd.org; Wed, 26 May 2004 19:31:32 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 19:31:32 -0700 (PDT) Message-Id: <200405270231.i4R2VWQI039282@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 53578 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: Thu, 27 May 2004 02:32:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=53578 Change 53578 by rwatson@rwatson_paprika on 2004/05/26 19:31:14 Export sys/security/audit from kernel to user space. Affected files ... .. //depot/projects/trustedbsd/audit2/include/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/audit2/include/Makefile#3 (text+ko) ==== @@ -36,9 +36,9 @@ fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \ fs/procfs fs/smbfs fs/udf fs/umapfs fs/unionfs isofs/cd9660 \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ - netgraph/atm security/mac_biba security/mac_bsdextended \ - security/mac_lomac security/mac_mls security/mac_partition \ - ufs/ffs ufs/ufs + netgraph/atm security/audit security/mac_biba \ + security/mac_bsdextended security/mac_lomac security/mac_mls \ + security/mac_partition ufs/ffs ufs/ufs LSUBSUBDIRS= netgraph/bluetooth/include From owner-p4-projects@FreeBSD.ORG Wed May 26 20:09:41 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCE1E16A4D0; Wed, 26 May 2004 20:09:40 -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 9265216A4CE for ; Wed, 26 May 2004 20:09:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AB3543D49 for ; Wed, 26 May 2004 20:09:40 -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.11/8.12.11) with ESMTP id i4R39IMK047446 for ; Wed, 26 May 2004 20:09:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R39IOf047443 for perforce@freebsd.org; Wed, 26 May 2004 20:09:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 20:09:18 -0700 (PDT) Message-Id: <200405270309.i4R39IOf047443@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 53579 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: Thu, 27 May 2004 03:09:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=53579 Change 53579 by rwatson@rwatson_paprika on 2004/05/26 20:09:14 Hook up libbsm to the build. Affected files ... .. //depot/projects/trustedbsd/audit2/lib/Makefile#2 edit Differences ... ==== //depot/projects/trustedbsd/audit2/lib/Makefile#2 (text+ko) ==== @@ -25,7 +25,7 @@ SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil libypclnt \ ${_compat} libalias ${_libatm} ${_libbind} \ - ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ + ${_libbluetooth} libbsm libbsnmp libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ libedit libexpat libfetch libform libftpio libgeom ${_libio} libipsec \ libipx libisc libkiconv libmenu ${_libmilter} ${_libmp} ${_libncp} \ From owner-p4-projects@FreeBSD.ORG Wed May 26 20:18:09 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B227C16A4D0; Wed, 26 May 2004 20:18:08 -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 8601616A4CE for ; Wed, 26 May 2004 20:18:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67E8B43D41 for ; Wed, 26 May 2004 20:18:08 -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.11/8.12.11) with ESMTP id i4R3HSTX049427 for ; Wed, 26 May 2004 20:17:29 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R3HSaa049424 for perforce@freebsd.org; Wed, 26 May 2004 20:17:28 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 20:17:28 -0700 (PDT) Message-Id: <200405270317.i4R3HSaa049424@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 53580 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: Thu, 27 May 2004 03:18:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=53580 Change 53580 by rwatson@rwatson_paprika on 2004/05/26 20:16:38 Hook up auditreduce and praudit to the build. Affected files ... .. //depot/projects/trustedbsd/audit2/usr.sbin/Makefile#5 edit Differences ... ==== //depot/projects/trustedbsd/audit2/usr.sbin/Makefile#5 (text+ko) ==== @@ -14,6 +14,7 @@ ancontrol \ arp \ auditon \ + auditreduce \ bootparamd \ bsnmpd \ burncd \ @@ -79,6 +80,7 @@ ppp \ pppd \ pppstats \ + praudit \ procctl \ pstat \ pw \ From owner-p4-projects@FreeBSD.ORG Wed May 26 20:23:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9884616A4D1; Wed, 26 May 2004 20:23:28 -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 6D69C16A4CF for ; Wed, 26 May 2004 20:23:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6662743D31 for ; Wed, 26 May 2004 20:23:28 -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.11/8.12.11) with ESMTP id i4R3MZLh051252 for ; Wed, 26 May 2004 20:22:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4R3MZvl051247 for perforce@freebsd.org; Wed, 26 May 2004 20:22:35 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 26 May 2004 20:22:35 -0700 (PDT) Message-Id: <200405270322.i4R3MZvl051247@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 53581 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: Thu, 27 May 2004 03:23:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=53581 Change 53581 by rwatson@rwatson_paprika on 2004/05/26 20:22:35 Use FreeBSD directory layout to reach bsm include files. We'll need to use the bsm layout for include files at some point, but this should get things going in the mean time. Affected files ... .. //depot/projects/trustedbsd/audit2/contrib/bsm/lib/libbsm.h#2 edit Differences ... ==== //depot/projects/trustedbsd/audit2/contrib/bsm/lib/libbsm.h#2 (text+ko) ==== @@ -43,9 +43,11 @@ #include #include /* __{BEGIN,END}_DECLS */ -#include -#include +#include +#include +#ifdef DARWIN #include /* audit_token_t */ +#endif #define AU_PRS_SUCCESS 1 #define AU_PRS_FAILURE 2 From owner-p4-projects@FreeBSD.ORG Thu May 27 19:23:32 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D57916A4D0; Thu, 27 May 2004 19:23:32 -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 C2AC916A4CE for ; Thu, 27 May 2004 19:23:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B97BD43D48 for ; Thu, 27 May 2004 19:23:31 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4S2MeRd091827 for ; Thu, 27 May 2004 19:22:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4S2MaZu091778 for perforce@freebsd.org; Thu, 27 May 2004 19:22:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Thu, 27 May 2004 19:22:36 -0700 (PDT) Message-Id: <200405280222.i4S2MaZu091778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53633 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: Fri, 28 May 2004 02:23:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=53633 Change 53633 by marcel@marcel_nfs on 2004/05/27 19:21:34 IFC @53623 Affected files ... .. //depot/projects/gdb/bin/df/Makefile#3 integrate .. //depot/projects/gdb/bin/df/df.c#8 integrate .. //depot/projects/gdb/bin/ls/Makefile#2 integrate .. //depot/projects/gdb/bin/ls/print.c#7 integrate .. //depot/projects/gdb/bin/ps/ps.1#10 integrate .. //depot/projects/gdb/bin/ps/ps.c#10 integrate .. //depot/projects/gdb/bin/sh/arith.y#3 integrate .. //depot/projects/gdb/contrib/pf/ftp-proxy/ftp-proxy.8#2 integrate .. //depot/projects/gdb/etc/rc.d/Makefile#9 integrate .. //depot/projects/gdb/etc/rc.d/nisdomain#2 integrate .. //depot/projects/gdb/etc/rc.d/nsswitch#1 branch .. //depot/projects/gdb/etc/rc.firewall6#2 integrate .. //depot/projects/gdb/etc/services#2 integrate .. //depot/projects/gdb/games/fortune/datfiles/fortunes#7 integrate .. //depot/projects/gdb/include/rpcsvc/yp_prot.h#2 integrate .. //depot/projects/gdb/include/stdio.h#4 integrate .. //depot/projects/gdb/include/wchar.h#2 integrate .. //depot/projects/gdb/lib/libarchive/Makefile#8 integrate .. //depot/projects/gdb/lib/libarchive/archive.h#9 integrate .. //depot/projects/gdb/lib/libarchive/archive_entry.c#14 integrate .. //depot/projects/gdb/lib/libarchive/archive_private.h#10 integrate .. //depot/projects/gdb/lib/libarchive/archive_read.3#5 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#11 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_all.c#4 integrate .. //depot/projects/gdb/lib/libarchive/archive_read_support_compression_compress.c#1 branch .. //depot/projects/gdb/lib/libarchive/archive_read_support_format_all.c#4 integrate .. //depot/projects/gdb/lib/libarchive/libarchive.3#3 integrate .. //depot/projects/gdb/lib/libc/locale/euc.c#7 integrate .. //depot/projects/gdb/lib/libc/locale/none.c#4 integrate .. //depot/projects/gdb/lib/libc/locale/wcwidth.c#2 integrate .. //depot/projects/gdb/lib/libc/net/Makefile.inc#2 integrate .. //depot/projects/gdb/lib/libc/net/eui64.3#1 branch .. //depot/projects/gdb/lib/libc/net/eui64.c#1 branch .. //depot/projects/gdb/lib/libc/stdio/getwc.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/getwchar.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/putwc.c#2 integrate .. //depot/projects/gdb/lib/libc/stdio/putwchar.c#2 integrate .. //depot/projects/gdb/lib/libipx/ipx_ntoa.c#2 integrate .. //depot/projects/gdb/lib/libutil/Makefile#3 integrate .. //depot/projects/gdb/lib/libutil/humanize_number.3#1 branch .. //depot/projects/gdb/lib/libutil/humanize_number.c#1 branch .. //depot/projects/gdb/lib/libutil/libutil.h#3 integrate .. //depot/projects/gdb/lib/liby/main.c#2 integrate .. //depot/projects/gdb/libexec/rbootd/rmpproto.c#2 integrate .. //depot/projects/gdb/libexec/rbootd/utils.c#2 integrate .. //depot/projects/gdb/libexec/rexecd/rexecd.c#2 integrate .. //depot/projects/gdb/libexec/rtld-elf/libmap.c#4 integrate .. //depot/projects/gdb/libexec/rtld-elf/rtld.c#5 integrate .. //depot/projects/gdb/libexec/tftpd/tftpd.8#2 integrate .. //depot/projects/gdb/libexec/tftpd/tftpd.c#2 integrate .. //depot/projects/gdb/sbin/gbde/gbde.8#3 integrate .. //depot/projects/gdb/sbin/geom/class/concat/gconcat.8#3 integrate .. //depot/projects/gdb/sbin/geom/class/nop/gnop.8#3 integrate .. //depot/projects/gdb/sbin/geom/class/stripe/gstripe.8#3 integrate .. //depot/projects/gdb/sbin/geom/core/Makefile#2 integrate .. //depot/projects/gdb/sbin/geom/core/geom.8#1 branch .. //depot/projects/gdb/sbin/geom/core/geom.c#3 integrate .. //depot/projects/gdb/sbin/ipfw/ipfw.8#6 integrate .. //depot/projects/gdb/sbin/mount_ntfs/mount_ntfs.c#2 integrate .. //depot/projects/gdb/sbin/restore/dirs.c#3 integrate .. //depot/projects/gdb/sbin/restore/extern.h#4 integrate .. //depot/projects/gdb/sbin/restore/interactive.c#3 integrate .. //depot/projects/gdb/sbin/restore/tape.c#4 integrate .. //depot/projects/gdb/sbin/vinum/commands.c#4 integrate .. //depot/projects/gdb/sbin/vinum/vinum.8#3 integrate .. //depot/projects/gdb/share/examples/cvsup/cvs-supfile#5 integrate .. //depot/projects/gdb/share/examples/cvsup/doc-supfile#2 integrate .. //depot/projects/gdb/share/examples/cvsup/gnats-supfile#2 integrate .. //depot/projects/gdb/share/examples/cvsup/ports-supfile#4 integrate .. //depot/projects/gdb/share/examples/cvsup/stable-supfile#2 integrate .. //depot/projects/gdb/share/examples/cvsup/standard-supfile#2 integrate .. //depot/projects/gdb/share/examples/cvsup/www-supfile#2 integrate .. //depot/projects/gdb/share/man/man4/Makefile#10 integrate .. //depot/projects/gdb/share/man/man4/cy.4#1 branch .. //depot/projects/gdb/share/man/man4/ixgb.4#1 branch .. //depot/projects/gdb/share/man/man4/man4.i386/Makefile#9 integrate .. //depot/projects/gdb/share/man/man4/man4.i386/cy.4#2 delete .. //depot/projects/gdb/share/man/man4/vlan.4#3 integrate .. //depot/projects/gdb/share/man/man5/Makefile#5 integrate .. //depot/projects/gdb/share/man/man5/eui64.5#1 branch .. //depot/projects/gdb/share/man/man5/libmap.conf.5#3 integrate .. //depot/projects/gdb/share/man/man9/zero_copy.9#3 integrate .. //depot/projects/gdb/share/misc/bsd-family-tree#4 integrate .. //depot/projects/gdb/sys/alpha/alpha/vm_machdep.c#6 integrate .. //depot/projects/gdb/sys/amd64/amd64/apic_vector.S#4 integrate .. //depot/projects/gdb/sys/amd64/amd64/exception.S#3 integrate .. //depot/projects/gdb/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/gdb/sys/amd64/amd64/support.S#8 integrate .. //depot/projects/gdb/sys/amd64/amd64/vm_machdep.c#9 integrate .. //depot/projects/gdb/sys/amd64/ia32/ia32_exception.S#2 integrate .. //depot/projects/gdb/sys/amd64/isa/atpic_vector.S#4 integrate .. //depot/projects/gdb/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/gdb/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/gdb/sys/conf/files#25 integrate .. //depot/projects/gdb/sys/conf/files.amd64#9 integrate .. //depot/projects/gdb/sys/conf/files.i386#17 integrate .. //depot/projects/gdb/sys/conf/files.pc98#12 integrate .. //depot/projects/gdb/sys/conf/kern.post.mk#5 integrate .. //depot/projects/gdb/sys/conf/kmod.mk#6 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/CHANGES.txt#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acconfig.h#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acdebug.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acdispat.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acefi.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acenv.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acevents.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acexcep.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acfreebsd.h#6 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acglobal.h#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/achware.h#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/aclocal.h#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acmacros.h#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acnamesp.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acobject.h#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acparser.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acpixf.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/acstruct.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/actbl.h#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/actypes.h#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/common/adisasm.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslcompiler.y#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/compiler/aslstubs.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbcmds.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbdisply.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dbinput.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dmwalk.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsmethod.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dsopcode.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/dswstate.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evevent.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evgpe.c#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evgpeblk.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evmisc.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evregion.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evxface.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evxfevnt.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/evxfregn.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exconfig.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exmutex.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exoparg2.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exresolv.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/exstore.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/hwgpe.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/hwsleep.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsaccess.c#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsalloc.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nseval.c#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsinit.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsparse.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsxfeval.c#4 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/nsxfname.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/psxface.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsutils.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/rsxface.c#3 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/uteval.c#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utglobal.c#5 integrate .. //depot/projects/gdb/sys/contrib/dev/acpica/utxface.c#3 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi.c#16 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_acad.c#6 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_button.c#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_ec.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_lid.c#4 integrate .. //depot/projects/gdb/sys/dev/acpica/acpi_thermal.c#7 integrate .. //depot/projects/gdb/sys/dev/acpica/acpivar.h#13 integrate .. //depot/projects/gdb/sys/dev/aic/aic_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/an/if_an.c#3 integrate .. //depot/projects/gdb/sys/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/arl/if_arl.c#4 integrate .. //depot/projects/gdb/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/gdb/sys/dev/awi/if_awi_pccard.c#5 integrate .. //depot/projects/gdb/sys/dev/bfe/if_bfe.c#4 integrate .. //depot/projects/gdb/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/gdb/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/gdb/sys/dev/bktr/bktr_core.c#2 integrate .. //depot/projects/gdb/sys/dev/ciss/cissreg.h#5 integrate .. //depot/projects/gdb/sys/dev/cnw/if_cnw.c#3 integrate .. //depot/projects/gdb/sys/dev/cp/if_cp.c#2 integrate .. //depot/projects/gdb/sys/dev/cs/if_cs.c#4 integrate .. //depot/projects/gdb/sys/dev/cs/if_cs_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/ed/if_ed.c#6 integrate .. //depot/projects/gdb/sys/dev/ed/if_ed_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/em/if_em.c#6 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep.c#3 integrate .. //depot/projects/gdb/sys/dev/ep/if_ep_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/ex/if_ex.c#4 integrate .. //depot/projects/gdb/sys/dev/ex/if_ex_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/gdb/sys/dev/fe/if_fe.c#4 integrate .. //depot/projects/gdb/sys/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/firewire/fwdev.c#6 integrate .. //depot/projects/gdb/sys/dev/firewire/fwohci.c#6 integrate .. //depot/projects/gdb/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/gdb/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/gdb/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/gdb/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/gdb/sys/dev/gx/if_gx.c#5 integrate .. //depot/projects/gdb/sys/dev/hme/if_hme.c#5 integrate .. //depot/projects/gdb/sys/dev/iicbus/iicbus.c#4 integrate .. //depot/projects/gdb/sys/dev/isp/isp.c#3 integrate .. //depot/projects/gdb/sys/dev/isp/isp_freebsd.c#4 integrate .. //depot/projects/gdb/sys/dev/isp/isp_inline.h#2 integrate .. //depot/projects/gdb/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/gdb/sys/dev/isp/isp_target.c#3 integrate .. //depot/projects/gdb/sys/dev/isp/ispvar.h#4 integrate .. //depot/projects/gdb/sys/dev/ixgb/LICENSE#1 branch .. //depot/projects/gdb/sys/dev/ixgb/README#1 branch .. //depot/projects/gdb/sys/dev/ixgb/if_ixgb.c#1 branch .. //depot/projects/gdb/sys/dev/ixgb/if_ixgb.h#1 branch .. //depot/projects/gdb/sys/dev/ixgb/if_ixgb_osdep.h#1 branch .. //depot/projects/gdb/sys/dev/ixgb/ixgb_ee.c#1 branch .. //depot/projects/gdb/sys/dev/ixgb/ixgb_ee.h#1 branch .. //depot/projects/gdb/sys/dev/ixgb/ixgb_hw.c#1 branch .. //depot/projects/gdb/sys/dev/ixgb/ixgb_hw.h#1 branch .. //depot/projects/gdb/sys/dev/ixgb/ixgb_ids.h#1 branch .. //depot/projects/gdb/sys/dev/joy/joy_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/gdb/sys/dev/lnc/if_lnc.c#5 integrate .. //depot/projects/gdb/sys/dev/musycc/musycc.c#3 integrate .. //depot/projects/gdb/sys/dev/my/if_my.c#3 integrate .. //depot/projects/gdb/sys/dev/ncv/ncr53c500_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/gdb/sys/dev/nsp/nsp_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/owi/if_owi.c#3 integrate .. //depot/projects/gdb/sys/dev/owi/if_owi_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/pccard/Makefile.pccarddevs#2 delete .. //depot/projects/gdb/sys/dev/pccard/devlist2h.awk#2 delete .. //depot/projects/gdb/sys/dev/pccard/pccard_cis_quirks.c#2 integrate .. //depot/projects/gdb/sys/dev/pccard/pccarddevs.h#7 delete .. //depot/projects/gdb/sys/dev/pcf/envctrl.c#1 branch .. //depot/projects/gdb/sys/dev/pcf/pcf.c#1 branch .. //depot/projects/gdb/sys/dev/pcf/pcf_isa.c#1 branch .. //depot/projects/gdb/sys/dev/pcf/pcfvar.h#1 branch .. //depot/projects/gdb/sys/dev/pci/pci.c#11 integrate .. //depot/projects/gdb/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/gdb/sys/dev/re/if_re.c#4 integrate .. //depot/projects/gdb/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/gdb/sys/dev/sbsh/if_sbsh.c#3 integrate .. //depot/projects/gdb/sys/dev/sio/sio_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/sn/if_sn.c#5 integrate .. //depot/projects/gdb/sys/dev/sn/if_sn_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/snc/dp83932.c#3 integrate .. //depot/projects/gdb/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/gdb/sys/dev/stg/tmc18c30_pccard.c#3 integrate .. //depot/projects/gdb/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/gdb/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/gdb/sys/dev/uart/uart_bus_pccard.c#2 integrate .. //depot/projects/gdb/sys/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/if_auereg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/gdb/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_cue.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_rue.c#4 integrate .. //depot/projects/gdb/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/if_udavreg.h#2 integrate .. //depot/projects/gdb/sys/dev/usb/uhci.c#2 integrate .. //depot/projects/gdb/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/ums.c#3 integrate .. //depot/projects/gdb/sys/dev/usb/usb.c#3 integrate .. //depot/projects/gdb/sys/dev/vx/if_vx.c#3 integrate .. //depot/projects/gdb/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/gdb/sys/dev/wl/if_wl.c#5 integrate .. //depot/projects/gdb/sys/dev/xe/if_xe.c#4 integrate .. //depot/projects/gdb/sys/dev/xe/if_xe_pccard.c#4 integrate .. //depot/projects/gdb/sys/geom/concat/g_concat.c#7 integrate .. //depot/projects/gdb/sys/geom/stripe/g_stripe.c#2 integrate .. //depot/projects/gdb/sys/i386/conf/GENERIC#9 integrate .. //depot/projects/gdb/sys/i386/i386/apic_vector.s#5 integrate .. //depot/projects/gdb/sys/i386/i386/exception.s#4 integrate .. //depot/projects/gdb/sys/i386/i386/genassym.c#3 integrate .. //depot/projects/gdb/sys/i386/i386/mptable.c#5 integrate .. //depot/projects/gdb/sys/i386/i386/support.s#5 integrate .. //depot/projects/gdb/sys/i386/i386/vm_machdep.c#9 integrate .. //depot/projects/gdb/sys/i386/isa/atpic_vector.s#6 integrate .. //depot/projects/gdb/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/gdb/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/gdb/sys/kern/kern_exit.c#8 integrate .. //depot/projects/gdb/sys/kern/kern_proc.c#6 integrate .. //depot/projects/gdb/sys/kern/subr_bus.c#6 integrate .. //depot/projects/gdb/sys/modules/aic/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/an/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/awi/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/cs/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ed/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ep/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ex/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/exca/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/fdc/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/fe/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/if_ndis/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/ixgb/Makefile#1 branch .. //depot/projects/gdb/sys/modules/joy/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ncv/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/nsp/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/oldcard/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/owi/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/pccard/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/pcic/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/ray/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/sio/Makefile#3 integrate .. //depot/projects/gdb/sys/modules/sn/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/stg/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/uart/Makefile#4 integrate .. //depot/projects/gdb/sys/modules/wi/Makefile#2 integrate .. //depot/projects/gdb/sys/modules/xe/Makefile#2 integrate .. //depot/projects/gdb/sys/net/if_ef.c#2 integrate .. //depot/projects/gdb/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/gdb/sys/net/if_vlan.c#5 integrate .. //depot/projects/gdb/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#4 integrate .. //depot/projects/gdb/sys/netgraph/ng_hole.c#3 integrate .. //depot/projects/gdb/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfs.h#6 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_serv.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvcache.c#4 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_srvsubs.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/gdb/sys/nfsserver/nfsm_subs.h#3 integrate .. //depot/projects/gdb/sys/pci/agp.c#8 integrate .. //depot/projects/gdb/sys/pci/agp_nvidia.c#4 integrate .. //depot/projects/gdb/sys/pci/if_dc.c#4 integrate .. //depot/projects/gdb/sys/pci/if_rl.c#6 integrate .. //depot/projects/gdb/sys/pci/if_rlreg.h#2 integrate .. //depot/projects/gdb/sys/pci/if_sis.c#4 integrate .. //depot/projects/gdb/sys/pci/if_ste.c#9 integrate .. //depot/projects/gdb/sys/powerpc/powerpc/vm_machdep.c#7 integrate .. //depot/projects/gdb/sys/sparc64/include/pcpu.h#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/genassym.c#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/pmap.c#7 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/swtch.S#2 integrate .. //depot/projects/gdb/sys/sparc64/sparc64/vm_machdep.c#7 integrate .. //depot/projects/gdb/sys/sys/bus.h#3 integrate .. //depot/projects/gdb/sys/sys/eui64.h#1 branch .. //depot/projects/gdb/sys/sys/mbuf.h#8 integrate .. //depot/projects/gdb/sys/sys/proc.h#13 integrate .. //depot/projects/gdb/sys/sys/sysctl.h#5 integrate .. //depot/projects/gdb/sys/tools/devlist2h.awk#2 delete .. //depot/projects/gdb/sys/tools/miidevs2h.awk#2 integrate .. //depot/projects/gdb/sys/vm/vm_map.c#9 integrate .. //depot/projects/gdb/sys/vm/vm_object.c#6 integrate .. //depot/projects/gdb/tools/regression/lib/libc/net/Makefile#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/net/test-eui64.h#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/net/test-eui64_aton.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/net/test-eui64_line.c#1 branch .. //depot/projects/gdb/tools/regression/lib/libc/net/test-eui64_ntoa.c#1 branch .. //depot/projects/gdb/usr.bin/calendar/calendars/de_AT.ISO_8859-15/calendar.feiertag#1 branch .. //depot/projects/gdb/usr.bin/du/Makefile#2 integrate .. //depot/projects/gdb/usr.bin/du/du.c#4 integrate .. //depot/projects/gdb/usr.bin/gprof/aout.c#2 integrate .. //depot/projects/gdb/usr.bin/gprof/gprof.c#2 integrate .. //depot/projects/gdb/usr.bin/gprof/kernel.c#2 integrate .. //depot/projects/gdb/usr.bin/gprof/printgprof.c#2 integrate .. //depot/projects/gdb/usr.bin/gprof/printlist.c#2 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.c#12 integrate .. //depot/projects/gdb/usr.bin/tar/bsdtar.h#7 integrate .. //depot/projects/gdb/usr.bin/tar/read.c#7 integrate .. //depot/projects/gdb/usr.sbin/Makefile#8 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpi_user.c#5 integrate .. //depot/projects/gdb/usr.sbin/acpi/acpidump/acpidump.h#4 integrate .. //depot/projects/gdb/usr.sbin/apm/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/apm/apm.c#2 integrate .. //depot/projects/gdb/usr.sbin/atm/scspd/scspd.c#2 integrate .. //depot/projects/gdb/usr.sbin/crunch/crunchide/exec_aout.c#2 integrate .. //depot/projects/gdb/usr.sbin/dconschat/dconschat.8#3 integrate .. //depot/projects/gdb/usr.sbin/dconschat/dconschat.c#3 integrate .. //depot/projects/gdb/usr.sbin/diskinfo/Makefile#3 integrate .. //depot/projects/gdb/usr.sbin/diskinfo/diskinfo.c#4 integrate .. //depot/projects/gdb/usr.sbin/edquota/edquota.8#2 integrate .. //depot/projects/gdb/usr.sbin/fwcontrol/fwcontrol.c#2 integrate .. //depot/projects/gdb/usr.sbin/mrouted/testrsrr/testrsrr.c#2 integrate .. //depot/projects/gdb/usr.sbin/rpc.ypupdated/yp_dbupdate.c#2 integrate .. //depot/projects/gdb/usr.sbin/rpc.ypupdated/ypupdated_main.c#2 integrate .. //depot/projects/gdb/usr.sbin/rpc.ypxfrd/ypxfrd_main.c#2 integrate .. //depot/projects/gdb/usr.sbin/sliplogin/sliplogin.c#2 integrate .. //depot/projects/gdb/usr.sbin/smbmsg/smbmsg.c#2 integrate .. //depot/projects/gdb/usr.sbin/syslogd/syslogd.c#3 integrate .. //depot/projects/gdb/usr.sbin/usbdevs/usbdevs.8#2 integrate .. //depot/projects/gdb/usr.sbin/usbdevs/usbdevs.c#2 integrate .. //depot/projects/gdb/usr.sbin/yppoll/yppoll.c#2 integrate Differences ... ==== //depot/projects/gdb/bin/df/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.3 (Berkeley) 5/8/95 -# $FreeBSD: src/bin/df/Makefile,v 1.17 2004/04/18 20:56:31 obrien Exp $ +# $FreeBSD: src/bin/df/Makefile,v 1.18 2004/05/24 22:21:49 pjd Exp $ MOUNT= ${.CURDIR}/../../sbin/mount .PATH: ${MOUNT} @@ -9,7 +9,7 @@ CFLAGS+= -I${MOUNT} -DPADD= ${LIBM} -LDADD= -lm +DPADD= ${LIBUTIL} +LDADD= -lutil .include ==== //depot/projects/gdb/bin/df/df.c#8 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.60 2004/04/22 17:05:08 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.61 2004/05/24 22:21:49 pjd Exp $"); #include #include @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include @@ -62,27 +62,9 @@ #include "extern.h" -#define UNITS_SI 1 -#define UNITS_2 2 - -#define KILO_SZ(n) (n) -#define MEGA_SZ(n) ((n) * (n)) -#define GIGA_SZ(n) ((n) * (n) * (n)) -#define TERA_SZ(n) ((n) * (n) * (n) * (n)) -#define PETA_SZ(n) ((n) * (n) * (n) * (n) * (n)) +#define UNITS_SI 1 +#define UNITS_2 2 -#define KILO_2_SZ (KILO_SZ(1024ULL)) -#define MEGA_2_SZ (MEGA_SZ(1024ULL)) -#define GIGA_2_SZ (GIGA_SZ(1024ULL)) -#define TERA_2_SZ (TERA_SZ(1024ULL)) -#define PETA_2_SZ (PETA_SZ(1024ULL)) - -#define KILO_SI_SZ (KILO_SZ(1000ULL)) -#define MEGA_SI_SZ (MEGA_SZ(1000ULL)) -#define GIGA_SI_SZ (GIGA_SZ(1000ULL)) -#define TERA_SI_SZ (TERA_SZ(1000ULL)) -#define PETA_SI_SZ (PETA_SZ(1000ULL)) - /* Maximum widths of various fields. */ struct maxwidths { int mntfrom; @@ -93,37 +75,14 @@ int ifree; }; -static uintmax_t vals_si [] = { - 1, - KILO_SI_SZ, - MEGA_SI_SZ, - GIGA_SI_SZ, - TERA_SI_SZ, - PETA_SI_SZ -}; -static uintmax_t vals_base2[] = { - 1, - KILO_2_SZ, - MEGA_2_SZ, - GIGA_2_SZ, - TERA_2_SZ, - PETA_2_SZ -}; -static uintmax_t *valp; - -typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t; - -static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; - static void addstat(struct statfs *, struct statfs *); static char *getmntpt(const char *); static int int64width(int64_t); static char *makenetvfslist(void); static void prthuman(const struct statfs *, int64_t); -static void prthumanval(double); +static void prthumanval(int64_t); static void prtstat(struct statfs *, struct maxwidths *); static size_t regetmntinfo(struct statfs **, long, const char **); -static unit_t unit_adjust(double *); static void update_maxwidths(struct maxwidths *, const struct statfs *); static void usage(void); @@ -175,11 +134,9 @@ break; case 'H': hflag = UNITS_SI; - valp = vals_si; break; case 'h': hflag = UNITS_2; - valp = vals_base2; break; case 'i': iflag = 1; @@ -359,55 +316,29 @@ return (j); } -/* - * Output in "human-readable" format. Uses 3 digits max and puts - * unit suffixes at the end. Makes output compact and easy to read, - * especially on huge disks. - * - */ -static unit_t -unit_adjust(double *val) -{ - double abval; - unit_t unit; - int unit_sz; - - abval = fabs(*val); - - unit_sz = abval ? ilogb(abval) / 10 : 0; - - if (unit_sz >= (int)UNIT_MAX) { - unit = NONE; - } else { - unit = unitp[unit_sz]; - *val /= (double)valp[unit_sz]; - } - - return (unit); -} - static void prthuman(const struct statfs *sfsp, int64_t used) { - prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize); - prthumanval((double)used * (double)sfsp->f_bsize); - prthumanval((double)sfsp->f_bavail * (double)sfsp->f_bsize); + prthumanval(sfsp->f_blocks * sfsp->f_bsize); + prthumanval(used * sfsp->f_bsize); + prthumanval(sfsp->f_bavail * sfsp->f_bsize); } static void -prthumanval(double bytes) +prthumanval(int64_t bytes) { + char buf[6]; + int flags; + + flags = HN_B | HN_NOSPACE | HN_DECIMAL; + if (hflag == UNITS_SI) + flags |= HN_DIVISOR_1000; - unit_t unit; - unit = unit_adjust(&bytes); + humanize_number(buf, sizeof(buf) - (bytes < 0 ? 0 : 1), + bytes, "", HN_AUTOSCALE, flags); - if (bytes == 0) - (void)printf(" 0B"); - else if (bytes > 10) - (void)printf(" % 6.0f%c", bytes, "BKMGTPE"[unit]); - else - (void)printf(" % 6.1f%c", bytes, "BKMGTPE"[unit]); + (void)printf(" %6s", buf); } /* ==== //depot/projects/gdb/bin/ls/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 -# $FreeBSD: src/bin/ls/Makefile,v 1.25 2003/06/13 07:04:02 markm Exp $ +# $FreeBSD: src/bin/ls/Makefile,v 1.26 2004/05/25 14:53:47 pjd Exp $ PROG= ls SRCS= cmp.c ls.c print.c util.c -DPADD= ${LIBM} -LDADD= -lm +DPADD= ${LIBUTIL} +LDADD= -lutil .if !defined(RELEASE_CRUNCH) CFLAGS+= -DCOLORLS ==== //depot/projects/gdb/bin/ls/print.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.71 2004/05/02 11:25:37 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.72 2004/05/25 14:53:47 pjd Exp $"); #include #include @@ -45,8 +45,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -74,27 +74,6 @@ #define IS_NOPRINT(p) ((p)->fts_number == NO_PRINT) -#define KILO_SZ(n) (n) -#define MEGA_SZ(n) ((n) * (n)) -#define GIGA_SZ(n) ((n) * (n) * (n)) -#define TERA_SZ(n) ((n) * (n) * (n) * (n)) -#define PETA_SZ(n) ((n) * (n) * (n) * (n) * (n)) - -#define KILO_2_SZ (KILO_SZ(1024ULL)) -#define MEGA_2_SZ (MEGA_SZ(1024ULL)) -#define GIGA_2_SZ (GIGA_SZ(1024ULL)) -#define TERA_2_SZ (TERA_SZ(1024ULL)) -#define PETA_2_SZ (PETA_SZ(1024ULL)) - -static unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; - -typedef enum { - NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX -} unit_t; -static unit_t unit_adjust(double *); - -static unit_t unitp[] = {NONE, KILO, MEGA, GIGA, TERA, PETA}; - #ifdef COLORLS /* Most of these are taken from */ typedef enum Colors { @@ -613,49 +592,17 @@ static void printsize(size_t width, off_t bytes) { - double dbytes; - unit_t unit; if (f_humanval) { - dbytes = bytes; - unit = unit_adjust(&dbytes); + char buf[5]; - if (unit == 0) - (void)printf("%*d%c ", 4, (int)bytes, 'B'); - else - (void)printf("%*.*f%c ", 4, - dbytes >= 99.95 ? 0 : 1, dbytes, "BKMGTPE"[unit]); + humanize_number(buf, sizeof(buf), (int64_t)bytes, "", + HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL); + (void)printf("%5s ", buf); } else (void)printf("%*jd ", (u_int)width, bytes); } -/* - * Output in "human-readable" format. Uses 3 digits max and puts - * unit suffixes at the end. Makes output compact and easy to read, - * especially on huge disks. - * - */ -static unit_t -unit_adjust(double *val) -{ - double abval; - unit_t unit; - u_int unit_sz; - - abval = fabs(*val); - - unit_sz = abval ? (u_int)ilogb(abval) / 10 : 0; - - if (unit_sz >= (u_int)UNIT_MAX) { - unit = NONE; - } else { - unit = unitp[unit_sz]; - *val /= (double)vals_base2[unit_sz]; - } - - return (unit); -} - static void aclmode(char *buf, const FTSENT *p, int *haveacls) { ==== //depot/projects/gdb/bin/ps/ps.1#10 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.76 2004/05/16 21:35:05 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.78 2004/05/25 14:05:25 gad Exp $ .\" .Dd March 27, 2004 .Dt PS 1 @@ -142,7 +142,7 @@ header per page of information. .It Fl j Print information associated with the following keywords: -.Cm user , pid , ppid , pgid , jobc , state , tt , time , +.Cm user , pid , ppid , pgid , sid , jobc , state , tt , time , and .Cm command . .It Fl L @@ -610,6 +610,8 @@ .El .Sh SEE ALSO .Xr kill 1 , +.Xr pgrep 1 , +.Xr pkill 1 , .Xr w 1 , .Xr kvm 3 , .Xr strftime 3 , ==== //depot/projects/gdb/bin/ps/ps.c#10 (text+ko) ==== @@ -47,7 +47,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.88 2004/04/06 20:06:49 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.91 2004/05/23 21:35:35 gad Exp $"); #include #include @@ -142,7 +142,7 @@ static void usage(void); static char dfmt[] = "pid,tt,state,time,command"; -static char jfmt[] = "user,pid,ppid,pgid,jobc,state,tt,time,command"; +static char jfmt[] = "user,pid,ppid,pgid,sid,jobc,state,tt,time,command"; static char lfmt[] = "uid,pid,ppid,cpu,pri,nice,vsz,rss,mwchan,state," "tt,time,command"; static char o1[] = "pid"; @@ -462,8 +462,11 @@ what = showthreads != 0 ? KERN_PROC_ALL : KERN_PROC_PROC; flag = 0; if (nselectors == 1) { - /* XXX - Apparently there's no KERN_PROC_GID flag. */ - if (pgrplist.count == 1) { + if (gidlist.count == 1) { + what = KERN_PROC_RGID | showthreads; + flag = *gidlist.l.gids; + nselectors = 0; + } else if (pgrplist.count == 1) { what = KERN_PROC_PGRP | showthreads; flag = *pgrplist.l.pids; nselectors = 0; @@ -475,16 +478,10 @@ what = KERN_PROC_RUID | showthreads; flag = *ruidlist.l.uids; nselectors = 0; -#if 0 - /*- - * XXX - KERN_PROC_SESSION causes error in kvm_getprocs? - * For now, always do sid-matching in this routine. - */ } else if (sesslist.count == 1) { what = KERN_PROC_SESSION | showthreads; flag = *sesslist.l.pids; nselectors = 0; -#endif } else if (ttylist.count == 1) { what = KERN_PROC_TTY | showthreads; flag = *ttylist.l.ttys; @@ -1107,11 +1104,12 @@ * of the oldps options -- option string NOT starting with a '-' -- * then convert to 'T' (meaning *this* terminal, i.e. ttyname(0)). * - * However, if a flag accepting a string argument is found in the - * option string, the remainder of the string is the argument to - * that flag; do not modify that argument. + * However, if a flag accepting a string argument is found earlier + * in the option string (including a possible `t' flag), then the + * remainder of the string must be the argument to that flag; so + * do not modify that argument. */ - if (strcspn(s, "MNOoU") == len && *cp == 't' && *s != '-') + if (*cp == 't' && *s != '-' && strcspn(s, "MNOoUt") == len - 1) *cp = 'T'; else { /* ==== //depot/projects/gdb/bin/sh/arith.y#3 (text+ko) ==== @@ -38,9 +38,11 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.18 2004/04/06 20:06:51 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.19 2004/05/24 10:11:31 stefanf Exp $"); #include +#include + #include "shell.h" #include "var.h" %} ==== //depot/projects/gdb/contrib/pf/ftp-proxy/ftp-proxy.8#2 (text+ko) ==== @@ -27,6 +27,8 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" +.\" $FreeBSD: src/contrib/pf/ftp-proxy/ftp-proxy.8,v 1.2 2004/05/27 23:51:05 mlaier Exp $ +.\" .Dd August 17, 2001 .Dt FTP-PROXY 8 .Os @@ -182,7 +184,7 @@ .Nm on the port from above using .Bd -literal -offset 2n -127.0.0.1:8021 stream tcp nowait root /usr/libexec/ftp-proxy ftp-proxy +ftp-proxy stream tcp nowait root /usr/libexec/ftp-proxy ftp-proxy .Ed .Pp in ==== //depot/projects/gdb/etc/rc.d/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.40 2004/04/17 04:12:27 brooks Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.41 2004/05/24 14:17:19 des Exp $ FILES= DAEMON LOGIN NETWORKING SERVERS \ abi accounting addswap adjkerntz amd \ @@ -23,7 +23,7 @@ mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ network_ipv6 nfsclient nfsd \ - nfslocking nfsserver nisdomain ntpd ntpdate \ + nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \ othermta \ pccard pcvt pf pflog preseedrandom \ power_profile ppp-user pppoed pwcheck \ ==== //depot/projects/gdb/etc/rc.d/nisdomain#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/etc/rc.d/nisdomain,v 1.1 2003/04/18 17:51:54 mtm Exp $ +# $FreeBSD: src/etc/rc.d/nisdomain,v 1.2 2004/05/24 11:48:58 des Exp $ # # PROVIDE: nisdomain @@ -37,72 +37,8 @@ start_cmd="nisdomain_start" stop_cmd=":" -convert_host_conf() -{ - host_conf=$1; shift; - nsswitch_conf=$1; shift; - awk ' \ - /^[:blank:]*#/ { next } \ - /(hosts|local|file)/ { nsswitch[c] = "files"; c++; next } \ - /(dns|bind)/ { nsswitch[c] = "dns"; c++; next } \ - /nis/ { nsswitch[c] = "nis"; c++; next } \ - { printf "Warning: unrecognized line [%s]", $0 > "/dev/stderr" } \ - END { \ - printf "hosts: "; \ - for (i in nsswitch) printf "%s ", nsswitch[i]; \ - printf "\n"; \ - }' < $host_conf > $nsswitch_conf -} - -generate_host_conf() -{ - nsswitch_conf=$1; shift; - host_conf=$1; shift; - - awk ' -BEGIN { - xlat["files"] = "hosts"; - xlat["dns"] = "bind"; - xlat["nis"] = "nis"; - cont = 0; -} -sub(/^[\t ]*hosts:/, "") || cont { - if (!cont) - srcs = "" - sub(/#.*/, "") - gsub(/[][]/, " & ") - cont = sub(/\\$/, "") - srcs = srcs " " $0 -} -END { - print "# Auto-generated from nsswitch.conf, do not edit" - ns = split(srcs, s) - for (n = 1; n <= ns; ++n) { - if (s[n] in xlat) - print xlat[s[n]] - } -} -' <$nsswitch_conf >$host_conf -} - nisdomain_start() { - # Generate host.conf for compatibility - # - if [ -f "/etc/nsswitch.conf" ]; then - echo 'Generating host.conf.' - generate_host_conf /etc/nsswitch.conf /etc/host.conf - fi - - # Convert host.conf to nsswitch.conf if necessary - # - if [ -f "/etc/host.conf" -a ! -f "/etc/nsswitch.conf" ]; then - echo '' - echo 'Warning: /etc/host.conf is no longer used' - echo ' /etc/nsswitch.conf will be created for you' - convert_host_conf /etc/host.conf /etc/nsswitch.conf - fi - # Set the domainname if we're using NIS # case ${nisdomainname} in ==== //depot/projects/gdb/etc/rc.firewall6#2 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh - ############ # Setup system for IPv6 firewall service. -# $FreeBSD: src/etc/rc.firewall6,v 1.13 2003/11/02 07:31:44 ru Exp $ +# $FreeBSD: src/etc/rc.firewall6,v 1.14 2004/05/24 07:27:26 ume Exp $ # Suck in the configuration variables. if [ -z "${source_rc_confs_defined}" ]; then @@ -55,6 +55,8 @@ # Only in rare cases do you want to change these rules # ${fw6cmd} add 100 pass all from any to any via lo0 + ${fw6cmd} add 200 deny all from any to ::1 + ${fw6cmd} add 300 deny all from ::1 to any # # ND # ==== //depot/projects/gdb/etc/services#2 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.98 2003/10/08 08:48:43 bms Exp $ +# $FreeBSD: src/etc/services,v 1.99 2004/05/27 23:42:26 mlaier Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -2090,6 +2090,7 @@ fodms 7200/udp #FODMS FLIP dlip 7201/tcp dlip 7201/udp +ftp-proxy 8021/tcp # FTP proxy natd 8668/divert # Network Address Translation jetdirect 9100/tcp #HP JetDirect card man 9535/tcp ==== //depot/projects/gdb/games/fortune/datfiles/fortunes#7 (text+ko) ==== @@ -1,5 +1,6 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.134 2004/05/11 17:26:15 fanf Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.135 2004/05/25 19:15:02 wollman Exp $ + % -- Gifts for Children -- @@ -7777,6 +7778,11 @@ qualifications, that field's employment market is glutted. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 27 20:14:35 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE09216A4D0; Thu, 27 May 2004 20:14:34 -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 9846316A4CE for ; Thu, 27 May 2004 20:14:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7928C43D1D for ; Thu, 27 May 2004 20:14:34 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4S3DlX2005671 for ; Thu, 27 May 2004 20:13:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4S3DliL005668 for perforce@freebsd.org; Thu, 27 May 2004 20:13:47 -0700 (PDT) (envelope-from marcel@freebsd.org) Date: Thu, 27 May 2004 20:13:47 -0700 (PDT) Message-Id: <200405280313.i4S3DliL005668@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 53640 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: Fri, 28 May 2004 03:14:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=53640 Change 53640 by marcel@marcel_nfs on 2004/05/27 20:13:34 IFC @53638 Affected files ... .. //depot/projects/gdb/sys/dev/acpica/acpi.c#17 integrate .. //depot/projects/gdb/sys/dev/pccard/card_if.m#2 integrate .. //depot/projects/gdb/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/gdb/sys/dev/sn/if_sn_pccard.c#4 integrate Differences ... ==== //depot/projects/gdb/sys/dev/acpica/acpi.c#17 (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/dev/acpica/acpi.c,v 1.147 2004/05/27 18:38:45 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi.c,v 1.148 2004/05/28 02:50:43 marcel Exp $ */ #include "opt_acpi.h" @@ -1877,7 +1877,7 @@ if (acpi_parse_prw(h, &prw) != 0) return (AE_OK); - sstate = (int)context; + sstate = (int)(intptr_t)context; if (sstate > prw.lowest_wake) AcpiDisableGpe(prw.gpe_handle, prw.gpe_bit, ACPI_NOT_ISR); @@ -1892,7 +1892,7 @@ if (ACPI_SUCCESS(AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &sb_handle))) AcpiWalkNamespace(ACPI_TYPE_ANY, sb_handle, 100, - acpi_wake_limit, (void *)sstate, NULL); + acpi_wake_limit, (void *)(intptr_t)sstate, NULL); return (0); } ==== //depot/projects/gdb/sys/dev/pccard/card_if.m#2 (text+ko) ==== @@ -23,10 +23,11 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/sys/dev/pccard/card_if.m,v 1.23 2003/10/07 03:33:53 imp Exp $ +# $FreeBSD: src/sys/dev/pccard/card_if.m,v 1.24 2004/05/28 02:23:10 imp Exp $ # #include +#include #include INTERFACE card; ==== //depot/projects/gdb/sys/dev/pccard/pccardvar.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: pcmciavar.h,v 1.12 2000/02/08 12:51:31 enami Exp $ */ -/* $FreeBSD: src/sys/dev/pccard/pccardvar.h,v 1.46 2003/11/02 20:18:19 imp Exp $ */ +/* $FreeBSD: src/sys/dev/pccard/pccardvar.h,v 1.47 2004/05/28 02:24:07 imp Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -30,11 +30,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - -#include - extern int pccard_verbose; /* ==== //depot/projects/gdb/sys/dev/sn/if_sn_pccard.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_pccard.c,v 1.23 2004/05/27 03:49:43 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn_pccard.c,v 1.24 2004/05/28 02:19:42 imp Exp $"); #include #include @@ -42,6 +42,8 @@ #include #include +#include + #include #include From owner-p4-projects@FreeBSD.ORG Thu May 27 22:17:13 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E481B16A4D0; Thu, 27 May 2004 22:17:12 -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 C075916A4CE for ; Thu, 27 May 2004 22:17:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A735943D2F for ; Thu, 27 May 2004 22:17:12 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4S5GJjA037583 for ; Thu, 27 May 2004 22:16:19 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4S5GIdU037580 for perforce@freebsd.org; Thu, 27 May 2004 22:16:18 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Thu, 27 May 2004 22:16:18 -0700 (PDT) Message-Id: <200405280516.i4S5GIdU037580@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 53646 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: Fri, 28 May 2004 05:17:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=53646 Change 53646 by scottl@scottl-esp-sparc64 on 2004/05/27 22:16:16 Hack the headers enough so that they compile without error. Start hacking up esp_sbus.c so that it will compile. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#3 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#2 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#3 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#3 (text+ko) ==== @@ -38,21 +38,26 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: esp_sbus.c,v 1.27 2002/12/10 13:44:47 pk Exp $"); #include #include -#include -#include -#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include - #include #include @@ -78,16 +83,24 @@ int sc_pri; /* SBUS priority */ }; -void espattach_sbus(struct device *, struct device *, void *); -void espattach_dma(struct device *, struct device *, void *); -int espmatch_sbus(struct device *, struct cfdata *, void *); +static int esp_sbus_probe(device_t); +static int esp_sbus_attach(device_t); +static device_method_t esp_sbus_methods[] = { + DEVMETHOD(device_probe, esp_sbus_probe), + DEVMETHOD(device_attach, esp_sbus_attach), +#if 0 + DEVMETHOD(device_detach, espdetach_sbus), + DEVMETHOD(device_suspend, espsuspend_sbus), + DEVMETHOD(device_resume, espresume_sbus), +#endif + {0, 0} +}; +#if 0 CFATTACH_DECL(esp_sbus, sizeof(struct esp_softc), espmatch_sbus, espattach_sbus, NULL, NULL); - -CFATTACH_DECL(esp_dma, sizeof(struct esp_softc), - espmatch_sbus, espattach_dma, NULL, NULL); +#endif /* * Functions and the switch for the MI code. @@ -133,11 +146,8 @@ static void espattach(struct esp_softc *, struct ncr53c9x_glue *); -int -espmatch_sbus(parent, cf, aux) - struct device *parent; - struct cfdata *cf; - void *aux; +static int +esp_sbus_probe(device_t dev) { int rv; struct sbus_attach_args *sa = aux; @@ -150,10 +160,8 @@ return (rv); } -void -espattach_sbus(parent, self, aux) - struct device *parent, *self; - void *aux; +static int +esp_sbus_attach(device_t dev) { struct esp_softc *esc = (void *)self; struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x; @@ -531,10 +539,6 @@ icookie = bus_intr_establish(esc->sc_bustag, esc->sc_pri, IPL_BIO, ncr53c9x_intr, sc); - /* register interrupt stats */ - evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL, - sc->sc_dev.dv_xname, "intr"); - /* Turn on target selection using the `dma' method */ if (sc->sc_rev != NCR_VARIANT_FAS366) sc->sc_features |= NCR_F_DMASELECT; ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#2 (text+ko) ==== @@ -2080,8 +2080,6 @@ /* and what do the registers say... */ ncr53c9x_readregs(sc); - sc->sc_intrcnt.ev_count++; - /* * At the moment, only a SCSI Bus Reset or Illegal * Command are classed as errors. A disconnect is a ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#3 (text+ko) ==== @@ -269,12 +269,13 @@ }; struct ncr53c9x_softc { - struct device sc_dev; /* us as a device */ + device_t sc_dev; /* us as a device */ - struct evcnt sc_intrcnt; /* intr count */ struct cam_sim *sim; /* our scsi adapter */ struct cam_path *path; /* our scsi channel */ +#if 0 struct device *sc_child; /* attached scsibus, if any */ +#endif struct callout sc_watchdog; /* periodic timer */ struct ncr53c9x_glue *sc_glue; /* glue to MD code */ @@ -342,7 +343,7 @@ int sc_minsync; /* Minimum sync period / 4 */ int sc_maxxfer; /* Maximum transfer size */ - struct simplelock sc_lock;/* driver mutex */ + struct mtx sc_lock; /* driver mutex */ }; /* values for sc_state */ @@ -445,7 +446,7 @@ void ncr53c9x_attach(struct ncr53c9x_softc *); int ncr53c9x_detach(struct ncr53c9x_softc *, int); -void ncr53c9x_action(struct cam_sim *, union *); +void ncr53c9x_action(struct cam_sim *, union ccb *); void ncr53c9x_reset(struct ncr53c9x_softc *); int ncr53c9x_intr(void *); void ncr53c9x_init(struct ncr53c9x_softc *, int); From owner-p4-projects@FreeBSD.ORG Fri May 28 06:44:30 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F2EE16A4D0; Fri, 28 May 2004 06:44:30 -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 48B2716A4CE for ; Fri, 28 May 2004 06:44:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27CA443D41 for ; Fri, 28 May 2004 06:44:30 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4SDhRim053342 for ; Fri, 28 May 2004 06:43:27 -0700 (PDT) (envelope-from cvance@nailabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4SDhRmY053339 for perforce@freebsd.org; Fri, 28 May 2004 06:43:27 -0700 (PDT) (envelope-from cvance@nailabs.com) Date: Fri, 28 May 2004 06:43:27 -0700 (PDT) Message-Id: <200405281343.i4SDhRmY053339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@nailabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 53659 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: Fri, 28 May 2004 13:44:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=53659 Change 53659 by cvance@cvance_sony on 2004/05/28 06:43:25 Consistently call cap_check_cred with a thread as the second parameter. It's ok to use a NULL thread (though it's odd that cap_check_cred even requires a thread, since it doesn't use it) Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#6 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet/in_pcb.c#12 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet/raw_ip.c#11 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet6/in6_pcb.c#11 edit .. //depot/projects/trustedbsd/sebsd/sys/netinet6/in6_src.c#8 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_cap.c#6 (text+ko) ==== @@ -153,5 +153,5 @@ int cap_check(struct thread *td, cap_value_t cap) { - return cap_check_cred(td->td_ucred, cap, 0); + return cap_check_cred(td->td_ucred, td, cap, 0); } ==== //depot/projects/trustedbsd/sebsd/sys/netinet/in_pcb.c#12 (text+ko) ==== @@ -320,7 +320,7 @@ /* GROSS */ if (ntohs(lport) <= ipport_reservedhigh && ntohs(lport) >= ipport_reservedlow && - cap_check_cred(cred, CAP_NET_BIND_SERVICE, PRISON_ROOT)) + cap_check_cred(cred, NULL, CAP_NET_BIND_SERVICE, PRISON_ROOT)) return (EACCES); if (jailed(cred)) prison = 1; @@ -395,7 +395,7 @@ last = ipport_hilastauto; lastport = &pcbinfo->lasthi; } else if (inp->inp_flags & INP_LOWPORT) { - if ((error = cap_check_cred(cred, CAP_NET_BIND_SERVICE, PRISON_ROOT)) != 0) + if ((error = cap_check_cred(cred, NULL, CAP_NET_BIND_SERVICE, PRISON_ROOT)) != 0) return error; first = ipport_lowfirstauto; /* 1023 */ last = ipport_lowlastauto; /* 600 */ ==== //depot/projects/trustedbsd/sebsd/sys/netinet/raw_ip.c#11 (text+ko) ==== @@ -543,7 +543,7 @@ INP_INFO_WUNLOCK(&ripcbinfo); return (EPERM); } - if (td && (error = cap_check_cred(td->td_ucred, CAP_NET_RAW, PRISON_ROOT)) != 0) { + if (td && (error = cap_check_cred(td->td_ucred, td, CAP_NET_RAW, PRISON_ROOT)) != 0) { INP_INFO_WUNLOCK(&ripcbinfo); return error; } ==== //depot/projects/trustedbsd/sebsd/sys/netinet6/in6_pcb.c#11 (text+ko) ==== @@ -188,7 +188,7 @@ /* GROSS */ if (ntohs(lport) < IPV6PORT_RESERVED && - cap_check_cred(cred, CAP_NET_BIND_SERVICE, PRISON_ROOT)) + cap_check_cred(cred, NULL, CAP_NET_BIND_SERVICE, PRISON_ROOT)) return (EACCES); if (so->so_cred->cr_uid != 0 && !IN6_IS_ADDR_MULTICAST(&sin6->sin6_addr)) { ==== //depot/projects/trustedbsd/sebsd/sys/netinet6/in6_src.c#8 (text+ko) ==== @@ -760,7 +760,7 @@ last = ipport_hilastauto; lastport = &pcbinfo->lasthi; } else if (inp->inp_flags & INP_LOWPORT) { - if ((error = cap_check_cred(cred, CAP_NET_BIND_SERVICE, 0))) + if ((error = cap_check_cred(cred, NULL, CAP_NET_BIND_SERVICE, 0))) return error; first = ipport_lowfirstauto; /* 1023 */ last = ipport_lowlastauto; /* 600 */ From owner-p4-projects@FreeBSD.ORG Fri May 28 10:31:06 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25C6E16A4D0; Fri, 28 May 2004 10:31:06 -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 CCDC416A4CF for ; Fri, 28 May 2004 10:31:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9B44543D1F for ; Fri, 28 May 2004 10:31:05 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4SHTBhx009572 for ; Fri, 28 May 2004 10:29:11 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4SHTBDb009569 for perforce@freebsd.org; Fri, 28 May 2004 10:29:11 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Fri, 28 May 2004 10:29:11 -0700 (PDT) Message-Id: <200405281729.i4SHTBDb009569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 53672 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: Fri, 28 May 2004 17:31:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=53672 Change 53672 by scottl@scottl-esp-sparc64 on 2004/05/28 10:28:58 Remove most of the code for attaching to non-FAS366 devices and attaching to independent DMA engines. These configurations do not exist on ultrasparcs, and there is little chance that we will ever support older sparcstations. Also port more functionality. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#4 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri May 28 10:35:05 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 676CF16A4D2; Fri, 28 May 2004 10:35:05 -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 2056716A4CE for ; Fri, 28 May 2004 10:35:05 -0700 (PDT) Received: from mail6.speakeasy.net (mail6.speakeasy.net [216.254.0.206]) by mx1.FreeBSD.org (Postfix) with ESMTP id 93DD143D1F for ; Fri, 28 May 2004 10:35:04 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 6330 invoked from network); 28 May 2004 17:34:44 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 28 May 2004 17:34:43 -0000 Received: from 10.50.40.205 (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.11/8.12.11) with ESMTP id i4SHYeMr029480; Fri, 28 May 2004 13:34:40 -0400 (EDT) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: Scott Long Date: Fri, 28 May 2004 13:35:19 -0400 User-Agent: KMail/1.6 References: <200405281729.i4SHTBDb009569@repoman.freebsd.org> In-Reply-To: <200405281729.i4SHTBDb009569@repoman.freebsd.org> MIME-Version: 1.0 Content-Disposition: inline Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200405281335.19866.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.63 (2004-01-11) on server.baldwin.cx cc: Perforce Change Reviews Subject: Re: PERFORCE change 53672 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: Fri, 28 May 2004 17:35:05 -0000 On Friday 28 May 2004 01:29 pm, Scott Long wrote: > http://perforce.freebsd.org/chv.cgi?CH=53672 > > Change 53672 by scottl@scottl-esp-sparc64 on 2004/05/28 10:28:58 > > Remove most of the code for attaching to non-FAS366 devices and > attaching to independent DMA engines. These configurations do not > exist on ultrasparcs, and there is little chance that we will > ever support older sparcstations. Also port more functionality. Forgot to save the file before submitting? > Affected files ... > > .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#4 edit > > Differences ... > > ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#4 (text+ko) > ==== -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org From owner-p4-projects@FreeBSD.ORG Fri May 28 10:41:17 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3451116A4D0; Fri, 28 May 2004 10:41:17 -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 DE02716A4CE for ; Fri, 28 May 2004 10:41:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2EB743D2D for ; Fri, 28 May 2004 10:41:16 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4SHeQaL011710 for ; Fri, 28 May 2004 10:40:26 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4SHeQaK011707 for perforce@freebsd.org; Fri, 28 May 2004 10:40:26 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Fri, 28 May 2004 10:40:26 -0700 (PDT) Message-Id: <200405281740.i4SHeQaK011707@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 53674 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: Fri, 28 May 2004 17:41:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=53674 Change 53674 by scottl@scottl-esp-sparc64 on 2004/05/28 10:40:06 Actually submit the file that should have been submitted last time. Pointy hat graciously given by jhb =-) Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#5 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#5 (text+ko) ==== @@ -64,8 +64,6 @@ #include #include -#include - /* #define ESP_SBUS_DEBUG */ struct esp_softc { @@ -97,18 +95,20 @@ {0, 0} }; -#if 0 -CFATTACH_DECL(esp_sbus, sizeof(struct esp_softc), - espmatch_sbus, espattach_sbus, NULL, NULL); -#endif +static driver_t esp_sbus_driver = { + "esp", + esp_sbus_methods, + sizeof(struct esp_softc) +}; + +static devclass_t esp_devclass; +DRIVER_MODULE(esp, sbus, esp_sbus_driver, esp_devclass, 0, 0); /* * Functions and the switch for the MI code. */ static u_char esp_read_reg(struct ncr53c9x_softc *, int); static void esp_write_reg(struct ncr53c9x_softc *, int, u_char); -static u_char esp_rdreg1(struct ncr53c9x_softc *, int); -static void esp_wrreg1(struct ncr53c9x_softc *, int, u_char); static int esp_dma_isintr(struct ncr53c9x_softc *); static void esp_dma_reset(struct ncr53c9x_softc *); static int esp_dma_intr(struct ncr53c9x_softc *); @@ -117,6 +117,7 @@ static void esp_dma_go(struct ncr53c9x_softc *); static void esp_dma_stop(struct ncr53c9x_softc *); static int esp_dma_isactive(struct ncr53c9x_softc *); +static void espattach(struct esp_softc *, struct ncr53c9x_glue *); static struct ncr53c9x_glue esp_sbus_glue = { esp_read_reg, @@ -131,66 +132,48 @@ NULL, /* gl_clear_latched_intr */ }; -static struct ncr53c9x_glue esp_sbus_glue1 = { - esp_rdreg1, - esp_wrreg1, - esp_dma_isintr, - esp_dma_reset, - esp_dma_intr, - esp_dma_setup, - esp_dma_go, - esp_dma_stop, - esp_dma_isactive, - NULL, /* gl_clear_latched_intr */ -}; - -static void espattach(struct esp_softc *, struct ncr53c9x_glue *); - static int esp_sbus_probe(device_t dev) { - int rv; - struct sbus_attach_args *sa = aux; + char *name; - if (strcmp("SUNW,fas", sa->sa_name) == 0) - return 1; + name = sbus_get_name(dev); + if (strcmp("SUNW,fas", name) == 0) + return (-10); - rv = (strcmp(cf->cf_name, sa->sa_name) == 0 || - strcmp("ptscII", sa->sa_name) == 0); - return (rv); + return (ENXIO); } static int esp_sbus_attach(device_t dev) { - struct esp_softc *esc = (void *)self; + struct esp_softc *esc = device_get_softc(dev); struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x; - struct sbus_attach_args *sa = aux; struct lsi64854_softc *lsc; + phandle_t node; + char *name; int burst, sbusburst; - esc->sc_bustag = sa->sa_bustag; - esc->sc_dmatag = sa->sa_dmatag; + node = sbus_get_node(dev); + name = sbus_get_name(dev); + if (OF_getprop(node, "initiator-id", &sc->sc_id, + sizeof(sc->sc_id)) == -1) + sc->sc_id = 7;; + sc->sc_freq = sbus_get_clockfreq(dev); - sc->sc_id = PROM_getpropint(sa->sa_node, "initiator-id", 7); - sc->sc_freq = PROM_getpropint(sa->sa_node, "clock-frequency", -1); - if (sc->sc_freq < 0) - sc->sc_freq = ((struct sbus_softc *) - sc->sc_dev.dv_parent)->sc_clockfreq; - #ifdef ESP_SBUS_DEBUG printf("%s: espattach_sbus: sc_id %d, freq %d\n", self->dv_xname, sc->sc_id, sc->sc_freq); #endif - if (strcmp("SUNW,fas", sa->sa_name) == 0) { + if (strcmp("SUNW,fas", name) == 0) { /* * fas has 2 register spaces: dma(lsi64854) and SCSI core (ncr53c9x) */ if (sa->sa_nreg != 2) { printf("%s: %d register spaces\n", self->dv_xname, sa->sa_nreg); - return; + return (ENXIO); } /* @@ -202,7 +185,7 @@ if (lsc == NULL) { printf("%s: out of memory (lsi64854_softc)\n", self->dv_xname); - return; + return (ENOMEM); } esc->sc_dma = lsc; @@ -224,7 +207,7 @@ 0, &lsc->sc_regs) != 0) { printf("%s: cannot map dma registers\n", self->dv_xname); - return; + return (ENXIO); } } @@ -239,7 +222,7 @@ if (sbusburst == 0) sbusburst = SBUS_BURST_32 - 1; /* 1->16 */ - burst = PROM_getpropint(sa->sa_node, "burst-sizes", -1); + burst = sbus_get_burstsz(dev); #if ESP_SBUS_DEBUG printf("espattach_sbus: burst 0x%x, sbus 0x%x\n", @@ -275,13 +258,13 @@ printf("%s @ sbus: " "cannot map scsi core registers\n", self->dv_xname); - return; + return (ENXIO); } } if (sa->sa_nintr == 0) { printf("\n%s: no interrupt property\n", self->dv_xname); - return; + return (ENXIO); } esc->sc_pri = sa->sa_pri; @@ -294,146 +277,17 @@ espattach(esc, &esp_sbus_glue); - return; + return (0); } - /* - * Find the DMA by poking around the dma device structures - * - * What happens here is that if the dma driver has not been - * configured, then this returns a NULL pointer. Then when the - * dma actually gets configured, it does the opposing test, and - * if the sc->sc_esp field in it's softc is NULL, then tries to - * find the matching esp driver. - */ - esc->sc_dma = (struct lsi64854_softc *) - getdevunit("dma", sc->sc_dev.dv_unit); - - /* - * and a back pointer to us, for DMA - */ - if (esc->sc_dma) - esc->sc_dma->sc_client = sc; - else { - printf("\n"); - panic("espattach: no dma found"); - } - - /* - * The `ESC' DMA chip must be reset before we can access - * the esp registers. - */ - if (esc->sc_dma->sc_rev == DMAREV_ESC) - DMA_RESET(esc->sc_dma); - - /* - * Map my registers in, if they aren't already in virtual - * address space. - */ - if (sa->sa_npromvaddrs) { - sbus_promaddr_to_handle(sa->sa_bustag, - sa->sa_promvaddrs[0], &esc->sc_reg); - } else { - if (sbus_bus_map(sa->sa_bustag, - sa->sa_slot, sa->sa_offset, sa->sa_size, - 0, &esc->sc_reg) != 0) { - printf("%s @ sbus: cannot map registers\n", - self->dv_xname); - return; - } - } - - if (sa->sa_nintr == 0) { - /* - * No interrupt properties: we quit; this might - * happen on e.g. a Sparc X terminal. - */ - printf("\n%s: no interrupt property\n", self->dv_xname); - return; - } - - esc->sc_pri = sa->sa_pri; - -#if 0 - /* add me to the sbus structures */ - esc->sc_sd.sd_reset = (void *) ncr53c9x_reset; - sbus_establish(&esc->sc_sd, &sc->sc_dev); -#endif - - if (strcmp("ptscII", sa->sa_name) == 0) { - espattach(esc, &esp_sbus_glue1); - } else { - espattach(esc, &esp_sbus_glue); - } -} - -void -espattach_dma(parent, self, aux) - struct device *parent, *self; - void *aux; -{ - struct esp_softc *esc = (void *)self; - struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x; - struct sbus_attach_args *sa = aux; - - if (strcmp("ptscII", sa->sa_name) == 0) { - return; - } - - esc->sc_bustag = sa->sa_bustag; - esc->sc_dmatag = sa->sa_dmatag; - - sc->sc_id = PROM_getpropint(sa->sa_node, "initiator-id", 7); - sc->sc_freq = PROM_getpropint(sa->sa_node, "clock-frequency", -1); - - esc->sc_dma = (struct lsi64854_softc *)parent; - esc->sc_dma->sc_client = sc; - - /* - * Map my registers in, if they aren't already in virtual - * address space. - */ - if (sa->sa_npromvaddrs) { - sbus_promaddr_to_handle(sa->sa_bustag, - sa->sa_promvaddrs[0], &esc->sc_reg); - } else { - if (sbus_bus_map(sa->sa_bustag, - sa->sa_slot, sa->sa_offset, sa->sa_size, - 0, &esc->sc_reg) != 0) { - printf("%s @ dma: cannot map registers\n", - self->dv_xname); - return; - } - } - - if (sa->sa_nintr == 0) { - /* - * No interrupt properties: we quit; this might - * happen on e.g. a Sparc X terminal. - */ - printf("\n%s: no interrupt property\n", self->dv_xname); - return; - } - - esc->sc_pri = sa->sa_pri; - -#if 0 - /* Assume SBus is grandparent */ - esc->sc_sd.sd_reset = (void *) ncr53c9x_reset; - sbus_establish(&esc->sc_sd, parent); -#endif - - espattach(esc, &esp_sbus_glue); + return (ENXIO); } - /* * Attach this instance, and then all the sub-devices */ void -espattach(esc, gluep) - struct esp_softc *esc; - struct ncr53c9x_glue *gluep; +espattach(struct esp_softc *esc, struct ncr53c9x_glue *gluep) { struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x; void *icookie; @@ -635,27 +489,6 @@ bus_space_write_1(esc->sc_bustag, esc->sc_reg, reg * 4, v); } -u_char -esp_rdreg1(sc, reg) - struct ncr53c9x_softc *sc; - int reg; -{ - struct esp_softc *esc = (struct esp_softc *)sc; - - return (bus_space_read_1(esc->sc_bustag, esc->sc_reg, reg)); -} - -void -esp_wrreg1(sc, reg, v) - struct ncr53c9x_softc *sc; - int reg; - u_char v; -{ - struct esp_softc *esc = (struct esp_softc *)sc; - - bus_space_write_1(esc->sc_bustag, esc->sc_reg, reg, v); -} - int esp_dma_isintr(sc) struct ncr53c9x_softc *sc; From owner-p4-projects@FreeBSD.ORG Fri May 28 13:36:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 210DF16A4D1; Fri, 28 May 2004 13:36:03 -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 D4A8C16A4CF for ; Fri, 28 May 2004 13:36:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CCF3543D1D for ; Fri, 28 May 2004 13:36:02 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4SKZ3se058078 for ; Fri, 28 May 2004 13:35:03 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4SKZ3hq058075 for perforce@freebsd.org; Fri, 28 May 2004 13:35:03 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Fri, 28 May 2004 13:35:03 -0700 (PDT) Message-Id: <200405282035.i4SKZ3hq058075@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 53682 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: Fri, 28 May 2004 20:36:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=53682 Change 53682 by scottl@scottl-esp-sparc64 on 2004/05/28 13:35:00 Start using FreeBSD bus_space conventions. Also eliminate dv_xname usage. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#6 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854var.h#3 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#6 (text+ko) ==== @@ -67,16 +67,17 @@ /* #define ESP_SBUS_DEBUG */ struct esp_softc { - struct ncr53c9x_softc sc_ncr53c9x; /* glue to MI code */ + struct ncr53c9x_softc sc_ncr53c9x; /* glue to MI code */ #if 0 struct sbusdev sc_sd; /* sbus device */ #endif - bus_space_tag_t sc_bustag; - bus_dma_tag_t sc_dmatag; + int sc_rid; + struct resource *sc_res; + bus_space_handle_t sc_regh; + bus_space_tag_t sc_regt; - bus_space_handle_t sc_reg; /* the registers */ - struct lsi64854_softc *sc_dma; /* pointer to my dma */ + struct lsi64854_softc *sc_dma; /* pointer to my dma */ int sc_pri; /* SBUS priority */ }; @@ -151,136 +152,103 @@ struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x; struct lsi64854_softc *lsc; phandle_t node; - char *name; int burst, sbusburst; node = sbus_get_node(dev); - name = sbus_get_name(dev); if (OF_getprop(node, "initiator-id", &sc->sc_id, sizeof(sc->sc_id)) == -1) sc->sc_id = 7;; sc->sc_freq = sbus_get_clockfreq(dev); #ifdef ESP_SBUS_DEBUG - printf("%s: espattach_sbus: sc_id %d, freq %d\n", - self->dv_xname, sc->sc_id, sc->sc_freq); + device_printf(dev, "espattach_sbus: sc_id %d, freq %d\n", + sc->sc_id, sc->sc_freq); #endif - if (strcmp("SUNW,fas", name) == 0) { + /* + * allocate space for dma, in SUNW,fas there are no separate + * dma device + */ + lsc = malloc(sizeof (struct lsi64854_softc), M_DEVBUF, M_NOWAIT); - /* - * fas has 2 register spaces: dma(lsi64854) and SCSI core (ncr53c9x) - */ - if (sa->sa_nreg != 2) { - printf("%s: %d register spaces\n", self->dv_xname, sa->sa_nreg); - return (ENXIO); - } + if (lsc == NULL) { + device_printf(dev, "out of memory (lsi64854_softc)\n"); + return (ENOMEM); + } + esc->sc_dma = lsc; - /* - * allocate space for dma, in SUNW,fas there are no separate - * dma device - */ - lsc = malloc(sizeof (struct lsi64854_softc), M_DEVBUF, M_NOWAIT); + /* + * fas has 2 register spaces: dma(lsi64854) and SCSI core (ncr53c9x) + */ - if (lsc == NULL) { - printf("%s: out of memory (lsi64854_softc)\n", - self->dv_xname); - return (ENOMEM); - } - esc->sc_dma = lsc; + /* Map dma registers */ + lsc->sc_rid = 0; + if ((lsc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &lsc->sc_rid, RF_ACTIVE)) == NULL) { + device_printf(dev, "cannot map dma registers\n"); + free(lsc, M_DEVBUF); + return (ENXIO); + } + lsc->sc_regt = rman_get_bustag(lsc->sc_res); + lsc->sc_regh = rman_get_bushandle(lsc->sc_res); - lsc->sc_bustag = sa->sa_bustag; - lsc->sc_dmatag = sa->sa_dmatag; + /* + * XXX is this common(from bpp.c), the same in dma_sbus...etc. + * + * Get transfer burst size from PROM and plug it into the + * controller registers. This is needed on the Sun4m; do + * others need it too? + */ +#if 0 + sbusburst = ((struct sbus_softc *)parent)->sc_burst; +#endif + if (sbusburst == 0) + sbusburst = SBUS_BURST_32 - 1; /* 1->16 */ - bcopy(sc->sc_dev.dv_xname, lsc->sc_dev.dv_xname, - sizeof (lsc->sc_dev.dv_xname)); - - /* Map dma registers */ - if (sa->sa_npromvaddrs) { - sbus_promaddr_to_handle(sa->sa_bustag, - sa->sa_promvaddrs[0], &lsc->sc_regs); - } else { - if (sbus_bus_map(sa->sa_bustag, - sa->sa_reg[0].oa_space, - sa->sa_reg[0].oa_base, - sa->sa_reg[0].oa_size, - 0, &lsc->sc_regs) != 0) { - printf("%s: cannot map dma registers\n", - self->dv_xname); - return (ENXIO); - } - } + burst = sbus_get_burstsz(dev); - /* - * XXX is this common(from bpp.c), the same in dma_sbus...etc. - * - * Get transfer burst size from PROM and plug it into the - * controller registers. This is needed on the Sun4m; do - * others need it too? - */ - sbusburst = ((struct sbus_softc *)parent)->sc_burst; - if (sbusburst == 0) - sbusburst = SBUS_BURST_32 - 1; /* 1->16 */ - - burst = sbus_get_burstsz(dev); - #if ESP_SBUS_DEBUG - printf("espattach_sbus: burst 0x%x, sbus 0x%x\n", - burst, sbusburst); + printf("espattach_sbus: burst 0x%x, sbus 0x%x\n", burst, sbusburst); #endif - if (burst == -1) - /* take SBus burst sizes */ - burst = sbusburst; + if (burst == -1) + /* take SBus burst sizes */ + burst = sbusburst; - /* Clamp at parent's burst sizes */ - burst &= sbusburst; - lsc->sc_burst = (burst & SBUS_BURST_32) ? 32 : - (burst & SBUS_BURST_16) ? 16 : 0; + /* Clamp at parent's burst sizes */ + burst &= sbusburst; + lsc->sc_burst = (burst & SBUS_BURST_32) ? 32 : + (burst & SBUS_BURST_16) ? 16 : 0; - lsc->sc_channel = L64854_CHANNEL_SCSI; - lsc->sc_client = sc; + lsc->sc_channel = L64854_CHANNEL_SCSI; + lsc->sc_client = sc; - lsi64854_attach(lsc); + lsi64854_attach(lsc); - /* - * map SCSI core registers - */ - if (sa->sa_npromvaddrs > 1) { - sbus_promaddr_to_handle(sa->sa_bustag, - sa->sa_promvaddrs[1], &esc->sc_reg); - } else { - if (sbus_bus_map(sa->sa_bustag, - sa->sa_reg[1].oa_space, - sa->sa_reg[1].oa_base, - sa->sa_reg[1].oa_size, - 0, &esc->sc_reg) != 0) { - printf("%s @ sbus: " - "cannot map scsi core registers\n", - self->dv_xname); - return (ENXIO); - } - } + /* + * map SCSI core registers + */ + esc->sc_rid = 1; + if ((esc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &esc->sc_rid, RF_ACTIVE)) == NULL) { + device_printf(dev, "cannot map scsi core registers\n"); + free(lsc, M_DEVBUF); + return (ENXIO); + } + esc->sc_regt = rman_get_bustag(esc->sc_res); + esc->sc_regh = rman_get_bushandle(esc->sc_res); - if (sa->sa_nintr == 0) { - printf("\n%s: no interrupt property\n", self->dv_xname); - return (ENXIO); - } +#if 0 + esc->sc_pri = sa->sa_pri; - esc->sc_pri = sa->sa_pri; - -#if 0 - /* add me to the sbus structures */ - esc->sc_sd.sd_reset = (void *) ncr53c9x_reset; - sbus_establish(&esc->sc_sd, &sc->sc_dev); + /* add me to the sbus structures */ + esc->sc_sd.sd_reset = (void *) ncr53c9x_reset; + sbus_establish(&esc->sc_sd, &sc->sc_dev); #endif - espattach(esc, &esp_sbus_glue); + espattach(esc, &esp_sbus_glue); - return (0); - } - - return (ENXIO); + return (0); } /* @@ -464,7 +432,7 @@ struct esp_softc *esc = (struct esp_softc *)sc; u_char v; - v = bus_space_read_1(esc->sc_bustag, esc->sc_reg, reg * 4); + v = bus_space_read_1(esc->sc_regt, esc->sc_regh, reg * 4); #ifdef ESP_SBUS_DEBUG if (esp_sbus_debug && (reg < 0x10) && esp__read_regnames[reg].r_flag) printf("RD:%x <%s> %x\n", reg * 4, @@ -486,7 +454,7 @@ printf("WR:%x <%s> %x\n", reg * 4, ((unsigned)reg < 0x10) ? esp__write_regnames[reg].r_name : "<***>", v); #endif - bus_space_write_1(esc->sc_bustag, esc->sc_reg, reg * 4, v); + bus_space_write_1(esc->sc_regt, esc->sc_regh, reg * 4, v); } int ==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854var.h#3 (text+ko) ==== @@ -38,10 +38,11 @@ struct lsi64854_softc { char *dv_name; - bus_space_tag_t sc_bustag; /* bus tags */ - bus_dma_tag_t sc_dmatag; - bus_space_handle_t sc_regs; /* the registers */ + int sc_rid; + struct resource *sc_res; + bus_space_handle_t sc_regh; + bus_space_tag_t sc_regt; u_int sc_rev; /* revision */ int sc_burst; /* max suported burst size */ @@ -72,10 +73,10 @@ }; #define L64854_GCSR(sc) \ - (bus_space_read_4((sc)->sc_bustag, (sc)->sc_regs, L64854_REG_CSR)) + (bus_space_read_4((sc)->sc_regt, (sc)->sc_regh, L64854_REG_CSR)) #define L64854_SCSR(sc, csr) \ - bus_space_write_4((sc)->sc_bustag, (sc)->sc_regs, L64854_REG_CSR, csr) + bus_space_write_4((sc)->sc_regt, (sc)->sc_regh, L64854_REG_CSR, csr) /* From owner-p4-projects@FreeBSD.ORG Fri May 28 14:08:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 400DC16A4D0; Fri, 28 May 2004 14:08:03 -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 F0F9F16A4CE for ; Fri, 28 May 2004 14:08:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B144243D2D for ; Fri, 28 May 2004 14:08:02 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4SL7lou065317 for ; Fri, 28 May 2004 14:07:47 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4SL7kuW065314 for perforce@freebsd.org; Fri, 28 May 2004 14:07:46 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Fri, 28 May 2004 14:07:46 -0700 (PDT) Message-Id: <200405282107.i4SL7kuW065314@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 53687 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: Fri, 28 May 2004 21:08:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=53687 Change 53687 by scottl@scottl-esp-sparc64 on 2004/05/28 14:06:53 Use FreeBSD conventions for allocating an interrupt. Remove the code for negotiating the sbus burst size as that is already done but the sbus accessor. Remove other barriers to having this compile. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#7 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#3 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#4 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#7 (text+ko) ==== @@ -68,6 +68,7 @@ struct esp_softc { struct ncr53c9x_softc sc_ncr53c9x; /* glue to MI code */ + struct device *sc_dev; #if 0 struct sbusdev sc_sd; /* sbus device */ #endif @@ -77,6 +78,10 @@ bus_space_handle_t sc_regh; bus_space_tag_t sc_regt; + int sc_irqrid; + struct resource *sc_irqres; + void *sc_irq; + struct lsi64854_softc *sc_dma; /* pointer to my dma */ int sc_pri; /* SBUS priority */ @@ -152,8 +157,9 @@ struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x; struct lsi64854_softc *lsc; phandle_t node; - int burst, sbusburst; + int burst; + esc->sc_dev = dev; node = sbus_get_node(dev); if (OF_getprop(node, "initiator-id", &sc->sc_id, sizeof(sc->sc_id)) == -1) @@ -192,31 +198,12 @@ lsc->sc_regt = rman_get_bustag(lsc->sc_res); lsc->sc_regh = rman_get_bushandle(lsc->sc_res); - /* - * XXX is this common(from bpp.c), the same in dma_sbus...etc. - * - * Get transfer burst size from PROM and plug it into the - * controller registers. This is needed on the Sun4m; do - * others need it too? - */ -#if 0 - sbusburst = ((struct sbus_softc *)parent)->sc_burst; -#endif - if (sbusburst == 0) - sbusburst = SBUS_BURST_32 - 1; /* 1->16 */ - burst = sbus_get_burstsz(dev); #if ESP_SBUS_DEBUG - printf("espattach_sbus: burst 0x%x, sbus 0x%x\n", burst, sbusburst); + printf("espattach_sbus: burst 0x%x\n", burst); #endif - if (burst == -1) - /* take SBus burst sizes */ - burst = sbusburst; - - /* Clamp at parent's burst sizes */ - burst &= sbusburst; lsc->sc_burst = (burst & SBUS_BURST_32) ? 32 : (burst & SBUS_BURST_16) ? 16 : 0; @@ -258,7 +245,6 @@ espattach(struct esp_softc *esc, struct ncr53c9x_glue *gluep) { struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x; - void *icookie; unsigned int uid = 0; /* @@ -358,16 +344,23 @@ } /* Establish interrupt channel */ - icookie = bus_intr_establish(esc->sc_bustag, esc->sc_pri, IPL_BIO, - ncr53c9x_intr, sc); + esc->sc_irqrid = 0; + if ((esc->sc_irqres = bus_alloc_resource_any(esc->sc_dev, SYS_RES_IRQ, + &esc->sc_irqrid, RF_SHAREABLE|RF_ACTIVE)) == NULL) { + device_printf(esc->sc_dev, "Cannot allocate interrupt\n"); + return; + } + if (bus_setup_intr(esc->sc_dev, esc->sc_irqres, + INTR_TYPE_BIO|INTR_ENTROPY, ncr53c9x_intr, sc, &esc->sc_irq)) { + device_printf(esc->sc_dev, "Cannot set up interrupt\n"); + return; + } /* Turn on target selection using the `dma' method */ if (sc->sc_rev != NCR_VARIANT_FAS366) sc->sc_features |= NCR_F_DMASELECT; /* Do the common parts of attachment. */ - sc->sc_adapter.adapt_minphys = minphys; - sc->sc_adapter.adapt_request = ncr53c9x_scsipi_request; ncr53c9x_attach(sc); } ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9x.c#3 (text+ko) ==== @@ -2059,7 +2059,7 @@ * * Most of this needs verifying. */ -int +void ncr53c9x_intr(arg) void *arg; { ==== //depot/projects/scottl-esp/src/sys/dev/esp/ncr53c9xvar.h#4 (text+ko) ==== @@ -448,7 +448,7 @@ int ncr53c9x_detach(struct ncr53c9x_softc *, int); void ncr53c9x_action(struct cam_sim *, union ccb *); void ncr53c9x_reset(struct ncr53c9x_softc *); -int ncr53c9x_intr(void *); +void ncr53c9x_intr(void *); void ncr53c9x_init(struct ncr53c9x_softc *, int); #endif /* _DEV_IC_NCR53C9XVAR_H_ */ From owner-p4-projects@FreeBSD.ORG Fri May 28 14:31:25 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B33F516A4D0; Fri, 28 May 2004 14:31:24 -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 8494B16A4CE for ; Fri, 28 May 2004 14:31:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7CA0B43D1F for ; Fri, 28 May 2004 14:31:24 -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.11/8.12.11) with ESMTP id i4SLVJ0A070485 for ; Fri, 28 May 2004 14:31:19 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4SLVHKg070461 for perforce@freebsd.org; Fri, 28 May 2004 14:31:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 28 May 2004 14:31:17 -0700 (PDT) Message-Id: <200405282131.i4SLVHKg070461@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 53690 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: Fri, 28 May 2004 21:31:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=53690 Change 53690 by rwatson@rwatson_paprika on 2004/05/28 14:30:56 Selective integrate of ithread preemption fix from FreeBSD CVS HEAD to netperf_socket branch. Affected files ... .. //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/i386/i386/intr_machdep.c#3 (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/i386/i386/intr_machdep.c,v 1.5 2004/05/04 21:02:56 jhb Exp $ + * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.6 2004/05/28 17:50:07 jhb Exp $ */ /* @@ -183,7 +183,6 @@ if (vector == 0) clkintr_pending = 1; - critical_enter(); if (ih != NULL && ih->ih_flags & IH_FAST) { /* * Execute fast interrupt handlers directly. @@ -191,6 +190,7 @@ * with a NULL argument, then we pass it a pointer to * a trapframe as its argument. */ + critical_enter(); TAILQ_FOREACH(ih, &it->it_handlers, ih_next) { MPASS(ih->ih_flags & IH_FAST); CTR3(KTR_INTR, "%s: executing handler %p(%p)", @@ -204,6 +204,7 @@ } isrc->is_pic->pic_eoi_source(isrc); error = 0; + critical_exit(); } else { /* * For stray and threaded interrupts, we mask and EOI the @@ -216,7 +217,6 @@ else error = ithread_schedule(it, !cold); } - critical_exit(); if (error == EINVAL) { atomic_add_long(isrc->is_straycount, 1); if (*isrc->is_straycount < MAX_STRAY_LOG) From owner-p4-projects@FreeBSD.ORG Fri May 28 21:23:36 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4387916A4D0; Fri, 28 May 2004 21:23:36 -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 DEB8516A4CE for ; Fri, 28 May 2004 21:23:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D8D7243D49 for ; Fri, 28 May 2004 21:23:35 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4T4NB1A073508 for ; Fri, 28 May 2004 21:23:11 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4T4NAqp073505 for perforce@freebsd.org; Fri, 28 May 2004 21:23:10 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Fri, 28 May 2004 21:23:10 -0700 (PDT) Message-Id: <200405290423.i4T4NAqp073505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 53716 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: Sat, 29 May 2004 04:23:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=53716 Change 53716 by scottl@scottl-esp-sparc64 on 2004/05/28 21:22:13 Add default dummy functions for suspend, resume, and attach. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#8 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#8 (text+ko) ==== @@ -89,15 +89,16 @@ static int esp_sbus_probe(device_t); static int esp_sbus_attach(device_t); +static int esp_sbus_detach(device_t); +static int esp_sbus_suspend(device_t); +static int esp_sbus_resume(device_t); static device_method_t esp_sbus_methods[] = { DEVMETHOD(device_probe, esp_sbus_probe), DEVMETHOD(device_attach, esp_sbus_attach), -#if 0 - DEVMETHOD(device_detach, espdetach_sbus), - DEVMETHOD(device_suspend, espsuspend_sbus), - DEVMETHOD(device_resume, espresume_sbus), -#endif + DEVMETHOD(device_detach, esp_sbus_detach), + DEVMETHOD(device_suspend, esp_sbus_suspend), + DEVMETHOD(device_resume, esp_sbus_resume), {0, 0} }; @@ -238,6 +239,29 @@ return (0); } +static int +esp_sbus_detach(device_t dev) +{ + struct ncr53c9x_softc *sc; + struct esp_softc *esc; + + esc = device_get_softc(dev); + sc = &esc->sc_ncr53c9x; + return (ncr53c9x_detach(sc, 0)); +} + +static int +esp_sbus_suspend(device_t dev) +{ + return (ENXIO); +} + +static int +esp_sbus_resume(device_t dev) +{ + return (ENXIO); +} + /* * Attach this instance, and then all the sub-devices */ From owner-p4-projects@FreeBSD.ORG Sat May 29 02:11:46 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA8F616A4D0; Sat, 29 May 2004 02:11:45 -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 8049816A4CE for ; Sat, 29 May 2004 02:11:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7AD9B43D1D for ; Sat, 29 May 2004 02:11:45 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i4T9BAHa041415 for ; Sat, 29 May 2004 02:11:10 -0700 (PDT) (envelope-from scottl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i4T9BAuE041412 for perforce@freebsd.org; Sat, 29 May 2004 02:11:10 -0700 (PDT) (envelope-from scottl@freebsd.org) Date: Sat, 29 May 2004 02:11:10 -0700 (PDT) Message-Id: <200405290911.i4T9BAuE041412@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to scottl@freebsd.org using -f From: Scott Long To: Perforce Change Reviews Subject: PERFORCE change 53734 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: Sat, 29 May 2004 09:11:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=53734 Change 53734 by scottl@scottl-esp-sparc64 on 2004/05/29 02:11:02 Starting changing the DMA engine code so that it can be compiled. Fix up headers, modify bus_space usage, etc. Affected files ... .. //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#9 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#3 edit .. //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854var.h#4 edit Differences ... ==== //depot/projects/scottl-esp/src/sys/dev/esp/esp_sbus.c#9 (text+ko) ==== @@ -210,6 +210,7 @@ lsc->sc_channel = L64854_CHANNEL_SCSI; lsc->sc_client = sc; + lsc->sc_dev = dev; lsi64854_attach(lsc); ==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854.c#3 (text+ko) ==== @@ -37,30 +37,26 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lsi64854.c,v 1.22 2002/10/01 07:07:03 petrov Exp $"); #include #include +#include #include -#include -#include -#include - -#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include -#include -#include +#include +#include void lsi64854_reset(struct lsi64854_softc *); int lsi64854_setup(struct lsi64854_softc *, caddr_t *, size_t *, @@ -97,7 +93,7 @@ { u_int32_t csr; - sc->dv_name = device_get_nameunit(sc->sc_client); + sc->dv_name = device_get_nameunit(sc->sc_dev); /* Indirect functions */ switch (sc->sc_channel) { @@ -279,7 +275,7 @@ L64854_SCSR(sc, csr); if (sc->sc_rev == DMAREV_HME) { - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_ADDR, 0); + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR, 0); sc->sc_dmactl = csr; } sc->sc_active = 0; @@ -328,7 +324,7 @@ L64854_SCSR(sc, sc->sc_dmactl | L64854_RESET); L64854_SCSR(sc, sc->sc_dmactl); - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_CNT, *dmasize); + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT, *dmasize); } /* Program the DMA address */ @@ -343,7 +339,7 @@ datain ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE); - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_ADDR, + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR, sc->sc_dmamap->dm_segs[0].ds_addr); } @@ -353,7 +349,7 @@ long eaddr = bcnt + (long)*sc->sc_dmaaddr; if ((eaddr & PGOFSET) != 0) bcnt = roundup(bcnt, PAGE_SIZE); - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_CNT, + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT, bcnt); } @@ -395,7 +391,7 @@ csr = L64854_GCSR(sc); DPRINTF(LDB_SCSI, ("%s: dmaintr: addr 0x%x, csr %s\n", sc->dv_name, - bus_space_read_4(sc->sc_bustag, sc->sc_regs, L64854_REG_ADDR), + bus_space_read_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR), bitmask_snprintf(csr, DDMACSR_BITS, bits, sizeof(bits)))); if (csr & (D_ERR_PEND|D_SLAVE_ERR)) { @@ -590,10 +586,10 @@ datain ? BUS_DMASYNC_PREREAD : BUS_DMASYNC_PREWRITE); - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_ADDR, + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR, sc->sc_dmamap->dm_segs[0].ds_addr); - bus_space_write_4(sc->sc_bustag, sc->sc_regs, L64854_REG_CNT, + bus_space_write_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT, sc->sc_dmasize); } @@ -634,11 +630,11 @@ csr = L64854_GCSR(sc); DPRINTF(LDB_PP, ("%s: pp intr: addr 0x%x, csr %s\n", sc->dv_name, - bus_space_read_4(sc->sc_bustag, sc->sc_regs, L64854_REG_ADDR), + bus_space_read_4(sc->sc_regt, sc->sc_regh, L64854_REG_ADDR), bitmask_snprintf(csr, PDMACSR_BITS, bits, sizeof(bits)))); if (csr & (P_ERR_PEND|P_SLAVE_ERR)) { - resid = bus_space_read_4(sc->sc_bustag, sc->sc_regs, + resid = bus_space_read_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT); printf("%s: pp error: resid %d csr=%s\n", sc->dv_name, resid, bitmask_snprintf(csr, PDMACSR_BITS, bits,sizeof(bits))); @@ -653,7 +649,7 @@ if (sc->sc_active != 0) { DMA_DRAIN(sc, 0); - resid = bus_space_read_4(sc->sc_bustag, sc->sc_regs, + resid = bus_space_read_4(sc->sc_regt, sc->sc_regh, L64854_REG_CNT); } ==== //depot/projects/scottl-esp/src/sys/dev/esp/lsi64854var.h#4 (text+ko) ==== @@ -37,7 +37,8 @@ */ struct lsi64854_softc { - char *dv_name; + device_t sc_dev; + const char *dv_name; int sc_rid; struct resource *sc_res;