Date: Fri, 16 Sep 2005 20:41:54 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 83755 for review Message-ID: <200509162041.j8GKfsBj020699@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=83755 Change 83755 by sam@sam_ebb on 2005/09/16 20:41:34 IFC Affected files ... .. //depot/projects/wifi/etc/rc.initdiskless#4 integrate .. //depot/projects/wifi/include/Makefile#16 integrate .. //depot/projects/wifi/lib/libc/gen/getcwd.c#2 integrate .. //depot/projects/wifi/lib/libc/gen/glob.c#2 integrate .. //depot/projects/wifi/lib/libmd/sha256.3#3 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate .. //depot/projects/wifi/sbin/init/init.8#4 integrate .. //depot/projects/wifi/sbin/init/init.c#3 integrate .. //depot/projects/wifi/sbin/mount_msdosfs/mount_msdosfs.8#3 integrate .. //depot/projects/wifi/sbin/sysctl/sysctl.8#6 integrate .. //depot/projects/wifi/sbin/sysctl/sysctl.c#5 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/Makefile#7 integrate .. //depot/projects/wifi/share/man/man4/man4.i386/acpi_sony.4#1 branch .. //depot/projects/wifi/share/man/man5/msdosfs.5#2 integrate .. //depot/projects/wifi/share/man/man5/rc.conf.5#19 integrate .. //depot/projects/wifi/sys/alpha/alpha/busdma_machdep.c#6 integrate .. //depot/projects/wifi/sys/alpha/include/atomic.h#5 integrate .. //depot/projects/wifi/sys/amd64/include/atomic.h#7 integrate .. //depot/projects/wifi/sys/boot/pc98/boot2/io.c#4 integrate .. //depot/projects/wifi/sys/conf/NOTES#26 integrate .. //depot/projects/wifi/sys/conf/files#32 integrate .. //depot/projects/wifi/sys/dev/aac/aac.c#7 integrate .. //depot/projects/wifi/sys/dev/aac/aac_cam.c#5 integrate .. //depot/projects/wifi/sys/dev/ata/ata-all.c#13 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#17 integrate .. //depot/projects/wifi/sys/dev/ata/ata-lowlevel.c#15 integrate .. //depot/projects/wifi/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/wifi/sys/dev/digi/digi.c#3 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_cbus.c#8 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pccard.c#10 integrate .. //depot/projects/wifi/sys/dev/ed/if_ed_pci.c#8 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#14 integrate .. //depot/projects/wifi/sys/dev/ieee488/tnt4882.c#1 branch .. //depot/projects/wifi/sys/dev/ieee488/upd7210.c#5 integrate .. //depot/projects/wifi/sys/dev/ieee488/upd7210.h#4 integrate .. //depot/projects/wifi/sys/dev/nge/if_nge.c#9 integrate .. //depot/projects/wifi/sys/dev/re/if_re.c#10 integrate .. //depot/projects/wifi/sys/dev/sn/if_sn.c#8 integrate .. //depot/projects/wifi/sys/dev/sn/if_snvar.h#5 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sndstat.c#4 integrate .. //depot/projects/wifi/sys/dev/txp/if_txp.c#8 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs.h#5 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_devs.c#8 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_rule.c#4 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#26 integrate .. //depot/projects/wifi/sys/fs/fifofs/fifo_vnops.c#11 integrate .. //depot/projects/wifi/sys/fs/nullfs/null_vnops.c#13 integrate .. //depot/projects/wifi/sys/geom/geom_io.c#4 integrate .. //depot/projects/wifi/sys/geom/geom_slice.c#3 integrate .. //depot/projects/wifi/sys/i386/i386/local_apic.c#9 integrate .. //depot/projects/wifi/sys/i386/i386/sys_machdep.c#10 integrate .. //depot/projects/wifi/sys/i386/include/atomic.h#6 integrate .. //depot/projects/wifi/sys/i386/include/pcb_ext.h#2 integrate .. //depot/projects/wifi/sys/kern/imgact_elf.c#8 integrate .. //depot/projects/wifi/sys/kern/init_main.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_conf.c#12 integrate .. //depot/projects/wifi/sys/kern/kern_event.c#9 integrate .. //depot/projects/wifi/sys/kern/kern_intr.c#10 integrate .. //depot/projects/wifi/sys/kern/kern_timeout.c#6 integrate .. //depot/projects/wifi/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#14 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#17 integrate .. //depot/projects/wifi/sys/kern/vfs_lookup.c#13 integrate .. //depot/projects/wifi/sys/kern/vfs_syscalls.c#14 integrate .. //depot/projects/wifi/sys/net/bpf.c#15 integrate .. //depot/projects/wifi/sys/net/route.h#3 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#15 integrate .. //depot/projects/wifi/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/wifi/sys/pc98/cbus/fdc.c#3 integrate .. //depot/projects/wifi/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/wifi/sys/pc98/cbus/nmi.c#2 integrate .. //depot/projects/wifi/sys/pc98/cbus/sio.c#2 integrate .. //depot/projects/wifi/sys/pc98/pc98/epsonio.h#4 delete .. //depot/projects/wifi/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/wifi/sys/pc98/pc98/pc98_machdep.c#5 integrate .. //depot/projects/wifi/sys/pc98/pc98/pc98_machdep.h#3 integrate .. //depot/projects/wifi/sys/pci/if_dc.c#10 integrate .. //depot/projects/wifi/sys/pci/if_rl.c#8 integrate .. //depot/projects/wifi/sys/pci/if_tl.c#7 integrate .. //depot/projects/wifi/sys/pci/if_tlreg.h#4 integrate .. //depot/projects/wifi/sys/powerpc/include/atomic.h#5 integrate .. //depot/projects/wifi/sys/sys/conf.h#13 integrate .. //depot/projects/wifi/sys/sys/filedesc.h#9 integrate .. //depot/projects/wifi/sys/sys/proc.h#18 integrate .. //depot/projects/wifi/tools/regression/sockets/shutdown/shutdown.c#2 integrate .. //depot/projects/wifi/usr.bin/netstat/bpf.c#2 integrate .. //depot/projects/wifi/usr.sbin/pmcstat/pmcstat_log.c#3 integrate .. //depot/projects/wifi/usr.sbin/portsnap/portsnap/portsnap.sh#3 integrate Differences ... ==== //depot/projects/wifi/etc/rc.initdiskless#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/etc/rc.initdiskless,v 1.44 2005/08/28 18:48:04 bmah Exp $ +# $FreeBSD: src/etc/rc.initdiskless,v 1.45 2005/09/15 16:09:28 rwatson Exp $ # On entry to this script the entire system consists of a read-only root # mounted via NFS. The kernel has run BOOTP and configured an interface @@ -191,7 +191,7 @@ fi done # Get the values passed with the T134 bootp cookie. - class="`/sbin/sysctl -n kern.bootp_cookie`" + class="`/sbin/sysctl -qn kern.bootp_cookie`" echo "Interface ${bootp_ifc} IP-Address ${bootp_ipa} Broadcast ${bootp_ipbca} ${class}" fi ==== //depot/projects/wifi/include/Makefile#16 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.247 2005/09/12 16:11:48 stefanf Exp $ +# $FreeBSD: src/include/Makefile,v 1.248 2005/09/14 09:01:06 stefanf Exp $ # # Doing a "make install" builds /usr/include. @@ -84,7 +84,6 @@ echo "#else" >> osreldate.h; \ echo \#'undef __FreeBSD_version' >> osreldate.h; \ echo \#'define __FreeBSD_version' $$RELDATE >> osreldate.h; \ - echo "int getosreldate(void);" >> osreldate.h; \ echo "#endif" >> osreldate.h .for i in ${LHDRS} ==== //depot/projects/wifi/lib/libc/gen/getcwd.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getcwd.c 8.5 (Berkeley) 2/7/95"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/getcwd.c,v 1.25 2003/10/29 10:45:01 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/getcwd.c,v 1.27 2005/09/15 17:25:52 ache Exp $"); #include "namespace.h" #include <sys/param.h> @@ -91,7 +91,7 @@ } ept = pt + size; } else { - if ((pt = malloc(ptsize = 1024 - 4)) == NULL) + if ((pt = malloc(ptsize = PATH_MAX)) == NULL) return (NULL); ept = pt + ptsize; } @@ -111,13 +111,13 @@ *bpt = '\0'; /* - * Allocate bytes (1024 - malloc space) for the string of "../"'s. - * Should always be enough (it's 340 levels). If it's not, allocate + * Allocate 1024 bytes for the string of "../"'s. + * Should always be enough. If it's not, allocate * as necessary. Special case the first stat, it's ".", not "..". */ - if ((up = malloc(upsize = 1024 - 4)) == NULL) + if ((up = malloc(upsize = 1024)) == NULL) goto err; - eup = up + MAXPATHLEN; + eup = up + upsize; bup = up; up[0] = '.'; up[1] = '\0'; ==== //depot/projects/wifi/lib/libc/gen/glob.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.22 2004/07/29 03:48:52 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/glob.c,v 1.23 2005/09/14 19:14:32 ache Exp $"); /* * glob(3) -- a superset of the one defined in POSIX 1003.2. @@ -277,7 +277,7 @@ { int i; Char *lm, *ls; - const Char *pe, *pm, *pl; + const Char *pe, *pm, *pm1, *pl; Char patbuf[MAXPATHLEN]; /* copy part up to the brace */ @@ -318,14 +318,14 @@ switch (*pm) { case LBRACKET: /* Ignore everything between [] */ - for (pl = pm++; *pm != RBRACKET && *pm != EOS; pm++) + for (pm1 = pm++; *pm != RBRACKET && *pm != EOS; pm++) continue; if (*pm == EOS) { /* * We could not find a matching RBRACKET. * Ignore and just look for RBRACE */ - pm = pl; + pm = pm1; } break; ==== //depot/projects/wifi/lib/libmd/sha256.3#3 (text+ko) ==== @@ -7,7 +7,7 @@ .\" ---------------------------------------------------------------------------- .\" .\" From: Id: mdX.3,v 1.14 1999/02/11 20:31:49 wollman Exp -.\" $FreeBSD: src/lib/libmd/sha256.3,v 1.2 2005/06/16 21:53:41 ru Exp $ +.\" $FreeBSD: src/lib/libmd/sha256.3,v 1.3 2005/09/14 10:42:51 pjd Exp $ .\" .Dd March 9, 2005 .Dt SHA256 3 @@ -27,13 +27,13 @@ .In sys/types.h .In sha256.h .Ft void -.Fn SHA256_Init "SHA_CTX *context" +.Fn SHA256_Init "SHA256_CTX *context" .Ft void -.Fn SHA256_Update "SHA_CTX *context" "const unsigned char *data" "size_t len" +.Fn SHA256_Update "SHA256_CTX *context" "const unsigned char *data" "size_t len" .Ft void -.Fn SHA256_Final "unsigned char digest[32]" "SHA_CTX *context" +.Fn SHA256_Final "unsigned char digest[32]" "SHA256_CTX *context" .Ft "char *" -.Fn SHA256_End "SHA_CTX *context" "char *buf" +.Fn SHA256_End "SHA256_CTX *context" "char *buf" .Ft "char *" .Fn SHA256_File "const char *filename" "char *buf" .Ft "char *" ==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.889 2005/09/05 17:16:50 brueffer Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.890 2005/09/14 05:50:09 brueffer Exp $</pubdate> <copyright> <year>2000</year> @@ -257,8 +257,8 @@ <title>Documentation</title> <para>Documentation of existing functionality has been improved by - the addition of the following manual page: - &man.snd.t4dwave.4;.</para> + the addition of the following manual pages: + &man.acpi.sony.4;, &man.snd.t4dwave.4;.</para> </sect2> </sect1> ==== //depot/projects/wifi/sbin/init/init.8#4 (text+ko) ==== @@ -29,9 +29,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)init.8 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/sbin/init/init.8,v 1.47 2005/09/03 17:16:00 garys Exp $ +.\" $FreeBSD: src/sbin/init/init.8,v 1.48 2005/09/15 13:16:07 rse Exp $ .\" -.Dd April 18, 1994 +.Dd September 15, 2005 .Dt INIT 8 .Os .Sh NAME @@ -270,6 +270,12 @@ as .Nm innd (the InterNetNews server). +If this script does not terminate within 120 seconds, +.Nm +will terminate it. The timeout can be configured via the +.Xr sysctl 8 +variable +.Va kern.init_shutdown_timeout . .Pp The role of .Nm ==== //depot/projects/wifi/sbin/init/init.c#3 (text+ko) ==== @@ -41,7 +41,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.60 2005/01/11 14:34:29 delphij Exp $"; + "$FreeBSD: src/sbin/init/init.c,v 1.61 2005/09/15 13:16:07 rse Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -1520,7 +1520,7 @@ } len = sizeof(shutdowntimeout); - if (sysctlbyname("kern.shutdown_timeout", + if (sysctlbyname("kern.init_shutdown_timeout", &shutdowntimeout, &len, NULL, 0) == -1 || shutdowntimeout < 2) shutdowntimeout = DEATH_SCRIPT; ==== //depot/projects/wifi/sbin/mount_msdosfs/mount_msdosfs.8#3 (text+ko) ==== @@ -28,7 +28,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/sbin/mount_msdosfs/mount_msdosfs.8,v 1.31 2005/02/10 09:19:30 ru Exp $ +.\" $FreeBSD: src/sbin/mount_msdosfs/mount_msdosfs.8,v 1.32 2005/09/14 16:36:19 joel Exp $ .\" .Dd April 7, 1994 .Dt MOUNT_MSDOSFS 8 @@ -189,6 +189,7 @@ .Xr mount 2 , .Xr unmount 2 , .Xr fstab 5 , +.Xr msdosfs 5 , .Xr mount 8 .Pp List of Localized MS Operating Systems: ==== //depot/projects/wifi/sbin/sysctl/sysctl.8#6 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.58 2005/07/14 20:29:06 brueffer Exp $ +.\" $FreeBSD: src/sbin/sysctl/sysctl.8,v 1.59 2005/09/15 16:08:04 rwatson Exp $ .\" .Dd March 10, 2002 .Dt SYSCTL 8 @@ -40,7 +40,7 @@ .Ar name Ns Op = Ns Ar value .Ar ... .Nm -.Op Fl bdehNnox +.Op Fl bdehNnoqx .Fl a .Sh DESCRIPTION The @@ -111,6 +111,10 @@ Show opaque variables (which are normally suppressed). The format and length are printed, as well as a hex dump of the first sixteen bytes of the value. +.It Fl q +Suppress some warnings generated by +.Nm +to standard error. .It Fl X Equivalent to .Fl x a ==== //depot/projects/wifi/sbin/sysctl/sysctl.c#5 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)from: sysctl.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.67 2005/04/13 06:59:07 mdodd Exp $"; + "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.68 2005/09/15 16:08:04 rwatson Exp $"; #endif /* not lint */ #ifdef __i386__ @@ -60,7 +60,8 @@ #include <string.h> #include <unistd.h> -static int aflag, bflag, dflag, eflag, hflag, Nflag, nflag, oflag, xflag; +static int aflag, bflag, dflag, eflag, hflag, Nflag, nflag, oflag; +static int qflag, xflag; static int oidfmt(int *, int, char *, u_int *); static void parse(char *); @@ -89,7 +90,7 @@ setbuf(stdout,0); setbuf(stderr,0); - while ((ch = getopt(argc, argv, "AabdehNnowxX")) != -1) { + while ((ch = getopt(argc, argv, "AabdehNnoqwxX")) != -1) { switch (ch) { case 'A': /* compatibility */ @@ -119,6 +120,9 @@ case 'o': oflag = 1; break; + case 'q': + qflag = 1; + break; case 'w': /* compatibility */ /* ignored */ @@ -181,8 +185,12 @@ } len = name2oid(bufp, mib); - if (len < 0) - errx(1, "unknown oid '%s'", bufp); + if (len < 0) { + if (qflag) + exit(1); + else + errx(1, "unknown oid '%s'", bufp); + } if (oidfmt(mib, len, fmt, &kind)) err(1, "couldn't find format of oid '%s'", bufp); ==== //depot/projects/wifi/share/man/man4/man4.i386/Makefile#7 (text+ko) ==== @@ -1,9 +1,10 @@ -# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.179 2005/08/27 18:14:53 marius Exp $ +# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.180 2005/09/14 05:09:33 brueffer Exp $ MAN= acpi_asus.4 \ acpi_fujitsu.4 \ acpi_ibm.4 \ acpi_panasonic.4 \ + acpi_sony.4 \ acpi_toshiba.4 \ aic.4 \ alpm.4 \ ==== //depot/projects/wifi/share/man/man5/msdosfs.5#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.4 2003/02/24 22:53:23 ru Exp $ +.\" $FreeBSD: src/share/man/man5/msdosfs.5,v 1.5 2005/09/14 16:32:21 joel Exp $ .\" Written by Tom Rhodes .\" This file is in the public domain. .\" @@ -64,10 +64,6 @@ .Xr mount 8 , .Xr mount_msdosfs 8 , .Xr umount 8 -.Rs -.%T "The FreeBSD Handbook" -.%O "http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/" -.Re .Sh AUTHORS This manual page was written by .An Tom Rhodes Aq trhodes@FreeBSD.org . ==== //depot/projects/wifi/share/man/man5/rc.conf.5#19 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.263 2005/09/08 09:22:21 yar Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.264 2005/09/15 13:16:07 rse Exp $ .\" -.Dd September 8, 2005 +.Dd September 15, 2005 .Dt RC.CONF 5 .Os .Sh NAME @@ -3170,6 +3170,21 @@ if .Xr shutdown 8 has not completed within the specified time (in seconds). +Notice that in addition to this soft timeout, +.Xr init 8 +also applies a hard timeout for the execution of +.Pa rc.shutdown . +This is configured via +.Xr sysctl 8 +variable +.Va kern.init_shutdown_timeout +and defaults to 120 seconds. Setting the value of +.Va rcshutdown_timeout +to more than 120 seconds will have no effect until the +.Xr sysctl 8 +variable +.Va kern.init_shutdown_timeout +is also increased. .It Va virecover_enable .Pq Vt bool Set to ==== //depot/projects/wifi/sys/alpha/alpha/busdma_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.51 2005/05/25 07:25:12 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busdma_machdep.c,v 1.52 2005/09/15 17:09:42 jhb Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -891,6 +891,10 @@ } } } + + /* Ensure any pending writes have drained. */ + if (op & (BUS_DMASYNC_PREWRITE)) + alpha_mb(); } static void ==== //depot/projects/wifi/sys/alpha/include/atomic.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.22 2005/07/15 18:17:57 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.23 2005/09/15 19:31:22 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -56,12 +56,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldl_l %0, %2\n\t" /* load old value */ - "bis %0, %3, %0\n\t" /* calculate new value */ + "1:\tldl_l %0, %3\n\t" /* load old value */ + "bis %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ : "=&r" (temp), "=m" (*p) - : "m" (*p), "r" (v) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -72,12 +72,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldl_l %0, %1\n\t" /* load old value */ + "1:\tldl_l %0, %3\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -88,12 +88,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldl_l %0, %1\n\t" /* load old value */ + "1:\tldl_l %0, %3\n\t" /* load old value */ "addl %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -104,12 +104,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldl_l %0, %1\n\t" /* load old value */ + "1:\tldl_l %0, %3\n\t" /* load old value */ "subl %0, %2, %0\n\t" /* calculate new value */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -121,12 +121,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( "wmb\n" /* ensure pending writes have drained */ - "1:\tldl_l %0,%2\n\t" /* load current value, asserting lock */ + "1:\tldl_l %0,%3\n\t" /* load current value, asserting lock */ "ldiq %1,0\n\t" /* value to store */ "stl_c %1,%2\n\t" /* attempt to store */ "beq %1,1b\n" /* if the store failed, spin */ - : "=&r"(result), "=&r"(temp), "+m" (*addr) - : + : "=&r"(result), "=&r"(temp), "=m" (*addr) + : "m" (*addr) : "memory"); #endif @@ -139,12 +139,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldq_l %0, %1\n\t" /* load old value */ + "1:\tldq_l %0, %3\n\t" /* load old value */ "bis %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -155,12 +155,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldq_l %0, %1\n\t" /* load old value */ + "1:\tldq_l %0, %3\n\t" /* load old value */ "bic %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -171,12 +171,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldq_l %0, %1\n\t" /* load old value */ + "1:\tldq_l %0, %3\n\t" /* load old value */ "addq %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -187,12 +187,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldq_l %0, %1\n\t" /* load old value */ + "1:\tldq_l %0, %3\n\t" /* load old value */ "subq %0, %2, %0\n\t" /* calculate new value */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n" /* spin if failed */ - : "=&r" (temp), "+m" (*p) - : "r" (v) + : "=&r" (temp), "=m" (*p) + : "r" (v), "m" (*p) : "memory"); #endif } @@ -204,12 +204,12 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( "wmb\n" /* ensure pending writes have drained */ - "1:\tldq_l %0,%2\n\t" /* load current value, asserting lock */ + "1:\tldq_l %0,%3\n\t" /* load current value, asserting lock */ "ldiq %1,0\n\t" /* value to store */ "stq_c %1,%2\n\t" /* attempt to store */ "beq %1,1b\n" /* if the store failed, spin */ - : "=&r"(result), "=&r"(temp), "+m" (*addr) - : + : "=&r"(result), "=&r"(temp), "=m" (*addr) + : "m" (*addr) : "memory"); #endif @@ -289,15 +289,15 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldl_l %0, %1\n\t" /* load old value */ + "1:\tldl_l %0, %4\n\t" /* load old value */ "cmpeq %0, %2, %0\n\t" /* compare */ "beq %0, 2f\n\t" /* exit if not equal */ "mov %3, %0\n\t" /* value to store */ "stl_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n\t" /* if it failed, spin */ "2:\n" - : "=&r" (ret), "+m" (*p) - : "r" ((long)(int)cmpval), "r" (newval) + : "=&r" (ret), "=m" (*p) + : "r" ((long)(int)cmpval), "r" (newval), "m" (*p) : "memory"); #endif @@ -316,15 +316,15 @@ #ifdef __GNUCLIKE_ASM __asm __volatile ( - "1:\tldq_l %0, %1\n\t" /* load old value */ + "1:\tldq_l %0, %4\n\t" /* load old value */ "cmpeq %0, %2, %0\n\t" /* compare */ "beq %0, 2f\n\t" /* exit if not equal */ "mov %3, %0\n\t" /* value to store */ "stq_c %0, %1\n\t" /* attempt to store */ "beq %0, 1b\n\t" /* if it failed, spin */ "2:\n" - : "=&r" (ret), "+m" (*p) - : "r" (cmpval), "r" (newval) + : "=&r" (ret), "=m" (*p) + : "r" (cmpval), "r" (newval), "m" (*p) : "memory"); #endif ==== //depot/projects/wifi/sys/amd64/include/atomic.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.37 2005/08/18 14:36:47 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.38 2005/09/15 19:31:22 jhb Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -99,8 +99,8 @@ atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ __asm __volatile(__XSTRING(MPLOCKED) OP \ - : "+m" (*p) \ - : CONS (V)); \ + : "=m" (*p) \ + : CONS (V), "m" (*p)); \ } \ struct __hack @@ -119,15 +119,16 @@ __asm __volatile ( " " __XSTRING(MPLOCKED) " " - " cmpxchgl %1,%2 ; " + " cmpxchgl %2,%1 ; " " setz %%al ; " " movzbl %%al,%0 ; " "1: " "# atomic_cmpset_int" - : "+a" (res) /* 0 (result) */ - : "r" (src), /* 1 */ - "m" (*(dst)) /* 2 */ - : "memory"); + : "+a" (res), /* 0 (result) */ + "=m" (*dst) /* 1 */ + : "r" (src), /* 2 */ + "m" (*dst) /* 3 */ + : "memory"); return (res); } @@ -139,15 +140,16 @@ __asm __volatile ( " " __XSTRING(MPLOCKED) " " - " cmpxchgq %1,%2 ; " + " cmpxchgq %2,%1 ; " " setz %%al ; " " movzbq %%al,%0 ; " "1: " "# atomic_cmpset_long" - : "+a" (res) /* 0 (result) */ - : "r" (src), /* 1 */ - "m" (*(dst)) /* 2 */ - : "memory"); + : "+a" (res), /* 0 (result) */ + "=m" (*dst) /* 1 */ + : "r" (src), /* 2 */ + "m" (*dst) /* 3 */ + : "memory"); return (res); } @@ -185,8 +187,9 @@ \ __asm __volatile(__XSTRING(MPLOCKED) LOP \ : "=a" (res), /* 0 (result) */\ - "+m" (*p) /* 1 */ \ - : : "memory"); \ + "=m" (*p) /* 1 */ \ + : "m" (*p) /* 2 */ \ + : "memory"); \ \ return (res); \ } \ @@ -198,9 +201,9 @@ atomic_store_rel_##TYPE(volatile u_##TYPE *p, u_##TYPE v)\ { \ __asm __volatile(SOP \ - : "+m" (*p), /* 0 */ \ + : "=m" (*p), /* 0 */ \ "+r" (v) /* 1 */ \ - : : "memory"); \ + : "m" (*p)); /* 2 */ \ } \ struct __hack @@ -246,12 +249,13 @@ { u_int result; + result = 0; __asm __volatile ( - " xorl %0,%0 ; " " xchgl %1,%0 ; " "# atomic_readandclear_int" - : "=&r" (result) /* 0 (result) */ - : "m" (*addr)); /* 1 (addr) */ + : "+r" (result), /* 0 (result) */ + "=m" (*addr) /* 1 (addr) */ + : "m" (*addr)); return (result); } @@ -261,12 +265,13 @@ { u_long result; + result = 0; __asm __volatile ( - " xorq %0,%0 ; " " xchgq %1,%0 ; " "# atomic_readandclear_long" - : "=&r" (result) /* 0 (result) */ - : "m" (*addr)); /* 1 (addr) */ + : "+r" (result), /* 0 (result) */ + "=m" (*addr) /* 1 (addr) */ + : "m" (*addr)); return (result); } ==== //depot/projects/wifi/sys/boot/pc98/boot2/io.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.8 2005/05/10 12:02:14 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/boot2/io.c,v 1.9 2005/09/14 12:39:06 nyan Exp $"); #include "boot.h" #include <machine/cpufunc.h> @@ -354,7 +354,6 @@ int ret; int i; int data = 0; - u_char epson_machine_id = *(unsigned char *)V(0xA1624); /* PC98_SYSTEM_PARAMETER(0x501) */ ret = ((*(unsigned char*)V(0xA1501)) & 0x08) >> 3; @@ -390,18 +389,8 @@ } else { ret |= M_NOT_H98; } - } else { + } else ret |= M_NOT_H98; - switch (epson_machine_id) { - case 0x20: /* note A */ - case 0x22: /* note W */ - case 0x27: /* note AE */ - case 0x2a: /* note WR */ - ret |= M_NOTE; - break; - default: - break; - } - } + (*(unsigned long *)V(0xA1620)) = ret; } ==== //depot/projects/wifi/sys/conf/NOTES#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1328 2005/07/27 21:47:55 pjd Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1329 2005/09/15 13:28:33 phk Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1999,13 +1999,17 @@ # # IEEE-488 hardware: -# pcii: PCIIA cards (uPD7210 based isa cards) +# pcii: PCIIA cards (uPD7210 based isa cards) +# tnt4882: National Instruments PCI-GPIB card. + device pcii hint.pcii.0.at="isa" hint.pcii.0.port="0x2e1" hint.pcii.0.irq="5" hint.pcii.0.drq="1" +device tnt4882 + # # Miscellaneous hardware: # ==== //depot/projects/wifi/sys/conf/files#32 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1047 2005/09/11 03:38:18 obrien Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1048 2005/09/15 13:28:33 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -650,9 +650,12 @@ dev/ida/ida_pci.c optional ida pci dev/ie/if_ie.c optional ie isa nowerror dev/ie/if_ie_isa.c optional ie isa -dev/ieee488/ibfoo.c optional pcii -dev/ieee488/pcii.c optional pcii +dev/ieee488/ibfoo.c optional pcii +dev/ieee488/ibfoo.c optional tnt4882 +dev/ieee488/pcii.c optional pcii +dev/ieee488/tnt4882.c optional tnt4882 dev/ieee488/upd7210.c optional pcii +dev/ieee488/upd7210.c optional tnt4882 dev/iicbus/if_ic.c optional ic dev/iicbus/iic.c optional iic dev/iicbus/iicbb.c optional iicbb ==== //depot/projects/wifi/sys/dev/aac/aac.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.109 2005/06/01 07:11:17 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.110 2005/09/14 05:46:28 scottl Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -925,7 +925,7 @@ cm->cm_datalen = bp->bio_bcount; cm->cm_complete = aac_bio_complete; cm->cm_private = bp; - cm->cm_timestamp = time_second; + cm->cm_timestamp = time_uptime; cm->cm_queue = AAC_ADAP_NORM_CMD_QUEUE; /* build the FIB */ @@ -1426,7 +1426,7 @@ /* * First wait for the adapter to come ready. */ - then = time_second; + then = time_uptime; do { code = AAC_GET_FWSTATUS(sc); if (code & AAC_SELF_TEST_FAILED) { @@ -1438,7 +1438,7 @@ "FATAL: controller kernel panic\n"); return(ENXIO); } - if (time_second > (then + AAC_BOOT_TIMEOUT)) { + if (time_uptime > (then + AAC_BOOT_TIMEOUT)) { device_printf(sc->aac_dev, "FATAL: controller not coming ready, " "status %x\n", code); @@ -1573,7 +1573,7 @@ ip->HostPhysMemPages = (ip->HostPhysMemPages + AAC_PAGE_SIZE) / AAC_PAGE_SIZE; } - ip->HostElapsedSeconds = time_second; /* reset later if invalid */ + ip->HostElapsedSeconds = time_uptime; /* reset later if invalid */ /* * Initialise FIB queues. Note that it appears that the layout of the @@ -1701,9 +1701,9 @@ AAC_QNOTIFY(sc, AAC_DB_SYNC_COMMAND); /* spin waiting for the command to complete */ - then = time_second; + then = time_uptime; do { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509162041.j8GKfsBj020699>