CVS commit: src/sys/arch/acorn32/eb7500atx
Module Name:src
Committed By: cegger
Date: Tue May 12 06:57:51 UTC 2009
Modified Files:
src/sys/arch/acorn32/eb7500atx: if_cs.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/acorn32/eb7500atx/if_cs.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/acorn32/eb7500atx/if_cs.c
diff -u src/sys/arch/acorn32/eb7500atx/if_cs.c:1.4 src/sys/arch/acorn32/eb7500atx/if_cs.c:1.5
--- src/sys/arch/acorn32/eb7500atx/if_cs.c:1.4 Sun Dec 11 12:16:05 2005
+++ src/sys/arch/acorn32/eb7500atx/if_cs.c Tue May 12 06:57:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cs.c,v 1.4 2005/12/11 12:16:05 christos Exp $ */
+/* $NetBSD: if_cs.c,v 1.5 2009/05/12 06:57:51 cegger Exp $ */
/*
* Copyright (c) 2004 Christopher Gilbert
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.4 2005/12/11 12:16:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cs.c,v 1.5 2009/05/12 06:57:51 cegger Exp $");
#include
#include
@@ -171,7 +171,7 @@
iobase = 0x03010600;
if (bus_space_map(sc->sc_iot, iobase, CS8900_IOSIZE * 4,
0, &sc->sc_ioh)) {
- printf("%s: unable to map i/o space\n", sc->sc_dev.dv_xname);
+ printf("%s: unable to map i/o space\n", device_xname(&sc->sc_dev));
return;
}
@@ -179,7 +179,7 @@
if (bus_space_map(sc->sc_memt, iobase + 0x3A00,
CS8900_MEMSIZE * 4, 0, &sc->sc_memh)) {
printf("%s: unable to map memory space\n",
- sc->sc_dev.dv_xname);
+ device_xname(&sc->sc_dev));
} else {
sc->sc_cfgflags |= CFGFLG_MEM_MODE | CFGFLG_USE_SA;
sc->sc_pktpgaddr = 1<<23;
@@ -189,7 +189,7 @@
sc->sc_ih = intr_claim(IRQ_INT5, IPL_NET, "cs", cs_intr, sc);
if (sc->sc_ih == NULL) {
printf("%s: unable to establish interrupt\n",
- sc->sc_dev.dv_xname);
+ device_xname(&sc->sc_dev));
return;
}
CVS commit: src/sys/arch/acorn32/acorn32
Module Name:src
Committed By: cegger
Date: Tue May 12 06:57:00 UTC 2009
Modified Files:
src/sys/arch/acorn32/acorn32: autoconf.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/acorn32/acorn32/autoconf.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/acorn32/acorn32/autoconf.c
diff -u src/sys/arch/acorn32/acorn32/autoconf.c:1.15 src/sys/arch/acorn32/acorn32/autoconf.c:1.16
--- src/sys/arch/acorn32/acorn32/autoconf.c:1.15 Sun Mar 15 22:18:35 2009
+++ src/sys/arch/acorn32/acorn32/autoconf.c Tue May 12 06:56:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.15 2009/03/15 22:18:35 cegger Exp $ */
+/* $NetBSD: autoconf.c,v 1.16 2009/05/12 06:56:59 cegger Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.15 2009/03/15 22:18:35 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.16 2009/05/12 06:56:59 cegger Exp $");
#include "opt_md.h"
@@ -135,7 +135,7 @@
set_root_device();
printf("boot device: %s\n",
- booted_device != NULL ? booted_device->dv_xname : "");
+ booted_device != NULL ? device_xname(booted_device) : "");
#endif
setroot(booted_device, booted_partition);
}
CVS commit: src/sys/arch/acorn32/podulebus
Module Name:src
Committed By: cegger
Date: Tue May 12 06:54:11 UTC 2009
Modified Files:
src/sys/arch/acorn32/podulebus: asc.c cosc.c csc.c icside.c if_ie.c
podulebus.c ptsc.c sbic.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/acorn32/podulebus/asc.c \
src/sys/arch/acorn32/podulebus/cosc.c \
src/sys/arch/acorn32/podulebus/csc.c \
src/sys/arch/acorn32/podulebus/ptsc.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/acorn32/podulebus/icside.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/acorn32/podulebus/podulebus.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/acorn32/podulebus/sbic.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/acorn32/podulebus/asc.c
diff -u src/sys/arch/acorn32/podulebus/asc.c:1.15 src/sys/arch/acorn32/podulebus/asc.c:1.16
--- src/sys/arch/acorn32/podulebus/asc.c:1.15 Thu Jun 12 23:22:36 2008
+++ src/sys/arch/acorn32/podulebus/asc.c Tue May 12 06:54:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: asc.c,v 1.15 2008/06/12 23:22:36 cegger Exp $ */
+/* $NetBSD: asc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $ */
/*
* Copyright (c) 2001 Richard Earnshaw
@@ -98,7 +98,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.15 2008/06/12 23:22:36 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $");
#include
#include
@@ -268,7 +268,7 @@
#endif
{
evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL,
- dp->dv_xname, "intr");
+ device_xname(dp), "intr");
sc->sc_ih = podulebus_irq_establish(pa->pa_ih, IPL_BIO,
asc_intr, sc, &sc->sc_intrcnt);
if (sc->sc_ih == NULL)
Index: src/sys/arch/acorn32/podulebus/cosc.c
diff -u src/sys/arch/acorn32/podulebus/cosc.c:1.15 src/sys/arch/acorn32/podulebus/cosc.c:1.16
--- src/sys/arch/acorn32/podulebus/cosc.c:1.15 Sat Mar 14 21:04:01 2009
+++ src/sys/arch/acorn32/podulebus/cosc.c Tue May 12 06:54:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cosc.c,v 1.15 2009/03/14 21:04:01 dsl Exp $ */
+/* $NetBSD: cosc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.15 2009/03/14 21:04:01 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cosc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $");
#include
#include
@@ -271,7 +271,7 @@
#endif
{
evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL,
- dp->dv_xname, "intr");
+ device_xname(dp), "intr");
sc->sc_ih = podulebus_irq_establish(pa->pa_ih, IPL_BIO,
cosc_intr, sc, &sc->sc_intrcnt);
if (sc->sc_ih == NULL)
Index: src/sys/arch/acorn32/podulebus/csc.c
diff -u src/sys/arch/acorn32/podulebus/csc.c:1.15 src/sys/arch/acorn32/podulebus/csc.c:1.16
--- src/sys/arch/acorn32/podulebus/csc.c:1.15 Sat Mar 14 15:35:58 2009
+++ src/sys/arch/acorn32/podulebus/csc.c Tue May 12 06:54:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: csc.c,v 1.15 2009/03/14 15:35:58 dsl Exp $ */
+/* $NetBSD: csc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: csc.c,v 1.15 2009/03/14 15:35:58 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: csc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $");
#include
#include
@@ -184,7 +184,7 @@
#if CSC_POLL == 0
evcnt_attach_dynamic(&sc->sc_softc.sc_intrcnt, EVCNT_TYPE_INTR, NULL,
- dp->dv_xname, "intr");
+ device_xname(dp), "intr");
sc->sc_softc.sc_ih = podulebus_irq_establish(pa->pa_ih, IPL_BIO,
csc_intr, &sc->sc_softc, &sc->sc_softc.sc_intrcnt);
if (sc->sc_softc.sc_ih == NULL)
Index: src/sys/arch/acorn32/podulebus/ptsc.c
diff -u src/sys/arch/acorn32/podulebus/ptsc.c:1.15 src/sys/arch/acorn32/podulebus/ptsc.c:1.16
--- src/sys/arch/acorn32/podulebus/ptsc.c:1.15 Sat Mar 14 15:35:59 2009
+++ src/sys/arch/acorn32/podulebus/ptsc.c Tue May 12 06:54:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ptsc.c,v 1.15 2009/03/14 15:35:59 dsl Exp $ */
+/* $NetBSD: ptsc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -75,7 +75,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.15 2009/03/14 15:35:59 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptsc.c,v 1.16 2009/05/12 06:54:10 cegger Exp $");
#include
#include
@@ -225,7 +225,7 @@
#if PTSC_POLL == 0
evcnt_attach_dynamic(&sc->sc_softc.sc_intrcnt, EVCNT_TYPE_INTR, NULL,
- dp->dv_xname, "intr");
+ device_xname(dp), "intr");
sc->sc_softc.sc_ih = podulebus_irq_establish(pa->pa_ih, IPL_BIO,
ptsc_intr, &sc->sc_softc, &sc->sc_softc.sc_intrcnt);
if (sc->sc_softc.sc_ih == NULL)
Index: src/sys/arch/acorn32/podulebus/icside.c
diff -u src/sys/arch/acorn32/podulebus/icside.c:1.27 src/sys/arch/acorn32/podulebus/icsi
CVS commit: src/sys/arch/acorn26/acorn26
Module Name:src
Committed By: cegger
Date: Tue May 12 06:31:37 UTC 2009
Modified Files:
src/sys/arch/acorn26/acorn26: fpu.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/acorn26/acorn26/fpu.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/acorn26/acorn26/fpu.c
diff -u src/sys/arch/acorn26/acorn26/fpu.c:1.9 src/sys/arch/acorn26/acorn26/fpu.c:1.10
--- src/sys/arch/acorn26/acorn26/fpu.c:1.9 Wed Mar 18 10:22:21 2009
+++ src/sys/arch/acorn26/acorn26/fpu.c Tue May 12 06:31:37 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.9 2009/03/18 10:22:21 cegger Exp $ */
+/* $NetBSD: fpu.c,v 1.10 2009/05/12 06:31:37 cegger Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -32,7 +32,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.9 2009/03/18 10:22:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.10 2009/05/12 06:31:37 cegger Exp $");
#include
#include
@@ -103,7 +103,7 @@
printf("\n");
if (!supported)
printf("%s: WARNING: FPU type not supported by kernel\n",
- self->dv_xname);
+ device_xname(self));
}
static label_t undef_jmp;
CVS commit: xsrc/xfree/xc/programs/Xserver/hw/sun
Module Name:xsrc Committed By: mrg Date: Tue May 12 04:44:18 UTC 2009 Modified Files: xsrc/xfree/xc/programs/Xserver/hw/sun: sunKbd.c Log Message: be explicit when assigning members of Firm_event, that are now not a "pure" timeval, but a 32 bit time_t one. not worth attempting to version this code to handle 64 bit time_t since we have it already working properly in Xorg tree and the current code will work for another 29 years. build-tested by me for several weeks, also posted by r...@. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/hw/sun/sunKbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/xfree/xc/programs/Xserver/hw/sun/sunKbd.c diff -u xsrc/xfree/xc/programs/Xserver/hw/sun/sunKbd.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/sun/sunKbd.c:1.3 --- xsrc/xfree/xc/programs/Xserver/hw/sun/sunKbd.c:1.2 Fri Dec 31 12:33:40 2004 +++ xsrc/xfree/xc/programs/Xserver/hw/sun/sunKbd.c Tue May 12 04:44:18 2009 @@ -833,7 +833,8 @@ autoRepeatEvent = *xE; autoRepeatFirst = TRUE; autoRepeatKeyDown++; - autoRepeatLastKeyDownTv = fe->time; + autoRepeatLastKeyDownTv.tv_sec = fe->time.tv_sec; + autoRepeatLastKeyDownTv.tv_usec = fe->time.tv_usec; } return FALSE; }
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: jnemeth Date: Tue May 12 02:17:49 UTC 2009 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: install /etc/rc.d/dhcpcd as well To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/usr.sbin/postinstall/postinstall 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/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.95 src/usr.sbin/postinstall/postinstall:1.96 --- src/usr.sbin/postinstall/postinstall:1.95 Tue May 12 01:53:07 2009 +++ src/usr.sbin/postinstall/postinstall Tue May 12 02:17:49 2009 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.95 2009/05/12 01:53:07 jnemeth Exp $ +# $NetBSD: postinstall,v 1.96 2009/05/12 02:17:49 jnemeth Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -1012,7 +1012,7 @@ accounting altqd amd apmd \ bootconf.sh bootparams btattach btconfig btdevctl bthcid \ ccd cgd cleartmp cron \ - dhclient dhcpd dhcrelay dmesg downinterfaces envsys \ + dhclient dhcpcd dhcpd dhcrelay dmesg downinterfaces envsys \ fsck fsck_root ftp_proxy ftpd \ hostapd httpd \ identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: jnemeth
Date: Tue May 12 01:53:08 UTC 2009
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
install /etc/dhcpcd.conf
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/usr.sbin/postinstall/postinstall
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/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.94 src/usr.sbin/postinstall/postinstall:1.95
--- src/usr.sbin/postinstall/postinstall:1.94 Tue Apr 21 16:08:57 2009
+++ src/usr.sbin/postinstall/postinstall Tue May 12 01:53:07 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.94 2009/04/21 16:08:57 joerg Exp $
+# $NetBSD: postinstall,v 1.95 2009/05/12 01:53:07 jnemeth Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -717,6 +717,23 @@
}
#
+# dhcpcd
+#
+additem dhcpcd "dhcpcd configuration is up to date"
+do_dhcpcd()
+{
+ [ -n "$1" ] || err 3 "USAGE: do_dhcpcd fix|check"
+ op="$1"
+ failed=0
+
+ populate_dir "$op" true "${SRC_DIR}/etc" "${DEST_DIR}/etc" 644 \
+ dhcpcd.conf
+ failed=$(( ${failed} + $? ))
+
+ return ${failed}
+}
+
+#
# envsys
#
additem envsys "envsys configuration is up to date"
CVS commit: src/sys/sys
Module Name:src Committed By: ad Date: Mon May 11 22:37:21 UTC 2009 Modified Files: src/sys/sys: mutex.h Log Message: Obsolete comment. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/sys/mutex.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/mutex.h diff -u src/sys/sys/mutex.h:1.16 src/sys/sys/mutex.h:1.17 --- src/sys/sys/mutex.h:1.16 Mon Apr 28 20:24:11 2008 +++ src/sys/sys/mutex.h Mon May 11 22:37:21 2009 @@ -1,7 +1,7 @@ -/* $NetBSD: mutex.h,v 1.16 2008/04/28 20:24:11 martin Exp $ */ +/* $NetBSD: mutex.h,v 1.17 2009/05/11 22:37:21 ad Exp $ */ /*- - * Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc. + * Copyright (c) 2002, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -128,9 +128,8 @@ * mutex_exit() * * Two additional stubs may be implemented that handle only the spinlock - * case, primarily for the scheduler. These should not be documented for - * or used by device drivers. __HAVE_SPIN_MUTEX_STUBS should be defined - * if these are provided: + * case, primarily for the scheduler. __HAVE_SPIN_MUTEX_STUBS should be + * defined if these are provided: * * mutex_spin_enter() * mutex_spin_exit()
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: cegger
Date: Mon May 11 21:34:56 UTC 2009
Modified Files:
src/sys/compat/ndis: subr_ndis.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/ndis/subr_ndis.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/ndis/subr_ndis.c
diff -u src/sys/compat/ndis/subr_ndis.c:1.20 src/sys/compat/ndis/subr_ndis.c:1.21
--- src/sys/compat/ndis/subr_ndis.c:1.20 Mon May 11 21:31:29 2009
+++ src/sys/compat/ndis/subr_ndis.c Mon May 11 21:34:55 2009
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.20 2009/05/11 21:31:29 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.21 2009/05/11 21:34:55 cegger Exp $");
#endif
/*
@@ -1211,7 +1211,7 @@
va_start(ap, numerrors);
for (i = 0; i < numerrors; i++)
printf ("%s: argptr: %p\n",
- dev->dv_xname,
+ device_xname(dev),
va_arg(ap, void *));
va_end(ap);
CVS commit: src/sys/compat/ndis
Module Name:src
Committed By: cegger
Date: Mon May 11 21:31:29 UTC 2009
Modified Files:
src/sys/compat/ndis: kern_ndis.c subr_ndis.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/ndis/kern_ndis.c
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/ndis/subr_ndis.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/ndis/kern_ndis.c
diff -u src/sys/compat/ndis/kern_ndis.c:1.20 src/sys/compat/ndis/kern_ndis.c:1.21
--- src/sys/compat/ndis/kern_ndis.c:1.20 Wed May 6 22:38:31 2009
+++ src/sys/compat/ndis/kern_ndis.c Mon May 11 21:31:29 2009
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.60.2.5 2005/04/01 17:14:20 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.20 2009/05/06 22:38:31 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ndis.c,v 1.21 2009/05/11 21:31:29 cegger Exp $");
#endif
#include
@@ -938,7 +938,7 @@
#endif
if (ifp->if_flags & IFF_DEBUG)
printf("%s: status: %x\n",
- sc->ndis_dev->dv_xname, status);
+ device_xname(sc->ndis_dev), status);
return;
}
@@ -963,7 +963,7 @@
#endif
if (ifp->if_flags & IFF_DEBUG)
printf("%s: status complete\n",
- sc->ndis_dev->dv_xname);
+ device_xname(sc->ndis_dev));
return;
}
@@ -1012,7 +1012,7 @@
if (ifp->if_flags & IFF_DEBUG)
printf("%s: reset done...\n",
- sc->ndis_dev->dv_xname);
+ device_xname(sc->ndis_dev));
wakeup(sc);
return;
}
@@ -1145,7 +1145,7 @@
/* Create the sysctl tree. */
sysctl_createv(&sc->sysctllog, 0, NULL, &ndis_node, CTLFLAG_READWRITE, CTLTYPE_NODE,
- sc->ndis_dev->dv_xname, NULL, NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL);
+ device_xname(sc->ndis_dev), NULL, NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL);
/* Store the number of the ndis mib */
sc->ndis_sysctl_mib = ndis_node->sysctl_num;
Index: src/sys/compat/ndis/subr_ndis.c
diff -u src/sys/compat/ndis/subr_ndis.c:1.19 src/sys/compat/ndis/subr_ndis.c:1.20
--- src/sys/compat/ndis/subr_ndis.c:1.19 Wed Mar 18 17:06:48 2009
+++ src/sys/compat/ndis/subr_ndis.c Mon May 11 21:31:29 2009
@@ -35,7 +35,7 @@
__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.67.2.7 2005/03/31 21:50:11 wpaul Exp $");
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.19 2009/03/18 17:06:48 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_ndis.c,v 1.20 2009/05/11 21:31:29 cegger Exp $");
#endif
/*
@@ -1204,9 +1204,9 @@
str = ustr;
}
- printf ("%s: NDIS ERROR: %x (%s)\n", dev->dv_xname, code,
+ printf ("%s: NDIS ERROR: %x (%s)\n", device_xname(dev), code,
str == NULL ? "unknown error" : str);
- printf ("%s: NDIS NUMERRORS: %x\n", dev->dv_xname, numerrors);
+ printf ("%s: NDIS NUMERRORS: %x\n", device_xname(dev), numerrors);
va_start(ap, numerrors);
for (i = 0; i < numerrors; i++)
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: cegger
Date: Mon May 11 21:22:47 UTC 2009
Modified Files:
src/sys/dev/ic: smc91cxx.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/ic/smc91cxx.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/smc91cxx.c
diff -u src/sys/dev/ic/smc91cxx.c:1.73 src/sys/dev/ic/smc91cxx.c:1.74
--- src/sys/dev/ic/smc91cxx.c:1.73 Sat Mar 14 21:04:20 2009
+++ src/sys/dev/ic/smc91cxx.c Mon May 11 21:22:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxx.c,v 1.73 2009/03/14 21:04:20 dsl Exp $ */
+/* $NetBSD: smc91cxx.c,v 1.74 2009/05/11 21:22:47 cegger Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.73 2009/03/14 21:04:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.74 2009/05/11 21:22:47 cegger Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -1052,7 +1052,7 @@
static int txsuc_count;
if (ppsratecheck(&txsuc_last, &txsuc_count, 1))
printf("%s: successful packet caused TX"
-" interrupt?!\n", sc->sc_dev.dv_xname);
+" interrupt?!\n", device_xname(&sc->sc_dev));
} else
ifp->if_oerrors++;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: cegger
Date: Mon May 11 21:13:09 UTC 2009
Modified Files:
src/sys/dev/pci: alipm.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/alipm.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/pci/alipm.c
diff -u src/sys/dev/pci/alipm.c:1.4 src/sys/dev/pci/alipm.c:1.5
--- src/sys/dev/pci/alipm.c:1.4 Wed May 6 10:34:32 2009
+++ src/sys/dev/pci/alipm.c Mon May 11 21:13:09 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: alipm.c,v 1.4 2009/05/06 10:34:32 cegger Exp $ */
+/* $NetBSD: alipm.c,v 1.5 2009/05/11 21:13:09 cegger Exp $ */
/* $OpenBSD: alipm.c,v 1.13 2007/05/03 12:19:01 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: alipm.c,v 1.4 2009/05/06 10:34:32 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: alipm.c,v 1.5 2009/05/11 21:13:09 cegger Exp $");
#include
#include
@@ -251,7 +251,7 @@
int retries, error = 0;
DPRINTF(("%s: exec op %d, addr 0x%x, cmdlen %d, len %d, "
- "flags 0x%x\n", sc->sc_dev.dv_xname, op, addr, cmdlen,
+ "flags 0x%x\n", device_xname(&sc->sc_dev), op, addr, cmdlen,
len, flags));
if (!I2C_OP_STOP_P(op) || cmdlen > 1 || len > 2)
CVS commit: src/sys/dev/pci/n8
Module Name:src
Committed By: cegger
Date: Mon May 11 20:56:59 UTC 2009
Modified Files:
src/sys/dev/pci/n8: nsp.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/n8/nsp.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/pci/n8/nsp.c
diff -u src/sys/dev/pci/n8/nsp.c:1.6 src/sys/dev/pci/n8/nsp.c:1.7
--- src/sys/dev/pci/n8/nsp.c:1.6 Wed May 6 10:34:33 2009
+++ src/sys/dev/pci/n8/nsp.c Mon May 11 20:56:59 2009
@@ -348,13 +348,13 @@
aprint_normal(": %s, rev. %d\n", nspp->nsp_name,
PCI_REVISION(pa->pa_class));
- printf("NetOctave Encryption Processor - %s\n", sc->device.dv_xname);
+ printf("NetOctave Encryption Processor - %s\n", device_xname(&sc->device));
n8_sessionInit(sc);
NSPcount_g = 1;
if (n8_driverInit(N8_EA_POOL_SIZE, N8_PK_POOL_SIZE)) {
- DBG(("%s: Failed driver init\n", sc->device.dv_xname));
+ DBG(("%s: Failed driver init\n", device_xname(&sc->device)));
NSPcount_g = 0;
return;
}
@@ -385,8 +385,7 @@
if (pci_mapreg_map(pa, NSP_BAR0, PCI_MAPREG_MEM_TYPE_64BIT, 0,
&sc->mem_tag, &sc->mem_handle, NULL, &sc->mem_size)) {
- aprint_error("%s: can't map mem space %d\n",
- sc->device.dv_xname, 0);
+ aprint_error_dev(&sc->device, "can't map mem space %d\n", 0);
return;
}
CVS commit: src/sys/dev/pci/n8
Module Name:src
Committed By: cegger
Date: Mon May 11 20:53:47 UTC 2009
Modified Files:
src/sys/dev/pci/n8: n8_memory_bsd.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/n8/n8_memory_bsd.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/pci/n8/n8_memory_bsd.c
diff -u src/sys/dev/pci/n8/n8_memory_bsd.c:1.2 src/sys/dev/pci/n8/n8_memory_bsd.c:1.3
--- src/sys/dev/pci/n8/n8_memory_bsd.c:1.2 Wed Mar 18 16:00:20 2009
+++ src/sys/dev/pci/n8/n8_memory_bsd.c Mon May 11 20:53:47 2009
@@ -61,7 +61,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-static char const n8_id[] = "$Id: n8_memory_bsd.c,v 1.2 2009/03/18 16:00:20 cegger Exp $";
+static char const n8_id[] = "$Id: n8_memory_bsd.c,v 1.3 2009/05/11 20:53:47 cegger Exp $";
/*/
/** @file n8_memory_bsd.c
* @brief NetOctaveMemory Services - FreeBSD-specific support routines.
@@ -287,26 +287,27 @@
#endif
if (bus_dmamem_alloc(sc->dma_tag, size, PAGE_SIZE, 0,
&seg, 1, &rseg, BUS_DMA_NOWAIT)) {
- printf("%s: can't alloc DMA buffer\n", sc->device.dv_xname);
+ printf("%s: can't alloc DMA buffer\n",
+ device_xname(&sc->device));
return 0;
}
if (bus_dmamem_map(sc->dma_tag, &seg, rseg, size, &kva,
BUS_DMA_NOWAIT)) {
- printf("%s: can't map DMA buffers (%lu bytes)\n", sc->device.dv_xname,
- size);
+ printf("%s: can't map DMA buffers (%lu bytes)\n",
+ device_xname(&sc->device), size);
bus_dmamem_free(sc->dma_tag, &seg, rseg);
return 0;
}
if (bus_dmamap_create(sc->dma_tag, size, 1,
size, 0, BUS_DMA_NOWAIT, &DmaMap_g[bankIndex])) {
- printf("%s: can't create DMA map\n", sc->device.dv_xname);
+ printf("%s: can't create DMA map\n", device_xname(&sc->device));
bus_dmamem_unmap(sc->dma_tag, kva, size);
bus_dmamem_free(sc->dma_tag, &seg, rseg);
return 0;
}
if (bus_dmamap_load(sc->dma_tag, DmaMap_g[bankIndex], kva, size,
NULL, BUS_DMA_NOWAIT)) {
- printf("%s: can't load DMA map\n", sc->device.dv_xname);
+ printf("%s: can't load DMA map\n", device_xname(&sc->device));
bus_dmamap_destroy(sc->dma_tag, DmaMap_g[bankIndex]);
bus_dmamem_unmap(sc->dma_tag, kva, size);
bus_dmamem_free(sc->dma_tag, &seg, rseg);
CVS commit: src/sys/dev/podulebus
Module Name:src
Committed By: bjh21
Date: Mon May 11 20:13:50 UTC 2009
Modified Files:
src/sys/dev/podulebus: sec.c
Log Message:
Replace shutdownhooks with pmf in sec(4).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/podulebus/sec.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/podulebus/sec.c
diff -u src/sys/dev/podulebus/sec.c:1.14 src/sys/dev/podulebus/sec.c:1.15
--- src/sys/dev/podulebus/sec.c:1.14 Thu Feb 12 06:24:45 2009
+++ src/sys/dev/podulebus/sec.c Mon May 11 20:13:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sec.c,v 1.14 2009/02/12 06:24:45 rumble Exp $ */
+/* $NetBSD: sec.c,v 1.15 2009/05/11 20:13:49 bjh21 Exp $ */
/*-
* Copyright (c) 2000, 2001, 2006 Ben Harris
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sec.c,v 1.14 2009/02/12 06:24:45 rumble Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sec.c,v 1.15 2009/05/11 20:13:49 bjh21 Exp $");
#include
@@ -95,7 +95,7 @@
static void sec_attach(device_t, device_t, void *);
/* shutdown hook */
-static void sec_shutdown(void *);
+static bool sec_shutdown(device_t, int);
/* callbacks from MI WD33C93 driver */
static int sec_dmasetup(struct wd33c93_softc *, void **, size_t *, int,
@@ -214,19 +214,20 @@
sec_cli(sc);
sc->sc_mpr |= SEC_MPR_IE;
bus_space_write_1(sc->sc_pod_t, sc->sc_pod_h, SEC_MPR, sc->sc_mpr);
- shutdownhook_establish(sec_shutdown, sc);
+ pmf_device_register1(sc->sc_sbic.sc_dev, NULL, NULL, sec_shutdown);
}
/*
* Before reboot, reset the page register to 0 so that RISC OS can see
* the podule ROM.
*/
-static void
-sec_shutdown(void *cookie)
+static bool
+sec_shutdown(device_t dev, int howto)
{
- struct sec_softc *sc = cookie;
+ struct sec_softc *sc = device_private(dev);
sec_setpage(sc, 0);
+ return true;
}
static void
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Mon May 11 20:13:47 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.1 Log Message: Tickets 748, 750 To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-5.0.1 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-5.0.1 diff -u src/doc/CHANGES-5.0.1:1.1.2.7 src/doc/CHANGES-5.0.1:1.1.2.8 --- src/doc/CHANGES-5.0.1:1.1.2.7 Sun May 10 20:51:55 2009 +++ src/doc/CHANGES-5.0.1 Mon May 11 20:13:47 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.1,v 1.1.2.7 2009/05/10 20:51:55 snj Exp $ +# $NetBSD: CHANGES-5.0.1,v 1.1.2.8 2009/05/11 20:13:47 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.0.1 release: @@ -64,3 +64,16 @@ Fix typo, from Shannon -jj Behrens in PR 41375. [dholland, ticket #746] +sys/dist/ipf/netinet/ip_fil_netbsd.c 1.50 + + Don't call callout_stop() without callout_init() + Fixes PR/41364 + [kefren, ticket #748] + +sys/arch/sparc/include/math.h 1.5 +sys/arch/sparc64/include/math.h 1.7 + + merge these two files, makes sparc64 sparc/libc work again. + only provide __HAVE_LONG_DOUBLE if _LP64. + [mrg, ticket #750] +
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Mon May 11 20:13:02 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 742, 747-751 To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.1 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-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.10 src/doc/CHANGES-5.1:1.1.2.11 --- src/doc/CHANGES-5.1:1.1.2.10 Sun May 10 21:39:22 2009 +++ src/doc/CHANGES-5.1 Mon May 11 20:13:02 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.10 2009/05/10 21:39:22 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.11 2009/05/11 20:13:02 bouyer Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -410,3 +410,40 @@ Update dhcpcd to 5.0.1. [roy, ticket #534] +BUILDING 1.83 +doc/BUILDING.mdoc1.72 +external/mit/xorg/lib/freetype/Makefile 1.5 + + Introduce MKSUBPIXEL, which allows enabling subpixel rendering code + in FreeType. + [snj, ticket #742] + +gnu/usr.bin/groff/tmac/mdoc.local 1.51 via patch + + Add an entry for 5.1. + [snj, ticket #747] + +sys/dist/ipf/netinet/ip_fil_netbsd.c 1.50 + + Don't call callout_stop() without callout_init() + Fixes PR/41364 + [kefren, ticket #748] + +sys/dev/md.c 1.58 + + Check the RAMdisk size in mdattach() and not nothing if it's 0. + This allows mdattach() to be called twice, once from config_finalize() + and once from tftproot_getfile(). Fix options TFTPROOT. + [manu, ticket #749] + +sys/arch/sparc/include/math.h 1.5 +sys/arch/sparc64/include/math.h 1.7 + + merge these two files, makes sparc64 sparc/libc work again. + only provide __HAVE_LONG_DOUBLE if _LP64. + [mrg, ticket #750] + +sys/dev/pci/if_wm.cpatch + Remove extra printf(). + [msaitoh, ticket #751] +
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Mon May 11 20:11:35 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5]: if_wm.c
Log Message:
Apply patch (requested by msaitoh in ticket #751):
sys/dev/pci/if_wm.c: patch
Remove extra printf()s.
To generate a diff of this commit:
cvs rdiff -u -r1.162.4.7 -r1.162.4.8 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.162.4.7 src/sys/dev/pci/if_wm.c:1.162.4.8
--- src/sys/dev/pci/if_wm.c:1.162.4.7 Sun May 3 17:58:41 2009
+++ src/sys/dev/pci/if_wm.c Mon May 11 20:11:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.162.4.7 2009/05/03 17:58:41 snj Exp $ */
+/* $NetBSD: if_wm.c,v 1.162.4.8 2009/05/11 20:11:34 bouyer Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.162.4.7 2009/05/03 17:58:41 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.162.4.8 2009/05/11 20:11:34 bouyer Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -5286,7 +5286,6 @@
break;
}
- printf("X mng=%d ===\n", rv);
return rv;
}
@@ -5344,7 +5343,6 @@
case WM_T_80003:
case WM_T_ICH8:
case WM_T_ICH9:
- printf("YY load drv YYY\n");
reg = CSR_READ(sc, WMREG_CTRL_EXT);
CSR_WRITE(sc, WMREG_CTRL_EXT, reg | CTRL_EXT_DRV_LOAD);
break;
CVS commit: [netbsd-5-0] src/sys/arch
Module Name:src Committed By: bouyer Date: Mon May 11 20:09:20 UTC 2009 Modified Files: src/sys/arch/sparc/include [netbsd-5-0]: math.h src/sys/arch/sparc64/include [netbsd-5-0]: math.h Log Message: Pull up following revision(s) (requested by mrg in ticket #750): sys/arch/sparc64/include/math.h: revision 1.7 sys/arch/sparc/include/math.h: revision 1.5 merge these two files, makes sparc64 sparc/libc work again. only provide __HAVE_LONG_DOUBLE if _LP64. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.136.1 src/sys/arch/sparc/include/math.h cvs rdiff -u -r1.6 -r1.6.92.1 src/sys/arch/sparc64/include/math.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/sparc/include/math.h diff -u src/sys/arch/sparc/include/math.h:1.4 src/sys/arch/sparc/include/math.h:1.4.136.1 --- src/sys/arch/sparc/include/math.h:1.4 Tue Feb 19 13:08:15 2002 +++ src/sys/arch/sparc/include/math.h Mon May 11 20:09:20 2009 @@ -1,3 +1,7 @@ -/* $NetBSD: math.h,v 1.4 2002/02/19 13:08:15 simonb Exp $ */ +/* $NetBSD: math.h,v 1.4.136.1 2009/05/11 20:09:20 bouyer Exp $ */ #define __HAVE_NANF + +#ifdef _LP64 +#define __HAVE_LONG_DOUBLE +#endif Index: src/sys/arch/sparc64/include/math.h diff -u src/sys/arch/sparc64/include/math.h:1.6 src/sys/arch/sparc64/include/math.h:1.6.92.1 --- src/sys/arch/sparc64/include/math.h:1.6 Sun Dec 11 12:19:10 2005 +++ src/sys/arch/sparc64/include/math.h Mon May 11 20:09:20 2009 @@ -1,4 +1,3 @@ -/* $NetBSD: math.h,v 1.6 2005/12/11 12:19:10 christos Exp $ */ +/* $NetBSD: math.h,v 1.6.92.1 2009/05/11 20:09:20 bouyer Exp $ */ -#define __HAVE_LONG_DOUBLE -#define __HAVE_NANF +#include
CVS commit: [netbsd-5] src/sys/arch
Module Name:src Committed By: bouyer Date: Mon May 11 20:09:09 UTC 2009 Modified Files: src/sys/arch/sparc/include [netbsd-5]: math.h src/sys/arch/sparc64/include [netbsd-5]: math.h Log Message: Pull up following revision(s) (requested by mrg in ticket #750): sys/arch/sparc64/include/math.h: revision 1.7 sys/arch/sparc/include/math.h: revision 1.5 merge these two files, makes sparc64 sparc/libc work again. only provide __HAVE_LONG_DOUBLE if _LP64. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.132.1 src/sys/arch/sparc/include/math.h cvs rdiff -u -r1.6 -r1.6.88.1 src/sys/arch/sparc64/include/math.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/sparc/include/math.h diff -u src/sys/arch/sparc/include/math.h:1.4 src/sys/arch/sparc/include/math.h:1.4.132.1 --- src/sys/arch/sparc/include/math.h:1.4 Tue Feb 19 13:08:15 2002 +++ src/sys/arch/sparc/include/math.h Mon May 11 20:09:09 2009 @@ -1,3 +1,7 @@ -/* $NetBSD: math.h,v 1.4 2002/02/19 13:08:15 simonb Exp $ */ +/* $NetBSD: math.h,v 1.4.132.1 2009/05/11 20:09:09 bouyer Exp $ */ #define __HAVE_NANF + +#ifdef _LP64 +#define __HAVE_LONG_DOUBLE +#endif Index: src/sys/arch/sparc64/include/math.h diff -u src/sys/arch/sparc64/include/math.h:1.6 src/sys/arch/sparc64/include/math.h:1.6.88.1 --- src/sys/arch/sparc64/include/math.h:1.6 Sun Dec 11 12:19:10 2005 +++ src/sys/arch/sparc64/include/math.h Mon May 11 20:09:09 2009 @@ -1,4 +1,3 @@ -/* $NetBSD: math.h,v 1.6 2005/12/11 12:19:10 christos Exp $ */ +/* $NetBSD: math.h,v 1.6.88.1 2009/05/11 20:09:09 bouyer Exp $ */ -#define __HAVE_LONG_DOUBLE -#define __HAVE_NANF +#include
CVS commit: [netbsd-5] src/sys/dev
Module Name:src
Committed By: bouyer
Date: Mon May 11 20:07:08 UTC 2009
Modified Files:
src/sys/dev [netbsd-5]: md.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #749):
sys/dev/md.c: revision 1.58
TFTPROOT loads the RAMdisk through TFTP at boot time. It needs the
network to be functionnal, and therefore must be called after
config_finalize(). Unfortunately, config_finalize() attaches md0
through mdattach(), and when tftproot_getfile() attempts to attach it
later by calling mdattach() again, it gets a failure.
This change checks for the RAMdisk size in mdattach(). If it is zero, then
the RAMdisk has not been loaded yet, and nothing is done. It will be
attached later when tftproot_getfile() will call mdattach()
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.6.1 src/sys/dev/md.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/md.c
diff -u src/sys/dev/md.c:1.56 src/sys/dev/md.c:1.56.6.1
--- src/sys/dev/md.c:1.56 Mon Jun 16 10:27:47 2008
+++ src/sys/dev/md.c Mon May 11 20:07:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.56 2008/06/16 10:27:47 drochner Exp $ */
+/* $NetBSD: md.c,v 1.56.6.1 2009/05/11 20:07:08 bouyer Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -46,9 +46,10 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.56 2008/06/16 10:27:47 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: md.c,v 1.56.6.1 2009/05/11 20:07:08 bouyer Exp $");
#include "opt_md.h"
+#include "opt_tftproot.h"
#include
#include
@@ -118,6 +119,8 @@
CFATTACH_DECL_NEW(md, sizeof(struct md_softc),
0, md_attach, 0, NULL);
+extern size_t md_root_size;
+
/*
* This is called if we are configured as a pseudo-device
*/
@@ -127,6 +130,14 @@
int i;
cfdata_t cf;
+#ifdef TFTPROOT
+ /*
+ * Attachement of md0 must be done after md_root_setconf(),
+ * because the RAMdisk is not loaded yet.
+ */
+ if (md_root_size == 0)
+ return;
+#endif
if (config_cfattach_attach("md", &md_ca)) {
printf("md: cfattach_attach failed\n");
return;
CVS commit: [netbsd-5-0] src/sys/dist/ipf/netinet
Module Name:src Committed By: bouyer Date: Mon May 11 20:03:08 UTC 2009 Modified Files: src/sys/dist/ipf/netinet [netbsd-5-0]: ip_fil_netbsd.c Log Message: Pull up following revision(s) (requested by kefren in ticket #748): sys/dist/ipf/netinet/ip_fil_netbsd.c: revision 1.50 Don't call callout_stop() without callout_init() Fixes PR/41364 To generate a diff of this commit: cvs rdiff -u -r1.46.8.1 -r1.46.8.1.2.1 \ src/sys/dist/ipf/netinet/ip_fil_netbsd.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/dist/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1.2.1 --- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1 Thu Feb 19 20:33:39 2009 +++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Mon May 11 20:03:08 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1 2009/02/19 20:33:39 snj Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.1 2009/05/11 20:03:08 bouyer Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include -__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.46.8.1 2009/02/19 20:33:39 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.1 2009/05/11 20:03:08 bouyer Exp $"); #else static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 2.55.2.59 2008/03/01 23:16:38 darrenr Exp"; @@ -471,7 +471,8 @@ SPL_NET(s); #if (__NetBSD_Version__ >= 10401) - callout_stop(&fr_slowtimer_ch); + if (fr_running > 0) + callout_stop(&fr_slowtimer_ch); #else untimeout(fr_slowtimer, NULL); #endif /* NetBSD */
CVS commit: [netbsd-5] src/sys/dist/ipf/netinet
Module Name:src Committed By: bouyer Date: Mon May 11 20:02:44 UTC 2009 Modified Files: src/sys/dist/ipf/netinet [netbsd-5]: ip_fil_netbsd.c Log Message: Pull up following revision(s) (requested by kefren in ticket #748): sys/dist/ipf/netinet/ip_fil_netbsd.c: revision 1.50 Don't call callout_stop() without callout_init() Fixes PR/41364 To generate a diff of this commit: cvs rdiff -u -r1.46.8.1 -r1.46.8.2 src/sys/dist/ipf/netinet/ip_fil_netbsd.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/dist/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.2 --- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1 Thu Feb 19 20:33:39 2009 +++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Mon May 11 20:02:43 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1 2009/02/19 20:33:39 snj Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.2 2009/05/11 20:02:43 bouyer Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include -__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.46.8.1 2009/02/19 20:33:39 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.46.8.2 2009/05/11 20:02:43 bouyer Exp $"); #else static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed"; static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 2.55.2.59 2008/03/01 23:16:38 darrenr Exp"; @@ -471,7 +471,8 @@ SPL_NET(s); #if (__NetBSD_Version__ >= 10401) - callout_stop(&fr_slowtimer_ch); + if (fr_running > 0) + callout_stop(&fr_slowtimer_ch); #else untimeout(fr_slowtimer, NULL); #endif /* NetBSD */
CVS commit: [netbsd-5] src/gnu/usr.bin/groff/tmac
Module Name:src Committed By: bouyer Date: Mon May 11 20:00:52 UTC 2009 Modified Files: src/gnu/usr.bin/groff/tmac [netbsd-5]: mdoc.local Log Message: Pull up following revision(s) (requested by snj in ticket #747): gnu/usr.bin/groff/tmac/mdoc.local: revision 1.51 via patch Add an entry for 5.1. To generate a diff of this commit: cvs rdiff -u -r1.43.4.9 -r1.43.4.10 src/gnu/usr.bin/groff/tmac/mdoc.local Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.9 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.10 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.9 Thu Apr 30 00:54:47 2009 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Mon May 11 20:00:52 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.43.4.9 2009/04/30 00:54:47 snj Exp $ +.\" $NetBSD: mdoc.local,v 1.43.4.10 2009/05/11 20:00:52 bouyer Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -57,6 +57,7 @@ .ds doc-operating-system-NetBSD-3.13.1 .ds doc-operating-system-NetBSD-4.04.0 .ds doc-operating-system-NetBSD-5.05.0 +.ds doc-operating-system-NetBSD-5.15.1 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-6.1 6.1 .ds doc-operating-system-FreeBSD-6.3 6.3
CVS commit: [netbsd-5] src
Module Name:src
Committed By: bouyer
Date: Mon May 11 19:40:22 UTC 2009
Modified Files:
src [netbsd-5]: BUILDING
src/doc [netbsd-5]: BUILDING.mdoc
src/external/mit/xorg/lib/freetype [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by snj in ticket #742):
doc/BUILDING.mdoc: revision 1.72
external/mit/xorg/lib/freetype/Makefile: revision 1.5
BUILDING: revision 1.83
Introduce MKSUBPIXEL, which allows enabling subpixel rendering code
in FreeType.
To generate a diff of this commit:
cvs rdiff -u -r1.78.2.2 -r1.78.2.3 src/BUILDING
cvs rdiff -u -r1.67.2.2 -r1.67.2.3 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.3 -r1.3.2.1 src/external/mit/xorg/lib/freetype/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/BUILDING
diff -u src/BUILDING:1.78.2.2 src/BUILDING:1.78.2.3
--- src/BUILDING:1.78.2.2 Sat Nov 15 22:10:33 2008
+++ src/BUILDING Mon May 11 19:40:22 2009
@@ -281,6 +281,12 @@
Default: ``no''
+ MKSUBPIXEL Can be set to ``yes'' or ``no''. For X builds, decides if
+ subpixel rendering code in FreeType is turned on. Turned off
+ by default because of patent issues.
+
+ Default: ``no''
+
MKTTINTERP Can be set to ``yes'' or ``no''. For X builds, decides if
the TrueType bytecode interpreter is turned on. See
http://www.freetype.org/patents.html for details.
@@ -886,4 +892,4 @@
The build.sh based build scheme was introduced for NetBSD 1.6 as
USE_NEW_TOOLCHAIN, and re-worked to TOOLCHAIN_MISSING after that.
-NetBSDSeptember 10, 2008NetBSD
+NetBSDMay 1, 2009 NetBSD
Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.67.2.2 src/doc/BUILDING.mdoc:1.67.2.3
--- src/doc/BUILDING.mdoc:1.67.2.2 Sat Nov 15 22:10:33 2008
+++ src/doc/BUILDING.mdoc Mon May 11 19:40:22 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: BUILDING.mdoc,v 1.67.2.2 2008/11/15 22:10:33 snj Exp $
+.\" $NetBSD: BUILDING.mdoc,v 1.67.2.3 2009/05/11 19:40:22 bouyer Exp $
.\"
.\" Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -33,7 +33,7 @@
.\" Toolchain prefix for commands
.ds toolprefix nb
.
-.Dd September 10, 2008
+.Dd May 1, 2009
.Dt BUILDING 8
.Os NetBSD
.
@@ -514,6 +514,13 @@
.Xr ident 1 .
.DFLTn
.
+.It Sy MKSUBPIXEL
+.YorN
+For X builds, decides if subpixel rendering code in FreeType
+is turned on.
+Turned off by default because of patent issues.
+.DFLTn
+.
.It Sy MKTTINTERP
.YorN
For X builds, decides if the TrueType bytecode interpreter
Index: src/external/mit/xorg/lib/freetype/Makefile
diff -u src/external/mit/xorg/lib/freetype/Makefile:1.3 src/external/mit/xorg/lib/freetype/Makefile:1.3.2.1
--- src/external/mit/xorg/lib/freetype/Makefile:1.3 Sat Oct 25 13:14:49 2008
+++ src/external/mit/xorg/lib/freetype/Makefile Mon May 11 19:40:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/25 13:14:49 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2009/05/11 19:40:22 bouyer Exp $
.include
@@ -83,6 +83,10 @@
-I${DESTDIR}${X11INCDIR}/freetype2/freetype/config \
-I${X11SRCDIR.${LIB}}/include
+.if defined(MKSUBPIXEL) && ${MKSUBPIXEL} != "no"
+CPPFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
+.endif
+
.if defined(MKTTINTERP) && ${MKTTINTERP} != "no"
CPPFLAGS+= -DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
.endif
CVS commit: [netbsd-4] src/doc
Module Name:src
Committed By: bouyer
Date: Mon May 11 19:32:22 UTC 2009
Modified Files:
src/doc [netbsd-4]: CHANGES-4.1
Log Message:
tickets 1312-1315
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.146 -r1.1.2.147 src/doc/CHANGES-4.1
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-4.1
diff -u src/doc/CHANGES-4.1:1.1.2.146 src/doc/CHANGES-4.1:1.1.2.147
--- src/doc/CHANGES-4.1:1.1.2.146 Thu Apr 30 18:27:50 2009
+++ src/doc/CHANGES-4.1 Mon May 11 19:32:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-4.1,v 1.1.2.146 2009/04/30 18:27:50 bouyer Exp $
+# $NetBSD: CHANGES-4.1,v 1.1.2.147 2009/05/11 19:32:22 bouyer Exp $
A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1
release:
@@ -3038,3 +3038,28 @@
Fix build fallout from ticket 1310
[hauke, ticket #1311]
+usr.sbin/racoonctl/Makefile 1.5 via patch
+
+ adjust the ADMINPORTDIR to match that of racoon (with which
+ it'll want to talk) fixes PR 41376
+ [spz, ticket #1312]
+
+lib/libc/stdio/vfwprintf.c 1.15
+
+ printf("%zi\n", (ssize_t)-1); now correcly prints -1 on i386
+ [cube, ticket #1313]
+
+share/man/man8/afterboot.8 1.39
+
+ Fix typo, from Shannon -jj Behrens in PR 41375.
+ [dholland, ticket #1314]
+
+sys/arch/mac68k/conf/GENERIC 1.188
+sys/arch/mac68k/obio/esp.c 1.51 via patch
+
+ Add LOCKDEBUG option, commented out, so that people know it's there.
+ esp_quick_dma_go() gets called from the MI ncr53c9x_intr() handler,
+ which protects itself against multiple invocation with a
+ simple_lock. Fixes PR mac68k/38758.
+ [hauke, ticket #1315]
+
CVS commit: [netbsd-4] src/sys/arch/mac68k
Module Name:src
Committed By: bouyer
Date: Mon May 11 19:31:40 UTC 2009
Modified Files:
src/sys/arch/mac68k/conf [netbsd-4]: GENERIC
src/sys/arch/mac68k/obio [netbsd-4]: esp.c
Log Message:
Pull up following revision(s) (requested by hauke in ticket #1315):
sys/arch/mac68k/obio/esp.c: revision 1.51 via patch
sys/arch/mac68k/conf/GENERIC: revision 1.188
Add LOCKDEBUG option, commented out, so that people know it's there.
esp_quick_dma_go() gets called from the MI ncr53c9x_intr() handler,
which protects itself against multiple invocation with a
simple_lock. Follow the example of ncr53c9x_poll() for servicing an
interrupt that came while we run in splhigh(), and 'manually' unlock
the MI handler for calling ncr53c9x_intr().
Fixes PR mac68k/38758.
To generate a diff of this commit:
cvs rdiff -u -r1.177.2.2 -r1.177.2.3 src/sys/arch/mac68k/conf/GENERIC
cvs rdiff -u -r1.44 -r1.44.14.1 src/sys/arch/mac68k/obio/esp.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/mac68k/conf/GENERIC
diff -u src/sys/arch/mac68k/conf/GENERIC:1.177.2.2 src/sys/arch/mac68k/conf/GENERIC:1.177.2.3
--- src/sys/arch/mac68k/conf/GENERIC:1.177.2.2 Sat Aug 25 09:00:08 2007
+++ src/sys/arch/mac68k/conf/GENERIC Mon May 11 19:31:40 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.177.2.2 2007/08/25 09:00:08 liamjfoy Exp $
+# $NetBSD: GENERIC,v 1.177.2.3 2009/05/11 19:31:40 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.177.2.2 $"
+#ident "GENERIC-$Revision: 1.177.2.3 $"
maxusers 16 # estimated number of users
@@ -69,6 +69,7 @@
# Diagnostic/debugging support options
#options DIAGNOSTIC # cheap kernel consistency checks
#options DEBUG # expensive debugging checks/support
+#options LOCKDEBUG # kernel lock debugging
options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_HISTORY_SIZE=100 # enable history editing in DDB
Index: src/sys/arch/mac68k/obio/esp.c
diff -u src/sys/arch/mac68k/obio/esp.c:1.44 src/sys/arch/mac68k/obio/esp.c:1.44.14.1
--- src/sys/arch/mac68k/obio/esp.c:1.44 Wed Mar 8 23:46:23 2006
+++ src/sys/arch/mac68k/obio/esp.c Mon May 11 19:31:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.44 2006/03/08 23:46:23 lukem Exp $ */
+/* $NetBSD: esp.c,v 1.44.14.1 2009/05/11 19:31:39 bouyer Exp $ */
/*
* Copyright (c) 1997 Jason R. Thorpe.
@@ -77,7 +77,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.44 2006/03/08 23:46:23 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.44.14.1 2009/05/11 19:31:39 bouyer Exp $");
#include
#include
@@ -851,7 +851,14 @@
printf("g!\n");
}
#endif
+ /*
+ * We have been called from the MI ncr53c9x_intr() handler,
+ * which protects itself against multiple invocation with a
+ * simple_lock. Follow the example of ncr53c9x_poll().
+ */
+ simple_unlock(&sc->sc_lock);
ncr53c9x_intr(sc);
+ simple_lock(&sc->sc_lock);
if (espspl != -1) splx(espspl); espspl = -1;
}
CVS commit: [netbsd-4-0] src/doc
Module Name:src
Committed By: bouyer
Date: Mon May 11 19:31:34 UTC 2009
Modified Files:
src/doc [netbsd-4-0]: CHANGES-4.0.2
Log Message:
tickets 1312-1314
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.28 -r1.1.2.29 src/doc/CHANGES-4.0.2
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-4.0.2
diff -u src/doc/CHANGES-4.0.2:1.1.2.28 src/doc/CHANGES-4.0.2:1.1.2.29
--- src/doc/CHANGES-4.0.2:1.1.2.28 Thu Apr 30 18:26:44 2009
+++ src/doc/CHANGES-4.0.2 Mon May 11 19:31:33 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-4.0.2,v 1.1.2.28 2009/04/30 18:26:44 bouyer Exp $
+# $NetBSD: CHANGES-4.0.2,v 1.1.2.29 2009/05/11 19:31:33 bouyer Exp $
A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2
release:
@@ -228,3 +228,19 @@
Fix build fallout from ticket 1310
[hauke, ticket #1311]
+usr.sbin/racoonctl/Makefile 1.5 via patch
+
+ adjust the ADMINPORTDIR to match that of racoon (with which
+ it'll want to talk) fixes PR 41376
+ [spz, ticket #1312]
+
+lib/libc/stdio/vfwprintf.c 1.15
+
+ printf("%zi\n", (ssize_t)-1); now correcly prints -1 on i386
+ [cube, ticket #1313]
+
+share/man/man8/afterboot.8 1.39
+
+ Fix typo, from Shannon -jj Behrens in PR 41375.
+ [dholland, ticket #1314]
+
CVS commit: [netbsd-4-0] src/share/man/man8
Module Name:src Committed By: bouyer Date: Mon May 11 19:25:24 UTC 2009 Modified Files: src/share/man/man8 [netbsd-4-0]: afterboot.8 Log Message: Pull up following revision(s) (requested by dholland in ticket #1314): share/man/man8/afterboot.8: revision 1.39 Fix typo, from Shannon -jj Behrens in PR 41375. To generate a diff of this commit: cvs rdiff -u -r1.29.2.1.2.1 -r1.29.2.1.2.2 src/share/man/man8/afterboot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.29.2.1.2.1 src/share/man/man8/afterboot.8:1.29.2.1.2.2 --- src/share/man/man8/afterboot.8:1.29.2.1.2.1 Wed Nov 5 19:54:29 2008 +++ src/share/man/man8/afterboot.8 Mon May 11 19:25:24 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: afterboot.8,v 1.29.2.1.2.1 2008/11/05 19:54:29 snj Exp $ +.\" $NetBSD: afterboot.8,v 1.29.2.1.2.2 2009/05/11 19:25:24 bouyer Exp $ .\" $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\" .\" Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -622,7 +622,7 @@ .Pp The directory .Pa /etc/rc.d -contains a serie of scripts used at startup/shutdown, called by +contains a series of scripts used at startup/shutdown, called by .Pa /etc/rc . .Pa /etc/rc is in turn influenced by the configuration variables present in
CVS commit: [netbsd-4] src/share/man/man8
Module Name:src Committed By: bouyer Date: Mon May 11 19:25:21 UTC 2009 Modified Files: src/share/man/man8 [netbsd-4]: afterboot.8 Log Message: Pull up following revision(s) (requested by dholland in ticket #1314): share/man/man8/afterboot.8: revision 1.39 Fix typo, from Shannon -jj Behrens in PR 41375. To generate a diff of this commit: cvs rdiff -u -r1.29.2.2 -r1.29.2.3 src/share/man/man8/afterboot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/afterboot.8 diff -u src/share/man/man8/afterboot.8:1.29.2.2 src/share/man/man8/afterboot.8:1.29.2.3 --- src/share/man/man8/afterboot.8:1.29.2.2 Wed Nov 5 19:53:09 2008 +++ src/share/man/man8/afterboot.8 Mon May 11 19:25:21 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: afterboot.8,v 1.29.2.2 2008/11/05 19:53:09 snj Exp $ +.\" $NetBSD: afterboot.8,v 1.29.2.3 2009/05/11 19:25:21 bouyer Exp $ .\" $OpenBSD: afterboot.8,v 1.72 2002/02/22 02:02:33 miod Exp $ .\" .\" Originally created by Marshall M. Midden -- 1997-10-20, m...@umn.edu @@ -622,7 +622,7 @@ .Pp The directory .Pa /etc/rc.d -contains a serie of scripts used at startup/shutdown, called by +contains a series of scripts used at startup/shutdown, called by .Pa /etc/rc . .Pa /etc/rc is in turn influenced by the configuration variables present in
CVS commit: [netbsd-4-0] src/lib/libc/stdio
Module Name:src
Committed By: bouyer
Date: Mon May 11 19:23:33 UTC 2009
Modified Files:
src/lib/libc/stdio [netbsd-4-0]: vfwprintf.c
Log Message:
Pull up following revision(s) (requested by cube in ticket #1313):
lib/libc/stdio/vfwprintf.c: revision 1.15
printf("%zi\n", (ssize_t)-1); now correcly prints -1 on i386
ok: christos
To generate a diff of this commit:
cvs rdiff -u -r1.9.2.1.4.1 -r1.9.2.1.4.2 src/lib/libc/stdio/vfwprintf.c
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/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.9.2.1.4.1 src/lib/libc/stdio/vfwprintf.c:1.9.2.1.4.2
--- src/lib/libc/stdio/vfwprintf.c:1.9.2.1.4.1 Tue Apr 8 21:10:55 2008
+++ src/lib/libc/stdio/vfwprintf.c Mon May 11 19:23:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwprintf.c,v 1.9.2.1.4.1 2008/04/08 21:10:55 jdc Exp $ */
+/* $NetBSD: vfwprintf.c,v 1.9.2.1.4.2 2009/05/11 19:23:33 bouyer Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
#else
-__RCSID("$NetBSD: vfwprintf.c,v 1.9.2.1.4.1 2008/04/08 21:10:55 jdc Exp $");
+__RCSID("$NetBSD: vfwprintf.c,v 1.9.2.1.4.2 2009/05/11 19:23:33 bouyer Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -98,6 +98,7 @@
long long longlongarg;
unsigned long long ulonglongarg;
ptrdiff_t ptrdiffarg;
+ ssize_t ssizearg;
size_t sizearg;
intmax_t intmaxarg;
uintmax_t uintmaxarg;
@@ -125,7 +126,7 @@
enum typeid {
T_UNUSED, TP_SHORT, T_INT, T_U_INT, TP_INT,
T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG,
- T_PTRDIFFT, TP_PTRDIFFT, T_SIZET, TP_SIZET,
+ T_PTRDIFFT, TP_PTRDIFFT, T_SSIZET, T_SIZET, TP_SIZET,
T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR,
T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
};
@@ -756,7 +757,7 @@
#define INTMAX_SIZE (INTMAXT|SIZET|PTRDIFFT|LLONGINT)
#define SJARG() \
(flags&INTMAXT ? GETARG(intmax_t) : \
- flags&SIZET ? (intmax_t)GETARG(size_t) : \
+ flags&SIZET ? (intmax_t)GETARG(ssize_t) : \
flags&PTRDIFFT ? (intmax_t)GETARG(ptrdiff_t) : \
(intmax_t)GETARG(long long))
#define UJARG() \
@@ -1571,7 +1572,7 @@
if (flags & INTMAXT) \
ADDTYPE(T_INTMAXT); \
else if (flags & SIZET) \
- ADDTYPE(T_SIZET); \
+ ADDTYPE(T_SSIZET); \
else if (flags & PTRDIFFT) \
ADDTYPE(T_PTRDIFFT); \
else if (flags & LLONGINT) \
@@ -1838,6 +1839,9 @@
case TP_PTRDIFFT:
(*argtable) [n].pptrdiffarg = va_arg (ap, ptrdiff_t *);
break;
+ case T_SSIZET:
+ (*argtable) [n].ssizearg = va_arg (ap, ssize_t);
+ break;
case T_SIZET:
(*argtable) [n].sizearg = va_arg (ap, size_t);
break;
CVS commit: [netbsd-4] src/lib/libc/stdio
Module Name:src
Committed By: bouyer
Date: Mon May 11 19:23:20 UTC 2009
Modified Files:
src/lib/libc/stdio [netbsd-4]: vfwprintf.c
Log Message:
Pull up following revision(s) (requested by cube in ticket #1313):
lib/libc/stdio/vfwprintf.c: revision 1.15
printf("%zi\n", (ssize_t)-1); now correcly prints -1 on i386
ok: christos
To generate a diff of this commit:
cvs rdiff -u -r1.9.2.2 -r1.9.2.3 src/lib/libc/stdio/vfwprintf.c
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/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.9.2.2 src/lib/libc/stdio/vfwprintf.c:1.9.2.3
--- src/lib/libc/stdio/vfwprintf.c:1.9.2.2 Tue Apr 8 21:00:08 2008
+++ src/lib/libc/stdio/vfwprintf.c Mon May 11 19:23:20 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwprintf.c,v 1.9.2.2 2008/04/08 21:00:08 jdc Exp $ */
+/* $NetBSD: vfwprintf.c,v 1.9.2.3 2009/05/11 19:23:20 bouyer Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
#else
-__RCSID("$NetBSD: vfwprintf.c,v 1.9.2.2 2008/04/08 21:00:08 jdc Exp $");
+__RCSID("$NetBSD: vfwprintf.c,v 1.9.2.3 2009/05/11 19:23:20 bouyer Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -98,6 +98,7 @@
long long longlongarg;
unsigned long long ulonglongarg;
ptrdiff_t ptrdiffarg;
+ ssize_t ssizearg;
size_t sizearg;
intmax_t intmaxarg;
uintmax_t uintmaxarg;
@@ -125,7 +126,7 @@
enum typeid {
T_UNUSED, TP_SHORT, T_INT, T_U_INT, TP_INT,
T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG,
- T_PTRDIFFT, TP_PTRDIFFT, T_SIZET, TP_SIZET,
+ T_PTRDIFFT, TP_PTRDIFFT, T_SSIZET, T_SIZET, TP_SIZET,
T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR,
T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR
};
@@ -756,7 +757,7 @@
#define INTMAX_SIZE (INTMAXT|SIZET|PTRDIFFT|LLONGINT)
#define SJARG() \
(flags&INTMAXT ? GETARG(intmax_t) : \
- flags&SIZET ? (intmax_t)GETARG(size_t) : \
+ flags&SIZET ? (intmax_t)GETARG(ssize_t) : \
flags&PTRDIFFT ? (intmax_t)GETARG(ptrdiff_t) : \
(intmax_t)GETARG(long long))
#define UJARG() \
@@ -1571,7 +1572,7 @@
if (flags & INTMAXT) \
ADDTYPE(T_INTMAXT); \
else if (flags & SIZET) \
- ADDTYPE(T_SIZET); \
+ ADDTYPE(T_SSIZET); \
else if (flags & PTRDIFFT) \
ADDTYPE(T_PTRDIFFT); \
else if (flags & LLONGINT) \
@@ -1838,6 +1839,9 @@
case TP_PTRDIFFT:
(*argtable) [n].pptrdiffarg = va_arg (ap, ptrdiff_t *);
break;
+ case T_SSIZET:
+ (*argtable) [n].ssizearg = va_arg (ap, ssize_t);
+ break;
case T_SIZET:
(*argtable) [n].sizearg = va_arg (ap, size_t);
break;
CVS commit: [netbsd-4-0] src/usr.sbin/racoonctl
Module Name:src
Committed By: bouyer
Date: Mon May 11 19:20:34 UTC 2009
Modified Files:
src/usr.sbin/racoonctl [netbsd-4-0]: Makefile
Log Message:
Pull up following revision(s) (requested by spz in ticket #1312):
usr.sbin/racoonctl/Makefile: revision 1.5 via patch
adjust the ADMINPORTDIR to match that of racoon (with which it'll want to talk)
fixes PR 41376
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.20.1 src/usr.sbin/racoonctl/Makefile
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/racoonctl/Makefile
diff -u src/usr.sbin/racoonctl/Makefile:1.1 src/usr.sbin/racoonctl/Makefile:1.1.20.1
--- src/usr.sbin/racoonctl/Makefile:1.1 Sat Feb 19 16:55:05 2005
+++ src/usr.sbin/racoonctl/Makefile Mon May 11 19:20:34 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2005/02/19 16:55:05 thorpej Exp $
+# $NetBSD: Makefile,v 1.1.20.1 2009/05/11 19:20:34 bouyer Exp $
WARNS= 0 # Will be fixed later
@@ -13,7 +13,7 @@
CPPFLAGS+= -I${DIST}/src/racoon -I${DIST}/src/libipsec \
-I${NETBSDSRCDIR}/lib/libipsec \
-DIPSEC_DEBUG -DHAVE_CONFIG_H \
- -DADMINPORTDIR=\"/var/racoon\"
+ -DADMINPORTDIR=\"/var/run\"
LDADD+= -lipsec
DPADD+= ${LIBIPSEC}
CLEANFILES+= racoonctl.cat8
CVS commit: [netbsd-4] src/usr.sbin/racoonctl
Module Name:src
Committed By: bouyer
Date: Mon May 11 19:19:25 UTC 2009
Modified Files:
src/usr.sbin/racoonctl [netbsd-4]: Makefile
Log Message:
Pull up following revision(s) (requested by spz in ticket #1312):
usr.sbin/racoonctl/Makefile: revision 1.5 via patch
adjust the ADMINPORTDIR to match that of racoon (with which it'll want to talk)
fixes PR 41376
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.10.1 src/usr.sbin/racoonctl/Makefile
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/racoonctl/Makefile
diff -u src/usr.sbin/racoonctl/Makefile:1.1 src/usr.sbin/racoonctl/Makefile:1.1.10.1
--- src/usr.sbin/racoonctl/Makefile:1.1 Sat Feb 19 16:55:05 2005
+++ src/usr.sbin/racoonctl/Makefile Mon May 11 19:19:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2005/02/19 16:55:05 thorpej Exp $
+# $NetBSD: Makefile,v 1.1.10.1 2009/05/11 19:19:24 bouyer Exp $
WARNS= 0 # Will be fixed later
@@ -13,7 +13,7 @@
CPPFLAGS+= -I${DIST}/src/racoon -I${DIST}/src/libipsec \
-I${NETBSDSRCDIR}/lib/libipsec \
-DIPSEC_DEBUG -DHAVE_CONFIG_H \
- -DADMINPORTDIR=\"/var/racoon\"
+ -DADMINPORTDIR=\"/var/run\"
LDADD+= -lipsec
DPADD+= ${LIBIPSEC}
CLEANFILES+= racoonctl.cat8
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Mon May 11 18:33:30 UTC 2009
Modified Files:
src/lib/libedit: editline.3 el.c histedit.h
Log Message:
restore binary compatibility by providing new prompt functions that take
an extra literal character.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/lib/libedit/editline.3
cvs rdiff -u -r1.51 -r1.52 src/lib/libedit/el.c
cvs rdiff -u -r1.39 -r1.40 src/lib/libedit/histedit.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/libedit/editline.3
diff -u src/lib/libedit/editline.3:1.67 src/lib/libedit/editline.3:1.68
--- src/lib/libedit/editline.3:1.67 Sat Apr 11 16:48:26 2009
+++ src/lib/libedit/editline.3 Mon May 11 14:33:30 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: editline.3,v 1.67 2009/04/11 20:48:26 joerg Exp $
+.\" $NetBSD: editline.3,v 1.68 2009/05/11 18:33:30 christos Exp $
.\"
.\" Copyright (c) 1997-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -26,7 +26,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd March 31, 2009
+.Dd May 11, 2009
.Dt EDITLINE 3
.Os
.Sh NAME
@@ -218,11 +218,14 @@
.Fa op
are supported, along with the required argument list:
.Bl -tag -width 4n
-.It Dv EL_PROMPT , Fa "char *(*f)(EditLine *)" , Fa "char c"
+.It Dv EL_PROMPT , Fa "char *(*f)(EditLine *)"
Define prompt printing function as
.Fa f ,
which is to return a string that contains the prompt.
-The
+.It Dv EL_PROMPT_ESC , Fa "char *(*f)(EditLine *)" , Fa "char c"
+Same as
+.Dv EL_PROMPT,
+but the
.Fa c
argument indicates the start/stop literal prompt character.
.Pp
@@ -241,6 +244,8 @@
Define right side prompt printing function as
.Fa f ,
which is to return a string that contains the prompt.
+.It Dv EL_RPROMPT_ESC , Fa "char *(*f)(EditLine *)" , Fa "char c"
+Define the right prompt printing function but with a literal escape character.
.It Dv EL_TERMINAL , Fa "const char *type"
Define terminal type of the tty to be
.Fa type ,
Index: src/lib/libedit/el.c
diff -u src/lib/libedit/el.c:1.51 src/lib/libedit/el.c:1.52
--- src/lib/libedit/el.c:1.51 Tue Mar 31 13:38:27 2009
+++ src/lib/libedit/el.c Mon May 11 14:33:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: el.c,v 1.51 2009/03/31 17:38:27 christos Exp $ */
+/* $NetBSD: el.c,v 1.52 2009/05/11 18:33:30 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)el.c 8.2 (Berkeley) 1/3/94";
#else
-__RCSID("$NetBSD: el.c,v 1.51 2009/03/31 17:38:27 christos Exp $");
+__RCSID("$NetBSD: el.c,v 1.52 2009/05/11 18:33:30 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -157,6 +157,14 @@
case EL_PROMPT:
case EL_RPROMPT: {
el_pfunc_t p = va_arg(ap, el_pfunc_t);
+
+ rv = prompt_set(el, p, 0, op);
+ break;
+ }
+
+ case EL_PROMPT_ESC:
+ case EL_RPROMPT_ESC: {
+ el_pfunc_t p = va_arg(ap, el_pfunc_t);
char c = va_arg(ap, int);
rv = prompt_set(el, p, c, op);
Index: src/lib/libedit/histedit.h
diff -u src/lib/libedit/histedit.h:1.39 src/lib/libedit/histedit.h:1.40
--- src/lib/libedit/histedit.h:1.39 Tue Mar 31 13:38:27 2009
+++ src/lib/libedit/histedit.h Mon May 11 14:33:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: histedit.h,v 1.39 2009/03/31 17:38:27 christos Exp $ */
+/* $NetBSD: histedit.h,v 1.40 2009/05/11 18:33:30 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -115,7 +115,7 @@
/*
* el_set/el_get parameters
*/
-#define EL_PROMPT 0 /* , el_pfunc_t, char); */
+#define EL_PROMPT 0 /* , el_pfunc_t); */
#define EL_TERMINAL 1 /* , const char *); */
#define EL_EDITOR 2 /* , const char *); */
#define EL_SIGNAL 3 /* , int); */
@@ -128,15 +128,17 @@
/* , el_func_t); */
#define EL_HIST 10 /* , hist_fun_t, const char *); */
#define EL_EDITMODE 11 /* , int); */
-#define EL_RPROMPT 12 /* , el_pfunc_t, char); */
+#define EL_RPROMPT 12 /* , el_pfunc_t); */
#define EL_GETCFN 13 /* , el_rfunc_t); */
#define EL_CLIENTDATA 14 /* , void *); */
#define EL_UNBUFFERED 15 /* , int); */
-#define EL_PREP_TERM16 /* , int); */
+#define EL_PREP_TERM 16 /* , int); */
#define EL_GETTC 17 /* , const char *, ..., NULL); */
#define EL_GETFP 18 /* , int, FILE **); */
#define EL_SETFP 19 /* , int, FILE *); */
-#define EL_REFRESH 20 /* , void); */
+#define EL_REFRESH 20 /* , void); */
+#define EL_PROMPT_ESC 21 /* , el_pfunc_t, char); */
+#define EL_RPROMPT_ESC 22 /* , el_pfunc_t, char); */
#define EL_BUILTIN_GETCFN (NULL)
CVS commit: src/sys/dev/ata
Module Name:src
Committed By: cegger
Date: Mon May 11 17:14:31 UTC 2009
Modified Files:
src/sys/dev/ata: ata_raid_intel.c ata_raid_jmicron.c
Log Message:
use device_xname()
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ata/ata_raid_intel.c \
src/sys/dev/ata/ata_raid_jmicron.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/ata/ata_raid_intel.c
diff -u src/sys/dev/ata/ata_raid_intel.c:1.3 src/sys/dev/ata/ata_raid_intel.c:1.4
--- src/sys/dev/ata/ata_raid_intel.c:1.3 Tue Sep 16 11:45:30 2008
+++ src/sys/dev/ata/ata_raid_intel.c Mon May 11 17:14:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_intel.c,v 1.3 2008/09/16 11:45:30 tron Exp $ */
+/* $NetBSD: ata_raid_intel.c,v 1.4 2009/05/11 17:14:31 cegger Exp $ */
/*-
* Copyright (c) 2000-2008 Søren Schmidt
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_intel.c,v 1.3 2008/09/16 11:45:30 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_intel.c,v 1.4 2009/05/11 17:14:31 cegger Exp $");
#include
#include
@@ -224,7 +224,7 @@
break;
default:
DPRINTF(("%s: unknown Intel MatrixRAID type 0x%02x\n",
- sc->sc_dev->dv_xname, map->type));
+ device_xname(sc->sc_dev), map->type));
error = EINVAL;
goto out;
}
Index: src/sys/dev/ata/ata_raid_jmicron.c
diff -u src/sys/dev/ata/ata_raid_jmicron.c:1.3 src/sys/dev/ata/ata_raid_jmicron.c:1.4
--- src/sys/dev/ata/ata_raid_jmicron.c:1.3 Mon Sep 15 11:44:50 2008
+++ src/sys/dev/ata/ata_raid_jmicron.c Mon May 11 17:14:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ata_raid_jmicron.c,v 1.3 2008/09/15 11:44:50 tron Exp $ */
+/* $NetBSD: ata_raid_jmicron.c,v 1.4 2009/05/11 17:14:31 cegger Exp $ */
/*-
* Copyright (c) 2000-2008 Søren Schmidt
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ata_raid_jmicron.c,v 1.3 2008/09/15 11:44:50 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata_raid_jmicron.c,v 1.4 2009/05/11 17:14:31 cegger Exp $");
#include
#include
@@ -223,7 +223,7 @@
break;
default:
DPRINTF(("%s: unknown JMicron RAID type 0x%02x\n",
- sc->sc_dev->dv_xname, info->type));
+ device_xname(sc->sc_dev), info->type));
error = EINVAL;
goto out;
}
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: he Date: Mon May 11 16:16:42 UTC 2009 Modified Files: src/sys/arch/evbppc/conf: WALNUT Log Message: Bump SYMTAB_SPACE so that it fits again. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbppc/conf/WALNUT 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/evbppc/conf/WALNUT diff -u src/sys/arch/evbppc/conf/WALNUT:1.40 src/sys/arch/evbppc/conf/WALNUT:1.41 --- src/sys/arch/evbppc/conf/WALNUT:1.40 Fri Mar 6 20:31:48 2009 +++ src/sys/arch/evbppc/conf/WALNUT Mon May 11 16:16:42 2009 @@ -1,4 +1,4 @@ -# $NetBSD: WALNUT,v 1.40 2009/03/06 20:31:48 joerg Exp $ +# $NetBSD: WALNUT,v 1.41 2009/05/11 16:16:42 he Exp $ # # GENERIC -- everything that's currently supported # @@ -39,7 +39,7 @@ options DDB # in-kernel debugger options DDB_HISTORY_SIZE=512 # enable history editing in DDB options TRAP_PANICWAIT -options SYMTAB_SPACE=40 # size for embedded symbol table +options SYMTAB_SPACE=41 # size for embedded symbol table makeoptions DEBUG="-g" # compile full symbol table
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src
Committed By: he
Date: Mon May 11 16:09:24 UTC 2009
Modified Files:
src/sys/arch/powerpc/ibm4xx: pmap.c
Log Message:
Follow up the changed prototype of pmap_enter(), flag from int to u_int.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/ibm4xx/pmap.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/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.54 src/sys/arch/powerpc/ibm4xx/pmap.c:1.55
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.54 Wed Mar 18 10:22:34 2009
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Mon May 11 16:09:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.54 2009/03/18 10:22:34 cegger Exp $ */
+/* $NetBSD: pmap.c,v 1.55 2009/05/11 16:09:24 he Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.54 2009/03/18 10:22:34 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.55 2009/05/11 16:09:24 he Exp $");
#include
#include
@@ -809,7 +809,7 @@
* Insert physical page at pa into the given pmap at virtual address va.
*/
int
-pmap_enter(struct pmap *pm, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
+pmap_enter(struct pmap *pm, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
{
int s;
u_int tte;
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: tsutsui Date: Mon May 11 15:47:36 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Fix more pasto botches in pmf(9) entries. To generate a diff of this commit: cvs rdiff -u -r1.1255 -r1.1256 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1255 src/distrib/sets/lists/comp/mi:1.1256 --- src/distrib/sets/lists/comp/mi:1.1255 Mon May 11 14:45:04 2009 +++ src/distrib/sets/lists/comp/mi Mon May 11 15:47:36 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1255 2009/05/11 14:45:04 roy Exp $ +# $NetBSD: mi,v 1.1256 2009/05/11 15:47:36 tsutsui Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -19473,25 +19473,25 @@ ./usr/share/man/man9/pmc_start_profiling.9 comp-sys-man .man ./usr/share/man/man9/pmc_stop_profiling.9 comp-sys-man .man ./usr/share/man/man9/pmf.9 comp-sys-man .man -./usr/share/man/man9/pmf_class_display_register.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_class_input_register.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_class_network_register.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_device_deregister.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_device_recursive_suspend.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_device_recursive_resume.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_device_register.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_device_register1.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_device_resume.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_device_resume_subtree.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_device_suspend.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_event_deregister.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_event_inject.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_event_register.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_get_platform.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_set_platform.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_system_resume.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_system_shutdown.9 comp-sys-catman .cat -./usr/share/man/man9/pmf_system_suspend.9 comp-sys-catman .cat +./usr/share/man/man9/pmf_class_display_register.9 comp-sys-man .man +./usr/share/man/man9/pmf_class_input_register.9 comp-sys-man .man +./usr/share/man/man9/pmf_class_network_register.9 comp-sys-man .man +./usr/share/man/man9/pmf_device_deregister.9 comp-sys-man .man +./usr/share/man/man9/pmf_device_recursive_suspend.9 comp-sys-man .man +./usr/share/man/man9/pmf_device_recursive_resume.9 comp-sys-man .man +./usr/share/man/man9/pmf_device_register.9 comp-sys-man .man +./usr/share/man/man9/pmf_device_register1.9 comp-sys-man .man +./usr/share/man/man9/pmf_device_resume.9 comp-sys-man .man +./usr/share/man/man9/pmf_device_resume_subtree.9 comp-sys-man .man +./usr/share/man/man9/pmf_device_suspend.9 comp-sys-man .man +./usr/share/man/man9/pmf_event_deregister.9 comp-sys-man .man +./usr/share/man/man9/pmf_event_inject.9 comp-sys-man .man +./usr/share/man/man9/pmf_event_register.9 comp-sys-man .man +./usr/share/man/man9/pmf_get_platform.9 comp-sys-man .man +./usr/share/man/man9/pmf_set_platform.9 comp-sys-man .man +./usr/share/man/man9/pmf_system_resume.9 comp-sys-man .man +./usr/share/man/man9/pmf_system_shutdown.9 comp-sys-man .man +./usr/share/man/man9/pmf_system_suspend.9 comp-sys-man .man ./usr/share/man/man9/pool.9 comp-sys-man .man ./usr/share/man/man9/pool_cache.9 comp-sys-man .man ./usr/share/man/man9/pool_cache_destroy.9 comp-sys-man .man
CVS commit: src/sys/dev/ic
Module Name:src Committed By: tsutsui Date: Mon May 11 15:42:34 UTC 2009 Modified Files: src/sys/dev/ic: rtl8169.c rtl81x9reg.h Log Message: - rename RTK_HWREV_8102EL_SPIN2 -> RTK_HWREV_8103E - add a HWREV value for 8168DP Per Realtek's Linux drivers. To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/sys/dev/ic/rtl8169.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/ic/rtl81x9reg.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/rtl8169.c diff -u src/sys/dev/ic/rtl8169.c:1.118 src/sys/dev/ic/rtl8169.c:1.119 --- src/sys/dev/ic/rtl8169.c:1.118 Sun May 3 13:49:07 2009 +++ src/sys/dev/ic/rtl8169.c Mon May 11 15:42:34 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rtl8169.c,v 1.118 2009/05/03 13:49:07 tsutsui Exp $ */ +/* $NetBSD: rtl8169.c,v 1.119 2009/05/11 15:42:34 tsutsui Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.118 2009/05/03 13:49:07 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.119 2009/05/11 15:42:34 tsutsui Exp $"); /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */ /* @@ -610,7 +610,7 @@ break; case RTK_HWREV_8102E: case RTK_HWREV_8102EL: - case RTK_HWREV_8102EL_SPIN2: + case RTK_HWREV_8103E: sc->sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD | RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_NOJUMBO; break; Index: src/sys/dev/ic/rtl81x9reg.h diff -u src/sys/dev/ic/rtl81x9reg.h:1.38 src/sys/dev/ic/rtl81x9reg.h:1.39 --- src/sys/dev/ic/rtl81x9reg.h:1.38 Wed Apr 29 15:10:57 2009 +++ src/sys/dev/ic/rtl81x9reg.h Mon May 11 15:42:33 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rtl81x9reg.h,v 1.38 2009/04/29 15:10:57 tsutsui Exp $ */ +/* $NetBSD: rtl81x9reg.h,v 1.39 2009/05/11 15:42:33 tsutsui Exp $ */ /* * Copyright (c) 1997, 1998 @@ -158,8 +158,9 @@ #define RTK_HWREV_8169_8110SB 0x1000 #define RTK_HWREV_8169_8110SC 0x1800 #define RTK_HWREV_8102EL 0x2480 -#define RTK_HWREV_8102EL_SPIN2 0x24C0 +#define RTK_HWREV_8103E 0x24C0 #define RTK_HWREV_8168D 0x2800 +#define RTK_HWREV_8168DP 0x2880 #define RTK_HWREV_8168_SPIN1 0x3000 #define RTK_HWREV_8100E 0x3080 #define RTK_HWREV_8101E 0x3400
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: roy Date: Mon May 11 14:45:04 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Fix flist, ok:cube To generate a diff of this commit: cvs rdiff -u -r1.1254 -r1.1255 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1254 src/distrib/sets/lists/comp/mi:1.1255 --- src/distrib/sets/lists/comp/mi:1.1254 Sun May 10 10:59:21 2009 +++ src/distrib/sets/lists/comp/mi Mon May 11 14:45:04 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1254 2009/05/10 10:59:21 tsutsui Exp $ +# $NetBSD: mi,v 1.1255 2009/05/11 14:45:04 roy Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -14037,25 +14037,25 @@ ./usr/share/man/html9/pmc_start_profiling.html comp-sys-htmlman html ./usr/share/man/html9/pmc_stop_profiling.html comp-sys-htmlman html ./usr/share/man/html9/pmf.html comp-sys-htmlman html -./usr/share/man/html9/pmf_class_display_register.html comp-sys-catman .cat -./usr/share/man/html9/pmf_class_input_register.html comp-sys-catman .cat -./usr/share/man/html9/pmf_class_network_register.html comp-sys-catman .cat -./usr/share/man/html9/pmf_device_deregister.html comp-sys-catman .cat -./usr/share/man/html9/pmf_device_recursive_suspend.html comp-sys-catman .cat -./usr/share/man/html9/pmf_device_recursive_resume.html comp-sys-catman .cat -./usr/share/man/html9/pmf_device_register.html comp-sys-catman .cat -./usr/share/man/html9/pmf_device_register1.html comp-sys-catman .cat -./usr/share/man/html9/pmf_device_resume.html comp-sys-catman .cat -./usr/share/man/html9/pmf_device_resume_subtree.html comp-sys-catman .cat -./usr/share/man/html9/pmf_device_suspend.html comp-sys-catman .cat -./usr/share/man/html9/pmf_event_deregister.html comp-sys-catman .cat -./usr/share/man/html9/pmf_event_inject.html comp-sys-catman .cat -./usr/share/man/html9/pmf_event_register.html comp-sys-catman .cat -./usr/share/man/html9/pmf_get_platform.html comp-sys-catman .cat -./usr/share/man/html9/pmf_set_platform.html comp-sys-catman .cat -./usr/share/man/html9/pmf_system_resume.html comp-sys-catman .cat -./usr/share/man/html9/pmf_system_shutdown.html comp-sys-catman .cat -./usr/share/man/html9/pmf_system_suspend.html comp-sys-catman .cat +./usr/share/man/html9/pmf_class_display_register.html comp-sys-htmlman html +./usr/share/man/html9/pmf_class_input_register.html comp-sys-htmlman html +./usr/share/man/html9/pmf_class_network_register.html comp-sys-htmlman html +./usr/share/man/html9/pmf_device_deregister.html comp-sys-htmlman html +./usr/share/man/html9/pmf_device_recursive_suspend.html comp-sys-htmlman html +./usr/share/man/html9/pmf_device_recursive_resume.html comp-sys-htmlman html +./usr/share/man/html9/pmf_device_register.html comp-sys-htmlman html +./usr/share/man/html9/pmf_device_register1.html comp-sys-htmlman html +./usr/share/man/html9/pmf_device_resume.html comp-sys-htmlman html +./usr/share/man/html9/pmf_device_resume_subtree.html comp-sys-htmlman html +./usr/share/man/html9/pmf_device_suspend.html comp-sys-htmlman html +./usr/share/man/html9/pmf_event_deregister.html comp-sys-htmlman html +./usr/share/man/html9/pmf_event_inject.html comp-sys-htmlman html +./usr/share/man/html9/pmf_event_register.html comp-sys-htmlman html +./usr/share/man/html9/pmf_get_platform.html comp-sys-htmlman html +./usr/share/man/html9/pmf_set_platform.html comp-sys-htmlman html +./usr/share/man/html9/pmf_system_resume.html comp-sys-htmlman html +./usr/share/man/html9/pmf_system_shutdown.html comp-sys-htmlman html +./usr/share/man/html9/pmf_system_suspend.html comp-sys-htmlman html ./usr/share/man/html9/pool.html comp-sys-htmlman html ./usr/share/man/html9/pool_cache.html comp-sys-htmlman html ./usr/share/man/html9/pool_cache_destroy.html comp-sys-htmlman html
CVS commit: src/sys/netkey
Module Name:src
Committed By: skd
Date: Mon May 11 11:00:51 UTC 2009
Modified Files:
src/sys/netkey: key.c
Log Message:
Fix the sense of two compares. I previously broke this.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/netkey/key.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/netkey/key.c
diff -u src/sys/netkey/key.c:1.174 src/sys/netkey/key.c:1.175
--- src/sys/netkey/key.c:1.174 Sat Apr 18 14:58:06 2009
+++ src/sys/netkey/key.c Mon May 11 11:00:51 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.174 2009/04/18 14:58:06 tsutsui Exp $ */
+/* $NetBSD: key.c,v 1.175 2009/05/11 11:00:51 skd Exp $ */
/* $KAME: key.c,v 1.310 2003/09/08 02:23:44 itojun Exp $ */
/*
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.174 2009/04/18 14:58:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.175 2009/05/11 11:00:51 skd Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -651,7 +651,7 @@
LIST_FOREACH(sah, &sahtree, chain) {
if (sah->state == SADB_SASTATE_DEAD)
continue;
- if (key_cmpsaidx_withmode(&sah->saidx, saidx) == 0)
+ if (key_cmpsaidx_withmode(&sah->saidx, saidx))
goto found;
}
@@ -2893,7 +2893,7 @@
LIST_FOREACH(sah, &sahtree, chain) {
if (sah->state == SADB_SASTATE_DEAD)
continue;
- if (key_cmpsaidx_exactly(&sah->saidx, saidx) == 0)
+ if (key_cmpsaidx_exactly(&sah->saidx, saidx))
return (sah);
}
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon May 11 10:51:44 UTC 2009 Modified Files: src/share/man/man4: onewire.4 Log Message: Comment out owid(4) reference. Per PR 41405 from Jukka Ruohonen. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/onewire.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/onewire.4 diff -u src/share/man/man4/onewire.4:1.2 src/share/man/man4/onewire.4:1.3 --- src/share/man/man4/onewire.4:1.2 Sat Apr 8 23:10:03 2006 +++ src/share/man/man4/onewire.4 Mon May 11 10:51:44 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: onewire.4,v 1.2 2006/04/08 23:10:03 wiz Exp $ +.\" $NetBSD: onewire.4,v 1.3 2009/05/11 10:51:44 wiz Exp $ .\" $OpenBSD: onewire.4,v 1.2 2006/03/06 10:24:46 grange Exp $ .\" .\" Copyright (c) 2006 Alexander Yurchenko @@ -49,8 +49,8 @@ .El .Sh SUPPORTED SLAVES .Bl -tag -width 10n -offset ind -compact -.It Xr owid 4 -ID family type device +.\".It Xr owid 4 +.\"ID family type device .It Xr owtemp 4 temperature family type device .El
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon May 11 10:10:13 UTC 2009 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Import dhcpcd-5.0.3 To generate a diff of this commit: cvs rdiff -u -r1.693 -r1.694 src/doc/3RDPARTY cvs rdiff -u -r1.1227 -r1.1228 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/3RDPARTY diff -u src/doc/3RDPARTY:1.693 src/doc/3RDPARTY:1.694 --- src/doc/3RDPARTY:1.693 Sun May 10 16:54:00 2009 +++ src/doc/3RDPARTY Mon May 11 10:10:13 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.693 2009/05/10 16:54:00 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.694 2009/05/11 10:10:13 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -258,8 +258,8 @@ top of the current tree. Package: dhcpcd -Version: 5.0.2 -Current Vers: 5.0.2 +Version: 5.0.3 +Current Vers: 5.0.3 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1227 src/doc/CHANGES:1.1228 --- src/doc/CHANGES:1.1227 Sun May 10 16:54:00 2009 +++ src/doc/CHANGES Mon May 11 10:10:13 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1227 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1228 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -270,3 +270,4 @@ section [wiz 20090508] file(1): Import 5.03 [christos 20090508] dhcpcd(8): Import dhcpcd-5.0.2 [roy 20090510] + dhcpcd(8): Import dhcpcd-5.0.3 [roy 20090511]
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Mon May 11 08:52:48 UTC 2009 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv26086 Log Message: Import dhcpcd-5.0.3 Changes from 5.0.2 * Fix crash when ifa_addr from getifaddrs(3) is NULL Status: Vendor Tag: roy Release Tags: dhcpcd-5-0-3 U src/external/bsd/dhcpcd/dist/README U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/bind.c U src/external/bsd/dhcpcd/dist/bind.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/configure.c U src/external/bsd/dhcpcd/dist/configure.h U src/external/bsd/dhcpcd/dist/control.c U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/net.c U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/signals.c U src/external/bsd/dhcpcd/dist/signals.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf No conflicts created by this import
CVS commit: src/sys/arch/arm/xscale
Module Name:src
Committed By: nonaka
Date: Mon May 11 08:27:04 UTC 2009
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_mci.c
Log Message:
Don't touch dma data when PMC_CAPS_NO_DMA is set.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/xscale/pxa2x0_mci.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/arm/xscale/pxa2x0_mci.c
diff -u src/sys/arch/arm/xscale/pxa2x0_mci.c:1.1 src/sys/arch/arm/xscale/pxa2x0_mci.c:1.2
--- src/sys/arch/arm/xscale/pxa2x0_mci.c:1.1 Tue Apr 21 03:00:29 2009
+++ src/sys/arch/arm/xscale/pxa2x0_mci.c Mon May 11 08:27:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_mci.c,v 1.1 2009/04/21 03:00:29 nonaka Exp $ */
+/* $NetBSD: pxa2x0_mci.c,v 1.2 2009/05/11 08:27:03 nonaka Exp $ */
/* $OpenBSD: pxa2x0_mmc.c,v 1.5 2009/02/23 18:09:55 miod Exp $ */
/*
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_mci.c,v 1.1 2009/04/21 03:00:29 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_mci.c,v 1.2 2009/05/11 08:27:03 nonaka Exp $");
#include
#include
@@ -797,11 +797,12 @@
device_xname(sc->sc_dev)));
pxamci_disable_intr(sc, MMC_I_DAT_ERR);
CLR(status, MMC_I_DAT_ERR);
- if (!ISSET(sc->sc_caps, PMC_CAPS_NO_DMA)
- && (ISSET(sc->sc_cmd->c_flags, SCF_CMD_READ))) {
- pxa2x0_dmac_abort_xfer(sc->sc_rxdx);
- } else {
- pxa2x0_dmac_abort_xfer(sc->sc_txdx);
+ if (!ISSET(sc->sc_caps, PMC_CAPS_NO_DMA)) {
+ if (ISSET(sc->sc_cmd->c_flags, SCF_CMD_READ)) {
+pxa2x0_dmac_abort_xfer(sc->sc_rxdx);
+ } else {
+pxa2x0_dmac_abort_xfer(sc->sc_txdx);
+ }
}
sc->sc_cmd->c_error = EIO;
pxamci_intr_done(sc);
