date:20101008

CVS commit: src/sys/dev/acpi

2010-10-08 Thread Grégoire Sutre

Module Name:src
Committed By:   gsutre
Date:   Fri Oct  8 07:04:32 UTC 2010

Modified Files:
src/sys/dev/acpi: acpi_power.c acpi_wakedev.c

Log Message:
Store sysctl MIBs instead of a pointer to the root of the sysctl
sub-tree (because the pointer may be invalid at the time we use it).

ok jruoho@


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/acpi/acpi_power.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/acpi/acpi_wakedev.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/acpi/acpi_power.c
diff -u src/sys/dev/acpi/acpi_power.c:1.22 src/sys/dev/acpi/acpi_power.c:1.23
--- src/sys/dev/acpi/acpi_power.c:1.22	Fri Aug  6 18:10:40 2010
+++ src/sys/dev/acpi/acpi_power.c	Fri Oct  8 07:04:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_power.c,v 1.22 2010/08/06 18:10:40 jruoho Exp $ */
+/* $NetBSD: acpi_power.c,v 1.23 2010/10/08 07:04:31 gsutre Exp $ */
 
 /*-
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.22 2010/08/06 18:10:40 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_power.c,v 1.23 2010/10/08 07:04:31 gsutre Exp $");
 
 #include 
 #include 
@@ -99,7 +99,8 @@
 static TAILQ_HEAD(, acpi_power_res) res_head =
 	TAILQ_HEAD_INITIALIZER(res_head);
 
-static const struct sysctlnode	*anode = NULL;
+static int32_t acpi_power_acpinode = CTL_EOL;
+static int32_t acpi_power_powernode = CTL_EOL;
 
 static struct acpi_power_res	*acpi_power_res_init(ACPI_HANDLE);
 static struct acpi_power_res	*acpi_power_res_get(ACPI_HANDLE);
@@ -691,6 +692,7 @@
 
 SYSCTL_SETUP(sysctl_acpi_power_setup, "sysctl hw.acpi.power subtree setup")
 {
+	const struct sysctlnode *anode;
 	int err;
 
 	err = sysctl_createv(NULL, 0, NULL, &anode,
@@ -699,7 +701,7 @@
 	CTL_HW, CTL_EOL);
 
 	if (err != 0)
-		goto fail;
+		return;
 
 	err = sysctl_createv(NULL, 0, &anode, &anode,
 	CTLFLAG_PERMANENT, CTLTYPE_NODE, "acpi",
@@ -707,7 +709,9 @@
 	CTL_CREATE, CTL_EOL);
 
 	if (err != 0)
-		goto fail;
+		return;
+
+	acpi_power_acpinode = anode->sysctl_num;
 
 	err = sysctl_createv(NULL, 0, &anode, &anode,
 	CTLFLAG_PERMANENT, CTLTYPE_NODE,
@@ -716,12 +720,9 @@
 	CTL_CREATE, CTL_EOL);
 
 	if (err != 0)
-		goto fail;
-
-	return;
+		return;
 
-fail:
-	anode = NULL;
+	acpi_power_powernode = anode->sysctl_num;
 }
 
 void
@@ -732,7 +733,8 @@
 	KASSERT(ad != NULL && ad->ad_root != NULL);
 	KASSERT((ad->ad_flags & ACPI_DEVICE_POWER) != 0);
 
-	if (anode == NULL)
+	if (acpi_power_acpinode == CTL_EOL ||
+	acpi_power_powernode == CTL_EOL)
 		return;
 
 	/*
@@ -740,9 +742,10 @@
 	 * may power multiple devices, it is unclear whether
 	 * power resources should be controllable by an user.
 	 */
-	err = sysctl_createv(NULL, 0, &anode, NULL,
+	err = sysctl_createv(NULL, 0, NULL, NULL,
 	CTLFLAG_READONLY, CTLTYPE_STRING, ad->ad_name,
 	NULL, acpi_power_sysctl, 0, ad, 0,
+	CTL_HW, acpi_power_acpinode, acpi_power_powernode,
 	CTL_CREATE, CTL_EOL);
 
 	if (err != 0)

Index: src/sys/dev/acpi/acpi_wakedev.c
diff -u src/sys/dev/acpi/acpi_wakedev.c:1.17 src/sys/dev/acpi/acpi_wakedev.c:1.18
--- src/sys/dev/acpi/acpi_wakedev.c:1.17	Mon Jun  7 14:12:20 2010
+++ src/sys/dev/acpi/acpi_wakedev.c	Fri Oct  8 07:04:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.17 2010/06/07 14:12:20 jruoho Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.18 2010/10/08 07:04:31 gsutre Exp $ */
 
 /*-
  * Copyright (c) 2009, 2010 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.17 2010/06/07 14:12:20 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakedev.c,v 1.18 2010/10/08 07:04:31 gsutre Exp $");
 
 #include 
 #include 
@@ -50,7 +50,8 @@
 	NULL,
 };
 
-static const struct sysctlnode *rnode = NULL;
+static int32_t acpi_wakedev_acpinode = CTL_EOL;
+static int32_t acpi_wakedev_wakenode = CTL_EOL;
 
 static void	acpi_wakedev_method(struct acpi_devnode *, int, int);
 static void	acpi_wakedev_gpe(struct acpi_devnode *, int, int);
@@ -58,6 +59,7 @@
 
 SYSCTL_SETUP(sysctl_acpi_wakedev_setup, "sysctl hw.acpi.wake subtree setup")
 {
+	const struct sysctlnode *rnode;
 	int err;
 
 	err = sysctl_createv(NULL, 0, NULL, &rnode,
@@ -66,7 +68,7 @@
 	CTL_HW, CTL_EOL);
 
 	if (err != 0)
-		goto fail;
+		return;
 
 	err = sysctl_createv(NULL, 0, &rnode, &rnode,
 	CTLFLAG_PERMANENT, CTLTYPE_NODE, "acpi",
@@ -74,7 +76,9 @@
 	CTL_CREATE, CTL_EOL);
 
 	if (err != 0)
-		goto fail;
+		return;
+
+	acpi_wakedev_acpinode = rnode->sysctl_num;
 
 	err = sysctl_createv(NULL, 0, &rnode, &rnode,
 	CTLFLAG_PERMANENT, CTLTYPE_NODE,
@@ -83,12 +87,9 @@
 	CTL_CREATE, CTL_EOL);
 
 	if (err != 0)
-		goto fail;
-
-	return;
+		return;
 
-fail:
-	rnode = NULL;
+	acpi_wakedev_wakenode = rnode->sysctl_num;
 }
 
 void
@@ -104,12 +105,14 @@
 	if (acpi_match_hid(ad->ad_devinfo, acpi_wakedev_default))
 		ad->ad_wa

CVS commit: src/sys/dev/marvell

2010-10-08 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Fri Oct  8 11:20:22 UTC 2010

Modified Files:
src/sys/dev/marvell: mvsdio.c

Log Message:
Add more explanation to .  It value from Marvell LSP.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/marvell/mvsdio.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/marvell/mvsdio.c
diff -u src/sys/dev/marvell/mvsdio.c:1.1 src/sys/dev/marvell/mvsdio.c:1.2
--- src/sys/dev/marvell/mvsdio.c:1.1	Thu Sep 23 12:36:01 2010
+++ src/sys/dev/marvell/mvsdio.c	Fri Oct  8 11:20:22 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: mvsdio.c,v 1.1 2010/09/23 12:36:01 kiyohara Exp $	*/
+/*	$NetBSD: mvsdio.c,v 1.2 2010/10/08 11:20:22 kiyohara Exp $	*/
 /*
  * Copyright (c) 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mvsdio.c,v 1.1 2010/09/23 12:36:01 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsdio.c,v 1.2 2010/10/08 11:20:22 kiyohara Exp $");
 
 #include "opt_mvsdio.h"
 
@@ -236,7 +236,7 @@
 	saa.saa_sct = &mvsdio_chip_functions;
 	saa.saa_sch = sc;
 	saa.saa_dmat = sc->sc_dmat;
-	saa.saa_clkmin = 100;			/* : 100 kHz */
+	saa.saa_clkmin = 100;		/* : 100 kHz from SheevaPlug LSP */
 	saa.saa_clkmax = MVSDIO_MAX_CLOCK;
 	saa.saa_caps = SMC_CAPS_AUTO_STOP | SMC_CAPS_4BIT_MODE | SMC_CAPS_DMA;
 #ifndef MVSDIO_CARD_DETECT

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd

2010-10-08 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Oct  8 17:49:26 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alphaMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast: dreamcastMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips:
ews4800mipsMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc: macppcMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips: newsmipsMouse.c

Log Message:
Handle WSMOUSEIO_SETVERSION in legacy XFree based MD servers
for workaround until eventual Xorg migration.
Taken from Xhpc as noted in PR xsrc/41619, but tested only on dreamcast.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcMouse.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsMouse.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/netbsd/alpha/alphaMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.1	Sun Jan 18 04:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c	Fri Oct  8 17:49:25 2010
@@ -153,6 +153,19 @@
 		Error ("alphaMouseProc ioctl VUIDSFORMAT");
 		return !Success;
 	}
+#endif
+
+#ifdef WSMOUSEIO_SETVERSION
+	   {
+   int version = WSMOUSE_EVENT_VERSION;
+   if (ioctl(alphaPtrPriv.fd, WSMOUSEIO_SETVERSION, &version) == -1) {
+   Error ("alphaMouseProc ioctl WSMOUSEIO_SETVERSION");
+   return !Success;
+   }
+   }
+#endif
+
+#if 0
 	alphaPtrPriv.bmask = 0;
 	AddEnabledDevice (alphaPtrPriv.fd);
 #endif

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.1	Sun Jan 18 05:21:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c	Fri Oct  8 17:49:25 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: decMouse.c,v 1.1 2004/01/18 05:21:41 rtr Exp $	*/
+/*	$NetBSD: decMouse.c,v 1.2 2010/10/08 17:49:25 tsutsui Exp $	*/
 
 /* XConsortium: sunMouse.c,v 5.21 94/04/17 20:29:47 kaleb Exp */
 /*-
@@ -131,6 +131,19 @@
 		Error ("decMouseProc ioctl VUIDSFORMAT");
 		return !Success;
 	}
+#endif
+
+#ifdef WSMOUSEIO_SETVERSION
+	   {
+   int version = WSMOUSE_EVENT_VERSION;
+   if (ioctl(decPtrPriv.fd, WSMOUSEIO_SETVERSION, &version) == -1) {
+   Error ("decMouseProc ioctl WSMOUSEIO_SETVERSION");
+   return !Success;
+   }
+   }
+#endif
+
+#if 0
 	decPtrPriv.bmask = 0;
 #endif
 	AddEnabledDevice (decPtrPriv.fd);

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.1	Sat Feb  7 02:39:07 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c	Fri Oct  8 17:49:25 2010
@@ -131,6 +131,16 @@
 	break;
 
 	case DEVICE_ON:
+#ifdef WSMOUSEIO_SETVERSION
+	   {
+   int version = WSMOUSE_EVENT_VERSION;
+   if (ioctl(dreamcastPtrPriv.fd, WSMOUSEIO_SETVERSION, &version) == -1) {
+   Error ("dreamcastMouseProc ioctl WSMOUSEIO_SETVERSION");
+   return !Success;
+   }
+   }
+#endif
+
 	dreamcastPtrPriv.bmask = 0;
 
 	AddEnabledDevice (dreamcastPtrPriv.fd);

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.1	Thu Dec 29 15:43:40 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c	Fri Oct  8 17:49:25 2010
@@ -120,6 +120,16 @@
 		break;
 
 	case DEVICE_ON:
+#ifdef WSMOUSEIO_SETVERSION
+	   {
+   int version = WSMOUSE_EVENT_VERSION;
+   if (ioctl(ews4

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast

2010-10-08 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Oct  8 18:53:12 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast: dreamcastKbd.c

Log Message:
Also handle WSKBDIO_SETVERSION. Now Xdreamcast works again.

XXX: not sure if other MD legacy servers need this


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.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/netbsd/dreamcast/dreamcastKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.3	Wed Jul  7 18:46:52 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c	Fri Oct  8 18:53:11 2010
@@ -158,6 +158,15 @@
 case DEVICE_ON:
 	pPriv = (dreamcastKbdPrivPtr)pKeyboard->devicePrivate;
 	dreamcastCleanupFd(pPriv->fd);
+#ifdef WSKBDIO_SETVERSION
+	   {
+		int version = WSKBDIO_EVENT_VERSION;
+		if (ioctl(pPriv->fd, WSKBDIO_SETVERSION, &version) == -1) {
+		Error ("dreamcastKbdProc ioctl WSKBDIO_SETVERSION");
+		return !Success;
+		}
+   }
+#endif
 	AddEnabledDevice(pPriv->fd);
 	pKeyboard->on = TRUE;
 	break;

CVS commit: [yamt-nfs-mp] src/sys

2010-10-08 Thread YAMAMOTO Takashi

Module Name:src
Committed By:   yamt
Date:   Sat Oct  9 03:32:47 UTC 2010

Modified Files:
src/sys/arch/alpha/alpha [yamt-nfs-mp]: dec_6600.c
src/sys/arch/alpha/common [yamt-nfs-mp]: sgmap_typedep.c
src/sys/arch/alpha/include [yamt-nfs-mp]: alpha_cpu.h elf_machdep.h
logout.h
src/sys/arch/alpha/pci [yamt-nfs-mp]: tsc.c tsp_pci.c tsreg.h tsvar.h
src/sys/arch/alpha/stand/common [yamt-nfs-mp]: boot.c
src/sys/arch/alpha/stand/ustarboot [yamt-nfs-mp]: Makefile
src/sys/arch/amd64/amd64 [yamt-nfs-mp]: machdep.c netbsd32_machdep.c
src/sys/arch/amd64/conf [yamt-nfs-mp]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/amd64/include [yamt-nfs-mp]: segments.h
src/sys/arch/amiga/conf [yamt-nfs-mp]: std.amiga
src/sys/arch/arm/arm [yamt-nfs-mp]: cpufunc.c
src/sys/arch/arm/arm32 [yamt-nfs-mp]: cpu.c
src/sys/arch/arm/conf [yamt-nfs-mp]: files.arm
src/sys/arch/arm/include [yamt-nfs-mp]: armreg.h cpuconf.h cpufunc.h
src/sys/arch/arm/omap [yamt-nfs-mp]: files.omap2 omap2_gpmc.c
omap2_gpmcreg.h omap2_gpmcvar.h omap2_intr.h omap2_obio.c
omap2_reg.h
src/sys/arch/arm/pic [yamt-nfs-mp]: pic.c
src/sys/arch/arm/sa11x0 [yamt-nfs-mp]: sa11x0_com.c
src/sys/arch/arm/xscale [yamt-nfs-mp]: pxa2x0_mci.c
src/sys/arch/atari/conf [yamt-nfs-mp]: std.atari std.hades std.milan
src/sys/arch/atari/stand/tostools/libtos [yamt-nfs-mp]: exec_elf.h
src/sys/arch/cesfic/conf [yamt-nfs-mp]: std.cesfic
src/sys/arch/dreamcast/conf [yamt-nfs-mp]: GENERIC
Makefile.dreamcast.inc
src/sys/arch/dreamcast/dev [yamt-nfs-mp]: gdrom.c
src/sys/arch/dreamcast/dev/g2 [yamt-nfs-mp]: g2rtc.c
src/sys/arch/evbarm/beagle [yamt-nfs-mp]: beagle_machdep.c
src/sys/arch/evbarm/conf [yamt-nfs-mp]: BEAGLEBOARD GUMSTIX OVERO
files.evbarm files.g42xxeb files.gumstix files.overo
src/sys/arch/evbarm/gumstix [yamt-nfs-mp]: gumstix_machdep.c
gumstix_start.S gumstixreg.h gxio.c if_sm_gxio.c if_smsh_gxio.c
src/sys/arch/hp300/conf [yamt-nfs-mp]: std.hp300
src/sys/arch/hp700/conf [yamt-nfs-mp]: GENERIC
src/sys/arch/hpcarm/conf [yamt-nfs-mp]: WZERO3
src/sys/arch/hpcarm/dev [yamt-nfs-mp]: j720pcic.c
src/sys/arch/hppa/include [yamt-nfs-mp]: ieee.h
src/sys/arch/i386/conf [yamt-nfs-mp]: ALL GENERIC MONOLITHIC XEN3_DOM0
XEN3_DOMU
src/sys/arch/i386/i386 [yamt-nfs-mp]: dumpsys.c machdep.c
src/sys/arch/i386/include [yamt-nfs-mp]: kcore.h pte.h types.h
src/sys/arch/i386/stand/boot [yamt-nfs-mp]: Makefile.boot
src/sys/arch/i386/stand/bootxx [yamt-nfs-mp]: Makefile
src/sys/arch/i386/stand/lib [yamt-nfs-mp]: exec.c
src/sys/arch/luna68k/conf [yamt-nfs-mp]: std.luna68k
src/sys/arch/m68k/conf [yamt-nfs-mp]: files.m68k
src/sys/arch/m68k/include [yamt-nfs-mp]: ieee.h
src/sys/arch/mac68k/conf [yamt-nfs-mp]: std.mac68k
src/sys/arch/macppc/dev [yamt-nfs-mp]: awacs.c pmu.c smartbat.c
snapper.c
src/sys/arch/macppc/macppc [yamt-nfs-mp]: machdep.c
src/sys/arch/macppc/stand/ofwboot [yamt-nfs-mp]: boot.c
src/sys/arch/mips/mips [yamt-nfs-mp]: in_cksum.c
src/sys/arch/mvme68k/conf [yamt-nfs-mp]: std.mvme68k
src/sys/arch/news68k/conf [yamt-nfs-mp]: std.news68k
src/sys/arch/news68k/stand/boot [yamt-nfs-mp]: boot.c
src/sys/arch/newsmips/stand/boot [yamt-nfs-mp]: boot.c
src/sys/arch/next68k/conf [yamt-nfs-mp]: std.next68k
src/sys/arch/sparc/conf [yamt-nfs-mp]: files.sparc std.sparc
src/sys/arch/sparc/dev [yamt-nfs-mp]: cgfourteen.c cgfourteenvar.h
src/sys/arch/sparc/include [yamt-nfs-mp]: ieee.h
src/sys/arch/sparc/stand [yamt-nfs-mp]: Makefile.buildboot
src/sys/arch/sparc/stand/boot [yamt-nfs-mp]: boot.c
src/sys/arch/sparc/stand/common [yamt-nfs-mp]: promdev.c
src/sys/arch/sparc/stand/ofwboot [yamt-nfs-mp]: Makefile boot.c
src/sys/arch/sparc64/conf [yamt-nfs-mp]: files.sparc64
src/sys/arch/sparc64/dev [yamt-nfs-mp]: ffb.c ffb_mainbus.c ffbvar.h
gfb.c
src/sys/arch/sparc64/sparc64 [yamt-nfs-mp]: autoconf.c
src/sys/arch/sun2/conf [yamt-nfs-mp]: std.sun2
src/sys/arch/sun3/conf [yamt-nfs-mp]: std.sun3 std.sun3x
src/sys/arch/x68k/conf [yamt-nfs-mp]: std.x68k
src/sys/arch/x68k/stand/boot [yamt-nfs-mp]: boot.c
src/sys/arch/x86/acpi [yamt-nfs-mp]: acpi_cpu_md.c
src/sys/arch/x86/include [yamt-nfs-mp]: cpu.h cpuvar.h ieee.h machdep.h
specialreg.h
src/sys/arch/x86/pci [yamt-nfs-mp]: fwhrng.c i82802reg.h ichlpcib.c
src/sys/arch/x86/x86 [yamt-nfs-mp]: bus_dma.c coretemp.c cpu.c est.c
ipmi.c platform.c tsc.c vga_post.c x86_autoconf.c x86_machdep.c
src/sys/

CVS commit: src/bin/sleep

2010-10-08 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Sat Oct  9 04:57:30 UTC 2010

Modified Files:
src/bin/sleep: sleep.1 sleep.c

Log Message:
add SIGINFO support; from freebsd:

when a SIGINFO is delivered, display the approximate remaining seconds.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/bin/sleep/sleep.1
cvs rdiff -u -r1.22 -r1.23 src/bin/sleep/sleep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sleep/sleep.1
diff -u src/bin/sleep/sleep.1:1.19 src/bin/sleep/sleep.1:1.20
--- src/bin/sleep/sleep.1:1.19	Sat Aug 18 00:41:52 2007
+++ src/bin/sleep/sleep.1	Sat Oct  9 04:57:30 2010
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sleep.1,v 1.19 2007/08/18 00:41:52 hubertf Exp $
+.\"	$NetBSD: sleep.1,v 1.20 2010/10/09 04:57:30 mrg Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -57,6 +57,11 @@
 command will accept and honor a non-integer number of specified seconds.
 This is a non-portable extension, and its use will nearly guarantee that
 a shell script will not execute properly on another system.
+.Pp
+When the
+.Dv SIGINFO
+signal is received, the estimate of the amount of seconds left to
+sleep is printed on the standard output.
 .Sh EXIT STATUS
 The
 .Nm

Index: src/bin/sleep/sleep.c
diff -u src/bin/sleep/sleep.c:1.22 src/bin/sleep/sleep.c:1.23
--- src/bin/sleep/sleep.c:1.22	Sun Jul 20 00:52:40 2008
+++ src/bin/sleep/sleep.c	Sat Oct  9 04:57:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sleep.c,v 1.22 2008/07/20 00:52:40 lukem Exp $ */
+/* $NetBSD: sleep.c,v 1.23 2010/10/09 04:57:30 mrg Exp $ */
 
 /*
  * Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)sleep.c	8.3 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: sleep.c,v 1.22 2008/07/20 00:52:40 lukem Exp $");
+__RCSID("$NetBSD: sleep.c,v 1.23 2010/10/09 04:57:30 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -57,13 +57,23 @@
 static void usage(void);
 int main(int, char *[]);
 
+static volatile sig_atomic_t report_requested;
+static void
+report_request(int signo __unused)
+{
+
+	report_requested = 1;
+}
+
+
 int
 main(int argc, char *argv[])
 {
 	char *arg, *temp;
 	double fval, ival, val;
 	struct timespec ntime;
-	int ch, fracflag;
+	time_t original;
+	int ch, fracflag, rv;
 
 	setprogname(argv[0]);
 	(void)setlocale(LC_ALL, "");
@@ -115,7 +125,19 @@
 		ntime.tv_nsec = 0;
 	}
 
-	if (nanosleep(&ntime, NULL) == -1)
+	original = ntime.tv_sec;
+	signal(SIGINFO, report_request);
+	while ((rv = nanosleep(&ntime, &ntime)) != 0) {
+		if (report_requested) {
+		/* Reporting does not bother with nanoseconds. */
+			warnx("about %d second(s) left out of the original %d",
+			(int)ntime.tv_sec, (int)original);
+			report_requested = 0;
+		} else
+			break;
+	}
+
+	if (rv == -1)
 		err(EXIT_FAILURE, "nanosleep failed");
 
 	return EXIT_SUCCESS;

CVS commit: src/doc

2010-10-08 Thread YAMAMOTO Takashi

Module Name:src
Committed By:   yamt
Date:   Sat Oct  9 05:24:56 UTC 2010

Modified Files:
src/doc: BRANCHES

Log Message:
update


To generate a diff of this commit:
cvs rdiff -u -r1.293 -r1.294 src/doc/BRANCHES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/BRANCHES
diff -u src/doc/BRANCHES:1.293 src/doc/BRANCHES:1.294
--- src/doc/BRANCHES:1.293	Mon May 31 15:01:09 2010
+++ src/doc/BRANCHES	Sat Oct  9 05:24:55 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: BRANCHES,v 1.293 2010/05/31 15:01:09 uebayasi Exp $
+#	$NetBSD: BRANCHES,v 1.294 2010/10/09 05:24:55 yamt Exp $
 #
 # This file contains a list of branches that exist in the NetBSD CVS
 # tree and their current state.
@@ -568,7 +568,7 @@
 Status:		Active
 Start Date:	Sun Apr 27 2008
 End Date:	
-Base Tag:	yamt-nfs-mp-base9
+Base Tag:	yamt-nfs-mp-base11
 Maintainer:	YAMAMOTO Takashi 
 Scope:		src/sys  (src/common is tagged but not branched)
 Notes:

CVS commit: src/sys/dev/acpi

CVS commit: src/sys/dev/marvell

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast

CVS commit: [yamt-nfs-mp] src/sys

CVS commit: src/bin/sleep

CVS commit: src/doc

7 matches

Site Navigation

Mail list logo

Footer information