From owner-p4-projects@FreeBSD.ORG Sun Aug 8 08:56:32 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8205A106567A; Sun, 8 Aug 2010 08:56:32 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 256BC1065678 for ; Sun, 8 Aug 2010 08:56:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 12DD88FC24 for ; Sun, 8 Aug 2010 08:56:32 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o788uVrp067151 for ; Sun, 8 Aug 2010 08:56:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o788uV1O067149 for perforce@freebsd.org; Sun, 8 Aug 2010 08:56:31 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 8 Aug 2010 08:56:31 GMT Message-Id: <201008080856.o788uV1O067149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2010 08:56:32 -0000 http://p4web.freebsd.org/@@182067?ac=10 Change 182067 by hselasky@hselasky_laptop001 on 2010/08/08 08:55:46 USB core: - extend use of clear stall bus method. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#26 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#76 edit .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#41 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#183 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_controller.h#26 (text+ko) ==== @@ -97,6 +97,9 @@ void (*get_hw_ep_profile) (struct usb_device *udev, const struct usb_hw_ep_profile **ppf, uint8_t ep_addr); void (*set_stall) (struct usb_device *udev, struct usb_xfer *xfer, struct usb_endpoint *ep, uint8_t *did_stall); + + /* USB Device mode mandatory. USB Host mode optional. */ + void (*clear_stall) (struct usb_device *udev, struct usb_endpoint *ep); /* Optional transfer polling support */ ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#76 (text+ko) ==== @@ -928,8 +928,8 @@ /*------------------------------------------------------------------------* * usbd_set_endpoint_stall * - * This function is used to make a BULK or INTERRUPT endpoint - * send STALL tokens. + * This function is used to make a BULK or INTERRUPT endpoint send + * STALL tokens in USB device mode. * * Returns: * 0: Success ==== //depot/projects/usb/src/sys/dev/usb/usb_request.c#41 (text+ko) ==== @@ -245,6 +245,8 @@ ep->is_stalled) { ep->toggle_next = 0; ep->is_stalled = 0; + /* some hardware needs a callback to clear the data toggle */ + usbd_clear_stall_locked(udev, ep); /* start up the current or next transfer, if any */ usb_command_wrapper(&ep->endpoint_q, ep->endpoint_q.curr); ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#183 (text+ko) ==== @@ -2863,12 +2863,34 @@ * data toggle. *------------------------------------------------------------------------*/ void +usbd_clear_stall_locked(struct usb_device *udev, struct usb_endpoint *ep) +{ + USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED); + + /* check that we have a valid case */ + if ((udev->flags.usb_mode == USB_MODE_HOST) && + (udev->parent_hub != NULL) && + (udev->bus->methods->clear_stall != NULL) && + (ep->methods != NULL)) { + (udev->bus->methods->clear_stall) (udev, ep); + } +} + +/*------------------------------------------------------------------------* + * usbd_clear_data_toggle - factored out code + * + * NOTE: the intention of this function is not to reset the hardware + * data toggle on the USB device side. + *------------------------------------------------------------------------*/ +void usbd_clear_data_toggle(struct usb_device *udev, struct usb_endpoint *ep) { DPRINTFN(5, "udev=%p endpoint=%p\n", udev, ep); USB_BUS_LOCK(udev->bus); ep->toggle_next = 0; + /* some hardware needs a callback to clear the data toggle */ + usbd_clear_stall_locked(udev, ep); USB_BUS_UNLOCK(udev->bus); } ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#17 (text+ko) ==== @@ -125,6 +125,8 @@ struct usb_xfer *xfer); void usbd_transfer_setup_sub(struct usb_setup_params *parm); void usbd_ctrl_transfer_setup(struct usb_device *udev); +void usbd_clear_stall_locked(struct usb_device *udev, + struct usb_endpoint *ep); void usbd_clear_data_toggle(struct usb_device *udev, struct usb_endpoint *ep); usb_callback_t usbd_do_request_callback; From owner-p4-projects@FreeBSD.ORG Sun Aug 8 09:41:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 694161065675; Sun, 8 Aug 2010 09:41:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2E10E1065674 for ; Sun, 8 Aug 2010 09:41:22 +0000 (UTC) (envelope-from aman@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C0608FC0C for ; Sun, 8 Aug 2010 09:41:22 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o789fMTG073568 for ; Sun, 8 Aug 2010 09:41:22 GMT (envelope-from aman@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o789fLdN073566 for perforce@freebsd.org; Sun, 8 Aug 2010 09:41:21 GMT (envelope-from aman@freebsd.org) Date: Sun, 8 Aug 2010 09:41:21 GMT Message-Id: <201008080941.o789fLdN073566@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to aman@freebsd.org using -f From: Aman Jassal To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2010 09:41:22 -0000 http://p4web.freebsd.org/@@182070?ac=10 Change 182070 by aman@src on 2010/08/08 09:41:15 Fixing the code for iflag, kread() should be called only when performing "non-live" monitoring. Live monitoring should be using sysctl instead, so add a "if (!live)" before the kread() call. There are other parts in the code which require the same fix but we shall do this in an incremental process. Reviewed by: pgj Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/main.c#49 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/main.c#49 (text+ko) ==== @@ -461,7 +461,8 @@ */ #endif if (iflag && !sflag) { - kread(0, NULL, 0); + if (!live) + kread(0, NULL, 0); session = netstat_session_new(kvmd); intpr(session, interval, NULL); netstat_session_free(session); From owner-p4-projects@FreeBSD.ORG Sun Aug 8 12:08:05 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6946F106567C; Sun, 8 Aug 2010 12:08:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13B051065672 for ; Sun, 8 Aug 2010 12:08:05 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F33AC8FC1F for ; Sun, 8 Aug 2010 12:08:04 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78C84KO088495 for ; Sun, 8 Aug 2010 12:08:04 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78C84Kl088491 for perforce@freebsd.org; Sun, 8 Aug 2010 12:08:04 GMT (envelope-from trasz@freebsd.org) Date: Sun, 8 Aug 2010 12:08:04 GMT Message-Id: <201008081208.o78C84Kl088491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2010 12:08:05 -0000 http://p4web.freebsd.org/@@182072?ac=10 Change 182072 by trasz@trasz_victim on 2010/08/08 12:07:32 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#24 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bsnmp/snmp_mibII/mibII.c#3 integrate .. //depot/projects/soc2009/trasz_limits/contrib/pf/pflogd/pflogd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/traceroute/traceroute.c#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/defaults/periodic.conf#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/netstart#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/periodic/daily/490.status-pkg-changes#1 branch .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/kgdb/kgdb.h#2 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/kgdb/kthr.c#3 integrate .. //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 integrate .. //depot/projects/soc2009/trasz_limits/include/stdio.h#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/net/sctp_recvmsg.3#6 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/net/sctp_sendmsg.3#6 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/malloc.3#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/realpath.3#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/kqueue.2#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/ptrace.2#5 integrate .. //depot/projects/soc2009/trasz_limits/lib/libcam/cam.3#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libcompat/4.1/ascftime.c#3 delete .. //depot/projects/soc2009/trasz_limits/lib/libcompat/4.1/cftime.3#3 delete .. //depot/projects/soc2009/trasz_limits/lib/libcompat/4.1/cftime.c#3 delete .. //depot/projects/soc2009/trasz_limits/lib/libcompat/4.1/ftime.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libcompat/4.1/getpw.3#2 delete .. //depot/projects/soc2009/trasz_limits/lib/libcompat/4.1/getpw.c#3 delete .. //depot/projects/soc2009/trasz_limits/lib/libcompat/4.3/cfree.3#2 delete .. //depot/projects/soc2009/trasz_limits/lib/libcompat/4.3/cfree.c#4 delete .. //depot/projects/soc2009/trasz_limits/lib/libcompat/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libgpib/gpib.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libpmc/pmc.corei7.3#5 integrate .. //depot/projects/soc2009/trasz_limits/lib/libpmc/pmc.mips.3#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libpmc/pmc.westmere.3#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libpmc/pmc.westmereuc.3#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb.3#9 integrate .. //depot/projects/soc2009/trasz_limits/lib/libutil/property.3#4 integrate .. //depot/projects/soc2009/trasz_limits/libexec/talkd/announce.c#2 integrate .. //depot/projects/soc2009/trasz_limits/libexec/talkd/table.c#2 integrate .. //depot/projects/soc2009/trasz_limits/libexec/ypxfr/ypxfr.8#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/fsck/fsck.8#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/fsck_ffs.8#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/class/part/gpart.8#7 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/core/geom.8#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastctl/hastctl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/control.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/control.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast.conf.5#6 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hastd.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hastd.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/parse.y#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/pjdlog.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/pjdlog.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/primary.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_impl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_socketpair.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_tcp4.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_uds.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/secondary.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/af_link.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifconfig.8#12 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifconfig.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sbin/ping6/ping6.8#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/sunlabel/sunlabel.8#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/alc.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/cmx.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/dc.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/gre.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/iic.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/linux.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/meteor.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/net80211.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/ng_car.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/pcii.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/pcm.4#9 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/sctp.4#4 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/BUS_NEW_PASS.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#15 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/ieee80211_vap.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/mbuf.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/rman.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/bsd-family-tree#8 integrate .. //depot/projects/soc2009/trasz_limits/share/syscons/keymaps/INDEX.keymaps#3 integrate .. //depot/projects/soc2009/trasz_limits/share/syscons/keymaps/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/share/syscons/keymaps/swissgerman.macbook.acc.kbd#1 branch .. //depot/projects/soc2009/trasz_limits/share/termcap/termcap.src#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/acpica/acpi_wakeup.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/mp_machdep.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/ia32/ia32_signal.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/smp.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/freebsd32/freebsd32_misc.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/x86bios/x86bios.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/x86bios/x86bios.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#25 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#34 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.i386#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/changes.txt#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/adisasm.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/common/dmextern.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslcompiler.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslglobal.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslmain.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/compiler/aslstartup.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbcmds.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/debugger/dbinput.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/events/evxfevnt.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exfldio.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/executer/exprep.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acdebug.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acdisasm.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acglobal.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/aclocal.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acobject.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acpiosxf.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acpixf.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/actypes.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/include/acutils.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/osunixxf.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/uteval.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utglobal.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utinit.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utmutex.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utosi.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/acpica/utilities/utxface.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/Osd/OsdHardware.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/Osd/OsdMemory.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_ec.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_pcibvar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/alc/if_alc.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/alc/if_alcreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/alc/if_alcvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_igb.c#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fb/vesa.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iicbus/iic.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phy.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/miidevs#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mpt/mpt_pci.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/null/null.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/quirk/usb_quirk.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uslcom.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#26 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/coda/coda.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/coda/coda_venus.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/devfs/devfs.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/devfs/devfs_vfsops.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/smp.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/vm86.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/xen/mp_machdep.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia32/ia32_signal.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/mp_machdep.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/smp.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_conf.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#23 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sched_ule.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_param.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_smp.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_cluster.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/ar71xx_pci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/cpuregs.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/pmap.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/pte.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/smp.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/locore.S#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/mp_machdep.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/mpboot.S#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/pmap.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/tick.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/sibyte/sb_machdep.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/sibyte/sb_scd.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/sibyte/sb_zbpci.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/acpi/acpi/Makefile#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/x86bios/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_vlan.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_carp.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/smp.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/mp_machdep.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/cache.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/smp.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/cache.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/mp_machdep.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/uio_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/vm_machdep.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/smp.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/sun4v/mp_machdep.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/conf.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/vnode.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/device_pager.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#14 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/fstest.c#4 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/chmod/08.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/chmod/09.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/chown/08.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/chown/09.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/conf#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/00.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/01.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/02.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/03.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/04.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/granular/05.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/link/05.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/link/12.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/link/13.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/link/14.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/link/15.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/link/16.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/misc.sh#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mkdir/08.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mkdir/09.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mkdir/11.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mkfifo/08.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mkfifo/10.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mkfifo/11.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/00.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/01.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/02.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/03.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/04.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/05.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/06.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/07.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/08.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/09.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/10.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/mknod/11.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/06.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/09.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/10.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/11.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/13.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/14.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/15.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/18.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/19.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/20.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/23.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/open/24.t#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/rename/06.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/rename/07.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/rename/08.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/rename/15.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/rename/16.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/rmdir/09.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/rmdir/10.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/rmdir/13.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/rmdir/14.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/symlink/09.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/symlink/10.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/symlink/11.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/truncate/08.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/truncate/10.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/truncate/11.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/unlink/09.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/unlink/10.t#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/tests/unlink/12.t#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/cpio/cmdline.c#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/cpio/cpio.c#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/cpio/cpio.h#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/csup/csup.1#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/csup/main.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/du/du.1#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/fstat/fstat.1#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/grep/nls/uk_UA.UTF-8.msg#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/rwall/rwall.1#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/acpi/acpidb/Makefile#7 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/acpi/iasl/Makefile#8 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/fifolog/lib/fifolog.h#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/iostat/iostat.8#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/jail/jail.8#13 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/lpr/lpr/printcap.5#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/makefs/makefs.8#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/mfiutil/mfiutil.8#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/ndp/ndp.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsd/stablerestart.5#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsuserd/nfsuserd.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/ntp/doc/ntp.conf.5#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/ntp/doc/ntpq.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/ppp/ipv6cp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/syslogd/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/syslogd/syslogd.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/syslogd/syslogd.c#5 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#24 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.240 2010/07/27 14:26:38 rpaulo Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.241 2010/08/06 20:13:36 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,11 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100806: removal of unused libcompat routines +OLD_FILES+=usr/share/man/man3/ascftime.3.gz +OLD_FILES+=usr/share/man/man3/cfree.3.gz +OLD_FILES+=usr/share/man/man3/cftime.3.gz +OLD_FILES+=usr/share/man/man3/getpw.3.gz # 20100725: acpi_aiboost(4) removal. OLD_FILES+=usr/share/man/man4/acpi_aiboost.4.gz # 20100720: new clang import which bumps version from 2.0 to 2.8 ==== //depot/projects/soc2009/trasz_limits/contrib/bsnmp/snmp_mibII/mibII.c#3 (text+ko) ==== @@ -843,6 +843,7 @@ case IFT_ETHER: case IFT_FDDI: case IFT_ISO88025: + case IFT_L2VLAN: if (mib_find_rcvaddr(ifp->index, ether_bcast, 6) == NULL && (rcv = mib_rcvaddr_create(ifp, ether_bcast, 6)) != NULL) rcv->flags |= MIBRCVADDR_BCAST; ==== //depot/projects/soc2009/trasz_limits/contrib/pf/pflogd/pflogd.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/contrib/pf/pflogd/pflogd.c,v 1.13 2007/10/16 02:12:05 mlaier Exp $"); +__FBSDID("$FreeBSD: src/contrib/pf/pflogd/pflogd.c,v 1.14 2010/08/05 18:49:06 csjp Exp $"); #include #include @@ -583,11 +583,7 @@ pcap_handler phandler = dump_packet; const char *errstr = NULL; -#ifdef __FreeBSD__ - /* another ?paranoid? safety measure we do not have */ -#else closefrom(STDERR_FILENO + 1); -#endif while ((ch = getopt(argc, argv, "Dxd:f:i:s:")) != -1) { switch (ch) { ==== //depot/projects/soc2009/trasz_limits/contrib/traceroute/traceroute.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)"; #endif static const char rcsid[] = - "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.36 2009/08/23 17:00:16 ume Exp $"; + "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.37 2010/08/08 08:22:53 ed Exp $"; #endif /* @@ -962,7 +962,6 @@ for (probe = 0, loss = 0; probe < nprobes; ++probe) { register int cc; struct timeval t1, t2; - struct timezone tz; register struct ip *ip; struct outdata outdata; @@ -973,7 +972,7 @@ outdata.ttl = ttl; /* Avoid alignment problems by copying bytewise: */ - (void)gettimeofday(&t1, &tz); + (void)gettimeofday(&t1, NULL); memcpy(&outdata.tv, &t1, sizeof(outdata.tv)); /* Finalize and send packet */ @@ -986,7 +985,7 @@ double T; int precis; - (void)gettimeofday(&t2, &tz); + (void)gettimeofday(&t2, NULL); i = packet_ok(packet, cc, from, seq); /* Skip short packet */ if (i == 0) @@ -1152,7 +1151,6 @@ fd_set *fdsp; size_t nfds; struct timeval now, wait; - struct timezone tz; register int cc = 0; register int error; int fromlen = sizeof(*fromp); @@ -1165,7 +1163,7 @@ wait.tv_sec = tp->tv_sec + waittime; wait.tv_usec = tp->tv_usec; - (void)gettimeofday(&now, &tz); + (void)gettimeofday(&now, NULL); tvsub(&wait, &now); if (wait.tv_sec < 0) { wait.tv_sec = 0; ==== //depot/projects/soc2009/trasz_limits/etc/defaults/periodic.conf#5 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.50 2010/07/19 20:19:14 gabor Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.51 2010/08/05 15:53:33 olli Exp $ # # What files override these defaults ? @@ -136,6 +136,9 @@ # 480.status-ntpd daily_status_ntpd_enable="NO" # Check NTP status +# 490.status-pkg-changes +daily_status_pkg_changes_enable="NO" # Show package changes + # 500.queuerun daily_queuerun_enable="YES" # Run mail queue daily_submit_queuerun="YES" # Also submit queue ==== //depot/projects/soc2009/trasz_limits/etc/netstart#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/netstart,v 1.70 2009/03/19 12:52:19 des Exp $ +# $FreeBSD: src/etc/netstart,v 1.72 2010/08/05 15:11:03 ume Exp $ # From: @(#)netstart 5.9 (Berkeley) 3/30/91 # @@ -55,8 +55,6 @@ /etc/rc.d/dhclient ${_start} /etc/rc.d/ppp ${_start} /etc/rc.d/ipfw ${_start} -/etc/rc.d/ip6fw ${_start} -/etc/rc.d/network_ipv6 ${_start} /etc/rc.d/routing ${_start} /etc/rc.d/mroute6d ${_start} /etc/rc.d/route6d ${_start} ==== //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/kgdb/kgdb.h#2 (text+ko) ==== @@ -23,7 +23,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/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.13 2008/04/29 20:32:45 jhb Exp $ + * $FreeBSD: src/gnu/usr.bin/gdb/kgdb/kgdb.h,v 1.14 2010/08/04 21:02:04 jhb Exp $ */ #ifndef _KGDB_H_ @@ -67,7 +67,7 @@ struct kthr *kgdb_thr_select(struct kthr *); char *kgdb_thr_extra_thread_info(int); -uintptr_t kgdb_lookup(const char *sym); +CORE_ADDR kgdb_lookup(const char *sym); CORE_ADDR kgdb_parse_1(const char *, int); #define kgdb_parse(exp) kgdb_parse_1((exp), 0) ==== //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/kgdb/kthr.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.13 2010/02/13 11:47:04 avg Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/kthr.c,v 1.14 2010/08/04 21:02:04 jhb Exp $"); #include #include @@ -44,26 +44,25 @@ #include "kgdb.h" #include -static uintptr_t dumppcb; +static CORE_ADDR dumppcb; static int dumptid; -static uintptr_t stoppcbs; +static CORE_ADDR stoppcbs; static __cpumask_t stopped_cpus; static struct kthr *first; struct kthr *curkthr; -uintptr_t +CORE_ADDR kgdb_lookup(const char *sym) { - struct nlist nl[2]; + CORE_ADDR addr; + char *name; - nl[0].n_type = N_UNDF; - nl[0].n_name = (char *)(uintptr_t)sym; - nl[1].n_name = NULL; - if (kvm_nlist(kvm, nl) != 0) - return (0); - return (nl[0].n_value); + asprintf(&name, "&%s", sym); + addr = kgdb_parse(name); + free(name); + return (addr); } struct kthr * @@ -78,7 +77,8 @@ struct proc p; struct thread td; struct kthr *kt; - uintptr_t addr, paddr; + CORE_ADDR addr; + uintptr_t paddr; while (first != NULL) { kt = first; @@ -86,32 +86,28 @@ free(kt); } - addr = kgdb_lookup("_allproc"); - if (addr == 0) { - warnx("kvm_nlist(_allproc): %s", kvm_geterr(kvm)); + addr = kgdb_lookup("allproc"); + if (addr == 0) return (NULL); - } kvm_read(kvm, addr, &paddr, sizeof(paddr)); - dumppcb = kgdb_lookup("_dumppcb"); - if (dumppcb == 0) { - warnx("kvm_nlist(_dumppcb): %s", kvm_geterr(kvm)); + dumppcb = kgdb_lookup("dumppcb"); + if (dumppcb == 0) return (NULL); - } - addr = kgdb_lookup("_dumptid"); + addr = kgdb_lookup("dumptid"); if (addr != 0) kvm_read(kvm, addr, &dumptid, sizeof(dumptid)); else dumptid = -1; - addr = kgdb_lookup("_stopped_cpus"); + addr = kgdb_lookup("stopped_cpus"); if (addr != 0) kvm_read(kvm, addr, &stopped_cpus, sizeof(stopped_cpus)); else stopped_cpus = 0; - stoppcbs = kgdb_lookup("_stoppcbs"); + stoppcbs = kgdb_lookup("stoppcbs"); while (paddr != 0) { if (kvm_read(kvm, paddr, &p, sizeof(p)) != sizeof(p)) { ==== //depot/projects/soc2009/trasz_limits/gnu/usr.bin/gdb/kgdb/trgt_i386.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.13 2008/09/27 15:58:37 kib Exp $"); +__FBSDID("$FreeBSD: src/gnu/usr.bin/gdb/kgdb/trgt_i386.c,v 1.14 2010/08/04 21:02:04 jhb Exp $"); #include #include @@ -136,7 +136,7 @@ if (kt == NULL || kt->cpu == NOCPU) return (0); - addr = kgdb_lookup("_gdt"); + addr = kgdb_lookup("gdt"); if (addr == 0) return (0); addr += (kt->cpu * NGDT + GPROC0_SEL) * sizeof(sd); @@ -159,11 +159,9 @@ * change it to be relative to cpu0prvpage instead. */ if (trunc_page(tss) == 0xffc00000) { - addr = kgdb_lookup("_cpu0prvpage"); - if (addr == 0) { - warnx("kvm_nlist(_cpu0prvpage): %s", kvm_geterr(kvm)); + addr = kgdb_lookup("cpu0prvpage"); + if (addr == 0) return (0); - } if (kvm_read(kvm, addr, &cpu0prvpage, sizeof(cpu0prvpage)) != sizeof(cpu0prvpage)) { warnx("kvm_read: %s", kvm_geterr(kvm)); ==== //depot/projects/soc2009/trasz_limits/include/stdio.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.80 2010/02/16 19:39:50 imp Exp $ + * $FreeBSD: src/include/stdio.h,v 1.81 2010/08/06 19:35:40 ed Exp $ */ #ifndef _STDIO_H_ @@ -285,8 +285,7 @@ * Functions defined in all versions of POSIX 1003.1. */ #if __BSD_VISIBLE || __POSIX_VISIBLE <= 199506 -/* size for cuserid(3); UT_NAMESIZE + 1, see */ -#define L_cuserid 17 /* legacy */ +#define L_cuserid 17 /* size for cuserid(3); MAXLOGNAME, legacy */ #endif #if __POSIX_VISIBLE ==== //depot/projects/soc2009/trasz_limits/lib/libc/net/sctp_recvmsg.3#6 (text+ko) ==== @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.9 2010/07/04 08:09:33 brucec Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.10 2010/08/06 14:33:42 joel Exp $ .\" .Dd August 13, 2007 .Dt SCTP_RECVMSG 3 @@ -88,7 +88,7 @@ .Fa fromlen will hold the length of that address. Note that -the address is bounded by the inital value of +the address is bounded by the initial value of .Fa fromlen which is used as an in/out variable. .Pp ==== //depot/projects/soc2009/trasz_limits/lib/libc/net/sctp_sendmsg.3#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)send.2 8.2 (Berkeley) 2/21/94 -.\" $FreeBSD: src/lib/libc/net/sctp_sendmsg.3,v 1.8 2010/08/02 16:01:45 joel Exp $ +.\" $FreeBSD: src/lib/libc/net/sctp_sendmsg.3,v 1.9 2010/08/06 14:33:42 joel Exp $ .\" .Dd December 15, 2006 .Dt SCTP_SENDMSG 3 @@ -72,7 +72,7 @@ the data being sent on the third leg of the SCTP four-way handshake. Note that if the socket is a one-to-one type (SOCK_STREAM) socket then an association must -be in existance (by use of the +be in existence (by use of the .Xr connect 2 system call). Calling ==== //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/malloc.3#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)malloc.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.82 2010/01/31 23:16:10 jasone Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.83 2010/08/06 14:33:42 joel Exp $ .\" .Dd January 31, 2010 .Dt MALLOC 3 @@ -415,7 +415,7 @@ minimum cacheline-multiple size class (see the .Dq Q option) are rounded up to the nearest multiple of the quantum. -Allocation requests that are more than the minumum cacheline-multiple size +Allocation requests that are more than the minimum cacheline-multiple size class, but no more than the minimum subpage-multiple size class (see the .Dq C option) are rounded up to the nearest multiple of the cacheline size (64). ==== //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/realpath.3#4 (text+ko) ==== @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)realpath.3 8.2 (Berkeley) 2/16/94 -.\" $FreeBSD: src/lib/libc/stdlib/realpath.3,v 1.18 2010/05/13 12:07:55 uqs Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/realpath.3,v 1.19 2010/08/05 01:39:25 ache Exp $ .\" .Dd April 19, 2010 .Dt REALPATH 3 @@ -111,11 +111,11 @@ .Xr getcwd 3 . .Sh SEE ALSO .Xr getcwd 3 -.Sh STANDARDS -The -.Fn realpath -function conforms to -.St -p1003.1-2001 . +.\" .Sh STANDARDS +.\" The +.\" .Fn realpath +.\" function conforms to +.\" .St -p1003.1-2001 . .Sh HISTORY The .Fn realpath ==== //depot/projects/soc2009/trasz_limits/lib/libc/sys/kqueue.2#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.50 2009/12/31 20:29:58 brooks Exp $ +.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.51 2010/08/06 14:33:42 joel Exp $ .\" .Dd September 15, 2009 .Dt KQUEUE 2 @@ -445,7 +445,7 @@ .It Dv EVFILT_USER Establishes a user event identified by .Va ident -which is not assosicated with any kernel mechanism but is triggered by +which is not associated with any kernel mechanism but is triggered by user level code. The lower 24 bits of the .Va fflags ==== //depot/projects/soc2009/trasz_limits/lib/libc/sys/ptrace.2#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.46 2010/07/10 14:31:44 kib Exp $ +.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.47 2010/08/06 14:33:42 joel Exp $ .\" $NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $ .\" .\" This file is in the public domain. @@ -335,7 +335,7 @@ When .Dv PL_FLAG_SCX is set, this flag may be additionally specified to inform that the -program being executed by debuggee process has been changed by succesful +program being executed by debuggee process has been changed by successful execution of a system call from the .Fn execve 2 family. ==== //depot/projects/soc2009/trasz_limits/lib/libcam/cam.3#3 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libcam/cam.3,v 1.15 2010/04/14 19:08:06 uqs Exp $ +.\" $FreeBSD: src/lib/libcam/cam.3,v 1.16 2010/08/06 14:33:42 joel Exp $ .\" .Dd October 10, 1998 .Dt CAM 3 @@ -382,7 +382,7 @@ of the CCB failed. .Pp .Fn cam_send_ccb -returns a value of -1 if an error occured, and +returns a value of -1 if an error occurred, and .Va errno is set to indicate the error. .Pp ==== //depot/projects/soc2009/trasz_limits/lib/libcompat/4.1/ftime.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #ifndef lint -static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/ftime.c,v 1.6 2010/03/13 18:06:17 ed Exp $"; +static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/ftime.c,v 1.7 2010/08/08 08:19:23 ed Exp $"; #endif /* not lint */ #include @@ -39,15 +39,15 @@ int ftime(struct timeb *tbp) { - struct timezone tz; - struct timeval t; + struct timezone tz; + struct timeval t; - if (gettimeofday(&t, &tz) < 0) - return (-1); - tbp->millitm = t.tv_usec / 1000; - tbp->time = t.tv_sec; - tbp->timezone = tz.tz_minuteswest; - tbp->dstflag = tz.tz_dsttime; + if (gettimeofday(&t, &tz) < 0) + return (-1); + tbp->millitm = t.tv_usec / 1000; + tbp->time = t.tv_sec; + tbp->timezone = tz.tz_minuteswest; + tbp->dstflag = tz.tz_dsttime; return (0); } ==== //depot/projects/soc2009/trasz_limits/lib/libcompat/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libcompat/Makefile,v 1.28 2010/03/14 10:18:58 ed Exp $ +# $FreeBSD: src/lib/libcompat/Makefile,v 1.29 2010/08/06 20:13:36 ed Exp $ LIB= compat CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale @@ -10,17 +10,14 @@ .PATH: ${.CURDIR}/4.1 ${.CURDIR}/4.3 ${.CURDIR}/4.4 # compat 4.1 sources -SRCS+= ascftime.c cftime.c ftime.c getpw.c +SRCS+= ftime.c -MAN+= 4.1/ftime.3 4.1/getpw.3 -MAN+= 4.1/cftime.3 +MAN+= 4.1/ftime.3 -MLINKS+=cftime.3 ascftime.3 - # compat 4.3 sources -SRCS+= cfree.c re_comp.c rexec.c +SRCS+= re_comp.c rexec.c -MAN+= 4.3/cfree.3 4.3/re_comp.3 4.3/rexec.3 +MAN+= 4.3/re_comp.3 4.3/rexec.3 MLINKS+=re_comp.3 re_exec.3 ==== //depot/projects/soc2009/trasz_limits/lib/libgpib/gpib.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgpib/gpib.3,v 1.1 2010/02/01 20:53:55 joerg Exp $ +.\" $FreeBSD: src/lib/libgpib/gpib.3,v 1.2 2010/08/06 14:33:42 joel Exp $ .\" .Dd February 1, 2010 .Dt GPIB 3 @@ -258,7 +258,7 @@ .It SPOLL Serial Poll .It EVENT -Event occured +Event occurred .It CMPL I/O complete .It LOK ==== //depot/projects/soc2009/trasz_limits/lib/libpmc/pmc.corei7.3#5 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.corei7.3,v 1.4 2010/08/03 17:40:09 joel Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.corei7.3,v 1.5 2010/08/06 14:33:42 joel Exp $ .\" .Dd March 24, 2010 .Dt PMC.COREI7 3 @@ -833,7 +833,7 @@ Counts mispredicted non-indirect near calls executed, (should always be 0). .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL .Pq Event 89H , Umask 20H -Counts mispredicted indirect near calls exeucted, including both register +Counts mispredicted indirect near calls executed, including both register and memory indirect. .It Li BR_MISP_EXEC.NEAR_CALLS .Pq Event 89H , Umask 30H ==== //depot/projects/soc2009/trasz_limits/lib/libpmc/pmc.mips.3#3 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.mips.3,v 1.2 2010/05/13 12:07:55 uqs Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.mips.3,v 1.3 2010/08/06 14:33:42 joel Exp $ .\" .Dd February 11, 2010 .Os @@ -153,7 +153,7 @@ Integer and co-processor loads completed. .It Li STORE_COMPLETED .Pq Event 15, Counter 1 -Integer and co-porocessor stores completed. +Integer and co-processor stores completed. .It Li BARRIER_COMPLETED .Pq Event 16, Counter 0 Direct jump (and link) instructions completed. @@ -225,10 +225,10 @@ Counts the number of cycles where the ALU pipeline cannot advance. .It Li UNCACHED_LOAD .Pq Event 33, Counter 0 -Counts uncached and uncached acclerated loads. +Counts uncached and uncached accelerated loads. .It Li UNCACHED_STORE .Pq Event 33, Counter 1 -Counts uncached and uncached acclerated stores. +Counts uncached and uncached accelerated stores. .It Li CP2_REG_TO_REG_COMPLETED .Pq Event 35, Counter 0 Co-processor 2 register to register instructions completed. ==== //depot/projects/soc2009/trasz_limits/lib/libpmc/pmc.westmere.3#4 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.westmere.3,v 1.3 2010/08/03 17:40:09 joel Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.westmere.3,v 1.4 2010/08/06 14:33:42 joel Exp $ .\" .Dd March 24, 2010 .Dt PMC.WESTMERE 3 @@ -775,7 +775,7 @@ Counts mispredicted non-indirect near calls executed, (should always be 0). .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL .Pq Event 89H , Umask 20H -Counts mispredicted indirect near calls exeucted, including both register +Counts mispredicted indirect near calls executed, including both register and memory indirect. .It Li BR_MISP_EXEC.NEAR_CALLS .Pq Event 89H , Umask 30H ==== //depot/projects/soc2009/trasz_limits/lib/libpmc/pmc.westmereuc.3#4 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.westmereuc.3,v 1.3 2010/06/08 16:48:59 uqs Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.westmereuc.3,v 1.4 2010/08/06 14:33:42 joel Exp $ .\" .Dd March 24, 2010 .Dt PMC.WESTMEREUC 3 @@ -715,7 +715,7 @@ supported: 0: NONE 40000000_00000000H:RSPFWDI 40001A00_00000000H:RSPFWDS 40001D00_00000000H:RSPIWB -Match opcode/addres s by writing MSR 396H with mask supported mask value +Match opcode/address by writing MSR 396H with mask supported mask value .It Li ADDR_OPCODE_MATCH.REMOTE .Pq Event 35H , Umask 02H Counts number of requests from the remote socket, address/opcode of request @@ -723,7 +723,7 @@ are supported: 0: NONE 40000000_00000000H:RSPFWDI 40001A00_00000000H:RSPFWDS 40001D00_00000000H:RSPIWB -Match opcode/addres s by writing MSR 396H with mask supported mask value +Match opcode/address by writing MSR 396H with mask supported mask value .It Li ADDR_OPCODE_MATCH.LOCAL .Pq Event 35H , Umask 04H Counts number of requests from the local socket, address/opcode of request @@ -731,7 +731,7 @@ are supported: 0: NONE 40000000_00000000H:RSPFWDI 40001A00_00000000H:RSPFWDS 40001D00_00000000H:RSPIWB -Match opcode/addres s by writing MSR 396H with mask supported mask value +Match opcode/address by writing MSR 396H with mask supported mask value .It Li QPI_TX_STALLED_SINGLE_FLIT.HOME.LINK_0 .Pq Event 40H , Umask 01H Counts cycles the Quickpath outbound link 0 HOME virtual channel is stalled >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Aug 8 12:41:42 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C576A106567C; Sun, 8 Aug 2010 12:41:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88E461065675 for ; Sun, 8 Aug 2010 12:41:42 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 755518FC0C for ; Sun, 8 Aug 2010 12:41:42 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78Cfgjh090929 for ; Sun, 8 Aug 2010 12:41:42 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78Cfg3h090927 for perforce@freebsd.org; Sun, 8 Aug 2010 12:41:42 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 8 Aug 2010 12:41:42 GMT Message-Id: <201008081241.o78Cfg3h090927@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2010 12:41:43 -0000 http://p4web.freebsd.org/@@182075?ac=10 Change 182075 by hselasky@hselasky_laptop001 on 2010/08/08 12:41:08 USB controller (XHCI): - fixes for double buffering and endpoint configuration. - correct some wrong definitions in xhci.h Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#16 (text+ko) ==== @@ -121,11 +121,8 @@ static void xhci_free_device_ext(struct usb_device *udev); static struct xhci_endpoint_ext *xhci_get_endpoint_ext(struct usb_device *, struct usb_endpoint_descriptor *); static usb_proc_callback_t xhci_configure_msg; -static usb_error_t xhci_configure_reset_endpoint(struct usb_xfer *); static usb_error_t xhci_configure_device(struct usb_device *); static usb_error_t xhci_configure_endpoint(struct usb_device *, struct usb_endpoint_descriptor *, uint64_t, uint16_t, uint8_t, uint16_t, uint16_t); -static usb_error_t xhci_configure_endpoint_by_xfer(struct usb_xfer *); -static usb_error_t xhci_set_address(struct usb_device *, struct mtx *, uint16_t); static usb_error_t xhci_configure_mask(struct usb_device *, uint32_t, uint8_t); extern struct usb_bus_methods xhci_bus_methods; @@ -628,6 +625,7 @@ err = xhci_generic_done_sub(xfer); done: + /* transfer is complete */ xhci_device_done(xfer, err); } @@ -637,14 +635,14 @@ static void xhci_check_transfer(struct xhci_softc *sc, struct xhci_trb *trb) { - struct usb_xfer *xfer; - struct xhci_td *td; - struct xhci_endpoint_ext *pepext; uint64_t td_event; uint32_t temp; uint32_t remainder; uint8_t status; uint8_t halted; + uint8_t epno; + uint8_t index; + uint8_t i; /* decode TRB */ td_event = le64toh(trb->qwTrb0); @@ -653,29 +651,44 @@ remainder = XHCI_TRB_2_REM_GET(temp); status = XHCI_TRB_2_ERROR_GET(temp); + temp = le32toh(trb->dwTrb3); + epno = XHCI_TRB_3_EP_GET(temp) + 1; + index = XHCI_TRB_3_SLOT_GET(temp); + /* check if error means halted */ halted = (status != XHCI_TRB_ERROR_SHORT_PKT) && (status != XHCI_TRB_ERROR_SUCCESS); - DPRINTF("remainder=%u status=%u\n", remainder, status); + DPRINTF("slot=%u epno=%u remainder=%u status=%u\n", + index, epno, remainder, status); + + if (index > sc->sc_noslot) { + DPRINTF("Invalid slot.\n"); + return; + } + + epno++; + + if (epno >= XHCI_MAX_ENDPOINTS) { + DPRINTF("Invalid endpoint.\n"); + return; + } /* try to find the USB transfer that generated the event */ - TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { + for (i = 0; i != (XHCI_MAX_TRANSFERS - 1); i++) { + struct usb_xfer *xfer; + struct xhci_td *td; + struct xhci_endpoint_ext *pepext; - /* check if transfer is cancelling */ - if (xfer->flags_int.did_dma_delay) - continue; + pepext = &sc->sc_hw.devs[index].endp[epno]; - pepext = xhci_get_endpoint_ext(xfer->xroot->udev, - xfer->endpoint->edesc); - - /* check if endpoint is halted */ - if (pepext->trb_halted != 0) + xfer = pepext->xfer[i]; + if (xfer == NULL) continue; td = xfer->td_transfer_cache; - DPRINTF("0x%08llx == (0x%08llx .. 0x%08llx)\n", + DPRINTFN(5, "Checking if 0x%016llx == (0x%016llx .. 0x%016llx)\n", (long long)td_event, (long long)td->td_self, (long long)td->td_event_last); @@ -684,13 +697,15 @@ (halted && (td_event >= td->td_self) && (td_event < td->td_event_last))) { - struct xhci_endpoint_ext *pepext; + usb_pc_cpu_invalidate(td->page_cache); - pepext = xhci_get_endpoint_ext(xfer->xroot->udev, - xfer->endpoint->edesc); + if (xfer->flags_int.isochronous_xfr) { + if (halted) { + halted = 0; + remainder = td->len; + } + } - usb_pc_cpu_invalidate(td->page_cache); - /* "td->remainder" is verified later */ td->remainder = remainder; td->status = status; @@ -1126,7 +1141,6 @@ err = USB_ERR_IOERROR; break; } - XHCI_CMD_UNLOCK(sc); if (mtx != NULL) @@ -1190,7 +1204,7 @@ trb.dwTrb2 = 0; temp = XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_RESET_EP) | XHCI_TRB_3_SLOT_SET(slot_id) | - XHCI_TRB_3_SLOT_SET(ep_id); + XHCI_TRB_3_EP_SET(ep_id); if (preserve) temp |= XHCI_TRB_3_PRSV_BIT; @@ -1201,6 +1215,28 @@ } static usb_error_t +xhci_cmd_set_tr_dequeue_ptr(struct xhci_softc *sc, uint64_t dequeue_ptr, + uint16_t stream_id, uint8_t ep_id, uint8_t slot_id) +{ + struct xhci_trb trb; + uint32_t temp; + + DPRINTF("\n"); + + trb.qwTrb0 = htole64(dequeue_ptr); + + temp = XHCI_TRB_2_STREAM_SET(stream_id); + trb.dwTrb2 = htole32(temp); + + temp = XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_SET_TR_DEQUEUE) | + XHCI_TRB_3_SLOT_SET(slot_id) | + XHCI_TRB_3_EP_SET(ep_id); + trb.dwTrb3 = htole32(temp); + + return (xhci_do_command(sc, &trb, 50 /* ms */)); +} + +static usb_error_t xhci_cmd_stop_ep(struct xhci_softc *sc, uint8_t suspend, uint8_t ep_id, uint8_t slot_id) { @@ -1213,7 +1249,7 @@ trb.dwTrb2 = 0; temp = XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_STOP_EP) | XHCI_TRB_3_SLOT_SET(slot_id) | - XHCI_TRB_3_SLOT_SET(ep_id); + XHCI_TRB_3_EP_SET(ep_id); if (suspend) temp |= XHCI_TRB_3_SUSP_EP_BIT; @@ -1223,6 +1259,7 @@ return (xhci_do_command(sc, &trb, 50 /* ms */)); } +#if 0 static usb_error_t xhci_cmd_reset_dev(struct xhci_softc *sc, uint8_t slot_id) { @@ -1240,6 +1277,7 @@ return (xhci_do_command(sc, &trb, 50 /* ms */)); } +#endif /*------------------------------------------------------------------------* * xhci_interrupt - XHCI interrupt handler @@ -1300,21 +1338,11 @@ xhci_timeout(void *arg) { struct usb_xfer *xfer = arg; - struct xhci_endpoint_ext *pepext; DPRINTF("xfer=%p\n", xfer); USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); - pepext = xhci_get_endpoint_ext(xfer->xroot->udev, - xfer->endpoint->edesc); - -#if 0 - /* check if endpoint is halted */ - if (pepext->trb_halted != 0) - return; -#endif - /* transfer is transferred */ xhci_device_done(xfer, USB_ERR_TIMEOUT); } @@ -2018,7 +2046,7 @@ route |= rh_port; } - temp = XHCI_SCTX_0_CTX_NUM_SET(1) | /* XXX XHCI_MAX_ENDPOINTS - 1) | */ + temp = XHCI_SCTX_0_CTX_NUM_SET(XHCI_MAX_ENDPOINTS - 1) | XHCI_SCTX_0_ROUTE_SET(route); switch (udev->speed) { @@ -2252,8 +2280,12 @@ pepext->trb_used--; - if (error) + pepext->xfer[xfer->qh_pos] = NULL; + + if (error && (pepext->trb_running != 0)) { pepext->trb_halted = 1; + pepext->trb_running = 0; + } } } @@ -2274,10 +2306,6 @@ pepext = xhci_get_endpoint_ext(xfer->xroot->udev, xfer->endpoint->edesc); - /* check for halt condition */ - if (pepext->trb_halted != 0) - return (0); - td_first = xfer->td_transfer_first; td_last = xfer->td_transfer_last; addr = pepext->physaddr; @@ -2287,10 +2315,30 @@ return (USB_ERR_NOMEM); } + /* check if transfer is not already on interrupt queue */ + if (xfer->wait_queue != &xfer->xroot->bus->intr_q) { + + /* remove transfer from pipe queue, if any */ + + usbd_transfer_dequeue(xfer); + + /* add transfer last on interrupt queue */ + + usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); + } + + /* check for stopped condition, after putting transfer on interrupt queue */ + if (pepext->trb_running == 0) { + struct xhci_softc *sc = XHCI_BUS2SC(xfer->xroot->bus); + + /* start configuration */ + (void)usb_proc_msignal(&sc->sc_config_proc, + &sc->sc_config_msg[0], &sc->sc_config_msg[1]); + return (0); + } + pepext->trb_used++; - xfer->flags_int.bandwidth_reclaimed = 1; - /* get current TRB index */ i = pepext->trb_index; @@ -2338,6 +2386,12 @@ usb_pc_cpu_flush(pepext->page_cache); + pepext->xfer[i] = xfer; + + xfer->qh_pos = i; + + xfer->flags_int.bandwidth_reclaimed = 1; + pepext->trb_index = inext; xhci_endpoint_doorbell(xfer); @@ -2418,13 +2472,8 @@ /* setup TD's and QH */ xhci_setup_generic_chain(xfer); -#ifdef NOTYET - /* put transfer on interrupt queue */ - usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); - /* try to insert xfer on HW queue */ xhci_transfer_insert(xfer); -#endif } static void @@ -2438,9 +2487,6 @@ "transfer %p into HW queue.\n", xfer); } - /* put transfer on interrupt queue */ - usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); - /* start timeout, if any */ if (xfer->timeout != 0) usbd_transfer_timeout_ms(xfer, &xhci_timeout, xfer->timeout); @@ -3067,10 +3113,6 @@ xfer->flags_int.curr_dma_set = 1; goto alloc_dma_set; } - - if ((parm->buf != NULL) && (parm->err == 0)) { - parm->err = xhci_configure_reset_endpoint(xfer); - } } static usb_error_t @@ -3092,6 +3134,7 @@ pepext = xhci_get_endpoint_ext(xfer->xroot->udev, xfer->endpoint->edesc); + udev = xfer->xroot->udev; index = udev->controller_slot_id; @@ -3155,18 +3198,12 @@ DPRINTF("Could not update parent HS HUB context.\n"); } - if (0) { - - - err = xhci_cmd_reset_dev(sc, index); - } - /* configure endpoint */ err = xhci_configure_endpoint_by_xfer(xfer); if (err == 0) { - err = xhci_cmd_stop_ep(sc, 0, epno, index); + err = xhci_cmd_stop_ep(sc, 0, epno - 1, index); if (err != 0) DPRINTF("Could not stop endpoint\n"); @@ -3190,10 +3227,15 @@ if (err == 0) { if ((edesc->bmAttributes & UE_XFERTYPE) == UE_BULK) - err = xhci_cmd_reset_ep(sc, 0, epno, index); + err = xhci_cmd_reset_ep(sc, 0, epno - 1, index); if (err != 0) DPRINTF("Could not reset endpoint %u\n", epno); + + err = xhci_cmd_set_tr_dequeue_ptr(sc, pepext->physaddr, 0, epno - 1, index); + + if (err != 0) + DPRINTF("Could not set dequeue ptr for endpoint %u\n", epno); } XHCI_CMD_UNLOCK(sc); @@ -3227,42 +3269,46 @@ sc = XHCI_BUS2SC(((struct usb_bus_msg *)pm)->bus); - /* make sure everything that is halted is gone, else we can loop */ - -restart0: +restart: TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { pepext = xhci_get_endpoint_ext(xfer->xroot->udev, xfer->endpoint->edesc); - if ((pepext->trb_halted != 0) && - (xfer->flags_int.bandwidth_reclaimed != 0)) { - xhci_device_done(xfer, USB_ERR_IOERROR); - goto restart0; - } - } + if ((pepext->trb_halted != 0) || + (pepext->trb_running == 0)) { -restart1: - TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { + uint8_t i; - pepext = xhci_get_endpoint_ext(xfer->xroot->udev, - xfer->endpoint->edesc); + /* clear halted and running */ + pepext->trb_halted = 0; + pepext->trb_running = 0; - if (xfer->flags_int.did_dma_delay) { + /* nuke remaining buffered transfers */ - if (pepext->trb_halted != 0) { + for (i = 0; i != (XHCI_MAX_TRANSFERS - 1); i++) { + if (pepext->xfer[i] != NULL) + xhci_device_done(pepext->xfer[i], USB_ERR_IOERROR); + } - /* NOTE: The USB transfer cannot vanish in this state! */ + /* NOTE: The USB transfer cannot vanish in this state! */ - USB_BUS_UNLOCK(&sc->sc_bus); + USB_BUS_UNLOCK(&sc->sc_bus); - xhci_configure_reset_endpoint(xfer); + xhci_configure_reset_endpoint(xfer); - USB_BUS_LOCK(&sc->sc_bus); + USB_BUS_LOCK(&sc->sc_bus); - pepext->trb_reset = 1; + /* check if halted is still cleared */ + if (pepext->trb_halted == 0) { + pepext->trb_running = 1; + pepext->trb_index = 1; } + goto restart; + } + if (xfer->flags_int.did_dma_delay) { + /* remove transfer from interrupt queue (again) */ usbd_transfer_dequeue(xfer); @@ -3270,22 +3316,14 @@ usb_dma_delay_done_cb(xfer); /* queue changed - restart */ - goto restart1; + goto restart; + } } - /* queue up leftover transfers, if any */ - TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { - pepext = xhci_get_endpoint_ext(xfer->xroot->udev, - xfer->endpoint->edesc); - - if ((pepext->trb_halted != 0) && - (pepext->trb_reset != 0)) { - pepext->trb_halted = 0; - pepext->trb_reset = 0; - } - xhci_transfer_insert(xfer); + /* try to insert transfer in hardware schedule */ + xhci_transfer_insert(xfer); } } @@ -3293,17 +3331,28 @@ xhci_ep_init(struct usb_device *udev, struct usb_endpoint_descriptor *edesc, struct usb_endpoint *ep) { + struct xhci_endpoint_ext *pepext; + DPRINTFN(2, "endpoint=%p, addr=%d, endpt=%d, mode=%d\n", - ep, udev->address, - edesc->bEndpointAddress, udev->flags.usb_mode); + ep, udev->address, edesc->bEndpointAddress, udev->flags.usb_mode); if (udev->flags.usb_mode != USB_MODE_HOST) { /* not supported */ return; } - /* check if not root HUB */ - if (udev->parent_hub != NULL) - ep->methods = &xhci_device_generic_methods; + if (udev->parent_hub == NULL) { + /* root HUB has special endpoint handling */ + return; + } + + ep->methods = &xhci_device_generic_methods; + + pepext = xhci_get_endpoint_ext(udev, edesc); + + USB_BUS_LOCK(udev->bus); + pepext->trb_halted = 1; + pepext->trb_running = 0; + USB_BUS_UNLOCK(udev->bus); } static void @@ -3312,6 +3361,30 @@ } +static void +xhci_ep_clear_stall(struct usb_device *udev, struct usb_endpoint *ep) +{ + struct xhci_endpoint_ext *pepext; + + DPRINTF("\n"); + + if (udev->flags.usb_mode != USB_MODE_HOST) { + /* not supported */ + return; + } + if (udev->parent_hub == NULL) { + /* root HUB has special endpoint handling */ + return; + } + + pepext = xhci_get_endpoint_ext(udev, ep->edesc); + + USB_BUS_LOCK(udev->bus); + pepext->trb_halted = 1; + pepext->trb_running = 0; + USB_BUS_UNLOCK(udev->bus); +} + static usb_error_t xhci_device_init(struct usb_device *udev) { @@ -3452,4 +3525,5 @@ .xfer_poll = xhci_do_poll, .start_dma_delay = xhci_start_dma_delay, .set_address = xhci_set_address, + .clear_stall = xhci_ep_clear_stall, }; ==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#18 (text+ko) ==== @@ -192,6 +192,8 @@ #define XHCI_TRB_2_BYTES_SET(x) ((x) & 0x1FFFF) #define XHCI_TRB_2_IRQ_GET(x) (((x) >> 22) & 0x3FF) #define XHCI_TRB_2_IRQ_SET(x) (((x) & 0x3FF) << 22) +#define XHCI_TRB_2_STREAM_GET(x) (((x) >> 16) & 0xFFFF) +#define XHCI_TRB_2_STREAM_SET(x) (((x) & 0xFFFF) << 16) volatile uint32_t dwTrb3; #define XHCI_TRB_3_TYPE_GET(x) (((x) >> 10) & 0x3F) @@ -215,11 +217,11 @@ #define XHCI_TRB_3_DIR_IN (1U << 16) #define XHCI_TRB_3_TLBPC_GET(x) (((x) >> 16) & 0xF) #define XHCI_TRB_3_TLBPC_SET(x) (((x) & 0xF) << 16) +#define XHCI_TRB_3_EP_GET(x) (((x) >> 16) & 0x1F) +#define XHCI_TRB_3_EP_SET(x) (((x) & 0x1F) << 16) #define XHCI_TRB_3_FRID_GET(x) (((x) >> 20) & 0x7FF) #define XHCI_TRB_3_FRID_SET(x) (((x) & 0x7FF) << 20) #define XHCI_TRB_3_ISO_SIA_BIT (1U << 31) -#define XHCI_TRB_3_EP_GET(x) (((x) >> 20) & 0x1F) -#define XHCI_TRB_3_EP_SET(x) (((x) & 0x1F) << 20) #define XHCI_TRB_3_SUSP_EP_BIT (1U << 23) #define XHCI_TRB_3_SLOT_GET(x) (((x) >> 24) & 0xFF) #define XHCI_TRB_3_SLOT_SET(x) (((x) & 0xFF) << 24) @@ -347,13 +349,13 @@ struct xhci_endpoint_ext { struct xhci_trb *trb; + struct usb_xfer *xfer[XHCI_MAX_TRANSFERS - 1]; struct usb_page_cache *page_cache; uint64_t physaddr; uint8_t trb_used; uint8_t trb_index; uint8_t trb_halted; - uint8_t trb_reset; - uint8_t trb_configured; + uint8_t trb_running; }; enum { From owner-p4-projects@FreeBSD.ORG Sun Aug 8 12:50:54 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99CB21065678; Sun, 8 Aug 2010 12:50:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E93B1065676 for ; Sun, 8 Aug 2010 12:50:54 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3180B8FC18 for ; Sun, 8 Aug 2010 12:50:54 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78Cos8r002533 for ; Sun, 8 Aug 2010 12:50:54 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78CosSk002531 for perforce@freebsd.org; Sun, 8 Aug 2010 12:50:54 GMT (envelope-from trasz@freebsd.org) Date: Sun, 8 Aug 2010 12:50:54 GMT Message-Id: <201008081250.o78CosSk002531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2010 12:50:54 -0000 http://p4web.freebsd.org/@@182076?ac=10 Change 182076 by trasz@trasz_victim on 2010/08/08 12:50:33 Use expand_number(3) in hrl(8). Affected files ... .. //depot/projects/soc2009/trasz_limits/TODO#26 edit .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/Makefile#6 edit .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#25 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/TODO#26 (text+ko) ==== @@ -82,5 +82,3 @@ - Should priv(9) checking be done by HRL, or by the callers? - - Use expand_number(3) in hrl(8). - ==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/Makefile#6 (text+ko) ==== @@ -3,6 +3,9 @@ PROG= hrl MAN= hrl.8 +DPADD= ${LIBUTIL} +LDADD= -lutil + WARNS?= 6 .include ==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#25 (text+ko) ==== @@ -29,11 +29,13 @@ #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -129,6 +131,48 @@ } /* + * This routine replaces "human-readable" number with its expanded form. + */ +static char * +expand_amount(char *rule) +{ + int64_t num; + const char *subject, *subject_id, *resource, *action, *amount, *per; + char *copy, *expanded; + + copy = strdup(rule); + if (copy == NULL) + err(1, "strdup"); + + subject = strsep(©, ":"); + subject_id = strsep(©, ":"); + resource = strsep(©, ":"); + action = strsep(©, "=/"); + amount = strsep(©, "/"); + per = copy; + + if (amount == NULL || strlen(amount) == 0) { + free(copy); + return (rule); + } + + assert(subject != NULL); + assert(subject_id != NULL); + assert(resource != NULL); + assert(action != NULL); + + if (expand_number(amount, &num)) + err(1, "expand_number"); + + if (per == NULL) + asprintf(&expanded, "%s:%s:%s:%s=%ld", subject, subject_id, resource, action, num); + else + asprintf(&expanded, "%s:%s:%s:%s=%ld/%s", subject, subject_id, resource, action, num, per); + + return (expanded); +} + +/* * Print rules, one per line, */ static void print_rules(char *rules) @@ -330,6 +374,7 @@ "at the same time"); rule = resolve_ids(rule); + rule = expand_amount(rule); if (aflag) { add_rule(rule); From owner-p4-projects@FreeBSD.ORG Sun Aug 8 13:12:19 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E2AE1065676; Sun, 8 Aug 2010 13:12:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5AAD106566C for ; Sun, 8 Aug 2010 13:12:18 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D18D78FC15 for ; Sun, 8 Aug 2010 13:12:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78DCIW9005392 for ; Sun, 8 Aug 2010 13:12:18 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78DCIL1005390 for perforce@freebsd.org; Sun, 8 Aug 2010 13:12:18 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 8 Aug 2010 13:12:18 GMT Message-Id: <201008081312.o78DCIL1005390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 182085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2010 13:12:19 -0000 http://p4web.freebsd.org/@@182085?ac=10 Change 182085 by rene@rene_acer on 2010/08/08 13:11:34 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#66 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#49 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#84 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#42 integrate .. //depot/projects/docproj_nl/share/images/books/handbook/install/ed0-conf.scr#2 integrate .. //depot/projects/docproj_nl/share/images/books/handbook/install/ed0-conf2.scr#2 integrate .. //depot/projects/docproj_nl/share/images/books/handbook/install/edit-inetd-conf.scr#2 integrate .. //depot/projects/docproj_nl/share/images/books/handbook/install/ftp-anon1.scr#2 integrate .. //depot/projects/docproj_nl/share/pgpkeys/ohauer.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#43 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#40 integrate .. //depot/projects/docproj_nl/www/en/cgi/man.cgi#16 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#40 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#29 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#86 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#66 (text+ko) ==== @@ -1,4 +1,4 @@ - + + @@ -661,7 +661,7 @@ returns 1 if the IP address does NOT belong to the jail or 0 otherwise. As you can see from the code, if it is indeed an IP address not belonging to the - jail, the protcol is not allowed to bind + jail, the protocol is not allowed to bind to that address. /usr/src/sys/kern/kern_jail.c: ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#2 (text+ko) ==== @@ -29,7 +29,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $FreeBSD: doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml,v 1.45 2006/08/28 18:59:15 blackend Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml,v 1.46 2010/08/02 16:15:46 bcr Exp $ --> @@ -330,7 +330,7 @@ permitted to sleep, limiting the use of primitives in those entry points to mutexes and wakeup operations. - When policy modules call out to other kernel subsytems, + When policy modules call out to other kernel subsystems, they will generally need to release any in-policy locks in order to avoid violating the kernel lock order or risking lock recursion. This will maintain policy locks as leaf ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -178,7 +178,7 @@ designed to reduce hardware complexity by requiring the host controller driver to supply a complete schedule of the transfers for each frame. OHCI type controllers are much more independent - by providing a more abstract interface doing alot of work + by providing a more abstract interface doing a lot of work themselves. @@ -246,7 +246,7 @@ is aware of scheduling priorities and the ordering of the types of transfers in a frame. The main data structure used by the host controller is the endpoint descriptor (ED) to which - aqueue of transfer descriptors (TDs) is attached. The ED + a queue of transfer descriptors (TDs) is attached. The ED contains the maximum packet size allowed for an endpoint and the controller hardware does the splitting into packets. The pointers to the data buffers are updated after each transfer ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/install/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -630,6 +630,10 @@ + A USB Memory Stick + + + A DOS partition on the same computer @@ -679,7 +683,7 @@ the operating system installed on your hard disk, but it can also be configured to use a bootable floppy disk. Most modern computers can also - boot from a CDROM in the CDROM drive. + boot from a CDROM in the CDROM drive or from a USB disk. If you have FreeBSD on CDROM or DVD (either one you purchased @@ -690,22 +694,96 @@ FreeBSD without any other special preparation. + To create a bootable memory stick, follow these + steps: + + + + Acquire the Memory Stick Image + + The memory stick image can be downloaded from the + ISO-IMAGES/ + directory from + ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/arch/ISO-IMAGES/version/&os;-&rel.current;-RELEASE-arch-memstick.img. + Replace arch and + version with the + architecture and the version number which you want to + install, respectively. For example, the memory stick + images for &os;/&arch.i386; &rel.current;-RELEASE are + available from . + + The memory stick image has a .img + extension. The ISO-IMAGES/ directory + contains a number of different images, and the one you + will need to use will depend on the version of &os; you + are installing, and in some cases, the hardware you are + installing to. + + + Before proceeding, back up the + data you currently have on your USB stick, as this + procedure will erase it. + + + + + Prepare the Memory Stick + + + The example below lists + /dev/da0 as the target device from + which you will be booting. Be very careful that you + have the correct device as the output target, or you may + destroy your existing data. + + + Set the kern.geom.debugflags sysctl + to be able to write a master boot record to the target + device. + + &prompt.root; sysctl kern.geom.debugflags=16 + + + + Write the Image File to the Memory Stick + + The .img file is + not a regular file you copy to the + memory stick. It is an image of the complete contents of + the disk. This means that you cannot + simply copy files from one disk to another. Instead, you + must use &man.dd.1; to write the image directly to the + disk: + + &prompt.root; dd if=&rel.current;-RELEASE-&arch.i386;-memstick.img of=/dev/da0 bs=64k + + + To create boot floppy images, follow these steps: Acquire the Boot Floppy Images + + Please note, as of &os; 8.0, floppy disk images are + no longer available. Please see above for instructions + on how to install &os; using a USB memory stick or just + use a CDROM or a DVD. + + The boot disks are available on your installation media in the floppies/ directory, and - can also be downloaded from the floppies directory, ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/<arch>/<version>-RELEASE/floppies/. - Replace <arch> and - <version> + can also be downloaded from the floppies directory, ftp://ftp.FreeBSD.org/pub/FreeBSD/releases/arch/version-RELEASE/floppies/. + Replace arch and + version with the architecture and the version number which you want to install, respectively. For example, the boot floppy images for - &os;/&arch.i386; &rel.current;-RELEASE are available - from . + &os;/&arch.i386; &rel2.current;-RELEASE are available + from . The floppy images have a .flp extension. The floppies/ directory contains a number of @@ -2584,7 +2662,7 @@ User Confirmation Requested - Would you like to Bring Up the ed0 interface right now? + Would you like to bring the ed0 interface up right now? [ Yes ] No ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#84 (text+ko) ==== @@ -1,7 +1,7 @@ Dependencies - Many ports depend on other ports. There are seven variables that - you can use to ensure that all the required bits will be on the - user's machine. There are also some pre-supported dependency - variables for common cases, plus a few more to control the behavior - of dependencies. + Many ports depend on other ports. This is very convenient + and nice feature of most Unix-like operating systems, + including &os;. It allows not having to bundle common + dependencies with every port or package, since a lot of ports + would share them. There are seven variables that can be used + to ensure that all the required bits will be on the user's + machine. There are also some pre-supported dependency + variables for common cases, plus a few more to control the + behavior of dependencies. <makevar>LIB_DEPENDS</makevar> @@ -3278,6 +3282,36 @@ not on the user's system. The target part can be omitted if it is the same as DEPENDS_TARGET. + + Quite common situation is when + RUN_DEPENDS is literally the same as + BUILD_DEPENDS, especially if ported + software is written in a scripted language or if it requires + the same run-time environment used to build it. In this + case, it is very tempting, and indeed natural to directly + assign one to another: + + RUN_DEPENDS= ${BUILD_DEPENDS} + + However, doing so can and often will result in + run-time dependencies be polluted by superfluous entries, not + present in original port's BUILD_DEPENDS. + It happens due to the fact that &man.make.1 is being lazy + when it evaluates assignments like these. Most probably + additional dependencies will be pulled by + ports/Mk/bsd.*.mk when processing + USE_* + variables, which most ports contain. For example, such + direct assignment along with + USE_GMAKE=yes will bring + gmake into + RUN_DEPENDS, despite that it was not + included explicitly in BUILD_DEPENDS. To + prevent this from happening, immediate expansion assignment + should be used, i.e. expand the value before assigning it + to the variable: + + RUN_DEPENDS:= ${BUILD_DEPENDS} ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#42 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.516 2010/07/28 09:05:35 bapt Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.518 2010/08/03 18:06:27 ohauer Exp $ --> aaron@FreeBSD.org"> @@ -858,6 +858,8 @@ obrien@FreeBSD.org"> +ohauer@FreeBSD.org"> + okazaki@FreeBSD.org"> oleg@FreeBSD.org"> ==== //depot/projects/docproj_nl/share/images/books/handbook/install/ed0-conf.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P                                                                                                                                                                    ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ~N~e~t~w~o~r~k~ ~i~n~t~e~r~f~a~c~e~ ~i~n~f~o~r~m~a~t~i~o~n~ ~r~e~q~u~i~r~e~d~ ~ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p         ³ pIpfp pypopup paprpep pupspipnpgp pPpPpPp popvpeprp pap pspeprpipaplp pdpepvpipcpep,p papsp popppppopspepdp ptpop pap pdpiprpepcptp p p p³p         ³ peptphpeprpnpeptp pcpopnpnpepcptpipopnp,p ptphpepnp pypopup pmpapyp pfpiprpsptp pnpepepdp ptpop pdpipaplp pypopuprp pIpnptpeprpnpeptp p p³p         ³ pSpeprpvpipcpep pPprpopvpipdpeprp pupspipnpgp ptphpep ppppppp puptpiplpiptpyp pwpep ppprpopvpipdpep pfpoprp ptphpaptp pppuprpppopspep.p p³p         ³ pIpfp pypopup'prpep pupspipnpgp pSpLpIpPp popvpeprp pap pspeprpipaplp pdpepvpipcpep ptphpepnp ptphpep pepxpppepcptpaptpipopnp pipsp p p p³p         ³ ptphpaptp pypopup phpapvpep pap pHpApRpDpWpIpRpEpDp pcpopnpnpepcptpipopnp.p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p         ³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p         ³ pYpopup pcpapnp paplpspop pipnpsptpaplplp popvpeprp pap pppaprpaplplpeplp pppoprptp pupspipnpgp pap pspppepcpipaplp p"plpappplpipnpkp"p p³p         ³ pcpapbplpep ptpop papnpoptphpeprp pmpapcphpipnpep prpupnpnpipnpgp pFprpepepBpSpDp.p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p         ³ pÚpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p         ³ p³p p p ped0 p p p pNovell NE1000/2000; 3C503; NE2000-co! mpatible PCMCIA p p p p³ p³p         ³ p³p p p pd|c~0~ p p p pDpEpCp/pIpnptpeplp p2p1p1p4p3p p(papnpdp pcplpopnpepsp)p pPpCpIp pFpapsptp pEptphpeprpnpeptp pcpaprpdp p p p p³ p³p         ³ p³p p p pp|l~i~p~0~ p pPpaprpaplplpeplp pPpoprptp pIpPp p(pPpLpIpPp)p pppepeprp pcpopnpnpepcptpipopnp p p p p p p p p p p p p p p p p³ p³p         ³ p³p p p ps|l~0~ p p p pSpLpIpPp pipnptpeprpfpapcpep popnp pdpepvpipcpep p/pdpepvp/pcpupapdp0p p(pCpOpMp1p)p p p p p p p p p p p p p p³ p³p         ³ p³p p p pp|p~p~0~ p p pPpPpPp pipnptpeprpfpapcpep popnp pdpepvpipcpep p/pdpepvp/pcpupapdp0p p(pCpOpMp1p)p p p p p p p p p p p p p p p³ p³p         ³ p³p p p ps|l~0~ p p p pSpLpIpPp pipnptpeprpfpapcpep popnp pdpepvpipcpep p/pdpepvp/pcpupapdp1p p(pCpOpMp2p)p p p p p p p p p p p p p p³ p³p         ³ p³p p p pp|p~p~0~ p p pPpPpPp pipnptpeprpfpapcpep popnp pdpepvpipcpep p/pdpepvp/pcpupapdp1p p(pCpOpMp2p)p p p p p p p p p p p p p p p³ p³p         ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p         ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p         ³ p p p p p p p p p p p p p p p p p p p p p p p[  OK  ] p p p p p p pCtapnpcpeplp p p p p p p p p p p p p p p p p p p p p p p p p p³p         ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~t~o~ ~r~e~a~d~ ~n~e~t~w~o~r~k~ ~c~o~n~f~i~g~u~r~a~t~i~o~n~ ~m~a~n~u~a~l~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                      +SCRSHOT_P                                                                                                                                                                                                                                                                                                                                    ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄ ~N~e~t~w~o~r~k~ ~i~n~t~e~r~f~a~c~e~ ~i~n~f~o~r~m~a~t~i~o~n~ ~r~e~q~u~i~r~e~d~ ~ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p         ³ pIpfp pypopup paprpep pupspipnpgp pPpPpPp popvpeprp pap pspeprpipaplp pdpepvpipcpep,p papsp popppppopspepdp ptpop pap pdpiprpepcptp p p p³p         ³ peptph peprpnpeptp pcpopnpnpepcptpipopnp,p ptphpepnp pypopup pmpapyp pfpiprpsptp pnpepepdp ptpop pdpipaplp pypopuprp pIpnptpeprpnpeptp p p³p         ³ pSpeprpvpipcpep pPprpopvpipdpeprp pupspipnpgp ptphpep ppppppp puptpiplpiptpyp pwpep ppprpopvpipdpep pfpoprp ptphpaptp pppuprpppopspep.p p³p         ³ pIpfp pypopup'prpep pupspipnpgp pSpLpIpPp popvpeprp pap pspeprpipaplp pdpepvpipcpep ptphpepnp ptphpep pepxpppepcptpaptpipopnp pipsp p p p³p         ³ ptphpaptp pypopup phpapvpep pap pHpApRpDpWpIpRpEpDp pcpopnpnpepcptpipopnp.p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p         ³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p         ³ pYpopup pcpapnp paplpspop pipnpsptpaplplp popvpeprp pap pppaprpaplplpeplp pppoprptp pupspipnpgp pap pspppepcpipaplp p"plpappplpipnpkp"p p³p         ³ pcpapbplpep ptpop papnpoptphpeprp p mpapcphpipnpep prpupnpnpipnpgp pFprpepepBpSpDp.p p p p p p p! p p p p p p p p p p p p p p p p p p p p p³p         ³ pÚpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp¿ p³p         ³ p³p p p ped0 p p p pNovell NE1000/2000; 3C503; NE2000-compatible PCMCIA p p p p³ p³p         ³ p³p p p pp|l~i~p~0~ p pPpaprpaplplpeplp pPpoprptp pIpPp p(pPpLpIpPp)p pppepeprp pcpopnpnpepcptpipopnp p p p p p p p p p p p p p p p p³ p³p         ³ pÀpÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÙ p³p         ÃÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ´p         ³ p p p p p p p p p p p p p p p p p p p p p p p[  OK  ] p p p p p p pCtapnpcpeplp p p p p p p p p p p p p p p p p p p p p p p p p p³p         ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp[~ ~P~r~e~s~s~ ~F~1~ ~t~o~ ~r~e~a~d~ ~n~e~t~w~o~r~k~ ~c~o~n~f~i~g~u~r~a~t~i~o~n~ ~m~a~n~u~a~l~ ~]~ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                                                                                                                                                                                                                                                                                                                                                      \ No newline at end of file ==== //depot/projects/docproj_nl/share/images/books/handbook/install/ed0-conf2.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P        ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ pNpeptpwpoprpkp pCpopnpfpipgpuprpaptpipopnp pÄÄÄÄÄÄÄÄÄÄÄÄ¿p                ³ p pHpopsptp:p p p p p p p p p p p p p p p p p p p p p p p p p p p p pDpopmpapipnp:p p p p p p p p p p p p p p p p p p p p p³p                ³ pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p³p                ³ p³kp6p-p2p.pepxpapmppplpep.pcpopmp p p p p p p p³p p p p p p p p p³epxpapmppplpep.pcpopmp p p p p p p p³p p p p p p p p p³p                ³ pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p³p                ³ p pIpPpvp4p pGpaptpepwpapyp:p p p p p p p p p p p p p p p p p p p p pNpapmpep pspeprpvpeprp:p p p p p p p p p p p p p p p p³p                ³  pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p p p³p                ³ p³ p p p p p p p p p p p p p p p p³p p p p p p p p p p p p p p p p³2p0p8p.p1p6p3p.p1p0p.p2p p p p p³p p p p p p p p p p p³p                ³ pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p³p                ³ p p p p p p pÚÄÄÄÄÄ pCpopnpfpipgpuprpaptpipopnp pfpoprp pIpnptpeprpfpapcpep pepdp0p pÄÄÄÄÄÄÄ¿p p p p p p p p p³p                ³ p p p p p p p³ p pIpPpvp4p pApdpdprpepspsp:p p p p p p p p p p p p pNpeptpmpapspkp:p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p³p p p p p p p p p³p                ³ p p p p p p p³ p³1p9p2p.p 1p6p8p.p0p.p1p p p p p p³p p p p p p p p³2p5p5p.p2p5p5p.p2p! 5p5p.p0p p p p³p p³p p p p p p p p p³p                ³ p p p p p p p³ pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p³p p p p p p p p p³p                ³ p p p p p p p³ p pEpxptprpap poppptpipopnpsp ptpop pipfpcpopnpfpipgp:p p p p p p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p³p p p p p p p p p³p                ³ p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p³p                ³ p p p p p p p p p p p p p pÚÄÄÄÄÄÄ¿p p p p p p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p p p p p p p p p³p                ³ p p p p p p p p p p p p p p³ p[OK] p³p p p p p p p p p p p p p³ p pCtApNpCpEpLp p p³p p p p p p p p p p p p p p p p p³p                ³ p p p p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p p p p p p³p                ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                         [~ ~S~e~l~e~c~t~ ~t~h~i~s~ ~i~f~ ~y~o~u~ ~a~r~e~ ~h~a~p~p~y~ ~w~i~t~h~ ~t~h~e~s~e~ ~s~e~t~t~i~n~g~s~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~]~   \ No newline at end of file +SCRSHOT_P        ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ pNpeptpwpoprpkp pCpopnpfpipgpuprpaptpipopnp pÄÄÄÄÄÄÄÄÄÄÄÄ¿p                ³ p pHpopsptp:p p p p p p p p p p p p p p p p p p p p p p p p p p p p pDpopmpapipnp:p p p p p p p p p p p p p p p p p p p p p³p                ³ pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p³p                ³ p³kp6p-p2p.pepxpapmppplpep.pcpopmp p p p p p p p³p p p p p p p p p³epxpapmppplpep.pcpopmp p p p p p p p³p p p p p p p p p³p                ³ pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p³p                ³ p pIpPpvp4p pGpaptpepwpapyp:p p p p p p p p p p p p p p p p p p p p pNpapmpep pspeprpvpeprp:p p p p p p p p p p p p p p p p³p                ³  pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p p p³p                ³ p³ p p p p p p p p p p p p p p p p³p p p p p p p p p p p p p p p p³2p0p8p.p1p6p3p.p1p0p.p2p p p p p³p p p p p p p p p p p³p                ³ pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p³p                ³ p p p p p p pÚÄÄÄÄÄ pCpopnpfpipgpuprpaptpipopnp pfpoprp pIpnptpeprpfpapcpep pepdp0p pÄÄÄÄÄÄÄ¿p p p p p p p p p³p                ³ p p p p p p p³ p pIpPpvp4p pApdpdprpepspsp:p p p p p p p p p p p p pNpeptpmpapspkp:p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p³p p p p p p p p p³p                ³ p p p p p p p³ p³1p9p2p.p 1p6p8p.p0p.p1p p p p p p³p p p p p p p p³2p5p5p.p2p5p5p.p2p! 5p5p.p0p p p p³p p³p p p p p p p p p³p                ³ p p p p p p p³ pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p³p p p p p p p p p³p                ³ p p p p p p p³ p pEpxptprpap poppptpipopnpsp ptpop pipfpcpopnpfpipgp p(pupspupaplplpyp pepmppptpyp)p:p p³p p p p p p p p p³p                ³ p p p p p p p³ pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p³p p p p p p p p p³p                ³ p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p³p                ³ p p p p p p p p p p p p p pÚÄÄÄÄÄÄ¿p p p p p p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p p p p p p p p p³p                ³ p p p p p p p p p p p p p p³ p[OK] p³p p p p p p p p p p p p p³ p pCtApNpCpEpLp p p³p p p p p p p p p p p p p p p p p³p                ³ p p p p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p p p p p p³p                ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                         [~ ~S~e~l~e~c~t~ ~t~h~i~s~ ~i~f~ ~y~o~u~ ~a~r~e~ ~h~a~p~p~y~ ~w~i~t~h~ ~t~h~e~s~e~ ~s~e~t~t~i~n~g~s~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~]~   \ No newline at end of file ==== //depot/projects/docproj_nl/share/images/books/handbook/install/edit-inetd-conf.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P^[ (escape) menu  ^y search prompt  ^k delete line   ^p prev li   ^g prev page  ^o ascii code     ^x search         ^l undelete line ^n next li   ^v next page  ^u end of file    ^a begin of line  ^w delete word   ^b back 1 char             ^t begin of file  ^e end of line    ^r restore word  ^f forward 1 char          ^c command        ^d delete char    ^j undelete char ^z next word               Lp:p p1p pCp:p p1p p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p # $FreeBS D: src/etc/inetd.conf,v 1.72 2006/08/31 17:15:10 obrien Exp $          #                                                                               # Internet server configuration database                                        #                                                                               # Define *both* IPv4 and IPv6 entries for dual-stack support.                   # To disable a service, comment it out by prefixing the line with '#'.          # To enable a service,  remove the '#' at the beginnin! g of the line.             #                                                                               #ftp    stream  tcp     nowait  root    /usr/libexec/ftpd       ftpd -l         #ftp    stream  tcp6    nowait  root    /usr/libexec/ftpd       ftpd -l         #ftp    stream  tcp     nowait  root    /usr/libexec/lukemftpd  ftpd -l -r      #ftp    stream  tcp6    nowait  root    /usr/libexec/lukemftpd  ftpd -l -r      #ssh    stream  tcp     nowait  root    /usr/sbin/sshd          sshd  -i -4      #ssh    stream  tcp6    nowait  root    /usr/sbin/sshd          sshd -i -6      #telnet stream  tcp     nowait  root    /usr/libexec/telnetd    telnetd         #telnet stream  tcp6    nowait  root    /usr/libexec/telnetd    telnetd         #shell  stream  tcp     nowait  root    /usr/libexec/rshd       rshd            #shell  stream  tcp6    nowait  root    /usr/libexec/rshd       rshd                                                                                             \ No newline at end of file +SCRSHOT_P^[ (escape) menu  ^y search prompt  ^k delete line   ^p prev li   ^g prev page  ^o ascii code     ^x search         ^l undelete line ^n next li   ^v next page  ^u end of file    ^a begin of line  ^w delete word   ^b back 1 char             ^t top of text    ^e end of line    ^r restore word  ^f forward 1 char          ^c command        ^d delete char    ^j undelete char ^z next word               =p=p=p=p=plpipnpep p1p pcpoplp p0p plpipnpepsp pfprpopmp ptpoppp p1p p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p=p # $FreeBS D: src/etc/inetd.conf,v 1.73.10.2.4.1 2010/06/14 02:09:06 kensmith Exp #                                                                               # Internet server configuration database                                        #                                                                               # Define *both* IPv4 and IPv6 entries for dual-stack support.                   # To disable a service, comment it out by prefixing the line with '#'.          # To enable a service,  remove the '#' at the beginnin! g of the line.             #                                                                               #ftp    stream  tcp     nowait  root    /usr/libexec/ftpd       ftpd -l         #ftp    stream  tcp6    nowait  root    /usr/libexec/ftpd       ftpd -l         #ssh    stream  tcp     nowait  root    /usr/sbin/sshd          sshd -i -4      #ssh    stream  tcp6    nowait  root    /usr/sbin/sshd          sshd -i -6      #telnet stream  tcp     nowait  root    /usr/libexec/telnetd    teln etd         #telnet stream  tcp6    nowait  root    /usr/libexec/telnetd    telnetd         #shell  stream  tcp     nowait  root    /usr/libexec/rshd       rshd            #shell  stream  tcp6    nowait  root    /usr/libexec/rshd       rshd            #login  stream  tcp     nowait  root    /usr/libexec/rlogind    rlogind         #login  stream  tcp6    nowait  root    /usr/libexec/rlogind    rlogind         file "/etc/inetd.conf", 118 lines                                                \ No newline at end of file ==== //depot/projects/docproj_nl/share/images/books/handbook/install/ftp-anon1.scr#2 (text+ko) ==== @@ -1,1 +1,1 @@ -SCRSHOT_P        ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ pApnpopnpypmpopupsp pFpTpPp pCpopnpfpipgpuprpaptpipopnp pÄÄÄÄÄÄÄÄÄ¿p                ³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p                ³ p p pUpIpDp:p p p p p p p p pGprpopuppp:p p p p p p p p p p p p p p pCpopmpmpepnptp:p p p p p p p p p p p p p p p p p p p p³p                ³ p pÚÄÄÄÄÄÄ¿p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p³p                ³ p p³1p4p p p p p³p p p p p³opppeprpaptpoprp p p p p p³p p p p p p³Apnpopnpypmpopupsp pFpTpPp pApdpmpipnp p p p³p p p p p³p                ³ p pÀÄpÄpÄpÄpÄpÄpÙp p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p³p                ³  p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p                ³ p p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄ pPpaptphp pCpopnpfpipgpuprpaptpipopnp pÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p pFpTpPp pRpopoptp pDpiprpepcptpoprpyp:p p p p p p p p p p p p p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p³p p p p p p p p p³p                ³ p p p p p p p³ p³/pvpaprp/pfptppp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p p³p p p p p p p p p³p                ³ p p p p p p p³ pÀÄpÄpÄpÄp ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp! ÄpÄpÄpÄpÄpÄpÄpÙp p³p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p p pUppplpopapdp pSpupbpdpiprpepcptpoprpyp:p p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p p³ipnpcpopmpipnpgp p p p p p p p p p p p p³p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p³p                ³ p p p p p p p p p p p p p pÚÄÄÄÄÄÄ¿p p p p p p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p p p p p p p p p³p                ³ p p p p p p p p p p p p p p³ p pOtKp p p³p p p p p p p p p p p p p³ p pCtApNpCpEpLp p p³p p p p p p p p p p p p p p p p p³p                ³ p p p p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p p p p p p³p                ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                         [~ ~W~h~a~t~ ~u~s~e~r~ ~I~D~ ~t~o~ ~a~s~s~i~g~n~ ~t~o~ ~F~T~P~ ~A~d~m~i~n~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~]~   \ No newline at end of file +SCRSHOT_P        ÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ pApnpopnpypmpopupsp pFpTpPp pCpopnpfpipgpuprpaptpipopnp pÄÄÄÄÄÄÄÄÄ¿p                ³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p                ³ p p pUpIpDp:p p p p p p p p pGprpopuppp:p p p p p p p p p p p p p p pCpopmpmpepnptp:p p p p p p p p p p p p p p p p p p p p³p                ³ p pÚÄÄÄÄÄÄ¿p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p³p                ³ p p³1p4p p p p p³p p p p p³fptppp p p p p p p p p p p³p p p p p p³Apnpopnpypmpopupsp pFpTpPp pApdpmpipnp p p p³p p p p p³p                ³ p pÀÄpÄpÄpÄpÄpÄpÙp p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p³p                ³  p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p                ³ p p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄ pPpaptphp pCpopnpfpipgpuprpaptpipopnp pÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p pFpTpPp pRpopoptp pDpiprpepcptpoprpyp:p p p p p p p p p p p p p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p³p p p p p p p p p³p                ³ p p p p p p p³ p³/pvpaprp/pfptppp p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p p³p p p p p p p p p³p                ³ p p p p p p p³ pÀÄpÄpÄpÄp ÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄp! ÄpÄpÄpÄpÄpÄpÄpÙp p³p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p p pUppplpopapdp pSpupbpdpiprpepcptpoprpyp:p p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p p³ipnpcpopmpipnpgp p p p p p p p p p p p p³p p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p p³ p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p p³p p p p p p p p p³p                ³ p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p³p                ³ p p p p p p p p p p p p p pÚÄÄÄÄÄÄ¿p p p p p p p p p p p p pÚÄÄÄÄÄÄÄÄÄÄ¿p p p p p p p p p p p p p p p p p³p                ³ p p p p p p p p p p p p p p³ p pOtKp p p³p p p p p p p p p p p p p³ p pCtApNpCpEpLp p p³p p p p p p p p p p p p p p p p p³p                ³ p p p p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p pÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp p p p p p p p p p p p p p p p p³p                ÀÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÄpÙp                                                                                         [~ ~W~h~a~t~ ~u~s~e~r~ ~I~D~ ~t~o~ ~a~s~s~i~g~n~ ~t~o~ ~F~T~P~ ~A~d~m~i~n~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~]~   \ No newline at end of file ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#43 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -491,6 +491,11 @@ &pgpkey.dhartmei; + + &a.ohauer; + &pgpkey.ohauer; + + &a.ehaupt; &pgpkey.ehaupt; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#40 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -239,6 +239,7 @@ + ==== //depot/projects/docproj_nl/www/en/cgi/man.cgi#16 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.250 2010/07/23 23:44:33 hrs Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.253 2010/08/04 17:17:58 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -196,21 +196,21 @@ %manPath = ( 'FreeBSD 8.1-RELEASE and Ports', -"$manLocalDir/FreeBSD-8.1-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", +"$manLocalDir/FreeBSD-8.1-RELEASE/man:$manLocalDir/FreeBSD-8.1-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports-8.1-RELEASE", 'FreeBSD 8.0-RELEASE and Ports', -"$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-7.2-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", +"$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports-8.0-RELEASE", 'FreeBSD 7.3-RELEASE and Ports', -"$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", +"$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports-7.3-RELEASE", 'FreeBSD 6.4-RELEASE and Ports', -"$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", +"$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports-6.2-RELEASE", 'FreeBSD Ports', "$manLocalDir/FreeBSD-ports", 'FreeBSD 9-current', "$manLocalDir/FreeBSD-9-current/man:$manLocalDir/FreeBSD-9-current/openssl/man", + 'FreeBSD 8.1-stable', "$manLocalDir/FreeBSD-8.1-stable/man:$manLocalDir/FreeBSD-8.1-stable/openssl/man", 'FreeBSD 8.1-RELEASE', "$manLocalDir/FreeBSD-8.1-RELEASE/man:$manLocalDir/FreeBSD-8.1-RELEASE/openssl/man", - 'FreeBSD 8.1-stable', "$manLocalDir/FreeBSD-8.1-stable/man:$manLocalDir/FreeBSD-8.1-stable/openssl/man", 'FreeBSD 8.0-RELEASE', "$manLocalDir/FreeBSD-8.0-RELEASE/man:$manLocalDir/FreeBSD-8.0-RELEASE/openssl/man", - 'FreeBSD 8.0-stable', "$manLocalDir/FreeBSD-8.0-stable/man:$manLocalDir/FreeBSD-8.0-stable/openssl/man", + 'FreeBSD Ports 8.1-RELEASE', "$manLocalDir/FreeBSD-ports-8.1-RELEASE", 'FreeBSD Ports 8.0-RELEASE', "$manLocalDir/FreeBSD-ports-8.0-RELEASE", 'FreeBSD 7.3-stable', "$manLocalDir/FreeBSD-7.3-RELEASE/man:$manLocalDir/FreeBSD-7.3-RELEASE/openssl/man", @@ -527,16 +527,16 @@ # keywords must be in lower cases. %manPathAliases = ( - 'freebsd', 'FreeBSD 8.0-RELEASE', - 'freebsd-release', 'FreeBSD 8.0-RELEASE', + 'freebsd', 'FreeBSD 8.1-RELEASE', + 'freebsd-release', 'FreeBSD 8.1-RELEASE', - 'freebsd-stable', 'FreeBSD 8.0-stable', - 'freebsd-stable8', 'FreeBSD 8.0-stable', + 'freebsd-stable', 'FreeBSD 8.1-stable', + 'freebsd-stable8', 'FreeBSD 8.1-stable', 'freebsd-stable7', 'FreeBSD 7.3-stable', 'freebsd-stable6', 'FreeBSD 6.4-stable', 'freebsd-current', 'FreeBSD 9-current', - 'freebsd-release-ports', 'FreeBSD 8.0-RELEASE and Ports', + 'freebsd-release-ports', 'FreeBSD 8.1-RELEASE and Ports', 'slackware', 'Linux Slackware 3.1', 'redhat', 'Red Hat Linux/i386 9', @@ -1442,7 +1442,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.250 2010/07/23 23:44:33 hrs Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.253 2010/08/04 17:17:58 wosch Exp $'; return qq{\ 
 Copyright (c) 1996-2010 Wolfram Schneider

==== //depot/projects/docproj_nl/www/en/developers.sgml#40 (text+ko) ====

@@ -6,7 +6,7 @@
 us to update author names, or the representation of those names (such
 as adding email addresses), by just editing a single file.
 
-$FreeBSD: www/en/developers.sgml,v 1.259 2010/07/28 14:51:15 bapt Exp $
+$FreeBSD: www/en/developers.sgml,v 1.260 2010/08/01 22:14:59 ohauer Exp $
 
 -->
 
@@ -429,6 +429,7 @@
 
 
 
+
 
 
 

==== //depot/projects/docproj_nl/www/share/sgml/events.xml#29 (text+ko) ====

@@ -10,7 +10,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/events.xml,v 1.85 2010/07/19 15:31:00 skreuzer Exp $
+      $FreeBSD: www/share/sgml/events.xml,v 1.86 2010/08/05 21:25:42 gavin Exp $
     
   
 
@@ -167,6 +167,32 @@
       track, tutorials, and FreeBSD developer summit.
   
 
+  
+    Bugathon #7: PRs containing patches
+    http://wiki.freebsd.org/Bugathons/2010August
+    
+      2010
+      8
+      6
+    
+    
+      2010
+      8
+      9
+    
+
+    A bugathon is an event coordinated by the &os;
+      bugbusting team.  Bugathons are held on IRC (in the
+      #freebsd-bugbusters channel of EFnet), and are attended by any
+      interested &os; developers and contributors during a week-end.
+      They focus on closing as many problem reports and fixing as many
+      bugs as possible.  The plan for the seventh bugathon is to work
+      through many of the problem reports in &os;'s GNATS database
+      containing patches, with a view to either committing them,
+      getting them into a committable shape, or explaining to the
+      submitters the issues with the supplied patches.
+  
+
   
     meetBSD 2010
     http://www.meetBSD.org/

==== //depot/projects/docproj_nl/www/share/sgml/news.xml#86 (text+ko) ====

@@ -25,7 +25,7 @@
 
   
     
-      $FreeBSD: www/share/sgml/news.xml,v 1.336 2010/07/28 14:51:15 bapt Exp $
+      $FreeBSD: www/share/sgml/news.xml,v 1.337 2010/08/01 22:57:05 ohauer Exp $
     
   
 
@@ -33,6 +33,17 @@
     2010
 
     
+      8
+
+      
+	01
+	
+	  
New committer: Oliver Hauer (ports)

+	
+      
+      
+
+    
       7
 
       

From owner-p4-projects@FreeBSD.ORG  Sun Aug  8 13:49:00 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E33451065670; Sun,  8 Aug 2010 13:48:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F50B106566B
	for ; Sun,  8 Aug 2010 13:48:59 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7BAA38FC08
	for ; Sun,  8 Aug 2010 13:48:59 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78Dmx7J007841
	for ; Sun, 8 Aug 2010 13:48:59 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78DmxdN007839
	for perforce@freebsd.org; Sun, 8 Aug 2010 13:48:59 GMT
	(envelope-from trasz@freebsd.org)
Date: Sun, 8 Aug 2010 13:48:59 GMT
Message-Id: <201008081348.o78DmxdN007839@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182086 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 08 Aug 2010 13:49:00 -0000

http://p4web.freebsd.org/@@182086?ac=10

Change 182086 by trasz@trasz_victim on 2010/08/08 13:47:59

	Add "-h" option to hrl(8), so I don't have to count digits anymore.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.8#4 edit
.. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#26 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.8#4 (text+ko) ====

@@ -33,17 +33,20 @@
 .Nd display and update Hierarchical Resource Limits database
 .Sh SYNOPSIS
 .Nm
+.Op Fl h
 .Op Ar filter
 .Nm
 .Fl a
 .Op Ar rule
 .Nm
+.Op Fl h
 .Fl l
 .Op Ar filter
 .Nm
 .Fl r
 .Op Ar filter
 .Nm
+.Op Fl h
 .Fl u
 .Op Ar filter
 .Sh DESCRIPTION
@@ -67,10 +70,14 @@
 Remove rules matching
 .Ar filter
 from the HRL database.
-.It Fl l Ar filter
+.It Fl u Ar filter
 Display resource usage for a subject (process, user, login class
 or jail) matching the
 .Ar filter .
+.It Fl h
+"Human-readable" output.
+Use unit suffixes: Byte, Kilobyte, Megabyte,
+Gigabyte, Terabyte and Petabyte.
 .Pp
 .Sh RULE SYNTAX
 Syntax for a rule is subject:subject-id:resource:action=amount/per.

==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#26 (text+ko) ====

@@ -169,46 +169,124 @@
 	else
 		asprintf(&expanded, "%s:%s:%s:%s=%ld/%s", subject, subject_id, resource, action, num, per);
 
+	if (expanded == NULL)
+		err(1, "asprintf");
+
 	return (expanded);
 }
 
+static char *
+humanize_ids(char *rule)
+{
+	id_t id;
+	struct passwd *pwd;
+	struct group *grp;
+	const char *subject, *textid, *rest;
+	char *humanized;
+
+	subject = strsep(&rule, ":");
+	textid = strsep(&rule, ":");
+	if (textid == NULL)
+		errx(1, "rule passed from the kernel didn't contain subject");
+	if (rule != NULL)
+		rest = rule;
+	else
+		rest = "";
+
+	/* Replace numerical user and group ids with names. */
+	if (strcasecmp(subject, "user") == 0) {
+		id = parse_user(textid);
+		pwd = getpwuid(id);
+		if (pwd != NULL)
+			textid = pwd->pw_name;
+	} else if (strcasecmp(subject, "group") == 0) {
+		id = parse_group(textid);
+		grp = getgrgid(id);
+		if (grp != NULL)
+			textid = grp->gr_name;
+	}
+
+	asprintf(&humanized, "%s:%s:%s", subject, textid, rest);
+
+	if (humanized == NULL)
+		err(1, "asprintf");
+
+	return (humanized);
+}
+
+static int
+str2int64(const char *str, int64_t *value)
+{
+	char *end;
+
+	if (str == NULL)
+		return (EINVAL);
+
+	*value = strtoul(str, &end, 10);
+	if ((size_t)(end - str) != strlen(str))
+		return (EINVAL);
+
+	return (0);
+}
+
+static char *
+humanize_amount(char *rule)
+{
+	int64_t num;
+	const char *subject, *subject_id, *resource, *action, *amount, *per;
+	char *copy, *humanized, buf[6];
+
+	copy = strdup(rule);
+	if (copy == NULL)
+		err(1, "strdup");
+
+	subject = strsep(©, ":");
+	subject_id = strsep(©, ":");
+	resource = strsep(©, ":");
+	action = strsep(©, "=/");
+	amount = strsep(©, "/");
+	per = copy;
+
+	if (amount == NULL || strlen(amount) == 0 || str2int64(amount, &num) != 0) {
+		free(copy);
+		return (rule);
+	}
+
+	assert(subject != NULL);
+	assert(subject_id != NULL);
+	assert(resource != NULL);
+	assert(action != NULL);
+
+	if (humanize_number(buf, sizeof(buf), num, "", HN_AUTOSCALE, HN_DECIMAL | HN_NOSPACE) == -1)
+		err(1, "humanize_number");
+
+	if (per == NULL)
+		asprintf(&humanized, "%s:%s:%s:%s=%s", subject, subject_id, resource, action, buf);
+	else
+		asprintf(&humanized, "%s:%s:%s:%s=%s/%s", subject, subject_id, resource, action, buf, per);
+
+	if (humanized == NULL)
+		err(1, "asprintf");
+
+	return (humanized);
+}
+
 /*
- * Print rules, one per line,  */
+ * Print rules, one per line.
+ */
 static void
-print_rules(char *rules)
+print_rules(char *rules, int hflag)
 {
 	char *rule;
-	const char *subject, *textid, *rest;
-	id_t id;
-	struct passwd *pwd;
-	struct group *grp;
 
 	while ((rule = strsep(&rules, ",")) != NULL) {
 		if (rule[0] == '\0')
 			break; /* XXX */
-		subject = strsep(&rule, ":");
-		textid = strsep(&rule, ":");
-		if (textid == NULL)
-			errx(1, "rule passed from the kernel didn't contain subject");
-		if (rule != NULL)
-			rest = rule;
-		else
-			rest = "";
-
-		/* Replace numerical user and group ids with names. */
-		if (strcasecmp(subject, "user") == 0) {
-			id = parse_user(textid);
-			pwd = getpwuid(id);
-			if (pwd != NULL)
-				textid = pwd->pw_name;
-		} else if (strcasecmp(subject, "group") == 0) {
-			id = parse_group(textid);
-			grp = getgrgid(id);
-			if (grp != NULL)
-				textid = grp->gr_name;
-		}
-
-		printf("%s:%s:%s\n", subject, textid, rest);
+		rule = humanize_ids(rule);
+		if (hflag)
+			rule = humanize_amount(rule);
+		printf("%s\n", rule);
+		free(rule);
 	}
 }
 
@@ -224,7 +302,7 @@
 }
 
 static void
-show_limits(char *filter)
+show_limits(char *filter, int hflag)
 {
 	int error;
 	char *outbuf = NULL;
@@ -241,7 +319,7 @@
 			err(1, "hrl_get_limits");
 	} while (error && errno == ERANGE);
 
-	print_rules(outbuf);
+	print_rules(outbuf, hflag);
 	free(filter);
 	free(outbuf);
 }
@@ -257,11 +335,41 @@
 	free(filter);
 }
 
+static char *
+humanize_usage_amount(char *usage)
+{
+	int64_t num;
+	const char *resource, *amount;
+	char *copy, *humanized, buf[6];
+
+	copy = strdup(usage);
+	if (copy == NULL)
+		err(1, "strdup");
+
+	resource = strsep(©, "=");
+	amount = copy;
+
+	assert(resource != NULL);
+	assert(amount != NULL);
+
+	if (str2int64(amount, &num) != 0 || 
+	    humanize_number(buf, sizeof(buf), num, "", HN_AUTOSCALE, HN_DECIMAL | HN_NOSPACE) == -1) {
+		free(copy);
+		return (usage);
+	}
+
+	asprintf(&humanized, "%s=%s", resource, buf);
+	if (humanized == NULL)
+		err(1, "asprintf");
+
+	return (humanized);
+}
+
 /*
  * Query the kernel about a resource usage and print it out.
  */
 static void
-show_usage(char *filter)
+show_usage(char *filter, int hflag)
 {
 	int error;
 	char *outbuf = NULL, *tmp;
@@ -278,11 +386,16 @@
 			err(1, "hrl_get_usage");
 	} while (error && errno == ERANGE);
 
-	for (tmp = outbuf; *tmp != '\0'; tmp++)
-		if (*tmp == ',')
-			*tmp = '\n';
+	while ((tmp = strsep(&outbuf, ",")) != NULL) {
+		if (tmp[0] == '\0')
+			break; /* XXX */
+
+		if (hflag)
+			tmp = humanize_usage_amount(tmp);
+
+		printf("%s\n", tmp);
+	}
 
-	printf("%s\n", outbuf);
 	free(filter);
 	free(outbuf);
 }
@@ -291,7 +404,7 @@
  * Query the kernel about resource limit rules and print them out.
  */
 static void
-show_rules(char *filter)
+show_rules(char *filter, int hflag)
 {
 	int error;
 	char *outbuf = NULL;
@@ -313,7 +426,7 @@
 			err(1, "hrl_get_rules");
 	} while (error && errno == ERANGE);
 
-	print_rules(outbuf);
+	print_rules(outbuf, hflag);
 	free(outbuf);
 }
 
@@ -321,22 +434,25 @@
 usage(void)
 {
 
-	fprintf(stderr, "usage: hrl [-a rule | -l filter | -r filter | -u filter | filter]\n");
+	fprintf(stderr, "usage: hrl [ -h ] [-a rule | -l filter | -r filter | -u filter | filter]\n");
 	exit(1);
 }
 
 int
 main(int argc __unused, char **argv __unused)
 {
-	int ch, aflag = 0, lflag = 0, rflag = 0, uflag = 0;
+	int ch, aflag = 0, hflag = 0, lflag = 0, rflag = 0, uflag = 0;
 	char *rule = NULL;
 
-	while ((ch = getopt(argc, argv, "a:l:r:u:")) != -1) {
+	while ((ch = getopt(argc, argv, "a:hl:r:u:")) != -1) {
 		switch (ch) {
 		case 'a':
 			aflag = 1;
 			rule = strdup(optarg);
 			break;
+		case 'h':
+			hflag = 1;
+			break;
 		case 'l':
 			lflag = 1;
 			rule = strdup(optarg);
@@ -363,7 +479,7 @@
 		usage();
 
 	if (rule == NULL) {
-		if ( argc == 1)
+		if (argc == 1)
 			rule = strdup(argv[0]);
 		else
 			rule = strdup("::");
@@ -382,7 +498,7 @@
 	}
 
 	if (lflag) {
-		show_limits(rule);
+		show_limits(rule, hflag);
 		return (0);
 	}
 
@@ -392,10 +508,10 @@
 	}
 
 	if (uflag) {
-		show_usage(rule);
+		show_usage(rule, hflag);
 		return (0);
 	}
 
-	show_rules(rule);
+	show_rules(rule, hflag);
 	return (0);
 }

From owner-p4-projects@FreeBSD.ORG  Sun Aug  8 14:47:04 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1568E1065672; Sun,  8 Aug 2010 14:47:04 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CE1C4106567A
	for ; Sun,  8 Aug 2010 14:47:03 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A17328FC15
	for ; Sun,  8 Aug 2010 14:47:03 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78El3Yb012721
	for ; Sun, 8 Aug 2010 14:47:03 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78El33k012719
	for perforce@freebsd.org; Sun, 8 Aug 2010 14:47:03 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 8 Aug 2010 14:47:03 GMT
Message-Id: <201008081447.o78El33k012719@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182087 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 08 Aug 2010 14:47:04 -0000

http://p4web.freebsd.org/@@182087?ac=10

Change 182087 by hselasky@hselasky_laptop001 on 2010/08/08 14:46:47

	
	IFC

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/input/uep.c#1 branch

Differences ...

From owner-p4-projects@FreeBSD.ORG  Sun Aug  8 14:52:10 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0CAB9106567B; Sun,  8 Aug 2010 14:52:10 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ACAC21065670
	for ; Sun,  8 Aug 2010 14:52:09 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F9108FC14
	for ; Sun,  8 Aug 2010 14:52:09 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78Eq92W013047
	for ; Sun, 8 Aug 2010 14:52:09 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78Eq9hp013045
	for perforce@freebsd.org; Sun, 8 Aug 2010 14:52:09 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 8 Aug 2010 14:52:09 GMT
Message-Id: <201008081452.o78Eq9hp013045@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182088 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 08 Aug 2010 14:52:10 -0000

http://p4web.freebsd.org/@@182088?ac=10

Change 182088 by hselasky@hselasky_laptop001 on 2010/08/08 14:51:16

	USB drivers:
		- add missing MODULE_VERSION() definitions.
		- this resolves problems around duplicate module
		loads.
	
	PR:		usb/125736
	Submitted by:	danger@ and mm@
	Reviewed by:	hselasky@

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/input/atp.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/input/uep.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#51 edit
.. //depot/projects/usb/src/sys/dev/usb/input/ums.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#53 edit
.. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#56 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#55 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#30 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/input/atp.c#7 (text+ko) ====

@@ -2222,3 +2222,4 @@
 
 DRIVER_MODULE(atp, uhub, atp_driver, atp_devclass, NULL, 0);
 MODULE_DEPEND(atp, usb, 1, 1, 1);
+MODULE_VErSION(atp, 1);

==== //depot/projects/usb/src/sys/dev/usb/input/uep.c#2 (text+ko) ====

@@ -439,3 +439,4 @@
 
 DRIVER_MODULE(uep, uhub, uep_driver, uep_devclass, NULL, NULL);
 MODULE_DEPEND(uep, usb, 1, 1, 1);
+MODULE_VERSION(uep, 1);

==== //depot/projects/usb/src/sys/dev/usb/input/uhid.c#20 (text+ko) ====

@@ -801,3 +801,4 @@
 
 DRIVER_MODULE(uhid, uhub, uhid_driver, uhid_devclass, NULL, 0);
 MODULE_DEPEND(uhid, usb, 1, 1, 1);
+MODULE_VERSION(uhid, 1);

==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#51 (text+ko) ====

@@ -1887,3 +1887,4 @@
 
 DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0);
 MODULE_DEPEND(ukbd, usb, 1, 1, 1);
+MODULE_VERSION(ukbd, 1);

==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#30 (text+ko) ====

@@ -1010,3 +1010,4 @@
 
 DRIVER_MODULE(ums, uhub, ums_driver, ums_devclass, NULL, 0);
 MODULE_DEPEND(ums, usb, 1, 1, 1);
+MODULE_VERSION(ums, 1);

==== //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#15 (text+ko) ====

@@ -261,6 +261,7 @@
 DRIVER_MODULE(udbp, uhub, udbp_driver, udbp_devclass, udbp_modload, 0);
 MODULE_DEPEND(udbp, netgraph, NG_ABI_VERSION, NG_ABI_VERSION, NG_ABI_VERSION);
 MODULE_DEPEND(udbp, usb, 1, 1, 1);
+MODULE_VERSION(udbp, 1);
 
 static int
 udbp_modload(module_t mod, int event, void *data)

==== //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#12 (text+ko) ====

@@ -117,6 +117,7 @@
 
 DRIVER_MODULE(ufm, uhub, ufm_driver, ufm_devclass, NULL, 0);
 MODULE_DEPEND(ufm, usb, 1, 1, 1);
+MODULE_VERSION(ufm, 1);
 
 static int
 ufm_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#21 (text+ko) ====

@@ -281,6 +281,7 @@
 MODULE_DEPEND(aue, usb, 1, 1, 1);
 MODULE_DEPEND(aue, ether, 1, 1, 1);
 MODULE_DEPEND(aue, miibus, 1, 1, 1);
+MODULE_VERSION(aue, 1);
 
 static const struct usb_ether_methods aue_ue_methods = {
 	.ue_attach_post = aue_attach_post,

==== //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#25 (text+ko) ====

@@ -256,6 +256,7 @@
 MODULE_DEPEND(axe, usb, 1, 1, 1);
 MODULE_DEPEND(axe, ether, 1, 1, 1);
 MODULE_DEPEND(axe, miibus, 1, 1, 1);
+MODULE_VERSION(axe, 1);
 
 static const struct usb_ether_methods axe_ue_methods = {
 	.ue_attach_post = axe_attach_post,

==== //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#18 (text+ko) ====

@@ -173,6 +173,7 @@
 MODULE_DEPEND(cue, uether, 1, 1, 1);
 MODULE_DEPEND(cue, usb, 1, 1, 1);
 MODULE_DEPEND(cue, ether, 1, 1, 1);
+MODULE_VERSION(cue, 1);
 
 static const struct usb_ether_methods cue_ue_methods = {
 	.ue_attach_post = cue_attach_post,

==== //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#18 (text+ko) ====

@@ -215,6 +215,7 @@
 MODULE_DEPEND(kue, uether, 1, 1, 1);
 MODULE_DEPEND(kue, usb, 1, 1, 1);
 MODULE_DEPEND(kue, ether, 1, 1, 1);
+MODULE_VERSION(kue, 1);
 
 static const struct usb_ether_methods kue_ue_methods = {
 	.ue_attach_post = kue_attach_post,

==== //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#18 (text+ko) ====

@@ -213,6 +213,7 @@
 MODULE_DEPEND(rue, usb, 1, 1, 1);
 MODULE_DEPEND(rue, ether, 1, 1, 1);
 MODULE_DEPEND(rue, miibus, 1, 1, 1);
+MODULE_VERSION(rue, 1);
 
 static const struct usb_ether_methods rue_ue_methods = {
 	.ue_attach_post = rue_attach_post,

==== //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#17 (text+ko) ====

@@ -172,6 +172,7 @@
 MODULE_DEPEND(udav, usb, 1, 1, 1);
 MODULE_DEPEND(udav, ether, 1, 1, 1);
 MODULE_DEPEND(udav, miibus, 1, 1, 1);
+MODULE_VERSION(udav, 1);
 
 static const struct usb_ether_methods udav_ue_methods = {
 	.ue_attach_post = udav_attach_post,

==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#33 (text+ko) ====

@@ -178,6 +178,7 @@
 DRIVER_MODULE(u3g, uhub, u3g_driver, u3g_devclass, u3g_driver_loaded, 0);
 MODULE_DEPEND(u3g, ucom, 1, 1, 1);
 MODULE_DEPEND(u3g, usb, 1, 1, 1);
+MODULE_VERSION(u3g, 1);
 
 static const struct usb_device_id u3g_devs[] = {
 #define	U3G_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) }

==== //depot/projects/usb/src/sys/dev/usb/serial/uark.c#14 (text+ko) ====

@@ -169,6 +169,7 @@
 DRIVER_MODULE(uark, uhub, uark_driver, uark_devclass, NULL, 0);
 MODULE_DEPEND(uark, ucom, 1, 1, 1);
 MODULE_DEPEND(uark, usb, 1, 1, 1);
+MODULE_VERSION(uark, 1);
 
 static const struct usb_device_id uark_devs[] = {
 	{USB_VPI(USB_VENDOR_ARKMICRO, USB_PRODUCT_ARKMICRO_ARK3116, 0)},

==== //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#15 (text+ko) ====

@@ -277,6 +277,7 @@
 DRIVER_MODULE(ubsa, uhub, ubsa_driver, ubsa_devclass, NULL, 0);
 MODULE_DEPEND(ubsa, ucom, 1, 1, 1);
 MODULE_DEPEND(ubsa, usb, 1, 1, 1);
+MODULE_VERSION(ubsa, 1);
 
 static int
 ubsa_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#20 (text+ko) ====

@@ -214,6 +214,7 @@
 DRIVER_MODULE(ubser, uhub, ubser_driver, ubser_devclass, NULL, 0);
 MODULE_DEPEND(ubser, ucom, 1, 1, 1);
 MODULE_DEPEND(ubser, usb, 1, 1, 1);
+MODULE_VERSION(ubser, 1);
 
 static int
 ubser_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#18 (text+ko) ====

@@ -855,3 +855,4 @@
 DRIVER_MODULE(uchcom, uhub, uchcom_driver, uchcom_devclass, NULL, 0);
 MODULE_DEPEND(uchcom, ucom, 1, 1, 1);
 MODULE_DEPEND(uchcom, usb, 1, 1, 1);
+MODULE_VERSION(uchcom, 1);

==== //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#17 (text+ko) ====

@@ -176,6 +176,7 @@
 DRIVER_MODULE(ucycom, uhub, ucycom_driver, ucycom_devclass, NULL, 0);
 MODULE_DEPEND(ucycom, ucom, 1, 1, 1);
 MODULE_DEPEND(ucycom, usb, 1, 1, 1);
+MODULE_VERSION(ucycom, 1);
 
 /*
  * Supported devices

==== //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#16 (text+ko) ====

@@ -326,6 +326,7 @@
 DRIVER_MODULE(ufoma, uhub, ufoma_driver, ufoma_devclass, NULL, 0);
 MODULE_DEPEND(ufoma, ucom, 1, 1, 1);
 MODULE_DEPEND(ufoma, usb, 1, 1, 1);
+MODULE_VERSION(ufoma, 1);
 
 static int
 ufoma_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#29 (text+ko) ====

@@ -205,6 +205,7 @@
 DRIVER_MODULE(uftdi, uhub, uftdi_driver, uftdi_devclass, NULL, 0);
 MODULE_DEPEND(uftdi, ucom, 1, 1, 1);
 MODULE_DEPEND(uftdi, usb, 1, 1, 1);
+MODULE_VERSION(uftdi, 1);
 
 static struct usb_device_id uftdi_devs[] = {
 #define	UFTDI_DEV(v,p,t) \

==== //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#18 (text+ko) ====

@@ -153,6 +153,7 @@
 DRIVER_MODULE(ugensa, uhub, ugensa_driver, ugensa_devclass, NULL, 0);
 MODULE_DEPEND(ugensa, ucom, 1, 1, 1);
 MODULE_DEPEND(ugensa, usb, 1, 1, 1);
+MODULE_VERSION(ugensa, 1);
 
 static const struct usb_device_id ugensa_devs[] = {
 	{USB_VPI(USB_VENDOR_AIRPRIME, USB_PRODUCT_AIRPRIME_PC5220, 0)},

==== //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#20 (text+ko) ====

@@ -1085,6 +1085,7 @@
 DRIVER_MODULE(uipaq, uhub, uipaq_driver, uipaq_devclass, NULL, 0);
 MODULE_DEPEND(uipaq, ucom, 1, 1, 1);
 MODULE_DEPEND(uipaq, usb, 1, 1, 1);
+MODULE_VERSION(uipaq, 1);
 
 static int
 uipaq_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#21 (text+ko) ====

@@ -745,3 +745,4 @@
 DRIVER_MODULE(ulpt, uhub, ulpt_driver, ulpt_devclass, NULL, 0);
 MODULE_DEPEND(ulpt, usb, 1, 1, 1);
 MODULE_DEPEND(ulpt, ucom, 1, 1, 1);
+MODULE_VERSION(ulpt, 1);

==== //depot/projects/usb/src/sys/dev/usb/serial/umct.c#20 (text+ko) ====

@@ -219,6 +219,7 @@
 DRIVER_MODULE(umct, uhub, umct_driver, umct_devclass, NULL, 0);
 MODULE_DEPEND(umct, ucom, 1, 1, 1);
 MODULE_DEPEND(umct, usb, 1, 1, 1);
+MODULE_VERSION(umct, 1);
 
 static int
 umct_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#15 (text+ko) ====

@@ -279,6 +279,7 @@
 DRIVER_MODULE(umoscom, uhub, umoscom_driver, umoscom_devclass, NULL, 0);
 MODULE_DEPEND(umoscom, ucom, 1, 1, 1);
 MODULE_DEPEND(umoscom, usb, 1, 1, 1);
+MODULE_VERSION(umoscom, 1);
 
 static const struct usb_device_id umoscom_devs[] = {
 	{USB_VPI(USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7703, 0)}

==== //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#21 (text+ko) ====

@@ -252,6 +252,7 @@
 DRIVER_MODULE(uvisor, uhub, uvisor_driver, uvisor_devclass, NULL, 0);
 MODULE_DEPEND(uvisor, ucom, 1, 1, 1);
 MODULE_DEPEND(uvisor, usb, 1, 1, 1);
+MODULE_VERSION(uvisor, 1);
 
 static const struct usb_device_id uvisor_devs[] = {
 #define	UVISOR_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) }

==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#53 (text+ko) ====

@@ -715,6 +715,7 @@
 DRIVER_MODULE(umass, uhub, umass_driver, umass_devclass, NULL, 0);
 MODULE_DEPEND(umass, usb, 1, 1, 1);
 MODULE_DEPEND(umass, cam, 1, 1, 1);
+MODULE_VERSION(umass, 1);
 
 /*
  * USB device probe/attach/detach

==== //depot/projects/usb/src/sys/dev/usb/storage/urio.c#18 (text+ko) ====

@@ -197,6 +197,7 @@
 
 DRIVER_MODULE(urio, uhub, urio_driver, urio_devclass, NULL, 0);
 MODULE_DEPEND(urio, usb, 1, 1, 1);
+MODULE_VERSION(urio, 1);
 
 static int
 urio_probe(device_t dev)

==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#56 (text+ko) ====

@@ -122,6 +122,7 @@
 static devclass_t usb_linux_devclass;
 
 DRIVER_MODULE(usb_linux, uhub, usb_linux_driver, usb_linux_devclass, NULL, 0);
+MODULE_VERSION(usb_linux, 1);
 
 /*------------------------------------------------------------------------*
  *	usb_linux_lookup_id

==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#55 (text+ko) ====

@@ -172,6 +172,7 @@
 
 DRIVER_MODULE(uhub, usbus, uhub_driver, uhub_devclass, 0, 0);
 DRIVER_MODULE(uhub, uhub, uhub_driver, uhub_devclass, NULL, 0);
+MODULE_VERSION(uhub, 1);
 
 static void
 uhub_intr_callback(struct usb_xfer *xfer, usb_error_t error)

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#30 (text+ko) ====

@@ -139,9 +139,6 @@
 #undef RUM_DEV
 };
 
-MODULE_DEPEND(rum, wlan, 1, 1, 1);
-MODULE_DEPEND(rum, usb, 1, 1, 1);
-
 static device_probe_t rum_match;
 static device_attach_t rum_attach;
 static device_detach_t rum_detach;
@@ -2364,3 +2361,6 @@
 static devclass_t rum_devclass;
 
 DRIVER_MODULE(rum, uhub, rum_driver, rum_devclass, NULL, 0);
+MODULE_DEPEND(rum, wlan, 1, 1, 1);
+MODULE_DEPEND(rum, usb, 1, 1, 1);
+MODULE_VERSION(rum, 1);

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#17 (text+ko) ====

@@ -286,10 +286,6 @@
     { USB_VP(USB_VENDOR_ZYXEL,		USB_PRODUCT_ZYXEL_RT2870_2) },
 };
 
-MODULE_DEPEND(run, wlan, 1, 1, 1);
-MODULE_DEPEND(run, usb, 1, 1, 1);
-MODULE_DEPEND(run, firmware, 1, 1, 1);
-
 static device_probe_t	run_match;
 static device_attach_t	run_attach;
 static device_detach_t	run_detach;
@@ -4950,3 +4946,7 @@
 static devclass_t run_devclass;
 
 DRIVER_MODULE(run, uhub, run_driver, run_devclass, NULL, 0);
+MODULE_DEPEND(run, wlan, 1, 1, 1);
+MODULE_DEPEND(run, usb, 1, 1, 1);
+MODULE_DEPEND(run, firmware, 1, 1, 1);
+MODULE_VERSION(run, 1);

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#23 (text+ko) ====

@@ -2921,3 +2921,4 @@
 DRIVER_MODULE(uath, uhub, uath_driver, uath_devclass, NULL, 0);
 MODULE_DEPEND(uath, wlan, 1, 1, 1);
 MODULE_DEPEND(uath, usb, 1, 1, 1);
+MODULE_VERSION(uath, 1);

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#24 (text+ko) ====

@@ -400,6 +400,7 @@
 DRIVER_MODULE(ural, uhub, ural_driver, ural_devclass, NULL, 0);
 MODULE_DEPEND(ural, usb, 1, 1, 1);
 MODULE_DEPEND(ural, wlan, 1, 1, 1);
+MODULE_VERSION(ural, 1);
 
 static int
 ural_match(device_t self)

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#17 (text+ko) ====

@@ -4446,3 +4446,4 @@
 DRIVER_MODULE(urtw, uhub, urtw_driver, urtw_devclass, NULL, 0);
 MODULE_DEPEND(urtw, wlan, 1, 1, 1);
 MODULE_DEPEND(urtw, usb, 1, 1, 1);
+MODULE_VERSION(urtw, 1);

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#30 (text+ko) ====

@@ -2955,3 +2955,4 @@
 DRIVER_MODULE(zyd, uhub, zyd_driver, zyd_devclass, NULL, 0);
 MODULE_DEPEND(zyd, usb, 1, 1, 1);
 MODULE_DEPEND(zyd, wlan, 1, 1, 1);
+MODULE_VERSION(zyd, 1);

From owner-p4-projects@FreeBSD.ORG  Sun Aug  8 14:57:15 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 82AD61065670; Sun,  8 Aug 2010 14:57:15 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4772F1065679
	for ; Sun,  8 Aug 2010 14:57:15 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 34CA58FC1A
	for ; Sun,  8 Aug 2010 14:57:15 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78EvFBd013379
	for ; Sun, 8 Aug 2010 14:57:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78EvFuB013377
	for perforce@freebsd.org; Sun, 8 Aug 2010 14:57:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 8 Aug 2010 14:57:15 GMT
Message-Id: <201008081457.o78EvFuB013377@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182089 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 08 Aug 2010 14:57:15 -0000

http://p4web.freebsd.org/@@182089?ac=10

Change 182089 by hselasky@hselasky_laptop001 on 2010/08/08 14:56:45

	USB drivers:
		- fix typo and add missed patch
	
	PR:		usb/125736

Affected files ...

.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/input/atp.c#8 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#26 (text+ko) ====

@@ -107,6 +107,7 @@
 static devclass_t ndis_devclass;
 
 DRIVER_MODULE(ndis, uhub, ndis_driver, ndis_devclass, ndisdrv_modevent, 0);
+MODULE_VERSION(ndis, 1);
 
 static int
 ndisusb_devcompare(interface_type bustype, struct ndis_usb_type *t, device_t dev)

==== //depot/projects/usb/src/sys/dev/usb/input/atp.c#8 (text+ko) ====

@@ -2222,4 +2222,4 @@
 
 DRIVER_MODULE(atp, uhub, atp_driver, atp_devclass, NULL, 0);
 MODULE_DEPEND(atp, usb, 1, 1, 1);
-MODULE_VErSION(atp, 1);
+MODULE_VERSION(atp, 1);

From owner-p4-projects@FreeBSD.ORG  Sun Aug  8 14:59:20 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 474B91065688; Sun,  8 Aug 2010 14:59:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A2BB31065676
	for ; Sun,  8 Aug 2010 14:59:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8F6B68FC15
	for ; Sun,  8 Aug 2010 14:59:17 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78ExH40013493
	for ; Sun, 8 Aug 2010 14:59:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78ExHsF013491
	for perforce@freebsd.org; Sun, 8 Aug 2010 14:59:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 8 Aug 2010 14:59:17 GMT
Message-Id: <201008081459.o78ExHsF013491@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182090 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 08 Aug 2010 14:59:20 -0000

http://p4web.freebsd.org/@@182090?ac=10

Change 182090 by hselasky@hselasky_laptop001 on 2010/08/08 14:58:42

	USB controller (XHCI):
		- more bugfixes

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#17 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#17 (text+ko) ====

@@ -652,7 +652,7 @@
 	status = XHCI_TRB_2_ERROR_GET(temp);
 
 	temp = le32toh(trb->dwTrb3);
-	epno = XHCI_TRB_3_EP_GET(temp) + 1;
+	epno = XHCI_TRB_3_EP_GET(temp);
 	index = XHCI_TRB_3_SLOT_GET(temp);
 
 	/* check if error means halted */
@@ -667,9 +667,7 @@
 		return;
 	}
 
-	epno++;
-
-	if (epno >= XHCI_MAX_ENDPOINTS) {
+	if ((epno == 0) || (epno >= XHCI_MAX_ENDPOINTS)) {
 		DPRINTF("Invalid endpoint.\n");
 		return;
 	}
@@ -688,14 +686,15 @@
 
 		td = xfer->td_transfer_cache;
 
-		DPRINTFN(5, "Checking if 0x%016llx == (0x%016llx .. 0x%016llx)\n",
+		DPRINTFN(5, "Checking if 0x%016llx == (0x%016llx .. 0x%016llx +/- 16)\n",
 			(long long)td_event,
 			(long long)td->td_self,
 			(long long)td->td_event_last);
 
 		if ((td_event == td->td_event_last) ||
+		    (td_event == (td->td_event_last - 16)) ||
 		    (halted && (td_event >= td->td_self) &&
-		    (td_event < td->td_event_last))) {
+		    (td_event <= td->td_event_last))) {
 
 			usb_pc_cpu_invalidate(td->page_cache);
 
@@ -1066,17 +1065,18 @@
 
 	switch (hdev->state) {
 	case XHCI_ST_ADDRESSED:
+	case XHCI_ST_CONFIGURED:
 		err = 0;
 		break;
 
-	case XHCI_ST_ENABLED:
+	case XHCI_ST_DEFAULT:
 		if (address == 0) {
 			err = 0;
 			break;
 		}
 		/* FALLTHROUGH */
 
-	case XHCI_ST_DEFAULT:
+	case XHCI_ST_ENABLED:
 
 		/* set configure mask to slot and EP0 */
 		xhci_configure_mask(udev, 3, 0);
@@ -1149,7 +1149,6 @@
 	return (err);
 }
 
-#if 0
 static usb_error_t
 xhci_cmd_configure_ep(struct xhci_softc *sc, uint64_t input_ctx,
     uint8_t deconfigure, uint8_t slot_id)
@@ -1171,7 +1170,6 @@
 
 	return (xhci_do_command(sc, &trb, 50 /* ms */));
 }
-#endif
 
 static usb_error_t
 xhci_cmd_evaluate_ctx(struct xhci_softc *sc, uint64_t input_ctx,
@@ -1546,7 +1544,7 @@
 		/* compute event pointer */
 
 		addr = td->td_self;
-		addr += (x - 1) * sizeof(struct xhci_trb);
+		addr += x * sizeof(struct xhci_trb);
 		td->td_event_last = addr;
 
 		/* fill out link TRB */
@@ -2046,8 +2044,16 @@
 			route |= rh_port;
 	}
 
-	temp = XHCI_SCTX_0_CTX_NUM_SET(XHCI_MAX_ENDPOINTS - 1) |
-	    XHCI_SCTX_0_ROUTE_SET(route);
+	temp = XHCI_SCTX_0_ROUTE_SET(route);
+
+	switch (sc->sc_hw.devs[index].state) {
+	case XHCI_ST_CONFIGURED:
+		temp |= XHCI_SCTX_0_CTX_NUM_SET(XHCI_MAX_ENDPOINTS - 1);
+		break;
+	default:
+		temp = XHCI_SCTX_0_CTX_NUM_SET(1);
+		break;
+	}
 
 	switch (udev->speed) {
 	case USB_SPEED_LOW:
@@ -2298,10 +2304,15 @@
 	uint64_t addr;
 	uint8_t i;
 	uint8_t inext;
+	uint8_t trb_limit;
+
+	DPRINTFN(8, "\n");
 
 	/* check if already inserted */
-	if (xfer->flags_int.bandwidth_reclaimed)
+	if (xfer->flags_int.bandwidth_reclaimed) {
+		DPRINTFN(8, "Already in schedule\n");
 		return (0);
+	}
 
 	pepext = xhci_get_endpoint_ext(xfer->xroot->udev,
 	    xfer->endpoint->edesc);
@@ -2310,7 +2321,19 @@
 	td_last = xfer->td_transfer_last;
 	addr = pepext->physaddr;
 
-	if (pepext->trb_used >= (XHCI_MAX_TRANSFERS - 1)) {
+	switch (xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE) {
+	case UE_CONTROL:
+	case UE_INTERRUPT:
+		/* single buffered */
+		trb_limit = 1;
+		break;
+	default:
+		/* multi buffered */
+		trb_limit = (XHCI_MAX_TRANSFERS - 2);
+		break;
+	}
+
+	if (pepext->trb_used >= trb_limit) {
 		DPRINTFN(8, "Too many TDs queued.\n");
 		return (USB_ERR_NOMEM);
 	}
@@ -2331,6 +2354,8 @@
 	if (pepext->trb_running == 0) {
 		struct xhci_softc *sc = XHCI_BUS2SC(xfer->xroot->bus);
 
+		DPRINTFN(8, "Not running\n");
+
 		/* start configuration */
 		(void)usb_proc_msignal(&sc->sc_config_proc,
 		    &sc->sc_config_msg[0], &sc->sc_config_msg[1]);
@@ -2386,6 +2411,8 @@
 
 	usb_pc_cpu_flush(pepext->page_cache);
 
+	DPRINTF("qh_pos = %u\n", i);
+
 	pepext->xfer[i] = xfer;
 
 	xfer->qh_pos = i;
@@ -2396,6 +2423,10 @@
 
 	xhci_endpoint_doorbell(xfer);
 
+	/* start timeout, if any */
+	if (xfer->timeout != 0)
+		usbd_transfer_timeout_ms(xfer, &xhci_timeout, xfer->timeout);
+
 	return (0);
 }
 
@@ -2482,14 +2513,7 @@
 	DPRINTF("\n");
 
 	/* try to insert xfer on HW queue */
-	if (xhci_transfer_insert(xfer) != 0) {
-		DPRINTFN(0, "Failed to insert "
-		    "transfer %p into HW queue.\n", xfer);
-	}
-
-	/* start timeout, if any */
-	if (xfer->timeout != 0)
-		usbd_transfer_timeout_ms(xfer, &xhci_timeout, xfer->timeout);
+	xhci_transfer_insert(xfer);
 }
 
 struct usb_pipe_methods xhci_device_generic_methods =
@@ -3181,6 +3205,8 @@
 
 		struct usb_page_search buf_hub;
 
+		DPRINTF("Configure HUB\n");
+
 		usbd_get_page(&sc->sc_hw.devs[
 		    hub->controller_slot_id].input_pc, 0, &buf_hub);
 
@@ -3203,17 +3229,42 @@
 	err = xhci_configure_endpoint_by_xfer(xfer);
 
 	if (err == 0) {
-		err = xhci_cmd_stop_ep(sc, 0, epno - 1, index);
+
+		err = xhci_cmd_reset_ep(sc, 0, epno, index);
 
 		if (err != 0)
-			DPRINTF("Could not stop endpoint\n");
+			DPRINTF("Could not reset endpoint %u\n", epno);
+
+		if (epno > 1) {
+
+			err = xhci_cmd_stop_ep(sc, 0, epno, index);
+
+			if (err != 0)
+				DPRINTF("Could not stop endpoint %u\n", epno);
+
+			if (sc->sc_hw.devs[index].state != XHCI_ST_CONFIGURED) {
+				sc->sc_hw.devs[index].state = XHCI_ST_CONFIGURED;
+
+				xhci_configure_mask(udev, 1, 0);
+
+				err = xhci_configure_device(udev);
+
+				if (err != 0)
+					DPRINTF("Could not deconfigure device\n");
+
+				err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
+
+				if (err != 0)
+					DPRINTF("Could not evaluate device\n");
+			}
 
-		xhci_configure_mask(udev, 1U << epno, 1);
+			xhci_configure_mask(udev, 1U << epno, 1);
 
-		err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
+			err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
 
-		if (err != 0)
-			DPRINTF("Could not deconfigure endpoint %u\n", epno);
+			if (err != 0)
+				DPRINTF("Could not deconfigure endpoint %u\n", epno);
+		}
 
 		xhci_configure_mask(udev, 1U << epno, 0);
 
@@ -3221,20 +3272,20 @@
 
 		if (err != 0)
 			DPRINTF("Could not configure endpoint %u\n", epno);
+
+		err = xhci_cmd_configure_ep(sc, buf_inp.physaddr, 0, index);
+
+		if (err != 0)
+			DPRINTF("Could not configure endpoint %u\n", epno);
 	}
 
 	/* reset endpoint */
 
 	if (err == 0) {
-		if ((edesc->bmAttributes & UE_XFERTYPE) == UE_BULK)
-			err = xhci_cmd_reset_ep(sc, 0, epno - 1, index);
+		err = xhci_cmd_set_tr_dequeue_ptr(sc, pepext->physaddr |
+		    XHCI_EPCTX_2_DCS_SET(1), 0, epno, index);
 
 		if (err != 0)
-			DPRINTF("Could not reset endpoint %u\n", epno);
-
-		err = xhci_cmd_set_tr_dequeue_ptr(sc, pepext->physaddr, 0, epno - 1, index);
-
-		if (err != 0)
 			DPRINTF("Could not set dequeue ptr for endpoint %u\n", epno);
 	}
 	XHCI_CMD_UNLOCK(sc);
@@ -3302,7 +3353,7 @@
 			/* check if halted is still cleared */
 			if (pepext->trb_halted == 0) {
 				pepext->trb_running = 1;
-				pepext->trb_index = 1;
+				pepext->trb_index = 0;
 			}
 			goto restart;
 		}
@@ -3317,7 +3368,6 @@
 
 			/* queue changed - restart */
 			goto restart;
-
 		}
 	}
 

From owner-p4-projects@FreeBSD.ORG  Sun Aug  8 16:07:33 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5AAD91065676; Sun,  8 Aug 2010 16:07:33 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 149871065674
	for ; Sun,  8 Aug 2010 16:07:33 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DAC5E8FC1D
	for ; Sun,  8 Aug 2010 16:07:32 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78G7WQE020008
	for ; Sun, 8 Aug 2010 16:07:32 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78G7WFA020006
	for perforce@freebsd.org; Sun, 8 Aug 2010 16:07:32 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 8 Aug 2010 16:07:32 GMT
Message-Id: <201008081607.o78G7WFA020006@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182091 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 08 Aug 2010 16:07:33 -0000

http://p4web.freebsd.org/@@182091?ac=10

Change 182091 by hselasky@hselasky_laptop001 on 2010/08/08 16:06:33

	USB controller (XHCI):
		- fix some final configuration details according to spec.
		- disable debugging prints by default.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#18 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#18 (text+ko) ====

@@ -85,7 +85,7 @@
     ((uint8_t *)&(((struct xhci_softc *)0)->sc_bus))))
 
 #ifdef USB_DEBUG
-static int xhcidebug = 17;
+static int xhcidebug = 0;
 
 SYSCTL_NODE(_hw_usb, OID_AUTO, xhci, CTLFLAG_RW, 0, "USB XHCI");
 SYSCTL_INT(_hw_usb_xhci, OID_AUTO, debug, CTLFLAG_RW,
@@ -124,6 +124,7 @@
 static usb_error_t xhci_configure_device(struct usb_device *);
 static usb_error_t xhci_configure_endpoint(struct usb_device *, struct usb_endpoint_descriptor *, uint64_t, uint16_t, uint8_t, uint16_t, uint16_t);
 static usb_error_t xhci_configure_mask(struct usb_device *, uint32_t, uint8_t);
+static usb_error_t xhci_cmd_evaluate_ctx(struct xhci_softc *, uint64_t, uint8_t);
 
 extern struct usb_bus_methods xhci_bus_methods;
 
@@ -1045,8 +1046,13 @@
 static usb_error_t
 xhci_set_address(struct usb_device *udev, struct mtx *mtx, uint16_t address)
 {
+	struct usb_page_search buf_inp;
+	struct usb_page_search buf_dev;
 	struct xhci_softc *sc = XHCI_BUS2SC(udev->bus);
 	struct xhci_hw_dev *hdev;
+	struct xhci_dev_ctx *pdev;
+	struct xhci_endpoint_ext *pepext;
+	uint16_t mps;
 	usb_error_t err;
 	uint8_t index;
 
@@ -1084,55 +1090,78 @@
 		/* configure input slot context structure */
 		err = xhci_configure_device(udev);
 
+		if (err != 0) {
+			DPRINTF("Could not configure device\n");
+			break;
+		}
+
 		/* configure input endpoint context structure */
-		if (err == 0) {
-			struct xhci_endpoint_ext *pepext;
-			uint16_t mps;
+
+		switch (udev->speed) {
+		case USB_SPEED_LOW:
+		case USB_SPEED_FULL:
+			mps = 8;
+			break;
+		case USB_SPEED_HIGH:
+			mps = 64;
+			break;
+		default:
+			mps = 512;
+			break;
+		}
 
-			switch (udev->speed) {
-			case USB_SPEED_LOW:
-			case USB_SPEED_FULL:
-				mps = 8;
-				break;
-			case USB_SPEED_HIGH:
-				mps = 64;
-				break;
-			default:
-				mps = 512;
-				break;
-			}
+		pepext = xhci_get_endpoint_ext(udev,
+		    &udev->ctrl_ep_desc);
+		err = xhci_configure_endpoint(udev,
+		    &udev->ctrl_ep_desc, pepext->physaddr,
+		    0, 1, mps, mps);
 
-			pepext = xhci_get_endpoint_ext(udev,
-			    &udev->ctrl_ep_desc);
-			err = xhci_configure_endpoint(udev,
-			    &udev->ctrl_ep_desc, pepext->physaddr,
-			    0, 1, mps, mps);
+		if (err != 0) {
+			DPRINTF("Could not configure default endpoint\n");
+			break;
 		}
 
 		/* execute set address command */
-		if (err == 0) {
-			struct usb_page_search buf_inp;
+		usbd_get_page(&hdev->input_pc, 0, &buf_inp);
 
-			usbd_get_page(&hdev->input_pc, 0, &buf_inp);
+		err = xhci_cmd_set_address(sc, buf_inp.physaddr,
+		    (address == 0), index);
 
-			err = xhci_cmd_set_address(sc, buf_inp.physaddr,
-			    (address == 0), index);
+		if (err != 0) {
+			DPRINTF("Could not set address\n");
+			break;
 		}
 
-		/* update device address and state to new value */
-		if (err == 0) {
-			struct usb_page_search buf_dev;
-			struct xhci_dev_ctx *pdev;
+		/* update device address to new value */
+
+		usbd_get_page(&hdev->device_pc, 0, &buf_dev);
+		pdev = buf_dev.buffer;
+		usb_pc_cpu_invalidate(&hdev->device_pc);
+		udev->address = XHCI_SCTX_3_DEV_ADDR_GET(pdev->ctx_slot.dwSctx3);
+
+		/* update device state to new value */
+
+		if (address != 0) {
+
+			/* we skip the addressed state */
+			hdev->state = XHCI_ST_CONFIGURED;
+
+			xhci_configure_mask(udev, 1, 0);
+
+			err = xhci_configure_device(udev);
+			if (err != 0) {
+				DPRINTF("Could not configure device\n");
+				break;
+			}
 
-			if (address == 0)
-				hdev->state = XHCI_ST_DEFAULT;
-			else
-				hdev->state = XHCI_ST_ADDRESSED;
+			err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
 
-			usbd_get_page(&hdev->device_pc, 0, &buf_dev);
-			pdev = buf_dev.buffer;
-			usb_pc_cpu_invalidate(&hdev->device_pc);
-			udev->address = XHCI_SCTX_3_DEV_ADDR_GET(pdev->ctx_slot.dwSctx3);
+			if (err != 0) {
+				DPRINTF("Could not evaluate device context\n");
+				break;
+			}
+		} else {
+			hdev->state = XHCI_ST_DEFAULT;
 		}
 		break;
 
@@ -3228,69 +3257,52 @@
 
 	err = xhci_configure_endpoint_by_xfer(xfer);
 
-	if (err == 0) {
+	if (err != 0) {
+		XHCI_CMD_UNLOCK(sc);
+		return (err);
+	}
 
-		err = xhci_cmd_reset_ep(sc, 0, epno, index);
+	/*
+	 * Get the endpoint into the stopped state according to the
+	 * endpoint context state diagram in the XHCI specification:
+	 */
 
-		if (err != 0)
-			DPRINTF("Could not reset endpoint %u\n", epno);
+	err = xhci_cmd_stop_ep(sc, 0, epno, index);
 
-		if (epno > 1) {
+	if (err != 0)
+		DPRINTF("Could not stop endpoint %u\n", epno);
 
-			err = xhci_cmd_stop_ep(sc, 0, epno, index);
+	err = xhci_cmd_reset_ep(sc, 0, epno, index);
 
-			if (err != 0)
-				DPRINTF("Could not stop endpoint %u\n", epno);
+	if (err != 0)
+		DPRINTF("Could not reset endpoint %u\n", epno);
 
-			if (sc->sc_hw.devs[index].state != XHCI_ST_CONFIGURED) {
-				sc->sc_hw.devs[index].state = XHCI_ST_CONFIGURED;
+	err = xhci_cmd_set_tr_dequeue_ptr(sc, pepext->physaddr |
+	    XHCI_EPCTX_2_DCS_SET(1), 0, epno, index);
 
-				xhci_configure_mask(udev, 1, 0);
+	if (err != 0)
+		DPRINTF("Could not set dequeue ptr for endpoint %u\n", epno);
 
-				err = xhci_configure_device(udev);
+	/*
+	 * Get the endpoint into the running state according to the
+	 * endpoint context state diagram in the XHCI specification:
+	 */
 
-				if (err != 0)
-					DPRINTF("Could not deconfigure device\n");
+	xhci_configure_mask(udev, 1U << epno, 0);
 
-				err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
+	err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
 
-				if (err != 0)
-					DPRINTF("Could not evaluate device\n");
-			}
+	if (err != 0)
+		DPRINTF("Could not configure endpoint %u\n", epno);
 
-			xhci_configure_mask(udev, 1U << epno, 1);
+	err = xhci_cmd_configure_ep(sc, buf_inp.physaddr, 0, index);
 
-			err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
-
-			if (err != 0)
-				DPRINTF("Could not deconfigure endpoint %u\n", epno);
-		}
-
-		xhci_configure_mask(udev, 1U << epno, 0);
-
-		err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
-
-		if (err != 0)
-			DPRINTF("Could not configure endpoint %u\n", epno);
-
-		err = xhci_cmd_configure_ep(sc, buf_inp.physaddr, 0, index);
-
-		if (err != 0)
-			DPRINTF("Could not configure endpoint %u\n", epno);
-	}
-
-	/* reset endpoint */
+	if (err != 0)
+		DPRINTF("Could not configure endpoint %u\n", epno);
 
-	if (err == 0) {
-		err = xhci_cmd_set_tr_dequeue_ptr(sc, pepext->physaddr |
-		    XHCI_EPCTX_2_DCS_SET(1), 0, epno, index);
-
-		if (err != 0)
-			DPRINTF("Could not set dequeue ptr for endpoint %u\n", epno);
-	}
 	XHCI_CMD_UNLOCK(sc);
 
-	return (err);
+	return (0);
 }
 
 static void
@@ -3513,10 +3525,11 @@
 	if (index <= sc->sc_noslot) {
 		xhci_cmd_disable_slot(sc, index);
 		sc->sc_hw.devs[index].state = XHCI_ST_DISABLED;
+
+		/* free device extension */
+		xhci_free_device_ext(udev);
 	}
 
-	xhci_free_device_ext(udev);
-
 	XHCI_CMD_UNLOCK(sc);
 }
 

From owner-p4-projects@FreeBSD.ORG  Sun Aug  8 16:46:22 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 547F51065673; Sun,  8 Aug 2010 16:46:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 148F3106564A
	for ; Sun,  8 Aug 2010 16:46:22 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D9D068FC13
	for ; Sun,  8 Aug 2010 16:46:21 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78GkLIE022505
	for ; Sun, 8 Aug 2010 16:46:21 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78GkFDY022498
	for perforce@freebsd.org; Sun, 8 Aug 2010 16:46:15 GMT
	(envelope-from raj@freebsd.org)
Date: Sun, 8 Aug 2010 16:46:15 GMT
Message-Id: <201008081646.o78GkFDY022498@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182093 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 08 Aug 2010 16:46:22 -0000

http://p4web.freebsd.org/@@182093?ac=10

Change 182093 by raj@raj_nand on 2010/08/08 16:45:43

	IFC @182079

Affected files ...

.. //depot/projects/nand2/Makefile.inc1#5 integrate
.. //depot/projects/nand2/Makefile.mips#1 branch
.. //depot/projects/nand2/ObsoleteFiles.inc#4 integrate
.. //depot/projects/nand2/UPDATING#4 integrate
.. //depot/projects/nand2/bin/kill/kill.c#2 integrate
.. //depot/projects/nand2/bin/ln/ln.1#2 integrate
.. //depot/projects/nand2/bin/pkill/pkill.1#3 integrate
.. //depot/projects/nand2/bin/ps/keyword.c#3 integrate
.. //depot/projects/nand2/bin/ps/ps.1#4 integrate
.. //depot/projects/nand2/bin/setfacl/setfacl.1#4 integrate
.. //depot/projects/nand2/bin/sh/eval.c#4 integrate
.. //depot/projects/nand2/bin/sh/expand.c#3 integrate
.. //depot/projects/nand2/bin/sh/histedit.c#4 integrate
.. //depot/projects/nand2/bin/sh/jobs.c#3 integrate
.. //depot/projects/nand2/bin/sh/jobs.h#2 integrate
.. //depot/projects/nand2/bin/sh/parser.c#5 integrate
.. //depot/projects/nand2/bin/sh/sh.1#4 integrate
.. //depot/projects/nand2/bin/sleep/sleep.1#2 integrate
.. //depot/projects/nand2/bin/sleep/sleep.c#2 integrate
.. //depot/projects/nand2/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/nand2/cddl/compat/opensolaris/misc/fsshare.c#2 integrate
.. //depot/projects/nand2/cddl/compat/opensolaris/misc/mnttab.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.stddevtoofew.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevnoarg.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.stddevtoomany.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearstddev.d.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.D_PDESC_ZERO.lowfrequency.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.D_PDESC_ZERO.malformedoverflow.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.D_PDESC_ZERO.nonexistentevent.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cpcvscpustatpart1.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cpcvscpustatpart2.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cputrackfailtostart.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.cputrackterminates.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/err.toomanyenablings.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/tst.allcpus.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/tst.genericevent.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/cpc/tst.platformevent.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv4remote.pl#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/get.ipv6remote.pl#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localicmp.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localtcp.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localudp.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4localudp.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remoteicmp.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remoteicmp.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remotetcp.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remoteudp.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv4remoteudp.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6localicmp.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6remoteicmp.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.ipv6remoteicmp.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.localtcpstate.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/ip/tst.remotetcpstate.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestGetAggregate.java#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.GetAggregate.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.macroglob.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.killonerror.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.largeusersym.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sdt/tst.sdtargs.c#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sdt/tst.sdtargs.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.D_AGG_SPEC.SpeculateWithStddev.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/sysevent/tst.post_chan.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.corruptenv.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh.out#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i386/funcs/tst.badcopyin.d#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.basic.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.hvmenable.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.memenable.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedargs.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i86xpv/xdt/tst.schedenable.ksh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/pid/err.D_PROC_ALIGN.misaligned.exe#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/pyzfs/pyzfs.py#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/zdb/zdb.c#3 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/zfs/zfs.8#3 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#4 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#3 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/cmd/ztest/ztest.c#3 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#4 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrno.sh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/common/mksignal.sh#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/i386/regs.d.in#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/i386/regs.sed.in#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/sparc/dt_isadep.c#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libdtrace/sparc/regs.d#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#4 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#3 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#3 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#3 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#3 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/pyzfs/common/__init__.py#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/pyzfs/common/allow.py#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/pyzfs/common/dataset.py#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/pyzfs/common/groupspace.py#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/pyzfs/common/ioctl.c#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/pyzfs/common/unallow.py#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/pyzfs/common/userspace.py#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/lib/pyzfs/common/util.py#1 branch
.. //depot/projects/nand2/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c#3 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.h#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/tools/ctf/cvt/output.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c#2 integrate
.. //depot/projects/nand2/cddl/contrib/opensolaris/tools/ctf/cvt/tdata.c#2 integrate
.. //depot/projects/nand2/cddl/lib/Makefile#2 integrate
.. //depot/projects/nand2/cddl/usr.sbin/Makefile#2 integrate
.. //depot/projects/nand2/cddl/usr.sbin/dtrace/Makefile#2 integrate
.. //depot/projects/nand2/cddl/usr.sbin/lockstat/Makefile#2 integrate
.. //depot/projects/nand2/contrib/binutils/bfd/elf64-ppc.c#2 integrate
.. //depot/projects/nand2/contrib/binutils/ld/emultempl/elf32.em#2 integrate
.. //depot/projects/nand2/contrib/binutils/ld/lexsup.c#2 integrate
.. //depot/projects/nand2/contrib/bsnmp/snmp_mibII/mibII.c#2 integrate
.. //depot/projects/nand2/contrib/file/apprentice.c#2 integrate
.. //depot/projects/nand2/contrib/file/magic.c#2 integrate
.. //depot/projects/nand2/contrib/gcc/config/rs6000/freebsd.h#2 integrate
.. //depot/projects/nand2/contrib/gdb/gdb/ppcfbsd-tdep.c#2 integrate
.. //depot/projects/nand2/contrib/gdb/gdb/solib-svr4.c#2 integrate
.. //depot/projects/nand2/contrib/llvm/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/Makefile.config.in#2 integrate
.. //depot/projects/nand2/contrib/llvm/Makefile.rules#2 integrate
.. //depot/projects/nand2/contrib/llvm/autoconf/configure.ac#2 integrate
.. //depot/projects/nand2/contrib/llvm/autoconf/m4/link_options.m4#2 integrate
.. //depot/projects/nand2/contrib/llvm/bindings/ada/llvm/llvm.ads#2 integrate
.. //depot/projects/nand2/contrib/llvm/configure#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm-c/Core.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm-c/Target.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm-c/lto.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/APFloat.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/APInt.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/DAGDeltaAlgorithm.h#1 branch
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/DenseMap.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/EquivalenceClasses.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/FoldingSet.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/ImmutableIntervalMap.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/PostOrderIterator.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/SetVector.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/SmallPtrSet.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/SmallVector.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/Statistic.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/Triple.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/ValueMap.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ADT/ilist.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/AbstractTypeUser.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/AliasAnalysis.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/CFGPrinter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/CaptureTracking.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/CodeMetrics.h#1 branch
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/DebugInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/DominatorInternals.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/Dominators.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/InlineCost.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/IntervalIterator.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/Loads.h#1 branch
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/LoopInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/MemoryBuiltins.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/ScalarEvolution.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/ScalarEvolutionExpander.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Analysis/ValueTracking.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Bitcode/ReaderWriter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/AsmPrinter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/FastISel.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h#1 branch
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/GCMetadata.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/GCMetadataPrinter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/ISDOpcodes.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/LinkAllCodegenComponents.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/LiveInterval.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/LiveIntervalAnalysis.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/MachineFrameInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/MachineFunctionPass.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/MachineInstr.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/MachineJumpTableInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/MachineLoopInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/MachineModuleInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/MachineOperand.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/MachineRegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/Passes.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/PostRAHazardRecognizer.h#1 branch
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/ProcessImplicitDefs.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/RegisterCoalescer.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/RegisterScavenging.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/RuntimeLibcalls.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/SelectionDAG.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/SelectionDAGISel.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/CodeGen/SlotIndexes.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Config/config.h.in#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/ExecutionEngine/ExecutionEngine.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/GlobalValue.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/InlineAsm.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/InstrTypes.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Instructions.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/IntrinsicInst.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Intrinsics.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/LinkAllPasses.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCAssembler.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCContext.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCDirectives.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCObjectStreamer.h#1 branch
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCObjectWriter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCParser/AsmLexer.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCParser/AsmParser.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCParser/MCAsmLexer.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCParser/MCAsmParser.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCParser/MCAsmParserExtension.h#1 branch
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCSection.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCSectionCOFF.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/MCStreamer.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/MC/SectionKind.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Module.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Pass.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/PassAnalysisSupport.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/PassManagers.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/PassSupport.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/CFG.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/COFF.h#1 branch
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/CallSite.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/Dwarf.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/ELF.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/IRBuilder.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/IRReader.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/MemoryBuffer.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/Regex.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/StringPool.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/Timer.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Support/raw_ostream.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/SymbolTableListTraits.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/System/DataTypes.h.cmake#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/System/Path.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Target/Target.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Target/TargetAsmParser.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Target/TargetCallingConv.h#1 branch
.. //depot/projects/nand2/contrib/llvm/include/llvm/Target/TargetInstrDesc.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Target/TargetInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Target/TargetInstrItineraries.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Target/TargetLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Target/TargetOpcodes.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Target/TargetOptions.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Target/TargetRegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Transforms/IPO.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Transforms/Utils/BasicBlockUtils.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Transforms/Utils/BuildLibCalls.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Transforms/Utils/Cloning.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Transforms/Utils/Local.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Type.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Use.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/include/llvm/Value.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/AliasAnalysis.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/AliasDebugger.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/BasicAliasAnalysis.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/ConstantFolding.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/DebugInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/DomPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/IPA/CallGraph.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/IPA/GlobalsModRef.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/InlineCost.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/InstructionSimplify.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/Lint.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/Loads.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/LoopInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/MemoryBuiltins.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/MemoryDependenceAnalysis.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/PostDominators.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/ProfileInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/ScalarEvolution.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/ScalarEvolutionAliasAnalysis.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/ScalarEvolutionNormalization.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Analysis/ValueTracking.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Archive/ArchiveWriter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/AsmParser/LLLexer.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/AsmParser/LLParser.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/AsmParser/LLParser.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/AsmParser/LLToken.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Bitcode/Writer/ValueEnumerator.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/AggressiveAntiDepBreaker.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/AsmPrinter/DIE.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/BranchFolding.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/BranchFolding.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/CalcSpillWeights.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/CallingConvLower.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/CodePlacementOpt.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/CriticalAntiDepBreaker.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/DwarfEHPrepare.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/ELFCodeEmitter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.cpp#2 delete
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/ExactHazardRecognizer.h#2 delete
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/GCStrategy.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/IfConversion.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/InlineSpiller.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/IntrinsicLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/LatencyPriorityQueue.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/LiveInterval.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/LiveStackAnalysis.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/LiveVariables.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/LowerSubregs.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/MachineCSE.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/MachineDominators.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/MachineFunction.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/MachineInstr.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/MachineLICM.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/MachineModuleInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/MachineRegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/MachineSink.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/MachineVerifier.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/OptimizeExts.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/OptimizePHIs.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/PBQP/HeuristicSolver.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/PBQP/Heuristics/Briggs.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/PHIElimination.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/Passes.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/PostRAHazardRecognizer.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/PostRASchedulerList.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/PreAllocSplitting.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/ProcessImplicitDefs.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/PrologEpilogInserter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/RegAllocFast.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/RegAllocLinearScan.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/RegAllocLocal.cpp#2 delete
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/RegAllocPBQP.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/RegisterCoalescer.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/RegisterScavenging.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/ScheduleDAG.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/ScheduleDAGEmit.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/CallingConvLower.cpp#2 delete
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/FunctionLoweringInfo.h#2 delete
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/InstrEmitter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorOps.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/ShadowStackGC.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SimpleHazardRecognizer.h#2 delete
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SimpleRegisterCoalescing.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SjLjEHPrepare.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/SlotIndexes.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/Spiller.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/Spiller.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/StackProtector.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/StackSlotColoring.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/StrongPHIElimination.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/TailDuplication.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/TargetInstrInfoImpl.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CodeGen/VirtRegRewriter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/CompilerDriver/Tool.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/ExecutionEngine/JIT/JIT.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/ExecutionEngine/JIT/JIT.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Linker/LinkItems.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCAsmStreamer.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCAssembler.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCContext.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCExpr.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCMachOStreamer.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCObjectStreamer.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCParser/AsmLexer.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCParser/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCParser/DarwinAsmParser.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCParser/MCAsmLexer.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCParser/MCAsmParser.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCParser/MCAsmParserExtension.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/MC/MCSectionCOFF.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/MachObjectWriter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/MC/WinCOFFObjectWriter.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/MC/WinCOFFStreamer.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/Support/APFloat.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/APInt.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/DAGDeltaAlgorithm.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/Support/DeltaAlgorithm.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/Dwarf.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/FileUtilities.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/FoldingSet.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/MemoryBuffer.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/PrettyStackTrace.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/Regex.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/SmallPtrSet.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/SmallVector.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/StringPool.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/Timer.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/Triple.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Support/raw_ostream.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/System/Disassembler.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/System/Path.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/System/Unix/Path.inc#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/System/Unix/Program.inc#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/System/Unix/Signals.inc#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/System/Win32/Path.inc#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/System/Win32/Signals.inc#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARM.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARM.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMAddressingModes.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMBaseInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMCodeEmitter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMConstantIslandPass.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMConstantPoolValue.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMExpandPseudoInsts.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMInstrFormats.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMInstrInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMInstrNEON.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMInstrThumb.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMInstrVFP.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMJITInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMLoadStoreOptimizer.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMMachineFunctionInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMRegisterInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMScheduleA8.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMScheduleA9.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMScheduleV6.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMSubtarget.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/ARMTargetMachine.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/AsmPrinter/ARMAsmPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/AsmPrinter/ARMInstPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/AsmPrinter/ARMInstPrinter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Disassembler/ThumbDisassemblerCore.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/NEONMoveFix.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/NEONPreAllocPass.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/README.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Thumb1InstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Thumb1RegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Thumb2HazardRecognizer.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Thumb2HazardRecognizer.h#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Thumb2ITBlockPass.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Thumb2InstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/ARM/Thumb2SizeReduction.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Alpha/AlphaISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Alpha/AlphaISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Alpha/AlphaInstrFormats.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Alpha/AlphaInstrInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Alpha/AlphaMCAsmInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Alpha/AlphaMCAsmInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Alpha/AlphaRegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Blackfin/BlackfinISelDAGToDAG.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Blackfin/BlackfinISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Blackfin/BlackfinISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Blackfin/BlackfinInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Blackfin/BlackfinInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Blackfin/BlackfinInstrInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Blackfin/BlackfinMCAsmInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Blackfin/BlackfinRegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CBackend/CBackend.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPUCallingConv.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPUFrameInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPUISelDAGToDAG.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPUISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPUInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPUMCAsmInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPUMCAsmInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPUNodes.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CellSPU/SPURegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MBlaze/AsmPrinter/MBlazeAsmPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MBlaze/MBlazeISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MBlaze/MBlazeInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MBlaze/MBlazeMCAsmInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MBlaze/MBlazeMCAsmInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MBlaze/MBlazeRegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSIL/MSILWriter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSIL/MSILWriter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSP430/MSP430ISelDAGToDAG.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSP430/MSP430ISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSP430/MSP430InstrInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSP430/MSP430MCAsmInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSP430/MSP430MCAsmInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/MSP430/MSP430RegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Mangler.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Mips/AsmPrinter/MipsAsmPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Mips/MipsISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Mips/MipsInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Mips/MipsInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Mips/MipsMCAsmInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Mips/MipsMCAsmInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16DebugInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16ISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16ISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16InstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16InstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16InstrInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16MCAsmInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16MCAsmInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16MemSelOpt.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16Passes/PIC16Cloner.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16Passes/PIC16Cloner.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16RegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PIC16/PIC16RegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PowerPC/PPCHazardRecognizers.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/README.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Sparc/SparcISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Sparc/SparcISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Sparc/SparcInstrInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Sparc/SparcMCAsmInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Sparc/SparcMCAsmInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/Sparc/SparcRegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/AsmPrinter/SystemZAsmPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZISelDAGToDAG.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZInstrFP.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZInstrInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZMCAsmInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/SystemZ/SystemZRegisterInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/TargetInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/TargetLoweringObjectFile.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/TargetMachine.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/TargetRegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/AsmParser/X86AsmLexer.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/AsmPrinter/X86AsmPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/AsmPrinter/X86IntelInstPrinter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/AsmPrinter/X86MCInstLower.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/Disassembler/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/README-SSE.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/README-X86-64.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/README.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86AsmBackend.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86COFF.h#2 delete
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86CallingConv.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86FastISel.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86FixupKinds.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86FloatingPoint.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86FloatingPointRegKill.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86ISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86Instr64bit.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86InstrBuilder.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86InstrFPStack.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86InstrFormats.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86InstrFragmentsSIMD.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86InstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86InstrInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86InstrMMX.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86InstrSSE.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86MCCodeEmitter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86RegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86RegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86RegisterInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86Subtarget.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86Subtarget.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/X86/X86TargetMachine.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/XCore/XCoreISelLowering.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/XCore/XCoreISelLowering.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/XCore/XCoreInstrInfo.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/XCore/XCoreMCAsmInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/XCore/XCoreMCAsmInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Target/XCore/XCoreRegisterInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Hello/Hello.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Hello/Hello.exports#1 branch
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Hello/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/IPO/GlobalOpt.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/IPO/Inliner.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/IPO/LowerSetJmp.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/IPO/MergeFunctions.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/IPO/PartialInlining.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/IPO/PartialSpecialization.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/IPO/StripSymbols.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/IPO/StructRetPromotion.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/InstCombine/InstCombine.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/InstCombine/InstCombineCasts.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/InstCombine/InstCombinePHI.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/InstCombine/InstCombineShifts.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Instrumentation/OptimalEdgeProfiling.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Instrumentation/ProfilingUtils.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/ABCD.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/ADCE.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/CodeGenPrepare.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/GVN.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/JumpThreading.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/LoopDeletion.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/LoopIndexSplit.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/LoopRotation.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/MemCpyOptimizer.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/SimplifyCFGPass.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/SimplifyLibCalls.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/TailDuplication.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/AddrModeMatcher.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/BuildLibCalls.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/CloneLoop.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/CloneModule.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/DemoteRegToStack.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/InlineFunction.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/LCSSA.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/Local.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/LoopSimplify.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/LoopUnroll.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/LowerInvoke.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/SimplifyCFG.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/ValueMapper.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/Transforms/Utils/ValueMapper.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/AsmWriter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/AutoUpgrade.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/ConstantFold.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/Core.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/Instruction.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/Instructions.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/IntrinsicInst.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/Metadata.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/Module.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/Pass.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/PassManager.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/Value.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/lib/VMCore/Verifier.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/bugpoint/BugDriver.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/bugpoint/CrashDebugger.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/bugpoint/ExtractFunction.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/bugpoint/ListReducer.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/bugpoint/Miscompilation.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/bugpoint/ToolRunner.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/NOTES.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/README.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang-c/Index.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang-c/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/ASTContext.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/Attr.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/CanonicalType.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/Decl.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/DeclBase.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/DeclFriend.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/DeclObjC.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/DeclTemplate.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/DeclVisitor.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/Expr.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/ExprCXX.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/ExternalASTSource.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/RecursiveASTVisitor.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/Redeclarable.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/Stmt.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/StmtIterator.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/StmtNodes.td#2 delete
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/TemplateBase.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/TemplateName.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/Type.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/TypeLoc.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/TypeLocBuilder.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/TypeNodes.def#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/AST/UsuallyTinyPtrVector.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Analysis/Analyses/PrintfFormatString.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Analysis/Support/BumpVector.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/Attr.td#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/AttrKinds.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/Builtins.def#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsARM.def#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsPPC.def#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/DeclNodes.td#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/Diagnostic.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticCommonKinds.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticGroups.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticLexKinds.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticParseKinds.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/FileManager.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/IdentifierTable.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/LangOptions.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/PartialDiagnostic.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/SourceLocation.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/StmtNodes.td#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/TargetInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/TargetOptions.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/Version.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/Version.inc.in#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Basic/arm_neon.td#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/AnalysisConsumer.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/BugReporter/BugReporter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/FrontendActions.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathDiagnosticClients.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/Checker.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/CheckerVisitor.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/Environment.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/ExplodedGraph.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/GRCoreEngine.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/GRExprEngine.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/GRState.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/GRSubEngine.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/GRTransferFuncs.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/MemRegion.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/SVals.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/SValuator.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/Store.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Checker/PathSensitive/SymbolManager.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/CodeGen/BackendUtil.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/CodeGen/CodeGenAction.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/CodeGen/CodeGenOptions.h#2 delete
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/CodeGen/ModuleBuilder.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/Action.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/Arg.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/ArgList.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/Compilation.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/Driver.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/HostInfo.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/OptTable.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/Option.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/Options.td#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/Types.def#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Driver/Types.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/ASTConsumers.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/AnalysisConsumer.h#2 delete
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/AnalyzerOptions.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenAction.h#2 delete
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInstance.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/CompilerInvocation.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/DiagnosticOptions.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/FixItRewriter.h#2 delete
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/FrontendAction.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/FrontendActions.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/FrontendOptions.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/FrontendPluginRegistry.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/PCHBitCodes.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/PCHDeserializationListener.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/PCHReader.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/PCHWriter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/PathDiagnosticClients.h#2 delete
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/TextDiagnosticPrinter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/TypeXML.def#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Frontend/Utils.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Index/CallGraph.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Index/Entity.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Index/Indexer.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Index/TranslationUnit.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Lex/PPCallbacks.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Lex/Pragma.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Lex/Token.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Parse/Action.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Parse/AttributeList.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Parse/DeclSpec.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Parse/Parser.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Parse/Template.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Rewrite/ASTConsumers.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Rewrite/FixItRewriter.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Rewrite/FrontendActions.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Rewrite/RewriteRope.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Rewrite/Rewriter.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Rewrite/Rewriters.h#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Sema/CodeCompleteConsumer.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/include/clang/Sema/ExternalSemaSource.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/ASTContext.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/AttrImpl.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/CXXInheritance.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/Decl.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/DeclBase.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/DeclFriend.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/DeclObjC.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/DeclPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/DeclTemplate.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/Expr.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/ExprCXX.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/ExprClassification.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/ExprConstant.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/RecordLayoutBuilder.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/Stmt.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/StmtPrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/StmtProfile.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/TemplateBase.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/TemplateName.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/Type.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/AST/TypePrinter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Analysis/CFG.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Analysis/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Analysis/LiveVariables.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Analysis/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Analysis/PrintfFormatString.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Basic/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Basic/Diagnostic.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Basic/FileManager.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Basic/Makefile#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Basic/TargetInfo.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Basic/Targets.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/AnalysisConsumer.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/AttrNonNullChecker.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/BasicConstraintManager.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/BasicObjCFoundationChecks.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/BasicObjCFoundationChecks.h#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/BasicStore.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/BugReporter.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/BuiltinFunctionChecker.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/CFRefCount.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/CMakeLists.txt#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/CStringChecker.cpp#1 branch
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/CallInliner.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/CastSizeChecker.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/CheckSecuritySyntaxOnly.cpp#2 integrate
.. //depot/projects/nand2/contrib/llvm/tools/clang/lib/Checker/Environment.cpp#2 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sun Aug  8 17:48:31 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AFB241065673; Sun,  8 Aug 2010 17:48:31 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3ABB81065672
	for ; Sun,  8 Aug 2010 17:48:31 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 26EA68FC19
	for ; Sun,  8 Aug 2010 17:48:31 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o78HmV1u038469
	for ; Sun, 8 Aug 2010 17:48:31 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o78HmUAd038467
	for perforce@freebsd.org; Sun, 8 Aug 2010 17:48:30 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 8 Aug 2010 17:48:30 GMT
Message-Id: <201008081748.o78HmUAd038467@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182096 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Sun, 08 Aug 2010 17:48:32 -0000

http://p4web.freebsd.org/@@182096?ac=10

Change 182096 by pgj@Binturong on 2010/08/08 17:48:20

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#9 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/cups/article.sgml#8 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/dialup-firewall/article.sgml#8 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/gjournal-desktop/article.sgml#13 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-users/article.sgml#15 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/faq/book.sgml#61 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/examples/appendix.sgml#7 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/psgml-mode/chapter.sgml#7 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#13 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-primer/chapter.sgml#11 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/the-website/chapter.sgml#7 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#42 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/basics/chapter.sgml#13 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#15 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#30 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/cutting-edge/chapter.sgml#30 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/desktop/chapter.sgml#23 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/disks/chapter.sgml#21 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/dtrace/chapter.sgml#16 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/eresources/chapter.sgml#31 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/filesystems/chapter.sgml#13 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/firewalls/chapter.sgml#27 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/install/chapter.sgml#14 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/introduction/chapter.sgml#30 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/jails/chapter.sgml#16 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/kernelconfig/chapter.sgml#21 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#19 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/linuxemu/chapter.sgml#15 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mac/chapter.sgml#15 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mail/chapter.sgml#6 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#50 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/multimedia/chapter.sgml#15 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/network-servers/chapter.sgml#37 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ports/chapter.sgml#27 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/ppp-and-slip/chapter.sgml#16 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/printing/chapter.sgml#14 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/security/chapter.sgml#25 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/serialcomms/chapter.sgml#14 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/users/chapter.sgml#5 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/vinum/chapter.sgml#10 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/virtualization/chapter.sgml#20 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/x11/chapter.sgml#27 integrate
.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#16 integrate
.. //depot/projects/docproj_hu/www/hu/developers/cvs.sgml#13 integrate
.. //depot/projects/docproj_hu/www/hu/docs/books.sgml#26 integrate
.. //depot/projects/docproj_hu/www/hu/news/2009/news.xml#3 integrate
.. //depot/projects/docproj_hu/www/hu/platforms/alpha.sgml#7 integrate
.. //depot/projects/docproj_hu/www/hu/projects/projects.sgml#12 integrate
.. //depot/projects/docproj_hu/www/hu/security/security.sgml#23 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#32 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#16 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#105 integrate
.. //depot/projects/docproj_hu/www/hu/support/bugreports.sgml#8 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/compiz-fusion/article.sgml#9 (text+ko) ====

@@ -1,4 +1,4 @@
-
+
 
 
+
 
 
+
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -821,6 +821,10 @@
 	
 
 	
+	  Pendrive (USB-flash-tároló)
+	
+
+	
 	  SCSI- vagy QIC-szalag
 	
 
@@ -884,8 +888,8 @@
 	rendszerindító (bootolható)
 	floppy lemezt használjon.  Napjaink
 	számítógépei azonban a
-	CD-meghajtóban levõ CD-krõl is el tudnak
-	indulni.
+	CD-meghajtóban levõ CD-krõl vagy USB
+	lemezrõl is el tudnak indulni.
 
       
 	Ha CD-n vagy DVD-n megvan a &os; telepítõje
@@ -902,31 +906,131 @@
 	  nélkül telepíthetünk.

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:25:49 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4F3491065672; Wed, 11 Aug 2010 18:25:49 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03D8C106564A
	for ; Wed, 11 Aug 2010 18:25:49 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id E48078FC13
	for ; Wed, 11 Aug 2010 18:25:48 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPmHB083700
	for ; Wed, 11 Aug 2010 18:25:48 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPmqN083697
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:48 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:48 GMT
Message-Id: <201008111825.o7BIPmqN083697@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182097 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:25:49 -0000
X-List-Received-Date: Wed, 11 Aug 2010 18:25:49 -0000

http://p4web.freebsd.org/@@182097?ac=10

Change 182097 by hselasky@hselasky_laptop001 on 2010/08/08 18:42:59

	USB core + USB controller (XHCI):
		- patches related to USB re-enumeration using XHCI chip.
		- be smarter when reading the USB device descriptor
		by exploiting information about the device speed.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#77 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_request.c#42 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_request.h#14 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#19 (text+ko) ====

@@ -125,6 +125,7 @@
 static usb_error_t xhci_configure_endpoint(struct usb_device *, struct usb_endpoint_descriptor *, uint64_t, uint16_t, uint8_t, uint16_t, uint16_t);
 static usb_error_t xhci_configure_mask(struct usb_device *, uint32_t, uint8_t);
 static usb_error_t xhci_cmd_evaluate_ctx(struct xhci_softc *, uint64_t, uint8_t);
+static usb_error_t xhci_cmd_reset_dev(struct xhci_softc *, uint8_t);
 
 extern struct usb_bus_methods xhci_bus_methods;
 
@@ -624,7 +625,6 @@
 	if (xfer->flags_int.control_xfr &&
 	    !xfer->flags_int.control_act)
 		err = xhci_generic_done_sub(xfer);
-
 done:
 	/* transfer is complete */
 	xhci_device_done(xfer, err);
@@ -1072,14 +1072,21 @@
 	switch (hdev->state) {
 	case XHCI_ST_ADDRESSED:
 	case XHCI_ST_CONFIGURED:
-		err = 0;
-		break;
+		if (udev->address == 0) {
+			err = xhci_cmd_reset_dev(sc, index);
 
-	case XHCI_ST_DEFAULT:
-		if (address == 0) {
+			if (err != 0) {
+				DPRINTF("Device reset failed\n");
+			}
+		} else {
 			err = 0;
 			break;
 		}
+
+	case XHCI_ST_DEFAULT:
+
+		hdev->state = XHCI_ST_ENABLED;
+
 		/* FALLTHROUGH */
 
 	case XHCI_ST_ENABLED:
@@ -1129,7 +1136,8 @@
 
 		if (err != 0) {
 			DPRINTF("Could not set address\n");
-			break;
+			if (address != 0)
+				break;
 		}
 
 		/* update device address to new value */
@@ -1155,7 +1163,6 @@
 			}
 
 			err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
-
 			if (err != 0) {
 				DPRINTF("Could not evaluate device context\n");
 				break;
@@ -1286,7 +1293,6 @@
 	return (xhci_do_command(sc, &trb, 50 /* ms */));
 }
 
-#if 0
 static usb_error_t
 xhci_cmd_reset_dev(struct xhci_softc *sc, uint8_t slot_id)
 {
@@ -1304,7 +1310,6 @@
 
 	return (xhci_do_command(sc, &trb, 50 /* ms */));
 }
-#endif
 
 /*------------------------------------------------------------------------*
  *	xhci_interrupt - XHCI interrupt handler
@@ -3166,6 +3171,10 @@
 		xfer->flags_int.curr_dma_set = 1;
 		goto alloc_dma_set;
 	}
+
+	/* make sure we catch any set address updates */
+	if (parm->buf != NULL)
+		xhci_set_address(xfer->xroot->udev, NULL, 0);
 }
 
 static usb_error_t

==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#77 (text+ko) ====

@@ -1681,45 +1681,16 @@
 	}
 	usb_set_device_state(udev, USB_STATE_ADDRESSED);
 
-	/*
-	 * Get the first 8 bytes of the device descriptor !
-	 *
-	 * NOTE: "usbd_do_request" will check the device descriptor
-	 * next time we do a request to see if the maximum packet size
-	 * changed! The 8 first bytes of the device descriptor
-	 * contains the maximum packet size to use on control endpoint
-	 * 0. If this value is different from "USB_MAX_IPACKET" a new
-	 * USB control request will be setup!
-	 */
-	err = usbd_req_get_desc(udev, NULL, NULL, &udev->ddesc,
-	    USB_MAX_IPACKET, USB_MAX_IPACKET, 0, UDESC_DEVICE, 0, 0);
-	if (err) {
-		DPRINTFN(0, "getting device descriptor "
-		    "at addr %d failed, %s\n", udev->address,
-		    usbd_errstr(err));
+	/* setup the device descriptor and the initial "wMaxPacketSize" */
+	err = usbd_setup_device_desc(udev, NULL);
+
+	if (err != 0) {
 		/* XXX try to re-enumerate the device */
 		err = usbd_req_re_enumerate(udev, NULL);
-		if (err) {
+		if (err)
 			goto done;
-		}
 	}
-	DPRINTF("adding unit addr=%d, rev=%02x, class=%d, "
-	    "subclass=%d, protocol=%d, maxpacket=%d, len=%d, speed=%d\n",
-	    udev->address, UGETW(udev->ddesc.bcdUSB),
-	    udev->ddesc.bDeviceClass,
-	    udev->ddesc.bDeviceSubClass,
-	    udev->ddesc.bDeviceProtocol,
-	    udev->ddesc.bMaxPacketSize,
-	    udev->ddesc.bLength,
-	    udev->speed);
 
-	/* get the full device descriptor */
-	err = usbd_req_get_device_desc(udev, NULL, &udev->ddesc);
-	if (err) {
-		DPRINTF("addr=%d, getting full desc failed\n",
-		    udev->address);
-		goto done;
-	}
 	/*
 	 * Setup temporary USB attach args so that we can figure out some
 	 * basic quirks for this device.

==== //depot/projects/usb/src/sys/dev/usb/usb_request.c#42 (text+ko) ====

@@ -1763,6 +1763,68 @@
 }
 
 /*------------------------------------------------------------------------*
+ *	usbd_setup_device_desc
+ *------------------------------------------------------------------------*/
+usb_error_t
+usbd_setup_device_desc(struct usb_device *udev, struct mtx *mtx)
+{
+	usb_error_t err;
+
+	/*
+	 * Get the first 8 bytes of the device descriptor !
+	 *
+	 * NOTE: "usbd_do_request()" will check the device descriptor
+	 * next time we do a request to see if the maximum packet size
+	 * changed! The 8 first bytes of the device descriptor
+	 * contains the maximum packet size to use on control endpoint
+	 * 0. If this value is different from "USB_MAX_IPACKET" a new
+	 * USB control request will be setup!
+	 */
+	switch (udev->speed) {
+	case USB_SPEED_FULL:
+	case USB_SPEED_LOW:
+		err = usbd_req_get_desc(udev, mtx, NULL, &udev->ddesc,
+		    USB_MAX_IPACKET, USB_MAX_IPACKET, 0, UDESC_DEVICE, 0, 0);
+		if (err != 0) {
+			DPRINTFN(0, "getting device descriptor "
+			    "at addr %d failed, %s\n", udev->address,
+			    usbd_errstr(err));
+			return (err);
+		}
+		break;
+	default:
+		DPRINTF("Minimum MaxPacketSize is large enough "
+		    "to hold the complete device descriptor\n");
+		break;
+	}
+
+	/* get the full device descriptor */
+	err = usbd_req_get_device_desc(udev, mtx, &udev->ddesc);
+
+	/* try one more time, if error */
+	if (err)
+		err = usbd_req_get_device_desc(udev, mtx, &udev->ddesc);
+
+	if (err) {
+		DPRINTF("addr=%d, getting full desc failed\n",
+		    udev->address);
+		return (err);
+	}
+
+	DPRINTF("adding unit addr=%d, rev=%02x, class=%d, "
+	    "subclass=%d, protocol=%d, maxpacket=%d, len=%d, speed=%d\n",
+	    udev->address, UGETW(udev->ddesc.bcdUSB),
+	    udev->ddesc.bDeviceClass,
+	    udev->ddesc.bDeviceSubClass,
+	    udev->ddesc.bDeviceProtocol,
+	    udev->ddesc.bMaxPacketSize,
+	    udev->ddesc.bLength,
+	    udev->speed);
+
+	return (err);
+}
+
+/*------------------------------------------------------------------------*
  *	usbd_req_re_enumerate
  *
  * NOTE: After this function returns the hardware is in the
@@ -1821,23 +1883,9 @@
 	if (udev->address == USB_START_ADDR)
 		udev->address = old_addr;
 
-	/* get the device descriptor */
-	err = usbd_req_get_desc(udev, mtx, NULL, &udev->ddesc,
-	    USB_MAX_IPACKET, USB_MAX_IPACKET, 0, UDESC_DEVICE, 0, 0);
-	if (err) {
-		DPRINTFN(0, "getting device descriptor "
-		    "at addr %d failed, %s\n", udev->address,
-		    usbd_errstr(err));
-		goto done;
-	}
-	/* get the full device descriptor */
-	err = usbd_req_get_device_desc(udev, mtx, &udev->ddesc);
-	if (err) {
-		DPRINTFN(0, "addr=%d, getting device "
-		    "descriptor failed, %s\n", old_addr, 
-		    usbd_errstr(err));
-		goto done;
-	}
+	/* setup the device descriptor and the initial "wMaxPacketSize" */
+	err = usbd_setup_device_desc(udev, mtx);
+
 done:
 	if (err && do_retry) {
 		/* give the USB firmware some time to load */

==== //depot/projects/usb/src/sys/dev/usb/usb_request.h#14 (text+ko) ====

@@ -71,6 +71,7 @@
 		    uint16_t sel);
 usb_error_t usbd_req_set_port_feature(struct usb_device *udev,
 		    struct mtx *mtx, uint8_t port, uint16_t sel);
+usb_error_t usbd_setup_device_desc(struct usb_device *udev, struct mtx *mtx);
 usb_error_t usbd_req_re_enumerate(struct usb_device *udev, struct mtx *mtx);
 usb_error_t usbd_req_clear_device_feature(struct usb_device *udev,
 		    struct mtx *mtx, uint16_t sel);

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:25:49 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 95A5F1065770; Wed, 11 Aug 2010 18:25:49 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 23EE6106566B
	for ; Wed, 11 Aug 2010 18:25:49 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 115518FC14
	for ; Wed, 11 Aug 2010 18:25:49 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPmFP083706
	for ; Wed, 11 Aug 2010 18:25:48 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPmJg083703
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:48 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:48 GMT
Message-Id: <201008111825.o7BIPmJg083703@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182098 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:25:50 -0000

http://p4web.freebsd.org/@@182098?ac=10

Change 182098 by hselasky@hselasky_laptop001 on 2010/08/08 19:22:10

	
	USB controller (XHCI):
		- make sure we don't claim done until the STATUS
		stage is complete for control transactions or the
		next packet for isochronous transfers.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#20 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#20 (text+ko) ====

@@ -563,7 +563,8 @@
 		/* Check for short transfer */
 		if (len > 0) {
 			if (xfer->flags_int.short_frames_ok || 
-			    xfer->flags_int.isochronous_xfr) {
+			    xfer->flags_int.isochronous_xfr ||
+			    xfer->flags_int.control_xfr) {
 				/* follow alt next */
 				td = td->alt_next;
 			} else {
@@ -738,8 +739,10 @@
 			 */
 			if (td->remainder > 0) {
 				DPRINTF("TD has short pkt\n");
-				if (xfer->flags_int.short_frames_ok) {
-					/* follow alt next */
+				if (xfer->flags_int.short_frames_ok ||
+				    xfer->flags_int.isochronous_xfr ||
+				    xfer->flags_int.control_xfr) {
+					/* try to follow follow alt next */
 					if (td->alt_next != NULL) {
 						xfer->td_transfer_cache = td->alt_next;
 						break;

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:25:53 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5294C106567E; Wed, 11 Aug 2010 18:25:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 59894106566C
	for ; Wed, 11 Aug 2010 18:25:51 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 473D58FC22
	for ; Wed, 11 Aug 2010 18:25:51 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPpon083784
	for ; Wed, 11 Aug 2010 18:25:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPpbv083780
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:51 GMT
Message-Id: <201008111825.o7BIPpbv083780@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182110 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:25:54 -0000

http://p4web.freebsd.org/@@182110?ac=10

Change 182110 by hselasky@hselasky_laptop001 on 2010/08/08 22:06:26

	
	USB core:
		- correct calculations for Super Speed USB.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#184 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#184 (text+ko) ====

@@ -322,6 +322,7 @@
 	usb_frcount_t x;
 	uint8_t type;
 	uint8_t zmps;
+	uint8_t mult;
 
 	/*
 	 * Sanity check. The following parameters must be initialized before
@@ -358,12 +359,36 @@
 			xfer->max_packet_count = 3;
 		xfer->max_packet_size &= 0x7FF;
 		break;
+
 	case USB_SPEED_SUPER:
-		if (xfer->endpoint->ecomp != NULL)
-			xfer->max_packet_count += xfer->endpoint->ecomp->bMaxBurst;
+		xfer->max_packet_count += (xfer->max_packet_size >> 11) & 3;
+		mult = 1;
+
+		/* compute additional bMaxBurst */
+		if (xfer->endpoint->ecomp != NULL) {
+			xfer->max_packet_count +=
+			    xfer->endpoint->ecomp->bMaxBurst;
+
+			if (type == UE_ISOCHRONOUS) {
+				mult +=
+				    (xfer->endpoint->ecomp->bmAttributes & 3);
+			}
+		}
+
+		xfer->max_packet_count *= mult;
+
 		/* check for invalid max packet count */
-		if (xfer->max_packet_count > 15)
-			xfer->max_packet_count = 15;
+		if (type == UE_ISOCHRONOUS) {
+			if ((xfer->max_packet_count == 0) || 
+			    (xfer->max_packet_count > (16 * 3)))
+				xfer->max_packet_count = (16 * 3);
+		} else {
+			if ((xfer->max_packet_count == 0) || 
+			    (xfer->max_packet_count > (16 * 1)))
+				xfer->max_packet_count = (16 * 1);
+		}
+
+		xfer->max_packet_size &= 0x7FF;
 		break;
 	default:
 		break;

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:25:54 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CCA2B10658EC; Wed, 11 Aug 2010 18:25:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 945AE106567C
	for ; Wed, 11 Aug 2010 18:25:51 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 819C58FC23
	for ; Wed, 11 Aug 2010 18:25:51 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPp34083790
	for ; Wed, 11 Aug 2010 18:25:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPpGt083787
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:51 GMT
Message-Id: <201008111825.o7BIPpGt083787@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182111 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:25:54 -0000

http://p4web.freebsd.org/@@182111?ac=10

Change 182111 by hselasky@hselasky_laptop001 on 2010/08/08 22:08:28

	USB controller (XHCI):
		- more bugfixes.
		- take into account that SuperSpeed devices can
		burst upto 1024 * 32 bytes. Increase TD size.
		- fix wrong endpoint direction.
		- at this point a SuperSpeed hardisk is enumerating
		and is usable.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#19 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#21 (text+ko) ====

@@ -122,7 +122,7 @@
 static struct xhci_endpoint_ext *xhci_get_endpoint_ext(struct usb_device *, struct usb_endpoint_descriptor *);
 static usb_proc_callback_t xhci_configure_msg;
 static usb_error_t xhci_configure_device(struct usb_device *);
-static usb_error_t xhci_configure_endpoint(struct usb_device *, struct usb_endpoint_descriptor *, uint64_t, uint16_t, uint8_t, uint16_t, uint16_t);
+static usb_error_t xhci_configure_endpoint(struct usb_device *, struct usb_endpoint_descriptor *, uint64_t, uint16_t, uint8_t, uint8_t, uint16_t, uint16_t);
 static usb_error_t xhci_configure_mask(struct usb_device *, uint32_t, uint8_t);
 static usb_error_t xhci_cmd_evaluate_ctx(struct xhci_softc *, uint64_t, uint8_t);
 static usb_error_t xhci_cmd_reset_dev(struct xhci_softc *, uint8_t);
@@ -1124,7 +1124,7 @@
 		    &udev->ctrl_ep_desc);
 		err = xhci_configure_endpoint(udev,
 		    &udev->ctrl_ep_desc, pepext->physaddr,
-		    0, 1, mps, mps);
+		    0, 1, 1, mps, mps);
 
 		if (err != 0) {
 			DPRINTF("Could not configure default endpoint\n");
@@ -1910,7 +1910,7 @@
 static usb_error_t
 xhci_configure_endpoint(struct usb_device *udev,
     struct usb_endpoint_descriptor *edesc, uint64_t ring_addr,
-    uint16_t interval, uint8_t max_packet_count,
+    uint16_t interval, uint8_t max_packet_count, uint8_t mult,
     uint16_t max_packet_size, uint16_t max_frame_size)
 {
 	struct usb_page_search buf_inp;
@@ -1940,7 +1940,12 @@
 	if (max_packet_count == 0)
 		return (USB_ERR_BAD_BUFSIZE);
 
-	max_packet_count --;
+	max_packet_count--;
+
+	if (mult == 0)
+		return (USB_ERR_BAD_BUFSIZE);
+
+	mult--;
 
 	temp = XHCI_EPCTX_0_EPSTATE_SET(0) |
 	    XHCI_EPCTX_0_MAXP_STREAMS_SET(0) |
@@ -1952,8 +1957,10 @@
 		temp |= XHCI_EPCTX_0_IVAL_SET(k);
 		break;
 	case UE_ISOCHRONOUS:
-		if (udev->speed == USB_SPEED_SUPER)
-			temp |= XHCI_EPCTX_0_MULT_SET(max_packet_count);
+		if (udev->speed == USB_SPEED_SUPER) {
+			temp |= XHCI_EPCTX_0_MULT_SET(mult);
+			max_packet_count /= mult;
+		}
 		break;
 	default:
 		break;
@@ -1966,8 +1973,10 @@
 	    XHCI_EPCTX_1_MAXB_SET(max_packet_count) |
 	    XHCI_EPCTX_1_MAXP_SIZE_SET(max_packet_size);
 
-	if ((udev->parent_hs_hub != NULL) || (udev->address != 0))
-		temp |= XHCI_EPCTX_1_CERR_SET(3);
+	if ((udev->parent_hs_hub != NULL) || (udev->address != 0)) {
+		if ((edesc->bmAttributes & UE_XFERTYPE) != UE_ISOCHRONOUS)
+			temp |= XHCI_EPCTX_1_CERR_SET(3);
+	}
 
 	switch (edesc->bmAttributes & UE_XFERTYPE) {
 	case UE_CONTROL:
@@ -1984,7 +1993,7 @@
 		break;
 	}
 
-	if (edesc->bmAttributes & UE_DIR_IN)
+	if (edesc->bEndpointAddress & UE_DIR_IN)
 		temp |= XHCI_EPCTX_1_EPTYPE_SET(4);
 
 	pinp->ctx_ep[epno - 1].dwEpCtx1 = htole32(temp);
@@ -1993,8 +2002,21 @@
 
 	pinp->ctx_ep[epno - 1].qwEpCtx2 = htole64(ring_addr);
 
-	temp = XHCI_EPCTX_4_AVG_TRB_LEN_SET(max_frame_size) |
-	    XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_SET(max_frame_size);
+	temp = 0;
+
+	switch (edesc->bmAttributes & UE_XFERTYPE) {
+	case UE_INTERRUPT:
+	case UE_ISOCHRONOUS:
+		temp |= XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_SET(max_frame_size);
+		temp |= XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_TD_PAYLOAD_MAX);
+		break;
+	case UE_CONTROL:
+		temp |= XHCI_EPCTX_4_AVG_TRB_LEN_SET(8);
+		break;
+	default:
+		temp |= XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_TD_PAYLOAD_MAX);
+		break;
+	}
 
 	pinp->ctx_ep[epno - 1].dwEpCtx4 = htole32(temp);
 
@@ -2010,16 +2032,20 @@
 xhci_configure_endpoint_by_xfer(struct usb_xfer *xfer)
 {
 	struct xhci_endpoint_ext *pepext;
+	struct usb_endpoint_ss_comp_descriptor *ecomp;
 
 	pepext = xhci_get_endpoint_ext(xfer->xroot->udev,
 	    xfer->endpoint->edesc);
 
+	ecomp = xfer->endpoint->ecomp;
+
 	pepext->trb[0].dwTrb3 = 0;	/* halt any transfers */
 	usb_pc_cpu_flush(pepext->page_cache);
 
 	return (xhci_configure_endpoint(xfer->xroot->udev,
 	    xfer->endpoint->edesc, pepext->physaddr,
 	    xfer->interval, xfer->max_packet_count,
+	    (ecomp != NULL) ? (ecomp->bmAttributes & 3) + 1 : 1,
 	    xfer->max_packet_size, xfer->max_frame_size));
 }
 
@@ -2122,12 +2148,19 @@
 		temp |= XHCI_SCTX_1_NUM_PORTS_SET(udev->hub->nports);
 
 	switch (udev->speed) {
-	case USB_SPEED_LOW:
-	case USB_SPEED_HIGH:
-	case USB_SPEED_FULL:
+	case USB_SPEED_SUPER:
+		switch (sc->sc_hw.devs[index].state) {
+		case XHCI_ST_ADDRESSED:
+		case XHCI_ST_CONFIGURED:
+			/* enable power save */
+			temp |= XHCI_SCTX_1_MAX_EL_SET(sc->sc_exit_lat_max);
+			break;
+		default:
+			/* disable power save */
+			break;
+		}
 		break;
 	default:
-		temp |= XHCI_SCTX_1_MAX_EL_SET(sc->sc_exit_lat_max);
 		break;
 	}
 
@@ -3116,7 +3149,7 @@
 	 * maximum data payload.
 	 */
 	parm->hc_max_packet_size = 0x400;
-	parm->hc_max_packet_count = 15;
+	parm->hc_max_packet_count = 16 * 3;
 	parm->hc_max_frame_size = XHCI_TD_PAYLOAD_MAX;
 
 	xfer->flags_int.bdma_enable = 1;

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#19 (text+ko) ====

@@ -46,7 +46,6 @@
 #define	XHCI_SCRATCH_BUF_ARRAY_ALIGN	64	/* bytes */
 #define	XHCI_SCRATCH_BUFFER_ALIGN	USB_PAGE_SIZE
 #define	XHCI_TRB_ALIGN			16	/* bytes */
-#define	XHCI_QH_ALIGN			16	/* bytes */
 #define	XHCI_TD_ALIGN			64	/* bytes */
 #define	XHCI_PAGE_SIZE			4096	/* bytes */
 
@@ -304,7 +303,7 @@
 	struct xhci_trb trb[XHCI_MAX_ENDPOINTS][XHCI_MAX_TRANSFERS];
 };
 
-#define	XHCI_TD_PAGE_NBUF	5	/* units */
+#define	XHCI_TD_PAGE_NBUF	13	/* units */
 #define	XHCI_TD_PAGE_SIZE	4096	/* bytes */
 #define	XHCI_TD_PAYLOAD_MAX	(XHCI_TD_PAGE_SIZE * (XHCI_TD_PAGE_NBUF - 1))
 

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:25:55 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 506A61065889; Wed, 11 Aug 2010 18:25:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4E8D4106564A
	for ; Wed, 11 Aug 2010 18:25:52 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 3BDF58FC14
	for ; Wed, 11 Aug 2010 18:25:52 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPqqx083823
	for ; Wed, 11 Aug 2010 18:25:52 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPq6X083820
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:52 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:52 GMT
Message-Id: <201008111825.o7BIPq6X083820@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182116 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:25:55 -0000

http://p4web.freebsd.org/@@182116?ac=10

Change 182116 by hselasky@hselasky_laptop001 on 2010/08/08 23:56:18

	
	USB controller (XHCI):
		- fix problem with multi enter of USB transfers.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#22 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#22 (text+ko) ====

@@ -1675,6 +1675,8 @@
 
 		x = XREAD4(temp.sc, runt, XHCI_MFINDEX);
 
+		DPRINTF("MFINDEX=0x%08x\n", x);
+
 		switch (usbd_get_speed(xfer->xroot->udev)) {
 		case USB_SPEED_FULL:
 			shift = 3;
@@ -2408,18 +2410,6 @@
 		return (USB_ERR_NOMEM);
 	}
 
-	/* check if transfer is not already on interrupt queue */
-	if (xfer->wait_queue != &xfer->xroot->bus->intr_q) {
-
-		/* remove transfer from pipe queue, if any */
-
-		usbd_transfer_dequeue(xfer);
-
-		/* add transfer last on interrupt queue */
-
-		usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
-	}
-
 	/* check for stopped condition, after putting transfer on interrupt queue */
 	if (pepext->trb_running == 0) {
 		struct xhci_softc *sc = XHCI_BUS2SC(xfer->xroot->bus);
@@ -2493,10 +2483,6 @@
 
 	xhci_endpoint_doorbell(xfer);
 
-	/* start timeout, if any */
-	if (xfer->timeout != 0)
-		usbd_transfer_timeout_ms(xfer, &xhci_timeout, xfer->timeout);
-
 	return (0);
 }
 
@@ -2566,6 +2552,42 @@
 }
 
 static void
+xhci_device_generic_multi_enter(struct usb_endpoint *ep,
+    struct usb_xfer *enter_xfer)
+{
+	struct usb_xfer *xfer;
+
+	/* check if there is a current transfer */
+	xfer = ep->endpoint_q.curr;
+	if (xfer == NULL)
+		return;
+
+	/*
+	 * Check if the current transfer is started and then pickup
+	 * the next one, if any. Else wait for next start event due to
+	 * block on failure feature.
+	 */
+	if (!xfer->flags_int.bandwidth_reclaimed)
+		return;
+
+	xfer = TAILQ_FIRST(&ep->endpoint_q.head);
+	if (xfer == NULL) {
+		/*
+		 * In case of enter we have to consider that the
+		 * transfer is queued by the USB core after the enter
+		 * method is called.
+		 */
+		xfer = enter_xfer;
+
+		if (xfer == NULL)
+			return;
+	}
+
+	/* try to multi buffer */
+	xhci_transfer_insert(xfer);
+}
+
+static void
 xhci_device_generic_enter(struct usb_xfer *xfer)
 {
 	DPRINTF("\n");
@@ -2573,8 +2595,7 @@
 	/* setup TD's and QH */
 	xhci_setup_generic_chain(xfer);
 
-	/* try to insert xfer on HW queue */
-	xhci_transfer_insert(xfer);
+	xhci_device_generic_multi_enter(xfer->endpoint, xfer);
 }
 
 static void
@@ -2584,6 +2605,16 @@
 
 	/* try to insert xfer on HW queue */
 	xhci_transfer_insert(xfer);
+
+	/* try to multi buffer */
+	xhci_device_generic_multi_enter(xfer->endpoint, NULL);
+
+	/* add transfer last on interrupt queue */
+	usbd_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer);
+
+	/* start timeout, if any */
+	if (xfer->timeout != 0)
+		usbd_transfer_timeout_ms(xfer, &xhci_timeout, xfer->timeout);
 }
 
 struct usb_pipe_methods xhci_device_generic_methods =
@@ -2594,7 +2625,6 @@
 	.start = xhci_device_generic_start,
 };
 
-
 /*------------------------------------------------------------------------*
  * xhci root HUB support
  *------------------------------------------------------------------------*
@@ -3429,8 +3459,12 @@
 	}
 
 	TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) {
-			/* try to insert transfer in hardware schedule */
-			xhci_transfer_insert(xfer);
+
+		/* try to insert xfer on HW queue */
+		xhci_transfer_insert(xfer);
+
+		/* try to multi buffer */
+		xhci_device_generic_multi_enter(xfer->endpoint, NULL);
 	}
 }
 

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:25:56 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CBE611065B2E; Wed, 11 Aug 2010 18:25:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD21D1065881
	for ; Wed, 11 Aug 2010 18:25:52 +0000 (UTC)
	(envelope-from ivoras@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id A0B648FC1F
	for ; Wed, 11 Aug 2010 18:25:52 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPq8G083837
	for ; Wed, 11 Aug 2010 18:25:52 GMT
	(envelope-from ivoras@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPqT5083833
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:52 GMT
	(envelope-from ivoras@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:52 GMT
Message-Id: <201008111825.o7BIPqT5083833@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	ivoras@FreeBSD.org using -f
From: Ivan Voras 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182118 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:25:56 -0000

http://p4web.freebsd.org/@@182118?ac=10

Change 182118 by ivoras@ursaminor on 2010/08/09 01:20:17

	Better handling of symlinks, better style(9) compliance.

Affected files ...

.. //depot/projects/soc2010/pkg_patch/src/patch/Makefile#32 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#22 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#22 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#31 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#31 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/main.c#32 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#30 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#30 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.c#15 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.h#14 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#30 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/support.c#29 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/updateweb.c#10 edit
.. //depot/projects/soc2010/pkg_patch/src/patch/updateweb.h#10 edit

Differences ...

==== //depot/projects/soc2010/pkg_patch/src/patch/Makefile#32 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.c#22 (text+ko) ====

@@ -49,7 +49,7 @@
 		return (-1);
 	}
 	if (access(PKGPATCH_BACKUP_DIR, F_OK) != 0) {
-		if (mkdir(PKGPATCH_BACKUP_DIR, 0644) != 0) {
+		if (mkdir(PKGPATCH_BACKUP_DIR, 0730) != 0) {
 			warnx("Cannot mkdir: %s", PKGPATCH_BACKUP_DIR);
 			return (-1);
 		}
@@ -429,19 +429,19 @@
 			 warnx("Cannot resolve %s on a live pkg", pl->filename);
 		}
 		snprintf(newfile, PATH_MAX, "%s%s", tmp, pext);
-		if (pl->method == PPMETHOD_CP)
+		if (pl->method == PPMETHOD_CP || pl->method == PPMETHOD_LN)
 			snprintf(patchfile, PATH_MAX, "%s/%s", dpatch,
 			    pl->filename);
 		else if (pl->method == PPMETHOD_BSDIFF)
-			snprintf(patchfile, PATH_MAX, "%s/%s.bsdiff", dpatch,
-			    pl->filename);
+			snprintf(patchfile, PATH_MAX, "%s/%s.%s", dpatch,
+			    pl->filename, BSDIFF_EXT);
 		else
 			errx(1, "Unknown patch method: %d", (int)(pl->method));
 		if (Verbose > 2)
-			printf("Raw patching %s to %s using %s\n", tmp, newfile,
+			printf("Patching %s to %s using %s\n", tmp, newfile,
 			    patchfile);
 		if (pl->method == PPMETHOD_BSDIFF) {
-			char cmd[3*PATH_MAX];
+			char cmd[3 * PATH_MAX];
 			
 			snprintf(cmd, sizeof(cmd), "%s \"%s\" \"%s\" \"%s\"",
 				_PATH_BSPATCH, tmp, newfile, patchfile);
@@ -449,9 +449,15 @@
 			if (fpvect[n_patched_files] == NULL)
 				err(1, "Cannot popen: %s", cmd);
 			n_patched_files++;
-		} else
-			if (cp(tmp, newfile) != 0)
-				err(1, "Cannot copy %s to %s", tmp, newfile);
+		} else if (pl->method == PPMETHOD_LN) {
+			if (copy_file_absolute(patchfile, newfile) != 0)
+				err(1, "Cannot symlink %s to %s", patchfile,
+				    newfile);
+		} else {
+			if (cp(patchfile, newfile) != 0)
+				err(1, "Cannot copy %s to %s", patchfile,
+				    newfile);
+		}
 	}
 	for (i = 0; i < n_patched_files; i++)
 		if (pclose(fpvect[i]) != 0)
@@ -475,12 +481,22 @@
 			break;
 		}
 		strncat(newfile, pext, PATH_MAX);
+		if (issymlink(newfile))
+			/* Symlinks are relative and point to wrong files at this point */
+			continue;
 		if (MD5File(newfile, live_md5) == NULL)
 			err(1, "Cannot MD5 file: %s", newfile);
-		if (strncmp(live_md5, target_md5, sizeof(live_md5)) != 0)
-			errx(1, "MD5 mismatch for %s: expected %s, got %s",
-			    pl->filename, target_md5, live_md5);
-		snprintf(tmp, PATH_MAX, "%s/%s", dpatch, pl->filename);
+		if (strncmp(live_md5, target_md5, sizeof(live_md5)) != 0) {
+			warnx("MD5 mismatch for %s: expected %s, got %s",
+			    newfile, target_md5, live_md5);
+			abort();
+			goto error_cleanup;
+		}
+		if (pl->method == PPMETHOD_BSDIFF)
+			snprintf(tmp, PATH_MAX, "%s/%s.%s", dpatch,
+			    pl->filename, BSDIFF_EXT);
+		else
+			snprintf(tmp, PATH_MAX, "%s/%s", dpatch, pl->filename);
 		if (copy_file_attrs(tmp, NULL, newfile) != 0) {
 			warn("Cannot copy file attributes from %s to %s",
 			    tmp, newfile);
@@ -560,6 +576,8 @@
 		}
 	}
 	/* Plaudite, amici, comoedia finita est. */
+	if (Verbose > 1)
+		printf("All is well.\n");
 	return;
 error_cleanup:
 	/* Remove temp patch files, restore backed-up package. */

==== //depot/projects/soc2010/pkg_patch/src/patch/applypatch.h#22 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.c#31 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/hashjob.h#31 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/main.c#32 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.c#30 (text+ko) ====

@@ -170,9 +170,6 @@
 	else
 		method = "cp";
 	
-	/*
-	 * XXX: Possibly reimplement with libarchive.
-	 */
 	snprintf(tmp, PATH_MAX, "%s/%s", dpatch, PKGPATCH_FNAME);
 	fp = fopen(tmp, "w");
 	if (fp == NULL)
@@ -196,7 +193,8 @@
 	n_changed_files = 0;
 	SLIST_FOREACH(fl, &flchanged, linkage)
 		if (fl->filename[0] != '+') {
-			fprintf(fp, "@patch [method=%s] %s\n", method,
+			fprintf(fp, "@patch [method=%s] %s\n",
+				S_ISLNK(fl->st.st_mode) ? "ln" : method,
 			    fl->filename);
 			n_changed_files++;
 		}
@@ -234,8 +232,8 @@
 			snprintf(tmp, PATH_MAX, "%s/%s", dnew, fl->filename);
 			snprintf(tmp2, PATH_MAX, "%s/%s", dpatch, fl->filename);
 			if (copy_file_absolute(tmp, tmp2) != 0)
-				err(1, "[3] Cannot copy file: %s to file: %s", tmp,
-				    tmp2);
+				err(1, "[3] Cannot copy file: %s to file: %s",
+				    tmp, tmp2);
 		}
 	} else {
 		/*
@@ -244,15 +242,28 @@
 		 * I've observed linear or better processing time improvments
 		 * with this simple trick.
 		 */
-		FILE **fpvect = calloc(n_changed_files, sizeof(*fpvect));
+		FILE **fpvect; 
 		int n = 0;
 		
+		fpvect = calloc(n_changed_files, sizeof(*fpvect));
 		if (fpvect == NULL)
 			err(1, "calloc() failed");
 		/* Start jobs */
 		SLIST_FOREACH(fl, &flchanged, linkage) {
 			if (fl->filename[0] == '+')
 				continue;
+			if (S_ISLNK(fl->st.st_mode)) {
+				snprintf(tmp, PATH_MAX, "%s/%s", dnew,
+				    fl->filename);
+				snprintf(tmp2, PATH_MAX, "%s/%s", dpatch,
+				    fl->filename);
+				if (copy_file_absolute(tmp, tmp2) != 0)
+					err(1, "[4] Cannot copy file: "
+					    "%s to file: %s", tmp, tmp2);
+				
+				fpvect[n++] = NULL;
+				continue;
+			}
 			if (Verbose > 1)
 				printf("bsdiff for %s\n", fl->filename);
 			snprintf(tmp, PATH_MAX, 
@@ -272,6 +283,10 @@
 		SLIST_FOREACH(fl, &flchanged, linkage) {
 			if (fl->filename[0] == '+')
 				continue;
+			if (fpvect[n] == NULL) {
+				n++;
+				continue;
+			}
 			if (pclose(fpvect[n]) < 0)
 				err(1, "pclose() failed for bsdiff of %s",
 				    fl->filename);

==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatch.h#30 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.c#15 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/mkpatchdir.h#14 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/pkg_patch.h#30 (text+ko) ====

@@ -48,6 +48,9 @@
 #ifndef PKG_FORMAT_EXT
 #define PKG_FORMAT_EXT	"tbz"
 #endif
+#ifndef BSDIFF_EXT
+#define BSDIFF_EXT	"bsdiff"
+#endif
 
 #ifndef PKGNAME_MAX
 #define	PKGNAME_MAX	200
@@ -99,7 +102,7 @@
 	SLIST_ENTRY(pkgjoinlist)	linkage;
 };
 
-enum PPMETHOD { PPMETHOD_UNKNOWN, PPMETHOD_CP, PPMETHOD_BSDIFF };
+enum PPMETHOD { PPMETHOD_UNKNOWN, PPMETHOD_CP, PPMETHOD_BSDIFF, PPMETHOD_LN };
 
 STAILQ_HEAD(pplist_head, pplist);
 struct pplist {
@@ -160,5 +163,7 @@
 int check_conflicts(Package *pnew, char **pkglist);
 enum CMP_NAME compare_package_names(char *pkg1, char *pkg2);
 enum CMP_NAME check_dependencies(Package *pnew, char **pkglist);
+char *find_filename(char *fullname);
+
 
 #endif

==== //depot/projects/soc2010/pkg_patch/src/patch/support.c#29 (text+ko) ====

@@ -77,7 +77,7 @@
 cp(char *from, char *to)
 {
 	int fd1, fd2, rval = 0;
-	size_t bs = 1*1024*1024;
+	size_t bs = 1 * 1024 * 1024;
 	char *buf;
 	
 	fd1 = open(from, O_RDONLY);
@@ -404,7 +404,7 @@
 		return (errno);
 	
 	if (S_ISDIR(st.st_mode)) {
-		if (mkdir(to, 0600) != 0) {
+		if (mkdir(to, 0700) != 0) {
 			if (errno != EEXIST)
 				return (-errno);
 		}
@@ -580,6 +580,10 @@
 						if (strcmp(p5, "bsdiff") == 0)
 							pl->method = 
 							    PPMETHOD_BSDIFF;
+						else if (strcmp(p5, "cp") == 0)
+							pl->method = PPMETHOD_CP;
+					    	else if (strcmp(p5, "ln") == 0)
+							pl->method = PPMETHOD_LN;
 					}
 				}
 			} else {
@@ -671,7 +675,7 @@
 		return NULL;
 	while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
 		FILE *fplist;
-		size_t bs = 16*1024;
+		size_t bs = 16 * 1024;
 		char *buf;
 		
 		if (strncmp(archive_entry_pathname(entry), CONTENTS_FNAME,
@@ -722,7 +726,7 @@
 			for (i = 0; pkglist[i] != NULL; i++) {
 				if (strncmp(pl->name, pkglist[i], PKGNAME_MAX)
 				    == 0)
-					return (i+1);
+					return (i + 1);
 			}
 		}
 		pl = pl->next;
@@ -809,3 +813,16 @@
 	 * if needed. */
 	return (best);
 }
+
+
+/* Return a char* pointer to the filename portion of the given full filename */
+char *
+find_filename(char *fullname)
+{
+	char *p;
+	
+	p = strrchr(fullname, '/');
+	if (p == NULL)
+		return (fullname);
+	return (p + 1);
+}

==== //depot/projects/soc2010/pkg_patch/src/patch/updateweb.c#10 (text+ko) ====


==== //depot/projects/soc2010/pkg_patch/src/patch/updateweb.h#10 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:25:57 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8A7131065C33; Wed, 11 Aug 2010 18:25:57 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D44EA10658F8
	for ; Wed, 11 Aug 2010 18:25:53 +0000 (UTC)
	(envelope-from afiveg@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id C04768FC2B
	for ; Wed, 11 Aug 2010 18:25:53 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPr0n083883
	for ; Wed, 11 Aug 2010 18:25:53 GMT
	(envelope-from afiveg@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPrqo083880
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:53 GMT
	(envelope-from afiveg@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:53 GMT
Message-Id: <201008111825.o7BIPrqo083880@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	afiveg@FreeBSD.org using -f
From: Alexandre Fiveg 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182125 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:25:57 -0000

http://p4web.freebsd.org/@@182125?ac=10

Change 182125 by afiveg@cottonmouth on 2010/08/09 11:29:28

	Set slot takes only capt_object as parameter and slot number. Other things like dev, ring, etc.. are stored in the capt_object

Affected files ...

.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#29 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.h#21 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#28 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#26 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#18 edit
.. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#23 edit
.. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#24 edit
.. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#18 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#29 (text+ko) ====

@@ -276,7 +276,7 @@
 extern int ringmap_attach (device_t, struct ringmap_functions *);
 extern int ringmap_detach (device_t);
 
-extern struct ringmap_functions ringmap_f;
+extern struct ringmap_functions ringmap_8254_f;
 #endif 
 
 #ifdef DEVICE_POLLING
@@ -686,7 +686,7 @@
 	    device_get_nameunit(dev));
 
 #ifdef RINGMAP
-	ringmap_attach (dev, &ringmap_f);
+	ringmap_attach (dev, &ringmap_8254_f);
 #endif 
 
 	INIT_DEBUGOUT("lem_attach: end");

==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.h#21 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#28 (text+ko) ====

@@ -23,15 +23,15 @@
 device_t rm_8254_get_device_p(struct cdev *);
 void rm_8254_enable_intr(device_t);
 void rm_8254_disable_intr(device_t);
-int rm_8254_set_slot(struct ring *, device_t, unsigned int);
+int rm_8254_set_slot(struct capt_object *, unsigned int);
 void rm_8254_interrupt(void *);
 void rm_8254_delayed_interrupt(void *);
+void rm_8254_delayed_interrupt_per_packet(void *, int);
 int rm_8254_print_ring_pointers(struct adapter *);
-void rm_8254_sync_head_tail(device_t);
-void rm_8254_sync_tail(device_t);
-void rm_8254_sync_head(device_t);
-void rm_8254_delayed_interrupt_per_packet(device_t, int);
+void rm_8254_sync_tail(void *);
+void rm_8254_sync_head(void *);
 struct ring * rm_8254_find_next(struct adapter *);
+int rm_8254_set_queue(struct capt_object *, unsigned int);
 
 extern devclass_t em_devclass;
 extern void	lem_enable_intr(struct adapter *);
@@ -40,48 +40,39 @@
 extern void print_capt_obj(struct capt_object *);
 
 
-struct ringmap_functions ringmap_f = {
+struct ringmap_functions ringmap_8254_f = {
 	rm_8254_set_ringmap_to_adapter,
 	rm_8254_enable_intr,
 	rm_8254_disable_intr,
 	rm_8254_interrupt,
 	rm_8254_delayed_interrupt,
 	rm_8254_delayed_interrupt_per_packet,
-	rm_8254_sync_head_tail,
 	rm_8254_sync_tail,
 	rm_8254_sync_head,
 	rm_8254_set_slot,
+	rm_8254_set_queue,
 	rm_8254_get_ringmap_p,
 	rm_8254_get_device_p
 };
 
 
 /* 
- * This function synchronize the tail and head hardware registers
- * with head and tail software varibles, that are visible from 
- * software process. 
- *
- * Synchronisation rules:
- * 1. SYNC_HEAD: ring->kernrp = RDH
+ * Write the userrp into the RDT register
  * 2. SYNC_TAIL: RDT =  ring->userrp
  */
 void 
-rm_8254_sync_head_tail(device_t dev)
+rm_8254_sync_tail(void *context)
 {
-	rm_8254_sync_tail(dev);
-	rm_8254_sync_head(dev);
-}
-
-
-void 
-rm_8254_sync_tail(device_t dev)
-{
-	struct adapter *adapter;
-	adapter = (struct adapter *)device_get_softc(dev);
+	device_t dev = (device_t)context;
+	struct adapter *adapter = (struct adapter *)device_get_softc(dev);
 	struct ring *ring = NULL;
 
 	RINGMAP_FUNC_DEBUG(start);
 
+	/* 
+	 * In case if there are many processes that capture, take the 
+	 * userrp from process that is next to RDH.
+	 */
 	ring = rm_8254_find_next(adapter);
 
 #if (__RINGMAP_DEB)
@@ -93,19 +84,26 @@
 	RINGMAP_FUNC_DEBUG(end);
 }
 
-
+/* Set value from RDH to the ring->kernrp*/
 void 
-rm_8254_sync_head(device_t dev)
+rm_8254_sync_head(void *context)
 {
+	device_t dev = (device_t)context;
 	struct capt_object *co = NULL;
 	struct adapter *adapter;
 
 	RINGMAP_FUNC_DEBUG(start);
 
 	adapter = (struct adapter *)device_get_softc(dev);
+	if (adapter->rm == NULL)
+		return;
 
 	RINGMAP_LOCK(adapter->rm);
 
+	/* 
+	 * In case if there are many processes that capture, set in the 
+	 * ring structure of each process the kernrp
+	 */
 	SLIST_FOREACH(co, &adapter->rm->object_list, objects) {
 		if (co->ring != NULL) {
 			RINGMAP_HW_SYNC_HEAD(adapter, co->ring); 
@@ -187,8 +185,9 @@
 }
 
 void 
-rm_8254_delayed_interrupt_per_packet(device_t dev, int slot_num)
+rm_8254_delayed_interrupt_per_packet(void *context, int slot_num)
 {
+	device_t dev = (device_t)context;
 	struct capt_object *co = NULL;
 	struct adapter *adapter = NULL;
 	struct ringmap *rm = NULL;
@@ -220,10 +219,11 @@
 
 
 int
-rm_8254_set_slot(struct ring *ring, device_t dev, unsigned int slot_num)
+rm_8254_set_slot(struct capt_object *co, unsigned int slot_num)
 {
-	struct adapter *adapter = NULL;
-	adapter = (struct adapter *)device_get_softc(dev);
+	device_t dev = co->dev;
+	struct adapter *adapter = (struct adapter *)device_get_softc(dev);
+	struct ring *ring = co->ring;
 
 #if (__RINGMAP_DEB)
 	printf("[%s] Set slot: %d\n", __func__, slot_num);
@@ -346,6 +346,7 @@
 }
 
 
+/* Print the values from RDT and RDH */
 int 
 rm_8254_print_ring_pointers(struct adapter *adapter)
 {
@@ -368,3 +369,13 @@
 out:
 	return (0);
 }
+
+
+int 
+rm_8254_set_queue(struct capt_object *co, unsigned int i)
+{
+	/* No multiqueue for 8254 */
+	co->que = NULL;
+
+	return (0);
+}

==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#26 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#18 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#23 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#24 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#18 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:25:58 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C8DB11065CC4; Wed, 11 Aug 2010 18:25:57 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6EE9D10659A4
	for ; Wed, 11 Aug 2010 18:25:54 +0000 (UTC)
	(envelope-from ilya@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 592428FC19
	for ; Wed, 11 Aug 2010 18:25:54 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPsVJ083896
	for ; Wed, 11 Aug 2010 18:25:54 GMT
	(envelope-from ilya@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPseu083893
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:54 GMT
	(envelope-from ilya@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:54 GMT
Message-Id: <201008111825.o7BIPseu083893@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	ilya@FreeBSD.org using -f
From: Ilya Putsikau 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182127 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:25:58 -0000

http://p4web.freebsd.org/@@182127?ac=10

Change 182127 by ilya@ilya_triton on 2010/08/09 12:29:53

	Update tests, add inotify tests, add linux test output. Fix various bugs found with test cases.
	Don't save/lookup full paths use relative paths only, as linux does.

Affected files ...

.. //depot/projects/soc2010/ilya_fsnotify/src/sys/kern/vfs_notify.c#10 edit
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/fsnotify/regress.02.sh#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/fsnotify/regress.03.sh#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/fsnotify/regress.04.sh#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/Makefile#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/inotify-test#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/inotify-test.c#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/inotify-test.o#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.00.out#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.00.out-linux#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.00.sh#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.01.out#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.01.out-linux#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.01.sh#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.02.out#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.02.out-linux#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.02.sh#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.03.out#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.03.out-linux#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.03.sh#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.04.out#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.04.out-linux#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.04.sh#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.m4#1 add
.. //depot/projects/soc2010/ilya_fsnotify/src/tools/regression/inotify/regress.sh#1 add

Differences ...

==== //depot/projects/soc2010/ilya_fsnotify/src/sys/kern/vfs_notify.c#10 (text+ko) ====

@@ -76,11 +76,10 @@
 	struct mtx		nd_mtx;
 	struct vnode		*nd_vnode;
 	struct mount		*nd_mount;
-	char			*nd_path;
-	char			*nd_pathfree;
+	char			*nd_name;
 	ino_t			nd_ino;
 	volatile u_int		nd_refcnt;
-	int			nd_pathlen;
+	int			nd_namelen;
 	int			nd_watchcount;
 	u_int			nd_supermask;
 	int			nd_flags;
@@ -95,8 +94,8 @@
 struct fnevent {
 	TAILQ_ENTRY(fnevent)	ev_queueentry;
 	struct fnnode		*ev_node;
-	char			*ev_pathfree;
-	int			ev_pathpos;
+	char			*ev_name;
+	int			ev_namelen;
 	int 			ev_mask;
 	int 			ev_cookie;
 	int			ev_handlecount;
@@ -182,7 +181,8 @@
     int mask, struct fnwatch **watchpp);
 static int session_rmwatch(struct fnsession *ss, int wd);
 
-static struct fnnode* node_alloc(struct vnode *vp, ino_t ino);
+static struct fnnode* node_alloc(struct vnode *vp, ino_t ino, char *name,
+    int namelen);
 static struct fnnode* node_lookup(struct vnode *vp);
 static struct fnnode* node_lookupex(struct vnode *vp, ino_t *inop, int flags);
 static void node_hold(struct fnnode *node);
@@ -190,15 +190,12 @@
 static void node_watchhold(struct fnnode *node);
 static void node_watchdrop(struct fnnode *node);
 
-static void event_copypath(struct fnevent *event, char *path);
-static int event_userpathlen(struct fnevent *event);
 static void event_enqueue(struct fnnode *node, struct componentname *cnp,
     int *cookiep, int mask);
 
 static void watch_free(struct fnwatch *watch);
 
-#define	NODE_ISDIR		0x0001
-#define	NODE_CHANGED		0x0002
+#define	NODE_CHANGED		0x0001
 
 #define	LOOKUP_VPLOCKED		0x0001
 #define	LOOKUP_IGNINVAL		0x0002
@@ -339,6 +336,7 @@
 	while (!TAILQ_EMPTY(&ss->ss_watchlist)) {
 		watch = TAILQ_FIRST(&ss->ss_watchlist);
 		watch_free(watch);
+		SESSION_LOCK(ss);
 	}
 	SESSION_UNLOCK(ss);
 
@@ -378,7 +376,7 @@
 	struct fnwatch *watch;
 	struct fsnotify_event *fe;
 	int destroy, len, error;
-	char user_buf[sizeof(struct fsnotify_event) + MAXPATHLEN];
+	char user_buf[sizeof(struct fsnotify_event) + NAME_MAX + 1];
 
 	printf("fsnotify_read: offset %jd\n", uio->uio_offset);
 	
@@ -413,24 +411,24 @@
 		}
 		event = eh->eh_event;
 		watch = eh->eh_watch;
-		fe->len = event_userpathlen(event);
+		fe->len = event->ev_namelen + 1;
 		len = fe->len + sizeof(struct fsnotify_event);
 		if (len > uio->uio_resid) {
 			SESSION_UNLOCK(ss);
 			break;
 		}
 		fe->wd = watch->wt_wd;
-		fe->mask = watch->wt_mask & event->ev_mask;
+		fe->mask = (FN_FLAGS | watch->wt_mask) & event->ev_mask;
 		fe->fileno = event->ev_node->nd_ino;
 		fe->cookie = event->ev_cookie;
-		event_copypath(event, fe->name);
+		memcpy(fe->name, event->ev_name, event->ev_namelen + 1);
 
 		destroy = event->ev_mask & FN_DESTROY;
 		session_drophandle(ss, eh);
 		if (destroy != 0)
 			watch_free(watch);
-
-		SESSION_UNLOCK(ss);
+		else
+			SESSION_UNLOCK(ss);
 
 		MPASS(len <= uio->uio_resid);
 		error = uiomove(user_buf, len, uio);
@@ -457,7 +455,7 @@
 	SESSION_LOCK(ss);
 	TAILQ_FOREACH(eh, &ss->ss_queue, eh_queueentry) {
 		*nread += sizeof(struct fsnotify_event) +
-		    event_userpathlen(eh->eh_event);
+		    eh->eh_event->ev_namelen;
 	}
 	SESSION_UNLOCK(ss);
 
@@ -472,21 +470,24 @@
 	struct fnwatch *watch;
 	struct file *fp;
 	struct filedesc *fdp;
-	struct vnode *vp;
-	char *path, *pathfree;
+	struct vnode *vp, *xvp;
+	char *name;
 	ino_t ino;
 	int error = 0, vfslocked;
+	u_int namelen;
 
 	fdp = td->td_proc->p_fd;
 	vp = NULL;
 	FILEDESC_SLOCK(fdp);
 	fp = fget_locked(fdp, ap->fd);
-	if (fp != NULL && fp->f_type == DTYPE_VNODE) {
+	if (fp != NULL && fp->f_type == DTYPE_VNODE)
 		vp = fp->f_vnode;
-	}
 	FILEDESC_SUNLOCK(fdp);
 	if (vp == NULL)
 		return (EBADF);
+	/* FIXME FIXME */
+	if (vp->v_type != VDIR)
+		return (EINVAL);
 	vfslocked = VFS_LOCK_GIANT(vp->v_mount);
 	ino = 0;
 	node = node_lookupex(vp, &ino, LOOKUP_IGNINVAL);
@@ -495,16 +496,21 @@
 		NODE_UNLOCK(node);
 		VFS_UNLOCK_GIANT(vfslocked);
 	} else {
-		error = vn_fullpath_global(td, vp, &path, &pathfree);
-		VFS_UNLOCK_GIANT(vfslocked);
+		namelen = NAME_MAX;
+		name = malloc(namelen + 1, M_FSNOTIFY, M_WAITOK);
+		xvp = vp;
+		error = vn_vptocnp(&xvp, td->td_ucred, name, &namelen);
 		if (error == 0) {
-			node = node_alloc(vp, ino);
-			node->nd_path = path;
-			node->nd_pathlen = strlen(path);
-			node->nd_pathfree = pathfree;
+			memcpy(name, name + namelen, NAME_MAX - namelen);
+			namelen = NAME_MAX - namelen;
+			name[namelen] = '\0';
+			node = node_alloc(vp, ino, name, namelen);
 			node_watchhold(node);
+			vdrop(xvp);
 			NODE_UNLOCK(node);
-		}
+		} else
+			free(name, M_FSNOTIFY);
+		VFS_UNLOCK_GIANT(vfslocked);
 	}
 
 	if ((ap->mask & FN_CLOSEFD) != 0) {
@@ -580,6 +586,13 @@
 /*
  * VFS hooks
  */
+
+static __inline int
+vp_isdir(struct vnode *vp)
+{
+	return (vp->v_type == VDIR ? FN_ISDIR : 0);
+}
+
 static void
 hook_reclaim(struct vnode *vp)
 {
@@ -604,12 +617,13 @@
 static void
 hook_open(struct vop_open_args *ap)
 {
+	struct vnode *vp = ap->a_vp;
 	struct fnnode *node;
 	int cookie = 0;
 
-	node = node_lookup(ap->a_vp);
+	node = node_lookup(vp);
 	if (node != NULL) {
-		if ((node->nd_flags & NODE_ISDIR) == 0)
+		if (vp_isdir(vp) == 0)
 			event_enqueue(node, NULL, &cookie, FN_OPEN);
 		else
 			NODE_UNLOCK(node);
@@ -619,12 +633,13 @@
 static void
 hook_close(struct vop_close_args *ap)
 {
+	struct vnode *vp = ap->a_vp;
 	struct fnnode *node;
 	int cookie = 0, mask;
 
-	node = node_lookup(ap->a_vp);
+	node = node_lookup(vp);
 	if (node != NULL) {
-		if ((node->nd_flags & NODE_ISDIR) == 0) {
+		if (vp_isdir(vp) == 0) {
 			mask = (node->nd_flags & NODE_CHANGED) != 0 ?
 			    FN_CLOSE_RW : FN_CLOSE_RO;
 			event_enqueue(node, NULL, &cookie, mask);
@@ -652,11 +667,12 @@
 static void
 hook_write(struct vop_write_args *ap)
 {
+	struct vnode *vp = ap->a_vp;
 	struct fnnode *node;
 
-	node = node_lookup(ap->a_vp);
+	node = node_lookup(vp);
 	if (node != NULL) {
-		if ((node->nd_flags & NODE_ISDIR) == 0)
+		if (vp_isdir(vp) == 0)
 			node->nd_flags |= NODE_CHANGED;
 		NODE_UNLOCK(node);
 	}
@@ -665,12 +681,14 @@
 static void
 hook_setattr(struct vop_setattr_args *ap)
 {
+	struct vnode *vp = ap->a_vp;
 	struct fnnode *node;
 	int cookie = 0;
 
-	node = node_lookup(ap->a_vp);
+	node = node_lookup(vp);
 	if (node != NULL) {
-		event_enqueue(node, NULL, &cookie, FN_SETATTR);
+		event_enqueue(node, NULL, &cookie,
+		    FN_SETATTR | vp_isdir(vp));
 	}
 }
 
@@ -683,7 +701,8 @@
 
 	dirnode = node_lookup(dvp);
 	if (dirnode != NULL)
-		event_enqueue(dirnode, cnp, &cookie, FN_CREATE);
+		event_enqueue(dirnode, cnp, &cookie,
+		    FN_CREATE | vp_isdir(vp));
 	return (0);
 }
 
@@ -698,11 +717,13 @@
 
 	node = node_lookup(vp);
 	if (node != NULL)
-		event_enqueue(node, NULL, &cookie, FN_DESTROY | FN_REMOVE);
+		event_enqueue(node, NULL, &cookie,
+		    FN_DESTROY | FN_REMOVE | vp_isdir(vp));
 
 	dirnode = node_lookup(dvp);
 	if (dirnode != NULL)
-		event_enqueue(dirnode, cnp, &cookie, FN_REMOVE);
+		event_enqueue(dirnode, cnp, &cookie,
+		    FN_REMOVE | vp_isdir(vp));
 }
 
 static void
@@ -749,13 +770,16 @@
 hook_rename(struct vop_rename_args *ap)
 {
 	struct fnnode *fdirnode, *fnode, *tdirnode, *tnode;
+	int dirmask;
 	int cookie = 0;
 
+	dirmask = vp_isdir(ap->a_fvp);
+
 	if (ap->a_tvp != NULL) {
 		tnode = node_lookupex(ap->a_tvp, NULL, 0);
 		if (tnode != NULL) {
 			event_enqueue(tnode, NULL, &cookie,
-			    FN_DESTROY | FN_REMOVE);
+			    FN_DESTROY | FN_REMOVE | dirmask);
 		}
 	}
 	fnode = node_lookupex(ap->a_fvp, NULL, 0);
@@ -767,10 +791,12 @@
 
 	fdirnode = node_lookupex(ap->a_fdvp, NULL, 0);
 	if (fdirnode != NULL)
-		event_enqueue(fdirnode, ap->a_fcnp, &cookie, FN_RENAME_FROM);
+		event_enqueue(fdirnode, ap->a_fcnp, &cookie,
+		    FN_RENAME_FROM | dirmask);
 	tdirnode = node_lookupex(ap->a_tdvp, NULL, 0);
 	if (tdirnode != NULL)
-		event_enqueue(tdirnode, ap->a_tcnp, &cookie, FN_RENAME_TO);
+		event_enqueue(tdirnode, ap->a_tcnp, &cookie,
+		    FN_RENAME_TO | dirmask);
 }
 
 static void
@@ -810,14 +836,15 @@
 
 	TAILQ_REMOVE(&ss->ss_watchlist, watch, wt_sessionentry);
 	watch->wt_session = NULL;
-	free_unr(fsnotify_wds, watch->wt_wd);
 
 	TAILQ_FOREACH(eh, &ss->ss_queue, eh_queueentry) {
 		MPASS(eh->eh_watch != watch);
 	}
 
-	MPASS(watch->wt_session == NULL && watch->wt_node == NULL);
+	MPASS(watch->wt_node == NULL);
 	printf("watch_free: free %p\n", watch);
+	SESSION_UNLOCK(ss);
+	free_unr(fsnotify_wds, watch->wt_wd);
 	free(watch, M_FSNOTIFY);
 }
 
@@ -865,7 +892,7 @@
 			INOHASH_UNLOCK();
 		}
 		mtx_destroy(&node->nd_mtx);
-		free(node->nd_pathfree, M_TEMP);
+		free(node->nd_name, M_FSNOTIFY);
 		free(node, M_FSNOTIFY);
 	}
 }
@@ -880,7 +907,7 @@
 }
 
 static struct fnnode *
-node_alloc(struct vnode *vp, ino_t ino)
+node_alloc(struct vnode *vp, ino_t ino, char *path, int namelen)
 {
 	struct fnnode *node;
 
@@ -895,6 +922,8 @@
 	TAILQ_INIT(&node->nd_watchlist);
 
 	node->nd_ino = ino;
+	node->nd_name = path;
+	node->nd_namelen = namelen;
 
 	NODE_LOCK(node);
 
@@ -907,8 +936,6 @@
 	vholdl(vp);
 	node->nd_vnode = vp;
 	vp->v_fnnode = node;
-	if (vp->v_type == VDIR)
-		node->nd_flags |= NODE_ISDIR;
 	VI_UNLOCK(vp);
 
 	return (node);
@@ -1038,95 +1065,27 @@
 	return (node_lookupex(vp, NULL, LOOKUP_VPLOCKED));
 }
 
-static int
-node_updatepath(struct fnnode *node)
-{
-	struct nameidata ni;
-	struct vnode *vp;
-	char *path, *pathfree;
-	char *npath, *npathfree;
-	int vfslocked, error;
-
-	/* Should be executed in *single* fsnotify_daemon thread */
-	vp = node->nd_vnode;
-	if ((vp->v_iflag & VI_DOOMED) != 0 || vp->v_usecount == 0) {
-		printf("skip node path update: %p\n", vp);
-		return (ENOENT);
-	}
-
-	printf("node_updatepath: node %p  vp %p  %s\n",
-	    node, vp, node->nd_path);
-	path = node->nd_path;
-	pathfree = node->nd_pathfree;
-	npath = npathfree = NULL;
-	vhold(vp);
-	NODE_UNLOCK(node);
-
-	vref(rootvnode);
-	NDINIT_ATVP(&ni, LOOKUP, MPSAFE | FOLLOW, UIO_SYSSPACE, path, rootvnode,
-	    curthread);
-	error = namei(&ni);
-	if (error == 0) {
-		if (vp != ni.ni_vp) {
-			printf("fsnotify: vnode was replaced between lookups: %s\n",
-			    path);
-			error = ENOENT;
-		}
-		NDFREE(&ni, 0);
-	}
-	if (error != 0) {
-		vfslocked = VFS_LOCK_GIANT(vp->v_mount);
-		error = vn_fullpath_global(curthread, vp, &npath, &npathfree);
-		VFS_UNLOCK_GIANT(vfslocked);
-	}
-
-	if ((vp->v_iflag & VI_DOOMED) != 0) {
-		printf("fsnotify: vnode is doomed: %s\n", path);
-		error = ENOENT;
-	}
-	vdrop(vp);
-	NODE_LOCK(node);
-	if (path != node->nd_path) {
-		/* Lookup race */
-		free(pathfree, M_TEMP);
-		MPASS(node->nd_path != NULL);
-		error = 0;
-	} else if (error == 0 && npath != NULL) {
-		free(node->nd_pathfree, M_TEMP);
-		node->nd_path = npath;
-		node->nd_pathlen = strlen(npath);
-		node->nd_pathfree = npathfree;
-		npathfree = NULL;
-	}
-	if (npathfree != NULL)
-		free(npathfree, M_TEMP);
-	return (error);
-}
-
 static struct fnevent *
 event_alloc(struct fnnode *node, char *name, int namelen, int handle_maxsize,
     int mask, int cookie)
 {
 	struct fnevent *event;
 
+	MPASS(namelen > 0 && name != NULL);
 	MPASS(handle_maxsize > 0);
 	MPASS(mask != 0);
 
 	event = malloc(sizeof(struct fnevent) +
-	    (sizeof(struct fneventhandle) * handle_maxsize),
+	    (sizeof(struct fneventhandle) * handle_maxsize) + namelen + 1,
 	    M_FSNOTIFY, M_WAITOK | M_ZERO);
 	event->ev_handlemaxsize = handle_maxsize;
 	event->ev_node = node;
 	event->ev_mask = mask;
 	event->ev_cookie = cookie;
-	event->ev_pathfree = uma_zalloc(namei_zone, M_WAITOK);
-	event->ev_pathpos = MAXPATHLEN - 1 - namelen;
-	event->ev_pathfree[MAXPATHLEN - 1] = '\0';
-	if (name != NULL) {
-		MPASS((node->nd_flags & NODE_ISDIR) != 0);
-		memcpy(event->ev_pathfree + event->ev_pathpos, name, namelen);
-	}
-	printf("event alloc: %p\n", event);
+	event->ev_namelen = namelen;
+	event->ev_name = (char *)(event->ev_handlebuf + handle_maxsize);
+	memcpy(event->ev_name, name, namelen);
+	printf("event alloc: %s\n", event->ev_name);
 
 	return (event);
 }
@@ -1134,32 +1093,11 @@
 static void
 event_free(struct fnevent *event)
 {
+	printf("event free: %s\n", event->ev_name);
 	node_drop(event->ev_node);
-	uma_zfree(namei_zone, event->ev_pathfree);
 	free(event, M_FSNOTIFY);
-	printf("event free: %p\n", event);
-}
-
-static __inline int
-event_pathlen(struct fnevent *event)
-{
-	return (MAXPATHLEN - 1 - event->ev_pathpos);
 }
 
-static __inline int
-event_userpathlen(struct fnevent *event)
-{
-	/* Count last zero byte */
-	return event_pathlen(event) + 1;
-}
-
-static __inline void
-event_copypath(struct fnevent *event, char *path)
-{
-	memcpy(path, event->ev_pathfree + event->ev_pathpos,
-	    event_userpathlen(event));
-}
-
 static void
 eventhandle_drop(struct fneventhandle *eh)
 {
@@ -1176,24 +1114,6 @@
 		event_free(eh->eh_event);
 }
 
-static void
-event_prependpath(struct fnevent *event, struct fnnode *node)
-{
-	int pos, len;
-
-	pos = event->ev_pathpos;
-	len = node->nd_pathlen;
-	MPASS(len > 0 && node->nd_path[len - 1] != '/');
-	MPASS(pos >= len + 1);
-
-	if (event_pathlen(event) != 0)
-		event->ev_pathfree[--pos] = '/';
-	pos -= len;
-	memcpy(event->ev_pathfree + pos, node->nd_path, len);
-
-	event->ev_pathpos = pos;
-}
-
 static int
 event_nextcookie(void)
 {
@@ -1240,6 +1160,7 @@
 
 	if (*cookiep == 0)
 		*cookiep = event_nextcookie();
+
 	event = event_alloc(node, nameptr, namelen, watchcount + 1, mask,
 	    *cookiep);
 
@@ -1258,13 +1179,14 @@
 	struct fnwatch *w;
 
 	mask &= ~FN_FLAGS_INTERNAL;
-	if ((mask & FN_FLAGS) != 0) {
-		printf("fsnotify: invalid watch mask: %08x\n", mask);
-		mask &= ~FN_FLAGS;
+	if ((mask & ~FN_ALL) != 0) {
+		printf("fsnotify: invalid watch mask: %08x -> %08x\n",
+		    mask, mask & FN_ALL);
+		mask &= FN_ALL;
 	}
 
 	printf("session_addwatch: %s: node %p  session %p\n",
-	    node->nd_path, node, ss);
+	    node->nd_name, node, ss);
 
 	watch = malloc(sizeof(struct fnwatch), M_FSNOTIFY, M_WAITOK | M_ZERO);
 	printf("watch alloc: %p\n", watch);
@@ -1411,13 +1333,6 @@
 			event_free(event);
 			continue;
 		}
-		if (node->nd_vnode != NULL &&
-		    (event->ev_mask & FN_DESTROY) == 0)
-			node_updatepath(node);
-		else
-			printf("fsnotify: vnode not found, reusing cached path: %s\n",
-			    node->nd_path);
-		event_prependpath(event, node);
 
 		if (event->ev_mask & FN_DESTROY)
 			node_detachallwatches(node);

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:25:58 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7C4AD1065D86; Wed, 11 Aug 2010 18:25:58 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5D324106596A
	for ; Wed, 11 Aug 2010 18:25:54 +0000 (UTC)
	(envelope-from afiveg@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 1FD158FC13
	for ; Wed, 11 Aug 2010 18:25:54 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPsR1083890
	for ; Wed, 11 Aug 2010 18:25:54 GMT
	(envelope-from afiveg@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPrMk083886
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:53 GMT
	(envelope-from afiveg@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:53 GMT
Message-Id: <201008111825.o7BIPrMk083886@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	afiveg@FreeBSD.org using -f
From: Alexandre Fiveg 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182126 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:25:58 -0000

http://p4web.freebsd.org/@@182126?ac=10

Change 182126 by afiveg@ringmap-2 on 2010/08/09 11:53:41

	ringmap_open fixed. capt_object is passed to the set_slot function instead of ring, que, etc... 

Affected files ...

.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#28 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#12 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#11 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#12 edit
.. //depot/projects/soc2010/ringmap/current/sys/modules/ringmap/Makefile#4 edit
.. //depot/projects/soc2010/ringmap/current/sys/modules/ringmap/Makefile.em#2 edit
.. //depot/projects/soc2010/ringmap/current/sys/modules/ringmap/Makefile.ixgbe#2 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#42 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#42 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#12 edit
.. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#24 edit
.. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#25 edit
.. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#19 edit
.. //depot/projects/soc2010/ringmap/stable_8/sys/dev/ixgbe/ixgbe.h#2 edit
.. //depot/projects/soc2010/ringmap/stable_8/sys/i386/conf/I686_STABLE#1 add
.. //depot/projects/soc2010/ringmap/tests/ringmap/close.c#11 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#11 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/main.c#13 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#13 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/open.c#13 edit
.. //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#11 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#28 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ixgbe.h#12 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#12 (text+ko) ====

@@ -38,7 +38,7 @@
 device_t rm_8259_get_device_p(struct cdev *);
 void rm_8259_enable_intr(device_t);
 void rm_8259_disable_intr(device_t);
-int rm_8259_set_slot(struct ring *, void *, unsigned int);
+int rm_8259_set_slot(struct capt_object*, unsigned int);
 int rm_8259_set_queue(struct capt_object *, unsigned int);
 void rm_8259_interrupt(void *);
 void rm_8259_delayed_interrupt(void *);
@@ -143,6 +143,7 @@
 	struct adapter	*adapter = (struct adapter *)que->adapter;
 	struct capt_object *co = NULL;
 
+
 	RINGMAP_LOCK(adapter->rm);
 
 	adapter->rm->interrupts_counter++;
@@ -177,18 +178,18 @@
 		goto out;
 	}
 
+	rm_8259_print_ring_pointers(que);
+
 	if (adapter->rm->open_cnt) {
 		co = get_capt_obj(que);
 		if (co != NULL) {
 
-
 			co->ring->slot[slot_num].intr_num = co->ring->intr_num;
 			co->ring->slot[slot_num].ts = co->ring->last_ts;
 			co->ring->slot[slot_num].is_ok = 1;
 
 			rxbuf = &que->rxr->rx_buffers[slot_num];
 
-
 #if (RINGMAP_INTR_DEB)
 			rxbuf->m_pack = (struct mbuf *)K_MBUF(co->ring, slot_num);
 			rxbuf->m_pack->m_data = (void *)K_PACKET(co->ring, slot_num);
@@ -218,9 +219,10 @@
 
 
 int
-rm_8259_set_slot(struct ring *ring, void *context, unsigned int slot_num)
+rm_8259_set_slot(struct capt_object *co, unsigned int slot_num)
 {
-	struct ix_queue	*que	= (struct ix_queue *)context;
+	struct ix_queue	*que	= co->que;
+	struct ring *ring = co->ring;
 
 #if (__RINGMAP_DEB)
 	printf("[%s] Set slot: %d\n", __func__, slot_num);

==== //depot/projects/soc2010/ringmap/current/sys/modules/ringmap/Makefile#4 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/modules/ringmap/Makefile.em#2 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/modules/ringmap/Makefile.ixgbe#2 (text+ko) ====

@@ -2,9 +2,9 @@
 .PATH:  ${.CURDIR}/../../dev/ixgbe : ${.CURDIR}/../../net
 KMOD    = if_ringmap
 SRCS    = device_if.h bus_if.h pci_if.h
-SRCS    += ixgbe.c $(RINGMAP_SRC)
+SRCS    += ixgbe.c # $(RINGMAP_SRC)
 
-RINGMAP_SRC = ringmap.c ringmap_ixgbe.c
+# RINGMAP_SRC = ringmap.c ringmap_ixgbe.c
 
 # Shared source
 SRCS    += ixgbe_common.c ixgbe_api.c ixgbe_phy.c

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#42 (text+ko) ====

@@ -79,11 +79,6 @@
 		return (-1); 
 	}
 
-	rm->funcs = rf;
-
-	get_ringmap_p = rf->dev_to_ringmap;
-	get_device_p = rf->cdev_to_dev;
-
 	/* 
 	 * Create char device for communication with user-space. The user-space
 	 * process wich want to capture packets should first open this device.
@@ -96,6 +91,15 @@
 	rm->cdev = make_dev(&ringmap_devsw, device_get_unit(dev),
 						UID_ROOT, GID_WHEEL, 0666, 
 						RINGMAP_DEVICE"%d", device_get_unit(dev));
+	if (rm->cdev == NULL) {
+		RINGMAP_ERROR(Can not create char device);
+		return (-1);
+	}
+
+	/* Set function pointers */
+	rm->funcs = rf;
+	get_ringmap_p = rf->dev_to_ringmap;
+	get_device_p = rf->cdev_to_dev;
 
 	/* Store adapters device structure */
 	rm->dev = dev;
@@ -109,10 +113,6 @@
 	/* set the pointer to ringmap into the adapters structure */
 	rm->funcs->set_ringmap_to_adapter(dev, rm);
 
-#if (__RINGMAP_DEB)
-	printf("Page Size: %d \n", PAGE_SIZE);
-#endif 
-
 	RINGMAP_FUNC_DEBUG(end); 
 
 	return (0);	
@@ -133,13 +133,15 @@
 		return (-1);
 	}
 
+	/* Remove all capturing objects properly */
     while (!SLIST_EMPTY(&rm->object_list)) {
 	    co = SLIST_FIRST(&rm->object_list);
 	    SLIST_REMOVE_HEAD(&rm->object_list, objects);
 	    clear_capt_object((void *)co);
     }
 
-	destroy_dev(rm->cdev);
+	if (rm->cdev != NULL)
+		destroy_dev(rm->cdev);
 	
 	RINGMAP_LOCK_DESTROY(rm);
 
@@ -211,7 +213,7 @@
 	}
 
 	/* 
-	 * create the capturing instance wich will represent 
+	 * create the capturing object wich will represent 
 	 * current thread and packets ring 
 	 */
 	MALLOC(	co, struct capt_object *, 
@@ -238,10 +240,11 @@
 
 		err = EIO; goto out;
 	}
+#endif 
 
 	/* Init ring-slots  with mbufs and packets adrresses */
 	for (i = 0 ; i < SLOTS_NUMBER ; i++){
-		if (rm->funcs->set_slot(ring, co->que, i) == -1){
+		if (rm->funcs->set_slot(co, i) == -1){
 			RINGMAP_ERROR(Ring initialization failed!);
 			contigfree(ring, sizeof(struct ring), M_DEVBUF);
 
@@ -251,7 +254,6 @@
 		PRINT_SLOT(ring, i);
 #endif
 	}
-#endif 
 
 	/* 
 	 * Insert the capturing object in the single linked list

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#42 (text+ko) ====

@@ -13,7 +13,7 @@
 /*
  * Default queue number
  */
-#define DEFAULT_QUEUE	0
+#define DEFAULT_QUEUE	1
 
 /* 
  * Driver works only with device wich has the following device ID. If 0

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#12 (text+ko) ====

@@ -104,7 +104,7 @@
 	void (*sync_head)(void *);
 
 	/* Initialize the ring slot */
-	int (*set_slot)(struct ring *, void *, unsigned int);
+	int (*set_slot)(struct capt_object *, unsigned int);
 
 	/* Associate the capturing objec with a hardware queue */
 	int (*set_queue)(struct capt_object *, unsigned int);

==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#24 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#25 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#19 (text+ko) ====


==== //depot/projects/soc2010/ringmap/stable_8/sys/dev/ixgbe/ixgbe.h#2 (text+ko) ====

@@ -124,6 +124,11 @@
 #define MAX_RXD		4096
 #define MIN_RXD		64
 
+//#define DEFAULT_RXD	64
+//#define PERFORM_RXD	64
+//#define MAX_RXD		64
+//#define MIN_RXD		64
+
 /* Alignment for rings */
 #define DBA_ALIGN	128
 

==== //depot/projects/soc2010/ringmap/tests/ringmap/close.c#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/ioctl.c#11 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/main.c#13 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/mmap.c#13 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/open.c#13 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/ringmap/tests.h#11 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:01 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 72E2A1065EEB; Wed, 11 Aug 2010 18:26:01 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F15A71065C26
	for ; Wed, 11 Aug 2010 18:25:56 +0000 (UTC)
	(envelope-from gpf@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id DF4FD8FC1F
	for ; Wed, 11 Aug 2010 18:25:56 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPuuD083978
	for ; Wed, 11 Aug 2010 18:25:56 GMT
	(envelope-from gpf@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPuMs083975
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:56 GMT
	(envelope-from gpf@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:56 GMT
Message-Id: <201008111825.o7BIPuMs083975@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	gpf@FreeBSD.org using -f
From: Efstratios Karatzas 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182139 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:02 -0000

http://p4web.freebsd.org/@@182139?ac=10

Change 182139 by gpf@gpf_desktop on 2010/08/09 17:14:56

	- here are the properly formatted man pages

Affected files ...

.. //depot/projects/soc2010/gpf_audit/freebsd/src/share/man/man9/VFS_FHHINT.9#1 add
.. //depot/projects/soc2010/gpf_audit/freebsd/src/share/man/man9/VOP_GETPARENT.9#1 add
.. //depot/projects/soc2010/gpf_audit/freebsd/src/share/man/man9/vn_fullpath_nocache.9#1 add
.. //depot/projects/soc2010/gpf_audit/vfs_fhhint.txt#2 delete
.. //depot/projects/soc2010/gpf_audit/vn_fullpath_nocache.txt#2 delete
.. //depot/projects/soc2010/gpf_audit/vop_getparent.txt#2 delete

Differences ...

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:03 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 004691066066; Wed, 11 Aug 2010 18:26:02 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 331371065C02
	for ; Wed, 11 Aug 2010 18:25:58 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id AD76D8FC13
	for ; Wed, 11 Aug 2010 18:25:58 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPwuK084041
	for ; Wed, 11 Aug 2010 18:25:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPwa4084037
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:58 GMT
Message-Id: <201008111825.o7BIPwa4084037@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182148 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:03 -0000

http://p4web.freebsd.org/@@182148?ac=10

Change 182148 by hselasky@hselasky_laptop001 on 2010/08/09 19:43:23

	USB core:
		- changes needed for XHCI support (Super Speed USB)
		- compute fps_shift also for interrupt endpoints
		- add helper function to USB HUB driver to give
		information about number of HUB ports before
		the HUB driver gets attached.
		- add new USB method that allows the USB controller
		driver to track the state of the USB devices.
		- correct some Super Speed burst computations.
		- add missing state changes in the re-enumerate
		function

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#27 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#78 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_device.h#41 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#56 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#18 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_request.c#43 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#185 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_controller.h#27 (text+ko) ====

@@ -126,6 +126,8 @@
 
 	void	(*start_dma_delay) (struct usb_xfer *);
 
+	void	(*device_state_change) (struct usb_device *);
+
 	/* Optional for host mode */
 
 	usb_error_t	(*set_address) (struct usb_device *, struct mtx *, uint16_t);

==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#78 (text+ko) ====

@@ -1560,7 +1560,6 @@
 	udev->bus = bus;
 	udev->address = USB_START_ADDR;	/* default value */
 	udev->plugtime = (usb_ticks_t)ticks;
-	usb_set_device_state(udev, USB_STATE_POWERED);
 	/*
 	 * We need to force the power mode to "on" because there are plenty
 	 * of USB devices out there that do not work very well with
@@ -1637,6 +1636,8 @@
 			goto done;
 		}
 	}
+	/* set powered device state after device init is complete */
+	usb_set_device_state(udev, USB_STATE_POWERED);
 
 	if (udev->flags.usb_mode == USB_MODE_HOST) {
 
@@ -2616,6 +2617,17 @@
 	DPRINTF("udev %p state %s -> %s\n", udev,
 	    usb_statestr(udev->state), usb_statestr(state));
 	udev->state = state;
+
+	if (udev->bus->methods->device_state_change != NULL)
+		(udev->bus->methods->device_state_change) (udev);
+}
+
+enum usb_dev_state
+usb_get_device_state(struct usb_device *udev)
+{
+	if (udev == NULL)
+		return (USB_STATE_DETACHED);
+	return (udev->state);
 }
 
 uint8_t

==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#41 (text+ko) ====

@@ -215,8 +215,9 @@
 void	usb_linux_free_device(struct usb_device *dev);
 uint8_t	usb_peer_can_wakeup(struct usb_device *udev);
 struct usb_endpoint *usb_endpoint_foreach(struct usb_device *udev, struct usb_endpoint *ep);
-void	usb_set_device_state(struct usb_device *udev,
-	    enum usb_dev_state state);
+void	usb_set_device_state(struct usb_device *, enum usb_dev_state);
+enum usb_dev_state usb_get_device_state(struct usb_device *);
+
 void	usbd_enum_lock(struct usb_device *);
 void	usbd_enum_unlock(struct usb_device *);
 void	usbd_sr_lock(struct usb_device *);

==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#56 (text+ko) ====

@@ -805,6 +805,67 @@
 	return (ENXIO);
 }
 
+/* NOTE: The information returned by this function can be wrong. */
+usb_error_t
+uhub_query_info(struct usb_device *udev, uint8_t *pnports, uint8_t *ptt)
+{
+	struct usb_hub_descriptor hubdesc20;
+	struct usb_hub_ss_descriptor hubdesc30;
+	usb_error_t err;
+	uint8_t nports;
+	uint8_t tt;
+
+	if (udev->ddesc.bDeviceClass != UDCLASS_HUB)
+		return (USB_ERR_INVAL);
+
+	nports = 0;
+	tt = 0;
+
+	switch (udev->speed) {
+	case USB_SPEED_LOW:
+	case USB_SPEED_FULL:
+	case USB_SPEED_HIGH:
+		/* assuming that there is one port */
+		err = usbd_req_get_hub_descriptor(udev, NULL, &hubdesc20, 1);
+		if (err) {
+			DPRINTFN(0, "getting USB 2.0 HUB descriptor failed,"
+			    "error=%s\n", usbd_errstr(err));
+			break;
+		}
+		nports = hubdesc20.bNbrPorts;
+		if (nports > 127)
+			nports = 127;
+
+		if (udev->speed == USB_SPEED_HIGH)
+			tt = (UGETW(hubdesc20.wHubCharacteristics) >> 5) & 3;
+		break;
+
+	case USB_SPEED_SUPER:
+		err = usbd_req_get_ss_hub_descriptor(udev, NULL, &hubdesc30, 1);
+		if (err) {
+			DPRINTFN(0, "Getting USB 3.0 HUB descriptor failed,"
+			    "error=%s\n", usbd_errstr(err));
+			break;
+		}
+		nports = hubdesc30.bNbrPorts;
+		if (nports > 16)
+			nports = 16;
+		break;
+
+	default:
+		err = USB_ERR_INVAL;
+		break;
+	}
+
+	if (pnports != NULL)
+		*pnports = nports;
+
+	if (ptt != NULL)
+		*ptt = tt;
+
+	return (err);
+}
+
 static int
 uhub_attach(device_t dev)
 {

==== //depot/projects/usb/src/sys/dev/usb/usb_hub.h#18 (text+ko) ====

@@ -78,5 +78,6 @@
 void	usb_bus_power_update(struct usb_bus *bus);
 void	usb_bus_powerd(struct usb_bus *bus);
 void	uhub_root_intr(struct usb_bus *, const uint8_t *, uint8_t);
+usb_error_t uhub_query_info(struct usb_device *, uint8_t *, uint8_t *);
 
 #endif					/* _USB_HUB_H_ */

==== //depot/projects/usb/src/sys/dev/usb/usb_request.c#43 (text+ko) ====

@@ -1858,6 +1858,7 @@
 		    old_addr, usbd_errstr(err));
 		goto done;
 	}
+
 	/*
 	 * After that the port has been reset our device should be at
 	 * address zero:
@@ -1867,6 +1868,9 @@
 	/* reset "bMaxPacketSize" */
 	udev->ddesc.bMaxPacketSize = USB_MAX_IPACKET;
 
+	/* reset USB state */
+	usb_set_device_state(udev, USB_STATE_POWERED);
+
 	/*
 	 * Restore device address:
 	 */
@@ -1898,6 +1902,9 @@
 	/* restore address */
 	if (udev->address == USB_START_ADDR)
 		udev->address = old_addr;
+	/* update state, if successful */
+	if (err == 0)
+		usb_set_device_state(udev, USB_STATE_ADDRESSED);
 	return (err);
 }
 

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#185 (text+ko) ====

@@ -315,6 +315,7 @@
 	};
 	struct usb_xfer *xfer = parm->curr_xfer;
 	const struct usb_config *setup = parm->curr_setup;
+	struct usb_endpoint_ss_comp_descriptor *ecomp;
 	struct usb_endpoint_descriptor *edesc;
 	struct usb_std_packet_size std_size;
 	usb_frcount_t n_frlengths;
@@ -322,7 +323,6 @@
 	usb_frcount_t x;
 	uint8_t type;
 	uint8_t zmps;
-	uint8_t mult;
 
 	/*
 	 * Sanity check. The following parameters must be initialized before
@@ -335,6 +335,7 @@
 		goto done;
 	}
 	edesc = xfer->endpoint->edesc;
+	ecomp = xfer->endpoint->ecomp;
 
 	type = (edesc->bmAttributes & UE_XFERTYPE);
 
@@ -353,41 +354,48 @@
 
 	switch (parm->speed) {
 	case USB_SPEED_HIGH:
-		xfer->max_packet_count += (xfer->max_packet_size >> 11) & 3;
-		/* check for invalid max packet count */
-		if (xfer->max_packet_count > 3)
-			xfer->max_packet_count = 3;
+		switch (type) {
+		case UE_ISOCHRONOUS:
+		case UE_INTERRUPT:
+			xfer->max_packet_count += (xfer->max_packet_size >> 11) & 3;
+
+			/* check for invalid max packet count */
+			if (xfer->max_packet_count > 3)
+				xfer->max_packet_count = 3;
+			break;
+		default:
+			break;
+		}
 		xfer->max_packet_size &= 0x7FF;
 		break;
-
 	case USB_SPEED_SUPER:
 		xfer->max_packet_count += (xfer->max_packet_size >> 11) & 3;
-		mult = 1;
+
+		if (ecomp != NULL)
+			xfer->max_packet_count += ecomp->bMaxBurst;
 
-		/* compute additional bMaxBurst */
-		if (xfer->endpoint->ecomp != NULL) {
-			xfer->max_packet_count +=
-			    xfer->endpoint->ecomp->bMaxBurst;
+		if ((xfer->max_packet_count == 0) || 
+		    (xfer->max_packet_count > 16))
+			xfer->max_packet_count = 16;
 
-			if (type == UE_ISOCHRONOUS) {
-				mult +=
-				    (xfer->endpoint->ecomp->bmAttributes & 3);
-			}
-		}
+		switch (type) {
+		case UE_CONTROL:
+			xfer->max_packet_count = 1;
+			break;
+		case UE_ISOCHRONOUS:
+			if (ecomp != NULL) {
+				uint8_t mult;
 
-		xfer->max_packet_count *= mult;
+				mult = (ecomp->bmAttributes & 3) + 1;
+				if (mult > 3)
+					mult = 3;
 
-		/* check for invalid max packet count */
-		if (type == UE_ISOCHRONOUS) {
-			if ((xfer->max_packet_count == 0) || 
-			    (xfer->max_packet_count > (16 * 3)))
-				xfer->max_packet_count = (16 * 3);
-		} else {
-			if ((xfer->max_packet_count == 0) || 
-			    (xfer->max_packet_count > (16 * 1)))
-				xfer->max_packet_count = (16 * 1);
+				xfer->max_packet_count *= mult;
+			}
+			break;
+		default:
+			break;
 		}
-
 		xfer->max_packet_size &= 0x7FF;
 		break;
 	default:
@@ -484,41 +492,57 @@
 	} else {
 
 		/*
-		 * if a value is specified use that else check the endpoint
-		 * descriptor
+		 * If a value is specified use that else check the
+		 * endpoint descriptor!
 		 */
-		if (xfer->interval == 0) {
+		if (type == UE_INTERRUPT) {
+
+			uint32_t temp;
 
-			if (type == UE_INTERRUPT) {
+			if (xfer->interval == 0) {
 
 				xfer->interval = edesc->bInterval;
 
 				switch (parm->speed) {
-				case USB_SPEED_SUPER:
-				case USB_SPEED_VARIABLE:
+				case USB_SPEED_LOW:
+				case USB_SPEED_FULL:
+					break;
+				default:
 					/* 125us -> 1ms */
 					if (xfer->interval < 4)
 						xfer->interval = 1;
 					else if (xfer->interval > 16)
-						xfer->interval = (1<<(16-4));
+						xfer->interval = (1 << (16 - 4));
 					else
 						xfer->interval = 
-						    (1 << (xfer->interval-4));
+						    (1 << (xfer->interval - 4));
 					break;
-				case USB_SPEED_HIGH:
-					/* 125us -> 1ms */
-					xfer->interval /= 8;
-					break;
-				default:
-					break;
 				}
-				if (xfer->interval == 0) {
-					/*
-					 * One millisecond is the smallest
-					 * interval we support:
-					 */
-					xfer->interval = 1;
-				}
+			}
+
+			if (xfer->interval == 0) {
+				/*
+				 * One millisecond is the smallest
+				 * interval we support:
+				 */
+				xfer->interval = 1;
+			}
+
+			xfer->fps_shift = 0;
+			temp = 1;
+
+			while ((temp != 0) && (temp < xfer->interval)) {
+				xfer->fps_shift++;
+				temp *= 2;
+			}
+
+			switch (parm->speed) {
+			case USB_SPEED_LOW:
+			case USB_SPEED_FULL:
+				break;
+			default:
+				xfer->fps_shift += 3;
+				break;
 			}
 		}
 	}

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:06 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C2C42106572A; Wed, 11 Aug 2010 18:26:03 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B0741065EB7
	for ; Wed, 11 Aug 2010 18:26:01 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id E85028FC14
	for ; Wed, 11 Aug 2010 18:25:58 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPw9G084048
	for ; Wed, 11 Aug 2010 18:25:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPwvV084044
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:58 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:58 GMT
Message-Id: <201008111825.o7BIPwvV084044@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182149 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:06 -0000

http://p4web.freebsd.org/@@182149?ac=10

Change 182149 by hselasky@hselasky_laptop001 on 2010/08/09 19:48:33

	USB controller (XHCI):
		- fix problem about short USB transfers (compute correct remainder).
		- correctly initialise USB HUB fields in slot context
		- correct interrupt endpoint intervals (we round down the intervals).
		- add support for USB 2.0 device suspend and resume
		- add new callback function to correctly update the current XHCI device state.
		- at this point the XHCI driver works with any kind of USB device (HS/LS/FS and SS)
		- have tested ISOC, BULK, CONTROL and INTERRUPT transfer types.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#20 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#23 (text+ko) ====

@@ -122,10 +122,9 @@
 static struct xhci_endpoint_ext *xhci_get_endpoint_ext(struct usb_device *, struct usb_endpoint_descriptor *);
 static usb_proc_callback_t xhci_configure_msg;
 static usb_error_t xhci_configure_device(struct usb_device *);
-static usb_error_t xhci_configure_endpoint(struct usb_device *, struct usb_endpoint_descriptor *, uint64_t, uint16_t, uint8_t, uint8_t, uint16_t, uint16_t);
+static usb_error_t xhci_configure_endpoint(struct usb_device *, struct usb_endpoint_descriptor *, uint64_t, uint16_t, uint8_t, uint8_t, uint8_t, uint16_t, uint16_t);
 static usb_error_t xhci_configure_mask(struct usb_device *, uint32_t, uint8_t);
 static usb_error_t xhci_cmd_evaluate_ctx(struct xhci_softc *, uint64_t, uint8_t);
-static usb_error_t xhci_cmd_reset_dev(struct xhci_softc *, uint8_t);
 
 extern struct usb_bus_methods xhci_bus_methods;
 
@@ -637,6 +636,7 @@
 static void
 xhci_check_transfer(struct xhci_softc *sc, struct xhci_trb *trb)
 {
+	int64_t offset;
 	uint64_t td_event;
 	uint32_t temp;
 	uint32_t remainder;
@@ -688,18 +688,37 @@
 
 		td = xfer->td_transfer_cache;
 
-		DPRINTFN(5, "Checking if 0x%016llx == (0x%016llx .. 0x%016llx +/- 16)\n",
+		DPRINTFN(5, "Checking if 0x%016llx == (0x%016llx .. 0x%016llx)\n",
 			(long long)td_event,
 			(long long)td->td_self,
-			(long long)td->td_event_last);
+			(long long)td->td_self + sizeof(td->td_trb));
+
+		/*
+		 * NOTE: Some XHCI implementations might not trigger
+		 * an event on the last LINK TRB so we need to
+		 * consider both the last and second last event
+		 * address as conditions for a successful transfer.
+		 *
+		 * NOTE: We assume that the XHCI will only trigger one
+		 * event per chain of TRBs.
+		 */
+
+		offset = td_event - td->td_self;
 
-		if ((td_event == td->td_event_last) ||
-		    (td_event == (td->td_event_last - 16)) ||
-		    (halted && (td_event >= td->td_self) &&
-		    (td_event <= td->td_event_last))) {
+		if ((offset >= 0) &&
+		    (offset < sizeof(td->td_trb))) {
 
 			usb_pc_cpu_invalidate(td->page_cache);
 
+			/* compute rest of remainder, if any */
+			for (i = (offset / 16) + 1; i < td->ntrb; i++) {
+				temp = le32toh(td->td_trb[i].dwTrb2);
+				remainder += XHCI_TRB_2_BYTES_GET(temp);
+			}
+
+			DPRINTFN(5, "New remainder: %u\n", remainder);
+
+			/* clear isochronous transfer errors */
 			if (xfer->flags_int.isochronous_xfr) {
 				if (halted) {
 					halted = 0;
@@ -1073,27 +1092,11 @@
 	XHCI_CMD_LOCK(sc);
 
 	switch (hdev->state) {
-	case XHCI_ST_ADDRESSED:
-	case XHCI_ST_CONFIGURED:
-		if (udev->address == 0) {
-			err = xhci_cmd_reset_dev(sc, index);
-
-			if (err != 0) {
-				DPRINTF("Device reset failed\n");
-			}
-		} else {
-			err = 0;
-			break;
-		}
-
 	case XHCI_ST_DEFAULT:
+	case XHCI_ST_ENABLED:
 
 		hdev->state = XHCI_ST_ENABLED;
 
-		/* FALLTHROUGH */
-
-	case XHCI_ST_ENABLED:
-
 		/* set configure mask to slot and EP0 */
 		xhci_configure_mask(udev, 3, 0);
 
@@ -1124,7 +1127,7 @@
 		    &udev->ctrl_ep_desc);
 		err = xhci_configure_endpoint(udev,
 		    &udev->ctrl_ep_desc, pepext->physaddr,
-		    0, 1, 1, mps, mps);
+		    0, 1, 1, 0, mps, mps);
 
 		if (err != 0) {
 			DPRINTF("Could not configure default endpoint\n");
@@ -1138,7 +1141,8 @@
 		    (address == 0), index);
 
 		if (err != 0) {
-			DPRINTF("Could not set address\n");
+			DPRINTF("Could not set address "
+			    "for slot %u.\n", index);
 			if (address != 0)
 				break;
 		}
@@ -1152,27 +1156,10 @@
 
 		/* update device state to new value */
 
-		if (address != 0) {
-
-			/* we skip the addressed state */
-			hdev->state = XHCI_ST_CONFIGURED;
-
-			xhci_configure_mask(udev, 1, 0);
-
-			err = xhci_configure_device(udev);
-			if (err != 0) {
-				DPRINTF("Could not configure device\n");
-				break;
-			}
-
-			err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
-			if (err != 0) {
-				DPRINTF("Could not evaluate device context\n");
-				break;
-			}
-		} else {
+		if (address != 0)
+			hdev->state = XHCI_ST_ADDRESSED;
+		else
 			hdev->state = XHCI_ST_DEFAULT;
-		}
 		break;
 
 	default:
@@ -1399,7 +1386,6 @@
 	struct xhci_td *td;
 	struct xhci_td *td_next;
 	struct xhci_td *td_alt_next;
-	uint64_t addr;
 	uint32_t buf_offset;
 	uint32_t average;
 	uint32_t len_old;
@@ -1553,11 +1539,20 @@
 			  XHCI_TRB_3_TYPE_SET(temp->trb_type) | 
 			  XHCI_TRB_3_FRID_SET(temp->isoc_frame);
 
-			if (temp->direction == UE_DIR_IN)
+			if (temp->direction == UE_DIR_IN) {
 				dword |= XHCI_TRB_3_DIR_IN;
 
-			if (average == 0)
-				dword |= XHCI_TRB_3_IDT_BIT;
+				/*
+				 * NOTE: Only the SETUP stage should
+				 * use the IDT bit. Else transactions
+				 * can be sent using the wrong data
+				 * toggle value.
+				 */
+
+				if ((temp->trb_type != XHCI_TRB_TYPE_SETUP_STAGE) &&
+				    (temp->trb_type != XHCI_TRB_TYPE_STATUS_STAGE))
+					dword |= XHCI_TRB_3_ISP_BIT;
+			}
 
 			td->td_trb[x].dwTrb3 = htole32(dword);
 
@@ -1578,12 +1573,6 @@
 
 		DPRINTF("NTRB=%u\n", x);
 
-		/* compute event pointer */
-
-		addr = td->td_self;
-		addr += x * sizeof(struct xhci_trb);
-		td->td_event_last = addr;
-
 		/* fill out link TRB */
 
 		if (td_next != NULL) {
@@ -1629,7 +1618,7 @@
 		goto restart;
 	}
 
-	if (temp->multishort == 0) {
+	if (temp->multishort != 0) {
 		/* remove chain bit and clear TD SIZE - end of frame */
 		td->td_trb[td->ntrb - 1].dwTrb2 &= ~htole32(XHCI_TRB_2_TDSZ_SET(15));
  		td->td_trb[td->ntrb - 1].dwTrb3 &= ~htole32(XHCI_TRB_3_CHAIN_BIT);
@@ -1656,6 +1645,7 @@
 	temp.last_frame = 0;
 	temp.offset = 0;
 	temp.multishort = xfer->flags_int.isochronous_xfr ||
+	    xfer->flags_int.control_xfr ||
 	    xfer->flags_int.short_frames_ok;
 
 	/* toggle the DMA set we are using */
@@ -1867,23 +1857,6 @@
 	usb_pc_cpu_flush(&sc->sc_hw.ctx_pc);
 }
 
-static uint8_t
-xhci_log2(uint32_t x)
-{
-	uint8_t retval;
-
-	retval = 0;
-	while (1) {
-		if (x == 1)
-			break;
-		x >>= 2;
-		if (x == 0)
-			break;
-		retval++;
-	}
-	return (retval);
-}
-
 static usb_error_t
 xhci_configure_mask(struct usb_device *udev, uint32_t mask, uint8_t drop)
 {
@@ -1913,7 +1886,7 @@
 xhci_configure_endpoint(struct usb_device *udev,
     struct usb_endpoint_descriptor *edesc, uint64_t ring_addr,
     uint16_t interval, uint8_t max_packet_count, uint8_t mult,
-    uint16_t max_packet_size, uint16_t max_frame_size)
+    uint8_t fps_shift, uint16_t max_packet_size, uint16_t max_frame_size)
 {
 	struct usb_page_search buf_inp;
 	struct xhci_softc *sc = XHCI_BUS2SC(udev->bus);
@@ -1921,7 +1894,7 @@
 	uint32_t temp;
 	uint8_t index;
 	uint8_t epno;
-	uint8_t k;
+	uint8_t type;
 
 	index = udev->controller_slot_id;
 
@@ -1930,8 +1903,9 @@
 	pinp = buf_inp.buffer;
 
 	epno = edesc->bEndpointAddress;
+	type = edesc->bmAttributes & UE_XFERTYPE;
 
-	if ((edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL)
+	if (type == UE_CONTROL)
 		epno |= UE_DIR_IN;
 
 	epno = XHCI_EPNO2EPID(epno);
@@ -1947,21 +1921,38 @@
 	if (mult == 0)
 		return (USB_ERR_BAD_BUFSIZE);
 
-	mult--;
-
 	temp = XHCI_EPCTX_0_EPSTATE_SET(0) |
 	    XHCI_EPCTX_0_MAXP_STREAMS_SET(0) |
 	    XHCI_EPCTX_0_LSA_SET(0);
 
-	switch (edesc->bmAttributes & UE_XFERTYPE) {
+	switch (udev->speed) {
+	case USB_SPEED_FULL:
+	case USB_SPEED_LOW:
+		/* 1ms -> 125us */
+		fps_shift += 3;
+		break;
+	default:
+		break;
+	}
+
+	switch (type) {
 	case UE_INTERRUPT:
-		k = xhci_log2(interval) + 3;
-		temp |= XHCI_EPCTX_0_IVAL_SET(k);
+		if (fps_shift > 3)
+			fps_shift--;
+		temp |= XHCI_EPCTX_0_IVAL_SET(fps_shift);
 		break;
 	case UE_ISOCHRONOUS:
-		if (udev->speed == USB_SPEED_SUPER) {
-			temp |= XHCI_EPCTX_0_MULT_SET(mult);
+		temp |= XHCI_EPCTX_0_IVAL_SET(fps_shift);
+
+		switch (udev->speed) {
+		case USB_SPEED_SUPER:
+			if (mult > 3)
+				mult = 3;
+			temp |= XHCI_EPCTX_0_MULT_SET(mult - 1);
 			max_packet_count /= mult;
+			break;
+		default:
+			break;
 		}
 		break;
 	default:
@@ -1976,11 +1967,11 @@
 	    XHCI_EPCTX_1_MAXP_SIZE_SET(max_packet_size);
 
 	if ((udev->parent_hs_hub != NULL) || (udev->address != 0)) {
-		if ((edesc->bmAttributes & UE_XFERTYPE) != UE_ISOCHRONOUS)
+		if (type != UE_ISOCHRONOUS)
 			temp |= XHCI_EPCTX_1_CERR_SET(3);
 	}
 
-	switch (edesc->bmAttributes & UE_XFERTYPE) {
+	switch (type) {
 	case UE_CONTROL:
 		temp |= XHCI_EPCTX_1_EPTYPE_SET(4);
 		break;
@@ -1995,7 +1986,8 @@
 		break;
 	}
 
-	if (edesc->bEndpointAddress & UE_DIR_IN)
+	/* check for IN direction */
+	if (epno & 1)
 		temp |= XHCI_EPCTX_1_EPTYPE_SET(4);
 
 	pinp->ctx_ep[epno - 1].dwEpCtx1 = htole32(temp);
@@ -2004,19 +1996,17 @@
 
 	pinp->ctx_ep[epno - 1].qwEpCtx2 = htole64(ring_addr);
 
-	temp = 0;
-
 	switch (edesc->bmAttributes & UE_XFERTYPE) {
 	case UE_INTERRUPT:
 	case UE_ISOCHRONOUS:
-		temp |= XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_SET(max_frame_size);
-		temp |= XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_TD_PAYLOAD_MAX);
+		temp = XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_SET(max_frame_size);
+		temp = XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_TD_PAYLOAD_MAX);
 		break;
 	case UE_CONTROL:
-		temp |= XHCI_EPCTX_4_AVG_TRB_LEN_SET(8);
+		temp = XHCI_EPCTX_4_AVG_TRB_LEN_SET(8);
 		break;
 	default:
-		temp |= XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_TD_PAYLOAD_MAX);
+		temp = XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_TD_PAYLOAD_MAX);
 		break;
 	}
 
@@ -2048,7 +2038,8 @@
 	    xfer->endpoint->edesc, pepext->physaddr,
 	    xfer->interval, xfer->max_packet_count,
 	    (ecomp != NULL) ? (ecomp->bmAttributes & 3) + 1 : 1,
-	    xfer->max_packet_size, xfer->max_frame_size));
+	    usbd_xfer_get_fps_shift(xfer), xfer->max_packet_size,
+	    xfer->max_frame_size));
 }
 
 static usb_error_t
@@ -2135,7 +2126,7 @@
 		break;
 	}
 
-	is_hub = (udev->hub != NULL) && 
+	is_hub = (sc->sc_hw.devs[index].nports != 0) &&
 	    ((udev->speed == USB_SPEED_SUPER) ||
 	    (udev->speed = USB_SPEED_HIGH));
 
@@ -2147,7 +2138,7 @@
 	temp = XHCI_SCTX_1_RH_PORT_SET(rh_port);
 
 	if (is_hub)
-		temp |= XHCI_SCTX_1_NUM_PORTS_SET(udev->hub->nports);
+		temp |= XHCI_SCTX_1_NUM_PORTS_SET(sc->sc_hw.devs[index].nports);
 
 	switch (udev->speed) {
 	case USB_SPEED_SUPER:
@@ -2170,16 +2161,24 @@
 
 	temp = XHCI_SCTX_2_IRQ_TARGET_SET(0);
 
-	if (is_hub) {
-		if (udev->speed == USB_SPEED_HIGH)
-			temp |= XHCI_SCTX_2_TT_THINK_TIME_SET(3);
-	}
+	if (is_hub)
+		temp |= XHCI_SCTX_2_TT_THINK_TIME_SET(sc->sc_hw.devs[index].tt);
 
 	hubdev = udev->parent_hs_hub;
 
-	if (hubdev != NULL) {
-		temp |= XHCI_SCTX_2_TT_HUB_SID_SET(hubdev->controller_slot_id);
-		temp |= XHCI_SCTX_2_TT_PORT_NUM_SET(hubdev->port_no);
+	/* check if we should activate the transaction translator */
+	switch (udev->speed) {
+	case USB_SPEED_FULL:
+	case USB_SPEED_LOW:
+		if (hubdev != NULL) {
+			temp |= XHCI_SCTX_2_TT_HUB_SID_SET(
+			    hubdev->controller_slot_id);
+			temp |= XHCI_SCTX_2_TT_PORT_NUM_SET(
+			    udev->hs_port_no);
+		}
+		break;
+	default:
+		break;
 	}
 
 	pinp->ctx_slot.dwSctx2 = htole32(temp);
@@ -2342,7 +2341,8 @@
 	epno = XHCI_EPNO2EPID(epno);
 	index = xfer->xroot->udev->controller_slot_id;
 
-	XWRITE4(sc, door, XHCI_DOORBELL(index), epno | XHCI_DB_SID_SET(0));
+	if (xfer->xroot->udev->flags.self_suspended == 0)
+		XWRITE4(sc, door, XHCI_DOORBELL(index), epno | XHCI_DB_SID_SET(0));
 }
 
 static void
@@ -2536,8 +2536,15 @@
 static void
 xhci_device_generic_open(struct usb_xfer *xfer)
 {
-	if (xfer->flags_int.isochronous_xfr)
-		usb_hs_bandwidth_alloc(xfer);
+	if (xfer->flags_int.isochronous_xfr) {
+		switch (xfer->xroot->udev->speed) {
+		case USB_SPEED_FULL:
+			break;
+		default:
+			usb_hs_bandwidth_alloc(xfer);
+			break;
+		}
+	}
 }
 
 static void
@@ -2547,8 +2554,15 @@
 
 	xhci_device_done(xfer, USB_ERR_CANCELLED);
 
-	if (xfer->flags_int.isochronous_xfr)
-		usb_hs_bandwidth_free(xfer);
+	if (xfer->flags_int.isochronous_xfr) {
+		switch (xfer->xroot->udev->speed) {
+		case USB_SPEED_FULL:
+			break;
+		default:
+			usb_hs_bandwidth_free(xfer);
+			break;
+		}
+	}
 }
 
 static void
@@ -3237,10 +3251,6 @@
 		xfer->flags_int.curr_dma_set = 1;
 		goto alloc_dma_set;
 	}
-
-	/* make sure we catch any set address updates */
-	if (parm->buf != NULL)
-		xhci_set_address(xfer->xroot->udev, NULL, 0);
 }
 
 static usb_error_t
@@ -3249,7 +3259,6 @@
 	struct xhci_softc *sc = XHCI_BUS2SC(xfer->xroot->bus);
 	struct usb_page_search buf_dev;
 	struct usb_page_search buf_inp;
-	struct usb_device *hub;
 	struct usb_device *udev;
 	struct xhci_endpoint_ext *pepext;
 	struct usb_endpoint_descriptor *edesc;
@@ -3288,46 +3297,6 @@
 
 	XHCI_CMD_LOCK(sc);
 
-	/* figure out if a parent HUB should be configured */
-
-	hub = udev->parent_hs_hub;
-	if (hub == NULL) {
-		hub = udev->parent_hub;
-		if (hub == NULL)
-			hub = NULL;
-		else if (hub->parent_hub == NULL)
-			hub = NULL;
-		else if (hub->speed != USB_SPEED_SUPER)
-			hub = NULL;
-	} else {
-		/* check for root HUB */
-		if (hub->parent_hub == NULL)
-			hub = NULL;
-	}
-
-	if (hub != NULL) {
-
-		struct usb_page_search buf_hub;
-
-		DPRINTF("Configure HUB\n");
-
-		usbd_get_page(&sc->sc_hw.devs[
-		    hub->controller_slot_id].input_pc, 0, &buf_hub);
-
-		/* set configure mask to slot only */
-		xhci_configure_mask(hub, 1, 0);
-
-		/* configure input slot context structure */
-		err = xhci_configure_device(hub);
-
-		/* update context */
-		if (err == 0)
-			err = xhci_cmd_evaluate_ctx(sc, buf_hub.physaddr, index);
-
-		if (err)
-			DPRINTF("Could not update parent HS HUB context.\n");
-	}
-
 	/* configure endpoint */
 
 	err = xhci_configure_endpoint_by_xfer(xfer);
@@ -3625,25 +3594,61 @@
 static void
 xhci_device_resume(struct usb_device *udev)
 {
+	struct xhci_softc *sc = XHCI_BUS2SC(udev->bus);
+	uint8_t index;
+	uint8_t n;
+
 	DPRINTF("\n");
 
+	/* check for root HUB */
+	if (udev->parent_hub == NULL)
+		return;
+
+	index = udev->controller_slot_id;
+
+	XHCI_CMD_LOCK(sc);
+
+	/* blindly resume all endpoints */
+
 	USB_BUS_LOCK(udev->bus);
 
-	/* start endpoint */
+	for (n = 1; n != XHCI_MAX_ENDPOINTS; n++)
+		XWRITE4(sc, door, XHCI_DOORBELL(index), n | XHCI_DB_SID_SET(0));
 
 	USB_BUS_UNLOCK(udev->bus);
+
+	XHCI_CMD_UNLOCK(sc);
 }
 
 static void
 xhci_device_suspend(struct usb_device *udev)
 {
+	struct xhci_softc *sc = XHCI_BUS2SC(udev->bus);
+	uint8_t index;
+	uint8_t n;
+	usb_error_t err;
+
 	DPRINTF("\n");
 
-	USB_BUS_LOCK(udev->bus);
+	/* check for root HUB */
+	if (udev->parent_hub == NULL)
+		return;
+
+	index = udev->controller_slot_id;
+
+	XHCI_CMD_LOCK(sc);
+
+	/* blindly suspend all endpoints */
 
-	/* stop endpoint */
+	for (n = 1; n != XHCI_MAX_ENDPOINTS; n++) {
+		err = xhci_cmd_stop_ep(sc, 1, n, index);
+		if (err != 0) {
+			DPRINTF("Failed to suspend endpoint "
+			    "%u on slot %u (ignored).\n", n, index);
+		}
+	}
 
-	USB_BUS_UNLOCK(udev->bus);
+	XHCI_CMD_UNLOCK(sc);
 }
 
 static void
@@ -3652,6 +3657,89 @@
 	DPRINTF("\n");
 }
 
+static void
+xhci_device_state_change(struct usb_device *udev)
+{
+	struct xhci_softc *sc = XHCI_BUS2SC(udev->bus);
+	struct usb_page_search buf_inp;
+	usb_error_t err;
+	uint8_t index;
+
+	/* check for root HUB */
+	if (udev->parent_hub == NULL)
+		return;
+
+	index = udev->controller_slot_id;
+
+	DPRINTF("\n");
+
+	if (usb_get_device_state(udev) == USB_STATE_CONFIGURED) {
+		err = uhub_query_info(udev, &sc->sc_hw.devs[index].nports, 
+		    &sc->sc_hw.devs[index].tt);
+		if (err != 0)
+			sc->sc_hw.devs[index].nports = 0;
+	}
+
+	XHCI_CMD_LOCK(sc);
+
+	switch (usb_get_device_state(udev)) {
+	case USB_STATE_POWERED:
+		if (sc->sc_hw.devs[index].state == XHCI_ST_DEFAULT)
+			break;
+
+		sc->sc_hw.devs[index].state = XHCI_ST_DEFAULT;
+
+		err = xhci_cmd_reset_dev(sc, index);
+
+		if (err != 0) {
+			DPRINTF("Device reset failed "
+			    "for slot %u.\n", index);
+		}
+		break;
+
+	case USB_STATE_ADDRESSED:
+		if (sc->sc_hw.devs[index].state == XHCI_ST_ADDRESSED)
+			break;
+
+		sc->sc_hw.devs[index].state = XHCI_ST_ADDRESSED;
+
+		err = xhci_cmd_configure_ep(sc, 0, 1, index);
+
+		if (err) {
+			DPRINTF("Failed to deconfigure "
+			    "slot %u.\n", index);
+		}
+		break;
+
+	case USB_STATE_CONFIGURED:
+		if (sc->sc_hw.devs[index].state == XHCI_ST_CONFIGURED)
+			break;
+
+		sc->sc_hw.devs[index].state = XHCI_ST_CONFIGURED;
+
+		usbd_get_page(&sc->sc_hw.devs[index].input_pc, 0, &buf_inp);
+
+		xhci_configure_mask(udev, 1, 0);
+
+		err = xhci_configure_device(udev);
+		if (err != 0) {
+			DPRINTF("Could not configure device "
+			    "at slot %u.\n", index);
+		}
+
+		err = xhci_cmd_evaluate_ctx(sc, buf_inp.physaddr, index);
+		if (err != 0) {
+			DPRINTF("Could not evaluate device "
+			    "context at slot %u.\n", index);
+		}
+		break;
+
+	default:
+		break;
+	}
+	XHCI_CMD_UNLOCK(sc);
+}
+
 struct usb_bus_methods xhci_bus_methods = {
 	.endpoint_init = xhci_ep_init,
 	.endpoint_uninit = xhci_ep_uninit,
@@ -3668,4 +3756,5 @@
 	.start_dma_delay = xhci_start_dma_delay,
 	.set_address = xhci_set_address,
 	.clear_stall = xhci_ep_clear_stall,
+	.device_state_change = xhci_device_state_change,
 };

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#20 (text+ko) ====

@@ -314,7 +314,6 @@
  * Extra information needed:
  */
 	uint64_t td_self;
-	uint64_t td_event_last;
 	struct xhci_td *next;
 	struct xhci_td *alt_next;
 	struct xhci_td *obj_next;
@@ -378,6 +377,9 @@
 	struct xhci_endpoint_ext endp[XHCI_MAX_ENDPOINTS];
 
 	uint8_t state;
+	uint8_t nports;
+	uint8_t tt;
+	uint8_t reserved;
 };
 
 struct xhci_hw_softc {

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:06 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CD170106573F; Wed, 11 Aug 2010 18:26:03 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5CBFF1065EBC
	for ; Wed, 11 Aug 2010 18:26:01 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 385098FC1E
	for ; Wed, 11 Aug 2010 18:25:59 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIPxLB084061
	for ; Wed, 11 Aug 2010 18:25:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIPxVe084057
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:25:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:25:59 GMT
Message-Id: <201008111825.o7BIPxVe084057@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182151 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:06 -0000

http://p4web.freebsd.org/@@182151?ac=10

Change 182151 by hselasky@hselasky_laptop001 on 2010/08/09 20:17:26

	USB controller (XHCI):
		- we also need to check if the ISOC transfer is queued to
		far in the future alike the OHCI driver.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#24 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#24 (text+ko) ====

@@ -1687,7 +1687,8 @@
 		y = XHCI_MFINDEX_GET(x - xfer->endpoint->isoc_next);
 
 		if ((xfer->endpoint->is_synced == 0) ||
-		    (y < (xfer->nframes << shift))) {
+		    (y < (xfer->nframes << shift)) ||
+		    (XHCI_MFINDEX_GET(-y) >= (128 * 8))) {
 			/*
 			 * If there is data underflow or the pipe
 			 * queue is empty we schedule the transfer a

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:13 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 506B2106614A; Wed, 11 Aug 2010 18:26:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2092F10657D6
	for ; Wed, 11 Aug 2010 18:26:06 +0000 (UTC)
	(envelope-from afiveg@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 002E28FC14
	for ; Wed, 11 Aug 2010 18:26:06 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQ5h9084303
	for ; Wed, 11 Aug 2010 18:26:05 GMT
	(envelope-from afiveg@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQ5IJ084300
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:05 GMT
	(envelope-from afiveg@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:05 GMT
Message-Id: <201008111826.o7BIQ5IJ084300@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	afiveg@FreeBSD.org using -f
From: Alexandre Fiveg 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182187 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:13 -0000

http://p4web.freebsd.org/@@182187?ac=10

Change 182187 by afiveg@cottonmouth on 2010/08/10 14:48:20

	ringmap for lem driver fixed. 
	Changes in ringmap.[hc] - now the global list of ringmap structures will be used. It reduces the number of ringmap function, that earlier was needed for access to the ringmap structure. Eliminated LOCKS from sync* functions - they could cause a dead-lock. TODO: fix ixgbe-ringmap to these changes. 

Affected files ...

.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#14 edit
.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#14 edit
.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#17 edit
.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#29 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#30 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#29 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#27 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#19 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#12 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#13 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#43 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#43 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#13 edit
.. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#25 edit
.. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#26 edit
.. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#20 edit
.. //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#11 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#14 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#14 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#17 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#29 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#30 (text+ko) ====

@@ -82,7 +82,7 @@
 
 #include "e1000_api.h"
 #ifdef RINGMAP
-#include <../../net/ringmap.h>
+#include 
 #endif
 #include "if_lem.h"
 
@@ -272,8 +272,7 @@
 
 
 #ifdef RINGMAP
-
-extern int ringmap_attach (device_t, struct ringmap_functions *);
+extern struct ringmap * ringmap_attach(device_t, struct ringmap_functions *);
 extern int ringmap_detach (device_t);
 
 extern struct ringmap_functions ringmap_8254_f;
@@ -686,7 +685,10 @@
 	    device_get_nameunit(dev));
 
 #ifdef RINGMAP
-	ringmap_attach (dev, &ringmap_8254_f);
+	adapter->rm = ringmap_attach (dev, &ringmap_8254_f);
+	if (adapter->rm == NULL) {
+		goto err_rx_struct;
+	}
 #endif 
 
 	INIT_DEBUGOUT("lem_attach: end");
@@ -1383,37 +1385,15 @@
 	struct adapter	*adapter = context;
 	struct ifnet	*ifp = adapter->ifp;
 
-#ifdef RINGMAP
-	struct capt_object *co = NULL;
-#endif
-
 	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
-#ifdef RINGMAP
-		if ((adapter->rm != NULL) && (adapter->rm->open_cnt > 0)) {
-			adapter->rm->funcs->delayed_isr(context);
-#endif
 		if (lem_rxeof(adapter, adapter->rx_process_limit) != 0)
 			taskqueue_enqueue(adapter->tq, &adapter->rxtx_task);
-#ifdef RINGMAP
-			adapter->rm->funcs->sync_head(adapter->dev);
-			
-			SLIST_FOREACH(co, &adapter->rm->object_list, objects) {
-				if (RING_NOT_EMPTY(co->ring)){
-					wakeup(co->ring);
-				}
-			}
-		}
-#endif 
 
-#ifdef RINGMAP
-#if (RINGMAP_TX_ENABLE)
 		EM_TX_LOCK(adapter);
 		lem_txeof(adapter);
 		if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd))
 			lem_start_locked(ifp);
 		EM_TX_UNLOCK(adapter);
-#endif
-#endif
 	}
 
 	lem_enable_intr(adapter);
@@ -3521,6 +3501,10 @@
 	int		i, rx_sent = 0;
 	struct e1000_rx_desc   *current_desc;
 
+#ifdef RINGMAP
+	struct capt_object *co = NULL;
+#endif
+
 	EM_RX_LOCK(adapter);
 	i = adapter->next_rx_desc_to_check;
 	current_desc = &adapter->rx_desc_base[i];
@@ -3532,6 +3516,12 @@
 		return (rx_sent);
 	}
 
+#ifdef RINGMAP
+	/* Call our ringmap-isr only in case any process captures (open_cnt > 0) */ 
+	if ((adapter->rm != NULL) && (adapter->rm->open_cnt > 0)) 
+		adapter->rm->funcs->delayed_isr(adapter);
+#endif
+
 	while ((current_desc->status & E1000_RXD_STAT_DD) &&
 	    (count != 0) &&
 	    (ifp->if_drv_flags & IFF_DRV_RUNNING)) {
@@ -3586,12 +3576,12 @@
 		if (accept_frame) {
 
 #ifdef RINGMAP
-			if (adapter->rm != NULL) 
+			if ((adapter->rm != NULL) && (adapter->rm->open_cnt > 0)) 
 				adapter->rm->funcs->delayed_isr_per_packet(adapter->dev, i);
 #endif
 
 #ifndef RINGMAP
-		/* Do not allocate memory for new mbufs and packets. Work in ring */
+/* RINGMAP: Do not allocate memory for new mbufs and packets. Work in ring */
 			if (lem_get_buf(adapter, i) != 0) {
 				ifp->if_iqdrops++;
 				goto discard;
@@ -3696,6 +3686,18 @@
 		}
 		current_desc = &adapter->rx_desc_base[i];
 	}
+
+#ifdef RINGMAP
+	RINGMAP_LOCK(adapter->rm);
+	SLIST_FOREACH(co, &adapter->rm->object_list, objects) {
+		adapter->rm->funcs->sync_head(co);
+		if (RING_NOT_EMPTY(co->ring)){
+			wakeup(co->ring);
+		}
+	}
+	RINGMAP_UNLOCK(adapter->rm);
+#endif 
+
 	adapter->next_rx_desc_to_check = i;
 
 	/* Advance the E1000's Receive Queue #0  "Tail Pointer". */

==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#29 (text+ko) ====

@@ -18,7 +18,6 @@
 #include "if_lem.h"
 #include "ringmap_8254.h"
 
-int rm_8254_set_ringmap_to_adapter(device_t, struct ringmap *);
 struct ringmap * rm_8254_get_ringmap_p(device_t);
 device_t rm_8254_get_device_p(struct cdev *);
 void rm_8254_enable_intr(device_t);
@@ -28,9 +27,9 @@
 void rm_8254_delayed_interrupt(void *);
 void rm_8254_delayed_interrupt_per_packet(void *, int);
 int rm_8254_print_ring_pointers(struct adapter *);
-void rm_8254_sync_tail(void *);
-void rm_8254_sync_head(void *);
-struct ring * rm_8254_find_next(struct adapter *);
+void rm_8254_sync_tail(struct capt_object *);
+void rm_8254_sync_head(struct capt_object *);
+struct capt_object * rm_8254_find_next(struct adapter *);
 int rm_8254_set_queue(struct capt_object *, unsigned int);
 
 extern devclass_t em_devclass;
@@ -41,7 +40,6 @@
 
 
 struct ringmap_functions ringmap_8254_f = {
-	rm_8254_set_ringmap_to_adapter,
 	rm_8254_enable_intr,
 	rm_8254_disable_intr,
 	rm_8254_interrupt,
@@ -51,8 +49,6 @@
 	rm_8254_sync_head,
 	rm_8254_set_slot,
 	rm_8254_set_queue,
-	rm_8254_get_ringmap_p,
-	rm_8254_get_device_p
 };
 
 
@@ -61,61 +57,27 @@
  * 2. SYNC_TAIL: RDT =  ring->userrp
  */
 void 
-rm_8254_sync_tail(void *context)
+rm_8254_sync_tail(struct capt_object *co)
 {
-	device_t dev = (device_t)context;
-	struct adapter *adapter = (struct adapter *)device_get_softc(dev);
-	struct ring *ring = NULL;
+	struct adapter *adapter = (struct adapter *)device_get_softc(co->rm->dev);
 
 	RINGMAP_FUNC_DEBUG(start);
 
-	/* 
-	 * In case if there are many processes that capture, take the 
-	 * userrp from process that is next to RDH.
-	 */
-	ring = rm_8254_find_next(adapter);
+	RINGMAP_HW_SYNC_TAIL(adapter, co->ring);
 
-#if (__RINGMAP_DEB)
-	printf("Next ring->pid is %d\n", ring->pid);
-#endif 
-
-	RINGMAP_HW_SYNC_TAIL(adapter, ring);
-
 	RINGMAP_FUNC_DEBUG(end);
 }
 
 /* Set value from RDH to the ring->kernrp*/
 void 
-rm_8254_sync_head(void *context)
+rm_8254_sync_head(struct capt_object *co)
 {
-	device_t dev = (device_t)context;
-	struct capt_object *co = NULL;
-	struct adapter *adapter;
+	struct adapter *adapter = (struct adapter *)device_get_softc(co->rm->dev);
 
 	RINGMAP_FUNC_DEBUG(start);
 
-	adapter = (struct adapter *)device_get_softc(dev);
-	if (adapter->rm == NULL)
-		return;
+	RINGMAP_HW_SYNC_HEAD(adapter, co->ring); 
 
-	RINGMAP_LOCK(adapter->rm);
-
-	/* 
-	 * In case if there are many processes that capture, set in the 
-	 * ring structure of each process the kernrp
-	 */
-	SLIST_FOREACH(co, &adapter->rm->object_list, objects) {
-		if (co->ring != NULL) {
-			RINGMAP_HW_SYNC_HEAD(adapter, co->ring); 
-#if (__RINGMAP_DEB)
-			print_capt_obj(co);
-			PRINT_RING_PTRS(co->ring);
-#endif 
-		}
-	}
-
-	RINGMAP_UNLOCK(adapter->rm);
-
 	RINGMAP_FUNC_DEBUG(end);
 }
 
@@ -124,14 +86,11 @@
  * This should be called from ISR. Other interrupts are disallowed!
  * It means the functions must be as small as possible
  */
-void 
+void inline 
 rm_8254_interrupt(void *arg)
 {
-	struct adapter	*adapter = (struct adapter *) arg;
-
-	/* count interrupts only if there is capturing object */
-	if ( adapter->rm->open_cnt > 0 )
-		adapter->rm->interrupts_counter++;
+	/* Do nothing ... */
+   return;	
 }
 
 
@@ -146,15 +105,16 @@
 	RINGMAP_LOCK(adapter->rm);
 
 	getmicrotime(&last_ts);
-	rm_8254_sync_tail(adapter->dev);
+
+	rm_8254_sync_tail(rm_8254_find_next(adapter));
 
 	SLIST_FOREACH(co, &adapter->rm->object_list, objects) {
 		if (co->ring != NULL) {
-#if (__RINGMAP_DEB)
+#if (RINGMAP_INTR_DEB)
 			PRINT_RING_PTRS(co->ring);
 #endif
 			co->ring->last_ts = last_ts;
-			co->ring->intr_num = co->rm->interrupts_counter;
+			++co->ring->intr_num;
 		}
 	}
 
@@ -163,7 +123,7 @@
 }
 
 /* The ring which TAIL pointer is mostly near to to the HEAD(RDH) */
-struct ring *
+struct capt_object *
 rm_8254_find_next(struct adapter *adapter)
 {
 	unsigned int rdh, rdt, dist, min_dist = SLOTS_NUMBER;
@@ -181,7 +141,7 @@
 		}
 	}
 
-	return (min_co->ring);
+	return (min_co);
 }
 
 void 
@@ -199,9 +159,9 @@
 
 	RINGMAP_LOCK(rm);
 	SLIST_FOREACH(co, &rm->object_list, objects) {
-		if ( co->ring != NULL ) {
+		if (co->ring != NULL) {
 			co->ring->slot[slot_num].is_ok = 1;
-			co->ring->slot[slot_num].intr_num = rm->interrupts_counter;
+			co->ring->slot[slot_num].intr_num = co->ring->intr_num;;
 
 #ifdef RINGMAP_TIMESTAMP
 			co->ring->slot[slot_num].ts = co->ring->last_ts;
@@ -221,15 +181,27 @@
 int
 rm_8254_set_slot(struct capt_object *co, unsigned int slot_num)
 {
-	device_t dev = co->dev;
-	struct adapter *adapter = (struct adapter *)device_get_softc(dev);
-	struct ring *ring = co->ring;
+	device_t dev = NULL; 	
+	struct adapter *adapter = NULL; 
+	struct ring *ring = NULL; 
 
 #if (__RINGMAP_DEB)
 	printf("[%s] Set slot: %d\n", __func__, slot_num);
 #endif
 
-	/* First check pointers */
+	dev = co->rm->dev;
+	adapter = (struct adapter *)device_get_softc(dev);
+	ring = co->ring;
+
+	/* First check ALL pointers */
+	if (co == NULL) {
+		RINGMAP_ERROR(Pointer to capturing object is NULL);
+		goto fail;
+	}
+	if (co->rm == NULL) {
+		RINGMAP_ERROR(Pointer to ringmap is NULL);
+		goto fail;
+	}
 	if (GET_MBUF_P(adapter, slot_num) == NULL){
 		RINGMAP_ERROR(Pointer to mbuf is NULL);
 		goto fail;
@@ -273,7 +245,6 @@
 void 
 rm_8254_disable_intr(device_t dev)
 {
-	
 	struct adapter *adapter;
 	adapter = (struct adapter *)device_get_softc(dev);
 
@@ -288,7 +259,6 @@
 void 
 rm_8254_enable_intr(device_t dev)
 {
-	
 	struct adapter *adapter;
 	adapter = (struct adapter *)device_get_softc(dev);
 
@@ -319,21 +289,6 @@
 
 
 /*
- * Set pointer to ringmap in the adapter structure.
- */
-int
-rm_8254_set_ringmap_to_adapter(device_t dev, struct ringmap *rm)
-{
-	struct adapter *adapter;
-
-	adapter = (struct adapter *)device_get_softc(dev);
-	adapter->rm = rm;
-
-	return (0);
-}
-
-
-/*
  * Returns pointer to ringmap structure
  */
 struct ringmap * 

==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#27 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#19 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#12 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#13 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#43 (text+ko) ====

@@ -36,15 +36,14 @@
 
 #include "ringmap.h"
 
-int ringmap_attach (device_t, struct ringmap_functions *);
+struct ringmap * ringmap_attach (device_t, struct ringmap_functions *);
 int ringmap_detach (device_t);
 void ringmap_close_cb (void *data);
 void clear_capt_object(void *);
 void print_capt_obj(struct capt_object *);
+struct ringmap * cdev2ringmap(struct cdev *);
+struct ringmap * dev2ringmap(device_t);
 
-struct ringmap *(*get_ringmap_p)(device_t);
-device_t 		(*get_device_p)(struct cdev *);
-
 d_open_t	ringmap_open;
 d_close_t	ringmap_close;
 d_ioctl_t	ringmap_ioctl;
@@ -61,11 +60,16 @@
 	.d_name 	= "ringmap_cdev"
 };
 
+
+struct ringmap_global_list ringmap_list_head = 
+		SLIST_HEAD_INITIALIZER(ringmap_list_head);
+
+
 /*
  * Will called from if_em.c before returning from 
  * em_attach() function.  
  */
-int 
+struct ringmap *
 ringmap_attach(device_t dev, struct ringmap_functions *rf) 
 {	
 	struct ringmap *rm = NULL;
@@ -75,8 +79,8 @@
 	rm = (struct ringmap *) contigmalloc (sizeof(struct ringmap), 
 							M_DEVBUF, M_ZERO, 0, -1L, PAGE_SIZE, 0);
 	if (rm == NULL) { 
-		RINGMAP_ERROR(Can not allocate space for ringmap structure); 
-		return (-1); 
+		RINGMAP_ERROR(Can not allocate space for ringmap structure);
+		return (NULL);
 	}
 
 	/* 
@@ -93,29 +97,31 @@
 						RINGMAP_DEVICE"%d", device_get_unit(dev));
 	if (rm->cdev == NULL) {
 		RINGMAP_ERROR(Can not create char device);
-		return (-1);
+		contigfree(rm, sizeof(struct ringmap), M_DEVBUF);
+		return (NULL);
 	}
 
-	/* Set function pointers */
+	/* 
+	 * Tell to ringmap which hardware and driver speciffic functions 
+	 * should it use 
+	 */
 	rm->funcs = rf;
-	get_ringmap_p = rf->dev_to_ringmap;
-	get_device_p = rf->cdev_to_dev;
 
-	/* Store adapters device structure */
+	/* Store adapters device structure by ringmap */
 	rm->dev = dev;
 
 	/* Initialize the list of capturing objects */
 	SLIST_INIT(&rm->object_list);
 
+	/* Insert ringmap in the global list */
+	SLIST_INSERT_HEAD(&ringmap_list_head, rm, entries);
+
 	/* Init the mutex to protecting our data */
 	RINGMAP_LOCK_INIT(rm, device_get_nameunit(dev));
 
-	/* set the pointer to ringmap into the adapters structure */
-	rm->funcs->set_ringmap_to_adapter(dev, rm);
-
 	RINGMAP_FUNC_DEBUG(end); 
 
-	return (0);	
+	return (rm);	
 }
 
 
@@ -127,24 +133,28 @@
 
 	RINGMAP_FUNC_DEBUG(start);
 	
-	rm = get_ringmap_p (dev);
-	if (rm == NULL){
+	rm = dev2ringmap(dev);
+	if (rm == NULL) {
 		RINGMAP_WARN(Can not get pointer to ringmap structure);
 		return (-1);
 	}
 
-	/* Remove all capturing objects properly */
+	/* Remove all capturing objects associated with ringmap */
     while (!SLIST_EMPTY(&rm->object_list)) {
 	    co = SLIST_FIRST(&rm->object_list);
 	    SLIST_REMOVE_HEAD(&rm->object_list, objects);
 	    clear_capt_object((void *)co);
     }
 
+	/* Destroy char device associated with ringmap */
 	if (rm->cdev != NULL)
 		destroy_dev(rm->cdev);
-	
+
 	RINGMAP_LOCK_DESTROY(rm);
 
+	/* And remove ringmap from global list */
+	SLIST_REMOVE(&ringmap_list_head, rm, ringmap, entries);
+	
 	contigfree(rm, sizeof(struct ringmap), M_DEVBUF);
 
 	RINGMAP_FUNC_DEBUG(end);
@@ -172,8 +182,7 @@
 	printf(RINGMAP_PREFIX"[%s] pid = %d\n", __func__, td->td_proc->p_pid);
 #endif 
 
-	/* a little magic */
-	rm = get_ringmap_p(get_device_p(cdev));
+	rm = cdev2ringmap(cdev);
 	if ( rm == NULL ) {
 		RINGMAP_ERROR(Null pointer to ringmap structure);
 
@@ -189,20 +198,17 @@
 		err = EIO; goto out;
 	}
 
-	/* check: the current thread shouldn't open more than one time */
-	if (rm->open_cnt) {
-		SLIST_FOREACH(co, &rm->object_list, objects) {
-			if (co->td == td) {
-				RINGMAP_ERROR(Device is opened!);
-
-				err = EIO; goto out;
-			}
+	/* Only ONE open() per thread */
+	SLIST_FOREACH(co, &rm->object_list, objects) {
+		if (co->td == td) {
+			RINGMAP_ERROR(Device is opened!);
+			err = EIO; goto out;
 		}
 	}
 
 	/* 
-	 * Allocate memory for ring structure Use contigmalloc(9) to get PAGE_SIZE
-	 * alignment that is needed for memory mapping.  
+	 * Allocate memory for ring structure. Use contigmalloc(9) to get
+	 * PAGE_SIZE alignment that is needed for memory mapping.  
 	 */
 	ring = (struct ring *) contigmalloc (sizeof(struct ring), 
 			M_DEVBUF, M_ZERO, 0, -1L, PAGE_SIZE, 0);
@@ -220,7 +226,6 @@
 			sizeof(struct capt_object), M_DEVBUF, (M_ZERO | M_WAITOK));
 	if ( co == NULL ){
 		contigfree(ring, sizeof(struct ring), M_DEVBUF);
-
 		err = EIO; goto out;
 	}
 
@@ -236,17 +241,21 @@
 	/* Associate the capturing object with a queue */
 	if (rm->funcs->set_queue(co, DEFAULT_QUEUE) == -1) {
 		RINGMAP_ERROR(Can not associate que with the capturing object!);
+
 		contigfree(ring, sizeof(struct ring), M_DEVBUF);
+		FREE(co, M_DEVBUF);
 
 		err = EIO; goto out;
 	}
 #endif 
 
 	/* Init ring-slots  with mbufs and packets adrresses */
-	for (i = 0 ; i < SLOTS_NUMBER ; i++){
+	for (i = 0 ; i < SLOTS_NUMBER ; i++) {
 		if (rm->funcs->set_slot(co, i) == -1){
 			RINGMAP_ERROR(Ring initialization failed!);
+
 			contigfree(ring, sizeof(struct ring), M_DEVBUF);
+			FREE(co, M_DEVBUF);
 
 			err = EIO; goto out;
 		}
@@ -262,18 +271,18 @@
 	SLIST_INSERT_HEAD(&rm->object_list, co, objects);
 
 	/* 
-	 * Store capturing object as private date. So we can access our capturing
+	 * Store capturing object as private data. So we can access our capturing
 	 * object in other syscalls, e.g. read, close, etc... 
 	 */
 	if ( devfs_set_cdevpriv((void *)co, clear_capt_object) ) {
 		RINGMAP_ERROR(Can not set private data!);
+
+		contigfree(ring, sizeof(struct ring), M_DEVBUF);
 		FREE(co, M_DEVBUF);
-		contigfree(ring, sizeof(struct ring), M_DEVBUF);
 
 		err = EIO; goto out;
 	}
 
-	rm->funcs->sync_tail(co->que);
 	rm->open_cnt++;
 
 #if (__RINGMAP_DEB)
@@ -334,7 +343,7 @@
 	}
 	
 	if (rm->open_cnt)
-		rm->open_cnt--;
+		--rm->open_cnt;
 
 	RINGMAP_UNLOCK(rm);
 
@@ -342,6 +351,7 @@
 }
 
 
+/* doesn't work yet */
 int 
 ringmap_mmap_single(struct cdev *cdev, vm_ooffset_t *offset,
     vm_size_t size, struct vm_object **object, int nprot)
@@ -359,7 +369,7 @@
 	RINGMAP_FUNC_DEBUG(start);
 
 
-	rm = get_ringmap_p(get_device_p(cdev));
+	rm = cdev2ringmap(cdev);
 	if ( rm == NULL ) {
 		RINGMAP_ERROR(Null pointer to ringmap structure);
 
@@ -407,7 +417,7 @@
 	RINGMAP_FUNC_DEBUG(start);
 
 	/* Get pointer to the ringmap structure */
-	rm = get_ringmap_p(get_device_p(cdev));
+	rm = cdev2ringmap(cdev);
 
 	if (devfs_get_cdevpriv((void **)&co)) {
 		RINGMAP_ERROR(Can not get capturing object);
@@ -448,30 +458,12 @@
 	printf("[%s] pid = %d\n", __func__, td->td_proc->p_pid);
 #endif 
 
-	/* Eliminate it. Use devfs_* funcs */
-	rm = get_ringmap_p(get_device_p(cdev));
-	if (rm == NULL) {
-		RINGMAP_ERROR(NULL pointer. ioctl can not be accomplished);
-
-		/* TODO: look whether ENODEV is a correctly for this case */
-		return(ENODEV);
-	}
-
-	RINGMAP_LOCK(rm);
 	if ( devfs_get_cdevpriv((void **)&co) ) {
-		RINGMAP_IOCTL(Error! Can not get private date!)
+		RINGMAP_IOCTL(Error! Can not get private date!);
 		return (ENODEV);
 	}
-	if (co->td != curthread){
 
-		RINGMAP_IOCTL(Wrong private data!);
-
-		SLIST_FOREACH(co, &rm->object_list, objects) {
-			if ( co->td == curthread)
-				break;
-		}
-	}
-	RINGMAP_UNLOCK(rm);
+	rm = co->rm;
 
 	switch( cmd ){
 
@@ -494,7 +486,7 @@
 			co->ring->user_wait_kern++;
 
 			/* Set adapter TAIL register */
-			rm->funcs->sync_tail(co->que);
+			rm->funcs->sync_tail(co);
 
 #if (__RINGMAP_DEB)
 			print_capt_obj(co);
@@ -543,3 +535,30 @@
 				(unsigned int)co->que);
 	}
 }
+
+
+struct ringmap *
+dev2ringmap(device_t dev)
+{
+	struct ringmap *rm = NULL;
+
+	SLIST_FOREACH(rm, &ringmap_list_head, entries) {
+		if (rm->dev == dev) 
+			return(rm);
+	}
+
+	return(rm);
+}
+
+
+struct ringmap *
+cdev2ringmap(struct cdev *cdev)
+{
+	struct ringmap *rm = NULL;
+	
+	SLIST_FOREACH(rm, &ringmap_list_head, entries) {
+		if (rm->cdev == cdev) 
+			return(rm);
+	}
+	return(rm);
+}

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#43 (text+ko) ====

@@ -76,11 +76,11 @@
 };
 
 /*
- * This structure represents the packets ringbuffer.  The structure should be
+ * This structure represents the packets ringbuffer. The structure should be
  * mapped into the user-space to be visible and accessible from the user
  * capturing application. The ring contains the pointer to SLOTs array. Each
- * SLOT represents one packet. Additionaly, the structure contains 
- * ring-HEAD (kernrp) and ring-TAIL (userrp) poiners. 
+ * SLOT represents one packet. Additionaly, the structure contains ring-HEAD
+ * (kernrp) and ring-TAIL (userrp) poiners. 
  */
 struct ring {
 

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#13 (text+ko) ====

@@ -24,10 +24,8 @@
 	/* Char device for communications between user and kernel spaces */
 	struct 	cdev 	*cdev;
 
-	/* 
-	 * Number of processes that opened cdev. 
-	 * A.K.A. number of capturing objects  
-	 */
+	/* Number of processes that opened cdev. 
+	 * A.K.A. number of capturing objects  */
 	uint32_t volatile open_cnt;
 	
 	/* Hardware dependent functions */
@@ -36,20 +34,18 @@
 	/* Mutex that should protect the data allocated in the ring */
 	struct mtx	ringmap_mtx;
 
+	/* Head of the list of capturing objects */
 	SLIST_HEAD(object_list, capt_object) object_list;
 
-	/* Counts number of hardware interrupts */
-	unsigned long long interrupts_counter;
+	/* Next ringmap in the list */
+	SLIST_ENTRY(ringmap) entries;
 };
 
+/* SLIST of ringmap structures */
+SLIST_HEAD(ringmap_global_list, ringmap);
+
 struct ringmap_functions {
 
-	/* 
-	 * Set pointer to the ringmap structure into the adapters
-	 * driver structure. 
-	 */
-	int (*set_ringmap_to_adapter)(device_t, struct ringmap*);
-
 	/*
 	 * In some situations it is safe to disable 
 	 * interrupts on adapter. 
@@ -66,7 +62,7 @@
 	/*
 	 * This function should be calld from delayed interrupt 
 	 * function. It can contain operations that must not be 
-	 * very fast.
+	 * very fast (can sleep).
 	 */
 	void (*delayed_isr)(void *);
 
@@ -81,8 +77,8 @@
 
 	/* 
 	 * Next functions synchronize the tail and head hardware registers
-	 * with head and tail software varibles which are also visible from 
-	 * user-space process. 
+	 * with head and tail software varibles visible in both  
+	 * kernel- and user-space. 
 	 *
 	 * Synchronisation rules:
 	 * 1. SYNC_HEAD: HARDWARE_HEAD => SOFTWARE_HEAD
@@ -90,28 +86,27 @@
 	 * 		HEAD-variable: ring->kernrp.  The User-space process shouldn't
 	 * 		touch the ring->kernrp variable. Only hardware increment the value
 	 * 		in the HEAD register onto adapters chip while receiving new
-	 * 		packets, and only driver (kernel) synchronize then hardware HEAD
+	 * 		packets, and only driver (kernel) synchronizes then hardware HEAD
 	 * 		with ring->kernrp.
 	 *
 	 * 2. SYNC_TAIL: SOFTWARE_TAIL => HARDWARE_TAIL
 	 *		set value from software TAIL-variable: ring->userrp into the
 	 *		hardware TAIL-register. Hardware shouldn't change the content of
-	 *		TAIL-register.  Software after reading one packet in RAM increments
-	 *		the value of ring->userrp. Kernel will check this value and set it
-	 *		into the hardware TAIL-register.
+	 *		TAIL-register.  Software after reading one packet in RAM
+	 *		increments the value of ring->userrp. Kernel will check this value
+	 *		(it is mapped - visible in kernel and user) and set it into the
+	 *		hardware TAIL-register.
 	 */
-	void (*sync_tail)(void *);
-	void (*sync_head)(void *);
+	void (*sync_tail)(struct capt_object *);
+	void (*sync_head)(struct capt_object *);
 
 	/* Initialize the ring slot */
 	int (*set_slot)(struct capt_object *, unsigned int);
 
-	/* Associate the capturing objec with a hardware queue */
+	/* Associate the capturing objec with a hardware queue. Usable ONLY
+	 * on controllers supported multiple queues */
 	int (*set_queue)(struct capt_object *, unsigned int);
 
-	struct ringmap *(*dev_to_ringmap)(device_t);
-
-	device_t (*cdev_to_dev)(struct cdev *);
 };
 
 /* MUTEX */

==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#25 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#26 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#20 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#11 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:14 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1449210662CE; Wed, 11 Aug 2010 18:26:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4398B1065E53
	for ; Wed, 11 Aug 2010 18:26:07 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id D38448FC0C
	for ; Wed, 11 Aug 2010 18:26:06 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQ6mJ084324
	for ; Wed, 11 Aug 2010 18:26:06 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQ6es084320
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:06 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 11 Aug 2010 18:26:06 GMT
Message-Id: <201008111826.o7BIQ6es084320@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182190 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:14 -0000

http://p4web.freebsd.org/@@182190?ac=10

Change 182190 by jhb@jhb_fiver on 2010/08/10 15:29:22

	Convert various places over to using cpumask_t instead of int
	or u_int.  Cosmetic.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#67 edit
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#109 edit
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#49 edit
.. //depot/projects/smpng/sys/arm/include/pmap.h#30 edit
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#128 edit
.. //depot/projects/smpng/sys/i386/i386/pmap.c#148 edit
.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#98 edit
.. //depot/projects/smpng/sys/i386/xen/pmap.c#17 edit
.. //depot/projects/smpng/sys/mips/include/pmap.h#13 edit
.. //depot/projects/smpng/sys/powerpc/include/pmap.h#28 edit
.. //depot/projects/smpng/sys/sparc64/include/pmap.h#37 edit
.. //depot/projects/smpng/sys/sparc64/include/smp.h#28 edit
.. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#42 edit
.. //depot/projects/smpng/sys/sun4v/include/smp.h#11 edit
.. //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#13 edit
.. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#22 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#67 (text+ko) ====

@@ -1053,7 +1053,7 @@
 	int ncpu, othercpus;
 
 	othercpus = mp_ncpus - 1;
-	if (mask == (u_int)-1) {
+	if (mask == (cpumask_t)-1) {
 		ncpu = othercpus;
 		if (ncpu < 1)
 			return;
@@ -1078,7 +1078,7 @@
 	smp_tlb_addr1 = addr1;
 	smp_tlb_addr2 = addr2;
 	atomic_store_rel_int(&smp_tlb_wait, 0);
-	if (mask == (u_int)-1)
+	if (mask == (cpumask_t)-1)
 		ipi_all_but_self(vector);
 	else
 		ipi_selected(mask, vector);
@@ -1338,7 +1338,7 @@
 cpustop_handler(void)
 {
 	int cpu = PCPU_GET(cpuid);
-	int cpumask = PCPU_GET(cpumask);
+	cpumask_t cpumask = PCPU_GET(cpumask);
 
 	savectx(&stoppcbs[cpu]);
 
@@ -1367,7 +1367,7 @@
 {
 	register_t cr3, rf;
 	int cpu = PCPU_GET(cpuid);
-	int cpumask = PCPU_GET(cpumask);
+	cpumask_t cpumask = PCPU_GET(cpumask);
 
 	rf = intr_disable();
 	cr3 = rcr3();
@@ -1539,7 +1539,7 @@
 int
 mp_grab_cpu_hlt(void)
 {
-	u_int mask = PCPU_GET(cpumask);
+	cpumask_t mask = PCPU_GET(cpumask);
 #ifdef MP_WATCHDOG
 	u_int cpuid = PCPU_GET(cpuid);
 #endif
@@ -1549,9 +1549,11 @@
 	ap_watchdog(cpuid);
 #endif
 
-	retval = mask & hlt_cpus_mask;
-	while (mask & hlt_cpus_mask)
+	retval = 0;
+	while (mask & hlt_cpus_mask) {
+		retval = 1;
 		__asm __volatile("sti; hlt" : : : "memory");
+	}
 	return (retval);
 }
 

==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#109 (text+ko) ====

@@ -926,8 +926,8 @@
 void
 pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
 {
-	u_int cpumask;
-	u_int other_cpus;
+	cpumask_t cpumask;
+	cpumask_t other_cpus;
 
 	sched_pin();
 	if (pmap == kernel_pmap || pmap->pm_active == all_cpus) {
@@ -947,8 +947,8 @@
 void
 pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
-	u_int cpumask;
-	u_int other_cpus;
+	cpumask_t cpumask;
+	cpumask_t other_cpus;
 	vm_offset_t addr;
 
 	sched_pin();
@@ -972,8 +972,8 @@
 void
 pmap_invalidate_all(pmap_t pmap)
 {
-	u_int cpumask;
-	u_int other_cpus;
+	cpumask_t cpumask;
+	cpumask_t other_cpus;
 
 	sched_pin();
 	if (pmap == kernel_pmap || pmap->pm_active == all_cpus) {

==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#49 (text+ko) ====

@@ -528,7 +528,8 @@
 cpu_reset()
 {
 #ifdef SMP
-	u_int cnt, map;
+	cpumask_t map;
+	u_int cnt;
 
 	disable_intr();
 	if (smp_active) {

==== //depot/projects/smpng/sys/arm/include/pmap.h#30 (text+ko) ====

@@ -136,7 +136,7 @@
 	pd_entry_t		*pm_pdir;	/* KVA of page directory */
 	uint32_t		pm_gen_count;	/* generation count (pmap lock dropped) */
 	u_int			pm_retries;
-	int			pm_active;	/* active on cpus */
+	cpumask_t			pm_active;	/* active on cpus */
 	struct pmap_statistics	pm_stats;	/* pmap statictics */
 	TAILQ_HEAD(,pv_entry)	pm_pvlist;	/* list of mappings in pmap */
 };

==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#128 (text+ko) ====

@@ -1593,7 +1593,7 @@
 int
 mp_grab_cpu_hlt(void)
 {
-	u_int mask = PCPU_GET(cpumask);
+	cpumask_t mask = PCPU_GET(cpumask);
 #ifdef MP_WATCHDOG
 	u_int cpuid = PCPU_GET(cpuid);
 #endif
@@ -1603,9 +1603,11 @@
 	ap_watchdog(cpuid);
 #endif
 
-	retval = mask & hlt_cpus_mask;
-	while (mask & hlt_cpus_mask)
+	retval = 0;
+	while (mask & hlt_cpus_mask) {
+		retval = 1;
 		__asm __volatile("sti; hlt" : : : "memory");
+	}
 	return (retval);
 }
 

==== //depot/projects/smpng/sys/i386/i386/pmap.c#148 (text+ko) ====

@@ -949,8 +949,8 @@
 void
 pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
 {
-	u_int cpumask;
-	u_int other_cpus;
+	cpumask_t cpumask;
+	cpumask_t other_cpus;
 
 	sched_pin();
 	if (pmap == kernel_pmap || pmap->pm_active == all_cpus) {
@@ -970,8 +970,8 @@
 void
 pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
-	u_int cpumask;
-	u_int other_cpus;
+	cpumask_t cpumask;
+	cpumask_t other_cpus;
 	vm_offset_t addr;
 
 	sched_pin();
@@ -995,8 +995,8 @@
 void
 pmap_invalidate_all(pmap_t pmap)
 {
-	u_int cpumask;
-	u_int other_cpus;
+	cpumask_t cpumask;
+	cpumask_t other_cpus;
 
 	sched_pin();
 	if (pmap == kernel_pmap || pmap->pm_active == all_cpus) {

==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#98 (text+ko) ====

@@ -597,7 +597,8 @@
 #endif
 
 #ifdef SMP
-	u_int cnt, map;
+	cpumask_t map;
+	u_int map;
 
 	disable_intr();
 	if (smp_active) {

==== //depot/projects/smpng/sys/i386/xen/pmap.c#17 (text+ko) ====

@@ -863,8 +863,8 @@
 void
 pmap_invalidate_page(pmap_t pmap, vm_offset_t va)
 {
-	u_int cpumask;
-	u_int other_cpus;
+	cpumask_t cpumask;
+	cpumask_t other_cpus;
 
 	CTR2(KTR_PMAP, "pmap_invalidate_page: pmap=%p va=0x%x",
 	    pmap, va);
@@ -888,8 +888,8 @@
 void
 pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva)
 {
-	u_int cpumask;
-	u_int other_cpus;
+	cpumask_t cpumask;
+	cpumask_t other_cpus;
 	vm_offset_t addr;
 
 	CTR3(KTR_PMAP, "pmap_invalidate_page: pmap=%p eva=0x%x sva=0x%x",
@@ -917,8 +917,8 @@
 void
 pmap_invalidate_all(pmap_t pmap)
 {
-	u_int cpumask;
-	u_int other_cpus;
+	cpumask_t cpumask;
+	cpumask_t other_cpus;
 
 	CTR1(KTR_PMAP, "pmap_invalidate_page: pmap=%p", pmap);
 

==== //depot/projects/smpng/sys/mips/include/pmap.h#13 (text+ko) ====

@@ -81,7 +81,7 @@
 						 * pmap */
 	uint32_t	pm_gen_count;	/* generation count (pmap lock dropped) */
 	u_int		pm_retries;
-	int pm_active;		/* active on cpus */
+	cpumask_t	pm_active;		/* active on cpus */
 	struct {
 		u_int32_t asid:ASID_BITS;	/* TLB address space tag */
 		u_int32_t gen:ASIDGEN_BITS;	/* its generation number */

==== //depot/projects/smpng/sys/powerpc/include/pmap.h#28 (text+ko) ====

@@ -99,7 +99,7 @@
     #else
 	register_t	pm_sr[16];
     #endif
-	u_int		pm_active;
+	cpumask_t	pm_active;
 	uint32_t	pm_gen_count;	/* generation count (pmap lock dropped) */
 	u_int		pm_retries;
 
@@ -153,7 +153,7 @@
 struct pmap {
 	struct mtx		pm_mtx;		/* pmap mutex */
 	tlbtid_t		pm_tid[MAXCPU];	/* TID to identify this pmap entries in TLB */
-	u_int			pm_active;	/* active on cpus */
+	cpumask_t		pm_active;	/* active on cpus */
 	int			pm_refs;	/* ref count */
 	struct pmap_statistics	pm_stats;	/* pmap statistics */
 

==== //depot/projects/smpng/sys/sparc64/include/pmap.h#37 (text+ko) ====

@@ -61,7 +61,7 @@
 	struct	mtx pm_mtx;
 	struct	tte *pm_tsb;
 	vm_object_t pm_tsb_obj;
-	u_int	pm_active;
+	cpumask_t	pm_active;
 	uint32_t	pm_gen_count;	/* generation count (pmap lock dropped) */
 	u_int			pm_retries;
 	u_int	pm_context[MAXCPU];

==== //depot/projects/smpng/sys/sparc64/include/smp.h#28 (text+ko) ====

@@ -77,12 +77,12 @@
 };
 
 struct ipi_cache_args {
-	u_int	ica_mask;
+	cpumask_t ica_mask;
 	vm_paddr_t ica_pa;
 };
 
 struct ipi_tlb_args {
-	u_int	ita_mask;
+	cpumask_t ita_mask;
 	struct	pmap *ita_pmap;
 	u_long	ita_start;
 	u_long	ita_end;
@@ -184,7 +184,7 @@
 ipi_tlb_context_demap(struct pmap *pm)
 {
 	struct ipi_tlb_args *ita;
-	u_int cpus;
+	cpumask_t cpus;
 
 	if (smp_cpus == 1)
 		return (NULL);
@@ -206,7 +206,7 @@
 ipi_tlb_page_demap(struct pmap *pm, vm_offset_t va)
 {
 	struct ipi_tlb_args *ita;
-	u_int cpus;
+	cpumask_t cpus;
 
 	if (smp_cpus == 1)
 		return (NULL);
@@ -228,7 +228,7 @@
 ipi_tlb_range_demap(struct pmap *pm, vm_offset_t start, vm_offset_t end)
 {
 	struct ipi_tlb_args *ita;
-	u_int cpus;
+	cpumask_t cpus;
 
 	if (smp_cpus == 1)
 		return (NULL);
@@ -250,7 +250,7 @@
 static __inline void
 ipi_wait(void *cookie)
 {
-	volatile u_int *mask;
+	volatile cpumask_t *mask;
 
 	if ((mask = cookie) != NULL) {
 		atomic_clear_int(mask, PCPU_GET(cpumask));

==== //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#42 (text+ko) ====

@@ -119,7 +119,7 @@
 static vm_offset_t mp_tramp;
 static u_int cpuid_to_mid[MAXCPU];
 static int isjbus;
-static volatile u_int shutdown_cpus;
+static volatile cpumask_t shutdown_cpus;
 
 static void ap_count(phandle_t node, u_int mid, u_int cpu_impl);
 static void ap_start(phandle_t node, u_int mid, u_int cpu_impl);

==== //depot/projects/smpng/sys/sun4v/include/smp.h#11 (text+ko) ====

@@ -59,12 +59,12 @@
 };
 
 struct ipi_cache_args {
-	u_int	ica_mask;
+	cpumask_t ica_mask;
 	vm_paddr_t ica_pa;
 };
 
 struct ipi_tlb_args {
-	u_int	ita_mask;
+	cpumask_t ita_mask;
 	struct	pmap *ita_pmap;
 	u_long	ita_start;
 	u_long	ita_end;

==== //depot/projects/smpng/sys/sun4v/sun4v/mp_machdep.c#13 (text+ko) ====

@@ -115,7 +115,7 @@
 
 u_int	mp_boot_mid;
 
-static volatile u_int	shutdown_cpus;
+static volatile cpumask_t	shutdown_cpus;
 
 void cpu_mp_unleash(void *);
 SYSINIT(cpu_mp_unleash, SI_SUB_SMP, SI_ORDER_FIRST, cpu_mp_unleash, NULL);

==== //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#22 (text+ko) ====

@@ -1451,7 +1451,7 @@
 {
 
 	int i, cpu_count, retried;
-	u_int cpus;
+	cpumask_t cpus;
 	cpumask_t cpumask, active, curactive;
 	cpumask_t active_total, ackmask;
 	uint16_t *cpulist;

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:14 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 93691106639A; Wed, 11 Aug 2010 18:26:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 469B71065EC6
	for ; Wed, 11 Aug 2010 18:26:08 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id A26B18FC1B
	for ; Wed, 11 Aug 2010 18:26:07 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQ7tj084340
	for ; Wed, 11 Aug 2010 18:26:07 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQ7J8084334
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:07 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 11 Aug 2010 18:26:07 GMT
Message-Id: <201008111826.o7BIQ7J8084334@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182192 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:14 -0000

http://p4web.freebsd.org/@@182192?ac=10

Change 182192 by jhb@jhb_jhbbsd on 2010/08/10 15:52:55

	IFC @182191

Affected files ...

.. //depot/projects/smpng/share/man/man9/mbuf.9#2 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#68 integrate
.. //depot/projects/smpng/sys/amd64/amd64/tsc.c#9 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#30 integrate
.. //depot/projects/smpng/sys/boot/zfs/zfsimpl.c#9 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#13 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32.h#11 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#70 integrate
.. //depot/projects/smpng/sys/compat/x86bios/x86bios.c#8 integrate
.. //depot/projects/smpng/sys/conf/files#264 integrate
.. //depot/projects/smpng/sys/conf/files.i386#138 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#14 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/common/dmextern.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.h#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslglobal.h#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslmain.c#11 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslstartup.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbcmds.c#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/debugger/dbinput.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/events/evxfevnt.c#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exfldio.c#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/executer/exprep.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdebug.h#5 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acdisasm.h#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acglobal.h#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/aclocal.h#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acobject.h#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpiosxf.h#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acpixf.h#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/actypes.h#7 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/include/acutils.h#6 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#12 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/uteval.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utglobal.c#8 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utinit.c#4 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utmutex.c#3 integrate
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utosi.c#1 branch
.. //depot/projects/smpng/sys/contrib/dev/acpica/utilities/utxface.c#4 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#25 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdMemory.c#14 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#53 integrate
.. //depot/projects/smpng/sys/dev/alc/if_alc.c#8 integrate
.. //depot/projects/smpng/sys/dev/alc/if_alcreg.h#3 integrate
.. //depot/projects/smpng/sys/dev/alc/if_alcvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar5416.ini#3 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#89 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_igb.c#24 integrate
.. //depot/projects/smpng/sys/dev/fb/vesa.c#10 integrate
.. //depot/projects/smpng/sys/dev/iicbus/iic.h#6 integrate
.. //depot/projects/smpng/sys/dev/iscsi/initiator/isc_cam.c#5 integrate
.. //depot/projects/smpng/sys/dev/iscsi/initiator/isc_sm.c#4 integrate
.. //depot/projects/smpng/sys/dev/iscsi/initiator/isc_soc.c#6 integrate
.. //depot/projects/smpng/sys/dev/iscsi/initiator/isc_subr.c#4 integrate
.. //depot/projects/smpng/sys/dev/iscsi/initiator/iscsi.c#5 integrate
.. //depot/projects/smpng/sys/dev/iscsi/initiator/iscsi.h#3 integrate
.. //depot/projects/smpng/sys/dev/iscsi/initiator/iscsi_subr.c#3 integrate
.. //depot/projects/smpng/sys/dev/iscsi/initiator/iscsivar.h#3 integrate
.. //depot/projects/smpng/sys/dev/mii/atphy.c#4 integrate
.. //depot/projects/smpng/sys/dev/mii/e1000phy.c#25 integrate
.. //depot/projects/smpng/sys/dev/mii/miidevs#42 integrate
.. //depot/projects/smpng/sys/dev/ste/if_ste.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#15 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#156 integrate
.. //depot/projects/smpng/sys/fs/coda/coda.h#3 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_venus.c#6 integrate
.. //depot/projects/smpng/sys/fs/coda/coda_vnops.c#10 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#129 integrate
.. //depot/projects/smpng/sys/i386/i386/tsc.c#15 integrate
.. //depot/projects/smpng/sys/ia64/ia32/ia32_signal.c#7 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#88 integrate
.. //depot/projects/smpng/sys/kern/kern_cons.c#4 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#83 integrate
.. //depot/projects/smpng/sys/kern/kern_ktrace.c#72 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#63 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#138 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#132 integrate
.. //depot/projects/smpng/sys/kern/vfs_cluster.c#52 integrate
.. //depot/projects/smpng/sys/mips/include/cpuregs.h#6 integrate
.. //depot/projects/smpng/sys/mips/include/pte.h#6 integrate
.. //depot/projects/smpng/sys/mips/mips/locore.S#6 integrate
.. //depot/projects/smpng/sys/mips/mips/mpboot.S#4 integrate
.. //depot/projects/smpng/sys/mips/mips/pmap.c#22 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi/Makefile#25 integrate
.. //depot/projects/smpng/sys/modules/x86bios/Makefile#3 integrate
.. //depot/projects/smpng/sys/netinet/ip_carp.c#42 integrate
.. //depot/projects/smpng/sys/netinet/libalias/alias_db.c#12 integrate
.. //depot/projects/smpng/sys/netinet6/in6_proto.c#37 integrate
.. //depot/projects/smpng/sys/sparc64/include/cache.h#17 integrate
.. //depot/projects/smpng/sys/sparc64/include/smp.h#29 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/cache.c#20 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#49 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#19 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.S#8 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#43 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#89 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/tick.c#26 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/uio_machdep.c#7 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#56 integrate
.. //depot/projects/smpng/sys/teken/teken_subr.h#5 integrate

Differences ...

==== //depot/projects/smpng/share/man/man9/mbuf.9#2 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.67 2008/03/25 09:39:02 ru Exp $
+.\" $FreeBSD: src/share/man/man9/mbuf.9,v 1.68 2010/08/07 13:26:08 des Exp $
 .\"
-.Dd March 25, 2008
+.Dd August 7, 2010
 .Dt MBUF 9
 .Os
 .\"
@@ -211,7 +211,7 @@
 #define	M_EOR		0x0004	/* end of record */
 #define	M_RDONLY	0x0008	/* associated data marked read-only */
 #define	M_PROTO1	0x0010	/* protocol-specific */
-#define	M_PROTO2	0x0020 	/* protocol-specific */
+#define	M_PROTO2	0x0020	/* protocol-specific */
 #define	M_PROTO3	0x0040	/* protocol-specific */
 #define	M_PROTO4	0x0080	/* protocol-specific */
 #define	M_PROTO5	0x0100	/* protocol-specific */
@@ -238,6 +238,22 @@
 #define	MT_OOBDATA	15	/* expedited data */
 .Ed
 .Pp
+The available external buffer types are defined as follows:
+.Bd -literal
+/* external buffer types */
+#define EXT_CLUSTER	1	/* mbuf cluster */
+#define EXT_SFBUF	2	/* sendfile(2)'s sf_bufs */
+#define EXT_JUMBOP	3	/* jumbo cluster 4096 bytes */
+#define EXT_JUMBO9	4	/* jumbo cluster 9216 bytes */
+#define EXT_JUMBO16	5	/* jumbo cluster 16184 bytes */
+#define EXT_PACKET	6	/* mbuf+cluster from packet zone */
+#define EXT_MBUF	7	/* external mbuf reference (M_IOVEC) */
+#define EXT_NET_DRV	100	/* custom ext_buf provided by net driver(s) */
+#define EXT_MOD_TYPE	200	/* custom module's ext_buf type */
+#define EXT_DISPOSABLE	300	/* can throw this buffer away w/page flipping */
+#define EXT_EXTREF	400	/* has externally maintained ref_cnt ptr */
+.Ed
+.Pp
 If the
 .Dv M_PKTHDR
 flag is set, a
@@ -383,6 +399,43 @@
 See
 .Fn MGET
 for details.
+.It Fn MEXTADD mbuf buf size free opt_arg1 opt_arg2 flags type
+Associate externally managed data with
+.Fa mbuf .
+Any internal data contained in the mbuf will be discarded, and the
+.Dv M_EXT flag will be set.
+The
+.Fa buf
+and
+.Fa size
+arguments are the address and length, respectively, of the data.
+The
+.Fa free
+argument points to a function which will be called to free the data
+when the mbuf is freed; it is only used if
+.Fa type
+is
+.Dv EXT_EXTREF .
+The
+.Fa opt_arg1
+and
+.Fa opt_arg2
+arguments will be passed unmodified to
+.Fa free .
+The
+.Fa flags
+argument specifies additional
+.Vt mbuf
+flags; it is not necessary to specify
+.Dv M_EXT .
+Finally, the
+.Fa type
+argument specifies the type of external data, which controls how it
+will be disposed of when the
+.Vt mbuf
+is freed.
+In most cases, the correct value is
+.Dv EXT_EXTREF .
 .It Fn MCLGET mbuf how
 Allocate and attach an
 .Vt mbuf cluster

==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#68 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.322 2010/08/06 15:36:59 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.323 2010/08/09 20:25:06 attilio Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -1087,6 +1087,30 @@
 	mtx_unlock_spin(&smp_ipi_mtx);
 }
 
+/*
+ * Send an IPI to specified CPU handling the bitmap logic.
+ */
+static void
+ipi_send_cpu(int cpu, u_int ipi)
+{
+	u_int bitmap, old_pending, new_pending;
+
+	KASSERT(cpu_apic_ids[cpu] != -1, ("IPI to non-existent CPU %d", cpu));
+
+	if (IPI_IS_BITMAPED(ipi)) {
+		bitmap = 1 << ipi;
+		ipi = IPI_BITMAP_VECTOR;
+		do {
+			old_pending = cpu_ipi_pending[cpu];
+			new_pending = old_pending | bitmap;
+		} while  (!atomic_cmpset_int(&cpu_ipi_pending[cpu],
+		    old_pending, new_pending)); 
+		if (old_pending)
+			return;
+	}
+	lapic_ipi_vectored(ipi, cpu_apic_ids[cpu]);
+}
+
 void
 smp_cache_flush(void)
 {
@@ -1210,14 +1234,6 @@
 ipi_selected(cpumask_t cpus, u_int ipi)
 {
 	int cpu;
-	u_int bitmap = 0;
-	u_int old_pending;
-	u_int new_pending;
-
-	if (IPI_IS_BITMAPED(ipi)) { 
-		bitmap = 1 << ipi;
-		ipi = IPI_BITMAP_VECTOR;
-	}
 
 	/*
 	 * IPI_STOP_HARD maps to a NMI and the trap handler needs a bit
@@ -1231,20 +1247,7 @@
 	while ((cpu = ffs(cpus)) != 0) {
 		cpu--;
 		cpus &= ~(1 << cpu);
-
-		KASSERT(cpu_apic_ids[cpu] != -1,
-		    ("IPI to non-existent CPU %d", cpu));
-
-		if (bitmap) {
-			do {
-				old_pending = cpu_ipi_pending[cpu];
-				new_pending = old_pending | bitmap;
-			} while  (!atomic_cmpset_int(&cpu_ipi_pending[cpu],
-			    old_pending, new_pending));	
-			if (old_pending)
-				continue;
-		}
-		lapic_ipi_vectored(ipi, cpu_apic_ids[cpu]);
+		ipi_send_cpu(cpu, ipi);
 	}
 }
 
@@ -1254,15 +1257,7 @@
 void
 ipi_cpu(int cpu, u_int ipi)
 {
-	u_int bitmap = 0;
-	u_int old_pending;
-	u_int new_pending;
 
-	if (IPI_IS_BITMAPED(ipi)) { 
-		bitmap = 1 << ipi;
-		ipi = IPI_BITMAP_VECTOR;
-	}
-
 	/*
 	 * IPI_STOP_HARD maps to a NMI and the trap handler needs a bit
 	 * of help in order to understand what is the source.
@@ -1272,18 +1267,7 @@
 		atomic_set_int(&ipi_nmi_pending, 1 << cpu);
 
 	CTR3(KTR_SMP, "%s: cpu: %d ipi: %x", __func__, cpu, ipi);
-	KASSERT(cpu_apic_ids[cpu] != -1, ("IPI to non-existent CPU %d", cpu));
-
-	if (bitmap) {
-		do {
-			old_pending = cpu_ipi_pending[cpu];
-			new_pending = old_pending | bitmap;
-		} while  (!atomic_cmpset_int(&cpu_ipi_pending[cpu],
-		    old_pending, new_pending));	
-		if (old_pending)
-			return;
-	}
-	lapic_ipi_vectored(ipi, cpu_apic_ids[cpu]);
+	ipi_send_cpu(cpu, ipi);
 }
 
 /*

==== //depot/projects/smpng/sys/amd64/amd64/tsc.c#9 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.209 2008/10/21 00:38:00 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/tsc.c,v 1.210 2010/08/08 20:34:53 dwmalone Exp $");
 
 #include "opt_clock.h"
 
@@ -222,7 +222,7 @@
 }
 
 SYSCTL_PROC(_machdep, OID_AUTO, tsc_freq, CTLTYPE_QUAD | CTLFLAG_RW,
-    0, sizeof(u_int), sysctl_machdep_tsc_freq, "QU", "");
+    0, 0, sysctl_machdep_tsc_freq, "QU", "");
 
 static unsigned
 tsc_get_timecount(struct timecounter *tc)

==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#30 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.30 2010/06/30 18:03:42 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.31 2010/08/07 11:57:13 kib Exp $");
 
 #include "opt_compat.h"
 
@@ -391,7 +391,7 @@
 	}
 
 	regs->tf_rsp = (uintptr_t)sfp;
-	regs->tf_rip = FREEBSD32_PS_STRINGS - sz_freebsd4_ia32_sigcode;
+	regs->tf_rip = p->p_sysent->sv_psstrings - sz_freebsd4_ia32_sigcode;
 	regs->tf_rflags &= ~(PSL_T | PSL_D);
 	regs->tf_cs = _ucode32sel;
 	regs->tf_ss = _udatasel;
@@ -512,7 +512,7 @@
 	}
 
 	regs->tf_rsp = (uintptr_t)sfp;
-	regs->tf_rip = FREEBSD32_PS_STRINGS - *(p->p_sysent->sv_szsigcode);
+	regs->tf_rip = p->p_sysent->sv_psstrings - *(p->p_sysent->sv_szsigcode);
 	regs->tf_rflags &= ~(PSL_T | PSL_D);
 	regs->tf_cs = _ucode32sel;
 	regs->tf_ss = _udatasel;

==== //depot/projects/smpng/sys/boot/zfs/zfsimpl.c#9 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.10 2010/05/28 07:34:20 avg Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.11 2010/08/09 06:36:11 mm Exp $");
 
 /*
  *	Stand-alone ZFS file reader.
@@ -328,6 +328,9 @@
 	size_t psize;
 	int rc;
 
+	if (!vdev->v_phys_read)
+		return (EIO);
+
 	if (bp) {
 		psize = BP_GET_PSIZE(bp);
 	} else {

==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#13 (text+ko) ====

@@ -357,7 +357,7 @@
 			 * quota on things *under* (ie. contained by)
 			 * the thing they own.
 			 */
-			if (dsl_prop_get_integer(name, "zoned", &zoned,
+			if (dsl_prop_get_integer(name, "jailed", &zoned,
 			    setpoint))
 				return (EPERM);
 			if (!zoned || strlen(name) <= strlen(setpoint))

==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32.h#11 (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/compat/freebsd32/freebsd32.h,v 1.13 2010/04/21 19:32:00 kib Exp $
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32.h,v 1.14 2010/08/07 11:53:38 kib Exp $
  */
 
 #ifndef _COMPAT_FREEBSD32_FREEBSD32_H_
@@ -157,6 +157,24 @@
 	unsigned int :(8 / 2) * (16 - (int)sizeof(struct timespec32));
 };
 
+struct ostat32 {
+	__uint16_t st_dev;
+	ino_t	st_ino;
+	mode_t	st_mode;
+	nlink_t	st_nlink;
+	__uint16_t st_uid;
+	__uint16_t st_gid;
+	__uint16_t st_rdev;
+	__int32_t st_size;
+	struct timespec32 st_atim;
+	struct timespec32 st_mtim;
+	struct timespec32 st_ctim;
+	__int32_t st_blksize;
+	__int32_t st_blocks;
+	u_int32_t st_flags;
+	__uint32_t st_gen;
+};
+
 struct jail32_v0 {
 	u_int32_t	version;
 	uint32_t	path;

==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#70 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.113 2010/08/04 14:38:20 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.114 2010/08/07 11:57:13 kib Exp $");
 
 #include "opt_compat.h"
 #include "opt_inet.h"
@@ -2541,7 +2541,8 @@
 		execpath_len = strlen(imgp->execpath) + 1;
 	else
 		execpath_len = 0;
-	arginfo = (struct freebsd32_ps_strings *)FREEBSD32_PS_STRINGS;
+	arginfo = (struct freebsd32_ps_strings *)curproc->p_sysent->
+	    sv_psstrings;
 	szsigcode = *(imgp->proc->p_sysent->sv_szsigcode);
 	destp =	(caddr_t)arginfo - szsigcode - SPARE_USRSPACE -
 		roundup(execpath_len, sizeof(char *)) -

==== //depot/projects/smpng/sys/compat/x86bios/x86bios.c#8 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/sys/compat/x86bios/x86bios.c,v 1.23 2010/08/06 15:24:37 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/x86bios/x86bios.c,v 1.30 2010/08/10 15:22:48 jkim Exp $");
 
 #include "opt_x86bios.h"
 
@@ -58,6 +58,13 @@
 
 #define	X86BIOS_MEM_SIZE	0x00100000	/* 1M */
 
+#define	X86BIOS_TRACE(h, n, r)	do {					\
+	printf(__STRING(h)						\
+	    " (ax=0x%04x bx=0x%04x cx=0x%04x dx=0x%04x es=0x%04x di=0x%04x)\n",\
+	    (n), (r)->R_AX, (r)->R_BX, (r)->R_CX, (r)->R_DX,		\
+	    (r)->R_ES, (r)->R_DI);					\
+} while (0)
+
 static struct mtx x86bios_lock;
 
 SYSCTL_NODE(_debug, OID_AUTO, x86bios, CTLFLAG_RD, NULL, "x86bios debugging");
@@ -112,44 +119,49 @@
 void *
 x86bios_alloc(uint32_t *offset, size_t size, int flags)
 {
-	vm_offset_t addr;
+	void *vaddr;
 	int i;
 
-	addr = (vm_offset_t)contigmalloc(size, M_DEVBUF, flags, 0,
-	    X86BIOS_MEM_SIZE, PAGE_SIZE, 0);
-	if (addr != 0) {
-		*offset = vtophys(addr);
+	if (offset == NULL || size == 0)
+		return (NULL);
+	vaddr = contigmalloc(size, M_DEVBUF, flags, 0, X86BIOS_MEM_SIZE,
+	    PAGE_SIZE, 0);
+	if (vaddr != NULL) {
+		*offset = vtophys(vaddr);
 		mtx_lock(&x86bios_lock);
 		for (i = 0; i < atop(round_page(size)); i++)
 			vm86_addpage(&x86bios_vmc, atop(*offset) + i,
-			    addr + ptoa(i));
+			    (vm_offset_t)vaddr + ptoa(i));
 		mtx_unlock(&x86bios_lock);
 	}
 
-	return ((void *)addr);
+	return (vaddr);
 }
 
 void
 x86bios_free(void *addr, size_t size)
 {
-	int i, last;
+	vm_paddr_t paddr;
+	int i, nfree;
 
+	if (addr == NULL || size == 0)
+		return;
+	paddr = vtophys(addr);
+	if (paddr >= X86BIOS_MEM_SIZE || (paddr & PAGE_MASK) != 0)
+		return;
 	mtx_lock(&x86bios_lock);
-	for (i = 0, last = -1; i < x86bios_vmc.npages; i++)
-		if (x86bios_vmc.pmap[i].kva >= (vm_offset_t)addr &&
-		    x86bios_vmc.pmap[i].kva < (vm_offset_t)addr + size) {
-			bzero(&x86bios_vmc.pmap[i],
-			    sizeof(x86bios_vmc.pmap[i]));
-			last = i;
-		}
-	if (last < 0) {
+	for (i = 0; i < x86bios_vmc.npages; i++)
+		if (x86bios_vmc.pmap[i].kva == (vm_offset_t)addr)
+			break;
+	if (i >= x86bios_vmc.npages) {
 		mtx_unlock(&x86bios_lock);
 		return;
 	}
-	if (last == x86bios_vmc.npages - 1) {
-		x86bios_vmc.npages -= atop(round_page(size));
-		for (i = x86bios_vmc.npages - 1;
-		    i >= 0 && x86bios_vmc.pmap[i].kva == 0; i--)
+	nfree = atop(round_page(size));
+	bzero(x86bios_vmc.pmap + i, sizeof(*x86bios_vmc.pmap) * nfree);
+	if (i + nfree == x86bios_vmc.npages) {
+		x86bios_vmc.npages -= nfree;
+		while (--i >= 0 && x86bios_vmc.pmap[i].kva == 0)
 			x86bios_vmc.npages--;
 	}
 	mtx_unlock(&x86bios_lock);
@@ -169,10 +181,7 @@
 	struct vm86frame vmf;
 
 	if (x86bios_trace_call)
-		printf("Calling 0x%05x (ax=0x%04x bx=0x%04x "
-		    "cx=0x%04x dx=0x%04x es=0x%04x di=0x%04x)\n",
-		    (seg << 4) + off, regs->R_AX, regs->R_BX, regs->R_CX,
-		    regs->R_DX, regs->R_ES, regs->R_DI);
+		X86BIOS_TRACE(Calling 0x%06x, (seg << 4) + off, regs);
 
 	bzero(&vmf, sizeof(vmf));
 	x86bios_emu2vmf((struct x86emu_regs *)regs, &vmf);
@@ -184,17 +193,14 @@
 	x86bios_vmf2emu(&vmf, (struct x86emu_regs *)regs);
 
 	if (x86bios_trace_call)
-		printf("Exiting 0x%05x (ax=0x%04x bx=0x%04x "
-		    "cx=0x%04x dx=0x%04x es=0x%04x di=0x%04x)\n",
-		    (seg << 4) + off, regs->R_AX, regs->R_BX, regs->R_CX,
-		    regs->R_DX, regs->R_ES, regs->R_DI);
+		X86BIOS_TRACE(Exiting 0x%06x, (seg << 4) + off, regs);
 }
 
 uint32_t
 x86bios_get_intr(int intno)
 {
 
-	return (readl(x86bios_offset(intno * 4)));
+	return (readl(BIOS_PADDRTOVADDR(intno * 4)));
 }
 
 void
@@ -203,10 +209,7 @@
 	struct vm86frame vmf;
 
 	if (x86bios_trace_int)
-		printf("Calling int 0x%x (ax=0x%04x bx=0x%04x "
-		    "cx=0x%04x dx=0x%04x es=0x%04x di=0x%04x)\n",
-		    intno, regs->R_AX, regs->R_BX, regs->R_CX,
-		    regs->R_DX, regs->R_ES, regs->R_DI);
+		X86BIOS_TRACE(Calling INT 0x%02x, intno, regs);
 
 	bzero(&vmf, sizeof(vmf));
 	x86bios_emu2vmf((struct x86emu_regs *)regs, &vmf);
@@ -216,10 +219,7 @@
 	x86bios_vmf2emu(&vmf, (struct x86emu_regs *)regs);
 
 	if (x86bios_trace_int)
-		printf("Exiting int 0x%x (ax=0x%04x bx=0x%04x "
-		    "cx=0x%04x dx=0x%04x es=0x%04x di=0x%04x)\n",
-		    intno, regs->R_AX, regs->R_BX, regs->R_CX,
-		    regs->R_DX, regs->R_ES, regs->R_DI);
+		X86BIOS_TRACE(Exiting INT 0x%02x, intno, regs);
 }
 
 void *
@@ -266,7 +266,7 @@
 #define	X86BIOS_RAM_BASE	0x00001000
 #define	X86BIOS_ROM_BASE	0x000a0000
 
-#define	X86BIOS_ROM_SIZE	(X86BIOS_MEM_SIZE - (uint32_t)x86bios_rom_phys)
+#define	X86BIOS_ROM_SIZE	(X86BIOS_MEM_SIZE - x86bios_rom_phys)
 #define	X86BIOS_SEG_SIZE	X86BIOS_PAGE_SIZE
 
 #define	X86BIOS_PAGES		(X86BIOS_MEM_SIZE / X86BIOS_PAGE_SIZE)
@@ -424,10 +424,12 @@
 x86bios_emu_inb(struct x86emu *emu, uint16_t port)
 {
 
+#ifndef X86BIOS_NATIVE_ARCH
 	if (port == 0xb2) /* APM scratch register */
 		return (0);
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return (0);
+#endif
 
 	return (iodev_read_1(port));
 }
@@ -437,10 +439,10 @@
 {
 	uint16_t val;
 
+#ifndef X86BIOS_NATIVE_ARCH
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return (0);
 
-#ifndef X86BIOS_NATIVE_ARCH
 	if ((port & 1) != 0) {
 		val = iodev_read_1(port);
 		val |= iodev_read_1(port + 1) << 8;
@@ -456,10 +458,10 @@
 {
 	uint32_t val;
 
+#ifndef X86BIOS_NATIVE_ARCH
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return (0);
 
-#ifndef X86BIOS_NATIVE_ARCH
 	if ((port & 1) != 0) {
 		val = iodev_read_1(port);
 		val |= iodev_read_2(port + 1) << 8;
@@ -478,10 +480,12 @@
 x86bios_emu_outb(struct x86emu *emu, uint16_t port, uint8_t val)
 {
 
+#ifndef X86BIOS_NATIVE_ARCH
 	if (port == 0xb2) /* APM scratch register */
 		return;
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return;
+#endif
 
 	iodev_write_1(port, val);
 }
@@ -490,10 +494,10 @@
 x86bios_emu_outw(struct x86emu *emu, uint16_t port, uint16_t val)
 {
 
+#ifndef X86BIOS_NATIVE_ARCH
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return;
 
-#ifndef X86BIOS_NATIVE_ARCH
 	if ((port & 1) != 0) {
 		iodev_write_1(port, val);
 		iodev_write_1(port + 1, val >> 8);
@@ -506,10 +510,10 @@
 x86bios_emu_outl(struct x86emu *emu, uint16_t port, uint32_t val)
 {
 
+#ifndef X86BIOS_NATIVE_ARCH
 	if (port >= 0x80 && port < 0x88) /* POST status register */
 		return;
 
-#ifndef X86BIOS_NATIVE_ARCH
 	if ((port & 1) != 0) {
 		iodev_write_1(port, val);
 		iodev_write_2(port + 1, val >> 8);
@@ -548,12 +552,13 @@
 
 	if (offset == NULL || size == 0)
 		return (NULL);
-
 	vaddr = contigmalloc(size, M_DEVBUF, flags, X86BIOS_RAM_BASE,
 	    x86bios_rom_phys, X86BIOS_PAGE_SIZE, 0);
 	if (vaddr != NULL) {
 		*offset = vtophys(vaddr);
+		mtx_lock(&x86bios_lock);
 		x86bios_set_pages((vm_offset_t)vaddr, *offset, size);
+		mtx_unlock(&x86bios_lock);
 	}
 
 	return (vaddr);
@@ -566,14 +571,14 @@
 
 	if (addr == NULL || size == 0)
 		return;
-
 	paddr = vtophys(addr);
 	if (paddr < X86BIOS_RAM_BASE || paddr >= x86bios_rom_phys ||
 	    paddr % X86BIOS_PAGE_SIZE != 0)
 		return;
-
+	mtx_lock(&x86bios_lock);
 	bzero(x86bios_map + paddr / X86BIOS_PAGE_SIZE,
 	    sizeof(*x86bios_map) * howmany(size, X86BIOS_PAGE_SIZE));
+	mtx_unlock(&x86bios_lock);
 	contigfree(addr, size, M_DEVBUF);
 }
 
@@ -590,29 +595,22 @@
 x86bios_call(struct x86regs *regs, uint16_t seg, uint16_t off)
 {
 
-	if (x86bios_map == NULL)
-		return;
-
 	if (x86bios_trace_call)
-		printf("Calling 0x%05x (ax=0x%04x bx=0x%04x "
-		    "cx=0x%04x dx=0x%04x es=0x%04x di=0x%04x)\n",
-		    (seg << 4) + off, regs->R_AX, regs->R_BX, regs->R_CX,
-		    regs->R_DX, regs->R_ES, regs->R_DI);
+		X86BIOS_TRACE(Calling 0x%06x, (seg << 4) + off, regs);
 
-	mtx_lock_spin(&x86bios_lock);
+	mtx_lock(&x86bios_lock);
 	memcpy(&x86bios_emu.x86, regs, sizeof(*regs));
 	x86bios_fault = 0;
+	spinlock_enter();
 	x86emu_exec_call(&x86bios_emu, seg, off);
+	spinlock_exit();
 	memcpy(regs, &x86bios_emu.x86, sizeof(*regs));
-	mtx_unlock_spin(&x86bios_lock);
+	mtx_unlock(&x86bios_lock);
 
 	if (x86bios_trace_call) {
-		printf("Exiting 0x%05x (ax=0x%04x bx=0x%04x "
-		    "cx=0x%04x dx=0x%04x es=0x%04x di=0x%04x)\n",
-		    (seg << 4) + off, regs->R_AX, regs->R_BX, regs->R_CX,
-		    regs->R_DX, regs->R_ES, regs->R_DI);
+		X86BIOS_TRACE(Exiting 0x%06x, (seg << 4) + off, regs);
 		if (x86bios_fault)
-			printf("Page fault at 0x%05x from 0x%04x:0x%04x.\n",
+			printf("Page fault at 0x%06x from 0x%04x:0x%04x.\n",
 			    x86bios_fault_addr, x86bios_fault_cs,
 			    x86bios_fault_ip);
 	}
@@ -635,29 +633,22 @@
 	if (intno < 0 || intno > 255)
 		return;
 
-	if (x86bios_map == NULL)
-		return;
-
 	if (x86bios_trace_int)
-		printf("Calling int 0x%x (ax=0x%04x bx=0x%04x "
-		    "cx=0x%04x dx=0x%04x es=0x%04x di=0x%04x)\n",
-		    intno, regs->R_AX, regs->R_BX, regs->R_CX,
-		    regs->R_DX, regs->R_ES, regs->R_DI);
+		X86BIOS_TRACE(Calling INT 0x%02x, intno, regs);
 
-	mtx_lock_spin(&x86bios_lock);
+	mtx_lock(&x86bios_lock);
 	memcpy(&x86bios_emu.x86, regs, sizeof(*regs));
 	x86bios_fault = 0;
+	spinlock_enter();
 	x86emu_exec_intr(&x86bios_emu, intno);
+	spinlock_exit();
 	memcpy(regs, &x86bios_emu.x86, sizeof(*regs));
-	mtx_unlock_spin(&x86bios_lock);
+	mtx_unlock(&x86bios_lock);
 
 	if (x86bios_trace_int) {
-		printf("Exiting int 0x%x (ax=0x%04x bx=0x%04x "
-		    "cx=0x%04x dx=0x%04x es=0x%04x di=0x%04x)\n",
-		    intno, regs->R_AX, regs->R_BX, regs->R_CX,
-		    regs->R_DX, regs->R_ES, regs->R_DI);
+		X86BIOS_TRACE(Exiting INT 0x%02x, intno, regs);
 		if (x86bios_fault)
-			printf("Page fault at 0x%05x from 0x%04x:0x%04x.\n",
+			printf("Page fault at 0x%06x from 0x%04x:0x%04x.\n",
 			    x86bios_fault_addr, x86bios_fault_cs,
 			    x86bios_fault_ip);
 	}
@@ -674,6 +665,7 @@
 x86bios_unmap_mem(void)
 {
 
+	free(x86bios_map, M_DEVBUF);
 	if (x86bios_ivt != NULL)
 #ifdef X86BIOS_NATIVE_ARCH
 		pmap_unmapdev((vm_offset_t)x86bios_ivt, X86BIOS_IVT_SIZE);
@@ -690,6 +682,9 @@
 x86bios_map_mem(void)
 {
 
+	x86bios_map = malloc(sizeof(*x86bios_map) * X86BIOS_PAGES, M_DEVBUF,
+	    M_WAITOK | M_ZERO);
+
 #ifdef X86BIOS_NATIVE_ARCH
 	x86bios_ivt = pmap_mapbios(X86BIOS_IVT_BASE, X86BIOS_IVT_SIZE);
 
@@ -721,22 +716,30 @@
 	    X86BIOS_RAM_BASE, x86bios_rom_phys, X86BIOS_PAGE_SIZE, 0);
 	x86bios_seg_phys = vtophys(x86bios_seg);
 
+	x86bios_set_pages((vm_offset_t)x86bios_ivt, X86BIOS_IVT_BASE,
+	    X86BIOS_IVT_SIZE);
+	x86bios_set_pages((vm_offset_t)x86bios_rom, x86bios_rom_phys,
+	    X86BIOS_ROM_SIZE);
+	x86bios_set_pages((vm_offset_t)x86bios_seg, x86bios_seg_phys,
+	    X86BIOS_SEG_SIZE);
+
 	if (bootverbose) {
-		printf("x86bios:   IVT 0x%06x-0x%06x at %p\n",
-		    X86BIOS_IVT_BASE, X86BIOS_IVT_SIZE + X86BIOS_IVT_BASE - 1,
+		printf("x86bios:  IVT 0x%06jx-0x%06jx at %p\n",
+		    (vm_paddr_t)X86BIOS_IVT_BASE,
+		    (vm_paddr_t)X86BIOS_IVT_SIZE + X86BIOS_IVT_BASE - 1,
 		    x86bios_ivt);
-		printf("x86bios:  SSEG 0x%06x-0x%06x at %p\n",
-		    (uint32_t)x86bios_seg_phys,
-		    X86BIOS_SEG_SIZE + (uint32_t)x86bios_seg_phys - 1,
+		printf("x86bios: SSEG 0x%06jx-0x%06jx at %p\n",
+		    x86bios_seg_phys,
+		    (vm_paddr_t)X86BIOS_SEG_SIZE + x86bios_seg_phys - 1,
 		    x86bios_seg);
 		if (x86bios_rom_phys < X86BIOS_ROM_BASE)
-			printf("x86bios:  EBDA 0x%06x-0x%06x at %p\n",
-			    (uint32_t)x86bios_rom_phys, X86BIOS_ROM_BASE - 1,
+			printf("x86bios: EBDA 0x%06jx-0x%06jx at %p\n",
+			    x86bios_rom_phys, (vm_paddr_t)X86BIOS_ROM_BASE - 1,
 			    x86bios_rom);
-		printf("x86bios:   ROM 0x%06x-0x%06x at %p\n",
-		    X86BIOS_ROM_BASE, X86BIOS_MEM_SIZE - X86BIOS_SEG_SIZE - 1,
-		    (void *)((vm_offset_t)x86bios_rom + X86BIOS_ROM_BASE -
-		    (vm_offset_t)x86bios_rom_phys));
+		printf("x86bios:  ROM 0x%06jx-0x%06jx at %p\n",
+		    (vm_paddr_t)X86BIOS_ROM_BASE,
+		    (vm_paddr_t)X86BIOS_MEM_SIZE - X86BIOS_SEG_SIZE - 1,
+		    (caddr_t)x86bios_rom + X86BIOS_ROM_BASE - x86bios_rom_phys);
 	}
 
 	return (0);
@@ -752,20 +755,11 @@
 {
 	int i;
 
+	mtx_init(&x86bios_lock, "x86bios lock", NULL, MTX_DEF);
+
 	if (x86bios_map_mem() != 0)
 		return (ENOMEM);
 
-	mtx_init(&x86bios_lock, "x86bios lock", NULL, MTX_SPIN);
-
-	x86bios_map = malloc(sizeof(*x86bios_map) * X86BIOS_PAGES, M_DEVBUF,
-	    M_WAITOK | M_ZERO);
-	x86bios_set_pages((vm_offset_t)x86bios_ivt, X86BIOS_IVT_BASE,
-	    X86BIOS_IVT_SIZE);
-	x86bios_set_pages((vm_offset_t)x86bios_rom, x86bios_rom_phys,
-	    X86BIOS_ROM_SIZE);
-	x86bios_set_pages((vm_offset_t)x86bios_seg, x86bios_seg_phys,
-	    X86BIOS_SEG_SIZE);
-
 	bzero(&x86bios_emu, sizeof(x86bios_emu));
 
 	x86bios_emu.emu_rdb = x86bios_emu_rdb;
@@ -791,18 +785,8 @@
 static int
 x86bios_uninit(void)
 {
-	vm_offset_t *map = x86bios_map;
 
-	mtx_lock_spin(&x86bios_lock);
-	if (x86bios_map != NULL) {
-		free(x86bios_map, M_DEVBUF);
-		x86bios_map = NULL;
-	}
-	mtx_unlock_spin(&x86bios_lock);
-
-	if (map != NULL)
-		x86bios_unmap_mem();
-
+	x86bios_unmap_mem();
 	mtx_destroy(&x86bios_lock);
 
 	return (0);

==== //depot/projects/smpng/sys/conf/files#264 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1526 2010/07/25 17:55:57 rpaulo Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1528 2010/08/08 08:43:01 bschmidt Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -285,6 +285,7 @@
 contrib/dev/acpica/utilities/utmisc.c		optional acpi
 contrib/dev/acpica/utilities/utmutex.c		optional acpi
 contrib/dev/acpica/utilities/utobject.c		optional acpi
+contrib/dev/acpica/utilities/utosi.c		optional acpi
 contrib/dev/acpica/utilities/utresrc.c		optional acpi
 contrib/dev/acpica/utilities/utstate.c		optional acpi
 contrib/dev/acpica/utilities/utxface.c		optional acpi
@@ -1858,7 +1859,7 @@
 dev/wi/if_wi_pci.c		optional wi pci
 dev/wl/if_wl.c			optional wl isa
 wpifw.c			optional wpifw					\
-	compile-with	"${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:2144 -lintel_wpi -mwpi -c${.TARGET}" \
+	compile-with	"${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:2144 -mwpi -c${.TARGET}" \
 	no-implicit-rule before-depend local				\
 	clean		"wpifw.c"
 wpifw.fwo			optional wpifw				\

==== //depot/projects/smpng/sys/conf/files.i386#138 (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.i386,v 1.649 2010/07/27 20:40:46 jhb Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.650 2010/08/08 06:18:05 jkim Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -369,10 +369,9 @@
 dev/fb/boot_font.c		optional xboxfb
 i386/xbox/pic16l.s		optional xbox
 #
-# x86 real mode BIOS emulator, required by atkbdc/dpms/vesa
+# x86 real mode BIOS support, required by atkbdc/dpms/vesa
 #
 compat/x86bios/x86bios.c	optional x86bios | atkbd | dpms | vesa
-contrib/x86emu/x86emu.c		optional x86bios | atkbd | dpms | vesa
 #
 # x86 shared code between IA32, AMD64 and PC98 architectures
 #

==== //depot/projects/smpng/sys/contrib/dev/acpica/changes.txt#8 (text+ko) ====

@@ -1,8 +1,69 @@
 ----------------------------------------
+06 August 2010. Summary of changes for version 20100806:
+
+1) ACPI CA Core Subsystem:
+
+Designed and implemented a new host interface to the _OSI support code. This 
+will allow the host to dynamically add or remove multiple _OSI strings, as 
+well as install an optional handler that is called for each _OSI invocation. 
+Also added a new AML debugger command, 'osi' to display and modify the global 
+_OSI string table, and test support in the AcpiExec utility. See the ACPICA 
+reference manual for full details. Lin Ming, Bob Moore. ACPICA BZ 836.
+New Functions:
+    AcpiInstallInterface - Add an _OSI string.
+    AcpiRemoveInterface - Delete an _OSI string.
+    AcpiInstallInterfaceHandler - Install optional _OSI handler.
+Obsolete Functions:
+    AcpiOsValidateInterface - no longer used.
+New Files:
+    source/components/utilities/utosi.c
+
+Re-introduced the support to enable multi-byte transfers for Embedded 
+Controller (EC) operation regions. A reported problem was found to be a bug 
+in the host OS, not in the multi-byte support. Previously, the maximum data 
+size passed to the EC operation region handler was a single byte. There are 
+often EC Fields larger than one byte that need to be transferred, and it is 
+useful for the EC driver to lock these as a single transaction. This change 
+enables single transfers larger than 8 bits. This effectively changes the 
+access to the EC space from ByteAcc to AnyAcc, and will probably require 
+changes to the host OS Embedded Controller driver to enable 16/32/64/256-bit 
+transfers in addition to 8-bit transfers. Alexey Starikovskiy, Lin Ming.
+
+Fixed a problem with the prototype for AcpiOsReadPciConfiguration. The 
+prototype in acpiosxf.h had the output value pointer as a (void *).
+It should be a (UINT64 *). This may affect some host OSL code.
+
+Fixed a couple problems with the recently modified Linux makefiles for iASL 
+and AcpiExec. These new makefiles place the generated object files in the 
+local directory so that there can be no collisions between the files that are 
+shared between them that are compiled with different options.
+
+Example Code and Data Size: These are the sizes for the OS-independent 
+acpica.lib produced by the Microsoft Visual C++ 6.0 32-bit compiler. The 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:15 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 34A131066472; Wed, 11 Aug 2010 18:26:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 48B111065F0E
	for ; Wed, 11 Aug 2010 18:26:08 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id C4BFF8FC20
	for ; Wed, 11 Aug 2010 18:26:07 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQ7pk084346
	for ; Wed, 11 Aug 2010 18:26:07 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQ7P8084343
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:07 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 11 Aug 2010 18:26:07 GMT
Message-Id: <201008111826.o7BIQ7P8084343@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182193 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:15 -0000

http://p4web.freebsd.org/@@182193?ac=10

Change 182193 by jhb@jhb_fiver on 2010/08/10 15:55:32

	One more.

Affected files ...

.. //depot/projects/smpng/sys/sparc64/include/smp.h#30 edit

Differences ...

==== //depot/projects/smpng/sys/sparc64/include/smp.h#30 (text+ko) ====

@@ -82,7 +82,7 @@
 };
 
 struct ipi_rd_args {
-	u_int	ira_mask;
+	cpumask_t ira_mask;
 	register_t *ira_val;
 };
 

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:18 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BFB51106655C; Wed, 11 Aug 2010 18:26:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 806D91066531
	for ; Wed, 11 Aug 2010 18:26:15 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id D226C8FC15
	for ; Wed, 11 Aug 2010 18:26:15 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQFr3084381
	for ; Wed, 11 Aug 2010 18:26:15 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQ7ti084350
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:07 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:07 GMT
Message-Id: <201008111826.o7BIQ7ti084350@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182194 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:18 -0000

http://p4web.freebsd.org/@@182194?ac=10

Change 182194 by hselasky@hselasky_laptop001 on 2010/08/10 16:03:19

	
	IFC @ 182186

Affected files ...

.. //depot/projects/usb/src/lib/libusb/libusb.3#22 integrate
.. //depot/projects/usb/src/sys/amd64/acpica/Makefile#2 delete
.. //depot/projects/usb/src/sys/amd64/acpica/acpi_switch.S#4 integrate
.. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakecode.S#6 integrate
.. //depot/projects/usb/src/sys/amd64/acpica/acpi_wakeup.c#8 integrate
.. //depot/projects/usb/src/sys/amd64/acpica/genwakecode.sh#3 delete
.. //depot/projects/usb/src/sys/amd64/acpica/genwakedata.sh#2 delete
.. //depot/projects/usb/src/sys/amd64/acpica/madt.c#9 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/apic_vector.S#7 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/cpu_switch.S#14 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/db_interface.c#3 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#10 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/exception.S#16 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/fpu.c#8 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/genassym.c#15 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#23 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/initcpu.c#11 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/intr_machdep.c#14 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/io_apic.c#9 delete
.. //depot/projects/usb/src/sys/amd64/amd64/legacy.c#5 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#24 delete
.. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#32 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/mca.c#6 delete
.. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#27 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/mptable_pci.c#4 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/msi.c#13 delete
.. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#40 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/support.S#9 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/trap.c#25 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/tsc.c#5 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#18 integrate
.. //depot/projects/usb/src/sys/amd64/conf/GENERIC#39 integrate
.. //depot/projects/usb/src/sys/amd64/conf/GENERIC.hints#7 integrate
.. //depot/projects/usb/src/sys/amd64/conf/NOTES#27 integrate
.. //depot/projects/usb/src/sys/amd64/ia32/ia32_exception.S#5 integrate
.. //depot/projects/usb/src/sys/amd64/ia32/ia32_reg.c#5 integrate
.. //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#12 integrate
.. //depot/projects/usb/src/sys/amd64/ia32/ia32_syscall.c#7 integrate
.. //depot/projects/usb/src/sys/amd64/include/apicreg.h#3 integrate
.. //depot/projects/usb/src/sys/amd64/include/apicvar.h#13 integrate
.. //depot/projects/usb/src/sys/amd64/include/asmacros.h#5 integrate
.. //depot/projects/usb/src/sys/amd64/include/atomic.h#6 integrate
.. //depot/projects/usb/src/sys/amd64/include/clock.h#8 integrate
.. //depot/projects/usb/src/sys/amd64/include/cpu.h#2 integrate
.. //depot/projects/usb/src/sys/amd64/include/fpu.h#4 integrate
.. //depot/projects/usb/src/sys/amd64/include/mca.h#4 integrate
.. //depot/projects/usb/src/sys/amd64/include/param.h#11 integrate
.. //depot/projects/usb/src/sys/amd64/include/pcb.h#10 integrate
.. //depot/projects/usb/src/sys/amd64/include/pcpu.h#9 integrate
.. //depot/projects/usb/src/sys/amd64/include/pmap.h#13 integrate
.. //depot/projects/usb/src/sys/amd64/include/proc.h#5 integrate
.. //depot/projects/usb/src/sys/amd64/include/segments.h#5 integrate
.. //depot/projects/usb/src/sys/amd64/include/smp.h#11 integrate
.. //depot/projects/usb/src/sys/amd64/include/specialreg.h#19 integrate
.. //depot/projects/usb/src/sys/amd64/include/vmparam.h#12 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#15 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#11 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#10 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#11 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#25 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#10 integrate
.. //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#10 integrate
.. //depot/projects/usb/src/sys/arm/arm/machdep.c#13 integrate
.. //depot/projects/usb/src/sys/arm/arm/nexus.c#6 integrate
.. //depot/projects/usb/src/sys/arm/arm/pmap.c#27 integrate
.. //depot/projects/usb/src/sys/arm/arm/trap.c#11 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_aicreg.h#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91_pio_sam9.h#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91_pit.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91_pitreg.h#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91_pmc.c#9 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_pmcreg.h#3 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91sam9.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91sam9_machdep.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91sam9g20reg.h#1 branch
.. //depot/projects/usb/src/sys/arm/at91/board_hl201.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/files.at91sam9#1 branch
.. //depot/projects/usb/src/sys/arm/at91/if_macb.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/if_macbreg.h#1 branch
.. //depot/projects/usb/src/sys/arm/at91/if_macbvar.h#1 branch
.. //depot/projects/usb/src/sys/arm/at91/std.at91sam9#1 branch
.. //depot/projects/usb/src/sys/arm/at91/std.hl201#1 branch
.. //depot/projects/usb/src/sys/arm/conf/DB-78XXX#8 integrate
.. //depot/projects/usb/src/sys/arm/conf/DB-88F5XXX#8 integrate
.. //depot/projects/usb/src/sys/arm/conf/DB-88F6XXX#8 integrate
.. //depot/projects/usb/src/sys/arm/conf/HL201#1 branch
.. //depot/projects/usb/src/sys/arm/conf/HL201.hints#1 branch
.. //depot/projects/usb/src/sys/arm/conf/SHEEVAPLUG#3 integrate
.. //depot/projects/usb/src/sys/arm/include/fdt.h#1 branch
.. //depot/projects/usb/src/sys/arm/include/metadata.h#3 integrate
.. //depot/projects/usb/src/sys/arm/include/ofw_machdep.h#1 branch
.. //depot/projects/usb/src/sys/arm/include/vmparam.h#9 integrate
.. //depot/projects/usb/src/sys/arm/mv/bus_space.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/common.c#8 integrate
.. //depot/projects/usb/src/sys/arm/mv/discovery/db78xxx.c#6 delete
.. //depot/projects/usb/src/sys/arm/mv/discovery/discovery.c#6 integrate
.. //depot/projects/usb/src/sys/arm/mv/discovery/files.db78xxx#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/discovery/std.db78xxx#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/files.mv#8 integrate
.. //depot/projects/usb/src/sys/arm/mv/gpio.c#4 integrate
.. //depot/projects/usb/src/sys/arm/mv/ic.c#4 integrate
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/db88f6xxx.c#6 delete
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/files.db88f6xxx#3 delete
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/kirkwood.c#7 integrate
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/sheevaplug.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/std.db88f6xxx#3 integrate
.. //depot/projects/usb/src/sys/arm/mv/kirkwood/std.sheevaplug#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/mv_machdep.c#11 integrate
.. //depot/projects/usb/src/sys/arm/mv/mv_pci.c#6 integrate
.. //depot/projects/usb/src/sys/arm/mv/mv_sata.c#5 integrate
.. //depot/projects/usb/src/sys/arm/mv/mvreg.h#8 integrate
.. //depot/projects/usb/src/sys/arm/mv/mvvar.h#5 integrate
.. //depot/projects/usb/src/sys/arm/mv/mvwin.h#3 integrate
.. //depot/projects/usb/src/sys/arm/mv/obio.c#4 delete
.. //depot/projects/usb/src/sys/arm/mv/orion/db88f5xxx.c#6 integrate
.. //depot/projects/usb/src/sys/arm/mv/orion/orion.c#6 integrate
.. //depot/projects/usb/src/sys/arm/mv/orion/std.db88f5xxx#3 integrate
.. //depot/projects/usb/src/sys/arm/mv/rtc.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/timer.c#2 integrate
.. //depot/projects/usb/src/sys/arm/mv/twsi.c#3 integrate
.. //depot/projects/usb/src/sys/arm/s3c2xx0/files.s3c2xx0#2 integrate
.. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c24x0.c#2 integrate
.. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#2 integrate
.. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c24x0_rtc.c#1 branch
.. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c24x0reg.h#2 integrate
.. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c2xx0_space.c#2 integrate
.. //depot/projects/usb/src/sys/arm/s3c2xx0/s3c2xx0var.h#2 integrate
.. //depot/projects/usb/src/sys/boot/Makefile#12 integrate
.. //depot/projects/usb/src/sys/boot/arm/uboot/Makefile#4 integrate
.. //depot/projects/usb/src/sys/boot/arm/uboot/version#3 integrate
.. //depot/projects/usb/src/sys/boot/common/Makefile.inc#6 integrate
.. //depot/projects/usb/src/sys/boot/common/load_elf_obj.c#2 integrate
.. //depot/projects/usb/src/sys/boot/common/loader.8#9 integrate
.. //depot/projects/usb/src/sys/boot/fdt/Makefile#1 branch
.. //depot/projects/usb/src/sys/boot/fdt/dts/bindings-gpio.txt#1 branch
.. //depot/projects/usb/src/sys/boot/fdt/dts/bindings-mpp.txt#1 branch
.. //depot/projects/usb/src/sys/boot/fdt/dts/db78100.dts#1 branch
.. //depot/projects/usb/src/sys/boot/fdt/dts/db88f5182.dts#1 branch
.. //depot/projects/usb/src/sys/boot/fdt/dts/db88f5281.dts#1 branch
.. //depot/projects/usb/src/sys/boot/fdt/dts/db88f6281.dts#1 branch
.. //depot/projects/usb/src/sys/boot/fdt/dts/mpc8555cds.dts#1 branch
.. //depot/projects/usb/src/sys/boot/fdt/dts/mpc8572ds.dts#1 branch
.. //depot/projects/usb/src/sys/boot/fdt/dts/sheevaplug.dts#1 branch
.. //depot/projects/usb/src/sys/boot/fdt/fdt_loader_cmd.c#1 branch
.. //depot/projects/usb/src/sys/boot/ficl/Makefile#5 integrate
.. //depot/projects/usb/src/sys/boot/ficl/ficl.h#3 integrate
.. //depot/projects/usb/src/sys/boot/forth/loader.conf#27 integrate
.. //depot/projects/usb/src/sys/boot/i386/boot0/Makefile#4 integrate
.. //depot/projects/usb/src/sys/boot/i386/btx/btx/Makefile#3 integrate
.. //depot/projects/usb/src/sys/boot/i386/btx/btxldr/Makefile#2 integrate
.. //depot/projects/usb/src/sys/boot/i386/cdboot/Makefile#2 integrate
.. //depot/projects/usb/src/sys/boot/i386/loader/Makefile#9 integrate
.. //depot/projects/usb/src/sys/boot/i386/mbr/Makefile#2 integrate
.. //depot/projects/usb/src/sys/boot/i386/pmbr/Makefile#2 integrate
.. //depot/projects/usb/src/sys/boot/i386/pxeldr/Makefile#2 integrate
.. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#9 integrate
.. //depot/projects/usb/src/sys/boot/ia64/common/exec.c#3 integrate
.. //depot/projects/usb/src/sys/boot/ia64/efi/version#5 integrate
.. //depot/projects/usb/src/sys/boot/ofw/Makefile.inc#2 integrate
.. //depot/projects/usb/src/sys/boot/ofw/libofw/Makefile#5 integrate
.. //depot/projects/usb/src/sys/boot/ofw/libofw/libofw.h#3 integrate
.. //depot/projects/usb/src/sys/boot/ofw/libofw/ppc64_elf_freebsd.c#1 branch
.. //depot/projects/usb/src/sys/boot/pc98/boot0.5/Makefile#3 integrate
.. //depot/projects/usb/src/sys/boot/pc98/boot0/Makefile#2 integrate
.. //depot/projects/usb/src/sys/boot/pc98/btx/btx/Makefile#3 integrate
.. //depot/projects/usb/src/sys/boot/pc98/btx/btxldr/Makefile#2 integrate
.. //depot/projects/usb/src/sys/boot/pc98/cdboot/Makefile#2 integrate
.. //depot/projects/usb/src/sys/boot/pc98/loader/Makefile#6 integrate
.. //depot/projects/usb/src/sys/boot/powerpc/Makefile.inc#2 integrate
.. //depot/projects/usb/src/sys/boot/powerpc/boot1.chrp/Makefile#2 integrate
.. //depot/projects/usb/src/sys/boot/powerpc/ofw/Makefile#5 integrate
.. //depot/projects/usb/src/sys/boot/powerpc/ofw/conf.c#2 integrate
.. //depot/projects/usb/src/sys/boot/powerpc/ofw/ldscript.powerpc#2 integrate
.. //depot/projects/usb/src/sys/boot/powerpc/ofw/metadata.c#2 integrate
.. //depot/projects/usb/src/sys/boot/powerpc/uboot/Makefile#4 integrate
.. //depot/projects/usb/src/sys/boot/powerpc/uboot/ldscript.powerpc#2 integrate
.. //depot/projects/usb/src/sys/boot/powerpc/uboot/version#3 integrate
.. //depot/projects/usb/src/sys/boot/sparc64/boot1/Makefile#2 integrate
.. //depot/projects/usb/src/sys/boot/uboot/Makefile.inc#2 integrate
.. //depot/projects/usb/src/sys/boot/uboot/common/main.c#5 integrate
.. //depot/projects/usb/src/sys/boot/uboot/common/metadata.c#3 integrate
.. //depot/projects/usb/src/sys/boot/uboot/lib/Makefile#3 integrate
.. //depot/projects/usb/src/sys/boot/uboot/lib/disk.c#6 integrate
.. //depot/projects/usb/src/sys/boot/uboot/lib/glue.c#7 integrate
.. //depot/projects/usb/src/sys/boot/zfs/zfs.c#6 integrate
.. //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#8 integrate
.. //depot/projects/usb/src/sys/boot/zfs/zfstest.c#1 branch
.. //depot/projects/usb/src/sys/cam/ata/ata_da.c#13 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_pmp.c#7 integrate
.. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#13 integrate
.. //depot/projects/usb/src/sys/cam/cam.c#7 integrate
.. //depot/projects/usb/src/sys/cam/cam_ccb.h#14 integrate
.. //depot/projects/usb/src/sys/cam/cam_debug.h#2 integrate
.. //depot/projects/usb/src/sys/cam/cam_periph.c#17 integrate
.. //depot/projects/usb/src/sys/cam/cam_xpt.c#31 integrate
.. //depot/projects/usb/src/sys/cam/cam_xpt_internal.h#7 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_all.c#10 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_all.h#7 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#18 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_ch.h#2 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#20 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_target.c#9 integrate
.. //depot/projects/usb/src/sys/cam/scsi/scsi_xpt.c#6 integrate
.. //depot/projects/usb/src/sys/cddl/boot/zfs/zfsimpl.h#8 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#7 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c#1 branch
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/misc.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/policy.h#5 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sid.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/uio.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vnode.h#9 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/atomic/powerpc64/opensolaris_atomic.S#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#7 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#12 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#6 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#8 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#7 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#6 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#6 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#7 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#10 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#9 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#10 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#7 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#15 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#13 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#20 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#13 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#6 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#7 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#7 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#3 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#2 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#1 branch
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c#1 branch
.. //depot/projects/usb/src/sys/cddl/dev/cyclic/cyclic.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/dev/dtrace/dtrace_debug.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/dev/dtrace/dtrace_load.c#3 integrate
.. //depot/projects/usb/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/dev/systrace/systrace.c#3 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32.h#8 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#24 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#25 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_signal.h#3 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#24 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#24 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#25 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_util.h#4 integrate
.. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#25 integrate
.. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#15 integrate
.. //depot/projects/usb/src/sys/compat/ia32/ia32_util.h#2 integrate
.. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#26 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#24 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.h#7 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_signal.c#7 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#19 integrate
.. //depot/projects/usb/src/sys/compat/svr4/svr4_filio.c#3 integrate
.. //depot/projects/usb/src/sys/compat/svr4/svr4_proto.h#6 integrate
.. //depot/projects/usb/src/sys/compat/svr4/svr4_syscall.h#5 integrate
.. //depot/projects/usb/src/sys/compat/svr4/svr4_syscallnames.c#5 integrate
.. //depot/projects/usb/src/sys/compat/svr4/svr4_sysent.c#6 integrate
.. //depot/projects/usb/src/sys/compat/svr4/svr4_sysvec.c#8 integrate
.. //depot/projects/usb/src/sys/compat/x86bios/x86bios.c#6 integrate
.. //depot/projects/usb/src/sys/compat/x86bios/x86bios.h#3 integrate
.. //depot/projects/usb/src/sys/conf/Makefile.arm#11 integrate
.. //depot/projects/usb/src/sys/conf/Makefile.powerpc#3 integrate
.. //depot/projects/usb/src/sys/conf/NOTES#57 integrate
.. //depot/projects/usb/src/sys/conf/files#98 integrate
.. //depot/projects/usb/src/sys/conf/files.amd64#30 integrate
.. //depot/projects/usb/src/sys/conf/files.arm#11 integrate
.. //depot/projects/usb/src/sys/conf/files.i386#35 integrate
.. //depot/projects/usb/src/sys/conf/files.mips#10 integrate
.. //depot/projects/usb/src/sys/conf/files.pc98#24 integrate
.. //depot/projects/usb/src/sys/conf/files.powerpc#29 integrate
.. //depot/projects/usb/src/sys/conf/files.sparc64#19 integrate
.. //depot/projects/usb/src/sys/conf/files.sun4v#11 integrate
.. //depot/projects/usb/src/sys/conf/kern.mk#14 integrate
.. //depot/projects/usb/src/sys/conf/kern.post.mk#11 integrate
.. //depot/projects/usb/src/sys/conf/kern.pre.mk#18 integrate
.. //depot/projects/usb/src/sys/conf/kmod.mk#17 integrate
.. //depot/projects/usb/src/sys/conf/ldscript.mips.64#1 branch
.. //depot/projects/usb/src/sys/conf/ldscript.mips.n32#1 branch
.. //depot/projects/usb/src/sys/conf/ldscript.powerpc64#1 branch
.. //depot/projects/usb/src/sys/conf/options#50 integrate
.. //depot/projects/usb/src/sys/conf/options.amd64#12 integrate
.. //depot/projects/usb/src/sys/conf/options.arm#14 integrate
.. //depot/projects/usb/src/sys/conf/options.mips#6 integrate
.. //depot/projects/usb/src/sys/conf/options.powerpc#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/acpica_prep.sh#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#10 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/common/adisasm.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/common/adwalk.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmextern.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmrestag.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtable.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtbdump.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmtbinfo.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompile.c#9 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#9 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asldefine.h#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslerror.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslfiles.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslglobal.h#8 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asllookup.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmain.c#8 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslopt.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslpredef.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslstartup.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltransform.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltree.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltypes.h#10 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslutils.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtcompile.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtcompiler.h#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtfield.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtio.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtsubtable.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dttable.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dttemplate.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dttemplate.h#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtutils.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbcmds.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbdisply.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbexec.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbfileio.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbhistry.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbinput.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbutils.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmobject.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmopcode.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmresrc.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsutils.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpe.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpeblk.c#8 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpeinit.c#2 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evgpeutil.c#2 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evrgnini.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxface.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfevnt.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exdump.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exfldio.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exprep.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exregion.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exsystem.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwgpe.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwsleep.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwvalid.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acconfig.h#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdebug.h#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acdisasm.h#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acevents.h#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acexcep.h#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acglobal.h#8 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/achware.h#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/aclocal.h#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acnamesp.h#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acobject.h#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acoutput.h#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpiosxf.h#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#10 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpredef.h#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acstruct.h#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl.h#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actbl2.h#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actypes.h#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acutils.h#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsaccess.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsalloc.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsdump.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsinit.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsnames.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsparse.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nssearch.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsutils.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nswalk.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/osunixxf.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/uteval.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utglobal.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utinit.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utmisc.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utmutex.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utosi.c#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/uttrack.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utxface.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-6000-9.193.4.1.fw.uu#2 delete
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-6000-9.221.4.1.fw.uu#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu#1 branch
.. //depot/projects/usb/src/sys/contrib/libfdt/libfdt_env.h#2 integrate
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/README.txt#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmip.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-abi.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-access-native.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-access.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-address.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-app-init-linux.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-app-init.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-app-init.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-asm.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-asx.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-atomic.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-bootloader.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-bootmem.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-bootmem.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-ciu.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-cmd-queue.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-cmd-queue.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-cn3010-evb-hs5.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-compactflash.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-compactflash.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-core.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-core.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-coremask.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-coremask.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-csr-addresses.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-csr-db-support.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-csr-db.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-csr-db.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-csr-enums.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-csr-typedefs.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-csr.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-cvmmem.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-dfa.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-dfa.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-dma-engine.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-dma-engine.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-ebt3000.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-ebt3000.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-fau.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-flash.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-flash.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-fpa.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-fpa.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-gmx.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-gpio.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-board.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-board.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-check-defines.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-errata.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-errata.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-fpa.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-fpa.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-loop.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-loop.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-npi.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-npi.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-rgmii.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-rgmii.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-sgmii.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-sgmii.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-spi.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-spi.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-util.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-util.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-xaui.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-xaui.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-higig.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-interrupt-decodes.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-interrupt-handler.S#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-interrupt-rsl.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-interrupt.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-interrupt.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-iob.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-ipd.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-key.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-l2c.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-l2c.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-llm.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-llm.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-lmc.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-log-arc.S#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-log.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-log.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-malloc.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-malloc/README-malloc#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-malloc/arena.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-malloc/malloc.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-malloc/malloc.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-malloc/thread-m.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-mdio.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-mgmt-port.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-mgmt-port.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-mio.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-nand.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-nand.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-npi.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-packet.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-pci.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-pcie.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-pcie.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-pip.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-pko.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-pko.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-platform.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-pow.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-pow.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-raid.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-raid.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-resources.config#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-rng.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-rtc.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-rwlock.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-scratch.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-shared-linux-n32.ld#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-shared-linux-o32.ld#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-shared-linux.ld#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-spi.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-spi.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-spi4000.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-spinlock.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-swap.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-sysinfo.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-sysinfo.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-thunder.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-thunder.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-tim.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-tim.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-tra.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-tra.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-twsi-raw.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-twsi-raw.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-twsi.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-twsi.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-uart.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-usb.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-usb.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-utils.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-version.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-warn.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-warn.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-wqe.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-zip.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-zip.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-zone.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx.mk#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/executive-config.h.template#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/octeon-feature.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/octeon-model.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/octeon-model.h#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/octeon-pci-console.c#1 branch
.. //depot/projects/usb/src/sys/contrib/octeon-sdk/octeon-pci-console.h#1 branch
.. //depot/projects/usb/src/sys/crypto/aesni/aesencdec_amd64.S#1 branch
.. //depot/projects/usb/src/sys/crypto/aesni/aesencdec_i386.S#1 branch
.. //depot/projects/usb/src/sys/crypto/aesni/aeskeys_amd64.S#1 branch
.. //depot/projects/usb/src/sys/crypto/aesni/aeskeys_i386.S#1 branch
.. //depot/projects/usb/src/sys/crypto/aesni/aesni.c#1 branch
.. //depot/projects/usb/src/sys/crypto/aesni/aesni.h#1 branch
.. //depot/projects/usb/src/sys/crypto/aesni/aesni_wrap.c#1 branch
.. //depot/projects/usb/src/sys/crypto/via/padlock.c#9 integrate
.. //depot/projects/usb/src/sys/crypto/via/padlock.h#2 integrate
.. //depot/projects/usb/src/sys/crypto/via/padlock_cipher.c#3 integrate
.. //depot/projects/usb/src/sys/crypto/via/padlock_hash.c#4 integrate
.. //depot/projects/usb/src/sys/ddb/db_command.c#8 integrate
.. //depot/projects/usb/src/sys/ddb/db_command.h#4 integrate
.. //depot/projects/usb/src/sys/ddb/db_thread.c#5 integrate
.. //depot/projects/usb/src/sys/dev/acpi_support/acpi_aiboost.c#5 delete
.. //depot/projects/usb/src/sys/dev/acpi_support/acpi_asus.c#14 integrate
.. //depot/projects/usb/src/sys/dev/acpi_support/acpi_fujitsu.c#5 integrate
.. //depot/projects/usb/src/sys/dev/acpi_support/acpi_hp.c#3 integrate
.. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#13 integrate
.. //depot/projects/usb/src/sys/dev/acpi_support/atk0110.c#1 branch
.. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdHardware.c#7 integrate
.. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdMemory.c#5 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi.c#28 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_button.c#5 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_cpu.c#16 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_dock.c#9 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_ec.c#10 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.c#12 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.h#2 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_lid.c#5 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib.c#4 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib_pci.c#5 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_pcibvar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_thermal.c#10 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_video.c#8 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#16 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp.c#12 integrate
.. //depot/projects/usb/src/sys/dev/agp/agp_nvidia.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ahci/ahci.c#15 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aic79xx.reg#2 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aic7xxx.reg#2 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#4 integrate
.. //depot/projects/usb/src/sys/dev/alc/if_alc.c#8 integrate
.. //depot/projects/usb/src/sys/dev/alc/if_alcreg.h#2 integrate
.. //depot/projects/usb/src/sys/dev/alc/if_alcvar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/amdsbwd/amdsbwd.c#2 integrate
.. //depot/projects/usb/src/sys/dev/amr/amrvar.h#4 integrate
.. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.c#13 integrate
.. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.h#6 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-all.c#27 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-all.h#20 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-card.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#20 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-lowlevel.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#20 integrate
.. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#28 integrate
.. //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#16 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acerlabs.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-amd.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-highpoint.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#12 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ite.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-jmicron.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#13 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#11 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#11 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-serverworks.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#12 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-sis.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-via.c#8 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.h#8 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_eeprom_v4k.h#3 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#3 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#6 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#10 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#3 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#4 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#3 integrate
.. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#2 integrate
.. //depot/projects/usb/src/sys/dev/ath/if_ath.c#39 integrate
.. //depot/projects/usb/src/sys/dev/bce/if_bce.c#29 integrate
.. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#18 integrate
.. //depot/projects/usb/src/sys/dev/bge/if_bge.c#31 integrate
.. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#16 integrate
.. //depot/projects/usb/src/sys/dev/bktr/bktr_core.c#2 integrate
.. //depot/projects/usb/src/sys/dev/bwi/if_bwi.c#8 integrate
.. //depot/projects/usb/src/sys/dev/bwi/if_bwi_pci.c#3 integrate
.. //depot/projects/usb/src/sys/dev/bwn/if_bwn.c#5 integrate
.. //depot/projects/usb/src/sys/dev/cas/if_cas.c#5 integrate
.. //depot/projects/usb/src/sys/dev/cfi/cfi_bus_fdt.c#1 branch
.. //depot/projects/usb/src/sys/dev/cfi/cfi_bus_lbc.c#2 delete
.. //depot/projects/usb/src/sys/dev/coretemp/coretemp.c#6 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#14 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#15 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#17 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#18 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#31 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#25 integrate
.. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#5 integrate
.. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#14 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#8 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#7 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_api.h#5 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#8 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_mbx.c#1 branch
.. //depot/projects/usb/src/sys/dev/e1000/e1000_mbx.h#1 branch
.. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.h#5 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#8 integrate
.. //depot/projects/usb/src/sys/dev/e1000/e1000_vf.c#1 branch
.. //depot/projects/usb/src/sys/dev/e1000/e1000_vf.h#1 branch
.. //depot/projects/usb/src/sys/dev/e1000/if_em.c#21 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#21 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#8 integrate
.. //depot/projects/usb/src/sys/dev/e1000/if_lem.c#3 integrate
.. //depot/projects/usb/src/sys/dev/et/if_et.c#5 integrate
.. //depot/projects/usb/src/sys/dev/et/if_etreg.h#3 integrate
.. //depot/projects/usb/src/sys/dev/et/if_etvar.h#3 integrate
.. //depot/projects/usb/src/sys/dev/fb/fbreg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/fb/vesa.c#11 integrate
.. //depot/projects/usb/src/sys/dev/fdc/fdc_acpi.c#4 integrate
.. //depot/projects/usb/src/sys/dev/fdt/fdt_common.c#1 branch
.. //depot/projects/usb/src/sys/dev/fdt/fdt_common.h#1 branch
.. //depot/projects/usb/src/sys/dev/fdt/fdt_pci.c#1 branch
.. //depot/projects/usb/src/sys/dev/fdt/fdt_powerpc.c#1 branch
.. //depot/projects/usb/src/sys/dev/fdt/fdt_static_dtb.S#1 branch
.. //depot/projects/usb/src/sys/dev/fdt/fdtbus.c#1 branch
.. //depot/projects/usb/src/sys/dev/fdt/simplebus.c#1 branch
.. //depot/projects/usb/src/sys/dev/flash/mx25l.c#2 integrate
.. //depot/projects/usb/src/sys/dev/flash/mx25lreg.h#2 integrate
.. //depot/projects/usb/src/sys/dev/gem/if_gem.c#13 integrate
.. //depot/projects/usb/src/sys/dev/hme/if_hme.c#7 integrate
.. //depot/projects/usb/src/sys/dev/hptiop/hptiop.c#7 integrate
.. //depot/projects/usb/src/sys/dev/hptmv/entry.c#8 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_core.c#8 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_core.h#3 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_mod.c#19 integrate
.. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#12 integrate
.. //depot/projects/usb/src/sys/dev/iicbus/iic.h#5 integrate
.. //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#10 integrate
.. //depot/projects/usb/src/sys/dev/iicbus/iiconf.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ipmi/ipmi_smbios.c#5 integrate
.. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_cam.c#5 integrate
.. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_sm.c#4 integrate
.. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_soc.c#5 integrate
.. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_subr.c#4 integrate
.. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi.c#5 integrate
.. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi.h#3 integrate
.. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi_subr.c#3 integrate
.. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsivar.h#3 integrate
.. //depot/projects/usb/src/sys/dev/isp/isp.c#15 integrate
.. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#17 integrate
.. //depot/projects/usb/src/sys/dev/isp/isp_library.c#10 integrate
.. //depot/projects/usb/src/sys/dev/isp/isp_pci.c#11 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#20 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwnreg.h#6 integrate
.. //depot/projects/usb/src/sys/dev/iwn/if_iwnvar.h#8 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#20 integrate
.. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#11 integrate
.. //depot/projects/usb/src/sys/dev/md/md.c#17 integrate
.. //depot/projects/usb/src/sys/dev/mge/if_mge.c#11 integrate
.. //depot/projects/usb/src/sys/dev/mge/if_mgevar.h#3 integrate
.. //depot/projects/usb/src/sys/dev/mii/atphy.c#3 integrate
.. //depot/projects/usb/src/sys/dev/mii/e1000phy.c#13 integrate
.. //depot/projects/usb/src/sys/dev/mii/miidevs#20 integrate
.. //depot/projects/usb/src/sys/dev/mmc/mmc.c#12 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt.c#11 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt.h#13 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.c#16 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt_pci.c#12 integrate
.. //depot/projects/usb/src/sys/dev/mpt/mpt_raid.c#14 integrate
.. //depot/projects/usb/src/sys/dev/mvs/mvs.c#3 integrate
.. //depot/projects/usb/src/sys/dev/mvs/mvs_pci.c#2 integrate
.. //depot/projects/usb/src/sys/dev/mvs/mvs_soc.c#2 integrate
.. //depot/projects/usb/src/sys/dev/mxge/eth_z8e.h#7 integrate
.. //depot/projects/usb/src/sys/dev/mxge/ethp_z8e.h#7 integrate
.. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#25 integrate
.. //depot/projects/usb/src/sys/dev/mxge/rss_eth_z8e.h#6 integrate
.. //depot/projects/usb/src/sys/dev/mxge/rss_ethp_z8e.h#6 integrate
.. //depot/projects/usb/src/sys/dev/null/null.c#4 integrate
.. //depot/projects/usb/src/sys/dev/ofw/ofw_bus_subr.c#5 integrate
.. //depot/projects/usb/src/sys/dev/ofw/ofw_bus_subr.h#4 integrate
.. //depot/projects/usb/src/sys/dev/ofw/ofw_fdt.c#1 branch
.. //depot/projects/usb/src/sys/dev/ofw/ofw_if.m#4 integrate
.. //depot/projects/usb/src/sys/dev/ofw/ofw_standard.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ofw/openfirm.c#9 integrate
.. //depot/projects/usb/src/sys/dev/ofw/openfirm.h#8 integrate
.. //depot/projects/usb/src/sys/dev/pci/pci.c#36 integrate
.. //depot/projects/usb/src/sys/dev/pci/pci_user.c#7 integrate
.. //depot/projects/usb/src/sys/dev/pci/pcib_private.h#7 integrate
.. //depot/projects/usb/src/sys/dev/pci/pcireg.h#17 integrate
.. //depot/projects/usb/src/sys/dev/pci/pcivar.h#13 integrate
.. //depot/projects/usb/src/sys/dev/puc/pucdata.c#15 integrate
.. //depot/projects/usb/src/sys/dev/quicc/quicc_bfe_fdt.c#1 branch
.. //depot/projects/usb/src/sys/dev/quicc/quicc_bfe_ocp.c#2 delete
.. //depot/projects/usb/src/sys/dev/random/nehemiah.c#3 integrate
.. //depot/projects/usb/src/sys/dev/sec/sec.c#3 integrate
.. //depot/projects/usb/src/sys/dev/sge/if_sge.c#4 integrate
.. //depot/projects/usb/src/sys/dev/sge/if_sgereg.h#4 integrate
.. //depot/projects/usb/src/sys/dev/siis/siis.c#14 integrate
.. //depot/projects/usb/src/sys/dev/sk/if_sk.c#12 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#43 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/feeder_eq.c#2 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/feeder_rate.c#11 integrate
.. //depot/projects/usb/src/sys/dev/sound/pcm/sound.c#12 integrate
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#72 integrate
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudioreg.h#14 integrate
.. //depot/projects/usb/src/sys/dev/ste/if_ste.c#8 integrate
.. //depot/projects/usb/src/sys/dev/syscons/scvgarndr.c#5 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.c#22 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.h#12 integrate
.. //depot/projects/usb/src/sys/dev/tsec/if_tsec.c#8 integrate
.. //depot/projects/usb/src/sys/dev/tsec/if_tsec.h#5 integrate
.. //depot/projects/usb/src/sys/dev/tsec/if_tsec_fdt.c#1 branch
.. //depot/projects/usb/src/sys/dev/tsec/if_tsec_ocp.c#3 delete
.. //depot/projects/usb/src/sys/dev/twa/tw_cl.h#3 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_cl_fwif.h#3 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_cl_init.c#5 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_cl_intr.c#4 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_cl_io.c#5 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_cl_misc.c#4 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_cl_share.h#5 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_osl.h#6 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_osl_cam.c#8 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_osl_externs.h#3 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_osl_freebsd.c#10 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_osl_inline.h#4 integrate
.. //depot/projects/usb/src/sys/dev/twa/tw_osl_share.h#6 integrate
.. //depot/projects/usb/src/sys/dev/uart/uart_bus_fdt.c#1 branch
.. //depot/projects/usb/src/sys/dev/uart/uart_bus_mbus.c#2 delete
.. //depot/projects/usb/src/sys/dev/uart/uart_bus_ocp.c#2 delete
.. //depot/projects/usb/src/sys/dev/uart/uart_cpu_mv.c#4 delete
.. //depot/projects/usb/src/sys/dev/uart/uart_cpu_powerpc.c#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#57 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#12 delete
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mv.c#1 branch
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#38 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#34 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/uhso.c#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#36 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#34 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#30 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#21 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#16 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#47 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_device.c#79 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_process.c#18 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#186 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#133 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#31 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#18 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#10 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#23 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#25 integrate
.. //depot/projects/usb/src/sys/dev/xen/netfront/netfront.c#16 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vfsops.c#11 integrate
.. //depot/projects/usb/src/sys/fs/coda/coda.h#3 integrate
.. //depot/projects/usb/src/sys/fs/coda/coda_venus.c#6 integrate
.. //depot/projects/usb/src/sys/fs/coda/coda_vnops.c#9 integrate
.. //depot/projects/usb/src/sys/fs/devfs/devfs.h#4 integrate
.. //depot/projects/usb/src/sys/fs/devfs/devfs_devs.c#16 integrate
.. //depot/projects/usb/src/sys/fs/devfs/devfs_rule.c#6 integrate
.. //depot/projects/usb/src/sys/fs/devfs/devfs_vfsops.c#7 integrate
.. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#25 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfs_commonport.c#7 integrate
.. //depot/projects/usb/src/sys/fs/nfs/nfs_var.h#10 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clbio.c#12 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clcomsubs.c#2 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_cllock.c#2 delete
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnfsiod.c#4 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clport.c#7 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clrpcops.c#9 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clstate.c#12 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clsubs.c#5 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvfsops.c#9 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#17 integrate
.. //depot/projects/usb/src/sys/fs/nfsclient/nfs_lock.h#2 delete
.. //depot/projects/usb/src/sys/fs/nfsclient/nfsnode.h#3 integrate
.. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdport.c#11 integrate
.. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdsocket.c#4 integrate
.. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#12 integrate
.. //depot/projects/usb/src/sys/fs/nwfs/nwfs_io.c#10 integrate
.. //depot/projects/usb/src/sys/fs/procfs/procfs_type.c#2 integrate
.. //depot/projects/usb/src/sys/fs/smbfs/smbfs_io.c#14 integrate
.. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#15 integrate
.. //depot/projects/usb/src/sys/fs/udf/udf_vfsops.c#14 integrate
.. //depot/projects/usb/src/sys/fs/udf/udf_vnops.c#16 integrate
.. //depot/projects/usb/src/sys/fs/unionfs/union_subr.c#14 integrate
.. //depot/projects/usb/src/sys/geom/cache/g_cache.h#2 integrate
.. //depot/projects/usb/src/sys/geom/gate/g_gate.c#6 integrate
.. //depot/projects/usb/src/sys/geom/geom_dev.c#14 integrate
.. //depot/projects/usb/src/sys/geom/geom_disk.c#11 integrate
.. //depot/projects/usb/src/sys/geom/geom_disk.h#6 integrate
.. //depot/projects/usb/src/sys/geom/geom_event.c#4 integrate
.. //depot/projects/usb/src/sys/geom/geom_io.c#14 integrate
.. //depot/projects/usb/src/sys/geom/label/g_label.c#8 integrate
.. //depot/projects/usb/src/sys/geom/mountver/g_mountver.c#2 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part.c#26 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part.h#10 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_bsd.c#13 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#21 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_mbr.c#10 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_vtoc8.c#9 integrate
.. //depot/projects/usb/src/sys/geom/sched/g_sched.c#2 integrate
.. //depot/projects/usb/src/sys/i386/acpica/acpi_wakeup.c#7 integrate
.. //depot/projects/usb/src/sys/i386/acpica/madt.c#10 integrate
.. //depot/projects/usb/src/sys/i386/conf/GENERIC#37 integrate
.. //depot/projects/usb/src/sys/i386/conf/GENERIC.hints#6 integrate
.. //depot/projects/usb/src/sys/i386/conf/NOTES#32 integrate
.. //depot/projects/usb/src/sys/i386/i386/apic_vector.s#5 integrate
.. //depot/projects/usb/src/sys/i386/i386/atpic_vector.s#2 integrate
.. //depot/projects/usb/src/sys/i386/i386/elf_machdep.c#11 integrate
.. //depot/projects/usb/src/sys/i386/i386/exception.s#7 integrate
.. //depot/projects/usb/src/sys/i386/i386/genassym.c#10 integrate
.. //depot/projects/usb/src/sys/i386/i386/identcpu.c#20 integrate
.. //depot/projects/usb/src/sys/i386/i386/initcpu.c#12 integrate
.. //depot/projects/usb/src/sys/i386/i386/intr_machdep.c#14 integrate
.. //depot/projects/usb/src/sys/i386/i386/io_apic.c#9 delete
.. //depot/projects/usb/src/sys/i386/i386/legacy.c#5 integrate
.. //depot/projects/usb/src/sys/i386/i386/local_apic.c#24 delete
.. //depot/projects/usb/src/sys/i386/i386/machdep.c#28 integrate
.. //depot/projects/usb/src/sys/i386/i386/mca.c#6 delete
.. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#22 integrate
.. //depot/projects/usb/src/sys/i386/i386/mptable_pci.c#4 integrate
.. //depot/projects/usb/src/sys/i386/i386/msi.c#13 delete
.. //depot/projects/usb/src/sys/i386/i386/pmap.c#36 integrate
.. //depot/projects/usb/src/sys/i386/i386/ptrace_machdep.c#3 integrate
.. //depot/projects/usb/src/sys/i386/i386/support.s#9 integrate
.. //depot/projects/usb/src/sys/i386/i386/swtch.s#7 integrate
.. //depot/projects/usb/src/sys/i386/i386/trap.c#20 integrate
.. //depot/projects/usb/src/sys/i386/i386/tsc.c#6 integrate
.. //depot/projects/usb/src/sys/i386/i386/vm_machdep.c#17 integrate
.. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_proto.h#6 integrate
.. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_syscall.h#4 integrate
.. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysent.c#5 integrate
.. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysvec.c#5 integrate
.. //depot/projects/usb/src/sys/i386/include/apicreg.h#3 integrate
.. //depot/projects/usb/src/sys/i386/include/apicvar.h#15 integrate
.. //depot/projects/usb/src/sys/i386/include/atomic.h#7 integrate
.. //depot/projects/usb/src/sys/i386/include/clock.h#8 integrate
.. //depot/projects/usb/src/sys/i386/include/cpu.h#2 integrate
.. //depot/projects/usb/src/sys/i386/include/mca.h#4 integrate
.. //depot/projects/usb/src/sys/i386/include/md_var.h#7 integrate
.. //depot/projects/usb/src/sys/i386/include/npx.h#4 integrate
.. //depot/projects/usb/src/sys/i386/include/pcb.h#3 integrate
.. //depot/projects/usb/src/sys/i386/include/pcpu.h#8 integrate
.. //depot/projects/usb/src/sys/i386/include/pmap.h#18 integrate
.. //depot/projects/usb/src/sys/i386/include/proc.h#6 integrate
.. //depot/projects/usb/src/sys/i386/include/segments.h#3 integrate
.. //depot/projects/usb/src/sys/i386/include/smp.h#11 integrate
.. //depot/projects/usb/src/sys/i386/include/specialreg.h#19 integrate
.. //depot/projects/usb/src/sys/i386/include/vm86.h#2 integrate
.. //depot/projects/usb/src/sys/i386/include/vmparam.h#9 integrate
.. //depot/projects/usb/src/sys/i386/isa/npx.c#12 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux_machdep.c#13 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux_ptrace.c#3 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux_sysent.c#10 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#19 integrate

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:18 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4EBA01066615; Wed, 11 Aug 2010 18:26:18 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8A7DE106654D
	for ; Wed, 11 Aug 2010 18:26:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 7681A8FC24
	for ; Wed, 11 Aug 2010 18:26:16 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQGA8084399
	for ; Wed, 11 Aug 2010 18:26:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQGoN084396
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:16 GMT
Message-Id: <201008111826.o7BIQGoN084396@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182197 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:18 -0000

http://p4web.freebsd.org/@@182197?ac=10

Change 182197 by hselasky@hselasky_laptop001 on 2010/08/10 16:19:57

	USB controller (XHCI):
		- correctly compute multiplier and burst bits for
		isoc. transfers.
		- isochronous transfers should not fail on
		data errors and always report success to the
		client unless there is a complete stop in
		the isochronous schedule.
		- use timeout error code instead of I/O error
		code due to the way applications handle this
		kind of error.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#21 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#25 (text+ko) ====

@@ -113,6 +113,8 @@
 	uint8_t last_frame;
 	uint8_t trb_type;
 	uint8_t direction;
+	uint8_t tbc;
+	uint8_t tlbpc;
 };
 
 static void xhci_do_poll(struct usb_bus *);
@@ -722,6 +724,7 @@
 			if (xfer->flags_int.isochronous_xfr) {
 				if (halted) {
 					halted = 0;
+					status = XHCI_TRB_ERROR_SUCCESS;
 					remainder = td->len;
 				}
 			}
@@ -1537,7 +1540,9 @@
 
 			dword = XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_CYCLE_BIT |
 			  XHCI_TRB_3_TYPE_SET(temp->trb_type) | 
-			  XHCI_TRB_3_FRID_SET(temp->isoc_frame);
+			  XHCI_TRB_3_FRID_SET(temp->isoc_frame) | 
+			  XHCI_TRB_3_TBC_SET(temp->tbc) |
+			  XHCI_TRB_3_TLBPC_SET(temp->tlbpc);
 
 			if (temp->direction == UE_DIR_IN) {
 				dword |= XHCI_TRB_3_DIR_IN;
@@ -1637,7 +1642,10 @@
 	struct xhci_td *td;
 	uint32_t x;
 	uint32_t y;
+	uint8_t mult;
 
+	temp.tbc = 0;
+	temp.tlbpc = 0;
 	temp.average = xfer->max_hc_frame_size;
 	temp.max_packet_size = xfer->max_packet_size;
 	temp.sc = XHCI_BUS2SC(xfer->xroot->bus);
@@ -1663,6 +1671,20 @@
 	if (xfer->flags_int.isochronous_xfr) {
 		uint8_t shift;
 
+		/* compute multiplier for ISOCHRONOUS transfers */
+		mult = xfer->endpoint->ecomp ?
+		    (xfer->endpoint->ecomp->bmAttributes & 3) : 0;
+		/* check for USB 2.0 multiplier */
+		if (mult == 0) {
+			mult = (xfer->endpoint->edesc->
+			    wMaxPacketSize[1] >> 3) & 3;
+		}
+		/* range check */
+		if (mult > 2)
+			mult = 3;
+		else
+			mult++;
+
 		x = XREAD4(temp.sc, runt, XHCI_MFINDEX);
 
 		DPRINTF("MFINDEX=0x%08x\n", x);
@@ -1737,11 +1759,13 @@
 			xhci_setup_generic_chain_sub(&temp);
 		}
 		x = 1;
+		mult = 1;
 		temp.isoc_delta = 0;
 		temp.isoc_frame = 0;
 		temp.trb_type = XHCI_TRB_TYPE_DATA_STAGE;
 	} else {
 		x = 0;
+		mult = 1;
 		temp.isoc_delta = 0;
 		temp.isoc_frame = 0;
 		temp.trb_type = XHCI_TRB_TYPE_NORMAL;
@@ -1777,8 +1801,13 @@
 
 			temp.shortpkt = 0;
 
+			temp.tbc = 0;
+			temp.tlbpc = mult - 1;
+
 		} else if (xfer->flags_int.isochronous_xfr) {
 
+			uint8_t tdpc;
+
 			/* isochronous transfers don't have short packet termination */
 
 			temp.shortpkt = 1;
@@ -1787,6 +1816,18 @@
 
 			if (temp.len > xfer->max_frame_size)
 				temp.len = xfer->max_frame_size;
+
+			/* compute TD packet count */
+			tdpc = (temp.len + xfer->max_packet_size - 1) /
+			    xfer->max_packet_size;
+
+			temp.tbc = ((tdpc + mult - 1) / mult) - 1;
+			temp.tlbpc = (tdpc % mult);
+
+			if (temp.tlbpc == 0)
+				temp.tlbpc = mult - 1;
+			else
+				temp.tlbpc--;
 		} else {
 
 			/* regular data transfer */
@@ -2000,14 +2041,14 @@
 	switch (edesc->bmAttributes & UE_XFERTYPE) {
 	case UE_INTERRUPT:
 	case UE_ISOCHRONOUS:
-		temp = XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_SET(max_frame_size);
-		temp = XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_TD_PAYLOAD_MAX);
+		temp = XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_SET(max_frame_size) |
+		    XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_PAGE_SIZE);
 		break;
 	case UE_CONTROL:
 		temp = XHCI_EPCTX_4_AVG_TRB_LEN_SET(8);
 		break;
 	default:
-		temp = XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_TD_PAYLOAD_MAX);
+		temp = XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_PAGE_SIZE);
 		break;
 	}
 
@@ -3395,11 +3436,22 @@
 			/* nuke remaining buffered transfers */
 
 			for (i = 0; i != (XHCI_MAX_TRANSFERS - 1); i++) {
-				if (pepext->xfer[i] != NULL)
-					xhci_device_done(pepext->xfer[i], USB_ERR_IOERROR);
+				/*
+				 * NOTE: We need to use the timeout
+				 * error code here else existing
+				 * isochronous clients can get
+				 * confused:
+				 */
+				if (pepext->xfer[i] != NULL) {
+					xhci_device_done(pepext->xfer[i],
+					    USB_ERR_TIMEOUT);
+				}
 			}
 
-			/* NOTE: The USB transfer cannot vanish in this state! */
+			/*
+			 * NOTE: The USB transfer cannot vanish in
+			 * this state!
+			 */
 
 			USB_BUS_UNLOCK(&sc->sc_bus);
 

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#21 (text+ko) ====

@@ -205,6 +205,8 @@
 #define	XHCI_TRB_3_CHAIN_BIT		(1U << 4)
 #define	XHCI_TRB_3_IOC_BIT		(1U << 5)
 #define	XHCI_TRB_3_IDT_BIT		(1U << 6)
+#define	XHCI_TRB_3_TBC_GET(x)		(((x) >> 7) & 3)
+#define	XHCI_TRB_3_TBC_SET(x)		(((x) & 3) << 7)
 #define	XHCI_TRB_3_BEI_BIT		(1U << 9)
 #define	XHCI_TRB_3_DCEP_BIT		(1U << 9)
 #define	XHCI_TRB_3_PRSV_BIT		(1U << 9)

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:19 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D01E61066722; Wed, 11 Aug 2010 18:26:18 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B8F21066550
	for ; Wed, 11 Aug 2010 18:26:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E6488FC08
	for ; Wed, 11 Aug 2010 18:26:16 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQG8H084405
	for ; Wed, 11 Aug 2010 18:26:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQGph084402
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:16 GMT
Message-Id: <201008111826.o7BIQGph084402@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182198 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:19 -0000

http://p4web.freebsd.org/@@182198?ac=10

Change 182198 by hselasky@hselasky_laptop001 on 2010/08/10 16:31:35

	
	IFC
		- integrate octusb driver in new location

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/octusb.c#8 delete
.. //depot/projects/usb/src/sys/dev/usb/controller/octusb.h#3 delete
.. //depot/projects/usb/src/sys/mips/cavium/usb/octusb.c#2 edit
.. //depot/projects/usb/src/sys/modules/usb/octusb/Makefile#3 edit

Differences ...

==== //depot/projects/usb/src/sys/mips/cavium/usb/octusb.c#2 (text+ko) ====

@@ -1361,7 +1361,7 @@
 	.bcdUSB = {0x00, 0x02},
 	.bDeviceClass = UDCLASS_HUB,
 	.bDeviceSubClass = UDSUBCLASS_HUB,
-	.bDeviceProtocol = UDPROTO_FSHUB,
+	.bDeviceProtocol = UDPROTO_HSHUBSTT,
 	.bMaxPacketSize = 64,
 	.idVendor = {0},
 	.idProduct = {0},
@@ -1403,7 +1403,7 @@
 		.bNumEndpoints = 1,
 		.bInterfaceClass = UICLASS_HUB,
 		.bInterfaceSubClass = UISUBCLASS_HUB,
-		.bInterfaceProtocol = UIPROTO_FSHUB,
+		.bInterfaceProtocol = 0,
 	},
 	.endpd = {
 		.bLength = sizeof(struct usb_endpoint_descriptor),
@@ -1444,9 +1444,6 @@
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 
-	/* XXX disable power save mode, hence it is not supported */
-	udev->power_mode = USB_POWER_MODE_ON;
-
 	/* buffer reset */
 	ptr = (const void *)&sc->sc_hub_desc.temp;
 	len = 0;
@@ -1885,7 +1882,7 @@
 }
 
 static void
-octusb_get_dma_delay(struct usb_bus *bus, uint32_t *pus)
+octusb_get_dma_delay(struct usb_device *udev, uint32_t *pus)
 {
 	/* DMA delay - wait until any use of memory is finished */
 	*pus = (2125);			/* microseconds */
@@ -1909,6 +1906,13 @@
 	DPRINTF("Nothing to do.\n");
 }
 
+static void
+octusb_get_power_mode(struct usb_device *udev, int8_t *pmode)
+{
+	/* power save is not supported */
+	*pmode = USB_POWER_MODE_ON;
+}
+
 struct usb_bus_methods octusb_bus_methods = {
 	.endpoint_init = octusb_ep_init,
 	.xfer_setup = octusb_xfer_setup,
@@ -1919,4 +1923,5 @@
 	.set_hw_power = octusb_set_hw_power,
 	.roothub_exec = octusb_roothub_exec,
 	.xfer_poll = octusb_do_poll,
+	.get_power_mode = octusb_get_power_mode,
 };

==== //depot/projects/usb/src/sys/modules/usb/octusb/Makefile#3 (text+ko) ====

@@ -27,11 +27,11 @@
 
 S=	${.CURDIR}/../../..
 
-.PATH: $S/dev/usb/controller
+.PATH: $S/mips/cavium/usb
 
 KMOD=	octusb
 SRCS=	bus_if.h device_if.h usb_if.h \
-	opt_bus.h opt_usb.h \
-	octusb.c octusb.h
+	opt_bus.h opt_usb.h opt_cvmx.h \
+	octusb.c
 
 .include 

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:20 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3714D10667B0; Wed, 11 Aug 2010 18:26:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8C0961066552
	for ; Wed, 11 Aug 2010 18:26:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id CB4B68FC0C
	for ; Wed, 11 Aug 2010 18:26:16 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQGDa084411
	for ; Wed, 11 Aug 2010 18:26:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQGYT084408
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:16 GMT
Message-Id: <201008111826.o7BIQGYT084408@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182199 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:20 -0000

http://p4web.freebsd.org/@@182199?ac=10

Change 182199 by hselasky@hselasky_laptop001 on 2010/08/10 16:35:43

	
	USB controller (XHCI):
		- add support for multi transaction translator, MTT, feature.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#26 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#26 (text+ko) ====

@@ -2172,9 +2172,15 @@
 	    ((udev->speed == USB_SPEED_SUPER) ||
 	    (udev->speed = USB_SPEED_HIGH));
 
-	if (is_hub)
+	if (is_hub) {
 		temp |= XHCI_SCTX_0_HUB_SET(1);
 
+		if (udev->ddesc.bDeviceProtocol == UDPROTO_HSHUBMTT) {
+			DPRINTF("HUB supports MTT\n");
+			temp |= XHCI_SCTX_0_MTT_SET(1);
+		}
+	}
+
 	pinp->ctx_slot.dwSctx0 = htole32(temp);
 
 	temp = XHCI_SCTX_1_RH_PORT_SET(rh_port);

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:24 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 960C61066A8A; Wed, 11 Aug 2010 18:26:24 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 07E111066949
	for ; Wed, 11 Aug 2010 18:26:23 +0000 (UTC)
	(envelope-from afiveg@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id B22FB8FC22
	for ; Wed, 11 Aug 2010 18:26:21 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQLFJ084523
	for ; Wed, 11 Aug 2010 18:26:21 GMT
	(envelope-from afiveg@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQLZA084520
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:21 GMT
	(envelope-from afiveg@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:21 GMT
Message-Id: <201008111826.o7BIQLZA084520@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	afiveg@FreeBSD.org using -f
From: Alexandre Fiveg 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182215 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:25 -0000

http://p4web.freebsd.org/@@182215?ac=10

Change 182215 by afiveg@cottonmouth on 2010/08/10 19:30:53

	cosmetic fixes

Affected files ...

.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#15 edit
.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#15 edit
.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#18 edit
.. //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#30 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#31 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#30 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#28 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#20 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#13 edit
.. //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#14 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#44 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#44 edit
.. //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#14 edit
.. //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#26 edit
.. //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#27 edit
.. //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#21 edit
.. //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#12 edit

Differences ...

==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-bpf.c#15 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap-int.h#15 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/pcap.c#18 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/contrib/libpcap/ringmap_pcap.c#30 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/if_lem.c#31 (text+ko) ====

@@ -1436,10 +1436,6 @@
 	 */
 	lem_disable_intr(adapter);
 
-#ifdef RINGMAP
-	adapter->rm->funcs->isr(arg);
-#endif
-
 	taskqueue_enqueue(adapter->tq, &adapter->rxtx_task);
 
 	/* Link status change */
@@ -3518,8 +3514,10 @@
 
 #ifdef RINGMAP
 	/* Call our ringmap-isr only in case any process captures (open_cnt > 0) */ 
-	if ((adapter->rm != NULL) && (adapter->rm->open_cnt > 0)) 
+	RINGMAP_LOCK(adapter->rm);
+	if (adapter->rm->open_cnt > 0) 
 		adapter->rm->funcs->delayed_isr(adapter);
+	RINGMAP_UNLOCK(adapter->rm);
 #endif
 
 	while ((current_desc->status & E1000_RXD_STAT_DD) &&
@@ -3576,8 +3574,10 @@
 		if (accept_frame) {
 
 #ifdef RINGMAP
-			if ((adapter->rm != NULL) && (adapter->rm->open_cnt > 0)) 
+			RINGMAP_LOCK(adapter->rm);
+			if (adapter->rm->open_cnt)
 				adapter->rm->funcs->delayed_isr_per_packet(adapter->dev, i);
+			RINGMAP_UNLOCK(adapter->rm);
 #endif
 
 #ifndef RINGMAP
@@ -3704,8 +3704,8 @@
 	if (--i < 0)
 		i = adapter->num_rx_desc - 1;
 
+	/* RINGMAP: Don't write RDT. We do it in sync_tail() */
 #ifndef RINGMAP
-	/* Tail pointer will be with userrp synchronized */
 	E1000_WRITE_REG(&adapter->hw, E1000_RDT(0), i);
 #endif 
 

==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.c#30 (text+ko) ====

@@ -102,7 +102,6 @@
 	struct timeval	last_ts;
 
 	RINGMAP_INTR(start);
-	RINGMAP_LOCK(adapter->rm);
 
 	getmicrotime(&last_ts);
 
@@ -118,7 +117,6 @@
 		}
 	}
 
-	RINGMAP_UNLOCK(adapter->rm);
 	RINGMAP_INTR(end);
 }
 
@@ -157,7 +155,6 @@
 
 	RINGMAP_INTR(start);
 
-	RINGMAP_LOCK(rm);
 	SLIST_FOREACH(co, &rm->object_list, objects) {
 		if (co->ring != NULL) {
 			co->ring->slot[slot_num].is_ok = 1;
@@ -172,7 +169,6 @@
 #endif 
 		}
 	}
-	RINGMAP_UNLOCK(rm);
 
 	RINGMAP_INTR(end);
 }

==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_8254.h#28 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/e1000/ringmap_e1000.h#20 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_8259.h#13 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/dev/ixgbe/ringmap_ixgbe.c#14 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.c#44 (text+ko) ====

@@ -61,7 +61,7 @@
 };
 
 
-struct ringmap_global_list ringmap_list_head = 
+static struct ringmap_global_list ringmap_list_head = 
 		SLIST_HEAD_INITIALIZER(ringmap_list_head);
 
 
@@ -125,6 +125,10 @@
 }
 
 
+/* 
+ * Should be called from driver detach function. It is a little dangerous 
+ * place. Probably we shoul protect our data here with mutexes.
+ */
 int
 ringmap_detach(device_t dev)
 {
@@ -138,7 +142,7 @@
 		RINGMAP_WARN(Can not get pointer to ringmap structure);
 		return (-1);
 	}
-
+	
 	/* Remove all capturing objects associated with ringmap */
     while (!SLIST_EMPTY(&rm->object_list)) {
 	    co = SLIST_FIRST(&rm->object_list);
@@ -185,7 +189,6 @@
 	rm = cdev2ringmap(cdev);
 	if ( rm == NULL ) {
 		RINGMAP_ERROR(Null pointer to ringmap structure);
-
 		return (EIO);
 	}
 
@@ -194,7 +197,6 @@
 	/* TODO: set max number of threads in the ringmap struct as a variable */
 	if (rm->open_cnt == RINGMAP_MAX_THREADS) {
 		RINGMAP_ERROR(Can not open device!);
-
 		err = EIO; goto out;
 	}
 
@@ -214,7 +216,6 @@
 			M_DEVBUF, M_ZERO, 0, -1L, PAGE_SIZE, 0);
 	if (ring == NULL) {
 		RINGMAP_ERROR(Can not allocate space for ring);
-
 		err = EIO; goto out;
 	}
 
@@ -302,7 +303,6 @@
 int
 ringmap_close(struct cdev *cdev, int flag, int otyp, struct thread *td)
 {
-
 	RINGMAP_FUNC_DEBUG(start);
 
 #if (__RINGMAP_DEB)
@@ -338,15 +338,14 @@
 		SLIST_REMOVE(&rm->object_list, co, capt_object, objects);
 		FREE(co, M_DEVBUF);
 		data = NULL;
+
+		rm->open_cnt--;
+		RINGMAP_UNLOCK(rm);
+
 	} else {
 		RINGMAP_FUNC_DEBUG(NULL pointer to the capturing object!);
 	}
 	
-	if (rm->open_cnt)
-		--rm->open_cnt;
-
-	RINGMAP_UNLOCK(rm);
-
 	RINGMAP_FUNC_DEBUG(end);
 }
 
@@ -454,7 +453,7 @@
 
 	RINGMAP_IOCTL(start);
 
-#if (__RINGMAP_DEB)
+#if (RINGMAP_IOCTL_DEB)
 	printf("[%s] pid = %d\n", __func__, td->td_proc->p_pid);
 #endif 
 
@@ -488,7 +487,7 @@
 			/* Set adapter TAIL register */
 			rm->funcs->sync_tail(co);
 
-#if (__RINGMAP_DEB)
+#if (RINGMAP_IOCTL_DEB)
 			print_capt_obj(co);
 			PRINT_RING_PTRS(co->ring);
 #endif

==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap.h#44 (text+ko) ====


==== //depot/projects/soc2010/ringmap/current/sys/net/ringmap_kernel.h#14 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/build_ringmap.sh#26 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/set_ringmap.sh#27 (text+ko) ====


==== //depot/projects/soc2010/ringmap/scripts/tailf_ringmap_msgs.sh#21 (text+ko) ====


==== //depot/projects/soc2010/ringmap/tests/libpcap/easy_pcap.c#12 (text+ko) ====


From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:25 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5A2801066B6F; Wed, 11 Aug 2010 18:26:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 08400106694D
	for ; Wed, 11 Aug 2010 18:26:23 +0000 (UTC)
	(envelope-from jlaffaye@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id F0E7D8FC16
	for ; Wed, 11 Aug 2010 18:26:21 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQL02084529
	for ; Wed, 11 Aug 2010 18:26:21 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQLIV084526
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:21 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:21 GMT
Message-Id: <201008111826.o7BIQLIV084526@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jlaffaye@FreeBSD.org using -f
From: Julien Laffaye 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182216 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:25 -0000

http://p4web.freebsd.org/@@182216?ac=10

Change 182216 by jlaffaye@jlaffaye-chulak on 2010/08/10 19:51:08

	Remove dead code.
	Re-implement the _TOP environment variable behavior via a global PkgTopDir
	(used to find dependencies on local disk).

Affected files ...

.. //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#11 edit
.. //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#8 edit
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/add.h#7 edit
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#15 edit
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#14 edit

Differences ...

==== //depot/projects/soc2010/pkg_complete/lib/libpkg/pkg.h#11 (text+ko) ====

@@ -174,7 +174,6 @@
 Boolean		isempty(const char *);
 Boolean		issymlink(const char *);
 Boolean		isURL(const char *);
-const char	*fileGetURL(const char *, const char *, int);
 int		find_package_url(char * restrict, const char *, const char *);
 int		fetch_archive(const char *, Boolean);
 char		*fileFindByPath(const char *, const char *);

==== //depot/projects/soc2010/pkg_complete/lib/libpkg/url.c#8 (text+ko) ====

@@ -31,162 +31,6 @@
 #include "pkg.h"
 
 /*
- * Try and fetch a file by URL, returning the directory name for where
- * it's unpacked, if successful.
- * XXX (jlaffaye): to be removed when all call to fileGetURL() are converted to
- * fetch_archive()
- */
-const char *
-fileGetURL(const char *base, const char *spec, int keep_package)
-{
-	FILE *ftp = NULL;
-	const char *rp = NULL;
-	char *cp, *hint, *tmp;
-	char fname[FILENAME_MAX];
-	char pen[FILENAME_MAX];
-	char pkg[FILENAME_MAX];
-	char buf[8192];
-	int fd = -1, pkgfd = -1;
-	int pfd[2], pstat, r, w = 0;
-	pid_t tpid;
-
-	rp = NULL;
-	/* Special tip that sysinstall left for us */
-	hint = getenv("PKG_ADD_BASE");
-	if (!isURL(spec)) {
-		/*
-		 * We've been given an existing URL (that's known-good) and now
-		 * we need to construct a composite one out of that and the
-		 * basename we were handed as a dependency.
-		 */
-		if (base != NULL) {
-
-			strcpy(fname, base);
-
-		    	/*
-	    		 * Advance back two slashes to get to the root of the
-	    		 * package hierarchy
-			 */
-			cp = strrchr(fname, '/');
-			if (cp) {
-				*cp = '\0';	/* chop name */
-				cp = strrchr(fname, '/');
-			}
-			if (cp != NULL) {
-				*(cp + 1) = '\0';
-				strcat(cp, "All/");
-				strcat(cp, spec);
-				strcat(cp, ".tbz");
-			}
-			else
-				return (NULL);
-		}
-		else if (hint != NULL) {
-			/*
-			 * Otherwise, we've been given an environment variable
-			 * hinting at the right location from sysinstall
-			 */
-			strcpy(fname, hint);
-			strcat(fname, spec);
-			strcat(fname, ".tbz");
-
-		}
-		else
-			return (NULL);
-
-	}
-	else
-		strcpy(fname, spec);
-
-	if (keep_package) {
-
-		tmp = getenv("PKGDIR");
-		strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg));
-		tmp = basename(fname);
-		strlcat(pkg, "/", sizeof(pkg));
-		strlcat(pkg, tmp, sizeof(pkg));
-
-		if ((pkgfd = open(pkg, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) {
-			warn("Error: Unable to open %s", pkg);
-			return (NULL);
-		}
-
-	}
-
-	fetchDebug = (Verbose > 0);
-	if ((ftp = fetchGetURL(fname, Verbose ? "v" : NULL)) == NULL) {
-		warnx("Error: Unable to get %s: %s\n", fname,
-		      fetchLastErrString);
-		/* If the fetch fails, yank the package. */
-		if (keep_package && unlink(pkg) < 0) {
-			warnx("failed to remove partially fetched package: %s",
-			      pkg);
-		}
-		return (NULL);
-	}
-
-	if (isatty(0) || Verbose) {
-		printf("Fetching %s...", fname);
-		fflush(stdout);
-	}
-	pen[0] = '\0';
-	if ((rp = make_playpen(pen, 0)) == NULL)
-		warn("Error: Unable to construct a new playpen for FTP!");
-	else if (pipe(pfd) == -1)
-		warn("pipe()");
-	else
-		switch ((tpid = fork())) {
-		case -1:
-			warn("fork()");
-			break;
-		case 0:
-			dup2(pfd[0], 0);
-			for (fd = getdtablesize() - 1; fd >= 3; --fd)
-				close(fd);
-			execl("/usr/bin/tar", "tar",
-			    Verbose ? "-xpjvf" : "-xpjf", "-", (char *)0);
-			_exit(2);
-		default:
-			close(pfd[0]);
-
-			for (;;) {
-
-				if ((r = fread(buf, 1, sizeof(buf), ftp)) < 1)
-					break;
-				if ((w = write(pfd[1], buf, r)) != r)
-					break;
-				if (keep_package)
-					if ((w = write(pkgfd, buf, r)) != r)
-						break;
-
-			}
-			if (w == -1)
-				warn("warning: error writing to tar");
-			if (ferror(ftp))
-				warn("warning: error reading from server");
-
-			close(pfd[1]);
-			tpid = waitpid(tpid, &pstat, 0);
-			if (Verbose)
-				printf("tar command returned %d status\n",
-				    WEXITSTATUS(pstat));
-			if (rp != NULL && (isatty(0) || Verbose))
-				printf(" Done.\n");
-			break;
-		}
-
-	if (0 < fd)
-		close(fd);
-	if (ftp != NULL)
-		fclose(ftp);
-	if (0 < pkgfd)
-		close(pkgfd);
-
-	return (rp);
-
-}
-
-/*
  * Given a know-good URL `base', construct the URL to fetch `pkgname'.
  * The resulting URL is stored in a fixed buffer of size MAXPATHLEN
  * pointed by `p'.

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/add.h#7 (text+ko) ====

@@ -41,6 +41,7 @@
 extern Boolean	KeepPackage;
 extern Boolean	IgnoreDeps;
 extern add_mode_t AddMode;
+extern char	PkgTopDir[PATH_MAX];
 
 int	mkdirs(char *path);
 int	extract_package(struct archive *, Package *, const char *);

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#15 (text+ko) ====

@@ -248,7 +248,7 @@
 			    if (ext == NULL)
 				ext = ".tbz";
 			    snprintf(path, FILENAME_MAX, "%s/%s%s",
-				     getenv("_TOP"), p->name, ext);
+				     PkgTopDir, p->name, ext);
 			    if (fexists(path))
 				cp = path;
 			    else

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#14 (text+ko) ====

@@ -38,6 +38,8 @@
 extern char	db_dir_tmp[FILENAME_MAX];
 extern char	db_dir[FILENAME_MAX];
 
+char		PkgTopDir[PATH_MAX];
+
 int
 pkg_perform(char **pkgs)
 {
@@ -47,11 +49,15 @@
 	if (register_cleanup_handler(cleanup, NULL, NULL, 0) == -1)
 		err(EXIT_FAILURE, "failed to initialize cleanup exit handler");
 
-	if (AddMode == SLAVE)
+	if (AddMode == SLAVE) {
+		PkgTopDir[0] = '\0';
 		err_cnt = pkg_do(NULL);
+	}
 	else
-		for (i = 0; pkgs[i]; i++)
+		for (i = 0; pkgs[i]; i++) {
+			PkgTopDir[0] = '\0';
 			err_cnt += pkg_do(pkgs[i]);
+		}
 	return err_cnt;
 }
 
@@ -93,6 +99,12 @@
 		    retcode = 1;
 		    goto cleanup;
 		}
+		if (PkgTopDir[0] == '\0')
+		    if (realpath(dirname(fname), PkgTopDir) == NULL) {
+			warn("realpath()");
+			retcode = 1;
+			goto cleanup;
+		    }
 	    }
 	}
 
@@ -133,86 +145,6 @@
 	if (a != NULL)
 	    archive_read_finish(a);
 	return (retcode);
-
-# if 0
-    /* Are we coming in for a second pass, everything already extracted? */
-    if (!pkg) {
-	fgets(playpen, FILENAME_MAX, stdin);
-	playpen[strlen(playpen) - 1] = '\0'; /* pesky newline! */
-	if (chdir(playpen) == -1) {
-	    warnx("pkg_add in SLAVE mode can't chdir to %s", playpen);
-	    return 1;
-	}
-	if (read_plist(&Plist, fileno(stdin)) != 0)
-	    return 1;
-	where_to = playpen;
-    }
-    /* Nope - do it now */
-    else {
-	/* Is it an ftp://foo.bar.baz/file.t[bg]z specification? */
-	if (isURL(pkg)) {
-	    if (!(where_to = fileGetURL(NULL, pkg, KeepPackage))) {
-		warnx("unable to fetch '%s' by URL", pkg);
-		cleanup();
-		return 1;
-	    }
-	    cfile = open(CONTENTS_FNAME, O_RDONLY);
-	    if (cfile == -1) {
-		warnx(
-		"unable to open table of contents file '%s' - not a package?",
-		CONTENTS_FNAME);
-		goto bomb;
-	    }
-	    rc = read_plist(&Plist, cfile);
-	    close(cfile);
-	    if (rc != 0)
-		goto bomb;
-	}
-	else {
-
-	    /* 
-	     * If TRUE: We have to extract the whole thing to disk because
-	     * this could be our one and only shot to do so...
-	     */
-	    Boolean extract_whole_archive_from_stdin = FALSE;
-
-	    if (strcmp(pkg, "-") == 0)
-		extract_whole_archive_from_stdin = TRUE;
-
-	    /* Since we can call ourselves recursively, keep notes on where we
-came from */
-	    if (!getenv("_TOP"))
-		setenv("_TOP", where_to, 1);
-	    if (extract_whole_archive_from_stdin == TRUE) {
-		if (unpack_to_disk(NULL, NULL) == 0)
-		    cfile = open(CONTENTS_FNAME, O_RDONLY);
-		else {
-		    warnx("unable to extract table of contents file from '%s' "
-			"- not a package?", pkg);
-		}
-	    } else
-		cfile = unpack_to_fd(pkg, CONTENTS_FNAME);
-
-	    if (cfile == -1) {
-		warnx("unable to open table of contents file '%s' - not a "
-		    "package?", CONTENTS_FNAME);
-		goto bomb;
-	    }
-	    rc = read_plist(&Plist, cfile);
-	    (void) close(cfile);
-	    if (rc != 0)
-		goto bomb;
-	}
-
-	/* If we're running in MASTER mode, just output the plist and return */
-	if (AddMode == MASTER) {
-	    printf("%s\n", where_playpen());
-	    if (write_plist(&Plist, stdout) != 0)
-		return 1;
-	    return 0;
-	}
-    }
-#endif
 }
 
 void

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:25 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9E6BB1066BE4; Wed, 11 Aug 2010 18:26:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09D2A106694E
	for ; Wed, 11 Aug 2010 18:26:23 +0000 (UTC)
	(envelope-from jlaffaye@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 5C6758FC24
	for ; Wed, 11 Aug 2010 18:26:22 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQMiK084541
	for ; Wed, 11 Aug 2010 18:26:22 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQMOK084538
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:22 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:22 GMT
Message-Id: <201008111826.o7BIQMOK084538@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jlaffaye@FreeBSD.org using -f
From: Julien Laffaye 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182218 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:25 -0000

http://p4web.freebsd.org/@@182218?ac=10

Change 182218 by jlaffaye@jlaffaye-chulak on 2010/08/10 20:04:01

	Remove useless globals.

Affected files ...

.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#16 edit
.. //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#15 edit

Differences ...

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/extract.c#16 (text+ko) ====

@@ -31,10 +31,8 @@
 
 #include "add.h"
 
-/* Globals used by cleanup() */
-int	extract_state;
-char	db_dir_tmp[FILENAME_MAX];
-char	db_dir[FILENAME_MAX];
+/* Global used by cleanup() */
+char db_dir_tmp[FILENAME_MAX];
 
 /*
  * Extract and parse the plist of a package archive.
@@ -90,6 +88,7 @@
 	Boolean conflictsfound = FALSE;
 	int code = 0;
 	int errcode = 0;
+	char db_dir[FILENAME_MAX];
 	char cmd[FILENAME_MAX];
 	char pre_script[FILENAME_MAX] = INSTALL_FNAME;
 	char post_script[FILENAME_MAX];
@@ -102,7 +101,7 @@
 	struct stat sb;
 
 	/* Nothing to cleanup yet */
-	extract_state = 0;
+	db_dir_tmp[0] = '\0';
 
 	/*
 	* If we have a prefix, delete the first one we see and add this
@@ -289,7 +288,7 @@
 				    printf("%s added successfully\n", p->name);
 			}
 			/* pkg_do() modified this global, so reset it */
-			extract_state = 0;
+			db_dir_tmp[0] = '\0';
 		    }
 		    /* XXX: WTF is this logic ? */
 		    else {
@@ -324,8 +323,6 @@
 	    warnx("Can not create '%s' directory - aborting", db_dir_tmp);
 	    return (1);
 	}
-	/* Tell cleanup that we have a temporary dir in LOG_DIR */
-	extract_state = 1;
 	if (chdir(db_dir_tmp) == -1) {
 	    warn("chdir(%s) - aborting", db_dir_tmp);
 	    vsystem("%s -rf %s", REMOVE_CMD, db_dir_tmp);
@@ -629,7 +626,7 @@
 	    if (rename(db_dir_tmp, db_dir) == -1)
 		warn("Can not rename '%s' to '%s'", db_dir_tmp, db_dir);
 	    else {
-		extract_state = 0;
+		db_dir_tmp[0] = '\0';
 		if (Verbose)
 		    printf("Package %s registered in %s\n", pkg->name, db_dir);
 	    }

==== //depot/projects/soc2010/pkg_complete/usr.sbin/pkg_install/add/perform.c#15 (text+ko) ====

@@ -150,6 +150,6 @@
 void
 cleanup(void)
 {
-    if (extract_state == 1)
+    if (db_dir_tmp[0] != '\0')
 	vsystem("%s -rf %s", REMOVE_CMD, db_dir_tmp);
 }

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:36 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE0821065712; Wed, 11 Aug 2010 18:26:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C5B311066A34
	for ; Wed, 11 Aug 2010 18:26:23 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id B14AD8FC12
	for ; Wed, 11 Aug 2010 18:26:23 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQNIW084563
	for ; Wed, 11 Aug 2010 18:26:23 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQMNQ084557
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:22 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:22 GMT
Message-Id: <201008111826.o7BIQMNQ084557@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182221 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:36 -0000

http://p4web.freebsd.org/@@182221?ac=10

Change 182221 by gonzo@gonzo_figaro on 2010/08/10 20:47:21

	IFC

Affected files ...

.. //depot/projects/avr32/src/Makefile.mips#2 integrate
.. //depot/projects/avr32/src/ObsoleteFiles.inc#15 integrate
.. //depot/projects/avr32/src/bin/sh/mksyntax.c#4 integrate
.. //depot/projects/avr32/src/contrib/bsnmp/snmp_mibII/mibII.c#4 integrate
.. //depot/projects/avr32/src/contrib/traceroute/traceroute.c#3 integrate
.. //depot/projects/avr32/src/etc/periodic/daily/Makefile#3 integrate
.. //depot/projects/avr32/src/etc/periodic/security/460.chkportsum#2 integrate
.. //depot/projects/avr32/src/games/fortune/datfiles/freebsd-tips#3 integrate
.. //depot/projects/avr32/src/include/stdio.h#6 integrate
.. //depot/projects/avr32/src/lib/libc/net/sctp_recvmsg.3#4 integrate
.. //depot/projects/avr32/src/lib/libc/net/sctp_sendmsg.3#4 integrate
.. //depot/projects/avr32/src/lib/libc/stdlib/malloc.3#4 integrate
.. //depot/projects/avr32/src/lib/libc/sys/kqueue.2#4 integrate
.. //depot/projects/avr32/src/lib/libc/sys/ptrace.2#5 integrate
.. //depot/projects/avr32/src/lib/libcam/cam.3#3 integrate
.. //depot/projects/avr32/src/lib/libcompat/4.1/ascftime.c#3 delete
.. //depot/projects/avr32/src/lib/libcompat/4.1/cftime.3#3 delete
.. //depot/projects/avr32/src/lib/libcompat/4.1/cftime.c#3 delete
.. //depot/projects/avr32/src/lib/libcompat/4.1/ftime.c#3 integrate
.. //depot/projects/avr32/src/lib/libcompat/4.1/getpw.3#2 delete
.. //depot/projects/avr32/src/lib/libcompat/4.1/getpw.c#3 delete
.. //depot/projects/avr32/src/lib/libcompat/4.3/cfree.3#2 delete
.. //depot/projects/avr32/src/lib/libcompat/4.3/cfree.c#4 delete
.. //depot/projects/avr32/src/lib/libcompat/Makefile#3 integrate
.. //depot/projects/avr32/src/lib/libgpib/gpib.3#2 integrate
.. //depot/projects/avr32/src/lib/libpmc/pmc.corei7.3#3 integrate
.. //depot/projects/avr32/src/lib/libpmc/pmc.mips.3#2 integrate
.. //depot/projects/avr32/src/lib/libpmc/pmc.westmere.3#3 integrate
.. //depot/projects/avr32/src/lib/libpmc/pmc.westmereuc.3#2 integrate
.. //depot/projects/avr32/src/lib/libusb/libusb.3#9 integrate
.. //depot/projects/avr32/src/lib/libutil/property.3#4 integrate
.. //depot/projects/avr32/src/libexec/rtld-elf/mips/reloc.c#4 integrate
.. //depot/projects/avr32/src/libexec/talkd/announce.c#2 integrate
.. //depot/projects/avr32/src/libexec/talkd/table.c#2 integrate
.. //depot/projects/avr32/src/libexec/ypxfr/ypxfr.8#3 integrate
.. //depot/projects/avr32/src/release/picobsd/tinyware/login/pico-login.c#3 integrate
.. //depot/projects/avr32/src/sbin/fsck/fsck.8#4 integrate
.. //depot/projects/avr32/src/sbin/fsck_ffs/fsck_ffs.8#4 integrate
.. //depot/projects/avr32/src/sbin/geom/class/part/gpart.8#4 integrate
.. //depot/projects/avr32/src/sbin/geom/core/geom.8#4 integrate
.. //depot/projects/avr32/src/sbin/hastctl/hastctl.c#2 integrate
.. //depot/projects/avr32/src/sbin/hastd/hast.conf.5#3 integrate
.. //depot/projects/avr32/src/sbin/ifconfig/af_link.c#2 integrate
.. //depot/projects/avr32/src/sbin/ifconfig/ifconfig.8#7 integrate
.. //depot/projects/avr32/src/sbin/ifconfig/ifconfig.c#7 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/Makefile#3 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/auth_subr.c#2 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/config.c#3 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/fsm.c#2 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/iscontrol.8#3 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/iscontrol.c#2 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/iscontrol.h#3 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/iscsi.conf.5#4 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/login.c#2 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/misc.c#2 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/pdu.c#3 integrate
.. //depot/projects/avr32/src/sbin/iscontrol/pdu.h#2 delete
.. //depot/projects/avr32/src/sbin/ping6/ping6.8#3 integrate
.. //depot/projects/avr32/src/sbin/sunlabel/sunlabel.8#3 integrate
.. //depot/projects/avr32/src/share/man/man4/alc.4#2 integrate
.. //depot/projects/avr32/src/share/man/man4/cmx.4#3 integrate
.. //depot/projects/avr32/src/share/man/man4/dc.4#3 integrate
.. //depot/projects/avr32/src/share/man/man4/gre.4#3 integrate
.. //depot/projects/avr32/src/share/man/man4/iic.4#3 integrate
.. //depot/projects/avr32/src/share/man/man4/linux.4#3 integrate
.. //depot/projects/avr32/src/share/man/man4/meteor.4#2 integrate
.. //depot/projects/avr32/src/share/man/man4/net80211.4#3 integrate
.. //depot/projects/avr32/src/share/man/man4/ng_car.4#2 integrate
.. //depot/projects/avr32/src/share/man/man4/pcii.4#2 integrate
.. //depot/projects/avr32/src/share/man/man4/pcm.4#7 integrate
.. //depot/projects/avr32/src/share/man/man4/sctp.4#3 integrate
.. //depot/projects/avr32/src/share/man/man9/BUS_NEW_PASS.9#2 integrate
.. //depot/projects/avr32/src/share/man/man9/Makefile#14 integrate
.. //depot/projects/avr32/src/share/man/man9/ieee80211_vap.9#3 integrate
.. //depot/projects/avr32/src/share/man/man9/mbuf.9#2 integrate
.. //depot/projects/avr32/src/share/man/man9/rman.9#2 integrate
.. //depot/projects/avr32/src/share/syscons/keymaps/INDEX.keymaps#3 integrate
.. //depot/projects/avr32/src/share/syscons/keymaps/Makefile#3 integrate
.. //depot/projects/avr32/src/share/syscons/keymaps/swissgerman.macbook.acc.kbd#1 branch
.. //depot/projects/avr32/src/share/termcap/termcap.src#5 integrate
.. //depot/projects/avr32/src/sys/amd64/acpica/acpi_wakeup.c#8 integrate
.. //depot/projects/avr32/src/sys/amd64/amd64/mp_machdep.c#12 integrate
.. //depot/projects/avr32/src/sys/amd64/amd64/pmap.c#12 integrate
.. //depot/projects/avr32/src/sys/amd64/amd64/tsc.c#2 integrate
.. //depot/projects/avr32/src/sys/amd64/conf/GENERIC#11 integrate
.. //depot/projects/avr32/src/sys/amd64/ia32/ia32_signal.c#8 integrate
.. //depot/projects/avr32/src/sys/amd64/include/smp.h#7 integrate
.. //depot/projects/avr32/src/sys/boot/zfs/zfsimpl.c#4 integrate
.. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#8 integrate
.. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32.h#4 integrate
.. //depot/projects/avr32/src/sys/compat/freebsd32/freebsd32_misc.c#10 integrate
.. //depot/projects/avr32/src/sys/compat/x86bios/x86bios.c#5 integrate
.. //depot/projects/avr32/src/sys/conf/files#19 integrate
.. //depot/projects/avr32/src/sys/conf/files.i386#13 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/changes.txt#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/common/adisasm.c#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/common/dmextern.c#3 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#6 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslglobal.h#6 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslmain.c#6 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/compiler/aslstartup.c#4 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/debugger/dbcmds.c#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/debugger/dbinput.c#4 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/events/evxfevnt.c#4 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/executer/exfldio.c#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/executer/exprep.c#4 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acdebug.h#4 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acdisasm.h#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acglobal.h#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/aclocal.h#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acobject.h#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acpiosxf.h#3 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acpixf.h#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/actypes.h#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/include/acutils.h#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/osunixxf.c#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/uteval.c#4 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/utglobal.c#5 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/utinit.c#4 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/utmutex.c#3 integrate
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/utosi.c#1 branch
.. //depot/projects/avr32/src/sys/contrib/dev/acpica/utilities/utxface.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/acpica/Osd/OsdHardware.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/acpica/Osd/OsdMemory.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/acpica/acpi_ec.c#6 integrate
.. //depot/projects/avr32/src/sys/dev/alc/if_alc.c#7 integrate
.. //depot/projects/avr32/src/sys/dev/alc/if_alcreg.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/alc/if_alcvar.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#3 integrate
.. //depot/projects/avr32/src/sys/dev/ath/if_ath.c#14 integrate
.. //depot/projects/avr32/src/sys/dev/e1000/if_igb.c#11 integrate
.. //depot/projects/avr32/src/sys/dev/fb/vesa.c#4 integrate
.. //depot/projects/avr32/src/sys/dev/iicbus/iic.h#4 integrate
.. //depot/projects/avr32/src/sys/dev/iscsi/initiator/isc_cam.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/iscsi/initiator/isc_sm.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/iscsi/initiator/isc_soc.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/iscsi/initiator/isc_subr.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/iscsi/initiator/iscsi.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/iscsi/initiator/iscsi_subr.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/iscsi/initiator/iscsivar.h#2 integrate
.. //depot/projects/avr32/src/sys/dev/mii/atphy.c#2 integrate
.. //depot/projects/avr32/src/sys/dev/mii/e1000phy.c#7 integrate
.. //depot/projects/avr32/src/sys/dev/mii/miidevs#6 integrate
.. //depot/projects/avr32/src/sys/dev/mpt/mpt_pci.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/null/null.c#3 integrate
.. //depot/projects/avr32/src/sys/dev/ste/if_ste.c#5 integrate
.. //depot/projects/avr32/src/sys/dev/usb/quirk/usb_quirk.c#8 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/uplcom.c#11 integrate
.. //depot/projects/avr32/src/sys/dev/usb/serial/uslcom.c#11 integrate
.. //depot/projects/avr32/src/sys/dev/usb/usbdevs#13 integrate
.. //depot/projects/avr32/src/sys/fs/coda/coda.h#3 integrate
.. //depot/projects/avr32/src/sys/fs/coda/coda_venus.c#3 integrate
.. //depot/projects/avr32/src/sys/fs/coda/coda_vnops.c#5 integrate
.. //depot/projects/avr32/src/sys/fs/devfs/devfs.h#4 integrate
.. //depot/projects/avr32/src/sys/fs/devfs/devfs_rule.c#2 integrate
.. //depot/projects/avr32/src/sys/fs/devfs/devfs_vfsops.c#4 integrate
.. //depot/projects/avr32/src/sys/fs/devfs/devfs_vnops.c#9 integrate
.. //depot/projects/avr32/src/sys/i386/conf/GENERIC#10 integrate
.. //depot/projects/avr32/src/sys/i386/i386/mp_machdep.c#11 integrate
.. //depot/projects/avr32/src/sys/i386/i386/pmap.c#11 integrate
.. //depot/projects/avr32/src/sys/i386/i386/tsc.c#3 integrate
.. //depot/projects/avr32/src/sys/i386/include/smp.h#5 integrate
.. //depot/projects/avr32/src/sys/i386/xen/mp_machdep.c#11 integrate
.. //depot/projects/avr32/src/sys/ia64/ia32/ia32_signal.c#3 integrate
.. //depot/projects/avr32/src/sys/ia64/ia64/mp_machdep.c#8 integrate
.. //depot/projects/avr32/src/sys/ia64/include/smp.h#4 integrate
.. //depot/projects/avr32/src/sys/kern/init_main.c#9 integrate
.. //depot/projects/avr32/src/sys/kern/kern_conf.c#8 integrate
.. //depot/projects/avr32/src/sys/kern/kern_cons.c#4 integrate
.. //depot/projects/avr32/src/sys/kern/kern_jail.c#12 integrate
.. //depot/projects/avr32/src/sys/kern/kern_ktrace.c#7 integrate
.. //depot/projects/avr32/src/sys/kern/sched_4bsd.c#4 integrate
.. //depot/projects/avr32/src/sys/kern/sched_ule.c#10 integrate
.. //depot/projects/avr32/src/sys/kern/subr_param.c#6 integrate
.. //depot/projects/avr32/src/sys/kern/subr_smp.c#8 integrate
.. //depot/projects/avr32/src/sys/kern/tty.c#15 integrate
.. //depot/projects/avr32/src/sys/kern/uipc_socket.c#10 integrate
.. //depot/projects/avr32/src/sys/kern/vfs_bio.c#12 integrate
.. //depot/projects/avr32/src/sys/kern/vfs_cluster.c#5 integrate
.. //depot/projects/avr32/src/sys/mips/atheros/ar71xx_pci.c#2 integrate
.. //depot/projects/avr32/src/sys/mips/include/cpuregs.h#4 integrate
.. //depot/projects/avr32/src/sys/mips/include/pmap.h#7 integrate
.. //depot/projects/avr32/src/sys/mips/include/pte.h#4 integrate
.. //depot/projects/avr32/src/sys/mips/include/smp.h#5 integrate
.. //depot/projects/avr32/src/sys/mips/mips/locore.S#4 integrate
.. //depot/projects/avr32/src/sys/mips/mips/mp_machdep.c#6 integrate
.. //depot/projects/avr32/src/sys/mips/mips/mpboot.S#3 integrate
.. //depot/projects/avr32/src/sys/mips/mips/pmap.c#10 integrate
.. //depot/projects/avr32/src/sys/mips/sibyte/sb_machdep.c#3 integrate
.. //depot/projects/avr32/src/sys/mips/sibyte/sb_scd.c#2 integrate
.. //depot/projects/avr32/src/sys/mips/sibyte/sb_zbpci.c#2 integrate
.. //depot/projects/avr32/src/sys/modules/acpi/acpi/Makefile#8 integrate
.. //depot/projects/avr32/src/sys/modules/x86bios/Makefile#3 integrate
.. //depot/projects/avr32/src/sys/net/if_vlan.c#10 integrate
.. //depot/projects/avr32/src/sys/netinet/ip_carp.c#8 integrate
.. //depot/projects/avr32/src/sys/netinet/libalias/alias_db.c#4 integrate
.. //depot/projects/avr32/src/sys/netinet6/in6_proto.c#8 integrate
.. //depot/projects/avr32/src/sys/powerpc/include/smp.h#6 integrate
.. //depot/projects/avr32/src/sys/powerpc/powerpc/mp_machdep.c#7 integrate
.. //depot/projects/avr32/src/sys/sparc64/include/cache.h#3 integrate
.. //depot/projects/avr32/src/sys/sparc64/include/smp.h#5 integrate
.. //depot/projects/avr32/src/sys/sparc64/sparc64/cache.c#3 integrate
.. //depot/projects/avr32/src/sys/sparc64/sparc64/genassym.c#4 integrate
.. //depot/projects/avr32/src/sys/sparc64/sparc64/mem.c#2 integrate
.. //depot/projects/avr32/src/sys/sparc64/sparc64/mp_exception.S#2 integrate
.. //depot/projects/avr32/src/sys/sparc64/sparc64/mp_machdep.c#6 integrate
.. //depot/projects/avr32/src/sys/sparc64/sparc64/pmap.c#6 integrate
.. //depot/projects/avr32/src/sys/sparc64/sparc64/tick.c#4 integrate
.. //depot/projects/avr32/src/sys/sparc64/sparc64/uio_machdep.c#2 integrate
.. //depot/projects/avr32/src/sys/sparc64/sparc64/vm_machdep.c#4 integrate
.. //depot/projects/avr32/src/sys/sun4v/include/smp.h#4 integrate
.. //depot/projects/avr32/src/sys/sun4v/sun4v/mp_machdep.c#4 integrate
.. //depot/projects/avr32/src/sys/sys/conf.h#7 integrate
.. //depot/projects/avr32/src/sys/sys/vnode.h#11 integrate
.. //depot/projects/avr32/src/sys/teken/teken_subr.h#4 integrate
.. //depot/projects/avr32/src/sys/vm/device_pager.c#7 integrate
.. //depot/projects/avr32/src/sys/vm/vm_mmap.c#11 integrate
.. //depot/projects/avr32/src/tools/regression/bin/sh/expansion/plus-minus4.0#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/fstest.c#5 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/chmod/08.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/chmod/09.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/chown/08.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/chown/09.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/conf#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/00.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/01.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/02.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/03.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/04.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/granular/05.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/link/05.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/link/12.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/link/13.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/link/14.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/link/15.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/link/16.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/misc.sh#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mkdir/08.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mkdir/09.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mkdir/11.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mkfifo/08.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mkfifo/10.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mkfifo/11.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/00.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/01.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/02.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/03.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/04.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/05.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/06.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/07.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/08.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/09.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/10.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/mknod/11.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/06.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/09.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/10.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/11.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/13.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/14.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/15.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/18.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/19.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/20.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/23.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/open/24.t#1 branch
.. //depot/projects/avr32/src/tools/regression/fstest/tests/rename/06.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/rename/07.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/rename/08.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/rename/15.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/rename/16.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/rmdir/09.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/rmdir/10.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/rmdir/13.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/rmdir/14.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/symlink/09.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/symlink/10.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/symlink/11.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/truncate/08.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/truncate/10.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/truncate/11.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/unlink/09.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/unlink/10.t#2 integrate
.. //depot/projects/avr32/src/tools/regression/fstest/tests/unlink/12.t#2 integrate
.. //depot/projects/avr32/src/tools/tools/vhba/Makefile#2 integrate
.. //depot/projects/avr32/src/tools/tools/vhba/mptest/Makefile#1 branch
.. //depot/projects/avr32/src/tools/tools/vhba/mptest/vhba_mptest.c#1 branch
.. //depot/projects/avr32/src/usr.bin/cpio/cmdline.c#5 integrate
.. //depot/projects/avr32/src/usr.bin/cpio/cpio.c#5 integrate
.. //depot/projects/avr32/src/usr.bin/cpio/cpio.h#4 integrate
.. //depot/projects/avr32/src/usr.bin/du/du.1#3 integrate
.. //depot/projects/avr32/src/usr.bin/fstat/fstat.1#3 integrate
.. //depot/projects/avr32/src/usr.bin/grep/nls/uk_UA.UTF-8.msg#2 integrate
.. //depot/projects/avr32/src/usr.bin/indent/indent.c#3 integrate
.. //depot/projects/avr32/src/usr.bin/rwall/rwall.1#2 integrate
.. //depot/projects/avr32/src/usr.sbin/acpi/acpidb/Makefile#5 integrate
.. //depot/projects/avr32/src/usr.sbin/acpi/iasl/Makefile#5 integrate
.. //depot/projects/avr32/src/usr.sbin/bsnmpd/modules/snmp_bridge/snmp_bridge.3#2 integrate
.. //depot/projects/avr32/src/usr.sbin/bsnmpd/modules/snmp_wlan/snmp_wlan.3#2 integrate
.. //depot/projects/avr32/src/usr.sbin/crunch/crunchide/exec_elf32.c#3 integrate
.. //depot/projects/avr32/src/usr.sbin/fifolog/lib/fifolog.h#2 integrate
.. //depot/projects/avr32/src/usr.sbin/iostat/iostat.8#3 integrate
.. //depot/projects/avr32/src/usr.sbin/jail/jail.8#10 integrate
.. //depot/projects/avr32/src/usr.sbin/lpr/lpr/printcap.5#2 integrate
.. //depot/projects/avr32/src/usr.sbin/makefs/makefs.8#3 integrate
.. //depot/projects/avr32/src/usr.sbin/mfiutil/mfiutil.8#3 integrate
.. //depot/projects/avr32/src/usr.sbin/ndp/ndp.c#3 integrate
.. //depot/projects/avr32/src/usr.sbin/nfsd/stablerestart.5#3 integrate
.. //depot/projects/avr32/src/usr.sbin/nfsuserd/nfsuserd.8#2 integrate
.. //depot/projects/avr32/src/usr.sbin/ntp/doc/ntp.conf.5#2 integrate
.. //depot/projects/avr32/src/usr.sbin/ntp/doc/ntpq.8#2 integrate
.. //depot/projects/avr32/src/usr.sbin/ppp/ipv6cp.c#3 integrate
.. //depot/projects/avr32/src/usr.sbin/syslogd/Makefile#3 integrate
.. //depot/projects/avr32/src/usr.sbin/syslogd/syslogd.8#2 integrate
.. //depot/projects/avr32/src/usr.sbin/syslogd/syslogd.c#3 integrate

Differences ...

==== //depot/projects/avr32/src/Makefile.mips#2 (text+ko) ====

@@ -1,5 +1,2 @@
-# $FreeBSD: src/Makefile.mips,v 1.1 2010/06/24 16:28:52 imp Exp $
+# $FreeBSD: src/Makefile.mips,v 1.2 2010/08/10 14:36:20 adrian Exp $
 
-# A bug in binutils prevents rescue from building, so override the user's
-# choice.
-MK_RESCUE=no

==== //depot/projects/avr32/src/ObsoleteFiles.inc#15 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.240 2010/07/27 14:26:38 rpaulo Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.241 2010/08/06 20:13:36 ed Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20100806: removal of unused libcompat routines
+OLD_FILES+=usr/share/man/man3/ascftime.3.gz
+OLD_FILES+=usr/share/man/man3/cfree.3.gz
+OLD_FILES+=usr/share/man/man3/cftime.3.gz
+OLD_FILES+=usr/share/man/man3/getpw.3.gz
 # 20100725: acpi_aiboost(4) removal.
 OLD_FILES+=usr/share/man/man4/acpi_aiboost.4.gz
 # 20100720: new clang import which bumps version from 2.0 to 2.8

==== //depot/projects/avr32/src/bin/sh/mksyntax.c#4 (text+ko) ====

@@ -42,7 +42,7 @@
 #endif /* not lint */
 #endif
 #include 
-__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.29 2010/04/11 12:24:47 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.30 2010/08/08 21:04:27 jilles Exp $");
 
 /*
  * This program creates syntax.h and syntax.c.
@@ -241,8 +241,8 @@
 	filltable("0");
 	fputs("\n/* character classification table */\n", cfile);
 	add("0123456789", "ISDIGIT");
-	add("abcdefghijklmnopqrstucvwxyz", "ISLOWER");
-	add("ABCDEFGHIJKLMNOPQRSTUCVWXYZ", "ISUPPER");
+	add("abcdefghijklmnopqrstuvwxyz", "ISLOWER");
+	add("ABCDEFGHIJKLMNOPQRSTUVWXYZ", "ISUPPER");
 	add("_", "ISUNDER");
 	add("#?$!-*@", "ISSPECL");
 	print("is_type");

==== //depot/projects/avr32/src/contrib/bsnmp/snmp_mibII/mibII.c#4 (text+ko) ====

@@ -843,6 +843,7 @@
 	  case IFT_ETHER:
 	  case IFT_FDDI:
 	  case IFT_ISO88025:
+	  case IFT_L2VLAN:
 		if (mib_find_rcvaddr(ifp->index, ether_bcast, 6) == NULL &&
 		    (rcv = mib_rcvaddr_create(ifp, ether_bcast, 6)) != NULL)
 			rcv->flags |= MIBRCVADDR_BCAST;

==== //depot/projects/avr32/src/contrib/traceroute/traceroute.c#3 (text+ko) ====

@@ -28,7 +28,7 @@
     "@(#)$Id: traceroute.c,v 1.68 2000/12/14 08:04:33 leres Exp $ (LBL)";
 #endif
 static const char rcsid[] =
-    "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.36 2009/08/23 17:00:16 ume Exp $";
+    "$FreeBSD: src/contrib/traceroute/traceroute.c,v 1.37 2010/08/08 08:22:53 ed Exp $";
 #endif
 
 /*
@@ -962,7 +962,6 @@
 		for (probe = 0, loss = 0; probe < nprobes; ++probe) {
 			register int cc;
 			struct timeval t1, t2;
-			struct timezone tz;
 			register struct ip *ip;
 			struct outdata outdata;
 
@@ -973,7 +972,7 @@
 			outdata.ttl = ttl;
 
 			/* Avoid alignment problems by copying bytewise: */
-			(void)gettimeofday(&t1, &tz);
+			(void)gettimeofday(&t1, NULL);
 			memcpy(&outdata.tv, &t1, sizeof(outdata.tv));
 
 			/* Finalize and send packet */
@@ -986,7 +985,7 @@
 				double T;
 				int precis;
 
-				(void)gettimeofday(&t2, &tz);
+				(void)gettimeofday(&t2, NULL);
 				i = packet_ok(packet, cc, from, seq);
 				/* Skip short packet */
 				if (i == 0)
@@ -1152,7 +1151,6 @@
 	fd_set *fdsp;
 	size_t nfds;
 	struct timeval now, wait;
-	struct timezone tz;
 	register int cc = 0;
 	register int error;
 	int fromlen = sizeof(*fromp);
@@ -1165,7 +1163,7 @@
 
 	wait.tv_sec = tp->tv_sec + waittime;
 	wait.tv_usec = tp->tv_usec;
-	(void)gettimeofday(&now, &tz);
+	(void)gettimeofday(&now, NULL);
 	tvsub(&wait, &now);
 	if (wait.tv_sec < 0) {
 		wait.tv_sec = 0;

==== //depot/projects/avr32/src/etc/periodic/daily/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.18 2010/06/17 12:25:47 netchild Exp $
+# $FreeBSD: src/etc/periodic/daily/Makefile,v 1.19 2010/08/10 12:58:44 olli Exp $
 
 .include 
 
@@ -39,6 +39,10 @@
 FILES+=	480.status-ntpd
 .endif
 
+.if ${MK_PKGTOOLS} != "no"
+FILES+=	490.status-pkg-changes
+.endif
+
 .if ${MK_RCMDS} != "no"
 FILES+=	140.clean-rwho \
 	430.status-rwho

==== //depot/projects/avr32/src/etc/periodic/security/460.chkportsum#2 (text+ko) ====

@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/periodic/security/460.chkportsum,v 1.1 2010/07/19 20:19:14 gabor Exp $
+# $FreeBSD: src/etc/periodic/security/460.chkportsum,v 1.2 2010/08/10 11:15:17 gabor Exp $
 #
 
 if [ -r /etc/defaults/periodic.conf ]
@@ -42,20 +42,20 @@
 
 case "${daily_status_security_chkportsum_enable}" in
 	[Yy][Ee][Ss])
+	set -f
 	pkg_info -ga 2>/dev/null | \
-	while read one two three; do
-		case ${one} in
+	while IFS= read -r line; do
+		set -- $line
+		case $1 in
 			Information)
-			case ${two} in
-				  for) name=${three%%:} ;;
-					*) name='??' ;;
+			case $2 in
+				for) name="${3%%:}" ;;
+				*) name='??' ;;
 			esac
 			;;
 			Mismatched|'') ;;
-			*)
-			if [ -n ${name} ]; then
-				echo ${name}: ${one}
-			fi
+			*) [ -n "${name}" ] &&
+				echo "${name}: ${line%% fails the original MD5 checksum}"
 			;;
 		esac
 	done

==== //depot/projects/avr32/src/games/fortune/datfiles/freebsd-tips#3 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.48 2010/01/11 21:17:49 gavin Exp $
+$FreeBSD: src/games/fortune/datfiles/freebsd-tips,v 1.49 2010/08/09 09:26:17 fjoe Exp $
 %
 Any user that is a member of the wheel group can use "su -" to simulate
 a root login. You can add a user to the wheel group by editing /etc/group.
@@ -476,6 +476,6 @@
 directories for the specified programs. This can be particularly handy
 when you are trying to find where in the ports tree an application is.
 
-Try "whereis netscape" and "whereis whereis".
+Try "whereis firefox" and "whereis whereis".
 		-- Konstantinos Konstantinidis 
 %

==== //depot/projects/avr32/src/include/stdio.h#6 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)stdio.h	8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.80 2010/02/16 19:39:50 imp Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.81 2010/08/06 19:35:40 ed Exp $
  */
 
 #ifndef	_STDIO_H_
@@ -285,8 +285,7 @@
  * Functions defined in all versions of POSIX 1003.1.
  */
 #if __BSD_VISIBLE || __POSIX_VISIBLE <= 199506
-/* size for cuserid(3); UT_NAMESIZE + 1, see  */
-#define	L_cuserid	17	/* legacy */
+#define	L_cuserid	17	/* size for cuserid(3); MAXLOGNAME, legacy */
 #endif
 
 #if __POSIX_VISIBLE

==== //depot/projects/avr32/src/lib/libc/net/sctp_recvmsg.3#4 (text+ko) ====

@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.9 2010/07/04 08:09:33 brucec Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_recvmsg.3,v 1.10 2010/08/06 14:33:42 joel Exp $
 .\"
 .Dd August 13, 2007
 .Dt SCTP_RECVMSG 3
@@ -88,7 +88,7 @@
 .Fa fromlen
 will hold the length of that address.
 Note that
-the address is bounded by the inital value of 
+the address is bounded by the initial value of 
 .Fa fromlen
 which is used as an in/out variable.
 .Pp

==== //depot/projects/avr32/src/lib/libc/net/sctp_sendmsg.3#4 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)send.2	8.2 (Berkeley) 2/21/94
-.\" $FreeBSD: src/lib/libc/net/sctp_sendmsg.3,v 1.8 2010/08/02 16:01:45 joel Exp $
+.\" $FreeBSD: src/lib/libc/net/sctp_sendmsg.3,v 1.9 2010/08/06 14:33:42 joel Exp $
 .\"
 .Dd December 15, 2006
 .Dt SCTP_SENDMSG 3
@@ -72,7 +72,7 @@
 the data being sent on the third leg of the SCTP four-way handshake.
 Note that if
 the socket is a one-to-one type (SOCK_STREAM) socket then an association must
-be in existance (by use of the 
+be in existence (by use of the 
 .Xr connect 2
 system call).
 Calling 

==== //depot/projects/avr32/src/lib/libc/stdlib/malloc.3#4 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)malloc.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.82 2010/01/31 23:16:10 jasone Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.83 2010/08/06 14:33:42 joel Exp $
 .\"
 .Dd January 31, 2010
 .Dt MALLOC 3
@@ -415,7 +415,7 @@
 minimum cacheline-multiple size class (see the
 .Dq Q
 option) are rounded up to the nearest multiple of the quantum.
-Allocation requests that are more than the minumum cacheline-multiple size
+Allocation requests that are more than the minimum cacheline-multiple size
 class, but no more than the minimum subpage-multiple size class (see the
 .Dq C
 option) are rounded up to the nearest multiple of the cacheline size (64).

==== //depot/projects/avr32/src/lib/libc/sys/kqueue.2#4 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.50 2009/12/31 20:29:58 brooks Exp $
+.\" $FreeBSD: src/lib/libc/sys/kqueue.2,v 1.51 2010/08/06 14:33:42 joel Exp $
 .\"
 .Dd September 15, 2009
 .Dt KQUEUE 2
@@ -445,7 +445,7 @@
 .It Dv EVFILT_USER
 Establishes a user event identified by
 .Va ident
-which is not assosicated with any kernel mechanism but is triggered by
+which is not associated with any kernel mechanism but is triggered by
 user level code.
 The lower 24 bits of the 
 .Va fflags

==== //depot/projects/avr32/src/lib/libc/sys/ptrace.2#5 (text+ko) ====

@@ -1,4 +1,4 @@
-.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.46 2010/07/10 14:31:44 kib Exp $
+.\" $FreeBSD: src/lib/libc/sys/ptrace.2,v 1.47 2010/08/06 14:33:42 joel Exp $
 .\"	$NetBSD: ptrace.2,v 1.2 1995/02/27 12:35:37 cgd Exp $
 .\"
 .\" This file is in the public domain.
@@ -335,7 +335,7 @@
 When
 .Dv PL_FLAG_SCX
 is set, this flag may be additionally specified to inform that the
-program being executed by debuggee process has been changed by succesful
+program being executed by debuggee process has been changed by successful
 execution of a system call from the
 .Fn execve 2
 family.

==== //depot/projects/avr32/src/lib/libcam/cam.3#3 (text+ko) ====

@@ -25,7 +25,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libcam/cam.3,v 1.15 2010/04/14 19:08:06 uqs Exp $
+.\" $FreeBSD: src/lib/libcam/cam.3,v 1.16 2010/08/06 14:33:42 joel Exp $
 .\"
 .Dd October 10, 1998
 .Dt CAM 3
@@ -382,7 +382,7 @@
 of the CCB failed.
 .Pp
 .Fn cam_send_ccb
-returns a value of -1 if an error occured, and
+returns a value of -1 if an error occurred, and
 .Va errno
 is set to indicate the error.
 .Pp

==== //depot/projects/avr32/src/lib/libcompat/4.1/ftime.c#3 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/ftime.c,v 1.6 2010/03/13 18:06:17 ed Exp $";
+static char rcsid[] = "$FreeBSD: src/lib/libcompat/4.1/ftime.c,v 1.7 2010/08/08 08:19:23 ed Exp $";
 #endif /* not lint */
 
 #include 
@@ -39,15 +39,15 @@
 int
 ftime(struct timeb *tbp)
 {
-        struct timezone tz;
-        struct timeval t;
+	struct timezone tz;
+	struct timeval t;
 
-        if (gettimeofday(&t, &tz) < 0)
-                return (-1);
-        tbp->millitm = t.tv_usec / 1000;
-        tbp->time = t.tv_sec;
-        tbp->timezone = tz.tz_minuteswest;
-        tbp->dstflag = tz.tz_dsttime;
+	if (gettimeofday(&t, &tz) < 0)
+		return (-1);
+	tbp->millitm = t.tv_usec / 1000;
+	tbp->time = t.tv_sec;
+	tbp->timezone = tz.tz_minuteswest;
+	tbp->dstflag = tz.tz_dsttime;
 
 	return (0);
 }

==== //depot/projects/avr32/src/lib/libcompat/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libcompat/Makefile,v 1.28 2010/03/14 10:18:58 ed Exp $
+# $FreeBSD: src/lib/libcompat/Makefile,v 1.29 2010/08/06 20:13:36 ed Exp $
 
 LIB=	compat
 CFLAGS+=-DLIBC_SCCS -DSYSLIBC_SCCS -I${.CURDIR}/../libc/locale
@@ -10,17 +10,14 @@
 .PATH:	${.CURDIR}/4.1 ${.CURDIR}/4.3 ${.CURDIR}/4.4
 
 # compat 4.1 sources
-SRCS+=	ascftime.c cftime.c ftime.c getpw.c
+SRCS+=	ftime.c
 
-MAN+=	4.1/ftime.3 4.1/getpw.3
-MAN+=	4.1/cftime.3
+MAN+=	4.1/ftime.3
 
-MLINKS+=cftime.3 ascftime.3
-
 # compat 4.3 sources
-SRCS+=	cfree.c re_comp.c rexec.c
+SRCS+=	re_comp.c rexec.c
 
-MAN+=	4.3/cfree.3 4.3/re_comp.3 4.3/rexec.3
+MAN+=	4.3/re_comp.3 4.3/rexec.3
 
 MLINKS+=re_comp.3 re_exec.3
 

==== //depot/projects/avr32/src/lib/libgpib/gpib.3#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libgpib/gpib.3,v 1.1 2010/02/01 20:53:55 joerg Exp $
+.\" $FreeBSD: src/lib/libgpib/gpib.3,v 1.2 2010/08/06 14:33:42 joel Exp $
 .\"
 .Dd February 1, 2010
 .Dt GPIB 3
@@ -258,7 +258,7 @@
 .It SPOLL
 Serial Poll
 .It EVENT
-Event occured
+Event occurred
 .It CMPL
 I/O complete
 .It LOK

==== //depot/projects/avr32/src/lib/libpmc/pmc.corei7.3#3 (text+ko) ====

@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libpmc/pmc.corei7.3,v 1.4 2010/08/03 17:40:09 joel Exp $
+.\" $FreeBSD: src/lib/libpmc/pmc.corei7.3,v 1.5 2010/08/06 14:33:42 joel Exp $
 .\"
 .Dd March 24, 2010
 .Dt PMC.COREI7 3
@@ -833,7 +833,7 @@
 Counts mispredicted non-indirect near calls executed, (should always be 0).
 .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 89H , Umask 20H
-Counts mispredicted indirect near calls exeucted, including both register
+Counts mispredicted indirect near calls executed, including both register
 and memory indirect.
 .It Li BR_MISP_EXEC.NEAR_CALLS
 .Pq Event 89H , Umask 30H

==== //depot/projects/avr32/src/lib/libpmc/pmc.mips.3#2 (text+ko) ====

@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libpmc/pmc.mips.3,v 1.2 2010/05/13 12:07:55 uqs Exp $
+.\" $FreeBSD: src/lib/libpmc/pmc.mips.3,v 1.3 2010/08/06 14:33:42 joel Exp $
 .\"
 .Dd February 11, 2010
 .Os
@@ -153,7 +153,7 @@
 Integer and co-processor loads completed.
 .It Li STORE_COMPLETED
 .Pq Event 15, Counter 1
-Integer and co-porocessor stores completed.
+Integer and co-processor stores completed.
 .It Li BARRIER_COMPLETED
 .Pq Event 16, Counter 0
 Direct jump (and link) instructions completed.
@@ -225,10 +225,10 @@
 Counts the number of cycles where the ALU pipeline cannot advance.
 .It Li UNCACHED_LOAD
 .Pq Event 33, Counter 0
-Counts uncached and uncached acclerated loads.
+Counts uncached and uncached accelerated loads.
 .It Li UNCACHED_STORE
 .Pq Event 33, Counter 1
-Counts uncached and uncached acclerated stores.
+Counts uncached and uncached accelerated stores.
 .It Li CP2_REG_TO_REG_COMPLETED
 .Pq Event 35, Counter 0
 Co-processor 2 register to register instructions completed.

==== //depot/projects/avr32/src/lib/libpmc/pmc.westmere.3#3 (text+ko) ====

@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libpmc/pmc.westmere.3,v 1.3 2010/08/03 17:40:09 joel Exp $
+.\" $FreeBSD: src/lib/libpmc/pmc.westmere.3,v 1.4 2010/08/06 14:33:42 joel Exp $
 .\"
 .Dd March 24, 2010
 .Dt PMC.WESTMERE 3
@@ -775,7 +775,7 @@
 Counts mispredicted non-indirect near calls executed, (should always be 0).
 .It Li BR_MISP_EXEC.INDIRECT_NEAR_CALL
 .Pq Event 89H , Umask 20H
-Counts mispredicted indirect near calls exeucted, including both register
+Counts mispredicted indirect near calls executed, including both register
 and memory indirect.
 .It Li BR_MISP_EXEC.NEAR_CALLS
 .Pq Event 89H , Umask 30H

==== //depot/projects/avr32/src/lib/libpmc/pmc.westmereuc.3#2 (text+ko) ====

@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libpmc/pmc.westmereuc.3,v 1.3 2010/06/08 16:48:59 uqs Exp $
+.\" $FreeBSD: src/lib/libpmc/pmc.westmereuc.3,v 1.4 2010/08/06 14:33:42 joel Exp $
 .\"
 .Dd March 24, 2010
 .Dt PMC.WESTMEREUC 3
@@ -715,7 +715,7 @@
 supported:
 0: NONE 40000000_00000000H:RSPFWDI 40001A00_00000000H:RSPFWDS
 40001D00_00000000H:RSPIWB
-Match opcode/addres s by writing MSR 396H with mask supported mask value
+Match opcode/address by writing MSR 396H with mask supported mask value
 .It Li ADDR_OPCODE_MATCH.REMOTE
 .Pq Event 35H , Umask 02H
 Counts number of requests from the remote socket, address/opcode of request
@@ -723,7 +723,7 @@
 are supported:
 0: NONE 40000000_00000000H:RSPFWDI 40001A00_00000000H:RSPFWDS
 40001D00_00000000H:RSPIWB
-Match opcode/addres s by writing MSR 396H with mask supported mask value
+Match opcode/address by writing MSR 396H with mask supported mask value
 .It Li ADDR_OPCODE_MATCH.LOCAL
 .Pq Event 35H , Umask 04H
 Counts number of requests from the local socket, address/opcode of request
@@ -731,7 +731,7 @@
 are supported:
 0: NONE 40000000_00000000H:RSPFWDI 40001A00_00000000H:RSPFWDS
 40001D00_00000000H:RSPIWB
-Match opcode/addres s by writing MSR 396H with mask supported mask value
+Match opcode/address by writing MSR 396H with mask supported mask value
 .It Li QPI_TX_STALLED_SINGLE_FLIT.HOME.LINK_0
 .Pq Event 40H , Umask 01H
 Counts cycles the Quickpath outbound link 0 HOME virtual channel is stalled

==== //depot/projects/avr32/src/lib/libusb/libusb.3#9 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.9 2010/08/03 17:40:09 joel Exp $
+.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.10 2010/08/06 14:33:42 joel Exp $
 .\"
 .Dd June 22, 2009
 .Dt LIBUSB 3
@@ -144,7 +144,7 @@
 .
 .Ft libusb_device_handle *
 .Fn libusb_open_device_with_vid_pid "libusb_context *ctx" "uint16_t vid" "uint16_t pid"
-Conveniance function to open a device with is 
+Convenience function to open a device with is 
 .Fa vid 
 and 
 .Fa pid.

==== //depot/projects/avr32/src/lib/libutil/property.3#4 (text+ko) ====

@@ -23,7 +23,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/lib/libutil/property.3,v 1.20 2010/08/03 17:40:09 joel Exp $
+.\" $FreeBSD: src/lib/libutil/property.3,v 1.21 2010/08/06 14:33:42 joel Exp $
 .\" "
 .Dd October 7, 1998
 .Dt PROPERTIES 3
@@ -85,7 +85,7 @@
 is an alphanumeric string (and any punctuation not including the `=' character)
 and
 .Fa value
-is an arbitary string of text terminated by a newline character.
+is an arbitrary string of text terminated by a newline character.
 If newlines
 are desired, the entire value should be enclosed in { } (curly-bracket)
 characters.

==== //depot/projects/avr32/src/libexec/rtld-elf/mips/reloc.c#4 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include 
-__FBSDID("$FreeBSD: src/libexec/rtld-elf/mips/reloc.c,v 1.5 2010/07/29 20:18:52 jchandra Exp $");
+__FBSDID("$FreeBSD: src/libexec/rtld-elf/mips/reloc.c,v 1.6 2010/08/10 05:15:35 neel Exp $");
 
 #include 
 #include 
@@ -75,7 +75,7 @@
  * ELF64 MIPS encodes the relocs uniquely.  The first 32-bits of info contain
  * the symbol index.  The top 32-bits contain three relocation types encoded
  * in big-endian integer with first relocation in LSB.  This means for little
- * endian we have to byte swap that interger (r_type).
+ * endian we have to byte swap that integer (r_type).
  */
 #define	Elf_Sxword			Elf64_Sxword
 #define	ELF_R_NXTTYPE_64_P(r_type)	((((r_type) >> 8) & 0xff) == R_TYPE(64))
@@ -83,7 +83,7 @@
 #undef ELF_R_SYM
 #undef ELF_R_TYPE
 #define ELF_R_SYM(r_info)		((r_info) & 0xffffffff)
-#define ELF_R_TYPE(r_info)		bswap32((r_info) >> 32)
+#define ELF_R_TYPE(r_info)		bswap32(((r_info) >> 32))
 #endif
 #else
 #define	ELF_R_NXTTYPE_64_P(r_type)	(0)

==== //depot/projects/avr32/src/libexec/talkd/announce.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)announce.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/libexec/talkd/announce.c,v 1.17 2008/03/26 07:32:07 brueffer Exp $";
+  "$FreeBSD: src/libexec/talkd/announce.c,v 1.18 2010/08/08 02:45:48 ed Exp $";
 #endif /* not lint */
 
 #include 
@@ -99,7 +99,6 @@
 {
 	struct timeval now;
 	time_t clock_sec;
-	struct timezone zone;
 	struct tm *localclock;
 	struct iovec iovec;
 	char line_buf[N_LINES][N_CHARS];
@@ -110,7 +109,7 @@
 
 	i = 0;
 	max_size = 0;
-	gettimeofday(&now, &zone);
+	gettimeofday(&now, NULL);
 	clock_sec = now.tv_sec;
 	localclock = localtime(&clock_sec);
 	(void)snprintf(line_buf[i], N_CHARS, " ");

==== //depot/projects/avr32/src/libexec/talkd/table.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/libexec/talkd/table.c,v 1.9 2003/04/03 05:13:27 jmallett Exp $";
+  "$FreeBSD: src/libexec/talkd/table.c,v 1.10 2010/08/08 02:45:48 ed Exp $";
 #endif /* not lint */
 
 /*
@@ -66,7 +66,6 @@
 
 extern	int debug;
 struct	timeval tp;
-struct	timezone txp;
 
 typedef struct table_entry TABLE_ENTRY;
 
@@ -91,7 +90,7 @@
 	TABLE_ENTRY *ptr;
 	time_t current_time;
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:36 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E9AFD106572D; Wed, 11 Aug 2010 18:26:29 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E92D11066D1D
	for ; Wed, 11 Aug 2010 18:26:28 +0000 (UTC)
	(envelope-from bfiedler@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 69E628FC21
	for ; Wed, 11 Aug 2010 18:26:26 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQQGY084655
	for ; Wed, 11 Aug 2010 18:26:26 GMT
	(envelope-from bfiedler@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQQLF084652
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:26 GMT
	(envelope-from bfiedler@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:26 GMT
Message-Id: <201008111826.o7BIQQLF084652@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	bfiedler@FreeBSD.org using -f
From: Benjamin Fiedler 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182234 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:36 -0000

http://p4web.freebsd.org/@@182234?ac=10

Change 182234 by bfiedler@freebsd-home on 2010/08/11 03:28:39

	Fix tabs in makefile so buildworld completes

Affected files ...

.. //depot/projects/soc2010/bsdtextproc/src/usr.bin/mandoc/Makefile#3 edit

Differences ...

==== //depot/projects/soc2010/bsdtextproc/src/usr.bin/mandoc/Makefile#3 (text+ko) ====

@@ -24,33 +24,38 @@
 CFLAGS    += $(WFLAGS) $(VFLAGS) -DHAVE_CONFIG_H -DUGLY
 
 install:
-      ( mkdir -p $(DESTDIR)$(BINDIR) ; \
-        mkdir -p $(DESTDIR)$(EXAMPLEDIR) ; \
-        mkdir -p $(DESTDIR)$(MANDIR)/man1 ; \
-        mkdir -p $(DESTDIR)$(MANDIR)/man7 ; \
-        $(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR) ; \
-        $(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1 ; \
-        $(INSTALL_MAN) man.7 mdoc.7 roff.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 ; \
-        $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) \
-      ) 
+	mkdir -p $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(EXAMPLEDIR)
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	mkdir -p $(DESTDIR)$(MANDIR)/man7
+	$(INSTALL_PROGRAM) mandoc $(DESTDIR)$(BINDIR)
+	$(INSTALL_MAN) mandoc.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL_MAN) man.7 mdoc.7 roff.7 mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 
+	$(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR) 
 
 PROG=	mandoc
 LINKS=	mdocml
 MAN=	mandoc.1 man.7 mandoc_char.7 mdoc.7 roff.7
 MLINKS= mandoc.1 mdocml.1
+GENSRCS= ${MDOCMLDIR}/config.h
+
 SRCS=	arch.c att.c chars.c compat.c html.c lib.c main.c man.c \
 	man_action.c man_argv.c man_hash.c man_html.c man_macro.c man_term.c \
 	man_validate.c mandoc.c mdoc.c mdoc_action.c mdoc_argv.c mdoc_hash.c \
 	mdoc_html.c mdoc_macro.c mdoc_strings.c mdoc_term.c mdoc_validate.c \
-	msec.c out.c roff.c st.c term.c tree.c vol.c
+	msec.c out.c roff.c st.c term.c tree.c vol.c ${GENSRCS}
 
-config.h: config.h.pre config.h.post
-        ( cat ${.ALLSRCS} 
-        ) > ${.TARGET}
+${MDOCMLDIR}/config.h: config.h.pre config.h.post
+	rm -f config.log
+	( cat ${MDOCMLDIR}/config.h.pre; \
+	echo ""; \
+	echo '#define HAVE_STRLCAT'; \
+	echo '#define HAVE_STRLCPY'; \
+	echo ""; \
+	cat ${MDOCMLDIR}/config.h.post \
+	) > ${.TARGET}
 
-GENSRCS+=       config.h
-CLEANFILES=     config.h config.log
-
+CLEANFILES= config.h config.log
 
 WARNS?=	3
 

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:36 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 05B74106586E; Wed, 11 Aug 2010 18:26:30 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EA28D1066D1E
	for ; Wed, 11 Aug 2010 18:26:28 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BD668FC25
	for ; Wed, 11 Aug 2010 18:26:26 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQQ2M084662
	for ; Wed, 11 Aug 2010 18:26:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQQc1084659
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:26 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:26 GMT
Message-Id: <201008111826.o7BIQQc1084659@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182235 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:36 -0000

http://p4web.freebsd.org/@@182235?ac=10

Change 182235 by hselasky@hselasky_laptop001 on 2010/08/11 05:20:40

	
	USB controller (XHCI):
		- multi TT support is not yet ready (requires some
		changes in the HUB driver too)

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#27 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#27 (text+ko) ====

@@ -2174,11 +2174,12 @@
 
 	if (is_hub) {
 		temp |= XHCI_SCTX_0_HUB_SET(1);
-
+#if 0
 		if (udev->ddesc.bDeviceProtocol == UDPROTO_HSHUBMTT) {
 			DPRINTF("HUB supports MTT\n");
 			temp |= XHCI_SCTX_0_MTT_SET(1);
 		}
+#endif
 	}
 
 	pinp->ctx_slot.dwSctx0 = htole32(temp);

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:36 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1445310658A1; Wed, 11 Aug 2010 18:26:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1C84F1066D2A
	for ; Wed, 11 Aug 2010 18:26:29 +0000 (UTC)
	(envelope-from kkata@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 7B7908FC12
	for ; Wed, 11 Aug 2010 18:26:27 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQR2T084695
	for ; Wed, 11 Aug 2010 18:26:27 GMT
	(envelope-from kkata@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQRDP084692
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:27 GMT
	(envelope-from kkata@freebsd.org)
Date: Wed, 11 Aug 2010 18:26:27 GMT
Message-Id: <201008111826.o7BIQRDP084692@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	kkata@freebsd.org using -f
From: Katalin Konkoly 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182240 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:37 -0000

http://p4web.freebsd.org/@@182240?ac=10

Change 182240 by kkata@bonbol_fbsd on 2010/08/11 09:11:29

	Fix typos and spelling in the Hungarian translation of the linux-users
	article
	Reviewed by: pgj	

Affected files ...

.. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-users/article.sgml#16 edit

Differences ...

==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/linux-users/article.sgml#16 (text+ko) ====

@@ -101,7 +101,7 @@
       /usr/local/bin vagy a
       /usr/bin könyvtárakban
       találhatóak, és bizonyos
-      vészhelyzetekben elõfordulhat, hogy az ezeket az
+      vészhelyzetekben elõfordulhat, hogy ezeket az
       állományrendszereket nem tudjuk csatlakoztatni.
       Ilyen esetekben a root sem lesz képes
       elérni a saját alapértelmezett
@@ -179,7 +179,7 @@
 	  legújabb verziójához tartoznak.  Ezt az
 	  alapértelmezett viselkedést felül tudjuk
 	  bírálni, ha a PACKAGESITE
-	  környezeti változót a 
 	  értékre állítjuk, és
 	  így például a 6.X sorozathoz
@@ -312,7 +312,7 @@
 	  lehetõségünk van ezeket kedvünk szerint
 	  megváltoztatni, mint például
 	  további modulok fordítását
-	  kérni vagy átállítani a
+	  kérni, vagy átállítani a
 	  telepítés alapértelmezett
 	  helyét.)
 
@@ -353,7 +353,7 @@
       /etc/rc szkript beolvassa az
       /etc/defaults/rc.conf és
       /etc/rc.conf állományokat,
-      amibõl megállapítja, hogy milyen
+      amelyekbõl megállapítja, hogy milyen
       szolgáltatásokat indítson el.  A megadott
       szolgáltatásokat ezután az
       /etc/rc.d és a
@@ -423,7 +423,7 @@
       sor megadásával.  A rendszer alapértelmezett
       beállításait az
       /etc/defaults/rc.conf
-      állományban találhatjuk meg, amelyeket az
+      állományban találhatjuk meg, ezeket az
       /etc/rc.conf állományban tudjuk
       felülbírálni.  Az alkalmazásokhoz
       tartozó szolgáltatások
@@ -448,7 +448,7 @@
 
     Miután az /etc/rc.conf
       állományban engedélyeztük a
-      szolgáltatásokat, a paranccsorból el is
+      szolgáltatásokat, a parancssorból el is
       tudjuk indítani ezeket (a rendszer
       újraindítása nélkül):
 
@@ -537,7 +537,7 @@
       PF
     
 
-    Az IPFIREWALL avagy
+    Az IPFIREWALL, avagy
       IPFW (az
       IPFW szabályrendszereit az
       &man.ipfw.8; paranccsal tudjuk kezelni) a &os; fejlesztõi
@@ -569,10 +569,10 @@
     pass in on $ext_if proto tcp from any to any port = 22
 
     Az utolsó tûzfal, a PF,
-      az OpenBSD Projekt fejlesztése.  Az
+      az OpenBSD Projekt fejlesztése.  A
       PF eredetileg az
       IPFILTER
-      leváltására készült.  Emiatt az
+      leváltására készült.  Emiatt a
       PF szabályainak megadási
       módja nagyon hasonlít az
       IPFILTER esetében
@@ -607,10 +607,10 @@
       forráskódjának nálunk levõ
       (helyi) másolatát a &os;
       CVS (Concurrent Versioning System)
-      szervereivel.  Miután ezt megtörtént, le tudjuk
-      fordítani a rendszermagot és a
-      hozzá tartozó programokat.  A források
-      frissítésével kapcsolatban olvassuk el
+      szervereivel.  Miután ez megtörtént, le tudjuk
+      fordítani a rendszermagot és a hozzá
+      tartozó programokat.  A források
+      frissítésével kapcsolatban olvassuk el a
       &os; kézikönyv frissítésrõl
 	szóló fejezetét.
@@ -643,7 +643,7 @@
       lényegében egy egyértelmû folyamat.
       Indítsuk el
       számítógépünket a
-      telepítõlemezrõl és a
+      telepítõlemezrõl, és a
       telepítõben válasszuk a frissítés
       (upgrade) opciót.
 
@@ -666,7 +666,7 @@
     Ha az IP-csomagok
       továbbításáról
       szóló példánál maradunk, akkor
-      ezt az alábbi módon kérdezhetjük le,
+      az alábbi módon kérdezhetjük le,
       hogy engedélyezett-e a &os; rendszerünkön:
 
     &prompt.user; sysctl net.inet.ip.forwarding
@@ -726,7 +726,7 @@
 
     A procfs típusú
       állományrendszereket így lehet
-      csaltkoztatni:
+      csatlakoztatni:
 
     &prompt.root; mount /proc
 
@@ -833,7 +833,7 @@
     Bízunk benne, hogy ez a leírás eleget
       mutatott be ahhoz, hogy elkezdjünk ismerkedni a &os;-vel.  Ha
       az érintett témák még jobban
-      érdekelnek minket vagy olyanról szeretnénk
+      érdekelnek minket, vagy olyanról szeretnénk
       többet megtudni, ami itt nem szerepelt, akkor
       mindenképpen olvassunk bele a &os; kézikönyvbe.

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:47 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AF1591066D6C; Wed, 11 Aug 2010 18:26:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 982EC1066623
	for ; Wed, 11 Aug 2010 18:26:39 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id BAB908FC36
	for ; Wed, 11 Aug 2010 18:26:38 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQc4i084902
	for ; Wed, 11 Aug 2010 18:26:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQcWD084899
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:38 GMT
Message-Id: <201008111826.o7BIQcWD084899@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182110 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:47 -0000

http://p4web.freebsd.org/@@182110?ac=10

Change 182110 by hselasky@hselasky_laptop001 on 2010/08/08 22:06:26

	
	USB core:
		- correct calculations for Super Speed USB.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#184 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#184 (text+ko) ====

@@ -322,6 +322,7 @@
 	usb_frcount_t x;
 	uint8_t type;
 	uint8_t zmps;
+	uint8_t mult;
 
 	/*
 	 * Sanity check. The following parameters must be initialized before
@@ -358,12 +359,36 @@
 			xfer->max_packet_count = 3;
 		xfer->max_packet_size &= 0x7FF;
 		break;
+
 	case USB_SPEED_SUPER:
-		if (xfer->endpoint->ecomp != NULL)
-			xfer->max_packet_count += xfer->endpoint->ecomp->bMaxBurst;
+		xfer->max_packet_count += (xfer->max_packet_size >> 11) & 3;
+		mult = 1;
+
+		/* compute additional bMaxBurst */
+		if (xfer->endpoint->ecomp != NULL) {
+			xfer->max_packet_count +=
+			    xfer->endpoint->ecomp->bMaxBurst;
+
+			if (type == UE_ISOCHRONOUS) {
+				mult +=
+				    (xfer->endpoint->ecomp->bmAttributes & 3);
+			}
+		}
+
+		xfer->max_packet_count *= mult;
+
 		/* check for invalid max packet count */
-		if (xfer->max_packet_count > 15)
-			xfer->max_packet_count = 15;
+		if (type == UE_ISOCHRONOUS) {
+			if ((xfer->max_packet_count == 0) || 
+			    (xfer->max_packet_count > (16 * 3)))
+				xfer->max_packet_count = (16 * 3);
+		} else {
+			if ((xfer->max_packet_count == 0) || 
+			    (xfer->max_packet_count > (16 * 1)))
+				xfer->max_packet_count = (16 * 1);
+		}
+
+		xfer->max_packet_size &= 0x7FF;
 		break;
 	default:
 		break;

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:47 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B84C01066D80; Wed, 11 Aug 2010 18:26:44 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9983E106667B
	for ; Wed, 11 Aug 2010 18:26:39 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 01D388FC38
	for ; Wed, 11 Aug 2010 18:26:39 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQcXw084915
	for ; Wed, 11 Aug 2010 18:26:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQcc3084906
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:38 GMT
Message-Id: <201008111826.o7BIQcc3084906@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182111 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:48 -0000

http://p4web.freebsd.org/@@182111?ac=10

Change 182111 by hselasky@hselasky_laptop001 on 2010/08/08 22:08:28

	USB controller (XHCI):
		- more bugfixes.
		- take into account that SuperSpeed devices can
		burst upto 1024 * 32 bytes. Increase TD size.
		- fix wrong endpoint direction.
		- at this point a SuperSpeed hardisk is enumerating
		and is usable.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#19 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#21 (text+ko) ====

@@ -122,7 +122,7 @@
 static struct xhci_endpoint_ext *xhci_get_endpoint_ext(struct usb_device *, struct usb_endpoint_descriptor *);
 static usb_proc_callback_t xhci_configure_msg;
 static usb_error_t xhci_configure_device(struct usb_device *);
-static usb_error_t xhci_configure_endpoint(struct usb_device *, struct usb_endpoint_descriptor *, uint64_t, uint16_t, uint8_t, uint16_t, uint16_t);
+static usb_error_t xhci_configure_endpoint(struct usb_device *, struct usb_endpoint_descriptor *, uint64_t, uint16_t, uint8_t, uint8_t, uint16_t, uint16_t);
 static usb_error_t xhci_configure_mask(struct usb_device *, uint32_t, uint8_t);
 static usb_error_t xhci_cmd_evaluate_ctx(struct xhci_softc *, uint64_t, uint8_t);
 static usb_error_t xhci_cmd_reset_dev(struct xhci_softc *, uint8_t);
@@ -1124,7 +1124,7 @@
 		    &udev->ctrl_ep_desc);
 		err = xhci_configure_endpoint(udev,
 		    &udev->ctrl_ep_desc, pepext->physaddr,
-		    0, 1, mps, mps);
+		    0, 1, 1, mps, mps);
 
 		if (err != 0) {
 			DPRINTF("Could not configure default endpoint\n");
@@ -1910,7 +1910,7 @@
 static usb_error_t
 xhci_configure_endpoint(struct usb_device *udev,
     struct usb_endpoint_descriptor *edesc, uint64_t ring_addr,
-    uint16_t interval, uint8_t max_packet_count,
+    uint16_t interval, uint8_t max_packet_count, uint8_t mult,
     uint16_t max_packet_size, uint16_t max_frame_size)
 {
 	struct usb_page_search buf_inp;
@@ -1940,7 +1940,12 @@
 	if (max_packet_count == 0)
 		return (USB_ERR_BAD_BUFSIZE);
 
-	max_packet_count --;
+	max_packet_count--;
+
+	if (mult == 0)
+		return (USB_ERR_BAD_BUFSIZE);
+
+	mult--;
 
 	temp = XHCI_EPCTX_0_EPSTATE_SET(0) |
 	    XHCI_EPCTX_0_MAXP_STREAMS_SET(0) |
@@ -1952,8 +1957,10 @@
 		temp |= XHCI_EPCTX_0_IVAL_SET(k);
 		break;
 	case UE_ISOCHRONOUS:
-		if (udev->speed == USB_SPEED_SUPER)
-			temp |= XHCI_EPCTX_0_MULT_SET(max_packet_count);
+		if (udev->speed == USB_SPEED_SUPER) {
+			temp |= XHCI_EPCTX_0_MULT_SET(mult);
+			max_packet_count /= mult;
+		}
 		break;
 	default:
 		break;
@@ -1966,8 +1973,10 @@
 	    XHCI_EPCTX_1_MAXB_SET(max_packet_count) |
 	    XHCI_EPCTX_1_MAXP_SIZE_SET(max_packet_size);
 
-	if ((udev->parent_hs_hub != NULL) || (udev->address != 0))
-		temp |= XHCI_EPCTX_1_CERR_SET(3);
+	if ((udev->parent_hs_hub != NULL) || (udev->address != 0)) {
+		if ((edesc->bmAttributes & UE_XFERTYPE) != UE_ISOCHRONOUS)
+			temp |= XHCI_EPCTX_1_CERR_SET(3);
+	}
 
 	switch (edesc->bmAttributes & UE_XFERTYPE) {
 	case UE_CONTROL:
@@ -1984,7 +1993,7 @@
 		break;
 	}
 
-	if (edesc->bmAttributes & UE_DIR_IN)
+	if (edesc->bEndpointAddress & UE_DIR_IN)
 		temp |= XHCI_EPCTX_1_EPTYPE_SET(4);
 
 	pinp->ctx_ep[epno - 1].dwEpCtx1 = htole32(temp);
@@ -1993,8 +2002,21 @@
 
 	pinp->ctx_ep[epno - 1].qwEpCtx2 = htole64(ring_addr);
 
-	temp = XHCI_EPCTX_4_AVG_TRB_LEN_SET(max_frame_size) |
-	    XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_SET(max_frame_size);
+	temp = 0;
+
+	switch (edesc->bmAttributes & UE_XFERTYPE) {
+	case UE_INTERRUPT:
+	case UE_ISOCHRONOUS:
+		temp |= XHCI_EPCTX_4_MAX_ESIT_PAYLOAD_SET(max_frame_size);
+		temp |= XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_TD_PAYLOAD_MAX);
+		break;
+	case UE_CONTROL:
+		temp |= XHCI_EPCTX_4_AVG_TRB_LEN_SET(8);
+		break;
+	default:
+		temp |= XHCI_EPCTX_4_AVG_TRB_LEN_SET(XHCI_TD_PAYLOAD_MAX);
+		break;
+	}
 
 	pinp->ctx_ep[epno - 1].dwEpCtx4 = htole32(temp);
 
@@ -2010,16 +2032,20 @@
 xhci_configure_endpoint_by_xfer(struct usb_xfer *xfer)
 {
 	struct xhci_endpoint_ext *pepext;
+	struct usb_endpoint_ss_comp_descriptor *ecomp;
 
 	pepext = xhci_get_endpoint_ext(xfer->xroot->udev,
 	    xfer->endpoint->edesc);
 
+	ecomp = xfer->endpoint->ecomp;
+
 	pepext->trb[0].dwTrb3 = 0;	/* halt any transfers */
 	usb_pc_cpu_flush(pepext->page_cache);
 
 	return (xhci_configure_endpoint(xfer->xroot->udev,
 	    xfer->endpoint->edesc, pepext->physaddr,
 	    xfer->interval, xfer->max_packet_count,
+	    (ecomp != NULL) ? (ecomp->bmAttributes & 3) + 1 : 1,
 	    xfer->max_packet_size, xfer->max_frame_size));
 }
 
@@ -2122,12 +2148,19 @@
 		temp |= XHCI_SCTX_1_NUM_PORTS_SET(udev->hub->nports);
 
 	switch (udev->speed) {
-	case USB_SPEED_LOW:
-	case USB_SPEED_HIGH:
-	case USB_SPEED_FULL:
+	case USB_SPEED_SUPER:
+		switch (sc->sc_hw.devs[index].state) {
+		case XHCI_ST_ADDRESSED:
+		case XHCI_ST_CONFIGURED:
+			/* enable power save */
+			temp |= XHCI_SCTX_1_MAX_EL_SET(sc->sc_exit_lat_max);
+			break;
+		default:
+			/* disable power save */
+			break;
+		}
 		break;
 	default:
-		temp |= XHCI_SCTX_1_MAX_EL_SET(sc->sc_exit_lat_max);
 		break;
 	}
 
@@ -3116,7 +3149,7 @@
 	 * maximum data payload.
 	 */
 	parm->hc_max_packet_size = 0x400;
-	parm->hc_max_packet_count = 15;
+	parm->hc_max_packet_count = 16 * 3;
 	parm->hc_max_frame_size = XHCI_TD_PAYLOAD_MAX;
 
 	xfer->flags_int.bdma_enable = 1;

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#19 (text+ko) ====

@@ -46,7 +46,6 @@
 #define	XHCI_SCRATCH_BUF_ARRAY_ALIGN	64	/* bytes */
 #define	XHCI_SCRATCH_BUFFER_ALIGN	USB_PAGE_SIZE
 #define	XHCI_TRB_ALIGN			16	/* bytes */
-#define	XHCI_QH_ALIGN			16	/* bytes */
 #define	XHCI_TD_ALIGN			64	/* bytes */
 #define	XHCI_PAGE_SIZE			4096	/* bytes */
 
@@ -304,7 +303,7 @@
 	struct xhci_trb trb[XHCI_MAX_ENDPOINTS][XHCI_MAX_TRANSFERS];
 };
 
-#define	XHCI_TD_PAGE_NBUF	5	/* units */
+#define	XHCI_TD_PAGE_NBUF	13	/* units */
 #define	XHCI_TD_PAGE_SIZE	4096	/* bytes */
 #define	XHCI_TD_PAYLOAD_MAX	(XHCI_TD_PAGE_SIZE * (XHCI_TD_PAGE_NBUF - 1))
 

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:48 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D22981066DA6; Wed, 11 Aug 2010 18:26:26 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E60911066A51
	for ; Wed, 11 Aug 2010 18:26:23 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id D39118FC13
	for ; Wed, 11 Aug 2010 18:26:23 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQN0n084570
	for ; Wed, 11 Aug 2010 18:26:23 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQNRk084567
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:23 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:23 GMT
Message-Id: <201008111826.o7BIQNRk084567@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182222 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:48 -0000

http://p4web.freebsd.org/@@182222?ac=10

Change 182222 by gonzo@gonzo_figaro on 2010/08/10 20:51:10

	Add avr32 to the list of KNOWN_ARCHES

Affected files ...

.. //depot/projects/avr32/src/Makefile.inc1#13 edit

Differences ...

==== //depot/projects/avr32/src/Makefile.inc1#13 (text+ko) ====

@@ -128,7 +128,7 @@
 TARGET?=	${MACHINE}
 TARGET_ARCH?=	${MACHINE_ARCH}
 
-KNOWN_ARCHES?=	amd64 arm i386 i386/pc98 ia64 mips powerpc powerpc64/powerpc sparc64 sparc64/sun4v
+KNOWN_ARCHES?=	amd64 arm avr32 i386 i386/pc98 ia64 mips powerpc powerpc64/powerpc sparc64 sparc64/sun4v
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:48 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EBDBC1066DDC; Wed, 11 Aug 2010 18:26:27 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9E60E1066A8B
	for ; Wed, 11 Aug 2010 18:26:24 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 8A7AC8FC1D
	for ; Wed, 11 Aug 2010 18:26:24 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQONq084598
	for ; Wed, 11 Aug 2010 18:26:24 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQOnS084595
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:24 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 11 Aug 2010 18:26:24 GMT
Message-Id: <201008111826.o7BIQOnS084595@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182226 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:48 -0000

http://p4web.freebsd.org/@@182226?ac=10

Change 182226 by gonzo@gonzo_figaro on 2010/08/10 21:24:42

	New way of handling syscalls introduced by r208453

Affected files ...

.. //depot/projects/avr32/src/sys/avr32/avr32/elf_machdep.c#5 edit
.. //depot/projects/avr32/src/sys/avr32/avr32/trap.c#15 edit
.. //depot/projects/avr32/src/sys/avr32/avr32/vm_machdep.c#13 edit

Differences ...

==== //depot/projects/avr32/src/sys/avr32/avr32/elf_machdep.c#5 (text+ko) ====

@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -75,7 +76,10 @@
 	.sv_setregs	= exec_setregs,
 	.sv_fixlimit	= NULL,
 	.sv_maxssiz	= NULL,
-	.sv_flags	= SV_ABI_FREEBSD | SV_ILP32
+	.sv_flags	= SV_ABI_FREEBSD | SV_ILP32,
+	.sv_set_syscall_retval = cpu_set_syscall_retval,
+	.sv_fetch_syscall_args = NULL, /* XXXKIB */
+	.sv_syscallnames = syscallnames,
 };
 
 static Elf32_Brandinfo freebsd_brand_info = {

==== //depot/projects/avr32/src/sys/avr32/avr32/trap.c#15 (text+ko) ====

@@ -466,7 +466,6 @@
         CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td,
             td->td_proc->p_pid, td->td_name, code);
 
-        td->td_syscalls++;
         if (error == 0) {
 		td->td_retval[0] = 0;
 		td->td_retval[1] = 0;

==== //depot/projects/avr32/src/sys/avr32/avr32/vm_machdep.c#13 (text+ko) ====

@@ -261,3 +261,8 @@
 	}
 }
 
+void
+cpu_set_syscall_retval(struct thread *td, int error)
+{
+	panic("cpu_set_syscall_retval: implement me");
+}

From owner-p4-projects@FreeBSD.ORG  Wed Aug 11 18:26:48 2010
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F369E1066DE4; Wed, 11 Aug 2010 18:26:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F105E1066B35
	for ; Wed, 11 Aug 2010 18:26:24 +0000 (UTC)
	(envelope-from kkata@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id DBE5F8FC20
	for ; Wed, 11 Aug 2010 18:26:24 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7BIQOhM084605
	for ; Wed, 11 Aug 2010 18:26:24 GMT
	(envelope-from kkata@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7BIQOHm084601
	for perforce@freebsd.org; Wed, 11 Aug 2010 18:26:24 GMT
	(envelope-from kkata@freebsd.org)
Date: Wed, 11 Aug 2010 18:26:24 GMT
Message-Id: <201008111826.o7BIQOHm084601@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	kkata@freebsd.org using -f
From: Katalin Konkoly 
To: Perforce Change Reviews 
Precedence: bulk
Cc: 
Subject: PERFORCE change 182227 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes 
List-Unsubscribe: ,
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: ,
	
X-List-Received-Date: Wed, 11 Aug 2010 18:26:48 -0000

http://p4web.freebsd.org/@@182227?ac=10

Change 182227 by kkata@bonbol_fbsd on 2010/08/10 21:58:46

	IFC

Affected files ...

.. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#17 integrate
.. //depot/projects/docproj_hu/www/en/cgi/man.cgi#22 integrate
.. //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#20 integrate
.. //depot/projects/docproj_hu/www/en/search/opensearch/Makefile#3 integrate
.. //depot/projects/docproj_hu/www/en/search/opensearch/man-freebsd-release-ports.xml#1 branch
.. //depot/projects/docproj_hu/www/en/search/opensearch/opensearch.sgml#3 integrate
.. //depot/projects/docproj_hu/www/hu/community.xsl#11 integrate
.. //depot/projects/docproj_hu/www/hu/events/rss.xsl#5 integrate
.. //depot/projects/docproj_hu/www/hu/index.xsl#25 integrate
.. //depot/projects/docproj_hu/www/hu/news/2009/news.xml#4 integrate
.. //depot/projects/docproj_hu/www/hu/search/site.map#11 integrate
.. //depot/projects/docproj_hu/www/hu/search/web.atoz#17 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#33 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#19 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#17 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#31 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#106 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/templates.events.xsl#8 integrate
.. //depot/projects/docproj_hu/www/hu/share/sgml/templates.pastevents.xsl#4 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#28 integrate
.. //depot/projects/docproj_hu/www/share/sgml/commercial.software.xml#6 integrate
.. //depot/projects/docproj_hu/www/share/sgml/events.xml#30 integrate
.. //depot/projects/docproj_hu/www/share/sgml/news.xml#100 integrate

Differences ...

==== //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#17 (text+ko) ====

@@ -1,7 +1,7 @@
 
 
 
-
+
 
 

==== //depot/projects/docproj_hu/www/en/cgi/man.cgi#22 (text+ko) ====

@@ -34,7 +34,7 @@
 # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995
 #
 # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $
-# $FreeBSD: www/en/cgi/man.cgi,v 1.253 2010/08/04 17:17:58 wosch Exp $
+# $FreeBSD: www/en/cgi/man.cgi,v 1.254 2010/08/09 19:37:14 wosch Exp $
 
 ############################################################################
 # !!! man.cgi is stale perl4 code !!!
@@ -630,6 +630,7 @@
 
 
 
+