CVS commit: src
Module Name:src Committed By: wiz Date: Mon Aug 29 08:58:19 UTC 2011 Modified Files: src/external/bsd/mdocml/dist: lib.in src/gnu/usr.bin/groff/tmac: mdoc.local Log Message: Add libppath. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/mdocml/dist/lib.in cvs rdiff -u -r1.64 -r1.65 src/gnu/usr.bin/groff/tmac/mdoc.local 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.3 src/external/bsd/mdocml/dist/lib.in:1.4 --- src/external/bsd/mdocml/dist/lib.in:1.3 Fri Feb 11 23:47:49 2011 +++ src/external/bsd/mdocml/dist/lib.in Mon Aug 29 08:58:18 2011 @@ -71,6 +71,7 @@ LINE(libpci, PCI Bus Access Library (libpci, \\-lpci)) LINE(libpmc, Performance Counters Library (libpmc, \\-lpmc)) LINE(libposix, POSIX Compatibility Library (libposix, \\-lposix)) +LINE(libppath, Property-List Paths Library (libppath, \\-lppath)) LINE(libprop, Property Container Object Library (libprop, \\-lprop)) LINE(libpthread, POSIX Threads Library (libpthread, \\-lpthread)) LINE(libpuffs, puffs Convenience Library (libpuffs, \\-lpuffs)) Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.64 src/gnu/usr.bin/groff/tmac/mdoc.local:1.65 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.64 Sat May 21 17:15:46 2011 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Mon Aug 29 08:58:18 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.64 2011/05/21 17:15:46 wiz Exp $ +.\ $NetBSD: mdoc.local,v 1.65 2011/08/29 08:58:18 wiz Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -90,6 +90,7 @@ .ds doc-str-Lb-libisns Internet Storage Name Service Library (libisns, \-lisns) .ds doc-str-Lb-libnetpgpNetpgp signing, verification, encryption and decryption (libnetpgp, \-lnetpgp) .ds doc-str-Lb-libperfuse PUFFS enabled relay to FUSE Library (libperfuse, \-lperfuse) +.ds doc-str-Lb-libppath Property-List Paths Library (libppath, \-lppath) .ds doc-str-Lb-libprop Property Container Object Library (libprop, \-lprop) .ds doc-str-Lb-libpuffs puffs Convenience Library (libpuffs, \-lpuffs) .ds doc-str-Lb-librefuseFile System in Userspace Convenience Library (librefuse, \-lrefuse)
CVS commit: src/sys
Module Name:src
Committed By: jmcneill
Date: Mon Aug 29 09:50:04 UTC 2011
Modified Files:
src/sys/dist/pf/net: pf.c pf_ioctl.c pf_norm.c
src/sys/modules/pf: Makefile
src/sys/net: files.pf
Log Message:
build pf module with WARNS=3, and remove the need for -Wno-shadow
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dist/pf/net/pf.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dist/pf/net/pf_ioctl.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dist/pf/net/pf_norm.c
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/pf/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/net/files.pf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dist/pf/net/pf.c
diff -u src/sys/dist/pf/net/pf.c:1.65 src/sys/dist/pf/net/pf.c:1.66
--- src/sys/dist/pf/net/pf.c:1.65 Tue May 3 18:28:45 2011
+++ src/sys/dist/pf/net/pf.c Mon Aug 29 09:50:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pf.c,v 1.65 2011/05/03 18:28:45 dyoung Exp $ */
+/* $NetBSD: pf.c,v 1.66 2011/08/29 09:50:04 jmcneill Exp $ */
/* $OpenBSD: pf.c,v 1.552.2.1 2007/11/27 16:37:57 henning Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pf.c,v 1.65 2011/05/03 18:28:45 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: pf.c,v 1.66 2011/08/29 09:50:04 jmcneill Exp $);
#include pflog.h
@@ -3436,14 +3436,14 @@
(r-rule_flag PFRULE_RETURN))
!(th-th_flags TH_RST)) {
u_int32_t ack = ntohl(th-th_seq) + pd-p_len;
- struct ip *h = mtod(m, struct ip *);
+ struct ip *hip = mtod(m, struct ip *);
#ifdef __NetBSD__
if (pf_check_proto_cksum(m, direction, off,
- ntohs(h-ip_len) - off, IPPROTO_TCP, AF_INET))
+ ntohs(hip-ip_len) - off, IPPROTO_TCP, AF_INET))
#else
if (pf_check_proto_cksum(m, off,
- ntohs(h-ip_len) - off, IPPROTO_TCP, AF_INET))
+ ntohs(hip-ip_len) - off, IPPROTO_TCP, AF_INET))
#endif /* !__NetBSD__ */
REASON_SET(reason, PFRES_PROTCKSUM);
else {
@@ -3877,14 +3877,14 @@
(*state)-src.state = PF_TCPS_PROXY_DST;
}
if ((*state)-src.state == PF_TCPS_PROXY_DST) {
- struct pf_state_host *src, *dst;
+ struct pf_state_host *psrc, *pdst;
if (direction == PF_OUT) {
- src = (*state)-state_key-gwy;
- dst = (*state)-state_key-ext;
+ psrc = (*state)-state_key-gwy;
+ pdst = (*state)-state_key-ext;
} else {
- src = (*state)-state_key-ext;
- dst = (*state)-state_key-lan;
+ psrc = (*state)-state_key-ext;
+ pdst = (*state)-state_key-lan;
}
if (direction == (*state)-state_key-direction) {
if (((th-th_flags (TH_SYN|TH_ACK)) != TH_ACK) ||
@@ -3896,8 +3896,8 @@
(*state)-src.max_win = MAX(ntohs(th-th_win), 1);
if ((*state)-dst.seqhi == 1)
(*state)-dst.seqhi = htonl(arc4random());
- pf_send_tcp((*state)-rule.ptr, pd-af, src-addr,
- dst-addr, src-port, dst-port,
+ pf_send_tcp((*state)-rule.ptr, pd-af, psrc-addr,
+ pdst-addr, psrc-port, pdst-port,
(*state)-dst.seqhi, 0, TH_SYN, 0,
(*state)-src.mss, 0, 0, (*state)-tag, NULL, NULL);
REASON_SET(reason, PFRES_SYNPROXY);
@@ -3915,8 +3915,8 @@
ntohl(th-th_ack), ntohl(th-th_seq) + 1,
TH_ACK, (*state)-src.max_win, 0, 0, 0,
(*state)-tag, NULL, NULL);
- pf_send_tcp((*state)-rule.ptr, pd-af, src-addr,
- dst-addr, src-port, dst-port,
+ pf_send_tcp((*state)-rule.ptr, pd-af, psrc-addr,
+ pdst-addr, psrc-port, pdst-port,
(*state)-src.seqhi + 1, (*state)-src.seqlo + 1,
TH_ACK, (*state)-dst.max_win, 0, 0, 1,
0, NULL, NULL);
Index: src/sys/dist/pf/net/pf_ioctl.c
diff -u src/sys/dist/pf/net/pf_ioctl.c:1.43 src/sys/dist/pf/net/pf_ioctl.c:1.44
--- src/sys/dist/pf/net/pf_ioctl.c:1.43 Wed Jan 19 19:58:02 2011
+++ src/sys/dist/pf/net/pf_ioctl.c Mon Aug 29 09:50:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_ioctl.c,v 1.43 2011/01/19 19:58:02 drochner Exp $ */
+/* $NetBSD: pf_ioctl.c,v 1.44 2011/08/29 09:50:04 jmcneill Exp $ */
/* $OpenBSD: pf_ioctl.c,v 1.182 2007/06/24 11:17:13 mcbride Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pf_ioctl.c,v 1.43 2011/01/19 19:58:02 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: pf_ioctl.c,v 1.44 2011/08/29 09:50:04 jmcneill Exp $);
#ifdef _KERNEL_OPT
#include opt_inet.h
@@ -1370,7 +1370,6 @@
struct pfioc_rule *pr = (struct pfioc_rule *)addr;
struct pf_ruleset *ruleset;
struct pf_rule *rule, *tail;
- struct pf_pooladdr *pa;
int rs_num;
pr-anchor[sizeof(pr-anchor) - 1] = 0;
@@ -1830,20 +1829,20 @@
}
case DIOCCLRSTATES: {
- struct pf_state *s, *nexts;
+ struct pf_state *ps, *nexts;
struct pfioc_state_kill *psk = (struct pfioc_state_kill *)addr;
int killed = 0;
- for (s = RB_MIN(pf_state_tree_id, tree_id); s; s = nexts) {
- nexts = RB_NEXT(pf_state_tree_id, tree_id, s);
+ for (ps = RB_MIN(pf_state_tree_id, tree_id); ps; ps = nexts) {
+ nexts = RB_NEXT(pf_state_tree_id, tree_id,
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Mon Aug 29 10:41:10 UTC 2011 Modified Files: src/share/man/man4: dtv.4 Log Message: Various improvements; e.g. primarily speak about DTV (i.e. DVB is just a standard), split out SUPPORTED DEVICES from SEE ALSO, improve grammar, fix references, speak about interface instead of device, fix AUTHORS, etc. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/dtv.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/dtv.4 diff -u src/share/man/man4/dtv.4:1.2 src/share/man/man4/dtv.4:1.3 --- src/share/man/man4/dtv.4:1.2 Sun Aug 14 20:42:09 2011 +++ src/share/man/man4/dtv.4 Mon Aug 29 10:41:10 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: dtv.4,v 1.2 2011/08/14 20:42:09 wiz Exp $ +.\ $NetBSD: dtv.4,v 1.3 2011/08/29 10:41:10 jruoho Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -32,7 +32,7 @@ .Os .Sh NAME .Nm dtv -.Nd DVB (digital video broadcasting) programming interface +.Nd interface for digital television .Sh SYNOPSIS .Cd dtv* at dtvbus? .Pp @@ -40,38 +40,63 @@ .In dev/dtv/dtvio_demux.h .In dev/dtv/dtvio_frontend.h .Sh DESCRIPTION -The +The machine-independent +.Nm +interface provides support for digital television +.Pq Dv DTV . +A subset of the Linux Digital Video Broadcasting +.Pq Dv DVB +.Dv APIs +is supported. +In particular, .Nm -driver provides support for a subset of the Linux DVB (digital -video broadcasting) APIs; in particular, +provides the DVB frontend and demodulator +.Dv APIs . +.Sh SUPPORTED DEVICES +The following machine-independent devices are supported: +.Bl -tag -width auvitek(4) -offset indent +.It Xr auvitek 4 +Auvitek AU0828-based video capture cards +.It Xr coram 4 +Hauppauge WinTV-HVR-1250 +.It Xr xdtv 4 +Conexant CX2388X-based DTV cards +.It Xr emdtv 4 +EM28XX-based DTV cards +.El +.Pp +Note that the .Nm -provides the DVB Frontend API and the DVB Demux Device. +device drivers are generally only available as kernel modules; see +.Xr module 7 +and +.Xr modload 8 +for additional details. .Sh FILES .Bl -tag -width 28n .It Pa /dev/dvb/adapterN/frontend0 The frontend device, for controlling the tuner and demodulator hardware. .It Pa /dev/dvb/adapterN/demux0 -The demux device, for controlling the DVB hardware's filters. +The demux device, for controlling the hardware filters. .It Pa /dev/dvb/adapterN/dvr0 -Digital video recording device +Digital video recording device. .El .Sh SEE ALSO -.Xr auvitek 4 , -.Xr coram 4 , -.Xr cxdtv 4 , -.Xr emdtv 4 , +.Xr video 9 +.Pp .Pa pkgsrc/multimedia/dvb-apps , .Pa pkgsrc/multimedia/mplayer , -.Pa http://linuxtv.org/downloads/v4l-dvb-apis/dvbapi.html +.Rs +.%T Linux Media Infrastructure API. +.%T Part II. Linux DVB API +.%D 2011 +.%U http://linuxtv.org/downloads/v4l-dvb-apis/dvbapi.html +.Re .Sh HISTORY The .Nm -device driver first appeared in +interface first appeared in .Nx 6.0 . .Sh AUTHORS -.An -nosplit -The -.Nm -driver was written by .An Jared D. McNeill -.Aq jmcne...@netbsd.org . +.Aq jmcne...@invisible.ca
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Mon Aug 29 10:43:52 UTC 2011 Modified Files: src/share/man/man4: dtv.4 Log Message: Fix xref-typo in the previous. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/dtv.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/dtv.4 diff -u src/share/man/man4/dtv.4:1.3 src/share/man/man4/dtv.4:1.4 --- src/share/man/man4/dtv.4:1.3 Mon Aug 29 10:41:10 2011 +++ src/share/man/man4/dtv.4 Mon Aug 29 10:43:52 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: dtv.4,v 1.3 2011/08/29 10:41:10 jruoho Exp $ +.\ $NetBSD: dtv.4,v 1.4 2011/08/29 10:43:52 jruoho Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -59,7 +59,7 @@ Auvitek AU0828-based video capture cards .It Xr coram 4 Hauppauge WinTV-HVR-1250 -.It Xr xdtv 4 +.It Xr cxdtv 4 Conexant CX2388X-based DTV cards .It Xr emdtv 4 EM28XX-based DTV cards
CVS commit: src
Module Name:src Committed By: jruoho Date: Mon Aug 29 10:48:57 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile dtv.4 Log Message: Install the dtv(4) manual page. (The stub man-pages are commented out ATM.) To generate a diff of this commit: cvs rdiff -u -r1.1333 -r1.1334 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.565 -r1.566 src/share/man/man4/Makefile cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/dtv.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1333 src/distrib/sets/lists/man/mi:1.1334 --- src/distrib/sets/lists/man/mi:1.1333 Sun Aug 14 16:11:15 2011 +++ src/distrib/sets/lists/man/mi Mon Aug 29 10:48:57 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1333 2011/08/14 16:11:15 wiz Exp $ +# $NetBSD: mi,v 1.1334 2011/08/29 10:48:57 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -922,6 +922,7 @@ ./usr/share/man/cat4/drm.0 man-sys-catman .cat ./usr/share/man/cat4/drum.0 man-sys-catman .cat ./usr/share/man/cat4/dtide.0 man-sys-catman .cat +./usr/share/man/cat4/dtv.0 man-sys-catman .cat ./usr/share/man/cat4/dty.0 man-sys-catman .cat ./usr/share/man/cat4/ea.0 man-sys-catman .cat ./usr/share/man/cat4/eap.0 man-sys-catman .cat @@ -3730,6 +3731,7 @@ ./usr/share/man/html4/drm.html man-sys-htmlman html ./usr/share/man/html4/drum.html man-sys-htmlman html ./usr/share/man/html4/dtide.html man-sys-htmlman html +./usr/share/man/html4/dtv.html man-sys-htmlman html ./usr/share/man/html4/dty.html man-sys-htmlman html ./usr/share/man/html4/ea.html man-sys-htmlman html ./usr/share/man/html4/eap.html man-sys-htmlman html @@ -6313,6 +6315,7 @@ ./usr/share/man/man4/drm.4 man-sys-man .man ./usr/share/man/man4/drum.4 man-sys-man .man ./usr/share/man/man4/dtide.4 man-sys-man .man +./usr/share/man/man4/dtv.4 man-sys-man .man ./usr/share/man/man4/dty.4 man-sys-man .man ./usr/share/man/man4/ea.4 man-sys-man .man ./usr/share/man/man4/eap.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.565 src/share/man/man4/Makefile:1.566 --- src/share/man/man4/Makefile:1.565 Sun Aug 14 16:11:16 2011 +++ src/share/man/man4/Makefile Mon Aug 29 10:48:57 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.565 2011/08/14 16:11:16 wiz Exp $ +# $NetBSD: Makefile,v 1.566 2011/08/29 10:48:57 jruoho Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -21,7 +21,7 @@ clockctl.4 cltp.4 cmdide.4 cmpci.4 cms.4 cnw.4 \ com.4 crypto.4 cs80bus.4 cuda.4 cypide.4 \ ddb.4 ddc.4 de.4 dge.4 dk.4 dm.4 dmoverio.4 \ - dmphy.4 dpt.4 dpti.4 drm.4 drum.4 \ + dmphy.4 dpt.4 dpti.4 drm.4 drum.4 dtv.4 \ eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 esis.4 \ esa.4 esiop.4 esm.4 eso.4 et.4 etherip.4 etphy.4 exphy.4 \ fast_ipsec.4 fd.4 finsio.4 flash.4 fpa.4 fms.4 fss.4 fujbp.4 fxp.4 \ Index: src/share/man/man4/dtv.4 diff -u src/share/man/man4/dtv.4:1.4 src/share/man/man4/dtv.4:1.5 --- src/share/man/man4/dtv.4:1.4 Mon Aug 29 10:43:52 2011 +++ src/share/man/man4/dtv.4 Mon Aug 29 10:48:57 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: dtv.4,v 1.4 2011/08/29 10:43:52 jruoho Exp $ +.\ $NetBSD: dtv.4,v 1.5 2011/08/29 10:48:57 jruoho Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -57,12 +57,15 @@ .Bl -tag -width auvitek(4) -offset indent .It Xr auvitek 4 Auvitek AU0828-based video capture cards -.It Xr coram 4 -Hauppauge WinTV-HVR-1250 -.It Xr cxdtv 4 -Conexant CX2388X-based DTV cards -.It Xr emdtv 4 -EM28XX-based DTV cards +.\ +.\ XXX: Uncomment once the stub-pages are actually installed. +.\ +.\ .It Xr coram 4 +.\ Hauppauge WinTV-HVR-1250 +.\ .It Xr cxdtv 4 +.\ Conexant CX2388X-based DTV cards +.\ .It Xr emdtv 4 +.\ EM28XX-based DTV cards .El .Pp Note that the
CVS commit: othersrc/external/bsd/udevfsd
Module Name:othersrc
Committed By: jmcneill
Date: Mon Aug 29 10:59:58 UTC 2011
Modified Files:
othersrc/external/bsd/udevfsd: udevfsd.c
Log Message:
don't use WNOHANG flag with waitpid
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/udevfsd/udevfsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/udevfsd/udevfsd.c
diff -u othersrc/external/bsd/udevfsd/udevfsd.c:1.2 othersrc/external/bsd/udevfsd/udevfsd.c:1.3
--- othersrc/external/bsd/udevfsd/udevfsd.c:1.2 Wed Aug 3 00:06:00 2011
+++ othersrc/external/bsd/udevfsd/udevfsd.c Mon Aug 29 10:59:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: udevfsd.c,v 1.2 2011/08/03 00:06:00 jmcneill Exp $ */
+/* $NetBSD: udevfsd.c,v 1.3 2011/08/29 10:59:57 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -35,7 +35,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2011\
Jared D. McNeill jmcne...@invisible.ca. All rights reserved.);
-__RCSID($NetBSD: udevfsd.c,v 1.2 2011/08/03 00:06:00 jmcneill Exp $);
+__RCSID($NetBSD: udevfsd.c,v 1.3 2011/08/29 10:59:57 jmcneill Exp $);
#include sys/types.h
#include sys/ioctl.h
@@ -91,7 +91,7 @@
udevfsd_exec(udevfsd_script, event, device);
/* NOTREACHED */
default:
- if (waitpid(pid, status, WNOHANG) == -1) {
+ if (waitpid(pid, status, 0) == -1) {
syslog(LOG_ERR, waitpid(%d) failed: %m, pid);
break;
}
CVS commit: src/lib/libcurses
Module Name:src
Committed By: christos
Date: Mon Aug 29 11:07:38 UTC 2011
Modified Files:
src/lib/libcurses: tstp.c tty.c
Log Message:
Fix for systems that don't have TCSASOFT as intended originally. Simplify.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/lib/libcurses/tstp.c
cvs rdiff -u -r1.42 -r1.43 src/lib/libcurses/tty.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/libcurses/tstp.c
diff -u src/lib/libcurses/tstp.c:1.38 src/lib/libcurses/tstp.c:1.39
--- src/lib/libcurses/tstp.c:1.38 Wed Feb 3 10:34:40 2010
+++ src/lib/libcurses/tstp.c Mon Aug 29 07:07:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tstp.c,v 1.38 2010/02/03 15:34:40 roy Exp $ */
+/* $NetBSD: tstp.c,v 1.39 2011/08/29 11:07:38 christos Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)tstp.c 8.3 (Berkeley) 5/4/94;
#else
-__RCSID($NetBSD: tstp.c,v 1.38 2010/02/03 15:34:40 roy Exp $);
+__RCSID($NetBSD: tstp.c,v 1.39 2011/08/29 11:07:38 christos Exp $);
#endif
#endif/* not lint */
@@ -55,6 +55,9 @@
__P((int)) = SIG_DFL;
static struct sigaction owsa;
+#ifndef TCSASOFT
+#define TCSASOFT 0
+#endif
/*
* stop_signal_handler --
@@ -243,9 +246,8 @@
_cursesi_screen-endwin = 1;
- return (tcsetattr(fileno(_cursesi_screen-infd),
- __tcaction ? TCSASOFT | TCSADRAIN : TCSADRAIN,
- _cursesi_screen-orig_termios) ? ERR : OK);
+ return tcsetattr(fileno(_cursesi_screen-infd), TCSASOFT | TCSADRAIN,
+ _cursesi_screen-orig_termios) ? ERR : OK;
}
@@ -299,9 +301,8 @@
_cursesi_screen-orig_termios);
/* Reset the terminal state to the mode just before we stopped. */
- (void) tcsetattr(fileno(_cursesi_screen-infd),
- __tcaction ? TCSASOFT | TCSADRAIN : TCSADRAIN,
- _cursesi_screen-save_termios);
+ (void) tcsetattr(fileno(_cursesi_screen-infd), TCSASOFT | TCSADRAIN,
+ _cursesi_screen-save_termios);
/* Restore colours */
__restore_colors();
@@ -325,28 +326,27 @@
if (_cursesi_screen-endwin)
return ERR;
- return (tcgetattr(fileno(_cursesi_screen-infd),
- _cursesi_screen-save_termios) ? ERR : OK);
+ return tcgetattr(fileno(_cursesi_screen-infd),
+ _cursesi_screen-save_termios) ? ERR : OK;
}
int
reset_prog_mode(void)
{
- return tcsetattr(fileno(_cursesi_screen-infd),
- __tcaction ? TCSASOFT | TCSADRAIN : TCSADRAIN,
- _cursesi_screen-save_termios) ? ERR : OK;
+ return tcsetattr(fileno(_cursesi_screen-infd), TCSASOFT | TCSADRAIN,
+ _cursesi_screen-save_termios) ? ERR : OK;
}
int
def_shell_mode(void)
{
- return (tcgetattr(fileno(_cursesi_screen-infd),
- _cursesi_screen-orig_termios) ? ERR : OK);
+ return tcgetattr(fileno(_cursesi_screen-infd),
+ _cursesi_screen-orig_termios) ? ERR : OK;
}
int
reset_shell_mode(void)
{
- return (__stopwin());
+ return __stopwin();
}
Index: src/lib/libcurses/tty.c
diff -u src/lib/libcurses/tty.c:1.42 src/lib/libcurses/tty.c:1.43
--- src/lib/libcurses/tty.c:1.42 Wed Feb 3 10:34:40 2010
+++ src/lib/libcurses/tty.c Mon Aug 29 07:07:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.42 2010/02/03 15:34:40 roy Exp $ */
+/* $NetBSD: tty.c,v 1.43 2011/08/29 11:07:38 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)tty.c 8.6 (Berkeley) 1/10/95;
#else
-__RCSID($NetBSD: tty.c,v 1.42 2010/02/03 15:34:40 roy Exp $);
+__RCSID($NetBSD: tty.c,v 1.43 2011/08/29 11:07:38 christos Exp $);
#endif
#endif/* not lint */
@@ -56,12 +56,12 @@
* those attributes at each change, or at least when stopped and restarted.
* See also the comments in getterm().
*/
-#ifdef TCSASOFT
-int __tcaction = 1; /* Ignore hardware settings. */
-#else
-int __tcaction = 0;
+#ifndef TCSASOFT
+#define TCSASOFT 0
#endif
+int __tcaction = TCSASOFT != 0; /* Ignore hardware settings */
+
#ifndef OXTABS
#ifdef XTABS /* SMI uses XTABS. */
#define OXTABS XTABS
@@ -115,7 +115,7 @@
screen-notty = TRUE;
__GT = 0;
__NONL = 0;
- return (OK);
+ return OK;
}
}
@@ -143,6 +143,7 @@
screen-rawt.c_oflag = ~OPOST;
screen-rawt.c_lflag = ~(ISIG | IEXTEN);
+#if TCSASOFT == 0
/*
* In general, curses should leave hardware-related settings alone.
* This includes parity and word size. Older versions set the tty
@@ -151,15 +152,14 @@
* parity and word size, the TCSASOFT bit has to be removed from the
* calls that switch to/from raw mode.
*/
- if (!__tcaction) {
- screen-rawt.c_iflag = ~ISTRIP;
- screen-rawt.c_cflag = ~(CSIZE | PARENB);
- screen-rawt.c_cflag |= CS8;
- }
+ screen-rawt.c_iflag = ~ISTRIP;
+ screen-rawt.c_cflag = ~(CSIZE | PARENB);
+ screen-rawt.c_cflag |= CS8;
+#endif
screen-curt = screen-baset;
- return (tcsetattr(fileno(screen-infd), __tcaction ?
- TCSASOFT | TCSADRAIN : TCSADRAIN, screen-curt) ? ERR : OK);
+ return tcsetattr(fileno(screen-infd), TCSASOFT
CVS commit: src
Module Name:src Committed By: jruoho Date: Mon Aug 29 11:14:16 UTC 2011 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.i386 src/sys/modules: Makefile Added Files: src/sys/dev/i2c: zl10353.c zl10353reg.h zl10353var.h src/sys/modules/zl10353: Makefile Log Message: Add Zarlink ZL10353 DVB demodulator (or as it is now know, Intel CE623x). To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/modules/md.i386 cvs rdiff -u -r0 -r1.1 src/sys/dev/i2c/zl10353.c src/sys/dev/i2c/zl10353reg.h \ src/sys/dev/i2c/zl10353var.h cvs rdiff -u -r1.90 -r1.91 src/sys/modules/Makefile cvs rdiff -u -r0 -r1.1 src/sys/modules/zl10353/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/sets/lists/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.29 src/distrib/sets/lists/modules/md.amd64:1.30 --- src/distrib/sets/lists/modules/md.amd64:1.29 Thu Aug 11 12:03:58 2011 +++ src/distrib/sets/lists/modules/md.amd64 Mon Aug 29 11:14:15 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.29 2011/08/11 12:03:58 mbalmer Exp $ +# $NetBSD: md.amd64,v 1.30 2011/08/29 11:14:15 jruoho Exp $ ./@MODULEDIR@/acpiacadbase-kernel-modules kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod ./@MODULEDIR@/acpibatbase-kernel-modules kmod @@ -113,3 +113,5 @@ ./@MODULEDIR@/xc3028/xc3028.kmod base-kernel-modules kmod ./@MODULEDIR@/xc5kbase-kernel-modules kmod ./@MODULEDIR@/xc5k/xc5k.kmod base-kernel-modules kmod +./@MODULEDIR@/zl10353base-kernel-modules kmod +./@MODULEDIR@/zl10353/zl10353.kmod base-kernel-modules kmod Index: src/distrib/sets/lists/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.35 src/distrib/sets/lists/modules/md.i386:1.36 --- src/distrib/sets/lists/modules/md.i386:1.35 Sun Aug 28 16:19:08 2011 +++ src/distrib/sets/lists/modules/md.i386 Mon Aug 29 11:14:15 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.35 2011/08/28 16:19:08 jmcneill Exp $ +# $NetBSD: md.i386,v 1.36 2011/08/29 11:14:15 jruoho Exp $ ./@MODULEDIR@/acpiacadbase-kernel-modules kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod ./@MODULEDIR@/acpibatbase-kernel-modules kmod @@ -139,3 +139,5 @@ ./@MODULEDIR@/xc3028/xc3028.kmod base-kernel-modules kmod ./@MODULEDIR@/xc5kbase-kernel-modules kmod ./@MODULEDIR@/xc5k/xc5k.kmod base-kernel-modules kmod +./@MODULEDIR@/zl10353base-kernel-modules kmod +./@MODULEDIR@/zl10353/zl10353.kmod base-kernel-modules kmod Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.90 src/sys/modules/Makefile:1.91 --- src/sys/modules/Makefile:1.90 Sun Aug 28 16:19:07 2011 +++ src/sys/modules/Makefile Mon Aug 29 11:14:15 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.90 2011/08/28 16:19:07 jmcneill Exp $ +# $NetBSD: Makefile,v 1.91 2011/08/29 11:14:15 jruoho Exp $ .include bsd.own.mk @@ -234,6 +234,7 @@ SUBDIR+= tvpll SUBDIR+= xc3028 SUBDIR+= xc5k +SUBDIR+= zl10353 # hardware drivers SUBDIR+= auvitek SUBDIR+= coram Added files: Index: src/sys/dev/i2c/zl10353.c diff -u /dev/null src/sys/dev/i2c/zl10353.c:1.1 --- /dev/null Mon Aug 29 11:14:16 2011 +++ src/sys/dev/i2c/zl10353.c Mon Aug 29 11:14:15 2011 @@ -0,0 +1,663 @@ +/* $NetBSD */ + +/*- + * Copyright (c) 2011 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jukka Ruohonen. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#include sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Mon Aug 29 11:23:53 UTC 2011 Modified Files: src/share/man/man4: dtv.4 Log Message: Xref auvitek(4) also in SEE ALSO (and the others as comments). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/dtv.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/dtv.4 diff -u src/share/man/man4/dtv.4:1.5 src/share/man/man4/dtv.4:1.6 --- src/share/man/man4/dtv.4:1.5 Mon Aug 29 10:48:57 2011 +++ src/share/man/man4/dtv.4 Mon Aug 29 11:23:53 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: dtv.4,v 1.5 2011/08/29 10:48:57 jruoho Exp $ +.\ $NetBSD: dtv.4,v 1.6 2011/08/29 11:23:53 jruoho Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -85,6 +85,10 @@ Digital video recording device. .El .Sh SEE ALSO +.Xr auvitek 4 , +.\ coram 4 , +.\ cxdtv 4 , +.\ emdtv 4 , .Xr video 9 .Pp .Pa pkgsrc/multimedia/dvb-apps ,
CVS commit: src/sbin/mount_nfs
Module Name:src Committed By: jruoho Date: Mon Aug 29 11:47:46 UTC 2011 Modified Files: src/sbin/mount_nfs: mount_nfs.8 Log Message: Remove a comma. From Snader_LB on freenode. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sbin/mount_nfs/mount_nfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_nfs/mount_nfs.8 diff -u src/sbin/mount_nfs/mount_nfs.8:1.39 src/sbin/mount_nfs/mount_nfs.8:1.40 --- src/sbin/mount_nfs/mount_nfs.8:1.39 Sat Apr 18 14:55:50 2009 +++ src/sbin/mount_nfs/mount_nfs.8 Mon Aug 29 11:47:46 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount_nfs.8,v 1.39 2009/04/18 14:55:50 wiz Exp $ +.\ $NetBSD: mount_nfs.8,v 1.40 2011/08/29 11:47:46 jruoho Exp $ .\ .\ Copyright (c) 1992, 1993, 1994, 1995 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\ -.Dd April 18, 2009 +.Dd August 29, 2011 .Dt MOUNT_NFS 8 .Os .Sh NAME @@ -474,7 +474,7 @@ .Pp .Dl mount_nfs: can't access /foo: Permission denied .Pp -This message means that the remote host, is either not exporting +This message means that the remote host is either not exporting the filesystem you requested, or is not exporting it to your host. If you believe the remote host is indeed exporting a filesystem to you, make sure the
CVS commit: src/lib/libutil
Module Name:src Committed By: jruoho Date: Mon Aug 29 12:32:55 UTC 2011 Modified Files: src/lib/libutil: util.3 Log Message: Note strpct(3). To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libutil/util.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/util.3 diff -u src/lib/libutil/util.3:1.21 src/lib/libutil/util.3:1.22 --- src/lib/libutil/util.3:1.21 Wed May 5 06:11:14 2010 +++ src/lib/libutil/util.3 Mon Aug 29 12:32:54 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: util.3,v 1.21 2010/05/05 06:11:14 jruoho Exp $ +.\ $NetBSD: util.3,v 1.22 2011/08/29 12:32:54 jruoho Exp $ .\ .\ Copyright (c) 2001 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 5, 2010 +.Dd August 29, 2011 .Dt UTIL 3 .Os .Sh NAME @@ -101,6 +101,7 @@ .It Xr setusercontext 3 Ta query login.conf database about a user class .It Xr snprintb 3 Ta bitmask output conversion .It Xr sockaddr_snprintf 3 Ta socket address formatting function +.It xr strpct 3 Ta decimal percent formatter .It Xr ttyaction 3 Ta ttyaction utility function .It Xr ttylock 3 Ta locks based on files containing PIDs .It Xr ttymsg 3 Ta ttymsg utility function
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: reinoud
Date: Mon Aug 29 12:37:20 UTC 2011
Modified Files:
src/sys/arch/usermode/usermode: syscall.c
Log Message:
Update syscall prototype
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/usermode/usermode/syscall.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/usermode/usermode/syscall.c
diff -u src/sys/arch/usermode/usermode/syscall.c:1.4 src/sys/arch/usermode/usermode/syscall.c:1.5
--- src/sys/arch/usermode/usermode/syscall.c:1.4 Sun Aug 28 19:39:05 2011
+++ src/sys/arch/usermode/usermode/syscall.c Mon Aug 29 12:37:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.4 2011/08/28 19:39:05 reinoud Exp $ */
+/* $NetBSD: syscall.c,v 1.5 2011/08/29 12:37:20 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.4 2011/08/28 19:39:05 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: syscall.c,v 1.5 2011/08/29 12:37:20 reinoud Exp $);
#include sys/types.h
#include sys/param.h
@@ -41,7 +41,7 @@
#include machine/pcb.h
#include machine/thunk.h
-void syscall(void);
+int syscall(lwp_t *l, struct trapframe *tr);
void
child_return(void *arg)
@@ -58,8 +58,10 @@
ktrsysret(SYS_fork, 0, 0);
}
-void
-syscall(void)
+
+int
+syscall(lwp_t *l, struct trapframe *tr)
{
-printf(syscall called !\n);
+printf(syscall called for lwp %p, trapframe %p!\n, l, tr);
+ return ENOENT;
}
CVS commit: src/sys/arch/usermode/include
Module Name:src
Committed By: reinoud
Date: Mon Aug 29 12:37:53 UTC 2011
Modified Files:
src/sys/arch/usermode/include: pcb.h
Log Message:
Update pcb and trapframe
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/usermode/include/pcb.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/usermode/include/pcb.h
diff -u src/sys/arch/usermode/include/pcb.h:1.5 src/sys/arch/usermode/include/pcb.h:1.6
--- src/sys/arch/usermode/include/pcb.h:1.5 Sun Aug 28 19:40:26 2011
+++ src/sys/arch/usermode/include/pcb.h Mon Aug 29 12:37:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcb.h,v 1.5 2011/08/28 19:40:26 reinoud Exp $ */
+/* $NetBSD: pcb.h,v 1.6 2011/08/29 12:37:53 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -38,16 +38,17 @@
*/
typedef struct trapframe {
- int (*tf_syscall)(void *); /* address to call for syscalls */
+ int (*tf_syscall)(lwp_t *, struct trapframe *);
int tf_reason; /* XXX unused */
uintptr_t tf_io[8]; /* to transport info */
} trapframe_t;
struct pcb {
- ucontext_t pcb_ucp;
+ ucontext_t pcb_ucp; /* lwp switchframe */
+ ucontext_t pcb_userland_ucp; /* userland switchframe */
bool pcb_needfree;
- struct trapframe pcb_tf; /* XXX */
+ struct trapframe pcb_tf;
void * pcb_onfault; /* on fault handler */
};
CVS commit: src/lib/libutil
Module Name:src Committed By: jruoho Date: Mon Aug 29 12:39:50 UTC 2011 Modified Files: src/lib/libutil: util.3 Log Message: Fix markup-typo. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/lib/libutil/util.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/util.3 diff -u src/lib/libutil/util.3:1.23 src/lib/libutil/util.3:1.24 --- src/lib/libutil/util.3:1.23 Mon Aug 29 12:37:53 2011 +++ src/lib/libutil/util.3 Mon Aug 29 12:39:50 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: util.3,v 1.23 2011/08/29 12:37:53 jruoho Exp $ +.\ $NetBSD: util.3,v 1.24 2011/08/29 12:39:50 jruoho Exp $ .\ .\ Copyright (c) 2001 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -102,7 +102,7 @@ .It Xr setusercontext 3 Ta query login.conf database about a user class .It Xr snprintb 3 Ta bitmask output conversion .It Xr sockaddr_snprintf 3 Ta socket address formatting function -.It xr strpct 3 Ta decimal percent formatter +.It Xr strpct 3 Ta decimal percent formatter .It Xr ttyaction 3 Ta ttyaction utility function .It Xr ttylock 3 Ta locks based on files containing PIDs .It Xr ttymsg 3 Ta ttymsg utility function
CVS commit: src/tests/lib/libcurses
Module Name:src
Committed By: christos
Date: Mon Aug 29 12:40:59 UTC 2011
Modified Files:
src/tests/lib/libcurses: t_curses.sh
Log Message:
make sure that our terminal has a consistent size now that terminfo obeys
the environment variables.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libcurses/t_curses.sh
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/libcurses/t_curses.sh
diff -u src/tests/lib/libcurses/t_curses.sh:1.4 src/tests/lib/libcurses/t_curses.sh:1.5
--- src/tests/lib/libcurses/t_curses.sh:1.4 Fri Jun 17 12:59:51 2011
+++ src/tests/lib/libcurses/t_curses.sh Mon Aug 29 08:40:59 2011
@@ -3,6 +3,8 @@
{
file=$(atf_get_srcdir)/tests/${1}
+ export COLUMNS=80
+ export LINES=24
$(atf_get_srcdir)/director \
-T $(atf_get_srcdir) \
-t atf \
CVS commit: src/tests/lib/libcurses/check_files
Module Name:src Committed By: christos Date: Mon Aug 29 12:41:38 UTC 2011 Modified Files: src/tests/lib/libcurses/check_files: timeout.chk Log Message: we never get the b character since we timeout and drain! To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/check_files/timeout.chk 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/libcurses/check_files/timeout.chk diff -u src/tests/lib/libcurses/check_files/timeout.chk:1.1 src/tests/lib/libcurses/check_files/timeout.chk:1.2 --- src/tests/lib/libcurses/check_files/timeout.chk:1.1 Sun Apr 10 05:55:09 2011 +++ src/tests/lib/libcurses/check_files/timeout.chk Mon Aug 29 08:41:38 2011 @@ -1 +1 @@ -absmkx \ No newline at end of file +asmkx
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: reinoud
Date: Mon Aug 29 12:42:19 UTC 2011
Modified Files:
src/sys/arch/usermode/usermode: trap.c
Log Message:
Hack trap for now to upgrade protection.. this really needs fixing soon
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/usermode/usermode/trap.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/usermode/usermode/trap.c
diff -u src/sys/arch/usermode/usermode/trap.c:1.10 src/sys/arch/usermode/usermode/trap.c:1.11
--- src/sys/arch/usermode/usermode/trap.c:1.10 Sun Aug 28 19:38:20 2011
+++ src/sys/arch/usermode/usermode/trap.c Mon Aug 29 12:42:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.10 2011/08/28 19:38:20 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.11 2011/08/29 12:42:19 reinoud Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.10 2011/08/28 19:38:20 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.11 2011/08/29 12:42:19 reinoud Exp $);
#include sys/types.h
#include sys/param.h
@@ -35,15 +35,18 @@
#include sys/proc.h
#include sys/systm.h
#include sys/userret.h
+#include sys/errno.h
+
#include uvm/uvm_extern.h
#include machine/cpu.h
+#include machine/pcb.h
+#include machine/pmap.h
+#include machine/thunk.h
+
//#include machine/ctlreg.h
//#include machine/trap.h
//#include machine/instr.h
-#include machine/pcb.h
-#include machine/pmap.h
//#include machine/userret.h
-#include machine/thunk.h
void setup_signal_handlers(void);
@@ -135,11 +138,17 @@
panic(peeing outside the box!);
}
- pcb-pcb_onfault = NULL;
/* XXX TODO determine atype?? */
-atype = PROT_READ | PROT_WRITE;
+atype = PROT_READ;
+again:
+ pcb-pcb_onfault = NULL;
rv = uvm_fault(vm_map, (vaddr_t) va, atype);
pcb-pcb_onfault = (void *) onfault;
+if (rv) printf(uvm_fault rv = %d\n, rv);
+if (rv == EACCES) {
+ atype |= PROT_WRITE | PROT_EXEC;
+ goto again;
+}
if (rv) {
/* something got wrong */
if (kmem) {
CVS commit: src/tests/lib/libcurses/tests
Module Name:src Committed By: christos Date: Mon Aug 29 12:42:58 UTC 2011 Modified Files: src/tests/lib/libcurses/tests: addnstr Log Message: This could have never worked before since the syntax was wrong. Unfortunately since I added the error checking, I was blamed for it failing. Go figure. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/addnstr 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/libcurses/tests/addnstr diff -u src/tests/lib/libcurses/tests/addnstr:1.1 src/tests/lib/libcurses/tests/addnstr:1.2 --- src/tests/lib/libcurses/tests/addnstr:1.1 Sun Apr 10 05:55:10 2011 +++ src/tests/lib/libcurses/tests/addnstr Mon Aug 29 08:42:57 2011 @@ -1,5 +1,5 @@ include start -call OK addnstr abdcefg 5 -refresh +call OK addnstr abcdefg 5 +call OK refresh # should be the same as addstr -compare addstr +compare addstr.chk
CVS commit: src/tests/lib/libcurses/tests
Module Name:src Committed By: christos Date: Mon Aug 29 12:43:52 UTC 2011 Modified Files: src/tests/lib/libcurses/tests: assume_default_colors Log Message: change comparend to compare so that this passes now. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/tests/assume_default_colors 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/libcurses/tests/assume_default_colors diff -u src/tests/lib/libcurses/tests/assume_default_colors:1.1 src/tests/lib/libcurses/tests/assume_default_colors:1.2 --- src/tests/lib/libcurses/tests/assume_default_colors:1.1 Sun Apr 10 05:55:10 2011 +++ src/tests/lib/libcurses/tests/assume_default_colors Mon Aug 29 08:43:51 2011 @@ -2,7 +2,7 @@ call OK start_color call OK assume_default_colors -1 -1 call OK refresh -comparend color_start.chk +compare color_start.chk # This should be the same as the default compare color_default.chk # default foreground, blue background
CVS commit: src/tests/lib/libcurses
Module Name:src Committed By: christos Date: Mon Aug 29 12:44:35 UTC 2011 Modified Files: src/tests/lib/libcurses: t_curses.sh Log Message: comment out racy test that I will not bother fixing for now. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libcurses/t_curses.sh 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/libcurses/t_curses.sh diff -u src/tests/lib/libcurses/t_curses.sh:1.5 src/tests/lib/libcurses/t_curses.sh:1.6 --- src/tests/lib/libcurses/t_curses.sh:1.5 Mon Aug 29 08:40:59 2011 +++ src/tests/lib/libcurses/t_curses.sh Mon Aug 29 08:44:35 2011 @@ -272,7 +272,7 @@ atf_add_test_case addstr atf_add_test_case addnstr atf_add_test_case getch - atf_add_test_case timeout +# atf_add_test_case timeout # This is racy; works with -v atf_add_test_case window atf_add_test_case wborder atf_add_test_case box
CVS commit: src/tests/lib/libcurses/slave
Module Name:src
Committed By: christos
Date: Mon Aug 29 12:46:04 UTC 2011
Modified Files:
src/tests/lib/libcurses/slave: curses_commands.c
Log Message:
fix bug where we read the same argument twice. Name the timeout val the
same 'tval' in both timeout routines.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libcurses/slave/curses_commands.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/libcurses/slave/curses_commands.c
diff -u src/tests/lib/libcurses/slave/curses_commands.c:1.4 src/tests/lib/libcurses/slave/curses_commands.c:1.5
--- src/tests/lib/libcurses/slave/curses_commands.c:1.4 Sat Jun 11 14:03:18 2011
+++ src/tests/lib/libcurses/slave/curses_commands.c Mon Aug 29 08:46:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: curses_commands.c,v 1.4 2011/06/11 18:03:18 christos Exp $ */
+/* $NetBSD: curses_commands.c,v 1.5 2011/08/29 12:46:03 christos Exp $ */
/*-
* Copyright 2009 Brett Lymn bl...@netbsd.org
@@ -4088,7 +4088,7 @@
return;
}
- if (sscanf(args[0], %d, flag) == 0) {
+ if (sscanf(args[1], %d, flag) == 0) {
report_count(1);
report_error(BAD ARGUMENT);
return;
@@ -5620,7 +5620,7 @@
cmd_wtimeout(int nargs, char **args)
{
WINDOW *win;
- int delay;
+ int tval;
if (check_arg_count(nargs, 2) == 1)
return;
@@ -5631,13 +5631,13 @@
return;
}
- if (sscanf(args[1], %d, delay) == 0) {
+ if (sscanf(args[1], %d, tval) == 0) {
report_count(1);
report_error(BAD ARGUMENT);
return;
}
- wtimeout(win, delay); /* void return */
+ wtimeout(win, tval); /* void return */
report_count(1);
report_return(OK);
}
CVS commit: src/sys/arch/usermode
Module Name:src
Committed By: reinoud
Date: Mon Aug 29 12:46:59 UTC 2011
Modified Files:
src/sys/arch/usermode/dev: cpu.c
src/sys/arch/usermode/usermode: machdep.c
Log Message:
Dirty commit of machdep.c and cpu.c
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/usermode/dev/cpu.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/usermode/usermode/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/usermode/dev/cpu.c
diff -u src/sys/arch/usermode/dev/cpu.c:1.22 src/sys/arch/usermode/dev/cpu.c:1.23
--- src/sys/arch/usermode/dev/cpu.c:1.22 Sun Aug 28 21:31:41 2011
+++ src/sys/arch/usermode/dev/cpu.c Mon Aug 29 12:46:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.22 2011/08/28 21:31:41 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.23 2011/08/29 12:46:58 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include opt_cpu.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.22 2011/08/28 21:31:41 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.23 2011/08/29 12:46:58 reinoud Exp $);
#include sys/param.h
#include sys/conf.h
@@ -277,14 +277,11 @@
func(arg);
-printf(%s: setting ucontext on lwp %p\n, __func__, curlwp);
-pcb = lwp_getpcb(curlwp);
-printf(pcb %p\n, pcb);
-printf(\tpcb-pcb_ucp.uc_stack.ss_sp = %p\n, pcb-pcb_ucp.uc_stack.ss_sp);
-printf(\tpcb-pcb_ucp.uc_stack.ss_size = %d\n, (int) pcb-pcb_ucp.uc_stack.ss_size);
+ pcb = lwp_getpcb(curlwp);
/* switch to userland */
- thunk_setcontext(pcb-pcb_ucp);
+printf(switching to userland\n);
+ thunk_setcontext(pcb-pcb_userland_ucp);
panic(%s: shouldn't return, __func__);
}
@@ -294,7 +291,8 @@
void (*func)(void *), void *arg)
{
extern int errno;
- struct pcb *pcb = lwp_getpcb(l2);
+ struct pcb *pcb1 = lwp_getpcb(l1);
+ struct pcb *pcb2 = lwp_getpcb(l2);
#ifdef CPU_DEBUG
printf(cpu_lwp_fork [%s/%p] - [%s/%p] stack=%p stacksize=%d\n,
@@ -303,21 +301,25 @@
stack, (int)stacksize);
#endif
+ /* copy the PCB and its switchframes from parent */
+ memcpy(pcb2, pcb1, sizeof(struct pcb));
+
/* XXXJDM */
if (stack == NULL) {
stack = malloc(PAGE_SIZE, M_TEMP, M_NOWAIT);
stacksize = PAGE_SIZE;
- pcb-pcb_needfree = true;
+ pcb2-pcb_needfree = true;
} else
- pcb-pcb_needfree = false;
+ pcb2-pcb_needfree = false;
- if (thunk_getcontext(pcb-pcb_ucp))
+ if (thunk_getcontext(pcb2-pcb_ucp))
panic(getcontext failed: %d, errno);
- pcb-pcb_ucp.uc_stack.ss_sp = stack;
- pcb-pcb_ucp.uc_stack.ss_size = stacksize;
- pcb-pcb_ucp.uc_link = NULL;
- pcb-pcb_ucp.uc_flags = _UC_STACK | _UC_CPU;
- thunk_makecontext(pcb-pcb_ucp, (void (*)(void))cpu_lwp_trampoline,
+
+ pcb2-pcb_ucp.uc_stack.ss_sp = stack;
+ pcb2-pcb_ucp.uc_stack.ss_size = stacksize;
+ pcb2-pcb_ucp.uc_link = NULL;
+ pcb2-pcb_ucp.uc_flags = _UC_STACK | _UC_CPU;
+ thunk_makecontext(pcb2-pcb_ucp, (void (*)(void))cpu_lwp_trampoline,
2, func, arg);
}
@@ -326,6 +328,7 @@
{
}
+int syscall(lwp_t *l, struct trapframe *tr);
void
cpu_startup(void)
{
@@ -341,6 +344,11 @@
if (thunk_getcontext(lwp0pcb.pcb_ucp))
panic(getcontext failed);
uvm_lwp_setuarea(lwp0, (vaddr_t)lwp0pcb);
+
+ /* init trapframe (going nowhere!), maybe a panic func? */
+ lwp0pcb.pcb_tf.tf_syscall = syscall;
+ memcpy(lwp0pcb.pcb_userland_ucp, lwp0pcb.pcb_ucp, sizeof(ucontext_t));
+// thunk_makecontext_trapframe2go(lwp0pcb.pcb_userland_ucp, NULL, NULL);
}
void
Index: src/sys/arch/usermode/usermode/machdep.c
diff -u src/sys/arch/usermode/usermode/machdep.c:1.17 src/sys/arch/usermode/usermode/machdep.c:1.18
--- src/sys/arch/usermode/usermode/machdep.c:1.17 Sun Aug 28 19:39:42 2011
+++ src/sys/arch/usermode/usermode/machdep.c Mon Aug 29 12:46:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.17 2011/08/28 19:39:42 reinoud Exp $ */
+/* $NetBSD: machdep.c,v 1.18 2011/08/29 12:46:58 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.17 2011/08/28 19:39:42 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.18 2011/08/29 12:46:58 reinoud Exp $);
#include sys/types.h
#include sys/param.h
@@ -137,19 +137,24 @@
setregs(struct lwp *l, struct exec_package *pack, vaddr_t stack)
{
struct pcb *pcb = lwp_getpcb(l);
+ ucontext_t *ucp = pcb-pcb_userland_ucp;
printf(setregs called: lwp %p, exec package %p, stack %p\n, l, pack, (void *) stack);
-printf(cur pcb %p\n, pcb);
+printf(current stat of pcb %p\n, pcb);
printf(\tpcb-pcb_ucp.uc_stack.ss_sp = %p\n, pcb-pcb_ucp.uc_stack.ss_sp);
printf(\tpcb-pcb_ucp.uc_stack.ss_size = %d\n, (int) pcb-pcb_ucp.uc_stack.ss_size);
+printf(\tpcb-pcb_userland_ucp.uc_stack.ss_sp = %p\n, pcb-pcb_userland_ucp.uc_stack.ss_sp);
+printf(\tpcb-pcb_userland_ucp.uc_stack.ss_size = %d\n, (int)
CVS commit: src/tests/lib/libcurses/director
Module Name:src
Committed By: christos
Date: Mon Aug 29 12:49:37 UTC 2011
Modified Files:
src/tests/lib/libcurses/director: testlang_parse.y
Log Message:
- err - errx mistakes
- make sure that -v does not change the program behavior
- don't set revents in poll
- add more debugging
- only call read when we have POLLIN
- don't mix I/O from master while processing input
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libcurses/director/testlang_parse.y
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/libcurses/director/testlang_parse.y
diff -u src/tests/lib/libcurses/director/testlang_parse.y:1.8 src/tests/lib/libcurses/director/testlang_parse.y:1.9
--- src/tests/lib/libcurses/director/testlang_parse.y:1.8 Wed Aug 17 22:44:45 2011
+++ src/tests/lib/libcurses/director/testlang_parse.y Mon Aug 29 08:49:37 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: testlang_parse.y,v 1.8 2011/08/18 02:44:45 christos Exp $ */
+/* $NetBSD: testlang_parse.y,v 1.9 2011/08/29 12:49:37 christos Exp $ */
/*-
* Copyright 2009 Brett Lymn bl...@netbsd.org
@@ -41,6 +41,7 @@
#include sys/syslimits.h
#include time.h
#include vis.h
+#include stdint.h
#include returns.h
#define YYDEBUG 1
@@ -226,16 +227,18 @@
err(1, Undefined variable in check statement, line %zu
of file %s, line, cur_file);
- if (verbose)
+ if (verbose) {
fprintf(stderr, Checking contents of variable %s for %s\n,
vars[command.returns[0].return_index].name,
returns_enum_names[command.returns[1].return_type]);
+ }
if (((command.returns[1].return_type == ret_byte)
(vars[command.returns[0].return_index].type != ret_byte)) ||
vars[command.returns[0].return_index].type != ret_string)
err(1, Var type %s (%d) does not match return type %s (%d),
- returns_enum_names[vars[command.returns[0].return_index].type],
+ returns_enum_names[
+ vars[command.returns[0].return_index].type],
vars[command.returns[0].return_index].type,
returns_enum_names[command.returns[1].return_type],
command.returns[1].return_type);
@@ -263,11 +266,12 @@
case ret_string:
case ret_number:
- if (verbose)
+ if (verbose) {
fprintf(stderr, %s == returned %s\n,
(const char *)command.returns[1].return_value,
(const char *)
vars[command.returns[0].return_index].value);
+ }
validate_variable(0, ret_string,
command.returns[1].return_value,
command.returns[0].return_index, 0);
@@ -296,8 +300,9 @@
if (sscanf($2, %d, input_delay) == 0)
err(1, delay specification %s could not be converted to
numeric at line %zu of file %s, $2, line, cur_file);
- if (verbose)
+ if (verbose) {
fprintf(stderr, Set input delay to %d ms\n, input_delay);
+ }
if (input_delay DELAY_MIN)
input_delay = 1000 * DELAY_MIN; /* ms to ns */
@@ -308,6 +313,11 @@
*/
delay_spec.tv_sec = input_delay / 1000;
delay_spec.tv_nsec = (input_delay - 1000 * delay_spec.tv_sec) * 1000;
+ if (verbose) {
+ fprintf(stderr, set delay to %jd.%jd\n,
+ (intmax_t)delay_spec.tv_sec,
+ (intmax_t)delay_spec.tv_nsec);
+ }
init_parse_variables(0);
}
@@ -464,10 +474,11 @@
result = i1 | i2;
asprintf(ret, %lu, result);
- if (verbose)
+ if (verbose) {
fprintf(stderr, numeric or of 0x%lx (%s) and 0x%lx (%s)
results in 0x%lx (%s)\n,
i1, n1, i2, n2, result, ret);
+ }
return ret;
}
@@ -518,8 +529,7 @@
if ((name = malloc(strlen(varname) + 1)) == NULL)
err(1, Alloc of varname failed);
- if ((temp = (var_t *) realloc(vars, sizeof(var_t) * (nvars + 1)))
- == NULL) {
+ if ((temp = realloc(vars, sizeof(*temp) * (nvars + 1))) == NULL) {
free(name);
err(1, Realloc of vars array failed);
}
@@ -544,9 +554,10 @@
char *str = arg;
returns_t *ret;
- if (verbose)
- printf(function is %s, adding arg %s type %s\n,
+ if (verbose) {
+ fprintf(stderr, function is %s, adding arg %s type %s\n,
command.function, str, args_enum_names[arg_type]);
+ }
cur.arg_type = arg_type;
switch (arg_type) {
@@ -580,7 +591,7 @@
strcpy(cur.arg_string, arg);
}
- temp = realloc(command.args, sizeof(args_t) * (command.nargs + 1));
+ temp = realloc(command.args, sizeof(*temp) * (command.nargs + 1));
if (temp == NULL)
err(1, Failed to reallocate args);
command.args = temp;
@@ -627,8 +638,7 @@
cur.return_index = assign_var(ret);
}
- temp = realloc(command.returns,
- sizeof(returns_t) * (command.nrets + 1));
+ temp = realloc(command.returns, sizeof(*temp) * (command.nrets + 1));
if (temp == NULL)
err(1, Failed to reallocate returns);
command.returns = temp;
@@ -687,6 +697,7 @@
struct pollfd fds[2];
int nfd, check_fd;
ssize_t result;
+ size_t offs;
/*
* Don't prepend check path iff check file has an absolute
@@ -714,10 +725,8 @@
fds[0].fd = check_fd;
fds[0].events =
CVS commit: src/tests
Module Name:src
Committed By: jruoho
Date: Mon Aug 29 12:50:50 UTC 2011
Modified Files:
src/tests/include/sys: t_bitops.c
src/tests/lib/libc/stdlib: t_strtod.c
src/tests/lib/libm: t_floor.c
Log Message:
Remove Xfails that are related to the infamous qemu/amd64 floating point
bugs. It appears to be quite difficult to identify the exact Qemu version
and setup. These do not fail on the TNF's qemu/amd64 setup, which can be
taken as a reference point for expected failures.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/include/sys/t_bitops.c
cvs rdiff -u -r1.24 -r1.25 src/tests/lib/libc/stdlib/t_strtod.c
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libm/t_floor.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/include/sys/t_bitops.c
diff -u src/tests/include/sys/t_bitops.c:1.8 src/tests/include/sys/t_bitops.c:1.9
--- src/tests/include/sys/t_bitops.c:1.8 Thu Jul 7 11:04:30 2011
+++ src/tests/include/sys/t_bitops.c Mon Aug 29 12:50:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_bitops.c,v 1.8 2011/07/07 11:04:30 jruoho Exp $ */
+/* $NetBSD: t_bitops.c,v 1.9 2011/08/29 12:50:50 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_bitops.c,v 1.8 2011/07/07 11:04:30 jruoho Exp $);
+__RCSID($NetBSD: t_bitops.c,v 1.9 2011/08/29 12:50:50 jruoho Exp $);
#include atf-c.h
@@ -174,10 +174,6 @@
*/
ATF_REQUIRE(uname(utsname) == 0);
- if (strcmp(utsname.machine, amd64) == 0
- system(cpuctl identify 0 | grep -q QEMU) == 0)
- atf_tc_expect_fail(PR misc/44767);
-
for (i = 1; i UINT32_MAX; i += UINT16_MAX) {
x = log2(i);
Index: src/tests/lib/libc/stdlib/t_strtod.c
diff -u src/tests/lib/libc/stdlib/t_strtod.c:1.24 src/tests/lib/libc/stdlib/t_strtod.c:1.25
--- src/tests/lib/libc/stdlib/t_strtod.c:1.24 Fri Jul 8 05:10:05 2011
+++ src/tests/lib/libc/stdlib/t_strtod.c Mon Aug 29 12:50:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strtod.c,v 1.24 2011/07/08 05:10:05 jruoho Exp $ */
+/* $NetBSD: t_strtod.c,v 1.25 2011/08/29 12:50:50 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
/* Public domain, Otto Moerbeek o...@drijf.net, 2006. */
#include sys/cdefs.h
-__RCSID($NetBSD: t_strtod.c,v 1.24 2011/07/08 05:10:05 jruoho Exp $);
+__RCSID($NetBSD: t_strtod.c,v 1.25 2011/08/29 12:50:50 jruoho Exp $);
#include sys/utsname.h
@@ -275,10 +275,6 @@
*/
ATF_REQUIRE(uname(utsname) == 0);
- if (strcmp(utsname.machine, amd64) == 0
- system(cpuctl identify 0 | grep -q QEMU) == 0)
- atf_tc_expect_fail(PR misc/44767);
-
const char *val =
1.0011920928977282585492503130808472633361816406;
Index: src/tests/lib/libm/t_floor.c
diff -u src/tests/lib/libm/t_floor.c:1.6 src/tests/lib/libm/t_floor.c:1.7
--- src/tests/lib/libm/t_floor.c:1.6 Thu Jul 7 11:04:30 2011
+++ src/tests/lib/libm/t_floor.c Mon Aug 29 12:50:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_floor.c,v 1.6 2011/07/07 11:04:30 jruoho Exp $ */
+/* $NetBSD: t_floor.c,v 1.7 2011/08/29 12:50:50 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_floor.c,v 1.6 2011/07/07 11:04:30 jruoho Exp $);
+__RCSID($NetBSD: t_floor.c,v 1.7 2011/08/29 12:50:50 jruoho Exp $);
#include sys/utsname.h
@@ -63,10 +63,6 @@
*/
ATF_REQUIRE(uname(utsname) == 0);
- if (strcmp(utsname.machine, amd64) == 0
- system(cpuctl identify 0 | grep -q QEMU) == 0)
- atf_tc_expect_fail(PR misc/44767);
-
for (i = 0; i n; i++) {
x = i + 0.9;
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: jmcneill
Date: Mon Aug 29 13:15:54 UTC 2011
Modified Files:
src/sys/arch/usermode/usermode: trap.c
Log Message:
mem_access_handler: print originating lwp ptr + pid + lid
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/usermode/usermode/trap.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/usermode/usermode/trap.c
diff -u src/sys/arch/usermode/usermode/trap.c:1.11 src/sys/arch/usermode/usermode/trap.c:1.12
--- src/sys/arch/usermode/usermode/trap.c:1.11 Mon Aug 29 12:42:19 2011
+++ src/sys/arch/usermode/usermode/trap.c Mon Aug 29 13:15:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.11 2011/08/29 12:42:19 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.12 2011/08/29 13:15:54 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.11 2011/08/29 12:42:19 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.12 2011/08/29 13:15:54 jmcneill Exp $);
#include sys/types.h
#include sys/param.h
@@ -91,7 +91,10 @@
static volatile int recurse = 0;
recurse++;
- aprint_debug(trap\n);
+ aprint_debug(trap lwp=%p pid=%d lid=%d\n,
+ curlwp,
+ curlwp-l_proc-p_pid,
+ curlwp-l_lid);
if (recurse 1)
printf(enter trap recursion level %d\n, recurse);
if ((info-si_signo == SIGSEGV) || (info-si_signo == SIGBUS)) {
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Aug 29 13:42:54 UTC 2011 Modified Files: src/share/man/man4: dtvi2c.4 Log Message: Some fixes from Jared, add zl10353, update AUTHORS. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/dtvi2c.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/dtvi2c.4 diff -u src/share/man/man4/dtvi2c.4:1.1 src/share/man/man4/dtvi2c.4:1.2 --- src/share/man/man4/dtvi2c.4:1.1 Sun Aug 14 16:04:12 2011 +++ src/share/man/man4/dtvi2c.4 Mon Aug 29 13:42:53 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: dtvi2c.4,v 1.1 2011/08/14 16:04:12 wiz Exp $ +.\ $NetBSD: dtvi2c.4,v 1.2 2011/08/29 13:42:53 wiz Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -66,21 +66,23 @@ The currently supported modules are: .Bl -tag -width 10n -offset indent .It au8522 -Auvitek AU8522 ATSC demodulator +Auvitek AU8522 ATSC/QAM64/QAM256 demodulator .It cx24227 -Conexant CX24227 ATSC demodulator +Conexant CX24227 ATSC/QAM64/QAM256 demodulator .It lg3303 -LG LGDT3303 ATSC demodulator +LG LGDT3303 ATSC/QAM64/QAM256 demodulator .It mt2131 MicroTune MT2131 ATSC demodulator .It nxt2k XXX description .It tvpll -Philips TUV1236D and LG TDVS-H06xF ? XXX +Generic PLL-based tuners .It xc3028 XCeive XC3028 analog and digital tuner .It xc5k -XXX description +Xceive XC5000 analog and digital tuner +.It zl10353 +Zarlink ZL10353 (Intel CE623x) DVB demodulator .El .Sh FILES .Bl -bullet @@ -89,6 +91,8 @@ needed by nxt2k .It .Pa xc3028L-v36.fw +(provided by +.Pa pkgsrc/sysutils/xc3028l-firmware ) or .Pa xc3028-v27.fw needed by xc3028 @@ -111,7 +115,10 @@ .Nm modules were written by .An Jared D. McNeill -.Aq jmcne...@netbsd.org -and +.Aq jmcne...@netbsd.org , .An Jonathan A. Kollasch -.Aq jakll...@netbsd.org . +.Aq jakll...@netbsd.org , +and +.An Jukka Ruohonen +.Aq jru...@netbsd.org . +.Aq jakll...@netbsd.org ,
CVS commit: src/usr.bin/bthset
Module Name:src
Committed By: joerg
Date: Mon Aug 29 13:47:16 UTC 2011
Modified Files:
src/usr.bin/bthset: bthset.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/bthset/bthset.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/bthset/bthset.c
diff -u src/usr.bin/bthset/bthset.c:1.6 src/usr.bin/bthset/bthset.c:1.7
--- src/usr.bin/bthset/bthset.c:1.6 Thu Aug 25 16:19:23 2011
+++ src/usr.bin/bthset/bthset.c Mon Aug 29 13:47:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bthset.c,v 1.6 2011/08/25 16:19:23 joerg Exp $ */
+/* $NetBSD: bthset.c,v 1.7 2011/08/29 13:47:16 joerg Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -33,7 +33,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2006 Itronix, Inc. All rights reserved.);
-__RCSID($NetBSD: bthset.c,v 1.6 2011/08/25 16:19:23 joerg Exp $);
+__RCSID($NetBSD: bthset.c,v 1.7 2011/08/29 13:47:16 joerg Exp $);
#include sys/types.h
#include sys/audioio.h
@@ -62,45 +62,44 @@
#define RING_INTERVAL 5 /* seconds */
-int main(int, char *[]);
-void usage(void);
+__dead static void usage(void);
-void do_signal(int, short, void *);
-void do_ring(int, short, void *);
-void do_mixer(int, short, void *);
-void do_rfcomm(int, short, void *);
-void do_server(int, short, void *);
-int send_rfcomm(const char *, ...);
-
-int init_mixer(struct btsco_info *, const char *);
-int init_rfcomm(struct btsco_info *);
-int init_server(struct btsco_info *, int);
-
-void remove_pid(void);
-int write_pid(void);
-
-struct event sigint_ev; /* bye bye */
-struct event sigusr1_ev; /* start ringing */
-struct event sigusr2_ev; /* stop ringing */
-struct event mixer_ev; /* mixer changed */
-struct event rfcomm_ev; /* headset speaks */
-struct event server_ev; /* headset connecting */
-struct event ring_ev; /* ring timer */
-
-mixer_ctrl_t vgs; /* speaker control */
-mixer_ctrl_t vgm; /* mic control */
-int ringing; /* we are ringing */
-int verbose; /* copy to stdout */
-int mx; /* mixer fd */
-int rf; /* rfcomm connection fd */
-int ag; /* rfcomm gateway fd */
-sdp_session_t ss; /* SDP server session */
+static void do_signal(int, short, void *);
+static void do_ring(int, short, void *);
+static void do_mixer(int, short, void *);
+static void do_rfcomm(int, short, void *);
+static void do_server(int, short, void *);
+static int send_rfcomm(const char *, ...);
+
+static int init_mixer(struct btsco_info *, const char *);
+static int init_rfcomm(struct btsco_info *);
+static int init_server(struct btsco_info *, int);
+
+static void remove_pid(void);
+static int write_pid(void);
+
+static struct event sigint_ev; /* bye bye */
+static struct event sigusr1_ev; /* start ringing */
+static struct event sigusr2_ev; /* stop ringing */
+static struct event mixer_ev; /* mixer changed */
+static struct event rfcomm_ev; /* headset speaks */
+static struct event server_ev; /* headset connecting */
+static struct event ring_ev; /* ring timer */
+
+static mixer_ctrl_t vgs; /* speaker control */
+static mixer_ctrl_t vgm; /* mic control */
+static int ringing; /* we are ringing */
+static int verbose; /* copy to stdout */
+static int mx; /* mixer fd */
+static int rf; /* rfcomm connection fd */
+static int ag; /* rfcomm gateway fd */
+static sdp_session_t ss; /* SDP server session */
-char *command; /* answer command */
-char *pidfile; /* PID file name */
+static char *command; /* answer command */
+static char *pidfile; /* PID file name */
/* Headset Audio Gateway service record */
-uint8_t hset_data[] = {
+static uint8_t hset_data[] = {
0x09, 0x00, 0x00, // uint16 ServiceRecordHandle
0x0a, 0x00, 0x00, 0x00, // uint32 0x
0x00,
@@ -141,8 +140,8 @@
0x77, 0x61, 0x79
};
-sdp_data_t hset_record = { hset_data + 0, hset_data + 91 };
-sdp_data_t hset_channel = { hset_data + 36, hset_data + 37 };
+static sdp_data_t hset_record = { hset_data + 0, hset_data + 91 };
+static sdp_data_t hset_channel = { hset_data + 36, hset_data + 37 };
int
main(int ac, char *av[])
@@ -239,7 +238,7 @@
err(EXIT_FAILURE, event_dispatch);
}
-void
+static void
usage(void)
{
@@ -257,7 +256,7 @@
exit(EXIT_FAILURE);
}
-void
+static void
do_signal(int s, short ev, void *arg)
{
@@ -277,7 +276,7 @@
}
}
-void
+static void
do_ring(int s, short ev, void *arg)
{
static struct timeval tv = { RING_INTERVAL, 0 };
@@ -293,7 +292,7 @@
* The mixer device has been twiddled. We check mic and speaker
* settings and send the appropriate commands to the headset,
*/
-void
+static void
do_mixer(int s, short ev, void *arg)
{
mixer_ctrl_t mc;
@@ -325,7 +324,7 @@
/*
* RFCOMM socket event.
*/
-void
+static void
do_rfcomm(int fd, short ev, void *arg)
{
char buf[128];
@@ -392,7 +391,7 @@
/*
* got an incoming connection on the AG socket.
*/
-void
+static void
do_server(int
CVS commit: src/usr.bin/btpin
Module Name:src
Committed By: joerg
Date: Mon Aug 29 13:50:14 UTC 2011
Modified Files:
src/usr.bin/btpin: btpin.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/btpin/btpin.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/btpin/btpin.c
diff -u src/usr.bin/btpin/btpin.c:1.5 src/usr.bin/btpin/btpin.c:1.6
--- src/usr.bin/btpin/btpin.c:1.5 Sat May 16 07:18:42 2009
+++ src/usr.bin/btpin/btpin.c Mon Aug 29 13:50:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: btpin.c,v 1.5 2009/05/16 07:18:42 plunky Exp $ */
+/* $NetBSD: btpin.c,v 1.6 2011/08/29 13:50:13 joerg Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -33,7 +33,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2006 Itronix, Inc. All rights reserved.);
-__RCSID($NetBSD: btpin.c,v 1.5 2009/05/16 07:18:42 plunky Exp $);
+__RCSID($NetBSD: btpin.c,v 1.6 2011/08/29 13:50:13 joerg Exp $);
#include sys/types.h
#include sys/un.h
@@ -45,8 +45,7 @@
#include time.h
#include unistd.h
-int main(int, char *[]);
-void usage(void);
+__dead static void usage(void);
int
main(int ac, char *av[])
@@ -183,7 +182,7 @@
exit(EXIT_SUCCESS);
}
-void
+static void
usage(void)
{
CVS commit: src/dist/bzip2
Module Name:src
Committed By: joerg
Date: Mon Aug 29 13:51:38 UTC 2011
Modified Files:
src/dist/bzip2: bzip2.c
Log Message:
Sprinkle NORETURN.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/dist/bzip2/bzip2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/bzip2/bzip2.c
diff -u src/dist/bzip2/bzip2.c:1.8 src/dist/bzip2/bzip2.c:1.9
--- src/dist/bzip2/bzip2.c:1.8 Sat Apr 11 11:10:43 2009
+++ src/dist/bzip2/bzip2.c Mon Aug 29 13:51:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bzip2.c,v 1.8 2009/04/11 11:10:43 lukem Exp $ */
+/* $NetBSD: bzip2.c,v 1.9 2011/08/29 13:51:38 joerg Exp $ */
/*---*/
@@ -804,7 +804,7 @@
/*-*/
-static
+NORETURN static
void mySignalCatcher ( IntNative n )
{
fprintf ( stderr,
@@ -816,7 +816,7 @@
/*-*/
#ifndef SMALL
-static
+NORETURN static
void mySIGSEGVorSIGBUScatcher ( IntNative n )
{
if (opMode == OM_Z)
CVS commit: src/usr.bin/cal
Module Name:src
Committed By: joerg
Date: Mon Aug 29 13:55:22 UTC 2011
Modified Files:
src/usr.bin/cal: cal.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/cal/cal.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/cal/cal.c
diff -u src/usr.bin/cal/cal.c:1.26 src/usr.bin/cal/cal.c:1.27
--- src/usr.bin/cal/cal.c:1.26 Wed Feb 3 15:34:45 2010
+++ src/usr.bin/cal/cal.c Mon Aug 29 13:55:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cal.c,v 1.26 2010/02/03 15:34:45 roy Exp $ */
+/* $NetBSD: cal.c,v 1.27 2011/08/29 13:55:22 joerg Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)cal.c 8.4 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: cal.c,v 1.26 2010/02/03 15:34:45 roy Exp $);
+__RCSID($NetBSD: cal.c,v 1.27 2011/08/29 13:55:22 joerg Exp $);
#endif
#endif /* not lint */
@@ -73,7 +73,7 @@
{0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31},
};
-int empty[MAXDAYS] = {
+static int empty[MAXDAYS] = {
SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE,
SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE,
SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE,
@@ -81,15 +81,15 @@
SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE,
SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE,
};
-int shift_days[2][4][MAXDAYS + 1];
+static int shift_days[2][4][MAXDAYS + 1];
-const char *month_names[12] = {
+static const char *month_names[12] = {
January, February, March, April, May, June,
July, August, September, October, November, December,
};
-const char *day_headings = S M Tu W Th F S;
-const char *j_day_headings = S M Tu W Th F S;
+static const char *day_headings = S M Tu W Th F S;
+static const char *j_day_headings = S M Tu W Th F S;
/* leap years according to the julian calendar */
#define j_leap_year(y, m, d) \
@@ -152,7 +152,7 @@
#define leap_years_since_year_1(yr) \
((yr) / 4 - centuries_since_reform(yr) + quad_centuries_since_reform(yr))
-struct reform {
+static struct reform {
const char *country;
int ambiguity, year, month, date;
long first_missing_day;
@@ -195,24 +195,23 @@
{ NULL, 0,0, 0, 0, 0, 0 },
};
-int julian;
-int dow;
-int hilite;
-const char *md, *me;
-
-void init_hilite(void);
-int getnum(const char *);
-void gregorian_reform(const char *);
-void reform_day_array(int, int, int *, int *, int *,int *,int *,int *);
-int ascii_day(char *, int);
-void center(const char *, int, int);
-void day_array(int, int, int *);
-int day_in_week(int, int, int);
-int day_in_year(int, int, int);
-void monthrange(int, int, int, int, int);
-int main(int, char **);
-void trim_trailing_spaces(char *);
-void usage(void);
+static int julian;
+static int dow;
+static int hilite;
+static const char *md, *me;
+
+static void init_hilite(void);
+static int getnum(const char *);
+static void gregorian_reform(const char *);
+static void reform_day_array(int, int, int *, int *, int *,int *,int *,int *);
+static int ascii_day(char *, int);
+static void center(const char *, int, int);
+static void day_array(int, int, int *);
+static int day_in_week(int, int, int);
+static int day_in_year(int, int, int);
+static void monthrange(int, int, int, int, int);
+static void trim_trailing_spaces(char *);
+__dead static void usage(void);
int
main(int argc, char **argv)
@@ -338,7 +337,7 @@
#define MONTH_PER_ROW 3 /* how many monthes in a row */
#define J_MONTH_PER_ROW 2
-void
+static void
monthrange(int month, int year, int before, int after, int yearly)
{
int startmonth, startyear;
@@ -484,7 +483,7 @@
* out end to end. You would have 42 numbers or spaces. This routine
* builds that array for any month from Jan. 1 through Dec. .
*/
-void
+static void
day_array(int month, int year, int *days)
{
int day, dw, dm;
@@ -523,7 +522,7 @@
* day_in_year --
* return the 1 based day number within the year
*/
-int
+static int
day_in_year(int day, int month, int year)
{
int i, leap;
@@ -540,7 +539,7 @@
* 31 Dec. . Returns the day of the week of the first
* missing day for any given Gregorian shift.
*/
-int
+static int
day_in_week(int day, int month, int year)
{
long temp;
@@ -554,7 +553,7 @@
return ((FIRST_MISSING_DAY - dow + 6 + SATURDAY) % 7);
}
-int
+static int
ascii_day(char *p, int day)
{
int display, val, rc;
@@ -629,7 +628,7 @@
return (rc);
}
-void
+static void
trim_trailing_spaces(char *s)
{
char *p;
@@ -643,7 +642,7 @@
*p = '\0';
}
-void
+static void
center(const char *str, int len, int separate)
{
@@ -662,7 +661,7 @@
* doing so would not select more than one different built-in
* reform point.
*/
-void
+static void
gregorian_reform(const char *p)
{
int year, month, date;
@@ -807,7 +806,7 @@
* and julian day representations) with respect for days
* skipped during a reform
CVS commit: src/usr.bin/cap_mkdb
Module Name:src Committed By: joerg Date: Mon Aug 29 13:56:18 UTC 2011 Modified Files: src/usr.bin/cap_mkdb: cap_mkdb.c Log Message: usage() is not unused, it is dead To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.bin/cap_mkdb/cap_mkdb.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/cap_mkdb/cap_mkdb.c diff -u src/usr.bin/cap_mkdb/cap_mkdb.c:1.26 src/usr.bin/cap_mkdb/cap_mkdb.c:1.27 --- src/usr.bin/cap_mkdb/cap_mkdb.c:1.26 Sun Aug 14 12:50:10 2011 +++ src/usr.bin/cap_mkdb/cap_mkdb.c Mon Aug 29 13:56:17 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cap_mkdb.c,v 1.26 2011/08/14 12:50:10 christos Exp $ */ +/* $NetBSD: cap_mkdb.c,v 1.27 2011/08/29 13:56:17 joerg Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -40,7 +40,7 @@ #if 0 static char sccsid[] = @(#)cap_mkdb.c 8.2 (Berkeley) 4/27/95; #endif -__RCSID($NetBSD: cap_mkdb.c,v 1.26 2011/08/14 12:50:10 christos Exp $); +__RCSID($NetBSD: cap_mkdb.c,v 1.27 2011/08/29 13:56:17 joerg Exp $); #endif /* not lint */ #include sys/param.h @@ -58,7 +58,7 @@ static void db_build(const char **); static void dounlink(void); -static void usage(void) __unused; +static void usage(void) __dead; static int count_records(char **); static DB *capdbp;
CVS commit: src/usr.bin/cdplay
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:00:54 UTC 2011
Modified Files:
src/usr.bin/cdplay: cdplay.c
Log Message:
ANSIfy + static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/cdplay/cdplay.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/cdplay/cdplay.c
diff -u src/usr.bin/cdplay/cdplay.c:1.42 src/usr.bin/cdplay/cdplay.c:1.43
--- src/usr.bin/cdplay/cdplay.c:1.42 Sat Apr 11 11:52:35 2009
+++ src/usr.bin/cdplay/cdplay.c Mon Aug 29 14:00:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cdplay.c,v 1.42 2009/04/11 11:52:35 lukem Exp $ */
+/* $NetBSD: cdplay.c,v 1.43 2011/08/29 14:00:54 joerg Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran.
@@ -40,7 +40,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: cdplay.c,v 1.42 2009/04/11 11:52:35 lukem Exp $);
+__RCSID($NetBSD: cdplay.c,v 1.43 2011/08/29 14:00:54 joerg Exp $);
#endif /* not lint */
#include sys/types.h
@@ -90,7 +90,7 @@
CMD_VOLUME,
};
-struct cmdtab {
+static struct cmdtab {
enum cmd command;
const char *name;
unsigned int min;
@@ -134,17 +134,18 @@
#define CD_MAX_TRACK 99 /* largest 2 digit BCD number */
-struct cd_toc_entry toc_buffer[CD_MAX_TRACK + 1];
+static struct cd_toc_entry toc_buffer[CD_MAX_TRACK + 1];
-const char *cdname;
-int fd = -1;
-int msf = 1;
-int shuffle;
-int interactive = 1;
-int digital = 0;
-int tbvalid = 0;
-struct itimerval itv_timer;
-struct {
+static const char *cdname;
+static int fd = -1;
+static int msf = 1;
+static int shuffle;
+static int interactive = 1;
+static int digital = 0;
+static int tbvalid = 0;
+static struct itimerval itv_timer;
+
+static struct {
const char *auname;
u_char *audata, *aubuf;
int afd;
@@ -155,40 +156,38 @@
int read_errors;
} da;
-History *hist;
-HistEvent he;
-EditLine *elptr;
-
-int get_vol(int *, int *);
-int get_status(int *, int *, int *, int *, int *);
-void help(void);
-int info(const char *);
-void lba2msf(u_long, u_int *, u_int *, u_int *);
-int main(int, char **);
-u_int msf2lba(u_int, u_int, u_int);
-int opencd(void);
-int openaudio(void);
-const char *parse(char *, int *);
-int play(const char *, int);
-int play_blocks(int, int);
-int play_digital(int, int);
-int play_msf(int, int, int, int, int, int);
-int play_track(int, int, int, int);
-int print_status(const char *);
-void print_track(struct cd_toc_entry *);
-const char *prompt(void);
-int readaudio(int, int, int, u_char *);
-int read_toc_entrys(int);
-int run(int, const char *);
-int setvol(int, int);
-void sig_timer(int);
-int skip(int, int);
-const char *strstatus(int);
-void usage(void);
-
-void toc2msf(u_int, u_int *, u_int *, u_int *);
-int toc2lba(u_int);
-void addmsf(u_int *, u_int *, u_int *, u_int, u_int, u_int);
+static History *hist;
+static HistEvent he;
+static EditLine *elptr;
+
+static int get_status(int *, int *, int *, int *, int *);
+static void help(void);
+static int info(const char *);
+static void lba2msf(u_long, u_int *, u_int *, u_int *);
+static u_int msf2lba(u_int, u_int, u_int);
+static int opencd(void);
+static int openaudio(void);
+static const char *parse(char *, int *);
+static int play(const char *, int);
+static int play_blocks(int, int);
+static int play_digital(int, int);
+static int play_msf(int, int, int, int, int, int);
+static int play_track(int, int, int, int);
+static int print_status(const char *);
+static void print_track(struct cd_toc_entry *);
+static const char *prompt(void);
+static int readaudio(int, int, int, u_char *);
+static int read_toc_entrys(int);
+static int run(int, const char *);
+static int setvol(int, int);
+static void sig_timer(int);
+static int skip(int, int);
+static const char *strstatus(int);
+__dead static void usage(void);
+
+static void toc2msf(u_int, u_int *, u_int *, u_int *);
+static int toc2lba(u_int);
+static void addmsf(u_int *, u_int *, u_int *, u_int, u_int, u_int);
int
main(int argc, char **argv)
@@ -314,7 +313,7 @@
/* NOTREACHED */
}
-void
+static void
usage(void)
{
@@ -323,7 +322,7 @@
/* NOTREACHED */
}
-void
+static void
help(void)
{
const struct cmdtab *c, *mc;
@@ -345,7 +344,7 @@
The plain target address is taken as a synonym for play.\n);
}
-int
+static int
run(int cmd, const char *arg)
{
int l, r, rv;
@@ -600,7 +599,7 @@
return (rv);
}
-int
+static int
play(const char *arg, int fromuser)
{
int rv, start, end, istart, iend, blk, len, relend;
@@ -823,7 +822,7 @@
return (0);
}
-void
+static void
sig_timer(int sig)
{
int aulen, auwr, fpw;
@@ -861,7 +860,7 @@
setitimer(ITIMER_REAL, itv_timer, NULL);
}
-int
+static int
skip(int dir, int fromuser)
{
char str[16];
@@ -899,7 +898,7 @@
return (play(str, 0));
}
-const char *
+static const char *
strstatus(int sts)
{
const char *str;
@@ -931,7 +930,7 @@
return (str);
}
-int
CVS commit: src/usr.bin/chflags
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:05:09 UTC 2011
Modified Files:
src/usr.bin/chflags: chflags.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/chflags/chflags.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/chflags/chflags.c
diff -u src/usr.bin/chflags/chflags.c:1.15 src/usr.bin/chflags/chflags.c:1.16
--- src/usr.bin/chflags/chflags.c:1.15 Mon Jul 21 14:19:21 2008
+++ src/usr.bin/chflags/chflags.c Mon Aug 29 14:05:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chflags.c,v 1.15 2008/07/21 14:19:21 lukem Exp $ */
+/* $NetBSD: chflags.c,v 1.16 2011/08/29 14:05:08 joerg Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = from: @(#)chflags.c 8.5 (Berkeley) 4/1/94;
#else
-__RCSID($NetBSD: chflags.c,v 1.15 2008/07/21 14:19:21 lukem Exp $);
+__RCSID($NetBSD: chflags.c,v 1.16 2011/08/29 14:05:08 joerg Exp $);
#endif
#endif /* not lint */
@@ -55,7 +55,7 @@
#include unistd.h
#include util.h
-void usage(void);
+__dead static void usage(void);
int
main(int argc, char *argv[])
@@ -191,7 +191,7 @@
exit(rval);
}
-void
+static void
usage(void)
{
CVS commit: src/usr.sbin/installboot
Module Name:src Committed By: alnsn Date: Mon Aug 29 14:09:02 UTC 2011 Modified Files: src/usr.sbin/installboot: installboot.8 Log Message: Typo. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/usr.sbin/installboot/installboot.8 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/installboot/installboot.8 diff -u src/usr.sbin/installboot/installboot.8:1.77 src/usr.sbin/installboot/installboot.8:1.78 --- src/usr.sbin/installboot/installboot.8:1.77 Wed Aug 3 14:47:28 2011 +++ src/usr.sbin/installboot/installboot.8 Mon Aug 29 14:09:01 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: installboot.8,v 1.77 2011/08/03 14:47:28 gdt Exp $ +.\ $NetBSD: installboot.8,v 1.78 2011/08/29 14:09:01 alnsn Exp $ .\ .\ Copyright (c) 2002-2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -73,7 +73,7 @@ or disable an existing bootstrap in .Ar filesystem . .Pp -One some architectures the options of an existing installed bootstrap, +On some architectures the options of an existing installed bootstrap, or those of a bootstrap file can be changed. Installing a new primary bootstrap will reset those options to default values.
CVS commit: src/usr.bin/cksum
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:12:29 UTC 2011
Modified Files:
src/usr.bin/cksum: cksum.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/usr.bin/cksum/cksum.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/cksum/cksum.c
diff -u src/usr.bin/cksum/cksum.c:1.44 src/usr.bin/cksum/cksum.c:1.45
--- src/usr.bin/cksum/cksum.c:1.44 Fri Jan 2 09:42:51 2009
+++ src/usr.bin/cksum/cksum.c Mon Aug 29 14:12:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cksum.c,v 1.44 2009/01/02 09:42:51 lukem Exp $ */
+/* $NetBSD: cksum.c,v 1.45 2011/08/29 14:12:29 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -81,7 +81,7 @@
#if 0
static char sccsid[] = @(#)cksum.c 8.2 (Berkeley) 4/28/95;
#endif
-__RCSID($NetBSD: cksum.c,v 1.44 2009/01/02 09:42:51 lukem Exp $);
+__RCSID($NetBSD: cksum.c,v 1.45 2011/08/29 14:12:29 joerg Exp $);
#endif /* not lint */
#include sys/types.h
@@ -142,9 +142,9 @@
{ .progname = NULL, },
};
-int hash_digest_file(char *, const struct hash *, int);
-void requirehash(const char *);
-void usage(void);
+static int hash_digest_file(char *, const struct hash *, int);
+__dead static void requirehash(const char *);
+__dead static void usage(void);
int
main(int argc, char **argv)
@@ -497,7 +497,7 @@
exit(rval);
}
-int
+static int
hash_digest_file(char *fn, const struct hash *hash, int normal)
{
char *cp;
@@ -516,14 +516,14 @@
return 0;
}
-void
+static void
requirehash(const char *flg)
{
warnx(%s flag requires `-a algorithm', flg);
usage();
}
-void
+static void
usage(void)
{
const char fileargs[] = [file ... | -c [-w] [sumfile]];
CVS commit: src/sbin/devpubd
Module Name:src Committed By: wiz Date: Mon Aug 29 14:21:50 UTC 2011 Added Files: src/sbin/devpubd: devpubd.8 Log Message: Add minimal devpubd man page, not hooked into the build yet. XXX: someone should write drvctl(4) To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sbin/devpubd/devpubd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sbin/devpubd/devpubd.8 diff -u /dev/null src/sbin/devpubd/devpubd.8:1.1 --- /dev/null Mon Aug 29 14:21:50 2011 +++ src/sbin/devpubd/devpubd.8 Mon Aug 29 14:21:50 2011 @@ -0,0 +1,54 @@ +.\ $NetBSD: devpubd.8,v 1.1 2011/08/29 14:21:50 wiz Exp $ +.\ +.\ Copyright (c) 2011 The NetBSD Foundation, Inc. +.\ All rights reserved. +.\ +.\ This code is derived from software contributed to The NetBSD Foundation +.\ by Thomas Klausner. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\ POSSIBILITY OF SUCH DAMAGE. +.\ +.Dd August 29, 2011 +.Dt DEVPUBD 8 +.Os +.Sh NAME +.Nm devpubd +.Nd device publish daemon for automatic device node creation +.Sh SYNOPSIS +.Nm +.Op Fl f +.Sh DESCRIPTION +.Nm +listens on +.Xr drvctl 4 +for new devices and creates their device nodes using +.Xr MAKEDEV 8 +if they are missing. +.Pp +When +.Fl f +is specified, +.Nm +does not go into the background. +.Sh SEE ALSO +.Xr drvctl 8 , +.Xr MAKEDEV 8
CVS commit: src/usr.bin/rsh
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:22:47 UTC 2011
Modified Files:
src/usr.bin/rsh: rsh.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/rsh/rsh.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/rsh/rsh.c
diff -u src/usr.bin/rsh/rsh.c:1.32 src/usr.bin/rsh/rsh.c:1.33
--- src/usr.bin/rsh/rsh.c:1.32 Sat Oct 2 09:24:16 2010
+++ src/usr.bin/rsh/rsh.c Mon Aug 29 14:22:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rsh.c,v 1.32 2010/10/02 09:24:16 gson Exp $ */
+/* $NetBSD: rsh.c,v 1.33 2011/08/29 14:22:46 joerg Exp $ */
/*-
* Copyright (c) 1983, 1990, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)rsh.c 8.4 (Berkeley) 4/29/95;
#else
-__RCSID($NetBSD: rsh.c,v 1.32 2010/10/02 09:24:16 gson Exp $);
+__RCSID($NetBSD: rsh.c,v 1.33 2011/08/29 14:22:46 joerg Exp $);
#endif
#endif /* not lint */
@@ -75,12 +75,11 @@
static int sigs[] = { SIGINT, SIGTERM, SIGQUIT };
-char *copyargs(char **);
-void sendsig(int);
-int checkfd(struct pollfd *, int);
-void talk(int, sigset_t *, pid_t, int);
-void usage(void);
-int main(int, char **);
+static char *copyargs(char **);
+static void sendsig(int);
+static int checkfd(struct pollfd *, int);
+static void talk(int, sigset_t *, pid_t, int);
+__dead static void usage(void);
#ifdef IN_RCMD
int orcmd(char **, int, const char *,
const char *, const char *, int *);
@@ -298,7 +297,7 @@
exit(0);
}
-int
+static int
checkfd(struct pollfd *fdp, int outfd)
{
int nr, nw;
@@ -336,7 +335,7 @@
}
}
-void
+static void
talk(int nflag, sigset_t *oset, __pid_t pid, int rem)
{
int nr, nw, nfds;
@@ -426,7 +425,7 @@
while (nfds);
}
-void
+static void
sendsig(int sig)
{
char signo;
@@ -436,7 +435,7 @@
}
-char *
+static char *
copyargs(char **argv)
{
int cc;
@@ -458,7 +457,7 @@
return (args);
}
-void
+static void
usage(void)
{
CVS commit: src/usr.bin
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:24:03 UTC 2011
Modified Files:
src/usr.bin/at: at.c
src/usr.bin/banner: banner.c
src/usr.bin/basename: basename.c
src/usr.bin/biff: biff.c
src/usr.bin/btkey: btkey.c
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.bin/at/at.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/banner/banner.c
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/basename/basename.c
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/biff/biff.c
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/btkey/btkey.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/at/at.c
diff -u src/usr.bin/at/at.c:1.29 src/usr.bin/at/at.c:1.30
--- src/usr.bin/at/at.c:1.29 Sun Aug 14 13:41:17 2011
+++ src/usr.bin/at/at.c Mon Aug 29 14:24:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: at.c,v 1.29 2011/08/14 13:41:17 christos Exp $ */
+/* $NetBSD: at.c,v 1.30 2011/08/29 14:24:03 joerg Exp $ */
/*
* at.c : Put file into atrun queue
@@ -72,7 +72,7 @@
#if 0
static char rcsid[] = $OpenBSD: at.c,v 1.15 1998/06/03 16:20:26 deraadt Exp $;
#else
-__RCSID($NetBSD: at.c,v 1.29 2011/08/14 13:41:17 christos Exp $);
+__RCSID($NetBSD: at.c,v 1.30 2011/08/29 14:24:03 joerg Exp $);
#endif
#endif
@@ -91,8 +91,8 @@
/* Function declarations */
-static void sigc (int);
-static void alarmc (int);
+__dead static void sigc (int);
+__dead static void alarmc (int);
static char *cwdname (void);
static int nextjob (void);
static void writefile (time_t, unsigned char);
Index: src/usr.bin/banner/banner.c
diff -u src/usr.bin/banner/banner.c:1.12 src/usr.bin/banner/banner.c:1.13
--- src/usr.bin/banner/banner.c:1.12 Mon Jul 21 14:19:21 2008
+++ src/usr.bin/banner/banner.c Mon Aug 29 14:24:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: banner.c,v 1.12 2008/07/21 14:19:21 lukem Exp $ */
+/* $NetBSD: banner.c,v 1.13 2011/08/29 14:24:03 joerg Exp $ */
/*
* Changes for banner(1)
@@ -58,7 +58,7 @@
#if 0
static char sccsid[] = @(#)printjob.c 8.2 (Berkeley) 4/16/94;
#else
-__RCSID($NetBSD: banner.c,v 1.12 2008/07/21 14:19:21 lukem Exp $);
+__RCSID($NetBSD: banner.c,v 1.13 2011/08/29 14:24:03 joerg Exp $);
#endif
#endif /* not lint */
@@ -82,7 +82,7 @@
static int dropit (int);
static void scan_out (int, char *, int);
static char *scnline (int, char *, int);
-static void usage(void);
+__dead static void usage(void);
/* the char gen code below is lifted from lpd */
@@ -202,7 +202,7 @@
exit(0);
}
-void
+static void
usage(void)
{
fprintf(stderr, usage: %s [-f fgchar] [-b bgchar] [-l] message...\n,
Index: src/usr.bin/basename/basename.c
diff -u src/usr.bin/basename/basename.c:1.14 src/usr.bin/basename/basename.c:1.15
--- src/usr.bin/basename/basename.c:1.14 Mon Jul 21 14:19:21 2008
+++ src/usr.bin/basename/basename.c Mon Aug 29 14:24:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: basename.c,v 1.14 2008/07/21 14:19:21 lukem Exp $ */
+/* $NetBSD: basename.c,v 1.15 2011/08/29 14:24:03 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)basename.c 8.4 (Berkeley) 5/4/95;
#endif
-__RCSID($NetBSD: basename.c,v 1.14 2008/07/21 14:19:21 lukem Exp $);
+__RCSID($NetBSD: basename.c,v 1.15 2011/08/29 14:24:03 joerg Exp $);
#endif /* not lint */
#include err.h
@@ -50,7 +50,7 @@
#include string.h
#include unistd.h
-static void usage(void);
+__dead static void usage(void);
int
main(int argc, char **argv)
Index: src/usr.bin/biff/biff.c
diff -u src/usr.bin/biff/biff.c:1.10 src/usr.bin/biff/biff.c:1.11
--- src/usr.bin/biff/biff.c:1.10 Mon Jul 21 14:19:21 2008
+++ src/usr.bin/biff/biff.c Mon Aug 29 14:24:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: biff.c,v 1.10 2008/07/21 14:19:21 lukem Exp $ */
+/* $NetBSD: biff.c,v 1.11 2011/08/29 14:24:03 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)biff.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: biff.c,v 1.10 2008/07/21 14:19:21 lukem Exp $);
+__RCSID($NetBSD: biff.c,v 1.11 2011/08/29 14:24:03 joerg Exp $);
#endif
#endif /* not lint */
@@ -53,7 +53,7 @@
#include string.h
#include unistd.h
-static void usage(void);
+__dead static void usage(void);
int
main(int argc, char *argv[])
Index: src/usr.bin/btkey/btkey.c
diff -u src/usr.bin/btkey/btkey.c:1.3 src/usr.bin/btkey/btkey.c:1.4
--- src/usr.bin/btkey/btkey.c:1.3 Thu Dec 10 18:57:31 2009
+++ src/usr.bin/btkey/btkey.c Mon Aug 29 14:24:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: btkey.c,v 1.3 2009/12/10 18:57:31 plunky Exp $ */
+/* $NetBSD: btkey.c,v 1.4 2011/08/29 14:24:03 joerg Exp $ */
/*-
* Copyright (c) 2007 Iain Hibbert
@@ -29,7 +29,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2007 Iain Hibbert. All rights reserved.);
-__RCSID($NetBSD: btkey.c,v 1.3 2009/12/10 18:57:31 plunky Exp $);
+__RCSID($NetBSD: btkey.c,v 1.4 2011/08/29 14:24:03
CVS commit: src/sbin/brconfig
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:29:21 UTC 2011
Modified Files:
src/sbin/brconfig: brconfig.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sbin/brconfig/brconfig.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/brconfig/brconfig.c
diff -u src/sbin/brconfig/brconfig.c:1.12 src/sbin/brconfig/brconfig.c:1.13
--- src/sbin/brconfig/brconfig.c:1.12 Mon Mar 16 12:56:19 2009
+++ src/sbin/brconfig/brconfig.c Mon Aug 29 14:29:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: brconfig.c,v 1.12 2009/03/16 12:56:19 lukem Exp $ */
+/* $NetBSD: brconfig.c,v 1.13 2011/08/29 14:29:21 joerg Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -43,7 +43,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: brconfig.c,v 1.12 2009/03/16 12:56:19 lukem Exp $);
+__RCSID($NetBSD: brconfig.c,v 1.13 2011/08/29 14:29:21 joerg Exp $);
#endif
@@ -74,29 +74,29 @@
#define CMD_INVERT 0x01 /* invert the sense of the command */
-void cmd_add(const struct command *, int, const char *, char **);
-void cmd_delete(const struct command *, int, const char *, char **);
-void cmd_up(const struct command *, int, const char *, char **);
-void cmd_down(const struct command *, int, const char *, char **);
-void cmd_discover(const struct command *, int, const char *, char **);
-void cmd_learn(const struct command *, int, const char *, char **);
-void cmd_flush(const struct command *, int, const char *, char **);
-void cmd_flushall(const struct command *, int, const char *, char **);
-void cmd_static(const struct command *, int, const char *, char **);
-void cmd_deladdr(const struct command *, int, const char *, char **);
-void cmd_addr(const struct command *, int, const char *, char **);
-void cmd_maxaddr(const struct command *, int, const char *, char **);
-void cmd_hellotime(const struct command *, int, const char *, char **);
-void cmd_fwddelay(const struct command *, int, const char *, char **);
-void cmd_maxage(const struct command *, int, const char *, char **);
-void cmd_priority(const struct command *, int, const char *, char **);
-void cmd_ifpriority(const struct command *, int, const char *, char **);
-void cmd_ifpathcost(const struct command *, int, const char *, char **);
-void cmd_timeout(const struct command *, int, const char *, char **);
-void cmd_stp(const struct command *, int, const char *, char **);
-void cmd_ipf(const struct command *, int, const char *, char **);
+static void cmd_add(const struct command *, int, const char *, char **);
+static void cmd_delete(const struct command *, int, const char *, char **);
+static void cmd_up(const struct command *, int, const char *, char **);
+static void cmd_down(const struct command *, int, const char *, char **);
+static void cmd_discover(const struct command *, int, const char *, char **);
+static void cmd_learn(const struct command *, int, const char *, char **);
+static void cmd_flush(const struct command *, int, const char *, char **);
+static void cmd_flushall(const struct command *, int, const char *, char **);
+static void cmd_static(const struct command *, int, const char *, char **);
+static void cmd_deladdr(const struct command *, int, const char *, char **);
+static void cmd_addr(const struct command *, int, const char *, char **);
+static void cmd_maxaddr(const struct command *, int, const char *, char **);
+static void cmd_hellotime(const struct command *, int, const char *, char **);
+static void cmd_fwddelay(const struct command *, int, const char *, char **);
+static void cmd_maxage(const struct command *, int, const char *, char **);
+static void cmd_priority(const struct command *, int, const char *, char **);
+static void cmd_ifpriority(const struct command *, int, const char *, char **);
+static void cmd_ifpathcost(const struct command *, int, const char *, char **);
+static void cmd_timeout(const struct command *, int, const char *, char **);
+static void cmd_stp(const struct command *, int, const char *, char **);
+static void cmd_ipf(const struct command *, int, const char *, char **);
-const struct command command_table[] = {
+static const struct command command_table[] = {
{ add, 1, 0, cmd_add },
{ delete, 1, 0, cmd_delete },
@@ -134,25 +134,25 @@
{ NULL, 0, 0, NULL },
};
-void printall(int);
-void status(int, const char *);
-int is_bridge(const char *);
-void show_config(int, const char *, const char *);
-void show_interfaces(int, const char *, const char *);
-void show_addresses(int, const char *, const char *);
-int get_val(const char *, u_long *);
-int do_cmd(int, const char *, u_long, void *, size_t, int);
-void do_ifflag(int, const char *, int, int);
-void do_bridgeflag(int, const char *, const char *, int, int);
+static void printall(int);
+static void status(int, const char *);
+static int is_bridge(const char *);
+static void
CVS commit: src/sbin/savecore
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:30:38 UTC 2011
Modified Files:
src/sbin/savecore: savecore.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sbin/savecore/savecore.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/savecore/savecore.c
diff -u src/sbin/savecore/savecore.c:1.81 src/sbin/savecore/savecore.c:1.82
--- src/sbin/savecore/savecore.c:1.81 Tue Aug 18 04:02:39 2009
+++ src/sbin/savecore/savecore.c Mon Aug 29 14:30:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: savecore.c,v 1.81 2009/08/18 04:02:39 dogcow Exp $ */
+/* $NetBSD: savecore.c,v 1.82 2011/08/29 14:30:38 joerg Exp $ */
/*-
* Copyright (c) 1986, 1992, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)savecore.c 8.5 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: savecore.c,v 1.81 2009/08/18 04:02:39 dogcow Exp $);
+__RCSID($NetBSD: savecore.c,v 1.82 2011/08/29 14:30:38 joerg Exp $);
#endif
#endif /* not lint */
@@ -75,7 +75,7 @@
#define KREAD(kd, addr, p)\
(kvm_read(kd, addr, (char *)(p), sizeof(*(p))) != sizeof(*(p)))
-struct nlist current_nl[] = { /* Namelist for currently running system. */
+static struct nlist current_nl[] = { /* Namelist for currently running system. */
#define X_DUMPDEV 0
{ .n_name = _dumpdev },
#define X_DUMPLO 1
@@ -110,11 +110,11 @@
{ .n_name = _ksyms_symtabs },
{ .n_name = NULL },
};
-int cursyms[] = { X_DUMPDEV, X_DUMPLO, X_VERSION, X_DUMPMAG, X_DUMPCDEV, -1 };
-int dumpsyms[] = { X_TIME_SECOND, X_TIME, X_DUMPSIZE, X_VERSION, X_PANICSTR,
+static int cursyms[] = { X_DUMPDEV, X_DUMPLO, X_VERSION, X_DUMPMAG, X_DUMPCDEV, -1 };
+static int dumpsyms[] = { X_TIME_SECOND, X_TIME, X_DUMPSIZE, X_VERSION, X_PANICSTR,
X_DUMPMAG, X_SYMSZ, X_STRSZ, X_KHDR, X_SYMTABS, -1 };
-struct nlist dump_nl[] = { /* Name list for dumped system. */
+static struct nlist dump_nl[] = { /* Name list for dumped system. */
{ .n_name = _dumpdev }, /* Entries MUST be the same as */
{ .n_name = _dumplo }, /* those in current_nl[]. */
{ .n_name = _time_second },
@@ -135,41 +135,39 @@
};
/* Types match kernel declarations. */
-off_t dumplo;/* where dump starts on dumpdev */
-u_int32_t dumpmag; /* magic number in dump */
-int dumpsize; /* amount of memory dumped */
-off_t dumpbytes; /* in bytes */
-
-const char *kernel; /* name of used kernel */
-char *dirname; /* directory to save dumps in */
-char *ddname; /* name of dump device */
-dev_t dumpdev; /* dump device */
-dev_t dumpcdev = NODEV; /* dump device (char equivalent) */
-int dumpfd;/* read/write descriptor on dev */
-kvm_t *kd_dump; /* kvm descriptor on dev */
-time_t now;/* current date */
-char panic_mesg[1024];
-long panicstr;
-char vers[1024];
-char gzmode[3];
+static off_t dumplo;/* where dump starts on dumpdev */
+static u_int32_t dumpmag; /* magic number in dump */
+static int dumpsize; /* amount of memory dumped */
+static off_t dumpbytes; /* in bytes */
+
+static const char *kernel; /* name of used kernel */
+static char *dirname; /* directory to save dumps in */
+static char *ddname; /* name of dump device */
+static dev_t dumpdev; /* dump device */
+static dev_t dumpcdev = NODEV; /* dump device (char equivalent) */
+static int dumpfd;/* read/write descriptor on dev */
+static kvm_t *kd_dump; /* kvm descriptor on dev */
+static time_t now;/* current date */
+static char panic_mesg[1024];
+static long panicstr;
+static char vers[1024];
+static char gzmode[3];
static int clear, compress, force, verbose; /* flags */
-void check_kmem(void);
-int check_space(void);
-void clear_dump(void);
-int Create(char *, int);
-int dump_exists(void);
-char *find_dev(dev_t, mode_t);
-int get_crashtime(void);
-void kmem_setup(void);
-void Lseek(int, off_t, int);
-int main(int, char *[]);
-int Open(const char *, int rw);
-char *rawname(char *s);
-void save_core(void);
-void usage(void);
-void Write(int, void *, int);
+static void check_kmem(void);
+static int check_space(void);
+static void clear_dump(void);
+static int Create(char *, int);
+static int dump_exists(void);
+static char *find_dev(dev_t, mode_t);
+static int get_crashtime(void);
+static void kmem_setup(void);
+static void Lseek(int, off_t, int);
+static int Open(const char *, int rw);
+static char *rawname(char *s);
+static void save_core(void);
+__dead static void usage(void);
int
main(int argc, char *argv[])
@@ -259,7 +257,7 @@
exit(0);
}
-void
+static void
kmem_setup(void)
{
kvm_t *kd_kern;
@@ -392,7 +390,7 @@
kvm_close(kd_kern);
}
-void
+static void
check_kmem(void)
{
char *cp, *bufdata;
@@ -490,7 +488,7 @@
}
}
-int
+static int
dump_exists(void)
{
u_int32_t newdumpmag;
@@ -525,7 +523,7 @@
return (1);
}
-void
+static void
clear_dump(void)
{
if (kvm_dump_inval(kd_dump) == -1)
@@ -534,7 +532,7 @@
}
-char
CVS commit: src/sbin
Module Name:src Committed By: joerg Date: Mon Aug 29 14:35:04 UTC 2011 Modified Files: src/sbin/bioctl: bioctl.c src/sbin/cgdconfig: cgdconfig.c src/sbin/chown: chown.c src/sbin/disklabel: main.c src/sbin/dmesg: dmesg.c src/sbin/drvctl: drvctl.c src/sbin/dump: dumprmt.c src/sbin/fsck_ffs: main.c src/sbin/fsdb: fsdb.c src/sbin/ifconfig: ifconfig.c media.c src/sbin/mount: mount.c src/sbin/mount_ados: mount_ados.c src/sbin/mount_cd9660: mount_cd9660.c src/sbin/mount_efs: mount_efs.c src/sbin/mount_ext2fs: mount_ext2fs.c src/sbin/mount_fdesc: mount_fdesc.c src/sbin/mount_ffs: mount_ffs.c src/sbin/mount_filecore: mount_filecore.c src/sbin/mount_hfs: mount_hfs.c src/sbin/mount_kernfs: mount_kernfs.c src/sbin/mount_lfs: mount_lfs.c src/sbin/mount_nfs: mount_nfs.c src/sbin/mount_null: mount_null.c src/sbin/mount_overlay: mount_overlay.c src/sbin/mount_portal: puffs_portal.c src/sbin/mount_procfs: mount_procfs.c src/sbin/mount_ptyfs: mount_ptyfs.c src/sbin/mount_puffs: mount_puffs.c src/sbin/mount_sysvbfs: mount_sysvbfs.c src/sbin/mount_umap: mount_umap.c src/sbin/mount_union: mount_union.c src/sbin/newfs_msdos: newfs_msdos.c src/sbin/newfs_sysvbfs: newfs_sysvbfs.c src/sbin/raidctl: raidctl.c src/sbin/restore: main.c tape.c src/sbin/route: route.c src/sbin/routed: defs.h src/sbin/routed/rtquery: rtquery.c src/sbin/scsictl: scsictl.c src/sbin/sysctl: sysctl.c src/sbin/tunefs: tunefs.c src/sbin/veriexecctl: veriexecctl.c Log Message: Use __dead To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sbin/bioctl/bioctl.c cvs rdiff -u -r1.32 -r1.33 src/sbin/cgdconfig/cgdconfig.c cvs rdiff -u -r1.4 -r1.5 src/sbin/chown/chown.c cvs rdiff -u -r1.24 -r1.25 src/sbin/disklabel/main.c cvs rdiff -u -r1.26 -r1.27 src/sbin/dmesg/dmesg.c cvs rdiff -u -r1.12 -r1.13 src/sbin/drvctl/drvctl.c cvs rdiff -u -r1.33 -r1.34 src/sbin/dump/dumprmt.c cvs rdiff -u -r1.79 -r1.80 src/sbin/fsck_ffs/main.c cvs rdiff -u -r1.42 -r1.43 src/sbin/fsdb/fsdb.c cvs rdiff -u -r1.225 -r1.226 src/sbin/ifconfig/ifconfig.c cvs rdiff -u -r1.5 -r1.6 src/sbin/ifconfig/media.c cvs rdiff -u -r1.92 -r1.93 src/sbin/mount/mount.c cvs rdiff -u -r1.28 -r1.29 src/sbin/mount_ados/mount_ados.c cvs rdiff -u -r1.31 -r1.32 src/sbin/mount_cd9660/mount_cd9660.c cvs rdiff -u -r1.4 -r1.5 src/sbin/mount_efs/mount_efs.c cvs rdiff -u -r1.21 -r1.22 src/sbin/mount_ext2fs/mount_ext2fs.c cvs rdiff -u -r1.25 -r1.26 src/sbin/mount_fdesc/mount_fdesc.c cvs rdiff -u -r1.26 -r1.27 src/sbin/mount_ffs/mount_ffs.c cvs rdiff -u -r1.19 -r1.20 src/sbin/mount_filecore/mount_filecore.c cvs rdiff -u -r1.8 -r1.9 src/sbin/mount_hfs/mount_hfs.c cvs rdiff -u -r1.24 -r1.25 src/sbin/mount_kernfs/mount_kernfs.c cvs rdiff -u -r1.33 -r1.34 src/sbin/mount_lfs/mount_lfs.c cvs rdiff -u -r1.68 -r1.69 src/sbin/mount_nfs/mount_nfs.c cvs rdiff -u -r1.18 -r1.19 src/sbin/mount_null/mount_null.c cvs rdiff -u -r1.12 -r1.13 src/sbin/mount_overlay/mount_overlay.c cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_portal/puffs_portal.c cvs rdiff -u -r1.23 -r1.24 src/sbin/mount_procfs/mount_procfs.c cvs rdiff -u -r1.11 -r1.12 src/sbin/mount_ptyfs/mount_ptyfs.c cvs rdiff -u -r1.3 -r1.4 src/sbin/mount_puffs/mount_puffs.c cvs rdiff -u -r1.7 -r1.8 src/sbin/mount_sysvbfs/mount_sysvbfs.c cvs rdiff -u -r1.22 -r1.23 src/sbin/mount_umap/mount_umap.c cvs rdiff -u -r1.21 -r1.22 src/sbin/mount_union/mount_union.c cvs rdiff -u -r1.35 -r1.36 src/sbin/newfs_msdos/newfs_msdos.c cvs rdiff -u -r1.7 -r1.8 src/sbin/newfs_sysvbfs/newfs_sysvbfs.c cvs rdiff -u -r1.52 -r1.53 src/sbin/raidctl/raidctl.c cvs rdiff -u -r1.33 -r1.34 src/sbin/restore/main.c cvs rdiff -u -r1.65 -r1.66 src/sbin/restore/tape.c cvs rdiff -u -r1.131 -r1.132 src/sbin/route/route.c cvs rdiff -u -r1.25 -r1.26 src/sbin/routed/defs.h cvs rdiff -u -r1.22 -r1.23 src/sbin/routed/rtquery/rtquery.c cvs rdiff -u -r1.32 -r1.33 src/sbin/scsictl/scsictl.c cvs rdiff -u -r1.137 -r1.138 src/sbin/sysctl/sysctl.c cvs rdiff -u -r1.43 -r1.44 src/sbin/tunefs/tunefs.c cvs rdiff -u -r1.34 -r1.35 src/sbin/veriexecctl/veriexecctl.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/bioctl/bioctl.c diff -u src/sbin/bioctl/bioctl.c:1.14 src/sbin/bioctl/bioctl.c:1.15 --- src/sbin/bioctl/bioctl.c:1.14 Wed May 25 15:34:19 2011 +++ src/sbin/bioctl/bioctl.c Mon Aug 29 14:34:58 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bioctl.c,v 1.14 2011/05/25 15:34:19 joerg Exp $ */ +/* $NetBSD: bioctl.c,v 1.15 2011/08/29 14:34:58 joerg Exp $ */ /* $OpenBSD: bioctl.c,v 1.52 2007/03/20 15:26:06 jmc Exp $ */ /* @@ -31,7 +31,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD:
CVS commit: src/bin/ln
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:38:30 UTC 2011
Modified Files:
src/bin/ln: ln.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/bin/ln/ln.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ln/ln.c
diff -u src/bin/ln/ln.c:1.34 src/bin/ln/ln.c:1.35
--- src/bin/ln/ln.c:1.34 Sun Jul 20 00:52:40 2008
+++ src/bin/ln/ln.c Mon Aug 29 14:38:30 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ln.c,v 1.34 2008/07/20 00:52:40 lukem Exp $ */
+/* $NetBSD: ln.c,v 1.35 2011/08/29 14:38:30 joerg Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)ln.c 8.2 (Berkeley) 3/31/94;
#else
-__RCSID($NetBSD: ln.c,v 1.34 2008/07/20 00:52:40 lukem Exp $);
+__RCSID($NetBSD: ln.c,v 1.35 2011/08/29 14:38:30 joerg Exp $);
#endif
#endif /* not lint */
@@ -54,19 +54,18 @@
#include string.h
#include unistd.h
-int fflag;/* Unlink existing files. */
-int hflag;/* Check new name for symlink first. */
-int iflag;/* Interactive mode. */
-int sflag;/* Symbolic, not hard, link. */
-int vflag; /* Verbose output */
+static int fflag;/* Unlink existing files. */
+static int hflag;/* Check new name for symlink first. */
+static int iflag;/* Interactive mode. */
+static int sflag;/* Symbolic, not hard, link. */
+static int vflag; /* Verbose output */
/* System link call. */
-int (*linkf)(const char *, const char *);
-char linkch;
+static int (*linkf)(const char *, const char *);
+static char linkch;
-int linkit(const char *, const char *, int);
-void usage(void);
-int main(int, char *[]);
+static int linkit(const char *, const char *, int);
+__dead static void usage(void);
int
main(int argc, char *argv[])
@@ -150,7 +149,7 @@
/* NOTREACHED */
}
-int
+static int
linkit(const char *target, const char *source, int isdir)
{
struct stat sb;
@@ -219,7 +218,7 @@
return (0);
}
-void
+static void
usage(void)
{
CVS commit: src/bin/ls
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:44:22 UTC 2011
Modified Files:
src/bin/ls: extern.h ls.c util.c
Log Message:
Move usage and mark it static+dead
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/bin/ls/extern.h
cvs rdiff -u -r1.68 -r1.69 src/bin/ls/ls.c
cvs rdiff -u -r1.33 -r1.34 src/bin/ls/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ls/extern.h
diff -u src/bin/ls/extern.h:1.16 src/bin/ls/extern.h:1.17
--- src/bin/ls/extern.h:1.16 Thu Dec 14 20:09:36 2006
+++ src/bin/ls/extern.h Mon Aug 29 14:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.16 2006/12/14 20:09:36 he Exp $ */
+/* $NetBSD: extern.h,v 1.17 2011/08/29 14:44:21 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -51,4 +51,3 @@
void printscol(DISPLAY *);
void printstream(DISPLAY *);
int safe_print(const char *);
-void usage(void);
Index: src/bin/ls/ls.c
diff -u src/bin/ls/ls.c:1.68 src/bin/ls/ls.c:1.69
--- src/bin/ls/ls.c:1.68 Tue Mar 15 03:52:37 2011
+++ src/bin/ls/ls.c Mon Aug 29 14:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ls.c,v 1.68 2011/03/15 03:52:37 erh Exp $ */
+/* $NetBSD: ls.c,v 1.69 2011/08/29 14:44:21 joerg Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)ls.c 8.7 (Berkeley) 8/5/94;
#else
-__RCSID($NetBSD: ls.c,v 1.68 2011/03/15 03:52:37 erh Exp $);
+__RCSID($NetBSD: ls.c,v 1.69 2011/08/29 14:44:21 joerg Exp $);
#endif
#endif /* not lint */
@@ -112,6 +112,17 @@
int f_typedir; /* add type character for directories */
int f_whiteout; /* show whiteout entries */
+__dead static void
+usage(void)
+{
+
+ (void)fprintf(stderr,
+ usage: %s [-AaBbCcdFfghikLlMmnopqRrSsTtuWwx1] [file ...]\n,
+ getprogname());
+ exit(EXIT_FAILURE);
+ /* NOTREACHED */
+}
+
int
ls_main(int argc, char *argv[])
{
Index: src/bin/ls/util.c
diff -u src/bin/ls/util.c:1.33 src/bin/ls/util.c:1.34
--- src/bin/ls/util.c:1.33 Tue Mar 15 08:36:16 2011
+++ src/bin/ls/util.c Mon Aug 29 14:44:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.33 2011/03/15 08:36:16 wiz Exp $ */
+/* $NetBSD: util.c,v 1.34 2011/08/29 14:44:21 joerg Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)util.c 8.5 (Berkeley) 4/28/95;
#else
-__RCSID($NetBSD: util.c,v 1.33 2011/03/15 08:36:16 wiz Exp $);
+__RCSID($NetBSD: util.c,v 1.34 2011/08/29 14:44:21 joerg Exp $);
#endif
#endif /* not lint */
@@ -166,14 +166,3 @@
}
return n;
}
-
-void
-usage(void)
-{
-
- (void)fprintf(stderr,
- usage: %s [-AaBbCcdFfghikLlMmnopqRrSsTtuWwx1] [file ...]\n,
- getprogname());
- exit(EXIT_FAILURE);
- /* NOTREACHED */
-}
CVS commit: src/bin/mkdir
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:45:28 UTC 2011
Modified Files:
src/bin/mkdir: mkdir.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/bin/mkdir/mkdir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/mkdir/mkdir.c
diff -u src/bin/mkdir/mkdir.c:1.37 src/bin/mkdir/mkdir.c:1.38
--- src/bin/mkdir/mkdir.c:1.37 Sun Jul 20 00:52:40 2008
+++ src/bin/mkdir/mkdir.c Mon Aug 29 14:45:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mkdir.c,v 1.37 2008/07/20 00:52:40 lukem Exp $ */
+/* $NetBSD: mkdir.c,v 1.38 2011/08/29 14:45:28 joerg Exp $ */
/*
* Copyright (c) 1983, 1992, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)mkdir.c 8.2 (Berkeley) 1/25/94;
#else
-__RCSID($NetBSD: mkdir.c,v 1.37 2008/07/20 00:52:40 lukem Exp $);
+__RCSID($NetBSD: mkdir.c,v 1.38 2011/08/29 14:45:28 joerg Exp $);
#endif
#endif /* not lint */
@@ -55,9 +55,8 @@
#include string.h
#include unistd.h
-int mkpath(char *, mode_t, mode_t);
-void usage(void);
-int main(int, char *[]);
+static int mkpath(char *, mode_t, mode_t);
+__dead static void usage(void);
int
main(int argc, char *argv[])
@@ -149,7 +148,7 @@
* mode - file mode of terminal directory
* dir_mode - file mode of intermediate directories
*/
-int
+static int
mkpath(char *path, mode_t mode, mode_t dir_mode)
{
struct stat sb;
@@ -213,7 +212,7 @@
return 0;
}
-void
+static void
usage(void)
{
CVS commit: src/bin/mt
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:46:01 UTC 2011
Modified Files:
src/bin/mt: mt.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/bin/mt/mt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/mt/mt.c
diff -u src/bin/mt/mt.c:1.46 src/bin/mt/mt.c:1.47
--- src/bin/mt/mt.c:1.46 Sun Jul 20 00:52:40 2008
+++ src/bin/mt/mt.c Mon Aug 29 14:46:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mt.c,v 1.46 2008/07/20 00:52:40 lukem Exp $ */
+/* $NetBSD: mt.c,v 1.47 2011/08/29 14:46:01 joerg Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)mt.c 8.2 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: mt.c,v 1.46 2008/07/20 00:52:40 lukem Exp $);
+__RCSID($NetBSD: mt.c,v 1.47 2011/08/29 14:46:01 joerg Exp $);
#endif
#endif /* not lint */
@@ -76,7 +76,7 @@
};
#define CMD(a) a, sizeof(a) - 1
-const struct commands com[] = {
+static const struct commands com[] = {
{ CMD(asf), MTIOCTOP, MTASF, 1, 0 },
{ CMD(blocksize), MTIOCTOP, MTSETBSIZ, 1, 0 },
{ CMD(bsf), MTIOCTOP, MTBSF, 1, 1 },
@@ -104,10 +104,9 @@
{ .c_name = NULL }
};
-void printreg(const char *, u_int, const char *);
-void status(struct mtget *);
-void usage(void);
-int main(int, char *[]);
+static void printreg(const char *, u_int, const char *);
+static void status(struct mtget *);
+__dead static void usage(void);
int
main(int argc, char *argv[])
@@ -234,7 +233,7 @@
#include tahoe/vba/cyreg.h
#endif
-const struct tape_desc {
+static const struct tape_desc {
short t_type; /* type of magtape device */
const char *t_name; /* printing name */
const char *t_dsbits; /* drive status register */
@@ -256,7 +255,7 @@
/*
* Interpret the status buffer returned
*/
-void
+static void
status(struct mtget *bp)
{
const struct tape_desc *mt;
@@ -287,7 +286,7 @@
/*
* Print a register a la the %b format of the kernel's printf.
*/
-void
+static void
printreg(const char *s, u_int v, const char *bits)
{
int any, i;
@@ -315,7 +314,7 @@
}
}
-void
+static void
usage(void)
{
(void)fprintf(stderr, usage: %s [-f device] command [count]\n,
CVS commit: src/bin/mv
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:46:54 UTC 2011
Modified Files:
src/bin/mv: mv.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/bin/mv/mv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/mv/mv.c
diff -u src/bin/mv/mv.c:1.42 src/bin/mv/mv.c:1.43
--- src/bin/mv/mv.c:1.42 Wed Aug 3 04:11:15 2011
+++ src/bin/mv/mv.c Mon Aug 29 14:46:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mv.c,v 1.42 2011/08/03 04:11:15 manu Exp $ */
+/* $NetBSD: mv.c,v 1.43 2011/08/29 14:46:54 joerg Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)mv.c 8.2 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: mv.c,v 1.42 2011/08/03 04:11:15 manu Exp $);
+__RCSID($NetBSD: mv.c,v 1.43 2011/08/29 14:46:54 joerg Exp $);
#endif
#endif /* not lint */
@@ -65,14 +65,13 @@
#include pathnames.h
-int fflg, iflg, vflg;
-int stdin_ok;
+static int fflg, iflg, vflg;
+static int stdin_ok;
-int copy(char *, char *);
-int do_move(char *, char *);
-int fastcopy(char *, char *, struct stat *);
-void usage(void);
-int main(int, char *[]);
+static int copy(char *, char *);
+static int do_move(char *, char *);
+static int fastcopy(char *, char *, struct stat *);
+__dead static void usage(void);
int
main(int argc, char *argv[])
@@ -151,7 +150,7 @@
/* NOTREACHED */
}
-int
+static int
do_move(char *from, char *to)
{
struct stat sb;
@@ -253,7 +252,7 @@
fastcopy(from, to, sb) : copy(from, to));
}
-int
+static int
fastcopy(char *from, char *to, struct stat *sbp)
{
struct timeval tval[2];
@@ -337,7 +336,7 @@
return (0);
}
-int
+static int
copy(char *from, char *to)
{
pid_t pid;
@@ -382,7 +381,7 @@
return (0);
}
-void
+static void
usage(void)
{
(void)fprintf(stderr, usage: %s [-fiv] source target\n
CVS commit: src/sys
Module Name:src Committed By: jmcneill Date: Mon Aug 29 14:47:09 UTC 2011 Modified Files: src/sys/dev/pci: azalia.c coram.c cxdtv.c if_alc.c if_ath_pci.c if_cas.c pci.c pci_verbose.c pwdog.c src/sys/dev/pci/hdaudio: hdaudio.c src/sys/external/bsd/drm/dist/bsd-core: drm_drv.c Log Message: have pci register itself as a module, and make PCI driver modules depend on it To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/dev/pci/azalia.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/coram.c cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/cxdtv.c \ src/sys/dev/pci/pci_verbose.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/if_alc.c src/sys/dev/pci/pwdog.c cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/if_ath_pci.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_cas.c cvs rdiff -u -r1.141 -r1.142 src/sys/dev/pci/pci.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/hdaudio/hdaudio.c cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.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/azalia.c diff -u src/sys/dev/pci/azalia.c:1.76 src/sys/dev/pci/azalia.c:1.77 --- src/sys/dev/pci/azalia.c:1.76 Sun Aug 28 15:40:49 2011 +++ src/sys/dev/pci/azalia.c Mon Aug 29 14:47:07 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: azalia.c,v 1.76 2011/08/28 15:40:49 jmcneill Exp $ */ +/* $NetBSD: azalia.c,v 1.77 2011/08/29 14:47:07 jmcneill Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: azalia.c,v 1.76 2011/08/28 15:40:49 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: azalia.c,v 1.77 2011/08/29 14:47:07 jmcneill Exp $); #include sys/param.h #include sys/device.h @@ -2406,7 +2406,7 @@ return 0; } -MODULE(MODULE_CLASS_DRIVER, azalia, NULL); +MODULE(MODULE_CLASS_DRIVER, azalia, pci); #ifdef _MODULE #include ioconf.c Index: src/sys/dev/pci/coram.c diff -u src/sys/dev/pci/coram.c:1.8 src/sys/dev/pci/coram.c:1.9 --- src/sys/dev/pci/coram.c:1.8 Tue Aug 9 01:42:24 2011 +++ src/sys/dev/pci/coram.c Mon Aug 29 14:47:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: coram.c,v 1.8 2011/08/09 01:42:24 jmcneill Exp $ */ +/* $NetBSD: coram.c,v 1.9 2011/08/29 14:47:08 jmcneill Exp $ */ /* * Copyright (c) 2008, 2011 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: coram.c,v 1.8 2011/08/09 01:42:24 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: coram.c,v 1.9 2011/08/29 14:47:08 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -1100,7 +1100,7 @@ return 0; } -MODULE(MODULE_CLASS_DRIVER, coram, cx24227,mt2131); +MODULE(MODULE_CLASS_DRIVER, coram, cx24227,mt2131,pci); #ifdef _MODULE #include ioconf.c Index: src/sys/dev/pci/cxdtv.c diff -u src/sys/dev/pci/cxdtv.c:1.7 src/sys/dev/pci/cxdtv.c:1.8 --- src/sys/dev/pci/cxdtv.c:1.7 Tue Aug 9 01:42:24 2011 +++ src/sys/dev/pci/cxdtv.c Mon Aug 29 14:47:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cxdtv.c,v 1.7 2011/08/09 01:42:24 jmcneill Exp $ */ +/* $NetBSD: cxdtv.c,v 1.8 2011/08/29 14:47:08 jmcneill Exp $ */ /* * Copyright (c) 2008, 2011 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cxdtv.c,v 1.7 2011/08/09 01:42:24 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: cxdtv.c,v 1.8 2011/08/29 14:47:08 jmcneill Exp $); #include sys/param.h #include sys/kernel.h @@ -1164,7 +1164,7 @@ delay(20); } -MODULE(MODULE_CLASS_DRIVER, cxdtv, tvpll,nxt2k,lg3303); +MODULE(MODULE_CLASS_DRIVER, cxdtv, tvpll,nxt2k,lg3303,pci); #ifdef _MODULE #include ioconf.c Index: src/sys/dev/pci/pci_verbose.c diff -u src/sys/dev/pci/pci_verbose.c:1.7 src/sys/dev/pci/pci_verbose.c:1.8 --- src/sys/dev/pci/pci_verbose.c:1.7 Sun Jul 25 14:14:25 2010 +++ src/sys/dev/pci/pci_verbose.c Mon Aug 29 14:47:08 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_verbose.c,v 1.7 2010/07/25 14:14:25 pgoyette Exp $ */ +/* $NetBSD: pci_verbose.c,v 1.8 2011/08/29 14:47:08 jmcneill Exp $ */ /* * Copyright (c) 1997 Zubin D. Dittia. All rights reserved. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pci_verbose.c,v 1.7 2010/07/25 14:14:25 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: pci_verbose.c,v 1.8 2011/08/29 14:47:08 jmcneill Exp $); #include sys/param.h @@ -69,7 +69,7 @@ #ifdef _KERNEL static int pciverbose_modcmd(modcmd_t, void *); -MODULE(MODULE_CLASS_MISC, pciverbose, NULL); +MODULE(MODULE_CLASS_MISC, pciverbose, pci); static int pciverbose_modcmd(modcmd_t cmd, void *arg) Index: src/sys/dev/pci/if_alc.c diff -u src/sys/dev/pci/if_alc.c:1.4 src/sys/dev/pci/if_alc.c:1.5 --- src/sys/dev/pci/if_alc.c:1.4 Thu Jun 23 17:42:46 2011 +++ src/sys/dev/pci/if_alc.c Mon Aug 29 14:47:08 2011 @@ -2640,7 +2640,7 @@ CSR_WRITE_4(sc, ALC_MAC_CFG, rxcfg); } -MODULE(MODULE_CLASS_DRIVER, if_alc, NULL); +MODULE(MODULE_CLASS_DRIVER, if_alc, pci);
CVS commit: src/bin/pax
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:47:48 UTC 2011
Modified Files:
src/bin/pax: extern.h options.c pax.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/bin/pax/extern.h
cvs rdiff -u -r1.110 -r1.111 src/bin/pax/options.c
cvs rdiff -u -r1.46 -r1.47 src/bin/pax/pax.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/extern.h
diff -u src/bin/pax/extern.h:1.57 src/bin/pax/extern.h:1.58
--- src/bin/pax/extern.h:1.57 Sat Jun 18 23:07:04 2011
+++ src/bin/pax/extern.h Mon Aug 29 14:47:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.57 2011/06/18 23:07:04 christos Exp $ */
+/* $NetBSD: extern.h,v 1.58 2011/08/29 14:47:47 joerg Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -204,7 +204,6 @@
extern int havechd;
void options(int, char **);
OPLIST * opt_next(void);
-int opt_add(const char *);
int bad_opt(void);
int mkpath(char *);
char *chdname;
@@ -265,9 +264,6 @@
extern char *tempfile;
extern char *tempbase;
-int main(int, char **);
-void sig_cleanup(int);
-
/*
* sel_subs.c
*/
Index: src/bin/pax/options.c
diff -u src/bin/pax/options.c:1.110 src/bin/pax/options.c:1.111
--- src/bin/pax/options.c:1.110 Sat Jun 18 23:07:04 2011
+++ src/bin/pax/options.c Mon Aug 29 14:47:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.110 2011/06/18 23:07:04 christos Exp $ */
+/* $NetBSD: options.c,v 1.111 2011/08/29 14:47:47 joerg Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = @(#)options.c 8.2 (Berkeley) 4/18/94;
#else
-__RCSID($NetBSD: options.c,v 1.110 2011/06/18 23:07:04 christos Exp $);
+__RCSID($NetBSD: options.c,v 1.111 2011/08/29 14:47:47 joerg Exp $);
#endif
#endif /* not lint */
@@ -81,18 +81,19 @@
static OPLIST *ophead = NULL; /* head for format specific options -x */
static OPLIST *optail = NULL; /* option tail */
+static int opt_add(const char *);
static int no_op(void);
static void printflg(unsigned int);
static int c_frmt(const void *, const void *);
static off_t str_offt(char *);
static char *get_line(FILE *fp);
static void pax_options(int, char **);
-static void pax_usage(void);
+__dead static void pax_usage(void);
static void tar_options(int, char **);
-static void tar_usage(void);
+__dead static void tar_usage(void);
#ifndef NO_CPIO
static void cpio_options(int, char **);
-static void cpio_usage(void);
+__dead static void cpio_usage(void);
#endif
/* errors from get_line */
@@ -2054,7 +2055,7 @@
return num;
}
-char *
+static char *
get_line(FILE *f)
{
char *name, *temp;
@@ -2095,7 +2096,7 @@
* print the usage summary to the user
*/
-void
+static void
pax_usage(void)
{
fprintf(stderr,
@@ -2124,7 +2125,7 @@
* print the usage summary to the user
*/
-void
+static void
tar_usage(void)
{
(void)fputs(usage: tar [-]{crtux}[-befhjklmopqvwzHOPSXZ014578] [archive]
@@ -2141,7 +2142,7 @@
* print the usage summary to the user
*/
-void
+static void
cpio_usage(void)
{
Index: src/bin/pax/pax.c
diff -u src/bin/pax/pax.c:1.46 src/bin/pax/pax.c:1.47
--- src/bin/pax/pax.c:1.46 Sat Jun 18 23:07:04 2011
+++ src/bin/pax/pax.c Mon Aug 29 14:47:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pax.c,v 1.46 2011/06/18 23:07:04 christos Exp $ */
+/* $NetBSD: pax.c,v 1.47 2011/08/29 14:47:48 joerg Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -44,7 +44,7 @@
#if 0
static char sccsid[] = @(#)pax.c 8.2 (Berkeley) 4/18/94;
#else
-__RCSID($NetBSD: pax.c,v 1.46 2011/06/18 23:07:04 christos Exp $);
+__RCSID($NetBSD: pax.c,v 1.47 2011/08/29 14:47:48 joerg Exp $);
#endif
#endif /* not lint */
@@ -337,7 +337,7 @@
* never
*/
-void
+__dead static void
sig_cleanup(int which_sig)
{
/*
CVS commit: src/bin/rm
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:48:46 UTC 2011
Modified Files:
src/bin/rm: rm.c
Log Message:
static + __dead
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/bin/rm/rm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/rm/rm.c
diff -u src/bin/rm/rm.c:1.49 src/bin/rm/rm.c:1.50
--- src/bin/rm/rm.c:1.49 Sat Feb 14 08:05:04 2009
+++ src/bin/rm/rm.c Mon Aug 29 14:48:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rm.c,v 1.49 2009/02/14 08:05:04 lukem Exp $ */
+/* $NetBSD: rm.c,v 1.50 2011/08/29 14:48:46 joerg Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994, 2003
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)rm.c 8.8 (Berkeley) 4/27/95;
#else
-__RCSID($NetBSD: rm.c,v 1.49 2009/02/14 08:05:04 lukem Exp $);
+__RCSID($NetBSD: rm.c,v 1.50 2011/08/29 14:48:46 joerg Exp $);
#endif
#endif /* not lint */
@@ -59,15 +59,14 @@
#include string.h
#include unistd.h
-int dflag, eval, fflag, iflag, Pflag, stdin_ok, vflag, Wflag;
+static int dflag, eval, fflag, iflag, Pflag, stdin_ok, vflag, Wflag;
-int check(char *, char *, struct stat *);
-void checkdot(char **);
-void rm_file(char **);
-int rm_overwrite(char *, struct stat *);
-void rm_tree(char **);
-void usage(void);
-int main(int, char *[]);
+static int check(char *, char *, struct stat *);
+static void checkdot(char **);
+static void rm_file(char **);
+static int rm_overwrite(char *, struct stat *);
+static void rm_tree(char **);
+__dead static void usage(void);
/*
* For the sake of the `-f' flag, check whether an error number indicates the
@@ -147,7 +146,7 @@
/* NOTREACHED */
}
-void
+static void
rm_tree(char **argv)
{
FTS *fts;
@@ -261,7 +260,7 @@
fts_close(fts);
}
-void
+static void
rm_file(char **argv)
{
struct stat sb;
@@ -371,7 +370,7 @@
* rm_overwrite will return 0 on success.
*/
-int
+static int
rm_overwrite(char *file, struct stat *sbp)
{
struct stat sb;
@@ -492,7 +491,7 @@
return 1;
}
-int
+static int
check(char *path, char *name, struct stat *sp)
{
int ch, first;
@@ -540,7 +539,7 @@
* trailing slashes have been removed, we'll remove them here.
*/
#define ISDOT(a) ((a)[0] == '.' (!(a)[1] || ((a)[1] == '.' !(a)[2])))
-void
+static void
checkdot(char **argv)
{
char *p, **save, **t;
@@ -571,7 +570,7 @@
}
}
-void
+static void
usage(void)
{
CVS commit: src/bin/sh
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:50:27 UTC 2011
Modified Files:
src/bin/sh: arith.y
Log Message:
Mark yyerror as static and __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/bin/sh/arith.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/arith.y
diff -u src/bin/sh/arith.y:1.20 src/bin/sh/arith.y:1.21
--- src/bin/sh/arith.y:1.20 Sat Jun 18 21:18:46 2011
+++ src/bin/sh/arith.y Mon Aug 29 14:50:27 2011
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: arith.y,v 1.20 2011/06/18 21:18:46 christos Exp $ */
+/* $NetBSD: arith.y,v 1.21 2011/08/29 14:50:27 joerg Exp $ */
/*-
* Copyright (c) 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = @(#)arith.y 8.3 (Berkeley) 5/4/95;
#else
-__RCSID($NetBSD: arith.y,v 1.20 2011/06/18 21:18:46 christos Exp $);
+__RCSID($NetBSD: arith.y,v 1.21 2011/08/29 14:50:27 joerg Exp $);
#endif
#endif /* not lint */
@@ -56,7 +56,7 @@
intmax_t arith_result;
const char *arith_buf, *arith_startbuf;
-void yyerror(const char *);
+__dead static void yyerror(const char *);
#ifdef TESTARITH
int main(int , char *[]);
int error(char *);
@@ -197,9 +197,8 @@
}
#endif
-void
-yyerror(s)
- const char *s;
+static void
+yyerror(const char *s)
{
yyerrok;
CVS commit: src/bin
Module Name:src
Committed By: joerg
Date: Mon Aug 29 14:51:19 UTC 2011
Modified Files:
src/bin/chio: chio.c
src/bin/chmod: chmod.c
src/bin/csh: csh.c dol.c extern.h sem.c
src/bin/dd: extern.h
src/bin/domainname: domainname.c
src/bin/ed: ed.h
src/bin/hostname: hostname.c
src/bin/kill: kill.c
src/bin/ps: ps.c
src/bin/pwd: pwd.c
src/bin/sleep: sleep.c
src/bin/stty: extern.h gfmt.c
src/bin/test: test.c
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/bin/chio/chio.c
cvs rdiff -u -r1.35 -r1.36 src/bin/chmod/chmod.c
cvs rdiff -u -r1.41 -r1.42 src/bin/csh/csh.c
cvs rdiff -u -r1.26 -r1.27 src/bin/csh/dol.c
cvs rdiff -u -r1.22 -r1.23 src/bin/csh/extern.h
cvs rdiff -u -r1.28 -r1.29 src/bin/csh/sem.c
cvs rdiff -u -r1.18 -r1.19 src/bin/dd/extern.h
cvs rdiff -u -r1.14 -r1.15 src/bin/domainname/domainname.c
cvs rdiff -u -r1.34 -r1.35 src/bin/ed/ed.h
cvs rdiff -u -r1.16 -r1.17 src/bin/hostname/hostname.c
cvs rdiff -u -r1.26 -r1.27 src/bin/kill/kill.c
cvs rdiff -u -r1.75 -r1.76 src/bin/ps/ps.c
cvs rdiff -u -r1.21 -r1.22 src/bin/pwd/pwd.c
cvs rdiff -u -r1.23 -r1.24 src/bin/sleep/sleep.c
cvs rdiff -u -r1.11 -r1.12 src/bin/stty/extern.h
cvs rdiff -u -r1.16 -r1.17 src/bin/stty/gfmt.c
cvs rdiff -u -r1.37 -r1.38 src/bin/test/test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/chio/chio.c
diff -u src/bin/chio/chio.c:1.30 src/bin/chio/chio.c:1.31
--- src/bin/chio/chio.c:1.30 Sun Jul 20 00:52:39 2008
+++ src/bin/chio/chio.c Mon Aug 29 14:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chio.c,v 1.30 2008/07/20 00:52:39 lukem Exp $ */
+/* $NetBSD: chio.c,v 1.31 2011/08/29 14:51:17 joerg Exp $ */
/*-
* Copyright (c) 1996, 1998, 1999 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
__COPYRIGHT(
@(#) Copyright (c) 1996, 1998, 1999\
The NetBSD Foundation, Inc. All rights reserved.);
-__RCSID($NetBSD: chio.c,v 1.30 2008/07/20 00:52:39 lukem Exp $);
+__RCSID($NetBSD: chio.c,v 1.31 2011/08/29 14:51:17 joerg Exp $);
#endif
#include sys/param.h
@@ -61,7 +61,7 @@
#include pathnames.h
int main(int, char *[]);
-static void usage(void);
+__dead static void usage(void);
static void cleanup(void);
static int parse_element_type(const char *);
static int parse_element_unit(const char *);
Index: src/bin/chmod/chmod.c
diff -u src/bin/chmod/chmod.c:1.35 src/bin/chmod/chmod.c:1.36
--- src/bin/chmod/chmod.c:1.35 Fri Jan 22 05:41:36 2010
+++ src/bin/chmod/chmod.c Mon Aug 29 14:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: chmod.c,v 1.35 2010/01/22 05:41:36 snj Exp $ */
+/* $NetBSD: chmod.c,v 1.36 2011/08/29 14:51:17 joerg Exp $ */
/*
* Copyright (c) 1989, 1993, 1994
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = @(#)chmod.c 8.8 (Berkeley) 4/1/94;
#else
-__RCSID($NetBSD: chmod.c,v 1.35 2010/01/22 05:41:36 snj Exp $);
+__RCSID($NetBSD: chmod.c,v 1.36 2011/08/29 14:51:17 joerg Exp $);
#endif
#endif /* not lint */
@@ -58,8 +58,7 @@
#include string.h
#include unistd.h
-int main(int, char *[]);
-void usage(void);
+__dead static void usage(void);
int
main(int argc, char *argv[])
@@ -203,7 +202,7 @@
/* NOTREACHED */
}
-void
+static void
usage(void)
{
(void)fprintf(stderr,
Index: src/bin/csh/csh.c
diff -u src/bin/csh/csh.c:1.41 src/bin/csh/csh.c:1.42
--- src/bin/csh/csh.c:1.41 Sun Jul 20 00:52:39 2008
+++ src/bin/csh/csh.c Mon Aug 29 14:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: csh.c,v 1.41 2008/07/20 00:52:39 lukem Exp $ */
+/* $NetBSD: csh.c,v 1.42 2011/08/29 14:51:17 joerg Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)csh.c 8.2 (Berkeley) 10/12/93;
#else
-__RCSID($NetBSD: csh.c,v 1.41 2008/07/20 00:52:39 lukem Exp $);
+__RCSID($NetBSD: csh.c,v 1.42 2011/08/29 14:51:17 joerg Exp $);
#endif
#endif /* not lint */
@@ -99,7 +99,7 @@
static int closef(void *);
static int srccat(Char *, Char *);
static int srcfile(const char *, int, int);
-static void phup(int);
+__dead static void phup(int);
static void srcunit(int, int, int);
static void mailchk(void);
#ifndef _PATH_DEFPATH
Index: src/bin/csh/dol.c
diff -u src/bin/csh/dol.c:1.26 src/bin/csh/dol.c:1.27
--- src/bin/csh/dol.c:1.26 Mon Jul 16 18:26:09 2007
+++ src/bin/csh/dol.c Mon Aug 29 14:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dol.c,v 1.26 2007/07/16 18:26:09 christos Exp $ */
+/* $NetBSD: dol.c,v 1.27 2011/08/29 14:51:17 joerg Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)dol.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: dol.c,v 1.26 2007/07/16 18:26:09 christos Exp $);
+__RCSID($NetBSD: dol.c,v 1.27 2011/08/29 14:51:17 joerg Exp $);
#endif
#endif /* not lint */
@@ -85,7 +85,7 @@
static void Dfix2(Char **);
static Char *Dpack(Char *, Char *);
static int Dword(void);
-static void
CVS commit: src/sys/arch/usermode/usermode
Module Name:src
Committed By: reinoud
Date: Mon Aug 29 14:59:09 UTC 2011
Modified Files:
src/sys/arch/usermode/usermode: pmap.c trap.c
Log Message:
Implement read and modify detection code
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/usermode/usermode/pmap.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/usermode/usermode/trap.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/usermode/usermode/pmap.c
diff -u src/sys/arch/usermode/usermode/pmap.c:1.38 src/sys/arch/usermode/usermode/pmap.c:1.39
--- src/sys/arch/usermode/usermode/pmap.c:1.38 Sat Aug 27 17:59:24 2011
+++ src/sys/arch/usermode/usermode/pmap.c Mon Aug 29 14:59:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.38 2011/08/27 17:59:24 reinoud Exp $ */
+/* $NetBSD: pmap.c,v 1.39 2011/08/29 14:59:09 reinoud Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.38 2011/08/27 17:59:24 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.39 2011/08/29 14:59:09 reinoud Exp $);
#include opt_memsize.h
#include opt_kmempages.h
@@ -90,6 +90,8 @@
static void pv_update(struct pv_entry *pv);
static void pmap_update_page(uintptr_t ppn);
+void pmap_get_current_protection(pmap_t pmap, vaddr_t va,
+ vm_prot_t *cur_prot, vm_prot_t *prot);
static struct pv_entry *pv_get(pmap_t pmap, uintptr_t ppn, uintptr_t lpn);
static struct pv_entry *pv_alloc(void);
static void pv_free(struct pv_entry *pv);
@@ -421,6 +423,39 @@
return pv;
}
+void
+pmap_get_current_protection(pmap_t pmap, vaddr_t va,
+ vm_prot_t *cur_prot, vm_prot_t *prot)
+{
+ struct pv_entry *pv;
+
+ uintptr_t lpn;
+
+ aprint_debug(pmap_get_current_protection pmap %p, va %p\n, pmap, (void *) va);
+#ifdef DIAGNOSTIC
+ if ((va VM_MIN_ADDRESS) || (va = VM_MAX_ADDRESS))
+ panic(pmap_do_enter: invalid va isued\n);
+#endif
+
+ lpn = atop(va - VM_MIN_ADDRESS); /* V-L */
+
+ /* raise interupt level */
+ pv = pmap-pm_entries[lpn];
+ if (pv == NULL) {
+ *cur_prot = *prot = VM_PROT_NONE;
+ return;
+ }
+
+ *prot = pv-pv_prot;
+ *cur_prot = VM_PROT_NONE;
+ if (pv-pv_mmap_ppl PROT_READ)
+ *cur_prot |= VM_PROT_READ;
+ if (pv-pv_mmap_ppl PROT_WRITE)
+ *cur_prot |= VM_PROT_WRITE;
+ if (pv-pv_mmap_ppl PROT_EXEC)
+ *cur_prot |= VM_PROT_EXECUTE;
+}
+
static void
pmap_page_activate(struct pv_entry *pv)
{
@@ -660,6 +695,10 @@
/* TODO protect against roque values */
aprint_debug(pmap_extract: extracting va %p\n, (void *) va);
+#ifdef DIAGNOSTIC
+ if ((va VM_MIN_ADDRESS) || (va VM_MAX_ADDRESS))
+ panic(pmap_extract: invalid va isued\n);
+#endif
pv = pmap-pm_entries[atop(va - VM_MIN_ADDRESS)]; /* V-L */
if (pv == NULL)
Index: src/sys/arch/usermode/usermode/trap.c
diff -u src/sys/arch/usermode/usermode/trap.c:1.12 src/sys/arch/usermode/usermode/trap.c:1.13
--- src/sys/arch/usermode/usermode/trap.c:1.12 Mon Aug 29 13:15:54 2011
+++ src/sys/arch/usermode/usermode/trap.c Mon Aug 29 14:59:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.12 2011/08/29 13:15:54 jmcneill Exp $ */
+/* $NetBSD: trap.c,v 1.13 2011/08/29 14:59:09 reinoud Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk rein...@netbsd.org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.12 2011/08/29 13:15:54 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.13 2011/08/29 14:59:09 reinoud Exp $);
#include sys/types.h
#include sys/param.h
@@ -49,11 +49,12 @@
//#include machine/userret.h
+/* forwards and externals */
void setup_signal_handlers(void);
static void mem_access_handler(int sig, siginfo_t *info, void *ctx);
-
-static struct sigaction sa;
+extern void pmap_get_current_protection(pmap_t pmap, vaddr_t va,
+ vm_prot_t *cur_prot, vm_prot_t *prot);
extern int errno;
void
@@ -64,6 +65,8 @@
void
setup_signal_handlers(void)
{
+ static struct sigaction sa;
+
sigemptyset(sa.sa_mask);
sa.sa_flags = SA_RESTART | SA_SIGINFO;
sa.sa_sigaction = mem_access_handler;
@@ -84,7 +87,7 @@
struct vmspace *vm;
struct vm_map *vm_map;
struct trapframe *tf;
- vm_prot_t atype;
+ vm_prot_t cur_prot, prot, atype;
vaddr_t va;
vaddr_t onfault;
int kmem, rv;
@@ -104,7 +107,7 @@
onfault = (vaddr_t) pcb-pcb_onfault;
vm = p-p_vmspace;
-#if 0
+#if 1
printf(SIGSEGV or SIGBUS!\n);
printf(\tsi_signo = %d\n, info-si_signo);
printf(\tsi_errno = %d\n, info-si_errno);
@@ -141,17 +144,39 @@
panic(peeing outside the box!);
}
- /* XXX TODO determine atype?? */
-atype = PROT_READ;
-again:
- pcb-pcb_onfault = NULL;
- rv = uvm_fault(vm_map, (vaddr_t) va, atype);
- pcb-pcb_onfault = (void *) onfault;
-if (rv) printf(uvm_fault rv = %d\n, rv);
-if (rv == EACCES) {
- atype |= PROT_WRITE | PROT_EXEC;
- goto again;
-}
+ /* determine accesstype */
+ pmap_get_current_protection(vm_map-pmap, va, cur_prot, prot);
+
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: mbalmer
Date: Mon Aug 29 15:06:49 UTC 2011
Modified Files:
src/sys/dev/pci: pwdog.c
Log Message:
Register as built-in module when not compiled as a module. Reminded by
jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/pwdog.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/pwdog.c
diff -u src/sys/dev/pci/pwdog.c:1.5 src/sys/dev/pci/pwdog.c:1.6
--- src/sys/dev/pci/pwdog.c:1.5 Mon Aug 29 14:47:08 2011
+++ src/sys/dev/pci/pwdog.c Mon Aug 29 15:06:49 2011
@@ -1,4 +1,4 @@
-/* $$NetBSD: pwdog.c,v 1.5 2011/08/29 14:47:08 jmcneill Exp $ */
+/* $$NetBSD: pwdog.c,v 1.6 2011/08/29 15:06:49 mbalmer Exp $ */
/* $OpenBSD: pwdog.c,v 1.7 2010/04/08 00:23:53 tedu Exp $ */
/*
@@ -193,33 +193,36 @@
return 0;
}
-#ifdef _MODULE
MODULE(MODULE_CLASS_DRIVER, pwdog, pci);
+#ifdef _MODULE
#include ioconf.c
+#endif
static int
pwdog_modcmd(modcmd_t cmd, void *opaque)
{
int error;
+ error = 0;
switch (cmd) {
case MODULE_CMD_INIT:
+#ifdef _MODULE
error = config_init_component(cfdriver_ioconf_pwdog,
cfattach_ioconf_pwdog, cfdata_ioconf_pwdog);
- if (error) {
+ if (error)
aprint_error(%s: unable to init component\n,
pwdog_cd.cd_name);
- return error;
- }
- return 0;
+#endif
+ break;
case MODULE_CMD_FINI:
+#ifdef _MODULE
config_fini_component(cfdriver_ioconf_pwdog,
cfattach_ioconf_pwdog, cfdata_ioconf_pwdog);
- return 0;
+#endif
+ break;
default:
- return ENOTTY;
+ error = ENOTTY;
}
+ return error;
}
-
-#endif /* _MODULE */
CVS commit: src/sys/dev/gpio
Module Name:src
Committed By: mbalmer
Date: Mon Aug 29 15:14:04 UTC 2011
Modified Files:
src/sys/dev/gpio: gpio.c gpiosim.c
Log Message:
Register as built-in module when compiled wo/ _MODULE.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/gpio/gpio.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/gpio/gpiosim.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/gpio/gpio.c
diff -u src/sys/dev/gpio/gpio.c:1.36 src/sys/dev/gpio/gpio.c:1.37
--- src/sys/dev/gpio/gpio.c:1.36 Sun Aug 28 07:48:50 2011
+++ src/sys/dev/gpio/gpio.c Mon Aug 29 15:14:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.36 2011/08/28 07:48:50 mbalmer Exp $ */
+/* $NetBSD: gpio.c,v 1.37 2011/08/29 15:14:04 mbalmer Exp $ */
/* $OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gpio.c,v 1.36 2011/08/28 07:48:50 mbalmer Exp $);
+__KERNEL_RCSID(0, $NetBSD: gpio.c,v 1.37 2011/08/29 15:14:04 mbalmer Exp $);
/*
* General Purpose Input/Output framework.
@@ -897,19 +897,22 @@
return 0;
}
-#ifdef _MODULE
MODULE(MODULE_CLASS_DRIVER, gpio, NULL);
+#ifdef _MODULE
#include ioconf.c
+#endif
static int
gpio_modcmd(modcmd_t cmd, void *opaque)
{
+#ifdef _MODULE
devmajor_t cmajor = NODEVMAJOR, bmajor = NODEVMAJOR;
int error;
-
+#endif
switch (cmd) {
case MODULE_CMD_INIT:
+#ifdef _MODULE
error = config_init_component(cfdriver_ioconf_gpio,
cfattach_ioconf_gpio, cfdata_ioconf_gpio);
if (error) {
@@ -925,14 +928,16 @@
return config_fini_component(cfdriver_ioconf_gpio,
cfattach_ioconf_gpio, cfdata_ioconf_gpio);
}
+#endif
return 0;
case MODULE_CMD_FINI:
+#ifdef _MODULE
config_fini_component(cfdriver_ioconf_gpio,
cfattach_ioconf_gpio, cfdata_ioconf_gpio);
devsw_detach(NULL, gpio_cdevsw);
+#endif
return 0;
default:
return ENOTTY;
}
}
-#endif
Index: src/sys/dev/gpio/gpiosim.c
diff -u src/sys/dev/gpio/gpiosim.c:1.11 src/sys/dev/gpio/gpiosim.c:1.12
--- src/sys/dev/gpio/gpiosim.c:1.11 Sun Aug 28 11:36:17 2011
+++ src/sys/dev/gpio/gpiosim.c Mon Aug 29 15:14:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiosim.c,v 1.11 2011/08/28 11:36:17 jmcneill Exp $ */
+/* $NetBSD: gpiosim.c,v 1.12 2011/08/29 15:14:04 mbalmer Exp $ */
/* $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $ */
/*
@@ -219,9 +219,9 @@
sc-sc_gpio_pins[pin].pin_flags = flags;
}
-#ifdef _MODULE
MODULE(MODULE_CLASS_DRIVER, gpiosim, gpio);
+#ifdef _MODULE
static const struct cfiattrdata gpiobus_iattrdata = {
gpiobus, 0, { { NULL, NULL, 0 },}
};
@@ -247,14 +247,17 @@
},
{ NULL, NULL, 0, FSTATE_NOTFOUND, NULL, 0, NULL }
};
+#endif
static int
gpiosim_modcmd(modcmd_t cmd, void *opaque)
{
+#ifdef _MODULE
int error = 0;
-
+#endif
switch (cmd) {
case MODULE_CMD_INIT:
+#ifdef _MODULE
error = config_cfdriver_attach(gpiosim_cd);
if (error)
return error;
@@ -276,15 +279,18 @@
gpiosim_cd.cd_name);
return error;
}
- (void)config_attach_pseudo(gpiosim_cfdata);
+ config_attach_pseudo(gpiosim_cfdata);
+#endif
return 0;
case MODULE_CMD_FINI:
+#ifdef _MODULE
error = config_cfdata_detach(gpiosim_cfdata);
if (error)
return error;
config_cfattach_detach(gpiosim_cd.cd_name, gpiosim_ca);
config_cfdriver_detach(gpiosim_cd);
+#endif
return 0;
case MODULE_CMD_AUTOUNLOAD:
/* no auto-unload */
@@ -293,4 +299,3 @@
return ENOTTY;
}
}
-#endif
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Mon Aug 29 15:35:29 UTC 2011 Modified Files: src/share/man/man4: dtvi2c.4 Log Message: Some improvements. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/dtvi2c.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/dtvi2c.4 diff -u src/share/man/man4/dtvi2c.4:1.2 src/share/man/man4/dtvi2c.4:1.3 --- src/share/man/man4/dtvi2c.4:1.2 Mon Aug 29 13:42:53 2011 +++ src/share/man/man4/dtvi2c.4 Mon Aug 29 15:35:29 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: dtvi2c.4,v 1.2 2011/08/29 13:42:53 wiz Exp $ +.\ $NetBSD: dtvi2c.4,v 1.3 2011/08/29 15:35:29 jruoho Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,20 +27,25 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 14, 2011 +.Dd August 29, 2011 .Dt DTVI2C 4 .Os .Sh NAME .Nm dtvi2c -.Nd iic-connected support modules for dtv +.Nd Inter IC (I2C) modules for +.Ic dtv .Sh DESCRIPTION The .Nm -modules are drivers for support hardware needed by DVB devices. -This includes e.g. tuners, demodulators, and analog video decoders. +modules provide support for +.Xr dtv 4 +devices. +The +.Nm +group includes digital tuners, demodulators, and analog video decoders. .Pp The usual hardware structure consists of a host controller -(connected via +(connected for instance via .Xr usb 4 or .Xr pci 4 ) @@ -52,37 +57,52 @@ For example, a typical .Xr dtv 4 setup would look like this: -.Bl -bullet -offset indent -.It -initialize transport stream (TS) port on host controller +.Bl -enum -offset indent .It -configure demodulator (put it in the ATSC/QAM/DVB-T/etc. mode) -.It -configure tuner (set frequency etc.) -.It -start TS transfer (using DMA transfers or USB high speed transfers) +Initialize transport stream +.Pq Dv TS +port on the host controller. +.It +Configure the demodulator that +.Dq demodulates +the information from an intermediate frequency +.Pq Dv IF +that is provided to it by the associated tuner. +This step typically includes setting the desired +quadrature amplitude modulation +.Pq Dv QAM +and bandwidth, among other things. +.It +Configure the tuner. +Typically this step includes at least setting the frequency. +.It +Start TS transfer (using +.Dv DMA +transfers or +.Dv USB +high speed transfers). .El .Pp The currently supported modules are: .Bl -tag -width 10n -offset indent -.It au8522 +.It Ic au8522 Auvitek AU8522 ATSC/QAM64/QAM256 demodulator -.It cx24227 +.It Ic cx24227 Conexant CX24227 ATSC/QAM64/QAM256 demodulator -.It lg3303 +.It Ic lg3303 LG LGDT3303 ATSC/QAM64/QAM256 demodulator -.It mt2131 +.It Ic mt2131 MicroTune MT2131 ATSC demodulator -.It nxt2k +.It Ic nxt2k XXX description -.It tvpll +.It Ic tvpll Generic PLL-based tuners -.It xc3028 +.It Ic xc3028 XCeive XC3028 analog and digital tuner -.It xc5k +.It Ic xc5k Xceive XC5000 analog and digital tuner -.It zl10353 -Zarlink ZL10353 (Intel CE623x) DVB demodulator +.It Ic zl10353 +Zarlink ZL10353 (Intel CE623x) demodulator .El .Sh FILES .Bl -bullet @@ -107,7 +127,7 @@ .Sh HISTORY The .Nm -device driver first appeared in +modules first appeared in .Nx 6.0 . .Sh AUTHORS .An -nosplit @@ -120,5 +140,4 @@ .Aq jakll...@netbsd.org , and .An Jukka Ruohonen -.Aq jru...@netbsd.org . -.Aq jakll...@netbsd.org , +.Aq jruoho...@iki.fi .
CVS commit: src/share/misc
Module Name:src
Committed By: jruoho
Date: Mon Aug 29 16:28:38 UTC 2011
Modified Files:
src/share/misc: acronyms.comp
Log Message:
Add few.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.126 src/share/misc/acronyms.comp:1.127
--- src/share/misc/acronyms.comp:1.126 Tue Jun 14 05:43:37 2011
+++ src/share/misc/acronyms.comp Mon Aug 29 16:28:38 2011
@@ -1,12 +1,14 @@
-$NetBSD: acronyms.comp,v 1.126 2011/06/14 05:43:37 jruoho Exp $
+$NetBSD: acronyms.comp,v 1.127 2011/08/29 16:28:38 jruoho Exp $
3WHS three-way handshake
+8VSB 8-state vestigial side band modulation
AA anti-aliasing
AAA authentication, authorization, accounting
AAT average access time
ABI application binary interface
ABR available bit rate
AC alternating current
+ACI adjacent channel interferer
ACID atomicity, consistency, isolation, durability
ACK acknowledgement
ACK Amsterdam compiler kit
@@ -85,6 +87,7 @@
AVL Adelson-Velsky-Landis
AVX advanced vector extensions
AWK Aho, Werner, and Kernighan
+BA byte align
BAL basic assembly language
BAR base address register
BBS bulletin board system
@@ -94,10 +97,11 @@
BCS base configuration space
BD baud
BDD binary decision diagram
+BDI bit deinterleave
BDUF big design up front
BEDO burst extended data output
BER basic encoding rules
-BER bit error rate
+BER bit error {rate, ratio}
BFD binary {file, format} descriptor
BFKL big fscking kernel lock
BFS breadth-first search
@@ -128,6 +132,7 @@
BPI bits per inch
BPM business process modelling
BPS bits per second
+BPSK binary phase shift keying
BQS Berkeley quality software
BRE basic regular expression
BS binary sequence
@@ -151,6 +156,7 @@
CAD computer-aided design
CAM computer assisted manufacturing
CAM content addressable memory
+CAM conditional access module
CARP common address redundancy protocol
CAS (atomic) compare and swap
CAS computer algebra system
@@ -161,6 +167,7 @@
CBC cipher block chaining
CBR constant bit rate
CCD charge coupled device
+CCI co-channel interferer
CC carbon coby
CD compact disc
CD cache disable
@@ -202,12 +209,15 @@
CNC computer numerical control
CNR carrier to noise ratio
COF current operating frequency
+COFDM coded orthogonal frequency division multiplexing
COFF common object file format
COM component object model
COMA cache-only memory architecture
CORBA common object request broker architecture
COW copy-on-write
+CP continuous pilot
CPB core performance boost
+CPE common phase error
CPG clock pulse generator
CPL current privilege level
CPLD complex programmable logic device
@@ -216,6 +226,7 @@
CPU central processing unit
CR carriage return
CRC cyclic redundancy check
+CRL carrier recovery loop
CRLF carriage return line feed
CRT cathode ray tube
CS computer science
@@ -223,9 +234,11 @@
CS chip select
CS code segment
CSI common system interface
+CSI channel state information
CSMA carrier sense multiple access
CSMA/CA carrier sense multiple access with collision avoidance
CSMA/CD carrier sense multiple access with collision detection
+CSR control [and] status registers
CSS cascading style sheets
CSV comma-separated values
CTM close to metal
@@ -236,6 +249,7 @@
CVS concurrent versions system
DA destination address
DAA distributed application architecture
+DAB digital audio broadcasting
DAC discretionary access control
DAC digital [to] analog converter
DAO disk at once
@@ -244,6 +258,7 @@
DAT dynamic acceleration technology
DB database
DBA dynamic bandwidth allocation
+DBB data bus buffer
DBC design by contract
DBL dynamic buffer limiting
DBMS database management system
@@ -293,6 +308,7 @@
DMA direct memory access
DMI desktop management interface
DMS document management system
+DMT discrete multitone modulation
DNARD Digital network appliance reference design
DNS domain name system
DOE distributed object environment
@@ -344,6 +360,7 @@
ECS enhanced chip set
ECS extended configuration space
EDAT enhanced dynamic acceleration technology
+EDGE explicit data graph execution
EDID extended display identification data
EDO extended data out
EDS electronical data sheet
@@ -392,6 +409,7 @@
FET field-effect transistor
FFH functional fixed hardware
FFI foreign function interface
+FFM focus follows mouse
FFS fast file system
FFS find first set
FFT fast Fourier transform
@@ -461,6 +479,7 @@
HDD hard disk drive
HDCP high-bandwidth digital content protection
HDL hardware description language
+HDTV high-definition television
HF high frequency
HFM highest frequency mode
HID human interface device
@@ -495,6 +514,7 @@
ICE in-circuit emulator
ICMP Internet control message protocol
ICT information and communications technology
+ICW initialization command word
IDA Intel
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: njoly Date: Mon Aug 29 16:45:55 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi Log Message: +devpubd.debug To generate a diff of this commit: cvs rdiff -u -r1.1666 -r1.1667 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.1666 src/distrib/sets/lists/comp/mi:1.1667 --- src/distrib/sets/lists/comp/mi:1.1666 Mon Aug 29 12:37:52 2011 +++ src/distrib/sets/lists/comp/mi Mon Aug 29 16:45:54 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1666 2011/08/29 12:37:52 jruoho Exp $ +# $NetBSD: mi,v 1.1667 2011/08/29 16:45:54 njoly Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3362,6 +3362,7 @@ ./usr/libdata/debug/sbin/cgdconfig.debug comp-sysutil-debug crypto,debug ./usr/libdata/debug/sbin/chown.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/clri.debug comp-sysutil-debug debug +./usr/libdata/debug/sbin/devpubd.debug comp-sysutil-debug debug ./usr/libdata/debug/sbin/dhclient.debug comp-dhclient-debug debug ./usr/libdata/debug/sbin/dhcpcd.debug comp-dhcpcd-debug debug ./usr/libdata/debug/sbin/disklabel.debug comp-sysutil-debug debug
CVS commit: src/bin/df
Module Name:src
Committed By: gson
Date: Mon Aug 29 17:30:28 UTC 2011
Modified Files:
src/bin/df: df.c
Log Message:
Use the same column spacing for the -h output as with the normal output,
as the same header line format is used in both cases and it can't line
up correctly with both of them otherwise.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/bin/df/df.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/df/df.c
diff -u src/bin/df/df.c:1.88 src/bin/df/df.c:1.89
--- src/bin/df/df.c:1.88 Mon Aug 29 00:36:20 2011
+++ src/bin/df/df.c Mon Aug 29 17:30:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: df.c,v 1.88 2011/08/29 00:36:20 enami Exp $ */
+/* $NetBSD: df.c,v 1.89 2011/08/29 17:30:28 gson Exp $ */
/*
* Copyright (c) 1980, 1990, 1993, 1994
@@ -45,7 +45,7 @@
#if 0
static char sccsid[] = @(#)df.c 8.7 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: df.c,v 1.88 2011/08/29 00:36:20 enami Exp $);
+__RCSID($NetBSD: df.c,v 1.89 2011/08/29 17:30:28 gson Exp $);
#endif
#endif /* not lint */
@@ -338,7 +338,7 @@
prthuman(struct statvfs *sfsp, int64_t used, int64_t bavail)
{
- prthumanval((int64_t)(sfsp-f_blocks * sfsp-f_frsize), );
+ prthumanval((int64_t)(sfsp-f_blocks * sfsp-f_frsize),);
prthumanval((int64_t)(used * sfsp-f_frsize), );
prthumanval((int64_t)(bavail * sfsp-f_frsize), );
}
CVS commit: src/tests/util/df
Module Name:src
Committed By: gson
Date: Mon Aug 29 17:31:41 UTC 2011
Modified Files:
src/tests/util/df: t_df.sh
Log Message:
Track spacing changes of df.c 1.89
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/util/df/t_df.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/util/df/t_df.sh
diff -u src/tests/util/df/t_df.sh:1.9 src/tests/util/df/t_df.sh:1.10
--- src/tests/util/df/t_df.sh:1.9 Mon Aug 29 04:55:58 2011
+++ src/tests/util/df/t_df.sh Mon Aug 29 17:31:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_df.sh,v 1.9 2011/08/29 04:55:58 gson Exp $
+# $NetBSD: t_df.sh,v 1.10 2011/08/29 17:31:41 gson Exp $
#
# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -91,51 +91,51 @@
}
hflag_body() {
cat expout EOF
-FilesystemSize Used Avail %Cap Mounted on
-filer:/ 1.1T 132M 1.1T 0% /filer
-filer:/ 1.1T 0B 1.1T 0% /filer
-filer:/ 1.1T 229G 918G 20% /filer
-filer:/ 1.1T 688G 459G 60% /filer
-filer:/ 1.1T 1.1T57G 95% /filer
-filer:/ 1.1T 1.1T 0B 100% /filer
-filer:/ 1.1T 0B 1.1T 0% /filer
-filer:/ 1.1T 229G 860G 21% /filer
-filer:/ 1.1T 688G 401G 63% /filer
-filer:/ 1.1T 1.1T 0B 100% /filer
-filer:/ 1.1T 1.1T -57G 105% /filer
-filer:/ 1.1T 0B 1.0T 0% /filer
-filer:/ 1.1T 229G 803G 22% /filer
-filer:/ 1.1T 688G 344G 66% /filer
-filer:/ 1.1T 1.1T -57G 105% /filer
-filer:/ 1.1T 1.1T -115G 111% /filer
-filer:/ 1.1T 0B 975G 0% /filer
-filer:/ 1.1T 229G 746G 23% /filer
-filer:/ 1.1T 688G 287G 70% /filer
-filer:/ 1.1T 1.1T -115G 111% /filer
-filer:/ 1.1T 1.1T -172G 117% /filer
-/dev/ld0g 1.2T17G 1.1T 1% /anon-root
-/dev/ld0g 1.2T 0B 1.2T 0% /anon-root
-/dev/ld0g 1.2T 250G 998G 20% /anon-root
-/dev/ld0g 1.2T 749G 499G 60% /anon-root
-/dev/ld0g 1.2T 1.2T62G 95% /anon-root
-/dev/ld0g 1.2T 1.2T 0B 100% /anon-root
-/dev/ld0g 1.2T 0B 1.2T 0% /anon-root
-/dev/ld0g 1.2T 250G 936G 21% /anon-root
-/dev/ld0g 1.2T 749G 437G 63% /anon-root
-/dev/ld0g 1.2T 1.2T 0B 100% /anon-root
-/dev/ld0g 1.2T 1.2T -62G 105% /anon-root
-/dev/ld0g 1.2T 0B 1.1T 0% /anon-root
-/dev/ld0g 1.2T 250G 874G 22% /anon-root
-/dev/ld0g 1.2T 749G 374G 66% /anon-root
-/dev/ld0g 1.2T 1.2T -62G 105% /anon-root
-/dev/ld0g 1.2T 1.2T -125G 111% /anon-root
-/dev/ld0g 1.2T 0B 1.0T 0% /anon-root
-/dev/ld0g 1.2T 250G 811G 23% /anon-root
-/dev/ld0g 1.2T 749G 312G 70% /anon-root
-/dev/ld0g 1.2T 1.2T -125G 111% /anon-root
-/dev/ld0g 1.2T 1.2T -187G 117% /anon-root
-/dev/strpct20T10T10T 50% /strpct
-/dev/wd0e 10G 2.7G 7.3G 27% /mount/windows/C
+Filesystem Size Used Avail %Cap Mounted on
+filer:/1.1T 132M 1.1T 0% /filer
+filer:/1.1T 0B 1.1T 0% /filer
+filer:/1.1T 229G 918G 20% /filer
+filer:/1.1T 688G 459G 60% /filer
+filer:/1.1T 1.1T57G 95% /filer
+filer:/1.1T 1.1T 0B 100% /filer
+filer:/1.1T 0B 1.1T 0% /filer
+filer:/1.1T 229G 860G 21% /filer
+filer:/1.1T 688G 401G 63% /filer
+filer:/1.1T 1.1T 0B 100% /filer
+filer:/1.1T 1.1T -57G 105% /filer
+filer:/1.1T 0B 1.0T 0% /filer
+filer:/1.1T 229G 803G 22% /filer
+filer:/1.1T 688G 344G 66% /filer
+filer:/1.1T 1.1T -57G 105% /filer
+filer:/1.1T 1.1T -115G 111% /filer
+filer:/1.1T 0B 975G 0% /filer
+filer:/1.1T 229G 746G 23% /filer
+filer:/1.1T 688G 287G 70% /filer
+filer:/1.1T 1.1T -115G 111% /filer
+filer:/1.1T 1.1T -172G 117% /filer
+/dev/ld0g 1.2T17G 1.1T 1% /anon-root
+/dev/ld0g 1.2T
CVS commit: src/sys/kern
Module Name:src Committed By: jmcneill Date: Mon Aug 29 17:31:51 UTC 2011 Modified Files: src/sys/kern: sys_process.c Log Message: PR# kern/43681: PT_SYSCALL appears to be broken sys_ptrace: For PT_CONTINUE/PT_SYSCALL/PT_DETACH, modify the p_trace_enabled flag of the target process, not the calling process. To generate a diff of this commit: cvs rdiff -u -r1.157 -r1.158 src/sys/kern/sys_process.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/kern/sys_process.c diff -u src/sys/kern/sys_process.c:1.157 src/sys/kern/sys_process.c:1.158 --- src/sys/kern/sys_process.c:1.157 Sun Jul 3 08:57:43 2011 +++ src/sys/kern/sys_process.c Mon Aug 29 17:31:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_process.c,v 1.157 2011/07/03 08:57:43 mrg Exp $ */ +/* $NetBSD: sys_process.c,v 1.158 2011/08/29 17:31:50 jmcneill Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -118,7 +118,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sys_process.c,v 1.157 2011/07/03 08:57:43 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: sys_process.c,v 1.158 2011/08/29 17:31:50 jmcneill Exp $); #include opt_ptrace.h #include opt_ktrace.h @@ -600,7 +600,7 @@ #endif } } - p-p_trace_enabled = trace_is_enabled(p); + t-p_trace_enabled = trace_is_enabled(t); /* * Pick up the LWPID, if supplied. There are two cases:
CVS commit: src/tests
Module Name:src
Committed By: jruoho
Date: Mon Aug 29 17:39:55 UTC 2011
Modified Files:
src/tests/include/sys: t_bitops.c
src/tests/lib/libc/stdlib: t_strtod.c
src/tests/lib/libm: t_floor.c
Log Message:
Remove some cruft that is no longer needed.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/include/sys/t_bitops.c
cvs rdiff -u -r1.25 -r1.26 src/tests/lib/libc/stdlib/t_strtod.c
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libm/t_floor.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/include/sys/t_bitops.c
diff -u src/tests/include/sys/t_bitops.c:1.9 src/tests/include/sys/t_bitops.c:1.10
--- src/tests/include/sys/t_bitops.c:1.9 Mon Aug 29 12:50:50 2011
+++ src/tests/include/sys/t_bitops.c Mon Aug 29 17:39:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_bitops.c,v 1.9 2011/08/29 12:50:50 jruoho Exp $ */
+/* $NetBSD: t_bitops.c,v 1.10 2011/08/29 17:39:54 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,13 +29,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_bitops.c,v 1.9 2011/08/29 12:50:50 jruoho Exp $);
+__RCSID($NetBSD: t_bitops.c,v 1.10 2011/08/29 17:39:54 jruoho Exp $);
#include atf-c.h
#include sys/cdefs.h
#include sys/bitops.h
-#include sys/utsname.h
#include math.h
#include stdlib.h
@@ -165,15 +164,12 @@
ATF_TC_BODY(ilog2_log2, tc)
{
- struct utsname utsname;
double x, y;
uint64_t i;
/*
* This may fail under QEMU; see PR misc/44767.
*/
- ATF_REQUIRE(uname(utsname) == 0);
-
for (i = 1; i UINT32_MAX; i += UINT16_MAX) {
x = log2(i);
Index: src/tests/lib/libc/stdlib/t_strtod.c
diff -u src/tests/lib/libc/stdlib/t_strtod.c:1.25 src/tests/lib/libc/stdlib/t_strtod.c:1.26
--- src/tests/lib/libc/stdlib/t_strtod.c:1.25 Mon Aug 29 12:50:50 2011
+++ src/tests/lib/libc/stdlib/t_strtod.c Mon Aug 29 17:39:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strtod.c,v 1.25 2011/08/29 12:50:50 jruoho Exp $ */
+/* $NetBSD: t_strtod.c,v 1.26 2011/08/29 17:39:54 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,9 +32,7 @@
/* Public domain, Otto Moerbeek o...@drijf.net, 2006. */
#include sys/cdefs.h
-__RCSID($NetBSD: t_strtod.c,v 1.25 2011/08/29 12:50:50 jruoho Exp $);
-
-#include sys/utsname.h
+__RCSID($NetBSD: t_strtod.c,v 1.26 2011/08/29 17:39:54 jruoho Exp $);
#include errno.h
#include math.h
@@ -265,16 +263,12 @@
{
#if defined(__i386__) || defined(__amd64__) || defined(__sparc__)
- struct utsname utsname;
-
/*
* Test that strtod(3) honors the current rounding mode.
* The used value is somewhere near 1 + DBL_EPSILON + FLT_EPSILON.
*
* May fail under QEMU; cf. PR misc/44767.
*/
- ATF_REQUIRE(uname(utsname) == 0);
-
const char *val =
1.0011920928977282585492503130808472633361816406;
Index: src/tests/lib/libm/t_floor.c
diff -u src/tests/lib/libm/t_floor.c:1.7 src/tests/lib/libm/t_floor.c:1.8
--- src/tests/lib/libm/t_floor.c:1.7 Mon Aug 29 12:50:50 2011
+++ src/tests/lib/libm/t_floor.c Mon Aug 29 17:39:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_floor.c,v 1.7 2011/08/29 12:50:50 jruoho Exp $ */
+/* $NetBSD: t_floor.c,v 1.8 2011/08/29 17:39:54 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,9 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_floor.c,v 1.7 2011/08/29 12:50:50 jruoho Exp $);
-
-#include sys/utsname.h
+__RCSID($NetBSD: t_floor.c,v 1.8 2011/08/29 17:39:54 jruoho Exp $);
#include atf-c.h
#include math.h
@@ -53,7 +51,6 @@
ATF_TC_BODY(floor, tc)
{
- struct utsname utsname;
const int n = 10240;
double x, y;
int i;
@@ -61,8 +58,6 @@
/*
* This may fail under QEMU; see PR misc/44767.
*/
- ATF_REQUIRE(uname(utsname) == 0);
-
for (i = 0; i n; i++) {
x = i + 0.9;
CVS commit: src/external/gpl3/binutils/dist/gas/config
Module Name:src Committed By: bouyer Date: Mon Aug 29 18:30:52 UTC 2011 Modified Files: src/external/gpl3/binutils/dist/gas/config: tc-mips.c Log Message: Hide instructions added by -mfix-loongson2f-jump in the same way as -mfix-loongson2f-btb, to avoid a gas warning macro expanded into multiple instructions (which cause GDIUM kernel build failure as it's built with -Wa,-mfix-loongson2f-jump -Wa,--fatal-warnings). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/binutils/dist/gas/config/tc-mips.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/dist/gas/config/tc-mips.c diff -u src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.6 src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.7 --- src/external/gpl3/binutils/dist/gas/config/tc-mips.c:1.6 Sat Aug 27 13:19:39 2011 +++ src/external/gpl3/binutils/dist/gas/config/tc-mips.c Mon Aug 29 18:30:52 2011 @@ -2749,6 +2749,12 @@ ep.X_add_number = 0x; macro_build (ep, ori, t,r,i, ATREG, ATREG, BFD_RELOC_LO16); macro_build (NULL, and, d,v,t, sreg, sreg, ATREG); + /* Hide these three instructions to avoid getting a ``macro expanded into + multiple instructions'' warning. */ + if (mips_relax.sequence != 2) +mips_macro_warning.sizes[0] -= 3 * 4; + if (mips_relax.sequence != 1) +mips_macro_warning.sizes[1] -= 3 * 4; } }
CVS commit: src
Module Name:src
Committed By: bouyer
Date: Mon Aug 29 18:32:18 UTC 2011
Modified Files:
src/distrib/evbmips/instkernel/instkernel: Makefile
src/etc/etc.evbmips: Makefile.inc
Added Files:
src/sys/arch/evbmips/conf: INSTALL_LOONGSON
Log Message:
Add a INSTALL_LOONGSON kernel with a ramdisk.
build LOONGSON and INSTALL_LOONGSON for evbmips-mip64el
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/evbmips/instkernel/instkernel/Makefile
cvs rdiff -u -r1.17 -r1.18 src/etc/etc.evbmips/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbmips/conf/INSTALL_LOONGSON
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbmips/instkernel/instkernel/Makefile
diff -u src/distrib/evbmips/instkernel/instkernel/Makefile:1.3 src/distrib/evbmips/instkernel/instkernel/Makefile:1.4
--- src/distrib/evbmips/instkernel/instkernel/Makefile:1.3 Sun Feb 20 08:26:09 2011
+++ src/distrib/evbmips/instkernel/instkernel/Makefile Mon Aug 29 18:32:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/02/20 08:26:09 matt Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/29 18:32:18 bouyer Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -16,6 +16,9 @@
MDSETTARGETS+= INSTALL_MALTA64 ${RAMDISK} -
MDSETTARGETS+= INSTALL_XLSATX32 ${RAMDISK} -
MDSETTARGETS+= INSTALL_XLSATX64 ${RAMDISK} -
+.if ${MACHINE_ARCH} == mips64el
+MDSETTARGETS+= INSTALL_LOONGSON ${RAMDISK} -
+.endif
.else
# Big endian platforms.
Index: src/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.17 src/etc/etc.evbmips/Makefile.inc:1.18
--- src/etc/etc.evbmips/Makefile.inc:1.17 Wed Aug 24 16:03:34 2011
+++ src/etc/etc.evbmips/Makefile.inc Mon Aug 29 18:32:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2011/08/24 16:03:34 matt Exp $
+# $NetBSD: Makefile.inc,v 1.18 2011/08/29 18:32:18 bouyer Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -22,6 +22,8 @@
.if ${MACHINE_ARCH} == mips64el
KERNEL_SETS+= P5064-64
+KERNEL_SETS+= LOONGSON
+BUILD_KERNELS+= INSTALL_LOONGSON
KERNEL_SETS+= GDIUM64
.endif
.else
Added files:
Index: src/sys/arch/evbmips/conf/INSTALL_LOONGSON
diff -u /dev/null src/sys/arch/evbmips/conf/INSTALL_LOONGSON:1.1
--- /dev/null Mon Aug 29 18:32:18 2011
+++ src/sys/arch/evbmips/conf/INSTALL_LOONGSON Mon Aug 29 18:32:18 2011
@@ -0,0 +1,14 @@
+# $NetBSD: INSTALL_LOONGSON,v 1.1 2011/08/29 18:32:18 bouyer Exp $
+
+include arch/evbmips/conf/LOONGSON
+
+#ident INSTALL_LOONGSON-$Revision: 1.1 $
+
+# Enable the hooks used for initializing the root memory-disk.
+# The ramdisk size must be kept in sync manually with the size of
+# the `ramdisk' image (which is built in distrib/evbmips/ramdisk/ramdisk).
+pseudo-device md# memory disk device
+options MEMORY_DISK_HOOKS
+options MEMORY_DISK_IS_ROOT # force root on memory disk
+options MEMORY_DISK_SERVER=0 # no userspace memory disk
+options MEMORY_DISK_ROOT_SIZE=12288 # size of memory disk, in blocks
CVS commit: src/sys
Module Name:src
Committed By: bouyer
Date: Mon Aug 29 18:34:43 UTC 2011
Modified Files:
src/sys/arch/evbmips/loongson/dev: gcscpcib_pci.c
src/sys/arch/i386/pci: gcscpcib_pci.c
src/sys/dev/ic: gcscpcib.c gcscpcibvar.h
Log Message:
Add a flags argument to gcscpcib_attach().
Add a flag argument which cause the waychdog to not be attached.
Use it to disable the watchdog on loongson-based platforms, where
the CS5536's reset output is not wired to the CPU reset line :(
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/loongson/dev/gcscpcib_pci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/i386/pci/gcscpcib_pci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/gcscpcib.c \
src/sys/dev/ic/gcscpcibvar.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/evbmips/loongson/dev/gcscpcib_pci.c
diff -u src/sys/arch/evbmips/loongson/dev/gcscpcib_pci.c:1.1 src/sys/arch/evbmips/loongson/dev/gcscpcib_pci.c:1.2
--- src/sys/arch/evbmips/loongson/dev/gcscpcib_pci.c:1.1 Sat Aug 27 13:42:45 2011
+++ src/sys/arch/evbmips/loongson/dev/gcscpcib_pci.c Mon Aug 29 18:34:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscpcib_pci.c,v 1.1 2011/08/27 13:42:45 bouyer Exp $ */
+/* $NetBSD: gcscpcib_pci.c,v 1.2 2011/08/29 18:34:42 bouyer Exp $ */
/* $OpenBSD: gcscpcib.c,v 1.6 2007/11/17 17:02:47 mbalmer Exp $ */
/*
@@ -25,7 +25,7 @@
* machine-dependent attachement.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gcscpcib_pci.c,v 1.1 2011/08/27 13:42:45 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: gcscpcib_pci.c,v 1.2 2011/08/29 18:34:42 bouyer Exp $);
#include sys/param.h
@@ -92,7 +92,7 @@
/* Attach the PCI-ISA bridge at first */
pcibattach(parent, self, aux);
/* then attach gcscpcib itself */
- gcscpcib_attach(self, sc-sc_gcscpcib, pa-pa_iot);
+ gcscpcib_attach(self, sc-sc_gcscpcib, pa-pa_iot, GCSCATTACH_NO_WDT);
}
uint64_t
Index: src/sys/arch/i386/pci/gcscpcib_pci.c
diff -u src/sys/arch/i386/pci/gcscpcib_pci.c:1.1 src/sys/arch/i386/pci/gcscpcib_pci.c:1.2
--- src/sys/arch/i386/pci/gcscpcib_pci.c:1.1 Sat Aug 27 12:47:49 2011
+++ src/sys/arch/i386/pci/gcscpcib_pci.c Mon Aug 29 18:34:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscpcib_pci.c,v 1.1 2011/08/27 12:47:49 bouyer Exp $ */
+/* $NetBSD: gcscpcib_pci.c,v 1.2 2011/08/29 18:34:42 bouyer Exp $ */
/* $OpenBSD: gcscpcib.c,v 1.6 2007/11/17 17:02:47 mbalmer Exp $ */
/*
@@ -25,7 +25,7 @@
* machine-dependent attachement.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gcscpcib_pci.c,v 1.1 2011/08/27 12:47:49 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: gcscpcib_pci.c,v 1.2 2011/08/29 18:34:42 bouyer Exp $);
#include sys/param.h
@@ -92,7 +92,7 @@
/* Attach the PCI-ISA bridge at first */
pcibattach(parent, self, aux);
/* then attach gcscpcib itself */
- gcscpcib_attach(self, sc-sc_gcscpcib, pa-pa_iot);
+ gcscpcib_attach(self, sc-sc_gcscpcib, pa-pa_iot, 0);
}
uint64_t
Index: src/sys/dev/ic/gcscpcib.c
diff -u src/sys/dev/ic/gcscpcib.c:1.1 src/sys/dev/ic/gcscpcib.c:1.2
--- src/sys/dev/ic/gcscpcib.c:1.1 Sat Aug 27 12:47:49 2011
+++ src/sys/dev/ic/gcscpcib.c Mon Aug 29 18:34:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscpcib.c,v 1.1 2011/08/27 12:47:49 bouyer Exp $ */
+/* $NetBSD: gcscpcib.c,v 1.2 2011/08/29 18:34:42 bouyer Exp $ */
/* $OpenBSD: gcscpcib.c,v 1.6 2007/11/17 17:02:47 mbalmer Exp $ */
/*
@@ -24,7 +24,7 @@
* AMD CS5535/CS5536 series LPC bridge also containing timer, watchdog and GPIO.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gcscpcib.c,v 1.1 2011/08/27 12:47:49 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: gcscpcib.c,v 1.2 2011/08/29 18:34:42 bouyer Exp $);
#include gpio.h
@@ -84,7 +84,7 @@
void
gcscpcib_attach(device_t self, struct gcscpcib_softc *sc,
-bus_space_tag_t iot)
+bus_space_tag_t iot, int flags)
{
struct timecounter *tc = sc-sc_timecounter;
bus_addr_t wdtbase;
@@ -109,6 +109,9 @@
tc-tc_priv = sc;
tc_init(tc);
+ if (flags GCSCATTACH_NO_WDT)
+ goto gpio;
+
/* Attach the watchdog timer */
wdtbase = gcsc_rdmsr(MSR_LBAR_MFGPT) 0x;
if (bus_space_map(sc-sc_iot, wdtbase, 64, 0, sc-sc_ioh)) {
@@ -295,10 +298,11 @@
period * AMD553X_WDT_TICK);
/* enable watchdog action */
- DPRINTF((%s: enable watchdog action. (MFGPT0_CMP2= %d)\n, __func__,
+ DPRINTF((%s: enable watchdog action. (MFGPT0_CMP2= %d), __func__,
bus_space_read_2(sc-sc_iot, sc-sc_ioh,
AMD553X_MFGPTX_CMP2(sc-sc_wdt_mfgpt;
AMD553X_MFGPTx_NR_ENABLE(sc-sc_wdt_mfgpt, AMD553X_MFGPT0_C2_RSTEN);
+ DPRINTF(( AMD553X_MFGPT_NR 0x% PRIx64 \n, gcsc_rdmsr(AMD553X_MFGPT_NR)));
}
static int
Index: src/sys/dev/ic/gcscpcibvar.h
diff -u src/sys/dev/ic/gcscpcibvar.h:1.1 src/sys/dev/ic/gcscpcibvar.h:1.2
--- src/sys/dev/ic/gcscpcibvar.h:1.1 Sat Aug 27 12:47:49 2011
+++ src/sys/dev/ic/gcscpcibvar.h Mon Aug 29 18:34:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscpcibvar.h,v
CVS commit: src/sbin/fsck_lfs
Module Name:src
Committed By: bouyer
Date: Mon Aug 29 18:43:20 UTC 2011
Modified Files:
src/sbin/fsck_lfs: setup.c
Log Message:
PR bin/45299: print FBMASK not FFMASK when lfs_fbmask is incorrect.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sbin/fsck_lfs/setup.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/fsck_lfs/setup.c
diff -u src/sbin/fsck_lfs/setup.c:1.37 src/sbin/fsck_lfs/setup.c:1.38
--- src/sbin/fsck_lfs/setup.c:1.37 Tue Feb 16 23:20:30 2010
+++ src/sbin/fsck_lfs/setup.c Mon Aug 29 18:43:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.37 2010/02/16 23:20:30 mlelstv Exp $ */
+/* $NetBSD: setup.c,v 1.38 2011/08/29 18:43:20 bouyer Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -367,8 +367,8 @@
}
}
if (fs-lfs_fbmask != (1 fs-lfs_fbshift) - 1) {
- pwarn(INCORRECT FFMASK=% PRId64 IN SUPERBLOCK,
- fs-lfs_ffmask);
+ pwarn(INCORRECT FBMASK=% PRId64 IN SUPERBLOCK,
+ fs-lfs_fbmask);
fs-lfs_fbmask = (1 fs-lfs_fbshift) - 1;
if (preen)
printf( (FIXED)\n);
CVS commit: src/games
Module Name:src
Committed By: joerg
Date: Mon Aug 29 20:30:37 UTC 2011
Modified Files:
src/games/banner: banner.c
src/games/dab: board.h
src/games/larn: bill.c extern.h
src/games/ppt: ppt.c
src/games/sail: extern.h
src/games/trek: main.c
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/games/banner/banner.c
cvs rdiff -u -r1.2 -r1.3 src/games/dab/board.h
cvs rdiff -u -r1.10 -r1.11 src/games/larn/bill.c
cvs rdiff -u -r1.15 -r1.16 src/games/larn/extern.h
cvs rdiff -u -r1.18 -r1.19 src/games/ppt/ppt.c
cvs rdiff -u -r1.37 -r1.38 src/games/sail/extern.h
cvs rdiff -u -r1.22 -r1.23 src/games/trek/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/banner/banner.c
diff -u src/games/banner/banner.c:1.18 src/games/banner/banner.c:1.19
--- src/games/banner/banner.c:1.18 Wed Aug 12 05:19:27 2009
+++ src/games/banner/banner.c Mon Aug 29 20:30:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: banner.c,v 1.18 2009/08/12 05:19:27 dholland Exp $ */
+/* $NetBSD: banner.c,v 1.19 2011/08/29 20:30:36 joerg Exp $ */
/*
* Copyright (c) 1980, 1993, 1994
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)banner.c 8.4 (Berkeley) 4/29/95;
#else
-__RCSID($NetBSD: banner.c,v 1.18 2009/08/12 05:19:27 dholland Exp $);
+__RCSID($NetBSD: banner.c,v 1.19 2011/08/29 20:30:36 joerg Exp $);
#endif
#endif /* not lint */
@@ -1025,7 +1025,7 @@
static int debug, i, j, linen, max, nchars, pc, term, trace, x, y;
static int width = DWIDTH; /* -w option: scrunch letters to 80 columns */
-static void
+__dead static void
toolong(void)
{
errx(EXIT_FAILURE, message too long);
Index: src/games/dab/board.h
diff -u src/games/dab/board.h:1.2 src/games/dab/board.h:1.3
--- src/games/dab/board.h:1.2 Mon Apr 28 20:22:53 2008
+++ src/games/dab/board.h Mon Aug 29 20:30:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: board.h,v 1.2 2008/04/28 20:22:53 martin Exp $ */
+/* $NetBSD: board.h,v 1.3 2011/08/29 20:30:37 joerg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
void games(size_t i, const PLAYER p); // Post games
void total(size_t i, const PLAYER p); // Post totals
void ties(const PLAYER p);// Post ties
-void abort(const char *s, ...) const; // Algorithm error
+__dead void abort(const char *s, ...) const; // Algorithm error
private:
Index: src/games/larn/bill.c
diff -u src/games/larn/bill.c:1.10 src/games/larn/bill.c:1.11
--- src/games/larn/bill.c:1.10 Wed Aug 12 08:04:05 2009
+++ src/games/larn/bill.c Mon Aug 29 20:30:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bill.c,v 1.10 2009/08/12 08:04:05 dholland Exp $ */
+/* $NetBSD: bill.c,v 1.11 2011/08/29 20:30:37 joerg Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)bill.c 5.2 (Berkeley) 5/28/91;
#else
-__RCSID($NetBSD: bill.c,v 1.10 2009/08/12 08:04:05 dholland Exp $);
+__RCSID($NetBSD: bill.c,v 1.11 2011/08/29 20:30:37 joerg Exp $);
#endif
#endif /* not lint */
@@ -119,7 +119,7 @@
*/
void
-mailbill()
+mailbill(void)
{
inti;
char fname[32];
Index: src/games/larn/extern.h
diff -u src/games/larn/extern.h:1.15 src/games/larn/extern.h:1.16
--- src/games/larn/extern.h:1.15 Fri Aug 26 06:18:17 2011
+++ src/games/larn/extern.h Mon Aug 29 20:30:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.15 2011/08/26 06:18:17 dholland Exp $ */
+/* $NetBSD: extern.h,v 1.16 2011/08/29 20:30:37 joerg Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -36,7 +36,7 @@
void act_open_chest(int, int);
/* bill.c */
-void mailbill(void);
+__dead void mailbill(void);
/* config.c */
Index: src/games/ppt/ppt.c
diff -u src/games/ppt/ppt.c:1.18 src/games/ppt/ppt.c:1.19
--- src/games/ppt/ppt.c:1.18 Wed Aug 12 08:24:20 2009
+++ src/games/ppt/ppt.c Mon Aug 29 20:30:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ppt.c,v 1.18 2009/08/12 08:24:20 dholland Exp $ */
+/* $NetBSD: ppt.c,v 1.19 2011/08/29 20:30:37 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)ppt.c 8.1 (Berkeley) 5/31/93;
#else
-__RCSID($NetBSD: ppt.c,v 1.18 2009/08/12 08:24:20 dholland Exp $);
+__RCSID($NetBSD: ppt.c,v 1.19 2011/08/29 20:30:37 joerg Exp $);
#endif
#endif /* not lint */
@@ -54,7 +54,7 @@
static void putppt(int);
static int getppt(const char *);
-static void
+__dead static void
usage(void)
{
extern char *__progname;
@@ -127,8 +127,7 @@
}
static void
-putppt(c)
- int c;
+putppt(int c)
{
int i;
Index: src/games/sail/extern.h
diff -u src/games/sail/extern.h:1.37 src/games/sail/extern.h:1.38
--- src/games/sail/extern.h:1.37 Fri Aug 26 06:18:18 2011
+++ src/games/sail/extern.h Mon Aug 29 20:30:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.37 2011/08/26 06:18:18 dholland Exp $ */
+/*
CVS commit: src/usr.sbin/mtree
Module Name:src Committed By: joerg Date: Mon Aug 29 20:37:43 UTC 2011 Modified Files: src/usr.sbin/mtree: extern.h mtree.c Log Message: Use __dead and __printflike To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/mtree/extern.h cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/mtree/mtree.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.sbin/mtree/extern.h diff -u src/usr.sbin/mtree/extern.h:1.31 src/usr.sbin/mtree/extern.h:1.32 --- src/usr.sbin/mtree/extern.h:1.31 Wed Apr 8 19:03:13 2009 +++ src/usr.sbin/mtree/extern.h Mon Aug 29 20:37:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.31 2009/04/08 19:03:13 apb Exp $ */ +/* $NetBSD: extern.h,v 1.32 2011/08/29 20:37:43 joerg Exp $ */ /*- * Copyright (c) 1991, 1993 @@ -60,8 +60,7 @@ void dump_nodes(const char *, NODE *, int); void init_excludes(void); int matchtags(NODE *); -void mtree_err(const char *, ...) - __attribute__((__format__(__printf__, 1, 2))); +__dead __printflike(1,2) void mtree_err(const char *, ...); const char *nodetype(u_int); u_int parsekey(const char *, int *); void parsetags(slist_t *, char *); Index: src/usr.sbin/mtree/mtree.c diff -u src/usr.sbin/mtree/mtree.c:1.36 src/usr.sbin/mtree/mtree.c:1.37 --- src/usr.sbin/mtree/mtree.c:1.36 Wed Apr 8 19:43:05 2009 +++ src/usr.sbin/mtree/mtree.c Mon Aug 29 20:37:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: mtree.c,v 1.36 2009/04/08 19:43:05 wiz Exp $ */ +/* $NetBSD: mtree.c,v 1.37 2011/08/29 20:37:43 joerg Exp $ */ /*- * Copyright (c) 1989, 1990, 1993 @@ -43,7 +43,7 @@ #if 0 static char sccsid[] = @(#)mtree.c 8.1 (Berkeley) 6/6/93; #else -__RCSID($NetBSD: mtree.c,v 1.36 2009/04/08 19:43:05 wiz Exp $); +__RCSID($NetBSD: mtree.c,v 1.37 2011/08/29 20:37:43 joerg Exp $); #endif #endif /* not lint */ @@ -63,8 +63,7 @@ rflag, sflag, tflag, uflag, Uflag; char fullpath[MAXPATHLEN]; - int main(int, char **); -static void usage(void); +__dead static void usage(void); int main(int argc, char **argv)
CVS commit: src/usr.sbin
Module Name:src
Committed By: joerg
Date: Mon Aug 29 20:38:55 UTC 2011
Modified Files:
src/usr.sbin/ac: ac.c
src/usr.sbin/accton: accton.c
src/usr.sbin/acpitools/acpidump: acpidump.c
src/usr.sbin/acpitools/amldb: amldb.c
src/usr.sbin/altq/altqd: altqd.c
src/usr.sbin/altq/altqstat: altqstat.c
src/usr.sbin/altq/tbrconfig: tbrconfig.c
src/usr.sbin/bootp/bootpd: bootpd.c
src/usr.sbin/bootp/bootpef: bootpef.c
src/usr.sbin/bootp/bootpgw: bootpgw.c
src/usr.sbin/btpand: btpand.c client.c
src/usr.sbin/catman: catman.c
src/usr.sbin/rtsold: rtsold.c
src/usr.sbin/ypbind: ypbind.c
Log Message:
Use __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/ac/ac.c
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/accton/accton.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/acpitools/acpidump/acpidump.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/amldb/amldb.c
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/altq/altqd/altqd.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/altq/altqstat/altqstat.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/altq/tbrconfig/tbrconfig.c
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/bootp/bootpd/bootpd.c
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/bootp/bootpef/bootpef.c
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/bootp/bootpgw/bootpgw.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/btpand/btpand.c \
src/usr.sbin/btpand/client.c
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/catman/catman.c
cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/rtsold/rtsold.c
cvs rdiff -u -r1.88 -r1.89 src/usr.sbin/ypbind/ypbind.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.sbin/ac/ac.c
diff -u src/usr.sbin/ac/ac.c:1.23 src/usr.sbin/ac/ac.c:1.24
--- src/usr.sbin/ac/ac.c:1.23 Fri May 26 02:16:17 2006
+++ src/usr.sbin/ac/ac.c Mon Aug 29 20:38:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ac.c,v 1.23 2006/05/26 02:16:17 jnemeth Exp $ */
+/* $NetBSD: ac.c,v 1.24 2011/08/29 20:38:53 joerg Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -49,7 +49,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: ac.c,v 1.23 2006/05/26 02:16:17 jnemeth Exp $);
+__RCSID($NetBSD: ac.c,v 1.24 2011/08/29 20:38:53 joerg Exp $);
#endif
#include sys/types.h
@@ -134,7 +134,7 @@
static void show_users(struct user_list *);
static struct user_list *update_user(struct user_list *, char *, time_t);
static int compare(const void *, const void *);
-static void usage(void);
+__dead static void usage(void);
/*
* open wtmp or die
Index: src/usr.sbin/accton/accton.c
diff -u src/usr.sbin/accton/accton.c:1.11 src/usr.sbin/accton/accton.c:1.12
--- src/usr.sbin/accton/accton.c:1.11 Mon Jul 21 13:36:57 2008
+++ src/usr.sbin/accton/accton.c Mon Aug 29 20:38:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: accton.c,v 1.11 2008/07/21 13:36:57 lukem Exp $ */
+/* $NetBSD: accton.c,v 1.12 2011/08/29 20:38:54 joerg Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = @(#)accton.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: accton.c,v 1.11 2008/07/21 13:36:57 lukem Exp $);
+__RCSID($NetBSD: accton.c,v 1.12 2011/08/29 20:38:54 joerg Exp $);
#endif
#endif /* not lint */
@@ -51,7 +51,7 @@
#include stdio.h
#include string.h
-void usage(void);
+__dead static void usage(void);
int
main(int argc, char **argv)
@@ -82,7 +82,7 @@
exit(0);
}
-void
+static void
usage(void)
{
Index: src/usr.sbin/acpitools/acpidump/acpidump.c
diff -u src/usr.sbin/acpitools/acpidump/acpidump.c:1.4 src/usr.sbin/acpitools/acpidump/acpidump.c:1.5
--- src/usr.sbin/acpitools/acpidump/acpidump.c:1.4 Thu Feb 17 10:18:05 2011
+++ src/usr.sbin/acpitools/acpidump/acpidump.c Mon Aug 29 20:38:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpidump.c,v 1.4 2011/02/17 10:18:05 jmcneill Exp $ */
+/* $NetBSD: acpidump.c,v 1.5 2011/08/29 20:38:54 joerg Exp $ */
/*-
* Copyright (c) 2000 Mitsuru IWASAKI iwas...@freebsd.org
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: acpidump.c,v 1.4 2011/02/17 10:18:05 jmcneill Exp $);
+__RCSID($NetBSD: acpidump.c,v 1.5 2011/08/29 20:38:54 joerg Exp $);
#include sys/param.h
@@ -48,7 +48,7 @@
int tflag; /* Dump contents of SDT tables */
int vflag; /* Use verbose messages */
-static void
+__dead static void
usage(void)
{
const char *progname = getprogname();
Index: src/usr.sbin/acpitools/amldb/amldb.c
diff -u src/usr.sbin/acpitools/amldb/amldb.c:1.2 src/usr.sbin/acpitools/amldb/amldb.c:1.3
--- src/usr.sbin/acpitools/amldb/amldb.c:1.2 Sun Jan 14 05:33:18 2007
+++ src/usr.sbin/acpitools/amldb/amldb.c Mon Aug 29 20:38:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: amldb.c,v 1.2 2007/01/14 05:33:18 dogcow Exp $ */
+/* $NetBSD: amldb.c,v 1.3 2011/08/29 20:38:54 joerg Exp $ */
/*-
* Copyright (c) 1999 Mitsuru IWASAKI iwas...@freebsd.org
@@ -29,7 +29,7 @@
* $FreeBSD:
CVS commit: src/libexec
Module Name:src Committed By: joerg Date: Mon Aug 29 20:41:07 UTC 2011 Modified Files: src/libexec/ftpd: extern.h ftpd.c src/libexec/getNAME: getNAME.c src/libexec/identd: identd.c src/libexec/rpc.rstatd: rstatd.c src/libexec/rpc.rwalld: rwalld.c src/libexec/rpc.sprayd: sprayd.c src/libexec/tftpd: tftpd.c Log Message: Use __dead To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/libexec/ftpd/extern.h cvs rdiff -u -r1.194 -r1.195 src/libexec/ftpd/ftpd.c cvs rdiff -u -r1.26 -r1.27 src/libexec/getNAME/getNAME.c cvs rdiff -u -r1.32 -r1.33 src/libexec/identd/identd.c cvs rdiff -u -r1.14 -r1.15 src/libexec/rpc.rstatd/rstatd.c cvs rdiff -u -r1.20 -r1.21 src/libexec/rpc.rwalld/rwalld.c cvs rdiff -u -r1.15 -r1.16 src/libexec/rpc.sprayd/sprayd.c cvs rdiff -u -r1.38 -r1.39 src/libexec/tftpd/tftpd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ftpd/extern.h diff -u src/libexec/ftpd/extern.h:1.61 src/libexec/ftpd/extern.h:1.62 --- src/libexec/ftpd/extern.h:1.61 Mon Jul 13 19:05:40 2009 +++ src/libexec/ftpd/extern.h Mon Aug 29 20:41:06 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.61 2009/07/13 19:05:40 roy Exp $ */ +/* $NetBSD: extern.h,v 1.62 2011/08/29 20:41:06 joerg Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -124,8 +124,8 @@ void delete(const char *); int display_file(const char *, int); const char **do_conversion(const char *); -void dologout(int); -void fatal(const char *); +__dead void dologout(int); +__dead void fatal(const char *); void feat(void); void format_path(char *, const char *); int ftpd_pclose(FILE *); Index: src/libexec/ftpd/ftpd.c diff -u src/libexec/ftpd/ftpd.c:1.194 src/libexec/ftpd/ftpd.c:1.195 --- src/libexec/ftpd/ftpd.c:1.194 Mon Jul 13 19:05:40 2009 +++ src/libexec/ftpd/ftpd.c Mon Aug 29 20:41:06 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ftpd.c,v 1.194 2009/07/13 19:05:40 roy Exp $ */ +/* $NetBSD: ftpd.c,v 1.195 2011/08/29 20:41:06 joerg Exp $ */ /* * Copyright (c) 1997-2009 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ #if 0 static char sccsid[] = @(#)ftpd.c 8.5 (Berkeley) 4/28/95; #else -__RCSID($NetBSD: ftpd.c,v 1.194 2009/07/13 19:05:40 roy Exp $); +__RCSID($NetBSD: ftpd.c,v 1.195 2011/08/29 20:41:06 joerg Exp $); #endif #endif /* not lint */ @@ -249,9 +249,9 @@ static void login_utmp(const char *, const char *, const char *, struct sockinet *); static void logremotehost(struct sockinet *); -static void lostconn(int); -static void toolong(int); -static void sigquit(int); +__dead static void lostconn(int); +__dead static void toolong(int); +__dead static void sigquit(int); static void sigurg(int); static int handleoobcmd(void); static int receive_data(FILE *, FILE *); Index: src/libexec/getNAME/getNAME.c diff -u src/libexec/getNAME/getNAME.c:1.26 src/libexec/getNAME/getNAME.c:1.27 --- src/libexec/getNAME/getNAME.c:1.26 Sun Jul 20 01:09:07 2008 +++ src/libexec/getNAME/getNAME.c Mon Aug 29 20:41:06 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: getNAME.c,v 1.26 2008/07/20 01:09:07 lukem Exp $ */ +/* $NetBSD: getNAME.c,v 1.27 2011/08/29 20:41:06 joerg Exp $ */ /*- * Copyright (c) 1997, Christos Zoulas. All rights reserved. @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = @(#)getNAME.c 8.1 (Berkeley) 6/30/93; #else -__RCSID($NetBSD: getNAME.c,v 1.26 2008/07/20 01:09:07 lukem Exp $); +__RCSID($NetBSD: getNAME.c,v 1.27 2011/08/29 20:41:06 joerg Exp $); #endif #endif /* not lint */ @@ -76,7 +76,7 @@ static void remquote(char *, size_t *); static void fixxref(char *, size_t *); static void split(char *, char *); -static void usage(void); +__dead static void usage(void); int main(int, char *[]); Index: src/libexec/identd/identd.c diff -u src/libexec/identd/identd.c:1.32 src/libexec/identd/identd.c:1.33 --- src/libexec/identd/identd.c:1.32 Sun Jan 18 00:37:53 2009 +++ src/libexec/identd/identd.c Mon Aug 29 20:41:06 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: identd.c,v 1.32 2009/01/18 00:37:53 lukem Exp $ */ +/* $NetBSD: identd.c,v 1.33 2011/08/29 20:41:06 joerg Exp $ */ /* * identd.c - TCP/IP Ident protocol server. @@ -8,7 +8,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: identd.c,v 1.32 2009/01/18 00:37:53 lukem Exp $); +__RCSID($NetBSD: identd.c,v 1.33 2011/08/29 20:41:06 joerg Exp $); #include sys/param.h #include sys/socket.h @@ -61,9 +61,9 @@ static int check_userident(const char *, char *, size_t); static void random_string(char *, size_t); static int change_format(const char *, struct passwd *, char *, size_t); -static void timeout_handler(int); -static void fatal(const char *); -static void die(const char *, ...); +__dead static void timeout_handler(int); +__dead static void fatal(const char *); +__dead static void die(const char *, ...); static int bflag, eflag, fflag, iflag, Iflag; static int lflag, Lflag, nflag, Nflag,
CVS commit: src/dist/bzip2
Module Name:src
Committed By: joerg
Date: Mon Aug 29 20:41:22 UTC 2011
Modified Files:
src/dist/bzip2: bzip2recover.c
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/dist/bzip2/bzip2recover.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/bzip2/bzip2recover.c
diff -u src/dist/bzip2/bzip2recover.c:1.8 src/dist/bzip2/bzip2recover.c:1.9
--- src/dist/bzip2/bzip2recover.c:1.8 Tue May 24 12:18:03 2011
+++ src/dist/bzip2/bzip2recover.c Mon Aug 29 20:41:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bzip2recover.c,v 1.8 2011/05/24 12:18:03 joerg Exp $ */
+/* $NetBSD: bzip2recover.c,v 1.9 2011/08/29 20:41:22 joerg Exp $ */
/*---*/
@@ -112,7 +112,7 @@
/*---*/
/*-*/
-static void readError ( void )
+__dead static void readError ( void )
{
fprintf ( stderr,
%s: I/O error reading `%s', possible reason follows.\n,
@@ -125,7 +125,7 @@
/*-*/
-static void writeError ( void )
+__dead static void writeError ( void )
{
fprintf ( stderr,
%s: I/O error reading `%s', possible reason follows.\n,
@@ -138,7 +138,7 @@
/*-*/
-static void mallocFail ( Int32 n )
+__dead static void mallocFail ( Int32 n )
{
fprintf ( stderr,
%s: malloc failed on request for %d bytes.\n,
@@ -150,7 +150,7 @@
/*-*/
-static void tooManyBlocks ( Int32 max_handled_blocks )
+__dead static void tooManyBlocks ( Int32 max_handled_blocks )
{
fprintf ( stderr,
%s: `%s' appears to contain more than %d blocks\n,
CVS commit: src
Module Name:src Committed By: joerg Date: Mon Aug 29 20:48:36 UTC 2011 Modified Files: src/lib/libpuffs: puffs.h src/sys/rump/include/rump: rumpuser.h Log Message: Use __dead To generate a diff of this commit: cvs rdiff -u -r1.118 -r1.119 src/lib/libpuffs/puffs.h cvs rdiff -u -r1.69 -r1.70 src/sys/rump/include/rump/rumpuser.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpuffs/puffs.h diff -u src/lib/libpuffs/puffs.h:1.118 src/lib/libpuffs/puffs.h:1.119 --- src/lib/libpuffs/puffs.h:1.118 Mon Jul 4 08:07:30 2011 +++ src/lib/libpuffs/puffs.h Mon Aug 29 20:48:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: puffs.h,v 1.118 2011/07/04 08:07:30 manu Exp $ */ +/* $NetBSD: puffs.h,v 1.119 2011/08/29 20:48:36 joerg Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. @@ -615,7 +615,7 @@ void puffs_set_errnotify(struct puffs_usermount *, pu_errnotify_fn); void puffs_kernerr_log(struct puffs_usermount *, uint8_t, int, const char *, puffs_cookie_t); -void puffs_kernerr_abort(struct puffs_usermount *, uint8_t, int, +__dead void puffs_kernerr_abort(struct puffs_usermount *, uint8_t, int, const char *, puffs_cookie_t); void puffs_set_prepost(struct puffs_usermount *, pu_prepost_fn, pu_prepost_fn); Index: src/sys/rump/include/rump/rumpuser.h diff -u src/sys/rump/include/rump/rumpuser.h:1.69 src/sys/rump/include/rump/rumpuser.h:1.70 --- src/sys/rump/include/rump/rumpuser.h:1.69 Mon May 23 20:49:35 2011 +++ src/sys/rump/include/rump/rumpuser.h Mon Aug 29 20:48:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser.h,v 1.69 2011/05/23 20:49:35 joerg Exp $ */ +/* $NetBSD: rumpuser.h,v 1.70 2011/08/29 20:48:36 joerg Exp $ */ /* * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. @@ -114,7 +114,7 @@ /* rumpuser_pth */ void rumpuser_thrinit(kernel_lockfn, kernel_unlockfn, int); -void rumpuser_biothread(void *); +__dead void rumpuser_biothread(void *); int rumpuser_thread_create(void *(*f)(void *), void *, const char *, int, void **);
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: joerg
Date: Mon Aug 29 21:08:54 UTC 2011
Modified Files:
src/crypto/external/bsd/openssh/dist: packet.c packet.h ssh.c
sshconnect2.c
Log Message:
Use __dead
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/packet.h
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/ssh.c
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/sshconnect2.c
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/openssh/dist/packet.c
diff -u src/crypto/external/bsd/openssh/dist/packet.c:1.6 src/crypto/external/bsd/openssh/dist/packet.c:1.7
--- src/crypto/external/bsd/openssh/dist/packet.c:1.6 Mon Jul 25 03:03:10 2011
+++ src/crypto/external/bsd/openssh/dist/packet.c Mon Aug 29 21:08:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: packet.c,v 1.6 2011/07/25 03:03:10 christos Exp $ */
+/* $NetBSD: packet.c,v 1.7 2011/08/29 21:08:54 joerg Exp $ */
/* $OpenBSD: packet.c,v 1.172 2010/11/13 23:27:50 djm Exp $ */
/*
* Author: Tatu Ylonen y...@cs.hut.fi
@@ -39,7 +39,7 @@
*/
#include includes.h
-__RCSID($NetBSD: packet.c,v 1.6 2011/07/25 03:03:10 christos Exp $);
+__RCSID($NetBSD: packet.c,v 1.7 2011/08/29 21:08:54 joerg Exp $);
#include sys/types.h
#include sys/queue.h
#include sys/socket.h
@@ -251,7 +251,7 @@
active_state-packet_timeout_ms = timeout * count * 1000;
}
-static void
+__dead static void
packet_stop_discard(void)
{
if (active_state-packet_discard_mac) {
Index: src/crypto/external/bsd/openssh/dist/packet.h
diff -u src/crypto/external/bsd/openssh/dist/packet.h:1.4 src/crypto/external/bsd/openssh/dist/packet.h:1.5
--- src/crypto/external/bsd/openssh/dist/packet.h:1.4 Mon Jul 25 03:03:10 2011
+++ src/crypto/external/bsd/openssh/dist/packet.h Mon Aug 29 21:08:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: packet.h,v 1.4 2011/07/25 03:03:10 christos Exp $ */
+/* $NetBSD: packet.h,v 1.5 2011/08/29 21:08:54 joerg Exp $ */
/* $OpenBSD: packet.h,v 1.55 2010/11/13 23:27:50 djm Exp $ */
/*
@@ -69,7 +69,7 @@
void *packet_get_string(u_int *length_ptr);
char *packet_get_cstring(u_int *length_ptr);
void *packet_get_string_ptr(u_int *length_ptr);
-void packet_disconnect(const char *fmt,...) __attribute__((format(printf, 1, 2)));
+__dead void packet_disconnect(const char *fmt,...) __attribute__((format(printf, 1, 2)));
void packet_send_debug(const char *fmt,...) __attribute__((format(printf, 1, 2)));
void set_newkeys(int mode);
Index: src/crypto/external/bsd/openssh/dist/ssh.c
diff -u src/crypto/external/bsd/openssh/dist/ssh.c:1.7 src/crypto/external/bsd/openssh/dist/ssh.c:1.8
--- src/crypto/external/bsd/openssh/dist/ssh.c:1.7 Mon Jul 25 08:51:10 2011
+++ src/crypto/external/bsd/openssh/dist/ssh.c Mon Aug 29 21:08:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ssh.c,v 1.7 2011/07/25 08:51:10 joerg Exp $ */
+/* $NetBSD: ssh.c,v 1.8 2011/08/29 21:08:54 joerg Exp $ */
/* $OpenBSD: ssh.c,v 1.356 2011/01/06 22:23:53 djm Exp $ */
/*
* Author: Tatu Ylonen y...@cs.hut.fi
@@ -42,7 +42,7 @@
*/
#include includes.h
-__RCSID($NetBSD: ssh.c,v 1.7 2011/07/25 08:51:10 joerg Exp $);
+__RCSID($NetBSD: ssh.c,v 1.8 2011/08/29 21:08:54 joerg Exp $);
#include sys/types.h
#include sys/param.h
#include sys/ioctl.h
@@ -184,7 +184,7 @@
/* Prints a help message to the user. This function never returns. */
-static void
+__dead static void
usage(void)
{
fprintf(stderr,
@@ -984,7 +984,7 @@
}
}
-static void
+__dead static void
client_cleanup_stdio_fwd(int id, void *arg)
{
debug(stdio forwarding: done);
Index: src/crypto/external/bsd/openssh/dist/sshconnect2.c
diff -u src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.8 src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.9
--- src/crypto/external/bsd/openssh/dist/sshconnect2.c:1.8 Mon Jul 25 03:03:11 2011
+++ src/crypto/external/bsd/openssh/dist/sshconnect2.c Mon Aug 29 21:08:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sshconnect2.c,v 1.8 2011/07/25 03:03:11 christos Exp $ */
+/* $NetBSD: sshconnect2.c,v 1.9 2011/08/29 21:08:54 joerg Exp $ */
/* $OpenBSD: sshconnect2.c,v 1.186 2010/11/29 23:45:51 djm Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include includes.h
-__RCSID($NetBSD: sshconnect2.c,v 1.8 2011/07/25 03:03:11 christos Exp $);
+__RCSID($NetBSD: sshconnect2.c,v 1.9 2011/08/29 21:08:54 joerg Exp $);
#include sys/types.h
#include sys/socket.h
#include sys/wait.h
@@ -284,10 +284,10 @@
};
void input_userauth_success(int, u_int32_t, void *);
-void input_userauth_success_unexpected(int, u_int32_t, void *);
+__dead void input_userauth_success_unexpected(int, u_int32_t, void *);
void input_userauth_failure(int, u_int32_t, void *);
void input_userauth_banner(int, u_int32_t, void *);
-void
CVS commit: src/share/man/man4
Module Name:src Committed By: jym Date: Mon Aug 29 22:01:47 UTC 2011 Modified Files: src/share/man/man4: ddb.4 Log Message: Be more precise for Xen dom0: either Ctrl + Alt + Esc, or + when on serial console. Thanks to Christoph and Manuel for pointing that out. To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/share/man/man4/ddb.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/ddb.4 diff -u src/share/man/man4/ddb.4:1.144 src/share/man/man4/ddb.4:1.145 --- src/share/man/man4/ddb.4:1.144 Sun Aug 28 22:09:36 2011 +++ src/share/man/man4/ddb.4 Mon Aug 29 22:01:47 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ddb.4,v 1.144 2011/08/28 22:09:36 jym Exp $ +.\ $NetBSD: ddb.4,v 1.145 2011/08/29 22:01:47 jym Exp $ .\ .\ Copyright (c) 1997 - 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -169,9 +169,14 @@ \*[Lt]Esc\*[Gt]-\*[Lt]Shift\*[Gt]-D on serial console. .It x68k Interrupt switch on the body. +.It xen dom0 +\*[Lt]Ctrl\*[Gt]-\*[Lt]Alt\*[Gt]-\*[Lt]Esc\*[Gt] on PC style keyboards. +.It ++ +(five plus signs) on serial console. .It xen domU + -(five plus signs) +(five plus signs) on serial console. .It zaurus \*[Lt]Ctrl\*[Gt]-\*[Lt]Alt\*[Gt]-\*[Lt]Esc\*[Gt] .El
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: dyoung
Date: Mon Aug 29 22:41:52 UTC 2011
Modified Files:
src/sys/arch/x86/pci: pci_intr_machdep.c
Log Message:
Use a loop instead of tail-recursion for the pci_intr(9) overrides.
This is the same change that I just made to the pci(9) overrides. While
I am here, fix a bug: use PCI_OVERRIDE_INTR_DISESTABLISH instead of
PCI_OVERRIDE_INTR_ESTABLISH for the pci_intr_disestablish(9) override.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/x86/pci/pci_intr_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/pci_intr_machdep.c
diff -u src/sys/arch/x86/pci/pci_intr_machdep.c:1.22 src/sys/arch/x86/pci/pci_intr_machdep.c:1.23
--- src/sys/arch/x86/pci/pci_intr_machdep.c:1.22 Wed Aug 17 14:56:55 2011
+++ src/sys/arch/x86/pci/pci_intr_machdep.c Mon Aug 29 22:41:52 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_intr_machdep.c,v 1.22 2011/08/17 14:56:55 dyoung Exp $ */
+/* $NetBSD: pci_intr_machdep.c,v 1.23 2011/08/29 22:41:52 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 2009 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_intr_machdep.c,v 1.22 2011/08/17 14:56:55 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_intr_machdep.c,v 1.23 2011/08/29 22:41:52 dyoung Exp $);
#include sys/types.h
#include sys/param.h
@@ -115,20 +115,16 @@
{
int pin = pa-pa_intrpin;
int line = pa-pa_intrline;
- pci_chipset_tag_t pc;
+ pci_chipset_tag_t ipc, pc = pa-pa_pc;
#if NIOAPIC 0 || NACPICA 0
int rawpin = pa-pa_rawintrpin;
int bus, dev, func;
#endif
- if ((pc = pa-pa_pc) != NULL) {
- if ((pc-pc_present PCI_OVERRIDE_INTR_MAP) != 0)
- return (*pc-pc_ov-ov_intr_map)(pc-pc_ctx, pa, ihp);
- if (pc-pc_super != NULL) {
- struct pci_attach_args paclone = *pa;
- paclone.pa_pc = pc-pc_super;
- return pci_intr_map(paclone, ihp);
- }
+ for (ipc = pc; ipc != NULL; ipc = ipc-pc_super) {
+ if ((ipc-pc_present PCI_OVERRIDE_INTR_MAP) == 0)
+ continue;
+ return (*ipc-pc_ov-ov_intr_map)(ipc-pc_ctx, pa, ihp);
}
if (pin == 0) {
@@ -217,12 +213,12 @@
const char *
pci_intr_string(pci_chipset_tag_t pc, pci_intr_handle_t ih)
{
+ pci_chipset_tag_t ipc;
- if (pc != NULL) {
- if ((pc-pc_present PCI_OVERRIDE_INTR_STRING) != 0)
- return (*pc-pc_ov-ov_intr_string)(pc-pc_ctx, pc, ih);
- if (pc-pc_super != NULL)
- return pci_intr_string(pc-pc_super, ih);
+ for (ipc = pc; ipc != NULL; ipc = ipc-pc_super) {
+ if ((ipc-pc_present PCI_OVERRIDE_INTR_STRING) == 0)
+ continue;
+ return (*ipc-pc_ov-ov_intr_string)(ipc-pc_ctx, pc, ih);
}
return intr_string(ih ~MPSAFE_MASK);
@@ -232,12 +228,12 @@
const struct evcnt *
pci_intr_evcnt(pci_chipset_tag_t pc, pci_intr_handle_t ih)
{
+ pci_chipset_tag_t ipc;
- if (pc != NULL) {
- if ((pc-pc_present PCI_OVERRIDE_INTR_EVCNT) != 0)
- return (*pc-pc_ov-ov_intr_evcnt)(pc-pc_ctx, pc, ih);
- if (pc-pc_super != NULL)
- return pci_intr_evcnt(pc-pc_super, ih);
+ for (ipc = pc; ipc != NULL; ipc = ipc-pc_super) {
+ if ((ipc-pc_present PCI_OVERRIDE_INTR_EVCNT) == 0)
+ continue;
+ return (*ipc-pc_ov-ov_intr_evcnt)(ipc-pc_ctx, pc, ih);
}
/* XXX for now, no evcnt parent reported */
@@ -273,16 +269,13 @@
struct ioapic_softc *ioapic;
#endif
bool mpsafe;
+ pci_chipset_tag_t ipc;
- if (pc != NULL) {
- if ((pc-pc_present PCI_OVERRIDE_INTR_ESTABLISH) != 0) {
- return (*pc-pc_ov-ov_intr_establish)(pc-pc_ctx,
- pc, ih, level, func, arg);
- }
- if (pc-pc_super != NULL) {
- return pci_intr_establish(pc-pc_super, ih, level, func,
- arg);
- }
+ for (ipc = pc; ipc != NULL; ipc = ipc-pc_super) {
+ if ((ipc-pc_present PCI_OVERRIDE_INTR_ESTABLISH) == 0)
+ continue;
+ return (*ipc-pc_ov-ov_intr_establish)(ipc-pc_ctx,
+ pc, ih, level, func, arg);
}
pic = i8259_pic;
@@ -312,17 +305,13 @@
void
pci_intr_disestablish(pci_chipset_tag_t pc, void *cookie)
{
+ pci_chipset_tag_t ipc;
- if (pc != NULL) {
- if ((pc-pc_present PCI_OVERRIDE_INTR_ESTABLISH) != 0) {
- (*pc-pc_ov-ov_intr_disestablish)(pc-pc_ctx,
- pc, cookie);
- return;
- }
- if (pc-pc_super != NULL) {
- pci_intr_disestablish(pc-pc_super, cookie);
- return;
- }
+ for (ipc = pc; ipc != NULL; ipc = ipc-pc_super) {
+ if ((ipc-pc_present PCI_OVERRIDE_INTR_DISESTABLISH) == 0)
+ continue;
+ (*ipc-pc_ov-ov_intr_disestablish)(ipc-pc_ctx, pc, cookie);
+ return;
}
intr_disestablish(cookie);
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: dyoung
Date: Mon Aug 29 22:46:04 UTC 2011
Modified Files:
src/sys/arch/x86/pci: pci_machdep.c
Added Files:
src/sys/arch/x86/pci: pci_ranges.c
Log Message:
Move the code for grovelling in PCI configuration space for assigned
memory I/O regions into its own module, pci_ranges.c, so that we can
leave it out on systems that won't need it.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/x86/pci/pci_machdep.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/pci/pci_ranges.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/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.48 src/sys/arch/x86/pci/pci_machdep.c:1.49
--- src/sys/arch/x86/pci/pci_machdep.c:1.48 Sun Aug 28 06:04:18 2011
+++ src/sys/arch/x86/pci/pci_machdep.c Mon Aug 29 22:46:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.48 2011/08/28 06:04:18 dyoung Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.49 2011/08/29 22:46:04 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.48 2011/08/28 06:04:18 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.49 2011/08/29 22:46:04 dyoung Exp $);
#include sys/types.h
#include sys/param.h
@@ -85,9 +85,6 @@
#include sys/cpu.h
#include sys/kmem.h
-#include prop/proplib.h
-#include ppath/ppath.h
-
#include uvm/uvm_extern.h
#include machine/bus_private.h
@@ -753,918 +750,6 @@
bridge_hook);
}
-typedef enum pci_alloc_regtype {
- PCI_ALLOC_REGTYPE_NONE = 0
- , PCI_ALLOC_REGTYPE_BAR = 1
- , PCI_ALLOC_REGTYPE_WIN = 2
- , PCI_ALLOC_REGTYPE_CBWIN = 3
- , PCI_ALLOC_REGTYPE_VGA_EN = 4
-} pci_alloc_regtype_t;
-
-typedef enum pci_alloc_space {
- PCI_ALLOC_SPACE_IO = 0
- , PCI_ALLOC_SPACE_MEM = 1
-} pci_alloc_space_t;
-
-typedef enum pci_alloc_flags {
- PCI_ALLOC_F_PREFETCHABLE = 0x1
-} pci_alloc_flags_t;
-
-typedef struct pci_alloc {
- TAILQ_ENTRY(pci_alloc) pal_link;
- pcitag_t pal_tag;
- uint64_t pal_addr;
- uint64_t pal_size;
- pci_alloc_regtype_t pal_type;
- struct pci_alloc_reg {
- int r_ofs;
- pcireg_t r_val;
- pcireg_t r_mask;
- }pal_reg[3];
- pci_alloc_space_t pal_space;
- pci_alloc_flags_t pal_flags;
-} pci_alloc_t;
-
-typedef struct pci_alloc_reg pci_alloc_reg_t;
-
-TAILQ_HEAD(pci_alloc_list, pci_alloc);
-
-typedef struct pci_alloc_list pci_alloc_list_t;
-
-static pci_alloc_t *
-pci_alloc_dup(const pci_alloc_t *pal)
-{
- pci_alloc_t *npal;
-
- if ((npal = kmem_alloc(sizeof(*npal), KM_SLEEP)) == NULL)
- return NULL;
-
- *npal = *pal;
-
- return npal;
-}
-
-static bool
-pci_alloc_linkdup(pci_alloc_list_t *pals, const pci_alloc_t *pal)
-{
- pci_alloc_t *npal;
-
- if ((npal = pci_alloc_dup(pal)) == NULL)
- return false;
-
- TAILQ_INSERT_TAIL(pals, npal, pal_link);
-
- return true;
-}
-
-struct range_infer_ctx {
- pci_chipset_tag_t ric_pc;
- pci_alloc_list_t ric_pals;
- bus_addr_t ric_mmio_bottom;
- bus_addr_t ric_mmio_top;
- bus_addr_t ric_io_bottom;
- bus_addr_t ric_io_top;
-};
-
-#if 1
-static bool
-io_range_extend(struct range_infer_ctx *ric, const pci_alloc_t *pal)
-{
- if (ric-ric_io_bottom pal-pal_addr)
- ric-ric_io_bottom = pal-pal_addr;
- if (ric-ric_io_top pal-pal_addr + pal-pal_size)
- ric-ric_io_top = pal-pal_addr + pal-pal_size;
-
- return pci_alloc_linkdup(ric-ric_pals, pal);
-}
-
-static bool
-io_range_extend_by_bar(struct range_infer_ctx *ric, int bus, int dev, int fun,
-int ofs, pcireg_t curbar, pcireg_t sizebar)
-{
- pci_alloc_reg_t *r;
- pci_alloc_t pal = {
- .pal_flags = 0
- , .pal_space = PCI_ALLOC_SPACE_IO
- , .pal_type = PCI_ALLOC_REGTYPE_BAR
- , .pal_reg = {{
- .r_mask = ~(pcireg_t)0
- }}
- };
-
- r = pal.pal_reg[0];
-
- pal.pal_tag = pci_make_tag(ric-ric_pc, bus, dev, fun);
- r-r_ofs = ofs;
- r-r_val = curbar;
-
- pal.pal_addr = PCI_MAPREG_IO_ADDR(curbar);
- pal.pal_size = PCI_MAPREG_IO_SIZE(sizebar);
-
- aprint_debug(%s: %d.%d.%d base at % PRIx64 size % PRIx64 \n,
- __func__, bus, dev, fun, pal.pal_addr, pal.pal_size);
-
- return (pal.pal_size == 0) || io_range_extend(ric, pal);
-}
-
-static bool
-io_range_extend_by_vga_enable(struct range_infer_ctx *ric,
-int bus, int dev, int fun, pcireg_t csr, pcireg_t bcr)
-{
- pci_alloc_reg_t *r;
- pci_alloc_t tpal = {
- .pal_flags = 0
- , .pal_space = PCI_ALLOC_SPACE_IO
- , .pal_type = PCI_ALLOC_REGTYPE_VGA_EN
- , .pal_reg = {{
- .r_ofs = PCI_COMMAND_STATUS_REG
- , .r_mask = PCI_COMMAND_IO_ENABLE
- }, {
- .r_ofs = PCI_BRIDGE_CONTROL_REG
- , .r_mask =
- PCI_BRIDGE_CONTROL_VGA PCI_BRIDGE_CONTROL_SHIFT
- }}
- }, pal[2];
-
- aprint_debug(%s: %d.%d.%d enter\n, __func__, bus, dev, fun);
-
- if ((csr PCI_COMMAND_IO_ENABLE) == 0 ||
- (bcr (PCI_BRIDGE_CONTROL_VGA PCI_BRIDGE_CONTROL_SHIFT)) == 0) {
- aprint_debug(%s:
CVS commit: src/sys/arch/x86/conf
Module Name:src Committed By: dyoung Date: Mon Aug 29 22:46:56 UTC 2011 Modified Files: src/sys/arch/x86/conf: files.x86 Log Message: Add pci_ranges.c to the set of files compiled when 'pci' is configured. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/arch/x86/conf/files.x86 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/conf/files.x86 diff -u src/sys/arch/x86/conf/files.x86:1.71 src/sys/arch/x86/conf/files.x86:1.72 --- src/sys/arch/x86/conf/files.x86:1.71 Sun Jun 12 11:31:31 2011 +++ src/sys/arch/x86/conf/files.x86 Mon Aug 29 22:46:56 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.x86,v 1.71 2011/06/12 11:31:31 jruoho Exp $ +# $NetBSD: files.x86,v 1.72 2011/08/29 22:46:56 dyoung Exp $ # options for MP configuration through the MP spec defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI @@ -125,6 +125,7 @@ file arch/x86/x86/tprof_amdpmi.c tprof_amdpmi file arch/x86/pci/pci_machdep.c pci +file arch/x86/pci/pci_ranges.c pci file arch/x86/pci/pci_intr_machdep.c pci file arch/x86/pci/pciide_machdep.c pciide_common
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Tue Aug 30 01:21:03 UTC 2011
Modified Files:
src/sys/dev/pci: voyagerfb.c
Log Message:
fix thinko in downward scrolling ( never had a chance to test it until now... )
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/voyagerfb.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/voyagerfb.c
diff -u src/sys/dev/pci/voyagerfb.c:1.7 src/sys/dev/pci/voyagerfb.c:1.8
--- src/sys/dev/pci/voyagerfb.c:1.7 Sat Jan 22 15:14:28 2011
+++ src/sys/dev/pci/voyagerfb.c Tue Aug 30 01:21:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: voyagerfb.c,v 1.7 2011/01/22 15:14:28 cegger Exp $ */
+/* $NetBSD: voyagerfb.c,v 1.8 2011/08/30 01:21:03 macallan Exp $ */
/*
* Copyright (c) 2009 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: voyagerfb.c,v 1.7 2011/01/22 15:14:28 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: voyagerfb.c,v 1.8 2011/08/30 01:21:03 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -795,11 +795,13 @@
* to copy line by line here
* should probably use a command sequence
*/
+ ys += (height - ri-ri_font-fontheight);
+ yd += (height - ri-ri_font-fontheight);
for (i = 0; i nrows; i++) {
voyagerfb_bitblt(sc, x, ys, x, yd, width,
ri-ri_font-fontheight, ROP_COPY);
-ys += ri-ri_font-fontheight;
-yd += ri-ri_font-fontheight;
+ys -= ri-ri_font-fontheight;
+yd -= ri-ri_font-fontheight;
}
} else
voyagerfb_bitblt(sc, x, ys, x, yd, width, height,
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Tue Aug 30 02:53:02 UTC 2011
Modified Files:
src/sys/dev/pci: voyagerfb.c
Log Message:
contrary to the manual the right-to-left flag also causes the blitter to
work bottom-to-top
Now all copy*() methods should work properly in all directions.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/voyagerfb.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/voyagerfb.c
diff -u src/sys/dev/pci/voyagerfb.c:1.8 src/sys/dev/pci/voyagerfb.c:1.9
--- src/sys/dev/pci/voyagerfb.c:1.8 Tue Aug 30 01:21:03 2011
+++ src/sys/dev/pci/voyagerfb.c Tue Aug 30 02:53:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: voyagerfb.c,v 1.8 2011/08/30 01:21:03 macallan Exp $ */
+/* $NetBSD: voyagerfb.c,v 1.9 2011/08/30 02:53:01 macallan Exp $ */
/*
* Copyright (c) 2009 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: voyagerfb.c,v 1.8 2011/08/30 01:21:03 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: voyagerfb.c,v 1.9 2011/08/30 02:53:01 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -601,9 +601,16 @@
if (xd = xs) {
/* left to right */
} else {
+ /*
+ * According to the manual this flag reverses only the blitter's
+ * X direction. At least on my Gdium it also reverses the Y
+ * direction
+ */
cmd |= SM502_CTRL_R_TO_L;
- xs += he - 1;
+ xs += wi - 1;
xd += wi - 1;
+ ys += he - 1;
+ yd += he - 1;
}
bus_space_write_4(sc-sc_memt, sc-sc_regh, SM502_CONTROL, cmd);
CVS commit: src/external/mit/xorg/server
Module Name:src
Committed By: macallan
Date: Tue Aug 30 04:22:57 UTC 2011
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/xorg-server: Makefile.common
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
build Xorg and some drivers appropriate for Loongson-based hw on evbmips
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.22 -r1.23 \
src/external/mit/xorg/server/xorg-server/Makefile.common
cvs rdiff -u -r1.30 -r1.31 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
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/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.59 src/external/mit/xorg/server/drivers/Makefile:1.60
--- src/external/mit/xorg/server/drivers/Makefile:1.59 Thu Jul 21 10:20:25 2011
+++ src/external/mit/xorg/server/drivers/Makefile Tue Aug 30 04:22:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2011/07/21 10:20:25 tsutsui Exp $
+# $NetBSD: Makefile,v 1.60 2011/08/30 04:22:56 macallan Exp $
# xf86-input drivers
@@ -147,6 +147,13 @@
xf86-video-wsfb
.endif # ${MACHINE} == dreamcast
+.if ${MACHINE} == evbmips
+SUBDIR+= \
+ xf86-video-siliconmotion \
+ xf86-video-sis \
+ xf86-video-wsfb
+.endif # ${MACHINE} == evbmips
+
.if ${MACHINE} == ews4800mips
SUBDIR+= \
xf86-video-wsfb
@@ -254,7 +261,7 @@
.if ${MACHINE} == zaurus
SUBDIR+= \
xf86-video-wsfb
-.endif ${MACHINE} == zaurus
+.endif # ${MACHINE} == zaurus
# broken with xorg-server 1.6
# x86
Index: src/external/mit/xorg/server/xorg-server/Makefile.common
diff -u src/external/mit/xorg/server/xorg-server/Makefile.common:1.22 src/external/mit/xorg/server/xorg-server/Makefile.common:1.23
--- src/external/mit/xorg/server/xorg-server/Makefile.common:1.22 Thu Jul 21 10:20:25 2011
+++ src/external/mit/xorg/server/xorg-server/Makefile.common Tue Aug 30 04:22:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2011/07/21 10:20:25 tsutsui Exp $
+# $NetBSD: Makefile.common,v 1.23 2011/08/30 04:22:56 macallan Exp $
# These define parts of the Xserver tree that are to be
# conditionally compiled for different platforms. See
@@ -13,6 +13,7 @@
${MACHINE} == cats || \
${MACHINE} == dreamcast || \
${MACHINE} == ews4800mips || \
+${MACHINE} == evbmips || \
${MACHINE} == hp300 || \
${MACHINE} == hpcarm || \
${MACHINE} == hpcmips || \
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.30 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.31
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.30 Thu Jul 21 10:20:25 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Tue Aug 30 04:22:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2011/07/21 10:20:25 tsutsui Exp $
+# $NetBSD: Makefile,v 1.31 2011/08/30 04:22:56 macallan Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -60,7 +60,8 @@
.if ${MACHINE} == ews4800mips || \
${MACHINE} == hpcmips || \
${MACHINE} == newsmips || \
-${MACHINE} == sgimips
+${MACHINE} == sgimips || \
+${MACHINE} == evbmips
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Aug 30 05:40:40 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile Added Files: src/share/man/man4: dtviic.4 Removed Files: src/share/man/man4: dtvi2c.4 Log Message: As discussed with wiz@ and jmcneill@, move the dtvi2c(4) page to dtviic(4) (to match iic(4)) and install it by default. Also, and in particular, build and install MLINKS for all supported demodulators and tuners. To generate a diff of this commit: cvs rdiff -u -r1.1334 -r1.1335 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.566 -r1.567 src/share/man/man4/Makefile cvs rdiff -u -r1.3 -r0 src/share/man/man4/dtvi2c.4 cvs rdiff -u -r0 -r1.1 src/share/man/man4/dtviic.4 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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1334 src/distrib/sets/lists/man/mi:1.1335 --- src/distrib/sets/lists/man/mi:1.1334 Mon Aug 29 10:48:57 2011 +++ src/distrib/sets/lists/man/mi Tue Aug 30 05:40:38 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1334 2011/08/29 10:48:57 jruoho Exp $ +# $NetBSD: mi,v 1.1335 2011/08/30 05:40:38 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -811,6 +811,7 @@ ./usr/share/man/cat4/attimer.0 man-sys-catman .cat ./usr/share/man/cat4/atu.0 man-sys-catman .cat ./usr/share/man/cat4/atw.0 man-sys-catman .cat +./usr/share/man/cat4/au8522.0 man-sys-catman .cat ./usr/share/man/cat4/auacer.0 man-sys-catman .cat ./usr/share/man/cat4/audio.0 man-sys-catman .cat ./usr/share/man/cat4/audiocs.0 man-sys-catman .cat @@ -891,6 +892,7 @@ ./usr/share/man/cat4/cs80bus.0 man-sys-catman .cat ./usr/share/man/cat4/cuda.0 man-sys-catman .cat ./usr/share/man/cat4/cue.0 man-sys-catman .cat +./usr/share/man/cat4/cx24227.0 man-sys-catman .cat ./usr/share/man/cat4/cy.0 man-sys-catman .cat ./usr/share/man/cat4/cypide.0 man-sys-catman .cat ./usr/share/man/cat4/cz.0 man-sys-catman .cat @@ -1229,6 +1231,7 @@ ./usr/share/man/cat4/lc.0 man-sys-catman .cat ./usr/share/man/cat4/ld.0 man-sys-catman .cat ./usr/share/man/cat4/le.0 man-sys-catman .cat +./usr/share/man/cat4/lg3303.0 man-sys-catman .cat ./usr/share/man/cat4/lii.0 man-sys-catman .cat ./usr/share/man/cat4/lkm.0 man-obsolete obsolete ./usr/share/man/cat4/lm.0 man-sys-catman .cat @@ -1288,6 +1291,7 @@ ./usr/share/man/cat4/mr.0 man-obsolete obsolete ./usr/share/man/cat4/msk.0 man-sys-catman .cat ./usr/share/man/cat4/mskc.0 man-sys-catman .cat +./usr/share/man/cat4/mt2131.0 man-sys-catman .cat ./usr/share/man/cat4/mtd.0 man-sys-catman .cat ./usr/share/man/cat4/mtio.0 man-sys-catman .cat ./usr/share/man/cat4/multicast.0 man-sys-catman .cat @@ -1335,6 +1339,7 @@ ./usr/share/man/cat4/ntwo.0 man-sys-catman .cat ./usr/share/man/cat4/ntwoc.0 man-sys-catman .cat ./usr/share/man/cat4/null.0 man-sys-catman .cat +./usr/share/man/cat4/nxt2k.0 man-sys-catman .cat ./usr/share/man/cat4/oak.0 man-sys-catman .cat ./usr/share/man/cat4/oboe.0 man-sys-catman .cat ./usr/share/man/cat4/ofisa.0 man-sys-catman .cat @@ -1638,6 +1643,7 @@ ./usr/share/man/cat4/tty.0 man-sys-catman .cat ./usr/share/man/cat4/tun.0 man-sys-catman .cat ./usr/share/man/cat4/tuner.0 man-sys-catman .cat +./usr/share/man/cat4/tvpll.0 man-sys-catman .cat ./usr/share/man/cat4/twa.0 man-sys-catman .cat ./usr/share/man/cat4/twe.0 man-sys-catman .cat ./usr/share/man/cat4/txp.0 man-sys-catman .cat @@ -1822,6 +1828,8 @@ ./usr/share/man/cat4/xbd.0 man-sys-catman .cat ./usr/share/man/cat4/xbdback.0 man-sys-catman .cat ./usr/share/man/cat4/xbox.0 man-sys-catman .cat +./usr/share/man/cat4/xc3028.0 man-sys-catman .cat +./usr/share/man/cat4/xc5k.0 man-sys-catman .cat ./usr/share/man/cat4/xenbus.0 man-sys-catman .cat ./usr/share/man/cat4/xennet.0 man-sys-catman .cat ./usr/share/man/cat4/xge.0 man-sys-catman .cat @@ -1832,6 +1840,7 @@ ./usr/share/man/cat4/yds.0 man-sys-catman .cat ./usr/share/man/cat4/ym.0 man-sys-catman .cat ./usr/share/man/cat4/zero.0 man-sys-catman .cat +./usr/share/man/cat4/zl10353.0 man-sys-catman .cat ./usr/share/man/cat4/zs.0 man-sys-catman .cat ./usr/share/man/cat4/zsc.0 man-sys-catman .cat ./usr/share/man/cat4/zstty.0 man-sys-catman .cat @@ -3623,6 +3632,7 @@ ./usr/share/man/html4/attimer.html man-sys-htmlman html ./usr/share/man/html4/atu.html man-sys-htmlman html ./usr/share/man/html4/atw.html man-sys-htmlman html +./usr/share/man/html4/au8522.html man-sys-htmlman html ./usr/share/man/html4/auacer.html man-sys-htmlman html ./usr/share/man/html4/audio.html man-sys-htmlman html ./usr/share/man/html4/audiocs.html man-sys-htmlman html @@ -3700,6 +3710,7 @@ ./usr/share/man/html4/cs80bus.html
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Tue Aug 30 05:43:32 UTC 2011 Modified Files: src/share/man/man4: dtv.4 iic.4 Log Message: Xref dtviic(4). To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/dtv.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/iic.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/dtv.4 diff -u src/share/man/man4/dtv.4:1.6 src/share/man/man4/dtv.4:1.7 --- src/share/man/man4/dtv.4:1.6 Mon Aug 29 11:23:53 2011 +++ src/share/man/man4/dtv.4 Tue Aug 30 05:43:30 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: dtv.4,v 1.6 2011/08/29 11:23:53 jruoho Exp $ +.\ $NetBSD: dtv.4,v 1.7 2011/08/30 05:43:30 jruoho Exp $ .\ .\ Copyright (c) 2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 14, 2011 +.Dd August 30, 2011 .Dt DTV 4 .Os .Sh NAME @@ -75,6 +75,9 @@ and .Xr modload 8 for additional details. +Refer to +.Xr dtviic 4 +for details about the supported demodulators and tuners. .Sh FILES .Bl -tag -width 28n .It Pa /dev/dvb/adapterN/frontend0 @@ -86,6 +89,7 @@ .El .Sh SEE ALSO .Xr auvitek 4 , +.Xr dtviic 4 , .\ coram 4 , .\ cxdtv 4 , .\ emdtv 4 , Index: src/share/man/man4/iic.4 diff -u src/share/man/man4/iic.4:1.5 src/share/man/man4/iic.4:1.6 --- src/share/man/man4/iic.4:1.5 Mon Dec 20 18:15:21 2010 +++ src/share/man/man4/iic.4 Tue Aug 30 05:43:31 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: iic.4,v 1.5 2010/12/20 18:15:21 jruoho Exp $ +.\ $NetBSD: iic.4,v 1.6 2011/08/30 05:43:31 jruoho Exp $ .\ $OpenBSD: iic.4,v 1.74 2008/09/10 16:13:43 reyk Exp $ .\ .\ Copyright (c) 2004, 2006 Alexander Yurchenko gra...@openbsd.org @@ -16,7 +16,7 @@ .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\ -.Dd December 20, 2010 +.Dd August 30, 2011 .Dt IIC 4 .Os .Sh NAME @@ -147,6 +147,7 @@ .El .Sh SEE ALSO .Xr intro 4 , +.Xr dtviic 4 , .Xr iic 9 .Sh HISTORY The
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: jruoho Date: Tue Aug 30 05:51:16 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi Log Message: Hopefully all the difficult links went ok, but the main page was missing. To generate a diff of this commit: cvs rdiff -u -r1.1335 -r1.1336 src/distrib/sets/lists/man/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/man/mi diff -u src/distrib/sets/lists/man/mi:1.1335 src/distrib/sets/lists/man/mi:1.1336 --- src/distrib/sets/lists/man/mi:1.1335 Tue Aug 30 05:40:38 2011 +++ src/distrib/sets/lists/man/mi Tue Aug 30 05:51:15 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1335 2011/08/30 05:40:38 jruoho Exp $ +# $NetBSD: mi,v 1.1336 2011/08/30 05:51:15 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -925,6 +925,7 @@ ./usr/share/man/cat4/drum.0 man-sys-catman .cat ./usr/share/man/cat4/dtide.0 man-sys-catman .cat ./usr/share/man/cat4/dtv.0 man-sys-catman .cat +./usr/share/man/cat4/dtviic.0 man-sys-catman .cat ./usr/share/man/cat4/dty.0 man-sys-catman .cat ./usr/share/man/cat4/ea.0 man-sys-catman .cat ./usr/share/man/cat4/eap.0 man-sys-catman .cat @@ -3743,6 +3744,7 @@ ./usr/share/man/html4/drum.html man-sys-htmlman html ./usr/share/man/html4/dtide.html man-sys-htmlman html ./usr/share/man/html4/dtv.html man-sys-htmlman html +./usr/share/man/html4/dtviic.html man-sys-htmlman html ./usr/share/man/html4/dty.html man-sys-htmlman html ./usr/share/man/html4/ea.html man-sys-htmlman html ./usr/share/man/html4/eap.html man-sys-htmlman html @@ -6336,6 +6338,7 @@ ./usr/share/man/man4/drum.4 man-sys-man .man ./usr/share/man/man4/dtide.4 man-sys-man .man ./usr/share/man/man4/dtv.4 man-sys-man .man +./usr/share/man/man4/dtviic.4 man-sys-man .man ./usr/share/man/man4/dty.4 man-sys-man .man ./usr/share/man/man4/ea.4 man-sys-man .man ./usr/share/man/man4/eap.4 man-sys-man .man
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Tue Aug 30 05:58:02 UTC 2011 Modified Files: src/share/man/man4: bktr.4 Log Message: Note that bktr(4) is not part of the dtv(4) infrastructure. XXX: This driver should be converted (or even bluntly removed, given the lack of general third-party software support). To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/bktr.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/bktr.4 diff -u src/share/man/man4/bktr.4:1.17 src/share/man/man4/bktr.4:1.18 --- src/share/man/man4/bktr.4:1.17 Wed May 27 19:23:59 2009 +++ src/share/man/man4/bktr.4 Tue Aug 30 05:58:02 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: bktr.4,v 1.17 2009/05/27 19:23:59 snj Exp $ +.\ $NetBSD: bktr.4,v 1.18 2011/08/30 05:58:02 jruoho Exp $ .\ .\ Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005 Thomas Klausner .\ All rights reserved. @@ -23,7 +23,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd December 6, 2005 +.Dd August 30, 2011 .Dt BKTR 4 .Os .Sh NAME @@ -58,6 +58,12 @@ .Tn Bt879 chips. .Pp +Note that +.Nm +is not part of the +.Xr dtv 4 +framework. +.Pp Supported cards include most cards by .Tn AVerMedia , .Tn Hauppauge ,
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Aug 30 05:59:45 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile Log Message: Deprecate the tuner(4) page (link to bktr(4)), as the name is too general and nowadays misleading. To generate a diff of this commit: cvs rdiff -u -r1.1336 -r1.1337 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.567 -r1.568 src/share/man/man4/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/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1336 src/distrib/sets/lists/man/mi:1.1337 --- src/distrib/sets/lists/man/mi:1.1336 Tue Aug 30 05:51:15 2011 +++ src/distrib/sets/lists/man/mi Tue Aug 30 05:59:44 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1336 2011/08/30 05:51:15 jruoho Exp $ +# $NetBSD: mi,v 1.1337 2011/08/30 05:59:44 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1643,7 +1643,7 @@ ./usr/share/man/cat4/trm.0 man-sys-catman .cat ./usr/share/man/cat4/tty.0 man-sys-catman .cat ./usr/share/man/cat4/tun.0 man-sys-catman .cat -./usr/share/man/cat4/tuner.0 man-sys-catman .cat +./usr/share/man/cat4/tuner.0 man-obsolete obsolete ./usr/share/man/cat4/tvpll.0 man-sys-catman .cat ./usr/share/man/cat4/twa.0 man-sys-catman .cat ./usr/share/man/cat4/twe.0 man-sys-catman .cat @@ -4388,7 +4388,7 @@ ./usr/share/man/html4/trm.html man-sys-htmlman html ./usr/share/man/html4/tty.html man-sys-htmlman html ./usr/share/man/html4/tun.html man-sys-htmlman html -./usr/share/man/html4/tuner.html man-sys-htmlman html +./usr/share/man/html4/tuner.html man-obsolete obsolete ./usr/share/man/html4/tvpll.html man-sys-htmlman html ./usr/share/man/html4/twa.html man-sys-htmlman html ./usr/share/man/html4/twe.html man-sys-htmlman html @@ -7056,7 +7056,7 @@ ./usr/share/man/man4/trm.4 man-sys-man .man ./usr/share/man/man4/tty.4 man-sys-man .man ./usr/share/man/man4/tun.4 man-sys-man .man -./usr/share/man/man4/tuner.4 man-sys-man .man +./usr/share/man/man4/tuner.4 man-obsolete obsolete ./usr/share/man/man4/tvpll.4 man-sys-man .man ./usr/share/man/man4/twa.4 man-sys-man .man ./usr/share/man/man4/twe.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.567 src/share/man/man4/Makefile:1.568 --- src/share/man/man4/Makefile:1.567 Tue Aug 30 05:40:38 2011 +++ src/share/man/man4/Makefile Tue Aug 30 05:59:44 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.567 2011/08/30 05:40:38 jruoho Exp $ +# $NetBSD: Makefile,v 1.568 2011/08/30 05:59:44 jruoho Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -177,7 +177,6 @@ MLINKS+=audio.4 mixer.4 MLINKS+=audio.4 sound.4 MLINKS+=bha.4 bt.4 -MLINKS+=bktr.4 tuner.4 MLINKS+=bktr.4 vbi.4 MLINKS+=cardbus.4 cardslot.4 MLINKS+=cardbus.4 cbb.4
