Date: Tue, 10 Feb 2009 16:15:05 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 157496 for review Message-ID: <200902101615.n1AGF5nj023760@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=157496 Change 157496 by hselasky@hselasky_laptop001 on 2009/02/10 16:14:20 IFC @ 157495 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#12 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#8 integrate .. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#16 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.c#8 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#14 integrate .. //depot/projects/usb/src/sys/conf/NOTES#28 integrate .. //depot/projects/usb/src/sys/conf/files#52 integrate .. //depot/projects/usb/src/sys/conf/options#21 integrate .. //depot/projects/usb/src/sys/dev/cfi/cfi_core.c#3 integrate .. //depot/projects/usb/src/sys/dev/de/if_de.c#6 integrate .. //depot/projects/usb/src/sys/dev/firewire/if_fwe.c#5 integrate .. //depot/projects/usb/src/sys/dev/firewire/if_fwip.c#7 integrate .. //depot/projects/usb/src/sys/dev/firewire/sbp.c#7 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#14 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.c#4 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#33 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#15 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#29 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#35 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#52 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#38 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#33 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#42 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_auereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdcereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cuereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kuereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_ruereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udavreg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_cdc.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#16 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#29 integrate .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumvar.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#30 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_uralreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_uralvar.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#32 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zydfw.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zydreg.h#6 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs.h#6 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_subr.c#8 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate .. //depot/projects/usb/src/sys/fs/udf/ecma167-udf.h#4 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vnops.c#11 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#13 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_apm.c#10 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_ebr.c#1 branch .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#11 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_mbr.c#7 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#7 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_vtoc8.c#6 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#9 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#17 integrate .. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#15 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#13 integrate .. //depot/projects/usb/src/sys/kern/link_elf.c#11 integrate .. //depot/projects/usb/src/sys/kern/link_elf_obj.c#11 integrate .. //depot/projects/usb/src/sys/kern/subr_clist.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_debug.c#6 integrate .. //depot/projects/usb/src/sys/mips/include/pmap.h#4 integrate .. //depot/projects/usb/src/sys/mips/mips/in_cksum.c#3 integrate .. //depot/projects/usb/src/sys/modules/geom/geom_part/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/geom/geom_part/geom_part_ebr/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb2/Makefile#12 integrate .. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#13 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#16 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_regdomain.c#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.c#6 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#12 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#16 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_syscalls.c#10 integrate .. //depot/projects/usb/src/sys/pci/if_rl.c#10 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm.c#13 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_klib.c#12 integrate .. //depot/projects/usb/src/sys/security/audit/audit_pipe.c#13 integrate .. //depot/projects/usb/src/sys/security/audit/audit_private.h#9 integrate .. //depot/projects/usb/src/sys/sys/bus_dma.h#9 integrate .. //depot/projects/usb/src/sys/vm/vm_fault.c#9 integrate .. //depot/projects/usb/src/sys/vm/vm_kern.c#9 integrate .. //depot/projects/usb/src/sys/vm/vm_map.c#12 integrate .. //depot/projects/usb/src/sys/vm/vm_map.h#7 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#14 integrate .. //depot/projects/usb/src/sys/vm/vm_object.c#13 integrate .. //depot/projects/usb/src/sys/vm/vm_object.h#6 integrate .. //depot/projects/usb/src/sys/vm/vm_unix.c#2 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.c#12 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.h#2 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.86 2008/07/15 03:34:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.88 2009/02/09 18:03:31 cognet Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -93,6 +93,7 @@ int active_bpages; int total_bounced; int total_deferred; + int map_count; bus_size_t alignment; bus_size_t boundary; bus_addr_t lowaddr; @@ -418,7 +419,7 @@ else maxpages = MIN(MAX_BPAGES, Maxmem -atop(dmat->lowaddr)); if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0 - || (dmat->map_count > 0 && bz->total_bpages < maxpages)) { + || (bz->map_count > 0 && bz->total_bpages < maxpages)) { int pages; pages = MAX(atop(dmat->maxsize), 1); @@ -434,6 +435,7 @@ error = 0; } } + bz->map_count++; } else { *mapp = NULL; } @@ -457,6 +459,8 @@ __func__, dmat, EBUSY); return (EBUSY); } + if (dmat->bounce_zone) + dmat->bounce_zone->map_count--; free(map, M_DEVBUF); } dmat->map_count--; @@ -989,6 +993,7 @@ bz->lowaddr = dmat->lowaddr; bz->alignment = dmat->alignment; bz->boundary = dmat->boundary; + bz->map_count = 0; snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; snprintf(bz->lowaddrid, 18, "%#jx", (uintmax_t)bz->lowaddr); ==== //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#8 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.14 2008/12/17 17:43:22 marcel Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.15 2009/02/10 00:08:39 marcel Exp $ machine amd64 @@ -17,4 +17,5 @@ # Default partitioning schemes options GEOM_PART_BSD +options GEOM_PART_EBR options GEOM_PART_MBR ==== //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.42 2009/02/04 01:14:06 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.44 2009/02/09 18:03:31 cognet Exp $"); /* * ARM bus dma support routines @@ -112,6 +112,7 @@ int active_bpages; int total_bounced; int total_deferred; + int map_count; bus_size_t alignment; bus_size_t boundary; bus_addr_t lowaddr; @@ -523,7 +524,7 @@ */ maxpages = MAX_BPAGES; if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0 - || (dmat->map_count > 0 && bz->total_bpages < maxpages)) { + || (bz->map_count > 0 && bz->total_bpages < maxpages)) { int pages; pages = MAX(atop(dmat->maxsize), 1); @@ -539,6 +540,7 @@ error = 0; } } + bz->map_count++; } CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, error); @@ -560,6 +562,8 @@ __func__, dmat, EBUSY); return (EBUSY); } + if (dmat->bounce_zone) + dmat->bounce_zone->map_count--; dmat->map_count--; CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat); return (0); @@ -1277,6 +1281,7 @@ bz->lowaddr = dmat->lowaddr; bz->alignment = dmat->alignment; bz->boundary = dmat->boundary; + bz->map_count = 0; snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount); busdma_zonecount++; snprintf(bz->lowaddrid, 18, "%#jx", (uintmax_t)bz->lowaddr); ==== //depot/projects/usb/src/sys/cam/cam_periph.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.76 2009/01/26 15:01:47 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.77 2009/02/09 17:02:54 fjoe Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -171,7 +171,7 @@ break; } xpt_unlock_buses(); - if (p_drv == NULL) { + if (*p_drv == NULL) { printf("cam_periph_alloc: invalid periph name '%s'\n", name); return (CAM_REQ_INVALID); } ==== //depot/projects/usb/src/sys/cam/cam_xpt.c#14 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.208 2009/01/23 21:08:00 trasz Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.209 2009/02/08 22:08:48 trasz Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -4178,7 +4178,7 @@ struct sbuf sb; #ifdef INVARIANTS - if (path != NULL && path->bus != NULL && path->bus->sim != NULL) + if (path != NULL && path->bus != NULL) mtx_assert(path->bus->sim->mtx, MA_OWNED); #endif ==== //depot/projects/usb/src/sys/conf/NOTES#28 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1525 2009/02/08 00:16:24 wkoszek Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1528 2009/02/10 00:08:39 marcel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -147,6 +147,7 @@ options GEOM_NOP # Test class. options GEOM_PART_APM # Apple partitioning options GEOM_PART_BSD # BSD disklabel +options GEOM_PART_EBR # Extended Boot Records options GEOM_PART_GPT # GPT partitioning options GEOM_PART_MBR # MBR partitioning options GEOM_PART_PC98 # PC-9800 disk partitioning @@ -2138,44 +2139,9 @@ # scd: Sony CD-ROM using proprietary (non-ATAPI) interface # mcd: Mitsumi CD-ROM using proprietary (non-ATAPI) interface # bktr: Brooktree bt848/848a/849a/878/879 video capture and TV Tuner board -# cy: Cyclades serial driver # joy: joystick (including IO DATA PCJOY PC Card joystick) -# rc: RISCom/8 multiport card -# rp: Comtrol Rocketport(ISA/PCI) - single card -# si: Specialix SI/XIO 4-32 port terminal multiplexor # cmx: OmniKey CardMan 4040 pccard smartcard reader -# Notes on the Comtrol Rocketport driver: -# -# The exact values used for rp0 depend on how many boards you have -# in the system. The manufacturer's sample configs are listed as: -# -# device rp # core driver support -# -# Comtrol Rocketport ISA single card -# hint.rp.0.at="isa" -# hint.rp.0.port="0x280" -# -# If instead you have two ISA cards, one installed at 0x100 and the -# second installed at 0x180, then you should add the following to -# your kernel probe hints: -# hint.rp.0.at="isa" -# hint.rp.0.port="0x100" -# hint.rp.1.at="isa" -# hint.rp.1.port="0x180" -# -# For 4 ISA cards, it might be something like this: -# hint.rp.0.at="isa" -# hint.rp.0.port="0x180" -# hint.rp.1.at="isa" -# hint.rp.1.port="0x100" -# hint.rp.2.at="isa" -# hint.rp.2.port="0x340" -# hint.rp.3.at="isa" -# hint.rp.3.port="0x240" -# -# For PCI cards, you need no hints. - # Mitsumi CD-ROM device mcd hint.mcd.0.at="isa" @@ -2352,6 +2318,7 @@ # ppi General-purpose I/O ("Geek Port") + IEEE1284 I/O # pps Pulse per second Timing Interface # lpbb Philips official parallel port I2C bit-banging interface +# pcfclock Parallel port clock driver. # # Supported interfaces: # ppc ISA-bus parallel port interfaces. ==== //depot/projects/usb/src/sys/conf/files#52 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1366 2009/02/08 03:02:06 piso Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1369 2009/02/09 22:38:55 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1036,7 +1036,7 @@ dependency "iwn.fw" \ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \ no-implicit-rule \ - clean "iwn.fwo" + clean "iwnfw.fwo" iwn.fw optional iwnfw \ dependency ".PHONY" \ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu" \ @@ -1234,7 +1234,7 @@ dependency "rt2561.fw" \ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \ no-implicit-rule \ - clean "rt2561.fwo" + clean "rt2561fw.fwo" rt2561.fw optional rt2561fw | ralfw \ dependency ".PHONY" \ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \ @@ -1248,7 +1248,7 @@ dependency "rt2561s.fw" \ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \ no-implicit-rule \ - clean "rt2561s.fwo" + clean "rt2561sfw.fwo" rt2561s.fw optional rt2561sfw | ralfw \ dependency ".PHONY" \ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu" \ @@ -1262,7 +1262,7 @@ dependency "rt2661.fw" \ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \ no-implicit-rule \ - clean "rt2661.fwo" + clean "rt2661fw.fwo" rt2661.fw optional rt2661fw | ralfw \ dependency ".PHONY" \ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu" \ @@ -1276,7 +1276,7 @@ dependency "rt2860.fw" \ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \ no-implicit-rule \ - clean "rt2860.fwo" + clean "rt2860fw.fwo" rt2860.fw optional rt2860fw | ralfw \ dependency ".PHONY" \ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu" \ @@ -1715,7 +1715,7 @@ dependency "wpi.fw" \ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} wpi.fw" \ no-implicit-rule \ - clean "wpi.fwo" + clean "wpifw.fwo" wpi.fw optional wpifw \ dependency ".PHONY" \ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu" \ ==== //depot/projects/usb/src/sys/conf/options#21 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.660 2009/02/06 10:30:46 wkoszek Exp $ +# $FreeBSD: src/sys/conf/options,v 1.661 2009/02/10 00:08:39 marcel Exp $ # # On the handling of kernel options # @@ -92,6 +92,7 @@ GEOM_NOP opt_geom.h GEOM_PART_APM opt_geom.h GEOM_PART_BSD opt_geom.h +GEOM_PART_EBR opt_geom.h GEOM_PART_GPT opt_geom.h GEOM_PART_MBR opt_geom.h GEOM_PART_PC98 opt_geom.h ==== //depot/projects/usb/src/sys/dev/cfi/cfi_core.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/cfi/cfi_core.c,v 1.5 2009/02/07 05:32:19 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/cfi/cfi_core.c,v 1.6 2009/02/08 20:29:37 sam Exp $"); #include "opt_cfi.h" @@ -439,7 +439,7 @@ * at the factory with a unique 64-bit number which is immutable. * The other segment is left blank for User (OEM) programming. * The User/OEM segment is One Time Programmable (OTP). It can also - * be locked to prevent any firther writes by setting bit 0 of the + * be locked to prevent any further writes by setting bit 0 of the * Protection Lock Register (PLR). The PLR can written only once. */ ==== //depot/projects/usb/src/sys/dev/de/if_de.c#6 (text) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/de/if_de.c,v 1.184 2008/04/05 17:24:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/de/if_de.c,v 1.185 2009/02/09 17:07:29 fjoe Exp $"); #define TULIP_HDR_DATA @@ -4561,7 +4561,7 @@ sc->tulip_setup_dma_addr = 0; } if (sc->tulip_setupbuf != NULL) { - bus_dmamem_free(sc->tulip_setup_tag, sc->tulip_setupdata, + bus_dmamem_free(sc->tulip_setup_tag, sc->tulip_setupbuf, sc->tulip_setup_map); sc->tulip_setup_map = NULL; sc->tulip_setupbuf = NULL; ==== //depot/projects/usb/src/sys/dev/firewire/if_fwe.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.45 2008/03/25 09:38:58 ru Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwe.c,v 1.46 2009/02/09 16:58:18 fjoe Exp $ */ #ifdef HAVE_KERNEL_OPTION_HEADERS @@ -445,7 +445,7 @@ #ifdef DEVICE_POLLING { struct ifreq *ifr = (struct ifreq *) data; - struct firewire_comm *fc = fc = fwe->fd.fc; + struct firewire_comm *fc = fwe->fd.fc; if (ifr->ifr_reqcap & IFCAP_POLLING && !(ifp->if_capenable & IFCAP_POLLING)) { ==== //depot/projects/usb/src/sys/dev/firewire/if_fwip.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/if_fwip.c,v 1.17 2008/03/25 09:38:58 ru Exp $ + * $FreeBSD: src/sys/dev/firewire/if_fwip.c,v 1.18 2009/02/09 16:58:18 fjoe Exp $ */ #ifdef HAVE_KERNEL_OPTION_HEADERS @@ -427,7 +427,7 @@ #ifdef DEVICE_POLLING { struct ifreq *ifr = (struct ifreq *) data; - struct firewire_comm *fc = fc = fwip->fd.fc; + struct firewire_comm *fc = fwip->fd.fc; if (ifr->ifr_reqcap & IFCAP_POLLING && !(ifp->if_capenable & IFCAP_POLLING)) { ==== //depot/projects/usb/src/sys/dev/firewire/sbp.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.98 2009/02/01 23:28:52 sbruno Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.99 2009/02/09 16:57:07 fjoe Exp $ * */ @@ -330,12 +330,11 @@ static void sbp_identify(driver_t *driver, device_t parent) { - device_t child; SBP_DEBUG(0) printf("sbp_identify\n"); END_DEBUG - child = BUS_ADD_CHILD(parent, 0, "sbp", device_get_unit(parent)); + BUS_ADD_CHILD(parent, 0, "sbp", device_get_unit(parent)); } /* ==== //depot/projects/usb/src/sys/dev/re/if_re.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.151 2009/01/20 20:22:28 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.152 2009/02/09 04:59:13 yongari Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -156,7 +156,7 @@ #include "miibus_if.h" /* Tunables. */ -static int msi_disable = 1; +static int msi_disable = 0; TUNABLE_INT("hw.re.msi_disable", &msi_disable); #define RE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP) @@ -2064,6 +2064,13 @@ mii_tick(mii); if ((sc->rl_flags & RL_FLAG_LINK) == 0) re_miibus_statchg(sc->rl_dev); + /* + * Reclaim transmitted frames here. Technically it is not + * necessary to do here but it ensures periodic reclamation + * regardless of Tx completion interrupt which seems to be + * lost on PCIe based controllers under certain situations. + */ + re_txeof(sc); re_watchdog(sc); callout_reset(&sc->rl_stat_callout, hz, re_tick, sc); } ==== //depot/projects/usb/src/sys/dev/sound/pci/ds1.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ #include <dev/sound/pci/ds1.h> #include <dev/sound/pci/ds1-fw.h> -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.52 2007/06/17 06:10:41 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/ds1.c,v 1.53 2009/02/09 22:59:22 cognet Exp $"); /* -------------------------------------------------------------------- */ @@ -396,7 +396,7 @@ pb->Format |= b16? 0 : 0x80000000; pb->Format |= (stereo && (ch == 2 || ch == 4))? 0x00000001 : 0; pb->LoopDefault = 0; - pb->PgBase = base? base : 0; + pb->PgBase = base; pb->PgLoop = 0; pb->PgLoopEnd = len >> ss; pb->PgLoopFrac = 0; ==== //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm-teken.c,v 1.1 2009/01/01 13:26:53 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/syscons/scterm-teken.c,v 1.2 2009/02/09 15:55:21 ed Exp $"); #include "opt_syscons.h" @@ -49,6 +49,7 @@ #include <dev/syscons/teken/teken.h> static void scteken_revattr(unsigned char, teken_attr_t *); +static unsigned int scteken_attr(const teken_attr_t *); static sc_term_init_t scteken_init; static sc_term_term_t scteken_term; @@ -165,21 +166,25 @@ scteken_ioctl(scr_stat *scp, struct tty *tp, u_long cmd, caddr_t data, struct thread *td) { + teken_stat *ts = scp->ts; vid_info_t *vi; + unsigned int attr; switch (cmd) { case GIO_ATTR: /* get current attributes */ - *(int*)data = SC_NORM_ATTR; + *(int*)data = + scteken_attr(teken_get_curattr(&ts->ts_teken)); return (0); case CONS_GETINFO: /* get current (virtual) console info */ - /* XXX: INCORRECT! */ vi = (vid_info_t *)data; if (vi->size != sizeof(struct vid_info)) return EINVAL; - vi->mv_norm.fore = SC_NORM_ATTR & 0x0f; - vi->mv_norm.back = (SC_NORM_ATTR >> 4) & 0x0f; - vi->mv_rev.fore = SC_NORM_ATTR & 0x0f; - vi->mv_rev.back = (SC_NORM_ATTR >> 4) & 0x0f; + + attr = scteken_attr(teken_get_defattr(&ts->ts_teken)); + vi->mv_norm.fore = attr & 0x0f; + vi->mv_norm.back = (attr >> 4) & 0x0f; + vi->mv_rev.fore = vi->mv_norm.back; + vi->mv_rev.back = vi->mv_norm.fore; /* * The other fields are filled by the upper routine. XXX */ @@ -280,7 +285,7 @@ } } -static inline unsigned int +static unsigned int scteken_attr(const teken_attr_t *a) { unsigned int attr = 0; @@ -300,7 +305,7 @@ attr |= FG_BLINK; #endif /* FG_BLINK */ - return (attr << 8); + return (attr); } static void @@ -337,7 +342,7 @@ } else #endif /* TEKEN_UTF8 */ { - attr = scteken_attr(a); + attr = scteken_attr(a) << 8; ch = c; } @@ -373,7 +378,7 @@ } else #endif /* TEKEN_UTF8 */ { - attr = scteken_attr(a); + attr = scteken_attr(a) << 8; ch = c; } ==== //depot/projects/usb/src/sys/dev/syscons/teken/teken.c#4 (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/dev/syscons/teken/teken.c,v 1.6 2009/01/20 11:34:28 ed Exp $ + * $FreeBSD: src/sys/dev/syscons/teken/teken.c,v 1.7 2009/02/09 15:55:21 ed Exp $ */ #include <sys/cdefs.h> @@ -329,6 +329,20 @@ t->t_cursor = *p; } +const teken_attr_t * +teken_get_curattr(teken_t *t) +{ + + return (&t->t_curattr); +} + +const teken_attr_t * +teken_get_defattr(teken_t *t) +{ + + return (&t->t_defattr); +} + void teken_set_defattr(teken_t *t, const teken_attr_t *a) { ==== //depot/projects/usb/src/sys/dev/syscons/teken/teken.h#4 (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/dev/syscons/teken/teken.h,v 1.4 2009/01/20 11:34:28 ed Exp $ + * $FreeBSD: src/sys/dev/syscons/teken/teken.h,v 1.5 2009/02/09 15:55:21 ed Exp $ */ #ifndef _TEKEN_H_ @@ -170,7 +170,9 @@ /* Deliver character input. */ void teken_input(teken_t *, const void *, size_t); -/* Set teken attributes. */ +/* Get/set teken attributes. */ +const teken_attr_t *teken_get_curattr(teken_t *); +const teken_attr_t *teken_get_defattr(teken_t *); void teken_set_cursor(teken_t *, const teken_pos_t *); void teken_set_defattr(teken_t *, const teken_attr_t *); void teken_set_winsize(teken_t *, const teken_pos_t *); ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#27 (text+ko) ==== @@ -1,5 +1,5 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci.c,v 1.11 2009/01/13 19:05:51 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci.c,v 1.12 2009/02/09 21:47:39 thompsa Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#21 (text+ko) ==== @@ -1,5 +1,5 @@ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci_atmelarm.c,v 1.8 2009/02/01 00:51:25 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/at91dci_atmelarm.c,v 1.9 2009/02/09 21:47:39 thompsa Exp $"); /*- * Copyright (c) 2007-2008 Hans Petter Selasky. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#33 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2.c,v 1.10 2009/02/07 15:51:32 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2.c,v 1.12 2009/02/09 21:47:39 thompsa Exp $"); #include <dev/usb2/include/usb2_standard.h> #include <dev/usb2/include/usb2_mfunc.h> @@ -1896,17 +1896,10 @@ EHCI_QH_SET_MPL(xfer->max_packet_size)); if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { - if (methods != &ehci_device_intr_methods) { - qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | - EHCI_QH_DTC | EHCI_QH_SET_NRL(8)); - } else { - /* - * Nak-Reload count must be zero for interrupt - * endpoints See EHCI pdf file, section 4.9 - */ - qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | - EHCI_QH_DTC); - } + qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | + EHCI_QH_DTC); + if (methods != &ehci_device_intr_methods) + qh_endp |= EHCI_QH_SET_NRL(8); } else { if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) { ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/ehci2.h,v 1.5 2009/01/13 19:03:01 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/ehci2.h,v 1.6 2009/02/09 21:47:39 thompsa Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#25 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2_pci.c,v 1.8 2009/02/01 00:51:25 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ehci2_pci.c,v 1.9 2009/02/09 21:47:39 thompsa Exp $"); /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. ==== //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#26 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg.c,v 1.10 2009/01/13 19:03:33 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/musb2_otg.c,v 1.11 2009/02/09 21:47:39 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#30 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2.c,v 1.9 2009/02/07 06:27:16 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/ohci2.c,v 1.10 2009/02/09 21:47:39 thompsa Exp $"); /* * USB Open Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#29 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2.c,v 1.11 2009/02/07 06:27:16 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/controller/uhci2.c,v 1.12 2009/02/09 21:47:39 thompsa Exp $"); /* * USB Universal Host Controller driver. ==== //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#26 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.c,v 1.9 2009/01/13 19:03:23 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/usb2_controller.c,v 1.10 2009/02/09 21:47:39 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#23 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/controller/uss820dci.c,v 1.9 2009/01/13 19:05:51 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/controller/uss820dci.c,v 1.10 2009/02/09 21:47:39 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky <hselasky@freebsd.org> * All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_busdma.c,v 1.7 2009/01/13 19:03:12 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_busdma.c,v 1.8 2009/02/08 22:54:58 imp Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#35 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_core.h,v 1.7 2009/01/13 19:03:12 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_core.h,v 1.8 2009/02/09 21:56:33 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#52 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.c,v 1.11 2009/01/13 19:04:58 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_device.c,v 1.12 2009/02/09 21:56:33 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#38 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.c,v 1.13 2009/02/01 00:51:25 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_hub.c,v 1.14 2009/02/09 21:56:33 thompsa Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#18 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.c,v 1.4 2009/01/04 00:12:01 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_msctest.c,v 1.5 2009/02/09 21:56:33 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#18 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_process.c,v 1.2 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_process.c,v 1.4 2009/02/09 21:56:33 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_process.h,v 1.2 2008/12/11 23:13:02 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_process.h,v 1.3 2009/02/09 21:56:33 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#33 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.c,v 1.7 2009/01/13 19:03:12 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.c,v 1.8 2009/02/09 21:56:33 thompsa Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. * Copyright (c) 1998 Lennart Augustsson. All rights reserved. ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.h,v 1.3 2009/01/04 00:12:01 alfred Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_request.h,v 1.4 2009/02/09 21:56:33 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#42 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.c,v 1.10 2009/01/13 19:04:58 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_transfer.c,v 1.11 2009/02/09 21:56:33 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb2/core/usb2_util.c,v 1.3 2008/12/11 23:17:48 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/core/usb2_util.c,v 1.4 2009/02/09 21:56:33 thompsa Exp $ */ /*- >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902101615.n1AGF5nj023760>