CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: macallan
Date: Sun Jul 12 06:42:33 UTC 2020
Modified Files:
src/sys/dev/i2c: dbcool.c
Log Message:
in sysctl_dbcool_behavior() - actually use the array index when translating
text from sysctl -w *.behavior=
now this actually works on my sb2500's two adm1030s
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/i2c/dbcool.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/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.55 src/sys/dev/i2c/dbcool.c:1.56
--- src/sys/dev/i2c/dbcool.c:1.55 Sun Jul 12 06:38:56 2020
+++ src/sys/dev/i2c/dbcool.c Sun Jul 12 06:42:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.55 2020/07/12 06:38:56 macallan Exp $ */
+/* $NetBSD: dbcool.c,v 1.56 2020/07/12 06:42:32 macallan Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.55 2020/07/12 06:38:56 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.56 2020/07/12 06:42:32 macallan Exp $");
#include
#include
@@ -1314,7 +1314,7 @@ sysctl_dbcool_behavior(SYSCTLFN_ARGS)
break;
if (i >= __arraycount(behavior))
return EINVAL;
-
+ newreg = i;
if (sc->sc_dc.dc_chip->flags & DBCFLAG_ADM1030) {
/*
* ADM1030 splits fan controller behavior across two
CVS commit: src/sys/dev/pci
Module Name:src Committed By: kim Date: Sun Jul 12 06:40:11 UTC 2020 Modified Files: src/sys/dev/pci: vioscsi.c Log Message: Fix off-by-one SCSI target reporting Use max_target as the controller ID instead of zero, so that the device located at SCSI ID zero (e.g. a disk) is not obscured through not being probed by scsi_probe_bus() (which skips the controller ID). Copy the target requested onto the wire without decrementing it by one. ok christos@ To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/vioscsi.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/vioscsi.c diff -u src/sys/dev/pci/vioscsi.c:1.21 src/sys/dev/pci/vioscsi.c:1.22 --- src/sys/dev/pci/vioscsi.c:1.21 Sat Apr 13 06:17:33 2019 +++ src/sys/dev/pci/vioscsi.c Sun Jul 12 06:40:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vioscsi.c,v 1.21 2019/04/13 06:17:33 maxv Exp $ */ +/* $NetBSD: vioscsi.c,v 1.22 2020/07/12 06:40:11 kim Exp $ */ /* $OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $ */ /* @@ -18,7 +18,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.21 2019/04/13 06:17:33 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.22 2020/07/12 06:40:11 kim Exp $"); #include #include @@ -194,7 +194,7 @@ vioscsi_attach(device_t parent, device_t chan->chan_channel = 0; chan->chan_ntargets = MIN(max_target, 16); /* cap reasonably */ chan->chan_nluns = MIN(max_lun, 1024); /* cap reasonably */ - chan->chan_id = 0; + chan->chan_id = max_target; chan->chan_flags = SCSIPI_CHAN_NOSETTLE; config_found(self, &sc->sc_channel, scsiprint); @@ -318,7 +318,7 @@ vioscsi_scsipi_request(struct scsipi_cha } req->lun[0] = 1; - req->lun[1] = periph->periph_target - 1; + req->lun[1] = periph->periph_target; req->lun[2] = 0x40 | ((periph->periph_lun >> 8) & 0x3F); req->lun[3] = periph->periph_lun & 0xFF; memset(req->lun + 4, 0, 4);
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: macallan
Date: Sun Jul 12 06:38:57 UTC 2020
Modified Files:
src/sys/dev/i2c: dbcool.c
Log Message:
get sensor names from device properties if possible
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/i2c/dbcool.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/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.54 src/sys/dev/i2c/dbcool.c:1.55
--- src/sys/dev/i2c/dbcool.c:1.54 Wed Feb 6 08:37:12 2019
+++ src/sys/dev/i2c/dbcool.c Sun Jul 12 06:38:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.54 2019/02/06 08:37:12 martin Exp $ */
+/* $NetBSD: dbcool.c,v 1.55 2020/07/12 06:38:56 macallan Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.54 2019/02/06 08:37:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.55 2020/07/12 06:38:56 macallan Exp $");
#include
#include
@@ -775,6 +775,7 @@ dbcool_attach(device_t parent, device_t
sc->sc_dc.dc_readreg = dbcool_readreg;
sc->sc_dc.dc_writereg = dbcool_writereg;
sc->sc_dev = self;
+ sc->sc_prop = args->ia_prop;
if (dbcool_chip_ident(&sc->sc_dc) < 0 || sc->sc_dc.dc_chip == NULL)
panic("could not identify chip at addr %d", args->ia_addr);
@@ -1689,10 +1690,18 @@ dbcool_attach_sensor(struct dbcool_softc
{
int name_index;
int error = 0;
+ char name[8];
+ const char *desc;
name_index = sc->sc_dc.dc_chip->table[idx].name_index;
- strlcpy(sc->sc_sensor[idx].desc, dbc_sensor_names[name_index],
- sizeof(sc->sc_sensor[idx].desc));
+ snprintf(name, 7, "s%02x", sc->sc_dc.dc_chip->table[idx].reg.val_reg);
+ if (prop_dictionary_get_cstring_nocopy(sc->sc_prop, name, &desc)) {
+ strlcpy(sc->sc_sensor[idx].desc, desc,
+ sizeof(sc->sc_sensor[idx].desc));
+ } else {
+ strlcpy(sc->sc_sensor[idx].desc, dbc_sensor_names[name_index],
+ sizeof(sc->sc_sensor[idx].desc));
+ }
sc->sc_regs[idx] = &sc->sc_dc.dc_chip->table[idx].reg;
sc->sc_nom_volt[idx] = sc->sc_dc.dc_chip->table[idx].nom_volt_index;
@@ -1721,9 +1730,12 @@ dbcool_attach_temp_control(struct dbcool
/* create sysctl node for the sensor if not one already there */
if (sc->sc_sysctl_num[j] == -1) {
+ int name_index = sc->sc_dc.dc_chip->table[idx].name_index;
+
ret = sysctl_createv(&sc->sc_sysctl_log, 0, NULL, &me2,
CTLFLAG_READWRITE,
- CTLTYPE_NODE, sc->sc_sensor[j].desc, NULL,
+ CTLTYPE_NODE, dbc_sensor_names[name_index],
+ sc->sc_sensor[j].desc,
NULL, 0, NULL, 0,
CTL_HW, sc->sc_root_sysctl_num, CTL_CREATE,
CTL_EOL);
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Sun Jul 12 06:37:39 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: locore.S
Log Message:
More DEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/aarch64/aarch64/locore.S
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/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.65 src/sys/arch/aarch64/aarch64/locore.S:1.66
--- src/sys/arch/aarch64/aarch64/locore.S:1.65 Sun Jul 12 06:35:58 2020
+++ src/sys/arch/aarch64/aarch64/locore.S Sun Jul 12 06:37:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.65 2020/07/12 06:35:58 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.66 2020/07/12 06:37:39 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -38,7 +38,7 @@
#include
#include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.65 2020/07/12 06:35:58 skrll Exp $")
+RCSID("$NetBSD: locore.S,v 1.66 2020/07/12 06:37:39 skrll Exp $")
#ifdef AARCH64_DEVICE_MEM_STRONGLY_ORDERED
#define MAIR_DEVICE_MEM MAIR_DEVICE_nGnRnE
@@ -782,6 +782,9 @@ init_mmutable:
cbz x0, init_mmutable_error
msr ttbr0_el1, x0
+ DPRINTSREG("TTBR0= ", ttbr0_el1)
+ DPRINTSREG("TTBR1= ", ttbr1_el1)
+
#ifdef DEBUG_MMU
adr x26, tinyprintf
#else
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Sun Jul 12 06:35:58 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: locore.S
Log Message:
KNF (whitespace)
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/aarch64/aarch64/locore.S
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/locore.S
diff -u src/sys/arch/aarch64/aarch64/locore.S:1.64 src/sys/arch/aarch64/aarch64/locore.S:1.65
--- src/sys/arch/aarch64/aarch64/locore.S:1.64 Thu May 28 04:51:44 2020
+++ src/sys/arch/aarch64/aarch64/locore.S Sun Jul 12 06:35:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.64 2020/05/28 04:51:44 ryo Exp $ */
+/* $NetBSD: locore.S,v 1.65 2020/07/12 06:35:58 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -38,7 +38,7 @@
#include
#include "assym.h"
-RCSID("$NetBSD: locore.S,v 1.64 2020/05/28 04:51:44 ryo Exp $")
+RCSID("$NetBSD: locore.S,v 1.65 2020/07/12 06:35:58 skrll Exp $")
#ifdef AARCH64_DEVICE_MEM_STRONGLY_ORDERED
#define MAIR_DEVICE_MEM MAIR_DEVICE_nGnRnE
@@ -368,7 +368,7 @@ printcpu:
ENTRY_NP(cpu_mpstart)
mrs x3, mpidr_el1
- ldr x0, =(MPIDR_AFF0|MPIDR_AFF1|MPIDR_AFF2|MPIDR_AFF3)
+ ldr x0, =(MPIDR_AFF0 | MPIDR_AFF1 | MPIDR_AFF2 | MPIDR_AFF3)
and x3, x3, x0
/*
@@ -807,8 +807,8 @@ init_mmutable:
mov x7, x26/* pr func */
adr x6, bootpage_alloc /* allocator */
mov x5, xzr/* flags = 0 */
- mov x4, #LX_BLKPAG_ATTR_DEVICE_MEM|LX_BLKPAG_AP_RW /* attr */
- orr x4, x4, #LX_BLKPAG_UXN|LX_BLKPAG_PXN
+ mov x4, #LX_BLKPAG_ATTR_DEVICE_MEM | LX_BLKPAG_AP_RW /* attr */
+ orr x4, x4, #LX_BLKPAG_UXN | LX_BLKPAG_PXN
mov x3, #L2_SIZE /* blocksize */
mov x2, #L2_SIZE /* size */
ldr x1, =CONSADDR /* pa */
@@ -821,8 +821,8 @@ init_mmutable:
mov x7, x26/* pr func */
adr x6, bootpage_alloc /* allocator */
mov x5, xzr/* flags = 0 */
- mov x4, #LX_BLKPAG_ATTR_DEVICE_MEM|LX_BLKPAG_AP_RW /* attr */
- orr x4, x4, #LX_BLKPAG_UXN|LX_BLKPAG_PXN
+ mov x4, #LX_BLKPAG_ATTR_DEVICE_MEM | LX_BLKPAG_AP_RW /* attr */
+ orr x4, x4, #LX_BLKPAG_UXN | LX_BLKPAG_PXN
mov x3, #L2_SIZE /* blocksize */
mov x2, #(1024*1024*1024*4) /* size */
mov x1, xzr/* pa */
@@ -836,7 +836,7 @@ init_mmutable:
mov x7, x26/* pr func */
adr x6, bootpage_alloc /* allocator */
mov x5, xzr/* flags = 0 */
- mov x4, #LX_BLKPAG_ATTR_NORMAL_NC|LX_BLKPAG_AP_RW /* attr */
+ mov x4, #LX_BLKPAG_ATTR_NORMAL_NC | LX_BLKPAG_AP_RW /* attr */
mov x3, #L2_SIZE /* blocksize */
adr x0, start /* va = start */
adrl x2, _end
@@ -854,8 +854,8 @@ init_mmutable:
mov x7, x26/* pr func */
adr x6, bootpage_alloc /* allocator */
mov x5, xzr/* flags = 0 */
- mov x4, #LX_BLKPAG_ATTR_NORMAL_NC|LX_BLKPAG_AP_RW /* attr */
- orr x4, x4, #LX_BLKPAG_UXN|LX_BLKPAG_PXN
+ mov x4, #LX_BLKPAG_ATTR_NORMAL_NC | LX_BLKPAG_AP_RW /* attr */
+ orr x4, x4, #LX_BLKPAG_UXN | LX_BLKPAG_PXN
mov x3, #L2_SIZE /* blocksize */
mov x2, #L2_SIZE /* size */
mov x1, x8/* pa */
@@ -868,7 +868,7 @@ init_mmutable:
mov x7, x26/* pr func */
adr x6, bootpage_alloc /* allocator */
mov x5, xzr/* flags = 0 */
- mov x4, #LX_BLKPAG_ATTR_NORMAL_WB|LX_BLKPAG_AP_RW /* attr */
+ mov x4, #LX_BLKPAG_ATTR_NORMAL_WB | LX_BLKPAG_AP_RW /* attr */
orr x4, x4, #LX_BLKPAG_UXN
mov x3, #L2_SIZE /* blocksize */
adr x1, start /* pa = start */
CVS commit: src/sys/arch/evbsh3/evbsh3
Module Name:src Committed By: uwe Date: Sun Jul 12 03:52:51 UTC 2020 Modified Files: src/sys/arch/evbsh3/evbsh3: locore.S Log Message: Use symbolic constants for SR and CCR init values. Same object code is generated. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbsh3/evbsh3/locore.S 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/evbsh3/evbsh3/locore.S diff -u src/sys/arch/evbsh3/evbsh3/locore.S:1.12 src/sys/arch/evbsh3/evbsh3/locore.S:1.13 --- src/sys/arch/evbsh3/evbsh3/locore.S:1.12 Sun Jul 12 01:52:22 2020 +++ src/sys/arch/evbsh3/evbsh3/locore.S Sun Jul 12 03:52:51 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.12 2020/07/12 01:52:22 uwe Exp $ */ +/* $NetBSD: locore.S,v 1.13 2020/07/12 03:52:51 uwe Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -81,6 +81,7 @@ #endif #include +#include #include #include #include @@ -111,7 +112,7 @@ ALTENTRY(kernel_text) bra start1 nop .align 2 -SR_init: .long 0x50F0 +SR_init: .long PSL_MD | PSL_BL | PSL_IMASK REG_SYMBOL(MMUCR) start1: @@ -230,8 +231,8 @@ XLinitSH3: .long _C_LABEL(initSH3) XLmain: .long _C_LABEL(main) XLtoP2: .long 0x2000 REG_SYMBOL(CCR) -#ifdef SH4 -XL_CCRVAL: .long 0x0909 /* Operand cache ON */ +#ifdef SH4 /* invalidate and enable instruction and operand caches */ +XL_CCRVAL: .long SH4_CCR_ICI | SH4_CCR_ICE | SH4_CCR_OCI | SH4_CCR_OCE #endif /* SH4 */ load_and_reset:
CVS commit: src/sbin/wsconsctl
Module Name:src Committed By: nia Date: Sun Jul 12 03:37:07 UTC 2020 Modified Files: src/sbin/wsconsctl: wsconsctl.8 Log Message: More keyboard layouts To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sbin/wsconsctl/wsconsctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wsconsctl/wsconsctl.8 diff -u src/sbin/wsconsctl/wsconsctl.8:1.28 src/sbin/wsconsctl/wsconsctl.8:1.29 --- src/sbin/wsconsctl/wsconsctl.8:1.28 Tue Feb 14 11:05:32 2012 +++ src/sbin/wsconsctl/wsconsctl.8 Sun Jul 12 03:37:06 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: wsconsctl.8,v 1.28 2012/02/14 11:05:32 wiz Exp $ +.\" $NetBSD: wsconsctl.8,v 1.29 2020/07/12 03:37:06 nia Exp $ .\" .\" Copyright (c) 1998, 2004 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 June 9, 2009 +.Dd July 12, 2020 .Dt WSCONSCTL 8 .Os .Sh NAME @@ -115,10 +115,11 @@ There are also definitions relating to v control, which are not applicable to all display types, and to text emulation and graphics (mapped) modes. .Pp -In addition to British, US, and US-Dvorak keyboard encodings, support -currently exists for the following languages: Belgian, Danish, Finnish, -French, German, Greek, Hungarian, Italian, Japanese, Norwegian, Polish, -Portuguese, Russian, Spanish, Swedish, Swiss, and Ukrainian. +In addition to British, US, and US-Dvorak keyboard encodings, +support currently exists for the following languages: Belgian, +Brazilian, Danish, Finnish, French, German, Greek, Hungarian, +Italian, Japanese, Norwegian, Polish, Portuguese, Russian, Spanish, +Swedish, Swiss, Turkish, and Ukrainian. Additionally, a user-defined encoding is supported. .Sh FILES .Bl -tag -width /dev/wsmouse
CVS commit: src/games/hangman
Module Name:src
Committed By: dholland
Date: Sun Jul 12 02:34:54 UTC 2020
Modified Files:
src/games/hangman: prdata.c
Log Message:
Avoid messing up the display when too many letters are guessed at once.
The field to put them in was made 26 characters wide... but includes
the string "Guessed: ". So if you get to 17 it wraps to the next line
and clreol()'s it. Instead, when reaching this point step on the
"Guessed:" string instead.
Reported by phil@.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/games/hangman/prdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/hangman/prdata.c
diff -u src/games/hangman/prdata.c:1.7 src/games/hangman/prdata.c:1.8
--- src/games/hangman/prdata.c:1.7 Sat Oct 13 21:03:09 2012
+++ src/games/hangman/prdata.c Sun Jul 12 02:34:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: prdata.c,v 1.7 2012/10/13 21:03:09 dholland Exp $ */
+/* $NetBSD: prdata.c,v 1.8 2020/07/12 02:34:54 dholland Exp $ */
/*-
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)prdata.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: prdata.c,v 1.7 2012/10/13 21:03:09 dholland Exp $");
+__RCSID("$NetBSD: prdata.c,v 1.8 2020/07/12 02:34:54 dholland Exp $");
#endif
#endif /* not lint */
@@ -47,9 +47,17 @@ __RCSID("$NetBSD: prdata.c,v 1.7 2012/10
void
prdata(void)
{
- int i;
+ int i, n, l;
- move(GUESSY, GUESSX + sizeof "Guessed: ");
+ for (i = n = 0; i < 26; i++)
+ if (Guessed[i])
+ n++;
+
+ move(GUESSY, GUESSX);
+ l = sizeof "Guessed: ";
+ if (GUESSX + l + n < COLS) {
+ addstr("Guessed: ");
+ }
for (i = 0; i < 26; i++)
if (Guessed[i])
addch(i + 'a');
CVS commit: src/doc
Module Name:src Committed By: nia Date: Sun Jul 12 02:09:52 UTC 2020 Modified Files: src/doc: CHANGES Log Message: doc/CHANGES: Added KB_BR To generate a diff of this commit: cvs rdiff -u -r1.2709 -r1.2710 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2709 src/doc/CHANGES:1.2710 --- src/doc/CHANGES:1.2709 Sat Jul 4 21:03:50 2020 +++ src/doc/CHANGES Sun Jul 12 02:09:51 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2709 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2710 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -243,3 +243,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0: dhcpcd: Import version 9.1.4 [roy 20200703] x86: Xen kernels now use the same kernel modules as native kernels. [chs 20200704] + wskbd(4): Added Brazilian keyboard layout (KB_BR) to pckbd(4) and + ukbd(4). [nia 20200712]
CVS commit: src/sys/arch/evbsh3/evbsh3
Module Name:src Committed By: uwe Date: Sun Jul 12 01:52:22 UTC 2020 Modified Files: src/sys/arch/evbsh3/evbsh3: locore.S Log Message: Wrap _ROM_START in #ifdef ROMIMAGE to match its use. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbsh3/evbsh3/locore.S 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/evbsh3/evbsh3/locore.S diff -u src/sys/arch/evbsh3/evbsh3/locore.S:1.11 src/sys/arch/evbsh3/evbsh3/locore.S:1.12 --- src/sys/arch/evbsh3/evbsh3/locore.S:1.11 Sat Oct 7 01:21:47 2006 +++ src/sys/arch/evbsh3/evbsh3/locore.S Sun Jul 12 01:52:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.11 2006/10/07 01:21:47 tsutsui Exp $ */ +/* $NetBSD: locore.S,v 1.12 2020/07/12 01:52:22 uwe Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -223,7 +223,9 @@ ___etext: .long _C_LABEL(etext) ___end: .long _C_LABEL(end) XLtmpstk: .long INIT_STACK _KERNBASE: .long 0x8c00 +#ifdef ROMIMAGE _ROM_START: .long IOM_ROM_BEGIN +#endif XLinitSH3: .long _C_LABEL(initSH3) XLmain: .long _C_LABEL(main) XLtoP2: .long 0x2000
CVS commit: src/sys/dev
Module Name:src
Committed By: nia
Date: Sun Jul 12 01:44:24 UTC 2020
Modified Files:
src/sys/dev/hid: hidkbdmap.c
src/sys/dev/pckbport: wskbdmap_mfii.c
Log Message:
Bring br.nodead closer to X11
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/hid/hidkbdmap.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pckbport/wskbdmap_mfii.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/hid/hidkbdmap.c
diff -u src/sys/dev/hid/hidkbdmap.c:1.4 src/sys/dev/hid/hidkbdmap.c:1.5
--- src/sys/dev/hid/hidkbdmap.c:1.4 Sun Jul 12 01:35:59 2020
+++ src/sys/dev/hid/hidkbdmap.c Sun Jul 12 01:44:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hidkbdmap.c,v 1.4 2020/07/12 01:35:59 nia Exp $ */
+/* $NetBSD: hidkbdmap.c,v 1.5 2020/07/12 01:44:24 nia Exp $ */
/*
* Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.4 2020/07/12 01:35:59 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.5 2020/07/12 01:44:24 nia Exp $");
#include
#include
@@ -649,6 +649,7 @@ static const keysym_t hidkbd_keydesc_br[
static const keysym_t hidkbd_keydesc_br_nodead[] = {
/* pos normal shifted altgr shift-altgr */
+KC(35), KS_6, KS_diaeresis, KS_notsign, KS_dead_diaeresis,
KC(47), KS_apostrophe, KS_grave, KS_dead_acute, KS_dead_grave,
KC(52), KS_asciitilde, KS_asciicircum, KS_dead_tilde, KS_dead_circumflex,
};
Index: src/sys/dev/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.28 src/sys/dev/pckbport/wskbdmap_mfii.c:1.29
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.28 Sun Jul 12 01:35:59 2020
+++ src/sys/dev/pckbport/wskbdmap_mfii.c Sun Jul 12 01:44:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_mfii.c,v 1.28 2020/07/12 01:35:59 nia Exp $ */
+/* $NetBSD: wskbdmap_mfii.c,v 1.29 2020/07/12 01:44:24 nia Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.28 2020/07/12 01:35:59 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.29 2020/07/12 01:44:24 nia Exp $");
#include "opt_wskbdmap.h"
#include
@@ -857,6 +857,7 @@ static const keysym_t pckbd_keydesc_br[]
static const keysym_t pckbd_keydesc_br_nodead[] = {
/* pos normal shifted altgr shift-altgr */
+KC(7), KS_6, KS_diaeresis, KS_notsign, KS_dead_diaeresis,
KC(26), KS_apostrophe, KS_grave, KS_dead_acute, KS_dead_grave,
KC(40), KS_asciitilde, KS_asciicircum, KS_dead_tilde, KS_dead_circumflex,
};
CVS commit: src
Module Name:src Committed By: nia Date: Sun Jul 12 01:36:32 UTC 2020 Modified Files: src/etc: wscons.conf src/share/man/man4: pckbd.4 Log Message: Update lists of keyboard layouts to add Turkish and Brazilian To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/etc/wscons.conf cvs rdiff -u -r1.22 -r1.23 src/share/man/man4/pckbd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/wscons.conf diff -u src/etc/wscons.conf:1.19 src/etc/wscons.conf:1.20 --- src/etc/wscons.conf:1.19 Fri Jul 22 19:06:23 2011 +++ src/etc/wscons.conf Sun Jul 12 01:36:32 2020 @@ -1,4 +1,4 @@ -# $NetBSD: wscons.conf,v 1.19 2011/07/22 19:06:23 christos Exp $ +# $NetBSD: wscons.conf,v 1.20 2020/07/12 01:36:32 nia Exp $ # # workstation console configuration @@ -34,8 +34,8 @@ screen 4 - - # Select a kernel builtin keyboard map by uncommenting the following line and # altering the country code to your requirements -# (choose from user, us, uk, be, cz, dk, nl, fi, fr, de, gr, hu, it, jp, no, -# pl, pt, ru, es, sv, sf, sg, ua) +# (choose from user, us, uk, be, br, cz, dk, nl, fi, fr, de, gr, hu, it, jp, +# no, pl, pt, ru, es, sv, sf, sg, tr, ua) # See wsconsctl(8), pckbd(4), ukbd(4) etc. for more details. #encoding sv #encoding us.swapctrlcaps Index: src/share/man/man4/pckbd.4 diff -u src/share/man/man4/pckbd.4:1.22 src/share/man/man4/pckbd.4:1.23 --- src/share/man/man4/pckbd.4:1.22 Sat Jan 11 21:45:08 2020 +++ src/share/man/man4/pckbd.4 Sun Jul 12 01:36:32 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: pckbd.4,v 1.22 2020/01/11 21:45:08 nia Exp $ +.\" $NetBSD: pckbd.4,v 1.23 2020/07/12 01:36:32 nia Exp $ .\" .\" Copyright (c) 1999 .\" Matthias Drochner. All rights reserved. @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 11, 2020 +.Dd July 12, 2020 .Dt PCKBD 4 .Os .Sh NAME @@ -62,6 +62,8 @@ The builtin mappings are at this time: .It Li KB_US Ta us Ta English/US keyboard mapping (default) .It Li KB_UK Ta uk Ta English/UK keyboard mapping .It Li KB_BE Ta be Ta Belgian +.It Li KB_BR Ta br Ta Brazilian with +.Dq dead accents .It Li KB_CZ Ta cz Ta Czech (QWERTY) .It Li KB_DK Ta dk Ta Danish with .Dq dead accents @@ -84,6 +86,8 @@ The builtin mappings are at this time: .Dq dead accents .It Li KB_SF Ta sf Ta Swiss French .It Li KB_SG Ta sg Ta Swiss German +.It Li KB_TR Ta tr Ta Turkish with +.Dq dead accents .It Li KB_UA Ta ua Ta Ukrainian .It Li "KB_US|KB_DECLK" Ta \&us.declk Ta English/US mapping for Tn DEC .It Ta Ta LK400-style keyboards with PC keyboard @@ -95,11 +99,16 @@ The builtin mappings are at this time: .El .Pp The +.Li KB_BR , .Li KB_DE , .Li KB_DK , -.Li KB_NO +.Li KB_NO , +.Li KB_NL , +.Li KB_SF , +.Li KB_SG , +.Li KB_SV , and -.Li KB_SV +.Li KB_TR mappings can be used in the .Li KB_NODEAD ( .Dq .nodead )
CVS commit: src/sys/dev
Module Name:src
Committed By: nia
Date: Sun Jul 12 01:35:59 UTC 2020
Modified Files:
src/sys/dev/hid: hidkbdmap.c
src/sys/dev/pckbport: wskbdmap_mfii.c
src/sys/dev/wscons: wsksymdef.h
Log Message:
Add support for the Brazilian keyboard layout to pckbd and ukbd.
This is significantly different from the European Portugese layout,
and was pieced together from Wikipedia, X11 layout files, and to
some extent with trial and error.
Thanks to lun-4 for helping test this.
PR kern/44570
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/hid/hidkbdmap.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pckbport/wskbdmap_mfii.c
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/wscons/wsksymdef.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hid/hidkbdmap.c
diff -u src/sys/dev/hid/hidkbdmap.c:1.3 src/sys/dev/hid/hidkbdmap.c:1.4
--- src/sys/dev/hid/hidkbdmap.c:1.3 Fri Apr 24 13:29:46 2020
+++ src/sys/dev/hid/hidkbdmap.c Sun Jul 12 01:35:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hidkbdmap.c,v 1.3 2020/04/24 13:29:46 rhialto Exp $ */
+/* $NetBSD: hidkbdmap.c,v 1.4 2020/07/12 01:35:59 nia Exp $ */
/*
* Copyright (c) 1999,2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.3 2020/04/24 13:29:46 rhialto Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hidkbdmap.c,v 1.4 2020/07/12 01:35:59 nia Exp $");
#include
#include
@@ -619,6 +619,40 @@ static const keysym_t hidkbd_keydesc_hu[
KC(230), KS_Mode_switch, KS_Multi_key
};
+static const keysym_t hidkbd_keydesc_br[] = {
+/* pos normal shifted altgr shift-altgr */
+KC(6), KS_c, KS_C, KS_copyright, KS_copyright,
+KC(8), KS_e, KS_E, KS_currency, KS_currency,
+KC(16), KS_m, KS_M, KS_mu, KS_mu,
+KC(20), KS_q, KS_Q, KS_slash, KS_slash,
+KC(21), KS_r, KS_R, KS_registered, KS_registered,
+KC(26), KS_w, KS_W, KS_question, KS_question,
+KC(30), KS_1, KS_exclam, KS_onesuperior, KS_exclamdown,
+KC(31), KS_2, KS_at, KS_twosuperior, KS_onehalf,
+KC(32), KS_3, KS_numbersign, KS_threesuperior, KS_threequarters,
+KC(33), KS_4, KS_dollar, KS_sterling, KS_onequarter,
+KC(34), KS_5, KS_percent, KS_cent, KS_cent,
+KC(35), KS_6, KS_dead_diaeresis, KS_notsign, KS_diaeresis,
+KC(46), KS_equal, KS_plus, KS_section, KS_dead_ogonek,
+KC(47), KS_dead_acute, KS_dead_grave, KS_acute, KS_grave,
+KC(48), KS_bracketleft, KS_braceleft, KS_ordfeminine, KS_macron,
+KC(49), KS_bracketright, KS_braceright, KS_masculine, KS_masculine,
+KC(50), KS_bracketright, KS_braceright, KS_masculine, KS_masculine,
+KC(51), KS_ccedilla, KS_Ccedilla, KS_dead_acute, KS_dead_hungarumlaut,
+KC(52), KS_dead_tilde, KS_dead_circumflex, KS_asciitilde, KS_asciicircum,
+KC(53), KS_apostrophe, KS_quotedbl, KS_notsign, KS_notsign,
+KC(56), KS_semicolon, KS_colon, KS_dead_dotaccent, KS_abovedot,
+KC(100), KS_backslash, KS_bar, KS_masculine, KS_dead_breve,
+KC(135), KS_slash, KS_question, KS_degree, KS_questiondown,
+KC(230), KS_Mode_switch, KS_Multi_key,
+};
+
+static const keysym_t hidkbd_keydesc_br_nodead[] = {
+/* pos normal shifted altgr shift-altgr */
+KC(47), KS_apostrophe, KS_grave, KS_dead_acute, KS_dead_grave,
+KC(52), KS_asciitilde, KS_asciicircum, KS_dead_tilde, KS_dead_circumflex,
+};
+
#define KBD_MAP(name, base, map) \
{ name, base, sizeof(map)/sizeof(keysym_t), map }
@@ -636,6 +670,8 @@ const struct wscons_keydesc hidkbd_keyde
KBD_MAP(KB_FR, KB_US, hidkbd_keydesc_fr),
KBD_MAP(KB_FR | KB_SWAPCTRLCAPS,KB_FR, hidkbd_keydesc_swapctrlcaps),
KBD_MAP(KB_BE, KB_FR, hidkbd_keydesc_be),
+ KBD_MAP(KB_BR, KB_US, hidkbd_keydesc_br),
+ KBD_MAP(KB_BR | KB_NODEAD, KB_BR, hidkbd_keydesc_br_nodead),
KBD_MAP(KB_DK, KB_US, hidkbd_keydesc_dk),
KBD_MAP(KB_DK | KB_NODEAD, KB_DK, hidkbd_keydesc_dk_nodead),
KBD_MAP(KB_IT, KB_US, hidkbd_keydesc_it),
Index: src/sys/dev/pckbport/wskbdmap_mfii.c
diff -u src/sys/dev/pckbport/wskbdmap_mfii.c:1.27 src/sys/dev/pckbport/wskbdmap_mfii.c:1.28
--- src/sys/dev/pckbport/wskbdmap_mfii.c:1.27 Sat Jan 11 21:43:11 2020
+++ src/sys/dev/pckbport/wskbdmap_mfii.c Sun Jul 12 01:35:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbdmap_mfii.c,v 1.27 2020/01/11 21:43:11 nia Exp $ */
+/* $NetBSD: wskbdmap_mfii.c,v 1.28 2020/07/12 01:35:59 nia Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.27 2020/01/11 21:43:11 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbdmap_mfii.c,v 1.28 2020/07/12 01:35:59 nia Exp $");
#include "opt_wskbdmap.h"
#include
@@ -827,6 +827,39 @@ st
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: kim
Date: Sat Jul 11 14:31:46 UTC 2020
Modified Files:
src/sys/dev/scsipi: scsiconf.c
Log Message:
Continue scanning a SCSI bus when a LUN is reported not present
This fixes disk attachment under Qemu when there is no disk on LUN 0 on
a SCSI bus but there is a disk on LUN 1. The inquiry for LUN 0 returns
SID_QUAL_LU_NOTPRESENT & T_NODEVICE. Quirks are only checked if neither
one of those are set, so cannot use a quirk entry.
Use case 1: Proxmox 6 configures each disk on its own bus when using
the "Virtio SCSI single" SCSI controller. However, while the "scsi0"
disk is on LUN 0, the "scsi1" disk is on LUN 1.
Use case 2: A Linode boot profile with multiple disks results in
the first disk ("sda") on LUN 1, while the second disk ("sdb") is
on LUN 0, each on their own bus.
To generate a diff of this commit:
cvs rdiff -u -r1.287 -r1.288 src/sys/dev/scsipi/scsiconf.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/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.287 src/sys/dev/scsipi/scsiconf.c:1.288
--- src/sys/dev/scsipi/scsiconf.c:1.287 Sat May 2 06:45:53 2020
+++ src/sys/dev/scsipi/scsiconf.c Sat Jul 11 14:31:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.287 2020/05/02 06:45:53 jdc Exp $ */
+/* $NetBSD: scsiconf.c,v 1.288 2020/07/11 14:31:46 kim Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.287 2020/05/02 06:45:53 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.288 2020/07/11 14:31:46 kim Exp $");
#include
#include
@@ -883,6 +883,8 @@ scsi_probe_device(struct scsibus_softc *
break;
case SID_QUAL_LU_NOTPRESENT:
+ docontinue = 1;
+ /* FALLTHROUGH */
case SID_QUAL_reserved:
case SID_QUAL_LU_NOT_SUPP:
goto bad;
CVS commit: src/sys/arch
Module Name:src
Committed By: nia
Date: Sat Jul 11 13:07:01 UTC 2020
Modified Files:
src/sys/arch/mips/atheros/dev: argpio.c
src/sys/arch/sun2/sun2: locore2.c
src/sys/arch/sun3/sun3: locore2.c
src/sys/arch/sun3/sun3x: locore2.c
Log Message:
Fix various typos of "system" in comments. Mainly copypasto errors.
from vezhlys on freenode.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/atheros/dev/argpio.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sun2/sun2/locore2.c
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/sun3/sun3/locore2.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sun3/sun3x/locore2.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/mips/atheros/dev/argpio.c
diff -u src/sys/arch/mips/atheros/dev/argpio.c:1.7 src/sys/arch/mips/atheros/dev/argpio.c:1.8
--- src/sys/arch/mips/atheros/dev/argpio.c:1.7 Thu Sep 15 21:45:37 2016
+++ src/sys/arch/mips/atheros/dev/argpio.c Sat Jul 11 13:07:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: argpio.c,v 1.7 2016/09/15 21:45:37 jdolecek Exp $ */
+/* $NetBSD: argpio.c,v 1.8 2020/07/11 13:07:01 nia Exp $ */
/*-
* Copyright (c) 2006 Garrett D'Amore
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1.7 2016/09/15 21:45:37 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1.8 2020/07/11 13:07:01 nia Exp $");
#include
#include
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1
* General Plan:
*
* Register GPIOs for all pins that are _not_ associated with the reset
- * pin. (Possibly also not the sytem LED.)
+ * pin. (Possibly also not the system LED.)
*/
struct argpio_softc {
Index: src/sys/arch/sun2/sun2/locore2.c
diff -u src/sys/arch/sun2/sun2/locore2.c:1.27 src/sys/arch/sun2/sun2/locore2.c:1.28
--- src/sys/arch/sun2/sun2/locore2.c:1.27 Mon Sep 3 16:29:28 2018
+++ src/sys/arch/sun2/sun2/locore2.c Sat Jul 11 13:07:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore2.c,v 1.27 2018/09/03 16:29:28 riastradh Exp $ */
+/* $NetBSD: locore2.c,v 1.28 2020/07/11 13:07:01 nia Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.27 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.28 2020/07/11 13:07:01 nia Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -151,7 +151,7 @@ _save_symtab(void)
/*
* This function is called from _bootstrap() to initialize
- * pre-vm-sytem virtual memory. All this really does is to
+ * pre-vm-system virtual memory. All this really does is to
* set virtual_avail to the first page following preloaded
* data (i.e. the kernel and its symbol table) and special
* things that may be needed very early (lwp0 upages).
Index: src/sys/arch/sun3/sun3/locore2.c
diff -u src/sys/arch/sun3/sun3/locore2.c:1.102 src/sys/arch/sun3/sun3/locore2.c:1.103
--- src/sys/arch/sun3/sun3/locore2.c:1.102 Mon Sep 3 16:29:28 2018
+++ src/sys/arch/sun3/sun3/locore2.c Sat Jul 11 13:07:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore2.c,v 1.102 2018/09/03 16:29:28 riastradh Exp $ */
+/* $NetBSD: locore2.c,v 1.103 2020/07/11 13:07:01 nia Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.102 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.103 2020/07/11 13:07:01 nia Exp $");
#include "opt_ddb.h"
#include "opt_modular.h"
@@ -168,7 +168,7 @@ _save_symtab(void)
/*
* This function is called from _bootstrap() to initialize
- * pre-vm-sytem virtual memory. All this really does is to
+ * pre-vm-system virtual memory. All this really does is to
* set virtual_avail to the first page following preloaded
* data (i.e. the kernel and its symbol table) and special
* things that may be needed very early (lwp0 upages).
Index: src/sys/arch/sun3/sun3x/locore2.c
diff -u src/sys/arch/sun3/sun3x/locore2.c:1.41 src/sys/arch/sun3/sun3x/locore2.c:1.42
--- src/sys/arch/sun3/sun3x/locore2.c:1.41 Mon Sep 3 16:29:28 2018
+++ src/sys/arch/sun3/sun3x/locore2.c Sat Jul 11 13:07:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore2.c,v 1.41 2018/09/03 16:29:28 riastradh Exp $ */
+/* $NetBSD: locore2.c,v 1.42 2020/07/11 13:07:01 nia Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.41 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.42 2020/07/11 13:07:01 nia Exp $");
#include "opt_ddb.h"
@@ -134,7 +134,7 @@ _save_symtab(void)
/*
* This function is called from _bootstrap() to initialize
- * pre-vm-sytem virtual memory. All this really does is to
+ * pre-vm-system virtual memory. All this really does is to
* set virtual_avail to the first page following preloaded
* data (i.e. the ke
CVS commit: src/share/misc
Module Name:src Committed By: nia Date: Sat Jul 11 13:04:29 UTC 2020 Modified Files: src/share/misc: acronyms.comp Log Message: spell system correctly; from vezhlys on freenode To generate a diff of this commit: cvs rdiff -u -r1.307 -r1.308 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.307 src/share/misc/acronyms.comp:1.308 --- src/share/misc/acronyms.comp:1.307 Thu Jun 11 23:19:53 2020 +++ src/share/misc/acronyms.comp Sat Jul 11 13:04:29 2020 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.307 2020/06/11 23:19:53 sevan Exp $ +$NetBSD: acronyms.comp,v 1.308 2020/07/11 13:04:29 nia Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1747,7 +1747,7 @@ VROC Virtual RAID On CPU VRRP Virtual Router Redundancy Protocol VSTP VLAN Spanning Tree Protocol VTP VLAN Trunking Protocol -VXFS Veritas file sytem +VXFS Veritas file system VXVM Veritas volume manager W watt W3C World Wide Web Consortium
CVS commit: src/sbin/wdogctl
Module Name:src Committed By: jruoho Date: Sat Jul 11 12:51:21 UTC 2020 Modified Files: src/sbin/wdogctl: wdogctl.8 Log Message: Xref x86/tco(4) instead of the parent x86/ichlpcib(4) bridge. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sbin/wdogctl/wdogctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wdogctl/wdogctl.8 diff -u src/sbin/wdogctl/wdogctl.8:1.24 src/sbin/wdogctl/wdogctl.8:1.25 --- src/sbin/wdogctl/wdogctl.8:1.24 Thu Aug 11 08:00:05 2011 +++ src/sbin/wdogctl/wdogctl.8 Sat Jul 11 12:51:21 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: wdogctl.8,v 1.24 2011/08/11 08:00:05 mbalmer Exp $ +.\" $NetBSD: wdogctl.8,v 1.25 2020/07/11 12:51:21 jruoho Exp $ .\" .\" Copyright (c) 2000 Zembu Labs, Inc. .\" All rights reserved. @@ -31,7 +31,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 August 11, 2011 +.Dd July 11, 2020 .Dt WDOGCTL 8 .Os .Sh NAME @@ -172,7 +172,7 @@ the timer. .Xr pcweasel 4 , .Xr pwdog 4 , .Xr swwdog 4 , -.Xr x86/ichlpcib 4 +.Xr x86/tco 4 .Sh HISTORY The .Nm
CVS commit: src/tests/usr.sbin
Module Name:src
Committed By: jruoho
Date: Sat Jul 11 09:55:26 UTC 2020
Modified Files:
src/tests/usr.sbin/execsnoop: t_execsnoop.sh
src/tests/usr.sbin/opensnoop: t_opensnoop.sh
Log Message:
Sleep even more.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.sbin/execsnoop/t_execsnoop.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.sbin/opensnoop/t_opensnoop.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.sbin/execsnoop/t_execsnoop.sh
diff -u src/tests/usr.sbin/execsnoop/t_execsnoop.sh:1.2 src/tests/usr.sbin/execsnoop/t_execsnoop.sh:1.3
--- src/tests/usr.sbin/execsnoop/t_execsnoop.sh:1.2 Mon Jul 6 10:32:18 2020
+++ src/tests/usr.sbin/execsnoop/t_execsnoop.sh Sat Jul 11 09:55:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_execsnoop.sh,v 1.2 2020/07/06 10:32:18 jruoho Exp $
+# $NetBSD: t_execsnoop.sh,v 1.3 2020/07/11 09:55:26 jruoho Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -47,8 +47,9 @@ basic_body() {
n=$(expr $n - 1)
done
- sleep 3
+ sleep 5
pkill -9 execsnoop
+ sleep 1
if [ ! $(cat $tmp | grep "whoami" | wc -l) -eq 10 ]; then
atf_fail "execsnoop does not work"
Index: src/tests/usr.sbin/opensnoop/t_opensnoop.sh
diff -u src/tests/usr.sbin/opensnoop/t_opensnoop.sh:1.3 src/tests/usr.sbin/opensnoop/t_opensnoop.sh:1.4
--- src/tests/usr.sbin/opensnoop/t_opensnoop.sh:1.3 Sat Jul 11 09:35:22 2020
+++ src/tests/usr.sbin/opensnoop/t_opensnoop.sh Sat Jul 11 09:55:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_opensnoop.sh,v 1.3 2020/07/11 09:35:22 jruoho Exp $
+# $NetBSD: t_opensnoop.sh,v 1.4 2020/07/11 09:55:26 jruoho Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -50,8 +50,9 @@ basic_body() {
n=$(expr $n - 1)
done
- sleep 3
+ sleep 5
pkill -9 opensnoop
+ sleep 1
if [ ! $(cat $tmp | grep "/etc/spwd.db" | wc -l) -eq 10 ]; then
atf_fail "opensnoop does not work"
CVS commit: src/tests/usr.sbin/opensnoop
Module Name:src
Committed By: jruoho
Date: Sat Jul 11 09:35:22 UTC 2020
Modified Files:
src/tests/usr.sbin/opensnoop: t_opensnoop.sh
Log Message:
Skip this test as it may cause a panic. Point to PR kern/55481.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.sbin/opensnoop/t_opensnoop.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.sbin/opensnoop/t_opensnoop.sh
diff -u src/tests/usr.sbin/opensnoop/t_opensnoop.sh:1.2 src/tests/usr.sbin/opensnoop/t_opensnoop.sh:1.3
--- src/tests/usr.sbin/opensnoop/t_opensnoop.sh:1.2 Mon Jul 6 10:32:18 2020
+++ src/tests/usr.sbin/opensnoop/t_opensnoop.sh Sat Jul 11 09:35:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_opensnoop.sh,v 1.2 2020/07/06 10:32:18 jruoho Exp $
+# $NetBSD: t_opensnoop.sh,v 1.3 2020/07/11 09:35:22 jruoho Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,11 +33,14 @@ atf_test_case basic cleanup
basic_head() {
atf_set "require.user" "root"
atf_set "require.progs" "opensnoop"
- atf_set "descr" "Test that DTrace's opensnoop works (cf. kern/53417)"
+ atf_set "descr" "Test that DTrace's opensnoop works " \
+ "(cf. PR kern/53417 and PR kern/55481)"
}
basic_body() {
+ atf_skip "The test may cause a panic (PR kern/55481)"
+
n=10
atf_check -s exit:0 -o ignore -e empty -x "opensnoop > $tmp &"
sleep 1
CVS commit: src/libexec/httpd
Module Name:src
Committed By: jruoho
Date: Sat Jul 11 08:10:52 UTC 2020
Modified Files:
src/libexec/httpd: Makefile auth-bozo.c bozohttpd.8 bozohttpd.c
bozohttpd.h
Log Message:
Add blocklistd(8) support.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/libexec/httpd/Makefile
cvs rdiff -u -r1.24 -r1.25 src/libexec/httpd/auth-bozo.c
cvs rdiff -u -r1.80 -r1.81 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.115 -r1.116 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.61 -r1.62 src/libexec/httpd/bozohttpd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/Makefile
diff -u src/libexec/httpd/Makefile:1.28 src/libexec/httpd/Makefile:1.29
--- src/libexec/httpd/Makefile:1.28 Thu Jan 17 07:39:00 2019
+++ src/libexec/httpd/Makefile Sat Jul 11 08:10:52 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/01/17 07:39:00 mrg Exp $
+# $NetBSD: Makefile,v 1.29 2020/07/11 08:10:52 jruoho Exp $
#
# $eterna: Makefile,v 1.30 2010/07/11 00:34:27 mrg Exp $
#
@@ -14,6 +14,7 @@
# NO_SSL_SUPPORT /* don't support ssl (https) */
# DO_HTPASSWD /* support .htpasswd files */
# NO_LUA_SUPPORT /* don't support Lua for dynamic content */
+# NO_BLOCKLIST_SUPPORT /* don't support blocklist */
#
# other system specific defines:
# HAVE_NBUTIL_H /* netbsd compat is in
@@ -32,8 +33,8 @@ SRCS= bozohttpd.c ssl-bozo.c auth-bozo.c
tilde-luzah-bozo.c dir-index-bozo.c content-bozo.c lua-bozo.c
SRCS+= main.c
-LDADD= -lcrypt -llua -lm
-DPADD= ${LIBCRYPT} ${LIBLUA} ${LIBM}
+LDADD= -lblocklist -lcrypt -llua -lm
+DPADD= ${LIBBLOCKLIST} ${LIBCRYPT} ${LIBLUA} ${LIBM}
WARNS?= 4
Index: src/libexec/httpd/auth-bozo.c
diff -u src/libexec/httpd/auth-bozo.c:1.24 src/libexec/httpd/auth-bozo.c:1.25
--- src/libexec/httpd/auth-bozo.c:1.24 Thu Feb 28 08:28:21 2019
+++ src/libexec/httpd/auth-bozo.c Sat Jul 11 08:10:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-bozo.c,v 1.24 2019/02/28 08:28:21 mrg Exp $ */
+/* $NetBSD: auth-bozo.c,v 1.25 2020/07/11 08:10:52 jruoho Exp $ */
/* $eterna: auth-bozo.c,v 1.17 2011/11/18 09:21:15 mrg Exp $ */
@@ -105,6 +105,11 @@ bozo_auth_check(bozo_httpreq_t *request,
pass) != 0)
break;
fclose(fp);
+
+#ifndef NO_BLOCKLIST_SUPPORT
+ pfilter_notify(BLOCKLIST_AUTH_OK, 200);
+#endif /* !NO_BLOCKLIST_SUPPORT */
+
return 0;
}
}
Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.80 src/libexec/httpd/bozohttpd.8:1.81
--- src/libexec/httpd/bozohttpd.8:1.80 Mon Jul 6 23:31:36 2020
+++ src/libexec/httpd/bozohttpd.8 Sat Jul 11 08:10:52 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: bozohttpd.8,v 1.80 2020/07/06 23:31:36 jmcneill Exp $
+.\" $NetBSD: bozohttpd.8,v 1.81 2020/07/11 08:10:52 jruoho Exp $
.\"
.\" $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
.\"
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd July 6, 2020
+.Dd July 11, 2020
.Dt BOZOHTTPD 8
.Os
.Sh NAME
@@ -454,6 +454,45 @@ with
on the compiler command line to enable this support.
It may require linking with the crypt library, using
.Dq -lcrypt .
+.Ss BLOCKLIST SUPPORT
+On NetBSD,
+.Nm
+supports
+.Xr blocklistd 8
+by default.
+The support can be disabled with the
+.Dq -DNO_BLOCKLIST_SUPPORT
+compilation option.
+.Pp
+Upon occurrence,
+.Nm
+reports three HTTP status codes to
+.Xr blocklistd 8
+as failures:
+.Em 401
+(``Unauthorized'') ,
+.Em 403
+(``Forbidden'') ,
+and
+.Em 500
+(``Internal Server Error'') .
+Of these,
+.Em 401
+is the one received upon authorization failure with the
+HTTP Basic Authorization mechanism.
+A successful authorization decreases the counter kept by
+.Xr blocklistd 8 .
+.Pp
+Note that the implementation of the HTTP Basic Authorization mechanism
+uses a redirection; a status code
+.Em 401
+is always initially received.
+Therefore, a single authorization failure of
+.Pa .htpasswd
+is reported as two failures to
+.Xr blocklistd 8 ,
+but no failures are recorded upon successful authorization
+due to the decrease of the failure counter.
.Ss SSL SUPPORT
.Nm
has support for TLSv1.1 and TLSv1.2 protocols that are included by
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.115 src/libexec/httpd/bozohttpd.c:1.116
--- src/libexec/httpd/bozohttpd.c:1.115 Mon Jul 6 23:31:36 2020
+++ src/libexec/httpd/bozohttpd.c Sat Jul 11 08:10:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.115 2020/07/06 23:31:36 jmcneill Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.116 2020/07/11 08:10:52 jruoho Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -2133,6 +2133,7 @@ static struct errors_map {
const char *shortmsg; /* short version of message */
const char *longmsg; /* long version of message */
} errors_map[] = {
+ { 200, "200 OK", "The request was valid", },
{ 400, "400 Bad Request", "The request was no
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Sat Jul 11 07:14:53 UTC 2020
Modified Files:
src/sys/kern: subr_prf.c
Log Message:
Remove support for '%n' in the kernel printf functions.
It makes vulnerabilities too easily exploitable, is unused and as a sanity
rule should not be used in the kernel to begin with.
Now, "printf(unfiltered_string);" is much less of a problem.
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/sys/kern/subr_prf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.184 src/sys/kern/subr_prf.c:1.185
--- src/sys/kern/subr_prf.c:1.184 Sat May 23 23:42:43 2020
+++ src/sys/kern/subr_prf.c Sat Jul 11 07:14:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prf.c,v 1.184 2020/05/23 23:42:43 ad Exp $ */
+/* $NetBSD: subr_prf.c,v 1.185 2020/07/11 07:14:53 maxv Exp $ */
/*-
* Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.184 2020/05/23 23:42:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.185 2020/07/11 07:14:53 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1373,20 +1373,21 @@ reswitch: switch (ch) {
base = DEC;
goto number;
case 'n':
+ /* no %n support in the kernel, consume and skip */
if (flags & MAXINT)
-*va_arg(ap, intmax_t *) = ret;
+(void)va_arg(ap, intmax_t *);
else if (flags & PTRINT)
-*va_arg(ap, intptr_t *) = ret;
+(void)va_arg(ap, intptr_t *);
else if (flags & SIZEINT)
-*va_arg(ap, ssize_t *) = ret;
+(void)va_arg(ap, ssize_t *);
else if (flags & QUADINT)
-*va_arg(ap, quad_t *) = ret;
+(void)va_arg(ap, quad_t *);
else if (flags & LONGINT)
-*va_arg(ap, long *) = ret;
+(void)va_arg(ap, long *);
else if (flags & SHORTINT)
-*va_arg(ap, short *) = ret;
+(void)va_arg(ap, short *);
else
-*va_arg(ap, int *) = ret;
+(void)va_arg(ap, int *);
continue; /* no output */
case 'O':
flags |= LONGINT;
