CVS commit: src/etc/rc.d
Module Name:src Committed By: mlelstv Date: Tue Aug 3 05:15:20 UTC 2021 Modified Files: src/etc/rc.d: ccd cgd devpubd lvm raidframe zfs Log Message: Reverse devpubd dependeny to avoid dangling reference to zfs which is an optional part of the build. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/etc/rc.d/ccd cvs rdiff -u -r1.8 -r1.9 src/etc/rc.d/cgd cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/devpubd cvs rdiff -u -r1.6 -r1.7 src/etc/rc.d/lvm cvs rdiff -u -r1.10 -r1.11 src/etc/rc.d/raidframe cvs rdiff -u -r1.5 -r1.6 src/etc/rc.d/zfs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/rc.d/ccd diff -u src/etc/rc.d/ccd:1.7 src/etc/rc.d/ccd:1.8 --- src/etc/rc.d/ccd:1.7 Tue Apr 5 02:52:27 2011 +++ src/etc/rc.d/ccd Tue Aug 3 05:15:20 2021 @@ -1,9 +1,10 @@ #!/bin/sh # -# $NetBSD: ccd,v 1.7 2011/04/05 02:52:27 enami Exp $ +# $NetBSD: ccd,v 1.8 2021/08/03 05:15:20 mlelstv Exp $ # # PROVIDE: ccd +# REQUIRE: devpubd # BEFORE: DISKS # KEYWORD: shutdown Index: src/etc/rc.d/cgd diff -u src/etc/rc.d/cgd:1.8 src/etc/rc.d/cgd:1.9 --- src/etc/rc.d/cgd:1.8 Mon Nov 1 14:41:11 2010 +++ src/etc/rc.d/cgd Tue Aug 3 05:15:20 2021 @@ -1,10 +1,10 @@ #!/bin/sh # -# $NetBSD: cgd,v 1.8 2010/11/01 14:41:11 christos Exp $ +# $NetBSD: cgd,v 1.9 2021/08/03 05:15:20 mlelstv Exp $ # # PROVIDE: cgd -# REQUIRE: rndctl +# REQUIRE: rndctl devpubd # BEFORE: DISKS # KEYWORD: interactive Index: src/etc/rc.d/devpubd diff -u src/etc/rc.d/devpubd:1.2 src/etc/rc.d/devpubd:1.3 --- src/etc/rc.d/devpubd:1.2 Sat Jul 31 14:47:04 2021 +++ src/etc/rc.d/devpubd Tue Aug 3 05:15:20 2021 @@ -1,11 +1,10 @@ #!/bin/sh # -# $NetBSD: devpubd,v 1.2 2021/07/31 14:47:04 mlelstv Exp $ +# $NetBSD: devpubd,v 1.3 2021/08/03 05:15:20 mlelstv Exp $ # # PROVIDE: devpubd # REQUIRE: root -# BEFORE: zfs ccd cgd lvm raidframe $_rc_subr_loaded . /etc/rc.subr Index: src/etc/rc.d/lvm diff -u src/etc/rc.d/lvm:1.6 src/etc/rc.d/lvm:1.7 --- src/etc/rc.d/lvm:1.6 Sat Jul 4 06:24:53 2020 +++ src/etc/rc.d/lvm Tue Aug 3 05:15:20 2021 @@ -1,10 +1,10 @@ #!/bin/sh # -# $NetBSD: lvm,v 1.6 2020/07/04 06:24:53 skrll Exp $ +# $NetBSD: lvm,v 1.7 2021/08/03 05:15:20 mlelstv Exp $ # # PROVIDE: lvm -# REQUIRE: root +# REQUIRE: root devpubd # BEFORE: DISKS $_rc_subr_loaded . /etc/rc.subr Index: src/etc/rc.d/raidframe diff -u src/etc/rc.d/raidframe:1.10 src/etc/rc.d/raidframe:1.11 --- src/etc/rc.d/raidframe:1.10 Tue Apr 21 16:08:57 2009 +++ src/etc/rc.d/raidframe Tue Aug 3 05:15:20 2021 @@ -1,9 +1,10 @@ #!/bin/sh # -# $NetBSD: raidframe,v 1.10 2009/04/21 16:08:57 joerg Exp $ +# $NetBSD: raidframe,v 1.11 2021/08/03 05:15:20 mlelstv Exp $ # # PROVIDE: raidframe +# REQUIRE: devpubd # BEFORE: DISKS $_rc_subr_loaded . /etc/rc.subr Index: src/etc/rc.d/zfs diff -u src/etc/rc.d/zfs:1.5 src/etc/rc.d/zfs:1.6 --- src/etc/rc.d/zfs:1.5 Mon Dec 9 00:11:32 2019 +++ src/etc/rc.d/zfs Tue Aug 3 05:15:20 2021 @@ -1,10 +1,10 @@ #!/bin/sh # -# $NetBSD: zfs,v 1.5 2019/12/09 00:11:32 sevan Exp $ +# $NetBSD: zfs,v 1.6 2021/08/03 05:15:20 mlelstv Exp $ # # PROVIDE: zfs -# REQUIRE: root +# REQUIRE: root devpubd # BEFORE: DISKS $_rc_subr_loaded . /etc/rc.subr
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Tue Aug 3 04:46:49 UTC 2021
Modified Files:
src/usr.bin/make/unit-tests: varmod-order-numeric.mk
varmod-order-reverse.mk varmod-order-shuffle.mk
varmod-order-string.mk varmod-order.exp varmod-order.mk
Log Message:
tests/make: fix test for the variable modifier ':On'
The variable modifier ':On' sorts words numerically. If these words are
not numeric at all, they get assigned the numeric value 0. Internally,
':On' uses qsort for sorting the words. Since qsort is not specified to
use a stable sorting algorithm, the test data must only use words that
either are written in the same way or that are numerically different.
The test varmod-order failed this requirement by trying to numerically
sort a list of non-numeric words. This led to different results on BSD
and Ubuntu, as could be expected.
To fix the tests, distinguish between words and numbers in the tests.
While here, clean up the tests for all variants of the variable modifier
':O'.
Found by sjg on Ubuntu.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/varmod-order-numeric.mk \
src/usr.bin/make/unit-tests/varmod-order-reverse.mk \
src/usr.bin/make/unit-tests/varmod-order.exp
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/varmod-order-shuffle.mk \
src/usr.bin/make/unit-tests/varmod-order.mk
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/varmod-order-string.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/varmod-order-numeric.mk
diff -u src/usr.bin/make/unit-tests/varmod-order-numeric.mk:1.4 src/usr.bin/make/unit-tests/varmod-order-numeric.mk:1.5
--- src/usr.bin/make/unit-tests/varmod-order-numeric.mk:1.4 Sat Jul 31 20:55:46 2021
+++ src/usr.bin/make/unit-tests/varmod-order-numeric.mk Tue Aug 3 04:46:49 2021
@@ -1,11 +1,17 @@
-# $NetBSD: varmod-order-numeric.mk,v 1.4 2021/07/31 20:55:46 rillig Exp $
+# $NetBSD: varmod-order-numeric.mk,v 1.5 2021/08/03 04:46:49 rillig Exp $
#
-# Tests for the :On variable modifier, which returns the words, sorted in
-# ascending numeric order.
+# Tests for the variable modifiers ':On', which returns the words, sorted in
+# ascending numeric order, and for ':Orn' and ':Onr', which additionally
+# reverse the order.
+#
+# The variable modifiers ':On', ':Onr' and ':Orn' were added in var.c 1.939
+# from 2021-07-30.
# This list contains only 32-bit numbers since the make code needs to conform
# to C90, which does not provide integer types larger than 32 bit. It uses
-# 'long long' by default, but that type is overridable if necessary.
+# 'long long' by default, but that type is overridable if necessary to support
+# older environments.
+#
# To get 53-bit integers even in C90, it would be possible to switch to
# 'double' instead, but that would allow floating-point numbers as well, which
# is out of scope for this variable modifier.
@@ -24,6 +30,14 @@ NUMBERS= 3 5 7 1 42 -42 5K -3m 1M 1k -2G
. error ${NUMBERS:Onr}
.endif
+# Duplicate numbers are preserved in the output. In this case the
+# equal-valued numbers are spelled the same, so they are indistinguishable in
+# the output.
+DUPLICATES= 3 1 2 2 1 1 # https://oeis.org/A034002
+.if ${DUPLICATES:On} != "1 1 1 2 2 3"
+. error ${DUPLICATES:On}
+.endif
+
# If there are several numbers that have the same integer value, they are
# returned in unspecified order.
SAME_VALUE:= ${:U 79 80 0x0050 81 :On}
@@ -32,9 +46,9 @@ SAME_VALUE:= ${:U 79 80 0x0050 81 :On}
.endif
# Hexadecimal and octal numbers are supported as well.
-OCTAL= 0 010 0x7 9
-.if ${OCTAL:On} != "0 0x7 010 9"
-. error ${OCTAL:On}
+MIXED_BASE= 0 010 0x7 9
+.if ${MIXED_BASE:On} != "0 0x7 010 9"
+. error ${MIXED_BASE:On}
.endif
all:
Index: src/usr.bin/make/unit-tests/varmod-order-reverse.mk
diff -u src/usr.bin/make/unit-tests/varmod-order-reverse.mk:1.4 src/usr.bin/make/unit-tests/varmod-order-reverse.mk:1.5
--- src/usr.bin/make/unit-tests/varmod-order-reverse.mk:1.4 Sat Oct 24 08:46:08 2020
+++ src/usr.bin/make/unit-tests/varmod-order-reverse.mk Tue Aug 3 04:46:49 2021
@@ -1,13 +1,12 @@
-# $NetBSD: varmod-order-reverse.mk,v 1.4 2020/10/24 08:46:08 rillig Exp $
+# $NetBSD: varmod-order-reverse.mk,v 1.5 2021/08/03 04:46:49 rillig Exp $
#
# Tests for the :Or variable modifier, which returns the words, sorted in
# descending order.
-NUMBERS= one two three four five six seven eight nine ten
+WORDS= one two three four five six seven eight nine ten
-.if ${NUMBERS:Or} != "two three ten six seven one nine four five eight"
-. error ${NUMBERS:Or}
+.if ${WORDS:Or} != "two three ten six seven one nine four five eight"
+. error ${WORDS:Or}
.endif
all:
- @:;
Index: src/usr.bin/make/unit-tests/varmod-order.exp
diff -u src/usr.bin/make/unit-tests/varmod-order.exp:1.4 src/usr.bin/make/unit-tests/varmod-order.exp:1.
CVS commit: src/doc
Module Name:src Committed By: msaitoh Date: Tue Aug 3 01:44:11 UTC 2021 Modified Files: src/doc: TODO.smpnet Log Message: Remove ixgbe because both ixg and ixv exist in the list. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/doc/TODO.smpnet Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.smpnet diff -u src/doc/TODO.smpnet:1.41 src/doc/TODO.smpnet:1.42 --- src/doc/TODO.smpnet:1.41 Mon Aug 2 23:49:26 2021 +++ src/doc/TODO.smpnet Tue Aug 3 01:44:10 2021 @@ -1,4 +1,4 @@ -$NetBSD: TODO.smpnet,v 1.41 2021/08/02 23:49:26 mrg Exp $ +$NetBSD: TODO.smpnet,v 1.42 2021/08/03 01:44:10 msaitoh Exp $ MP-safe components == @@ -11,7 +11,6 @@ kernel option. Some components scale up - bcmgenet(4) - iavf(4) - ixg(4) - - ixgbe(4) - ixl(4) - ixv(4) - mcx(4)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: knakahara
Date: Tue Aug 3 01:08:18 UTC 2021
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix locking against myself reported by rin@n.o.
In some machine, INTx interrupts occurs for some reason while holding
txq_lock in softint context.
e.g. https://dmesgd.nycbug.org/index.cgi?do=view&id=6139
The panic message is the following.
[ 50.1699480] panic: LOCKDEBUG: Mutex error: mutex_vector_enter,467: locking
against myself
[ 50.1800188] cpu0: Begin traceback...
[ 50.1800188] 0xc7a29ac4: netbsd:db_panic+0xc
[ 50.1900018] 0xc7a29adc: netbsd:vpanic+0x120
[ 50.1999533] 0xc7a29af4: netbsd:aprint_debug
[ 50.1999533] 0xc7a29b34: netbsd:lockdebug_abort1+0x18c
[ 50.2099719] 0xc7a29b74: netbsd:lockdebug_wantlock+0x1e8
[ 50.2199525] 0xc7a29bb4: netbsd:mutex_enter+0x288
[ 50.2299642] 0xc7a29be4: netbsd:wm_intr_legacy+0x9c
[ 50.2299642] 0xc7a29c2c: netbsd:i80321_intr_dispatch+0x138
[ 50.2399631] 0xc7a29de4: netbsd:irq_entry+0x98
[ 50.2499452] 0xc7a29e24: netbsd:entropy_enter+0x88
[ 50.256] 0xc7a29e6c: netbsd:rnd_add_data_1+0x50
[ 50.2699565] 0xc7a29ebc: netbsd:rnd_add_data+0x10c
[ 50.2699565] 0xc7a29ed4: netbsd:rnd_add_uint32+0x28
[ 50.2799524] 0xc7a29f1c: netbsd:wm_txeof+0x2c0
[ 50.2899527] 0xc7a29f5c: netbsd:wm_handle_queue+0x44
[ 50.3000257] 0xc7a29fac: netbsd:softint_thread+0x130
[ 50.3100119] cpu0: End traceback...
To fix this panic, stop wm(4) interrupts before calling softint.
This behavior is similar to MSI-X polling mode.
Reviewed by msaitoh@n.o, tested by rin@n.o, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.705 -r1.706 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.705 src/sys/dev/pci/if_wm.c:1.706
--- src/sys/dev/pci/if_wm.c:1.705 Wed Jun 16 00:21:18 2021
+++ src/sys/dev/pci/if_wm.c Tue Aug 3 01:08:18 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.705 2021/06/16 00:21:18 riastradh Exp $ */
+/* $NetBSD: if_wm.c,v 1.706 2021/08/03 01:08:18 knakahara Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.705 2021/06/16 00:21:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.706 2021/08/03 01:08:18 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -9774,6 +9774,20 @@ wm_sched_handle_queue(struct wm_softc *s
softint_schedule(wmq->wmq_si);
}
+static inline void
+wm_legacy_intr_disable(struct wm_softc *sc)
+{
+
+ CSR_WRITE(sc, WMREG_IMC, 0xU);
+}
+
+static inline void
+wm_legacy_intr_enable(struct wm_softc *sc)
+{
+
+ CSR_WRITE(sc, WMREG_IMS, sc->sc_icr);
+}
+
/*
* wm_intr_legacy:
*
@@ -9788,6 +9802,7 @@ wm_intr_legacy(void *arg)
struct wm_rxqueue *rxq = &wmq->wmq_rxq;
uint32_t icr, rndval = 0;
int handled = 0;
+ bool more = false;
while (1 /* CONSTCOND */) {
icr = CSR_READ(sc, WMREG_ICR);
@@ -9822,7 +9837,7 @@ wm_intr_legacy(void *arg)
* as if_percpuq_enqueue() just call softint_schedule().
* So, we can call wm_rxeof() in interrupt context.
*/
- wm_rxeof(rxq, UINT_MAX);
+ more = wm_rxeof(rxq, UINT_MAX);
mutex_exit(rxq->rxq_lock);
mutex_enter(txq->txq_lock);
@@ -9840,7 +9855,7 @@ wm_intr_legacy(void *arg)
WM_Q_EVCNT_INCR(txq, txdw);
}
#endif
- wm_txeof(txq, UINT_MAX);
+ more |= wm_txeof(txq, UINT_MAX);
mutex_exit(txq->txq_lock);
WM_CORE_LOCK(sc);
@@ -9869,8 +9884,9 @@ wm_intr_legacy(void *arg)
rnd_add_uint32(&sc->rnd_source, rndval);
- if (handled) {
+ if (more) {
/* Try to get more packets going. */
+ wm_legacy_intr_disable(sc);
wmq->wmq_txrx_use_workqueue = sc->sc_txrx_use_workqueue;
wm_sched_handle_queue(sc, wmq);
}
@@ -9883,6 +9899,10 @@ wm_txrxintr_disable(struct wm_queue *wmq
{
struct wm_softc *sc = wmq->wmq_txq.txq_sc;
+ if (__predict_false(!wm_is_using_msix(sc))) {
+ return wm_legacy_intr_disable(sc);
+ }
+
if (sc->sc_type == WM_T_82574)
CSR_WRITE(sc, WMREG_IMC,
ICR_TXQ(wmq->wmq_id) | ICR_RXQ(wmq->wmq_id));
@@ -9900,6 +9920,10 @@ wm_txrxintr_enable(struct wm_queue *wmq)
wm_itrs_calculate(sc, wmq);
+ if (__predict_false(!wm_is_using_msix(sc))) {
+ return wm_legacy_intr_enable(sc);
+ }
+
/*
* ICR_OTHER which is disabled in wm_linkintr_msix() is enabled here.
* There is no need to care about which of RXQ(0) and RXQ(1) enable
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Mon Aug 2 23:49:26 UTC 2021 Modified Files: src/doc: TODO.smpnet Log Message: update the list of ethernet drivers that have been MPSAFEified. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/doc/TODO.smpnet Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.smpnet diff -u src/doc/TODO.smpnet:1.40 src/doc/TODO.smpnet:1.41 --- src/doc/TODO.smpnet:1.40 Wed Jan 20 10:26:43 2021 +++ src/doc/TODO.smpnet Mon Aug 2 23:49:26 2021 @@ -1,4 +1,4 @@ -$NetBSD: TODO.smpnet,v 1.40 2021/01/20 10:26:43 nia Exp $ +$NetBSD: TODO.smpnet,v 1.41 2021/08/02 23:49:26 mrg Exp $ MP-safe components == @@ -8,12 +8,34 @@ kernel option. Some components scale up - Device drivers - aq(4) - - vioif(4) - - vmx(4) - - wm(4) + - bcmgenet(4) + - iavf(4) - ixg(4) + - ixgbe(4) - ixl(4) - ixv(4) + - mcx(4) + - rge(4) + - se(4) + - sunxi_emac(4) + - vioif(4) + - vmx(4) + - wm(4) + - xennet(4) + - usbnet(4) based adapters: + - axe(4) + - axen(4) + - cdce(4) + - cue(4) + - kue(4) + - mos(4) + - mue(4) + - smsc(4) + - udav(4) + - upl(4) + - ure(4) + - url(4) + - urndis(4) - Layer 2 - Ethernet (if_ethersubr.c) - bridge(4)
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src
Committed By: riastradh
Date: Mon Aug 2 23:14:15 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/linux: linux_reservation.c
Log Message:
drm: Plug another fence leak.
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/linux/linux_reservation.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/external/bsd/drm2/linux/linux_reservation.c
diff -u src/sys/external/bsd/drm2/linux/linux_reservation.c:1.13 src/sys/external/bsd/drm2/linux/linux_reservation.c:1.14
--- src/sys/external/bsd/drm2/linux/linux_reservation.c:1.13 Mon Aug 2 20:20:54 2021
+++ src/sys/external/bsd/drm2/linux/linux_reservation.c Mon Aug 2 23:14:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_reservation.c,v 1.13 2021/08/02 20:20:54 riastradh Exp $ */
+/* $NetBSD: linux_reservation.c,v 1.14 2021/08/02 23:14:15 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.13 2021/08/02 20:20:54 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.14 2021/08/02 23:14:15 riastradh Exp $");
#include
#include
@@ -1003,6 +1003,7 @@ top:
* assume the event is not ready.
*/
if (!claimed || callback) {
+ fence_put(fence);
revents = 0;
break;
}
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: oster
Date: Mon Aug 2 22:37:29 UTC 2021
Modified Files:
src/sys/dev/raidframe: raidframevar.h rf_raid.h
Log Message:
Accidentally commited some other changes that weren't quite ready. Add
these changes to fix the build.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/raidframe/raidframevar.h
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/raidframe/rf_raid.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/raidframe/raidframevar.h
diff -u src/sys/dev/raidframe/raidframevar.h:1.21 src/sys/dev/raidframe/raidframevar.h:1.22
--- src/sys/dev/raidframe/raidframevar.h:1.21 Thu Oct 10 03:43:59 2019
+++ src/sys/dev/raidframe/raidframevar.h Mon Aug 2 22:37:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframevar.h,v 1.21 2019/10/10 03:43:59 christos Exp $ */
+/* $NetBSD: raidframevar.h,v 1.22 2021/08/02 22:37:29 oster Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -355,6 +355,7 @@ typedef RF_uint32 RF_ReconReqFlags_t;
/* flags that can be put in the rf_recon_req structure */
#define RF_FDFLAGS_NONE 0x0 /* just fail the disk */
#define RF_FDFLAGS_RECON 0x1 /* fail and initiate recon */
+#define RF_FDFLAGS_RECON_FORCE 0x2 /* fail and initiate recon, ignoring errors */
struct rf_recon_req { /* used to tell the kernel to fail a disk */
RF_RowCol_t col;
Index: src/sys/dev/raidframe/rf_raid.h
diff -u src/sys/dev/raidframe/rf_raid.h:1.49 src/sys/dev/raidframe/rf_raid.h:1.50
--- src/sys/dev/raidframe/rf_raid.h:1.49 Fri Jul 23 00:54:45 2021
+++ src/sys/dev/raidframe/rf_raid.h Mon Aug 2 22:37:29 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid.h,v 1.49 2021/07/23 00:54:45 oster Exp $ */
+/* $NetBSD: rf_raid.h,v 1.50 2021/08/02 22:37:29 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -187,6 +187,7 @@ struct RF_Raid_s {
RF_HeadSepLimit_t headSepLimit;
int numFloatingReconBufs;
int reconInProgress;
+ int forceRecon;
rf_declare_cond2(waitForReconCond); /* goes with raidPtr->mutex */
RF_RaidReconDesc_t *reconDesc; /* reconstruction descriptor */
RF_ReconCtrl_t *reconControl; /* reconstruction control structure
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Mon Aug 2 20:58:39 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: oper.c
Log Message:
lint: expand abbreviations in definitions of operator properties
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/xlint/lint1/oper.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/oper.c
diff -u src/usr.bin/xlint/lint1/oper.c:1.9 src/usr.bin/xlint/lint1/oper.c:1.10
--- src/usr.bin/xlint/lint1/oper.c:1.9 Sat Mar 20 20:56:58 2021
+++ src/usr.bin/xlint/lint1/oper.c Mon Aug 2 20:58:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: oper.c,v 1.9 2021/03/20 20:56:58 rillig Exp $ */
+/* $NetBSD: oper.c,v 1.10 2021/08/02 20:58:39 rillig Exp $ */
/*-
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -36,17 +36,23 @@
const mod_t modtab[NOPS] =
#define begin_ops() {
#define op(name, repr, \
- bi, lo, tb, rb, \
- in, ic, ar, sc, \
- fo, va, ts, ba, \
- se, lu, ru, pc, \
- cm, ve, de, ew) \
+ is_binary, is_logical, takes_bool, requires_bool, \
+ is_integer, is_complex, is_arithmetic, is_scalar, \
+ can_fold, is_value, is_test, balances_operands, \
+ side_effects, left_unsigned, right_unsigned, \
+ precedence_confusion, is_comparison, \
+ valid_on_enum, bad_on_enum, warn_if_eq) \
{ \
- bi + 0 > 0, lo + 0 > 0, tb + 0 > 0, rb + 0 > 0, \
- in + 0 > 0, ic + 0 > 0, ar + 0 > 0, sc + 0 > 0, \
- fo + 0 > 0, va + 0 > 0, ts + 0 > 0, ba + 0 > 0, \
- se + 0 > 0, lu + 0 > 0, ru + 0 > 0, pc + 0 > 0, \
- cm + 0 > 0, ve + 0 > 0, de + 0 > 0, ew + 0 > 0, \
+ is_binary + 0 > 0, is_logical + 0 > 0, \
+ takes_bool + 0 > 0, requires_bool + 0 > 0, \
+ is_integer + 0 > 0, is_complex + 0 > 0, \
+ is_arithmetic + 0 > 0, is_scalar + 0 > 0, \
+ can_fold + 0 > 0, is_value + 0 > 0, \
+ is_test + 0 > 0, balances_operands + 0 > 0, \
+ side_effects + 0 > 0, left_unsigned + 0 > 0, \
+ right_unsigned + 0 > 0, precedence_confusion + 0 > 0, \
+ is_comparison + 0 > 0, valid_on_enum + 0 > 0, \
+ bad_on_enum + 0 > 0, warn_if_eq + 0 > 0, \
repr, \
},
#define end_ops(n) };
CVS commit: src
Module Name:src
Committed By: oster
Date: Mon Aug 2 20:31:15 UTC 2021
Modified Files:
src/sbin/raidctl: raidctl.8 raidctl.c
src/sys/dev/raidframe: raidframeio.h rf_netbsdkintf.c
Log Message:
Support on-demand re-scanning all devices to look for
autoconfig RAID sets. raidctl now supports looking
for autoconfig RAID sets with a new '-L' flag.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sbin/raidctl/raidctl.8
cvs rdiff -u -r1.73 -r1.74 src/sbin/raidctl/raidctl.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/raidframe/raidframeio.h
cvs rdiff -u -r1.397 -r1.398 src/sys/dev/raidframe/rf_netbsdkintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/raidctl/raidctl.8
diff -u src/sbin/raidctl/raidctl.8:1.77 src/sbin/raidctl/raidctl.8:1.78
--- src/sbin/raidctl/raidctl.8:1.77 Thu May 27 07:03:27 2021
+++ src/sbin/raidctl/raidctl.8 Mon Aug 2 20:31:15 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: raidctl.8,v 1.77 2021/05/27 07:03:27 wiz Exp $
+.\" $NetBSD: raidctl.8,v 1.78 2021/08/02 20:31:15 oster Exp $
.\"
.\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -53,7 +53,7 @@
.\" any improvements or extensions that they make and grant Carnegie the
.\" rights to redistribute these changes.
.\"
-.Dd May 26, 2021
+.Dd August 2, 2021
.Dt RAIDCTL 8
.Os
.Sh NAME
@@ -96,6 +96,9 @@
.Fl i Ar dev
.Nm
.Op Fl v
+.Fl L Ar dev
+.Nm
+.Op Fl v
.Fl M
.Oo yes | no | set
.Ar params
@@ -251,6 +254,15 @@ be done for
.Em all
RAID sets before the RAID device is labeled and before
file systems are created on the RAID device.
+.It Fl L Ar dev
+Rescan all devices on the system, looking for RAID sets that can be
+auto-configured. The RAID device provided here has to be a valid
+device, but does not need to be configured. (e.g.
+.Bd -literal -offset indent
+raidctl -L raid0
+.Ed
+.Pp
+is all that is needed to perform a rescan.)
.It Fl M Ic yes Ar dev
.\"XXX should there be a section with more info on the parity map feature?
Enable the use of a parity map on the RAID set; this is the default,
Index: src/sbin/raidctl/raidctl.c
diff -u src/sbin/raidctl/raidctl.c:1.73 src/sbin/raidctl/raidctl.c:1.74
--- src/sbin/raidctl/raidctl.c:1.73 Sun Aug 1 20:26:53 2021
+++ src/sbin/raidctl/raidctl.c Mon Aug 2 20:31:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: raidctl.c,v 1.73 2021/08/01 20:26:53 oster Exp $ */
+/* $NetBSD: raidctl.c,v 1.74 2021/08/02 20:31:15 oster Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: raidctl.c,v 1.73 2021/08/01 20:26:53 oster Exp $");
+__RCSID("$NetBSD: raidctl.c,v 1.74 2021/08/02 20:31:15 oster Exp $");
#endif
@@ -133,7 +133,7 @@ main(int argc,char *argv[])
last_unit = 0;
openmode = O_RDWR; /* default to read/write */
- while ((ch = getopt(argc, argv, "a:A:Bc:C:f:F:g:GiI:l:mM:r:R:sSpPuU:v"))
+ while ((ch = getopt(argc, argv, "a:A:Bc:C:f:F:g:GiI:l:LmM:r:R:sSpPuU:v"))
!= -1)
switch(ch) {
case 'a':
@@ -202,6 +202,10 @@ main(int argc,char *argv[])
get_comp(component, optarg, sizeof(component));
num_options++;
break;
+ case 'L':
+ action = RAIDFRAME_RESCAN;
+ num_options++;
+ break;
case 'm':
action = RAIDFRAME_PARITYMAP_STATUS;
openmode = O_RDONLY;
@@ -362,6 +366,9 @@ main(int argc,char *argv[])
do_ioctl(fd, RAIDFRAME_SET_LAST_UNIT, &last_unit,
"RAIDFRAME_SET_LAST_UNIT");
break;
+ case RAIDFRAME_RESCAN:
+ do_ioctl(fd, RAIDFRAME_RESCAN, NULL, "RAIDFRAME_RESCAN");
+ break;
default:
break;
}
Index: src/sys/dev/raidframe/raidframeio.h
diff -u src/sys/dev/raidframe/raidframeio.h:1.9 src/sys/dev/raidframe/raidframeio.h:1.10
--- src/sys/dev/raidframe/raidframeio.h:1.9 Sat Jan 20 01:32:45 2018
+++ src/sys/dev/raidframe/raidframeio.h Mon Aug 2 20:31:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframeio.h,v 1.9 2018/01/20 01:32:45 mrg Exp $ */
+/* $NetBSD: raidframeio.h,v 1.10 2021/08/02 20:31:14 oster Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -133,5 +133,6 @@
#define RAIDFRAME_SET_LAST_UNIT _IOW('r', 41, int)
#define RAIDFRAME_GET_INFO _IOWR('r', 42, RF_DeviceConfig_t *) /* get configuration */
#define RAIDFRAME_CONFIGURE _IOW ('r', 43, void *) /* configure the driver */
-
+#define RAIDFRAME_RESCAN _IO ('r', 44)
#endif/* !_RF_RAIDFRAMEIO_H_ */
+
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.397 src/sys/dev/raidframe/rf_netbsdkintf.c:1.398
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.397 Mon Jul 26 22:50:36 2021
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Mon Aug 2 20:31:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.397 2021/07/26 22:50:36 oster Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.398 2021/08/02 20:31:14 oster Exp
CVS commit: src/sys/external/bsd/drm2/linux
Module Name:src Committed By: riastradh Date: Mon Aug 2 20:20:54 UTC 2021 Modified Files: src/sys/external/bsd/drm2/linux: linux_reservation.c Log Message: drm: Release fence if we're about to return too. Should fix another fence leak. XXX pullup-9 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/drm2/linux/linux_reservation.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/external/bsd/drm2/linux/linux_reservation.c diff -u src/sys/external/bsd/drm2/linux/linux_reservation.c:1.12 src/sys/external/bsd/drm2/linux/linux_reservation.c:1.13 --- src/sys/external/bsd/drm2/linux/linux_reservation.c:1.12 Sun Jun 27 08:10:36 2021 +++ src/sys/external/bsd/drm2/linux/linux_reservation.c Mon Aug 2 20:20:54 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_reservation.c,v 1.12 2021/06/27 08:10:36 riastradh Exp $ */ +/* $NetBSD: linux_reservation.c,v 1.13 2021/08/02 20:20:54 riastradh Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.12 2021/06/27 08:10:36 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.13 2021/08/02 20:20:54 riastradh Exp $"); #include #include @@ -794,9 +794,9 @@ wait: KASSERT(fence != NULL); rcu_read_unlock(); ret = fence_wait_timeout(fence, intr, timeout); + fence_put(fence); if (ret <= 0) return ret; - fence_put(fence); KASSERT(ret <= timeout); timeout = ret; goto top;
CVS commit: src/lib/librumpuser
Module Name:src Committed By: andvar Date: Mon Aug 2 17:45:10 UTC 2021 Modified Files: src/lib/librumpuser: README.compileopts Log Message: fix typo in README.compileopts text. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/README.compileopts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumpuser/README.compileopts diff -u src/lib/librumpuser/README.compileopts:1.1 src/lib/librumpuser/README.compileopts:1.2 --- src/lib/librumpuser/README.compileopts:1.1 Mon Jan 25 00:24:23 2016 +++ src/lib/librumpuser/README.compileopts Mon Aug 2 17:45:10 2021 @@ -1,4 +1,4 @@ -$NetBSD: README.compileopts,v 1.1 2016/01/25 00:24:23 pooka Exp $ +$NetBSD: README.compileopts,v 1.2 2021/08/02 17:45:10 andvar Exp $ This file describes compile-time options (make variables) for the rumpuser POSIX implementation. @@ -12,7 +12,7 @@ Global options: values: pthread/none/fiber or defval: effect: Define the way threading is implemented in the rumpuser hypercall - implmentation. + implementation. - use default implementation (currently "pthread") pthread - use pthreads to implement threading none- do not support kernel threads at all
CVS commit: src/tests/lib/libossaudio
Module Name:src
Committed By: andvar
Date: Mon Aug 2 17:43:56 UTC 2021
Modified Files:
src/tests/lib/libossaudio: t_ossaudio.c
Log Message:
s/suported/supported in comments
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libossaudio/t_ossaudio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libossaudio/t_ossaudio.c
diff -u src/tests/lib/libossaudio/t_ossaudio.c:1.3 src/tests/lib/libossaudio/t_ossaudio.c:1.4
--- src/tests/lib/libossaudio/t_ossaudio.c:1.3 Sat Dec 26 15:28:52 2020
+++ src/tests/lib/libossaudio/t_ossaudio.c Mon Aug 2 17:43:55 2021
@@ -250,7 +250,7 @@ ATF_TC_BODY(oss_dsp_init, tc)
* and some unsupported sample rates... "best effort"
*/
- /* closest suported rate is 1000 */
+ /* closest supported rate is 1000 */
rate = 900;
if (ioctl(fd, SNDCTL_DSP_SPEED, &rate) < 0)
atf_tc_fail("ioctl SNDCTL_DSP_SPEED (900) failed");
@@ -259,7 +259,7 @@ ATF_TC_BODY(oss_dsp_init, tc)
ATF_REQUIRE((fabs(900.0 - info.play.sample_rate) / 900.0) < 0.2);
ATF_REQUIRE_EQ(rate, (int)info.play.sample_rate);
- /* closest suported rate is 192000 */
+ /* closest supported rate is 192000 */
rate = 197000;
if (ioctl(fd, SNDCTL_DSP_SPEED, &rate) < 0)
atf_tc_fail("ioctl SNDCTL_DSP_SPEED (197000) failed");
CVS commit: src/tests/lib/libc
Module Name:src
Committed By: andvar
Date: Mon Aug 2 17:41:07 UTC 2021
Modified Files:
src/tests/lib/libc/locale: t_sprintf.c t_strfmon.c t_toupper.c
src/tests/lib/libc/string: t_strcoll.c
Log Message:
s/diferent/different/
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libc/locale/t_sprintf.c
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/locale/t_strfmon.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/locale/t_toupper.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/string/t_strcoll.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/locale/t_sprintf.c
diff -u src/tests/lib/libc/locale/t_sprintf.c:1.7 src/tests/lib/libc/locale/t_sprintf.c:1.8
--- src/tests/lib/libc/locale/t_sprintf.c:1.7 Fri Dec 1 01:08:35 2017
+++ src/tests/lib/libc/locale/t_sprintf.c Mon Aug 2 17:41:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sprintf.c,v 1.7 2017/12/01 01:08:35 kre Exp $ */
+/* $NetBSD: t_sprintf.c,v 1.8 2021/08/02 17:41:07 andvar Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2017\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_sprintf.c,v 1.7 2017/12/01 01:08:35 kre Exp $");
+__RCSID("$NetBSD: t_sprintf.c,v 1.8 2021/08/02 17:41:07 andvar Exp $");
#include
#include
@@ -193,7 +193,7 @@ ATF_TC(sprintf);
ATF_TC_HEAD(sprintf, tc)
{
atf_tc_set_md_var(tc, "descr",
- "Checks sprintf %%'d and %%'f under diferent locales");
+ "Checks sprintf %%'d and %%'f under different locales");
}
ATF_TC_BODY(sprintf, tc)
{
@@ -207,7 +207,7 @@ ATF_TC(strto);
ATF_TC_HEAD(strto, tc)
{
atf_tc_set_md_var(tc, "descr",
- "Checks strtol and strtod under diferent locales");
+ "Checks strtol and strtod under different locales");
}
ATF_TC_BODY(strto, tc)
{
@@ -221,7 +221,7 @@ ATF_TC(sscanf);
ATF_TC_HEAD(sscanf, tc)
{
atf_tc_set_md_var(tc, "descr",
- "Checks sscanf under diferent locales");
+ "Checks sscanf under different locales");
}
ATF_TC_BODY(sscanf, tc)
{
Index: src/tests/lib/libc/locale/t_strfmon.c
diff -u src/tests/lib/libc/locale/t_strfmon.c:1.2 src/tests/lib/libc/locale/t_strfmon.c:1.3
--- src/tests/lib/libc/locale/t_strfmon.c:1.2 Thu Dec 7 22:23:14 2017
+++ src/tests/lib/libc/locale/t_strfmon.c Mon Aug 2 17:41:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strfmon.c,v 1.2 2017/12/07 22:23:14 kre Exp $ */
+/* $NetBSD: t_strfmon.c,v 1.3 2021/08/02 17:41:07 andvar Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: t_strfmon.c,v 1.2 2017/12/07 22:23:14 kre Exp $");
+__RCSID("$NetBSD: t_strfmon.c,v 1.3 2021/08/02 17:41:07 andvar Exp $");
#include
#include
@@ -41,7 +41,7 @@ ATF_TC(strfmon);
ATF_TC_HEAD(strfmon, tc)
{
atf_tc_set_md_var(tc, "descr",
- "Checks strfmon_l under diferent locales");
+ "Checks strfmon_l under different locales");
}
ATF_TC_BODY(strfmon, tc)
Index: src/tests/lib/libc/locale/t_toupper.c
diff -u src/tests/lib/libc/locale/t_toupper.c:1.1 src/tests/lib/libc/locale/t_toupper.c:1.2
--- src/tests/lib/libc/locale/t_toupper.c:1.1 Tue May 30 02:11:03 2017
+++ src/tests/lib/libc/locale/t_toupper.c Mon Aug 2 17:41:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: t_toupper.c,v 1.1 2017/05/30 02:11:03 perseant Exp $ */
+/* $NetBSD: t_toupper.c,v 1.2 2021/08/02 17:41:07 andvar Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2017\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_toupper.c,v 1.1 2017/05/30 02:11:03 perseant Exp $");
+__RCSID("$NetBSD: t_toupper.c,v 1.2 2021/08/02 17:41:07 andvar Exp $");
#include
#include
@@ -92,7 +92,7 @@ ATF_TC(toupper);
ATF_TC_HEAD(toupper, tc)
{
atf_tc_set_md_var(tc, "descr",
- "Checks toupper under diferent locales");
+ "Checks toupper under different locales");
}
ATF_TC_BODY(toupper, tc)
@@ -108,7 +108,7 @@ ATF_TC(tolower);
ATF_TC_HEAD(tolower, tc)
{
atf_tc_set_md_var(tc, "descr",
- "Checks tolower under diferent locales");
+ "Checks tolower under different locales");
}
ATF_TC_BODY(tolower, tc)
Index: src/tests/lib/libc/string/t_strcoll.c
diff -u src/tests/lib/libc/string/t_strcoll.c:1.1 src/tests/lib/libc/string/t_strcoll.c:1.2
--- src/tests/lib/libc/string/t_strcoll.c:1.1 Fri May 26 01:24:19 2017
+++ src/tests/lib/libc/string/t_strcoll.c Mon Aug 2 17:41:07 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strcoll.c,v 1.1 2017/05/26 01:24:19 perseant Exp $ */
+/* $NetBSD: t_strcoll.c,v 1.2 2021/08/02 17:41:07 andvar Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2017\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_strcoll.c,v 1.1 2017/05/26 01:24:19 perseant Exp $");
+__RCSID("$NetBSD: t_strcoll.c,v 1.2 20
CVS commit: src/sys/dev/ic
Module Name:src Committed By: tnn Date: Mon Aug 2 14:00:48 UTC 2021 Modified Files: src/sys/dev/ic: ssdfb.c ssdfbvar.h Log Message: ssdfb: define SSD1353 command set also adjust some SSD1322 command names To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/ssdfb.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/ssdfbvar.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/ic/ssdfb.c diff -u src/sys/dev/ic/ssdfb.c:1.14 src/sys/dev/ic/ssdfb.c:1.15 --- src/sys/dev/ic/ssdfb.c:1.14 Fri Jul 30 13:44:09 2021 +++ src/sys/dev/ic/ssdfb.c Mon Aug 2 14:00:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ssdfb.c,v 1.14 2021/07/30 13:44:09 tnn Exp $ */ +/* $NetBSD: ssdfb.c,v 1.15 2021/08/02 14:00:48 tnn Exp $ */ /* * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.14 2021/07/30 13:44:09 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.15 2021/08/02 14:00:48 tnn Exp $"); #include "opt_ddb.h" @@ -271,7 +271,7 @@ ssdfb_attach(struct ssdfb_softc *sc, int ri->ri_depth = sc->sc_p->p_bits_per_pixel; #else ri->ri_depth = 8; -#endif +#endif ri->ri_font = sc->sc_font; ri->ri_width = sc->sc_p->p_width; ri->ri_height = sc->sc_p->p_height; @@ -774,14 +774,14 @@ ssdfb_init_ssd1322(struct ssdfb_softc *s if (error) return error; SSDFB_CMD2(SSD1322_CMD_SET_SECOND_PRECHARGE_PERIOD, - SSD1322_DEFAULT_SECOND_PRECHARGE); + SSD1322_DEFAULT_SECOND_PRECHARGE_PERIOD); if (error) return error; /* * Configure physical display panel layout. */ - SSDFB_CMD2(SSD1322_CMD_SET_MUX_RATIO, sc->sc_p->p_multiplex_ratio); + SSDFB_CMD2(SSD1322_CMD_SET_MULTIPLEX_RATIO, sc->sc_p->p_multiplex_ratio); if (error) return error; if (sc->sc_upsidedown) Index: src/sys/dev/ic/ssdfbvar.h diff -u src/sys/dev/ic/ssdfbvar.h:1.6 src/sys/dev/ic/ssdfbvar.h:1.7 --- src/sys/dev/ic/ssdfbvar.h:1.6 Fri Jul 30 13:44:09 2021 +++ src/sys/dev/ic/ssdfbvar.h Mon Aug 2 14:00:48 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ssdfbvar.h,v 1.6 2021/07/30 13:44:09 tnn Exp $ */ +/* $NetBSD: ssdfbvar.h,v 1.7 2021/08/02 14:00:48 tnn Exp $ */ /* * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -154,13 +154,12 @@ #define SSD1322_CMD_SET_DISPLAY_START_LINE 0xa1 #define SSD1322_CMD_SET_DISPLAY_OFFSET 0xa2 -/* These are the same as SSDFB generic commands */ -#define SSD1322_CMD_ENTIRE_DISPLAY_OFF 0xa4 -#define SSD1322_CMD_ENTIRE_DISPLAY_ON 0xa5 -#define SSD1322_CMD_NORMAL_DISPLAY 0xa6 -#define SSD1322_CMD_INVERSE_DISPLAY 0xa7 -#define SSD1322_CMD_SET_SLEEP_MODE_ON 0xae -#define SSD1322_CMD_SET_SLEEP_MODE_OFF 0xaf +#define SSD1322_CMD_ENTIRE_DISPLAY_OFF SSDFB_CMD_ENTIRE_DISPLAY_OFF +#define SSD1322_CMD_ENTIRE_DISPLAY_ON SSDFB_CMD_ENTIRE_DISPLAY_ON +#define SSD1322_CMD_NORMAL_DISPLAY SSDFB_CMD_SET_NORMAL_DISPLAY +#define SSD1322_CMD_INVERSE_DISPLAY SSDFB_CMD_SET_INVERSE_DISPLAY +#define SSD1322_CMD_SET_SLEEP_MODE_ON SSDFB_CMD_SET_DISPLAY_OFF +#define SSD1322_CMD_SET_SLEEP_MODE_OFF SSDFB_CMD_SET_DISPLAY_ON #define SSD1322_CMD_ENABLE_PARTIAL_DISPLAY 0xa8 #define SSD1322_CMD_EXIT_PARTIAL_DISPLAY 0xa9 @@ -190,7 +189,7 @@ #define SSD1322_GPIO1_LOW __BIT(3) #define SSD1322_GPIO1_HIGH __BITS(3, 2) #define SSD1322_CMD_SET_SECOND_PRECHARGE_PERIOD 0xb6 - #define SSD1322_DEFAULT_SECOND_PRECHARGE 8 + #define SSD1322_DEFAULT_SECOND_PRECHARGE_PERIOD 8 #define SSD1322_CMD_SET_GRAY_SCALE_TABLE 0xb8 #define SSD1322_CMD_SET_DEFAULT_GRAY_SCALE_TABLE 0xb9 #define SSD1322_CMD_SET_PRE_CHARGE_VOLTAGE_LEVEL 0xbb @@ -201,13 +200,73 @@ #define SSD1322_DEFAULT_CONTRAST_CURRENT 0x7f #define SSD1322_CMD_MASTER_CONTRAST_CURRENT_CONTROL 0xc7 #define SSD1322_DEFAULT_MASTER_CONTRAST_CURRENT_CONTROL 0xf -#define SSD1322_CMD_SET_MUX_RATIO 0xca +#define SSD1322_CMD_SET_MULTIPLEX_RATIO 0xca #define SSD1322_CMD_DISPLAY_ENHANCEMENT_B 0xd1 #define SSD1322_DISPLAY_ENHANCEMENT_B_MAGIC1 0xa2 #define SSD1322_DISPLAY_ENHANCEMENT_B_MAGIC2 0x20 #define SSD1322_CMD_SET_COMMAND_LOCK 0xfd #define SSD1322_COMMAND_UNLOCK_MAGIC 0x12 #define SSD1322_COMMAND_LOCK_MAGIC 0x16 +/* undocumented on this chip, but works in practice */ +#define SSD1322_CMD_NOP SSDFB_CMD_NOP + +/* + * SSD1353 command set + */ +#define SSD1353_CMD_SET_COLUMN_ADDRESS SSD1322_CMD_SET_COLUMN_ADDRESS +#define SSD1353_CMD_DRAW_LINE0x21 +#define SSD1353_CMD_DRAW_RECTANGLE 0x22 +#define SSD1353_CMD_COPY0x23 +#define SSD1353_CMD_DIM 0x24 +#define SSD1353_CMD_CLEAR_WINDOW 0x25 +#define SSD1353_CMD_FILL_ENABLE0x26 +#define SSD1353_CMD_SCROLLING_SETUP 0x27 +#define SSD1353_CMD_DEACTIVATE_SCROLL SSDFB_CMD_DEACTIVATE_SCROLL +#define SSD1353_CMD_ACTIVATE_SCROLL SSDFB_CMD_ACTIVATE_SCROLL +#define SSD1353_CMD_WRITE_RAMSSD1322_CMD_WRITE_RAM +#define SD1353_CMD_READ_RAMSSD1322_CMD_READ_RAM +#define SSD1353_CMD_SET_ROW_
CVS commit: src
Module Name:src
Committed By: andvar
Date: Mon Aug 2 12:56:25 UTC 2021
Modified Files:
src/common/include/rpc: types.h
src/sys/arch/arm/arm: armv6_start.S
src/sys/arch/arm/ixp12x0: ixp12x0reg.h
src/sys/arch/arm/sociox: if_scx.c
src/sys/arch/arm/xscale: ixp425_npe.c
src/sys/arch/evbarm/adi_brh: brhreg.h
src/sys/arch/evbmips/rmixl: machdep.c
src/sys/arch/i386/stand/lib: biosmemx.S
src/sys/arch/luna68k/stand/boot: scsivar.h
src/sys/arch/m68k/060sp/dist: isp.s
src/sys/arch/mips/atheros/dev: aereg.h
src/sys/arch/sun3/dev: si_sebuf.c si_vme.c
src/sys/arch/sun3/sun3: pmap.c
src/sys/arch/vax/vax: pmap.c
src/sys/arch/x86/x86: pmap.c
src/sys/dev/isa: cs89x0isa.c
src/sys/dev/marvell: gtintrreg.h if_mvxpe.c mvxpbmvar.h
src/sys/dev/pci: if_skreg.h
src/sys/dev/pci/cxgb: cxgb_t3_hw.c
src/sys/dev/pci/ixgbe: ixgbe_common.c
src/sys/dev/pckbport: alps.c
src/sys/dev/raidframe: rf_dagfuncs.c
src/sys/dev/usb: usbdivar.h
src/sys/net/agr: if_agr.c
src/sys/netatalk: at_control.c
src/sys/netinet6: nd6_nbr.c
src/sys/sys: sockio.h
src/usr.bin/config: TODO
src/usr.sbin/mopd/common: common.h print.c
Log Message:
fix various typos in comments and log messages.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/common/include/rpc/types.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/arm/armv6_start.S
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/ixp12x0/ixp12x0reg.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/sociox/if_scx.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/ixp425_npe.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/adi_brh/brhreg.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbmips/rmixl/machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/i386/stand/lib/biosmemx.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/scsivar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/m68k/060sp/dist/isp.s
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/atheros/dev/aereg.h
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sun3/dev/si_sebuf.c \
src/sys/arch/sun3/dev/si_vme.c
cvs rdiff -u -r1.171 -r1.172 src/sys/arch/sun3/sun3/pmap.c
cvs rdiff -u -r1.191 -r1.192 src/sys/arch/vax/vax/pmap.c
cvs rdiff -u -r1.410 -r1.411 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/isa/cs89x0isa.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/marvell/gtintrreg.h
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/marvell/if_mvxpe.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/marvell/mvxpbmvar.h
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/if_skreg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/cxgb/cxgb_t3_hw.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/ixgbe/ixgbe_common.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pckbport/alps.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/raidframe/rf_dagfuncs.c
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/usb/usbdivar.h
cvs rdiff -u -r1.51 -r1.52 src/sys/net/agr/if_agr.c
cvs rdiff -u -r1.40 -r1.41 src/sys/netatalk/at_control.c
cvs rdiff -u -r1.181 -r1.182 src/sys/netinet6/nd6_nbr.c
cvs rdiff -u -r1.39 -r1.40 src/sys/sys/sockio.h
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/config/TODO
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/mopd/common/common.h
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/mopd/common/print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/include/rpc/types.h
diff -u src/common/include/rpc/types.h:1.3 src/common/include/rpc/types.h:1.4
--- src/common/include/rpc/types.h:1.3 Sun Jun 16 16:01:44 2019
+++ src/common/include/rpc/types.h Mon Aug 2 12:56:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.3 2019/06/16 16:01:44 christos Exp $ */
+/* $NetBSD: types.h,v 1.4 2021/08/02 12:56:22 andvar Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -95,7 +95,7 @@ struct netbuf {
};
/*
- * The format of the addres and options arguments of the XTI t_bind call.
+ * The format of the address and options arguments of the XTI t_bind call.
* Only provided for compatibility, it should not be used.
*/
Index: src/sys/arch/arm/arm/armv6_start.S
diff -u src/sys/arch/arm/arm/armv6_start.S:1.34 src/sys/arch/arm/arm/armv6_start.S:1.35
--- src/sys/arch/arm/arm/armv6_start.S:1.34 Wed Jan 27 13:50:17 2021
+++ src/sys/arch/arm/arm/armv6_start.S Mon Aug 2 12:56:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: armv6_start.S,v 1.34 2021/01/27 13:50:17 skrll Exp $ */
+/* $NetBSD: armv6_start.S,v 1.35 2021/08/02 12:56:22 andvar Exp $ */
/*-
* Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -462,7 +462,7 @@ generic_startv7:
movt r0, #:upper16:TEMP_L1_TABLE
sub r0, R_VTOPDIFF
- // Return to virtual addess after the call to armv7_mmuinit
+ // Return to virtual address after the call to armv7_mmuinit
movw lr, #:lower16:generic_vstartv7
movt lr, #:upper16:generic_vstartv7
b armv
CVS commit: src/lib/libcurses
Module Name:src Committed By: nia Date: Mon Aug 2 11:11:20 UTC 2021 Modified Files: src/lib/libcurses: curses_attributes.3 curses_standout.3 Log Message: curses: clarify documentation regarding the standout attribute To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libcurses/curses_attributes.3 cvs rdiff -u -r1.8 -r1.9 src/lib/libcurses/curses_standout.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/curses_attributes.3 diff -u src/lib/libcurses/curses_attributes.3:1.9 src/lib/libcurses/curses_attributes.3:1.10 --- src/lib/libcurses/curses_attributes.3:1.9 Thu Oct 25 10:36:56 2018 +++ src/lib/libcurses/curses_attributes.3 Mon Aug 2 11:11:20 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_attributes.3,v 1.9 2018/10/25 10:36:56 uwe Exp $ +.\" $NetBSD: curses_attributes.3,v 1.10 2021/08/02 11:11:20 nia Exp $ .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. .\" @@ -25,7 +25,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd October 25, 2018 +.Dd July 27, 2021 .Dt CURSES_ATTRIBUTES 3 .Os .Sh NAME @@ -102,7 +102,7 @@ The attributes that can be manipulated a .It A_NORMAL no special attributes are applied .It A_STANDOUT -characters are displayed in standout mode +characters are displayed in the "best" highlighting mode of the terminal .It A_UNDERLINE characters are displayed underlined .It A_REVERSE @@ -193,7 +193,7 @@ The additional wide attributes that can .Pp .Bl -tag -width "COLOR_PAIR(n)" -compact -offset indent .It WA_STANDOUT -characters are displayed in standout mode +characters are displayed in the "best" highlighting mode of the terminal .It WA_UNDERLINE characters are displayed underlined .It WA_REVERSE @@ -336,7 +336,10 @@ extension. .Sh HISTORY These functions first appeared in .Nx 1.5 . -.Sh BUGS +.Sh CAVEATS Some terminals do not support characters with both color and other attributes set. In this case, the other attribute is displayed instead of the color attribute. +.Pp +The standout attribute is a higher level alias and should not be mixed with +other attributes. Index: src/lib/libcurses/curses_standout.3 diff -u src/lib/libcurses/curses_standout.3:1.8 src/lib/libcurses/curses_standout.3:1.9 --- src/lib/libcurses/curses_standout.3:1.8 Mon Jul 26 20:17:09 2021 +++ src/lib/libcurses/curses_standout.3 Mon Aug 2 11:11:20 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_standout.3,v 1.8 2021/07/26 20:17:09 nia Exp $ +.\" $NetBSD: curses_standout.3,v 1.9 2021/08/02 11:11:20 nia Exp $ .\" Copyright (c) 2002 The NetBSD Foundation, Inc. .\" All rights reserved. .\" @@ -25,7 +25,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 26, 2021 +.Dd July 27, 2021 .Dt CURSES_STANDOUT 3 .Os .Sh NAME @@ -55,6 +55,9 @@ These functions manipulate the standout attribute on .Dv stdscr or on the specified window. +The standout attribute applies the "best highlighting mode" +supported by the current terminal, which may be an alias of +other attributes. .Pp The .Fn standout @@ -101,3 +104,9 @@ Single Unix Specification. .Sh HISTORY The Curses package appeared in .Bx 4.0 . +.Sh CAVEATS +On some terminals, characters with standout set may have the same appearance +as characters with the reverse video or bold attribute set. +However, on legacy terminals, standout may be the only attribute that can be +used to emphasize characters. +The standout attribute should not be mixed with other attributes.
