CVS commit: src/tests/lib/libc/gen/exect
Module Name:src
Committed By: kamil
Date: Fri Dec 9 06:47:48 UTC 2016
Modified Files:
src/tests/lib/libc/gen/exect: t_exect.c
Log Message:
Add check in t_exect_null to verify that SIGTRAP was emitted only once
Currently this test fails on amd64.
PR port-amd64/51700
exect(NULL,NULL,NULL) generates 15859 times SIGTRAP on amd64
On FreeBSD/amd64 this tests passes correctly.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/gen/exect/t_exect.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/exect/t_exect.c
diff -u src/tests/lib/libc/gen/exect/t_exect.c:1.2 src/tests/lib/libc/gen/exect/t_exect.c:1.3
--- src/tests/lib/libc/gen/exect/t_exect.c:1.2 Fri Dec 9 06:12:02 2016
+++ src/tests/lib/libc/gen/exect/t_exect.c Fri Dec 9 06:47:48 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_exect.c,v 1.2 2016/12/09 06:12:02 kamil Exp $ */
+/* $NetBSD: t_exect.c,v 1.3 2016/12/09 06:47:48 kamil Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -42,17 +42,26 @@ ATF_TC_HEAD(t_exect_null, tc)
"Tests an empty exect(2) executing");
}
+static sig_atomic_t caught = 0;
+
static void
sigtrap_handler(int sig, siginfo_t *info, void *ctx)
{
ATF_REQUIRE_EQ(sig, SIGTRAP);
ATF_REQUIRE_EQ(info->si_code, TRAP_TRACE);
+
+ ++caught;
}
ATF_TC_BODY(t_exect_null, tc)
{
struct sigaction act;
+ /*
+ * exect(NULL,NULL,NULL) generates 15859 times SIGTRAP on amd64
+ */
+ atf_tc_expect_fail("PR port-amd64/51700");
+
ATF_REQUIRE(sigemptyset(&act.sa_mask) == 0);
act.sa_sigaction = sigtrap_handler;
act.sa_flags = SA_SIGINFO;
@@ -60,6 +69,9 @@ ATF_TC_BODY(t_exect_null, tc)
ATF_REQUIRE(sigaction(SIGTRAP, &act, 0) == 0);
ATF_REQUIRE_ERRNO(EFAULT, exect(NULL, NULL, NULL) == -1);
+
+ ATF_REQUIRE_EQ_MSG(caught, 1, "expected caught (1) != received (%d)",
+ caught);
}
ATF_TP_ADD_TCS(tp)
CVS commit: src
Module Name:src Committed By: kamil Date: Fri Dec 9 06:12:02 UTC 2016 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests src/tests/lib/libc/gen: Makefile src/tests/lib/libc/gen/exect: t_exect.c Log Message: Attach t_exect to ATF tests and distribution Add missing SIGTRAP handler. Assert there that the signal is SIGTRAP as expected and si_code TRAP_TRACE. This test will break on some ports that have dummy or incomplete implementation of exect(2). This test works on amd64 correctly. Sponsored by To generate a diff of this commit: cvs rdiff -u -r1.183 -r1.184 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.706 -r1.707 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.136 -r1.137 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.49 -r1.50 src/tests/lib/libc/gen/Makefile cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/gen/exect/t_exect.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.183 src/distrib/sets/lists/debug/mi:1.184 --- src/distrib/sets/lists/debug/mi:1.183 Fri Dec 2 05:54:14 2016 +++ src/distrib/sets/lists/debug/mi Fri Dec 9 06:12:02 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.183 2016/12/02 05:54:14 kamil Exp $ +# $NetBSD: mi,v 1.184 2016/12/09 06:12:02 kamil Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -1863,6 +1863,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/db/h_db.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/db/h_lfsr.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/db/t_db_hash_seq.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/gen/exect/t_exect.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/gen/execve/t_execve.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/h_fileactions.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/h_spawn.debug tests-kernel-tests debug,atf,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.706 src/distrib/sets/lists/tests/mi:1.707 --- src/distrib/sets/lists/tests/mi:1.706 Fri Dec 2 05:54:14 2016 +++ src/distrib/sets/lists/tests/mi Fri Dec 9 06:12:02 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.706 2016/12/02 05:54:14 kamil Exp $ +# $NetBSD: mi,v 1.707 2016/12/09 06:12:02 kamil Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -90,6 +90,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/c063tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/dbtests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/gentests-lib-debug compattestfile,atf +./usr/libdata/debug/usr/tests/lib/libc/gen/exect tests-kernel-tests compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/execve tests-kernel-tests compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn tests-kernel-tests compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/getaddrinfo tests-obsolete obsolete @@ -2417,6 +2418,10 @@ ./usr/tests/lib/libc/gen tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/gen/Atffile tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/gen/Kyuafile tests-lib-tests compattestfile,atf,kyua +./usr/tests/lib/libc/gen/exect tests-kernel-tests compattestfile,atf +./usr/tests/lib/libc/gen/exect/Atffile tests-kernel-tests compattestfile,atf +./usr/tests/lib/libc/gen/exect/Kyuafile tests-kernel-tests compattestfile,atf,kyua +./usr/tests/lib/libc/gen/exect/t_exect tests-kernel-tests compattestfile,atf ./usr/tests/lib/libc/gen/execve tests-kernel-tests compattestfile,atf ./usr/tests/lib/libc/gen/execve/Atffile tests-kernel-tests compattestfile,atf ./usr/tests/lib/libc/gen/execve/Kyuafile tests-kernel-tests compattestfile,atf,kyua Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.136 src/etc/mtree/NetBSD.dist.tests:1.137 --- src/etc/mtree/NetBSD.dist.tests:1.136 Fri Dec 2 05:54:14 2016 +++ src/etc/mtree/NetBSD.dist.tests Fri Dec 9 06:12:02 2016 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.136 2016/12/02 05:54:14 kamil Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.137 2016/12/09 06:12:02 kamil Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -80,6 +80,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/c063 ./usr/libdata/debug/usr/tests/lib/libc/db ./usr/libdata/debug/usr/tests/lib/libc/gen +./usr/libdata/debug/usr/tests/lib/libc/gen/exect ./usr/libdata/debug/usr/tes
CVS commit: src/sys/modules/spkr
Module Name:src
Committed By: christos
Date: Fri Dec 9 06:12:03 UTC 2016
Modified Files:
src/sys/modules/spkr: Makefile
Log Message:
sync with latest. this should either be called spkr_pcppi or made to work
with both busses.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/spkr/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/spkr/Makefile
diff -u src/sys/modules/spkr/Makefile:1.4 src/sys/modules/spkr/Makefile:1.5
--- src/sys/modules/spkr/Makefile:1.4 Thu Dec 8 21:22:56 2016
+++ src/sys/modules/spkr/Makefile Fri Dec 9 01:12:03 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2016/12/09 02:22:56 christos Exp $
+# $NetBSD: Makefile,v 1.5 2016/12/09 06:12:03 christos Exp $
.include "../Makefile.inc"
-.PATH: ${S}/dev/isa
+.PATH: ${S}/dev/isa ${S}/dev
KMOD= spkr
IOCONF= spkr.ioconf
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Fri Dec 9 06:05:25 UTC 2016 Modified Files: src/distrib/sets/lists/comp: mi Log Message: put back the isa/spkrio.h for compat To generate a diff of this commit: cvs rdiff -u -r1.2078 -r1.2079 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2078 src/distrib/sets/lists/comp/mi:1.2079 --- src/distrib/sets/lists/comp/mi:1.2078 Fri Dec 9 00:18:37 2016 +++ src/distrib/sets/lists/comp/mi Fri Dec 9 01:05:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2078 2016/12/09 05:18:37 christos Exp $ +# $NetBSD: mi,v 1.2079 2016/12/09 06:05:25 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -577,7 +577,7 @@ ./usr/include/dev/isa/sbdspvar.h comp-obsolete obsolete ./usr/include/dev/isa/sbreg.h comp-obsolete obsolete ./usr/include/dev/isa/sbvar.h comp-obsolete obsolete -./usr/include/dev/isa/spkrio.h comp-obsolete obsolete +./usr/include/dev/isa/spkrio.h comp-c-include ./usr/include/dev/isa/vga_isavar.h comp-obsolete obsolete ./usr/include/dev/isa/wdlink.h comp-obsolete obsolete ./usr/include/dev/isa/wdreg.h comp-obsolete obsolete
CVS commit: src/sys/dev/isa
Module Name:src Committed By: christos Date: Fri Dec 9 06:04:06 UTC 2016 Modified Files: src/sys/dev/isa: Makefile Added Files: src/sys/dev/isa: spkrio.h Log Message: put back spkrio.h for compat To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/isa/Makefile cvs rdiff -u -r0 -r1.5 src/sys/dev/isa/spkrio.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/isa/Makefile diff -u src/sys/dev/isa/Makefile:1.9 src/sys/dev/isa/Makefile:1.10 --- src/sys/dev/isa/Makefile:1.9 Thu Dec 8 23:46:39 2016 +++ src/sys/dev/isa/Makefile Fri Dec 9 01:04:06 2016 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2016/12/09 04:46:39 christos Exp $ +# $NetBSD: Makefile,v 1.10 2016/12/09 06:04:06 christos Exp $ INCSDIR= /usr/include/dev/isa # Only install includes which are used by userland -INCS= isvio.h satlinkio.h wtreg.h +INCS= isvio.h satlinkio.h spkrio.h wtreg.h .include Added files: Index: src/sys/dev/isa/spkrio.h diff -u /dev/null src/sys/dev/isa/spkrio.h:1.5 --- /dev/null Fri Dec 9 01:04:06 2016 +++ src/sys/dev/isa/spkrio.h Fri Dec 9 01:04:06 2016 @@ -0,0 +1,2 @@ +/* $NetBSD: spkrio.h,v 1.5 2016/12/09 06:04:06 christos Exp $ */ +#include
CVS commit: src/sys/dev
Module Name:src Committed By: christos Date: Fri Dec 9 05:45:20 UTC 2016 Modified Files: src/sys/dev: spkrvar.h Log Message: include Modified files: Index: src/sys/dev/spkrvar.h diff -u src/sys/dev/spkrvar.h:1.2 src/sys/dev/spkrvar.h:1.3 --- src/sys/dev/spkrvar.h:1.2 Thu Dec 8 23:46:39 2016 +++ src/sys/dev/spkrvar.h Fri Dec 9 00:45:20 2016 @@ -1,8 +1,10 @@ -/* $NetBSD: spkrvar.h,v 1.2 2016/12/09 04:46:39 christos Exp $ */ +/* $NetBSD: spkrvar.h,v 1.3 2016/12/09 05:45:20 christos Exp $ */ #ifndef _SYS_DEV_SPKRVAR_H #define _SYS_DEV_SPKRVAR_H +#include + device_t speakerattach_mi(device_t); void speaker_play(u_int, u_int, u_int);
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Fri Dec 9 05:41:31 UTC 2016 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: 1294-1300 To generate a diff of this commit: cvs rdiff -u -r1.1.2.126 -r1.1.2.127 src/doc/CHANGES-7.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.126 src/doc/CHANGES-7.1:1.1.2.127 --- src/doc/CHANGES-7.1:1.1.2.126 Thu Dec 8 08:12:10 2016 +++ src/doc/CHANGES-7.1 Fri Dec 9 05:41:31 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.126 2016/12/08 08:12:10 snj Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.127 2016/12/09 05:41:31 snj Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -7163,3 +7163,56 @@ sys/arch/x86/x86/procfs_machdep.c 1.12- - Update some Linux mapping unused in /proc/cpuinfo. [msaitoh, ticket #1293] +sys/dev/pci/ichsmb.c1.43-1.44 + + ichsmb(4): Add Braswell PCU SMBus and Intel 100 Series SMBus. + [msaitoh, ticket #1294] + +sys/arch/x86/pci/ichlpcib.c 1.50 + + Add Core 5G (mobile) LPC support. + [msaitoh, ticket #1295] + +sys/dev/pci/pci_subr.c1.155 via patch + + Protect against buffer overflow. + [pgoyette, ticket #1296] + +sys/arch/amd64/conf/ALL1.37 +sys/arch/amd64/conf/GENERIC 1.436 +sys/arch/amd64/conf/XEN3_DOM0 1.120 +sys/arch/i386/conf/ALL1.400 +sys/arch/i386/conf/GENERIC 1.1138 +sys/arch/i386/conf/XEN3_DOM0 1.99 + + x86 kernel configs: + - Add ichsmb(4), spdmem(4) and iic(4) to XEN3_DOM0. + - Add sdtemp(4). For ALL kernels, it's enabled. For others, it's + commented out. + [msaitoh, ticket #1297] + +sys/dev/pci/pcidevs1.1246 +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen +sys/dev/pci/piixide.c1.65 + + Correct name of 82801HBM AHCI SATA Controller and + SATA RAID Controller. + [msaitoh, ticket #1298] + +sys/dev/mii/miidevs1.123, 1.124 +sys/dev/mii/miidevs.hregen +sys/dev/mii/miidevs_data.h regen + + - Add xxMarvell E6060 6-port 10/100 Fast Ethernet Switch + - Add Marvell 88E1512. + [msaitoh, ticket #1299] + +sys/dev/pci/if_wm.c1.426 +sys/dev/pci/pcidevs1.1270 +sys/dev/pci/pcidevs.hregen +sys/edv/pci/pcidevs_data.h regen + + i82567V-3 is not ICH9 but ICH8. + [msaitoh, ticket #1300] +
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Fri Dec 9 05:28:26 UTC 2016
Modified Files:
src/sys/dev/pci [netbsd-7]: pcidevs.h pcidevs_data.h
Log Message:
regen for ticket 1300
To generate a diff of this commit:
cvs rdiff -u -r1.1192.2.8 -r1.1192.2.9 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1191.2.8 -r1.1191.2.9 src/sys/dev/pci/pcidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1192.2.8 src/sys/dev/pci/pcidevs.h:1.1192.2.9
--- src/sys/dev/pci/pcidevs.h:1.1192.2.8 Fri Dec 9 05:16:34 2016
+++ src/sys/dev/pci/pcidevs.h Fri Dec 9 05:28:12 2016
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1192.2.8 2016/12/09 05:16:34 snj Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1192.2.9 2016/12/09 05:28:12 snj Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1199.2.8 2016/12/09 05:15:18 snj Exp
+ * NetBSD: pcidevs,v 1.1199.2.9 2016/12/09 05:27:30 snj Exp
*/
/*
@@ -2975,7 +2975,7 @@
#define PCI_PRODUCT_INTEL_82870P2_PPB 0x1460 /* 82870P2 P64H2 PCI-PCI Bridge */
#define PCI_PRODUCT_INTEL_82870P2_IOxAPIC 0x1461 /* 82870P2 P64H2 IOxAPIC */
#define PCI_PRODUCT_INTEL_82870P2_HPLUG 0x1462 /* 82870P2 P64H2 Hot Plug Controller */
-#define PCI_PRODUCT_INTEL_82801I_82567V_3 0x1501 /* i82567V-3 LAN Controller */
+#define PCI_PRODUCT_INTEL_82801H_82567V_3 0x1501 /* i82567V-3 LAN Controller */
#define PCI_PRODUCT_INTEL_PCH2_LV_LM 0x1502 /* 82579LM Gigabit Network Connection */
#define PCI_PRODUCT_INTEL_PCH2_LV_V 0x1503 /* 82579V Gigabit Network Connection */
#define PCI_PRODUCT_INTEL_82599_SFP_EM 0x1507 /* 82599 10G Ethernet Express Module */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1191.2.8 src/sys/dev/pci/pcidevs_data.h:1.1191.2.9
--- src/sys/dev/pci/pcidevs_data.h:1.1191.2.8 Fri Dec 9 05:16:35 2016
+++ src/sys/dev/pci/pcidevs_data.h Fri Dec 9 05:28:13 2016
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1191.2.8 2016/12/09 05:16:35 snj Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1191.2.9 2016/12/09 05:28:13 snj Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1199.2.8 2016/12/09 05:15:18 snj Exp
+ * NetBSD: pcidevs,v 1.1199.2.9 2016/12/09 05:27:30 snj Exp
*/
/*
@@ -4686,7 +4686,7 @@ static const uint16_t pci_products[] = {
19362, 19370, 17461, 0,
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82870P2_HPLUG,
19362, 19370, 19376, 19380, 6293, 0,
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_82567V_3,
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_82567V_3,
19385, 4534, 6293, 0,
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCH2_LV_LM,
19395, 5547, 3888, 18507, 0,
CVS commit: [netbsd-7] src/sys/dev/mii
Module Name:src Committed By: snj Date: Fri Dec 9 05:23:31 UTC 2016 Modified Files: src/sys/dev/mii [netbsd-7]: miidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1299): sys/dev/mii/miidevs: revisions 1.123, 1.124 Add xxMarvell E6060 6-port 10/100 Fast Ethernet Switch -- Add Marvell 88E1512. To generate a diff of this commit: cvs rdiff -u -r1.120.2.1 -r1.120.2.2 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.120.2.1 src/sys/dev/mii/miidevs:1.120.2.2 --- src/sys/dev/mii/miidevs:1.120.2.1 Sat Jan 17 13:46:39 2015 +++ src/sys/dev/mii/miidevs Fri Dec 9 05:23:31 2016 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.120.2.1 2015/01/17 13:46:39 martin Exp $ +$NetBSD: miidevs,v 1.120.2.2 2016/12/09 05:23:31 snj Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -261,6 +261,8 @@ model xxMARVELL E1112 0x0009 Marvell 88 model xxMARVELL E1149 0x000b Marvell 88E1149 Gigabit PHY model xxMARVELL E 0x000c Marvell 88E Gigabit PHY model xxMARVELL E1145 0x000d Marvell 88E1145 Quad Gigabit PHY +model xxMARVELL E6060 0x0010 Marvell 88E6060 6-Port 10/100 Fast Ethernet Switch +model xxMARVELL E1512 0x001d Marvell 88E1512 Gigabit PHY model xxMARVELL E1116 0x0021 Marvell 88E1116 Gigabit PHY model xxMARVELL E1118 0x0022 Marvell 88E1118 Gigabit PHY model xxMARVELL E1116R 0x0024 Marvell 88E1116R Gigabit PHY
CVS commit: [netbsd-7] src/sys/dev/mii
Module Name:src
Committed By: snj
Date: Fri Dec 9 05:23:58 UTC 2016
Modified Files:
src/sys/dev/mii [netbsd-7]: miidevs.h miidevs_data.h
Log Message:
regen for ticket 1299
To generate a diff of this commit:
cvs rdiff -u -r1.123.2.1 -r1.123.2.2 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.111.2.1 -r1.111.2.2 src/sys/dev/mii/miidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.123.2.1 src/sys/dev/mii/miidevs.h:1.123.2.2
--- src/sys/dev/mii/miidevs.h:1.123.2.1 Sat Jan 17 14:13:40 2015
+++ src/sys/dev/mii/miidevs.h Fri Dec 9 05:23:58 2016
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.123.2.1 2015/01/17 14:13:40 martin Exp $ */
+/* $NetBSD: miidevs.h,v 1.123.2.2 2016/12/09 05:23:58 snj Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.120.2.1 2015/01/17 13:46:39 martin Exp
+ * NetBSD: miidevs,v 1.120.2.2 2016/12/09 05:23:31 snj Exp
*/
/*-
@@ -383,6 +383,10 @@
#define MII_STR_xxMARVELL_E "Marvell 88E Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1145 0x000d
#define MII_STR_xxMARVELL_E1145 "Marvell 88E1145 Quad Gigabit PHY"
+#define MII_MODEL_xxMARVELL_E6060 0x0010
+#define MII_STR_xxMARVELL_E6060 "Marvell 88E6060 6-Port 10/100 Fast Ethernet Switch"
+#define MII_MODEL_xxMARVELL_E1512 0x001d
+#define MII_STR_xxMARVELL_E1512 "Marvell 88E1512 Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1116 0x0021
#define MII_STR_xxMARVELL_E1116 "Marvell 88E1116 Gigabit PHY"
#define MII_MODEL_xxMARVELL_E1118 0x0022
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.111.2.1 src/sys/dev/mii/miidevs_data.h:1.111.2.2
--- src/sys/dev/mii/miidevs_data.h:1.111.2.1 Sat Jan 17 14:13:40 2015
+++ src/sys/dev/mii/miidevs_data.h Fri Dec 9 05:23:58 2016
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.111.2.1 2015/01/17 14:13:40 martin Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.111.2.2 2016/12/09 05:23:58 snj Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.120.2.1 2015/01/17 13:46:39 martin Exp
+ * NetBSD: miidevs,v 1.120.2.2 2016/12/09 05:23:31 snj Exp
*/
/*-
@@ -152,6 +152,8 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1149, MII_STR_xxMARVELL_E1149 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E, MII_STR_xxMARVELL_E },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1145, MII_STR_xxMARVELL_E1145 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E6060, MII_STR_xxMARVELL_E6060 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1512, MII_STR_xxMARVELL_E1512 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116, MII_STR_xxMARVELL_E1116 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1118, MII_STR_xxMARVELL_E1118 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R, MII_STR_xxMARVELL_E1116R },
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Fri Dec 9 05:27:30 UTC 2016
Modified Files:
src/sys/dev/pci [netbsd-7]: if_wm.c pcidevs
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1300):
sys/dev/pci/pcidevs: revision 1.1270
sys/dev/pci/if_wm.c: revision 1.426
i82567V-3 is not ICH9 but ICH8.
--
82567V-3 is not ICH9 but ICH8.
To generate a diff of this commit:
cvs rdiff -u -r1.289.2.9 -r1.289.2.10 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.1199.2.8 -r1.1199.2.9 src/sys/dev/pci/pcidevs
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.289.2.9 src/sys/dev/pci/if_wm.c:1.289.2.10
--- src/sys/dev/pci/if_wm.c:1.289.2.9 Fri Feb 26 22:08:17 2016
+++ src/sys/dev/pci/if_wm.c Fri Dec 9 05:27:30 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.289.2.9 2016/02/26 22:08:17 snj Exp $ */
+/* $NetBSD: if_wm.c,v 1.289.2.10 2016/12/09 05:27:30 snj Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.9 2016/02/26 22:08:17 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.10 2016/12/09 05:27:30 snj Exp $");
#include
#include
@@ -1029,6 +1029,9 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_IFE_G,
"Intel i82801H IFE (G) LAN Controller",
WM_T_ICH8, WMP_F_COPPER },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801H_82567V_3,
+ "82567V-3 LAN Controller",
+ WM_T_ICH8, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_IGP_AMT,
"82801I (AMT) LAN Controller",
WM_T_ICH9, WMP_F_COPPER },
@@ -1056,9 +1059,6 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_BM,
"82567LM-4 LAN Controller",
WM_T_ICH9, WMP_F_COPPER },
- { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801I_82567V_3,
- "82567V-3 LAN Controller",
- WM_T_ICH9, WMP_F_COPPER },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801J_R_BM_LM,
"82567LM-2 LAN Controller",
WM_T_ICH10, WMP_F_COPPER },
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1199.2.8 src/sys/dev/pci/pcidevs:1.1199.2.9
--- src/sys/dev/pci/pcidevs:1.1199.2.8 Fri Dec 9 05:15:18 2016
+++ src/sys/dev/pci/pcidevs Fri Dec 9 05:27:30 2016
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1199.2.8 2016/12/09 05:15:18 snj Exp $
+$NetBSD: pcidevs,v 1.1199.2.9 2016/12/09 05:27:30 snj Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2968,7 +2968,7 @@ product INTEL 82439HX 0x1250 82439HX (T
product INTEL 82870P2_PPB 0x1460 82870P2 P64H2 PCI-PCI Bridge
product INTEL 82870P2_IOxAPIC 0x1461 82870P2 P64H2 IOxAPIC
product INTEL 82870P2_HPLUG 0x1462 82870P2 P64H2 Hot Plug Controller
-product INTEL 82801I_82567V_3 0x1501 i82567V-3 LAN Controller
+product INTEL 82801H_82567V_3 0x1501 i82567V-3 LAN Controller
product INTEL PCH2_LV_LM 0x1502 82579LM Gigabit Network Connection
product INTEL PCH2_LV_V 0x1503 82579V Gigabit Network Connection
product INTEL 82599_SFP_EM 0x1507 82599 10G Ethernet Express Module
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: christos Date: Fri Dec 9 05:18:37 UTC 2016 Modified Files: src/distrib/sets/lists/comp: mi Log Message: spkrio.h is not isa only anymore. To generate a diff of this commit: cvs rdiff -u -r1.2077 -r1.2078 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2077 src/distrib/sets/lists/comp/mi:1.2078 --- src/distrib/sets/lists/comp/mi:1.2077 Thu Dec 1 21:29:54 2016 +++ src/distrib/sets/lists/comp/mi Fri Dec 9 00:18:37 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2077 2016/12/02 02:29:54 riastradh Exp $ +# $NetBSD: mi,v 1.2078 2016/12/09 05:18:37 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -577,7 +577,7 @@ ./usr/include/dev/isa/sbdspvar.h comp-obsolete obsolete ./usr/include/dev/isa/sbreg.h comp-obsolete obsolete ./usr/include/dev/isa/sbvar.h comp-obsolete obsolete -./usr/include/dev/isa/spkrio.h comp-c-include +./usr/include/dev/isa/spkrio.h comp-obsolete obsolete ./usr/include/dev/isa/vga_isavar.h comp-obsolete obsolete ./usr/include/dev/isa/wdlink.h comp-obsolete obsolete ./usr/include/dev/isa/wdreg.h comp-obsolete obsolete @@ -698,6 +698,7 @@ ./usr/include/dev/scsipi/ses.h comp-c-include ./usr/include/dev/scsipi/ss_mustek.h comp-obsolete obsolete ./usr/include/dev/scsipi/ssvar.h comp-obsolete obsolete +./usr/include/dev/spkrio.h comp-c-include ./usr/include/dev/sun/disklabel.h comp-c-include ./usr/include/dev/sun/eeprom.h comp-c-include ./usr/include/dev/sun/event_var.h comp-obsolete obsolete
CVS commit: src/sys/dev
Module Name:src
Committed By: christos
Date: Fri Dec 9 05:17:04 UTC 2016
Modified Files:
src/sys/dev: spkr.c spkr_synth.c
src/sys/dev/isa: spkr_pcppi.c
Log Message:
fix module build
XXX: spkr module is the pcppi version.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/spkr.c src/sys/dev/spkr_synth.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/isa/spkr_pcppi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/spkr.c
diff -u src/sys/dev/spkr.c:1.2 src/sys/dev/spkr.c:1.3
--- src/sys/dev/spkr.c:1.2 Thu Dec 8 23:46:39 2016
+++ src/sys/dev/spkr.c Fri Dec 9 00:17:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.2 2016/12/09 04:46:39 christos Exp $ */
+/* $NetBSD: spkr.c,v 1.3 2016/12/09 05:17:03 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.2 2016/12/09 04:46:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.3 2016/12/09 05:17:03 christos Exp $");
#include
#include
@@ -478,15 +478,18 @@ spkrioctl(dev_t dev, u_long cmd, void *d
return(0);
}
+#ifdef _MODULE
+extern struct cfdriver spkr_cd;
+#include "ioconf.c"
+#endif
+
int
spkr__modcmd(modcmd_t cmd, void *arg)
{
#ifdef _MODULE
devmajor_t bmajor, cmajor;
-#endif
int error = 0;
-#ifdef _MODULE
switch(cmd) {
case MODULE_CMD_INIT:
bmajor = cmajor = -1;
@@ -513,7 +516,9 @@ spkr__modcmd(modcmd_t cmd, void *arg)
error = ENOTTY;
break;
}
-#endif
return error;
+#else
+ return 0;
+#endif
}
Index: src/sys/dev/spkr_synth.c
diff -u src/sys/dev/spkr_synth.c:1.2 src/sys/dev/spkr_synth.c:1.3
--- src/sys/dev/spkr_synth.c:1.2 Thu Dec 8 23:32:39 2016
+++ src/sys/dev/spkr_synth.c Fri Dec 9 00:17:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_synth.c,v 1.2 2016/12/09 04:32:39 christos Exp $ */
+/* $NetBSD: spkr_synth.c,v 1.3 2016/12/09 05:17:03 christos Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.2 2016/12/09 04:32:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.3 2016/12/09 05:17:03 christos Exp $");
#include
#include
@@ -77,11 +77,6 @@ spkr_modcmd(modcmd_t cmd, void *arg)
return spkr__modcmd(cmd, arg);
}
-#ifdef _MODULE
-#include "ioconf.c"
-#endif
-
-
CFATTACH_DECL3_NEW(spkr_synth, 0,
spkr_probe, spkrattach, spkrdetach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
Index: src/sys/dev/isa/spkr_pcppi.c
diff -u src/sys/dev/isa/spkr_pcppi.c:1.3 src/sys/dev/isa/spkr_pcppi.c:1.4
--- src/sys/dev/isa/spkr_pcppi.c:1.3 Thu Dec 8 23:46:39 2016
+++ src/sys/dev/isa/spkr_pcppi.c Fri Dec 9 00:17:03 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_pcppi.c,v 1.3 2016/12/09 04:46:39 christos Exp $ */
+/* $NetBSD: spkr_pcppi.c,v 1.4 2016/12/09 05:17:03 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.3 2016/12/09 04:46:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.4 2016/12/09 05:17:03 christos Exp $");
#include
#include
@@ -78,10 +78,6 @@ spkr_modcmd(modcmd_t cmd, void *arg)
return spkr__modcmd(cmd, arg);
}
-#ifdef _MODULE
-#include "ioconf.c"
-#endif
-
CFATTACH_DECL_NEW(spkr_pcppi, 0, spkr_probe, spkrattach, spkrdetach, NULL);
static pcppi_tag_t ppicookie;
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Fri Dec 9 05:15:18 UTC 2016
Modified Files:
src/sys/dev/pci [netbsd-7]: pcidevs piixide.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1298):
sys/dev/pci/piixide.c: revision 1.65
sys/dev/pci/pcidevs: revision 1.1246
- s/82081/82801/ from OpenBSD.
- 0x2829 is SATA. 0x282a is RAID.
--
Rename macro (sync with pcidevs rev. 1.1246). No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.1199.2.7 -r1.1199.2.8 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.64 -r1.64.12.1 src/sys/dev/pci/piixide.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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1199.2.7 src/sys/dev/pci/pcidevs:1.1199.2.8
--- src/sys/dev/pci/pcidevs:1.1199.2.7 Thu Dec 8 07:56:45 2016
+++ src/sys/dev/pci/pcidevs Fri Dec 9 05:15:18 2016
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1199.2.7 2016/12/08 07:56:45 snj Exp $
+$NetBSD: pcidevs,v 1.1199.2.8 2016/12/09 05:15:18 snj Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -3571,8 +3571,8 @@ product INTEL 82801H_SATA_2 0x2825 82801
product INTEL C610_SATA_RAID_3 0x2826 C61x/X99 SATA Controller (RAID)
product INTEL C610_SSATA_RAID_2 0x2827 C61x/X99 sSATA Controller (RAID)
product INTEL 82801HEM_SATA 0x2828 82801HEM SATA Controller
-product INTEL 82801HBM_SATA_1 0x2829 82801HBM SATA Controller
-product INTEL 82801HBM_SATA_2 0x282a 82081HBM SATA Controller
+product INTEL 82801HBM_SATA_AHCI 0x2829 82801HBM AHCI SATA Controller
+product INTEL 82801HBM_SATA_RAID 0x282a 82801HBM SATA RAID Controller
product INTEL 82801H_USB_1 0x2830 82801H USB UHCI Controller
product INTEL 82801H_USB_2 0x2831 82801H USB UHCI Controller
product INTEL 82801H_USB_3 0x2832 82801H USB UHCI Controller
Index: src/sys/dev/pci/piixide.c
diff -u src/sys/dev/pci/piixide.c:1.64 src/sys/dev/pci/piixide.c:1.64.12.1
--- src/sys/dev/pci/piixide.c:1.64 Wed Nov 14 01:05:49 2012
+++ src/sys/dev/pci/piixide.c Fri Dec 9 05:15:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: piixide.c,v 1.64 2012/11/14 01:05:49 jakllsch Exp $ */
+/* $NetBSD: piixide.c,v 1.64.12.1 2016/12/09 05:15:18 snj Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.64 2012/11/14 01:05:49 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixide.c,v 1.64.12.1 2016/12/09 05:15:18 snj Exp $");
#include
#include
@@ -203,14 +203,14 @@ static const struct pciide_product_desc
"Intel 82801HBM IDE Controller (ICH8M)",
piix_chip_map,
},
- { PCI_PRODUCT_INTEL_82801HBM_SATA_1,
+ { PCI_PRODUCT_INTEL_82801HBM_SATA_AHCI,
0,
- "Intel 82801HBM Serial ATA Controller (ICH8M)",
+ "Intel 82801HBM Serial ATA AHCI Controller (ICH8M)",
piixsata_chip_map,
},
- { PCI_PRODUCT_INTEL_82801HBM_SATA_2,
+ { PCI_PRODUCT_INTEL_82801HBM_SATA_RAID,
0,
- "Intel 82801HBM Serial ATA Controller (ICH8M)",
+ "Intel 82801HBM Serial ATA RAID Controller (ICH8M)",
piixsata_chip_map,
},
{ PCI_PRODUCT_INTEL_82801HEM_SATA,
CVS commit: [netbsd-7] src/sys/arch
Module Name:src Committed By: snj Date: Fri Dec 9 05:10:45 UTC 2016 Modified Files: src/sys/arch/amd64/conf [netbsd-7]: ALL GENERIC XEN3_DOM0 src/sys/arch/i386/conf [netbsd-7]: ALL GENERIC XEN3_DOM0 Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1297): sys/arch/amd64/conf/ALL: revision 1.37 sys/arch/amd64/conf/GENERIC: revision 1.436 sys/arch/amd64/conf/XEN3_DOM0: revision 1.120 sys/arch/i386/conf/ALL: revision 1.400 sys/arch/i386/conf/GENERIC: revision 1.1138 sys/arch/i386/conf/XEN3_DOM0: revision 1.99 Add sdtemp(4) -- Add ichsmb(4), spdmem(4) and sdtemp(4). To generate a diff of this commit: cvs rdiff -u -r1.13.2.3 -r1.13.2.4 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.392.2.7 -r1.392.2.8 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.103.2.4 -r1.103.2.5 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.380.2.2 -r1.380.2.3 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1107.2.8 -r1.1107.2.9 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.85.2.5 -r1.85.2.6 src/sys/arch/i386/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.13.2.3 src/sys/arch/amd64/conf/ALL:1.13.2.4 --- src/sys/arch/amd64/conf/ALL:1.13.2.3 Fri May 15 03:44:17 2015 +++ src/sys/arch/amd64/conf/ALL Fri Dec 9 05:10:45 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.13.2.3 2015/05/15 03:44:17 snj Exp $ +# $NetBSD: ALL,v 1.13.2.4 2016/12/09 05:10:45 snj Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.13.2.3 $" +#ident "ALL-$Revision: 1.13.2.4 $" maxusers 64 # estimated number of users @@ -668,6 +668,13 @@ spdmem* at iic? addr 0x55 spdmem* at iic? addr 0x56 spdmem* at iic? addr 0x57 sdtemp* at iic? addr 0x18 +sdtemp* at iic? addr 0x19 +sdtemp* at iic? addr 0x1a +sdtemp* at iic? addr 0x1b +sdtemp* at iic? addr 0x1c +sdtemp* at iic? addr 0x1d +sdtemp* at iic? addr 0x1e +sdtemp* at iic? addr 0x1f # I2O devices iop* at pci? dev ? function ? # I/O processor Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.392.2.7 src/sys/arch/amd64/conf/GENERIC:1.392.2.8 --- src/sys/arch/amd64/conf/GENERIC:1.392.2.7 Fri May 15 03:44:17 2015 +++ src/sys/arch/amd64/conf/GENERIC Fri Dec 9 05:10:45 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.392.2.7 2015/05/15 03:44:17 snj Exp $ +# $NetBSD: GENERIC,v 1.392.2.8 2016/12/09 05:10:45 snj Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.392.2.7 $" +#ident "GENERIC-$Revision: 1.392.2.8 $" maxusers 64 # estimated number of users @@ -515,6 +515,14 @@ iic* at ichsmb? #spdmem* at iic? addr 0x55 #spdmem* at iic? addr 0x56 #spdmem* at iic? addr 0x57 +#sdtemp* at iic? addr 0x18 +#sdtemp* at iic? addr 0x19 +#sdtemp* at iic? addr 0x1a +#sdtemp* at iic? addr 0x1b +#sdtemp* at iic? addr 0x1c +#sdtemp* at iic? addr 0x1d +#sdtemp* at iic? addr 0x1e +#sdtemp* at iic? addr 0x1f # I2O devices iop* at pci? dev ? function ? # I/O processor Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.4 src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.5 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.4 Wed Jul 22 16:53:34 2015 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri Dec 9 05:10:45 2016 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.103.2.4 2015/07/22 16:53:34 snj Exp $ +# $NetBSD: XEN3_DOM0,v 1.103.2.5 2016/12/09 05:10:45 snj Exp $ include "arch/amd64/conf/std.xen" @@ -299,11 +299,33 @@ amdtemp* at amdnb_misc? # AMD CPU Temp amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface #iic* at amdpm? # sensors below are on this bus +# Intel ICH SMBus controller +ichsmb* at pci? dev ? function ? +iic* at ichsmb? + # Thermal monitor and fan controller #dbcool* at iic? addr 0x2C # Unknown other motherboard(s) #dbcool* at iic? addr 0x2D # Tyan S2881 #dbcool* at iic? addr 0x2E # Tyan S2882-D +# Serial Presence Detect capable memory modules +#spdmem* at iic? addr 0x50 +#spdmem* at iic? addr 0x51 +#spdmem* at iic? addr 0x52 +#spdmem* at iic? addr 0x53 +#spdmem* at iic? addr 0x54 +#spdmem* at iic? addr 0x55 +#spdmem* at iic? addr 0x56 +#spdmem* at iic? addr 0x57 +#sdtemp* at iic? addr 0x18 +#sdtemp* at iic? addr 0x19 +#sdtemp* at iic? addr 0x1a +#sdtemp* at iic? addr 0x1b +#sdtemp* at iic? addr 0x1c +#sdtemp* at iic? addr 0x1d +#sdtemp* at iic? addr 0x1e +#sdtemp* at iic? addr 0x1f + # Winbond LPC Super I/O #wbsio* at isa? port 0x2e #wbsio* at isa? port 0x4e Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src
Committed By: snj
Date: Fri Dec 9 04:56:25 UTC 2016
Modified Files:
src/sys/dev/pci [netbsd-7]: pci_subr.c
Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #1296):
sys/dev/pci/pci_subr.c: revision 1.155 via patch
Protect against buffer overflow.
To generate a diff of this commit:
cvs rdiff -u -r1.124.2.2 -r1.124.2.3 src/sys/dev/pci/pci_subr.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/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.124.2.2 src/sys/dev/pci/pci_subr.c:1.124.2.3
--- src/sys/dev/pci/pci_subr.c:1.124.2.2 Sun Dec 14 16:49:35 2014
+++ src/sys/dev/pci/pci_subr.c Fri Dec 9 04:56:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.124.2.2 2014/12/14 16:49:35 martin Exp $ */
+/* $NetBSD: pci_subr.c,v 1.124.2.3 2016/12/09 04:56:25 snj Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.124.2.2 2014/12/14 16:49:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.124.2.3 2016/12/09 04:56:25 snj Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -54,6 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v
#include
#else
#include
+#include
#include
#include
#include
@@ -618,6 +619,43 @@ pci_findproduct_stub(pcireg_t id_reg)
}
#endif
+/*
+ * Append a formatted string to dest without writing more than len
+ * characters (including the trailing NUL character). dest and len
+ * are updated for use in subsequent calls to snappendf().
+ *
+ * Returns 0 on success, a negative value if vnsprintf() fails, or
+ * a positive value if the dest buffer would have overflowed.
+ */
+
+static int __printflike(3,4)
+snappendf(char **dest, size_t *len, const char * restrict fmt, ...)
+{
+ va_list ap;
+ int count;
+
+ va_start(ap, fmt);
+ count = vsnprintf(*dest, *len, fmt, ap);
+ va_end(ap);
+
+ /* Let vsnprintf() errors bubble up to caller */
+ if (count < 0 || *len == 0)
+ return count;
+
+ /* Handle overflow */
+ if ((size_t)count >= *len) {
+ *dest += *len - 1;
+ *len = 1;
+ return 1;
+ }
+
+ /* Update dest & len to point at trailing NUL */
+ *dest += count;
+ *len -= count;
+
+ return 0;
+}
+
void
pci_devinfo(pcireg_t id_reg, pcireg_t class_reg, int showclass, char *cp,
size_t l)
@@ -631,9 +669,6 @@ pci_devinfo(pcireg_t id_reg, pcireg_t cl
const char *unmatched = pci_unmatched;
const char *vendor_namep, *product_namep;
const struct pci_class *classp, *subclassp, *interfacep;
- char *ep;
-
- ep = cp + l;
vendor = PCI_VENDOR(id_reg);
product = PCI_PRODUCT(id_reg);
@@ -669,39 +704,35 @@ pci_devinfo(pcireg_t id_reg, pcireg_t cl
}
if (vendor_namep == NULL)
- cp += snprintf(cp, ep - cp, "%svendor 0x%04x product 0x%04x",
+ (void)snappendf(&cp, &l, "%svendor 0x%04x product 0x%04x",
unmatched, vendor, product);
else if (product_namep != NULL)
- cp += snprintf(cp, ep - cp, "%s %s", vendor_namep,
- product_namep);
+ (void)snappendf(&cp, &l, "%s %s", vendor_namep, product_namep);
else
- cp += snprintf(cp, ep - cp, "%s product 0x%04x",
+ (void)snappendf(&cp, &l, "%s product 0x%04x",
vendor_namep, product);
if (showclass) {
- cp += snprintf(cp, ep - cp, " (");
+ (void)snappendf(&cp, &l, " (");
if (classp->name == NULL)
- cp += snprintf(cp, ep - cp,
+ (void)snappendf(&cp, &l,
"class 0x%02x, subclass 0x%02x", class, subclass);
else {
if (subclassp == NULL || subclassp->name == NULL)
-cp += snprintf(cp, ep - cp,
-"%s, subclass 0x%02x",
+(void)snappendf(&cp, &l, "%s, subclass 0x%02x",
classp->name, subclass);
else
-cp += snprintf(cp, ep - cp, "%s %s",
+(void)snappendf(&cp, &l, "%s %s",
subclassp->name, classp->name);
}
if ((interfacep == NULL) || (interfacep->name == NULL)) {
if (interface != 0)
-cp += snprintf(cp, ep - cp,
-", interface 0x%02x", interface);
+(void)snappendf(&cp, &l, ", interface 0x%02x",
+interface);
} else if (strncmp(interfacep->name, "", 1) != 0)
- cp += snprintf(cp, ep - cp, ", %s",
- interfacep->name);
+ (void)snappendf(&cp, &l, ", %s", interfacep->name);
if (revision != 0)
- cp += snprintf(cp, ep - cp, ", revision 0x%02x",
- revision);
- cp += snprintf(cp, ep - cp, ")");
+ (void)snappendf(&cp, &l, ", revision 0x%02x", revision);
+ (void)snappendf(&cp, &l, ")");
}
}
CVS commit: [netbsd-7] src/sys/arch/x86/pci
Module Name:src
Committed By: snj
Date: Fri Dec 9 04:48:44 UTC 2016
Modified Files:
src/sys/arch/x86/pci [netbsd-7]: ichlpcib.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1295):
sys/arch/x86/pci/ichlpcib.c: revision 1.50
Add Core 5G (mobile) LPC support.
To generate a diff of this commit:
cvs rdiff -u -r1.43.4.5 -r1.43.4.6 src/sys/arch/x86/pci/ichlpcib.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/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.43.4.5 src/sys/arch/x86/pci/ichlpcib.c:1.43.4.6
--- src/sys/arch/x86/pci/ichlpcib.c:1.43.4.5 Sun Aug 28 03:38:15 2016
+++ src/sys/arch/x86/pci/ichlpcib.c Fri Dec 9 04:48:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.43.4.5 2016/08/28 03:38:15 snj Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.43.4.6 2016/12/09 04:48:44 snj Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.43.4.5 2016/08/28 03:38:15 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v 1.43.4.6 2016/12/09 04:48:44 snj Exp $");
#include
#include
@@ -261,6 +261,8 @@ static struct lpcib_device {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z97_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X99_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_X99_LPC_2, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE5G_M_LPC_4, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_CORE5G_M_LPC_7, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C222_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C224_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C226_LPC, 1, 0 },
CVS commit: src/sys/dev
Module Name:src
Committed By: christos
Date: Fri Dec 9 04:46:39 UTC 2016
Modified Files:
src/sys/dev: Makefile spkr.c spkrio.h spkrvar.h
src/sys/dev/isa: Makefile spkr_pcppi.c
Log Message:
move spkrio.h out of isa
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/spkr.c src/sys/dev/spkrio.h \
src/sys/dev/spkrvar.h
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/isa/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/isa/spkr_pcppi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/Makefile
diff -u src/sys/dev/Makefile:1.37 src/sys/dev/Makefile:1.38
--- src/sys/dev/Makefile:1.37 Sun Aug 2 07:09:05 2015
+++ src/sys/dev/Makefile Thu Dec 8 23:46:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2015/08/02 11:09:05 jmcneill Exp $
+# $NetBSD: Makefile,v 1.38 2016/12/09 04:46:39 christos Exp $
SUBDIR= apm ata bluetooth dec dm dmover dtv filemon hdaudio hdmicec hpc \
i2c i2o ic ieee1394 ir isa \
@@ -15,6 +15,6 @@ INCSDIR= /usr/include/dev
# Only install includes which are used by userland
INCS= biovar.h ccdvar.h cgdvar.h fssvar.h keylock.h kttcpio.h lockstat.h \
- md.h vndvar.h
+ md.h vndvar.h spkrio.h
.include
Index: src/sys/dev/spkr.c
diff -u src/sys/dev/spkr.c:1.1 src/sys/dev/spkr.c:1.2
--- src/sys/dev/spkr.c:1.1 Thu Dec 8 23:32:39 2016
+++ src/sys/dev/spkr.c Thu Dec 8 23:46:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.1 2016/12/09 04:32:39 christos Exp $ */
+/* $NetBSD: spkr.c,v 1.2 2016/12/09 04:46:39 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.1 2016/12/09 04:32:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.2 2016/12/09 04:46:39 christos Exp $");
#include
#include
@@ -60,6 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.1
#include
#include
+#include
dev_type_open(spkropen);
dev_type_close(spkrclose);
Index: src/sys/dev/spkrio.h
diff -u src/sys/dev/spkrio.h:1.1 src/sys/dev/spkrio.h:1.2
--- src/sys/dev/spkrio.h:1.1 Thu Dec 8 23:32:39 2016
+++ src/sys/dev/spkrio.h Thu Dec 8 23:46:39 2016
@@ -1,11 +1,11 @@
-/* $NetBSD: spkrio.h,v 1.1 2016/12/09 04:32:39 christos Exp $ */
+/* $NetBSD: spkrio.h,v 1.2 2016/12/09 04:46:39 christos Exp $ */
/*
- * spkr.h -- interface definitions for speaker ioctl()
+ * spkrio.h -- interface definitions for speaker ioctl()
*/
-#ifndef _DEV_ISA_SPKR_H_
-#define _DEV_ISA_SPKR_H_
+#ifndef _DEV_SPKRIO_H_
+#define _DEV_SPKRIO_H_
#include
@@ -17,10 +17,4 @@ typedef struct {
int duration; /* in 1/100ths of a second */
} tone_t;
-void spkr_tone(u_int, u_int);
-void spkr_rest(int);
-int spkr__modcmd(modcmd_t, void *);
-int spkr_probe(device_t, cfdata_t, void *);
-extern int spkr_attached;
-
#endif
Index: src/sys/dev/spkrvar.h
diff -u src/sys/dev/spkrvar.h:1.1 src/sys/dev/spkrvar.h:1.2
--- src/sys/dev/spkrvar.h:1.1 Thu Dec 8 06:31:08 2016
+++ src/sys/dev/spkrvar.h Thu Dec 8 23:46:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkrvar.h,v 1.1 2016/12/08 11:31:08 nat Exp $ */
+/* $NetBSD: spkrvar.h,v 1.2 2016/12/09 04:46:39 christos Exp $ */
#ifndef _SYS_DEV_SPKRVAR_H
#define _SYS_DEV_SPKRVAR_H
@@ -6,4 +6,11 @@
device_t speakerattach_mi(device_t);
void speaker_play(u_int, u_int, u_int);
+// XXX:
+void spkr_tone(u_int, u_int);
+void spkr_rest(int);
+int spkr__modcmd(modcmd_t, void *);
+int spkr_probe(device_t, cfdata_t, void *);
+extern int spkr_attached;
+
#endif /* _SYS_DEV_SPKRVAR_H */
Index: src/sys/dev/isa/Makefile
diff -u src/sys/dev/isa/Makefile:1.8 src/sys/dev/isa/Makefile:1.9
--- src/sys/dev/isa/Makefile:1.8 Tue Apr 1 21:34:36 2008
+++ src/sys/dev/isa/Makefile Thu Dec 8 23:46:39 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2008/04/02 01:34:36 dyoung Exp $
+# $NetBSD: Makefile,v 1.9 2016/12/09 04:46:39 christos Exp $
INCSDIR= /usr/include/dev/isa
# Only install includes which are used by userland
-INCS= isvio.h satlinkio.h spkrio.h wtreg.h
+INCS= isvio.h satlinkio.h wtreg.h
.include
Index: src/sys/dev/isa/spkr_pcppi.c
diff -u src/sys/dev/isa/spkr_pcppi.c:1.2 src/sys/dev/isa/spkr_pcppi.c:1.3
--- src/sys/dev/isa/spkr_pcppi.c:1.2 Thu Dec 8 23:32:39 2016
+++ src/sys/dev/isa/spkr_pcppi.c Thu Dec 8 23:46:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_pcppi.c,v 1.2 2016/12/09 04:32:39 christos Exp $ */
+/* $NetBSD: spkr_pcppi.c,v 1.3 2016/12/09 04:46:39 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -43,7 +43,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.2 2016/12/09 04:32:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c,v 1.3 2016/12/09 04:46:39 christos Exp $");
#include
#include
@@ -61,6 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: spkr_pcppi.c
#include
+#include
#include
extern int spkr_attached;
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src Committed By: snj Date: Fri Dec 9 04:43:08 UTC 2016 Modified Files: src/sys/dev/pci [netbsd-7]: ichsmb.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1294): sys/dev/pci/ichsmb.c: revisions 1.43-1.44 ichsmb(4): Add Braswell PCU SMBus and Intel 100 Series SMBus. To generate a diff of this commit: cvs rdiff -u -r1.37.2.2 -r1.37.2.3 src/sys/dev/pci/ichsmb.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/ichsmb.c diff -u src/sys/dev/pci/ichsmb.c:1.37.2.2 src/sys/dev/pci/ichsmb.c:1.37.2.3 --- src/sys/dev/pci/ichsmb.c:1.37.2.2 Thu Apr 30 19:27:20 2015 +++ src/sys/dev/pci/ichsmb.c Fri Dec 9 04:43:08 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ichsmb.c,v 1.37.2.2 2015/04/30 19:27:20 snj Exp $ */ +/* $NetBSD: ichsmb.c,v 1.37.2.3 2016/12/09 04:43:08 snj Exp $ */ /* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */ /* @@ -22,7 +22,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.37.2.2 2015/04/30 19:27:20 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.37.2.3 2016/12/09 04:43:08 snj Exp $"); #include #include @@ -111,9 +111,11 @@ ichsmb_match(device_t parent, cfdata_t m case PCI_PRODUCT_INTEL_7SERIES_SMB: case PCI_PRODUCT_INTEL_8SERIES_SMB: case PCI_PRODUCT_INTEL_9SERIES_SMB: + case PCI_PRODUCT_INTEL_100SERIES_SMB: case PCI_PRODUCT_INTEL_CORE4G_M_SMB: case PCI_PRODUCT_INTEL_CORE5G_M_SMB: case PCI_PRODUCT_INTEL_BAYTRAIL_PCU_SMB: + case PCI_PRODUCT_INTEL_BSW_PCU_SMB: case PCI_PRODUCT_INTEL_C600_SMBUS: case PCI_PRODUCT_INTEL_C600_SMB_0: case PCI_PRODUCT_INTEL_C600_SMB_1:
CVS commit: src/sys/dev
Module Name:src
Committed By: christos
Date: Fri Dec 9 04:32:39 UTC 2016
Modified Files:
src/sys/dev: files.audio spkr_synth.c
src/sys/dev/isa: files.isa spkr_pcppi.c
Added Files:
src/sys/dev: spkr.c spkrio.h
Removed Files:
src/sys/dev/isa: spkr.c spkrio.h
Log Message:
more spkr rework.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/files.audio
cvs rdiff -u -r0 -r1.1 src/sys/dev/spkr.c src/sys/dev/spkrio.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/spkr_synth.c
cvs rdiff -u -r1.166 -r1.167 src/sys/dev/isa/files.isa
cvs rdiff -u -r1.39 -r0 src/sys/dev/isa/spkr.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/isa/spkr_pcppi.c
cvs rdiff -u -r1.3 -r0 src/sys/dev/isa/spkrio.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/files.audio
diff -u src/sys/dev/files.audio:1.5 src/sys/dev/files.audio:1.6
--- src/sys/dev/files.audio:1.5 Thu Dec 8 06:31:08 2016
+++ src/sys/dev/files.audio Thu Dec 8 23:32:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.audio,v 1.5 2016/12/08 11:31:08 nat Exp $
+# $NetBSD: files.audio,v 1.6 2016/12/09 04:32:39 christos Exp $
define audiobus { }
define midibus { }
@@ -33,4 +33,5 @@ file dev/midi.c midi needs-flag
file dev/midictl.c midisyn
file dev/midisyn.c midisyn
file dev/mulaw.c mulaw needs-flag
-file dev/spkr_synth.c spkr & vaudiospeaker needs-flag
+file dev/spkr.c spkr needs-flag
+file dev/spkr_synth.c spkr_synth needs-flag
Index: src/sys/dev/spkr_synth.c
diff -u src/sys/dev/spkr_synth.c:1.1 src/sys/dev/spkr_synth.c:1.2
--- src/sys/dev/spkr_synth.c:1.1 Thu Dec 8 06:31:08 2016
+++ src/sys/dev/spkr_synth.c Thu Dec 8 23:32:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_synth.c,v 1.1 2016/12/08 11:31:08 nat Exp $ */
+/* $NetBSD: spkr_synth.c,v 1.2 2016/12/09 04:32:39 christos Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss
@@ -26,9 +26,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifdef VAUDIOSPEAKER
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.1 2016/12/08 11:31:08 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_synth.c,v 1.2 2016/12/09 04:32:39 christos Exp $");
#include
#include
@@ -62,26 +61,29 @@ static int beep_sysctl_device(SYSCTLFN_P
#include
#include
-#include
+#include
-#include "isa/spkr.c"
-
-int spkrprobe(device_t, cfdata_t, void *);
-void spkrattach(device_t, device_t, void *);
-int spkrdetach(device_t, int);
+static void spkrattach(device_t, device_t, void *);
+static int spkrdetach(device_t, int);
device_t speakerattach_mi(device_t);
#include "ioconf.h"
MODULE(MODULE_CLASS_DRIVER, spkr, NULL /* "audio" */);
+static int
+spkr_modcmd(modcmd_t cmd, void *arg)
+{
+ return spkr__modcmd(cmd, arg);
+}
+
#ifdef _MODULE
#include "ioconf.c"
#endif
CFATTACH_DECL3_NEW(spkr_synth, 0,
-spkrprobe, spkrattach, spkrdetach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
+spkr_probe, spkrattach, spkrdetach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
extern struct cfdriver audio_cd;
@@ -97,17 +99,17 @@ struct spkr_attach_args {
device_t dev;
};
-static void
-tone(u_int xhz, u_int ticks)
+void
+spkr_tone(u_int xhz, u_int ticks)
{
audiobell(beep_index, xhz, ticks * (1000 / hz), 80, 0);
}
-static void
-rest(int ticks)
+void
+spkr_rest(int ticks)
{
#ifdef SPKRDEBUG
-printf("rest: %d\n", ticks);
+printf("%s: %d\n", __func__, ticks);
#endif /* SPKRDEBUG */
if (ticks > 0)
audiobell(beep_index, 0, ticks * (1000 / hz), 80, 0);
@@ -121,7 +123,7 @@ speakerattach_mi(device_t dev)
return config_found(dev, &sa, NULL);
}
-void
+static void
spkrattach(device_t parent, device_t self, void *aux)
{
const struct sysctlnode *node;
@@ -160,7 +162,7 @@ spkrattach(device_t parent, device_t sel
bell_thread, &sc_bell_args, &sc_bellthread, "vbell");
}
-int
+static int
spkrdetach(device_t self, int flags)
{
@@ -250,6 +252,3 @@ beep_sysctl_device(SYSCTLFN_ARGS)
return error;
}
-
-#endif /* VAUDIOSPEAKER */
-/* spkr.c ends here */
Index: src/sys/dev/isa/files.isa
diff -u src/sys/dev/isa/files.isa:1.166 src/sys/dev/isa/files.isa:1.167
--- src/sys/dev/isa/files.isa:1.166 Thu Dec 8 21:22:34 2016
+++ src/sys/dev/isa/files.isa Thu Dec 8 23:32:39 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.166 2016/12/09 02:22:34 christos Exp $
+# $NetBSD: files.isa,v 1.167 2016/12/09 04:32:39 christos Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -435,7 +435,6 @@ attach pcppi at isa
file dev/isa/pcppi.c pcppi needs-flag
attach spkr at pcppi with spkr_pcppi
-file dev/isa/spkr.c spkr needs-flag
file dev/isa/spkr_pcppi.c spkr_pcppi
attach midi at pcppi with midi_pcppi: midisyn
Index: src/sys/dev/isa/spkr_pcppi.c
diff -u src/sys/dev/isa/spkr_pcppi.c:1.1 src/sys/dev/isa/spkr_pcppi.c:1.2
--- src/sys/dev/isa/spkr_pcppi.c:1.1 Thu Dec
CVS commit: src/tests/lib/libc/gen/exect
Module Name:src
Committed By: kamil
Date: Fri Dec 9 04:00:36 UTC 2016
Added Files:
src/tests/lib/libc/gen/exect: Makefile t_exect.c
Log Message:
Add new test t_exect to verify exect(2)
This test is a clone of tests/lib/libc/gen/execve/t_execve
t_exect_null:
Tests an empty exect(2) executing
The function exect() executes a file with the program tracing facilities
enabled (see ptrace(2)).
-- exect(2)
This test will be attached to build afterwards.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/gen/exect/Makefile \
src/tests/lib/libc/gen/exect/t_exect.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tests/lib/libc/gen/exect/Makefile
diff -u /dev/null src/tests/lib/libc/gen/exect/Makefile:1.1
--- /dev/null Fri Dec 9 04:00:36 2016
+++ src/tests/lib/libc/gen/exect/Makefile Fri Dec 9 04:00:36 2016
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2016/12/09 04:00:36 kamil Exp $
+
+NOMAN= # defined
+WARNS=4
+
+.include
+
+TESTSDIR= ${TESTSBASE}/lib/libc/gen/exect
+
+TESTS_C= t_exect
+
+BINDIR= ${TESTSDIR}
+SCRIPTSDIR= ${TESTSDIR}
+
+.include
Index: src/tests/lib/libc/gen/exect/t_exect.c
diff -u /dev/null src/tests/lib/libc/gen/exect/t_exect.c:1.1
--- /dev/null Fri Dec 9 04:00:36 2016
+++ src/tests/lib/libc/gen/exect/t_exect.c Fri Dec 9 04:00:36 2016
@@ -0,0 +1,59 @@
+/* $NetBSD: t_exect.c,v 1.1 2016/12/09 04:00:36 kamil Exp $ */
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+
+#include
+#include
+#include
+#include
+
+ATF_TC(t_exect_null);
+
+ATF_TC_HEAD(t_exect_null, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Tests an empty exect(2) executing");
+}
+
+ATF_TC_BODY(t_exect_null, tc)
+{
+ int err;
+
+ err = exect(NULL, NULL, NULL);
+ ATF_REQUIRE(err == -1);
+ ATF_REQUIRE_MSG(errno == EFAULT,
+ "wrong error returned %d instead of %d", errno, EFAULT);
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, t_exect_null);
+
+ return atf_no_error();
+}
CVS commit: src/sys/rump/net/lib/libnpf
Module Name:src Committed By: christos Date: Fri Dec 9 02:50:06 UTC 2016 Modified Files: src/sys/rump/net/lib/libnpf: Makefile Log Message: remove ptree add lpm To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/rump/net/lib/libnpf/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/rump/net/lib/libnpf/Makefile diff -u src/sys/rump/net/lib/libnpf/Makefile:1.17 src/sys/rump/net/lib/libnpf/Makefile:1.18 --- src/sys/rump/net/lib/libnpf/Makefile:1.17 Tue Jan 26 18:12:19 2016 +++ src/sys/rump/net/lib/libnpf/Makefile Thu Dec 8 21:50:06 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2016/01/26 23:12:19 pooka Exp $ +# $NetBSD: Makefile,v 1.18 2016/12/09 02:50:06 christos Exp $ # # Public Domain. # @@ -15,7 +15,7 @@ SRCS= npf.c npf_alg.c npf_conf.c npf_ctl SRCS+= npf_bpf.c npf_if.c npf_inet.c npf_mbuf.c npf_nat.c SRCS+= npf_ruleset.c npf_conn.c npf_conndb.c npf_rproc.c SRCS+= npf_state.c npf_state_tcp.c npf_tableset.c -SRCS+= npf_tableset_ptree.c npf_sendpkt.c npf_worker.c +SRCS+= lpm.c npf_sendpkt.c npf_worker.c SRCS+= if_npflog.c
CVS commit: src/sys/modules/npf
Module Name:src Committed By: christos Date: Fri Dec 9 02:41:09 UTC 2016 Modified Files: src/sys/modules/npf: Makefile Log Message: ditch ptree and use lpm To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/modules/npf/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/npf/Makefile diff -u src/sys/modules/npf/Makefile:1.18 src/sys/modules/npf/Makefile:1.19 --- src/sys/modules/npf/Makefile:1.18 Thu Aug 20 07:05:01 2015 +++ src/sys/modules/npf/Makefile Thu Dec 8 21:41:09 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2015/08/20 11:05:01 christos Exp $ +# $NetBSD: Makefile,v 1.19 2016/12/09 02:41:09 christos Exp $ # # Public Domain. # @@ -13,7 +13,7 @@ SRCS= npf.c npf_alg.c npf_conf.c npf_ct SRCS+= npf_bpf.c npf_if.c npf_inet.c npf_mbuf.c npf_nat.c SRCS+= npf_ruleset.c npf_conn.c npf_conndb.c npf_rproc.c SRCS+= npf_state.c npf_state_tcp.c npf_tableset.c -SRCS+= npf_tableset_ptree.c npf_sendpkt.c npf_worker.c +SRCS+= lpm.c npf_sendpkt.c npf_worker.c CPPFLAGS+= -DINET6
CVS commit: src/sys/net/npf
Module Name:src
Committed By: christos
Date: Fri Dec 9 02:40:38 UTC 2016
Modified Files:
src/sys/net/npf: files.npf npf_impl.h npf_tableset.c
Added Files:
src/sys/net/npf: lpm.c lpm.h
Removed Files:
src/sys/net/npf: npf_tableset_ptree.c
Log Message:
This patches ditches the ptree(3) library, because it is broken (you
can get missing entries!). Instead, as a temporary solution, we switch
to a simple linear scan of the hash tables for the longest-prefix-match
(lpm.c lpm.h) algorithm. In fact, with few unique prefixes in the set,
on modern hardware this simple algorithm is pretty fast anyway!
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/net/npf/files.npf
cvs rdiff -u -r0 -r1.1 src/sys/net/npf/lpm.c src/sys/net/npf/lpm.h
cvs rdiff -u -r1.61 -r1.62 src/sys/net/npf/npf_impl.h
cvs rdiff -u -r1.23 -r1.24 src/sys/net/npf/npf_tableset.c
cvs rdiff -u -r1.1 -r0 src/sys/net/npf/npf_tableset_ptree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/files.npf
diff -u src/sys/net/npf/files.npf:1.17 src/sys/net/npf/files.npf:1.18
--- src/sys/net/npf/files.npf:1.17 Sat Jul 19 14:24:16 2014
+++ src/sys/net/npf/files.npf Thu Dec 8 21:40:38 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.npf,v 1.17 2014/07/19 18:24:16 rmind Exp $
+# $NetBSD: files.npf,v 1.18 2016/12/09 02:40:38 christos Exp $
#
# Public Domain.
#
@@ -19,7 +19,6 @@ file net/npf/npf_bpf.c npf
file net/npf/npf_ruleset.c npf
file net/npf/npf_rproc.c npf
file net/npf/npf_tableset.c npf
-file net/npf/npf_tableset_ptree.c npf
file net/npf/npf_if.c npf
file net/npf/npf_inet.c npf
file net/npf/npf_conn.c npf
@@ -31,6 +30,9 @@ file net/npf/npf_alg.c npf
file net/npf/npf_sendpkt.c npf
file net/npf/npf_worker.c npf
+# LPM
+file net/npf/lpm.cnpf
+
# Built-in extensions.
file net/npf/npf_ext_log.c npf
file net/npf/npf_ext_normalize.c npf
Index: src/sys/net/npf/npf_impl.h
diff -u src/sys/net/npf/npf_impl.h:1.61 src/sys/net/npf/npf_impl.h:1.62
--- src/sys/net/npf/npf_impl.h:1.61 Sun Feb 1 19:31:39 2015
+++ src/sys/net/npf/npf_impl.h Thu Dec 8 21:40:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_impl.h,v 1.61 2015/02/02 00:31:39 rmind Exp $ */
+/* $NetBSD: npf_impl.h,v 1.62 2016/12/09 02:40:38 christos Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -49,7 +49,6 @@
#include
#include
-#include
#include
#include
@@ -228,8 +227,6 @@ bool npf_bpf_validate(const void *, siz
void npf_tableset_sysinit(void);
void npf_tableset_sysfini(void);
-extern const pt_tree_ops_t npf_table_ptree_ops;
-
npf_tableset_t *npf_tableset_create(u_int);
void npf_tableset_destroy(npf_tableset_t *);
int npf_tableset_insert(npf_tableset_t *, npf_table_t *);
Index: src/sys/net/npf/npf_tableset.c
diff -u src/sys/net/npf/npf_tableset.c:1.23 src/sys/net/npf/npf_tableset.c:1.24
--- src/sys/net/npf/npf_tableset.c:1.23 Wed Apr 20 11:46:08 2016
+++ src/sys/net/npf/npf_tableset.c Thu Dec 8 21:40:38 2016
@@ -1,7 +1,7 @@
-/* $NetBSD: npf_tableset.c,v 1.23 2016/04/20 15:46:08 christos Exp $ */
+/* $NetBSD: npf_tableset.c,v 1.24 2016/12/09 02:40:38 christos Exp $ */
/*-
- * Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
+ * Copyright (c) 2009-2016 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This material is based upon work partially supported by The
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.23 2016/04/20 15:46:08 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.24 2016/12/09 02:40:38 christos Exp $");
#include
#include
@@ -58,13 +58,12 @@ __KERNEL_RCSID(0, "$NetBSD: npf_tableset
#include
#include "npf_impl.h"
+#include "lpm.h"
typedef struct npf_tblent {
- union {
- LIST_ENTRY(npf_tblent) te_hashent;
- pt_node_t te_node;
- } /* C11 */;
- int te_alen;
+ LIST_ENTRY(npf_tblent) te_listent;
+ uint16_t te_preflen;
+ uint16_t te_alen;
npf_addr_t te_addr;
} npf_tblent_t;
@@ -81,7 +80,8 @@ struct npf_table {
u_long t_hashmask;
};
struct {
- pt_tree_t t_tree[2];
+ lpm_t * t_lpm;
+ LIST_HEAD(, npf_tblent) t_list;
};
struct {
void * t_blob;
@@ -294,7 +294,7 @@ table_hash_lookup(const npf_table_t *t,
* Lookup the hash table and check for duplicates.
* Note: mask is ignored for the hash storage.
*/
- LIST_FOREACH(ent, htbl, te_hashent) {
+ LIST_FOREACH(ent, htbl, te_listent) {
if (ent->te_alen != alen) {
continue;
}
@@ -307,27 +307,28 @@ table_hash_lookup(const npf_table_t *t,
}
static void
-table_hash_destroy(npf_table_t *t)
+table_hash_flush(npf_table_t *t)
{
for (unsigned n = 0; n <= t->t_hashmask; n++) {
npf_tblent_t *ent;
while ((ent = LIST_FIRST(&t->t_hashl[n])) != NULL) {
- LIST_REMOVE(ent, te_hashent);
+ LIST_REMOVE(ent, te_listent);
pool_cache_put(tblent_cache, ent);
}
}
}
static
CVS commit: src/sys/net
Module Name:src Committed By: christos Date: Fri Dec 9 02:38:14 UTC 2016 Modified Files: src/sys/net: if.c Log Message: This spams 100's of times during boot! To generate a diff of this commit: cvs rdiff -u -r1.364 -r1.365 src/sys/net/if.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/if.c diff -u src/sys/net/if.c:1.364 src/sys/net/if.c:1.365 --- src/sys/net/if.c:1.364 Wed Dec 7 20:06:35 2016 +++ src/sys/net/if.c Thu Dec 8 21:38:14 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: if.c,v 1.364 2016/12/08 01:06:35 ozaki-r Exp $ */ +/* $NetBSD: if.c,v 1.365 2016/12/09 02:38:14 christos Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.364 2016/12/08 01:06:35 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.365 2016/12/09 02:38:14 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -979,11 +979,6 @@ if_deferred_start_softint(void *arg) struct if_deferred_start *ids = arg; struct ifnet *ifp = ids->ids_ifp; -#ifdef DEBUG - log(LOG_DEBUG, "%s: deferred start on %s\n", __func__, - ifp->if_xname); -#endif - ids->ids_if_start(ifp); }
CVS commit: src/sys/net/npf
Module Name:src Committed By: christos Date: Fri Dec 9 02:26:36 UTC 2016 Modified Files: src/sys/net/npf: npf.h Log Message: make this compile again To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/net/npf/npf.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/net/npf/npf.h diff -u src/sys/net/npf/npf.h:1.48 src/sys/net/npf/npf.h:1.49 --- src/sys/net/npf/npf.h:1.48 Thu Dec 8 18:07:11 2016 +++ src/sys/net/npf/npf.h Thu Dec 8 21:26:36 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: npf.h,v 1.48 2016/12/08 23:07:11 rmind Exp $ */ +/* $NetBSD: npf.h,v 1.49 2016/12/09 02:26:36 christos Exp $ */ /*- * Copyright (c) 2009-2014 The NetBSD Foundation, Inc. @@ -259,6 +259,9 @@ bool npf_autounload_p(void); #define NPF_LAYER_2 2 #define NPF_LAYER_3 3 +/* XXX mbuf.h: just for now. */ +#define PACKET_TAG_NPF 10 + /* Packet tags. */ #define NPF_NTAG_PASS 0x0001
CVS commit: src/sys/arch
Module Name:src Committed By: christos Date: Fri Dec 9 02:25:47 UTC 2016 Modified Files: src/sys/arch/alpha/conf: GENERIC src/sys/arch/bebox/conf: GENERIC INSTALL src/sys/arch/cats/conf: GENERIC INSTALL src/sys/arch/prep/conf: GENERIC Log Message: kill PCPPISPEAKER To generate a diff of this commit: cvs rdiff -u -r1.372 -r1.373 src/sys/arch/alpha/conf/GENERIC cvs rdiff -u -r1.148 -r1.149 src/sys/arch/bebox/conf/GENERIC cvs rdiff -u -r1.57 -r1.58 src/sys/arch/bebox/conf/INSTALL cvs rdiff -u -r1.158 -r1.159 src/sys/arch/cats/conf/GENERIC cvs rdiff -u -r1.98 -r1.99 src/sys/arch/cats/conf/INSTALL cvs rdiff -u -r1.177 -r1.178 src/sys/arch/prep/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/alpha/conf/GENERIC diff -u src/sys/arch/alpha/conf/GENERIC:1.372 src/sys/arch/alpha/conf/GENERIC:1.373 --- src/sys/arch/alpha/conf/GENERIC:1.372 Thu Dec 8 06:31:09 2016 +++ src/sys/arch/alpha/conf/GENERIC Thu Dec 8 21:25:46 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.372 2016/12/08 11:31:09 nat Exp $ +# $NetBSD: GENERIC,v 1.373 2016/12/09 02:25:46 christos Exp $ # # This machine description file is used to generate the default NetBSD # kernel. @@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "GENERIC-$Revision: 1.372 $" +ident "GENERIC-$Revision: 1.373 $" maxusers 32 @@ -440,7 +440,6 @@ pckbd* at pckbc?# PC keyboard (kbd p pms* at pckbc?# PS/2-style mouse (aux port) attimer* at isa?# AT Timer pcppi* at isa?# PC prog. periph. interface -options PCPPISPEAKER spkr0 at pcppi?# IBM BASIC emulation isabeep0 at pcppi?# "keyboard" beep com* at isa? port 0x3f8 irq 4 # standard serial ports Index: src/sys/arch/bebox/conf/GENERIC diff -u src/sys/arch/bebox/conf/GENERIC:1.148 src/sys/arch/bebox/conf/GENERIC:1.149 --- src/sys/arch/bebox/conf/GENERIC:1.148 Thu Dec 8 06:31:09 2016 +++ src/sys/arch/bebox/conf/GENERIC Thu Dec 8 21:25:46 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.148 2016/12/08 11:31:09 nat Exp $ +# $NetBSD: GENERIC,v 1.149 2016/12/09 02:25:46 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.148 $" +#ident "GENERIC-$Revision: 1.149 $" maxusers 32 @@ -202,7 +202,6 @@ lpt0 at isa? port 0x378 irq 7 # standard mcclock0 at isa? port 0x70 # time-of-day clock attimer0 at isa? #pcppi0 at isa? -#options PCPPISPEAKER #spkr0 at pcppi? wss0 at isa? port 0x82c irq 30 drq 6 drq2 7 # Windows Sound System Index: src/sys/arch/bebox/conf/INSTALL diff -u src/sys/arch/bebox/conf/INSTALL:1.57 src/sys/arch/bebox/conf/INSTALL:1.58 --- src/sys/arch/bebox/conf/INSTALL:1.57 Thu Dec 8 06:31:09 2016 +++ src/sys/arch/bebox/conf/INSTALL Thu Dec 8 21:25:46 2016 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.57 2016/12/08 11:31:09 nat Exp $ +# $NetBSD: INSTALL,v 1.58 2016/12/09 02:25:46 christos Exp $ # # First try for BeBox config file # @@ -179,7 +179,6 @@ tlp* at pci? dev ? function ? # DECchip ukphy* at mii? phy ? # generic unknown PHYs #wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System -#options PCPPISPEAKER #spkr0 at pcppi? # Joystick driver. Probe is a little strange; add only if you have one. Index: src/sys/arch/cats/conf/GENERIC diff -u src/sys/arch/cats/conf/GENERIC:1.158 src/sys/arch/cats/conf/GENERIC:1.159 --- src/sys/arch/cats/conf/GENERIC:1.158 Thu Dec 8 06:31:09 2016 +++ src/sys/arch/cats/conf/GENERIC Thu Dec 8 21:25:46 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.158 2016/12/08 11:31:09 nat Exp $ +# $NetBSD: GENERIC,v 1.159 2016/12/09 02:25:46 christos Exp $ # # GENERIC machine description file # @@ -502,7 +502,6 @@ lpt1 at isa? port 0x278 irq 5 #ep* at isa? port ? irq ? # The spkr driver provides a simple tone interface to the built in speaker. -options PCPPISPEAKER spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/cats/conf/INSTALL diff -u src/sys/arch/cats/conf/INSTALL:1.98 src/sys/arch/cats/conf/INSTALL:1.99 --- src/sys/arch/cats/conf/INSTALL:1.98 Thu Dec 8 06:31:09 2016 +++ src/sys/arch/cats/conf/INSTALL Thu Dec 8 21:25:46 2016 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.98 2016/12/08 11:31:09 nat Exp $ +# $NetBSD: INSTALL,v 1.99 2016/12/09 02:25:46 christos Exp $ # # CATSINST -- CHALTECH CATS Install kernel # @@ -398,7 +398,6 @@ lpt1 at isa? port 0x278 irq 5 #ep* at isa? port ? irq ? # The spkr driver provides a simple tone interface to the built in speaker. -#options PCPPISPEAKER #spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/prep/conf/GENERIC diff -u src/sys/arch/prep/conf/GENERIC:1.177 src/sys/arch/prep/conf/GENERIC:1.178 --- src/sys/arch/prep/con
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: christos Date: Fri Dec 9 02:24:17 UTC 2016 Modified Files: src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY Log Message: PCPPISPEAKER To generate a diff of this commit: cvs rdiff -u -r1.404 -r1.405 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1142 -r1.1143 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.143 -r1.144 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.31 -r1.32 src/sys/arch/i386/conf/INSTALL_FLOPPY cvs rdiff -u -r1.145 -r1.146 src/sys/arch/i386/conf/INSTALL_TINY 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/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.404 src/sys/arch/i386/conf/ALL:1.405 --- src/sys/arch/i386/conf/ALL:1.404 Thu Dec 8 06:31:10 2016 +++ src/sys/arch/i386/conf/ALL Thu Dec 8 21:24:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.404 2016/12/08 11:31:10 nat Exp $ +# $NetBSD: ALL,v 1.405 2016/12/09 02:24:17 christos Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.404 $" +#ident "ALL-$Revision: 1.405 $" maxusers 64 # estimated number of users @@ -1543,7 +1543,6 @@ midi* at midibus? midi* at pcppi? # MIDI interface to the PC speaker # The spkr driver provides a simple tone interface to the built in speaker. -options PCPPISPEAKER spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1142 src/sys/arch/i386/conf/GENERIC:1.1143 --- src/sys/arch/i386/conf/GENERIC:1.1142 Thu Dec 8 06:31:10 2016 +++ src/sys/arch/i386/conf/GENERIC Thu Dec 8 21:24:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1142 2016/12/08 11:31:10 nat Exp $ +# $NetBSD: GENERIC,v 1.1143 2016/12/09 02:24:17 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1142 $" +#ident "GENERIC-$Revision: 1.1143 $" maxusers 64 # estimated number of users @@ -1466,7 +1466,6 @@ midi* at midibus? midi* at pcppi? # MIDI interface to the PC speaker # The spkr driver provides a simple tone interface to the built in speaker. -#options PCPPISPEAKER #spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/i386/conf/GENERIC_TINY diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.143 src/sys/arch/i386/conf/GENERIC_TINY:1.144 --- src/sys/arch/i386/conf/GENERIC_TINY:1.143 Thu Dec 8 06:31:10 2016 +++ src/sys/arch/i386/conf/GENERIC_TINY Thu Dec 8 21:24:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.143 2016/12/08 11:31:10 nat Exp $ +# $NetBSD: GENERIC_TINY,v 1.144 2016/12/09 02:24:17 christos Exp $ # # GENERIC_TINY -- suitable default for 4M machines # No EISA, PCI, or SCSI. @@ -508,7 +508,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq #audio* at audiobus? # The spkr driver provides a simple tone interface to the built in speaker. -#options PCPPISPEAKER #spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/i386/conf/INSTALL_FLOPPY diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.31 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.32 --- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.31 Thu Dec 8 06:31:10 2016 +++ src/sys/arch/i386/conf/INSTALL_FLOPPY Thu Dec 8 21:24:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_FLOPPY,v 1.31 2016/12/08 11:31:10 nat Exp $ +# $NetBSD: INSTALL_FLOPPY,v 1.32 2016/12/09 02:24:17 christos Exp $ # # INSTALL - Installation kernel. # @@ -710,7 +710,6 @@ url* at uhub? port ? # Realtek RTL8150L #midi* at pcppi? # MIDI interface to the PC speaker # The spkr driver provides a simple tone interface to the built in speaker. -#options PCPPISPEAKER #spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/i386/conf/INSTALL_TINY diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.145 src/sys/arch/i386/conf/INSTALL_TINY:1.146 --- src/sys/arch/i386/conf/INSTALL_TINY:1.145 Thu Dec 8 06:31:11 2016 +++ src/sys/arch/i386/conf/INSTALL_TINY Thu Dec 8 21:24:17 2016 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_TINY,v 1.145 2016/12/08 11:31:11 nat Exp $ +# $NetBSD: INSTALL_TINY,v 1.146 2016/12/09 02:24:17 christos Exp $ # # This kernel should be derived from INSTALL (which is derived # from GENERIC) with some features commented out. @@ -468,7 +468,6 @@ we1 at isa? port 0x300 iomem 0xcc000 irq #audio* at audiobus? # The spkr driver provides a simple tone interface to the built in speaker. -#options PCPPISPEAKER #spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: christos Date: Fri Dec 9 02:23:25 UTC 2016 Modified Files: src/sys/arch/amd64/conf: ALL GENERIC Log Message: kill PCPPISPEAKER To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.444 -r1.445 src/sys/arch/amd64/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/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.41 src/sys/arch/amd64/conf/ALL:1.42 --- src/sys/arch/amd64/conf/ALL:1.41 Thu Dec 8 06:31:09 2016 +++ src/sys/arch/amd64/conf/ALL Thu Dec 8 21:23:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.41 2016/12/08 11:31:09 nat Exp $ +# $NetBSD: ALL,v 1.42 2016/12/09 02:23:25 christos Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.41 $" +#ident "ALL-$Revision: 1.42 $" maxusers 64 # estimated number of users @@ -1375,7 +1375,6 @@ midi* at midibus? midi* at pcppi? # MIDI interface to the PC speaker # The spkr driver provides a simple tone interface to the built in speaker. -options PCPPISPEAKER spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.444 src/sys/arch/amd64/conf/GENERIC:1.445 --- src/sys/arch/amd64/conf/GENERIC:1.444 Thu Dec 8 06:31:09 2016 +++ src/sys/arch/amd64/conf/GENERIC Thu Dec 8 21:23:25 2016 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.444 2016/12/08 11:31:09 nat Exp $ +# $NetBSD: GENERIC,v 1.445 2016/12/09 02:23:25 christos Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.444 $" +#ident "GENERIC-$Revision: 1.445 $" maxusers 64 # estimated number of users @@ -1109,7 +1109,6 @@ hdafg* at hdaudiobus? audio* at audiobus? # The spkr driver provides a simple tone interface to the built in speaker. -options PCPPISPEAKER spkr0 at pcppi? # PC speaker #options VAUDIOSPEAKER
CVS commit: src/sys/modules/spkr
Module Name:src Committed By: christos Date: Fri Dec 9 02:22:56 UTC 2016 Modified Files: src/sys/modules/spkr: Makefile Log Message: Add spkr_pcppi.c To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/modules/spkr/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/spkr/Makefile diff -u src/sys/modules/spkr/Makefile:1.3 src/sys/modules/spkr/Makefile:1.4 --- src/sys/modules/spkr/Makefile:1.3 Thu Dec 8 18:22:18 2016 +++ src/sys/modules/spkr/Makefile Thu Dec 8 21:22:56 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/12/08 23:22:18 nat Exp $ +# $NetBSD: Makefile,v 1.4 2016/12/09 02:22:56 christos Exp $ .include "../Makefile.inc" @@ -6,8 +6,7 @@ KMOD= spkr IOCONF= spkr.ioconf -CFLAGS+= -DPCPPISPEAKER -SRCS= spkr.c +SRCS= spkr.c spkr_pcppi.c WARNS= 4
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: christos
Date: Fri Dec 9 02:22:34 UTC 2016
Modified Files:
src/sys/dev/isa: files.isa spkr.c spkrio.h
Added Files:
src/sys/dev/isa: spkr_pcppi.c
Log Message:
split out the pcppi attachment of the speaker
XXX: needs more work
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/dev/isa/files.isa
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/isa/spkr.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/isa/spkr_pcppi.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/isa/spkrio.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/isa/files.isa
diff -u src/sys/dev/isa/files.isa:1.165 src/sys/dev/isa/files.isa:1.166
--- src/sys/dev/isa/files.isa:1.165 Thu Dec 8 06:31:08 2016
+++ src/sys/dev/isa/files.isa Thu Dec 8 21:22:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.isa,v 1.165 2016/12/08 11:31:08 nat Exp $
+# $NetBSD: files.isa,v 1.166 2016/12/09 02:22:34 christos Exp $
#
# Config file and device description for machine-independent ISA code.
# Included by ports that need it. Requires that the SCSI files be
@@ -434,8 +434,9 @@ device pcppi {}
attach pcppi at isa
file dev/isa/pcppi.c pcppi needs-flag
-attach spkr at pcppi
-file dev/isa/spkr.c spkr & pcppispeaker needs-flag
+attach spkr at pcppi with spkr_pcppi
+file dev/isa/spkr.c spkr needs-flag
+file dev/isa/spkr_pcppi.c spkr_pcppi
attach midi at pcppi with midi_pcppi: midisyn
file dev/isa/midi_pcppi.c midi_pcppi
Index: src/sys/dev/isa/spkr.c
diff -u src/sys/dev/isa/spkr.c:1.38 src/sys/dev/isa/spkr.c:1.39
--- src/sys/dev/isa/spkr.c:1.38 Thu Dec 8 06:31:08 2016
+++ src/sys/dev/isa/spkr.c Thu Dec 8 21:22:34 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr.c,v 1.38 2016/12/08 11:31:08 nat Exp $ */
+/* $NetBSD: spkr.c,v 1.39 2016/12/09 02:22:34 christos Exp $ */
/*
* Copyright (c) 1990 Eric S. Raymond (e...@snark.thyrsus.com)
@@ -42,9 +42,8 @@
* use hz value from param.c
*/
-#ifdef PCPPISPEAKER
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.38 2016/12/08 11:31:08 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.39 2016/12/09 02:22:34 christos Exp $");
#include
#include
@@ -60,30 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: spkr.c,v 1.3
#include
-#include
-
#include
-void spkrattach(device_t, device_t, void *);
-int spkrdetach(device_t, int);
-
-#include "ioconf.h"
-
-MODULE(MODULE_CLASS_DRIVER, spkr, NULL /* "pcppi" */);
-
-#ifdef _MODULE
-#include "ioconf.c"
-#endif
-
-#endif /* PCPPISPEAKER */
-
-int spkrprobe(device_t, cfdata_t, void *);
-
-#ifdef PCPPISPEAKER
-CFATTACH_DECL_NEW(spkr, 0,
-spkrprobe, spkrattach, spkrdetach, NULL);
-#endif
-
dev_type_open(spkropen);
dev_type_close(spkrclose);
dev_type_write(spkrwrite);
@@ -104,48 +81,15 @@ const struct cdevsw spkr_cdevsw = {
.d_flag = D_OTHER
};
-#ifdef PCPPISPEAKER
-static pcppi_tag_t ppicookie;
-#endif
-
-#define SPKRPRI (PZERO - 1)
-
-static void tone(u_int, u_int);
-static void rest(int);
static void playinit(void);
static void playtone(int, int, int);
static void playstring(char *, int);
-#ifdef PCPPISPEAKER
-static void
-tone(u_int xhz, u_int ticks)
-/* emit tone of frequency hz for given number of ticks */
-{
- pcppi_bell(ppicookie, xhz, ticks, PCPPI_BELL_SLEEP);
-}
-
-static void
-rest(int ticks)
-/* rest for given number of ticks */
-{
-/*
- * Set timeout to endrest function, then give up the timeslice.
- * This is so other processes can execute while the rest is being
- * waited out.
- */
-#ifdef SPKRDEBUG
-printf("rest: %d\n", ticks);
-#endif /* SPKRDEBUG */
-if (ticks > 0)
- tsleep(rest, SPKRPRI | PCATCH, "rest", ticks);
-}
-#endif
-
/ PLAY STRING INTERPRETER BEGINS HERE **
*
* Play string interpretation is modelled on IBM BASIC 2.0's PLAY statement;
* M[LNS] are missing and the ~ synonym and octave-tracking facility is added.
- * Requires tone(), rest(), and endtone(). String play is not interruptible
+ * Requires spkr_tone(), spkr_rest(). String play is not interruptible
* except possibly at physical block boundaries.
*/
@@ -223,7 +167,7 @@ playtone(int pitch, int val, int sustain
}
if (pitch == -1)
- rest(whole * snum / (val * sdenom));
+ spkr_rest(whole * snum / (val * sdenom));
else
{
sound = (whole * snum) / (val * sdenom)
@@ -235,9 +179,9 @@ playtone(int pitch, int val, int sustain
pitch, sound, silence);
#endif /* SPKRDEBUG */
- tone(pitchtab[pitch], sound);
+ spkr_tone(pitchtab[pitch], sound);
if (fill != LEGATO)
- rest(silence);
+ spkr_rest(silence);
}
}
@@ -418,45 +362,14 @@ playstring(char *cp, int slen)
/*** UNIX DRIVER HOOKS BEGIN HERE **
*
- * This section implements driver hooks to run playstring() and the tone(),
- * endtone(), and rest() functions defined above.
+ * This section implements driver hoo
CVS commit: src/sys/modules
Module Name:src
Committed By: nat
Date: Thu Dec 8 23:22:18 UTC 2016
Modified Files:
src/sys/modules: Makefile
src/sys/modules/spkr: Makefile spkr.ioconf
Log Message:
Revert to previous. Add PCPPISPEAKER flag to fix build.
To generate a diff of this commit:
cvs rdiff -u -r1.184 -r1.185 src/sys/modules/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/spkr/Makefile \
src/sys/modules/spkr/spkr.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.184 src/sys/modules/Makefile:1.185
--- src/sys/modules/Makefile:1.184 Thu Dec 8 21:42:42 2016
+++ src/sys/modules/Makefile Thu Dec 8 23:22:18 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.184 2016/12/08 21:42:42 nat Exp $
+# $NetBSD: Makefile,v 1.185 2016/12/08 23:22:18 nat Exp $
.include
@@ -116,7 +116,6 @@ SUBDIR+= skipjack
SUBDIR+= slcompress
SUBDIR+= smbfs
SUBDIR+= spdmem
-SUBDIR+= spkr
SUBDIR+= sppp_subr
SUBDIR+= sysmon
SUBDIR+= sysmon_envsys
@@ -366,6 +365,7 @@ SUBDIR+= auvitek
SUBDIR+= coram
SUBDIR+= cxdtv
SUBDIR+= emdtv
+SUBDIR+= spkr
.endif
.if (${MKISCSI} != "no")
Index: src/sys/modules/spkr/Makefile
diff -u src/sys/modules/spkr/Makefile:1.2 src/sys/modules/spkr/Makefile:1.3
--- src/sys/modules/spkr/Makefile:1.2 Thu Dec 8 21:42:42 2016
+++ src/sys/modules/spkr/Makefile Thu Dec 8 23:22:18 2016
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2016/12/08 21:42:42 nat Exp $
+# $NetBSD: Makefile,v 1.3 2016/12/08 23:22:18 nat Exp $
.include "../Makefile.inc"
-.PATH: ${S}/dev
+.PATH: ${S}/dev/isa
KMOD= spkr
IOCONF= spkr.ioconf
-SRCS= spkr_synth.c
+CFLAGS+= -DPCPPISPEAKER
+SRCS= spkr.c
WARNS= 4
Index: src/sys/modules/spkr/spkr.ioconf
diff -u src/sys/modules/spkr/spkr.ioconf:1.2 src/sys/modules/spkr/spkr.ioconf:1.3
--- src/sys/modules/spkr/spkr.ioconf:1.2 Thu Dec 8 21:42:42 2016
+++ src/sys/modules/spkr/spkr.ioconf Thu Dec 8 23:22:18 2016
@@ -1,9 +1,10 @@
-# $NetBSD: spkr.ioconf,v 1.2 2016/12/08 21:42:42 nat Exp $
+# $NetBSD: spkr.ioconf,v 1.3 2016/12/08 23:22:18 nat Exp $
ioconf spkr
include "conf/files"
+include "dev/isa/files.isa"
-pseudo-root audio*
+pseudo-root pcppi*
-spkr* at audio?
+spkr* at pcppi?
CVS commit: src/sys/net/npf
Module Name:src
Committed By: rmind
Date: Thu Dec 8 23:07:12 UTC 2016
Modified Files:
src/sys/net/npf: npf.h npf_conn.c npf_handler.c npf_mbuf.c
Log Message:
NPF: adjust the 'stateful-ends' mechanism to tag the packets and thus
pass-through them on other interfaces. Per discussion with christos@.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/net/npf/npf.h
cvs rdiff -u -r1.16 -r1.17 src/sys/net/npf/npf_conn.c \
src/sys/net/npf/npf_mbuf.c
cvs rdiff -u -r1.33 -r1.34 src/sys/net/npf/npf_handler.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf.h
diff -u src/sys/net/npf/npf.h:1.47 src/sys/net/npf/npf.h:1.48
--- src/sys/net/npf/npf.h:1.47 Sun Aug 10 19:09:43 2014
+++ src/sys/net/npf/npf.h Thu Dec 8 23:07:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf.h,v 1.47 2014/08/10 19:09:43 rmind Exp $ */
+/* $NetBSD: npf.h,v 1.48 2016/12/08 23:07:11 rmind Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -116,8 +116,8 @@ void * nbuf_ensure_contig(nbuf_t *, siz
void * nbuf_ensure_writable(nbuf_t *, size_t);
bool nbuf_cksum_barrier(nbuf_t *, int);
-int nbuf_add_tag(nbuf_t *, uint32_t, uint32_t);
-int nbuf_find_tag(nbuf_t *, uint32_t, void **);
+int nbuf_add_tag(nbuf_t *, uint32_t);
+int nbuf_find_tag(nbuf_t *, uint32_t *);
/*
* Packet information cache.
@@ -259,8 +259,8 @@ bool npf_autounload_p(void);
#define NPF_LAYER_2 2
#define NPF_LAYER_3 3
-/* XXX mbuf.h: just for now. */
-#define PACKET_TAG_NPF 10
+/* Packet tags. */
+#define NPF_NTAG_PASS 0x0001
/*
* Rule commands (non-ioctl).
Index: src/sys/net/npf/npf_conn.c
diff -u src/sys/net/npf/npf_conn.c:1.16 src/sys/net/npf/npf_conn.c:1.17
--- src/sys/net/npf/npf_conn.c:1.16 Thu Feb 5 22:04:03 2015
+++ src/sys/net/npf/npf_conn.c Thu Dec 8 23:07:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_conn.c,v 1.16 2015/02/05 22:04:03 rmind Exp $ */
+/* $NetBSD: npf_conn.c,v 1.17 2016/12/08 23:07:11 rmind Exp $ */
/*-
* Copyright (c) 2014-2015 Mindaugas Rasiukevicius
@@ -99,7 +99,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_conn.c,v 1.16 2015/02/05 22:04:03 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_conn.c,v 1.17 2016/12/08 23:07:11 rmind Exp $");
#include
#include
@@ -432,11 +432,21 @@ npf_conn_inspect(npf_cache_t *npc, const
ok = npf_state_inspect(npc, &con->c_state, forw);
mutex_exit(&con->c_lock);
+ /* If invalid state: let the rules deal with it. */
if (__predict_false(!ok)) {
- /* Invalid: let the rules deal with it. */
npf_conn_release(con);
npf_stats_inc(NPF_STAT_INVALID_STATE);
- con = NULL;
+ return NULL;
+ }
+
+ /*
+ * If this is multi-end state, then specially tag the packet
+ * so it will be just passed-through on other interfaces.
+ */
+ if (con->c_ifid == 0 && nbuf_add_tag(nbuf, NPF_NTAG_PASS) != 0) {
+ npf_conn_release(con);
+ *error = ENOMEM;
+ return NULL;
}
return con;
}
Index: src/sys/net/npf/npf_mbuf.c
diff -u src/sys/net/npf/npf_mbuf.c:1.16 src/sys/net/npf/npf_mbuf.c:1.17
--- src/sys/net/npf/npf_mbuf.c:1.16 Fri Mar 18 10:09:46 2016
+++ src/sys/net/npf/npf_mbuf.c Thu Dec 8 23:07:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_mbuf.c,v 1.16 2016/03/18 10:09:46 mrg Exp $ */
+/* $NetBSD: npf_mbuf.c,v 1.17 2016/12/08 23:07:11 rmind Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.16 2016/03/18 10:09:46 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_mbuf.c,v 1.17 2016/12/08 23:07:11 rmind Exp $");
#include
#include
@@ -274,7 +274,7 @@ nbuf_cksum_barrier(nbuf_t *nbuf, int di)
* => Returns 0 on success or errno on failure.
*/
int
-nbuf_add_tag(nbuf_t *nbuf, uint32_t key, uint32_t val)
+nbuf_add_tag(nbuf_t *nbuf, uint32_t val)
{
struct mbuf *m = nbuf->nb_mbuf0;
struct m_tag *mt;
@@ -298,7 +298,7 @@ nbuf_add_tag(nbuf_t *nbuf, uint32_t key,
* => Returns 0 on success or errno on failure.
*/
int
-nbuf_find_tag(nbuf_t *nbuf, uint32_t key, void **data)
+nbuf_find_tag(nbuf_t *nbuf, uint32_t *val)
{
struct mbuf *m = nbuf->nb_mbuf0;
struct m_tag *mt;
@@ -309,6 +309,6 @@ nbuf_find_tag(nbuf_t *nbuf, uint32_t key
if (mt == NULL) {
return EINVAL;
}
- *data = (void *)(mt + 1);
+ *val = *(uint32_t *)(mt + 1);
return 0;
}
Index: src/sys/net/npf/npf_handler.c
diff -u src/sys/net/npf/npf_handler.c:1.33 src/sys/net/npf/npf_handler.c:1.34
--- src/sys/net/npf/npf_handler.c:1.33 Wed Jul 23 01:25:34 2014
+++ src/sys/net/npf/npf_handler.c Thu Dec 8 23:07:11 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_handler.c,v 1.33 2014/07/23 01:25:34 rmind Exp $ */
+/* $NetBSD: npf_handler.c,v 1.34 2016/12/08 23:07:11 rmind Exp $ */
/*-
* Copyright (c) 2009-2013 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_handler.c,v 1.33 2014/07/23 01:25:34 rmind Exp $");
+__K
CVS commit: src/sys/modules
Module Name:src
Committed By: nat
Date: Thu Dec 8 21:42:42 UTC 2016
Modified Files:
src/sys/modules: Makefile
src/sys/modules/spkr: Makefile spkr.ioconf
Log Message:
Fix building of the spkr module. The module now is the synthesized speaker.
Reported by joerg@
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/sys/modules/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/spkr/Makefile \
src/sys/modules/spkr/spkr.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.183 src/sys/modules/Makefile:1.184
--- src/sys/modules/Makefile:1.183 Wed Nov 16 00:49:27 2016
+++ src/sys/modules/Makefile Thu Dec 8 21:42:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.183 2016/11/16 00:49:27 pgoyette Exp $
+# $NetBSD: Makefile,v 1.184 2016/12/08 21:42:42 nat Exp $
.include
@@ -116,6 +116,7 @@ SUBDIR+= skipjack
SUBDIR+= slcompress
SUBDIR+= smbfs
SUBDIR+= spdmem
+SUBDIR+= spkr
SUBDIR+= sppp_subr
SUBDIR+= sysmon
SUBDIR+= sysmon_envsys
@@ -365,7 +366,6 @@ SUBDIR+= auvitek
SUBDIR+= coram
SUBDIR+= cxdtv
SUBDIR+= emdtv
-SUBDIR+= spkr
.endif
.if (${MKISCSI} != "no")
Index: src/sys/modules/spkr/Makefile
diff -u src/sys/modules/spkr/Makefile:1.1 src/sys/modules/spkr/Makefile:1.2
--- src/sys/modules/spkr/Makefile:1.1 Sun May 17 05:21:38 2015
+++ src/sys/modules/spkr/Makefile Thu Dec 8 21:42:42 2016
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2015/05/17 05:21:38 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/08 21:42:42 nat Exp $
.include "../Makefile.inc"
-.PATH: ${S}/dev/isa
+.PATH: ${S}/dev
KMOD= spkr
IOCONF= spkr.ioconf
-SRCS= spkr.c
+SRCS= spkr_synth.c
WARNS= 4
Index: src/sys/modules/spkr/spkr.ioconf
diff -u src/sys/modules/spkr/spkr.ioconf:1.1 src/sys/modules/spkr/spkr.ioconf:1.2
--- src/sys/modules/spkr/spkr.ioconf:1.1 Sun May 17 05:21:38 2015
+++ src/sys/modules/spkr/spkr.ioconf Thu Dec 8 21:42:42 2016
@@ -1,10 +1,9 @@
-# $NetBSD: spkr.ioconf,v 1.1 2015/05/17 05:21:38 pgoyette Exp $
+# $NetBSD: spkr.ioconf,v 1.2 2016/12/08 21:42:42 nat Exp $
ioconf spkr
include "conf/files"
-include "dev/isa/files.isa"
-pseudo-root pcppi*
+pseudo-root audio*
-spkr* at pcppi?
+spkr* at audio?
CVS commit: src/sys/sys
Module Name:src Committed By: nat Date: Thu Dec 8 20:53:12 UTC 2016 Modified Files: src/sys/sys: conf.h Log Message: MCLOSE class->flag. Found by hannken@ To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 src/sys/sys/conf.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/sys/conf.h diff -u src/sys/sys/conf.h:1.147 src/sys/sys/conf.h:1.148 --- src/sys/sys/conf.h:1.147 Thu Dec 8 10:28:44 2016 +++ src/sys/sys/conf.h Thu Dec 8 20:53:12 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: conf.h,v 1.147 2016/12/08 10:28:44 nat Exp $ */ +/* $NetBSD: conf.h,v 1.148 2016/12/08 20:53:12 nat Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -60,10 +60,10 @@ struct vnode; #define D_TAPE 0x0001 #define D_DISK 0x0002 #define D_TTY 0x0003 -#define D_MCLOSE 0x0004 #define D_TYPEMASK 0x00ff #define D_MPSAFE 0x0100 #define D_NEGOFFSAFE 0x0200 +#define D_MCLOSE 0x0400 /* * Block device switch table
CVS commit: src/etc/etc.aarch64
Module Name:src Committed By: nat Date: Thu Dec 8 20:44:24 UTC 2016 Modified Files: src/etc/etc.aarch64: MAKEDEV.conf Log Message: spkr->speaker. Found by kamil@ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/etc/etc.aarch64/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.aarch64/MAKEDEV.conf diff -u src/etc/etc.aarch64/MAKEDEV.conf:1.2 src/etc/etc.aarch64/MAKEDEV.conf:1.3 --- src/etc/etc.aarch64/MAKEDEV.conf:1.2 Thu Dec 8 11:31:13 2016 +++ src/etc/etc.aarch64/MAKEDEV.conf Thu Dec 8 20:44:24 2016 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.2 2016/12/08 11:31:13 nat Exp $ +# $NetBSD: MAKEDEV.conf,v 1.3 2016/12/08 20:44:24 nat Exp $ all_md) makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 @@ -15,7 +15,7 @@ all_md) makedev pci0 pci1 pci2 pci3 makedev kttcp makedev cfs - makedev audio spkr + makedev audio speaker makedev spiflash0 ;;
CVS commit: src/sys/dev
Module Name:src Committed By: nat Date: Thu Dec 8 20:33:52 UTC 2016 Modified Files: src/sys/dev: audio.c Log Message: Fix a build error. Found by joerg@ To generate a diff of this commit: cvs rdiff -u -r1.269 -r1.270 src/sys/dev/audio.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/audio.c diff -u src/sys/dev/audio.c:1.269 src/sys/dev/audio.c:1.270 --- src/sys/dev/audio.c:1.269 Thu Dec 8 10:28:44 2016 +++ src/sys/dev/audio.c Thu Dec 8 20:33:52 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.269 2016/12/08 10:28:44 nat Exp $ */ +/* $NetBSD: audio.c,v 1.270 2016/12/08 20:33:52 nat Exp $ */ /*- * Copyright (c) 2016 Nathanial Sloss @@ -148,7 +148,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.269 2016/12/08 10:28:44 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.270 2016/12/08 20:33:52 nat Exp $"); #include "audio.h" #if NAUDIO > 0 @@ -3580,7 +3580,7 @@ audio_upmix(void *v) continue; i--; vc = sc->sc_vchan[n]; - if (!vc->sc_open & AUOPEN_READ) + if (!(vc->sc_open & AUOPEN_READ)) continue; if (!vc->sc_rbus) continue;
CVS commit: src/external/gpl3/binutils
Module Name:src Committed By: christos Date: Thu Dec 8 19:35:12 UTC 2016 Modified Files: src/external/gpl3/binutils/lib/libbfd/arch/arm: bfd.h bfdver.h config.h src/external/gpl3/binutils/lib/libbfd/arch/armeb: bfd.h bfdver.h config.h src/external/gpl3/binutils/lib/libbfd/arch/earmhf: bfd.h bfdver.h config.h src/external/gpl3/binutils/lib/libbfd/arch/earmhfeb: bfd.h bfdver.h config.h src/external/gpl3/binutils/lib/libopcodes/arch/arm: config.h src/external/gpl3/binutils/lib/libopcodes/arch/armeb: config.h src/external/gpl3/binutils/lib/libopcodes/arch/earmhf: config.h src/external/gpl3/binutils/lib/libopcodes/arch/earmhfeb: config.h src/external/gpl3/binutils/usr.bin/common/arch/arm: config.h defs.mk src/external/gpl3/binutils/usr.bin/common/arch/armeb: config.h defs.mk src/external/gpl3/binutils/usr.bin/common/arch/earmhf: config.h defs.mk src/external/gpl3/binutils/usr.bin/common/arch/earmhfeb: config.h defs.mk src/external/gpl3/binutils/usr.bin/gas/arch/arm: config.h src/external/gpl3/binutils/usr.bin/gas/arch/armeb: config.h src/external/gpl3/binutils/usr.bin/gas/arch/earmhf: config.h targ-env.h src/external/gpl3/binutils/usr.bin/gas/arch/earmhfeb: config.h targ-env.h src/external/gpl3/binutils/usr.bin/gprof/arch/arm: gconfig.h src/external/gpl3/binutils/usr.bin/gprof/arch/armeb: gconfig.h src/external/gpl3/binutils/usr.bin/gprof/arch/earmhf: gconfig.h src/external/gpl3/binutils/usr.bin/gprof/arch/earmhfeb: gconfig.h src/external/gpl3/binutils/usr.bin/ld/arch/arm: config.h src/external/gpl3/binutils/usr.bin/ld/arch/armeb: config.h src/external/gpl3/binutils/usr.bin/ld/arch/earmhf: config.h src/external/gpl3/binutils/usr.bin/ld/arch/earmhfeb: config.h Log Message: finish arm regeneration To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/binutils/lib/libbfd/arch/arm/bfdver.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/lib/libbfd/arch/arm/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfdver.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/lib/libbfd/arch/armeb/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/lib/libbfd/arch/earmhf/bfd.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/binutils/lib/libbfd/arch/earmhf/bfdver.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/lib/libbfd/arch/earmhf/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/lib/libbfd/arch/earmhfeb/bfd.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/binutils/lib/libbfd/arch/earmhfeb/bfdver.h \ src/external/gpl3/binutils/lib/libbfd/arch/earmhfeb/config.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/lib/libopcodes/arch/arm/config.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/lib/libopcodes/arch/armeb/config.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/binutils/lib/libopcodes/arch/earmhf/config.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/binutils/lib/libopcodes/arch/earmhfeb/config.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/usr.bin/common/arch/arm/config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/binutils/usr.bin/common/arch/arm/defs.mk cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/usr.bin/common/arch/armeb/config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/binutils/usr.bin/common/arch/armeb/defs.mk cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/usr.bin/common/arch/earmhf/config.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/binutils/usr.bin/common/arch/earmhf/defs.mk cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/binutils/usr.bin/common/arch/earmhfeb/config.h \ src/external/gpl3/binutils/usr.bin/common/arch/earmhfeb/defs.mk cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/usr.bin/gas/arch/arm/config.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/usr.bin/gas/arch/armeb/config.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/binutils/usr.bin/gas/arch/earmhf/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/binutils/usr.bin/gas/arch/earmhf/targ-env.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/binutils/usr.bin/gas/arch/earmhfeb/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/gas/arch/earmhfeb/targ-env.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/usr.bin/gprof/arch/arm/gconfig.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/usr.bin/gprof/arch/armeb/gconfig.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/binutils/usr.bin/gprof/arch/earmhf/gconfig.h cvs rdiff -u -r1.
CVS commit: src/lib/libm
Module Name:src
Committed By: christos
Date: Thu Dec 8 18:42:01 UTC 2016
Modified Files:
src/lib/libm: Makefile
Log Message:
more stuff needs -mfpu=vfp
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.186 src/lib/libm/Makefile:1.187
--- src/lib/libm/Makefile:1.186 Wed Sep 21 10:11:40 2016
+++ src/lib/libm/Makefile Thu Dec 8 13:42:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.186 2016/09/21 14:11:40 christos Exp $
+# $NetBSD: Makefile,v 1.187 2016/12/08 18:42:01 christos Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -69,7 +69,9 @@ COPTS+= -mfloat-ieee -mieee-with-inexact
.PATH.c: ${.CURDIR}/arch/arm
COMMON_SRCS+= fenv.c s_nexttowardf.c \
s_nearbyint.c s_rintl.c
-COPTS.fenv.c+= -mfpu=vfp
+.for f in fenv.c lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
+COPTS.$f += -mfpu=vfp
+.endfor
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.if (${MKSOFTFLOAT} == "no")
.PATH.S: ${.CURDIR}/arch/arm
CVS commit: xsrc/external/mit/xf86-video-glint/dist/src
Module Name:xsrc
Committed By: macallan
Date: Thu Dec 8 18:09:39 UTC 2016
Modified Files:
xsrc/external/mit/xf86-video-glint/dist/src: glint_driver.c
Log Message:
round pitch up to a multiple of 32
now oddball resolutions like 1366x768 work properly on pm3
( the other chips enforce that anyway )
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c
diff -u xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.8 xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.9
--- xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c:1.8 Fri Dec 2 22:58:26 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/glint_driver.c Thu Dec 8 18:09:39 2016
@@ -2224,6 +2224,15 @@ GLINTPreInit(ScrnInfoPtr pScrn, int flag
/* set the MULTI width for software rendering */
pScrn->displayWidth = inputXSpanBytes / bytesPerPixel;
+} else {
+ /*
+ * round pitch up to next multiple of 32
+ * On most chips this will be enforced anyway by the pprod code, but
+ * not on pm3, which does seem to have some alignment requirements
+ * although it's not clear what exactly, so this may be too big.
+ * With this it works properly with a 1366x768 monitor.
+ */
+ pScrn->displayWidth = (pScrn->displayWidth + 31) & ~31;
}
/* Set the current mode to the first in the list */
CVS commit: src/tests/kernel
Module Name:src
Committed By: kamil
Date: Thu Dec 8 13:32:17 UTC 2016
Modified Files:
src/tests/kernel: t_ptrace_wait.c
Log Message:
Fix Clang/LLVM build
Reported error:
src/tests/kernel/t_ptrace_wait.c:4401:33:
error: missing field 'pl_event' initializer
[-Werror,-Wmissing-field-initializers]
Line in the code:
struct ptrace_lwpinfo info = {0};
Appease it with initializing info to {0, 0}.
Sponsored by
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/tests/kernel/t_ptrace_wait.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/kernel/t_ptrace_wait.c
diff -u src/tests/kernel/t_ptrace_wait.c:1.45 src/tests/kernel/t_ptrace_wait.c:1.46
--- src/tests/kernel/t_ptrace_wait.c:1.45 Tue Dec 6 18:59:00 2016
+++ src/tests/kernel/t_ptrace_wait.c Thu Dec 8 13:32:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.45 2016/12/06 18:59:00 christos Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.46 2016/12/08 13:32:17 kamil Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.45 2016/12/06 18:59:00 christos Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.46 2016/12/08 13:32:17 kamil Exp $");
#include
#include
@@ -4398,7 +4398,7 @@ ATF_TC_BODY(lwpinfo1, tc)
#if defined(TWAIT_HAVE_STATUS)
int status;
#endif
- struct ptrace_lwpinfo info = {0};
+ struct ptrace_lwpinfo info = {0, 0};
printf("Before forking process PID=%d\n", getpid());
ATF_REQUIRE((child = fork()) != -1);
@@ -4469,7 +4469,7 @@ ATF_TC_BODY(lwpinfo2, tc)
#if defined(TWAIT_HAVE_STATUS)
int status;
#endif
- struct ptrace_lwpinfo info = {0};
+ struct ptrace_lwpinfo info = {0, 0};
printf("Spawn tracee\n");
ATF_REQUIRE(msg_open(&parent_tracee) == 0);
CVS commit: src/sys/dev
Module Name:src
Committed By: mlelstv
Date: Thu Dec 8 12:22:56 UTC 2016
Modified Files:
src/sys/dev: dksubr.c
Log Message:
invoke optional d_label callback to give the driver the possibility
to adjust the label with driver specific data.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/dksubr.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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.92 src/sys/dev/dksubr.c:1.93
--- src/sys/dev/dksubr.c:1.92 Mon Nov 28 08:42:20 2016
+++ src/sys/dev/dksubr.c Thu Dec 8 12:22:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.92 2016/11/28 08:42:20 mlelstv Exp $ */
+/* $NetBSD: dksubr.c,v 1.93 2016/12/08 12:22:56 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.92 2016/11/28 08:42:20 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.93 2016/12/08 12:22:56 mlelstv Exp $");
#include
#include
@@ -815,6 +815,7 @@ dk_dump(struct dk_softc *dksc, dev_t dev
void
dk_getdefaultlabel(struct dk_softc *dksc, struct disklabel *lp)
{
+ const struct dkdriver *dkd = dksc->sc_dkdev.dk_driver;
struct disk_geom *dg = &dksc->sc_dkdev.dk_geom;
memset(lp, 0, sizeof(*lp));
@@ -843,7 +844,11 @@ dk_getdefaultlabel(struct dk_softc *dksc
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
- lp->d_checksum = dkcksum(dksc->sc_dkdev.dk_label);
+
+ if (dkd->d_label)
+ dkd->d_label(dksc->sc_dev, lp);
+
+ lp->d_checksum = dkcksum(lp);
}
/* ARGSUSED */
CVS commit: src/sys/sys
Module Name:src
Committed By: mlelstv
Date: Thu Dec 8 12:21:54 UTC 2016
Modified Files:
src/sys/sys: disk.h param.h
Log Message:
Add driver entry point to augment a default disklabel with driver specific
data. Legacy data like RPM values, typenames but also special paritioning
representing disk formats.
Bump kernel rev.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/sys/disk.h
cvs rdiff -u -r1.510 -r1.511 src/sys/sys/param.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/sys/disk.h
diff -u src/sys/sys/disk.h:1.68 src/sys/sys/disk.h:1.69
--- src/sys/sys/disk.h:1.68 Mon Nov 28 08:42:20 2016
+++ src/sys/sys/disk.h Thu Dec 8 12:21:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: disk.h,v 1.68 2016/11/28 08:42:20 mlelstv Exp $ */
+/* $NetBSD: disk.h,v 1.69 2016/12/08 12:21:54 mlelstv Exp $ */
/*-
* Copyright (c) 1996, 1997, 2004 The NetBSD Foundation, Inc.
@@ -482,6 +482,7 @@ struct dkdriver {
int (*d_lastclose)(device_t);
int (*d_discard)(device_t, off_t, off_t);
int (*d_firstopen)(device_t, dev_t, int, int);
+ void (*d_label)(device_t, struct disklabel *lp);
};
#endif
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.510 src/sys/sys/param.h:1.511
--- src/sys/sys/param.h:1.510 Mon Nov 28 08:42:20 2016
+++ src/sys/sys/param.h Thu Dec 8 12:21:54 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.510 2016/11/28 08:42:20 mlelstv Exp $ */
+/* $NetBSD: param.h,v 1.511 2016/12/08 12:21:54 mlelstv Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -67,7 +67,7 @@
* 2.99.9 (299000900)
*/
-#define __NetBSD_Version__ 799004300 /* NetBSD 7.99.43 */
+#define __NetBSD_Version__ 799004400 /* NetBSD 7.99.44 */
#define __NetBSD_Prereq__(M,m,p) (M) * 1) + \
(m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/doc
Module Name:src Committed By: nat Date: Thu Dec 8 11:34:40 UTC 2016 Modified Files: src/doc: CHANGES Log Message: Synthesized PC speaker(4) device. To generate a diff of this commit: cvs rdiff -u -r1.2217 -r1.2218 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2217 src/doc/CHANGES:1.2218 --- src/doc/CHANGES:1.2217 Thu Dec 8 11:17:36 2016 +++ src/doc/CHANGES Thu Dec 8 11:34:40 2016 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2217 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2218 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -405,3 +405,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: FreeBSD) [skrll 20161204] ixg(4): Add X55x support [msaitoh 20161205] audio(4): Audio sub-system changes - in kernel mixing [nat 20161208] + speaker(4):Synthesized beep for platforms with audio [nat 20161208]
CVS commit: src
Module Name:src Committed By: nat Date: Thu Dec 8 11:31:15 UTC 2016 Modified Files: src/etc/etc.aarch64: MAKEDEV.conf src/etc/etc.algor: MAKEDEV.conf src/etc/etc.amiga: MAKEDEV.conf src/etc/etc.amigappc: MAKEDEV.conf src/etc/etc.atari: MAKEDEV.conf src/etc/etc.cats: MAKEDEV.conf src/etc/etc.cobalt: MAKEDEV.conf src/etc/etc.dreamcast: MAKEDEV.conf src/etc/etc.epoc32: MAKEDEV.conf src/etc/etc.evbarm: MAKEDEV.conf src/etc/etc.evbppc: MAKEDEV.conf src/etc/etc.evbsh3: MAKEDEV.conf src/etc/etc.hpcarm: MAKEDEV.conf src/etc/etc.hpcmips: MAKEDEV.conf src/etc/etc.hppa: MAKEDEV.conf src/etc/etc.landisk: MAKEDEV.conf src/etc/etc.macppc: MAKEDEV.conf src/etc/etc.mmeye: MAKEDEV.conf src/etc/etc.or1k: MAKEDEV.conf src/etc/etc.pmax: MAKEDEV.conf src/etc/etc.sgimips: MAKEDEV.conf src/etc/etc.shark: MAKEDEV.conf src/etc/etc.sparc: MAKEDEV.conf src/etc/etc.sparc64: MAKEDEV.conf src/etc/etc.x68k: MAKEDEV.conf src/etc/etc.zaurus: MAKEDEV.conf src/share/man/man4: speaker.4 src/sys/arch/acorn32/conf: EB7500ATX GENERIC INSTALL LOWMEM_WSCONS NC src/sys/arch/algor/conf: majors.algor src/sys/arch/alpha/conf: GENERIC majors.alpha src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 majors.amd64 src/sys/arch/amiga/conf: AMIGA DRACO GENERIC GENERIC.in MDINSTALL src/sys/arch/amigappc/conf: GENERIC NULL src/sys/arch/atari/conf: GENERIC.in HADES HADES.in MILAN-ISAIDE MILAN-PCIIDE src/sys/arch/bebox/conf: GENERIC INSTALL majors.bebox src/sys/arch/cats/conf: GENERIC INSTALL src/sys/arch/cobalt/conf: GENERIC INSTALL src/sys/arch/dreamcast/conf: GENERIC src/sys/arch/emips/conf: GENERIC src/sys/arch/epoc32/conf: GENERIC src/sys/arch/evbarm/conf: ALLWINNER_A80 ARMADILLO9 BPI CUBIEBOARD GUMSTIX HDL_G HPT5325 HUMMINGBIRD_A31 IMX23_OLINUXINO LUBBOCK MINI2440 MMNET_GENERIC MPCSA_GENERIC MV2120 POGO RPI SHEEVAPLUG SMDK2410 TEGRA TS7200 TWINTAIL src/sys/arch/evbmips/conf: ALCHEMY LOONGSON MALTA majors.evbmips src/sys/arch/evbppc/conf: EV64260 OPENBLOCKS266_OPT PMPPC src/sys/arch/hp300/conf: GENERIC src/sys/arch/hpcarm/conf: NETBOOKPRO WZERO3 src/sys/arch/hpcmips/conf: GENERIC TX3922 VR41XX src/sys/arch/hppa/conf: GENERIC src/sys/arch/i386/conf: ALL GENERIC GENERIC_TINY INSTALL_FLOPPY INSTALL_TINY XEN3_DOM0 majors.i386 src/sys/arch/ia64/conf: majors.ia64 src/sys/arch/ibmnws/conf: GENERIC src/sys/arch/iyonix/conf: GENERIC src/sys/arch/landisk/conf: GENERIC src/sys/arch/macppc/conf: GENERIC GENERIC_601 POWERMAC_G5 src/sys/arch/mmeye/conf: MMEYE_WLF src/sys/arch/netwinder/conf: GENERIC src/sys/arch/ofppc/conf: GENERIC src/sys/arch/playstation2/conf: DEBUG src/sys/arch/pmax/conf: GENERIC GENERIC64 INSTALL INSTALL64 src/sys/arch/powerpc/conf: majors.powerpc src/sys/arch/prep/conf: GENERIC majors.prep src/sys/arch/riscv/conf: majors.riscv src/sys/arch/sandpoint/conf: ENCPP1 src/sys/arch/sgimips/conf: GENERIC32_IP2x GENERIC32_IP3x src/sys/arch/shark/conf: GENERIC INSTALL src/sys/arch/sparc/conf: GENERIC INSTALL KRUPS MRCOFFEE TADPOLE3GX src/sys/arch/sparc64/conf: GENERIC NONPLUS64 src/sys/arch/usermode/conf: GENERIC.common src/sys/arch/vax/conf: GENERIC src/sys/arch/x68k/conf: GENERIC INSTALL src/sys/arch/x86/acpi: acpi_cpu_md.c src/sys/arch/zaurus/conf: GENERIC INSTALL src/sys/conf: majors src/sys/dev: audiobell.c audiobellvar.h files.audio src/sys/dev/isa: files.isa spkr.c src/sys/dev/wscons: wskbd.c Added Files: src/sys/dev: spkr_synth.c spkrvar.h Log Message: Add a synthesized pc beeper and keyboard bell for platforms with an audio device. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/etc/etc.aarch64/MAKEDEV.conf cvs rdiff -u -r1.4 -r1.5 src/etc/etc.algor/MAKEDEV.conf cvs rdiff -u -r1.11 -r1.12 src/etc/etc.amiga/MAKEDEV.conf cvs rdiff -u -r1.2 -r1.3 src/etc/etc.amigappc/MAKEDEV.conf cvs rdiff -u -r1.10 -r1.11 src/etc/etc.atari/MAKEDEV.conf cvs rdiff -u -r1.8 -r1.9 src/etc/etc.cats/MAKEDEV.conf cvs rdiff -u -r1.12 -r1.13 src/etc/etc.cobalt/MAKEDEV.conf cvs rdiff -u -r1.5 -r1.6 src/etc/etc.dreamcast/MAKEDEV.conf cvs rdiff -u -r1.1 -r1.2 src/etc/etc.epoc32/MAKEDEV.conf cvs rdiff -u -r1.15 -r1.16 src/etc/etc.evbarm/MAKEDEV.conf cvs rdiff -u -r1.9 -r1.10 src/etc/etc.evbppc/MAKEDEV.conf cvs rdiff -u -r1.7 -r1.8 src/etc/etc.evbsh3/MAKEDEV.conf cvs rdiff -u -r1.13 -r1.14 src/etc/etc.hpcarm/MAKEDEV.conf cvs rdiff -u -r1.6 -r1.7 src/etc/etc.hpcmips/MAKEDEV.conf cvs rdiff -u -r
CVS commit: src/doc
Module Name:src Committed By: nat Date: Thu Dec 8 11:17:37 UTC 2016 Modified Files: src/doc: CHANGES Log Message: New audio sub-system changes - in kernel mixing To generate a diff of this commit: cvs rdiff -u -r1.2216 -r1.2217 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2216 src/doc/CHANGES:1.2217 --- src/doc/CHANGES:1.2216 Mon Dec 5 08:53:01 2016 +++ src/doc/CHANGES Thu Dec 8 11:17:36 2016 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2216 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2217 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -404,3 +404,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: axe(4): added support for AX88772A and AX88772B chipsets (from FreeBSD) [skrll 20161204] ixg(4): Add X55x support [msaitoh 20161205] + audio(4): Audio sub-system changes - in kernel mixing [nat 20161208]
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Thu Dec 8 08:12:10 UTC 2016 Modified Files: src/doc [netbsd-7]: CHANGES-7.1 Log Message: tickets 1286-1293 To generate a diff of this commit: cvs rdiff -u -r1.1.2.125 -r1.1.2.126 src/doc/CHANGES-7.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1 diff -u src/doc/CHANGES-7.1:1.1.2.125 src/doc/CHANGES-7.1:1.1.2.126 --- src/doc/CHANGES-7.1:1.1.2.125 Thu Dec 8 00:15:50 2016 +++ src/doc/CHANGES-7.1 Thu Dec 8 08:12:10 2016 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1,v 1.1.2.125 2016/12/08 00:15:50 snj Exp $ +# $NetBSD: CHANGES-7.1,v 1.1.2.126 2016/12/08 08:12:10 snj Exp $ A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1 release: @@ -6990,3 +6990,176 @@ usr.sbin/cpuctl/arch/i386.c 1.72-1.74 - Add new TLB descriptor 0x64 and 0xc4. [msaitoh, ticket #1285] +sys/dev/i2c/sdtemp.c1.26-1.32 via patch +sys/dev/i2c/sdtemp_reg.h 1.8-1.12 +share/man/man4/sdtemp.41.5-1.6 + + Changes for sdtemp(4): + - Add support for Atmel AT30TS00, AT30TSE004, Giantec GT30TS00, + GT34TS02, Microchip MCP9804, MCP98244, IDT TS3000GB[02], TS3001GB2, + TSE2004GB2, On Semiconductor CAT34TS02C and CAT34TS04. + - Add JEDEC TSE2004av support. If a device conforms TES2004av, it can + be used without adding new entry into the matching table. + - Check the temperature resolution field in the capability register + instead of the hard coded value in the match table. With this change, + some devices' temperature resolution would be fixed. + - The resolution register is a vendor specific register. + - All of IDT devices have the resolution register. + - The address of the resolution register of Microchip MCP98244 is + different from other Microchip devices. + - Show accuracy, range, resolution, high voltage standoff and shutdown. + - Show timeout with AB_DEBUG. + - Fix dmesg of STTS2004. + [msaitoh, ticket #1286] + +sys/arch/arm/include/armreg.h 1.111 + + Fix CORTEXA9Rx definitions. + [msaitoh, ticket #1287] + +distrib/sets/lists/man/mi 1.1521, 1.1522 +lib/libc/stdlib/Makefile.inc 1.92 + + Add malloc.conf.5 (link to jemalloc.3). + [msaitoh, ticket #1288] + +sys/dev/usb/usbdevs 1.683-1.684, 1.686-1.689, 1.691-1.695, 1.697-1.700, 1.702-1.711, 1.713-1.715, 1.717-1.727 +sys/dev/usb/usbdevs.h regen +sys/dev/usb/usbdevs_data.h regen + + - Add Realtek RTL8152, RTL8153, RTL8192EU. + - Add Atheros AR3012. + - Add Validity Sensors, Inc. and their devices. PR#45732 from + Greg A. Woods. + - Add some SMSC devices (PR#49484) + - Add Silicon Labs EC3 USB debug adapter. + - Add Xbox 360 Wireless Receiver. + - Add Arduino, TP-Link, Compare, DataApex, Evoluton Robotics devices. + - Add another RTL8192CU device of Asustek. + - Add Belkin Components RTL8192CPU, RTL8188CU and F7D2102. + - Add another RTL8188CUS. device of Chicony Electronics. + - Add another RTL8192CU and DWA-131 rev. B of D-Link. + - Add Guillemot RTL8192CU. + - Add Hawking RTL8192CU. + - Add IO-DATA WN-G150UM and RTL8192CU. + - Add another RTL8188RU of Realtek. + - Add Huawei U8150, E353_HiLink. + - Add vendor ID of Ingenic Semiconductor Ltd. + - Add Conexant USB Modem. + - Add TI TUSB3410, MSP-FET430UIF and MSP-FET430UIF JTAG. + Part of PR#49814. + - Add Lenovo ThinkPad Compact USB keyboard with TrackPoint. + - Add Panasonic Lumix Camera DMC-FS45 from kern/49809. + - Add Asustek USB-N53 and USB-N66. + - Add D-Link DWA-1xx devices. + - Add Ralink RT3573 and RT5572. + - Add Sitecom Europe ET3072 and LN-031. + - Add Elecom WDC-433SU2M2. + - Add Apple iPhone[45], iPad[23] and iPad Mini. + - Add Century CT-USB1HUB. + - Add MosChip MCS7832 Ethernet Adapter. + - Add another RTL8188CU of Realtek. + - Add DisplayLink MIMO, Polaris2 USB dock, Plugable docking station, + FY-DVI and FY-DVI2. + - Add a NetChip USB-IDE bridge. + - Add MS Confort Mouse 6000 from Martijn van Buul (PR#50701). + - Add NTT DOCOMO L-05A. + - Add Buffalo WI-U2-300D. + - Add Sandisk Cruzer (PR#46547). + - Add D-Link DWA 125 rev. D1 USB wireless network adapter + from Jake Slazenger (part of PR#51529). + - Add C-Meida USB Pnp Sound. + - Add AboCom RTL8188EU. + - Add Intel Advanced-N 6235 Combo Bluetooth. + - Add Validity Sensors VFS491. + - Add Linksys HG20F9 Ethernet. + [msaitoh, ticket #1289] + +sys/dev/pci/satalink.c1.53 + + Remove PCI_PRODUCT_CMDTECH_240's entry because CMDTECH_AAR_1210SA + has the same ID. + [msaitoh, ticket #1290] + +sys/dev/pci/pcidevs1.1221-1.1245, 1.1247-1.1262, 1.1264-1.1269, 1.1271-1.1273 +sys/dev/pci/pcidevs.hregen +sys/dev/pci/pcidevs_data.h regen + + - Add SystemBase SB16C1050 UARTs. + - Add D-Link DFE520TX (part of PR#49889 reported by Maxim Tsyplakov). + - Add Realtek RTL8188EE and RTL8192CE + - Add PLX Technology PEX 8111. + - Add some Red Hat devices. + - Add Samsung SM951. + - Add several NVIDIA geforce and NVS cards. + - Add some ATI/AMD devices.
CVS commit: [netbsd-7] src/sys/arch/x86/x86
Module Name:src
Committed By: snj
Date: Thu Dec 8 08:06:38 UTC 2016
Modified Files:
src/sys/arch/x86/x86 [netbsd-7]: procfs_machdep.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1293):
sys/arch/x86/x86/procfs_machdep.c: revisions 1.12-1.14
Update for x86 /proc/cpuinfo:
- Add ptsc, avx512dq, avx512bw, avx512vl and rdt_a.
- Update VIA/Cyrix/Centaur-defined bits. Part of PR#39950.
- Remove pcommit.
- Update some Linux mapping unused in /proc/cpuinfo.
To generate a diff of this commit:
cvs rdiff -u -r1.6.4.1 -r1.6.4.2 src/sys/arch/x86/x86/procfs_machdep.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/x86/x86/procfs_machdep.c
diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.1 src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.2
--- src/sys/arch/x86/x86/procfs_machdep.c:1.6.4.1 Sun Mar 6 17:58:22 2016
+++ src/sys/arch/x86/x86/procfs_machdep.c Thu Dec 8 08:06:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_machdep.c,v 1.6.4.1 2016/03/06 17:58:22 martin Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.6.4.2 2016/12/08 08:06:38 snj Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6.4.1 2016/03/06 17:58:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.6.4.2 2016/12/08 08:06:38 snj Exp $");
#include
#include
@@ -61,13 +61,13 @@ __KERNEL_RCSID(0, "$NetBSD: procfs_machd
* x86/include/asm/cpufeatures.h.
*/
static const char * const x86_features[][32] = {
- { /* (0) Common */
+ { /* (0) Common: 0x001 edx */
"fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
"cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
"pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",
"fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe"},
- { /* (1) AMD-defined: 8001 edx */
+ { /* (1) AMD-defined: 0x8001 edx */
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
NULL, NULL, NULL, "mp", "nx", NULL, "mmxext", NULL,
@@ -86,7 +86,7 @@ static const char * const x86_features[]
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
- { /* (4) Intel-defined: 8001 ecx */
+ { /* (4) Intel-defined: 0x0001 ecx */
"pni", "pclmulqdq", "dtes64", "monitor", "ds_cpl", "vmx", "smx", "est",
"tm2", "ssse3", "cid", "sdbg", "fma", "cx16", "xtpr", "pdcm",
NULL, "pcid", "dca", "sse4_1", "sse4_2", "x2apic", "movbe", "popcnt",
@@ -95,7 +95,7 @@ static const char * const x86_features[]
{ /* (5) VIA/Cyrix/Centaur-defined */
NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ "ace2", "ace2_en", "phe", "phe_en", "pmm", "pmm_en", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
@@ -105,12 +105,13 @@ static const char * const x86_features[]
"3dnowprefetch", "osvw", "ibs", "xop", "skinit", "wdt", NULL, "lwp",
"fma4", "tce", NULL, "nodeid_msr",
NULL, "tbm", "topoext", "perfctr_core",
- "perfctr_nb", NULL, "bpext", NULL, "perfctr_l2", "mwaitx", NULL, NULL},
+ "perfctr_nb", NULL, "bpext", "ptsc",
+ "perfctr_l2", "mwaitx", NULL, NULL},
{ /* (7) Linux mapping */
- "ida", "arat", "cpb", "ebp", NULL, "pln", "pts", "dtherm",
- "hw_pstate", "proc_feedback", "hwp", "hwp_notify", "hwp_act_window",
- "hwp_epp", "hwp_pkg_req", "intel_pt",
+ NULL, NULL, "cpb", "ebp", NULL, "pln", "pts", "dtherm",
+ "hw_pstate", "proc_feedback", NULL, NULL,
+ NULL, NULL, NULL, "intel_pt",
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
@@ -124,11 +125,11 @@ static const char * const x86_features[]
{ /* (9) Intel-defined: 0007 ebx */
"fsgsbase", "tsc_adjust", NULL, "bmi1", "hle", "avx2", NULL, "smep",
- "bmi2", "erms", "invpcid", "rtm", "cqm", NULL, "mpx", NULL,
- "avx512f", NULL, "rdseed", "adx",
- "smap", NULL, "pcommit", "clflushopt",
+ "bmi2", "erms", "invpcid", "rtm", "cqm", NULL, "mpx", "rdt_a",
+ "avx512f", "avx512dq", "rdseed", "adx",
+ "smap", NULL, NULL, "clflushopt",
"clwb", NULL, "avx512pf", "avx512er",
- "avx512cd", "sha_ni", NULL, NULL},
+ "avx512cd", "sha_ni", "avx512bw", "avx512vl"},
{ /* (10) 000d eax */
"xsaveopt", "xsavec", "xgetbv1", "xsaves", NULL, NULL, NULL, NULL,
CVS commit: [netbsd-7] src
Module Name:src
Committed By: snj
Date: Thu Dec 8 08:03:59 UTC 2016
Modified Files:
src/share/man/man4 [netbsd-7]: puc.4
src/sys/dev/pci [netbsd-7]: pucdata.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1292):
sys/dev/pci/pucdata.c: revisions 1.95-1.98
share/man/man4/puc.4: revisions 1.39-40
Add three devices to puc(4):
- Add support for SystemBase SB16C1050 PCI serial card. PR#49819
reported by Roberto E. Vargas Caballero.
- Add another Intel Q45 KT.
- Add Intel 100 Series Chipset KT.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.38.8.1 src/share/man/man4/puc.4
cvs rdiff -u -r1.93.4.1 -r1.93.4.2 src/sys/dev/pci/pucdata.c
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/puc.4
diff -u src/share/man/man4/puc.4:1.38 src/share/man/man4/puc.4:1.38.8.1
--- src/share/man/man4/puc.4:1.38 Fri Oct 26 11:43:43 2012
+++ src/share/man/man4/puc.4 Thu Dec 8 08:03:59 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: puc.4,v 1.38 2012/10/26 11:43:43 msaitoh Exp $
+.\" $NetBSD: puc.4,v 1.38.8.1 2016/12/08 08:03:59 snj Exp $
.\"
.\" Copyright (c) 1998 Christopher G. Demetriou
.\" All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" <>
.\"
-.Dd October 26, 2012
+.Dd May 4, 2015
.Dt PUC 4
.Os
.Sh NAME
@@ -165,6 +165,7 @@ The driver currently supports the follow
.It Tn "SUNIX 5099 (4 port serial and 1 port parallel)"
.It Tn "Syba Tech Ltd. PCI-4S"
.It Tn "Syba Tech Ltd. PCI-4S2P-550-ECP"
+.It Tn "SystemBase SB16C1050PCI (2 port serial)"
.It Tn "SystemBase SB16C1054PCI (4 port serial)"
.It Tn "SystemBase SB16C1058PCI (8 port serial)"
.It Tn "US Robotics (3Com) 3CP5609 PCI 16550 Modem"
@@ -217,7 +218,8 @@ driver appeared in
.Sh AUTHORS
The
.Nm
-driver was written by Chris Demetriou.
+driver was written by
+.An Chris Demetriou .
.Sh BUGS
The current design of this driver keeps any
.Nm com
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.93.4.1 src/sys/dev/pci/pucdata.c:1.93.4.2
--- src/sys/dev/pci/pucdata.c:1.93.4.1 Thu Apr 30 19:27:20 2015
+++ src/sys/dev/pci/pucdata.c Thu Dec 8 08:03:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.93.4.1 2015/04/30 19:27:20 snj Exp $ */
+/* $NetBSD: pucdata.c,v 1.93.4.2 2016/12/08 08:03:59 snj Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.93.4.1 2015/04/30 19:27:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.93.4.2 2016/12/08 08:03:59 snj Exp $");
#include
#include
@@ -477,7 +477,7 @@ const struct puc_device_description puc_
{ PUC_PORT_TYPE_COM, PCI_BAR2, 0x00, COM_FREQ },
},
},
-
+
/* Lava Computers 2SP-PCI */
{ "Lava Computers 2SP-PCI parallel port",
{ PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_TWOSP_1P, 0, 0 },
@@ -1315,7 +1315,7 @@ const struct puc_device_description puc_
},
{ "SUNIX 5008 1P",
- { PCI_VENDOR_SUNIX2, PCI_PRODUCT_SUNIX2_SER5,
+ { PCI_VENDOR_SUNIX2, PCI_PRODUCT_SUNIX2_SER5,
0x1fd4, 0x0100 },
{ 0x, 0x, 0x, 0xeff0 },
{
@@ -1469,7 +1469,7 @@ const struct puc_device_description puc_
},
/*
- * Nanjing QinHeng Electronics
+ * Nanjing QinHeng Electronics
* Products based on CH353 chip which can be
* configured to provide various combinations
* including 2 serial ports and a parallel port
@@ -1857,6 +1857,14 @@ const struct puc_device_description puc_
},
},
+ /* Intel Q45 KT (again) */
+ { "Intel Q45 KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q45_KT_1, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ },
+ },
/* Intel 5 Series and Intel 3400 Series KT */
{ "Intel 5 Series KT",
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_KT, 0, 0 },
@@ -1902,6 +1910,15 @@ const struct puc_device_description puc_
},
},
+ /* Intel 100 Series KT */
+ { "Intel 100 Series KT",
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_100SERIES_KT, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ },
+ },
+ },
+
/* Intel C600/X79 Series KT */
{ "Intel C600/X79 Series KT",
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_KT, 0, 0 },
@@ -2783,6 +2800,16 @@ const struct puc_device_description puc_
},
},
+ /* SystemBase SB16C1050 UARTs */
+ { "SystemBase SB16C1050",
+ { PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1050, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x00, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x08, COM_FREQ * 8},
+ },
+ },
+
/* SystemBase SB16C1054 UARTs */
{ "SystemBase SB16C1054",
{ PCI_VENDOR_SYSTEMBASE, PCI_PRODUCT_SYSTEMBASE_SB16C1054, 0, 0 },
