CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src
Committed By: riastradh
Date: Fri Mar 15 02:20:59 UTC 2024
Modified Files:
src/distrib/evbarm/instkernel/sshramdisk: Makefile
Log Message:
evbarm/instkernel/sshramdisk: Put firmware in the right paths.
Maybe this should also be wired up to `release' to put the ramdisk in
the releasedir so we detect destdir path leakage like this had.
PR port-evbarm/58035
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/evbarm/instkernel/sshramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.25 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.26
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.25 Thu Mar 26 07:44:43 2020
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Fri Mar 15 02:20:58 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/03/26 07:44:43 skrll Exp $
+# $NetBSD: Makefile,v 1.26 2024/03/15 02:20:58 riastradh Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -29,7 +29,9 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/group \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
+IMAGEPREBUILD= \
+ (cd ${DESTDIR} && ${TOOL_PAX} ${PAX_TIMESTAMP} -w libdata/firmware) \
+ | (cd ${WORKDIR} && ${TOOL_PAX} -r -pp)
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
CVS commit: src/distrib/evbarm/instkernel/sshramdisk
Module Name:src Committed By: riastradh Date: Fri Mar 15 02:20:59 UTC 2024 Modified Files: src/distrib/evbarm/instkernel/sshramdisk: Makefile Log Message: evbarm/instkernel/sshramdisk: Put firmware in the right paths. Maybe this should also be wired up to `release' to put the ramdisk in the releasedir so we detect destdir path leakage like this had. PR port-evbarm/58035 To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/evbarm/instkernel/sshramdisk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/usr.bin/stat
Am 14.03.2024 um 21:27 schrieb Robert Elz: > Date:Thu, 14 Mar 2024 20:53:13 +0100 > From:Roland Illig > Message-ID: <9c7513f7-97b5-4d3b-9d66-dce483af7...@gmx.de> > > | I don't think the flags '+' and '0' make sense for strings, that's why I > | decided to preserve existing behavior. > > But the change only affected things when the # flag was given. I agree > that + and 0 are meaningless for strings, but - isn't, and %-S would work, > I see no reason why %#-S shouldn't work as well. > > Not exactly a serius problem, as clearly no-one ever seems to have > been bothered by it, but no-one intentionally writes the code as it > was (generating clear everything) - the ! was obviously just a thinko > for ~. I agree. Thank you for fixing the left-aligned output, I wrote a few tests for these cases. Roland
CVS commit: src
Module Name:src
Committed By: rillig
Date: Thu Mar 14 21:17:54 UTC 2024
Modified Files:
src/tests/usr.bin/stat: t_stat.sh
src/usr.bin/stat: stat.c
Log Message:
stat: don't allow numeric formatting flags on strings
Calling snprintf with "%+s" invokes undefined behavior.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/stat/t_stat.sh
cvs rdiff -u -r1.52 -r1.53 src/usr.bin/stat/stat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/stat/t_stat.sh
diff -u src/tests/usr.bin/stat/t_stat.sh:1.1 src/tests/usr.bin/stat/t_stat.sh:1.2
--- src/tests/usr.bin/stat/t_stat.sh:1.1 Thu Mar 14 21:00:33 2024
+++ src/tests/usr.bin/stat/t_stat.sh Thu Mar 14 21:17:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: t_stat.sh,v 1.1 2024/03/14 21:00:33 rillig Exp $
+# $NetBSD: t_stat.sh,v 1.2 2024/03/14 21:17:54 rillig Exp $
#
# Copyright (c) 2024 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -44,10 +44,15 @@ string_format_body() {
atf_check -o 'inline:left-aligned <Ümläute >\n' \
stat -f 'left-aligned <%-20SN>' 'Ümläute'
- # FIXME: invokes undefined behavior in snprintf "%+s"
- atf_check -o 'inline:string-plus <Ümläute>\n' \
+ atf_check -s exit:1 -o ignore -e 'inline:stat: % SN: bad format\n' \
+ stat -f 'string-space <% SN>' 'Ümläute'
+
+ atf_check -s exit:1 -o ignore -e 'inline:stat: %+SN: bad format\n' \
stat -f 'string-plus <%+SN>' 'Ümläute'
+ atf_check -s exit:1 -o ignore -e 'inline:stat: %0SN: bad format\n' \
+ stat -f 'string-zero <%0SN>' 'Ümläute'
+
atf_check -o 'inline:vis <\303\234ml\303\244ute>\n' \
stat -f 'vis <%#SN>' 'Ümläute'
Index: src/usr.bin/stat/stat.c
diff -u src/usr.bin/stat/stat.c:1.52 src/usr.bin/stat/stat.c:1.53
--- src/usr.bin/stat/stat.c:1.52 Thu Mar 14 19:38:56 2024
+++ src/usr.bin/stat/stat.c Thu Mar 14 21:17:54 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: stat.c,v 1.52 2024/03/14 19:38:56 kre Exp $ */
+/* $NetBSD: stat.c,v 1.53 2024/03/14 21:17:54 rillig Exp $ */
/*
* Copyright (c) 2002-2011 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: stat.c,v 1.52 2024/03/14 19:38:56 kre Exp $");
+__RCSID("$NetBSD: stat.c,v 1.53 2024/03/14 21:17:54 rillig Exp $");
#endif
#if ! HAVE_NBTOOL_CONFIG_H
@@ -1065,11 +1065,11 @@ format1(const struct stat *st,
errx(1, "%.*s: bad format", (int)flen, fmt);
}
- /*
- * If a subdatum was specified but not supported, or an output
- * format was selected that is not supported, that's an error.
- */
- if (hilo != 0 || (ofmt & formats) == 0)
+ if (hilo != 0 // subdatum not supported
+ || !(ofmt & formats) // output format not supported
+ || (ofmt == FMTF_STRING && flags & FLAG_SPACE)
+ || (ofmt == FMTF_STRING && flags & FLAG_PLUS)
+ || (ofmt == FMTF_STRING && flags & FLAG_ZERO))
errx(1, "%.*s: bad format", (int)flen, fmt);
/*
CVS commit: src
Module Name:src Committed By: rillig Date: Thu Mar 14 21:17:54 UTC 2024 Modified Files: src/tests/usr.bin/stat: t_stat.sh src/usr.bin/stat: stat.c Log Message: stat: don't allow numeric formatting flags on strings Calling snprintf with "%+s" invokes undefined behavior. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/stat/t_stat.sh cvs rdiff -u -r1.52 -r1.53 src/usr.bin/stat/stat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rillig
Date: Thu Mar 14 21:00:33 UTC 2024
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/usr.bin: Makefile
Added Files:
src/tests/usr.bin/stat: Makefile t_stat.sh
Log Message:
tests/stat: test the left-aligned and right-aligned 'S' format
To generate a diff of this commit:
cvs rdiff -u -r1.1309 -r1.1310 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.202 -r1.203 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.39 -r1.40 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/stat/Makefile \
src/tests/usr.bin/stat/t_stat.sh
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/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1309 src/distrib/sets/lists/tests/mi:1.1310
--- src/distrib/sets/lists/tests/mi:1.1309 Sun Mar 3 00:50:41 2024
+++ src/distrib/sets/lists/tests/mi Thu Mar 14 21:00:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1309 2024/03/03 00:50:41 rillig Exp $
+# $NetBSD: mi,v 1.1310 2024/03/14 21:00:33 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6473,6 +6473,10 @@
./usr/tests/usr.bin/sort/d_any_char_iflag_out.txt tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/sort/d_any_char_in.txt tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/sort/t_sorttests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/stattests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/stat/Atffile tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/stat/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
+./usr/tests/usr.bin/stat/t_stattests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/tar tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/tar/Atffile tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/tar/Kyuafiletests-usr.bin-tests compattestfile,atf,kyua
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.202 src/etc/mtree/NetBSD.dist.tests:1.203
--- src/etc/mtree/NetBSD.dist.tests:1.202 Thu Jan 25 00:30:57 2024
+++ src/etc/mtree/NetBSD.dist.tests Thu Mar 14 21:00:32 2024
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.202 2024/01/25 00:30:57 riastradh Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.203 2024/03/14 21:00:32 rillig Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -476,6 +476,7 @@
./usr/tests/usr.bin/sed
./usr/tests/usr.bin/shmif_dumpbus
./usr/tests/usr.bin/sort
+./usr/tests/usr.bin/stat
./usr/tests/usr.bin/tar
./usr/tests/usr.bin/tmux
./usr/tests/usr.bin/tr
Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.39 src/tests/usr.bin/Makefile:1.40
--- src/tests/usr.bin/Makefile:1.39 Thu Jan 25 00:30:57 2024
+++ src/tests/usr.bin/Makefile Thu Mar 14 21:00:33 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2024/01/25 00:30:57 riastradh Exp $
+# $NetBSD: Makefile,v 1.40 2024/03/14 21:00:33 rillig Exp $
#
.include
@@ -9,7 +9,7 @@ TESTS_SUBDIRS= awk basename bzip2 cc cmp
diff dirname error find fstat gdb grep gzip id indent \
infocmp jot ld locale m4 make mixerctl mkdep mtree nbperf \
netpgpverify patch pkill pr printf pwhash realpath rump_server \
- shmif_dumpbus sdiff sed sort tar tmux tr unifdef uniq \
+ shmif_dumpbus sdiff sed sort stat tar tmux tr unifdef uniq \
vmstat xlint ztest
.if ${MKCXX} != "no"
Added files:
Index: src/tests/usr.bin/stat/Makefile
diff -u /dev/null src/tests/usr.bin/stat/Makefile:1.1
--- /dev/null Thu Mar 14 21:00:33 2024
+++ src/tests/usr.bin/stat/Makefile Thu Mar 14 21:00:33 2024
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2024/03/14 21:00:33 rillig Exp $
+
+TESTSDIR= ${TESTSBASE}/usr.bin/stat
+
+TESTS_SH= t_stat
+
+.include
Index: src/tests/usr.bin/stat/t_stat.sh
diff -u /dev/null src/tests/usr.bin/stat/t_stat.sh:1.1
--- /dev/null Thu Mar 14 21:00:33 2024
+++ src/tests/usr.bin/stat/t_stat.sh Thu Mar 14 21:00:33 2024
@@ -0,0 +1,63 @@
+# $NetBSD: t_stat.sh,v 1.1 2024/03/14 21:00:33 rillig Exp $
+#
+# Copyright (c) 2024 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Roland Illig.
+#
+# 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,
CVS commit: src
Module Name:src Committed By: rillig Date: Thu Mar 14 21:00:33 UTC 2024 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests src/tests/usr.bin: Makefile Added Files: src/tests/usr.bin/stat: Makefile t_stat.sh Log Message: tests/stat: test the left-aligned and right-aligned 'S' format To generate a diff of this commit: cvs rdiff -u -r1.1309 -r1.1310 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.202 -r1.203 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.39 -r1.40 src/tests/usr.bin/Makefile cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/stat/Makefile \ src/tests/usr.bin/stat/t_stat.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/usr.bin/stat
Date:Thu, 14 Mar 2024 20:53:13 +0100 From:Roland Illig Message-ID: <9c7513f7-97b5-4d3b-9d66-dce483af7...@gmx.de> | I don't think the flags '+' and '0' make sense for strings, that's why I | decided to preserve existing behavior. But the change only affected things when the # flag was given. I agree that + and 0 are meaningless for strings, but - isn't, and %-S would work, I see no reason why %#-S shouldn't work as well. Not exactly a serius problem, as clearly no-one ever seems to have been bothered by it, but no-one intentionally writes the code as it was (generating clear everything) - the ! was obviously just a thinko for ~. kre
Re: CVS commit: src/usr.bin/stat
Am 14.03.2024 um 20:38 schrieb Robert Elz: > Module Name: src > Committed By: kre > Date: Thu Mar 14 19:38:56 UTC 2024 > > Modified Files: > src/usr.bin/stat: stat.c > > Log Message: > While the change in 1.51 certainly retained binary compat with > what was in 1.50 (while silencing LINT) - it was clearly not the > correct change to make. The code used !FLAG_POUND where it > clearly meant ~FLAG_POUND ... the former is 0, so &= 0 could > be replaced by =0 changing nothing. But that's not what it > should have been doing, other flags should not have been > removed here, just FLAG_POUND. I don't think the flags '+' and '0' make sense for strings, that's why I decided to preserve existing behavior. Roland
CVS commit: src/usr.bin/stat
Module Name:src
Committed By: kre
Date: Thu Mar 14 19:38:56 UTC 2024
Modified Files:
src/usr.bin/stat: stat.c
Log Message:
While the change in 1.51 certainly retained binary compat with
what was in 1.50 (while silencing LINT) - it was clearly not the
correct change to make. The code used !FLAG_POUND where it
clearly meant ~FLAG_POUND ... the former is 0, so &= 0 could
be replaced by =0 changing nothing. But that's not what it
should have been doing, other flags should not have been
removed here, just FLAG_POUND.
This problem seems to have existed since support for %#s
was first added in 2011, which kind of suggests how rarely
that format, particularly with other flags (like %#-s)
has ever been used (with no other flags, the bug would not
be noticed).
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/usr.bin/stat/stat.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/stat/stat.c
diff -u src/usr.bin/stat/stat.c:1.51 src/usr.bin/stat/stat.c:1.52
--- src/usr.bin/stat/stat.c:1.51 Thu Mar 14 00:07:20 2024
+++ src/usr.bin/stat/stat.c Thu Mar 14 19:38:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: stat.c,v 1.51 2024/03/14 00:07:20 rillig Exp $ */
+/* $NetBSD: stat.c,v 1.52 2024/03/14 19:38:56 kre Exp $ */
/*
* Copyright (c) 2002-2011 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: stat.c,v 1.51 2024/03/14 00:07:20 rillig Exp $");
+__RCSID("$NetBSD: stat.c,v 1.52 2024/03/14 19:38:56 kre Exp $");
#endif
#if ! HAVE_NBTOOL_CONFIG_H
@@ -1077,7 +1077,7 @@ format1(const struct stat *st,
* First prefixlen chars are not encoded.
*/
if ((flags & FLAG_POUND) != 0 && ofmt == FMTF_STRING) {
- flags = 0;
+ flags &= ~FLAG_POUND;
strncpy(visbuf, sdata, prefixlen);
/* Avoid GCC warnings. */
visbuf[prefixlen] = 0;
CVS commit: src/usr.bin/stat
Module Name:src Committed By: kre Date: Thu Mar 14 19:38:56 UTC 2024 Modified Files: src/usr.bin/stat: stat.c Log Message: While the change in 1.51 certainly retained binary compat with what was in 1.50 (while silencing LINT) - it was clearly not the correct change to make. The code used !FLAG_POUND where it clearly meant ~FLAG_POUND ... the former is 0, so &= 0 could be replaced by =0 changing nothing. But that's not what it should have been doing, other flags should not have been removed here, just FLAG_POUND. This problem seems to have existed since support for %#s was first added in 2011, which kind of suggests how rarely that format, particularly with other flags (like %#-s) has ever been used (with no other flags, the bug would not be noticed). To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/usr.bin/stat/stat.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/ic
Module Name:src Committed By: jakllsch Date: Thu Mar 14 16:43:00 UTC 2024 Modified Files: src/sys/dev/ic: dwc_gmac.c Log Message: Use ether_crc32_be() instead of having a local bitrev32() function to munge ether_crc32_le() output when programming multicast filter. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/dev/ic/dwc_gmac.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/ic
Module Name:src
Committed By: jakllsch
Date: Thu Mar 14 16:43:00 UTC 2024
Modified Files:
src/sys/dev/ic: dwc_gmac.c
Log Message:
Use ether_crc32_be() instead of having a local bitrev32() function to
munge ether_crc32_le() output when programming multicast filter.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/ic/dwc_gmac.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/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.85 src/sys/dev/ic/dwc_gmac.c:1.86
--- src/sys/dev/ic/dwc_gmac.c:1.85 Sun Mar 3 10:09:42 2024
+++ src/sys/dev/ic/dwc_gmac.c Thu Mar 14 16:43:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.85 2024/03/03 10:09:42 skrll Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.86 2024/03/14 16:43:00 jakllsch Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.85 2024/03/03 10:09:42 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.86 2024/03/14 16:43:00 jakllsch Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -98,7 +98,6 @@ static void dwc_gmac_tx_intr(struct dwc_
static void dwc_gmac_rx_intr(struct dwc_gmac_softc *);
static void dwc_gmac_setmulti(struct dwc_gmac_softc *);
static int dwc_gmac_ifflags_cb(struct ethercom *);
-static uint32_t bitrev32(uint32_t);
static void dwc_gmac_desc_set_owned_by_dev(struct dwc_gmac_dev_dmadesc *);
static int dwc_gmac_desc_is_owned_by_dev(struct dwc_gmac_dev_dmadesc *);
static void dwc_gmac_desc_std_set_len(struct dwc_gmac_dev_dmadesc *, int);
@@ -1346,20 +1345,6 @@ skip:
mutex_exit(>sc_rxq.r_mtx);
}
-/*
- * Reverse order of bits - http://aggregate.org/MAGIC/#Bit%20Reversal
- */
-static uint32_t
-bitrev32(uint32_t x)
-{
- x = (((x & 0x) >> 1) | ((x & 0x) << 1));
- x = (((x & 0x) >> 2) | ((x & 0x) << 2));
- x = (((x & 0xf0f0f0f0) >> 4) | ((x & 0x0f0f0f0f) << 4));
- x = (((x & 0xff00ff00) >> 8) | ((x & 0x00ff00ff) << 8));
-
- return (x >> 16) | (x << 16);
-}
-
static void
dwc_gmac_setmulti(struct dwc_gmac_softc *sc)
{
@@ -1398,9 +1383,7 @@ dwc_gmac_setmulti(struct dwc_gmac_softc
goto special_filter;
}
- h = bitrev32(
- ~ether_crc32_le(enm->enm_addrlo, ETHER_ADDR_LEN)
- ) >> 26;
+ h = ~ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN) >> 26;
hashes[h >> 5] |= (1 << (h & 0x1f));
mcnt++;
CVS commit: src/sys/arch/sparc/include
Module Name:src Committed By: christos Date: Thu Mar 14 15:51:10 UTC 2024 Modified Files: src/sys/arch/sparc/include: limits.h Log Message: Sync with x86_64 the quad constants. No reason to be different To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc/include/limits.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/include
Module Name:src Committed By: christos Date: Thu Mar 14 15:51:10 UTC 2024 Modified Files: src/sys/arch/sparc/include: limits.h Log Message: Sync with x86_64 the quad constants. No reason to be different To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sparc/include/limits.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/arch/sparc/include/limits.h diff -u src/sys/arch/sparc/include/limits.h:1.23 src/sys/arch/sparc/include/limits.h:1.24 --- src/sys/arch/sparc/include/limits.h:1.23 Mon Jan 21 15:28:18 2019 +++ src/sys/arch/sparc/include/limits.h Thu Mar 14 11:51:10 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: limits.h,v 1.23 2019/01/21 20:28:18 dholland Exp $ */ +/* $NetBSD: limits.h,v 1.24 2024/03/14 15:51:10 christos Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -75,11 +75,9 @@ #define SSIZE_MIN LONG_MIN /* min value for a ssize_t */ #define SIZE_T_MAX ULONG_MAX /* max value for a size_t */ -/* GCC requires that quad constants be written as expressions. */ -#define UQUAD_MAX ((u_quad_t)0-1) /* max value for a uquad_t */ - /* max value for a quad_t */ -#define QUAD_MAX ((quad_t)(UQUAD_MAX >> 1)) -#define QUAD_MIN (-QUAD_MAX-1) /* min value for a quad_t */ +#define UQUAD_MAX 0xULL /* max unsigned quad */ +#define QUAD_MAX 0x7fffLL /* max signed quad */ +#define QUAD_MIN (-0x7fffLL-1) /* min signed quad */ #endif /* _NETBSD_SOURCE */ #endif /* _POSIX_C_SOURCE || _XOPEN_SOURCE || _NETBSD_SOURCE */
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: christos
Date: Thu Mar 14 15:41:54 UTC 2024
Modified Files:
src/distrib/utils/embedded/conf: armv7.conf
Log Message:
Fix reproducible build (Jan-Benedict Glaw)
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/distrib/utils/embedded/conf/armv7.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.46 src/distrib/utils/embedded/conf/armv7.conf:1.47
--- src/distrib/utils/embedded/conf/armv7.conf:1.46 Wed Apr 19 14:39:18 2023
+++ src/distrib/utils/embedded/conf/armv7.conf Thu Mar 14 11:41:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.46 2023/04/19 18:39:18 brook Exp $
+# $NetBSD: armv7.conf,v 1.47 2024/03/14 15:41:54 christos Exp $
# ARMv7 customization script used by mkimage
#
board=armv7
@@ -45,7 +45,11 @@ populate_common() {
fi
# Install boot script
- "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/armv7 boot" "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr"
+ [ -n "${MKREPRO_TIMESTAMP}" ] && \
+ MKUBOOTIMAGEARGS="-t ${MKREPRO_TIMESTAMP}"
+ "${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script \
+ ${MKUBOOTIMAGEARGS} -a 0 -n "NetBSD/armv7 boot" \
+ "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr"
}
populate_rpi() {
CVS commit: src/distrib/utils/embedded/conf
Module Name:src Committed By: christos Date: Thu Mar 14 15:41:54 UTC 2024 Modified Files: src/distrib/utils/embedded/conf: armv7.conf Log Message: Fix reproducible build (Jan-Benedict Glaw) To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/distrib/utils/embedded/conf/armv7.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libusbhid
Module Name:src Committed By: jakllsch Date: Thu Mar 14 15:39:23 UTC 2024 Modified Files: src/lib/libusbhid: usb_hid_usages Log Message: Sync with OpenBSD To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libusbhid/usb_hid_usages Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libusbhid/usb_hid_usages diff -u src/lib/libusbhid/usb_hid_usages:1.11 src/lib/libusbhid/usb_hid_usages:1.12 --- src/lib/libusbhid/usb_hid_usages:1.11 Thu Mar 14 15:27:22 2024 +++ src/lib/libusbhid/usb_hid_usages Thu Mar 14 15:39:23 2024 @@ -1,4 +1,5 @@ -# $NetBSD: usb_hid_usages,v 1.11 2024/03/14 15:27:22 jakllsch Exp $ +# $NetBSD: usb_hid_usages,v 1.12 2024/03/14 15:39:23 jakllsch Exp $ +# $OpenBSD: usb_hid_usages,v 1.6 2020/09/09 02:26:54 pamela Exp $ # # USB HID usage table # Syntax: @@ -19,6 +20,15 @@ 0x07 Keypad 0x08 Multi-axis Controller 0x09 Tablet PC System Controls + 0x0A Water Cooling Device + 0x0B Computer Chassis Device + 0x0C Wireless Radio Controls + 0x0D Portable Device Control + 0x0E System Multi-Axis Controller + 0x0F Spatial Controller + 0x10 Assistive Control + 0x11 Device Dock + 0x12 Dockable Device 0x30 X 0x31 Y 0x32 Z @@ -43,6 +53,10 @@ 0x46 Vno 0x47 Feature Notification 0x48 Resolution Multiplier + 0x49 Qx + 0x4A Qy + 0x4B Qz + 0x4C Qw 0x80 System Control 0x81 System Power Down 0x82 System Sleep @@ -63,6 +77,14 @@ 0x91 D-pad Down 0x92 D-pad Right 0x93 D-pad Left + 0x94 Index Trigger + 0x95 Palm Trigger + 0x96 Thumbstick + 0x97 System Function Shift + 0x98 System Function Shift Lock + 0x99 System Function Shift Lock Indicator + 0x9A System Dismiss Notification + 0x9B System Do Not Disturb 0xA0 System Dock 0xA1 System Undock 0xA2 System Setup @@ -80,6 +102,25 @@ 0xB5 System Display Toggle Int/Ext 0xB6 System Display Swap Primary/Secondary 0xB7 System Display LCD Autoscale + 0xC0 Sensor Zone + 0xC1 RPM + 0xC2 Coolant Level + 0xC3 Coolant Critical Level + 0xC4 Coolant Pump + 0xC5 Chassis Enclosure + 0xC6 Wireless Radio Button + 0xC7 Wireless Radio LED + 0xC8 Wireless Radio Slider Switch + 0xC9 System Display Rotation Lock Button + 0xCA System Display Rotation Lock Slider Switch + 0xCB Control Enable + 0xD0 Dockable Device Unique ID + 0xD1 Dockable Device Vendor ID + 0xD2 Dockable Device Primary Usage Page + 0xD3 Dockable Device Primary Usage ID + 0xD4 Dockable Device Docking State + 0xD5 Dockable Device Display Occlusion + 0xD6 Dockable Device Object Type 2 Simulation Controls 0x00 Undefined @@ -94,27 +135,26 @@ 0x09 Airplane Simulation Device 0x0A Helicopter Simulation Device 0x0B Magic Carpet Simulation Device - 0x0C Bicycle + 0x0C Bicycle Simulation Device 0x20 Flight Control Stick 0x21 Flight Stick 0x22 Cyclic Control 0x23 Cyclic Trim 0x24 Flight Yoke 0x25 Track Control - 0x26 Driving Control 0xB0 Aileron 0xB1 Aileron Trim 0xB2 Anti-Torque Control - 0xB3 Auto-pilot Enable + 0xB3 Autopilot Enable 0xB4 Chaff Release 0xB5 Collective Control 0xB6 Dive Brake - 0xB7 Electronic Counter Measures + 0xB7 Electronic Countermeasures 0xB8 Elevator 0xB9 Elevator Trim 0xBA Rudder 0xBB Throttle - 0xBC Flight Communication + 0xBC Flight Communications 0xBD Flare Release 0xBE Landing Gear 0xBF Toe Brake @@ -218,9 +258,11 @@ 0x36 Gun Safety 0x37 Gamepad Fire/Jump 0x39 Gamepad Trigger + 0x3A Form-fitting Gamepad 6 Device Controls 0x00 Undefined + 0x06 Background/Nonuser Controls 0x20 Battery Strength 0x21 Wireless Channel 0x22 Wireless ID @@ -228,6 +270,22 @@ 0x24 Security Code Character Entered 0x25 Security Code Character Erased 0x26 Security Code Cleared + 0x27 Sequence ID + 0x28 Sequence ID Reset + 0x29 RF Signal Strength + 0x2A Software Version + 0x2B Protocol Version + 0x2C Hardware Version + 0x2D Major + 0x2E Minor + 0x2F Revision + 0x30 Handedness + 0x31 Either Hand + 0x32 Left Hand + 0x33 Right Hand + 0x34 Both Hands + 0x40 Grip Pose Offset + 0x41 Pointer Pose Offset 7 Keyboard 0x00 No Event @@ -529,6 +587,24 @@ 0x4B Generic Indicator 0x4C System Suspend 0x4D External Power Connected + 0x4E Indicator Blue + 0x4F Indicator Orange + 0x50 Good Status + 0x51 Warning Status + 0x52 RGB LED + 0x53 Red LED Channel + 0x54 Blue LED Channel + 0x55 Green LED Channel + 0x56 LED Intensity + 0x60 Player Indicator + 0x61 Player 1 + 0x62 Player 2 + 0x63 Player 3 + 0x64 Player 4 + 0x65 Player 5 + 0x66 Player 6 + 0x67 Player 7 + 0x68 Player 8 9 Button 0x00 No Button Pressed @@ -605,6 +681,40 @@ 0xBD Phone Key B 0xBE Phone Key C 0xBF Phone Key D + 0xC0 Phone Call History Key + 0xC1 Phone Caller ID Key + 0xC2 Phone Settings Key + 0xF0 Host Control + 0xF1 Host Available + 0xF2 Host Call Active + 0xF3 Activate Handset Audio + 0xF4 Ring Type + 0xF5 Re-dialable Phone Number + 0xF8 Stop Ring Tone + 0xF9 PSTN Ring Tone + 0xFA Host Ring Tone + 0xFB Alert Sound Error +
CVS commit: src/lib/libusbhid
Module Name:src Committed By: jakllsch Date: Thu Mar 14 15:39:23 UTC 2024 Modified Files: src/lib/libusbhid: usb_hid_usages Log Message: Sync with OpenBSD To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/lib/libusbhid/usb_hid_usages Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libusbhid
Module Name:src Committed By: jakllsch Date: Thu Mar 14 15:27:23 UTC 2024 Modified Files: src/lib/libusbhid: usb_hid_usages Log Message: Remove Reserved usages and ranges thereof Helps align with future merge To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libusbhid/usb_hid_usages Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libusbhid/usb_hid_usages diff -u src/lib/libusbhid/usb_hid_usages:1.10 src/lib/libusbhid/usb_hid_usages:1.11 --- src/lib/libusbhid/usb_hid_usages:1.10 Thu Mar 14 15:23:52 2024 +++ src/lib/libusbhid/usb_hid_usages Thu Mar 14 15:27:22 2024 @@ -1,4 +1,4 @@ -# $NetBSD: usb_hid_usages,v 1.10 2024/03/14 15:23:52 jakllsch Exp $ +# $NetBSD: usb_hid_usages,v 1.11 2024/03/14 15:27:22 jakllsch Exp $ # # USB HID usage table # Syntax: @@ -13,7 +13,6 @@ 0x00 Undefined 0x01 Pointer 0x02 Mouse - 0x03 Reserved 0x04 Joystick 0x05 Game Pad 0x06 Keyboard @@ -530,7 +529,6 @@ 0x4B Generic Indicator 0x4C System Suspend 0x4D External Power Connected - 0x4C- Reserved 9 Button 0x00 No Button Pressed
CVS commit: src/lib/libusbhid
Module Name:src Committed By: jakllsch Date: Thu Mar 14 15:27:23 UTC 2024 Modified Files: src/lib/libusbhid: usb_hid_usages Log Message: Remove Reserved usages and ranges thereof Helps align with future merge To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libusbhid/usb_hid_usages Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libusbhid
Module Name:src Committed By: jakllsch Date: Thu Mar 14 15:23:52 UTC 2024 Modified Files: src/lib/libusbhid: usb_hid_usages Log Message: fix typos To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libusbhid/usb_hid_usages Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libusbhid/usb_hid_usages diff -u src/lib/libusbhid/usb_hid_usages:1.9 src/lib/libusbhid/usb_hid_usages:1.10 --- src/lib/libusbhid/usb_hid_usages:1.9 Sat Feb 10 09:21:52 2024 +++ src/lib/libusbhid/usb_hid_usages Thu Mar 14 15:23:52 2024 @@ -1,4 +1,4 @@ -# $NetBSD: usb_hid_usages,v 1.9 2024/02/10 09:21:52 andvar Exp $ +# $NetBSD: usb_hid_usages,v 1.10 2024/03/14 15:23:52 jakllsch Exp $ # # USB HID usage table # Syntax: @@ -40,7 +40,7 @@ 0x42 Vz 0x43 Vbrx 0x44 Vbry - 0x45 Vbrx + 0x45 Vbrz 0x46 Vno 0x47 Feature Notification 0x48 Resolution Multiplier @@ -627,7 +627,7 @@ 0x35 Illumination 0x36 Function Buttons 0x40 Menu - 0x41 Menu Pick + 0x41 Menu Pick 0x42 Menu Up 0x43 Menu Down 0x44 Menu Left @@ -688,7 +688,7 @@ 0xB7 Stop 0xB8 Eject 0xB9 Random Play - 0xBA Select DisC + 0xBA Select Disc 0xBB Enter Disc 0xBC Repeat 0xBD Tracking
CVS commit: src/lib/libusbhid
Module Name:src Committed By: jakllsch Date: Thu Mar 14 15:23:52 UTC 2024 Modified Files: src/lib/libusbhid: usb_hid_usages Log Message: fix typos To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libusbhid/usb_hid_usages Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: pgoyette Date: Thu Mar 14 15:19:03 UTC 2024 Modified Files: src/share/man/man4: ihidev.4 Log Message: Be a bit more clear about which devices are being handled. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/ihidev.4 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/man4/ihidev.4 diff -u src/share/man/man4/ihidev.4:1.3 src/share/man/man4/ihidev.4:1.4 --- src/share/man/man4/ihidev.4:1.3 Sat Oct 5 06:28:50 2019 +++ src/share/man/man4/ihidev.4 Thu Mar 14 15:19:03 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: ihidev.4,v 1.3 2019/10/05 06:28:50 ryoon Exp $ +.\" $NetBSD: ihidev.4,v 1.4 2024/03/14 15:19:03 pgoyette Exp $ .\" .\" Copyright (c) 2001,2017 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -39,7 +39,7 @@ .Sh DESCRIPTION The .Nm -driver handles all Human Interface Devices. +driver handles all Human Interface Devices attached via I2C bus. Each HID device can have several components, e.g., a keyboard and a mouse. These components use different report identifiers (a byte)
CVS commit: src/share/man/man4
Module Name:src Committed By: pgoyette Date: Thu Mar 14 15:19:03 UTC 2024 Modified Files: src/share/man/man4: ihidev.4 Log Message: Be a bit more clear about which devices are being handled. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/ihidev.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/conf
Module Name:src
Committed By: macallan
Date: Thu Mar 14 13:18:36 UTC 2024
Modified Files:
src/sys/arch/hppa/conf: GENERIC
Log Message:
add gftfb
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/hppa/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/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.43 src/sys/arch/hppa/conf/GENERIC:1.44
--- src/sys/arch/hppa/conf/GENERIC:1.43 Mon Jan 29 18:27:12 2024
+++ src/sys/arch/hppa/conf/GENERIC Thu Mar 14 13:18:35 2024
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.43 2024/01/29 18:27:12 christos Exp $
+# $NetBSD: GENERIC,v 1.44 2024/03/14 13:18:35 macallan Exp $
#
# GENERIC machine description file
#
@@ -23,7 +23,7 @@ include "arch/hppa/conf/std.hppa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-#ident "GENERIC-$Revision: 1.43 $"
+#ident "GENERIC-$Revision: 1.44 $"
maxusers 32 # estimated number of users
@@ -283,6 +283,7 @@ sti* at mainbus0 # [H]CRX-{8,24,48}[Z]
sti* at phantomas? # [H]CRX-{8,24,48}[Z] and Visualize graphics
sti* at uturn?
sti* at pci? # EG-PCI, FX*
+gftfb* at pci? # PCI Visualize EG
# Human Interface Loop
hil* at gsc? irq 1 # Human Interface Loop, kbd and mouse
@@ -298,7 +299,9 @@ wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
wskbd* at hilkbd? console ?
wsmouse* at hilms? mux 0
-wsdisplay* at sti?
+# make sure the console display is always wsdisplay0
+wsdisplay0 at wsemuldisplaydev? console 1
+wsdisplay* at wsemuldisplaydev?
# Serial Devices
CVS commit: src/sys/arch/hppa/conf
Module Name:src Committed By: macallan Date: Thu Mar 14 13:18:36 UTC 2024 Modified Files: src/sys/arch/hppa/conf: GENERIC Log Message: add gftfb To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/hppa/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu Mar 14 09:13:58 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: expat-2.6.2 is out To generate a diff of this commit: cvs rdiff -u -r1.1998 -r1.1999 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.1998 src/doc/3RDPARTY:1.1999 --- src/doc/3RDPARTY:1.1998 Thu Mar 7 00:35:10 2024 +++ src/doc/3RDPARTY Thu Mar 14 09:13:57 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1998 2024/03/07 00:35:10 gutteridge Exp $ +# $NetBSD: 3RDPARTY,v 1.1999 2024/03/14 09:13:57 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -409,11 +409,11 @@ Notes: Package: expat Version: 2.4.6 -Current Vers: 2.6.0 +Current Vers: 2.6.2 Maintainer: Expat Project Archive Site: https://github.com/libexpat/libexpat/releases Home Page: http://www.libexpat.org/ -Date: 2024-02-07 +Date: 2024-03-14 Mailing List: expat-disc...@libexpat.org Responsible: mrg License: MIT
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu Mar 14 09:13:58 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: expat-2.6.2 is out To generate a diff of this commit: cvs rdiff -u -r1.1998 -r1.1999 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
