CVS commit: src/sys/dev/usb

2021-10-15 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sat Oct 16 05:40:46 UTC 2021

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

Log Message:
apply always-open quirk for logitech B100 mouse.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/usb/usb_quirks.c

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

Modified files:

Index: src/sys/dev/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.99 src/sys/dev/usb/usb_quirks.c:1.100
--- src/sys/dev/usb/usb_quirks.c:1.99	Fri Oct  1 21:09:50 2021
+++ src/sys/dev/usb/usb_quirks.c	Sat Oct 16 05:40:46 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_quirks.c,v 1.99 2021/10/01 21:09:50 macallan Exp $	*/
+/*	$NetBSD: usb_quirks.c,v 1.100 2021/10/16 05:40:46 mrg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.99 2021/10/01 21:09:50 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.100 2021/10/16 05:40:46 mrg Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -393,6 +393,8 @@ Static const struct usbd_quirk_entry {
 	{ UQ_ALWAYS_ON, NULL }},
  { USB_VENDOR_PIXART,		USB_PRODUCT_PIXART_RPIMOUSE,		ANY,
 	{ UQ_ALWAYS_ON, NULL }},
+ { USB_VENDOR_LOGITECH, 	USB_PRODUCT_LOGITECH_B100,		ANY,
+	{ UQ_ALWAYS_ON, NULL }},
 /*
  * The HAILUCK USB Keyboard has a built-in touchpad, which
  * needs to be active for the keyboard to function properly.

CVS commit: src/sys/dev/usb

2021-10-15 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sat Oct 16 05:40:46 UTC 2021

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

Log Message:
apply always-open quirk for logitech B100 mouse.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/dev/usb/usb_quirks.c

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

CVS commit: src/tests/usr.bin/indent

2021-10-15 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Oct 16 05:40:17 UTC 2021

Modified Files:
src/tests/usr.bin/indent: opt_bbb.c opt_bc.c opt_bs.c opt_cdb.c
opt_ce.c opt_cs.c opt_eei.c opt_ei.c opt_fbs.c opt_fc1.c opt_fcb.c
opt_ip.c opt_lp.c opt_lpl.c opt_pcs.c opt_psl.c opt_sc.c opt_sob.c
t_options.sh

Log Message:
tests/indent: remove duplicate data from options tests


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/indent/opt_bbb.c \
src/tests/usr.bin/indent/opt_bc.c src/tests/usr.bin/indent/opt_bs.c \
src/tests/usr.bin/indent/opt_cdb.c src/tests/usr.bin/indent/opt_ce.c \
src/tests/usr.bin/indent/opt_cs.c src/tests/usr.bin/indent/opt_eei.c \
src/tests/usr.bin/indent/opt_ei.c src/tests/usr.bin/indent/opt_fbs.c \
src/tests/usr.bin/indent/opt_fc1.c src/tests/usr.bin/indent/opt_fcb.c \
src/tests/usr.bin/indent/opt_ip.c src/tests/usr.bin/indent/opt_lp.c \
src/tests/usr.bin/indent/opt_lpl.c src/tests/usr.bin/indent/opt_pcs.c \
src/tests/usr.bin/indent/opt_psl.c src/tests/usr.bin/indent/opt_sc.c \
src/tests/usr.bin/indent/opt_sob.c src/tests/usr.bin/indent/t_options.sh

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

Modified files:

Index: src/tests/usr.bin/indent/opt_bbb.c
diff -u src/tests/usr.bin/indent/opt_bbb.c:1.1 src/tests/usr.bin/indent/opt_bbb.c:1.2
--- src/tests/usr.bin/indent/opt_bbb.c:1.1	Sat Oct 16 03:20:13 2021
+++ src/tests/usr.bin/indent/opt_bbb.c	Sat Oct 16 05:40:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_bbb.c,v 1.1 2021/10/16 03:20:13 rillig Exp $ */
+/* $NetBSD: opt_bbb.c,v 1.2 2021/10/16 05:40:17 rillig Exp $ */
 /* $FreeBSD$ */
 
 #indent input
@@ -57,32 +57,6 @@ function_definition(void)
 }
 #indent end
 
-#indent input
-/*
- * This is a block comment.
- */
-/* This is not a block comment since it is single-line. */
-/*
- * This is a second block comment.
- */
-/* This is not a block comment. */
-/*
- * Documentation of global_variable.
- */
-int global_variable;
-/*
- * Documentation of function_declaration.
- */
-void function_declaration(void);
-/*
- * Documentation of function_definition.
- */
-void
-function_definition(void)
-{
-}
-#indent end
-
 #indent run -nbbb
 /*
  * This is a block comment.
Index: src/tests/usr.bin/indent/opt_bc.c
diff -u src/tests/usr.bin/indent/opt_bc.c:1.1 src/tests/usr.bin/indent/opt_bc.c:1.2
--- src/tests/usr.bin/indent/opt_bc.c:1.1	Sat Oct 16 03:20:13 2021
+++ src/tests/usr.bin/indent/opt_bc.c	Sat Oct 16 05:40:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_bc.c,v 1.1 2021/10/16 03:20:13 rillig Exp $ */
+/* $NetBSD: opt_bc.c,v 1.2 2021/10/16 05:40:17 rillig Exp $ */
 /* $FreeBSD$ */
 
 #indent input
@@ -13,11 +13,6 @@ int		a,
 void		function_declaration(int a, int b, int c);
 #indent end
 
-#indent input
-int a,b,c;
-void function_declaration(int a,int b,int c);
-#indent end
-
 #indent run -nbc
 int		a, b, c;
 void		function_declaration(int a, int b, int c);
Index: src/tests/usr.bin/indent/opt_bs.c
diff -u src/tests/usr.bin/indent/opt_bs.c:1.1 src/tests/usr.bin/indent/opt_bs.c:1.2
--- src/tests/usr.bin/indent/opt_bs.c:1.1	Sat Oct 16 03:20:13 2021
+++ src/tests/usr.bin/indent/opt_bs.c	Sat Oct 16 05:40:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_bs.c,v 1.1 2021/10/16 03:20:13 rillig Exp $ */
+/* $NetBSD: opt_bs.c,v 1.2 2021/10/16 05:40:17 rillig Exp $ */
 /* $FreeBSD$ */
 
 #indent input
@@ -35,23 +35,6 @@ example(int i)
 }
 #indent end
 
-#indent input
-void
-example(int i)
-{
-	print(sizeof(i));
-	print(sizeof(int));
-
-	print(sizeof i);
-	print(sizeof (i));
-	print(sizeof (int));
-
-	print(sizeof   i);
-	print(sizeof   (i));
-	print(sizeof   (int));
-}
-#indent end
-
 #indent run -nbs
 void
 example(int i)
Index: src/tests/usr.bin/indent/opt_cdb.c
diff -u src/tests/usr.bin/indent/opt_cdb.c:1.1 src/tests/usr.bin/indent/opt_cdb.c:1.2
--- src/tests/usr.bin/indent/opt_cdb.c:1.1	Sat Oct 16 03:20:13 2021
+++ src/tests/usr.bin/indent/opt_cdb.c	Sat Oct 16 05:40:17 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: opt_cdb.c,v 1.1 2021/10/16 03:20:13 rillig Exp $ */
+/* $NetBSD: opt_cdb.c,v 1.2 2021/10/16 05:40:17 rillig Exp $ */
 /* $FreeBSD$ */
 
 #indent input
@@ -81,51 +81,6 @@ example(void)
 }
 #indent end
 
-#indent input
-/* A single-line comment. */
-
-/* A
- * multi-line
- * comment. */
-
-/*
- * A
- * multi-line
- * comment.
- */
-
-int		ga;		/* A single-line comment. */
-
-int		gb;		/* A
- * multi-line
- * comment. */
-
-int		gc;		/*
- * A
- * multi-line
- * comment.
- */
-
-void
-example(void)
-{
-	/* A single-line comment. */
-	int la;
-
-	/* A
-	 * multi-line
-	 * comment. */
-	int lb;
-
-	/*
-	 * A
-	 * multi-line
-	 * comment.
-	 */
-	int lc;
-}
-#indent end
-
 #indent run -ncdb
 /* A single-line comment. */
 
Index: src/tests/usr.bin/indent/opt_ce.c
diff -u src/tests/usr.bin/indent/opt_ce.c:1.1 src/tests/usr.bin/indent/opt_ce.c:1.2
---

CVS commit: src/tests/usr.bin/indent

2021-10-15 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Oct 16 05:40:17 UTC 2021

Modified Files:
src/tests/usr.bin/indent: opt_bbb.c opt_bc.c opt_bs.c opt_cdb.c
opt_ce.c opt_cs.c opt_eei.c opt_ei.c opt_fbs.c opt_fc1.c opt_fcb.c
opt_ip.c opt_lp.c opt_lpl.c opt_pcs.c opt_psl.c opt_sc.c opt_sob.c
t_options.sh

Log Message:
tests/indent: remove duplicate data from options tests


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/indent/opt_bbb.c \
src/tests/usr.bin/indent/opt_bc.c src/tests/usr.bin/indent/opt_bs.c \
src/tests/usr.bin/indent/opt_cdb.c src/tests/usr.bin/indent/opt_ce.c \
src/tests/usr.bin/indent/opt_cs.c src/tests/usr.bin/indent/opt_eei.c \
src/tests/usr.bin/indent/opt_ei.c src/tests/usr.bin/indent/opt_fbs.c \
src/tests/usr.bin/indent/opt_fc1.c src/tests/usr.bin/indent/opt_fcb.c \
src/tests/usr.bin/indent/opt_ip.c src/tests/usr.bin/indent/opt_lp.c \
src/tests/usr.bin/indent/opt_lpl.c src/tests/usr.bin/indent/opt_pcs.c \
src/tests/usr.bin/indent/opt_psl.c src/tests/usr.bin/indent/opt_sc.c \
src/tests/usr.bin/indent/opt_sob.c src/tests/usr.bin/indent/t_options.sh

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

CVS commit: src/sys/dev/usb

2021-10-15 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sat Oct 16 05:39:32 UTC 2021

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
regen.


To generate a diff of this commit:
cvs rdiff -u -r1.785 -r1.786 src/sys/dev/usb/usbdevs.h \
src/sys/dev/usb/usbdevs_data.h

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

CVS commit: src/sys/dev/usb

2021-10-15 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sat Oct 16 05:39:11 UTC 2021

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
add logitech B100 mouse


To generate a diff of this commit:
cvs rdiff -u -r1.795 -r1.796 src/sys/dev/usb/usbdevs

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

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.795 src/sys/dev/usb/usbdevs:1.796
--- src/sys/dev/usb/usbdevs:1.795	Fri Oct  1 21:01:34 2021
+++ src/sys/dev/usb/usbdevs	Sat Oct 16 05:39:11 2021
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.795 2021/10/01 21:01:34 macallan Exp $
+$NetBSD: usbdevs,v 1.796 2021/10/16 05:39:11 mrg Exp $
 
 /*-
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -2190,6 +2190,7 @@ product LOGITECH BD58		0xc00c	BD58 mouse
 product LOGITECH USBPS2MOUSE	0xc00e	USB-PS/2 Optical Mouse
 product LOGITECH MUV55A		0xc016	M-UV55a
 product LOGITECH UN58A		0xc030	iFeel Mouse
+product LOGITECH B100		0xc077	B100 Optical Mouse
 product LOGITECH WMPAD		0xc208	WingMan GamePad Extreme
 product LOGITECH WMRPAD		0xc20a	WingMan RumblePad
 product LOGITECH WMJOY		0xc281	WingMan Force joystick

CVS commit: src/sys/dev/usb

2021-10-15 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sat Oct 16 05:39:11 UTC 2021

Modified Files:
src/sys/dev/usb: usbdevs

Log Message:
add logitech B100 mouse


To generate a diff of this commit:
cvs rdiff -u -r1.795 -r1.796 src/sys/dev/usb/usbdevs

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

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

2021-10-15 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Oct 16 05:21:57 UTC 2021

Modified Files:
src/distrib/sets/lists/tests: mi

Log Message:
tests/indent: remove accidentally added file from the mi list


To generate a diff of this commit:
cvs rdiff -u -r1.1139 -r1.1140 src/distrib/sets/lists/tests/mi

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

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1139 src/distrib/sets/lists/tests/mi:1.1140
--- src/distrib/sets/lists/tests/mi:1.1139	Sat Oct 16 03:20:12 2021
+++ src/distrib/sets/lists/tests/mi	Sat Oct 16 05:21:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1139 2021/10/16 03:20:12 rillig Exp $
+# $NetBSD: mi,v 1.1140 2021/10/16 05:21:57 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5001,7 +5001,6 @@
 ./usr/tests/usr.bin/indent/opt_cdb.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/indent/opt_ce.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/indent/opt_cs.c	tests-usr.bin-tests	compattestfile,atf
-./usr/tests/usr.bin/indent/opt_di.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/indent/opt_dj.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/indent/opt_eei.c	tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/indent/opt_ei.c	tests-usr.bin-tests	compattestfile,atf

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

2021-10-15 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Oct 16 05:21:57 UTC 2021

Modified Files:
src/distrib/sets/lists/tests: mi

Log Message:
tests/indent: remove accidentally added file from the mi list


To generate a diff of this commit:
cvs rdiff -u -r1.1139 -r1.1140 src/distrib/sets/lists/tests/mi

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

CVS commit: src

2021-10-15 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Oct 16 03:20:13 UTC 2021

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/indent: Makefile
Added Files:
src/tests/usr.bin/indent: opt_bacc.c opt_bad.c opt_badp.c opt_bap.c
opt_bbb.c opt_bc.c opt_bs.c opt_cdb.c opt_ce.c opt_cs.c opt_dj.c
opt_eei.c opt_ei.c opt_fbs.c opt_fc1.c opt_fcb.c opt_ip.c opt_lp.c
opt_lpl.c opt_pcs.c opt_psl.c opt_sc.c opt_sob.c opt_ut.c opt_v.c
t_options.sh
Removed Files:
src/tests/usr.bin/indent: opt-bacc.0 opt-bacc.0.pro opt-bacc.0.stdout
opt-bad.0 opt-bad.0.pro opt-bad.0.stdout opt-badp.0 opt-badp.0.pro
opt-badp.0.stdout opt-bap.0 opt-bap.0.pro opt-bap.0.stdout
opt-bbb.0 opt-bbb.0.pro opt-bbb.0.stdout opt-bc.0 opt-bc.0.pro
opt-bc.0.stdout opt-bs.0 opt-bs.0.pro opt-bs.0.stdout opt-cdb.0
opt-cdb.0.pro opt-cdb.0.stdout opt-ce.0 opt-ce.0.pro
opt-ce.0.stdout opt-cs.0 opt-cs.0.pro opt-cs.0.stdout opt-dj.0
opt-dj.0.pro opt-dj.0.stdout opt-eei.0 opt-eei.0.pro
opt-eei.0.stdout opt-ei.0 opt-ei.0.pro opt-ei.0.stdout opt-fbs.0
opt-fbs.0.pro opt-fbs.0.stdout opt-fc1.0 opt-fc1.0.pro
opt-fc1.0.stdout opt-fcb.0 opt-fcb.0.pro opt-fcb.0.stdout opt-ip.0
opt-ip.0.pro opt-ip.0.stdout opt-lp.0 opt-lp.0.pro opt-lp.0.stdout
opt-lpl.0 opt-lpl.0.pro opt-lpl.0.stdout opt-nbacc.0
opt-nbacc.0.pro opt-nbacc.0.stdout opt-nbad.0 opt-nbad.0.pro
opt-nbad.0.stdout opt-nbadp.0 opt-nbadp.0.pro opt-nbadp.0.stdout
opt-nbap.0 opt-nbap.0.pro opt-nbap.0.stdout opt-nbbb.0
opt-nbbb.0.pro opt-nbbb.0.stdout opt-nbc.0 opt-nbc.0.pro
opt-nbc.0.stdout opt-nbs.0 opt-nbs.0.pro opt-nbs.0.stdout
opt-ncdb.0 opt-ncdb.0.pro opt-ncdb.0.stdout opt-nce.0 opt-nce.0.pro
opt-nce.0.stdout opt-ncs.0 opt-ncs.0.pro opt-ncs.0.stdout opt-ndj.0
opt-ndj.0.pro opt-ndj.0.stdout opt-neei.0 opt-neei.0.pro
opt-neei.0.stdout opt-nei.0 opt-nei.0.pro opt-nei.0.stdout
opt-nfbs.0 opt-nfbs.0.pro opt-nfbs.0.stdout opt-nfc1.0
opt-nfc1.0.pro opt-nfc1.0.stdout opt-nfcb.0 opt-nfcb.0.pro
opt-nfcb.0.stdout opt-nip.0 opt-nip.0.pro opt-nip.0.stdout
opt-nlp.0 opt-nlp.0.pro opt-nlp.0.stdout opt-nlpl.0 opt-nlpl.0.pro
opt-nlpl.0.stdout opt-npcs.0 opt-npcs.0.pro opt-npcs.0.stdout
opt-npsl.0 opt-npsl.0.pro opt-npsl.0.stdout opt-nsc.0 opt-nsc.0.pro
opt-nsc.0.stdout opt-nsob.0 opt-nsob.0.pro opt-nsob.0.stdout
opt-nut.0 opt-nut.0.pro opt-nut.0.stdout opt-nv.0 opt-nv.0.pro
opt-nv.0.stdout opt-pcs.0 opt-pcs.0.pro opt-pcs.0.stdout opt-psl.0
opt-psl.0.pro opt-psl.0.stdout opt-sc.0 opt-sc.0.pro
opt-sc.0.stdout opt-sob.0 opt-sob.0.pro opt-sob.0.stdout opt-ut.0
opt-ut.0.pro opt-ut.0.stdout opt-v.0 opt-v.0.pro opt-v.0.stdout

Log Message:
tests/indent: condense tests for bool options

Previously, each bool option such as '-bacc/-nbacc' had 6 test files:
input, options, output for the positive and negative option. Splitting
this test data into separate files made it harder than necessary to
quickly compare the test output from '-bacc' with that of '-nbacc'.

Have a single test for the positive and negative option, allowing
several tests to run on the same input with different options.

This commit only contains the rather mechanic changes of concatenating
the previous test files and inserting the '#indent' directives, which
are documented in t_options.sh. Removing duplicate input sections, as
well as other cleanups will follow soon.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.1138 -r1.1139 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.15 -r1.16 src/tests/usr.bin/indent/Makefile
cvs rdiff -u -r1.3 -r0 src/tests/usr.bin/indent/opt-bacc.0 \
src/tests/usr.bin/indent/opt-bacc.0.stdout \
src/tests/usr.bin/indent/opt-nbacc.0 \
src/tests/usr.bin/indent/opt-nbacc.0.stdout \
src/tests/usr.bin/indent/opt-nsob.0 \
src/tests/usr.bin/indent/opt-nsob.0.stdout \
src/tests/usr.bin/indent/opt-v.0 src/tests/usr.bin/indent/opt-v.0.stdout
cvs rdiff -u -r1.1 -r0 src/tests/usr.bin/indent/opt-bacc.0.pro \
src/tests/usr.bin/indent/opt-bad.0.pro \
src/tests/usr.bin/indent/opt-badp.0.pro \
src/tests/usr.bin/indent/opt-bap.0.pro \
src/tests/usr.bin/indent/opt-bbb.0.pro \
src/tests/usr.bin/indent/opt-bc.0.pro \
src/tests/usr.bin/indent/opt-bs.0.pro \
src/tests/usr.bin/indent/opt-cdb.0.pro \
src/tests/usr.bin/indent/opt-ce.0.pro \
src/tests/usr.bin/indent/opt-cs.0.pro \
src/tests/usr.bin/indent/opt-dj.0.pro \
src/tests/usr.bin/indent/opt-eei.0.pro \
src/tests/usr.bin/indent/opt-ei.0.pro \
src/tests/usr.bin/indent/opt-fbs.0.pro \

CVS commit: src

2021-10-15 Thread Roland Illig 
Module Name:src
Committed By:   rillig
Date:   Sat Oct 16 03:20:13 UTC 2021

Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/indent: Makefile
Added Files:
src/tests/usr.bin/indent: opt_bacc.c opt_bad.c opt_badp.c opt_bap.c
opt_bbb.c opt_bc.c opt_bs.c opt_cdb.c opt_ce.c opt_cs.c opt_dj.c
opt_eei.c opt_ei.c opt_fbs.c opt_fc1.c opt_fcb.c opt_ip.c opt_lp.c
opt_lpl.c opt_pcs.c opt_psl.c opt_sc.c opt_sob.c opt_ut.c opt_v.c
t_options.sh
Removed Files:
src/tests/usr.bin/indent: opt-bacc.0 opt-bacc.0.pro opt-bacc.0.stdout
opt-bad.0 opt-bad.0.pro opt-bad.0.stdout opt-badp.0 opt-badp.0.pro
opt-badp.0.stdout opt-bap.0 opt-bap.0.pro opt-bap.0.stdout
opt-bbb.0 opt-bbb.0.pro opt-bbb.0.stdout opt-bc.0 opt-bc.0.pro
opt-bc.0.stdout opt-bs.0 opt-bs.0.pro opt-bs.0.stdout opt-cdb.0
opt-cdb.0.pro opt-cdb.0.stdout opt-ce.0 opt-ce.0.pro
opt-ce.0.stdout opt-cs.0 opt-cs.0.pro opt-cs.0.stdout opt-dj.0
opt-dj.0.pro opt-dj.0.stdout opt-eei.0 opt-eei.0.pro
opt-eei.0.stdout opt-ei.0 opt-ei.0.pro opt-ei.0.stdout opt-fbs.0
opt-fbs.0.pro opt-fbs.0.stdout opt-fc1.0 opt-fc1.0.pro
opt-fc1.0.stdout opt-fcb.0 opt-fcb.0.pro opt-fcb.0.stdout opt-ip.0
opt-ip.0.pro opt-ip.0.stdout opt-lp.0 opt-lp.0.pro opt-lp.0.stdout
opt-lpl.0 opt-lpl.0.pro opt-lpl.0.stdout opt-nbacc.0
opt-nbacc.0.pro opt-nbacc.0.stdout opt-nbad.0 opt-nbad.0.pro
opt-nbad.0.stdout opt-nbadp.0 opt-nbadp.0.pro opt-nbadp.0.stdout
opt-nbap.0 opt-nbap.0.pro opt-nbap.0.stdout opt-nbbb.0
opt-nbbb.0.pro opt-nbbb.0.stdout opt-nbc.0 opt-nbc.0.pro
opt-nbc.0.stdout opt-nbs.0 opt-nbs.0.pro opt-nbs.0.stdout
opt-ncdb.0 opt-ncdb.0.pro opt-ncdb.0.stdout opt-nce.0 opt-nce.0.pro
opt-nce.0.stdout opt-ncs.0 opt-ncs.0.pro opt-ncs.0.stdout opt-ndj.0
opt-ndj.0.pro opt-ndj.0.stdout opt-neei.0 opt-neei.0.pro
opt-neei.0.stdout opt-nei.0 opt-nei.0.pro opt-nei.0.stdout
opt-nfbs.0 opt-nfbs.0.pro opt-nfbs.0.stdout opt-nfc1.0
opt-nfc1.0.pro opt-nfc1.0.stdout opt-nfcb.0 opt-nfcb.0.pro
opt-nfcb.0.stdout opt-nip.0 opt-nip.0.pro opt-nip.0.stdout
opt-nlp.0 opt-nlp.0.pro opt-nlp.0.stdout opt-nlpl.0 opt-nlpl.0.pro
opt-nlpl.0.stdout opt-npcs.0 opt-npcs.0.pro opt-npcs.0.stdout
opt-npsl.0 opt-npsl.0.pro opt-npsl.0.stdout opt-nsc.0 opt-nsc.0.pro
opt-nsc.0.stdout opt-nsob.0 opt-nsob.0.pro opt-nsob.0.stdout
opt-nut.0 opt-nut.0.pro opt-nut.0.stdout opt-nv.0 opt-nv.0.pro
opt-nv.0.stdout opt-pcs.0 opt-pcs.0.pro opt-pcs.0.stdout opt-psl.0
opt-psl.0.pro opt-psl.0.stdout opt-sc.0 opt-sc.0.pro
opt-sc.0.stdout opt-sob.0 opt-sob.0.pro opt-sob.0.stdout opt-ut.0
opt-ut.0.pro opt-ut.0.stdout opt-v.0 opt-v.0.pro opt-v.0.stdout

Log Message:
tests/indent: condense tests for bool options

Previously, each bool option such as '-bacc/-nbacc' had 6 test files:
input, options, output for the positive and negative option. Splitting
this test data into separate files made it harder than necessary to
quickly compare the test output from '-bacc' with that of '-nbacc'.

Have a single test for the positive and negative option, allowing
several tests to run on the same input with different options.

This commit only contains the rather mechanic changes of concatenating
the previous test files and inserting the '#indent' directives, which
are documented in t_options.sh. Removing duplicate input sections, as
well as other cleanups will follow soon.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.1138 -r1.1139 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.15 -r1.16 src/tests/usr.bin/indent/Makefile
cvs rdiff -u -r1.3 -r0 src/tests/usr.bin/indent/opt-bacc.0 \
src/tests/usr.bin/indent/opt-bacc.0.stdout \
src/tests/usr.bin/indent/opt-nbacc.0 \
src/tests/usr.bin/indent/opt-nbacc.0.stdout \
src/tests/usr.bin/indent/opt-nsob.0 \
src/tests/usr.bin/indent/opt-nsob.0.stdout \
src/tests/usr.bin/indent/opt-v.0 src/tests/usr.bin/indent/opt-v.0.stdout
cvs rdiff -u -r1.1 -r0 src/tests/usr.bin/indent/opt-bacc.0.pro \
src/tests/usr.bin/indent/opt-bad.0.pro \
src/tests/usr.bin/indent/opt-badp.0.pro \
src/tests/usr.bin/indent/opt-bap.0.pro \
src/tests/usr.bin/indent/opt-bbb.0.pro \
src/tests/usr.bin/indent/opt-bc.0.pro \
src/tests/usr.bin/indent/opt-bs.0.pro \
src/tests/usr.bin/indent/opt-cdb.0.pro \
src/tests/usr.bin/indent/opt-ce.0.pro \
src/tests/usr.bin/indent/opt-cs.0.pro \
src/tests/usr.bin/indent/opt-dj.0.pro \
src/tests/usr.bin/indent/opt-eei.0.pro \
src/tests/usr.bin/indent/opt-ei.0.pro \
src/tests/usr.bin/indent/opt-fbs.0.pro \

CVS commit: src

2021-10-15 Thread Andrius Varanavicius 
Module Name:src
Committed By:   andvar
Date:   Fri Oct 15 22:32:29 UTC 2021

Modified Files:
src/include: unistd.h
src/sys/crypto/blowfish: bf_locl.h
src/sys/dev/ic: aic79xxvar.h
src/sys/ufs/lfs: ulfs_quota2.c
src/sys/ufs/ufs: ufs_quota2.c

Log Message:
fix typos in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/include/unistd.h
cvs rdiff -u -r1.6 -r1.7 src/sys/crypto/blowfish/bf_locl.h
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/aic79xxvar.h
cvs rdiff -u -r1.33 -r1.34 src/sys/ufs/lfs/ulfs_quota2.c
cvs rdiff -u -r1.43 -r1.44 src/sys/ufs/ufs/ufs_quota2.c

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

Modified files:

Index: src/include/unistd.h
diff -u src/include/unistd.h:1.161 src/include/unistd.h:1.162
--- src/include/unistd.h:1.161	Fri Dec  4 23:04:58 2020
+++ src/include/unistd.h	Fri Oct 15 22:32:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: unistd.h,v 1.161 2020/12/04 23:04:58 kre Exp $	*/
+/*	$NetBSD: unistd.h,v 1.162 2021/10/15 22:32:28 andvar Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -187,7 +187,7 @@ off_t	 lseek(int, off_t, int);
 int	 truncate(const char *, off_t);
 /*
  * IEEE Std 1003.1b-93,
- * also found in X/Open Portability Guide >= Issue 4 Verion 2
+ * also found in X/Open Portability Guide >= Issue 4 Version 2
  */
 #if (_POSIX_C_SOURCE - 0) >= 199309L || \
 (defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)) || \

Index: src/sys/crypto/blowfish/bf_locl.h
diff -u src/sys/crypto/blowfish/bf_locl.h:1.6 src/sys/crypto/blowfish/bf_locl.h:1.7
--- src/sys/crypto/blowfish/bf_locl.h:1.6	Mon Feb  4 08:23:53 2019
+++ src/sys/crypto/blowfish/bf_locl.h	Fri Oct 15 22:32:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: bf_locl.h,v 1.6 2019/02/04 08:23:53 mrg Exp $	*/
+/*	$NetBSD: bf_locl.h,v 1.7 2021/10/15 22:32:28 andvar Exp $	*/
 /*	$KAME: bf_locl.h,v 1.5 2000/08/31 06:03:48 itojun Exp $	*/
 
 /* crypto/bf/bf_local.h */
@@ -179,7 +179,7 @@
 
 #if defined(BF_PTR2)
 
-/* This is basically a special pentium verson */
+/* This is basically a special pentium version */
 #define BF_ENC(LL,R,S,P) \
 	{ \
 	BF_LONG t,u,v; \

Index: src/sys/dev/ic/aic79xxvar.h
diff -u src/sys/dev/ic/aic79xxvar.h:1.28 src/sys/dev/ic/aic79xxvar.h:1.29
--- src/sys/dev/ic/aic79xxvar.h:1.28	Sun Aug 22 19:56:15 2021
+++ src/sys/dev/ic/aic79xxvar.h	Fri Oct 15 22:32:28 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: aic79xxvar.h,v 1.28 2021/08/22 19:56:15 andvar Exp $	*/
+/*	$NetBSD: aic79xxvar.h,v 1.29 2021/10/15 22:32:28 andvar Exp $	*/
 
 /*
  * Core definitions and data structures sharable across OS platforms.
@@ -1186,7 +1186,7 @@ struct ahd_softc {
 	uint8_t			  tqinfifonext;
 
 	/*
-	 * Cached verson of the hs_mailbox so we can avoid
+	 * Cached version of the hs_mailbox so we can avoid
 	 * pausing the sequencer during mailbox updates.
 	 */
 	uint8_t			  hs_mailbox;

Index: src/sys/ufs/lfs/ulfs_quota2.c
diff -u src/sys/ufs/lfs/ulfs_quota2.c:1.33 src/sys/ufs/lfs/ulfs_quota2.c:1.34
--- src/sys/ufs/lfs/ulfs_quota2.c:1.33	Sat Dec  5 17:40:00 2020
+++ src/sys/ufs/lfs/ulfs_quota2.c	Fri Oct 15 22:32:29 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ulfs_quota2.c,v 1.33 2020/12/05 17:40:00 thorpej Exp $	*/
+/*	$NetBSD: ulfs_quota2.c,v 1.34 2021/10/15 22:32:29 andvar Exp $	*/
 /*  from NetBSD: ufs_quota2.c,v 1.40 2015/03/28 19:24:05 maxv Exp Exp  */
 /*  from NetBSD: ffs_quota2.c,v 1.5 2015/02/22 14:12:48 maxv Exp  */
 
@@ -29,7 +29,7 @@
   */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.33 2020/12/05 17:40:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.34 2021/10/15 22:32:29 andvar Exp $");
 
 #include 
 #include 
@@ -311,7 +311,7 @@ quota2_q2ealloc(struct ulfsmount *ump, i
 		struct vnode *vp = ump->um_quotas[type];
 		struct inode *ip = VTOI(vp);
 		uint64_t size = ip->i_size;
-		/* need to alocate a new disk block */
+		/* need to allocate a new disk block */
 		error = lfs_balloc(vp, size, ump->umq2_bsize,
 		ump->um_cred[type], B_CLRBUF | B_SYNC, );
 		if (error) {

Index: src/sys/ufs/ufs/ufs_quota2.c
diff -u src/sys/ufs/ufs/ufs_quota2.c:1.43 src/sys/ufs/ufs/ufs_quota2.c:1.44
--- src/sys/ufs/ufs/ufs_quota2.c:1.43	Sat Dec  5 17:33:54 2020
+++ src/sys/ufs/ufs/ufs_quota2.c	Fri Oct 15 22:32:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota2.c,v 1.43 2020/12/05 17:33:54 thorpej Exp $ */
+/* $NetBSD: ufs_quota2.c,v 1.44 2021/10/15 22:32:29 andvar Exp $ */
 /*-
   * Copyright (c) 2010 Manuel Bouyer
   * All rights reserved.
@@ -26,7 +26,7 @@
   */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.43 2020/12/05 17:33:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota2.c,v 1.44 2021/10/15 22:32:29 andvar Exp $");
 
 #include 
 #include 
@@ -304,7 +304,7 @@ quota2_q2ealloc(struct ufsmount *ump, in
 		struct vnode *vp = ump->um_quotas[type];
 		struct inode *ip = VTOI(vp);
 		uint64_t size = ip->i_size;
-		/* need to alocate a new disk

CVS commit: src

2021-10-15 Thread Andrius Varanavicius 
Module Name:src
Committed By:   andvar
Date:   Fri Oct 15 22:32:29 UTC 2021

Modified Files:
src/include: unistd.h
src/sys/crypto/blowfish: bf_locl.h
src/sys/dev/ic: aic79xxvar.h
src/sys/ufs/lfs: ulfs_quota2.c
src/sys/ufs/ufs: ufs_quota2.c

Log Message:
fix typos in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/include/unistd.h
cvs rdiff -u -r1.6 -r1.7 src/sys/crypto/blowfish/bf_locl.h
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/aic79xxvar.h
cvs rdiff -u -r1.33 -r1.34 src/sys/ufs/lfs/ulfs_quota2.c
cvs rdiff -u -r1.43 -r1.44 src/sys/ufs/ufs/ufs_quota2.c

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

Re: CVS commit: src/sys/arch/x86/x86

2021-10-15 Thread Paul Goyette 

hehehe - porn iterators - love it!


On Fri, 15 Oct 2021, Jason Thorpe wrote:


I demand this change be reverted.

(/s)


On Oct 15, 2021, at 11:12 AM, Jared D. McNeill  wrote:

Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 18:12:48 UTC 2021

Modified Files:
src/sys/arch/x86/x86: tsc.c

Log Message:
Fix typo in comment: "porniters" -> "pointers"


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/x86/tsc.c

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



-- thorpej


!DSPAM:6169cf82254421105921466!




++--+--+
| Paul Goyette   | PGP Key fingerprint: | E-mail addresses:|
| (Retired)  | FA29 0E3B 35AF E8AE 6651 | p...@whooppee.com|
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoye...@netbsd.org  |
| & Network Engineer |  | pgoyett...@gmail.com |
++--+--+

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

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 19:22:12 UTC 2021

Modified Files:
src/sys/arch/amd64/conf: GENERIC

Log Message:
Swap fdc@isa for fdc@acpi as the former takes over a second to probe.


To generate a diff of this commit:
cvs rdiff -u -r1.590 -r1.591 src/sys/arch/amd64/conf/GENERIC

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

Modified files:

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.590 src/sys/arch/amd64/conf/GENERIC:1.591
--- src/sys/arch/amd64/conf/GENERIC:1.590	Thu Sep  9 13:22:50 2021
+++ src/sys/arch/amd64/conf/GENERIC	Fri Oct 15 19:22:12 2021
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.590 2021/09/09 13:22:50 jakllsch Exp $
+# $NetBSD: GENERIC,v 1.591 2021/10/15 19:22:12 jmcneill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.590 $"
+#ident		"GENERIC-$Revision: 1.591 $"
 
 maxusers	64		# estimated number of users
 
@@ -338,7 +338,8 @@ aibs*		at acpi?		# ASUSTeK AI Booster ha
 asus*		at acpi?		# ASUS hotkeys
 attimer*	at acpi?		# AT Timer
 #com*		at acpi?		# Serial communications interface
-#fdc*		at acpi?		# Floppy disk controller
+fdc*		at acpi?		# Floppy disk controller
+fd*		at fdc? drive ?		# the drives themselves
 fujbp*		at acpi?		# Fujitsu Brightness & Pointer
 fujhk*		at acpi?		# Fujitsu Hotkeys
 #hpacel* 	at acpi?		# HP 3D DriveGuard accelerometer
@@ -784,11 +785,8 @@ ld*	at nvme? nsid ?
 # Miscellaneous mass storage devices
 
 # ISA floppy
-fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
+#fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
 #fdc1	at isa? port 0x370 irq ? drq ?
-fd*	at fdc? drive ?			# the drives themselves
-# some machines need you to do this instead of fd*
-#fd0	at fdc0 drive 0
 
 # Network Interfaces

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

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 19:22:12 UTC 2021

Modified Files:
src/sys/arch/amd64/conf: GENERIC

Log Message:
Swap fdc@isa for fdc@acpi as the former takes over a second to probe.


To generate a diff of this commit:
cvs rdiff -u -r1.590 -r1.591 src/sys/arch/amd64/conf/GENERIC

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

CVS commit: src/sys/dev/acpi

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 19:21:45 UTC 2021

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

Log Message:
Convert some debug messages to aprint_debug


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/acpi/fdc_acpi.c

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

Modified files:

Index: src/sys/dev/acpi/fdc_acpi.c
diff -u src/sys/dev/acpi/fdc_acpi.c:1.46 src/sys/dev/acpi/fdc_acpi.c:1.47
--- src/sys/dev/acpi/fdc_acpi.c:1.46	Fri Jan 29 15:49:55 2021
+++ src/sys/dev/acpi/fdc_acpi.c	Fri Oct 15 19:21:45 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.46 2021/01/29 15:49:55 thorpej Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.47 2021/10/15 19:21:45 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill 
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.46 2021/01/29 15:49:55 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.47 2021/10/15 19:21:45 jmcneill Exp $");
 
 #include 
 #include 
@@ -245,7 +245,7 @@ fdc_acpi_enumerate(struct fdc_acpi_softc
 	drives = 0;
 	for (i = 0; i < 4; i++) {
 		if (p[i]) drives |= (1 << i);
-		aprint_normal_dev(sc->sc_dev, "drive %d %sattached\n", i,
+		aprint_debug_dev(sc->sc_dev, "drive %d %sattached\n", i,
 		p[i] ? "" : "not ");
 	}
 
@@ -278,17 +278,14 @@ fdc_acpi_getknownfds(struct fdc_acpi_sof
 			continue;
 		rv = acpi_eval_struct(asc->sc_node->ad_handle, "_FDI", );
 		if (ACPI_FAILURE(rv)) {
-			aprint_normal_dev(sc->sc_dev,
-			"failed to evaluate _FDI: %s on drive %d\n",
-			AcpiFormatException(rv), i);
-			/* XXX if _FDI fails, assume 1.44MB floppy */
+			/* if _FDI fails, assume 1.44MB floppy */
 			sc->sc_knownfds[i] = _acpi_fdtypes[0];
 			continue;
 		}
 		fdi = abuf.Pointer;
 		if (fdi->Type != ACPI_TYPE_PACKAGE) {
 			aprint_error_dev(sc->sc_dev,
-			"expected PACKAGE, got %u\n", fdi->Type);
+			"_FDI: expected PACKAGE, got %u\n", fdi->Type);
 			goto out;
 		}
 		e = fdi->Package.Elements;

CVS commit: src/sys/dev/acpi

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 19:21:45 UTC 2021

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

Log Message:
Convert some debug messages to aprint_debug


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/acpi/fdc_acpi.c

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

CVS commit: src/sys/arch/x86/isa

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 19:01:52 UTC 2021

Modified Files:
src/sys/arch/x86/isa: isa_machdep.c

Log Message:
Add missing acpi include


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/x86/isa/isa_machdep.c

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

CVS commit: src/sys/arch/x86/isa

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 19:01:52 UTC 2021

Modified Files:
src/sys/arch/x86/isa: isa_machdep.c

Log Message:
Add missing acpi include


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/x86/isa/isa_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/sys/arch/x86/isa/isa_machdep.c
diff -u src/sys/arch/x86/isa/isa_machdep.c:1.47 src/sys/arch/x86/isa/isa_machdep.c:1.48
--- src/sys/arch/x86/isa/isa_machdep.c:1.47	Fri Oct 15 18:44:53 2021
+++ src/sys/arch/x86/isa/isa_machdep.c	Fri Oct 15 19:01:52 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.47 2021/10/15 18:44:53 jmcneill Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.48 2021/10/15 19:01:52 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.47 2021/10/15 18:44:53 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.48 2021/10/15 19:01:52 jmcneill Exp $");
 
 #include 
 #include 
@@ -96,6 +96,10 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.
 #include 
 #endif
 
+#if NACPICA > 0
+#include 
+#endif
+
 static int _isa_dma_may_bounce(bus_dma_tag_t, bus_dmamap_t, int, int *);
 
 struct x86_bus_dma_tag isa_bus_dma_tag = {

Re: CVS commit: src/sys/arch/x86/x86

2021-10-15 Thread Jason Thorpe 
I demand this change be reverted.

(/s)

> On Oct 15, 2021, at 11:12 AM, Jared D. McNeill  wrote:
> 
> Module Name:  src
> Committed By: jmcneill
> Date: Fri Oct 15 18:12:48 UTC 2021
> 
> Modified Files:
>   src/sys/arch/x86/x86: tsc.c
> 
> Log Message:
> Fix typo in comment: "porniters" -> "pointers"
> 
> 
> To generate a diff of this commit:
> cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/x86/tsc.c
> 
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
> 

-- thorpej

CVS commit: src/sys/arch/x86/pci

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 18:51:39 UTC 2021

Modified Files:
src/sys/arch/x86/pci: pci_machdep.c

Log Message:
Disable MSI and MSI-X support if IAPC_BOOT_ARCH reports that MSI is not
supported.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/x86/pci/pci_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/sys/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.88 src/sys/arch/x86/pci/pci_machdep.c:1.89
--- src/sys/arch/x86/pci/pci_machdep.c:1.88	Thu Jan 28 01:57:31 2021
+++ src/sys/arch/x86/pci/pci_machdep.c	Fri Oct 15 18:51:38 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.88 2021/01/28 01:57:31 jmcneill Exp $	*/
+/*	$NetBSD: pci_machdep.c,v 1.89 2021/10/15 18:51:38 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.88 2021/01/28 01:57:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.89 2021/10/15 18:51:38 jmcneill Exp $");
 
 #include 
 #include 
@@ -534,6 +534,16 @@ pci_attach_hook(device_t parent, device_
 		aprint_verbose("\n");
 		aprint_verbose_dev(self,
 		"This pci host does not support MSI-X.");
+#if NACPICA > 0
+	} else if (acpi_active &&
+		   AcpiGbl_FADT.Header.Revision >= 4 &&
+		   (AcpiGbl_FADT.BootFlags & ACPI_FADT_NO_MSI) != 0) {
+		pba->pba_flags &= ~PCI_FLAGS_MSI_OKAY;
+		pba->pba_flags &= ~PCI_FLAGS_MSIX_OKAY;
+		aprint_verbose("\n");
+		aprint_verbose_dev(self,
+		"MSI support disabled via ACPI IAPC_BOOT_ARCH flag.\n");
+#endif
 	} else {
 		pba->pba_flags |= PCI_FLAGS_MSI_OKAY;
 		pba->pba_flags |= PCI_FLAGS_MSIX_OKAY;

CVS commit: src/sys/arch/x86/pci

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 18:51:39 UTC 2021

Modified Files:
src/sys/arch/x86/pci: pci_machdep.c

Log Message:
Disable MSI and MSI-X support if IAPC_BOOT_ARCH reports that MSI is not
supported.


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/x86/pci/pci_machdep.c

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

CVS commit: src/sys/arch/x86/isa

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 18:44:53 UTC 2021

Modified Files:
src/sys/arch/x86/isa: isa_machdep.c

Log Message:
If ACPI indicates that there are no user visible devices on the LPC or ISA
bus, set the "no-legacy-devices" property on isa to bypass indirect
configuration of ISA devices.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/x86/isa/isa_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/sys/arch/x86/isa/isa_machdep.c
diff -u src/sys/arch/x86/isa/isa_machdep.c:1.46 src/sys/arch/x86/isa/isa_machdep.c:1.47
--- src/sys/arch/x86/isa/isa_machdep.c:1.46	Sat May  2 16:44:35 2020
+++ src/sys/arch/x86/isa/isa_machdep.c	Fri Oct 15 18:44:53 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.46 2020/05/02 16:44:35 bouyer Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.47 2021/10/15 18:44:53 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.46 2020/05/02 16:44:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.47 2021/10/15 18:44:53 jmcneill Exp $");
 
 #include 
 #include 
@@ -369,13 +369,20 @@ device_isa_register(device_t dev, void *
 		prop_dictionary_set_bool(device_properties(dev),
 		"no-legacy-devices", true);
 #if NACPICA > 0
-#if notyet
 	if (device_is_a(dev, "isa") && acpi_active) {
-		if (!(AcpiGbl_FADT.BootFlags & ACPI_FADT_LEGACY_DEVICES))
+		/*
+		 * For FACP >= 2, the LEGACY_DEVICES flag indicates that
+		 * the motherboard supports user-visible devices on the LPC
+		 * or ISA bus. If clear, assume that no such devices are
+		 * present and we can enumerate everything we need using
+		 * ACPI tables.
+		 */
+		if (AcpiGbl_FADT.Header.Revision >= 2 &&
+		!(AcpiGbl_FADT.BootFlags & ACPI_FADT_LEGACY_DEVICES)) {
 			prop_dictionary_set_bool(device_properties(dev),
 			"no-legacy-devices", true);
+		}
 	}
-#endif
 #endif /* NACPICA > 0 */
 	return NULL;
 }

CVS commit: src/sys/arch/x86/isa

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 18:44:53 UTC 2021

Modified Files:
src/sys/arch/x86/isa: isa_machdep.c

Log Message:
If ACPI indicates that there are no user visible devices on the LPC or ISA
bus, set the "no-legacy-devices" property on isa to bypass indirect
configuration of ISA devices.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/x86/isa/isa_machdep.c

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

CVS commit: src/sys/arch/x86/x86

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 18:12:48 UTC 2021

Modified Files:
src/sys/arch/x86/x86: tsc.c

Log Message:
Fix typo in comment: "porniters" -> "pointers"


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/x86/tsc.c

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

Modified files:

Index: src/sys/arch/x86/x86/tsc.c
diff -u src/sys/arch/x86/x86/tsc.c:1.56 src/sys/arch/x86/x86/tsc.c:1.57
--- src/sys/arch/x86/x86/tsc.c:1.56	Wed Jun  2 06:48:10 2021
+++ src/sys/arch/x86/x86/tsc.c	Fri Oct 15 18:12:48 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: tsc.c,v 1.56 2021/06/02 06:48:10 nia Exp $	*/
+/*	$NetBSD: tsc.c,v 1.57 2021/10/15 18:12:48 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2020 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.56 2021/06/02 06:48:10 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsc.c,v 1.57 2021/10/15 18:12:48 jmcneill Exp $");
 
 #include 
 #include 
@@ -151,7 +151,7 @@ tsc_is_invariant(void)
 	return invariant;
 }
 
-/* Setup function porniters for rdtsc() and timecounter(9). */
+/* Setup function pointers for rdtsc() and timecounter(9). */
 void
 tsc_setfunc(struct cpu_info *ci)
 {

CVS commit: src/sys/arch/x86/x86

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 18:12:48 UTC 2021

Modified Files:
src/sys/arch/x86/x86: tsc.c

Log Message:
Fix typo in comment: "porniters" -> "pointers"


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/x86/tsc.c

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

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

2021-10-15 Thread Izumi Tsutsui 
Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Oct 15 17:42:04 UTC 2021

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

Log Message:
Handle restoring keyboard state via AbortDevices() rather than AbortDDX().

Tested on 3/60.  Note AbortDevices() and DEVICE_ABORT in deviceProc
functions were introduced after Xorg 1.14.0:
 
https://gitlab.freedesktop.org/xorg/xserver/-/commit/9f79e93b6b3416055d08a0e8f9f16d5fd0649e36


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.10 -r1.11 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/sunIo.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.6 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c:1.6	Tue Dec  8 10:33:47 2020
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c	Fri Oct 15 17:42:04 2021
@@ -163,17 +163,12 @@ AbortDDX(enum ExitCode error)
 {
 int		i;
 ScreenPtr	pScreen;
-DevicePtr	devPtr;
 
 #ifdef SVR4
 (void) OsSignal (SIGPOLL, SIG_IGN);
 #else
 (void) OsSignal (SIGIO, SIG_IGN);
 #endif
-if (sunKeyboardDevice) {
-devPtr = >public;
-	(void) sunChangeKbdTranslation (((sunKbdPrivPtr)(devPtr->devicePrivate))->fd, FALSE);
-}
 #if defined(SVR4) || defined(CSRG_BASED)
 sunNonBlockConsoleOff ();
 #else

Index: xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.10 xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.11
--- xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c:1.10	Wed Mar 17 15:02:27 2021
+++ xsrc/external/mit/xorg-server/dist/hw/sun/sunKbd.c	Fri Oct 15 17:42:04 2021
@@ -669,7 +669,7 @@ sunKbdProc(DeviceIntPtr device, int what
 	 * Set the keyboard into "direct" mode and turn on
 	 * event translation.
 	 */
-	if (sunChangeKbdTranslation(pPriv->fd,TRUE) == -1)
+	if (sunChangeKbdTranslation(pPriv->fd, TRUE) == -1)
 	FatalError("Can't set keyboard translation\n");
 	SetNotifyFd(pPriv->fd, sunKbdHandlerNotify, X_NOTIFY_READ, NULL);
 	pKeyboard->on = TRUE;
@@ -687,13 +687,18 @@ sunKbdProc(DeviceIntPtr device, int what
 	/*
 	 * Restore original keyboard directness and translation.
 	 */
-	if (sunChangeKbdTranslation(pPriv->fd,FALSE) == -1)
+	if (sunChangeKbdTranslation(pPriv->fd, FALSE) == -1)
 	FatalError("Can't reset keyboard translation\n");
 	RemoveNotifyFd(pPriv->fd);
 	pKeyboard->on = FALSE;
 	break;
 
 case DEVICE_ABORT:
+	/*
+	 * Restore original keyboard directness and translation.
+	 */
+	pPriv = (sunKbdPrivPtr)pKeyboard->devicePrivate;
+	(void)sunChangeKbdTranslation(pPriv->fd, FALSE);
 	break;
 }
 return Success;

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

2021-10-15 Thread Izumi Tsutsui 
Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Oct 15 17:42:04 UTC 2021

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

Log Message:
Handle restoring keyboard state via AbortDevices() rather than AbortDDX().

Tested on 3/60.  Note AbortDevices() and DEVICE_ABORT in deviceProc
functions were introduced after Xorg 1.14.0:
 
https://gitlab.freedesktop.org/xorg/xserver/-/commit/9f79e93b6b3416055d08a0e8f9f16d5fd0649e36


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/hw/sun/sunIo.c
cvs rdiff -u -r1.10 -r1.11 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.

CVS commit: [netbsd-9] src/doc

2021-10-15 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Oct 15 15:15:52 UTC 2021

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

Log Message:
Ticket #1360


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-9.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-9.3
diff -u src/doc/CHANGES-9.3:1.1.2.37 src/doc/CHANGES-9.3:1.1.2.38
--- src/doc/CHANGES-9.3:1.1.2.37	Wed Oct 13 16:08:44 2021
+++ src/doc/CHANGES-9.3	Fri Oct 15 15:15:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.3,v 1.1.2.37 2021/10/13 16:08:44 martin Exp $
+# $NetBSD: CHANGES-9.3,v 1.1.2.38 2021/10/15 15:15:52 martin Exp $
 
 A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3
 release:
@@ -811,3 +811,14 @@ sys/arch/amiga/dev/amidisplaycc.c		1.33,
 	amiga: enable wsfb based X11.
 	[abs, ticket #1359]
 
+distrib/amd64/Makefile1.15
+distrib/amd64/installimage-bios/Makefile	1.1
+distrib/amd64/installimage-bios/boot.cfg.in	1.1
+distrib/amd64/installimage-bios/etc.rc		1.1
+distrib/amd64/installimage-bios/etc.ttys	1.1
+distrib/amd64/installimage-bios/install.sh	1.1
+distrib/amd64/installimage-bios/spec.inst	1.1
+
+	Restore having a BIOS-only amd64 USB image.
+	[maya, ticket #1360]
+

CVS commit: [netbsd-9] src/doc

2021-10-15 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Oct 15 15:15:52 UTC 2021

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

Log Message:
Ticket #1360


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.37 -r1.1.2.38 src/doc/CHANGES-9.3

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

CVS commit: [netbsd-9] src/distrib/amd64

2021-10-15 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Oct 15 15:14:51 UTC 2021

Modified Files:
src/distrib/amd64 [netbsd-9]: Makefile
Added Files:
src/distrib/amd64/installimage-bios [netbsd-9]: Makefile boot.cfg.in
etc.rc etc.ttys install.sh spec.inst

Log Message:
Pull up following revision(s) (requested by maya in ticket #1360):

distrib/amd64/installimage-bios/etc.ttys: revision 1.1
distrib/amd64/installimage-bios/Makefile: revision 1.1
distrib/amd64/Makefile: revision 1.15
distrib/amd64/installimage-bios/boot.cfg.in: revision 1.1
distrib/amd64/installimage-bios/spec.inst: revision 1.1
distrib/amd64/installimage-bios/etc.rc: revision 1.1
distrib/amd64/installimage-bios/install.sh: revision 1.1

Restore having a BIOS-only amd64 USB image.

Several people reported having hardware that struggles booting the mix
EFI+BIOS image, and it's better to offer them a working image.

Keeping the EFI image as having the obvious name, this is going to become
more likely to work by default as newer hardware may not support BIOS boot.

(XXX pullup-9)


To generate a diff of this commit:
cvs rdiff -u -r1.13.12.1 -r1.13.12.2 src/distrib/amd64/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/distrib/amd64/installimage-bios/Makefile \
src/distrib/amd64/installimage-bios/boot.cfg.in \
src/distrib/amd64/installimage-bios/etc.rc \
src/distrib/amd64/installimage-bios/etc.ttys \
src/distrib/amd64/installimage-bios/install.sh \
src/distrib/amd64/installimage-bios/spec.inst

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

Modified files:

Index: src/distrib/amd64/Makefile
diff -u src/distrib/amd64/Makefile:1.13.12.1 src/distrib/amd64/Makefile:1.13.12.2
--- src/distrib/amd64/Makefile:1.13.12.1	Sun May 31 10:21:34 2020
+++ src/distrib/amd64/Makefile	Fri Oct 15 15:14:51 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13.12.1 2020/05/31 10:21:34 martin Exp $
+#	$NetBSD: Makefile,v 1.13.12.2 2021/10/15 15:14:51 martin Exp $
 
 .include 
 
@@ -14,6 +14,7 @@ SUBDIR+=	.WAIT
 SUBDIR+=	cdroms
 SUBDIR+=	liveimage
 SUBDIR+=	installimage
+SUBDIR+=	installimage-bios
 TARGETS+=	release 
 
 iso_image:
@@ -24,5 +25,6 @@ live_image:
 
 install_image:
 	${MAKEDIRTARGET} installimage install_image
+	${MAKEDIRTARGET} installimage-bios install_image
 
 .include 

Added files:

Index: src/distrib/amd64/installimage-bios/Makefile
diff -u /dev/null src/distrib/amd64/installimage-bios/Makefile:1.1.2.2
--- /dev/null	Fri Oct 15 15:14:51 2021
+++ src/distrib/amd64/installimage-bios/Makefile	Fri Oct 15 15:14:51 2021
@@ -0,0 +1,38 @@
+#	$NetBSD: Makefile,v 1.1.2.2 2021/10/15 15:14:51 martin Exp $
+
+.include 
+
+INSTIMGBASE=	NetBSD-${DISTRIBVER}-amd64-bios-install	# gives ${IMGBASE}.img
+
+INSTIMAGEMB?=	1800			# for all installation binaries
+
+PRIMARY_BOOT=		bootxx_ffsv1
+SECONDARY_BOOT=		boot
+SECONDARY_BOOT_ARG=	# unnecessary
+
+USE_MBR=		yes
+
+CLEANFILES+=	boot.cfg
+
+prepare_md_post:
+	${TOOL_SED}			\
+	-e "s/@@MACHINE@@/${MACHINE}/"\
+	-e "s/@@VERSION@@/${DISTRIBVER}/"\
+	< ${.CURDIR}/boot.cfg.in > boot.cfg
+
+DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
+SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+
+SPEC_EXTRA=		${.CURDIR}/spec.inst
+IMGFILE_EXTRA=\
+	${.CURDIR}/etc.ttys		etc/ttys			\
+	${.CURDIR}/etc.rc		etc/rc\
+	${.CURDIR}/install.sh		.\
+	${.OBJDIR}/boot.cfg		.\
+	${SYSINSTDIR}/sysinstmsgs.de	.\
+	${SYSINSTDIR}/sysinstmsgs.es	.\
+	${SYSINSTDIR}/sysinstmsgs.fr	.\
+	${SYSINSTDIR}/sysinstmsgs.pl	.\
+	${SYSINSTDIR}/sysinst		.
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage//Makefile.installimage"
Index: src/distrib/amd64/installimage-bios/boot.cfg.in
diff -u /dev/null src/distrib/amd64/installimage-bios/boot.cfg.in:1.1.2.2
--- /dev/null	Fri Oct 15 15:14:51 2021
+++ src/distrib/amd64/installimage-bios/boot.cfg.in	Fri Oct 15 15:14:51 2021
@@ -0,0 +1,9 @@
+banner=Welcome to the NetBSD/@@MACHINE@@ @@VERSION@@ installation image
+banner
+banner=
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
+menu=Install NetBSD:boot netbsd
+menu=Drop to boot prompt:prompt
+timeout=30
+clear=1
Index: src/distrib/amd64/installimage-bios/etc.rc
diff -u /dev/null src/distrib/amd64/installimage-bios/etc.rc:1.1.2.2
--- /dev/null	Fri Oct 15 15:14:51 2021
+++ src/distrib/amd64/installimage-bios/etc.rc	Fri Oct 15 15:14:51 2021
@@ -0,0 +1,49 @@
+# $NetBSD: etc.rc,v 1.1.2.2 2021/10/15 15:14:51 martin Exp $
+#
+# Copyright (c) 1997 Perry E. Metzger
+# Copyright (c) 1994 Christopher G. Demetriou
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.

CVS commit: [netbsd-9] src/distrib/amd64

2021-10-15 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Oct 15 15:14:51 UTC 2021

Modified Files:
src/distrib/amd64 [netbsd-9]: Makefile
Added Files:
src/distrib/amd64/installimage-bios [netbsd-9]: Makefile boot.cfg.in
etc.rc etc.ttys install.sh spec.inst

Log Message:
Pull up following revision(s) (requested by maya in ticket #1360):

distrib/amd64/installimage-bios/etc.ttys: revision 1.1
distrib/amd64/installimage-bios/Makefile: revision 1.1
distrib/amd64/Makefile: revision 1.15
distrib/amd64/installimage-bios/boot.cfg.in: revision 1.1
distrib/amd64/installimage-bios/spec.inst: revision 1.1
distrib/amd64/installimage-bios/etc.rc: revision 1.1
distrib/amd64/installimage-bios/install.sh: revision 1.1

Restore having a BIOS-only amd64 USB image.

Several people reported having hardware that struggles booting the mix
EFI+BIOS image, and it's better to offer them a working image.

Keeping the EFI image as having the obvious name, this is going to become
more likely to work by default as newer hardware may not support BIOS boot.

(XXX pullup-9)


To generate a diff of this commit:
cvs rdiff -u -r1.13.12.1 -r1.13.12.2 src/distrib/amd64/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/distrib/amd64/installimage-bios/Makefile \
src/distrib/amd64/installimage-bios/boot.cfg.in \
src/distrib/amd64/installimage-bios/etc.rc \
src/distrib/amd64/installimage-bios/etc.ttys \
src/distrib/amd64/installimage-bios/install.sh \
src/distrib/amd64/installimage-bios/spec.inst

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

CVS commit: src/sys/dev/usb

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 11:59:17 UTC 2021

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

Log Message:
Revert "usb: uhub: remove unnecessary delays when powering on ports"

syzbot says that the change exposes UB in usb_free_device and I can't
see how, so revert until I have a better understanding of what's going on.

Reported-by: syzbot+c445f7149cce07d4c...@syzkaller.appspotmail.com
Reported-by: syzbot+a2ae42f37de765a54...@syzkaller.appspotmail.com


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/usb/uhub.c

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

Modified files:

Index: src/sys/dev/usb/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.157 src/sys/dev/usb/uhub.c:1.158
--- src/sys/dev/usb/uhub.c:1.157	Mon Oct 11 06:30:23 2021
+++ src/sys/dev/usb/uhub.c	Fri Oct 15 11:59:16 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhub.c,v 1.157 2021/10/11 06:30:23 msaitoh Exp $	*/
+/*	$NetBSD: uhub.c,v 1.158 2021/10/15 11:59:16 jmcneill Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $	*/
 /*	$OpenBSD: uhub.c,v 1.86 2015/06/29 18:27:40 mpi Exp $ */
 
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.157 2021/10/11 06:30:23 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.158 2021/10/15 11:59:16 jmcneill Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.1
 
 #include 
 
-#include 
 #include 
 #include 
 #include 
@@ -125,8 +124,6 @@ struct uhub_softc {
 	struct lwp		*sc_exploring;
 };
 
-typedef __BITMAP_TYPE(, uint8_t, UHD_NPORTS_MAX + 1) usb_port_mask;
-
 #define UHUB_IS_HIGH_SPEED(sc) \
 ((sc)->sc_proto == UDPROTO_HSHUBSTT || (sc)->sc_proto == UDPROTO_HSHUBMTT)
 #define UHUB_IS_SINGLE_TT(sc) ((sc)->sc_proto == UDPROTO_HSHUBSTT)
@@ -498,8 +495,6 @@ uhub_explore(struct usbd_device *dev)
 	int speed;
 	int port;
 	int change, status, reconnect, rescan;
-	usb_port_mask powerup_port;
-	int powerup_port_count = 0;
 
 	UHUBHIST_FUNC();
 	UHUBHIST_CALLARGS("uhub%jd dev=%#jx addr=%jd speed=%ju",
@@ -552,8 +547,6 @@ uhub_explore(struct usbd_device *dev)
 		}
 	}
 
-	__BITMAP_ZERO(_port);
-
 	for (port = 1; port <= hd->bNbrPorts; port++) {
 		up = >ud_hub->uh_ports[port - 1];
 
@@ -684,26 +677,8 @@ uhub_explore(struct usbd_device *dev)
 		DPRINTF("unit %jd dev->speed=%ju dev->depth=%ju",
 		device_unit(sc->sc_dev), dev->ud_speed, dev->ud_depth, 0);
 
-		__BITMAP_SET(port, _port);
-		powerup_port_count++;
-	}
-
-	if (powerup_port_count == 0) {
-		goto explore;
-	}
-
-	aprint_debug_dev(sc->sc_dev, "power up %u port(s)\n",
-	powerup_port_count);
-
-	/* Wait for maximum device power up time. */
-	usbd_delay_ms(dev, USB_PORT_POWERUP_DELAY);
-
-	for (port = 1; port <= hd->bNbrPorts; port++) {
-		if (!__BITMAP_ISSET(port, _port)) {
-			continue;
-		}
-
-		up = >ud_hub->uh_ports[port - 1];
+		/* Wait for maximum device power up time. */
+		usbd_delay_ms(dev, USB_PORT_POWERUP_DELAY);
 
 		/* Reset port, which implies enabling it. */
 		if (usbd_reset_port(dev, port, >up_status)) {
@@ -841,8 +816,6 @@ uhub_explore(struct usbd_device *dev)
 up->up_dev->ud_hub->uh_explore(up->up_dev);
 		}
 	}
-
-explore:
 	mutex_enter(>sc_lock);
 	sc->sc_explorepending = false;
 	for (int i = 0; i < sc->sc_statuslen; i++) {

CVS commit: src/sys/dev/usb

2021-10-15 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 15 11:59:17 UTC 2021

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

Log Message:
Revert "usb: uhub: remove unnecessary delays when powering on ports"

syzbot says that the change exposes UB in usb_free_device and I can't
see how, so revert until I have a better understanding of what's going on.

Reported-by: syzbot+c445f7149cce07d4c...@syzkaller.appspotmail.com
Reported-by: syzbot+a2ae42f37de765a54...@syzkaller.appspotmail.com


To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/dev/usb/uhub.c

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