Date: Wed, 12 Nov 2003 08:55:03 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42136 for review Message-ID: <200311121655.hACGt3Dw000894@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42136 Change 42136 by peter@peter_daintree on 2003/11/12 08:54:49 IFC @42135 Affected files ... .. //depot/projects/hammer/UPDATING#24 integrate .. //depot/projects/hammer/bin/df/df.c#9 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#9 integrate .. //depot/projects/hammer/release/i386/drivers.conf#14 integrate .. //depot/projects/hammer/share/man/man4/dc.4#6 integrate .. //depot/projects/hammer/share/man/man4/ddb.4#4 integrate .. //depot/projects/hammer/share/man/man4/inet.4#7 integrate .. //depot/projects/hammer/share/man/man4/intro.4#5 integrate .. //depot/projects/hammer/share/man/man4/ips.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/lnc.4#2 integrate .. //depot/projects/hammer/share/man/man4/man4.i386/svr4.4#4 integrate .. //depot/projects/hammer/share/man/man4/netgraph.4#4 integrate .. //depot/projects/hammer/share/man/man7/ports.7#7 integrate .. //depot/projects/hammer/share/man/man9/style.9#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#8 integrate .. //depot/projects/hammer/sys/conf/files#36 integrate .. //depot/projects/hammer/sys/crypto/rijndael/rijndael-api.c#1 branch .. //depot/projects/hammer/sys/crypto/rijndael/rijndael.c#2 delete .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdInterrupt.c#4 integrate .. //depot/projects/hammer/sys/dev/aha/ahareg.h#3 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#24 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.h#2 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp_targ.c#2 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#19 integrate .. //depot/projects/hammer/sys/dev/usb/ohci.c#9 integrate .. //depot/projects/hammer/sys/fs/devfs/devfs.h#5 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#6 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_ccd.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#8 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#28 integrate .. //depot/projects/hammer/sys/ia64/ia64/trap.c#20 integrate .. //depot/projects/hammer/sys/ia64/include/md_var.h#6 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#19 integrate .. //depot/projects/hammer/sys/kern/kern_exec.c#16 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#23 integrate .. //depot/projects/hammer/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#19 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#19 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#23 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#14 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#16 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#18 integrate .. //depot/projects/hammer/sys/net/bpfdesc.h#5 integrate .. //depot/projects/hammer/sys/net/if_var.h#9 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#10 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/hammer/sys/netgraph/ng_message.h#5 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#12 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#18 integrate .. //depot/projects/hammer/sys/security/mac/mac_internal.h#4 integrate .. //depot/projects/hammer/sys/security/mac/mac_label.c#1 branch .. //depot/projects/hammer/sys/security/mac/mac_net.c#4 integrate .. //depot/projects/hammer/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/hammer/sys/security/mac/mac_process.c#3 integrate .. //depot/projects/hammer/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/hammer/sys/security/mac/mac_vfs.c#3 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#18 integrate .. //depot/projects/hammer/sys/security/mac_lomac/mac_lomac.c#12 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#18 integrate .. //depot/projects/hammer/sys/security/mac_partition/mac_partition.c#5 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#12 integrate .. //depot/projects/hammer/sys/sys/mac.h#13 integrate .. //depot/projects/hammer/sys/sys/mount.h#10 integrate .. //depot/projects/hammer/sys/sys/pipe.h#5 integrate .. //depot/projects/hammer/sys/sys/proc.h#37 integrate .. //depot/projects/hammer/sys/sys/socketvar.h#9 integrate .. //depot/projects/hammer/sys/sys/syscall.h#19 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#19 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#19 integrate .. //depot/projects/hammer/sys/sys/ucred.h#4 integrate .. //depot/projects/hammer/sys/sys/vnode.h#19 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/hammer/tools/tools/tinderbox/etc/releng_4.rc#3 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/index.cgi#7 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/tb.css#3 integrate .. //depot/projects/hammer/usr.sbin/ngctl/list.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/main.c#2 integrate .. //depot/projects/hammer/usr.sbin/ngctl/msg.c#2 integrate Differences ... ==== //depot/projects/hammer/UPDATING#24 (text+ko) ==== @@ -17,6 +17,13 @@ developers choose to disable these features on build machines to maximize performance. +20031112: + Some netgraph string length constants have been changed. This + change requires the netgraph kernel modules and all netgraph + userland components to be in sync. Especially users who require + netgraph to boot need to make sure to have world and kernel in + sync before rebooting. + 20031103: The i386 APIC_IO kernel option has been replaced by 'device apic'. The ACPI module has also been temporarily @@ -1398,4 +1405,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.276 2003/11/04 19:42:55 ceri Exp $ +$FreeBSD: src/UPDATING,v 1.277 2003/11/12 09:11:18 harti Exp $ ==== //depot/projects/hammer/bin/df/df.c#9 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.51 2003/09/13 20:46:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.52 2003/11/12 08:01:39 mckusick Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -120,9 +120,9 @@ static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; static char *getmntpt(const char *); -static size_t longwidth(long); +static size_t int64width(int64_t); static char *makenetvfslist(void); -static void prthuman(const struct statfs *, size_t); +static void prthuman(const struct statfs *, int64_t); static void prthumanval(double); static void prtstat(struct statfs *, struct maxwidths *); static size_t regetmntinfo(struct statfs **, long, const char **); @@ -371,7 +371,7 @@ } static void -prthuman(const struct statfs *sfsp, size_t used) +prthuman(const struct statfs *sfsp, int64_t used) { prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize); @@ -408,10 +408,10 @@ static void prtstat(struct statfs *sfsp, struct maxwidths *mwp) { - static long blocksize; + static u_long blocksize; static int headerlen, timesthrough = 0; static const char *header; - size_t used, availblks, inodes; + int64_t used, availblks, inodes; if (++timesthrough == 1) { mwp->mntfrom = max(mwp->mntfrom, strlen("Filesystem")); @@ -445,21 +445,23 @@ if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*ld %*ld %*ld", - (u_int)mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - (u_int)mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), - (u_int)mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, - blocksize)); + (void)printf(" %*qd %*qd %*qd", + (u_int)mwp->total, + (intmax_t)fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), + (u_int)mwp->used, + (intmax_t)fsbtoblk(used, sfsp->f_bsize, blocksize), + (u_int)mwp->avail, + (intmax_t)fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } (void)printf(" %5.0f%%", availblks == 0 ? 100.0 : (double)used / (double)availblks * 100.0); if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; - (void)printf(" %*lu %*lu %4.0f%% ", - (u_int)mwp->iused, (u_long)used, - (u_int)mwp->ifree, sfsp->f_ffree, - inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); + (void)printf(" %*qd %*qd %4.0f%% ", + (u_int)mwp->iused, (intmax_t)used, + (u_int)mwp->ifree, (intmax_t)sfsp->f_ffree, + inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); } else (void)printf(" "); (void)printf(" %s\n", sfsp->f_mntonname); @@ -472,27 +474,27 @@ static void update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static long blocksize = 0; + static u_long blocksize = 0; int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); mwp->mntfrom = max(mwp->mntfrom, strlen(sfsp->f_mntfromname)); - mwp->total = max(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, + mwp->total = max(mwp->total, int64width( + fsbtoblk((int64_t)sfsp->f_blocks, sfsp->f_bsize, blocksize))); + mwp->used = max(mwp->used, int64width(fsbtoblk((int64_t)sfsp->f_blocks - + (int64_t)sfsp->f_bfree, sfsp->f_bsize, blocksize))); + mwp->avail = max(mwp->avail, int64width(fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize))); - mwp->used = max(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - - sfsp->f_bfree, sfsp->f_bsize, blocksize))); - mwp->avail = max(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, - sfsp->f_bsize, blocksize))); - mwp->iused = max(mwp->iused, longwidth(sfsp->f_files - + mwp->iused = max(mwp->iused, int64width((int64_t)sfsp->f_files - sfsp->f_ffree)); - mwp->ifree = max(mwp->ifree, longwidth(sfsp->f_ffree)); + mwp->ifree = max(mwp->ifree, int64width(sfsp->f_ffree)); } /* Return the width in characters of the specified long. */ static size_t -longwidth(long val) +int64width(int64_t val) { size_t len; ==== //depot/projects/hammer/gnu/usr.bin/binutils/gdb/freebsd-uthread.c#3 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.10 2003/01/04 17:35:54 fjoe Exp $ */ /* Low level interface for debugging FreeBSD user threads for GDB, the GNU debugger. Copyright 1996, 1999 Free Software Foundation, Inc. @@ -18,6 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/gnu/usr.bin/binutils/gdb/freebsd-uthread.c,v 1.11 2003/11/12 08:33:18 obrien Exp $ */ + /* This module implements a sort of half target that sits between the machine-independent parts of GDB and the ptrace interface (infptrace.c) to provide access to the FreeBSD user-mode thread implementation. ==== //depot/projects/hammer/lib/libc/stdio/vfwprintf.c#9 (text+ko) ==== @@ -41,7 +41,7 @@ #endif /* LIBC_SCCS and not lint */ __FBSDID("FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.58 2003/04/14 11:24:53 das Exp"); #endif -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.13 2003/11/05 08:20:45 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.14 2003/11/12 08:49:12 tjr Exp $"); /* * Actual wprintf innards. @@ -114,6 +114,7 @@ }; static int __sbprintf(FILE *, const wchar_t *, va_list); +static wint_t __xfputwc(wchar_t, FILE *); static wchar_t *__ujtoa(uintmax_t, wchar_t *, int, int, const wchar_t *, int, char, const char *); static wchar_t *__ultoa(u_long, wchar_t *, int, int, const wchar_t *, int, @@ -156,6 +157,34 @@ } /* + * Like __fputwc, but handles fake string (__SSTR) files properly. + * File must already be locked. + */ +static wint_t +__xfputwc(wchar_t wc, FILE *fp) +{ + char buf[MB_LEN_MAX]; + struct __suio uio; + struct __siov iov; + size_t i, len; + int ret; + + if ((fp->_flags & __SSTR) == 0) + return (__fputwc(wc, fp)); + + if ((len = wcrtomb(buf, wc, NULL)) == (size_t)-1) { + fp->_flags |= __SERR; + return (WEOF); + } + uio.uio_iov = &iov; + uio.uio_resid = len; + uio.uio_iovcnt = 1; + iov.iov_base = buf; + iov.iov_len = len; + return (__sfvwrite(fp, &uio) != EOF ? (wint_t)wc : WEOF); +} + +/* * Macros for converting digits to letters and vice versa */ #define to_digit(c) ((c) - '0') @@ -529,7 +558,7 @@ */ #define PRINT(ptr, len) do { \ for (n3 = 0; n3 < (len); n3++) \ - __fputwc((ptr)[n3], fp); \ + __xfputwc((ptr)[n3], fp); \ } while (0) #define PAD(howmany, with) do { \ if ((n = (howmany)) > 0) { \ ==== //depot/projects/hammer/release/i386/drivers.conf#14 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/i386/drivers.conf,v 1.30 2003/09/12 08:20:47 kuriyama Exp $ +# $FreeBSD: src/release/i386/drivers.conf,v 1.31 2003/11/12 08:08:16 kuriyama Exp $ # # drv: driver name in kernel config file @@ -94,7 +94,7 @@ wlan rc4 3 network "802.11 crypto support" wlan wlan 3 network "802.11 support" -CD9660 cd9660 3 options "ISO 9660 Filesystem" +CD9660 cd9660 2 options "ISO 9660 Filesystem" MSDOSFS msdosfs 3 options "MSDOS filsystem" NFSCLIENT nfsclient 3 options "Network Filesystem Client" ==== //depot/projects/hammer/share/man/man4/dc.4#6 (text+ko) ==== @@ -28,7 +28,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/dc.4,v 1.22 2003/11/11 13:34:53 simon Exp $ +.\" $FreeBSD: src/share/man/man4/dc.4,v 1.23 2003/11/12 14:13:36 simon Exp $ .\" .Dd November 20, 1999 .Dt DC 4 @@ -49,19 +49,20 @@ .It DEC/Intel 21143 .It -ADMtek AL981 Comet and AN985 Centaur +ADMtek AL981 Comet, AN985 Centaur, ADM9511 Centaur II and ADM9513 +Centaur II .It ASIX Electronics AX88140A and AX88141 .It Conexant LANfinity RS7112 (miniPCI) .It -Davicom DM9100, DM9102 and DM9102A +Davicom DM9009, DM9100, DM9102 and DM9102A .It Lite-On 82c168 and 82c169 PNIC .It Lite-On/Macronix 82c115 PNIC II .It -Macronix 98713, 98713A, 98715, 98715A, 98725, 98727 and 98732 +Macronix 98713, 98713A, 98715, 98715A, 98715AEC-C, 98725, 98727 and 98732 .It Xircom X3201 (cardbus only) .El @@ -105,6 +106,14 @@ .It 3Com OfficeConnect 10/100B (ADMtek AN985 Centaur-P) .It +Abocom FE2500 +.It +Accton EN1217 (98715A) +.It +Accton EN2242 MiniPCI +.It +Adico AE310TX (98715A) +.It Alfa Inc GFC2204 (ASIX AX88140A) .It Built in 10Mbps only ethernet on Compaq Presario 7900 series @@ -124,6 +133,8 @@ .It Digital DE500-BA 10/100 (21143, non-MII) .It +Hawking CB102 CardBus +.It Jaton XpressNet (Davicom DM9102) .It Kingston KNE100TX (21143, MII) @@ -148,6 +159,10 @@ .It NetGear FA310-TX Rev. D1, D2 or D3 (PNIC 82c169) .It +Netgear FA511 +.It +PlaneX FNW-3602-T (ADMtek AN985) +.It SVEC PN102-TX (98713) .El .Pp ==== //depot/projects/hammer/share/man/man4/ddb.4#4 (text+ko) ==== @@ -57,7 +57,7 @@ .\" Created. .\" [90/08/30 dbg] .\" -.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.23 2003/10/14 02:47:23 imp Exp $ +.\" $FreeBSD: src/share/man/man4/ddb.4,v 1.24 2003/11/12 02:35:20 hmp Exp $ .Dd January 16, 1996 .Dt DDB 4 .Os @@ -312,7 +312,8 @@ point at the low-level code paths may also cause strange behavior. .It Cm delete Ar addr .It Cm delete Li \&# Ns Ar number -Delete the break point. The target break point can be specified by a +Delete the break point. +The target break point can be specified by a break point number with .Li # , or by using the same @@ -520,7 +521,10 @@ .It Li maxwidth The width of the displayed line. .It Li lines -The number of lines. It is used by "more" feature. +The number of lines. +It is used by +.Dq more +feature. .It Li tabstops Tab stop width. .It Li work Ns Ar xx @@ -583,7 +587,8 @@ a binary operator which rounds up the left hand side to the next multiple of right hand side. .It Li \&* Ns Em expr -indirection. It may be followed by a +indirection. +It may be followed by a .Sq Li : and modifiers as described above. .El ==== //depot/projects/hammer/share/man/man4/inet.4#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)inet.4 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man4/inet.4,v 1.25 2003/10/14 02:59:13 imp Exp $ +.\" $FreeBSD: src/share/man/man4/inet.4,v 1.26 2003/11/12 02:35:20 hmp Exp $ .\" .Dd February 14, 1995 .Dt INET 4 @@ -297,7 +297,8 @@ .Re .Sh CAVEAT The Internet protocol support is subject to change as -the Internet protocols develop. Users should not depend +the Internet protocols develop. +Users should not depend on details of the current implementation, but rather the services exported. .Sh HISTORY ==== //depot/projects/hammer/share/man/man4/intro.4#5 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (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: src/share/man/man4/intro.4,v 1.27 2003/06/28 23:53:37 ru Exp $ +.\" $FreeBSD: src/share/man/man4/intro.4,v 1.28 2003/11/12 02:35:20 hmp Exp $ .\" .Dd January 20, 1996 .Dt INTRO 4 @@ -149,8 +149,8 @@ .Xr config 8 for a detailed description of the files involved. The individual manual pages in this section provide a sample line for the -configuration file in their synopsis portion. See also the sample -config file +configuration file in their synopsis portion. +See also the sample config file .Pa /sys/i386/conf/LINT (for the .Em i386 ==== //depot/projects/hammer/share/man/man4/ips.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ips.4,v 1.1 2003/11/11 18:47:01 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/ips.4,v 1.2 2003/11/12 02:26:47 hmp Exp $ .\" .Dd November 11, 2003 .Dt IPS 4 @@ -63,7 +63,7 @@ key combination during the initial card .Tn POST . .Pp -It is highly recommended that this be used to configure the card +It is highly recommended that this utility be used to configure the card before attempting to diagnose the below error messages. .Pp In some cases, the @@ -71,12 +71,12 @@ driver can have difficulties attaching during the system initialization period. To avoid these difficulties, set the -.Pp -.Dl hw.ips.0.disable=1 -.Pp -.Xr sysctl -.Dq MIB -to prevent the driver from attaching. +.Dl hw.ips.0.disable +tunable to +.Dq 1 . +This +.Tn MIB +prevents the driver from attaching. .Sh DIAGNOSTICS Several error codes may be shown when the card initializes the .Tn IBM @@ -92,7 +92,7 @@ .It ips%d iobuf error .Pp A buffer input/output error has occurred. -.Op ENXIO +.Bq Er ENXIO .El .Ss General adapter errors: .Bl -diag @@ -143,7 +143,7 @@ The .Nm driver will return -.Op ENOMEM +.Bq Er ENOMEM in such cases. .It ERROR: unable to get a command! can't flush cache! .It ERROR: cache flush command failed! @@ -177,5 +177,6 @@ .An David Jefferys and .An Scott Long Aq scottl@FreeBSD.org . +.Pp This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org . ==== //depot/projects/hammer/share/man/man4/man4.i386/lnc.4#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (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: src/share/man/man4/man4.i386/lnc.4,v 1.20 2001/10/13 09:08:37 yokota Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/lnc.4,v 1.21 2003/11/12 02:35:20 hmp Exp $ .\" .Dd January 19, 1997 .Dt LNC 4 i386 @@ -68,20 +68,24 @@ .Sh DIAGNOSTICS .Bl -diag .It "lnc%d: Framing error" -A framing error occurred. This means a CRC error also occurred. +A framing error occurred. +This means a CRC error also occurred. This caused the driver to drop the packet that contained the framing error. .It "lnc%d: Receive CRC error The received Ethernet frame failed the CRC checksum. This caused the driver to drop the packet that failed the checksum. .It "lnc%d: Packet dropped, no mbufs" -The driver ran out of mbuf's. This may suggest a resource problem. +The driver ran out of mbuf's. +This may suggest a resource problem. .It "lnc%d: Couldn't allocate memory for NIC" -This is a fatal error. The driver will not attach to the card under this +This is a fatal error. +The driver will not attach to the card under this circumstance. .It "lnc%d: Memory allocated above 16Mb limit" ISA and ESIA cards require bounce buffers for DMA transfers above 16mb. The Am7990 and Am79C960 only have 24 address lines and so can only access -the lower 16Mb of physical memory. The +the lower 16Mb of physical memory. +The .Nm driver assumes the memory it allocates is within the lower 16Mb range. This is not a very valid assumption but there's nothing that can be done @@ -89,7 +93,8 @@ For shared memory NICs this isn't relevant. .It "lnc%d: Device timeout -- Resetting" The device has stopped responding to the network, or there is a problem with -the network connection (cable). Make sure the network connection in use +the network connection (cable). +Make sure the network connection in use is the same one the card is configured for. .It "lnc%d: Transmit late collision -- Net error?" .It "lnc%d: Loss of carrier during transmit -- Net error?" ==== //depot/projects/hammer/share/man/man4/man4.i386/svr4.4#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/man4.i386/svr4.4,v 1.9 2003/10/28 05:22:19 tjr Exp $ +.\" $FreeBSD: src/share/man/man4/man4.i386/svr4.4,v 1.10 2003/11/12 02:35:20 hmp Exp $ .Dd October 28, 2003 .Dt SVR4 4 i386 .Os @@ -141,7 +141,9 @@ .Pa /compat/svr4/dev . Internally, the .Xr streams 4 -driver produces a socket descriptor and "tags" it with additional STREAMS +driver produces a socket descriptor and +.Dq tags +it with additional STREAMS state information before returning it to the client application. The .Nm @@ -177,9 +179,11 @@ .Pp Extensive testing has only really been carried out with Solaris 2.x binaries, with anecdotal reports of limited success coming from testers with -early-revision SCO media. In theory, the basic SVR4 ABI should be constant +early-revision SCO media. +In theory, the basic SVR4 ABI should be constant across the set of vendors who produce SVR4 operating systems, but in -practice that's probably not the case. If necessary, future work can +practice that's probably not the case. +If necessary, future work can either implement additional .Xr kld 4 modules which produce functionality which contains OS-dependent @@ -187,7 +191,9 @@ ABI implementation. Alternatively, .Xr sysctl 8 -variables could set the "personality" the environment should present to +variables could set the +.Dq personality +the environment should present to client applications. .Sh FILES .Bl -tag -width /sys/compat/svr4/syscalls.master -compact ==== //depot/projects/hammer/share/man/man4/netgraph.4#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" Authors: Julian Elischer <julian@FreeBSD.org> .\" Archie Cobbs <archie@FreeBSD.org> .\" -.\" $FreeBSD: src/share/man/man4/netgraph.4,v 1.42 2003/06/28 23:53:37 ru Exp $ +.\" $FreeBSD: src/share/man/man4/netgraph.4,v 1.43 2003/11/12 13:24:03 harti Exp $ .\" $Whistle: netgraph.4,v 1.7 1999/01/28 23:54:52 julian Exp $ .\" .Dd January 19, 1999 @@ -103,7 +103,7 @@ or .Dq \&: and is limited to -.Dv "NG_NODELEN + 1" +.Dv "NG_NODESIZ" characters (including NUL byte). .Pp Each node instance has a unique @@ -134,7 +134,7 @@ .Dq \&: and is limited to -.Dv "NG_HOOKLEN + 1" +.Dv "NG_HOOKSIZ" characters (including NUL byte). .It A hook is always connected to another hook. @@ -696,9 +696,9 @@ .Fn ( NG_NODE_NAME "node" [0]) .... .Pp -if (strncmp( +if (strcmp( .Fn NG_NODE_NAME "node" , -"fred", NG_NODELEN)) ... +"fred")) ... .Pp .It A node dependent opaque cookie @@ -815,7 +815,7 @@ .Ss Netgraph Message Structure Control messages have the following structure: .Bd -literal -#define NG_CMDSTRLEN 15 /* Max command string (16 with null) */ +#define NG_CMDSTRSIZ 32 /* Max command string (including nul) */ struct ng_mesg { struct ng_msghdr { @@ -826,7 +826,7 @@ u_long token; /* Reply should have the same token */ u_long typecookie; /* Node type understanding this message */ u_long cmd; /* Command identifier */ - u_char cmdstr[NG_CMDSTRLEN+1]; /* Cmd string (for debug) */ + u_char cmdstr[NG_CMDSTRSIZ]; /* Cmd string (for debug) */ } header; char data[0]; /* Start of cmd/resp data */ }; ==== //depot/projects/hammer/share/man/man7/ports.7#7 (text+ko) ==== @@ -23,7 +23,7 @@ .\" (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: src/share/man/man7/ports.7,v 1.39 2003/11/09 09:30:39 brueffer Exp $ +.\" $FreeBSD: src/share/man/man7/ports.7,v 1.41 2003/11/12 08:26:08 brueffer Exp $ .\" .Dd January 25, 1998 .Dt PORTS 7 @@ -78,7 +78,7 @@ .Pa http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/ports.html ) . For information about creating new ports, see .%B "The Porter's Handbook" -.Pa ( file:/usr/share/doc/porters-handbook/index.html +.Pa ( file:/usr/share/doc/en_US.ISO8859-1/books/porters-handbook/index.html or .Pa http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/porters-handbook/ ) . .Sh TARGETS @@ -163,6 +163,9 @@ Show list of files needed to be fetched in order to build the port. .It Cm fetch-recursive Fetch the distfiles of the port and all its dependencies. +.It Cm fetch-recursive-list +Show list of files that would be retrieved by +.Cm fetch-recursive . .It Cm pretty-print-run-depends-list , pretty-print-build-depends-list Print a list of all the compile and run dependencies, and dependencies of those dependencies. @@ -191,6 +194,10 @@ .It Cm deinstall Remove an installed port from the system, similar to .Xr pkg_delete 1 . +.It Cm deinstall-all +Remove all installed ports with the same +.Va PKGORIGIN +from the system. .It Cm package Make a binary package for the port. The port will be installed if it has not already been. ==== //depot/projects/hammer/share/man/man9/style.9#12 (text+ko) ==== @@ -43,7 +43,7 @@ * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). * * @(#)style 1.14 (Berkeley) 4/28/95 - * $FreeBSD: src/share/man/man9/style.9,v 1.104 2003/11/10 14:32:13 fanf Exp $ + * $FreeBSD: src/share/man/man9/style.9,v 1.105 2003/11/12 10:53:52 fanf Exp $ */ /* @@ -86,7 +86,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.104 2003/11/10 14:32:13 fanf Exp $"); +__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.105 2003/11/12 10:53:52 fanf Exp $"); .Ed .Pp Leave another blank line before the header files. @@ -328,7 +328,7 @@ incomplete structure type can be mentioned as many times as necessary. Typedefs are difficult to use in stand-alone header files: -the header that defines the typedef must either be included +the header that defines the typedef must be included before the header that uses it, or by the header that uses it (which causes namespace pollution), or there must be a back-door mechanism for obtaining the typedef. ==== //depot/projects/hammer/sys/amd64/amd64/autoconf.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.174 2003/07/25 21:15:44 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/autoconf.c,v 1.175 2003/11/12 01:49:49 peter Exp $"); /* * Setup the system to run on the current machine. @@ -136,6 +136,8 @@ { cninit_finish(); + if (bootverbose) + printf("Device configuration finished.\n"); cold = 0; } ==== //depot/projects/hammer/sys/conf/files#36 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.848 2003/11/11 22:07:29 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.850 2003/11/12 04:22:36 ume Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -207,7 +207,7 @@ crypto/des/des_ecb.c optional ipsec ipsec_esp crypto/des/des_setkey.c optional ipsec ipsec_esp crypto/rijndael/rijndael-alg-fst.c optional ipsec -crypto/rijndael/rijndael.c optional ipsec +crypto/rijndael/rijndael-api.c optional ipsec opencrypto/rmd160.c optional ipsec crypto/sha1.c optional ipsec crypto/sha2/sha2.c optional ipsec @@ -1618,6 +1618,7 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard kern/uipc_sem.c optional p1003_1b_semaphores +security/mac/mac_label.c optional mac security/mac/mac_net.c optional mac security/mac/mac_pipe.c optional mac security/mac/mac_process.c optional mac ==== //depot/projects/hammer/sys/dev/acpica/Osd/OsdInterrupt.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.13 2003/11/11 18:12:12 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdInterrupt.c,v 1.15 2003/11/12 16:24:16 jhb Exp $ */ /* @@ -135,10 +135,12 @@ acpi_OverrideInterruptLevel(UINT32 InterruptNumber) { - if (InterruptOverride != 0) - return_ACPI_STATUS(AE_ALREADY_EXISTS); - InterruptOverride = InterruptNumber; - return_ACPI_STATUS(AE_OK); + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); + + if (InterruptOverride != 0) + return_ACPI_STATUS(AE_ALREADY_EXISTS); + InterruptOverride = InterruptNumber; + return_ACPI_STATUS(AE_OK); } /* ==== //depot/projects/hammer/sys/dev/aha/ahareg.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/aha/ahareg.h,v 1.15 2003/11/09 19:51:16 imp Exp $ + * $FreeBSD: src/sys/dev/aha/ahareg.h,v 1.16 2003/11/12 05:44:44 imp Exp $ */ #ifndef _AHAREG_H_ @@ -426,4 +426,4 @@ #define AHA1542_PNPCOMPAT 0xA000D040 /* PNP00A0 */ #define ICU0091_PNP 0X91005AA4 /* ICU0091 */ -#endif /* _AHA_H_ */ +#endif /* _AHAREG_H_ */ ==== //depot/projects/hammer/sys/dev/firewire/sbp.c#24 (text+ko) ==== @@ -1,6 +1,6 @@ /* - * Copyright (c) 2003 Hidetosh Shimokawa - * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetosh Shimokawa + * Copyright (c) 2003 Hidetoshi Shimokawa + * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.68 2003/11/10 14:04:37 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp.c,v 1.71 2003/11/12 04:06:21 simokawa Exp $ * */ @@ -1142,7 +1142,7 @@ END_DEBUG if (xfer->resp != 0) { /* XXX */ - printf("%s: xfer->resp != 0\n", __FUNCTION__); + printf("%s: xfer->resp = %d\n", __FUNCTION__, xfer->resp); } sbp_xfer_free(xfer); sdev->flags &= ~ORB_POINTER_ACTIVE; @@ -1208,7 +1208,7 @@ END_DEBUG if (xfer->resp != 0) { /* XXX */ - printf("%s: xfer->resp != 0\n", __FUNCTION__); + printf("%s: xfer->resp = %d\n", __FUNCTION__, xfer->resp); } sbp_xfer_free(xfer); return; @@ -1317,6 +1317,7 @@ } if ((ocb = sbp_get_ocb(sdev)) == NULL) { splx(s); + /* XXX */ return; } ocb->flags = OCB_ACT_MGM; @@ -1572,7 +1573,7 @@ */ sbp = (struct sbp_softc *)xfer->sc; if (xfer->resp != 0){ - printf("sbp_recv: xfer->resp != 0\n"); + printf("sbp_recv: xfer->resp = %d\n", xfer->resp); goto done0; } if (xfer->recv.payload == NULL){ @@ -1903,7 +1904,7 @@ sbp->sim = cam_sim_alloc(sbp_action, sbp_poll, "sbp", sbp, device_get_unit(dev), /*untagged*/ 1, - /*tagged*/ SBP_QUEUE_LEN, + /*tagged*/ SBP_QUEUE_LEN - 1, devq); if (sbp->sim == NULL) { @@ -2325,8 +2326,11 @@ } } #endif - if ((ocb = sbp_get_ocb(sdev)) == NULL) + if ((ocb = sbp_get_ocb(sdev)) == NULL) { + ccb->ccb_h.status = CAM_REQUEUE_REQ; + xpt_done(ccb); return; + } ocb->flags = OCB_ACT_CMD; ocb->sdev = sdev; ==== //depot/projects/hammer/sys/dev/firewire/sbp.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* - * Copyright (c) 2003 Hidetosh Shimokawa - * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetosh Shimokawa + * Copyright (c) 2003 Hidetoshi Shimokawa + * Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,7 +31,7 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.1 2003/10/02 04:06:56 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp.h,v 1.2 2003/11/12 03:29:57 simokawa Exp $ * */ ==== //depot/projects/hammer/sys/dev/firewire/sbp_targ.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/firewire/sbp_targ.c,v 1.1 2003/10/18 05:41:31 simokawa Exp $ + * $FreeBSD: src/sys/dev/firewire/sbp_targ.c,v 1.2 2003/11/12 04:06:21 simokawa Exp $ */ #include <sys/param.h> @@ -471,7 +471,7 @@ orbi = (struct orb_info *)xfer->sc; if (xfer->resp != 0) { /* XXX */ - printf("%s: xfer->resp != 0\n", __FUNCTION__); + printf("%s: xfer->resp = %d\n", __FUNCTION__, xfer->resp); } free(orbi, M_SBP_TARG); fw_xfer_free(xfer); @@ -589,7 +589,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311121655.hACGt3Dw000894>