Date: Fri, 27 Sep 2002 17:04:35 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 18246 for review Message-ID: <200209280004.g8S04Zuj092111@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18246 Change 18246 by peter@peter_daintree on 2002/09/27 17:03:55 IFC @18243 Affected files ... .. //depot/projects/hammer/bin/ps/keyword.c#3 integrate .. //depot/projects/hammer/etc/defaults/pccard.conf#3 integrate .. //depot/projects/hammer/etc/rc.d/moused#3 integrate .. //depot/projects/hammer/lib/libc/stdio/asprintf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/vasprintf.c#3 integrate .. //depot/projects/hammer/lib/libc/stdio/vswprintf.c#2 integrate .. //depot/projects/hammer/lib/libc/string/wcscat.c#4 integrate .. //depot/projects/hammer/lib/libc/string/wcscpy.c#4 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.c#3 integrate .. //depot/projects/hammer/lib/libugidfw/ugidfw.h#2 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.8#3 integrate .. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/hammer/sbin/init/init.c#2 integrate .. //depot/projects/hammer/sbin/mdconfig/mdconfig.8#3 integrate .. //depot/projects/hammer/share/man/man4/Makefile#3 integrate .. //depot/projects/hammer/share/man/man4/pst.4#1 branch .. //depot/projects/hammer/share/man/man7/hier.7#2 integrate .. //depot/projects/hammer/share/man/man7/release.7#2 integrate .. //depot/projects/hammer/share/man/man9/VOP_IOCTL.9#2 integrate .. //depot/projects/hammer/sys/coda/coda_venus.c#2 integrate .. //depot/projects/hammer/sys/conf/NOTES#6 integrate .. //depot/projects/hammer/sys/conf/majors#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.reg#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.seq#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_inline.h#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_scan.l#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#3 integrate .. //depot/projects/hammer/sys/dev/eisa/eisaconf.c#2 integrate .. //depot/projects/hammer/sys/dev/mca/mca_bus.c#2 integrate .. //depot/projects/hammer/sys/dev/pst/pst-raid.c#4 integrate .. //depot/projects/hammer/sys/dev/puc/puc.c#3 integrate .. //depot/projects/hammer/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/hammer/sys/dev/puc/pucvar.h#3 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#4 integrate .. //depot/projects/hammer/sys/dev/usb/usb.h#3 integrate .. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#4 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#4 integrate .. //depot/projects/hammer/sys/fs/nwfs/nwfs_ioctl.c#2 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#4 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/hammer/sys/geom/geom.h#4 integrate .. //depot/projects/hammer/sys/geom/geom_aes.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_enc.c#3 integrate .. //depot/projects/hammer/sys/geom/geom_event.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_gpt.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_int.h#2 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#3 integrate .. //depot/projects/hammer/sys/geom/geom_kern.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_mbr.c#3 integrate .. //depot/projects/hammer/sys/geom/geom_pc98.c#3 integrate .. //depot/projects/hammer/sys/geom/geom_slice.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_slice.h#2 integrate .. //depot/projects/hammer/sys/geom/geom_sunlabel.c#3 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#4 integrate .. //depot/projects/hammer/sys/isa/isa_common.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#6 integrate .. //depot/projects/hammer/sys/kern/link_elf.c#4 integrate .. //depot/projects/hammer/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/hammer/sys/net/if.h#3 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/hammer/sys/net/if_gif.c#4 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#5 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/hammer/sys/sys/alq.h#2 integrate .. //depot/projects/hammer/sys/sys/conf.h#2 integrate .. //depot/projects/hammer/sys/sys/linker.h#3 integrate .. //depot/projects/hammer/sys/sys/proc.h#6 integrate .. //depot/projects/hammer/sys/sys/types.h#5 integrate .. //depot/projects/hammer/sys/sys/vnode.h#6 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/hammer/sys/ufs/ufs/inode.h#3 integrate .. //depot/projects/hammer/tools/regression/geom/GLib/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/geom/Test/T013/ref.conf#3 integrate .. //depot/projects/hammer/tools/regression/geom/Test/T013/testprg.c#3 integrate .. //depot/projects/hammer/tools/regression/geom/Test/T014/ref.conf#3 integrate .. //depot/projects/hammer/tools/regression/geom/geom_sim.h#3 integrate .. //depot/projects/hammer/usr.bin/fstat/fstat.c#4 integrate .. //depot/projects/hammer/usr.bin/make/make.1#3 integrate .. //depot/projects/hammer/usr.bin/make/parse.c#4 integrate .. //depot/projects/hammer/usr.bin/make/targ.c#3 integrate Differences ... ==== //depot/projects/hammer/bin/ps/keyword.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.54 2002/09/17 17:13:52 jmallett Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.56 2002/09/27 01:44:30 jmallett Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -264,8 +264,11 @@ } } free(tempstr1); - if (!vhead) - errx(1, "no valid keywords"); + if (!vhead) { + warnx("no valid keywords; valid keywords:"); + showkey(); + exit(1); + } } static VAR * ==== //depot/projects/hammer/etc/defaults/pccard.conf#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # Default PCCARD configuration file # -# $FreeBSD: src/etc/defaults/pccard.conf,v 1.242 2002/09/06 17:45:36 iwasaki Exp $ +# $FreeBSD: src/etc/defaults/pccard.conf,v 1.243 2002/09/27 06:14:29 imp Exp $ # # Please send new entries for this file to imp@freebsd.org. He likes to # review them before they are committed to make sure they are correct for @@ -1986,6 +1986,12 @@ insert /etc/pccard_ether $device start remove /etc/pccard_ether $device stop +# Nortel eMobility +card "Nortel Networks" "emobility 802.11 Wireless LAN PC Card" + config auto "wi" ? + insert /etc/pccard_ether $device start + remove /etc/pccard_ether $device stop + # PLANEX GeoWave/GW-NS110 card "PLANEX" "GeoWave/GW-NS110" config 0x1 "wi" ? @@ -2137,5 +2143,5 @@ # GENERIC Flash ATA / ATA HDD generic fixed_disk - config auto "ata" ? + config 0x1 "ata" ? logstr "GENERIC Flash ATA / ATA HDD" ==== //depot/projects/hammer/etc/rc.d/moused#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $ -# $FreeBSD: src/etc/rc.d/moused,v 1.2 2002/09/06 16:18:05 gordon Exp $ +# $FreeBSD: src/etc/rc.d/moused,v 1.3 2002/09/27 16:54:21 gordon Exp $ # # PROVIDE: moused @@ -12,14 +12,12 @@ name=moused rcvar=`set_rcvar` +command="/usr/sbin/${name}" case ${OSTYPE} in FreeBSD) start_cmd="moused_start" ;; -NetBSD) - command="/usr/sbin/${name}" - ;; esac moused_start() ==== //depot/projects/hammer/lib/libc/stdio/asprintf.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $OpenBSD: asprintf.c,v 1.4 1998/06/21 22:13:46 millert Exp $ */ +/* $OpenBSD: asprintf.c,v 1.8 2002/02/19 19:39:36 millert Exp $ */ /* * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.11 2002/08/19 03:52:36 jmallett Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.13 2002/09/26 13:09:48 tjr Exp $"); #include <stdio.h> #include <stdlib.h> @@ -45,7 +45,6 @@ FILE f; struct __sFILEX ext; - va_start(ap, fmt); f._file = -1; f._flags = __SWR | __SSTR | __SALC; f._bf._base = f._p = (unsigned char *)malloc(128); @@ -57,14 +56,16 @@ f._bf._size = f._w = 127; /* Leave room for the NUL */ f._extra = &ext; INITEXTRA(&f); + va_start(ap, fmt); ret = __vfprintf(&f, fmt, ap); /* Use unlocked __vfprintf */ - *f._p = '\0'; va_end(ap); - f._bf._base = reallocf(f._bf._base, f._bf._size + 1); - if (f._bf._base == NULL) { + if (ret < 0) { + free(f._bf._base); + *str = NULL; errno = ENOMEM; - ret = -1; + return (-1); } + *f._p = '\0'; *str = (char *)f._bf._base; return (ret); } ==== //depot/projects/hammer/lib/libc/stdio/vasprintf.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.18 2002/09/26 13:11:24 tjr Exp $"); #include <stdio.h> #include <stdlib.h> @@ -57,12 +57,13 @@ f._extra = &ext; INITEXTRA(&f); ret = __vfprintf(&f, fmt, ap); - *f._p = '\0'; - f._bf._base = reallocf(f._bf._base, f._bf._size + 1); - if (f._bf._base == NULL) { + if (ret < 0) { + free(f._bf._base); + *str = NULL; errno = ENOMEM; - ret = -1; + return (-1); } + *f._p = '\0'; *str = (char *)f._bf._base; return (ret); } ==== //depot/projects/hammer/lib/libc/stdio/vswprintf.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ #if 0 __FBSDID("FreeBSD: src/lib/libc/stdio/vasprintf.c,v 1.16 2002/08/21 16:19:57 mike Exp "); #endif -__FBSDID("$FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.1 2002/09/21 13:00:30 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.2 2002/09/26 08:26:16 tjr Exp $"); #include <errno.h> #include <stdio.h> @@ -48,7 +48,7 @@ mbstate_t mbs; char *mbp; size_t mbresult; - int ret; + int ret, sverrno; if (n == 0) { errno = EINVAL; @@ -66,6 +66,12 @@ f._extra = &ext; INITEXTRA(&f); ret = __vfwprintf(&f, fmt, ap); + if (ret < 0) { + sverrno = errno; + free(f._bf._base); + errno = sverrno; + return (-1); + } *f._p = '\0'; mbp = f._bf._base; memset(&mbs, 0, sizeof(mbs)); ==== //depot/projects/hammer/lib/libc/string/wcscat.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ __RCSID("$NetBSD: wcscat.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ #endif -__FBSDID("$FreeBSD: src/lib/libc/string/wcscat.c,v 1.7 2002/09/21 00:29:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/wcscat.c,v 1.8 2002/09/26 09:28:55 tjr Exp $"); #include <wchar.h> @@ -41,17 +41,13 @@ wchar_t * __restrict s1; const wchar_t * __restrict s2; { - wchar_t *p; - wchar_t *q; - const wchar_t *r; + wchar_t *cp; + + cp = s1; + while (*cp != L'\0') + cp++; + while ((*cp++ = *s2++) != L'\0') + ; - p = s1; - while (*p) - p++; - q = p; - r = s2; - while (*r) - *q++ = *r++; - *q = '\0'; - return s1; + return (s1); } ==== //depot/projects/hammer/lib/libc/string/wcscpy.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ __RCSID("$NetBSD: wcscpy.c,v 1.1 2000/12/23 23:14:36 itojun Exp $"); #endif /* LIBC_SCCS and not lint */ #endif -__FBSDID("$FreeBSD: src/lib/libc/string/wcscpy.c,v 1.7 2002/09/21 00:29:23 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/string/wcscpy.c,v 1.8 2002/09/26 09:23:07 tjr Exp $"); #include <wchar.h> @@ -41,15 +41,11 @@ wchar_t * __restrict s1; const wchar_t * __restrict s2; { - wchar_t *p; - const wchar_t *q; + wchar_t *cp; - *s1 = '\0'; - p = s1; - q = s2; - while (*q) - *p++ = *q++; - *p = '\0'; + cp = s1; + while ((*cp++ = *s2++) != L'\0') + ; - return s1; + return (s1); } ==== //depot/projects/hammer/lib/libugidfw/ugidfw.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.2 2002/08/14 22:30:07 rwatson Exp $ + * $FreeBSD: src/lib/libugidfw/ugidfw.c,v 1.3 2002/09/27 16:35:19 rwatson Exp $ */ #include <sys/param.h> #include <sys/errno.h> @@ -553,9 +553,10 @@ } int -bsde_get_mib(const char *string, int *name, int *namelen) +bsde_get_mib(const char *string, int *name, size_t *namelen) { - int error, len; + size_t len; + int error; len = *namelen; error = sysctlnametomib(string, name, &len); ==== //depot/projects/hammer/lib/libugidfw/ugidfw.h#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/lib/libugidfw/ugidfw.h,v 1.1 2002/08/02 07:07:35 rwatson Exp $ + * $FreeBSD: src/lib/libugidfw/ugidfw.h,v 1.2 2002/09/27 16:35:19 rwatson Exp $ */ #ifndef _UGIDFW_H @@ -49,7 +49,7 @@ struct mac_bsdextended_rule *rule, size_t buflen, char *errstr); int bsde_parse_rule_string(const char *string, struct mac_bsdextended_rule *rule, size_t buflen, char *errstr); -int bsde_get_mib(const char *string, int *name, int *namelen); +int bsde_get_mib(const char *string, int *name, size_t *namelen); int bsde_get_rule_count(size_t buflen, char *errstr); int bsde_get_rule_slots(size_t buflen, char *errstr); int bsde_get_rule(int rulenum, struct mac_bsdextended_rule *rule, ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.8#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94 -.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.61 2002/08/19 15:18:24 sobomax Exp $ +.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.62 2002/09/27 18:57:43 phk Exp $ .\" .Dd July 2, 2001 .Dt IFCONFIG 8 @@ -504,6 +504,17 @@ .It Fl link Op Cm 0 No - Cm 2 .Sm on Disable special processing at the link level with the specified interface. +.It Cm monitor +.Sm on +Put the interface in monitor mode. +No packets are transmitted and received packets are discarded after +.Xr bpf 4 +processing. +.Sm off +.It Fl monitor +.Sm on +Take the interface out of monitor mode. +.Sm off .It Cm up Mark an interface .Dq up . ==== //depot/projects/hammer/sbin/ifconfig/ifconfig.c#3 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.79 2002/08/19 15:18:24 sobomax Exp $"; + "$FreeBSD: src/sbin/ifconfig/ifconfig.c,v 1.80 2002/09/27 18:57:43 phk Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -241,6 +241,8 @@ { "-link1", -IFF_LINK1, setifflags }, { "link2", IFF_LINK2, setifflags }, { "-link2", -IFF_LINK2, setifflags }, + { "monitor", IFF_MONITOR, setifflags }, + { "-monitor", -IFF_MONITOR, setifflags }, #ifdef USE_IF_MEDIA { "media", NEXTARG, setmedia }, { "mediaopt", NEXTARG, setmediaopt }, ==== //depot/projects/hammer/sbin/init/init.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 7/15/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/init/init.c,v 1.51 2002/08/03 16:21:33 mux Exp $"; + "$FreeBSD: src/sbin/init/init.c,v 1.52 2002/09/27 16:02:28 jhb Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -939,7 +939,7 @@ * then don't add the device to the session list. */ if ((fd = open(sp->se_device, O_RDONLY | O_NONBLOCK, 0)) < 0) { - if (errno == ENXIO) { + if (errno == ENXIO || errno == ENOENT) { free_session(sp); return (0); } ==== //depot/projects/hammer/sbin/mdconfig/mdconfig.8#3 (text+ko) ==== @@ -39,7 +39,7 @@ .\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 .\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29 .\" -.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.16 2002/08/21 18:10:47 trhodes Exp $ +.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.17 2002/09/26 21:29:10 phk Exp $ .\" .Dd December 31, 2000 .Dt MDCONFIG 8 @@ -157,9 +157,8 @@ .Pa /tmp : .Bd -literal -offset indent mdconfig -a -t swap -s 128M -u 10 -disklabel -r -w md10 auto -newfs -U /dev/md10c -mount /dev/md10c /tmp +newfs -U /dev/md10 +mount /dev/md10 /tmp chmod 1777 /tmp .Ed .Sh SEE ALSO ==== //depot/projects/hammer/share/man/man4/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.163 2002/09/06 17:17:22 sobomax Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.164 2002/09/27 17:44:12 sos Exp $ MAN= aac.4 \ acpi.4 \ @@ -139,6 +139,7 @@ ppi.4 \ ppp.4 \ psm.4 \ + pst.4 \ pt.4 \ pty.4 \ puc.4 \ ==== //depot/projects/hammer/share/man/man7/hier.7#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.75 2002/05/29 17:30:56 ru Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.76 2002/09/26 17:12:05 ceri Exp $ .\" .Dd June 5, 1993 .Dt HIER 7 @@ -689,6 +689,10 @@ .Pp .It Pa db/ misc. automatically generated system-specific database files +.It Pa empty/ +empty directory used by sshd(8) for privilege separation; +see +.Xr sshd 8 .It Pa games/ misc. game status and score files .It Pa log/ ==== //depot/projects/hammer/share/man/man7/release.7#2 (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/man7/release.7,v 1.14 2002/07/27 21:09:29 jhb Exp $ +.\" $FreeBSD: src/share/man/man7/release.7,v 1.15 2002/09/26 07:08:48 ru Exp $ .\" .Dd March 12, 2002 .Dt RELEASE 7 @@ -220,6 +220,10 @@ will ask .Xr cvs 1 to check out or update sources as of 00:00:00 GMT, January 1 2002, respectively. +.It Va DOC_LANG +The list of languages and encodings the SGML-based documentation +should be built for. +If not set, the documentation is built for all available languages. .It Va DOCRELEASETAG The CVS tag to use when checking out the documentation tree. Usually, ==== //depot/projects/hammer/share/man/man9/VOP_IOCTL.9#2 (text+ko) ==== @@ -26,7 +26,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/man9/VOP_IOCTL.9,v 1.8 2002/03/28 12:57:48 dd Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_IOCTL.9,v 1.9 2002/09/26 14:10:21 phk Exp $ .\" .Dd July 24, 1996 .Os @@ -63,13 +63,16 @@ The file should not be locked on entry. .Sh RETURN VALUES If successful, zero is returned, otherwise an appropriate error code. +.Pp +If the ioctl is not recognized or not handled, ENOTTY should be returned. .Sh PSEUDOCODE .Bd -literal int vop_ioctl(struct vnode *vp, int command, caddr_t data, int fflag, struct ucred *cred, struct thread *td) { - return EOPNOTSUPP; + + return ENOTTY; } .Ed .Sh SEE ALSO ==== //depot/projects/hammer/sys/coda/coda_venus.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_venus.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_venus.c,v 1.15 2002/04/16 17:11:30 jhb Exp $ + * $FreeBSD: src/sys/coda/coda_venus.c,v 1.16 2002/09/26 06:19:31 njl Exp $ * */ @@ -274,7 +274,7 @@ inp->len = iap->vi.in_size; inp->data = (char *)(sizeof (struct coda_ioctl_in)); - error = copyin(iap->vi.in, (char*)inp + (int)inp->data, + error = copyin(iap->vi.in, (char*)inp + (long)inp->data, iap->vi.in_size); if (error) { CODA_FREE(inp, coda_ioctl_size); @@ -289,7 +289,7 @@ if (outp->len > iap->vi.out_size) { error = EINVAL; } else { - error = copyout((char *)outp + (int)outp->data, + error = copyout((char *)outp + (long)outp->data, iap->vi.out, iap->vi.out_size); } } @@ -377,7 +377,7 @@ if (!error) { CODA_ALLOC(*str, char *, outp->count); *len = outp->count; - bcopy((char *)outp + (int)outp->data, *str, *len); + bcopy((char *)outp + (long)outp->data, *str, *len); } CODA_FREE(inp, coda_readlink_size); @@ -634,7 +634,7 @@ Osize = VC_MAXMSGSIZE; error = coda_call(mdp, Isize, &Osize, (char *)inp); if (!error) { - bcopy((char *)outp + (int)outp->data, buffer, outp->size); + bcopy((char *)outp + (long)outp->data, buffer, outp->size); *len = outp->size; } ==== //depot/projects/hammer/sys/conf/NOTES#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1084 2002/09/25 15:21:49 scottl Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1085 2002/09/26 18:16:21 scottl Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1320,12 +1320,6 @@ device mly # -# Adaptec FSA RAID controllers, including integrated DELL controllers, -# the Dell PERC 2/QC and the HP NetRAID-4M -device aac -device aacp # SCSI Passthrough interface (optional, CAM required) - -# # Compaq Smart RAID, Mylex DAC960 and AMI MegaRAID controllers. Only # one entry is needed; the code will find and configure all supported # controllers. ==== //depot/projects/hammer/sys/conf/majors#4 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/conf/majors,v 1.140 2002/09/24 02:46:46 imp Exp $ +$FreeBSD: src/sys/conf/majors,v 1.141 2002/09/27 17:06:56 scottl Exp $ Hopefully, this list will one day be obsoleted by DEVFS, but for now this is the current allocation of device major numbers. @@ -190,6 +190,8 @@ 172 mided LSI MegaRAID IDE (disk device) 173 devctl Devd control device <imp> 174 pciwd Berkshire Watchdog PCI <marcel@progressix.com> +175 ips IBM/Adaptec ServeRAID (control device) +176 ipsd IBM/Adaptec ServeRAID (disk device) 200 ?? entries from 200-252 are reserved for local use 252 ?? entries from 200-252 are reserved for local use 254 internal Used internally by the kernel ==== //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#4 (text+ko) ==== @@ -26,9 +26,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahc_eisa.c#8 $ + * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahc_eisa.c#9 $ * - * $FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.26 2002/09/22 23:03:31 scottl Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.27 2002/09/26 21:48:17 gibbs Exp $ */ #include <dev/aic7xxx/aic7xxx_osm.h> ==== //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#4 (text+ko) ==== @@ -28,9 +28,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahc_pci.c#8 $ + * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahc_pci.c#9 $ * - * $FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.49 2002/09/22 23:03:31 scottl Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.50 2002/09/26 21:48:17 gibbs Exp $ */ #include <dev/aic7xxx/aic7xxx_osm.h> ==== //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#2 (text+ko) ==== @@ -28,9 +28,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/ahd_pci.c#6 $ * - * $FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.2 2002/06/06 16:35:57 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.3 2002/09/26 21:50:27 gibbs Exp $ */ #include <dev/aic7xxx/aic79xx_osm.h> ==== //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#3 (text+ko) ==== @@ -37,9 +37,9 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGES. * - * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#102 $ + * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#113 $ * - * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.3 2002/08/31 06:48:14 gibbs Exp $ + * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.4 2002/09/26 22:53:59 gibbs Exp $ */ #ifdef __linux__ @@ -488,7 +488,6 @@ struct scb *scb; u_int scbid; - ahd_update_modes(ahd); scbid = ahd_get_scbptr(ahd); scb = ahd_lookup_scb(ahd, scbid); if (scb == NULL) { @@ -933,12 +932,6 @@ ahd_outb(ahd, CLRSINT0, CLRSELINGO); scbid = ahd_inw(ahd, WAITING_TID_HEAD); -#ifdef AHD_DEBUG - if ((ahd_debug & AHD_SHOW_SELTO) != 0) { - ahd_print_path(ahd, scb); - printf("Saw Selection Timeout for SCB 0x%x\n", scbid); - } -#endif scb = ahd_lookup_scb(ahd, scbid); if (scb == NULL) { printf("%s: ahd_intr - referenced scb not " @@ -947,6 +940,13 @@ ahd_dump_card_state(ahd); panic("For diagnostics"); } else { +#ifdef AHD_DEBUG + if ((ahd_debug & AHD_SHOW_SELTO) != 0) { + ahd_print_path(ahd, scb); + printf("Saw Selection Timeout for SCB 0x%x\n", + scbid); + } +#endif ahd_set_transaction_status(scb, CAM_SEL_TIMEOUT); ahd_freeze_devq(ahd, scb); } @@ -1033,22 +1033,31 @@ if (packetized && ahd_inb(ahd, LASTPHASE) == P_BUSFREE) { restart = ahd_handle_pkt_busfree(ahd, busfreetime); } else { + packetized = 0; restart = ahd_handle_nonpkt_busfree(ahd); } /* * Clear the busfree interrupt status. The setting of - * the interrupt is a pulse, so we do not need to muck - * with the ENBUSFREE logic. This also ensures that if - * the bus has moved on to another connection, busfree - * protection is still in force. + * the interrupt is a pulse, so in a perfect world, we + * would not need to muck with the ENBUSFREE logic. This + * would ensure that if the bus moves on to another + * connection, busfree protection is still in force. If + * BUSFREEREV is broken, however, we must manually clear + * the ENBUSFREE if the busfree occurred during a non-pack + * connection so that we don't get false positives during + * future, packetized, connections. */ - ahd_outb(ahd, CLRSINT1, CLRBUSFREE|CLRSCSIPERR); + ahd_outb(ahd, CLRSINT1, CLRBUSFREE); + if (packetized == 0 + && (ahd->bugs & AHD_BUSFREEREV_BUG) != 0) + ahd_outb(ahd, SIMODE1, + ahd_inb(ahd, SIMODE1) & ~ENBUSFREE); if (clear_fifo) ahd_clear_fifo(ahd, mode); ahd_clear_msg_state(ahd); - ahd_clear_intstat(ahd); + ahd_outb(ahd, CLRINT, CLRSCSIINT); if (restart) { ahd_restart(ahd); } else { @@ -1066,12 +1075,13 @@ static void ahd_handle_transmission_error(struct ahd_softc *ahd) { - u_int lqistat1; - u_int lqistat2; - u_int msg_out; - u_int curphase; - u_int lastphase; - u_int perrdiag; + u_int lqistat1; + u_int lqistat2; + u_int msg_out; + u_int curphase; + u_int lastphase; + u_int perrdiag; + u_int cur_col; ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI); lqistat1 = ahd_inb(ahd, LQISTAT1) & ~(LQIPHASE_LQ|LQIPHASE_NLQ); @@ -1098,9 +1108,12 @@ msg_out = MSG_INITIATOR_DET_ERR; ahd_outb(ahd, CLRSINT1, CLRSCSIPERR); printf("%s: Transmission error detected\n", ahd_name(ahd)); - printf("%s: lqistat1 == 0x%x, LASTPHASE == 0x0%x, " - "curphase = 0x%x, perrdiag == 0x%x\n", - ahd_name(ahd), lqistat1, lastphase, curphase, perrdiag); + cur_col = 0; + ahd_lqistat1_print(lqistat1, &cur_col, 50); + ahd_lastphase_print(lastphase, &cur_col, 50); + ahd_scsisigi_print(curphase, &cur_col, 50); + ahd_perrdiag_print(perrdiag, &cur_col, 50); + printf("\n"); ahd_dump_card_state(ahd); if ((lqistat1 & (LQIOVERI_LQ|LQIOVERI_NLQ)) != 0) { printf("%s: Gross protocol error during incoming " @@ -1261,7 +1274,7 @@ /* * Packetized unexpected or expected busfree. - * Entered in MODE_SCSI. + * Entered in mode based on busfreetime. */ static int ahd_handle_pkt_busfree(struct ahd_softc *ahd, u_int busfreetime) @@ -1274,6 +1287,7 @@ if ((lqostat1 & LQOBUSFREE) != 0) { struct scb *scb; u_int scbid; + u_int saved_scbptr; u_int waiting_h; u_int waiting_t; u_int next; @@ -1282,8 +1296,23 @@ printf("%s: Warning, BUSFREE time is 0x%x. " "Expected BUSFREE_LQO.\n", ahd_name(ahd), busfreetime); - - scbid = ahd_get_scbptr(ahd); + /* + * The LQO manager detected an unexpected busfree + * either: + * + * 1) During an outgoing LQ. + * 2) After an outgoing LQ but before the first + * REQ of the command packet. + * 3) During an outgoing command packet. + * + * In all cases, CURRSCB is pointing to the + * SCB that encountered the failure. Clean + * up the queue, clear SELDO and LQOBUSFREE, + * and allow the sequencer to restart the select + * out at its lesure. + */ + ahd_set_modes(ahd, AHD_MODE_SCSI, AHD_MODE_SCSI); + scbid = ahd_inw(ahd, CURRSCB); scb = ahd_lookup_scb(ahd, scbid); if (scb == NULL) panic("SCB not valid during LQOBUSFREE"); @@ -1302,27 +1331,17 @@ * Clear the status. */ ahd_outb(ahd, CLRLQOINT1, CLRLQOBUSFREE); - if ((ahd->bugs & AHD_CLRLQO_AUTOCLR_BUG) != 0) { + if ((ahd->bugs & AHD_CLRLQO_AUTOCLR_BUG) != 0) ahd_outb(ahd, CLRLQOINT1, 0); - } + ahd_outb(ahd, SCSISEQ0, ahd_inb(ahd, SCSISEQ0) & ~ENSELO); + ahd_outb(ahd, CLRSINT0, CLRSELDO); + /* - * The LQO manager detected an unexpected busfree - * either: - * - * 1) During an outgoing LQ. - * 2) After an outgoing LQ but before the first - * REQ of the command packet. - * 3) During an outgoing command packet. - * - * In all cases, CURRSCB is pointing to the - * SCB that encountered the failure. Clean - * up the queue, clear SELDO and LQOBUSFREE, - * and allow the sequencer to restart the select - * out at its lesure. + * Update the waiting for selection queue so + * we restart on the correct SCB. */ - ahd_outb(ahd, SCSISEQ0, ahd_inb(ahd, SCSISEQ0) & ~ENSELO); - ahd_outb(ahd, CLRSINT0, CLRSELDO); waiting_h = ahd_inw(ahd, WAITING_TID_HEAD); + saved_scbptr = ahd_get_scbptr(ahd); if (waiting_h != scbid) { ahd_outw(ahd, WAITING_TID_HEAD, scbid); @@ -1337,7 +1356,7 @@ ahd_set_scbptr(ahd, scbid); ahd_outw(ahd, SCB_NEXT2, next); } - + ahd_set_scbptr(ahd, saved_scbptr); /* Return unpausing the sequencer. */ return (0); } @@ -1769,6 +1788,10 @@ |CLRLQOATNPKT|CLRLQOTCRC); ahd_outb(ahd, CLRLQOINT1, CLRLQOINITSCBPERR|CLRLQOSTOPI2|CLRLQOBADQAS |CLRLQOBUSFREE|CLRLQOPHACHGINPKT); + if ((ahd->bugs & AHD_CLRLQO_AUTOCLR_BUG) != 0) { + ahd_outb(ahd, CLRLQOINT0, 0); + ahd_outb(ahd, CLRLQOINT1, 0); + } ahd_outb(ahd, CLRSINT3, CLRNTRAMPERR|CLROSRAMPERR); ahd_outb(ahd, CLRSINT1, CLRSELTIMEO|CLRATNO|CLRSCSIRSTI |CLRBUSFREE|CLRSCSIPERR|CLRREQINIT); @@ -1817,26 +1840,32 @@ sg_list = (struct ahd_dma64_seg*)scb->sg_list; for (i = 0; i < scb->sg_count; i++) { uint64_t addr; + uint32_t len; addr = ahd_le64toh(sg_list[i].addr); - printf("sg[%d] - Addr 0x%x%x : Length %d\n", + len = ahd_le32toh(sg_list[i].len); + printf("sg[%d] - Addr 0x%x%x : Length %d%s\n", i, (uint32_t)((addr >> 32) & 0xFFFFFFFF), (uint32_t)(addr & 0xFFFFFFFF), - ahd_le32toh(sg_list[i].len)); + sg_list[i].len & AHD_SG_LEN_MASK, + (sg_list[i].len & AHD_DMA_LAST_SEG) + ? " Last" : ""); } } else { struct ahd_dma_seg *sg_list; sg_list = (struct ahd_dma_seg*)scb->sg_list; for (i = 0; i < scb->sg_count; i++) { - printf("sg[%d] - Addr 0x%x%x : Length %d\n", + uint32_t len; + + len = ahd_le32toh(sg_list[i].len); + printf("sg[%d] - Addr 0x%x%x : Length %d%s\n", i, - (ahd_le32toh(sg_list[i].len) >> 24 - & SG_HIGH_ADDR_BITS), + (len >> 24) & SG_HIGH_ADDR_BITS, >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209280004.g8S04Zuj092111>