From 3e678d58aa7b47e823702aead47cf69982d3d270 Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 5 Jan 2012 10:46:22 +0000 Subject: Reimplement on top of __generic(). The macro construction used now, is almost identical to the code provided in C11 proposal N1404. This new version doesn't seem to introduce any regressions according to the regression test in tools/, but still seems to malfunction with Clang on certain aspects. The new code does work successfully with GCC 4.2, 4.6 and 4.7. With 4.7, it also works when __generic() is implemented on top of _Generic(). Discussed with: stefanf --- share/man/man3/tgmath.3 | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/man/man3/tgmath.3 b/share/man/man3/tgmath.3 index f8faf26..e86b141 100644 --- a/share/man/man3/tgmath.3 +++ b/share/man/man3/tgmath.3 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 14, 2004 +.Dd January 4, 2012 .Dt TGMATH 3 .Os .Sh NAME @@ -139,15 +139,24 @@ The header .In tgmath.h first appeared in .Fx 5.3 . -.Sh BUGS -The header +.Sh COMPILER SUPPORT +Before +.St -isoC-11 , +the header .In tgmath.h -cannot be implemented with strictly conforming C code and needs +could not be implemented with strictly conforming C code and needed special compiler support. -The current implementation only works for GCC. -.Pp +As of +.St -isoC-11 , +this header file can be implemented using the +.Fn _Generic +language keyword. +In addition to compilers that support this keyword, this header file +works with GCC. +.Sh BUGS Many of the functions mentioned here are not prototyped in .In math.h or .In complex.h as they are not yet implemented. +This prevents the corresponding type-generic macro from working at all. -- cgit v1.1 From 8952a0a413cffae99db7587034450cc04ca30726 Mon Sep 17 00:00:00 2001 From: brueffer Date: Thu, 5 Jan 2012 11:16:42 +0000 Subject: Fix typo. MFC after: 1 week --- share/man/man4/bce.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/bce.4 b/share/man/man4/bce.4 index 0bca57b..cbad861 100644 --- a/share/man/man4/bce.4 +++ b/share/man/man4/bce.4 @@ -251,7 +251,7 @@ status block. .It "bce%d: Could not allocate status block DMA memory!" The driver could not allocate DMA addressable memory for the controller's status block. -.It "bce_d: Could not map status block DMA memory!" +.It "bce%d: Could not map status block DMA memory!" The driver could not map the status block memory into the controller's DMA address space. .It "bce%d: Could not allocate statistics block DMA tag!" -- cgit v1.1 From 962d9f7018174ba31dee0955e96d5c4caf550748 Mon Sep 17 00:00:00 2001 From: uqs Date: Thu, 5 Jan 2012 21:36:12 +0000 Subject: Pull up vendor changes to mdoc(7) This switches us to using -isoC-2011 as the symbol name which is used by groff and mdocml. It follows the change to 4 digit years as done with IEEE Std 1003 post-1999. MFC after: 2 weeks (groff changes only) --- share/man/man3/ATOMIC_VAR_INIT.3 | 4 ++-- share/man/man3/tgmath.3 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man3/ATOMIC_VAR_INIT.3 b/share/man/man3/ATOMIC_VAR_INIT.3 index 41f28db..1f85d3b 100644 --- a/share/man/man3/ATOMIC_VAR_INIT.3 +++ b/share/man/man3/ATOMIC_VAR_INIT.3 @@ -274,7 +274,7 @@ When using GCC, all atomic operations are executed as if they are using .Dv memory_order_seq_cst . .Pp Instead of using the atomic operations provided by this interface, -.St -isoC-11 +.St -isoC-2011 allows the atomic variables to be modified directly using built-in language operators. This behaviour cannot be emulated for older compilers. @@ -292,7 +292,7 @@ datatypes, if supported by the CPU. .Xr atomic 9 .Sh STANDARDS These macros attempt to conform to -.St -isoC-11 . +.St -isoC-2011 . .Sh HISTORY These macros appeared in .Fx 10.0 . diff --git a/share/man/man3/tgmath.3 b/share/man/man3/tgmath.3 index e86b141..70e4a81 100644 --- a/share/man/man3/tgmath.3 +++ b/share/man/man3/tgmath.3 @@ -141,13 +141,13 @@ first appeared in .Fx 5.3 . .Sh COMPILER SUPPORT Before -.St -isoC-11 , +.St -isoC-2011 , the header .In tgmath.h could not be implemented with strictly conforming C code and needed special compiler support. As of -.St -isoC-11 , +.St -isoC-2011 , this header file can be implemented using the .Fn _Generic language keyword. -- cgit v1.1 From a6fa5fdce7a3d98f7eceb931e20460d08dc642a4 Mon Sep 17 00:00:00 2001 From: uqs Date: Thu, 5 Jan 2012 21:43:33 +0000 Subject: Apply Typo-B-Gone 2000 [TM] --- share/man/man4/apic.4 | 2 +- share/man/man4/carp.4 | 2 +- share/man/man5/ar.5 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man4/apic.4 b/share/man/man4/apic.4 index 224e4f6..0856232 100644 --- a/share/man/man4/apic.4 +++ b/share/man/man4/apic.4 @@ -61,7 +61,7 @@ In addition, they are able to accept and generate inter-processor interrupts I/O APICs contain a redirection table, which is used to route the interrupts they receive from peripheral buses to one or more local APICs. .Pp -Each local APIC includes one 32-bit programable timer. +Each local APIC includes one 32-bit programmable timer. This driver uses them to supply kernel with one event timer named "LAPIC". Event timer provided by the driver supports both one-shot an periodic modes. Because of local APIC nature it is per-CPU. diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4 index 1b59e72..5a761ec 100644 --- a/share/man/man4/carp.4 +++ b/share/man/man4/carp.4 @@ -193,7 +193,7 @@ This can be accomplished by using hooks. Master/slave events are signalled under system .Dv CARP . -Subsystem specifies vhid and name of interface, where event occured. +Subsystem specifies vhid and name of interface, where event occurred. Type of the message displays new state of vhid. Please see .Xr devd.conf 5 diff --git a/share/man/man5/ar.5 b/share/man/man5/ar.5 index 81bc7e6..2acbde4 100644 --- a/share/man/man5/ar.5 +++ b/share/man/man5/ar.5 @@ -126,7 +126,7 @@ The BSD and SVR4/GNU variants use different schemes for encoding file names for members. .Bl -tag -width "SVR4/GNU" .It "BSD" -File names that are upto 16 bytes long and which do not contain +File names that are up to 16 bytes long and which do not contain embedded spaces are stored directly in the .Ar ar_name field of the archive header. @@ -164,7 +164,7 @@ ASCII .Dq "A BC D" .Pc . .It "SVR4/GNU" -File names that are upto 15 characters long are stored directly in the +File names that are up to 15 characters long are stored directly in the .Ar ar_name field of the header, terminated by a .Dq Li / -- cgit v1.1 From 3a7fb4e36ad64aafde3ca6083efda2d8767c92c1 Mon Sep 17 00:00:00 2001 From: adrian Date: Thu, 5 Jan 2012 21:49:43 +0000 Subject: Allow crunchgen binary link generation to be disabled. If CRUNCH_GENERATE_LINKS is set to "no", then no links will be generated. This defaults to "yes" so things like release crunch building still works. --- share/mk/bsd.crunchgen.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'share') diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk index 5ebfd94..540c6d2 100644 --- a/share/mk/bsd.crunchgen.mk +++ b/share/mk/bsd.crunchgen.mk @@ -22,6 +22,8 @@ # Specific links can be suppressed by setting # CRUNCH_SUPPRESS_LINK_$(NAME) to 1. # +# If CRUNCH_GENERATE_LINKS is set to no, no links will be generated. +# # $FreeBSD$ @@ -39,6 +41,7 @@ CANONICALOBJDIR:= ${MAKEOBJDIRPREFIX}${.CURDIR} .else CANONICALOBJDIR:= /usr/obj${.CURDIR} .endif +CRUNCH_GENERATE_LINKS?= yes CLEANFILES+= $(CONF) *.o *.lo *.c *.mk *.cache *.a *.h @@ -51,6 +54,7 @@ $(OUTPUTS): $(CRUNCH_SRCDIR_${P})/Makefile .else $(OUTPUTS): $(.CURDIR)/../../$(D)/$(P)/Makefile .endif +.if ${CRUNCH_GENERATE_LINKS} == "yes" .ifndef CRUNCH_SUPPRESS_LINK_${P} LINKS+= $(BINDIR)/$(PROG) $(BINDIR)/$(P) .endif @@ -59,6 +63,7 @@ LINKS+= $(BINDIR)/$(PROG) $(BINDIR)/$(P) LINKS+= $(BINDIR)/$(PROG) $(BINDIR)/$(A) .endif .endfor +.endif .endfor .endfor -- cgit v1.1 From 8c8c75b10c56d54274ac6edf8c28f6a0f5879ce4 Mon Sep 17 00:00:00 2001 From: eadler Date: Mon, 9 Jan 2012 00:48:19 +0000 Subject: X11BASE has been deprecated for a long time and will die soon Approved by: x11 (eadler) Approved by: brucec MFC after: 1 week --- share/examples/diskless/README.TEMPLATING | 6 +++--- share/examples/ppp/ppp.linkdown.sample | 2 +- share/examples/printing/hpvf | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/examples/diskless/README.TEMPLATING b/share/examples/diskless/README.TEMPLATING index 28edcae..48984e0 100644 --- a/share/examples/diskless/README.TEMPLATING +++ b/share/examples/diskless/README.TEMPLATING @@ -94,8 +94,8 @@ be useful to set up clients and server for diskless boot. /usr/ports ( note 5 ) /usr/src ( note 5 ) /usr/local/crack ( note 5 ) - /usr/X11R6/lib/X11/xdm/xdm-errors ( note 6 ) - /usr/X11R6/lib/X11/xdm/xdm-pid ( note 6 ) + /usr/local/lib/X11/xdm/xdm-errors ( note 6 ) + /usr/local/lib/X11/xdm/xdm-pid ( note 6 ) /usr/local/etc/ssh_host_key ( note 6 ) /usr/local/etc/ssh_host_key.pub ( note 6 ) /usr/local/etc/ssh_random_seed ( note 6 ) @@ -120,7 +120,7 @@ be useful to set up clients and server for diskless boot. do not want to template such directories. note 6: Note that you can solve the problem of xdm and sshd creating - files in /usr. With xdm, edit /usr/X11R6/lib/xdm/xdm-config + files in /usr. With xdm, edit /usr/local/lib/xdm/xdm-config and change the errorLogFile and pidFile config lines. With sshd, add 'HostKey' and 'RandomSeed' directives to specify diff --git a/share/examples/ppp/ppp.linkdown.sample b/share/examples/ppp/ppp.linkdown.sample index c7da79e..749dd94 100644 --- a/share/examples/ppp/ppp.linkdown.sample +++ b/share/examples/ppp/ppp.linkdown.sample @@ -23,7 +23,7 @@ # ``auplay'' (assuming NAS is installed and configured). # MYADDR: - !bg /usr/X11R6/bin/auplay /etc/ppp/linkdown.au + !bg /usr/local/bin/auplay /etc/ppp/linkdown.au # If you're running ``ppp -auto -nat dynamic-nat-auto'', and are # assigned a dynamic IP number by the peer, this may be worth while diff --git a/share/examples/printing/hpvf b/share/examples/printing/hpvf index 233de80..c900f31 100644 --- a/share/examples/printing/hpvf +++ b/share/examples/printing/hpvf @@ -1,10 +1,10 @@ #!/bin/sh # +# $FreeBSD$ +# # hpvf - Convert GIF files into HP/PCL, then print # Installed in /usr/local/libexec/hpvf -PATH=/usr/X11R6/bin:$PATH; export PATH - giftopnm | ppmtopgm | pgmtopbm | pbmtolj -resolution 300 \ && exit 0 \ || exit 2 -- cgit v1.1 From 0730e7f5bed7d8a8c749f0b81c900c9dc3f0b5c9 Mon Sep 17 00:00:00 2001 From: melifaro Date: Tue, 10 Jan 2012 12:45:24 +0000 Subject: Add setsockopt(2) example to ng_ksocket(4). While here, fix formatting a bit Approved by: kib(mentor) MFC after: 2 weeks --- share/man/man4/ng_ksocket.4 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/ng_ksocket.4 b/share/man/man4/ng_ksocket.4 index d20ee46..e74f61a 100644 --- a/share/man/man4/ng_ksocket.4 +++ b/share/man/man4/ng_ksocket.4 @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 28, 2005 +.Dd January 09, 2012 .Dt NG_KSOCKET 4 .Os .Sh NAME @@ -199,7 +199,7 @@ For the address is the pathname as a doubly quoted string. .Pp Examples: -.Bl -tag -width XXXXXXXXXX +.Bl -tag -width "PF_LOCAL" .It Dv PF_LOCAL local/"/tmp/foo.socket" .It Dv PF_INET @@ -215,6 +215,12 @@ the normal form for that structure is used. In the future, more convenient encoding of the more common socket options may be supported. +.Pp +Setting socket options example: +.Bl -tag -width "PF_LOCAL" +.It Set FIB 2 for a socket (SOL_SOCKET, SO_SETFIB): +.Dv "setopt \&{ level=0xffff name=0x1014 data=[ 2 ] \&}" +.El .Sh SHUTDOWN This node shuts down upon receipt of a .Dv NGM_SHUTDOWN -- cgit v1.1 From fce645c1536d9a3584347abccad168ea1bca2d53 Mon Sep 17 00:00:00 2001 From: ken Date: Thu, 12 Jan 2012 00:34:33 +0000 Subject: Add the CAM Target Layer (CTL). CTL is a disk and processor device emulation subsystem originally written for Copan Systems under Linux starting in 2003. It has been shipping in Copan (now SGI) products since 2005. It was ported to FreeBSD in 2008, and thanks to an agreement between SGI (who acquired Copan's assets in 2010) and Spectra Logic in 2010, CTL is available under a BSD-style license. The intent behind the agreement was that Spectra would work to get CTL into the FreeBSD tree. Some CTL features: - Disk and processor device emulation. - Tagged queueing - SCSI task attribute support (ordered, head of queue, simple tags) - SCSI implicit command ordering support. (e.g. if a read follows a mode select, the read will be blocked until the mode select completes.) - Full task management support (abort, LUN reset, target reset, etc.) - Support for multiple ports - Support for multiple simultaneous initiators - Support for multiple simultaneous backing stores - Persistent reservation support - Mode sense/select support - Error injection support - High Availability support (1) - All I/O handled in-kernel, no userland context switch overhead. (1) HA Support is just an API stub, and needs much more to be fully functional. ctl.c: The core of CTL. Command handlers and processing, character driver, and HA support are here. ctl.h: Basic function declarations and data structures. ctl_backend.c, ctl_backend.h: The basic CTL backend API. ctl_backend_block.c, ctl_backend_block.h: The block and file backend. This allows for using a disk or a file as the backing store for a LUN. Multiple threads are started to do I/O to the backing device, primarily because the VFS API requires that to get any concurrency. ctl_backend_ramdisk.c: A "fake" ramdisk backend. It only allocates a small amount of memory to act as a source and sink for reads and writes from an initiator. Therefore it cannot be used for any real data, but it can be used to test for throughput. It can also be used to test initiators' support for extremely large LUNs. ctl_cmd_table.c: This is a table with all 256 possible SCSI opcodes, and command handler functions defined for supported opcodes. ctl_debug.h: Debugging support. ctl_error.c, ctl_error.h: CTL-specific wrappers around the CAM sense building functions. ctl_frontend.c, ctl_frontend.h: These files define the basic CTL frontend port API. ctl_frontend_cam_sim.c: This is a CTL frontend port that is also a CAM SIM. This frontend allows for using CTL without any target-capable hardware. So any LUNs you create in CTL are visible in CAM via this port. ctl_frontend_internal.c, ctl_frontend_internal.h: This is a frontend port written for Copan to do some system-specific tasks that required sending commands into CTL from inside the kernel. This isn't entirely relevant to FreeBSD in general, but can perhaps be repurposed. ctl_ha.h: This is a stubbed-out High Availability API. Much more is needed for full HA support. See the comments in the header and the description of what is needed in the README.ctl.txt file for more details. ctl_io.h: This defines most of the core CTL I/O structures. union ctl_io is conceptually very similar to CAM's union ccb. ctl_ioctl.h: This defines all ioctls available through the CTL character device, and the data structures needed for those ioctls. ctl_mem_pool.c, ctl_mem_pool.h: Generic memory pool implementation used by the internal frontend. ctl_private.h: Private data structres (e.g. CTL softc) and function prototypes. This also includes the SCSI vendor and product names used by CTL. ctl_scsi_all.c, ctl_scsi_all.h: CTL wrappers around CAM sense printing functions. ctl_ser_table.c: Command serialization table. This defines what happens when one type of command is followed by another type of command. ctl_util.c, ctl_util.h: CTL utility functions, primarily designed to be used from userland. See ctladm for the primary consumer of these functions. These include CDB building functions. scsi_ctl.c: CAM target peripheral driver and CTL frontend port. This is the path into CTL for commands from target-capable hardware/SIMs. README.ctl.txt: CTL code features, roadmap, to-do list. usr.sbin/Makefile: Add ctladm. ctladm/Makefile, ctladm/ctladm.8, ctladm/ctladm.c, ctladm/ctladm.h, ctladm/util.c: ctladm(8) is the CTL management utility. It fills a role similar to camcontrol(8). It allow configuring LUNs, issuing commands, injecting errors and various other control functions. usr.bin/Makefile: Add ctlstat. ctlstat/Makefile ctlstat/ctlstat.8, ctlstat/ctlstat.c: ctlstat(8) fills a role similar to iostat(8). It reports I/O statistics for CTL. sys/conf/files: Add CTL files. sys/conf/NOTES: Add device ctl. sys/cam/scsi_all.h: To conform to more recent specs, the inquiry CDB length field is now 2 bytes long. Add several mode page definitions for CTL. sys/cam/scsi_all.c: Handle the new 2 byte inquiry length. sys/dev/ciss/ciss.c, sys/dev/ata/atapi-cam.c, sys/cam/scsi/scsi_targ_bh.c, scsi_target/scsi_cmds.c, mlxcontrol/interface.c: Update for 2 byte inquiry length field. scsi_da.h: Add versions of the format and rigid disk pages that are in a more reasonable format for CTL. amd64/conf/GENERIC, i386/conf/GENERIC, ia64/conf/GENERIC, sparc64/conf/GENERIC: Add device ctl. i386/conf/PAE: The CTL frontend SIM at least does not compile cleanly on PAE. Sponsored by: Copan Systems, SGI and Spectra Logic MFC after: 1 month --- share/examples/scsi_target/scsi_cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/examples/scsi_target/scsi_cmds.c b/share/examples/scsi_target/scsi_cmds.c index b0da04e..7a95606 100644 --- a/share/examples/scsi_target/scsi_cmds.c +++ b/share/examples/scsi_target/scsi_cmds.c @@ -328,7 +328,7 @@ tcmd_inquiry(struct ccb_accept_tio *atio, struct ccb_scsiio *ctio) bcopy(&inq_data, ctio->data_ptr, sizeof(inq_data)); ctio->dxfer_len = inq_data.additional_length + 4; ctio->dxfer_len = min(ctio->dxfer_len, - SCSI_CDB6_LEN(inq->length)); + scsi_2btoul(inq->length)); ctio->ccb_h.flags |= CAM_DIR_IN | CAM_SEND_STATUS; ctio->scsi_status = SCSI_STATUS_OK; } -- cgit v1.1 From c797a8475bbecf74b84ac55cdb264fba23feba0f Mon Sep 17 00:00:00 2001 From: rea Date: Thu, 12 Jan 2012 06:48:11 +0000 Subject: rc.d: document 'quiet' prefix and fix dhclient/devd interaction Document the current semantics of the 'quiet' command prefix in the rc.subr(8). Fix dhclient rc.d script: it should not call err() for non-DHCP-enabled interface when it is called from devd, because the latter just blindly calls 'service dhclient quietstart' on each "link up" event. Since the 'quietstart' will silence the message "Cannot 'start' . Set _enable to YES in /etc/rc.conf or use 'onestart' instead of 'start'." and running dhclient on the non-DHCP-enabled interface is the same thing as running the service without _enable set, such modification is in sync with the current semantics of the 'quiet' prefix. Approved by: glebius Reviewed by: freebsd-rc list MFC after: 2 weeks --- share/man/man8/rc.subr.8 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index 9f6c7fa..a3c759a 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -339,7 +339,7 @@ with being the list of valid arguments prefixed by .Sm off -.Dq Bq Li fast | force | one . +.Dq Bq Li fast | force | one | quiet . .Sm on .It Ic reverse_list Ar item ... Print the list of @@ -427,6 +427,22 @@ Skip the checks for being set to .Dq Li YES , but performs all the other prerequisite tests. +.It Li quiet +Inhibits some verbose diagnostics. +Currently, this includes messages +.Qq Starting ${name} +(as checked by +.Ic check_startmsgs +inside +.Nm ) +and errors about usage of services that are not enabled in +.Xr rc.conf 5 . +This prefix also sets +.Va rc_quiet Ns = Ns Li YES . +.Em Please, note: +.Va rc_quiet +is not intended to completely mask all debug and warning messages, +but only certain small classes of them. .El .Pp .Ic run_rc_command -- cgit v1.1 From ac5aad43eb022f6712491235aaed38d544ed75ff Mon Sep 17 00:00:00 2001 From: maxim Date: Fri, 13 Jan 2012 06:14:03 +0000 Subject: o Mac OS X 10.7 added (belatedly). FreeBSD 9.0-RELEASE added. --- share/misc/bsd-family-tree | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 822e5f2..a4064fc 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -247,11 +247,14 @@ FreeBSD 5.2 | | | | | FreeBSD FreeBSD | | | | | 8.2 7.4 | | | DragonFly 2.10.1 | v | | OpenBSD 4.9 | - | | | | | - | | | | | + | Mac OS X | | | + | 10.7 | | | | | | OpenBSD 5.0 | + +--FreeBSD | | | | + | 9.0 | | | | + | v | | | | | | | | | -FreeBSD 9 -current | NetBSD -current OpenBSD -current | +FreeBSD 10 -current | NetBSD -current OpenBSD -current | | | | | | v v v v v @@ -537,7 +540,9 @@ FreeBSD 7.4 2011-02-24 [FBD] FreeBSD 8.2 2011-02-24 [FBD] DragonFly 2.10.1 2011-04-26 [DFB] OpenBSD 4.9 2011-05-01 [OBD] +Mac OS X 10.7 2011-07-20 [APL] OpenBSD 5.0 2011-11-01 [OBD] +FreeBSD 9.0 2012-01-12 [FBD] Bibliography ------------------------ -- cgit v1.1 From 6898680f64062d1debcda280c9b38d4e54905c66 Mon Sep 17 00:00:00 2001 From: maxim Date: Fri, 13 Jan 2012 06:18:23 +0000 Subject: Copyright years updated. --- share/misc/bsd-family-tree | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index a4064fc..162bca1 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -600,7 +600,7 @@ original BSD announcements from Usenet or tapes. Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11BSD manual pages. -- -Copyright (c) 1997-2007 Wolfram Schneider +Copyright (c) 1997-2012 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree $FreeBSD$ -- cgit v1.1 From 1d219ec710a2ecb30cd10629844c8ba61cbfc478 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 13 Jan 2012 15:43:01 +0000 Subject: Regenerate src.conf(5). --- share/man/man5/src.conf.5 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 37f490f..68a93cd 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru .\" $FreeBSD$ -.Dd December 30, 2011 +.Dd January 13, 2012 .Dt SRC.CONF 5 .Os .Sh NAME @@ -252,7 +252,7 @@ Set to build some programs without optional bzip2 support. Set to not build .Xr calendar 1 . .It Va WITHOUT_CAPSICUM -.\" $FreeBSD$ +.\" from FreeBSD: head/tools/build/options/WITHOUT_CAPSICUM 229319 2012-01-02 21:57:58Z rwatson Set to not build Capsicum support into system programs. .It Va WITHOUT_CDDL .\" from FreeBSD: head/tools/build/options/WITHOUT_CDDL 163861 2006-11-01 09:02:11Z jb @@ -930,12 +930,11 @@ When set, it also enforces the following options: .\" from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru Set to not build USB-related programs and libraries. .It Va WITHOUT_UTMPX -.\" from FreeBSD: head/tools/build/options/WITHOUT_UTMPX 223209 2011-06-17 21:30:21Z ed +.\" from FreeBSD: head/tools/build/options/WITHOUT_UTMPX 230060 2012-01-13 15:40:49Z ed Set to not build user accounting tools such as .Xr last 1 , .Xr users 1 , .Xr who 1 , -.Xr wtmpcvt 1 , .Xr ac 8 , .Xr lastlogin 8 and -- cgit v1.1 From a64dcf26c8fdd3be98274f2c948254bd1d683cb9 Mon Sep 17 00:00:00 2001 From: glebius Date: Sat, 14 Jan 2012 18:16:10 +0000 Subject: No need to run buildworld before generate-release.sh. --- share/man/man7/release.7 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index f527c24..2d66691 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 18, 2011 +.Dd January 14, 2012 .Dt RELEASE 7 .Os .Sh NAME @@ -316,9 +316,7 @@ The following sequence of commands can be used to build a .Dq "-CURRENT snapshot" in a clean environment, including ports and documentation: .Bd -literal -offset indent -cd /usr/src -make buildworld -cd release +cd /usr/src/release export CVSUP_HOST=cvsupN.freebsd.org sh generate-release.sh head /local3/release .Ed -- cgit v1.1 From c578dd940cf46033db16e2a6545bdf221612b85b Mon Sep 17 00:00:00 2001 From: dougb Date: Sat, 14 Jan 2012 21:51:44 +0000 Subject: Remove documentation for set_rcvar() now that it has been removed. --- share/man/man8/rc.8 | 6 +++--- share/man/man8/rc.subr.8 | 30 +----------------------------- 2 files changed, 4 insertions(+), 32 deletions(-) (limited to 'share') diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8 index 82737d4..56a33ce 100644 --- a/share/man/man8/rc.8 +++ b/share/man/man8/rc.8 @@ -35,7 +35,7 @@ .\" @(#)rc.8 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd November 17, 2009 +.Dd January 14, 2012 .Dt RC 8 .Os .Sh NAME @@ -485,7 +485,7 @@ Most scripts require little more than the following. \&. /etc/rc.subr name="foo" -rcvar=`set_rcvar` +rcvar=foo_enable command="/usr/local/bin/foo" load_rc_config $name @@ -506,7 +506,7 @@ The script may list and define as many commands at it needs. \&. /etc/rc.subr name="foo" -rcvar=`set_rcvar` +rcvar=foo_enable command="/usr/local/bin/foo" extra_commands="nop hello" hello_cmd="echo Hello World." diff --git a/share/man/man8/rc.subr.8 b/share/man/man8/rc.subr.8 index a3c759a..8ed2470 100644 --- a/share/man/man8/rc.subr.8 +++ b/share/man/man8/rc.subr.8 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 18, 2007 +.Dd January 14, 2012 .Dt RC.SUBR 8 .Os .Sh NAME @@ -73,8 +73,6 @@ .It .Ic run_rc_script Ar file Ar argument .It -.Ic set_rcvar Op Ar base -.It .Ic wait_for_pids Op Ar pid ... .It .Ic warn Ar message @@ -832,32 +830,6 @@ signal is sent to the parent process, which is assumed to be .Xr rc 8 . Otherwise, the shell exits with a non-zero status. -.It Ic set_rcvar Op Ar base -Set the variable name required to start a service. -In -.Fx -a daemon is usually controlled by an -.Xr rc.conf 5 -variable consisting of a daemon's name postfixed by the string -.Dq Li "_enable" . -This is not the case in -.Nx . -When the following line is included in a script: -.Pp -.Dl "rcvar=`set_rcvar`" -.Pp -this function will use the value of the -.Va $name -variable, which should be defined by the calling script, -to construct the appropriate -.Xr rc.conf 5 -knob. -If the -.Ar base -argument is set it will use -.Ar base -instead of -.Va $name . .It Ic wait_for_pids Op Ar pid ... Wait until all of the provided .Ar pids -- cgit v1.1 From a84af1b28cf33f23a875d32dc0f9a4ce3069588f Mon Sep 17 00:00:00 2001 From: mav Date: Sun, 15 Jan 2012 13:21:36 +0000 Subject: Major snd_hda driver rewrite: - Huge old hdac driver was split into three independent pieces: HDA controller driver (hdac), HDA CODEC driver (hdacc) and HDA sudio function driver (hdaa). - Support for multichannel recording was added. Now, as specification defines, driver checks input associations for pins with sequence numbers 14 and 15, and if found (usually) -- works as before, mixing signals together. If it doesn't, it configures input association as multichannel. - Signal tracer was improved to look for cases where several DACs/ADCs in CODEC can work with the same audio signal. If such case found, driver registers additional playback/record stream (channel) for the pcm device. - New controller streams reservation mechanism was implemented. That allows to have more pcm devices then streams supported by the controller (usually 4 in each direction). Now it limits only number of simultaneously transferred audio streams, that is rarely reachable and properly reported if happens. - Codec pins and GPIO signals configuration was exported via set of writable sysctls. Another sysctl dev.hdaa.X.reconfig allows to trigger driver reconfiguration in run-time. - Driver now decodes pins location and connector type names. In some cases it allows to hint user where on the system case connectors, related to the pcm device, are located. Number of channels supported by pcm device, reported now (if it is not 2), should also make search easier. - Added workaround for digital mic on some Asus laptops/netbooks. MFC after: 2 months Sponsored by: iXsystems, Inc. --- share/man/man4/snd_hda.4 | 343 +++++++++++++++++++---------------------------- 1 file changed, 136 insertions(+), 207 deletions(-) (limited to 'share') diff --git a/share/man/man4/snd_hda.4 b/share/man/man4/snd_hda.4 index 6dedb02..270a9f5 100644 --- a/share/man/man4/snd_hda.4 +++ b/share/man/man4/snd_hda.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 22, 2010 +.Dd January 11, 2012 .Dt SND_HDA 4 .Os .Sh NAME @@ -53,8 +53,9 @@ support for several logical audio devices, and general purpose DMA channels. .Pp The .Nm -driver is a HDA bus controller driver and HDA codecs audio functions bridge -driver that allows the generic audio driver, +driver includes HDA bus controller driver (hdac), HDA codec driver (hdacc) +and HDA codecs audio functions bridge driver (hdaa) that allows +the generic audio driver, .Xr sound 4 , to be used with this hardware. Only audio functions are supported by @@ -77,7 +78,9 @@ For example, one device for main rear 7.1 output and inputs, one device for independent headset connectors at front and one device for SPDIF or HDMI audio input/output. The assignment of audio inputs and outputs may be tuned with -.Xr device.hints 5 . +.Xr device.hints 5 +or +.Xr sysctl 8 . The driver's verbose boot messages provide a lot of information about the operation of the driver and present audio setup. .Pp @@ -92,19 +95,26 @@ The following variables are available at boot-time through the file: .Bl -tag -width ".Va hint.hdac.%d.config"-offset indent .It Va hint.hdac.%d.config -Configures a range of possible options. +Configures a range of possible controller options. Possible values are: +.Dq Li 64bit , .Dq Li dmapos , +.Dq Li msi . +An option prefixed with +.Dq Li no , +such as +.Dq Li nomsi , +will do the opposite and takes precedence. +Options can be separated by whitespace and commas. +.It Va hint.hdac.%d.msi +Controls MSI (Message Signaled Interrupts) support. +.It Va hint.hdac.%d.cad%d.nid%d.config +Same as +.Va hint.hdaa.%d.nid%d.config +.It Va hint.hdaa.%d.config +Configures a range of possible audio function options. +Possible values are: .Dq Li eapdinv , -.Dq Li gpio0 , -.Dq Li gpio1 , -.Dq Li gpio2 , -.Dq Li gpio3 , -.Dq Li gpio4 , -.Dq Li gpio5 , -.Dq Li gpio6 , -.Dq Li gpio7 , -.Dq Li gpioflush , .Dq Li ivref , .Dq Li ivref50 , .Dq Li ivref80 , @@ -126,22 +136,47 @@ such as will do the opposite and takes precedence. Options can be separated by whitespace and commas. .Pp +The +.Dq Li eapdinv +option inverts External Amplifier Power Down signal. +The +.Dq Li fixedrate +denies all sampling rates except 48KHz. +The +.Dq Li forcestereo +denies mono playback/recording. +The +.Dq Li senseinv +option inverts jack sensing logic. +The +.Dq Li ivref Ns Ar X +and +.Dq Li ovref Ns Ar X +options control the voltage used to power external microphones. +.It Va hint.hdaa.%d.gpio_config +Overrides audio function GPIO pins configuration set by BIOS. +May be specified as a set of space-separated +.Dq Ar num Ns = Ns Ar value +pairs, where +.Ar num +is GPIO line number, and +.Ar value +is one of: +.Dq Li keep , +.Dq Li set , +.Dq Li clear , +.Dq Li disable +and +.Dq Li input . +.Pp .Dq Li GPIO Ns s are a codec's General Purpose I/O pins which system integrators sometimes use to control external muters, amplifiers and so on. If you have no sound, or sound volume is not adequate, you may have to experiment a bit with the GPIO setup to find the optimal setup for your system. -.Pp -The -.Dq Li ivref Ns Ar X -and -.Dq Li ovref Ns Ar X -options control the voltage used to power external microphones. -.It Va hint.hdac.%d.msi -Controls MSI (Message Signaled Interrupts) support. -.It Va hint.hdac.%d.cad%d.nid%d.config -Overrides codec pin configuration set by BIOS. +.It Va hint.hdaa.%d.nid%d.config +Overrides audio function pin configuration set by BIOS. May be specified as a 32-bit hexadecimal value with a leading .Dq 0x , or as a set of space-separated @@ -165,7 +200,7 @@ The following options are supported: Association number. Associations are used to group individual pins to form a complex multi-pin device. -For example, to group 4 connectors for 7.1 output, or to treat several +For example, to group 4 connectors for 7.1 input/output, or to treat several input connectors as sources for the same input device. Association numbers can be specified as numeric values from 0 to 15. A value of 0 means disabled pin. @@ -180,16 +215,22 @@ A unique, per-association number used to order pins inside the particular association. Sequence numbers can be specified as numeric values from 0 to 15. .Pp -For output assotiations sequence numbers encode speaker pairs positions: -0 - Front, 1 - Center/LFE, 2 - Back, 3 - Front Wide Center, 4 - Side. -Standard combinations are: (0) - Stereo; (0, 2), (0, 4) - Quadro; -(0, 1, 2), (0, 1, 4) - 5.1; (0, 1, 2, 4) - 7.1. -.Pp The sequence number 15 has a special meaning for output associations. Output pins with this number and device type .Dq Ar Headphones will duplicate (with automatic mute if jack detection is supported) the first pin in that association. +.Pp +The sequence numbers 14 and 15 has a special meaning for input associations. +Their presence in association defines it as multiplexed or mixed respectively. +If none of them present and there are more then one pin in association, +the association will provide multichannel input. +.Pp +For multichannel input/output assotiations sequence numbers encode +channel pairs positions: +0 - Front, 1 - Center/LFE, 2 - Back, 3 - Front Wide Center, 4 - Side. +Standard combinations are: (0) - Stereo; (0, 2), (0, 4) - Quadro; +(0, 1, 2), (0, 1, 4) - 5.1; (0, 1, 2, 4) - 7.1. .It Va device Device type. Can be specified as a number from 0 to 15 or as a name: @@ -278,7 +319,11 @@ The following variables are available in addition to those available to all .Xr sound 4 devices: -.Bl -tag -width ".Va dev.hdac.%d.polling" -offset indent +.Bl -tag -width ".Va dev.hdaa.%d.nid%d_original" -offset indent +.It Va dev.hdac.%d.pindump +Setting this to a non-zero value dumps the current pin configuration, main +capabilities and jack sense status of all audio functions on the controller +to console and syslog. .It Va dev.hdac.%d.polling Enables polling mode. In this mode the driver operates by querying the device state on timer @@ -288,11 +333,30 @@ instead of interrupts. Polling is disabled by default. Do not enable it unless you are facing weird interrupt problems or if the device cannot generate interrupts at all. -.It Va dev.hdac.%d.polling_interval -Controller/Jack Sense polling interval (1-1000 ms) -.It Va dev.hdac.%d.pindump -Setting this to a non-zero value dumps the current pin configuration, main -capabilities and jack sense status to console and syslog. +.It Va dev.hdaa.%d.config +Run-time equivalent of the +.Va hint.hdaa.%d.config +tunable. +.It Va dev.hdaa.%d.gpi_state +Current state of GPI lines. +.It Va dev.hdaa.%d.gpio_state +Current state of GPIO lines. +.It Va dev.hdaa.%d.gpio_config +Run-time equivalent of the +.Va hint.hdaa.%d.gpio.config +tunable. +.It Va dev.hdaa.%d.gpo_state +Current state of GPO lines. +.It Va dev.hdaa.%d.nid%d_config +Run-time equivalent of the +.Va hint.hdaa.%d.nid%d.config +tunable. +.It Va dev.hdaa.%d.nid%d_original +Original pin configuration written by BIOS. +.It Va dev.hdaa.%d.reconfig +Setting this to a non-zero value makes driver to destroy existing pcm devices +and process new pins configuration set via +.Va dev.hdaa.%d.nid%d_config. .El .Sh EXAMPLES Taking HP Compaq DX2300 with Realtek ALC888 HDA codec for example. @@ -307,22 +371,23 @@ So high codec uniformity and flexibility allow driver to configure it in many different ways, depending on requested pins usage described by pins configuration. The driver reports such default pin configuration when verbose messages enabled: .Bd -literal -hdac0: nid 20 0x01014020 as 2 seq 0 Line-out Jack jack 1 loc 1 color Green misc 0 -hdac0: nid 21 0x99130110 as 1 seq 0 Speaker Fixed jack 3 loc 25 color Unknown misc 1 -hdac0: nid 22 0x411111f0 as 15 seq 0 Speaker None jack 1 loc 1 color Black misc 1 -hdac0: nid 23 0x411111f0 as 15 seq 0 Speaker None jack 1 loc 1 color Black misc 1 -hdac0: nid 24 0x01a19830 as 3 seq 0 Mic Jack jack 1 loc 1 color Pink misc 8 -hdac0: nid 25 0x02a1983f as 3 seq 15 Mic Jack jack 1 loc 2 color Pink misc 8 -hdac0: nid 26 0x01813031 as 3 seq 1 Line-in Jack jack 1 loc 1 color Blue misc 0 -hdac0: nid 27 0x0221401f as 1 seq 15 Headphones Jack jack 1 loc 2 color Green misc 0 -hdac0: nid 28 0x411111f0 as 15 seq 0 Speaker None jack 1 loc 1 color Black misc 1 -hdac0: nid 30 0x411111f0 as 15 seq 0 Speaker None jack 1 loc 1 color Black misc 1 -hdac0: nid 31 0x411111f0 as 15 seq 0 Speaker None jack 1 loc 1 color Black misc 1 +hdaa0: nid 0x as seq device conn jack loc color misc +hdaa0: 20 01014020 2 0 Line-out Jack 1/8 Rear Green 0 +hdaa0: 21 99130110 1 0 Speaker Fixed ATAPI Onboard Unknown 1 +hdaa0: 22 411111f0 15 0 Speaker None 1/8 Rear Black 1 DISA +hdaa0: 23 411111f0 15 0 Speaker None 1/8 Rear Black 1 DISA +hdaa0: 24 01a19830 3 0 Mic Jack 1/8 Rear Pink 8 +hdaa0: 25 02a1983f 3 15 Mic Jack 1/8 Front Pink 8 +hdaa0: 26 01813031 3 1 Line-in Jack 1/8 Rear Blue 0 +hdaa0: 27 0221401f 1 15 Headphones Jack 1/8 Front Green 0 +hdaa0: 28 411111f0 15 0 Speaker None 1/8 Rear Black 1 DISA +hdaa0: 30 411111f0 15 0 Speaker None 1/8 Rear Black 1 DISA +hdaa0: 31 411111f0 15 0 Speaker None 1/8 Rear Black 1 DISA .Ed .Pp Here we can see, that the nodes with ID (nid) 25 and 27 are front panel -connectors (Jack, loc 2), nids 20, 24 and 26 are rear panel connectors -(Jack, loc 1) and nid 21 is a built-in speaker (Fixed, loc 25). +connectors (Jack, Front), nids 20, 24 and 26 are rear panel connectors +(Jack, Rear) and nid 21 is a built-in speaker (Fixed, Onboard). Pins with nids 22, 23, 28, 30 and 31 will be disabled by driver due to "None" connectivity. So the pin count and description matches to connectors that we have. @@ -330,15 +395,15 @@ we have. Using association (as) and sequence (seq) fields values pins are grouped into 3 associations: .Bd -literal -hdac0: Association 0 (1) out: -hdac0: Pin nid=21 seq=0 -hdac0: Pin nid=27 seq=15 -hdac0: Association 1 (2) out: -hdac0: Pin nid=20 seq=0 -hdac0: Association 2 (3) in: -hdac0: Pin nid=24 seq=0 -hdac0: Pin nid=26 seq=1 -hdac0: Pin nid=25 seq=15 +hdaa0: Association 0 (1) out: +hdaa0: Pin nid=21 seq=0 +hdaa0: Pin nid=27 seq=15 +hdaa0: Association 1 (2) out: +hdaa0: Pin nid=20 seq=0 +hdaa0: Association 2 (3) in: +hdaa0: Pin nid=24 seq=0 +hdaa0: Pin nid=26 seq=1 +hdaa0: Pin nid=25 seq=15 .Ed .Pp Each @@ -497,148 +562,14 @@ Most of controls use logarithmic scale. .Sh HARDWARE The .Nm -driver supports many Intel HDA compatible audio chipsets including the -following: -.Pp -.Bl -bullet -compact -.It -ATI SB450 -.It -ATI SB600 -.It -Intel 631x/632xESB -.It -Intel 82801F (ICH6) -.It -Intel 82801G (ICH7) -.It -Intel 82801H (ICH8) -.It -Intel 82801I (ICH9) -.It -Intel 82801J (ICH10) -.It -Intel US15W (SCH) -.It -nVidia MCP51 -.It -nVidia MCP55 -.It -nVidia MCP61A -.It -nVidia MCP61B -.It -nVidia MCP63 -.It -nVidia MCP65A -.It -nVidia MCP65B -.It -nVidia MCP67A -.It -nVidia MCP67B -.It -nVidia MCP68 -.It -nVidia MCP69 -.It -nVidia MCP73 -.It -nVidia MCP78 -.It -nVidia MCP79 -.It -nVidia MCP89 -.It -SiS 966 -.It -VIA VT8251/8237A -.El -.Pp -The following and many other codecs have been verified to work: +driver supports controllers having PCI class 4 (multimedia) and +subclass 3 (HDA), compatible with Intel HDA specification. .Pp -.Bl -bullet -compact -.It -Analog Devices AD1981HD -.It -Analog Devices AD1983 -.It -Analog Devices AD1984 -.It -Analog Devices AD1986A -.It -Analog Devices AD1988 -.It -Analog Devices AD1988B -.It -CMedia CMI9880 -.It -Conexant CX20549 (Venice) -.It -Conexant CX20551 (Waikiki) -.It -Conexant CX20561 (Hermosa) -.It -Realtek ALC260 -.It -Realtek ALC262 -.It -Realtek ALC268 -.It -Realtek ALC660 -.It -Realtek ALC861 -.It -Realtek ALC861VD -.It -Realtek ALC880 -.It -Realtek ALC882 -.It -Realtek ALC883 -.It -Realtek ALC885 -.It -Realtek ALC888 -.It -Realtek ALC889 -.It -Sigmatel STAC9205 -.It -Sigmatel STAC9220 -.It -Sigmatel STAC9220D / 9223D -.It -Sigmatel STAC9221 -.It -Sigmatel STAC9221D -.It -Sigmatel STAC9227D -.It -Sigmatel STAC9227X -.It -Sigmatel STAC9228D -.It -Sigmatel STAC9228X -.It -Sigmatel STAC9229D -.It -Sigmatel STAC9229X -.It -Sigmatel STAC9230D -.It -Sigmatel STAC9230X -.It -Sigmatel STAC9271D -.It -Sigmatel STAC9872AK -.It -VIA VT1708 -.It -VIA VT1708B -.It -VIA VT1709 -.El +The +.Nm +driver supports more then two hundred different controllers and CODECs. +There is no sense to list all of them here, as in most cases specific CODEC +configuration and wiring are more important then type of the CODEC itself. .Sh SEE ALSO .Xr sound 4 , .Xr snd_ich 4 , @@ -665,19 +596,17 @@ This manual page was written by and .An Giorgos Keramidas Aq keramida@FreeBSD.org . .Sh BUGS -A few Hardware/OEM vendors tend to screw up BIOS settings, thus -rendering the -.Nm -driver useless. -This usually results in a state where the +Some Hardware/OEM vendors tend to screw up BIOS settings or use custom +unusual CODEC wiring that create problems to the driver. +This may result in missing pcm devices, or a state where the .Nm driver seems to attach and work, but no sound is played. Some cases can be solved by tuning .Pa loader.conf variables. -Before trying to fix problem that way, make sure that there really is a problem -and that the PCM audio device in use really corresponds to the expected -audio connector. +But before trying to fix problem that way, make sure that there really is +a problem and that the PCM audio device in use really corresponds to the +expected audio connector. .Pp Some vendors use non-standardized General Purpose I/O (GPIO) pins of the codec to control external amplifiers. -- cgit v1.1 From a5c88f4732cc58341150fbb685858567a8fa7489 Mon Sep 17 00:00:00 2001 From: yongari Date: Tue, 17 Jan 2012 22:17:11 +0000 Subject: Document dev.bge.%d.msi_disable tunable. --- share/man/man4/bge.4 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4 index 13a4aa6..7a20d2a 100644 --- a/share/man/man4/bge.4 +++ b/share/man/man4/bge.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 2, 2011 +.Dd January 17, 2012 .Dt BGE 4 .Os .Sh NAME @@ -188,7 +188,7 @@ SysKonnect SK-9D21 (10/100/1000baseTX) SysKonnect SK-9D41 (1000baseSX) .El .Sh LOADER TUNABLES -The following tunable can be set at the +The following tunables can be set at the .Xr loader 8 prompt before booting the kernel, or stored in .Xr loader.conf 5 . @@ -197,6 +197,9 @@ prompt before booting the kernel, or stored in Allow the ASF feature for cooperating with IPMI. Can cause system lockup problems on a small number of systems. Enabled by default. +.It Va dev.bge.%d.msi_disable +Non-zero value disables MSI support on the Ethernet hardware. +The default value is 0. .El .Sh SYSCTL VARIABLES The following variables are available as both -- cgit v1.1 From 13ac35b1854f976ab055d43f9aacc540992a1615 Mon Sep 17 00:00:00 2001 From: kevlo Date: Wed, 18 Jan 2012 02:27:09 +0000 Subject: vfs_object_create() function is obsolete. Use vnode_create_vobject() to create the backing object. Reviewed by: kib --- share/man/man9/vnode.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9 index cfc6f7d..eba208f 100644 --- a/share/man/man9/vnode.9 +++ b/share/man/man9/vnode.9 @@ -119,13 +119,13 @@ No type. .It Dv VREG A regular file; may be with or without VM object backing. If you want to make sure this get a backing object, call -.Xr vfs_object_create 9 . +.Fn vnode_create_vobject . .It Dv VDIR A directory. .It Dv VBLK A block device; may be with or without VM object backing. If you want to make sure this get a backing object, call -.Xr vfs_object_create 9 . +.Fn vnode_create_vobject . .It Dv VCHR A character device. .It Dv VLNK -- cgit v1.1 From 6ac4c5fe321a5eebc8362b1b424749e90f182419 Mon Sep 17 00:00:00 2001 From: kevlo Date: Wed, 18 Jan 2012 02:29:11 +0000 Subject: NOOBJ is long time dead Reviewed by: kib --- share/man/man9/namei.9 | 4 ---- 1 file changed, 4 deletions(-) (limited to 'share') diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9 index c941004..f643a3f 100644 --- a/share/man/man9/namei.9 +++ b/share/man/man9/namei.9 @@ -196,10 +196,6 @@ With this flag, will follow the symbolic link if the last part of the path supplied is a symbolic link (i.e., it will return a vnode for whatever the link points at, instead for the link itself). -.It Dv NOOBJ -Do not call -.Fn vfs_object_create -for the returned vnode, even though it meets required criteria for VM support. .It Dv NOFOLLOW Do not follow symbolic links (pseudo). This flag is not looked for by the actual code, which looks for -- cgit v1.1 From 623ee56937b7b5667a6079f6c1bb83c2ed2ecbbc Mon Sep 17 00:00:00 2001 From: lstewart Date: Wed, 18 Jan 2012 03:03:21 +0000 Subject: Specify the correct section (4 instead of 9) in the h_ertt man page's title and bump the document date. MFC after: 3 days --- share/man/man4/h_ertt.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/h_ertt.4 b/share/man/man4/h_ertt.4 index 70ed36d..3dbedab 100644 --- a/share/man/man4/h_ertt.4 +++ b/share/man/man4/h_ertt.4 @@ -29,8 +29,8 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2011 -.Dt H_ERTT 9 +.Dd January 18, 2012 +.Dt H_ERTT 4 .Os .Sh NAME .Nm h_ertt -- cgit v1.1 From 7972e45b2052402d891e3dd144472547dac25ec6 Mon Sep 17 00:00:00 2001 From: schweikh Date: Wed, 18 Jan 2012 14:41:26 +0000 Subject: Comment cosmetics: end more sentences with full stops. --- share/examples/etc/make.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index d3cdf3e7..05872ff 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -91,13 +91,13 @@ # #COPTFLAGS= -O -pipe # -# Compare before install +# Compare before install. #INSTALL=install -C # -# Mtree will follow symlinks +# Mtree will follow symlinks. #MTREE_FOLLOWS_SYMLINKS= -L # -# To enable installing ssh(1) with the setuid bit turned on +# To enable installing ssh(1) with the setuid bit turned on. #ENABLE_SUID_SSH= # # To enable installing newgrp(1) with the setuid bit turned on. @@ -117,7 +117,7 @@ # #TRACEROUTE_NO_IPSEC= # do not build traceroute(8) with IPSEC support # -# To build sys/modules when building the world (our old way of doing things) +# To build sys/modules when building the world (our old way of doing things). #MODULES_WITH_WORLD= # do not build modules when building kernel # # The list of modules to build instead of all of them. @@ -133,7 +133,7 @@ # # # Default format for system documentation, depends on your printer. -# Set this to "ascii" for simple printers or screen +# Set this to "ascii" for simple printers or screen. # #PRINTERDEVICE= ps # @@ -199,7 +199,7 @@ # # Documentation # -# The list of languages and encodings to build and install +# The list of languages and encodings to build and install. # #DOC_LANG= en_US.ISO8859-1 ru_RU.KOI8-R # -- cgit v1.1 From 1e5d8b382dc92a9fe55fa15415eeaaccdc6539d9 Mon Sep 17 00:00:00 2001 From: sbruno Date: Wed, 18 Jan 2012 21:27:49 +0000 Subject: Update man page to show that ciss(4) now support the P420 MFC with r230313 Caught by: brueffer Obtained from: Yahoo! Inc MFC after: 2 weeks --- share/man/man4/ciss.4 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4 index f975707..fb080af 100644 --- a/share/man/man4/ciss.4 +++ b/share/man/man4/ciss.4 @@ -131,6 +131,8 @@ HP Smart Array P410i .It HP Smart Array P411 .It +HP Smart Array P420 +.It HP Smart Array P600 .It HP Smart Array P800 -- cgit v1.1 From e9eb3a867cff40b2681bf414f051e9a3edcbc591 Mon Sep 17 00:00:00 2001 From: sbruno Date: Wed, 18 Jan 2012 22:52:02 +0000 Subject: Update .Dd date on this man page. MFC with r230313 and r230316 Caught by: bz Obtained from: Yahoo! Inc. --- share/man/man4/ciss.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4 index fb080af..bf9ce87 100644 --- a/share/man/man4/ciss.4 +++ b/share/man/man4/ciss.4 @@ -2,7 +2,7 @@ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" -.Dd November 3, 2005 +.Dd January 18, 2012 .Dt CISS 4 .Os .Sh NAME -- cgit v1.1 From bb9610f591b07845e5a6537a35493f46defabb90 Mon Sep 17 00:00:00 2001 From: kevlo Date: Thu, 19 Jan 2012 02:49:21 +0000 Subject: Add missing MLINKS to INDEX.5 --- share/man/man5/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index fdf3b33..b05c1eb 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -76,6 +76,7 @@ MLINKS+=fs.5 inode.5 MLINKS+=hosts.equiv.5 rhosts.5 MLINKS+=msdosfs.5 msdos.5 MLINKS+=passwd.5 master.passwd.5 +MLINKS+=portindex.5 INDEX.5 MLINKS+=quota.user.5 quota.group.5 MLINKS+=rc.conf.5 rc.conf.local.5 MLINKS+=resolver.5 resolv.conf.5 -- cgit v1.1 From ea418e7d74ca6f7d3f1b25f6adc283124297c9d0 Mon Sep 17 00:00:00 2001 From: ed Date: Thu, 19 Jan 2012 09:51:07 +0000 Subject: Remove remnants of dev_t. These functions take a `struct cdev *' -- not a dev_t. Inside the kernel, dev_t has the same use as in userspace, namely to store a device identifier. MFC after: 2 weeks --- share/man/man9/DEV_MODULE.9 | 4 ++-- share/man/man9/devtoname.9 | 6 +++--- share/man/man9/physio.9 | 4 ++-- share/man/man9/uio.9 | 4 ++-- share/man/man9/vcount.9 | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'share') diff --git a/share/man/man9/DEV_MODULE.9 b/share/man/man9/DEV_MODULE.9 index 13a81c1..28465b3 100644 --- a/share/man/man9/DEV_MODULE.9 +++ b/share/man/man9/DEV_MODULE.9 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 11, 2001 +.Dd January 19, 2012 .Dt DEV_MODULE 9 .Os .Sh NAME @@ -68,7 +68,7 @@ on load and to destroy it when it is unloaded using static struct cdevsw foo_devsw = { ... }; -static dev_t sdev; +static struct cdev *sdev; static int foo_load(module_t mod, int cmd, void *arg) diff --git a/share/man/man9/devtoname.9 b/share/man/man9/devtoname.9 index f93e77b..0e6e0db 100644 --- a/share/man/man9/devtoname.9 +++ b/share/man/man9/devtoname.9 @@ -24,17 +24,17 @@ .\" .\" $FreeBSD$ .\" -.Dd September 25, 1999 +.Dd January 19, 2012 .Dt DEVTONAME 9 .Os .Sh NAME .Nm devtoname -.Nd "converts dev_t data into a string indicating the device name" +.Nd "converts character device into a string indicating the device name" .Sh SYNOPSIS .In sys/param.h .In sys/conf.h .Ft const char * -.Fn devtoname "dev_t dev" +.Fn devtoname "struct cdev *dev" .Sh DESCRIPTION The .Fn devtoname diff --git a/share/man/man9/physio.9 b/share/man/man9/physio.9 index 7d7174e..977c467 100644 --- a/share/man/man9/physio.9 +++ b/share/man/man9/physio.9 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 8, 2004 +.Dd January 19, 2012 .Dt PHYSIO 9 .Os .Sh NAME @@ -41,7 +41,7 @@ .In sys/bio.h .In sys/buf.h .Ft int -.Fn physio "dev_t dev" "struct uio *uio" "int ioflag" +.Fn physio "struct cdev *dev" "struct uio *uio" "int ioflag" .Sh DESCRIPTION The .Fn physio diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9 index 9d569b7..fd66e3d 100644 --- a/share/man/man9/uio.9 +++ b/share/man/man9/uio.9 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 9, 2011 +.Dd January 19, 2012 .Dt UIO 9 .Os .Sh NAME @@ -154,7 +154,7 @@ static char buffer[BUFSIZE]; static int data_available; /* amount of data that can be read */ static int -fooread(dev_t dev, struct uio *uio, int flag) +fooread(struct cdev *dev, struct uio *uio, int flag) { int rv, amnt; diff --git a/share/man/man9/vcount.9 b/share/man/man9/vcount.9 index 41263b9..186a350 100644 --- a/share/man/man9/vcount.9 +++ b/share/man/man9/vcount.9 @@ -32,7 +32,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 6, 2001 +.Dd January 19, 2012 .Dt VCOUNT 9 .Os .Sh NAME @@ -47,7 +47,7 @@ .Ft int .Fn vcount "struct vnode *vp" .Ft int -.Fn count_dev "dev_t dev" +.Fn count_dev "struct cdev *dev" .Sh DESCRIPTION .Fn vcount is used to get the number of references to a particular device. @@ -56,7 +56,7 @@ It allows for the fact that multiple vnodes may reference the same device. does the same thing as .Fn vcount , but takes a -.Vt dev_t +.Vt "struct cdev" rather than a .Vt "struct vnode" pointer as an argument. -- cgit v1.1 From 4e8b44a024a885568ac9b29289d2d8637925925b Mon Sep 17 00:00:00 2001 From: yongari Date: Thu, 19 Jan 2012 20:31:29 +0000 Subject: Reflect tunable name change made in r230337. --- share/man/man4/bge.4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man4/bge.4 b/share/man/man4/bge.4 index 7a20d2a..dc31ff6 100644 --- a/share/man/man4/bge.4 +++ b/share/man/man4/bge.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 17, 2012 +.Dd January 19, 2012 .Dt BGE 4 .Os .Sh NAME @@ -197,9 +197,9 @@ prompt before booting the kernel, or stored in Allow the ASF feature for cooperating with IPMI. Can cause system lockup problems on a small number of systems. Enabled by default. -.It Va dev.bge.%d.msi_disable -Non-zero value disables MSI support on the Ethernet hardware. -The default value is 0. +.It Va dev.bge.%d.msi +Non-zero value enables MSI support on the Ethernet hardware. +The default value is 1. .El .Sh SYSCTL VARIABLES The following variables are available as both -- cgit v1.1 From 5d0a4619603c5a23a070725ec7221cd056bbc559 Mon Sep 17 00:00:00 2001 From: brueffer Date: Sun, 22 Jan 2012 10:16:24 +0000 Subject: General cleanup. Prodded by: grehan --- share/man/man4/virtio.4 | 21 +++++++++++---------- share/man/man4/virtio_balloon.4 | 6 +++--- share/man/man4/virtio_blk.4 | 6 +++--- share/man/man4/vtnet.4 | 15 ++++++++------- 4 files changed, 25 insertions(+), 23 deletions(-) (limited to 'share') diff --git a/share/man/man4/virtio.4 b/share/man/man4/virtio.4 index 7787051..030f0aa 100644 --- a/share/man/man4/virtio.4 +++ b/share/man/man4/virtio.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 4, 2011 +.Dd January 22, 2012 .Dt VIRTIO 4 .Os .Sh NAME @@ -48,24 +48,25 @@ virtio_pci_load="YES" .Sh DESCRIPTION VirtIO is a specification for para-virtualized I/O in a virtual machine (VM). Traditionally, the hypervisor emulated real devices such as an Ethernet -interface or disk controller to provide the VM with I/O. This emulation is -often inefficient. +interface or disk controller to provide the VM with I/O. +This emulation is often inefficient. .Pp VirtIO defines an interface for efficient I/O between the hypervisor and VM. -The -.Xr virtio 4 +The +.Xr virtio 4 module provides a shared memory transport called a virtqueue. The .Xr virtio_pci 4 device driver represents an emulated PCI device that the hypervisor makes -available to the VM. This device provides the probing, configuration, and -interrupt notifications need to interact with the hypervisor. +available to the VM. +This device provides the probing, configuration, and +interrupt notifications needed to interact with the hypervisor. .Fx supports the following VirtIO devices: .Bl -hang -offset indent -width xxxxxxxx .It Nm Ethernet An emulated Ethernet device is provided by the -.Xr if_vtnet 4 +.Xr vtnet 4 device driver. .It Nm Block An emulated disk controller is provided by the @@ -78,9 +79,9 @@ provided by the device driver. .El .Sh SEE ALSO -.Xr if_vtnet 4 , +.Xr virtio_balloon 4 , .Xr virtio_blk 4 , -.Xr virtio_balloon 4 +.Xr vtnet 4 .Sh HISTORY Support for VirtIO first appeared in .Fx 9.0 . diff --git a/share/man/man4/virtio_balloon.4 b/share/man/man4/virtio_balloon.4 index 4053f78..96e8c73 100644 --- a/share/man/man4/virtio_balloon.4 +++ b/share/man/man4/virtio_balloon.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 4, 2011 +.Dd January 22, 2012 .Dt VIRTIO_BALLOON 4 .Os .Sh NAME @@ -51,8 +51,8 @@ device driver provides support for VirtIO memory balloon devices. .Pp The memory balloon allows the guest to, at the request of the hypervisor, return memory allocated to the hypervisor so it can -be made available to other guests. The hypervisor can later -signal the balloon to return the memory. +be made available to other guests. +The hypervisor can later signal the balloon to return the memory. .Sh SEE ALSO .Xr virtio 4 .Sh HISTORY diff --git a/share/man/man4/virtio_blk.4 b/share/man/man4/virtio_blk.4 index 4250141..7be4425 100644 --- a/share/man/man4/virtio_blk.4 +++ b/share/man/man4/virtio_blk.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 4, 2011 +.Dd January 22, 2012 .Dt VIRTIO_BLK 4 .Os .Sh NAME @@ -48,7 +48,6 @@ virtio_blk_load="YES" The .Nm device driver provides support for VirtIO block devices. -.Pp .Sh LOADER TUNABLES Tunables can be set at the .Xr loader 8 @@ -57,7 +56,8 @@ prompt before booting the kernel or stored in .Bl -tag -width "xxxxxx" .It Va hw.vtblk.no_ident This tunable disables retrieving the device identification string -from the hypervisor. The default value is 0. +from the hypervisor. +The default value is 0. .El .Sh SEE ALSO .Xr virtio 4 diff --git a/share/man/man4/vtnet.4 b/share/man/man4/vtnet.4 index 900d12d..febb0ac 100644 --- a/share/man/man4/vtnet.4 +++ b/share/man/man4/vtnet.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 4, 2011 +.Dd January 22, 2012 .Dt VTNET 4 .Os .Sh NAME @@ -62,7 +62,6 @@ utility configures the adapter to receive and transmit Jumbo Frames. .Pp For more information on configuring this device, see .Xr ifconfig 8 . -.El .Sh LOADER TUNABLES Tunables can be set at the .Xr loader 8 @@ -70,19 +69,21 @@ prompt before booting the kernel or stored in .Xr loader.conf 5 . .Bl -tag -width "xxxxxx" .It Va hw.vtnet.csum_disable -This tunable disables receive and send checksum offload. The default -value is 0. +This tunable disables receive and send checksum offload. +The default value is 0. .It Va hw.vtnet.tso_disable -This tunable disables TSO. The default value is 0. +This tunable disables TSO. +The default value is 0. .It Va hw.vtnet.lro_disable -This tunable disables LRO. The default value is 0. +This tunable disables LRO. +The default value is 0. .El .Sh SEE ALSO .Xr arp 4 , .Xr netintro 4 , .Xr ng_ether 4 , -.Xr vlan 4 , .Xr virtio 4 , +.Xr vlan 4 , .Xr ifconfig 8 .Sh HISTORY The -- cgit v1.1 From f317ff0f6559bac3c7a0ee926ba002b29cdf2d53 Mon Sep 17 00:00:00 2001 From: brueffer Date: Sun, 22 Jan 2012 13:51:20 +0000 Subject: Connect VirtIO-related manpages to the build. --- share/man/man4/Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 01c75ca..e935472 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -505,11 +505,15 @@ MAN= aac.4 \ viapm.4 \ ${_viawd.4} \ vinum.4 \ + ${_virtio.4} \ + ${_virtio_balloon.4} \ + ${_virtio_blk.4} \ vkbd.4 \ vlan.4 \ vpo.4 \ vr.4 \ vte.4 \ + ${_vtnet.4} \ ${_vxge.4} \ watchdog.4 \ wb.4 \ @@ -656,6 +660,7 @@ MLINKS+=vge.4 if_vge.4 MLINKS+=vlan.4 if_vlan.4 MLINKS+=vpo.4 imm.4 MLINKS+=vr.4 if_vr.4 +MLINKS+=${_vtnet.4} ${_if_vtnet.4} MLINKS+=${_vxge.4} ${_if_vxge.4} MLINKS+=watchdog.4 SW_WATCHDOG.4 MLINKS+=wb.4 if_wb.4 @@ -699,6 +704,7 @@ _if_nfe.4= if_nfe.4 _if_nve.4= if_nve.4 _if_nxge.4= if_nxge.4 _if_urtw.4= if_urtw.4 +_if_vtnet.4= if_vtnet.4 _if_vxge.4= if_vxge.4 _if_wpi.4= if_wpi.4 _ipmi.4= ipmi.4 @@ -711,6 +717,10 @@ _nfsmb.4= nfsmb.4 _nve.4= nve.4 _nvram.4= nvram.4 _nxge.4= nxge.4 +_virtio.4= virtio.4 +_virtio_balloon.4=virtio_balloon.4 +_virtio_blk.4= virtio_blk.4 +_vtnet.4= vtnet.4 _vxge.4= vxge.4 _padlock.4= padlock.4 _rr232x.4= rr232x.4 -- cgit v1.1 From 47a267281a18c3ec6dae857fa3d241f0291d5d7e Mon Sep 17 00:00:00 2001 From: stefanf Date: Sun, 22 Jan 2012 14:04:42 +0000 Subject: Document the values for hw.snd.default_auto. --- share/man/man4/pcm.4 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index 333033d..268e784 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 31, 2011 +.Dd January 22, 2012 .Dt SOUND 4 .Os .Sh NAME @@ -324,8 +324,17 @@ for Linux applications, and deny for everything else. Always allow PROT_EXEC page mappings. .El .It Va hw.snd.default_auto -Enable to automatically assign default sound unit to the most recent -attached device. +Automatically assign the default sound unit. +The following values are supported (default is 1): +.Bl -tag -width 2n +.It 0 +Do not assign the default sound unit automatically. +.It 1 +Use the best available sound device based on playing and recording +capabilities of the device. +.It 2 +Use the most recently attached device. +.El .It Va hw.snd.default_unit Default sound card for systems with multiple sound cards. When using -- cgit v1.1 From a4790143eb0c867b98963f6d4a12591d6b721af9 Mon Sep 17 00:00:00 2001 From: jimharris Date: Mon, 23 Jan 2012 22:30:09 +0000 Subject: Add man page and update a few other files in preparation for committing full isci driver. Sponsored by: Intel Reviewed by: scottl --- share/man/man4/Makefile | 1 + share/man/man4/isci.4 | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 share/man/man4/isci.4 (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b366dd5..6f87417 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -179,6 +179,7 @@ MAN= aac.4 \ ipsec.4 \ ipw.4 \ ipwfw.4 \ + isci.4 \ iscsi_initiator.4 \ isp.4 \ ispfw.4 \ diff --git a/share/man/man4/isci.4 b/share/man/man4/isci.4 new file mode 100644 index 0000000..4d00dc8 --- /dev/null +++ b/share/man/man4/isci.4 @@ -0,0 +1,110 @@ +.\" +.\" Copyright (c) 2012 Intel Corporation +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions, and the following disclaimer, +.\" without modification. +.\" 2. Redistributions in binary form must reproduce at minimum a disclaimer +.\" substantially similar to the "NO WARRANTY" disclaimer below +.\" ("Disclaimer") and any redistribution must be conditioned upon +.\" including a substantially similar Disclaimer requirement for further +.\" binary redistribution. +.\" +.\" NO WARRANTY +.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +.\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR +.\" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +.\" HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGES. +.\" +.\" isci driver man page. +.\" +.\" Author: Jim Harris +.\" +.\" $FreeBSD$ +.\" +.Dd January 23, 2012 +.Dt ISCI 4 +.Os +.Sh NAME +.Nm isci +.Nd Intel C600 Serial Attached SCSI driver +.Sh SYNOPSIS +To compile this driver into your kernel, +place the following lines in your kernel configuration file: +.Bd -ragged -offset indent +.Cd "device scbus" +.Cd "device isci" +.Ed +.Pp +Or, to load the driver as a module at boot, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +isci_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for Intel C600 +.Tn SAS +controller. +.Sh CONFIGURATION +To force legacy interrupts for all +.Nm +driver instances, set the following tunable value in +.Xr loader.conf 5 : +.Bd -literal -offset indent +hw.isci.force_legacy_interrupts=1 +.Ed +.Sh DEBUGGING +To enable debugging prints from the +.Nm +driver, set the +.Bd -literal -offset indent +hw.isci.debug_level +.Ed +.Pp +variable to a value between 1 and 4 in +.Xr loader.conf 5 . +.Pp +The hardware layer in the isci driver has extensive logging capabilities +which are disabled by default for performance reasons. These can be enabled +by adding +.Bd -literal -offset indent +options ISCI_LOGGING +.Ed +.Pp +to the kernel configuration file. +.Sh SEE ALSO +.Xr cd 4 , +.Xr ch 4 , +.Xr da 4 , +.Xr pci 4 , +.Xr sa 4 , +.Xr scsi 4 . +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 10.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was developed by Intel and originally written by +.An Jim Harris Aq jimharris@FreeBSD.org +with contributions from Sohaib Ahsan and input from +.An Scott Long Aq scottl@FreeBSD.org . +.Pp +This man page was written by +.An Jim Harris Aq jimharris@FreeBSD.org . -- cgit v1.1 From cdbeb8d33063265e76190128852d224f1e09acb9 Mon Sep 17 00:00:00 2001 From: imp Date: Wed, 25 Jan 2012 04:45:29 +0000 Subject: Some minor additions to the list of supported devices... --- share/man/man4/ed.4 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4 index 6217669..d002b96 100644 --- a/share/man/man4/ed.4 +++ b/share/man/man4/ed.4 @@ -139,7 +139,7 @@ Allied Telesis SIC-98, SIC-98NOTE (110pin), SIU-98 (flags 0x600000) (PC-98) .It Allied Telesis SIU-98-D (flags 0x610000) (PC-98) .It -AmbiCom 10BaseT card +AmbiCom 10BaseT card (8002, 8002T, 8010 and 8610) .It Bay Networks NETGEAR FA410TXC Fast Ethernet .It @@ -147,11 +147,15 @@ Belkin F5D5020 PC Card Fast Ethernet .It Billionton LM5LT-10B Ethernet/Modem PC Card .It +Billionton LNT-10TB, LNT-10TN Ethernet PC Card +.It Bromax iPort 10/100 Ethernet PC Card .It Bromax iPort 10 Ethernet PC Card .It -Buffalo LPC2-CLT, LPC3-CLT, LPC3-CLX, LPC4-TX PC Card +Buffalo LPC2-CLT, LPC3-CLT, LPC3-CLX, LPC4-TX, LPC-CTX PC Card +.It +Buffalo LPC-CF-CLT CF Card .It CNet BC40 adapter .It -- cgit v1.1 From 30761935c6caad4e8f25453ffd5804be83563d02 Mon Sep 17 00:00:00 2001 From: mav Date: Wed, 25 Jan 2012 20:46:10 +0000 Subject: Rewrite jack presence detection and implement automatic recording source selection in snd_hda(4) driver. Now driver tracks jack presence detection status for every CODEC pin. For playback associations, when configured, that information, same as before, can be used to automatically redirect audio to headphones. Also same as before, these events are used to track digital display connection status and fetch ELD. Now in addition to that driver uses that information to automatically switch recording source of the mixer to the connected input. When there are devices with no jack detection and with one both connected, last ones will have the precedence. As result, on most laptops after boot internal microphone should be automatically selected. But if external one (for example, headset) connected, it will be selected automatically. When external mic disconnected, internal one will be selected again. Automatic recording source selection is enabled by default now to make recording work out of the box without touching mixer. But it can be disabled or limited only to attach time using hint.pcm.X.rec.autosrc loader tunables or dev.pcm.X.rec.autosrc sysctls. MFC after: 2 months Sponsored by: iXsystems, Inc. --- share/man/man4/snd_hda.4 | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/snd_hda.4 b/share/man/man4/snd_hda.4 index 270a9f5..bcdd95a 100644 --- a/share/man/man4/snd_hda.4 +++ b/share/man/man4/snd_hda.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 11, 2012 +.Dd January 25, 2012 .Dt SND_HDA 4 .Os .Sh NAME @@ -182,6 +182,18 @@ May be specified as a 32-bit hexadecimal value with a leading or as a set of space-separated .Dq Ar option Ns = Ns Ar value pairs. +.It Va hint.pcm.%d.rec.autosrc +Controls automatic recording source feature: +.Bl -tag -compact +.It 0 +disabled, +.It 1 +once on attach, +.It 2 +enabled. +.El +When enabled, driver will automatically set recording source of the mixer to +connected input using jack presence detection statuses. .El .Pp Pin configuration is the UAA driver's main source of information about codec @@ -357,6 +369,16 @@ Original pin configuration written by BIOS. Setting this to a non-zero value makes driver to destroy existing pcm devices and process new pins configuration set via .Va dev.hdaa.%d.nid%d_config. +.It Va dev.pcm.%d.play.32bit , dev.pcm.%d.rec.32bit +HDA controller uses 32bit representation for all samples of more then 16 bits. +These variables allow to specify how many bits of these 32 should be +used by CODEC. +Depending on codec capabilities, possible values are 20, 24 and 32 bit. +The default value is 24. +.It Va dev.pcm.%d.rec.autosrc +Run-time equivalent of the +.Va hint.pcm.%d.rec.autosrc +tunable. .El .Sh EXAMPLES Taking HP Compaq DX2300 with Realtek ALC888 HDA codec for example. -- cgit v1.1 From 12d5141ba3c575ba8adfb1ff9baa411bb792e637 Mon Sep 17 00:00:00 2001 From: glebius Date: Thu, 26 Jan 2012 10:42:25 +0000 Subject: Update information on setting and retreiving inet4 addresses. --- share/man/man4/inet.4 | 49 +++++++++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 18 deletions(-) (limited to 'share') diff --git a/share/man/man4/inet.4 b/share/man/man4/inet.4 index e64b60a..09cb0bc 100644 --- a/share/man/man4/inet.4 +++ b/share/man/man4/inet.4 @@ -32,7 +32,7 @@ .\" From: @(#)inet.4 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd April 9, 2005 +.Dd January 26, 2012 .Dt INET 4 .Os .Sh NAME @@ -130,25 +130,37 @@ The .Tn ICMP message protocol is accessible from a raw socket. .Pp -The 32-bit Internet address contains both network and host parts. -However, direct examination of addresses is discouraged. -For those -programs which absolutely need to break addresses into their component -parts, the following +The +.Nm +address on an interface consist of the address itself, the +netmask, either broadcast address in case of a broadcast +interface or peers address in case of point-to-point interface. +The following .Xr ioctl 2 -commands are provided for a datagram socket in the Internet domain; -they have the same form as the -.Dv SIOCIFADDR -command (see -.Xr intro 4 ) . -.Bl -tag -width SIOCSIFNETMASK -.It Dv SIOCSIFNETMASK -Set interface network mask. -The network mask defines the network part of the address; -if it contains more of the address than the address type would indicate, -then subnets are in use. +commands are provided for a datagram socket in the Internet domain: +.Pp +.Bl -tag -width ".Dv SIOCGIFBRDADDR" -offset indent -compact +.It Dv SIOCAIFADDR +Add address to an interface. +The command requires +.Ft struct in_aliasreq +as argument. +.It Dv SIOCDIFADDR +Delete address from an interface. +The command requires +.Ft struct ifreq +as argument. +.It Dv SIOCGIFADDR +.It Dv SIOCGIFBRDADDR +.It Dv SIOCGIFDSTADDR .It Dv SIOCGIFNETMASK -Get interface network mask. +Return address information from interface. The returned value +is in +.Ft struct ifreq . +This way of address information retrieval is obsoleted, a +preferred way is to use +.Xr getifaddrs 3 +API. .El .Ss MIB Variables A number of variables are implemented in the net.inet branch of the @@ -260,6 +272,7 @@ in the reassembling queue for a packet. .Sh SEE ALSO .Xr ioctl 2 , .Xr socket 2 , +.Xr getifaddrs 3 , .Xr sysctl 3 , .Xr icmp 4 , .Xr intro 4 , -- cgit v1.1 From 4bc51e87e1e56b1b3aa52ff6f5154a8617e344ce Mon Sep 17 00:00:00 2001 From: glebius Date: Thu, 26 Jan 2012 10:43:40 +0000 Subject: - Remove no longer supported ioctl cmds. - Fix name of SIOCSIFADDR. --- share/man/man4/netintro.4 | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'share') diff --git a/share/man/man4/netintro.4 b/share/man/man4/netintro.4 index c0629e1..9f05e48 100644 --- a/share/man/man4/netintro.4 +++ b/share/man/man4/netintro.4 @@ -32,7 +32,7 @@ .\" @(#)netintro.4 8.2 (Berkeley) 11/30/93 .\" $FreeBSD$ .\" -.Dd April 14, 2010 +.Dd January 26, 2012 .Dt NETINTRO 4 .Os .Sh NAME @@ -231,19 +231,6 @@ struct ifreq { }; .Ed .Pp -Calls which are now deprecated are: -.Bl -tag -width SIOCGIFBRDADDR -.It Dv SIOCSIFADDR -Set interface address for protocol family. -Following the address assignment, the -.Dq initialization -routine for the interface is called. -.It Dv SIOCSIFDSTADDR -Set point to point address for protocol family and interface. -.It Dv SIOCSIFBRDADDR -Set broadcast address for protocol family and interface. -.El -.Pp .Fn Ioctl requests to obtain addresses and requests both to set and retrieve other data are still fully supported @@ -400,7 +387,7 @@ boundaries. .El .Bd -literal /* -* Structure used in SIOCAIFCONF request. +* Structure used in SIOCAIFADDR request. */ struct ifaliasreq { char ifra_name[IFNAMSIZ]; /* if name, e.g. "en0" */ -- cgit v1.1 From f47d7848ab6478fde5fb4d50b8d39090df2037d8 Mon Sep 17 00:00:00 2001 From: glebius Date: Thu, 26 Jan 2012 10:48:17 +0000 Subject: Remove a commented out old block inherited from inet.4. The text there was so much outdated that it required a complete rewrite even for inet.4, not mentioning inet6.4. There is no reason to keep it in the manual page. --- share/man/man4/inet6.4 | 80 -------------------------------------------------- 1 file changed, 80 deletions(-) (limited to 'share') diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4 index dad5ccf8..93015e0 100644 --- a/share/man/man4/inet6.4 +++ b/share/man/man4/inet6.4 @@ -184,86 +184,6 @@ by creating an Internet socket of type The .Tn ICMPv6 message protocol is accessible from a raw socket. -.\" .Pp -.\" The 128-bit IPv6 address contains both network and host parts. -.\" However, direct examination of addresses is discouraged. -.\" For those programs which absolutely need to break addresses -.\" into their component parts, the following -.\" .Xr ioctl 2 -.\" commands are provided for a datagram socket in the -.\" .Nm -.\" domain; they have the same form as the -.\" .Dv SIOCIFADDR -.\" command (see -.\" .Xr intro 4 ) . -.\" .Pp -.\" .Bl -tag -width SIOCSIFNETMASK -.\" .It Dv SIOCSIFNETMASK -.\" Set interface network mask. -.\" The network mask defines the network part of the address; -.\" if it contains more of the address than the address type would indicate, -.\" then subnets are in use. -.\" .It Dv SIOCGIFNETMASK -.\" Get interface network mask. -.\" .El -.\" .Sh ROUTING -.\" The current implementation of Internet protocols includes some routing-table -.\" adaptations to provide enhanced caching of certain end-to-end -.\" information necessary for Transaction TCP and Path MTU Discovery. The -.\" following changes are the most significant: -.\" .Bl -enum -.\" .It -.\" All IP routes, except those with the -.\" .Dv RTF_CLONING -.\" flag and those to multicast destinations, have the -.\" .Dv RTF_PRCLONING -.\" flag forcibly enabled (they are thus said to be -.\" .Dq "protocol cloning" ). -.\" .It -.\" When the last reference to an IP route is dropped, the route is -.\" examined to determine if it was created by cloning such a route. If -.\" this is the case, the -.\" .Dv RTF_PROTO3 -.\" flag is turned on, and the expiration timer is initialized to go off -.\" in net.inet.ip.rtexpire seconds. If such a route is re-referenced, -.\" the flag and expiration timer are reset. -.\" .It -.\" A kernel timeout runs once every ten minutes, or sooner if there are -.\" soon-to-expire routes in the kernel routing table, and deletes the -.\" expired routes. -.\" .El -.\" .Pp -.\" A dynamic process is in place to modify the value of -.\" net.inet.ip.rtexpire if the number of cached routes grows too large. -.\" If after an expiration run there are still more than -.\" net.inet.ip.rtmaxcache unreferenced routes remaining, the rtexpire -.\" value is multiplied by 3/4, and any routes which have longer -.\" expiration times have those times adjusted. This process is damped -.\" somewhat by specification of a minimum rtexpire value -.\" (net.inet.ip.rtminexpire), and by restricting the reduction to once in -.\" a ten-minute period. -.\" .Pp -.\" If some external process deletes the original route from which a -.\" protocol-cloned route was generated, the ``child route'' is deleted. -.\" (This is actually a generic mechanism in the routing code support for -.\" protocol-requested cloning.) -.\" .Pp -.\" No attempt is made to manage routes which were not created by protocol -.\" cloning; these are assumed to be static, under the management of an -.\" external routing process, or under the management of a link layer -.\" (e.g., -.\" .Tn ARP -.\" for Ethernets). -.\" .Pp -.\" Only certain types of network activity will result in the cloning of a -.\" route using this mechanism. Specifically, those protocols (such as -.\" .Tn TCP -.\" and -.\" .Tn UDP ) -.\" which themselves cache a long-lasting reference to route for a destination -.\" will trigger the mechanism; whereas raw -.\" .Tn IP -.\" packets, whether locally-generated or forwarded, will not. .Ss MIB Variables A number of variables are implemented in the net.inet6 branch of the .Xr sysctl 3 -- cgit v1.1 From 104a9c01e685dcc7ea3437fac5cfb66cbef27eb5 Mon Sep 17 00:00:00 2001 From: glebius Date: Thu, 26 Jan 2012 10:51:41 +0000 Subject: Remove a block that contatined some outdated misinformation on how addresses are configured, as well as obviousness that Ethernet interface may run arp(4). --- share/man/man4/txp.4 | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'share') diff --git a/share/man/man4/txp.4 b/share/man/man4/txp.4 index 6ef30db..e30f8b7 100644 --- a/share/man/man4/txp.4 +++ b/share/man/man4/txp.4 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 12, 2009 +.Dd January 26, 2012 .Dt TXP 4 .Os .Sh NAME @@ -77,17 +77,6 @@ segmentation, nor .Xr ipsec 4 acceleration. .Pp -Each of the host's network addresses -is specified at boot time with an -.Dv SIOCSIFADDR -.Xr ioctl 2 . -The -.Nm -interface employs the address resolution protocol described in -.Xr arp 4 -to dynamically map between Internet and Ethernet addresses on the local -network. -.Pp When a .Nm interface is brought up, by default, it will attempt to auto-negotiate the -- cgit v1.1 From 2df3f34dc879bae8d3622e1b1e18ebff67f30a79 Mon Sep 17 00:00:00 2001 From: glebius Date: Thu, 26 Jan 2012 10:53:39 +0000 Subject: Don't mention no longer supported ioctl commands. --- share/man/man4/tap.4 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/man/man4/tap.4 b/share/man/man4/tap.4 index a306108..3bfab5b 100644 --- a/share/man/man4/tap.4 +++ b/share/man/man4/tap.4 @@ -1,7 +1,7 @@ .\" $FreeBSD$ .\" Based on PR#2411 .\" -.Dd September 8, 2008 +.Dd January 26, 2012 .Dt TAP 4 .Os .Sh NAME @@ -89,11 +89,7 @@ Control devices (once successfully opened) persist until is unloaded or the interface is destroyed. .Pp Each interface supports the usual Ethernet network interface -.Xr ioctl 2 Ns s , -such as -.Dv SIOCSIFADDR -and -.Dv SIOCSIFNETMASK , +.Xr ioctl 2 Ns s and thus can be used with .Xr ifconfig 8 like any other Ethernet interface. -- cgit v1.1 From f84b253d0e86e1ff545be806ad5e2cf702917b93 Mon Sep 17 00:00:00 2001 From: glebius Date: Thu, 26 Jan 2012 11:08:55 +0000 Subject: List supported ioctl commands instead of old one. --- share/man/man9/ifnet.9 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index e015fb7..24e4ea2 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 3, 2011 +.Dd January 26, 2012 .Dt IFNET 9 .Os .Sh NAME @@ -1245,10 +1245,8 @@ or .Fn if_delmulti function is called to perform the operation; qq.v. .Pp -.It Dv SIOCSIFDSTADDR -.It Dv SIOCSIFADDR -.It Dv SIOCSIFBRDADDR -.It Dv SIOCSIFNETMASK +.It Dv SIOCAIFADDR +.It Dv SIOCDIFADDR The socket's protocol control routine is called to implement the requested action. .Pp -- cgit v1.1 From 7f685c218aab7dcffad6119b6e3741a0b71a2e97 Mon Sep 17 00:00:00 2001 From: ken Date: Thu, 26 Jan 2012 16:35:09 +0000 Subject: Xen netback driver rewrite. share/man/man4/Makefile, share/man/man4/xnb.4, sys/dev/xen/netback/netback.c, sys/dev/xen/netback/netback_unit_tests.c: Rewrote the netback driver for xen to attach properly via newbus and work properly in both HVM and PVM mode (only HVM is tested). Works with the in-tree FreeBSD netfront driver or the Windows netfront driver from SuSE. Has not been extensively tested with a Linux netfront driver. Does not implement LRO, TSO, or polling. Includes unit tests that may be run through sysctl after compiling with XNB_DEBUG defined. sys/dev/xen/blkback/blkback.c, sys/xen/interface/io/netif.h: Comment elaboration. sys/kern/uipc_mbuf.c: Fix page fault in kernel mode when calling m_print() on a null mbuf. Since m_print() is only used for debugging, there are no performance concerns for extra error checking code. sys/kern/subr_scanf.c: Add the "hh" and "ll" width specifiers from C99 to scanf(). A few callers were already using "ll" even though scanf() was handling it as "l". Submitted by: Alan Somers Submitted by: John Suykerbuyk Sponsored by: Spectra Logic MFC after: 1 week Reviewed by: ken --- share/man/man4/Makefile | 2 + share/man/man4/xnb.4 | 134 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+) create mode 100644 share/man/man4/xnb.4 (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index e935472..90dcdeb 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -531,6 +531,7 @@ MAN= aac.4 \ ${_xen.4} \ xhci.4 \ xl.4 \ + ${_xnb.4} \ xpt.4 \ zero.4 \ zyd.4 @@ -731,6 +732,7 @@ _urtw.4= urtw.4 _viawd.4= viawd.4 _wpi.4= wpi.4 _xen.4= xen.4 +_xnb.4= xnb.4 MLINKS+=lindev.4 full.4 .endif diff --git a/share/man/man4/xnb.4 b/share/man/man4/xnb.4 new file mode 100644 index 0000000..f2d8f8a --- /dev/null +++ b/share/man/man4/xnb.4 @@ -0,0 +1,134 @@ +.\" Copyright (c) 2012 Spectra Logic Corporation +.\" All rights reserved. +.\" +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions, and the following disclaimer, +.\" without modification. +.\" 2. Redistributions in binary form must reproduce at minimum a disclaimer +.\" substantially similar to the "NO WARRANTY" disclaimer below +.\" ("Disclaimer") and any redistribution must be conditioned upon +.\" including a substantially similar Disclaimer requirement for further +.\" binary redistribution. +.\" +.\" NO WARRANTY +.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +.\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR +.\" A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +.\" HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGES. +.\" +.\" Authors: Alan Somers (Spectra Logic Corporation) +.\" +.\" $FreeBSD$ +.\" + +.Dd January 6, 2012 +.Dt XNB 4 +.Os +.Sh NAME +.Nm xnb +.Nd "Xen Paravirtualized Backend Ethernet Driver" +.Sh SYNOPSIS +To compile this driver into the kernel, place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "options XENHVM" +.Cd "device xenpci" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides the back half of a paravirtualized +.Xr xen 4 +network connection. The netback and netfront drivers appear to their +respective operating systems as Ethernet devices linked by a crossover cable. +Typically, +.Nm +will run on Domain 0 and the netfront driver will run on a guest domain. +However, it is also possible to run +.Nm +on a guest domain. It may be bridged or routed to provide the netfront's +domain access to other guest domains or to a physical network. +.Pp +In most respects, the +.Nm +device appears to the OS as an other Ethernet device. It can be configured at +runtime entirely with +.Xr ifconfig 8 +\&. In particular, it supports MAC changing, arbitrary MTU sizes, checksum +offload for IP, UDP, and TCP for both receive and transmit, and TSO. However, +see +.Sx CAVEATS +before enabling txcsum, rxcsum, or tso. +.Sh SYSCTL VARIABLES +The following read-only variables are available via +.Xr sysctl 8 : +.Bl -tag -width indent +.It Va dev.xnb.%d.dump_rings +Displays information about the ring buffers used to pass requests between the +netfront and netback. Mostly useful for debugging, but can also be used to +get traffic statistics. +.It Va dev.xnb.%d.unit_test_results +Runs a builtin suite of unit tests and displays the results. Does not affect +the operation of the driver in any way. Note that the test suite simulates +error conditions; this will result in error messages being printed to the +system system log. +.Sh CAVEATS +Packets sent through Xennet pass over shared memory, so the protocol includes +no form of link-layer checksum or CRC. Furthermore, Xennet drivers always +report to their hosts that they support receive and transmit checksum +offloading. They "offload" the checksum calculation by simply skipping it. +That works fine for packets that are exchanged between two domains on the same +machine. However, when a Xennet interface is bridged to a physical interface, +a correct checksum must be attached to any packets bound for that physical +interface. Currently, FreeBSD lacks any mechanism for an ethernet device to +inform the OS that newly received packets are valid even though their checksums +are not. So if the netfront driver is configured to offload checksum +calculations, it will pass non-checksumed packets to +.Nm +, which must then calculate the checksum in software before passing the packet +to the OS. +.Pp +For this reason, it is recommended that if +.Nm +is bridged to a physcal interface, then transmit checksum offloading should be +disabled on the netfront. The Xennet protocol does not have any mechanism for +the netback to request the netfront to do this; the operator must do it +manually. +.Sh SEE ALSO +.Xr arp 4 , +.Xr netintro 4 , +.Xr ng_ether 4 , +.Xr ifconfig 8 , +.Xr xen 4 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 10.0 +. +.Sh AUTHORS +The +.Nm +driver was written by +.An Alan Somers +.Aq alans@spectralogic.com +and +.An John Suykerbuyk +.Aq johns@spectralogic.com +.Sh BUGS +The +.Nm +driver does not properly checksum UDP datagrams that span more than one +Ethernet frame. Nor does it correctly checksum IPv6 packets. To workaround +that bug, disable transmit checksum offloading on the netfront driver. -- cgit v1.1 From 7ebf2a01cf80cb57e9b9cf58123fef55fa1ba239 Mon Sep 17 00:00:00 2001 From: sbruno Date: Thu, 26 Jan 2012 17:04:17 +0000 Subject: Update PCI IDs for ciss controllers that are supported by this driver. Submitted by: scott.benesh@hp.com Obtained from: Yahoo! Inc and HP MFC after: 1 week --- share/man/man4/ciss.4 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4 index bf9ce87..277847b 100644 --- a/share/man/man4/ciss.4 +++ b/share/man/man4/ciss.4 @@ -2,7 +2,7 @@ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" -.Dd January 18, 2012 +.Dd January 26, 2012 .Dt CISS 4 .Os .Sh NAME @@ -121,6 +121,10 @@ HP Smart Array E200i .It HP Smart Array P212 .It +HP Smart Array P220i +.It +HP Smart Array P222 +.It HP Smart Array P400 .It HP Smart Array P400i @@ -133,8 +137,14 @@ HP Smart Array P411 .It HP Smart Array P420 .It +HP Smart Array P420i +.It +HP Smart Array P421 +.It HP Smart Array P600 .It +HP Smart Array P721m +.It HP Smart Array P800 .It HP Smart Array P812 -- cgit v1.1 From cd0b224af303778d82d643263ea5e08ae3c2d239 Mon Sep 17 00:00:00 2001 From: ken Date: Thu, 26 Jan 2012 17:28:33 +0000 Subject: Start sentences on a new line, and fix a few other nits. Prompted by: gjb MFC after: 1 week --- share/man/man4/xnb.4 | 77 ++++++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 35 deletions(-) (limited to 'share') diff --git a/share/man/man4/xnb.4 b/share/man/man4/xnb.4 index f2d8f8a..bb2cd1d 100644 --- a/share/man/man4/xnb.4 +++ b/share/man/man4/xnb.4 @@ -1,6 +1,5 @@ .\" Copyright (c) 2012 Spectra Logic Corporation -.\" All rights reserved. -.\" +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -30,7 +29,7 @@ .\" Authors: Alan Somers (Spectra Logic Corporation) .\" .\" $FreeBSD$ -.\" +.\" .Dd January 6, 2012 .Dt XNB 4 @@ -50,24 +49,26 @@ The .Nm driver provides the back half of a paravirtualized .Xr xen 4 -network connection. The netback and netfront drivers appear to their -respective operating systems as Ethernet devices linked by a crossover cable. +network connection. +The netback and netfront drivers appear to their respective operating +systems as Ethernet devices linked by a crossover cable. Typically, .Nm will run on Domain 0 and the netfront driver will run on a guest domain. However, it is also possible to run .Nm -on a guest domain. It may be bridged or routed to provide the netfront's +on a guest domain. +It may be bridged or routed to provide the netfront's domain access to other guest domains or to a physical network. .Pp In most respects, the .Nm -device appears to the OS as an other Ethernet device. It can be configured at -runtime entirely with -.Xr ifconfig 8 -\&. In particular, it supports MAC changing, arbitrary MTU sizes, checksum -offload for IP, UDP, and TCP for both receive and transmit, and TSO. However, -see +device appears to the OS as an other Ethernet device. +It can be configured at runtime entirely with +.Xr ifconfig 8 . +In particular, it supports MAC changing, arbitrary MTU sizes, checksum +offload for IP, UDP, and TCP for both receive and transmit, and TSO. +However, see .Sx CAVEATS before enabling txcsum, rxcsum, or tso. .Sh SYSCTL VARIABLES @@ -76,47 +77,51 @@ The following read-only variables are available via .Bl -tag -width indent .It Va dev.xnb.%d.dump_rings Displays information about the ring buffers used to pass requests between the -netfront and netback. Mostly useful for debugging, but can also be used to +netfront and netback. +Mostly useful for debugging, but can also be used to get traffic statistics. .It Va dev.xnb.%d.unit_test_results -Runs a builtin suite of unit tests and displays the results. Does not affect -the operation of the driver in any way. Note that the test suite simulates -error conditions; this will result in error messages being printed to the -system system log. +Runs a builtin suite of unit tests and displays the results. +Does not affect the operation of the driver in any way. +Note that the test suite simulates error conditions; this will result in +error messages being printed to the system system log. .Sh CAVEATS Packets sent through Xennet pass over shared memory, so the protocol includes -no form of link-layer checksum or CRC. Furthermore, Xennet drivers always -report to their hosts that they support receive and transmit checksum -offloading. They "offload" the checksum calculation by simply skipping it. +no form of link-layer checksum or CRC. +Furthermore, Xennet drivers always report to their hosts that they support +receive and transmit checksum offloading. +They "offload" the checksum calculation by simply skipping it. That works fine for packets that are exchanged between two domains on the same -machine. However, when a Xennet interface is bridged to a physical interface, +machine. +However, when a Xennet interface is bridged to a physical interface, a correct checksum must be attached to any packets bound for that physical -interface. Currently, FreeBSD lacks any mechanism for an ethernet device to +interface. +Currently, FreeBSD lacks any mechanism for an ethernet device to inform the OS that newly received packets are valid even though their checksums -are not. So if the netfront driver is configured to offload checksum -calculations, it will pass non-checksumed packets to -.Nm -, which must then calculate the checksum in software before passing the packet +are not. +So if the netfront driver is configured to offload checksum calculations, +it will pass non-checksumed packets to +.Nm , +which must then calculate the checksum in software before passing the packet to the OS. .Pp For this reason, it is recommended that if .Nm is bridged to a physcal interface, then transmit checksum offloading should be -disabled on the netfront. The Xennet protocol does not have any mechanism for -the netback to request the netfront to do this; the operator must do it -manually. +disabled on the netfront. +The Xennet protocol does not have any mechanism for the netback to request +the netfront to do this; the operator must do it manually. .Sh SEE ALSO .Xr arp 4 , .Xr netintro 4 , .Xr ng_ether 4 , -.Xr ifconfig 8 , -.Xr xen 4 +.Xr xen 4 , +.Xr ifconfig 8 .Sh HISTORY The .Nm device driver first appeared in -.Fx 10.0 -. +.Fx 10.0 . .Sh AUTHORS The .Nm @@ -130,5 +135,7 @@ and The .Nm driver does not properly checksum UDP datagrams that span more than one -Ethernet frame. Nor does it correctly checksum IPv6 packets. To workaround -that bug, disable transmit checksum offloading on the netfront driver. +Ethernet frame. +Nor does it correctly checksum IPv6 packets. +To workaround that bug, disable transmit checksum offloading on the +netfront driver. -- cgit v1.1 From 2af3de6b82c8914f634f9ab86e648d1639a6e870 Mon Sep 17 00:00:00 2001 From: ken Date: Thu, 26 Jan 2012 18:18:47 +0000 Subject: Remove the blank line between the license and .Dd Prompted by: brueffer MFC after: 1 week --- share/man/man4/xnb.4 | 1 - 1 file changed, 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/xnb.4 b/share/man/man4/xnb.4 index bb2cd1d..77f7f75 100644 --- a/share/man/man4/xnb.4 +++ b/share/man/man4/xnb.4 @@ -30,7 +30,6 @@ .\" .\" $FreeBSD$ .\" - .Dd January 6, 2012 .Dt XNB 4 .Os -- cgit v1.1 From 891dd313e70093cc92443c7fb6b047395b1310db Mon Sep 17 00:00:00 2001 From: glebius Date: Thu, 26 Jan 2012 19:11:08 +0000 Subject: - Rewrite paragraphs about preemption. - Avoid word combination "carp interface". Prodded by: az --- share/man/man4/carp.4 | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) (limited to 'share') diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4 index 5a761ec..f03ee97 100644 --- a/share/man/man4/carp.4 +++ b/share/man/man4/carp.4 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 20, 2011 +.Dd January 26, 2012 .Dt CARP 4 .Os .Sh NAME @@ -99,24 +99,14 @@ packets. Enabled by default. .It Va net.inet.carp.preempt Allow virtual hosts to preempt each other. -It is also used to failover -.Nm -interfaces as a group. -When the option is enabled and one of the -.Nm -enabled physical interfaces -goes down, -.Cm advskew -is changed to 240 on all -.Nm -interfaces. -See also the first example. +When enabled, a vhid in a backup state would preempt a master that +is announcing itself with a lower advskew. Disabled by default. .It Va net.inet.carp.log Value of 0 disables any logging. Value of 1 enables logging state changes of .Nm -interfaces. +vhids. Values above 1 enable logging of bad .Nm packets. @@ -202,9 +192,9 @@ and section for more information. .Sh EXAMPLES For firewalls and routers with multiple interfaces, it is desirable to -failover all of the +failover all of the addresses running .Nm -interfaces together, when one of the physical interfaces goes down. +together, when one of the physical interfaces goes down. This is achieved by the preempt option. Enable it on both host A and B: .Pp @@ -225,14 +215,13 @@ ifconfig em0 vhid 1 advskew 100 pass mekmitasdigoat 192.168.1.1/24 ifconfig em1 vhid 2 advskew 100 pass mekmitasdigoat 192.168.2.1/24 .Ed .Pp -Because of the preempt option, when one of the physical interfaces of -host A fails, +When one of the physical interfaces of host A fails, .Cm advskew -is adjusted to 240 on all its +is demoted to a configured value on all its .Nm -interfaces. -This will cause host B to preempt on both interfaces instead of -just the failed one. +vhids. +Due to the preempt option, host B would start announcing itself, and thus +preempt host A on both interfaces instead of just the failed one. .\".Pp .\"In order to set up an ARP balanced virtual host, it is necessary to configure .\"one virtual host for each physical host which would respond to ARP requests -- cgit v1.1 From b028f4969496180e5f104ad8efb70d435c0c439f Mon Sep 17 00:00:00 2001 From: glebius Date: Fri, 27 Jan 2012 08:46:32 +0000 Subject: Do not mention SIOCSIFADDR. --- share/man/man4/lo.4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man4/lo.4 b/share/man/man4/lo.4 index 12bf792..1a55b0c 100644 --- a/share/man/man4/lo.4 +++ b/share/man/man4/lo.4 @@ -30,7 +30,7 @@ .\" @(#)lo.4 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd March 15, 2009 +.Dd January 25, 2012 .Dt LO 4 .Os .Sh NAME @@ -47,9 +47,9 @@ communication. As with other network interfaces, the loopback interface must have network addresses assigned for each address family with which it is to be used. These addresses -may be set or changed with the -.Dv SIOCSIFADDR -.Xr ioctl 2 . +may be set with the appropriate +.Xr ioctl 2 +commands for corresponding address families. The loopback interface should be the last interface configured, as protocols may use the order of configuration as an indication of priority. The loopback should -- cgit v1.1 From e0549932740f963c8ed2500c4b089e58f7272d3f Mon Sep 17 00:00:00 2001 From: kmacy Date: Sat, 28 Jan 2012 17:21:12 +0000 Subject: document M_NODUMP flag --- share/man/man9/malloc.9 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'share') diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9 index ff6b4d2..2216898 100644 --- a/share/man/man9/malloc.9 +++ b/share/man/man9/malloc.9 @@ -123,6 +123,9 @@ operational characteristics as follows: .Bl -tag -width indent .It Dv M_ZERO Causes the allocated memory to be set to all zeros. +.It Dv M_NODUMP +For allocations greater than page size, causes the allocated +memory to be excluded from kernel core dumps. .It Dv M_NOWAIT Causes .Fn malloc , -- cgit v1.1 From 4c87ca2cdcbc5b75ee372b4be70e63d77315bb2e Mon Sep 17 00:00:00 2001 From: kmacy Date: Sat, 28 Jan 2012 17:27:58 +0000 Subject: alphabetically sort optional flags and add documentation for VM_ALLOC_NODUMP --- share/man/man9/vm_page_alloc.9 | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'share') diff --git a/share/man/man9/vm_page_alloc.9 b/share/man/man9/vm_page_alloc.9 index 4497e48..e9c0023 100644 --- a/share/man/man9/vm_page_alloc.9 +++ b/share/man/man9/vm_page_alloc.9 @@ -90,23 +90,18 @@ than zero. .Pp The optional flags are: .Bl -tag -width ".Dv VM_ALLOC_IFNOTCACHED" -.It Dv VM_ALLOC_ZERO -Indicate a preference for a pre-zeroed page. -There is no guarantee that the returned page will be zeroed, but it -will have the -.Dv PG_ZERO -flag set if it is zeroed. +.It Dv VM_ALLOC_NOBUSY +The returned page will not have the +.Dv VPO_BUSY +flag set. +.It Dv VM_ALLOC_NODUMP +The returned page will not be included in any kernel core dumps +regardless of whether or not it is mapped in to KVA. .It Dv VM_ALLOC_NOOBJ Do not associate the allocated page with a vm object. The .Fa object argument is ignored. -.It Dv VM_ALLOC_NOBUSY -The returned page will not have the -.Dv VPO_BUSY -flag set. -.It Dv VM_ALLOC_WIRED -The returned page will be wired. .It Dv VM_ALLOC_IFCACHED Allocate the page only if it is cached. Otherwise, return @@ -117,6 +112,14 @@ Only allocate the page if it is not cached in the If the page at the specified .Fa pindex is cached, NULL is returned instead. +.It Dv VM_ALLOC_WIRED +The returned page will be wired. +.It Dv VM_ALLOC_ZERO +Indicate a preference for a pre-zeroed page. +There is no guarantee that the returned page will be zeroed, but it +will have the +.Dv PG_ZERO +flag set if it is zeroed. .El .El .Sh RETURN VALUES -- cgit v1.1 From f1318243b8c408ce39a4f983eaef73464b4547b4 Mon Sep 17 00:00:00 2001 From: scf Date: Sat, 28 Jan 2012 21:21:05 +0000 Subject: msdos was renamed to msdosfs in 2001 by r77577. MFC after: 5 days --- share/man/man4/umass.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/umass.4 b/share/man/man4/umass.4 index 18ffde3..3b6bc1f 100644 --- a/share/man/man4/umass.4 +++ b/share/man/man4/umass.4 @@ -231,7 +231,7 @@ based file systems when storing information such as images and videos. These file systems can be accessed by specifying the file system type as -.Cm msdos +.Cm msdosfs when using .Xr mount 8 . .Sh SEE ALSO -- cgit v1.1 From 072fe4a7ca6c58f04a1155a0011bd95504a44cd2 Mon Sep 17 00:00:00 2001 From: kmacy Date: Sat, 28 Jan 2012 23:30:39 +0000 Subject: update .Dd --- share/man/man9/malloc.9 | 2 +- share/man/man9/vm_page_alloc.9 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9 index 2216898..08c9ea7 100644 --- a/share/man/man9/malloc.9 +++ b/share/man/man9/malloc.9 @@ -29,7 +29,7 @@ .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $ .\" $FreeBSD$ .\" -.Dd October 23, 2008 +.Dd January 28, 2012 .Dt MALLOC 9 .Os .Sh NAME diff --git a/share/man/man9/vm_page_alloc.9 b/share/man/man9/vm_page_alloc.9 index e9c0023..9397d21 100644 --- a/share/man/man9/vm_page_alloc.9 +++ b/share/man/man9/vm_page_alloc.9 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 3, 2010 +.Dd January 28, 2012 .Dt VM_PAGE_ALLOC 9 .Os .Sh NAME -- cgit v1.1 From b680dcba466cfa6a9c51e27676773f740b60aa4c Mon Sep 17 00:00:00 2001 From: brueffer Date: Mon, 30 Jan 2012 21:02:25 +0000 Subject: Manpages for the buf_ring and drbr interfaces. Submitted by: kmacy (aeons ago) MFC after: 1 week --- share/man/man9/Makefile | 20 +++++++ share/man/man9/buf_ring.9 | 144 +++++++++++++++++++++++++++++++++++++++++++++ share/man/man9/drbr.9 | 147 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 311 insertions(+) create mode 100644 share/man/man9/buf_ring.9 create mode 100644 share/man/man9/drbr.9 (limited to 'share') diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 7d2af8a..2b27a68 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -12,6 +12,7 @@ MAN= accept_filter.9 \ boot.9 \ bpf.9 \ buf.9 \ + buf_ring.9 \ BUF_ISLOCKED.9 \ BUF_LOCK.9 \ BUF_LOCKFREE.9 \ @@ -99,6 +100,7 @@ MAN= accept_filter.9 \ devtoname.9 \ disk.9 \ domain.9 \ + drbr.9 \ driver.9 \ DRIVER_MODULE.9 \ EVENTHANDLER.9 \ @@ -410,6 +412,16 @@ MLINKS+=bpf.9 bpfattach.9 \ bpf.9 bpf_tap.9 \ bpf.9 bpf_validate.9 MLINKS+=buf.9 bp.9 +MLINKS+=buf_ring.9 buf_ring_alloc.9 \ + buf_ring.9 buf_ring_free.9 \ + buf_ring.9 buf_ring_enqueue.9 \ + buf_ring.9 buf_ring_enqueue_bytes.9 \ + buf_ring.9 buf_ring_dequeue_mc.9 \ + buf_ring.9 buf_ring_dequeue_sc.9 \ + buf_ring.9 buf_ring_count.9 \ + buf_ring.9 buf_ring_empty.9 \ + buf_ring.9 buf_ring_full.9 \ + buf_ring.9 buf_ring_peek.9 MLINKS+=bus_activate_resource.9 bus_deactivate_resource.9 MLINKS+=bus_alloc_resource.9 bus_alloc_resource_any.9 MLINKS+=BUS_BIND_INTR.9 bus_bind_intr.9 @@ -608,6 +620,14 @@ MLINKS+=domain.9 DOMAIN_SET.9 \ domain.9 pfctlinput2.9 \ domain.9 pffindproto.9 \ domain.9 pffindtype.9 +MLINKS+=drbr.9 drbr_free.9 \ + drbr.9 drbr_enqueue.9 \ + drbr.9 drbr_dequeue.9 \ + drbr.9 drbr_dequeue_cond.9 \ + drbr.9 drbr_flush.9 \ + drbr.9 drbr_empty.9 \ + drbr.9 drbr_inuse.9 \ + drbr.9 drbr_stats_update.9 MLINKS+=EVENTHANDLER.9 EVENTHANDLER_DECLARE.9 \ EVENTHANDLER.9 EVENTHANDLER_DEREGISTER.9 \ EVENTHANDLER.9 eventhandler_deregister.9 \ diff --git a/share/man/man9/buf_ring.9 b/share/man/man9/buf_ring.9 new file mode 100644 index 0000000..3b73607 --- /dev/null +++ b/share/man/man9/buf_ring.9 @@ -0,0 +1,144 @@ +.\" Copyright (c) 2009 Bitgravity Inc +.\" Written by: Kip Macy +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 30, 2012 +.Dt BUF_RING 9 +.Os +.Sh NAME +.Nm buf_ring , +.Nm buf_ring_alloc , +.Nm buf_ring_free , +.Nm buf_ring_enqueue , +.Nm buf_ring_enqueue_bytes , +.Nm buf_ring_dequeue_mc , +.Nm buf_ring_dequeue_sc , +.Nm buf_ring_count , +.Nm buf_ring_empty , +.Nm buf_ring_full , +.Nm buf_ring_peek , +.Nd multi-producer, {single, multi}-consumer lock-less ring buffer +.Sh SYNOPSIS +.In sys/param.h +.In sys/buf_ring.h +.Ft struct buf_ring * +.Fn buf_ring_alloc "int count" "struct malloc_type *type" "int flags" "struct mtx *sc_lock" +.Ft void +.Fn buf_ring_free "struct buf_ring *br" "struct malloc_type *type" +.Ft int +.Fn buf_ring_enqueue "struct buf_ring *br" "void *buf" +.Ft int +.Fn buf_ring_enqueue_bytes "struct buf_ring *br" "void *buf" "int bytes" +.Ft void * +.Fn buf_ring_dequeue_mc "struct buf_ring *br" +.Ft void * +.Fn buf_ring_dequeue_sc "struct buf_ring *br" +.Ft int +.Fn buf_ring_count "struct buf_ring *br" +.Ft int +.Fn buf_ring_empty "struct buf_ring *br" +.Ft int +.Fn buf_ring_full "struct buf_ring *br" +.Ft void * +.Fn buf_ring_peek "struct buf_ring *br" +.Sh DESCRIPTION +The +.Nm +functions provide a lock-less multi-producer and lock-less multi-consumer as +well as single-consumer ring buffer. +.Pp +The +.Fn buf_ring_alloc +function is used to allocate a buf_ring ring buffer with +.Fa count +slots using malloc_type +.Fa type +and memory flags +.Fa flags . +The single consumer interface is protected by +.Fa sc_lock . +.Pp +The +.Fn buf_ring_free +function is used to free a buf_ring. +The user is responsible for freeing any enqueued items. +.Pp +The +.Fn buf_ring_enqueue +function is used to enqueue a buffer to a buf_ring. +.Pp +The +.Fn buf_ring_enqueue_bytes +function is used to enqueue a buffer to a buf_ring and increment the +number of bytes enqueued by +.Fa bytes . +.Pp +The +.Fn buf_ring_dequeue_mc +function is a multi-consumer safe way of dequeueing elements from a buf_ring. +.Pp +The +.Fn buf_ring_dequeue_sc +function is a single-consumer interface to dequeue elements - requiring +the user to serialize accesses with a lock. +.Pp +The +.Fn buf_ring_count +function returns the number of elements in a buf_ring. +.Pp +The +.Fn buf_ring_empty +function returns +.Dv TRUE +if the buf_ring is empty, +.Dv FALSE +otherwise. +.Pp +The +.Fn buf_ring_full +function returns +.Dv TRUE +if no more items can be enqueued, +.Dv FALSE +otherwise. +.Pp +The +.Fn buf_ring_peek +function returns a pointer to the last element in the buf_ring if the +buf_ring is not empty, +.Dv NULL +otherwise. +.Sh RETURN VALUES +The +.Fn buf_ring_enqueue +and +.Fn buf_ring_enqueue_bytes +functions return +.Er ENOBUFS +if there are no available slots in the buf_ring. +.Sh HISTORY +These functions were introduced in +.Fx 8.0 . diff --git a/share/man/man9/drbr.9 b/share/man/man9/drbr.9 new file mode 100644 index 0000000..ad67c35 --- /dev/null +++ b/share/man/man9/drbr.9 @@ -0,0 +1,147 @@ +.\" Copyright (c) 2009 Bitgravity Inc +.\" Written by: Kip Macy +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 30, 2012 +.Dt DRBR 9 +.Os +.Sh NAME +.Nm drbr , +.Nm drbr_free , +.Nm drbr_enqueue , +.Nm drbr_dequeue , +.Nm drbr_dequeue_cond , +.Nm drbr_flush , +.Nm drbr_empty , +.Nm drbr_inuse , +.Nm drbr_stats_update , +.Nd network driver interface to buf_ring +.Sh SYNOPSIS +.In sys/param.h +.In net/if.h +.In net/if_var.h +.Ft void +.Fn drbr_free "struct buf_ring *br" "struct malloc_type *type" +.Ft int +.Fn drbr_enqueue "struct ifnet *ifp" "struct buf_ring *br" "struct mbuf *m" +.Ft struct mbuf * +.Fn drbr_dequeue "struct ifnet *ifp" "struct buf_ring *br" +.Ft struct mbuf * +.Fn drbr_dequeue_cond "struct ifnet *ifp" "struct buf_ring *br" "int (*func) (struct mbuf *, void *)" "void *arg" +.Ft void +.Fn drbr_flush "struct ifnet *ifp" "struct buf_ring *br" +.Ft int +.Fn drbr_empty "struct ifnet *ifp" "struct buf_ring *br" +.Ft int +.Fn drbr_inuse "struct ifnet *ifp" "struct buf_ring *br" +.Ft void +.Fn drbr_stats_update "struct ifnet *ifp" "int len" "int mflags" +.Sh DESCRIPTION +The +.Nm +functions provide an API to network drivers for using +.Xr buf_ring 9 +for enqueueing and dequeueing packets. +This is meant as a replacement for the IFQ interface for packet queuing. +It allows a packet to be enqueued with a single atomic and packet +dequeue to be done without any per-packet atomics as it is protected +by the driver's tx queue lock. +If +.Dv INVARIANTS +is enabled, +.Fn drbr_dequeue +will assert that the tx queue lock is held when it is called. +.Pp +The +.Fn drbr_free +function frees all the enqueued mbufs and then frees the buf_ring. +.Pp +The +.Fn drbr_enqueue +function is used to enqueue an mbuf to a buf_ring, falling back to the +ifnet's IFQ if +.Xr ALTQ 4 +is enabled. +.Pp +The +.Fn drbr_dequeue +function is used to dequeue an mbuf from a buf_ring or, if +.Xr ALTQ 4 +is enabled, from the ifnet's IFQ. +.Pp +The +.Fn drbr_dequeue_cond +function is used to conditionally dequeue an mbuf from a buf_ring based +on whether +.Fa func +returns +.Dv TRUE +or +.Dv FALSE . +.Pp +The +.Fn drbr_flush +function frees all mbufs enqueued in the buf_ring and the ifnet's IFQ. +.Pp +The +.Fn drbr_empty +function returns +.Dv TRUE +if there are no mbufs enqueued, +.Dv FALSE +otherwise. +.Pp +The +.Fn drbr_inuse +function returns the number of mbufs enqueued. +Note to users that this is intrinsically racy as there is no guarantee that +there will not be more mbufs when +.Fn drbr_dequeue +is actually called. +Provided the tx queue lock is held there will not be less. +.Pp +The +.Fn drbr_stats_update +function updates the number of bytes and the number of multicast packets sent. +.Sh RETURN VALUES +The +.Fn drbr_enqueue +function returns +.Er ENOBUFS +if there are no slots available in the buf_ring and +.Dv 0 +on success. +.Pp +The +.Fn drbr_dequeue +and +.Fn drbr_dequeue_cond +functions return an mbuf on success and +.Dv NULL +if the buf_ring is empty. +.Sh HISTORY +These functions were introduced in +.Fx 8.0 . -- cgit v1.1 From a46b1b7ab382fc815708b9ba049ef342bdad65bc Mon Sep 17 00:00:00 2001 From: davide Date: Wed, 1 Feb 2012 19:46:12 +0000 Subject: Add myself to the relevant docs. Approved by: alc, gnn (mentors) --- share/misc/committers-src.dot | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'share') diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index c894455..28c4c4d 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -118,6 +118,7 @@ cokane [label="Coleman Kane\ncokane@FreeBSD.org\n2000/06/19"] cperciva [label="Colin Percival\ncperciva@FreeBSD.org\n2004/01/20"] csjp [label="Christian S.J. Peron\ncsjp@FreeBSD.org\n2004/05/04"] das [label="David Schultz\ndas@FreeBSD.org\n2003/02/21"] +davide [label="Davide Italiano\ndavide@FreeBSD.org\n2012/01/27"] davidxu [label="David Xu\ndavidxu@FreeBSD.org\n2002/09/02"] dchagin [label="Dmitry Chagin\ndchagin@FreeBSD.org\n2009/02/28"] delphij [label="Xin Li\ndelphij@FreeBSD.org\n2004/09/14"] @@ -284,6 +285,8 @@ adrian -> rmh ae -> melifaro +alc -> davide + andre -> qingli anholt -> jkim @@ -376,6 +379,7 @@ gnn -> ivoras gnn -> vanhu gnn -> lstewart gnn -> np +gnn -> davide grog -> edwin grog -> le -- cgit v1.1 From b5b4042f4a5b585a16906dd4cc90b3403e356ad4 Mon Sep 17 00:00:00 2001 From: rmh Date: Sat, 4 Feb 2012 00:54:43 +0000 Subject: Add MK_SOURCELESS build option. Setting MK_SOURCELESS to "no" will disable kernel modules that include binary-only code. More fine-grained control is provided via MK_SOURCELESS_HOST (for native code that runs on host CPU) and MK_SOURCELESS_UCODE (for microcode). Reviewed by: julian, delphij, freebsd-arch Approved by: kib (mentor) MFC after: 2 weeks --- share/mk/bsd.own.mk | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index d3183c4..f461f23 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -320,6 +320,9 @@ __DEFAULT_YES_OPTIONS = \ BOOT \ BSD_CPIO \ BSNMP \ + SOURCELESS \ + SOURCELESS_HOST \ + SOURCELESS_UCODE \ BZIP2 \ CALENDAR \ CAPSICUM \ @@ -511,6 +514,11 @@ MK_BIND_UTILS:= no MK_BIND_ETC:= no .endif +.if ${MK_SOURCELESS} == "no" +MK_SOURCELESS_HOST:= no +MK_SOURCELESS_UCODE:= no +.endif + .if ${MK_CDDL} == "no" MK_ZFS:= no MK_CTF:= no -- cgit v1.1 From 21763d06b263c44abb20e476106f93b16d14fb64 Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 4 Feb 2012 08:03:01 +0000 Subject: Add /usr/src/cddl/ to the hierarchy. --- share/man/man7/hier.7 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index b7aa57e..df76f46 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -639,6 +639,8 @@ third-party, and/or local source files .Bl -tag -width ".Pa kerberos5/" -compact .It Pa bin/ source code for files in /bin +.It Pa cddl/ +Utilities covered by the Common Development and Distribution License .It Pa contrib/ source code for contributed software .It Pa crypto/ -- cgit v1.1 From 4326beb059fb2e0786289b19b1bf9a8b7a2b824b Mon Sep 17 00:00:00 2001 From: glebius Date: Sun, 5 Feb 2012 16:53:02 +0000 Subject: Add new socket options: TCP_KEEPINIT, TCP_KEEPIDLE, TCP_KEEPINTVL and TCP_KEEPCNT, that allow to control initial timeout, idle time, idle re-send interval and idle send count on a per-socket basis. Reviewed by: andre, bz, lstewart --- share/man/man4/tcp.4 | 71 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 67 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index e2d4ad3..34c2a28 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -38,7 +38,7 @@ .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd November 14, 2011 +.Dd February 5, 2012 .Dt TCP 4 .Os .Sh NAME @@ -146,6 +146,65 @@ connection. See .Xr mod_cc 4 for details. +.It Dv TCP_KEEPINIT +This write-only +.Xr setsockopt 2 +option accepts a per-socket timeout argument of +.Vt "u_int" +in seconds, for new, non-established +.Tn TCP +connections. +For the global default in milliseconds see +.Va keepinit +in the +.Sx MIB Variables +section further down. +.It Dv TCP_KEEPIDLE +This write-only +.Xr setsockopt 2 +option accepts an argument of +.Vt "u_int" +for the amount of time, in seconds, that the connection must be idle +before keepalive probes (if enabled) are sent for the connection of this +socket. +If set on a listening socket, the value is inherited by the newly created +socket upon +.Xr accept 2 . +For the global default in milliseconds see +.Va keepidle +in the +.Sx MIB Variables +section further down. +.It Dv TCP_KEEPINTVL +This write-only +.Xr setsockopt 2 +option accepts an argument of +.Vt "u_int" +to set the per-socket interval, in seconds, between keepalive probes sent +to a peer. +If set on a listening socket, the value is inherited by the newly created +socket upon +.Xr accept 2 . +For the global default in milliseconds see +.Va keepintvl +in the +.Sx MIB Variables +section further down. +.It Dv TCP_KEEPCNT +This write-only +.Xr setsockopt 2 +option accepts an argument of +.Vt "u_int" +and allows a per-socket tuning of the number of probes sent, with no response, +before the connection will be dropped. +If set on a listening socket, the value is inherited by the newly created +socket upon +.Xr accept 2 . +For the global default see the +.Va keepcnt +in the +.Sx MIB Variables +section further down. .It Dv TCP_NODELAY Under most circumstances, .Tn TCP @@ -296,17 +355,21 @@ The Maximum Segment Lifetime, in milliseconds, for a packet. Timeout, in milliseconds, for new, non-established .Tn TCP connections. +The default is 75000 msec. .It Va keepidle Amount of time, in milliseconds, that the connection must be idle before keepalive probes (if enabled) are sent. +The default is 7200000 msec (2 hours). .It Va keepintvl The interval, in milliseconds, between keepalive probes sent to remote machines, when no response is received on a .Va keepidle probe. -After -.Dv TCPTV_KEEPCNT -(default 8) probes are sent, with no response, the connection is dropped. +The default is 75000 msec. +.It Va keepcnt +Number of probes sent, with no response, before a connection +is dropped. +The default is 8 packets. .It Va always_keepalive Assume that .Dv SO_KEEPALIVE -- cgit v1.1 From 4de4d315e465f872a81f448b1788cc017f2d2033 Mon Sep 17 00:00:00 2001 From: dim Date: Sun, 5 Feb 2012 23:02:13 +0000 Subject: Regenerate src.conf.5, after r230972 added the WITHOUT_SOURCELESS build options. MFC after: 2 weeks --- share/man/man5/src.conf.5 | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 68a93cd..cac3b38 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru .\" $FreeBSD$ -.Dd January 13, 2012 +.Dd February 5, 2012 .Dt SRC.CONF 5 .Os .Sh NAME @@ -869,6 +869,23 @@ as a set-user-ID root program. Set to not build the .Bx 4.4 legacy docs. +.It Va WITHOUT_SOURCELESS +.\" from FreeBSD: head/tools/build/options/WITHOUT_SOURCELESS 230972 2012-02-04 00:54:43Z rmh +Set to not build kernel modules that include sourceless code (either microcode or native code for host CPU). +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_SOURCELESS_HOST +.It +.Va WITHOUT_SOURCELESS_UCODE +.El +.It Va WITHOUT_SOURCELESS_HOST +.\" from FreeBSD: head/tools/build/options/WITHOUT_SOURCELESS_HOST 230972 2012-02-04 00:54:43Z rmh +Set to not build kernel modules that include sourceless native code for host CPU. +.It Va WITHOUT_SOURCELESS_UCODE +.\" from FreeBSD: head/tools/build/options/WITHOUT_SOURCELESS_UCODE 230972 2012-02-04 00:54:43Z rmh +Set to not build kernel modules that include sourceless microcode. .It Va WITHOUT_SSP .\" from FreeBSD: head/tools/build/options/WITHOUT_SSP 180012 2008-06-25 21:33:28Z ru Set to not build world with propolice stack smashing protection. -- cgit v1.1 From f3f41b99679f6f19f3f9773f469efd691a306a76 Mon Sep 17 00:00:00 2001 From: eadler Date: Tue, 7 Feb 2012 04:00:57 +0000 Subject: ports(7) currently makes no mention of LOCALBASE: fix that PR: docs/159551 Submitted by: Matthew Seaman Approved by: gjb MFC after: 3 days --- share/man/man7/ports.7 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 975b825..15da4cb 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 30, 2011 +.Dd Feb 06, 2012 .Dt PORTS 7 .Os .Sh NAME @@ -408,10 +408,13 @@ Directory to put the package in. .It Va PKGFILE The full path to the package. .El -.It Va PREFIX -Where to install things in general -(usually +.It Va LOCALBASE +Where existing things are installed and where to search for files when +resolving dependencies (usually .Pa /usr/local ) . +.It Va PREFIX +Where to install this port (usually set to the same as +.Va LOCALBASE ) . .It Va MASTER_SITES Primary sites for distribution files if not found locally. .It Va PATCH_SITES -- cgit v1.1 From b33d85415139e33cff5044b94eebdca293eaa0bf Mon Sep 17 00:00:00 2001 From: uqs Date: Tue, 7 Feb 2012 11:53:08 +0000 Subject: Record my ports mentor relationship. Approved by: beat (mentor) --- share/misc/committers-ports.dot | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index a4e858c..554aaec8 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -184,6 +184,7 @@ trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12"] trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2004/07/06"] thierry [label="Thierry Thomas\nthierry@FreeBSD.org\n2004/03/15"] tmclaugh [label="Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15"] +uqs [label="Ulrich Spoerlein\nuqs@FreeBSD.org\n2012/01/19"] vd [label="Vasil Dimov\nvd@FreeBSD.org\n2006/01/19"] wen [label="Wen Heping\nwen@FreeBSD.org\n2010/12/13"] wxs [label="Wesley Shields\nwxs@FreeBSD.org\n2008/01/03"] @@ -220,6 +221,7 @@ bapt -> eadler bapt -> jlaffaye beat -> decke +beat -> uqs beech -> glarkin beech -> mva -- cgit v1.1 From c02e62efd7ee044f7de028259dc67578d9568cad Mon Sep 17 00:00:00 2001 From: ken Date: Tue, 7 Feb 2012 23:43:29 +0000 Subject: Update the mps(4) man page for the changes in the new LSI-supported driver. This should have been included in change 230592. The supported hardware section still needs some updating to reflect the current reality. MFC after: 3 days --- share/man/man4/mps.4 | 89 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 23 deletions(-) (limited to 'share') diff --git a/share/man/man4/mps.4 b/share/man/man4/mps.4 index 2899747..54b0c0b 100644 --- a/share/man/man4/mps.4 +++ b/share/man/man4/mps.4 @@ -31,10 +31,10 @@ .\" .\" Author: Ken Merry .\" -.\" $Id: //depot/SpectraBSD/head/share/man/man4/mps.4#4 $ +.\" $Id: //depot/SpectraBSD/head/share/man/man4/mps.4#6 $ .\" $FreeBSD$ .\" -.Dd September 13, 2010 +.Dd February 7, 2012 .Dt MPS 4 .Os .Sh NAME @@ -58,7 +58,7 @@ The .Nm driver provides support for LSI Logic Fusion-MPT 2 .Tn SAS -controllers. +controllers and WarpDrive solid state storage cards. .Sh HARDWARE The .Nm @@ -90,6 +90,16 @@ driver instances, set the following tunable value in hw.mps.disable_msi=1 .Ed .Pp +To disable MSI interrupts for a specific +.Nm +driver instance, set the following tunable value in +.Xr loader.conf 5 : +.Bd -literal -offset indent +dev.mps.X.disable_msi=1 +.Ed +.Pp +where X is the adapter number. +.Pp To disable MSI-X interrupts for all .Nm driver instances, set the following tunable value in @@ -98,19 +108,51 @@ driver instances, set the following tunable value in hw.mps.disable_msix=1 .Ed .Pp -To allow the driver to send multiple task management commands (like abort, -LUN reset, etc.), set the following variable: +To disable MSI-X interrupts for a specific +.Nm +driver instance, set the following tunable value in +.Xr loader.conf 5 : .Bd -literal -offset indent -hw.mps.X.allow_multiple_tm_cmds=1 +dev.mps.X.disable_msix=1 .Ed .Pp -via -.Xr loader.conf 5 -or -.Xr sysctl 8 , -where X is the adapter number. -By default the driver only sends one task management command at a time, to -avoid causing a potential controller lock-up. +To set the maximum number of DMA chains allocated for all adapters, +set the following variable in +.Xr loader.conf 5 : +.Bd -literal -offset indent +hw.mps.max_chains=NNNN +.Ed +.Pp +To set the maximum number of DMA chains allocated for a specific adapter, +set the following variable in +.Xr loader.conf 5 : +.Bd -literal -offset indent +dev.mps.X.max_chains=NNNN +.Ed +.Pp +This variable may also be viewed via +.Xr sysctl 8 +to see the maximum set for a given adapter. +.Pp +The current number of free chain frames may be seen via the +dev.mps.X.chain_free +.Xr sysctl 8 +variable. +.Pp +The lowest number of free chain frames may be seen via the +dev.mps.X.chain_free_lowwater +.Xr sysctl 8 +variable. +.Pp +The current number of active I/O commands is shown in the +dev.mps.X.io_cmds_active +.Xr sysctl 8 +variable. +.Pp +The maximum number of active I/O command seen since boot is shown in the +dev.mps.X.io_cmds_highwater +.Xr sysctl 8 +variable. .Sh DEBUGGING To enable debugging prints from the .Nm @@ -142,7 +184,9 @@ Enable prints for controller events. .Xr pci 4 , .Xr sa 4 , .Xr scsi 4 , -.Xr targ 4 +.Xr targ 4 , +.Xr loader.conf 5 , +.Xr sysctl 8 .Sh HISTORY The .Nm @@ -154,20 +198,19 @@ The .Nm driver was originally written by .An Scott Long Aq scottl@FreeBSD.org . +It has been improved and tested by LSI Logic Corporation. This man page was written by .An Ken Merry Aq ken@FreeBSD.org . .Sh BUGS -This driver is still in development, it has only been tested on the amd64 -architecture and has some known shortcomings: +This driver has a couple of known shortcomings: .Bl -bullet -compact .It -No IR (Integrated RAID) support. +Not endian safe. +It only works on little endian machines (e.g. amd64 and i386). .It -No userland utility support (e.g. -.Xr mptutil 8). -.It -Sometimes the driver gets into a state where devices arrive and depart multiple -times, without user intervention. +No userland utility available (e.g. +.Xr mptutil 8) .It -The error recovery code isn't complete. +The driver probes devices sequentially. +If your system has a large number of devices, the probe will take a while. .El -- cgit v1.1 From 3120fac2c967ea9e896b260f9f7cea65c3278899 Mon Sep 17 00:00:00 2001 From: gjb Date: Wed, 8 Feb 2012 00:08:21 +0000 Subject: Add an option to 404.status-zfs (enabled by default) to list all zfs pools on the system. While here, document daily_status_zfs_enable in periodic.conf(5). Discussed on: -fs [1] Reviewed by: netchild [1] Approved by: jhb MFC after: 1 week [1] - http://lists.freebsd.org/pipermail/freebsd-fs/2011-June/011869.html --- share/man/man5/periodic.conf.5 | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5 index 540ef2e..4ab009c 100644 --- a/share/man/man5/periodic.conf.5 +++ b/share/man/man5/periodic.conf.5 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 8, 2011 +.Dd February 7, 2012 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -335,6 +335,28 @@ utility when .Va daily_status_disks_enable is set to .Dq Li YES . +.It Va daily_status_zfs_enable +.Pq Vt bool +Set to +.Dq Li YES +if you want to run +.Nm zpool Cm status +on your +.Xr zfs 8 +pools. +.It Va daily_status_zfs_zpool_list_enable +.Pq Vt bool +Set to +.Dq Li YES +if you want to run +.Nm zpool Cm list +on your +.Xr zfs 8 +pools. +Requires +.Va daily_status_zfs_enable +to be set to +.Li YES . .It Va daily_status_ata_raid_enable .Pq Vt bool Set to -- cgit v1.1 From f0596397a6ddff1ba920f96fffd52b8043862267 Mon Sep 17 00:00:00 2001 From: kevlo Date: Wed, 8 Feb 2012 08:42:17 +0000 Subject: Add offsetof.3 man page Obtained from: OpenBSD --- share/man/man3/Makefile | 1 + share/man/man3/offsetof.3 | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 share/man/man3/offsetof.3 (limited to 'share') diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 4706506..d1453eb 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -10,6 +10,7 @@ MAN= assert.3 \ fpgetround.3 \ intro.3 \ makedev.3 \ + offsetof.3 \ ${PTHREAD_MAN} \ queue.3 \ siginfo.3 \ diff --git a/share/man/man3/offsetof.3 b/share/man/man3/offsetof.3 new file mode 100644 index 0000000..e63916b --- /dev/null +++ b/share/man/man3/offsetof.3 @@ -0,0 +1,47 @@ +.\" $OpenBSD: offsetof.3,v 1.2 2010/02/18 18:30:19 jmc Exp $ +.\" +.\" Copyright (c) 2010 Thomas Pfaff +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 18 2010 +.Dt OFFSETOF 3 +.Os +.Sh NAME +.Nm offsetof +.Nd offset of a structure member +.Sh SYNOPSIS +.Fd #include +.Ft size_t +.Fn offsetof "type" "member" +.Sh DESCRIPTION +The +.Fn offsetof +macro expands to an integer constant expression of type +.Ft size_t +and yields the offset, +in bytes, of the field +.Ar member +from the start of the structure +.Ar type . +.Pp +A compiler error will result if +.Ar member +is not aligned to a byte boundary (i.e. it is a bit-field). +.Sh STANDARDS +The +.Fn offsetof +macro conforms to +.St -ansiC . -- cgit v1.1 From dd6bba093e5163f05fcfb84865b091c7f63dae7e Mon Sep 17 00:00:00 2001 From: dougb Date: Wed, 8 Feb 2012 08:52:40 +0000 Subject: As it stands right now, the default devfs rulesets are only loaded as a side effect of something else using them. If they haven't been loaded already but you want to use them, say for configuring a jail, you're out of luck. So add a knob to always load the default rulesets. While I'm here document the other devfs_ knobs in rc.conf.5. --- share/man/man5/rc.conf.5 | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 47a325b..5a5cf9d 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 13, 2011 +.Dd February 8, 2012 .Dt RC.CONF 5 .Os .Sh NAME @@ -3673,6 +3673,25 @@ is set to these are the flags passed to the .Xr watchdogd 8 daemon. +.It Va devfs_rulesets +.Pq Vt str +List of files containing sets of rules for +.Xr devfs 8 . +.It Va devfs_system_ruleset +.Pq Vt str +Rule name(s) to apply to the system +.Pa /dev +itself. +.It Va devfs_set_rulesets +.Pq Vt str +Pairs of already-mounted +.Pa dev +directories and rulesets that should be applied to them. +For example: /mount/dev=ruleset_name +.It Va devfs_load_rulesets +.Pq Vt bool +If set, always load the default rulesets listed in +.Va devfs_rulesets . .It Va performance_cx_lowest .Pq Vt str CPU idle state to use while on AC power. @@ -4532,6 +4551,7 @@ The default is 30. .Xr chkprintcap 8 , .Xr chown 8 , .Xr cron 8 , +.Xr devfs 8 , .Xr dhclient 8 , .Xr ftpd 8 , .Xr geli 8 , -- cgit v1.1 From be823780e4222832fda0b5c7434f320bfa2ab5e3 Mon Sep 17 00:00:00 2001 From: gjb Date: Thu, 9 Feb 2012 04:37:30 +0000 Subject: Fix some Xr references: - ada(4): ad(4) - removed, ada(4) would be a self-referencing entry - cd(4): ad(4) -> ada(4) - da(4): ad(4) -> ada(4) - DEVICE_PROBE(9): ugen(5) -> ugen(4) - ed(4): dhclinet(8) -> dhclient(8) (typo) - lmc(4): Netgraph(4) -> netgraph(4) - security(7): rc.conf(8) -> rc.conf(5) - sfxge(4): cpuset(8) -> cpuset(1) - sbp(4): sysctl(1) -> sysctl(8) - portindex(5): build(1) -> build(7) - u3g(4): usbconfig(5) -> usbconfig(8) - usb_quirk(4): usbconfig(5) -> usbconfig(8) Found with: textproc/igor MFC after: 3 days --- share/man/man4/ada.4 | 3 +-- share/man/man4/cd.4 | 4 ++-- share/man/man4/da.4 | 4 ++-- share/man/man4/ed.4 | 4 ++-- share/man/man4/lmc.4 | 4 ++-- share/man/man4/sbp.4 | 4 ++-- share/man/man4/sfxge.4 | 6 +++--- share/man/man4/u3g.4 | 6 +++--- share/man/man4/usb_quirk.4 | 6 +++--- share/man/man5/portindex.5 | 4 ++-- share/man/man7/security.7 | 4 ++-- share/man/man9/DEVICE_PROBE.9 | 4 ++-- 12 files changed, 26 insertions(+), 27 deletions(-) (limited to 'share') diff --git a/share/man/man4/ada.4 b/share/man/man4/ada.4 index c807a4b..9e31756 100644 --- a/share/man/man4/ada.4 +++ b/share/man/man4/ada.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 8, 2011 +.Dd February 8, 2012 .Dt ADA 4 .Os .Sh NAME @@ -139,7 +139,6 @@ The per-device default is to leave it as-is (follow global setting). ATA device nodes .El .Sh SEE ALSO -.Xr ad 4 , .Xr ahci 4 , .Xr cam 4 , .Xr da 4 , diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4 index 83b9f3b..47ce3bd 100644 --- a/share/man/man4/cd.4 +++ b/share/man/man4/cd.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 8, 2009 +.Dd February 8, 2012 .Dt CD 4 .Os .Sh NAME @@ -52,7 +52,7 @@ but it will only last until the .Tn CD-ROM is unmounted. In general the interfaces are similar to those described by -.Xr ad 4 +.Xr ada 4 and .Xr da 4 . .Pp diff --git a/share/man/man4/da.4 b/share/man/man4/da.4 index cf56934..39e1dba 100644 --- a/share/man/man4/da.4 +++ b/share/man/man4/da.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 2, 2003 +.Dd February 8, 2012 .Dt DA 4 .Os .Sh NAME @@ -195,7 +195,7 @@ SCSI disk device nodes .Sh DIAGNOSTICS None. .Sh SEE ALSO -.Xr ad 4 , +.Xr ada 4 , .Xr cam 4 , .Xr geom 4 , .Xr bsdlabel 8 , diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4 index d002b96..3bc7077 100644 --- a/share/man/man4/ed.4 +++ b/share/man/man4/ed.4 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 9, 2009 +.Dd February 8, 2012 .Dt ED 4 .Os .Sh NAME @@ -435,7 +435,7 @@ Some devices supported by do not generate the link state change events used by .Xr devd 8 to start -.Xr dhclinet 8 . +.Xr dhclient 8 . If you have problems with .Xr dhclient 8 not starting and the device is always attached to the network it may diff --git a/share/man/man4/lmc.4 b/share/man/man4/lmc.4 index 439a10f..2cf6e49 100644 --- a/share/man/man4/lmc.4 +++ b/share/man/man4/lmc.4 @@ -43,7 +43,7 @@ .\" this program; if not, write to the Free Software Foundation, Inc., 59 .\" Temple Place - Suite 330, Boston, MA 02111-1307, USA. .\" -.Dd July 23, 2011 +.Dd February 8, 2012 .Dt LMC 4 .Os .\" @@ -179,7 +179,7 @@ higher-level issues like protocol multiplexing and security. This driver is compatible with several line protocol packages: .Bl -tag -width "Generic HDLC" .It Sy "Netgraph" -.Xr Netgraph 4 +.Xr netgraph 4 implements many basic packet-handling functions as kernel loadable modules. They can be interconnected in a graph to implement many protocols. Configuration is done from userland without rebuilding the kernel. diff --git a/share/man/man4/sbp.4 b/share/man/man4/sbp.4 index 0f86213..eeddd5d 100644 --- a/share/man/man4/sbp.4 +++ b/share/man/man4/sbp.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 20, 2002 +.Dd February 8, 2012 .Dt SBP 4 .Os .Sh NAME @@ -71,7 +71,7 @@ topology. If you want to force to detach the device, run .Dq Nm fwcontrol Fl r several times or set hw.firewire.hold_count=0 by -.Xr sysctl 1 . +.Xr sysctl 8 . .Pp Some (broken) HDDs do not work well with tagged queuing. If you have problems with such drives, try diff --git a/share/man/man4/sfxge.4 b/share/man/man4/sfxge.4 index 33063d9..3f27275 100644 --- a/share/man/man4/sfxge.4 +++ b/share/man/man4/sfxge.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 16, 2011 +.Dd February 8, 2012 .Dt SFXGE 4 .Os .Sh NAME @@ -57,7 +57,7 @@ and Receive Side Scaling (RSS) using MSI-X interrupts. The driver allocates 1 receive queue, transmit queue, event queue and IRQ per CPU up to a maximum of 64. IRQ affinities should be spread out using -.Xr cpuset 8 . +.Xr cpuset 1 . Interrupt moderation may be controlled through the sysctl .Va dev.sfxge.%d.int_mod (units are microseconds). @@ -85,7 +85,7 @@ go to the Solarflare support website at: .Xr netintro 4 , .Xr ng_ether 4 , .Xr vlan 4 , -.Xr cpuset 8 , +.Xr cpuset 1 , .Xr ifconfig 8 .Sh AUTHORS The diff --git a/share/man/man4/u3g.4 b/share/man/man4/u3g.4 index 87e3824..d65c2c8 100644 --- a/share/man/man4/u3g.4 +++ b/share/man/man4/u3g.4 @@ -18,7 +18,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 20, 2011 +.Dd February 8, 2012 .Dt U3G 4 .Os .Sh NAME @@ -88,7 +88,7 @@ driver is present which contains Windows and Mac OS X drivers. The device starts up in disk mode (TruInstall, ZeroCD, etc.) and requires additional commands to switch it to modem mode. If your device is not switching automatically, please try to add quirks. See -.Xr usbconfig 5 +.Xr usbconfig 8 and .Xr usb_quirk 4 . .Pp @@ -97,7 +97,7 @@ and .Xr ucom 4 , .Xr usb 4 , .Xr usb_quirk 4 , -.Xr usbconfig 5 +.Xr usbconfig 8 .Sh HISTORY The .Nm diff --git a/share/man/man4/usb_quirk.4 b/share/man/man4/usb_quirk.4 index 00e4ba4..2323495 100644 --- a/share/man/man4/usb_quirk.4 +++ b/share/man/man4/usb_quirk.4 @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 27, 2011 +.Dd February 8, 2012 .Dt USB_QUIRK 4 .Os .Sh NAME @@ -41,7 +41,7 @@ The .Nm module provides support for dynamically adding and removing quirks for USB devices with -.Xr usbconfig 5 . +.Xr usbconfig 8 . .Sh General quirks: .Bl -tag -width Ds .It UQ_AUDIO_SWAP_LR @@ -183,7 +183,7 @@ device which appears as a USB device on usbconfig -d ugen0.3 add_quirk UQ_MSC_EJECT_WAIT .Ed .Sh SEE ALSO -.Xr usbconfig 5 +.Xr usbconfig 8 .Sh HISTORY The .Nm diff --git a/share/man/man5/portindex.5 b/share/man/man5/portindex.5 index f7b126f..3526196 100644 --- a/share/man/man5/portindex.5 +++ b/share/man/man5/portindex.5 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 28, 2009 +.Dd February 8, 2012 .Dt PORTINDEX 5 .Os .Sh NAME @@ -90,7 +90,7 @@ branch. vim-6.3.15|/usr/ports/editors/vim|/usr/local|Vi "workalike", with many additional features|/usr/ports/editors/vim/pkg-descr|obrien@FreeBSD.org|editors|libiconv-1.9.2_1|libiconv-1.9.2_1|http://www.vim.org/||| .Ed .Sh SEE ALSO -.Xr build 1 , +.Xr build 7 , .Xr csup 1 , .Xr ports 7 .Sh AUTHORS diff --git a/share/man/man7/security.7 b/share/man/man7/security.7 index 197fe3e..a3882d6 100644 --- a/share/man/man7/security.7 +++ b/share/man/man7/security.7 @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 7, 2010 +.Dd February 8, 2012 .Dt SECURITY 7 .Os .Sh NAME @@ -579,7 +579,7 @@ configuration cannot be adjusted. .El .Pp The security level can be configured with variables documented in -.Xr rc.conf 8 . +.Xr rc.conf 5 . .Sh CHECKING FILE INTEGRITY: BINARIES, CONFIG FILES, ETC When it comes right down to it, you can only protect your core system configuration and control files so much before the convenience factor diff --git a/share/man/man9/DEVICE_PROBE.9 b/share/man/man9/DEVICE_PROBE.9 index bf592c5..b536b90 100644 --- a/share/man/man9/DEVICE_PROBE.9 +++ b/share/man/man9/DEVICE_PROBE.9 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 3, 2008 +.Dd February 8, 2012 .Dt DEVICE_PROBE 9 .Os .Sh NAME @@ -120,7 +120,7 @@ treatment for some reason. .It BUS_PROBE_HOOVER The driver matches all unclaimed devices on a bus. The -.Xr ugen 5 +.Xr ugen 4 device is one example. .It BUS_PROBE_NOWILDCARD The driver expects its parent to tell it which children to manage -- cgit v1.1 From 27a58a0dde89f99954c275fce42e656d2c5a7cbf Mon Sep 17 00:00:00 2001 From: mm Date: Thu, 9 Feb 2012 10:09:12 +0000 Subject: Introduce the "ruleset=number" option for devfs(5) mounts. Add support for updating the devfs mount (currently only changing the ruleset number is supported). Check mnt_optnew with vfs_filteropt(9). This new option sets the specified ruleset number as the active ruleset of the new devfs mount and applies all its rules at mount time. If the specified ruleset doesn't exist, a new empty ruleset is created. MFC after: 1 month --- share/man/man5/devfs.5 | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5 index 8c7e598..7b483fc 100644 --- a/share/man/man5/devfs.5 +++ b/share/man/man5/devfs.5 @@ -38,7 +38,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 18, 2010 +.Dd February 9, 2012 .Dt DEVFS 5 .Os .Sh NAME @@ -90,6 +90,29 @@ and .Pa 2 . .Xr fdescfs 5 creates files for all open descriptors. +.Pp +The options are as follows: +.Bl -tag -width indent +.It Fl o Ar options +Use the specified mount +.Ar options , +as described in +.Xr mount 8 . +The following devfs file system-specific options are available: +.Bl -tag -width indent +.It Cm ruleset Ns No = Ns Ar ruleset +Set ruleset number +.Ar ruleset +as the current ruleset for the mount-point and apply all its rules. If the +ruleset number +.Ar ruleset +does not exist, an empty ruleset with the number +.Ar ruleset +is created. See +.Xr devfs 8 +for more information on working with devfs rulesets. +.El +.El .Sh FILES .Bl -tag -width /dev/XXXX -compact .It Pa /dev -- cgit v1.1 From bdf6c01f6dc2ef7a36886ddf75d1be91cb6d8680 Mon Sep 17 00:00:00 2001 From: glebius Date: Thu, 9 Feb 2012 10:20:41 +0000 Subject: Add support for RICOH R5CE823 card reader, that can be found in some Lenovo laptops. The conroller needs a quirk to lower its frequency, and after that it operates normally. --- share/man/man4/sdhci.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/sdhci.4 b/share/man/man4/sdhci.4 index 09d4313..e9729a1 100644 --- a/share/man/man4/sdhci.4 +++ b/share/man/man4/sdhci.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 14, 2009 +.Dd February 9, 2012 .Dt SDHCI 4 .Os .Sh NAME @@ -69,6 +69,8 @@ ENE CB714 .It RICOH R5C822 .It +RICOH R5CE823 +.It TI PCIXX21/XX11 .El .Sh SEE ALSO -- cgit v1.1 From ab683f0ec7f4cc9ec4dec888477ada35f9056ebd Mon Sep 17 00:00:00 2001 From: matthew Date: Thu, 9 Feb 2012 14:15:20 +0000 Subject: Adding myself as a new committer Approved by: shaun (mentor) --- share/misc/committers-ports.dot | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 554aaec8..e795bd0 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -134,6 +134,7 @@ marcus [label="Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"] markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21"] martymac [label="Ganael Laplanche\nmartymac@FreeBSD.org\n2010/09/24"] mat [label="Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"] +matthew [label="Matthew Seaman\nmatthew@FreeBSD.org\n2012/02/07"] mezz [label="Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30"] miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04"] mm [label="Martin Matuska\nmm@FreeBSD.org\n2007/04/04"] @@ -413,6 +414,7 @@ sem -> delphij sem -> stas shaun -> timur +shaun -> matthew sobomax -> demon sobomax -> glewis -- cgit v1.1 From 9591ab6a1a36706433ee688192acb501b50ba960 Mon Sep 17 00:00:00 2001 From: gjb Date: Fri, 10 Feb 2012 03:34:32 +0000 Subject: Fix date from r231111. Pointy-hat to: gjb (myself, approver of r231111) --- share/man/man7/ports.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 15da4cb..29312da 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Feb 06, 2012 +.Dd February 9, 2012 .Dt PORTS 7 .Os .Sh NAME -- cgit v1.1 From 29ea9d1f3b4c6045b8a8adcc89d2bcb0cbef17b9 Mon Sep 17 00:00:00 2001 From: ed Date: Fri, 10 Feb 2012 11:20:13 +0000 Subject: Remove outdated piece of information. devtoname() always returns a pathname to the device. It will never return a #major/minor string. MFC after: 2 weeks --- share/man/man9/devtoname.9 | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'share') diff --git a/share/man/man9/devtoname.9 b/share/man/man9/devtoname.9 index 0e6e0db..07ec04f 100644 --- a/share/man/man9/devtoname.9 +++ b/share/man/man9/devtoname.9 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 19, 2012 +.Dd February 10, 2012 .Dt DEVTONAME 9 .Os .Sh NAME @@ -41,15 +41,6 @@ The function returns a pointer to the name of the device passed to it. The name is whatever was set to it in .Fn make_dev . -If no name is associated with -.Va dev , -a pointer to a string consisting of a -.Dq # -followed by -.Dq Va major Ns / Ns Va minor -as it applies to -.Va dev -is returned. .Sh HISTORY The .Fn devtoname -- cgit v1.1 From 23524b572c9490078007a68a1760546e22a8184d Mon Sep 17 00:00:00 2001 From: ed Date: Sun, 12 Feb 2012 18:29:56 +0000 Subject: 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. MFC after: 1 month --- share/man/man4/agp.4 | 12 ++-- share/man/man4/icmp6.4 | 12 ++-- share/man/man4/ip6.4 | 30 ++++----- share/man/man4/mem.4 | 4 +- share/man/man4/mtio.4 | 40 ++++++------ share/man/man4/natm.4 | 8 +-- share/man/man4/net80211.4 | 2 +- share/man/man4/ng_async.4 | 6 +- share/man/man4/ng_bridge.4 | 34 +++++----- share/man/man4/ng_btsocket.4 | 4 +- share/man/man4/ng_car.4 | 30 ++++----- share/man/man4/ng_ccatm.4 | 4 +- share/man/man4/ng_cisco.4 | 4 +- share/man/man4/ng_etf.4 | 2 +- share/man/man4/ng_hci.4 | 34 +++++----- share/man/man4/ng_l2cap.4 | 6 +- share/man/man4/ng_l2tp.4 | 14 ++--- share/man/man4/ng_mppc.4 | 2 +- share/man/man4/ng_netflow.4 | 8 +-- share/man/man4/ng_one2many.4 | 12 ++-- share/man/man4/ng_ppp.4 | 8 +-- share/man/man4/ng_pppoe.4 | 10 +-- share/man/man4/ng_pptpgre.4 | 8 +-- share/man/man4/ppi.4 | 4 +- share/man/man5/fs.5 | 6 +- share/man/man9/MD5.9 | 2 +- share/man/man9/bios.9 | 4 +- share/man/man9/bus_space.9 | 128 +++++++++++++++++++------------------- share/man/man9/crypto.9 | 26 ++++---- share/man/man9/device_set_flags.9 | 4 +- share/man/man9/devstat.9 | 4 +- share/man/man9/eventtimers.9 | 2 +- share/man/man9/get_cyclecount.9 | 2 +- share/man/man9/mbchain.9 | 10 +-- share/man/man9/mbuf_tags.9 | 10 +-- share/man/man9/mdchain.9 | 18 +++--- share/man/man9/netisr.9 | 2 +- share/man/man9/random.9 | 2 +- share/man/man9/rijndael.9 | 20 +++--- share/man/man9/zone.9 | 2 +- 40 files changed, 270 insertions(+), 270 deletions(-) (limited to 'share') diff --git a/share/man/man4/agp.4 b/share/man/man4/agp.4 index 06bee73..8af97d6 100644 --- a/share/man/man4/agp.4 +++ b/share/man/man4/agp.4 @@ -80,8 +80,8 @@ The result is a pointer to the following structure: .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 diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4 index e6c3665..1c6026f 100644 --- a/share/man/man4/icmp6.4 +++ b/share/man/man4/icmp6.4 @@ -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; diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4 index b796851..fdbb956 100644 --- a/share/man/man4/ip6.4 +++ b/share/man/man4/ip6.4 @@ -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 number of extension headers that start 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 structure in the ancillary data 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 structure in the ancillary data 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 structure in the ancillary data 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 diff --git a/share/man/man4/mem.4 b/share/man/man4/mem.4 index 5dd2cb9..38c5110 100644 --- a/share/man/man4/mem.4 +++ b/share/man/man4/mem.4 @@ -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 diff --git a/share/man/man4/mtio.4 b/share/man/man4/mtio.4 index f3dd602..e8056e6 100644 --- a/share/man/man4/mtio.4 +++ b/share/man/man4/mtio.4 @@ -175,7 +175,7 @@ struct mtget { #if defined (__FreeBSD__) int32_t mt_blksiz; /* presently operating blocksize */ int32_t mt_density; /* presently operating density */ - u_int32_t mt_comp; /* presently operating compression */ + uint32_t mt_comp; /* presently operating compression */ int32_t mt_blksiz0; /* blocksize for mode 0 */ int32_t mt_blksiz1; /* blocksize for mode 1 */ int32_t mt_blksiz2; /* blocksize for mode 2 */ @@ -185,10 +185,10 @@ struct mtget { int32_t mt_density2; /* density for mode 2 */ int32_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 int32_t mt_fileno; /* relative file number of current position */ @@ -203,23 +203,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 */ 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 */ 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; }; @@ -265,18 +265,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" diff --git a/share/man/man4/natm.4 b/share/man/man4/natm.4 index 59e5559d3..a553f6e 100644 --- a/share/man/man4/natm.4 +++ b/share/man/man4/natm.4 @@ -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 diff --git a/share/man/man4/net80211.4 b/share/man/man4/net80211.4 index 693f6b9..1af240d 100644 --- a/share/man/man4/net80211.4 +++ b/share/man/man4/net80211.4 @@ -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 */ diff --git a/share/man/man4/ng_async.4 b/share/man/man4/ng_async.4 index bb6b0be..2349cb3 100644 --- a/share/man/man4/ng_async.4 +++ b/share/man/man4/ng_async.4 @@ -118,9 +118,9 @@ Sets the node configuration, which is described by a .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 diff --git a/share/man/man4/ng_bridge.4 b/share/man/man4/ng_bridge.4 index 8884e33..b00dc60 100644 --- a/share/man/man4/ng_bridge.4 +++ b/share/man/man4/ng_bridge.4 @@ -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 diff --git a/share/man/man4/ng_btsocket.4 b/share/man/man4/ng_btsocket.4 index 7db8178..22763f9 100644 --- a/share/man/man4/ng_btsocket.4 +++ b/share/man/man4/ng_btsocket.4 @@ -154,7 +154,7 @@ The Bluetooth L2CAP socket address is defined as follows: 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 diff --git a/share/man/man4/ng_car.4 b/share/man/man4/ng_car.4 index a536fb7..080986e 100644 --- a/share/man/man4/ng_car.4 +++ b/share/man/man4/ng_car.4 @@ -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 { diff --git a/share/man/man4/ng_ccatm.4 b/share/man/man4/ng_ccatm.4 index 3a9e121..1010c0f 100644 --- a/share/man/man4/ng_ccatm.4 +++ b/share/man/man4/ng_ccatm.4 @@ -110,7 +110,7 @@ The interface on these hooks is defined in 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 diff --git a/share/man/man4/ng_cisco.4 b/share/man/man4/ng_cisco.4 index d2b382f..e4300a0 100644 --- a/share/man/man4/ng_cisco.4 +++ b/share/man/man4/ng_cisco.4 @@ -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 diff --git a/share/man/man4/ng_etf.4 b/share/man/man4/ng_etf.4 index 18bb99e..bc42726 100644 --- a/share/man/man4/ng_etf.4 +++ b/share/man/man4/ng_etf.4 @@ -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 diff --git a/share/man/man4/ng_hci.4 b/share/man/man4/ng_hci.4 index 28de180..0234d41 100644 --- a/share/man/man4/ng_hci.4 +++ b/share/man/man4/ng_hci.4 @@ -133,9 +133,9 @@ The next sections specify the HCI packet formats. .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 diff --git a/share/man/man4/ng_l2cap.4 b/share/man/man4/ng_l2cap.4 index d4b7815..949b039 100644 --- a/share/man/man4/ng_l2cap.4 +++ b/share/man/man4/ng_l2cap.4 @@ -310,9 +310,9 @@ appropriate upstream hook and must be prepended with header defined as follows. .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 diff --git a/share/man/man4/ng_l2tp.4 b/share/man/man4/ng_l2tp.4 index 49fedf1..c556a49 100644 --- a/share/man/man4/ng_l2tp.4 +++ b/share/man/man4/ng_l2tp.4 @@ -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? */ diff --git a/share/man/man4/ng_mppc.4 b/share/man/man4/ng_mppc.4 index a146228..df3b3a7 100644 --- a/share/man/man4/ng_mppc.4 +++ b/share/man/man4/ng_mppc.4 @@ -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 */ }; diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4 index 914489b..ff54fc6 100644 --- a/share/man/man4/ng_netflow.4 +++ b/share/man/man4/ng_netflow.4 @@ -148,8 +148,8 @@ This message requires as an argument: .Bd -literal -offset 4n struct ng_netflow_setifindex { - u_int16_t iface; /* which iface to operate on */ - u_int16_t index; /* new index */ + uint16_t iface; /* which iface to operate on */ + uint16_t index; /* new index */ }; .Ed .Pp @@ -175,8 +175,8 @@ This message requires as an argument: .Bd -literal -offset 4n struct ng_netflow_setconfig { - u_int16_t iface; - u_int32_t conf; + uint16_t iface; + uint32_t conf; #define NG_NETFLOW_CONF_INGRESS 1 #define NG_NETFLOW_CONF_EGRESS 2 #define NG_NETFLOW_CONF_ONCE 4 diff --git a/share/man/man4/ng_one2many.4 b/share/man/man4/ng_one2many.4 index 434ea73..948b763 100644 --- a/share/man/man4/ng_one2many.4 +++ b/share/man/man4/ng_one2many.4 @@ -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 connected: .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 diff --git a/share/man/man4/ng_ppp.4 b/share/man/man4/ng_ppp.4 index 9fd72ca..453d1bd 100644 --- a/share/man/man4/ng_ppp.4 +++ b/share/man/man4/ng_ppp.4 @@ -355,14 +355,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) */ + uint32_t bandwidth; /* link bandwidth (in bytes/second) */ }; /* Bundle config structure */ struct ng_ppp_bund_conf { - u_int16_t mrru; /* multilink peer MRRU */ + uint16_t mrru; /* multilink peer MRRU */ u_char enableMultilink; /* enable multilink */ u_char recvShortSeq; /* recv multilink short seq # */ u_char xmitShortSeq; /* xmit multilink short seq # */ diff --git a/share/man/man4/ng_pppoe.4 b/share/man/man4/ng_pppoe.4 index 32efa69..e7a9939 100644 --- a/share/man/man4/ng_pppoe.4 +++ b/share/man/man4/ng_pppoe.4 @@ -148,7 +148,7 @@ The three commands above use a common data structure: .Bd -literal -offset 4n struct ngpppoe_init_data { char hook[NG_HOOKSIZ]; /* hook to monitor on */ - u_int16_t data_len; /* service name length */ + uint16_t data_len; /* service name length */ char data[0]; /* init data goes here */ }; .Ed @@ -345,8 +345,8 @@ setup(char *ethername, char *service, char *sessname, * The following is available about the node: * ninfo->name (string) * ninfo->type (string) - * ninfo->id (u_int32_t) - * ninfo->hooks (u_int32_t) (count of hooks) + * ninfo->id (uint32_t) + * ninfo->hooks (uint32_t) (count of hooks) * check it is the correct type. and get it's ID for use * with mkpeer later. */ @@ -366,8 +366,8 @@ setup(char *ethername, char *service, char *sessname, * link->peerhook (string) * peer->name (string) * peer->type (string) - * peer->id (u_int32_t) - * peer->hooks (u_int32_t) + * peer->id (uint32_t) + * peer->hooks (uint32_t) */ link = &hlist->link[k]; peer = &hlist->link[k].nodeinfo; diff --git a/share/man/man4/ng_pptpgre.4 b/share/man/man4/ng_pptpgre.4 index 89557dc..e0d41f1 100644 --- a/share/man/man4/ng_pptpgre.4 +++ b/share/man/man4/ng_pptpgre.4 @@ -97,10 +97,10 @@ struct ng_pptpgre_conf { u_char enableDelayedAck; /* enables delayed acks */ u_char enableAlwaysAck; /* always send ack with data */ u_char enableWindowing; /* enable windowing algorithm */ - u_int16_t cid; /* my call id */ - u_int16_t peerCid; /* peer call id */ - u_int16_t recvWin; /* peer recv window size */ - u_int16_t peerPpd; /* peer packet processing delay + uint16_t cid; /* my call id */ + uint16_t peerCid; /* peer call id */ + uint16_t recvWin; /* peer recv window size */ + uint16_t peerPpd; /* peer packet processing delay (in 1/10 of a second) */ }; .Ed diff --git a/share/man/man4/ppi.4 b/share/man/man4/ppi.4 index a6041d2..a4084ad 100644 --- a/share/man/man4/ppi.4 +++ b/share/man/man4/ppi.4 @@ -53,7 +53,7 @@ interface is performed using .Fn ioctl calls. Each command takes a single -.Ft u_int8_t +.Ft uint8_t argument, transferring one byte of data. The following commands are available: .Bl -tag -width indent @@ -85,7 +85,7 @@ again, the following code fragment can be used: .Bd -literal -compact int fd; - u_int8_t val; + uint8_t val; val = 0x5a; ioctl(fd, PPISDATA, &val); diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5 index abb0f47..fbe8706 100644 --- a/share/man/man5/fs.5 +++ b/share/man/man5/fs.5 @@ -145,12 +145,12 @@ struct fs { int8_t fs_old_flags; /* old FS_ flags */ u_char fs_fsmnt[MAXMNTLEN]; /* name mounted on */ u_char fs_volname[MAXVOLLEN]; /* volume name */ - u_int64_t fs_swuid; /* system-wide uid */ + uint64_t fs_swuid; /* system-wide uid */ int32_t fs_pad; /* due to alignment of fs_swuid */ /* these fields retain the current block allocation info */ int32_t fs_cgrotor; /* last cg searched */ void *fs_ocsp[NOCSPTRS]; /* padding; was list of fs_cs buffers */ - u_int8_t *fs_contigdirs; /* # of contiguously allocated dirs */ + uint8_t *fs_contigdirs; /* # of contiguously allocated dirs */ struct csum *fs_csp; /* cg summary info buffer for fs_cs */ int32_t *fs_maxcluster; /* max cluster in each cyl group */ u_int *fs_active; /* used by snapshots to track fs */ @@ -175,7 +175,7 @@ struct fs { int32_t fs_contigsumsize; /* size of cluster summary array */ int32_t fs_maxsymlinklen; /* max length of an internal symlink */ int32_t fs_old_inodefmt; /* format of on-disk inodes */ - u_int64_t fs_maxfilesize; /* maximum representable file size */ + uint64_t fs_maxfilesize; /* maximum representable file size */ int64_t fs_qbmask; /* ~fs_bmask for use with 64-bit size */ int64_t fs_qfmask; /* ~fs_fmask for use with 64-bit size */ int32_t fs_state; /* validate fs_clean field */ diff --git a/share/man/man9/MD5.9 b/share/man/man9/MD5.9 index b2d257f..1b9fcd2 100644 --- a/share/man/man9/MD5.9 +++ b/share/man/man9/MD5.9 @@ -44,7 +44,7 @@ .Ft void .Fn MD5Init "MD5_CTX *buf" .Ft void -.Fn MD5Transform "u_int32_t buf[4]" "const unsigned char block[64]" +.Fn MD5Transform "uint32_t buf[4]" "const unsigned char block[64]" .Sh DESCRIPTION The .Nm diff --git a/share/man/man9/bios.9 b/share/man/man9/bios.9 index 0621b72..48bbe16 100644 --- a/share/man/man9/bios.9 +++ b/share/man/man9/bios.9 @@ -40,8 +40,8 @@ .In machine/param.h .In machine/pmap.h .In machine/pc/bios.h -.Ft u_int32_t -.Fn bios_sigsearch "u_int32_t start" "u_char *sig" "int siglen" "int paralen" "int sigofs" +.Ft uint32_t +.Fn bios_sigsearch "uint32_t start" "u_char *sig" "int siglen" "int paralen" "int sigofs" .Ft int .Fn bios32_SDlookup "struct bios32_SDentry *ent" .Ft int diff --git a/share/man/man9/bus_space.9 b/share/man/man9/bus_space.9 index b3234c4..59c3607 100644 --- a/share/man/man9/bus_space.9 +++ b/share/man/man9/bus_space.9 @@ -167,77 +167,77 @@ .Fo bus_space_free .Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t size" .Fc -.Ft u_int8_t +.Ft uint8_t .Fo bus_space_read_1 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset" .Fc -.Ft u_int16_t +.Ft uint16_t .Fo bus_space_read_2 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset" .Fc -.Ft u_int32_t +.Ft uint32_t .Fo bus_space_read_4 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset" .Fc -.Ft u_int64_t +.Ft uint64_t .Fo bus_space_read_8 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset" .Fc -.Ft u_int8_t +.Ft uint8_t .Fo bus_space_read_stream_1 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset" .Fc -.Ft u_int16_t +.Ft uint16_t .Fo bus_space_read_stream_2 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset" .Fc -.Ft u_int32_t +.Ft uint32_t .Fo bus_space_read_stream_4 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset" .Fc -.Ft u_int64_t +.Ft uint64_t .Fo bus_space_read_stream_8 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" "bus_size_t offset" .Fc .Ft void .Fo bus_space_write_1 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" -.Fa "bus_size_t offset" "u_int8_t value" +.Fa "bus_size_t offset" "uint8_t value" .Fc .Ft void .Fo bus_space_write_2 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" -.Fa "bus_size_t offset" "u_int16_t value" +.Fa "bus_size_t offset" "uint16_t value" .Fc .Ft void .Fo bus_space_write_4 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" -.Fa "bus_size_t offset" "u_int32_t value" +.Fa "bus_size_t offset" "uint32_t value" .Fc .Ft void .Fo bus_space_write_8 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" -.Fa "bus_size_t offset" "u_int64_t value" +.Fa "bus_size_t offset" "uint64_t value" .Fc .Ft void .Fo bus_space_write_stream_1 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" -.Fa "bus_size_t offset" "u_int8_t value" +.Fa "bus_size_t offset" "uint8_t value" .Fc .Ft void .Fo bus_space_write_stream_2 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" -.Fa "bus_size_t offset" "u_int16_t value" +.Fa "bus_size_t offset" "uint16_t value" .Fc .Ft void .Fo bus_space_write_stream_4 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" -.Fa "bus_size_t offset" "u_int32_t value" +.Fa "bus_size_t offset" "uint32_t value" .Fc .Ft void .Fo bus_space_write_stream_8 .Fa "bus_space_tag_t space" "bus_space_handle_t handle" -.Fa "bus_size_t offset" "u_int64_t value" +.Fa "bus_size_t offset" "uint64_t value" .Fc .Ft void .Fo bus_space_barrier @@ -247,97 +247,97 @@ .Ft void .Fo bus_space_read_region_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_region_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_region_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_region_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_region_stream_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_region_stream_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_region_stream_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_region_stream_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_region_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_region_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_region_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_region_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_region_stream_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_region_stream_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_region_stream_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_region_stream_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" .Fa "bus_size_t count" .Fc .Ft void @@ -391,193 +391,193 @@ .Ft void .Fo bus_space_set_region_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_region_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_region_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_region_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_region_stream_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_region_stream_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_region_stream_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_region_stream_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_multi_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_multi_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_multi_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_multi_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_multi_stream_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_multi_stream_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_multi_stream_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_read_multi_stream_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_multi_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_multi_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_multi_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_multi_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_multi_stream_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_multi_stream_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_multi_stream_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_write_multi_stream_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t *datap" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t *datap" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_multi_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_multi_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_multi_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_multi_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_multi_stream_1 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int8_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint8_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_multi_stream_2 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int16_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint16_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_multi_stream_4 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int32_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint32_t value" .Fa "bus_size_t count" .Fc .Ft void .Fo bus_space_set_multi_stream_8 .Fa "bus_space_tag_t space" -.Fa "bus_space_handle_t handle" "bus_size_t offset" "u_int64_t value" +.Fa "bus_space_handle_t handle" "bus_size_t offset" "uint64_t value" .Fa "bus_size_t count" .Fc .Sh DESCRIPTION diff --git a/share/man/man9/crypto.9 b/share/man/man9/crypto.9 index ba13254..762d785 100644 --- a/share/man/man9/crypto.9 +++ b/share/man/man9/crypto.9 @@ -26,29 +26,29 @@ .Sh SYNOPSIS .In opencrypto/cryptodev.h .Ft int32_t -.Fn crypto_get_driverid u_int8_t +.Fn crypto_get_driverid uint8_t .Ft int -.Fn crypto_register u_int32_t int u_int16_t u_int32_t "int \*[lp]*\*[rp]\*[lp]void *, u_int32_t *, struct cryptoini *\*[rp]" "int \*[lp]*\*[rp]\*[lp]void *, u_int64_t\*[rp]" "int \*[lp]*\*[rp]\*[lp]void *, struct cryptop *\*[rp]" "void *" +.Fn crypto_register uint32_t int uint16_t uint32_t "int \*[lp]*\*[rp]\*[lp]void *, uint32_t *, struct cryptoini *\*[rp]" "int \*[lp]*\*[rp]\*[lp]void *, uint64_t\*[rp]" "int \*[lp]*\*[rp]\*[lp]void *, struct cryptop *\*[rp]" "void *" .Ft int -.Fn crypto_kregister u_int32_t int u_int32_t "int \*[lp]*\*[rp]\*[lp]void *, struct cryptkop *\*[rp]" "void *" +.Fn crypto_kregister uint32_t int uint32_t "int \*[lp]*\*[rp]\*[lp]void *, struct cryptkop *\*[rp]" "void *" .Ft int -.Fn crypto_unregister u_int32_t int +.Fn crypto_unregister uint32_t int .Ft int -.Fn crypto_unregister_all u_int32_t +.Fn crypto_unregister_all uint32_t .Ft void .Fn crypto_done "struct cryptop *" .Ft void .Fn crypto_kdone "struct cryptkop *" .Ft int -.Fn crypto_newsession "u_int64_t *" "struct cryptoini *" int +.Fn crypto_newsession "uint64_t *" "struct cryptoini *" int .Ft int -.Fn crypto_freesession u_int64_t +.Fn crypto_freesession uint64_t .Ft int .Fn crypto_dispatch "struct cryptop *" .Ft int .Fn crypto_kdispatch "struct cryptkop *" .Ft int -.Fn crypto_unblock u_int32_t int +.Fn crypto_unblock uint32_t int .Ft "struct cryptop *" .Fn crypto_getreq int .Ft void @@ -64,7 +64,7 @@ struct cryptoini { int cri_klen; int cri_mlen; caddr_t cri_key; - u_int8_t cri_iv[EALG_MAX_BLOCK_LEN]; + uint8_t cri_iv[EALG_MAX_BLOCK_LEN]; struct cryptoini *cri_next; }; @@ -83,7 +83,7 @@ struct cryptodesc { struct cryptop { TAILQ_ENTRY(cryptop) crp_next; - u_int64_t crp_sid; + uint64_t crp_sid; int crp_ilen; int crp_olen; int crp_etype; @@ -108,7 +108,7 @@ struct cryptkop { u_int krp_status; /* return status */ u_short krp_iparams; /* # of input parameters */ u_short krp_oparams; /* # of output parameters */ - u_int32_t krp_hid; + uint32_t krp_hid; struct crparam krp_param[CRK_MAXPARAM]; int (*krp_callback)(struct cryptkop *); }; @@ -524,10 +524,10 @@ The calling convention for the three driver-supplied routines is: .Bl -item -compact .It .Ft int -.Fn \*[lp]*newsession\*[rp] "void *" "u_int32_t *" "struct cryptoini *" ; +.Fn \*[lp]*newsession\*[rp] "void *" "uint32_t *" "struct cryptoini *" ; .It .Ft int -.Fn \*[lp]*freesession\*[rp] "void *" "u_int64_t" ; +.Fn \*[lp]*freesession\*[rp] "void *" "uint64_t" ; .It .Ft int .Fn \*[lp]*process\*[rp] "void *" "struct cryptop *" ; diff --git a/share/man/man9/device_set_flags.9 b/share/man/man9/device_set_flags.9 index aed3069..3a836ff 100644 --- a/share/man/man9/device_set_flags.9 +++ b/share/man/man9/device_set_flags.9 @@ -39,8 +39,8 @@ .In sys/param.h .In sys/bus.h .Ft void -.Fn device_set_flags "device_t dev" "u_int32_t flags" -.Ft u_int32_t +.Fn device_set_flags "device_t dev" "uint32_t flags" +.Ft uint32_t .Fn device_get_flags "device_t dev" .Sh DESCRIPTION Each device supports a set of driver-dependent flags which are often diff --git a/share/man/man9/devstat.9 b/share/man/man9/devstat.9 index fa37856..7ed7ec1 100644 --- a/share/man/man9/devstat.9 +++ b/share/man/man9/devstat.9 @@ -45,7 +45,7 @@ .Fa "struct devstat *ds" .Fa "const char *dev_name" .Fa "int unit_number" -.Fa "u_int32_t block_size" +.Fa "uint32_t block_size" .Fa "devstat_support_flags flags" .Fa "devstat_type_flags device_type" .Fa "devstat_priority priority" @@ -57,7 +57,7 @@ .Ft void .Fo devstat_end_transaction .Fa "struct devstat *ds" -.Fa "u_int32_t bytes" +.Fa "uint32_t bytes" .Fa "devstat_tag_type tag_type" .Fa "devstat_trans_flags flags" .Fc diff --git a/share/man/man9/eventtimers.9 b/share/man/man9/eventtimers.9 index db530a9..c21b1a7 100644 --- a/share/man/man9/eventtimers.9 +++ b/share/man/man9/eventtimers.9 @@ -52,7 +52,7 @@ struct eventtimer { #define ET_FLAGS_POW2DIV 16 int et_quality; int et_active; - u_int64_t et_frequency; + uint64_t et_frequency; struct bintime et_min_period; struct bintime et_max_period; et_start_t *et_start; diff --git a/share/man/man9/get_cyclecount.9 b/share/man/man9/get_cyclecount.9 index 30db0d8..eabaeb1 100644 --- a/share/man/man9/get_cyclecount.9 +++ b/share/man/man9/get_cyclecount.9 @@ -34,7 +34,7 @@ .In sys/param.h .In sys/systm.h .In machine/cpu.h -.Ft u_int64_t +.Ft uint64_t .Fn get_cyclecount "void" .Sh DESCRIPTION The diff --git a/share/man/man9/mbchain.9 b/share/man/man9/mbchain.9 index f9a4521..4e05e7a 100644 --- a/share/man/man9/mbchain.9 +++ b/share/man/man9/mbchain.9 @@ -66,15 +66,15 @@ .Ft caddr_t .Fn mb_reserve "struct mbchain *mbp" "int size" .Ft int -.Fn mb_put_uint8 "struct mbchain *mbp" "u_int8_t x" +.Fn mb_put_uint8 "struct mbchain *mbp" "uint8_t x" .Ft int -.Fn mb_put_uint16be "struct mbchain *mbp" "u_int16_t x" +.Fn mb_put_uint16be "struct mbchain *mbp" "uint16_t x" .Ft int -.Fn mb_put_uint16le "struct mbchain *mbp" "u_int16_t x" +.Fn mb_put_uint16le "struct mbchain *mbp" "uint16_t x" .Ft int -.Fn mb_put_uint32be "struct mbchain *mbp" "u_int32_t x" +.Fn mb_put_uint32be "struct mbchain *mbp" "uint32_t x" .Ft int -.Fn mb_put_uint32le "struct mbchain *mbp" "u_int32_t x" +.Fn mb_put_uint32le "struct mbchain *mbp" "uint32_t x" .Ft int .Fn mb_put_int64be "struct mbchain *mbp" "int64_t x" .Ft int diff --git a/share/man/man9/mbuf_tags.9 b/share/man/man9/mbuf_tags.9 index d84c56b..d9627e8 100644 --- a/share/man/man9/mbuf_tags.9 +++ b/share/man/man9/mbuf_tags.9 @@ -29,7 +29,7 @@ .Sh SYNOPSIS .In sys/mbuf.h .Ft "struct m_tag *" -.Fn m_tag_alloc "u_int32_t cookie" "int type" "int len" "int wait" +.Fn m_tag_alloc "uint32_t cookie" "int type" "int len" "int wait" .Ft "struct m_tag *" .Fn m_tag_copy "struct m_tag *t" "int how" .Ft int @@ -51,7 +51,7 @@ .Ft void .Fn m_tag_init "struct mbuf *m" .Ft struct m_tag * -.Fn m_tag_locate "struct mbuf *m" "u_int32_t cookie" "int type" "struct m_tag *t" +.Fn m_tag_locate "struct mbuf *m" "uint32_t cookie" "int type" "struct m_tag *t" .Ft "struct m_tag *" .Fn m_tag_next "struct mbuf *m" "struct m_tag *t" .Ft void @@ -100,9 +100,9 @@ bytes of a tag contain a .Bd -literal struct m_tag { SLIST_ENTRY(m_tag) m_tag_link; /* List of packet tags */ - u_int16_t m_tag_id; /* Tag ID */ - u_int16_t m_tag_len; /* Length of data */ - u_int32_t m_tag_cookie; /* ABI/Module ID */ + uint16_t m_tag_id; /* Tag ID */ + uint16_t m_tag_len; /* Length of data */ + uint32_t m_tag_cookie; /* ABI/Module ID */ void (*m_tag_free)(struct m_tag *); }; .Ed diff --git a/share/man/man9/mdchain.9 b/share/man/man9/mdchain.9 index 57291c7..5b0bf4a 100644 --- a/share/man/man9/mdchain.9 +++ b/share/man/man9/mdchain.9 @@ -63,19 +63,19 @@ .Ft int .Fn md_next_record "struct mdchain *mdp" .Ft int -.Fn md_get_uint8 "struct mdchain *mdp" "u_int8_t *x" +.Fn md_get_uint8 "struct mdchain *mdp" "uint8_t *x" .Ft int -.Fn md_get_uint16 "struct mdchain *mdp" "u_int16_t *x" +.Fn md_get_uint16 "struct mdchain *mdp" "uint16_t *x" .Ft int -.Fn md_get_uint16be "struct mdchain *mdp" "u_int16_t *x" +.Fn md_get_uint16be "struct mdchain *mdp" "uint16_t *x" .Ft int -.Fn md_get_uint16le "struct mdchain *mdp" "u_int16_t *x" +.Fn md_get_uint16le "struct mdchain *mdp" "uint16_t *x" .Ft int -.Fn md_get_uint32 "struct mdchain *mdp" "u_int32_t *x" +.Fn md_get_uint32 "struct mdchain *mdp" "uint32_t *x" .Ft int -.Fn md_get_uint32be "struct mdchain *mdp" "u_int32_t *x" +.Fn md_get_uint32be "struct mdchain *mdp" "uint32_t *x" .Ft int -.Fn md_get_uint32le "struct mdchain *mdp" "u_int32_t *x" +.Fn md_get_uint32le "struct mdchain *mdp" "uint32_t *x" .Ft int .Fn md_get_int64 "struct mdchain *mdp" "int64_t *x" .Ft int @@ -193,8 +193,8 @@ function can safely be called to destroy it. .Bd -literal struct mdchain *mdp; struct mbuf *m; -u_int16_t length; -u_int8_t byte; +uint16_t length; +uint8_t byte; receive(so, &m); md_initm(mdp, m); diff --git a/share/man/man9/netisr.9 b/share/man/man9/netisr.9 index ee6fbed..bb64b0e 100644 --- a/share/man/man9/netisr.9 +++ b/share/man/man9/netisr.9 @@ -50,7 +50,7 @@ .Ft void .Fn netisr_clearqdrops "const struct netisr_handler *nhp" .Ft void -.Fn netisr_getqdrops "const struct netisr_handler *nhp" "u_int64_t *qdropsp" +.Fn netisr_getqdrops "const struct netisr_handler *nhp" "uint64_t *qdropsp" .Ft void .Fn netisr_getqlimit "const struct netisr_handler *nhp" "u_int *qlimitp" .Ft int diff --git a/share/man/man9/random.9 b/share/man/man9/random.9 index 1d7c7da..a6bccda 100644 --- a/share/man/man9/random.9 +++ b/share/man/man9/random.9 @@ -44,7 +44,7 @@ .Fn random "void" .Ft void .Fn arc4rand "void *ptr" "u_int length" "int reseed" -.Ft u_int32_t +.Ft uint32_t .Fn arc4random "void" .Pp .In sys/random.h diff --git a/share/man/man9/rijndael.9 b/share/man/man9/rijndael.9 index 48b402b..1d8d904 100644 --- a/share/man/man9/rijndael.9 +++ b/share/man/man9/rijndael.9 @@ -43,47 +43,47 @@ .Ft int .Fo rijndael_makeKey .Fa "keyInstance *key" -.Fa "u_int8_t direction" +.Fa "uint8_t direction" .Fa "int keyLen" .Fa "char *keyMaterial" .Fc .Ft int .Fo rijndael_cipherInit .Fa "cipherInstance *cipher" -.Fa "u_int8_t mode" +.Fa "uint8_t mode" .Fa "char *IV" .Fc .Ft int .Fo rijndael_blockEncrypt .Fa "cipherInstance *cipher" .Fa "keyInstance *key" -.Fa "u_int8_t *input" +.Fa "uint8_t *input" .Fa "int inputLen" -.Fa "u_int8_t *outBuffer" +.Fa "uint8_t *outBuffer" .Fc .Ft int .Fo rijndael_padEncrypt .Fa "cipherInstance *cipher" .Fa "keyInstance *key" -.Fa "u_int8_t *input" +.Fa "uint8_t *input" .Fa "int inputOctets" -.Fa "u_int8_t *outBuffer" +.Fa "uint8_t *outBuffer" .Fc .Ft int .Fo rijndael_blockDecrypt .Fa "cipherInstance *cipher" .Fa "keyInstance *key" -.Fa "u_int8_t *input" +.Fa "uint8_t *input" .Fa "int inputLen" -.Fa "u_int8_t *outBuffer" +.Fa "uint8_t *outBuffer" .Fc .Ft int .Fo rijndael_padDecrypt .Fa "cipherInstance *cipher" .Fa "keyInstance *key" -.Fa "u_int8_t *input" +.Fa "uint8_t *input" .Fa "int inputOctets" -.Fa "u_int8_t *outBuffer" +.Fa "uint8_t *outBuffer" .Fc .Sh DESCRIPTION The diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9 index 32531bb..df7a353 100644 --- a/share/man/man9/zone.9 +++ b/share/man/man9/zone.9 @@ -47,7 +47,7 @@ .Fo uma_zcreate .Fa "char *name" "int size" .Fa "uma_ctor ctor" "uma_dtor dtor" "uma_init uminit" "uma_fini fini" -.Fa "int align" "u_int16_t flags" +.Fa "int align" "uint16_t flags" .Fc .Ft "void *" .Fn uma_zalloc "uma_zone_t zone" "int flags" -- cgit v1.1 From 35fc7978b5e964b0f1b6280b72d21b965e7eb973 Mon Sep 17 00:00:00 2001 From: brueffer Date: Mon, 13 Feb 2012 23:02:51 +0000 Subject: Minor cleanup and added missing svn keywords. --- share/man/man4/isci.4 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/man/man4/isci.4 b/share/man/man4/isci.4 index 4d00dc8..7900d4b 100644 --- a/share/man/man4/isci.4 +++ b/share/man/man4/isci.4 @@ -57,7 +57,7 @@ The .Nm driver provides support for Intel C600 .Tn SAS -controller. +controllers. .Sh CONFIGURATION To force legacy interrupts for all .Nm @@ -77,9 +77,11 @@ hw.isci.debug_level variable to a value between 1 and 4 in .Xr loader.conf 5 . .Pp -The hardware layer in the isci driver has extensive logging capabilities -which are disabled by default for performance reasons. These can be enabled -by adding +The hardware layer in the +.Nm +driver has extensive logging capabilities +which are disabled by default for performance reasons. +These can be enabled by adding .Bd -literal -offset indent options ISCI_LOGGING .Ed @@ -91,7 +93,7 @@ to the kernel configuration file. .Xr da 4 , .Xr pci 4 , .Xr sa 4 , -.Xr scsi 4 . +.Xr scsi 4 .Sh HISTORY The .Nm -- cgit v1.1 From 5abebddb436aac4d1f396c82a98743aa0a774aa6 Mon Sep 17 00:00:00 2001 From: dougb Date: Tue, 14 Feb 2012 10:51:24 +0000 Subject: Fix various issues with the NFS and RPC related scripts: 1. Add new functionality to the force_depend method to incorporate the tests for whether the service is enabled and/or already running. 2. Add a new option to bypass checking only that the service is enabled at boot time, and always check if it is running. 3. Use this new functionality to greatly simplify the rc.d scripts that use force_depend. 4. Add a force_depend for statd in lockd 5. Remove the check that either nfs_server or nfs_client is _enable'd from statd and lockd. This was always overkill, and prevented using the {one|force}start options, as well as stop'ing on the command line. 6. The yp* scripts had some of their arguments in various weird orders. Bring them into line with the model. 7. If mountd fails to create /var/db/mountdtab, err out. Ideas, suggestions, and/or review from delphij and jilles. Pointy hats are completely my responsibility however. --- share/man/man5/rc.conf.5 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 5a5cf9d..83d91be 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 8, 2012 +.Dd February 11, 2012 .Dt RC.CONF 5 .Os .Sh NAME @@ -149,6 +149,19 @@ and before changing it one should ensure that there are adequate provisions to recover from a failed boot (such as physical contact with the machine, or reliable remote console access). +.It Va always_force_depends +.Pq Vt bool +Various +.Pa rc.d +scripts use the force_depend function to check whether required +services are already running, and to start them if necessary. +By default during boot time this check is bypassed if the +required service is enabled in +.Pa /etc/rc.conf[.local] . +Setting this option will bypass that check at boot time and +always test whether or not the service is actually running. +Enabling this option is likely to increase your boot time if +services are enabled that utilize the force_depend check. .It Va swapfile .Pq Vt str If set to -- cgit v1.1 From 91f6a0dbf947ad209636165756c0303297e5a369 Mon Sep 17 00:00:00 2001 From: jimharris Date: Tue, 14 Feb 2012 17:11:34 +0000 Subject: Update HISTORY for isci.4 man page. Sponsored by: Intel Approved by: scottl --- share/man/man4/isci.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/isci.4 b/share/man/man4/isci.4 index 7900d4b..b99cb8c 100644 --- a/share/man/man4/isci.4 +++ b/share/man/man4/isci.4 @@ -98,7 +98,7 @@ to the kernel configuration file. The .Nm driver first appeared in -.Fx 10.0 . +.Fx 8.3 and 9.1 . .Sh AUTHORS .An -nosplit The -- cgit v1.1 From 24393271fee36a45a67119022dc110706aed11fa Mon Sep 17 00:00:00 2001 From: imp Date: Wed, 15 Feb 2012 21:20:58 +0000 Subject: Wordsmith the can't find kernel error message, and suggest which variable to set to override. --- share/mk/bsd.kmod.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk index 9c0434f..1cb6e32 100644 --- a/share/mk/bsd.kmod.mk +++ b/share/mk/bsd.kmod.mk @@ -9,7 +9,7 @@ SYSDIR= ${_dir} .endfor .if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \ !exists(${SYSDIR}/conf/kmod.mk) -.error "can't find kernel source tree" +.error "can't locate the kernel source tree, set SYSDIR to override." .endif .include "${SYSDIR}/conf/kmod.mk" -- cgit v1.1 From cdb7b1efe1a6471af92dc5764d5592e17f50b14d Mon Sep 17 00:00:00 2001 From: imp Date: Thu, 16 Feb 2012 21:04:47 +0000 Subject: Fix comma splice, can't ambiguity and quoting. Submitted by: bde@ MFC after: 2 weeks --- share/mk/bsd.kmod.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/mk/bsd.kmod.mk b/share/mk/bsd.kmod.mk index 1cb6e32..fd4f993 100644 --- a/share/mk/bsd.kmod.mk +++ b/share/mk/bsd.kmod.mk @@ -9,7 +9,7 @@ SYSDIR= ${_dir} .endfor .if !defined(SYSDIR) || !exists(${SYSDIR}/kern/) || \ !exists(${SYSDIR}/conf/kmod.mk) -.error "can't locate the kernel source tree, set SYSDIR to override." +.error Unable to locate the kernel source tree. Set SYSDIR to override. .endif .include "${SYSDIR}/conf/kmod.mk" -- cgit v1.1 From dcdb23291fec1365e927195511d5dfb273901a5d Mon Sep 17 00:00:00 2001 From: bz Date: Fri, 17 Feb 2012 02:39:58 +0000 Subject: Merge multi-FIB IPv6 support from projects/multi-fibv6/head/: Extend the so far IPv4-only support for multiple routing tables (FIBs) introduced in r178888 to IPv6 providing feature parity. This includes an extended rtalloc(9) KPI for IPv6, the necessary adjustments to the network stack, and user land support as in netstat. Sponsored by: Cisco Systems, Inc. Reviewed by: melifaro (basically) MFC after: 10 days --- share/man/man4/faith.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/faith.4 b/share/man/man4/faith.4 index b98ba39..f0a2df6 100644 --- a/share/man/man4/faith.4 +++ b/share/man/man4/faith.4 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 10, 1999 +.Dd January 23, 2012 .Dt FAITH 4 .Os .Sh NAME @@ -58,7 +58,7 @@ variable in .Xr rc.conf 5 . .Pp Special action will be taken when IPv6 TCP traffic is seen on a router, -and the routing table suggests to route it to the +and the default routing table suggests to route it to the .Nm interface. In this case, the packet will be accepted by the router, -- cgit v1.1 From e7f39f7e96dc1a1de8e01cdc1a63e39cf23c3946 Mon Sep 17 00:00:00 2001 From: luigi Date: Fri, 17 Feb 2012 14:02:44 +0000 Subject: add manpage for the "oce" driver Submitted by: Naresh Raju Gottumukkala (Emulex) MFC after: 3 days --- share/man/man4/Makefile | 1 + share/man/man4/oce.4 | 117 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) create mode 100644 share/man/man4/oce.4 (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 90f9554..39db534 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -328,6 +328,7 @@ MAN= aac.4 \ ${_nvram.4} \ ${_nvram2env.4} \ ${_nxge.4} \ + oce.4 \ ohci.4 \ orm.4 \ ${_padlock.4} \ diff --git a/share/man/man4/oce.4 b/share/man/man4/oce.4 new file mode 100644 index 0000000..b8af432 --- /dev/null +++ b/share/man/man4/oce.4 @@ -0,0 +1,117 @@ +.\" Copyright (C) 2012 Emulex +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions are met: +.\" +.\" 1. Redistributions of source code must retain the above copyright notice, +.\" this list of conditions and the following disclaimer. +.\" +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" 3. Neither the name of the Emulex Corporation nor the names of its +.\" contributors may be used to endorse or promote products derived from +.\" this software without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +.\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" POSSIBILITY OF SUCH DAMAGE. +.\" +.\" Contact Information: +.\" freebsd-drivers@emulex.com +.\" +.\" Emulex +.\" 3333 Susan Street +.\" Costa Mesa, CA 92626 +.\" +.\" $FreeBSD$ +.\" + + +.Dd February 14, 2012 +.Dt OCE 4 +.Os +.Sh NAME +.Nm oce +.Nd "Device driver for Emulex OneConnect 10Gb network adapters" +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device oce" +.Ed +.Pp +To load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +if_oce_load="YES" +.Ed +.Sh DESCRIPTION +Emulex one connect adapters come in various skews and with +different combinations of NIC, FCoE and iSCSI functions. +oce claims the NIC functions in all these adapters. +.Pp +The +.Nm +driver supports VLAN Hardware offload, TCP checksum offload, +TCP segmentation offload (TSO), Large receive offload (LRO), +Bonding, Jumbo frames (from 1500 - 9000), Multiple TX queues, +Receive-Side Scaling(RSS) and MSI-X interrupts. +.Sh HARDWARE +.Nm +driver supports the following Emulex network adapters: +.Bl -bullet -compact +.It +BladeEngine 2 +.It +BladeEngine 3 +.It +Lancer +.El +.Sh UPDATING FIRMWARE +Adapter firmware updates are persistent. + +Firmware can be updated by following the steps below: +.nf + 1) Copy the below code to a Makefile + ".KMOD=elxflash + FIRMWS=imagename.ufi:elxflash + .include " + 2) Replace imagename in above with UFI file name. + 3) Copy Makefile and UFI to a directory + 4) Execute make & copy generated elxflash.ko to /lib/modules + 5) sysctl dev.oce..fw_upgrade=elxflash + 6) Reboot the machine. + +In case of issues with supplied UFI, flashing fails with one +of the below errors. + 1) "Invalid BE3 firmware image" + 2) "Invalid Cookie. Firmware image corrupted ?" + 3) "cmd to write to flash rom failed." +.fi +.Sh SUPPORT +For general information and support, +go to the Emulex website at: +.Fa http://www.Emulex.com/ +or E-Mail at +.Fa freebsd-drivers@emulex.com. +.Sh SEE ALSO +.Xr ifconfig 8 +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An freebsd-drivers@emulex.com. -- cgit v1.1 From 43f93350383de9ce3e4412e9f84731facb43206f Mon Sep 17 00:00:00 2001 From: pluknet Date: Sun, 19 Feb 2012 18:16:42 +0000 Subject: - Trim empty lines resulting in bad rendering, EOL whitespaces - Convert to our standard SYNOPSIS language - Consistently use "The .Nm driver" - Rewrite .nf .fi block with mdoc - Add pci dependency to SYNOPSIS - Start .Bl list with new paragraph Approved by: luigi --- share/man/man4/oce.4 | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'share') diff --git a/share/man/man4/oce.4 b/share/man/man4/oce.4 index b8af432..9ee4019 100644 --- a/share/man/man4/oce.4 +++ b/share/man/man4/oce.4 @@ -36,9 +36,7 @@ .\" .\" $FreeBSD$ .\" - - -.Dd February 14, 2012 +.Dd February 19, 2012 .Dt OCE 4 .Os .Sh NAME @@ -49,10 +47,11 @@ To compile this driver into the kernel, place the following lines in your kernel configuration file: .Bd -ragged -offset indent +.Cd "device pci" .Cd "device oce" .Ed .Pp -To load the driver as a +Alternatively, to load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent @@ -61,17 +60,21 @@ if_oce_load="YES" .Sh DESCRIPTION Emulex one connect adapters come in various skews and with different combinations of NIC, FCoE and iSCSI functions. -oce claims the NIC functions in all these adapters. +The +.Nm +driver claims the NIC functions in all these adapters. .Pp The .Nm driver supports VLAN Hardware offload, TCP checksum offload, TCP segmentation offload (TSO), Large receive offload (LRO), Bonding, Jumbo frames (from 1500 - 9000), Multiple TX queues, -Receive-Side Scaling(RSS) and MSI-X interrupts. +Receive-Side Scaling(RSS) and MSI-X interrupts. .Sh HARDWARE +The .Nm driver supports the following Emulex network adapters: +.Pp .Bl -bullet -compact .It BladeEngine 2 @@ -82,9 +85,9 @@ Lancer .El .Sh UPDATING FIRMWARE Adapter firmware updates are persistent. - +.Pp Firmware can be updated by following the steps below: -.nf +.Bd -literal -compact 1) Copy the below code to a Makefile ".KMOD=elxflash FIRMWS=imagename.ufi:elxflash @@ -94,18 +97,18 @@ Firmware can be updated by following the steps below: 4) Execute make & copy generated elxflash.ko to /lib/modules 5) sysctl dev.oce..fw_upgrade=elxflash 6) Reboot the machine. - +.Pp In case of issues with supplied UFI, flashing fails with one of the below errors. 1) "Invalid BE3 firmware image" 2) "Invalid Cookie. Firmware image corrupted ?" 3) "cmd to write to flash rom failed." -.fi +.Ed .Sh SUPPORT For general information and support, go to the Emulex website at: .Fa http://www.Emulex.com/ -or E-Mail at +or E-Mail at .Fa freebsd-drivers@emulex.com. .Sh SEE ALSO .Xr ifconfig 8 -- cgit v1.1 From 313fbcba766e5a18256bbce52043ec5f7e8d8221 Mon Sep 17 00:00:00 2001 From: brueffer Date: Mon, 20 Feb 2012 13:22:00 +0000 Subject: More improvements, the biggest one using list environments for enumerations. --- share/man/man4/oce.4 | 64 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 40 insertions(+), 24 deletions(-) (limited to 'share') diff --git a/share/man/man4/oce.4 b/share/man/man4/oce.4 index 9ee4019..b1f2063 100644 --- a/share/man/man4/oce.4 +++ b/share/man/man4/oce.4 @@ -58,7 +58,7 @@ module at boot time, place the following line in if_oce_load="YES" .Ed .Sh DESCRIPTION -Emulex one connect adapters come in various skews and with +Emulex OneConnect adapters come in various skews and with different combinations of NIC, FCoE and iSCSI functions. The .Nm @@ -69,47 +69,63 @@ The driver supports VLAN Hardware offload, TCP checksum offload, TCP segmentation offload (TSO), Large receive offload (LRO), Bonding, Jumbo frames (from 1500 - 9000), Multiple TX queues, -Receive-Side Scaling(RSS) and MSI-X interrupts. +Receive-Side Scaling (RSS) and MSI-X interrupts. .Sh HARDWARE The .Nm -driver supports the following Emulex network adapters: +driver supports the following network adapters: .Pp .Bl -bullet -compact .It -BladeEngine 2 +Emulex BladeEngine 2 .It -BladeEngine 3 +Emulex BladeEngine 3 .It -Lancer +Emulex Lancer .El .Sh UPDATING FIRMWARE Adapter firmware updates are persistent. .Pp Firmware can be updated by following the steps below: -.Bd -literal -compact - 1) Copy the below code to a Makefile - ".KMOD=elxflash - FIRMWS=imagename.ufi:elxflash - .include " - 2) Replace imagename in above with UFI file name. - 3) Copy Makefile and UFI to a directory - 4) Execute make & copy generated elxflash.ko to /lib/modules - 5) sysctl dev.oce..fw_upgrade=elxflash - 6) Reboot the machine. +.Bl -enum +.It +Copy the below code to a Makefile: .Pp -In case of issues with supplied UFI, flashing fails with one -of the below errors. - 1) "Invalid BE3 firmware image" - 2) "Invalid Cookie. Firmware image corrupted ?" - 3) "cmd to write to flash rom failed." +.Bd -literal -offset indent +\&.KMOD=elxflash +FIRMWS=imagename.ufi:elxflash +\&.include .Ed +.It +Replace imagename in above with UFI file name +.It +Copy Makefile and UFI file to a directory +.It +Execute make & copy generated elxflash.ko to +.Pa /lib/modules +.It +sysctl dev.oce..fw_upgrade=elxflash +.It +Reboot the machine +.El +.Pp +In case of issues with supplied UFI, flashing fails with one +of the following errors. +.Pp +.Bl -enum -compact +.It +.Qq Invalid BE3 firmware image +.It +.Qq "Invalid Cookie. Firmware image corrupted ?" +.It +.Qq cmd to write to flash rom failed. +.El .Sh SUPPORT For general information and support, go to the Emulex website at: -.Fa http://www.Emulex.com/ +.Pa http://www.Emulex.com/ or E-Mail at -.Fa freebsd-drivers@emulex.com. +.Pa freebsd-drivers@emulex.com . .Sh SEE ALSO .Xr ifconfig 8 .Sh AUTHORS @@ -117,4 +133,4 @@ or E-Mail at The .Nm driver was written by -.An freebsd-drivers@emulex.com. +.An freebsd-drivers@emulex.com . -- cgit v1.1 From 0aab1edec5a8eb75e8bcb455bf2878cc70edea10 Mon Sep 17 00:00:00 2001 From: maxim Date: Wed, 22 Feb 2012 17:52:53 +0000 Subject: DragonFly 3.0.1 added. --- share/misc/bsd-family-tree | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 162bca1..545e9df 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -251,7 +251,7 @@ FreeBSD 5.2 | | | | | 10.7 | | | | | | OpenBSD 5.0 | +--FreeBSD | | | | - | 9.0 | | | | + | 9.0 | | | DragonFly 3.0.1 | v | | | | | | | | | FreeBSD 10 -current | NetBSD -current OpenBSD -current | @@ -543,6 +543,7 @@ OpenBSD 4.9 2011-05-01 [OBD] Mac OS X 10.7 2011-07-20 [APL] OpenBSD 5.0 2011-11-01 [OBD] FreeBSD 9.0 2012-01-12 [FBD] +DragonFly 3.0.1 2012-02-21 [DFB] Bibliography ------------------------ -- cgit v1.1 From 45d88af383e0895aaf4d949d6d9cc7cd60104c33 Mon Sep 17 00:00:00 2001 From: thompsa Date: Wed, 22 Feb 2012 22:09:17 +0000 Subject: Make it clear that fec is just an alias --- share/man/man4/lagg.4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4 index 1dd5142..ec7d8ec 100644 --- a/share/man/man4/lagg.4 +++ b/share/man/man4/lagg.4 @@ -88,8 +88,9 @@ variable to a nonzero value, which is useful for certain bridged network setups. .It Ic fec Supports Cisco EtherChannel. -This is a static setup and does not negotiate aggregation with the peer or -exchange frames to monitor the link. +This is an alias for +.Ic loadbalance +mode. .It Ic lacp Supports the IEEE 802.3ad Link Aggregation Control Protocol (LACP) and the Marker Protocol. -- cgit v1.1 From 851293d13e67c1a138adaad4f13227ac1a9ec76a Mon Sep 17 00:00:00 2001 From: thompsa Date: Wed, 22 Feb 2012 22:29:23 +0000 Subject: Document the net.link.lagg.X.use_flowid sysctl from r232008. --- share/man/man4/lagg.4 | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4 index ec7d8ec..d1e4a3f 100644 --- a/share/man/man4/lagg.4 +++ b/share/man/man4/lagg.4 @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 18, 2010 +.Dd February 23, 2012 .Dt LAGG 4 .Os .Sh NAME @@ -134,6 +134,18 @@ variable in .Pp The MTU of the first interface to be added is used as the lagg MTU. All additional interfaces are required to have exactly the same value. +.Pp +The +.Ic loadbalance +and +.Ic lacp +modes will use the RSS hash from the network card if available to avoid +computing one, this may give poor traffic distribution if the hash is invalid +or uses less of the protocol header information. +Local hash computation can be forced by setting the +.Va net.link.lagg.X.use_flowid +.Xr sysctl 8 +variable to zero where X is the interface number. .Sh EXAMPLES Create a 802.3ad link aggregation using LACP with two .Xr bge 4 -- cgit v1.1 From c094a4b8e20b2d1f5fc983dc23becf54066467f1 Mon Sep 17 00:00:00 2001 From: gjb Date: Wed, 22 Feb 2012 22:40:20 +0000 Subject: Xref the following in wlan(4): - bwn(4) - mwl(4) - run(4) MFC after: 3 days --- share/man/man4/wlan.4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/wlan.4 b/share/man/man4/wlan.4 index 4a2d1e7..76e797c 100644 --- a/share/man/man4/wlan.4 +++ b/share/man/man4/wlan.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 8, 2009 +.Dd February 22, 2012 .Dt WLAN 4 .Os .Sh NAME @@ -174,13 +174,16 @@ may not interoperate. .Xr an 4 , .Xr ath 4 , .Xr bwi 4 , +.Xr bwn 4 , .Xr ipw 4 , .Xr iwi 4 , .Xr iwn 4 , .Xr malo 4 , +.Xr mwl 4 , .Xr netintro 4 , .Xr ral 4 , .Xr rum 4 , +.Xr run 4 , .Xr uath 4 , .Xr upgt 4 , .Xr ural 4 , -- cgit v1.1 From 8b76671a808d4da4c1024750a1119b0d1f620c94 Mon Sep 17 00:00:00 2001 From: brueffer Date: Thu, 23 Feb 2012 17:47:19 +0000 Subject: Catch up with r195837 (2.5 years ago) which renamed net_add_domain() to domain_add(). PR: 165424 Submitted by: Lachlan Kang MFC after: 1 week --- share/man/man9/Makefile | 2 +- share/man/man9/domain.9 | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'share') diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 2b27a68..af2a216 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -615,7 +615,7 @@ MLINKS+=disk.9 disk_alloc.9 \ disk.9 disk_destroy.9 \ disk.9 disk_gone.9 MLINKS+=domain.9 DOMAIN_SET.9 \ - domain.9 net_add_domain.9 \ + domain.9 domain_add.9 \ domain.9 pfctlinput.9 \ domain.9 pfctlinput2.9 \ domain.9 pffindproto.9 \ diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9 index e868c97..7d665b3 100644 --- a/share/man/man9/domain.9 +++ b/share/man/man9/domain.9 @@ -26,11 +26,11 @@ .\" .\" $FreeBSD$ .\" -.Dd December 23, 2008 +.Dd February 23, 2012 .Dt DOMAIN 9 .Os .Sh NAME -.Nm net_add_domain , +.Nm domain_add , .Nm pfctlinput , .Nm pfctlinput2 , .Nm pffindproto , @@ -43,7 +43,7 @@ .In sys/protosw.h .In sys/domain.h .Ft void -.Fn net_add_domain "void *data" +.Fn domain_add "void *data" .Ft void .Fn pfctlinput "int cmd" "struct sockaddr *sa" .Ft void @@ -142,7 +142,7 @@ have their .Fn pr_ctlinput function called. .Pp -.Fn net_add_domain +.Fn domain_add adds a new protocol domain to the system. The argument .Fa data @@ -153,13 +153,13 @@ within the function, but is declared in order to prevent compiler warnings when new domains are registered with .Fn SYSINIT . In most cases -.Fn net_add_domain +.Fn domain_add is not called directly, instead .Fn DOMAIN_SET is used. .Pp If the new domain has defined an initialization routine, it is called by -.Fn net_add_domain ; +.Fn domain_add ; as well, each of the protocols within the domain that have defined an initialization routine will have theirs called. .Pp -- cgit v1.1 From da3a5506b851a2db73c9386b1ec92a3eb991e0fd Mon Sep 17 00:00:00 2001 From: brueffer Date: Thu, 23 Feb 2012 18:48:02 +0000 Subject: Rename DESCRIPTION section to HARDWARE, so this manpage can be used for automatic hardware notes generation. MFC after: 3 days --- share/man/man4/isci.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/isci.4 b/share/man/man4/isci.4 index b99cb8c..6cf471a 100644 --- a/share/man/man4/isci.4 +++ b/share/man/man4/isci.4 @@ -52,7 +52,7 @@ Or, to load the driver as a module at boot, place the following line in .Bd -literal -offset indent isci_load="YES" .Ed -.Sh DESCRIPTION +.Sh HARDWARE The .Nm driver provides support for Intel C600 -- cgit v1.1 From f16a14fbae48118c3ddb7f293a92f5d0b6822945 Mon Sep 17 00:00:00 2001 From: thompsa Date: Thu, 23 Feb 2012 21:56:53 +0000 Subject: Add a sysctl/tunable default value for the use_flowid sysctl in r232008. --- share/man/man4/lagg.4 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4 index d1e4a3f..8a37f31 100644 --- a/share/man/man4/lagg.4 +++ b/share/man/man4/lagg.4 @@ -142,10 +142,12 @@ and modes will use the RSS hash from the network card if available to avoid computing one, this may give poor traffic distribution if the hash is invalid or uses less of the protocol header information. -Local hash computation can be forced by setting the +Local hash computation can be forced per interface by setting the .Va net.link.lagg.X.use_flowid .Xr sysctl 8 -variable to zero where X is the interface number. +variable to zero where X is the interface number, the default for +new interfaces is set via +.Va net.link.lagg.default_use_flowid . .Sh EXAMPLES Create a 802.3ad link aggregation using LACP with two .Xr bge 4 -- cgit v1.1 From 57e60a16f8455d98b147666c53f4717a54de6bd2 Mon Sep 17 00:00:00 2001 From: thompsa Date: Thu, 23 Feb 2012 23:37:29 +0000 Subject: Break the last part to its own sentence rather than a run-on. Suggested by: dougb --- share/man/man4/lagg.4 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4 index 8a37f31..0ba8e1a 100644 --- a/share/man/man4/lagg.4 +++ b/share/man/man4/lagg.4 @@ -145,9 +145,10 @@ or uses less of the protocol header information. Local hash computation can be forced per interface by setting the .Va net.link.lagg.X.use_flowid .Xr sysctl 8 -variable to zero where X is the interface number, the default for -new interfaces is set via -.Va net.link.lagg.default_use_flowid . +variable to zero where X is the interface number. +The default for new interfaces is set via the +.Va net.link.lagg.default_use_flowid +.Xr sysctl 8 . .Sh EXAMPLES Create a 802.3ad link aggregation using LACP with two .Xr bge 4 -- cgit v1.1 From c330d907d8d8dad3530a39e4643428774fa69357 Mon Sep 17 00:00:00 2001 From: jkim Date: Fri, 24 Feb 2012 00:02:46 +0000 Subject: - Add support for Family 12h, 14h and 15h processors. - Remove all attempts to guess physical temperature using DiodeOffset. There are too many reports that it varies wildly depending on motherboard. Instead, if it is known to scale well and its offset is known from other temperature sensors on board, the user may set "dev.amdtemp.0.sensor_offset" tunable to compensate the difference. Document the caveats in amdtemp(4). - Add a quirk for Socket AM2 Revision G processors. These processors are known to have a different offset according to Linux k8temp driver. - Warn about Family 10h Erratum 319. These processors have broken sensors. - Report temperature in more logical orders under dev.amdtemp node. For example, "dev.amdtemp.0.sensor0.core0" is now "dev.amdtemp.0.core0.sensor0". - Replace K8, K10 and K11 with official processor names in amdtemp(4). --- share/man/man4/amdtemp.4 | 59 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 14 deletions(-) (limited to 'share') diff --git a/share/man/man4/amdtemp.4 b/share/man/man4/amdtemp.4 index bd8cc37..7d467cf 100644 --- a/share/man/man4/amdtemp.4 +++ b/share/man/man4/amdtemp.4 @@ -25,12 +25,14 @@ .\" .\" $FreeBSD$ .\" -.Dd April 8, 2008 +.Dd February 23, 2012 .Dt AMDTEMP 4 .Os .Sh NAME .Nm amdtemp -.Nd device driver for AMD K8, K10 and K11 on-die digital thermal sensor +.Nd device driver for +.Tn AMD +processor on-die digital thermal sensor .Sh SYNOPSIS To compile this driver into the kernel, place the following line in your @@ -49,22 +51,38 @@ amdtemp_load="YES" The .Nm driver provides support for the on-die digital thermal sensor present -in AMD K8, K10 and K11 processors. +in +.Tn AMD +Family 0Fh, 10h, 11h, 12h, 14h, and 15h processors. .Pp -For the K8 family, the +For Family 0Fh processors, the .Nm -driver reports each core's temperature through a sysctl node in the -corresponding CPU devices's sysctl tree, named -.Va dev.amdtemp.%d.sensor{0,1}.core{0,1} . +driver reports each core's temperature through sysctl nodes, named +.Va dev.amdtemp.%d.core{0,1}.sensor{0,1} . The driver also creates .Va dev.cpu.%d.temperature -displaying the maximum temperature of the two sensors -located in each CPU core. +in the corresponding CPU device's sysctl tree, displaying the maximum +temperature of the two sensors located in each CPU core. .Pp -For the K10 and K11 families, the driver creates +For Family 10h, 11h, 12h, 14h, and 15h processors, the driver reports each +package's temperature through a sysctl node, named +.Va dev.amdtemp.%d.core0.sensor0 . +The driver also creates .Va dev.cpu.%d.temperature -with the temperature of each core. +in the corresponding CPU device's sysctl tree, displaying the temperature +of the shared sensor located in each CPU package. +.Sh SYSCTL VARIABLES +The following variable is available as both +.Xr sysctl 8 +variable and +.Xr loader 8 +tunable: +.Bl -tag -width indent +.It Va dev.amdtemp.%d.sensor_offset +.El +Add the given offset to the temperature of the sensor. Default is 0. .Sh SEE ALSO +.Xr loader 8 , .Xr sysctl 8 .Sh HISTORY The @@ -74,6 +92,19 @@ driver first appeared in .Sh AUTHORS .An Rui Paulo Aq rpaulo@FreeBSD.org .An Norikatsu Shigemura Aq nork@FreeBSD.org -.Sh BUGS -AMD K9 is not supported because temperature reporting has been replaced -by Maltese. +.An Jung-uk Kim Aq jkim@FreeBSD.org +.Sh CAVEATS +For Family 10h and later processors, +.Do +(the reported temperature) is a non-physical temperature measured on +an arbitrary scale and it does not represent an actual physical +temperature like die or case temperature. Instead, it specifies +the processor temperature relative to the point at which the system +must supply the maximum cooling for the processor's specified maximum +case temperature and maximum thermal power dissipation +.Dc +according to +.Rs +.%T BIOS and Kernel Developer's Guide (BKDG) for AMD Processors +.%U http://developer.amd.com/documentation/guides/Pages/default.aspx +.Re -- cgit v1.1 From 5dea1ef2842c899be11d7d22b3077efbfc5c6d17 Mon Sep 17 00:00:00 2001 From: jkim Date: Fri, 24 Feb 2012 17:53:24 +0000 Subject: Fix mdoc style nits. Start new sentences on new lines. Reported by: brueffer --- share/man/man4/amdtemp.4 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/man/man4/amdtemp.4 b/share/man/man4/amdtemp.4 index 7d467cf..52444f5 100644 --- a/share/man/man4/amdtemp.4 +++ b/share/man/man4/amdtemp.4 @@ -80,7 +80,8 @@ tunable: .Bl -tag -width indent .It Va dev.amdtemp.%d.sensor_offset .El -Add the given offset to the temperature of the sensor. Default is 0. +Add the given offset to the temperature of the sensor. +Default is 0. .Sh SEE ALSO .Xr loader 8 , .Xr sysctl 8 @@ -98,10 +99,10 @@ For Family 10h and later processors, .Do (the reported temperature) is a non-physical temperature measured on an arbitrary scale and it does not represent an actual physical -temperature like die or case temperature. Instead, it specifies -the processor temperature relative to the point at which the system -must supply the maximum cooling for the processor's specified maximum -case temperature and maximum thermal power dissipation +temperature like die or case temperature. +Instead, it specifies the processor temperature relative to the point +at which the system must supply the maximum cooling for the processor's +specified maximum case temperature and maximum thermal power dissipation .Dc according to .Rs -- cgit v1.1 From 9761e3fdaf71ba499c124e255c7d3648868e8fa0 Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 25 Feb 2012 14:31:25 +0000 Subject: Fix various typos in manual pages. Submitted by: amdmi3 PR: 165431 MFC after: 1 week --- share/man/man3/pthread_getthreadid_np.3 | 4 ++-- share/man/man4/acpi_panasonic.4 | 4 ++-- share/man/man4/cxgbe.4 | 4 ++-- share/man/man4/ed.4 | 4 ++-- share/man/man4/mac_lomac.4 | 4 ++-- share/man/man4/umcs.4 | 4 ++-- share/man/man4/vr.4 | 4 ++-- share/man/man5/rc.conf.5 | 4 ++-- share/man/man9/kqueue.9 | 4 ++-- share/man/man9/zone.9 | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'share') diff --git a/share/man/man3/pthread_getthreadid_np.3 b/share/man/man3/pthread_getthreadid_np.3 index 271b628..bd28c6b 100644 --- a/share/man/man3/pthread_getthreadid_np.3 +++ b/share/man/man3/pthread_getthreadid_np.3 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 7, 2011 +.Dd February 25, 2012 .Dt PTHREAD_GETTHREADID_NP 3 .Os .Sh NAME @@ -42,7 +42,7 @@ The function returns the unique integral ID of the calling thread. Its semantics is similar to the AIX's .Fn pthread_getthreadid_np -functuion. +function. .Sh RETURN VALUES The .Fn pthread_getthreadid_np diff --git a/share/man/man4/acpi_panasonic.4 b/share/man/man4/acpi_panasonic.4 index 4bd7038..d02a16e 100644 --- a/share/man/man4/acpi_panasonic.4 +++ b/share/man/man4/acpi_panasonic.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 8, 2010 +.Dd February 25, 2012 .Dt ACPI_PANASONIC 4 .Os .Sh NAME @@ -66,7 +66,7 @@ The third and last is to provide a way to adjust LCD brightness and sound mute state via .Xr sysctl 8 . .Ss Hotkeys -There are 9 hotkeys available on the supported hardwares: +There are 9 hotkeys available on the supported hardware: .Pp .Bl -tag -compact -offset indent .It Sy Fn+F1 diff --git a/share/man/man4/cxgbe.4 b/share/man/man4/cxgbe.4 index 4bf5ac3..204f559 100644 --- a/share/man/man4/cxgbe.4 +++ b/share/man/man4/cxgbe.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 14, 2011 +.Dd February 25, 2012 .Dt CXGBE 4 .Os .Sh NAME @@ -56,7 +56,7 @@ The .Nm driver provides support for PCI Express Ethernet adapters based on the Chelsio Terminator 4 (T4) ASIC. -The driver supprts Jumbo Frames, Transmit/Receive checksum offload, +The driver supports Jumbo Frames, Transmit/Receive checksum offload, TCP segmentation offload (TSO), Large Receive Offload (LRO), VLAN tag insertion/extraction, VLAN checksum offload, VLAN TSO, and Receive Side Steering (RSS). diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4 index 3bc7077..ccb9c61 100644 --- a/share/man/man4/ed.4 +++ b/share/man/man4/ed.4 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 8, 2012 +.Dd February 25, 2012 .Dt ED 4 .Os .Sh NAME @@ -289,7 +289,7 @@ Surecom EtherPerfect EP-427 .It Surecom NE-34 .It -TDK 3000/3400/5670 Fast Etherenet/Modem +TDK 3000/3400/5670 Fast Ethernet/Modem .It TDK LAK-CD031, Grey Cell GCS2000 Ethernet Card .It diff --git a/share/man/man4/mac_lomac.4 b/share/man/man4/mac_lomac.4 index 80f2daf..0cf99c9 100644 --- a/share/man/man4/mac_lomac.4 +++ b/share/man/man4/mac_lomac.4 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 11, 2002 +.Dd February 25, 2012 .Dt MAC_LOMAC 4 .Os .Sh NAME @@ -63,7 +63,7 @@ which protects the integrity of system objects and subjects by means of an information flow policy coupled with the subject demotion via floating labels. In LOMAC, all system subjects and objects are assigned integrity labels, made -up of one or more hierarchial grades, depending on the their types. +up of one or more hierarchical grades, depending on the their types. Together, these label elements permit all labels to be placed in a partial order, with information flow protections and demotion decisions based on a dominance operator diff --git a/share/man/man4/umcs.4 b/share/man/man4/umcs.4 index af8bd5f..4c50de1 100644 --- a/share/man/man4/umcs.4 +++ b/share/man/man4/umcs.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 20, 2011 +.Dd February 25, 2012 .Dt UMCS 4 .Os .Sh NAME @@ -56,7 +56,7 @@ The driver provides support for various multiport serial adapters based on the MosCom MCS7820 and MCS7840 chips. They are 2- or 4-port adapters with full-featured 16550-compatible UARTs and very flexible baud generators. Also, these chips -support RS422/RS485 and IrDA oprations. +support RS422/RS485 and IrDA operations. .Pp The device is accessed through the .Xr ucom 4 diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4 index de65fe1..cd49f4b 100644 --- a/share/man/man4/vr.4 +++ b/share/man/man4/vr.4 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 7, 2010 +.Dd February 25, 2012 .Dt VR 4 .Os .Sh NAME @@ -94,7 +94,7 @@ or .Ar half-duplex modes. .It 100baseTX -Set 100Mbps (Fast Fthernet) operation. +Set 100Mbps (Fast Ethernet) operation. The .Ar mediaopt option can also be used to select either diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 83d91be..99793be 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 11, 2012 +.Dd February 25, 2012 .Dt RC.CONF 5 .Os .Sh NAME @@ -1427,7 +1427,7 @@ Note that ICMPv6 Router Advertisement messages will be accepted even when .Va net.inet6.ip6.forwarding is 1 -.Pq packet fowarding is enabled +.Pq packet forwarding is enabled when .Va net.inet6.ip6.rfc6204w3 is set to 1. diff --git a/share/man/man9/kqueue.9 b/share/man/man9/kqueue.9 index 8f0d109..2ecc08b 100644 --- a/share/man/man9/kqueue.9 +++ b/share/man/man9/kqueue.9 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 5, 2011 +.Dd February 25, 2012 .Dt KQUEUE 9 .Os .Sh NAME @@ -294,7 +294,7 @@ locks will be used instead. .Pp The function .Fn knlist_init_mtx -may be used to initalize a +may be used to initialize a .Vt knlist when .Fa lock diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9 index df7a353..a77fd5b 100644 --- a/share/man/man9/zone.9 +++ b/share/man/man9/zone.9 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 9, 2010 +.Dd February 25, 2012 .Dt ZONE 9 .Os .Sh NAME @@ -210,7 +210,7 @@ The .Fn uma_zone_get_cur function returns the approximate current occupancy of the zone. The returned value is approximate because appropriate synchronisation to -determine an exact value is not performend by the implementation. +determine an exact value is not performed by the implementation. This ensures low overhead at the expense of potentially stale data being used in the calculation. .Sh RETURN VALUES -- cgit v1.1 From 1ab2433a4ca6e435fc979b6ce5bb9d6b3c1b787a Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 25 Feb 2012 15:21:43 +0000 Subject: Whitespace cleanup: o Wrap sentences on to new lines o Cleanup trailing whitespace Found with: textproc/igor MFC after: 1 week X-MFC-With: r232157 --- share/man/man4/cxgbe.4 | 27 ++++++++++++++++++--------- share/man/man4/ed.4 | 4 ++-- share/man/man4/umcs.4 | 6 ++++-- share/man/man5/rc.conf.5 | 16 ++++++++++------ 4 files changed, 34 insertions(+), 19 deletions(-) (limited to 'share') diff --git a/share/man/man4/cxgbe.4 b/share/man/man4/cxgbe.4 index 204f559..88d42e3 100644 --- a/share/man/man4/cxgbe.4 +++ b/share/man/man4/cxgbe.4 @@ -100,28 +100,36 @@ prompt before booting the kernel or stored in .Xr loader.conf 5 . .Bl -tag -width indent .It Va hw.cxgbe.ntxq10g -The number of tx queues to use for a 10Gb port. The default is 16 or the number +The number of tx queues to use for a 10Gb port. +The default is 16 or the number of CPU cores in the system, whichever is less. .It Va hw.cxgbe.nrxq10g -The number of rx queues to use for a 10Gb port. The default is 8 or the number +The number of rx queues to use for a 10Gb port. +The default is 8 or the number of CPU cores in the system, whichever is less. .It Va hw.cxgbe.ntxq1g -The number of tx queues to use for a 1Gb port. The default is 4 or the number +The number of tx queues to use for a 1Gb port. +The default is 4 or the number of CPU cores in the system, whichever is less. .It Va hw.cxgbe.nrxq1g -The number of rx queues to use for a 1Gb port. The default is 2 or the number +The number of rx queues to use for a 1Gb port. +The default is 2 or the number of CPU cores in the system, whichever is less. .It Va hw.cxgbe.nofldtxq10g -The number of TOE tx queues to use for a 10Gb port. The default is 8 or the +The number of TOE tx queues to use for a 10Gb port. +The default is 8 or the number of CPU cores in the system, whichever is less. .It Va hw.cxgbe.nofldrxq10g -The number of TOE rx queues to use for a 10Gb port. The default is 2 or the +The number of TOE rx queues to use for a 10Gb port. +The default is 2 or the number of CPU cores in the system, whichever is less. .It Va hw.cxgbe.nofldtxq1g -The number of TOE tx queues to use for a 1Gb port. The default is 2 or the +The number of TOE tx queues to use for a 1Gb port. +The default is 2 or the number of CPU cores in the system, whichever is less. .It Va hw.cxgbe.nofldrxq1g -The number of TOE rx queues to use for a 1Gb port. The default is 1. +The number of TOE rx queues to use for a 1Gb port. +The default is 1. .It Va hw.cxgbe.holdoff_timer_idx_10G .It Va hw.cxgbe.holdoff_timer_idx_1G The timer index value to use to delay interrupts. @@ -149,7 +157,8 @@ ifconfig up). The size, in number of entries, of the descriptor ring used for a tx queue. A buf_ring of the same size is also allocated for additional -software queuing. See +software queuing. +See .Xr ifnet 9 . The default value is 1024. Different cxgbe interfaces can be assigned different values via the diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4 index ccb9c61..7ca8258 100644 --- a/share/man/man4/ed.4 +++ b/share/man/man4/ed.4 @@ -423,8 +423,8 @@ packets are received. As a result, it may throw out some good packets which have been received but not yet transferred from the card to main memory. .Pp -The -.Nm +The +.Nm driver is slow by today's standards. .Pp PC Card attachment supports the D-Link DMF650TX LAN/Modem card's Ethernet diff --git a/share/man/man4/umcs.4 b/share/man/man4/umcs.4 index 4c50de1..d9213bd 100644 --- a/share/man/man4/umcs.4 +++ b/share/man/man4/umcs.4 @@ -54,8 +54,10 @@ umcs_load="YES" The .Nm driver provides support for various multiport serial adapters based on the MosCom -MCS7820 and MCS7840 chips. They are 2- or 4-port adapters with full-featured -16550-compatible UARTs and very flexible baud generators. Also, these chips +MCS7820 and MCS7840 chips. +They are 2- or 4-port adapters with full-featured +16550-compatible UARTs and very flexible baud generators. +Also, these chips support RS422/RS485 and IrDA operations. .Pp The device is accessed through the diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 99793be..6a543af 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -200,7 +200,7 @@ to handle device added, removed or unknown events from the kernel. .Pq Vt bool Run .Xr ddb 8 -to install +to install .Xr ddb 4 scripts at boot time. .It Va ddb_config @@ -1273,7 +1273,7 @@ options in this variable, in addition to the file. For instance, to configure an .Xr ath 4 -wireless device in station mode with an address obtained +wireless device in station mode with an address obtained via DHCP, using WPA authentication and 802.11b mode, it is possible to use something like: .Bd -literal @@ -1449,7 +1449,8 @@ Aliases should be set by .Va ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n with .Dq Li inet6 -keyword. For example: +keyword. +For example: .Bd -literal ifconfig_ed0_ipv6="inet6 2001:db8:1::1 prefixlen 64" ifconfig_ed0_alias0="inet6 2001:db8:2::1 prefixlen 64" @@ -1552,14 +1553,17 @@ If .Dq Li AUTO is specified, it attempts to read a file .Pa /etc/ip6addrctl.conf -first. If this file is found, +first. +If this file is found, .Xr ip6addrctl 8 -reads and installs it. If not found, a policy is automatically set +reads and installs it. +If not found, a policy is automatically set according to .Va ipv6_activate_all_interfaces variable; if the variable is set to .Dq Li YES -the IPv6-preferred one is used. Otherwise IPv4-preferred. +the IPv6-preferred one is used. +Otherwise IPv4-preferred. .Pp The default value of .Va ip6addrctl_enable -- cgit v1.1 From 3ac0fcfb9762b2fd4991f32bff09543ba13df0d0 Mon Sep 17 00:00:00 2001 From: luigi Date: Mon, 27 Feb 2012 19:05:01 +0000 Subject: A bunch of netmap fixes: USERSPACE: 1. add support for devices with different number of rx and tx queues; 2. add better support for zero-copy operation, adding an extra field to the netmap ring to indicate how many buffers we have already processed but not yet released (with help from Eddie Kohler); 3. The two changes above unfortunately require an API change, so while at it add a version field and some spares to the ioctl() argument to help detect mismatches. 4. update the manual page for the two changes above; 5. update sample applications in tools/tools/netmap KERNEL: 1. simplify the internal structures moving the global wait queues to the 'struct netmap_adapter'; 2. simplify the functions that map kring<->nic ring indexes 3. normalize device-specific code, helps mainteinance; 4. start exploring the impact of micro-optimizations (prefetch etc.) in the ixgbe driver. Use 'legacy' descriptors on the tx ring and prefetch slots gives about 20% speedup at 900 MHz. Another 7-10% would come from removing the explict calls to bus_dmamap* in the core (they are effectively NOPs in this case, but it takes expensive load of the per-buffer dma maps to figure out that they are all NULL. Rx performance not investigated. I am postponing the MFC so i can import a few more improvements before merging. --- share/man/man4/netmap.4 | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'share') diff --git a/share/man/man4/netmap.4 b/share/man/man4/netmap.4 index 1ad574d..dfd96b0 100644 --- a/share/man/man4/netmap.4 +++ b/share/man/man4/netmap.4 @@ -28,7 +28,7 @@ .\" $FreeBSD$ .\" $Id: netmap.4 9662 2011-11-16 13:18:06Z luigi $: stable/8/share/man/man4/bpf.4 181694 2008-08-13 17:45:06Z ed $ .\" -.Dd November 16, 2011 +.Dd February 27, 2012 .Dt NETMAP 4 .Os .Sh NAME @@ -123,8 +123,9 @@ one ring pair (numbered N) for packets from/to the host stack. struct netmap_ring { const ssize_t buf_ofs; const uint32_t num_slots; /* number of slots in the ring. */ - uint32_t avail; /* number of usable slots */ - uint32_t cur; /* 'current' index for the user side */ + uint32_t avail; /* number of usable slots */ + uint32_t cur; /* 'current' index for the user side */ + uint32_t reserved; /* not refilled before current */ const uint16_t nr_buf_size; uint16_t flags; @@ -173,10 +174,14 @@ defined as follows: .Bd -literal struct nmreq { char nr_name[IFNAMSIZ]; + uint32_t nr_version; /* API version */ +#define NETMAP_API 2 /* current version */ uint32_t nr_offset; /* nifp offset in the shared region */ uint32_t nr_memsize; /* size of the shared region */ - uint32_t nr_numdescs; /* descriptors per queue */ - uint16_t nr_numqueues; + uint32_t nr_tx_slots; /* slots in tx rings */ + uint32_t nr_rx_slots; /* slots in rx rings */ + uint16_t nr_tx_rings; /* number of tx rings */ + uint16_t nr_rx_rings; /* number of tx rings */ uint16_t nr_ringid; /* ring(s) we care about */ #define NETMAP_HW_RING 0x4000 /* low bits indicate one hw ring */ #define NETMAP_SW_RING 0x2000 /* we process the sw ring */ @@ -199,8 +204,10 @@ and are: returns information about the interface named in nr_name. On return, nr_memsize indicates the size of the shared netmap memory region (this is device-independent), -nr_numslots indicates how many buffers are in a ring, -nr_numrings indicates the number of rings supported by the hardware. +nr_tx_slots and nr_rx_slots indicates how many buffers are in a +transmit and receive ring, +nr_tx_rings and nr_rx_rings indicates the number of transmit +and receive rings supported by the hardware. .Pp If the device does not support netmap, the ioctl returns EINVAL. .It Dv NIOCREGIF @@ -266,6 +273,7 @@ struct netmap_request nmr; fd = open("/dev/netmap", O_RDWR); bzero(&nmr, sizeof(nmr)); strcpy(nmr.nm_name, "ix0"); +nmr.nm_version = NETMAP_API; ioctl(fd, NIOCREG, &nmr); p = mmap(0, nmr.memsize, fd); nifp = NETMAP_IF(p, nmr.offset); -- cgit v1.1 From fe4276cc143eb362b0065fce4556e6f54cd66fb2 Mon Sep 17 00:00:00 2001 From: gjb Date: Tue, 28 Feb 2012 03:11:02 +0000 Subject: Fix a few rendering nits in rc.conf(5) with regards to mentioning jail_parallel_enable. --- share/man/man5/rc.conf.5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 6a543af..a45ee01 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 25, 2012 +.Dd February 27, 2012 .Dt RC.CONF 5 .Os .Sh NAME @@ -3754,11 +3754,11 @@ indicates that the highest frequency (less power savings) should be used. If set to .Dq Li NO , any configured jails will not be started. -.It jail_parallel_start +.It Va jail_parallel_start .Pq Vt bool If set to -.Dq Li YES -all configured jails will be started in the background (= in parallel). +.Dq Li YES , +all configured jails will be started in the background (in parallel). .It Va jail_list .Pq Vt str A space separated list of names for jails. -- cgit v1.1 From 733cf6f55fb5675311ce6a564dac94b641f68c11 Mon Sep 17 00:00:00 2001 From: mm Date: Tue, 28 Feb 2012 07:35:07 +0000 Subject: mdoc(7) stype - start new sentences on new line MFC after: 1 week --- share/man/man5/devfs.5 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man5/devfs.5 b/share/man/man5/devfs.5 index 7b483fc..504a062 100644 --- a/share/man/man5/devfs.5 +++ b/share/man/man5/devfs.5 @@ -103,12 +103,13 @@ The following devfs file system-specific options are available: .It Cm ruleset Ns No = Ns Ar ruleset Set ruleset number .Ar ruleset -as the current ruleset for the mount-point and apply all its rules. If the -ruleset number +as the current ruleset for the mount-point and apply all its rules. +If the ruleset number .Ar ruleset does not exist, an empty ruleset with the number .Ar ruleset -is created. See +is created. +See .Xr devfs 8 for more information on working with devfs rulesets. .El -- cgit v1.1 From 010478985092910632984eb29c8a251e0a7551fb Mon Sep 17 00:00:00 2001 From: gavin Date: Tue, 28 Feb 2012 13:19:34 +0000 Subject: Correct capitalization of "Hz" in user-visible text (manpages, printf(), etc). MFC after: 3 days --- share/man/man4/ath.4 | 4 ++-- share/man/man4/net80211.4 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4 index b36bc90..33250ac 100644 --- a/share/man/man4/ath.4 +++ b/share/man/man4/ath.4 @@ -95,8 +95,8 @@ with transmit speeds appropriate to each. AR5416-class devices are capable of 802.11n operation but are supported only in legacy modes (802.11a, 11b, 11g). Most chips also support an Atheros Turbo Mode (TM) that operates in -the 5Ghz frequency range with 2x the transmit speeds. -Some chips also support Turbo mode in the 2.4Ghz range with 802.11g +the 5GHz frequency range with 2x the transmit speeds. +Some chips also support Turbo mode in the 2.4GHz range with 802.11g though this support is not presently available due to regulatory requirements. (Note that Turbo modes are, however, only interoperable with other Atheros-based devices.) diff --git a/share/man/man4/net80211.4 b/share/man/man4/net80211.4 index 1af240d..967bbe9 100644 --- a/share/man/man4/net80211.4 +++ b/share/man/man4/net80211.4 @@ -280,7 +280,7 @@ Return whether or not Dynamic Frequency Selection (DFS) is enabled in DFS embodies several facilities including detection of overlapping radar signals, dynamic transmit power control, and channel selection according to a least-congested criteria. -DFS support is mandatory for some 5Ghz frequencies in certain +DFS support is mandatory for some 5GHz frequencies in certain locales (e.g. ETSI). By default DFS is enabled according to the regulatory definitions and the current country code, regdomain, and channel. -- cgit v1.1 From a2a1f5f62f99d0ee130daa3cc29dbba825cfe000 Mon Sep 17 00:00:00 2001 From: kevlo Date: Tue, 28 Feb 2012 15:07:05 +0000 Subject: Fix typos --- share/man/man5/passwd.5 | 2 +- share/man/man9/byteorder.9 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5 index 8b8772e..228c4e3 100644 --- a/share/man/man5/passwd.5 +++ b/share/man/man5/passwd.5 @@ -232,7 +232,7 @@ user's home phone number .Pp The full .Ar name -may contain a ampersand +may contain an ampersand .Pq Ql & which will be replaced by the capitalized login diff --git a/share/man/man9/byteorder.9 b/share/man/man9/byteorder.9 index f47f609..20e3136 100644 --- a/share/man/man9/byteorder.9 +++ b/share/man/man9/byteorder.9 @@ -123,7 +123,7 @@ The .Fn htobe32 , and .Fn htobe64 -functions return a integer in the system's native +functions return an integer in the system's native byte order converted to big endian byte order. The return value will be the same as the argument on big endian systems. .Pp -- cgit v1.1 From d2840a94e2288dbb236832f24dad4bd3a916e990 Mon Sep 17 00:00:00 2001 From: kevlo Date: Tue, 28 Feb 2012 15:45:42 +0000 Subject: Add support for the MCS7832 Obtained from: OpenBSD --- share/man/man4/mos.4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/mos.4 b/share/man/man4/mos.4 index 84aaabc..4ca0db5 100644 --- a/share/man/man4/mos.4 +++ b/share/man/man4/mos.4 @@ -20,7 +20,7 @@ .Os .Sh NAME .Nm mos -.Nd Moschip MCS7730/MCS7840 USB Ethernet driver +.Nd Moschip MCS7730/MCS7830/MCS7832 USB Ethernet driver .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -44,9 +44,9 @@ if_mos_load="YES" The .Nm driver provides support for USB Ethernet adapters based on the -Moschip MCS7730/MCS7830 chipset. +Moschip MCS7730/MCS7830/MCS7832 chipset. .Pp -The adapters that contain the Moschip MCS7730/MCS7830 chipset +The adapters that contain the Moschip MCS7730/MCS7830/MCS7832 chipset will operate at 100Base-TX and full-duplex. .Pp The Moschip contains a 10/100 -- cgit v1.1 From 714a708b6a92a32fbffa6ee65ea674dc498c9347 Mon Sep 17 00:00:00 2001 From: kevlo Date: Tue, 28 Feb 2012 15:47:39 +0000 Subject: Mention mos(4) --- share/man/man4/usb.4 | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4 index eb65fba8..f3f8104 100644 --- a/share/man/man4/usb.4 +++ b/share/man/man4/usb.4 @@ -150,6 +150,7 @@ specifications can be found at: .Xr cue 4 , .Xr ehci 4 , .Xr kue 4 , +.Xr mos 4 , .Xr ohci 4 , .Xr pci 4 , .Xr rue 4 , -- cgit v1.1 From 0d1f91e8e1d46e491844d983927a0fbfc1c6b414 Mon Sep 17 00:00:00 2001 From: dim Date: Tue, 28 Feb 2012 18:30:18 +0000 Subject: Define several extra macros in bsd.sys.mk and sys/conf/kern.pre.mk, to get rid of testing explicitly for clang (using ${CC:T:Mclang}) in individual Makefiles. Instead, use the following extra macros, for use with clang: - NO_WERROR.clang (disables -Werror) - NO_WCAST_ALIGN.clang (disables -Wcast-align) - NO_WFORMAT.clang (disables -Wformat and friends) - CLANG_NO_IAS (disables integrated assembler) - CLANG_OPT_SMALL (adds flags for extra small size optimizations) As a side effect, this enables setting CC/CXX/CPP in src.conf instead of make.conf! For clang, use the following: CC=clang CXX=clang++ CPP=clang-cpp MFC after: 2 weeks --- share/mk/bsd.sys.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 7a72ca6..9b56154 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -28,7 +28,7 @@ CFLAGS += -std=${CSTD} . if defined(WARNS) . if ${WARNS} >= 1 CWARNFLAGS += -Wsystem-headers -. if !defined(NO_WERROR) +. if !defined(NO_WERROR) && (${CC:T:Mclang} != "clang" || !defined(NO_WERROR.clang)) CWARNFLAGS += -Werror . endif . endif @@ -42,7 +42,7 @@ CWARNFLAGS += -W -Wno-unused-parameter -Wstrict-prototypes\ . if ${WARNS} >= 4 CWARNFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\ -Wshadow -Wunused-parameter -. if !defined(NO_WCAST_ALIGN) +. if !defined(NO_WCAST_ALIGN) && (${CC:T:Mclang} != "clang" || !defined(NO_WCAST_ALIGN.clang)) CWARNFLAGS += -Wcast-align . endif . endif @@ -84,12 +84,12 @@ WFORMAT = 1 . if ${WFORMAT} > 0 #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args CWARNFLAGS += -Wformat=2 -Wno-format-extra-args -. if !defined(NO_WERROR) +. if !defined(NO_WERROR) && (${CC:T:Mclang} != "clang" || !defined(NO_WERROR.clang)) CWARNFLAGS += -Werror . endif . endif . endif -. if defined(NO_WFORMAT) +. if defined(NO_WFORMAT) || (${CC:T:Mclang} == "clang" && defined(NO_WFORMAT.clang)) CWARNFLAGS += -Wno-format . endif .endif @@ -98,6 +98,12 @@ CWARNFLAGS += -Wno-format CWARNFLAGS += -Wno-unknown-pragmas .endif +.if ${CC:T:Mclang} == "clang" +CLANG_NO_IAS = -no-integrated-as +CLANG_OPT_SMALL = -mllvm -stack-alignment=8 -mllvm -inline-threshold=3 \ + -mllvm -enable-load-pre=false +.endif + .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \ ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" # Don't use -Wstack-protector as it breaks world with -Werror. -- cgit v1.1 From 64be263fa25e9eeabd2655a2f9da2fded3ea922a Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 29 Feb 2012 19:18:32 +0000 Subject: Regenerate src.conf(5) after r231530 (and to correct a little screwup with the WITH_CLANG_EXTRAS fragment I added). --- share/man/man5/src.conf.5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index d29115b..2fce2a9 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru .\" $FreeBSD$ -.Dd February 6, 2012 +.Dd February 29, 2012 .Dt SRC.CONF 5 .Os .Sh NAME @@ -284,7 +284,7 @@ Set to build the Clang C/C++ compiler. It is a default setting on amd64/amd64, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64. .It Va WITH_CLANG_EXTRAS -.\" $FreeBSD$ +.\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim Set to build additional clang and llvm tools, such as bugpoint. .It Va WITHOUT_CPP .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru @@ -956,7 +956,7 @@ When set, it also enforces the following options: .\" from FreeBSD: head/tools/build/options/WITHOUT_USB 156932 2006-03-21 07:50:50Z ru Set to not build USB-related programs and libraries. .It Va WITHOUT_UTMPX -.\" from FreeBSD: head/tools/build/options/WITHOUT_UTMPX 230060 2012-01-13 15:40:49Z ed +.\" from FreeBSD: head/tools/build/options/WITHOUT_UTMPX 231530 2012-02-11 20:28:42Z ed Set to not build user accounting tools such as .Xr last 1 , .Xr users 1 , @@ -964,7 +964,7 @@ Set to not build user accounting tools such as .Xr ac 8 , .Xr lastlogin 8 and -.Xr utxrm 8 . +.Xr utx 8 . .It Va WITHOUT_WIRELESS .\" from FreeBSD: head/tools/build/options/WITHOUT_WIRELESS 183242 2008-09-21 22:02:26Z sam Set to not build programs used for 802.11 wireless networks; especially -- cgit v1.1 From 7c3c126a078fb7613635087eb011ed0ff4b0d7a9 Mon Sep 17 00:00:00 2001 From: pluknet Date: Wed, 29 Feb 2012 20:13:53 +0000 Subject: Add myself, and show marck@ as my mentor. Approved by: marck (mentor) --- share/misc/committers-doc.dot | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index 278ccb9..9908dfa 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -72,6 +72,7 @@ maxim [label="Maxim Konovalov\nmaxim@FreeBSD.org\n2002/02/07"] miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2007/10/26"] murray [label="Murray Stokely\nmurray@FreeBSD.org\n2000/04/05"] pav [label="Pav Lucistnik\npav@FreeBSD.org\n2005/08/12"] +pluknet [label="Sergey Kandaurov\npluknet@FreeBSD.org\n2012/02/14"] remko [label="Remko Lodder\nremko@FreeBSD.org\n2004/10/16"] rene [label="Rene Ladan\nrene@FreeBSD.org\n2008/11/03"] roam [label="Peter Pentchev\nroam@FreeBSD.org\n2003/02/14"] @@ -129,6 +130,7 @@ keramida -> gjb keramida -> pav marck -> bvs +marck -> pluknet marck -> taras maxim -> taras -- cgit v1.1 From 5fb3a72857db9900e8bdadb8f7d81bdc41db250d Mon Sep 17 00:00:00 2001 From: thompsa Date: Wed, 29 Feb 2012 22:41:40 +0000 Subject: Correct the description for CTLFLAG_TUN and CTLFLAG_RDTUN, the declaring of a system tunable has never been implemented. This flag is only used by sysctl(8) to provide a helpful error message. Discussed with: dwhite, kan --- share/man/man9/sysctl.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9 index f6ba537..d58573b 100644 --- a/share/man/man9/sysctl.9 +++ b/share/man/man9/sysctl.9 @@ -138,9 +138,9 @@ This sysctl can be written to by processes in .It Dv CTLFLAG_SKIP When iterating the sysctl name space, do not list this sysctl. .It Dv CTLFLAG_TUN -Also declare a system tunable with the same name to initialize this variable. +Advisory flag that a system tunable also exists for this variable. .It Dv CTLFLAG_RDTUN -Also declare a system tunable with the same name to initialize this variable; +Advisory flag that a system tunable also exists for this variable; however, the run-time variable is read-only. .El .Pp -- cgit v1.1 From 2a09710001f8d4e44d609b777dbca5f6426072ed Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 29 Feb 2012 22:58:51 +0000 Subject: Add a WITH_CLANG_IS_CC option for src.conf(5), disabled by default, that installs clang as /usr/bin/cc, /usr/bin/c++ and /usr/bin/cpp. Note this does *not* disable building and installing gcc, which will still be available as /usr/bin/gcc, /usr/bin/g++ and /usr/bin/gcpp. If you want to disable gcc completely, you must use WITHOUT_GCC. MFC after: 2 weeks --- share/mk/bsd.own.mk | 5 +++++ share/mk/bsd.sys.mk | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 7ecb634..fc214b5 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -419,6 +419,7 @@ __DEFAULT_NO_OPTIONS = \ BIND_SIGCHASE \ BIND_XML \ CLANG_EXTRAS \ + CLANG_IS_CC \ CTF \ HESIOD \ ICONV \ @@ -574,6 +575,10 @@ MK_GCC:= no MK_GDB:= no .endif +.if ${MK_CLANG} == "no" +MK_CLANG_IS_CC:= no +.endif + # # Set defaults for the MK_*_SUPPORT variables. # diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 9b56154..401e671 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -28,7 +28,7 @@ CFLAGS += -std=${CSTD} . if defined(WARNS) . if ${WARNS} >= 1 CWARNFLAGS += -Wsystem-headers -. if !defined(NO_WERROR) && (${CC:T:Mclang} != "clang" || !defined(NO_WERROR.clang)) +. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) CWARNFLAGS += -Werror . endif . endif @@ -42,7 +42,7 @@ CWARNFLAGS += -W -Wno-unused-parameter -Wstrict-prototypes\ . if ${WARNS} >= 4 CWARNFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\ -Wshadow -Wunused-parameter -. if !defined(NO_WCAST_ALIGN) && (${CC:T:Mclang} != "clang" || !defined(NO_WCAST_ALIGN.clang)) +. if !defined(NO_WCAST_ALIGN) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WCAST_ALIGN.clang)) CWARNFLAGS += -Wcast-align . endif . endif @@ -59,7 +59,7 @@ CWARNFLAGS += -Wno-uninitialized CWARNFLAGS += -Wno-pointer-sign # Clang has more warnings enabled by default, and when using -Wall, so if WARNS # is set to low values, these have to be disabled explicitly. -. if ${CC:T:Mclang} == "clang" +. if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" . if ${WARNS} <= 3 CWARNFLAGS += -Wno-tautological-compare -Wno-unused-value\ -Wno-parentheses-equality -Wno-unused-function\ @@ -84,12 +84,12 @@ WFORMAT = 1 . if ${WFORMAT} > 0 #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args CWARNFLAGS += -Wformat=2 -Wno-format-extra-args -. if !defined(NO_WERROR) && (${CC:T:Mclang} != "clang" || !defined(NO_WERROR.clang)) +. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) CWARNFLAGS += -Werror . endif . endif . endif -. if defined(NO_WFORMAT) || (${CC:T:Mclang} == "clang" && defined(NO_WFORMAT.clang)) +. if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && defined(NO_WFORMAT.clang)) CWARNFLAGS += -Wno-format . endif .endif @@ -98,7 +98,7 @@ CWARNFLAGS += -Wno-format CWARNFLAGS += -Wno-unknown-pragmas .endif -.if ${CC:T:Mclang} == "clang" +.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" CLANG_NO_IAS = -no-integrated-as CLANG_OPT_SMALL = -mllvm -stack-alignment=8 -mllvm -inline-threshold=3 \ -mllvm -enable-load-pre=false -- cgit v1.1 From 4b408c2addcd1440e42b8c3a51da7d32ae672f24 Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 29 Feb 2012 23:06:48 +0000 Subject: Regenerate src.conf(5) after r232322. MFC after: 2 weeks --- share/man/man5/src.conf.5 | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 2fce2a9..08e08c5 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -276,6 +276,8 @@ When set, it also enforces the following options: .Bl -item -compact .It .Va WITHOUT_CLANG_EXTRAS +.It +.Va WITHOUT_CLANG_IS_CC .El .It Va WITH_CLANG .\" from FreeBSD: head/tools/build/options/WITH_CLANG 221730 2011-05-10 11:14:40Z ru @@ -286,6 +288,15 @@ amd64/amd64, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64. .It Va WITH_CLANG_EXTRAS .\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim Set to build additional clang and llvm tools, such as bugpoint. +.It Va WITH_CLANG_IS_CC +.\" from FreeBSD: head/tools/build/options/WITH_CLANG_IS_CC 232322 2012-02-29 22:58:51Z dim +Set to install the Clang C/C++ compiler as +.Pa /usr/bin/cc +, +.Pa /usr/bin/c++ +and +.Pa /usr/bin/cpp +. .It Va WITHOUT_CPP .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru Set to not build @@ -342,6 +353,8 @@ When set, it also enforces the following options: .It .Va WITHOUT_CLANG .It +.Va WITHOUT_CLANG_IS_CC +.It .Va WITHOUT_GROFF .El .It Va WITHOUT_DICT @@ -948,6 +961,8 @@ When set, it also enforces the following options: .It .Va WITHOUT_CLANG .It +.Va WITHOUT_CLANG_IS_CC +.It .Va WITHOUT_GCC .It .Va WITHOUT_GDB -- cgit v1.1 From 63c65b9bc769e0dd551d0327ae7db81c7c24f6df Mon Sep 17 00:00:00 2001 From: pluknet Date: Thu, 1 Mar 2012 11:03:39 +0000 Subject: Document ifnet refcount. MFC after: 1 week --- share/man/man9/ifnet.9 | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 24e4ea2..0ee33a5 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 26, 2012 +.Dd March 1, 2012 .Dt IFNET 9 .Os .Sh NAME @@ -256,6 +256,11 @@ if a unit number is not associated with the device. (Initialized by driver (usually via .Fn if_initname ) . ) +.It Va if_refcount +.Pq Vt u_int +The reference count. +(Initialized by +.Fn if_alloc . ) .It Va if_addrhead .Pq Vt "struct ifaddrhead" The head of the @@ -340,6 +345,20 @@ The output queue. .\"(Initialized by driver.) .El .Pp +References to +.Vt ifnet +structures are gained by calling the +.Fn if_ref +function and released by calling the +.Fn if_rele +function. +They are used to allow kernel code walking global interface lists +to release the +.Vt ifnet +lock yet keep the +.Vt ifnet +structure stable. +.Pp There are in addition a number of function pointers which the driver must initialize to complete its interface with the generic interface layer: -- cgit v1.1 From a540a62cbb852e38bea9ddd1df6ca41ad3afc6f5 Mon Sep 17 00:00:00 2001 From: pluknet Date: Thu, 1 Mar 2012 12:03:52 +0000 Subject: Document ifunit_ref function. MFC after: 1 week --- share/man/man9/ifnet.9 | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 0ee33a5..c87812d 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -66,6 +66,8 @@ .Fn if_allmulti "struct ifnet *ifp" "int amswitch" .Ft "struct ifnet *" .Fn ifunit "const char *name" +.Ft "struct ifnet *" +.Fn ifunit_ref "const char *name" .Ft void .Fn if_up "struct ifnet *ifp" .\" @@ -1151,6 +1153,14 @@ Return an .Vt ifnet pointer for the interface named .Fa name . +.It Fn ifunit_ref +Return a reference-counted (via +.Fn ifa_ref ) +.Vt ifnet +pointer for the interface named +.Fa name . +This is a preferred function over +.Fn ifunit . .It Fn ifioctl Process the ioctl request .Fa cmd , -- cgit v1.1 From 9a76a422701f488fd5afbbf3c9666511eb4e4a3a Mon Sep 17 00:00:00 2001 From: pluknet Date: Thu, 1 Mar 2012 12:16:00 +0000 Subject: Reflect that ifa_ifwithnet() gained ignore_ptp argument. MFC after: 1 week --- share/man/man9/ifnet.9 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index c87812d..8643ba8 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -77,7 +77,7 @@ .Ft "struct ifaddr *" .Fn ifa_ifwithdstaddr "struct sockaddr *addr" .Ft "struct ifaddr *" -.Fn ifa_ifwithnet "struct sockaddr *addr" +.Fn ifa_ifwithnet "struct sockaddr *addr" "int ignore_ptp" .Ft "struct ifaddr *" .Fn ifaof_ifpforaddr "struct sockaddr *addr" "struct ifnet *ifp" .Ft void @@ -1323,6 +1323,9 @@ subject to its configured netmask, or a point-to-point interface address whose remote address is .Fa addr if one is found. +If +.Fa ignore_ptp +is true, skip point-to-point interface addresses. .Pp .Fn ifaof_ifpforaddr returns the most specific address configured on interface -- cgit v1.1 From 103c25dec9640d24c172879d3deabef6d3cb05f3 Mon Sep 17 00:00:00 2001 From: pluknet Date: Thu, 1 Mar 2012 12:30:57 +0000 Subject: Refine r232333 [1] and put note about ifnet refcount caller responsibility. Spotted by: gavin [1] MFC after: 1 week --- share/man/man9/ifnet.9 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 8643ba8..ac98efa 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -1159,8 +1159,11 @@ Return a reference-counted (via .Vt ifnet pointer for the interface named .Fa name . -This is a preferred function over +This is the preferred function over .Fn ifunit . +The caller is responsible for releasing the reference with +.Fn if_rele +when it is finished with the ifnet. .It Fn ifioctl Process the ioctl request .Fa cmd , -- cgit v1.1 From 3e4d13da1e3c73a8b50ee86331dc86105fccc5fa Mon Sep 17 00:00:00 2001 From: pluknet Date: Thu, 1 Mar 2012 12:52:14 +0000 Subject: Changes in ifaddr refcounting: ifa_refcnt IFAREF/IFAFREE macros moved to ifa_ref()/ifa_free() refcounting functions. MFC after: 1 week --- share/man/man9/ifnet.9 | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index ac98efa..72c1207 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -81,8 +81,9 @@ .Ft "struct ifaddr *" .Fn ifaof_ifpforaddr "struct sockaddr *addr" "struct ifnet *ifp" .Ft void -.Fn ifafree "struct ifaddr *ifa" -.Fn IFAFREE "struct ifaddr *ifa" +.Fn ifa_ref "struct ifaddr *ifa" +.Ft void +.Fn ifa_free "struct ifaddr *ifa" .\" .Ss "Interface Multicast Address Functions" .Ft int @@ -999,14 +1000,11 @@ external routing protocol. .Pp References to .Vt ifaddr -structures are gained manually, by incrementing the -.Va ifa_refcnt -member. -References are released by calling either the -.Fn ifafree -function or the -.Fn IFAFREE -macro. +structures are gained by calling the +.Fn ifa_ref +function and released by calling the +.Fn ifa_free +function. .Pp .Fn ifa_rtrequest is a pointer to a function which receives callouts from the routing -- cgit v1.1 From d844e42d76db648c162bab17d351a353b5793366 Mon Sep 17 00:00:00 2001 From: mav Date: Thu, 1 Mar 2012 13:10:18 +0000 Subject: Add driver for the RME HDSPe AIO/RayDAT sound cards -- snd_hdspe(4). Cards are expensive and so rare, so leave the driver as module. Submitted by: Ruslan Bukin MFC after: 2 weeks --- share/man/man4/Makefile | 1 + share/man/man4/pcm.4 | 3 ++ share/man/man4/snd_hdspe.4 | 76 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 share/man/man4/snd_hdspe.4 (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 39db534..dffe304 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -414,6 +414,7 @@ MAN= aac.4 \ snd_fm801.4 \ snd_gusc.4 \ snd_hda.4 \ + snd_hdspe.4 \ snd_ich.4 \ snd_maestro3.4 \ snd_maestro.4 \ diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index 268e784..f65eca5 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -113,6 +113,8 @@ The following bridge device drivers are available: .It .Xr snd_hda 4 (enabled by default on amd64, i386) .It +.Xr snd_hdspe 4 +.It .Xr snd_ich 4 (enabled by default on amd64, i386) .It .Xr snd_maestro 4 @@ -723,6 +725,7 @@ A device node is not created properly. .Xr snd_fm801 4 , .Xr snd_gusc 4 , .Xr snd_hda 4 , +.Xr snd_hdspe 4 , .Xr snd_ich 4 , .Xr snd_maestro 4 , .Xr snd_maestro3 4 , diff --git a/share/man/man4/snd_hdspe.4 b/share/man/man4/snd_hdspe.4 new file mode 100644 index 0000000..a403a17 --- /dev/null +++ b/share/man/man4/snd_hdspe.4 @@ -0,0 +1,76 @@ +.\" Copyright (c) 2012 Ruslan Bukin +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd February 13, 2012 +.Dt SND_HDSPE 4 +.Os +.Sh NAME +.Nm snd_hdspe +.Nd "RME HDSPe brigde device driver" +.Sh SYNOPSIS +To compile this driver into the kernel, place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device sound" +.Cd "device snd_hdspe" +.Ed +.Pp +Alternatively, to load the driver as a module at boot time, place the +following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +snd_hdspe_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +bridge driver allows the generic audio driver +.Xr sound 4 +to attach to RME HDSPe audio devices. +.Sh HARDWARE +The +.Nm +driver supports the following audio devices: +.Pp +.Bl -bullet -compact +.It +RME HDSPe AIO +.It +RME HDSPe RayDAT +.El +.Sh SEE ALSO +.Xr sound 4 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 10.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Ruslan Bukin . -- cgit v1.1 From 806e8c58722e448287fcca80db3f3b8585bad093 Mon Sep 17 00:00:00 2001 From: jh Date: Thu, 1 Mar 2012 18:17:45 +0000 Subject: Since r199137 namei() returns EINVAL for DELETE and RENAME operations if the last component of the pathname is ".". Reviewed by: kib MFC after: 1 week --- share/man/man9/namei.9 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9 index f643a3f..1ba475a 100644 --- a/share/man/man9/namei.9 +++ b/share/man/man9/namei.9 @@ -33,7 +33,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 21, 2005 +.Dd March 1, 2012 .Dt NAMEI 9 .Os .Sh NAME @@ -340,6 +340,13 @@ permissions. Too many symbolic links were encountered in translating the pathname. .It Bq Er EISDIR An attempt is made to open a directory with write mode specified. +.It Bq Er EINVAL +The last component of the pathname specified for a +.Dv DELETE +or +.Dv RENAME +operation is +.Ql \&. . .It Bq Er EROFS An attempt is made to modify a file or directory on a read-only file system. .El -- cgit v1.1 From f2b9e70d486888e518e1ecb305f738c7ed7f3e5b Mon Sep 17 00:00:00 2001 From: ak Date: Thu, 1 Mar 2012 20:03:44 +0000 Subject: Add myself Approved by: itetcu (mentor) --- share/misc/committers-ports.dot | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'share') diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index e795bd0..f47f335 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -44,6 +44,7 @@ node [color=lightblue2, style=filled, bgcolor=black]; ache [label="Andrey Chernov\nache@FreeBSD.org\n1994/11/15"] acm [label="Jose Alonso Cardenas Marquez\nacm@FreeBSD.org\n2006/07/18"] ahze [label="Michael Johnson\nahze@FreeBSD.org\n2004/10/29"] +ak [label="Alex Kozlov\nak@FreeBSD.org\n2012/02/29"] ale [label="Alex Dupre\nale@FreeBSD.org\n2004/01/12"] alepulver [label="Alejandro Pulver\nalepulver@FreeBSD.org\n2006/04/01"] alexbl [label="Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/11"] @@ -245,6 +246,8 @@ delphij -> rafan demon -> mat +eadler -> ak + edwin -> cperciva edwin -> erwin edwin -> linimon @@ -296,6 +299,7 @@ glewis -> jkim ijliao -> leeym +itetcu -> ak itetcu -> araujo itetcu -> dryice itetcu -> sahil -- cgit v1.1 From 0b4e8b5716a2cec48f18114a48d0ac11a0865ea0 Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 1 Mar 2012 20:19:21 +0000 Subject: Update for adjusted types for boundary arguments in 232356. --- share/man/man9/bus_dma.9 | 2 +- share/man/man9/contigmalloc.9 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man9/bus_dma.9 b/share/man/man9/bus_dma.9 index 7886b14..3b5ca78 100644 --- a/share/man/man9/bus_dma.9 +++ b/share/man/man9/bus_dma.9 @@ -82,7 +82,7 @@ .In machine/bus.h .Ft int .Fn bus_dma_tag_create "bus_dma_tag_t parent" "bus_size_t alignment" \ -"bus_size_t boundary" "bus_addr_t lowaddr" "bus_addr_t highaddr" \ +"bus_addr_t boundary" "bus_addr_t lowaddr" "bus_addr_t highaddr" \ "bus_dma_filter_t *filtfunc" "void *filtfuncarg" "bus_size_t maxsize" \ "int nsegments" "bus_size_t maxsegsz" "int flags" "bus_dma_lock_t *lockfunc" \ "void *lockfuncarg" "bus_dma_tag_t *dmat" diff --git a/share/man/man9/contigmalloc.9 b/share/man/man9/contigmalloc.9 index f0797be..ba1f428 100644 --- a/share/man/man9/contigmalloc.9 +++ b/share/man/man9/contigmalloc.9 @@ -42,7 +42,7 @@ .Fa "vm_paddr_t low" .Fa "vm_paddr_t high" .Fa "unsigned long alignment" -.Fa "unsigned long boundary" +.Fa "vm_paddr_t boundary" .Fc .Ft void .Fo contigfree -- cgit v1.1 From 87af6ebd2e92f46676ab96bbb6db52e01b9a85ce Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 1 Mar 2012 20:20:55 +0000 Subject: Add pci_save_state() and pci_restore_state() wrappers around pci_cfg_save() and pci_cfg_restore() for device drivers to use when saving and restoring state (e.g. to handle device-specific resets). Reviewed by: imp MFC after: 2 weeks --- share/man/man9/Makefile | 2 ++ share/man/man9/pci.9 | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) (limited to 'share') diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index af2a216..81063b9 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -980,6 +980,8 @@ MLINKS+=pci.9 pci_disable_busmaster.9 \ pci.9 pci_find_device.9 \ pci.9 pci_get_powerstate.9 \ pci.9 pci_read_config.9 \ + pci.9 pci_restore_state.9 \ + pci.9 pci_save_state.9 \ pci.9 pci_set_powerstate.9 \ pci.9 pci_write_config.9 MLINKS+=pfil.9 pfil_add_hook.9 \ diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index d8ed624..93ea75e 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -38,6 +38,8 @@ .Nm pci_disable_io , .Nm pci_set_powerstate , .Nm pci_get_powerstate , +.Nm pci_save_state , +.Nm pci_restore_state , .Nm pci_find_bsf , .Nm pci_find_dbsf , .Nm pci_find_device @@ -63,6 +65,10 @@ .Fn pci_get_powerstate "device_t dev" .Ft uint32_t .Fn pci_read_config "device_t dev" "int reg" "int width" +.Ft void +.Fn pci_save_state "device_t dev" +.Ft void +.Fn pci_restore_state "device_t dev" .Ft device_t .Fn pci_find_bsf "uint8_t bus" "uint8_t slot" "uint8_t func" .Ft device_t @@ -188,6 +194,26 @@ of is set. .Pp The +.Fn pci_save_state +and +.Fn pci_restore_state +functions can be used by a device driver to save and restore standard PCI +config registers. +The +.Fn pci_save_state +function must be invoked while the device has valid state before +.Fn pci_restore_state +can be used. +If the device is not in the fully-powered state +.Pq Dv PCI_POWERSTATE_D0 +when +.Fn pci_restore_state +is invoked, +then the device will be transitioned to +.Dv PCI_POWERSTATE_D0 +before any config registers are restored. +.Pp +The .Fn pci_find_bsf function looks up the .Vt device_t -- cgit v1.1 From e03043889a2018be37c98fc3a9d57843a4ab819a Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 1 Mar 2012 20:32:02 +0000 Subject: Sort function prototypes. --- share/man/man9/pci.9 | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'share') diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index 93ea75e..16cca62 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -30,51 +30,51 @@ .Os .Sh NAME .Nm pci , -.Nm pci_read_config , -.Nm pci_write_config , -.Nm pci_enable_busmaster , .Nm pci_disable_busmaster , -.Nm pci_enable_io , .Nm pci_disable_io , -.Nm pci_set_powerstate , -.Nm pci_get_powerstate , -.Nm pci_save_state , -.Nm pci_restore_state , +.Nm pci_enable_busmaster , +.Nm pci_enable_io , .Nm pci_find_bsf , .Nm pci_find_dbsf , -.Nm pci_find_device +.Nm pci_find_device , +.Nm pci_get_powerstate , +.Nm pci_read_config , +.Nm pci_restore_state , +.Nm pci_save_state , +.Nm pci_set_powerstate , +.Nm pci_write_config .Nd PCI bus interface .Sh SYNOPSIS .In sys/bus.h .In dev/pci/pcivar.h .In dev/pci/pcireg.h .In machine/pci_cfgreg.h -.Ft void -.Fn pci_write_config "device_t dev" "int reg" "uint32_t val" "int width" -.Ft int -.Fn pci_enable_busmaster "device_t dev" .Ft int .Fn pci_disable_busmaster "device_t dev" .Ft int -.Fn pci_enable_io "device_t dev" "int space" -.Ft int .Fn pci_disable_io "device_t dev" "int space" .Ft int -.Fn pci_set_powerstate "device_t dev" "int state" +.Fn pci_enable_busmaster "device_t dev" .Ft int -.Fn pci_get_powerstate "device_t dev" -.Ft uint32_t -.Fn pci_read_config "device_t dev" "int reg" "int width" -.Ft void -.Fn pci_save_state "device_t dev" -.Ft void -.Fn pci_restore_state "device_t dev" +.Fn pci_enable_io "device_t dev" "int space" .Ft device_t .Fn pci_find_bsf "uint8_t bus" "uint8_t slot" "uint8_t func" .Ft device_t .Fn pci_find_dbsf "uint32_t domain" "uint8_t bus" "uint8_t slot" "uint8_t func" .Ft device_t .Fn pci_find_device "uint16_t vendor" "uint16_t device" +.Ft int +.Fn pci_get_powerstate "device_t dev" +.Ft uint32_t +.Fn pci_read_config "device_t dev" "int reg" "int width" +.Ft void +.Fn pci_restore_state "device_t dev" +.Ft void +.Fn pci_save_state "device_t dev" +.Ft int +.Fn pci_set_powerstate "device_t dev" "int state" +.Ft void +.Fn pci_write_config "device_t dev" "int reg" "uint32_t val" "int width" .Sh DESCRIPTION The .Nm -- cgit v1.1 From 20f70f7f55cbd6a05571983524a210f9ea3b7066 Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 1 Mar 2012 20:36:50 +0000 Subject: Update the documentation on pci_get/set_powerstate(). These methods are not ACPI-specific at all, but deal with PCI power states. Also, pci_set_powerstate() fails with EOPNOTSUPP if a request is made that the underlying device does not support rather than falling back to somehow setting D0. --- share/man/man9/pci.9 | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'share') diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index 16cca62..37a4f9a 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -145,13 +145,13 @@ the configuration space. .Pp The .Fn pci_get_powerstate -function returns the current ACPI power state of the device +function returns the current power state of the device .Fa dev . If the device does not support power management capabilities, then the default state of .Dv PCI_POWERSTATE_D0 is returned. -The following power states are defined by ACPI: +The following power states are defined by PCI: .Bl -hang -width ".Dv PCI_POWERSTATE_UNKNOWN" .It Dv PCI_POWERSTATE_D0 State in which device is on and running. @@ -183,15 +183,13 @@ The .Fn pci_set_powerstate function is used to transition the device .Fa dev -to the ACPI power state +to the PCI power state .Fa state . -It checks to see if the device is PCI 2.2 compliant. -If so, it checks the -capabilities pointer to determine which power states the device supports. -If the device does not have power management capabilities, the default state -of -.Dv PCI_POWERSTATE_D0 -is set. +If the device does not support power management capabilities or +it does not support the specific power state +.Fa state , +then the function will fail with +.Er EOPNOTSUPP . .Pp The .Fn pci_save_state -- cgit v1.1 From 11e7605a3d8872b68b1759cc1b06407349ed3594 Mon Sep 17 00:00:00 2001 From: mav Date: Fri, 2 Mar 2012 08:49:07 +0000 Subject: Fix names of some Marvell SATA chips. It looks like chips with proprietary interface supported by mvs(4) are 88SX, while AHCI-like chips are 88SE. PR: kern/165271 Submitted by: Jia-Shiun Li MFC after: 1 week --- share/man/man4/ahci.4 | 2 +- share/man/man4/ata.4 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/ahci.4 b/share/man/man4/ahci.4 index 29abd8c..622875c 100644 --- a/share/man/man4/ahci.4 +++ b/share/man/man4/ahci.4 @@ -146,7 +146,7 @@ subclass 6 (SATA) and programming interface 1 (AHCI). .Pp Also, in cooperation with atamarvell and atajmicron drivers of ata(4), it supports AHCI part of legacy-PATA + AHCI-SATA combined controllers, -such as JMicron JMB36x and Marvell 88SX61xx. +such as JMicron JMB36x and Marvell 88SE61xx. .Sh FILES .Bl -tag -width /dev/led/ahcich*.locate .It Pa /dev/led/ahcich*.act diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4 index 633d1ed..d2ac57a 100644 --- a/share/man/man4/ata.4 +++ b/share/man/man4/ata.4 @@ -193,8 +193,8 @@ IT8211F, IT8212F, IT8213F. .It JMicron: JMB360, JMB361, JMB363, JMB365, JMB366, JMB368. .It Marvell -88SX5040, 88SX5041, 88SX5080, 88SX5081, 88SX6041, 88SX6042, 88SX6081, 88SX6101, -88SX6102, 88SX6111, 88SX6121, 88SX6141, 88SX6145, 88SX7042. +88SX5040, 88SX5041, 88SX5080, 88SX5081, 88SX6041, 88SX6042, 88SX6081, 88SE6101, +88SE6102, 88SE6111, 88SE6121, 88SE6141, 88SE6145, 88SX7042. .It National: SC1100. .It NetCell: -- cgit v1.1 From 93f21831844e1002dc8984f9b50f2d260d7d957b Mon Sep 17 00:00:00 2001 From: pluknet Date: Fri, 2 Mar 2012 09:30:54 +0000 Subject: ifp->if_ioctl() has moved to u_long cmd in r36735. Somehow that change had not reached here together with ifioctl(). MFC after: 1 week --- share/man/man9/ifnet.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 72c1207..d4dd102 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -110,7 +110,7 @@ .Ft void .Fn \*(lp*if_qflush\*(rp "struct ifnet *ifp" .Ft int -.Fn \*(lp*if_ioctl\*(rp "struct ifnet *ifp" "int cmd" "caddr_t data" +.Fn \*(lp*if_ioctl\*(rp "struct ifnet *ifp" "u_long cmd" "caddr_t data" .Ft void .Fn \*(lp*if_watchdog\*(rp "struct ifnet *ifp" .Ft void -- cgit v1.1 From f90febf94750a1e4d57d01ee20c7d2fc12725531 Mon Sep 17 00:00:00 2001 From: pluknet Date: Fri, 2 Mar 2012 09:52:42 +0000 Subject: Reflect the renaming of ifmaof_ifpforaddr() to if_findmulti() in r148652. MFC after: 1 week --- share/man/man9/ifnet.9 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index d4dd102..7b5b5aa 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 1, 2012 +.Dd March 2, 2012 .Dt IFNET 9 .Os .Sh NAME @@ -91,7 +91,7 @@ .Ft int .Fn if_delmulti "struct ifnet *ifp" "struct sockaddr *sa" .Ft "struct ifmultiaddr *" -.Fn ifmaof_ifpforaddr "struct sockaddr *addr" "struct ifnet *ifp" +.Fn if_findmulti "struct ifnet *ifp" "struct sockaddr *sa" .Ss "Output queue macros" .Fn IF_DEQUEUE "struct ifqueue *ifq" "struct mbuf *m" .\" @@ -1347,7 +1347,7 @@ The .Fn if_addmulti , .Fn if_delmulti , and -.Fn ifmaof_ifpforaddr +.Fn if_findmulti functions provide support for requesting and relinquishing multicast group memberships, and for querying an interface's membership list, respectively. @@ -1404,11 +1404,11 @@ Both functions return zero on success, or a standard error number on failure. .Pp The -.Fn ifmaof_ifpforaddr +.Fn if_findmulti function examines the membership list of interface .Fa ifp for an address matching -.Fa addr , +.Fa sa , and returns a pointer to that .Vt "struct ifmultiaddr" if one is found, else it returns a null pointer. -- cgit v1.1 From c070890383b42ff46bc91c1af2f7fc18366bd02e Mon Sep 17 00:00:00 2001 From: jhb Date: Sat, 3 Mar 2012 14:23:54 +0000 Subject: Expand and reorganize the pci(9) manpage a bit: - Document the following routines: pci_alloc_msi(), pci_alloc_msix(), pci_find_cap(), pci_get_max_read_req(), pci_get_vpd_ident(), pci_get_vpd_readonly(), pci_msi_count(), pci_msix_count(), pci_pending_msix(), pci_release_msi(), pci_remap_msix(), and pci_set_max_read_req(). - Group the functions into five sub-sections: raw configuration access, locating devices, device information, device configuration, and message signaled interrupts. - Discourage use of pci_disable_io() and pci_enable_io() in device drivers. The PCI bus driver handles this automatically as resources are activated. MFC after: 2 weeks --- share/man/man9/Makefile | 14 +- share/man/man9/pci.9 | 454 ++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 417 insertions(+), 51 deletions(-) (limited to 'share') diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 81063b9..e9122e0 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -971,18 +971,30 @@ MLINKS+=namei.9 NDFREE.9 \ MLINKS+=pbuf.9 getpbuf.9 \ pbuf.9 relpbuf.9 \ pbuf.9 trypbuf.9 -MLINKS+=pci.9 pci_disable_busmaster.9 \ +MLINKS+=pci.9 pci_alloc_msi.9 \ + pci.9 pci_alloc_msix.9 \ + pci.9 pci_disable_busmaster.9 \ pci.9 pci_disable_io.9 \ pci.9 pci_enable_busmaster.9 \ pci.9 pci_enable_io.9 \ pci.9 pci_find_bsf.9 \ + pci.9 pci_find_cap.9 \ pci.9 pci_find_dbsf.9 \ pci.9 pci_find_device.9 \ + pci.9 pci_get_max_read_req.9 \ pci.9 pci_get_powerstate.9 \ + pci.9 pci_get_vpd_ident.9 \ + pci.9 pci_get_vpd_readonly.9 \ + pci.9 pci_msi_count.9 \ + pci.9 pci_msix_count.9 \ + pci.9 pci_pending_msix.9 \ pci.9 pci_read_config.9 \ + pci.9 pci_release_msi.9 \ + pci.9 pci_remap_msix.9 \ pci.9 pci_restore_state.9 \ pci.9 pci_save_state.9 \ pci.9 pci_set_powerstate.9 \ + pci.9 pci_set_max_read_req.9 \ pci.9 pci_write_config.9 MLINKS+=pfil.9 pfil_add_hook.9 \ pfil.9 pfil_hook_get.9 \ diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index 37a4f9a..e4a2eac 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -30,25 +30,40 @@ .Os .Sh NAME .Nm pci , +.Nm pci_alloc_msi , +.Nm pci_alloc_msix , .Nm pci_disable_busmaster , .Nm pci_disable_io , .Nm pci_enable_busmaster , .Nm pci_enable_io , .Nm pci_find_bsf , +.Nm pci_find_cap , .Nm pci_find_dbsf , .Nm pci_find_device , +.Nm pci_get_max_read_req , .Nm pci_get_powerstate , +.Nm pci_get_vpd_ident , +.Nm pci_get_vpd_readonly , +.Nm pci_msi_count , +.Nm pci_msix_count , +.Nm pci_pending_msix , .Nm pci_read_config , +.Nm pci_release_msi , +.Nm pci_remap_msix , .Nm pci_restore_state , .Nm pci_save_state , +.Nm pci_set_max_read_req , .Nm pci_set_powerstate , .Nm pci_write_config .Nd PCI bus interface .Sh SYNOPSIS .In sys/bus.h -.In dev/pci/pcivar.h .In dev/pci/pcireg.h -.In machine/pci_cfgreg.h +.In dev/pci/pcivar.h +.Ft int +.Fn pci_alloc_msi "device_t dev" "int *count" +.Ft int +.Fn pci_alloc_msix "device_t dev" "int *count" .Ft int .Fn pci_disable_busmaster "device_t dev" .Ft int @@ -59,19 +74,39 @@ .Fn pci_enable_io "device_t dev" "int space" .Ft device_t .Fn pci_find_bsf "uint8_t bus" "uint8_t slot" "uint8_t func" +.Ft int +.Fn pci_find_cap "device_t dev" "int capability" "int *capreg" .Ft device_t .Fn pci_find_dbsf "uint32_t domain" "uint8_t bus" "uint8_t slot" "uint8_t func" .Ft device_t .Fn pci_find_device "uint16_t vendor" "uint16_t device" .Ft int +.Fn pci_get_max_read_req "device_t dev" +.Ft int .Fn pci_get_powerstate "device_t dev" +.Ft int +.Fn pci_get_vpd_ident "device_t dev" "const char **identptr" +.Ft int +.Fn pci_get_vpd_readonly "device_t dev" "const char *kw" "const char **vptr" +.Ft int +.Fn pci_msi_count "device_t dev" +.Ft int +.Fn pci_msix_count "device_t dev" +.Ft int +.Fn pci_pending_msix "device_t dev" "u_int index" .Ft uint32_t .Fn pci_read_config "device_t dev" "int reg" "int width" +.Ft int +.Fn pci_release_msi "device_t dev" +.Ft int +.Fn pci_remap_msix "device_t dev" "int count" "const u_int *vectors" .Ft void .Fn pci_restore_state "device_t dev" .Ft void .Fn pci_save_state "device_t dev" .Ft int +.Fn pci_set_max_read_req "device_t dev" "int size" +.Ft int .Fn pci_set_powerstate "device_t dev" "int state" .Ft void .Fn pci_write_config "device_t dev" "int reg" "uint32_t val" "int width" @@ -79,7 +114,14 @@ The .Nm set of functions are used for managing PCI devices. -.Pp +The functions are split into several groups: +raw configuration access, +locating devices, +device information, +device configuration, +and +message signaled interrupts. +.Ss Raw Configuration Access The .Fn pci_read_config function is used to read data from the PCI configuration @@ -104,6 +146,126 @@ with .Fa width specifying the size of the access. .Pp +.Em NOTE : +Device drivers should only use these functions for functionality that +is not available via another +.Fn pci +function. +.Ss Locating Devices +The +.Fn pci_find_bsf +function looks up the +.Vt device_t +of a PCI device, given its +.Fa bus , +.Fa slot , +and +.Fa func . +The +.Fa slot +number actually refers to the number of the device on the bus, +which does not necessarily indicate its geographic location +in terms of a physical slot. +Note that in case the system has multiple PCI domains, +the +.Fn pci_find_bsf +function only searches the first one. +Actually, it is equivalent to: +.Bd -literal -offset indent +pci_find_dbsf(0, bus, slot, func); +.Ed +.Pp +The +.Fn pci_find_dbsf +function looks up the +.Vt device_t +of a PCI device, given its +.Fa domain , +.Fa bus , +.Fa slot , +and +.Fa func . +The +.Fa slot +number actually refers to the number of the device on the bus, +which does not necessarily indicate its geographic location +in terms of a physical slot. +.Pp +The +.Fn pci_find_device +function looks up the +.Vt device_t +of a PCI device, given its +.Fa vendor +and +.Fa device +IDs. +Note that there can be multiple matches for this search; this function +only returns the first matching device. +.Ss Device Information +The +.Fn pci_find_cap +function is used to locate the first instance of a PCI capability +register set for the device +.Fa dev . +The capability to locate is specified by ID via +.Fa capability . +Constant macros of the form +.Dv PCIY_xxx +for standard capability IDs are defined in +.In dev/pci/pcireg.h . +If the capability is found, then +.Fa *capreg +is set the offset in configuration space of the capability register set, +and +.Fn pci_find_cap +returns zero. +If the capability is not found or the device does not support capabilities, +.Fn pci_find_cap +returns an error. +.Pp +The +.Fn pci_get_vpd_ident +function is used to fetch a device's Vital Product Data +.Pq VPD +identifier string. +If the device +.Fa dev +supports VPD and provides an identifier string, +then +.Fa *identptr +is set to point at a read-only, null-terminated copy of the identifier +string, +and +.Fn pci_get_vpd_ident +returns zero. +If the device does not support VPD or does not provide an identifier +string, +then +.Fn pci_get_vpd_ident +returns an error. +.Pp +The +.Fn pci_get_vpd_readonly +function is used to fetch the value of a single VPD read-only keyword +for the device +.Fa dev . +The keyword to fetch is identified by the two character string +.Fa kw . +If the device supports VPD and provides a read-only value for the +requested keyword, +then +.Fa *vptr +is set to point at a read-only, null-terminated copy of the value, +and +.Fn pci_get_vpd_readonly +returns zero. +If the device does not support VPD or does not provide the requested +keyword, +then +.Fn pci_get_vpd_readonly +returns an error. +.Ss Device Configuration The .Fn pci_enable_busmaster function enables PCI bus mastering for the device @@ -138,10 +300,41 @@ argument specifies which resource is affected; this can be either or .Dv SYS_RES_IOPORT as appropriate. +Device drivers should generally not use these routines directly. +The PCI bus will enable decoding automatically when a +.Dv SYS_RES_MEMORY +or +.Dv SYS_RES_IOPORT +resource is activated via +.Xr bus_alloc_resource 9 +or +.Xr bus_activate_resource 9 . .Pp -.Em NOTE : -These functions should be used in preference to manually manipulating -the configuration space. +The +.Fn pci_get_max_read_req +function returns the current maximum read request size in bytes for a +PCI-express device. +If the +.Fa dev +device is not a PCI-express device, +.Fn pci_get_max_read_req +returns zero. +.Pp +The +.Fn pci_set_max_read_req +sets the PCI-express maximum read request size for +.Fa dev . +The requested +.Fa size +may be adjusted, +and +.Fn pci_set_max_read_req +returns the actual size set in bytes. +If the +.Fa dev +device is not a PCI-express device, +.Fn pci_set_max_read_req +returns zero. .Pp The .Fn pci_get_powerstate @@ -210,57 +403,216 @@ is invoked, then the device will be transitioned to .Dv PCI_POWERSTATE_D0 before any config registers are restored. +.Ss Message Signaled Interrupts +Message Signaled Interrupts +.Pq MSI +and +Enhanced Message Signaled Interrupts +.Pq MSI-X +are PCI capabilities that provide an alternate method for PCI +devices to signal interrupts. +The legacy INTx interrupt is available to PCI devices as a +.Dv SYS_RES_IRQ +resource with a resource ID of zero. +MSI and MSI-X interrupts are available to PCI devices as one or more +.Dv SYS_RES_IRQ +resources with resource IDs greater than zero. +A driver must ask the PCI bus to allocate MSI or MSI-X interrupts +using +.Fn pci_alloc_msi +or +.Fn pci_alloc_msix +before it can use MSI or MSI-X +.Dv SYS_RES_IRQ +resources. +A driver is not allowed to use the legacy INTx +.Dv SYS_RES_IRQ +resource if MSI or MSI-X interrupts have been allocated, +and attempts to allocate MSI or MSI-X interrupts will fail if the +driver is currently using the legacy INTx +.Dv SYS_RES_IRQ +resource. +A driver is only allowed to use either MSI or MSI-X, +but not both. .Pp The -.Fn pci_find_bsf -function looks up the -.Vt device_t -of a PCI device, given its -.Fa bus , -.Fa slot , -and -.Fa func . +.Fn pci_count_msi +function returns the maximum number of MSI messages supported by the +device +.Fa dev. +If the device does not support MSI, +then +.Fn pci_count_msi +returns zero. +.Pp The -.Fa slot -number actually refers to the number of the device on the bus, -which does not necessarily indicate its geographic location -in terms of a physical slot. -Note that in case the system has multiple PCI domains, -the -.Fn pci_find_bsf -function only searches the first one. -Actually, it is equivalent to: -.Bd -literal -offset indent -pci_find_dbsf(0, bus, slot, func); -.Ed +.Fn pci_alloc_msi +function attempts to allocate +.Fa *count +MSI messages for the device +.Fa dev . +The +.Fn pci_alloc_msi +function may allocate fewer messages than requested for various +reasons including requests for more messages than the device +.Fa dev +supports, +or if the system has a shortage of available MSI messages. +On success, +.Fa *count +is set to the number of messages allocated and +.Fn pci_alloc_msi +returns zero. +The +.Dv SYS_RES_IRQ +resources for the allocated messages will be available at consecutive +resource IDs beginning with one. +If +.Fn pci_alloc_msi +is not able to allocate any messages, +it returns an error. +Note that MSI only supports message counts that are powers of two; +requests to allocate a non-power of two count of messages will fail. .Pp The -.Fn pci_find_dbsf -function looks up the -.Vt device_t -of a PCI device, given its -.Fa domain , -.Fa bus , -.Fa slot , -and -.Fa func . +.Fn pci_release_msi +function is used to release any allocated MSI or MSI-X messages back +to the system. +If any MSI or MSI-X +.Dv SYS_RES_IRQ +resources are allocated by the driver or have a configured interrupt +handler, +this function will fail with +.Er EBUSY . The -.Fa slot -number actually refers to the number of the device on the bus, -which does not necessarily indicate its geographic location -in terms of a physical slot. +.Fn pci_release_msi +function returns zero on success and an error on failure. +.Pp +.The +.Fn pci_count_msix +function returns the maximum number of MSI-X messages supported by the +device +.Fa dev . +If the device does not support MSI-X, +then +.Fn pci_count_msix +returns zero. .Pp The -.Fn pci_find_device -function looks up the -.Vt device_t -of a PCI device, given its -.Fa vendor -and -.Fa device -IDs. -Note that there can be multiple matches for this search; this function -only returns the first matching device. +.Fn pci_alloc_msix +function attempts to allocate +.Fa *count +MSI-X messages for the device +.Fa dev . +The +.Fn pci_alloc_msix +function may allocate fewer messages than requested for various +reasons including requests for more messages than the device +.Fa dev +supports, +or if the system has a shortage of available MSI-X messages. +On success, +.Fa *count +is set to the number of messages allocated and +.Fn pci_alloc_msix +returns zero. +For MSI-X messages, +the resource ID for each +.Dv SYS_RES_IRQ resource identifies the index in the MSI-X table of the +corresponding message. +A resource ID of one maps to the first index of the MSI-X table; +a resource ID two identifies the second index in the table, etc. +The +.Fn pci_alloc_msix +function assigns the +.Fa *count +messages allocated to the first +.Fa *count +table indicies. +If +.Fn pci_alloc_msix +is not able to allocate any messages, +it returns an error. +Unlike MSI, +MSI-X does not require message counts that are powers of two. +.Pp +The +.Fn pci_pending_msix +function examines the +.Fa dev +device's Pending Bit Array +.Pq PBA +to determine the pending status of the MSI-X message at table index +.Fa index . +If the indicated message is pending, +this function returns a non-zero value; +otherwise, +it returns zero. +Passing an invalid +.Fa index +to this function will result in undefined behavior. +.Pp +As mentioned in the description of +.Fn pci_alloc_msix , +MSI-X messages are initially assigned to the first N table entries. +A driver may use a different distribution of available messages to +table entries via the +.Fn pci_remap_msix +function. +Note that this function must be called after a succesful call to +.Fn pci_alloc_msix +but before any of the +.Dv SYS_RES_IRQ +resources are allocated. +The +.Fn pci_remap_msix +function returns zero on success, +or an error on failure. +.Pp +The +.Fa vectors +array should contain +.Fa count +message vectors. +The array maps directly to the MSI-X table in that the first entry in +the array specifies the message used for the first entry in the MSI-X +table, +the second entry in the array corresponds to the second entry in the +MSI-X table, +etc. +The vector value in each array index can either be zero to indicate +that no message should be assigned to the corresponding MSI-X table entry, +or it can be a number from one to N +.Po +where N is the count returned from the previous call to +.Fn pci_alloc_msix +.Pc +to indicate which of the allocated messages should be assigned to the +corresponding MSI-X table entry. +.Pp +If +.Fn pci_remap_msix +succeeds, +each MSI-X table entry with a non-zero vector will have an associated +.Dv SYS_RES_IRQ +resource whose resource ID corresponds to the table index as described +above for +.Fn pci_alloc_msix . +MSI-X table entries that with a vector of zero will not have an +associated +.Dv SYS_RES_IRQ resource. +Additionally, +if any of the original messages allocated by +.Fn pci_alloc_msix +are not used in the new distribution of messages in the MSI-X table, +they will be released automatically. +Note that if a driver wishes to use fewer messages than were allocated by +.Fn pci_alloc_msix , +the driver must use a single, contiguous range of messages beginning +with one in the new distribution. +The +.Fn pci_remap_msix +function will fail if this condition is not met. .Sh IMPLEMENTATION NOTES The .Vt pci_addr_t @@ -293,7 +645,9 @@ space on the target architecture. .Re .Sh AUTHORS This manual page was written by -.An Bruce M Simpson Aq bms@FreeBSD.org . +.An Bruce M Simpson Aq bms@FreeBSD.org +and +.An John Baldwin Aq jhb@FreeBSD.org . .Sh BUGS The kernel PCI code has a number of references to .Dq "slot numbers" . -- cgit v1.1 From 35f5c46c91cca7eca1523a35b1a1f4e514545ee1 Mon Sep 17 00:00:00 2001 From: dim Date: Sat, 3 Mar 2012 18:58:15 +0000 Subject: After r232322, it turned out many people (and some ports) are building kernel modules using their old installed /usr/share/mk/bsd.*.mk files, instead of the updated ones in their source tree. This leads to errors like: "sys/conf/kmod.mk", line 111: Malformed conditional (${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") Obviously, these errors will go away after a "make installworld", or alternatively, by using "make buildenv" before attempting to manually build modules. However, since it is apparently an expected use case to build using old .mk files, change the way we test for clang, so it also works when the MK_CLANG_IS_CC macro doesn't exist. Note the conditional expressions are becoming rather unreadable now, but I will attempt to fix that on a followup commit. MFC after: 2 weeks --- share/mk/bsd.sys.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 401e671..595655a 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -28,7 +28,7 @@ CFLAGS += -std=${CSTD} . if defined(WARNS) . if ${WARNS} >= 1 CWARNFLAGS += -Wsystem-headers -. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) +. if !defined(NO_WERROR) && ((${CC:T:Mclang} != "clang" && (!defined(MK_CLANG_IS_CC) || ${MK_CLANG_IS_CC} == "no")) || !defined(NO_WERROR.clang)) CWARNFLAGS += -Werror . endif . endif @@ -42,7 +42,7 @@ CWARNFLAGS += -W -Wno-unused-parameter -Wstrict-prototypes\ . if ${WARNS} >= 4 CWARNFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\ -Wshadow -Wunused-parameter -. if !defined(NO_WCAST_ALIGN) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WCAST_ALIGN.clang)) +. if !defined(NO_WCAST_ALIGN) && ((${CC:T:Mclang} != "clang" && (!defined(MK_CLANG_IS_CC) || ${MK_CLANG_IS_CC} == "no")) || !defined(NO_WCAST_ALIGN.clang)) CWARNFLAGS += -Wcast-align . endif . endif @@ -59,7 +59,7 @@ CWARNFLAGS += -Wno-uninitialized CWARNFLAGS += -Wno-pointer-sign # Clang has more warnings enabled by default, and when using -Wall, so if WARNS # is set to low values, these have to be disabled explicitly. -. if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" +. if ${CC:T:Mclang} == "clang" || (defined(MK_CLANG_IS_CC) && ${MK_CLANG_IS_CC} != "no") . if ${WARNS} <= 3 CWARNFLAGS += -Wno-tautological-compare -Wno-unused-value\ -Wno-parentheses-equality -Wno-unused-function\ @@ -84,12 +84,12 @@ WFORMAT = 1 . if ${WFORMAT} > 0 #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args CWARNFLAGS += -Wformat=2 -Wno-format-extra-args -. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) +. if !defined(NO_WERROR) && ((${CC:T:Mclang} != "clang" && (!defined(MK_CLANG_IS_CC) || ${MK_CLANG_IS_CC} == "no")) || !defined(NO_WERROR.clang)) CWARNFLAGS += -Werror . endif . endif . endif -. if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && defined(NO_WFORMAT.clang)) +. if defined(NO_WFORMAT) || ((${CC:T:Mclang} == "clang" || (defined(MK_CLANG_IS_CC) && ${MK_CLANG_IS_CC} != "no")) && defined(NO_WFORMAT.clang)) CWARNFLAGS += -Wno-format . endif .endif @@ -98,7 +98,7 @@ CWARNFLAGS += -Wno-format CWARNFLAGS += -Wno-unknown-pragmas .endif -.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" +.if ${CC:T:Mclang} == "clang" || (defined(MK_CLANG_IS_CC) && ${MK_CLANG_IS_CC} != "no") CLANG_NO_IAS = -no-integrated-as CLANG_OPT_SMALL = -mllvm -stack-alignment=8 -mllvm -inline-threshold=3 \ -mllvm -enable-load-pre=false -- cgit v1.1 From ae227ddf7fe7c0964da0d2b5d1a31ab5f41f56da Mon Sep 17 00:00:00 2001 From: dim Date: Sat, 3 Mar 2012 23:49:53 +0000 Subject: Revert r232473. I have been convinced by Doug Barton and Bjoern Zeeb that it is better to error out when people attempt to build using the wrong bsd.*.mk files, than to silently ignore the problem. This means, that after this commit, if you want to build kernel modules by hand (or via a port) from a head source tree, you *must* make sure the files in /usr/share/mk are in sync with that tree. If that isn't possible, for example when you are running on an older FreeBSD branch, you can: - Run "make buildenv" from your head source tree, to have the correct environment setup. (It's advisable to have run "make buildworld", or at a minimum "make toolchain" first.) - Alternatively, set MAKESYSPATH to the share/mk directory under your head source tree. If your build tools are too old, other problems may still occur. - Alternatively, use "make -m" and specify the share/mk directory under your head source tree. Again, build tools that are too old may still result in trouble. MFC after: 2 weeks --- share/mk/bsd.sys.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 595655a..401e671 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -28,7 +28,7 @@ CFLAGS += -std=${CSTD} . if defined(WARNS) . if ${WARNS} >= 1 CWARNFLAGS += -Wsystem-headers -. if !defined(NO_WERROR) && ((${CC:T:Mclang} != "clang" && (!defined(MK_CLANG_IS_CC) || ${MK_CLANG_IS_CC} == "no")) || !defined(NO_WERROR.clang)) +. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) CWARNFLAGS += -Werror . endif . endif @@ -42,7 +42,7 @@ CWARNFLAGS += -W -Wno-unused-parameter -Wstrict-prototypes\ . if ${WARNS} >= 4 CWARNFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\ -Wshadow -Wunused-parameter -. if !defined(NO_WCAST_ALIGN) && ((${CC:T:Mclang} != "clang" && (!defined(MK_CLANG_IS_CC) || ${MK_CLANG_IS_CC} == "no")) || !defined(NO_WCAST_ALIGN.clang)) +. if !defined(NO_WCAST_ALIGN) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WCAST_ALIGN.clang)) CWARNFLAGS += -Wcast-align . endif . endif @@ -59,7 +59,7 @@ CWARNFLAGS += -Wno-uninitialized CWARNFLAGS += -Wno-pointer-sign # Clang has more warnings enabled by default, and when using -Wall, so if WARNS # is set to low values, these have to be disabled explicitly. -. if ${CC:T:Mclang} == "clang" || (defined(MK_CLANG_IS_CC) && ${MK_CLANG_IS_CC} != "no") +. if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" . if ${WARNS} <= 3 CWARNFLAGS += -Wno-tautological-compare -Wno-unused-value\ -Wno-parentheses-equality -Wno-unused-function\ @@ -84,12 +84,12 @@ WFORMAT = 1 . if ${WFORMAT} > 0 #CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args CWARNFLAGS += -Wformat=2 -Wno-format-extra-args -. if !defined(NO_WERROR) && ((${CC:T:Mclang} != "clang" && (!defined(MK_CLANG_IS_CC) || ${MK_CLANG_IS_CC} == "no")) || !defined(NO_WERROR.clang)) +. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) CWARNFLAGS += -Werror . endif . endif . endif -. if defined(NO_WFORMAT) || ((${CC:T:Mclang} == "clang" || (defined(MK_CLANG_IS_CC) && ${MK_CLANG_IS_CC} != "no")) && defined(NO_WFORMAT.clang)) +. if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && defined(NO_WFORMAT.clang)) CWARNFLAGS += -Wno-format . endif .endif @@ -98,7 +98,7 @@ CWARNFLAGS += -Wno-format CWARNFLAGS += -Wno-unknown-pragmas .endif -.if ${CC:T:Mclang} == "clang" || (defined(MK_CLANG_IS_CC) && ${MK_CLANG_IS_CC} != "no") +.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" CLANG_NO_IAS = -no-integrated-as CLANG_OPT_SMALL = -mllvm -stack-alignment=8 -mllvm -inline-threshold=3 \ -mllvm -enable-load-pre=false -- cgit v1.1 From 71b454b896bef66bf91b7c85dbacb28d4b3ff642 Mon Sep 17 00:00:00 2001 From: eadler Date: Sun, 4 Mar 2012 15:22:03 +0000 Subject: PR: docs/158813 Submitted by: Ben Kaduk Approved by: bcr MFC after: 1 week --- share/man/man4/jme.4 | 55 +++++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 26 deletions(-) (limited to 'share') diff --git a/share/man/man4/jme.4 b/share/man/man4/jme.4 index 0bcf652..e17a797 100644 --- a/share/man/man4/jme.4 +++ b/share/man/man4/jme.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 29, 2011 +.Dd March 4, 2012 .Dt JME 4 .Os .Sh NAME @@ -130,23 +130,26 @@ variables and tunables: .Bl -tag -width "xxxxxx" .It Va dev.jme.%d.tx_coal_to -Maximum amount of time to delay for Tx completion interrupt in -units of 1us. -The accepted range is 1 to 65535, the default is 100 (100us). +This variable sets the maximum amount of time to delay +before sending a Tx completion interrupt, in microseconds. +The accepted range is 1 to 65535; the default is 100 (100us). .It Va dev.jme.%d.tx_coal_pkt -Maximum number of packets to fire Tx completion interrupt. -The accepted range is 1 to 255, the default is 8. +This variable sets the maximum number of outgoing packets which may be +coalesced together into a single Tx completion interrupt. +The accepted range is 1 to 255; the default is 8. .It Va dev.jme.%d.rx_coal_to -Maximum amount of time to delay for Rx completion interrupt in -units of 1us. -The accepted range is 1 to 65535, the default is 100 (100us). +This variable sets the maximum amount of time to wait for +additional packets to arrive (for possible packet coalescing) +before firing an Rx completion interrupt, in microseconds. +The accepted range is 1 to 65535; the default is 100 (100us). .It Va dev.jme.%d.rx_coal_pkt -Maximum number of packets to fire Rx completion interrupt. -The accepted range is 1 to 255, the default is 2. +This variable sets the maximum number of incoming packets which may be +coalesced into a single Rx completion interrupt. +The accepted range is 1 to 255; the default is 2. .It Va dev.jme.%d.process_limit -Maximum amount of Rx events to be processed in the event loop before -rescheduling a taskqueue. -The accepted range is 10 to 255, the default value is 128 events. +This variable sets the maximum number of events that will be processed +in a single batch before the handler is requeued into a taskqueue. +The accepted range is 10 to 255; the default value is 128 events. The interface does not need to be brought down and up again before a change takes effect. .El @@ -173,22 +176,22 @@ driver tries to avoid unnecessary station address reprogramming for controllers that use eFuse to store station address. The number of times that eFuse can be safely reprogrammed is 16 at most. -In addition, there is no way to restore factory default station -address once station address is reprogrammed via eFuse. -It is highly recommended not to reprogram station address and -it is responsibility of administrator to store original station -address into a safe place when station address should be changed. +In addition, there is no way to restore the factory default station +address once the station address has been reprogrammed via eFuse. +It is highly recommended not to reprogram the station address and +it is the responsibility of the administrator to store the original station +address in a safe place when station address is changed. .Pp There are two known 1000baseT link establishment issues with JMC25x. If the full mask revision number of JMC25x controller is less than -or equal to 4 and link partner enabled IEEE 802.3az Energy Efficient -Ethernet feature, the controller would not be able to establish a +or equal to 4 and the link partner enabled the IEEE 802.3az Energy Efficient +Ethernet feature, the controller will not be able to establish a 1000baseT link. -Also if the length of cable is longer than 120 meters, controller +Also, if the length of the cable is longer than 120 meters, the controller can not establish a 1000baseT link. -The known workaround for the issue is to force manual link +The known workaround for these issues is to force manual link configuration with 100baseTX instead of relying on auto-negotiation. -The full mask revision number of controller could be checked with +The full mask revision number of controller can be checked with the verbose kernel boot option. -Use lower nibble of chip revision number to get full mask revision of -the controller. +Use the lower nibble of the chip revision number to get the +full mask revision of the controller. -- cgit v1.1 From 2cc463152bb877a425788043bb35db7c1b133eb8 Mon Sep 17 00:00:00 2001 From: eadler Date: Sun, 4 Mar 2012 16:26:49 +0000 Subject: ehci tunables are only available when kernel is compiled with USB_DEBUG PR: docs/163646 Reported by: Momchil Ivanov Submitted by: Benjamin Kaduk Approved by: cperciva MFC after: 1 week --- share/man/man4/ehci.4 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/ehci.4 b/share/man/man4/ehci.4 index ea99a9d..8e97b9b 100644 --- a/share/man/man4/ehci.4 +++ b/share/man/man4/ehci.4 @@ -80,7 +80,11 @@ The device driver first appeared in .Fx 5.1 . .Sh LOADER TUNABLES -Tunables can be set at the +When the kernel has been compiled with +.Cd options USB_DEBUG , +some tunables become available that affect the behavior of +.Nm . +These tunables can be set at the .Xr loader 8 prompt before booting the kernel or stored in .Xr loader.conf 5 . -- cgit v1.1 From 01c3c736096414051e55c095667205aca6f95e35 Mon Sep 17 00:00:00 2001 From: eadler Date: Sun, 4 Mar 2012 16:59:45 +0000 Subject: Bump date as modified the man page Submitted by: gjb --- share/man/man4/ehci.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/ehci.4 b/share/man/man4/ehci.4 index 8e97b9b..1d06bf9 100644 --- a/share/man/man4/ehci.4 +++ b/share/man/man4/ehci.4 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 24, 2011 +.Dd March 4, 2012 .Dt EHCI 4 .Os .Sh NAME -- cgit v1.1 From 44d3dd58d457039cc687ff95931359af58473a3f Mon Sep 17 00:00:00 2001 From: jhb Date: Sun, 4 Mar 2012 18:55:33 +0000 Subject: Document pci_find_extcap() and pci_find_htcap(). --- share/man/man9/Makefile | 2 ++ share/man/man9/pci.9 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) (limited to 'share') diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index e9122e0..8acef35 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -981,6 +981,8 @@ MLINKS+=pci.9 pci_alloc_msi.9 \ pci.9 pci_find_cap.9 \ pci.9 pci_find_dbsf.9 \ pci.9 pci_find_device.9 \ + pci.9 pci_find_extcap.9 \ + pci.9 pci_find_htcap.9 \ pci.9 pci_get_max_read_req.9 \ pci.9 pci_get_powerstate.9 \ pci.9 pci_get_vpd_ident.9 \ diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index e4a2eac..1126e57 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -40,6 +40,8 @@ .Nm pci_find_cap , .Nm pci_find_dbsf , .Nm pci_find_device , +.Nm pci_find_extcap , +.Nm pci_find_htcap , .Nm pci_get_max_read_req , .Nm pci_get_powerstate , .Nm pci_get_vpd_ident , @@ -81,6 +83,10 @@ .Ft device_t .Fn pci_find_device "uint16_t vendor" "uint16_t device" .Ft int +.Fn pci_find_extcap "device_t dev" "int capability" "int *capreg" +.Ft int +.Fn pci_find_htcap "device_t dev" "int capability" "int *capreg" +.Ft int .Fn pci_get_max_read_req "device_t dev" .Ft int .Fn pci_get_powerstate "device_t dev" @@ -225,6 +231,49 @@ If the capability is not found or the device does not support capabilities, returns an error. .Pp The +.Fn pci_find_extcap +function is used to locate the first instance of a PCI-express +extended capability register set for the device +.Fa dev . +The extended capability to locate is specified by ID via +.Fa capability . +Constant macros of the form +.Dv PCIZ_xxx +for standard extended capability IDs are defined in +.In dev/pci/pcireg.h . +If the extended capability is found, then +.Fa *capreg +is set the offset in configuration space of the extended capability +register set, and +.Fn pci_find_extcap +returns zero. +If the extended capability is not found or the device is not a +PCI-express device, +.Fn pci_find_extcap +returns an error. +.Pp +The +.Fn pci_find_htcap +function is used to locate the first instance of a HyperTransport capability +register set for the device +.Fa dev . +The capability to locate is specified by type via +.Fa capability . +Constant macros of the form +.Dv PCIM_HTCAP_xxx +for standard HyperTransport capability types are defined in +.In dev/pci/pcireg.h . +If the capability is found, then +.Fa *capreg +is set the offset in configuration space of the capability register set, +and +.Fn pci_find_htcap +returns zero. +If the capability is not found or the device is not a HyperTransport device, +.Fn pci_find_htcap +returns an error. +.Pp +The .Fn pci_get_vpd_ident function is used to fetch a device's Vital Product Data .Pq VPD -- cgit v1.1 From 2a173e7bbc11233c337c714626488c456a08e2aa Mon Sep 17 00:00:00 2001 From: glebius Date: Mon, 5 Mar 2012 06:12:15 +0000 Subject: Fix ng_ipfw(4) cookie number in example. Pointed out by: "Jacco van Buuren" --- share/man/man4/ng_patch.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/ng_patch.4 b/share/man/man4/ng_patch.4 index 4937327..416116e 100644 --- a/share/man/man4/ng_patch.4 +++ b/share/man/man4/ng_patch.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 9, 2010 +.Dd March 5, 2012 .Dt NG_PATCH 4 .Os .Sh NAME @@ -185,7 +185,7 @@ So you do: { mode=7 value=0xf7 length=1 offset=1 } \e { mode=8 value=0x02 length=1 offset=1 } ] } SEQ -/sbin/ipfw add 160 netgraph 600 ip from any to any not dst-port 80 +/sbin/ipfw add 160 netgraph 300 ip from any to any not dst-port 80 .Ed .Pp This first does -- cgit v1.1 From 66ccd6631c79d8699f52ee71f2e5a9d44335ef36 Mon Sep 17 00:00:00 2001 From: pluknet Date: Mon, 5 Mar 2012 17:38:44 +0000 Subject: Fix typo. Bump .Dd for the previous change. --- share/man/man9/pci.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index 1126e57..b994a75 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -537,7 +537,7 @@ The .Fn pci_release_msi function returns zero on success and an error on failure. .Pp -.The +The .Fn pci_count_msix function returns the maximum number of MSI-X messages supported by the device -- cgit v1.1 From b9d94deee6e0628df1537abc79161c7b0680ba54 Mon Sep 17 00:00:00 2001 From: jhb Date: Mon, 5 Mar 2012 19:38:59 +0000 Subject: Fix three instances of a missing word. Submitted by: bjk --- share/man/man9/pci.9 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index b994a75..53c38e5 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -222,7 +222,7 @@ for standard capability IDs are defined in .In dev/pci/pcireg.h . If the capability is found, then .Fa *capreg -is set the offset in configuration space of the capability register set, +is set to the offset in configuration space of the capability register set, and .Fn pci_find_cap returns zero. @@ -243,7 +243,7 @@ for standard extended capability IDs are defined in .In dev/pci/pcireg.h . If the extended capability is found, then .Fa *capreg -is set the offset in configuration space of the extended capability +is set to the offset in configuration space of the extended capability register set, and .Fn pci_find_extcap returns zero. @@ -265,7 +265,7 @@ for standard HyperTransport capability types are defined in .In dev/pci/pcireg.h . If the capability is found, then .Fa *capreg -is set the offset in configuration space of the capability register set, +is set to the offset in configuration space of the capability register set, and .Fn pci_find_htcap returns zero. -- cgit v1.1 From b3b4b54213cac1391d1e8193eca447ea5db05c1d Mon Sep 17 00:00:00 2001 From: pluknet Date: Mon, 5 Mar 2012 20:04:28 +0000 Subject: Actually bump date, sigh. --- share/man/man9/pci.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index 53c38e5..4089ee8 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 30, 2007 +.Dd March 5, 2012 .Dt PCI 9 .Os .Sh NAME -- cgit v1.1 From bc68c66587c9c81a31b5228861016de9621df1ee Mon Sep 17 00:00:00 2001 From: pluknet Date: Tue, 6 Mar 2012 08:59:42 +0000 Subject: - ifnet_addrs has gone and replaced by ifaddr_byindex(), as per r83130 - access to the AF_LINK address through if_addrhead is deprecated (r128315) MFC after: 1 week --- share/man/man9/ifnet.9 | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 7b5b5aa..a2c9480 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -73,6 +73,8 @@ .\" .Ss "Interface Address Functions" .Ft "struct ifaddr *" +.Fn ifaddr_byindex "u_short idx" +.Ft "struct ifaddr *" .Fn ifa_ifwithaddr "struct sockaddr *addr" .Ft "struct ifaddr *" .Fn ifa_ifwithdstaddr "struct sockaddr *addr" @@ -127,7 +129,7 @@ .\" .Ss "Global Variables" .Vt extern struct ifnethead ifnet ; -.Vt extern struct ifaddr **ifnet_addrs ; +.\" extern struct ifindex_entry *ifindex_table ; .Vt extern int if_index ; .Vt extern int ifqmaxlen ; .Sh DATA STRUCTURES @@ -192,12 +194,18 @@ Each interface also has a .Li TAILQ of interface addresses, described by .Vt ifaddr -structures; the head of the queue is always an +structures. +An .Dv AF_LINK address (see .Xr link_addr 3 ) -describing the link layer implemented by the interface (if any). +describing the link layer implemented by the interface (if any) +is accessed by the +.Fn ifaddr_byindex +function or +.Va if_addr +structure. (Some trivial interfaces do not provide any link layer addresses; this structure, while still present, serves only to identify the interface name and index.) @@ -1085,8 +1093,11 @@ addresses on that interface, and create a link-layer .Vt ifaddr structure to be the first element in that list. (A pointer to -this address structure is saved in the global array -.Va ifnet_addrs . ) +this address structure is saved in the +.Vt ifnet +structure and shall be accessed by the +.Fn ifaddr_byindex +function.) The .Fa ifp must have been allocated by -- cgit v1.1 From cc08870c86046aca4d76330c77ff77d137e8641c Mon Sep 17 00:00:00 2001 From: pluknet Date: Tue, 6 Mar 2012 09:04:53 +0000 Subject: The missing part of r232588 that documents ifaddr_byindex() itself. MFC after: 1 week --- share/man/man9/ifnet.9 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index a2c9480..a199298 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -1351,6 +1351,10 @@ precisely .Fa addr will be returned. .Pp +.Fn ifaddr_byindex +returns the link-level address of the interface with the given index +.Fa idx . +.Pp All of these functions return a null pointer if no such address can be found. .Ss "Interface Multicast Address Functions" -- cgit v1.1 From 9ea338986f54ec05d8b12178e9951d55c54f2de1 Mon Sep 17 00:00:00 2001 From: pluknet Date: Tue, 6 Mar 2012 09:40:34 +0000 Subject: Kill EoL whitespaces. --- share/man/man9/ifnet.9 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index a199298..d7eaba7 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -394,7 +394,7 @@ This function will return .Dv ENOBUFS if the devices software and hardware queues are both full. This function must be installed after -.Fn if_attach +.Fn if_attach to override the default implementation. This function is exposed in order to allow drivers to manage their own queues and to reduce the latency caused by a frequently gratuitous enqueue / dequeue @@ -402,8 +402,8 @@ pair to ifq. The suggested internal software queueing mechanism is buf_ring. .It Fn if_qflush Free mbufs in internally managed queues when the interface is marked down. -This function must be installed after -.Fn if_attach +This function must be installed after +.Fn if_attach to override the default implementation. This function is exposed in order to allow drivers to manage their own queues and to reduce the latency caused by a frequently gratuitous enqueue / dequeue @@ -623,14 +623,14 @@ This Ethernet interface supports TCP Segmentation offloading. .It Dv IFCAP_TSO6 This Ethernet interface supports TCP6 Segmentation offloading. .It Dv IFCAP_TSO -A shorthand for +A shorthand for .Pq Dv IFCAP_TSO4 | IFCAP_TSO6 . .It Dv IFCAP_TOE4 This Ethernet interface supports TCP offloading. .It Dv IFCAP_TOE6 This Ethernet interface supports TCP6 offloading. .It Dv ICAP_TOE -A Shorthand for +A Shorthand for .Pq Dv IFCAP_TOE4 | IFCAP_TOE6 . .It Dv IFCAP_WOL_UCAST This Ethernet interface supports waking up on any Unicast packet. -- cgit v1.1 From 73e2a901f85870cb1a2e3aeb604d14369439ace5 Mon Sep 17 00:00:00 2001 From: pluknet Date: Tue, 6 Mar 2012 09:57:50 +0000 Subject: Fix a typo: use lower case in "A Shorthand". Noted by: maxim --- share/man/man9/ifnet.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index d7eaba7..43ee6c7 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -630,7 +630,7 @@ This Ethernet interface supports TCP offloading. .It Dv IFCAP_TOE6 This Ethernet interface supports TCP6 offloading. .It Dv ICAP_TOE -A Shorthand for +A shorthand for .Pq Dv IFCAP_TOE4 | IFCAP_TOE6 . .It Dv IFCAP_WOL_UCAST This Ethernet interface supports waking up on any Unicast packet. -- cgit v1.1 From 46c04cbc53e36003415dca828c9f86150b6cbd0f Mon Sep 17 00:00:00 2001 From: pluknet Date: Tue, 6 Mar 2012 12:20:37 +0000 Subject: Remove if_watchdog remnants after if_timer/if_watchdog removal in r199975. This part was missed in r199992. MFC after: 1 week --- share/man/man9/ifnet.9 | 2 -- 1 file changed, 2 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 43ee6c7..b439623 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -114,8 +114,6 @@ .Ft int .Fn \*(lp*if_ioctl\*(rp "struct ifnet *ifp" "u_long cmd" "caddr_t data" .Ft void -.Fn \*(lp*if_watchdog\*(rp "struct ifnet *ifp" -.Ft void .Fn \*(lp*if_init\*(rp "void *if_softc" .Ft int .Fo \*(lp*if_resolvemulti\*(rp -- cgit v1.1 From 606ca3f4b71b5d5e3dbda63a827a683ffda7a0a4 Mon Sep 17 00:00:00 2001 From: bz Date: Tue, 6 Mar 2012 18:44:52 +0000 Subject: Provide wbwd(4), a driver for the watchdog timer found on various Winbond Super I/O chips. With minor efforts it should be possible the extend the driver to support further chips/revisions available from Winbond. In the simplest case only new IDs need to be added, while different chipsets might require their own function to enter extended function mode, etc. Sponsored by: Sandvine Incorporated ULC (in 2011) Reviewed by: emaste, brueffer MFC after: 2 weeks --- share/man/man4/wbwd.4 | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 share/man/man4/wbwd.4 (limited to 'share') diff --git a/share/man/man4/wbwd.4 b/share/man/man4/wbwd.4 new file mode 100644 index 0000000..2b24fab --- /dev/null +++ b/share/man/man4/wbwd.4 @@ -0,0 +1,117 @@ +.\"- +.\" Copyright (c) 2012 Bjoern A. Zeeb +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd March 6, 2012 +.Dt wbwd 4 +.Os +.Sh NAME +.Nm wbwd +.Nd device driver for watchdog timer found on Winbond Super I/O chips +.Sh SYNOPSIS +To compile this driver into the kernel, place the following line in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device wbwd" +.Ed +.Pp +Alternatively, to load the driver as a module at boot time, place the following +line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +wbwd_load="YES" +.Ed +.Pp +In +.Pa /boot/device.hints : +.Cd hint.wbwd.0.at="isa" +.Sh DESCRIPTION +The +.Nm +driver provides +.Xr watchdog 4 +support for the watchdog interrupt timer present on at least the following +Winbond Super I/O chips: +.Pp +.Bl -bullet -compact +.It +83627HF/F/HG/G Rev. G +.It +83627HF/F/HG/G Rev. J +.It +83627HF/F/HG/G Rev. UD-A +.It +83627DHG IC ver. 5 +.El +.Sh SYSCTL VARIABLES +The +.Nm +driver provides the following options as +.Xr sysctl 8 +variables. +.Bl -tag -width "xxxxxx" +.It Va dev.wbwd.0.timeout_override +This variable allows to program the timer to a value independent on the one +provided by the +.Xr watchdog 4 +framework while still relying on the regular updates from e.g. +.Xr watchdogd 8 . +This is particularly useful if your system provides multiple watchdogs and +you want them to fire in a special sequence to trigger an NMI after a shorter +period than the reset timeout for example. +The value set must not be lower than the sleep time of +.Xr watchdogd 8 . +A value of 0 disables this feature and the timeout value provided by +.Xr watchdog 4 +will be used. +.It Va dev.wbwd.0.debug_verbose +If set this sysctl will tell the driver to log its current state before and +after the timer reset on each invocation from +.Xr watchdog 9 +to the kernel message buffer for debugging. +.It Va dev.wbwd.0.debug +This read-only value gives the state of some registers on last update. +.El +.Pp +The +.Nm +driver also provides further sysctl options that are hidden by default. +See the source code for more information. +.Sh SEE ALSO +.Xr watchdog 4 , +.Xr device.hints 5 , +.Xr watchdog 8 , +.Xr watchdogd 8 , +.Xr watchdog 9 +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 10.0 . +.Sh AUTHORS +.An -nosplit +This manual page was written by +.An Bjoern A. Zeeb Aq bz@FreeBSD.org . -- cgit v1.1 From 0d910635b103117f4f090aa846bfa2a69717d257 Mon Sep 17 00:00:00 2001 From: pluknet Date: Wed, 7 Mar 2012 09:42:19 +0000 Subject: Update ifa_rtrequest() description after post-4.4BSD change made in r85074. 3rd argument of ifa->ifa_rtrequest is now ``rt_addrinfo *'' instead of ``sockaddr *''. While here, un-document RTM_RESOLVE cmd argument for ifa_rtrequest() that became a stub after separating L2 tables in r186119. MFC after: 1 week --- share/man/man9/ifnet.9 | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index b439623..6c2424e 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 2, 2012 +.Dd March 7, 2012 .Dt IFNET 9 .Os .Sh NAME @@ -122,7 +122,7 @@ .Ss "struct ifaddr member function" .Ft void .Fo \*(lp*ifa_rtrequest\*(rp -.Fa "int cmd" "struct rtentry *rt" "struct sockaddr *dst" +.Fa "int cmd" "struct rtentry *rt" "struct rt_addrinfo *info" .Fc .\" .Ss "Global Variables" @@ -1016,22 +1016,19 @@ function. is a pointer to a function which receives callouts from the routing code .Pq Fn rtrequest -to perform link-layer-specific actions upon requests to add, resolve, +to perform link-layer-specific actions upon requests to add, or delete routes. The .Fa cmd argument indicates the request in question: -.Dv RTM_ADD , RTM_RESOLVE , +.Dv RTM_ADD , or .Dv RTM_DELETE . The .Fa rt argument is the route in question; the -.Fa dst -argument is the specific destination being manipulated -for -.Dv RTM_RESOLVE , -or a null pointer otherwise. +.Fa info +argument contains the specific destination being manipulated. .Sh FUNCTIONS The functions provided by the generic interface code can be divided into two groups: those which manipulate interfaces, and those which -- cgit v1.1 From 244addf1dd867a0b7f1c0bb46cd0f22f3f38f478 Mon Sep 17 00:00:00 2001 From: pluknet Date: Wed, 7 Mar 2012 11:29:43 +0000 Subject: Reflect that if_output changed to take a struct route as its fourth argument (r191148). MFC after: 1 week --- share/man/man9/ifnet.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 6c2424e..155ee6e 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -103,7 +103,7 @@ .Ft int .Fo \*(lp*if_output\*(rp .Fa "struct ifnet *ifp" "struct mbuf *m" -.Fa "struct sockaddr *dst" "struct rtentry *rt" +.Fa "struct sockaddr *dst" "struct route *ro" .Fc .Ft void .Fn \*(lp*if_start\*(rp "struct ifnet *ifp" -- cgit v1.1 From 770a90e5697987a66071d29c6a7b556a7f295639 Mon Sep 17 00:00:00 2001 From: maxim Date: Wed, 7 Mar 2012 14:50:14 +0000 Subject: o Sync LOCK_PROFILING manpage with the current code: remove unexistent sysctls, add new ones. Reviewed by: gjb Sponsored by: Nginx, Inc. --- share/man/man9/LOCK_PROFILING.9 | 36 +++++++++--------------------------- 1 file changed, 9 insertions(+), 27 deletions(-) (limited to 'share') diff --git a/share/man/man9/LOCK_PROFILING.9 b/share/man/man9/LOCK_PROFILING.9 index 94b2246..d64b328 100644 --- a/share/man/man9/LOCK_PROFILING.9 +++ b/share/man/man9/LOCK_PROFILING.9 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 11, 2006 +.Dd March 7, 2012 .Dt LOCK_PROFILING 9 .Os .Sh NAME @@ -82,32 +82,6 @@ Enable or disable the lock profiling code. This defaults to 0 (off). .It Va debug.lock.prof.reset Reset the current lock profiling buffers. -.It Va debug.lock.prof.acquisitions -The total number of lock acquisitions recorded. -.It Va debug.lock.prof.records -The total number of acquisition points recorded. -Note that only active acquisition points (i.e., points that have been -reached at least once) are counted. -.It Va debug.lock.prof.maxrecords -The maximum number of acquisition points the profiling code is capable -of monitoring. -Since it would not be possible to call -.Xr malloc 9 -from within the lock profiling code, this is a static limit. -The number of records can be changed with the -.Dv LPROF_BUFFERS -kernel option. -.It Va debug.lock.prof.rejected -The number of acquisition points that were ignored after the table -filled up. -.It Va debug.lock.prof.hashsize -The size of the hash table used to map acquisition points to -statistics records. -The hash size can be changed with the -.Dv LPROF_HASH_SIZE -kernel option. -.It Va debug.lock.prof.collisions -The number of hash collisions in the acquisition point hash table. .It Va debug.lock.prof.stats The actual profiling statistics in plain text. The columns are as follows, from left to right: @@ -138,6 +112,14 @@ reached. The name of the acquisition point, derived from the source file name and line number, followed by the name of the lock in parentheses. .El +.It Va debug.lock.prof.rejected +The number of acquisition points that were ignored after the table +filled up. +.It Va debug.lock.prof.skipspin +Disable or enable the lock profiling code for the spin locks. +This defaults to 0 (do profiling for the spin locks). +.It Va debug.lock.prof.skipcount +Do sampling approximately every N lock acquisitions. .El .Sh SEE ALSO .Xr sysctl 8 , -- cgit v1.1 From e68655dbd3f2a55d7d30f58921dbcabea0043d2e Mon Sep 17 00:00:00 2001 From: pluknet Date: Wed, 7 Mar 2012 14:53:53 +0000 Subject: Move struct if_data basic description to a more suitable place, and remove a bit of .Bx 4.4 history. MFC after: 1 week --- share/man/man9/ifnet.9 | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 155ee6e..f9d56fe 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -181,13 +181,7 @@ return pointers to these structures. Each interface structure contains an .Vt if_data -structure, which contains statistics and identifying information used -by management programs, and which is exported to user programs by way -of the -.Xr ifmib 4 -branch of the -.Xr sysctl 3 -MIB. +structure used for statistics and information. Each interface also has a .Li TAILQ of interface addresses, described by @@ -734,14 +728,15 @@ is marked or cleared in the interface's .Va if_flags to indicate the current mode of the interface. .Ss The Vt if_data Ss Structure -In -.Bx 4.4 , -a subset of the interface information believed to be of interest to -management stations was segregated from the -.Vt ifnet -structure and moved into its own +The .Vt if_data -structure to facilitate its use by user programs. +structure contains statistics and identifying information used +by management programs, and which is exported to user programs by way +of the +.Xr ifmib 4 +branch of the +.Xr sysctl 3 +MIB. The following elements of the .Vt if_data structure are initialized by the interface and are not expected to change -- cgit v1.1 From 0533ed0221acc30262db173d17d49fa974693d3d Mon Sep 17 00:00:00 2001 From: emaste Date: Thu, 8 Mar 2012 01:37:01 +0000 Subject: Inbound TCP-MD5 digest validation is now supported --- share/man/man4/tcp.4 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index 34c2a28..01995e3 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -38,7 +38,7 @@ .\" From: @(#)tcp.4 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd February 5, 2012 +.Dd March 7, 2012 .Dt TCP 4 .Os .Sh NAME @@ -255,8 +255,9 @@ or the internal send buffer is filled. .It Dv TCP_MD5SIG This option enables the use of MD5 digests (also known as TCP-MD5) on writes to the specified socket. -In the current release, only outgoing traffic is digested; -digests on incoming traffic are not verified. +Outgoing traffic is digested; +digests on incoming traffic are verified +if the net.inet.tcp.signature_verify_input sysctl is nonzero. The current default behavior for the system is to respond to a system advertising this option with TCP-MD5; this may change. .Pp -- cgit v1.1 From fd7603d60b423c07ff1d83eb2019c0e8ffce1673 Mon Sep 17 00:00:00 2001 From: hselasky Date: Thu, 8 Mar 2012 07:22:41 +0000 Subject: Add new USB device IDs. PR: usb/165815 MFC after: 1 week --- share/man/man4/u3g.4 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/man/man4/u3g.4 b/share/man/man4/u3g.4 index d65c2c8..74eb0d6 100644 --- a/share/man/man4/u3g.4 +++ b/share/man/man4/u3g.4 @@ -63,6 +63,8 @@ Option GT 3G, GT 3G Quad, etc. .It Vodafone Mobile Connect Card 3G .It +Vodafone Mobile Broadband K3772-Z +.It Qualcomm Inc. CDMA MSM .It Huawei B190, E180v, E220 ('') -- cgit v1.1 From 486b631cb38cbd91bd7a8f6ab87a6d0ecdf7a8ac Mon Sep 17 00:00:00 2001 From: emaste Date: Thu, 8 Mar 2012 15:27:29 +0000 Subject: Correct markup, use proper reference for sysctl(3) Submitted by: brueffer@ --- share/man/man4/tcp.4 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index 01995e3..cd6516a 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -256,8 +256,10 @@ or the internal send buffer is filled. This option enables the use of MD5 digests (also known as TCP-MD5) on writes to the specified socket. Outgoing traffic is digested; -digests on incoming traffic are verified -if the net.inet.tcp.signature_verify_input sysctl is nonzero. +digests on incoming traffic are verified if the +.Va net.inet.tcp.signature_verify_input +.Xr sysctl 3 +is nonzero. The current default behavior for the system is to respond to a system advertising this option with TCP-MD5; this may change. .Pp -- cgit v1.1 From 3304bedba6930de0211db21f42642d5a0f4108b5 Mon Sep 17 00:00:00 2001 From: emaste Date: Fri, 9 Mar 2012 15:25:27 +0000 Subject: Remove undesired sysctl(3) xref Submitted by: bde --- share/man/man4/tcp.4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index cd6516a..a33e8fb 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -258,8 +258,7 @@ on writes to the specified socket. Outgoing traffic is digested; digests on incoming traffic are verified if the .Va net.inet.tcp.signature_verify_input -.Xr sysctl 3 -is nonzero. +sysctl is nonzero. The current default behavior for the system is to respond to a system advertising this option with TCP-MD5; this may change. .Pp -- cgit v1.1 From 56a05ae5138b6f5d7fc05fc2aed40e76b2d58213 Mon Sep 17 00:00:00 2001 From: jkim Date: Fri, 9 Mar 2012 23:30:30 +0000 Subject: Make boot2 build with Clang again. Submitted by: dim (bsd.sys.mk) Reviewed by: dim, jhb --- share/mk/bsd.sys.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 401e671..a8770cc7 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -100,8 +100,10 @@ CWARNFLAGS += -Wno-unknown-pragmas .if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" CLANG_NO_IAS = -no-integrated-as -CLANG_OPT_SMALL = -mllvm -stack-alignment=8 -mllvm -inline-threshold=3 \ - -mllvm -enable-load-pre=false +CLANG_OPT_SMALL = -mllvm -stack-alignment=8 \ + -mllvm -inline-threshold=3 \ + -mllvm -enable-load-pre=false \ + -mllvm -simplifycfg-dup-ret .endif .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \ -- cgit v1.1 From 5b5fc4e5856d75a0cda38add225366a3d7ff0035 Mon Sep 17 00:00:00 2001 From: mav Date: Tue, 13 Mar 2012 10:21:08 +0000 Subject: Add kern.eventtimer.activetick tunable/sysctl, specifying whether each hardclock() tick should be run on every active CPU, or on only one. On my tests, avoiding extra interrupts because of this on 8-CPU Core i7 system with HZ=10000 saves about 2% of performance. At this moment option implemented only for global timers, as reprogramming per-CPU timers is too expensive now to be compensated by this benefit, especially since we still have to regularly run hardclock() on at least one active CPU to update system uptime. For global timer it is quite trivial: timer runs always, but we just skip IPIs to other CPUs when possible. Option is enabled by default now, keeping previous behavior, as periodic hardclock() calls are still used at least to implement setitimer(2) with ITIMER_VIRTUAL and ITIMER_PROF arguments. But since default schedulers don't depend on it since r232917, we are much more free to experiment with it. MFC after: 1 month --- share/man/man4/eventtimers.4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/eventtimers.4 b/share/man/man4/eventtimers.4 index c935c3e..88ed860 100644 --- a/share/man/man4/eventtimers.4 +++ b/share/man/man4/eventtimers.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 15, 2010 +.Dd March 13, 2012 .Dt EVENTTIMERS 4 .Os .Sh NAME @@ -143,6 +143,12 @@ By default this options is disabled. If chosen timer is per-CPU and runs in periodic mode, this option has no effect - all interrupts are always generating. +.It Va kern.eventtimer.activetick +makes each CPU to receive all kinds of timer interrupts when they are busy. +Disabling it allows to skip some hardclock() calls in some cases. +By default this options is enabled. +If chosen timer is per-CPU, this option has no effect - all interrupts are +always generating, as timer reprogramming is too expensive for that case. .El .Sh SEE ALSO .Xr apic 4 , -- cgit v1.1 From 6305fd59a4505072cad584c3109fa95086c6a1bf Mon Sep 17 00:00:00 2001 From: mav Date: Tue, 13 Mar 2012 10:54:14 +0000 Subject: Some formatting for r232919. Submitted by: pluknet --- share/man/man4/eventtimers.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/eventtimers.4 b/share/man/man4/eventtimers.4 index 88ed860..4db4420 100644 --- a/share/man/man4/eventtimers.4 +++ b/share/man/man4/eventtimers.4 @@ -145,7 +145,9 @@ and runs in periodic mode, this option has no effect - all interrupts are always generating. .It Va kern.eventtimer.activetick makes each CPU to receive all kinds of timer interrupts when they are busy. -Disabling it allows to skip some hardclock() calls in some cases. +Disabling it allows to skip some +.Fn hardclock +calls in some cases. By default this options is enabled. If chosen timer is per-CPU, this option has no effect - all interrupts are always generating, as timer reprogramming is too expensive for that case. -- cgit v1.1 From aea001420fce825e57c60c48acf0f16094bc782b Mon Sep 17 00:00:00 2001 From: davidxu Date: Fri, 16 Mar 2012 05:05:37 +0000 Subject: Add implementation note about when a condition variable can be destroyed. --- share/man/man3/pthread_cond_destroy.3 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'share') diff --git a/share/man/man3/pthread_cond_destroy.3 b/share/man/man3/pthread_cond_destroy.3 index ca435ea..39eff9d 100644 --- a/share/man/man3/pthread_cond_destroy.3 +++ b/share/man/man3/pthread_cond_destroy.3 @@ -63,6 +63,9 @@ The variable .Fa cond is locked by another thread. .El +.Sh IMPLEMENTATION NOTES +A condition variable can be destroyed immediately after all the threads that +are blocked on it are awakened. .Sh SEE ALSO .Xr pthread_cond_broadcast 3 , .Xr pthread_cond_init 3 , -- cgit v1.1 From 36e49518fe7bd1bcbdcb73b8b11402442c37e145 Mon Sep 17 00:00:00 2001 From: dim Date: Fri, 16 Mar 2012 23:19:45 +0000 Subject: Change the style of share/mk/bsd.sys.mk to that of the other bsd.*.mk files, and style.Makefile(5), where applicable. While here, update the link to the gcc warning documentation. No functional change. MFC after: 1 week --- share/mk/bsd.sys.mk | 169 ++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 84 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index a8770cc7..22834aa 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -6,112 +6,113 @@ # Enable various levels of compiler warning checks. These may be # overridden (e.g. if using a non-gcc compiler) by defining NO_WARNS. -# for GCC: http://gcc.gnu.org/onlinedocs/gcc-3.0.4/gcc_3.html#IDX143 +# for GCC: http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Warning-Options.html # the default is gnu99 for now -CSTD ?= gnu99 +CSTD?= gnu99 .if ${CSTD} == "k&r" -CFLAGS += -traditional +CFLAGS+= -traditional .elif ${CSTD} == "c89" || ${CSTD} == "c90" -CFLAGS += -std=iso9899:1990 +CFLAGS+= -std=iso9899:1990 .elif ${CSTD} == "c94" || ${CSTD} == "c95" -CFLAGS += -std=iso9899:199409 +CFLAGS+= -std=iso9899:199409 .elif ${CSTD} == "c99" -CFLAGS += -std=iso9899:1999 -.else -CFLAGS += -std=${CSTD} -.endif +CFLAGS+= -std=iso9899:1999 +.else # CSTD +CFLAGS+= -std=${CSTD} +.endif # CSTD .if !defined(NO_WARNS) # -pedantic is problematic because it also imposes namespace restrictions -#CFLAGS += -pedantic -. if defined(WARNS) -. if ${WARNS} >= 1 -CWARNFLAGS += -Wsystem-headers -. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) -CWARNFLAGS += -Werror -. endif -. endif -. if ${WARNS} >= 2 -CWARNFLAGS += -Wall -Wno-format-y2k -. endif -. if ${WARNS} >= 3 -CWARNFLAGS += -W -Wno-unused-parameter -Wstrict-prototypes\ - -Wmissing-prototypes -Wpointer-arith -. endif -. if ${WARNS} >= 4 -CWARNFLAGS += -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch\ - -Wshadow -Wunused-parameter -. if !defined(NO_WCAST_ALIGN) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WCAST_ALIGN.clang)) -CWARNFLAGS += -Wcast-align -. endif -. endif +#CFLAGS+= -pedantic +.if defined(WARNS) +.if ${WARNS} >= 1 +CWARNFLAGS+= -Wsystem-headers +.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \ + ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) +CWARNFLAGS+= -Werror +.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) +.endif # WARNS >= 1 +.if ${WARNS} >= 2 +CWARNFLAGS+= -Wall -Wno-format-y2k +.endif # WARNS >= 2 +.if ${WARNS} >= 3 +CWARNFLAGS+= -W -Wno-unused-parameter -Wstrict-prototypes\ + -Wmissing-prototypes -Wpointer-arith +.endif # WARNS >= 3 +.if ${WARNS} >= 4 +CWARNFLAGS+= -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow\ + -Wunused-parameter +.if !defined(NO_WCAST_ALIGN) && ((${MK_CLANG_IS_CC} == "no" && \ + ${CC:T:Mclang} != "clang") || !defined(NO_WCAST_ALIGN.clang)) +CWARNFLAGS+= -Wcast-align +.endif # !NO_WCAST_ALIGN && (!CLANG || !NO_WCAST_ALIGN.clang) +.endif # WARNS >= 4 # BDECFLAGS -. if ${WARNS} >= 6 -CWARNFLAGS += -Wchar-subscripts -Winline -Wnested-externs\ - -Wredundant-decls -Wold-style-definition -. endif -. if ${WARNS} >= 2 && ${WARNS} <= 4 +.if ${WARNS} >= 6 +CWARNFLAGS+= -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls\ + -Wold-style-definition +.endif # WARNS >= 6 +.if ${WARNS} >= 2 && ${WARNS} <= 4 # XXX Delete -Wuninitialized by default for now -- the compiler doesn't # XXX always get it right. -CWARNFLAGS += -Wno-uninitialized -. endif -CWARNFLAGS += -Wno-pointer-sign +CWARNFLAGS+= -Wno-uninitialized +.endif # WARNS >=2 && WARNS <= 4 +CWARNFLAGS+= -Wno-pointer-sign # Clang has more warnings enabled by default, and when using -Wall, so if WARNS # is set to low values, these have to be disabled explicitly. -. if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" -. if ${WARNS} <= 3 -CWARNFLAGS += -Wno-tautological-compare -Wno-unused-value\ - -Wno-parentheses-equality -Wno-unused-function\ - -Wno-conversion -. endif -. if ${WARNS} <= 2 -CWARNFLAGS += -Wno-switch-enum -Wno-empty-body -. endif -. if ${WARNS} <= 1 -CWARNFLAGS += -Wno-parentheses -. endif -. if defined(NO_WARRAY_BOUNDS) -CWARNFLAGS += -Wno-array-bounds -. endif -. endif -. endif +.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" +.if ${WARNS} <= 3 +CWARNFLAGS+= -Wno-tautological-compare -Wno-unused-value\ + -Wno-parentheses-equality -Wno-unused-function -Wno-conversion +.endif # WARNS <= 3 +.if ${WARNS} <= 2 +CWARNFLAGS+= -Wno-switch-enum -Wno-empty-body +.endif # WARNS <= 2 +.if ${WARNS} <= 1 +CWARNFLAGS+= -Wno-parentheses +.endif # WARNS <= 1 +.if defined(NO_WARRAY_BOUNDS) +CWARNFLAGS+= -Wno-array-bounds +.endif # NO_WARRAY_BOUNDS +.endif # CLANG +.endif # WARNS -. if defined(FORMAT_AUDIT) -WFORMAT = 1 -. endif -. if defined(WFORMAT) -. if ${WFORMAT} > 0 -#CWARNFLAGS += -Wformat-nonliteral -Wformat-security -Wno-format-extra-args -CWARNFLAGS += -Wformat=2 -Wno-format-extra-args -. if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) -CWARNFLAGS += -Werror -. endif -. endif -. endif -. if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && defined(NO_WFORMAT.clang)) -CWARNFLAGS += -Wno-format -. endif -.endif +.if defined(FORMAT_AUDIT) +WFORMAT= 1 +.endif # FORMAT_AUDIT +.if defined(WFORMAT) +.if ${WFORMAT} > 0 +#CWARNFLAGS+= -Wformat-nonliteral -Wformat-security -Wno-format-extra-args +CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args +.if !defined(NO_WERROR) && ((${MK_CLANG_IS_CC} == "no" && \ + ${CC:T:Mclang} != "clang") || !defined(NO_WERROR.clang)) +CWARNFLAGS+= -Werror +.endif # !NO_WERROR && (!CLANG || !NO_WERROR.clang) +.endif # WFORMAT > 0 +.endif # WFORMAT +.if defined(NO_WFORMAT) || ((${MK_CLANG_IS_CC} != "no" || \ + ${CC:T:Mclang} == "clang") && defined(NO_WFORMAT.clang)) +CWARNFLAGS+= -Wno-format +.endif # NO_WFORMAT || (CLANG && NO_WFORMAT.clang) +.endif # !NO_WARNS .if defined(IGNORE_PRAGMA) -CWARNFLAGS += -Wno-unknown-pragmas -.endif +CWARNFLAGS+= -Wno-unknown-pragmas +.endif # IGNORE_PRAGMA .if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" -CLANG_NO_IAS = -no-integrated-as -CLANG_OPT_SMALL = -mllvm -stack-alignment=8 \ - -mllvm -inline-threshold=3 \ - -mllvm -enable-load-pre=false \ - -mllvm -simplifycfg-dup-ret -.endif +CLANG_NO_IAS= -no-integrated-as +CLANG_OPT_SMALL= -mllvm -stack-alignment=8 -mllvm -inline-threshold=3\ + -mllvm -enable-load-pre=false -mllvm -simplifycfg-dup-ret +.endif # CLANG .if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \ ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" # Don't use -Wstack-protector as it breaks world with -Werror. -SSP_CFLAGS ?= -fstack-protector -CFLAGS += ${SSP_CFLAGS} -.endif +SSP_CFLAGS?= -fstack-protector +CFLAGS+= ${SSP_CFLAGS} +.endif # SSP && !IA64 && !ARM && !MIPS # Allow user-specified additional warning flags -CFLAGS += ${CWARNFLAGS} +CFLAGS+= ${CWARNFLAGS} -- cgit v1.1 From a53812d462c6768c71d5b3c15d9e52f437d17b4c Mon Sep 17 00:00:00 2001 From: maxim Date: Mon, 19 Mar 2012 19:25:22 +0000 Subject: o Trim EoL whitespaces. --- share/man/man4/tcp.4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index a33e8fb..e961124 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -147,7 +147,7 @@ See .Xr mod_cc 4 for details. .It Dv TCP_KEEPINIT -This write-only +This write-only .Xr setsockopt 2 option accepts a per-socket timeout argument of .Vt "u_int" @@ -160,7 +160,7 @@ in the .Sx MIB Variables section further down. .It Dv TCP_KEEPIDLE -This write-only +This write-only .Xr setsockopt 2 option accepts an argument of .Vt "u_int" @@ -176,7 +176,7 @@ in the .Sx MIB Variables section further down. .It Dv TCP_KEEPINTVL -This write-only +This write-only .Xr setsockopt 2 option accepts an argument of .Vt "u_int" @@ -191,7 +191,7 @@ in the .Sx MIB Variables section further down. .It Dv TCP_KEEPCNT -This write-only +This write-only .Xr setsockopt 2 option accepts an argument of .Vt "u_int" -- cgit v1.1 From c7d36dddc754917de5eec13cf322775709d2f008 Mon Sep 17 00:00:00 2001 From: maxim Date: Mon, 19 Mar 2012 19:27:43 +0000 Subject: o Sort Xrs. --- share/man/man4/siftr.4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/siftr.4 b/share/man/man4/siftr.4 index d8a6e75..08d20e3 100644 --- a/share/man/man4/siftr.4 +++ b/share/man/man4/siftr.4 @@ -598,11 +598,11 @@ To change the log file location to /tmp/siftr.log, run the following command as root: sysctl net.inet.siftr.logfile=/tmp/siftr.log .Sh SEE ALSO +.Xr tcpdump 1 , +.Xr tcp 4 , +.Xr sysctl 8 , .Xr alq 9 , .Xr pfil 9 -.Xr sysctl 8 , -.Xr tcp 4 , -.Xr tcpdump 1 , .Sh ACKNOWLEDGEMENTS Development of this software was made possible in part by grants from the Cisco University Research Program Fund at Community Foundation Silicon Valley, -- cgit v1.1 From b276eae62cc103a99108b3a6ca4d3c7403c48511 Mon Sep 17 00:00:00 2001 From: maxim Date: Tue, 20 Mar 2012 12:24:36 +0000 Subject: o Xr siftr.4 in order to expose it to a wider audience. Reviewed by: lstewart --- share/man/man4/tcp.4 | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4 index e961124..aa2755e 100644 --- a/share/man/man4/tcp.4 +++ b/share/man/man4/tcp.4 @@ -562,6 +562,7 @@ address. .Xr intro 4 , .Xr ip 4 , .Xr mod_cc 4 , +.Xr siftr 4 , .Xr syncache 4 , .Xr setkey 8 .Rs -- cgit v1.1 From 5ca464704bebd9f3940c93dd1072afd303354505 Mon Sep 17 00:00:00 2001 From: pluknet Date: Tue, 20 Mar 2012 16:56:35 +0000 Subject: Update the list of struct ifnet fields. - Document if_vnet, if_home_vnet, if_carp, if_vlantrunk, if_multiaddrs, if_amcount, if_addr, if_llsoftc stub, if_broadcastaddr, if_bridge, if_label, if_afdata, if_afdata_initialized, if_afdata_lock, if_linktask, if_addr_mtx (now if_addr_lock), if_clones, if_groups, if_pf_kif, if_lagg, if_alloctype - G/c now defunct and/or commented out in the manual page if_ipending, if_poll_slowq, if_done, if_poll_recv, if_poll_xmit, if_poll_slowinput, if_poll_intren - Update if_snd type changed with ALTQ integration. MFC after: 1 week --- share/man/man9/ifnet.9 | 147 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 115 insertions(+), 32 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index f9d56fe..61b7419 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 7, 2012 +.Dd March 20, 2012 .Dt IFNET 9 .Os .Sh NAME @@ -229,6 +229,18 @@ A pointer to the driver's private state block. A pointer to the common data for the interface's layer 2 protocol. (Initialized by .Fn if_alloc . ) +.It Va if_vnet +.Pq Vt "struct vnet *" +A pointer to the virtual network stack instance. +(Initialized by +.Fn if_attach . ) +.It Va if_home_vnet +.Pq Vt "struct vnet *" +A pointer to the parent virtual network stack, where this +.Vt "struct ifnet" +originates from. +(Initialized by +.Fn if_attach . ) .It Va if_link .Pq Fn TAILQ_ENTRY ifnet .Xr queue 3 @@ -276,6 +288,13 @@ A count of promiscuous listeners on this interface, used to reference-count the .Dv IFF_PROMISC flag. +.It Va if_carp +.Pq Vt "struct carp_if *" +A pointer to the CARP interface structure, +.Xr carp 4 . +(Initialized by the driver-specific +.Fn if_ioctl +routine.) .It Va if_bpf .Pq Vt "struct bpf_if *" Opaque per-interface data for the packet filter, @@ -293,6 +312,13 @@ to refer to a particular interface by index .Xr link_addr 3 ) . (Initialized by .Fn if_alloc . ) +.It Va if_vlantrunk +.Pq Vt struct ifvlantrunk * +A pointer to 802.1Q trunk structure, +.Xr vlan 4 . +(Initialized by the driver-specific +.Fn if_ioctl +routine.) .It Va if_flags .Pq Vt int Flags describing operational parameters of this interface (see below). @@ -307,17 +333,6 @@ Flags describing the capabilities the interface supports (see below). .It Va if_capenable .Pq Vt int Flags describing the enabled capabilities of the interface (see below). -.\" .It Va if_ipending -.\" Interrupt-pending bits for polled operation: -.\" .Dv IFI_XMIT -.\" (transmit complete interrupt) -.\" and -.\" .Dv IFI_RECV -.\" (received packet ready interrupt). -.\" See the -.\" .Sx Polling -.\" section, below. -.\" (Manipulated by driver.) .It Va if_linkmib .Pq Vt "void *" A pointer to an interface-specific MIB structure exported by @@ -334,18 +349,97 @@ More statistics and information; see below. (Initialized by driver, manipulated by both driver and generic code.) +.It Va if_multiaddrs +.Pq Vt struct ifmultihead +The head of the +.Xr queue 3 +.Li TAILQ +containing the list of multicast addresses assigned to this interface. +.It Va if_amcount +.Pq Vt int +A number of multicast requests on this interface, used to +reference-count the +.Dv IFF_ALLMULTI +flag. +.It Va if_addr +.Pq Vt "struct ifaddr *" +A pointer to the link-level interface address. +(Initialized by +.Fn if_alloc . ) +.\" .It Va if_llsoftc +.\" .Pq Vt "void *" +.\" The purpose of the field is unclear. .It Va if_snd -.Pq Vt "struct ifqueue" +.Pq Vt "struct ifaltq" The output queue. (Manipulated by driver.) -.\".It Va if_poll_slowq -.\".Pq Vt "struct ifqueue *" -.\"A pointer to the input queue for devices which do not support polling -.\"well. -.\"See the -.\".Sx Polling -.\"section, below. -.\"(Initialized by driver.) +.It Va if_broadcastaddr +.Pq Vt "const u_int8_t *" +A link-level broadcast bytestring for protocols with variable address +length. +.It Va if_bridge +.Pq Vt "void *" +A pointer to the bridge interface structure, +.Xr if_bridge 4 . +(Initialized by the driver-specific +.Fn if_ioctl +routine.) +.It Va if_label +.Pq Vt "struct label *" +A pointer to the MAC Framework label structure, +.Xr mac 4 . +(Initialized by +.Fn if_alloc . ) +.It Va if_afdata +.Pq Vt "void *" +An address family dependent data region. +.It Va if_afdata_initialized +.Pq Vt int +Used to track the current state of address family initialization. +.It Va if_afdata_lock +.Pq Vt "struct rwlock" +An +.Xr rwlock 9 +lock used to protect +.Va if_afdata +internals. +.It Va if_linktask +.Pq Vt "struct task" +A +.Xr taskqueue 9 +task scheduled for link state change events of the interface. +.It Va if_addr_lock +.Pq Vt "struct rwlock" +An +.Xr rwlock 9 +lock used to protect interface-related address lists. +.It Va if_clones +.Pq Fn LIST_ENTRY ifnet +.Xr queue 3 +macro glue for the list of clonable network interfaces. +.It Va if_groups +.Pq Fn TAILQ_HEAD ", ifg_list" +The head of the +.Xr queue 3 +.Li TAILQ +containing the list of groups per interface. +.It Va if_pf_kif +.Pq Vt "void *" +A pointer to the structure used for interface abstraction by +.Xr pf 4 . +.It Va if_lagg +.Pq Vt "void *" +A pointer to the +.Xr lagg 4 +interface structure. +.It Va if_alloctype +.Pq Vt u_char +The type of the interface as it was at the time of its allocation. +It is used to cache the type passed to +.Fn if_alloc , +but unlike +.Va if_type , +it would not be changed by drivers. .El .Pp References to @@ -416,10 +510,6 @@ flag is not set. does not literally mean that output is active, but rather that the device's internal output queue is full.) Please note that this function will soon be deprecated. -.It Fn if_done -Not used. -We are not even sure what it was ever for. -The prototype is faked. .It Fn if_ioctl Process interface-related .Xr ioctl 2 @@ -434,13 +524,6 @@ flags and flushing queues. See the description of .Fn ifioctl below for more information. -.\" .It Fn if_poll_recv -.\" .It Fn if_poll_xmit -.\" .It Fn if_poll_slowinput -.\" .It Fn if_poll_intren -.\" See the -.\" .Sx Polling -.\" section, below. .It Fn if_init Initialize and bring up the hardware, e.g., reset the chip and enable the receiver unit. -- cgit v1.1 From 921d391cb5debd25cf72893a1cbbebb8778b5965 Mon Sep 17 00:00:00 2001 From: joel Date: Thu, 22 Mar 2012 16:24:50 +0000 Subject: Update snd_cmi, snd_csa and snd_emu10kx status. --- share/man/man4/pcm.4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index f65eca5..e9bfa6b 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 22, 2012 +.Dd March 22, 2012 .Dt SOUND 4 .Os .Sh NAME @@ -85,11 +85,11 @@ The following bridge device drivers are available: .It .Xr snd_audiocs 4 (enabled by default on sparc64) .It -.Xr snd_cmi 4 +.Xr snd_cmi 4 (enabled by default on amd64, i386) .It .Xr snd_cs4281 4 .It -.Xr snd_csa 4 +.Xr snd_csa 4 (enabled by default on amd64, i386) .It .Xr snd_davbus 4 (enabled by default on powerpc) .It @@ -97,7 +97,7 @@ The following bridge device drivers are available: .It .Xr snd_emu10k1 4 .It -.Xr snd_emu10kx 4 +.Xr snd_emu10kx 4 (enabled by default on amd64, i386) .It .Xr snd_envy24 4 .It -- cgit v1.1 From b7b9f0e6d97e8da9835352c055a69213e77abfb1 Mon Sep 17 00:00:00 2001 From: jkim Date: Thu, 22 Mar 2012 17:01:25 +0000 Subject: Add ACPI_LV_REPAIR debug level, available since ACPICA 20091214 (r200553). MFC after: 3 days --- share/man/man4/acpi.4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4 index e81b373..faedb06 100644 --- a/share/man/man4/acpi.4 +++ b/share/man/man4/acpi.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 20, 2012 +.Dd March 22, 2012 .Dt ACPI 4 .Os .Sh NAME @@ -491,6 +491,8 @@ Initialization progress Stores to objects .It Li ACPI_LV_INFO General information and progress +.It Li ACPI_LV_REPAIR +Repair a common problem with predefined methods .It Li ACPI_LV_ALL_EXCEPTIONS All the previous levels .It Li ACPI_LV_PARSE -- cgit v1.1 From 7bddb0d7f4cf79331080c5b436a762757e1e83b6 Mon Sep 17 00:00:00 2001 From: pluknet Date: Fri, 23 Mar 2012 06:01:16 +0000 Subject: Update IFF_* macro descriptions. MFC after: 1 week --- share/man/man9/ifnet.9 | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 61b7419..7ca602a 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 20, 2012 +.Dd March 23, 2012 .Dt IFNET 9 .Os .Sh NAME @@ -583,6 +583,14 @@ The interface is a loopback device. The interface is point-to-point; .Dq broadcast address is actually the address of the other end. +.It Dv IFF_SMART +.Aq S* +The interface manages its own routes, rather than using the generic +code in +.Fn if_up +and +.Fn if_down . +This is probably useful for serial lines. .It Dv IFF_DRV_RUNNING .Aq D* The interface has been configured and dynamic resources were @@ -619,14 +627,31 @@ multiple physical layers on some devices.) .It Dv IFF_MULTICAST .Aq S* This interface supports multicast. -.It Dv IFF_POLLING +.It Dv IFF_CANTCONFIG +.Aq S* +The interface isn't configurable in a meaningful way. +Primarily useful for +.Dv IFT_USB +interfaces registered at the interface list. +.It Dv IFF_MONITOR +.Aq D +This interface blocks transmission of packets and discards incoming +packets after BPF processing. +Used to monitor network trafic but not interact +with the network in question. +.It Dv IFF_STATICARP +.Aq D +Used to enable/disable ARP requests on this interface. +.It Dv IFF_DYING .Aq D* -The interface is in -.Xr polling 4 -mode. -See -.Sx Interface Capabilities Flags -for details. +Set when the +.Vt ifnet +structure of this interface is being released and still has +.Va if_refcount +references. +.It Dv IFF_RENAMING +.Aq D* +Set when this interface is being renamed. .El .Ss "Interface Capabilities Flags" Interface capabilities are specialized features an interface may -- cgit v1.1 From 0c727773c580bdfaf2d73377a848a1224911c460 Mon Sep 17 00:00:00 2001 From: pluknet Date: Fri, 23 Mar 2012 06:06:37 +0000 Subject: Document IFT_USB referenced by IFF_CANTCONFIG since the previous change, so that ifnet(9) is self contained. MFC after: 1 week --- share/man/man9/ifnet.9 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 7ca602a..2055cb6 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -1026,6 +1026,8 @@ Parallel-port IP .Pq Dq Tn PLIP .It Dv IFT_ATM Asynchronous Transfer Mode +.It Dv IFT_USB +USB Interface .El .Ss Interface Link States The following link states are currently defined: -- cgit v1.1 From 4e698dcf9e2c7d2ecb557b019c1407bea903863f Mon Sep 17 00:00:00 2001 From: pluknet Date: Fri, 23 Mar 2012 10:33:24 +0000 Subject: Clean up from the old kern.polling. Reviewed by: attilio MFC after: 1 week --- share/man/man9/ifnet.9 | 58 +++++++++----------------------------------------- 1 file changed, 10 insertions(+), 48 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 2055cb6..584bd7c 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -798,20 +798,7 @@ The capability of a network interface to operate in .Xr polling 4 mode involves several flags in different global variables and per-interface fields. -First, there is a system-wide -.Xr sysctl 8 -master switch named -.Va kern.polling.enable , -which can toggle -.Xr polling 4 -globally. -If that variable is set to non-zero, -.Xr polling 4 -will be used on those devices where it is enabled individually. -Otherwise, -.Xr polling 4 -will not be used in the system. -Second, the capability flag +The capability flag .Dv IFCAP_POLLING set in interface's .Va if_capabilities @@ -821,20 +808,19 @@ on the particular interface. If set in .Va if_capabilities , the same flag can be marked or cleared in the interface's -.Va if_capenable , +.Va if_capenable +within +.Fn ifioctl , thus initiating switch of the interface to .Xr polling 4 mode or interrupt mode, respectively. -The actual mode change will occur at an implementation-specific moment -in the future, e.g., during the next interrupt or -.Xr polling 4 -cycle. -And finally, if the mode transition has been successful, the flag -.Dv IFF_POLLING -is marked or cleared in the interface's -.Va if_flags -to indicate the current mode of the interface. +The actual mode change is managed by the driver-specific +.Fn if_ioctl +routine. +The +.Xr polling +handler returns the number of packets processed. .Ss The Vt if_data Ss Structure The .Vt if_data @@ -880,18 +866,6 @@ to attempt to ensure that there is always sufficient space to prepend a link-layer header without allocating an additional .Vt mbuf . -.\" (See -.\" .Xr mbuf 9 . ) -.\" .It Va ifi_recvquota -.\" .Pq Vt u_char -.\" Number of packets the interface is permitted to receive at one time -.\" when in polled mode. -.\" .It Va ifi_xmitquota -.\" .Pq Vt u_char -.\" Number of packets the interface is permitted to queue for transmission -.\" at one time when in polled mode. -.\" There is some controversy over -.\" whether such a restriction makes any sense at all. .It Va ifi_datalen .Pq Vt u_char Length of the @@ -972,18 +946,6 @@ Number of packets dropped on input. Rarely implemented. .It Va ifi_noproto Number of packets received for unknown network-layer protocol. -.\" .It Va ifi_recvtiming -.\" Amount of time, in microseconds, spent to receive an average packet on -.\" this interface. -.\" See the -.\" .Sx Polling -.\" section, below. -.\" .It Va ifi_xmittiming -.\" Amount of time, in microseconds, spent to service a transmit-complete -.\" interrupt on this interface. -.\" See the -.\" .Sx Polling -.\" section, below. .It Va ifi_lastchange .Pq Vt "struct timeval" The time of the last administrative change to the interface (as required -- cgit v1.1 From 1d95b215bb82eff2055dd8e467e48e7b83f2c7de Mon Sep 17 00:00:00 2001 From: pluknet Date: Fri, 23 Mar 2012 10:39:50 +0000 Subject: Update IFCAP_* macro descriptions. Reviewed by: attilio (polling part, a previous version) MFC after: 1 week --- share/man/man9/ifnet.9 | 51 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 12 deletions(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 584bd7c..5b4e257 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -685,13 +685,7 @@ Userland code shall use .Xr ioctl 2 . .Pp The following capabilities are currently supported by the system: -.Bl -tag -width ".Dv IFCAP_VLAN_HWTAGGING" -offset indent -.It Dv IFCAP_NETCONS -This interface can be a network console. -.It Dv IFCAP_POLLING -This interface supports -.Xr polling 4 . -See below for details. +.Bl -tag -width ".Dv IFCAP_POLLING_NOCOUNT" -offset indent .It Dv IFCAP_RXCSUM This interface can do checksum validation on receiving data. Some interfaces do not have sufficient buffer storage to store frames @@ -703,9 +697,8 @@ This interface can do checksum calculation on transmitting data. .It Dv IFCAP_HWCSUM A shorthand for .Pq Dv IFCAP_RXCSUM | IFCAP_TXCSUM . -.It Dv IFCAP_VLAN_HWTAGGING -This interface can do VLAN tagging on output and -demultiplex frames by their VLAN tag on input. +.It Dv IFCAP_NETCONS +This interface can be a network console. .It Dv IFCAP_VLAN_MTU The .Xr vlan 4 @@ -715,11 +708,24 @@ without having to decrease MTU on interfaces below 1500 bytes. This implies the ability of this interface to cope with frames somewhat longer than permitted by the Ethernet specification. +.It Dv IFCAP_VLAN_HWTAGGING +This interface can do VLAN tagging on output and +demultiplex frames by their VLAN tag on input. .It Dv IFCAP_JUMBO_MTU This Ethernet interface can transmit and receive frames up to 9000 bytes long. +.It Dv IFCAP_POLLING +This interface supports +.Xr polling 4 . +See below for details. +.It Dv IFCAP_VLAN_HWCSUM +This interface can do checksum calculation on both transmitting +and receiving data on +.Xr vlan 4 +interfaces (implies +.Dv IFCAP_HWCSUM ) . .It Dv IFCAP_TSO4 -This Ethernet interface supports TCP Segmentation offloading. +This Ethernet interface supports TCP4 Segmentation offloading. .It Dv IFCAP_TSO6 This Ethernet interface supports TCP6 Segmentation offloading. .It Dv IFCAP_TSO @@ -729,7 +735,7 @@ A shorthand for This Ethernet interface supports TCP offloading. .It Dv IFCAP_TOE6 This Ethernet interface supports TCP6 offloading. -.It Dv ICAP_TOE +.It Dv IFCAP_TOE A shorthand for .Pq Dv IFCAP_TOE4 | IFCAP_TOE6 . .It Dv IFCAP_WOL_UCAST @@ -743,6 +749,27 @@ as those sent by .It Dv IFCAP_WOL A shorthand for .Pq Dv IFCAP_WOL_UCAST | IFCAP_WOL_MCAST | IFCAP_WOL_MAGIC . +.It Dv IFCAP_TOE4 +This Ethernet interface supports TCP4 Offload Engine. +.It Dv IFCAP_TOE6 +This Ethernet interface supports TCP6 Offload Engine. +.It Dv IFCAP_TOE +A shorthand for +.Pq Dv IFCAP_TOE4 | IFCAP_TOE6 . +.It Dv IFCAP_VLAN_HWFILTER +This interface supports frame filtering in hardware on +.Xr vlan 4 +interfaces. +.It Dv IFCAP_POLLING_NOCOUNT +The return value for the number of processed packets should be +skipped for this interface. +.It Dv IFCAP_VLAN_HWTSO +This interface supports TCP Segmentation offloading on +.Xr vlan 4 +interfaces (implies +.Dv IFCAP_TSO ) . +.It Dv IFCAP_LINKSTATE +This Ethernet interface supports dynamic link state changes. .El .Pp The ability of advanced network interfaces to offload certain -- cgit v1.1 From 6a38dcaba9004d2df7ab8d3e81ef28bc712e864a Mon Sep 17 00:00:00 2001 From: pluknet Date: Fri, 23 Mar 2012 16:24:07 +0000 Subject: Expand contraction. Spotted by: bjk --- share/man/man9/ifnet.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index 5b4e257..dd4fdf5 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -629,7 +629,7 @@ multiple physical layers on some devices.) This interface supports multicast. .It Dv IFF_CANTCONFIG .Aq S* -The interface isn't configurable in a meaningful way. +The interface is not configurable in a meaningful way. Primarily useful for .Dv IFT_USB interfaces registered at the interface list. -- cgit v1.1 From 1994f885d3a28d7f220a6843465ea8a672012003 Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 24 Mar 2012 13:37:57 +0000 Subject: Remove superfluous paragraph macro. --- share/man/man4/acpi_hp.4 | 1 - share/man/man4/adv.4 | 3 --- share/man/man4/ahc.4 | 1 - share/man/man4/atkbd.4 | 1 - share/man/man4/bridge.4 | 1 - share/man/man4/cas.4 | 1 - share/man/man4/cc_vegas.4 | 2 -- share/man/man4/cy.4 | 1 - share/man/man4/dpms.4 | 1 - share/man/man4/ed.4 | 1 - share/man/man4/em.4 | 1 - share/man/man4/epair.4 | 1 - share/man/man4/fdc.4 | 1 - share/man/man4/fwohci.4 | 1 - share/man/man4/gem.4 | 1 - share/man/man4/geom_fox.4 | 1 - share/man/man4/geom_uzip.4 | 1 - share/man/man4/hptiop.4 | 1 - share/man/man4/igb.4 | 1 - share/man/man4/ip.4 | 2 -- share/man/man4/isp.4 | 1 - share/man/man4/man4.powerpc/bm.4 | 2 -- share/man/man4/man4.powerpc/snd_ai2s.4 | 2 -- share/man/man4/man4.powerpc/snd_davbus.4 | 2 -- share/man/man4/netmap.4 | 3 --- share/man/man4/ng_netflow.4 | 1 - share/man/man4/nvram2env.4 | 1 - share/man/man4/oce.4 | 1 - share/man/man4/ppbus.4 | 3 --- share/man/man4/snd_emu10kx.4 | 2 -- share/man/man4/snd_hda.4 | 3 --- share/man/man4/u3g.4 | 1 - share/man/man7/mailaddr.7 | 6 ------ share/man/man9/DB_COMMAND.9 | 1 - share/man/man9/fail.9 | 1 - share/man/man9/lock.9 | 1 - share/man/man9/locking.9 | 1 - share/man/man9/make_dev.9 | 1 - 38 files changed, 57 deletions(-) (limited to 'share') diff --git a/share/man/man4/acpi_hp.4 b/share/man/man4/acpi_hp.4 index 031d850..02bf346 100644 --- a/share/man/man4/acpi_hp.4 +++ b/share/man/man4/acpi_hp.4 @@ -244,7 +244,6 @@ Set maximum detail level for /dev/hpcmi output: .Bd -literal -offset indent sysctl dev.acpi_hp.0.cmi_detail=7 .Ed -.Pp .Sh SEE ALSO .Xr acpi 4 , .Xr acpi_wmi 4 , diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4 index 76e37a7..178bae1 100644 --- a/share/man/man4/adv.4 +++ b/share/man/man4/adv.4 @@ -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 i542 SpeedMaster. 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 240 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): diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4 index 6bdbb56..e7eed2d 100644 --- a/share/man/man4/ahc.4 +++ b/share/man/man4/ahc.4 @@ -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" diff --git a/share/man/man4/atkbd.4 b/share/man/man4/atkbd.4 index 73831c2..17ccef5 100644 --- a/share/man/man4/atkbd.4 +++ b/share/man/man4/atkbd.4 @@ -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 diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4 index 9bb8539..09e1dad 100644 --- a/share/man/man4/bridge.4 +++ b/share/man/man4/bridge.4 @@ -167,7 +167,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 diff --git a/share/man/man4/cas.4 b/share/man/man4/cas.4 index cc050c9..c2fe894 100644 --- a/share/man/man4/cas.4 +++ b/share/man/man4/cas.4 @@ -70,7 +70,6 @@ Selecting an MTU larger than 1500 bytes with the .Xr ifconfig 8 utility configures the adapter to receive and transmit Jumbo Frames. .Sh HARDWARE -.Pp The chips supported by the .Nm driver are: diff --git a/share/man/man4/cc_vegas.4 b/share/man/man4/cc_vegas.4 index 13a3fe0..a7397d5 100644 --- a/share/man/man4/cc_vegas.4 +++ b/share/man/man4/cc_vegas.4 @@ -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 the connection. .Pp The algorithm aims to keep diff between two parameters alpha and beta, such that: -.Pp .Bl -item -offset indent .It alpha < diff < beta diff --git a/share/man/man4/cy.4 b/share/man/man4/cy.4 index 0797473..3ad479f 100644 --- a/share/man/man4/cy.4 +++ b/share/man/man4/cy.4 @@ -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" diff --git a/share/man/man4/dpms.4 b/share/man/man4/dpms.4 index 2412b47..7f7af3e 100644 --- a/share/man/man4/dpms.4 +++ b/share/man/man4/dpms.4 @@ -50,7 +50,6 @@ it restores the display to its state when the driver was first loaded. .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, diff --git a/share/man/man4/ed.4 b/share/man/man4/ed.4 index 7ca8258..bfa5972 100644 --- a/share/man/man4/ed.4 +++ b/share/man/man4/ed.4 @@ -414,7 +414,6 @@ dropped packets during heavy network traffic. 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 diff --git a/share/man/man4/em.4 b/share/man/man4/em.4 index 8213b98..9098b75 100644 --- a/share/man/man4/em.4 +++ b/share/man/man4/em.4 @@ -242,7 +242,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" diff --git a/share/man/man4/epair.4 b/share/man/man4/epair.4 index 715fffe..8787727 100644 --- a/share/man/man4/epair.4 +++ b/share/man/man4/epair.4 @@ -97,7 +97,6 @@ one end of the interface pair can also be part of another (virtual) LAN. 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 , diff --git a/share/man/man4/fdc.4 b/share/man/man4/fdc.4 index 9ee9561..7fadf0a 100644 --- a/share/man/man4/fdc.4 +++ b/share/man/man4/fdc.4 @@ -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 diff --git a/share/man/man4/fwohci.4 b/share/man/man4/fwohci.4 index 417aa54..aa9aff3 100644 --- a/share/man/man4/fwohci.4 +++ b/share/man/man4/fwohci.4 @@ -60,7 +60,6 @@ section for detail), put the following line in .Bd -literal -offset indent hw.firewire.phydma_enable=0 .Ed -.Pp .Sh HARDWARE The .Nm diff --git a/share/man/man4/gem.4 b/share/man/man4/gem.4 index 3a3f081..213eb74 100644 --- a/share/man/man4/gem.4 +++ b/share/man/man4/gem.4 @@ -61,7 +61,6 @@ support for the reception and transmission of extended frames for .Xr vlan 4 and a 512-bit multicast hash filter. .Sh HARDWARE -.Pp Chips supported by the .Nm driver include: diff --git a/share/man/man4/geom_fox.4 b/share/man/man4/geom_fox.4 index 76fd0b9..8010d24 100644 --- a/share/man/man4/geom_fox.4 +++ b/share/man/man4/geom_fox.4 @@ -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 diff --git a/share/man/man4/geom_uzip.4 b/share/man/man4/geom_uzip.4 index 7275029..8d27673 100644 --- a/share/man/man4/geom_uzip.4 +++ b/share/man/man4/geom_uzip.4 @@ -90,7 +90,6 @@ Consumers: Sectorsize: 512 Mode: r1w0e1 .Ed -.Pp .Sh SEE ALSO .Xr GEOM 4 , .Xr md 4 , diff --git a/share/man/man4/hptiop.4 b/share/man/man4/hptiop.4 index 77fab0c..94a6dbd 100644 --- a/share/man/man4/hptiop.4 +++ b/share/man/man4/hptiop.4 @@ -100,7 +100,6 @@ The .Nm device driver first appeared in .Fx 7.0 . -.Pp .Sh AUTHORS The .Nm diff --git a/share/man/man4/igb.4 b/share/man/man4/igb.4 index dc72725..169d057 100644 --- a/share/man/man4/igb.4 +++ b/share/man/man4/igb.4 @@ -174,7 +174,6 @@ Make the identification LED of igb0 blink: 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" diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4 index 4e7d8b0..cf16d65 100644 --- a/share/man/man4/ip.4 +++ b/share/man/man4/ip.4 @@ -392,7 +392,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 @@ -682,7 +681,6 @@ are used to specify an upper limit on the number of per-socket and per-group source filter entries which the kernel may allocate. .\"----------------------- .Ss "Raw IP Sockets" -.Pp Raw .Tn IP sockets are connectionless, diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4 index 9de6da5..914fec4 100644 --- a/share/man/man4/isp.4 +++ b/share/man/man4/isp.4 @@ -138,7 +138,6 @@ Qlogic 2422 Optical Fibre Channel PCI cards (4 Gigabit) 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 diff --git a/share/man/man4/man4.powerpc/bm.4 b/share/man/man4/man4.powerpc/bm.4 index a9e57e3..5c4a35f 100644 --- a/share/man/man4/man4.powerpc/bm.4 +++ b/share/man/man4/man4.powerpc/bm.4 @@ -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 , diff --git a/share/man/man4/man4.powerpc/snd_ai2s.4 b/share/man/man4/man4.powerpc/snd_ai2s.4 index dee0424..a69faa0 100644 --- a/share/man/man4/man4.powerpc/snd_ai2s.4 +++ b/share/man/man4/man4.powerpc/snd_ai2s.4 @@ -54,7 +54,6 @@ predominantly in G4 and G5 machines, along with the snapper and tumbler 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 diff --git a/share/man/man4/man4.powerpc/snd_davbus.4 b/share/man/man4/man4.powerpc/snd_davbus.4 index afdf906..e220de2 100644 --- a/share/man/man4/man4.powerpc/snd_davbus.4 +++ b/share/man/man4/man4.powerpc/snd_davbus.4 @@ -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 diff --git a/share/man/man4/netmap.4 b/share/man/man4/netmap.4 index dfd96b0..0af979c 100644 --- a/share/man/man4/netmap.4 +++ b/share/man/man4/netmap.4 @@ -51,7 +51,6 @@ and can exploit the parallelism in multiqueue devices and multicore systems. .Pp -.Pp .Nm requires explicit support in device drivers. For a list of supported devices, see the end of this manual page. @@ -89,7 +88,6 @@ are relative (offsets or indexes). Some macros help converting them into actual pointers. .Pp The data structures in shared memory are the following: -.Pp .Bl -tag -width XXX .It Dv struct netmap_if (one per interface) indicates the number of rings supported by an interface, their @@ -162,7 +160,6 @@ int i = txring->slot[txring->cur].buf_idx; char *buf = NETMAP_BUF(txring, i); .Ed .Ss IOCTLS -.Pp .Nm supports some ioctl() to synchronize the state of the rings between the kernel and the user processes, plus some diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4 index ff54fc6..47684ef 100644 --- a/share/man/man4/ng_netflow.4 +++ b/share/man/man4/ng_netflow.4 @@ -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 diff --git a/share/man/man4/nvram2env.4 b/share/man/man4/nvram2env.4 index 5176097..6220a3e 100644 --- a/share/man/man4/nvram2env.4 +++ b/share/man/man4/nvram2env.4 @@ -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 diff --git a/share/man/man4/oce.4 b/share/man/man4/oce.4 index b1f2063..78043ff 100644 --- a/share/man/man4/oce.4 +++ b/share/man/man4/oce.4 @@ -90,7 +90,6 @@ Firmware can be updated by following the steps below: .Bl -enum .It Copy the below code to a Makefile: -.Pp .Bd -literal -offset indent \&.KMOD=elxflash FIRMWS=imagename.ufi:elxflash diff --git a/share/man/man4/ppbus.4 b/share/man/man4/ppbus.4 index 4a873056..327b7c9 100644 --- a/share/man/man4/ppbus.4 +++ b/share/man/man4/ppbus.4 @@ -61,7 +61,6 @@ that allows parallel port access from outside the kernel without conflicting 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 parallel port accesses. .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 access the hardware layer. 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 diff --git a/share/man/man4/snd_emu10kx.4 b/share/man/man4/snd_emu10kx.4 index a363260..3892d1e 100644 --- a/share/man/man4/snd_emu10kx.4 +++ b/share/man/man4/snd_emu10kx.4 @@ -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 diff --git a/share/man/man4/snd_hda.4 b/share/man/man4/snd_hda.4 index bcdd95a..6f7e8bd 100644 --- a/share/man/man4/snd_hda.4 +++ b/share/man/man4/snd_hda.4 @@ -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 diff --git a/share/man/man4/u3g.4 b/share/man/man4/u3g.4 index 74eb0d6..db56044 100644 --- a/share/man/man4/u3g.4 +++ b/share/man/man4/u3g.4 @@ -93,7 +93,6 @@ switching automatically, please try to add quirks. See .Xr usbconfig 8 and .Xr usb_quirk 4 . -.Pp .Sh SEE ALSO .Xr tty 4 , .Xr ucom 4 , diff --git a/share/man/man7/mailaddr.7 b/share/man/man7/mailaddr.7 index 07370fb..7726006 100644 --- a/share/man/man7/mailaddr.7 +++ b/share/man/man7/mailaddr.7 @@ -66,7 +66,6 @@ For example, a user on ``calder.berkeley.edu'' could send to ``eric@CS'' 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 hack'' for simplistic routing: .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 diff --git a/share/man/man9/DB_COMMAND.9 b/share/man/man9/DB_COMMAND.9 index 44fe32b..231e6a4 100644 --- a/share/man/man9/DB_COMMAND.9 +++ b/share/man/man9/DB_COMMAND.9 @@ -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 diff --git a/share/man/man9/fail.9 b/share/man/man9/fail.9 index 0973cea..5505d13 100644 --- a/share/man/man9/fail.9 +++ b/share/man/man9/fail.9 @@ -165,7 +165,6 @@ term only cascades when passed a non-zero argument. 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 .It Sy sysctl debug.fail_point.foobar="2.1%return(5)" diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9 index 049de42..c20839e 100644 --- a/share/man/man9/lock.9 +++ b/share/man/man9/lock.9 @@ -299,7 +299,6 @@ Assert that the current thread has a recursed lock on Assert that the current thread does not have a recursed lock on .Fa lkp . .El -.Pp .Sh RETURN VALUES The .Fn lockmgr diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index 4a54800..7aa73a3 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -235,7 +235,6 @@ mutex before the function returns. See .Xr sleep 9 for details. -.Pp .Ss Lockmanager locks Shared/exclusive locks, used mostly in .Xr VFS 9 , diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9 index dad08ed..2827235 100644 --- a/share/man/man9/make_dev.9 +++ b/share/man/man9/make_dev.9 @@ -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 , -- cgit v1.1 From 47162554ddbf828e9505cf4997766922753f841f Mon Sep 17 00:00:00 2001 From: marius Date: Sat, 24 Mar 2012 18:06:48 +0000 Subject: Add QGE-X to the list of known-working cards. MFC after: 1 week --- share/man/man4/cas.4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/cas.4 b/share/man/man4/cas.4 index c2fe894..0c0f5d7 100644 --- a/share/man/man4/cas.4 +++ b/share/man/man4/cas.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 3, 2010 +.Dd March 24, 2012 .Dt CAS 4 .Os .Sh NAME @@ -101,6 +101,9 @@ Sun GigaSwift Ethernet UTP (GCS) .It Sun Quad GigaSwift Ethernet UTP (QGE) (part no.\& 501-6522) +.It +Sun Quad GigaSwift Ethernet PCI-X (QGE-X) +(part no.\& 501-6738) .El .Sh NOTES On sparc64 the -- cgit v1.1 From 514f4dd5e0d406fd84cd46cdd4de4ab4c33494cf Mon Sep 17 00:00:00 2001 From: eadler Date: Sat, 24 Mar 2012 18:25:16 +0000 Subject: Direct users to csup instead of cvsup in the csup-file boilerplate text. Reviewed by: maxim, des, swills Approved by: cperciva MFC after: 3 days --- share/examples/cvsup/cvs-supfile | 17 +++++++---------- share/examples/cvsup/doc-supfile | 17 +++++++---------- share/examples/cvsup/gnats-supfile | 17 +++++++---------- share/examples/cvsup/ports-supfile | 17 +++++++---------- share/examples/cvsup/stable-supfile | 17 +++++++---------- share/examples/cvsup/standard-supfile | 17 +++++++---------- share/examples/cvsup/www-supfile | 17 +++++++---------- 7 files changed, 49 insertions(+), 70 deletions(-) (limited to 'share') diff --git a/share/examples/cvsup/cvs-supfile b/share/examples/cvsup/cvs-supfile index be9e0d9..8b4f16d 100644 --- a/share/examples/cvsup/cvs-supfile +++ b/share/examples/cvsup/cvs-supfile @@ -3,19 +3,16 @@ # This file contains all of the "CVSup collections" that make up the # CVS development tree of the FreeBSD system. # -# CVSup (CVS Update Protocol) allows you to download the latest CVS +# csup (CVS Update Protocol) allows you to download the latest CVS # tree (or any branch of development therefrom) to your system easily -# and efficiently (far more so than with sup, which CVSup is aimed -# at replacing). If you're running CVSup interactively, and are -# currently using an X display server, you should run CVSup as follows -# to keep your CVS tree up-to-date: +# and efficiently # -# cvsup cvs-supfile +# To keep your CVS tree up-to-date run: # -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: +# csup cvs-supfile # -# cvsup -g -L 2 cvs-supfile +# Note that this only updates the tree contents and does not +# update what is actually installed. # # You may wish to change some of the settings in this file to better # suit your system: @@ -29,7 +26,7 @@ # with cvsup's "-h host" option. # # base=/var/db -# This specifies the root where CVSup will store information +# This specifies the root where csup will store information # about the collections you have transferred to your system. # A setting of "/var/db" will generate this information in # /var/db/sup. You can override the "base" setting on the diff --git a/share/examples/cvsup/doc-supfile b/share/examples/cvsup/doc-supfile index 5e0beb8..0271ecc 100644 --- a/share/examples/cvsup/doc-supfile +++ b/share/examples/cvsup/doc-supfile @@ -3,19 +3,16 @@ # This file contains all of the "CVSup collections" that make up the # source of the FreeBSD doc tree # -# CVSup (CVS Update Protocol) allows you to download the latest CVS +# csup (CVS Update Protocol) allows you to download the latest CVS # tree (or any branch of development therefrom) to your system easily -# and efficiently (far more so than with sup, which CVSup is aimed -# at replacing). If you're running CVSup interactively, and are -# currently using an X display server, you should run CVSup as follows -# to keep your CVS tree up-to-date: +# and efficiently # -# cvsup doc-supfile +# To keep your CVS tree up-to-date run: # -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: +# csup doc-supfile # -# cvsup -g -L 2 doc-supfile +# Note that this only updates the tree contents and does not +# update what is actually installed. # # You may wish to change some of the settings in this file to better # suit your system: @@ -29,7 +26,7 @@ # with cvsup's "-h host" option. # # base=/var/db -# This specifies the root where CVSup will store information +# This specifies the root where csup will store information # about the collections you have transferred to your system. # A setting of "/var/db" will generate this information in # /var/db/sup. You can override the "base" setting on the diff --git a/share/examples/cvsup/gnats-supfile b/share/examples/cvsup/gnats-supfile index 7dcb333..57e9666 100644 --- a/share/examples/cvsup/gnats-supfile +++ b/share/examples/cvsup/gnats-supfile @@ -3,19 +3,16 @@ # This file contains all of the "CVSup collections" that make up the # FreeBSD GNATS bug report database. # -# CVSup (CVS Update Protocol) allows you to download the latest CVS +# csup (CVS Update Protocol) allows you to download the latest CVS # tree (or any branch of development therefrom) to your system easily -# and efficiently (far more so than with sup, which CVSup is aimed -# at replacing). If you're running CVSup interactively, and are -# currently using an X display server, you should run CVSup as follows -# to keep your CVS tree up-to-date: +# and efficiently # -# cvsup gnats-supfile +# To keep your CVS tree up-to-date run: # -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: +# csup gnats-supfile # -# cvsup -g -L 2 gnats-supfile +# Note that this only updates the tree contents and does not +# update what is actually installed. # # You may wish to change some of the settings in this file to better # suit your system: @@ -29,7 +26,7 @@ # with cvsup's "-h host" option. # # base=/var/db -# This specifies the root where CVSup will store information +# This specifies the root where csup will store information # about the collections you have transferred to your system. # A setting of "/var/db" will generate this information in # /var/db/sup. You can override the "base" setting on the diff --git a/share/examples/cvsup/ports-supfile b/share/examples/cvsup/ports-supfile index 3326a204..9090944 100644 --- a/share/examples/cvsup/ports-supfile +++ b/share/examples/cvsup/ports-supfile @@ -3,19 +3,16 @@ # This file contains all of the "CVSup collections" that make up the # FreeBSD-current ports collection. # -# CVSup (CVS Update Protocol) allows you to download the latest CVS +# csup (CVS Update Protocol) allows you to download the latest CVS # tree (or any branch of development therefrom) to your system easily -# and efficiently (far more so than with sup, which CVSup is aimed -# at replacing). If you're running CVSup interactively, and are -# currently using an X display server, you should run CVSup as follows -# to keep your CVS tree up-to-date: +# and efficiently # -# cvsup ports-supfile +# To keep your CVS tree up-to-date run: # -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: +# csup ports-supfile # -# cvsup -g -L 2 ports-supfile +# Note that this only updates the tree contents and does not +# update what is actually installed. # # You may wish to change some of the settings in this file to better # suit your system: @@ -29,7 +26,7 @@ # with cvsup's "-h host" option. # # base=/var/db -# This specifies the root where CVSup will store information +# This specifies the root where csup will store information # about the collections you have transferred to your system. # A setting of "/var/db" will generate this information in # /var/db/sup. You can override the "base" setting on the diff --git a/share/examples/cvsup/stable-supfile b/share/examples/cvsup/stable-supfile index 341eb6b..209b1eb 100644 --- a/share/examples/cvsup/stable-supfile +++ b/share/examples/cvsup/stable-supfile @@ -3,19 +3,16 @@ # This file contains all of the "CVSup collections" that make up the # FreeBSD-stable source tree. # -# CVSup (CVS Update Protocol) allows you to download the latest CVS +# csup (CVS Update Protocol) allows you to download the latest CVS # tree (or any branch of development therefrom) to your system easily -# and efficiently (far more so than with sup, which CVSup is aimed -# at replacing). If you're running CVSup interactively, and are -# currently using an X display server, you should run CVSup as follows -# to keep your CVS tree up-to-date: +# and efficiently # -# cvsup stable-supfile +# To keep your CVS tree up-to-date run: # -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: +# csup stable-supfile # -# cvsup -g -L 2 stable-supfile +# Note that this only updates the tree contents and does not +# update what is actually installed. # # You may wish to change some of the settings in this file to better # suit your system: @@ -29,7 +26,7 @@ # with cvsup's "-h host" option. # # base=/var/db -# This specifies the root where CVSup will store information +# This specifies the root where csup will store information # about the collections you have transferred to your system. # A setting of "/var/db" will generate this information in # /var/db/sup. You can override the "base" setting on the diff --git a/share/examples/cvsup/standard-supfile b/share/examples/cvsup/standard-supfile index 463fba8..b56068d 100644 --- a/share/examples/cvsup/standard-supfile +++ b/share/examples/cvsup/standard-supfile @@ -3,19 +3,16 @@ # This file contains all of the "CVSup collections" that make up the # FreeBSD-current source tree. # -# CVSup (CVS Update Protocol) allows you to download the latest CVS +# csup (CVS Update Protocol) allows you to download the latest CVS # tree (or any branch of development therefrom) to your system easily -# and efficiently (far more so than with sup, which CVSup is aimed -# at replacing). If you're running CVSup interactively, and are -# currently using an X display server, you should run CVSup as follows -# to keep your CVS tree up-to-date: +# and efficiently # -# cvsup standard-supfile +# To keep your CVS tree up-to-date run: # -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: +# csup standard-supfile # -# cvsup -g -L 2 standard-supfile +# Note that this only updates the tree contents and does not +# update what is actually installed. # # You may wish to change some of the settings in this file to better # suit your system: @@ -29,7 +26,7 @@ # with cvsup's "-h host" option. # # base=/var/db -# This specifies the root where CVSup will store information +# This specifies the root where csup will store information # about the collections you have transferred to your system. # A setting of "/var/db" will generate this information in # /var/db/sup. You can override the "base" setting on the diff --git a/share/examples/cvsup/www-supfile b/share/examples/cvsup/www-supfile index c06ccf5..db78f0f 100644 --- a/share/examples/cvsup/www-supfile +++ b/share/examples/cvsup/www-supfile @@ -3,19 +3,16 @@ # This file contains all of the "CVSup collections" that make up the # source of the FreeBSD www tree # -# CVSup (CVS Update Protocol) allows you to download the latest CVS +# csup (CVS Update Protocol) allows you to download the latest CVS # tree (or any branch of development therefrom) to your system easily -# and efficiently (far more so than with sup, which CVSup is aimed -# at replacing). If you're running CVSup interactively, and are -# currently using an X display server, you should run CVSup as follows -# to keep your CVS tree up-to-date: +# and efficiently # -# cvsup www-supfile +# To keep your CVS tree up-to-date run: # -# If not running X, or invoking cvsup from a non-interactive script, then -# run it as follows: +# csup www-supfile # -# cvsup -g -L 2 www-supfile +# Note that this only updates the tree contents and does not +# update what is actually installed. # # You may wish to change some of the settings in this file to better # suit your system: @@ -29,7 +26,7 @@ # with cvsup's "-h host" option. # # base=/var/db -# This specifies the root where CVSup will store information +# This specifies the root where csup will store information # about the collections you have transferred to your system. # A setting of "/var/db" will generate this information in # /var/db/sup. You can override the "base" setting on the -- cgit v1.1 From 67789bd4be452436575143436e6f0018219fc75f Mon Sep 17 00:00:00 2001 From: eadler Date: Sat, 24 Mar 2012 18:43:18 +0000 Subject: - Make the default values for tcsh more user friendly - Add an examples file with many of the not accepted suggestions from the discussion PR: conf/160689 Reviewed by: many Discussed on: current Approved by: cperciva --- share/examples/Makefile | 2 ++ share/examples/csh/dot.cshrc | 60 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 share/examples/csh/dot.cshrc (limited to 'share') diff --git a/share/examples/Makefile b/share/examples/Makefile index 7b968f9..304ddb7 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -8,6 +8,7 @@ LDIRS= BSD_daemon \ FreeBSD_version \ IPv6 \ bootforth \ + csh \ cvsup \ diskless \ drivers \ @@ -49,6 +50,7 @@ XFILES= BSD_daemon/FreeBSD.pfa \ bootforth/menu.4th \ bootforth/menuconf.4th \ bootforth/screen.4th \ + csh/dot.cshrc \ cvsup/README \ cvsup/cvs-supfile \ cvsup/doc-supfile \ diff --git a/share/examples/csh/dot.cshrc b/share/examples/csh/dot.cshrc new file mode 100644 index 0000000..ef72ce7 --- /dev/null +++ b/share/examples/csh/dot.cshrc @@ -0,0 +1,60 @@ +# Here are some example (t)csh options and configurations that you may find interesting +# +# $FreeBSD$ +# + +# Sets SSH_AUTH_SOCK to the user's ssh-agent socket path if running +if (${?SSH_AUTH_SOCK} != "1") then + setenv SSH_AUTH_SOCK `sockstat | grep "${USER}" | cut -d ' ' -f 6` +endif + +# Change only root's prompt +if (`id -g` == 0) + set prompt="root@%m# " +endif + +# This maps the "Delete" key to do the right thing +# Pressing CTRL-v followed by the key of interest will print the shell's +# mapping for the key +bindkey "^[[3~" delete-char-or-list-or-eof + +# Make the Ins key work +bindkey "\e[2~" overwrite-mode + +# Some common completions +complete chown 'p/1/u/' +complete man 'C/*/c/' +complete service 'n/*/`service -l`/' +complete service 'c/-/(e l r v)/' 'p/1/`service -l`/' 'n/*/(start stop reload restart status rcvar onestart onestop)/' +complete kldunload 'n@*@`kldstat | awk \{sub\(\/\.ko\/,\"\",\$NF\)\;print\ \$NF\} | grep -v Name` @' +complete make 'n@*@`make -pn | sed -n -E "/^[#_.\/[:blank:]]+/d; /=/d; s/[[:blank:]]*:.*//gp;"`@' +complete pkg_delete 'c/-/(i v D n p d f G x X r)/' 'n@*@`ls /var/db/pkg`@' +complete pkg_info 'c/-/(a b v p q Q c d D f g i I j k K r R m L s o G O x X e E l t V P)/' 'n@*@`\ls -1 /var/db/pkg | sed svar/db/pkg/%%`@" +complete kill 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $1}'"'"'`/' +complete killall 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $5}'"'"'`/' +alias _PKGS_PkGs_PoRtS_ 'awk -F\| \{sub\(\"\/usr\/ports\/\"\,\"\"\,\$2\)\;print\ \$2\} /usr/ports/INDEX-name -r | cut -d . -f 1A +alias _PKGS_PkGs_PoRtS_ 'awk -F\| \{sub\(\"\/usr\/ports\/\"\,\"\"\,\$2\)\;print\ \$2\} /usr/ports/INDEX-`uname -r | cut -d . -f 1`&& pkg_info -E \*' +complete portmaster 'c/--/(always-fetch check-depends check-port-dbdir clean-distfiles \ + clean-packages delete-build-only delete-packages force-config help \ + index index-first index-only list-origins local-packagedir no-confirm \ + no-index-fetch no-term-title packages packages-build packages-if-newer \ + packages-local packages-only show-work update-if-newer version)/' \ + 'c/-/(a b B C d D e f F g G h H i l L m n o p r R s t u v w x)/' \ + 'n@*@`_PKGS_PkGs_PoRtS_`@' + +# Alternate prompts +set prompt = '#' +set prompt = '%B%m%b%# ' +set prompt = '%B%m%b:%c03:%# ' +set prompt = '%{\033]0;%n@%m:%/\007%}%B%m%b:%c03:%# ' +set prompt = "%n@%m %c04%m%# " +set prompt = "%n@%m:%c04 %# " +set prompt = "[%n@%m]%c04%# " +set ellipsis + +# Color ls +alias ll ls -lAhG +alias ls ls -G + +# other autolist options +set autolist = TAB -- cgit v1.1 From dfeac3e82445b83c514221770b5f546e26f11219 Mon Sep 17 00:00:00 2001 From: eadler Date: Sat, 24 Mar 2012 23:10:18 +0000 Subject: Add a few more examples Submitted by: jmallett Approved by: cperciva (implicit) MFC after: 3 days X-MFC-With: r233429 --- share/examples/csh/dot.cshrc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'share') diff --git a/share/examples/csh/dot.cshrc b/share/examples/csh/dot.cshrc index ef72ce7..2cb4257 100644 --- a/share/examples/csh/dot.cshrc +++ b/share/examples/csh/dot.cshrc @@ -32,6 +32,7 @@ complete pkg_delete 'c/-/(i v D n p d f G x X r)/' 'n@*@`ls /var/db/pkg`@' complete pkg_info 'c/-/(a b v p q Q c d D f g i I j k K r R m L s o G O x X e E l t V P)/' 'n@*@`\ls -1 /var/db/pkg | sed svar/db/pkg/%%`@" complete kill 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $1}'"'"'`/' complete killall 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $5}'"'"'`/' +complete dd 'c/[io]f=/f/ n/*/"(if of ibs obs bs skip seek count)"/=' alias _PKGS_PkGs_PoRtS_ 'awk -F\| \{sub\(\"\/usr\/ports\/\"\,\"\"\,\$2\)\;print\ \$2\} /usr/ports/INDEX-name -r | cut -d . -f 1A alias _PKGS_PkGs_PoRtS_ 'awk -F\| \{sub\(\"\/usr\/ports\/\"\,\"\"\,\$2\)\;print\ \$2\} /usr/ports/INDEX-`uname -r | cut -d . -f 1`&& pkg_info -E \*' complete portmaster 'c/--/(always-fetch check-depends check-port-dbdir clean-distfiles \ @@ -56,5 +57,8 @@ set ellipsis alias ll ls -lAhG alias ls ls -G +# Color on many system utilities +setenv CLICOLOR 1 + # other autolist options set autolist = TAB -- cgit v1.1 From 1c68d75a62732e4a0c91cb49c1776151ea8385d2 Mon Sep 17 00:00:00 2001 From: joel Date: Sun, 25 Mar 2012 09:23:10 +0000 Subject: Remove superfluous paragraph macro. --- share/termcap/termcap.5 | 1 - 1 file changed, 1 deletion(-) (limited to 'share') diff --git a/share/termcap/termcap.5 b/share/termcap/termcap.5 index fefc592..1fae963 100644 --- a/share/termcap/termcap.5 +++ b/share/termcap/termcap.5 @@ -1157,7 +1157,6 @@ These are primarily useful if the terminal does not have .Sy \&cm , such as the Tektronix 4025. .Ss Cursor Motions -.Pp If the terminal has a fast way to home the cursor (to the very upper left corner of the screen), this can be given as .Sy \&ho . -- cgit v1.1 From db7581ccf5eaa9a69c6969b93bdac3408d1f1d0c Mon Sep 17 00:00:00 2001 From: joel Date: Sun, 25 Mar 2012 16:00:56 +0000 Subject: Make sure sections are sorted into conventional order. --- share/man/man3/pthread_cond_destroy.3 | 6 +++--- share/man/man4/umcs.4 | 6 +++--- share/man/man4/xnb.4 | 40 +++++++++++++++++------------------ 3 files changed, 26 insertions(+), 26 deletions(-) (limited to 'share') diff --git a/share/man/man3/pthread_cond_destroy.3 b/share/man/man3/pthread_cond_destroy.3 index 39eff9d..4ea7a87 100644 --- a/share/man/man3/pthread_cond_destroy.3 +++ b/share/man/man3/pthread_cond_destroy.3 @@ -44,6 +44,9 @@ The .Fn pthread_cond_destroy function frees the resources allocated by the condition variable .Fa cond . +.Sh IMPLEMENTATION NOTES +A condition variable can be destroyed immediately after all the threads that +are blocked on it are awakened. .Sh RETURN VALUES If successful, the .Fn pthread_cond_destroy @@ -63,9 +66,6 @@ The variable .Fa cond is locked by another thread. .El -.Sh IMPLEMENTATION NOTES -A condition variable can be destroyed immediately after all the threads that -are blocked on it are awakened. .Sh SEE ALSO .Xr pthread_cond_broadcast 3 , .Xr pthread_cond_init 3 , diff --git a/share/man/man4/umcs.4 b/share/man/man4/umcs.4 index d9213bd..8ccd2ca 100644 --- a/share/man/man4/umcs.4 +++ b/share/man/man4/umcs.4 @@ -84,9 +84,6 @@ ST Lab U-400 four-port serial USB adapter .Xr tty 4 , .Xr ucom 4 , .Xr usb 4 -.Sh BUGS -This driver doesn't support access to any fine tunes of -chip, like RS522/RS485 mode, non-standard baudrates, etc. .Sh HISTORY The .Nm @@ -99,3 +96,6 @@ The driver was written by .An Lev Serebryakov .Aq lev@FreeBSD.org . +.Sh BUGS +This driver doesn't support access to any fine tunes of +chip, like RS522/RS485 mode, non-standard baudrates, etc. diff --git a/share/man/man4/xnb.4 b/share/man/man4/xnb.4 index 77f7f75..06faafb 100644 --- a/share/man/man4/xnb.4 +++ b/share/man/man4/xnb.4 @@ -84,6 +84,26 @@ Runs a builtin suite of unit tests and displays the results. Does not affect the operation of the driver in any way. Note that the test suite simulates error conditions; this will result in error messages being printed to the system system log. +.Sh SEE ALSO +.Xr arp 4 , +.Xr netintro 4 , +.Xr ng_ether 4 , +.Xr xen 4 , +.Xr ifconfig 8 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 10.0 . +.Sh AUTHORS +The +.Nm +driver was written by +.An Alan Somers +.Aq alans@spectralogic.com +and +.An John Suykerbuyk +.Aq johns@spectralogic.com .Sh CAVEATS Packets sent through Xennet pass over shared memory, so the protocol includes no form of link-layer checksum or CRC. @@ -110,26 +130,6 @@ is bridged to a physcal interface, then transmit checksum offloading should be disabled on the netfront. The Xennet protocol does not have any mechanism for the netback to request the netfront to do this; the operator must do it manually. -.Sh SEE ALSO -.Xr arp 4 , -.Xr netintro 4 , -.Xr ng_ether 4 , -.Xr xen 4 , -.Xr ifconfig 8 -.Sh HISTORY -The -.Nm -device driver first appeared in -.Fx 10.0 . -.Sh AUTHORS -The -.Nm -driver was written by -.An Alan Somers -.Aq alans@spectralogic.com -and -.An John Suykerbuyk -.Aq johns@spectralogic.com .Sh BUGS The .Nm -- cgit v1.1 From 96b099d4c47ca4e52fbc294eeb3f76bbff60ef05 Mon Sep 17 00:00:00 2001 From: joel Date: Sun, 25 Mar 2012 19:34:05 +0000 Subject: mdoc: document title should be all caps. --- share/man/man4/wbwd.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/wbwd.4 b/share/man/man4/wbwd.4 index 2b24fab..0102225 100644 --- a/share/man/man4/wbwd.4 +++ b/share/man/man4/wbwd.4 @@ -26,7 +26,7 @@ .\" $FreeBSD$ .\" .Dd March 6, 2012 -.Dt wbwd 4 +.Dt WBWD 4 .Os .Sh NAME .Nm wbwd -- cgit v1.1 From fd561480db34c3cacc88ece00cce76c6dd422eca Mon Sep 17 00:00:00 2001 From: melifaro Date: Mon, 26 Mar 2012 09:34:17 +0000 Subject: - Add knlist_init_rw_reader() function to kqueue(9). Function acquired reader lock if needed. Assert check for reader or writer lock (RA_LOCKED / RA_UNLOCKED) - While here, add knlist_init_mtx.9 to MLINKS and fix some style(9) issues Reviewed by: glebius Approved by: ae(mentor) MFC after: 2 weeks --- share/man/man9/Makefile | 2 ++ share/man/man9/kqueue.9 | 23 ++++++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 8acef35..e5778a1 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -773,6 +773,8 @@ MLINKS+=kqueue.9 knlist_add.9 \ kqueue.9 knlist_destroy.9 \ kqueue.9 knlist_empty.9 \ kqueue.9 knlist_init.9 \ + kqueue.9 knlist_init_mtx.9 \ + kqueue.9 knlist_init_rw_reader.9 \ kqueue.9 knlist_remove.9 \ kqueue.9 knlist_remove_inevent.9 \ kqueue.9 knote_fdclose.9 \ diff --git a/share/man/man9/kqueue.9 b/share/man/man9/kqueue.9 index 2ecc08b..555fe54 100644 --- a/share/man/man9/kqueue.9 +++ b/share/man/man9/kqueue.9 @@ -24,14 +24,14 @@ .\" .\" $FreeBSD$ .\" -.Dd February 25, 2012 +.Dd March 26, 2012 .Dt KQUEUE 9 .Os .Sh NAME .Nm kqueue_add_filteropts , kqueue_del_filteropts , .Nm kqfd_register , .Nm knote_fdclose , -.Nm knlist_init , knlist_init_mtx , +.Nm knlist_init , knlist_init_mtx , knlist_init_rw_reader , .Nm knlist_add , knlist_remove , knlist_remove_inevent , knlist_empty , .Nm knlist_clear , knlist_delete , knlist_destroy , .Nm KNOTE_LOCKED , KNOTE_UNLOCKED @@ -57,6 +57,8 @@ .Ft void .Fn knlist_init_mtx "struct knlist *knl" "struct mtx *lock" .Ft void +.Fn knlist_init_rw_reader "struct knlist *knl" "struct rwlock *lock" +.Ft void .Fn knlist_add "struct knlist *knl" "struct knote *kn" "int islocked" .Ft void .Fn knlist_remove "struct knlist *knl" "struct knote *kn" "int islocked" @@ -259,8 +261,10 @@ If used, the .Vt knlist must be initialized with either .Fn knlist_init +, +.Fn knlist_init_mtx or -.Fn knlist_init_mtx . +.Fn knlist_init_rw_reader . The .Vt knlist structure may be embedded into the object structure. @@ -305,6 +309,19 @@ style lock. .Pp The function +.Fn knlist_init_rw_reader +may be used to initialize a +.Vt knlist +when +.Fa lock +is a +.Xr rwlock 9 +read lock. +Lock is acquired via +.Fn rw_rlock +function. +.Pp +The function .Fn knlist_empty returns true when there are no .Vt knotes -- cgit v1.1 From 4234591b03e753d1515af0b97f7b10e85b3b0f16 Mon Sep 17 00:00:00 2001 From: joel Date: Mon, 26 Mar 2012 15:18:14 +0000 Subject: mdoc: terminate quoted strings. Reviewed by: brueffer --- share/man/man4/amdsmb.4 | 2 +- share/man/man4/bce.4 | 2 +- share/man/man4/cd.4 | 2 +- share/man/man4/lmc.4 | 2 +- share/man/man4/syscons.4 | 10 +++++----- share/man/man7/operator.7 | 2 +- share/man/man9/crypto.9 | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'share') diff --git a/share/man/man4/amdsmb.4 b/share/man/man4/amdsmb.4 index eb02543..c038584 100644 --- a/share/man/man4/amdsmb.4 +++ b/share/man/man4/amdsmb.4 @@ -33,7 +33,7 @@ .Sh SYNOPSIS .Cd "device smbus" .Cd "device smb" -.Cd "device amdsmb +.Cd "device amdsmb" .Sh DESCRIPTION The .Nm diff --git a/share/man/man4/bce.4 b/share/man/man4/bce.4 index cbad861..090c477 100644 --- a/share/man/man4/bce.4 +++ b/share/man/man4/bce.4 @@ -266,7 +266,7 @@ address space. .It "bce%d: Could not allocate TX descriptor chain DMA tag!" The driver could not allocate a DMA tag for the controller's TX chain. -.It "bce%d: Could not allocate TX descriptor chain DMA memory! +.It "bce%d: Could not allocate TX descriptor chain DMA memory!" The driver could not allocate DMA addressable memory for the controller's TX chain. .It "bce%d: Could not map TX descriptor chain DMA memory!" diff --git a/share/man/man4/cd.4 b/share/man/man4/cd.4 index 47ce3bd..5c67b0c 100644 --- a/share/man/man4/cd.4 +++ b/share/man/man4/cd.4 @@ -34,7 +34,7 @@ .Sh SYNOPSIS .Cd device cd .Cd "options ""CHANGER_MIN_BUSY_SECONDS=3""" -.Cd "options ""CHANGER_MAX_BUSY_SECONDS=11"" +.Cd "options ""CHANGER_MAX_BUSY_SECONDS=11""" .Sh DESCRIPTION The .Nm diff --git a/share/man/man4/lmc.4 b/share/man/man4/lmc.4 index 2cf6e49..ee29aee 100644 --- a/share/man/man4/lmc.4 +++ b/share/man/man4/lmc.4 @@ -407,7 +407,7 @@ When testing an HSSI card with a null modem cable, configure it with .Xr lmcconfig 8 : .Pp -.Dl "lmcconfig lmc0 -a 2 +.Dl "lmcconfig lmc0 -a 2" .Pp .Dq Fl a Li 2 selects the PCI bus clock as the transmit clock. diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4 index 7685c89..d9f8d24 100644 --- a/share/man/man4/syscons.4 +++ b/share/man/man4/syscons.4 @@ -501,15 +501,15 @@ Note that you cannot put any white space inside the quoted string, because of the current implementation of .Xr config 8 . .Pp -.Dl "options SC_NORM_ATTR=(FG_GREEN|BG_BLACK) -.Dl "options SC_NORM_REV_ATTR=(FG_YELLOW|BG_GREEN) +.Dl "options SC_NORM_ATTR=(FG_GREEN|BG_BLACK)" +.Dl "options SC_NORM_REV_ATTR=(FG_YELLOW|BG_GREEN)" .Pp The following lines will set the default colors of the kernel message. The kernel message will be printed bright red on black background. The reversed message will be black on red background. .Pp -.Dl "options SC_KERNEL_CONS_ATTR=(FG_LIGHTRED|BG_BLACK) -.Dl "options SC_KERNEL_CONS_REV_ATTR=(FG_BLACK|BG_RED) +.Dl "options SC_KERNEL_CONS_ATTR=(FG_LIGHTRED|BG_BLACK)" +.Dl "options SC_KERNEL_CONS_REV_ATTR=(FG_BLACK|BG_RED)" .Pp The following example adds the font files .Pa cp850-8x16.fnt , @@ -519,7 +519,7 @@ and to the kernel. .Pp .Dl "options SC_DFLT_FONT" -.Dl "makeoptions SC_DFLT_FONT=cp850 +.Dl "makeoptions SC_DFLT_FONT=cp850" .Dl "device sc" .\".Sh DIAGNOSTICS .Sh SEE ALSO diff --git a/share/man/man7/operator.7 b/share/man/man7/operator.7 index e7c35cd..0ca8abd 100644 --- a/share/man/man7/operator.7 +++ b/share/man/man7/operator.7 @@ -45,7 +45,7 @@ .It "-------- -------------" .It "() [] -> . left to right" .It "! ~ ++ -- - (type) * & sizeof new delete right to left" -.It "->* .* left to right +.It "->* .* left to right" .It "* / % left to right" .It "+ - left to right" .It "<< >> left to right" diff --git a/share/man/man9/crypto.9 b/share/man/man9/crypto.9 index 762d785..c2682af 100644 --- a/share/man/man9/crypto.9 +++ b/share/man/man9/crypto.9 @@ -450,7 +450,7 @@ is called to perform a keying operation. The various fields in the .Vt cryptkop structure are: -.Bl -tag -width ".Va krp_callback' +.Bl -tag -width ".Va krp_callback" .It Va krp_op Operation code, such as .Dv CRK_MOD_EXP . -- cgit v1.1 From a19daf80bc6146f4bb36a1db4918c3b54fbbe062 Mon Sep 17 00:00:00 2001 From: joel Date: Mon, 26 Mar 2012 16:40:45 +0000 Subject: mdoc: Remove tabs in non-literal context. --- share/man/man4/nvram2env.4 | 2 +- share/man/man5/style.Makefile.5 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/nvram2env.4 b/share/man/man4/nvram2env.4 index 6220a3e..91d1639 100644 --- a/share/man/man4/nvram2env.4 +++ b/share/man/man4/nvram2env.4 @@ -31,7 +31,7 @@ .Nm nvram2env .Nd "copy nvram-like data into kernel environment" .Sh SYNOPSIS -.Cd "device nvram2env" +.Cd "device nvram2env" .Sh DESCRIPTION .Nm implements a simple method of reading the NVRAM-like data and information diff --git a/share/man/man5/style.Makefile.5 b/share/man/man5/style.Makefile.5 index bdf2830..c3a3288 100644 --- a/share/man/man5/style.Makefile.5 +++ b/share/man/man5/style.Makefile.5 @@ -143,7 +143,7 @@ is an important thing. The usage of .Va WARNS is spelled -.Dq Li "WARNS?= " , +.Dq Li "WARNS?= " , so that it may be overridden on the command line or in .Xr make.conf 5 . .It -- cgit v1.1 From 56f593829684b870c2901bea7de65ee82271ed9c Mon Sep 17 00:00:00 2001 From: joel Date: Mon, 26 Mar 2012 19:23:57 +0000 Subject: mdoc: sort prologue macros. --- share/man/man5/ar.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/ar.5 b/share/man/man5/ar.5 index 2acbde4..4abd439 100644 --- a/share/man/man5/ar.5 +++ b/share/man/man5/ar.5 @@ -24,8 +24,8 @@ .\" $FreeBSD$ .\" .Dd November 28, 2010 -.Os .Dt AR 5 +.Os .Sh NAME .Nm ar .Nd archive file format for -- cgit v1.1 From 1da5145831412582d8266d342a99ebe3de9f41db Mon Sep 17 00:00:00 2001 From: bschmidt Date: Tue, 27 Mar 2012 18:17:22 +0000 Subject: Add a list of available devices which matches the names shown by pciconf. While here add 2 missing firmware modules. MFC after: 1 week --- share/man/man4/iwn.4 | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) (limited to 'share') diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4 index 370241a..c43e14e 100644 --- a/share/man/man4/iwn.4 +++ b/share/man/man4/iwn.4 @@ -25,13 +25,12 @@ .\" .\" $FreeBSD$ .\" -.Dd July 20, 2010 +.Dd March 27, 2012 .Dt IWN 4 .Os .Sh NAME .Nm iwn -.Nd Intel Wireless WiFi Link 4965/1000/5000/5150/5300/6000/6050 -IEEE 802.11n driver +.Nd Intel IEEE 802.11n wireless network driver .Sh SYNOPSIS To compile this driver into the kernel, include the following lines in your @@ -51,6 +50,8 @@ Choose one from: .Cd "device iwn5000fw" .Cd "device iwn5150fw" .Cd "device iwn6000fw" +.Cd "device iwn6000g2afw" +.Cd "device iwn6000g2bfw" .Cd "device iwn6050fw" .Ed .Pp @@ -71,15 +72,32 @@ iwn1000fw_load="YES" iwn5000fw_load="YES" iwn5150fw_load="YES" iwn6000fw_load="YES" +iwn6000g2afw_load="YES" +iwn6000g2bfw_load="YES" iwn6050fw_load="YES" .Ed .Sh DESCRIPTION The .Nm -driver provides support for -.Tn Intel -Wireless WiFi Link 4965, 1000, 5000 and 6000 series of -PCI-Express network adapters. +driver provides support for: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It Intel Centrino Advanced-N 6200 +.It Intel Centrino Advanced-N 6205 +.It Intel Centrino Advanced-N 6230 +.It Intel Centrino Advanced-N + WiMAX 6250 +.It Intel Centrino Ultimate-N 6300 +.It Intel Centrino Wireless-N 130 +.It Intel Centrino Wireless-N 1000 +.It Intel Centrino Wireless-N 1030 +.It Intel Centrino Wireless-N + WiMAX 6150 +.It Intel Ultimate N WiFi Link 5300 +.It Intel Wireless WiFi Link 4965 +.It Intel WiFi Link 5100 +.It Intel WiMAX/WiFi Link 5150 +.It Intel WiMAX/WiFi Link 5350 +.El +.Pp .Nm supports .Cm station , -- cgit v1.1 From 97d2a4d873f12791dd1a1606523eae0062ccc7a5 Mon Sep 17 00:00:00 2001 From: joel Date: Tue, 27 Mar 2012 20:50:14 +0000 Subject: mdoc: add missing El macro. --- share/man/man4/xnb.4 | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/man/man4/xnb.4 b/share/man/man4/xnb.4 index 06faafb..bda6e45 100644 --- a/share/man/man4/xnb.4 +++ b/share/man/man4/xnb.4 @@ -84,6 +84,7 @@ Runs a builtin suite of unit tests and displays the results. Does not affect the operation of the driver in any way. Note that the test suite simulates error conditions; this will result in error messages being printed to the system system log. +.El .Sh SEE ALSO .Xr arp 4 , .Xr netintro 4 , -- cgit v1.1 From 0b14a09c6903a4dd8872ae0f99e56e072ec7f1eb Mon Sep 17 00:00:00 2001 From: jkim Date: Tue, 27 Mar 2012 23:43:01 +0000 Subject: - Do not clobber softc when psm(4) is reintialized. - Make INITAFTERSUSPEND flag independent of HOOKRESUME flag. - Automatically set INITAFTERSUSPEND flag when ALPS GlidePoint is detected. - Always probe Synaptics Touchpad. Allow MOUSE_SYN_GETHWINFO ioctl and automatically set INITAFTERSUSPEND flag when a supported device is detected, regardless of "hw.psm.synaptics_support" tunable setting. - Update psm(4) to reflect the above changes. - Remove long-time defunct SYNCHACK flag while I am in the neighborhood. MFC after: 1 month --- share/man/man4/psm.4 | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'share') diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4 index 9c10e23..caf0135 100644 --- a/share/man/man4/psm.4 +++ b/share/man/man4/psm.4 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 8, 2008 +.Dd March 27, 2012 .Dt PSM 4 .Os .Sh NAME @@ -329,9 +329,6 @@ It will cause the .Nm driver to reset and re-initialize the pointing device after the `resume' event. -It has no effect unless the -.Em HOOKRESUME -flag is set as well. .El .Sh LOADER TUNABLES Extended support for Synaptics touchpads can be enabled by setting @@ -445,10 +442,8 @@ Microsoft IntelliMouse .El .Pp .It Dv MOUSE_SYN_GETHWINFO Ar synapticshw_t *synhw -Retrieves extra information associated with Synaptics Touchpads. -Only available when -.Va hw.psm.synaptics_support -has been enabled. +Retrieves extra information associated with Synaptics Touchpad. +Only available when a supported device has been detected. .Bd -literal typedef struct synapticshw { int infoMajor; /* major hardware revision */ @@ -837,12 +832,11 @@ In contrast, some pad products, e.g.\& some versions of ALPS GlidePoint and Interlink VersaPad, treat the tapping action as fourth button events. .Pp -It is reported that Interlink VersaPad requires both -.Em HOOKRESUME -and +It is reported that ALPS GlidePoint, Synaptics Touchpad, and +Interlink VersaPad require .Em INITAFTERSUSPEND -flags in order to recover from suspended state. -These flags are automatically set when VersaPad is detected by the +flag in order to recover from suspended state. +This flag is automatically set when one of these devices is detected by the .Nm driver. .Pp -- cgit v1.1 From 4544b2987d0d95e6ea49d4f0c3281c2a11ce8f77 Mon Sep 17 00:00:00 2001 From: jmallett Date: Thu, 29 Mar 2012 02:54:35 +0000 Subject: Assume a big-endian default on MIPS and drop the "eb" suffix from MACHINE_ARCH. This makes our naming scheme more closely match other systems and the expectations of much third-party software. MIPS builds which are little-endian should require and exhibit no changes. Big-endian TARGET_ARCHes must be changed: From: To: mipseb mips mipsn32eb mipsn32 mips64eb mips64 An entry has been added to UPDATING and some foot-shooting protection (complete with warnings which should become errors in the near future) to the top-level base system Makefile. --- share/man/man5/src.conf.5 | 4 ++-- share/mk/bsd.endian.mk | 2 +- share/mk/sys.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 08e08c5..73e97cb 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -270,7 +270,7 @@ When set, it also enforces the following options: Set to not build the Clang C/C++ compiler. .Pp It is a default setting on -arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mipseb, mips/mips64el, mips/mips64eb, mips/mipsn32eb and sparc64/sparc64. +arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32eb and sparc64/sparc64. When set, it also enforces the following options: .Pp .Bl -item -compact @@ -384,7 +384,7 @@ Set to build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. .Pp It is a default setting on -arm/arm, arm/armeb, mips/mipsel, mips/mipseb, mips/mips64el, mips/mips64eb, mips/mipsn32eb, powerpc/powerpc and powerpc/powerpc64. +arm/arm, arm/armeb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64. .It Va WITHOUT_FLOPPY .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru Set to not build or install programs diff --git a/share/mk/bsd.endian.mk b/share/mk/bsd.endian.mk index c9e0e6b..c4381bc 100644 --- a/share/mk/bsd.endian.mk +++ b/share/mk/bsd.endian.mk @@ -10,6 +10,6 @@ TARGET_ENDIANNESS= 1234 ${MACHINE_ARCH} == "powerpc64" || \ ${MACHINE_ARCH} == "sparc64" || \ ${MACHINE_ARCH} == "armeb" || \ - ${MACHINE_ARCH:Mmips*eb} != "" + ${MACHINE_ARCH:Mmips*} != "" TARGET_ENDIANNESS= 4321 .endif diff --git a/share/mk/sys.mk b/share/mk/sys.mk index e8ec4c1..c984295 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -13,7 +13,7 @@ unix ?= We run FreeBSD, not UNIX. # and/or endian. This is called MACHINE_CPU in NetBSD, but that's used # for something different in FreeBSD. # -MACHINE_CPUARCH=${MACHINE_ARCH:C/mips.*e[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/} +MACHINE_CPUARCH=${MACHINE_ARCH:C/mips(n32|64)?(el)?/mips/:C/armeb/arm/:C/powerpc64/powerpc/} .endif # If the special target .POSIX appears (without prerequisites or -- cgit v1.1 From 299c847f0b109bdb3c5e20596f1ba2dc6f72e468 Mon Sep 17 00:00:00 2001 From: jmallett Date: Thu, 29 Mar 2012 03:04:59 +0000 Subject: o) Fix mips/mips -> mips for Makefile.inc1. o) Rebuild src.conf.5. --- share/man/man5/src.conf.5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 73e97cb..e209a26 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru .\" $FreeBSD$ -.Dd February 29, 2012 +.Dd March 25, 2012 .Dt SRC.CONF 5 .Os .Sh NAME @@ -270,7 +270,7 @@ When set, it also enforces the following options: Set to not build the Clang C/C++ compiler. .Pp It is a default setting on -arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32eb and sparc64/sparc64. +arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64. When set, it also enforces the following options: .Pp .Bl -item -compact -- cgit v1.1 From 1ef5fe44d364187e492b6a152c0176186161b44f Mon Sep 17 00:00:00 2001 From: eadler Date: Thu, 29 Mar 2012 05:02:12 +0000 Subject: Remove trailing whitespace per mdoc lint warning Disussed with: gavin No objection from: doc Approved by: joel MFC after: 3 days --- share/man/man3/pthread_attr_affinity_np.3 | 2 +- share/man/man3/pthread_cond_timedwait.3 | 4 ++-- share/man/man3/pthread_cond_wait.3 | 4 ++-- share/man/man4/acpi_hp.4 | 24 +++++++++---------- share/man/man4/acpi_wmi.4 | 2 +- share/man/man4/ada.4 | 2 +- share/man/man4/aibs.4 | 6 ++--- share/man/man4/ath.4 | 8 +++---- share/man/man4/atp.4 | 6 ++--- share/man/man4/carp.4 | 2 +- share/man/man4/coda.4 | 2 +- share/man/man4/epair.4 | 2 +- share/man/man4/gem.4 | 14 ++++++------ share/man/man4/gre.4 | 2 +- share/man/man4/ipmi.4 | 2 +- share/man/man4/ipw.4 | 2 +- share/man/man4/isci.4 | 10 ++++---- share/man/man4/iscsi_initiator.4 | 4 ++-- share/man/man4/iwi.4 | 2 +- share/man/man4/iwn.4 | 2 +- share/man/man4/iwnfw.4 | 2 +- share/man/man4/ixgbe.4 | 6 ++--- share/man/man4/ksyms.4 | 38 +++++++++++++++---------------- share/man/man4/ktr.4 | 2 +- share/man/man4/man4.i386/glxsb.4 | 2 +- share/man/man4/man4.powerpc/abtn.4 | 2 +- share/man/man4/man4.powerpc/akbd.4 | 8 +++---- share/man/man4/man4.powerpc/bm.4 | 4 ++-- share/man/man4/man4.powerpc/cuda.4 | 2 +- share/man/man4/man4.powerpc/smu.4 | 2 +- share/man/man4/man4.powerpc/snd_ai2s.4 | 2 +- share/man/man4/md.4 | 2 +- share/man/man4/mld.4 | 2 +- share/man/man4/mmc.4 | 2 +- share/man/man4/mos.4 | 2 +- share/man/man4/mps.4 | 12 +++++----- share/man/man4/mwl.4 | 6 ++--- share/man/man4/net80211.4 | 10 ++++---- share/man/man4/netmap.4 | 6 ++--- share/man/man4/ng_car.4 | 2 +- share/man/man4/ng_deflate.4 | 6 ++--- share/man/man4/ng_nat.4 | 4 ++-- share/man/man4/ng_netflow.4 | 8 +++---- share/man/man4/ng_patch.4 | 2 +- share/man/man4/ng_ppp.4 | 20 ++++++++-------- share/man/man4/ng_pred1.4 | 6 ++--- share/man/man4/ng_tty.4 | 2 +- share/man/man4/nvram2env.4 | 4 ++-- share/man/man4/nxge.4 | 4 ++-- share/man/man4/pcm.4 | 2 +- share/man/man4/pts.4 | 2 +- share/man/man4/ral.4 | 2 +- share/man/man4/run.4 | 2 +- share/man/man4/runfw.4 | 2 +- share/man/man4/sfxge.4 | 2 +- share/man/man4/smp.4 | 2 +- share/man/man4/snd_emu10kx.4 | 2 +- share/man/man4/snd_ich.4 | 2 +- share/man/man4/tpm.4 | 2 +- share/man/man4/uark.4 | 2 +- share/man/man4/uath.4 | 2 +- share/man/man4/ufoma.4 | 2 +- share/man/man4/uipaq.4 | 6 ++--- share/man/man4/upgt.4 | 10 ++++---- share/man/man4/vge.4 | 2 +- share/man/man4/virtio.4 | 4 ++-- share/man/man4/vxge.4 | 2 +- share/man/man4/wbwd.4 | 2 +- share/man/man4/wi.4 | 2 +- share/man/man4/wlan_acl.4 | 2 +- share/man/man4/wlan_amrr.4 | 2 +- share/man/man4/wpi.4 | 8 +++---- share/man/man4/xen.4 | 4 ++-- share/man/man4/xnb.4 | 10 ++++---- share/man/man5/ar.5 | 2 +- share/man/man5/fdescfs.5 | 2 +- share/man/man5/fs.5 | 4 ++-- share/man/man5/fstab.5 | 6 ++--- share/man/man5/nsmb.conf.5 | 4 ++-- share/man/man5/quota.user.5 | 10 ++++---- share/man/man5/services.5 | 2 +- share/man/man7/release.7 | 16 ++++++------- share/man/man8/picobsd.8 | 2 +- share/man/man9/BUS_DESCRIBE_INTR.9 | 2 +- share/man/man9/BUS_SETUP_INTR.9 | 4 ++-- share/man/man9/DB_COMMAND.9 | 14 ++++++------ share/man/man9/DEVICE_PROBE.9 | 6 ++--- share/man/man9/SYSINIT.9 | 2 +- share/man/man9/buf_ring.9 | 2 +- share/man/man9/condvar.9 | 4 ++-- share/man/man9/devclass_get_maxunit.9 | 2 +- share/man/man9/device_get_children.9 | 4 ++-- share/man/man9/drbr.9 | 8 +++---- share/man/man9/eventtimers.9 | 2 +- share/man/man9/firmware.9 | 2 +- share/man/man9/ieee80211.9 | 20 ++++++++-------- share/man/man9/ieee80211_amrr.9 | 6 ++--- share/man/man9/ieee80211_bmiss.9 | 4 ++-- share/man/man9/ieee80211_input.9 | 2 +- share/man/man9/ieee80211_node.9 | 12 +++++----- share/man/man9/ieee80211_output.9 | 8 +++---- share/man/man9/ieee80211_proto.9 | 12 +++++----- share/man/man9/ieee80211_radiotap.9 | 4 ++-- share/man/man9/ieee80211_regdomain.9 | 4 ++-- share/man/man9/ieee80211_scan.9 | 2 +- share/man/man9/ieee80211_vap.9 | 4 ++-- share/man/man9/kproc.9 | 6 ++--- share/man/man9/kthread.9 | 8 +++---- share/man/man9/lock.9 | 2 +- share/man/man9/locking.9 | 14 ++++++------ share/man/man9/malloc.9 | 2 +- share/man/man9/mi_switch.9 | 2 +- share/man/man9/osd.9 | 2 +- share/man/man9/rmlock.9 | 10 ++++---- share/man/man9/shm_map.9 | 2 +- share/man/man9/sleep.9 | 4 ++-- share/man/man9/spl.9 | 4 ++-- share/man/man9/sysctl_ctx_init.9 | 2 +- share/man/man9/taskqueue.9 | 8 +++---- share/man/man9/timeout.9 | 4 ++-- share/man/man9/usbdi.9 | 18 +++++++-------- share/man/man9/vm_map_find.9 | 2 +- share/man/man9/watchdog.9 | 2 +- 123 files changed, 311 insertions(+), 311 deletions(-) (limited to 'share') diff --git a/share/man/man3/pthread_attr_affinity_np.3 b/share/man/man3/pthread_attr_affinity_np.3 index 592652b..8813f1a 100644 --- a/share/man/man3/pthread_attr_affinity_np.3 +++ b/share/man/man3/pthread_attr_affinity_np.3 @@ -119,7 +119,7 @@ or the attribute specified by it is .It Bq Er EINVAL The .Fa cpusetp -specified a CPU that was outside the set supported by the kernel. +specified a CPU that was outside the set supported by the kernel. .It Bq Er ERANGE The .Fa cpusetsize diff --git a/share/man/man3/pthread_cond_timedwait.3 b/share/man/man3/pthread_cond_timedwait.3 index 11a3c2f..071f690 100644 --- a/share/man/man3/pthread_cond_timedwait.3 +++ b/share/man/man3/pthread_cond_timedwait.3 @@ -83,8 +83,8 @@ is invalid. The system time has reached or exceeded the time specified in .Fa abstime . .It Bq Er EPERM -The specified -.Fa mutex +The specified +.Fa mutex was not locked by the calling thread. .El .Sh SEE ALSO diff --git a/share/man/man3/pthread_cond_wait.3 b/share/man/man3/pthread_cond_wait.3 index 0727603..c057098 100644 --- a/share/man/man3/pthread_cond_wait.3 +++ b/share/man/man3/pthread_cond_wait.3 @@ -72,8 +72,8 @@ or the value specified by .Fa mutex is invalid. .It Bq Er EPERM -The specified -.Fa mutex +The specified +.Fa mutex was not locked by the calling thread. .El .Sh SEE ALSO diff --git a/share/man/man4/acpi_hp.4 b/share/man/man4/acpi_hp.4 index 02bf346..dbb0ca0 100644 --- a/share/man/man4/acpi_hp.4 +++ b/share/man/man4/acpi_hp.4 @@ -93,7 +93,7 @@ WWAN on air status changed to 1 (on air) .El .Ss Xr devfs 8 Ss Device You can read /dev/hpcmi to see your current BIOS settings. -The detail level can be adjusted by setting the sysctl +The detail level can be adjusted by setting the sysctl .Va cmi_detail as described below. .Sh SYSCTL VARIABLES @@ -101,7 +101,7 @@ The following sysctls are currently implemented: .Ss WLAN: .Bl -tag -width indent .It Va dev.acpi_hp.0.wlan_enabled -Toggle WLAN chip activity. +Toggle WLAN chip activity. .It Va dev.acpi_hp.0.wlan_radio (read-only) WLAN radio status (controlled by hardware switch) @@ -116,7 +116,7 @@ If set to 1, the WLAN chip will be disabled if the radio is turned off .Ss Bluetooth: .Bl -tag -width indent .It Va dev.acpi_hp.0.bt_enabled -Toggle Bluetooth chip activity. +Toggle Bluetooth chip activity. .It Va dev.acpi_hp.0.bt_radio (read-only) Bluetooth radio status (controlled by hardware switch) @@ -131,7 +131,7 @@ If set to 1, the Bluetooth chip will be disabled if the radio is turned off .Ss WWAN: .Bl -tag -width indent .It Va dev.acpi_hp.0.wwan_enabled -Toggle WWAN chip activity. +Toggle WWAN chip activity. .It Va dev.acpi_hp.0.wwan_radio (read-only) WWAN radio status (controlled by hardware switch) @@ -229,14 +229,14 @@ Get BIOS settings: .Bd -literal -offset indent cat /dev/hpcmi -Serial Port Disable -Infrared Port Enable -Parallel Port Disable -Flash Media Reader Disable -USB Ports including Express Card slot Enable -1394 Port Enable -Cardbus Slot Disable -Express Card Slot Disable +Serial Port Disable +Infrared Port Enable +Parallel Port Disable +Flash Media Reader Disable +USB Ports including Express Card slot Enable +1394 Port Enable +Cardbus Slot Disable +Express Card Slot Disable (...) .Ed .Pp diff --git a/share/man/man4/acpi_wmi.4 b/share/man/man4/acpi_wmi.4 index 0825249..12ecdfa 100644 --- a/share/man/man4/acpi_wmi.4 +++ b/share/man/man4/acpi_wmi.4 @@ -47,7 +47,7 @@ acpi_wmi_load="YES" .Sh DESCRIPTION The .Nm -driver provides an interface for vendor specific WMI implementations +driver provides an interface for vendor specific WMI implementations (e.g. HP and Acer laptops). It creates /dev/wmistat%d, which can be read to get information about GUIDs found in the system. diff --git a/share/man/man4/ada.4 b/share/man/man4/ada.4 index 9e31756..698ce36 100644 --- a/share/man/man4/ada.4 +++ b/share/man/man4/ada.4 @@ -121,7 +121,7 @@ seconds. .It Va kern.cam.ada.spindown_shutdown .Pp This variable determines whether to spin-down disks when shutting down. -Set to 1 to enable spin-down, 0 to disable. +Set to 1 to enable spin-down, 0 to disable. The default is currently enabled. .It Va kern.cam.ada.write_cache .It Va kern.cam.ada. Ns Ar X Ns Va .write_cache diff --git a/share/man/man4/aibs.4 b/share/man/man4/aibs.4 index b865ec8..b955f0f 100644 --- a/share/man/man4/aibs.4 +++ b/share/man/man4/aibs.4 @@ -90,15 +90,15 @@ dev.aibs.0.fan.0: 878 600 7200 dev.aibs.0.fan.1: 0 700 7200 .Pp > sysctl -d dev.aibs.0.{volt,temp,fan} -dev.aibs.0.volt: +dev.aibs.0.volt: dev.aibs.0.volt.0: Vcore Voltage dev.aibs.0.volt.1: +3.3 Voltage dev.aibs.0.volt.2: +5 Voltage dev.aibs.0.volt.3: +12 Voltage -dev.aibs.0.temp: +dev.aibs.0.temp: dev.aibs.0.temp.0: CPU Temperature dev.aibs.0.temp.1: MB Temperature -dev.aibs.0.fan: +dev.aibs.0.fan: dev.aibs.0.fan.0: CPU FAN Speed dev.aibs.0.fan.1: CHASSIS FAN Speed .Ed diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4 index 33250ac..e145853 100644 --- a/share/man/man4/ath.4 +++ b/share/man/man4/ath.4 @@ -129,14 +129,14 @@ use on cards that use a 5212 part. When multiple interfaces are configured each may have a separate mac address that is formed by setting the U/L bits in the mac address assigned to the underlying device. -Any number of +Any number of .Cm wds virtual interfaces may be configured together with .Cm hostap interfaces. Multiple .Cm station -interfaces may be operated together with +interfaces may be operated together with .Cm hostap interfaces to construct a wireless repeater device. The driver also support @@ -191,7 +191,7 @@ the fxp0 (wired) device: .Bd -literal -offset indent ifconfig wlan0 create wlandev ath0 wlanmode hostap \e ssid paying-customers wepmode on wepkey 0x1234567890 \e - mode 11a up + mode 11a up ifconfig wlan1 create wlandev ath0 wlanmode hostap bssid \e ssid freeloaders up ifconfig bridge0 create addm wlan0 addm wlan1 addm fxp0 up @@ -202,7 +202,7 @@ Create a master node in a two slot TDMA BSS configured to use .Bd -literal -offset indent ifconfig wlan0 create wlandev ath0 wlanmode tdma \e ssid tdma-test tmdaslot 0 tdmaslotlen 2500 \e - channel 36 up + channel 36 up .Ed .Sh DIAGNOSTICS .Bl -diag diff --git a/share/man/man4/atp.4 b/share/man/man4/atp.4 index 6700802..ed7b4d3 100644 --- a/share/man/man4/atp.4 +++ b/share/man/man4/atp.4 @@ -98,7 +98,7 @@ Core2 Duo MacBook3,1 (IDs: 0x0229, 0x022a, 0x022b) .El .Pp To discover the product\-id of a touchpad, search for 'Trackpad' in the -output of +output of .Xr lshal 1 and look up the property .Nm usb_device.product_id . @@ -108,7 +108,7 @@ creates a blocking pseudo\-device file, .Pa /dev/atp0 , which presents the mouse as a .Ar sysmouse -or +or .Ar mousesystems type device\-\-see .Xr moused 8 @@ -117,7 +117,7 @@ types. .Xr moused 8 can be configured to read touchpad data from .Pa /dev/atp0 -and pass it along to the +and pass it along to the .Xr sysmouse 4 driver so that any process wanting to utilize mouse operation (such as an X server) may fetch it from diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4 index f03ee97..05e4ece 100644 --- a/share/man/man4/carp.4 +++ b/share/man/man4/carp.4 @@ -187,7 +187,7 @@ Subsystem specifies vhid and name of interface, where event occurred. Type of the message displays new state of vhid. Please see .Xr devd.conf 5 -and +and .Sx EXAMPLES section for more information. .Sh EXAMPLES diff --git a/share/man/man4/coda.4 b/share/man/man4/coda.4 index 94b12ae..e1799ef 100644 --- a/share/man/man4/coda.4 +++ b/share/man/man4/coda.4 @@ -28,7 +28,7 @@ .Dt CODA 4 .Os .Sh NAME -.Nm coda +.Nm coda .Nd Coda Distributed File System .Sh SYNOPSIS To compile this driver into the kernel, diff --git a/share/man/man4/epair.4 b/share/man/man4/epair.4 index 8787727..899bd5f 100644 --- a/share/man/man4/epair.4 +++ b/share/man/man4/epair.4 @@ -103,7 +103,7 @@ support on top of it. .Xr bpf 4 , .Xr if_bridge 4 , .Xr vlan 4 , -.Xr loader.conf 5 , +.Xr loader.conf 5 , .Xr rc.conf 5 , .Xr ifconfig 8 .Sh HISTORY diff --git a/share/man/man4/gem.4 b/share/man/man4/gem.4 index 213eb74..e4ebeb0 100644 --- a/share/man/man4/gem.4 +++ b/share/man/man4/gem.4 @@ -53,13 +53,13 @@ The driver provides support for the GMAC Ethernet hardware found mostly in the last Apple PowerBooks G3s and most G4-based Apple hardware, as well as Sun UltraSPARC machines. -.Pp -All controllers supported by the -.Nm -driver have TCP checksum offload capability for both receive and transmit, -support for the reception and transmission of extended frames for -.Xr vlan 4 -and a 512-bit multicast hash filter. +.Pp +All controllers supported by the +.Nm +driver have TCP checksum offload capability for both receive and transmit, +support for the reception and transmission of extended frames for +.Xr vlan 4 +and a 512-bit multicast hash filter. .Sh HARDWARE Chips supported by the .Nm diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4 index f633e49..827c93e 100644 --- a/share/man/man4/gre.4 +++ b/share/man/man4/gre.4 @@ -337,4 +337,4 @@ Incoming packets with a different key or without a key will be treated as if the would belong to this interface. .Pp RFC1701 is not fully supported, however all unsupported features have been -deprecated in RFC2784. +deprecated in RFC2784. diff --git a/share/man/man4/ipmi.4 b/share/man/man4/ipmi.4 index c34093a..08dd0b0 100644 --- a/share/man/man4/ipmi.4 +++ b/share/man/man4/ipmi.4 @@ -63,7 +63,7 @@ If the .Ar port and .Ar spacing -are not specified the interface type default will be used. Only specify +are not specified the interface type default will be used. Only specify either the .Ar port for I/O access or diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4 index cfa7de7..21ec44c 100644 --- a/share/man/man4/ipw.4 +++ b/share/man/man4/ipw.4 @@ -127,7 +127,7 @@ This should not happen. The driver failed to load the firmware image using the .Xr firmware 9 subsystem. -Verify the +Verify the .Xr ipwfw 4 firmware module is installed and the license agreement .Xr loader 8 diff --git a/share/man/man4/isci.4 b/share/man/man4/isci.4 index 6cf471a..0179a76 100644 --- a/share/man/man4/isci.4 +++ b/share/man/man4/isci.4 @@ -1,7 +1,7 @@ -.\" +.\" .\" Copyright (c) 2012 Intel Corporation .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -13,7 +13,7 @@ .\" ("Disclaimer") and any redistribution must be conditioned upon .\" including a substantially similar Disclaimer requirement for further .\" binary redistribution. -.\" +.\" .\" NO WARRANTY .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS .\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -26,7 +26,7 @@ .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGES. -.\" +.\" .\" isci driver man page. .\" .\" Author: Jim Harris @@ -86,7 +86,7 @@ These can be enabled by adding options ISCI_LOGGING .Ed .Pp -to the kernel configuration file. +to the kernel configuration file. .Sh SEE ALSO .Xr cd 4 , .Xr ch 4 , diff --git a/share/man/man4/iscsi_initiator.4 b/share/man/man4/iscsi_initiator.4 index 90df509..b937f6b 100644 --- a/share/man/man4/iscsi_initiator.4 +++ b/share/man/man4/iscsi_initiator.4 @@ -79,7 +79,7 @@ the IP address of the target of session statistics for session .Em n .It Va net.iscsi.n.pid -the +the .Em "process id" of the userland side of session .Em n , @@ -87,7 +87,7 @@ see .Xr iscontrol 8 . .El .Sh FILES -The +The .Nm driver creates the following: .Pp diff --git a/share/man/man4/iwi.4 b/share/man/man4/iwi.4 index 7428542..97ff634 100644 --- a/share/man/man4/iwi.4 +++ b/share/man/man4/iwi.4 @@ -127,7 +127,7 @@ This should not happen. The driver failed to load the firmware image using the .Xr firmware 9 subsystem. -Verify the +Verify the .Xr iwifw 4 firmware module is installed and the license agreement .Xr loader 8 diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4 index c43e14e..2c47f6f 100644 --- a/share/man/man4/iwn.4 +++ b/share/man/man4/iwn.4 @@ -151,7 +151,7 @@ This should not happen. The driver failed to load the firmware image using the .Xr firmware 9 subsystem. -Verify the +Verify the .Xr iwnfw 4 firmware module is present. .It "iwn%d: could not load boot firmware" diff --git a/share/man/man4/iwnfw.4 b/share/man/man4/iwnfw.4 index 39752cf..681d728 100644 --- a/share/man/man4/iwnfw.4 +++ b/share/man/man4/iwnfw.4 @@ -65,7 +65,7 @@ iwn6050fw_load="YES" .Ed .Sh DESCRIPTION This module provides access to firmware sets for the -Intel Wireless WiFi Link 4965, 1000, 5000 and 6000 series of +Intel Wireless WiFi Link 4965, 1000, 5000 and 6000 series of IEEE 802.11n adapters. It may be statically linked into the kernel, or loaded as a module. diff --git a/share/man/man4/ixgbe.4 b/share/man/man4/ixgbe.4 index 24c583c..1fa970c 100644 --- a/share/man/man4/ixgbe.4 +++ b/share/man/man4/ixgbe.4 @@ -1,6 +1,6 @@ .\" Copyright (c) 2001-2008, Intel Corporation .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions are met: .\" @@ -79,13 +79,13 @@ driver supports the following cards: .Pp .Bl -bullet -compact .It -Intel(R) 10 Gigabit XF SR/AF Dual Port Server Adapter +Intel(R) 10 Gigabit XF SR/AF Dual Port Server Adapter .It Intel(R) 10 Gigabit XF SR/LR Server Adapter .It Intel(R) 82598EB 10 Gigabit AF Network Connection .It -Intel(R) 82598EB 10 Gigabit AT CX4 Network Connection +Intel(R) 82598EB 10 Gigabit AT CX4 Network Connection .El .Sh DIAGNOSTICS .Bl -diag diff --git a/share/man/man4/ksyms.4 b/share/man/man4/ksyms.4 index 9272eb8..b8e4f26 100644 --- a/share/man/man4/ksyms.4 +++ b/share/man/man4/ksyms.4 @@ -42,15 +42,15 @@ .Sh DESCRIPTION The .Pa /dev/ksyms -character device provides a read-only interface to a snapshot of the kernel +character device provides a read-only interface to a snapshot of the kernel symbol table. The in-kernel symbol manager is designed to be able to handle -many types of symbols tables, however, only +many types of symbols tables, however, only .Xr elf 5 symbol tables are supported by this device. The ELF format image contains two -sections: a symbol table and a corresponding string table. +sections: a symbol table and a corresponding string table. .Bl -tag -width indent -offset indent .It Dv Symbol Table -The SYMTAB section contains the symbol table entries present in the current +The SYMTAB section contains the symbol table entries present in the current running kernel, including the symbol table entries of any loaded modules. The symbols are ordered by the kernel module load time starting with kernel file symbols first, followed by the first loaded module's symbols and so on. @@ -65,10 +65,10 @@ file represents the state of the kernel at the time when the device is opened. Since .Pa /dev/ksyms has no text or data, most of the fields are initialized to NULL. -The -.Nm +The +.Nm driver does not block the loading or unloading of modules into the kernel -while the +while the .Pa /dev/ksyms file is open but may contain stale data. .Sh IOCTLS @@ -87,29 +87,29 @@ This can be used when allocating a buffer to make a copy of the kernel symbol table. .It Dv KIOCGADDR (void *) Returns the address of the kernel symbol table mapped in -the process memory. +the process memory. .El .Sh FILES .Bl -tag -width /dev/ksymsX .It Pa /dev/ksyms .El .Sh ERRORS -An +An .Xr open 2 of .Pa /dev/ksyms -will fail if: +will fail if: .Bl -tag -width Er .It Bq Er EBUSY -The device is already open. A process must close +The device is already open. A process must close .Pa /dev/ksyms -before it can be opened again. +before it can be opened again. .It Bq Er ENOMEM There is a resource shortage in the kernel. .It Bq Er ENXIO The driver was unsuccessful in creating a snapshot of the kernel symbol table. This may occur if the kernel was in the process of loading or -unloading a module. +unloading a module. .El .Sh SEE ALSO .Xr ioctl 2 , @@ -128,7 +128,7 @@ The .Nm driver first appeared in .Fx 8.0 -to support +to support .Xr lockstat 1 . .Sh AUTHORS The @@ -137,7 +137,7 @@ driver was written by .An Stacey Son .Aq sson@FreeBSD.org . .Sh BUGS -Because files can be dynamically linked into the kernel at any time the symbol +Because files can be dynamically linked into the kernel at any time the symbol information can vary. When you open the .Pa /dev/ksyms file, you have access to an ELF image which represents a snapshot of the state of the kernel symbol information at that instant in time. Keeping the device open does not block the loading or unloading of kernel modules. To get a new snapshot you must close and re-open the device. @@ -147,12 +147,12 @@ A process is only allowed to open the file once at a time. The process must close the .Pa /dev/ksyms before it is allowed to open it again. -.Pp +.Pp The .Nm -driver uses the calling process' memory address space to store the snapshot. +driver uses the calling process' memory address space to store the snapshot. .Xr ioctl 2 can be used to get the memory address where the symbol table is stored to -save kernel memory. +save kernel memory. .Xr mmap 2 -may also be used but it will map it to another address. +may also be used but it will map it to another address. diff --git a/share/man/man4/ktr.4 b/share/man/man4/ktr.4 index 7da4e37..b4039f0 100644 --- a/share/man/man4/ktr.4 +++ b/share/man/man4/ktr.4 @@ -171,7 +171,7 @@ the next invocation. enables logging of .Nm entries to disk if it is set to one. -Setting this to 0 will terminate logging to disk and revert to +Setting this to 0 will terminate logging to disk and revert to logging to the normal ktr ring buffer. Data is not sent to the ring buffer while logging to disk. .It Va debug.ktr.alq_max diff --git a/share/man/man4/man4.i386/glxsb.4 b/share/man/man4/man4.i386/glxsb.4 index c7bef27..fb2669f 100644 --- a/share/man/man4/man4.i386/glxsb.4 +++ b/share/man/man4/man4.i386/glxsb.4 @@ -66,7 +66,7 @@ framework will fail to open the crypto session on the device if the AES key's length is != 128 bits. This prevents the use of the .Nm -device driver with AES keys of length != 128 bits. +device driver with AES keys of length != 128 bits. .Sh SEE ALSO .Xr crypto 4 , .Xr intro 4 , diff --git a/share/man/man4/man4.powerpc/abtn.4 b/share/man/man4/man4.powerpc/abtn.4 index 9de300d..670f5a27 100644 --- a/share/man/man4/man4.powerpc/abtn.4 +++ b/share/man/man4/man4.powerpc/abtn.4 @@ -60,7 +60,7 @@ The .Nm driver sends events to .Xr devd 8 -for the following events under the +for the following events under the .Cd PMU system, and .Cd keys diff --git a/share/man/man4/man4.powerpc/akbd.4 b/share/man/man4/man4.powerpc/akbd.4 index d4f3aa1..e56676a 100644 --- a/share/man/man4/man4.powerpc/akbd.4 +++ b/share/man/man4/man4.powerpc/akbd.4 @@ -63,15 +63,15 @@ The .Nm driver sends events to .Xr devd 8 -for the following events under the +for the following events under the .Cd PMU system: .Pp .Bl -bullet -compact .It -Power button - +Power button - .Cd "Button" -subsystem, +subsystem, .Cd "pressed" type. .El @@ -81,7 +81,7 @@ The driver supports the following sysctl variable for configuring the Fn keys: .Bl -tag -width indent .It Va dev.akbd.%d.fn_keys_function_as_primary -Set the Fn keys to be their F-key type as default. A value of 0 causes the +Set the Fn keys to be their F-key type as default. A value of 0 causes the F-keys keys to work as special keys by default ( .Xr abtn 4 ) and a value of 1 sets them to behave as F-keys by default. diff --git a/share/man/man4/man4.powerpc/bm.4 b/share/man/man4/man4.powerpc/bm.4 index 5c4a35f..9d6a029 100644 --- a/share/man/man4/man4.powerpc/bm.4 +++ b/share/man/man4/man4.powerpc/bm.4 @@ -50,8 +50,8 @@ if_bm_load="YES" The .Nm driver provides support for the BMac ethernet hardware found mostly in -G3-based Apple hardware. -It is a close relative of the Sun HME controller found in contemporary +G3-based Apple hardware. +It is a close relative of the Sun HME controller found in contemporary Sun workstations. .Sh HARDWARE Chips supported by the diff --git a/share/man/man4/man4.powerpc/cuda.4 b/share/man/man4/man4.powerpc/cuda.4 index 4b4b218..f1faaf2 100644 --- a/share/man/man4/man4.powerpc/cuda.4 +++ b/share/man/man4/man4.powerpc/cuda.4 @@ -46,7 +46,7 @@ driver provides support for the CUDA VIA (Versatile Interface Attachment) chip found in pre-Core99 Apple hardware, such as the Power Macintosh G3. .Pp The Apple CUDA controller is a multi-purpose ASIC that provides power -control and an +control and an .Xr adb 4 interface. .Sh HARDWARE diff --git a/share/man/man4/man4.powerpc/smu.4 b/share/man/man4/man4.powerpc/smu.4 index 893522c..2550a0d 100644 --- a/share/man/man4/man4.powerpc/smu.4 +++ b/share/man/man4/man4.powerpc/smu.4 @@ -103,7 +103,7 @@ sensors in millivolts, and power sensors in milliwatts. .Sh LED INTERFACE The .Nm -driver provides an +driver provides an .Xr led 4 annunciator interface at .Pa /dev/led/sleepled . diff --git a/share/man/man4/man4.powerpc/snd_ai2s.4 b/share/man/man4/man4.powerpc/snd_ai2s.4 index a69faa0..472a518 100644 --- a/share/man/man4/man4.powerpc/snd_ai2s.4 +++ b/share/man/man4/man4.powerpc/snd_ai2s.4 @@ -49,7 +49,7 @@ snd_ai2s_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for the Apple I2S audio controllers found +driver provides support for the Apple I2S audio controllers found predominantly in G4 and G5 machines, along with the snapper and tumbler codecs. Some machines (e.g. the Mac Mini) do not have configurable codecs and so lack hardware volume control. diff --git a/share/man/man4/md.4 b/share/man/man4/md.4 index 4d7e492..49b0069 100644 --- a/share/man/man4/md.4 +++ b/share/man/man4/md.4 @@ -76,7 +76,7 @@ The image in .Pa /h/foo/ARM-MD will be loaded as the initial image each boot. To create the image to use, please follow the steps to create a file-backed -disk found in the +disk found in the .Xr mdconfig 8 man page. Other tools will also create these images, such as NanoBSD. diff --git a/share/man/man4/mld.4 b/share/man/man4/mld.4 index b761bb1..b6f3cee 100644 --- a/share/man/man4/mld.4 +++ b/share/man/man4/mld.4 @@ -52,7 +52,7 @@ itself, in response to multicast membership requests by user applications. Multicast routing protocol daemons may open a raw socket to directly interact with -.Nm +.Nm and receive membership reports. .Pp As of diff --git a/share/man/man4/mmc.4 b/share/man/man4/mmc.4 index 867c6e7..95fe976 100644 --- a/share/man/man4/mmc.4 +++ b/share/man/man4/mmc.4 @@ -42,7 +42,7 @@ driver supports all MMC and SD bridges in the system. All SD or MMC cards in the system attach to an instance of .Nm . The -.Nm +.Nm bus typically has only one slot, and only memory cards. MultiMediaCards exist only in memory. SD Cards exist as memory, I/O, or combination cards. diff --git a/share/man/man4/mos.4 b/share/man/man4/mos.4 index 4ca0db5..2656dea 100644 --- a/share/man/man4/mos.4 +++ b/share/man/man4/mos.4 @@ -43,7 +43,7 @@ if_mos_load="YES" .Sh DESCRIPTION The .Nm -driver provides support for USB Ethernet adapters based on the +driver provides support for USB Ethernet adapters based on the Moschip MCS7730/MCS7830/MCS7832 chipset. .Pp The adapters that contain the Moschip MCS7730/MCS7830/MCS7832 chipset diff --git a/share/man/man4/mps.4 b/share/man/man4/mps.4 index 54b0c0b..dbf35cd 100644 --- a/share/man/man4/mps.4 +++ b/share/man/man4/mps.4 @@ -1,7 +1,7 @@ -.\" +.\" .\" Copyright (c) 2010 Spectra Logic Corporation .\" All rights reserved. -.\" +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -13,7 +13,7 @@ .\" ("Disclaimer") and any redistribution must be conditioned upon .\" including a substantially similar Disclaimer requirement for further .\" binary redistribution. -.\" +.\" .\" NO WARRANTY .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS .\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -26,7 +26,7 @@ .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGES. -.\" +.\" .\" mps driver man page. .\" .\" Author: Ken Merry @@ -117,7 +117,7 @@ dev.mps.X.disable_msix=1 .Ed .Pp To set the maximum number of DMA chains allocated for all adapters, -set the following variable in +set the following variable in .Xr loader.conf 5 : .Bd -literal -offset indent hw.mps.max_chains=NNNN @@ -207,7 +207,7 @@ This driver has a couple of known shortcomings: .It Not endian safe. It only works on little endian machines (e.g. amd64 and i386). -.It +.It No userland utility available (e.g. .Xr mptutil 8) .It diff --git a/share/man/man4/mwl.4 b/share/man/man4/mwl.4 index 1864647..62dc29e 100644 --- a/share/man/man4/mwl.4 +++ b/share/man/man4/mwl.4 @@ -93,14 +93,14 @@ virtual interfaces may be configured for simultaneous use. When multiple interfaces are configured each may have a separate mac address that is formed by setting the U/L bits in the mac address assigned to the underlying device. -Any number of +Any number of .Cm wds virtual interfaces may be configured together with .Cm hostap interfaces. Multiple .Cm station -interfaces may be operated together with +interfaces may be operated together with .Cm hostap interfaces to construct a wireless repeater device. For more information on configuring this device, see @@ -150,7 +150,7 @@ the fxp0 (wired) device: .Bd -literal -offset indent ifconfig wlan0 create wlandev mwl0 wlanmode hostap \e ssid paying-customers wepmode on wepkey 0x1234567890 \e - mode 11a up + mode 11a up ifconfig wlan1 create wlandev mwl0 wlanmode hostap bssid \e ssid freeloaders up ifconfig bridge0 create addm wlan0 addm wlan1 addm fxp0 up diff --git a/share/man/man4/net80211.4 b/share/man/man4/net80211.4 index 967bbe9..20d71fe 100644 --- a/share/man/man4/net80211.4 +++ b/share/man/man4/net80211.4 @@ -199,7 +199,7 @@ Return the time between Beacon frames (in TU) in .It Dv IEEE80211_IOC_BGSCAN Return whether background scanning is enabled in .Va i_val . -When this value is non-zero and operating in station mode +When this value is non-zero and operating in station mode the station will periodically leave the current channel and scan for neighboring stations. See also @@ -343,7 +343,7 @@ Return, in .Va i_val , whether SSID hiding/cloaking is enabled. SSID hiding is only meaningful when operating as an access point. -When this is enabled Beacon frames do not include the SSID and +When this is enabled Beacon frames do not include the SSID and ProbeRequest frames are not answered unless they include the AP's SSID. This value will be non-zero when SSID hiding is enabled and otherwise zero. .It Dv IEEE80211_IOC_HTCOMPAT @@ -464,7 +464,7 @@ This value is also termed the listen interval and represents the maximum time a station will sleep before waking to retrieve packets buffered by an access point. .It Dv IEEE80211_IOC_PRIVACY -Return the current MLME setting for PRIVACY in +Return the current MLME setting for PRIVACY in .Va i_val . When PRIVACY is enabled all data packets must be encrypted. This value will be zero if PRIVACY is disabled and @@ -1093,7 +1093,7 @@ Set the powersave sleep time in TU to the value in .Va i_val . This request causes a running interface to be reset. .It Dv IEEE80211_IOC_PRIVACY -Set the current MLME setting for PRIVACY using the value in +Set the current MLME setting for PRIVACY using the value in .Va i_val . See .Dv IEEE80211_IOC_PRIVACY @@ -1205,7 +1205,7 @@ This request causes a running interface to be reset. Set the current TDMA slot to the value in .Va i_val . Values must be in the range [0-slotcnt]. -Slot 0 identifies the master in the TDMA network; if it running it will +Slot 0 identifies the master in the TDMA network; if it running it will immediately start sending Beacon frames. .It Dv IEEE80211_IOC_TDMA_SLOTCNT Set the number of slots in the TDMA network to the value in diff --git a/share/man/man4/netmap.4 b/share/man/man4/netmap.4 index 0af979c..8edcb02 100644 --- a/share/man/man4/netmap.4 +++ b/share/man/man4/netmap.4 @@ -21,7 +21,7 @@ .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. -.\" +.\" .\" This document is derived in part from the enet man page (enet.4) .\" distributed with 4.3BSD Unix. .\" @@ -43,7 +43,7 @@ is a framework for fast and safe access to network devices .Nm uses memory mapped buffers and metadata (buffer indexes and lengths) to communicate with the kernel, -which is in charge of validating information through +which is in charge of validating information through .Pa ioctl() and .Pa select()/poll(). @@ -65,7 +65,7 @@ to bind the file descriptor to a network device. When a device is put in .Nm mode, its data path is disconnected from the host stack. -The processes owning the file descriptor +The processes owning the file descriptor can exchange packets with the device, or with the host stack, through an mmapped memory region that contains pre-allocated buffers and metadata. diff --git a/share/man/man4/ng_car.4 b/share/man/man4/ng_car.4 index 080986e..79967e7 100644 --- a/share/man/man4/ng_car.4 +++ b/share/man/man4/ng_car.4 @@ -150,7 +150,7 @@ enum { /* mode options (opt) */ #define NG_CAR_COUNT_PACKETS 2 - + struct ng_car_bulkconf { struct ng_car_hookconf upstream; struct ng_car_hookconf downstream; diff --git a/share/man/man4/ng_deflate.4 b/share/man/man4/ng_deflate.4 index 25ba5e8..11dc132 100644 --- a/share/man/man4/ng_deflate.4 +++ b/share/man/man4/ng_deflate.4 @@ -40,7 +40,7 @@ .Sh DESCRIPTION The .Nm deflate -node type implements the Deflate sub-protocols of the Compression Control +node type implements the Deflate sub-protocols of the Compression Control Protocol (CCP). .Pp The node has two hooks, @@ -111,7 +111,7 @@ The receiver should respond by sending a PPP CCP Reset-Request to the peer. .Pp This message may also be received by this node type when a CCP Reset-Request or Reset-Ack is received by the local PPP entity. -The node will respond by flushing its compression state so the sides +The node will respond by flushing its compression state so the sides can resynchronize. .It Dv NGM_DEFLATE_GET_STATS Pq Li getstats This control message obtains statistics for a given hook. @@ -154,5 +154,5 @@ control message, or when hook have been disconnected. .An Alexander Motin Aq mav@alkar.net .Sh BUGS Due to nature of netgraph PPP implementation there are possible race conditions -between data packet and ResetAck CCP packet in case of packet loss. As result, +between data packet and ResetAck CCP packet in case of packet loss. As result, packet loss can produce bigger performance degradation than supposed by protocol. diff --git a/share/man/man4/ng_nat.4 b/share/man/man4/ng_nat.4 index cc89703..9a3e9bc 100644 --- a/share/man/man4/ng_nat.4 +++ b/share/man/man4/ng_nat.4 @@ -60,7 +60,7 @@ Configure aliasing address for a node. After both hooks have been connected and aliasing address was configured, a node is ready for aliasing operation. .It Dv NGM_NAT_SET_MODE Pq Li setmode -Set node's operation mode using supplied +Set node's operation mode using supplied .Vt "struct ng_nat_mode". .Bd -literal struct ng_nat_mode { @@ -78,7 +78,7 @@ struct ng_nat_mode { .Ed .It Dv NGM_NAT_SET_TARGET Pq Li settarget Configure target address for a node. -When an incoming packet not associated with any pre-existing aliasing +When an incoming packet not associated with any pre-existing aliasing link arrives at the host machine, it will be sent to the specified address. .It Dv NGM_NAT_REDIRECT_PORT Pq Li redirectport Redirect incoming connections arriving to given port(s) to diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4 index 47684ef..ca00201 100644 --- a/share/man/man4/ng_netflow.4 +++ b/share/man/man4/ng_netflow.4 @@ -71,9 +71,9 @@ and the same number of hooks named .Va out0 , out1 , etc., plus two export hooks: -.Va export +.Va export (for NetFlow version 5) and -.Va export9 +.Va export9 (for NetFlow version 9). Export can be done simultaneously for all supported export hooks. By default (ingress NetFlow enabled) node does NetFlow accounting of data received on @@ -193,7 +193,7 @@ if it several times passes via exactly this netflow node. Last two options are important to avoid duplicate accounting when both ingress and egress NetFlow are enabled. .It Dv NGM_NETFLOW_SETTEMPLATE -Sets various timeouts to announce data flow templates +Sets various timeouts to announce data flow templates (NetFlow v9-specific). This message requires .Vt "struct ng_netflow_settemplate" as an argument: @@ -208,7 +208,7 @@ Value of time field represents time in seconds to re-announce data templates. Value of packets field represents maximum packets count between re-announcing data templates. .It Dv NGM_NETFLOW_SETMTU -Sets export interface MTU to build packets of specified size (NetFlow v9-specific). +Sets export interface MTU to build packets of specified size (NetFlow v9-specific). This message requires .Vt "struct ng_netflow_setmtu" as an argument: diff --git a/share/man/man4/ng_patch.4 b/share/man/man4/ng_patch.4 index 416116e..e223c39 100644 --- a/share/man/man4/ng_patch.4 +++ b/share/man/man4/ng_patch.4 @@ -164,7 +164,7 @@ Here .Dq Li ttl_add node of type .Nm -configured to add (mode +configured to add (mode .Dv NG_PATCH_MODE_ADD ) a .Va value diff --git a/share/man/man4/ng_ppp.4 b/share/man/man4/ng_ppp.4 index 453d1bd..050d639 100644 --- a/share/man/man4/ng_ppp.4 +++ b/share/man/man4/ng_ppp.4 @@ -132,9 +132,9 @@ Compression is supported via two hooks, .Dv compress and .Dv decompress . -Compression and decompression can be enabled by toggling the +Compression and decompression can be enabled by toggling the .Vt enableCompression -and +and .Vt enableDecompression fields of the node configuration structure. (See below.) @@ -143,23 +143,23 @@ If is set to .Dv NG_PPP_COMPRESS_SIMPLE , then all outgoing frames are sent to the -.Dv compress +.Dv compress hook and all packets received on this hook are expected to be compressed, so the COMPD tag is put on them unconditionally. If .Vt enableCompression is set to .Dv NG_PPP_COMPRESS_FULL , -then packets received on the -.Dv compress +then packets received on the +.Dv compress hook are resent as is. The compressor node should put the tag, if the packet was compressed. -If +If .Vt enableDecompression -is set to +is set to .Dv NG_PPP_DECOMPRESS_SIMPLE , then the node will sent to the -.Dv decompress +.Dv decompress hook only those frames, that are marked with the COMPD tag. If .Vt enableDecompression @@ -396,7 +396,7 @@ Here .Dv NG_PPP_BUNDLE_LINKNUM is a valid link number corresponding to the multi-link bundle. .It Dv NGM_PPP_GET_LINK_STATS64 -Same as NGM_PPP_GET_LINK_STATS but returns +Same as NGM_PPP_GET_LINK_STATS but returns .Dv "struct ng_ppp_link_stat64" containing 64bit counters. .It Dv NGM_PPP_CLR_LINK_STATS @@ -407,7 +407,7 @@ Same as .Dv NGM_PPP_GET_LINK_STATS , but also atomically clears the statistics as well. .It Dv NGM_PPP_GETCLR_LINK_STATS64 -Same as NGM_PPP_GETCLR_LINK_STATS but returns +Same as NGM_PPP_GETCLR_LINK_STATS but returns .Dv "struct ng_ppp_link_stat64" containing 64bit counters. .El diff --git a/share/man/man4/ng_pred1.4 b/share/man/man4/ng_pred1.4 index 0048962..a8c8c5e 100644 --- a/share/man/man4/ng_pred1.4 +++ b/share/man/man4/ng_pred1.4 @@ -38,7 +38,7 @@ .Sh DESCRIPTION The .Nm pred1 -node type implements the Predictor-1 sub-protocols of the Compression Control +node type implements the Predictor-1 sub-protocols of the Compression Control Protocol (CCP). .Pp The node has two hooks, @@ -98,7 +98,7 @@ The receiver should respond by sending a PPP CCP Reset-Request to the peer. .Pp This message may also be received by this node type when a CCP Reset-Request or Reset-Ack is received by the local PPP entity. -The node will respond by flushing its compression state so the sides +The node will respond by flushing its compression state so the sides can resynchronize. .It Dv NGM_PRED1_GET_STATS Pq Li getstats This control message obtains statistics for a given hook. @@ -141,5 +141,5 @@ control message, or when hook have been disconnected. .An Alexander Motin Aq mav@alkar.net .Sh BUGS Due to nature of netgraph PPP implementation there are possible race conditions -between data packet and ResetAck CCP packet in case of packet loss. As result, +between data packet and ResetAck CCP packet in case of packet loss. As result, packet loss can produce bigger performance degradation than supposed by protocol. diff --git a/share/man/man4/ng_tty.4 b/share/man/man4/ng_tty.4 index 75e1b40..dc73e58 100644 --- a/share/man/man4/ng_tty.4 +++ b/share/man/man4/ng_tty.4 @@ -57,7 +57,7 @@ and frames received on .Dv hook are transmitted out on the tty device. No modification to the data is performed in either direction. -While the hook is installed on a tty, the normal read and write +While the hook is installed on a tty, the normal read and write operations are unavailable, returning .Er EIO . .Pp diff --git a/share/man/man4/nvram2env.4 b/share/man/man4/nvram2env.4 index 91d1639..36423fb 100644 --- a/share/man/man4/nvram2env.4 +++ b/share/man/man4/nvram2env.4 @@ -44,7 +44,7 @@ the string name, "=" delimiter and the string value. .Nm copies the environment values into kernel environment using the kernel setenv call. .Pp -Configuration of +Configuration of .Nm is done in .Xr device.hints 5 @@ -69,7 +69,7 @@ compatible, please set it to "1". Use format "Generic", skip uint32_t field, then zero terminating array of strings. .It Fa 0x0004 -Use Broadcom CFE format. uint32_t signature "FLSH", uint32_t size, +Use Broadcom CFE format. uint32_t signature "FLSH", uint32_t size, three unused fields uint32_t, then data. .It Fa 0x0008 Use U-Boot format, uint32_t crc, then zero terminating array of strings. diff --git a/share/man/man4/nxge.4 b/share/man/man4/nxge.4 index 4550535..8d94afc 100644 --- a/share/man/man4/nxge.4 +++ b/share/man/man4/nxge.4 @@ -48,8 +48,8 @@ if_nxge_load="YES" The .Nm driver provides support for Neterion Xframe-I and Xframe-II adapters. -The driver supports TCP Segmentation Offload (TSO/LSO), -Large Receive Offload (LRO), Jumbo Frames (5 buffer mode), +The driver supports TCP Segmentation Offload (TSO/LSO), +Large Receive Offload (LRO), Jumbo Frames (5 buffer mode), Header Separation (Rx 2 buffer mode), VLAN, and Promiscuous mode. .Pp For general information and support, please visit the Neterion support page diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index e9bfa6b..1ac5844 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -85,7 +85,7 @@ The following bridge device drivers are available: .It .Xr snd_audiocs 4 (enabled by default on sparc64) .It -.Xr snd_cmi 4 (enabled by default on amd64, i386) +.Xr snd_cmi 4 (enabled by default on amd64, i386) .It .Xr snd_cs4281 4 .It diff --git a/share/man/man4/pts.4 b/share/man/man4/pts.4 index 49e84ef..3faab8b 100644 --- a/share/man/man4/pts.4 +++ b/share/man/man4/pts.4 @@ -131,7 +131,7 @@ function should be used. .It Dv TIOCPTMASTER Determine whether the file descriptor is pointing to a pseudo-terminal master device. -This +This .Xr ioctl 2 should not be used directly. It is used to implement routines like .Xr grantpt 3 . diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4 index 0b13d08..f2e0e5f 100644 --- a/share/man/man4/ral.4 +++ b/share/man/man4/ral.4 @@ -82,7 +82,7 @@ Only one or .Cm mesh virtual interface may be configured at a time. -Any number of +Any number of .Cm wds virtual interfaces may be configured together with a .Cm hostap diff --git a/share/man/man4/run.4 b/share/man/man4/run.4 index f2fa809..5f895e1 100644 --- a/share/man/man4/run.4 +++ b/share/man/man4/run.4 @@ -105,7 +105,7 @@ The driver can be configured at runtime with .Xr ifconfig 8 . .Sh HARDWARE -The +The .Nm driver supports the following wireless adapters: .Pp diff --git a/share/man/man4/runfw.4 b/share/man/man4/runfw.4 index ddaf169..6bb86c7 100644 --- a/share/man/man4/runfw.4 +++ b/share/man/man4/runfw.4 @@ -32,7 +32,7 @@ kernel configuration file: .Ed .Pp This will include two firmware images, RT2870 and RT3071, inside the kernel. -.Xr run 4 +.Xr run 4 will load the appropriate image into the chip. .Pp Alternatively, to load the firmware images as a module at boot time, place diff --git a/share/man/man4/sfxge.4 b/share/man/man4/sfxge.4 index 3f27275..5e4935d 100644 --- a/share/man/man4/sfxge.4 +++ b/share/man/man4/sfxge.4 @@ -52,7 +52,7 @@ Solarflare SFC9000 family controllers. The driver supports jumbo frames, transmit/receive checksum offload, TCP Segmentation Offload (TSO), Large Receive Offload (LRO), VLAN checksum offload, VLAN TSO, -and Receive Side Scaling (RSS) using MSI-X interrupts. +and Receive Side Scaling (RSS) using MSI-X interrupts. .Pp The driver allocates 1 receive queue, transmit queue, event queue and IRQ per CPU up to a maximum of 64. diff --git a/share/man/man4/smp.4 b/share/man/man4/smp.4 index 5712dbd..1dfd283 100644 --- a/share/man/man4/smp.4 +++ b/share/man/man4/smp.4 @@ -123,7 +123,7 @@ supports hyperthreading on Intel CPU's on the i386 and AMD64 platforms. Because using logical CPUs can cause performance penalties under certain loads, the logical CPUs can be disabled by setting the .Va machdep.hyperthreading_allowed -tunable to zero. +tunable to zero. .Sh SEE ALSO .Xr cpuset 1 , .Xr mptable 1 , diff --git a/share/man/man4/snd_emu10kx.4 b/share/man/man4/snd_emu10kx.4 index 3892d1e..72568c3 100644 --- a/share/man/man4/snd_emu10kx.4 +++ b/share/man/man4/snd_emu10kx.4 @@ -119,7 +119,7 @@ option in your .Xr loader.conf 5 configuration file you will get up to five DSP devices, one for each sound card output. -You can use additional software (like +You can use additional software (like .Em audio/pulseaudio from .Em The Ports Collection ) diff --git a/share/man/man4/snd_ich.4 b/share/man/man4/snd_ich.4 index 71f47a7..c4359c8 100644 --- a/share/man/man4/snd_ich.4 +++ b/share/man/man4/snd_ich.4 @@ -52,7 +52,7 @@ bridge driver allows the generic audio driver to attach to Intel ICH AC'97 and compatible audio devices. .Pp Some later chips, like ICH6/ICH7, depending on wiring can instead implement -newer Intel HD Audio specification, which is supported by +newer Intel HD Audio specification, which is supported by .Xr snd_hda 4 driver. .Sh HARDWARE diff --git a/share/man/man4/tpm.4 b/share/man/man4/tpm.4 index 7615609..897aa00 100644 --- a/share/man/man4/tpm.4 +++ b/share/man/man4/tpm.4 @@ -48,7 +48,7 @@ In The .Nm driver provides support for various trusted platform modules (TPM) that can -store cryptographic keys. +store cryptographic keys. .Pp Supported modules: .Pp diff --git a/share/man/man4/uark.4 b/share/man/man4/uark.4 index 945983c..a4e2e56 100644 --- a/share/man/man4/uark.4 +++ b/share/man/man4/uark.4 @@ -43,7 +43,7 @@ The .Nm driver supports Arkmicro Technologies ARK3116 based serial adapters. .Sh HARDWARE -The +The .Nm driver supports the following adapters: .Pp diff --git a/share/man/man4/uath.4 b/share/man/man4/uath.4 index ad11809..3f4a9ab 100644 --- a/share/man/man4/uath.4 +++ b/share/man/man4/uath.4 @@ -76,7 +76,7 @@ This is normally done by the utility that is launched by .Xr devd 8 when the device is inserted. -.Xr uathload +.Xr uathload includes the firmware in the binary program. This firmware is licensed for general use and is included in the base system. .Sh HARDWARE diff --git a/share/man/man4/ufoma.4 b/share/man/man4/ufoma.4 index 77d192f..19028d9 100644 --- a/share/man/man4/ufoma.4 +++ b/share/man/man4/ufoma.4 @@ -99,7 +99,7 @@ When an interface is recognized by the system but not used, the interface will be set to this mode. .It Li unlinked When an interface is not yet negotiated, the interface is in this mode. -.El +.El .Sh HARDWARE Devices supported by the .Nm diff --git a/share/man/man4/uipaq.4 b/share/man/man4/uipaq.4 index 310cbfe..96b23e3 100644 --- a/share/man/man4/uipaq.4 +++ b/share/man/man4/uipaq.4 @@ -86,10 +86,10 @@ driver which makes it behave like a .Xr usb 4 .Sh HISTORY The -.Fx +.Fx support was imported from -.Nx -for +.Nx +for .Fx 7.0 . .Nx added support in diff --git a/share/man/man4/upgt.4 b/share/man/man4/upgt.4 index 7042dd7..7b81438 100644 --- a/share/man/man4/upgt.4 +++ b/share/man/man4/upgt.4 @@ -181,13 +181,13 @@ Join an existing BSS network (i.e., connect to an access point): .Bd -literal -offset indent ifconfig wlan create wlandev upgt0 inet 192.168.0.20 \e netmask 0xffffff00 -.Ed -.Pp +.Ed +.Pp Join a specific BSS network with network name -.Dq Li my_net : -.Pp +.Dq Li my_net : +.Pp .Dl "ifconfig wlan create wlandev upgt0 ssid my_net up" -.Pp +.Pp Join a specific BSS network with 64-bit WEP encryption: .Bd -literal -offset indent ifconfig wlan create wlandev upgt0 ssid my_net \e diff --git a/share/man/man4/vge.4 b/share/man/man4/vge.4 index 3ab9bce..5d48850 100644 --- a/share/man/man4/vge.4 +++ b/share/man/man4/vge.4 @@ -82,7 +82,7 @@ groups, the driver will switch over to using the hash filter. The jumbo frame support can be enabled by setting the interface MTU to any value larger than the default of 1500 bytes, up to a maximum of 9000 bytes. -Jumbo frames are disabled on the VT6130/VT6132 controllers because the TX +Jumbo frames are disabled on the VT6130/VT6132 controllers because the TX MAC will hang when trying to send a frame that is larger than 4K. The receive and transmit checksum offload support can be toggled on and off using the diff --git a/share/man/man4/virtio.4 b/share/man/man4/virtio.4 index 030f0aa..f30f339 100644 --- a/share/man/man4/virtio.4 +++ b/share/man/man4/virtio.4 @@ -28,7 +28,7 @@ .Dt VIRTIO 4 .Os .Sh NAME -.Nm virtio +.Nm virtio .Nd VirtIO Device Support .Sh SYNOPSIS To compile VirtIO device support into the kernel, place the following lines @@ -59,7 +59,7 @@ The .Xr virtio_pci 4 device driver represents an emulated PCI device that the hypervisor makes available to the VM. -This device provides the probing, configuration, and +This device provides the probing, configuration, and interrupt notifications needed to interact with the hypervisor. .Fx supports the following VirtIO devices: diff --git a/share/man/man4/vxge.4 b/share/man/man4/vxge.4 index 888413e..fdca8e2 100644 --- a/share/man/man4/vxge.4 +++ b/share/man/man4/vxge.4 @@ -48,7 +48,7 @@ if_vxge_load="YES" The .Nm driver provides support for Neterion X3100 adapters. -The driver supports TCP Segmentation Offload (TSO/LSO), +The driver supports TCP Segmentation Offload (TSO/LSO), Large Receive Offload (LRO), Jumbo Frames, Receive Traffic Hash (RTH), VLAN, Promiscuous mode and Multi function mode. .Pp diff --git a/share/man/man4/wbwd.4 b/share/man/man4/wbwd.4 index 0102225..67af2ec 100644 --- a/share/man/man4/wbwd.4 +++ b/share/man/man4/wbwd.4 @@ -72,7 +72,7 @@ The driver provides the following options as .Xr sysctl 8 variables. -.Bl -tag -width "xxxxxx" +.Bl -tag -width "xxxxxx" .It Va dev.wbwd.0.timeout_override This variable allows to program the timer to a value independent on the one provided by the diff --git a/share/man/man4/wi.4 b/share/man/man4/wi.4 index c8b49a5..92dedff 100644 --- a/share/man/man4/wi.4 +++ b/share/man/man4/wi.4 @@ -355,7 +355,7 @@ Lucent cards prior to firmware version 6.0.6 do not implement IBSS mode and are not supported. .Pp Prior versions of -.Nm +.Nm supported Symbol firmware. That support has been removed due to persistent problems with this firmware as well as getting proper documentation on this firmware. diff --git a/share/man/man4/wlan_acl.4 b/share/man/man4/wlan_acl.4 index 9a05aad..25314bd 100644 --- a/share/man/man4/wlan_acl.4 +++ b/share/man/man4/wlan_acl.4 @@ -40,7 +40,7 @@ module implements a MAC-based access control plugin for use with 802.11 devices operating as an access point. The .Nm -must be loaded for +must be loaded for .Xr ifconfig 8 to handle the .Cm mac:* diff --git a/share/man/man4/wlan_amrr.4 b/share/man/man4/wlan_amrr.4 index f810a9c..9247767 100644 --- a/share/man/man4/wlan_amrr.4 +++ b/share/man/man4/wlan_amrr.4 @@ -48,7 +48,7 @@ algorithm for use by 802.11 device drivers. .Xr wpi 4 , .Xr zyd 4 .Sh STANDARDS -More information can be found in the paper describing the +More information can be found in the paper describing the .Em AMRR algorithm at .Pa http://hal.inria.fr/inria-00070784/en/ . diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4 index 3fc1b6d..efcfdba 100644 --- a/share/man/man4/wpi.4 +++ b/share/man/man4/wpi.4 @@ -106,14 +106,14 @@ ifconfig wlan0 create wlandev wpi0 wlanmode adhoc ssid my_net \e The driver failed to load the firmware image using the .Xr firmware 9 subsystem. -Verify the +Verify the .Xr wpifw firmware module is installed. .It "wpi%d: fatal firmware error" An unknown error has occurred in the uploaded firmware, you may have to unload/reload the driver to continue. .It "wpi%d: Radio transmitter is switched off" -The hardware switch controlling the radio is currently turned off. +The hardware switch controlling the radio is currently turned off. Data transmission is not possible in this state. .El .Sh SEE ALSO @@ -133,8 +133,8 @@ driver was written for .Ox by .An Damien Bergamini Aq damien.bergamini@free.fr . -.An Benjamin Close Aq benjsc@FreeBSD.org -ported +.An Benjamin Close Aq benjsc@FreeBSD.org +ported .Nm to .Fx . diff --git a/share/man/man4/xen.4 b/share/man/man4/xen.4 index 31096d0..e053fc5 100644 --- a/share/man/man4/xen.4 +++ b/share/man/man4/xen.4 @@ -1,7 +1,7 @@ .\" Copyright (c) 2010 Robert N. M. Watson .\" All rights reserved. .\" -.\" This software was developed by SRI International and the University of +.\" This software was developed by SRI International and the University of .\" Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237 .\" ("CTSRD"), as part of the DARPA CRASH research program. .\" @@ -32,7 +32,7 @@ .Dt XEN 4 .Os .Sh NAME -.Nm xen +.Nm xen .Nd Xen Hypervisor Guest (DomU) Support .Sh SYNOPSIS To compile para-virtualized (PV) Xen guest support into an i386 kernel, place diff --git a/share/man/man4/xnb.4 b/share/man/man4/xnb.4 index bda6e45..d4ebae8 100644 --- a/share/man/man4/xnb.4 +++ b/share/man/man4/xnb.4 @@ -12,7 +12,7 @@ .\" ("Disclaimer") and any redistribution must be conditioned upon .\" including a substantially similar Disclaimer requirement for further .\" binary redistribution. -.\" +.\" .\" NO WARRANTY .\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS .\" "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -25,14 +25,14 @@ .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGES. -.\" +.\" .\" Authors: Alan Somers (Spectra Logic Corporation) -.\" +.\" .\" $FreeBSD$ -.\" +.\" .Dd January 6, 2012 .Dt XNB 4 -.Os +.Os .Sh NAME .Nm xnb .Nd "Xen Paravirtualized Backend Ethernet Driver" diff --git a/share/man/man5/ar.5 b/share/man/man5/ar.5 index 4abd439..1c1d79b 100644 --- a/share/man/man5/ar.5 +++ b/share/man/man5/ar.5 @@ -237,7 +237,7 @@ the ASCII string No padding is used to separate adjacent file names. .Ss "Archive Symbol Tables" Archive symbol tables are used to speed up link editing by providing a -mapping between the program symbols defined in the archive +mapping between the program symbols defined in the archive and the corresponding archive members. Archive symbol tables are managed by the .Xr ranlib 1 diff --git a/share/man/man5/fdescfs.5 b/share/man/man5/fdescfs.5 index b87d160..9c61581 100644 --- a/share/man/man5/fdescfs.5 +++ b/share/man/man5/fdescfs.5 @@ -101,7 +101,7 @@ creates entries for all file descriptors opened by the process. .It Pa /dev/fd/# .El .Sh EXAMPLES -To mount a +To mount a .Nm volume located on .Pa /dev/fd : diff --git a/share/man/man5/fs.5 b/share/man/man5/fs.5 index fbe8706..5a5171c 100644 --- a/share/man/man5/fs.5 +++ b/share/man/man5/fs.5 @@ -408,10 +408,10 @@ Each macro takes a pointer to an extattr structure. Returns a pointer to the next extended attribute following .Fa eap . .It Dv EXTATTR_CONTENT(eap) -Returns a pointer to the extended attribute content referenced by +Returns a pointer to the extended attribute content referenced by .Fa eap . .It Dv EXTATTR_CONTENT_SIZE(eap) -Returns the size of the extended attribute content referenced by +Returns the size of the extended attribute content referenced by .Fa eap . .It Dv EXTATTR_SET_LENGTHS(eap, size) Called with the size of the attribute content after initializing diff --git a/share/man/man5/fstab.5 b/share/man/man5/fstab.5 index adbf489..060d57c 100644 --- a/share/man/man5/fstab.5 +++ b/share/man/man5/fstab.5 @@ -235,7 +235,7 @@ programs to determine the order in which file system and quota checks are done at reboot time. The .Fa fs_passno -field can be any value between 0 and +field can be any value between 0 and .Ql INT_MAX Ns -1 . .Pp The root file system should be specified with a @@ -245,7 +245,7 @@ of 1, and other file systems should have a of 2 or greater. A file system with a .Fa fs_passno -value of 1 is always checked sequentially and be completed before +value of 1 is always checked sequentially and be completed before another file system is processed, and it will be processed before all file systems with a larger .Fa fs_passno . @@ -269,7 +269,7 @@ will assume that the file system does not need to be checked. .Pp The .Fa fs_passno -field can be used to implement finer control when +field can be used to implement finer control when the system utilities may determine that the file system resides on a different physical device, when it actually does not, as with a .Xr ccd 4 diff --git a/share/man/man5/nsmb.conf.5 b/share/man/man5/nsmb.conf.5 index f315f82..2548a05 100644 --- a/share/man/man5/nsmb.conf.5 +++ b/share/man/man5/nsmb.conf.5 @@ -133,7 +133,7 @@ is also assigned in this section. .Dq Li FSERVER:USER , defines the user settings and is useful for saving the password used during a specific connection. -The password may be plaintext or obfuscated using simple encryption. +The password may be plaintext or obfuscated using simple encryption. The simple encrypted password starts with the `$$1' symbols. Warning: the encryption function is very weak and intended only to hide clear text passwords. @@ -141,7 +141,7 @@ If the use of simple encryption is desired, the following command may be used on a password: .Bd -literal -offset indent smbutil crypt -.Ed +.Ed .Sh COMPATIBILITY At the time of this writing, the .Tn IPX diff --git a/share/man/man5/quota.user.5 b/share/man/man5/quota.user.5 index f502a51..c314b65 100644 --- a/share/man/man5/quota.user.5 +++ b/share/man/man5/quota.user.5 @@ -44,7 +44,7 @@ It is possible to specify a different location and file name with the and .Dq Li groupquota options in the -.Xr fstab 5 +.Xr fstab 5 file. .Pp The data files contain the following information: @@ -72,9 +72,9 @@ See .Xr edquota 8 for an explanation on the various limits and grace periods. .Pp -During normal quota operations the +During normal quota operations the .Xr quotactl 2 -interface is used to query or set quota information and the kernel +interface is used to query or set quota information and the kernel will maintain the data files as needed. If quotas are disabled on a file system, but marked as having quotas enabled in @@ -104,8 +104,8 @@ or .Dq Dv dbq_itime fields are non-zero, they are used to indicate the grace period on that file system for users who have exceeded their soft limit. -These times can be set by -.Xr edquota 8 +These times can be set by +.Xr edquota 8 with the .Fl t flag. diff --git a/share/man/man5/services.5 b/share/man/man5/services.5 index 55e0c9d..d1153d9 100644 --- a/share/man/man5/services.5 +++ b/share/man/man5/services.5 @@ -66,7 +66,7 @@ Service names may contain any printable character other than a field delimiter, newline, or comment character. .Pp -If +If .Dq db is specified as source in the .Xr nsswitch.conf 5 , diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 2d66691..a725fc6 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -53,7 +53,7 @@ and with clean checkouts of specific versions of the doc, src, and ports trees. For this purpose, a script .Pq Pa src/release/generate-release.sh is provided to automate these checkouts and then execute -.Dq Li "make release" +.Dq Li "make release" in a clean .Xr chroot 8 . .Pp @@ -65,7 +65,7 @@ and should have experience upgrading systems from source. The release build process requires that .Pa /usr/obj be populated with the output of -.Dq Li "make buildworld" +.Dq Li "make buildworld" and .Dq Li "make buildkernel" . This is necessary to provide the object files for the release or, when @@ -139,7 +139,7 @@ must be specified for ports and documentation to be included in the release. .It Ev CVS_TAG If the variable .Ev CVS_TAG -is set, that tag will be used for CVS checkouts (doc and ports), otherwise +is set, that tag will be used for CVS checkouts (doc and ports), otherwise .Ic generate-release.sh will use HEAD. .It Ev MAKE_FLAGS @@ -151,7 +151,7 @@ The location of the FreeBSD SVN source repository. Defaults to .Pa svn://svn.freebsd.org/base . .It Ev RELSTRING Optional base name for generated media images (e.g. FreeBSD-9.0-RC2-amd64). -Defaults to the output of +Defaults to the output of .Ic `uname -s`-`uname -r`-`uname -p` within the chroot. .El @@ -170,12 +170,12 @@ targets. Meta-target to build all release media and distributions applicable to this platform. .It Cm install -Copy all produced release media to +Copy all produced release media to .Pa ${DESTDIR} . .It Cm cdrom Builds installation CD-ROM images. On some systems, this may require that .Xr mkisofs 8 -be installed +be installed .Pq Pa sysutils/cdrtools and possibly that the .Xr md 4 @@ -239,7 +239,7 @@ Location of a directory containing the doc tree. By default, .Pa /usr/doc . If it is unset or cannot be found, most documentation will not be included in the release; see -.Ev NODOC +.Ev NODOC below. .It Va NOPORTS If defined, the Ports Collection will be omitted from the release. @@ -369,7 +369,7 @@ of building a release in a sterile environment. .Pp For the .Fx 9.0 -release, +release, .Pa src/release/Makefile was overhauled and the wrapper script .Pa src/release/generate-release.sh diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8 index e95786d..07373f6 100644 --- a/share/man/man8/picobsd.8 +++ b/share/man/man8/picobsd.8 @@ -648,7 +648,7 @@ already exists on disk (e.g.\& as a result of a previous update). .Xr crunchgen 1 , .Xr mdconfig 8 , .Xr nanobsd 8 , -.Xr swapon 8 +.Xr swapon 8 .Sh AUTHORS .An -nosplit .An Andrzej Bialecki Aq abial@FreeBSD.org , diff --git a/share/man/man9/BUS_DESCRIBE_INTR.9 b/share/man/man9/BUS_DESCRIBE_INTR.9 index 0163e70..b7f137b 100644 --- a/share/man/man9/BUS_DESCRIBE_INTR.9 +++ b/share/man/man9/BUS_DESCRIBE_INTR.9 @@ -45,7 +45,7 @@ .Ft int .Fo bus_describe_intr .Fa "device_t dev" "struct resource *irq" "void *cookie" "const char *fmt" -.Fa ... +.Fa ... .Fc .Sh DESCRIPTION The diff --git a/share/man/man9/BUS_SETUP_INTR.9 b/share/man/man9/BUS_SETUP_INTR.9 index 3910570..8264a99 100644 --- a/share/man/man9/BUS_SETUP_INTR.9 +++ b/share/man/man9/BUS_SETUP_INTR.9 @@ -130,8 +130,8 @@ Mutexes are not allowed to be held across calls to these functions. A filter runs in primary interrupt context. In this context, normal mutexes cannot be used. Only the spin lock version of these can be used (specified by passing -.Dv MTX_SPIN -to +.Dv MTX_SPIN +to .Fn mtx_init when initializing the mutex). .Xr wakeup 9 diff --git a/share/man/man9/DB_COMMAND.9 b/share/man/man9/DB_COMMAND.9 index 231e6a4..d452057 100644 --- a/share/man/man9/DB_COMMAND.9 +++ b/share/man/man9/DB_COMMAND.9 @@ -38,18 +38,18 @@ .Fo DB_COMMAND .Fa command_name .Fa command_function -.Fc -.Fn DB_SHOW_COMMAND "command_name" "command_function" -.Fn DB_SHOW_ALL_COMMAND "command_name" "command_function" +.Fc +.Fn DB_SHOW_COMMAND "command_name" "command_function" +.Fn DB_SHOW_ALL_COMMAND "command_name" "command_function" .Sh DESCRIPTION The .Fn DB_COMMAND macro adds .Fa command_name to the list of top-level commands. -Invoking +Invoking .Fa command_name -from ddb will call +from ddb will call .Fa command_function . .Pp The @@ -60,14 +60,14 @@ are roughly equivalent to .Fn DB_COMMAND but in these cases, .Fa command_name -is a sub-command of the ddb +is a sub-command of the ddb .Sy show command and .Sy show all command, respectively. .Pp The general command syntax: -.Cm command Ns Op Li \&/ Ns Ar modifier +.Cm command Ns Op Li \&/ Ns Ar modifier .Ar address Ns Op Li , Ns Ar count , translates into the following parameters for .Fa command_function : diff --git a/share/man/man9/DEVICE_PROBE.9 b/share/man/man9/DEVICE_PROBE.9 index b536b90..86b8339 100644 --- a/share/man/man9/DEVICE_PROBE.9 +++ b/share/man/man9/DEVICE_PROBE.9 @@ -96,7 +96,7 @@ all the rules, or special needs drivers). .It BUS_PROBE_VENDOR The device is supported by a vendor driver. This is for source or binary drivers that are not yet integrated into the -.Fx +.Fx tree. Its use in the base OS is prohibited. .It BUS_PROBE_DEFAULT @@ -119,8 +119,8 @@ drivers matching particular types of serial ports that need special treatment for some reason. .It BUS_PROBE_HOOVER The driver matches all unclaimed devices on a bus. -The -.Xr ugen 4 +The +.Xr ugen 4 device is one example. .It BUS_PROBE_NOWILDCARD The driver expects its parent to tell it which children to manage diff --git a/share/man/man9/SYSINIT.9 b/share/man/man9/SYSINIT.9 index 9140dd8..1837d25 100644 --- a/share/man/man9/SYSINIT.9 +++ b/share/man/man9/SYSINIT.9 @@ -29,7 +29,7 @@ .Os .Sh NAME .Nm SYSINIT , -.Nm SYSUNINIT +.Nm SYSUNINIT .Nd a framework for dynamic kernel initialization .Sh SYNOPSIS .In sys/param.h diff --git a/share/man/man9/buf_ring.9 b/share/man/man9/buf_ring.9 index 3b73607..ffade94 100644 --- a/share/man/man9/buf_ring.9 +++ b/share/man/man9/buf_ring.9 @@ -68,7 +68,7 @@ The .Nm functions provide a lock-less multi-producer and lock-less multi-consumer as -well as single-consumer ring buffer. +well as single-consumer ring buffer. .Pp The .Fn buf_ring_alloc diff --git a/share/man/man9/condvar.9 b/share/man/man9/condvar.9 index db3eab1..7b89d46 100644 --- a/share/man/man9/condvar.9 +++ b/share/man/man9/condvar.9 @@ -117,10 +117,10 @@ argument is a pointer to either a or .Xr sx 9 lock. -A +A .Xr mutex 9 argument must be initialized with -.Dv MTX_DEF +.Dv MTX_DEF and not .Dv MTX_SPIN . A thread must hold diff --git a/share/man/man9/devclass_get_maxunit.9 b/share/man/man9/devclass_get_maxunit.9 index fc2bc25..c3be627 100644 --- a/share/man/man9/devclass_get_maxunit.9 +++ b/share/man/man9/devclass_get_maxunit.9 @@ -48,7 +48,7 @@ The .Fn devclass_get_maxunit function returns -1 if .Fa dc -is +is .Dv NULL; otherwise it returns the next unit number in diff --git a/share/man/man9/device_get_children.9 b/share/man/man9/device_get_children.9 index 677d8eb..cbc1124 100644 --- a/share/man/man9/device_get_children.9 +++ b/share/man/man9/device_get_children.9 @@ -48,9 +48,9 @@ and the count in .Fa *devcountp . The memory allocated for the list should be freed using .Fn free "*devlistp" "M_TEMP" . -.Fa devlistp +.Fa devlistp and -.Fa devcountp +.Fa devcountp are not changed when an error is returned. .Sh RETURN VALUES Zero is returned on success, otherwise an appropriate error is returned. diff --git a/share/man/man9/drbr.9 b/share/man/man9/drbr.9 index ad67c35..168ce10 100644 --- a/share/man/man9/drbr.9 +++ b/share/man/man9/drbr.9 @@ -76,7 +76,7 @@ is enabled, will assert that the tx queue lock is held when it is called. .Pp The -.Fn drbr_free +.Fn drbr_free function frees all the enqueued mbufs and then frees the buf_ring. .Pp The @@ -106,7 +106,7 @@ The .Fn drbr_flush function frees all mbufs enqueued in the buf_ring and the ifnet's IFQ. .Pp -The +The .Fn drbr_empty function returns .Dv TRUE @@ -118,7 +118,7 @@ The .Fn drbr_inuse function returns the number of mbufs enqueued. Note to users that this is intrinsically racy as there is no guarantee that -there will not be more mbufs when +there will not be more mbufs when .Fn drbr_dequeue is actually called. Provided the tx queue lock is held there will not be less. @@ -137,7 +137,7 @@ on success. .Pp The .Fn drbr_dequeue -and +and .Fn drbr_dequeue_cond functions return an mbuf on success and .Dv NULL diff --git a/share/man/man9/eventtimers.9 b/share/man/man9/eventtimers.9 index c21b1a7..2ed15d0 100644 --- a/share/man/man9/eventtimers.9 +++ b/share/man/man9/eventtimers.9 @@ -213,7 +213,7 @@ is the opposite to It releases the event timer for other consumers use. .Pp .Fn ET_LOCK -and +and .Fn ET_UNLOCK macros should be used to manage .Xr mutex 9 diff --git a/share/man/man9/firmware.9 b/share/man/man9/firmware.9 index 5254f24..9987e09 100644 --- a/share/man/man9/firmware.9 +++ b/share/man/man9/firmware.9 @@ -157,7 +157,7 @@ argument may be set to to indicate that firmware_put is free to reclaim resources associated with the firmware image if this is the last reference. -By default a firmware image will be deferred to a +By default a firmware image will be deferred to a .Xr taskqueue 9 thread so the call may be done while holding a lock. In certain cases, such as on driver detach, this cannot be allowed. diff --git a/share/man/man9/ieee80211.9 b/share/man/man9/ieee80211.9 index 30affc9..1e53cf6 100644 --- a/share/man/man9/ieee80211.9 +++ b/share/man/man9/ieee80211.9 @@ -29,7 +29,7 @@ .Dt IEEE80211 9 .Os .Sh NAME -.Nm IEEE80211 +.Nm IEEE80211 .Nd 802.11 network layer .Sh SYNOPSIS .In net80211/ieee80211_var.h @@ -164,7 +164,7 @@ Table of channels the device is capable of operating on. This is initially provided by the driver but may be changed through calls that change the regulatory state. .It Dv ic_nchan -Number of entries in +Number of entries in .Dv ic_channels . .El .Pp @@ -221,7 +221,7 @@ There is no default method; the pointer may be NULL in which case it will not be used. .It Dv ic_node_alloc Allocate and initialize a -.Vt ieee80211_node +.Vt ieee80211_node structure. This method cannot sleep. The default method allocates zero'd memory using @@ -232,7 +232,7 @@ Memory allocated by the driver must be tagged with .Dv M_80211_NODE to balance the memory allocation statistics. .It Dv ic_node_free -Reclaim storage of a node allocated by +Reclaim storage of a node allocated by .Dv ic_node_alloc . Drivers are expected to .Em interpose @@ -302,7 +302,7 @@ and must initiate the work to scan a channel and schedule a timer to advance to the next channel in the scan list. This callback is done in a sleepable context. The default method handles active scan work (e.g. sending ProbeRequest -frames), and schedules a call to +frames), and schedules a call to .Xr ieee80211_scan_next 9 according to the maximum dwell time for the channel. Drivers that off-load scan work to firmware typically use this method @@ -354,7 +354,7 @@ Terminate receipt of A-MPDU data from the specified station for the TID. .El .Pp Once the -.Nm +.Nm layer is attached to a driver there are two more steps typically done to complete the work: .Bl -enum @@ -405,7 +405,7 @@ The following general capabilities are defined: Device is capable of operating in station (aka Infrastructure) mode. .It Dv IEEE80211_C_8023ENCAP Device requires 802.3-encapsulated frames be passed for transmit. -By default +By default .Nm will encapsulate all outbound frames as 802.11 frames (without a PLCP header). .It Dv IEEE80211_C_FF @@ -529,16 +529,16 @@ Device supports L-SIG TXOP protection. .It Dv IEEE80211_HTC_AMPDU Device supports A-MPDU aggregation. Note that any 802.11n compliant device must support A-MPDU receive -so this implicitly means support for +so this implicitly means support for .Em transmit of A-MPDU frames. .It Dv IEEE80211_HTC_AMSDU Device supports A-MSDU aggregation. Note that any 802.11n compliant device must support A-MSDU receive -so this implicitly means support for +so this implicitly means support for .Em transmit of A-MSDU frames. -.It Dv IEEE80211_HTC_HT +.It Dv IEEE80211_HTC_HT Device supports High Throughput (HT) operation. This capability must be set to enable 802.11n functionality in diff --git a/share/man/man9/ieee80211_amrr.9 b/share/man/man9/ieee80211_amrr.9 index 8206b2d..a90de3d 100644 --- a/share/man/man9/ieee80211_amrr.9 +++ b/share/man/man9/ieee80211_amrr.9 @@ -86,7 +86,7 @@ rate for each frame. To maximize throughput algorithms try to use the highest rate that is appropriate for the operating conditions. The rate will vary as conditions change; the distance between two stations -may change, transient noise may be present that affects signal quality, +may change, transient noise may be present that affects signal quality, etc. .Nm uses very simple information from a driver to do it's job: @@ -119,8 +119,8 @@ The .Vt amrr structure member holds the per-vap state for .Nm -and -.Xr ral 4 +and +.Xr ral 4 initializes it in the vap create method with: .Bd -literal -offset indent ieee80211_amrr_init(&rvp->amrr, vap, diff --git a/share/man/man9/ieee80211_bmiss.9 b/share/man/man9/ieee80211_bmiss.9 index bd82c3c..63b8e9f 100644 --- a/share/man/man9/ieee80211_bmiss.9 +++ b/share/man/man9/ieee80211_bmiss.9 @@ -56,9 +56,9 @@ This causes some number of ProbeRequest frames to be sent to the access point to check if the association is still alive. If no response is received and roaming mode is set to .Dv IEEE80211_ROAMING_AUTO -then +then .Nm net80211 -will try to re-associate and if that fails +will try to re-associate and if that fails trigger a scan to look for the access point or another suitable AP. When the .Nm net80211 diff --git a/share/man/man9/ieee80211_input.9 b/share/man/man9/ieee80211_input.9 index 61b11a5..9422f0b 100644 --- a/share/man/man9/ieee80211_input.9 +++ b/share/man/man9/ieee80211_input.9 @@ -110,7 +110,7 @@ RSSI and noise are used by the layer to make scanning and roaming decisions in station mode and to do auto channel selection for hostap and similar modes. Otherwise the values are made available to user applications -(with the rssi presented as a filtered average over the last ten values +(with the rssi presented as a filtered average over the last ten values and the noise floor the last reported value). .Sh SEE ALSO .Xr ieee80211 9 diff --git a/share/man/man9/ieee80211_node.9 b/share/man/man9/ieee80211_node.9 index 180d8c4..452bbcc 100644 --- a/share/man/man9/ieee80211_node.9 +++ b/share/man/man9/ieee80211_node.9 @@ -67,18 +67,18 @@ .Ft void .Fo ieee80211_dump_nodes .Fa "struct ieee80211_node_table *" -.Fc +.Fc .\" .Ft void .Fo ieee80211_dump_node .Fa "struct ieee80211_node *" -.Fc +.Fc .Sh DESCRIPTION The .Nm net80211 layer that supports 802.11 device drivers maintains a database of peer stations called the -.Dq node table +.Dq node table in the .Vt ic_sta entry of the @@ -125,7 +125,7 @@ field. This reference must be reclaimed by the driver when transmit processing is done. For each frame received the driver must lookup the table entry to -use in dispatching the frame +use in dispatching the frame .Dq up the stack . This lookup implicitly obtains a reference to the table entry and the driver must reclaim the reference when frame processing is completed. @@ -139,7 +139,7 @@ Entries may be looked up using one of the pre-defined API's or the .Fn ieee80211_iterate_nodes call may be used to iterate through all entries to do per-node processing or implement some non-standard search mechanism. -Note that +Note that .Fn ieee80211_iterate_nodes is single-threaded per-device and the effort processing involved is fairly @@ -206,7 +206,7 @@ iwi_node_free(struct ieee80211_node *ni) struct ieee80211com *ic = ni->ni_ic; struct iwi_softc *sc = ic->ic_ifp->if_softc; struct iwi_node *in = (struct iwi_node *)ni; - + if (in->in_station != -1) free_unr(sc->sc_unr, in->in_station); sc->sc_node_free(ni); /* invoke net80211 free handler */ diff --git a/share/man/man9/ieee80211_output.9 b/share/man/man9/ieee80211_output.9 index 82393bd..6a8d3a7 100644 --- a/share/man/man9/ieee80211_output.9 +++ b/share/man/man9/ieee80211_output.9 @@ -110,13 +110,13 @@ node table entry in the field. The node is associated with the frame destination. Typically it is the receiver's entry but in some situations it may be -a placeholder entry or the +a placeholder entry or the .Dq next hop station (such as in a mesh network). In all cases the reference must be reclaimed with .Fn ieee80211_free_node when the transmit work is completed. -The rule to remember is: +The rule to remember is: .Nm net80211 passes responsibility for the .Vt mbuf @@ -131,7 +131,7 @@ assigned to the receiving station and/or any Diffserv setting in an IP or IPv6 header. If both vlan and Diffserv priority are present the higher of the two is used. -If WME/WMM is being used then any ACM policy (in station mode) is +If WME/WMM is being used then any ACM policy (in station mode) is also enforced. The resulting AC is attached to the mbuf and may be read back using the .Fn M_WME_GETAC @@ -182,7 +182,7 @@ The callback is done using .Fn ieee80211_process_callback with the last parameter set to a non-zero value if an error occurred and zero otherwise. -Note +Note .Nm net80211 understands that drivers may be incapable of determining status; a device may not report if an ACK frame is received and/or a device may queue diff --git a/share/man/man9/ieee80211_proto.9 b/share/man/man9/ieee80211_proto.9 index 1938d6e..88412eb 100644 --- a/share/man/man9/ieee80211_proto.9 +++ b/share/man/man9/ieee80211_proto.9 @@ -108,7 +108,7 @@ Beware that data traffic is also gated by whether the associated .Dq port is authorized. When WPA/802.11i/802.1x is operational authorization may happen separately; -e.g. in station mode +e.g. in station mode .Xr wpa_supplicant 8 must complete the handshakes and plumb the necessary keys before a port is authorized. @@ -143,14 +143,14 @@ Certain .Nm net80211 data are valid only in certain states; e.g. the .Vt iv_bsschan -that specifies the channel for the operating BSS should never be used +that specifies the channel for the operating BSS should never be used except in .Dv IEEE80211_S_RUN or greater. .Sh STATE CHANGES State machine changes are typically handled internal to the .Nm net80211 -layer in response to +layer in response to .Xr ioctl 2 requests, received frames, or external events such as a beacon miss. The @@ -161,7 +161,7 @@ The request is initially processed to handle coordination of multiple vaps. For example, only one vap at a time can be scanning, if multiple vaps request a change to .Dv IEEE80211_S_SCAN -the first will be permitted to run and the others will be +the first will be permitted to run and the others will be .Em deferred until the scan operation completes at which time the selected channel will be adopted. @@ -197,12 +197,12 @@ call the handles two state changes specially. On transition to .Dv IEEE80211_S_RUN -the +the .Dv IFF_DRV_OACTIVE bit on the vap's transmit queue is cleared so traffic can flow. On transition to .Dv IEEE80211_S_INIT -any state in the scan cache associated with the vap is flushed +any state in the scan cache associated with the vap is flushed and any frames pending on the transmit queue are flushed. .Sh DRIVER INTEGRATION Drivers are expected to override the diff --git a/share/man/man9/ieee80211_radiotap.9 b/share/man/man9/ieee80211_radiotap.9 index 8d44a47..cea2eb4 100644 --- a/share/man/man9/ieee80211_radiotap.9 +++ b/share/man/man9/ieee80211_radiotap.9 @@ -61,7 +61,7 @@ The .Nm net80211 layer used by 802.11 drivers includes support for a device-independent packet capture format called -.Nm radiotap +.Nm radiotap that is understood by tools such as .Xr tcpdump 1 . This facility is designed for capturing 802.11 traffic, @@ -257,7 +257,7 @@ struct wi_rx_radiotap_header { uint16_t wr_chan_flags; uint8_t wr_antsignal; uint8_t wr_antnoise; -} __packed; +} __packed; .Ed .Pp and transmit definitions for the Atheros driver: diff --git a/share/man/man9/ieee80211_regdomain.9 b/share/man/man9/ieee80211_regdomain.9 index 527deb5..da310dd 100644 --- a/share/man/man9/ieee80211_regdomain.9 +++ b/share/man/man9/ieee80211_regdomain.9 @@ -56,7 +56,7 @@ The software layer provides a support framework for drivers that includes comprehensive regulatory support. .Nm net80211 -provides mechanisms that enforce +provides mechanisms that enforce .Em "regulatory policy" by privileged user applications. .Pp @@ -102,7 +102,7 @@ and leave proper setup to user applications. If default settings are known they can be installed and/or an event can be dispatched to user space using .Fn ieee80211_notify_country -so that +so that .Xr devd 8 will do the appropriate setup work at system boot (or device insertion). .Pp diff --git a/share/man/man9/ieee80211_scan.9 b/share/man/man9/ieee80211_scan.9 index b2b77cf..54cefa7 100644 --- a/share/man/man9/ieee80211_scan.9 +++ b/share/man/man9/ieee80211_scan.9 @@ -322,7 +322,7 @@ Existing entries are typically updated based on the latest information though some information such as RSSI and noise floor readings may be combined to present an average. .Pp -The cache contents is aged through +The cache contents is aged through .Fn ieee80211_scan_timeout calls. Typically these happen together with other station table activity; every diff --git a/share/man/man9/ieee80211_vap.9 b/share/man/man9/ieee80211_vap.9 index f5ef20b..0c68f6d 100644 --- a/share/man/man9/ieee80211_vap.9 +++ b/share/man/man9/ieee80211_vap.9 @@ -93,7 +93,7 @@ This data structure must have an structure at the front but is usually extended with driver-private state. Next the vap is setup with a call to .Fn ieee80211_vap_setup . -This request initializes +This request initializes .Nm net80211 state but does not activate the interface. The driver can then override methods setup by @@ -108,7 +108,7 @@ A vap is deleted when an .Dv SIOCIFDESTROY ioctl request is made or when the device detaches (causing all associated vaps to automatically be deleted). -Delete requests cause the +Delete requests cause the .Vt ic_vap_delete method to be called. Drivers must quiesce the device before calling diff --git a/share/man/man9/kproc.9 b/share/man/man9/kproc.9 index a20ab70..613ac31 100644 --- a/share/man/man9/kproc.9 +++ b/share/man/man9/kproc.9 @@ -77,8 +77,8 @@ A new family of .Fn kthread_* 9 functions was added to produce .Em real -kernel -.Em threads . +kernel +.Em threads . See the .Xr kthread 9 man page for more information on those calls. @@ -227,7 +227,7 @@ The actual suspension of the kernel process is done with .Pp The .Fn kproc_kthread_add -function is much like the +function is much like the .Fn kproc_create function above except that if the kproc already exists, then only a new thread (see diff --git a/share/man/man9/kthread.9 b/share/man/man9/kthread.9 index d2c770b..25a20ce 100644 --- a/share/man/man9/kthread.9 +++ b/share/man/man9/kthread.9 @@ -82,7 +82,7 @@ kernel threads. See the .Xr kproc 9 man page for more information on the renamed calls. -Also note that the +Also note that the .Fn kproc_kthread_add 9 function appears in both pages as its functionality is split. .Pp @@ -184,11 +184,11 @@ member of the new thread's .Pp The .Fn kproc_kthread_add -function is much like the +function is much like the .Fn kthread_add function above except that if the kproc does not already -exist, it is created. -This function is better documented in the +exist, it is created. +This function is better documented in the .Xr kproc 9 manual page. .Pp diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9 index c20839e..0e5cfb1 100644 --- a/share/man/man9/lock.9 +++ b/share/man/man9/lock.9 @@ -363,7 +363,7 @@ or the .Fa ilk must be held prior to calling -.Fn lockmgr +.Fn lockmgr or .Fn lockmgr_rw , and will be returned unlocked. diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index 7aa73a3..b528c56 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -82,7 +82,7 @@ since it may modify protected data. Reader/writer locks can be treated as mutexes (see above and .Xr mutex 9 ) with shared/exclusive semantics. -More specifically, regular mutexes can be +More specifically, regular mutexes can be considered to be equivalent to a write-lock on an .Em rw_lock. The @@ -94,7 +94,7 @@ are anonymous. Another important property is that shared holders of .Em rw_lock can recurse, but exclusive locks are not allowed to recurse. -This ability should not be used lightly and +This ability should not be used lightly and .Em may go away. .Pp See @@ -122,7 +122,7 @@ and read-mostly locks. They don't support priority propagation. They should be considered to be closely related to .Xr sleep 9 . -In fact it could in some cases be +In fact it could in some cases be considered a conditional sleep. .Pp See @@ -339,10 +339,10 @@ At this time this is a rather easy to remember table. .It Xo .Em "Context:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep .Xc -.It interrupt filter: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no -.It interrupt thread: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&ok Ta \&no -.It callout: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&no Ta \&no -.It syscall: Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok +.It interrupt filter: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no +.It interrupt thread: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&ok Ta \&no +.It callout: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&no Ta \&no +.It syscall: Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&ok .El .Sh SEE ALSO .Xr witness 4 , diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9 index 08c9ea7..7490939 100644 --- a/share/man/man9/malloc.9 +++ b/share/man/man9/malloc.9 @@ -124,7 +124,7 @@ operational characteristics as follows: .It Dv M_ZERO Causes the allocated memory to be set to all zeros. .It Dv M_NODUMP -For allocations greater than page size, causes the allocated +For allocations greater than page size, causes the allocated memory to be excluded from kernel core dumps. .It Dv M_NOWAIT Causes diff --git a/share/man/man9/mi_switch.9 b/share/man/man9/mi_switch.9 index 2f82b5a..46e7a8e 100644 --- a/share/man/man9/mi_switch.9 +++ b/share/man/man9/mi_switch.9 @@ -62,7 +62,7 @@ From within a function such as .Xr cv_wait 9 , .Xr mtx_lock , or -.Xr tsleep 9 +.Xr tsleep 9 when the current thread voluntarily relinquishes the CPU to wait for some resource or lock to become available. diff --git a/share/man/man9/osd.9 b/share/man/man9/osd.9 index 871575c..ba9c632 100644 --- a/share/man/man9/osd.9 +++ b/share/man/man9/osd.9 @@ -125,7 +125,7 @@ and remains valid until a corresponding call to .Ss Functions The .Fn osd_register -function registers a type/slot identifier pair with the +function registers a type/slot identifier pair with the .Nm framework for use with a new data type. The function may sleep and therefore cannot be called from a non-sleepable diff --git a/share/man/man9/rmlock.9 b/share/man/man9/rmlock.9 index bc20d70..893eb25 100644 --- a/share/man/man9/rmlock.9 +++ b/share/man/man9/rmlock.9 @@ -80,7 +80,7 @@ Read mostly locks are designed to be efficient for locks almost exclusively used as reader locks and as such should be used for protecting data that rarely changes. Acquiring an exclusive lock after the lock had been locked for shared access -is an expensive operation. +is an expensive operation. .Pp Although reader/writer locks look very similar to .Xr sx 9 @@ -196,9 +196,9 @@ This function releases a shared lock previously acquired by .Fn rm_rlock . The .Fa tracker -argument must match the -.Fa tracker -argument used for acquiring the shared lock +argument must match the +.Fa tracker +argument used for acquiring the shared lock .It Fn rm_wunlock "struct rmlock *rm" This function releases an exclusive lock previously acquired by .Fn rm_wlock . @@ -248,7 +248,7 @@ The implementation uses a single per CPU list shared by all rmlocks in the system. If rmlocks become popular, hashing to multiple per CPU queues may -be needed to speed up the writer lock process. +be needed to speed up the writer lock process. .Pp The .Nm diff --git a/share/man/man9/shm_map.9 b/share/man/man9/shm_map.9 index a711fb6..4ba8222 100644 --- a/share/man/man9/shm_map.9 +++ b/share/man/man9/shm_map.9 @@ -125,7 +125,7 @@ shm_example(int fd) fdrop(fp, curthread); return (error); } - + /* Do something with 'mem'. */ error = shm_unmap(fp, mem, 16384); diff --git a/share/man/man9/sleep.9 b/share/man/man9/sleep.9 index 469df9c..9141762 100644 --- a/share/man/man9/sleep.9 +++ b/share/man/man9/sleep.9 @@ -93,7 +93,7 @@ then the thread will be made runnable with the specified .Fa priority when it resumes. -.Dv PZERO +.Dv PZERO should never be used, as it is for compatibility only. A new priority of 0 means to use the thread's current priority when it is made runnable again. @@ -243,7 +243,7 @@ It is the programmer's responsibility to choose a unique value. The older .Fn wakeup -function did not require this, though it was never good practice +function did not require this, though it was never good practice for threads to share a .Fa chan value. diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9 index 95a5fc2..08fd4d4 100644 --- a/share/man/man9/spl.9 +++ b/share/man/man9/spl.9 @@ -80,8 +80,8 @@ code locking that the spl did when converting code from versions of the kernel prior to .Fx 5.0 . The examples in this man page are also obsolete and should not be viewed -as documenting -.Fx 5.0 +as documenting +.Fx 5.0 and newer. .Ef .Pp diff --git a/share/man/man9/sysctl_ctx_init.9 b/share/man/man9/sysctl_ctx_init.9 index f17ca3a..cbca5c6 100644 --- a/share/man/man9/sysctl_ctx_init.9 +++ b/share/man/man9/sysctl_ctx_init.9 @@ -135,7 +135,7 @@ in most cases, the programmer specifies as the oid number when creating an oid. However, during registration of the oid in the tree, this number is changed to the first available number -greater than or equal to +greater than or equal to .Dv CTL_AUTO_START . If the first step of context deletion fails, re-registration of the oid does not change the already assigned oid number diff --git a/share/man/man9/taskqueue.9 b/share/man/man9/taskqueue.9 index 056ee66..319aa2f 100644 --- a/share/man/man9/taskqueue.9 +++ b/share/man/man9/taskqueue.9 @@ -116,8 +116,8 @@ thread). The memory location where the thread identity is recorded is used to signal the service thread(s) to terminate--when this value is set to zero and the thread is signaled it will terminate. -If the queue is intended for use in fast interrupt handlers -.Fn taskqueue_create_fast +If the queue is intended for use in fast interrupt handlers +.Fn taskqueue_create_fast should be used in place of .Fn taskqueue_create . .Pp @@ -296,9 +296,9 @@ The variable is used to enqueue tasks onto the queue. .Pp .Fn TASKQUEUE_FAST_DEFINE -and +and .Fn TASKQUEUE_FAST_DEFINE_THREAD -act just like +act just like .Fn TASKQUEUE_DEFINE and .Fn TASKQUEUE_DEFINE_THREAD diff --git a/share/man/man9/timeout.9 b/share/man/man9/timeout.9 index 36731c8..ddc66b5 100644 --- a/share/man/man9/timeout.9 +++ b/share/man/man9/timeout.9 @@ -197,9 +197,9 @@ The function initializes a callout so it can be passed to .Fn callout_stop , .Fn callout_drain , -.Fn callout_reset +.Fn callout_reset or -.Fn callout_schedule +.Fn callout_schedule without any side effects. If the .Fa mpsafe diff --git a/share/man/man9/usbdi.9 b/share/man/man9/usbdi.9 index 0e9f9f2..c04c946 100644 --- a/share/man/man9/usbdi.9 +++ b/share/man/man9/usbdi.9 @@ -179,7 +179,7 @@ zero upon success. A non-zero return value indicates failure. . .Fn usbd_transfer_unsetup This function will release the given USB transfers and all allocated -resources associated with these USB transfers. +resources associated with these USB transfers. .Fa pxfer is a pointer to an array of USB transfer pointers, that may be NULL, that should be freed by the USB system. @@ -283,15 +283,15 @@ usb_default_callback(struct usb_xfer *xfer, usb_error_t error) usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL); switch (USB_GET_STATE(xfer)) { - case USB_ST_SETUP: + case USB_ST_SETUP: /* * Setup xfer frame lengths/count and data */ usbd_transfer_submit(xfer); break; - case USB_ST_TRANSFERRED: - /* + case USB_ST_TRANSFERRED: + /* * Read usb frame data, if any. * "actlen" has the total length for all frames * transferred. @@ -300,13 +300,13 @@ usb_default_callback(struct usb_xfer *xfer, usb_error_t error) default: /* Error */ /* - * Print error message and clear stall + * Print error message and clear stall * for example. */ break; } - /* - * Here it is safe to do something without the private + /* + * Here it is safe to do something without the private * USB mutex locked. */ return; @@ -320,7 +320,7 @@ First the SETUP packet, then DATA packet(s) and then a STATUS packet. . The SETUP packet is always pointed to by frame 0 and the -length is set by +length is set by .Fn usbd_xfer_frame_len also if there should not be sent any SETUP packet! If an USB control transfer has no DATA stage, @@ -375,7 +375,7 @@ module defines a USB config structure where it is possible to specify the characteristics of the wanted endpoint. .Bd -literal -offset indent -struct usb_config { +struct usb_config { bufsize, callback direction, diff --git a/share/man/man9/vm_map_find.9 b/share/man/man9/vm_map_find.9 index 4aa5fb8..1d21bae 100644 --- a/share/man/man9/vm_map_find.9 +++ b/share/man/man9/vm_map_find.9 @@ -71,7 +71,7 @@ by the caller before calling this function to account for the new entry. If .Fa find_space is either -.Dv VMFS_ALIGNED_SPACE +.Dv VMFS_ALIGNED_SPACE or .Dv VMFS_ANY_SPACE , the function will call diff --git a/share/man/man9/watchdog.9 b/share/man/man9/watchdog.9 index 170812b..2df9fd6 100644 --- a/share/man/man9/watchdog.9 +++ b/share/man/man9/watchdog.9 @@ -53,7 +53,7 @@ is zero, the watchdog must be disabled and the argument left untouched. If the watchdog cannot be disabled, the .Fa error -argument must be set to +argument must be set to .Dv EOPNOTSUPP . .Pp Else the watchdog should be reset and configured to a timeout of -- cgit v1.1 From c56f63e2badce01fac17bc5a106216ed15fcd003 Mon Sep 17 00:00:00 2001 From: joel Date: Thu, 29 Mar 2012 17:04:04 +0000 Subject: Put quotation marks around a string. --- share/man/man4/ulpt.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/ulpt.4 b/share/man/man4/ulpt.4 index e0f5eb6..cd92bfd 100644 --- a/share/man/man4/ulpt.4 +++ b/share/man/man4/ulpt.4 @@ -57,7 +57,7 @@ bi- or uni-directional protocol. The bits in the minor number select various features of the driver. .Bl -column "Minor Bit" "Functionxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -offset indent .Em "Minor Bit Function" -64 Do not initialize (reset) the device on the port. +64 "Do not initialize (reset) the device on the port." .El .Pp Some printers cannot handle the reset on open; in case of problems try the -- cgit v1.1 From 3a65370d0c05592988d5092b8062273f4fb6cda1 Mon Sep 17 00:00:00 2001 From: joel Date: Thu, 29 Mar 2012 20:23:35 +0000 Subject: Remove unnecessary Xo/Xc. Reviewed by: brueffer --- share/man/man9/locking.9 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index b528c56..7bce63f 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -293,9 +293,7 @@ running inside an interrupt thread. The following table shows what you can and can not do while holding one of the synchronization primitives discussed: .Bl -column ".Ic xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent -.It Xo -.Em "You have: You want:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep -.Xc +.It .Em "You have: You want:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep .It spin mtx Ta \&ok-1 Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no-3 .It mutex Ta \&ok Ta \&ok-1 Ta \&no Ta \&ok Ta \&ok Ta \&no-3 .It sx Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok Ta \&ok Ta \&ok-4 @@ -336,9 +334,7 @@ for details. The next table shows what can be used in different contexts. At this time this is a rather easy to remember table. .Bl -column ".Ic Xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent -.It Xo -.Em "Context:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep -.Xc +.It .Em "Context:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep .It interrupt filter: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no .It interrupt thread: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&ok Ta \&no .It callout: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&no Ta \&no -- cgit v1.1 From 897054d07fa9c01d2ded950c219334b89c033e7f Mon Sep 17 00:00:00 2001 From: joel Date: Thu, 29 Mar 2012 20:55:45 +0000 Subject: Fix typo from last commit. Noticed by: brueffer --- share/man/man9/locking.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index 7bce63f..00478bf 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -293,7 +293,7 @@ running inside an interrupt thread. The following table shows what you can and can not do while holding one of the synchronization primitives discussed: .Bl -column ".Ic xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent -.It .Em "You have: You want:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep +.It Em "You have: You want:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep .It spin mtx Ta \&ok-1 Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no-3 .It mutex Ta \&ok Ta \&ok-1 Ta \&no Ta \&ok Ta \&ok Ta \&no-3 .It sx Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok Ta \&ok Ta \&ok-4 @@ -334,7 +334,7 @@ for details. The next table shows what can be used in different contexts. At this time this is a rather easy to remember table. .Bl -column ".Ic Xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent -.It .Em "Context:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep +.It Em "Context:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep .It interrupt filter: Ta \&ok Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no .It interrupt thread: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&ok Ta \&no .It callout: Ta \&ok Ta \&ok Ta \&no Ta \&ok Ta \&no Ta \&no -- cgit v1.1 From 93dd3cf7e8f0326bb58681d809b6a6491b409ad2 Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 31 Mar 2012 07:08:35 +0000 Subject: mdoc: use It for each item in the list and separate each cell with Ta. --- share/man/man4/ahc.4 | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'share') diff --git a/share/man/man4/ahc.4 b/share/man/man4/ahc.4 index e7eed2d..3e47a8b 100644 --- a/share/man/man4/ahc.4 +++ b/share/man/man4/ahc.4 @@ -147,21 +147,21 @@ Note that wide and twin channel features, although always supported by a particular chip, may be disabled in a particular motherboard or card design. .Bd -ragged -offset indent -.Bl -column "aic7770 " "10 " "EISA/VL " "10MHz " "16bit " "SCBs " Features -.Em "Chip MIPS Bus MaxSync MaxWidth SCBs Features" -aic7770 10 EISA/VL 10MHz 16Bit 4 1 -aic7850 10 PCI/32 10MHz 8Bit 3 -aic7860 10 PCI/32 20MHz 8Bit 3 -aic7870 10 PCI/32 10MHz 16Bit 16 -aic7880 10 PCI/32 20MHz 16Bit 16 -aic7890 20 PCI/32 40MHz 16Bit 16 3 4 5 6 7 8 -aic7891 20 PCI/64 40MHz 16Bit 16 3 4 5 6 7 8 -aic7892 20 PCI/64 80MHz 16Bit 16 3 4 5 6 7 8 -aic7895 15 PCI/32 20MHz 16Bit 16 2 3 4 5 -aic7895C 15 PCI/32 20MHz 16Bit 16 2 3 4 5 8 -aic7896 20 PCI/32 40MHz 16Bit 16 2 3 4 5 6 7 8 -aic7897 20 PCI/64 40MHz 16Bit 16 2 3 4 5 6 7 8 -aic7899 20 PCI/64 80MHz 16Bit 16 2 3 4 5 6 7 8 +.Bl -column "aic7895CX" "MIPSX" "EISA/VLX" "MaxSyncX" "MaxWidthX" "SCBsX" "2 3 4 5 6 7 8X" +.It Em "Chip" Ta "MIPS" Ta "Bus" Ta "MaxSync" Ta "MaxWidth" Ta "SCBs" Ta "Features" +.It "aic7770" Ta "10" Ta "EISA/VL" Ta "10MHz" Ta "16Bit" Ta "4" Ta "1" +.It "aic7850" Ta "10" Ta "PCI/32" Ta "10MHz" Ta "8Bit" Ta "3" Ta "" +.It "aic7860" Ta "10" Ta "PCI/32" Ta "20MHz" Ta "8Bit" Ta "3" Ta "" +.It "aic7870" Ta "10" Ta "PCI/32" Ta "10MHz" Ta "16Bit" Ta "16" Ta "" +.It "aic7880" Ta "10" Ta "PCI/32" Ta "20MHz" Ta "16Bit" Ta "16" Ta "" +.It "aic7890" Ta "20" Ta "PCI/32" Ta "40MHz" Ta "16Bit" Ta "16" Ta "3 4 5 6 7 8" +.It "aic7891" Ta "20" Ta "PCI/64" Ta "40MHz" Ta "16Bit" Ta "16" Ta "3 4 5 6 7 8" +.It "aic7892" Ta "20" Ta "PCI/64" Ta "80MHz" Ta "16Bit" Ta "16" Ta "3 4 5 6 7 8" +.It "aic7895" Ta "15" Ta "PCI/32" Ta "20MHz" Ta "16Bit" Ta "16" Ta "2 3 4 5" +.It "aic7895C" Ta "15" Ta "PCI/32" Ta "20MHz" Ta "16Bit" Ta "16" Ta "2 3 4 5 8" +.It "aic7896" Ta "20" Ta "PCI/32" Ta "40MHz" Ta "16Bit" Ta "16" Ta "2 3 4 5 6 7 8" +.It "aic7897" Ta "20" Ta "PCI/64" Ta "40MHz" Ta "16Bit" Ta "16" Ta "2 3 4 5 6 7 8" +.It "aic7899" Ta "20" Ta "PCI/64" Ta "80MHz" Ta "16Bit" Ta "16" Ta "2 3 4 5 6 7 8" .El .Pp .Bl -enum -compact -- cgit v1.1 From 5221e2324a0328eefe0069fe266203ca5ffb07a0 Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 31 Mar 2012 07:10:16 +0000 Subject: Remove end of line whitespace. --- share/man/man9/ieee80211_crypto.9 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man9/ieee80211_crypto.9 b/share/man/man9/ieee80211_crypto.9 index e21bc26..9f48f21 100644 --- a/share/man/man9/ieee80211_crypto.9 +++ b/share/man/man9/ieee80211_crypto.9 @@ -127,7 +127,7 @@ driver is unable to provide necessary hardware services. cipher modules register their services using .Fn ieee80211_crypto_register and supply a template that describes their operation. -This +This .Vt ieee80211_cipher structure defines protocol-related state such as the number of bytes of space in the 802.11 header to reserve/remove during encap/decap @@ -153,7 +153,7 @@ hardware. .Sh CRYPTO KEY MANAGEMENT The .Nm net80211 -layer implements a per-vap 4-element +layer implements a per-vap 4-element .Dq global key table and a per-station .Dq unicast key @@ -235,7 +235,7 @@ to the driver that are already prepared for transmission. For receive, drivers mark frames with the .Dv M_WEP mbuf flag to indicate the hardware has decrypted the payload. -If frames have the +If frames have the .Dv IEEE80211_FC1_WEP bit marked in their 802.11 header and are not tagged with .Dv M_WEP -- cgit v1.1 From bbab93098d58b8643f834eba361bb0d661ba3876 Mon Sep 17 00:00:00 2001 From: dougb Date: Wed, 4 Apr 2012 23:58:41 +0000 Subject: Add Bv9ARM.pdf to the list of docs to install. --- share/doc/bind9/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile index 803811b..a92e37d 100644 --- a/share/doc/bind9/Makefile +++ b/share/doc/bind9/Makefile @@ -15,7 +15,7 @@ TOPDIR= ${DOCDIR}/bind9 ARM= Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html \ Bv9ARM.ch04.html Bv9ARM.ch05.html Bv9ARM.ch06.html \ Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html \ - Bv9ARM.ch10.html Bv9ARM.html \ + Bv9ARM.ch10.html Bv9ARM.html Bv9ARM.pdf \ man.arpaname.html man.ddns-confgen.html man.dig.html \ man.dnssec-dsfromkey.html man.dnssec-keyfromlabel.html \ man.dnssec-keygen.html man.dnssec-revoke.html \ -- cgit v1.1 From 85ccef88d3440944ee1c97a3fba3e8718d05fb8e Mon Sep 17 00:00:00 2001 From: melifaro Date: Fri, 6 Apr 2012 06:55:21 +0000 Subject: - Improve performace for writer-only BPF users. Linux and Solaris (at least OpenSolaris) has PF_PACKET socket families to send raw ethernet frames. The only FreeBSD interface that can be used to send raw frames is BPF. As a result, many programs like cdpd, lldpd, various dhcp stuff uses BPF only to send data. This leads us to the situation when software like cdpd, being run on high-traffic-volume interface significantly reduces overall performance since we have to acquire additional locks for every packet. Here we add sysctl that changes BPF behavior in the following way: If program came and opens BPF socket without explicitly specifyin read filter we assume it to be write-only and add it to special writer-only per-interface list. This makes bpf_peers_present() return 0, so no additional overhead is introduced. After filter is supplied, descriptor is added to original per-interface list permitting packets to be captured. Unfortunately, pcap_open_live() sets catch-all filter itself for the purpose of setting snap length. Fortunately, most programs explicitly sets (event catch-all) filter after that. tcpdump(1) is a good example. So a bit hackis approach is taken: we upgrade description only after second BIOCSETF is received. Sysctl is named net.bpf.optimize_writers and is turned off by default. - While here, document all sysctl variables in bpf.4 Sponsored by Yandex LLC Reviewed by: glebius (previous version) Reviewed by: silence on -net@ Approved by: (mentor) MFC after: 4 weeks --- share/man/man4/bpf.4 | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4 index e69456a..a317920 100644 --- a/share/man/man4/bpf.4 +++ b/share/man/man4/bpf.4 @@ -952,10 +952,33 @@ array initializers: .Fn BPF_STMT opcode operand and .Fn BPF_JUMP opcode operand true_offset false_offset . -.Sh FILES -.Bl -tag -compact -width /dev/bpf -.It Pa /dev/bpf -the packet filter device +.Sh SYSCTL VARIABLES +A set of +.Xr sysctl 8 +variables controls the behaviour of the +.Nm +subsystem +.Bl -tag -width indent +.It Va net.bpf.optimize_writers: No 0 +Various programs use BPF to send (but not receive) raw packets +(cdpd, lldpd, dhcpd, dhcp relays, etc. are good examples of such programs). +They do not need incoming packets to be send to them. Turning this option on +makes new BPF users to be attached to write-only interface list until program +explicitly specifies read filter via +.Cm pcap_set_filter() . +This removes any performance degradation for high-speed interfaces. +.It Va net.bpf.stats: +Binary interface for retrieving general statistics. +.It Va net.bpf.zerocopy_enable: No 0 +Permits zero-copy to be used with net BPF readers. Use with caution. +.It Va net.bpf.maxinsns: No 512 +Maximum number of instructions that BPF program can contain. Use +.Xr tcpdump 1 +-d option to determine approximate number of instruction for any filter. +.It Va net.bpf.maxbufsize: No 524288 +Maximum buffer size to allocate for packets buffer. +.It Va net.bpf.bufsize: No 4096 +Default buffer size to allocate for packets buffer. .El .Sh EXAMPLES The following filter is taken from the Reverse ARP Daemon. -- cgit v1.1 From 0ef023ae5b65d456b59d5ca3f4114a83e693a719 Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 7 Apr 2012 09:05:30 +0000 Subject: mdoc: fix column names, indentation, column separation within each row, and quotation. Also make sure we have the same amount of columns in each row as the number of columns we specify in the head arguments. Reviewed by: brueffer --- share/man/man3/tgmath.3 | 4 +-- share/man/man4/adv.4 | 73 ++++++++++++++++++++---------------------- share/man/man4/bt.4 | 69 ++++++++++++++++++++------------------- share/man/man4/bwi.4 | 7 ++-- share/man/man4/bwn.4 | 7 ++-- share/man/man4/malo.4 | 11 +++---- share/man/man4/man4.i386/apm.4 | 22 ++++++------- share/man/man4/uath.4 | 5 ++- 8 files changed, 95 insertions(+), 103 deletions(-) (limited to 'share') diff --git a/share/man/man3/tgmath.3 b/share/man/man3/tgmath.3 index 70e4a81..0feb13c 100644 --- a/share/man/man3/tgmath.3 +++ b/share/man/man3/tgmath.3 @@ -116,8 +116,8 @@ complex value to a generic argument invokes undefined behaviour: .It Fn erfc Ta Fn hypot Ta Fn lrint Ta Fn scalbln .It Fn exp2 Ta Fn ilogb Ta Fn lround Ta Fn tgamma .It Fn expm1 Ta Fn ldexp Ta Fn nextbyint Ta Fn trunc -.It Fn fdim Ta Fn lgamma Ta Fn nextafter -.It Fn floor Ta Fn llrint Ta Fn nexttoward +.It Fn fdim Ta Fn lgamma Ta Fn nextafter Ta \& +.It Fn floor Ta Fn llrint Ta Fn nexttoward Ta \& .El .Pp The following macros always expand to a complex function: diff --git a/share/man/man4/adv.4 b/share/man/man4/adv.4 index 178bae1..366441d 100644 --- a/share/man/man4/adv.4 +++ b/share/man/man4/adv.4 @@ -67,24 +67,23 @@ 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. .Bd -ragged -offset indent -.Bl -column "ABP510/5150 " "ISA PnP " "Yes " "10MHz " "Commands " Footnotes Connectivity Products: -.Pp -.Em "Adapter Bus Floppy MaxSync Commands Footnotes" -ABP510/5150 ISA No 10MHz 240 1 -ABP5140 ISA PnP No 10MHz 16 1, 3 -ABP5142 ISA PnP Yes 10MHz 16 4 -ABP[3]902 PCI No 10MHz 16 -ABP3905 PCI No 10MHz 16 -ABP915 PCI No 10MHz 16 -ABP920 PCI No 10MHz 16 -ABP3922 PCI No 10MHz 16 -ABP3925 PCI No 10MHz 16 -ABP930 PCI No 10MHz 16 5 -ABP930U PCI No 20MHz 16 -ABP930UA PCI No 20MHz 16 -ABP960 PCI No 10MHz 16 -ABP960U PCI No 20MHz 16 +.Bl -column "ABP510/5150 " "ISA PnP " "Floppy " "MaxSync " "Commands " "Footnotes " +.Em "Adapter" Ta Em "Bus" Ta Em "Floppy" Ta Em "MaxSync" Ta Em "Commands" Ta Em "Footnotes" +.It "ABP510/5150" Ta "ISA" Ta "\&No" Ta "10MHz" Ta "240" Ta "1" +.It "ABP5140" Ta "ISA PnP" Ta "\&No" Ta "10MHz" Ta "16" Ta "1, 3" +.It "ABP5142" Ta "ISA PnP" Ta "Yes" Ta "10MHz" Ta "16" Ta "4" +.It "ABP[3]902" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "16" Ta "" +.It "ABP3905" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "16" Ta "" +.It "ABP915" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "16" Ta "" +.It "ABP920" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "16" Ta "" +.It "ABP3922" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "16" Ta "" +.It "ABP3925" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "16" Ta "" +.It "ABP930" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "16" Ta "5" +.It "ABP930U" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "16" Ta "" +.It "ABP930UA" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "16" Ta "" +.It "ABP960" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "16" Ta "" +.It "ABP960U" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "16" Ta "" .El .Pp Footnotes: @@ -104,32 +103,30 @@ This board has been sold by SIIG as the Fast SCSI Pro PCI. .El .Ed .Bd -ragged -offset indent -.Bl -column "ABP510/5150 " "ISA PnP " "Yes " "10MHz " Commands Single Channel Products: -.Pp -.Em "Adapter Bus Floppy MaxSync Commands" -ABP542 ISA Yes 10MHz 240 -ABP742 EISA Yes 10MHz 240 -ABP842 VL Yes 10MHz 240 -ABP940 PCI No 10MHz 240 -ABP[3]940UA PCI No 20MHz 240 -ABP940U PCI No 20MHz 240 -ABP3960UA PCI No 20MHz 240 -ABP970 PCI No 10MHz 240 -ABP970U PCI No 20MHz 240 +.Bl -column "ABPX3X940UA " "EISA " "Floppy " "MaxSync " "Commands" +.Em "Adapter" Ta Em "Bus" Ta Em "Floppy" Ta Em "MaxSync" Ta Em "Commands" +.It "ABP542" Ta "ISA" Ta "Yes" Ta "10MHz" Ta "240" +.It "ABP742" Ta "EISA" Ta "Yes" Ta "10MHz" Ta "240" +.It "ABP842" Ta "VL" Ta "Yes" Ta "10MHz" Ta "240" +.It "ABP940" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "240" +.It "ABP[3]940UA" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "240" +.It "ABP940U" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "240" +.It "ABP3960UA" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "240" +.It "ABP970" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "240" +.It "ABP970U" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "240" .El .Ed .Bd -ragged -offset indent -.Bl -column "ABP510/5150 " "ISA PnP " "Yes " "10MHz " "Commands " "Channels " Multi Channel Products (Commands are per-channel): -.Pp -.Em "Adapter Bus Floppy MaxSync Commands Channels" -ABP752 EISA Yes 10MHz 240 2 -ABP852 VL Yes 10MHz 240 2 -ABP950 PCI No 10MHz 240 2 -ABP980 PCI No 10MHz 240 4 -ABP980U PCI No 20MHz 240 4 -ABP[3]980UA PCI No 20MHz 16 4 +.Bl -column "ABPX3X980UA " "EISA " "Floppy " "MaxSync " "Commands " "Channels" +.Em "Adapter" Ta Em "Bus" Ta Em "Floppy" Ta Em "MaxSync" Ta Em "Commands" Ta Em "Channels" +.It "ABP752" Ta "EISA" Ta "Yes" Ta "10MHz" Ta "240" Ta "2" +.It "ABP852" Ta "VL" Ta "Yes" Ta "10MHz" Ta "240" Ta "2" +.It "ABP950" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "240" Ta "2" +.It "ABP980" Ta "PCI" Ta "\&No" Ta "10MHz" Ta "240" Ta "4" +.It "ABP980U" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "240" Ta "4" +.It "ABP[3]980UA" Ta "PCI" Ta "\&No" Ta "20MHz" Ta "16" Ta "4" .El .Ed .Pp diff --git a/share/man/man4/bt.4 b/share/man/man4/bt.4 index c4c20e1..6a09bef 100644 --- a/share/man/man4/bt.4 +++ b/share/man/man4/bt.4 @@ -51,48 +51,47 @@ This driver provides access to the .Tn SCSI bus connected to a Buslogic/Mylex MultiMaster or compatible controller: .Bd -ragged -offset indent -.Bl -column "BT-956CD " "ISA " "Commands " Description MultiMaster "W" Series Host Adapters: -.Pp -.Em "Adapter Bus Commands Description" -BT-948 PCI 192 Ultra SCSI-3 -BT-958 PCI 192 Wide Ultra SCSI-3 -BT-958D PCI 192 Wide Differential Ultra SCSI-3 +.Bl -column "BT-956CD " "ISA " "Commands " "Description" +.Em "Adapter" Ta Em "Bus" Ta Em "Commands" Ta Em "Description" +BT-948 PCI 192 Ultra SCSI-3 +BT-958 PCI 192 Wide Ultra SCSI-3 +BT-958D PCI 192 Wide Differential Ultra SCSI-3 .El -.Bl -column "BT-956CD " "ISA " "Commands " Description -MultiMaster "C" Series Host Adapters: .Pp -.Em "Adapter Bus Commands Description" -BT-946C PCI 100 Fast SCSI-2 -BT-956C PCI 100 Wide Fast SCSI-2 -BT-956CD PCI 100 Wide Differential Fast SCSI-2 -BT-445C VLB 100 Fast SCSI-2 -BT-747C EISA 100 Fast SCSI-2 -BT-757C EISA 100 Wide Fast SCSI-2 -BT-757CD EISA 100 Wide Differential Fast SCSI-2 -BT-545C ISA 50 Fast SCSI-2 -BT-540CF ISA 50 Fast SCSI-2 +MultiMaster "C" Series Host Adapters: +.Bl -column "BT-956CD " "ISA " "Commands " "Description" +.Em "Adapter" Ta Em "Bus" Ta Em "Commands" Ta Em "Description" +BT-946C PCI 100 Fast SCSI-2 +BT-956C PCI 100 Wide Fast SCSI-2 +BT-956CD PCI 100 Wide Differential Fast SCSI-2 +BT-445C VLB 100 Fast SCSI-2 +BT-747C EISA 100 Fast SCSI-2 +BT-757C EISA 100 Wide Fast SCSI-2 +BT-757CD EISA 100 Wide Differential Fast SCSI-2 +BT-545C ISA 50 Fast SCSI-2 +BT-540CF ISA 50 Fast SCSI-2 .El -.Bl -column "BT-956CD " "ISA " "Commands " Description -MultiMaster "S" Series Host Adapters: .Pp -.Em "Adapter Bus Commands Description" -BT-445S VLB 30 Fast SCSI-2 -BT-747S EISA 30 Fast SCSI-2 -BT-747D EISA 30 Differential Fast SCSI-2 -BT-757S EISA 30 Wide Fast SCSI-2 -BT-757D EISA 30 Wide Differential Fast SCSI-2 -BT-545S ISA 30 Fast SCSI-2 -BT-542D ISA 30 Differential Fast SCSI-2 -BT-742A EISA 30 SCSI-2 (742A revision H) -BT-542B ISA 30 SCSI-2 (542B revision H) +MultiMaster "S" Series Host Adapters: +.Bl -column "BT-956CD " "ISA " "Commands " "Description" +.Em "Adapter" Ta Em "Bus" Ta Em "Commands" Ta Em "Description" +BT-445S VLB 30 Fast SCSI-2 +BT-747S EISA 30 Fast SCSI-2 +BT-747D EISA 30 Differential Fast SCSI-2 +BT-757S EISA 30 Wide Fast SCSI-2 +BT-757D EISA 30 Wide Differential Fast SCSI-2 +BT-545S ISA 30 Fast SCSI-2 +BT-542D ISA 30 Differential Fast SCSI-2 +BT-742A EISA 30 SCSI-2 (742A revision H) +BT-542B ISA 30 SCSI-2 (542B revision H) .El -.Bl -column "BT-956CD " "ISA " "Commands " Description -MultiMaster "A" Series Host Adapters: .Pp -.Em "Adapter Bus Commands Description" -BT-742A EISA 30 SCSI-2 (742A revisions A - G) -BT-542B ISA 30 SCSI-2 (542B revisions A - G) +MultiMaster "A" Series Host Adapters: +.Bl -column "BT-956CD " "ISA " "Commands " "Description" +.Em "Adapter" Ta Em "Bus" Ta Em "Commands" Ta Em "Description" +BT-742A EISA 30 SCSI-2 (742A revisions A - G) +BT-542B ISA 30 SCSI-2 (542B revisions A - G) .El .Ed .Pp diff --git a/share/man/man4/bwi.4 b/share/man/man4/bwi.4 index a9044e6..fe1ea65 100644 --- a/share/man/man4/bwi.4 +++ b/share/man/man4/bwi.4 @@ -72,16 +72,15 @@ will work. The .Nm driver supports Broadcom BCM43xx based wireless devices, including: -.Pp -.Bl -column -compact "Apple Airport Extreme" "BCM4306" "Mini PCI" "a/b/g" -offset 6n -.It Em "Card Chip Bus Standard" +.Bl -column "Apple Airport Extreme" "BCM4306" "Mini PCI" "a/b/g" -offset 6n +.It Em "Card" Ta Em "Chip" Ta Em "Bus" Ta Em "Standard" .It "Apple Airport Extreme BCM4306 PCI b/g" .It "Apple Airport Extreme BCM4318 PCI b/g" .It "ASUS WL-138g BCM4318 PCI b/g" .It "Buffalo WLI-CB-G54S BCM4318 CardBus b/g" .It "Buffalo WLI-PCI-G54S BCM4306 PCI b/g" .It "Compaq R4035 onboard BCM4306 PCI b/g" -.It "Dell Wireless 1390 BCM4311 Mini PCI b/g" +.It "Dell Wireless 1390 BCM4311 Mini PCI b/g" .It "Dell Wireless 1470 BCM4318 Mini PCI b/g" .It "Dell Truemobile 1300 r2 BCM4306 Mini PCI b/g" .It "Dell Truemobile 1400 BCM4309 Mini PCI b/g" diff --git a/share/man/man4/bwn.4 b/share/man/man4/bwn.4 index a2ff5c4..4aa75fd 100644 --- a/share/man/man4/bwn.4 +++ b/share/man/man4/bwn.4 @@ -75,13 +75,12 @@ LP (low power) PHY user please uses bwn_v4_lp_ucode module. The .Nm driver supports Broadcom BCM43xx based wireless devices, including: -.Pp -.Bl -column -compact "Apple Airport Extreme" "BCM4306" "Mini PCI" "a/b/g" -offset 6n -.It Em "Card Chip Bus Standard" +.Bl -column "Apple Airport Extreme" "BCM4306" "Mini PCI" "a/b/g" +.It Em "Card" Ta Em "Chip" Ta Em "Bus" Ta Em "Standard" .It "Apple Airport Extreme BCM4318 PCI b/g" .It "ASUS WL-138g BCM4318 PCI b/g" .It "Buffalo WLI-CB-G54S BCM4318 CardBus b/g" -.It "Dell Wireless 1390 BCM4311 Mini PCI b/g" +.It "Dell Wireless 1390 BCM4311 Mini PCI b/g" .It "Dell Wireless 1470 BCM4318 Mini PCI b/g" .It "Dell Truemobile 1400 BCM4309 Mini PCI b/g" .It "HP Compaq 6715b BCM4312 PCI b/g" diff --git a/share/man/man4/malo.4 b/share/man/man4/malo.4 index eb8c2ed..22cc471 100644 --- a/share/man/man4/malo.4 +++ b/share/man/man4/malo.4 @@ -88,12 +88,11 @@ directory. The following cards are among those supported by the .Nm driver: -.Pp -.Bl -column -compact "Microcom Travelcard" "MALO111" "CardBus" "a/b/g" -offset 6n -.Em "Card Chip Bus Standard" -Netgear WG311v3 88W8335 PCI b/g -Tenda TWL542P 88W8335 PCI b/g -U-Khan UW-2054i 88W8335 PCI b/g +.Bl -column "Netgear WG311v3" "88W8335" "PCI" "b/g" +.Em "Card" Ta Em "Chip" Ta Em "Bus" Ta Em "Standard" +.It "Netgear WG311v3" Ta "88W8335" Ta "PCI" Ta "b/g" +.It "Tenda TWL542P" Ta "88W8335" Ta "PCI" Ta "b/g" +.It "U-Khan UW-2054i" Ta "88W8335" Ta "PCI" Ta "b/g" .El .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): diff --git a/share/man/man4/man4.i386/apm.4 b/share/man/man4/man4.i386/apm.4 index e5e5c6a..6d7b524 100644 --- a/share/man/man4/man4.i386/apm.4 +++ b/share/man/man4/man4.i386/apm.4 @@ -104,17 +104,17 @@ These interfaces are used by .It .Nm polls APM events and handles the following events. -.Bl -column PMEV_POWERSTATECHANGEXXX "suspend system xxxxx" -.It Sy "Name " "Action " "Description" -.It Dv "PMEV_STANDBYREQ " No "suspend system " "standby request" -.It Dv "PMEV_SUSPENDREQ " No "suspend system " "suspend request" -.It Dv "PMEV_USERSUSPENDREQ " No "suspend system " "user suspend request" -.It Dv "PMEV_CRITSUSPEND " No "suspend system " "critical suspend request" -.It Dv "PMEV_NORMRESUME " No "resume system " "normal resume" -.It Dv "PMEV_CRITRESUME " No "resume system " "critical resume" -.It Dv "PMEV_STANDBYRESUME " No "resume system " "standby resume" -.It Dv "PMEV_BATTERYLOW " No "notify message " "battery low" -.It Dv "PMEV_UPDATETIME " No "adjust clock " "update time" +.Bl -column "xxxxxxxxxxxxxxxxx" "xxxxxxxxxxxxx" "xxxxxxxx" +.It Sy "Name" Ta Sy "Action" Ta Sy "Description" +.It Dv "PMEV_STANDBYREQ" Ta No "suspend system" Ta "standby request" +.It Dv "PMEV_SUSPENDREQ" Ta No "suspend system" Ta "suspend request" +.It Dv "PMEV_USERSUSPENDREQ" Ta No "suspend system" Ta "user suspend request" +.It Dv "PMEV_CRITSUSPEND" Ta No "suspend system" Ta "critical suspend request" +.It Dv "PMEV_NORMRESUME" Ta No "resume system" Ta "normal resume" +.It Dv "PMEV_CRITRESUME" Ta No "resume system" Ta "critical resume" +.It Dv "PMEV_STANDBYRESUME" Ta No "resume system" Ta "standby resume" +.It Dv "PMEV_BATTERYLOW" Ta No "notify message" Ta "battery low" +.It Dv "PMEV_UPDATETIME" Ta No "adjust clock" Ta "update time" .El .El .Sh SEE ALSO diff --git a/share/man/man4/uath.4 b/share/man/man4/uath.4 index 3f4a9ab..e93094e 100644 --- a/share/man/man4/uath.4 +++ b/share/man/man4/uath.4 @@ -83,9 +83,8 @@ This firmware is licensed for general use and is included in the base system. The .Nm driver should work with the following adapters: -.Pp -.Bl -column -compact "TRENDware International TEW-444UB" "AR5005UX" -offset 6n -.It Em "Adapter Chipset" +.Bl -column "TRENDware International TEW-444UB" "AR5005UX" +.It Em "Adapter" Ta Em "Chipset" .\".It Belkin F6D3050 AR5005UX .It Li "Compex WLU108AG" Ta AR5005UX .It Li "Compex WLU108G" Ta AR5005UG -- cgit v1.1 From 5b3638ba8262e351a76d74ba94bffeb153dcbae8 Mon Sep 17 00:00:00 2001 From: eadler Date: Tue, 10 Apr 2012 01:49:31 +0000 Subject: Update examples with corrections from the author PR: ports/160689 Submitted by: mickael.maillot@gmail.com Approved by: cperciva (implicit) MFC after: 1 days (with r233429) --- share/examples/csh/dot.cshrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/examples/csh/dot.cshrc b/share/examples/csh/dot.cshrc index 2cb4257..731a04a 100644 --- a/share/examples/csh/dot.cshrc +++ b/share/examples/csh/dot.cshrc @@ -29,11 +29,11 @@ complete service 'c/-/(e l r v)/' 'p/1/`service -l`/' 'n/*/(start stop reload complete kldunload 'n@*@`kldstat | awk \{sub\(\/\.ko\/,\"\",\$NF\)\;print\ \$NF\} | grep -v Name` @' complete make 'n@*@`make -pn | sed -n -E "/^[#_.\/[:blank:]]+/d; /=/d; s/[[:blank:]]*:.*//gp;"`@' complete pkg_delete 'c/-/(i v D n p d f G x X r)/' 'n@*@`ls /var/db/pkg`@' -complete pkg_info 'c/-/(a b v p q Q c d D f g i I j k K r R m L s o G O x X e E l t V P)/' 'n@*@`\ls -1 /var/db/pkg | sed svar/db/pkg/%%`@" +complete pkg_info 'c/-/(a b v p q Q c d D f g i I j k K r R m L s o G O x X e E l t V P)/' 'n@*@`\ls -1 /var/db/pkg | sed svar/db/pkg/%%`@' complete kill 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $1}'"'"'`/' complete killall 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $5}'"'"'`/' complete dd 'c/[io]f=/f/ n/*/"(if of ibs obs bs skip seek count)"/=' -alias _PKGS_PkGs_PoRtS_ 'awk -F\| \{sub\(\"\/usr\/ports\/\"\,\"\"\,\$2\)\;print\ \$2\} /usr/ports/INDEX-name -r | cut -d . -f 1A +alias _PKGS_PkGs_PoRtS_ 'awk -F\| \{sub\(\"\/usr\/ports\/\"\,\"\"\,\$2\)\;print\ \$2\} /usr/ports/INDEX-name -r | cut -d . -f 1' alias _PKGS_PkGs_PoRtS_ 'awk -F\| \{sub\(\"\/usr\/ports\/\"\,\"\"\,\$2\)\;print\ \$2\} /usr/ports/INDEX-`uname -r | cut -d . -f 1`&& pkg_info -E \*' complete portmaster 'c/--/(always-fetch check-depends check-port-dbdir clean-distfiles \ clean-packages delete-build-only delete-packages force-config help \ -- cgit v1.1 From 5aa865afa50a2b97e5a4ad1f19def0b2e61ebccf Mon Sep 17 00:00:00 2001 From: eadler Date: Wed, 11 Apr 2012 14:36:05 +0000 Subject: Fix typo (add a missing '%/' in sed) Submitted by: jmallett Approved by: cperciva (implicit) MFC after: 3 days --- share/examples/csh/dot.cshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/examples/csh/dot.cshrc b/share/examples/csh/dot.cshrc index 731a04a..8ee0088 100644 --- a/share/examples/csh/dot.cshrc +++ b/share/examples/csh/dot.cshrc @@ -29,7 +29,7 @@ complete service 'c/-/(e l r v)/' 'p/1/`service -l`/' 'n/*/(start stop reload complete kldunload 'n@*@`kldstat | awk \{sub\(\/\.ko\/,\"\",\$NF\)\;print\ \$NF\} | grep -v Name` @' complete make 'n@*@`make -pn | sed -n -E "/^[#_.\/[:blank:]]+/d; /=/d; s/[[:blank:]]*:.*//gp;"`@' complete pkg_delete 'c/-/(i v D n p d f G x X r)/' 'n@*@`ls /var/db/pkg`@' -complete pkg_info 'c/-/(a b v p q Q c d D f g i I j k K r R m L s o G O x X e E l t V P)/' 'n@*@`\ls -1 /var/db/pkg | sed svar/db/pkg/%%`@' +complete pkg_info 'c/-/(a b v p q Q c d D f g i I j k K r R m L s o G O x X e E l t V P)/' 'n@*@`\ls -1 /var/db/pkg | sed s%/var/db/pkg/%%`@' complete kill 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $1}'"'"'`/' complete killall 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $5}'"'"'`/' complete dd 'c/[io]f=/f/ n/*/"(if of ibs obs bs skip seek count)"/=' -- cgit v1.1 From 2eada33b7c94362e5583ff7d7ee15c10bd66110a Mon Sep 17 00:00:00 2001 From: eadler Date: Thu, 12 Apr 2012 00:12:17 +0000 Subject: Sort completions Add a new one for sysctl Submitted by: rm (the new completion) Approved by: cperciva (implicit) MFC after: 3 days --- share/examples/csh/dot.cshrc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'share') diff --git a/share/examples/csh/dot.cshrc b/share/examples/csh/dot.cshrc index 8ee0088..17951d4 100644 --- a/share/examples/csh/dot.cshrc +++ b/share/examples/csh/dot.cshrc @@ -21,20 +21,20 @@ bindkey "^[[3~" delete-char-or-list-or-eof # Make the Ins key work bindkey "\e[2~" overwrite-mode +# Aliases used for completions +alias _PKGS_PkGs_PoRtS_ 'awk -F\| \{sub\(\"\/usr\/ports\/\"\,\"\"\,\$2\)\;print\ \$2\} /usr/ports/INDEX-name -r | cut -d . -f 1' +alias _PKGS_PkGs_PoRtS_ 'awk -F\| \{sub\(\"\/usr\/ports\/\"\,\"\"\,\$2\)\;print\ \$2\} /usr/ports/INDEX-`uname -r | cut -d . -f 1`&& pkg_info -E \*' + # Some common completions complete chown 'p/1/u/' -complete man 'C/*/c/' -complete service 'n/*/`service -l`/' -complete service 'c/-/(e l r v)/' 'p/1/`service -l`/' 'n/*/(start stop reload restart status rcvar onestart onestop)/' +complete dd 'c/[io]f=/f/ n/*/"(if of ibs obs bs skip seek count)"/=' +complete kill 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $1}'"'"'`/' +complete killall 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $5}'"'"'`/' complete kldunload 'n@*@`kldstat | awk \{sub\(\/\.ko\/,\"\",\$NF\)\;print\ \$NF\} | grep -v Name` @' complete make 'n@*@`make -pn | sed -n -E "/^[#_.\/[:blank:]]+/d; /=/d; s/[[:blank:]]*:.*//gp;"`@' +complete man 'C/*/c/' complete pkg_delete 'c/-/(i v D n p d f G x X r)/' 'n@*@`ls /var/db/pkg`@' complete pkg_info 'c/-/(a b v p q Q c d D f g i I j k K r R m L s o G O x X e E l t V P)/' 'n@*@`\ls -1 /var/db/pkg | sed s%/var/db/pkg/%%`@' -complete kill 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $1}'"'"'`/' -complete killall 'c/-/S/' 'c/%/j/' 'n/*/`ps -ax | awk '"'"'{print $5}'"'"'`/' -complete dd 'c/[io]f=/f/ n/*/"(if of ibs obs bs skip seek count)"/=' -alias _PKGS_PkGs_PoRtS_ 'awk -F\| \{sub\(\"\/usr\/ports\/\"\,\"\"\,\$2\)\;print\ \$2\} /usr/ports/INDEX-name -r | cut -d . -f 1' -alias _PKGS_PkGs_PoRtS_ 'awk -F\| \{sub\(\"\/usr\/ports\/\"\,\"\"\,\$2\)\;print\ \$2\} /usr/ports/INDEX-`uname -r | cut -d . -f 1`&& pkg_info -E \*' complete portmaster 'c/--/(always-fetch check-depends check-port-dbdir clean-distfiles \ clean-packages delete-build-only delete-packages force-config help \ index index-first index-only list-origins local-packagedir no-confirm \ @@ -42,6 +42,8 @@ complete portmaster 'c/--/(always-fetch check-depends check-port-dbdir clean-d packages-local packages-only show-work update-if-newer version)/' \ 'c/-/(a b B C d D e f F g G h H i l L m n o p r R s t u v w x)/' \ 'n@*@`_PKGS_PkGs_PoRtS_`@' +complete service 'c/-/(e l r v)/' 'p/1/`service -l`/' 'n/*/(start stop reload restart status rcvar onestart onestop)/' +complete sysctl 'n/*/`sysctl -Na`/' # Alternate prompts set prompt = '#' -- cgit v1.1 From 4897f3c39d5e85509f94849f223b45ecb157db76 Mon Sep 17 00:00:00 2001 From: dougb Date: Thu, 12 Apr 2012 01:53:33 +0000 Subject: The BIND 9.8.2 tarball was re-rolled to remove 9.8.1 release notes. This change was noticed by ISC at: https://lists.isc.org/pipermail/bind-users/2012-April/087345.html and verified by me both by comparing the contents of the old and new distfiles and by verifying the PGP signature on the new distfile. --- share/doc/bind9/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'share') diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile index a92e37d..3aca4e5 100644 --- a/share/doc/bind9/Makefile +++ b/share/doc/bind9/Makefile @@ -8,9 +8,7 @@ SRCDIR= ${BIND_DIR}/doc NO_OBJ= FILESGROUPS= TOP ARM MISC -TOP= CHANGES COPYRIGHT FAQ HISTORY README \ - RELEASE-NOTES-BIND-9.8.1.pdf RELEASE-NOTES-BIND-9.8.1.txt \ - RELEASE-NOTES-BIND-9.8.1.html release-notes.css +TOP= CHANGES COPYRIGHT FAQ HISTORY README TOPDIR= ${DOCDIR}/bind9 ARM= Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html \ Bv9ARM.ch04.html Bv9ARM.ch05.html Bv9ARM.ch06.html \ -- cgit v1.1 From a89f19ac8b96335c605bb45d21de815e7b3a3900 Mon Sep 17 00:00:00 2001 From: pluknet Date: Thu, 12 Apr 2012 16:02:45 +0000 Subject: Update the swi_add prototype after struct ithd was split up into struct intr_event and struct intr_thread. PR: docs/166864 Reviewed by: jhb (older version) MFC after: 1 week --- share/man/man9/swi.9 | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'share') diff --git a/share/man/man9/swi.9 b/share/man/man9/swi.9 index ec2c3d6..979b532 100644 --- a/share/man/man9/swi.9 +++ b/share/man/man9/swi.9 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 30, 2000 +.Dd April 12, 2012 .Dt SWI 9 .Os .Sh NAME @@ -42,7 +42,7 @@ .Vt "extern void *vm_ih" ; .Ft int .Fo swi_add -.Fa "struct ithd **ithdp" +.Fa "struct intr_event **eventp" .Fa "const char *name" .Fa "driver_intr_t handler" .Fa "void *arg" @@ -67,20 +67,21 @@ time, and that they can be run via a lightweight context switch. .Pp The .Fn swi_add -function is used to register a new software interrupt handler. +function is used to add a new software interrupt handler to a specified +interrupt event. The -.Fa ithdp +.Fa eventp argument is an optional pointer to a -.Vt struct ithd +.Vt struct intr_event pointer. -If this argument points to an existing software interrupt thread, then this -handler will be attached to that thread. -Otherwise a new thread will be created, and if -.Fa ithdp +If this argument points to an existing event that holds a list of +interrupt handlers, then this handler will be attached to that event. +Otherwise a new event will be created, and if +.Fa eventp is not .Dv NULL , then the pointer at that address to will be modified to point to the -newly created thread. +newly created event. The .Fa name argument is used to associate a name with a specific handler. @@ -99,7 +100,7 @@ The .Fa pri value specifies the priority of this interrupt handler relative to other software interrupt handlers. -If an interrupt thread is created, then this value is used as the vector, +If an interrupt event is created, then this value is used as the vector, and the .Fa flags argument is used to specify the attributes of a handler such as @@ -183,7 +184,7 @@ argument specifies .Dv INTR_ENTROPY . .It Bq Er EINVAL The -.Fa ithdp +.Fa eventp argument points to a hardware interrupt thread. .It Bq Er EINVAL Either of the @@ -195,9 +196,9 @@ arguments are .It Bq Er EINVAL The .Dv INTR_EXCL -flag is specified and the interrupt thread pointed to by -.Fa ithdp -already has at least one handler, or the interrupt thread already has an +flag is specified and the interrupt event pointed to by +.Fa eventp +already has at least one handler, or the interrupt event already has an exclusive handler. .El .Sh SEE ALSO -- cgit v1.1 From 02e8925eaaadc72af91ad69199fbca1d57fadec5 Mon Sep 17 00:00:00 2001 From: madpilot Date: Thu, 12 Apr 2012 20:22:17 +0000 Subject: Add myself and my relation to my mentors. Approved by: crees --- share/misc/committers-ports.dot | 3 +++ 1 file changed, 3 insertions(+) (limited to 'share') diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index f47f335..51606a0 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -128,6 +128,7 @@ lme [label="Lars Engels\nlme@FreeBSD.org\n2007/07/09"] lth [label="Lars Thegler\nlth@FreeBSD.org\n2004/05/04"] lwhsu [label="Li-Wen Hsu\nlwhsu@FreeBSD.org\n2007/04/03"] lx [label="David Thiel\nlx@FreeBSD.org\n2006/11/29"] +madpilot [label="Guido Falsi\nmadpilot@FreeBSD.org\n2012/04/12"] maho [label="Maho Nakata\nmaho@FreeBSD.org\n2002/10/17"] makc [label="Max Brazhnikov\nmakc@FreeBSD.org\n2008/08/25"] mandree [label="Matthias Andree\nmandree@FreeBSD.org\n2009/11/18"] @@ -240,6 +241,7 @@ clsung -> lwhsu clsung -> tabthorpe crees -> jgh +crees -> madpilot delphij -> nemoliu delphij -> rafan @@ -440,6 +442,7 @@ tabthorpe -> fluffy tabthorpe -> jacula tabthorpe -> jadawin tabthorpe -> jlaffaye +tabthorpe -> madpilot tabthorpe -> pgj tabthorpe -> rene tabthorpe -> zi -- cgit v1.1 From f10cedc9c7620729abc9391282554fbcf2581628 Mon Sep 17 00:00:00 2001 From: monthadar Date: Fri, 13 Apr 2012 16:53:00 +0000 Subject: Add myself as a new committer and add adrian as my mentor. Approved by: adrian (mentor) --- share/misc/committers-src.dot | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 28c4c4d..90d6464 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -195,6 +195,7 @@ mdodd [label="Matthew N. Dodd\nmdodd@FreeBSD.org\n1999/07/27"] melifaro [label="Alexander V. Chernikov\nmelifaro@FreeBSD.org\n2011/10/04"] mjacob [label="Matt Jacob\nmjacob@FreeBSD.org\n1997/08/13"] mlaier [label="Max Laier\nmlaier@FreeBSD.org\n2004/02/10"] +monthadar [label="Monthadar Al Jaberi\nmonthadar@FreeBSD.org\n2012/04/02"] mr [label="Michael Reifenberger\nmr@FreeBSD.org\n2001/09/30"] mux [label="Maxime Henrion\nmux@FreeBSD.org\n2002/03/03"] neel [label="Neel Natu\nneel@FreeBSD.org\n2009/09/20"] @@ -280,6 +281,7 @@ day1 -> rgrimes day1 -> alm day1 -> dg +adrian -> monthadar adrian -> ray adrian -> rmh -- cgit v1.1 From 4cba6f70cf594650619c340d6ff4ae062f305bab Mon Sep 17 00:00:00 2001 From: jpaetzel Date: Fri, 13 Apr 2012 18:21:56 +0000 Subject: Update to version 2.3.1.0 Obtained from: Daniel Braniss --- share/man/man4/iscsi_initiator.4 | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'share') diff --git a/share/man/man4/iscsi_initiator.4 b/share/man/man4/iscsi_initiator.4 index b937f6b..a862c02 100644 --- a/share/man/man4/iscsi_initiator.4 +++ b/share/man/man4/iscsi_initiator.4 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2007 Daniel Braniss +.\" Copyright (c) 2007-2010 Daniel Braniss .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -24,9 +24,9 @@ .\" .\" $FreeBSD$ .\" -.Dd May 9, 2010 -.Dt ISCSI_INITIATOR 4 +.Dd August 3, 2010 .Os +.Dt ISCSI_INITIATOR 4 .Sh NAME .Nm iscsi_initiator .Nd kernel driver for the iSCSI protocol @@ -48,38 +48,36 @@ iscsi_initiator_load="YES" The .Nm implements the kernel side of the Internet SCSI (iSCSI) network -protocol standard. -The userland companion is +protocol standard, the user land companion is .Xr iscontrol 8 , and permits access to remote .Em virtual SCSI devices via .Xr cam 4 . .Sh SYSCTL VARIABLES -.Bl -tag -width "net.iscsi.n.targedaddress" +.Bl -tag -width ".Va net.iscsi.n.targeaddress" .It Va debug.iscsi_initiator set the debug-level, 0 means no debugging, 9 for maximum. .It Va net.iscsi.isid the initiator part of the Session Identifier. -.El -.Pp -The following are informative only: -.Bl -tag -width "net.iscsi.n.targedaddress" +.It Va "kern.cam.cam_srch_hi=1" +allow search above LUN 7 for SCSI3 and greater devices. +.It "the following are informative only:" .It Va net.iscsi.driver_version the current version of the driver. .It Va net.iscsi.sessions the number of current active sessions. .It Va net.iscsi.n.targetname -the target name of session +is the targe name of session .Em n . -.It Va net.iscsi.n.targedaddress -the IP address of the target of session +.It Va net.iscsi.n.targeaddress +is the IP address of the target of session .Em n . .It Va net.iscsi.n.stats -statistics for session -.Em n +are some statistics for session +.EM n .It Va net.iscsi.n.pid -the +is the .Em "process id" of the userland side of session .Em n , @@ -87,11 +85,11 @@ see .Xr iscontrol 8 . .El .Sh FILES -The +The .Nm driver creates the following: -.Pp .Bl -tag -width ".Pa /dev/iscsi%dxx" -compact +.Pp .It Pa /dev/iscsi used to create new sessions. .It Pa /dev/iscsi%d @@ -105,5 +103,6 @@ for each new session. iSCSI RFC 3720 .\" .Sh HISTORY .\" .Sh AUTHORS +This software was written by Daniel Braniss .Sh BUGS The lun discovery method is old-fashioned. -- cgit v1.1 From 78f7a45a3a539656c95935b3646b1b1098cebd5f Mon Sep 17 00:00:00 2001 From: jasone Date: Fri, 13 Apr 2012 20:58:01 +0000 Subject: Added myself to committers-src.dot. --- share/misc/committers-src.dot | 3 +++ 1 file changed, 3 insertions(+) (limited to 'share') diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 90d6464..0d1d7ef 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -156,6 +156,7 @@ iedowse [label="Ian Dowse\niedowse@FreeBSD.org\n2000/12/01"] imp [label="Warner Losh\nimp@FreeBSD.org\n1996/09/20"] ivoras [label="Ivan Voras\nivoras@FreeBSD.org\n2008/06/10"] jamie [label="Jamie Gritton\njamie@FreeBSD.org\n2009/01/28"] +jasone [label="Jason Evans\njasone@FreeBSD.org\n1999/03/03"] jceel [label="Jakub Klama\njceel@FreeBSD.org\n2011/09/25"] jchandra [label="Jayachandran C.\njchandra@FreeBSD.org\n2010/05/19"] jeff [label="Jeff Roberson\njeff@FreeBSD.org\n2002/02/21"] @@ -478,6 +479,7 @@ marcel -> arun marcel -> marius marcel -> nwhitehorn +markm -> jasone markm -> sheldonh mav -> ae @@ -494,6 +496,7 @@ mlaier -> thompsa mlaier -> eri msmith -> cokane +msmith -> jasone msmith -> scottl murray -> delphij -- cgit v1.1 From 390cf974cd057e4a00c820df04c98280b2d8dce1 Mon Sep 17 00:00:00 2001 From: sperber Date: Mon, 16 Apr 2012 15:08:01 +0000 Subject: Add myself to committers-ports Approved by: beat (mentor) --- share/misc/committers-ports.dot | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'share') diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 51606a0..2e897f2 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -173,6 +173,7 @@ shaun [label="Shaun Amott\nshaun@FreeBSD.org\n2006/06/19"] simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2005/01/08"] skreuzer [label="Steven Kreuzer\nskreuzer@FreeBSD.org\n2009/03/25"] sobomax[label="Maxim Sobolev\nsobomax@FreeBSD.org\n2000/05/17"] +sperber[label="Armin Pirkovitsch\nsperber@FreeBSD.org\n2012/04/15"] stas [label="Stanislav Sedov\nstas@FreeBSD.org\n2006/09/18"] stefan [label="Stefan Walter\nstefan@FreeBSD.org\n2006/05/07"] stephen [label="Stephen Montgomery-Smith\nstephen@FreeBSD.org\n2011/06/13"] @@ -224,6 +225,7 @@ bapt -> eadler bapt -> jlaffaye beat -> decke +beat -> sperber beat -> uqs beech -> glarkin @@ -243,6 +245,8 @@ clsung -> tabthorpe crees -> jgh crees -> madpilot +decke -> sperber + delphij -> nemoliu delphij -> rafan @@ -370,6 +374,7 @@ miwi -> nox miwi -> pawel miwi -> rm miwi -> sbz +miwi -> sperber miwi -> sylvio miwi -> tabthorpe miwi -> trasz -- cgit v1.1 From ef881c3335e928604952cacde8c36cdc46fe1f72 Mon Sep 17 00:00:00 2001 From: mav Date: Tue, 17 Apr 2012 11:13:03 +0000 Subject: Add some more SCSI mode pages from SPC-4 spec. MFC after: 1 week --- share/misc/scsi_modes | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/misc/scsi_modes b/share/misc/scsi_modes index f6116e8..4f7e59a 100644 --- a/share/misc/scsi_modes +++ b/share/misc/scsi_modes @@ -92,6 +92,25 @@ {Reserved} *i1 } +0x15 "Extended Page"; + +0x16 "Extended Device-Type Specific Page"; + +0x1c "Informational Exceptions Control Page" { + {PERF} t1 + {Reserved} *t1 + {EBF} t1 + {EWasc} t1 + {DExcpt} t1 + {TEST} t1 + {EBACKERR} t1 + {LogErr} t1 + {Reserved} *t4 + {MRIE} b4 + {Interval Timer} i4 + {Report Count} i4 +} + 0x09 "Peripheral Device Page" { {Interface Identifier} i2 {Reserved} *i1 @@ -100,7 +119,7 @@ {Reserved} *i1 } -0x1a "Power Control" { +0x1a "Power Condition Page" { {Reserved} *i1 {Reserved} *t6 {Idle} t1 @@ -109,6 +128,10 @@ {Standby Condition Timer} i4 } +0x18 "Protocol-Specific LUN Page"; + +0x19 "Protocol-Specific Port Page"; + # DIRECT ACCESS DEVICES 0x08 "Caching Page" { {IC} t1 -- cgit v1.1 From 9da257a75dc40dcb5a0bbc47e3414fbec382be87 Mon Sep 17 00:00:00 2001 From: maxim Date: Wed, 18 Apr 2012 15:23:21 +0000 Subject: o FreeBSD 8.3-RELEASE added. --- share/misc/bsd-family-tree | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'share') diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 545e9df..43ab9d6 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -246,13 +246,14 @@ FreeBSD 5.2 | | | | | | | | | NetBSD 5.1 | | | FreeBSD FreeBSD | | | | | 8.2 7.4 | | | DragonFly 2.10.1 - | v | | OpenBSD 4.9 | - | Mac OS X | | | - | 10.7 | | | - | | | OpenBSD 5.0 | - +--FreeBSD | | | | - | 9.0 | | | DragonFly 3.0.1 - | v | | | | + | | | | OpenBSD 4.9 | + | `-----. Mac OS X | | | + | \ 10.7 | | | + | | | | OpenBSD 5.0 | + *--FreeBSD | | | | | + | 9.0 | | | | DragonFly 3.0.1 + | v FreeBSD | | | | + | 8.3 | | | | | | | | | FreeBSD 10 -current | NetBSD -current OpenBSD -current | | | | | | @@ -544,6 +545,7 @@ Mac OS X 10.7 2011-07-20 [APL] OpenBSD 5.0 2011-11-01 [OBD] FreeBSD 9.0 2012-01-12 [FBD] DragonFly 3.0.1 2012-02-21 [DFB] +FreeBSD 8.3 2012-04-18 [FBD] Bibliography ------------------------ -- cgit v1.1 From 164dd155ca1447641996d72047b852a54ccc3aa0 Mon Sep 17 00:00:00 2001 From: dteske Date: Wed, 18 Apr 2012 18:35:19 +0000 Subject: Add myself as a new committer. Approved by: emaste (mentor) --- share/misc/committers-src.dot | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 0d1d7ef..62947f4 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -127,6 +127,7 @@ dfr [label="Doug Rabson\ndfr@FreeBSD.org\n????/??/??"] dg [label="David Greenman\ndg@FreeBSD.org\n1993/06/14"] dim [label="Dimitry Andric\ndim@FreeBSD.org\n2010/08/30"] dougb [label="Doug Barton\ndougb@FreeBSD.org\n2000/10/26"] +dteske [label="Devin Teske\ndteske@FreeBSD.org\n2012/04/10"] dwmalone [label="David Malone\ndwmalone@FreeBSD.org\n2000/07/11"] ed [label="Ed Schouten\ned@FreeBSD.org\n2008/05/22"] edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2007/06/25"] @@ -362,6 +363,7 @@ eivind -> des eivind -> rwatson emaste -> rstone +emaste -> dteske emax -> markus -- cgit v1.1 From 359a7bc8fb3bf19c68eed0c89709a1250e63ec9b Mon Sep 17 00:00:00 2001 From: pluknet Date: Thu, 19 Apr 2012 15:29:09 +0000 Subject: Document swi_remove(9). Reviewed by: jhb MFC after: 1 week --- share/man/man9/Makefile | 1 + share/man/man9/swi.9 | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index e5778a1..06b0e33 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1250,6 +1250,7 @@ MLINKS+=store.9 subyte.9 \ store.9 suword32.9 \ store.9 suword64.9 MLINKS+=swi.9 swi_add.9 \ + swi.9 swi_remove.9 \ swi.9 swi_sched.9 MLINKS+=sx.9 sx_assert.9 \ sx.9 sx_destroy.9 \ diff --git a/share/man/man9/swi.9 b/share/man/man9/swi.9 index 979b532..adc5421 100644 --- a/share/man/man9/swi.9 +++ b/share/man/man9/swi.9 @@ -24,11 +24,12 @@ .\" .\" $FreeBSD$ .\" -.Dd April 12, 2012 +.Dd April 19, 2012 .Dt SWI 9 .Os .Sh NAME .Nm swi_add , +.Nm swi_remove , .Nm swi_sched .Nd register and schedule software interrupt handlers .Sh SYNOPSIS @@ -50,6 +51,8 @@ .Fa "enum intr_type flags" .Fa "void **cookiep" .Fc +.Ft int +.Fn swi_remove "void *cookie" .Ft void .Fn swi_sched "void *cookie" "int flags" .Sh DESCRIPTION @@ -114,6 +117,14 @@ This cookie will be set to a value that uniquely identifies this handler, and is used to schedule the handler for execution later on. .Pp The +.Fn swi_remove +function is used to teardown an interrupt handler pointed to by the +.Fa cookie +argument. +It detaches the interrupt handler from the associated interrupt event +and frees its memory. +.Pp +The .Fn swi_sched function is used to schedule an interrupt handler and its associated thread to run. @@ -164,7 +175,9 @@ networking stack, clock interrupt, and VM subsystem respectively. .Sh RETURN VALUES The .Fn swi_add -function returns zero on success and non-zero on failure. +and +.Fn swi_remove +functions return zero on success and non-zero on failure. .Sh ERRORS The .Fn swi_add @@ -201,6 +214,17 @@ flag is specified and the interrupt event pointed to by already has at least one handler, or the interrupt event already has an exclusive handler. .El +.Pp +The +.Fn swi_remove +function will fail if: +.Bl -tag -width Er +.It Bq Er EINVAL +A software interrupt handler pointed to by +.Fa cookie +is +.Dv NULL . +.El .Sh SEE ALSO .Xr ithread 9 , .Xr taskqueue 9 @@ -221,6 +245,10 @@ and .Fn schedsoft* functions which date back to at least .Bx 4.4 . +The +.Fn swi_remove +function first appeared in +.Fx 6.1 . .Sh BUGS Most of the global variables described in this manual page should not be global, or at the very least should not be declared in -- cgit v1.1 From bb79f10054e52d5233c22331cb874f1b75576725 Mon Sep 17 00:00:00 2001 From: pluknet Date: Thu, 19 Apr 2012 16:13:15 +0000 Subject: - Update the rest of struct ithd references. - net_ih and softclock_ih cookies have gone away. MFC after: 1 week --- share/man/man9/swi.9 | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'share') diff --git a/share/man/man9/swi.9 b/share/man/man9/swi.9 index adc5421..831a67e 100644 --- a/share/man/man9/swi.9 +++ b/share/man/man9/swi.9 @@ -36,10 +36,8 @@ .In sys/param.h .In sys/bus.h .In sys/interrupt.h -.Vt "extern struct ithd *tty_ithd" ; -.Vt "extern struct ithd *clk_ithd" ; -.Vt "extern void *net_ih" ; -.Vt "extern void *softclock_ih" ; +.Vt "extern struct intr_event *tty_intr_event" ; +.Vt "extern struct intr_event *clk_intr_event" ; .Vt "extern void *vm_ih" ; .Ft int .Fo swi_add @@ -152,26 +150,23 @@ in earlier versions of .El .Pp The -.Va tty_ithd +.Va tty_intr_event and -.Va clk_ithd -variables contain pointers to the software interrupt threads for the tty and +.Va clk_intr_event +variables contain pointers to the software interrupt handlers for the tty and clock software interrupts, respectively. -.Va tty_ithd +.Va tty_intr_event is used to hang tty software interrupt handlers off of the same thread. -.Va clk_ithd +.Va clk_intr_event is used to hang delayed handlers off of the clock software interrupt thread so that the functionality of .Fn setdelayed can be obtained in conjunction with .Dv SWI_DELAY . The -.Va net_ih , -.Va softclock_ih , -and .Va vm_ih -handler cookies are used to schedule software interrupt threads to run for the -networking stack, clock interrupt, and VM subsystem respectively. +handler cookie is used to schedule software interrupt threads to run for the +VM subsystem. .Sh RETURN VALUES The .Fn swi_add -- cgit v1.1 From 908f0136e85e7abafe5b743e1019ac68acadeb5b Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 21 Apr 2012 11:51:31 +0000 Subject: Minor mdoc fixes. --- share/man/man4/iscsi_initiator.4 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/man/man4/iscsi_initiator.4 b/share/man/man4/iscsi_initiator.4 index a862c02..d48a757 100644 --- a/share/man/man4/iscsi_initiator.4 +++ b/share/man/man4/iscsi_initiator.4 @@ -25,8 +25,8 @@ .\" $FreeBSD$ .\" .Dd August 3, 2010 -.Os .Dt ISCSI_INITIATOR 4 +.Os .Sh NAME .Nm iscsi_initiator .Nd kernel driver for the iSCSI protocol @@ -75,9 +75,9 @@ is the IP address of the target of session .Em n . .It Va net.iscsi.n.stats are some statistics for session -.EM n +.Em n .It Va net.iscsi.n.pid -is the +is the .Em "process id" of the userland side of session .Em n , @@ -85,11 +85,11 @@ see .Xr iscontrol 8 . .El .Sh FILES -The +The .Nm driver creates the following: -.Bl -tag -width ".Pa /dev/iscsi%dxx" -compact .Pp +.Bl -tag -width ".Pa /dev/iscsi%dxx" -compact .It Pa /dev/iscsi used to create new sessions. .It Pa /dev/iscsi%d @@ -102,7 +102,7 @@ for each new session. .Sh STANDARDS iSCSI RFC 3720 .\" .Sh HISTORY -.\" .Sh AUTHORS +.Sh AUTHORS This software was written by Daniel Braniss .Sh BUGS The lun discovery method is old-fashioned. -- cgit v1.1 From 3675431b54d7120daef53592065aedf6b0edf86d Mon Sep 17 00:00:00 2001 From: imp Date: Sat, 21 Apr 2012 17:45:40 +0000 Subject: Fix partially merged patch from my external compiler tree in r234546. Define NM except when we're in strict POSIX mode. --- share/mk/sys.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'share') diff --git a/share/mk/sys.mk b/share/mk/sys.mk index c984295..4a4712c 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -141,6 +141,10 @@ YFLAGS ?= YFLAGS ?= -d .endif +.if !defined(%POSIX) +NM ?= nm +.endif + .if defined(%POSIX) # Posix 1003.2 mandated rules -- cgit v1.1 From 764e7565056beb1a3efd22e9e38e4ac9560d9a02 Mon Sep 17 00:00:00 2001 From: delphij Date: Sun, 22 Apr 2012 07:42:44 +0000 Subject: Use 10.0 instead of 10 for FreeBSD version number. The latter undefined. --- share/man/man4/carp.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4 index 05e4ece..a734824 100644 --- a/share/man/man4/carp.4 +++ b/share/man/man4/carp.4 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 26, 2012 +.Dd April 22, 2012 .Dt CARP 4 .Os .Sh NAME @@ -295,7 +295,7 @@ The device was imported into .Fx 5.4 . In -.Fx 10 +.Fx 10.0 the .Nm was significantly rewritten, and is no longer a pseudo-interface. -- cgit v1.1 From b4a2957ede854f283170c49c1edf87dab79de82c Mon Sep 17 00:00:00 2001 From: imp Date: Sun, 22 Apr 2012 17:14:11 +0000 Subject: Sort nm in order. Submitted by: bde --- share/mk/sys.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 4a4712c..533b1dd 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -123,6 +123,10 @@ LINTLIBFLAGS ?= -cghapbxu -C ${LIB} MAKE ?= make +.if !defined(%POSIX) +NM ?= nm +.endif + OBJC ?= cc OBJCFLAGS ?= ${OBJCINCLUDES} ${CFLAGS} -Wno-import @@ -141,10 +145,6 @@ YFLAGS ?= YFLAGS ?= -d .endif -.if !defined(%POSIX) -NM ?= nm -.endif - .if defined(%POSIX) # Posix 1003.2 mandated rules -- cgit v1.1 From 7299dc06c7b4480af7e1a0473b7bfda9a718a804 Mon Sep 17 00:00:00 2001 From: jlh Date: Mon, 23 Apr 2012 09:16:56 +0000 Subject: Add my informations. Approved by: kib (mentor) --- share/misc/committers-src.dot | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 62947f4..c3f00d5 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -169,6 +169,7 @@ jimharris [label="Jim Harris\njimharris@FreeBSD.org\n2011/12/09"] jinmei [label="JINMEI Tatuya\njinmei@FreeBSD.org\n2007/03/17"] jkim [label="Jung-uk Kim\njkim@FreeBSD.org\n2005/07/06"] jkoshy [label="A. Joseph Koshy\njkoshy@FreeBSD.org\n1998/05/13"] +jlh [label="Jeremie Le Hen\njlh@FreeBSD.org\n2012/04/22"] jls [label="Jordan Sissel\njls@FreeBSD.org\n2006/12/06"] joerg [label="Joerg Wunsch\njoerg@FreeBSD.org\n1993/11/14"] jon [label="Jonathan Chen\njon@FreeBSD.org\n2000/10/17"] @@ -462,6 +463,7 @@ kan -> kib kib -> ae kib -> dchagin +kib -> jlh kib -> jpaetzel kib -> lulf kib -> melifaro -- cgit v1.1 From c5ac010f586c540ff0e6bd3c097334149a771ad5 Mon Sep 17 00:00:00 2001 From: marcel Date: Mon, 23 Apr 2012 17:15:06 +0000 Subject: Update the bugs section. We don't consider tmpfs as experimental, though we do not claim to support all mount options equally well. Approved by: delphij@ MFC after: 3 days --- share/man/man5/tmpfs.5 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'share') diff --git a/share/man/man5/tmpfs.5 b/share/man/man5/tmpfs.5 index 4d66f5d..78568d2 100644 --- a/share/man/man5/tmpfs.5 +++ b/share/man/man5/tmpfs.5 @@ -49,7 +49,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 16, 2010 +.Dd April 23, 2012 .Dt TMPFS 5 .Os .Sh NAME @@ -141,9 +141,4 @@ to This manual page was written by .An Xin LI Aq delphij@FreeBSD.org . .Sh BUGS -The -.Nm -kernel implementation is currently considered as -an experimental feature. -Some file system mount -time options are not well supported. +Some file system mount time options may not be well-supported. -- cgit v1.1 From f0cabca1b818ea8a0563c3640eddf186f272a402 Mon Sep 17 00:00:00 2001 From: dim Date: Tue, 24 Apr 2012 17:00:30 +0000 Subject: After r234596, temporarily disable building clang on 32-bit PowerPC, until we are able to fix the binutils bug that makes linking clang fail with "relocation truncated to fit: R_PPC_REL24" errors. This should fix the tinderboxes for now. --- share/mk/bsd.own.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index fc214b5..55d6ba2 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -441,7 +441,8 @@ __T=${TARGET_ARCH} __T=${MACHINE_ARCH} .endif # Clang is only for x86 and powerpc right now, by default. -.if ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*} +# XXX: Temporarily disabled for 32-bit powerpc, due to a binutils bug. +.if ${__T} == "amd64" || ${__T} == "i386" || ${__T} == "powerpc64" __DEFAULT_YES_OPTIONS+=CLANG .else __DEFAULT_NO_OPTIONS+=CLANG -- cgit v1.1