CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Thu Sep 8 05:52:56 UTC 2022
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make: list comparison operators in declaration order
This allows a tiny optimization in the switch statement.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.336 -r1.337 src/usr.bin/make/cond.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/make/cond.c
diff -u src/usr.bin/make/cond.c:1.336 src/usr.bin/make/cond.c:1.337
--- src/usr.bin/make/cond.c:1.336 Sun Sep 4 22:55:00 2022
+++ src/usr.bin/make/cond.c Thu Sep 8 05:52:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.336 2022/09/04 22:55:00 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.337 2022/09/08 05:52:56 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -95,7 +95,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.336 2022/09/04 22:55:00 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.337 2022/09/08 05:52:56 rillig Exp $");
/*
* Conditional expressions conform to this grammar:
@@ -570,10 +570,10 @@ EvalCompareNum(double lhs, ComparisonOp
return lhs > rhs;
case GE:
return lhs >= rhs;
- case NE:
- return lhs != rhs;
- default:
+ case EQ:
return lhs == rhs;
+ default:
+ return lhs != rhs;
}
}
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Thu Sep 8 05:52:56 UTC 2022 Modified Files: src/usr.bin/make: cond.c Log Message: make: list comparison operators in declaration order This allows a tiny optimization in the switch statement. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.336 -r1.337 src/usr.bin/make/cond.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Thu Sep 8 05:43:20 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: cond-cmp-unary.mk
Log Message:
tests/make: document an edge case in evaluating conditionals
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/cond-cmp-unary.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/cond-cmp-unary.mk
diff -u src/usr.bin/make/unit-tests/cond-cmp-unary.mk:1.2 src/usr.bin/make/unit-tests/cond-cmp-unary.mk:1.3
--- src/usr.bin/make/unit-tests/cond-cmp-unary.mk:1.2 Wed Nov 11 07:30:11 2020
+++ src/usr.bin/make/unit-tests/cond-cmp-unary.mk Thu Sep 8 05:43:20 2022
@@ -1,11 +1,11 @@
-# $NetBSD: cond-cmp-unary.mk,v 1.2 2020/11/11 07:30:11 rillig Exp $
+# $NetBSD: cond-cmp-unary.mk,v 1.3 2022/09/08 05:43:20 rillig Exp $
#
# Tests for unary comparisons in .if conditions, that is, comparisons with
# a single operand. If the operand is a number, it is compared to zero,
# if it is a string, it is tested for emptiness.
-# The number 0 evaluates to false.
-.if 0
+# The number 0 in all its various representations evaluates to false.
+.if 0 || 0.0 || 0e0 || 0.0e0 || 0.0e10
. error
.endif
@@ -55,4 +55,20 @@
. error
.endif
+# The condition '${VAR:M*}' is almost equivalent to '${VAR:M*} != ""'. The
+# only case where they differ is for a single word whose numeric value is zero.
+.if ${:U0:M*}
+. error
+.endif
+.if ${:U0:M*} == ""
+. error
+.endif
+# Multiple words cannot be parsed as a single number, thus evaluating to true.
+.if !${:U0 0:M*}
+. error
+.endif
+.if ${:U0 0:M*} == ""
+. error
+.endif
+
all: # nothing
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Thu Sep 8 05:43:20 UTC 2022 Modified Files: src/usr.bin/make/unit-tests: cond-cmp-unary.mk Log Message: tests/make: document an edge case in evaluating conditionals To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/cond-cmp-unary.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets
Module Name:src
Committed By: rillig
Date: Thu Sep 8 05:26:34 UTC 2022
Modified Files:
src/distrib/sets: sets.subr
Log Message:
distrib/sets/sets.subr: remove trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 src/distrib/sets/sets.subr
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/sets.subr
diff -u src/distrib/sets/sets.subr:1.202 src/distrib/sets/sets.subr:1.203
--- src/distrib/sets/sets.subr:1.202 Sun Aug 21 07:10:03 2022
+++ src/distrib/sets/sets.subr Thu Sep 8 05:26:34 2022
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.202 2022/08/21 07:10:03 lukem Exp $
+# $NetBSD: sets.subr,v 1.203 2022/09/08 05:26:34 rillig Exp $
#
#
@@ -12,7 +12,7 @@
# stlib static library format (a.out, elf)
#
# The following variables are exported to the environment:
-# MACHINE
+# MACHINE
# MACHINE_ARCH
# MACHINE_CPU
# HAVE_ACPI
@@ -185,12 +185,12 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
#
# list_set_files setfile [...]
-#
+#
# Produce a packing list for setfile(s).
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.202 2022/08/21 07:10:03 lukem Exp $
+# # $NetBSD: sets.subr,v 1.203 2022/09/08 05:26:34 rillig Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -211,7 +211,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# make -f mkvars.mk mkvarsyesno
#
# These MK variables can be used as selectors in the sets as .
-#
+#
# The following extra keywords are also available, listed by:
#
# make -f mkvars.mk mkextravars
@@ -239,7 +239,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
#
#3. Finally:
# dummy dummy entry (ignored)
-# obsolete file is obsolete, and only printed if
+# obsolete file is obsolete, and only printed if
#${obsolete} != 0
#
# solaris ${MKDTRACE} != no or ${MKZFS} != no or ${MKCTF} != no
@@ -292,7 +292,7 @@ list_set_files()
BEGIN {
if (obsolete)
wanted["obsolete"] = 1
-
+
split("'"${MKVARS}"'", needvars)
doingcompat = 0
doingcompattests = 0
@@ -309,7 +309,7 @@ list_set_files()
sub(/^have_/, "", kw)
sub(/^target_endianness/, "endian", kw)
if (nv != "HAVE_GCC" && nv != "HAVE_GDB" && ENVIRON[nv] != "no" && nv != "COMPATARCHDIRS" && nv != "KMODARCHDIRS") {
- wanted[kw] = 1
+ wanted[kw] = 1
}
}
@@ -336,7 +336,7 @@ list_set_files()
kmodprefix = "./stand/"
kmodpat = kmodprefix ENVIRON["MACHINE"]
l_kmodpat = length(kmodpat)
-kmoddbprefix = "./usr/libdata/debug/stand/"
+kmoddbprefix = "./usr/libdata/debug/stand/"
kmoddbpat = kmoddbprefix ENVIRON["MACHINE"]
l_kmoddbpat = length(kmoddbpat)
}
@@ -394,7 +394,7 @@ list_set_files()
delete list [substr($1, 2)];
next;
}
-
+
NF > 2 && $3 != "-" {
if (notwanted[$1] != "")
@@ -513,7 +513,7 @@ list_set_files()
#
# list_set_lists setname
-#
+#
# Print to stdout a list of files, one filename per line, which
# concatenate to create the packing list for setname. E.g.,
#
CVS commit: src/distrib/sets
Module Name:src Committed By: rillig Date: Thu Sep 8 05:26:34 UTC 2022 Modified Files: src/distrib/sets: sets.subr Log Message: distrib/sets/sets.subr: remove trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.202 -r1.203 src/distrib/sets/sets.subr Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: rillig Date: Thu Sep 8 05:16:46 UTC 2022 Modified Files: src/distrib/sets/lists/base: md.bebox md.emips md.evbmips md.hpcmips md.hppa md.i386 md.landisk md.mac68k md.macppc md.mipsco md.newsmips md.next68k md.ofppc md.pmax md.rs6000 md.sandpoint md.sbmips md.sgimips md.sparc md.sparc64 md.sun3 md.vax Log Message: distrib/sets: remove trailing empty lines To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/base/md.bebox cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base/md.emips \ src/distrib/sets/lists/base/md.hppa src/distrib/sets/lists/base/md.rs6000 cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base/md.evbmips cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/base/md.hpcmips \ src/distrib/sets/lists/base/md.next68k \ src/distrib/sets/lists/base/md.sgimips cvs rdiff -u -r1.156 -r1.157 src/distrib/sets/lists/base/md.i386 cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base/md.landisk \ src/distrib/sets/lists/base/md.mipsco cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/base/md.mac68k cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/base/md.macppc cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base/md.newsmips cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/base/md.ofppc cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/base/md.pmax cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/base/md.sandpoint cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base/md.sbmips cvs rdiff -u -r1.85 -r1.86 src/distrib/sets/lists/base/md.sparc cvs rdiff -u -r1.256 -r1.257 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/base/md.sun3 cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/base/md.vax 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/md.bebox diff -u src/distrib/sets/lists/base/md.bebox:1.23 src/distrib/sets/lists/base/md.bebox:1.24 --- src/distrib/sets/lists/base/md.bebox:1.23 Sun Jan 9 18:11:09 2022 +++ src/distrib/sets/lists/base/md.bebox Thu Sep 8 05:16:45 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.bebox,v 1.23 2022/01/09 18:11:09 martin Exp $ +# $NetBSD: md.bebox,v 1.24 2022/09/08 05:16:45 rillig Exp $ ./dev/pms0 base-obsolete obsolete ./usr/mdec/boot base-sysutil-root ./usr/mdec/boot_com0base-sysutil-root @@ -9,4 +9,3 @@ ./usr/share/sysinst/catalog/sysinstmsgs.es base-util-share ./usr/share/sysinst/catalog/sysinstmsgs.fr base-util-share ./usr/share/sysinst/catalog/sysinstmsgs.pl base-util-share - Index: src/distrib/sets/lists/base/md.emips diff -u src/distrib/sets/lists/base/md.emips:1.4 src/distrib/sets/lists/base/md.emips:1.5 --- src/distrib/sets/lists/base/md.emips:1.4 Sun Jan 9 18:11:09 2022 +++ src/distrib/sets/lists/base/md.emips Thu Sep 8 05:16:45 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.emips,v 1.4 2022/01/09 18:11:09 martin Exp $ +# $NetBSD: md.emips,v 1.5 2022/09/08 05:16:45 rillig Exp $ # ./boot.emips base-sysutil-bin ./usr/mdec/boot.emipsbase-sysutil-bin @@ -9,4 +9,3 @@ ./usr/share/sysinst/catalog/sysinstmsgs.es base-util-share ./usr/share/sysinst/catalog/sysinstmsgs.fr base-util-share ./usr/share/sysinst/catalog/sysinstmsgs.pl base-util-share - Index: src/distrib/sets/lists/base/md.hppa diff -u src/distrib/sets/lists/base/md.hppa:1.4 src/distrib/sets/lists/base/md.hppa:1.5 --- src/distrib/sets/lists/base/md.hppa:1.4 Sun Jan 9 18:11:09 2022 +++ src/distrib/sets/lists/base/md.hppa Thu Sep 8 05:16:45 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.hppa,v 1.4 2022/01/09 18:11:09 martin Exp $ +# $NetBSD: md.hppa,v 1.5 2022/09/08 05:16:45 rillig Exp $ ./usr/mdec/bootbase-sysutil-bin ./usr/mdec/cdboot base-sysutil-bin ./usr/mdec/mkboot base-sysutil-bin @@ -8,4 +8,3 @@ ./usr/share/sysinst/catalog/sysinstmsgs.es base-util-share ./usr/share/sysinst/catalog/sysinstmsgs.fr base-util-share ./usr/share/sysinst/catalog/sysinstmsgs.pl base-util-share - Index: src/distrib/sets/lists/base/md.rs6000 diff -u src/distrib/sets/lists/base/md.rs6000:1.4 src/distrib/sets/lists/base/md.rs6000:1.5 --- src/distrib/sets/lists/base/md.rs6000:1.4 Sun Jan 9 18:11:09 2022 +++ src/distrib/sets/lists/base/md.rs6000 Thu Sep 8 05:16:45 2022 @@ -1,8 +1,7 @@ -# $NetBSD: md.rs6000,v 1.4 2022/01/09 18:11:09 martin Exp $ +# $NetBSD: md.rs6000,v 1.5 2022/09/08 05:16:45 rillig Exp $ ./usr/mdec/boot base-sysutil-bin ./usr/mdec/mkbootimagebase-sysutil-bin ./usr/share/sysinst/catalog/sysinstmsgs.de base-util-share ./usr/share/sysinst/catalog/sysinstmsgs.es base-util-share ./usr/share/sysinst/catalog/sysinstmsgs.fr base-util-share ./usr/share/sysinst/catalog/sysinstmsgs.pl base-util-share - Index: src/distrib/sets/lists/base/md.evbmips diff -u src/distrib/sets/lists/base/md.evbmips:1.5 src/distrib/sets/lists/base/md.evbmips:1.6 --- src/distrib/sets/lists/base/md.evbmips:1.5 Mon Jan 10
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: rillig Date: Thu Sep 8 05:16:46 UTC 2022 Modified Files: src/distrib/sets/lists/base: md.bebox md.emips md.evbmips md.hpcmips md.hppa md.i386 md.landisk md.mac68k md.macppc md.mipsco md.newsmips md.next68k md.ofppc md.pmax md.rs6000 md.sandpoint md.sbmips md.sgimips md.sparc md.sparc64 md.sun3 md.vax Log Message: distrib/sets: remove trailing empty lines To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/base/md.bebox cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base/md.emips \ src/distrib/sets/lists/base/md.hppa src/distrib/sets/lists/base/md.rs6000 cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/base/md.evbmips cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/base/md.hpcmips \ src/distrib/sets/lists/base/md.next68k \ src/distrib/sets/lists/base/md.sgimips cvs rdiff -u -r1.156 -r1.157 src/distrib/sets/lists/base/md.i386 cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base/md.landisk \ src/distrib/sets/lists/base/md.mipsco cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/base/md.mac68k cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/base/md.macppc cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base/md.newsmips cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/base/md.ofppc cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/base/md.pmax cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/base/md.sandpoint cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base/md.sbmips cvs rdiff -u -r1.85 -r1.86 src/distrib/sets/lists/base/md.sparc cvs rdiff -u -r1.256 -r1.257 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/base/md.sun3 cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/base/md.vax Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: rillig Date: Thu Sep 8 05:16:20 UTC 2022 Modified Files: src/distrib/sets/lists/base: md.ia64 Log Message: distrib/sets: fix typo in comment To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base/md.ia64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: rillig Date: Thu Sep 8 05:16:20 UTC 2022 Modified Files: src/distrib/sets/lists/base: md.ia64 Log Message: distrib/sets: fix typo in comment To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base/md.ia64 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/md.ia64 diff -u src/distrib/sets/lists/base/md.ia64:1.2 src/distrib/sets/lists/base/md.ia64:1.3 --- src/distrib/sets/lists/base/md.ia64:1.2 Wed Jan 12 15:35:51 2022 +++ src/distrib/sets/lists/base/md.ia64 Thu Sep 8 05:16:20 2022 @@ -1,8 +1,8 @@ -# $NetBSD: md.ia64,v 1.2 2022/01/12 15:35:51 martin Exp $ +# $NetBSD: md.ia64,v 1.3 2022/09/08 05:16:20 rillig Exp $ # # XXX add skiload for now # -# XXX loader.sym probaby not necessary +# XXX loader.sym probably not necessary # ./usr/mdec/loader.efi base-sysutil-bin ./usr/mdec/loader.sym base-sysutil-bin
CVS commit: src/distrib/sets
Module Name:src
Committed By: rillig
Date: Thu Sep 8 05:05:08 UTC 2022
Modified Files:
src/distrib/sets: fmt-list
Log Message:
distrib/sets/fmt-list: clean up string formatting
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/fmt-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/fmt-list
diff -u src/distrib/sets/fmt-list:1.5 src/distrib/sets/fmt-list:1.6
--- src/distrib/sets/fmt-list:1.5 Mon Feb 15 23:46:46 2021
+++ src/distrib/sets/fmt-list Thu Sep 8 05:05:08 2022
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: fmt-list,v 1.5 2021/02/15 23:46:46 rillig Exp $
+-- $NetBSD: fmt-list,v 1.6 2022/09/08 05:05:08 rillig Exp $
--[[
@@ -18,7 +18,7 @@ end
local function assert_equals(got, expected)
if got ~= expected then
-assert(false, string.format("got %q, expected %q", got, expected))
+assert(false, ("got %q, expected %q"):format(got, expected))
end
end
@@ -28,7 +28,7 @@ end
local function tabwidth(str)
local width = 0
for i = 1, #str do
-if string.sub(str, i, i) == "\t" then
+if str:sub(i, i) == "\t" then
width = width // 8 * 8 + 8
else
width = width + 1
@@ -51,9 +51,9 @@ end)
-- of the string to the desired width.
local function tabs(str, width)
local strwidth = tabwidth(str)
- local tabs = string.rep("\t", (width - strwidth + 7) // 8)
+ local tabs = ("\t"):rep((width - strwidth + 7) // 8)
if tabs == "" then
-error(string.format("%q\t%d\t%d", str, strwidth, width))
+error(("%q\t%d\t%d"):format(str, strwidth, width))
end
assert(tabs ~= "")
return tabs
@@ -96,7 +96,7 @@ test(function()
items,
function(item) return item[1] end,
function(group, key)
- result = result .. string.format("%d %s\n", #group, key)
+ result = result .. ("%d %s\n"):format(#group, key)
end)
assert_equals(result, "2 prime\n1 not prime\n2 prime\n")
end)
@@ -294,8 +294,8 @@ local function add_tabs(entries)
column(entries, width_before_category, "category_col")
local flags_col = column(entries, width_before_flags, "flags_col")
- -- To avoid horizontal jumps for the column, the minimum column is set
- -- to 56. This way, the third column is usually set to 72, which is
+ -- To avoid horizontal jumps for the category column, the minimum column is
+ -- set to 56. This way, the third column is usually set to 72, which is
-- still visible on an 80-column screen.
if category_aligned == "unaligned" then
category_col = max(category_col, 56)
@@ -378,8 +378,7 @@ local function read_list(fname)
elseif line:match("^#") then
table.insert(head, line)
else
- local msg = string.format(
-"%s:%d: unknown line format %q", fname, lineno, line)
+ local msg = ("%s:%d: unknown line format %q"):format(fname, lineno, line)
table.insert(errors, msg)
end
end
@@ -415,7 +414,7 @@ local function write_list(fname, head, e
prev_line = line
f:write(line, "\n")
else
- --print(string.format("%s: duplicate entry: %s", fname, line))
+ --print(("%s: duplicate entry: %s"):format(fname, line))
end
end
CVS commit: src/distrib/sets
Module Name:src Committed By: rillig Date: Thu Sep 8 05:05:08 UTC 2022 Modified Files: src/distrib/sets: fmt-list Log Message: distrib/sets/fmt-list: clean up string formatting No functional change. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/fmt-list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Sep 8 02:40:10 UTC 2022 Modified Files: src/sys/dev/pci: if_wm.c Log Message: KNF. Modify comment. No fucntional change. To generate a diff of this commit: cvs rdiff -u -r1.763 -r1.764 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Sep 8 02:40:10 UTC 2022
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
KNF. Modify comment. No fucntional change.
To generate a diff of this commit:
cvs rdiff -u -r1.763 -r1.764 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.763 src/sys/dev/pci/if_wm.c:1.764
--- src/sys/dev/pci/if_wm.c:1.763 Fri Aug 12 10:59:42 2022
+++ src/sys/dev/pci/if_wm.c Thu Sep 8 02:40:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.763 2022/08/12 10:59:42 riastradh Exp $ */
+/* $NetBSD: if_wm.c,v 1.764 2022/09/08 02:40:10 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.763 2022/08/12 10:59:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.764 2022/09/08 02:40:10 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@@ -891,7 +891,7 @@ static void wm_start_locked(struct ifnet
static int wm_transmit(struct ifnet *, struct mbuf *);
static void wm_transmit_locked(struct ifnet *, struct wm_txqueue *);
static void wm_send_common_locked(struct ifnet *, struct wm_txqueue *,
- bool);
+bool);
static void wm_nq_tx_offload(struct wm_softc *, struct wm_txqueue *,
struct wm_txsoft *, uint32_t *, uint32_t *, bool *);
static void wm_nq_start(struct ifnet *);
@@ -899,7 +899,7 @@ static void wm_nq_start_locked(struct if
static int wm_nq_transmit(struct ifnet *, struct mbuf *);
static void wm_nq_transmit_locked(struct ifnet *, struct wm_txqueue *);
static void wm_nq_send_common_locked(struct ifnet *, struct wm_txqueue *,
- bool);
+bool);
static void wm_deferred_start_locked(struct wm_txqueue *);
static void wm_handle_queue(void *);
static void wm_handle_queue_work(struct work *, void *);
@@ -2289,7 +2289,7 @@ alloc_retry:
aprint_error_dev(sc->sc_dev,
"unable to find PCIX capability\n");
else if (sc->sc_type != WM_T_82545_3 &&
- sc->sc_type != WM_T_82546_3) {
+ sc->sc_type != WM_T_82546_3) {
/*
* Work around a problem caused by the BIOS
* setting the max memory read byte count
@@ -3703,7 +3703,7 @@ wm_watchdog_txq_locked(struct ifnet *ifp
if_statinc(ifp, if_oerrors);
#ifdef WM_DEBUG
for (i = txq->txq_sdirty; i != txq->txq_snext;
- i = WM_NEXTTXS(txq, i)) {
+ i = WM_NEXTTXS(txq, i)) {
txs = >txq_soft[i];
printf("txs %d tx %d -> %d\n",
i, txs->txs_firstdesc, txs->txs_lastdesc);
@@ -3857,9 +3857,9 @@ wm_tick(void *arg)
if_statadd_ref(nsr, if_ierrors,
crcerrs + algnerrc + symerrc + rxerrc + sec + cexterr + rlec);
/*
- * WMREG_RNBC is incremented when there are no available buffers in host
- * memory. It does not mean the number of dropped packets, because an
- * Ethernet controller can receive packets in such case if there is
+ * WMREG_RNBC is incremented when there are no available buffers in
+ * host memory. It does not mean the number of dropped packets, because
+ * an Ethernet controller can receive packets in such case if there is
* space in the phy's FIFO.
*
* If you want to know the nubmer of WMREG_RMBC, you should use such as
@@ -4069,8 +4069,8 @@ wm_ioctl(struct ifnet *ifp, u_long cmd,
mutex_enter(sc->sc_core_lock);
if (sc->sc_if_flags & IFF_RUNNING) {
/*
- * Multicast list has changed; set the hardware filter
- * accordingly.
+ * Multicast list has changed; set the
+ * hardware filter accordingly.
*/
wm_set_filter(sc);
}
@@ -4168,7 +4168,7 @@ wm_read_mac_addr(struct wm_softc *sc, ui
return 0;
- bad:
+bad:
return -1;
}
@@ -4458,10 +4458,10 @@ wm_set_filter(struct wm_softc *sc)
goto setit;
- allmulti:
+allmulti:
sc->sc_rctl |= RCTL_MPE;
- setit:
+setit:
if (sc->sc_type >= WM_T_PCH2) {
if (((ec->ec_capabilities & ETHERCAP_JUMBO_MTU) != 0)
&& (ifp->if_mtu > ETHERMTU))
@@ -4852,7 +4852,8 @@ wm_init_lcd_from_nvm(struct wm_softc *sc
* LCD Write Enable bits are set in the NVM. When both NVM bits
* are cleared, SW will configure them instead.
*/
- DPRINTF(sc, WM_DEBUG_INIT, ("%s: %s: Configure SMBus and LED\n",
+ DPRINTF(sc, WM_DEBUG_INIT,
+ ("%s: %s: Configure SMBus and LED\n",
device_xname(sc->sc_dev), __func__));
if ((rv = wm_write_smbus_addr(sc)) != 0)
goto release;
@@ -5163,15 +5164,15 @@ wm_initialize_hardware_bits(struct wm_so
CSR_WRITE(sc, WMREG_TARC0, tarc0);
switch (sc->sc_type) {
- /*
- * 8257[12] Errata No.52, 82573 Errata No.43 and some others.
- * Avoid RSS Hash Value bug.
- */
case WM_T_82571:
case WM_T_82572:
case WM_T_82573:
case WM_T_80003:
case WM_T_ICH8:
+ /*
+ * 8257[12] Errata No.52, 82573 Errata No.43 and some
+ * others to avoid RSS Hash Value bug.
+ */
reg
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Sep 7 23:34:56 UTC 2022 Modified Files: src/usr.bin/make: make.1 Log Message: make.1: clean up style, grammar, punctuation, improve clarity To generate a diff of this commit: cvs rdiff -u -r1.335 -r1.336 src/usr.bin/make/make.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/make/make.1 diff -u src/usr.bin/make/make.1:1.335 src/usr.bin/make/make.1:1.336 --- src/usr.bin/make/make.1:1.335 Wed Sep 7 22:57:43 2022 +++ src/usr.bin/make/make.1 Wed Sep 7 23:34:56 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.335 2022/09/07 22:57:43 rillig Exp $ +.\" $NetBSD: make.1,v 1.336 2022/09/07 23:34:56 rillig Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -86,7 +86,7 @@ The options are as follows: .Bl -tag -width Ds .It Fl B Try to be backwards compatible by executing a single shell per command and -by executing the commands to make the sources of a dependency line in sequence. +by making the sources of a dependency line in sequence. .It Fl C Ar directory Change to .Ar directory @@ -127,14 +127,14 @@ equivalent to specifying all of the debu .It Cm a Print debugging information about archive searching and caching. .It Cm C -Print debugging information about current working directory. +Print debugging information about the current working directory. .It Cm c Print debugging information about conditional evaluation. .It Cm d Print debugging information about directory searching and caching. .It Cm e Print debugging information about failed commands and targets. -.It Cm F Ns Oo \&+ Oc Ns Ar filename +.It Cm F Ns Oo Cm \&+ Oc Ns Ar filename Specify where debugging output is written. This must be the last flag, because it consumes the remainder of the argument. @@ -221,8 +221,8 @@ Print debugging information about target .It Cm V Force the .Fl V -option to print raw values of variables, overriding the default behavior -set via +option to print raw values of variables, +overriding the default behavior set via .Va .MAKE.EXPAND_VARIABLES . .It Cm v Print debugging information about variable assignment and expansion. @@ -232,8 +232,7 @@ Run shell commands with so the actual commands are printed as they are executed. .El .It Fl e -Specify that environment variables override macro assignments within -makefiles. +Let environment variables override global variables within makefiles. .It Fl f Ar makefile Specify a makefile to read instead of the default .Sq Pa makefile . @@ -294,13 +293,13 @@ The option can be used multiple times to form a search path. This path overrides the default system include path .Pa /usr/share/mk . -Furthermore the system include path is appended to the search path used for +Furthermore, the system include path is appended to the search path used for .Li \*q Ns Ar file Ns Li \*q Ns -style include statements (see the .Fl I option). .Pp -If a file or directory name in the +If a directory name in the .Fl m argument (or the .Ev MAKESYSPATH @@ -309,14 +308,14 @@ environment variable) starts with the st .Nm searches for the specified file or directory named in the remaining part of the argument string. -The search starts with the current directory of -the Makefile and then works upward towards the root of the file system. +The search starts with the current directory +and then works upward towards the root of the file system. If the search is successful, the resulting directory replaces the .Ql \&.../ specification in the .Fl m argument. -If used, this feature allows +This feature allows .Nm to easily search in the current source tree for customized .Pa sys.mk @@ -325,16 +324,18 @@ files (e.g., by using as an argument). .It Fl n Display the commands that would have been executed, but do not -actually execute them unless the target depends on the .MAKE special -source (see below) or the command is prefixed with -.Sq Ic + . +actually execute them unless the target depends on the +.Va .MAKE +special source (see below) or the command is prefixed with +.Sq Cm + . .It Fl N -Display the commands which would have been executed, but do not -actually execute any of them; useful for debugging top-level makefiles +Display the commands that would have been executed, +but do not actually execute any of them; +useful for debugging top-level makefiles without descending into subdirectories. .It Fl q -Do not execute any commands, but exit 0 if the specified targets are -up-to-date, and 1 otherwise. +Do not execute any commands, +instead exit 0 if the specified targets are up to date, and 1 otherwise. .It Fl r Do not use the built-in rules specified in the system makefile. .It Fl S @@ -420,12 +421,12 @@ Variable assignments should follow optio but no ordering is enforced. .El .Pp -There are seven different types of lines in a
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Sep 7 23:34:56 UTC 2022 Modified Files: src/usr.bin/make: make.1 Log Message: make.1: clean up style, grammar, punctuation, improve clarity To generate a diff of this commit: cvs rdiff -u -r1.335 -r1.336 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Sep 7 22:57:43 UTC 2022 Modified Files: src/usr.bin/make: make.1 Log Message: make.1: remove redundant 'then' from conditional sentences. To generate a diff of this commit: cvs rdiff -u -r1.334 -r1.335 src/usr.bin/make/make.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/make/make.1 diff -u src/usr.bin/make/make.1:1.334 src/usr.bin/make/make.1:1.335 --- src/usr.bin/make/make.1:1.334 Wed Sep 7 22:36:48 2022 +++ src/usr.bin/make/make.1 Wed Sep 7 22:57:43 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.334 2022/09/07 22:36:48 rillig Exp $ +.\" $NetBSD: make.1,v 1.335 2022/09/07 22:57:43 rillig Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -116,7 +116,7 @@ but this can be changed using the debugging flag. The debugging output is always unbuffered; in addition, if debugging is enabled but debugging output is not directed to standard output, -then the standard output is line buffered. +the standard output is line buffered. The available .Ar flags are: @@ -142,7 +142,7 @@ If the character immediately after the .Cm F flag is .Ql \&+ , -then the file is opened in append mode; +the file is opened in append mode; otherwise the file is overwritten. If the file name is .Ql stdout @@ -648,7 +648,7 @@ If the variable name contains only a sin the surrounding curly braces or parentheses are not required. This shorter form is not recommended. .Pp -If the variable name contains a dollar, then the name itself is expanded first. +If the variable name contains a dollar, the name itself is expanded first. This allows almost arbitrary variable names, however names containing dollar, braces, parentheses, or whitespace are really best avoided. .Pp @@ -983,11 +983,13 @@ to a value which represents True. .It Pa missing-meta= Ar bf If .Va bf -is True, then a missing .meta file makes the target out-of-date. +is True, a missing +.Pa .meta +file makes the target out-of-date. .It Pa missing-filemon= Ar bf If .Va bf -is True, then missing filemon data makes the target out-of-date. +is True, missing filemon data makes the target out-of-date. .It Pa nofilemon Do not use .Xr filemon 4 . @@ -1229,7 +1231,7 @@ to the canonical path given by .Xr getcwd 3 . However, if the environment variable .Sq Ev PWD -is set and gives a path to the current directory, then +is set and gives a path to the current directory, .Nm sets .Sq Va .CURDIR @@ -1418,7 +1420,7 @@ This modifier sets the separator to the .Ar c . If .Ar c -is omitted, then no separator is used. +is omitted, no separator is used. The common escapes (including octal numeric codes) work as expected. .It Cm \&:tu Converts variable to upper-case letters. @@ -1450,7 +1452,7 @@ is affected. If a .Ql W is appended to the last delimiter of the pattern, -then the value is treated as a single word +the value is treated as a single word (possibly containing embedded white space). If .Ar old_string @@ -1559,10 +1561,9 @@ If or .Ar new_string do not contain the pattern matching character -.Ql % -then it is assumed that they are -anchored at the end of each word, so only suffixes or entire -words may be replaced. +.Ql % , +it is assumed that they are anchored at the end of each word, +so only suffixes or entire words may be replaced. Otherwise .Ql % is the substring of @@ -1575,13 +1576,13 @@ contains the pattern matching character .Ql % , and .Ar old_string -matches, then the result is the +matches, the result is the .Ar new_string . If only the .Ar new_string contains the pattern matching character .Ql % , -then it is not treated specially and it is printed as a literal +it is not treated specially and it is printed as a literal .Ql % on match. If there is more than one pattern matching character @@ -1661,8 +1662,7 @@ The name of the variable is the value. .It Cm \&:P The path of the node which has the same name as the variable is the value. -If no such node exists or its path is null, then the -name of the variable is used. +If no such node exists or its path is null, the name of the variable is used. In order for this modifier to work, the name (node) must at least have appeared on the rhs of a dependency. .Sm off @@ -1749,12 +1749,13 @@ If .Ar start is greater than .Ar end , -then the words are output in reverse order. +the words are output in reverse order. For example, .Sq Cm \&:[-1..1] selects all the words from last to first. -If the list is already ordered, then this effectively reverses -the list, but it is more efficient to use +If the list is already ordered, +this effectively reverses the list, +but it is more efficient to use .Sq Cm \&:Or instead of .Sq Cm \&:O:[-1..1] . @@ -1810,14 +1811,14 @@ is also accepted. If the include statement is written as .Cm .-include or
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Sep 7 22:57:43 UTC 2022 Modified Files: src/usr.bin/make: make.1 Log Message: make.1: remove redundant 'then' from conditional sentences. To generate a diff of this commit: cvs rdiff -u -r1.334 -r1.335 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Sep 7 22:36:48 UTC 2022 Modified Files: src/usr.bin/make: make.1 Log Message: make.1: use present tense in conditional sentences These sentences are about general, timeless rules, rather than about predictions about the future. To generate a diff of this commit: cvs rdiff -u -r1.333 -r1.334 src/usr.bin/make/make.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/make/make.1 diff -u src/usr.bin/make/make.1:1.333 src/usr.bin/make/make.1:1.334 --- src/usr.bin/make/make.1:1.333 Mon Sep 5 17:13:36 2022 +++ src/usr.bin/make/make.1 Wed Sep 7 22:36:48 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: make.1,v 1.333 2022/09/05 17:13:36 rillig Exp $ +.\" $NetBSD: make.1,v 1.334 2022/09/07 22:36:48 rillig Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 .\" -.Dd September 2, 2022 +.Dd September 7, 2022 .Dt MAKE 1 .Os .Sh NAME @@ -106,10 +106,10 @@ Turn on debugging, and specify which por .Nm are to print debugging information. Unless the flags are preceded by -.Ql \- +.Ql \- , they are added to the .Ev MAKEFLAGS -environment variable and will be processed by any child make processes. +environment variable and are passed on to any child make processes. By default, debugging information is printed to standard error, but this can be changed using the .Cm F @@ -142,21 +142,21 @@ If the character immediately after the .Cm F flag is .Ql \&+ , -then the file will be opened in append mode; -otherwise the file will be overwritten. +then the file is opened in append mode; +otherwise the file is overwritten. If the file name is .Ql stdout or -.Ql stderr -then debugging output will be written to the +.Ql stderr , +debugging output is written to the standard output or standard error output file descriptors respectively (and the .Ql \&+ option has no effect). -Otherwise, the output will be written to the named file. +Otherwise, the output is written to the named file. If the file name ends with -.Ql .%d -then the +.Ql .%d , +the .Ql %d is replaced by the pid. .It Cm f @@ -174,9 +174,8 @@ Print debugging information about hash t Print debugging information about running multiple shells. .It Cm L Turn on lint checks. -This will throw errors for variable assignments that do not parse -correctly, at the time of assignment so the file and line number -are available. +This throws errors for variable assignments that do not parse correctly, +at the time of assignment, so the file and line number are available. .It Cm l Print commands in Makefiles regardless of whether or not they are prefixed by .Ql @ @@ -293,10 +292,9 @@ include statement. The .Fl m option can be used multiple times to form a search path. -This path will override the default system include path +This path overrides the default system include path .Pa /usr/share/mk . -Furthermore the system include path will be appended to the search path used -for +Furthermore the system include path is appended to the search path used for .Li \*q Ns Ar file Ns Li \*q Ns -style include statements (see the .Fl I @@ -307,14 +305,13 @@ If a file or directory name in the argument (or the .Ev MAKESYSPATH environment variable) starts with the string -.Ql \&.../ -then +.Ql \&.../ , .Nm -will search for the specified file or directory named in the remaining part +searches for the specified file or directory named in the remaining part of the argument string. The search starts with the current directory of the Makefile and then works upward towards the root of the file system. -If the search is successful, then the resulting directory replaces the +If the search is successful, the resulting directory replaces the .Ql \&.../ specification in the .Fl m @@ -364,7 +361,7 @@ Print the value of .Ar variable . Do not build any targets. Multiple instances of this option may be specified; -the variables will be printed one per line, +the variables are printed one per line, with a blank line for each null or undefined variable. The value printed is extracted from the global scope after all makefiles have been read. @@ -373,13 +370,12 @@ include additional unexpanded variable r If .Ar variable contains a -.Ql \&$ -then the value will be recursively expanded to its complete resultant +.Ql \&$ , +the value is recursively expanded to its complete resultant text before printing. -The expanded value will also be printed if +The expanded value is also printed if .Va .MAKE.EXPAND_VARIABLES -is set to true and -the +is set to true and the .Fl dV option has not been used to override it. Note that loop-local and target-local variables, as well as values @@ -442,7 +438,7 @@ on the sources and are customarily created from them. A target is considered out-of-date
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Sep 7 22:36:48 UTC 2022 Modified Files: src/usr.bin/make: make.1 Log Message: make.1: use present tense in conditional sentences These sentences are about general, timeless rules, rather than about predictions about the future. To generate a diff of this commit: cvs rdiff -u -r1.333 -r1.334 src/usr.bin/make/make.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: martin Date: Wed Sep 7 11:37:25 UTC 2022 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 Log Message: Comment out emuxki here for now - I don't think they belong here and something else(tm) is wrong with the setup anyway, so better fix the build for now and leave cleanup to somebody else. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.95 -r1.96 src/distrib/sets/lists/modules/md.i386 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.97 src/distrib/sets/lists/modules/md.amd64:1.98 --- src/distrib/sets/lists/modules/md.amd64:1.97 Wed Sep 7 00:29:23 2022 +++ src/distrib/sets/lists/modules/md.amd64 Wed Sep 7 11:37:25 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.97 2022/09/07 00:29:23 khorben Exp $ +# $NetBSD: md.amd64,v 1.98 2022/09/07 11:37:25 martin Exp $ # ./@MODULEDIR@/acpiacadmodules-base-kernel kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod @@ -134,8 +134,8 @@ ./@MODULEDIR@/dtrace_syscall_netbsd32/dtrace_syscall_netbsd32.kmod modules-base-kernel kmod,dtrace ./@MODULEDIR@/emdtvmodules-base-kernel kmod ./@MODULEDIR@/emdtv/emdtv.kmod modules-base-kernel kmod -./@MODULEDIR@/emuxkimodules-base-kernel kmod -./@MODULEDIR@/emuxki/emuxki.kmod modules-base-kernel kmod +#./@MODULEDIR@/emuxkimodules-base-kernel kmod +#./@MODULEDIR@/emuxki/emuxki.kmod modules-base-kernel kmod ./@MODULEDIR@/estmodules-base-kernel kmod ./@MODULEDIR@/est/est.kmod modules-base-kernel kmod ./@MODULEDIR@/exec_elf32 modules-base-kernel kmod Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.95 src/distrib/sets/lists/modules/md.i386:1.96 --- src/distrib/sets/lists/modules/md.i386:1.95 Wed Sep 7 00:29:23 2022 +++ src/distrib/sets/lists/modules/md.i386 Wed Sep 7 11:37:25 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.95 2022/09/07 00:29:23 khorben Exp $ +# $NetBSD: md.i386,v 1.96 2022/09/07 11:37:25 martin Exp $ # ./@MODULEDIR@/acpiacadmodules-base-kernel kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod modules-base-kernel kmod @@ -86,8 +86,8 @@ ./@MODULEDIR@/dtrace_syscall_linux/dtrace_syscall_linux.kmod modules-base-kernel kmod,dtrace ./@MODULEDIR@/emdtvmodules-base-kernel kmod ./@MODULEDIR@/emdtv/emdtv.kmod modules-base-kernel kmod -./@MODULEDIR@/emuxkimodules-base-kernel kmod -./@MODULEDIR@/emuxki/emuxki.kmod modules-base-kernel kmod +#./@MODULEDIR@/emuxkimodules-base-kernel kmod +#./@MODULEDIR@/emuxki/emuxki.kmod modules-base-kernel kmod ./@MODULEDIR@/estmodules-base-kernel kmod ./@MODULEDIR@/est/est.kmod modules-base-kernel kmod ./@MODULEDIR@/exec_aoutmodules-base-kernel kmod
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: martin Date: Wed Sep 7 11:37:25 UTC 2022 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 Log Message: Comment out emuxki here for now - I don't think they belong here and something else(tm) is wrong with the setup anyway, so better fix the build for now and leave cleanup to somebody else. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.95 -r1.96 src/distrib/sets/lists/modules/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: martin Date: Wed Sep 7 11:26:23 UTC 2022 Modified Files: src/sys/modules: Makefile Log Message: Move emuxki from i386/amd64 specific modules to attachment specific modules (effectively disabling it for the build for now, as it needs setlist fixes and breaks the build). To generate a diff of this commit: cvs rdiff -u -r1.270 -r1.271 src/sys/modules/Makefile 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.270 src/sys/modules/Makefile:1.271 --- src/sys/modules/Makefile:1.270 Wed Sep 7 00:29:23 2022 +++ src/sys/modules/Makefile Wed Sep 7 11:26:23 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.270 2022/09/07 00:29:23 khorben Exp $ +# $NetBSD: Makefile,v 1.271 2022/09/07 11:26:23 martin Exp $ .include @@ -225,7 +225,6 @@ SUBDIR+= amdsmn SUBDIR+= amdtemp SUBDIR+= amdzentemp SUBDIR+= coretemp -SUBDIR+= emuxki SUBDIR+= est SUBDIR+= hdafg SUBDIR+= hdaudio @@ -469,6 +468,7 @@ SUBDIR+= ataraid SUBDIR+= cac SUBDIR+= cac_eisa SUBDIR+= cac_pci +SUBDIR+= emuxki SUBDIR+= if_aq SUBDIR+= if_vioif SUBDIR+= if_vmx
CVS commit: src/sys/modules
Module Name:src Committed By: martin Date: Wed Sep 7 11:26:23 UTC 2022 Modified Files: src/sys/modules: Makefile Log Message: Move emuxki from i386/amd64 specific modules to attachment specific modules (effectively disabling it for the build for now, as it needs setlist fixes and breaks the build). To generate a diff of this commit: cvs rdiff -u -r1.270 -r1.271 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: riastradh Date: Wed Sep 7 10:41:34 UTC 2022 Modified Files: src/sys/dev/usb: usbdi.c Log Message: usbdi(9): Fix timeout after non-racy xfer resubmission. Previously we would never clear ux_timeout_set if an xfer timedout, so resubmission of the same xfer later would fail to schedule a callout. To generate a diff of this commit: cvs rdiff -u -r1.243 -r1.244 src/sys/dev/usb/usbdi.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/usbdi.c diff -u src/sys/dev/usb/usbdi.c:1.243 src/sys/dev/usb/usbdi.c:1.244 --- src/sys/dev/usb/usbdi.c:1.243 Sat Aug 20 11:32:20 2022 +++ src/sys/dev/usb/usbdi.c Wed Sep 7 10:41:34 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi.c,v 1.243 2022/08/20 11:32:20 riastradh Exp $ */ +/* $NetBSD: usbdi.c,v 1.244 2022/09/07 10:41:34 riastradh Exp $ */ /* * Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.243 2022/08/20 11:32:20 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.244 2022/09/07 10:41:34 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1683,6 +1683,15 @@ usbd_xfer_probe_timeout(struct usbd_xfer KASSERT(xfer->ux_timeout_set); /* + * After this point, no further timeout probing will happen for + * the current incarnation of the timeout, so make the next + * usbd_xfer_schedule_timout schedule a new callout. + * usbd_xfer_probe_timeout has already processed any reset. + */ + KASSERT(!xfer->ux_timeout_reset); + xfer->ux_timeout_set = false; + + /* * Neither callout nor task may be pending; they execute * alternately in lock step. */
CVS commit: src/sys/dev/usb
Module Name:src Committed By: riastradh Date: Wed Sep 7 10:41:34 UTC 2022 Modified Files: src/sys/dev/usb: usbdi.c Log Message: usbdi(9): Fix timeout after non-racy xfer resubmission. Previously we would never clear ux_timeout_set if an xfer timedout, so resubmission of the same xfer later would fail to schedule a callout. To generate a diff of this commit: cvs rdiff -u -r1.243 -r1.244 src/sys/dev/usb/usbdi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Sep 7 10:10:55 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1759 To generate a diff of this commit: cvs rdiff -u -r1.1.2.145 -r1.1.2.146 src/doc/CHANGES-8.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-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.145 src/doc/CHANGES-8.3:1.1.2.146 --- src/doc/CHANGES-8.3:1.1.2.145 Tue Aug 30 15:40:57 2022 +++ src/doc/CHANGES-8.3 Wed Sep 7 10:10:55 2022 @@ -1,4 +1,4 @@ - $NetBSD: CHANGES-8.3,v 1.1.2.145 2022/08/30 15:40:57 martin Exp $ + $NetBSD: CHANGES-8.3,v 1.1.2.146 2022/09/07 10:10:55 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -2756,3 +2756,21 @@ external/mit/xorg/server/drivers/xf86-vi wsfb(4): disable broken DGA extension for xf86-video-wsfb. [rin, ticket #1758] +sys/dev/pci/if_wm.c1.741-1.749,1.753-1.757, + 1.762 via patch +sys/dev/pci/if_wmreg.h1.126-1.127 + + - Fix I219 workaround in wm_flush_desc_rings(). + - Add more statistics counters. + - To avoid releasing mutex temporally, use new + wm_set_mdio_slow_mode_hv_locked(). + - No functional changes: + - Turn a locking botch (shouldn't drop lock on error) into a KASSERT + in wm_deferred_start_locked(). + - Remove unneeded header inclusion. + - Use __BIT() a little. + - Modify comment and debug messages. + - Consistency use -1 instead of 1 for some error code. + - KNF. + [msaitoh, ticket #1759] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Sep 7 10:10:55 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1759 To generate a diff of this commit: cvs rdiff -u -r1.1.2.145 -r1.1.2.146 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Sep 7 10:09:20 UTC 2022
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c if_wmreg.h
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1759:
sys/dev/pci/if_wm.c 1.741-1.749,1.753-1.757,
1.762 via patch
sys/dev/pci/if_wmreg.h 1.126-1.127
- Fix I219 workaround in wm_flush_desc_rings().
- Add more statistics counters.
- To avoid releasing mutex temporally, use new
wm_set_mdio_slow_mode_hv_locked().
- No functional changes:
- Turn a locking botch (shouldn't drop lock on error) into a KASSERT
in wm_deferred_start_locked().
- Remove unneeded header inclusion.
- Use __BIT() a little.
- Modify comment and debug messages.
- Consistency use -1 instead of 1 for some error code.
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.45 -r1.508.4.46 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.98.6.14 -r1.98.6.15 src/sys/dev/pci/if_wmreg.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.508.4.45 src/sys/dev/pci/if_wm.c:1.508.4.46
--- src/sys/dev/pci/if_wm.c:1.508.4.45 Mon Jul 11 14:15:57 2022
+++ src/sys/dev/pci/if_wm.c Wed Sep 7 10:09:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.508.4.45 2022/07/11 14:15:57 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.508.4.46 2022/09/07 10:09:20 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.45 2022/07/11 14:15:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.46 2022/09/07 10:09:20 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -90,26 +90,24 @@ __KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.
#endif
#include
-#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
#include
-#include
-#include
+#include
#include
-#include
+#include
+#include
+#include
+#include
#include
+#include
+#include
+#include
#include
+#include
+#include
#include
-#include
-
#include
#include
#include
@@ -495,7 +493,7 @@ struct wm_queue {
};
struct wm_phyop {
- int (*acquire)(struct wm_softc *);
+ int (*acquire)(struct wm_softc *) __attribute__((warn_unused_result));
void (*release)(struct wm_softc *);
int (*readreg_locked)(device_t, int, int, uint16_t *);
int (*writereg_locked)(device_t, int, int, uint16_t);
@@ -504,7 +502,7 @@ struct wm_phyop {
};
struct wm_nvmop {
- int (*acquire)(struct wm_softc *);
+ int (*acquire)(struct wm_softc *) __attribute__((warn_unused_result));
void (*release)(struct wm_softc *);
int (*read)(struct wm_softc *, int, int, uint16_t *);
};
@@ -593,12 +591,76 @@ struct wm_softc {
/* Event counters. */
struct evcnt sc_ev_linkintr; /* Link interrupts */
- /* WM_T_82542_2_1 only */
+ /* >= WM_T_82542_2_1 */
struct evcnt sc_ev_tx_xoff; /* Tx PAUSE(!0) frames */
struct evcnt sc_ev_tx_xon; /* Tx PAUSE(0) frames */
struct evcnt sc_ev_rx_xoff; /* Rx PAUSE(!0) frames */
struct evcnt sc_ev_rx_xon; /* Rx PAUSE(0) frames */
struct evcnt sc_ev_rx_macctl; /* Rx Unsupported */
+
+ struct evcnt sc_ev_crcerrs; /* CRC Error */
+ struct evcnt sc_ev_algnerrc; /* Alignment Error */
+ struct evcnt sc_ev_symerrc; /* Symbol Error */
+ struct evcnt sc_ev_rxerrc; /* Receive Error */
+ struct evcnt sc_ev_mpc; /* Missed Packets */
+ struct evcnt sc_ev_colc; /* Collision */
+ struct evcnt sc_ev_sec; /* Sequence Error */
+ struct evcnt sc_ev_cexterr; /* Carrier Extension Error */
+ struct evcnt sc_ev_rlec; /* Receive Length Error */
+ struct evcnt sc_ev_scc; /* Single Collision */
+ struct evcnt sc_ev_ecol; /* Excessive Collision */
+ struct evcnt sc_ev_mcc; /* Multiple Collision */
+ struct evcnt sc_ev_latecol; /* Late Collision */
+ struct evcnt sc_ev_dc; /* Defer */
+ struct evcnt sc_ev_gprc; /* Good Packets Rx */
+ struct evcnt sc_ev_bprc; /* Broadcast Packets Rx */
+ struct evcnt sc_ev_mprc; /* Multicast Packets Rx */
+ struct evcnt sc_ev_gptc; /* Good Packets Tx */
+ struct evcnt sc_ev_gorc; /* Good Octets Rx */
+ struct evcnt sc_ev_gotc; /* Good Octets Tx */
+ struct evcnt sc_ev_rnbc; /* Rx No Buffers */
+ struct evcnt sc_ev_ruc; /* Rx Undersize */
+ struct evcnt sc_ev_rfc; /* Rx Fragment */
+ struct evcnt sc_ev_roc; /* Rx Oversize */
+ struct evcnt sc_ev_rjc; /* Rx Jabber */
+ struct evcnt sc_ev_tor; /* Total Octets Rx */
+ struct evcnt sc_ev_tot; /* Total Octets Tx */
+ struct evcnt sc_ev_tpr; /* Total Packets Rx */
+ struct evcnt sc_ev_tpt; /* Total Packets Tx */
+ struct evcnt sc_ev_mptc; /* Multicast Packets Tx */
+ struct evcnt sc_ev_bptc; /* Broadcast Packets Tx Count */
+ struct evcnt sc_ev_prc64; /* Packets Rx (64
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Sep 7 10:09:20 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-8]: if_wm.c if_wmreg.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #1759: sys/dev/pci/if_wm.c 1.741-1.749,1.753-1.757, 1.762 via patch sys/dev/pci/if_wmreg.h 1.126-1.127 - Fix I219 workaround in wm_flush_desc_rings(). - Add more statistics counters. - To avoid releasing mutex temporally, use new wm_set_mdio_slow_mode_hv_locked(). - No functional changes: - Turn a locking botch (shouldn't drop lock on error) into a KASSERT in wm_deferred_start_locked(). - Remove unneeded header inclusion. - Use __BIT() a little. - Modify comment and debug messages. - Consistency use -1 instead of 1 for some error code. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.508.4.45 -r1.508.4.46 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.98.6.14 -r1.98.6.15 src/sys/dev/pci/if_wmreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Sep 7 10:07:43 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1515 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.8 src/doc/CHANGES-9.4:1.1.2.9 --- src/doc/CHANGES-9.4:1.1.2.8 Tue Aug 30 18:36:21 2022 +++ src/doc/CHANGES-9.4 Wed Sep 7 10:07:43 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.8 2022/08/30 18:36:21 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.9 2022/09/07 10:07:43 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -119,3 +119,21 @@ distrib/vax/inst-common/dot.commonutils being compiled without support for depracated test expressions. [tsutsui, ticket #1514] +sys/dev/pci/if_wm.c1.741-1.749,1.753-1.757, + 1.762 via patch +sys/dev/pci/if_wmreg.h1.126-1.127 + + - Fix I219 workaround in wm_flush_desc_rings(). + - Add more statistics counters. + - To avoid releasing mutex temporally, use new + wm_set_mdio_slow_mode_hv_locked(). + - No functional changes: + - Turn a locking botch (shouldn't drop lock on error) into a KASSERT + in wm_deferred_start_locked(). + - Remove unneeded header inclusion. + - Use __BIT() a little. + - Modify comment and debug messages. + - Consistency use -1 instead of 1 for some error code. + - KNF. + [msaitoh, ticket #1515] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Sep 7 10:07:43 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1515 To generate a diff of this commit: cvs rdiff -u -r1.1.2.8 -r1.1.2.9 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Sep 7 10:05:42 UTC 2022 Modified Files: src/sys/dev/pci [netbsd-9]: if_wm.c if_wmreg.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #1515: sys/dev/pci/if_wm.c 1.741-1.749, 1.753-1.757, 1.762 via patch sys/dev/pci/if_wmreg.h 1.126-1.127 - Fix I219 workaround in wm_flush_desc_rings(). - Add more statistics counters. - To avoid releasing mutex temporally, use new wm_set_mdio_slow_mode_hv_locked(). - No functional changes: - Turn a locking botch (shouldn't drop lock on error) into a KASSERT in wm_deferred_start_locked(). - Remove unneeded header inclusion. - Use __BIT() a little. - Modify comment and debug messages. - Consistency use -1 instead of 1 for some error code. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.645.2.13 -r1.645.2.14 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.115.2.5 -r1.115.2.6 src/sys/dev/pci/if_wmreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Sep 7 10:05:42 UTC 2022
Modified Files:
src/sys/dev/pci [netbsd-9]: if_wm.c if_wmreg.h
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #1515:
sys/dev/pci/if_wm.c 1.741-1.749,
1.753-1.757,
1.762 via patch
sys/dev/pci/if_wmreg.h 1.126-1.127
- Fix I219 workaround in wm_flush_desc_rings().
- Add more statistics counters.
- To avoid releasing mutex temporally, use new
wm_set_mdio_slow_mode_hv_locked().
- No functional changes:
- Turn a locking botch (shouldn't drop lock on error) into a KASSERT
in wm_deferred_start_locked().
- Remove unneeded header inclusion.
- Use __BIT() a little.
- Modify comment and debug messages.
- Consistency use -1 instead of 1 for some error code.
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.645.2.13 -r1.645.2.14 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.115.2.5 -r1.115.2.6 src/sys/dev/pci/if_wmreg.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.645.2.13 src/sys/dev/pci/if_wm.c:1.645.2.14
--- src/sys/dev/pci/if_wm.c:1.645.2.13 Mon Jul 11 14:10:18 2022
+++ src/sys/dev/pci/if_wm.c Wed Sep 7 10:05:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.645.2.13 2022/07/11 14:10:18 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.645.2.14 2022/09/07 10:05:42 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.13 2022/07/11 14:10:18 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.14 2022/09/07 10:05:42 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -90,26 +90,25 @@ __KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.
#endif
#include
-#include
+
+#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
#include
-#include
-#include
+#include
#include
-#include
+#include
+#include
+#include
+#include
#include
+#include
+#include
+#include
#include
+#include
+#include
#include
-#include
-
-#include
#include
#include
@@ -497,7 +496,7 @@ struct wm_queue {
};
struct wm_phyop {
- int (*acquire)(struct wm_softc *);
+ int (*acquire)(struct wm_softc *) __attribute__((warn_unused_result));
void (*release)(struct wm_softc *);
int (*readreg_locked)(device_t, int, int, uint16_t *);
int (*writereg_locked)(device_t, int, int, uint16_t);
@@ -506,7 +505,7 @@ struct wm_phyop {
};
struct wm_nvmop {
- int (*acquire)(struct wm_softc *);
+ int (*acquire)(struct wm_softc *) __attribute__((warn_unused_result));
void (*release)(struct wm_softc *);
int (*read)(struct wm_softc *, int, int, uint16_t *);
};
@@ -597,12 +596,76 @@ struct wm_softc {
/* Event counters. */
struct evcnt sc_ev_linkintr; /* Link interrupts */
- /* WM_T_82542_2_1 only */
+ /* >= WM_T_82542_2_1 */
struct evcnt sc_ev_tx_xoff; /* Tx PAUSE(!0) frames */
struct evcnt sc_ev_tx_xon; /* Tx PAUSE(0) frames */
struct evcnt sc_ev_rx_xoff; /* Rx PAUSE(!0) frames */
struct evcnt sc_ev_rx_xon; /* Rx PAUSE(0) frames */
struct evcnt sc_ev_rx_macctl; /* Rx Unsupported */
+
+ struct evcnt sc_ev_crcerrs; /* CRC Error */
+ struct evcnt sc_ev_algnerrc; /* Alignment Error */
+ struct evcnt sc_ev_symerrc; /* Symbol Error */
+ struct evcnt sc_ev_rxerrc; /* Receive Error */
+ struct evcnt sc_ev_mpc; /* Missed Packets */
+ struct evcnt sc_ev_colc; /* Collision */
+ struct evcnt sc_ev_sec; /* Sequence Error */
+ struct evcnt sc_ev_cexterr; /* Carrier Extension Error */
+ struct evcnt sc_ev_rlec; /* Receive Length Error */
+ struct evcnt sc_ev_scc; /* Single Collision */
+ struct evcnt sc_ev_ecol; /* Excessive Collision */
+ struct evcnt sc_ev_mcc; /* Multiple Collision */
+ struct evcnt sc_ev_latecol; /* Late Collision */
+ struct evcnt sc_ev_dc; /* Defer */
+ struct evcnt sc_ev_gprc; /* Good Packets Rx */
+ struct evcnt sc_ev_bprc; /* Broadcast Packets Rx */
+ struct evcnt sc_ev_mprc; /* Multicast Packets Rx */
+ struct evcnt sc_ev_gptc; /* Good Packets Tx */
+ struct evcnt sc_ev_gorc; /* Good Octets Rx */
+ struct evcnt sc_ev_gotc; /* Good Octets Tx */
+ struct evcnt sc_ev_rnbc; /* Rx No Buffers */
+ struct evcnt sc_ev_ruc; /* Rx Undersize */
+ struct evcnt sc_ev_rfc; /* Rx Fragment */
+ struct evcnt sc_ev_roc; /* Rx Oversize */
+ struct evcnt sc_ev_rjc; /* Rx Jabber */
+ struct evcnt sc_ev_tor; /* Total Octets Rx */
+ struct evcnt sc_ev_tot; /* Total Octets Tx */
+ struct evcnt sc_ev_tpr; /* Total Packets Rx */
+ struct evcnt sc_ev_tpt; /* Total Packets Tx */
+ struct evcnt sc_ev_mptc; /* Multicast Packets Tx */
+ struct evcnt sc_ev_bptc; /*
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src
Committed By: rin
Date: Wed Sep 7 06:53:03 UTC 2022
Modified Files:
src/sys/arch/powerpc/fpu: fpu_emu.c
Log Message:
Fix mnemonics for fm{add,sub}. NFC except for evcnt(9) names.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/fpu/fpu_emu.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/powerpc/fpu/fpu_emu.c
diff -u src/sys/arch/powerpc/fpu/fpu_emu.c:1.54 src/sys/arch/powerpc/fpu/fpu_emu.c:1.55
--- src/sys/arch/powerpc/fpu/fpu_emu.c:1.54 Mon Sep 5 00:25:18 2022
+++ src/sys/arch/powerpc/fpu/fpu_emu.c Wed Sep 7 06:53:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu_emu.c,v 1.54 2022/09/05 00:25:18 rin Exp $ */
+/* $NetBSD: fpu_emu.c,v 1.55 2022/09/07 06:53:03 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.54 2022/09/05 00:25:18 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.55 2022/09/07 06:53:03 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -136,8 +136,8 @@ FPU_EMU_EVCNT_DECL(fsel);
FPU_EMU_EVCNT_DECL(fpres);
FPU_EMU_EVCNT_DECL(fmul);
FPU_EMU_EVCNT_DECL(frsqrte);
-FPU_EMU_EVCNT_DECL(fmulsub);
-FPU_EMU_EVCNT_DECL(fmuladd);
+FPU_EMU_EVCNT_DECL(fmsub);
+FPU_EMU_EVCNT_DECL(fmadd);
FPU_EMU_EVCNT_DECL(fnmsub);
FPU_EMU_EVCNT_DECL(fnmadd);
@@ -714,8 +714,8 @@ fpu_execute(struct trapframe *tf, struct
fp = fpu_div(fe);
break;
case OPC59_FMSUBS:
-FPU_EMU_EVCNT_INCR(fmulsub);
-DPRINTF(FPE_INSN, ("fpu_execute: FMULSUB\n"));
+FPU_EMU_EVCNT_INCR(fmsub);
+DPRINTF(FPE_INSN, ("fpu_execute: FMSUB\n"));
fpu_explode(fe, >fe_f1, type, FR(ra));
fpu_explode(fe, >fe_f2, type, FR(rc));
fp = fpu_mul(fe);
@@ -724,8 +724,8 @@ fpu_execute(struct trapframe *tf, struct
fp = fpu_sub(fe);
break;
case OPC59_FMADDS:
-FPU_EMU_EVCNT_INCR(fmuladd);
-DPRINTF(FPE_INSN, ("fpu_execute: FMULADD\n"));
+FPU_EMU_EVCNT_INCR(fmadd);
+DPRINTF(FPE_INSN, ("fpu_execute: FMADD\n"));
fpu_explode(fe, >fe_f1, type, FR(ra));
fpu_explode(fe, >fe_f2, type, FR(rc));
fp = fpu_mul(fe);
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src
Committed By: rin
Date: Wed Sep 7 06:53:03 UTC 2022
Modified Files:
src/sys/arch/powerpc/fpu: fpu_emu.c
Log Message:
Fix mnemonics for fm{add,sub}. NFC except for evcnt(9) names.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/fpu/fpu_emu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src Committed By: rin Date: Wed Sep 7 06:51:58 UTC 2022 Modified Files: src/sys/arch/powerpc/fpu: fpu_explode.c Log Message: fpu_explode(): Fix sign for FTYPE_INT. NFC for now; conversion for this type is used only for immediate 1. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/fpu/fpu_explode.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/powerpc/fpu/fpu_explode.c diff -u src/sys/arch/powerpc/fpu/fpu_explode.c:1.13 src/sys/arch/powerpc/fpu/fpu_explode.c:1.14 --- src/sys/arch/powerpc/fpu/fpu_explode.c:1.13 Mon Sep 5 00:24:24 2022 +++ src/sys/arch/powerpc/fpu/fpu_explode.c Wed Sep 7 06:51:58 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu_explode.c,v 1.13 2022/09/05 00:24:24 rin Exp $ */ +/* $NetBSD: fpu_explode.c,v 1.14 2022/09/07 06:51:58 rin Exp $ */ /* * Copyright (c) 1992, 1993 @@ -46,7 +46,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.13 2022/09/05 00:24:24 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fpu_explode.c,v 1.14 2022/09/07 06:51:58 rin Exp $"); #include #include @@ -227,6 +227,7 @@ fpu_explode(struct fpemu *fe, struct fpn break; case FTYPE_INT: + fp->fp_sign = lo >> 31; class = fpu_itof(fp, lo); break;
CVS commit: src/sys/arch/powerpc/fpu
Module Name:src Committed By: rin Date: Wed Sep 7 06:51:58 UTC 2022 Modified Files: src/sys/arch/powerpc/fpu: fpu_explode.c Log Message: fpu_explode(): Fix sign for FTYPE_INT. NFC for now; conversion for this type is used only for immediate 1. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/fpu/fpu_explode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Sep 7 06:37:05 UTC 2022 Modified Files: src/sys/dev/pci: files.pci Log Message: Fix the build, add new emuxki_boards.c To generate a diff of this commit: cvs rdiff -u -r1.440 -r1.441 src/sys/dev/pci/files.pci 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/files.pci diff -u src/sys/dev/pci/files.pci:1.440 src/sys/dev/pci/files.pci:1.441 --- src/sys/dev/pci/files.pci:1.440 Fri Dec 17 08:27:06 2021 +++ src/sys/dev/pci/files.pci Wed Sep 7 06:37:04 2022 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.440 2021/12/17 08:27:06 knakahara Exp $ +# $NetBSD: files.pci,v 1.441 2022/09/07 06:37:04 martin Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -568,6 +568,7 @@ file dev/pci/mpu_yds.c mpu_yds device emuxki: audiobus, ac97 attach emuxki at pci file dev/pci/emuxki.c emuxki +file dev/pci/emuxki_boards.c emuxki # Trident 4DWAVE AC'97 audio (including SiS 7018,ALi M5451) device autri: audiobus, ac97, midibus
CVS commit: src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Sep 7 06:37:05 UTC 2022 Modified Files: src/sys/dev/pci: files.pci Log Message: Fix the build, add new emuxki_boards.c To generate a diff of this commit: cvs rdiff -u -r1.440 -r1.441 src/sys/dev/pci/files.pci Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
