CVS commit: src/share/tmac
Module Name:src Committed By: kamil Date: Sun Nov 22 05:13:00 UTC 2015 Modified Files: src/share/tmac: doc2html Log Message: +libpanel: Z-order for curses windows To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/share/tmac/doc2html Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/tmac/doc2html diff -u src/share/tmac/doc2html:1.65 src/share/tmac/doc2html:1.66 --- src/share/tmac/doc2html:1.65 Sat Aug 3 22:12:23 2013 +++ src/share/tmac/doc2html Sun Nov 22 05:13:00 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: doc2html,v 1.65 2013/08/03 22:12:23 wiz Exp $ +.\" $NetBSD: doc2html,v 1.66 2015/11/22 05:13:00 kamil Exp $ .\" .\" Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -590,6 +590,7 @@ Unknown .Bl list type \\$1 (#\\n(.c) .if "\\$1"libmagic" \&Magic Number Recognition Library (libmagic, -lmagic) .if "\\$1"libmenu" \&Curses Menu Library (libmenu, -lmenu) .if "\\$1"libossaudio" \&OSS Audio Emulation Library (libossaudio, -lossaudio) +.if "\\$1"libpanel" \&Curses Panel Library (libpanel, -lpanel) .if "\\$1"libpcap" \&Packet Capture Library (libpcap, -lpcap) .if "\\$1"libpci" \&PCI Bus Access Library (libpci, -lpci) .if "\\$1"libpmc" \&Performance Counters Library (libpmc, -lpmc)
CVS commit: src/share/man/man3
Module Name:src Committed By: kamil Date: Sun Nov 22 05:12:22 UTC 2015 Modified Files: src/share/man/man3: intro.3 Log Message: +libpanel: Z-order for curses windows To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/share/man/man3/intro.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man3/intro.3 diff -u src/share/man/man3/intro.3:1.29 src/share/man/man3/intro.3:1.30 --- src/share/man/man3/intro.3:1.29 Tue Jul 3 09:28:08 2012 +++ src/share/man/man3/intro.3 Sun Nov 22 05:12:22 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: intro.3,v 1.29 2012/07/03 09:28:08 wiz Exp $ +.\" $NetBSD: intro.3,v 1.30 2015/11/22 05:12:22 kamil Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -237,6 +237,10 @@ See The curses menu library. See .Xr menus 3 . +.It Em libpanel Pq Fl l Ns Ar panel +The curses panel library. +See +.Xr panel 3 . .It Em libpcap Pq Fl l Ns Ar pcap The packet capture library. See
CVS commit: src/gnu/usr.bin/groff/tmac
Module Name:src Committed By: kamil Date: Sun Nov 22 05:10:28 UTC 2015 Modified Files: src/gnu/usr.bin/groff/tmac: ru.KOI8-R Log Message: +libpanel (Russian version) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/gnu/usr.bin/groff/tmac/ru.KOI8-R Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/ru.KOI8-R diff -u src/gnu/usr.bin/groff/tmac/ru.KOI8-R:1.2 src/gnu/usr.bin/groff/tmac/ru.KOI8-R:1.3 --- src/gnu/usr.bin/groff/tmac/ru.KOI8-R:1.2 Mon Feb 6 18:29:48 2006 +++ src/gnu/usr.bin/groff/tmac/ru.KOI8-R Sun Nov 22 05:10:28 2015 @@ -94,6 +94,7 @@ .ds doc-str-Lb-libnetgraph ðÏÌØÚÏ×ÁÔÅÌØÓËÁÑ ÂÉÂÌÉÏÔÅËÁ Netgraph (libnetgraph, \-lnetgraph) .ds doc-str-Lb-libossaudio âÉÂÌÉÏÔÅËÁ ÜÍÕÌÑÃÉÉ OSS Audio (libossaudio, \-lossaudio) .ds doc-str-Lb-libpam âÉÂÌÉÏÔÅËÁ PAM (libpam, \-lpam) +.\" XXX ds doc-str-Lb-libpanel Curses Panel Library (libpanel, \-lpanel) .ds doc-str-Lb-libposixâÉÂÌÉÏÔÅËÁ \*[Px]\-ÓÏ×ÍÅÓÔÉÍÏÓÔÉ (libposix, \-lposix) .\" XXX ds doc-str-Lb-libresolv DNS Resolver Library (libresolv, \-lresolv) .ds doc-str-Lb-librpcsvc âÉÂÌÉÏÔÅËÁ ÓÌÕÖ RPC (librpcsvc, \-lrpcsvc)
CVS commit: src/gnu/usr.bin/groff/tmac
Module Name:src Committed By: kamil Date: Sun Nov 22 05:06:57 UTC 2015 Modified Files: src/gnu/usr.bin/groff/tmac: fr.ISO8859-1 Log Message: +libpanel (French version) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/gnu/usr.bin/groff/tmac/fr.ISO8859-1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/usr.bin/groff/tmac/fr.ISO8859-1 diff -u src/gnu/usr.bin/groff/tmac/fr.ISO8859-1:1.2 src/gnu/usr.bin/groff/tmac/fr.ISO8859-1:1.3 --- src/gnu/usr.bin/groff/tmac/fr.ISO8859-1:1.2 Mon Feb 6 18:29:48 2006 +++ src/gnu/usr.bin/groff/tmac/fr.ISO8859-1 Sun Nov 22 05:06:56 2015 @@ -94,6 +94,7 @@ .ds doc-str-Lb-libnetgraph Bibliothèque utilisateur Netgraph (libnetgraph, \-lnetgraph) .ds doc-str-Lb-libossaudio Bibliothèque d'émulation audio OSS (libossaudio, \-lossaudio) .ds doc-str-Lb-libpam Bibliothèque PAM (libpam, \-lpam) +.ds doc-str-Lb-libpanelBibliothèque de panneaux en Curses (libpanel, \-lpanel) .ds doc-str-Lb-libposixBibliothèque de compatibilité \*[Px] (libposix, \-lposix) .ds doc-str-Lb-libresolv Bibliothèque du résolveur DNS (libresolv, \-lresolv) .ds doc-str-Lb-librpcsvc Bibliothèque des services RPC (librpcsvc, \-lrpcsvc)
CVS commit: src/gnu/dist/groff/tmac
Module Name:src Committed By: kamil Date: Sun Nov 22 05:03:20 UTC 2015 Modified Files: src/gnu/dist/groff/tmac: doc-syms groff_mdoc.man Log Message: +libpanel To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/gnu/dist/groff/tmac/doc-syms cvs rdiff -u -r1.20 -r1.21 src/gnu/dist/groff/tmac/groff_mdoc.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/groff/tmac/doc-syms diff -u src/gnu/dist/groff/tmac/doc-syms:1.18 src/gnu/dist/groff/tmac/doc-syms:1.19 --- src/gnu/dist/groff/tmac/doc-syms:1.18 Sun Jun 10 15:02:31 2012 +++ src/gnu/dist/groff/tmac/doc-syms Sun Nov 22 05:03:20 2015 @@ -701,6 +701,7 @@ .ds doc-str-Lb-libmenu Curses Menu Library (libmenu, \-lmenu) .ds doc-str-Lb-libossaudio OSS Audio Emulation Library (libossaudio, \-lossaudio) .ds doc-str-Lb-libpam Pluggable Authentication Module Library (libpam, \-lpam) +.ds doc-str-Lb-libpanelZ-order for curses windows (libpanel, \-lpanel) .ds doc-str-Lb-libpcap Packet Capture Library (libpcap, \-lpcap) .ds doc-str-Lb-libpci PCI Bus Access Library (libpci, \-lpci) .ds doc-str-Lb-libpmc Performance Counters Library (libpmc, \-lpmc) Index: src/gnu/dist/groff/tmac/groff_mdoc.man diff -u src/gnu/dist/groff/tmac/groff_mdoc.man:1.20 src/gnu/dist/groff/tmac/groff_mdoc.man:1.21 --- src/gnu/dist/groff/tmac/groff_mdoc.man:1.20 Mon Feb 24 07:23:40 2014 +++ src/gnu/dist/groff/tmac/groff_mdoc.man Sun Nov 22 05:03:20 2015 @@ -1706,6 +1706,8 @@ and their results are: .Lb libossaudio .It Li libpam .Lb libpam +.It Li libpanel +.Lb libpanel .It Li libpcap .Lb libpcap .It Li libpci
CVS commit: src/external/bsd/mdocml/dist
Module Name:src
Committed By: kamil
Date: Sun Nov 22 05:01:44 UTC 2015
Modified Files:
src/external/bsd/mdocml/dist: lib.in
Log Message:
+libpanel
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/mdocml/dist/lib.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/lib.in
diff -u src/external/bsd/mdocml/dist/lib.in:1.17 src/external/bsd/mdocml/dist/lib.in:1.18
--- src/external/bsd/mdocml/dist/lib.in:1.17 Mon Sep 28 22:11:40 2015
+++ src/external/bsd/mdocml/dist/lib.in Sun Nov 22 05:01:44 2015
@@ -82,6 +82,7 @@ LINE("libnetpgpverify", "Netpgp Verifica
LINE("libnpf", "NPF Packet Filter Library (libnpf, \\-lnpf)")
LINE("libossaudio", "OSS Audio Emulation Library (libossaudio, \\-lossaudio)")
LINE("libpam", "Pluggable Authentication Module Library (libpam, \\-lpam)")
+LINE("libpanel", "Z-order for curses windows (libpanel, \\-lpanel)")
LINE("libpcap", "Capture Library (libpcap, \\-lpcap)")
LINE("libpci", "PCI Bus Access Library (libpci, \\-lpci)")
LINE("libpmc", "Performance Counters Library (libpmc, \\-lpmc)")
CVS commit: src/share/mk
Module Name:src
Committed By: kamil
Date: Sun Nov 22 04:59:16 UTC 2015
Modified Files:
src/share/mk: bsd.README bsd.hostprog.mk
Log Message:
Add new predefined value for DPADD: LIBPANEL
To generate a diff of this commit:
cvs rdiff -u -r1.347 -r1.348 src/share/mk/bsd.README
cvs rdiff -u -r1.74 -r1.75 src/share/mk/bsd.hostprog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.347 src/share/mk/bsd.README:1.348
--- src/share/mk/bsd.README:1.347 Sat Nov 7 23:53:28 2015
+++ src/share/mk/bsd.README Sun Nov 22 04:59:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.347 2015/11/07 23:53:28 christos Exp $
+# $NetBSD: bsd.README,v 1.348 2015/11/22 04:59:15 kamil Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1576,6 +1576,7 @@ DPADD Additional dependencies for the p
LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a
LIBOSSAUDIO?= ${DESTDIR}/usr/lib/libossaudio.a
LIBPAM?= ${DESTDIR}/usr/lib/libpam.a
+ LIBPANEL?= ${DESTDIR}/usr/lib/libpanel.a
LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a
LIBPCI?= ${DESTDIR}/usr/lib/libpci.a
LIBPMC?= ${DESTDIR}/usr/lib/libpmc.a
Index: src/share/mk/bsd.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.74 src/share/mk/bsd.hostprog.mk:1.75
--- src/share/mk/bsd.hostprog.mk:1.74 Mon Dec 1 01:34:30 2014
+++ src/share/mk/bsd.hostprog.mk Sun Nov 22 04:59:15 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostprog.mk,v 1.74 2014/12/01 01:34:30 erh Exp $
+# $NetBSD: bsd.hostprog.mk,v 1.75 2015/11/22 04:59:15 kamil Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.include
@@ -41,6 +41,7 @@ LIBMP?= /usr/lib/libmp.a
LIBNTP?= /usr/lib/libntp.a
LIBOBJC?= /usr/lib/libobjc.a
LIBP2K?= /usr/lib/libp2k.a
+LIBPANEL?= /usr/lib/libpanel.a
LIBPC?= /usr/lib/libpc.a
LIBPCAP?= /usr/lib/libpcap.a
LIBPCI?= /usr/lib/libpci.a
CVS commit: src/lib/libcurses
Module Name:src Committed By: kamil Date: Sun Nov 22 04:56:00 UTC 2015 Modified Files: src/lib/libcurses: shlib_version Log Message: Note to update major of libpanel(3) for new major of curses(3) To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/lib/libcurses/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/shlib_version diff -u src/lib/libcurses/shlib_version:1.40 src/lib/libcurses/shlib_version:1.41 --- src/lib/libcurses/shlib_version:1.40 Sun Jan 11 03:07:47 2009 +++ src/lib/libcurses/shlib_version Sun Nov 22 04:56:00 2015 @@ -1,8 +1,8 @@ -# $NetBSD: shlib_version,v 1.40 2009/01/11 03:07:47 christos Exp $ +# $NetBSD: shlib_version,v 1.41 2015/11/22 04:56:00 kamil Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # Remember to run `make fileio.h` when changing -# Remember to increment the major numbers of both libform and libmenu -# when the libcurses major number increments. +# Remember to increment the major numbers of libform, libmenu and +# libpanel when the libcurses major number increments. # major=7 minor=0
CVS commit: src/lib/libpanel
Module Name:src
Committed By: kamil
Date: Sun Nov 22 04:30:33 UTC 2015
Modified Files:
src/lib/libpanel: Makefile
Log Message:
Specify path of a local internal header of libpanel
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libpanel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpanel/Makefile
diff -u src/lib/libpanel/Makefile:1.6 src/lib/libpanel/Makefile:1.7
--- src/lib/libpanel/Makefile:1.6 Sun Nov 22 04:26:14 2015
+++ src/lib/libpanel/Makefile Sun Nov 22 04:30:33 2015
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2015/11/22 04:26:14 kamil Exp $
+# $NetBSD: Makefile,v 1.7 2015/11/22 04:30:33 kamil Exp $
WARNS= 4
+CPPFLAGS+= -I${.CURDIR}
+
LIB= panel
INCS= panel.h
CVS commit: src/lib/libpanel
Module Name:src
Committed By: kamil
Date: Sun Nov 22 04:26:14 UTC 2015
Modified Files:
src/lib/libpanel: Makefile
Log Message:
Set LIBDPLIBS in libpanel for the required curses dependency
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libpanel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpanel/Makefile
diff -u src/lib/libpanel/Makefile:1.5 src/lib/libpanel/Makefile:1.6
--- src/lib/libpanel/Makefile:1.5 Sun Nov 22 04:23:32 2015
+++ src/lib/libpanel/Makefile Sun Nov 22 04:26:14 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/11/22 04:23:32 kamil Exp $
+# $NetBSD: Makefile,v 1.6 2015/11/22 04:26:14 kamil Exp $
WARNS= 4
@@ -27,7 +27,7 @@ SRCS+= top.c
SRCS+= update.c
SRCS+= window.c
-#LIBDPLIBS+= curses ${.CURDIR}/../libcurses
+LIBDPLIBS+= curses ${.CURDIR}/../libcurses
MAN= #
MAN+= move_panel.3
CVS commit: src/lib/libpanel
Module Name:src Committed By: kamil Date: Sun Nov 22 04:23:32 UTC 2015 Modified Files: src/lib/libpanel: Makefile Log Message: Set the INCSDIR value of panel.h to /usr/include To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libpanel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpanel/Makefile diff -u src/lib/libpanel/Makefile:1.4 src/lib/libpanel/Makefile:1.5 --- src/lib/libpanel/Makefile:1.4 Sun Nov 22 04:21:39 2015 +++ src/lib/libpanel/Makefile Sun Nov 22 04:23:32 2015 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.4 2015/11/22 04:21:39 kamil Exp $ +# $NetBSD: Makefile,v 1.5 2015/11/22 04:23:32 kamil Exp $ WARNS= 4 LIB= panel INCS= panel.h +INCSDIR= /usr/include SRCS= #
CVS commit: src/lib/libpanel
Module Name:src Committed By: kamil Date: Sun Nov 22 04:21:40 UTC 2015 Modified Files: src/lib/libpanel: Makefile Log Message: Define man page links of the libpanel functions To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libpanel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpanel/Makefile diff -u src/lib/libpanel/Makefile:1.3 src/lib/libpanel/Makefile:1.4 --- src/lib/libpanel/Makefile:1.3 Sun Nov 22 04:16:22 2015 +++ src/lib/libpanel/Makefile Sun Nov 22 04:21:39 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2015/11/22 04:16:22 kamil Exp $ +# $NetBSD: Makefile,v 1.4 2015/11/22 04:21:39 kamil Exp $ WARNS= 4 @@ -37,4 +37,18 @@ MAN+= panel_hidden.3 MAN+= panel_userptr.3 MAN+= update_panels.3 +MLINKS+= new_panel.3 panel_window.3 +MLINKS+= new_panel.3 replace_window.3 +MLINKS+= new_panel.3 replace_panel.3 +MLINKS+= new_panel.3 del_panel.3 + +MLINKS+= panel_above.3 top_panel.3 +MLINKS+= panel_above.3 bottom_panel.3 +MLINKS+= panel_above.3 panel_below.3 + +MLINKS+= panel_hidden.3 hide_panel.3 +MLINKS+= panel_hidden.3 show_panel.3 + +MLINKS+= panel_userptr.3 set_panel_userptr.3 + .include
CVS commit: src/lib/libpanel
Module Name:src
Committed By: kamil
Date: Sun Nov 22 04:16:22 UTC 2015
Modified Files:
src/lib/libpanel: Makefile
Log Message:
Update the list of libpanel man pages
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libpanel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpanel/Makefile
diff -u src/lib/libpanel/Makefile:1.2 src/lib/libpanel/Makefile:1.3
--- src/lib/libpanel/Makefile:1.2 Tue Oct 27 23:13:18 2015
+++ src/lib/libpanel/Makefile Sun Nov 22 04:16:22 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/10/27 23:13:18 uwe Exp $
+# $NetBSD: Makefile,v 1.3 2015/11/22 04:16:22 kamil Exp $
WARNS= 4
@@ -28,6 +28,13 @@ SRCS+= window.c
#LIBDPLIBS+= curses ${.CURDIR}/../libcurses
-MAN= panel.3
+MAN= #
+MAN+= move_panel.3
+MAN+= new_panel.3
+MAN+= panel.3
+MAN+= panel_above.3
+MAN+= panel_hidden.3
+MAN+= panel_userptr.3
+MAN+= update_panels.3
.include
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: kamil Date: Sun Nov 22 03:31:01 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi Log Message: + aligned_alloc.0 To generate a diff of this commit: cvs rdiff -u -r1.2004 -r1.2005 src/distrib/sets/lists/comp/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2004 src/distrib/sets/lists/comp/mi:1.2005 --- src/distrib/sets/lists/comp/mi:1.2004 Sat Nov 7 16:21:42 2015 +++ src/distrib/sets/lists/comp/mi Sun Nov 22 03:31:00 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2004 2015/11/07 16:21:42 nros Exp $ +# $NetBSD: mi,v 1.2005 2015/11/22 03:31:00 kamil Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -4890,6 +4890,7 @@ ./usr/share/man/cat3/aio_suspend.0 comp-c-catman .cat ./usr/share/man/cat3/aio_write.0 comp-c-catman .cat ./usr/share/man/cat3/alarm.0 comp-c-catman .cat +./usr/share/man/cat3/aligned_alloc.0 comp-c-catman .cat ./usr/share/man/cat3/alloca.0 comp-c-catman .cat ./usr/share/man/cat3/allocaddrinfo.0 comp-c-catman .cat ./usr/share/man/cat3/alphasort.0 comp-c-catman .cat
CVS commit: src/sys/dev/filemon
Module Name:src Committed By: pgoyette Date: Sun Nov 22 01:20:52 UTC 2015 Modified Files: src/sys/dev/filemon: filemon_wrapper.c Log Message: Fix return-code handling for execve and chdir wrappers. Fixes PR kern/50309 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/filemon/filemon_wrapper.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/filemon/filemon_wrapper.c diff -u src/sys/dev/filemon/filemon_wrapper.c:1.8 src/sys/dev/filemon/filemon_wrapper.c:1.9 --- src/sys/dev/filemon/filemon_wrapper.c:1.8 Fri Nov 20 01:16:04 2015 +++ src/sys/dev/filemon/filemon_wrapper.c Sun Nov 22 01:20:52 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: filemon_wrapper.c,v 1.8 2015/11/20 01:16:04 pgoyette Exp $ */ +/* $NetBSD: filemon_wrapper.c,v 1.9 2015/11/22 01:20:52 pgoyette Exp $ */ /* * Copyright (c) 2010, Juniper Networks, Inc. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: filemon_wrapper.c,v 1.8 2015/11/20 01:16:04 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: filemon_wrapper.c,v 1.9 2015/11/22 01:20:52 pgoyette Exp $"); #include #include @@ -48,7 +48,7 @@ filemon_wrapper_chdir(struct lwp * l, co struct filemon *filemon; if ((error = sys_chdir(l, uap, retval)) != 0) - return 0; + return error; filemon = filemon_lookup(curproc); if (filemon == NULL) @@ -76,11 +76,11 @@ filemon_wrapper_execve(struct lwp * l, s struct filemon *filemon; if ((error = sys_execve(l, uap, retval)) != EJUSTRETURN) - return 0; + return error; filemon = filemon_lookup(curproc); if (filemon == NULL) - return 0; + return EJUSTRETURN; error = copyinstr(SCARG(uap, path), fname, sizeof(fname), &done); if (error) @@ -89,7 +89,7 @@ filemon_wrapper_execve(struct lwp * l, s filemon_printf(filemon, "E %d %s\n", curproc->p_pid, fname); out: rw_exit(&filemon->fm_mtx); - return 0; + return EJUSTRETURN; }
CVS commit: src/usr.bin/config
Module Name:src
Committed By: uebayasi
Date: Sun Nov 22 01:20:36 UTC 2015
Modified Files:
src/usr.bin/config: TODO
Log Message:
A few more.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/config/TODO
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/config/TODO
diff -u src/usr.bin/config/TODO:1.30 src/usr.bin/config/TODO:1.31
--- src/usr.bin/config/TODO:1.30 Fri Sep 11 02:26:22 2015
+++ src/usr.bin/config/TODO Sun Nov 22 01:20:36 2015
@@ -226,7 +226,7 @@ o Pass input files to ${LD} via linker s
Instead of passing input files on command-line, output "INPUT(xxx.o)"
commands, and include it from generated linker scripts.
-o Generate `*.d' files.
+o Directly generate `*.d' files.
Output source/object files in raw texts instead of `Makefile'. Generate
`*.d' (make(1) depend) files. make(1) knows which object files are to be
@@ -459,3 +459,9 @@ o Clean up CTF-related rules.
Don't overwrite compile/link rules conditionally by existence of
${CTFCONVERT}/${CTFMERGE}. Give a separate suffix (*.ctfo) and define its
rules (.c -> .ctfo).
+
+o Consider using cpp -MD instead of ${MKDEP}.
+
+o Make "make depend" mandatory.
+
+ Automatically execute "make depend".
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Nov 21 22:55:46 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: JETSONTK1 Log Message: enable tegrasoctherm To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 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/evbarm/conf/JETSONTK1 diff -u src/sys/arch/evbarm/conf/JETSONTK1:1.40 src/sys/arch/evbarm/conf/JETSONTK1:1.41 --- src/sys/arch/evbarm/conf/JETSONTK1:1.40 Sat Nov 21 12:09:39 2015 +++ src/sys/arch/evbarm/conf/JETSONTK1 Sat Nov 21 22:55:46 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: JETSONTK1,v 1.40 2015/11/21 12:09:39 jmcneill Exp $ +# $NetBSD: JETSONTK1,v 1.41 2015/11/21 22:55:46 jmcneill Exp $ # # NVIDIA Jetson TK1 - Tegra K1 development kit # https://developer.nvidia.com/jetson-tk1 @@ -155,6 +155,9 @@ pseudo-device wsfont # GPU #nouveau0 at tegraio? # GPU +# Thermal throttling controller +tegrasoctherm0 at tegraio? # SOC_THERM + # USB 2.0 tegraehci0 at tegraio? port 0 # USB1 tegraehci1 at tegraio? port 1 # USB2
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Sat Nov 21 22:55:32 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: files.tegra tegra_car.c tegra_carreg.h
tegra_intr.h tegra_io.c tegra_reg.h tegra_var.h
Added Files:
src/sys/arch/arm/nvidia: tegra_soctherm.c tegra_socthermreg.h
Log Message:
Add SOC_THERM temperature sensor driver:
# envstat -d tegrasoctherm0
Current CritMax WarnMax WarnMin CritMin Unit
CPU0:27.500 degC
CPU1:27.500 degC
CPU2:29.500 degC
CPU3:29.000 degC
MEM0:26.500 degC
MEM1:27.000 degC
GPU:27.000 degC
PLLX:28.000 degC
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/nvidia/files.tegra
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/nvidia/tegra_car.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/nvidia/tegra_carreg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/nvidia/tegra_intr.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/nvidia/tegra_io.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/nvidia/tegra_reg.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/nvidia/tegra_soctherm.c \
src/sys/arch/arm/nvidia/tegra_socthermreg.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/nvidia/tegra_var.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/arm/nvidia/files.tegra
diff -u src/sys/arch/arm/nvidia/files.tegra:1.23 src/sys/arch/arm/nvidia/files.tegra:1.24
--- src/sys/arch/arm/nvidia/files.tegra:1.23 Sat Nov 21 12:09:39 2015
+++ src/sys/arch/arm/nvidia/files.tegra Sat Nov 21 22:55:32 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.tegra,v 1.23 2015/11/21 12:09:39 jmcneill Exp $
+# $NetBSD: files.tegra,v 1.24 2015/11/21 22:55:32 jmcneill Exp $
#
# Configuration info for NVIDIA Tegra ARM Peripherals
#
@@ -91,6 +91,11 @@ file arch/arm/nvidia/tegra_ehci.c tegra
attach sdhc at tegraio with tegra_sdhc
file arch/arm/nvidia/tegra_sdhc.c tegra_sdhc
+# Thermal throttling controller
+device tegrasoctherm: sysmon_envsys
+attach tegrasoctherm at tegraio with tegra_soctherm
+file arch/arm/nvidia/tegra_soctherm.c tegra_soctherm
+
# PCIE
device tegrapcie: pcibus
attach tegrapcie at tegraio with tegra_pcie
Index: src/sys/arch/arm/nvidia/tegra_car.c
diff -u src/sys/arch/arm/nvidia/tegra_car.c:1.29 src/sys/arch/arm/nvidia/tegra_car.c:1.30
--- src/sys/arch/arm/nvidia/tegra_car.c:1.29 Sat Nov 21 12:09:39 2015
+++ src/sys/arch/arm/nvidia/tegra_car.c Sat Nov 21 22:55:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_car.c,v 1.29 2015/11/21 12:09:39 jmcneill Exp $ */
+/* $NetBSD: tegra_car.c,v 1.30 2015/11/21 22:55:32 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -29,7 +29,7 @@
#include "locators.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_car.c,v 1.29 2015/11/21 12:09:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_car.c,v 1.30 2015/11/21 22:55:32 jmcneill Exp $");
#include
#include
@@ -882,3 +882,36 @@ tegra_car_fuse_disable(void)
tegra_reg_set_clear(bst, bsh, CAR_CLK_ENB_H_SET_REG, 0, CAR_DEV_H_FUSE);
}
+
+void
+tegra_car_soctherm_enable(void)
+{
+ bus_space_tag_t bst;
+ bus_space_handle_t bsh;
+
+ tegra_car_get_bs(&bst, &bsh);
+
+ bus_space_write_4(bst, bsh, CAR_RST_DEV_U_SET_REG, CAR_DEV_U_SOC_THERM);
+
+ const u_int soctherm_rate = 5100;
+ const u_int soctherm_div =
+ howmany(tegra_car_pllp0_rate() * 2, soctherm_rate) - 2;
+ bus_space_write_4(bst, bsh, CAR_CLKSRC_SOC_THERM_REG,
+ __SHIFTIN(soctherm_div, CAR_CLKSRC_SOC_THERM_DIV) |
+ __SHIFTIN(CAR_CLKSRC_SOC_THERM_SRC_PLLP_OUT0,
+ CAR_CLKSRC_SOC_THERM_SRC));
+ delay(20);
+
+ const u_int tsensor_rate = 40;
+ const u_int tsensor_div =
+ howmany(TEGRA_REF_FREQ * 2, tsensor_rate) - 2;
+ bus_space_write_4(bst, bsh, CAR_CLKSRC_TSENSOR_REG,
+ __SHIFTIN(tsensor_div, CAR_CLKSRC_TSENSOR_DIV) |
+ __SHIFTIN(CAR_CLKSRC_TSENSOR_SRC_CLK_M, CAR_CLKSRC_TSENSOR_SRC));
+ delay(20);
+
+ bus_space_write_4(bst, bsh, CAR_CLK_ENB_V_SET_REG, CAR_DEV_V_TSENSOR);
+ bus_space_write_4(bst, bsh, CAR_CLK_ENB_U_SET_REG, CAR_DEV_U_SOC_THERM);
+
+ bus_space_write_4(bst, bsh, CAR_RST_DEV_U_CLR_REG, CAR_DEV_U_SOC_THERM);
+}
Index: src/sys/arch/arm/nvidia/tegra_carreg.h
diff -u src/sys/arch/arm/nvidia/tegra_carreg.h:1.21 src/sys/arch/arm/nvidia/tegra_carreg.h:1.22
--- src/sys/arch/arm/nvidia/tegra_carreg.h:1.21 Sat Oct 17 21:16:09 2015
+++ src/sys/arch/arm/nvidia/tegra_carreg.h Sat Nov 21 22:55:32 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_carreg.h,v 1.21 2015/10/17 21:16:09 jmcneill Exp $ */
+/* $NetBSD: tegra_carreg.h,v 1.22 2015/11/21 22:55:32 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -358,6 +358,7 @
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Sat Nov 21 22:52:31 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: soc_tegra124.c tegra_fuse.c Log Message: Apply initial fuse offset in tegra_fuse_read instead of in each reg def To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/soc_tegra124.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_fuse.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/nvidia/soc_tegra124.c diff -u src/sys/arch/arm/nvidia/soc_tegra124.c:1.9 src/sys/arch/arm/nvidia/soc_tegra124.c:1.10 --- src/sys/arch/arm/nvidia/soc_tegra124.c:1.9 Sat Nov 21 12:09:39 2015 +++ src/sys/arch/arm/nvidia/soc_tegra124.c Sat Nov 21 22:52:31 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: soc_tegra124.c,v 1.9 2015/11/21 12:09:39 jmcneill Exp $ */ +/* $NetBSD: soc_tegra124.c,v 1.10 2015/11/21 22:52:31 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -30,7 +30,7 @@ #include "opt_multiprocessor.h" #include -__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.9 2015/11/21 12:09:39 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.10 2015/11/21 22:52:31 jmcneill Exp $"); #include #include @@ -47,17 +47,17 @@ __KERNEL_RCSID(0, "$NetBSD: soc_tegra124 #define EVP_RESET_VECTOR_0_REG 0x100 -#define FUSE_SKU_INFO_REG 0x110 -#define FUSE_CPU_SPEEDO_0_REG 0x114 -#define FUSE_CPU_IDDQ_REG 0x118 -#define FUSE_FT_REV_REG 0x128 -#define FUSE_CPU_SPEEDO_1_REG 0x12c -#define FUSE_CPU_SPEEDO_2_REG 0x130 -#define FUSE_SOC_SPEEDO_0_REG 0x134 -#define FUSE_SOC_SPEEDO_1_REG 0x138 -#define FUSE_SOC_SPEEDO_2_REG 0x13c -#define FUSE_SOC_IDDQ_REG 0x140 -#define FUSE_GPU_IDDQ_REG 0x228 +#define FUSE_SKU_INFO_REG 0x010 +#define FUSE_CPU_SPEEDO_0_REG 0x014 +#define FUSE_CPU_IDDQ_REG 0x018 +#define FUSE_FT_REV_REG 0x028 +#define FUSE_CPU_SPEEDO_1_REG 0x02c +#define FUSE_CPU_SPEEDO_2_REG 0x030 +#define FUSE_SOC_SPEEDO_0_REG 0x034 +#define FUSE_SOC_SPEEDO_1_REG 0x038 +#define FUSE_SOC_SPEEDO_2_REG 0x03c +#define FUSE_SOC_IDDQ_REG 0x040 +#define FUSE_GPU_IDDQ_REG 0x128 static void tegra124_speedo_init(void); static int tegra124_speedo_init_ids(uint32_t); Index: src/sys/arch/arm/nvidia/tegra_fuse.c diff -u src/sys/arch/arm/nvidia/tegra_fuse.c:1.1 src/sys/arch/arm/nvidia/tegra_fuse.c:1.2 --- src/sys/arch/arm/nvidia/tegra_fuse.c:1.1 Sat Nov 21 12:09:39 2015 +++ src/sys/arch/arm/nvidia/tegra_fuse.c Sat Nov 21 22:52:31 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_fuse.c,v 1.1 2015/11/21 12:09:39 jmcneill Exp $ */ +/* $NetBSD: tegra_fuse.c,v 1.2 2015/11/21 22:52:31 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -29,7 +29,7 @@ #include "locators.h" #include -__KERNEL_RCSID(0, "$NetBSD: tegra_fuse.c,v 1.1 2015/11/21 12:09:39 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tegra_fuse.c,v 1.2 2015/11/21 22:52:31 jmcneill Exp $"); #include #include @@ -96,7 +96,7 @@ tegra_fuse_read(u_int offset) } tegra_car_fuse_enable(); - const uint32_t v = bus_space_read_4(bst, bsh, offset); + const uint32_t v = bus_space_read_4(bst, bsh, 0x100 + offset); tegra_car_fuse_disable(); return v;
CVS commit: othersrc/share/examples/ec2/files
Module Name:othersrc Committed By: riz Date: Sat Nov 21 20:03:53 UTC 2015 Modified Files: othersrc/share/examples/ec2/files: ec2_firstboot Log Message: Remove "resize_root" lines from rc.conf if they exist. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 othersrc/share/examples/ec2/files/ec2_firstboot Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/share/examples/ec2/files/ec2_firstboot diff -u othersrc/share/examples/ec2/files/ec2_firstboot:1.1 othersrc/share/examples/ec2/files/ec2_firstboot:1.2 --- othersrc/share/examples/ec2/files/ec2_firstboot:1.1 Fri Apr 20 21:01:03 2012 +++ othersrc/share/examples/ec2/files/ec2_firstboot Sat Nov 21 20:03:53 2015 @@ -19,6 +19,8 @@ ec2_firstboot_run() # The first boot has finished. if [ -f /root/firstboot ]; then rm /root/firstboot + # remove resize_root from rc.conf + sed -i -e ',s^resize_root.*$,,' /etc/rc.conf fi }
CVS commit: othersrc/share/examples/ec2/files
Module Name:othersrc Committed By: riz Date: Sat Nov 21 20:02:36 UTC 2015 Modified Files: othersrc/share/examples/ec2/files: ec2_init Log Message: Can't be both BEFORE: LOGIN and REQUIRE: sshd, so drop the former. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 othersrc/share/examples/ec2/files/ec2_init Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/share/examples/ec2/files/ec2_init diff -u othersrc/share/examples/ec2/files/ec2_init:1.1 othersrc/share/examples/ec2/files/ec2_init:1.2 --- othersrc/share/examples/ec2/files/ec2_init:1.1 Fri Apr 20 21:01:03 2012 +++ othersrc/share/examples/ec2/files/ec2_init Sat Nov 21 20:02:36 2015 @@ -2,7 +2,6 @@ # # PROVIDE: ec2_init # REQUIRE: NETWORKING sshd -# BEFORE: LOGIN # # DO NOT modify the output of this file without understanding the
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jakllsch
Date: Sat Nov 21 16:50:29 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_mc.c
Log Message:
Add error interrupt handler to for Tegra MC.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nvidia/tegra_mc.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/nvidia/tegra_mc.c
diff -u src/sys/arch/arm/nvidia/tegra_mc.c:1.2 src/sys/arch/arm/nvidia/tegra_mc.c:1.3
--- src/sys/arch/arm/nvidia/tegra_mc.c:1.2 Sun Mar 29 22:27:04 2015
+++ src/sys/arch/arm/nvidia/tegra_mc.c Sat Nov 21 16:50:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_mc.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $ */
+/* $NetBSD: tegra_mc.c,v 1.3 2015/11/21 16:50:29 jakllsch Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -29,7 +29,7 @@
#include "locators.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_mc.c,v 1.2 2015/03/29 22:27:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_mc.c,v 1.3 2015/11/21 16:50:29 jakllsch Exp $");
#include
#include
@@ -45,10 +45,13 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_mc.c,v
static int tegra_mc_match(device_t, cfdata_t, void *);
static void tegra_mc_attach(device_t, device_t, void *);
+static int tegra_mc_intr(void *);
+
struct tegra_mc_softc {
device_t sc_dev;
bus_space_tag_t sc_bst;
bus_space_handle_t sc_bsh;
+ void *sc_ih;
};
static struct tegra_mc_softc *mc_softc = NULL;
@@ -56,6 +59,19 @@ static struct tegra_mc_softc *mc_softc =
CFATTACH_DECL_NEW(tegra_mc, sizeof(struct tegra_mc_softc),
tegra_mc_match, tegra_mc_attach, NULL, NULL);
+static inline uint32_t
+mc_read(const struct tegra_mc_softc * const sc, const bus_size_t offset)
+{
+ return bus_space_read_4(sc->sc_bst, sc->sc_bsh, offset);
+}
+
+static inline void
+mc_write(const struct tegra_mc_softc * const sc, const bus_size_t offset,
+const uint32_t value)
+{
+ bus_space_write_4(sc->sc_bst, sc->sc_bsh, offset, value);
+}
+
static int
tegra_mc_match(device_t parent, cfdata_t cf, void *aux)
{
@@ -79,6 +95,40 @@ tegra_mc_attach(device_t parent, device_
aprint_naive("\n");
aprint_normal(": MC\n");
+
+ sc->sc_ih = intr_establish(loc->loc_intr, IPL_VM, IST_LEVEL,
+ tegra_mc_intr, sc);
+ if (sc->sc_ih == NULL) {
+ aprint_error_dev(self, "failed to establish interrupt %d\n",
+ loc->loc_intr);
+ return;
+ }
+ aprint_normal_dev(self, "interrupting on irq %d\n", loc->loc_intr);
+
+ mc_write(sc, MC_INTSTATUS_REG, MC_INT__ALL);
+ mc_write(sc, MC_INTMASK_REG, MC_INT__ALL);
+}
+
+int
+tegra_mc_intr(void *v)
+{
+ struct tegra_mc_softc * const sc = v;
+
+ const uint32_t status = mc_read(sc, MC_INTSTATUS_REG);
+
+ if (status == 0) {
+ return 0;
+ }
+
+ const uint32_t err_status = mc_read(sc, MC_ERR_STATUS_REG);
+ const uint32_t err_adr = mc_read(sc, MC_ERR_ADR_REG);
+
+ device_printf(sc->sc_dev, "intrstatus %#x err %#x adr %#x\n",
+ status, err_status, err_adr);
+
+ mc_write(sc, MC_INTSTATUS_REG, status);
+
+ return status;
}
psize_t
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jakllsch Date: Sat Nov 21 16:48:33 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_mcreg.h Log Message: Add a bunch of hopefully-useful Tegra MC register bits. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_mcreg.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/arm/nvidia/tegra_mcreg.h diff -u src/sys/arch/arm/nvidia/tegra_mcreg.h:1.1 src/sys/arch/arm/nvidia/tegra_mcreg.h:1.2 --- src/sys/arch/arm/nvidia/tegra_mcreg.h:1.1 Sun Mar 29 10:41:59 2015 +++ src/sys/arch/arm/nvidia/tegra_mcreg.h Sat Nov 21 16:48:33 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_mcreg.h,v 1.1 2015/03/29 10:41:59 jmcneill Exp $ */ +/* $NetBSD: tegra_mcreg.h,v 1.2 2015/11/21 16:48:33 jakllsch Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -29,6 +29,50 @@ #ifndef _ARM_TEGRA_MCREG_H #define _ARM_TEGRA_MCREG_H +#define MC_INTSTATUS_REG 0x00 +#define MC_INTMASK_REG 0x04 + +#define MC_INT_DECERR_MTS __BIT(16) +#define MC_INT_SECERR_SEC __BIT(13) +#define MC_INT_DECERR_VPR __BIT(12) +#define MC_INT_INVALID_APB_ASID_UPDATE __BIT(11) +#define MC_INT_INVALID_SMMU_PAGE __BIT(10) +#define MC_INT_SECURITY_VIOLATION __BIT(8) +#define MC_INT_ARBITRATION_EMEM __BIT(9) +#define MC_INT_DECERR_EMEM __BIT(6) +#define MC_INT__ALL (MC_INT_DECERR_MTS | \ +MC_INT_SECERR_SEC | MC_INT_DECERR_VPR | \ +MC_INT_INVALID_APB_ASID_UPDATE | MC_INT_INVALID_SMMU_PAGE | \ +MC_INT_SECURITY_VIOLATION | MC_INT_ARBITRATION_EMEM | \ +MC_INT_DECERR_EMEM) + +#define MC_ERR_STATUS_REG 0x08 + +#define MC_ERR_TYPE __BITS(30,28) +#define MC_ERR_INVALID_SMMU_PAGE_READABLE __BIT(27) +#define MC_ERR_INVALID_SMMU_PAGE_WRITABLE __BIT(26) +#define MC_ERR_INVALID_SMMU_PAGE_NONSECURE __BIT(25) +#define MC_ERR_ADDR_HI __BITS(21,20) +#define MC_ERR_SWAP __BIT(18) +#define MC_ERR_SECURITY __BIT(17) +#define MC_ERR_RW __BIT(16) +#define MC_ERR_RW_READ 0 +#define MC_ERR_RW_WRITE 1 +#define MC_ERR_ADR1 __BITS(14,12) +#define MC_ERR_ID __BITS(6,0) + +#define MC_ERR_ADR_REG 0x0c + +#define MC_SMMU_CONFIG_REG 0x10 +#define MC_SMMU_ENABLE __BIT(0) + +#define MC_SMMU_TLB_CONFIG_REG 0x14 +#define MC_SMMU_PTC_CONFIG_REG 0x18 +#define MC_SMMU_PTB_ASID_REG 0x1c +#define MC_SMMU_PTB_DATA_REG 0x20 +#define MC_SMMU_TLB_FLUSH_REG 0x30 +#define MC_SMMU_PTC_FLUSH_REG 0x34 + #define MC_EMEM_CFG_0_REG 0x50 #define MC_EMEM_CFG_0_EMEM_BOM __BIT(31)
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Sat Nov 21 16:04:11 UTC 2015 Modified Files: src/sys/dev/ic: dwc_gmac_reg.h Log Message: Fix an off by one in the bit definition for RX store and forward mode. Pointed out by ganbold. While there add a few other bits of the same register. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/dwc_gmac_reg.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/ic/dwc_gmac_reg.h diff -u src/sys/dev/ic/dwc_gmac_reg.h:1.14 src/sys/dev/ic/dwc_gmac_reg.h:1.15 --- src/sys/dev/ic/dwc_gmac_reg.h:1.14 Fri Nov 28 09:01:05 2014 +++ src/sys/dev/ic/dwc_gmac_reg.h Sat Nov 21 16:04:11 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_gmac_reg.h,v 1.14 2014/11/28 09:01:05 martin Exp $ */ +/* $NetBSD: dwc_gmac_reg.h,v 1.15 2015/11/21 16:04:11 martin Exp $ */ /*- * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc. @@ -131,8 +131,13 @@ #define AWIN_GMAC_MII_IRQ __BIT(0) -#define GMAC_DMA_OP_RXSTOREFORWARD __BIT(24) /* start RX when a +#define GMAC_DMA_OP_DISABLECSDROP __BIT(26) /* disable dropping of + frames with TCP/IP + checksum errors */ +#define GMAC_DMA_OP_RXSTOREFORWARD __BIT(25) /* start RX when a full frame is available */ +#define GMAC_DMA_OP_DISABLERXFLUSH __BIT(24) /* Do not drop frames + when out of RX descr. */ #define GMAC_DMA_OP_TXSTOREFORWARD __BIT(21) /* start TX when a full frame is available */ #define GMAC_DMA_OP_FLUSHTX __BIT(20) /* flush TX fifo */
CVS commit: src/usr.bin/finger
Module Name:src
Committed By: christos
Date: Sat Nov 21 15:22:17 UTC 2015
Modified Files:
src/usr.bin/finger: sprint.c
Log Message:
fix format
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/finger/sprint.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/finger/sprint.c
diff -u src/usr.bin/finger/sprint.c:1.17 src/usr.bin/finger/sprint.c:1.18
--- src/usr.bin/finger/sprint.c:1.17 Tue Jan 3 20:17:54 2006
+++ src/usr.bin/finger/sprint.c Sat Nov 21 10:22:17 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sprint.c,v 1.17 2006/01/04 01:17:54 perry Exp $ */
+/* $NetBSD: sprint.c,v 1.18 2015/11/21 15:22:17 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)sprint.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: sprint.c,v 1.17 2006/01/04 01:17:54 perry Exp $");
+__RCSID("$NetBSD: sprint.c,v 1.18 2015/11/21 15:22:17 christos Exp $");
#endif
#endif /* not lint */
@@ -92,7 +92,7 @@ sflag_print(void)
* office phone
*/
#define MAXREALNAME 18
- (void)printf("%-*s %-*s %s %s\n", maxname, "Login", MAXREALNAME,
+ (void)printf("%-*s %-*s %s %s\n", (int)maxname, "Login", MAXREALNAME,
"Name", " Tty Idle Login Time ", (gflag) ? "" :
(oflag) ? "Office Office Phone" : "Where");
CVS commit: src/usr.bin/who
Module Name:src
Committed By: christos
Date: Sat Nov 21 15:01:43 UTC 2015
Modified Files:
src/usr.bin/who: Makefile utmpentry.c utmpentry.h who.c
Log Message:
WARNS=6
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/who/Makefile
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/who/utmpentry.c
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/who/utmpentry.h
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/who/who.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/who/Makefile
diff -u src/usr.bin/who/Makefile:1.9 src/usr.bin/who/Makefile:1.10
--- src/usr.bin/who/Makefile:1.9 Tue Apr 14 18:15:29 2009
+++ src/usr.bin/who/Makefile Sat Nov 21 10:01:43 2015
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2009/04/14 22:15:29 lukem Exp $
+# $NetBSD: Makefile,v 1.10 2015/11/21 15:01:43 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
+WARNS= 6
PROG= who
SRCS= who.c utmpentry.c
CPPFLAGS+= -DSUPPORT_UTMPX -DSUPPORT_UTMP
Index: src/usr.bin/who/utmpentry.c
diff -u src/usr.bin/who/utmpentry.c:1.17 src/usr.bin/who/utmpentry.c:1.18
--- src/usr.bin/who/utmpentry.c:1.17 Fri May 1 10:26:10 2009
+++ src/usr.bin/who/utmpentry.c Sat Nov 21 10:01:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: utmpentry.c,v 1.17 2009/05/01 14:26:10 christos Exp $ */
+/* $NetBSD: utmpentry.c,v 1.18 2015/11/21 15:01:43 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: utmpentry.c,v 1.17 2009/05/01 14:26:10 christos Exp $");
+__RCSID("$NetBSD: utmpentry.c,v 1.18 2015/11/21 15:01:43 christos Exp $");
#endif
#include
@@ -69,16 +69,16 @@ static int setup(const char *);
static void adjust_size(struct utmpentry *e);
#endif
-int maxname = 8, maxline = 8, maxhost = 16;
+size_t maxname = 8, maxline = 8, maxhost = 16;
int etype = 1 << USER_PROCESS;
-static int numutmp = 0;
+static size_t numutmp = 0;
static struct utmpentry *ehead;
#if defined(SUPPORT_UTMPX) || defined(SUPPORT_UTMP)
static void
adjust_size(struct utmpentry *e)
{
- int max;
+ size_t max;
if ((max = strlen(e->name)) > maxname)
maxname = max;
@@ -178,7 +178,7 @@ endutentries(void)
numutmp = 0;
}
-int
+size_t
getutentries(const char *fname, struct utmpentry **epp)
{
#ifdef SUPPORT_UTMPX
Index: src/usr.bin/who/utmpentry.h
diff -u src/usr.bin/who/utmpentry.h:1.7 src/usr.bin/who/utmpentry.h:1.8
--- src/usr.bin/who/utmpentry.h:1.7 Sun Jul 13 16:07:49 2008
+++ src/usr.bin/who/utmpentry.h Sat Nov 21 10:01:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: utmpentry.h,v 1.7 2008/07/13 20:07:49 dholland Exp $ */
+/* $NetBSD: utmpentry.h,v 1.8 2015/11/21 15:01:43 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@ struct utmpentry {
struct utmpentry *next;
};
-extern int maxname, maxline, maxhost;
+extern size_t maxname, maxline, maxhost;
extern int etype;
/*
@@ -72,5 +72,5 @@ extern int etype;
* endutentries clears and frees the cached data.
*/
-int getutentries(const char *, struct utmpentry **);
+size_t getutentries(const char *, struct utmpentry **);
void endutentries(void);
Index: src/usr.bin/who/who.c
diff -u src/usr.bin/who/who.c:1.24 src/usr.bin/who/who.c:1.25
--- src/usr.bin/who/who.c:1.24 Sun Jun 8 05:53:43 2014
+++ src/usr.bin/who/who.c Sat Nov 21 10:01:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: who.c,v 1.24 2014/06/08 09:53:43 mlelstv Exp $ */
+/* $NetBSD: who.c,v 1.25 2015/11/21 15:01:43 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)who.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: who.c,v 1.24 2014/06/08 09:53:43 mlelstv Exp $");
+__RCSID("$NetBSD: who.c,v 1.25 2015/11/21 15:01:43 christos Exp $");
#endif /* not lint */
#include
@@ -307,12 +307,12 @@ print(const char *name, const char *line
}
- (void)printf("%-*.*s ", maxname, maxname, name);
+ (void)printf("%-*.*s ", (int)maxname, (int)maxname, name);
if (show_term)
(void)printf("%c ", state);
- (void)printf("%-*.*s ", maxline, maxline, line);
+ (void)printf("%-*.*s ", (int)maxline, (int)maxline, line);
tstr = ctime(&t);
(void)printf("%.12s ", tstr ? tstr + 4 : "?");
@@ -339,19 +339,19 @@ print(const char *name, const char *line
}
if (*host)
- (void)printf("\t(%.*s)", maxhost, host);
+ (void)printf("\t(%.*s)", (int)maxhost, host);
(void)putchar('\n');
}
static void
output_labels(void)
{
- (void)printf("%-*.*s ", maxname, maxname, "USER");
+ (void)printf("%-*.*s ", (int)maxname, (int)maxname, "USER");
if (show_term)
(void)printf("S ");
- (void)printf("%-*.*s ", maxline, maxline, "LINE");
+ (void)printf("%-*.*s ", (int)maxline, (int)maxline, "LINE");
(void)printf("WHEN ");
if (show_idle) {
@@ -372,7 +372,7 @@ quick(const char *fname)
(void)getutentries(fname, &ehead);
for (ep = ehead; ep
CVS commit: src/usr.bin/wall
Module Name:src
Committed By: christos
Date: Sat Nov 21 14:59:51 UTC 2015
Modified Files:
src/usr.bin/wall: Makefile wall.c
Log Message:
PR/50454: Timo Buhrmester: Fix wrong allocation for wall(1) -g
Modernize.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/wall/Makefile
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/wall/wall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/wall/Makefile
diff -u src/usr.bin/wall/Makefile:1.10 src/usr.bin/wall/Makefile:1.11
--- src/usr.bin/wall/Makefile:1.10 Mon May 28 08:06:32 2007
+++ src/usr.bin/wall/Makefile Sat Nov 21 09:59:51 2015
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2007/05/28 12:06:32 tls Exp $
+# $NetBSD: Makefile,v 1.11 2015/11/21 14:59:51 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include
+WARNS=6
USE_FORT?= yes # setuid
PROG= wall
Index: src/usr.bin/wall/wall.c
diff -u src/usr.bin/wall/wall.c:1.29 src/usr.bin/wall/wall.c:1.30
--- src/usr.bin/wall/wall.c:1.29 Tue Sep 6 14:45:21 2011
+++ src/usr.bin/wall/wall.c Sat Nov 21 09:59:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wall.c,v 1.29 2011/09/06 18:45:21 joerg Exp $ */
+/* $NetBSD: wall.c,v 1.30 2015/11/21 14:59:51 christos Exp $ */
/*
* Copyright (c) 1988, 1990, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)wall.c 8.2 (Berkeley) 11/16/93";
#endif
-__RCSID("$NetBSD: wall.c,v 1.29 2011/09/06 18:45:21 joerg Exp $");
+__RCSID("$NetBSD: wall.c,v 1.30 2015/11/21 14:59:51 christos Exp $");
#endif /* not lint */
/*
@@ -68,7 +68,7 @@ __RCSID("$NetBSD: wall.c,v 1.29 2011/09/
#include "term_chk.h"
static void addgroup(char *);
-static void makemsg(const char *);
+static void makemsg(struct iovec *, const char *, int);
__dead static void usage(void);
static struct wallgroup {
@@ -78,11 +78,6 @@ static struct wallgroup {
struct wallgroup *next;
} *grouplist;
-static int nobanner;
-static size_t mbufsize;
-static char *mbuf;
-
-/* ARGSUSED */
int
main(int argc, char **argv)
{
@@ -93,15 +88,19 @@ main(int argc, char **argv)
gid_t egid;
struct wallgroup *wg;
struct passwd *pw;
+ int nobanner;
setprogname(argv[0]);
egid = getegid();
if (setegid(getgid()) == -1)
- err(1, "setegid");
+ err(EXIT_FAILURE, "setegid");
pw = getpwnam("nobody");
+ if (pw == NULL)
+ errx(EXIT_FAILURE, "Can't find passwd entry for `nobody'");
(void)check_sender(NULL, getuid(), egid);
+ nobanner = 0;
while ((ch = getopt(argc, argv, "g:n")) != -1)
switch (ch) {
case 'n':
@@ -121,10 +120,8 @@ main(int argc, char **argv)
if (argc > 1)
usage();
- makemsg(*argv);
+ makemsg(&iov, *argv, nobanner);
- iov.iov_base = mbuf;
- iov.iov_len = mbufsize;
(void)getutentries(NULL, &ep);
(void)setegid(egid);
for (; ep; ep = ep->next) {
@@ -153,34 +150,34 @@ main(int argc, char **argv)
if ((p = ttymsg(&iov, 1, ep->line, 60*5)) != NULL)
warnx("%s", p);
}
- exit(0);
+ return EXIT_SUCCESS;
}
static void
addgroup(char *name)
{
- int i;
+ size_t i;
struct group *grp;
struct wallgroup *g;
grp = getgrnam(name);
if ((grp = getgrnam(name)) == NULL)
- errx(1, "unknown group `%s'", name);
+ errx(EXIT_FAILURE, "unknown group `%s'", name);
for (i = 0; grp->gr_mem[i]; i++)
continue;
- g = (struct wallgroup *)malloc(sizeof *g);
+ g = malloc(sizeof(*g));
if (g == NULL)
- err(1, "malloc");
+ err(EXIT_FAILURE, "malloc");
g->gid = grp->gr_gid;
g->name = name;
- g->mem = (char **)malloc(i + 1);
+ g->mem = calloc(i + 1, sizeof(*g->mem));
if (g->mem == NULL)
- err(1, "malloc");
+ err(EXIT_FAILURE, "calloc");
for (i = 0; grp->gr_mem[i] != NULL; i++) {
g->mem[i] = strdup(grp->gr_mem[i]);
if (g->mem[i] == NULL)
- err(1, "malloc");
+ err(EXIT_FAILURE, "strdup");
}
g->mem[i] = NULL;
g->next = grouplist;
@@ -188,57 +185,66 @@ addgroup(char *name)
}
static void
-makemsg(const char *fname)
+makebanner(FILE *fp)
{
- int ch, cnt;
+ const char *whom, *tty;
+ char hostname[MAXHOSTNAMELEN + 1], lbuf[100];
+ time_t now;
struct tm *lt;
struct passwd *pw;
+
+ if (!(whom = getlogin()))
+ whom = (pw = getpwuid(getuid())) ? pw->pw_name : "???";
+ (void)gethostname(hostname, sizeof(hostname));
+ hostname[sizeof(hostname) - 1] = '\0';
+ (void)time(&now);
+ lt = localtime(&now);
+
+ /*
+ * all this stuff is to blank out a square for the message;
+ * we wrap message lines at column 79, not 80, because some
+ * terminals wrap after 79, some do not, and we can't tell.
+ * Which means that we may leave a non-blank character
+ * in column 80, but that can't be helped.
+ */
+ (void)fprintf(fp, "\r%79s\r\n", " ");
+ (void)snprintf(lbuf, sizeof lbuf,
+ "Broadcast Message from %s@%s", whom, hostname);
+ (void)fprintf(fp, "%-79.79s\007\007\r\n", lbuf);
+ tty = ttyname(STDERR_FILENO);
+ if (tty == NULL)
+ tty = "??";
+ (void)snprintf(lbuf, sizeof lbuf,
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: maxv Date: Sat Nov 21 12:34:48 UTC 2015 Modified Files: src/sys/arch/amd64/amd64: copy.S Log Message: Remove the amd64 implementation of fuword and suword. They are not used in the MI+amd64 code - Christos replaced them yesterday by copy*. They are both buggy: - suword does not properly check the userspace limit: 64 bits are copied, but the max address checked is VM_MAXUSER_ADDRESS-4, which means that 4 bytes may overflow. Reported by Ed Schouten. - fuword is supposed to be symmetrical with suword. But it uses 32bit registers, so it stores 32bit values! Spotted by Chuck (chs@). To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/amd64/amd64/copy.S 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/amd64/copy.S diff -u src/sys/arch/amd64/amd64/copy.S:1.18 src/sys/arch/amd64/amd64/copy.S:1.19 --- src/sys/arch/amd64/amd64/copy.S:1.18 Wed Jul 7 01:13:29 2010 +++ src/sys/arch/amd64/amd64/copy.S Sat Nov 21 12:34:48 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: copy.S,v 1.18 2010/07/07 01:13:29 chs Exp $ */ +/* $NetBSD: copy.S,v 1.19 2015/11/21 12:34:48 maxv Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -359,19 +359,6 @@ ENTRY(copystr) 7: ret -ENTRY(fuword) - DEFERRED_SWITCH_CHECK - movq $VM_MAXUSER_ADDRESS-4,%r11 - cmpq %r11,%rdi - ja _C_LABEL(fusuaddrfault) - GET_CURPCB(%rcx) - leaq _C_LABEL(fusufailure)(%rip),%r11 - movq %r11,PCB_ONFAULT(%rcx) - movl (%rdi),%eax - movq $0,PCB_ONFAULT(%rcx) - ret - DEFERRED_SWITCH_CALL - ENTRY(fusword) DEFERRED_SWITCH_CHECK movq $VM_MAXUSER_ADDRESS-2,%r11 @@ -411,22 +398,6 @@ ENTRY(fubyte) ret DEFERRED_SWITCH_CALL -ENTRY(suword) - DEFERRED_SWITCH_CHECK - movq $VM_MAXUSER_ADDRESS-4,%r11 - cmpq %r11,%rdi - ja _C_LABEL(fusuaddrfault) - - GET_CURPCB(%rcx) - leaq _C_LABEL(fusufailure)(%rip),%r11 - movq %r11,PCB_ONFAULT(%rcx) - - movq %rsi,(%rdi) - xorq %rax,%rax - movq %rax,PCB_ONFAULT(%rcx) - ret - DEFERRED_SWITCH_CALL - ENTRY(susword) DEFERRED_SWITCH_CHECK movq $VM_MAXUSER_ADDRESS-2,%r11
CVS commit: src/sys/arch/evbarm/tegra
Module Name:src
Committed By: jmcneill
Date: Sat Nov 21 12:22:26 UTC 2015
Modified Files:
src/sys/arch/evbarm/tegra: tegra_machdep.c
Log Message:
Try to reboot with the PMIC if available, falling back to PMC.
When the PMIC watchdog is armed and we reboot via PMC, the watchdog stays
armed on the next boot (and we end up being reset mid-boot the second time).
By rebooting with PMIC, we can ensure that the watchdog is not armed after
reset.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/tegra/tegra_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/tegra/tegra_machdep.c
diff -u src/sys/arch/evbarm/tegra/tegra_machdep.c:1.32 src/sys/arch/evbarm/tegra/tegra_machdep.c:1.33
--- src/sys/arch/evbarm/tegra/tegra_machdep.c:1.32 Fri Nov 20 16:44:23 2015
+++ src/sys/arch/evbarm/tegra/tegra_machdep.c Sat Nov 21 12:22:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_machdep.c,v 1.32 2015/11/20 16:44:23 jakllsch Exp $ */
+/* $NetBSD: tegra_machdep.c,v 1.33 2015/11/21 12:22:25 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.32 2015/11/20 16:44:23 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_machdep.c,v 1.33 2015/11/21 12:22:25 jmcneill Exp $");
#include "opt_tegra.h"
#include "opt_machdep.h"
@@ -109,6 +109,7 @@ extern char KERNEL_BASE_phys[];
#define KERNEL_BASE_PHYS ((paddr_t)KERNEL_BASE_phys)
static void tegra_device_register(device_t, void *);
+static void tegra_reset(void);
static void tegra_powerdown(void);
bs_protos(bs_notimpl);
@@ -244,7 +245,7 @@ initarm(void *arg)
uboot_args[0], uboot_args[1], uboot_args[2], uboot_args[3]);
#endif
- cpu_reset_address = tegra_pmc_reset;
+ cpu_reset_address = tegra_reset;
cpu_powerdown_address = tegra_powerdown;
/* Talk to the user */
@@ -524,6 +525,22 @@ tegra_device_register(device_t self, voi
}
static void
+tegra_reset(void)
+{
+#if NAS3722PMIC > 0
+ device_t pmic = device_find_by_driver_unit("as3722pmic", 0);
+ if (pmic != NULL) {
+ delay(100);
+ if (as3722_reboot(pmic) != 0) {
+ printf("WARNING: AS3722 reset failed\n");
+ return;
+ }
+ }
+#endif
+ tegra_pmc_reset();
+}
+
+static void
tegra_powerdown(void)
{
#if NAS3722PMIC > 0
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: jmcneill
Date: Sat Nov 21 12:19:47 UTC 2015
Modified Files:
src/sys/dev/i2c: as3722.c as3722.h
Log Message:
expose pmic reset functionality
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/as3722.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/as3722.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/i2c/as3722.c
diff -u src/sys/dev/i2c/as3722.c:1.2 src/sys/dev/i2c/as3722.c:1.3
--- src/sys/dev/i2c/as3722.c:1.2 Sat Nov 21 10:56:40 2015
+++ src/sys/dev/i2c/as3722.c Sat Nov 21 12:19:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: as3722.c,v 1.2 2015/11/21 10:56:40 jmcneill Exp $ */
+/* $NetBSD: as3722.c,v 1.3 2015/11/21 12:19:47 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.2 2015/11/21 10:56:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.3 2015/11/21 12:19:47 jmcneill Exp $");
#include
#include
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1
#define AS3722_RESET_CTRL_REG 0x36
#define AS3722_RESET_CTRL_POWER_OFF __BIT(1)
+#define AS3722_RESET_CTRL_FORCE_RESET __BIT(0)
#define AS3722_WATCHDOG_CTRL_REG 0x38
#define AS3722_WATCHDOG_CTRL_MODE __BITS(2,1)
@@ -251,3 +252,19 @@ as3722_poweroff(device_t dev)
return error;
}
+
+int
+as3722_reboot(device_t dev)
+{
+ struct as3722_softc * const sc = device_private(dev);
+ int error;
+
+ const int flags = I2C_F_POLL;
+
+ iic_acquire_bus(sc->sc_i2c, flags);
+ error = as3722_write(sc, AS3722_RESET_CTRL_REG,
+ AS3722_RESET_CTRL_FORCE_RESET, flags);
+ iic_release_bus(sc->sc_i2c, flags);
+
+ return error;
+}
Index: src/sys/dev/i2c/as3722.h
diff -u src/sys/dev/i2c/as3722.h:1.1 src/sys/dev/i2c/as3722.h:1.2
--- src/sys/dev/i2c/as3722.h:1.1 Wed Nov 11 12:35:22 2015
+++ src/sys/dev/i2c/as3722.h Sat Nov 21 12:19:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: as3722.h,v 1.1 2015/11/11 12:35:22 jmcneill Exp $ */
+/* $NetBSD: as3722.h,v 1.2 2015/11/21 12:19:47 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -30,5 +30,6 @@
#define _DEV_I2C_AS3722_H
int as3722_poweroff(device_t);
+int as3722_reboot(device_t);
#endif /* !_DEV_I2C_AS3722_H */
CVS commit: src/etc
Module Name:src
Committed By: pgoyette
Date: Sat Nov 21 12:11:56 UTC 2015
Modified Files:
src/etc: MAKEDEV.tmpl
Log Message:
Add the filemon(4) device.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/etc/MAKEDEV.tmpl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.176 src/etc/MAKEDEV.tmpl:1.177
--- src/etc/MAKEDEV.tmpl:1.176 Sun Nov 8 23:23:30 2015
+++ src/etc/MAKEDEV.tmpl Sat Nov 21 12:11:56 2015
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.176 2015/11/08 23:23:30 joerg Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.177 2015/11/21 12:11:56 pgoyette Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -818,6 +818,7 @@ all)
makedev dk8 dk9 dk10 dk11 dk12 dk13 dk14 dk15
makedev ccd0 ccd1 ccd2 ccd3
makedev cgd0 cgd1 cgd2 cgd3
+ makedev filemon
makedev fss0 fss1 fss2 fss3
makedev md0 md1
makedev raid0 raid1 raid2 raid3 raid4 raid5 raid6 raid7
@@ -2164,6 +2165,10 @@ dtrace)
mkdev dtrace/dtrace c %dtrace_chr% 0 600
;;
+filemon)
+ mkdev filemon c %filemon_chr% 0 666
+ ;;
+
fw[0-9]*)
unit=${i#fw}
for j in 0 1 2 3
CVS commit: src/sys/arch
Module Name:src
Committed By: jmcneill
Date: Sat Nov 21 12:09:39 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: files.tegra soc_tegra124.c tegra_car.c
tegra_cpufreq.c tegra_io.c tegra_reg.h tegra_var.h
src/sys/arch/evbarm/conf: JETSONTK1 NYAN-BIG
Added Files:
src/sys/arch/arm/nvidia: tegra_fuse.c
Log Message:
Add FUSE driver, use it to determine maximum CPU frequency for the board.
Retire CPUFREQ_BOOT option and always use highest available CPU frequency.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/nvidia/files.tegra
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/soc_tegra124.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/nvidia/tegra_car.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_cpufreq.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/nvidia/tegra_fuse.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/nvidia/tegra_io.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra_reg.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/nvidia/tegra_var.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/JETSONTK1
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/NYAN-BIG
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.22 src/sys/arch/arm/nvidia/files.tegra:1.23
--- src/sys/arch/arm/nvidia/files.tegra:1.22 Thu Nov 19 22:09:16 2015
+++ src/sys/arch/arm/nvidia/files.tegra Sat Nov 21 12:09:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.tegra,v 1.22 2015/11/19 22:09:16 jmcneill Exp $
+# $NetBSD: files.tegra,v 1.23 2015/11/21 12:09:39 jmcneill Exp $
#
# Configuration info for NVIDIA Tegra ARM Peripherals
#
@@ -32,6 +32,11 @@ device tegrapmc
attach tegrapmc at tegraio with tegra_pmc
file arch/arm/nvidia/tegra_pmc.c tegra_pmc
+# eFUSE
+device tegrafuse
+attach tegrafuse at tegraio with tegra_fuse
+file arch/arm/nvidia/tegra_fuse.c tegra_fuse
+
# Clock and Reset controller
device tegracar
attach tegracar at tegraio with tegra_car
@@ -135,9 +140,6 @@ defparam opt_tegra.h CONMODE
# Memory parameters
defparam opt_tegra.h MEMSIZE
-# CPU parameters
-defparam opt_tegra.h CPUFREQ_BOOT
-
# SOC parameters
defflag opt_tegra.h SOC_TEGRAK1
defflag opt_tegra.h SOC_TEGRA124: SOC_TEGRAK1
Index: src/sys/arch/arm/nvidia/soc_tegra124.c
diff -u src/sys/arch/arm/nvidia/soc_tegra124.c:1.8 src/sys/arch/arm/nvidia/soc_tegra124.c:1.9
--- src/sys/arch/arm/nvidia/soc_tegra124.c:1.8 Thu Nov 12 10:31:29 2015
+++ src/sys/arch/arm/nvidia/soc_tegra124.c Sat Nov 21 12:09:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: soc_tegra124.c,v 1.8 2015/11/12 10:31:29 jmcneill Exp $ */
+/* $NetBSD: soc_tegra124.c,v 1.9 2015/11/21 12:09:39 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -30,7 +30,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.8 2015/11/12 10:31:29 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.9 2015/11/21 12:09:39 jmcneill Exp $");
#include
#include
@@ -47,6 +47,22 @@ __KERNEL_RCSID(0, "$NetBSD: soc_tegra124
#define EVP_RESET_VECTOR_0_REG 0x100
+#define FUSE_SKU_INFO_REG 0x110
+#define FUSE_CPU_SPEEDO_0_REG 0x114
+#define FUSE_CPU_IDDQ_REG 0x118
+#define FUSE_FT_REV_REG 0x128
+#define FUSE_CPU_SPEEDO_1_REG 0x12c
+#define FUSE_CPU_SPEEDO_2_REG 0x130
+#define FUSE_SOC_SPEEDO_0_REG 0x134
+#define FUSE_SOC_SPEEDO_1_REG 0x138
+#define FUSE_SOC_SPEEDO_2_REG 0x13c
+#define FUSE_SOC_IDDQ_REG 0x140
+#define FUSE_GPU_IDDQ_REG 0x228
+
+static void tegra124_speedo_init(void);
+static int tegra124_speedo_init_ids(uint32_t);
+static bool tegra124_speedo_rate_ok(u_int);
+
static u_int tegra124_cpufreq_set_rate(u_int);
static u_int tegra124_cpufreq_get_rate(void);
static size_t tegra124_cpufreq_get_available(u_int *, size_t);
@@ -74,6 +90,23 @@ static struct tegra124_cpufreq_rate {
{ 696, 1, 58, 0 }
};
+static const u_int tegra124_cpufreq_max[] = {
+ 2014,
+ 2320,
+ 2116,
+ 2524
+};
+
+static struct tegra124_speedo {
+ u_int cpu_speedo_id;
+ u_int soc_speedo_id;
+ u_int gpu_speedo_id;
+} tegra124_speedo = {
+ .cpu_speedo_id = 0,
+ .soc_speedo_id = 0,
+ .gpu_speedo_id = 0
+};
+
void
tegra124_cpuinit(void)
{
@@ -85,15 +118,85 @@ tegra124_cpuinit(void)
tegra_i2c_dvc_write(0x40, (sd0_vsel << 8) | 00, 2);
delay(1);
+ tegra124_speedo_init();
+
tegra_cpufreq_register(&tegra124_cpufreq_func);
}
+static void
+tegra124_speedo_init(void)
+{
+ uint32_t sku_id;
+
+ sku_id = tegra_fuse_read(FUSE_SKU_INFO_REG);
+ tegra124_speedo_init_ids(sku_id);
+}
+
+static int
+tegra124_speedo_init_ids(uint32_t sku_id)
+{
+ int threshold = 0;
+
+ switch (sku_id) {
+ case 0x00:
+ case 0x0f:
+ case 0x23:
+ break; /* use default */
+ case 0x83:
+ tegra124_speedo.cpu_speedo_id = 2;
+ break;
+ case 0x1f:
+ case 0x87:
+ case 0x27:
+ tegra124_speedo.cpu_speedo_id = 2;
+ tegra124_speedo.so
CVS commit: src/external/mit/xorg/lib/libX11
Module Name:src
Committed By: tsutsui
Date: Sat Nov 21 11:15:31 UTC 2015
Modified Files:
src/external/mit/xorg/lib/libX11: Makefile.libx11
Log Message:
Disable UIThrStubs.c, which is unnecessary on NetBSD.
This fixes xterm startup failure on NetBSD/m68k 7.0.
See PR/50386 for details.
Should be pulled up to netbsd-7 and netbsd-7-0.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/lib/libX11/Makefile.libx11
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.16 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.17
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.16 Tue Nov 3 10:26:06 2015
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11 Sat Nov 21 11:15:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libx11,v 1.16 2015/11/03 10:26:06 szptvlfn Exp $
+# $NetBSD: Makefile.libx11,v 1.17 2015/11/21 11:15:31 tsutsui Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@@ -265,8 +265,9 @@ SRCS= \
XlibInt.c \
Xrm.c
-SRCS+= \
- UIThrStubs.c
+# We have own pthread stubs in src/lib/libc/thread-stub. See PR/50386.
+#SRCS+= \
+# UIThrStubs.c
SRCS+= \
AddDIC.c \
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: jmcneill
Date: Sat Nov 21 10:57:32 UTC 2015
Modified Files:
src/sys/dev/i2c: files.i2c
Log Message:
add sysmon_wdog dependency to as3722pmic
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/i2c/files.i2c
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/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.67 src/sys/dev/i2c/files.i2c:1.68
--- src/sys/dev/i2c/files.i2c:1.67 Wed Nov 11 12:35:22 2015
+++ src/sys/dev/i2c/files.i2c Sat Nov 21 10:57:32 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.i2c,v 1.67 2015/11/11 12:35:22 jmcneill Exp $
+# $NetBSD: files.i2c,v 1.68 2015/11/21 10:57:32 jmcneill Exp $
obsolete defflag opt_i2cbus.h I2C_SCAN
define i2cbus { }
@@ -252,6 +252,6 @@ attach titemp at iic
file dev/i2c/titemp.c titemp
# AMS AS3722 Power Management IC
-device as3722pmic
+device as3722pmic: sysmon_wdog
attach as3722pmic at iic
file dev/i2c/as3722.c as3722pmic needs-flag
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: jmcneill
Date: Sat Nov 21 10:56:40 UTC 2015
Modified Files:
src/sys/dev/i2c: as3722.c
Log Message:
add watchdog support
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/as3722.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/i2c/as3722.c
diff -u src/sys/dev/i2c/as3722.c:1.1 src/sys/dev/i2c/as3722.c:1.2
--- src/sys/dev/i2c/as3722.c:1.1 Wed Nov 11 12:35:22 2015
+++ src/sys/dev/i2c/as3722.c Sat Nov 21 10:56:40 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: as3722.c,v 1.1 2015/11/11 12:35:22 jmcneill Exp $ */
+/* $NetBSD: as3722.c,v 1.2 2015/11/21 10:56:40 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.1 2015/11/11 12:35:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1.2 2015/11/21 10:56:40 jmcneill Exp $");
#include
#include
@@ -36,13 +36,35 @@ __KERNEL_RCSID(0, "$NetBSD: as3722.c,v 1
#include
#include
#include
+#include
+
+#include
#include
#include
+#define AS3722_GPIO0_CTRL_REG 0x08
+#define AS3722_GPIO0_CTRL_INVERT __BIT(7)
+#define AS3722_GPIO0_CTRL_IOSF __BITS(6,3)
+#define AS3722_GPIO0_CTRL_IOSF_GPIO 0
+#define AS3722_GPIO0_CTRL_IOSF_WATCHDOG 9
+#define AS3722_GPIO0_CTRL_MODE __BITS(2,0)
+#define AS3722_GPIO0_CTRL_MODE_PULLDOWN 5
+
#define AS3722_RESET_CTRL_REG 0x36
#define AS3722_RESET_CTRL_POWER_OFF __BIT(1)
+#define AS3722_WATCHDOG_CTRL_REG 0x38
+#define AS3722_WATCHDOG_CTRL_MODE __BITS(2,1)
+#define AS3722_WATCHDOG_CTRL_ON __BIT(0)
+
+#define AS3722_WATCHDOG_TIMER_REG 0x46
+#define AS3722_WATCHDOG_TIMER_TIMER __BITS(6,0)
+
+#define AS3722_WATCHDOG_SIGNAL_REG 0x48
+#define AS3722_WATCHDOG_SIGNAL_PWM_DIV __BITS(7,6)
+#define AS3722_WATCHDOG_SIGNAL_SW_SIG __BIT(0)
+
#define AS3722_ASIC_ID1_REG 0x90
#define AS3722_ASIC_ID2_REG 0x91
@@ -50,15 +72,22 @@ struct as3722_softc {
device_t sc_dev;
i2c_tag_t sc_i2c;
i2c_addr_t sc_addr;
+
+ struct sysmon_wdog sc_smw;
};
+#define AS3722_WATCHDOG_DEFAULT_PERIOD 10
+
static int as3722_match(device_t, cfdata_t, void *);
static void as3722_attach(device_t, device_t, void *);
-#if 0
+static int as3722_wdt_setmode(struct sysmon_wdog *);
+static int as3722_wdt_tickle(struct sysmon_wdog *);
+
static int as3722_read(struct as3722_softc *, uint8_t, uint8_t *, int);
-#endif
static int as3722_write(struct as3722_softc *, uint8_t, uint8_t, int);
+static int as3722_set_clear(struct as3722_softc *, uint8_t, uint8_t,
+ uint8_t, int);
CFATTACH_DECL_NEW(as3722pmic, sizeof(struct as3722_softc),
as3722_match, as3722_attach, NULL, NULL);
@@ -87,6 +116,7 @@ as3722_attach(device_t parent, device_t
{
struct as3722_softc * const sc = device_private(self);
struct i2c_attach_args *ia = aux;
+ int error;
sc->sc_dev = self;
sc->sc_i2c = ia->ia_tag;
@@ -94,16 +124,40 @@ as3722_attach(device_t parent, device_t
aprint_naive("\n");
aprint_normal(": AMS AS3822\n");
+
+ iic_acquire_bus(sc->sc_i2c, I2C_F_POLL);
+ error = as3722_write(sc, AS3722_GPIO0_CTRL_REG,
+ __SHIFTIN(AS3722_GPIO0_CTRL_IOSF_GPIO,
+ AS3722_GPIO0_CTRL_IOSF) |
+ __SHIFTIN(AS3722_GPIO0_CTRL_MODE_PULLDOWN,
+ AS3722_GPIO0_CTRL_MODE),
+ I2C_F_POLL);
+ error += as3722_set_clear(sc, AS3722_WATCHDOG_CTRL_REG,
+ __SHIFTIN(1, AS3722_WATCHDOG_CTRL_MODE), 0, I2C_F_POLL);
+ iic_release_bus(sc->sc_i2c, I2C_F_POLL);
+
+ if (error)
+ aprint_error_dev(self, "couldn't setup watchdog\n");
+
+ sc->sc_smw.smw_name = device_xname(self);
+ sc->sc_smw.smw_cookie = sc;
+ sc->sc_smw.smw_setmode = as3722_wdt_setmode;
+ sc->sc_smw.smw_tickle = as3722_wdt_tickle;
+ sc->sc_smw.smw_period = AS3722_WATCHDOG_DEFAULT_PERIOD;
+
+ aprint_normal_dev(self, "default watchdog period is %u seconds\n",
+ sc->sc_smw.smw_period);
+
+ if (sysmon_wdog_register(&sc->sc_smw) != 0)
+ aprint_error_dev(self, "couldn't register with sysmon\n");
}
-#if 0
static int
as3722_read(struct as3722_softc *sc, uint8_t reg, uint8_t *val, int flags)
{
return iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_addr,
®, 1, val, 1, flags);
}
-#endif
static int
as3722_write(struct as3722_softc *sc, uint8_t reg, uint8_t val, int flags)
@@ -113,6 +167,75 @@ as3722_write(struct as3722_softc *sc, ui
NULL, 0, buf, 2, flags);
}
+static int
+as3722_set_clear(struct as3722_softc *sc, uint8_t reg, uint8_t set,
+uint8_t clr, int flags)
+{
+ uint8_t old, new;
+ int error;
+
+ error = as3722_read(sc, reg, &old, flags);
+ if (error) {
+ return error;
+ }
+ new = set | (old & ~clr);
+
+ return as3722_write(sc, reg, new, flags);
+}
+
+static int
+as3722_wdt_setmode(struct sysmon_wdog *smw)
+{
+ struct as3722_softc * const sc = smw->smw_cookie;
+ int error;
+
+ const int flags = (cold ? I2C_F_POLL : 0);
+
+ if ((smw->smw_mode & WDOG_MODE_MASK) == WDOG_MODE_DISARMED) {
+ iic_acquire_b
CVS commit: src/sys/sys
Module Name:src
Committed By: mlelstv
Date: Sat Nov 21 09:06:03 UTC 2015
Modified Files:
src/sys/sys: gpio.h
Log Message:
Provide additional flags to control alternate functions
and interrupts.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/sys/gpio.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/gpio.h
diff -u src/sys/sys/gpio.h:1.14 src/sys/sys/gpio.h:1.15
--- src/sys/sys/gpio.h:1.14 Sun Sep 6 06:01:02 2015
+++ src/sys/sys/gpio.h Sat Nov 21 09:06:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.h,v 1.14 2015/09/06 06:01:02 dholland Exp $ */
+/* $NetBSD: gpio.h,v 1.15 2015/11/21 09:06:03 mlelstv Exp $ */
/* $OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $ */
/*
* Copyright (c) 2009, 2011 Marc Balmer
@@ -31,19 +31,30 @@
#define GPIOMAXNAME 64
/* GPIO pin configuration flags */
-#define GPIO_PIN_INPUT 0x0001 /* input direction */
-#define GPIO_PIN_OUTPUT 0x0002 /* output direction */
-#define GPIO_PIN_INOUT 0x0004 /* bi-directional */
-#define GPIO_PIN_OPENDRAIN 0x0008 /* open-drain output */
-#define GPIO_PIN_PUSHPULL 0x0010 /* push-pull output */
-#define GPIO_PIN_TRISTATE 0x0020 /* output disabled */
-#define GPIO_PIN_PULLUP 0x0040 /* internal pull-up enabled */
-#define GPIO_PIN_PULLDOWN 0x0080 /* internal pull-down enabled */
-#define GPIO_PIN_INVIN 0x0100 /* invert input */
-#define GPIO_PIN_INVOUT 0x0200 /* invert output */
-#define GPIO_PIN_USER 0x0400 /* user != 0 can access */
-#define GPIO_PIN_PULSATE 0x0800 /* pulsate in hardware */
-#define GPIO_PIN_SET 0x8000 /* set for securelevel access */
+#define GPIO_PIN_INPUT 0x0001 /* input direction */
+#define GPIO_PIN_OUTPUT 0x0002 /* output direction */
+#define GPIO_PIN_INOUT 0x0004 /* bi-directional */
+#define GPIO_PIN_OPENDRAIN 0x0008 /* open-drain output */
+#define GPIO_PIN_PUSHPULL 0x0010 /* push-pull output */
+#define GPIO_PIN_TRISTATE 0x0020 /* output disabled */
+#define GPIO_PIN_PULLUP 0x0040 /* internal pull-up enabled */
+#define GPIO_PIN_PULLDOWN 0x0080 /* internal pull-down enabled */
+#define GPIO_PIN_INVIN 0x0100 /* invert input */
+#define GPIO_PIN_INVOUT 0x0200 /* invert output */
+#define GPIO_PIN_USER 0x0400 /* user != 0 can access */
+#define GPIO_PIN_PULSATE 0x0800 /* pulsate in hardware */
+#define GPIO_PIN_SET 0x8000 /* set for securelevel access */
+#define GPIO_PIN_ALT0 0x0001 /* alternate function 0 */
+#define GPIO_PIN_ALT1 0x0002 /* alternate function 1 */
+#define GPIO_PIN_ALT2 0x0004 /* alternate function 2 */
+#define GPIO_PIN_ALT3 0x0008 /* alternate function 3 */
+#define GPIO_PIN_ALT4 0x0010 /* alternate function 4 */
+#define GPIO_PIN_ALT5 0x0020 /* alternate function 5 */
+#define GPIO_PIN_ALT6 0x0040 /* alternate function 6 */
+#define GPIO_PIN_ALT7 0x0080 /* alternate function 7 */
+#define GPIO_PIN_EVENTS 0x1000 /* deliver events */
+#define GPIO_PIN_LEVEL 0x2000 /* interrupt on level/edge */
+#define GPIO_PIN_FALLING 0x4000 /* interrupt on falling/rising */
/* GPIO controller description */
struct gpio_info {
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sat Nov 21 09:02:31 UTC 2015 Modified Files: src/share/man/man4: bridge.4 Log Message: Add missing word. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/bridge.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/bridge.4 diff -u src/share/man/man4/bridge.4:1.10 src/share/man/man4/bridge.4:1.11 --- src/share/man/man4/bridge.4:1.10 Fri Nov 20 17:00:48 2015 +++ src/share/man/man4/bridge.4 Sat Nov 21 09:02:31 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: bridge.4,v 1.10 2015/11/20 17:00:48 christos Exp $ +.\" $NetBSD: bridge.4,v 1.11 2015/11/21 09:02:31 wiz Exp $ .\" .\" Copyright 2001 Wasabi Systems, Inc. .\" All rights reserved. @@ -96,7 +96,7 @@ as on the interface on which the packet .Pp The .Nm -will enable passing of VLAN tagged packets automatically if the underlying +driver will enable passing of VLAN tagged packets automatically if the underlying interfaces support it. This is to facilitate XEN network configurations with .Xr xennet 4 .
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Sat Nov 21 09:01:35 UTC 2015 Modified Files: src/share/man/man4: filemon.4 Log Message: Fix some typos. Use more markup. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/filemon.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/filemon.4 diff -u src/share/man/man4/filemon.4:1.12 src/share/man/man4/filemon.4:1.13 --- src/share/man/man4/filemon.4:1.12 Sat Nov 21 00:50:15 2015 +++ src/share/man/man4/filemon.4 Sat Nov 21 09:01:35 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: filemon.4,v 1.12 2015/11/21 00:50:15 pgoyette Exp $ +.\" $NetBSD: filemon.4,v 1.13 2015/11/21 09:01:35 wiz Exp $ .\" .\" Copyright (c) 2011, Juniper Networks, Inc. .\" @@ -34,8 +34,9 @@ .Sh DESCRIPTION In normal situations, .Nm -is not built-in to the kernel, and a call to open /dev/filemon will -auto-load the +is not built-in to the kernel, and a call to open +.Pa /dev/filemon +will auto-load the .Nm module (see .Xr module 7 @@ -212,8 +213,13 @@ The .Nm facility can only be used to track processes running in the system's native emulation. -Neither processes using any of the COMPAT_xxx compatability layers nor +Neither processes using any of the +.Dv COMPAT_xxx +compatibility layers nor any descendants of such processes can be tracked. .Pp -Additionally, the procces_id specified with FILEMON_SET_PID must refer to -a descendant of the calling process. +Additionally, the +.Ar process_id +specified with +.Dv FILEMON_SET_PID +must refer to a descendant of the calling process.
