CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: blymn Date: Thu Oct 29 00:27:50 UTC 2020 Modified Files: src/tests/lib/libcurses: t_curses.sh Log Message: Disable the wgetch test as it appears to be missing at the moment. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/tests/lib/libcurses/t_curses.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/lib/libcurses/t_curses.sh diff -u src/tests/lib/libcurses/t_curses.sh:1.19 src/tests/lib/libcurses/t_curses.sh:1.20 --- src/tests/lib/libcurses/t_curses.sh:1.19 Tue Oct 27 11:01:22 2020 +++ src/tests/lib/libcurses/t_curses.sh Thu Oct 29 00:27:50 2020 @@ -2203,7 +2203,7 @@ atf_init_test_cases() # curses input stream routines atf_add_test_case getch - atf_add_test_case wgetch + #atf_add_test_case wgetch [test is missing] atf_add_test_case define_key atf_add_test_case keyok atf_add_test_case getnstr
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: ryo
Date: Wed Oct 28 08:36:40 UTC 2020
Added Files:
src/sys/dev/fdt: vmt_fdt.c
Log Message:
add missing vmt_fdt.c.
sorry, I forgot to commit vmt_fdt.c in
http://mail-index.netbsd.org/source-changes/2020/10/27/msg123452.html
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/fdt/vmt_fdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/dev/fdt/vmt_fdt.c
diff -u /dev/null src/sys/dev/fdt/vmt_fdt.c:1.1
--- /dev/null Wed Oct 28 08:36:40 2020
+++ src/sys/dev/fdt/vmt_fdt.c Wed Oct 28 08:36:40 2020
@@ -0,0 +1,71 @@
+/* $NetBSD: vmt_fdt.c,v 1.1 2020/10/28 08:36:40 ryo Exp $ */
+
+/*
+ * Copyright (c) 2020 Ryo Shimizu
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: vmt_fdt.c,v 1.1 2020/10/28 08:36:40 ryo Exp $");
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+static int vmt_fdt_match(device_t, cfdata_t, void *);
+static void vmt_fdt_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(vmt_fdt, sizeof(struct vmt_softc),
+vmt_fdt_match, vmt_fdt_attach, NULL, NULL);
+
+static const struct of_compat_data compat_data[] = {
+ { "vmware", },
+ { NULL }
+};
+
+static int
+vmt_fdt_match(device_t parent, cfdata_t cf, void *aux)
+{
+ const struct fdt_attach_args * const faa = aux;
+
+ if (OF_finddevice("/hypervisor") != faa->faa_phandle)
+ return 0;
+ return of_match_compat_data(faa->faa_phandle, compat_data);
+}
+
+static void
+vmt_fdt_attach(device_t parent, device_t self, void *aux)
+{
+ struct vmt_softc * const sc = device_private(self);
+
+ aprint_naive("\n");
+ aprint_normal(": VMware Tools driver\n");
+
+ sc->sc_dev = self;
+ vmt_common_attach(sc);
+}
CVS commit: src
Module Name:src Committed By: nia Date: Wed Oct 28 08:10:10 UTC 2020 Modified Files: src/distrib/sets/lists/xbase: mi shl.mi src/distrib/sets/lists/xcomp: mi shl.mi src/distrib/sets/lists/xdebug: mi shl.mi src/external/mit/xorg/bin: Makefile src/external/mit/xorg/lib: Makefile Removed Files: src/external/mit/xorg/bin/xtrap: Makefile Makefile.xtrap src/external/mit/xorg/bin/xtrap/xtrapchar: Makefile src/external/mit/xorg/bin/xtrap/xtrapin: Makefile src/external/mit/xorg/bin/xtrap/xtrapinfo: Makefile src/external/mit/xorg/bin/xtrap/xtrapout: Makefile src/external/mit/xorg/bin/xtrap/xtrapproto: Makefile src/external/mit/xorg/bin/xtrap/xtrapreset: Makefile src/external/mit/xorg/bin/xtrap/xtrapstats: Makefile Log Message: xorg: retire XTrap library and sample clients the DEC-XTRAP extension is deprecated since 1994, so modern X servers do not support it the library was removed from pkgsrc last year and is not required by anything not-sample-client related in src if you try to query the protocol on netbsd, you get the following: $ xtrapproto Display: :0.0 Warning: Can't load DEC-XTRAP extension xtrapproto: could not initialize extension To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 src/distrib/sets/lists/xbase/mi cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/xbase/shl.mi cvs rdiff -u -r1.220 -r1.221 src/distrib/sets/lists/xcomp/mi cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/xcomp/shl.mi cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xdebug/mi cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/bin/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xtrap/Makefile cvs rdiff -u -r1.3 -r0 src/external/mit/xorg/bin/xtrap/Makefile.xtrap cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xtrap/xtrapchar/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xtrap/xtrapin/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xtrap/xtrapinfo/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/bin/xtrap/xtrapout/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/xtrap/xtrapproto/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/xtrap/xtrapreset/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/xtrap/xtrapstats/Makefile cvs rdiff -u -r1.53 -r1.54 src/external/mit/xorg/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.159 src/distrib/sets/lists/xbase/mi:1.160 --- src/distrib/sets/lists/xbase/mi:1.159 Fri Oct 16 08:28:17 2020 +++ src/distrib/sets/lists/xbase/mi Wed Oct 28 08:10:08 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.159 2020/10/16 08:28:17 nia Exp $ +# $NetBSD: mi,v 1.160 2020/10/28 08:10:08 nia Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -133,13 +133,13 @@ ./usr/X11R7/bin/xsm xbase-xsm-bin xorg ./usr/X11R7/bin/xstdcmapxbase-xstdcmap-bin xorg ./usr/X11R7/bin/xterm xbase-xterm-bin xorg -./usr/X11R7/bin/xtrapcharxbase-xtrap-bin xorg -./usr/X11R7/bin/xtrapin xbase-xtrap-bin xorg -./usr/X11R7/bin/xtrapinfoxbase-xtrap-bin xorg -./usr/X11R7/bin/xtrapoutxbase-xtrap-bin xorg -./usr/X11R7/bin/xtrapprotoxbase-xtrap-bin xorg -./usr/X11R7/bin/xtrapresetxbase-xtrap-bin xorg -./usr/X11R7/bin/xtrapstatsxbase-xtrap-bin xorg +./usr/X11R7/bin/xtrapcharxbase-obsolete obsolete +./usr/X11R7/bin/xtrapin xbase-obsolete obsolete +./usr/X11R7/bin/xtrapinfoxbase-obsolete obsolete +./usr/X11R7/bin/xtrapoutxbase-obsolete obsolete +./usr/X11R7/bin/xtrapprotoxbase-obsolete obsolete +./usr/X11R7/bin/xtrapresetxbase-obsolete obsolete +./usr/X11R7/bin/xtrapstatsxbase-obsolete obsolete ./usr/X11R7/bin/xvidtunexbase-xvidtune-bin xorg ./usr/X11R7/bin/xvinfo xbase-xvinfo-bin xorg ./usr/X11R7/bin/xwd xbase-xwd-bin xorg @@ -1386,14 +1386,14 @@ ./usr/X11R7/man/cat1/xsm.0xbase-xsm-catman .cat,xorg ./usr/X11R7/man/cat1/xstdcmap.0xbase-xstdcmap-catman .cat,xorg ./usr/X11R7/man/cat1/xterm.0xbase-xterm-catman .cat,xorg -./usr/X11R7/man/cat1/xtrap.0xbase-xtrap-catman .cat,xorg -./usr/X11R7/man/cat1/xtrapchar.0 xbase-xtrap-catman .cat,xorg -./usr/X11R7/man/cat1/xtrapin.0xbase-xtrap-catman .cat,xorg -./usr/X11R7/man/cat1/xtrapinfo.0 xbase-xtrap-catman .cat,xorg -./usr/X11R7/man/cat1/xtrapout.0xbase-xtrap-catman .cat,xorg -./usr/X11R7/man/cat1/xtrapproto.0 xbase-xtrap-catman .cat,xorg -./usr/X11R7/man/cat1/xtrapreset.0 xbase-xtrap-catman .cat,xorg -./usr/X11R7/man/cat1/xtrapstats.0 xbase-xtrap-catman .cat,xorg +./usr/X11R7/man/cat1/xtrap.0xbase-obsolete obsolete +./usr/X11R7/man/cat1/xtrapchar.0 xbase-obsolete obsolete
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Wed Oct 28 07:36:17 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: Add smscphy(4) found on some RPI models. To generate a diff of this commit: cvs rdiff -u -r1.164 -r1.165 src/sys/arch/evbarm/conf/GENERIC64 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/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.164 src/sys/arch/evbarm/conf/GENERIC64:1.165 --- src/sys/arch/evbarm/conf/GENERIC64:1.164 Tue Oct 27 08:57:10 2020 +++ src/sys/arch/evbarm/conf/GENERIC64 Wed Oct 28 07:36:17 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.164 2020/10/27 08:57:10 ryo Exp $ +# $NetBSD: GENERIC64,v 1.165 2020/10/28 07:36:17 rin Exp $ # # GENERIC ARM (aarch64) kernel # @@ -263,6 +263,7 @@ pnaphy* at mii? phy ? # generic HomePN rdcphy* at mii? phy ? # RDC R6040 10/100 PHY rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs rlphy* at mii? phy ? # Realtek 8139/8201L PHYs +smscphy* at mii? phy ? # SMSC LAN87xx PHYs sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs tlphy* at mii? phy ? # ThunderLAN PHYs tqphy* at mii? phy ? # TDK Semiconductor PHYs
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Oct 28 07:08:08 UTC 2020
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Add missing drain for pcq in wm_stop_locked(). OK'd by knakahara.
This change fixes two problems:
1. If the pcq is full and watchdog timer is fired, the full state of the
pcq is kept and wm_transmit() returns with ENOBUFS.
2. ifconfig down doesn't free mbufs in the pcq.
To generate a diff of this commit:
cvs rdiff -u -r1.691 -r1.692 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.691 src/sys/dev/pci/if_wm.c:1.692
--- src/sys/dev/pci/if_wm.c:1.691 Fri Oct 16 05:53:39 2020
+++ src/sys/dev/pci/if_wm.c Wed Oct 28 07:08:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.691 2020/10/16 05:53:39 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.692 2020/10/28 07:08:08 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.691 2020/10/16 05:53:39 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.692 2020/10/28 07:08:08 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -6523,6 +6523,8 @@ wm_stop_locked(struct ifnet *ifp, bool d
for (qidx = 0; qidx < sc->sc_nqueues; qidx++) {
struct wm_queue *wmq = >sc_queue[qidx];
struct wm_txqueue *txq = >wmq_txq;
+ struct mbuf *m;
+
mutex_enter(txq->txq_lock);
txq->txq_sending = false; /* Ensure watchdog disabled */
for (i = 0; i < WM_TXQUEUELEN(txq); i++) {
@@ -6533,6 +6535,9 @@ wm_stop_locked(struct ifnet *ifp, bool d
txs->txs_mbuf = NULL;
}
}
+ /* Drain txq_interq */
+ while ((m = pcq_get(txq->txq_interq)) != NULL)
+ m_freem(m);
mutex_exit(txq->txq_lock);
}
