From owner-svn-src-stable-9@freebsd.org Sun Nov 15 20:20:05 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 45F13A3040E; Sun, 15 Nov 2015 20:20:05 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DE7AB1993; Sun, 15 Nov 2015 20:20:04 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFKK3i9083886; Sun, 15 Nov 2015 20:20:03 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFKK3Ba083885; Sun, 15 Nov 2015 20:20:03 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511152020.tAFKK3Ba083885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 15 Nov 2015 20:20:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290878 - stable/9/sys/boot/common X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 20:20:05 -0000 Author: ngie Date: Sun Nov 15 20:20:03 2015 New Revision: 290878 URL: https://svnweb.freebsd.org/changeset/base/290878 Log: MFstable/10 r290877: MFC r289896: Make vers.c creation atomic by using a temporary file, then moving the temporary file to vers.c at the end of the script The previous logic wrote out to vers.c multiple times, so the file could be incorrectly interpreted as being completely written out after one of the echo calls with recursive make, when in reality it was only partially written. Also, in the event the build was interrupted when creating vers.c (small race window), it would have a leftover file that needed to be cleaned up before resuming the build. Sponsored by: EMC / Isilon Storage Division Modified: stable/9/sys/boot/common/newvers.sh Directory Properties: stable/9/ (props changed) stable/9/sys/ (props changed) stable/9/sys/boot/ (props changed) Modified: stable/9/sys/boot/common/newvers.sh ============================================================================== --- stable/9/sys/boot/common/newvers.sh Sun Nov 15 20:14:54 2015 (r290877) +++ stable/9/sys/boot/common/newvers.sh Sun Nov 15 20:20:03 2015 (r290878) @@ -32,12 +32,16 @@ # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 +tempfile=$(mktemp tmp.XXXXXX) || exit +trap "rm -f $tempfile" EXIT INT TERM + LC_ALL=C; export LC_ALL u=${USER-root} h=${HOSTNAME-`hostname`} t=`date` #r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '` r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1` -echo "char bootprog_name[] = \"FreeBSD/${3} ${2}\";" > vers.c -echo "char bootprog_rev[] = \"${r}\";" >> vers.c -echo "char bootprog_date[] = \"${t}\";" >> vers.c -echo "char bootprog_maker[] = \"${u}@${h}\";" >> vers.c +echo "char bootprog_name[] = \"FreeBSD/${3} ${2}\";" > $tempfile +echo "char bootprog_rev[] = \"${r}\";" >> $tempfile +echo "char bootprog_date[] = \"${t}\";" >> $tempfile +echo "char bootprog_maker[] = \"${u}@${h}\";" >> $tempfile +mv $tempfile vers.c From owner-svn-src-stable-9@freebsd.org Sun Nov 15 20:25:27 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 885C5A305DF; Sun, 15 Nov 2015 20:25:27 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 61D5D105E; Sun, 15 Nov 2015 20:25:27 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFKPQJv087406; Sun, 15 Nov 2015 20:25:26 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFKPQFF087402; Sun, 15 Nov 2015 20:25:26 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511152025.tAFKPQFF087402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 15 Nov 2015 20:25:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290880 - in stable/9: share/man/man4 share/man/man5 tools/build/mk X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 20:25:27 -0000 Author: ngie Date: Sun Nov 15 20:25:26 2015 New Revision: 290880 URL: https://svnweb.freebsd.org/changeset/base/290880 Log: MFstable/10 r290879: MFC r290659,r290660: r290659: - Move ng_bluetooth.4 under MK_BLUETOOTH != no - Move all section 5 bluetooth manpages under MK_BLUETOOTH != no PR: 193260 Reported by: Philippe Michel Sponsored by: EMC / Isilon Storage Division r290660: Move the MK_BLUETOOTH block down below the architecture specific sections by the other generic options PR: 193260 Sponsored by: EMC / Isilon Storage Divisions Modified: stable/9/share/man/man4/Makefile stable/9/share/man/man5/Makefile stable/9/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/9/ (props changed) stable/9/share/ (props changed) stable/9/share/man/ (props changed) stable/9/share/man/man4/ (props changed) stable/9/share/man/man5/ (props changed) stable/9/tools/ (props changed) stable/9/tools/build/ (props changed) Modified: stable/9/share/man/man4/Makefile ============================================================================== --- stable/9/share/man/man4/Makefile Sun Nov 15 20:23:09 2015 (r290879) +++ stable/9/share/man/man4/Makefile Sun Nov 15 20:25:26 2015 (r290880) @@ -275,7 +275,6 @@ MAN= aac.4 \ ng_atm.4 \ ngatmbase.4 \ ng_atmllc.4 \ - ng_bluetooth.4 \ ng_bpf.4 \ ng_bridge.4 \ ng_bt3c.4 \ @@ -751,6 +750,10 @@ _nvram2env.4= nvram2env.4 SUBDIR= man4.${MACHINE_CPUARCH} .endif +.if ${MK_BLUETOOTH} != "no" +MAN+= ng_bluetooth.4 +.endif + .if ${MK_CCD} != "no" _ccd.4= ccd.4 .endif Modified: stable/9/share/man/man5/Makefile ============================================================================== --- stable/9/share/man/man5/Makefile Sun Nov 15 20:23:09 2015 (r290879) +++ stable/9/share/man/man5/Makefile Sun Nov 15 20:25:26 2015 (r290880) @@ -7,9 +7,6 @@ MAN= acct.5 \ ar.5 \ a.out.5 \ - bluetooth.device.conf.5 \ - bluetooth.hosts.5 \ - bluetooth.protocols.5 \ ${_boot.config.5} \ core.5 \ devfs.5 \ @@ -79,6 +76,12 @@ MLINKS+=quota.user.5 quota.group.5 MLINKS+=rc.conf.5 rc.conf.local.5 MLINKS+=resolver.5 resolv.conf.5 +.if ${MK_BLUETOOTH} != "no" +MAN+= bluetooth.device.conf.5 \ + bluetooth.hosts.5 \ + bluetooth.protocols.5 +.endif + .if ${MK_FREEBSD_UPDATE} != "no" MAN+= freebsd-update.conf.5 .endif Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 15 20:23:09 2015 (r290879) +++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Sun Nov 15 20:25:26 2015 (r290880) @@ -460,6 +460,10 @@ OLD_FILES+=usr/share/man/man3/sdp_regist OLD_FILES+=usr/share/man/man3/sdp_search.3.gz OLD_FILES+=usr/share/man/man3/sdp_unregister_service.3.gz OLD_FILES+=usr/share/man/man3/sdp_uuid2desc.3.gz +OLD_FILES+=usr/share/man/man4/ng_bluetooth.4.gz +OLD_FILES+=usr/share/man/man5/bluetooth.device.conf.5.gz +OLD_FILES+=usr/share/man/man5/bluetooth.hosts.5.gz +OLD_FILES+=usr/share/man/man5/bluetooth.protocols.5.gz OLD_FILES+=usr/share/man/man5/hcsecd.conf.5.gz OLD_FILES+=usr/share/man/man8/bcmfw.8.gz OLD_FILES+=usr/share/man/man8/bt3cfw.8.gz From owner-svn-src-stable-9@freebsd.org Sun Nov 15 21:16:18 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 509E4A2F15A; Sun, 15 Nov 2015 21:16:18 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18FF41055; Sun, 15 Nov 2015 21:16:18 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFLGHQY004163; Sun, 15 Nov 2015 21:16:17 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFLGDX1004122; Sun, 15 Nov 2015 21:16:13 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511152116.tAFLGDX1004122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 15 Nov 2015 21:16:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290886 - in stable/9/share/man: man4 man4/man4.powerpc man7 man9 X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 21:16:18 -0000 Author: ngie Date: Sun Nov 15 21:16:13 2015 New Revision: 290886 URL: https://svnweb.freebsd.org/changeset/base/290886 Log: MFstable/10 r233422: r233422 (by joel): Remove superfluous paragraph macro. Command used: $ svn merge --accept mine-conflict -c 233422 ^/stable/10 Conflicts: share/man/man4/netmap.4 share/man/man9/locking.9 ( Modified: stable/9/share/man/man4/acpi_hp.4 stable/9/share/man/man4/adv.4 stable/9/share/man/man4/ahc.4 stable/9/share/man/man4/atkbd.4 stable/9/share/man/man4/bridge.4 stable/9/share/man/man4/cas.4 stable/9/share/man/man4/cc_vegas.4 stable/9/share/man/man4/cy.4 stable/9/share/man/man4/dpms.4 stable/9/share/man/man4/ed.4 stable/9/share/man/man4/em.4 stable/9/share/man/man4/epair.4 stable/9/share/man/man4/fdc.4 stable/9/share/man/man4/fwohci.4 stable/9/share/man/man4/gem.4 stable/9/share/man/man4/geom_fox.4 stable/9/share/man/man4/geom_uzip.4 stable/9/share/man/man4/hptiop.4 stable/9/share/man/man4/igb.4 stable/9/share/man/man4/ip.4 stable/9/share/man/man4/isp.4 stable/9/share/man/man4/man4.powerpc/bm.4 stable/9/share/man/man4/man4.powerpc/snd_ai2s.4 stable/9/share/man/man4/man4.powerpc/snd_davbus.4 stable/9/share/man/man4/netmap.4 stable/9/share/man/man4/ng_netflow.4 stable/9/share/man/man4/nvram2env.4 stable/9/share/man/man4/oce.4 stable/9/share/man/man4/ppbus.4 stable/9/share/man/man4/snd_emu10kx.4 stable/9/share/man/man4/snd_hda.4 stable/9/share/man/man4/u3g.4 stable/9/share/man/man7/mailaddr.7 stable/9/share/man/man9/DB_COMMAND.9 stable/9/share/man/man9/fail.9 stable/9/share/man/man9/lock.9 stable/9/share/man/man9/make_dev.9 Directory Properties: stable/9/ (props changed) stable/9/share/ (props changed) stable/9/share/man/ (props changed) stable/9/share/man/man4/ (props changed) stable/9/share/man/man7/ (props changed) stable/9/share/man/man9/ (props changed) Modified: stable/9/share/man/man4/acpi_hp.4 ============================================================================== --- stable/9/share/man/man4/acpi_hp.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/acpi_hp.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -244,7 +244,6 @@ Set maximum detail level for /dev/hpcmi .Bd -literal -offset indent sysctl dev.acpi_hp.0.cmi_detail=7 .Ed -.Pp .Sh SEE ALSO .Xr acpi 4 , .Xr acpi_wmi 4 , Modified: stable/9/share/man/man4/adv.4 ============================================================================== --- stable/9/share/man/man4/adv.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/adv.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -66,7 +66,6 @@ host adapter chips. The following tables list the AdvanSys products using these chips, their bus attachment type, maximum sync rate, and the maximum number of commands that can be handled by the adapter concurrently. -.Pp .Bd -ragged -offset indent .Bl -column "ABP510/5150 " "ISA PnP " "Yes " "10MHz " "Commands " Footnotes Connectivity Products: @@ -104,7 +103,6 @@ This board has been sold by SIIG as the This board has been sold by SIIG as the Fast SCSI Pro PCI. .El .Ed -.Pp .Bd -ragged -offset indent .Bl -column "ABP510/5150 " "ISA PnP " "Yes " "10MHz " Commands Single Channel Products: @@ -121,7 +119,6 @@ ABP970 PCI No 10MHz ABP970U PCI No 20MHz 240 .El .Ed -.Pp .Bd -ragged -offset indent .Bl -column "ABP510/5150 " "ISA PnP " "Yes " "10MHz " "Commands " "Channels " Multi Channel Products (Commands are per-channel): Modified: stable/9/share/man/man4/ahc.4 ============================================================================== --- stable/9/share/man/man4/ahc.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/ahc.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -146,7 +146,6 @@ driver. Note that wide and twin channel features, although always supported by a particular chip, may be disabled in a particular motherboard or card design. -.Pp .Bd -ragged -offset indent .Bl -column "aic7770 " "10 " "EISA/VL " "10MHz " "16bit " "SCBs " Features .Em "Chip MIPS Bus MaxSync MaxWidth SCBs Features" Modified: stable/9/share/man/man4/atkbd.4 ============================================================================== --- stable/9/share/man/man4/atkbd.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/atkbd.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -144,7 +144,6 @@ command. This option will disable this feature and prevent the user from changing key assignment. .El -.Pp .Ss Driver Flags The .Nm Modified: stable/9/share/man/man4/bridge.4 ============================================================================== --- stable/9/share/man/man4/bridge.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/bridge.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -239,7 +239,6 @@ by enabling the .Va net.link.bridge.log_stp variable using .Xr sysctl 8 . -.Pp .Sh PACKET FILTERING Packet filtering can be used with any firewall package that hooks in via the .Xr pfil 9 Modified: stable/9/share/man/man4/cas.4 ============================================================================== --- stable/9/share/man/man4/cas.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/cas.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -70,7 +70,6 @@ Selecting an MTU larger than 1500 bytes .Xr ifconfig 8 utility configures the adapter to receive and transmit Jumbo Frames. .Sh HARDWARE -.Pp The chips supported by the .Nm driver are: Modified: stable/9/share/man/man4/cc_vegas.4 ============================================================================== --- stable/9/share/man/man4/cc_vegas.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/cc_vegas.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -39,7 +39,6 @@ The Vegas congestion control algorithm uses what the authors term the actual and expected transmission rates to determine whether there is congestion along the network path i.e. -.Pp .Bl -item -offset indent .It actual rate = (total data sent in a RTT) / RTT @@ -54,7 +53,6 @@ smallest round trip time observed during .Pp The algorithm aims to keep diff between two parameters alpha and beta, such that: -.Pp .Bl -item -offset indent .It alpha < diff < beta Modified: stable/9/share/man/man4/cy.4 ============================================================================== --- stable/9/share/man/man4/cy.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/cy.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -44,7 +44,6 @@ .Nm cy .Nd Cyclades Cyclom-Y serial driver .Sh SYNOPSIS -.Pp For one ISA card: .Bd -ragged -offset indent -compact .Cd "device cy" Modified: stable/9/share/man/man4/dpms.4 ============================================================================== --- stable/9/share/man/man4/dpms.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/dpms.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -50,7 +50,6 @@ it restores the display to its state whe .Sh SEE ALSO .Xr acpi_video 4 .Sh BUGS -.Pp The VESA BIOS DPMS calls do not provide any way to identify a particular display or adapter to manipulate. As a result, Modified: stable/9/share/man/man4/ed.4 ============================================================================== --- stable/9/share/man/man4/ed.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/ed.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -410,7 +410,6 @@ dropped packets during heavy network tra The Mitsubishi B8895 PC Card uses a DP83902, but its ASIC part is undocumented. Neither the NE2000 nor the WD83x0 drivers work with this card. -.Pp .Sh BUGS The .Nm Modified: stable/9/share/man/man4/em.4 ============================================================================== --- stable/9/share/man/man4/em.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/em.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -240,7 +240,6 @@ Make the identification LED of em0 blink Turn the identification LED of em0 off again: .Pp .Dl "echo 0 > /dev/led/em0" -.Pp .Sh DIAGNOSTICS .Bl -diag .It "em%d: Unable to allocate bus resource: memory" Modified: stable/9/share/man/man4/epair.4 ============================================================================== --- stable/9/share/man/man4/epair.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/epair.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -97,7 +97,6 @@ one end of the interface pair can also b As with any other Ethernet interface one can configure .Xr vlan 4 support on top of it. -.Pp .Sh SEE ALSO .Xr ioctl 2 , .Xr altq 4 , Modified: stable/9/share/man/man4/fdc.4 ============================================================================== --- stable/9/share/man/man4/fdc.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/fdc.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -173,7 +173,6 @@ For that purpose, a per-drive device flags value of .Ar 0x20 needs to be specified. -.Pp .Ss Programming Interface In addition to the normal read and write functionality, the .Nm Modified: stable/9/share/man/man4/fwohci.4 ============================================================================== --- stable/9/share/man/man4/fwohci.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/fwohci.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -60,7 +60,6 @@ section for detail), put the following l .Bd -literal -offset indent hw.firewire.phydma_enable=0 .Ed -.Pp .Sh HARDWARE The .Nm Modified: stable/9/share/man/man4/gem.4 ============================================================================== --- stable/9/share/man/man4/gem.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/gem.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -61,7 +61,6 @@ support for the reception and transmissi .Xr vlan 4 and a 512-bit multicast hash filter. .Sh HARDWARE -.Pp Chips supported by the .Nm driver include: Modified: stable/9/share/man/man4/geom_fox.4 ============================================================================== --- stable/9/share/man/man4/geom_fox.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/geom_fox.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -85,7 +85,6 @@ The driver will disallow write operations to the underlying devices once the fox device has been opened for writing. .Sh EXAMPLES -.Pp .Bl -bullet -compact .It .Nm Modified: stable/9/share/man/man4/geom_uzip.4 ============================================================================== --- stable/9/share/man/man4/geom_uzip.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/geom_uzip.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -90,7 +90,6 @@ Consumers: Sectorsize: 512 Mode: r1w0e1 .Ed -.Pp .Sh SEE ALSO .Xr GEOM 4 , .Xr md 4 , Modified: stable/9/share/man/man4/hptiop.4 ============================================================================== --- stable/9/share/man/man4/hptiop.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/hptiop.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -132,7 +132,6 @@ The .Nm device driver first appeared in .Fx 7.0 . -.Pp .Sh AUTHORS The .Nm Modified: stable/9/share/man/man4/igb.4 ============================================================================== --- stable/9/share/man/man4/igb.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/igb.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -187,7 +187,6 @@ Make the identification LED of igb0 blin Turn the identification LED of igb0 off again: .Pp .Dl "echo 0 > /dev/led/igb0" -.Pp .Sh DIAGNOSTICS .Bl -diag .It "igb%d: Unable to allocate bus resource: memory" Modified: stable/9/share/man/man4/ip.4 ============================================================================== --- stable/9/share/man/man4/ip.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/ip.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -430,7 +430,6 @@ and .Va net.inet.ip.portrange.randomtime are 10 port allocations per second and 45 seconds correspondingly. .Ss "Multicast Options" -.Pp .Tn IP multicasting is supported only on .Dv AF_INET @@ -720,7 +719,6 @@ are used to specify an upper limit on th source filter entries which the kernel may allocate. .\"----------------------- .Ss "Raw IP Sockets" -.Pp Raw .Tn IP sockets are connectionless, Modified: stable/9/share/man/man4/isp.4 ============================================================================== --- stable/9/share/man/man4/isp.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/isp.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -138,7 +138,6 @@ Qlogic 2422 Optical Fibre Channel PCI ca Qlogic 2432 Optical Fibre Channel PCIe cards (4 Gigabit) .El .Sh CONFIGURATION OPTIONS -.Pp Target mode support may be enabled with the .Pp .Cd options ISP_TARGET_MODE Modified: stable/9/share/man/man4/man4.powerpc/bm.4 ============================================================================== --- stable/9/share/man/man4/man4.powerpc/bm.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/man4.powerpc/bm.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -54,7 +54,6 @@ G3-based Apple hardware. It is a close relative of the Sun HME controller found in contemporary Sun workstations. .Sh HARDWARE -.Pp Chips supported by the .Nm driver include: @@ -65,7 +64,6 @@ Apple BMAC Onboard Ethernet .It Apple BMAC+ Onboard Ethernet .El -.Pp .Sh SEE ALSO .Xr altq 4 , .Xr hme 4 , Modified: stable/9/share/man/man4/man4.powerpc/snd_ai2s.4 ============================================================================== --- stable/9/share/man/man4/man4.powerpc/snd_ai2s.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/man4.powerpc/snd_ai2s.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -54,7 +54,6 @@ predominantly in G4 and G5 machines, alo codecs. Some machines (e.g. the Mac Mini) do not have configurable codecs and so lack hardware volume control. .Sh HARDWARE -.Pp Chips supported by the .Nm driver include: @@ -65,7 +64,6 @@ Apple Tumbler Audio .It Apple Snapper Audio .El -.Pp .Sh SEE ALSO .Xr sound 4 , .Xr snd_davbus 4 Modified: stable/9/share/man/man4/man4.powerpc/snd_davbus.4 ============================================================================== --- stable/9/share/man/man4/man4.powerpc/snd_davbus.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/man4.powerpc/snd_davbus.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -52,7 +52,6 @@ The driver provides support for the Apple Davbus audio controllers found in many G3-era Apple machines. .Sh HARDWARE -.Pp Chips supported by the .Nm driver include: @@ -63,7 +62,6 @@ Apple Burgundy Audio .It Apple Screamer Audio .El -.Pp .Sh SEE ALSO .Xr sound 4 , .Xr snd_ai2s 4 Modified: stable/9/share/man/man4/netmap.4 ============================================================================== --- stable/9/share/man/man4/netmap.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/netmap.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -210,7 +210,6 @@ A on the file descriptor removes the binding, and returns the NIC to normal mode (reconnecting the data path to the host stack), or destroys the virtual port. -.Pp .Sh DATA STRUCTURES The data structures in the mmapped memory region are detailed in .Xr sys/net/netmap.h , @@ -390,7 +389,6 @@ Below is an example of the evolution of v v TX [..........aaaaaaaaaaa........] .Ed -.Pp select() and poll() wlll block if there is no space in the ring, i.e. .Dl ring->cur == ring->tail and return when new slots have become available. Modified: stable/9/share/man/man4/ng_netflow.4 ============================================================================== --- stable/9/share/man/man4/ng_netflow.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/ng_netflow.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -61,7 +61,6 @@ The default is 15 seconds. .Pp Node supports IPv6 accounting (NetFlow v9 only) and is aware of multiple fibs. Different fibs are mapped to different domain_id in NetFlow V9 and different engine_id in NetFlow V5. -.Pp .Sh HOOKS This node type supports up to .Dv NG_NETFLOW_MAXIFACES Modified: stable/9/share/man/man4/nvram2env.4 ============================================================================== --- stable/9/share/man/man4/nvram2env.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/nvram2env.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -101,7 +101,6 @@ hint.nvram.0.base=0x1fc00400 .Ed .Pp Dynamic, editable form CFE, override values from first -.Pp .Bd -literal -offset indent hint.nvram.1.flags=0x05 # Broadcom + nocheck hint.nvram.1.base=0x1cff8000 Modified: stable/9/share/man/man4/oce.4 ============================================================================== --- stable/9/share/man/man4/oce.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/oce.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -90,7 +90,6 @@ Firmware can be updated by following the .Bl -enum .It Copy the below code to a Makefile: -.Pp .Bd -literal -offset indent \&.KMOD=elxflash FIRMWS=imagename.ufi:elxflash Modified: stable/9/share/man/man4/ppbus.4 ============================================================================== --- stable/9/share/man/man4/ppbus.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/ppbus.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -61,7 +61,6 @@ that allows parallel port access from ou with kernel-in drivers. .El .Ss Developing new drivers -.Pp The ppbus system has been designed to support the development of standard and non-standard software: .Pp @@ -74,7 +73,6 @@ It uses standard and non-standard parall .It Sy lpbb Ta "Philips official parallel port I2C bit-banging interface" .El .Ss Porting existing drivers -.Pp Another approach to the ppbus system is to port existing drivers. Various drivers have already been ported: .Pp @@ -274,7 +272,6 @@ propose an arch-independent interface to Finally, the .Em device layer gathers the parallel peripheral device drivers. -.Pp .Ss Parallel modes management We have to differentiate operating modes at various ppbus system layers. Actually, ppbus and adapter operating modes on one hands and for each Modified: stable/9/share/man/man4/snd_emu10kx.4 ============================================================================== --- stable/9/share/man/man4/snd_emu10kx.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/snd_emu10kx.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -164,7 +164,6 @@ DSP inputs 0..8: .It +0x3E sync substream (0xc0de) .El -.Pp .Ss Audigy substream map (in byte offsets, each substream is 2 bytes LE) .Bl -tag -width ".Dv +0x00..+0x3E" .It Dv Offset @@ -286,7 +285,6 @@ The device driver and this manual page were written by .An Yuriy Tsibizov . .Sh BUGS -.Pp The driver does not detect lost S/PDIF signals and produces noise when S/PDIF is not connected and S/PDIF volume is not zero. .Pp Modified: stable/9/share/man/man4/snd_hda.4 ============================================================================== --- stable/9/share/man/man4/snd_hda.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/snd_hda.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -480,7 +480,6 @@ Recording on will go from two external microphones and line-in jacks. .Li pcm1 playback will go to the internal speaker. -.Pp .Ss Example 2 Setting the .Xr device.hints 5 @@ -503,7 +502,6 @@ The .Li pcm1 device will be completely dedicated to a headset (headphones and mic) connected to the front connectors. -.Pp .Ss Example 3 Setting the .Xr device.hints 5 @@ -527,7 +525,6 @@ will give 4 independent devices: and .Li pcm3 .Pq internal speaker . -.Pp .Ss Example 4 Setting the .Xr device.hints 5 Modified: stable/9/share/man/man4/u3g.4 ============================================================================== --- stable/9/share/man/man4/u3g.4 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man4/u3g.4 Sun Nov 15 21:16:13 2015 (r290886) @@ -92,7 +92,6 @@ switching automatically, please try to a .Xr usbconfig 8 and .Xr usb_quirk 4 . -.Pp .Sh SEE ALSO .Xr tty 4 , .Xr ucom 4 , Modified: stable/9/share/man/man7/mailaddr.7 ============================================================================== --- stable/9/share/man/man7/mailaddr.7 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man7/mailaddr.7 Sun Nov 15 21:16:13 2015 (r290886) @@ -66,7 +66,6 @@ For example, a user on ``calder.berkeley without adding the ``berkeley.edu'' since it is the same on both sending and receiving hosts. .Ss Compatibility. -.Pp Certain old address formats are converted to the new format to provide compatibility with the previous mail system. In particular, @@ -94,16 +93,13 @@ is converted to .Pp This is normally converted back to the ``host!user'' form before being sent on for compatibility with older UUCP hosts. -.Pp .Ss Case Distinctions. -.Pp Domain names (i.e., anything after the ``@'' sign) may be given in any mixture of upper and lower case with the exception of UUCP hostnames. Most hosts accept any combination of case in user names, with the notable exception of MULTICS sites. .Ss Route-addrs. -.Pp Under some circumstances it may be necessary to route a message through several hosts to get it to the final destination. Normally this routing @@ -134,11 +130,9 @@ Many sites also support the ``percent ha .Pp is routed as indicated in the previous example. .Ss Postmaster. -.Pp Every site is required to have a user or user alias designated ``postmaster'' to which problems with the mail system may be addressed. .Ss Other Networks. -.Pp Some other networks can be reached by giving the name of the network as the last component of the domain. .Em This is not a standard feature Modified: stable/9/share/man/man9/DB_COMMAND.9 ============================================================================== --- stable/9/share/man/man9/DB_COMMAND.9 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man9/DB_COMMAND.9 Sun Nov 15 21:16:13 2015 (r290886) @@ -42,7 +42,6 @@ .Fn DB_SHOW_COMMAND "command_name" "command_function" .Fn DB_SHOW_ALL_COMMAND "command_name" "command_function" .Sh DESCRIPTION -.Pp The .Fn DB_COMMAND macro adds Modified: stable/9/share/man/man9/fail.9 ============================================================================== --- stable/9/share/man/man9/fail.9 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man9/fail.9 Sun Nov 15 21:16:13 2015 (r290886) @@ -165,7 +165,6 @@ term only cascades when passed a non-zer A pid can optionally be specified. The fail point term is only executed when invoked by a process with a matching p_pid. -.Pp .Sh EXAMPLES .Bl -tag -width Sy .It Sy sysctl debug.fail_point.foobar="2.1%return(5)" Modified: stable/9/share/man/man9/lock.9 ============================================================================== --- stable/9/share/man/man9/lock.9 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man9/lock.9 Sun Nov 15 21:16:13 2015 (r290886) @@ -308,7 +308,6 @@ Assert that the current thread has a rec Assert that the current thread does not have a recursed lock on .Fa lkp . .El -.Pp .Sh RETURN VALUES The .Fn lockmgr Modified: stable/9/share/man/man9/make_dev.9 ============================================================================== --- stable/9/share/man/man9/make_dev.9 Sun Nov 15 20:49:03 2015 (r290885) +++ stable/9/share/man/man9/make_dev.9 Sun Nov 15 21:16:13 2015 (r290886) @@ -369,7 +369,6 @@ The .Dv MAKEDEV_CHECKNAME flag was specified and the provided device name already exists. .El -.Pp .Sh SEE ALSO .Xr devctl 4 , .Xr devfs 5 , From owner-svn-src-stable-9@freebsd.org Sun Nov 15 21:27:55 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DB0BCA2F3D5; Sun, 15 Nov 2015 21:27:54 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8A65D176C; Sun, 15 Nov 2015 21:27:54 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFLRrEo007826; Sun, 15 Nov 2015 21:27:53 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFLRoFm007790; Sun, 15 Nov 2015 21:27:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511152127.tAFLRoFm007790@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 15 Nov 2015 21:27:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290887 - in stable/9: lib/libc/db/man lib/libc/gen lib/libc/net lib/libc/rpc lib/libc/sys lib/libcam lib/libdevstat lib/libradius sbin/bsdlabel sbin/newfs_msdos share/man/man4 share/ma... X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 21:27:55 -0000 Author: ngie Date: Sun Nov 15 21:27:50 2015 New Revision: 290887 URL: https://svnweb.freebsd.org/changeset/base/290887 Log: MFstable/10 r231564: r231564 (by ed): Globally replace u_int*_t from (non-contributed) man pages. The reasoning behind this, is that if we are consistent in our documentation about the uint*_t stuff, people will be less tempted to write new code that uses the non-standard types. I am not going to bump the man page dates, as these changes can be considered style nits. The meaning of the man pages is unaffected. Modified: stable/9/lib/libc/db/man/hash.3 stable/9/lib/libc/gen/arc4random.3 stable/9/lib/libc/net/nsdispatch.3 stable/9/lib/libc/rpc/rpc.3 stable/9/lib/libc/rpc/rpc_clnt_create.3 stable/9/lib/libc/sys/getdirentries.2 stable/9/lib/libc/sys/nfssvc.2 stable/9/lib/libcam/cam.3 stable/9/lib/libcam/cam_cdbparse.3 stable/9/lib/libdevstat/devstat.3 stable/9/lib/libradius/libradius.3 stable/9/sbin/bsdlabel/bsdlabel.8 stable/9/sbin/newfs_msdos/newfs_msdos.8 stable/9/share/man/man4/agp.4 stable/9/share/man/man4/icmp6.4 stable/9/share/man/man4/ip6.4 stable/9/share/man/man4/mem.4 stable/9/share/man/man4/mtio.4 stable/9/share/man/man4/natm.4 stable/9/share/man/man4/net80211.4 stable/9/share/man/man4/ng_async.4 stable/9/share/man/man4/ng_bridge.4 stable/9/share/man/man4/ng_btsocket.4 stable/9/share/man/man4/ng_car.4 stable/9/share/man/man4/ng_ccatm.4 stable/9/share/man/man4/ng_cisco.4 stable/9/share/man/man4/ng_etf.4 stable/9/share/man/man4/ng_hci.4 stable/9/share/man/man4/ng_l2cap.4 stable/9/share/man/man4/ng_l2tp.4 stable/9/share/man/man4/ng_mppc.4 stable/9/share/man/man4/ng_one2many.4 stable/9/share/man/man4/ng_ppp.4 stable/9/share/man/man4/ng_pppoe.4 stable/9/share/man/man4/ng_pptpgre.4 stable/9/share/man/man4/ppi.4 stable/9/share/man/man5/fs.5 stable/9/share/man/man9/MD5.9 stable/9/share/man/man9/bios.9 stable/9/share/man/man9/bus_space.9 stable/9/share/man/man9/crypto.9 stable/9/share/man/man9/device_set_flags.9 stable/9/share/man/man9/devstat.9 stable/9/share/man/man9/eventtimers.9 stable/9/share/man/man9/get_cyclecount.9 stable/9/share/man/man9/mbchain.9 stable/9/share/man/man9/mbuf_tags.9 stable/9/share/man/man9/mdchain.9 stable/9/share/man/man9/netisr.9 stable/9/share/man/man9/random.9 stable/9/share/man/man9/rijndael.9 stable/9/share/man/man9/zone.9 stable/9/usr.bin/m4/lib/ohash_interval.3 stable/9/usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.3 Directory Properties: stable/9/ (props changed) stable/9/lib/ (props changed) stable/9/lib/libc/ (props changed) stable/9/lib/libc/sys/ (props changed) stable/9/lib/libcam/ (props changed) stable/9/lib/libradius/ (props changed) stable/9/sbin/ (props changed) stable/9/sbin/bsdlabel/ (props changed) stable/9/sbin/newfs_msdos/ (props changed) stable/9/share/ (props changed) stable/9/share/man/ (props changed) stable/9/share/man/man4/ (props changed) stable/9/share/man/man5/ (props changed) stable/9/share/man/man9/ (props changed) stable/9/usr.bin/ (props changed) stable/9/usr.bin/m4/ (props changed) stable/9/usr.sbin/ (props changed) stable/9/usr.sbin/bsnmpd/ (props changed) Modified: stable/9/lib/libc/db/man/hash.3 ============================================================================== --- stable/9/lib/libc/db/man/hash.3 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/lib/libc/db/man/hash.3 Sun Nov 15 21:27:50 2015 (r290887) @@ -65,7 +65,7 @@ typedef struct { u_int ffactor; u_int nelem; u_int cachesize; - u_int32_t (*hash)(const void *, size_t); + uint32_t (*hash)(const void *, size_t); int lorder; } HASHINFO; .Ed Modified: stable/9/lib/libc/gen/arc4random.3 ============================================================================== --- stable/9/lib/libc/gen/arc4random.3 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/lib/libc/gen/arc4random.3 Sun Nov 15 21:27:50 2015 (r290887) @@ -44,12 +44,12 @@ .Lb libc .Sh SYNOPSIS .In stdlib.h -.Ft u_int32_t +.Ft uint32_t .Fn arc4random "void" .Ft void .Fn arc4random_buf "void *buf" "size_t nbytes" -.Ft u_int32_t -.Fn arc4random_uniform "u_int32_t upper_bound" +.Ft uint32_t +.Fn arc4random_uniform "uint32_t upper_bound" .Ft void .Fn arc4random_stir "void" .Ft void Modified: stable/9/lib/libc/net/nsdispatch.3 ============================================================================== --- stable/9/lib/libc/net/nsdispatch.3 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/lib/libc/net/nsdispatch.3 Sun Nov 15 21:27:50 2015 (r290887) @@ -129,7 +129,7 @@ structures, which have the following for .Bd -literal -offset indent typedef struct _ns_src { const char *src; - u_int32_t flags; + uint32_t flags; } ns_src; .Ed .Bd -ragged -offset indent Modified: stable/9/lib/libc/rpc/rpc.3 ============================================================================== --- stable/9/lib/libc/rpc/rpc.3 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/lib/libc/rpc/rpc.3 Sun Nov 15 21:27:50 2015 (r290887) @@ -119,12 +119,12 @@ file. .Sh Derived Types The derived types used in the RPC interfaces are defined as follows: .Bd -literal - typedef u_int32_t rpcprog_t; - typedef u_int32_t rpcvers_t; - typedef u_int32_t rpcproc_t; - typedef u_int32_t rpcprot_t; - typedef u_int32_t rpcport_t; - typedef int32_t rpc_inline_t; + typedef uint32_t rpcprog_t; + typedef uint32_t rpcvers_t; + typedef uint32_t rpcproc_t; + typedef uint32_t rpcprot_t; + typedef uint32_t rpcport_t; + typedef int32_t rpc_inline_t; .Ed .Sh "Data Structures" Some of the data structures used by the Modified: stable/9/lib/libc/rpc/rpc_clnt_create.3 ============================================================================== --- stable/9/lib/libc/rpc/rpc_clnt_create.3 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/lib/libc/rpc/rpc_clnt_create.3 Sun Nov 15 21:27:50 2015 (r290887) @@ -106,10 +106,10 @@ Set the timeout argument to 0 for batchi .It Dv CLGET_FD Ta "int *" Ta "get fd from handle" .It Dv CLSET_FD_CLOSE Ta "void" Ta "close fd on destroy" .It Dv CLSET_FD_NCLOSE Ta void Ta "do not close fd on destroy" -.It Dv CLGET_VERS Ta "u_int32_t *" Ta "get RPC program version" -.It Dv CLSET_VERS Ta "u_int32_t *" Ta "set RPC program version" -.It Dv CLGET_XID Ta "u_int32_t *" Ta "get XID of previous call" -.It Dv CLSET_XID Ta "u_int32_t *" Ta "set XID of next call" +.It Dv CLGET_VERS Ta "uint32_t *" Ta "get RPC program version" +.It Dv CLSET_VERS Ta "uint32_t *" Ta "set RPC program version" +.It Dv CLGET_XID Ta "uint32_t *" Ta "get XID of previous call" +.It Dv CLSET_XID Ta "uint32_t *" Ta "set XID of next call" .El .Pp The following operations are valid for connectionless transports only: Modified: stable/9/lib/libc/sys/getdirentries.2 ============================================================================== --- stable/9/lib/libc/sys/getdirentries.2 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/lib/libc/sys/getdirentries.2 Sun Nov 15 21:27:50 2015 (r290887) @@ -71,10 +71,10 @@ The data in the buffer is a series of .Vt dirent structures each containing the following entries: .Bd -literal -offset indent -u_int32_t d_fileno; -u_int16_t d_reclen; -u_int8_t d_type; -u_int8_t d_namlen; +uint32_t d_fileno; +uint16_t d_reclen; +uint8_t d_type; +uint8_t d_namlen; char d_name[MAXNAMELEN + 1]; /* see below */ .Ed .Pp Modified: stable/9/lib/libc/sys/nfssvc.2 ============================================================================== --- stable/9/lib/libc/sys/nfssvc.2 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/lib/libc/sys/nfssvc.2 Sun Nov 15 21:27:50 2015 (r290887) @@ -143,14 +143,14 @@ and a pointer to a struct nfsd_srvargs { struct nfsd *nsd_nfsd; /* Pointer to in kernel nfsd struct */ uid_t nsd_uid; /* Effective uid mapped to cred */ - u_int32_t nsd_haddr; /* Ip address of client */ + uint32_t nsd_haddr; /* Ip address of client */ struct ucred nsd_cr; /* Cred. uid maps to */ int nsd_authlen; /* Length of auth string (ret) */ u_char *nsd_authstr; /* Auth string (ret) */ int nsd_verflen; /* and the verifier */ u_char *nsd_verfstr; struct timeval nsd_timestamp; /* timestamp from verifier */ - u_int32_t nsd_ttl; /* credential ttl (sec) */ + uint32_t nsd_ttl; /* credential ttl (sec) */ NFSKERBKEY_T nsd_key; /* Session key */ }; .Ed Modified: stable/9/lib/libcam/cam.3 ============================================================================== --- stable/9/lib/libcam/cam.3 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/lib/libcam/cam.3 Sun Nov 15 21:27:50 2015 (r290887) @@ -145,7 +145,7 @@ struct cam_device { * Device name given by * the user. */ - u_int32_t given_unit_number; /* + uint32_t given_unit_number; /* * Unit number given by * the user. */ @@ -153,7 +153,7 @@ struct cam_device { * Name of the device, * e.g. 'pass' */ - u_int32_t dev_unit_num; /* Unit number of the passthrough + uint32_t dev_unit_num; /* Unit number of the passthrough * device associated with this * particular device. */ @@ -161,18 +161,18 @@ struct cam_device { char sim_name[SIM_IDLEN+1];/* * Controller name, e.g.'ahc' */ - u_int32_t sim_unit_number; /* Controller unit number */ - u_int32_t bus_id; /* Controller bus number */ + uint32_t sim_unit_number; /* Controller unit number */ + uint32_t bus_id; /* Controller bus number */ lun_id_t target_lun; /* Logical Unit Number */ target_id_t target_id; /* Target ID */ path_id_t path_id; /* System SCSI bus number */ - u_int16_t pd_type; /* type of peripheral device */ + uint16_t pd_type; /* type of peripheral device */ struct scsi_inquiry_data inq_data; /* SCSI Inquiry data */ - u_int8_t serial_num[252]; /* device serial number */ - u_int8_t serial_num_len; /* length of the serial number */ - u_int8_t sync_period; /* Negotiated sync period */ - u_int8_t sync_offset; /* Negotiated sync offset */ - u_int8_t bus_width; /* Negotiated bus width */ + uint8_t serial_num[252]; /* device serial number */ + uint8_t serial_num_len; /* length of the serial number */ + uint8_t sync_period; /* Negotiated sync period */ + uint8_t sync_offset; /* Negotiated sync offset */ + uint8_t bus_width; /* Negotiated bus width */ int fd; /* file descriptor for device */ }; .Ed Modified: stable/9/lib/libcam/cam_cdbparse.3 ============================================================================== --- stable/9/lib/libcam/cam_cdbparse.3 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/lib/libcam/cam_cdbparse.3 Sun Nov 15 21:27:50 2015 (r290887) @@ -83,9 +83,9 @@ .Ft int .Fo csio_build .Fa "struct ccb_scsiio *csio" -.Fa "u_int8_t *data_ptr" -.Fa "u_int32_t dxfer_len" -.Fa "u_int32_t flags" +.Fa "uint8_t *data_ptr" +.Fa "uint32_t dxfer_len" +.Fa "uint32_t flags" .Fa "int retry_count" .Fa "int timeout" .Fa "const char *cmd_spec" @@ -94,9 +94,9 @@ .Ft int .Fo csio_build_visit .Fa "struct ccb_scsiio *csio" -.Fa "u_int8_t *data_ptr" -.Fa "u_int32_t dxfer_len" -.Fa "u_int32_t flags" +.Fa "uint8_t *data_ptr" +.Fa "uint32_t dxfer_len" +.Fa "uint32_t flags" .Fa "int retry_count" .Fa "int timeout" .Fa "const char *cmd_spec" @@ -122,14 +122,14 @@ .Fc .Ft int .Fo buff_decode -.Fa "u_int8_t *buff" +.Fa "uint8_t *buff" .Fa "size_t len" .Fa "const char *fmt" .Fa "..." .Fc .Ft int .Fo buff_decode_visit -.Fa "u_int8_t *buff" +.Fa "uint8_t *buff" .Fa "size_t len" .Fa "const char *fmt" .Fa "void (*arg_put)(void *, int, void *, int, char *)" @@ -150,7 +150,7 @@ .Fc .Ft int .Fo buff_encode_visit -.Fa "u_int8_t *buff" +.Fa "uint8_t *buff" .Fa "size_t len" .Fa "const char *fmt" .Fa "int (*arg_get)(void *hook, char *field_name)" Modified: stable/9/lib/libdevstat/devstat.3 ============================================================================== --- stable/9/lib/libdevstat/devstat.3 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/lib/libdevstat/devstat.3 Sun Nov 15 21:27:50 2015 (r290887) @@ -193,7 +193,7 @@ subelement contains the following elemen .Bd -literal -offset indent struct devinfo { struct devstat *devices; - u_int8_t *mem_ptr; + uint8_t *mem_ptr; long generation; int numdevs; }; @@ -472,7 +472,7 @@ structure to calculate statistics over For each statistics to be calculated, the user should supply the proper enumerated type (listed below), and a variable of the indicated type. All statistics are either integer values, for which a -.Vt u_int64_t +.Vt uint64_t is used, or floating point, for which a .Vt "long double" @@ -489,7 +489,7 @@ be the last argument passed to It is an argument list terminator. .It Dv DSM_TOTAL_BYTES type: -.Vt "u_int64_t *" +.Vt "uint64_t *" .Pp The total number of bytes transferred between the acquisition of .Fa previous @@ -499,7 +499,7 @@ and .It Dv DSM_TOTAL_BYTES_WRITE .It Dv DSM_TOTAL_BYTES_FREE type: -.Vt "u_int64_t *" +.Vt "uint64_t *" .Pp The total number of bytes in transactions of the specified type between the acquisition of @@ -508,7 +508,7 @@ and .Fa current . .It Dv DSM_TOTAL_TRANSFERS type: -.Vt "u_int64_t *" +.Vt "uint64_t *" .Pp The total number of transfers between the acquisition of .Fa previous @@ -519,7 +519,7 @@ and .It Dv DSM_TOTAL_TRANSFERS_WRITE .It Dv DSM_TOTAL_TRANSFERS_FREE type: -.Vt "u_int64_t *" +.Vt "uint64_t *" .Pp The total number of transactions of the specified type between the acquisition of @@ -528,7 +528,7 @@ and .Fa current . .It Dv DSM_TOTAL_BLOCKS type: -.Vt "u_int64_t *" +.Vt "uint64_t *" .Pp The total number of blocks transferred between the acquisition of .Fa previous @@ -541,7 +541,7 @@ blocksize of 512 bytes will be used in t .It Dv DSM_TOTAL_BLOCKS_WRITE .It Dv DSM_TOTAL_BLOCKS_FREE type: -.Vt "u_int64_t *" +.Vt "uint64_t *" .Pp The total number of blocks of the specified type between the acquisition of .Fa previous @@ -665,7 +665,7 @@ and .Fa current . .It Dv DSM_QUEUE_LENGTH type: -.Vt "u_int64_t *" +.Vt "uint64_t *" .Pp The number of not yet completed transactions at the time when .Fa current Modified: stable/9/lib/libradius/libradius.3 ============================================================================== --- stable/9/lib/libradius/libradius.3 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/lib/libradius/libradius.3 Sun Nov 15 21:27:50 2015 (r290887) @@ -51,14 +51,14 @@ .Fn rad_create_response "struct rad_handle *h" "int code" .Ft "struct in_addr" .Fn rad_cvt_addr "const void *data" -.Ft u_int32_t +.Ft uint32_t .Fn rad_cvt_int "const void *data" .Ft char * .Fn rad_cvt_string "const void *data" "size_t len" .Ft int .Fn rad_get_attr "struct rad_handle *h" "const void **data" "size_t *len" .Ft int -.Fn rad_get_vendor_attr "u_int32_t *vendor" "const void **data" "size_t *len" +.Fn rad_get_vendor_attr "uint32_t *vendor" "const void **data" "size_t *len" .Ft int .Fn rad_init_send_request "struct rad_handle *h" "int *fd" "struct timeval *tv" .Ft int @@ -66,7 +66,7 @@ .Ft int .Fn rad_put_attr "struct rad_handle *h" "int type" "const void *data" "size_t len" .Ft int -.Fn rad_put_int "struct rad_handle *h" "int type" "u_int32_t value" +.Fn rad_put_int "struct rad_handle *h" "int type" "uint32_t value" .Ft int .Fn rad_put_string "struct rad_handle *h" "int type" "const char *str" .Ft int @@ -76,7 +76,7 @@ .Ft int .Fn rad_put_vendor_attr "struct rad_handle *h" "int vendor" "int type" "const void *data" "size_t len" .Ft int -.Fn rad_put_vendor_int "struct rad_handle *h" "int vendor" "int type" "u_int32_t value" +.Fn rad_put_vendor_int "struct rad_handle *h" "int vendor" "int type" "uint32_t value" .Ft int .Fn rad_put_vendor_string "struct rad_handle *h" "int vendor" "int type" "const char *str" .Ft ssize_t Modified: stable/9/sbin/bsdlabel/bsdlabel.8 ============================================================================== --- stable/9/sbin/bsdlabel/bsdlabel.8 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/sbin/bsdlabel/bsdlabel.8 Sun Nov 15 21:27:50 2015 (r290887) @@ -475,7 +475,7 @@ The kernel device drivers will not allow to be decreased or the offset of a partition to be changed while it is open. .Sh COMPATIBILITY Due to the use of an -.Vt u_int32_t +.Vt uint32_t to store the number of sectors, .Bx labels are restricted to a maximum of 2^32-1 sectors. Modified: stable/9/sbin/newfs_msdos/newfs_msdos.8 ============================================================================== --- stable/9/sbin/newfs_msdos/newfs_msdos.8 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/sbin/newfs_msdos/newfs_msdos.8 Sun Nov 15 21:27:50 2015 (r290887) @@ -180,27 +180,27 @@ For reference purposes, this structure i below. .Bd -literal struct bsbpb { - u_int16_t bpbBytesPerSec; /* [-S] bytes per sector */ - u_int8_t bpbSecPerClust; /* [-c] sectors per cluster */ - u_int16_t bpbResSectors; /* [-r] reserved sectors */ - u_int8_t bpbFATs; /* [-n] number of FATs */ - u_int16_t bpbRootDirEnts; /* [-e] root directory entries */ - u_int16_t bpbSectors; /* [-s] total sectors */ - u_int8_t bpbMedia; /* [-m] media descriptor */ - u_int16_t bpbFATsecs; /* [-a] sectors per FAT */ - u_int16_t bpbSecPerTrack; /* [-u] sectors per track */ - u_int16_t bpbHeads; /* [-h] drive heads */ - u_int32_t bpbHiddenSecs; /* [-o] hidden sectors */ - u_int32_t bpbHugeSectors; /* [-s] big total sectors */ + uint16_t bpbBytesPerSec; /* [-S] bytes per sector */ + uint8_t bpbSecPerClust; /* [-c] sectors per cluster */ + uint16_t bpbResSectors; /* [-r] reserved sectors */ + uint8_t bpbFATs; /* [-n] number of FATs */ + uint16_t bpbRootDirEnts; /* [-e] root directory entries */ + uint16_t bpbSectors; /* [-s] total sectors */ + uint8_t bpbMedia; /* [-m] media descriptor */ + uint16_t bpbFATsecs; /* [-a] sectors per FAT */ + uint16_t bpbSecPerTrack; /* [-u] sectors per track */ + uint16_t bpbHeads; /* [-h] drive heads */ + uint32_t bpbHiddenSecs; /* [-o] hidden sectors */ + uint32_t bpbHugeSectors; /* [-s] big total sectors */ }; /* FAT32 extensions */ struct bsxbpb { - u_int32_t bpbBigFATsecs; /* [-a] big sectors per FAT */ - u_int16_t bpbExtFlags; /* control flags */ - u_int16_t bpbFSVers; /* file system version */ - u_int32_t bpbRootClust; /* root directory start cluster */ - u_int16_t bpbFSInfo; /* [-i] file system info sector */ - u_int16_t bpbBackup; /* [-k] backup boot sector */ + uint32_t bpbBigFATsecs; /* [-a] big sectors per FAT */ + uint16_t bpbExtFlags; /* control flags */ + uint16_t bpbFSVers; /* file system version */ + uint32_t bpbRootClust; /* root directory start cluster */ + uint16_t bpbFSInfo; /* [-i] file system info sector */ + uint16_t bpbBackup; /* [-k] backup boot sector */ }; .Ed .Sh LIMITATION Modified: stable/9/share/man/man4/agp.4 ============================================================================== --- stable/9/share/man/man4/agp.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/agp.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -80,8 +80,8 @@ The result is a pointer to the following .Bd -literal typedef struct _agp_info { agp_version version; /* version of the driver */ - u_int32_t bridge_id; /* bridge vendor/device */ - u_int32_t agp_mode; /* mode info of bridge */ + uint32_t bridge_id; /* bridge vendor/device */ + uint32_t agp_mode; /* mode info of bridge */ off_t aper_base; /* base of aperture */ size_t aper_size; /* size of aperture */ size_t pg_total; /* max pages (swap + system) */ @@ -105,7 +105,7 @@ This takes the following structure: .Bd -literal typedef struct _agp_setup { - u_int32_t agp_mode; /* mode info of bridge */ + uint32_t agp_mode; /* mode info of bridge */ } agp_setup; .Ed .Pp @@ -120,8 +120,8 @@ takes the following structure: typedef struct _agp_allocate { int key; /* tag of allocation */ size_t pg_count; /* number of pages */ - u_int32_t type; /* 0 == normal, other devspec */ - u_int32_t physical; /* device specific (some devices + uint32_t type; /* 0 == normal, other devspec */ + uint32_t physical; /* device specific (some devices * need a phys address of the * actual page behind the gatt * table) */ @@ -159,7 +159,7 @@ takes the following structure: .Bd -literal typedef struct _agp_unbind { int key; /* tag of allocation */ - u_int32_t priority; /* priority for paging out */ + uint32_t priority; /* priority for paging out */ } agp_unbind; .Ed .El Modified: stable/9/share/man/man4/icmp6.4 ============================================================================== --- stable/9/share/man/man4/icmp6.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/icmp6.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -140,13 +140,13 @@ This header corresponds to the structure and has the following definition: .Bd -literal -offset indent struct icmp6_hdr { - u_int8_t icmp6_type; /* type field */ - u_int8_t icmp6_code; /* code field */ - u_int16_t icmp6_cksum; /* checksum field */ + uint8_t icmp6_type; /* type field */ + uint8_t icmp6_code; /* code field */ + uint16_t icmp6_cksum; /* checksum field */ union { - u_int32_t icmp6_un_data32[1]; /* type-specific */ - u_int16_t icmp6_un_data16[2]; /* type-specific */ - u_int8_t icmp6_un_data8[4]; /* type-specific */ + uint32_t icmp6_un_data32[1]; /* type-specific */ + uint16_t icmp6_un_data16[2]; /* type-specific */ + uint8_t icmp6_un_data8[4]; /* type-specific */ } icmp6_dataun; } __packed; Modified: stable/9/share/man/man4/ip6.4 ============================================================================== --- stable/9/share/man/man4/ip6.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ip6.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -75,12 +75,12 @@ The header has the following definition: struct ip6_hdr { union { struct ip6_hdrctl { - u_int32_t ip6_un1_flow; /* 20 bits of flow ID */ - u_int16_t ip6_un1_plen; /* payload length */ - u_int8_t ip6_un1_nxt; /* next header */ - u_int8_t ip6_un1_hlim; /* hop limit */ + uint32_t ip6_un1_flow; /* 20 bits of flow ID */ + uint16_t ip6_un1_plen; /* payload length */ + uint8_t ip6_un1_nxt; /* next header */ + uint8_t ip6_un1_hlim; /* hop limit */ } ip6_un1; - u_int8_t ip6_un2_vfc; /* version and class */ + uint8_t ip6_un2_vfc; /* version and class */ } ip6_ctlun; struct in6_addr ip6_src; /* source address */ struct in6_addr ip6_dst; /* destination address */ @@ -121,8 +121,8 @@ The IPv6 header may be followed by any n with the following generic definition: .Bd -literal -offset indent struct ip6_ext { - u_int8_t ip6e_nxt; - u_int8_t ip6e_len; + uint8_t ip6e_nxt; + uint8_t ip6e_len; } __packed; .Ed .Ss Options @@ -281,8 +281,8 @@ The option is stored in the following st returned: .Bd -literal struct ip6_hbh { - u_int8_t ip6h_nxt; /* next header */ - u_int8_t ip6h_len; /* length in units of 8 octets */ + uint8_t ip6h_nxt; /* next header */ + uint8_t ip6h_len; /* length in units of 8 octets */ /* followed by options */ } __packed; .Ed @@ -301,8 +301,8 @@ The option is stored in the following st returned: .Bd -literal struct ip6_dest { - u_int8_t ip6d_nxt; /* next header */ - u_int8_t ip6d_len; /* length in units of 8 octets */ + uint8_t ip6d_nxt; /* next header */ + uint8_t ip6d_len; /* length in units of 8 octets */ /* followed by options */ } __packed; .Ed @@ -333,10 +333,10 @@ The header is stored in the following st returned: .Bd -literal struct ip6_rthdr { - u_int8_t ip6r_nxt; /* next header */ - u_int8_t ip6r_len; /* length in units of 8 octets */ - u_int8_t ip6r_type; /* routing type */ - u_int8_t ip6r_segleft; /* segments left */ + uint8_t ip6r_nxt; /* next header */ + uint8_t ip6r_len; /* length in units of 8 octets */ + uint8_t ip6r_type; /* routing type */ + uint8_t ip6r_segleft; /* segments left */ /* followed by routing-type-specific data */ } __packed; .Ed Modified: stable/9/share/man/man4/mem.4 ============================================================================== --- stable/9/share/man/man4/mem.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/mem.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -101,8 +101,8 @@ The region cannot be written to. Memory ranges are described by .Vt struct mem_range_desc : .Bd -literal -offset indent -u_int64_t mr_base; /\(** physical base address \(**/ -u_int64_t mr_len; /\(** physical length of region \(**/ +uint64_t mr_base; /\(** physical base address \(**/ +uint64_t mr_len; /\(** physical length of region \(**/ int mr_flags; /\(** attributes of region \(**/ char mr_owner[8]; .Ed Modified: stable/9/share/man/man4/mtio.4 ============================================================================== --- stable/9/share/man/man4/mtio.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/mtio.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -169,7 +169,7 @@ struct mtget { #if defined (__FreeBSD__) daddr_t mt_blksiz; /* presently operating blocksize */ daddr_t mt_density; /* presently operating density */ - u_int32_t mt_comp; /* presently operating compression */ + uint32_t mt_comp; /* presently operating compression */ daddr_t mt_blksiz0; /* blocksize for mode 0 */ daddr_t mt_blksiz1; /* blocksize for mode 1 */ daddr_t mt_blksiz2; /* blocksize for mode 2 */ @@ -179,10 +179,10 @@ struct mtget { daddr_t mt_density2; /* density for mode 2 */ daddr_t mt_density3; /* density for mode 3 */ /* the following are not yet implemented */ - u_int32_t mt_comp0; /* compression type for mode 0 */ - u_int32_t mt_comp1; /* compression type for mode 1 */ - u_int32_t mt_comp2; /* compression type for mode 2 */ - u_int32_t mt_comp3; /* compression type for mode 3 */ + uint32_t mt_comp0; /* compression type for mode 0 */ + uint32_t mt_comp1; /* compression type for mode 1 */ + uint32_t mt_comp2; /* compression type for mode 2 */ + uint32_t mt_comp3; /* compression type for mode 3 */ /* end not yet implemented */ #endif daddr_t mt_fileno; /* relative file number of current position */ @@ -197,23 +197,23 @@ struct scsi_tape_errors { * Check Condition noted for these operations. The act * of issuing an MTIOCERRSTAT unlatches and clears them. */ - u_int8_t io_sense[32]; /* Last Sense Data For Data I/O */ + uint8_t io_sense[32]; /* Last Sense Data For Data I/O */ u_int32_t io_resid; /* residual count from last Data I/O */ - u_int8_t io_cdb[16]; /* Command that Caused the Last Data Sense */ - u_int8_t ctl_sense[32]; /* Last Sense Data For Control I/O */ + uint8_t io_cdb[16]; /* Command that Caused the Last Data Sense */ + uint8_t ctl_sense[32]; /* Last Sense Data For Control I/O */ u_int32_t ctl_resid; /* residual count from last Control I/O */ - u_int8_t ctl_cdb[16]; /* Command that Caused the Last Control Sense */ + uint8_t ctl_cdb[16]; /* Command that Caused the Last Control Sense */ /* * These are the read and write cumulative error counters. * (how to reset cumulative error counters is not yet defined). * (not implemented as yet but space is being reserved for them) */ struct { - u_int32_t retries; /* total # retries performed */ - u_int32_t corrected; /* total # corrections performed */ - u_int32_t processed; /* total # corrections successful */ - u_int32_t failures; /* total # corrections/retries failed */ - u_int64_t nbytes; /* total # bytes processed */ + uint32_t retries; /* total # retries performed */ + uint32_t corrected; /* total # corrections performed */ + uint32_t processed; /* total # corrections successful */ + uint32_t failures; /* total # corrections/retries failed */ + uint64_t nbytes; /* total # bytes processed */ } wterr, rderr; }; @@ -259,18 +259,18 @@ union mterrstat { * rethink these ioctls to support all the entities they haul into * the picture (64 bit blocks, logical file record numbers, etc..). */ -#define MTIOCRDSPOS _IOR('m', 5, u_int32_t) /* get logical blk addr */ -#define MTIOCRDHPOS _IOR('m', 6, u_int32_t) /* get hardware blk addr */ -#define MTIOCSLOCATE _IOW('m', 5, u_int32_t) /* seek to logical blk addr */ -#define MTIOCHLOCATE _IOW('m', 6, u_int32_t) /* seek to hardware blk addr */ +#define MTIOCRDSPOS _IOR('m', 5, uint32_t) /* get logical blk addr */ +#define MTIOCRDHPOS _IOR('m', 6, uint32_t) /* get hardware blk addr */ +#define MTIOCSLOCATE _IOW('m', 5, uint32_t) /* seek to logical blk addr */ +#define MTIOCHLOCATE _IOW('m', 6, uint32_t) /* seek to hardware blk addr */ #define MTIOCERRSTAT _IOR('m', 7, union mterrstat) /* get tape errors */ /* * Set EOT model- argument is number of filemarks to end a tape with. * Note that not all possible values will be accepted. */ -#define MTIOCSETEOTMODEL _IOW('m', 8, u_int32_t) +#define MTIOCSETEOTMODEL _IOW('m', 8, uint32_t) /* Get current EOT model */ -#define MTIOCGETEOTMODEL _IOR('m', 8, u_int32_t) +#define MTIOCGETEOTMODEL _IOR('m', 8, uint32_t) #ifndef _KERNEL #define DEFTAPE "/dev/nsa0" Modified: stable/9/share/man/man4/natm.4 ============================================================================== --- stable/9/share/man/man4/natm.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/natm.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -23,11 +23,11 @@ The NATM layer uses a to specify a virtual circuit: .Bd -literal -offset indent struct sockaddr_natm { - u_int8_t snatm_len; /* length */ - u_int8_t snatm_family; /* AF_NATM */ + uint8_t snatm_len; /* length */ + uint8_t snatm_family; /* AF_NATM */ char snatm_if[IFNAMSIZ]; /* interface name */ - u_int16_t snatm_vci; /* vci */ - u_int8_t snatm_vpi; /* vpi */ + uint16_t snatm_vci; /* vci */ + uint8_t snatm_vpi; /* vpi */ }; .Ed .Pp Modified: stable/9/share/man/man4/net80211.4 ============================================================================== --- stable/9/share/man/man4/net80211.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/net80211.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -64,7 +64,7 @@ This structure is defined as follows: .Bd -literal struct ieee80211req { char i_name[IFNAMSIZ]; /* if_name, e.g. "wi0" */ - u_int16_t i_type; /* req type */ + uint16_t i_type; /* req type */ int16_t i_val; /* Index or simple value */ int16_t i_len; /* Index or simple value */ void *i_data; /* Extra data */ Modified: stable/9/share/man/man4/ng_async.4 ============================================================================== --- stable/9/share/man/man4/ng_async.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_async.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -118,9 +118,9 @@ Sets the node configuration, which is de .Bd -literal -offset 4n struct ng_async_cfg { u_char enabled; /* Turn encoding on/off */ - u_int16_t amru; /* Max receive async frame len */ - u_int16_t smru; /* Max receive sync frame len */ - u_int32_t accm; /* ACCM encoding */ + uint16_t amru; /* Max receive async frame len */ + uint16_t smru; /* Max receive sync frame len */ + uint32_t accm; /* ACCM encoding */ }; .Ed .Pp Modified: stable/9/share/man/man4/ng_bridge.4 ============================================================================== --- stable/9/share/man/man4/ng_bridge.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_bridge.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -108,9 +108,9 @@ as an argument: struct ng_bridge_config { u_char ipfw[NG_BRIDGE_MAX_LINKS]; /* enable ipfw */ u_char debugLevel; /* debug level */ - u_int32_t loopTimeout; /* link loopback mute time */ - u_int32_t maxStaleness; /* max host age before nuking */ - u_int32_t minStableAge; /* min time for a stable host */ + uint32_t loopTimeout; /* link loopback mute time */ + uint32_t maxStaleness; /* max host age before nuking */ + uint32_t minStableAge; /* min time for a stable host */ }; .Ed .Pp @@ -155,20 +155,20 @@ currently connected: .Bd -literal -offset 0n /* Statistics structure (one for each link) */ struct ng_bridge_link_stats { - u_int64_t recvOctets; /* total octets rec'd on link */ - u_int64_t recvPackets; /* total pkts rec'd on link */ - u_int64_t recvMulticasts; /* multicast pkts rec'd on link */ - u_int64_t recvBroadcasts; /* broadcast pkts rec'd on link */ - u_int64_t recvUnknown; /* pkts rec'd with unknown dest addr */ - u_int64_t recvRunts; /* pkts rec'd less than 14 bytes */ - u_int64_t recvInvalid; /* pkts rec'd with bogus source addr */ - u_int64_t xmitOctets; /* total octets xmit'd on link */ - u_int64_t xmitPackets; /* total pkts xmit'd on link */ - u_int64_t xmitMulticasts; /* multicast pkts xmit'd on link */ - u_int64_t xmitBroadcasts; /* broadcast pkts xmit'd on link */ - u_int64_t loopDrops; /* pkts dropped due to loopback */ - u_int64_t loopDetects; /* number of loop detections */ - u_int64_t memoryFailures; /* times couldn't get mem or mbuf */ + uint64_t recvOctets; /* total octets rec'd on link */ + uint64_t recvPackets; /* total pkts rec'd on link */ + uint64_t recvMulticasts; /* multicast pkts rec'd on link */ + uint64_t recvBroadcasts; /* broadcast pkts rec'd on link */ + uint64_t recvUnknown; /* pkts rec'd with unknown dest addr */ + uint64_t recvRunts; /* pkts rec'd less than 14 bytes */ + uint64_t recvInvalid; /* pkts rec'd with bogus source addr */ + uint64_t xmitOctets; /* total octets xmit'd on link */ + uint64_t xmitPackets; /* total pkts xmit'd on link */ + uint64_t xmitMulticasts; /* multicast pkts xmit'd on link */ + uint64_t xmitBroadcasts; /* broadcast pkts xmit'd on link */ + uint64_t loopDrops; /* pkts dropped due to loopback */ + uint64_t loopDetects; /* number of loop detections */ + uint64_t memoryFailures; /* times couldn't get mem or mbuf */ }; .Ed .It Dv NGM_BRIDGE_CLR_STATS Modified: stable/9/share/man/man4/ng_btsocket.4 ============================================================================== --- stable/9/share/man/man4/ng_btsocket.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_btsocket.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -154,7 +154,7 @@ The Bluetooth L2CAP socket address is de struct sockaddr_l2cap { u_char l2cap_len; /* total length */ u_char l2cap_family; /* address family */ - u_int16_t l2cap_psm; /* Protocol/Service Multiplexor */ + uint16_t l2cap_psm; /* Protocol/Service Multiplexor */ bdaddr_t l2cap_bdaddr; /* address */ }; .Ed @@ -272,7 +272,7 @@ struct sockaddr_rfcomm { u_char rfcomm_len; /* total length */ u_char rfcomm_family; /* address family */ bdaddr_t rfcomm_bdaddr; /* address */ - u_int8_t rfcomm_channel; /* channel */ + uint8_t rfcomm_channel; /* channel */ }; .Ed .Ss Dv SOCK_STREAM Ss RFCOMM sockets Modified: stable/9/share/man/man4/ng_car.4 ============================================================================== --- stable/9/share/man/man4/ng_car.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_car.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -123,15 +123,15 @@ Return current node configuration as .Vt "struct ng_car_bulkconf" .Bd -literal struct ng_car_hookconf { - u_int64_t cbs; /* Committed burst size */ - u_int64_t ebs; /* Exceeded/Peak burst size */ - u_int64_t cir; /* Committed information rate */ - u_int64_t pir; /* Peak information rate */ - u_int8_t green_action; /* Action for green packets */ - u_int8_t yellow_action; /* Action for yellow packets */ - u_int8_t red_action; /* Action for red packets */ - u_int8_t mode; /* operation mode */ - u_int8_t opt; /* mode options */ + uint64_t cbs; /* Committed burst size */ + uint64_t ebs; /* Exceeded/Peak burst size */ + uint64_t cir; /* Committed information rate */ + uint64_t pir; /* Peak information rate */ + uint8_t green_action; /* Action for green packets */ + uint8_t yellow_action; /* Action for yellow packets */ + uint8_t red_action; /* Action for red packets */ + uint8_t mode; /* operation mode */ + uint8_t opt; /* mode options */ }; /* possible actions (..._action) */ @@ -161,12 +161,12 @@ Return node statistics as .Vt "struct ng_car_bulkstats" .Bd -literal struct ng_car_hookstats { - u_int64_t passed_pkts; - u_int64_t droped_pkts; - u_int64_t green_pkts; - u_int64_t yellow_pkts; - u_int64_t red_pkts; - u_int64_t errors; + uint64_t passed_pkts; + uint64_t droped_pkts; + uint64_t green_pkts; + uint64_t yellow_pkts; + uint64_t red_pkts; + uint64_t errors; }; struct ng_car_bulkstats { Modified: stable/9/share/man/man4/ng_ccatm.4 ============================================================================== --- stable/9/share/man/man4/ng_ccatm.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_ccatm.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -110,7 +110,7 @@ The interface on these hooks is defined and uses a structure .Bd -literal struct ccatm_op { - u_int32_t op; /* request code */ + uint32_t op; /* request code */ u_char data[]; /* optional data */ }; .Ed @@ -230,7 +230,7 @@ struct ngm_ccatm_get_addresses { struct ngm_ccatm_address_req addr[0]; }; struct ngm_ccatm_address_req { - u_int32_t port; + uint32_t port; struct uni_addr addr; }; .Ed Modified: stable/9/share/man/man4/ng_cisco.4 ============================================================================== --- stable/9/share/man/man4/ng_cisco.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_cisco.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -148,8 +148,8 @@ Returns a .Dv "struct ngciscostat" : .Bd -literal -offset 4n struct ngciscostat { - u_int32_t seq_retries; /* # unack'd retries */ - u_int32_t keepalive_period; /* in seconds */ + uint32_t seq_retries; /* # unack'd retries */ + uint32_t keepalive_period; /* in seconds */ }; .Ed .El Modified: stable/9/share/man/man4/ng_etf.4 ============================================================================== --- stable/9/share/man/man4/ng_etf.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_etf.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -102,7 +102,7 @@ are specified in a structure of type .Bd -literal -offset 4n struct ng_etffilter { char matchhook[NG_HOOKSIZ]; /* hook name */ - u_int16_t ethertype; /* catch these */ + uint16_t ethertype; /* catch these */ }; .Ed .El Modified: stable/9/share/man/man4/ng_hci.4 ============================================================================== --- stable/9/share/man/man4/ng_hci.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_hci.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -133,9 +133,9 @@ The next sections specify the HCI packet .Bd -literal -offset indent #define NG_HCI_CMD_PKT 0x01 typedef struct { - u_int8_t type; /* MUST be 0x1 */ - u_int16_t opcode; /* OpCode */ - u_int8_t length; /* parameter(s) length in bytes */ + uint8_t type; /* MUST be 0x1 */ + uint16_t opcode; /* OpCode */ + uint8_t length; /* parameter(s) length in bytes */ } __attribute__ ((packed)) ng_hci_cmd_pkt_t; .Ed .Pp @@ -156,9 +156,9 @@ Controller to the Host. .Bd -literal -offset indent #define NG_HCI_EVENT_PKT 0x04 typedef struct { - u_int8_t type; /* MUST be 0x4 */ - u_int8_t event; /* event */ - u_int8_t length; /* parameter(s) length in bytes */ + uint8_t type; /* MUST be 0x4 */ + uint8_t event; /* event */ + uint8_t length; /* parameter(s) length in bytes */ } __attribute__ ((packed)) ng_hci_event_pkt_t; .Ed .Pp @@ -168,9 +168,9 @@ when events occur. .Bd -literal -offset indent #define NG_HCI_ACL_DATA_PKT 0x02 typedef struct { - u_int8_t type; /* MUST be 0x2 */ - u_int16_t con_handle; /* connection handle + PB + BC flags */ - u_int16_t length; /* payload length in bytes */ + uint8_t type; /* MUST be 0x2 */ + uint16_t con_handle; /* connection handle + PB + BC flags */ + uint16_t length; /* payload length in bytes */ } __attribute__ ((packed)) ng_hci_acldata_pkt_t; .Ed .Pp @@ -180,9 +180,9 @@ Host Controller. .Bd -literal -offset indent #define NG_HCI_SCO_DATA_PKT 0x03 typedef struct { - u_int8_t type; /* MUST be 0x3 */ - u_int16_t con_handle; /* connection handle + reserved bits */ - u_int8_t length; /* payload length in bytes */ + uint8_t type; /* MUST be 0x3 */ + uint16_t con_handle; /* connection handle + reserved bits */ + uint8_t length; /* payload length in bytes */ } __attribute__ ((packed)) ng_hci_scodata_pkt_t; .Ed .Pp @@ -216,9 +216,9 @@ Netgraph message defined as follows. .Bd -literal -offset indent #define NGM_HCI_NODE_UP 112 /* HCI -> Upper */ typedef struct { - u_int16_t pkt_size; /* max. ACL/SCO packet size (w/o hdr) */ - u_int16_t num_pkts; /* ACL/SCO packet queue size */ - u_int16_t reserved; /* place holder */ + uint16_t pkt_size; /* max. ACL/SCO packet size (w/o hdr) */ + uint16_t num_pkts; /* ACL/SCO packet queue size */ + uint16_t reserved; /* place holder */ bdaddr_t bdaddr; /* bdaddr */ } ng_hci_node_up_ep; .Ed @@ -244,8 +244,8 @@ Netgraph message is defined as follows. .Bd -literal -offset indent #define NGM_HCI_SYNC_CON_QUEUE 113 /* HCI -> Upper */ typedef struct { - u_int16_t con_handle; /* connection handle */ - u_int16_t completed; /* number of completed packets */ + uint16_t con_handle; /* connection handle */ + uint16_t completed; /* number of completed packets */ } ng_hci_sync_con_queue_ep; .Ed .Sh HOOKS Modified: stable/9/share/man/man4/ng_l2cap.4 ============================================================================== --- stable/9/share/man/man4/ng_l2cap.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_l2cap.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -310,9 +310,9 @@ appropriate upstream hook and must be pr .Bd -literal -offset indent /* L2CA data packet header */ typedef struct { - u_int32_t token; /* token to use in L2CAP_L2CA_WRITE */ - u_int16_t length; /* length of the data */ - u_int16_t lcid; /* local channel ID */ + uint32_t token; /* token to use in L2CAP_L2CA_WRITE */ + uint16_t length; /* length of the data */ + uint16_t lcid; /* local channel ID */ } __attribute__ ((packed)) ng_l2cap_l2ca_hdr_t; .Ed .Pp Modified: stable/9/share/man/man4/ng_l2tp.4 ============================================================================== --- stable/9/share/man/man4/ng_l2tp.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_l2tp.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -115,11 +115,11 @@ as an argument: struct ng_l2tp_config { u_char enabled; /* enables traffic flow */ u_char match_id; /* tunnel id must match 'tunnel_id' */ - u_int16_t tunnel_id; /* local tunnel id */ - u_int16_t peer_id; /* peer's tunnel id */ - u_int16_t peer_win; /* peer's max recv window size */ - u_int16_t rexmit_max; /* max retransmits before failure */ - u_int16_t rexmit_max_to; /* max delay between retransmits */ + uint16_t tunnel_id; /* local tunnel id */ + uint16_t peer_id; /* peer's tunnel id */ + uint16_t peer_win; /* peer's max recv window size */ + uint16_t rexmit_max; /* max retransmits before failure */ + uint16_t rexmit_max_to; /* max delay between retransmits */ }; .Ed .Pp @@ -197,8 +197,8 @@ The argument is a .Bd -literal /* Configuration for a session hook */ struct ng_l2tp_sess_config { - u_int16_t session_id; /* local session id */ - u_int16_t peer_id; /* peer's session id */ + uint16_t session_id; /* local session id */ + uint16_t peer_id; /* peer's session id */ u_char control_dseq; /* we control data sequencing? */ u_char enable_dseq; /* enable data sequencing? */ u_char include_length; /* include length field? */ Modified: stable/9/share/man/man4/ng_mppc.4 ============================================================================== --- stable/9/share/man/man4/ng_mppc.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_mppc.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -106,7 +106,7 @@ as an argument: /* Configuration for a session */ struct ng_mppc_config { u_char enable; /* enable */ - u_int32_t bits; /* config bits */ + uint32_t bits; /* config bits */ u_char startkey[MPPE_KEY_LEN]; /* start key */ }; Modified: stable/9/share/man/man4/ng_one2many.4 ============================================================================== --- stable/9/share/man/man4/ng_one2many.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_one2many.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -156,8 +156,8 @@ as the control message argument: .Bd -literal /* Node configuration structure */ struct ng_one2many_config { - u_int32_t xmitAlg; /* how to distribute packets */ - u_int32_t failAlg; /* how to detect link failure */ + uint32_t xmitAlg; /* how to distribute packets */ + uint32_t failAlg; /* how to detect link failure */ u_char enabledLinks[NG_ONE2MANY_MAX_LINKS]; }; .Ed @@ -187,10 +187,10 @@ link, which may or may not be currently .Bd -literal /* Statistics structure (one for each link) */ struct ng_one2many_link_stats { - u_int64_t recvOctets; /* total octets rec'd on link */ - u_int64_t recvPackets; /* total pkts rec'd on link */ - u_int64_t xmitOctets; /* total octets xmit'd on link */ - u_int64_t xmitPackets; /* total pkts xmit'd on link */ + uint64_t recvOctets; /* total octets rec'd on link */ + uint64_t recvPackets; /* total pkts rec'd on link */ + uint64_t xmitOctets; /* total octets xmit'd on link */ + uint64_t xmitPackets; /* total pkts xmit'd on link */ }; .Ed .Pp Modified: stable/9/share/man/man4/ng_ppp.4 ============================================================================== --- stable/9/share/man/man4/ng_ppp.4 Sun Nov 15 21:16:13 2015 (r290886) +++ stable/9/share/man/man4/ng_ppp.4 Sun Nov 15 21:27:50 2015 (r290887) @@ -357,14 +357,14 @@ struct ng_ppp_link_conf { u_char enableLink; /* enable this link */ u_char enableProtoComp;/* enable protocol field compression */ u_char enableACFComp; /* enable addr/ctrl field compression */ - u_int16_t mru; /* peer MRU */ - u_int32_t latency; /* link latency (in milliseconds) */ - u_int32_t bandwidth; /* link bandwidth (in bytes/second) */ + uint16_t mru; /* peer MRU */ + uint32_t latency; /* link latency (in milliseconds) */ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable-9@freebsd.org Sun Nov 15 21:41:53 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B231A2F870; Sun, 15 Nov 2015 21:41:53 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BD331F30; Sun, 15 Nov 2015 21:41:53 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFLfqDU014202; Sun, 15 Nov 2015 21:41:52 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFLfpmh014190; Sun, 15 Nov 2015 21:41:51 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511152141.tAFLfpmh014190@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 15 Nov 2015 21:41:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290888 - in stable/9: sbin/camcontrol sbin/kldload sbin/newfs share/man/man3 share/man/man4 usr.sbin/bluetooth/l2ping usr.sbin/ctladm usr.sbin/makefs usr.sbin/mptutil usr.sbin/services... X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 21:41:53 -0000 Author: ngie Date: Sun Nov 15 21:41:51 2015 New Revision: 290888 URL: https://svnweb.freebsd.org/changeset/base/290888 Log: MFstable/10 r249373: r249373 (by joel): Remove contractions. Command used: $ svn merge --accept mine-full -c r249373 ^/stable/10 Conflicts: share/man/man9/locking.9 share/man/man9/zone.9 usr.bin/patch Modified: stable/9/sbin/camcontrol/camcontrol.8 stable/9/sbin/kldload/kldload.8 stable/9/sbin/newfs/newfs.8 stable/9/share/man/man3/fpgetround.3 stable/9/share/man/man4/ng_tag.4 stable/9/share/man/man4/sdhci.4 stable/9/usr.sbin/bluetooth/l2ping/l2ping.8 stable/9/usr.sbin/ctladm/ctladm.8 stable/9/usr.sbin/makefs/makefs.8 stable/9/usr.sbin/mptutil/mptutil.8 stable/9/usr.sbin/services_mkdb/services_mkdb.8 Directory Properties: stable/9/ (props changed) stable/9/sbin/ (props changed) stable/9/sbin/camcontrol/ (props changed) stable/9/sbin/kldload/ (props changed) stable/9/sbin/newfs/ (props changed) stable/9/share/ (props changed) stable/9/share/man/ (props changed) stable/9/share/man/man3/ (props changed) stable/9/share/man/man4/ (props changed) stable/9/share/man/man9/ (props changed) stable/9/usr.bin/ (props changed) stable/9/usr.sbin/ (props changed) stable/9/usr.sbin/ctladm/ (props changed) stable/9/usr.sbin/makefs/ (props changed) stable/9/usr.sbin/mptutil/ (props changed) stable/9/usr.sbin/services_mkdb/ (props changed) Modified: stable/9/sbin/camcontrol/camcontrol.8 ============================================================================== --- stable/9/sbin/camcontrol/camcontrol.8 Sun Nov 15 21:27:50 2015 (r290887) +++ stable/9/sbin/camcontrol/camcontrol.8 Sun Nov 15 21:41:51 2015 (r290888) @@ -401,7 +401,7 @@ There are a couple of options to modify .It Fl c Just print out a count of LUNs, not the actual LUN numbers. .It Fl l -Just print out the LUNs, and don't print out the count. +Just print out the LUNs, and do not print out the count. .It Fl r Ar reporttype Specify the type of report to request from the target: .Bl -tag -width 012345678 Modified: stable/9/sbin/kldload/kldload.8 ============================================================================== --- stable/9/sbin/kldload/kldload.8 Sun Nov 15 21:27:50 2015 (r290887) +++ stable/9/sbin/kldload/kldload.8 Sun Nov 15 21:41:51 2015 (r290888) @@ -63,7 +63,7 @@ in the current directory. The following options are available: .Bl -tag -width indent .It Fl n -Don't try to load module if already loaded. +Do not try to load module if already loaded. .It Fl v Be more verbose. .It Fl q Modified: stable/9/sbin/newfs/newfs.8 ============================================================================== --- stable/9/sbin/newfs/newfs.8 Sun Nov 15 21:27:50 2015 (r290887) +++ stable/9/sbin/newfs/newfs.8 Sun Nov 15 21:41:51 2015 (r290888) @@ -226,7 +226,7 @@ See for more details on how to set this option. .It Fl p Ar partition The partition name (a..h) you want to use in case the underlying image -is a file, so you don't have access to individual partitions through the +is a file, so you do not have access to individual partitions through the filesystem. Can also be used with a device, e.g. .Nm Modified: stable/9/share/man/man3/fpgetround.3 ============================================================================== --- stable/9/share/man/man3/fpgetround.3 Sun Nov 15 21:27:50 2015 (r290887) +++ stable/9/share/man/man3/fpgetround.3 Sun Nov 15 21:41:51 2015 (r290888) @@ -164,7 +164,7 @@ and .Fn fpsetprec functions provide functionality unavailable on many platforms. At present, they are implemented only on the i386 and amd64 platforms. -Changing precision isn't a supported feature: +Changing precision is not a supported feature: it may be ineffective when code is compiled to take advantage of SSE, and many library functions and compiler optimizations depend upon the default precision for correct behavior. Modified: stable/9/share/man/man4/ng_tag.4 ============================================================================== --- stable/9/share/man/man4/ng_tag.4 Sun Nov 15 21:27:50 2015 (r290887) +++ stable/9/share/man/man4/ng_tag.4 Sun Nov 15 21:41:51 2015 (r290888) @@ -284,7 +284,7 @@ ngctl msg ngdc: sethookout { thisHook=\e tag_id=412 } .Ed .Pp -Don't forget to program +Do not forget to program .Xr ng_bpf 4 .Dq Li ipfw hook with the above expression (see Modified: stable/9/share/man/man4/sdhci.4 ============================================================================== --- stable/9/share/man/man4/sdhci.4 Sun Nov 15 21:27:50 2015 (r290887) +++ stable/9/share/man/man4/sdhci.4 Sun Nov 15 21:41:51 2015 (r290888) @@ -83,4 +83,4 @@ TI PCIXX21/XX11 Many of existing SD controller chips have some nonstandard requirements, proprietary registers and hardware bugs, requiring additional handling. ENE chips are handled to work fine, while some revisions of RICOH and TI -controllers still don't see cards without some additional initialization. +controllers still do not see cards without some additional initialization. Modified: stable/9/usr.sbin/bluetooth/l2ping/l2ping.8 ============================================================================== --- stable/9/usr.sbin/bluetooth/l2ping/l2ping.8 Sun Nov 15 21:27:50 2015 (r290887) +++ stable/9/usr.sbin/bluetooth/l2ping/l2ping.8 Sun Nov 15 21:41:51 2015 (r290888) @@ -63,7 +63,7 @@ If this option is not specified, .Nm will operate until interrupted. .It Fl f -Don't wait between sending each packet. +Do not wait between sending each packet. .It Fl h Display usage message and exit. .It Fl i Ar wait Modified: stable/9/usr.sbin/ctladm/ctladm.8 ============================================================================== --- stable/9/usr.sbin/ctladm/ctladm.8 Sun Nov 15 21:27:50 2015 (r290887) +++ stable/9/usr.sbin/ctladm/ctladm.8 Sun Nov 15 21:41:51 2015 (r290888) @@ -488,7 +488,7 @@ cache for the entire LUN. .It Fl r Specify relative addressing for the starting LBA. CTL does not support relative addressing, since it only works for linked commands, and CTL -doesn't support linked commands. +does not support linked commands. .It Fl i Tell the target to return status immediately after issuing the SYHCHRONIZE CACHE command rather than waiting for the cache to finish syncing. CTL does not Modified: stable/9/usr.sbin/makefs/makefs.8 ============================================================================== --- stable/9/usr.sbin/makefs/makefs.8 Sun Nov 15 21:27:50 2015 (r290887) +++ stable/9/usr.sbin/makefs/makefs.8 Sun Nov 15 21:41:51 2015 (r290888) @@ -339,7 +339,7 @@ Load a generic boot image into the first .It Sy hard-disk-boot Boot image is a hard disk image. .It Sy keep-bad-images -Don't throw away images whose write was aborted due to an error. +Do not throw away images whose write was aborted due to an error. For debugging purposes. .It Sy label Label name of the image. Modified: stable/9/usr.sbin/mptutil/mptutil.8 ============================================================================== --- stable/9/usr.sbin/mptutil/mptutil.8 Sun Nov 15 21:27:50 2015 (r290887) +++ stable/9/usr.sbin/mptutil/mptutil.8 Sun Nov 15 21:41:51 2015 (r290888) @@ -196,7 +196,7 @@ If any hot spare drives are configured, Lists all of the physical drives attached to the controller. .It Cm show events Display all the entries from the controller's event log. -Due to lack of documentation this command isn't very useful currently and +Due to lack of documentation this command is not very useful currently and just dumps each log entry in hex. .It Cm show volumes Lists all of the logical volumes managed by the controller. @@ -389,7 +389,7 @@ The mpt version 1 API that is used by .Nm and .Xr mpt 4 -doesn't support volumes above two terabytes. +does not support volumes above two terabytes. This is a limitation of the API. If you are using this adapter with volumes larger than two terabytes, use the adapter in JBOD mode. Utilize Modified: stable/9/usr.sbin/services_mkdb/services_mkdb.8 ============================================================================== --- stable/9/usr.sbin/services_mkdb/services_mkdb.8 Sun Nov 15 21:27:50 2015 (r290887) +++ stable/9/usr.sbin/services_mkdb/services_mkdb.8 Sun Nov 15 21:41:51 2015 (r290888) @@ -69,7 +69,7 @@ Use little-endian byte order for databas .It Fl o Ar database Put the output databases in the named file. .It Fl q -Don't warn about duplicate services. +Do not warn about duplicate services. .It Fl u Print the services file to stdout, omitting duplicate entries and comments. .El From owner-svn-src-stable-9@freebsd.org Sun Nov 15 21:44:12 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 517B3A2F91F; Sun, 15 Nov 2015 21:44:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 11CC5114C; Sun, 15 Nov 2015 21:44:12 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFLiBxM014503; Sun, 15 Nov 2015 21:44:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFLiBBk014502; Sun, 15 Nov 2015 21:44:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511152144.tAFLiBBk014502@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 15 Nov 2015 21:44:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290889 - stable/9/usr.sbin/makefs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 21:44:12 -0000 Author: ngie Date: Sun Nov 15 21:44:10 2015 New Revision: 290889 URL: https://svnweb.freebsd.org/changeset/base/290889 Log: MFstable/10 r290882,r290884,r290885: r290882: MFC r290260,r290262: r290260: Document undocumented long options for -t cd9660 Note which options have been implemented and which options haven't been implemented Submitted as the following NetBSD PRs: bin/50390 and bin/50392 Sponsored by: EMC / Isilon Storage Division r290262: Fix spelling of `isolevel` cd9660 option Sponsored by: EMC / Isilon Storage Division r290884: MFC r290259,r290601: r290259: Sync makefs(8) content a bit with src/usr.sbin/makefs/makefs.8@1.53 Sections involving unimplemented filesystems (chfs, msdosfs, udf, v7fs) and options have been omitted. Obtained from: NetBSD Sponsored by: EMC / Isilon Storage Division r290601: Follow up to r290259 dealing with makefs(8) - Don't use contractions (don't -> do not) - Change "throw away" to "discard" when describing the -o keep-bad-images option - Revert author e-mail split I brought over from NetBSD, effectively reverting the change bapt made in r267668 Submitted by: bjk Sponsored by: EMC / Isilon Storage Division r290885: Bump .Dd Modified: stable/9/usr.sbin/makefs/makefs.8 Directory Properties: stable/9/ (props changed) stable/9/usr.sbin/ (props changed) stable/9/usr.sbin/makefs/ (props changed) Modified: stable/9/usr.sbin/makefs/makefs.8 ============================================================================== --- stable/9/usr.sbin/makefs/makefs.8 Sun Nov 15 21:41:51 2015 (r290888) +++ stable/9/usr.sbin/makefs/makefs.8 Sun Nov 15 21:44:10 2015 (r290889) @@ -35,7 +35,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 29, 2015 +.Dd November 15, 2015 .Dt MAKEFS 8 .Os .Sh NAME @@ -44,10 +44,10 @@ .Sh SYNOPSIS .Nm .Op Fl DxZ -.Op Fl B Ar byte-order +.Op Fl B Ar endian .Op Fl b Ar free-blocks .Op Fl d Ar debug-mask -.Op Fl F Ar specfile +.Op Fl F Ar mtree-specfile .Op Fl f Ar free-files .Op Fl M Ar minimum-size .Op Fl m Ar maximum-size @@ -69,9 +69,9 @@ from the directory tree .Ar directory or from the mtree manifest .Ar manifest . -If optional directory tree +If any optional directory trees are passed in the .Ar extra-directory -is passed, then the directory tree of each argument will be merged +arguments, then the directory tree of each argument will be merged into the .Ar directory or @@ -82,9 +82,9 @@ No special devices or privileges are req .Pp The options are as follows: .Bl -tag -width flag -.It Fl B Ar byte-order +.It Fl B Ar endian Set the byte order of the image to -.Ar byte-order . +.Ar endian . Valid byte orders are .Ql 4321 , .Ql big , @@ -114,9 +114,9 @@ Enable various levels of debugging, depe set in .Ar debug-mask . XXX: document these -.It Fl F Ar specfile +.It Fl F Ar mtree-specfile Use -.Ar specfile +.Ar mtree-specfile as an .Xr mtree 8 .Sq specfile @@ -174,13 +174,13 @@ Set the maximum size of the file system .Ar maximum-size . An error will be raised if the target file system needs to be larger than this to accommodate the provided directory tree. -.It Fl N Ar dbdir +.It Fl N Ar userdb-dir Use the user database text file .Pa master.passwd and group database text file .Pa group from -.Ar dbdir , +.Ar userdb-dir , rather than using the results from the system's .Xr getpwnam 3 and @@ -226,7 +226,9 @@ ISO 9660 file system. .It Fl x Exclude file system nodes not explicitly listed in the specfile. .It Fl Z -Create the image as a sparse file. +Create a sparse file for +.Sy ffs . +This is useful for virtual machine images. .El .Pp Where sizes are specified, a decimal number of bytes is expected. @@ -301,10 +303,10 @@ The following keywords are supported: .It Sy allow-deep-trees Allow the directory structure to exceed the maximum specified in the spec. -.\" .It Sy allow-illegal-chars -.\" Unknown -.\" .It Sy allow-lowercase -.\" Unknown +.It Sy allow-illegal-chars +Allow illegal characters in filenames. This option is not implemented. +.It Sy allow-lowercase +Allow lowercase characters in filenames. This option is not implemented. .It Sy allow-max-name Allow 37 instead of 33 characters for filenames by omitting the version id. @@ -318,6 +320,8 @@ Use the extension to encode .Tn RISC OS metadata. +.It Sy bootimagedir +Boot image directory. This option is not implemented. .It Sy chrp-boot Write an MBR partition table to the image to allow older CHRP hardware to boot. @@ -338,8 +342,18 @@ or Load a generic boot image into the first 32K of the cd9660 image. .It Sy hard-disk-boot Boot image is a hard disk image. +.It Sy isolevel +An integer representing the ISO 9660 interchange level where +.Dq level +is either +.Ql 1 +or +.Ql 2 . +.Dq level +.Ql 3 +is not implemented. .It Sy keep-bad-images -Do not throw away images whose write was aborted due to an error. +Do not discard images whose write was aborted due to an error. For debugging purposes. .It Sy label Label name of the image. @@ -351,14 +365,16 @@ Boot image is a ElTorito image. .It Sy no-trailing-padding Do not pad the image (apparently Linux needs the padding). -.\" .It Sy omit-trailing-period -.\" Unknown +.It Sy omit-trailing-period +Omit trailing periods in filenames. .It Sy preparer Preparer ID of the image. .It Sy publisher Publisher ID of the image. .It Sy rockridge Use RockRidge extensions (for longer filenames, etc.). +.It Sy verbose +Turns on verbose output. .It Sy volumeid Volume set identifier of the image. .El @@ -372,9 +388,8 @@ The utility appeared in .Nx 1.6 . .Sh AUTHORS -.An Luke Mewburn -.Aq lukem@NetBSD.org -(original program) +.An Luke Mewburn Aq Mt lukem@NetBSD.org +(original program), .An Daniel Watt , .An Walter Deignan , .An Ryan Gabrys , From owner-svn-src-stable-9@freebsd.org Sun Nov 15 21:58:05 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C706A2FD3A; Sun, 15 Nov 2015 21:58:05 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 513851B0D; Sun, 15 Nov 2015 21:58:05 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAFLw40T018207; Sun, 15 Nov 2015 21:58:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAFLw45N018206; Sun, 15 Nov 2015 21:58:04 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511152158.tAFLw45N018206@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Sun, 15 Nov 2015 21:58:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290891 - stable/9/usr.bin/tar X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Nov 2015 21:58:05 -0000 Author: ngie Date: Sun Nov 15 21:58:04 2015 New Revision: 290891 URL: https://svnweb.freebsd.org/changeset/base/290891 Log: MFstable/10 r290890: MFC r283245: r283245 (by imp): Remove stray DEBUG_FLAGS=-g that snuck in with r184761. Modified: stable/9/usr.bin/tar/Makefile Directory Properties: stable/9/ (props changed) stable/9/usr.bin/ (props changed) stable/9/usr.bin/tar/ (props changed) Modified: stable/9/usr.bin/tar/Makefile ============================================================================== --- stable/9/usr.bin/tar/Makefile Sun Nov 15 21:56:15 2015 (r290890) +++ stable/9/usr.bin/tar/Makefile Sun Nov 15 21:58:04 2015 (r290891) @@ -38,7 +38,6 @@ CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBA CFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe SYMLINKS= bsdtar ${BINDIR}/tar MLINKS= bsdtar.1 tar.1 -DEBUG_FLAGS=-g .PHONY: check test clean-test check test: $(PROG) bsdtar.1.gz From owner-svn-src-stable-9@freebsd.org Tue Nov 17 15:10:26 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8F13BA31FDE; Tue, 17 Nov 2015 15:10:26 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 34D5113B2; Tue, 17 Nov 2015 15:10:26 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAHFAPfk051149; Tue, 17 Nov 2015 15:10:25 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAHFAPKF051148; Tue, 17 Nov 2015 15:10:25 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201511171510.tAHFAPKF051148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 17 Nov 2015 15:10:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290983 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2015 15:10:26 -0000 Author: avg Date: Tue Nov 17 15:10:24 2015 New Revision: 290983 URL: https://svnweb.freebsd.org/changeset/base/290983 Log: MFC r290191: l2arc: do not call trim_map_free() for blocks with zero b_asize The code in this branch has become quite outdated, so the change had to be applied by hand. PR: 203473 Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 17 14:39:33 2015 (r290982) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Tue Nov 17 15:10:24 2015 (r290983) @@ -825,6 +825,19 @@ static void l2arc_decompress_zio(zio_t * enum zio_compress c); static void l2arc_release_cdata_buf(arc_buf_hdr_t *ab); +static void +l2arc_trim(const l2arc_buf_hdr_t *l2hdr) +{ + ASSERT(MUTEX_HELD(&l2arc_buflist_mtx)); + + if (l2hdr->b_asize != 0) { + trim_map_free(l2hdr->b_dev->l2ad_vdev, l2hdr->b_daddr, + l2hdr->b_asize, 0); + } else { + ASSERT3U(l2hdr->b_compress, ==, ZIO_COMPRESS_EMPTY); + } +} + static uint64_t buf_hash(uint64_t spa, const dva_t *dva, uint64_t birth) { @@ -1739,8 +1752,7 @@ arc_hdr_destroy(arc_buf_hdr_t *hdr) } if (l2hdr != NULL) { - trim_map_free(l2hdr->b_dev->l2ad_vdev, l2hdr->b_daddr, - l2hdr->b_asize, 0); + l2arc_trim(l2hdr); list_remove(l2hdr->b_dev->l2ad_buflist, hdr); ARCSTAT_INCR(arcstat_l2_size, -hdr->b_size); ARCSTAT_INCR(arcstat_l2_asize, -l2hdr->b_asize); @@ -3674,8 +3686,7 @@ arc_release(arc_buf_t *buf, void *tag) if (l2hdr) { ARCSTAT_INCR(arcstat_l2_asize, -l2hdr->b_asize); - trim_map_free(l2hdr->b_dev->l2ad_vdev, l2hdr->b_daddr, - l2hdr->b_asize, 0); + l2arc_trim(l2hdr); kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t)); ARCSTAT_INCR(arcstat_l2_size, -buf_size); mutex_exit(&l2arc_buflist_mtx); @@ -4623,8 +4634,7 @@ l2arc_write_done(zio_t *zio) list_remove(buflist, ab); ARCSTAT_INCR(arcstat_l2_asize, -abl2->b_asize); ab->b_l2hdr = NULL; - trim_map_free(abl2->b_dev->l2ad_vdev, abl2->b_daddr, - abl2->b_asize, 0); + l2arc_trim(abl2); kmem_free(abl2, sizeof (l2arc_buf_hdr_t)); ARCSTAT_INCR(arcstat_l2_size, -ab->b_size); } From owner-svn-src-stable-9@freebsd.org Tue Nov 17 15:14:17 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BBF77A30249; Tue, 17 Nov 2015 15:14:17 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8969E1BC2; Tue, 17 Nov 2015 15:14:17 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAHFEGwg053939; Tue, 17 Nov 2015 15:14:16 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAHFEGbm053938; Tue, 17 Nov 2015 15:14:16 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201511171514.tAHFEGbm053938@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 17 Nov 2015 15:14:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290985 - stable/9/tools/tools/zfsboottest X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2015 15:14:17 -0000 Author: avg Date: Tue Nov 17 15:14:16 2015 New Revision: 290985 URL: https://svnweb.freebsd.org/changeset/base/290985 Log: MFC r290451: zfsboottest: build as a 32 bit application Modified: stable/9/tools/tools/zfsboottest/Makefile Directory Properties: stable/9/tools/tools/zfsboottest/ (props changed) Modified: stable/9/tools/tools/zfsboottest/Makefile ============================================================================== --- stable/9/tools/tools/zfsboottest/Makefile Tue Nov 17 15:14:00 2015 (r290984) +++ stable/9/tools/tools/zfsboottest/Makefile Tue Nov 17 15:14:16 2015 (r290985) @@ -16,6 +16,7 @@ CFLAGS= -O1 \ -I. \ -fdiagnostics-show-option \ -W -Wextra -Wno-sign-compare -Wno-unused-parameter +CFLAGS+=-m32 LDADD+= -lmd .if ${MACHINE_CPUARCH} == "amd64" From owner-svn-src-stable-9@freebsd.org Tue Nov 17 15:19:00 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8159CA30380; Tue, 17 Nov 2015 15:19:00 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 47E601E91; Tue, 17 Nov 2015 15:19:00 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAHFIxdb054383; Tue, 17 Nov 2015 15:18:59 GMT (envelope-from avg@FreeBSD.org) Received: (from avg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAHFIxQL054382; Tue, 17 Nov 2015 15:18:59 GMT (envelope-from avg@FreeBSD.org) Message-Id: <201511171518.tAHFIxQL054382@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avg set sender to avg@FreeBSD.org using -f From: Andriy Gapon Date: Tue, 17 Nov 2015 15:18:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290987 - stable/9/tools/tools/zfsboottest X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2015 15:19:00 -0000 Author: avg Date: Tue Nov 17 15:18:59 2015 New Revision: 290987 URL: https://svnweb.freebsd.org/changeset/base/290987 Log: MFC r290452: zfsboottest: catch up with r241289, call zfs_spa_init() for all found pools Modified: stable/9/tools/tools/zfsboottest/zfsboottest.c Directory Properties: stable/9/tools/tools/zfsboottest/ (props changed) Modified: stable/9/tools/tools/zfsboottest/zfsboottest.c ============================================================================== --- stable/9/tools/tools/zfsboottest/zfsboottest.c Tue Nov 17 15:18:52 2015 (r290986) +++ stable/9/tools/tools/zfsboottest/zfsboottest.c Tue Nov 17 15:18:59 2015 (r290987) @@ -136,19 +136,21 @@ main(int argc, char** argv) } } + STAILQ_FOREACH(spa, &zfs_pools, spa_link) { + if (zfs_spa_init(spa)) { + fprintf(stderr, "can't init pool %s\n", spa->spa_name); + exit(1); + } + } + + spa_all_status(); + spa = STAILQ_FIRST(&zfs_pools); if (spa == NULL) { fprintf(stderr, "no pools\n"); exit(1); } - if (zfs_spa_init(spa)) { - fprintf(stderr, "can't init pool\n"); - exit(1); - } - - spa_all_status(); - #if 0 uint64_t rootobj; if (zfs_get_root(spa, &rootobj)) { From owner-svn-src-stable-9@freebsd.org Tue Nov 17 18:22:58 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C3EBA312C8; Tue, 17 Nov 2015 18:22:58 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E143A1120; Tue, 17 Nov 2015 18:22:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAHIMvYA015112; Tue, 17 Nov 2015 18:22:57 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAHIMubH015110; Tue, 17 Nov 2015 18:22:56 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201511171822.tAHIMubH015110@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 17 Nov 2015 18:22:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r290995 - in stable: 10/release/doc/share/xml 9/release/doc/share/xml X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2015 18:22:58 -0000 Author: gjb Date: Tue Nov 17 18:22:56 2015 New Revision: 290995 URL: https://svnweb.freebsd.org/changeset/base/290995 Log: Document EN-15:19.kqueue, EN-15:20.vm, SA-15:25.ntp Sponsored by: The FreeBSD Foundation Modified: stable/9/release/doc/share/xml/errata.xml stable/9/release/doc/share/xml/security.xml Changes in other areas also in this revision: Modified: stable/10/release/doc/share/xml/errata.xml stable/10/release/doc/share/xml/security.xml Modified: stable/9/release/doc/share/xml/errata.xml ============================================================================== --- stable/9/release/doc/share/xml/errata.xml Tue Nov 17 16:46:05 2015 (r290994) +++ stable/9/release/doc/share/xml/errata.xml Tue Nov 17 18:22:56 2015 (r290995) @@ -116,6 +116,22 @@ Implement pubkey support for &man.pkg.7; bootstrap. + + + FreeBSD-EN-15:19.kqueue + 4 November 2015 + &man.kqueue.2; write events never fire for files + larger than 2GB. + + + + FreeBSD-EN-15:20.vm + 4 November 2015 + Applications exiting due to segmentation + violation on a correct memory address. + Modified: stable/9/release/doc/share/xml/security.xml ============================================================================== --- stable/9/release/doc/share/xml/security.xml Tue Nov 17 16:46:05 2015 (r290994) +++ stable/9/release/doc/share/xml/security.xml Tue Nov 17 18:22:56 2015 (r290995) @@ -238,6 +238,13 @@ 29 September 2015 Remote denial of service + + + FreeBSD-SA-15:25.ntp + 26 October 2015 + Multiple vulnerabilities + From owner-svn-src-stable-9@freebsd.org Thu Nov 19 00:19:11 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2617DA32614; Thu, 19 Nov 2015 00:19:11 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BFD2315F4; Thu, 19 Nov 2015 00:19:10 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAJ0J9xd019667; Thu, 19 Nov 2015 00:19:09 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJ0J91R019666; Thu, 19 Nov 2015 00:19:09 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511190019.tAJ0J91R019666@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 19 Nov 2015 00:19:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r291043 - stable/9/usr.sbin/bootparamd/bootparamd X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2015 00:19:11 -0000 Author: ngie Date: Thu Nov 19 00:19:09 2015 New Revision: 291043 URL: https://svnweb.freebsd.org/changeset/base/291043 Log: MFstable/10 r291042: MFC r290645: Fix some trivial warnings with bootparamd/main.c - Convert K&R to something a bit less ancient - Remove an incorrect, duplicate prototype for bootparamprog_1(..) PR: 71667 Submitted by: bcran Sponsored by: EMC / Isilon Storage Division Modified: stable/9/usr.sbin/bootparamd/bootparamd/main.c Directory Properties: stable/9/ (props changed) stable/9/usr.sbin/ (props changed) stable/9/usr.sbin/bootparamd/ (props changed) Modified: stable/9/usr.sbin/bootparamd/bootparamd/main.c ============================================================================== --- stable/9/usr.sbin/bootparamd/bootparamd/main.c Thu Nov 19 00:14:23 2015 (r291042) +++ stable/9/usr.sbin/bootparamd/bootparamd/main.c Thu Nov 19 00:19:09 2015 (r291043) @@ -36,13 +36,10 @@ in_addr_t route_addr = -1; struct sockaddr_in my_addr; char *bootpfile = "/etc/bootparams"; -extern void bootparamprog_1(); static void usage(void); int -main(argc, argv) -int argc; -char **argv; +main(int argc, char **argv) { SVCXPRT *transp; struct hostent *he; @@ -110,7 +107,7 @@ char **argv; } static void -usage() +usage(void) { fprintf(stderr, "usage: bootparamd [-d] [-s] [-r router] [-f bootparmsfile]\n"); From owner-svn-src-stable-9@freebsd.org Thu Nov 19 03:53:33 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7945A31179; Thu, 19 Nov 2015 03:53:33 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A12231788; Thu, 19 Nov 2015 03:53:33 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAJ3rWrR085696; Thu, 19 Nov 2015 03:53:32 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJ3rVqw085686; Thu, 19 Nov 2015 03:53:31 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511190353.tAJ3rVqw085686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 19 Nov 2015 03:53:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r291054 - stable/9/lib/libc/rpc X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2015 03:53:34 -0000 Author: ngie Date: Thu Nov 19 03:53:31 2015 New Revision: 291054 URL: https://svnweb.freebsd.org/changeset/base/291054 Log: MFstable/10 r290899: MFC r290253: Remove unnecessary `if (x)` tests before calling `free(x)`; free(3) already employs this check Sponsored by: EMC / Isilon Storage Division Modified: stable/9/lib/libc/rpc/clnt_bcast.c stable/9/lib/libc/rpc/clnt_vc.c stable/9/lib/libc/rpc/getnetconfig.c stable/9/lib/libc/rpc/mt_misc.c stable/9/lib/libc/rpc/rpc_soc.c stable/9/lib/libc/rpc/rpcb_clnt.c stable/9/lib/libc/rpc/svc.c stable/9/lib/libc/rpc/svc_dg.c stable/9/lib/libc/rpc/svc_simple.c stable/9/lib/libc/rpc/svc_vc.c Directory Properties: stable/9/ (props changed) stable/9/lib/ (props changed) stable/9/lib/libc/ (props changed) Modified: stable/9/lib/libc/rpc/clnt_bcast.c ============================================================================== --- stable/9/lib/libc/rpc/clnt_bcast.c Thu Nov 19 03:11:20 2015 (r291053) +++ stable/9/lib/libc/rpc/clnt_bcast.c Thu Nov 19 03:53:31 2015 (r291054) @@ -631,13 +631,10 @@ rpc_broadcast_exp(prog, vers, proc, xarg } /* The giant for loop */ done_broad: - if (inbuf) - (void) free(inbuf); - if (outbuf) - (void) free(outbuf); + free(inbuf); + free(outbuf); #ifdef PORTMAP - if (outbuf_pmap) - (void) free(outbuf_pmap); + free(outbuf_pmap); #endif /* PORTMAP */ for (i = 0; i < fdlistno; i++) { (void)_close(fdlist[i].fd); Modified: stable/9/lib/libc/rpc/clnt_vc.c ============================================================================== --- stable/9/lib/libc/rpc/clnt_vc.c Thu Nov 19 03:11:20 2015 (r291053) +++ stable/9/lib/libc/rpc/clnt_vc.c Thu Nov 19 03:53:31 2015 (r291054) @@ -666,8 +666,7 @@ clnt_vc_destroy(cl) (void)_close(ct->ct_fd); } XDR_DESTROY(&(ct->ct_xdrs)); - if (ct->ct_addr.buf) - free(ct->ct_addr.buf); + free(ct->ct_addr.buf); mem_free(ct, sizeof(struct ct_data)); if (cl->cl_netid && cl->cl_netid[0]) mem_free(cl->cl_netid, strlen(cl->cl_netid) +1); Modified: stable/9/lib/libc/rpc/getnetconfig.c ============================================================================== --- stable/9/lib/libc/rpc/getnetconfig.c Thu Nov 19 03:11:20 2015 (r291053) +++ stable/9/lib/libc/rpc/getnetconfig.c Thu Nov 19 03:53:31 2015 (r291054) @@ -164,8 +164,7 @@ __nc_error() if ((nc_addr = (int *)thr_getspecific(nc_key)) == NULL) { nc_addr = (int *)malloc(sizeof (int)); if (thr_setspecific(nc_key, (void *) nc_addr) != 0) { - if (nc_addr) - free(nc_addr); + free(nc_addr); return (&nc_error); } *nc_addr = 0; @@ -419,7 +418,7 @@ void *handlep; while (q != NULL) { p = q->next; - if (q->ncp->nc_lookups != NULL) free(q->ncp->nc_lookups); + free(q->ncp->nc_lookups); free(q->ncp); free(q->linep); free(q); @@ -541,8 +540,7 @@ freenetconfigent(netconfigp) { if (netconfigp != NULL) { free(netconfigp->nc_netid); /* holds all netconfigp's strings */ - if (netconfigp->nc_lookups != NULL) - free(netconfigp->nc_lookups); + free(netconfigp->nc_lookups); free(netconfigp); } return; @@ -631,8 +629,7 @@ struct netconfig *ncp; /* where to put r } else { char *cp; /* tmp string */ - if (ncp->nc_lookups != NULL) /* from last visit */ - free(ncp->nc_lookups); + free(ncp->nc_lookups); /* from last visit */ ncp->nc_lookups = NULL; ncp->nc_nlookups = 0; while ((cp = tokenp) != NULL) { Modified: stable/9/lib/libc/rpc/mt_misc.c ============================================================================== --- stable/9/lib/libc/rpc/mt_misc.c Thu Nov 19 03:11:20 2015 (r291053) +++ stable/9/lib/libc/rpc/mt_misc.c Thu Nov 19 03:53:31 2015 (r291054) @@ -106,8 +106,7 @@ __rpc_createerr() rce_addr = (struct rpc_createerr *) malloc(sizeof (struct rpc_createerr)); if (thr_setspecific(rce_key, (void *) rce_addr) != 0) { - if (rce_addr) - free(rce_addr); + free(rce_addr); return (&rpc_createerr); } memset(rce_addr, 0, sizeof (struct rpc_createerr)); Modified: stable/9/lib/libc/rpc/rpc_soc.c ============================================================================== --- stable/9/lib/libc/rpc/rpc_soc.c Thu Nov 19 03:11:20 2015 (r291053) +++ stable/9/lib/libc/rpc/rpc_soc.c Thu Nov 19 03:53:31 2015 (r291054) @@ -472,8 +472,7 @@ clntunix_create(raddr, prog, vers, sockp if ((raddr->sun_len == 0) || ((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) || ((svcaddr->buf = malloc(sizeof(struct sockaddr_un))) == NULL)) { - if (svcaddr != NULL) - free(svcaddr); + free(svcaddr); rpc_createerr.cf_stat = RPC_SYSTEMERROR; rpc_createerr.cf_error.re_errno = errno; return(cl); Modified: stable/9/lib/libc/rpc/rpcb_clnt.c ============================================================================== --- stable/9/lib/libc/rpc/rpcb_clnt.c Thu Nov 19 03:11:20 2015 (r291053) +++ stable/9/lib/libc/rpc/rpcb_clnt.c Thu Nov 19 03:53:31 2015 (r291054) @@ -183,8 +183,7 @@ delete_cache(addr) free(cptr->ac_netid); free(cptr->ac_taddr->buf); free(cptr->ac_taddr); - if (cptr->ac_uaddr) - free(cptr->ac_uaddr); + free(cptr->ac_uaddr); if (prevptr) prevptr->ac_next = cptr->ac_next; else @@ -222,14 +221,10 @@ add_cache(host, netid, taddr, uaddr) ad_cache->ac_taddr->buf = (char *) malloc(taddr->len); if (ad_cache->ac_taddr->buf == NULL) { out: - if (ad_cache->ac_host) - free(ad_cache->ac_host); - if (ad_cache->ac_netid) - free(ad_cache->ac_netid); - if (ad_cache->ac_uaddr) - free(ad_cache->ac_uaddr); - if (ad_cache->ac_taddr) - free(ad_cache->ac_taddr); + free(ad_cache->ac_host); + free(ad_cache->ac_netid); + free(ad_cache->ac_uaddr); + free(ad_cache->ac_taddr); free(ad_cache); return; } @@ -262,8 +257,7 @@ out: free(cptr->ac_netid); free(cptr->ac_taddr->buf); free(cptr->ac_taddr); - if (cptr->ac_uaddr) - free(cptr->ac_uaddr); + free(cptr->ac_uaddr); if (prevptr) { prevptr->ac_next = NULL; @@ -816,10 +810,8 @@ __rpcb_findaddr_timed(program, version, malloc(remote.len)) == NULL)) { rpc_createerr.cf_stat = RPC_SYSTEMERROR; clnt_geterr(client, &rpc_createerr.cf_error); - if (address) { - free(address); - address = NULL; - } + free(address); + address = NULL; goto error; } memcpy(address->buf, remote.buf, remote.len); Modified: stable/9/lib/libc/rpc/svc.c ============================================================================== --- stable/9/lib/libc/rpc/svc.c Thu Nov 19 03:11:20 2015 (r291053) +++ stable/9/lib/libc/rpc/svc.c Thu Nov 19 03:53:31 2015 (r291054) @@ -201,8 +201,7 @@ svc_reg(xprt, prog, vers, dispatch, ncon rwlock_wrlock(&svc_lock); if ((s = svc_find(prog, vers, &prev, netid)) != NULL) { - if (netid) - free(netid); + free(netid); if (s->sc_dispatch == dispatch) goto rpcb_it; /* he is registering another xptr */ rwlock_unlock(&svc_lock); @@ -210,8 +209,7 @@ svc_reg(xprt, prog, vers, dispatch, ncon } s = mem_alloc(sizeof (struct svc_callout)); if (s == NULL) { - if (netid) - free(netid); + free(netid); rwlock_unlock(&svc_lock); return (FALSE); } Modified: stable/9/lib/libc/rpc/svc_dg.c ============================================================================== --- stable/9/lib/libc/rpc/svc_dg.c Thu Nov 19 03:11:20 2015 (r291053) +++ stable/9/lib/libc/rpc/svc_dg.c Thu Nov 19 03:53:31 2015 (r291054) @@ -421,8 +421,7 @@ svc_dg_destroy(xprt) (void) mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen); if (xprt->xp_ltaddr.buf) (void) mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen); - if (xprt->xp_tp) - (void) free(xprt->xp_tp); + free(xprt->xp_tp); svc_xprt_free(xprt); } Modified: stable/9/lib/libc/rpc/svc_simple.c ============================================================================== --- stable/9/lib/libc/rpc/svc_simple.c Thu Nov 19 03:11:20 2015 (r291053) +++ stable/9/lib/libc/rpc/svc_simple.c Thu Nov 19 03:53:31 2015 (r291054) @@ -164,10 +164,8 @@ rpc_reg(prognum, versnum, procnum, progn if (((xdrbuf = malloc((unsigned)recvsz)) == NULL) || ((netid = strdup(nconf->nc_netid)) == NULL)) { warnx(rpc_reg_err, rpc_reg_msg, __no_mem_str); - if (xdrbuf != NULL) - free(xdrbuf); - if (netid != NULL) - free(netid); + free(xdrbuf); + free(netid); SVC_DESTROY(svcxprt); break; } Modified: stable/9/lib/libc/rpc/svc_vc.c ============================================================================== --- stable/9/lib/libc/rpc/svc_vc.c Thu Nov 19 03:11:20 2015 (r291053) +++ stable/9/lib/libc/rpc/svc_vc.c Thu Nov 19 03:53:31 2015 (r291054) @@ -408,10 +408,8 @@ __svc_vc_dodestroy(xprt) mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen); if (xprt->xp_ltaddr.buf) mem_free(xprt->xp_ltaddr.buf, xprt->xp_ltaddr.maxlen); - if (xprt->xp_tp) - free(xprt->xp_tp); - if (xprt->xp_netid) - free(xprt->xp_netid); + free(xprt->xp_tp); + free(xprt->xp_netid); svc_xprt_free(xprt); } From owner-svn-src-stable-9@freebsd.org Thu Nov 19 09:54:30 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31A61A33030; Thu, 19 Nov 2015 09:54:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D8C761D8E; Thu, 19 Nov 2015 09:54:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAJ9sTaH090267; Thu, 19 Nov 2015 09:54:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJ9sSqB090265; Thu, 19 Nov 2015 09:54:28 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201511190954.tAJ9sSqB090265@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Thu, 19 Nov 2015 09:54:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r291063 - stable/9/sys/dev/usb X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2015 09:54:30 -0000 Author: hselasky Date: Thu Nov 19 09:54:28 2015 New Revision: 291063 URL: https://svnweb.freebsd.org/changeset/base/291063 Log: MFC r290489: Add helper function to check if a USB page cache buffer is properly aligned to reduce the use of bounce buffers in PIO mode. Modified: stable/9/sys/dev/usb/usb_busdma.c stable/9/sys/dev/usb/usb_busdma.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/usb_busdma.c ============================================================================== --- stable/9/sys/dev/usb/usb_busdma.c Thu Nov 19 09:52:46 2015 (r291062) +++ stable/9/sys/dev/usb/usb_busdma.c Thu Nov 19 09:54:28 2015 (r291063) @@ -130,6 +130,35 @@ usbd_get_page(struct usb_page_cache *pc, } /*------------------------------------------------------------------------* + * usb_pc_buffer_is_aligned - verify alignment + * + * This function is used to check if a page cache buffer is properly + * aligned to reduce the use of bounce buffers in PIO mode. + *------------------------------------------------------------------------*/ +uint8_t +usb_pc_buffer_is_aligned(struct usb_page_cache *pc, usb_frlength_t offset, + usb_frlength_t len, usb_frlength_t mask) +{ + struct usb_page_search buf_res; + + while (len != 0) { + + usbd_get_page(pc, offset, &buf_res); + + if (buf_res.length > len) + buf_res.length = len; + if (USB_P2U(buf_res.buffer) & mask) + return (0); + if (buf_res.length & mask) + return (0); + + offset += buf_res.length; + len -= buf_res.length; + } + return (1); +} + +/*------------------------------------------------------------------------* * usbd_copy_in - copy directly to DMA-able memory *------------------------------------------------------------------------*/ void Modified: stable/9/sys/dev/usb/usb_busdma.h ============================================================================== --- stable/9/sys/dev/usb/usb_busdma.h Thu Nov 19 09:52:46 2015 (r291062) +++ stable/9/sys/dev/usb/usb_busdma.h Thu Nov 19 09:54:28 2015 (r291063) @@ -157,5 +157,8 @@ void usb_pc_cpu_flush(struct usb_page_ca void usb_pc_cpu_invalidate(struct usb_page_cache *pc); void usb_pc_dmamap_destroy(struct usb_page_cache *pc); void usb_pc_free_mem(struct usb_page_cache *pc); +uint8_t usb_pc_buffer_is_aligned(struct usb_page_cache *pc, + usb_frlength_t offset, usb_frlength_t len, + usb_frlength_t mask); #endif /* _USB_BUSDMA_H_ */ From owner-svn-src-stable-9@freebsd.org Thu Nov 19 10:01:51 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AD5F0A332DB; Thu, 19 Nov 2015 10:01:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7098118F1; Thu, 19 Nov 2015 10:01:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAJA1oco093426; Thu, 19 Nov 2015 10:01:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJA1oOi093424; Thu, 19 Nov 2015 10:01:50 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201511191001.tAJA1oOi093424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Thu, 19 Nov 2015 10:01:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r291066 - in stable/9/sys/dev/usb: . input X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2015 10:01:51 -0000 Author: hselasky Date: Thu Nov 19 10:01:50 2015 New Revision: 291066 URL: https://svnweb.freebsd.org/changeset/base/291066 Log: MFC r290639: Update the wsp driver to support newer touch pads, like found in MacBookPro11,4 and MacBook12,1. This update adds support for the force touch parameter. PR: 204420 Modified: stable/9/sys/dev/usb/input/wsp.c stable/9/sys/dev/usb/usbdevs Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/usb/input/wsp.c ============================================================================== --- stable/9/sys/dev/usb/input/wsp.c Thu Nov 19 10:00:17 2015 (r291065) +++ stable/9/sys/dev/usb/input/wsp.c Thu Nov 19 10:01:50 2015 (r291066) @@ -94,8 +94,8 @@ static struct wsp_tuning { .z_factor = 5, .pressure_touch_threshold = 50, .pressure_untouch_threshold = 10, - .pressure_tap_threshold = 100, - .scr_hor_threshold = 10, + .pressure_tap_threshold = 120, + .scr_hor_threshold = 20, }; static void @@ -122,8 +122,6 @@ SYSCTL_INT(_hw_usb_wsp, OID_AUTO, pressu SYSCTL_INT(_hw_usb_wsp, OID_AUTO, scr_hor_threshold, CTLFLAG_RW, &wsp_tuning.scr_hor_threshold, 0, "horizontal scrolling threshold"); -#define WSP_IFACE_INDEX 1 - /* * Some tables, structures, definitions and constant values for the * touchpad protocol has been copied from Linux's @@ -155,21 +153,30 @@ struct bt_data { enum tp_type { TYPE1, /* plain trackpad */ TYPE2, /* button integrated in trackpad */ - TYPE3 /* additional header fields since June 2013 */ + TYPE3, /* additional header fields since June 2013 */ + TYPE4 /* additional header field for pressure data */ }; /* trackpad finger data offsets, le16-aligned */ #define FINGER_TYPE1 (13 * 2) #define FINGER_TYPE2 (15 * 2) #define FINGER_TYPE3 (19 * 2) +#define FINGER_TYPE4 (23 * 2) /* trackpad button data offsets */ #define BUTTON_TYPE2 15 #define BUTTON_TYPE3 23 +#define BUTTON_TYPE4 31 /* list of device capability bits */ #define HAS_INTEGRATED_BUTTON 1 +/* trackpad finger data block size */ +#define FSIZE_TYPE1 (14 * 2) +#define FSIZE_TYPE2 (14 * 2) +#define FSIZE_TYPE3 (14 * 2) +#define FSIZE_TYPE4 (15 * 2) + /* trackpad finger header - little endian */ struct tp_header { uint8_t flag; @@ -197,9 +204,10 @@ struct tp_finger { int16_t orientation; /* 16384 when point, else 15 bit angle */ int16_t touch_major; /* touch area, major axis */ int16_t touch_minor; /* touch area, minor axis */ - int16_t unused[3]; /* zeros */ + int16_t unused[2]; /* zeros */ + int16_t pressure; /* pressure on forcetouch touchpad */ int16_t multi; /* one finger: varies, more fingers: - * constant */ + * constant */ } __packed; /* trackpad finger data size, empirically at least ten fingers */ @@ -207,7 +215,7 @@ struct tp_finger { #define SIZEOF_FINGER sizeof(struct tp_finger) #define SIZEOF_ALL_FINGERS (MAX_FINGERS * SIZEOF_FINGER) -#if (WSP_BUFFER_MAX < ((MAX_FINGERS * 14 * 2) + FINGER_TYPE3)) +#if (WSP_BUFFER_MAX < ((MAX_FINGERS * FSIZE_TYPE4) + FINGER_TYPE4)) #error "WSP_BUFFER_MAX is too small" #endif @@ -224,6 +232,7 @@ enum { WSP_FLAG_WELLSPRING7, WSP_FLAG_WELLSPRING7A, WSP_FLAG_WELLSPRING8, + WSP_FLAG_WELLSPRING9, WSP_FLAG_MAX, }; @@ -231,69 +240,213 @@ enum { struct wsp_dev_params { uint8_t caps; /* device capability bitmask */ uint8_t tp_type; /* type of trackpad interface */ + uint8_t tp_button; /* offset to button data */ uint8_t tp_offset; /* offset to trackpad finger data */ + uint8_t tp_fsize; /* bytes in single finger block */ + uint8_t tp_delta; /* offset from header to finger struct */ + uint8_t iface_index; + uint8_t um_size; /* usb control message length */ + uint8_t um_req_val; /* usb control message value */ + uint8_t um_req_idx; /* usb control message index */ + uint8_t um_switch_idx; /* usb control message mode switch index */ + uint8_t um_switch_on; /* usb control message mode switch on */ + uint8_t um_switch_off; /* usb control message mode switch off */ }; static const struct wsp_dev_params wsp_dev_params[WSP_FLAG_MAX] = { [WSP_FLAG_WELLSPRING1] = { .caps = 0, .tp_type = TYPE1, + .tp_button = 0, .tp_offset = FINGER_TYPE1, + .tp_fsize = FSIZE_TYPE1, + .tp_delta = 0, + .iface_index = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, }, [WSP_FLAG_WELLSPRING2] = { .caps = 0, .tp_type = TYPE1, + .tp_button = 0, .tp_offset = FINGER_TYPE1, + .tp_fsize = FSIZE_TYPE1, + .tp_delta = 0, + .iface_index = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, }, [WSP_FLAG_WELLSPRING3] = { .caps = HAS_INTEGRATED_BUTTON, .tp_type = TYPE2, + .tp_button = BUTTON_TYPE2, .tp_offset = FINGER_TYPE2, + .tp_fsize = FSIZE_TYPE2, + .tp_delta = 0, + .iface_index = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, }, [WSP_FLAG_WELLSPRING4] = { .caps = HAS_INTEGRATED_BUTTON, .tp_type = TYPE2, + .tp_button = BUTTON_TYPE2, .tp_offset = FINGER_TYPE2, + .tp_fsize = FSIZE_TYPE2, + .tp_delta = 0, + .iface_index = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, }, [WSP_FLAG_WELLSPRING4A] = { .caps = HAS_INTEGRATED_BUTTON, .tp_type = TYPE2, + .tp_button = BUTTON_TYPE2, .tp_offset = FINGER_TYPE2, + .tp_fsize = FSIZE_TYPE2, + .tp_delta = 0, + .iface_index = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, }, [WSP_FLAG_WELLSPRING5] = { .caps = HAS_INTEGRATED_BUTTON, .tp_type = TYPE2, + .tp_button = BUTTON_TYPE2, .tp_offset = FINGER_TYPE2, + .tp_fsize = FSIZE_TYPE2, + .tp_delta = 0, + .iface_index = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, }, [WSP_FLAG_WELLSPRING6] = { .caps = HAS_INTEGRATED_BUTTON, .tp_type = TYPE2, + .tp_button = BUTTON_TYPE2, .tp_offset = FINGER_TYPE2, + .tp_fsize = FSIZE_TYPE2, + .tp_delta = 0, + .iface_index = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, }, [WSP_FLAG_WELLSPRING5A] = { .caps = HAS_INTEGRATED_BUTTON, .tp_type = TYPE2, + .tp_button = BUTTON_TYPE2, .tp_offset = FINGER_TYPE2, + .tp_fsize = FSIZE_TYPE2, + .tp_delta = 0, + .iface_index = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, }, [WSP_FLAG_WELLSPRING6A] = { .caps = HAS_INTEGRATED_BUTTON, .tp_type = TYPE2, + .tp_button = BUTTON_TYPE2, .tp_offset = FINGER_TYPE2, + .tp_fsize = FSIZE_TYPE2, + .tp_delta = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, }, [WSP_FLAG_WELLSPRING7] = { .caps = HAS_INTEGRATED_BUTTON, .tp_type = TYPE2, + .tp_button = BUTTON_TYPE2, .tp_offset = FINGER_TYPE2, + .tp_fsize = FSIZE_TYPE2, + .tp_delta = 0, + .iface_index = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, }, [WSP_FLAG_WELLSPRING7A] = { .caps = HAS_INTEGRATED_BUTTON, .tp_type = TYPE2, + .tp_button = BUTTON_TYPE2, .tp_offset = FINGER_TYPE2, + .tp_fsize = FSIZE_TYPE2, + .tp_delta = 0, + .iface_index = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, }, [WSP_FLAG_WELLSPRING8] = { .caps = HAS_INTEGRATED_BUTTON, .tp_type = TYPE3, + .tp_button = BUTTON_TYPE3, .tp_offset = FINGER_TYPE3, + .tp_fsize = FSIZE_TYPE3, + .tp_delta = 0, + .iface_index = 0, + .um_size = 8, + .um_req_val = 0x03, + .um_req_idx = 0x00, + .um_switch_idx = 0, + .um_switch_on = 0x01, + .um_switch_off = 0x08, + }, + [WSP_FLAG_WELLSPRING9] = { + .caps = HAS_INTEGRATED_BUTTON, + .tp_type = TYPE4, + .tp_button = BUTTON_TYPE4, + .tp_offset = FINGER_TYPE4, + .tp_fsize = FSIZE_TYPE4, + .tp_delta = 2, + .iface_index = 2, + .um_size = 2, + .um_req_val = 0x03, + .um_req_idx = 0x02, + .um_switch_idx = 1, + .um_switch_on = 0x01, + .um_switch_off = 0x00, }, }; @@ -346,7 +499,7 @@ static const STRUCT_USB_HOST_ID wsp_devs WSP_DEV(APPLE, WELLSPRING5A_JIS, WSP_FLAG_WELLSPRING5A), /* MacbookPro10,1 (unibody, June 2012) */ - /* MacbookPro11,? (unibody, June 2013) */ + /* MacbookPro11,1-3 (unibody, June 2013) */ WSP_DEV(APPLE, WELLSPRING7_ANSI, WSP_FLAG_WELLSPRING7), WSP_DEV(APPLE, WELLSPRING7_ISO, WSP_FLAG_WELLSPRING7), WSP_DEV(APPLE, WELLSPRING7_JIS, WSP_FLAG_WELLSPRING7), @@ -360,6 +513,11 @@ static const STRUCT_USB_HOST_ID wsp_devs WSP_DEV(APPLE, WELLSPRING8_ANSI, WSP_FLAG_WELLSPRING8), WSP_DEV(APPLE, WELLSPRING8_ISO, WSP_FLAG_WELLSPRING8), WSP_DEV(APPLE, WELLSPRING8_JIS, WSP_FLAG_WELLSPRING8), + + /* MacbookPro12,1 MacbookPro11,4 */ + WSP_DEV(APPLE, WELLSPRING9_ANSI, WSP_FLAG_WELLSPRING9), + WSP_DEV(APPLE, WELLSPRING9_ISO, WSP_FLAG_WELLSPRING9), + WSP_DEV(APPLE, WELLSPRING9_JIS, WSP_FLAG_WELLSPRING9), }; #define WSP_FIFO_BUF_SIZE 8 /* bytes */ @@ -421,11 +579,6 @@ struct wsp_softc { uint8_t tp_data[WSP_BUFFER_MAX] __aligned(4); /* trackpad transferred data */ }; -typedef enum interface_mode { - RAW_SENSOR_MODE = 0x01, - HID_MODE = 0x08 -} interface_mode; - /* * function prototypes */ @@ -473,14 +626,19 @@ static const struct usb_config wsp_confi }; static usb_error_t -wsp_set_device_mode(struct wsp_softc *sc, interface_mode mode) +wsp_set_device_mode(struct wsp_softc *sc, uint8_t on) { + const struct wsp_dev_params *params = sc->sc_params; uint8_t mode_bytes[8]; usb_error_t err; + /* Type 3 does not require a mode switch */ + if (params->tp_type == TYPE3) + return 0; + err = usbd_req_get_report(sc->sc_usb_device, NULL, - mode_bytes, sizeof(mode_bytes), 0, - 0x03, 0x00); + mode_bytes, params->um_size, params->iface_index, + params->um_req_val, params->um_req_idx); if (err != USB_ERR_NORMAL_COMPLETION) { DPRINTF("Failed to read device mode (%d)\n", err); @@ -495,11 +653,12 @@ wsp_set_device_mode(struct wsp_softc *sc */ pause("WHW", hz / 4); - mode_bytes[0] = mode; + mode_bytes[params->um_switch_idx] = + on ? params->um_switch_on : params->um_switch_off; return (usbd_req_set_report(sc->sc_usb_device, NULL, - mode_bytes, sizeof(mode_bytes), 0, - 0x03, 0x00)); + mode_bytes, params->um_size, params->iface_index, + params->um_req_val, params->um_req_idx)); } static int @@ -524,17 +683,29 @@ static int wsp_probe(device_t self) { struct usb_attach_arg *uaa = device_get_ivars(self); + struct usb_interface_descriptor *id; + struct usb_interface *iface; + uint8_t i; if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); - if (uaa->info.bIfaceIndex != WSP_IFACE_INDEX) - return (ENXIO); - - if ((uaa->info.bInterfaceClass != UICLASS_HID) || - (uaa->info.bInterfaceProtocol != 0)) + /* figure out first interface matching */ + for (i = 1;; i++) { + iface = usbd_get_iface(uaa->device, i); + if (iface == NULL || i == 3) + return (ENXIO); + id = iface->idesc; + if ((id == NULL) || + (id->bInterfaceClass != UICLASS_HID) || + (id->bInterfaceProtocol != 0 && + id->bInterfaceProtocol != UIPROTO_MOUSE)) + continue; + break; + } + /* check if we are attaching to the first match */ + if (uaa->info.bIfaceIndex != i) return (ENXIO); - return (usbd_lookup_id_by_uaa(wsp_devs, sizeof(wsp_devs), uaa)); } @@ -569,6 +740,9 @@ wsp_attach(device_t dev) sc->sc_usb_device = uaa->device; + /* get device specific configuration */ + sc->sc_params = wsp_dev_params + USB_GET_DRIVER_INFO(uaa); + /* * By default the touchpad behaves like a HID device, sending * packets with reportID = 8. Such reports contain only @@ -584,13 +758,13 @@ wsp_attach(device_t dev) * device back into HID mode before switching it to RAW * mode. Else the device does not work like expected. */ - err = wsp_set_device_mode(sc, HID_MODE); + err = wsp_set_device_mode(sc, 0); if (err != USB_ERR_NORMAL_COMPLETION) { DPRINTF("Failed to set mode to HID MODE (%d)\n", err); return (ENXIO); } - err = wsp_set_device_mode(sc, RAW_SENSOR_MODE); + err = wsp_set_device_mode(sc, 1); if (err != USB_ERR_NORMAL_COMPLETION) { DPRINTF("failed to set mode to RAW MODE (%d)\n", err); return (ENXIO); @@ -598,9 +772,6 @@ wsp_attach(device_t dev) mtx_init(&sc->sc_mutex, "wspmtx", NULL, MTX_DEF | MTX_RECURSE); - /* get device specific configuration */ - sc->sc_params = wsp_dev_params + USB_GET_DRIVER_INFO(uaa); - err = usbd_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, sc->sc_xfer, wsp_config, WSP_N_TRANSFER, sc, &sc->sc_mutex); @@ -642,7 +813,7 @@ wsp_detach(device_t dev) { struct wsp_softc *sc = device_get_softc(dev); - (void) wsp_set_device_mode(sc, HID_MODE); + (void) wsp_set_device_mode(sc, 0); mtx_lock(&sc->sc_mutex); if (sc->sc_state & WSP_ENABLED) @@ -692,6 +863,13 @@ wsp_intr_callback(struct usb_xfer *xfer, pc = usbd_xfer_get_frame(xfer, 0); usbd_copy_out(pc, 0, sc->tp_data, len); + if ((len < params->tp_offset + params->tp_fsize) || + ((len - params->tp_offset) % params->tp_fsize) != 0) { + DPRINTFN(WSP_LLEVEL_INFO, "Invalid length: %d, %x, %x\n", + len, sc->tp_data[0], sc->tp_data[1]); + goto tr_setup; + } + if (len < sc->tp_datalen) { /* make sure we don't process old data */ memset(sc->tp_data + len, 0, sc->tp_datalen - len); @@ -699,12 +877,9 @@ wsp_intr_callback(struct usb_xfer *xfer, h = (struct tp_header *)(sc->tp_data); - if (params->tp_type == TYPE2) { - ibt = sc->tp_data[BUTTON_TYPE2]; - ntouch = sc->tp_data[BUTTON_TYPE2 - 1]; - } else if (params->tp_type == TYPE3) { - ibt = sc->tp_data[BUTTON_TYPE3]; - ntouch = sc->tp_data[BUTTON_TYPE3 - 1]; + if (params->tp_type >= TYPE2) { + ibt = sc->tp_data[params->tp_button]; + ntouch = sc->tp_data[params->tp_button - 1]; } /* range check */ if (ntouch < 0) @@ -712,33 +887,33 @@ wsp_intr_callback(struct usb_xfer *xfer, else if (ntouch > MAX_FINGERS) ntouch = MAX_FINGERS; - f = (struct tp_finger *)(sc->tp_data + params->tp_offset); - for (i = 0; i != ntouch; i++) { + f = (struct tp_finger *)(sc->tp_data + params->tp_offset + params->tp_delta + i * params->tp_fsize); /* swap endianness, if any */ if (le16toh(0x1234) != 0x1234) { - f[i].origin = le16toh((uint16_t)f[i].origin); - f[i].abs_x = le16toh((uint16_t)f[i].abs_x); - f[i].abs_y = le16toh((uint16_t)f[i].abs_y); - f[i].rel_x = le16toh((uint16_t)f[i].rel_x); - f[i].rel_y = le16toh((uint16_t)f[i].rel_y); - f[i].tool_major = le16toh((uint16_t)f[i].tool_major); - f[i].tool_minor = le16toh((uint16_t)f[i].tool_minor); - f[i].orientation = le16toh((uint16_t)f[i].orientation); - f[i].touch_major = le16toh((uint16_t)f[i].touch_major); - f[i].touch_minor = le16toh((uint16_t)f[i].touch_minor); - f[i].multi = le16toh((uint16_t)f[i].multi); + f->origin = le16toh((uint16_t)f->origin); + f->abs_x = le16toh((uint16_t)f->abs_x); + f->abs_y = le16toh((uint16_t)f->abs_y); + f->rel_x = le16toh((uint16_t)f->rel_x); + f->rel_y = le16toh((uint16_t)f->rel_y); + f->tool_major = le16toh((uint16_t)f->tool_major); + f->tool_minor = le16toh((uint16_t)f->tool_minor); + f->orientation = le16toh((uint16_t)f->orientation); + f->touch_major = le16toh((uint16_t)f->touch_major); + f->touch_minor = le16toh((uint16_t)f->touch_minor); + f->pressure = le16toh((uint16_t)f->pressure); + f->multi = le16toh((uint16_t)f->multi); } - DPRINTFN(WSP_LLEVEL_INFO, "[%d]ibt=%d, taps=%d, u=%x, o=%4d, ax=%5d, ay=%5d, " - "rx=%5d, ry=%5d, tlmaj=%4d, tlmin=%4d, ot=%5d, tchmaj=%4d, tchmin=%4d, m=%4x\n", - i, ibt, ntouch, h->q2, - f[i].origin, f[i].abs_x, f[i].abs_y, f[i].rel_x, f[i].rel_y, - f[i].tool_major, f[i].tool_minor, f[i].orientation, - f[i].touch_major, f[i].touch_minor, f[i].multi); - - sc->pos_x[i] = f[i].abs_x; - sc->pos_y[i] = -f[i].abs_y; - sc->index[i] = &f[i]; + DPRINTFN(WSP_LLEVEL_INFO, + "[%d]ibt=%d, taps=%d, o=%4d, ax=%5d, ay=%5d, " + "rx=%5d, ry=%5d, tlmaj=%4d, tlmin=%4d, ot=%4x, " + "tchmaj=%4d, tchmin=%4d, presure=%4d, m=%4x\n", + i, ibt, ntouch, f->origin, f->abs_x, f->abs_y, + f->rel_x, f->rel_y, f->tool_major, f->tool_minor, f->orientation, + f->touch_major, f->touch_minor, f->pressure, f->multi); + sc->pos_x[i] = f->abs_x; + sc->pos_y[i] = -f->abs_y; + sc->index[i] = f; } sc->sc_status.flags &= ~MOUSE_POSCHANGED; @@ -750,24 +925,24 @@ wsp_intr_callback(struct usb_xfer *xfer, sc->sc_status.button |= MOUSE_BUTTON1DOWN; sc->ibtn = 1; } - if (h->q2 == 4) - sc->intr_count++; + sc->intr_count++; if (sc->ntaps < ntouch) { switch (ntouch) { case 1: - if (f[0].touch_major > tun.pressure_tap_threshold) + if (sc->index[0]->touch_major > tun.pressure_tap_threshold && + sc->index[0]->tool_major <= 1200) sc->ntaps = 1; break; case 2: - if (f[0].touch_major > tun.pressure_tap_threshold && - f[1].touch_major > tun.pressure_tap_threshold) + if (sc->index[0]->touch_major > tun.pressure_tap_threshold-30 && + sc->index[1]->touch_major > tun.pressure_tap_threshold-30) sc->ntaps = 2; break; case 3: - if (f[0].touch_major > tun.pressure_tap_threshold && - f[1].touch_major > tun.pressure_tap_threshold && - f[2].touch_major > tun.pressure_tap_threshold) + if (sc->index[0]->touch_major > tun.pressure_tap_threshold-40 && + sc->index[1]->touch_major > tun.pressure_tap_threshold-40 && + sc->index[2]->touch_major > tun.pressure_tap_threshold-40) sc->ntaps = 3; break; default: @@ -779,7 +954,7 @@ wsp_intr_callback(struct usb_xfer *xfer, abs(sc->pos_x[0] - sc->pos_x[1]), abs(sc->pos_y[0] - sc->pos_y[1]))); } - if (f[0].touch_major < tun.pressure_untouch_threshold && + if (sc->index[0]->touch_major < tun.pressure_untouch_threshold && sc->sc_status.button == 0) { sc->sc_touch = WSP_UNTOUCH; if (sc->intr_count < WSP_TAP_MAX_COUNT && @@ -840,10 +1015,10 @@ wsp_intr_callback(struct usb_xfer *xfer, sc->rdy = 0; sc->rdz = 0; sc->scr_mode = WSP_SCR_NONE; - } else if (f[0].touch_major >= tun.pressure_touch_threshold && + } else if (sc->index[0]->touch_major >= tun.pressure_touch_threshold && sc->sc_touch == WSP_UNTOUCH) { /* ignore first touch */ sc->sc_touch = WSP_FIRST_TOUCH; - } else if (f[0].touch_major >= tun.pressure_touch_threshold && + } else if (sc->index[0]->touch_major >= tun.pressure_touch_threshold && sc->sc_touch == WSP_FIRST_TOUCH) { /* ignore second touch */ sc->sc_touch = WSP_SECOND_TOUCH; DPRINTFN(WSP_LLEVEL_INFO, "Fist pre_x=%5d, pre_y=%5d\n", @@ -853,22 +1028,26 @@ wsp_intr_callback(struct usb_xfer *xfer, sc->sc_touch = WSP_TOUCHING; if (ntouch != 0 && - h->q2 == 4 && - f[0].touch_major >= tun.pressure_touch_threshold) { + sc->index[0]->touch_major >= tun.pressure_touch_threshold) { dx = sc->pos_x[0] - sc->pre_pos_x; dy = sc->pos_y[0] - sc->pre_pos_y; - /* Ignore movement from ibt=1 to ibt=0 */ - if (sc->sc_status.obutton != 0 && - sc->sc_status.button == 0) { - dx = 0; - dy = 0; - } + /* Ignore movement during button is releasing */ + if (sc->ibtn != 0 && sc->sc_status.button == 0) + dx = dy = 0; + /* Ignore movement if ntouch changed */ - if (sc->o_ntouch != ntouch) { - dx = 0; - dy = 0; - } + if (sc->o_ntouch != ntouch) + dx = dy = 0; + + /* Ignore unexpeted movment when typing */ + if (ntouch == 1 && sc->index[0]->tool_major > 1200) + dx = dy = 0; + + if (sc->ibtn != 0 && ntouch == 1 && + sc->intr_count < WSP_TAP_MAX_COUNT && + abs(sc->dx_sum) < 1 && abs(sc->dy_sum) < 1 ) + dx = dy = 0; if (ntouch == 2 && sc->sc_status.button != 0) { dx = sc->pos_x[sc->finger] - sc->pre_pos_x; @@ -878,26 +1057,23 @@ wsp_intr_callback(struct usb_xfer *xfer, * Ignore movement of switch finger or * movement from ibt=0 to ibt=1 */ - if (f[0].origin == 0 || f[1].origin == 0 || + if (sc->index[0]->origin == 0 || sc->index[1]->origin == 0 || sc->sc_status.obutton != sc->sc_status.button) { - dx = 0; - dy = 0; + dx = dy = 0; sc->finger = 0; } - if ((abs(f[0].rel_x) + abs(f[0].rel_y)) < - (abs(f[1].rel_x) + abs(f[1].rel_y)) && + if ((abs(sc->index[0]->rel_x) + abs(sc->index[0]->rel_y)) < + (abs(sc->index[1]->rel_x) + abs(sc->index[1]->rel_y)) && sc->finger == 0) { sc->sc_touch = WSP_SECOND_TOUCH; - dx = 0; - dy = 0; + dx = dy = 0; sc->finger = 1; } - if ((abs(f[0].rel_x) + abs(f[0].rel_y)) >= - (abs(f[1].rel_x) + abs(f[1].rel_y)) && + if ((abs(sc->index[0]->rel_x) + abs(sc->index[0]->rel_y)) >= + (abs(sc->index[1]->rel_x) + abs(sc->index[1]->rel_y)) && sc->finger == 1) { sc->sc_touch = WSP_SECOND_TOUCH; - dx = 0; - dy = 0; + dx = dy = 0; sc->finger = 0; } DPRINTFN(WSP_LLEVEL_INFO, "dx=%5d, dy=%5d, mov=%5d\n", @@ -926,8 +1102,7 @@ wsp_intr_callback(struct usb_xfer *xfer, if (sc->scr_mode == WSP_SCR_NONE && abs(sc->dx_sum) + abs(sc->dy_sum) > tun.scr_hor_threshold) sc->scr_mode = abs(sc->dx_sum) > - abs(sc->dy_sum) * 3 ? WSP_SCR_HOR : - WSP_SCR_VER; + abs(sc->dy_sum) * 2 ? WSP_SCR_HOR : WSP_SCR_VER; DPRINTFN(WSP_LLEVEL_INFO, "scr_mode=%5d, count=%d, dx_sum=%d, dy_sum=%d\n", sc->scr_mode, sc->intr_count, sc->dx_sum, sc->dy_sum); if (sc->scr_mode == WSP_SCR_HOR) @@ -935,8 +1110,7 @@ wsp_intr_callback(struct usb_xfer *xfer, else sc->dt_sum = 0; - dx = 0; - dy = 0; + dx = dy = 0; if (sc->dz_count == 0) dz = sc->dz_sum / tun.z_factor; if (sc->scr_mode == WSP_SCR_HOR || @@ -944,15 +1118,12 @@ wsp_intr_callback(struct usb_xfer *xfer, abs(sc->pos_y[0] - sc->pos_y[1]) > MAX_DISTANCE) dz = 0; } - if (ntouch == 3) { - dx = 0; - dy = 0; - dz = 0; - } + if (ntouch == 3) + dx = dy = dz = 0; if (sc->intr_count < WSP_TAP_MAX_COUNT && - abs(dx) < 3 && abs(dy) < 3 && abs(dz) < 3) { + abs(dx) < 3 && abs(dy) < 3 && abs(dz) < 3) dx = dy = dz = 0; - } else + else sc->intr_count = WSP_TAP_MAX_COUNT; if (dx || dy || dz) sc->sc_status.flags |= MOUSE_POSCHANGED; Modified: stable/9/sys/dev/usb/usbdevs ============================================================================== --- stable/9/sys/dev/usb/usbdevs Thu Nov 19 10:00:17 2015 (r291065) +++ stable/9/sys/dev/usb/usbdevs Thu Nov 19 10:01:50 2015 (r291066) @@ -1128,6 +1128,10 @@ product APPLE WELLSPRING7A_JIS 0x025b Ap product APPLE WELLSPRING8_ANSI 0x0290 Apple Internal Keyboard/Trackpad product APPLE WELLSPRING8_ISO 0x0291 Apple Internal Keyboard/Trackpad product APPLE WELLSPRING8_JIS 0x0292 Apple Internal Keyboard/Trackpad +/* MacbookPro12,1 */ +product APPLE WELLSPRING9_ANSI 0x0272 Apple Internal Keyboard/Trackpad +product APPLE WELLSPRING9_ISO 0x0273 Apple Internal Keyboard/Trackpad +product APPLE WELLSPRING9_JIS 0x0274 Apple Internal Keyboard/Trackpad product APPLE MOUSE 0x0301 Mouse M4848 product APPLE OPTMOUSE 0x0302 Optical mouse product APPLE MIGHTYMOUSE 0x0304 Mighty Mouse From owner-svn-src-stable-9@freebsd.org Thu Nov 19 19:40:31 2015 Return-Path: Delivered-To: svn-src-stable-9@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A72D2A335AC; Thu, 19 Nov 2015 19:40:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 58713185D; Thu, 19 Nov 2015 19:40:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAJJeUOT061354; Thu, 19 Nov 2015 19:40:30 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAJJeUTL061353; Thu, 19 Nov 2015 19:40:30 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201511191940.tAJJeUTL061353@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 19 Nov 2015 19:40:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r291083 - in stable: 10/sys/dev/cxgbe 9/sys/dev/cxgbe X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2015 19:40:31 -0000 Author: jhb Date: Thu Nov 19 19:40:30 2015 New Revision: 291083 URL: https://svnweb.freebsd.org/changeset/base/291083 Log: MFC 290416: Chelsio T5 chips do not properly echo the No Snoop and Relaxed Ordering attributes when replying to a TLP from a Root Port. As a workaround, disable No Snoop and Relaxed Ordering in the Root Port of each T5 adapter during attach so that CPU-initiated requests do not contain these flags. Note that this affects CPU-initiated requests to all devices under this root port. Sponsored by: Chelsio Modified: stable/9/sys/dev/cxgbe/t4_main.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sys/dev/cxgbe/t4_main.c Directory Properties: stable/10/ (props changed) Modified: stable/9/sys/dev/cxgbe/t4_main.c ============================================================================== --- stable/9/sys/dev/cxgbe/t4_main.c Thu Nov 19 18:33:20 2015 (r291082) +++ stable/9/sys/dev/cxgbe/t4_main.c Thu Nov 19 19:40:30 2015 (r291083) @@ -547,6 +547,33 @@ t5_probe(device_t dev) return (ENXIO); } +static void +t5_attribute_workaround(device_t dev) +{ + device_t root_port; + uint32_t v; + + /* + * The T5 chips do not properly echo the No Snoop and Relaxed + * Ordering attributes when replying to a TLP from a Root + * Port. As a workaround, find the parent Root Port and + * disable No Snoop and Relaxed Ordering. Note that this + * affects all devices under this root port. + */ + root_port = pci_find_pcie_root_port(dev); + if (root_port == NULL) { + device_printf(dev, "Unable to find parent root port\n"); + return; + } + + v = pcie_adjust_config(root_port, PCIER_DEVICE_CTL, + PCIEM_CTL_RELAXED_ORD_ENABLE | PCIEM_CTL_NOSNOOP_ENABLE, 0, 2); + if ((v & (PCIEM_CTL_RELAXED_ORD_ENABLE | PCIEM_CTL_NOSNOOP_ENABLE)) != + 0) + device_printf(dev, "Disabled No Snoop/Relaxed Ordering on %s\n", + device_get_nameunit(root_port)); +} + static int t4_attach(device_t dev) { @@ -561,6 +588,8 @@ t4_attach(device_t dev) sc = device_get_softc(dev); sc->dev = dev; + if ((pci_get_device(dev) & 0xff00) == 0x5400) + t5_attribute_workaround(dev); pci_enable_busmaster(dev); if (pci_find_cap(dev, PCIY_EXPRESS, &i) == 0) { uint32_t v;