CVS commit: src/doc
Module Name:src Committed By: kamil Date: Thu Dec 15 07:47:08 UTC 2016 Modified Files: src/doc: TODO.ptrace Log Message: Add new entries to TODO.ptrace - add support for detecting equivalent events to PTRACE_O_TRACEEXEC, PTRACE_O_TRACECLONE, PTRACE_O_TRACEEXIT from Linux - exect(3) rething or remove -- maybe PT_TRACE_ME + PTRACE_O_TRACEEXEC? Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/doc/TODO.ptrace 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.ptrace diff -u src/doc/TODO.ptrace:1.2 src/doc/TODO.ptrace:1.3 --- src/doc/TODO.ptrace:1.2 Wed Dec 14 06:26:04 2016 +++ src/doc/TODO.ptrace Thu Dec 15 07:47:08 2016 @@ -1,4 +1,4 @@ -$NetBSD: TODO.ptrace,v 1.2 2016/12/14 06:26:04 kamil Exp $ +$NetBSD: TODO.ptrace,v 1.3 2016/12/15 07:47:08 kamil Exp $ Items we (currently) plan to finish in the ptrace(2) field: @@ -18,6 +18,10 @@ Items we (currently) plan to finish in t in all ports - integrate all ptrace(2) features in gdb - add ptrace(2) NetBSD support in LLDB + - add support for detecting equivalent events to PTRACE_O_TRACEEXEC, + PTRACE_O_TRACECLONE, PTRACE_O_TRACEEXIT from Linux + - exect(3) rething or remove -- maybe PT_TRACE_ME + PTRACE_O_TRACEEXEC? + and of course: fix as many bugs as possible.
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: pgoyette Date: Thu Dec 15 07:08:27 UTC 2016 Modified Files: src/distrib/sets/lists/modules: mi Log Message: Restore the obsolete entries for spkr_synth, and mark the new spkr module as not-obsolete. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/modules/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.104 src/distrib/sets/lists/modules/mi:1.105 --- src/distrib/sets/lists/modules/mi:1.104 Thu Dec 15 06:50:37 2016 +++ src/distrib/sets/lists/modules/mi Thu Dec 15 07:08:27 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.104 2016/12/15 06:50:37 pgoyette Exp $ +# $NetBSD: mi,v 1.105 2016/12/15 07:08:27 pgoyette Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -314,8 +314,10 @@ ./@MODULEDIR@/smbfs/smbfs.kmod base-kernel-modules kmod ./@MODULEDIR@/solarisbase-kernel-modules kmod,solaris ./@MODULEDIR@/solaris/solaris.kmod base-kernel-modules kmod,solaris -./@MODULEDIR@/spkrbase-obsolete obsolete -./@MODULEDIR@/spkr/spkr.kmod base-obsolete obsolete +./@MODULEDIR@/spkrbase-kernel-modules kmod +./@MODULEDIR@/spkr/spkr.kmod base-kernel-modules kmod +./@MODULEDIR@/spkr_synch base-obsolete obsolete +./@MODULEDIR@/spkr/_synchspkr._synchkmod base-obsolete obsolete ./@MODULEDIR@/spdmembase-kernel-modules kmod ./@MODULEDIR@/spdmem/spdmem.kmod base-kernel-modules kmod ./@MODULEDIR@/sppp_subrbase-kernel-modules kmod
CVS commit: src/sys/dev
Module Name:src
Committed By: pgoyette
Date: Thu Dec 15 06:55:55 UTC 2016
Modified Files:
src/sys/dev: spkr.c
Log Message:
Add the module glue to the common spkr code.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/spkr.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/spkr.c
diff -u src/sys/dev/spkr.c:1.4 src/sys/dev/spkr.c:1.5
--- src/sys/dev/spkr.c:1.4 Tue Dec 13 20:20:34 2016
+++ src/sys/dev/spkr.c Thu Dec 15 06:55:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.4 2016/12/13 20:20:34 christos Exp $ */
+/* $NetBSD: spkr.c,v 1.5 2016/12/15 06:55:55 pgoyette Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.4 2016/12/13 20:20:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.5 2016/12/15 06:55:55 pgoyette Exp $");
#include
#include
@@ -475,8 +475,10 @@ extern struct cfdriver spkr_cd;
#include "ioconf.c"
#endif
+MODULE(MODULE_CLASS_DRIVER, spkr, "" /* audio and/or pcppi */ );
+
int
-spkr__modcmd(modcmd_t cmd, void *arg)
+spkr_modcmd(modcmd_t cmd, void *arg)
{
#ifdef _MODULE
devmajor_t bmajor, cmajor;
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: pgoyette Date: Thu Dec 15 06:50:37 UTC 2016 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 mi Log Message: Update for the new "universal" spkr module. Note that entries in the md.i386 and md.amd64 lists are actually deleted (rather than being marked "obsolete" as directed in the comments). This is OK, since there is now a new module in the mi list to replace them. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r1.103 -r1.104 src/distrib/sets/lists/modules/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.70 src/distrib/sets/lists/modules/md.amd64:1.71 --- src/distrib/sets/lists/modules/md.amd64:1.70 Wed Oct 19 09:44:00 2016 +++ src/distrib/sets/lists/modules/md.amd64 Thu Dec 15 06:50:37 2016 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.70 2016/10/19 09:44:00 skrll Exp $ +# $NetBSD: md.amd64,v 1.71 2016/12/15 06:50:37 pgoyette Exp $ # # NOTE that there are two sets of files here: # @MODULEDIR@ and amd64-xen @@ -141,8 +141,6 @@ ./@MODULEDIR@/pwdog/pwdog.kmod base-kernel-modules kmod ./@MODULEDIR@/sljitbase-kernel-modules kmod,sljit ./@MODULEDIR@/sljit/sljit.kmod base-kernel-modules kmod,sljit -./@MODULEDIR@/spkrbase-kernel-modules kmod -./@MODULEDIR@/spkr/spkr.kmod base-kernel-modules kmod ./@MODULEDIR@/syscallemu base-kernel-modules kmod ./@MODULEDIR@/syscallemu/syscallemu.kmod base-kernel-modules kmod ./@MODULEDIR@/tcobase-kernel-modules kmod Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.71 src/distrib/sets/lists/modules/md.i386:1.72 --- src/distrib/sets/lists/modules/md.i386:1.71 Tue Sep 27 20:52:43 2016 +++ src/distrib/sets/lists/modules/md.i386 Thu Dec 15 06:50:37 2016 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.71 2016/09/27 20:52:43 pgoyette Exp $ +# $NetBSD: md.i386,v 1.72 2016/12/15 06:50:37 pgoyette Exp $ # # NOTE that there are three sets of files here: # @MODULEDIR@, i386-xen, and i386pae-xen @@ -154,8 +154,6 @@ ./@MODULEDIR@/sisdrm/sisdrm.kmod base-kernel-modules kmod ./@MODULEDIR@/sljitbase-kernel-modules kmod,sljit ./@MODULEDIR@/sljit/sljit.kmod base-kernel-modules kmod,sljit -./@MODULEDIR@/spkrbase-kernel-modules kmod -./@MODULEDIR@/spkr/spkr.kmod base-kernel-modules kmod ./@MODULEDIR@/syscallemu base-kernel-modules kmod ./@MODULEDIR@/syscallemu/syscallemu.kmod base-kernel-modules kmod ./@MODULEDIR@/tcobase-kernel-modules kmod Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.103 src/distrib/sets/lists/modules/mi:1.104 --- src/distrib/sets/lists/modules/mi:1.103 Thu Dec 15 04:38:04 2016 +++ src/distrib/sets/lists/modules/mi Thu Dec 15 06:50:37 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.103 2016/12/15 04:38:04 christos Exp $ +# $NetBSD: mi,v 1.104 2016/12/15 06:50:37 pgoyette Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -314,8 +314,8 @@ ./@MODULEDIR@/smbfs/smbfs.kmod base-kernel-modules kmod ./@MODULEDIR@/solarisbase-kernel-modules kmod,solaris ./@MODULEDIR@/solaris/solaris.kmod base-kernel-modules kmod,solaris -./@MODULEDIR@/spkr_synth base-obsolete obsolete -./@MODULEDIR@/spkr_synth/spkr_synth.kmod base-obsolete obsolete +./@MODULEDIR@/spkrbase-obsolete obsolete +./@MODULEDIR@/spkr/spkr.kmod base-obsolete obsolete ./@MODULEDIR@/spdmembase-kernel-modules kmod ./@MODULEDIR@/spdmem/spdmem.kmod base-kernel-modules kmod ./@MODULEDIR@/sppp_subrbase-kernel-modules kmod
CVS commit: src/sys
Module Name:src
Committed By: pgoyette
Date: Thu Dec 15 06:48:14 UTC 2016
Modified Files:
src/sys/dev: spkr_audio.c spkrvar.h
src/sys/dev/isa: spkr_pcppi.c
src/sys/modules: Makefile
src/sys/modules/spkr: Makefile spkr.ioconf
Log Message:
Create a single combined module for spkr_pcppi and spkr_audio, and
build it for all architectures.
By doing this, we can handle pcppi, audio, or both attachments with
non-built-in modules.
XXX Still to do: the module currently cannot be unloaded, and the
XXX spkr device(s) currently cannot be detached. (Really, two
XXX sides of the same problem.)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/spkr_audio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/spkrvar.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/isa/spkr_pcppi.c
cvs rdiff -u -r1.187 -r1.188 src/sys/modules/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/spkr/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/spkr/spkr.ioconf
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/spkr_audio.c
diff -u src/sys/dev/spkr_audio.c:1.1 src/sys/dev/spkr_audio.c:1.2
--- src/sys/dev/spkr_audio.c:1.1 Thu Dec 15 04:36:07 2016
+++ src/sys/dev/spkr_audio.c Thu Dec 15 06:48:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_audio.c,v 1.1 2016/12/15 04:36:07 christos Exp $ */
+/* $NetBSD: spkr_audio.c,v 1.2 2016/12/15 06:48:14 pgoyette Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.1 2016/12/15 04:36:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.2 2016/12/15 06:48:14 pgoyette Exp $");
#include
#include
@@ -35,7 +35,6 @@ __KERNEL_RCSID(0, "$NetBSD: spkr_audio.c
#include
#include
#include
-#include
#include
#include
#include
@@ -77,14 +76,6 @@ struct spkr_audio_softc {
CFATTACH_DECL_NEW(spkr_audio, sizeof(struct spkr_audio_softc),
spkr_audio_probe, spkr_audio_attach, spkr_audio_detach, NULL);
-MODULE(MODULE_CLASS_DRIVER, spkr, NULL /* "audio" */);
-
-static int
-spkr_modcmd(modcmd_t cmd, void *arg)
-{
- return spkr__modcmd(cmd, arg);
-}
-
static void
spkr_audio_tone(device_t self, u_int xhz, u_int ticks)
{
Index: src/sys/dev/spkrvar.h
diff -u src/sys/dev/spkrvar.h:1.4 src/sys/dev/spkrvar.h:1.5
--- src/sys/dev/spkrvar.h:1.4 Tue Dec 13 20:20:34 2016
+++ src/sys/dev/spkrvar.h Thu Dec 15 06:48:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkrvar.h,v 1.4 2016/12/13 20:20:34 christos Exp $ */
+/* $NetBSD: spkrvar.h,v 1.5 2016/12/15 06:48:14 pgoyette Exp $ */
#ifndef _SYS_DEV_SPKRVAR_H
#define _SYS_DEV_SPKRVAR_H
@@ -20,7 +20,6 @@ struct spkr_softc {
void (*sc_rest)(device_t, int);
};
-int spkr__modcmd(modcmd_t, void *);
void spkr_attach(device_t,
void (*)(device_t, u_int, u_int), void (*)(device_t, int));
Index: src/sys/dev/isa/spkr_pcppi.c
diff -u src/sys/dev/isa/spkr_pcppi.c:1.7 src/sys/dev/isa/spkr_pcppi.c:1.8
--- src/sys/dev/isa/spkr_pcppi.c:1.7 Wed Dec 14 22:30:42 2016
+++ src/sys/dev/isa/spkr_pcppi.c Thu Dec 15 06:48:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_pcppi.c,v 1.7 2016/12/14 22:30:42 christos Exp $ */
+/* $NetBSD: spkr_pcppi.c,v 1.8 2016/12/15 06:48:14 pgoyette Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.7 2016/12/14 22:30:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.8 2016/12/15 06:48:14 pgoyette Exp $");
#include
#include
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c
#include
#include
#include
-#include
#include
#include
#include
@@ -76,14 +75,6 @@ static int spkr_pcppi_detach(device_t, i
CFATTACH_DECL_NEW(spkr_pcppi, sizeof(struct spkr_pcppi_softc),
spkr_pcppi_probe, spkr_pcppi_attach, spkr_pcppi_detach, NULL);
-MODULE(MODULE_CLASS_DRIVER, spkr, NULL /* "pcppi" */);
-
-static int
-spkr_modcmd(modcmd_t cmd, void *arg)
-{
- return spkr__modcmd(cmd, arg);
-}
-
#define SPKRPRI (PZERO - 1)
/* emit tone of frequency hz for given number of ticks */
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.187 src/sys/modules/Makefile:1.188
--- src/sys/modules/Makefile:1.187 Thu Dec 15 04:37:00 2016
+++ src/sys/modules/Makefile Thu Dec 15 06:48:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.187 2016/12/15 04:37:00 christos Exp $
+# $NetBSD: Makefile,v 1.188 2016/12/15 06:48:14 pgoyette Exp $
.include
@@ -116,6 +116,7 @@ SUBDIR+= skipjack
SUBDIR+= slcompress
SUBDIR+= smbfs
SUBDIR+= spdmem
+SUBDIR+= spkr
SUBDIR+= sppp_subr
SUBDIR+= sysmon
SUBDIR+= sysmon_envsys
@@ -365,7 +366,6 @@ SUBDIR+= auvitek
SUBDIR+= coram
SUBDIR+= cxdtv
SUBDIR+= emdtv
-SUBDIR+= spkr
.endif
.if (${MKISCSI} != "no")
Index: src/sys/modules/spkr/Makefile
diff -u src/sys/modules/spkr/Makefile:1.5 src/sys/modules/spkr/Makefile:1.6
--- src/sys/modules/spkr/Ma
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: nonaka
Date: Thu Dec 15 04:49:15 UTC 2016
Modified Files:
src/usr.bin/ftp: fetch.c
Log Message:
handle proxy authentication correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.225 -r1.226 src/usr.bin/ftp/fetch.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/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.225 src/usr.bin/ftp/fetch.c:1.226
--- src/usr.bin/ftp/fetch.c:1.225 Mon Oct 17 00:52:53 2016
+++ src/usr.bin/ftp/fetch.c Thu Dec 15 04:49:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.225 2016/10/17 00:52:53 christos Exp $ */
+/* $NetBSD: fetch.c,v 1.226 2016/12/15 04:49:15 nonaka Exp $ */
/*-
* Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.225 2016/10/17 00:52:53 christos Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.226 2016/12/15 04:49:15 nonaka Exp $");
#endif /* not lint */
/*
@@ -855,8 +855,7 @@ print_connect(FETCH *fin, const struct u
#define C_OK 0
#define C_CLEANUP 1
#define C_IMPROPER 2
-#define C_PROXY 3
-#define C_NOPROXY 4
+#define C_RESTART 3
static int
getresponseline(FETCH *fin, char *buf, size_t buflen, int *len)
@@ -1087,7 +1086,7 @@ negotiate_connection(FETCH *fin, const c
case 401:
case 407:
{
- struct authinfo aauth;
+ struct authinfo aauth;
char **authp;
if (hcode == 401)
@@ -1122,7 +1121,8 @@ negotiate_connection(FETCH *fin, const c
authp = &aauth.auth;
if (auth_url(*auth, authp, &aauth) == 0) {
*rval = fetch_url(url, penv,
- pauth->auth, wauth->auth);
+ hcode == 401 ? pauth->auth : aauth.auth,
+ hcode == 401 ? aauth.auth : wauth->auth);
memset(*authp, 0, strlen(*authp));
FREEPTR(*authp);
}
@@ -1217,6 +1217,34 @@ connectmethod(int s, FETCH *fin, struct
switch (hcode) {
case 200:
break;
+#ifndef NO_AUTH
+ case 407:
+ if (verbose || pauth->auth == NULL ||
+ pauth->user == NULL || pauth->pass == NULL)
+ fprintf(ttyout, "%s\n", message);
+ if (EMPTYSTRING(*auth)) {
+ warnx("No authentication challenge provided by server");
+ goto cleanup_fetch_url;
+ }
+
+ if (pauth->auth != NULL) {
+ char reply[10];
+
+ fprintf(ttyout, "Authorization failed. Retry (y/n)? ");
+ if (get_line(stdin, reply, sizeof(reply), NULL)
+ < 0) {
+goto cleanup_fetch_url;
+ }
+ if (tolower((unsigned char)reply[0]) != 'y')
+goto cleanup_fetch_url;
+ pauth->user = NULL;
+ pauth->pass = NULL;
+ }
+
+ if (auth_url(*auth, &pauth->auth, pauth) == 0)
+ goto restart_fetch_url;
+ goto cleanup_fetch_url;
+#endif
default:
if (message)
warnx("Error proxy connect " "`%s'", message);
@@ -1237,6 +1265,9 @@ improper:
cleanup_fetch_url:
rv = C_CLEANUP;
goto out;
+restart_fetch_url:
+ rv = C_RESTART;
+ goto out;
out:
FREEPTR(message);
return rv;
@@ -1445,6 +1476,10 @@ fetch_url(const char *url, const char *p
if (isproxy && oui.utype == HTTPS_URL_T) {
switch (connectmethod(s, fin, &oui, &ui, &pauth, &auth,
&hasleading)) {
+ case C_RESTART:
+rval = fetch_url(url, penv, pauth.auth,
+wauth.auth);
+/*FALLTHROUGH*/
case C_CLEANUP:
goto cleanup_fetch_url;
case C_IMPROPER:
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: christos Date: Thu Dec 15 04:38:04 UTC 2016 Modified Files: src/distrib/sets/lists/modules: mi Log Message: delete spkr_synth To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/lists/modules/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.102 src/distrib/sets/lists/modules/mi:1.103 --- src/distrib/sets/lists/modules/mi:1.102 Fri Dec 9 19:39:40 2016 +++ src/distrib/sets/lists/modules/mi Wed Dec 14 23:38:04 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.102 2016/12/10 00:39:40 pgoyette Exp $ +# $NetBSD: mi,v 1.103 2016/12/15 04:38:04 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -314,8 +314,8 @@ ./@MODULEDIR@/smbfs/smbfs.kmod base-kernel-modules kmod ./@MODULEDIR@/solarisbase-kernel-modules kmod,solaris ./@MODULEDIR@/solaris/solaris.kmod base-kernel-modules kmod,solaris -./@MODULEDIR@/spkr_synth base-kernel-modules kmod -./@MODULEDIR@/spkr_synth/spkr_synth.kmod base-kernel-modules kmod +./@MODULEDIR@/spkr_synth base-obsolete obsolete +./@MODULEDIR@/spkr_synth/spkr_synth.kmod base-obsolete obsolete ./@MODULEDIR@/spdmembase-kernel-modules kmod ./@MODULEDIR@/spdmem/spdmem.kmod base-kernel-modules kmod ./@MODULEDIR@/sppp_subrbase-kernel-modules kmod
CVS commit: src/sys/modules
Module Name:src Committed By: christos Date: Thu Dec 15 04:37:01 UTC 2016 Modified Files: src/sys/modules: Makefile Removed Files: src/sys/modules/spkr_synth: Makefile spkr_synth.ioconf Log Message: delete spkr_synth module To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/sys/modules/Makefile cvs rdiff -u -r1.2 -r0 src/sys/modules/spkr_synth/Makefile \ src/sys/modules/spkr_synth/spkr_synth.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.186 src/sys/modules/Makefile:1.187 --- src/sys/modules/Makefile:1.186 Fri Dec 9 19:39:40 2016 +++ src/sys/modules/Makefile Wed Dec 14 23:37:00 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.186 2016/12/10 00:39:40 pgoyette Exp $ +# $NetBSD: Makefile,v 1.187 2016/12/15 04:37:00 christos Exp $ .include @@ -116,7 +116,6 @@ SUBDIR+= skipjack SUBDIR+= slcompress SUBDIR+= smbfs SUBDIR+= spdmem -SUBDIR+= spkr_synth SUBDIR+= sppp_subr SUBDIR+= sysmon SUBDIR+= sysmon_envsys
CVS commit: src/sys/dev
Module Name:src
Committed By: christos
Date: Thu Dec 15 04:36:07 UTC 2016
Modified Files:
src/sys/dev: files.audio
Added Files:
src/sys/dev: spkr_audio.c
Removed Files:
src/sys/dev: spkr_synth.c
Log Message:
name attachment after parent per existing convention.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/files.audio
cvs rdiff -u -r0 -r1.1 src/sys/dev/spkr_audio.c
cvs rdiff -u -r1.9 -r0 src/sys/dev/spkr_synth.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/files.audio
diff -u src/sys/dev/files.audio:1.8 src/sys/dev/files.audio:1.9
--- src/sys/dev/files.audio:1.8 Tue Dec 13 15:20:34 2016
+++ src/sys/dev/files.audio Wed Dec 14 23:36:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.audio,v 1.8 2016/12/13 20:20:34 christos Exp $
+# $NetBSD: files.audio,v 1.9 2016/12/15 04:36:07 christos Exp $
define audiobus { }
define midibus { }
@@ -17,7 +17,7 @@ device audio {}: audiodev, auconv, aurat
attach audio at audiobus
device midi: audio
attach midi at midibus
-attach spkr at audio with spkr_synth
+attach spkr at audio with spkr_audio
# console bell via audio device
#
@@ -25,11 +25,11 @@ define audiobell
file dev/auconv.c auconv
file dev/audio.c audio needs-flag
-file dev/audiobell.c spkr_synth needs-flag
+file dev/audiobell.c spkr_audio needs-flag
file dev/aurateconv.c aurateconv needs-flag
file dev/auvolconv.c auvolconv
file dev/midi.c midi needs-flag
file dev/midictl.c midisyn
file dev/midisyn.c midisyn
file dev/mulaw.c mulaw needs-flag
-file dev/spkr_synth.c spkr_synth needs-flag
+file dev/spkr_audio.c spkr_audio needs-flag
Added files:
Index: src/sys/dev/spkr_audio.c
diff -u /dev/null src/sys/dev/spkr_audio.c:1.1
--- /dev/null Wed Dec 14 23:36:07 2016
+++ src/sys/dev/spkr_audio.c Wed Dec 14 23:36:07 2016
@@ -0,0 +1,201 @@
+/* $NetBSD: spkr_audio.c,v 1.1 2016/12/15 04:36:07 christos Exp $ */
+
+/*-
+ * Copyright (c) 2016 Nathanial Sloss
+ * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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: spkr_audio.c,v 1.1 2016/12/15 04:36:07 christos Exp $");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+struct vbell_args {
+ u_int pitch;
+ u_int period;
+ u_int volume;
+ bool dying;
+};
+
+static void bell_thread(void *) __dead;
+
+#include
+
+#include
+#include
+
+static int spkr_audio_probe(device_t, cfdata_t, void *);
+static void spkr_audio_attach(device_t, device_t, void *);
+static int spkr_audio_detach(device_t, int);
+
+struct spkr_audio_softc {
+ struct spkr_softc sc_spkr;
+ lwp_t *sc_bellthread;
+ kmutex_t sc_bellock;
+ kcondvar_t sc_bellcv;
+ device_t sc_audiodev;
+ struct vbell_args sc_bell_args;
+};
+
+CFATTACH_DECL_NEW(spkr_audio, sizeof(struct spkr_audio_softc),
+spkr_audio_probe, spkr_audio_attach, spkr_audio_detach, NULL);
+
+MODULE(MODULE_CLASS_DRIVER, spkr, NULL /* "audio" */);
+
+static int
+spkr_modcmd(modcmd_t cmd, void *arg)
+{
+ return spkr__modcmd(cmd, arg);
+}
+
+static void
+spkr_audio_tone(device_t self, u_int xhz, u_int ticks)
+{
+ struct spkr_audio_softc *sc = device_private(self);
+
+#ifdef SPKRDEBUG
+ aprint_debug_dev(self, "%s: %u %d\n", __func__, xhz, ticks);
+#endif /* SPKRDEBUG */
+ audiobell(sc->sc_audiodev, xhz, ticks * (1000 / hz), 80, 0);
+}
+
+static void
+spkr_audio_rest(device_t self, int ticks)
+{
+ struct spkr_audio_softc *sc = device_private(self);
+
+#ifdef SPKRDEBUG
+ aprint_debug_dev
CVS commit: src/sys/arch
Module Name:src Committed By: ozaki-r Date: Thu Dec 15 04:01:09 UTC 2016 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL Log Message: Add SCTP to ALL configs to keep it buildable anyway To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.407 -r1.408 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.44 src/sys/arch/amd64/conf/ALL:1.45 --- src/sys/arch/amd64/conf/ALL:1.44 Tue Dec 13 20:42:16 2016 +++ src/sys/arch/amd64/conf/ALL Thu Dec 15 04:01:09 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.44 2016/12/13 20:42:16 christos Exp $ +# $NetBSD: ALL,v 1.45 2016/12/15 04:01:09 ozaki-r Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.44 $" +#ident "ALL-$Revision: 1.45 $" maxusers 64 # estimated number of users @@ -233,6 +233,7 @@ options IPFILTER_COMPAT # Compat for IP options IPFILTER_DEFAULT_BLOCK # block all packets by default options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG options TCP_SIGNATURE # RFC 2385 support, used with BGP +options SCTP # Stream Control Transmission Protocol options ALTQ # Manipulate network interfaces' output queues options ALTQ_BLUE # Stochastic Fair Blue Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.407 src/sys/arch/i386/conf/ALL:1.408 --- src/sys/arch/i386/conf/ALL:1.407 Tue Dec 13 20:42:18 2016 +++ src/sys/arch/i386/conf/ALL Thu Dec 15 04:01:09 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.407 2016/12/13 20:42:18 christos Exp $ +# $NetBSD: ALL,v 1.408 2016/12/15 04:01:09 ozaki-r Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.407 $" +#ident "ALL-$Revision: 1.408 $" maxusers 64 # estimated number of users @@ -232,6 +232,7 @@ options IPFILTER_COMPAT # Compat for IP options IPFILTER_DEFAULT_BLOCK # block all packets by default options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG options TCP_SIGNATURE # RFC 2385 support, used with BGP +options SCTP # Stream Control Transmission Protocol options ALTQ # Manipulate network interfaces' output queues options ALTQ_BLUE # Stochastic Fair Blue
CVS commit: src/sys/netinet
Module Name:src Committed By: ozaki-r Date: Thu Dec 15 03:54:15 UTC 2016 Modified Files: src/sys/netinet: sctp_asconf.c Log Message: Restore nd6.h inclusion to resolve implicit dependency To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/sctp_asconf.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/netinet/sctp_asconf.c diff -u src/sys/netinet/sctp_asconf.c:1.6 src/sys/netinet/sctp_asconf.c:1.7 --- src/sys/netinet/sctp_asconf.c:1.6 Tue Dec 13 08:29:03 2016 +++ src/sys/netinet/sctp_asconf.c Thu Dec 15 03:54:15 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: sctp_asconf.c,v 1.6 2016/12/13 08:29:03 ozaki-r Exp $ */ +/* $NetBSD: sctp_asconf.c,v 1.7 2016/12/15 03:54:15 ozaki-r Exp $ */ /* $KAME: sctp_asconf.c,v 1.25 2005/06/16 20:44:24 jinmei Exp $ */ /* @@ -30,7 +30,7 @@ * SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.6 2016/12/13 08:29:03 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sctp_asconf.c,v 1.7 2016/12/15 03:54:15 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_ipsec.h" @@ -64,6 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: sctp_asconf. #include #include #include +#include #endif /* INET6 */ #include
CVS commit: src/doc
Module Name:src Committed By: pgoyette Date: Thu Dec 15 03:24:43 UTC 2016 Modified Files: src/doc: TODO.modules Log Message: Note desire to have a way to selectively build modules (and include them from the modules/mi sets-list) based on "attributes" rather than having to enumerate individual architectures on which to build and include. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/doc/TODO.modules 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.modules diff -u src/doc/TODO.modules:1.8 src/doc/TODO.modules:1.9 --- src/doc/TODO.modules:1.8 Wed Sep 28 06:47:55 2016 +++ src/doc/TODO.modules Thu Dec 15 03:24:43 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: TODO.modules,v 1.8 2016/09/28 06:47:55 wiz Exp $ */ +/* $NetBSD: TODO.modules,v 1.9 2016/12/15 03:24:43 pgoyette Exp $ */ Some notes on the limitations of our current (as of 7.99.35) module subsystem. This list was triggered by an Email exchange between @@ -109,3 +109,14 @@ christos and pgoyette. 12. Item #11 gets even murkier when a particular parent can provide more than one attribute. + +13. It seems that we might want some additional sets-lists "attributes" +to control contents of distributions. As an example, many of our +architectures have PCI bus capabilities, but not all. It is rather +painful to need to maintain individual architectures' modules/md_* +sets lists, especially when we already have to conditionalize the +build of the modules based on architecture. If we had a single +"attribute" for PCI-bus-capable, the same attribute could be used to +select which modules to build and which modules from modules/mi to +include in the release. (This is not limited to PCI; recently we +encounter similar issues with spkr aka spkr_synth module.)
CVS commit: src/tests/net/net
Module Name:src
Committed By: ozaki-r
Date: Thu Dec 15 02:43:56 UTC 2016
Modified Files:
src/tests/net/net: t_ipaddress.sh
Log Message:
Fix that cleanup doesn't run when DEBUG=false
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/net/net/t_ipaddress.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/net/net/t_ipaddress.sh
diff -u src/tests/net/net/t_ipaddress.sh:1.8 src/tests/net/net/t_ipaddress.sh:1.9
--- src/tests/net/net/t_ipaddress.sh:1.8 Fri Nov 25 08:51:17 2016
+++ src/tests/net/net/t_ipaddress.sh Thu Dec 15 02:43:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ipaddress.sh,v 1.8 2016/11/25 08:51:17 ozaki-r Exp $
+# $NetBSD: t_ipaddress.sh,v 1.9 2016/12/15 02:43:56 ozaki-r Exp $
#
# Copyright (c) 2015 Internet Initiative Japan Inc.
# All rights reserved.
@@ -178,7 +178,7 @@ add_test()
test_${name}; \
}; \
ipaddr_${name}_cleanup() { \
- $DEBUG && dump \
+ $DEBUG && dump; \
cleanup; \
}"
atf_add_test_case "ipaddr_${name}"
CVS commit: src/sys/dev
Module Name:src
Committed By: christos
Date: Wed Dec 14 22:30:42 UTC 2016
Modified Files:
src/sys/dev: spkr_synth.c
src/sys/dev/isa: spkr_pcppi.c
Log Message:
print more info during autoconfig
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/spkr_synth.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/isa/spkr_pcppi.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/spkr_synth.c
diff -u src/sys/dev/spkr_synth.c:1.8 src/sys/dev/spkr_synth.c:1.9
--- src/sys/dev/spkr_synth.c:1.8 Tue Dec 13 15:50:13 2016
+++ src/sys/dev/spkr_synth.c Wed Dec 14 17:30:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_synth.c,v 1.8 2016/12/13 20:50:13 christos Exp $ */
+/* $NetBSD: spkr_synth.c,v 1.9 2016/12/14 22:30:42 christos Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.8 2016/12/13 20:50:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.9 2016/12/14 22:30:42 christos Exp $");
#include
#include
@@ -137,7 +137,8 @@ spkr_synth_attach(device_t parent, devic
{
struct spkr_synth_softc *sc = device_private(self);
- aprint_normal("\n");
+ aprint_naive("\n");
+ aprint_normal(": PC Speaker (synthesized)\n");
sc->sc_audiodev = parent;
Index: src/sys/dev/isa/spkr_pcppi.c
diff -u src/sys/dev/isa/spkr_pcppi.c:1.6 src/sys/dev/isa/spkr_pcppi.c:1.7
--- src/sys/dev/isa/spkr_pcppi.c:1.6 Wed Dec 14 16:52:43 2016
+++ src/sys/dev/isa/spkr_pcppi.c Wed Dec 14 17:30:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_pcppi.c,v 1.6 2016/12/14 21:52:43 christos Exp $ */
+/* $NetBSD: spkr_pcppi.c,v 1.7 2016/12/14 22:30:42 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.6 2016/12/14 21:52:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.7 2016/12/14 22:30:42 christos Exp $");
#include
#include
@@ -126,7 +126,7 @@ spkr_pcppi_attach(device_t parent, devic
struct spkr_pcppi_softc *sc = device_private(self);
aprint_naive("\n");
- aprint_normal("\n");
+ aprint_normal(": PC Speaker\n");
sc->sc_pcppicookie = pa->pa_cookie;
spkr_attach(self, spkr_pcppi_tone, spkr_pcppi_rest);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Wed Dec 14 22:21:13 UTC 2016
Modified Files:
src/sys/dev/pci: if_sk.c
Log Message:
Tidy up and make it look like the other drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/pci/if_sk.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_sk.c
diff -u src/sys/dev/pci/if_sk.c:1.83 src/sys/dev/pci/if_sk.c:1.84
--- src/sys/dev/pci/if_sk.c:1.83 Wed Dec 7 20:12:01 2016
+++ src/sys/dev/pci/if_sk.c Wed Dec 14 17:21:13 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sk.c,v 1.83 2016/12/08 01:12:01 ozaki-r Exp $ */
+/* $NetBSD: if_sk.c,v 1.84 2016/12/14 22:21:13 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.83 2016/12/08 01:12:01 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.84 2016/12/14 22:21:13 christos Exp $");
#include
#include
@@ -985,11 +985,38 @@ sk_ifmedia_upd(struct ifnet *ifp)
return rc;
}
+static void
+sk_promisc(struct sk_if_softc *sc_if, int on)
+{
+ struct sk_softc *sc = sc_if->sk_softc;
+ switch (sc->sk_type) {
+ case SK_GENESIS:
+ if (on)
+ SK_XM_SETBIT_4(sc_if, XM_MODE, XM_MODE_RX_PROMISC);
+ else
+ SK_XM_CLRBIT_4(sc_if, XM_MODE, XM_MODE_RX_PROMISC);
+ break;
+ case SK_YUKON:
+ case SK_YUKON_LITE:
+ case SK_YUKON_LP:
+ if (on)
+ SK_YU_CLRBIT_2(sc_if, YUKON_RCR,
+ YU_RCR_UFLEN | YU_RCR_MUFLEN);
+ else
+ SK_YU_SETBIT_2(sc_if, YUKON_RCR,
+ YU_RCR_UFLEN | YU_RCR_MUFLEN);
+ break;
+ default:
+ aprint_error_dev(sc_if->sk_dev, "Can't set promisc for %d\n",
+ sc->sk_type);
+ break;
+ }
+}
+
int
sk_ioctl(struct ifnet *ifp, u_long command, void *data)
{
struct sk_if_softc *sc_if = ifp->if_softc;
- struct sk_softc *sc = sc_if->sk_softc;
int s, error = 0;
/* DPRINTFN(2, ("sk_ioctl\n")); */
@@ -1002,45 +1029,20 @@ sk_ioctl(struct ifnet *ifp, u_long comma
DPRINTFN(2, ("sk_ioctl IFFLAGS\n"));
if ((error = ifioctl_common(ifp, command, data)) != 0)
break;
- if (ifp->if_flags & IFF_UP) {
- if (ifp->if_flags & IFF_RUNNING &&
- ifp->if_flags & IFF_PROMISC &&
- !(sc_if->sk_if_flags & IFF_PROMISC)) {
-switch (sc->sk_type) {
-case SK_GENESIS:
- SK_XM_SETBIT_4(sc_if, XM_MODE,
- XM_MODE_RX_PROMISC);
- break;
-case SK_YUKON:
-case SK_YUKON_LITE:
-case SK_YUKON_LP:
- SK_YU_CLRBIT_2(sc_if, YUKON_RCR,
- YU_RCR_UFLEN | YU_RCR_MUFLEN);
- break;
-}
-sk_setmulti(sc_if);
- } else if (ifp->if_flags & IFF_RUNNING &&
- !(ifp->if_flags & IFF_PROMISC) &&
- sc_if->sk_if_flags & IFF_PROMISC) {
-switch (sc->sk_type) {
-case SK_GENESIS:
- SK_XM_CLRBIT_4(sc_if, XM_MODE,
- XM_MODE_RX_PROMISC);
- break;
-case SK_YUKON:
-case SK_YUKON_LITE:
-case SK_YUKON_LP:
- SK_YU_SETBIT_2(sc_if, YUKON_RCR,
- YU_RCR_UFLEN | YU_RCR_MUFLEN);
- break;
-}
-
+ switch (ifp->if_flags & (IFF_UP | IFF_RUNNING)) {
+ case IFF_RUNNING:
+ sk_stop(ifp, 1);
+ break;
+ case IFF_UP:
+ sk_init(ifp);
+ break;
+ case IFF_UP | IFF_RUNNING:
+ if ((ifp->if_flags ^ sc_if->sk_if_flags) == IFF_PROMISC) {
+sk_promisc(sc_if, ifp->if_flags & IFF_PROMISC);
sk_setmulti(sc_if);
} else
-(void) sk_init(ifp);
- } else {
- if (ifp->if_flags & IFF_RUNNING)
-sk_stop(ifp,0);
+sk_init(ifp);
+ break;
}
sc_if->sk_if_flags = ifp->if_flags;
error = 0;
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Wed Dec 14 22:14:28 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: TODO
Log Message:
Remove one that won't happen
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.4.1 src/sys/dev/usb/TODO
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/TODO
diff -u src/sys/dev/usb/TODO:1.45 src/sys/dev/usb/TODO:1.45.4.1
--- src/sys/dev/usb/TODO:1.45 Wed Jun 25 21:23:03 2014
+++ src/sys/dev/usb/TODO Wed Dec 14 22:14:28 2016
@@ -59,8 +59,6 @@ Stylistic changes:
use usb_ and usbd_ consistently
rearrange the contents and names of some files (Nick)
-Add threads to the Ethernet drivers.
-
Change what's done at watchdog timeout inb if_{a,c,k}ue.c; what we have
now doesn't work because it's done in an interrupt context.
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Wed Dec 14 22:09:21 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: TODO.usbmp
Log Message:
Some updates
To generate a diff of this commit:
cvs rdiff -u -r1.8.4.4 -r1.8.4.5 src/sys/dev/usb/TODO.usbmp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/TODO.usbmp
diff -u src/sys/dev/usb/TODO.usbmp:1.8.4.4 src/sys/dev/usb/TODO.usbmp:1.8.4.5
--- src/sys/dev/usb/TODO.usbmp:1.8.4.4 Mon Dec 5 10:55:17 2016
+++ src/sys/dev/usb/TODO.usbmp Wed Dec 14 22:09:21 2016
@@ -1,4 +1,4 @@
-$NetBSD: TODO.usbmp,v 1.8.4.4 2016/12/05 10:55:17 skrll Exp $
+$NetBSD: TODO.usbmp,v 1.8.4.5 2016/12/14 22:09:21 skrll Exp $
the majority of the USB MP device interface is documented in usbdivar.h.
@@ -18,7 +18,7 @@ KERNEL_LOCK
- uhub.c
- usscanner.c
-usb_detach_{waitold,wakeup} to usb_detach_{wait,broadcast} conversion:
+usb_detach_{waitold,wakeup} to cv_{wait,broadcast} conversion:
- drivers:
if_aue.c
if_axe.c
@@ -26,15 +26,12 @@ usb_detach_{waitold,wakeup} to usb_detac
if_smsc.c
if_udav.c
if_url.c
- stuirda.c
ubt.c
- ucom.c
ucycom.c
udsir.c
uhso.c
uirda.c
ulpt.c
- umass.c - done, partially done -- need to check umass_scsipi.c change
urio.c
uscanner.c
usscanner.c
@@ -88,26 +85,31 @@ splusb drivers:
- ubt.c
- ucycom.c
- udsir.c
+ - uhso.c
+ - ukbd.c
+ - ulpt.c
+ - urio.c
+ - uscanner.c
+ - usscanner.c
+ - ustir.c
+ - utoppy.c
+ - uvideo.c
wakeup/tsleep drivers:
- - if_otus.c
- if_run.c
- - if_upgt.c
- if_urtwn.c
- if_zyd.c
- - ucom.c
- ucycom.c
- udsir.c
- uirda.c
- - ulpt.c
- umass_isdata.c
+ - ulpt.c
- ustir.c
- uthum.c
- uvscom.c
- uyurex.c
missing D_MPSAFE drivers:
- - ucom
- ucycom
- ugen - partially ready
- uhso
@@ -148,7 +150,7 @@ driver testing: STATUS
- uep
- udl
- ulpt attaches ok
- - uhso working (must take kernel lock for scsipi)
+ - uhso working
- umass working
- uaudio working
- umidi working
@@ -177,7 +179,7 @@ driver testing: STATUS
- uberry
- uipad
- urio
- - uscanner ? (must take kernel lock for scsipi)
+ - uscanner ?
- usscanner
- utoppy
- uyap
@@ -185,9 +187,9 @@ driver testing: STATUS
- ugen mostly done
- pseye working
- uvideo
- - auvitek ? (must take kernel lock for scsipi)
- - emdtv ? (must take kernel lock for scsipi)
- - ubt working (must take kernel lock for scsipi)
+ - auvitek ?
+ - emdtv ?
+ - ubt working
- aubtfwl
- u3ginit
ucom attachments:
@@ -195,7 +197,7 @@ ucom attachments:
- uark
- ubsa
- uchcom
- - uftdi
+ - uftdi working
- uipaq
- umct
- uplcom attaches ok
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: christos
Date: Wed Dec 14 21:52:43 UTC 2016
Modified Files:
src/sys/dev/isa: spkr_pcppi.c
Log Message:
correct spkr softc.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/isa/spkr_pcppi.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/isa/spkr_pcppi.c
diff -u src/sys/dev/isa/spkr_pcppi.c:1.5 src/sys/dev/isa/spkr_pcppi.c:1.6
--- src/sys/dev/isa/spkr_pcppi.c:1.5 Tue Dec 13 15:20:34 2016
+++ src/sys/dev/isa/spkr_pcppi.c Wed Dec 14 16:52:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_pcppi.c,v 1.5 2016/12/13 20:20:34 christos Exp $ */
+/* $NetBSD: spkr_pcppi.c,v 1.6 2016/12/14 21:52:43 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.5 2016/12/13 20:20:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.6 2016/12/14 21:52:43 christos Exp $");
#include
#include
@@ -65,8 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c
#include
struct spkr_pcppi_softc {
- device_t sc_dev;
- device_t sc_spkr_dev;
+ struct spkr_softc sc_spkr;
pcppi_tag_t sc_pcppicookie;
};
CVS commit: xsrc/external/mit/xf86-video-glint/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Dec 14 20:34:17 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-glint/dist/src: pm3_exa.c
Log Message:
no more constant pitch, now we can use all video memory
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c:1.4 xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c:1.5
--- xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c:1.4 Wed Dec 14 16:51:44 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c Wed Dec 14 20:34:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pm3_exa.c,v 1.4 2016/12/14 16:51:44 macallan Exp $ */
+/* $NetBSD: pm3_exa.c,v 1.5 2016/12/14 20:34:17 macallan Exp $ */
/*
* Copyright (c) 2016 Michael Lorenz
@@ -73,6 +73,10 @@ Pm3PrepareCopy(PixmapPtr pSrcPixmap, Pix
{
ScrnInfoPtr pScrn = xf86Screens[pDstPixmap->drawable.pScreen->myNum];
GLINTPtr pGlint = GLINTPTR(pScrn);
+ int dstoff = exaGetPixmapOffset(pDstPixmap);
+ int dstpitch = exaGetPixmapPitch(pDstPixmap);
+ int srcoff = exaGetPixmapOffset(pSrcPixmap);
+ int srcpitch = exaGetPixmapPitch(pSrcPixmap);
ENTER;
@@ -99,7 +103,21 @@ Pm3PrepareCopy(PixmapPtr pSrcPixmap, Pix
pGlint->srcoff = exaGetPixmapOffset(pSrcPixmap);
- GLINT_WAIT(2);
+ GLINT_WAIT(10);
+ GLINT_WRITE_REG(dstoff, PM3FBWriteBufferAddr0);
+ GLINT_WRITE_REG(dstpitch >> 2, PM3FBWriteBufferWidth0);
+ GLINT_WRITE_REG(dstoff, PM3FBDestReadBufferAddr0);
+ GLINT_WRITE_REG(dstpitch >> 2, PM3FBDestReadBufferWidth0);
+ GLINT_WRITE_REG(srcoff, PM3FBSourceReadBufferAddr);
+ GLINT_WRITE_REG(srcpitch >> 2, PM3FBSourceReadBufferWidth);
+ GLINT_WRITE_REG(PM3FBWriteMode_WriteEnable|
+ PM3FBWriteMode_OpaqueSpan|
+ PM3FBWriteMode_Enable0,
+ PM3FBWriteMode);
+ GLINT_WRITE_REG(
+ PM3FBDestReadMode_ReadEnable |
+ PM3FBDestReadMode_Enable0,
+ PM3FBDestReadMode);
PM3_PLANEMASK(planemask);
GLINT_WRITE_REG(pGlint->PM3_Config2D, PM3Config2D);
return TRUE;
@@ -113,15 +131,9 @@ Pm3Copy(PixmapPtr pDstPixmap,
GLINTPtr pGlint = GLINTPTR(pScrn);
/* Spans needs to be 32 bit aligned. */
int x_align = srcX & 0x1f;
- int dstoff = exaGetPixmapOffset(pDstPixmap);
- int pitch = exaGetPixmapPitch(pDstPixmap);
ENTER;
- /* assuming constant pitch for now */
- srcY += pGlint->srcoff / pitch;
- dstY += dstoff / pitch;
-
GLINT_WAIT(5);
GLINT_WRITE_REG(((dstY & 0x0fff) << 16) | (dstX & 0x0fff), ScissorMinXY);
GLINT_WRITE_REGdstY + h) & 0x0fff) << 16) | ((dstX + w) & 0x0fff), ScissorMaxXY);
@@ -155,9 +167,24 @@ Pm3PrepareSolid(PixmapPtr pPixmap, int r
{
ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
GLINTPtr pGlint = GLINTPTR(pScrn);
+ int offset = exaGetPixmapOffset(pPixmap);
+ int pitch = exaGetPixmapPitch(pPixmap);
ENTER;
+ GLINT_WAIT(6);
+ GLINT_WRITE_REG(offset, PM3FBWriteBufferAddr0);
+ GLINT_WRITE_REG(pitch >> 2, PM3FBWriteBufferWidth0);
+ GLINT_WRITE_REG(offset, PM3FBDestReadBufferAddr0);
+ GLINT_WRITE_REG(pitch >> 2, PM3FBDestReadBufferWidth0);
+ GLINT_WRITE_REG(PM3FBWriteMode_WriteEnable|
+ PM3FBWriteMode_OpaqueSpan|
+ PM3FBWriteMode_Enable0,
+ PM3FBWriteMode);
+ GLINT_WRITE_REG(
+ PM3FBDestReadMode_ReadEnable |
+ PM3FBDestReadMode_Enable0,
+ PM3FBDestReadMode);
/* Prepare Common Render2D & Config2D data */
pGlint->PM3_Render2D =
PM3Render2D_XPositive |
@@ -223,14 +250,10 @@ Pm3Solid(PixmapPtr pPixmap, int x1, int
{
ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum];
GLINTPtr pGlint = GLINTPTR(pScrn);
- int offset = exaGetPixmapOffset(pPixmap);
- int pitch = exaGetPixmapPitch(pPixmap);
int w = x2 - x1, h = y2 - y1;
ENTER;
- y1 += offset / pitch;
-
GLINT_WAIT(2);
GLINT_WRITE_REG(
PM3RectanglePosition_XOffset(x1) |
@@ -308,7 +331,7 @@ Pm3InitEXA(ScreenPtr pScreen)
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
GLINTPtr pGlint = GLINTPTR(pScrn);
ExaDriverPtr pExa;
- int stride, lines;
+ int stride;
ENTER;
@@ -323,14 +346,12 @@ Pm3InitEXA(ScreenPtr pScreen)
pExa->memoryBase = pGlint->FbBase;
stride = pScrn->displayWidth * (pScrn->bitsPerPixel >> 3);
- lines = min(pGlint->FbMapSize / stride, 4095);
- pExa->memorySize = lines * stride;
- xf86Msg(X_ERROR, "stride: %d\n", stride);
+ pExa->offScreenBase = stride * pScrn->virtualY;
+ pExa->memorySize = pGlint->FbMapSize;
pExa->offScreenBase = stride * pScrn->virtualY;
- /* for now, until I figure out how to do variable stride */
- pExa->pixmapOffsetAlign = stride;
- pExa->pixmapPitchAlign = stride;
+ pExa->pixmapOffsetAlign = 32;
+ pExa->pixmapPitchAlign = 32;
pExa->flags = EXA_OFFSCREEN_PIXMAPS;
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed Dec 14 19:33:33 UTC 2016 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: 1320-1322 To generate a diff of this commit: cvs rdiff -u -r1.1.2.133 -r1.1.2.134 src/doc/CHANGES-7.1 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-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.133 src/doc/CHANGES-7.1:1.1.2.134 --- src/doc/CHANGES-7.1:1.1.2.133 Wed Dec 14 10:52:38 2016 +++ src/doc/CHANGES-7.1 Wed Dec 14 19:33:33 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.133 2016/12/14 10:52:38 martin Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.134 2016/12/14 19:33:33 snj Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -7573,3 +7573,26 @@ external/public-domain/tz/tzdata2netbsd Update tzdata to 2016j. [kre, ticket #1324] +sys/external/bsd/drm2/drm/drmfb.c 1.3 +sys/external/bsd/drm2/i915drm/intelfb.c 1.14 +sys/external/bsd/drm2/include/drm/drmfb.h 1.2 +sys/external/bsd/drm2/nouveau/nouveaufb.c 1.4 + + Fix misaligned linebytes in nouveaufb. PR kern/51181. + [riastradh, ticket #1322] + +sys/dev/usb/usbdevs1.728 +sys/dev/usb/usbdevs_data.h regen +sys/dev/usb/usbdevs.hregen + + Rename "CH341 serial/parallel" to "CH341 USB-Serial Bridge", + and add a second device id for this chip. + [bouyer, ticket #1320] + +sys/dev/usb/uchcom.c1.17 + + - For newer (0x30-on) CH340 devices, don't update LCR1/LCR2. + With this change, currently available devices now work. + - Match USB_PRODUCT_WINCHIPHEAD2_CH341_2. + [bouyer, ticket #1321] +
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rjs Date: Wed Dec 14 19:29:31 UTC 2016 Modified Files: src/distrib/sets/lists/debug: mi Log Message: The t_clock_subr test doesn't require rump. To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.186 src/distrib/sets/lists/debug/mi:1.187 --- src/distrib/sets/lists/debug/mi:1.186 Wed Dec 14 12:59:51 2016 +++ src/distrib/sets/lists/debug/mi Wed Dec 14 19:29:31 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.186 2016/12/14 12:59:51 kre Exp $ +# $NetBSD: mi,v 1.187 2016/12/14 19:29:31 rjs Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -1595,7 +1595,7 @@ ./usr/libdata/debug/usr/tests/dev/cgd/t_cgd_3des.debug tests-fs-debug atf,compattestfile,crypto,debug,rump ./usr/libdata/debug/usr/tests/dev/cgd/t_cgd_aes.debug tests-fs-debug atf,compattestfile,crypto,debug,rump ./usr/libdata/debug/usr/tests/dev/cgd/t_cgd_blowfish.debug tests-fs-debug atf,compattestfile,crypto,debug,rump -./usr/libdata/debug/usr/tests/dev/clock_subr/t_clock_subr.debug tests-fs-debug debug,atf,rump +./usr/libdata/debug/usr/tests/dev/clock_subr/t_clock_subr.debug tests-fs-debug debug,atf ./usr/libdata/debug/usr/tests/dev/md/h_mdserv.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/dev/scsipi/t_cd.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/dev/sysmon/t_swwdog.debug tests-fs-debug debug,atf,rump
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src
Committed By: snj
Date: Wed Dec 14 19:18:58 UTC 2016
Modified Files:
src/sys/dev/usb [netbsd-7]: uchcom.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1321):
sys/dev/usb/uchcom.c: revision 1.17
Followling an advice in a linux forum, don't update LCR1/LCR2.
With this change this CH340 usb/serial based device:
https://www.olimex.com/Products/Breadboarding/BB-CH340T/open-source-hardware
(the chip is written H340T)
works as expected. As I'm not sure if this is needed for older device,
make this change for sc_version 0x30 or newer only.
While there, match USB_PRODUCT_WINCHIPHEAD2_CH341_2 too.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/dev/usb/uchcom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uchcom.c
diff -u src/sys/dev/usb/uchcom.c:1.13 src/sys/dev/usb/uchcom.c:1.13.4.1
--- src/sys/dev/usb/uchcom.c:1.13 Sat Mar 15 19:20:27 2014
+++ src/sys/dev/usb/uchcom.c Wed Dec 14 19:18:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: uchcom.c,v 1.13 2014/03/15 19:20:27 martin Exp $ */
+/* $NetBSD: uchcom.c,v 1.13.4.1 2016/12/14 19:18:58 snj Exp $ */
/*
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13 2014/03/15 19:20:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.13.4.1 2016/12/14 19:18:58 snj Exp $");
/*
* driver for WinChipHead CH341/340, the worst USB-serial chip in the world.
@@ -91,6 +91,7 @@ int uchcomdebug = 0;
#define UCHCOM_REG_LCR2 0x25
#define UCHCOM_VER_20 0x20
+#define UCHCOM_VER_30 0x30
#define UCHCOM_BASE_UNKNOWN 0
#define UCHCOM_BPS_MOD_BASE 2000
@@ -176,6 +177,7 @@ static const struct uchcom_divider_recor
static const struct usb_devno uchcom_devs[] = {
{ USB_VENDOR_WINCHIPHEAD, USB_PRODUCT_WINCHIPHEAD_CH341SER },
{ USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341 },
+ { USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341_2 },
};
#define uchcom_lookup(v, p) usb_lookup(uchcom_devs, v, p)
@@ -570,6 +572,7 @@ update_version(struct uchcom_softc *sc)
usbd_errstr(err));
return EIO;
}
+ DPRINTF(("%s: update_version %d\n", device_xname(sc->sc_dev), sc->sc_version));
return 0;
}
@@ -715,50 +718,52 @@ set_dte_rate(struct uchcom_softc *sc, ui
static int
set_line_control(struct uchcom_softc *sc, tcflag_t cflag)
{
- usbd_status err;
- uint8_t lcr1val = 0, lcr2val = 0;
+ if (sc->sc_version < UCHCOM_VER_30) {
+ usbd_status err;
+ uint8_t lcr1val = 0, lcr2val = 0;
- err = read_reg(sc, UCHCOM_REG_LCR1, &lcr1val, UCHCOM_REG_LCR2, &lcr2val);
- if (err) {
- aprint_error_dev(sc->sc_dev, "cannot get LCR: %s\n",
- usbd_errstr(err));
- return EIO;
- }
+ err = read_reg(sc, UCHCOM_REG_LCR1, &lcr1val, UCHCOM_REG_LCR2, &lcr2val);
+ if (err) {
+ aprint_error_dev(sc->sc_dev, "cannot get LCR: %s\n",
+ usbd_errstr(err));
+ return EIO;
+ }
- lcr1val &= ~UCHCOM_LCR1_MASK;
- lcr2val &= ~UCHCOM_LCR2_MASK;
+ lcr1val &= ~UCHCOM_LCR1_MASK;
+ lcr2val &= ~UCHCOM_LCR2_MASK;
- /*
- * XXX: it is difficult to handle the line control appropriately:
- * - CS8, !CSTOPB and any parity mode seems ok, but
- * - the chip doesn't have the function to calculate parity
- * in !CS8 mode.
- * - it is unclear that the chip supports CS5,6 mode.
- * - it is unclear how to handle stop bits.
- */
-
- switch (ISSET(cflag, CSIZE)) {
- case CS5:
- case CS6:
- case CS7:
- return EINVAL;
- case CS8:
- break;
- }
+ /*
+ * XXX: it is difficult to handle the line control appropriately:
+ * - CS8, !CSTOPB and any parity mode seems ok, but
+ * - the chip doesn't have the function to calculate parity
+ * in !CS8 mode.
+ * - it is unclear that the chip supports CS5,6 mode.
+ * - it is unclear how to handle stop bits.
+ */
+
+ switch (ISSET(cflag, CSIZE)) {
+ case CS5:
+ case CS6:
+ case CS7:
+ return EINVAL;
+ case CS8:
+ break;
+ }
- if (ISSET(cflag, PARENB)) {
- lcr1val |= UCHCOM_LCR1_PARENB;
- if (ISSET(cflag, PARODD))
- lcr2val |= UCHCOM_LCR2_PARODD;
- else
- lcr2val |= UCHCOM_LCR2_PAREVEN;
- }
+ if (ISSET(cflag, PARENB)) {
+ lcr1val |= UCHCOM_LCR1_PARENB;
+ if (ISSET(cflag, PARODD))
+lcr2val |= UCHCOM_LCR2_PARODD;
+ else
+lcr2val |= UCHCOM_LCR2_PAREVEN;
+ }
- err = write_reg(sc, UCHCOM_REG_LCR1, lcr1val, UCHCOM_REG_LCR2, lcr2val);
- if (err) {
- aprint_error_dev(sc->sc_dev, "cannot set LCR: %s\n",
- usbd_errstr(err));
- return EIO;
+ err = write_reg(sc, UCHCOM_REG_LCR1, lcr1val, UCHCOM_REG_LCR2, lcr2val);
+ if (err) {
+ aprint_error_dev(sc->sc_dev, "cannot set LCR: %s\n",
+ usbd_errstr(err));
+ return EIO;
+ }
}
return 0;
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src
Committed By: snj
Date: Wed Dec 14 19:16:56 UTC 2016
Modified Files:
src/sys/dev/usb [netbsd-7]: usbdevs.h usbdevs_data.h
Log Message:
regen for ticket 1320
To generate a diff of this commit:
cvs rdiff -u -r1.672.2.6 -r1.672.2.7 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.673.2.6 -r1.673.2.7 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.672.2.6 src/sys/dev/usb/usbdevs.h:1.672.2.7
--- src/sys/dev/usb/usbdevs.h:1.672.2.6 Thu Dec 8 07:50:15 2016
+++ src/sys/dev/usb/usbdevs.h Wed Dec 14 19:16:55 2016
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.672.2.6 2016/12/08 07:50:15 snj Exp $ */
+/* $NetBSD: usbdevs.h,v 1.672.2.7 2016/12/14 19:16:55 snj Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.680.2.6 2016/12/08 07:49:42 snj Exp
+ * NetBSD: usbdevs,v 1.680.2.7 2016/12/14 19:16:14 snj Exp
*/
/*
@@ -3384,7 +3384,8 @@
/* WinChipHead products */
#define USB_PRODUCT_WINCHIPHEAD_CH341SER 0x5523 /* CH341/CH340 USB-Serial Bridge */
-#define USB_PRODUCT_WINCHIPHEAD2_CH341 0x7523 /* CH341 serial/parallel */
+#define USB_PRODUCT_WINCHIPHEAD2_CH341 0x7523 /* CH341 USB-Serial Bridge */
+#define USB_PRODUCT_WINCHIPHEAD2_CH341_2 0x5523 /* CH341 USB-Serial Bridge */
/* Wistron NeWeb products */
#define USB_PRODUCT_WISTRONNEWEB_WNC0600 0x0326 /* WNC-0600USB */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.673.2.6 src/sys/dev/usb/usbdevs_data.h:1.673.2.7
--- src/sys/dev/usb/usbdevs_data.h:1.673.2.6 Thu Dec 8 07:50:15 2016
+++ src/sys/dev/usb/usbdevs_data.h Wed Dec 14 19:16:55 2016
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.673.2.6 2016/12/08 07:50:15 snj Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.673.2.7 2016/12/14 19:16:55 snj Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.680.2.6 2016/12/08 07:49:42 snj Exp
+ * NetBSD: usbdevs,v 1.680.2.7 2016/12/14 19:16:14 snj Exp
*/
/*
@@ -10184,7 +10184,11 @@ const struct usb_product usb_products[]
},
{
USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341,
- "CH341 serial/parallel",
+ "CH341 USB-Serial Bridge",
+ },
+ {
+ USB_VENDOR_WINCHIPHEAD2, USB_PRODUCT_WINCHIPHEAD2_CH341_2,
+ "CH341 USB-Serial Bridge",
},
{
USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_WNC0600,
@@ -10535,4 +10539,4 @@ const struct usb_product usb_products[]
"Prestige",
},
};
-const int usb_nproducts = 2084;
+const int usb_nproducts = 2085;
CVS commit: [netbsd-7] src/sys/dev/usb
Module Name:src Committed By: snj Date: Wed Dec 14 19:16:14 UTC 2016 Modified Files: src/sys/dev/usb [netbsd-7]: usbdevs Log Message: Pull up following revision(s) (requested by bouyer in ticket #1320): sys/dev/usb/usbdevs: revision 1.728 Rename "CH341 serial/parallel" to "CH341 USB-Serial Bridge", and add a second device id for this chip. >From FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.680.2.6 -r1.680.2.7 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.680.2.6 src/sys/dev/usb/usbdevs:1.680.2.7 --- src/sys/dev/usb/usbdevs:1.680.2.6 Thu Dec 8 07:49:42 2016 +++ src/sys/dev/usb/usbdevs Wed Dec 14 19:16:14 2016 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.680.2.6 2016/12/08 07:49:42 snj Exp $ +$NetBSD: usbdevs,v 1.680.2.7 2016/12/14 19:16:14 snj Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -3377,7 +3377,8 @@ product WESTERN EXTHDD 0x0400 External /* WinChipHead products */ product WINCHIPHEAD CH341SER 0x5523 CH341/CH340 USB-Serial Bridge -product WINCHIPHEAD2 CH341 0x7523 CH341 serial/parallel +product WINCHIPHEAD2 CH341 0x7523 CH341 USB-Serial Bridge +product WINCHIPHEAD2 CH341_2 0x5523 CH341 USB-Serial Bridge /* Wistron NeWeb products */ product WISTRONNEWEB WNC0600 0x0326 WNC-0600USB
CVS commit: [netbsd-7] src/sys/external/bsd/drm2
Module Name:src
Committed By: snj
Date: Wed Dec 14 19:13:24 UTC 2016
Modified Files:
src/sys/external/bsd/drm2/drm [netbsd-7]: drmfb.c
src/sys/external/bsd/drm2/i915drm [netbsd-7]: intelfb.c
src/sys/external/bsd/drm2/include/drm [netbsd-7]: drmfb.h
src/sys/external/bsd/drm2/nouveau [netbsd-7]: nouveaufb.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1322):
sys/external/bsd/drm2/drm/drmfb.c: revision 1.3
sys/external/bsd/drm2/i915drm/intelfb.c: revision 1.14
sys/external/bsd/drm2/include/drm/drmfb.h: revision 1.2
sys/external/bsd/drm2/nouveau/nouveaufb.c: revision 1.4
add da_fb_linebytes to drmfb_attach_args and use it to pass linebytes
from nouveau code to drmfb. keep the same linebytes logic for i915.
nvidia hardware needs 256 byte alignment, so aligning to just 64 was
not enough.
fixes broken console with a width of 1440px (PR kern/51181)
ok riastradh
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/external/bsd/drm2/drm/drmfb.c
cvs rdiff -u -r1.9.4.3 -r1.9.4.4 src/sys/external/bsd/drm2/i915drm/intelfb.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
src/sys/external/bsd/drm2/include/drm/drmfb.h
cvs rdiff -u -r1.1.2.4 -r1.1.2.5 \
src/sys/external/bsd/drm2/nouveau/nouveaufb.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/drm/drmfb.c
diff -u src/sys/external/bsd/drm2/drm/drmfb.c:1.1.2.3 src/sys/external/bsd/drm2/drm/drmfb.c:1.1.2.4
--- src/sys/external/bsd/drm2/drm/drmfb.c:1.1.2.3 Thu Feb 11 23:17:06 2016
+++ src/sys/external/bsd/drm2/drm/drmfb.c Wed Dec 14 19:13:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: drmfb.c,v 1.1.2.3 2016/02/11 23:17:06 snj Exp $ */
+/* $NetBSD: drmfb.c,v 1.1.2.4 2016/12/14 19:13:24 snj Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.1.2.3 2016/02/11 23:17:06 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drmfb.c,v 1.1.2.4 2016/12/14 19:13:24 snj Exp $");
#ifdef _KERNEL_OPT
#include "vga.h"
@@ -103,9 +103,7 @@ drmfb_attach(struct drmfb_softc *sc, con
prop_dictionary_set_uint32(dict, "width", sizes->surface_width);
prop_dictionary_set_uint32(dict, "height", sizes->surface_height);
prop_dictionary_set_uint8(dict, "depth", sizes->surface_bpp);
- prop_dictionary_set_uint16(dict, "linebytes",
- roundup2((sizes->surface_width * howmany(sizes->surface_bpp, 8)),
- 64));
+ prop_dictionary_set_uint16(dict, "linebytes", da->da_fb_linebytes);
prop_dictionary_set_uint32(dict, "address", 0); /* XXX >32-bit */
CTASSERT(sizeof(uintptr_t) <= sizeof(uint64_t));
prop_dictionary_set_uint64(dict, "virtual_address",
Index: src/sys/external/bsd/drm2/i915drm/intelfb.c
diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.9.4.3 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.9.4.4
--- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.9.4.3 Thu Apr 23 07:31:17 2015
+++ src/sys/external/bsd/drm2/i915drm/intelfb.c Wed Dec 14 19:13:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: intelfb.c,v 1.9.4.3 2015/04/23 07:31:17 snj Exp $ */
+/* $NetBSD: intelfb.c,v 1.9.4.4 2016/12/14 19:13:24 snj Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.9.4.3 2015/04/23 07:31:17 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intelfb.c,v 1.9.4.4 2016/12/14 19:13:24 snj Exp $");
#include
#include
@@ -164,11 +164,14 @@ intelfb_attach_task(struct i915drmkms_ta
struct intelfb_softc *const sc = container_of(task,
struct intelfb_softc, sc_attach_task);
const struct intelfb_attach_args *const ifa = &sc->sc_ifa;
+ const struct drm_fb_helper_surface_size *const sizes = &ifa->ifa_fb_sizes;
const struct drmfb_attach_args da = {
.da_dev = sc->sc_dev,
.da_fb_helper = ifa->ifa_fb_helper,
.da_fb_sizes = &ifa->ifa_fb_sizes,
.da_fb_vaddr = bus_space_vaddr(ifa->ifa_fb_bst, sc->sc_fb_bsh),
+ .da_fb_linebytes = roundup2((sizes->surface_width *
+ howmany(sizes->surface_bpp, 8)), 64),
.da_params = &intelfb_drmfb_params,
};
int error;
Index: src/sys/external/bsd/drm2/include/drm/drmfb.h
diff -u src/sys/external/bsd/drm2/include/drm/drmfb.h:1.1.2.2 src/sys/external/bsd/drm2/include/drm/drmfb.h:1.1.2.3
--- src/sys/external/bsd/drm2/include/drm/drmfb.h:1.1.2.2 Fri Mar 6 21:39:10 2015
+++ src/sys/external/bsd/drm2/include/drm/drmfb.h Wed Dec 14 19:13:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: drmfb.h,v 1.1.2.2 2015/03/06 21:39:10 snj Exp $ */
+/* $NetBSD: drmfb.h,v 1.1.2.3 2016/12/14 19:13:24 snj Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -76,6 +76,7 @@ struct drmfb_attach_args {
struct drm_fb_helper *da_fb_helper;
const struct drm_fb_helper_surface_size *da_fb_sizes;
void*da_fb_vaddr;
+ uint32_t da_fb_linebytes;
const struct drmfb_params *da_param
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: mrg
Date: Wed Dec 14 18:50:56 UTC 2016
Modified Files:
src/sys/arch/sparc/sparc: db_interface.c
Log Message:
remove local lwp_eprio() definition that broke the clang build.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/sparc/sparc/db_interface.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/sparc/sparc/db_interface.c
diff -u src/sys/arch/sparc/sparc/db_interface.c:1.92 src/sys/arch/sparc/sparc/db_interface.c:1.93
--- src/sys/arch/sparc/sparc/db_interface.c:1.92 Sat Dec 10 10:41:07 2016
+++ src/sys/arch/sparc/sparc/db_interface.c Wed Dec 14 18:50:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.92 2016/12/10 10:41:07 mrg Exp $ */
+/* $NetBSD: db_interface.c,v 1.93 2016/12/14 18:50:56 mrg Exp $ */
/*
* Mach Operating System
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.92 2016/12/10 10:41:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.93 2016/12/14 18:50:56 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -366,14 +366,6 @@ kdb_trap(int type, struct trapframe *tf)
}
#endif /* DDB */
-#ifndef _KERNEL
-static inline pri_t
-lwp_eprio(lwp_t *l)
-{
- return 0;
-}
-#endif
-
#ifdef _KERNEL
void
db_proc_cmd(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
CVS commit: xsrc/external/mit/xf86-video-glint/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Dec 14 16:51:44 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-glint/dist/src: pm2_exa.c pm3_exa.c
Log Message:
appease clang
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c:1.4 xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c:1.5
--- xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c:1.4 Wed Dec 14 16:46:31 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c Wed Dec 14 16:51:44 2016
@@ -208,10 +208,10 @@ Pm2UploadToScreen(PixmapPtr pDst, int x,
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
GLINTPtr pGlint = GLINTPTR(pScrn);
- intoffset = exaGetPixmapOffset(pDst);
- char *dst= pGlint->FbBase + offset;
- uint32_t *s;
- intdst_pitch = exaGetPixmapPitch(pDst);
+ intoffset = exaGetPixmapOffset(pDst);
+ unsigned char *dst = pGlint->FbBase + offset;
+ CARD32 *s;
+ intdst_pitch = exaGetPixmapPitch(pDst);
int bpp= pDst->drawable.bitsPerPixel;
int cpp= (bpp + 7) >> 3;
@@ -233,19 +233,10 @@ Pm2UploadToScreen(PixmapPtr pDst, int x,
}
} else {
/* use host blit */
- GLINT_WAIT(3);
y += offset / dst_pitch;
-#if 0
- GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
- GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
- Permedia2LoadCoord(pScrn, x, y, w, h);
- GLINT_WRITE_REG(PrimitiveRectangle |
- XPositive | YPositive | SyncOnHostData,
- Render);
-#endif
adr = y * (dst_pitch >> 2) + x;
while (h--) {
- s = (uint32_t *)src;
+ s = (CARD32 *)src;
xx = w;
GLINT_WAIT(1);
GLINT_WRITE_REG(adr, TextureDownloadOffset);
@@ -276,9 +267,9 @@ Pm2DownloadFromScreen(PixmapPtr pSrc, in
char *dst, int dst_pitch)
{
ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
- GLINTPtr pGlint = GLINTPTR(pScrn);
- char *src= pGlint->FbBase + exaGetPixmapOffset(pSrc);
- intsrc_pitch = exaGetPixmapPitch(pSrc);
+ GLINTPtr pGlint= GLINTPTR(pScrn);
+ unsigned char *src = pGlint->FbBase + exaGetPixmapOffset(pSrc);
+ intsrc_pitch = exaGetPixmapPitch(pSrc);
ENTER;
int bpp= pSrc->drawable.bitsPerPixel;
Index: xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c:1.3 xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c:1.4
--- xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c:1.3 Sat Dec 10 07:23:38 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/pm3_exa.c Wed Dec 14 16:51:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pm3_exa.c,v 1.3 2016/12/10 07:23:38 macallan Exp $ */
+/* $NetBSD: pm3_exa.c,v 1.4 2016/12/14 16:51:44 macallan Exp $ */
/*
* Copyright (c) 2016 Michael Lorenz
@@ -251,9 +251,9 @@ Pm3UploadToScreen(PixmapPtr pDst, int x,
char *src, int src_pitch)
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
- GLINTPtr pGlint = GLINTPTR(pScrn);
- char *dst= pGlint->FbBase + exaGetPixmapOffset(pDst);
- intdst_pitch = exaGetPixmapPitch(pDst);
+ GLINTPtr pGlint= GLINTPTR(pScrn);
+ unsigned char *dst = pGlint->FbBase + exaGetPixmapOffset(pDst);
+ intdst_pitch = exaGetPixmapPitch(pDst);
int bpp= pDst->drawable.bitsPerPixel;
int cpp= (bpp + 7) >> 3;
@@ -280,9 +280,9 @@ Pm3DownloadFromScreen(PixmapPtr pSrc, in
char *dst, int dst_pitch)
{
ScrnInfoPtr pScrn = xf86Screens[pSrc->drawable.pScreen->myNum];
- GLINTPtr pGlint = GLINTPTR(pScrn);
- char *src= pGlint->FbBase + exaGetPixmapOffset(pSrc);
- intsrc_pitch = exaGetPixmapPitch(pSrc);
+ GLINTPtr pGlint= GLINTPTR(pScrn);
+ unsigned char *src = pGlint->FbBase + exaGetPixmapOffset(pSrc);
+ intsrc_pitch = exaGetPixmapPitch(pSrc);
ENTER;
int bpp= pSrc->drawable.bitsPerPixel;
CVS commit: xsrc/external/mit/xf86-video-glint/dist/src
Module Name:xsrc
Committed By: macallan
Date: Wed Dec 14 16:46:31 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-glint/dist/src: pm2_exa.c
Log Message:
use host blits for image uploads on pm2
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c:1.3 xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c:1.4
--- xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c:1.3 Sat Dec 10 07:23:38 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/pm2_exa.c Wed Dec 14 16:46:31 2016
@@ -208,22 +208,62 @@ Pm2UploadToScreen(PixmapPtr pDst, int x,
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
GLINTPtr pGlint = GLINTPTR(pScrn);
- char *dst= pGlint->FbBase + exaGetPixmapOffset(pDst);
+ intoffset = exaGetPixmapOffset(pDst);
+ char *dst= pGlint->FbBase + offset;
+ uint32_t *s;
intdst_pitch = exaGetPixmapPitch(pDst);
int bpp= pDst->drawable.bitsPerPixel;
int cpp= (bpp + 7) >> 3;
int wBytes = w * cpp;
+ int xx, i, fs = pGlint->FIFOSize, chunk, adr;
ENTER;
- dst += (x * cpp) + (y * dst_pitch);
- Permedia2Sync(pScrn);
-
- while (h--) {
- memcpy(dst, src, wBytes);
- src += src_pitch;
- dst += dst_pitch;
+ if (bpp < 24) {
+ /* for now */
+ dst += (x * cpp) + (y * dst_pitch);
+
+ Permedia2Sync(pScrn);
+
+ while (h--) {
+ memcpy(dst, src, wBytes);
+ src += src_pitch;
+ dst += dst_pitch;
+ }
+ } else {
+ /* use host blit */
+ GLINT_WAIT(3);
+ y += offset / dst_pitch;
+#if 0
+ GLINT_WRITE_REG(UNIT_DISABLE, ColorDDAMode);
+ GLINT_WRITE_REG(pGlint->pprod, FBReadMode);
+ Permedia2LoadCoord(pScrn, x, y, w, h);
+ GLINT_WRITE_REG(PrimitiveRectangle |
+ XPositive | YPositive | SyncOnHostData,
+ Render);
+#endif
+ adr = y * (dst_pitch >> 2) + x;
+ while (h--) {
+ s = (uint32_t *)src;
+ xx = w;
+ GLINT_WAIT(1);
+ GLINT_WRITE_REG(adr, TextureDownloadOffset);
+ while (xx > 0) {
+chunk = min(fs - 1, xx);
+ GLINT_WAIT(chunk);
+ GLINT_WRITE_REG(((chunk - 1) << 16) | (0x11 << 4) |
+ 0x0d, OutputFIFO);
+GLINT_MoveDWORDS(
+ (CARD32*)((char*)pGlint->IOBase + OutputFIFO + 4),
+ s, chunk);
+ xx -= chunk;
+ s += chunk;
+ }
+ adr += (dst_pitch >> 2);
+ src += src_pitch;
+ }
+ exaMarkSync(pDst->drawable.pScreen);
}
return TRUE;
}
CVS commit: xsrc/external/mit/xorg-cf-files/dist
Module Name:xsrc Committed By: scole Date: Wed Dec 14 16:05:34 UTC 2016 Modified Files: xsrc/external/mit/xorg-cf-files/dist: Imake.cf Log Message: Add "define ia64Architecture" for ia64 case; probably more changes needed later. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-cf-files/dist/Imake.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-cf-files/dist/Imake.cf diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.5 xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.6 --- xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.5 Wed Mar 19 23:45:21 2014 +++ xsrc/external/mit/xorg-cf-files/dist/Imake.cf Wed Dec 14 16:05:34 2016 @@ -255,6 +255,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # define AMD64Architecture # undef __x86_64__ # endif +# ifdef __ia64__ +# define ia64Architecture +# undef __ia64__ +# endif #endif /* NetBSD */ /* Systems based on kernel of NetBSD */
CVS commit: src/share/mk
Module Name:src
Committed By: scole
Date: Wed Dec 14 16:03:19 UTC 2016
Modified Files:
src/share/mk: bsd.x11.mk
Log Message:
Make ia64 considered 64bit for the _XSERVER64 define so a release with x11 will
at least build.
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.123 src/share/mk/bsd.x11.mk:1.124
--- src/share/mk/bsd.x11.mk:1.123 Fri Oct 14 20:34:29 2016
+++ src/share/mk/bsd.x11.mk Wed Dec 14 16:03:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.123 2016/10/14 20:34:29 joerg Exp $
+# $NetBSD: bsd.x11.mk,v 1.124 2016/12/14 16:03:19 scole Exp $
.include
@@ -97,6 +97,7 @@ X11FLAGS.SERVER+= -DXINPUT -DXFreeXDGA -
.endif
.if ${MACHINE_ARCH} == "alpha" || \
+${MACHINE_ARCH} == "ia64" || \
${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "x86_64" || \
${MACHINE_CPU} == "aarch64"
CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Wed Dec 14 15:49:35 UTC 2016
Modified Files:
src/sys/kern: vfs_vnode.c
Log Message:
Change the freelists to lrulists, all vnodes are always on one
of the lists. Speeds up namei on cached vnodes by ~3 percent.
Merge "vrele_thread" into "vdrain_thread" so we have one thread
working on the lrulists. Adapt vfs_drainvnodes() to always wait
for a complete cycle of vdrain_thread().
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/kern/vfs_vnode.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/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.62 src/sys/kern/vfs_vnode.c:1.63
--- src/sys/kern/vfs_vnode.c:1.62 Wed Dec 14 15:48:55 2016
+++ src/sys/kern/vfs_vnode.c Wed Dec 14 15:49:35 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.62 2016/12/14 15:48:55 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.63 2016/12/14 15:49:35 hannken Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.62 2016/12/14 15:48:55 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.63 2016/12/14 15:49:35 hannken Exp $");
#include
#include
@@ -188,22 +188,19 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,
u_int numvnodes __cacheline_aligned;
/*
- * There are two free lists: one is for vnodes which have no buffer/page
- * references and one for those which do (i.e. v_holdcnt is non-zero).
- * Vnode recycling mechanism first attempts to look into the former list.
- */
-static kmutex_t vnode_free_list_lock __cacheline_aligned;
-static vnodelst_t vnode_free_list __cacheline_aligned;
-static vnodelst_t vnode_hold_list __cacheline_aligned;
+ * There are three lru lists: one holds vnodes waiting for async release,
+ * one is for vnodes which have no buffer/page references and
+ * one for those which do (i.e. v_holdcnt is non-zero).
+ */
+static vnodelst_t lru_vrele_list __cacheline_aligned;
+static vnodelst_t lru_free_list __cacheline_aligned;
+static vnodelst_t lru_hold_list __cacheline_aligned;
+static kmutex_t vdrain_lock __cacheline_aligned;
static kcondvar_t vdrain_cv __cacheline_aligned;
-
-static vnodelst_t vrele_list __cacheline_aligned;
-static kmutex_t vrele_lock __cacheline_aligned;
-static kcondvar_t vrele_cv __cacheline_aligned;
-static lwp_t * vrele_lwp __cacheline_aligned;
-static int vrele_pending __cacheline_aligned;
-static int vrele_gen __cacheline_aligned;
-
+static int vdrain_gen;
+static kcondvar_t vdrain_gen_cv;
+static bool vdrain_retry;
+static lwp_t * vdrain_lwp;
SLIST_HEAD(hashhead, vnode_impl);
static struct {
kmutex_t lock;
@@ -214,15 +211,15 @@ static struct {
pool_cache_t pool;
} vcache __cacheline_aligned;
-static int cleanvnode(void);
-static vnode_impl_t *vcache_alloc(void);
+static void lru_requeue(vnode_t *, vnodelst_t *);
+static vnodelst_t * lru_which(vnode_t *);
+static vnode_impl_t * vcache_alloc(void);
static void vcache_free(vnode_impl_t *);
static void vcache_init(void);
static void vcache_reinit(void);
static void vcache_reclaim(vnode_t *);
static void vrelel(vnode_t *, int);
static void vdrain_thread(void *);
-static void vrele_thread(void *);
static void vnpanic(vnode_t *, const char *, ...)
__printflike(2, 3);
@@ -357,22 +354,18 @@ vfs_vnode_sysinit(void)
KASSERT(dead_rootmount != NULL);
dead_rootmount->mnt_iflag = IMNT_MPSAFE;
- mutex_init(&vnode_free_list_lock, MUTEX_DEFAULT, IPL_NONE);
- TAILQ_INIT(&vnode_free_list);
- TAILQ_INIT(&vnode_hold_list);
- TAILQ_INIT(&vrele_list);
+ mutex_init(&vdrain_lock, MUTEX_DEFAULT, IPL_NONE);
+ TAILQ_INIT(&lru_free_list);
+ TAILQ_INIT(&lru_hold_list);
+ TAILQ_INIT(&lru_vrele_list);
vcache_init();
- mutex_init(&vrele_lock, MUTEX_DEFAULT, IPL_NONE);
cv_init(&vdrain_cv, "vdrain");
- cv_init(&vrele_cv, "vrele");
+ cv_init(&vdrain_gen_cv, "vdrainwt");
error = kthread_create(PRI_VM, KTHREAD_MPSAFE, NULL, vdrain_thread,
- NULL, NULL, "vdrain");
+ NULL, &vdrain_lwp, "vdrain");
KASSERTMSG((error == 0), "kthread_create(vdrain) failed: %d", error);
- error = kthread_create(PRI_VM, KTHREAD_MPSAFE, NULL, vrele_thread,
- NULL, &vrele_lwp, "vrele");
- KASSERTMSG((error == 0), "kthread_create(vrele) failed: %d", error);
}
/*
@@ -420,53 +413,74 @@ vnis_marker(vnode_t *vp)
}
/*
- * cleanvnode: grab a vnode from freelist, clean and free it.
- *
- * => Releases vnode_free_list_lock.
+ * Return the lru list this node should be on.
*/
-static int
-cleanvnode(void)
+static vnodelst_t *
+lru_which(vnode_t *vp)
{
- vnode_t *vp;
- vnode_impl_t *vi;
- vnodelst_t *listhd;
- struct mount *mp;
- KASSERT(mutex_owned(&vnode_free_list_lock));
+ KASSERT(mutex_owned(vp->v_interlock));
- listhd = &vnode_free_list;
-try_nextlist:
- TAILQ_FOREACH(vi, listhd, vi_lrulist) {
- vp = VIMPL_TO_V
CVS commit: src
Module Name:src
Committed By: hannken
Date: Wed Dec 14 15:48:55 UTC 2016
Modified Files:
src/share/man/man9: vnode.9
src/sys/fs/msdosfs: msdosfs_vfsops.c
src/sys/gdbscripts: vchain vdump
src/sys/kern: vfs_subr.c vfs_vnode.c
src/sys/sys: param.h vnode.h vnode_impl.h
Log Message:
Move vnode members "v_freelisthd" and "v_freelist" from "struct vnode"
to "struct vnode_impl" and rename to "vi_lrulisthd" and "vi_lrulist".
No functional change intended.
Welcome to 7.99.48
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/share/man/man9/vnode.9
cvs rdiff -u -r1.118 -r1.119 src/sys/fs/msdosfs/msdosfs_vfsops.c
cvs rdiff -u -r1.7 -r1.8 src/sys/gdbscripts/vchain
cvs rdiff -u -r1.5 -r1.6 src/sys/gdbscripts/vdump
cvs rdiff -u -r1.451 -r1.452 src/sys/kern/vfs_subr.c
cvs rdiff -u -r1.61 -r1.62 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.514 -r1.515 src/sys/sys/param.h
cvs rdiff -u -r1.266 -r1.267 src/sys/sys/vnode.h
cvs rdiff -u -r1.3 -r1.4 src/sys/sys/vnode_impl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man9/vnode.9
diff -u src/share/man/man9/vnode.9:1.72 src/share/man/man9/vnode.9:1.73
--- src/share/man/man9/vnode.9:1.72 Sat Aug 20 12:41:31 2016
+++ src/share/man/man9/vnode.9 Wed Dec 14 15:48:54 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: vnode.9,v 1.72 2016/08/20 12:41:31 wiz Exp $
+.\" $NetBSD: vnode.9,v 1.73 2016/12/14 15:48:54 hannken Exp $
.\"
.\" Copyright (c) 2001, 2005, 2006 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 August 20, 2016
+.Dd December 14, 2016
.Dt VNODE 9
.Os
.Sh NAME
@@ -175,8 +175,6 @@ struct vnode {
int v_synclist_slot; /* synclist slot index */
struct mount *v_mount; /* ptr to vfs we are in */
int (**v_op)(void *); /* vnode operations vector */
- TAILQ_ENTRY(vnode) v_freelist; /* vnode freelist */
- struct vnodelst *v_freelisthd; /* which freelist? */
TAILQ_ENTRY(vnode) v_mntvnodes; /* vnodes for mount point */
struct buflists v_cleanblkhd; /* clean blocklist head */
struct buflists v_dirtyblkhd; /* dirty blocklist head */
@@ -300,11 +298,8 @@ When both the
.Em v_usecount
and
.Em v_holdcnt
-reach zero, the vnode is recycled to the freelist and may be reused
-for another file.
-The transition to and from the freelist is handled by
-a kernel thread
-and
+reach zero, the vnode is cached.
+The transition from the cache is handled by a kernel thread and
.Fn vrecycle .
Access to
.Em v_usecount ,
@@ -354,14 +349,9 @@ See
.Xr vnodeops 9
for a description of vnode operations.
.Pp
-When not in use, vnodes are kept on the freelist through
-.Em v_freelist .
-The vnodes still reference valid files but may be reused to refer to a
-new file at any time.
-When a valid vnode which is on the freelist is used again, the user
-must call
+When a valid vnode which is cached is used again, the user must call
.Fn vget
-to increment the reference count and retrieve it from the freelist.
+to increment the reference count.
When a user wants a new vnode for another file,
.Fn vcache_get
or
@@ -512,7 +502,6 @@ The members
.Em v_holdcnt ,
.Em v_dirtyblkhd ,
.Em v_cleanblkhd ,
-.Em v_freelist ,
and
.Em v_synclist
are modified in interrupt context and must be protected by
@@ -547,14 +536,14 @@ If both
.Em v_usecount
and
.Em v_holdcnt
-are zero, the vnode is placed on the freelist.
+are zero, the vnode is cached.
.It Fn vrele_async "vp"
Will asychronously release the vnode in different context than the caller,
sometime after the call.
.It Fn vget "vp" "lockflags" "wait"
Reclaim vnode
.Fa vp
-from the freelist and increment its reference count.
+from the cache and increment its reference count.
.Pp
The vnode
.Fa vp
@@ -628,17 +617,15 @@ directly.
Mark the vnode
.Fa vp
as active by incrementing
-.Em vp-\*[Gt]v_holdcnt
-and moving the vnode from the freelist to the holdlist.
-Once on the holdlist, the vnode will not be recycled until it is
+.Em vp-\*[Gt]v_holdcnt .
+Once held, the vnode will not be recycled until it is
released with
.Fn holdrele .
.It Fn holdrele "vp"
Mark the vnode
.Fa vp
as inactive by decrementing
-.Em vp-\*[Gt]v_holdcnt
-and moving the vnode from the holdlist to the freelist.
+.Em vp-\*[Gt]v_holdcnt .
.It Fn vcache_get "mp" "key" "key_len" "vpp"
Allocate a new vnode.
The new vnode is returned referenced in the address specified by
Index: src/sys/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.118 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.119
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.118 Sat Mar 28 19:24:05 2015
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Wed Dec 14 15:48:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.118 2015/03/28 19:24:05 maxv Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,
CVS commit: src/sys
Module Name:src
Committed By: hannken
Date: Wed Dec 14 15:46:57 UTC 2016
Modified Files:
src/sys/kern: init_sysctl.c vfs_mount.c vfs_vnode.c
src/sys/sys: vnode.h vnode_impl.h
Log Message:
Remove the "target" argment from vfs_drainvnodes() as it is
always equal to "desiredvnodes" and move its definition
from sys/vnode.h to sys/vnode_impl.h.
Extend vfs_drainvnodes() to also wait for deferred vrele to flush
and replace the call to vrele_flush() with a call to vfs_drainvnodes().
To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 src/sys/kern/init_sysctl.c
cvs rdiff -u -r1.41 -r1.42 src/sys/kern/vfs_mount.c
cvs rdiff -u -r1.60 -r1.61 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.265 -r1.266 src/sys/sys/vnode.h
cvs rdiff -u -r1.2 -r1.3 src/sys/sys/vnode_impl.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/kern/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.211 src/sys/kern/init_sysctl.c:1.212
--- src/sys/kern/init_sysctl.c:1.211 Tue May 31 05:44:19 2016
+++ src/sys/kern/init_sysctl.c Wed Dec 14 15:46:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.211 2016/05/31 05:44:19 pgoyette Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.212 2016/12/14 15:46:57 hannken Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.211 2016/05/31 05:44:19 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.212 2016/12/14 15:46:57 hannken Exp $");
#include "opt_sysv.h"
#include "opt_compat_netbsd.h"
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: init_sysctl.
#include
#include
#include
-#include
+#include /* For vfs_drainvnodes(). */
#include
#include
#include
@@ -756,7 +756,7 @@ sysctl_kern_maxvnodes(SYSCTLFN_ARGS)
old_vnodes = desiredvnodes;
desiredvnodes = new_vnodes;
- error = vfs_drainvnodes(new_vnodes);
+ error = vfs_drainvnodes();
if (error) {
desiredvnodes = old_vnodes;
return (error);
Index: src/sys/kern/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.41 src/sys/kern/vfs_mount.c:1.42
--- src/sys/kern/vfs_mount.c:1.41 Thu Nov 3 11:03:31 2016
+++ src/sys/kern/vfs_mount.c Wed Dec 14 15:46:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_mount.c,v 1.41 2016/11/03 11:03:31 hannken Exp $ */
+/* $NetBSD: vfs_mount.c,v 1.42 2016/12/14 15:46:57 hannken Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.41 2016/11/03 11:03:31 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.42 2016/12/14 15:46:57 hannken Exp $");
#include
#include
@@ -509,8 +509,8 @@ vflush(struct mount *mp, vnode_t *skipvp
int error, busy = 0, when = 0;
struct vflush_ctx ctx;
- /* First, flush out any vnode references from vrele_list. */
- vrele_flush();
+ /* First, flush out any vnode references from deferred vrele list. */
+ vfs_drainvnodes();
vfs_vnode_iterator_init(mp, &marker);
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.60 src/sys/kern/vfs_vnode.c:1.61
--- src/sys/kern/vfs_vnode.c:1.60 Thu Dec 1 14:49:03 2016
+++ src/sys/kern/vfs_vnode.c Wed Dec 14 15:46:57 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.60 2016/12/01 14:49:03 hannken Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.61 2016/12/14 15:46:57 hannken Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.60 2016/12/01 14:49:03 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.61 2016/12/14 15:46:57 hannken Exp $");
#include
#include
@@ -208,6 +208,7 @@ SLIST_HEAD(hashhead, vnode_impl);
static struct {
kmutex_t lock;
kcondvar_t cv;
+ u_int hashsize;
u_long hashmask;
struct hashhead *hashtab;
pool_cache_t pool;
@@ -857,20 +858,6 @@ vrele_thread(void *cookie)
}
}
-void
-vrele_flush(void)
-{
- int gen;
-
- mutex_enter(&vrele_lock);
- gen = vrele_gen;
- while (vrele_pending && gen == vrele_gen) {
- cv_broadcast(&vrele_cv);
- cv_wait(&vrele_cv, &vrele_lock);
- }
- mutex_exit(&vrele_lock);
-}
-
/*
* Vnode reference, where a reference is already held by some other
* object (for example, a file structure).
@@ -1040,6 +1027,7 @@ vcache_init(void)
KASSERT(vcache.pool != NULL);
mutex_init(&vcache.lock, MUTEX_DEFAULT, IPL_NONE);
cv_init(&vcache.cv, "vcache");
+ vcache.hashsize = desiredvnodes;
vcache.hashtab = hashinit(desiredvnodes, HASH_SLIST, true,
&vcache.hashmask);
}
@@ -1057,6 +1045,7 @@ vcache_reinit(void)
mutex_enter(&vcache.lock);
oldtab = vcache.hashtab;
oldmask = vcache.hashmask;
+ vcache.hashsize = desiredvnodes;
vcache.hashtab = newtab;
vcache.hashmask = newmask;
for (i = 0; i <= oldmask; i++) {
@@ -1601,13 +1590,21 @@ vdead_check(struct vnode *vp, int flags)
}
int
-vfs_drainvnodes(long ta
CVS commit: src/usr.bin/cmp
Module Name:src Committed By: abhinav Date: Wed Dec 14 15:24:06 UTC 2016 Modified Files: src/usr.bin/cmp: cmp.1 Log Message: Add a HISTORY section Move information about exit status to EXIT STATUS section Add more xrefs ok wiz@ To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.bin/cmp/cmp.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/cmp/cmp.1 diff -u src/usr.bin/cmp/cmp.1:1.11 src/usr.bin/cmp/cmp.1:1.12 --- src/usr.bin/cmp/cmp.1:1.11 Sun Oct 30 19:33:49 2016 +++ src/usr.bin/cmp/cmp.1 Wed Dec 14 15:24:06 2016 @@ -1,4 +1,4 @@ -.\" $NetBSD: cmp.1,v 1.11 2016/10/30 19:33:49 christos Exp $ +.\" $NetBSD: cmp.1,v 1.12 2016/12/14 15:24:06 abhinav Exp $ .\" .\" Copyright (c) 1987, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\" .\" @(#)cmp.1 8.1 (Berkeley) 6/6/93 .\" -.Dd October 30, 2016 +.Dd December 13, 2016 .Dt CMP 1 .Os .Sh NAME @@ -84,7 +84,7 @@ and respectively, where the comparison will begin. The offset is decimal by default, but may be expressed as an hexadecimal or octal value by preceding it with a leading ``0x'' or ``0''. -.Pp +.Sh EXIT STATUS The .Nm utility exits with one of the following values: @@ -105,11 +105,18 @@ file (before any differences were found) An error occurred. .El .Sh SEE ALSO +.Xr comm 1 , .Xr diff 1 , -.Xr diff3 1 +.Xr diff3 1 , +.Xr sdiff 1 .Sh STANDARDS The .Nm utility is expected to be .St -p1003.2 compatible. +.Sh HISTORY +The +.Nm +utility first appeared in +.At v1 .
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Wed Dec 14 15:11:29 UTC 2016
Modified Files:
src/sys/dev/usb: ucom.c
Log Message:
Don't hold softc lock when calling ucom_read
PR/51714: uftdi (on xhci): mutex_vector_enter: locking against myself
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/dev/usb/ucom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.117 src/sys/dev/usb/ucom.c:1.118
--- src/sys/dev/usb/ucom.c:1.117 Sun Dec 4 10:12:35 2016
+++ src/sys/dev/usb/ucom.c Wed Dec 14 15:11:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.117 2016/12/04 10:12:35 skrll Exp $ */
+/* $NetBSD: ucom.c,v 1.118 2016/12/14 15:11:29 skrll Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.117 2016/12/04 10:12:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.118 2016/12/14 15:11:29 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1608,6 +1608,7 @@ ucomreadcb(struct usbd_xfer *xfer, void
return;
}
+ mutex_exit(&sc->sc_lock);
if (sc->sc_methods->ucom_read != NULL) {
sc->sc_methods->ucom_read(sc->sc_parent, sc->sc_portno,
&cp, &cc);
@@ -1617,6 +1618,15 @@ ucomreadcb(struct usbd_xfer *xfer, void
ub->ub_len = cc;
+ mutex_enter(&sc->sc_lock);
+ if (sc->sc_dying) {
+ if (--sc->sc_refcnt < 0)
+ cv_broadcast(&sc->sc_detachcv);
+ mutex_exit(&sc->sc_lock);
+ DPRINTF("... dying", 0, 0, 0, 0);
+ return;
+ }
+
SIMPLEQ_INSERT_TAIL(&sc->sc_ibuff_full, ub, ub_link);
ucom_read_complete(sc);
CVS commit: src/sys/arch/epoc32/conf
Module Name:src Committed By: martin Date: Wed Dec 14 14:01:10 UTC 2016 Modified Files: src/sys/arch/epoc32/conf: GENERIC Log Message: Comment out spkr at audio, as audio is commented out too To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/epoc32/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/epoc32/conf/GENERIC diff -u src/sys/arch/epoc32/conf/GENERIC:1.11 src/sys/arch/epoc32/conf/GENERIC:1.12 --- src/sys/arch/epoc32/conf/GENERIC:1.11 Tue Dec 13 20:42:17 2016 +++ src/sys/arch/epoc32/conf/GENERIC Wed Dec 14 14:01:10 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.11 2016/12/13 20:42:17 christos Exp $ +# $NetBSD: GENERIC,v 1.12 2016/12/14 14:01:10 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/epoc32/conf/std.epoc32" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.11 $" +#ident "GENERIC-$Revision: 1.12 $" maxusers 32 # estimated number of users @@ -167,8 +167,7 @@ wskbd* at epockbd? #tp* at spi* # ADS7843 Touch screen #audio* at audio? - -spkr* at audio? # PC speaker (synthesized) +#spkr* at audio? # PC speaker (synthesized) # External devices
CVS commit: src/sys/arch/bebox/conf
Module Name:src Committed By: martin Date: Wed Dec 14 14:00:17 UTC 2016 Modified Files: src/sys/arch/bebox/conf: GENERIC Log Message: Comment out spkr at pcppi, as pcppi is commented out too. To generate a diff of this commit: cvs rdiff -u -r1.151 -r1.152 src/sys/arch/bebox/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/bebox/conf/GENERIC diff -u src/sys/arch/bebox/conf/GENERIC:1.151 src/sys/arch/bebox/conf/GENERIC:1.152 --- src/sys/arch/bebox/conf/GENERIC:1.151 Tue Dec 13 20:42:16 2016 +++ src/sys/arch/bebox/conf/GENERIC Wed Dec 14 14:00:16 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.151 2016/12/13 20:42:16 christos Exp $ +# $NetBSD: GENERIC,v 1.152 2016/12/14 14:00:16 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.151 $" +#ident "GENERIC-$Revision: 1.152 $" maxusers 32 @@ -202,7 +202,7 @@ lpt0 at isa? port 0x378 irq 7 # standard mcclock0 at isa? port 0x70 # time-of-day clock attimer0 at isa? #pcppi0 at isa? -spkr* at pcppi? +#spkr* at pcppi? wss0 at isa? port 0x82c irq 30 drq 6 drq2 7 # Windows Sound System
CVS commit: src/distrib/sets
Module Name:src
Committed By: kre
Date: Wed Dec 14 13:04:42 UTC 2016
Modified Files:
src/distrib/sets: sort-list
Log Message:
Simplify (and no need for sub-shells).
Same functionality, same method, simpler exposition.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/sort-list
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/sort-list
diff -u src/distrib/sets/sort-list:1.1 src/distrib/sets/sort-list:1.2
--- src/distrib/sets/sort-list:1.1 Sun Aug 11 22:33:09 2013
+++ src/distrib/sets/sort-list Wed Dec 14 13:04:42 2016
@@ -1,7 +1,7 @@
#!/bin/sh
-while [ $# != 0 ]; do
- ( grep '^#' $1; grep -v '^#' $1 | LC_ALL=C sort ) > $1.tmp
- mv $1.tmp $1
- shift
+for F
+do
+ { grep '^#' "${F}"; grep -v '^#' "${F}" | LC_ALL=C sort ;} > "${F}".tmp
+ mv "${F}".tmp "${F}"
done
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: kre Date: Wed Dec 14 12:59:52 UTC 2016 Modified Files: src/distrib/sets/lists/base: ad.mips shl.mi src/distrib/sets/lists/comp: ad.mips ad.sh3 md.amd64 mi stl.mi src/distrib/sets/lists/debug: ad.aarch64 ad.mips md.amd64 md.sparc64 mi src/distrib/sets/lists/man: mi Log Message: Sort the unsorted sets lists (they should all be correctly sorted now.) To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.793 -r1.794 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/comp/ad.sh3 cvs rdiff -u -r1.238 -r1.239 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.2079 -r1.2080 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/comp/stl.mi cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.185 -r1.186 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1539 -r1.1540 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.73 src/distrib/sets/lists/base/ad.mips:1.74 --- src/distrib/sets/lists/base/ad.mips:1.73 Fri Oct 14 17:52:41 2016 +++ src/distrib/sets/lists/base/ad.mips Wed Dec 14 12:59:51 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.73 2016/10/14 17:52:41 maya Exp $ +# $NetBSD: ad.mips,v 1.74 2016/12/14 12:59:51 kre Exp $ ./lib/libc_fp.sobase-sys-shlib dynamicroot,softfloat,arch64 ./lib/libc_fp.so.0base-sys-shlib dynamicroot,softfloat,arch64 ./lib/libc_fp.so.0.0base-sys-shlib dynamicroot,softfloat,arch64 @@ -7,14 +7,14 @@ ./usr/lib/64/libc_fp.sobase-compat-shlib compat,pic,arch64 ./usr/lib/64/libc_fp.so.0 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libc_fp.so base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libc_fp.so.0 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64 ./usr/lib/libc_fp.sobase-sys-shlib softfloat,arch64 ./usr/lib/libc_fp.so.0base-sys-shlib softfloat,arch64 ./usr/lib/libc_fp.so.0.0 base-sys-shlib softfloat,arch64 +./usr/lib/o32/libc_fp.so base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libc_fp.so.0 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libc_fp.so.0.0 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libgomp.so.1.1 base-compat-shlib compat,pic,arch64,gcc=48 +./usr/lib/o32/libgomp.so.1.2 base-compat-shlib compat,pic,arch64,gcc=53 ./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic,arch64 ./usr/libexec/ld.elf_so-o32 base-sysutil-bin compat,pic,arch64 ./usr/lkm/ldscriptbase-obsolete obsolete -./usr/lib/o32/libgomp.so.1.1 base-compat-shlib compat,pic,arch64,gcc=48 -./usr/lib/o32/libgomp.so.1.2 base-compat-shlib compat,pic,arch64,gcc=53 Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.793 src/distrib/sets/lists/base/shl.mi:1.794 --- src/distrib/sets/lists/base/shl.mi:1.793 Sat Dec 10 05:39:13 2016 +++ src/distrib/sets/lists/base/shl.mi Wed Dec 14 12:59:51 2016 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.793 2016/12/10 05:39:13 christos Exp $ +# $NetBSD: shl.mi,v 1.794 2016/12/14 12:59:51 kre Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -809,12 +809,12 @@ ./usr/lib/libukfs.sobase-sys-shlib compatfile,rump ./usr/lib/libukfs.so.1base-sys-shlib compatfile,rump ./usr/lib/libukfs.so.1.0 base-sys-shlib compatfile,rump -./usr/lib/libunbound.sobase-sys-shlib compatfile,crypto,unbound -./usr/lib/libunbound.so.6 base-sys-shlib compatfile,crypto,unbound -./usr/lib/libunbound.so.6.1 base-sys-shlib compatfile,crypto,unbound ./usr/lib/libumem.sobase-zfs-shlib compatfile,zfs ./usr/lib/libumem.so.0base-zfs-shlib compatfile,zfs ./usr/lib/libumem.so.0.0 base-zfs-shlib compatfile,zfs +./usr/lib/libunbound.sobase-sys-shlib compatfile,crypto,unbound +./usr/lib/libunbound.so.6 base-sys-shlib compatfile,crypto,unbound +./usr/lib/libunbound.so.6.1 base-sys-shlib compatfile,crypto,unbound ./usr/lib/libusbhid.sobase-sys-shlib compatfile ./usr/lib/libusbhid.so.1 base-sys-shlib compatfile ./usr/lib/libusbhid.so.1.0 base-sys-shlib compatfile Index: src/distrib/sets/lists/comp/ad.mips diff -u src/distrib/sets/lists/comp/ad.mips:1.66 src/distrib/sets/lists/comp/ad.mips:1.67 --- src/distrib/sets/lists/comp/ad.mips:1.66 Mon Oct 31 20:22:35 2016 +++ src/distrib/sets/li
CVS commit: src/sys
Module Name:src
Committed By: knakahara
Date: Wed Dec 14 11:19:15 UTC 2016
Modified Files:
src/sys/net: if_etherip.h if_gif.c if_gif.h
src/sys/netinet: in_gif.c
src/sys/netinet6: in6_gif.c
Log Message:
fix race of gif_softc->gif_ro when we send multiple flows over gif on
NET_MPSAFE enabled kernel.
make gif_softc->gif_ro percpu as well as ipforward_rt to resolve this race.
and add future TODO comment for etherip(4).
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/net/if_etherip.h
cvs rdiff -u -r1.123 -r1.124 src/sys/net/if_gif.c
cvs rdiff -u -r1.24 -r1.25 src/sys/net/if_gif.h
cvs rdiff -u -r1.85 -r1.86 src/sys/netinet/in_gif.c
cvs rdiff -u -r1.81 -r1.82 src/sys/netinet6/in6_gif.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/net/if_etherip.h
diff -u src/sys/net/if_etherip.h:1.11 src/sys/net/if_etherip.h:1.12
--- src/sys/net/if_etherip.h:1.11 Sat Jul 28 00:43:24 2012
+++ src/sys/net/if_etherip.h Wed Dec 14 11:19:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_etherip.h,v 1.11 2012/07/28 00:43:24 matt Exp $*/
+/* $NetBSD: if_etherip.h,v 1.12 2016/12/14 11:19:15 knakahara Exp $*/
/*
* Copyright (c) 2006, Hans Rosenfeld
@@ -46,7 +46,11 @@ struct etherip_softc {
struct ethercom sc_ec;
struct sockaddr *sc_src;/* tunnel source address */
struct sockaddr *sc_dst;/* tunnel destination address */
- struct route sc_ro; /* cached inet route */
+ struct route sc_ro; /*
+ * cached inet route
+ * TODO:
+ * we must make percpu when MP-ify
+ */
void *sc_si;/* softintr handle*/
LIST_ENTRY(etherip_softc) etherip_list; /* list of etherip tunnels*/
};
Index: src/sys/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.123 src/sys/net/if_gif.c:1.124
--- src/sys/net/if_gif.c:1.123 Thu Sep 15 06:59:32 2016
+++ src/sys/net/if_gif.c Wed Dec 14 11:19:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.c,v 1.123 2016/09/15 06:59:32 knakahara Exp $ */
+/* $NetBSD: if_gif.c,v 1.124 2016/12/14 11:19:15 knakahara Exp $ */
/* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.123 2016/09/15 06:59:32 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.124 2016/12/14 11:19:15 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -240,6 +240,9 @@ gif_clone_create(struct if_clone *ifc, i
gifattach0(sc);
+ sc->gif_ro_percpu = percpu_alloc(sizeof(struct route));
+ KASSERTMSG(sc->gif_ro_percpu != NULL,
+ "failed to allocate sc->gif_ro_percpu");
LIST_INSERT_HEAD(&gif_softc_list, sc, gif_list);
return (0);
}
@@ -271,6 +274,14 @@ gifattach0(struct gif_softc *sc)
bpf_attach(&sc->gif_if, DLT_NULL, sizeof(u_int));
}
+void
+gif_rtcache_free_pc(void *p, void *arg __unused, struct cpu_info *ci __unused)
+{
+ struct route *ro = p;
+
+ rtcache_free(ro);
+}
+
static int
gif_clone_destroy(struct ifnet *ifp)
{
@@ -281,8 +292,8 @@ gif_clone_destroy(struct ifnet *ifp)
gif_delete_tunnel(&sc->gif_if);
bpf_detach(ifp);
if_detach(ifp);
- rtcache_free(&sc->gif_ro);
-
+ percpu_foreach(sc->gif_ro_percpu, gif_rtcache_free_pc, NULL);
+ percpu_free(sc->gif_ro_percpu, sizeof(struct route));
kmem_free(sc, sizeof(struct gif_softc));
return (0);
Index: src/sys/net/if_gif.h
diff -u src/sys/net/if_gif.h:1.24 src/sys/net/if_gif.h:1.25
--- src/sys/net/if_gif.h:1.24 Fri Jun 24 04:38:12 2016
+++ src/sys/net/if_gif.h Wed Dec 14 11:19:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gif.h,v 1.24 2016/06/24 04:38:12 knakahara Exp $ */
+/* $NetBSD: if_gif.h,v 1.25 2016/12/14 11:19:15 knakahara Exp $ */
/* $KAME: if_gif.h,v 1.23 2001/07/27 09:21:42 itojun Exp $ */
/*
@@ -38,6 +38,7 @@
#define _NET_IF_GIF_H_
#include
+#include
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -52,9 +53,7 @@ struct gif_softc {
struct ifnet gif_if; /* common area - must be at the top */
struct sockaddr *gif_psrc; /* Physical src addr */
struct sockaddr *gif_pdst; /* Physical dst addr */
- union {
- struct route gifscr_ro;/* xxx */
- } gifsc_gifscr;
+ percpu_t *gif_ro_percpu;
int gif_flags;
const struct encaptab *encap_cookie4;
const struct encaptab *encap_cookie6;
@@ -62,8 +61,6 @@ struct gif_softc {
};
#define GIF_ROUTE_TTL 10
-#define gif_ro gifsc_gifscr.gifscr_ro
-
#define GIF_MTU (1280) /* Default MTU */
#define GIF_MTU_MIN (1280) /* Minimum MTU */
#define GIF_MTU_MAX (8192) /* Maximum MTU */
@@ -71,6 +68,8 @@ struct gif_softc {
/* Prototypes */
void gif_input(struct mbuf *, int, struct ifnet *);
+void gif_rtcache_free_pc(void *, void *, struct cpu_info *);
+
#ifdef GIF_ENCAPCHECK
int gif_encapcheck(struct mbuf *, int, int, void *);
#endif
Index: src/sys/netinet/in_gif.c
diff -u src/sys/netinet/in_gif.c:1.85 src/s
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Wed Dec 14 10:52:39 UTC 2016 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: Ammend #1305 for additional changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.132 -r1.1.2.133 src/doc/CHANGES-7.1 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-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.132 src/doc/CHANGES-7.1:1.1.2.133 --- src/doc/CHANGES-7.1:1.1.2.132 Wed Dec 14 08:21:17 2016 +++ src/doc/CHANGES-7.1 Wed Dec 14 10:52:38 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.132 2016/12/14 08:21:17 snj Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.133 2016/12/14 10:52:38 martin Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -7524,8 +7524,7 @@ distrib/sets/lists/xdebug/md.i386 1.21 distrib/sets/lists/xserver/md.amd64 1.85-1.87 distrib/sets/lists/xserver/md.i386 1.103-1.105 external/mit/xorg/lib/Makefile 1.36 -external/mit/xorg/lib/gallium/Makefile 1.8 -external/mit/xorg/lib/gallium/Makefile 1.9 +external/mit/xorg/lib/gallium/Makefile 1.8,1.9,1.11,1.15 external/mit/xorg/lib/libdrm/drm/Makefile 1.7 external/mit/xorg/lib/libdrm_nouveau/Makefile 1.1 external/mit/xorg/lib/libdrm_nouveau/shlib_version 1.1
CVS commit: [netbsd-7] src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: martin
Date: Wed Dec 14 10:50:52 UTC 2016
Modified Files:
src/external/mit/xorg/lib/gallium [netbsd-7]: Makefile
Log Message:
Pull up revisions 1.11 and 1.15, requested by snj in #1305:
don't look for libdrm_nouveau unless we've built it.
only build the radeon and nouveau drivers on i386/amd64/evbarm,
where they're useful. this saves almost 2MB in text/data on shark.
To generate a diff of this commit:
cvs rdiff -u -r1.6.2.4 -r1.6.2.5 src/external/mit/xorg/lib/gallium/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.6.2.4 src/external/mit/xorg/lib/gallium/Makefile:1.6.2.5
--- src/external/mit/xorg/lib/gallium/Makefile:1.6.2.4 Mon Dec 12 09:32:35 2016
+++ src/external/mit/xorg/lib/gallium/Makefile Wed Dec 14 10:50:52 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6.2.4 2016/12/12 09:32:35 msaitoh Exp $
+# $NetBSD: Makefile,v 1.6.2.5 2016/12/14 10:50:52 martin Exp $
# Link the gallium mega driver.
@@ -13,16 +13,7 @@ LIB= gallium_dri
DRIDIR= ${X11USRLIBDIR}/modules/dri
DRIDEBUGDIR= ${DEBUGDIR}${X11USRLIBDIR}/modules/dri
-DRIVERS= kms_swrast swrast
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-DRIVERS+= r600 nouveau
-.endif
-
-CPPFLAGS+= \
- -I${DESTDIR}${X11INCDIR}/libdrm
-
-# cargo culted.
-#CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
GALLIUM_SUBDIRS= \
auxiliary \
@@ -44,21 +35,44 @@ GALLIUM_SUBDIRS= \
drivers/noop \
drivers/trace \
drivers/rbug \
+ drivers/softpipe \
+ winsys/sw/null \
+ winsys/sw/dri \
+ winsys/sw/kms-dri \
+ state_trackers/dri
+
+GALLIUM_SUBDIRS_ATI= \
drivers/radeon \
drivers/r600 \
drivers/r600/sb \
+ winsys/radeon/drm
+
+GALLIUM_SUBDIRS_NOUVEAU= \
drivers/nouveau \
drivers/nouveau/nv30 \
drivers/nouveau/nv50 \
drivers/nouveau/codegen \
drivers/nouveau/nvc0 \
- drivers/softpipe \
- winsys/radeon/drm \
- winsys/nouveau/drm \
- winsys/sw/null \
- winsys/sw/dri \
- winsys/sw/kms-dri \
- state_trackers/dri
+ winsys/nouveau/drm
+
+BUILD_RADEON=0
+BUILD_NOUVEAU=0
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+BUILD_RADEON=1
+.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+BUILD_NOUVEAU=1
+.endif
+
+DRIVERS= kms_swrast swrast
+.if ${BUILD_RADEON} == 1
+DRIVERS+= r600
+GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_ATI}
+.endif
+.if ${BUILD_NOUVEAU} == 1
+DRIVERS+= nouveau
+GALLIUM_SUBDIRS+= ${GALLIUM_SUBDIRS_NOUVEAU}
+.endif
GALLIUM_NAMES= kms_swrast r600 swrant
@@ -535,10 +549,17 @@ SRCS+= ${GALLIUM_SOURCES.${_d}}
.include "../libloader.mk"
+
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
+.if ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
LIBDPLIBS+= drm ${.CURDIR}/../libdrm
+.if ${BUILD_RADEON} == 1
LIBDPLIBS+= drm_radeon ${.CURDIR}/../libdrm_radeon
+.endif # ${BUILD_RADEON} == 1
+.if ${BUILD_NOUVEAU} == 1
LIBDPLIBS+= drm_nouveau ${.CURDIR}/../libdrm_nouveau
+.endif # ${BUILD_NOUVEAU} == 1
+.endif # ${BUILD_RADEON} == 1 || ${BUILD_NOUVEAU} == 1
LIBDPLIBS+= glapi ${.CURDIR}/../libglapi
LIBDPLIBS+= expat ${.CURDIR}/../../../../../external/mit/expat/lib/libexpat
@@ -576,14 +597,22 @@ CPPFLAGS.target.c += \
-DGALLIUM_NOOP \
-DGALLIUM_RBUG \
-DGALLIUM_TRACE \
- -DGALLIUM_R200 \
- -DGALLIUM_R600 \
- -DGALLIUM_NOUVEAU \
-DGALLIUM_SOFTPIPE \
-I${X11SRCDIR.MesaLib}/src/gallium/state_trackers/dri \
-I${X11SRCDIR.MesaLib}/src/loader \
-I${X11SRCDIR.MesaLib}/src/gallium/winsys
+.if ${BUILD_RADEON} == 1
+CPPFLAGS.target.c += \
+ -DGALLIUM_R200 \
+ -DGALLIUM_R600
+.endif # ${BUILD_RADEON} == 1
+
+.if ${BUILD_NOUVEAU} == 1
+CPPFLAGS.target.c += \
+ -DGALLIUM_NOUVEAU
+.endif # ${BUILD_NOUVEAU} == 1
+
CWARNFLAGS.clang+= -Wno-error=constant-conversion \
-Wno-error=tautological-constant-out-of-range-compare \
-Wno-error=pointer-sign \
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Wed Dec 14 10:46:12 UTC 2016 Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c Log Message: Fix ip[46]csum-tx doesn't work other than TCP and UDP. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/ixgbe/ix_txrx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ixgbe/ix_txrx.c diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.10 src/sys/dev/pci/ixgbe/ix_txrx.c:1.11 --- src/sys/dev/pci/ixgbe/ix_txrx.c:1.10 Mon Dec 5 08:50:29 2016 +++ src/sys/dev/pci/ixgbe/ix_txrx.c Wed Dec 14 10:46:12 2016 @@ -59,7 +59,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ /*$FreeBSD: head/sys/dev/ixgbe/ix_txrx.c 301538 2016-06-07 04:51:50Z sephe $*/ -/*$NetBSD: ix_txrx.c,v 1.10 2016/12/05 08:50:29 msaitoh Exp $*/ +/*$NetBSD: ix_txrx.c,v 1.11 2016/12/14 10:46:12 msaitoh Exp $*/ #include "opt_inet.h" #include "opt_inet6.h" @@ -840,6 +840,7 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr, break; #endif default: + offload = false; break; } @@ -863,6 +864,9 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr, else offload = false; break; + default: + offload = false; + break; } if (offload) /* Insert L4 checksum into data descriptors */
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: snj Date: Wed Dec 14 08:22:33 UTC 2016 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: 1324 To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.12 src/doc/CHANGES-7.0.3:1.1.2.13 --- src/doc/CHANGES-7.0.3:1.1.2.12 Tue Dec 13 07:35:08 2016 +++ src/doc/CHANGES-7.0.3 Wed Dec 14 08:22:33 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.12 2016/12/13 07:35:08 snj Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.13 2016/12/14 08:22:33 snj Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -172,6 +172,7 @@ lib/libc/time/zic.cpatch [kre, ticket #1323] distrib/sets/lists/base/mi 1.1125, 1.1128, 1.1132, 1.1137, 1.1139, 1.1140 +doc/3RDPARTY patch external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.3 external/public-domain/tz/dist/LICENSE up to 1.1.1.2 external/public-domain/tz/dist/Makefile up to 1.1.1.16
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: snj Date: Wed Dec 14 08:21:39 UTC 2016 Modified Files: src/doc [netbsd-7-0]: 3RDPARTY Log Message: Apply patch (requested by kre in ticket #1324): Update tz info. To generate a diff of this commit: cvs rdiff -u -r1.1145.2.18.2.10 -r1.1145.2.18.2.11 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1145.2.18.2.10 src/doc/3RDPARTY:1.1145.2.18.2.11 --- src/doc/3RDPARTY:1.1145.2.18.2.10 Sat Nov 5 17:47:29 2016 +++ src/doc/3RDPARTY Wed Dec 14 08:21:38 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1145.2.18.2.10 2016/11/05 17:47:29 martin Exp $ +# $NetBSD: 3RDPARTY,v 1.1145.2.18.2.11 2016/12/14 08:21:38 snj Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1300,15 +1300,15 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2014j / tzdata2015f -Current Vers: tzcode2015b / tzdata2015f +Version: tzcode2014j (+ upgraded zic) / tzdata2016j +Current Vers: tzcode2016j / tzdata2016j Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Old Archive Site: ftp://elsie.nci.nih.gov/pub/ Home Page: http://www.iana.org/time-zones Mailing List: t...@iana.org -Responsible: kleink, christos, apb +Responsible: kleink, christos, kre License: Public domain Location: lib/libc/time/zoneinfo, external/public-domain/tz/share Notes:
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed Dec 14 08:21:17 UTC 2016 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: update 1324 To generate a diff of this commit: cvs rdiff -u -r1.1.2.131 -r1.1.2.132 src/doc/CHANGES-7.1 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-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.131 src/doc/CHANGES-7.1:1.1.2.132 --- src/doc/CHANGES-7.1:1.1.2.131 Tue Dec 13 07:34:53 2016 +++ src/doc/CHANGES-7.1 Wed Dec 14 08:21:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.131 2016/12/13 07:34:53 snj Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.132 2016/12/14 08:21:17 snj Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -7543,6 +7543,7 @@ lib/libc/time/zic.cpatch [kre, ticket #1323] distrib/sets/lists/base/mi 1.1125, 1.1128, 1.1132, 1.1137, 1.1139, 1.1140 +doc/3RDPARTY patch external/public-domain/tz/dist/CONTRIBUTING up to 1.1.1.3 external/public-domain/tz/dist/LICENSE up to 1.1.1.2 external/public-domain/tz/dist/Makefile up to 1.1.1.16
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed Dec 14 08:20:42 UTC 2016 Modified Files: src/doc [netbsd-7]: 3RDPARTY Log Message: Apply patch (requested by kre in ticket #1324): Update tz info. To generate a diff of this commit: cvs rdiff -u -r1.1145.2.31 -r1.1145.2.32 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1145.2.31 src/doc/3RDPARTY:1.1145.2.32 --- src/doc/3RDPARTY:1.1145.2.31 Sat Nov 5 17:54:05 2016 +++ src/doc/3RDPARTY Wed Dec 14 08:20:41 2016 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1145.2.31 2016/11/05 17:54:05 martin Exp $ +# $NetBSD: 3RDPARTY,v 1.1145.2.32 2016/12/14 08:20:41 snj Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1300,15 +1300,15 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2014j / tzdata2015f -Current Vers: tzcode2015b / tzdata2015f +Version: tzcode2014j (+ upgraded zic) / tzdata2016j +Current Vers: tzcode2016j / tzdata2016j Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Old Archive Site: ftp://elsie.nci.nih.gov/pub/ Home Page: http://www.iana.org/time-zones Mailing List: t...@iana.org -Responsible: kleink, christos, apb +Responsible: kleink, christos, kre License: Public domain Location: lib/libc/time/zoneinfo, external/public-domain/tz/share Notes:
