Re: CVS commit: src/sys/dev/sysmon
Date: Tue, 28 Apr 2015 17:01:10 +0800 (PHT) From: Paul Goyette p...@vps1.whooppee.com Well, it really is a (pseudo-)device, and even has its own major device number. We cannot avoid all of the device goop, since a non-built-in-module would still have to merge in the devsw. My goal is to eventually be able to build and run a kernel which has no portion of sysmon built-in, and still be able to load and unload the wdog/power/envsys components, along with the actual drivers for timers/power-switches/sensors. But what purpose does attaching an *autoconf* device serve? The devsw is the userland interface, /dev/sysmon, and is not actually related to autoconf devices. You can attach a devsw without any associated autoconf device, and vice versa. The defpseudo config directive with the associated (often empty) xyzattach routine allows you to include or exclude the code from a kernel statically with the pseudo-device directive. Some pseudo-devices have multiple instances, e.g. cgd(4): each /dev/cgdN needs its own separate state. So it uses multiple autoconf devices to manage the numbered instances. Some pseudo-devices attach children, so they also need an autoconf device. In the case of sysmon, there's only one global state. Some of it is put into a softc struct (sc_minor_mtx); the rest of it is in global variables (sysmon_opvec_table, sysmon_refcnt). It doesn't seem to attach any children. There's no defpseudo, so you can't configure it statically in your kernel. I think you could remove the whole cfattach/cfdriver/sysmon_match/c. business and replace it by initialization in MODULE_CMD_INIT (plus the RUN_ONCE nonsense because builtin modules get initialized too late).
CVS commit: src/sys/arch
Module Name:src Committed By: rjs Date: Tue Apr 28 13:52:50 UTC 2015 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL Log Message: Add DCCP. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.391 -r1.392 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: rjs Date: Tue Apr 28 13:52:50 UTC 2015 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL Log Message: Add DCCP. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.391 -r1.392 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.27 src/sys/arch/amd64/conf/ALL:1.28 --- src/sys/arch/amd64/conf/ALL:1.27 Fri Mar 6 15:09:50 2015 +++ src/sys/arch/amd64/conf/ALL Tue Apr 28 13:52:49 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.27 2015/03/06 15:09:50 riastradh Exp $ +# $NetBSD: ALL,v 1.28 2015/04/28 13:52:49 rjs 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.27 $ +#ident ALL-$Revision: 1.28 $ maxusers 64 # estimated number of users @@ -224,6 +224,7 @@ options MPLS # MultiProtocol Label Swi options MROUTING # IP multicast routing options PIM # Protocol Independent Multicast options NETATALK # AppleTalk networking protocols +options DCCP # Datagram Congestion Control Protocol options PPP_BSDCOMP # BSD-Compress compression support for PPP options PPP_DEFLATE # Deflate compression support for PPP options PPP_FILTER # Active filter support for PPP (requires bpf) Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.391 src/sys/arch/i386/conf/ALL:1.392 --- src/sys/arch/i386/conf/ALL:1.391 Fri Feb 13 18:57:47 2015 +++ src/sys/arch/i386/conf/ALL Tue Apr 28 13:52:50 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.391 2015/02/13 18:57:47 nonaka Exp $ +# $NetBSD: ALL,v 1.392 2015/04/28 13:52:50 rjs 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.391 $ +#ident ALL-$Revision: 1.392 $ maxusers 64 # estimated number of users @@ -223,6 +223,7 @@ options MPLS # MultiProtocol Label Swi options MROUTING # IP multicast routing options PIM # Protocol Independent Multicast options NETATALK # AppleTalk networking protocols +options DCCP # Datagram Congestion Control Protocol options PPP_BSDCOMP # BSD-Compress compression support for PPP options PPP_DEFLATE # Deflate compression support for PPP options PPP_FILTER # Active filter support for PPP (requires bpf)
CVS commit: src/usr.sbin/zdump
Module Name:src Committed By: martin Date: Tue Apr 28 19:59:14 UTC 2015 Modified Files: src/usr.sbin/zdump: Makefile Log Message: Remove reference to (no longer existing) ialloc.c To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/zdump/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zdump
Module Name:src
Committed By: martin
Date: Tue Apr 28 19:59:14 UTC 2015
Modified Files:
src/usr.sbin/zdump: Makefile
Log Message:
Remove reference to (no longer existing) ialloc.c
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/zdump/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zdump/Makefile
diff -u src/usr.sbin/zdump/Makefile:1.9 src/usr.sbin/zdump/Makefile:1.10
--- src/usr.sbin/zdump/Makefile:1.9 Tue Oct 7 22:20:02 2014
+++ src/usr.sbin/zdump/Makefile Tue Apr 28 19:59:14 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2014/10/07 22:20:02 christos Exp $
+# $NetBSD: Makefile,v 1.10 2015/04/28 19:59:14 martin Exp $
.include ${.PARSEDIR}/../zic/Makefile.inc
.include bsd.own.mk
PROG= zdump
-SRCS= zdump.c ialloc.c
+SRCS= zdump.c
MAN= zdump.8
TZVERSION!= ${TOOL_SED} -ne 's/VERSION=[ ]*//p' ${NETBSDSRCDIR}/lib/libc/time/Makefile
CVS commit: src/sbin/newfs
Module Name:src
Committed By: christos
Date: Wed Apr 29 01:49:25 UTC 2015
Modified Files:
src/sbin/newfs: mkfs.c
Log Message:
- use calloc to zero memory
- pass the proper buffer to mkdir
- fix for apple ufs
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sbin/newfs/mkfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs/mkfs.c
diff -u src/sbin/newfs/mkfs.c:1.123 src/sbin/newfs/mkfs.c:1.124
--- src/sbin/newfs/mkfs.c:1.123 Tue Apr 28 11:15:53 2015
+++ src/sbin/newfs/mkfs.c Tue Apr 28 21:49:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.123 2015/04/28 15:15:53 christos Exp $ */
+/* $NetBSD: mkfs.c,v 1.124 2015/04/29 01:49:25 christos Exp $ */
/*
* Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
#if 0
static char sccsid[] = @(#)mkfs.c 8.11 (Berkeley) 5/3/95;
#else
-__RCSID($NetBSD: mkfs.c,v 1.123 2015/04/28 15:15:53 christos Exp $);
+__RCSID($NetBSD: mkfs.c,v 1.124 2015/04/29 01:49:25 christos Exp $);
#endif
#endif /* not lint */
@@ -110,7 +110,8 @@ union dinode {
static void initcg(int, const struct timeval *);
static int fsinit(const struct timeval *, mode_t, uid_t, gid_t);
-static int makedir(struct direct *, int);
+union Buffer;
+static int makedir(union Buffer *, struct direct *, int);
static daddr_t alloc(int, int);
static void iput(union dinode *, ino_t);
static void rdfs(daddr_t, int, void *);
@@ -199,9 +200,9 @@ mkfs(const char *fsys, int fi, int fo,
exit(12);
}
#endif
- if ((fsun = mkfs_malloc(sizeof(*fsun))) == NULL)
+ if ((fsun = calloc(1, sizeof(*fsun))) == NULL)
exit(12);
- if ((cgun = mkfs_malloc(sizeof(*cgun))) == NULL)
+ if ((cgun = calloc(1, sizeof(*cgun))) == NULL)
exit(12);
fsi = fi;
@@ -1054,12 +1055,12 @@ fsinit(const struct timeval *tv, mode_t
*/
memset(node, 0, sizeof(node));
if (Oflag == 0) {
- (void)makedir((struct direct *)olost_found_dir, 2);
+ (void)makedir(buf, (struct direct *)olost_found_dir, 2);
for (i = dirblksiz; i sblock.fs_bsize; i += dirblksiz)
copy_dir((struct direct*)olost_found_dir[2],
(struct direct*)buf[i]);
} else {
- (void)makedir(lost_found_dir, 2);
+ (void)makedir(buf, lost_found_dir, 2);
for (i = dirblksiz; i sblock.fs_bsize; i += dirblksiz)
copy_dir(lost_found_dir[2], (struct direct*)buf[i]);
}
@@ -1125,10 +1126,10 @@ fsinit(const struct timeval *tv, mode_t
}
node.dp1.di_nlink = PREDEFDIR;
if (Oflag == 0)
- node.dp1.di_size = makedir((struct direct *)oroot_dir,
- PREDEFDIR);
+ node.dp1.di_size = makedir(buf,
+ (struct direct *)oroot_dir, PREDEFDIR);
else
- node.dp1.di_size = makedir(root_dir, PREDEFDIR);
+ node.dp1.di_size = makedir(buf, root_dir, PREDEFDIR);
node.dp1.di_db[0] = alloc(sblock.fs_fsize, node.dp1.di_mode);
if (node.dp1.di_db[0] == 0)
return (0);
@@ -1155,7 +1156,7 @@ fsinit(const struct timeval *tv, mode_t
node.dp2.di_birthtime = tv-tv_sec;
node.dp2.di_birthnsec = tv-tv_usec * 1000;
node.dp2.di_nlink = PREDEFDIR;
- node.dp2.di_size = makedir(root_dir, PREDEFDIR);
+ node.dp2.di_size = makedir(buf, root_dir, PREDEFDIR);
node.dp2.di_db[0] = alloc(sblock.fs_fsize, node.dp2.di_mode);
if (node.dp2.di_db[0] == 0)
return (0);
@@ -1260,18 +1261,17 @@ fsinit(const struct timeval *tv, mode_t
* return size of directory.
*/
int
-makedir(struct direct *protodir, int entries)
+makedir(union Buffer *buf, struct direct *protodir, int entries)
{
char *cp;
- union Buffer buf;
int i, spcleft;
int dirblksiz = UFS_DIRBLKSIZ;
if (isappleufs)
dirblksiz = APPLEUFS_DIRBLKSIZ;
- memset(buf, 0, UFS_DIRBLKSIZ);
+ memset(buf, 0, dirblksiz);
spcleft = dirblksiz;
- for (cp = buf.data, i = 0; i entries - 1; i++) {
+ for (cp = buf-data, i = 0; i entries - 1; i++) {
protodir[i].d_reclen = UFS_DIRSIZ(Oflag == 0, protodir[i], 0);
copy_dir(protodir[i], (struct direct*)cp);
cp += protodir[i].d_reclen;
CVS commit: src/sbin/newfs
Module Name:src Committed By: christos Date: Wed Apr 29 01:49:25 UTC 2015 Modified Files: src/sbin/newfs: mkfs.c Log Message: - use calloc to zero memory - pass the proper buffer to mkdir - fix for apple ufs To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 src/sbin/newfs/mkfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src
Committed By: jmcneill
Date: Tue Apr 28 11:15:55 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: files.tegra tegra_io.c tegra_reg.h tegra_soc.c
tegra_var.h
src/sys/arch/evbarm/conf: JETSONTK1
Added Files:
src/sys/arch/arm/nvidia: tegra_car.c tegra_carreg.h
Log Message:
Add a basic driver for the Clock and Reset controller, use it to determine
CPU frequency.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/files.tegra \
src/sys/arch/arm/nvidia/tegra_io.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/nvidia/tegra_car.c \
src/sys/arch/arm/nvidia/tegra_carreg.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra_reg.h \
src/sys/arch/arm/nvidia/tegra_soc.c src/sys/arch/arm/nvidia/tegra_var.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/JETSONTK1
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/arm/nvidia/files.tegra
diff -u src/sys/arch/arm/nvidia/files.tegra:1.2 src/sys/arch/arm/nvidia/files.tegra:1.3
--- src/sys/arch/arm/nvidia/files.tegra:1.2 Sun Mar 29 22:27:04 2015
+++ src/sys/arch/arm/nvidia/files.tegra Tue Apr 28 11:15:55 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.tegra,v 1.2 2015/03/29 22:27:04 jmcneill Exp $
+# $NetBSD: files.tegra,v 1.3 2015/04/28 11:15:55 jmcneill Exp $
#
# Configuration info for NVIDIA Tegra ARM Peripherals
#
@@ -31,6 +31,11 @@ device tegrapmc
attach tegrapmc at tegraio with tegra_pmc
file arch/arm/nvidia/tegra_pmc.c tegra_pmc
+# Clock and Reset controller
+device tegracar
+attach tegracar at tegraio with tegra_car
+file arch/arm/nvidia/tegra_car.c tegra_car
+
# UART
attach com at tegraio with tegra_com
file arch/arm/nvidia/tegra_com.c tegra_com needs-flag
Index: src/sys/arch/arm/nvidia/tegra_io.c
diff -u src/sys/arch/arm/nvidia/tegra_io.c:1.2 src/sys/arch/arm/nvidia/tegra_io.c:1.3
--- src/sys/arch/arm/nvidia/tegra_io.c:1.2 Sun Mar 29 22:27:04 2015
+++ src/sys/arch/arm/nvidia/tegra_io.c Tue Apr 28 11:15:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_io.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $ */
+/* $NetBSD: tegra_io.c,v 1.3 2015/04/28 11:15:55 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include opt_tegra.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tegra_io.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_io.c,v 1.3 2015/04/28 11:15:55 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -61,6 +61,11 @@ static bool tegraio_found = false;
#define NOPORT TEGRAIOCF_PORT_DEFAULT
#define NOINTR TEGRAIO_INTR_DEFAULT
+static const struct tegra_locators tegra_ppsb_locators[] = {
+ { tegracar,
+TEGRA_CAR_OFFSET, TEGRA_CAR_SIZE, NOPORT, NOINTR },
+};
+
static const struct tegra_locators tegra_apb_locators[] = {
{ tegramc,
TEGRA_MC_OFFSET, TEGRA_MC_SIZE, NOPORT, NOINTR },
@@ -113,6 +118,8 @@ tegraio_attach(device_t parent, device_t
aprint_naive(\n);
aprint_normal(: %s\n, tegra_chip_name());
+ tegraio_scan(self, tegra_ppsb_bsh,
+ tegra_ppsb_locators, __arraycount(tegra_ppsb_locators));
tegraio_scan(self, tegra_apb_bsh,
tegra_apb_locators, __arraycount(tegra_apb_locators));
tegraio_scan(self, tegra_ahb_a2_bsh,
Index: src/sys/arch/arm/nvidia/tegra_reg.h
diff -u src/sys/arch/arm/nvidia/tegra_reg.h:1.3 src/sys/arch/arm/nvidia/tegra_reg.h:1.4
--- src/sys/arch/arm/nvidia/tegra_reg.h:1.3 Sun Apr 26 22:04:28 2015
+++ src/sys/arch/arm/nvidia/tegra_reg.h Tue Apr 28 11:15:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_reg.h,v 1.3 2015/04/26 22:04:28 jmcneill Exp $ */
+/* $NetBSD: tegra_reg.h,v 1.4 2015/04/28 11:15:55 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -87,6 +87,8 @@
#define TEGRA_XUSB_DEV_SIZE 0xa000
/* PPSB */
+#define TEGRA_CAR_OFFSET 0x6000
+#define TEGRA_CAR_SIZE 0x1000
#define TEGRA_EVP_OFFSET 0xf000
#define TEGRA_EVP_SIZE 0x1000
Index: src/sys/arch/arm/nvidia/tegra_soc.c
diff -u src/sys/arch/arm/nvidia/tegra_soc.c:1.3 src/sys/arch/arm/nvidia/tegra_soc.c:1.4
--- src/sys/arch/arm/nvidia/tegra_soc.c:1.3 Sun Apr 26 22:04:28 2015
+++ src/sys/arch/arm/nvidia/tegra_soc.c Tue Apr 28 11:15:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_soc.c,v 1.3 2015/04/26 22:04:28 jmcneill Exp $ */
+/* $NetBSD: tegra_soc.c,v 1.4 2015/04/28 11:15:55 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -30,7 +30,7 @@
#include opt_multiprocessor.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tegra_soc.c,v 1.3 2015/04/26 22:04:28 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_soc.c,v 1.4 2015/04/28 11:15:55 jmcneill Exp $);
#define _ARM32_BUS_DMA_PRIVATE
#include sys/param.h
@@ -81,7 +81,7 @@ tegra_bootstrap(void)
tegra_ahb_a2_bsh) != 0)
panic(couldn't map AHB A2);
- curcpu()-ci_data.cpu_cc_freq = 69600; /* XXX */
+
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: martin
Date: Tue Apr 28 11:58:50 UTC 2015
Modified Files:
src/sys/dev/sysmon: sysmon_taskq.c
Log Message:
sysmon_task_queue_sched needs to RUN_ONCE(tq_preinit) as well, it can
be called from sysmon_envsys_register() early.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/sysmon/sysmon_taskq.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/sysmon/sysmon_taskq.c
diff -u src/sys/dev/sysmon/sysmon_taskq.c:1.18 src/sys/dev/sysmon/sysmon_taskq.c:1.19
--- src/sys/dev/sysmon/sysmon_taskq.c:1.18 Mon Apr 27 07:51:28 2015
+++ src/sys/dev/sysmon/sysmon_taskq.c Tue Apr 28 11:58:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_taskq.c,v 1.18 2015/04/27 07:51:28 pgoyette Exp $ */
+/* $NetBSD: sysmon_taskq.c,v 1.19 2015/04/28 11:58:49 martin Exp $ */
/*
* Copyright (c) 2001, 2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon_taskq.c,v 1.18 2015/04/27 07:51:28 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon_taskq.c,v 1.19 2015/04/28 11:58:49 martin Exp $);
#include sys/param.h
#include sys/malloc.h
@@ -212,6 +212,8 @@ sysmon_task_queue_sched(u_int pri, void
{
struct sysmon_task *st, *lst;
+ (void)RUN_ONCE(once_tq, tq_preinit);
+
if (sysmon_task_queue_lwp == NULL)
aprint_debug(WARNING: Callback scheduled before sysmon
task queue thread present\n);
CVS commit: src/sys/dev/sysmon
Module Name:src Committed By: martin Date: Tue Apr 28 11:58:50 UTC 2015 Modified Files: src/sys/dev/sysmon: sysmon_taskq.c Log Message: sysmon_task_queue_sched needs to RUN_ONCE(tq_preinit) as well, it can be called from sysmon_envsys_register() early. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/dev/sysmon/sysmon_taskq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: jmcneill Date: Tue Apr 28 11:15:55 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: files.tegra tegra_io.c tegra_reg.h tegra_soc.c tegra_var.h src/sys/arch/evbarm/conf: JETSONTK1 Added Files: src/sys/arch/arm/nvidia: tegra_car.c tegra_carreg.h Log Message: Add a basic driver for the Clock and Reset controller, use it to determine CPU frequency. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/files.tegra \ src/sys/arch/arm/nvidia/tegra_io.c cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/nvidia/tegra_car.c \ src/sys/arch/arm/nvidia/tegra_carreg.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra_reg.h \ src/sys/arch/arm/nvidia/tegra_soc.c src/sys/arch/arm/nvidia/tegra_var.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/JETSONTK1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/newfs
Module Name:src
Committed By: christos
Date: Tue Apr 28 15:15:54 UTC 2015
Modified Files:
src/sbin/newfs: mkfs.c
Log Message:
reduce bss usage
To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/sbin/newfs/mkfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs/mkfs.c
diff -u src/sbin/newfs/mkfs.c:1.122 src/sbin/newfs/mkfs.c:1.123
--- src/sbin/newfs/mkfs.c:1.122 Sat Apr 26 10:15:08 2014
+++ src/sbin/newfs/mkfs.c Tue Apr 28 11:15:53 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.122 2014/04/26 14:15:08 martin Exp $ */
+/* $NetBSD: mkfs.c,v 1.123 2015/04/28 15:15:53 christos Exp $ */
/*
* Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
#if 0
static char sccsid[] = @(#)mkfs.c 8.11 (Berkeley) 5/3/95;
#else
-__RCSID($NetBSD: mkfs.c,v 1.122 2014/04/26 14:15:08 martin Exp $);
+__RCSID($NetBSD: mkfs.c,v 1.123 2015/04/28 15:15:53 christos Exp $);
#endif
#endif /* not lint */
@@ -132,13 +132,13 @@ static void *mkfs_malloc(size_t size);
union {
struct fs fs;
char data[SBLOCKSIZE];
-} fsun;
-#define sblock fsun.fs
+} *fsun;
+#define sblock fsun-fs
-union {
+union Buffer {
struct quota2_header q2h;
char data[MAXBSIZE];
-} buf;
+};
struct csum *fscs_0; /* first block of cylinder summaries */
struct csum *fscs_next; /* place for next summary */
@@ -149,8 +149,8 @@ uint fs_csaddr; /* fragment number to w
union {
struct cg cg;
char pad[MAXBSIZE];
-} cgun;
-#define acg cgun.cg
+} *cgun;
+#define acg cgun-cg
#define DIP(dp, field) \
((sblock.fs_magic == FS_UFS1_MAGIC) ? \
@@ -199,6 +199,11 @@ mkfs(const char *fsys, int fi, int fo,
exit(12);
}
#endif
+ if ((fsun = mkfs_malloc(sizeof(*fsun))) == NULL)
+ exit(12);
+ if ((cgun = mkfs_malloc(sizeof(*cgun))) == NULL)
+ exit(12);
+
fsi = fi;
fso = fo;
if (Oflag == 0) {
@@ -1024,6 +1029,7 @@ int
fsinit(const struct timeval *tv, mode_t mfsmode, uid_t mfsuid, gid_t mfsgid)
{
union dinode node;
+ union Buffer buf;
int i;
int qblocks = 0;
int qinos = 0;
@@ -1257,6 +1263,7 @@ int
makedir(struct direct *protodir, int entries)
{
char *cp;
+ union Buffer buf;
int i, spcleft;
int dirblksiz = UFS_DIRBLKSIZ;
if (isappleufs)
CVS commit: src/sbin/newfs
Module Name:src Committed By: christos Date: Tue Apr 28 15:15:54 UTC 2015 Modified Files: src/sbin/newfs: mkfs.c Log Message: reduce bss usage To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sbin/newfs/mkfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/atari/floppies/install
Module Name:src Committed By: christos Date: Tue Apr 28 15:13:45 UTC 2015 Modified Files: src/distrib/atari/floppies/install: Makefile Log Message: remove unused flags To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/atari/floppies/install/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nonaka Date: Tue Apr 28 15:38:02 UTC 2015 Modified Files: src/sys/dev/pci: if_iwm.c if_iwmvar.h Log Message: Use MSI instead of legacy INTx, if available. should fix PR/49663. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/if_iwm.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_iwmvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/ingenic
Module Name:src
Committed By: macallan
Date: Tue Apr 28 15:05:45 UTC 2015
Modified Files:
src/sys/arch/mips/ingenic: ingenic_regs.h
Log Message:
add sdmmc ('MSC') registers
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mips/ingenic/ingenic_regs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/ingenic/ingenic_regs.h
diff -u src/sys/arch/mips/ingenic/ingenic_regs.h:1.15 src/sys/arch/mips/ingenic/ingenic_regs.h:1.16
--- src/sys/arch/mips/ingenic/ingenic_regs.h:1.15 Thu Apr 23 01:20:20 2015
+++ src/sys/arch/mips/ingenic/ingenic_regs.h Tue Apr 28 15:05:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ingenic_regs.h,v 1.15 2015/04/23 01:20:20 macallan Exp $ */
+/* $NetBSD: ingenic_regs.h,v 1.16 2015/04/28 15:05:45 macallan Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -557,4 +557,166 @@ gpio_as_intr_level(uint32_t g, int pin)
#define JZ_MSC1_BASE 0x1346
#define JZ_MSC2_BASE 0x1347
+#define JZ_MSC_CTRL 0x00
+ #define JZ_SEND_CCSD 0x8000
+ #define JZ_SEND_AS_CCSD 0x4000
+ #define JZ_EXIT_MULTIPLE 0x0080
+ #define JZ_EXIT_TRANSFER 0x0040
+ #define JZ_START_READWAIT 0x0020
+ #define JZ_STOP_READWAIT 0x0010
+ #define JZ_RESET 0x0008
+ #define JZ_START_OP 0x0004
+ #define JZ_CLOCK_CTRL_M 0x0003
+ #define JZ_CLOCK_START 0x0002
+ #define JZ_CLOCK_STOP 0x0001
+#define JZ_MSC_STAT 0x04
+ #define JZ_AUTO_CMD12_DONE 0x8000
+ #define JZ_AUTO_CMD23_DONE 0x4000
+ #define JZ_SVS 0x2000
+ #define JZ_PIN_LEVEL_M 0x1f00
+ #define JZ_BCE 0x0010 /* boot CRC error */
+ #define JZ_BDE 0x0008 /* boot data end */
+ #define JZ_BAE 0x0004 /* boot acknowledge error */
+ #define JZ_BAR 0x0002 /* boot ack. received */
+ #define JZ_DMAEND 0x0001
+ #define JZ_IS_RESETTING 0x8000
+ #define JZ_SDIO_INT_ACTIVE 0x4000
+ #define JZ_PRG_DONE 0x2000
+ #define JZ_DATA_TRAN_DONE 0x1000
+ #define JZ_END_CMD_RES 0x0800
+ #define JZ_DATA_FIFO_AFULL 0x0400
+ #define JZ_IS_READWAIT 0x0200
+ #define JZ_CLK_EN 0x0100
+ #define JZ_DATA_FIFO_FULL 0x0080
+ #define JZ_DATA_FIFO_EMPTY 0x0040
+ #define JZ_CRC_RES_ERR 0x0020
+ #define JZ_CRC_READ_ERR 0x0010
+ #define JZ_CRC_WRITE_ERR_M 0x000c
+ #define JZ_CRC_WRITE_OK 0x
+ #define JZ_CRC_CARD_ERR 0x0004
+ #define JZ_CRC_NO_STATUS 0x0008
+ #define JZ_TIME_OUT_RES 0x0002
+ #define JZ_TIME_OUT_READ 0x0001
+#define JZ_MSC_CLKRT 0x08
+ #define JZ_DEV_CLK 0x0
+ #define JZ_DEV_CLK_2 0x1 /* DEV_CLK / 2 */
+ #define JZ_DEV_CLK_4 0x2 /* DEV_CLK / 4 */
+ #define JZ_DEV_CLK_8 0x3 /* DEV_CLK / 8 */
+ #define JZ_DEV_CLK_16 0x4 /* DEV_CLK / 16 */
+ #define JZ_DEV_CLK_32 0x5 /* DEV_CLK / 32 */
+ #define JZ_DEV_CLK_64 0x6 /* DEV_CLK / 64 */
+ #define JZ_DEV_CLK_128 0x7 /* DEV_CLK / 128 */
+#define JZ_MSC_CMDAT 0x0c
+ #define JZ_CCS_EXPECTED 0x8000
+ #define JZ_READ_CEATA 0x4000
+ #define JZ_DIS_BOOT 0x0800
+ #define JZ_ENA_BOOT 0x0400
+ #define JZ_EXP_BOOT_ACK 0x0200
+ #define JZ_BOOT_MODE 0x0100
+ #define JZ_AUTO_CMD23 0x0004
+ #define JZ_SDIO_PRDT 0x0002
+ #define JZ_AUTO_CMD12 0x0001
+ #define JZ_RTRG_M 0xc000 /* receive FIFO trigger */
+ #define JZ_RTRG_16 0x /* = 16 */
+ #define JZ_RTRG_32 0x4000 /* = 32 */
+ #define JZ_RTRG_64 0x8000 /* = 64 */
+ #define JZ_RTRG_96 0xc000 /* = 96 */
+ #define JZ_TTRG_M 0x3000 /* transmit FIFO trigger */
+ #define JZ_TTRG_16 0x /* = 16 */
+ #define JZ_TTRG_32 0x1000 /* = 32 */
+ #define JZ_TTRG_64 0x2000 /* = 64 */
+ #define JZ_TTRG_96 0x3000 /* = 96 */
+ #define JZ_IO_ABORT 0x0800
+ #define JZ_BUS_WIDTH_M 0x0600
+ #define JZ_BUS_1BIT 0x
+ #define JZ_BUS_4BIT 0x0200
+ #define JZ_BUS_8BIT 0x0300
+ #define JZ_INIT 0x0080 /* send 80 clk init before cmd */
+ #define JZ_BUSY 0x0040
+ #define JZ_STREAM 0x0020
+ #define JZ_WRITE 0x0010 /* read otherwise */
+ #define JZ_DATA_EN 0x0008
+ #define JZ_RESPONSE_M 0x0007 /* response format */
+ #define JZ_RES_NONE 0x
+ #define JZ_RES_R1 0x0001 /* R1 and R1b */
+ #define JZ_RES_R2 0x0002
+ #define JZ_RES_R3 0x0003
+ #define JZ_RES_R4 0x0004
+ #define JZ_RES_R5 0x0005
+ #define JZ_RES_R6 0x0006
+ #define JZ_RES_R7 0x0007
+#define JZ_MSC_RESTO 0x10 /* 16bit response timeout in MSC_CLK */
+#define JZ_MSC_RDTO RW 0x14 /* 32bit read timeout in MSC_CLK */
+#define JZ_MSC_BLKLEN 0x18 /* 16bit block length */
+#define JZ_MSC_NOB RW 0x1c /* 16bit block counter */
+#define JZ_MSC_SNOB 0x20 /* 16bit successful block counter */
+#define JZ_MSC_IMASK 0x24 /* interrupt mask */
+ #define JZ_INT_AUTO_CMD23_DONE 0x4000
+ #define JZ_INT_SVS 0x2000
+ #define JZ_INT_PIN_LEVEL_M 0x1f00
+ #define JZ_INT_BCE 0x0010
+ #define JZ_INT_BDE 0x0008
+ #define JZ_INT_BAE 0x0004
+
CVS commit: src/sys/arch/mips/ingenic
Module Name:src
Committed By: macallan
Date: Tue Apr 28 15:05:45 UTC 2015
Modified Files:
src/sys/arch/mips/ingenic: ingenic_regs.h
Log Message:
add sdmmc ('MSC') registers
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mips/ingenic/ingenic_regs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: nonaka
Date: Tue Apr 28 15:38:02 UTC 2015
Modified Files:
src/sys/dev/pci: if_iwm.c if_iwmvar.h
Log Message:
Use MSI instead of legacy INTx, if available.
should fix PR/49663.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/if_iwm.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_iwmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.30 src/sys/dev/pci/if_iwm.c:1.31
--- src/sys/dev/pci/if_iwm.c:1.30 Wed Apr 15 05:40:48 2015
+++ src/sys/dev/pci/if_iwm.c Tue Apr 28 15:38:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.30 2015/04/15 05:40:48 nonaka Exp $ */
+/* $NetBSD: if_iwm.c,v 1.31 2015/04/28 15:38:02 nonaka Exp $ */
/* OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp */
/*
@@ -105,7 +105,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.30 2015/04/15 05:40:48 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.31 2015/04/28 15:38:02 nonaka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -6628,7 +6628,9 @@ iwm_attach(device_t parent, device_t sel
{
struct iwm_softc *sc = device_private(self);
struct pci_attach_args *pa = aux;
+#ifndef __HAVE_PCI_MSI_MSIX
pci_intr_handle_t ih;
+#endif
pcireg_t reg, memtype;
const char *intrstr;
int error;
@@ -6676,14 +6678,46 @@ iwm_attach(device_t parent, device_t sel
}
/* Install interrupt handler. */
+ sc-sc_intr_type = IWM_INTR_INTX;
+#ifdef __HAVE_PCI_MSI_MSIX
+ error = ENODEV;
+ if (pci_msi_count(pa) 0) {
+ error = pci_msi_alloc_exact(pa, sc-sc_pihp, 1);
+ if (error == 0)
+ sc-sc_intr_type = IWM_INTR_MSI;
+ }
+ if (error != 0) {
+ if (pci_intx_alloc(pa, sc-sc_pihp)) {
+ aprint_error_dev(self, can't map interrupt\n);
+ return;
+ }
+ }
+#else /* !__HAVE_PCI_MSI_MSIX */
if (pci_intr_map(pa, ih)) {
aprint_error_dev(self, can't map interrupt\n);
return;
}
+#endif /* __HAVE_PCI_MSI_MSIX */
char intrbuf[PCI_INTRSTR_LEN];
+#ifdef __HAVE_PCI_MSI_MSIX
+ intrstr = pci_intr_string(sc-sc_pct, sc-sc_pihp[0], intrbuf,
+ sizeof(intrbuf));
+ switch (sc-sc_intr_type) {
+ case IWM_INTR_MSI:
+ sc-sc_ih = pci_msi_establish(sc-sc_pct, sc-sc_pihp[0],
+ IPL_NET, iwm_intr, sc);
+ break;
+
+ case IWM_INTR_INTX:
+ sc-sc_ih = pci_intr_establish(sc-sc_pct, sc-sc_pihp[0],
+ IPL_NET, iwm_intr, sc);
+ break;
+ }
+#else /* !__HAVE_PCI_MSI_MSIX */
intrstr = pci_intr_string(sc-sc_pct, ih, intrbuf, sizeof(intrbuf));
sc-sc_ih = pci_intr_establish(sc-sc_pct, ih, IPL_NET, iwm_intr, sc);
+#endif /* __HAVE_PCI_MSI_MSIX */
if (sc-sc_ih == NULL) {
aprint_error_dev(self, can't establish interrupt);
if (intrstr != NULL)
Index: src/sys/dev/pci/if_iwmvar.h
diff -u src/sys/dev/pci/if_iwmvar.h:1.5 src/sys/dev/pci/if_iwmvar.h:1.6
--- src/sys/dev/pci/if_iwmvar.h:1.5 Tue Mar 3 09:10:45 2015
+++ src/sys/dev/pci/if_iwmvar.h Tue Apr 28 15:38:02 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwmvar.h,v 1.5 2015/03/03 09:10:45 nonaka Exp $ */
+/* $NetBSD: if_iwmvar.h,v 1.6 2015/04/28 15:38:02 nonaka Exp $ */
/* OpenBSD: if_iwmvar.h,v 1.7 2015/03/02 13:51:10 jsg Exp */
/*
@@ -363,6 +363,11 @@ struct iwm_bf_data {
int last_cqm_event;
};
+enum iwm_intr_type {
+ IWM_INTR_INTX,
+ IWM_INTR_MSI
+};
+
struct iwm_softc {
device_t sc_dev;
struct ethercom sc_ec;
@@ -376,6 +381,10 @@ struct iwm_softc {
bus_space_tag_t sc_st;
bus_space_handle_t sc_sh;
+ enum iwm_intr_type sc_intr_type;
+#ifdef __HAVE_PCI_MSI_MSIX
+ pci_intr_handle_t *sc_pihp;
+#endif
bus_size_t sc_sz;
bus_dma_tag_t sc_dmat;
CVS commit: src/tests/lib/libc/time
Module Name:src
Committed By: ginsbach
Date: Tue Apr 28 16:06:09 UTC 2015
Modified Files:
src/tests/lib/libc/time: t_strptime.c
Log Message:
Add hour tests as a standalone test case.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/time/t_strptime.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/time/t_strptime.c
diff -u src/tests/lib/libc/time/t_strptime.c:1.4 src/tests/lib/libc/time/t_strptime.c:1.5
--- src/tests/lib/libc/time/t_strptime.c:1.4 Wed Apr 22 13:15:30 2015
+++ src/tests/lib/libc/time/t_strptime.c Tue Apr 28 16:06:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strptime.c,v 1.4 2015/04/22 13:15:30 ginsbach Exp $ */
+/* $NetBSD: t_strptime.c,v 1.5 2015/04/28 16:06:09 ginsbach Exp $ */
/*-
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.);
-__RCSID($NetBSD: t_strptime.c,v 1.4 2015/04/22 13:15:30 ginsbach Exp $);
+__RCSID($NetBSD: t_strptime.c,v 1.5 2015/04/28 16:06:09 ginsbach Exp $);
#include time.h
@@ -158,6 +158,28 @@ ATF_TC_BODY(day, tc)
h_fail(SaturDay, %OA);
}
+ATF_TC(hour);
+
+ATF_TC_HEAD(hour, tc)
+{
+
+ atf_tc_set_md_var(tc, descr,
+ Checks strptime(3) hour conversions [IH]);
+}
+
+ATF_TC_BODY(hour, tc)
+{
+
+ h_fail(00, %I);
+ h_fail(13, %I);
+
+ h_pass(00, %H, 2, -1, -1, 0, -1, -1, -1, -1, -1);
+ h_pass(12, %H, 2, -1, -1, 12, -1, -1, -1, -1, -1);
+ h_pass(23, %H, 2, -1, -1, 23, -1, -1, -1, -1, -1);
+ h_fail(24, %H);
+}
+
+
ATF_TC(month);
ATF_TC_HEAD(month, tc)
@@ -274,6 +296,7 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, common);
ATF_TP_ADD_TC(tp, day);
+ ATF_TP_ADD_TC(tp, hour);
ATF_TP_ADD_TC(tp, month);
ATF_TP_ADD_TC(tp, seconds);
ATF_TP_ADD_TC(tp, year);
CVS commit: src/tests/lib/libc/time
Module Name:src Committed By: ginsbach Date: Tue Apr 28 16:06:09 UTC 2015 Modified Files: src/tests/lib/libc/time: t_strptime.c Log Message: Add hour tests as a standalone test case. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/time/t_strptime.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/ingenic
Module Name:src
Committed By: macallan
Date: Tue Apr 28 15:08:07 UTC 2015
Modified Files:
src/sys/arch/mips/ingenic: apbus.c
Log Message:
add entries for sdmmc hosts, no driver yet
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/ingenic/apbus.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/mips/ingenic/apbus.c
diff -u src/sys/arch/mips/ingenic/apbus.c:1.12 src/sys/arch/mips/ingenic/apbus.c:1.13
--- src/sys/arch/mips/ingenic/apbus.c:1.12 Tue Apr 21 19:57:41 2015
+++ src/sys/arch/mips/ingenic/apbus.c Tue Apr 28 15:08:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: apbus.c,v 1.12 2015/04/21 19:57:41 macallan Exp $ */
+/* $NetBSD: apbus.c,v 1.13 2015/04/28 15:08:07 macallan Exp $ */
/*-
* Copyright (c) 2014 Michael Lorenz
@@ -29,7 +29,7 @@
/* catch-all for on-chip peripherals */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: apbus.c,v 1.12 2015/04/21 19:57:41 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: apbus.c,v 1.13 2015/04/28 15:08:07 macallan Exp $);
#include locators.h
#define _MIPS_BUS_DMA_PRIVATE
@@ -86,6 +86,9 @@ static const apbus_dev_t apbus_devs[] =
{ jziic, JZ_SMB2_BASE, 58, CLK_SMB2, 0},
{ jziic, JZ_SMB3_BASE, 57, 0, CLK_SMB3},
{ jziic, JZ_SMB4_BASE, 56, 0, CLK_SMB4},
+ { jzmmc, JZ_MSC0_BASE, 37, CLK_MSC0, 0},
+ { jzmmc, JZ_MSC1_BASE, 36, CLK_MSC1, 0},
+ { jzmmc, JZ_MSC2_BASE, 35, CLK_MSC2, 0},
{ jzfb, JZ_LCDC0_BASE, 31, CLK_LCD, CLK_HDMI},
{ NULL, -1, -1, 0, 0}
};
CVS commit: src/distrib/atari/floppies/install
Module Name:src Committed By: christos Date: Tue Apr 28 15:13:45 UTC 2015 Modified Files: src/distrib/atari/floppies/install: Makefile Log Message: remove unused flags To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/atari/floppies/install/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/atari/floppies/install/Makefile diff -u src/distrib/atari/floppies/install/Makefile:1.4 src/distrib/atari/floppies/install/Makefile:1.5 --- src/distrib/atari/floppies/install/Makefile:1.4 Sat Apr 25 14:41:55 2015 +++ src/distrib/atari/floppies/install/Makefile Tue Apr 28 11:13:45 2015 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2015/04/25 18:41:55 christos Exp $ +# $NetBSD: Makefile,v 1.5 2015/04/28 15:13:45 christos Exp $ IMAGE= sysinst.fs IMAGESIZE?= 1440k MAKEDEVTARGETS= floppy USE_SYSINST= yes -#MAKEFS_FLAGS= -o bsize=4096,fsize=128 .include ../common/Makefile.images
CVS commit: src/distrib/utils/x_ifconfig
Module Name:src Committed By: christos Date: Tue Apr 28 15:14:07 UTC 2015 Modified Files: src/distrib/utils/x_ifconfig: Makefile Log Message: Add small. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/distrib/utils/x_ifconfig/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/x_ifconfig
Module Name:src
Committed By: christos
Date: Tue Apr 28 15:14:07 UTC 2015
Modified Files:
src/distrib/utils/x_ifconfig: Makefile
Log Message:
Add small.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/distrib/utils/x_ifconfig/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/x_ifconfig/Makefile
diff -u src/distrib/utils/x_ifconfig/Makefile:1.32 src/distrib/utils/x_ifconfig/Makefile:1.33
--- src/distrib/utils/x_ifconfig/Makefile:1.32 Tue Dec 14 12:07:08 2010
+++ src/distrib/utils/x_ifconfig/Makefile Tue Apr 28 11:14:07 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2010/12/14 17:07:08 hannken Exp $
+# $NetBSD: Makefile,v 1.33 2015/04/28 15:14:07 christos Exp $
# Build a smaller ifconfig (i.e. for boot media)
.include bsd.own.mk
@@ -14,6 +14,10 @@ CPPFLAGS+= -DINET6
SRCS+= af_inet6.c
.endif
+.ifdef SMALLPROG
+CPPFLAGS+=-DSMALL
+.endif
+
PROG= ifconfig
.include ${.CURDIR}/../../../sbin/ifconfig/Makefile.inc
CVS commit: src/sys/arch/mips/ingenic
Module Name:src Committed By: macallan Date: Tue Apr 28 15:07:07 UTC 2015 Modified Files: src/sys/arch/mips/ingenic: ingenic_dwctwo.c Log Message: 'USB' - 'USB OTG' to distinguish this one from the other USB hosts To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/ingenic/ingenic_dwctwo.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/mips/ingenic/ingenic_dwctwo.c diff -u src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.9 src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.10 --- src/sys/arch/mips/ingenic/ingenic_dwctwo.c:1.9 Tue Mar 17 09:27:09 2015 +++ src/sys/arch/mips/ingenic/ingenic_dwctwo.c Tue Apr 28 15:07:07 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ingenic_dwctwo.c,v 1.9 2015/03/17 09:27:09 macallan Exp $ */ +/* $NetBSD: ingenic_dwctwo.c,v 1.10 2015/04/28 15:07:07 macallan Exp $ */ /*- * Copyright (c) 2014 Michael Lorenz @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ingenic_dwctwo.c,v 1.9 2015/03/17 09:27:09 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: ingenic_dwctwo.c,v 1.10 2015/04/28 15:07:07 macallan Exp $); /* * adapted from bcm2835_dwctwo.c @@ -134,9 +134,10 @@ ingenic_dwc2_attach(device_t parent, dev return; } - aprint_naive(: USB controller\n); - aprint_normal(: USB controller\n); + aprint_naive(: USB OTG controller\n); + aprint_normal(: USB OTG controller\n); + /* reset PHY, flash LED */ gpio_set(5, 15, 0); delay(25); gpio_set(5, 15, 1);
CVS commit: src/sys/arch/mips/ingenic
Module Name:src Committed By: macallan Date: Tue Apr 28 15:07:07 UTC 2015 Modified Files: src/sys/arch/mips/ingenic: ingenic_dwctwo.c Log Message: 'USB' - 'USB OTG' to distinguish this one from the other USB hosts To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/ingenic/ingenic_dwctwo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: nonaka
Date: Wed Apr 29 03:35:09 UTC 2015
Modified Files:
src/sys/dev/pci: if_iwm.c
Log Message:
Added control debugging output via sysctl.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/if_iwm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.31 src/sys/dev/pci/if_iwm.c:1.32
--- src/sys/dev/pci/if_iwm.c:1.31 Tue Apr 28 15:38:02 2015
+++ src/sys/dev/pci/if_iwm.c Wed Apr 29 03:35:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.31 2015/04/28 15:38:02 nonaka Exp $ */
+/* $NetBSD: if_iwm.c,v 1.32 2015/04/29 03:35:09 nonaka Exp $ */
/* OpenBSD: if_iwm.c,v 1.39 2015/03/23 00:35:19 jsg Exp */
/*
@@ -105,7 +105,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.31 2015/04/28 15:38:02 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.32 2015/04/29 03:35:09 nonaka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -116,6 +116,7 @@ __KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1
#include sys/proc.h
#include sys/socket.h
#include sys/sockio.h
+#include sys/sysctl.h
#include sys/systm.h
#include sys/cpu.h
@@ -154,7 +155,7 @@ __KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1
#ifdef IWM_DEBUG
#define DPRINTF(x) do { if (iwm_debug 0) printf x; } while (0)
#define DPRINTFN(n, x) do { if (iwm_debug = (n)) printf x; } while (0)
-int iwm_debug = 1;
+int iwm_debug = 0;
#else
#define DPRINTF(x) do { ; } while (0)
#define DPRINTFN(n, x) do { ; } while (0)
@@ -6910,3 +6911,29 @@ iwm_activate(device_t self, enum devact
CFATTACH_DECL_NEW(iwm, sizeof(struct iwm_softc), iwm_match, iwm_attach,
NULL, NULL);
+
+#ifdef IWM_DEBUG
+SYSCTL_SETUP(sysctl_iwm, sysctl iwm(4) subtree setup)
+{
+ const struct sysctlnode *rnode, *cnode;
+ int rc;
+
+ if ((rc = sysctl_createv(clog, 0, NULL, rnode,
+ CTLFLAG_PERMANENT, CTLTYPE_NODE, iwm,
+ SYSCTL_DESCR(iwm global controls),
+ NULL, 0, NULL, 0, CTL_HW, CTL_CREATE, CTL_EOL)) != 0)
+ goto err;
+
+ /* control debugging printfs */
+ if ((rc = sysctl_createv(clog, 0, rnode, cnode,
+ CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT,
+ debug, SYSCTL_DESCR(Enable debugging output),
+ NULL, 0, iwm_debug, 0, CTL_CREATE, CTL_EOL)) != 0)
+ goto err;
+
+ return;
+
+ err:
+ aprint_error(%s: sysctl_createv failed (rc = %d)\n, __func__, rc);
+}
+#endif /* IWM_DEBUG */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nonaka Date: Wed Apr 29 03:35:09 UTC 2015 Modified Files: src/sys/dev/pci: if_iwm.c Log Message: Added control debugging output via sysctl. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/dev/pci/if_iwm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Wed Apr 29 04:45:03 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/via: via_drv.c via_drv.h via_irq.c
src/sys/external/bsd/drm2/pci: files.drmkms_pci
src/sys/external/bsd/drm2/via: files.via
Log Message:
Make viadrm (UMS) almost build.
Missing part: something needs to issue config_found_ia(drmums_pci),
and config(5) needs to be told that it will do that. The sensible
approach is for vga_pci to do so. But config(5) doesn't seem to
understand that *only* vga_pci will do that, not all vga.
The old scheme was to tell config(5) that vga would always attach
drm, and actually attach it in vga_pci, and hope that nobody would
ever consider trying to attach non-PCI devices but quietly leave the
token `pci' out of the name of the drm interface attribute so it
didn't look wrong to have it outside dev/pci/files.pci.
Maybe that's still the right thing, as far as anything UMS can be
right.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/external/bsd/drm2/dist/drm/via/via_drv.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/via/via_drv.h
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/via/via_irq.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/pci/files.drmkms_pci
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/via/files.via
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/via/via_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/via/via_drv.c:1.1.1.2 src/sys/external/bsd/drm2/dist/drm/via/via_drv.c:1.2
--- src/sys/external/bsd/drm2/dist/drm/via/via_drv.c:1.1.1.2 Wed Jul 16 19:35:29 2014
+++ src/sys/external/bsd/drm2/dist/drm/via/via_drv.c Wed Apr 29 04:45:03 2015
@@ -53,6 +53,7 @@ static void via_driver_postclose(struct
kfree(file_priv);
}
+#ifndef __NetBSD__
static struct pci_device_id pciidlist[] = {
viadrv_PCI_IDS
};
@@ -69,6 +70,7 @@ static const struct file_operations via_
#endif
.llseek = noop_llseek,
};
+#endif
static struct drm_driver driver = {
.driver_features =
@@ -90,7 +92,9 @@ static struct drm_driver driver = {
.dma_quiescent = via_driver_dma_quiescent,
.lastclose = via_lastclose,
.ioctls = via_ioctls,
+#ifndef __NetBSD__
.fops = via_driver_fops,
+#endif
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
.date = DRIVER_DATE,
@@ -99,9 +103,14 @@ static struct drm_driver driver = {
.patchlevel = DRIVER_PATCHLEVEL,
};
+#ifdef __NetBSD__
+struct drm_driver *const via_drm_driver = driver;
+#endif
+
+#ifndef __NetBSD__
static struct pci_driver via_pci_driver = {
.name = DRIVER_NAME,
- .id_table = pciidlist,
+ .id_table = viadrm_pciidlist,
};
static int __init via_init(void)
@@ -115,6 +124,7 @@ static void __exit via_exit(void)
{
drm_pci_exit(driver, via_pci_driver);
}
+#endif /* __NetBSD__ */
module_init(via_init);
module_exit(via_exit);
Index: src/sys/external/bsd/drm2/dist/drm/via/via_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/via/via_drv.h:1.3 src/sys/external/bsd/drm2/dist/drm/via/via_drv.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/via/via_drv.h:1.3 Sat Feb 28 18:25:39 2015
+++ src/sys/external/bsd/drm2/dist/drm/via/via_drv.h Wed Apr 29 04:45:03 2015
@@ -152,7 +152,7 @@ extern u32 via_get_vblank_counter(struct
extern int via_enable_vblank(struct drm_device *dev, int crtc);
extern void via_disable_vblank(struct drm_device *dev, int crtc);
-extern irqreturn_t via_driver_irq_handler(int irq, void *arg);
+extern irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS);
extern void via_driver_irq_preinstall(struct drm_device *dev);
extern int via_driver_irq_postinstall(struct drm_device *dev);
extern void via_driver_irq_uninstall(struct drm_device *dev);
Index: src/sys/external/bsd/drm2/dist/drm/via/via_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/via/via_irq.c:1.4 src/sys/external/bsd/drm2/dist/drm/via/via_irq.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/via/via_irq.c:1.4 Sat Feb 28 18:25:39 2015
+++ src/sys/external/bsd/drm2/dist/drm/via/via_irq.c Wed Apr 29 04:45:03 2015
@@ -104,7 +104,7 @@ u32 via_get_vblank_counter(struct drm_de
return atomic_read(dev_priv-vbl_received);
}
-irqreturn_t via_driver_irq_handler(int irq, void *arg)
+irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
{
struct drm_device *dev = (struct drm_device *) arg;
drm_via_private_t *dev_priv = (drm_via_private_t *) dev-dev_private;
Index: src/sys/external/bsd/drm2/pci/files.drmkms_pci
diff -u src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.5 src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.6
--- src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.5 Thu Mar 5 17:50:41 2015
+++ src/sys/external/bsd/drm2/pci/files.drmkms_pci Wed Apr 29 04:45:03 2015
@@ -1,7 +1,14 @@
-# $NetBSD: files.drmkms_pci,v 1.5 2015/03/05 17:50:41 riastradh Exp $
+# $NetBSD: files.drmkms_pci,v 1.6 2015/04/29 04:45:03 riastradh
CVS commit: src/sys/external/bsd/drm2
Module Name:src Committed By: riastradh Date: Wed Apr 29 04:45:03 UTC 2015 Modified Files: src/sys/external/bsd/drm2/dist/drm/via: via_drv.c via_drv.h via_irq.c src/sys/external/bsd/drm2/pci: files.drmkms_pci src/sys/external/bsd/drm2/via: files.via Log Message: Make viadrm (UMS) almost build. Missing part: something needs to issue config_found_ia(drmums_pci), and config(5) needs to be told that it will do that. The sensible approach is for vga_pci to do so. But config(5) doesn't seem to understand that *only* vga_pci will do that, not all vga. The old scheme was to tell config(5) that vga would always attach drm, and actually attach it in vga_pci, and hope that nobody would ever consider trying to attach non-PCI devices but quietly leave the token `pci' out of the name of the drm interface attribute so it didn't look wrong to have it outside dev/pci/files.pci. Maybe that's still the right thing, as far as anything UMS can be right. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/external/bsd/drm2/dist/drm/via/via_drv.c cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/dist/drm/via/via_drv.h cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/via/via_irq.c cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/pci/files.drmkms_pci cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/via/files.via Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed Apr 29 04:58:19 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 654 To generate a diff of this commit: cvs rdiff -u -r1.1.2.270 -r1.1.2.271 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.270 src/doc/CHANGES-7.0:1.1.2.271 --- src/doc/CHANGES-7.0:1.1.2.270 Tue Apr 28 20:45:05 2015 +++ src/doc/CHANGES-7.0 Wed Apr 29 04:58:19 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.270 2015/04/28 20:45:05 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.271 2015/04/29 04:58:19 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -20345,3 +20345,1462 @@ distrib/sets/lists/debug/mi 1.112 Mark httpd.debug as obsolete. [mrg, ticket #724] +crypto/external/bsd/openssl/dist/CHANGES up to 1.1.1.11.2.2 +crypto/external/bsd/openssl/dist/Configure up to 1.8.2.2 +crypto/external/bsd/openssl/dist/Makefile up to 1.2.2.2 +crypto/external/bsd/openssl/dist/NEWS up to 1.1.1.9.2.2 +crypto/external/bsd/openssl/dist/README up to 1.1.1.10.2.2 +crypto/external/bsd/openssl/dist/e_os.h up to 1.1.1.5.2.2 +crypto/external/bsd/openssl/dist/e_os2.h up to 1.1.1.4 +crypto/external/bsd/openssl/dist/makevms.com up to 1.1.1.3.12.2 +crypto/external/bsd/openssl/dist/openssl.spec up to 1.1.1.10.2.2 +crypto/external/bsd/openssl/dist/MacOS/Randomizer.h up to 1.1.1.1 +crypto/external/bsd/openssl/dist/MacOS/_MWERKS_GUSI_prefix.h up to 1.1.1.1 +crypto/external/bsd/openssl/dist/MacOS/_MWERKS_prefix.h up to 1.1.1.1 +crypto/external/bsd/openssl/dist/MacOS/buildinf.h up to 1.1.1.1 +crypto/external/bsd/openssl/dist/MacOS/opensslconf.h up to 1.1.1.1 +crypto/external/bsd/openssl/dist/MacOS/GetHTTPS.src/MacSocket.h up to 1.1.1.1 +crypto/external/bsd/openssl/dist/apps/app_rand.c up to 1.1.1.1 +crypto/external/bsd/openssl/dist/apps/apps.c up to 1.1.1.8 +crypto/external/bsd/openssl/dist/apps/apps.h up to 1.1.1.6 +crypto/external/bsd/openssl/dist/apps/asn1pars.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/apps/ca.c up to 1.7.2.1 +crypto/external/bsd/openssl/dist/apps/ciphers.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/apps/cms.c up to 1.1.1.6 +crypto/external/bsd/openssl/dist/apps/crl.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/crl2p7.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/apps/dgst.c up to 1.1.1.7.2.1 +crypto/external/bsd/openssl/dist/apps/dh.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/dhparam.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/apps/dsa.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/apps/dsaparam.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/apps/ec.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/ecparam.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/apps/enc.c up to 1.1.1.6 +crypto/external/bsd/openssl/dist/apps/engine.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/errstr.c up to 1.1.1.1 +crypto/external/bsd/openssl/dist/apps/gendh.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/gendsa.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/genpkey.c up to 1.1.1.1 +crypto/external/bsd/openssl/dist/apps/genrsa.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/apps/nseq.c up to 1.1.1.1 +crypto/external/bsd/openssl/dist/apps/ocsp.c up to 1.6.2.1 +crypto/external/bsd/openssl/dist/apps/openssl.c up to 1.1.1.4.4.1 +crypto/external/bsd/openssl/dist/apps/passwd.c up to 1.1.1.1 +crypto/external/bsd/openssl/dist/apps/pkcs12.c up to 1.1.1.4 +crypto/external/bsd/openssl/dist/apps/pkcs7.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/pkcs8.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/apps/pkey.c up to 1.1.1.1 +crypto/external/bsd/openssl/dist/apps/pkeyparam.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/pkeyutl.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/prime.c up to 1.1.1.1 +crypto/external/bsd/openssl/dist/apps/progs.h up to 1.1.1.4 +crypto/external/bsd/openssl/dist/apps/rand.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/req.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/apps/rsa.c up to 1.1.1.3 +crypto/external/bsd/openssl/dist/apps/rsautl.c up to 1.1.1.1 +crypto/external/bsd/openssl/dist/apps/s_apps.h up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/s_cb.c up to 1.1.1.7 +crypto/external/bsd/openssl/dist/apps/s_client.c up to 1.6.2.2 +crypto/external/bsd/openssl/dist/apps/s_server.c up to 1.6.2.1 +crypto/external/bsd/openssl/dist/apps/s_socket.c up to 1.1.1.4 +crypto/external/bsd/openssl/dist/apps/s_time.c up to 1.2.26.1 +crypto/external/bsd/openssl/dist/apps/sess_id.c up to 1.1.1.2 +crypto/external/bsd/openssl/dist/apps/smime.c up to 1.1.1.4 +crypto/external/bsd/openssl/dist/apps/speed.c up to 1.6.10.1 +crypto/external/bsd/openssl/dist/apps/spkac.c up to 1.1.1.1 +crypto/external/bsd/openssl/dist/apps/srp.c up to
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed Apr 29 04:58:19 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 654 To generate a diff of this commit: cvs rdiff -u -r1.1.2.270 -r1.1.2.271 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sysmon
Module Name:src
Committed By: pgoyette
Date: Wed Apr 29 03:27:27 UTC 2015
Modified Files:
src/sys/dev/sysmon: sysmon.c
Log Message:
At suggestion from riastradh@ ...
Remove auto_configure(9) goop from sysmon device. It does make things
a bit cleaner, and also reduces source code by about 10%.
Tested via QEMU with no obvious side-effects.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/sysmon/sysmon.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/sysmon/sysmon.c
diff -u src/sys/dev/sysmon/sysmon.c:1.24 src/sys/dev/sysmon/sysmon.c:1.25
--- src/sys/dev/sysmon/sysmon.c:1.24 Sat Apr 25 23:40:09 2015
+++ src/sys/dev/sysmon/sysmon.c Wed Apr 29 03:27:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon.c,v 1.24 2015/04/25 23:40:09 pgoyette Exp $ */
+/* $NetBSD: sysmon.c,v 1.25 2015/04/29 03:27:27 pgoyette Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sysmon.c,v 1.24 2015/04/25 23:40:09 pgoyette Exp $);
+__KERNEL_RCSID(0, $NetBSD: sysmon.c,v 1.25 2015/04/29 03:27:27 pgoyette Exp $);
#include sys/param.h
#include sys/conf.h
@@ -52,6 +52,7 @@ __KERNEL_RCSID(0, $NetBSD: sysmon.c,v 1
#include sys/module.h
#include sys/mutex.h
#include sys/device.h
+#include sys/once.h
#include dev/sysmon/sysmonvar.h
@@ -77,13 +78,8 @@ const struct cdevsw sysmon_cdevsw = {
.d_flag = D_OTHER | D_MPSAFE
};
-static int sysmon_match(device_t, cfdata_t, void *);
-static void sysmon_attach(device_t, device_t, void *);
-static int sysmon_detach(device_t, int);
-
static int sysmon_modcmd(modcmd_t, void *);
-
-CFDRIVER_DECL(sysmon, DV_DULL, NULL);
+static int sm_init_once(void);
/*
* Info about our minor devices
@@ -93,44 +89,13 @@ static int sysmon_refcnt[] = { 0, 0, 0
static const char *sysmon_mod[] = { sysmon_envsys,
sysmon_wdog,
sysmon_power };
+static kmutex_t sysmon_minor_mtx;
-struct sysmon_softc {
- device_t sc_dev;
- kmutex_t sc_minor_mtx;
-};
-
-static device_t sysmon_dev = NULL;
-
-CFATTACH_DECL_NEW(sysmon, sizeof(struct sysmon_softc),
-sysmon_match, sysmon_attach, sysmon_detach, NULL);
-extern struct cfdriver sysmon_cd;
-
-static int
-sysmon_match(device_t parent, cfdata_t data, void *aux)
-{
-
- return 1;
-}
-
-static void
-sysmon_attach(device_t parent, device_t self, void *aux)
-{
-
-struct sysmon_softc *sc = device_private(self);
-
-sc-sc_dev = self;
-
- mutex_init(sc-sc_minor_mtx, MUTEX_DEFAULT, IPL_NONE);
-}
-
-static int
-sysmon_detach(device_t self, int flags)
-{
-struct sysmon_softc *sc = device_private(self);
+#ifdef _MODULE
+static bool sm_is_attached;
+#endif
- mutex_destroy(sc-sc_minor_mtx);
- return 0;
-}
+ONCE_DECL(once_sm);
/*
* sysmon_attach_minor
@@ -145,10 +110,9 @@ sysmon_detach(device_t self, int flags)
int
sysmon_attach_minor(int minor, struct sysmon_opvec *opvec)
{
- struct sysmon_softc *sc = device_private(sysmon_dev);
int ret;
- mutex_enter(sc-sc_minor_mtx);
+ mutex_enter(sysmon_minor_mtx);
if (opvec) {
if (sysmon_opvec_table[minor] == NULL) {
sysmon_refcnt[minor] = 0;
@@ -164,7 +128,7 @@ sysmon_attach_minor(int minor, struct sy
ret = EBUSY;
}
- mutex_exit(sc-sc_minor_mtx);
+ mutex_exit(sysmon_minor_mtx);
return ret;
}
@@ -176,20 +140,19 @@ sysmon_attach_minor(int minor, struct sy
int
sysmonopen(dev_t dev, int flag, int mode, struct lwp *l)
{
- struct sysmon_softc *sc = device_private(sysmon_dev);
int error;
- mutex_enter(sc-sc_minor_mtx);
+ mutex_enter(sysmon_minor_mtx);
switch (minor(dev)) {
case SYSMON_MINOR_ENVSYS:
case SYSMON_MINOR_WDOG:
case SYSMON_MINOR_POWER:
if (sysmon_opvec_table[minor(dev)] == NULL) {
- mutex_exit(sc-sc_minor_mtx);
+ mutex_exit(sysmon_minor_mtx);
error = module_autoload(sysmon_mod[minor(dev)],
MODULE_CLASS_MISC);
- mutex_enter(sc-sc_minor_mtx);
+ mutex_enter(sysmon_minor_mtx);
if (sysmon_opvec_table[minor(dev)] == NULL)
error = ENODEV;
}
@@ -202,7 +165,7 @@ sysmonopen(dev_t dev, int flag, int mode
error = ENODEV;
}
- mutex_exit(sc-sc_minor_mtx);
+ mutex_exit(sysmon_minor_mtx);
return (error);
}
@@ -342,65 +305,36 @@ sysmonkqfilter(dev_t dev, struct knote *
MODULE(MODULE_CLASS_DRIVER, sysmon, );
+static int
+sm_init_once(void)
+{
+
+ mutex_init(sysmon_minor_mtx, MUTEX_DEFAULT, IPL_NONE);
+
+ return 0;
+}
+
int
sysmon_init(void)
{
+ int error;
#ifdef _MODULE
devmajor_t bmajor, cmajor;
#endif
- static struct cfdata cf;
- int error = 0;
- if (sysmon_dev != NULL) {
- return EEXIST;
- }
-
- error = config_cfdriver_attach(sysmon_cd);
- if (error) {
- aprint_error(%s: unable to attach cfdriver\n,
- sysmon_cd.cd_name);
- return error;
- }
- error = config_cfattach_attach(sysmon_cd.cd_name, sysmon_ca);
- if (error) {
-
CVS commit: src/sys/dev/sysmon
Module Name:src Committed By: pgoyette Date: Wed Apr 29 03:27:27 UTC 2015 Modified Files: src/sys/dev/sysmon: sysmon.c Log Message: At suggestion from riastradh@ ... Remove auto_configure(9) goop from sysmon device. It does make things a bit cleaner, and also reduces source code by about 10%. Tested via QEMU with no obvious side-effects. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/sysmon/sysmon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: riastradh
Date: Wed Apr 29 04:38:56 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_bufs.c
src/sys/external/bsd/drm2/dist/include/drm: drmP.h
src/sys/external/bsd/drm2/drm: drm_memory.c
src/sys/external/bsd/drm2/pci: drm_pci.c
Log Message:
Replace drm_ioremap by drm_core_ioremap, reducing diff a little.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/include/drm/drmP.h
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_memory.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/pci/drm_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/drm_bufs.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.6 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/drm_bufs.c:1.6 Wed Jul 16 20:56:24 2014
+++ src/sys/external/bsd/drm2/dist/drm/drm_bufs.c Wed Apr 29 04:38:55 2015
@@ -213,7 +213,7 @@ static int drm_addmap_core(struct drm_de
}
if (map-type == _DRM_REGISTERS) {
#ifdef __NetBSD__
- map-handle = drm_ioremap(dev, map);
+ drm_core_ioremap(map, dev);
#else
if (map-flags _DRM_WRITE_COMBINING)
map-handle = ioremap_wc(map-offset,
@@ -351,7 +351,7 @@ static int drm_addmap_core(struct drm_de
if (!list) {
if (map-type == _DRM_REGISTERS)
#ifdef __NetBSD__
- drm_iounmap(dev, map);
+ drm_core_ioremapfree(map, dev);
#else
iounmap(map-handle);
#endif
@@ -372,7 +372,7 @@ static int drm_addmap_core(struct drm_de
if (ret) {
if (map-type == _DRM_REGISTERS)
#ifdef __NetBSD__ /* XXX What about other map types...? */
- drm_iounmap(dev, map);
+ drm_core_ioremapfree(map, dev);
#else
iounmap(map-handle);
#endif
@@ -494,7 +494,7 @@ int drm_rmmap_locked(struct drm_device *
switch (map-type) {
case _DRM_REGISTERS:
#ifdef __NetBSD__
- drm_iounmap(dev, map);
+ drm_core_ioremapfree(map, dev);
#else
iounmap(map-handle);
#endif
Index: src/sys/external/bsd/drm2/dist/include/drm/drmP.h
diff -u src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.10 src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.11
--- src/sys/external/bsd/drm2/dist/include/drm/drmP.h:1.10 Fri Mar 6 01:24:24 2015
+++ src/sys/external/bsd/drm2/dist/include/drm/drmP.h Wed Apr 29 04:38:55 2015
@@ -1437,9 +1437,7 @@ extern unsigned int drm_poll(struct file
/* Memory management support (drm_memory.h) */
#include drm/drm_memory.h
-#ifdef __NetBSD__ /* XXX move to drm_memory.h */
-extern void *drm_ioremap(struct drm_device *dev, struct drm_local_map *map);
-extern void drm_iounmap(struct drm_device *dev, struct drm_local_map *map);
+#ifdef __NetBSD__
extern int drm_limit_dma_space(struct drm_device *, resource_size_t,
resource_size_t);
#endif
Index: src/sys/external/bsd/drm2/drm/drm_memory.c
diff -u src/sys/external/bsd/drm2/drm/drm_memory.c:1.6 src/sys/external/bsd/drm2/drm/drm_memory.c:1.7
--- src/sys/external/bsd/drm2/drm/drm_memory.c:1.6 Wed Jul 16 20:56:25 2014
+++ src/sys/external/bsd/drm2/drm/drm_memory.c Wed Apr 29 04:38:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_memory.c,v 1.6 2014/07/16 20:56:25 riastradh Exp $ */
+/* $NetBSD: drm_memory.c,v 1.7 2015/04/29 04:38:55 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: drm_memory.c,v 1.6 2014/07/16 20:56:25 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: drm_memory.c,v 1.7 2015/04/29 04:38:55 riastradh Exp $);
#ifdef _KERNEL_OPT
#include agp_i810.h
@@ -74,8 +74,8 @@ drm_bus_borrow(bus_addr_t base, bus_size
return false;
}
-void *
-drm_ioremap(struct drm_device *dev, struct drm_local_map *map)
+void
+drm_core_ioremap(struct drm_local_map *map, struct drm_device *dev)
{
const bus_space_tag_t bst = dev-bst;
unsigned int unit;
@@ -125,19 +125,20 @@ drm_ioremap(struct drm_device *dev, stru
}
/* Failure! */
- return NULL;
+ return;
win: map-lm_data.bus_space.bst = bst;
- return bus_space_vaddr(bst, map-lm_data.bus_space.bsh);
+ map-handle = bus_space_vaddr(bst, map-lm_data.bus_space.bsh);
}
void
-drm_iounmap(struct drm_device *dev, struct drm_local_map *map)
+drm_core_ioremapfree(struct drm_local_map *map, struct drm_device *dev)
{
if (map-lm_data.bus_space.bus_map != NULL) {
bus_space_unmap(map-lm_data.bus_space.bst,
map-lm_data.bus_space.bsh, map-size);
map-lm_data.bus_space.bus_map = NULL;
+ map-handle = NULL;
}
}
Index: src/sys/external/bsd/drm2/pci/drm_pci.c
diff -u src/sys/external/bsd/drm2/pci/drm_pci.c:1.12 src/sys/external/bsd/drm2/pci/drm_pci.c:1.13
--- src/sys/external/bsd/drm2/pci/drm_pci.c:1.12 Fri Mar 6 13:44:18 2015
+++ src/sys/external/bsd/drm2/pci/drm_pci.c Wed Apr 29 04:38:55 2015
@@ -1,4 +1,4 @@
CVS commit: src/sys/external/bsd/drm2
Module Name:src Committed By: riastradh Date: Wed Apr 29 04:38:56 UTC 2015 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_bufs.c src/sys/external/bsd/drm2/dist/include/drm: drmP.h src/sys/external/bsd/drm2/drm: drm_memory.c src/sys/external/bsd/drm2/pci: drm_pci.c Log Message: Replace drm_ioremap by drm_core_ioremap, reducing diff a little. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/drm_bufs.c cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/drm2/dist/include/drm/drmP.h cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_memory.c cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/pci/drm_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/vfp
Module Name:src Committed By: jmcneill Date: Tue Apr 28 17:14:21 UTC 2015 Modified Files: src/sys/arch/arm/vfp: vfp_init.c Log Message: isb after writing cpacr, from Andrew Turner To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/arch/arm/vfp/vfp_init.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/arm/vfp/vfp_init.c diff -u src/sys/arch/arm/vfp/vfp_init.c:1.47 src/sys/arch/arm/vfp/vfp_init.c:1.48 --- src/sys/arch/arm/vfp/vfp_init.c:1.47 Mon Mar 23 17:42:02 2015 +++ src/sys/arch/arm/vfp/vfp_init.c Tue Apr 28 17:14:21 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vfp_init.c,v 1.47 2015/03/23 17:42:02 matt Exp $ */ +/* $NetBSD: vfp_init.c,v 1.48 2015/04/28 17:14:21 jmcneill Exp $ */ /* * Copyright (c) 2008 ARM Ltd @@ -265,6 +265,8 @@ vfp_attach(struct cpu_info *ci) cpacr |= __SHIFTIN(CPACR_ALL, cpacr_vfp2); armreg_cpacr_write(cpacr); + arm_isb(); + /* * If we could enable them, then they exist. */
CVS commit: src/sys/arch/arm/vfp
Module Name:src Committed By: jmcneill Date: Tue Apr 28 17:14:21 UTC 2015 Modified Files: src/sys/arch/arm/vfp: vfp_init.c Log Message: isb after writing cpacr, from Andrew Turner To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/arch/arm/vfp/vfp_init.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Tue Apr 28 17:00:24 UTC 2015 Modified Files: src/lib/libc/time: Makefile NEWS private.h tz-link.htm zic.c Removed Files: src/lib/libc/time: ialloc.c scheck.c Log Message: welcome to tzcode 2015d (zic performance improvements and cleanups) To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libc/time/Makefile cvs rdiff -u -r1.10 -r1.11 src/lib/libc/time/NEWS cvs rdiff -u -r1.9 -r0 src/lib/libc/time/ialloc.c cvs rdiff -u -r1.39 -r1.40 src/lib/libc/time/private.h cvs rdiff -u -r1.12 -r0 src/lib/libc/time/scheck.c cvs rdiff -u -r1.21 -r1.22 src/lib/libc/time/tz-link.htm cvs rdiff -u -r1.52 -r1.53 src/lib/libc/time/zic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/time/Makefile diff -u src/lib/libc/time/Makefile:1.27 src/lib/libc/time/Makefile:1.28 --- src/lib/libc/time/Makefile:1.27 Tue Mar 24 16:01:18 2015 +++ src/lib/libc/time/Makefile Tue Apr 28 13:00:24 2015 @@ -5,7 +5,7 @@ PACKAGE= tzcode # Version numbers of the code and data distributions. -VERSION= 2015b +VERSION= 2015d # Email address for bug reports. BUGEMAIL= t...@iana.org @@ -120,6 +120,7 @@ LDLIBS= # -DHAVE_STDINT_H=1 if you have a pre-C99 compiler with stdint.h # -DHAVE_STRFTIME_L=1 if time.h declares locale_t and strftime_l # This defaults to 0 if _POSIX_VERSION 200809, 1 otherwise. +# -DHAVE_STRDUP=0 if your system lacks the strdup function # -DHAVE_SYMLINK=0 if your system lacks the symlink function # -DHAVE_SYS_STAT_H=0 if your compiler lacks a sys/stat.h # -DHAVE_SYS_WAIT_H=0 if your compiler lacks a sys/wait.h @@ -150,18 +151,18 @@ LDLIBS= # $(GCC_DEBUG_FLAGS) if you are using GCC and want lots of checking GCC_DEBUG_FLAGS = -Dlint -g3 -O3 -fno-common -fstrict-aliasing \ -Wall -Wextra \ - -Wbad-function-cast -Wcast-align -Wcast-qual \ + -Wbad-function-cast -Wcast-align -Wdate-time \ -Wdeclaration-after-statement \ + -Wdouble-promotion \ -Wformat=2 -Winit-self -Wjump-misses-init \ - -Wmissing-declarations -Wmissing-noreturn -Wmissing-prototypes \ - -Wnested-externs -Wno-address -Wno-cast-qual \ - -Wno-format-nonliteral -Wno-sign-compare -Wno-sign-conversion \ - -Wno-type-limits \ - -Wno-unused-parameter -Woverlength-strings -Wpointer-arith \ + -Wlogical-op -Wmissing-prototypes -Wnested-externs \ + -Wold-style-definition -Woverlength-strings -Wpointer-arith \ -Wshadow -Wstrict-prototypes -Wsuggest-attribute=const \ -Wsuggest-attribute=format -Wsuggest-attribute=noreturn \ -Wsuggest-attribute=pure -Wtrampolines \ - -Wwrite-strings + -Wunused -Wwrite-strings \ + -Wno-address -Wno-format-nonliteral -Wno-sign-compare \ + -Wno-type-limits -Wno-unused-parameter # # If you want to use System V compatibility code, add # -DUSG_COMPAT @@ -331,13 +332,13 @@ AR= ar # ':' on typical hosts; 'ranlib' on the ancient hosts that still need ranlib. RANLIB= : -TZCOBJS= zic.o scheck.o ialloc.o +TZCOBJS= zic.o TZDOBJS= zdump.o localtime.o asctime.o DATEOBJS= date.o localtime.o strftime.o asctime.o LIBSRCS= localtime.c asctime.c difftime.c LIBOBJS= localtime.o asctime.o difftime.o HEADERS= tzfile.h private.h -NONLIBSRCS= zic.c zdump.c scheck.c ialloc.c +NONLIBSRCS= zic.c zdump.c NEWUCBSRCS= date.c strftime.c SOURCES= $(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \ tzselect.ksh workman.sh @@ -655,9 +656,7 @@ zonenames: $(TDATA) asctime.o: private.h tzfile.h date.o: private.h difftime.o: private.h -ialloc.o: private.h localtime.o: private.h tzfile.h -scheck.o: private.h strftime.o: private.h tzfile.h zdump.o: version.h zic.o: private.h tzfile.h version.h Index: src/lib/libc/time/NEWS diff -u src/lib/libc/time/NEWS:1.10 src/lib/libc/time/NEWS:1.11 --- src/lib/libc/time/NEWS:1.10 Tue Mar 24 16:01:18 2015 +++ src/lib/libc/time/NEWS Tue Apr 28 13:00:24 2015 @@ -1,5 +1,79 @@ News for the tz database +Release 2015d - 2015-04-24 08:09:46 -0700 + + Changes affecting future time stamps + +Egypt will not observe DST in 2015 and will consider canceling it +permanently. For now, assume no DST indefinitely. +(Thanks to Ahmed Nazmy and Tim Parenti.) + + Changes affecting past time stamps + +America/Whitehorse switched from UTC-9 to UTC-8 on 1967-05-28, not +1966-07-01. Also, Yukon's time zone history is documented better. +(Thanks to Brian Inglis and Dennis Ferguson.) + + Change affecting past and future time zone abbreviations + +The abbreviations for Hawaii-Aleutian standard and daylight times +have been changed from HAST/HADT to HST/HDT, as per US Government +Printing Office style. This affects only America/Adak since 1983, +as America/Honolulu was already using the new style. + + Changes affecting code + + zic has some minor performance improvements. + + +Release 2015c - 2015-04-11 08:55:55 -0700 + + Changes affecting future time stamps + +Egypt's
CVS commit: src/usr.sbin/zic
Module Name:src Committed By: christos Date: Tue Apr 28 17:00:42 UTC 2015 Modified Files: src/usr.sbin/zic: Makefile Log Message: remove unused To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/zic/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/zic
Module Name:src
Committed By: christos
Date: Tue Apr 28 17:00:42 UTC 2015
Modified Files:
src/usr.sbin/zic: Makefile
Log Message:
remove unused
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/zic/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/zic/Makefile
diff -u src/usr.sbin/zic/Makefile:1.15 src/usr.sbin/zic/Makefile:1.16
--- src/usr.sbin/zic/Makefile:1.15 Tue Oct 7 18:14:05 2014
+++ src/usr.sbin/zic/Makefile Tue Apr 28 13:00:42 2015
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.15 2014/10/07 22:14:05 christos Exp $
+# $NetBSD: Makefile,v 1.16 2015/04/28 17:00:42 christos Exp $
.include Makefile.inc
.include bsd.own.mk
COPTS.zic.c += -Wno-format-nonliteral
-COPTS.scheck.c += -Wno-format-nonliteral
PROG= zic
-SRCS= zic.c scheck.c ialloc.c
+SRCS= zic.c
MAN= zic.8
TZVERSION!= ${TOOL_SED} -ne 's/VERSION=[ ]*//p' ${NETBSDSRCDIR}/lib/libc/time/Makefile
CPPFLAGS+=-DPKGVERSION='(tzcode) ' -DTZVERSION='${TZVERSION}'
CVS commit: src/lib/libc/time
Module Name:src Committed By: christos Date: Tue Apr 28 17:00:24 UTC 2015 Modified Files: src/lib/libc/time: Makefile NEWS private.h tz-link.htm zic.c Removed Files: src/lib/libc/time: ialloc.c scheck.c Log Message: welcome to tzcode 2015d (zic performance improvements and cleanups) To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/lib/libc/time/Makefile cvs rdiff -u -r1.10 -r1.11 src/lib/libc/time/NEWS cvs rdiff -u -r1.9 -r0 src/lib/libc/time/ialloc.c cvs rdiff -u -r1.39 -r1.40 src/lib/libc/time/private.h cvs rdiff -u -r1.12 -r0 src/lib/libc/time/scheck.c cvs rdiff -u -r1.21 -r1.22 src/lib/libc/time/tz-link.htm cvs rdiff -u -r1.52 -r1.53 src/lib/libc/time/zic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Apr 28 17:01:40 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tzcode. To generate a diff of this commit: cvs rdiff -u -r1.1221 -r1.1222 src/doc/3RDPARTY cvs rdiff -u -r1.2071 -r1.2072 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1221 src/doc/3RDPARTY:1.1222 --- src/doc/3RDPARTY:1.1221 Thu Apr 23 09:51:53 2015 +++ src/doc/3RDPARTY Tue Apr 28 13:01:40 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1221 2015/04/23 13:51:53 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1222 2015/04/28 17:01:40 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1337,8 +1337,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2015b / tzdata2015b -Current Vers: tzcode2015b / tzdata2015b +Version: tzcode2015d / tzdata2015b +Current Vers: tzcode2015d / tzdata2015d Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2071 src/doc/CHANGES:1.2072 --- src/doc/CHANGES:1.2071 Fri Apr 24 00:42:42 2015 +++ src/doc/CHANGES Tue Apr 28 13:01:40 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2071 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.2072 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -154,3 +154,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: Add DMA support to the sdhc controllers on AM335x SoC. Enable DMA for sdhc0 and sdhc1 on BEAGLEBONE [bouyer 20150414] xz(1): Import of XZ 5.2.1. [christos 20150417] + libc: Update to tzcode2015d. [christos 20150428]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Apr 28 17:01:40 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new tzcode. To generate a diff of this commit: cvs rdiff -u -r1.1221 -r1.1222 src/doc/3RDPARTY cvs rdiff -u -r1.2071 -r1.2072 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/distrib/sets/lists/debug
Module Name:src Committed By: snj Date: Tue Apr 28 20:43:26 UTC 2015 Modified Files: src/distrib/sets/lists/debug [netbsd-7]: mi Log Message: Pull up following revision(s) (requested by mrg in ticket #724): distrib/sets/lists/debug/mi: revision 1.112 And mark the original httpd.debug as obsolete. Hello, mrg ... To generate a diff of this commit: cvs rdiff -u -r1.81.2.4 -r1.81.2.5 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/distrib/sets/lists/debug
Module Name:src Committed By: snj Date: Tue Apr 28 20:43:26 UTC 2015 Modified Files: src/distrib/sets/lists/debug [netbsd-7]: mi Log Message: Pull up following revision(s) (requested by mrg in ticket #724): distrib/sets/lists/debug/mi: revision 1.112 And mark the original httpd.debug as obsolete. Hello, mrg ... To generate a diff of this commit: cvs rdiff -u -r1.81.2.4 -r1.81.2.5 src/distrib/sets/lists/debug/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.81.2.4 src/distrib/sets/lists/debug/mi:1.81.2.5 --- src/distrib/sets/lists/debug/mi:1.81.2.4 Fri Apr 24 17:14:07 2015 +++ src/distrib/sets/lists/debug/mi Tue Apr 28 20:43:26 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.81.2.4 2015/04/24 17:14:07 snj Exp $ +# $NetBSD: mi,v 1.81.2.5 2015/04/28 20:43:26 snj Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -908,7 +908,7 @@ ./usr/libdata/debug/usr/libexec/getNAME.debug comp-man-debug !makemandb,debug ./usr/libdata/debug/usr/libexec/getty.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/libexec/hpropd.debug comp-krb5-debug kerberos,debug -./usr/libdata/debug/usr/libexec/httpd.debug comp-netutil-debug debug +./usr/libdata/debug/usr/libexec/httpd.debug comp-netutil-debug obsolete ./usr/libdata/debug/usr/libexec/identd.debug comp-netutil-debug debug ./usr/libdata/debug/usr/libexec/ipropd-master.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/libexec/ipropd-slave.debug comp-krb5-debug kerberos,debug
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Tue Apr 28 20:45:06 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 724 To generate a diff of this commit: cvs rdiff -u -r1.1.2.269 -r1.1.2.270 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Tue Apr 28 20:45:06 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 724 To generate a diff of this commit: cvs rdiff -u -r1.1.2.269 -r1.1.2.270 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.269 src/doc/CHANGES-7.0:1.1.2.270 --- src/doc/CHANGES-7.0:1.1.2.269 Fri Apr 24 17:22:13 2015 +++ src/doc/CHANGES-7.0 Tue Apr 28 20:45:05 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.269 2015/04/24 17:22:13 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.270 2015/04/28 20:45:05 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -20340,3 +20340,8 @@ distrib/sets/lists/debug/mi 1.111 Add missing debug entry for bozohttpd [riz, ticket #721] +distrib/sets/lists/debug/mi 1.112 + + Mark httpd.debug as obsolete. + [mrg, ticket #724] +
Re: CVS commit: src/sys/dev/sysmon
Well, it really is a (pseudo-)device, and even has its own major device number. We cannot avoid all of the device goop, since a non-built-in-module would still have to merge in the devsw. My goal is to eventually be able to build and run a kernel which has no portion of sysmon built-in, and still be able to load and unload the wdog/power/envsys components, along with the actual drivers for timers/power-switches/sensors. It's really not all that complicated. On Tue, 28 Apr 2015, Taylor R Campbell wrote: Date: Thu, 23 Apr 2015 23:22:03 + From: Paul Goyette pgoye...@netbsd.org Modularize sysmon and its components Why does this introduce a sysmon(4) autoconf device? It seems like needless bookkeeping -- you could just make the mutex global, like all the state it protects, and skip all the match/attach/detach/cfdriver autoconf business. - | Paul Goyette | PGP Key fingerprint: | E-mail addresses: | | (Retired)| FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com| | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd.org | -
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Apr 28 06:55:26 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: utoppy.c Log Message: Remove lbl argument to utoppy_bulk_transfer To generate a diff of this commit: cvs rdiff -u -r1.24.4.7 -r1.24.4.8 src/sys/dev/usb/utoppy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: prlw1 Date: Tue Apr 28 09:48:31 UTC 2015 Modified Files: src/crypto/external/bsd/heimdal/dist/kadmin: kadmin.8 src/external/bsd/am-utils/dist: README src/external/bsd/pkg_install/dist/info: pkg_info.1 src/external/bsd/pkg_install/dist/lib: pkg_install.conf.5.in src/external/gpl3/gcc/dist/gcc/doc: invoke.texi src/sbin/dump: dump.8 src/sbin/mount_nfs: mount_nfs.8 src/share/man/man4: crypto.4 src/share/man/man8: pam.8 src/share/man/man9: firmload.9 wdc.9 src/sys/rump/librump/rumpvfs: rump_etfs.3 Log Message: Fix typos To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/am-utils/dist/README cvs rdiff -u -r1.1.1.6 -r1.2 \ src/external/bsd/pkg_install/dist/info/pkg_info.1 cvs rdiff -u -r1.1.1.13 -r1.2 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/doc/invoke.texi cvs rdiff -u -r1.65 -r1.66 src/sbin/dump/dump.8 cvs rdiff -u -r1.43 -r1.44 src/sbin/mount_nfs/mount_nfs.8 cvs rdiff -u -r1.24 -r1.25 src/share/man/man4/crypto.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man8/pam.8 cvs rdiff -u -r1.8 -r1.9 src/share/man/man9/firmload.9 cvs rdiff -u -r1.18 -r1.19 src/share/man/man9/wdc.9 cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpvfs/rump_etfs.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 diff -u src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8:1.3 src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8:1.4 --- src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8:1.3 Thu Apr 24 13:45:33 2014 +++ src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 Tue Apr 28 09:48:30 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: kadmin.8,v 1.3 2014/04/24 13:45:33 pettai Exp $ +.\ $NetBSD: kadmin.8,v 1.4 2015/04/28 09:48:30 prlw1 Exp $ .\ .\ Copyright (c) 2000 - 2007 Kungliga Tekniska Högskolan .\ (Royal Institute of Technology, Stockholm, Sweden). @@ -115,7 +115,7 @@ Commands include: .Ar principal... .Bd -ragged -offset indent Adds a new principal to the database. The options not passed on the -command line will be promped for. +command line will be prompted for. .Ed .Pp .Nm add_enctype @@ -123,7 +123,7 @@ command line will be promped for. .Ar principal enctypes... .Pp .Bd -ragged -offset indent -Adds a new encryption type to the principal, only random key are +Adds a new encryption type to the principal, only random keys are supported. .Ed .Pp Index: src/external/bsd/am-utils/dist/README diff -u src/external/bsd/am-utils/dist/README:1.1.1.2 src/external/bsd/am-utils/dist/README:1.2 --- src/external/bsd/am-utils/dist/README:1.1.1.2 Sat Jan 17 16:34:14 2015 +++ src/external/bsd/am-utils/dist/README Tue Apr 28 09:48:30 2015 @@ -38,9 +38,8 @@ and then run make -This would configure amd in the directory you've run the configure script -in, and the built it there. Run make install to install all the necessary -files. +This would configure amd in the directory you've run the configure script, +and build it there. Run make install to install all the necessary files. Note that this is good for building only one version of amd on one architecture! Don't try this for multiple architectures. If you must, then @@ -91,7 +90,7 @@ buildall script to rerun configure and t Modifying M4 macros may not be very intuitive to anyone that has not done so before. Let me know if you are having any problems with them. I fully -expect, at least initially, to have to be the sole developers of the M4 +expect, at least initially, to have to be the sole developer of the M4 macros and let others concentrate on C sources. [E] Report all bugs via Bugzilla or the am-utils list (see Index: src/external/bsd/pkg_install/dist/info/pkg_info.1 diff -u src/external/bsd/pkg_install/dist/info/pkg_info.1:1.1.1.6 src/external/bsd/pkg_install/dist/info/pkg_info.1:1.2 --- src/external/bsd/pkg_install/dist/info/pkg_info.1:1.1.1.6 Sat Apr 20 15:26:53 2013 +++ src/external/bsd/pkg_install/dist/info/pkg_info.1 Tue Apr 28 09:48:30 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: pkg_info.1,v 1.1.1.6 2013/04/20 15:26:53 wiz Exp $ +.\ $NetBSD: pkg_info.1,v 1.2 2015/04/28 09:48:30 prlw1 Exp $ .\ .\ FreeBSD install - a package for the installation and maintenance .\ of non-core utilities. @@ -47,7 +47,7 @@ command. .Pp The .Ar pkg-name -may be the name of an installed package (with our without version), a +may be the name of an installed package (with or without version), a pattern matching several installed packages (see the .Sx PACKAGE WILDCARDS section for a description of possible patterns), Index: src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in diff -u
CVS commit: src
Module Name:src Committed By: prlw1 Date: Tue Apr 28 09:48:31 UTC 2015 Modified Files: src/crypto/external/bsd/heimdal/dist/kadmin: kadmin.8 src/external/bsd/am-utils/dist: README src/external/bsd/pkg_install/dist/info: pkg_info.1 src/external/bsd/pkg_install/dist/lib: pkg_install.conf.5.in src/external/gpl3/gcc/dist/gcc/doc: invoke.texi src/sbin/dump: dump.8 src/sbin/mount_nfs: mount_nfs.8 src/share/man/man4: crypto.4 src/share/man/man8: pam.8 src/share/man/man9: firmload.9 wdc.9 src/sys/rump/librump/rumpvfs: rump_etfs.3 Log Message: Fix typos To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/heimdal/dist/kadmin/kadmin.8 cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/am-utils/dist/README cvs rdiff -u -r1.1.1.6 -r1.2 \ src/external/bsd/pkg_install/dist/info/pkg_info.1 cvs rdiff -u -r1.1.1.13 -r1.2 \ src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/doc/invoke.texi cvs rdiff -u -r1.65 -r1.66 src/sbin/dump/dump.8 cvs rdiff -u -r1.43 -r1.44 src/sbin/mount_nfs/mount_nfs.8 cvs rdiff -u -r1.24 -r1.25 src/share/man/man4/crypto.4 cvs rdiff -u -r1.4 -r1.5 src/share/man/man8/pam.8 cvs rdiff -u -r1.8 -r1.9 src/share/man/man9/firmload.9 cvs rdiff -u -r1.18 -r1.19 src/share/man/man9/wdc.9 cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpvfs/rump_etfs.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: martin Date: Tue Apr 28 06:23:57 UTC 2015 Modified Files: src/sys/arch/x86/pci: msipic.c Log Message: Make this compilable in non-DIAGNOSTIC kernels. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/pci/msipic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: martin
Date: Tue Apr 28 06:23:57 UTC 2015
Modified Files:
src/sys/arch/x86/pci: msipic.c
Log Message:
Make this compilable in non-DIAGNOSTIC kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/pci/msipic.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/msipic.c
diff -u src/sys/arch/x86/pci/msipic.c:1.2 src/sys/arch/x86/pci/msipic.c:1.3
--- src/sys/arch/x86/pci/msipic.c:1.2 Tue Apr 28 02:38:53 2015
+++ src/sys/arch/x86/pci/msipic.c Tue Apr 28 06:23:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: msipic.c,v 1.2 2015/04/28 02:38:53 knakahara Exp $ */
+/* $NetBSD: msipic.c,v 1.3 2015/04/28 06:23:57 martin Exp $ */
/*
* Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: msipic.c,v 1.2 2015/04/28 02:38:53 knakahara Exp $);
+__KERNEL_RCSID(0, $NetBSD: msipic.c,v 1.3 2015/04/28 06:23:57 martin Exp $);
#include sys/types.h
#include sys/param.h
@@ -322,12 +322,13 @@ msi_set_msictl_enablebit(struct pic *pic
struct pci_attach_args *pa;
pcitag_t tag;
pcireg_t ctl;
- int off;
+ int off, err __diagused;
pc = NULL;
pa = pic-pic_msipic-mp_pa;
tag = pa-pa_tag;
- KASSERT(pci_get_capability(pc, tag, PCI_CAP_MSI, off, NULL) != 0);
+ err = pci_get_capability(pc, tag, PCI_CAP_MSI, off, NULL);
+ KASSERT(err != 0);
/*
* MSI can establish only one vector at once.
@@ -368,12 +369,13 @@ msi_addroute(struct pic *pic, struct cpu
struct pci_attach_args *pa;
pcitag_t tag;
pcireg_t addr, data, ctl;
- int off;
+ int off, err __diagused;
pc = NULL;
pa = pic-pic_msipic-mp_pa;
tag = pa-pa_tag;
- KASSERT(pci_get_capability(pc, tag, PCI_CAP_MSI, off, NULL) != 0);
+ err = pci_get_capability(pc, tag, PCI_CAP_MSI, off, NULL);
+ KASSERT(err != 0);
/*
* See Intel 64 and IA-32 Architectures Software Developer's Manual
@@ -527,7 +529,7 @@ msix_addroute(struct pic *pic, struct cp
bus_space_handle_t bshandle;
uint64_t entry_base;
pcireg_t addr, data, ctl;
- int off;
+ int off, err __diagused;
if (msix_vec 0) {
DPRINTF((%s: invalid MSI-X table index, devid=%d vecid=%d,
@@ -538,7 +540,8 @@ msix_addroute(struct pic *pic, struct cp
pa = pic-pic_msipic-mp_pa;
pc = pa-pa_pc;
tag = pa-pa_tag;
- KASSERT(pci_get_capability(pc, tag, PCI_CAP_MSIX, off, NULL) != 0);
+ err = pci_get_capability(pc, tag, PCI_CAP_MSIX, off, NULL);
+ KASSERT(err != 0);
entry_base = PCI_MSIX_TABLE_ENTRY_SIZE * msix_vec;
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Tue Apr 28 06:55:26 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: utoppy.c
Log Message:
Remove lbl argument to utoppy_bulk_transfer
To generate a diff of this commit:
cvs rdiff -u -r1.24.4.7 -r1.24.4.8 src/sys/dev/usb/utoppy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/utoppy.c
diff -u src/sys/dev/usb/utoppy.c:1.24.4.7 src/sys/dev/usb/utoppy.c:1.24.4.8
--- src/sys/dev/usb/utoppy.c:1.24.4.7 Sat Mar 21 11:33:37 2015
+++ src/sys/dev/usb/utoppy.c Tue Apr 28 06:55:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: utoppy.c,v 1.24.4.7 2015/03/21 11:33:37 skrll Exp $ */
+/* $NetBSD: utoppy.c,v 1.24.4.8 2015/04/28 06:55:26 skrll Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: utoppy.c,v 1.24.4.7 2015/03/21 11:33:37 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: utoppy.c,v 1.24.4.8 2015/04/28 06:55:26 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -523,8 +523,7 @@ utoppy_dump_packet(const void *b, size_t
static usbd_status
utoppy_bulk_transfer(struct usbd_xfer *xfer, struct usbd_pipe *pipe,
-uint16_t flags, uint32_t timeout, void *buf, uint32_t *size,
-const char *lbl)
+uint16_t flags, uint32_t timeout, void *buf, uint32_t *size)
{
usbd_status err;
@@ -613,8 +612,7 @@ utoppy_send_packet(struct utoppy_softc *
memcpy(sc-sc_out_buf, data, thislen);
err = utoppy_bulk_transfer(sc-sc_out_xfer, sc-sc_out_pipe,
- 0, timeout, sc-sc_out_buf, thislen,
- utoppytx);
+ 0, timeout, sc-sc_out_buf, thislen);
if (thislen != min(len, UTOPPY_FRAG_SIZE)) {
DPRINTF(UTOPPY_DBG_SEND_PACKET, (%s:
@@ -655,7 +653,7 @@ utoppy_recv_packet(struct utoppy_softc *
err = utoppy_bulk_transfer(sc-sc_in_xfer, sc-sc_in_pipe,
USBD_SHORT_XFER_OK, timeout, sc-sc_in_buf,
- thislen, utoppyrx);
+ thislen);
DPRINTF(UTOPPY_DBG_RECV_PACKET, (%s: utoppy_recv_packet:
usbd_bulk_transfer() returned %d, thislen %d, data %p\n,
CVS commit: src/sys/arch/mips/ingenic
Module Name:src Committed By: macallan Date: Tue Apr 28 15:08:07 UTC 2015 Modified Files: src/sys/arch/mips/ingenic: apbus.c Log Message: add entries for sdmmc hosts, no driver yet To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mips/ingenic/apbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/ifconfig
Module Name:src Committed By: christos Date: Tue Apr 28 15:14:57 UTC 2015 Modified Files: src/sbin/ifconfig: Makefile ieee80211.c Log Message: remove 80211 stats if small. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sbin/ifconfig/Makefile cvs rdiff -u -r1.27 -r1.28 src/sbin/ifconfig/ieee80211.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: christos
Date: Tue Apr 28 15:14:57 UTC 2015
Modified Files:
src/sbin/ifconfig: Makefile ieee80211.c
Log Message:
remove 80211 stats if small.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sbin/ifconfig/Makefile
cvs rdiff -u -r1.27 -r1.28 src/sbin/ifconfig/ieee80211.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.54 src/sbin/ifconfig/Makefile:1.55
--- src/sbin/ifconfig/Makefile:1.54 Fri Mar 1 13:25:16 2013
+++ src/sbin/ifconfig/Makefile Tue Apr 28 11:14:57 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2013/03/01 18:25:16 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2015/04/28 15:14:57 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -25,6 +25,10 @@ RUMPSRCS= getifaddrs.c
CPPFLAGS+= -DRUMP_ACTION
.endif
+.ifdef SMALLPROG
+CPPFLAGS+=-DSMALL
+.endif
+
CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/pf/
SRCS+= pfsync.c
Index: src/sbin/ifconfig/ieee80211.c
diff -u src/sbin/ifconfig/ieee80211.c:1.27 src/sbin/ifconfig/ieee80211.c:1.28
--- src/sbin/ifconfig/ieee80211.c:1.27 Tue Jan 7 20:56:20 2014
+++ src/sbin/ifconfig/ieee80211.c Tue Apr 28 11:14:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211.c,v 1.27 2014/01/08 01:56:20 christos Exp $ */
+/* $NetBSD: ieee80211.c,v 1.28 2015/04/28 15:14:57 christos Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: ieee80211.c,v 1.27 2014/01/08 01:56:20 christos Exp $);
+__RCSID($NetBSD: ieee80211.c,v 1.28 2015/04/28 15:14:57 christos Exp $);
#endif /* not lint */
#include sys/param.h
@@ -482,6 +482,7 @@ scan_exec(prop_dictionary_t env, prop_di
static void
ieee80211_statistics(prop_dictionary_t env)
{
+#ifndef SMALL
struct ieee80211_stats stats;
struct ifreq ifr;
@@ -584,6 +585,7 @@ ieee80211_statistics(prop_dictionary_t e
STAT_PRINT(is_ff_decap, fast frames decap'd);
STAT_PRINT(is_ff_encap, fast frames encap'd for tx);
STAT_PRINT(is_rx_badbintval, rx frame w/ bogus bintval);
+#endif
}
static void
