CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: dholland Date: Fri Aug 28 01:39:03 UTC 2009 Modified Files: src/sys/compat/linux/common: linux_uselib.c Log Message: Another one that needs . To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/compat/linux/common/linux_uselib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/common/linux_uselib.c diff -u src/sys/compat/linux/common/linux_uselib.c:1.29 src/sys/compat/linux/common/linux_uselib.c:1.30 --- src/sys/compat/linux/common/linux_uselib.c:1.29 Sat Aug 15 23:39:35 2009 +++ src/sys/compat/linux/common/linux_uselib.c Fri Aug 28 01:39:03 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_uselib.c,v 1.29 2009/08/15 23:39:35 matt Exp $ */ +/* $NetBSD: linux_uselib.c,v 1.30 2009/08/28 01:39:03 dholland Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.29 2009/08/15 23:39:35 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_uselib.c,v 1.30 2009/08/28 01:39:03 dholland Exp $"); #include #include @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -48,11 +49,6 @@ #include #include -#ifndef EXEC_AOUT -/* define EXEC_AOUT to get prototype from linux_syscall.h */ -#define EXEC_AOUT -#endif - #include #include #include @@ -61,6 +57,11 @@ #include #include +#ifndef EXEC_AOUT +/* define EXEC_AOUT to get prototype from linux_syscall.h */ +#define EXEC_AOUT +#endif + #include #include
CVS commit: [matt-nb5-mips64] src
Module Name:src Committed By: matt Date: Thu Aug 27 22:48:36 UTC 2009 Modified Files: src/bin [matt-nb5-mips64]: Makefile.inc src/sbin [matt-nb5-mips64]: Makefile.inc Log Message: Change LDSTATIC?= -static to LDSTATIC+= -static so MKDYNAMICROOT=no works again. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.15.32.1 src/bin/Makefile.inc cvs rdiff -u -r1.20 -r1.20.32.1 src/sbin/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/Makefile.inc diff -u src/bin/Makefile.inc:1.15 src/bin/Makefile.inc:1.15.32.1 --- src/bin/Makefile.inc:1.15 Sun Jun 26 19:10:48 2005 +++ src/bin/Makefile.inc Thu Aug 27 22:48:36 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.15 2005/06/26 19:10:48 christos Exp $ +# $NetBSD: Makefile.inc,v 1.15.32.1 2009/08/27 22:48:36 matt Exp $ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 .include # for MKDYNAMICROOT definition @@ -7,5 +7,5 @@ BINDIR?= /bin .if (${MKDYNAMICROOT} == "no") -LDSTATIC?= -static +LDSTATIC+= -static .endif Index: src/sbin/Makefile.inc diff -u src/sbin/Makefile.inc:1.20 src/sbin/Makefile.inc:1.20.32.1 --- src/sbin/Makefile.inc:1.20 Sun Oct 8 17:52:28 2006 +++ src/sbin/Makefile.inc Thu Aug 27 22:48:36 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.20 2006/10/08 17:52:28 peter Exp $ +# $NetBSD: Makefile.inc,v 1.20.32.1 2009/08/27 22:48:36 matt Exp $ # @(#)Makefile.inc 8.1 (Berkeley) 6/8/93 .include # for MKDYNAMICROOT definition @@ -7,5 +7,5 @@ BINDIR?= /sbin .if (${MKDYNAMICROOT} == "no") -LDSTATIC?= -static +LDSTATIC+= -static .endif
CVS commit: src/sys/arch/sparc/dev
Module Name:src Committed By: macallan Date: Thu Aug 27 20:52:18 UTC 2009 Modified Files: src/sys/arch/sparc/dev: cgfourteen.c Log Message: use vcons_replay_msgbuf() To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/sparc/dev/cgfourteen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/dev/cgfourteen.c diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.61 src/sys/arch/sparc/dev/cgfourteen.c:1.62 --- src/sys/arch/sparc/dev/cgfourteen.c:1.61 Tue Jul 14 20:57:22 2009 +++ src/sys/arch/sparc/dev/cgfourteen.c Thu Aug 27 20:52:18 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cgfourteen.c,v 1.61 2009/07/14 20:57:22 apb Exp $ */ +/* $NetBSD: cgfourteen.c,v 1.62 2009/08/27 20:52:18 macallan Exp $ */ /* * Copyright (c) 1996 @@ -834,6 +834,7 @@ sc->sc_defaultscreen_descr.ncols = ri->ri_cols; wsdisplay_cnattach(&sc->sc_defaultscreen_descr, ri, 0, 0, defattr); + vcons_replay_msgbuf(&sc->sc_console_screen); } else { /* * since we're not the console we can postpone the rest
CVS commit: src/sys/dev/ic
Module Name:src Committed By: dyoung Date: Thu Aug 27 20:24:16 UTC 2009 Modified Files: src/sys/dev/ic: tulip.c Log Message: Use *_FOREACH() routines instead of open-coding them. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/sys/dev/ic/tulip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/tulip.c diff -u src/sys/dev/ic/tulip.c:1.169 src/sys/dev/ic/tulip.c:1.170 --- src/sys/dev/ic/tulip.c:1.169 Fri Apr 17 15:22:35 2009 +++ src/sys/dev/ic/tulip.c Thu Aug 27 20:24:16 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: tulip.c,v 1.169 2009/04/17 15:22:35 cegger Exp $ */ +/* $NetBSD: tulip.c,v 1.170 2009/08/27 20:24:16 dyoung Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.169 2009/04/17 15:22:35 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.170 2009/08/27 20:24:16 dyoung Exp $"); #include "bpfilter.h" @@ -4033,8 +4033,7 @@ #define PRINT(str) printf("%s%s", sep, str); sep = ", " printf("%s: ", device_xname(sc->sc_dev)); - for (ife = TAILQ_FIRST(&sc->sc_mii.mii_media.ifm_list); - ife != NULL; ife = TAILQ_NEXT(ife, ifm_list)) { + TAILQ_FOREACH(ife, &sc->sc_mii.mii_media.ifm_list, ifm_list) { tm = ife->ifm_aux; if (tm == NULL) { #ifdef DIAGNOSTIC @@ -4211,8 +4210,7 @@ return; } - for (ife = TAILQ_FIRST(&sc->sc_mii.mii_media.ifm_list); - ife != NULL; ife = TAILQ_NEXT(ife, ifm_list)) { + TAILQ_FOREACH(ife, &sc->sc_mii.mii_media.ifm_list, ifm_list) { tm = ife->ifm_aux; if (tm == NULL) continue; @@ -4833,11 +4831,10 @@ * kernel, we lose. The PHY's default media always * takes priority. */ - for (phy = LIST_FIRST(&sc->sc_mii.mii_phys); - phy != NULL; - phy = LIST_NEXT(phy, mii_list)) + LIST_FOREACH(phy, &sc->sc_mii.mii_phys, mii_list) { if (phy->mii_offset == tm->tm_phyno) break; + } if (phy == NULL) { aprint_error_dev(sc->sc_dev, "unable to configure MII\n"); break; @@ -4858,9 +4855,8 @@ * We do this by looking for media with our * PHY's `instance'. */ - for (ife = TAILQ_FIRST(&sc->sc_mii.mii_media.ifm_list); - ife != NULL; - ife = TAILQ_NEXT(ife, ifm_list)) { + TAILQ_FOREACH(ife, &sc->sc_mii.mii_media.ifm_list, + ifm_list) { if (IFM_INST(ife->ifm_media) != phy->mii_inst) continue; ife->ifm_aux = tm; @@ -4990,11 +4986,10 @@ * kernel, we lose. The PHY's default media always * takes priority. */ - for (phy = LIST_FIRST(&sc->sc_mii.mii_phys); - phy != NULL; - phy = LIST_NEXT(phy, mii_list)) + LIST_FOREACH(phy, &sc->sc_mii.mii_phys, mii_list) { if (phy->mii_offset == tm->tm_phyno) break; + } if (phy == NULL) { aprint_error_dev(sc->sc_dev, "unable to configure MII\n"); break; @@ -5015,9 +5010,8 @@ * We do this by looking for media with our * PHY's `instance'. */ - for (ife = TAILQ_FIRST(&sc->sc_mii.mii_media.ifm_list); - ife != NULL; - ife = TAILQ_NEXT(ife, ifm_list)) { + TAILQ_FOREACH(ife, &sc->sc_mii.mii_media.ifm_list, + ifm_list) { if (IFM_INST(ife->ifm_media) != phy->mii_inst) continue; ife->ifm_aux = tm;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: dyoung Date: Thu Aug 27 20:23:32 UTC 2009 Modified Files: src/sys/dev/ic: tulipreg.h Log Message: Make descriptors packed w/ 4-byte alignment. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/dev/ic/tulipreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/tulipreg.h diff -u src/sys/dev/ic/tulipreg.h:1.34 src/sys/dev/ic/tulipreg.h:1.35 --- src/sys/dev/ic/tulipreg.h:1.34 Mon Apr 28 20:23:51 2008 +++ src/sys/dev/ic/tulipreg.h Thu Aug 27 20:23:32 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: tulipreg.h,v 1.34 2008/04/28 20:23:51 martin Exp $ */ +/* $NetBSD: tulipreg.h,v 1.35 2009/08/27 20:23:32 dyoung Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -158,7 +158,7 @@ volatile u_int32_t td_ctl; /* Control and Byte Counts */ volatile u_int32_t td_bufaddr1; /* Buffer Address 1 */ volatile u_int32_t td_bufaddr2; /* Buffer Address 2 */ -}; +} __packed __aligned(4); /* * Descriptor Status bits common to transmit and receive.
CVS commit: src/usr.sbin/sti
Module Name:src Committed By: christos Date: Thu Aug 27 19:40:06 UTC 2009 Modified Files: src/usr.sbin/sti: sti.c Log Message: port to non NetBSD systems. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/sti/sti.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sti/sti.c diff -u src/usr.sbin/sti/sti.c:1.7 src/usr.sbin/sti/sti.c:1.8 --- src/usr.sbin/sti/sti.c:1.7 Mon Apr 28 16:24:17 2008 +++ src/usr.sbin/sti/sti.c Thu Aug 27 15:40:06 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: sti.c,v 1.7 2008/04/28 20:24:17 martin Exp $ */ +/* $NetBSD: sti.c,v 1.8 2009/08/27 19:40:06 christos Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -29,7 +29,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__RCSID("$NetBSD: sti.c,v 1.7 2008/04/28 20:24:17 martin Exp $"); +#ifdef __RCSID +__RCSID("$NetBSD: sti.c,v 1.8 2009/08/27 19:40:06 christos Exp $"); +#endif #include #include @@ -40,14 +42,21 @@ #include #include #include -#include #include +#ifdef __RCSID +#include +#else +#define setprogname(a) +extern const char *__progname; +#define getprogname() __progname +#endif static int unescape(const char **pp, int *state) { char ch, out; +#ifdef __RCSID while ((ch = *(*pp)++) != '\0') { switch(unvis(&out, ch, state, 0)) { case 0: @@ -65,6 +74,48 @@ } if (unvis(&out, '\0', state, UNVIS_END) == UNVIS_VALID) return out; +#else + switch ((ch = *(*pp)++)) { + case '\0': + goto out; + case '^': + ch = *(*pp)++; + return CTRL(ch); + case '\\': + switch (ch = *(*pp)++) { + case 'a': return '\a'; + case 'b': return '\b'; + case 'e': return '\e'; + case 'f': return '\f'; + case 't': return '\t'; + case 'n': return '\n'; + case 'r': return '\r'; + case 'v': return '\v'; + case '\\': return '\\'; + + case '0': case '1': case '2': case '3': + case '4': case '5': case '6': case '7': + out = 0; + if (ch >= '0' && ch < '8') { +out = out * 8 + ch - '0'; +ch = *(*pp)++; +if (ch >= '0' && ch < '8') { + out = out * 8 + ch - '0'; + ch = *(*pp)++; + if (ch >= '0' && ch < '8') + out = out * 8 + ch - '0'; +} + } + return out; + default: + break; + } + break; + default: + return ch; + } +out: +#endif errno = ENODATA; return -1; } @@ -127,10 +178,21 @@ if (argc == 0) { char *line; +#ifndef __RCSID + line = malloc(10240); + while (fgets(line, 10240, stdin) != NULL) { + char *p; + if ((p = strrchr(line, '\n')) != NULL) +*p = '\0'; + sendstr(fd, line); + } + free(line); +#else while ((line = fparseln(stdin, NULL, NULL, NULL, 0)) != NULL) { sendstr(fd, line); free(line); } +#endif } else { for (; argc--; argv++) { sendstr(fd, *argv);
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/include
Module Name:src Committed By: matt Date: Thu Aug 27 17:47:30 UTC 2009 Modified Files: src/sys/arch/mips/include [matt-nb5-mips64]: signal.h Log Message: For the kernel (since we only use it in compability with O32) define sigcontext with ints. For libc, define the way we want to use it for jmpbuf since that will be the only consumer of it. To generate a diff of this commit: cvs rdiff -u -r1.27.92.2 -r1.27.92.3 src/sys/arch/mips/include/signal.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/signal.h diff -u src/sys/arch/mips/include/signal.h:1.27.92.2 src/sys/arch/mips/include/signal.h:1.27.92.3 --- src/sys/arch/mips/include/signal.h:1.27.92.2 Sun Aug 23 04:04:35 2009 +++ src/sys/arch/mips/include/signal.h Thu Aug 27 17:47:30 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: signal.h,v 1.27.92.2 2009/08/23 04:04:35 matt Exp $ */ +/* $NetBSD: signal.h,v 1.27.92.3 2009/08/27 17:47:30 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -75,9 +75,9 @@ struct sigcontext13 { int sc_onstack; /* sigstack state to restore */ int sc_mask; /* signal mask to restore (old style) */ - mips_reg_t sc_pc; /* pc at time of signal */ - mips_reg_t sc_regs[32]; /* processor regs 0 to 31 */ - mips_reg_t mullo, mulhi;/* mullo and mulhi registers... */ + int sc_pc; /* pc at time of signal */ + int sc_regs[32]; /* processor regs 0 to 31 */ + int mullo, mulhi; /* mullo and mulhi registers... */ int sc_fpused; /* fp has been used */ int sc_fpregs[33]; /* fp regs 0 to 31 and csr */ int sc_fpc_eir; /* floating point exception instruction reg */ @@ -89,18 +89,32 @@ /* * Only need an O32 version. */ -struct sigcontext { - int sc_onstack; /* sigstack state to restore */ - int __sc_mask13; /* signal mask to restore (old style) */ - int sc_pc; /* pc at time of signal */ - int sc_regs[32]; /* processor regs 0 to 31 */ - int mullo, mulhi; /* mullo and mulhi registers... */ - int sc_fpused; /* fp has been used */ - int sc_fpregs[33]; /* fp regs 0 to 31 and csr */ - int sc_fpc_eir; /* floating point exception instruction reg */ - int sc_xxx[8]; /* XXX reserved */ - sigset_t sc_mask; /* signal mask to restore (new style) */ -}; +#define _SIGCONTEXT_DEFINE(_name, _reg_t, _fp_t) \ +struct sigcontext { \ + int sc_onstack; /* sigstack state to restore */ \ + int __sc_mask13; /* signal mask to restore (old style) */ \ + _reg_t sc_pc; /* pc at time of signal */ \ + _reg_t sc_regs[32]; /* processor regs 0 to 31 */ \ + _reg_t mullo, mulhi; /* mullo and mulhi registers... */ \ + int sc_fpused; /* fp has been used */ \ + _fp_t sc_fpregs[33]; /* fp regs 0 to 31 and csr */ \ + int sc_fpc_eir; /* floating point exception instruction reg */ \ + int sc_xxx[8]; /* XXX reserved */ \ + sigset_t sc_mask; /* signal mask to restore (new style) */ \ +} + +/* + * These will be identical in O32 + */ +#ifdef _KERNEL +/* + * We need this only compatibility. + */ +_SIGCONTEXT_DEFINE(sigcontext, int, int); +#endif +#ifdef _LIBC +_SIGCONTEXT_DEFINE(sigcontext, register_t, fpregister_t); +#endif #endif /* _LIBC || _KERNEL */
CVS commit: [matt-nb5-mips64] src/lib/libc/arch/mips
Module Name:src Committed By: matt Date: Thu Aug 27 16:51:27 UTC 2009 Modified Files: src/lib/libc/arch/mips [matt-nb5-mips64]: Makefile.inc Added Files: src/lib/libc/arch/mips/softfloat [matt-nb5-mips64]: milieu.h mips-gcc.h softfloat.h Log Message: Add MKSOFTFLOAT support for mips and mips64. Some more work is needed to complete support FLOAT128. To generate a diff of this commit: cvs rdiff -u -r1.8.34.1 -r1.8.34.2 src/lib/libc/arch/mips/Makefile.inc cvs rdiff -u -r0 -r1.1.2.1 src/lib/libc/arch/mips/softfloat/milieu.h \ src/lib/libc/arch/mips/softfloat/mips-gcc.h \ src/lib/libc/arch/mips/softfloat/softfloat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/arch/mips/Makefile.inc diff -u src/lib/libc/arch/mips/Makefile.inc:1.8.34.1 src/lib/libc/arch/mips/Makefile.inc:1.8.34.2 --- src/lib/libc/arch/mips/Makefile.inc:1.8.34.1 Sun Aug 16 03:36:02 2009 +++ src/lib/libc/arch/mips/Makefile.inc Thu Aug 27 16:51:27 2009 @@ -1,6 +1,11 @@ -# $NetBSD: Makefile.inc,v 1.8.34.1 2009/08/16 03:36:02 matt Exp $ +# $NetBSD: Makefile.inc,v 1.8.34.2 2009/08/27 16:51:27 matt Exp $ SRCS+= __sigaction14_sigtramp.c __sigtramp2.S CPPFLAGS+= -I. CPPFLAGS.assym.h+=-D__LIBC12_SOURCE__ + +.if ${MKSOFTFLOAT} != "no" +.include +CPPFLAGS+= -DSOFTFLOAT_NEED_FIXUNS +.endif Added files: Index: src/lib/libc/arch/mips/softfloat/milieu.h diff -u /dev/null src/lib/libc/arch/mips/softfloat/milieu.h:1.1.2.1 --- /dev/null Thu Aug 27 16:51:27 2009 +++ src/lib/libc/arch/mips/softfloat/milieu.h Thu Aug 27 16:51:27 2009 @@ -0,0 +1,48 @@ +/* $NetBSD: milieu.h,v 1.1.2.1 2009/08/27 16:51:27 matt Exp $ */ + +/* +=== + +This C header file is part of the SoftFloat IEC/IEEE Floating-point +Arithmetic Package, Release 2a. + +Written by John R. Hauser. This work was made possible in part by the +International Computer Science Institute, located at Suite 600, 1947 Center +Street, Berkeley, California 94704. Funding was partially provided by the +National Science Foundation under grant MIP-9311980. The original version +of this code was written as part of a project to build a fixed-point vector +processor in collaboration with the University of California at Berkeley, +overseen by Profs. Nelson Morgan and John Wawrzynek. More information +is available through the Web page `http://HTTP.CS.Berkeley.EDU/~jhauser/ +arithmetic/SoftFloat.html'. + +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ANY +AND ALL LOSSES, COSTS, OR OTHER PROBLEMS ARISING FROM ITS USE. + +Derivative works are acceptable, even for commercial purposes, so long as +(1) they include prominent notice that the work is derivative, and (2) they +include prominent notice akin to these four paragraphs for those parts of +this code that are retained. + +=== +*/ + +/* +--- +Include common integer types and flags. +--- +*/ +#include "mips-gcc.h" + +/* +--- +Symbolic Boolean literals. +--- +*/ +enum { +FALSE = 0, +TRUE = 1 +}; Index: src/lib/libc/arch/mips/softfloat/mips-gcc.h diff -u /dev/null src/lib/libc/arch/mips/softfloat/mips-gcc.h:1.1.2.1 --- /dev/null Thu Aug 27 16:51:27 2009 +++ src/lib/libc/arch/mips/softfloat/mips-gcc.h Thu Aug 27 16:51:27 2009 @@ -0,0 +1,95 @@ +/* $NetBSD: mips-gcc.h,v 1.1.2.1 2009/08/27 16:51:27 matt Exp $ */ + +/* +--- +One of the macros `BIGENDIAN' or `LITTLEENDIAN' must be defined. +--- +*/ +#ifdef __MIPSEB__ +#define BIGENDIAN +#else +#define LITTLEENDIAN +#endif + +/* +--- +The macro `BITS64' can be defined to indicate that 64-bit integer types are +supported by the compiler. +--- +*/ +#define BITS64 + +/* +--- +Each of the following `typedef's defines the most convenient type that holds +integers of at least as many bits as specified. For example, `uint8' should +be the most convenient type that can hold unsigned integers of a
CVS commit: src/sys/dev/ic
Module Name:src Committed By: tsutsui Date: Thu Aug 27 16:02:26 UTC 2009 Modified Files: src/sys/dev/ic: rtl8169.c Log Message: Remove an unnecessary assignment. No binary change. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/sys/dev/ic/rtl8169.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/rtl8169.c diff -u src/sys/dev/ic/rtl8169.c:1.121 src/sys/dev/ic/rtl8169.c:1.122 --- src/sys/dev/ic/rtl8169.c:1.121 Sun May 31 05:10:47 2009 +++ src/sys/dev/ic/rtl8169.c Thu Aug 27 16:02:26 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rtl8169.c,v 1.121 2009/05/31 05:10:47 tsutsui Exp $ */ +/* $NetBSD: rtl8169.c,v 1.122 2009/08/27 16:02:26 tsutsui Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.121 2009/05/31 05:10:47 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.122 2009/08/27 16:02:26 tsutsui Exp $"); /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */ /* @@ -1636,12 +1636,9 @@ BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); } if (__predict_false(pad)) { - bus_addr_t paddaddr; - d = &sc->re_ldata.re_tx_list[curdesc]; d->re_vlanctl = htole32(vlanctl); - paddaddr = RE_TXPADDADDR(sc); - re_set_bufaddr(d, paddaddr); + re_set_bufaddr(d, RE_TXPADDADDR(sc)); cmdstat = re_flags | RE_TDESC_CMD_OWN | RE_TDESC_CMD_EOF | (RE_IP4CSUMTX_PADLEN + 1 - m->m_pkthdr.len);
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Thu Aug 27 14:29:22 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Minor tweaks for www changes page: - add man page suffixes - fix indent (use tab, not space) - adjust a theme To generate a diff of this commit: cvs rdiff -u -r1.1280 -r1.1281 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1280 src/doc/CHANGES:1.1281 --- src/doc/CHANGES:1.1280 Thu Aug 27 04:17:50 2009 +++ src/doc/CHANGES Thu Aug 27 14:29:22 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1280 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1281 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -277,7 +277,7 @@ [skrll 20090508] dhcpcd(8): Import dhcpcd-5.0.2 [roy 20090510] dhcpcd(8): Import dhcpcd-5.0.3 [roy 20090511] - bluetooth: Update the Bluetooth service discovery API and merge it + bluetooth(3): Update the Bluetooth service discovery API and merge it into libbluetooth, retiring the separate libsdp. [plunky 20090512] dhcpcd(8): Import dhcpcd-5.0.4 [roy 20090514] @@ -328,7 +328,7 @@ of the received datagram. [minskim 20090716] ip(4): Add IP_MINTTL option to discard packets with a TTL lower than the option value. [minskim 20090717] - openssl: Import SNAP-20090710 under the new crypto/external + openssl(1): Import SNAP-20090710 under the new crypto/external framework [christos 20090719] gpio(4): Complete rework to integrate with kauth(9), allow for runtime driver attachment, naming of individual pins. @@ -354,16 +354,16 @@ types are enabled as wakeup devices if the firmware supports it: lid switch, sleep/power button, PC keyboard controller. [jmcneill 20090804] - openssl: Import SNAP-20090805 to fix the namespace issues + openssl(1): Import SNAP-20090805 to fix the namespace issues (BLOCK, CSTRING, etc) [christos 20090805] tcx(8): support wsdisplay and acceleration [macallan 20090806] zfs: Import OpenSolaris zfs source code to NetBSD, add NetBSD - patches. [haad 20090808] + patches. [haad 20090808] gpioiic(4): New driver to create an I2C bus using GPIO pins in bit-banging mode. [mbalmer 20090809] voyagerfb(8): a driver for the Gdium Liberty 1000's video controller [macallan 20090812] - mips a.out support: removed [matt 20090812] + mips: removed a.out support [matt 20090812] secmode_keylock, keylock, gpiolock(4): Add support for multi-position keylocks. [mbalmer 20090814] nbperf(1): A minimal perfect hash function generator. [joerg 20090815]
CVS commit: src/sys/dev/ic
Module Name:src Committed By: bouyer Date: Thu Aug 27 09:40:39 UTC 2009 Modified Files: src/sys/dev/ic: mfi.c Log Message: Oups, remove extra } To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/mfi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/mfi.c diff -u src/sys/dev/ic/mfi.c:1.28 src/sys/dev/ic/mfi.c:1.29 --- src/sys/dev/ic/mfi.c:1.28 Wed Aug 26 21:41:05 2009 +++ src/sys/dev/ic/mfi.c Thu Aug 27 09:40:39 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mfi.c,v 1.28 2009/08/26 21:41:05 bouyer Exp $ */ +/* $NetBSD: mfi.c,v 1.29 2009/08/27 09:40:39 bouyer Exp $ */ /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */ /* * Copyright (c) 2006 Marco Peereboom @@ -17,7 +17,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.28 2009/08/26 21:41:05 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.29 2009/08/27 09:40:39 bouyer Exp $"); #include "bio.h" @@ -2042,7 +2042,6 @@ KERNEL_LOCK(1, curlwp); s = splbio(); error = mfi_ioctl_vol(sc, &bv); - } splx(s); KERNEL_UNLOCK_ONE(curlwp); if (error)
CVS commit: src/sys/sys
Module Name:src Committed By: mouse Date: Thu Aug 27 07:28:42 UTC 2009 Modified Files: src/sys/sys: stat.h Log Message: Parenthesize S_IS*() macro arguments to prevent breakage with certain arguments - see PR 41919. Approved by dholland. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/sys/stat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/stat.h diff -u src/sys/sys/stat.h:1.58 src/sys/sys/stat.h:1.59 --- src/sys/sys/stat.h:1.58 Sun Jan 11 02:45:55 2009 +++ src/sys/sys/stat.h Thu Aug 27 07:28:42 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: stat.h,v 1.58 2009/01/11 02:45:55 christos Exp $ */ +/* $NetBSD: stat.h,v 1.59 2009/08/27 07:28:42 mouse Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -148,21 +148,21 @@ #define S_ARCH2 _S_ARCH2 #endif -#define S_ISDIR(m) ((m & _S_IFMT) == _S_IFDIR) /* directory */ -#define S_ISCHR(m) ((m & _S_IFMT) == _S_IFCHR) /* char special */ -#define S_ISBLK(m) ((m & _S_IFMT) == _S_IFBLK) /* block special */ -#define S_ISREG(m) ((m & _S_IFMT) == _S_IFREG) /* regular file */ -#define S_ISFIFO(m) ((m & _S_IFMT) == _S_IFIFO) /* fifo */ +#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR) /* directory */ +#define S_ISCHR(m) (((m) & _S_IFMT) == _S_IFCHR) /* char special */ +#define S_ISBLK(m) (((m) & _S_IFMT) == _S_IFBLK) /* block special */ +#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG) /* regular file */ +#define S_ISFIFO(m) (((m) & _S_IFMT) == _S_IFIFO) /* fifo */ #if ((_POSIX_C_SOURCE - 0) >= 200112L) || defined(_XOPEN_SOURCE) || \ defined(_NETBSD_SOURCE) -#define S_ISLNK(m) ((m & _S_IFMT) == _S_IFLNK) /* symbolic link */ +#define S_ISLNK(m) (((m) & _S_IFMT) == _S_IFLNK) /* symbolic link */ #endif #if ((_POSIX_C_SOURCE - 0) >= 200112L) || ((_XOPEN_SOURCE - 0) >= 600) || \ defined(_NETBSD_SOURCE) -#define S_ISSOCK(m) ((m & _S_IFMT) == _S_IFSOCK) /* socket */ +#define S_ISSOCK(m) (((m) & _S_IFMT) == _S_IFSOCK) /* socket */ #endif #if defined(_NETBSD_SOURCE) -#define S_ISWHT(m) ((m & _S_IFMT) == _S_IFWHT) /* whiteout */ +#define S_ISWHT(m) (((m) & _S_IFMT) == _S_IFWHT) /* whiteout */ #endif #if defined(_NETBSD_SOURCE)