CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Oct 16 07:34:20 UTC 2013

Modified Files:
src/sys/dev/usb: if_kue.c

Log Message:
Apply patch from PR/48310 - kue(4) cannot receive multicast packets.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/usb/if_kue.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/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.79 src/sys/dev/usb/if_kue.c:1.80
--- src/sys/dev/usb/if_kue.c:1.79	Sat Jan  5 01:30:15 2013
+++ src/sys/dev/usb/if_kue.c	Wed Oct 16 07:34:20 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_kue.c,v 1.79 2013/01/05 01:30:15 christos Exp $	*/
+/*	$NetBSD: if_kue.c,v 1.80 2013/10/16 07:34:20 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -71,7 +71,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_kue.c,v 1.79 2013/01/05 01:30:15 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_kue.c,v 1.80 2013/10/16 07:34:20 skrll Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_inet.h
@@ -1038,8 +1038,12 @@ kue_ioctl(struct ifnet *ifp, u_long comm
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
-		kue_setmulti(sc);
-		error = 0;
+		error = ether_ioctl(ifp, command, data);
+		if (error == ENETRESET) {
+			if (ifp-if_flags  IFF_RUNNING)
+kue_setmulti(sc);
+			error = 0;
+		}
 		break;
 	default:
 		error = ether_ioctl(ifp, command, data);

CVS commit: src/libexec/httpd

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Wed Oct 16 10:04:26 UTC 2013

Modified Files:
src/libexec/httpd: Makefile

Log Message:
Also depend on LIBLUA, and add -lm to allow static linking.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/libexec/httpd/Makefile

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

Modified files:

Index: src/libexec/httpd/Makefile
diff -u src/libexec/httpd/Makefile:1.16 src/libexec/httpd/Makefile:1.17
--- src/libexec/httpd/Makefile:1.16	Sat Oct 12 17:24:06 2013
+++ src/libexec/httpd/Makefile	Wed Oct 16 10:04:26 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2013/10/12 17:24:06 mbalmer Exp $
+#	$NetBSD: Makefile,v 1.17 2013/10/16 10:04:26 he Exp $
 #
 #	$eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
 #
@@ -27,8 +27,8 @@ SRCS=	bozohttpd.c ssl-bozo.c auth-bozo.c
 	tilde-luzah-bozo.c dir-index-bozo.c content-bozo.c lua-bozo.c
 SRCS+=	main.c
 
-LDADD=	-lcrypt -llua
-DPADD=	${LIBCRYPT}
+LDADD=	-lcrypt -llua -lm
+DPADD=	${LIBCRYPT} ${LIBLUA} ${LIBM}
 
 WARNS?=	4
 

CVS commit: src/lib/libcurses

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Wed Oct 16 12:43:35 UTC 2013

Modified Files:
src/lib/libcurses: curses.h

Log Message:
Define WA_NORMAL


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/lib/libcurses/curses.h

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

Modified files:

Index: src/lib/libcurses/curses.h
diff -u src/lib/libcurses/curses.h:1.104 src/lib/libcurses/curses.h:1.105
--- src/lib/libcurses/curses.h:1.104	Sat Apr 21 12:27:27 2012
+++ src/lib/libcurses/curses.h	Wed Oct 16 12:43:35 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: curses.h,v 1.104 2012/04/21 12:27:27 roy Exp $	*/
+/*	$NetBSD: curses.h,v 1.105 2013/10/16 12:43:35 roy Exp $	*/
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -259,6 +259,7 @@ typedef struct __screen SCREEN;
 
 #ifdef HAVE_WCHAR
 #define WA_ATTRIBUTES	0x03ff	/* Wide character attributes mask */
+#define WA_NORMAL	__NORMAL
 #define WA_STANDOUT	__STANDOUT	/* Best highlighting mode */
 #define WA_UNDERLINE	__UNDERSCORE	/* Underlining */
 #define WA_REVERSE	__REVERSE	/* Reverse video */

CVS commit: src/etc/mtree

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 14:50:43 UTC 2013

Modified Files:
src/etc/mtree: Makefile

Log Message:
silence is golden


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/etc/mtree/Makefile

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

Modified files:

Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.23 src/etc/mtree/Makefile:1.24
--- src/etc/mtree/Makefile:1.23	Sat Apr 27 03:59:09 2013
+++ src/etc/mtree/Makefile	Wed Oct 16 10:50:43 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2013/04/27 07:59:09 matt Exp $
+#	$NetBSD: Makefile,v 1.24 2013/10/16 14:50:43 christos Exp $
 
 .include bsd.own.mk
 
@@ -54,7 +54,7 @@ TOOL_MTREE.unpriv=	-W
 # the Makefile.
 #
 emit_dist_file:
-	cat ${.CURDIR}/NetBSD.dist.base ${EXTRA_DIST_FILES}
+	@cat ${.CURDIR}/NetBSD.dist.base ${EXTRA_DIST_FILES}
 
 distrib-dirs: .PHONY check_DESTDIR NetBSD.dist
 .if !defined(DISTRIBUTION_DONE)		# {

CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Wed Oct 16 15:28:27 UTC 2013

Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile

Log Message:
Add missing i810_dri.c file to SRCS.
PR xsrc/48315.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.11
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.10	Thu Aug 11 23:15:40 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile	Wed Oct 16 15:28:27 2013
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.10 2011/08/11 23:15:40 joerg Exp $
+#	$NetBSD: Makefile,v 1.11 2013/10/16 15:28:27 martin Exp $
 
 DRIVER=		xf86-video-intel
 DRIVER_NAME=	intel_drv
 
 SRCS=		drmmode_display.c i810_accel.c i810_cursor.c i810_dga.c
-SRCS+=		i810_driver.c i810_io.c i810_memory.c i810_video.c
+SRCS+=		i810_dri.c i810_driver.c i810_io.c i810_memory.c i810_video.c
 SRCS+=		i810_wmark.c i830_3d.c i830_accel.c i830_bios.c
 SRCS+=		i830_batchbuffer.c i830_crt.c i830_cursor.c i830_debug.c
 SRCS+=		i830_display.c i830_quirks.c i830_driver.c i830_dvo.c

CVS commit: src/usr.sbin/mtree

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 17:24:20 UTC 2013

Modified Files:
src/usr.sbin/mtree: create.c

Log Message:
Restore old behavior of not printing sizes for directories, since it varies
depending on filesystem implementation. (Brooks Davis)


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/usr.sbin/mtree/create.c

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

Modified files:

Index: src/usr.sbin/mtree/create.c
diff -u src/usr.sbin/mtree/create.c:1.70 src/usr.sbin/mtree/create.c:1.71
--- src/usr.sbin/mtree/create.c:1.70	Mon Sep  9 19:27:43 2013
+++ src/usr.sbin/mtree/create.c	Wed Oct 16 13:24:20 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: create.c,v 1.70 2013/09/09 23:27:43 christos Exp $	*/
+/*	$NetBSD: create.c,v 1.71 2013/10/16 17:24:20 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = @(#)create.c	8.1 (Berkeley) 6/6/93;
 #else
-__RCSID($NetBSD: create.c,v 1.70 2013/09/09 23:27:43 christos Exp $);
+__RCSID($NetBSD: create.c,v 1.71 2013/10/16 17:24:20 christos Exp $);
 #endif
 #endif /* not lint */
 
@@ -221,7 +221,7 @@ statf(int indent, FTSENT *p)
 	if (keys  F_NLINK  p-fts_statp-st_nlink != 1)
 		output(indent, offset, nlink=%u, p-fts_statp-st_nlink);
 	if (keys  F_SIZE 
-	(flavor != F_NETBSD6 || S_ISREG(p-fts_statp-st_mode)))
+	(flavor == F_FREEBSD9 || S_ISREG(p-fts_statp-st_mode)))
 		output(indent, offset, size=%ju,
 		(uintmax_t)p-fts_statp-st_size);
 	if (keys  F_TIME)

CVS commit: src/usr.sbin/mtree

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 17:26:14 UTC 2013

Modified Files:
src/usr.sbin/mtree: spec.c

Log Message:
Default a bare . with no type to F_DIR. For FreeBSD compatibility (Brooks
Davis)


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/usr.sbin/mtree/spec.c

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

Modified files:

Index: src/usr.sbin/mtree/spec.c
diff -u src/usr.sbin/mtree/spec.c:1.86 src/usr.sbin/mtree/spec.c:1.87
--- src/usr.sbin/mtree/spec.c:1.86	Mon Sep  9 19:27:43 2013
+++ src/usr.sbin/mtree/spec.c	Wed Oct 16 13:26:14 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: spec.c,v 1.86 2013/09/09 23:27:43 christos Exp $	*/
+/*	$NetBSD: spec.c,v 1.87 2013/10/16 17:26:14 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -67,7 +67,7 @@
 #if 0
 static char sccsid[] = @(#)spec.c	8.2 (Berkeley) 4/28/95;
 #else
-__RCSID($NetBSD: spec.c,v 1.86 2013/09/09 23:27:43 christos Exp $);
+__RCSID($NetBSD: spec.c,v 1.87 2013/10/16 17:26:14 christos Exp $);
 #endif
 #endif /* not lint */
 
@@ -217,6 +217,12 @@ noparent:		mtree_err(no parent node);
 /*
  * empty tree
  */
+			/*
+			 * Allow a bare . root node by forcing it to
+			 * type=dir for compatibility with FreeBSD.
+			 */
+			if (strcmp(centry-name, .) == 0  centry-type == 0)
+centry-type = F_DIR;
 			if (strcmp(centry-name, .) != 0 ||
 			centry-type != F_DIR)
 mtree_err(

CVS commit: src/usr.sbin/mtree

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 17:27:42 UTC 2013

Modified Files:
src/usr.sbin/mtree: getid.c

Log Message:
skip comment lines on password and group databases (Brooks Davis)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/mtree/getid.c

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

Modified files:

Index: src/usr.sbin/mtree/getid.c
diff -u src/usr.sbin/mtree/getid.c:1.7 src/usr.sbin/mtree/getid.c:1.8
--- src/usr.sbin/mtree/getid.c:1.7	Mon Apr 28 16:24:17 2008
+++ src/usr.sbin/mtree/getid.c	Wed Oct 16 13:27:42 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: getid.c,v 1.7 2008/04/28 20:24:17 martin Exp $	*/
+/*	$NetBSD: getid.c,v 1.8 2013/10/16 17:27:42 christos Exp $	*/
 /*	from: NetBSD: getpwent.c,v 1.48 2000/10/03 03:22:26 enami Exp */
 /*	from: NetBSD: getgrent.c,v 1.41 2002/01/12 23:51:30 lukem Exp */
 
@@ -65,7 +65,7 @@
 #endif
 
 #include sys/cdefs.h
-__RCSID($NetBSD: getid.c,v 1.7 2008/04/28 20:24:17 martin Exp $);
+__RCSID($NetBSD: getid.c,v 1.8 2013/10/16 17:27:42 christos Exp $);
 
 #include sys/param.h
 
@@ -230,6 +230,9 @@ grscan(int search, gid_t gid, const char
 ;
 			continue;
 		}
+		/* skip comments */
+		if (pwline[0] == '#')
+			continue;
 		if (grmatchline(search, gid, name))
 			return 1;
 	}
@@ -371,6 +374,9 @@ pwscan(int search, uid_t uid, const char
 ;
 			continue;
 		}
+		/* skip comments */
+		if (pwline[0] == '#')
+			continue;
 		if (pwmatchline(search, uid, name))
 			return 1;
 	}

CVS commit: src/sys/dev/acpi

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 17:31:01 UTC 2013

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

Log Message:
remove unused variable


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/acpi/acpi_ec.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_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.71 src/sys/dev/acpi/acpi_ec.c:1.72
--- src/sys/dev/acpi/acpi_ec.c:1.71	Sun Jul 24 16:15:09 2011
+++ src/sys/dev/acpi/acpi_ec.c	Wed Oct 16 13:31:01 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_ec.c,v 1.71 2011/07/24 20:15:09 jakllsch Exp $	*/
+/*	$NetBSD: acpi_ec.c,v 1.72 2013/10/16 17:31:01 christos Exp $	*/
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger jo...@netbsd.org.
@@ -59,7 +59,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.71 2011/07/24 20:15:09 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.72 2013/10/16 17:31:01 christos Exp $);
 
 #include sys/param.h
 #include sys/callout.h
@@ -645,7 +645,6 @@ acpiec_space_handler(uint32_t func, ACPI
 uint32_t width, ACPI_INTEGER *value, void *arg, void *region_arg)
 {
 	device_t dv;
-	struct acpiec_softc *sc;
 	ACPI_STATUS rv;
 	uint8_t addr, reg;
 	unsigned int i;
@@ -656,7 +655,6 @@ acpiec_space_handler(uint32_t func, ACPI
 
 	addr = paddr;
 	dv = arg;
-	sc = device_private(dv);
 
 	rv = AE_OK;
 

CVS commit: src/sys/dev/acpi

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 17:30:42 UTC 2013

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

Log Message:
remove unused variable


To generate a diff of this commit:
cvs rdiff -u -r1.255 -r1.256 src/sys/dev/acpi/acpi.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.c
diff -u src/sys/dev/acpi/acpi.c:1.255 src/sys/dev/acpi/acpi.c:1.256
--- src/sys/dev/acpi/acpi.c:1.255	Sat Sep 22 20:31:06 2012
+++ src/sys/dev/acpi/acpi.c	Wed Oct 16 13:30:42 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi.c,v 1.255 2012/09/23 00:31:06 chs Exp $	*/
+/*	$NetBSD: acpi.c,v 1.256 2013/10/16 17:30:42 christos Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.255 2012/09/23 00:31:06 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.256 2013/10/16 17:30:42 christos Exp $);
 
 #include opt_acpi.h
 #include opt_pcifixup.h
@@ -1296,7 +1296,6 @@ acpi_enter_sleep_state(int state)
 {
 	struct acpi_softc *sc = acpi_softc;
 	ACPI_STATUS rv;
-	int err;
 
 	if (acpi_softc == NULL)
 		return;
@@ -1403,7 +1402,7 @@ acpi_enter_sleep_state(int state)
 
 		} else {
 
-			err = acpi_md_sleep(state);
+			(void)acpi_md_sleep(state);
 
 			if (state == ACPI_STATE_S4)
 AcpiEnable();

CVS commit: src/sys/dev/acpi

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 17:31:28 UTC 2013

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

Log Message:
print a warning if we failed.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/acpi/acpi_pci_link.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_pci_link.c
diff -u src/sys/dev/acpi/acpi_pci_link.c:1.19 src/sys/dev/acpi/acpi_pci_link.c:1.20
--- src/sys/dev/acpi/acpi_pci_link.c:1.19	Sat Sep 22 20:26:25 2012
+++ src/sys/dev/acpi/acpi_pci_link.c	Wed Oct 16 13:31:28 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_pci_link.c,v 1.19 2012/09/23 00:26:25 chs Exp $	*/
+/*	$NetBSD: acpi_pci_link.c,v 1.20 2013/10/16 17:31:28 christos Exp $	*/
 
 /*-
  * Copyright (c) 2002 Mitsuru IWASAKI iwas...@jp.freebsd.org
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_pci_link.c,v 1.19 2012/09/23 00:26:25 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_pci_link.c,v 1.20 2013/10/16 17:31:28 christos Exp $);
 
 #include sys/param.h
 #include sys/malloc.h
@@ -903,6 +903,10 @@ acpi_pci_link_srs(struct acpi_pci_link_s
 	else
 		status = acpi_pci_link_srs_from_crs(sc, srsbuf);
 
+	if (ACPI_FAILURE(status))
+		printf(%s: Unable to find link srs : %s\n,
+		sc-pl_name, AcpiFormatException(status));
+
 	/* Write out new resources via _SRS. */
 	return AcpiSetCurrentResources(sc-pl_handle, srsbuf);
 }

CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 17:39:09 UTC 2013

Modified Files:
src/sys/dev/pci: esa.c esadsp.h

Log Message:
- use proper types (uint16_t instead of uint32_t)
- don't index past the end of arrays
- use __arraycount() consistently instead of manual cruft.
- remove useless cast


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/esa.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/esadsp.h

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

Modified files:

Index: src/sys/dev/pci/esa.c
diff -u src/sys/dev/pci/esa.c:1.58 src/sys/dev/pci/esa.c:1.59
--- src/sys/dev/pci/esa.c:1.58	Mon Jan 30 14:41:19 2012
+++ src/sys/dev/pci/esa.c	Wed Oct 16 13:39:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: esa.c,v 1.58 2012/01/30 19:41:19 drochner Exp $ */
+/* $NetBSD: esa.c,v 1.59 2013/10/16 17:39:09 christos Exp $ */
 
 /*
  * Copyright (c) 2001-2008 Jared D. McNeill jmcne...@invisible.ca
@@ -39,7 +39,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: esa.c,v 1.58 2012/01/30 19:41:19 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: esa.c,v 1.59 2013/10/16 17:39:09 christos Exp $);
 
 #include sys/types.h
 #include sys/errno.h
@@ -653,7 +653,7 @@ esa_trigger_output(void *hdl, void *star
 	ESA_DMAC_BLOCKF_SELECTOR);
 
 	/* Set an armload of static initializers */
-	for (i = 0; i  (sizeof(esa_playvals) / sizeof(esa_playvals[0])); i++)
+	for (i = 0; i  __arraycount(esa_playvals); i++)
 		esa_write_assp(sc, ESA_MEMTYPE_INTERNAL_DATA, dac_data +
 		esa_playvals[i].addr, esa_playvals[i].val);
 
@@ -787,7 +787,7 @@ esa_trigger_input(void *hdl, void *start
 	ESA_DMAC_PAGE3_SELECTOR + ESA_DMAC_BLOCKF_SELECTOR);
 
 	/* Set an armload of static initializers */
-	for (i = 0; i  (sizeof(esa_recvals) / sizeof(esa_recvals[0])); i++)
+	for (i = 0; i  __arraycount(esa_recvals); i++)
 		esa_write_assp(sc, ESA_MEMTYPE_INTERNAL_DATA, adc_data +
 		esa_recvals[i].addr, esa_recvals[i].val);
 
@@ -930,7 +930,7 @@ esa_allocmem(struct esa_softc *sc, size_
 
 	p-size = size;
 	error = bus_dmamem_alloc(sc-sc_dmat, p-size, align, 0,
- p-segs, sizeof(p-segs) / sizeof(p-segs[0]),
+ p-segs, __arraycount(p-segs),
  p-nsegs, BUS_DMA_WAITOK);
 	if (error)
 		return error;
@@ -1090,7 +1090,7 @@ esa_attach(device_t parent, device_t sel
 	/* create suspend save area */
 	sc-savememsz = sizeof(uint16_t) * (ESA_REV_B_CODE_MEMORY_LENGTH
 	+ ESA_REV_B_DATA_MEMORY_LENGTH + 1);
-	sc-savemem = (uint16_t *)kmem_zalloc(sc-savememsz, KM_SLEEP);
+	sc-savemem = kmem_zalloc(sc-savememsz, KM_SLEEP);
 	if (sc-savemem == NULL) {
 		aprint_error_dev(sc-sc_dev,
 		unable to allocate suspend buffer\n);
@@ -1385,21 +1385,19 @@ esa_init(struct esa_softc *sc)
 	ESA_KDATA_DMA_XFER0);
 
 	/* Write kernel code into memory */
-	size = sizeof(esa_assp_kernel_image);
-	for (i = 0; i  size / 2; i++)
+	for (i = 0; i  __arraycount(esa_assp_kernel_image); i++)
 		esa_write_assp(sc, ESA_MEMTYPE_INTERNAL_CODE,
 		ESA_REV_B_CODE_MEMORY_BEGIN + i, esa_assp_kernel_image[i]);
 
-	size = sizeof(esa_assp_minisrc_image);
-	for (i = 0; i  size / 2; i++)
+	for (i = 0; i  __arraycount(esa_assp_minisrc_image); i++)
 		esa_write_assp(sc, ESA_MEMTYPE_INTERNAL_CODE, 0x400 + i,
 		esa_assp_minisrc_image[i]);
 
 	/* Write the coefficients for the low pass filter */
-	size = sizeof(esa_minisrc_lpf_image);
-	for (i = 0; i  size / 2; i++)
+	for (i = 0; i  __arraycount(esa_minisrc_lpf_image); i++)
 		esa_write_assp(sc, ESA_MEMTYPE_INTERNAL_CODE,
-		0x400 + ESA_MINISRC_COEF_LOC + i, esa_minisrc_lpf_image[i]);
+		0x400 + ESA_MINISRC_COEF_LOC + i,
+		esa_minisrc_lpf_image[i]);
 	esa_write_assp(sc, ESA_MEMTYPE_INTERNAL_CODE,
 	0x400 + ESA_MINISRC_COEF_LOC + size, 0x8000);
 	esa_write_assp(sc, ESA_MEMTYPE_INTERNAL_DATA, ESA_KDATA_TASK0, 0x400);

Index: src/sys/dev/pci/esadsp.h
diff -u src/sys/dev/pci/esadsp.h:1.6 src/sys/dev/pci/esadsp.h:1.7
--- src/sys/dev/pci/esadsp.h:1.6	Sun Dec 11 07:22:49 2005
+++ src/sys/dev/pci/esadsp.h	Wed Oct 16 13:39:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: esadsp.h,v 1.6 2005/12/11 12:22:49 christos Exp $ */
+/* $NetBSD: esadsp.h,v 1.7 2013/10/16 17:39:09 christos Exp $ */
 
 /*
  * Copyright (c) 2002 Lennart Augustsson
@@ -93,7 +93,7 @@ static struct rec_vals {
 	{ ESA_SRC3_DIRECTION_OFFSET + 22, 0xff}
 };
 
-static uint32_t esa_assp_kernel_image[] = {
+static uint16_t esa_assp_kernel_image[] = {
  0x7980, 0x0030, 0x7980, 0x03b4, 0x7980, 0x03b4, 0x7980, 0x00fb,
  0x7980, 0x00dd, 0x7980, 0x03b4, 0x7980, 0x0332, 0x7980, 0x0287,
  0x7980, 0x03b4, 0x7980, 0x03b4, 0x7980, 0x03b4, 0x7980, 0x03b4,
@@ -215,7 +215,7 @@ static uint32_t esa_assp_kernel_image[] 
  0x0267, 0x0368, 0x0469, 0x056a, 0xbe3a,
 };
 
-static uint32_t esa_assp_minisrc_image[] = {
+static uint16_t esa_assp_minisrc_image[] = {
  0xbf80, 0x101e, 0x906e,
  0x006e, 0x8b88, 0x6980, 0xef88, 0x906f, 

CVS commit: src/sys/dev/ieee1394

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 17:40:55 UTC 2013

Modified Files:
src/sys/dev/ieee1394: fwohci.c

Log Message:
add missing ifdefs


To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/ieee1394/fwohci.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/ieee1394/fwohci.c
diff -u src/sys/dev/ieee1394/fwohci.c:1.135 src/sys/dev/ieee1394/fwohci.c:1.136
--- src/sys/dev/ieee1394/fwohci.c:1.135	Thu Sep 12 16:16:51 2013
+++ src/sys/dev/ieee1394/fwohci.c	Wed Oct 16 13:40:55 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: fwohci.c,v 1.135 2013/09/12 20:16:51 martin Exp $	*/
+/*	$NetBSD: fwohci.c,v 1.136 2013/10/16 17:40:55 christos Exp $	*/
 
 /*-
  * Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
  *
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fwohci.c,v 1.135 2013/09/12 20:16:51 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: fwohci.c,v 1.136 2013/10/16 17:40:55 christos Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -2645,9 +2645,9 @@ fwohci_arcv_swap(struct fw_pkt *fp, int 
 {
 	struct fw_pkt *fp0;
 	uint32_t ld0;
-	int slen, hlen;
+	int hlen;
 #if BYTE_ORDER == BIG_ENDIAN
-	int i;
+	int slen, i;
 #endif
 
 	ld0 = FWOHCI_DMA_READ(fp-mode.ld[0]);
@@ -2662,7 +2662,9 @@ fwohci_arcv_swap(struct fw_pkt *fp, int 
 	case FWTCODE_WREQQ:
 	case FWTCODE_RRESQ:
 	case FWOHCITCODE_PHY:
+#if BYTE_ORDER == BIG_ENDIAN
 		slen = 12;
+#endif
 		break;
 
 	case FWTCODE_RREQB:
@@ -2670,7 +2672,9 @@ fwohci_arcv_swap(struct fw_pkt *fp, int 
 	case FWTCODE_LREQ:
 	case FWTCODE_RRESB:
 	case FWTCODE_LRES:
+#if BYTE_ORDER == BIG_ENDIAN
 		slen = 16;
+#endif
 		break;
 
 	default:

CVS commit: src/sys/dev/pci/hdaudio

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 17:43:33 UTC 2013

Modified Files:
src/sys/dev/pci/hdaudio: hdafg.c

Log Message:
move all the unused stuff to ifdef notyet


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/pci/hdaudio/hdafg.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/hdaudio/hdafg.c
diff -u src/sys/dev/pci/hdaudio/hdafg.c:1.16 src/sys/dev/pci/hdaudio/hdafg.c:1.17
--- src/sys/dev/pci/hdaudio/hdafg.c:1.16	Sun Mar 11 15:39:36 2012
+++ src/sys/dev/pci/hdaudio/hdafg.c	Wed Oct 16 13:43:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.16 2012/03/11 19:39:36 para Exp $ */
+/* $NetBSD: hdafg.c,v 1.17 2013/10/16 17:43:33 christos Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -60,7 +60,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdafg.c,v 1.16 2012/03/11 19:39:36 para Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdafg.c,v 1.17 2013/10/16 17:43:33 christos Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -2978,7 +2978,7 @@ hdafg_commit(struct hdafg_softc *sc)
 {
 	struct hdaudio_widget *w;
 	uint32_t gdata, gmask, gdir;
-	int commitgpio, numgpio;
+	int commitgpio;
 	int i;
 
 	/* Commit controls */
@@ -3000,10 +3000,10 @@ hdafg_commit(struct hdafg_softc *sc)
 	}
 
 	gdata = gmask = gdir = commitgpio = 0;
-	numgpio = COP_GPIO_COUNT_NUM_GPIO(sc-sc_p.gpio_cnt);
+#ifdef notyet
+	int numgpio = COP_GPIO_COUNT_NUM_GPIO(sc-sc_p.gpio_cnt);
 
 	hda_trace(sc, found %d GPIOs\n, numgpio);
-#if notyet
 	for (i = 0; i  numgpio  i  8; i++) {
 		if (commitgpio == 0)
 			commitgpio = 1;
@@ -3199,6 +3199,7 @@ hdafg_stream_intr(struct hdaudio_stream 
 {
 	struct hdaudio_audiodev *ad = st-st_cookie;
 	int handled = 0;
+/*###3202 [cc] error: variable 'sts' set but not used [-Werror=unused-but-set-variable]%%%*/
 	uint8_t sts;
 
 	sts = hda_read1(ad-ad_sc-sc_host, HDAUDIO_SD_STS(st-st_shift));

CVS commit: src/sys/arch/amd64/amd64

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 18:07:56 UTC 2013

Modified Files:
src/sys/arch/amd64/amd64: gdt.c

Log Message:
remove unused


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/amd64/amd64/gdt.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/amd64/amd64/gdt.c
diff -u src/sys/arch/amd64/amd64/gdt.c:1.24 src/sys/arch/amd64/amd64/gdt.c:1.25
--- src/sys/arch/amd64/amd64/gdt.c:1.24	Tue Jul  6 21:14:52 2010
+++ src/sys/arch/amd64/amd64/gdt.c	Wed Oct 16 14:07:56 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: gdt.c,v 1.24 2010/07/07 01:14:52 chs Exp $	*/
+/*	$NetBSD: gdt.c,v 1.25 2013/10/16 18:07:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gdt.c,v 1.24 2010/07/07 01:14:52 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: gdt.c,v 1.25 2013/10/16 18:07:56 christos Exp $);
 
 #include opt_multiprocessor.h
 #include opt_xen.h
@@ -300,9 +300,6 @@ tss_alloc(struct x86_64_tss *tss)
 {
 #ifndef XEN
 	int slot;
-	struct sys_segment_descriptor *gdt;
-
-	gdt = (struct sys_segment_descriptor *)gdtstore[DYNSEL_START];
 
 	mutex_enter(cpu_lock);
 	slot = gdt_get_slot();

CVS commit: src/sys/dev/pci/hdaudio

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 18:13:00 UTC 2013

Modified Files:
src/sys/dev/pci/hdaudio: hdafg.c hdaudio.c

Log Message:
move debugging code inside debugging ifdef.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/hdaudio/hdafg.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/hdaudio/hdaudio.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/hdaudio/hdafg.c
diff -u src/sys/dev/pci/hdaudio/hdafg.c:1.17 src/sys/dev/pci/hdaudio/hdafg.c:1.18
--- src/sys/dev/pci/hdaudio/hdafg.c:1.17	Wed Oct 16 13:43:33 2013
+++ src/sys/dev/pci/hdaudio/hdafg.c	Wed Oct 16 14:13:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.17 2013/10/16 17:43:33 christos Exp $ */
+/* $NetBSD: hdafg.c,v 1.18 2013/10/16 18:13:00 christos Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -60,7 +60,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdafg.c,v 1.17 2013/10/16 17:43:33 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdafg.c,v 1.18 2013/10/16 18:13:00 christos Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -532,7 +532,7 @@ static void
 hdafg_widget_pin_dump(struct hdafg_softc *sc)
 {
 	struct hdaudio_widget *w;
-	int i, conn, color, defdev;
+	int i, conn;
 
 	for (i = sc-sc_startnode; i  sc-sc_endnode; i++) {
 		w = hdafg_widget_lookup(sc, i);
@@ -541,14 +541,16 @@ hdafg_widget_pin_dump(struct hdafg_softc
 		if (w-w_type != COP_AWCAP_TYPE_PIN_COMPLEX)
 			continue;
 		conn = COP_CFG_PORT_CONNECTIVITY(w-w_pin.config);
-		color = COP_CFG_COLOR(w-w_pin.config);
-		defdev = COP_CFG_DEFAULT_DEVICE(w-w_pin.config);
 		if (conn != 1) {
+#ifdef HDAUDIO_DEBUG
+			int color = COP_CFG_COLOR(w-w_pin.config);
+			int defdev = COP_CFG_DEFAULT_DEVICE(w-w_pin.config);
 			hda_trace(sc, io %02X: %s (%s, %s)\n,
 			w-w_nid,
 			hdafg_default_device[defdev],
 			hdafg_color[color],
 			hdafg_port_connectivity[conn]);
+#endif
 		}
 	}
 }
@@ -975,7 +977,7 @@ hdafg_assoc_dump(struct hdafg_softc *sc)
 {
 	struct hdaudio_assoc *as = sc-sc_assocs;
 	struct hdaudio_widget *w;
-	uint32_t conn, color, defdev, curdev, curport;
+	uint32_t conn, defdev, curdev, curport;
 	int maxassocs = sc-sc_nassocs;
 	int i, j;
 
@@ -1053,7 +1055,6 @@ hdafg_assoc_dump(struct hdafg_softc *sc)
 	if (w == NULL)
 		continue;
 	conn = COP_CFG_PORT_CONNECTIVITY(w-w_pin.config);
-	color = COP_CFG_COLOR(w-w_pin.config);
 	defdev = COP_CFG_DEFAULT_DEVICE(w-w_pin.config);
 	if (conn != curport || defdev != curdev)
 		continue;
@@ -1063,8 +1064,12 @@ hdafg_assoc_dump(struct hdafg_softc *sc)
 	else
 		hda_trace1(sc,  );
 	firstport = false;
+#ifdef HDAUDIO_DEBUG
+	int color =
+	COP_CFG_COLOR(w-w_pin.config);
 	hda_trace1(sc, %s,
 	hdafg_color[color]);
+#endif
 	hda_trace1(sc, (%02X), w-w_nid);
 }
 hda_print1(sc, ]);
@@ -3199,10 +3204,8 @@ hdafg_stream_intr(struct hdaudio_stream 
 {
 	struct hdaudio_audiodev *ad = st-st_cookie;
 	int handled = 0;
-/*###3202 [cc] error: variable 'sts' set but not used [-Werror=unused-but-set-variable]%%%*/
-	uint8_t sts;
 
-	sts = hda_read1(ad-ad_sc-sc_host, HDAUDIO_SD_STS(st-st_shift));
+	(void)hda_read1(ad-ad_sc-sc_host, HDAUDIO_SD_STS(st-st_shift));
 	hda_write1(ad-ad_sc-sc_host, HDAUDIO_SD_STS(st-st_shift),
 	HDAUDIO_STS_DESE | HDAUDIO_STS_FIFOE | HDAUDIO_STS_BCIS);
 

Index: src/sys/dev/pci/hdaudio/hdaudio.c
diff -u src/sys/dev/pci/hdaudio/hdaudio.c:1.18 src/sys/dev/pci/hdaudio/hdaudio.c:1.19
--- src/sys/dev/pci/hdaudio/hdaudio.c:1.18	Wed Nov 23 22:35:59 2011
+++ src/sys/dev/pci/hdaudio/hdaudio.c	Wed Oct 16 14:13:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.18 2011/11/24 03:35:59 mrg Exp $ */
+/* $NetBSD: hdaudio.c,v 1.19 2013/10/16 18:13:00 christos Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdaudio.c,v 1.18 2011/11/24 03:35:59 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdaudio.c,v 1.19 2013/10/16 18:13:00 christos Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -694,9 +694,6 @@ hdaudio_attach_fg(struct hdaudio_functio
 static void
 hdaudio_codec_attach(struct hdaudio_codec *co)
 {
-#ifdef HDAUDIO_DEBUG
-	struct hdaudio_softc *sc = co-co_host;
-#endif
 	struct hdaudio_function_group *fg;
 	uint32_t vid, rid, snc, fgrp;
 	int starting_node, num_nodes, nid;
@@ -705,7 +702,6 @@ hdaudio_codec_attach(struct hdaudio_code
 		return;
 
 	vid = hdaudio_command(co, 0, CORB_GET_PARAMETER, COP_VENDOR_ID);
-	rid = hdaudio_command(co, 0, CORB_GET_PARAMETER, COP_REVISION_ID);
 	snc = hdaudio_command(co, 0, CORB_GET_PARAMETER,
 	COP_SUBORDINATE_NODE_COUNT);
 
@@ -714,6 +710,9 @@ hdaudio_codec_attach(struct hdaudio_code
 		return;
 
 #ifdef HDAUDIO_DEBUG
+	struct hdaudio_softc *sc = co-co_host;
+	

CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 18:18:54 UTC 2013

Modified Files:
src/sys/dev/pci: cs4281.c

Log Message:
use variables that are only used in debugging.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/cs4281.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/cs4281.c
diff -u src/sys/dev/pci/cs4281.c:1.48 src/sys/dev/pci/cs4281.c:1.49
--- src/sys/dev/pci/cs4281.c:1.48	Sat Oct 27 13:18:31 2012
+++ src/sys/dev/pci/cs4281.c	Wed Oct 16 14:18:54 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: cs4281.c,v 1.48 2012/10/27 17:18:31 chs Exp $	*/
+/*	$NetBSD: cs4281.c,v 1.49 2013/10/16 18:18:54 christos Exp $	*/
 
 /*
  * Copyright (c) 2000 Tatoku Ogaito.  All rights reserved.
@@ -43,7 +43,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cs4281.c,v 1.48 2012/10/27 17:18:31 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: cs4281.c,v 1.49 2013/10/16 18:18:54 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -335,8 +335,13 @@ cs4281_intr(void *p)
 	/* clear the interrupt register */
 	BA0WRITE4(sc, CS4281_HICR, HICR_CHGM | HICR_IEV);
 
+#ifdef CS4280_DEBUG
 	DPRINTF((intr = 0x%08x, hdsr0 = 0x%08x hdsr1 = 0x%08x\n,
 		 intr, hdsr0, hdsr1));
+#else
+	(void)hdsr0;
+	(void)hdsr1;
+#endif
 
 	/* Playback Interrupt */
 	if (intr  HISR_DMA0) {

CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 18:20:17 UTC 2013

Modified Files:
src/sys/dev/pci: auvia.c coram.c cxdtv.c eso.c
src/sys/dev/pci/bktr: bktr_card.c
src/sys/dev/pci/hdaudio: hdaudio.c

Log Message:
remove unused variables.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pci/auvia.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pci/coram.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/cxdtv.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/bktr/bktr_card.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/hdaudio/hdaudio.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/auvia.c
diff -u src/sys/dev/pci/auvia.c:1.75 src/sys/dev/pci/auvia.c:1.76
--- src/sys/dev/pci/auvia.c:1.75	Wed Nov 23 22:35:58 2011
+++ src/sys/dev/pci/auvia.c	Wed Oct 16 14:20:16 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: auvia.c,v 1.75 2011/11/24 03:35:58 mrg Exp $	*/
+/*	$NetBSD: auvia.c,v 1.76 2013/10/16 18:20:16 christos Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: auvia.c,v 1.75 2011/11/24 03:35:58 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: auvia.c,v 1.76 2013/10/16 18:20:16 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1076,11 +1076,9 @@ auvia_build_dma_ops(struct auvia_softc *
 	struct auvia_dma *p, void *start, void *end, int blksize)
 {
 	struct auvia_dma_op *op;
-	struct auvia_dma *dp;
 	bus_addr_t s;
 	size_t l;
 
-	dp = ch-sc_dma_ops_dma;
 	op = ch-sc_dma_ops;
 	s = p-map-dm_segs[0].ds_addr;
 	l = ((char *)end - (char *)start);

Index: src/sys/dev/pci/coram.c
diff -u src/sys/dev/pci/coram.c:1.11 src/sys/dev/pci/coram.c:1.12
--- src/sys/dev/pci/coram.c:1.11	Mon Oct 29 08:59:43 2012
+++ src/sys/dev/pci/coram.c	Wed Oct 16 14:20:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: coram.c,v 1.11 2012/10/29 12:59:43 chs Exp $ */
+/* $NetBSD: coram.c,v 1.12 2013/10/16 18:20:16 christos Exp $ */
 
 /*
  * Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: coram.c,v 1.11 2012/10/29 12:59:43 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: coram.c,v 1.12 2013/10/16 18:20:16 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -450,9 +450,6 @@ done:
 static bool
 coram_resume(device_t dv, const pmf_qual_t *qual)
 {
-	struct coram_softc *sc;
-	sc = device_private(dv);
-
 	return true;
 }
 
@@ -774,10 +771,6 @@ coram_dtv_stop_transfer(void *cookie)
 static int
 coram_mpeg_reset(struct coram_softc *sc)
 {
-	uint32_t v;
-
-	v = (uint32_t)-1;
-
 	/* hold RISC in reset */
 	bus_space_write_4(sc-sc_memt, sc-sc_memh, DEV_CNTRL2, 0);
 

Index: src/sys/dev/pci/cxdtv.c
diff -u src/sys/dev/pci/cxdtv.c:1.12 src/sys/dev/pci/cxdtv.c:1.13
--- src/sys/dev/pci/cxdtv.c:1.12	Sat Oct 27 13:18:31 2012
+++ src/sys/dev/pci/cxdtv.c	Wed Oct 16 14:20:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cxdtv.c,v 1.12 2012/10/27 17:18:31 chs Exp $ */
+/* $NetBSD: cxdtv.c,v 1.13 2013/10/16 18:20:16 christos Exp $ */
 
 /*
  * Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cxdtv.c,v 1.12 2012/10/27 17:18:31 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: cxdtv.c,v 1.13 2013/10/16 18:20:16 christos Exp $);
 
 #include sys/param.h
 #include sys/kernel.h
@@ -313,9 +313,6 @@ cxdtv_childdet(device_t self, device_t c
 static bool
 cxdtv_resume(device_t dv, const pmf_qual_t *qual)
 {
-	struct cxdtv_softc *sc;
-	sc = device_private(dv);
-
 	/* XXX revisit */
 
 	aprint_debug_dev(dv, %s\n, __func__);
@@ -353,11 +350,10 @@ static void
 cxdtv_i2cbb_set_bits(void *cookie, uint32_t bits)
 {
 	struct cxdtv_softc *sc = cookie;
-	uint32_t value;
 
 	bus_space_write_4(sc-sc_memt, sc-sc_memh,
 	CXDTV_I2C_C_DATACONTROL, bits);
-	value = bus_space_read_4(sc-sc_memt, sc-sc_memh,
+	(void)bus_space_read_4(sc-sc_memt, sc-sc_memh,
 	CXDTV_I2C_C_DATACONTROL);
 
 	return;
@@ -687,12 +683,10 @@ cxdtv_dtv_stop_transfer(void *priv)
 int
 cxdtv_mpeg_reset(struct cxdtv_softc *sc)
 {
-	struct cxdtv_sram_ch *ch;
 	uint32_t v;
 
 	CX_DPRINTF((cxdtv_mpeg_reset\n));
 
-	ch = cxdtv_sram_chs[CXDTV_SRAM_CH_MPEG];
 	v = (uint32_t)-1; 
 
 	/* shutdown */

Index: src/sys/dev/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.63 src/sys/dev/pci/eso.c:1.64
--- src/sys/dev/pci/eso.c:1.63	Wed Jul 17 17:26:29 2013
+++ src/sys/dev/pci/eso.c	Wed Oct 16 14:20:16 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: eso.c,v 1.63 2013/07/17 21:26:29 soren Exp $	*/
+/*	$NetBSD: eso.c,v 1.64 2013/10/16 18:20:16 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: eso.c,v 1.63 2013/07/17 21:26:29 soren Exp $);
+__KERNEL_RCSID(0, $NetBSD: eso.c,v 1.64 2013/10/16 18:20:16 christos Exp $);
 
 #include mpu.h
 
@@ 

CVS commit: src/sys/dev/usb

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 18:23:39 UTC 2013

Modified Files:
src/sys/dev/usb: if_athn_usb.c

Log Message:
remove unused variable


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_athn_usb.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/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.5 src/sys/dev/usb/if_athn_usb.c:1.6
--- src/sys/dev/usb/if_athn_usb.c:1.5	Wed Apr  3 10:20:18 2013
+++ src/sys/dev/usb/if_athn_usb.c	Wed Oct 16 14:23:39 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_athn_usb.c,v 1.5 2013/04/03 14:20:18 christos Exp $	*/
+/*	$NetBSD: if_athn_usb.c,v 1.6 2013/10/16 18:23:39 christos Exp $	*/
 /*	$OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $	*/
 
 /*-
@@ -22,7 +22,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_athn_usb.c,v 1.5 2013/04/03 14:20:18 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_athn_usb.c,v 1.6 2013/10/16 18:23:39 christos Exp $);
 
 #ifdef	_KERNEL_OPT
 #include opt_inet.h
@@ -2731,7 +2731,7 @@ athn_usb_stop(struct ifnet *ifp)
 	struct ar_htc_target_vif hvif;
 	struct mbuf *m;
 	uint8_t sta_index;
-	int s, error;
+	int s;
 
 	DPRINTFN(DBG_FN, sc, \n);
 
@@ -2771,7 +2771,7 @@ athn_usb_stop(struct ifnet *ifp)
 	/* Remove default node. */
 	sta_index = 0;
 	DPRINTFN(DBG_NODES, usc, removing node %u\n, sta_index);
-	error = athn_usb_remove_hw_node(usc, sta_index);
+	(void)athn_usb_remove_hw_node(usc, sta_index);
 
 	(void)athn_usb_wmi_cmd(usc, AR_WMI_CMD_DISABLE_INTR);
 	(void)athn_usb_wmi_cmd(usc, AR_WMI_CMD_DRAIN_TXQ_ALL);

CVS commit: src/sys/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 19:31:43 UTC 2013

Modified Files:
src/sys/sys: cdefs.h

Log Message:
introduce __USE(variable) that uses a variable to squash unused variable
warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/sys/cdefs.h

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

Modified files:

Index: src/sys/sys/cdefs.h
diff -u src/sys/sys/cdefs.h:1.112 src/sys/sys/cdefs.h:1.113
--- src/sys/sys/cdefs.h:1.112	Sun Sep 15 09:01:37 2013
+++ src/sys/sys/cdefs.h	Wed Oct 16 15:31:43 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: cdefs.h,v 1.112 2013/09/15 13:01:37 martin Exp $	*/
+/*	$NetBSD: cdefs.h,v 1.113 2013/10/16 19:31:43 christos Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -550,6 +550,8 @@
 #define __CAST(__dt, __st)	((__dt)(__st))
 #endif
 
+#define __USE(a) ((void)(a))
+
 #define __type_mask(t) (/*LINTED*/sizeof(t)  sizeof(intmax_t) ? \
 (~((1ULL  (sizeof(t) * NBBY)) - 1)) : 0ULL)
 

CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Oct 16 19:32:30 UTC 2013

Modified Files:
src/sys/dev/pci: cs4281.c

Log Message:
use __USE()


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/cs4281.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/cs4281.c
diff -u src/sys/dev/pci/cs4281.c:1.49 src/sys/dev/pci/cs4281.c:1.50
--- src/sys/dev/pci/cs4281.c:1.49	Wed Oct 16 14:18:54 2013
+++ src/sys/dev/pci/cs4281.c	Wed Oct 16 15:32:30 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: cs4281.c,v 1.49 2013/10/16 18:18:54 christos Exp $	*/
+/*	$NetBSD: cs4281.c,v 1.50 2013/10/16 19:32:30 christos Exp $	*/
 
 /*
  * Copyright (c) 2000 Tatoku Ogaito.  All rights reserved.
@@ -43,7 +43,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cs4281.c,v 1.49 2013/10/16 18:18:54 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: cs4281.c,v 1.50 2013/10/16 19:32:30 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -339,8 +339,8 @@ cs4281_intr(void *p)
 	DPRINTF((intr = 0x%08x, hdsr0 = 0x%08x hdsr1 = 0x%08x\n,
 		 intr, hdsr0, hdsr1));
 #else
-	(void)hdsr0;
-	(void)hdsr1;
+	__USE(hdsr0);
+	__USE(hdsr1);
 #endif
 
 	/* Playback Interrupt */

CVS commit: src/sys/sys

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Wed Oct 16 19:40:45 UTC 2013

Added Files:
src/sys/sys: lua.h

Log Message:
header file needed for lua(4)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/sys/lua.h

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

Added files:

Index: src/sys/sys/lua.h
diff -u /dev/null src/sys/sys/lua.h:1.1
--- /dev/null	Wed Oct 16 19:40:45 2013
+++ src/sys/sys/lua.h	Wed Oct 16 19:40:45 2013
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2011, 2013 Marc Balmer mbal...@netbsd.org.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. The name of the Author may not be used to endorse or promote products
+ *derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _SYS_LUA_H_
+#define _SYS_LUA_H_
+
+#include lua.h		/* for lua_State */
+
+#define MAX_LUA_NAME		16
+#define MAX_LUA_DESC		64
+#define LUA_MAX_MODNAME		32
+
+struct lua_state_info {
+	char	name[MAX_LUA_NAME];
+	char	desc[MAX_LUA_DESC];
+	bool	user;
+};
+
+struct lua_info {
+	int num_states;		/* total number of created Lua states */
+	struct lua_state_info *states;
+};
+
+struct lua_create {
+	char	name[MAX_LUA_NAME];
+	char	desc[MAX_LUA_DESC];
+};
+
+struct lua_require {
+	char	state[MAX_LUA_NAME];
+	char	module[LUA_MAX_MODNAME];
+};
+
+struct lua_load {
+	char	state[MAX_LUA_NAME];
+	char	path[MAXPATHLEN];
+};
+
+#define LUAINFO		_IOWR('l', 0, struct lua_info)
+
+#define LUACREATE	_IOWR('l', 1, struct lua_create)
+#define LUADESTROY	_IOWR('l', 2, struct lua_create)
+
+/* 'require' a module in a state */
+#define LUAREQUIRE	_IOWR('l', 3, struct lua_require)
+
+/* loading Lua code into a Lua state */
+#define LUALOAD		_IOWR('l', 4, struct lua_load)
+
+#ifdef _KERNEL
+extern int lua_mod_register(const char *, int (*)(void *));
+extern int lua_mod_unregister(const char *);
+
+typedef struct _klua_State {
+	lua_State	*L;
+	kmutex_t	 ks_lock;
+	kcondvar_t	 ks_inuse_cv;
+	int		 ks_inuse;
+	bool		 ks_user;	/* state created by user (ioctl) */
+} klua_State;
+
+extern int klua_lock(klua_State *);
+extern void klua_unlock(klua_State *);
+
+extern void klua_close(klua_State *);
+extern klua_State *klua_newstate(lua_Alloc, void *, const char *, const char *);
+
+extern void *lua_alloc(void *, void *, size_t, size_t);
+
+#endif
+
+#endif /* _SYS_LUA_H_ */

CVS commit: src/sbin/luactl

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Wed Oct 16 19:48:21 UTC 2013

Added Files:
src/sbin/luactl: Makefile luactl.8 luactl.c

Log Message:
luactl(8) is a command to control lua(4)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sbin/luactl/Makefile src/sbin/luactl/luactl.8 \
src/sbin/luactl/luactl.c

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

Added files:

Index: src/sbin/luactl/Makefile
diff -u /dev/null src/sbin/luactl/Makefile:1.1
--- /dev/null	Wed Oct 16 19:48:21 2013
+++ src/sbin/luactl/Makefile	Wed Oct 16 19:48:21 2013
@@ -0,0 +1,8 @@
+#	$NetBSD: Makefile,v 1.1 2013/10/16 19:48:21 mbalmer Exp $
+
+PROG=	luactl
+SRCS=	luactl.c
+
+MAN=	luactl.8
+
+.include bsd.prog.mk
Index: src/sbin/luactl/luactl.8
diff -u /dev/null src/sbin/luactl/luactl.8:1.1
--- /dev/null	Wed Oct 16 19:48:21 2013
+++ src/sbin/luactl/luactl.8	Wed Oct 16 19:48:21 2013
@@ -0,0 +1,126 @@
+.\ $NetBSD: luactl.8,v 1.1 2013/10/16 19:48:21 mbalmer Exp $
+.\
+.\ Copyright (c) 2011 Marc Balmer m...@msys.ch
+.\
+.\ Permission to use, copy, modify, and distribute this software for any
+.\ purpose with or without fee is hereby granted, provided that the above
+.\ copyright notice and this permission notice appear in all copies.
+.\
+.\ THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\
+.Dd August 26, 2011
+.Dt LUACTL 8
+.Os
+.Sh NAME
+.Nm luactl
+.Nd control kernel Lua states
+.Sh SYNOPSIS
+.Nm luactl
+.Op Fl cq
+.Nm luactl
+.Op Fl cq
+create
+.Ar name
+.Op desc
+.Nm luactl
+.Op Fl cq
+destroy
+.Ar name
+.Nm luactl
+.Op Fl cq
+require
+.Ar name module
+.Nm luactl
+.Op Fl cq
+load
+.Ar name path
+.Sh DESCRIPTION
+The
+.Nm
+program allows the manipulation of Lua states in the kernel.
+Lua states are created using the
+.Sq create
+command (see below),
+Lua bindings are provided as modules.
+To make a Lua binding available to a state, it must be
+.Sq required .
+If a kernel subsystem is to use a Lua state, a state has to be
+.Sq assigned
+to it.
+Once a module has been
+.Sq required
+by a state, it can not be unloaded from memory using the
+.Xr modunload 8
+command until the state using it has been destroyed.
+.Pp
+Lua code can be loaded from the filesystem into a state at anytime, please
+note that code loaded into a state is immediately executed.
+.Pp
+When executed without a command,
+.Nm
+reads information about the
+.Tn Lua
+states and displays it.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl c
+Create a Lua state before executing the command.
+This flag is used for the require, assing, and, load commands only, it
+is ignored for all other commands.
+.It Fl q
+Operate quietly i.e. nothing is printed to stdout.
+.El
+.Sh COMMANDS
+.Bl -tag -width Ds
+.It create Ar name Op Ar desc
+Create a Lua state with name
+.Ar name
+and optional description
+.Ar desc .
+.It destroy Ar name
+Destroy the Lua state
+.Ar name .
+.It require Ar name module
+Let the Lua state
+.Ar name
+use the bindings provided in module
+.Ar module .
+This is the equivalent of userland Lua code calling the
+.Sq require
+function.
+.It load Ar name Pa path
+Load Lua code in file
+.Pa path
+into the Lua state
+.Ar name .
+Note that the path name must contain at least one path separation character
+.Pq Sq / .
+.El
+.Sh FILES
+.Bl -tag -width /dev/lua -compact
+.It /dev/lua
+Lua device file.
+.El
+.Sh SEE ALSO
+.Xr lua 4 ,
+.Xr lua 9 ,
+.Xr modload 8 ,
+.Xr module 7 ,
+.Xr modunload 8
+.Sh HISTORY
+The
+.Nm
+command first appeared in
+.Nx 6.0 .
+.Sh AUTHORS
+The
+.Nm
+program was written by
+.An Marc Balmer Aq m...@msys.ch .
Index: src/sbin/luactl/luactl.c
diff -u /dev/null src/sbin/luactl/luactl.c:1.1
--- /dev/null	Wed Oct 16 19:48:21 2013
+++ src/sbin/luactl/luactl.c	Wed Oct 16 19:48:21 2013
@@ -0,0 +1,230 @@
+/*	$NetBSD: luactl.c,v 1.1 2013/10/16 19:48:21 mbalmer Exp $ */
+
+/*
+ * Copyright (c) 2011, Marc Balmer mbal...@netbsd.org.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. The name of the 

CVS commit: src/lib/libcurses

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Wed Oct 16 19:59:29 UTC 2013

Modified Files:
src/lib/libcurses: addbytes.c curses.c curses.h curses_private.h
ins_wch.c ins_wstr.c setterm.c

Log Message:
Add TABSIZE, which is derived from terminfo init_tabs.
Use this when processing \t.
If TABSIZE is set in the environment, this takes precedence.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/lib/libcurses/addbytes.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libcurses/curses.c
cvs rdiff -u -r1.105 -r1.106 src/lib/libcurses/curses.h
cvs rdiff -u -r1.47 -r1.48 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.5 -r1.6 src/lib/libcurses/ins_wch.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libcurses/ins_wstr.c
cvs rdiff -u -r1.51 -r1.52 src/lib/libcurses/setterm.c

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

Modified files:

Index: src/lib/libcurses/addbytes.c
diff -u src/lib/libcurses/addbytes.c:1.39 src/lib/libcurses/addbytes.c:1.40
--- src/lib/libcurses/addbytes.c:1.39	Fri Jul  1 01:19:33 2011
+++ src/lib/libcurses/addbytes.c	Wed Oct 16 19:59:29 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: addbytes.c,v 1.39 2011/07/01 01:19:33 joerg Exp $	*/
+/*	$NetBSD: addbytes.c,v 1.40 2013/10/16 19:59:29 roy Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = @(#)addbytes.c	8.4 (Berkeley) 5/4/94;
 #else
-__RCSID($NetBSD: addbytes.c,v 1.39 2011/07/01 01:19:33 joerg Exp $);
+__RCSID($NetBSD: addbytes.c,v 1.40 2013/10/16 19:59:29 roy Exp $);
 #endif
 #endif/* not lint */
 
@@ -199,11 +199,13 @@ _cursesi_addbyte(WINDOW *win, __LINE **l
 	static char	 blanks[] = ;
 	int		 newx;
 	attr_t		 attributes;
+	int		 tabsize;
 
 	switch (c) {
 	case '\t':
+		tabsize = win-screen-TABSIZE;
 		PSYNCH_OUT;
-		if (waddbytes(win, blanks, 8 - (*x % 8)) == ERR)
+		if (waddbytes(win, blanks, tabsize - (*x % tabsize)) == ERR)
 			return (ERR);
 		PSYNCH_IN;
 		break;
@@ -324,7 +326,7 @@ _cursesi_addwchar(WINDOW *win, __LINE **
 #ifndef HAVE_WCHAR
 	return (ERR);
 #else
-	int sx = 0, ex = 0, cw = 0, i = 0, newx = 0;
+	int sx = 0, ex = 0, cw = 0, i = 0, newx = 0, tabsize;
 	__LDATA *lp = win-alines[*y]-line[*x], *tp = NULL;
 	nschar_t *np = NULL;
 	cchar_t cc;
@@ -360,7 +362,8 @@ _cursesi_addwchar(WINDOW *win, __LINE **
 		cc.vals[0] = L' ';
 		cc.elements = 1;
 		cc.attributes = win-wattr;
-		for (i = 0; i  8 - (*x % 8); i++) {
+		tabsize = win-screen-TABSIZE;
+		for (i = 0; i  tabsize - (*x % tabsize); i++) {
 			if (wadd_wch(win, cc) == ERR)
 return ERR;
 		}

Index: src/lib/libcurses/curses.c
diff -u src/lib/libcurses/curses.c:1.24 src/lib/libcurses/curses.c:1.25
--- src/lib/libcurses/curses.c:1.24	Wed Feb  3 15:34:40 2010
+++ src/lib/libcurses/curses.c	Wed Oct 16 19:59:29 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: curses.c,v 1.24 2010/02/03 15:34:40 roy Exp $	*/
+/*	$NetBSD: curses.c,v 1.25 2013/10/16 19:59:29 roy Exp $	*/
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -35,7 +35,7 @@
 #if 0
 static char sccsid[] = @(#)curses.c	8.3 (Berkeley) 5/4/94;
 #else
-__RCSID($NetBSD: curses.c,v 1.24 2010/02/03 15:34:40 roy Exp $);
+__RCSID($NetBSD: curses.c,v 1.25 2013/10/16 19:59:29 roy Exp $);
 #endif
 #endif/* not lint */
 
@@ -66,6 +66,7 @@ WINDOW	*__virtscr;			/* Virtual screen (
 SCREEN  *_cursesi_screen;   /* the current screen we are using */
 int	 COLS;/* Columns on the screen. */
 int	 LINES;/* Lines on the screen. */
+int	 TABSIZE;			/* Size of a tab. */
 int	 COLORS;			/* Maximum colors on the screen */
 int	 COLOR_PAIRS = 0;		/* Maximum color pairs on the screen */
 int	 My_term = 0;			/* Use Def_term regardless. */

Index: src/lib/libcurses/curses.h
diff -u src/lib/libcurses/curses.h:1.105 src/lib/libcurses/curses.h:1.106
--- src/lib/libcurses/curses.h:1.105	Wed Oct 16 12:43:35 2013
+++ src/lib/libcurses/curses.h	Wed Oct 16 19:59:29 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: curses.h,v 1.105 2013/10/16 12:43:35 roy Exp $	*/
+/*	$NetBSD: curses.h,v 1.106 2013/10/16 19:59:29 roy Exp $	*/
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -410,6 +410,7 @@ extern int	 COLORS;		/* Max colors on th
 extern int	 COLOR_PAIRS;		/* Max color pairs on the screen. */
 
 extern int	 ESCDELAY;		/* Delay between keys in esc seq's. */
+extern int	 TABSIZE;		/* Size of a tab. */
 
 #ifndef OK
 #define	ERR	(-1)			/* Error return. */

Index: src/lib/libcurses/curses_private.h
diff -u src/lib/libcurses/curses_private.h:1.47 src/lib/libcurses/curses_private.h:1.48
--- src/lib/libcurses/curses_private.h:1.47	Tue Oct  4 11:01:13 2011
+++ src/lib/libcurses/curses_private.h	Wed Oct 16 19:59:29 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: curses_private.h,v 1.47 2011/10/04 11:01:13 roy Exp $	*/
+/*	$NetBSD: curses_private.h,v 1.48 2013/10/16 19:59:29 roy Exp $	*/
 
 /*-
  * Copyright (c) 1998-2000 Brett Lymn
@@ -193,6 +193,7 @@ struct __screen {
 	int  lx, ly;/* loop parameters for refresh */
 	int	 COLS;		/* 

CVS commit: src/sys/modules/luacore

[Alexander Nasonov]

Module Name:src
Committed By:   alnsn
Date:   Wed Oct 16 21:55:56 UTC 2013

Modified Files:
src/sys/modules/luacore: luacore.c

Log Message:
Use %s to panic.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/luacore/luacore.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/modules/luacore/luacore.c
diff -u src/sys/modules/luacore/luacore.c:1.1 src/sys/modules/luacore/luacore.c:1.2
--- src/sys/modules/luacore/luacore.c:1.1	Wed Oct 16 19:47:19 2013
+++ src/sys/modules/luacore/luacore.c	Wed Oct 16 21:55:56 2013
@@ -112,7 +112,7 @@ core_aprint_get_error_count(lua_State *L
 static int
 core_panic(lua_State *L)
 {
-	panic(lua_tostring(L, -1));
+	panic(%s, lua_tostring(L, -1));
 	return 0;
 }
 

CVS commit: src/distrib/notes/common

[Elad Efrat]

Module Name:src
Committed By:   elad
Date:   Thu Oct 17 02:58:56 UTC 2013

Modified Files:
src/distrib/notes/common: main

Log Message:
Readd myself.


To generate a diff of this commit:
cvs rdiff -u -r1.497 -r1.498 src/distrib/notes/common/main

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

Modified files:

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.497 src/distrib/notes/common/main:1.498
--- src/distrib/notes/common/main:1.497	Wed Aug 28 15:39:30 2013
+++ src/distrib/notes/common/main	Thu Oct 17 02:58:56 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: main,v 1.497 2013/08/28 15:39:30 slp Exp $
+.\	$NetBSD: main,v 1.498 2013/10/17 02:58:56 elad Exp $
 .\
 .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -1166,6 +1166,7 @@ If you're one of them, and would like to
 .It Ta Emmanuel Dreyfus Ta Mt m...@netbsd.org
 .It Ta Matthias Drochner Ta Mt droch...@netbsd.org
 .It Ta Jun Ebihara Ta Mt j...@netbsd.org
+.It Ta Elad Efrat Ta Mt e...@netbsd.org
 .It Ta H\(oavard Eidnes Ta Mt h...@netbsd.org
 .It Ta Jaime A Fournier Ta Mt o...@netbsd.org
 .It Ta Stoned Elipot Ta Mt s...@netbsd.org