date:20090929

CVS commit: src/sys/dev

2009-09-29 Thread Christoph Egger

Module Name:src
Committed By:   cegger
Date:   Tue Sep 29 11:01:39 UTC 2009

Modified Files:
src/sys/dev/isa: ess_isa.c
src/sys/dev/isapnp: ess_isapnp.c

Log Message:
use aprint_* in attach routines


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/isa/ess_isa.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/isapnp/ess_isapnp.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/isa/ess_isa.c
diff -u src/sys/dev/isa/ess_isa.c:1.22 src/sys/dev/isa/ess_isa.c:1.23
--- src/sys/dev/isa/ess_isa.c:1.22	Tue May  5 12:07:15 2009
+++ src/sys/dev/isa/ess_isa.c	Tue Sep 29 11:01:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ess_isa.c,v 1.22 2009/05/05 12:07:15 cegger Exp $	*/
+/*	$NetBSD: ess_isa.c,v 1.23 2009/09/29 11:01:39 cegger Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ess_isa.c,v 1.22 2009/05/05 12:07:15 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: ess_isa.c,v 1.23 2009/09/29 11:01:39 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -129,7 +129,9 @@
 	sc = device_private(self);
 	ia = aux;
 	enablejoy = 0;
-	printf(\n);
+
+	aprint_naive(\n);
+	aprint_normal(\n);
 
 	sc-sc_ic = ia-ia_ic;
 	sc-sc_iot = ia-ia_iot;
@@ -148,7 +150,7 @@
 	sc-sc_audio2.drq = ia-ia_ndrq  1 ? ia-ia_drq[1].ir_drq : -1;
 
 #if NJOY_ESS  0
-	if (device_cfdata(sc-sc_dev)-cf_flags  1) {
+	if (device_cfdata(self)-cf_flags  1) {
 		sc-sc_joy_iot = ia-ia_iot;
 		if (!bus_space_map(sc-sc_joy_iot, 0x201, 1, 0,
    sc-sc_joy_ioh))
@@ -156,7 +158,7 @@
 	}
 #endif
 
-	printf(%s, device_xname(sc-sc_dev));
+	aprint_normal_dev(self, );
 
 	essattach(sc, enablejoy);
 }

Index: src/sys/dev/isapnp/ess_isapnp.c
diff -u src/sys/dev/isapnp/ess_isapnp.c:1.20 src/sys/dev/isapnp/ess_isapnp.c:1.21
--- src/sys/dev/isapnp/ess_isapnp.c:1.20	Tue May  5 12:10:07 2009
+++ src/sys/dev/isapnp/ess_isapnp.c	Tue Sep 29 11:01:39 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: ess_isapnp.c,v 1.20 2009/05/05 12:10:07 cegger Exp $	*/
+/*	$NetBSD: ess_isapnp.c,v 1.21 2009/09/29 11:01:39 cegger Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ess_isapnp.c,v 1.20 2009/05/05 12:10:07 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: ess_isapnp.c,v 1.21 2009/09/29 11:01:39 cegger Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -98,10 +98,12 @@
 
 	sc = device_private(self);
 	ipa = aux;
-	printf(\n);
+
+	aprint_naive(\n);
+	aprint_normal(\n);
 
 	if (isapnp_config(ipa-ipa_iot, ipa-ipa_memt, ipa)) {
-		aprint_error_dev(sc-sc_dev, error in region allocation\n);
+		aprint_error_dev(self, error in region allocation\n);
 		return;
 	}
 
@@ -118,11 +120,11 @@
 	sc-sc_audio2.drq = ipa-ipa_drq[1].num;
 
 	if (!essmatch(sc)) {
-		aprint_error_dev(sc-sc_dev, essmatch failed\n);
+		aprint_error_dev(self, essmatch failed\n);
 		return;
 	}
 
-	printf(%s, device_xname(sc-sc_dev));
+	aprint_normal_dev(self, );
 
 	essattach(sc, 0);
 }

CVS commit: src/sys/kern

2009-09-29 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Tue Sep 29 11:51:02 UTC 2009

Modified Files:
src/sys/kern: vnode_if.sh

Log Message:
Add a switch on whether to create VNODE_LOCKDEBUG checks or not.
Since VNODE_LOCKDEBUG has never been generally useful, default to
off.  However, the checks can still be generated by flipping the
switch for the isolated cases where this form of dynamic analysis
is useful and the person using it knows what she is doing.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/kern/vnode_if.sh

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

Modified files:

Index: src/sys/kern/vnode_if.sh
diff -u src/sys/kern/vnode_if.sh:1.51 src/sys/kern/vnode_if.sh:1.52
--- src/sys/kern/vnode_if.sh:1.51	Wed Nov 19 14:10:49 2008
+++ src/sys/kern/vnode_if.sh	Tue Sep 29 11:51:02 2009
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 
-SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.51 2008/11/19 14:10:49 pooka Exp $'
+SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.52 2009/09/29 11:51:02 pooka Exp $'
 
 # Script to produce VFS front-end sugar.
 #
@@ -52,6 +52,9 @@
 out_h=../sys/vnode_if.h
 out_rumph=../rump/include/rump/rumpvnode_if.h
 
+# generate VNODE_LOCKDEBUG checks (not fully functional)
+lockdebug=0
+
 # Awk program (must support nawk extensions)
 # Use awk at Berkeley, nawk or gawk elsewhere.
 awk=${AWK:-awk}
@@ -196,10 +199,12 @@
 echo ''
 echo #ifndef _${SYS}VNODE_IF_H_
 echo #define _${SYS}VNODE_IF_H_
-echo ''
-echo '#ifdef _KERNEL_OPT'
-echo '#include opt_vnode_lockdebug.h'
-echo '#endif /* _KERNEL_OPT */'
+if [ ${lockdebug} -ne 0 ] ; then
+	echo ''
+	echo '#ifdef _KERNEL_OPT'
+	echo '#include opt_vnode_lockdebug.h'
+	echo '#endif /* _KERNEL_OPT */'
+fi
 echo 
 extern const struct vnodeop_desc ${rump}vop_default_desc;
 
@@ -279,11 +284,10 @@
 echo -n $copyright
 echo 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, \\$NetBSD\$\);
-
+__KERNEL_RCSID(0, \\$NetBSD\$\);
+
+[ ${lockdebug} -ne 0 ]  echo  echo '#include opt_vnode_lockdebug.h'
 
-echo '
-#include opt_vnode_lockdebug.h'
 echo '
 #include sys/param.h
 #include sys/mount.h
@@ -306,7 +310,7 @@
 '
 
 # Body stuff
-sed -e $sed_prep $src | $awk -v rump=${rump} '
+sed -e $sed_prep $src | $awk -v rump=${rump} -v lockdebug=${lockdebug} '
 function do_offset(typematch) {
 	for (i=0; iargc; i++) {
 		if (argtype[i] == typematch) {
@@ -376,16 +380,18 @@
 	}
 	printf()\n);
 	printf({\n\tint error;\n\tbool mpsafe;\n\tstruct %s_args a;\n, name);
-	printf(#ifdef VNODE_LOCKDEBUG\n);
-	for (i=0; iargc; i++) {
-		if (lockstate[i] != -1)
-			printf(\tint islocked_%s;\n, argname[i]);
+	if (lockdebug) {
+		printf(#ifdef VNODE_LOCKDEBUG\n);
+		for (i=0; iargc; i++) {
+			if (lockstate[i] != -1)
+printf(\tint islocked_%s;\n, argname[i]);
+		}
+		printf(#endif\n);
 	}
-	printf(#endif\n);
 	printf(\ta.a_desc = VDESC(%s);\n, name);
 	for (i=0; iargc; i++) {
 		printf(\ta.a_%s = %s;\n, argname[i], argname[i]);
-		if (lockstate[i] != -1) {
+		if (lockdebug  lockstate[i] != -1) {
 			printf(#ifdef VNODE_LOCKDEBUG\n);
 			printf(\tislocked_%s = (%s-v_vflag  VV_LOCKSWORK) ? (VOP_ISLOCKED(%s) == LK_EXCLUSIVE) : %d;\n,
 			argname[i], argname[i], argname[i], lockstate[i]);

CVS commit: src/bin/cp

2009-09-29 Thread Antti Kantee

Module Name:src
Committed By:   pooka
Date:   Tue Sep 29 13:30:17 UTC 2009

Modified Files:
src/bin/cp: cp.c

Log Message:
Remove fts sorting.  It was originally put there to copy files
before directories since files (usually) are in the same cylinder
group and subdirectories aren't.  However, this mostly changed with
the new ffs dirpref algorithm in 2001.

No sorting has two effects:
1) copy appears to be somewhat faster (e.g. on my laptop cp'ing build
   objdir to tmpfs is 7% faster after the change)
2) source file parameters no longer get randomly shuffled due to
   fts doing an unstable sort of them.  this means that
   cp 1 2 3 4 dest/ will copy the files in that order instead
   of e.g. 3 4 1 2.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/bin/cp/cp.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/cp/cp.c
diff -u src/bin/cp/cp.c:1.51 src/bin/cp/cp.c:1.52
--- src/bin/cp/cp.c:1.51	Sun Jul 20 00:52:39 2008
+++ src/bin/cp/cp.c	Tue Sep 29 13:30:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cp.c,v 1.51 2008/07/20 00:52:39 lukem Exp $ */
+/* $NetBSD: cp.c,v 1.52 2009/09/29 13:30:17 pooka Exp $ */
 
 /*
  * Copyright (c) 1988, 1993, 1994
@@ -43,7 +43,7 @@
 #if 0
 static char sccsid[] = @(#)cp.c	8.5 (Berkeley) 4/29/95;
 #else
-__RCSID($NetBSD: cp.c,v 1.51 2008/07/20 00:52:39 lukem Exp $);
+__RCSID($NetBSD: cp.c,v 1.52 2009/09/29 13:30:17 pooka Exp $);
 #endif
 #endif /* not lint */
 
@@ -92,7 +92,6 @@
 
 int 	main(int, char *[]);
 int 	copy(char *[], enum op, int);
-int 	mastercmp(const FTSENT **, const FTSENT **);
 
 int
 main(int argc, char *argv[])
@@ -295,7 +294,7 @@
 	dne = 0;
 	base = 0;	/* XXX gcc -Wuninitialized (see comment below) */
 
-	if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)
+	if ((ftsp = fts_open(argv, fts_options, NULL)) == NULL)
 		err(EXIT_FAILURE, %s, argv[0]);
 		/* NOTREACHED */
 	for (any_failed = 0; (curr = fts_read(ftsp)) != NULL;) {
@@ -515,29 +514,3 @@
 	(void)fts_close(ftsp);
 	return (any_failed);
 }
-
-/*
- * mastercmp --
- *	The comparison function for the copy order.  The order is to copy
- *	non-directory files before directory files.  The reason for this
- *	is because files tend to be in the same cylinder group as their
- *	parent directory, whereas directories tend not to be.  Copying the
- *	files first reduces seeking.
- */
-int
-mastercmp(const FTSENT **a, const FTSENT **b)
-{
-	int a_info, b_info;
-
-	a_info = (*a)-fts_info;
-	if (a_info == FTS_ERR || a_info == FTS_NS || a_info == FTS_DNR)
-		return (0);
-	b_info = (*b)-fts_info;
-	if (b_info == FTS_ERR || b_info == FTS_NS || b_info == FTS_DNR)
-		return (0);
-	if (a_info == FTS_D)
-		return (-1);
-	if (b_info == FTS_D)
-		return (1);
-	return (0);
-}

CVS commit: src

2009-09-29 Thread Stephen Borrill

Module Name:src
Committed By:   sborrill
Date:   Tue Sep 29 15:58:54 UTC 2009

Modified Files:
src/share/man/man4: audio.4
src/sys/dev: audio.c audio_if.h
src/sys/dev/pci/hdaudio: hdaudio_afg.c
src/sys/sys: audioio.h

Log Message:
Add support for playback- or capture-only devices.

Fixes PR 42050


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/share/man/man4/audio.4
cvs rdiff -u -r1.247 -r1.248 src/sys/dev/audio.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/audio_if.h
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/hdaudio/hdaudio_afg.c
cvs rdiff -u -r1.32 -r1.33 src/sys/sys/audioio.h

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/audio.4
diff -u src/share/man/man4/audio.4:1.69 src/share/man/man4/audio.4:1.70
--- src/share/man/man4/audio.4:1.69	Sat Jan  3 17:44:20 2009
+++ src/share/man/man4/audio.4	Tue Sep 29 15:58:54 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: audio.4,v 1.69 2009/01/03 17:44:20 christos Exp $
+.\	$NetBSD: audio.4,v 1.70 2009/09/29 15:58:54 sborrill Exp $
 .\
 .\ Copyright (c) 1996 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -27,7 +27,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd January 3, 2009
+.Dd September 29, 2009
 .Dt AUDIO 4
 .Os
 .Sh NAME
@@ -243,6 +243,10 @@
 .It Dv AUDIO_PROP_INDEPENDENT
 the device can set the playing and recording encoding parameters
 independently.
+.It Dv AUDIO_PROP_PLAYBACK
+the device is capable of audio playback.
+.It Dv AUDIO_PROP_CAPTURE
+the device is capable of audio capture.
 .El
 .It Dv AUDIO_GETIOFFS (audio_offset_t)
 .It Dv AUDIO_GETOOFFS (audio_offset_t)

Index: src/sys/dev/audio.c
diff -u src/sys/dev/audio.c:1.247 src/sys/dev/audio.c:1.248
--- src/sys/dev/audio.c:1.247	Thu Sep 24 16:03:11 2009
+++ src/sys/dev/audio.c	Tue Sep 29 15:58:54 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.247 2009/09/24 16:03:11 sborrill Exp $	*/
+/*	$NetBSD: audio.c,v 1.248 2009/09/29 15:58:54 sborrill Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -61,7 +61,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.247 2009/09/24 16:03:11 sborrill Exp $);
+__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.248 2009/09/29 15:58:54 sborrill Exp $);
 
 #include audio.h
 #if NAUDIO  0
@@ -192,6 +192,10 @@
 static void	audio_mixer_capture(struct audio_softc *);
 static void	audio_mixer_restore(struct audio_softc *);
 
+static int	audio_get_props(struct audio_softc *);
+static bool	audio_can_playback(struct audio_softc *);
+static bool	audio_can_capture(struct audio_softc *);
+
 static void	audio_softintr_rd(void *);
 static void	audio_softintr_wr(void *);
 
@@ -315,41 +319,51 @@
 	}
 #endif
 
-	props = hwp-get_props(hdlp);
+	sc-hw_if = hwp;
+	sc-hw_hdl = hdlp;
+	sc-sc_dev = parent;
+	sc-sc_opencnt = 0;
+	sc-sc_writing = sc-sc_waitcomp = 0;
+	sc-sc_lastinfovalid = false;
 
-	aprint_naive(\n);
+	props = audio_get_props(sc);
 
 	if (props  AUDIO_PROP_FULLDUPLEX)
 		aprint_normal(: full duplex);
 	else
 		aprint_normal(: half duplex);
 
+	if (props  AUDIO_PROP_PLAYBACK)
+		aprint_normal(, playback);
+	if (props  AUDIO_PROP_CAPTURE)
+		aprint_normal(, capture);
 	if (props  AUDIO_PROP_MMAP)
 		aprint_normal(, mmap);
 	if (props  AUDIO_PROP_INDEPENDENT)
 		aprint_normal(, independent);
 
+	aprint_naive(\n);
 	aprint_normal(\n);
 
-	sc-hw_if = hwp;
-	sc-hw_hdl = hdlp;
-	sc-sc_dev = parent;
-	sc-sc_opencnt = 0;
-	sc-sc_writing = sc-sc_waitcomp = 0;
-	sc-sc_lastinfovalid = false;
-
-	error = audio_alloc_ring(sc, sc-sc_pr, AUMODE_PLAY, AU_RING_SIZE);
-	if (error) {
-		sc-hw_if = NULL;
-		aprint_error(audio: could not allocate play buffer\n);
-		return;
+	if (audio_can_playback(sc)) {
+		error = audio_alloc_ring(sc, sc-sc_pr,
+		AUMODE_PLAY, AU_RING_SIZE);
+		if (error) {
+			sc-hw_if = NULL;
+			aprint_error(audio: could not allocate play buffer\n);
+			return;
+		}
 	}
-	error = audio_alloc_ring(sc, sc-sc_rr, AUMODE_RECORD, AU_RING_SIZE);
-	if (error) {
-		audio_free_ring(sc, sc-sc_pr);
-		sc-hw_if = NULL;
-		aprint_error(audio: could not allocate record buffer\n);
-		return;
+	if (audio_can_capture(sc)) {
+		error = audio_alloc_ring(sc, sc-sc_rr,
+		AUMODE_RECORD, AU_RING_SIZE);
+		if (error) {
+			if (sc-sc_pr.s.start != 0)
+audio_free_ring(sc, sc-sc_pr);
+			sc-hw_if = NULL;
+			aprint_error(audio: could not allocate record buffer\n);
+			return;
+		}
 	}
 
 	sc-sc_lastgain = 128;
@@ -742,6 +756,8 @@
 void
 audio_free_ring(struct audio_softc *sc, struct audio_ringbuffer *r)
 {
+	if (r-s.start == 0)
+		return;
 
 	if (sc-hw_if-freem)
 		sc-hw_if-freem(sc-hw_hdl, r-s.start, M_DEVBUF);
@@ -1301,41 +1317,49 @@
 
 	DPRINTF((audio_initbufs: mode=0x%x\n, sc-sc_mode));
 	hw = sc-hw_if;
-	audio_init_ringbuffer(sc, sc-sc_rr, AUMODE_RECORD);
-	if (hw-init_input  (sc-sc_mode  AUMODE_RECORD)) {
-

CVS commit: src/dist/libpcap

2009-09-29 Thread Manuel Bouyer

Module Name:src
Committed By:   bouyer
Date:   Tue Sep 29 19:00:45 UTC 2009

Modified Files:
src/dist/libpcap: inet.c

Log Message:
Fix pcap_lookupnet(): reset ifr before SIOCGIFNETMASK. Without it we get
back a bogus netmask.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/dist/libpcap/inet.c

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

Modified files:

Index: src/dist/libpcap/inet.c
diff -u src/dist/libpcap/inet.c:1.2 src/dist/libpcap/inet.c:1.3
--- src/dist/libpcap/inet.c:1.2	Mon Feb 27 15:53:24 2006
+++ src/dist/libpcap/inet.c	Tue Sep 29 19:00:45 2009
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-@(#) $Header: /cvsroot/src/dist/libpcap/inet.c,v 1.2 2006/02/27 15:53:24 drochner Exp $ (LBL);
+@(#) $Header: /cvsroot/src/dist/libpcap/inet.c,v 1.3 2009/09/29 19:00:45 bouyer Exp $ (LBL);
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -573,6 +573,12 @@
 	}
 	sin4 = (struct sockaddr_in *)ifr.ifr_addr;
 	*netp = sin4-sin_addr.s_addr;
+	memset(ifr, 0, sizeof(ifr));
+#ifdef linux
+	/* XXX Work around Linux kernel bug */
+	ifr.ifr_addr.sa_family = AF_INET;
+#endif
+	(void)strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
 	if (ioctl(fd, SIOCGIFNETMASK, (char *)ifr)  0) {
 		(void)snprintf(errbuf, PCAP_ERRBUF_SIZE,
 		SIOCGIFNETMASK: %s: %s, device, pcap_strerror(errno));

CVS commit: xsrc/external/mit/xf86-video-crime/dist/src

2009-09-29 Thread Michael Lorenz

Module Name:xsrc
Committed By:   macallan
Date:   Tue Sep 29 20:41:22 UTC 2009

Modified Files:
xsrc/external/mit/xf86-video-crime/dist/src: crime.h crime_accel.c
crime_driver.c

Log Message:
clean up debugging code, while there:
- use a fake framebuffer like newport does to hide software rendering
  artifacts
- only map the framebuffer when debugging, and actually unmap it too


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-crime/dist/src/crime.h
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-crime/dist/src/crime.h
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime.h:1.6 xsrc/external/mit/xf86-video-crime/dist/src/crime.h:1.7
--- xsrc/external/mit/xf86-video-crime/dist/src/crime.h:1.6	Thu Jun 25 00:58:46 2009
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime.h	Tue Sep 29 20:41:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: crime.h,v 1.6 2009/06/25 00:58:46 macallan Exp $ */
+/* $NetBSD: crime.h,v 1.7 2009/09/29 20:41:21 macallan Exp $ */
 /*
  * Copyright (c) 2008 Michael Lorenz
  * All rights reserved.
@@ -44,7 +44,7 @@
 #ifndef CRIME_H
 #define CRIME_H
 
-#define CRIME_DEBUG
+/*#define CRIME_DEBUG*/
 
 #define CRIME_DEBUG_LINES		0x0001
 #define CRIME_DEBUG_BITBLT		0x0002
@@ -56,7 +56,7 @@
 #define CRIME_DEBUG_XRENDER		0x0080
 #define CRIME_DEBUG_IMAGEREAD		0x0100
 #define CRIME_DEBUG_ALL			0x
-#define CRIME_DEBUG_MASK (/*CRIME_DEBUG_IMAGEWRITE*/0)
+#define CRIME_DEBUG_MASK 0
 
 #ifdef CRIME_DEBUG
 #define LOG(x) if (x  CRIME_DEBUG_MASK) xf86Msg(X_ERROR, %s\n, __func__)

Index: xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.10 xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.11
--- xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c:1.10	Wed Jul  1 03:52:11 2009
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime_accel.c	Tue Sep 29 20:41:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: crime_accel.c,v 1.10 2009/07/01 03:52:11 macallan Exp $ */
+/* $NetBSD: crime_accel.c,v 1.11 2009/09/29 20:41:22 macallan Exp $ */
 /*
  * Copyright (c) 2008 Michael Lorenz
  * All rights reserved.
@@ -34,6 +34,7 @@
 #include crime.h
 #include picturestr.h
 #include xaalocal.h
+#include xaa.h
 
 uint32_t regcache[0x1000];
 
@@ -48,7 +49,7 @@
 #define WRITE4(r, v) { *CRIMEREG(r) = v; }
 #endif
 #define WRITE4ST(r, v) {WBFLUSH; *CRIMEREG(r + CRIME_DE_START) = v; WBFLUSH;}
-#ifdef DEBUG
+#ifdef CRIME_DEBUG
 #define SYNC { int bail = 0; do {bail++; } \
   while(((*CRIMEREG(0x4000)  CRIME_DE_IDLE) == 0)  (bail  1000)); \
   if (bail == 1000) { \
@@ -176,7 +177,6 @@
 		WRITE4(CRIME_MTE_SRC1, (rxe  16) | rye);
 		WRITE4(CRIME_MTE_DST0, (rxd  16) | ryd);
 		WRITE4ST(CRIME_MTE_DST1, (rxde  16) | ryde);
-		//xf86Msg(X_ERROR, MTE);
 
 #ifdef CRIME_DEBUG_LOUD
 		xf86Msg(X_ERROR, reg: %08x %08x\n, oreg, reg);
@@ -227,6 +227,7 @@
 	int i;
 
 	LOG(CRIME_DEBUG_RECTFILL);
+#ifdef MTE_DRAW_RECT
 	if (rop == GXcopy) {
 		fPtr-use_mte = 1;
 		MAKE_ROOM(3);
@@ -237,7 +238,9 @@
 		WRITE4(CRIME_MTE_DST_Y_STEP, 1);
 		WRITE4(CRIME_MTE_BG, colour  8);
 		SYNCMTE;
-	} else {
+	} else
+#endif
+	{
 		fPtr-use_mte = 0;
 		MAKE_ROOM(7);
 		WRITE4(CRIME_DE_PLANEMASK, planemask);
@@ -270,6 +273,7 @@
 	int xa, xe, ya, ye;
 
 	LOG(CRIME_DEBUG_RECTFILL);
+#ifdef MTE_DRAW_RECT
 	if (fPtr-use_mte) {
 		
 		/*
@@ -286,7 +290,9 @@
 			WRITE4ST(CRIME_MTE_DST1,
 		 	   (((xe  2) - 1 )  16) | ((ye - 1)  0x));
 		}
-	} else {
+	} else 
+#endif
+	{
 		MAKE_ROOM(2);
 		WRITE4(CRIME_DE_X_VERTEX_0, (x  16) | (y  0x));
 		WRITE4ST(CRIME_DE_X_VERTEX_1,
@@ -582,7 +588,7 @@
 	WRITE4(CRIME_DE_X_VERTEX_0, (x1  16) | y1);
 	WRITE4ST(CRIME_DE_X_VERTEX_1, (x2  16) | y2);
 	DONE(CRIME_DEBUG_LINES);
-}  
+}
 
 void
 CrimeSetupForDashedLine(ScrnInfoPtr pScrn,

Index: xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.3 xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.4
--- xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.3	Thu Jun 25 00:58:46 2009
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c	Tue Sep 29 20:41:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: crime_driver.c,v 1.3 2009/06/25 00:58:46 macallan Exp $ */
+/* $NetBSD: crime_driver.c,v 1.4 2009/09/29 20:41:22 macallan Exp $ */
 /*
  * Copyright (c) 2008 Michael Lorenz
  * All rights reserved.
@@ -72,11 +72,6 @@
 
 #define CRIME_DEFAULT_DEV /dev/ttyE0
 
-#define DEBUG 1
-#ifndef DEBUG
-#define DEBUG 0
-#endif
-
 /* Prototypes */
 #ifdef XFree86LOADER
 static pointer CrimeSetup(pointer, pointer, int *, int

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa

2009-09-29 Thread Michael Lorenz

Module Name:xsrc
Committed By:   macallan
Date:   Tue Sep 29 20:42:54 UTC 2009

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa: xaaGC.c xaalocal.h

Log Message:
don't fall back to software rendering when drawing into the screen pixmap
this takes care of visible artifacts with non-mappable framebuffers like
newport and crime


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaGC.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaalocal.h

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaGC.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaGC.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaGC.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaGC.c:1.1.1.2	Thu Jun 11 01:52:58 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaaGC.c	Tue Sep 29 20:42:54 2009
@@ -88,7 +88,8 @@
 	pGC-fgPixel = 0x7fff;
 }
 
-if((pDraw-type == DRAWABLE_PIXMAP)  !IS_OFFSCREEN_PIXMAP(pDraw)){
+if((pDraw-type == DRAWABLE_PIXMAP)  
+   !IS_OFFSCREEN_PIXMAP(pDraw)  !PIXMAP_IS_SCREEN((PixmapPtr)pDraw, pGC)) {
 	pGCPriv-flags = OPS_ARE_PIXMAP;
 pGCPriv-changes |= changes;
 

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaalocal.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaalocal.h:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaalocal.h:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaalocal.h:1.3	Thu Jun 11 02:13:52 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa/xaalocal.h	Tue Sep 29 20:42:54 2009
@@ -1710,6 +1710,9 @@
 #define IS_OFFSCREEN_PIXMAP(pPix)\
 ((XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pPix)))-offscreenArea)	
 
+#define PIXMAP_IS_SCREEN(pPix, pGC)\
+(pPix == pGC-pScreen-GetScreenPixmap(pGC-pScreen))
+ 
 #define PIXMAP_IS_SHARED(pPix)\
 ((XAA_GET_PIXMAP_PRIVATE((PixmapPtr)(pPix)))-flags  SHARED_PIXMAP)

CVS commit: src/sys/dev/acpi

2009-09-29 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Tue Sep 29 21:41:39 UTC 2009

Modified Files:
src/sys/dev/acpi: acpi_bat.c

Log Message:
If the driver thinks a battery is not present, poll for present status.
Workaround for firmware that doesn't report battery present status
immediately at boot and doesn't issue a subsequent notify when the
information becomes available.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/acpi/acpi_bat.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_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.73 src/sys/dev/acpi/acpi_bat.c:1.74
--- src/sys/dev/acpi/acpi_bat.c:1.73	Wed Sep 16 10:47:54 2009
+++ src/sys/dev/acpi/acpi_bat.c	Tue Sep 29 21:41:38 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_bat.c,v 1.73 2009/09/16 10:47:54 mlelstv Exp $	*/
+/*	$NetBSD: acpi_bat.c,v 1.74 2009/09/29 21:41:38 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_bat.c,v 1.73 2009/09/16 10:47:54 mlelstv Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_bat.c,v 1.74 2009/09/29 21:41:38 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -785,6 +785,9 @@
 	ACPI_STATUS rv;
 	struct timeval tv, tmp;
 
+	if (!ABAT_ISSET(sc, ABAT_F_PRESENT))
+		acpibat_battery_present(dv);
+
 	if (ABAT_ISSET(sc, ABAT_F_PRESENT)) {
 		tmp.tv_sec = 5;
 		tmp.tv_usec = 0;

CVS commit: src/external/apache2/mDNSResponder/dist

2009-09-29 Thread Ty Sarna

Module Name:src
Committed By:   tsarna
Date:   Tue Sep 29 22:14:17 UTC 2009

Update of /cvsroot/src/external/apache2/mDNSResponder/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23795

Log Message:
Import Apple's mDNSResponder 212.1 per tech-net discussion

Status:

Vendor Tag: APPLE
Release Tags:   mdnsresponder-212-1

N src/external/apache2/mDNSResponder/dist/LICENSE
N src/external/apache2/mDNSResponder/dist/Clients/ClientCommon.c
N src/external/apache2/mDNSResponder/dist/Clients/ClientCommon.h
N src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c
N src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h
N src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c
N src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.h
N src/external/apache2/mDNSResponder/dist/mDNSCore/DNSDigest.c
N src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c
N src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSDebug.h
N src/external/apache2/mDNSResponder/dist/mDNSCore/uDNS.c
N src/external/apache2/mDNSResponder/dist/mDNSCore/uDNS.h
N src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
N src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
N src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.h
N src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
N src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h
N src/external/apache2/mDNSResponder/dist/mDNSShared/CommonServices.h
N src/external/apache2/mDNSResponder/dist/mDNSShared/GenLinkedList.c
N src/external/apache2/mDNSResponder/dist/mDNSShared/GenLinkedList.h
N src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c
N src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c
N src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.h
N src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1
N src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h
N src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c
N src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.c
N src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h
N src/external/apache2/mDNSResponder/dist/mDNSShared/mDNSDebug.c
N src/external/apache2/mDNSResponder/dist/mDNSShared/mDNSResponder.8
N src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
N src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.h

No conflicts created by this import

CVS commit: src/sys/kern

2009-09-29 Thread David Young

Module Name:src
Committed By:   dyoung
Date:   Tue Sep 29 22:40:15 UTC 2009

Modified Files:
src/sys/kern: init_main.c

Log Message:
#include drvctl.h for the NDRVCTL definition.  Without the NDRVCTL
definition, drvctl_init() is not called, the drvctl_eventq is not
initialized, and the kernel will panic in devmon_insert() when a
device is detached.

Thanks to Jared McNeill for pointing out the panic.


To generate a diff of this commit:
cvs rdiff -u -r1.401 -r1.402 src/sys/kern/init_main.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/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.401 src/sys/kern/init_main.c:1.402
--- src/sys/kern/init_main.c:1.401	Mon Sep 21 12:14:46 2009
+++ src/sys/kern/init_main.c	Tue Sep 29 22:40:15 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: init_main.c,v 1.401 2009/09/21 12:14:46 pooka Exp $	*/
+/*	$NetBSD: init_main.c,v 1.402 2009/09/29 22:40:15 dyoung Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.401 2009/09/21 12:14:46 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: init_main.c,v 1.402 2009/09/29 22:40:15 dyoung Exp $);
 
 #include opt_ddb.h
 #include opt_ipsec.h
@@ -113,6 +113,7 @@
 #include opt_compat_netbsd.h
 #include opt_wapbl.h
 
+#include drvctl.h
 #include ksyms.h
 #include rnd.h
 #include sysmon_envsys.h

CVS commit: [netbsd-5] src/sys/dev

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Sep 29 22:46:56 UTC 2009

Modified Files:
src/sys/dev [netbsd-5]: audio.c

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1016):
sys/dev/audio.c: revision 1.246
OSS audio allows mixer operations on the dsp device. NetBSD would return
EINVAL in these circumstances. This can break audio in apps running
under Linux emulation (e.g. Citrix ICA client will mute all audio when
volume control used). Therefore, pass unrecognised ioctls attempted on
dsp devices to mixer_ioctl.


To generate a diff of this commit:
cvs rdiff -u -r1.243 -r1.243.6.1 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.243 src/sys/dev/audio.c:1.243.6.1
--- src/sys/dev/audio.c:1.243	Tue Jun 10 22:53:08 2008
+++ src/sys/dev/audio.c	Tue Sep 29 22:46:56 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.243 2008/06/10 22:53:08 cegger Exp $	*/
+/*	$NetBSD: audio.c,v 1.243.6.1 2009/09/29 22:46:56 snj Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -61,7 +61,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.243 2008/06/10 22:53:08 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.243.6.1 2009/09/29 22:46:56 snj Exp $);
 
 #include audio.h
 #if NAUDIO  0
@@ -1149,6 +1149,12 @@
 	case AUDIOCTL_DEVICE:
 		device_active(sc-dev, DVA_SYSTEM);
 		error = audio_ioctl(sc, cmd, addr, flag, l);
+		/*
+		 * OSS audio allows mixer operations on sound devices
+		 * so pass through if command isn't a valid audio operation
+		 */
+		if (error == EINVAL)
+			error = mixer_ioctl(sc, cmd, addr, flag, l);
 		break;
 	case MIXER_DEVICE:
 		error = mixer_ioctl(sc, cmd, addr, flag, l);

CVS commit: [netbsd-5] src/sys/dev

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Sep 29 22:50:11 UTC 2009

Modified Files:
src/sys/dev [netbsd-5]: audio.c

Log Message:
Pull up following revision(s) (requested by sborrill in ticket #1016):
sys/dev/audio.c: revision 1.247
Revert previous and instead select whether to call mixer_ioctl() or
audio_ioctl() based on whether the command smells like a mixer ioctl or not.


To generate a diff of this commit:
cvs rdiff -u -r1.243.6.1 -r1.243.6.2 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.243.6.1 src/sys/dev/audio.c:1.243.6.2
--- src/sys/dev/audio.c:1.243.6.1	Tue Sep 29 22:46:56 2009
+++ src/sys/dev/audio.c	Tue Sep 29 22:50:11 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.243.6.1 2009/09/29 22:46:56 snj Exp $	*/
+/*	$NetBSD: audio.c,v 1.243.6.2 2009/09/29 22:50:11 snj Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -61,7 +61,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.243.6.1 2009/09/29 22:46:56 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: audio.c,v 1.243.6.2 2009/09/29 22:50:11 snj Exp $);
 
 #include audio.h
 #if NAUDIO  0
@@ -1148,13 +1148,10 @@
 	case AUDIO_DEVICE:
 	case AUDIOCTL_DEVICE:
 		device_active(sc-dev, DVA_SYSTEM);
-		error = audio_ioctl(sc, cmd, addr, flag, l);
-		/*
-		 * OSS audio allows mixer operations on sound devices
-		 * so pass through if command isn't a valid audio operation
-		 */
-		if (error == EINVAL)
+		if (IOCGROUP(cmd) == IOCGROUP(AUDIO_MIXER_READ))
 			error = mixer_ioctl(sc, cmd, addr, flag, l);
+		else
+			error = audio_ioctl(sc, cmd, addr, flag, l);
 		break;
 	case MIXER_DEVICE:
 		error = mixer_ioctl(sc, cmd, addr, flag, l);

CVS commit: [netbsd-5] src/sys/arch/hp700

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Sep 29 22:56:48 UTC 2009

Modified Files:
src/sys/arch/hp700/dev [netbsd-5]: dino.c
src/sys/arch/hp700/hp700 [netbsd-5]: mainbus.c
src/sys/arch/hp700/include [netbsd-5]: bus.h

Log Message:
Pull up following revision(s) (requested by skrll in ticket #1035):
sys/arch/hp700/dev/dino.c: revision 1.14 via patch
sys/arch/hp700/hp700/mainbus.c: revision 1.53
sys/arch/hp700/include/bus.h: revision 1.14
Provide bus_space_mmap. Still needs implementing.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/hp700/dev/dino.c
cvs rdiff -u -r1.45 -r1.45.6.1 src/sys/arch/hp700/hp700/mainbus.c
cvs rdiff -u -r1.12 -r1.12.54.1 src/sys/arch/hp700/include/bus.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/hp700/dev/dino.c
diff -u src/sys/arch/hp700/dev/dino.c:1.6 src/sys/arch/hp700/dev/dino.c:1.6.4.1
--- src/sys/arch/hp700/dev/dino.c:1.6	Thu Aug 28 08:25:46 2008
+++ src/sys/arch/hp700/dev/dino.c	Tue Sep 29 22:56:48 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: dino.c,v 1.6 2008/08/28 08:25:46 skrll Exp $ */
+/*	$NetBSD: dino.c,v 1.6.4.1 2009/09/29 22:56:48 snj Exp $ */
 
 /*	$OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $	*/
 
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.6 2008/08/28 08:25:46 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dino.c,v 1.6.4.1 2009/09/29 22:56:48 snj Exp $);
 
 /* #include cardbus.h */
 
@@ -160,6 +160,8 @@
 void dino_free(void *, bus_space_handle_t, bus_size_t);
 void dino_barrier(void *, bus_space_handle_t, bus_size_t, bus_size_t, int);
 void *dino_vaddr(void *, bus_space_handle_t);
+paddr_t dino_mmap(void *, bus_addr_t, off_t, int, int);
+
 u_int8_t dino_r1(void *, bus_space_handle_t, bus_size_t);
 u_int16_t dino_r2(void *, bus_space_handle_t, bus_size_t);
 u_int32_t dino_r4(void *, bus_space_handle_t, bus_size_t);
@@ -568,6 +570,12 @@
 	return bus_space_vaddr(sc-sc_bt, h);
 }
 
+paddr_t
+dino_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
+{
+	return -1;
+}
+
 u_int8_t
 dino_r1(void *v, bus_space_handle_t h, bus_size_t o)
 {
@@ -1399,7 +1407,7 @@
 	NULL,
 
 	NULL, dino_unmap, dino_subregion, NULL, dino_free,
-	dino_barrier, dino_vaddr,
+	dino_barrier, dino_vaddr, dino_mmap,
 	dino_r1,dino_r2,dino_r4,dino_r8,
 	dino_w1,dino_w2,dino_w4,dino_w8,
 	dino_rm_1,  dino_rm_2,  dino_rm_4,  dino_rm_8,

Index: src/sys/arch/hp700/hp700/mainbus.c
diff -u src/sys/arch/hp700/hp700/mainbus.c:1.45 src/sys/arch/hp700/hp700/mainbus.c:1.45.6.1
--- src/sys/arch/hp700/hp700/mainbus.c:1.45	Fri Jun 13 09:41:44 2008
+++ src/sys/arch/hp700/hp700/mainbus.c	Tue Sep 29 22:56:48 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.45 2008/06/13 09:41:44 cegger Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.45.6.1 2009/09/29 22:56:48 snj Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.45 2008/06/13 09:41:44 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: mainbus.c,v 1.45.6.1 2009/09/29 22:56:48 snj Exp $);
 
 #include locators.h
 #include opt_power_switch.h
@@ -156,6 +156,7 @@
 int mbus_subregion(void *, bus_space_handle_t, bus_size_t, bus_size_t, bus_space_handle_t *);
 void mbus_barrier(void *, bus_space_handle_t, bus_size_t, bus_size_t, int);
 void *mbus_vaddr(void *, bus_space_handle_t);
+paddr_t mbus_mmap(void *, bus_addr_t, off_t, int, int);
 
 int mbus_dmamap_create(void *, bus_size_t, int, bus_size_t, bus_size_t, int, bus_dmamap_t *);
 void mbus_dmamap_destroy(void *, bus_dmamap_t);
@@ -456,6 +457,13 @@
 	return (void*)h;
 }
 
+paddr_t
+mbus_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
+{
+
+	return -1;
+}
+
 u_int8_t
 mbus_r1(void *v, bus_space_handle_t h, bus_size_t o)
 {
@@ -810,7 +818,7 @@
 	NULL,
 
 	mbus_map, mbus_unmap, mbus_subregion, mbus_alloc, mbus_free,
-	mbus_barrier, mbus_vaddr,
+	mbus_barrier, mbus_vaddr, mbus_mmap,
 	mbus_r1,mbus_r2,   mbus_r4,   mbus_r8,
 	mbus_w1,mbus_w2,   mbus_w4,   mbus_w8,
 	mbus_rm_1,  mbus_rm_2, mbus_rm_4, mbus_rm_8,

Index: src/sys/arch/hp700/include/bus.h
diff -u src/sys/arch/hp700/include/bus.h:1.12 src/sys/arch/hp700/include/bus.h:1.12.54.1
--- src/sys/arch/hp700/include/bus.h:1.12	Sun Mar  4 05:59:51 2007
+++ src/sys/arch/hp700/include/bus.h	Tue Sep 29 22:56:48 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.12 2007/03/04 05:59:51 christos Exp $	*/
+/*	$NetBSD: bus.h,v 1.12.54.1 2009/09/29 22:56:48 snj Exp $	*/
 
 /*	$OpenBSD: bus.h,v 1.13 2001/07/30 14:15:59 art Exp $	*/
 
@@ -64,6 +64,7 @@
 	void (*hbt_barrier)(void *v, bus_space_handle_t h,
  bus_size_t o, bus_size_t l, int op);
 	void *(*hbt_vaddr)(void *, bus_space_handle_t);
+	paddr_t (*hbt_mmap)(void *, bus_addr_t, off_t, int, int);
 
 	u_int8_t  (*hbt_r1)(void *, bus_space_handle_t,

CVS commit: [netbsd-5] src

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Sep 29 23:30:05 UTC 2009

Modified Files:
src/distrib/sets/lists/base [netbsd-5]: mi
src/etc/mtree [netbsd-5]: NetBSD.dist
src/share/locale [netbsd-5]: Makefile.locale
src/share/locale/ctype [netbsd-5]: Makefile
src/share/locale/messages [netbsd-5]: Makefile
src/share/locale/monetary [netbsd-5]: Makefile
src/share/locale/numeric [netbsd-5]: Makefile
src/share/locale/time [netbsd-5]: Makefile

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1037):
distrib/sets/lists/base/mi: revision 1.811
etc/mtree/NetBSD.dist: revision 1.403
share/locale/Makefile.locale: revision 1.2
share/locale/ctype/Makefile: revision 1.29
share/locale/messages/Makefile: revision 1.6
share/locale/monetary/Makefile: revision 1.6
share/locale/numeric/Makefile: revision 1.5
share/locale/time/Makefile: revision 1.6
Add support for fr_*.UTF-8 locale. Setting LANG to fr_*.UTF-8 won't get
the message catalog right (they're encoded in iso-8859-1), but other locale
functions should work right.
Proposed on tech-userlevel on 20 May 2009.


To generate a diff of this commit:
cvs rdiff -u -r1.780.2.10 -r1.780.2.11 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.385.2.2 -r1.385.2.3 src/etc/mtree/NetBSD.dist
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/share/locale/Makefile.locale
cvs rdiff -u -r1.27.2.1 -r1.27.2.2 src/share/locale/ctype/Makefile
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/share/locale/messages/Makefile
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/share/locale/monetary/Makefile
cvs rdiff -u -r1.3.4.1 -r1.3.4.2 src/share/locale/numeric/Makefile
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/share/locale/time/Makefile

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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.780.2.10 src/distrib/sets/lists/base/mi:1.780.2.11
--- src/distrib/sets/lists/base/mi:1.780.2.10	Thu Sep 17 04:24:26 2009
+++ src/distrib/sets/lists/base/mi	Tue Sep 29 23:30:04 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.780.2.10 2009/09/17 04:24:26 snj Exp $
+# $NetBSD: mi,v 1.780.2.11 2009/09/29 23:30:04 snj Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -2889,6 +2889,13 @@
 ./usr/share/locale/fr_BE.ISO8859-15/LC_MONETARY	base-locale-fr		nls
 ./usr/share/locale/fr_BE.ISO8859-15/LC_NUMERIC	base-locale-fr		nls
 ./usr/share/locale/fr_BE.ISO8859-15/LC_TIME	base-locale-fr		nls
+./usr/share/locale/fr_BE.UTF-8			base-locale-fr
+./usr/share/locale/fr_BE.UTF-8/LC_CTYPE		base-locale-fr		nls
+./usr/share/locale/fr_BE.UTF-8/LC_MESSAGES	base-locale-fr
+./usr/share/locale/fr_BE.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-fr	nls
+./usr/share/locale/fr_BE.UTF-8/LC_MONETARY	base-locale-fr		nls
+./usr/share/locale/fr_BE.UTF-8/LC_NUMERIC	base-locale-fr		nls
+./usr/share/locale/fr_BE.UTF-8/LC_TIME		base-locale-fr		nls
 ./usr/share/locale/fr_CA.ISO8859-1		base-locale-fr
 ./usr/share/locale/fr_CA.ISO8859-1/LC_CTYPE	base-locale-fr		nls
 ./usr/share/locale/fr_CA.ISO8859-1/LC_MESSAGES	base-locale-fr
@@ -2903,6 +2910,13 @@
 ./usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY	base-locale-fr		nls
 ./usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC	base-locale-fr		nls
 ./usr/share/locale/fr_CA.ISO8859-15/LC_TIME	base-locale-fr		nls
+./usr/share/locale/fr_CA.UTF-8			base-locale-fr
+./usr/share/locale/fr_CA.UTF-8/LC_CTYPE		base-locale-fr		nls
+./usr/share/locale/fr_CA.UTF-8/LC_MESSAGES	base-locale-fr
+./usr/share/locale/fr_CA.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-fr	nls
+./usr/share/locale/fr_CA.UTF-8/LC_MONETARY	base-locale-fr		nls
+./usr/share/locale/fr_CA.UTF-8/LC_NUMERIC	base-locale-fr		nls
+./usr/share/locale/fr_CA.UTF-8/LC_TIME		base-locale-fr		nls
 ./usr/share/locale/fr_CH.ISO8859-1		base-locale-fr
 ./usr/share/locale/fr_CH.ISO8859-1/LC_CTYPE	base-locale-fr		nls
 ./usr/share/locale/fr_CH.ISO8859-1/LC_MESSAGES	base-locale-fr
@@ -2917,6 +2931,13 @@
 ./usr/share/locale/fr_CH.ISO8859-15/LC_MONETARY	base-locale-fr		nls
 ./usr/share/locale/fr_CH.ISO8859-15/LC_NUMERIC	base-locale-fr		nls
 ./usr/share/locale/fr_CH.ISO8859-15/LC_TIME	base-locale-fr		nls
+./usr/share/locale/fr_CH.UTF-8			base-locale-fr
+./usr/share/locale/fr_CH.UTF-8/LC_CTYPE		base-locale-fr		nls
+./usr/share/locale/fr_CH.UTF-8/LC_MESSAGES	base-locale-fr
+./usr/share/locale/fr_CH.UTF-8/LC_MESSAGES/SYS_LC_MESSAGES	base-locale-fr	nls
+./usr/share/locale/fr_CH.UTF-8/LC_MONETARY	base-locale-fr		nls
+./usr/share/locale/fr_CH.UTF-8/LC_NUMERIC	base-locale-fr		nls
+./usr/share/locale/fr_CH.UTF-8/LC_TIME		base-locale-fr		nls
 ./usr/share/locale/fr_FR.ISO8859-1		base-locale-fr
 ./usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE	base-locale-fr		nls
 ./usr/share/locale/fr_FR.ISO8859-1/LC_MESSAGES	base-locale-fr
@@ -2931,6 +2952,13 @@

CVS commit: [netbsd-5] src/sys/arch/x86

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Sep 29 23:53:14 UTC 2009

Modified Files:
src/sys/arch/x86/include [netbsd-5]: bus.h isa_machdep.h
src/sys/arch/x86/x86 [netbsd-5]: bus_space.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1040):
sys/arch/x86/include/bus.h: revision 1.18
sys/arch/x86/include/isa_machdep.h: revision 1.7
sys/arch/x86/x86/bus_space.c: revision 1.21
Apply patch proposed on port-amd64/port-i386, allowing to use a 64bit
bus_addr_t on i386PAE kernels:
change bus_addr_t to be a paddr_t (so its size follows paddr_t depending
   on options PAE)
remplace bus_addr_t with vaddr_t where the value is used as a virtual address.
Difference with the proposed patch: cast to uintmax_t and use %jx in
printf() as suggested by Joerg.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.10.1 src/sys/arch/x86/include/bus.h
cvs rdiff -u -r1.6 -r1.6.6.1 src/sys/arch/x86/include/isa_machdep.h
cvs rdiff -u -r1.20.4.1 -r1.20.4.2 src/sys/arch/x86/x86/bus_space.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/x86/include/bus.h
diff -u src/sys/arch/x86/include/bus.h:1.16 src/sys/arch/x86/include/bus.h:1.16.10.1
--- src/sys/arch/x86/include/bus.h:1.16	Mon Apr 28 20:23:40 2008
+++ src/sys/arch/x86/include/bus.h	Tue Sep 29 23:53:14 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.16 2008/04/28 20:23:40 martin Exp $	*/
+/*	$NetBSD: bus.h,v 1.16.10.1 2009/09/29 23:53:14 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -77,11 +77,11 @@
 /*
  * Bus address and size types
  */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
+typedef paddr_t bus_addr_t;
+typedef paddr_t bus_size_t;
 
 typedef	int bus_space_tag_t;
-typedef	u_long bus_space_handle_t;
+typedef	vaddr_t bus_space_handle_t;
 
 int	_x86_memio_map(bus_space_tag_t t, bus_addr_t addr,
 	bus_size_t size, int flags, bus_space_handle_t *bshp);

Index: src/sys/arch/x86/include/isa_machdep.h
diff -u src/sys/arch/x86/include/isa_machdep.h:1.6 src/sys/arch/x86/include/isa_machdep.h:1.6.6.1
--- src/sys/arch/x86/include/isa_machdep.h:1.6	Fri Jun 27 11:03:13 2008
+++ src/sys/arch/x86/include/isa_machdep.h	Tue Sep 29 23:53:14 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.6 2008/06/27 11:03:13 cegger Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.6.6.1 2009/09/29 23:53:14 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -202,19 +202,19 @@
  * function definitions, invoked through the softc.
  */
 
-extern u_long atdevbase;   /* kernel virtual address of hole */
+extern vaddr_t atdevbase; /* kernel virtual address of hole */
 
 /*
  * Given a kernel virtual address for some location
  * in the hole I/O space, return a physical address.
  */
-#define ISA_PHYSADDR(v) ((void *) ((u_long)(v) - atdevbase + IOM_BEGIN))
+#define ISA_PHYSADDR(v) ((bus_addr_t)(v) - atdevbase + IOM_BEGIN)
 
 /*
  * Given a physical address in the hole,
  * return a kernel virtual address.
  */
-#define ISA_HOLE_VADDR(p)  ((void *) ((u_long)(p) - IOM_BEGIN + atdevbase))
+#define ISA_HOLE_VADDR(p)  ((void *) ((vaddr_t)(p) - IOM_BEGIN + atdevbase))
 
 
 /*

Index: src/sys/arch/x86/x86/bus_space.c
diff -u src/sys/arch/x86/x86/bus_space.c:1.20.4.1 src/sys/arch/x86/x86/bus_space.c:1.20.4.2
--- src/sys/arch/x86/x86/bus_space.c:1.20.4.1	Wed Sep 16 03:45:45 2009
+++ src/sys/arch/x86/x86/bus_space.c	Tue Sep 29 23:53:14 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space.c,v 1.20.4.1 2009/09/16 03:45:45 snj Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.20.4.2 2009/09/29 23:53:14 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.20.4.1 2009/09/16 03:45:45 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.20.4.2 2009/09/29 23:53:14 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -199,8 +199,8 @@
 	if (error) {
 		if (extent_free(ex, bpa, size, EX_NOWAIT |
 		(ioport_malloc_safe ? EX_MALLOCOK : 0))) {
-			printf(x86_memio_map: pa 0x%lx, size 0x%lx\n,
-			bpa, size);
+			printf(x86_memio_map: pa 0x%jx, size 0x%jx\n,
+			(uintmax_t)bpa, (uintmax_t)size);
 			printf(x86_memio_map: can't free region\n);
 		}
 	}
@@ -286,8 +286,8 @@
 	if (error) {
 		if (extent_free(iomem_ex, bpa, size, EX_NOWAIT |
 		(ioport_malloc_safe ? EX_MALLOCOK : 0))) {
-			printf(x86_memio_alloc: pa 0x%lx, size 0x%lx\n,
-			bpa, size);
+			printf(x86_memio_alloc: pa 0x%jx, size 0x%jx\n,
+			(uintmax_t)bpa, (uintmax_t)size);
 			printf(x86_memio_alloc: can't free region\n);
 		}
 	}
@@ -464,8 +464,9 @@
 ok:
 	if (extent_free(ex, bpa, size,
 	EX_NOWAIT | (ioport_malloc_safe ? EX_MALLOCOK : 0))) {
-		printf(x86_memio_unmap: %s 0x%lx, size 0x%lx\n,
-		(t == X86_BUS_SPACE_IO) ? port : pa, bpa,

CVS commit: [netbsd-5] src/sys/arch/x86/include

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Sep 29 23:54:36 UTC 2009

Modified Files:
src/sys/arch/x86/include [netbsd-5]: bus.h

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1040):
sys/arch/x86/include/bus.h: revision 1.19
Change bus_size_t from paddr_t to size_t. It doens't make sense to have
a 64bit bus_size_t on i386 as the address space is 32bits anyway.
With a 64bit bus_size_t we need a different bus_space.S for PAE and non-PAE.


To generate a diff of this commit:
cvs rdiff -u -r1.16.10.1 -r1.16.10.2 src/sys/arch/x86/include/bus.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/x86/include/bus.h
diff -u src/sys/arch/x86/include/bus.h:1.16.10.1 src/sys/arch/x86/include/bus.h:1.16.10.2
--- src/sys/arch/x86/include/bus.h:1.16.10.1	Tue Sep 29 23:53:14 2009
+++ src/sys/arch/x86/include/bus.h	Tue Sep 29 23:54:36 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus.h,v 1.16.10.1 2009/09/29 23:53:14 snj Exp $	*/
+/*	$NetBSD: bus.h,v 1.16.10.2 2009/09/29 23:54:36 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
  * Bus address and size types
  */
 typedef paddr_t bus_addr_t;
-typedef paddr_t bus_size_t;
+typedef size_t bus_size_t;
 
 typedef	int bus_space_tag_t;
 typedef	vaddr_t bus_space_handle_t;

CVS commit: src

2009-09-29 Thread Ty Sarna

Module Name:src
Committed By:   tsarna
Date:   Tue Sep 29 23:56:35 UTC 2009

Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: mi shl.elf shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/etc: mi
src/distrib/sets/lists/man: mi
src/doc: 3RDPARTY
src/etc: Makefile group master.passwd
src/etc/defaults: rc.conf
src/etc/mtree: special
src/etc/rc.d: Makefile
src/external: Makefile
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
mDNSUNP.c
src/external/apache2/mDNSResponder/dist/mDNSShared: dns-sd.1 dns_sd.h
src/external/lib: Makefile
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk
src/usr.sbin/postinstall: postinstall
Added Files:
src/etc/rc.d: mdnsd
src/external/apache2: Makefile
src/external/apache2/mDNSResponder: Makefile Makefile.inc
prepare-import.sh
src/external/apache2/mDNSResponder/lib: Makefile shlib_version
src/external/apache2/mDNSResponder/usr.bin: Makefile Makefile.inc
src/external/apache2/mDNSResponder/usr.bin/dns-sd: Makefile
src/external/apache2/mDNSResponder/usr.sbin: Makefile Makefile.inc
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile

Log Message:
Multicast DNS (Bonjour) support, based on Apple's mDNSResponder.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/sets.subr
cvs rdiff -u -r1.830 -r1.831 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.185 -r1.186 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.491 -r1.492 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1313 -r1.1314 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.212 -r1.213 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1158 -r1.1159 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.717 -r1.718 src/doc/3RDPARTY
cvs rdiff -u -r1.372 -r1.373 src/etc/Makefile
cvs rdiff -u -r1.23 -r1.24 src/etc/group
cvs rdiff -u -r1.39 -r1.40 src/etc/master.passwd
cvs rdiff -u -r1.107 -r1.108 src/etc/defaults/rc.conf
cvs rdiff -u -r1.130 -r1.131 src/etc/mtree/special
cvs rdiff -u -r1.79 -r1.80 src/etc/rc.d/Makefile
cvs rdiff -u -r0 -r1.1 src/etc/rc.d/mdnsd
cvs rdiff -u -r1.6 -r1.7 src/external/Makefile
cvs rdiff -u -r0 -r1.1 src/external/apache2/Makefile
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/Makefile \
src/external/apache2/mDNSResponder/Makefile.inc \
src/external/apache2/mDNSResponder/prepare-import.sh
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/lib/Makefile \
src/external/apache2/mDNSResponder/lib/shlib_version
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/usr.bin/Makefile \
src/external/apache2/mDNSResponder/usr.bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/mDNSResponder/usr.bin/dns-sd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/usr.sbin/Makefile \
src/external/apache2/mDNSResponder/usr.sbin/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/lib/Makefile
cvs rdiff -u -r1.49 -r1.50 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.252 -r1.253 src/share/mk/bsd.README
cvs rdiff -u -r1.582 -r1.583 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.104 -r1.105 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/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.87 src/distrib/sets/sets.subr:1.88
--- src/distrib/sets/sets.subr:1.87	Tue Sep  8 07:08:00 2009
+++ src/distrib/sets/sets.subr	Tue Sep 29 23:56:26 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: sets.subr,v 1.87 2009/09/08 07:08:00 skrll Exp $
+#	$NetBSD: sets.subr,v 1.88 2009/09/29 23:56:26 tsarna Exp $
 #
 
 #
@@ -53,6 +53,7 @@
 	MKMAN		\
 	MKMANPAGES	\
 	MKMANZ		\
+	MKMDNS		\
 	MKNLS		\
 	MKNVI		\
 	MKPAM		\
@@ -235,7 +236,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-# 	# $NetBSD: sets.subr,v 1.87 2009/09/08 07:08:00 skrll Exp $
+# 	# $NetBSD: sets.subr,v 1.88 2009/09/29 23:56:26 tsarna Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
@@ -285,6 +286,7 @@
 #	man			${MKMAN} != no
 #	manpages		${MKMANPAGES} != no
 #	manz			${MKMANZ} != no
+#	mdns			${MKMDNS} != no
 #	nls			${MKNLS} != no
 #	nvi			${MKNVI} != no
 #	pam			${MKPAM} != no

Index:

CVS commit: [netbsd-5] src/sys/dev/pci

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Sep 29 23:57:41 UTC 2009

Modified Files:
src/sys/dev/pci [netbsd-5]: if_iwi.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1040):
sys/dev/pci/if_iwi.c: revision 1.79
make iwi_alloc_tx_ring() prototype match function declaration (shows up when
bus_addr_t != bus_size_t). Fix cast for 64bit paddr_t on i386.


To generate a diff of this commit:
cvs rdiff -u -r1.74.2.3 -r1.74.2.4 src/sys/dev/pci/if_iwi.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_iwi.c
diff -u src/sys/dev/pci/if_iwi.c:1.74.2.3 src/sys/dev/pci/if_iwi.c:1.74.2.4
--- src/sys/dev/pci/if_iwi.c:1.74.2.3	Wed Jan 14 17:57:39 2009
+++ src/sys/dev/pci/if_iwi.c	Tue Sep 29 23:57:41 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iwi.c,v 1.74.2.3 2009/01/14 17:57:39 snj Exp $  */
+/*	$NetBSD: if_iwi.c,v 1.74.2.4 2009/09/29 23:57:41 snj Exp $  */
 
 /*-
  * Copyright (c) 2004, 2005
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwi.c,v 1.74.2.3 2009/01/14 17:57:39 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwi.c,v 1.74.2.4 2009/09/29 23:57:41 snj Exp $);
 
 /*-
  * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -102,7 +102,7 @@
 static void	iwi_reset_cmd_ring(struct iwi_softc *, struct iwi_cmd_ring *);
 static void	iwi_free_cmd_ring(struct iwi_softc *, struct iwi_cmd_ring *);
 static int	iwi_alloc_tx_ring(struct iwi_softc *, struct iwi_tx_ring *,
-int, bus_addr_t, bus_size_t);
+int, bus_size_t, bus_size_t);
 static void	iwi_reset_tx_ring(struct iwi_softc *, struct iwi_tx_ring *);
 static void	iwi_free_tx_ring(struct iwi_softc *, struct iwi_tx_ring *);
 static struct mbuf *
@@ -2018,7 +2018,7 @@
 	int ntries, nsegs, error;
 	int sn;
 
-	nsegs = atop((char*)fw+size-1) - atop((char *)fw) + 1;
+	nsegs = atop((vaddr_t)fw+size-1) - atop((vaddr_t)fw) + 1;
 
 	/* Create a DMA map for the firmware image */
 	error = bus_dmamap_create(sc-sc_dmat, size, nsegs, size, 0,

CVS commit: [netbsd-5] src/sys/dev/isa

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Sep 29 23:59:45 UTC 2009

Modified Files:
src/sys/dev/isa [netbsd-5]: if_tr_isa.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1040):
sys/dev/isa/if_tr_isa.c: revision 1.19
Fix printf format after bus_size_t change


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.10.1 src/sys/dev/isa/if_tr_isa.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/isa/if_tr_isa.c
diff -u src/sys/dev/isa/if_tr_isa.c:1.18 src/sys/dev/isa/if_tr_isa.c:1.18.10.1
--- src/sys/dev/isa/if_tr_isa.c:1.18	Mon Apr 28 20:23:52 2008
+++ src/sys/dev/isa/if_tr_isa.c	Tue Sep 29 23:59:45 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tr_isa.c,v 1.18 2008/04/28 20:23:52 martin Exp $	*/
+/*	$NetBSD: if_tr_isa.c,v 1.18.10.1 2009/09/29 23:59:45 snj Exp $	*/
 
 /* XXXJRT changes isa_attach_args too early!! */
 
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_tr_isa.c,v 1.18 2008/04/28 20:23:52 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_tr_isa.c,v 1.18.10.1 2009/09/29 23:59:45 snj Exp $);
 
 #undef TRISADEBUG
 
@@ -107,7 +107,7 @@
 	mmio = ((s  0xfc)  11) + TR_MMIO_OFFSET;
 	if (bus_space_map(ia-ia_memt, mmio, TR_MMIO_SIZE, 0, mmioh)) {
 		printf(tr_isa_map_io: can't map MMIO region 0x%05lx/%d\n,
-			mmio, TR_MMIO_SIZE);
+			(u_long)mmio, TR_MMIO_SIZE);
 		bus_space_unmap(ia-ia_iot, *pioh, ia-ia_io[0].ir_size);
 		return 1;
 	}

CVS commit: [netbsd-5] src/etc/etc.i386

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Sep 30 00:05:07 UTC 2009

Modified Files:
src/etc/etc.i386 [netbsd-5]: Makefile.inc

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1040):
etc/etc.i386/Makefile.inc: revision 1.60
Add XEN3PAE_DOM0 to the list of kernels to build for a release.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.2.1 src/etc/etc.i386/Makefile.inc

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

Modified files:

Index: src/etc/etc.i386/Makefile.inc
diff -u src/etc/etc.i386/Makefile.inc:1.59 src/etc/etc.i386/Makefile.inc:1.59.2.1
--- src/etc/etc.i386/Makefile.inc:1.59	Sun May 11 12:31:45 2008
+++ src/etc/etc.i386/Makefile.inc	Wed Sep 30 00:05:07 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.59 2008/05/11 12:31:45 chris Exp $
+#	$NetBSD: Makefile.inc,v 1.59.2.1 2009/09/30 00:05:07 snj Exp $
 #
 #	etc.i386/Makefile.inc -- i386-specific etc Makefile targets
 #
@@ -11,6 +11,7 @@
 KERNEL_SETS+=	XEN2_DOMU
 KERNEL_SETS+=	XEN3_DOM0
 KERNEL_SETS+=	XEN3_DOMU
+KERNEL_SETS+=	XEN3PAE_DOM0
 KERNEL_SETS+=	XEN3PAE_DOMU
 # KERNEL_SETS+=	GENERIC_TINY
 # KERNEL_SETS+=	GENERIC_PS2TINY

CVS commit: [netbsd-5] src/sys/arch/x86/x86

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Sep 30 00:06:07 UTC 2009

Modified Files:
src/sys/arch/x86/x86 [netbsd-5]: bus_space.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1040):
sys/arch/x86/x86/bus_space.c: revision 1.22
physical addresses may not fit in u_long, use paddr_t


To generate a diff of this commit:
cvs rdiff -u -r1.20.4.2 -r1.20.4.3 src/sys/arch/x86/x86/bus_space.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/x86/x86/bus_space.c
diff -u src/sys/arch/x86/x86/bus_space.c:1.20.4.2 src/sys/arch/x86/x86/bus_space.c:1.20.4.3
--- src/sys/arch/x86/x86/bus_space.c:1.20.4.2	Tue Sep 29 23:53:14 2009
+++ src/sys/arch/x86/x86/bus_space.c	Wed Sep 30 00:06:07 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space.c,v 1.20.4.2 2009/09/29 23:53:14 snj Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.20.4.3 2009/09/30 00:06:07 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.20.4.2 2009/09/29 23:53:14 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.20.4.3 2009/09/30 00:06:07 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -301,7 +301,7 @@
 x86_mem_add_mapping(bus_addr_t bpa, bus_size_t size,
 		int cacheable, bus_space_handle_t *bshp)
 {
-	u_long pa, endpa;
+	paddr_t pa, endpa;
 	vaddr_t va, sva;
 	pt_entry_t *pte, xpte;

CVS commit: [netbsd-5] src/sys/arch

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Sep 30 00:08:03 UTC 2009

Modified Files:
src/sys/arch/i386/i386 [netbsd-5]: db_memrw.c
src/sys/arch/i386/include [netbsd-5]: param.h
src/sys/arch/xen/include [netbsd-5]: xenpmap.h
src/sys/arch/xen/xen [netbsd-5]: xenevt.c
Added Files:
src/sys/arch/i386/conf [netbsd-5]: XEN3PAE_DOM0

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1040):
sys/arch/i386/include/param.h: revision 1.71
sys/arch/i386/i386/db_memrw.c: revision 1.25
sys/arch/xen/include/xenpmap.h: revision 1.22
sys/arch/xen/xen/xenevt.c: revision 1.31
More i386PAE fixes:
- x86_round_page, x86_trunc_page, x86_btop and x86_ptob macros are used with
  physical addresses; cast to paddr_t instead of u_long. Issue pointed out
  by jym@
- machine_to_phys_mapping[] is a long. This is fine as it holds page
  frame numbers (and this fits in a 32bit int as physical addresses are
  only 36bits), but cast to paddr_t before  PAGE_SHIFT
- xen_start_info.store_mfn is a long; cast it to paddr_t before  PAGE_SHIFT.
  should fix issue pointed out by cegger@


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.8.2 src/sys/arch/i386/conf/XEN3PAE_DOM0
cvs rdiff -u -r1.24 -r1.24.10.1 src/sys/arch/i386/i386/db_memrw.c
cvs rdiff -u -r1.67.30.3 -r1.67.30.4 src/sys/arch/i386/include/param.h
cvs rdiff -u -r1.21 -r1.21.4.1 src/sys/arch/xen/include/xenpmap.h
cvs rdiff -u -r1.29.4.1 -r1.29.4.2 src/sys/arch/xen/xen/xenevt.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/i386/i386/db_memrw.c
diff -u src/sys/arch/i386/i386/db_memrw.c:1.24 src/sys/arch/i386/i386/db_memrw.c:1.24.10.1
--- src/sys/arch/i386/i386/db_memrw.c:1.24	Mon Apr 28 20:23:24 2008
+++ src/sys/arch/i386/i386/db_memrw.c	Wed Sep 30 00:08:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_memrw.c,v 1.24 2008/04/28 20:23:24 martin Exp $	*/
+/*	$NetBSD: db_memrw.c,v 1.24.10.1 2009/09/30 00:08:03 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.24 2008/04/28 20:23:24 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_memrw.c,v 1.24.10.1 2009/09/30 00:08:03 snj Exp $);
 
 #include opt_xen.h
 
@@ -125,7 +125,7 @@
 		if (oldpte  PG_PS)
 			pgva = (vaddr_t)dst  PG_LGFRAME;
 		else
-			pgva = x86_trunc_page(dst);
+			pgva = x86_trunc_page((vaddr_t)dst);
 
 		/*
 		 * Compute number of bytes that can be written

Index: src/sys/arch/i386/include/param.h
diff -u src/sys/arch/i386/include/param.h:1.67.30.3 src/sys/arch/i386/include/param.h:1.67.30.4
--- src/sys/arch/i386/include/param.h:1.67.30.3	Mon Feb 16 03:06:21 2009
+++ src/sys/arch/i386/include/param.h	Wed Sep 30 00:08:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: param.h,v 1.67.30.3 2009/02/16 03:06:21 snj Exp $	*/
+/*	$NetBSD: param.h,v 1.67.30.4 2009/09/30 00:08:03 snj Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -161,9 +161,9 @@
 #define	x86_trunc_pdr(x)	((unsigned long)(x)  ~(NBPD_L2 - 1))
 #define	x86_btod(x)		((unsigned long)(x)  L2_SHIFT)
 #define	x86_dtob(x)		((unsigned long)(x)  L2_SHIFT)
-#define	x86_round_page(x)	unsigned long)(x)) + PGOFSET)  ~PGOFSET)
-#define	x86_trunc_page(x)	((unsigned long)(x)  ~PGOFSET)
-#define	x86_btop(x)		((unsigned long)(x)  PGSHIFT)
-#define	x86_ptob(x)		((unsigned long)(x)  PGSHIFT)
+#define	x86_round_page(x)	paddr_t)(x)) + PGOFSET)  ~PGOFSET)
+#define	x86_trunc_page(x)	((paddr_t)(x)  ~PGOFSET)
+#define	x86_btop(x)		((paddr_t)(x)  PGSHIFT)
+#define	x86_ptob(x)		((paddr_t)(x)  PGSHIFT)
 
 #endif /* _I386_PARAM_H_ */

Index: src/sys/arch/xen/include/xenpmap.h
diff -u src/sys/arch/xen/include/xenpmap.h:1.21 src/sys/arch/xen/include/xenpmap.h:1.21.4.1
--- src/sys/arch/xen/include/xenpmap.h:1.21	Fri Oct 24 22:06:06 2008
+++ src/sys/arch/xen/include/xenpmap.h	Wed Sep 30 00:08:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: xenpmap.h,v 1.21 2008/10/24 22:06:06 jym Exp $	*/
+/*	$NetBSD: xenpmap.h,v 1.21.4.1 2009/09/30 00:08:03 snj Exp $	*/
 
 /*
  *
@@ -71,15 +71,17 @@
 static __inline paddr_t
 xpmap_mtop(paddr_t mpa)
 {
-	return ((machine_to_phys_mapping[mpa  PAGE_SHIFT]  PAGE_SHIFT) +
-	XPMAP_OFFSET) | (mpa  ~PG_FRAME);
+	return (
+	((paddr_t)machine_to_phys_mapping[mpa  PAGE_SHIFT]  PAGE_SHIFT)
+	+ XPMAP_OFFSET) | (mpa  ~PG_FRAME);
 }
 
 static __inline paddr_t
 xpmap_mtop_masked(paddr_t mpa)
 {
-	return ((machine_to_phys_mapping[mpa  PAGE_SHIFT]  PAGE_SHIFT) +
-	XPMAP_OFFSET);
+	return (
+	((paddr_t)machine_to_phys_mapping[mpa  PAGE_SHIFT]  PAGE_SHIFT)
+	+ XPMAP_OFFSET);
 }
 
 static __inline paddr_t

Index: src/sys/arch/xen/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.29.4.1 src/sys/arch/xen/xen/xenevt.c:1.29.4.2
--- src/sys/arch/xen/xen/xenevt.c:1.29.4.1	Sat Apr  4 23:36:27 2009
+++

CVS commit: [netbsd-5] src/sys/dev/isa

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Sep 30 00:01:19 UTC 2009

Modified Files:
src/sys/dev/isa [netbsd-5]: if_lc_isa.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1040):
sys/dev/isa/if_lc_isa.c: revision 1.30
sys/dev/pci/pccbb.c: revision 1.183
Fix bus_addr_t/bus_size_t confusion


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.14.1 src/sys/dev/isa/if_lc_isa.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/isa/if_lc_isa.c
diff -u src/sys/dev/isa/if_lc_isa.c:1.29 src/sys/dev/isa/if_lc_isa.c:1.29.14.1
--- src/sys/dev/isa/if_lc_isa.c:1.29	Tue Apr  8 20:08:50 2008
+++ src/sys/dev/isa/if_lc_isa.c	Wed Sep 30 00:01:19 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_lc_isa.c,v 1.29 2008/04/08 20:08:50 cegger Exp $ */
+/*	$NetBSD: if_lc_isa.c,v 1.29.14.1 2009/09/30 00:01:19 snj Exp $ */
 
 /*-
  * Copyright (c) 1994, 1995, 1997 Matt Thomas m...@3am-software.com
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_lc_isa.c,v 1.29 2008/04/08 20:08:50 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_lc_isa.c,v 1.29.14.1 2009/09/30 00:01:19 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -76,7 +76,7 @@
 	int attach;
 {
 	bus_addr_t maddr;
-	bus_addr_t msiz;
+	bus_size_t msiz;
 	int rv = 0, irq;
 
 	if (ia-ia_nio  1)

CVS commit: [netbsd-5] src/sys/dev/pci

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Sep 30 00:00:50 UTC 2009

Modified Files:
src/sys/dev/pci [netbsd-5]: pccbb.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1040):
sys/dev/isa/if_lc_isa.c: revision 1.30
sys/dev/pci/pccbb.c: revision 1.183
Fix bus_addr_t/bus_size_t confusion


To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.180.4.1 src/sys/dev/pci/pccbb.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/pccbb.c
diff -u src/sys/dev/pci/pccbb.c:1.180 src/sys/dev/pci/pccbb.c:1.180.4.1
--- src/sys/dev/pci/pccbb.c:1.180	Sat Oct 25 18:46:38 2008
+++ src/sys/dev/pci/pccbb.c	Wed Sep 30 00:00:49 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pccbb.c,v 1.180 2008/10/25 18:46:38 christos Exp $	*/
+/*	$NetBSD: pccbb.c,v 1.180.4.1 2009/09/30 00:00:49 snj Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.180 2008/10/25 18:46:38 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.180.4.1 2009/09/30 00:00:49 snj Exp $);
 
 /*
 #define CBB_DEBUG
@@ -150,7 +150,7 @@
 STATIC void pccbb_pcmcia_mem_free(pcmcia_chipset_handle_t,
 struct pcmcia_mem_handle *);
 STATIC int pccbb_pcmcia_mem_map(pcmcia_chipset_handle_t, int, bus_addr_t,
-bus_size_t, struct pcmcia_mem_handle *, bus_addr_t *, int *);
+bus_size_t, struct pcmcia_mem_handle *, bus_size_t *, int *);
 STATIC void pccbb_pcmcia_mem_unmap(pcmcia_chipset_handle_t, int);
 STATIC int pccbb_pcmcia_io_alloc(pcmcia_chipset_handle_t, bus_addr_t,
 bus_size_t, bus_size_t, struct pcmcia_io_handle *);
@@ -2683,7 +2683,7 @@
 STATIC int
 pccbb_pcmcia_mem_map(pcmcia_chipset_handle_t pch, int kind,
 bus_addr_t card_addr, bus_size_t size, struct pcmcia_mem_handle *pcmhp,
-bus_addr_t *offsetp, int *windowp)
+bus_size_t *offsetp, int *windowp)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)pch;
 	struct pcic_handle *ph = sc-sc_pcmcia_h;

CVS commit: [netbsd-5] src/doc

2009-09-29 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Wed Sep 30 00:30:35 UTC 2009

Modified Files:
src/doc [netbsd-5]: CHANGES-5.1

Log Message:
Tickets 1016, 1035, 1037, and 1040.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.78 -r1.1.2.79 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.78 src/doc/CHANGES-5.1:1.1.2.79
--- src/doc/CHANGES-5.1:1.1.2.78	Mon Sep 28 18:45:31 2009
+++ src/doc/CHANGES-5.1	Wed Sep 30 00:30:34 2009
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1,v 1.1.2.78 2009/09/28 18:45:31 snj Exp $
+# $NetBSD: CHANGES-5.1,v 1.1.2.79 2009/09/30 00:30:34 snj Exp $
 
 A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1
 release:
@@ -13693,3 +13693,53 @@
 	Update xterm to 248.
 	[mrg, ticket #1034]
 
+sys/dev/audio.c	1.246, 1.247
+
+	OSS audio allows mixer operations on the dsp device. NetBSD would
+	return EINVAL in these circumstances. This can break audio in apps
+	running under Linux emulation.  Select whether to call
+	mixer_ioctl() or audio_ioctl() based on whether the command smells
+	like a mixer ioctl or not.
+	[sborrill, ticket #1016]
+
+sys/arch/hp700/dev/dino.c			1.14 via patch
+sys/arch/hp700/hp700/mainbus.c			1.53
+sys/arch/hp700/include/bus.h			1.14
+
+	Provide bus_space_mmap. Still needs implementing.
+	[skrll, ticket #1035]
+
+distrib/sets/lists/base/mi			1.811
+etc/mtree/NetBSD.dist1.403
+share/locale/Makefile.locale			1.2
+share/locale/ctype/Makefile			1.29
+share/locale/messages/Makefile			1.6
+share/locale/monetary/Makefile			1.6
+share/locale/numeric/Makefile			1.5
+share/locale/time/Makefile			1.6
+
+	Add support for fr_*.UTF-8 locale. Setting LANG to fr_*.UTF-8
+	won't get the message catalog right (they're encoded in
+	iso-8859-1), but other locale functions should work right.
+	[bouyer, ticket #1037]
+
+etc/etc.i386/Makefile.in			1.60
+sys/dev/isa/if_lc_isa.c1.30
+sys/dev/isa/if_tr_isa.c1.19
+sys/dev/pci/if_dge.c1.23
+sys/dev/pci/if_iwi.c1.79
+sys/dev/pci/pccbb.c1.183
+sys/arch/i386/conf/XEN3PAE_DOM0			1.1
+sys/arch/i386/i386/db_memrw.c			1.25
+sys/arch/i386/include/param.h			1.71
+sys/arch/xen/include/xenpmap.h			1.22
+sys/arch/xen/xen/xenevt.c			1.31
+sys/arch/x86/include/bus.h			1.18, 1.19
+sys/arch/x86/include/isa_machdep.h		1.7
+sys/arch/x86/x86/bus_space.c			1.21, 1.22
+sys/arch/x86/x86/ioapic.c			1.39 
+sys/arch/x86/x86/mpbios.c			1.53
+
+	Add i386PAE support to Xen3 dom0.
+	[bouyer, ticket #1040]
+

CVS commit: src/distrib/i386

2009-09-29 Thread Adam Hoka

Module Name:src
Committed By:   ahoka
Date:   Wed Sep 30 00:32:08 UTC 2009

Modified Files:
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/i386/ramdisks/common: dot.profile

Log Message:
Give a chance for dhcpcd to work by mounting a memory backed /var/db and
/var/run. Also create an empty lease file in /tmp/dhcpcd-lease.

XXX is this needed on other platforms too?


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.3 -r1.4 src/distrib/i386/ramdisks/common/dot.profile

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

Modified files:

Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.13 src/distrib/i386/cdroms/Makefile.cdrom:1.14
--- src/distrib/i386/cdroms/Makefile.cdrom:1.13	Fri Sep 25 14:09:27 2009
+++ src/distrib/i386/cdroms/Makefile.cdrom	Wed Sep 30 00:32:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.13 2009/09/25 14:09:27 christos Exp $
+# $NetBSD: Makefile.cdrom,v 1.14 2009/09/30 00:32:08 ahoka Exp $
 
 .include bsd.own.mk
 
@@ -55,3 +55,4 @@
 	${CP} ${SYSINSTDIR}/sysinst cdrom
 	${CHMOD} ugo+rx cdrom/sysinst
 	${CP} ${SYSINSTDIR}/sysinstmsgs.?? cdrom
+	${MKDIR} cdrom/var

Index: src/distrib/i386/ramdisks/common/dot.profile
diff -u src/distrib/i386/ramdisks/common/dot.profile:1.3 src/distrib/i386/ramdisks/common/dot.profile:1.4
--- src/distrib/i386/ramdisks/common/dot.profile:1.3	Tue Nov 25 14:25:59 2008
+++ src/distrib/i386/ramdisks/common/dot.profile	Wed Sep 30 00:32:08 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: dot.profile,v 1.3 2008/11/25 14:25:59 ad Exp $
+#	$NetBSD: dot.profile,v 1.4 2009/09/30 00:32:08 ahoka Exp $
 #
 # Copyright (c) 1997 Perry E. Metzger
 # Copyright (c) 1994 Christopher G. Demetriou
@@ -57,8 +57,12 @@
 	# set up some sane defaults
 	stty newcrt werase ^W intr ^C kill ^U erase ^H
 	mount -t tmpfs tmpfs /tmp
+	mount -t tmpfs tmpfs /var
 	mount -t tmpfs -o union tmpfs /etc
 
+	mkdir -p /var/run /var/db
+	echo  /tmp/dhcpcd-lease
+
 	grep() sed -n /$1/p
 
 	if [ -x /sysinst ]; then

CVS commit: src/distrib/sets/lists/base

2009-09-29 Thread Ty Sarna

Module Name:src
Committed By:   tsarna
Date:   Wed Sep 30 03:41:12 UTC 2009

Modified Files:
src/distrib/sets/lists/base: shl.elf shl.mi

Log Message:
Correct version number for libdns_sd to match last-minute change


To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.492 -r1.493 src/distrib/sets/lists/base/shl.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/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.186 src/distrib/sets/lists/base/shl.elf:1.187
--- src/distrib/sets/lists/base/shl.elf:1.186	Tue Sep 29 23:56:26 2009
+++ src/distrib/sets/lists/base/shl.elf	Wed Sep 30 03:41:12 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.186 2009/09/29 23:56:26 tsarna Exp $
+# $NetBSD: shl.elf,v 1.187 2009/09/30 03:41:12 tsarna Exp $
 #
 # Note:	Do not mark old major and major.minor shared libraries as
 #	obsolete; just remove the entry, as third-party applications
@@ -122,7 +122,7 @@
 ./usr/lib/libdns.sobase-bind-shlib
 ./usr/lib/libdns.so.4base-bind-shlib
 ./usr/lib/libdns_sd.sobase-mdns-shlib		mdns
-./usr/lib/libdns_sd.so.1			base-mdns-shlib		mdns
+./usr/lib/libdns_sd.so.0			base-mdns-shlib		mdns
 ./usr/lib/libedit.sobase-sys-shlib
 ./usr/lib/libedit.so.3base-sys-shlib
 ./usr/lib/libevent.sobase-sys-shlib

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.492 src/distrib/sets/lists/base/shl.mi:1.493
--- src/distrib/sets/lists/base/shl.mi:1.492	Tue Sep 29 23:56:26 2009
+++ src/distrib/sets/lists/base/shl.mi	Wed Sep 30 03:41:12 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.492 2009/09/29 23:56:26 tsarna Exp $
+# $NetBSD: shl.mi,v 1.493 2009/09/30 03:41:12 tsarna Exp $
 #
 # Note:	Don't delete entries from here - mark them as obsolete instead,
 #	unless otherwise stated below.
@@ -69,7 +69,7 @@
 ./usr/lib/libdes.so.8.1base-crypto-shlib	crypto
 ./usr/lib/libdevmapper.so.1.0			base-lvm-shlib		lvm
 ./usr/lib/libdns.so.4.0base-bind-shlib
-./usr/lib/libdns_sd.so.1.0			base-mdns-shlib		mdns
+./usr/lib/libdns_sd.so.0.0			base-mdns-shlib		mdns
 ./usr/lib/libedit.so.3.0			base-sys-shlib
 ./usr/lib/libevent.so.3.1			base-sys-shlib
 ./usr/lib/libfetch.so.3.0			base-sys-shlib

CVS commit: src/sbin/sysctl

2009-09-29 Thread Elad Efrat

Module Name:src
Committed By:   elad
Date:   Wed Sep 30 04:30:50 UTC 2009

Modified Files:
src/sbin/sysctl: sysctl.8 sysctl.c

Log Message:
Remove stale references to the read only at securelevel [12] flags in
the documentation and code comments.


To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sbin/sysctl/sysctl.8
cvs rdiff -u -r1.129 -r1.130 src/sbin/sysctl/sysctl.c

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

Modified files:

Index: src/sbin/sysctl/sysctl.8
diff -u src/sbin/sysctl/sysctl.8:1.160 src/sbin/sysctl/sysctl.8:1.161
--- src/sbin/sysctl/sysctl.8:1.160	Wed Apr  1 15:55:27 2009
+++ src/sbin/sysctl/sysctl.8	Wed Sep 30 04:30:50 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: sysctl.8,v 1.160 2009/04/01 15:55:27 christos Exp $
+.\	$NetBSD: sysctl.8,v 1.161 2009/09/30 04:30:50 elad Exp $
 .\
 .\ Copyright (c) 2004 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -54,7 +54,7 @@
 .\
 .\	@(#)sysctl.8	8.1 (Berkeley) 6/6/93
 .\
-.Dd April 1, 2009
+.Dd September 30, 2009
 .Dt SYSCTL 8
 .Os
 .Sh NAME
@@ -376,16 +376,6 @@
 .Dq Writable .
 The data instrumented by the given node is writable at any time.
 This is the default for nodes that can have children.
-.It 1
-.Dq Read-only at securelevel 1 .
-The data instrumented by this node is writable until the securelevel
-reaches or passes securelevel 1.
-Examples of this include some network tunables.
-.It 2
-.Dq Read-only at securelevel 2 .
-The data instrumented by this node is writable until the securelevel
-reaches or passes securelevel 2.
-An example of this is the per-process core filename setting.
 .El
 .Pp
 .It
@@ -527,8 +517,7 @@
 .Sh SEE ALSO
 .Xr sysctl 3 ,
 .Xr ksyms 4 ,
-.Xr sysctl 7 ,
-.Xr secmodel_securelevel 9
+.Xr sysctl 7
 .Sh HISTORY
 .Nm sysctl
 first appeared in

Index: src/sbin/sysctl/sysctl.c
diff -u src/sbin/sysctl/sysctl.c:1.129 src/sbin/sysctl/sysctl.c:1.130
--- src/sbin/sysctl/sysctl.c:1.129	Wed Apr  1 15:55:27 2009
+++ src/sbin/sysctl/sysctl.c	Wed Sep 30 04:30:50 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysctl.c,v 1.129 2009/04/01 15:55:27 christos Exp $ */
+/*	$NetBSD: sysctl.c,v 1.130 2009/09/30 04:30:50 elad Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 #if 0
 static char sccsid[] = @(#)sysctl.c	8.1 (Berkeley) 6/6/93;
 #else
-__RCSID($NetBSD: sysctl.c,v 1.129 2009/04/01 15:55:27 christos Exp $);
+__RCSID($NetBSD: sysctl.c,v 1.130 2009/09/30 04:30:50 elad Exp $);
 #endif
 #endif /* not lint */
 
@@ -912,10 +912,9 @@
   [addr=0x,|symbol=...|value=...]
 
   size is optional for some types.  type must be set before anything
-  else.  nodes can have [r12whp], but nothing else applies.  if no
+  else.  nodes can have [rwhp], but nothing else applies.  if no
   size or type is given, node is asserted.  writeable is the default,
-  with [r12w] being read-only, writeable below securelevel 1,
-  writeable below securelevel 2, and unconditionally writeable
+  with [rw] being read-only and unconditionally writeable
   respectively.  if you specify addr, it is assumed to be the name of
   a kernel symbol, if value, CTLFLAG_OWNDATA will be asserted for
   strings, CTLFLAG_IMMEDIATE for ints and u_quad_ts.  you cannot

CVS commit: src/sys/dev

CVS commit: src/sys/kern

CVS commit: src/bin/cp

CVS commit: src

CVS commit: src/dist/libpcap

CVS commit: xsrc/external/mit/xf86-video-crime/dist/src

CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/xaa

CVS commit: src/sys/dev/acpi

CVS commit: src/external/apache2/mDNSResponder/dist

CVS commit: src/sys/kern

CVS commit: [netbsd-5] src/sys/dev

CVS commit: [netbsd-5] src/sys/dev

CVS commit: [netbsd-5] src/sys/arch/hp700

CVS commit: [netbsd-5] src

CVS commit: [netbsd-5] src/sys/arch/x86

CVS commit: [netbsd-5] src/sys/arch/x86/include

CVS commit: src

CVS commit: [netbsd-5] src/sys/dev/pci

CVS commit: [netbsd-5] src/sys/dev/isa

CVS commit: [netbsd-5] src/etc/etc.i386

CVS commit: [netbsd-5] src/sys/arch/x86/x86

CVS commit: [netbsd-5] src/sys/arch

CVS commit: [netbsd-5] src/sys/dev/isa

CVS commit: [netbsd-5] src/sys/dev/pci

CVS commit: [netbsd-5] src/doc

CVS commit: src/distrib/i386

CVS commit: src/distrib/sets/lists/base

CVS commit: src/sbin/sysctl

28 matches

Site Navigation

Mail list logo

Footer information