date:20210311

CVS commit: src/sys/arch/powerpc

2021-03-11 Thread Jason R Thorpe

Module Name:src
Committed By:   thorpej
Date:   Fri Mar 12 04:57:42 UTC 2021

Modified Files:
src/sys/arch/powerpc/include/oea: pmap.h
src/sys/arch/powerpc/oea: pmap.c

Log Message:
Re-factor the code in pmap_extract() that checks the 601 I/O segment
table and the BAT tables into separate functions that can be called
from outside of the pmap module.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/powerpc/include/oea/pmap.h
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/powerpc/oea/pmap.c

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

Modified files:

Index: src/sys/arch/powerpc/include/oea/pmap.h
diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.34 src/sys/arch/powerpc/include/oea/pmap.h:1.35
--- src/sys/arch/powerpc/include/oea/pmap.h:1.34	Tue Mar  2 01:47:44 2021
+++ src/sys/arch/powerpc/include/oea/pmap.h	Fri Mar 12 04:57:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.34 2021/03/02 01:47:44 thorpej Exp $	*/
+/*	$NetBSD: pmap.h,v 1.35 2021/03/12 04:57:42 thorpej Exp $	*/
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -158,6 +158,13 @@ int pmap_pte_spill(pmap_t, vaddr_t, bool
 int pmap_ste_spill(pmap_t, vaddr_t, bool);
 void pmap_pinit(pmap_t);
 
+#ifdef PPC_OEA601
+bool	pmap_extract_ioseg601(vaddr_t, paddr_t *);
+#endif /* PPC_OEA601 */
+#ifdef PPC_OEA
+bool	pmap_extract_battable(vaddr_t, paddr_t *);
+#endif /* PPC_OEA */
+
 u_int powerpc_mmap_flags(paddr_t);
 #define POWERPC_MMAP_FLAG_MASK	0xf
 #define POWERPC_MMAP_FLAG_PREFETCHABLE	0x1

Index: src/sys/arch/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.103 src/sys/arch/powerpc/oea/pmap.c:1.104
--- src/sys/arch/powerpc/oea/pmap.c:1.103	Thu Mar 11 04:43:47 2021
+++ src/sys/arch/powerpc/oea/pmap.c	Fri Mar 12 04:57:42 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.103 2021/03/11 04:43:47 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.104 2021/03/12 04:57:42 thorpej Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -63,7 +63,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.103 2021/03/11 04:43:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.104 2021/03/12 04:57:42 thorpej Exp $");
 
 #define	PMAP_NOOPNAMES
 
@@ -2087,6 +2087,66 @@ pmap_remove(pmap_t pm, vaddr_t va, vaddr
 	PMAP_UNLOCK();
 }
 
+#if defined(PMAP_OEA)
+#ifdef PPC_OEA601
+bool
+pmap_extract_ioseg601(vaddr_t va, paddr_t *pap)
+{
+	if ((MFPVR() >> 16) != MPC601)
+		return false;
+
+	const register_t sr = iosrtable[va >> ADDR_SR_SHFT];
+
+	if (SR601_VALID_P(sr) && SR601_PA_MATCH_P(sr, va)) {
+		if (pap)
+			*pap = va;
+		return true;
+	}
+	return false;
+}
+
+static bool
+pmap_extract_battable601(vaddr_t va, paddr_t *pap)
+{
+	const register_t batu = battable[va >> 23].batu;
+	const register_t batl = battable[va >> 23].batl;
+
+	if (BAT601_VALID_P(batl) && BAT601_VA_MATCH_P(batu, batl, va)) {
+		const register_t mask =
+		(~(batl & BAT601_BSM) << 17) & ~0x1L;
+		if (pap)
+			*pap = (batl & mask) | (va & ~mask);
+		return true;
+	}
+	return false;
+}
+#endif /* PPC_OEA601 */
+
+bool
+pmap_extract_battable(vaddr_t va, paddr_t *pap)
+{
+#ifdef PPC_OEA601
+	if ((MFPVR() >> 16) == MPC601)
+		return pmap_extract_battable601(va, pap);
+#endif /* PPC_OEA601 */
+
+	if (oeacpufeat & OEACPU_NOBAT)
+		return false;
+
+	const register_t batu = battable[BAT_VA2IDX(va)].batu;
+
+	if (BAT_VALID_P(batu, 0) && BAT_VA_MATCH_P(batu, va)) {
+		const register_t batl = battable[BAT_VA2IDX(va)].batl;
+		const register_t mask =
+		(~(batu & (BAT_XBL|BAT_BL)) << 15) & ~0x1L;
+		if (pap)
+			*pap = (batl & mask) | (va & ~mask);
+		return true;
+	}
+	return false;
+}
+#endif /* PMAP_OEA */
+
 /*
  * Get the physical page address for the given pmap/virtual address.
  */
@@ -2099,63 +2159,42 @@ pmap_extract(pmap_t pm, vaddr_t va, padd
 	PMAP_LOCK();
 
 	/*
-	 * If this is a kernel pmap lookup, also check the battable
-	 * and if we get a hit, translate the VA to a PA using the
-	 * BAT entries.  Don't check for VM_MAX_KERNEL_ADDRESS is
-	 * that will wrap back to 0.
+	 * If this is the kernel pmap, check the battable and I/O
+	 * segments for a hit.  This is done only for regions outside
+	 * VM_MIN_KERNEL_ADDRESS-VM_MAX_KERNEL_ADDRESS.
+	 *
+	 * Be careful when checking VM_MAX_KERNEL_ADDRESS; you don't
+	 * want to wrap around to 0.
 	 */
 	if (pm == pmap_kernel() &&
 	(va < VM_MIN_KERNEL_ADDRESS ||
 	 (KERNEL2_SR < 15 && VM_MAX_KERNEL_ADDRESS <= va))) {
 		KASSERT((va >> ADDR_SR_SHFT) != USER_SR);
-#if defined (PMAP_OEA)
+#if defined(PMAP_OEA)
 #ifdef PPC_OEA601
-		if ((MFPVR() >> 16) == MPC601) {
-			register_t batu = battable[va >> 23].batu;
-			register_t batl = battable[va >> 23].batl;
-			register_t sr = iosrtable[va >> ADDR_SR_SHFT];
-			if (BAT601_VALID_P(batl) &&
-			BAT601_VA_MATCH_P(batu, batl, va)) {
-register_t mask =
-(~(batl & BAT601_BSM) << 17) & ~0x1L;
-if

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

2021-03-11 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Mar 12 01:54:29 UTC 2021

Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c

Log Message:
Refactor rxr->next_to_check updating.


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/pci/ixgbe/ix_txrx.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/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.68 src/sys/dev/pci/ixgbe/ix_txrx.c:1.69
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.68	Fri Mar 12 01:53:36 2021
+++ src/sys/dev/pci/ixgbe/ix_txrx.c	Fri Mar 12 01:54:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.68 2021/03/12 01:53:36 knakahara Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.69 2021/03/12 01:54:29 knakahara Exp $ */
 
 /**
 
@@ -2079,9 +2079,7 @@ next_desc:
 
 		/* Now send to the stack or do LRO */
 		if (sendmp != NULL) {
-			rxr->next_to_check = i;
 			ixgbe_rx_input(rxr, ifp, sendmp, ptype);
-			i = rxr->next_to_check;
 		}
 
 		/* Every 8 descriptors we go to refresh mbufs */

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

2021-03-11 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Mar 12 01:53:36 UTC 2021

Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c

Log Message:
Remove extra unlock/lock processing around if_percpuq_enqueue().

same as if_wm.c:r1.700


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/pci/ixgbe/ix_txrx.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/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.67 src/sys/dev/pci/ixgbe/ix_txrx.c:1.68
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.67	Tue Mar  9 10:03:18 2021
+++ src/sys/dev/pci/ixgbe/ix_txrx.c	Fri Mar 12 01:53:36 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.67 2021/03/09 10:03:18 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.68 2021/03/12 01:53:36 knakahara Exp $ */
 
 /**
 
@@ -2080,9 +2080,7 @@ next_desc:
 		/* Now send to the stack or do LRO */
 		if (sendmp != NULL) {
 			rxr->next_to_check = i;
-			IXGBE_RX_UNLOCK(rxr);
 			ixgbe_rx_input(rxr, ifp, sendmp, ptype);
-			IXGBE_RX_LOCK(rxr);
 			i = rxr->next_to_check;
 		}

CVS commit: src/usr.bin/indent

2021-03-11 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Fri Mar 12 00:15:34 UTC 2021

Modified Files:
src/usr.bin/indent: indent.c

Log Message:
indent: manually fix indentation

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/indent/indent.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.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.43 src/usr.bin/indent/indent.c:1.44
--- src/usr.bin/indent/indent.c:1.43	Thu Mar 11 22:32:06 2021
+++ src/usr.bin/indent/indent.c	Fri Mar 12 00:15:34 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.43 2021/03/11 22:32:06 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.44 2021/03/12 00:15:34 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)indent.c	5.1
 #include 
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.43 2021/03/11 22:32:06 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.44 2021/03/12 00:15:34 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
 #endif
@@ -995,7 +995,7 @@ main(int argc, char **argv)
 	prefix_blankline_requested = 0;
 	parse(rbrace);	/* let parser know about this */
 	ps.search_brace = opt.cuddle_else
-		&& ps.p_stack[ps.tos] == if_expr_stmt
+		&& ps.p_stack[ps.tos] == if_expr_stmt
 		&& ps.il[ps.tos] >= ps.ind_level;
 	if (ps.tos <= 1 && opt.blanklines_after_procs && ps.dec_nest <= 0)
 		postfix_blankline_requested = 1;

CVS commit: src

2021-03-11 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Fri Mar 12 00:13:06 UTC 2021

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/indent: Makefile
Added Files:
src/tests/usr.bin/indent: token-binary_op.0 token-binary_op.0.pro
token-binary_op.0.stdout token-case_label.0 token-case_label.0.pro
token-case_label.0.stdout token-colon.0 token-colon.0.pro
token-colon.0.stdout token-comma.0 token-comma.0.pro
token-comma.0.stdout token-comment.0 token-comment.0.pro
token-comment.0.stdout token-decl.0 token-decl.0.pro
token-decl.0.stdout token-do_stmt.0 token-do_stmt.0.pro
token-do_stmt.0.stdout token-end_of_file.0 token-end_of_file.0.pro
token-end_of_file.0.stdout token-for_exprs.0 token-for_exprs.0.pro
token-for_exprs.0.stdout token-form_feed.0 token-form_feed.0.pro
token-form_feed.0.stdout token-funcname.0 token-funcname.0.pro
token-funcname.0.stdout token-ident.0 token-ident.0.pro
token-ident.0.stdout token-if_expr.0 token-if_expr.0.pro
token-if_expr.0.stdout token-if_expr_stmt.0
token-if_expr_stmt.0.pro token-if_expr_stmt.0.stdout
token-if_expr_stmt_else.0 token-if_expr_stmt_else.0.pro
token-if_expr_stmt_else.0.stdout token-keyword_do.0
token-keyword_do.0.pro token-keyword_do.0.stdout
token-keyword_do_else.0 token-keyword_do_else.0.pro
token-keyword_do_else.0.stdout token-keyword_else.0
token-keyword_else.0.pro token-keyword_else.0.stdout
token-keyword_for_if_while.0 token-keyword_for_if_while.0.pro
token-keyword_for_if_while.0.stdout
token-keyword_struct_union_enum.0
token-keyword_struct_union_enum.0.pro
token-keyword_struct_union_enum.0.stdout token-lbrace.0
token-lbrace.0.pro token-lbrace.0.stdout token-lparen.0
token-lparen.0.pro token-lparen.0.stdout token-newline.0
token-newline.0.pro token-newline.0.stdout token-period.0
token-period.0.pro token-period.0.stdout token-postfix_op.0
token-postfix_op.0.pro token-postfix_op.0.stdout
token-preprocessing.0 token-preprocessing.0.pro
token-preprocessing.0.stdout token-question.0 token-question.0.pro
token-question.0.stdout token-rbrace.0 token-rbrace.0.pro
token-rbrace.0.stdout token-rparen.0 token-rparen.0.pro
token-rparen.0.stdout token-semicolon.0 token-semicolon.0.pro
token-semicolon.0.stdout token-stmt.0 token-stmt.0.pro
token-stmt.0.stdout token-stmt_list.0 token-stmt_list.0.pro
token-stmt_list.0.stdout token-storage_class.0
token-storage_class.0.pro token-storage_class.0.stdout
token-string_prefix.0 token-string_prefix.0.pro
token-string_prefix.0.stdout token-switch_expr.0
token-switch_expr.0.pro token-switch_expr.0.stdout token-type_def.0
token-type_def.0.pro token-type_def.0.stdout token-unary_op.0
token-unary_op.0.pro token-unary_op.0.stdout token-while_expr.0
token-while_expr.0.pro token-while_expr.0.stdout

Log Message:
tests/indent: add test templates for testing specific parser symbols

The basic idea of indent is to split the input into tokens and then
reassemble them, reformatting them on the way.  These tokens determine
how the output is formatted, therefore add tests for each of the
terminal tokens and nonterminal parser symbols, to cover more common
cases, and edge cases as well.


To generate a diff of this commit:
cvs rdiff -u -r1.1030 -r1.1031 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/indent/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/indent/token-binary_op.0 \
src/tests/usr.bin/indent/token-binary_op.0.pro \
src/tests/usr.bin/indent/token-binary_op.0.stdout \
src/tests/usr.bin/indent/token-case_label.0 \
src/tests/usr.bin/indent/token-case_label.0.pro \
src/tests/usr.bin/indent/token-case_label.0.stdout \
src/tests/usr.bin/indent/token-colon.0 \
src/tests/usr.bin/indent/token-colon.0.pro \
src/tests/usr.bin/indent/token-colon.0.stdout \
src/tests/usr.bin/indent/token-comma.0 \
src/tests/usr.bin/indent/token-comma.0.pro \
src/tests/usr.bin/indent/token-comma.0.stdout \
src/tests/usr.bin/indent/token-comment.0 \
src/tests/usr.bin/indent/token-comment.0.pro \
src/tests/usr.bin/indent/token-comment.0.stdout \
src/tests/usr.bin/indent/token-decl.0 \
src/tests/usr.bin/indent/token-decl.0.pro \
src/tests/usr.bin/indent/token-decl.0.stdout \
src/tests/usr.bin/indent/token-do_stmt.0 \
src/tests/usr.bin/indent/token-do_stmt.0.pro \
src/tests/usr.bin/indent/token-do_stmt.0.stdout \
src/tests/usr.bin/indent/token-end_of_file.0 \

CVS commit: src/usr.bin/indent

2021-03-11 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Thu Mar 11 22:32:06 UTC 2021

Modified Files:
src/usr.bin/indent: indent.c lexi.c pr_comment.c

Log Message:
indent: reduce indentation of check_size functions

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.34 -r1.35 src/usr.bin/indent/lexi.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/indent/pr_comment.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.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.42 src/usr.bin/indent/indent.c:1.43
--- src/usr.bin/indent/indent.c:1.42	Thu Mar 11 22:28:30 2021
+++ src/usr.bin/indent/indent.c	Thu Mar 11 22:32:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.42 2021/03/11 22:28:30 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.43 2021/03/11 22:32:06 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)indent.c	5.1
 #include 
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.42 2021/03/11 22:28:30 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.43 2021/03/11 22:32:06 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
 #endif
@@ -136,31 +136,33 @@ charbakfile[MAXPATHLEN] = "";
 static void
 check_size_code(size_t desired_size)
 {
-if (e_code + (desired_size) >= l_code) {
-	int nsize = l_code - s_code + 400 + desired_size;
-	int code_len = e_code - s_code;
-	codebuf = realloc(codebuf, nsize);
-	if (codebuf == NULL)
-	err(1, NULL);
-	e_code = codebuf + code_len + 1;
-	l_code = codebuf + nsize - 5;
-	s_code = codebuf + 1;
-}
+if (e_code + (desired_size) < l_code)
+return;
+
+size_t nsize = l_code - s_code + 400 + desired_size;
+size_t code_len = e_code - s_code;
+codebuf = realloc(codebuf, nsize);
+if (codebuf == NULL)
+	err(1, NULL);
+e_code = codebuf + code_len + 1;
+l_code = codebuf + nsize - 5;
+s_code = codebuf + 1;
 }
 
 static void
 check_size_label(size_t desired_size)
 {
-if (e_lab + (desired_size) >= l_lab) {
-	int nsize = l_lab - s_lab + 400 + desired_size;
-	int label_len = e_lab - s_lab;
-	labbuf = realloc(labbuf, nsize);
-	if (labbuf == NULL)
-	err(1, NULL);
-	e_lab = labbuf + label_len + 1;
-	l_lab = labbuf + nsize - 5;
-	s_lab = labbuf + 1;
-}
+if (e_lab + (desired_size) < l_lab)
+return;
+
+size_t nsize = l_lab - s_lab + 400 + desired_size;
+size_t label_len = e_lab - s_lab;
+labbuf = realloc(labbuf, nsize);
+if (labbuf == NULL)
+	err(1, NULL);
+e_lab = labbuf + label_len + 1;
+l_lab = labbuf + nsize - 5;
+s_lab = labbuf + 1;
 }
 
 #if HAVE_CAPSICUM

Index: src/usr.bin/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.34 src/usr.bin/indent/lexi.c:1.35
--- src/usr.bin/indent/lexi.c:1.34	Thu Mar 11 22:28:30 2021
+++ src/usr.bin/indent/lexi.c	Thu Mar 11 22:32:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: lexi.c,v 1.34 2021/03/11 22:28:30 rillig Exp $	*/
+/*	$NetBSD: lexi.c,v 1.35 2021/03/11 22:32:06 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)lexi.c	8.1 (
 #include 
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.34 2021/03/11 22:28:30 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.35 2021/03/11 22:32:06 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
 #endif
@@ -196,16 +196,17 @@ inbuf_next(void)
 static void
 check_size_token(size_t desired_size)
 {
-if (e_token + (desired_size) >= l_token) {
-	int nsize = l_token - s_token + 400 + desired_size;
-	int token_len = e_token - s_token;
-	tokenbuf = realloc(tokenbuf, nsize);
-	if (tokenbuf == NULL)
-	err(1, NULL);
-	e_token = tokenbuf + token_len + 1;
-	l_token = tokenbuf + nsize - 5;
-	s_token = tokenbuf + 1;
-}
+if (e_token + (desired_size) < l_token)
+return;
+
+size_t nsize = l_token - s_token + 400 + desired_size;
+size_t token_len = e_token - s_token;
+tokenbuf = realloc(tokenbuf, nsize);
+if (tokenbuf == NULL)
+	err(1, NULL);
+e_token = tokenbuf + token_len + 1;
+l_token = tokenbuf + nsize - 5;
+s_token = tokenbuf + 1;
 }
 
 static int
@@ -690,8 +691,7 @@ void
 alloc_typenames(void)
 {
 
-typenames = malloc(sizeof(typenames[0]) *
-(typename_count = 16));
+typenames = malloc(sizeof(typenames[0]) * (typename_count = 16));
 if (typenames == NULL)
 	err(1, NULL);
 }

Index: src/usr.bin/indent/pr_comment.c
diff -u src/usr.bin/indent/pr_comment.c:1.17 src/usr.bin/indent/pr_comment.c:1.18
--- src/usr.bin/indent/pr_comment.c:1.17	Thu Mar 11 22:28:30 2021
+++ src/usr.bin/indent/pr_comment.c	Thu Mar 11 22:32:06 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pr_comment.c,v 1.17 2021/03/11

CVS commit: src/usr.bin/sed

2021-03-11 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 11 22:31:19 UTC 2021

Modified Files:
src/usr.bin/sed: compile.c

Log Message:
remove extra increment; fixes: echo o | sed -e 's/o/\a/'


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/sed/compile.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.bin/sed/compile.c
diff -u src/usr.bin/sed/compile.c:1.48 src/usr.bin/sed/compile.c:1.49
--- src/usr.bin/sed/compile.c:1.48	Sat Oct  5 16:23:55 2019
+++ src/usr.bin/sed/compile.c	Thu Mar 11 17:31:19 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: compile.c,v 1.48 2019/10/05 20:23:55 christos Exp $	*/
+/*	$NetBSD: compile.c,v 1.49 2021/03/11 22:31:19 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992 Diomidis Spinellis.
@@ -38,7 +38,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: compile.c,v 1.48 2019/10/05 20:23:55 christos Exp $");
+__RCSID("$NetBSD: compile.c,v 1.49 2021/03/11 22:31:19 christos Exp $");
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/usr.bin/sed/compile.c 259132 2013-12-09 18:57:20Z eadler $");
 #endif
@@ -531,7 +531,6 @@ unescape(char **pp, char **spp)
 		break;
 	case 'a':
 		*sp = '\a';
-		p++;
 		break;
 #if 0
 	// No, \b RE

CVS commit: src/usr.bin/indent

2021-03-11 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Thu Mar 11 22:28:30 UTC 2021

Modified Files:
src/usr.bin/indent: indent.c lexi.c pr_comment.c

Log Message:
indent: remove redundant cast after allocation functions

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/indent/lexi.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/indent/pr_comment.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.bin/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.41 src/usr.bin/indent/indent.c:1.42
--- src/usr.bin/indent/indent.c:1.41	Tue Mar  9 19:46:28 2021
+++ src/usr.bin/indent/indent.c	Thu Mar 11 22:28:30 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.41 2021/03/09 19:46:28 rillig Exp $	*/
+/*	$NetBSD: indent.c,v 1.42 2021/03/11 22:28:30 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)indent.c	5.1
 #include 
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: indent.c,v 1.41 2021/03/09 19:46:28 rillig Exp $");
+__RCSID("$NetBSD: indent.c,v 1.42 2021/03/11 22:28:30 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $");
 #endif
@@ -139,7 +139,7 @@ check_size_code(size_t desired_size)
 if (e_code + (desired_size) >= l_code) {
 	int nsize = l_code - s_code + 400 + desired_size;
 	int code_len = e_code - s_code;
-	codebuf = (char *)realloc(codebuf, nsize);
+	codebuf = realloc(codebuf, nsize);
 	if (codebuf == NULL)
 	err(1, NULL);
 	e_code = codebuf + code_len + 1;
@@ -154,7 +154,7 @@ check_size_label(size_t desired_size)
 if (e_lab + (desired_size) >= l_lab) {
 	int nsize = l_lab - s_lab + 400 + desired_size;
 	int label_len = e_lab - s_lab;
-	labbuf = (char *)realloc(labbuf, nsize);
+	labbuf = realloc(labbuf, nsize);
 	if (labbuf == NULL)
 	err(1, NULL);
 	e_lab = labbuf + label_len + 1;
@@ -397,16 +397,16 @@ main(int argc, char **argv)
 ps.last_nl = true;		/* this is true if the last thing scanned was
  * a newline */
 ps.last_token = semicolon;
-combuf = (char *) malloc(bufsize);
+combuf = malloc(bufsize);
 if (combuf == NULL)
 	err(1, NULL);
-labbuf = (char *) malloc(bufsize);
+labbuf = malloc(bufsize);
 if (labbuf == NULL)
 	err(1, NULL);
-codebuf = (char *) malloc(bufsize);
+codebuf = malloc(bufsize);
 if (codebuf == NULL)
 	err(1, NULL);
-tokenbuf = (char *) malloc(bufsize);
+tokenbuf = malloc(bufsize);
 if (tokenbuf == NULL)
 	err(1, NULL);
 alloc_typenames();
@@ -424,7 +424,7 @@ main(int argc, char **argv)
 s_com = e_com = combuf + 1;
 s_token = e_token = tokenbuf + 1;
 
-in_buffer = (char *) malloc(10);
+in_buffer = malloc(10);
 if (in_buffer == NULL)
 	err(1, NULL);
 in_buffer_limit = in_buffer + 8;

Index: src/usr.bin/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.33 src/usr.bin/indent/lexi.c:1.34
--- src/usr.bin/indent/lexi.c:1.33	Thu Mar 11 22:15:44 2021
+++ src/usr.bin/indent/lexi.c	Thu Mar 11 22:28:30 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: lexi.c,v 1.33 2021/03/11 22:15:44 rillig Exp $	*/
+/*	$NetBSD: lexi.c,v 1.34 2021/03/11 22:28:30 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)lexi.c	8.1 (
 #include 
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.33 2021/03/11 22:15:44 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.34 2021/03/11 22:28:30 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
 #endif
@@ -199,7 +199,7 @@ check_size_token(size_t desired_size)
 if (e_token + (desired_size) >= l_token) {
 	int nsize = l_token - s_token + 400 + desired_size;
 	int token_len = e_token - s_token;
-	tokenbuf = (char *)realloc(tokenbuf, nsize);
+	tokenbuf = realloc(tokenbuf, nsize);
 	if (tokenbuf == NULL)
 	err(1, NULL);
 	e_token = tokenbuf + token_len + 1;
@@ -690,7 +690,7 @@ void
 alloc_typenames(void)
 {
 
-typenames = (const char **)malloc(sizeof(typenames[0]) *
+typenames = malloc(sizeof(typenames[0]) *
 (typename_count = 16));
 if (typenames == NULL)
 	err(1, NULL);

Index: src/usr.bin/indent/pr_comment.c
diff -u src/usr.bin/indent/pr_comment.c:1.16 src/usr.bin/indent/pr_comment.c:1.17
--- src/usr.bin/indent/pr_comment.c:1.16	Thu Mar 11 22:15:44 2021
+++ src/usr.bin/indent/pr_comment.c	Thu Mar 11 22:28:30 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pr_comment.c,v 1.16 2021/03/11 22:15:44 rillig Exp $	*/
+/*	$NetBSD: pr_comment.c,v 1.17 2021/03/11 22:28:30 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)pr_comment.c
 #include 
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: pr_comment.c,v 1.16

CVS commit: src/usr.bin/indent

2021-03-11 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Thu Mar 11 22:15:44 UTC 2021

Modified Files:
src/usr.bin/indent: lexi.c pr_comment.c

Log Message:
indent: use consistent array indexing

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/indent/lexi.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/indent/pr_comment.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.bin/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.32 src/usr.bin/indent/lexi.c:1.33
--- src/usr.bin/indent/lexi.c:1.32	Thu Mar 11 21:47:36 2021
+++ src/usr.bin/indent/lexi.c	Thu Mar 11 22:15:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: lexi.c,v 1.32 2021/03/11 21:47:36 rillig Exp $	*/
+/*	$NetBSD: lexi.c,v 1.33 2021/03/11 22:15:44 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)lexi.c	8.1 (
 #include 
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.32 2021/03/11 21:47:36 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.33 2021/03/11 22:15:44 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
 #endif
@@ -331,7 +331,7 @@ lexi(struct parser_state *state)
 		*buf_ptr == '_' || *buf_ptr == '$') {
 		/* fill_buffer() terminates buffer with newline */
 		if (*buf_ptr == '\\') {
-		if (*(buf_ptr + 1) == '\n') {
+		if (buf_ptr[1] == '\n') {
 			buf_ptr += 2;
 			if (buf_ptr >= buf_end)
 			fill_buffer();
@@ -650,7 +650,7 @@ stop_lit:
 	unary_delim = state->last_u_d;
 	break;
 	}
-	while (*(e_token - 1) == *buf_ptr || *buf_ptr == '=') {
+	while (e_token[-1] == *buf_ptr || *buf_ptr == '=') {
 	/*
 	 * handle ||, &&, etc, and also things as in int *i
 	 */

Index: src/usr.bin/indent/pr_comment.c
diff -u src/usr.bin/indent/pr_comment.c:1.15 src/usr.bin/indent/pr_comment.c:1.16
--- src/usr.bin/indent/pr_comment.c:1.15	Tue Mar  9 16:48:28 2021
+++ src/usr.bin/indent/pr_comment.c	Thu Mar 11 22:15:44 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pr_comment.c,v 1.15 2021/03/09 16:48:28 rillig Exp $	*/
+/*	$NetBSD: pr_comment.c,v 1.16 2021/03/11 22:15:44 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)pr_comment.c
 #include 
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: pr_comment.c,v 1.15 2021/03/09 16:48:28 rillig Exp $");
+__RCSID("$NetBSD: pr_comment.c,v 1.16 2021/03/11 22:15:44 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/pr_comment.c 334927 2018-06-10 16:44:18Z pstef $");
 #endif
@@ -283,7 +283,7 @@ pr_comment(void)
 	}
 	else {
 		ps.last_nl = 1;
-		if (*(e_com - 1) == ' ' || *(e_com - 1) == '\t')
+		if (e_com[-1] == ' ' || e_com[-1] == '\t')
 		last_bl = e_com - 1;
 		/*
 		 * if there was a space at the end of the last line, remember

CVS commit: src/usr.bin/indent

2021-03-11 Thread Roland Illig

Module Name:src
Committed By:   rillig
Date:   Thu Mar 11 21:47:36 UTC 2021

Modified Files:
src/usr.bin/indent: lexi.c

Log Message:
indent: merge duplicate code for reading from the input buffer

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/indent/lexi.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.bin/indent/lexi.c
diff -u src/usr.bin/indent/lexi.c:1.31 src/usr.bin/indent/lexi.c:1.32
--- src/usr.bin/indent/lexi.c:1.31	Tue Mar  9 19:23:08 2021
+++ src/usr.bin/indent/lexi.c	Thu Mar 11 21:47:36 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: lexi.c,v 1.31 2021/03/09 19:23:08 rillig Exp $	*/
+/*	$NetBSD: lexi.c,v 1.32 2021/03/11 21:47:36 rillig Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)lexi.c	8.1 (
 #include 
 #ifndef lint
 #if defined(__NetBSD__)
-__RCSID("$NetBSD: lexi.c,v 1.31 2021/03/09 19:23:08 rillig Exp $");
+__RCSID("$NetBSD: lexi.c,v 1.32 2021/03/11 21:47:36 rillig Exp $");
 #elif defined(__FreeBSD__)
 __FBSDID("$FreeBSD: head/usr.bin/indent/lexi.c 337862 2018-08-15 18:19:45Z pstef $");
 #endif
@@ -171,6 +171,28 @@ static char const *table[] = {
 [0]   = "uuiifuufiuuiiuiuiu",
 };
 
+static char
+inbuf_peek(void)
+{
+return *buf_ptr;
+}
+
+static void
+inbuf_skip(void)
+{
+buf_ptr++;
+if (buf_ptr >= buf_end)
+	fill_buffer();
+}
+
+static char
+inbuf_next(void)
+{
+char ch = inbuf_peek();
+inbuf_skip();
+return ch;
+}
+
 static void
 check_size_token(size_t desired_size)
 {
@@ -273,8 +295,7 @@ lexi(struct parser_state *state)
 while (*buf_ptr == ' ' || *buf_ptr == '\t') {	/* get rid of blanks */
 	state->col_1 = false;	/* leading blanks imply token is not in column
  * 1 */
-	if (++buf_ptr >= buf_end)
-	fill_buffer();
+	inbuf_skip();
 }
 
 /* Scan an alphanumeric token */
@@ -300,9 +321,7 @@ lexi(struct parser_state *state)
 		}
 		s = table[i][s - 'A'];
 		check_size_token(1);
-		*e_token++ = *buf_ptr++;
-		if (buf_ptr >= buf_end)
-		fill_buffer();
+		*e_token++ = inbuf_next();
 	}
 	/* s now indicates the type: f(loating), i(integer), u(nknown) */
 	}
@@ -320,10 +339,7 @@ lexi(struct parser_state *state)
 			break;
 		}
 		check_size_token(1);
-		/* copy it over */
-		*e_token++ = *buf_ptr++;
-		if (buf_ptr >= buf_end)
-		fill_buffer();
+		*e_token++ = inbuf_next();
 	}
 	*e_token = '\0';
 
@@ -331,10 +347,8 @@ lexi(struct parser_state *state)
 	  (*buf_ptr == '"' || *buf_ptr == '\''))
 	return lexi_end(string_prefix);
 
-	while (*buf_ptr == ' ' || *buf_ptr == '\t') {	/* get rid of blanks */
-	if (++buf_ptr >= buf_end)
-		fill_buffer();
-	}
+	while (*buf_ptr == ' ' || *buf_ptr == '\t')	/* get rid of blanks */
+	inbuf_next();
 	state->keyword = rw_0;
 	if (state->last_token == keyword_struct_union_enum &&
 	!state->p_l_follow) {
@@ -440,11 +454,9 @@ lexi(struct parser_state *state)
 /* Scan a non-alphanumeric token */
 
 check_size_token(3);	/* things like "<<=" */
-*e_token++ = *buf_ptr;	/* if it is only a one-character token, it is
+*e_token++ = inbuf_next();	/* if it is only a one-character token, it is
  * moved here */
 *e_token = '\0';
-if (++buf_ptr >= buf_end)
-	fill_buffer();
 
 switch (*token) {
 case '\n':
@@ -468,17 +480,13 @@ lexi(struct parser_state *state)
 		goto stop_lit;
 		}
 		check_size_token(2);
-		*e_token = *buf_ptr++;
-		if (buf_ptr >= buf_end)
-		fill_buffer();
+		*e_token = inbuf_next();
 		if (*e_token == '\\') {		/* if escape, copy extra char */
 		if (*buf_ptr == '\n')	/* check for escaped newline */
 			++line_no;
-		*++e_token = *buf_ptr++;
+		*++e_token = inbuf_next();
 		++e_token;	/* we must increment this again because we
  * copied two chars */
-		if (buf_ptr >= buf_end)
-			fill_buffer();
 		}
 		else
 		break;	/* we copied one character */
@@ -596,11 +604,8 @@ stop_lit:
 case '>':
 case '<':
 case '!':			/* ops like <, <<, <=, !=, etc */
-	if (*buf_ptr == '>' || *buf_ptr == '<' || *buf_ptr == '=') {
-	*e_token++ = *buf_ptr;
-	if (++buf_ptr >= buf_end)
-		fill_buffer();
-	}
+	if (*buf_ptr == '>' || *buf_ptr == '<' || *buf_ptr == '=')
+	*e_token++ = inbuf_next();
 	if (*buf_ptr == '=')
 	*e_token++ = *buf_ptr++;
 	code = (state->last_u_d ? unary_op : binary_op);
@@ -620,8 +625,7 @@ stop_lit:
 		check_size_token(1);
 		*e_token++ = *buf_ptr;
 	}
-	if (++buf_ptr >= buf_end)
-		fill_buffer();
+	inbuf_skip();
 	}
 	if (ps.in_decl) {
 	char *tp = buf_ptr;
@@ -640,10 +644,7 @@ stop_lit:
 default:
 	if (token[0] == '/' && (*buf_ptr == '*' || *buf_ptr == '/')) {
 	/* it is start of comment */
-	*e_token++ = *buf_ptr;
-
-	if (++buf_ptr >= buf_end)
-		fill_buffer();
+	*e_token++ = inbuf_next();
 
 	code = comment;

CVS commit: src/sys/arch/macppc/dev

2021-03-11 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Thu Mar 11 19:36:11 UTC 2021

Modified Files:
src/sys/arch/macppc/dev: snapper.c

Log Message:
add basic support for iMac G5 audio:
- match AOAShasta
- deal with headphone gpios labeled as lineout in OF
- set sc_mode to SNAPPER_IS_PCM3052 - OF makes it look like an unlabeled
  TAS3004
TODO:
- actually support pcm3052 instead of treating it like a sw codec


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/macppc/dev/snapper.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/macppc/dev/snapper.c
diff -u src/sys/arch/macppc/dev/snapper.c:1.56 src/sys/arch/macppc/dev/snapper.c:1.57
--- src/sys/arch/macppc/dev/snapper.c:1.56	Fri Mar  5 07:15:53 2021
+++ src/sys/arch/macppc/dev/snapper.c	Thu Mar 11 19:36:11 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: snapper.c,v 1.56 2021/03/05 07:15:53 rin Exp $	*/
+/*	$NetBSD: snapper.c,v 1.57 2021/03/11 19:36:11 macallan Exp $	*/
 /*	Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp	*/
 /*	Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp		*/
 
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.56 2021/03/05 07:15:53 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.57 2021/03/11 19:36:11 macallan Exp $");
 
 #include 
 #include 
@@ -158,6 +158,7 @@ static int gpio_read(bus_size_t);
 static void gpio_write(bus_size_t, int);
 static void snapper_mute_speaker(struct snapper_softc *, int);
 static void snapper_mute_headphone(struct snapper_softc *, int);
+static void snapper_mute_lineout(struct snapper_softc *, int);
 static int snapper_cint(void *);
 static int tas3004_init(struct snapper_softc *);
 static void snapper_init(struct snapper_softc *, int);
@@ -519,11 +520,14 @@ static const struct audio_format onyx_fo
 #define ONYX_NFORMATS	__arraycount(onyx_formats)
 
 static bus_size_t amp_mute;
-static bus_size_t headphone_mute;
+static bus_size_t headphone_mute = 0;
 static bus_size_t audio_hw_reset;
-static bus_size_t headphone_detect;
+static bus_size_t headphone_detect = 0;
+static bus_size_t lineout_detect = 0;
+static bus_size_t lineout_mute= 0;
 static bus_size_t owaddr = -1;
-static uint8_t headphone_detect_active;
+static uint8_t headphone_detect_active = 0;
+static uint8_t lineout_detect_active = 0;
 
 
 /* I2S registers */
@@ -692,6 +696,9 @@ snapper_match(device_t parent, struct cf
 
 	if (strcmp(compat, "AOAK2") == 0)
 		return 1;
+
+	if (strcmp(compat, "AOAShasta") == 0)
+		return 1;
 		
 	if (strcmp(compat, "AOAbase") == 0)
 		return 1;
@@ -870,8 +877,17 @@ snapper_defer(device_t dev)
 		if (codec[0] == 0) {
 			if (sc->sc_deqaddr == 0x34) {
 sc->sc_mode = SNAPPER_IS_TAS3001;
-			} else
+			} else {
+int root = OF_finddevice("/");
+char model[32];
 sc->sc_mode = SNAPPER_IS_TAS3004;
+if (OF_getprop(root, "model", model, 32) > 0) {
+	printf("model %s\n", model);
+	if (strcmp(model, "PowerMac8,1") == 0) {
+		sc->sc_mode = SNAPPER_IS_PCM3052;
+	}
+}
+			}
 		} else if (strcmp(codec, "tas3004") == 0) {
 			sc->sc_mode = SNAPPER_IS_TAS3004;
 		} else if (strcmp(codec, "pcm3052") == 0) {
@@ -1077,10 +1093,13 @@ snapper_set_port(void *h, mixer_ctrl_t *
 
 		snapper_mute_speaker(sc, 1);
 		snapper_mute_headphone(sc, 1);
+		snapper_mute_lineout(sc, 1);
 		if (mc->un.mask & 1 << 0)
 			snapper_mute_speaker(sc, 0);
 		if (mc->un.mask & 1 << 1)
 			snapper_mute_headphone(sc, 0);
+		if (mc->un.mask & 1 << 2)
+			snapper_mute_lineout(sc, 0);
 
 		sc->sc_output_mask = mc->un.mask;
 		return 0;
@@ -1240,11 +1259,13 @@ snapper_query_devinfo(void *h, mixer_dev
 		strcpy(dip->label.name, AudioNoutput);
 		dip->type = AUDIO_MIXER_SET;
 		dip->prev = dip->next = AUDIO_MIXER_LAST;
-		dip->un.s.num_mem = 2;
+		dip->un.s.num_mem = 3;
 		strcpy(dip->un.s.member[0].label.name, AudioNspeaker);
 		dip->un.s.member[0].mask = 1 << 0;
 		strcpy(dip->un.s.member[1].label.name, AudioNheadphone);
 		dip->un.s.member[1].mask = 1 << 1;
+		strcpy(dip->un.s.member[2].label.name, AudioNline);
+		dip->un.s.member[2].mask = 1 << 2;
 		return 0;
 
 	case SNAPPER_VOL_OUTPUT:
@@ -1937,6 +1958,7 @@ gpio_write(bus_size_t addr, int val)
 }
 
 #define headphone_active 0	/* XXX OF */
+#define lineout_active 0	/* XXX OF */
 #define amp_active 0		/* XXX OF */
 
 static void
@@ -1977,30 +1999,68 @@ snapper_mute_headphone(struct snapper_so
 	}
 }
 
+static void
+snapper_mute_lineout(struct snapper_softc *sc, int mute)
+{
+	u_int x;
+
+	if (lineout_mute != 0) {
+		DPRINTF("lineoutmute %d --> ", gpio_read(lineout_mute));
+
+		if (mute)
+			x = lineout_active;	/* mute */
+		else
+			x = !lineout_active;	/* unmute */
+		if (x != gpio_read(lineout_mute))
+			gpio_write(lineout_mute, x);
+
+		DPRINTF("%d\n", gpio_read(lineout_mute));
+	}
+}
+
 static int
 snapper_cint(void *v)
 {
-	struct snapper_softc *sc;
+	struct snapper_softc *sc = v;
 	u_int sense;
+	int mask

CVS commit: src/sys/arch/sparc64/dev

2021-03-11 Thread Palle Lyckegaard

Module Name:src
Committed By:   palle
Date:   Thu Mar 11 19:34:11 UTC 2021

Modified Files:
src/sys/arch/sparc64/dev: vnet.c

Log Message:
sun4v: vnet - reception of ethernet frames seems to work now (WIP and code is  
still full of debug code)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/dev/vnet.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/sparc64/dev/vnet.c
diff -u src/sys/arch/sparc64/dev/vnet.c:1.2 src/sys/arch/sparc64/dev/vnet.c:1.3
--- src/sys/arch/sparc64/dev/vnet.c:1.2	Thu Mar  4 20:59:39 2021
+++ src/sys/arch/sparc64/dev/vnet.c	Thu Mar 11 19:34:11 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnet.c,v 1.2 2021/03/04 20:59:39 palle Exp $	*/
+/*	$NetBSD: vnet.c,v 1.3 2021/03/11 19:34:11 palle Exp $	*/
 /*	$OpenBSD: vnet.c,v 1.62 2020/07/10 13:26:36 patrick Exp $	*/
 /*
  * Copyright (c) 2009, 2015 Mark Kettenis
@@ -34,6 +34,8 @@ FIXME openbsd
 #if 0
 FIXME openbsd
 #include 
+#else
+#include 
 #endif
 
 #include 
@@ -56,6 +58,9 @@ FIXME openbsd
 #include 
 #include 
 
+#if 1
+#define VNET_DEBUG
+#endif
 #ifdef VNET_DEBUG
 #define DPRINTF(x)	printf x
 #else
@@ -169,6 +174,8 @@ struct vnet_softc {
 #if 0
 FIXME openbsd		
 	struct timeout	sc_handshake_to;
+#else
+	struct callout	sc_handshake_co;
 #endif		
 
 	uint8_t		sc_xfer_mode;
@@ -230,7 +237,7 @@ void	vnet_send_dring_data(struct vnet_so
 
 void	vnet_start(struct ifnet *);
 void	vnet_start_desc(struct ifnet *);
-int		vnet_ioctl (struct ifnet *, u_long, void *);
+int		vnet_ioctl(struct ifnet *, u_long, void *);
 void	vnet_watchdog(struct ifnet *);
 
 int		vnet_media_change(struct ifnet *);
@@ -240,13 +247,14 @@ void	vnet_link_state(struct vnet_softc *
 
 void	vnet_setmulti(struct vnet_softc *, int);
 
-void	vnet_init(struct ifnet *);
-void	vnet_stop(struct ifnet *);
+int		vnet_init(struct ifnet *);
+void	vnet_stop(struct ifnet *, int);
 
 int vnet_match(device_t parent, cfdata_t match, void *aux)
 {
 
 	struct cbus_attach_args *ca = aux;
+	
 	if (strcmp(ca->ca_name, "network") == 0)
 		return (1);
 
@@ -308,6 +316,9 @@ FIXME openbsd	
 #if 0
 FIXME openbsd	
 	timeout_set(>sc_handshake_to, vnet_handshake, sc);
+#else
+	callout_init(>sc_handshake_co, 0);
+/* netbsd callout do silmilar function...*/
 #endif 
 	sc->sc_peer_state = VIO_DP_STOPPED;
 
@@ -358,9 +369,13 @@ FIXME openbsd	
 	ifp = >sc_ethercom.ec_if;
 	ifp->if_softc = sc;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+#if 0	
 	ifp->if_link_state = LINK_STATE_DOWN;
+#endif	
+	ifp->if_init = vnet_init;
 	ifp->if_ioctl = vnet_ioctl;
 	ifp->if_start = vnet_start;
+	ifp->if_stop = vnet_stop;
 	ifp->if_watchdog = vnet_watchdog;
 	strlcpy(ifp->if_xname, device_xname(self), IFNAMSIZ);
 #if 0
@@ -374,6 +389,7 @@ FIXME openbsd	
 	ifmedia_add(>sc_media, IFM_ETHER | IFM_AUTO, 0, NULL);
 	ifmedia_set(>sc_media, IFM_ETHER | IFM_AUTO);
 
+#if 0	
 	int error = if_initialize(ifp);
 	if (error != 0) {
 		printf(", if_initialize() failed\n");
@@ -381,7 +397,10 @@ FIXME openbsd	
 	}
 	ether_ifattach(ifp, sc->sc_macaddr);
 	if_register(ifp);
-	
+#else
+	if_attach(ifp);
+	ether_ifattach(ifp, sc->sc_macaddr);
+#endif	
 	printf("\n");
 	return;
 free_txqueue:
@@ -424,7 +443,9 @@ vnet_tx_intr(void *arg)
 int
 vnet_rx_intr(void *arg)
 {
+#if 0		
 	DPRINTF(("%s: entry\n", __func__));
+#endif	
 
 	struct vnet_softc *sc = arg;
 	struct ldc_conn *lc = >sc_lc;
@@ -433,34 +454,47 @@ vnet_rx_intr(void *arg)
 	int err;
 
 	err = hv_ldc_rx_get_state(lc->lc_id, _head, _tail, _state);
-	if (err == H_EINVAL)
+	if (err == H_EINVAL) {
+		printf("hv_ldc_rx_get_state failed\n");
 		return (0);
+	}
 	if (err != H_EOK) {
 		printf("hv_ldc_rx_get_state %d\n", err);
 		return (0);
 	}
+#if 0	
+	DPRINTF(("%s: rx_state %" PRId64 "  head %" PRId64 "  tail %" PRId64 "\n",
+			 __func__, rx_state, rx_head, rx_tail));
+#endif	
 
 	if (rx_state != lc->lc_rx_state) {
+#if 0			
+		DPRINTF(("%s: rx_state %" PRId64 " != lc__rx_state %" PRId64 "\n",
+ __func__, rx_state, lc->lc_rx_state));
+#endif		
 		switch (rx_state) {
 		case LDC_CHANNEL_DOWN:
-			DPRINTF(("%s: Rx link down\n", __func__));
 			lc->lc_tx_seqid = 0;
 			lc->lc_state = 0;
 			lc->lc_reset(lc);
 			if (rx_head == rx_tail)
 break;
 			/* Discard and ack pending I/O. */
-			DPRINTF(("setting rx qhead to %lld\n", rx_tail));
+			DPRINTF(("setting rx qhead to %" PRId64 "\n", rx_tail));
 			err = hv_ldc_rx_set_qhead(lc->lc_id, rx_tail);
 			if (err == H_EOK)
 break;
 			printf("%s: hv_ldc_rx_set_qhead %d\n", __func__, err);
 			break;
 		case LDC_CHANNEL_UP:
+#if 0
 			DPRINTF(("%s: Rx link up\n", __func__));
+#endif			
 #if 0
 FIXME openbsd			
 			timeout_add_msec(>sc_handshake_to, 500);
+#else 
+			callout_reset(>sc_handshake_co, hz / 2, vnet_handshake, sc);
 #endif 
 			break;
 		case LDC_CHANNEL_RESET:
@@ -471,37 +505,73 @@ FIXME openbsd			
 #if 0
 FIXME openbsd

CVS commit: src/lib/libc/regex

2021-03-11 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 11 18:49:18 UTC 2021

Modified Files:
src/lib/libc/regex: regex.3

Log Message:
Underscore is a word character (thanks uwe@)


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/regex/regex.3

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

Modified files:

Index: src/lib/libc/regex/regex.3
diff -u src/lib/libc/regex/regex.3:1.31 src/lib/libc/regex/regex.3:1.32
--- src/lib/libc/regex/regex.3:1.31	Thu Mar 11 12:13:29 2021
+++ src/lib/libc/regex/regex.3	Thu Mar 11 13:49:18 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: regex.3,v 1.31 2021/03/11 17:13:29 wiz Exp $
+.\" $NetBSD: regex.3,v 1.32 2021/03/11 18:49:18 christos Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994 Henry Spencer.
 .\" Copyright (c) 1992, 1993, 1994
@@ -225,9 +225,9 @@ Horizontal Tab
 .It \ev
 Vertical Tab
 .It \ew
-Alias for [[:alnum:]]
+Alias for [[:alnum:]_]
 .It \eW
-Alias for [^[:alnum:]]
+Alias for [^[:alnum:]_]
 .It \e'
 Matches the end of the subject string (the string to be matched).
 .It \e`

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 18:16:50 UTC 2021

Modified Files:
src/share/man/man4: isa.4

Log Message:
Fix missing Xr


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/share/man/man4/isa.4

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

Modified files:

Index: src/share/man/man4/isa.4
diff -u src/share/man/man4/isa.4:1.48 src/share/man/man4/isa.4:1.49
--- src/share/man/man4/isa.4:1.48	Thu Mar 11 16:50:08 2021
+++ src/share/man/man4/isa.4	Thu Mar 11 18:16:50 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: isa.4,v 1.48 2021/03/11 16:50:08 nia Exp $
+.\"	$NetBSD: isa.4,v 1.49 2021/03/11 18:16:50 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -134,7 +134,7 @@ Boca BB100[48] and BB2016 multiplexing s
 NS8250-, NS16450-, and NS16550-based serial ports.
 .It Xr cy 4
 Cyclades Cyclom-4Y, -8Y, and -16Y asynchronous serial communications cards.
-.It ioat
+.It Xr ioat 4
 .Tn BOCA Research
 IOAT66
 serial interfaces.

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 17:42:14 UTC 2021

Modified Files:
src/share/man/man4: hdaudio.4

Log Message:
Mention that formats with >16-bit precision cannot yet be used


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/hdaudio.4

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

Modified files:

Index: src/share/man/man4/hdaudio.4
diff -u src/share/man/man4/hdaudio.4:1.17 src/share/man/man4/hdaudio.4:1.18
--- src/share/man/man4/hdaudio.4:1.17	Thu May  7 12:56:19 2020
+++ src/share/man/man4/hdaudio.4	Thu Mar 11 17:42:14 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hdaudio.4,v 1.17 2020/05/07 12:56:19 wiz Exp $
+.\"	$NetBSD: hdaudio.4,v 1.18 2021/03/11 17:42:14 nia Exp $
 .\"
 .\" Copyright (c) 2009, 2010 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 February 16, 2020
+.Dd March 11, 2021
 .Dt HDAUDIO 4
 .Os
 .Sh NAME
@@ -132,4 +132,6 @@ Add support for non-PCM output formats
 Handle unsolicited RIRB messages
 .It
 Modem function groups
+.It
+I/O with precision greater than 16 bits with the MI audio layer
 .El

CVS commit: src/usr.bin/sed

2021-03-11 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Mar 11 17:14:35 UTC 2021

Modified Files:
src/usr.bin/sed: sed.1

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/sed/sed.1

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

Modified files:

Index: src/usr.bin/sed/sed.1
diff -u src/usr.bin/sed/sed.1:1.42 src/usr.bin/sed/sed.1:1.43
--- src/usr.bin/sed/sed.1:1.42	Thu Mar 11 15:45:55 2021
+++ src/usr.bin/sed/sed.1	Thu Mar 11 17:14:35 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sed.1,v 1.42 2021/03/11 15:45:55 christos Exp $
+.\"	$NetBSD: sed.1,v 1.43 2021/03/11 17:14:35 wiz Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -101,7 +101,7 @@ The editing commands should each be list
 Turn off GNU regex extensions (the default).
 .It Fl g
 Turn on GNU regex extensions.
-See 
+See
 .Xr regex 3
 for details.
 .It Fl I Ns Op Ar extension

CVS commit: src/lib/libc/regex

2021-03-11 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Mar 11 17:13:29 UTC 2021

Modified Files:
src/lib/libc/regex: regex.3

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libc/regex/regex.3

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

Modified files:

Index: src/lib/libc/regex/regex.3
diff -u src/lib/libc/regex/regex.3:1.30 src/lib/libc/regex/regex.3:1.31
--- src/lib/libc/regex/regex.3:1.30	Thu Mar 11 16:36:41 2021
+++ src/lib/libc/regex/regex.3	Thu Mar 11 17:13:29 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: regex.3,v 1.30 2021/03/11 16:36:41 christos Exp $
+.\" $NetBSD: regex.3,v 1.31 2021/03/11 17:13:29 wiz Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994 Henry Spencer.
 .\" Copyright (c) 1992, 1993, 1994
@@ -194,15 +194,15 @@ caution in software intended to be porta
 .It Dv REG_GNU
 Include GNU-inspired extensions:
 .Pp
-.Bl -tag -offset indent -width XX -compact 
+.Bl -tag -offset indent -width XX -compact
 .It \eN
 Use backreference
 .Dv N
 where
 .Dv N
-is a single digit number between 
-.Dv 1 
-and 
+is a single digit number between
+.Dv 1
+and
 .Dv 9 .
 .It \ea
 Visual Bell

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 17:12:42 UTC 2021

Modified Files:
src/share/man/man4: iic.4

Log Message:
Remove dead references


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/share/man/man4/iic.4

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

Modified files:

Index: src/share/man/man4/iic.4
diff -u src/share/man/man4/iic.4:1.25 src/share/man/man4/iic.4:1.26
--- src/share/man/man4/iic.4:1.25	Sat Feb 27 08:59:24 2021
+++ src/share/man/man4/iic.4	Thu Mar 11 17:12:42 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: iic.4,v 1.25 2021/02/27 08:59:24 nia Exp $
+.\"	$NetBSD: iic.4,v 1.26 2021/03/11 17:12:42 nia Exp $
 .\"	$OpenBSD: iic.4,v 1.74 2008/09/10 16:13:43 reyk Exp $
 .\"
 .\" Copyright (c) 2004, 2006 Alexander Yurchenko 
@@ -147,54 +147,23 @@ ACPI SMBus Control Method Interface
 Acer Labs M7101 SMBus controller
 .It Xr amdpm 4
 AMD768 Power Management Controller and AMD8111 System Management Controller
-.It Xr armadillo9iic 4
-.It Xr at91twi 4
-.It Xr ausmbus 4
-.It Xr awiniic 4
-.It Xr awinp2wi 4
-.It Xr bcmi2c 4
 .It Xr coram 4
-digital video driver for Conexant CX23885 based cards
+Digital video driver for Conexant CX23885 based cards
 .It Xr cuda 4
-support for CUDA microcontrollers found in many Power Macintosh and
+Support for CUDA microcontrollers found in many Power Macintosh and
 compatible computers
 .It Xr cxdtv 4
-digital video driver for Conexant CX2388x based cards
-.It Xr diic 4
-.It Xr exyoiic 4
-.It Xr g2i2c 4
-.It Xr gpiic 4
+Digital video driver for Conexant CX2388x based cards
 .It Xr gpioiic 4
 GPIO I2C controller
-.It Xr gttwsi 4
-.It Xr i2cbus 4
-.It Xr gxiic 4
 .It Xr ichsmb 4
 Intel Chipset internal SMBus controller
-.It Xr imxi2c 4
-.It Xr iociic 4
-.It Xr iomdiic 4
-.It Xr iopiic 4
 .It Xr ismt 4
 Intel Chipset internal SMBus 2.0 controller with DMA
-.It Xr jziic 4
-.It Xr ki2c 4
-.It Xr nbpiic 4
 .It Xr nfsmb 4
 NVIDIA nForce 2/3/4 SMBus controller and SMBus driver
-.It Xr ociic 4
-.It Xr omapiic 4
-.It Xr pcfiic 4
 .It Xr piixpm 4
 Intel PIIX and compatible Power Management controller
-.It Xr ri2c 4
-.It Xr rkiic 4
-.It Xr rtciic 4
-.It Xr slugiic 4
-.It Xr tegrai2c 4
-.It Xr tiiic 4
-.It Xr tsciic 4
-.It Xr viapcib 4
 .El
 .Sh SUPPORTED SLAVES
 A wide list of slaves are supported, among them:
@@ -208,13 +177,8 @@ A wide list of slaves are supported, amo
 .Bl -tag -width 13n -compact -offset indent
 .It Xr dbcool 4
 dbCool(tm) family of environmental monitors and fan controllers
-.It Xr dsrtc 4
-.It Xr ioexp 4
-.It Xr m41trtc 4
-.It Xr nbppcon 4
 .It Xr pcf8563rtc 4
 NXP PCF8563 real-time clock
-.It Xr r2025rtc 4
 .It Xr rs5c372rtc 4
 RICOH RS5C372A and RS5C372B real-time clock
 .It Xr s390rtc 4
@@ -224,7 +188,7 @@ JEDEC JC-42.4 compatible memory module t
 .It Xr seeprom 4
 24-series I2C EEPROM driver
 .It Xr sgsmix 4
-driver for SGS 7433 Basic Audio Processor found in some Apple machines
+SGS 7433 Basic Audio Processor found in some Apple machines
 .It Xr spdmem 4
 Generic Memory Module Serial Presence Detect
 .It Xr ssdfb 4

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 17:01:55 UTC 2021

Modified Files:
src/share/man/man4: tc.4

Log Message:
Use inline cross-references.

Remove dead reference.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/tc.4

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

Modified files:

Index: src/share/man/man4/tc.4
diff -u src/share/man/man4/tc.4:1.8 src/share/man/man4/tc.4:1.9
--- src/share/man/man4/tc.4:1.8	Fri Feb 26 11:12:45 2021
+++ src/share/man/man4/tc.4	Thu Mar 11 17:01:55 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: tc.4,v 1.8 2021/02/26 11:12:45 nia Exp $
+.\" $NetBSD: tc.4,v 1.9 2021/03/11 17:01:55 nia Exp $
 .\"
 .\" Copyright (c) 1996, 1997 Jonathan Stone.
 .\" All rights reserved.
@@ -65,53 +65,40 @@ includes machine-independent
 drivers, sorted by device type and driver name:
 .Ss SCSI interfaces
 .Bl -tag -width pcdisplay -offset indent
-.It asc
-PMAZ-A single-channel SCSI adapter
-.It tcds
+.It Xr tcds 4
 PMAZ-DS, PMAZ-FS, PMAZB-AA and PMAZC-AA dual-channel SCSI adapters
 .El
 .Ss Network interfaces
 .Bl -tag -width pcdisplay -offset indent
-.It le
+.It Xr le 4
 LANCE Ethernet interface
 .El
 .Ss Frame buffers
 .Bl -tag -width pcdisplay -offset indent
-.It cfb
+.It Xr cfb 4
 PMAG-B CX colour unaccelerated 2-D framebuffer
-.It mfb
+.It Xr mfb 4
 PMAG-A MX monochrome framebuffer
-.It px
+.It Xr px 4
 PMAG-C PX accelerated graphics boards
-.It pxg
+.It Xr pxg 4
 PMAG-D, PMAG-E and PMAG-F PXG accelerated graphics
 boards
-.It sfb
+.It Xr sfb 4
 PMAGB-BA HX colour unaccelerated 2-D framebuffer
-.It tfb
+.It Xr tfb 4
 PMAG-J TX 24-bit colour unaccelerated 2-D framebuffer
 .El
 .Ss Miscellaneous
 .Bl -tag -width pcdisplay -offset indent
-.It ioasic
+.It Xr ioasic 4
 baseboard IO control ASIC for DEC TURBOchannel systems
-.It tcu
+.It Xr tcu 4
 TC-USB USB host and GPIO option
 .El
 .Sh SEE ALSO
-.Xr asc 4 ,
-.Xr cfb 4 ,
-.Xr fta 4 ,
 .Xr intro 4 ,
-.Xr ioasic 4 ,
-.Xr le 4 ,
-.Xr mfb 4 ,
-.Xr px 4 ,
-.Xr pxg 4 ,
-.Xr sfb 4 ,
-.Xr tcds 4 ,
-.Xr tcu 4 ,
-.Xr tfb 4
+.Xr tc 9
 .Sh HISTORY
 The
 .Nm

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 16:59:04 UTC 2021

Modified Files:
src/share/man/man4: mca.4

Log Message:
Use inline cross-references


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/share/man/man4/mca.4

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

Modified files:

Index: src/share/man/man4/mca.4
diff -u src/share/man/man4/mca.4:1.21 src/share/man/man4/mca.4:1.22
--- src/share/man/man4/mca.4:1.21	Fri Feb 26 11:12:45 2021
+++ src/share/man/man4/mca.4	Thu Mar 11 16:59:04 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: mca.4,v 1.21 2021/02/26 11:12:45 nia Exp $
+.\" $NetBSD: mca.4,v 1.22 2021/03/11 16:59:04 nia Exp $
 .\"
 .\" Copyright (c) 2000, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -55,11 +55,11 @@ drivers, sorted by device type and drive
 .\"
 .Ss SCSI controllers
 .Bl -tag -width speaker -offset indent
-.It aha
+.It Xr aha 4
 Adaptec AHA-1640
 .Tn SCSI
 interface
-.It esp
+.It Xr esp 4
 NCR 53C90
 .Tn SCSI
 Adapter
@@ -67,45 +67,35 @@ Adapter
 .\"
 .Ss Disk and tape controllers
 .Bl -tag -width speaker -offset indent
-.It edc
+.It Xr edc 4
 IBM ESDI Fixed Disk Controller
 .El
 .\"
 .Ss Serial interfaces
 .Bl -tag -width speaker -offset indent
-.It com
+.It Xr com 4
 NS8250-, NS16450-, and NS16550-based serial cards.
 .El
 .\"
 .Ss Network interfaces
 .Bl -tag -width speaker -offset indent
-.It ate
+.It Xr ate 4
 Allied-Telesis 1720 Ethernet interface cards
-.It we
+.It Xr we 4
 WD/SMC WD80x3x Ethernet interface cards and clones
-.It le
+.It Xr le 4
 SKNET Personal and MC+ Ethernet interface cards
-.It elmc
+.It Xr elmc 4
 3Com EtherLink/MC (3c523) Ethernet interface
-.It ep
+.It Xr ep 4
 3Com EtherLink III 3c529 Ethernet interface
-.It tra
+.It Xr tra 4
 Tiara LANCard/E and Standard MicroSystems 3016/MC Ethernet interface
 .El
 .\"
 .Sh SEE ALSO
-.Xr aha 4 ,
-.Xr ate 4 ,
-.Xr com 4 ,
-.Xr edc 4 ,
-.Xr elmc 4 ,
-.Xr ep 4 ,
-.Xr esp 4 ,
-.Xr le 4 ,
-.Xr ne 4 ,
-.Xr tr 4 ,
-.Xr tra 4 ,
-.Xr we 4
+.Xr intro 4 ,
+.Xr mca 9
 .\"
 .Sh HISTORY
 The machine-independent

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 16:56:50 UTC 2021

Modified Files:
src/share/man/man4: eisa.4

Log Message:
Use inline cross-references.

Remove reference to no-longer-existing FDDI driver.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/eisa.4

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

Modified files:

Index: src/share/man/man4/eisa.4
diff -u src/share/man/man4/eisa.4:1.14 src/share/man/man4/eisa.4:1.15
--- src/share/man/man4/eisa.4:1.14	Tue May  6 19:02:46 2003
+++ src/share/man/man4/eisa.4	Thu Mar 11 16:56:50 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: eisa.4,v 1.14 2003/05/06 19:02:46 wiz Exp $
+.\"	$NetBSD: eisa.4,v 1.15 2021/03/11 16:56:50 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jonathan Stone
 .\" All rights reserved.
@@ -74,49 +74,47 @@ drivers, sorted by device type
 and driver name:
 .Ss Disk and tape controllers
 .Bl -tag -width pcdisplay -offset indent
-.It cac
+.It Xr cac 4
 Compaq array controllers.
-.It mlx
+.It Xr mlx 4
 Mylex DAC960 and DEC SWXCR RAID controllers.
 .El
 .Ss SCSI interfaces
 .Bl -tag -width pcdisplay -offset indent
-.It ahb
+.It Xr ahb 4
 Adaptec 174x
 .Tn SCSI
 interfaces.
-.It ahc
+.It Xr ahc 4
 Adaptec AIC 7770, 274x, and 284x
 .Tn SCSI
 interfaces.
-.It bha
+.It Xr bha 4
 BusLogic BT-74x
 .Tn SCSI
 interfaces.
-.It dpt
+.It Xr dpt 4
 DPT SmartCache/SmartRAID III and IV
 .Tn SCSI
 interfaces.
-.It uha
+.It Xr uha 4
 Ultrastor 24f
 .Tn SCSI
 interfaces.
 .El
 .Ss Network interfaces
 .Bl -tag -width pcdisplay -offset indent
-.It ep
+.It Xr ep 4
 3Com 3c579 and 3c592 10Mbit
 .Tn Ethernet ,
 and 3c597 10/100Mbit
 .Tn Ethernet
 interfaces.
-.It fea
-Digital DEFEA FDDI interfaces.
-.It le
+.It Xr le 4
 Digital DE422
 .Tn Ethernet
 interfaces.
-.It tlp
+.It Xr tlp 4
 Digital DE425
 .Tn Ethernet
 interfaces.
@@ -137,18 +135,7 @@ or
 respectively.  The manual pages for each individual driver also lists the
 supported bus variants.
 .Sh SEE ALSO
-.Xr ahb 4 ,
-.Xr ahc 4 ,
-.Xr bha 4 ,
-.Xr cac 4 ,
-.Xr dpt 4 ,
-.Xr ep 4 ,
-.Xr fea 4 ,
-.Xr intro 4 ,
-.Xr le 4 ,
-.Xr mlx 4 ,
-.Xr tlp 4 ,
-.Xr uha 4
+.Xr intro 4
 .Sh HISTORY
 The machine-independent
 .Tn EISA

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 16:53:14 UTC 2021

Modified Files:
src/share/man/man4: sbus.4

Log Message:
Use inline cross-references.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/sbus.4

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

Modified files:

Index: src/share/man/man4/sbus.4
diff -u src/share/man/man4/sbus.4:1.10 src/share/man/man4/sbus.4:1.11
--- src/share/man/man4/sbus.4:1.10	Thu Sep  6 09:47:30 2018
+++ src/share/man/man4/sbus.4	Thu Mar 11 16:53:14 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sbus.4,v 1.10 2018/09/06 09:47:30 maxv Exp $
+.\"	$NetBSD: sbus.4,v 1.11 2021/03/11 16:53:14 nia Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -61,91 +61,74 @@ includes machine-independent
 .Nm
 drivers, sorted by device type and driver name:
 .Ss SCSI interfaces
-.Bl -tag -width  -offset indent
-.It esp
+.Bl -tag -width xx -offset indent
+.It Xr esp 4
 NCR53c94 and compatible
 .Tn SCSI
 interfaces.
-.It isp
+.It Xr isp 4
 Qlogic
 .Tn SCSI
 interfaces.
 .El
 .Ss Network interfaces
-.Bl -tag -width  -offset indent
-.It le
+.Bl -tag -width xx -offset indent
+.It Xr le 4
 .Tn Lance
 7990 series
 .Tn Ethernet
 interfaces.
-.It hme
+.It Xr hme 4
 .Dq Happy Meal
 .Tn Ethernet
 interfaces.
-.It be
+.It Xr be 4
 .Dq Big Mac
 .Tn Ethernet
 board.
-.It qe
+.It Xr qe 4
 Quad Ethernet Controller
 board.
 .El
 .Ss Bridges
-.Bl -tag -width  -offset indent
-.It xbox
+.Bl -tag -width xx -offset indent
+.It Xr xbox 4
 an
 .Nm Sbus
 expansion box.
 .El
 .Ss Graphics devices
-.Bl -tag -width  -offset indent
-.It bwtwo
+.Bl -tag -width xx -offset indent
+.It Xr bwtwo 4
 framebuffer device.
-.It cgthree
+.It Xr cgthree 4
 framebuffer device.
-.It cgsix
+.It Xr cgsix 4
 framebuffer device.
-.It pnozz
+.It Xr pnozz 4
 framebuffer device.
-.It tcx
+.It Xr tcx 4
 framebuffer device.
-.It zx
+.It Xr zx 4
 framebuffer device.
 .El
 .Ss Audio devices
-.Bl -tag -width  -offset indent
-.It audiocs
+.Bl -tag -width xx -offset indent
+.It Xr audiocs 4
 CS4231 codec.
 .El
 .Ss Serial interfaces
-.Bl -tag -width  -offset indent
-.It magma
+.Bl -tag -width xx -offset indent
+.It Xr magma 4
 Magma Serial/Parallel combo device.
 .El
 .Ss Floppy interfaces
-.Bl -tag -width  -offset indent
-.It fdc
+.Bl -tag -width xx -offset indent
+.It Xr fdc 4
 Floppy disk controller
 .El
 .Sh SEE ALSO
-.Xr audiocs 4 ,
-.Xr be 4 ,
-.Xr bwtwo 4 ,
-.Xr cgsix 4 ,
-.Xr cgthree 4 ,
-.Xr en 4 ,
-.Xr esp 4 ,
-.Xr fdc 4 ,
-.Xr hme 4 ,
-.Xr intro 4 ,
-.Xr isp 4 ,
-.Xr le 4 ,
-.Xr magma 4 ,
-.Xr pnozz 4 ,
-.Xr qe 4 ,
-.Xr tcx 4 ,
-.Xr xbox 4 ,
-.Xr zx 4
+.Xr intro 4
 .Sh HISTORY
 The machine-independent
 .Nm SBus

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 16:50:08 UTC 2021

Modified Files:
src/share/man/man4: isa.4

Log Message:
Use inline cross-references.

Remove dead references that mandoc complains about.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/share/man/man4/isa.4

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

Modified files:

Index: src/share/man/man4/isa.4
diff -u src/share/man/man4/isa.4:1.47 src/share/man/man4/isa.4:1.48
--- src/share/man/man4/isa.4:1.47	Fri Oct 25 17:39:57 2019
+++ src/share/man/man4/isa.4	Thu Mar 11 16:50:08 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: isa.4,v 1.47 2019/10/25 17:39:57 martin Exp $
+.\"	$NetBSD: isa.4,v 1.48 2021/03/11 16:50:08 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -66,222 +66,212 @@ includes machine-independent
 drivers, sorted by device type and driver name:
 .Ss SCSI interfaces
 .Bl -tag -width pcdisplay -offset indent
-.It adv
+.It Xr adv 4
 Advansys
 .Tn SCSI
 interfaces.
-.It aha
+.It Xr aha 4
 Adaptec AHA-154x family (154xA, 154xB, 154xC, and 154xCF) and the
 BusLogic BT54x
 .Tn SCSI
 interfaces.
-.It ahc
+.It Xr ahc 4
 Adaptec 29xx, 39xx, and other AIC-7xxx-based
 .Tn SCSI
 interfaces.
-.It aic
+.It Xr aic 4
 Adaptec AIC-6260 and Adaptec AIC-6360 based
 .Tn SCSI
 interfaces, including
 the Adaptec 152x, SoundBlaster
 .Tn SCSI
 interfaces, and a variety of compatibles.
-.It bha
+.It Xr bha 4
 BusLogic BT-445
 .Tn SCSI
 interfaces.
-.It dpt
+.It Xr dpt 4
 DPT SmartCache/SmartRAID III and IV
 .Tn SCSI
 interfaces.
-.It esp
+.It Xr esp 4
 NCR 53C9x, Emulex ESP406, and Qlogic FAS408
 .Tn SCSI
 interfaces.
-.It nca
+.It Xr nca 4
 NCR-5380/NCR-53C400
-.It sea
+.It Xr sea 4
 Seagate/Future Domain
 .Tn SCSI
 cards.
 ST01/02, Future Domain TMC-885, and Future Domain TMC-950.
-.It uha
+.It Xr uha 4
 Ultrastor 14f
 .Tn SCSI
 interfaces.
-.It wds
+.It Xr wds 4
 WD-7000 family of bus-mastering
 .Tn SCSI
 interfaces.
 .El
 .Ss Disk and tape controllers
 .Bl -tag -width pcdisplay -offset indent
-.It mcd
+.It Xr mcd 4
 Mitsumi CD-ROM drives.
-.It wdc
+.It Xr wdc 4
 Standard Western Digital type hard drive controllers: MFM, RLL, ESDI,
 and IDE/ATAPI.
-.It wt
+.It Xr wt 4
 Wangtek and compatible QIC-02 and QIC-36 tape drives.
 .El
 .Ss Serial and parallel interfaces
 .Bl -tag -width pcdisplay -offset indent
-.It ast
+.It Xr ast 4
 Multi-port serial communications card first made by AST.
-.It boca
+.It Xr boca 4
 Boca BB100[48] and BB2016 multiplexing serial communications cards.
-.It com
+.It Xr com 4
 NS8250-, NS16450-, and NS16550-based serial ports.
-.It cy
+.It Xr cy 4
 Cyclades Cyclom-4Y, -8Y, and -16Y asynchronous serial communications cards.
 .It ioat
 .Tn BOCA Research
 IOAT66
 serial interfaces.
-.It lpt
+.It Xr lpt 4
 Standard
 .Tn ISA
 parallel port interface.
-.It rtfps
+.It Xr rtfps 4
 IBM RT four-port serial interfaces.
-.It tcom
+.It Xr tcom 4
 Byte Runner Technologies TC-400 and TC-800 series serial interfaces.
 .El
 .Ss Network interfaces
 .Bl -tag -width pcdisplay -offset indent
-.It ai
+.It Xr ai 4
 .Tn AT
 .Tn StarLan
 .Tn Ethernet
 interfaces.
-.It ate
+.It Xr ate 4
 Allied Telesis AT1700 series and RE2000 series
 .Tn Ethernet
 interfaces.
-.It cs
+.It Xr cs 4
 .Tn Cirrus Logic
 Crystal CS8900
 .Tn Ethernet
 interfaces.
-.It ec
+.It Xr ec 4
 3Com EtherLink II (3c503)
 .Tn Ethernet
 interfaces.
-.It ef
+.It Xr ef 4
 .Tn 3Com
 EtherLink II (3c507)
 .Tn Ethernet
 interfaces.
-.It eg
+.It Xr eg 4
 3Com EtherLink Plus (3c505)
 .Tn Ethernet
 interfaces.
-.It el
+.It Xr el 4
 3Com EtherLink (3c501)
 .Tn Ethernet
 interfaces.
-.It ep
+.It Xr ep 4
 3Com EtherLink III (3c509)
 .Tn Ethernet
 interfaces.
-.It fmv
+.It Xr fmv 4
 Fujitsu FMV-181 and FMV-182 interfaces.
-.\".It hp
-.\" Broken driver for HP -relabelled
-.\" .Tn Ethernet
-.\" cards.
-.It ix
+.It Xr ix 4
 Intel EtherExpress/16
 .Tn Ethernet
 interfaces.
-.It iy
+.It Xr iy 4
 Intel i82595-based
 .Tn Ethernet
 interfaces, including the EtherExpress Pro/10.
-.It lc
+.It Xr lc 4
 DEC EtherWORKS III
 .Tn Ethernet
 interfaces (DE203, DE204, and DE205).
-.It le
+.It Xr le 4
 .Tn Ethernet
 interfaces based on the AMD LANCE chip,
 including BICC Isolan, Novell NE2100, Digital DEPCA, and PCnet-ISA.
-.It ne
+.It Xr ne 4
 Novel NE2000 and compatible
 .Tn Ethernet
 interfaces.
-.It ntwoc
+.It Xr ntwoc 4
 SDL Communications Riscom/N2 synchronous serial interfaces.
-.It sm
+.It Xr sm 4
 SMC91C9x-based
 .Tn Ethernet
 interfaces.
-.It tr
-TROPIC based token ring interfaces.
-.It we
+.It Xr we 4
 Western Digital/SMC 80x3, SMC Elite Ultra, and SMC EtherEZ
 .Tn Ethernet
 interfaces.
 .El
 .Ss Sound cards and MIDI interfaces
 .Bl -tag -width pcdisplay -offset indent
-.It aria
+.It Xr aria 4
 Sierra's Aria based sound cards.
-.It cms
+.It Xr cms 4
 Creative Music System.
-.It ess
+.It Xr ess 4
 ESS Technology AudioDrive 1788-, 1888-,

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 16:43:01 UTC 2021

Modified Files:
src/share/man/man4: cardbus.4 pcmcia.4

Log Message:
Reference kernel developer's manual


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/share/man/man4/cardbus.4
cvs rdiff -u -r1.38 -r1.39 src/share/man/man4/pcmcia.4

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

Modified files:

Index: src/share/man/man4/cardbus.4
diff -u src/share/man/man4/cardbus.4:1.39 src/share/man/man4/cardbus.4:1.40
--- src/share/man/man4/cardbus.4:1.39	Thu Mar 11 16:34:12 2021
+++ src/share/man/man4/cardbus.4	Thu Mar 11 16:43:01 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: cardbus.4,v 1.39 2021/03/11 16:34:12 nia Exp $
+.\"	$NetBSD: cardbus.4,v 1.40 2021/03/11 16:43:01 nia Exp $
 .\"
 .\" Copyright (c) 1999-2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -153,7 +153,8 @@ in the kernel configuration might be of 
 .Sh SEE ALSO
 .Xr options 4 ,
 .Xr pci 4 ,
-.Xr pcmcia 4
+.Xr pcmcia 4 ,
+.Xr cardbus 9
 .Sh HISTORY
 The
 .Nm

Index: src/share/man/man4/pcmcia.4
diff -u src/share/man/man4/pcmcia.4:1.38 src/share/man/man4/pcmcia.4:1.39
--- src/share/man/man4/pcmcia.4:1.38	Thu Mar 11 16:39:58 2021
+++ src/share/man/man4/pcmcia.4	Thu Mar 11 16:43:01 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: pcmcia.4,v 1.38 2021/03/11 16:39:58 nia Exp $
+.\" $NetBSD: pcmcia.4,v 1.39 2021/03/11 16:43:01 nia Exp $
 .\"
 .\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -136,7 +136,8 @@ Cypress/ScanLogic SL811HS USB Host Contr
 .Xr isa 4 ,
 .Xr options 4 ,
 .Xr pcic 4 ,
-.Xr tcic 4
+.Xr tcic 4 ,
+.Xr pcmcia 9
 .Sh HISTORY
 The
 .Nm

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 16:39:58 UTC 2021

Modified Files:
src/share/man/man4: pcmcia.4

Log Message:
Use inline cross-references.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/share/man/man4/pcmcia.4

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

Modified files:

Index: src/share/man/man4/pcmcia.4
diff -u src/share/man/man4/pcmcia.4:1.37 src/share/man/man4/pcmcia.4:1.38
--- src/share/man/man4/pcmcia.4:1.37	Tue Mar 13 19:25:41 2012
+++ src/share/man/man4/pcmcia.4	Thu Mar 11 16:39:58 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: pcmcia.4,v 1.37 2012/03/13 19:25:41 njoly Exp $
+.\" $NetBSD: pcmcia.4,v 1.38 2021/03/11 16:39:58 nia Exp $
 .\"
 .\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -69,93 +69,74 @@ includes the following machine-independe
 .Tn PCMCIA
 drivers, sorted by function and driver name:
 .Ss Serial interfaces and modems
-.Bl -tag -width speaker -offset indent
-.It com
+.Bl -tag -width speaker(4) -offset indent
+.It Xr com 4
 8250/16450/16550-compatible PCMCIA serial cards and modems.
 .El
 .Ss Network interfaces
-.Bl -tag -width speaker -offset indent
-.It an
+.Bl -tag -width speaker(4) -offset indent
+.It Xr an 4
 Aironet 4500/4800 and Cisco 340 series 802.11 controller.
-.It awi
+.It Xr awi 4
 802.11 controller based on the AMD PCnetMobile chipset.
-.It cnw
+.It Xr cnw 4
 Netwave AirSurfer Wireless LAN interface.
-.It ep
+.It Xr ep 4
 3Com 3c589 EtherLink III Ethernet card.
-.It mbe
+.It Xr mbe 4
 Ethernet card based on the Fujitsu MB86960A/MB86965A chipset.
-.It mhzc
+.It Xr mhzc 4
 Megahertz Ethernet/Modem combo cards
-.It ne
+.It Xr ne 4
 NE2000 compatible cards.
-.It ray
+.It Xr ray 4
 Raytheon Raylink and WebGear Aviator2.4 802.11 controller.
-.It sm
+.It Xr sm 4
 Megahertz Ethernet card.
-.It wi
+.It Xr wi 4
 Lucent WaveLAN/IEEE and PRISM-II based 802.11 controller.
-.It xi
+.It Xr xi 4
 Xircom CreditCard Ethernet
 .El
 .Ss SCSI controllers
-.Bl -tag -width speaker -offset indent
-.It aic
+.Bl -tag -width speaker(4) -offset indent
+.It Xr aic 4
 Adaptec APA-1460
 .Tn SCSI
 controller card.
-.It esp
+.It Xr esp 4
 NCR 53C9x, Emulex ESP406, and Qlogic FAS408
 .Tn SCSI
 controllers.
-.It spc
+.It Xr spc 4
 Fujitsu MB87030/MB89352
 .Tn SCSI
 controllers.
 .El
 .Ss IDE controllers
-.Bl -tag -width speaker -offset indent
-.It wdc
+.Bl -tag -width speaker(4) -offset indent
+.It Xr wdc 4
 Digital Hinote Ultra Mobile Media Adapter
 .El
 .Ss Bluetooth devices
-.Bl -tag -width speaker -offset indent
-.It bt3c
+.Bl -tag -width speaker(4) -offset indent
+.It Xr bt3c 4
 3Com 3CRWB6096 Bluetooth PC Card driver.
-.It btbc
+.It Xr btbc 4
 AnyCom Bluetooth BlueCard driver.
 .El
 .Ss USB Controller
-.Bl -tag -width speaker -offset indent
-.It slhci
+.Bl -tag -width speaker(4) -offset indent
+.It Xr slhci 4
 Cypress/ScanLogic SL811HS USB Host Controller driver.
 .El
 .Sh SEE ALSO
-.Xr aic 4 ,
-.Xr an 4 ,
-.Xr awi 4 ,
-.Xr bt3c 4 ,
-.Xr btbc 4 ,
 .Xr cardbus 4 ,
-.Xr cnw 4 ,
-.Xr com 4 ,
-.Xr ep 4 ,
-.Xr esp 4 ,
 .Xr intro 4 ,
 .Xr isa 4 ,
-.Xr mbe 4 ,
-.Xr mhzc 4 ,
-.Xr ne 4 ,
 .Xr options 4 ,
 .Xr pcic 4 ,
-.Xr pcmcom 4 ,
-.Xr ray 4 ,
-.Xr slhci 4 ,
-.Xr sm 4 ,
-.Xr spc 4 ,
-.Xr tcic 4 ,
-.Xr wi 4 ,
-.Xr xi 4
+.Xr tcic 4
 .Sh HISTORY
 The
 .Nm

CVS commit: src/lib/libc/regex

2021-03-11 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 11 16:36:41 UTC 2021

Modified Files:
src/lib/libc/regex: regex.3

Log Message:
improve wording.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/regex/regex.3

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

Modified files:

Index: src/lib/libc/regex/regex.3
diff -u src/lib/libc/regex/regex.3:1.29 src/lib/libc/regex/regex.3:1.30
--- src/lib/libc/regex/regex.3:1.29	Thu Mar 11 10:12:51 2021
+++ src/lib/libc/regex/regex.3	Thu Mar 11 11:36:41 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: regex.3,v 1.29 2021/03/11 15:12:51 christos Exp $
+.\" $NetBSD: regex.3,v 1.30 2021/03/11 16:36:41 christos Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994 Henry Spencer.
 .\" Copyright (c) 1992, 1993, 1994
@@ -200,8 +200,10 @@ Use backreference
 .Dv N
 where
 .Dv N
-is between
-.Dv [1-9] .
+is a single digit number between 
+.Dv 1 
+and 
+.Dv 9 .
 .It \ea
 Visual Bell
 .It \eb
@@ -227,9 +229,9 @@ Alias for [[:alnum:]]
 .It \eW
 Alias for [^[:alnum:]]
 .It \e'
-Matches the end of the subject.
+Matches the end of the subject string (the string to be matched).
 .It \e`
-Matches the beginning of the subject.
+Matches the beginning of the subject string.
 .El
 .Pp
 This is an extension,

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 16:34:12 UTC 2021

Modified Files:
src/share/man/man4: cardbus.4

Log Message:
Use inline references.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/share/man/man4/cardbus.4

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

Modified files:

Index: src/share/man/man4/cardbus.4
diff -u src/share/man/man4/cardbus.4:1.38 src/share/man/man4/cardbus.4:1.39
--- src/share/man/man4/cardbus.4:1.38	Wed Dec 31 18:19:21 2014
+++ src/share/man/man4/cardbus.4	Thu Mar 11 16:34:12 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: cardbus.4,v 1.38 2014/12/31 18:19:21 wiz Exp $
+.\"	$NetBSD: cardbus.4,v 1.39 2021/03/11 16:34:12 nia Exp $
 .\"
 .\" Copyright (c) 1999-2006 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -65,66 +65,66 @@ devices, respectively.
 includes the following machine-independent CardBus
 drivers, sorted by function and driver name:
 .Ss Network interfaces
-.Bl -tag -width speaker -offset indent -compact
-.It ath
+.Bl -tag -width siisata(4) -offset indent -compact
+.It Xr ath 4
 Atheros 5210/5211/5212 802.11
-.It atw
+.It Xr atw 4
 ADMtek ADM8211 (802.11)
-.It bwi
+.It Xr bwi 4
 Broadcom BCM430x/4318 (802.11)
-.It ex
+.It Xr ex 4
 3Com 3c575TX and 3c575BTX
-.It fxp
+.It Xr fxp 4
 Intel i8255x
-.It ral
+.It Xr ral 4
 Ralink Technology RT25x0 (802.11)
-.It re
+.It Xr re 4
 RealTek 8139C+/8169/8169S/8110S
-.It rtk
+.It Xr rtk 4
 Realtek 8129/8139
-.It rtw
+.It Xr rtw 4
 Realtek 8180L (802.11)
-.It tlp
+.It Xr tlp 4
 DECchip 21143
 .El
 .Ss Serial interfaces
-.Bl -tag -width speaker -offset indent -compact
-.It com
+.Bl -tag -width siisata(4) -offset indent -compact
+.It Xr com 4
 Modems and serial cards
 .El
 .Ss SCSI controllers
-.Bl -tag -width speaker -offset indent -compact
-.It adv
+.Bl -tag -width siisata(4) -offset indent -compact
+.It Xr adv 4
 AdvanSys 1200[A,B], 9xx[U,UA]
-.It ahc
+.It Xr ahc 4
 Adaptec ADP-1480
-.It njs
+.It Xr njs 4
 Workbit NinjaSCSI-32
 .El
 .Ss USB controllers
-.Bl -tag -width speaker -offset indent -compact
-.It ehci
+.Bl -tag -width siisata(4) -offset indent -compact
+.It Xr ehci 4
 Enhanced Host Controller (2.0)
-.It ohci
+.It Xr ohci 4
 Open Host Controller
-.It uhci
+.It Xr uhci 4
 Universal Host Controller
 .El
 .Ss IEEE1394 controllers
-.Bl -tag -width speaker -offset indent -compact
-.It fwohci
+.Bl -tag -width siisata(4) -offset indent -compact
+.It Xr fwohci 4
 OHCI controller
 .El
 .Ss SD/MMC/SDIO controllers
-.Bl -tag -width speaker -offset indent -compact
-.It sdhc
+.Bl -tag -width siisata(4) -offset indent -compact
+.It Xr sdhc 4
 SD Host Controller
 .El
 .Ss Disk and tape controllers
-.Bl -tag -width speaker -offset indent -compact
-.It njata
+.Bl -tag -width siisata(4) -offset indent -compact
+.It Xr njata 4
 Workbit NinjaATA-32
-.It siisata
+.It Xr siisata 4
 Silicon Image SATA-II controllers
 .El
 .Sh DIAGNOSTICS
@@ -151,30 +151,9 @@ or (if ACPI is in use)
 .El
 in the kernel configuration might be of use.
 .Sh SEE ALSO
-.Xr adv 4 ,
-.Xr ahc 4 ,
-.Xr ath 4 ,
-.Xr atw 4 ,
-.Xr bwi 4 ,
-.Xr com 4 ,
-.Xr ehci 4 ,
-.Xr ex 4 ,
-.Xr fwohci 4 ,
-.Xr fxp 4 ,
-.Xr njata 4 ,
-.Xr njs 4 ,
-.Xr ohci 4 ,
 .Xr options 4 ,
 .Xr pci 4 ,
-.Xr pcmcia 4 ,
-.Xr ral 4 ,
-.Xr re 4 ,
-.Xr rtk 4 ,
-.Xr rtw 4 ,
-.Xr sdhc 4 ,
-.Xr siisata 4 ,
-.Xr tlp 4 ,
-.Xr uhci 4
+.Xr pcmcia 4
 .Sh HISTORY
 The
 .Nm

CVS commit: [netbsd-8] src/doc

2021-03-11 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Thu Mar 11 16:17:46 UTC 2021

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Ticket #1663


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.78 -r1.1.2.79 src/doc/CHANGES-8.3

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-8.3
diff -u src/doc/CHANGES-8.3:1.1.2.78 src/doc/CHANGES-8.3:1.1.2.79
--- src/doc/CHANGES-8.3:1.1.2.78	Tue Mar  9 16:00:14 2021
+++ src/doc/CHANGES-8.3	Thu Mar 11 16:17:46 2021
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.3,v 1.1.2.78 2021/03/09 16:00:14 martin Exp $
+# $NetBSD: CHANGES-8.3,v 1.1.2.79 2021/03/11 16:17:46 martin Exp $
 
 A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
 release:
@@ -1771,3 +1771,28 @@ sys/netinet/tcp_timer.c1.96
 	Avoid information disclosure.
 	[christos, ticket #1662]
 
+sys/dev/pci/ixgbe/ixgbe.c			1.259, 1.278-1.279
+sys/dev/pci/ixgbe/ixgbe.h			1.75
+sys/dev/pci/ixgbe/ixgbe_netbsd.h		1.12
+sys/dev/pci/ixgbe/ixgbe_vf.c			1.24-1.26
+sys/dev/pci/ixgbe/ixgbe_x550.c			1.17
+sys/dev/pci/ixgbe/ixv.c1.155-1.156
+sys/dev/pci/ixgbe/ix_txrx.c			1.64-67
+sys/dev/pci/files.pci1.436
+share/man/man4/ixg.41.13-1.14
+share/man/man4/ixv.41.3, 1.6-1.7
+
+	- Fix a problem that the RX path stalled when the mbuf cluster is
+	  exhausted.
+	- Modify some parameters to reduce packet dropping. See also the
+	  manual's OPTIONS section for the detail.
+	- ixv(4): The max number of queue(pair) is not 7 but 8. Correctly
+	  reset the hardware.
+	- Add "TX " to "Queue No Descriptor Available" evcnt(9) name to make
+	  it more understandable.
+	- Fix a bug that some advertise speeds can't be set with
+	  hw.ixgN.advertise_speed if both 2.5G and 5G are set. Fix the error
+	  message, too.
+	- Fix typo in comment or debug message.
+	[msaitoh, ticket #1663]
+

CVS commit: [netbsd-9] src/doc

2021-03-11 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Thu Mar 11 16:17:14 UTC 2021

Modified Files:
src/doc [netbsd-9]: CHANGES-9.2

Log Message:
Ticket #1231


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.57 -r1.1.2.58 src/doc/CHANGES-9.2

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

Modified files:

Index: src/doc/CHANGES-9.2
diff -u src/doc/CHANGES-9.2:1.1.2.57 src/doc/CHANGES-9.2:1.1.2.58
--- src/doc/CHANGES-9.2:1.1.2.57	Tue Mar  9 16:02:45 2021
+++ src/doc/CHANGES-9.2	Thu Mar 11 16:17:14 2021
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.2,v 1.1.2.57 2021/03/09 16:02:45 martin Exp $
+# $NetBSD: CHANGES-9.2,v 1.1.2.58 2021/03/11 16:17:14 martin Exp $
 
 A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2
 release:
@@ -1834,3 +1834,28 @@ etc/rc.d/mountall1.15
 	/etc/rc.conf.d/zfs, not /etc/rc.conf.
 	[sborrill, ticket #1230]
 
+sys/dev/pci/ixgbe/ixgbe.c			1.259, 1.278-1.279
+sys/dev/pci/ixgbe/ixgbe.h			1.75
+sys/dev/pci/ixgbe/ixgbe_netbsd.h		1.12
+sys/dev/pci/ixgbe/ixgbe_vf.c			1.24-1.26
+sys/dev/pci/ixgbe/ixgbe_x550.c			1.17
+sys/dev/pci/ixgbe/ixv.c1.155-1.156
+sys/dev/pci/ixgbe/ix_txrx.c			1.64-67
+sys/dev/pci/files.pci1.436
+share/man/man4/ixg.41.13-1.14
+share/man/man4/ixv.41.6-1.7
+
+	- Fix a problem that the RX path stalled when the mbuf cluster is
+	  exhausted.
+	- Modify some parameters to reduce packet dropping. See also the
+	  manual's OPTIONS section for the detail.
+	- ixv(4): The max number of queue(pair) is not 7 but 8. Correctly
+	  reset the hardware.
+	- Add "TX " to "Queue No Descriptor Available" evcnt(9) name to make
+	  it more understandable.
+	- Fix a bug that some advertise speeds can't be set with
+	  hw.ixgN.advertise_speed if both 2.5G and 5G are set. Fix the error
+	  message, too.
+	- Fix typo in comment or debug message.
+	[msaitoh, ticket #1231]
+

CVS commit: [netbsd-8] src

2021-03-11 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Thu Mar 11 16:04:25 UTC 2021

Modified Files:
src/share/man/man4 [netbsd-8]: ixg.4 ixv.4
src/sys/dev/pci [netbsd-8]: files.pci
src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_netbsd.h ixgbe_vf.c ixgbe_x540.c ixv.c

Log Message:
Pull up the following (all via patch), requested by msaitoh in ticket #1663:

sys/dev/pci/ixgbe/ixgbe.c   1.259, 1.278-1.279
sys/dev/pci/ixgbe/ixgbe.h   1.75
sys/dev/pci/ixgbe/ixgbe_netbsd.h1.12
sys/dev/pci/ixgbe/ixgbe_vf.c1.24-1.26
sys/dev/pci/ixgbe/ixgbe_x550.c  1.17
sys/dev/pci/ixgbe/ixv.c 1.155-1.156
sys/dev/pci/ixgbe/ix_txrx.c 1.64-67
sys/dev/pci/files.pci   1.436
share/man/man4/ixg.41.13-1.14
share/man/man4/ixv.41.3, 1.6-1.7

- Fix a problem that the RX path stalled when the mbuf cluster is
  exhausted.
- Modify some parameters to reduce packet dropping. See also the
  manual's OPTIONS section for the detail.
- ixv(4): The max number of queue(pair) is not 7 but 8. Correctly
  reset the hardware.
- Add "TX " to "Queue No Descriptor Available" evcnt(9) name to make
  it more understandable.
- Fix a bug that some advertise speeds can't be set with
  hw.ixgN.advertise_speed if both 2.5G and 5G are set. Fix the error
  message, too.
- Fix typo in comment or debug message.


To generate a diff of this commit:
cvs rdiff -u -r1.10.4.1 -r1.10.4.2 src/share/man/man4/ixg.4
cvs rdiff -u -r1.3.2.3 -r1.3.2.4 src/share/man/man4/ixv.4
cvs rdiff -u -r1.388.4.4 -r1.388.4.5 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.24.2.20 -r1.24.2.21 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.88.2.42 -r1.88.2.43 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.24.6.20 -r1.24.6.21 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.7.6.2 -r1.7.6.3 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
cvs rdiff -u -r1.12.8.5 -r1.12.8.6 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.9.6.4 -r1.9.6.5 src/sys/dev/pci/ixgbe/ixgbe_x540.c
cvs rdiff -u -r1.56.2.30 -r1.56.2.31 src/sys/dev/pci/ixgbe/ixv.c

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/ixg.4
diff -u src/share/man/man4/ixg.4:1.10.4.1 src/share/man/man4/ixg.4:1.10.4.2
--- src/share/man/man4/ixg.4:1.10.4.1	Sat May 12 10:35:45 2018
+++ src/share/man/man4/ixg.4	Thu Mar 11 16:04:25 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: ixg.4,v 1.10.4.1 2018/05/12 10:35:45 martin Exp $
+.\" $NetBSD: ixg.4,v 1.10.4.2 2021/03/11 16:04:25 martin Exp $
 .\"
 .\" Copyright (c) 2001-2008, Intel Corporation
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/ixgbe.4,v 1.3 2010/12/19 23:54:31 yongari Exp $
 .\"
-.Dd May 9, 2018
+.Dd March 9, 2021
 .Dt IXG 4
 .Os
 .Sh NAME
@@ -83,6 +83,26 @@ go to the Intel support website at:
 .\" with a supported adapter, email the specific information related to the
 .\" issue to
 .\" .Aq freebsd...@mailbox.intel.com .
+.Sh OPTIONS
+The
+.Nm
+driver doesn't use the common
+.Xr MCLGET 9
+interface and use the driver specific cluster allocation mechanism.
+If it's exhausted, the
+.Xr evcnt 9
+counter "ixgX qY Rx no jumbo mbuf" is incremented.
+If this is observed,
+the number can be changed by the following config parameter:
+.Bl -tag -width IXGBE_JCLNUM_MULTI -offset 3n
+.It Dv IXGBE_JCLNUM_MULTI
+The number of RX jumbo buffers (clusters) per queue is calculated by
+.Dv IXGBE_JCLNUM_MULTI
+* (number of rx descriptors).
+The total number of clusters per queue is available via the
+.Li hw.ixgN.num_jcl_per_queue
+.Xr sysctl 7 .
+.El
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ixv 4 ,

Index: src/share/man/man4/ixv.4
diff -u src/share/man/man4/ixv.4:1.3.2.3 src/share/man/man4/ixv.4:1.3.2.4
--- src/share/man/man4/ixv.4:1.3.2.3	Thu Sep 26 18:19:27 2019
+++ src/share/man/man4/ixv.4	Thu Mar 11 16:04:25 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ixv.4,v 1.3.2.3 2019/09/26 18:19:27 martin Exp $
+.\"	$NetBSD: ixv.4,v 1.3.2.4 2021/03/11 16:04:25 martin Exp $
 .\"
 .\" Copyright (c) 2018 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,20 +27,42 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 5, 2019
+.Dd March 9, 2021
 .Dt IXV 4
 .Os
 .Sh NAME
 .Nm ixv
-.Nd Intel 10 giabit Ethernet virtual function
+.Nd Intel 10 Gigabit Ethernet virtual function
 .Sh SYNOPSIS
 .Cd "ixv* at pci? dev ? function ?"
 .Sh DESCRIPTION
 The
 .Nm
-driver supports Intel 10 gigabit Ethernet virtual function that 82599 and
+driver supports Intel 10 Gigabit Ethernet virtual function that 82599 and
 newer chips support.
-It can be used on a NetBSD guest that the host supports SR-IOV.
+It can be

CVS commit: [netbsd-9] src

2021-03-11 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Thu Mar 11 16:00:25 UTC 2021

Modified Files:
src/share/man/man4 [netbsd-9]: ixg.4 ixv.4
src/sys/dev/pci [netbsd-9]: files.pci
src/sys/dev/pci/ixgbe [netbsd-9]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_netbsd.h ixgbe_vf.c ixgbe_x540.c ixv.c

Log Message:
Pull up the following (all via patch) requested by msaitoh in ticket #1231:

sys/dev/pci/ixgbe/ixgbe.c   1.259, 1.278-1.279
sys/dev/pci/ixgbe/ixgbe.h   1.75
sys/dev/pci/ixgbe/ixgbe_netbsd.h1.12
sys/dev/pci/ixgbe/ixgbe_vf.c1.24-1.26
sys/dev/pci/ixgbe/ixgbe_x550.c  1.17
sys/dev/pci/ixgbe/ixv.c 1.155-1.156
sys/dev/pci/ixgbe/ix_txrx.c 1.64-67
sys/dev/pci/files.pci   1.436
share/man/man4/ixg.41.13-1.14
share/man/man4/ixv.41.6-1.7

- Fix a problem that the RX path stalled when the mbuf cluster is
  exhausted.
- Modify some parameters to reduce packet dropping. See also the
  manual's OPTIONS section for the detail.
- ixv(4): The max number of queue(pair) is not 7 but 8. Correctly
  reset the hardware.
- Add "TX " to "Queue No Descriptor Available" evcnt(9) name to make
  it more understandable.
- Fix a bug that some advertise speeds can't be set with
  hw.ixgN.advertise_speed if both 2.5G and 5G are set. Fix the error
  message, too.
- Fix typo in comment or debug message.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.4.1 src/share/man/man4/ixg.4
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/share/man/man4/ixv.4
cvs rdiff -u -r1.413.2.2 -r1.413.2.3 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.54.2.4 -r1.54.2.5 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.199.2.12 -r1.199.2.13 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.56.2.3 -r1.56.2.4 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.11 -r1.11.4.1 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
cvs rdiff -u -r1.18.2.2 -r1.18.2.3 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.16 -r1.16.8.1 src/sys/dev/pci/ixgbe/ixgbe_x540.c
cvs rdiff -u -r1.125.2.10 -r1.125.2.11 src/sys/dev/pci/ixgbe/ixv.c

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/ixg.4
diff -u src/share/man/man4/ixg.4:1.12 src/share/man/man4/ixg.4:1.12.4.1
--- src/share/man/man4/ixg.4:1.12	Wed May  9 08:01:16 2018
+++ src/share/man/man4/ixg.4	Thu Mar 11 16:00:24 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: ixg.4,v 1.12 2018/05/09 08:01:16 wiz Exp $
+.\" $NetBSD: ixg.4,v 1.12.4.1 2021/03/11 16:00:24 martin Exp $
 .\"
 .\" Copyright (c) 2001-2008, Intel Corporation
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/ixgbe.4,v 1.3 2010/12/19 23:54:31 yongari Exp $
 .\"
-.Dd May 9, 2018
+.Dd March 9, 2021
 .Dt IXG 4
 .Os
 .Sh NAME
@@ -83,6 +83,26 @@ go to the Intel support website at:
 .\" with a supported adapter, email the specific information related to the
 .\" issue to
 .\" .Aq freebsd...@mailbox.intel.com .
+.Sh OPTIONS
+The
+.Nm
+driver doesn't use the common
+.Xr MCLGET 9
+interface and use the driver specific cluster allocation mechanism.
+If it's exhausted, the
+.Xr evcnt 9
+counter "ixgX qY Rx no jumbo mbuf" is incremented.
+If this is observed,
+the number can be changed by the following config parameter:
+.Bl -tag -width IXGBE_JCLNUM_MULTI -offset 3n
+.It Dv IXGBE_JCLNUM_MULTI
+The number of RX jumbo buffers (clusters) per queue is calculated by
+.Dv IXGBE_JCLNUM_MULTI
+* (number of rx descriptors).
+The total number of clusters per queue is available via the
+.Li hw.ixgN.num_jcl_per_queue
+.Xr sysctl 7 .
+.El
 .Sh SEE ALSO
 .Xr arp 4 ,
 .Xr ixv 4 ,

Index: src/share/man/man4/ixv.4
diff -u src/share/man/man4/ixv.4:1.4.2.1 src/share/man/man4/ixv.4:1.4.2.2
--- src/share/man/man4/ixv.4:1.4.2.1	Thu Sep 26 19:07:23 2019
+++ src/share/man/man4/ixv.4	Thu Mar 11 16:00:24 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ixv.4,v 1.4.2.1 2019/09/26 19:07:23 martin Exp $
+.\"	$NetBSD: ixv.4,v 1.4.2.2 2021/03/11 16:00:24 martin Exp $
 .\"
 .\" Copyright (c) 2018 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 September 5, 2019
+.Dd March 9, 2021
 .Dt IXV 4
 .Os
 .Sh NAME
@@ -43,6 +43,26 @@ newer chips support.
 It can be used on a
 .Nx
 guest that the host supports SR-IOV.
+.Sh OPTIONS
+The
+.Nm
+driver doesn't use the common
+.Xr MCLGET 9
+interface and use the driver specific cluster allocation mechanism.
+If it's exhausted, the
+.Xr evcnt 9
+counter "ixgX qY Rx no jumbo mbuf" is incremented.
+If this is observed,
+the number can be changed by the following config parameter:
+.Bl -tag -width IXGBE_JCLNUM_MULTI -offset 3n

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 15:46:03 UTC 2021

Modified Files:
src/share/man/man4: spi.4

Log Message:
Use inline cross-references.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/spi.4

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

Modified files:

Index: src/share/man/man4/spi.4
diff -u src/share/man/man4/spi.4:1.10 src/share/man/man4/spi.4:1.11
--- src/share/man/man4/spi.4:1.10	Sat Feb 27 09:54:59 2021
+++ src/share/man/man4/spi.4	Thu Mar 11 15:46:03 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: spi.4,v 1.10 2021/02/27 09:54:59 nia Exp $
+.\"	$NetBSD: spi.4,v 1.11 2021/03/11 15:46:03 nia Exp $
 .\"
 .\" Copyright (c) 2006 Urbana-Champaign Independent Media Center.
 .\" Copyright (c) 2006 Garrett D'Amore.
@@ -130,18 +130,18 @@ typedef struct spi_ioctl_transfer {
 includes the following machine-independent
 .Tn SPI
 drivers:
-.Bl -tag -width pcdisplay -offset indent
-.It m25p
+.Bl -tag -width mcp23s17gpio(4) -offset indent
+.It Xr m25p 4
 STMicroelectronics M25P family of NOR flash devices.
-.It mcp23s17gpio
+.It Xr mcp23s17gpio 4
 Microchip MCP23S17 16-bit GPIO chip.
-.It mcp3kadc
+.It Xr mcp3kadc 4
 Microchip MCP3x0x SAR analog to digital converter.
-.It mcp48x1dac
+.It Xr mcp48x1dac 4
 Microchip MCP4801/MCP4811/MCP4821 digital to analog converter.
-.It tm121temp
+.It Xr tm121temp 4
 Texas Instruments TMP121 temperature sensor.
-.It ssdfb
+.It Xr ssdfb 4
 OLED/PLED framebuffer modules.
 .El
 .Sh FILES
@@ -152,12 +152,6 @@ SPI device unit
 file.
 .El
 .Sh SEE ALSO
-.Xr m25p 4 ,
-.Xr mcp23s17gpio 4 ,
-.Xr mcp3kadc 4 ,
-.Xr mcp48x1dac 4 ,
-.Xr ssdfb 4 ,
-.Xr tm121temp 4 ,
 .Xr spi 9
 .Sh HISTORY
 The machine-independent

CVS commit: src/usr.bin/sed

2021-03-11 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 11 15:45:55 UTC 2021

Modified Files:
src/usr.bin/sed: main.c sed.1

Log Message:
Use the same options like m4 (-g turns on GNU, -G turns off GNU) Suggested
by uwe@


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.bin/sed/main.c
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/sed/sed.1

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

Modified files:

Index: src/usr.bin/sed/main.c
diff -u src/usr.bin/sed/main.c:1.37 src/usr.bin/sed/main.c:1.38
--- src/usr.bin/sed/main.c:1.37	Thu Mar 11 10:15:05 2021
+++ src/usr.bin/sed/main.c	Thu Mar 11 10:45:55 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.37 2021/03/11 15:15:05 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.38 2021/03/11 15:45:55 christos Exp $	*/
 
 /*-
  * Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
@@ -39,7 +39,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: main.c,v 1.37 2021/03/11 15:15:05 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.38 2021/03/11 15:45:55 christos Exp $");
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/usr.bin/sed/main.c 252231 2013-06-26 04:14:19Z pfg $");
 #endif
@@ -141,14 +141,14 @@ main(int argc, char *argv[])
 	fflag = 0;
 	inplace = NULL;
 
-	while ((c = getopt(argc, argv, "EGI::ae:f:i::lnru")) != -1)
+	while ((c = getopt(argc, argv, "EGI::ae:f:gi::lnru")) != -1)
 		switch (c) {
 		case 'r':		/* Gnu sed compat */
 		case 'E':
 			rflags |= REG_EXTENDED;
 			break;
 		case 'G':
-			rflags |= REG_GNU;
+			rflags &= ~REG_GNU;
 			break;
 		case 'I':
 			inplace = optarg ? optarg : __UNCONST("");
@@ -168,6 +168,9 @@ main(int argc, char *argv[])
 			fflag = 1;
 			add_compunit(CU_FILE, optarg);
 			break;
+		case 'g':
+			rflags |= REG_GNU;
+			break;
 		case 'i':
 			inplace = optarg ? optarg : __UNCONST("");
 			ispan = 0;	/* don't span across input files */
@@ -226,8 +229,8 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr,
-	"Usage:  %s [-aElnru] command [file ...]\n"
-	"\t%s [-aEGlnru] [-e command] [-f command_file] [-I[extension]]\n"
+	"Usage:  %s [-aEGglnru] command [file ...]\n"
+	"\t%s [-aEGglnru] [-e command] [-f command_file] [-I[extension]]\n"
 	"\t[-i[extension]] [file ...]\n", getprogname(), getprogname());
 	exit(1);
 }

Index: src/usr.bin/sed/sed.1
diff -u src/usr.bin/sed/sed.1:1.41 src/usr.bin/sed/sed.1:1.42
--- src/usr.bin/sed/sed.1:1.41	Thu Mar 11 10:15:05 2021
+++ src/usr.bin/sed/sed.1	Thu Mar 11 10:45:55 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sed.1,v 1.41 2021/03/11 15:15:05 christos Exp $
+.\"	$NetBSD: sed.1,v 1.42 2021/03/11 15:45:55 christos Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -40,11 +40,11 @@
 .Nd stream editor
 .Sh SYNOPSIS
 .Nm
-.Op Fl aElnru
+.Op Fl aEGglnru
 .Ar command
 .Op Ar
 .Nm
-.Op Fl aEGlnru
+.Op Fl aEGglnru
 .Op Fl e Ar command
 .Op Fl f Ar command_file
 .Op Fl I Ns Op Ar extension
@@ -98,7 +98,9 @@ Append the editing commands found in the
 to the list of commands.
 The editing commands should each be listed on a separate line.
 .It Fl G
-Support GNU regex extensions.
+Turn off GNU regex extensions (the default).
+.It Fl g
+Turn on GNU regex extensions.
 See 
 .Xr regex 3
 for details.

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 15:44:50 UTC 2021

Modified Files:
src/share/man/man4: pci.4

Log Message:
cross-reference pci(9)


To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/share/man/man4/pci.4

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

Modified files:

Index: src/share/man/man4/pci.4
diff -u src/share/man/man4/pci.4:1.113 src/share/man/man4/pci.4:1.114
--- src/share/man/man4/pci.4:1.113	Thu Mar 11 15:41:32 2021
+++ src/share/man/man4/pci.4	Thu Mar 11 15:44:50 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pci.4,v 1.113 2021/03/11 15:41:32 nia Exp $
+.\"	$NetBSD: pci.4,v 1.114 2021/03/11 15:44:50 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -361,7 +361,8 @@ USB XHCI host controllers.
 .El
 .Sh SEE ALSO
 .Xr agp 4 ,
-.Xr intro 4
+.Xr intro 4 ,
+.Xr pci 9
 .Sh HISTORY
 The machine-independent PCI subsystem appeared in
 .Nx 1.2 .

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 15:41:32 UTC 2021

Modified Files:
src/share/man/man4: pci.4

Log Message:
Be less redundant in the DESCRIPTION


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/share/man/man4/pci.4

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

Modified files:

Index: src/share/man/man4/pci.4
diff -u src/share/man/man4/pci.4:1.112 src/share/man/man4/pci.4:1.113
--- src/share/man/man4/pci.4:1.112	Thu Mar 11 15:40:02 2021
+++ src/share/man/man4/pci.4	Thu Mar 11 15:41:32 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pci.4,v 1.112 2021/03/11 15:40:02 nia Exp $
+.\"	$NetBSD: pci.4,v 1.113 2021/03/11 15:41:32 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -46,19 +46,11 @@
 .Cd options PCI_BUS_FIXUP
 .Cd options PCI_INTR_FIXUP
 .Sh DESCRIPTION
-Other
-.Nm
-attachments are machine-dependent and depend on the bus topology and
-PCI bus interface of your system.
-See
-.Xr intro 4
-for your system for details.
-.Pp
 .Nx
 includes a machine-independent PCI bus subsystem and several
 machine-independent PCI device drivers.
 .Pp
-Your system may support additional PCI devices.
+Your system may support additional PCI devices and attachments.
 Drivers for PCI devices not listed here are machine-dependent.
 Consult your system's
 .Xr intro 4

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 15:40:02 UTC 2021

Modified Files:
src/share/man/man4: pci.4

Log Message:
Put cross-references in a useful place, copying usb(4)

Caught a few drivers in the list that no longer exist this way.


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/share/man/man4/pci.4

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

Modified files:

Index: src/share/man/man4/pci.4
diff -u src/share/man/man4/pci.4:1.111 src/share/man/man4/pci.4:1.112
--- src/share/man/man4/pci.4:1.111	Thu Mar 11 15:27:40 2021
+++ src/share/man/man4/pci.4	Thu Mar 11 15:40:02 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pci.4,v 1.111 2021/03/11 15:27:40 nia Exp $
+.\"	$NetBSD: pci.4,v 1.112 2021/03/11 15:40:02 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -126,237 +126,231 @@ option leaves the interrupt as is.
 .Nx
 includes machine-independent PCI drivers, sorted by device type and driver name:
 .Ss SCSI interfaces
-.Bl -tag -width pcdisplay -offset indent
-.It ahc
+.Bl -tag -width pcdisplay(4) -offset indent
+.It Xr ahc 4
 Adaptec 29xx, 39xx, and other AIC-7xxx-based SCSI
 interfaces.
-.It adv
+.It Xr adv 4
 Advansys SCSI interfaces.
-.It adw
+.It Xr adw 4
 Advansys Ultra Wide SCSI interfaces.
-.It bha
+.It Xr bha 4
 Buslogic BT-9xx SCSI interfaces.
-.It dpt
+.It Xr dpt 4
 DPT SmartCache/SmartRAID III and IV SCSI interfaces.
-.It iha
+.It Xr iha 4
 Initio INIC-940/950 SCSI interfaces.
-.It isp
+.It Xr isp 4
 QLogic ISP-1020, ISP-1040, and ISP-2100 SCSI and FibreChannel interfaces.
-.It mfi
+.It Xr mfi 4
 LSI Logic & Dell MegaRAID SAS RAID controllers.
-.It mly
+.It Xr mly 4
 Mylex AcceleRAID and eXtremeRAID controllers with v6 firmware.
-.It nca
+.It Xr nca 4
 Domex 536 SCSI interfaces.
-.It pcscp
+.It Xr pcscp 4
 Advanced Micro Devices Am53c974 PCscsi-PCI SCSI interfaces.
-.It siop
+.It Xr siop 4
 Symbios Logic/NCR 53c8xx-family SCSI interfaces.
-.It trm
+.It Xr trm 4
 Tekram TRM-S1040 ASIC based SCSI interfaces.
 .El
 .Ss Disk and tape controllers
-.Bl -tag -width pcdisplay -offset indent
-.It aac
+.Bl -tag -width pcdisplay(4) -offset indent
+.It Xr aac 4
 The Adaptec AAC family of RAID controllers.
-.It ahcisata
+.It Xr ahcisata 4
 AHCI 1.0 and 1.1 compliant SATA controllers.
-.It amr
+.It Xr amr 4
 The AMI and LSI Logic MegaRAID family of RAID controllers.
-.It cac
+.It Xr cac 4
 Compaq array controllers.
-.It icp
+.It Xr icp 4
 ICP Vortex GDT and Intel Storage RAID controllers.
-.It mlx
+.It Xr mlx 4
 Mylex DAC960 and DEC SWXCR RAID controllers.
-.It nvme
+.It Xr nvme 4
 Non-Volatile Memory (NVM Express) host controllers.
-.It pciide
+.It Xr pciide 4
 IDE disk controllers.
-.It twe
+.It Xr twe 4
 3Ware Escalade RAID controllers.
 .El
 .Ss Wired network interfaces
-.Bl -tag -width pcdisplay -offset indent
-.It aq
+.Bl -tag -width pcdisplay(4) -offset indent
+.It Xr aq 4
 Aquantia AQC multigigabit Ethernet interfaces.
-.It bnx
+.It Xr bnx 4
 Broadcom NetXtreme II 10/100/1000 Ethernet interfaces.
-.It de
-DEC DC21x4x (Tulip) based Ethernet interfaces, including the DE435,
-DE450, and DE500, and Znyx, SMC, Cogent/Adaptec, and Asante single- and
-multi-port Ethernet interfaces.
-.It ena
+.It Xr ena 4
 Elastic Network Adapter interfaces.
-.It ep
+.It Xr ep 4
 3Com 3c590, 3c595, 3c900, and 3c905 Ethernet interfaces.
-.It epic
+.It Xr epic 4
 SMC83C170 (EPIC/100) Ethernet interfaces.
-.It ex
+.It Xr ex 4
 3Com 3c900, 3c905, and 3c980 Ethernet interfaces.
-.It fxp
+.It Xr fxp 4
 Intel EtherExpress PRO 10+/100B Ethernet interfaces.
-.It gsip
+.It Xr gsip 4
 National Semiconductor DP83820 based Gigabit Ethernet interfaces.
-.It hme
+.It Xr hme 4
 Sun Microelectronics STP2002-STQ Ethernet interfaces.
-.It ixg
+.It Xr ixg 4
 Intel 82598EB, 82599, X540 and X550 10 Gigabit Ethernet interfaces.
-.It ixl
+.It Xr ixl 4
 Intel 700 series Ethernet interfaces.
-.It le
+.It Xr le 4
 PCNet-PCI Ethernet interfaces.
 Note, the
 .Xr pcn 4
 driver supersedes this driver.
-.It mcx
+.It Xr mcx 4
 Mellanox 5th generation Ethernet devices.
-.It msk
+.It Xr msk 4
 Marvell Yukon 2 based Gigabit Ethernet interfaces.
-.It ne
+.It Xr ne 4
 NE2000-compatible Ethernet interfaces.
-.It nfe
+.It Xr nfe 4
 NVIDIA nForce Ethernet interfaces.
-.It ntwoc
+.It Xr ntwoc 4
 SDL Communications N2pci and WAN/ic 400 synchronous serial interfaces.
-.It pcn
+.It Xr pcn 4
 AMD PCnet-PCI family of Ethernet interfaces.
-.It re
+.It Xr re 4
 Realtek 10/100/1000 Ethernet adapters.
-.It rge
+.It Xr rge 4
 Realtek RTL8125-based Ethernet interfaces.
-.It rtk
+.It Xr rtk 4
 Realtek 8129/8139 based Ethernet interfaces.
-.It sf
+.It Xr sf 4
 Adaptec AIC-6915 10/100 Ethernet interfaces.
-.It sip
+.It Xr sip 4
 Silicon Integrated Systems SiS 900, SiS 7016, and National Semiconductor
 DP83815 based Ethernet interfaces.
-.It sk
+.It Xr sk 4
 SysKonnect SK-98xx based Gigabit Ethernet

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 15:27:40 UTC 2021

Modified Files:
src/share/man/man4: pci.4

Log Message:
add ena(4)


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/share/man/man4/pci.4

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

Modified files:

Index: src/share/man/man4/pci.4
diff -u src/share/man/man4/pci.4:1.110 src/share/man/man4/pci.4:1.111
--- src/share/man/man4/pci.4:1.110	Thu Mar 11 14:19:43 2021
+++ src/share/man/man4/pci.4	Thu Mar 11 15:27:40 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pci.4,v 1.110 2021/03/11 14:19:43 nia Exp $
+.\"	$NetBSD: pci.4,v 1.111 2021/03/11 15:27:40 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -186,6 +186,8 @@ Broadcom NetXtreme II 10/100/1000 Ethern
 DEC DC21x4x (Tulip) based Ethernet interfaces, including the DE435,
 DE450, and DE500, and Znyx, SMC, Cogent/Adaptec, and Asante single- and
 multi-port Ethernet interfaces.
+.It ena
+Elastic Network Adapter interfaces.
 .It ep
 3Com 3c590, 3c595, 3c900, and 3c905 Ethernet interfaces.
 .It epic
@@ -404,6 +406,7 @@ USB XHCI host controllers.
 .Xr eap 4 ,
 .Xr ehci 4 ,
 .Xr emuxki 4 ,
+.Xr ena 4 ,
 .Xr ep 4 ,
 .Xr epic 4 ,
 .Xr esa 4 ,

CVS commit: src/usr.bin/sed

2021-03-11 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 11 15:15:05 UTC 2021

Modified Files:
src/usr.bin/sed: main.c sed.1

Log Message:
Add -G to support GNU extensions


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/sed/main.c
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/sed/sed.1

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

Modified files:

Index: src/usr.bin/sed/main.c
diff -u src/usr.bin/sed/main.c:1.36 src/usr.bin/sed/main.c:1.37
--- src/usr.bin/sed/main.c:1.36	Fri May 15 18:39:54 2020
+++ src/usr.bin/sed/main.c	Thu Mar 11 10:15:05 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.36 2020/05/15 22:39:54 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.37 2021/03/11 15:15:05 christos Exp $	*/
 
 /*-
  * Copyright (c) 2013 Johann 'Myrkraverk' Oskarsson.
@@ -39,7 +39,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: main.c,v 1.36 2020/05/15 22:39:54 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.37 2021/03/11 15:15:05 christos Exp $");
 #ifdef __FBSDID
 __FBSDID("$FreeBSD: head/usr.bin/sed/main.c 252231 2013-06-26 04:14:19Z pfg $");
 #endif
@@ -141,11 +141,14 @@ main(int argc, char *argv[])
 	fflag = 0;
 	inplace = NULL;
 
-	while ((c = getopt(argc, argv, "EI::ae:f:i::lnru")) != -1)
+	while ((c = getopt(argc, argv, "EGI::ae:f:i::lnru")) != -1)
 		switch (c) {
 		case 'r':		/* Gnu sed compat */
 		case 'E':
-			rflags = REG_EXTENDED;
+			rflags |= REG_EXTENDED;
+			break;
+		case 'G':
+			rflags |= REG_GNU;
 			break;
 		case 'I':
 			inplace = optarg ? optarg : __UNCONST("");
@@ -224,7 +227,7 @@ usage(void)
 {
 	(void)fprintf(stderr,
 	"Usage:  %s [-aElnru] command [file ...]\n"
-	"\t%s [-aElnru] [-e command] [-f command_file] [-I[extension]]\n"
+	"\t%s [-aEGlnru] [-e command] [-f command_file] [-I[extension]]\n"
 	"\t[-i[extension]] [file ...]\n", getprogname(), getprogname());
 	exit(1);
 }

Index: src/usr.bin/sed/sed.1
diff -u src/usr.bin/sed/sed.1:1.40 src/usr.bin/sed/sed.1:1.41
--- src/usr.bin/sed/sed.1:1.40	Tue Jun 24 22:05:58 2014
+++ src/usr.bin/sed/sed.1	Thu Mar 11 10:15:05 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sed.1,v 1.40 2014/06/25 02:05:58 uwe Exp $
+.\"	$NetBSD: sed.1,v 1.41 2021/03/11 15:15:05 christos Exp $
 .\" Copyright (c) 1992, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -32,7 +32,7 @@
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
 .\" $FreeBSD: head/usr.bin/sed/sed.1 259132 2013-12-09 18:57:20Z eadler $
 .\"
-.Dd June 18, 2014
+.Dd March 11, 2021
 .Dt SED 1
 .Os
 .Sh NAME
@@ -44,7 +44,7 @@
 .Ar command
 .Op Ar
 .Nm
-.Op Fl aElnru
+.Op Fl aEGlnru
 .Op Fl e Ar command
 .Op Fl f Ar command_file
 .Op Fl I Ns Op Ar extension
@@ -97,6 +97,11 @@ Append the editing commands found in the
 .Ar command_file
 to the list of commands.
 The editing commands should each be listed on a separate line.
+.It Fl G
+Support GNU regex extensions.
+See 
+.Xr regex 3
+for details.
 .It Fl I Ns Op Ar extension
 Edit files in-place, saving backups with the specified
 .Ar extension .

CVS commit: src/lib/libc/regex

2021-03-11 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 11 15:12:51 UTC 2021

Modified Files:
src/lib/libc/regex: regex.3

Log Message:
Document the "C" language escapes supported in GNU mode.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/regex/regex.3

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

Modified files:

Index: src/lib/libc/regex/regex.3
diff -u src/lib/libc/regex/regex.3:1.28 src/lib/libc/regex/regex.3:1.29
--- src/lib/libc/regex/regex.3:1.28	Wed Feb 24 04:10:12 2021
+++ src/lib/libc/regex/regex.3	Thu Mar 11 10:12:51 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: regex.3,v 1.28 2021/02/24 09:10:12 wiz Exp $
+.\" $NetBSD: regex.3,v 1.29 2021/03/11 15:12:51 christos Exp $
 .\"
 .\" Copyright (c) 1992, 1993, 1994 Henry Spencer.
 .\" Copyright (c) 1992, 1993, 1994
@@ -34,7 +34,7 @@
 .\"	@(#)regex.3	8.4 (Berkeley) 3/20/94
 .\" $FreeBSD: head/lib/libc/regex/regex.3 363817 2020-08-04 02:06:49Z kevans $
 .\"
-.Dd February 22, 2021
+.Dd March 11, 2021
 .Dt REGEX 3
 .Os
 .Sh NAME
@@ -202,14 +202,26 @@ where
 .Dv N
 is between
 .Dv [1-9] .
+.It \ea
+Visual Bell
 .It \eb
 Match a position that is a word boundary.
 .It \eB
 Match a position that is a not word boundary.
+.It \ef
+Form Feed
+.It \en
+Line Feed
+.It \er
+Carriage return
 .It \es
 Alias for [[:space:]]
 .It \eS
 Alias for [^[:space:]]
+.It \et
+Horizontal Tab
+.It \ev
+Vertical Tab
 .It \ew
 Alias for [[:alnum:]]
 .It \eW

CVS commit: src/lib/libc/regex

2021-03-11 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Thu Mar 11 15:00:29 UTC 2021

Modified Files:
src/lib/libc/regex: regcomp.c

Log Message:
recognize the "C" language backslash escapes like gnu does (except b which
is already taken)


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/libc/regex/regcomp.c

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

Modified files:

Index: src/lib/libc/regex/regcomp.c
diff -u src/lib/libc/regex/regcomp.c:1.45 src/lib/libc/regex/regcomp.c:1.46
--- src/lib/libc/regex/regcomp.c:1.45	Fri Feb 26 14:24:47 2021
+++ src/lib/libc/regex/regcomp.c	Thu Mar 11 10:00:29 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: regcomp.c,v 1.45 2021/02/26 19:24:47 christos Exp $	*/
+/*	$NetBSD: regcomp.c,v 1.46 2021/03/11 15:00:29 christos Exp $	*/
 
 /*-
  * SPDX-License-Identifier: BSD-3-Clause
@@ -51,7 +51,7 @@
 static char sccsid[] = "@(#)regcomp.c	8.5 (Berkeley) 3/20/94";
 __FBSDID("$FreeBSD: head/lib/libc/regex/regcomp.c 368359 2020-12-05 03:18:48Z kevans $");
 #endif
-__RCSID("$NetBSD: regcomp.c,v 1.45 2021/02/26 19:24:47 christos Exp $");
+__RCSID("$NetBSD: regcomp.c,v 1.46 2021/03/11 15:00:29 christos Exp $");
 
 #define _OPENBSD_SOURCE
 
@@ -547,6 +547,27 @@ p_ere_exp(struct parse *p, struct branch
 			case 's':
 p_b_pseudoclass(p, wc);
 break;
+			case 'a':
+ordinary(p, '\a');
+break;
+			case 'e':
+ordinary(p, '\e');
+break;
+			case 'f':
+ordinary(p, '\f');
+break;
+			case 'n':
+ordinary(p, '\n');
+break;
+			case 'r':
+ordinary(p, '\r');
+break;
+			case 't':
+ordinary(p, '\t');
+break;
+			case 'v':
+ordinary(p, '\v');
+break;
 			case '1':
 			case '2':
 			case '3':
@@ -906,6 +927,27 @@ p_simp_re(struct parse *p, struct branch
 			case BACKSL|'s':
 p_b_pseudoclass(p, cc);
 break;
+			case BACKSL|'a':
+ordinary(p, '\a');
+break;
+			case BACKSL|'e':
+ordinary(p, '\e');
+break;
+			case BACKSL|'f':
+ordinary(p, '\f');
+break;
+			case BACKSL|'n':
+ordinary(p, '\n');
+break;
+			case BACKSL|'r':
+ordinary(p, '\r');
+break;
+			case BACKSL|'t':
+ordinary(p, '\t');
+break;
+			case BACKSL|'v':
+ordinary(p, '\v');
+break;
 			default:
 handled = false;
 			}

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 14:19:43 UTC 2021

Modified Files:
src/share/man/man4: pci.4

Log Message:
delint by removing Tn macros


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/share/man/man4/pci.4

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

Modified files:

Index: src/share/man/man4/pci.4
diff -u src/share/man/man4/pci.4:1.109 src/share/man/man4/pci.4:1.110
--- src/share/man/man4/pci.4:1.109	Thu Mar 11 14:08:18 2021
+++ src/share/man/man4/pci.4	Thu Mar 11 14:19:43 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pci.4,v 1.109 2021/03/11 14:08:18 nia Exp $
+.\"	$NetBSD: pci.4,v 1.110 2021/03/11 14:19:43 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -49,26 +49,17 @@
 Other
 .Nm
 attachments are machine-dependent and depend on the bus topology and
-.Tn PCI
-bus interface of your system.
+PCI bus interface of your system.
 See
 .Xr intro 4
 for your system for details.
 .Pp
 .Nx
-includes a machine-independent
-.Tn PCI
-bus subsystem and
-several machine-independent
-.Tn PCI
-device drivers.
-.Pp
-Your system may support additional
-.Tn PCI
-devices.
-Drivers for
-.Tn PCI
-devices not listed here are machine-dependent.
+includes a machine-independent PCI bus subsystem and several
+machine-independent PCI device drivers.
+.Pp
+Your system may support additional PCI devices.
+Drivers for PCI devices not listed here are machine-dependent.
 Consult your system's
 .Xr intro 4
 for additional information.
@@ -133,61 +124,36 @@ option leaves the interrupt as is.
 .El
 .Sh HARDWARE
 .Nx
-includes machine-independent
-.Tn PCI
-drivers, sorted by device type and driver name:
+includes machine-independent PCI drivers, sorted by device type and driver name:
 .Ss SCSI interfaces
 .Bl -tag -width pcdisplay -offset indent
 .It ahc
-Adaptec 29xx, 39xx, and other AIC-7xxx-based
-.Tn SCSI
+Adaptec 29xx, 39xx, and other AIC-7xxx-based SCSI
 interfaces.
 .It adv
-Advansys
-.Tn SCSI
-interfaces.
+Advansys SCSI interfaces.
 .It adw
-Advansys Ultra Wide
-.Tn SCSI
-interfaces.
+Advansys Ultra Wide SCSI interfaces.
 .It bha
-Buslogic BT-9xx
-.Tn SCSI
-interfaces.
+Buslogic BT-9xx SCSI interfaces.
 .It dpt
-DPT SmartCache/SmartRAID III and IV
-.Tn SCSI
-interfaces.
+DPT SmartCache/SmartRAID III and IV SCSI interfaces.
 .It iha
-Initio INIC-940/950
-.Tn SCSI
-interfaces.
+Initio INIC-940/950 SCSI interfaces.
 .It isp
-QLogic ISP-1020, ISP-1040, and ISP-2100
-.Tn SCSI
-and
-.Tn FibreChannel
-interfaces.
+QLogic ISP-1020, ISP-1040, and ISP-2100 SCSI and FibreChannel interfaces.
 .It mfi
 LSI Logic & Dell MegaRAID SAS RAID controllers.
 .It mly
 Mylex AcceleRAID and eXtremeRAID controllers with v6 firmware.
 .It nca
-Domex 536
-.Tn SCSI
-interfaces.
+Domex 536 SCSI interfaces.
 .It pcscp
-Advanced Micro Devices Am53c974 PCscsi-PCI
-.Tn SCSI
-interfaces.
+Advanced Micro Devices Am53c974 PCscsi-PCI SCSI interfaces.
 .It siop
-Symbios Logic/NCR 53c8xx-family
-.Tn SCSI
-interfaces.
+Symbios Logic/NCR 53c8xx-family SCSI interfaces.
 .It trm
-Tekram TRM-S1040 ASIC based
-.Tn SCSI
-interfaces.
+Tekram TRM-S1040 ASIC based SCSI interfaces.
 .El
 .Ss Disk and tape controllers
 .Bl -tag -width pcdisplay -offset indent
@@ -217,125 +183,73 @@ Aquantia AQC multigigabit Ethernet inter
 .It bnx
 Broadcom NetXtreme II 10/100/1000 Ethernet interfaces.
 .It de
-.Tn DEC
-DC21x4x (Tulip) based
-.Tn Ethernet
-interfaces, including the DE435,
+DEC DC21x4x (Tulip) based Ethernet interfaces, including the DE435,
 DE450, and DE500, and Znyx, SMC, Cogent/Adaptec, and Asante single- and
-multi-port
-.Tn Ethernet
-interfaces.
+multi-port Ethernet interfaces.
 .It ep
-3Com 3c590, 3c595, 3c900, and 3c905
-.Tn Ethernet
-interfaces.
+3Com 3c590, 3c595, 3c900, and 3c905 Ethernet interfaces.
 .It epic
-SMC83C170 (EPIC/100)
-.Tn Ethernet
-interfaces.
+SMC83C170 (EPIC/100) Ethernet interfaces.
 .It ex
-3Com 3c900, 3c905, and 3c980
-.Tn Ethernet
-interfaces.
+3Com 3c900, 3c905, and 3c980 Ethernet interfaces.
 .It fxp
-Intel EtherExpress PRO 10+/100B
-.Tn Ethernet
-interfaces.
+Intel EtherExpress PRO 10+/100B Ethernet interfaces.
 .It gsip
-National Semiconductor DP83820 based Gigabit
-.Tn Ethernet
-interfaces.
+National Semiconductor DP83820 based Gigabit Ethernet interfaces.
 .It hme
-Sun Microelectronics STP2002-STQ
-.Tn Ethernet
-interfaces.
+Sun Microelectronics STP2002-STQ Ethernet interfaces.
 .It ixg
 Intel 82598EB, 82599, X540 and X550 10 Gigabit Ethernet interfaces.
 .It ixl
-Intel 700 series
-.Tn Ethernet
-interfaces.
+Intel 700 series Ethernet interfaces.
 .It le
-PCNet-PCI
-.Tn Ethernet
-interfaces.
+PCNet-PCI Ethernet interfaces.
 Note, the
 .Xr pcn 4
 driver supersedes this driver.
 .It mcx
 Mellanox 5th generation Ethernet devices.
 .It msk
-Marvell Yukon 2 based Gigabit
-.Tn Ethernet
-interfaces.
+Marvell Yukon 2 based Gigabit Ethernet interfaces.
 .It ne

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 14:08:18 UTC 2021

Modified Files:
src/share/man/man4: pci.4

Log Message:
add vmx, virtio


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/share/man/man4/pci.4

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

Modified files:

Index: src/share/man/man4/pci.4
diff -u src/share/man/man4/pci.4:1.108 src/share/man/man4/pci.4:1.109
--- src/share/man/man4/pci.4:1.108	Thu Mar 11 10:45:33 2021
+++ src/share/man/man4/pci.4	Thu Mar 11 14:08:18 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pci.4,v 1.108 2021/03/11 10:45:33 nia Exp $
+.\"	$NetBSD: pci.4,v 1.109 2021/03/11 14:08:18 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -326,6 +326,8 @@ DECchip 21x4x and clone
 interfaces.
 .It vge
 VIA Networking Technologies VT6122 PCI Gigabit Ethernet adapter driver.
+.It vmx
+VMware VMXNET3 virtual Ethernet interfaces.
 .It vr
 VIA VT3043 (Rhine) and VT86C100A (Rhine-II)
 .Tn Ethernet
@@ -459,6 +461,8 @@ communications ports.
 USB UHCI host controllers.
 .It viapm
 VIA VT82C686A hardware monitors.
+.It virtio
+Para-virtualized I/O in a virtual machine.
 .It vga
 VGA graphics boards.
 .It xhci
@@ -562,6 +566,8 @@ USB XHCI host controllers.
 .Xr vga 4 ,
 .Xr vge 4 ,
 .\" .Xr viapm 4 ,
+.Xr virtio 4 ,
+.Xr vmx 4 ,
 .Xr vr 4 ,
 .Xr wi 4 ,
 .Xr wm 4 ,

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

2021-03-11 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Mar 11 13:12:34 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunKbd.c

Log Message:
Avoid polluting console on non-fatal errors.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.9
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.8	Thu Mar 11 11:54:41 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Thu Mar 11 13:12:34 2021
@@ -191,7 +191,7 @@ SetLights(KeybdCtrl* ctrl, int fd)
 #endif
 };
 if (ioctl (fd, KIOCSLED, (caddr_t)_tab[ctrl->leds & SUN_LED_MASK]) == -1)
-	ErrorF("Failed to set keyboard lights\n");
+	LogMessage(X_ERROR, "Failed to set keyboard lights\n");
 #endif
 }
 
@@ -218,13 +218,13 @@ bell(int fd, int duration)
 
 kbdCmd = KBD_CMD_BELL;
 if (ioctl (fd, KIOCCMD, ) == -1) {
- 	ErrorF("Failed to activate bell\n");
+ 	LogMessage(X_ERROR, "Failed to activate bell\n");
 	return;
 }
 if (duration) usleep (duration);
 kbdCmd = KBD_CMD_NOBELL;
 if (ioctl (fd, KIOCCMD, ) == -1)
-	ErrorF("Failed to deactivate bell\n");
+	LogMessage(X_ERROR, "Failed to deactivate bell\n");
 }
 
 static void
@@ -394,7 +394,7 @@ sunKbdCtrl(DeviceIntPtr device, KeybdCtr
 	pPriv->click = ctrl->click;
 	kbdClickCmd = pPriv->click ? KBD_CMD_CLICK : KBD_CMD_NOCLICK;
 	if (ioctl (pPriv->fd, KIOCCMD, ) == -1)
- 	ErrorF("Failed to set keyclick\n");
+ 	LogMessage(X_ERROR, "Failed to set keyclick\n");
 }
 if ((pPriv->type == KB_SUN4) && (pPriv->leds != (ctrl->leds & SUN_LED_MASK)))
 	DoLEDs(device, ctrl, pPriv);

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2021-03-11 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Mar 11 12:08:57 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kFb.c x68kGraph.c
x68kKbd.c x68kMouse.c x68kText.c

Log Message:
ErrorF() doesn't append newlines at the end of messages.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
cvs rdiff -u -r1.10 -r1.11 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kText.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/xorg-server/dist/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.7 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.8
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c:1.7	Wed Nov  4 17:16:13 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kFb.c	Thu Mar 11 12:08:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kFb.c,v 1.7 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kFb.c,v 1.8 2021/03/11 12:08:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -50,12 +50,12 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 
 /* open frame buffer */
 if ( ( pPriv->fd = open(device, O_RDWR, 0)) < 0) {
-ErrorF( "Can't open frame buffer" );
+ErrorF( "Can't open frame buffer\n" );
 return FALSE;
 }
 /* get frame buffer infomation */
 if ( ioctl( pPriv->fd, GRFIOCGINFO,  ) == -1 ) {
-ErrorF( "Can't get grfinfo" );
+ErrorF( "Can't get grfinfo\n" );
 return FALSE;
 }
 pPriv->mapsize = gi.gd_regsize + gi.gd_fbsize;
@@ -64,7 +64,7 @@ x68kFbCommonOpen(X68kScreenRec *pPriv, c
 pPriv->reg = (FbReg *)mmap(0, pPriv->mapsize, PROT_READ | PROT_WRITE,
MAP_FILE | MAP_SHARED, pPriv->fd, 0 );
 if ( pPriv->reg == (FbReg *)-1) {
-ErrorF( "Can't map frame buffer" );
+ErrorF( "Can't map frame buffer\n" );
 return FALSE;
 }
 pPriv->fb = (uint8_t *)((uint32_t)pPriv->reg + gi.gd_regsize);
@@ -114,7 +114,7 @@ x68kFbCommonClose(X68kScreenRec *pPriv)
 
 /* unmap and close frame buffer */
 if ( munmap(pPriv->reg, pPriv->mapsize) == -1 )
-ErrorF("Can't unmap frame buffer");
+ErrorF("Can't unmap frame buffer\n");
 close(pPriv->fd);
 }
 

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.9 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c:1.9	Wed Nov  4 17:16:13 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kGraph.c	Thu Mar 11 12:08:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.9 2020/11/04 17:16:13 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.10 2021/03/11 12:08:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -195,7 +195,7 @@ x68kGraphInit(ScreenPtr pScreen, int arg
 
 /* store private record into screen */
 if (!dixRegisterPrivateKey(, PRIVATE_SCREEN, 0)) {
-ErrorF("dixRegisterPrivateKey failed");
+ErrorF("dixRegisterPrivateKey failed\n");
 return FALSE;
 }
 x68kSetScreenPrivate(pScreen, pPriv);
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.9 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.9	Sun Feb  7 16:55:18 2021
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Thu Mar 11 12:08:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.9 2021/02/07 16:55:18 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.10 2021/03/11 12:08:57 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -136,7 +136,7 @@ x68kMouseProc(DeviceIntPtr device, int w
 	case DEVICE_INIT:
 pMouse->devicePrivate = (void *) 
 if( (x68kMousePriv.fd = open("/dev/mouse", O_RDONLY)) == -1 ) {
-ErrorF("Can't open mouse device");
+ErrorF("Can't open mouse device\n");
 return !Success;
 }
 	pMouse->on = FALSE;
@@ -165,18 +165,18 @@ x68kMouseProc(DeviceIntPtr device, int w
 
 	case

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

2021-03-11 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Thu Mar 11 11:54:41 UTC 2021

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/sun: sunCfb.c sunFbs.c sunInit.c
sunKbd.c sunMouse.c

Log Message:
ErrorF() doesn't append newlines at the end of messages.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c \
xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c:1.6	Sun Aug  9 07:35:42 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunCfb.c	Thu Mar 11 11:54:41 2021
@@ -120,7 +120,7 @@ CGUpdateColormap(ScreenPtr pScreen, int 
 sunCmap.blue = [dex];
 
 if (ioctl(sunFbs[pScreen->myNum].fd, FBIOPUTCMAP, ) < 0) {
-	ErrorF("CGUpdateColormap");
+	ErrorF("CGUpdateColormap\n");
 	FatalError( "CGUpdateColormap: FBIOPUTCMAP failed\n" );
 }
 }
@@ -137,7 +137,7 @@ CGGetColormap(ScreenPtr pScreen, int dex
 sunCmap.blue = [dex];
 
 if (ioctl(sunFbs[pScreen->myNum].fd, FBIOGETCMAP, ) < 0) {
-	ErrorF("CGGetColormap");
+	ErrorF("CGGetColormap\n");
 	FatalError( "CGGetColormap: FBIOGETCMAP failed\n" );
 }
 }

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c:1.3	Sun Jul 26 07:35:37 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunFbs.c	Thu Mar 11 11:54:41 2021
@@ -99,7 +99,7 @@ sunMemoryMap(size_t len, off_t off, int 
 
 #if !defined(__bsdi__) && !defined(_MAP_NEW) && !defined(__NetBSD__) && !defined(__OpenBSD__)
 if ((addr = (caddr_t) valloc (mapsize)) == NULL) {
-	ErrorF("Couldn't allocate frame buffer memory");
+	ErrorF("Couldn't allocate frame buffer memory\n");
 	(void) close (fd);
 	return NULL;
 }
@@ -121,7 +121,7 @@ sunMemoryMap(size_t len, off_t off, int 
 		PROT_READ | PROT_WRITE, MAP_SHARED,
 		fd, off);
 if (mapaddr == (void *) -1) {
-	ErrorF("mapping frame buffer memory");
+	ErrorF("mapping frame buffer memory\n");
 	(void) close (fd);
 	mapaddr = NULL;
 }
@@ -134,7 +134,7 @@ sunScreenAllocate(ScreenPtr pScreen)
 sunScreenPtrpPrivate;
 
 if (!dixRegisterPrivateKey(, PRIVATE_SCREEN, 0)) {
-	ErrorF("dixRegisterPrivateKey failed");
+	ErrorF("dixRegisterPrivateKey failed\n");
 	return FALSE;
 }
 pPrivate = calloc(1, sizeof (sunScreenRec));
Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.3 xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c:1.3	Sat Nov 21 03:02:09 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunMouse.c	Thu Mar 11 11:54:41 2021
@@ -133,7 +133,7 @@ sunMouseProc(DeviceIntPtr device, int wh
 switch (what) {
 	case DEVICE_INIT:
 	if (pMouse != >public) {
-		ErrorF ("Cannot open non-system mouse");
+		ErrorF ("Cannot open non-system mouse\n");
 		return !Success;
 	}
 	if (sunPtrPriv.fd == -1)
@@ -156,12 +156,12 @@ sunMouseProc(DeviceIntPtr device, int wh
 
 	case DEVICE_ON:
 	if (ioctl (sunPtrPriv.fd, VUIDGFORMAT, ) == -1) {
-		ErrorF("sunMouseProc ioctl VUIDGFORMAT");
+		ErrorF("sunMouseProc ioctl VUIDGFORMAT\n");
 		return !Success;
 	}
 	format = VUID_FIRM_EVENT;
 	if (ioctl (sunPtrPriv.fd, VUIDSFORMAT, ) == -1) {
-		ErrorF("sunMouseProc ioctl VUIDSFORMAT");
+		ErrorF("sunMouseProc ioctl VUIDSFORMAT\n");
 		return !Success;
 	}
 	sunPtrPriv.bmask = 0;
@@ -173,7 +173,7 @@ sunMouseProc(DeviceIntPtr device, int wh
 	case DEVICE_CLOSE:
 	pMouse->on = FALSE;
 	if (ioctl (sunPtrPriv.fd, VUIDSFORMAT, ) == -1)
-		ErrorF("sunMouseProc ioctl VUIDSFORMAT");
+		ErrorF("sunMouseProc ioctl VUIDSFORMAT\n");
 	break;
 
 	case DEVICE_OFF:
@@ -210,7 +210,7 @@ sunMouseGetEvents(int fd, Bool on, int *
 	*pNumEvents = 0;
 	*pAgain = FALSE;
 	} else {
-	ErrorF("sunMouseGetEvents read");
+	ErrorF("sunMouseGetEvents read\n");
 	FatalError ("Could not read from mouse");
 	}
 } else {

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.9 xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.10
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunInit.c:1.9	Tue Aug 11 06:49:09 2020
+++

CVS commit: src/sys/netinet6

2021-03-11 Thread Ryo Shimizu

Module Name:src
Committed By:   ryo
Date:   Thu Mar 11 11:10:22 UTC 2021

Modified Files:
src/sys/netinet6: ip6_var.h

Log Message:
flowlabel will never return anything other than 1 or 0.
s/&&/&/


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/netinet6/ip6_var.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/netinet6/ip6_var.h
diff -u src/sys/netinet6/ip6_var.h:1.89 src/sys/netinet6/ip6_var.h:1.90
--- src/sys/netinet6/ip6_var.h:1.89	Mon Mar  8 18:22:16 2021
+++ src/sys/netinet6/ip6_var.h	Thu Mar 11 11:10:22 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_var.h,v 1.89 2021/03/08 18:22:16 christos Exp $	*/
+/*	$NetBSD: ip6_var.h,v 1.90 2021/03/11 11:10:22 ryo Exp $	*/
 /*	$KAME: ip6_var.h,v 1.33 2000/06/11 14:59:20 jinmei Exp $	*/
 
 /*
@@ -382,7 +382,7 @@ static __inline uint32_t
 ip6_randomflowlabel(void)
 {
 
-	return cprng_fast32() && 0xf;
+	return cprng_fast32() & 0xf;
 }
 
 static __inline bool

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 10:45:33 UTC 2021

Modified Files:
src/share/man/man4: pci.4

Log Message:
Add ixg


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/share/man/man4/pci.4

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

Modified files:

Index: src/share/man/man4/pci.4
diff -u src/share/man/man4/pci.4:1.107 src/share/man/man4/pci.4:1.108
--- src/share/man/man4/pci.4:1.107	Thu Mar 11 10:33:36 2021
+++ src/share/man/man4/pci.4	Thu Mar 11 10:45:33 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pci.4,v 1.107 2021/03/11 10:33:36 nia Exp $
+.\"	$NetBSD: pci.4,v 1.108 2021/03/11 10:45:33 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -249,7 +249,9 @@ interfaces.
 Sun Microelectronics STP2002-STQ
 .Tn Ethernet
 interfaces.
-.It ixl 
+.It ixg
+Intel 82598EB, 82599, X540 and X550 10 Gigabit Ethernet interfaces.
+.It ixl
 Intel 700 series
 .Tn Ethernet
 interfaces.
@@ -512,6 +514,7 @@ USB XHCI host controllers.
 .Xr iwi 4 ,
 .Xr iwm 4 ,
 .Xr iwn 4 ,
+.Xr ixg 4 ,
 .Xr ixl 4 ,
 .Xr le 4 ,
 .Xr malo 4 ,

CVS commit: src

2021-03-11 Thread Ryo Shimizu

Module Name:src
Committed By:   ryo
Date:   Thu Mar 11 10:34:34 UTC 2021

Modified Files:
src/share/man/man4: ddb.4
src/sys/arch/aarch64/aarch64: db_machdep.c

Log Message:
Numeric modifiers conflict with the syntax interpretation of ddb, so use 'b', 
'w', 'l', 'q' instead.
Also, change load/store('l','s') to 'r','w' like the other arch.

 >db{0}> machine watch/1 hostname
 >Bad modifier

 >db{0}> machine watch/s1 hostname
 >add watchpoint 0 as c1087848


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/share/man/man4/ddb.4
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/aarch64/aarch64/db_machdep.c

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/ddb.4
diff -u src/share/man/man4/ddb.4:1.198 src/share/man/man4/ddb.4:1.199
--- src/share/man/man4/ddb.4:1.198	Fri Feb 19 08:57:56 2021
+++ src/share/man/man4/ddb.4	Thu Mar 11 10:34:34 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ddb.4,v 1.198 2021/02/19 08:57:56 msaitoh Exp $
+.\"	$NetBSD: ddb.4,v 1.199 2021/03/11 10:34:34 ryo Exp $
 .\"
 .\" Copyright (c) 1997 - 2019 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -56,7 +56,7 @@
 .\" any improvements or extensions that they make and grant Carnegie Mellon
 .\" the rights to redistribute these changes.
 .\"
-.Dd February 19, 2021
+.Dd March 11, 2021
 .Dt DDB 4
 .Os
 .Sh NAME
@@ -1017,6 +1017,8 @@ set (e.g.
 Some of these commands are:
 .Ss AARCH64
 .Bl -tag -width "traptrace" -compact
+.It Ic break
+Set or clear a hardware breakpoint.
 .It Ic cpu
 Switch to another CPU.
 .It Ic cpuinfo
@@ -1035,26 +1037,18 @@ Print system registers.
 Set or clear a hardware watchpoint.
 Pass the address to be watched, or watchpoint number to clear the watchpoint.
 Optional modifiers are
-.Dq l
-for load access,
-.Dq s
-for store access,
-.Dq 1
+.Dq r
+for read access,
+.Dq w
+for write access (default: trap on read or write access),
+.Dq b
 for 8 bit width,
-.Dq 2
+.Dq h
 for 16 bit,
-.Dq 3
-for 24 bit,
-.Dq 4
-for 32 bit,
-.Dq 5
-for 40 bit,
-.Dq 6
-for 48 bit,
-.Dq 7
-for 56 bit,
-.Dq 8
-for 64 bit.
+.Dq l
+for 32 bit or,
+.Dq q
+for 64 bit (default: 32 bit).
 .El
 .Ss ALPHA
 .Bl -tag -width "traptrace" -compact

Index: src/sys/arch/aarch64/aarch64/db_machdep.c
diff -u src/sys/arch/aarch64/aarch64/db_machdep.c:1.38 src/sys/arch/aarch64/aarch64/db_machdep.c:1.39
--- src/sys/arch/aarch64/aarch64/db_machdep.c:1.38	Thu Mar 11 09:48:40 2021
+++ src/sys/arch/aarch64/aarch64/db_machdep.c	Thu Mar 11 10:34:34 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.38 2021/03/11 09:48:40 ryo Exp $ */
+/* $NetBSD: db_machdep.c,v 1.39 2021/03/11 10:34:34 ryo Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.38 2021/03/11 09:48:40 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.39 2021/03/11 10:34:34 ryo Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd32.h"
@@ -179,10 +179,11 @@ const struct db_command db_machine_comma
 		DDB_ADD_CMD(
 		"watch", db_md_watch_cmd, 0,
 		"set or clear watchpoint",
-		"[/12345678] [address|#]",
+		"[/rwbhlq] [address|#]",
 		"\taddress: watchpoint address to set\n"
-		"\t#: watchpoint number to remove"
-		"\t/1..8: size of data\n")
+		"\t#: watchpoint number to remove\n"
+		"\t/rw: read or write access\n"
+		"\t/bhlq: size of access\n")
 	},
 	{
 		DDB_ADD_CMD(
@@ -978,20 +979,22 @@ db_md_watch_cmd(db_expr_t addr, bool hav
 			ch = *modif;
 
 			switch (ch) {
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-watchsize = ch - '0';
+			case 'b':
+watchsize = 1;
+break;
+			case 'h':
+watchsize = 2;
 break;
 			case 'l':
+watchsize = 4;
+break;
+			case 'q':
+watchsize = 8;
+break;
+			case 'r':
 accesstype |= WATCHPOINT_ACCESS_LOAD;
 break;
-			case 's':
+			case 'w':
 accesstype |= WATCHPOINT_ACCESS_STORE;
 break;
 			}

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 10:33:36 UTC 2021

Modified Files:
src/share/man/man4: pci.4

Log Message:
Move nvme where I expected to find it (disk controllers section)


To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/share/man/man4/pci.4

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

Modified files:

Index: src/share/man/man4/pci.4
diff -u src/share/man/man4/pci.4:1.106 src/share/man/man4/pci.4:1.107
--- src/share/man/man4/pci.4:1.106	Thu Mar 11 10:28:53 2021
+++ src/share/man/man4/pci.4	Thu Mar 11 10:33:36 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pci.4,v 1.106 2021/03/11 10:28:53 nia Exp $
+.\"	$NetBSD: pci.4,v 1.107 2021/03/11 10:33:36 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -203,6 +203,8 @@ Compaq array controllers.
 ICP Vortex GDT and Intel Storage RAID controllers.
 .It mlx
 Mylex DAC960 and DEC SWXCR RAID controllers.
+.It nvme
+Non-Volatile Memory (NVM Express) host controllers.
 .It pciide
 IDE disk controllers.
 .It twe
@@ -435,8 +437,6 @@ USB EHCI host controllers.
 I2O I/O processors.
 .It mr
 Guillemot Maxi Radio FM 2000 FM radio device.
-.It nvme
-Non-Volatile Memory Host controllers.
 .It oboe
 Toshiba OBOE IrDA SIR/FIR controller.
 .It ohci

CVS commit: src/share/man/man4

2021-03-11 Thread Nia Alarie

Module Name:src
Committed By:   nia
Date:   Thu Mar 11 10:28:54 UTC 2021

Modified Files:
src/share/man/man4: pci.4

Log Message:
Split wifi cards into a separate section, add many more.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/share/man/man4/pci.4

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

Modified files:

Index: src/share/man/man4/pci.4
diff -u src/share/man/man4/pci.4:1.105 src/share/man/man4/pci.4:1.106
--- src/share/man/man4/pci.4:1.105	Mon Mar  1 18:08:36 2021
+++ src/share/man/man4/pci.4	Thu Mar 11 10:28:53 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pci.4,v 1.105 2021/03/01 18:08:36 jakllsch Exp $
+.\"	$NetBSD: pci.4,v 1.106 2021/03/11 10:28:53 nia Exp $
 .\"
 .\" Copyright (c) 1997 Jason R. Thorpe.  All rights reserved.
 .\" Copyright (c) 1997 Jonathan Stone
@@ -29,7 +29,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 1, 2021
+.Dd March 11, 2021
 .Dt PCI 4
 .Os
 .Sh NAME
@@ -208,13 +208,8 @@ IDE disk controllers.
 .It twe
 3Ware Escalade RAID controllers.
 .El
-.Ss Network interfaces
+.Ss Wired network interfaces
 .Bl -tag -width pcdisplay -offset indent
-.It an
-.Tn Aironet
-4500/4800 and
-.Tn Cisco
-340 series 802.11 interfaces.
 .It aq
 Aquantia AQC multigigabit Ethernet interfaces.
 .It bnx
@@ -283,8 +278,6 @@ SDL Communications N2pci and WAN/ic 400 
 AMD PCnet-PCI family of
 .Tn Ethernet
 interfaces.
-.It ral
-Ralink Technology RT2500/RT2600-based 802.11a/b/g wireless network interfaces.
 .It re
 Realtek 10/100/1000 Ethernet adapters.
 .It rge
@@ -296,8 +289,6 @@ interfaces.
 Realtek 8129/8139 based
 .Tn Ethernet
 interfaces.
-.It rtwn
-Realtek RTL8188CE/RTL8192CE 802.11b/g/n wireless network interfaces.
 .It sf
 Adaptec AIC-6915 10/100
 .Tn Ethernet
@@ -335,13 +326,47 @@ VIA Networking Technologies VT6122 PCI G
 VIA VT3043 (Rhine) and VT86C100A (Rhine-II)
 .Tn Ethernet
 interfaces.
-.It wi
-WaveLAN/IEEE and PRISM-II 802.11 wireless interfaces.
 .It wm
 Intel i8254x Gigabit
 .Tn Ethernet
 driver.
 .El
+.Ss Wireless network interfaces
+.Bl -tag -width pcdisplay -offset indent
+.It an
+Aironet 4500/4800 and Cisco 340 series 802.11 interfaces.
+.It atw
+ADMtek ADM8211 IEEE 802.11b PCI/CardBus wireless network interaces.
+.It ath
+Atheros IEEE 802.11a/b/g wireless network interfaces.
+.It athn
+Atheros IEEE 802.11a/b/g/n wireless network interfaces.
+.It bwi
+Broadcom BCM430x/4318 IEEE 802.11b/g wireless network interfaces.
+.It bwfm
+Broadcom and Cypress FullMAC wireless network interfaces.
+.It ipw
+Intel PRO/Wireless 2100 MiniPCI network interfaces.
+.It iwi
+Intel PRO/Wireless 2200BG and 2915ABG MiniPCI network interfaces.
+.It iwm
+Intel Wireless 7260, 7265, and 3160 PCIe Mini Card Dual Band network interfaces.
+.It iwn
+Intel Wireless WiFi Link 4965/5000/1000 and Centrino Wireless-N 1000/2000/6000
+PCIe Mini network interfaces.
+.It malo
+Marvell Libertas 88W8335/88W8310/88W8385 802.11b/g wireless network interfaces.
+.It ral
+Ralink Technology RT2500/RT2600-based 802.11a/b/g wireless network interfaces.
+.It rtw
+Realtek RTL8180L 802.11b wireless network interfaces.
+.It rtwn
+Realtek RTL8188CE/RTL8192CE 802.11b/g/n wireless network interfaces.
+.It wi
+WaveLAN/IEEE and PRISM-II 802.11 wireless interfaces.
+.It wpi
+Intel PRO/Wireless 3945ABG Mini PCI Express network adapters.
+.El
 .Ss Serial interfaces
 .Bl -tag -width pcdisplay -offset indent
 .It cy
@@ -447,12 +472,17 @@ USB XHCI host controllers.
 .Xr amr 4 ,
 .Xr an 4 ,
 .Xr aq 4 ,
+.Xr ath 4 ,
+.Xr athn 4 ,
+.Xr atw 4 ,
 .Xr auich 4 ,
 .Xr autri 4 ,
 .Xr auvia 4 ,
 .Xr bha 4 ,
 .Xr bktr 4 ,
 .Xr bnx 4 ,
+.Xr bwfm 4 ,
+.Xr bwi 4 ,
 .Xr cac 4 ,
 .Xr cbb 4 ,
 .Xr clcs 4 ,
@@ -477,9 +507,14 @@ USB XHCI host controllers.
 .Xr iha 4 ,
 .Xr intro 4 ,
 .Xr iop 4 ,
+.Xr ipw 4 ,
 .Xr isp 4 ,
+.Xr iwi 4 ,
+.Xr iwm 4 ,
+.Xr iwn 4 ,
 .Xr ixl 4 ,
 .Xr le 4 ,
+.Xr malo 4 ,
 .Xr mcx 4 ,
 .Xr mfi 4 ,
 .Xr mlx 4 ,
@@ -503,6 +538,8 @@ USB XHCI host controllers.
 .Xr ral 4 ,
 .Xr re 4 ,
 .Xr rtk 4 ,
+.Xr rtw 4 ,
+.Xr rtwn 4 ,
 .Xr rtwn 4 ,
 .Xr sf 4 ,
 .Xr siisata 4 ,
@@ -525,6 +562,7 @@ USB XHCI host controllers.
 .Xr vr 4 ,
 .Xr wi 4 ,
 .Xr wm 4 ,
+.Xr wpi 4 ,
 .Xr wscons 4 ,
 .Xr xhci 4 ,
 .Xr yds 4

CVS commit: src/sys/arch/aarch64

2021-03-11 Thread Ryo Shimizu

Module Name:src
Committed By:   ryo
Date:   Thu Mar 11 09:48:40 UTC 2021

Modified Files:
src/sys/arch/aarch64/aarch64: db_machdep.c
src/sys/arch/aarch64/include: db_machdep.h

Log Message:
- fixed a problem where hardware {break,watch}points other than #0 could not be 
cleared
- hardware {break,watch}point addresses are now strictly checked


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/aarch64/aarch64/db_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/aarch64/include/db_machdep.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/aarch64/aarch64/db_machdep.c
diff -u src/sys/arch/aarch64/aarch64/db_machdep.c:1.37 src/sys/arch/aarch64/aarch64/db_machdep.c:1.38
--- src/sys/arch/aarch64/aarch64/db_machdep.c:1.37	Tue Mar  9 16:44:27 2021
+++ src/sys/arch/aarch64/aarch64/db_machdep.c	Thu Mar 11 09:48:40 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.37 2021/03/09 16:44:27 ryo Exp $ */
+/* $NetBSD: db_machdep.c,v 1.38 2021/03/11 09:48:40 ryo Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.37 2021/03/09 16:44:27 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.38 2021/03/11 09:48:40 ryo Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd32.h"
@@ -699,7 +699,7 @@ aarch64_breakpoint_set(int n, vaddr_t ad
 		bvr = 0;
 		bcr = 0;
 	} else {
-		bvr = addr;
+		bvr = addr & DBGBVR_MASK;
 		bcr =
 		__SHIFTIN(0, DBGBCR_BT) |
 		__SHIFTIN(0, DBGBCR_LBN) |
@@ -714,7 +714,7 @@ aarch64_breakpoint_set(int n, vaddr_t ad
 }
 
 void
-aarch64_watchpoint_set(int n, vaddr_t addr, int size, int accesstype)
+aarch64_watchpoint_set(int n, vaddr_t addr, u_int size, u_int accesstype)
 {
 	uint64_t wvr, wcr;
 	uint32_t matchbytebit;
@@ -723,9 +723,13 @@ aarch64_watchpoint_set(int n, vaddr_t ad
 	if (size > 8)
 		size = 8;
 
-	/* BAS must be all of whose set bits are contiguous */
+	/*
+	 * It is always watched in 8byte units, and
+	 * BAS is a bit field of byte offset in 8byte units.
+	 */
 	matchbytebit = 0xff >> (8 - size);
 	matchbytebit <<= (addr & 7);
+	addr &= ~7UL;
 
 	/* load, store, or both */
 	accesstype &= WATCHPOINT_ACCESS_MASK;
@@ -752,24 +756,37 @@ aarch64_watchpoint_set(int n, vaddr_t ad
 	aarch64_set_wcr_wvr(n, wcr, wvr);
 }
 
-static void
+static int
 db_md_breakpoint_set(int n, vaddr_t addr)
 {
 	if (n >= __arraycount(breakpoint_buf))
-		return;
+		return -1;
+
+	if ((addr & 3) != 0) {
+		db_printf("address must be 4bytes aligned\n");
+		return -1;
+	}
 
 	breakpoint_buf[n].addr = addr;
+	return 0;
 }
 
-static void
-db_md_watchpoint_set(int n, vaddr_t addr, int size, int accesstype)
+static int
+db_md_watchpoint_set(int n, vaddr_t addr, u_int size, u_int accesstype)
 {
 	if (n >= __arraycount(watchpoint_buf))
-		return;
+		return -1;
+
+	if (size != 0 && ((addr) & ~7UL) != ((addr + size - 1) & ~7UL)) {
+		db_printf(
+		"address and size must fit within a block of 8bytes\n");
+		return -1;
+	}
 
 	watchpoint_buf[n].addr = addr;
 	watchpoint_buf[n].size = size;
 	watchpoint_buf[n].accesstype = accesstype;
+	return 0;
 }
 
 static void
@@ -893,7 +910,7 @@ void
 db_md_break_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
 const char *modif)
 {
-	int i;
+	int i, rc;
 	int added, cleared;
 
 	if (!have_addr) {
@@ -901,7 +918,6 @@ db_md_break_cmd(db_expr_t addr, bool hav
 		return;
 	}
 
-	addr &= DBGBVR_MASK;
 	added = -1;
 	cleared = -1;
 	if (0 <= addr && addr <= max_breakpoint) {
@@ -920,7 +936,9 @@ db_md_break_cmd(db_expr_t addr, bool hav
 		if (cleared == -1) {
 			for (i = 0; i <= max_breakpoint; i++) {
 if (breakpoint_buf[i].addr == 0) {
-	db_md_breakpoint_set(i, addr);
+	rc = db_md_breakpoint_set(i, addr);
+	if (rc != 0)
+		return;
 	added = i;
 	break;
 }
@@ -944,16 +962,15 @@ void
 db_md_watch_cmd(db_expr_t addr, bool have_addr, db_expr_t count,
 const char *modif)
 {
-	int i;
+	int i, rc;
 	int added, cleared;
-	int accesstype, watchsize;
+	u_int accesstype, watchsize;
 
 	if (!have_addr) {
 		show_watchpoints();
 		return;
 	}
 
-	addr &= DBGWVR_MASK;
 	accesstype = watchsize = 0;
 	if ((modif != NULL) && (*modif != '\0')) {
 		int ch;
@@ -1003,8 +1020,10 @@ db_md_watch_cmd(db_expr_t addr, bool hav
 		if (cleared == -1) {
 			for (i = 0; i <= max_watchpoint; i++) {
 if (watchpoint_buf[i].addr == 0) {
-	db_md_watchpoint_set(i, addr, watchsize,
-	accesstype);
+	rc = db_md_watchpoint_set(i, addr,
+	watchsize, accesstype);
+	if (rc != 0)
+		return;
 	added = i;
 	break;
 }

Index: src/sys/arch/aarch64/include/db_machdep.h
diff -u src/sys/arch/aarch64/include/db_machdep.h:1.12 src/sys/arch/aarch64/include/db_machdep.h:1.13
--- src/sys/arch/aarch64/include/db_machdep.h:1.12	Tue Mar  9 16:44:27 2021
+++

CVS commit: src/sys/arch/powerpc/include

2021-03-11 Thread Simon Burge

Module Name:src
Committed By:   simonb
Date:   Thu Mar 11 08:33:34 UTC 2021

Modified Files:
src/sys/arch/powerpc/include: db_machdep.h

Log Message:
Use ifdef _KERNEL_OPT instead of ifdef _KERNEL before including
"opt_ppcarch.h".


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/powerpc/include/db_machdep.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/powerpc/include/db_machdep.h
diff -u src/sys/arch/powerpc/include/db_machdep.h:1.29 src/sys/arch/powerpc/include/db_machdep.h:1.30
--- src/sys/arch/powerpc/include/db_machdep.h:1.29	Wed Jan  6 08:14:34 2021
+++ src/sys/arch/powerpc/include/db_machdep.h	Thu Mar 11 08:33:34 2021
@@ -1,5 +1,5 @@
 /*	$OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $	*/
-/*	$NetBSD: db_machdep.h,v 1.29 2021/01/06 08:14:34 rin Exp $	*/
+/*	$NetBSD: db_machdep.h,v 1.30 2021/03/11 08:33:34 simonb Exp $	*/
 
 /* 
  * Mach Operating System
@@ -33,7 +33,7 @@
 #ifndef	_PPC_DB_MACHDEP_H_
 #define	_PPC_DB_MACHDEP_H_
 
-#ifdef _KERNEL
+#if defined(_KERNEL_OPT)
 #include "opt_ppcarch.h"
 #endif

52 matches

Mail list logo