Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 May 2009 21:14:23 GMT
From:      Andrew Thompson <thompsa@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 162971 for review
Message-ID:  <200905282114.n4SLENBr008352@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=162971

Change 162971 by thompsa@thompsa_burger on 2009/05/28 21:13:43

	Integrate from usb.

Affected files ...

.. //depot/projects/usb_buf/src/lib/libusb/libusb.3#3 integrate
.. //depot/projects/usb_buf/src/lib/libusb/libusb20.c#2 integrate
.. //depot/projects/usb_buf/src/lib/libusb/libusb20.h#2 integrate
.. //depot/projects/usb_buf/src/sys/Makefile#2 integrate
.. //depot/projects/usb_buf/src/sys/arm/at91/ohci_atmelarm.c#2 delete
.. //depot/projects/usb_buf/src/sys/arm/conf/AVILA#2 integrate
.. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/usb_buf/src/sys/boot/common/ufsread.c#2 integrate
.. //depot/projects/usb_buf/src/sys/boot/pc98/boot2/sys.c#2 integrate
.. //depot/projects/usb_buf/src/sys/cddl/boot/zfs/zfssubr.c#3 integrate
.. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch
.. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate
.. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate
.. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate
.. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate
.. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate
.. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate
.. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate
.. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate
.. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate
.. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate
.. //depot/projects/usb_buf/src/sys/cddl/dev/lockstat/lockstat.c#1 branch
.. //depot/projects/usb_buf/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/usb_buf/src/sys/compat/linux/linux_ioctl.c#2 integrate
.. //depot/projects/usb_buf/src/sys/compat/linux/linux_mib.c#2 integrate
.. //depot/projects/usb_buf/src/sys/compat/ndis/kern_ndis.c#2 integrate
.. //depot/projects/usb_buf/src/sys/compat/ndis/subr_usbd.c#2 integrate
.. //depot/projects/usb_buf/src/sys/conf/NOTES#2 integrate
.. //depot/projects/usb_buf/src/sys/conf/files#4 integrate
.. //depot/projects/usb_buf/src/sys/conf/files.i386#3 integrate
.. //depot/projects/usb_buf/src/sys/conf/files.powerpc#3 integrate
.. //depot/projects/usb_buf/src/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/usb_buf/src/sys/conf/options#2 integrate
.. //depot/projects/usb_buf/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/usb_buf/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate
.. //depot/projects/usb_buf/src/sys/crypto/via/padlock_hash.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/ata/ata-usb.c#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/bktr/bktr_os.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_main.c#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/if_ndis/if_ndis_usb.c#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/iwi/if_iwivar.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/ksyms/ksyms.c#1 branch
.. //depot/projects/usb_buf/src/sys/dev/mii/e1000phy.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/mii/e1000phyreg.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/mii/miidevs#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/mpt/mpt_raid.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/msk/if_msk.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/msk/if_mskreg.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/nge/if_nge.c#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/nge/if_ngereg.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/random/nehemiah.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/random/randomdev_soft.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/sound/pci/cmi.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/sound/pci/cs4281.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/sound/pci/vibes.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/sound/pcm/sound.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/sound/pcm/sound.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/sound/usb/uaudio.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/sound/usb/uaudioreg.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/bluetooth/TODO.TXT#2 delete
.. //depot/projects/usb_buf/src/sys/dev/usb/bluetooth/ng_ubt.c#4 delete
.. //depot/projects/usb_buf/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete
.. //depot/projects/usb_buf/src/sys/dev/usb/bluetooth/ubtbcmfw.c#4 delete
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/misc/udbp.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/misc/ufm.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_aue.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_auereg.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_axe.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_axereg.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdce.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdcereg.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cue.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cuereg.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_kue.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_kuereg.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_rue.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_ruereg.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_udav.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/if_udavreg.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uark.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubsa.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubser.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uchcom.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ucycom.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ufoma.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uipaq.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/ulpt.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/umodem.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/umoscom.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uplcom.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/usb_serial.c#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/usb_serial.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uslcom.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvisor.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvscom.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/storage/umass.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/storage/urio.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/storage/ustorage_fs.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template.c#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template_cdce.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template_msc.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template_mtp.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_bus.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_cdc.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_controller.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.h#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.h#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_ioctl.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_parse.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_parse.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.c#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.c#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usbdevs#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/usbhid.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rumvar.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uath.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uathvar.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_upgt.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_ural.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uralvar.h#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtw.c#1 branch
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtwreg.h#1 branch
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtwvar.h#1 branch
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zyd.c#4 integrate
.. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate
.. //depot/projects/usb_buf/src/sys/dev/wi/if_wi.c#3 integrate
.. //depot/projects/usb_buf/src/sys/dev/xen/netfront/netfront.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfs/nfs.h#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfs/nfs_commonacl.c#2 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfs/nfs_commonkrpc.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfs/nfs_commonport.c#2 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfs/nfs_commonsubs.c#2 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfs/nfsport.h#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clbio.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clkrpc.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clport.c#2 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clvfsops.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clvnops.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfsserver/nfs_nfsdport.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfsserver/nfs_nfsdsocket.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/nfsserver/nfs_nfsdstate.c#4 integrate
.. //depot/projects/usb_buf/src/sys/fs/nwfs/nwfs_io.c#2 integrate
.. //depot/projects/usb_buf/src/sys/fs/procfs/procfs_status.c#2 integrate
.. //depot/projects/usb_buf/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate
.. //depot/projects/usb_buf/src/sys/fs/smbfs/smbfs_io.c#3 integrate
.. //depot/projects/usb_buf/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate
.. //depot/projects/usb_buf/src/sys/geom/geom_subr.c#2 integrate
.. //depot/projects/usb_buf/src/sys/i386/xen/xen_rtc.c#1 branch
.. //depot/projects/usb_buf/src/sys/ia64/ia64/mp_machdep.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/init_main.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_conf.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_cpuset.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_exit.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_fail.c#1 branch
.. //depot/projects/usb_buf/src/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_lock.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_lockf.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_lockstat.c#1 branch
.. //depot/projects/usb_buf/src/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_mutex.c#3 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_prot.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_rmlock.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_rwlock.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_sx.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/kern_vimage.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/link_elf.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/link_elf_obj.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/linker_if.m#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/subr_acl_posix1e.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/sysv_msg.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/sysv_shm.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/tty.c#3 integrate
.. //depot/projects/usb_buf/src/sys/kern/tty_inq.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/uipc_debug.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/usb_buf/src/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/usb_buf/src/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/usb_buf/src/sys/kgssapi/gsstest.c#2 integrate
.. //depot/projects/usb_buf/src/sys/legacy/dev/ata/ata-usb.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/sound/usb/uaudio.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/sound/usb/uaudio.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/FILES#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/dsbr100io.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehci.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehci_ddb.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehci_mbus.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehci_pci.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehcireg.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ehcivar.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/hid.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/hid.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/if_urtw.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/if_urtwreg.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/if_urtwvar.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ohci.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ohci_pci.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ohcireg.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ohcivar.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/rio500_usb.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/rt2573_ucode.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/sl811hs.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/sl811hsreg.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/sl811hsvar.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/slhci_pccard.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/u3g.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uark.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ubsa.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ubser.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ubser.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uchcom.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ucom.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ucomvar.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ucycom.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/udbp.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/udbp.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ufm.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ufoma.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uftdi.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uftdireg.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ugen.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhci.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhci_pci.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhcireg.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhcivar.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhid.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uhub.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uipaq.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ukbd.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ulpt.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/umass.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/umct.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/umodem.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/ums.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uplcom.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/urio.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_if.m#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_mem.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_mem.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_port.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_quirks.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_quirks.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usb_subr.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbcdc.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbdi.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbdi.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbdi_util.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbdi_util.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbdivar.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/usbhid.h#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uscanner.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uslcom.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uvisor.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uvscom.c#2 delete
.. //depot/projects/usb_buf/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete
.. //depot/projects/usb_buf/src/sys/mips/mips/pmap.c#2 integrate
.. //depot/projects/usb_buf/src/sys/modules/Makefile#2 integrate
.. //depot/projects/usb_buf/src/sys/modules/dtrace/Makefile#2 integrate
.. //depot/projects/usb_buf/src/sys/modules/dtrace/dtraceall/dtraceall.c#2 integrate
.. //depot/projects/usb_buf/src/sys/modules/ksyms/Makefile#1 branch
.. //depot/projects/usb_buf/src/sys/modules/linux/Makefile#2 integrate
.. //depot/projects/usb_buf/src/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate
.. //depot/projects/usb_buf/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate
.. //depot/projects/usb_buf/src/sys/modules/nfs4client/Makefile#2 delete
.. //depot/projects/usb_buf/src/sys/modules/nfscl/Makefile#1 branch
.. //depot/projects/usb_buf/src/sys/modules/nfsclient/Makefile#2 integrate
.. //depot/projects/usb_buf/src/sys/modules/nfscommon/Makefile#1 branch
.. //depot/projects/usb_buf/src/sys/modules/nfsd/Makefile#1 branch
.. //depot/projects/usb_buf/src/sys/modules/usb/Makefile#2 integrate
.. //depot/projects/usb_buf/src/sys/modules/usb/urtw/Makefile#1 branch
.. //depot/projects/usb_buf/src/sys/modules/wlan/Makefile#2 integrate
.. //depot/projects/usb_buf/src/sys/modules/zfs/Makefile#2 integrate
.. //depot/projects/usb_buf/src/sys/net/bpf.c#3 integrate
.. //depot/projects/usb_buf/src/sys/net/if.c#2 integrate
.. //depot/projects/usb_buf/src/sys/net/if_clone.c#2 integrate
.. //depot/projects/usb_buf/src/sys/net/if_loop.c#2 integrate
.. //depot/projects/usb_buf/src/sys/net/if_var.h#2 integrate
.. //depot/projects/usb_buf/src/sys/net/rtsock.c#2 integrate
.. //depot/projects/usb_buf/src/sys/net/vnet.h#2 integrate
.. //depot/projects/usb_buf/src/sys/net80211/ieee80211_adhoc.c#3 integrate
.. //depot/projects/usb_buf/src/sys/net80211/ieee80211_freebsd.c#4 integrate
.. //depot/projects/usb_buf/src/sys/net80211/ieee80211_hostap.c#3 integrate
.. //depot/projects/usb_buf/src/sys/net80211/ieee80211_monitor.c#3 integrate
.. //depot/projects/usb_buf/src/sys/net80211/ieee80211_radiotap.c#2 integrate
.. //depot/projects/usb_buf/src/sys/net80211/ieee80211_sta.c#3 integrate
.. //depot/projects/usb_buf/src/sys/net80211/ieee80211_wds.c#3 integrate
.. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/drivers/ubt/TODO#2 delete
.. //depot/projects/usb_buf/src/sys/netinet/accf_dns.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet/in.c#4 integrate
.. //depot/projects/usb_buf/src/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/usb_buf/src/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet/ip_ipsec.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet/tcp_input.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet/tcp_reass.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet/udp_var.h#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet/vinet.h#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet6/icmp6.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet6/in6.c#4 integrate
.. //depot/projects/usb_buf/src/sys/netinet6/in6.h#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet6/in6_mcast.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet6/ip6_input.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet6/mld6.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netipsec/ipsec.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/usb_buf/src/sys/netipsec/ipsec6.h#2 integrate
.. //depot/projects/usb_buf/src/sys/netipsec/key.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netipsec/vipsec.h#2 integrate
.. //depot/projects/usb_buf/src/sys/netipx/spx.h#2 integrate
.. //depot/projects/usb_buf/src/sys/netipx/spx_reass.c#1 branch
.. //depot/projects/usb_buf/src/sys/netipx/spx_usrreq.c#2 integrate
.. //depot/projects/usb_buf/src/sys/netipx/spx_var.h#2 integrate
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4.h#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_dev.c#3 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_dev.h#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_idmap.c#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_idmap.h#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_socket.c#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_subs.c#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vfs.h#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vfs_subs.c#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vfsops.c#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vn.h#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vn_subs.c#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4_vnops.c#2 delete
.. //depot/projects/usb_buf/src/sys/nfs4client/nfs4m_subs.h#2 delete
.. //depot/projects/usb_buf/src/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/krpc_subr.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfs.h#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfs_bio.c#3 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfs_diskless.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfs_krpc.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfs_lock.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfs_node.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfs_socket.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfs_subs.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfs_vfsops.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfsm_subs.h#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfsmount.h#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsserver/nfs_srvkrpc.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nfsserver/nfs_srvsock.c#2 integrate
.. //depot/projects/usb_buf/src/sys/nlm/nlm_advlock.c#2 integrate
.. //depot/projects/usb_buf/src/sys/opencrypto/cryptodev.c#2 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/booke/clock.c#3 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/booke/locore.S#2 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/booke/machdep.c#3 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/booke/mp_cpudep.c#1 branch
.. //depot/projects/usb_buf/src/sys/powerpc/booke/platform_bare.c#2 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/booke/pmap.c#3 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/booke/trap_subr.S#2 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/booke/vm_machdep.c#3 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/include/mutex.h#2 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/include/pcpu.h#2 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/include/spr.h#3 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/mpc85xx/ocpbus.c#2 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/mpc85xx/ocpbus.h#2 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/powerpc/busdma_machdep.c#2 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/powerpc/mp_machdep.c#3 integrate
.. //depot/projects/usb_buf/src/sys/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/usb_buf/src/sys/rpc/rpcclnt.c#2 delete
.. //depot/projects/usb_buf/src/sys/rpc/rpcclnt.h#2 delete
.. //depot/projects/usb_buf/src/sys/rpc/xdr.h#2 integrate
.. //depot/projects/usb_buf/src/sys/security/mac/mac_framework.c#2 integrate
.. //depot/projects/usb_buf/src/sys/security/mac/mac_internal.h#2 integrate
.. //depot/projects/usb_buf/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate
.. //depot/projects/usb_buf/src/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/acl.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/cpuset.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/eventhandler.h#3 integrate
.. //depot/projects/usb_buf/src/sys/sys/fail.h#1 branch
.. //depot/projects/usb_buf/src/sys/sys/jail.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/ksyms.h#1 branch
.. //depot/projects/usb_buf/src/sys/sys/lock.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/lockf.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/lockstat.h#1 branch
.. //depot/projects/usb_buf/src/sys/sys/mutex.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/namei.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/param.h#3 integrate
.. //depot/projects/usb_buf/src/sys/sys/priv.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/queue.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/rwlock.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/sx.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/syscallsubr.h#2 integrate
.. //depot/projects/usb_buf/src/sys/sys/systm.h#3 integrate
.. //depot/projects/usb_buf/src/sys/sys/vimage.h#3 integrate
.. //depot/projects/usb_buf/src/sys/ufs/ufs/ufs_acl.c#2 integrate
.. //depot/projects/usb_buf/src/sys/ufs/ufs/ufs_vnops.c#2 integrate
.. //depot/projects/usb_buf/src/sys/vm/vm_object.c#2 integrate
.. //depot/projects/usb_buf/src/sys/vm/vm_pageout.c#3 integrate
.. //depot/projects/usb_buf/src/sys/xdr/xdr_mem.c#2 integrate
.. //depot/projects/usb_buf/src/sys/xen/xenbus/xenbus_xs.c#2 integrate

Differences ...

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

@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD: src/lib/libusb/libusb.3,v 1.2 2009/04/05 18:30:24 thompsa Exp $
 .\"
-.Dd April 5, 2009
+.Dd May 28, 2009
 .Dt LIBUSB 3
 .Os
 .Sh NAME
@@ -78,6 +78,8 @@
 .Fn libusb20_tr_set_callback "struct libusb20_transfer *xfer" "libusb20_tr_callback_t *cb"
 .Ft void
 .Fn libusb20_tr_set_flags "struct libusb20_transfer *xfer" "uint8_t flags"
+.Ft uint32_t
+.Fn libusb20_tr_get_length "struct libusb20_transfer *xfer" "uint16_t fr_index"
 .Ft void
 .Fn libusb20_tr_set_length "struct libusb20_transfer *xfer" "uint32_t length" "uint16_t fr_index"
 .Ft void
@@ -183,6 +185,10 @@
 .Ft int
 .Fn libusb20_be_remove_dev_quirk "struct libusb20_backend *pbe" "struct libusb20_quirk *pq"
 .Ft struct libusb20_backend *
+.Fn libusb20_be_alloc_default "void"
+.Ft struct libusb20_backend *
+.Fn libusb20_be_alloc_freebsd "void"
+.Ft struct libusb20_backend *
 .Fn libusb20_be_alloc_linux "void"
 .Ft struct libusb20_device *
 .Fn libusb20_be_device_foreach  "struct libusb20_backend *pbe" "struct libusb20_device *pdev"
@@ -227,7 +233,7 @@
 .Pp
 .
 .Fn libusb20_tr_open
-will allocate kernel resources like
+will allocate kernel buffer resources according to
 .Fa max_buf_size
 and
 .Fa max_frame_count
@@ -235,6 +241,18 @@
 .Fa pxfer
 and bind the transfer to the specified
 .Fa ep_no .
+.Fa max_buf_size
+is the minimum buffer size which the data transport layer has to support.
+If
+.Fa max_buf_size
+is zero, the
+.Nm
+library will use wMaxPacketSize to compute the buffer size.
+This can be useful for isochronous transfers.
+The actual buffer size can be greater than
+.Fa max_buf_size
+and is returned by
+.Fn libusb20_tr_get_max_total_length .
 .
 This function returns zero upon success.
 .
@@ -367,8 +385,14 @@
 .
 .Pp
 .
+.Fn libusb20_tr_get_length
+returns the length of the given USB frame by index.
+After an USB transfer is complete the USB frame length will get updated to the actual transferred length.
+.
+.Pp
+.
 .Fn libusb20_tr_set_length
-sets the length of a given USB transfer and frame index.
+sets the length of the given USB frame by index.
 .
 .Pp
 .
@@ -829,6 +853,10 @@
 If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is
 returned.
 .
+.Pp
+.
+.Fn libusb20_be_alloc_default
+.Fn libusb20_be_alloc_freebsd
 .Fn libusb20_be_alloc_linux
 These functions are used to allocate a specific USB backend or the
 operating system default USB backend. Allocating a backend is a way to

==== //depot/projects/usb_buf/src/lib/libusb/libusb20.c#2 (text+ko) ====

@@ -319,6 +319,12 @@
 	return;
 }
 
+uint32_t
+libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t frIndex)
+{
+	return (xfer->pLength[frIndex]);
+}
+
 void
 libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t frIndex)
 {

==== //depot/projects/usb_buf/src/lib/libusb/libusb20.h#2 (text+ko) ====

@@ -216,6 +216,7 @@
 void	libusb20_tr_set_buffer(struct libusb20_transfer *xfer, void *buffer, uint16_t fr_index);
 void	libusb20_tr_set_callback(struct libusb20_transfer *xfer, libusb20_tr_callback_t *cb);
 void	libusb20_tr_set_flags(struct libusb20_transfer *xfer, uint8_t flags);
+uint32_t libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t fr_index);
 void	libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t fr_index);
 void	libusb20_tr_set_priv_sc0(struct libusb20_transfer *xfer, void *sc0);
 void	libusb20_tr_set_priv_sc1(struct libusb20_transfer *xfer, void *sc1);

==== //depot/projects/usb_buf/src/sys/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.54 2009/02/15 18:19:24 imp Exp $
+# $FreeBSD: src/sys/Makefile,v 1.55 2009/05/22 12:35:12 rwatson Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,7 @@
 CSCOPEDIRS=	boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
 		geom gnu isa kern libkern modules net net80211 netatalk \
 		netgraph netinet netinet6 netipsec netipx netnatm netncp \
-		netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \
+		netsmb nfs nfsclient nfsserver nlm opencrypto \
 		pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR}
 .if defined(ALL_ARCH)
 CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v

==== //depot/projects/usb_buf/src/sys/arm/conf/AVILA#2 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/arm/conf/AVILA,v 1.31 2009/05/10 00:00:25 kuriyama Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.32 2009/05/27 16:16:56 thompsa Exp $
 
 ident		AVILA
 
@@ -132,15 +132,14 @@
 options 	AH_SUPPORT_AR5416
 device		ath_ar9160
 
-makeoptions	WITH_LEGACY
-device		ousb
+device		usb
 #options 	USB_DEBUG
-device		oohci
-device		oehci
-device		oumass
+device		ohci
+device		ehci
+device		umass
 device		scbus		# SCSI bus (required for SCSI)
 device		da		# Direct Access (disks)
 
-#device		oural
-#device		ozyd
+#device		ural
+#device		zyd
 #device		wlan_amrr

==== //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/files.ixp425#2 (text+ko) ====

@@ -1,4 +1,4 @@
-#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.10 2009/03/06 23:22:09 sam Exp $
+#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.11 2009/05/27 16:16:56 thompsa Exp $
 arm/arm/bus_space_generic.c		standard
 arm/arm/cpufunc_asm_xscale.S		standard
 arm/arm/irq_dispatch.S			standard
@@ -47,4 +47,3 @@
 arm/xscale/ixp425/ixp425_qmgr.c		optional qmgr
 #
 dev/usb/controller/ehci_ixp4xx.c	optional ehci usb
-legacy/dev/usb/ehci_ixp4xx.c		optional oehci ousb

==== //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/if_npe.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.14 2009/03/10 19:35:37 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.15 2009/05/23 19:14:20 sam Exp $");
 
 /*
  * Intel XScale NPE Ethernet driver.
@@ -143,6 +143,7 @@
 	struct npestats	*sc_stats;
 	bus_dmamap_t	sc_stats_map;
 	bus_addr_t	sc_stats_phys;	/* phys addr of sc_stats */
+	struct npestats	sc_totals;	/* accumulated sc_stats */
 };
 
 /*
@@ -374,6 +375,8 @@
 	    CTLFLAG_RW, &sc->sc_debug, 0, "control debugging printfs");
 	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "tickinterval",
 	    CTLFLAG_RW, &sc->sc_tickinterval, 0, "periodic work frequency");
+	SYSCTL_ADD_STRUCT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "stats",
+	    CTLFLAG_RD, &sc->sc_totals, npestats, "onboard stats");
 
 	ether_ifattach(ifp, eaddr);
 	return 0;
@@ -867,12 +870,24 @@
 static void
 npe_addstats(struct npe_softc *sc)
 {
-#define	MIBADD(x)	sc->mibdata.x += be32toh(ns->x)
+#define	NPEADD(x)	sc->sc_totals.x += be32toh(ns->x)
+#define	MIBADD(x) do { sc->mibdata.x += be32toh(ns->x); NPEADD(x); } while (0)
 	struct ifnet *ifp = sc->sc_ifp;
 	struct npestats *ns = sc->sc_stats;
 
 	MIBADD(dot3StatsAlignmentErrors);
 	MIBADD(dot3StatsFCSErrors);
+	MIBADD(dot3StatsInternalMacReceiveErrors);
+	NPEADD(RxOverrunDiscards);
+	NPEADD(RxLearnedEntryDiscards);
+	NPEADD(RxLargeFramesDiscards);
+	NPEADD(RxSTPBlockedDiscards);
+	NPEADD(RxVLANTypeFilterDiscards);
+	NPEADD(RxVLANIdFilterDiscards);
+	NPEADD(RxInvalidSourceDiscards);
+	NPEADD(RxBlackListDiscards);
+	NPEADD(RxWhiteListDiscards);
+	NPEADD(RxUnderflowEntryDiscards);
 	MIBADD(dot3StatsSingleCollisionFrames);
 	MIBADD(dot3StatsMultipleCollisionFrames);
 	MIBADD(dot3StatsDeferredTransmissions);
@@ -880,10 +895,12 @@
 	MIBADD(dot3StatsExcessiveCollisions);
 	MIBADD(dot3StatsInternalMacTransmitErrors);
 	MIBADD(dot3StatsCarrierSenseErrors);
+	NPEADD(TxLargeFrameDiscards);
+	NPEADD(TxVLANIdFilterDiscards);
+
 	sc->mibdata.dot3StatsFrameTooLongs +=
 	      be32toh(ns->RxLargeFramesDiscards)
 	    + be32toh(ns->TxLargeFrameDiscards);
-	MIBADD(dot3StatsInternalMacReceiveErrors);
 	sc->mibdata.dot3StatsMissedFrames +=
 	      be32toh(ns->RxOverrunDiscards)
 	    + be32toh(ns->RxUnderflowEntryDiscards);
@@ -902,6 +919,7 @@
 		  be32toh(ns->dot3StatsSingleCollisionFrames)
 		+ be32toh(ns->dot3StatsMultipleCollisionFrames)
 		;
+#undef NPEADD
 #undef MIBADD
 }
 

==== //depot/projects/usb_buf/src/sys/boot/common/ufsread.c#2 (text+ko) ====

@@ -44,9 +44,10 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.18 2008/06/07 05:49:24 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.19 2009/05/28 08:22:36 dfr Exp $");
 
 #include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
 #ifdef UFS_SMALL_CGBASE
 /* XXX: Revert to old (broken for over 1.5Tb filesystems) version of cgbase
@@ -93,7 +94,7 @@
 fsfind(const char *name, ino_t * ino)
 {
 	char buf[DEV_BSIZE];
-	struct dirent *d;
+	struct direct *d;
 	char *s;
 	ssize_t n;
 
@@ -104,7 +105,7 @@
 			if (ls)
 				printf("%s ", d->d_name);
 			else if (!strcmp(name, d->d_name)) {
-				*ino = d->d_fileno;
+				*ino = d->d_ino;
 				return d->d_type;
 			}
 			s += d->d_reclen;

==== //depot/projects/usb_buf/src/sys/boot/pc98/boot2/sys.c#2 (text+ko) ====

@@ -27,14 +27,14 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.7 2005/05/08 14:17:27 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/sys.c,v 1.8 2009/05/28 08:22:36 dfr Exp $");
 
 /*
  * Ported to PC-9801 by Yoshio Kimura
  */
 
 #include "boot.h"
-#include <sys/dirent.h>
+#include <ufs/ufs/dir.h>
 
 #if 0
 /* #define BUFSIZE 4096 */
@@ -142,7 +142,7 @@
 {
 	char *rest, ch;
 	int block, off, loc, ino = ROOTINO;
-	struct dirent *dp;
+	struct direct *dp;
 	char list_only;
 
 	list_only = (path[0] == '?' && path[1] == '\0');
@@ -174,12 +174,12 @@
 			devread(iobuf, fsbtodb(fs, block_map(block)) + boff,
 				blksize(fs, &inode, block));
 		}
-		dp = (struct dirent *)(iobuf + off);
+		dp = (struct direct *)(iobuf + off);
 		loc += dp->d_reclen;
-		if (dp->d_fileno && list_only)
+		if (dp->d_ino && list_only)
 			printf("%s ", dp->d_name);
-	} while (!dp->d_fileno || strcmp(path, dp->d_name));
-	ino = dp->d_fileno;
+	} while (!dp->d_ino || strcmp(path, dp->d_name));
+	ino = dp->d_ino;
 	*(path = rest) = ch;
 	goto loop;
 }

==== //depot/projects/usb_buf/src/sys/cddl/boot/zfs/zfssubr.c#3 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cddl/boot/zfs/zfssubr.c,v 1.3 2009/05/16 10:48:20 dfr Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/boot/zfs/zfssubr.c,v 1.5 2009/05/23 16:01:58 des Exp $");
 
 static uint64_t zfs_crc64_table[256];
 

==== //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.6 2008/11/23 20:14:19 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c,v 1.7 2009/05/24 19:21:49 trasz Exp $");
 
 #include <sys/param.h>
 #include <sys/priv.h>
@@ -302,6 +302,14 @@
 		if (error)
 			return (error);
 	}
+	/*
+	 * Deny setting setuid if we are not the file owner.
+	 */
+	if ((vap->va_mode & S_ISUID) && ovap->va_uid != cred->cr_uid) {
+		error = priv_check_cred(cred, PRIV_VFS_ADMIN, 0);
+		if (error)
+			return (error);
+	}
 	return (0);
 }
 

==== //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 (text+ko) ====

@@ -424,7 +424,7 @@
 #endif
 }
 
-#ifndef __FreeBSD__
+#if !defined(_KERNEL)
 acl_t *
 acl_alloc(enum acl_type type)
 {
@@ -470,7 +470,6 @@
 
 	cacl_free(aclp, sizeof (acl_t));
 }
-#endif
 
 static uint32_t
 access_mask_set(int haswriteperm, int hasreadperm, int isowner, int isallow)
@@ -1727,3 +1726,4 @@
 	return (error);
 #endif
 }
+#endif /* _KERNEL */

==== //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 (text+ko) ====

@@ -46,6 +46,7 @@
 extern int ace_trivial_common(void *, int,
     uint64_t (*walk)(void *, uint64_t, int aclcnt, uint16_t *, uint16_t *,
     uint32_t *mask));
+#if !defined(_KERNEL)
 extern acl_t *acl_alloc(acl_type_t);
 extern void acl_free(acl_t *aclp);
 extern int acl_translate(acl_t *aclp, int target_flavor,
@@ -53,6 +54,7 @@
 void ksort(caddr_t v, int n, int s, int (*f)());
 int cmp2acls(void *a, void *b);
 
+#endif /* _KERNEL */
 
 #ifdef	__cplusplus
 }

==== //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 (text+ko) ====

@@ -18,7 +18,7 @@
  *
  * CDDL HEADER END
  *
- * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.9 2008/11/05 19:39:11 rodrigc Exp $
+ * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.10 2009/05/26 20:28:22 sson Exp $
  */
 
 /*
@@ -122,6 +122,7 @@
 #include <sys/sysctl.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#include <sys/rwlock.h>
 #include <sys/sx.h>
 #include <sys/dtrace_bsd.h>
 #include <netinet/in.h>
@@ -3168,14 +3169,11 @@
 		uintptr_t rw;
 	} r;
 #else
+	struct thread *lowner;
 	union {
-		struct mtx *mi;
-		uintptr_t mx;
-	} m;
-	union {
-		struct sx *si;
-		uintptr_t sx;
-	} s;
+		struct lock_object *li;
+		uintptr_t lx;
+	} l;
 #endif
 
 	switch (subr) {
@@ -3272,75 +3270,83 @@
 		break;
 
 #else
-	/* 
-         * XXX - The following code works because mutex, rwlocks, & sxlocks
-         *       all have similar data structures in FreeBSD.  This may not be
-         *	 good if someone changes one of the lock data structures.
-	 * 	 Ideally, it would be nice if all these shared a common lock 
-	 * 	 object.
-         */
 	case DIF_SUBR_MUTEX_OWNED:
-		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
-		m.mx = tupregs[0].dttk_value;
-
-#ifdef DOODAD
-		if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { 
-			regs[rd] = !(m.mi->mtx_lock & MTX_UNOWNED);
-		} else {	
-			regs[rd] = !(m.mi->mtx_lock & SX_UNLOCKED);
+		if (!dtrace_canload(tupregs[0].dttk_value,
+			sizeof (struct lock_object), mstate, vstate)) {
+			regs[rd] = 0;
+			break;
 		}
-#endif
+		l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value);
+		regs[rd] = LOCK_CLASS(l.li)->lc_owner(l.li, &lowner);
 		break;
 
 	case DIF_SUBR_MUTEX_OWNER:
-		/* XXX - need to use dtrace_canload() and dtrace_loadptr() */ 
-		m.mx = tupregs[0].dttk_value;
-
-		if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { 
-			regs[rd] = m.mi->mtx_lock & ~MTX_FLAGMASK;
-		} else {
-			if (!(m.mi->mtx_lock & SX_LOCK_SHARED)) 
-				regs[rd] = SX_OWNER(m.mi->mtx_lock);
-			else
-				regs[rd] = 0;
+		if (!dtrace_canload(tupregs[0].dttk_value,
+			sizeof (struct lock_object), mstate, vstate)) {
+			regs[rd] = 0;
+			break;
 		}
+		l.lx = dtrace_loadptr((uintptr_t)&tupregs[0].dttk_value);

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905282114.n4SLENBr008352>