From owner-p4-projects@FreeBSD.ORG Mon Jun 15 17:26:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB1D71065673; Mon, 15 Jun 2009 17:26:45 +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 99EE4106564A for ; Mon, 15 Jun 2009 17:26:45 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 85EDC8FC13 for ; Mon, 15 Jun 2009 17:26:45 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5FHQjuh012822 for ; Mon, 15 Jun 2009 17:26:45 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5FHQjZP012818 for perforce@freebsd.org; Mon, 15 Jun 2009 17:26:45 GMT (envelope-from syl@FreeBSD.org) Date: Mon, 15 Jun 2009 17:26:45 GMT Message-Id: <200906151726.n5FHQjZP012818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 164436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2009 17:26:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=164436 Change 164436 by syl@syl_atuin on 2009/06/15 17:26:19 MFC. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libdisk/change.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libutil/kinfo_getfile.3#3 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libutil/kinfo_getvmmap.3#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/amd64/amd64/pmap.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/pcm/feeder_rate.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/version.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/at91dci.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/avr32dci.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci_mbus.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ohci.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ohci_atmelarm.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uhci.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uss820dci.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/input/ukbd.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/misc/udbp.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_auereg.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_axereg.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_ruereg.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_udavreg.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/usb_ethernet.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/usb_ethernet.h#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/quirk/usb_quirk.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uark.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ubsa.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ucycom.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uipaq.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/umoscom.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/usb_serial.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/usb_serial.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uvisor.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uvscom.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/storage/ustorage_fs.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/template/usb_template.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/template/usb_template_cdce.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/template/usb_template_msc.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/template/usb_template_mtp.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb.h#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_bus.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_busdma.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_busdma.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_compat_linux.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_compat_linux.h#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_controller.h#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_core.h#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_debug.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_debug.h#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_defs.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_dev.c#6 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_dev.h#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_device.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_device.h#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_dynamic.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_dynamic.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_endian.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_error.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_error.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_generic.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_generic.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_handle_request.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_handle_request.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_hub.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_hub.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_ioctl.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_lookup.h#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_mfunc.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_msctest.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_msctest.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_parse.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_parse.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_pci.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_process.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_request.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_revision.h#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_transfer.c#5 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_transfer.h#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_util.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_util.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usbhid.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_uath.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_urtw.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_zyd.c#6 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/i386/msi.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/if_ppp/Makefile#3 delete .. //depot/projects/soc2009/syl_usb/src/sys/modules/if_sl/Makefile#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/netinet/ipfw/ip_dummynet.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/rpc/rpcsec_gss/svc_rpcsec_gss.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/param.h#6 integrate .. //depot/projects/soc2009/syl_usb/src/sys/tools/sound/feeder_rate_mkfilter.awk#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/vm/vm_object.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/vm/vm_object.h#2 integrate Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libdisk/change.c#2 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libdisk/change.c,v 1.26 2005/03/30 13:03:33 nyan Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/change.c,v 1.27 2009/06/15 16:18:24 lulf Exp $"); #include #include @@ -34,17 +34,9 @@ sane = 1; -#ifdef PC98 if (disk->bios_cyl >= 65536) -#else - if (disk->bios_cyl > 1024) -#endif sane = 0; -#ifdef PC98 - if (disk->bios_hd >= 256) -#else - if (disk->bios_hd > 16) -#endif + if (disk->bios_hd > 256) sane = 0; #ifdef PC98 if (disk->bios_sect >= 256) ==== //depot/projects/soc2009/syl_usb/src/lib/libutil/kinfo_getfile.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libutil/kinfo_getfile.3,v 1.2 2009/06/12 18:13:34 jhb Exp $ +.\" $FreeBSD: src/lib/libutil/kinfo_getfile.3,v 1.3 2009/06/15 15:43:00 jhb Exp $ .\" .Dd December 6, 2008 .Os @@ -35,7 +35,6 @@ .Lb libutil .Sh SYNOPSIS .In sys/types.h -.In sys/user.h .In libutil.h .Ft struct kinfo_file * .Fn kinfo_getfile "pid_t pid" "int *cntp" @@ -63,7 +62,8 @@ .Fn kinfo_getfile function returns a pointer to an array of .Vt struct kinfo_file -structures. +structures as defined by +.In sys/user.h . The array was obtained by an internal call to .Xr malloc 3 and must be freed by the caller with a call to ==== //depot/projects/soc2009/syl_usb/src/lib/libutil/kinfo_getvmmap.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libutil/kinfo_getvmmap.3,v 1.2 2009/06/12 18:13:34 jhb Exp $ +.\" $FreeBSD: src/lib/libutil/kinfo_getvmmap.3,v 1.3 2009/06/15 15:43:00 jhb Exp $ .\" .Dd December 6, 2008 .Os @@ -35,7 +35,6 @@ .Lb libutil .Sh SYNOPSIS .In sys/types.h -.In sys/user.h .In libutil.h .Ft struct kinfo_vmentry * .Fn kinfo_getfile "pid_t pid" "int *cntp" @@ -63,7 +62,8 @@ .Fn kinfo_getvmmap function returns a pointer to an array of .Vt struct kinfo_vmentry -structures. +structures as defined by +.In sys/user.h . The array was obtained by an internal call to .Xr malloc 3 and must be freed by the caller with a call to ==== //depot/projects/soc2009/syl_usb/src/sys/amd64/amd64/msi.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.10 2009/01/29 09:22:56 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.11 2009/06/15 13:47:49 mav Exp $"); #include #include @@ -210,6 +210,8 @@ old_id = msi->msi_cpu; if (old_vector && old_id == apic_id) return; + if (old_vector && !msi->msi_msix && msi->msi_first->msi_count > 1) + return; /* Allocate IDT vector on this cpu. */ vector = apic_alloc_vector(apic_id, msi->msi_irq); if (vector == 0) ==== //depot/projects/soc2009/syl_usb/src/sys/amd64/amd64/pmap.c#4 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.660 2009/06/08 18:23:43 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.661 2009/06/14 19:51:43 alc Exp $"); /* * Manages physical address maps. @@ -3322,78 +3322,74 @@ pmap_object_init_pt(pmap_t pmap, vm_offset_t addr, vm_object_t object, vm_pindex_t pindex, vm_size_t size) { - vm_offset_t va; + pd_entry_t *pde; + vm_paddr_t pa, ptepa; vm_page_t p, pdpg; VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); KASSERT(object->type == OBJT_DEVICE, ("pmap_object_init_pt: non-device object")); - if (((addr & (NBPDR - 1)) == 0) && ((size & (NBPDR - 1)) == 0)) { - vm_page_t m[1]; - pd_entry_t ptepa, *pde; - - PMAP_LOCK(pmap); - pde = pmap_pde(pmap, addr); - if (pde != 0 && (*pde & PG_V) != 0) - goto out; - PMAP_UNLOCK(pmap); -retry: + if ((addr & (NBPDR - 1)) == 0 && (size & (NBPDR - 1)) == 0) { + if (!vm_object_populate(object, pindex, pindex + atop(size))) + return; p = vm_page_lookup(object, pindex); - if (p != NULL) { - if (vm_page_sleep_if_busy(p, FALSE, "init4p")) - goto retry; - } else { - p = vm_page_alloc(object, pindex, VM_ALLOC_NORMAL); - if (p == NULL) - return; - m[0] = p; + KASSERT(p->valid == VM_PAGE_BITS_ALL, + ("pmap_object_init_pt: invalid page %p", p)); - if (vm_pager_get_pages(object, m, 1, 0) != VM_PAGER_OK) { - vm_page_lock_queues(); - vm_page_free(p); - vm_page_unlock_queues(); - return; - } - - p = vm_page_lookup(object, pindex); - vm_page_wakeup(p); - } - + /* + * Abort the mapping if the first page is not physically + * aligned to a 2MB page boundary. + */ ptepa = VM_PAGE_TO_PHYS(p); if (ptepa & (NBPDR - 1)) return; - p->valid = VM_PAGE_BITS_ALL; + /* + * Skip the first page. Abort the mapping if the rest of + * the pages are not physically contiguous. + */ + p = TAILQ_NEXT(p, listq); + for (pa = ptepa + PAGE_SIZE; pa < ptepa + size; + pa += PAGE_SIZE) { + KASSERT(p->valid == VM_PAGE_BITS_ALL, + ("pmap_object_init_pt: invalid page %p", p)); + if (pa != VM_PAGE_TO_PHYS(p)) + return; + p = TAILQ_NEXT(p, listq); + } + /* Map using 2MB pages. */ PMAP_LOCK(pmap); - for (va = addr; va < addr + size; va += NBPDR) { - while ((pdpg = - pmap_allocpde(pmap, va, M_NOWAIT)) == NULL) { - PMAP_UNLOCK(pmap); - vm_page_busy(p); - VM_OBJECT_UNLOCK(object); - VM_WAIT; - VM_OBJECT_LOCK(object); - vm_page_wakeup(p); - PMAP_LOCK(pmap); + for (pa = ptepa; pa < ptepa + size; pa += NBPDR) { + pdpg = pmap_allocpde(pmap, addr, M_NOWAIT); + if (pdpg == NULL) { + /* + * The creation of mappings below is only an + * optimization. If a page directory page + * cannot be allocated without blocking, + * continue on to the next mapping rather than + * blocking. + */ + addr += NBPDR; + continue; } pde = (pd_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(pdpg)); - pde = &pde[pmap_pde_index(va)]; + pde = &pde[pmap_pde_index(addr)]; if ((*pde & PG_V) == 0) { - pde_store(pde, ptepa | PG_PS | PG_M | PG_A | + pde_store(pde, pa | PG_PS | PG_M | PG_A | PG_U | PG_RW | PG_V); - pmap->pm_stats.resident_count += - NBPDR / PAGE_SIZE; + pmap->pm_stats.resident_count += NBPDR / + PAGE_SIZE; + pmap_pde_mappings++; } else { + /* Continue on if the PDE is already valid. */ pdpg->wire_count--; KASSERT(pdpg->wire_count > 0, ("pmap_object_init_pt: missing reference " - "to page directory page, va: 0x%lx", va)); + "to page directory page, va: 0x%lx", addr)); } - ptepa += NBPDR; + addr += NBPDR; } - pmap_invalidate_all(pmap); -out: PMAP_UNLOCK(pmap); } } ==== //depot/projects/soc2009/syl_usb/src/sys/compat/ndis/subr_usbd.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.15 2009/06/07 19:41:11 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.16 2009/06/15 01:02:43 thompsa Exp $"); #include #include @@ -472,7 +472,7 @@ * The NDIS driver is not allowed to change the * config! There is only one choice! */ - cdp = usb2_get_config_descriptor(sc->ndisusb_dev); + cdp = usbd_get_config_descriptor(sc->ndisusb_dev); if (cdp == NULL) { status = USB_ERR_INVAL; goto exit; @@ -492,7 +492,7 @@ status = USB_ERR_NORMAL_COMPLETION; } else { NDISUSB_LOCK(sc); - status = usb2_req_get_desc(sc->ndisusb_dev, &sc->ndisusb_mtx, + status = usbd_req_get_desc(sc->ndisusb_dev, &sc->ndisusb_mtx, &actlen, ctldesc->ucd_trans_buf, 2, ctldesc->ucd_trans_buflen, ctldesc->ucd_langid, ctldesc->ucd_desctype, ctldesc->ucd_idx, @@ -540,16 +540,16 @@ intf = &selconf->usc_intf; for (i = 0; i < conf->bNumInterface && intf->uii_len > 0; i++) { - ret = usb2_set_alt_interface_index(udev, + ret = usbd_set_alt_interface_index(udev, intf->uii_intfnum, intf->uii_altset); if (ret != USB_ERR_NORMAL_COMPLETION && ret != USB_ERR_IN_USE) { device_printf(dev, "setting alternate interface failed: %s\n", - usb2_errstr(ret)); + usbd_errstr(ret)); return usbd_usb2urb(ret); } - for (j = 0; (ep = usb2_endpoint_foreach(udev, ep)); j++) { + for (j = 0; (ep = usb_endpoint_foreach(udev, ep)); j++) { if (j >= intf->uii_numeps) { device_printf(dev, "endpoint %d and above are ignored", @@ -608,11 +608,11 @@ InitializeListHead(&ne->ne_pending); KeInitializeSpinLock(&ne->ne_lock); - status = usb2_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer, + status = usbd_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer, epconf, 1, sc, &sc->ndisusb_mtx); if (status != USB_ERR_NORMAL_COMPLETION) { device_printf(dev, "couldn't setup xfer: %s\n", - usb2_errstr(status)); + usbd_errstr(status)); return (status); } xfer = ne->ne_xfer[0]; @@ -680,11 +680,11 @@ if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_IN) cfg.flags.short_xfer_ok = 1; - status = usb2_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer, + status = usbd_transfer_setup(sc->ndisusb_dev, &ifidx, ne->ne_xfer, &cfg, 1, sc, &sc->ndisusb_mtx); if (status != USB_ERR_NORMAL_COMPLETION) { device_printf(dev, "couldn't setup xfer: %s\n", - usb2_errstr(status)); + usbd_errstr(status)); return (status); } xfer = ne->ne_xfer[0]; @@ -718,8 +718,8 @@ } NDISUSB_LOCK(sc); - usb2_transfer_stop(ne->ne_xfer[0]); - usb2_transfer_start(ne->ne_xfer[0]); + usbd_transfer_stop(ne->ne_xfer[0]); + usbd_transfer_start(ne->ne_xfer[0]); NDISUSB_UNLOCK(sc); return (USBD_STATUS_SUCCESS); @@ -800,8 +800,8 @@ * cancelled and then restarted. */ NDISUSB_LOCK(sc); - usb2_transfer_stop(ne->ne_xfer[0]); - usb2_transfer_start(ne->ne_xfer[0]); + usbd_transfer_stop(ne->ne_xfer[0]); + usbd_transfer_start(ne->ne_xfer[0]); NDISUSB_UNLOCK(sc); ip->irp_cancel = TRUE; @@ -873,7 +873,7 @@ /* copy in data with regard to the URB */ if (ne->ne_dirin != 0) - usb2_copy_out(xfer->frbuffers, 0, nx->nx_urbbuf, + usbd_copy_out(xfer->frbuffers, 0, nx->nx_urbbuf, xfer->frlengths[0]); nx->nx_urbbuf += xfer->frlengths[0]; nx->nx_urbactlen += xfer->frlengths[0]; @@ -929,10 +929,10 @@ extra: len = MIN(xfer->max_data_length, nx->nx_urblen); if (UE_GET_DIR(ep->bEndpointAddress) == UE_DIR_OUT) - usb2_copy_in(xfer->frbuffers, 0, nx->nx_urbbuf, len); + usbd_copy_in(xfer->frbuffers, 0, nx->nx_urbbuf, len); xfer->frlengths[0] = len; xfer->nframes = 1; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); break; default: nx = usbd_aq_getfirst(sc, ne); @@ -941,7 +941,7 @@ if (xfer->error != USB_ERR_CANCELLED) { xfer->flags.stall_pipe = 1; device_printf(sc->ndis_dev, "usb xfer warning (%s)\n", - usb2_errstr(xfer->error)); + usbd_errstr(xfer->error)); } usbd_xfer_complete(sc, ne, nx, xfer->error); if (xfer->error != USB_ERR_CANCELLED) @@ -974,7 +974,7 @@ vcreq = &urb->uu_vcreq; if (vcreq->uvc_trans_flags & USBD_TRANSFER_DIRECTION_IN) { - usb2_copy_out(xfer->frbuffers + 1, 0, + usbd_copy_out(xfer->frbuffers + 1, 0, vcreq->uvc_trans_buf, xfer->frlengths[1]); nx->nx_urbactlen += xfer->frlengths[1]; } @@ -1044,7 +1044,7 @@ nx->nx_urblen = vcreq->uvc_trans_buflen; nx->nx_urbactlen = 0; - usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); + usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); xfer->frlengths[0] = sizeof(req); xfer->nframes = 1; if (vcreq->uvc_trans_flags & USBD_TRANSFER_DIRECTION_IN) { @@ -1066,13 +1066,13 @@ * the future if it needs to be. */ if (nx->nx_urblen > 0) { - usb2_copy_in(xfer->frbuffers + 1 , 0, + usbd_copy_in(xfer->frbuffers + 1 , 0, nx->nx_urbbuf, nx->nx_urblen); xfer->frlengths[1] = nx->nx_urblen; xfer->nframes = 2; } } - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); break; default: nx = usbd_aq_getfirst(sc, ne); @@ -1081,7 +1081,7 @@ if (xfer->error != USB_ERR_CANCELLED) { xfer->flags.stall_pipe = 1; device_printf(sc->ndis_dev, "usb xfer warning (%s)\n", - usb2_errstr(xfer->error)); + usbd_errstr(xfer->error)); } usbd_xfer_complete(sc, ne, nx, xfer->error); if (xfer->error != USB_ERR_CANCELLED) @@ -1244,7 +1244,7 @@ ne = usbd_get_ndisep(ip, urb->uu_bulkintr.ubi_epdesc); if (ne == NULL) goto exit; - usb2_transfer_start(ne->ne_xfer[0]); + usbd_transfer_start(ne->ne_xfer[0]); break; case NDISUSB_TASK_IRPCANCEL: ne = usbd_get_ndisep(ip, @@ -1254,14 +1254,14 @@ if (ne == NULL) goto exit; - usb2_transfer_stop(ne->ne_xfer[0]); - usb2_transfer_start(ne->ne_xfer[0]); + usbd_transfer_stop(ne->ne_xfer[0]); + usbd_transfer_start(ne->ne_xfer[0]); break; case NDISUSB_TASK_VENDOR: ne = (urb->uu_vcreq.uvc_trans_flags & USBD_TRANSFER_DIRECTION_IN) ? &sc->ndisusb_dread_ep : &sc->ndisusb_dwrite_ep; - usb2_transfer_start(ne->ne_xfer[0]); + usbd_transfer_start(ne->ne_xfer[0]); break; default: break; @@ -1437,7 +1437,7 @@ struct usb_descriptor *next = NULL; usb_interface_descriptor_t *desc; - while ((next = usb2_desc_foreach(conf, next)) != NULL) { + while ((next = usb_desc_foreach(conf, next)) != NULL) { desc = (usb_interface_descriptor_t *)next; if (desc->bDescriptorType != UDESC_INTERFACE) continue; ==== //depot/projects/soc2009/syl_usb/src/sys/dev/ata/ata-usb.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.17 2009/05/29 18:46:57 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.19 2009/06/15 01:05:46 thompsa Exp $"); #include "usbdevs.h" #include @@ -166,93 +166,93 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb_device_request), - .mh.flags = {}, - .mh.callback = &atausb2_t_bbb_reset1_callback, - .mh.timeout = 5000, /* 5 seconds */ - .mh.interval = 500, /* 500 milliseconds */ + .bufsize = sizeof(struct usb_device_request), + .flags = {}, + .callback = &atausb2_t_bbb_reset1_callback, + .timeout = 5000, /* 5 seconds */ + .interval = 500, /* 500 milliseconds */ }, [ATAUSB_T_BBB_RESET2] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb_device_request), - .mh.flags = {}, - .mh.callback = &atausb2_t_bbb_reset2_callback, - .mh.timeout = 5000, /* 5 seconds */ - .mh.interval = 50, /* 50 milliseconds */ + .bufsize = sizeof(struct usb_device_request), + .flags = {}, + .callback = &atausb2_t_bbb_reset2_callback, + .timeout = 5000, /* 5 seconds */ + .interval = 50, /* 50 milliseconds */ }, [ATAUSB_T_BBB_RESET3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb_device_request), - .mh.flags = {}, - .mh.callback = &atausb2_t_bbb_reset3_callback, - .mh.timeout = 5000, /* 5 seconds */ - .mh.interval = 50, /* 50 milliseconds */ + .bufsize = sizeof(struct usb_device_request), + .flags = {}, + .callback = &atausb2_t_bbb_reset3_callback, + .timeout = 5000, /* 5 seconds */ + .interval = 50, /* 50 milliseconds */ }, [ATAUSB_T_BBB_COMMAND] = { .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .mh.bufsize = sizeof(struct bbb_cbw), - .mh.flags = {}, - .mh.callback = &atausb2_t_bbb_command_callback, - .mh.timeout = 5000, /* 5 seconds */ + .bufsize = sizeof(struct bbb_cbw), + .flags = {}, + .callback = &atausb2_t_bbb_command_callback, + .timeout = 5000, /* 5 seconds */ }, [ATAUSB_T_BBB_DATA_READ] = { .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .mh.bufsize = ATAUSB_BULK_SIZE, - .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, - .mh.callback = &atausb2_t_bbb_data_read_callback, - .mh.timeout = 0, /* overwritten later */ + .bufsize = ATAUSB_BULK_SIZE, + .flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, + .callback = &atausb2_t_bbb_data_read_callback, + .timeout = 0, /* overwritten later */ }, [ATAUSB_T_BBB_DATA_RD_CS] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb_device_request), - .mh.flags = {}, - .mh.callback = &atausb2_t_bbb_data_rd_cs_callback, - .mh.timeout = 5000, /* 5 seconds */ + .bufsize = sizeof(struct usb_device_request), + .flags = {}, + .callback = &atausb2_t_bbb_data_rd_cs_callback, + .timeout = 5000, /* 5 seconds */ }, [ATAUSB_T_BBB_DATA_WRITE] = { .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .mh.bufsize = ATAUSB_BULK_SIZE, - .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, - .mh.callback = &atausb2_t_bbb_data_write_callback, - .mh.timeout = 0, /* overwritten later */ + .bufsize = ATAUSB_BULK_SIZE, + .flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, + .callback = &atausb2_t_bbb_data_write_callback, + .timeout = 0, /* overwritten later */ }, [ATAUSB_T_BBB_DATA_WR_CS] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .mh.bufsize = sizeof(struct usb_device_request), - .mh.flags = {}, - .mh.callback = &atausb2_t_bbb_data_wr_cs_callback, - .mh.timeout = 5000, /* 5 seconds */ + .bufsize = sizeof(struct usb_device_request), + .flags = {}, + .callback = &atausb2_t_bbb_data_wr_cs_callback, + .timeout = 5000, /* 5 seconds */ }, [ATAUSB_T_BBB_STATUS] = { .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .mh.bufsize = sizeof(struct bbb_csw), - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &atausb2_t_bbb_status_callback, - .mh.timeout = 5000, /* ms */ + .bufsize = sizeof(struct bbb_csw), + .flags = {.short_xfer_ok = 1,}, + .callback = &atausb2_t_bbb_status_callback, + .timeout = 5000, /* ms */ }, }; @@ -288,7 +288,7 @@ /* give other drivers a try first */ return (ENXIO); } - id = usb2_get_interface_descriptor(uaa->iface); + id = usbd_get_interface_descriptor(uaa->iface); if ((!id) || (id->bInterfaceClass != UICLASS_MASS)) { return (ENXIO); } @@ -328,16 +328,16 @@ uint8_t has_intr; int err; - device_set_usb2_desc(dev); + device_set_usb_desc(dev); sc->dev = dev; sc->maxlun = 0; sc->locked_ch = NULL; sc->restart_ch = NULL; - sc->usb2_speed = usb2_get_speed(uaa->device); + sc->usb2_speed = usbd_get_speed(uaa->device); mtx_init(&sc->locked_mtx, "ATAUSB lock", NULL, (MTX_DEF | MTX_RECURSE)); - id = usb2_get_interface_descriptor(uaa->iface); + id = usbd_get_interface_descriptor(uaa->iface); switch (id->bInterfaceProtocol) { case UIPROTO_MASS_BBB: case UIPROTO_MASS_BBB_OLD: @@ -380,7 +380,7 @@ (strcmp(subclass, "ATAPI") && strcmp(subclass, "SCSI"))) { goto detach; } - err = usb2_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, + err = usbd_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, sc->xfer, atausb2_config, ATAUSB_T_BBB_MAX, sc, &sc->locked_mtx); @@ -389,7 +389,7 @@ if (err) { device_printf(sc->dev, "could not setup required " - "transfers, %s\n", usb2_errstr(err)); + "transfers, %s\n", usbd_errstr(err)); goto detach; } /* get number of devices so we can add matching channels */ @@ -398,12 +398,12 @@ USETW(request.wValue, 0); USETW(request.wIndex, sc->iface_no); USETW(request.wLength, sizeof(maxlun)); - err = usb2_do_request(uaa->device, &Giant, &request, &maxlun); + err = usbd_do_request(uaa->device, &Giant, &request, &maxlun); if (err) { if (bootverbose) { device_printf(sc->dev, "get maxlun not supported %s\n", - usb2_errstr(err)); + usbd_errstr(err)); } } else { sc->maxlun = maxlun; @@ -438,7 +438,7 @@ /* teardown our statemachine */ - usb2_transfer_unsetup(sc->xfer, ATAUSB_T_MAX); + usbd_transfer_unsetup(sc->xfer, ATAUSB_T_MAX); /* detach & delete all children, if any */ @@ -460,7 +460,7 @@ } if (sc->xfer[xfer_no]) { sc->last_xfer_no = xfer_no; - usb2_transfer_start(sc->xfer[xfer_no]); + usbd_transfer_start(sc->xfer[xfer_no]); } else { atausb2_cancel_request(sc); } @@ -485,11 +485,11 @@ req.wIndex[1] = 0; USETW(req.wLength, 0); - usb2_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); + usbd_copy_in(xfer->frbuffers, 0, &req, sizeof(req)); xfer->frlengths[0] = sizeof(req); xfer->nframes = 1; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); return; default: /* Error */ @@ -527,7 +527,7 @@ return; case USB_ST_SETUP: - if (usb2_clear_stall_callback(xfer, sc->xfer[stall_xfer])) { + if (usbd_clear_stall_callback(xfer, sc->xfer[stall_xfer])) { goto tr_transferred; } return; @@ -575,10 +575,10 @@ bzero(sc->cbw.cdb, 16); bcopy(request->u.atapi.ccb, sc->cbw.cdb, 12); /* XXX SOS */ - usb2_copy_in(xfer->frbuffers, 0, &sc->cbw, sizeof(sc->cbw)); + usbd_copy_in(xfer->frbuffers, 0, &sc->cbw, sizeof(sc->cbw)); xfer->frlengths[0] = sizeof(sc->cbw); - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); } return; @@ -598,7 +598,7 @@ switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - usb2_copy_out(xfer->frbuffers, 0, + usbd_copy_out(xfer->frbuffers, 0, sc->ata_data, xfer->actlen); sc->ata_bytecount -= xfer->actlen; @@ -625,7 +625,7 @@ xfer->timeout = sc->timeout; xfer->frlengths[0] = max_bulk; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); return; default: /* Error */ @@ -675,10 +675,10 @@ xfer->timeout = sc->timeout; xfer->frlengths[0] = max_bulk; - usb2_copy_in(xfer->frbuffers, 0, + usbd_copy_in(xfer->frbuffers, 0, sc->ata_data, max_bulk); - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); return; default: /* Error */ @@ -712,7 +712,7 @@ if (xfer->actlen < sizeof(sc->csw)) { bzero(&sc->csw, sizeof(sc->csw)); } - usb2_copy_out(xfer->frbuffers, 0, &sc->csw, xfer->actlen); + usbd_copy_out(xfer->frbuffers, 0, &sc->csw, xfer->actlen); if (request->flags & (ATA_R_READ | ATA_R_WRITE)) { request->donecount = sc->ata_donecount; @@ -780,7 +780,7 @@ case USB_ST_SETUP: xfer->frlengths[0] = xfer->max_data_length; - usb2_start_hardware(xfer); + usbd_transfer_submit(xfer); return; default: @@ -828,7 +828,7 @@ if (atausbdebug) { device_printf(sc->dev, "transfer failed, %s, in state %d " - "-> BULK reset\n", usb2_errstr(xfer->error), + "-> BULK reset\n", usbd_errstr(xfer->error), sc->last_xfer_no); } } @@ -903,7 +903,7 @@ sc->ata_data = request->data; sc->ata_donecount = 0; - usb2_transfer_start(sc->xfer[sc->last_xfer_no]); + usbd_transfer_start(sc->xfer[sc->last_xfer_no]); error = ATA_OP_CONTINUES; } else { request->result = EIO; ==== //depot/projects/soc2009/syl_usb/src/sys/dev/if_ndis/if_ndis_usb.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.17 2009/06/08 19:56:23 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.18 2009/06/15 01:02:43 thompsa Exp $"); #include #include @@ -211,12 +211,12 @@ ndis_pnpevent_nic(self, NDIS_PNP_EVENT_SURPRISE_REMOVED); if (sc->ndisusb_status & NDISUSB_STATUS_SETUP_EP) { - usb2_transfer_unsetup(sc->ndisusb_dread_ep.ne_xfer, 1); - usb2_transfer_unsetup(sc->ndisusb_dwrite_ep.ne_xfer, 1); + usbd_transfer_unsetup(sc->ndisusb_dread_ep.ne_xfer, 1); + usbd_transfer_unsetup(sc->ndisusb_dwrite_ep.ne_xfer, 1); } for (i = 0; i < NDISUSB_ENDPT_MAX; i++) { ne = &sc->ndisusb_ep[i]; - usb2_transfer_unsetup(ne->ne_xfer, 1); + usbd_transfer_unsetup(ne->ne_xfer, 1); } (void)ndis_detach(self); ==== //depot/projects/soc2009/syl_usb/src/sys/dev/sound/pcm/feeder_rate.c#3 (text+ko) ==== @@ -59,7 +59,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_rate.c,v 1.24 2009/06/07 19:12:08 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pcm/feeder_rate.c,v 1.25 2009/06/15 04:05:38 ariff Exp $"); #endif #include "feeder_rate_gen.h" @@ -789,13 +789,11 @@ defined(Z_COEFF_INTER_BSPLINE) || defined(Z_COEFF_INTERP_OPT32X) || \ defined(Z_COEFF_INTERP_OPT16X) || defined(Z_COEFF_INTERP_OPT8X) || \ defined(Z_COEFF_INTERP_OPT4X) || defined(Z_COEFF_INTERP_OPT2X)) -#if Z_DRIFT_SHIFT >= 8 +#if Z_DRIFT_SHIFT >= 12 #define Z_COEFF_INTERP_LINEAR 1 -#elif Z_DRIFT_SHIFT == 7 +#elif Z_DRIFT_SHIFT >= 8 #define Z_COEFF_INTERP_QUADRATIC 1 -#elif Z_DRIFT_SHIFT == 6 -#define Z_COEFF_INTERP_HERMITE 1 -#elif Z_DRIFT_SHIFT == 5 +#elif Z_DRIFT_SHIFT >= 5 #define Z_COEFF_INTERP_OPT32X 1 #elif Z_DRIFT_SHIFT == 4 #define Z_COEFF_INTERP_OPT16X 1 ==== //depot/projects/soc2009/syl_usb/src/sys/dev/sound/usb/uaudio.c#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.49 2009/06/07 19:12:08 ariff Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<<