Date: Sun, 26 Apr 2015 21:28:16 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r282038 - in projects/ifnet: . bin/ed bin/expr lib/libarchive lib/libc/gen lib/libc/nls lib/libc/regex lib/libc/rpc lib/libc/sys lib/libedit lib/msun/man sbin/atm/atmconfig sbin/camcont... Message-ID: <201504262128.t3QLSGkh073850@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Sun Apr 26 21:28:15 2015 New Revision: 282038 URL: https://svnweb.freebsd.org/changeset/base/282038 Log: Merge head r257698 through r282037. Added: projects/ifnet/share/doc/usd/10.exref/ - copied from r282037, head/share/doc/usd/10.exref/ projects/ifnet/share/doc/usd/11.vitut/ - copied from r282037, head/share/doc/usd/11.vitut/ projects/ifnet/share/doc/usd/12.vi/ - copied from r282037, head/share/doc/usd/12.vi/ projects/ifnet/share/doc/usd/13.viref/ - copied from r282037, head/share/doc/usd/13.viref/ Modified: projects/ifnet/ObsoleteFiles.inc projects/ifnet/bin/ed/ed.1 projects/ifnet/bin/expr/expr.1 projects/ifnet/lib/libarchive/config_freebsd.h projects/ifnet/lib/libc/gen/getutxent.3 projects/ifnet/lib/libc/gen/nice.3 projects/ifnet/lib/libc/gen/posix_spawn.3 projects/ifnet/lib/libc/gen/posix_spawn_file_actions_addopen.3 projects/ifnet/lib/libc/gen/posix_spawn_file_actions_init.3 projects/ifnet/lib/libc/gen/posix_spawnattr_getflags.3 projects/ifnet/lib/libc/gen/posix_spawnattr_getpgroup.3 projects/ifnet/lib/libc/gen/posix_spawnattr_getschedparam.3 projects/ifnet/lib/libc/gen/posix_spawnattr_getschedpolicy.3 projects/ifnet/lib/libc/gen/posix_spawnattr_getsigdefault.3 projects/ifnet/lib/libc/gen/posix_spawnattr_getsigmask.3 projects/ifnet/lib/libc/gen/posix_spawnattr_init.3 projects/ifnet/lib/libc/nls/catopen.3 projects/ifnet/lib/libc/regex/re_format.7 projects/ifnet/lib/libc/regex/regex.3 projects/ifnet/lib/libc/rpc/rpcbind.3 projects/ifnet/lib/libc/sys/posix_openpt.2 projects/ifnet/lib/libedit/el.c projects/ifnet/lib/msun/man/j0.3 projects/ifnet/lib/msun/man/lgamma.3 projects/ifnet/lib/msun/man/nextafter.3 projects/ifnet/sbin/atm/atmconfig/atmconfig.8 projects/ifnet/sbin/camcontrol/camcontrol.8 projects/ifnet/sbin/ipfw/ipfw2.c projects/ifnet/sbin/ipfw/ipfw2.h projects/ifnet/sbin/ipfw/tables.c projects/ifnet/share/doc/usd/Makefile projects/ifnet/share/man/man4/smb.4 projects/ifnet/sys/arm/allwinner/std.a10 projects/ifnet/sys/arm/arm/cpufunc.c projects/ifnet/sys/arm/arm/locore-v4.S projects/ifnet/sys/arm/arm/locore-v6.S projects/ifnet/sys/arm/broadcom/bcm2835/std.bcm2836 projects/ifnet/sys/dev/iicbus/pcf8563.c projects/ifnet/sys/dev/sound/pcm/dsp.c projects/ifnet/sys/kern/kern_descrip.c projects/ifnet/sys/kern/kern_thr.c projects/ifnet/sys/netinet/libalias/libalias.3 Directory Properties: projects/ifnet/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/sbin/ipfw/ (props changed) projects/ifnet/share/ (props changed) projects/ifnet/share/doc/usd/10.exref/exref/ex.rm (props changed) projects/ifnet/share/doc/usd/10.exref/summary/ex.summary (props changed) projects/ifnet/share/doc/usd/11.vitut/edittut.ms (props changed) projects/ifnet/share/doc/usd/12.vi/summary/vi.summary (props changed) projects/ifnet/share/doc/usd/12.vi/vi/vi.chars (props changed) projects/ifnet/share/doc/usd/12.vi/vi/vi.in (props changed) projects/ifnet/share/doc/usd/12.vi/viapwh/vi.apwh.ms (props changed) projects/ifnet/share/doc/usd/13.viref/ex.cmd.roff (props changed) projects/ifnet/share/doc/usd/13.viref/ref.so (props changed) projects/ifnet/share/doc/usd/13.viref/set.opt.roff (props changed) projects/ifnet/share/doc/usd/13.viref/vi.cmd.roff (props changed) projects/ifnet/share/doc/usd/13.viref/vi.ref (props changed) projects/ifnet/share/man/man4/ (props changed) projects/ifnet/sys/ (props changed) Modified: projects/ifnet/ObsoleteFiles.inc ============================================================================== --- projects/ifnet/ObsoleteFiles.inc Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/ObsoleteFiles.inc Sun Apr 26 21:28:15 2015 (r282038) @@ -56,18 +56,6 @@ OLD_FILES+=usr/include/altq/altq_rmclass OLD_FILES+=usr/include/altq/altq_cbq.h OLD_FILES+=usr/include/altq/altq_rio.h OLD_DIRS+=usr/include/altq -# 20150410 -OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz -OLD_DIRS+=usr/share/doc/usd/10.exref -OLD_FILES+=usr/share/doc/usd/11.edit/paper.ascii.gz -OLD_DIRS+=usr/share/doc/usd/11.edit -OLD_FILES+=usr/share/doc/usd/12.vi/paper.ascii.gz -OLD_FILES+=usr/share/doc/usd/12.vi/summary.ascii.gz -OLD_FILES+=usr/share/doc/usd/12.vi/viapwh.ascii.gz -OLD_DIRS+=usr/share/doc/usd/12.vi -OLD_FILES+=usr/share/doc/usd/13.viref/paper.ascii.gz -OLD_DIRS+=usr/share/doc/usd/13.viref # 20150329 .if ${TARGET_ARCH} == "arm" OLD_FILES+=usr/include/bootconfig.h Modified: projects/ifnet/bin/ed/ed.1 ============================================================================== --- projects/ifnet/bin/ed/ed.1 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/bin/ed/ed.1 Sun Apr 26 21:28:15 2015 (r282038) @@ -738,7 +738,7 @@ It is an error if no substitutions are p lines. The current address is set the last line affected. .Pp -.Ar Re +.Ar \&Re and .Ar replacement may be delimited by any character other than space and newline Modified: projects/ifnet/bin/expr/expr.1 ============================================================================== --- projects/ifnet/bin/expr/expr.1 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/bin/expr/expr.1 Sun Apr 26 21:28:15 2015 (r282038) @@ -90,17 +90,17 @@ Return the evaluation of .Ar expr1 if neither expression evaluates to an empty string or zero; otherwise, returns zero. -.It Ar expr1 Li "{=, >, >=, <, <=, !=}" Ar expr2 +.It Ar expr1 Bro =, >, >=, <, <=, != Brc Ar expr2 Return the results of integer comparison if both arguments are integers; otherwise, returns the results of string comparison using the locale-specific collation sequence. The result of each comparison is 1 if the specified relation is true, or 0 if the relation is false. -.It Ar expr1 Li "{+, -}" Ar expr2 +.It Ar expr1 Bro +, - Brc Ar expr2 Return the results of addition or subtraction of integer-valued arguments. -.It Ar expr1 Li "{*, /, %}" Ar expr2 +.It Ar expr1 Bro *, /, % Brc Ar expr2 Return the results of multiplication, integer division, or remainder of integer-valued arguments. -.It Ar expr1 Li : Ar expr2 +.It Ar expr1 Li \&: Ar expr2 The .Dq Li \&: operator matches Modified: projects/ifnet/lib/libarchive/config_freebsd.h ============================================================================== --- projects/ifnet/lib/libarchive/config_freebsd.h Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libarchive/config_freebsd.h Sun Apr 26 21:28:15 2015 (r282038) @@ -25,6 +25,8 @@ * $FreeBSD$ */ +#include <osreldate.h> + /* FreeBSD 5.0 and later have ACL and extattr support. */ #if __FreeBSD__ > 4 #define HAVE_ACL_CREATE_ENTRY 1 @@ -220,6 +222,11 @@ #define HAVE_ZLIB_H 1 #define TIME_WITH_SYS_TIME 1 +#if __FreeBSD_version >= 1100056 +#define HAVE_FUTIMENS 1 +#define HAVE_UTIMENSAT 1 +#endif + /* FreeBSD 4 and earlier lack intmax_t/uintmax_t */ #if __FreeBSD__ < 5 #define intmax_t int64_t Modified: projects/ifnet/lib/libc/gen/getutxent.3 ============================================================================== --- projects/ifnet/lib/libc/gen/getutxent.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/getutxent.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -475,4 +475,4 @@ They replaced the .In utmp.h interface. .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libc/gen/nice.3 ============================================================================== --- projects/ifnet/lib/libc/gen/nice.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/nice.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -87,7 +87,7 @@ The function conforms to .St -p1003.1-2008 except for the return value. -This implementation returns 0 upon successful completion but +This implementation returns 0 upon successful completion but the standard requires returning the new nice value, which could be \-1. .Sh HISTORY Modified: projects/ifnet/lib/libc/gen/posix_spawn.3 ============================================================================== --- projects/ifnet/lib/libc/gen/posix_spawn.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/posix_spawn.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -457,4 +457,4 @@ and functions first appeared in .Fx 8.0 . .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libc/gen/posix_spawn_file_actions_addopen.3 ============================================================================== --- projects/ifnet/lib/libc/gen/posix_spawn_file_actions_addopen.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/posix_spawn_file_actions_addopen.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -200,4 +200,4 @@ and functions first appeared in .Fx 8.0 . .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libc/gen/posix_spawn_file_actions_init.3 ============================================================================== --- projects/ifnet/lib/libc/gen/posix_spawn_file_actions_init.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/posix_spawn_file_actions_init.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -101,4 +101,4 @@ and functions first appeared in .Fx 8.0 . .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libc/gen/posix_spawnattr_getflags.3 ============================================================================== --- projects/ifnet/lib/libc/gen/posix_spawnattr_getflags.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/posix_spawnattr_getflags.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -108,4 +108,4 @@ and functions first appeared in .Fx 8.0 . .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libc/gen/posix_spawnattr_getpgroup.3 ============================================================================== --- projects/ifnet/lib/libc/gen/posix_spawnattr_getpgroup.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/posix_spawnattr_getpgroup.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -93,4 +93,4 @@ and functions first appeared in .Fx 8.0 . .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libc/gen/posix_spawnattr_getschedparam.3 ============================================================================== --- projects/ifnet/lib/libc/gen/posix_spawnattr_getschedparam.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/posix_spawnattr_getschedparam.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -97,4 +97,4 @@ and functions first appeared in .Fx 8.0 . .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libc/gen/posix_spawnattr_getschedpolicy.3 ============================================================================== --- projects/ifnet/lib/libc/gen/posix_spawnattr_getschedpolicy.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/posix_spawnattr_getschedpolicy.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -95,4 +95,4 @@ and functions first appeared in .Fx 8.0 . .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libc/gen/posix_spawnattr_getsigdefault.3 ============================================================================== --- projects/ifnet/lib/libc/gen/posix_spawnattr_getsigdefault.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/posix_spawnattr_getsigdefault.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -95,4 +95,4 @@ and functions first appeared in .Fx 8.0 . .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libc/gen/posix_spawnattr_getsigmask.3 ============================================================================== --- projects/ifnet/lib/libc/gen/posix_spawnattr_getsigmask.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/posix_spawnattr_getsigmask.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -95,4 +95,4 @@ and functions first appeared in .Fx 8.0 . .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libc/gen/posix_spawnattr_init.3 ============================================================================== --- projects/ifnet/lib/libc/gen/posix_spawnattr_init.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/gen/posix_spawnattr_init.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -120,4 +120,4 @@ and functions first appeared in .Fx 8.0 . .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libc/nls/catopen.3 ============================================================================== --- projects/ifnet/lib/libc/nls/catopen.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/nls/catopen.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -94,7 +94,7 @@ An empty string is substituted for undef Path names templates defined in .Ev NLSPATH are separated by colons -.No ( Sq \&: ) . +.Pq Sq \&: . A leading or two adjacent colons is equivalent to specifying %N. .Pp Modified: projects/ifnet/lib/libc/regex/re_format.7 ============================================================================== --- projects/ifnet/lib/libc/regex/re_format.7 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/regex/re_format.7 Sun Apr 26 21:28:15 2015 (r282038) @@ -392,10 +392,12 @@ and .Ql ?\& are ordinary characters, and their functionality can be expressed using bounds -.No ( Ql {1,} +.Po +.Ql {1,} or .Ql {0,1} -respectively). +respectively +.Pc . Also note that .Ql x+ in modern REs is equivalent to Modified: projects/ifnet/lib/libc/regex/regex.3 ============================================================================== --- projects/ifnet/lib/libc/regex/regex.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/regex/regex.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -420,10 +420,12 @@ it should have been the result from the using that .Ft regex_t . The -.Fn ( regerror +.Po +.Fn regerror may be able to supply a more detailed message using information from the -.Ft regex_t . ) +.Ft regex_t . +.Pc The .Fn regerror function Modified: projects/ifnet/lib/libc/rpc/rpcbind.3 ============================================================================== --- projects/ifnet/lib/libc/rpc/rpcbind.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/rpc/rpcbind.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -25,7 +25,7 @@ .Ft bool_t .Fn rpcb_gettime "const char *host" "time_t * timep" .Ft "enum clnt_stat" -.Fn rpcb_rmtcall "const struct netconfig *netconf" "const char *host" "const rpcprog_t prognum, const rpcvers_t versnum" "const rpcproc_t procnum, const xdrproc_t inproc" "const caddr_t in" "const xdrproc_t outproc" "const caddr_t out" "const struct timeval tout, const struct netbuf *svcaddr" +.Fn rpcb_rmtcall "const struct netconfig *netconf" "const char *host" "const rpcprog_t prognum" "const rpcvers_t versnum" "const rpcproc_t procnum" "const xdrproc_t inproc" "const caddr_t in" "const xdrproc_t outproc" "const caddr_t out" "const struct timeval tout" "const struct netbuf *svcaddr" .Ft bool_t .Fn rpcb_set "const rpcprog_t prognum" "const rpcvers_t versnum" "const struct netconfig *netconf" "const struct netbuf *svcaddr" .Ft bool_t Modified: projects/ifnet/lib/libc/sys/posix_openpt.2 ============================================================================== --- projects/ifnet/lib/libc/sys/posix_openpt.2 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libc/sys/posix_openpt.2 Sun Apr 26 21:28:15 2015 (r282038) @@ -137,4 +137,4 @@ is included for compatibility; in opening a terminal does not cause it to become a process's controlling terminal. .Sh AUTHORS -.An Ed Schouten Aq Mt ed@FreeBSD.org +.An \&Ed Schouten Aq Mt ed@FreeBSD.org Modified: projects/ifnet/lib/libedit/el.c ============================================================================== --- projects/ifnet/lib/libedit/el.c Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/libedit/el.c Sun Apr 26 21:28:15 2015 (r282038) @@ -96,7 +96,7 @@ el_init_fd(const char *prog, FILE *fin, */ el->el_flags = 0; #ifdef WIDECHAR - if (setlocale(LC_CTYPE, "") != NULL) { + if (setlocale(LC_CTYPE, NULL) != NULL) { if (strcmp(nl_langinfo(CODESET), "UTF-8") == 0) el->el_flags |= CHARSET_IS_UTF8; } Modified: projects/ifnet/lib/msun/man/j0.3 ============================================================================== --- projects/ifnet/lib/msun/man/j0.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/msun/man/j0.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -98,7 +98,7 @@ The functions .Fn y1 , and .Fn y1f -compute the linearly independent Bessel function of the second kind +compute the linearly independent Bessel function of the second kind of orders 0 and 1 for the positive .Em real value @@ -135,12 +135,12 @@ is \*(Pm0, these routines will generate a divide-by-zero exception and return -\*(If. If .Fa x -is a sufficiently small positive number, then +is a sufficiently small positive number, then .Fn y1 , .Fn y1f , .Fn yn , and -.Fn ynf +.Fn ynf will generate an overflow exception and return -\*(If. .Sh SEE ALSO .Xr math 3 Modified: projects/ifnet/lib/msun/man/lgamma.3 ============================================================================== --- projects/ifnet/lib/msun/man/lgamma.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/msun/man/lgamma.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -124,7 +124,6 @@ are deprecated aliases for and .Fn lgammaf_r , respectively. - .Sh IDIOSYNCRASIES Do not use the expression .Dq Li signgam\(**exp(lgamma(x)) Modified: projects/ifnet/lib/msun/man/nextafter.3 ============================================================================== --- projects/ifnet/lib/msun/man/nextafter.3 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/lib/msun/man/nextafter.3 Sun Apr 26 21:28:15 2015 (r282038) @@ -78,11 +78,11 @@ routines conform to They implement the Nextafter function recommended by .St -ieee754 , with the extension that -.Fn nextafter +0.0, -0.0 +.Fn nextafter "+0.0" "-0.0" returns .Li -0.0 , and -.Fn nextafter -0.0, +0.0 +.Fn nextafter "-0.0" "+0.0" returns .Li +0.0 . .Sh HISTORY Modified: projects/ifnet/sbin/atm/atmconfig/atmconfig.8 ============================================================================== --- projects/ifnet/sbin/atm/atmconfig/atmconfig.8 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/sbin/atm/atmconfig/atmconfig.8 Sun Apr 26 21:28:15 2015 (r282038) @@ -90,7 +90,7 @@ To get a list of options and arguments f .Pp To get a list of common options use: .D1 Nm Ic help Cm options -.Ss The Ic diag Ss Command +.Ss The Ic diag Command The .Ic diag command allows the inspection of the ATM interfaces on the local host @@ -201,7 +201,7 @@ Print traffic parameters: PCR, SCR, MBS, .It Nm Ic diag Cm stats Ar device Print driver specific statistics. .El -.Ss The Ic natm Ss Command +.Ss The Ic natm Command The .Ic natm command is used to change Modified: projects/ifnet/sbin/camcontrol/camcontrol.8 ============================================================================== --- projects/ifnet/sbin/camcontrol/camcontrol.8 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/sbin/camcontrol/camcontrol.8 Sun Apr 26 21:28:15 2015 (r282038) @@ -529,7 +529,7 @@ on the system. .It Ic defects Send the .Tn SCSI -READ DEFECT DATA (10) command (0x37) or the +READ DEFECT DATA (10) command (0x37) or the .Tn SCSI READ DEFECT DATA (12) command (0xB7) to the given device, and print out any combination of: the total number of defects, the primary @@ -563,12 +563,12 @@ drives. .It longblock Print out the list as logical blocks. This option uses a 64-bit block size. -.It bfi +.It bfi Print out the list in bytes from index format. .It extbfi Print out the list in extended bytes from index format. The extended format allows for ranges of blocks to be printed. -.It phys +.It phys Print out the list in physical sector format. Most drives support this format. .It extphys Modified: projects/ifnet/sbin/ipfw/ipfw2.c ============================================================================== --- projects/ifnet/sbin/ipfw/ipfw2.c Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/sbin/ipfw/ipfw2.c Sun Apr 26 21:28:15 2015 (r282038) @@ -375,6 +375,13 @@ static int ipfw_show_config(struct cmdli ipfw_cfg_lheader *cfg, size_t sz, int ac, char **av); static void ipfw_list_tifaces(void); +struct tidx; +static uint16_t pack_object(struct tidx *tstate, char *name, int otype); +static uint16_t pack_table(struct tidx *tstate, char *name); + +static char *table_search_ctlv(ipfw_obj_ctlv *ctlv, uint16_t idx); +static void object_sort_ctlv(ipfw_obj_ctlv *ctlv); + /* * Simple string buffer API. * Used to simplify buffer passing between function and for @@ -2558,6 +2565,7 @@ ipfw_show_config(struct cmdline_opts *co if (cfg->flags & IPFW_CFG_GET_STATIC) { /* We've requested static rules */ if (ctlv->head.type == IPFW_TLV_TBLNAME_LIST) { + object_sort_ctlv(ctlv); fo->tstate = ctlv; readsz += ctlv->head.length; ctlv = (ipfw_obj_ctlv *)((caddr_t)ctlv + @@ -2724,19 +2732,18 @@ struct tidx { }; static uint16_t -pack_table(struct tidx *tstate, char *name) +pack_object(struct tidx *tstate, char *name, int otype) { int i; ipfw_obj_ntlv *ntlv; - if (table_check_name(name) != 0) - return (0); - for (i = 0; i < tstate->count; i++) { if (strcmp(tstate->idx[i].name, name) != 0) continue; if (tstate->idx[i].set != tstate->set) continue; + if (tstate->idx[i].head.type != otype) + continue; return (tstate->idx[i].idx); } @@ -2752,7 +2759,7 @@ pack_table(struct tidx *tstate, char *na ntlv = &tstate->idx[i]; memset(ntlv, 0, sizeof(ipfw_obj_ntlv)); strlcpy(ntlv->name, name, sizeof(ntlv->name)); - ntlv->head.type = IPFW_TLV_TBL_NAME; + ntlv->head.type = otype; ntlv->head.length = sizeof(ipfw_obj_ntlv); ntlv->set = tstate->set; ntlv->idx = ++tstate->counter; @@ -2761,6 +2768,16 @@ pack_table(struct tidx *tstate, char *na return (ntlv->idx); } +static uint16_t +pack_table(struct tidx *tstate, char *name) +{ + + if (table_check_name(name) != 0) + return (0); + + return (pack_object(tstate, name, IPFW_TLV_TBL_NAME)); +} + static void fill_table(ipfw_insn *cmd, char *av, uint8_t opcode, struct tidx *tstate) { @@ -3611,7 +3628,6 @@ compile_rule(char *av[], uint32_t *rbuf, break; } else goto chkarg; - case TOK_QUEUE: action->opcode = O_QUEUE; goto chkarg; @@ -4656,6 +4672,101 @@ done: *rbufsize = (char *)dst - (char *)rule; } +static int +compare_ntlv(const void *_a, const void *_b) +{ + ipfw_obj_ntlv *a, *b; + + a = (ipfw_obj_ntlv *)_a; + b = (ipfw_obj_ntlv *)_b; + + if (a->set < b->set) + return (-1); + else if (a->set > b->set) + return (1); + + if (a->idx < b->idx) + return (-1); + else if (a->idx > b->idx) + return (1); + + if (a->head.type < b->head.type) + return (-1); + else if (a->head.type > b->head.type) + return (1); + + return (0); +} + +/* + * Provide kernel with sorted list of referenced objects + */ +static void +object_sort_ctlv(ipfw_obj_ctlv *ctlv) +{ + + qsort(ctlv + 1, ctlv->count, ctlv->objsize, compare_ntlv); +} + +struct object_kt { + uint16_t uidx; + uint16_t type; +}; +static int +compare_object_kntlv(const void *k, const void *v) +{ + ipfw_obj_ntlv *ntlv; + struct object_kt key; + + key = *((struct object_kt *)k); + ntlv = (ipfw_obj_ntlv *)v; + + if (key.uidx < ntlv->idx) + return (-1); + else if (key.uidx > ntlv->idx) + return (1); + + if (key.type < ntlv->head.type) + return (-1); + else if (key.type > ntlv->head.type) + return (1); + + return (0); +} + +/* + * Finds object name in @ctlv by @idx and @type. + * Uses the following facts: + * 1) All TLVs are the same size + * 2) Kernel implementation provides already sorted list. + * + * Returns table name or NULL. + */ +static char * +object_search_ctlv(ipfw_obj_ctlv *ctlv, uint16_t idx, uint16_t type) +{ + ipfw_obj_ntlv *ntlv; + struct object_kt key; + + key.uidx = idx; + key.type = type; + + ntlv = bsearch(&key, (ctlv + 1), ctlv->count, ctlv->objsize, + compare_object_kntlv); + + if (ntlv != 0) + return (ntlv->name); + + return (NULL); +} + +static char * +table_search_ctlv(ipfw_obj_ctlv *ctlv, uint16_t idx) +{ + + return (object_search_ctlv(ctlv, idx, IPFW_TLV_TBL_NAME)); +} + /* * Adds one or more rules to ipfw chain. * Data layout: @@ -4724,7 +4835,7 @@ ipfw_add(char *av[]) ctlv->count = ts.count; ctlv->objsize = sizeof(ipfw_obj_ntlv); memcpy(ctlv + 1, ts.idx, tlen); - table_sort_ctlv(ctlv); + object_sort_ctlv(ctlv); tstate = ctlv; /* Rule next */ ctlv = (ipfw_obj_ctlv *)((caddr_t)ctlv + ctlv->head.length); Modified: projects/ifnet/sbin/ipfw/ipfw2.h ============================================================================== --- projects/ifnet/sbin/ipfw/ipfw2.h Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/sbin/ipfw/ipfw2.h Sun Apr 26 21:28:15 2015 (r282038) @@ -344,8 +344,6 @@ int fill_ext6hdr(struct _ipfw_insn *cmd, /* tables.c */ struct _ipfw_obj_ctlv; -char *table_search_ctlv(struct _ipfw_obj_ctlv *ctlv, uint16_t idx); -void table_sort_ctlv(struct _ipfw_obj_ctlv *ctlv); int table_check_name(char *tablename); void ipfw_list_ta(int ac, char *av[]); void ipfw_list_values(int ac, char *av[]); Modified: projects/ifnet/sbin/ipfw/tables.c ============================================================================== --- projects/ifnet/sbin/ipfw/tables.c Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/sbin/ipfw/tables.c Sun Apr 26 21:28:15 2015 (r282038) @@ -1937,73 +1937,6 @@ ipfw_list_values(int ac, char *av[]) } int -compare_ntlv(const void *_a, const void *_b) -{ - ipfw_obj_ntlv *a, *b; - - a = (ipfw_obj_ntlv *)_a; - b = (ipfw_obj_ntlv *)_b; - - if (a->set < b->set) - return (-1); - else if (a->set > b->set) - return (1); - - if (a->idx < b->idx) - return (-1); - else if (a->idx > b->idx) - return (1); - - return (0); -} - -int -compare_kntlv(const void *k, const void *v) -{ - ipfw_obj_ntlv *ntlv; - uint16_t key; - - key = *((uint16_t *)k); - ntlv = (ipfw_obj_ntlv *)v; - - if (key < ntlv->idx) - return (-1); - else if (key > ntlv->idx) - return (1); - - return (0); -} - -/* - * Finds table name in @ctlv by @idx. - * Uses the following facts: - * 1) All TLVs are the same size - * 2) Kernel implementation provides already sorted list. - * - * Returns table name or NULL. - */ -char * -table_search_ctlv(ipfw_obj_ctlv *ctlv, uint16_t idx) -{ - ipfw_obj_ntlv *ntlv; - - ntlv = bsearch(&idx, (ctlv + 1), ctlv->count, ctlv->objsize, - compare_kntlv); - - if (ntlv != 0) - return (ntlv->name); - - return (NULL); -} - -void -table_sort_ctlv(ipfw_obj_ctlv *ctlv) -{ - - qsort(ctlv + 1, ctlv->count, ctlv->objsize, compare_ntlv); -} - -int table_check_name(char *tablename) { int c, i, l; Modified: projects/ifnet/share/doc/usd/Makefile ============================================================================== --- projects/ifnet/share/doc/usd/Makefile Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/share/doc/usd/Makefile Sun Apr 26 21:28:15 2015 (r282038) @@ -10,6 +10,10 @@ SUBDIR= title \ 05.dc \ 06.bc \ 07.mail \ + 10.exref \ + 11.vitut \ + 12.vi \ + 13.viref \ 18.msdiffs \ 19.memacros \ 20.meref \ Modified: projects/ifnet/share/man/man4/smb.4 ============================================================================== --- projects/ifnet/share/man/man4/smb.4 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/share/man/man4/smb.4 Sun Apr 26 21:28:15 2015 (r282038) @@ -37,10 +37,10 @@ .Sh DESCRIPTION The .Em smb -character device driver provides generic i/o to any +character device driver provides generic I/O to any .Xr smbus 4 instance. -In order to control SMB devices, use +To control SMB devices, use .Pa /dev/smb? with the ioctls described below. Any of these ioctl commands takes a pointer to @@ -74,86 +74,74 @@ struct smbcmd { The .Fa slave field is always used, and provides the address of the -SMBus slave device to talk to. +SMBus slave device. The slave address is specified in the seven most significant bits -.Pq i.e. Dq "left-justified" . +.Pq i.e., Dq "left-justified" . The least significant bit of the slave address must be zero. .Pp .Bl -column ".Dv SMB_QUICK_WRITE" -compact .It Em Ioctl Ta Em Description .Pp .It Dv SMB_QUICK_WRITE Ta -The .Em QuickWrite -command just issues the device address with write intent -to the bus, without transferring any data. +does not transfer any data. +It just issues the device address with write intent to the bus. .It Dv SMB_QUICK_READ Ta -The .Em QuickRead -command just issues the device address with read intent -to the bus, without transferring any data. +does not transfer any data. +It just issues the device address with read intent to the bus. .It Dv SMB_SENDB Ta -The .Em SendByte -command sends the byte provided in the +sends the byte provided in .Fa cmd -field to the device. +to the device. .It Dv SMB_RECVB Ta -The .Em ReceiveByte -command reads a single byte from the device which will -be returned in the -.Fa cmd -field. +reads a single byte from the device which is returned in +.Fa cmd . .It Dv SMB_WRITEB Ta -The .Em WriteByte -command first sends the byte from the +first sends the byte from .Fa cmd -field to the device, followed by the byte given in +to the device, followed by the byte given in .Fa wdata.byte . .It Dv SMB_WRITEW Ta -The .Em WriteWord -command first sends the byte from the +first sends the byte from .Fa cmd -field to the device, followed by the word given in +to the device, followed by the word given in .Fa wdata.word . Note that the SMBus byte-order is little-endian by definition. .It Dv SMB_READB Ta -The .Em ReadByte -command first sends the byte from the +first sends the byte from .Fa cmd -field to the device, and then reads one byte of data from +to the device, then reads one byte of data from the device. -The returned data will be stored in +Returned data is stored in .Fa rdata.byte . .It Dv SMB_READW Ta -The .Em ReadWord -command first sends the byte from the +first sends the byte from .Fa cmd -field to the device, and then reads one word of data from +to the device, then reads one word of data from the device. -The returned data will be stored in +Returned data is stored in .Fa rdata.word . .It Dv SMB_PCALL Ta -The .Em ProcedureCall -command first sends the byte from the +first sends the byte from .Fa cmd -field to the device, followed by the word provided in +to the device, followed by the word provided in .Fa wdata.word . -It then reads one word of data from the device, and returns it +It then reads one word of data from the device and returns it in .Fa rdata.word . .It Dv SMB_BWRITE Ta -The .Em BlockWrite -command first sends the byte from the +first sends the byte from .Fa cmd -field to the device, followed by +to the device, followed by .Fa wcount bytes of data that are taken from the buffer pointed to by .Fa wbuf . @@ -163,34 +151,32 @@ but since .Xr smbus 4 is also used to access I2C devices, the limit has been increased to 1024. -This value is available in the constant +This value can be read from the constant .Dv SMB_MAXBLOCKSIZE . .It Dv SMB_BREAD Ta -The .Em BlockRead -command first sends the byte from the +first sends the byte from .Fa cmd -field to the device, and then reads +to the device, then reads .Fa rcount bytes of data that from the device. -These data will be returned in the buffer pointed to by +This data is returned in the buffer pointed to by .Fa rbuf . .It Dv SMB_TRANS Ta -The .Em Trans -command sends an SMB roll-up transaction with flags that also allow it to -be used for (mostly) I2C pass-through and with with 10-bit addresses. -This function can be used to roll up all of the above functions. -It first sends the byte from the +sends an SMB roll-up transaction with flags that also allow it to +be used for (mostly) I2C pass-through and with 10-bit addresses. +This function can be utilized to roll up all of the above functions. +It first sends the byte from .Fa cmd -field to the device, followed by +to the device, followed by .Fa wcount bytes of data that are taken from the buffer pointed to by .Fa wbuf , then reads .Fa rcount bytes of data that from the device. -These data will be returned in the buffer pointed to by +This data is returned in the buffer pointed to by .Fa rbuf . .Pp The following flags are allowed in @@ -239,5 +225,4 @@ This manual page was written by .An Nicolas Souchu and extended by -.An Michael Gmelin Aq freebsd@grem.de -. +.An Michael Gmelin Aq freebsd@grem.de . Modified: projects/ifnet/sys/arm/allwinner/std.a10 ============================================================================== --- projects/ifnet/sys/arm/allwinner/std.a10 Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/sys/arm/allwinner/std.a10 Sun Apr 26 21:28:15 2015 (r282038) @@ -17,5 +17,7 @@ options KERNPHYSADDR=0x40200000 makeoptions KERNVIRTADDR=0xc0200000 options KERNVIRTADDR=0xc0200000 +options ARM_L2_PIPT + files "../allwinner/files.allwinner" files "../allwinner/files.a10" Modified: projects/ifnet/sys/arm/arm/cpufunc.c ============================================================================== --- projects/ifnet/sys/arm/arm/cpufunc.c Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/sys/arm/arm/cpufunc.c Sun Apr 26 21:28:15 2015 (r282038) @@ -1186,7 +1186,8 @@ arm11x6_setup(void) CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_LABT_ENABLE | CPU_CONTROL_SYST_ENABLE | - CPU_CONTROL_IC_ENABLE; + CPU_CONTROL_IC_ENABLE | + CPU_CONTROL_UNAL_ENABLE; /* * "write as existing" bits Modified: projects/ifnet/sys/arm/arm/locore-v4.S ============================================================================== --- projects/ifnet/sys/arm/arm/locore-v4.S Sun Apr 26 21:16:38 2015 (r282037) +++ projects/ifnet/sys/arm/arm/locore-v4.S Sun Apr 26 21:28:15 2015 (r282038) @@ -116,7 +116,7 @@ ASENTRY_NP(_start) * If we're running with MMU disabled, test against the * physical address instead. */ - mrc p15, 0, r2, c1, c0, 0 + mrc p15, 0, r2, c1, c0, 0 ands r2, r2, #CPU_CONTROL_MMU_ENABLE ldreq r6, =PHYSADDR ldrne r6, =LOADERRAMADDR @@ -125,7 +125,7 @@ ASENTRY_NP(_start) cmp r7, pc bhi from_ram b do_copy - + flash_lower: cmp r6, pc bls from_ram @@ -148,12 +148,12 @@ from_ram: disable_mmu: /* Disable MMU for a while */ - mrc p15, 0, r2, c1, c0, 0 + mrc p15, 0, r2, c1, c0, 0 bic r2, r2, #(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_DC_ENABLE |\ CPU_CONTROL_WBUF_ENABLE) bic r2, r2, #(CPU_CONTROL_IC_ENABLE) bic r2, r2, #(CPU_CONTROL_BPRD_ENABLE) - mcr p15, 0, r2, c1, c0, 0 + mcr p15, 0, r2, c1, c0, 0 nop nop @@ -169,36 +169,16 @@ Lunmapped: adr r0, Lpagetable bl translate_va_to_pa -#ifndef _ARM_ARCH_6 /* * Some of the older ports (the various XScale, mostly) assume * that the memory before the kernel is mapped, and use it for - * the various stacks, page tables, etc. For those CPUs, map the - * 64 first MB of RAM, as it used to be. + * the various stacks, page tables, etc. For those CPUs, map the + * 64 first MB of RAM, as it used to be. */ /* * Map PA == VA - */ - ldr r5, =PHYSADDR - mov r1, r5 - mov r2, r5 - /* Map 64MiB, preserved over calls to build_pagetables */ - mov r3, #64 - bl build_pagetables - - /* Create the kernel map to jump to */ - mov r1, r5 - ldr r2, =(KERNBASE) - bl build_pagetables - ldr r5, =(KERNPHYSADDR) -#else - /* - * Map PA == VA - */ - /* Find the start kernels load address */ - adr r5, _start - ldr r2, =(L1_S_OFFSET) - bic r5, r2 + */ + ldr r5, =PHYSADDR mov r1, r5 mov r2, r5 /* Map 64MiB, preserved over calls to build_pagetables */ @@ -207,10 +187,10 @@ Lunmapped: /* Create the kernel map to jump to */ mov r1, r5 - ldr r2, =(KERNVIRTADDR) + ldr r2, =(KERNBASE) bl build_pagetables -#endif - + ldr r5, =(KERNPHYSADDR) + #if defined(SOCDEV_PA) && defined(SOCDEV_VA) /* Create the custom map */ ldr r1, =SOCDEV_PA @@ -221,26 +201,16 @@ Lunmapped: mcr p15, 0, r0, c2, c0, 0 /* Set TTB */ mcr p15, 0, r0, c8, c7, 0 /* Flush TLB */ -#if defined(CPU_ARM1136) || defined(CPU_ARM1176) || defined(CPU_CORTEXA) || defined(CPU_MV_PJ4B) || defined(CPU_KRAIT) - mov r0, #0 - mcr p15, 0, r0, c13, c0, 1 /* Set ASID to 0 */ -#endif - /* Set the Domain Access register. Very important! */ - mov r0, #((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT) + mov r0, #((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT) mcr p15, 0, r0, c3, c0, 0 - /* + /* * Enable MMU. * On armv6 enable extended page tables, and set alignment checking * to modulo-4 (CPU_CONTROL_UNAL_ENABLE) for the ldrd/strd * instructions emitted by clang. */ mrc p15, 0, r0, c1, c0, 0 -#ifdef _ARM_ARCH_6 - orr r0, r0, #(CPU_CONTROL_V6_EXTPAGE | CPU_CONTROL_UNAL_ENABLE) - orr r0, r0, #(CPU_CONTROL_AFLT_ENABLE) - orr r0, r0, #(CPU_CONTROL_AF_ENABLE) -#endif orr r0, r0, #(CPU_CONTROL_MMU_ENABLE) mcr p15, 0, r0, c1, c0, 0 nop @@ -280,7 +250,7 @@ virt_done: /* init arm will return the new stack pointer. */ mov sp, r0 - bl _C_LABEL(mi_startup) /* call mi_startup()! */ + bl _C_LABEL(mi_startup) /* call mi_startup()! */ adr r0, .Lmainreturned b _C_LABEL(panic) @@ -389,11 +359,11 @@ pagetable: .word _C_LABEL(cpufuncs) ENTRY_NP(cpu_halt) - mrs r2, cpsr + mrs r2, cpsr bic r2, r2, #(PSR_MODE) - orr r2, r2, #(PSR_SVC32_MODE) + orr r2, r2, #(PSR_SVC32_MODE) orr r2, r2, #(PSR_I | PSR_F) - msr cpsr_fsxc, r2 + msr cpsr_fsxc, r2 ldr r4, .Lcpu_reset_address ldr r4, [r4] @@ -419,9 +389,9 @@ ENTRY_NP(cpu_halt) * Hurl ourselves into the ROM */ mov r0, #(CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE) - mcr p15, 0, r0, c1, c0, 0 - mcrne p15, 0, r2, c8, c7, 0 /* nail I+D TLB on ARMv4 and greater */ - mov pc, r4 + mcr p15, 0, r0, c1, c0, 0 + mcrne p15, 0, r2, c8, c7, 0 /* nail I+D TLB on ARMv4 and greater */ + mov pc, r4 /* * _cpu_reset_address contains the address to branch to, to complete *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504262128.t3QLSGkh073850>