from:"Hubert Feyrer"

CVS commit: src/distrib/utils/embedded/conf

2017-05-13 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sat May 13 10:44:58 UTC 2017

Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf

Log Message:
minor cleanup in customize_evbarm():
keep handling of /etc/rc.conf in one place


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/distrib/utils/embedded/conf/evbarm.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.26 src/distrib/utils/embedded/conf/evbarm.conf:1.27
--- src/distrib/utils/embedded/conf/evbarm.conf:1.26	Wed Apr 12 23:32:11 2017
+++ src/distrib/utils/embedded/conf/evbarm.conf	Sat May 13 10:44:58 2017
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.26 2017/04/12 23:32:11 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.27 2017/05/13 10:44:58 hubertf Exp $
 # evbarm shared config
 #
 image=$HOME/${board}.img
@@ -118,13 +118,14 @@ make_fstab_evbarm() {
 }
 
 customize_evbarm() {
-	cp ${release}/etc/rc.conf ${mnt}/etc/rc.conf
 	if $minwrites; then
 		mkdir ${mnt}/etc/postfix
 		(umask 022
 		sed -e 's/fifo/unix/' < ${release}/etc/postfix/master.cf > \
 		${mnt}/etc/postfix/master.cf)
 	fi
+	
+	cp ${release}/etc/rc.conf ${mnt}/etc/rc.conf
 	cat >> ${mnt}/etc/rc.conf << EOF
 rc_configured=YES
 hostname=${board}

CVS commit: src/share/man/man7

2017-01-09 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Mon Jan  9 20:08:26 UTC 2017

Modified Files:
src/share/man/man7: sysctl.7

Log Message:
Document kern.sched sysctl variables.


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/share/man/man7/sysctl.7

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/man7/sysctl.7
diff -u src/share/man/man7/sysctl.7:1.107 src/share/man/man7/sysctl.7:1.108
--- src/share/man/man7/sysctl.7:1.107	Sun Jan  8 14:28:42 2017
+++ src/share/man/man7/sysctl.7	Mon Jan  9 20:08:26 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sysctl.7,v 1.107 2017/01/08 14:28:42 wiz Exp $
+.\"	$NetBSD: sysctl.7,v 1.108 2017/01/09 20:08:26 hubertf Exp $
 .\"
 .\" Copyright (c) 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -355,7 +355,7 @@ privilege may change the value.
 .It kern.rtc_offset	integer	yes
 .It kern.saved_ids	integer	no
 .It kern.sbmax	integer	yes
-.\".It kern.sched	node	not applicable
+.It kern.sched	node	not applicable
 .It kern.securelevel	integer	raise only
 .It kern.somaxkva	integer	yes
 .It kern.synchronized_io	integer	no
@@ -1057,8 +1057,104 @@ Maximum socket buffer size.
 .It Li kern.securelevel ( Dv KERN_SECURELVL )
 See
 .Xr secmodel_securelevel 9 .
-.\" .It Li kern.sched
-.\" XXX: Undocumented.
+.It Li kern.sched ( dynamic )
+Influence the scheduling of LWPs, their priorisation and how they are
+distributed on and moved between CPUs.
+.Bl -column "kern.sched.balance_period" "integer" "Changeable" -offset indent
+.It Sy Third level name	   Sy Type	 Sy Changeable
+.It kern.sched.cacheht_time	   integer	 yes
+.It kern.sched.balance_period	   integer	 yes
+.It kern.sched.average_weight	   integer	 yes
+.It kern.sched.min_catch	   integer	 yes
+.It kern.sched.timesoftints	   integer	 yes
+.It kern.sched.kpreempt_pri	   integer	 yes
+.It kern.sched.upreempt_pri	   integer	 yes
+.It kern.sched.maxts	   integer	 yes
+.It kern.sched.mints	   integer	 yes 
+.It kern.sched.name	   string	 no 
+.It kern.sched.rtts	   integer	 no
+.It kern.sched.pri_min	   integer	 no
+.It kern.sched.pri_max	   integer	 no
+.El
+.Pp
+The variables are as follows:
+.Bl -tag -width "123456"
+.It Li kern.sched.cacheht_time ( dynamic )
+Cache hotness time in which a LWP is kept on one particular CPU
+and not moved to another CPU. This reduces the overhead of flushing
+and reloading caches.  
+Defaults to 3ms.
+Needs to be given in 
+.Dq hz
+units, see
+.Xr mstohz 9 .
+.It Li kern.sched.balance_period ( dynamic )
+Interval at which the CPU queues are checked for re-balancing.
+Defaults to 300ms.
+Needs to be given in 
+.Dq hz
+units, see
+.Xr mstohz 9 .
+.It Li kern.sched.average_weight ( dynamic )
+Can be used to influence how likely LWPs are to be migrated from
+one CPU's queue of LWPs that are ready to run to a different, idle CPU. 
+The value gives the percentage for weighting the average count of
+migratable threads from the past against the current number of
+migratable threads. 
+A small value gives more weight to the past, a larger values more weight 
+on the current situation.
+Defaults to 50 and must be between 0 and 100. 
+.It Li kern.sched.min_catch ( dynamic )
+Minimum count of migratable (runable) threads for catching (stealing)
+from another CPU.
+Defaults to 1 but can be increased to decrease chance of thread
+migration between CPUs. 
+.It Li kern.sched.timesoftints ( dynamic )
+Enable tracking of CPU time for soft interrupts
+as part of a LWP's real execution time.
+Set to a non-zero value to enable,
+and see
+.Xr ps 1
+for printing CPU times.
+.It Li kern.sched.kpreempt_pri ( dynamic )
+Minimum priority to trigger kernel preemption.
+.It Li kern.sched.upreempt_pri ( dynamic )
+Minimum priority to trigger user preemption.
+.It Li kern.sched.maxts ( dynamic )
+Scheduler specific maximal time quantum (in milliseconds).
+Must be set to a value larger than
+.Dq mints
+and between 10 and
+.Dq hz 
+as given by the
+.Dv kern.clockrate
+sysctl.
+Provided by the M2 scheduler.
+.It Li kern.sched.mints ( dynamic )
+Scheduler specific minimal time quantum (in milliseconds).
+Must be set to a value smaller than
+.Dq maxts
+and between 1 and
+.Dq hz 
+as given by the
+.Dq kern.clockrate
+sysctl.
+Provided by the M2 scheduler.
+.It Li kern.sched.name ( dynamic )
+Scheduler name. 
+Provided both by the M2 and the 4BSD scheduler.
+.It Li kern.sched.rtts ( dynamic )
+Fixed scheduler specific round-robin time quantum in milliseconds.
+Provided both by the M2 and the 4BSD scheduler.
+.It Li kern.sched.pri_min ( dynamic )
+Minimal POSIX real-time priority.
+See
+.Xr sched 3 .
+.It Li kern.sched.pri_max ( dynamic )
+Maximal POSIX real-time priority.
+See
+.Xr sched 3 .
+.El
 .It Li kern.somaxkva ( Dv KERN_SOMAXKVA )
 Maximum amount of kernel memory to be used for socket buffers.
 .\" XXX units?

CVS commit: src/usr.sbin/i2cscan

2015-11-26 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Thu Nov 26 16:56:52 UTC 2015

Modified Files:
src/usr.sbin/i2cscan: i2cscan.8

Log Message:
Add an EXAMPLES section to show what 'i2cdev' looks like.
Hint: /dev required!


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/i2cscan/i2cscan.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/i2cscan/i2cscan.8
diff -u src/usr.sbin/i2cscan/i2cscan.8:1.3 src/usr.sbin/i2cscan/i2cscan.8:1.4
--- src/usr.sbin/i2cscan/i2cscan.8:1.3	Wed Jul 10 15:18:54 2013
+++ src/usr.sbin/i2cscan/i2cscan.8	Thu Nov 26 16:56:52 2015
@@ -1,4 +1,4 @@
-.\"	$NetBSD: i2cscan.8,v 1.3 2013/07/10 15:18:54 tcort Exp $
+.\"	$NetBSD: i2cscan.8,v 1.4 2015/11/26 16:56:52 hubertf Exp $
 .\"
 .\" Copyright (c) 2011, 2013 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -62,5 +62,9 @@ Don't use this utility unless you know w
 accept all sorts of unforeseen consequences.
 .Sh EXIT STATUS
 .Ex -std i2cscan
+.Sh EXAMPLES
+Scan the first IIC bus found on the system for devices:
+.Pp
+.Dl "i2cscan /dev/iic0"
 .Sh SEE ALSO
 .Xr iic 4

CVS commit: src/share/examples/wpa_supplicant

2015-11-26 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Thu Nov 26 16:07:40 UTC 2015

Modified Files:
src/share/examples/wpa_supplicant: wpa_supplicant.conf

Log Message:
Move today's most common config (WPA) to the front
Add a WPA config with hidden (non-broadcasting) SSID


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/share/examples/wpa_supplicant/wpa_supplicant.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/examples/wpa_supplicant/wpa_supplicant.conf
diff -u src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.2 src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.3
--- src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.2	Thu Nov 26 16:03:18 2015
+++ src/share/examples/wpa_supplicant/wpa_supplicant.conf	Thu Nov 26 16:07:40 2015
@@ -1,4 +1,4 @@
-# $NetBSD: wpa_supplicant.conf,v 1.2 2015/11/26 16:03:18 hubertf Exp $
+# $NetBSD: wpa_supplicant.conf,v 1.3 2015/11/26 16:07:40 hubertf Exp $
 #
 # example wpa_supplicant config
 #
@@ -12,6 +12,21 @@ ctrl_interface=/var/run/wpa_supplicant/
 # name a group whose members will be Allowed(tm)
 ctrl_interface_group=wheel
 
+# simple WPA-PSK, a favourite with conferences and hotel networks
+network={
+	ssid="SomeConference"
+	key_mgmt=WPA-PSK
+	psk="secretKey"
+}
+
+# a private WPA-PSK that doesn't broadcast its SSID
+network={
+	ssid="HomeSweetHome"
+	key_mgmt=WPA-PSK
+	psk="secretKey"
+	scan_ssid=1
+}
+
 # WEP .. all the stopping power of a "please keep off the lawn" sign
 # least common denominator "security" so it's formally not open
 network={
@@ -23,13 +38,6 @@ network={
 	priority=2
 }
 
-# simple WPA-PSK, a favourite with conferences and hotel networks
-network={
-	ssid="SomeConference"
-	key_mgmt=WPA-PSK
-	psk="secretKey"
-}
-
 # using eduroam for more examples:
 
 ## eduroam with PEAP/MSCHAPv2

CVS commit: src/share/examples/wpa_supplicant

2015-11-26 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Thu Nov 26 16:03:18 UTC 2015

Modified Files:
src/share/examples/wpa_supplicant: wpa_supplicant.conf

Log Message:
add RCS is


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/share/examples/wpa_supplicant/wpa_supplicant.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/examples/wpa_supplicant/wpa_supplicant.conf
diff -u src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.1 src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.2
--- src/share/examples/wpa_supplicant/wpa_supplicant.conf:1.1	Thu Jan 23 07:26:51 2014
+++ src/share/examples/wpa_supplicant/wpa_supplicant.conf	Thu Nov 26 16:03:18 2015
@@ -1,3 +1,5 @@
+# $NetBSD: wpa_supplicant.conf,v 1.2 2015/11/26 16:03:18 hubertf Exp $
+#
 # example wpa_supplicant config
 #
 # please refer to the wpa_supplicant.conf man page

CVS commit: src/usr.sbin/i2cscan

2015-11-26 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Thu Nov 26 17:31:57 UTC 2015

Modified Files:
src/usr.sbin/i2cscan: i2cscan.8 i2cscan.c

Log Message:
Allow i2cdev to be specified with or without the /dev prefix.
Inspired by and code borrowed from gpioctl(8).


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/i2cscan/i2cscan.8 \
src/usr.sbin/i2cscan/i2cscan.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/i2cscan/i2cscan.8
diff -u src/usr.sbin/i2cscan/i2cscan.8:1.4 src/usr.sbin/i2cscan/i2cscan.8:1.5
--- src/usr.sbin/i2cscan/i2cscan.8:1.4	Thu Nov 26 16:56:52 2015
+++ src/usr.sbin/i2cscan/i2cscan.8	Thu Nov 26 17:31:56 2015
@@ -1,4 +1,4 @@
-.\"	$NetBSD: i2cscan.8,v 1.4 2015/11/26 16:56:52 hubertf Exp $
+.\"	$NetBSD: i2cscan.8,v 1.5 2015/11/26 17:31:56 hubertf Exp $
 .\"
 .\" Copyright (c) 2011, 2013 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 July 10, 2013
+.Dd November 26, 2015
 .Dt I2CSCAN 8
 .Os
 .Sh NAME
@@ -40,12 +40,21 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility scans the IIC bus
+utility scans the Inter-Integrated Circuit bus
 .Pq Xr iic 4
 specified by
 .Ar i2cdev
 to determine which addresses respond.
 .Pp
+.Ar i2cdev
+can be specified with or without the
+.Pa /dev
+prefix.
+For example, 
+.Pa /dev/iic0
+or
+.Pa iic0 .
+.Pp
 Available options:
 .Bl -tag -width Ds
 .It Fl r
Index: src/usr.sbin/i2cscan/i2cscan.c
diff -u src/usr.sbin/i2cscan/i2cscan.c:1.4 src/usr.sbin/i2cscan/i2cscan.c:1.5
--- src/usr.sbin/i2cscan/i2cscan.c:1.4	Wed Jul 10 15:18:54 2013
+++ src/usr.sbin/i2cscan/i2cscan.c	Thu Nov 26 17:31:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: i2cscan.c,v 1.4 2013/07/10 15:18:54 tcort Exp $ */
+/* $NetBSD: i2cscan.c,v 1.5 2015/11/26 17:31:56 hubertf Exp $ */
 
 /*-
  * Copyright (c) 2011, 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: i2cscan.c,v 1.4 2013/07/10 15:18:54 tcort Exp $");
+__RCSID("$NetBSD: i2cscan.c,v 1.5 2015/11/26 17:31:56 hubertf Exp $");
 
 #include 
 #include 
@@ -38,8 +38,10 @@ __RCSID("$NetBSD: i2cscan.c,v 1.4 2013/0
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -50,7 +52,7 @@ __RCSID("$NetBSD: i2cscan.c,v 1.4 2013/0
 __dead static void
 usage(void)
 {
-	fprintf(stderr, "usage: %s [-r] \n", getprogname());
+	fprintf(stderr, "usage: %s [-r] i2cdev\n", getprogname());
 	exit(EXIT_FAILURE);
 }
 
@@ -159,6 +161,8 @@ main(int argc, char *argv[])
 	int fd;
 	int ch, rflag;
 	int mode;
+	char *dev;
+	char devn[32];
 
 	setprogname(*argv);
 
@@ -182,8 +186,14 @@ main(int argc, char *argv[])
 
 	if (*argv == NULL)
 		usage();
+	dev = argv[0];
 
-	fd = open(*argv, O_RDWR);
+	if (strncmp(_PATH_DEV, dev, sizeof(_PATH_DEV) - 1)) {
+		(void)snprintf(devn, sizeof(devn), "%s%s", _PATH_DEV, dev);
+		dev = devn;
+	}
+
+	fd = open(dev, O_RDWR);
 	if (fd == -1)
 		err(EXIT_FAILURE, "couldn't open %s", *argv);

CVS commit: src/usr.bin/utoppya

2015-06-20 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sat Jun 20 16:42:32 UTC 2015

Modified Files:
src/usr.bin/utoppya: utoppya.1

Log Message:
There was a pilot flying a small single engine charter plane, with
a couple of very important executives on board. He was coming into
the Berkeley airport through thick fog with less than 10 miles
visibility when his instruments went out.

He began circling around looking for a landmark. Finally, a small
opening in the fog appears and he sees a tall building with a guy
working alone on the fifth floor. He banks the plane around, rolls
down the window and shouts to the guy, Hey where am I?

The man replies, You're in an airplane. The pilot rolls up the
window, executes a 275 degree turn and proceeds to perform a
perfect blind landing on the airport runway 5 miles away. Just as
the plane stops, so does the engine as the fuel has run out.

The passengers are amazed and one asks how he did it.

Quite easy, replies the pilot, I asked the guy in that building
a simple question. The answer he gave me was 100 percent correct
but absolutely useless, therefore, that must be NetBSD's
support office and from there the airport is just five miles due
East. (Credits:
http://www.techsupportforum.com/forums/f289/microsoft-joke-404432.html)

Seriously: give the reader of the manpage an idea on what this program
is for without forcing them to Google or read another manpage.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/utoppya/utoppya.1

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/utoppya/utoppya.1
diff -u src/usr.bin/utoppya/utoppya.1:1.5 src/usr.bin/utoppya/utoppya.1:1.6
--- src/usr.bin/utoppya/utoppya.1:1.5	Tue Mar 18 18:20:45 2014
+++ src/usr.bin/utoppya/utoppya.1	Sat Jun 20 16:42:32 2015
@@ -1,6 +1,6 @@
-.\ $NetBSD: utoppya.1,v 1.5 2014/03/18 18:20:45 riastradh Exp $
+.\ $NetBSD: utoppya.1,v 1.6 2015/06/20 16:42:32 hubertf Exp $
 .\
-.\ Copyright (c) 2006 The NetBSD Foundation, Inc.
+.\ Copyright (c) 2006,2015 The NetBSD Foundation, Inc.
 .\ All rights reserved.
 .\
 .\ This code is derived from software contributed to The NetBSD Foundation
@@ -32,7 +32,7 @@
 .Os
 .Sh NAME
 .Nm utoppya
-.Nd Topfield TF5000PVR file manipulation program
+.Nd Topfield TF5000PVR DVB recorder file manipulation program
 .Sh SYNOPSIS
 .Nm
 .Op Fl f Ar device
@@ -40,6 +40,8 @@
 .Sh DESCRIPTION
 .Nm
 is the userland interface to the
+Topfield TF5000PVR range of DVB recorders (nicknamed `Toppy')
+which uses the
 .Xr utoppy 4
 device driver.
 .Pp

CVS commit: src/distrib/utils/embedded

2015-04-19 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Apr 19 17:56:57 UTC 2015

Modified Files:
src/distrib/utils/embedded: mkimage

Log Message:
Add some documentation:
Tell what this does, and what it expects from conf files


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/distrib/utils/embedded/mkimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.57 src/distrib/utils/embedded/mkimage:1.58
--- src/distrib/utils/embedded/mkimage:1.57	Sat Apr 18 22:06:48 2015
+++ src/distrib/utils/embedded/mkimage	Sun Apr 19 17:56:57 2015
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkimage,v 1.57 2015/04/18 22:06:48 hubertf Exp $
+# $NetBSD: mkimage,v 1.58 2015/04/19 17:56:57 hubertf Exp $
 #
 # Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -32,6 +32,20 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
+#
+# Makes a bootable image for the host architecture given.
+# The host specific functions are pulled in from a /bin/sh script in the
+# conf directory, and is expected to provide the following shell
+# functions, which are called in the following order:
+#
+#  - make_fstab: Creates the host's /etc/fstab with / on ${rootdev}.
+#If -m is given, a number of directories are put on a tmpfs RAM disk
+#  - customize: After unpacking the sets, this gets the system to
+#a working state, e. g. by setting up /etc/rc.conf and /dev
+#  - populate: Add common goods like kernel and bootloader
+#  - make_label: Prints disklabel to stdout
+#
+
 set -e
 
 DIR=$(cd $(dirname $0)  pwd)

CVS commit: src/distrib/utils/embedded/conf

2015-04-19 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Apr 19 18:28:31 UTC 2015

Modified Files:
src/distrib/utils/embedded/conf: armv7.conf rpi.conf rpi_inst.conf
usermode.conf

Log Message:
Cleanup: make_filesystems is not used any longer, purge remains


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/armv7.conf
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/embedded/conf/rpi.conf
cvs rdiff -u -r1.6 -r1.7 src/distrib/utils/embedded/conf/rpi_inst.conf
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/embedded/conf/usermode.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.1 src/distrib/utils/embedded/conf/armv7.conf:1.2
--- src/distrib/utils/embedded/conf/armv7.conf:1.1	Thu Apr  9 10:55:23 2015
+++ src/distrib/utils/embedded/conf/armv7.conf	Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.1 2015/04/09 10:55:23 jmcneill Exp $
+# $NetBSD: armv7.conf,v 1.2 2015/04/19 18:28:31 hubertf Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -11,10 +11,6 @@ kernels_awin=BPI CUBIEBOARD CUBIETRUCK 
 kernels_rpi=RPI2
 kernels_amlogic=ODROID-C1
 
-make_filesystems() {
-	make_filesystems_evbarm
-}
-
 make_label() {
 	make_label_evbarm
 }

Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.28 src/distrib/utils/embedded/conf/rpi.conf:1.29
--- src/distrib/utils/embedded/conf/rpi.conf:1.28	Mon Apr  6 20:19:28 2015
+++ src/distrib/utils/embedded/conf/rpi.conf	Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.28 2015/04/06 20:19:28 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.29 2015/04/19 18:28:31 hubertf Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -11,10 +11,6 @@ resize=true
 firmwaredir=$src/external/broadcom/rpi-firmware/dist
 firmwarefiles=LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf
 
-make_filesystems() {
-	make_filesystems_evbarm
-}
-
 make_fstab() {
 	make_fstab_evbarm
 }

Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.6 src/distrib/utils/embedded/conf/rpi_inst.conf:1.7
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.6	Fri Jan 23 15:17:58 2015
+++ src/distrib/utils/embedded/conf/rpi_inst.conf	Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.6 2015/01/23 15:17:58 skrll Exp $
+# $NetBSD: rpi_inst.conf,v 1.7 2015/04/19 18:28:31 hubertf Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -75,10 +75,6 @@ customize_evbarm() {
 firmwaredir=$src/external/broadcom/rpi-firmware/dist
 firmwarefiles=LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf
 
-make_filesystems() {
-	make_filesystems_evbarm
-}
-
 make_fstab() {
 	make_fstab_evbarm
 }

Index: src/distrib/utils/embedded/conf/usermode.conf
diff -u src/distrib/utils/embedded/conf/usermode.conf:1.4 src/distrib/utils/embedded/conf/usermode.conf:1.5
--- src/distrib/utils/embedded/conf/usermode.conf:1.4	Fri Jan 23 15:17:58 2015
+++ src/distrib/utils/embedded/conf/usermode.conf	Sun Apr 19 18:28:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: usermode.conf,v 1.4 2015/01/23 15:17:58 skrll Exp $
+# $NetBSD: usermode.conf,v 1.5 2015/04/19 18:28:31 hubertf Exp $
 # NetBSD/usermode customization script used by mkimage
 
 # XXX: BROKEN, needs to be converted to makefs
@@ -10,11 +10,6 @@ setsdir=/usr/build/release/$(uname -m)/b
 size=0	# in MB
 usermodedirs=/var.cow /etc.cow /root.cow /pkgs
 
-make_filesystems() {
-	newfs /dev/r${vnddev}a
-	mount /dev/${vnddev}a ${mnt}
-}
-
 make_fstab() {
 cat  ${mnt}/etc/fstab  EOF
 # NetBSD/usermode /etc/fstab

CVS commit: src/distrib/utils/embedded/conf

2015-04-19 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Apr 19 18:53:33 UTC 2015

Modified Files:
src/distrib/utils/embedded/conf: rpi_inst.conf

Log Message:
More cleanup:
Instead of first overwriting the *_evbarm functions with own code,
and then calling them from the regular functions, directly put the
code into the regular functions.

No more functions from evbarm.conf are used now.
Some variables are still used!


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/utils/embedded/conf/rpi_inst.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.7 src/distrib/utils/embedded/conf/rpi_inst.conf:1.8
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.7	Sun Apr 19 18:28:31 2015
+++ src/distrib/utils/embedded/conf/rpi_inst.conf	Sun Apr 19 18:53:33 2015
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.7 2015/04/19 18:28:31 hubertf Exp $
+# $NetBSD: rpi_inst.conf,v 1.8 2015/04/19 18:53:33 hubertf Exp $
 # Raspberry Pi customization script used by mkimage
 #
 
@@ -17,7 +17,7 @@ init=8
 size=$(( 10485760 + ${swap} * 1024 * 512 + ${boot} * 1024 * 512 + ${init} * 1024 * 512 ))
 msdosid=12
 
-make_label_evbarm() {
+make_label() {
 	# compute all sizes in terms of sectors
 	local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
 
@@ -64,28 +64,17 @@ drivedata: 0 
 EOF
 }
 
-make_fstab_evbarm() {
-:
-}
-
-customize_evbarm() {
+customize() {
 	echo ${bar} creating directories ${bar}
 	mkdir ${mnt}/proc ${mnt}/kern
 }
-firmwaredir=$src/external/broadcom/rpi-firmware/dist
-firmwarefiles=LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf
 
 make_fstab() {
-	make_fstab_evbarm
+	:
 }
 
-make_label() {
-	make_label_evbarm
-}
-
-customize() {
-	customize_evbarm
-}
+firmwaredir=$src/external/broadcom/rpi-firmware/dist
+firmwarefiles=LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf
 
 populate() {
 	cat  ${mnt}/boot/cmdline.txt  EOF

CVS commit: src/distrib/utils/embedded

2015-04-18 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sat Apr 18 22:06:48 UTC 2015

Modified Files:
src/distrib/utils/embedded: mkimage

Log Message:
Properly spell X' name. From X(7):

   The  X.Org  Foundation  requests  that the following names be used when
   referring to this software:

  X
   X Window System
X Version 11
 X Window System, Version 11
 X11


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/distrib/utils/embedded/mkimage

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.56 src/distrib/utils/embedded/mkimage:1.57
--- src/distrib/utils/embedded/mkimage:1.56	Mon Apr  6 22:20:52 2015
+++ src/distrib/utils/embedded/mkimage	Sat Apr 18 22:06:48 2015
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: mkimage,v 1.56 2015/04/06 22:20:52 jmcneill Exp $
+# $NetBSD: mkimage,v 1.57 2015/04/18 22:06:48 hubertf Exp $
 #
 # Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -75,7 +75,7 @@ Usage: $PROG -h host-arch [-bdmx] [-K 
 -r	root device kind (sd, wd, ld)
 -d	Add the debug sets
 -m	Optimize the OS installation to mimimize disk writes for SSDs
--x	Load the x sets too, not just the base ones
+-x	Load the X sets too, not just the base ones
 EOF
 	exit 1
 }

CVS commit: src

2013-02-01 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sat Feb  2 02:08:37 UTC 2013

Modified Files:
src: build.sh

Log Message:
If the initial build of nbmake fails, make the configure logfile
available (and tell where it is).


To generate a diff of this commit:
cvs rdiff -u -r1.261 -r1.262 src/build.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/build.sh
diff -u src/build.sh:1.261 src/build.sh:1.262
--- src/build.sh:1.261	Mon Jan 14 13:02:59 2013
+++ src/build.sh	Sat Feb  2 02:08:37 2013
@@ -1,5 +1,5 @@
 #! /usr/bin/env sh
-#	$NetBSD: build.sh,v 1.261 2013/01/14 13:02:59 pooka Exp $
+#	$NetBSD: build.sh,v 1.262 2013/02/02 02:08:37 hubertf Exp $
 #
 # Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1455,7 +1455,8 @@ rebuildmake()
 		${runcmd} env CC=${HOST_CC-cc} CPPFLAGS=${HOST_CPPFLAGS} \
 			CFLAGS=${HOST_CFLAGS--O} LDFLAGS=${HOST_LDFLAGS} \
 			${HOST_SH} ${TOP}/tools/make/configure ||
-		bomb Configure of ${toolprefix}make failed
+		( cp ${tmpdir}/config.log ${tmpdir}-config.log
+		  bomb Configure of ${toolprefix}make failed, see ${tmpdir}-config.log for details )
 		${runcmd} ${HOST_SH} buildmake.sh ||
 		bomb Build of ${toolprefix}make failed
 		make=${tmpdir}/${toolprefix}make
@@ -1716,7 +1717,7 @@ createmakewrapper()
 	eval cat EOF ${makewrapout}
 #! ${HOST_SH}
 # Set proper variables to allow easy make building of a NetBSD subtree.
-# Generated from:  \$NetBSD: build.sh,v 1.261 2013/01/14 13:02:59 pooka Exp $
+# Generated from:  \$NetBSD: build.sh,v 1.262 2013/02/02 02:08:37 hubertf Exp $
 # with these arguments: ${_args}
 #

CVS commit: src/share/misc

2012-01-27 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Fri Jan 27 14:34:30 UTC 2012

Modified Files:
src/share/misc: bsd-family-tree

Log Message:
Sync with FreeBSD: src/share/misc/bsd-family-tree,v rev. 1.150
Submitted in PR 45880 by Rares Aioanei


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/share/misc/bsd-family-tree

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/bsd-family-tree
diff -u src/share/misc/bsd-family-tree:1.42 src/share/misc/bsd-family-tree:1.43
--- src/share/misc/bsd-family-tree:1.42	Sat Jan 24 00:06:54 2009
+++ src/share/misc/bsd-family-tree	Fri Jan 27 14:34:30 2012
@@ -25,7 +25,7 @@ Seventh Edition (V7)|
   \/ |
  3BSD|
   |  |
-   4.0BSD   2.7.9BSD
+   4.0BSD2.79BSD
   |  |
4.1BSD -- 2.8BSD
   |  |
@@ -62,9 +62,9 @@ Tenth Edition | 
||  4.4BSD|
||/ | |
||   4.4BSD-Encumbered  | |
-   |   - NetBSD 0.8|   BSD/386 1.0
-   |  / |  | |
-FreeBSD 1.0 '   NetBSD 0.9|   BSD/386 1.1
+   | NetBSD 0.8|   BSD/386 1.0
+   ||  | |
+FreeBSD 1.0  NetBSD 0.9|   BSD/386 1.1
||   .- 4.4BSD Lite   |
 FreeBSD 1.1 |  /   /   | \   |
|| /   /|  \  |
@@ -151,7 +151,7 @@ FreeBSD 4.0  |  |  |  |  | NetBSD 1.
  |   FreeBSD 4.5 ||  ||| |
  |  | \   |  |||   BSD/OS 4.3
  |   FreeBSD 4.6   \  |  ||OpenBSD 3.1   |
- |  |   \ |  | NetBSD 1.5.3|   	 |
+ |  |   \ |  | NetBSD 1.5.3| |
  |   FreeBSD 4.6.2 Mac OS X  | | |
  |  |10.2| | |
  |   FreeBSD 4.7  |  | | |
@@ -226,10 +226,35 @@ FreeBSD 5.2   |  |  
  | |  6.4 |  | |   |
  | |  |  | |   |
  |  FreeBSD 7.1   |  | |   |
- | |  |  | |   |
- | V  |  | |   |
+ | |  |  | |DragonFly 2.2.0
+ |  FreeBSD 7.2   |   NetBSD 5.0   OpenBSD 4.5 |
+ | \  |  |||   |
+ |  |  Mac OS X  |||   |
+ |  |10.6|||   |
+ |  | |  |||DragonFly 2.4.0
+ |  | |  ||OpenBSD 4.6 |
+ |  | |  |||   |
+ *--FreeBSD | |  |||   |
+ |8.0   | |  |||   |
+ | | FreeBSD  |  |||   |
+ | |   7.3|  |||DragonFly 2.6.0
+ | || |  ||OpenBSD 4.7 |
+ |  FreeBSD | |  |||   |
+ |8.1   | |  |||   |
+ | || |  |||DragonFly 2.8.2
+ | || |  ||OpenBSD 4.8 |
+ | || |  | NetBSD 5.1  |   |
+ |  FreeBSD  FreeBSD  |  | |   |
+ |8.2  7.4|  | |   DragonFly 2.10.1
+ | v  |  | OpenBSD 4.9 |
+ | Mac OS X  | |   |
+ |   10.7| |   |
+ ||  | OpenBSD 5.0 |
+ +--FreeBSD   |  | |   |
+ |9.0 |  | |   |
+ | v  |  |

CVS commit: src/sys/dev/pci

2010-06-16 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Wed Jun 16 20:15:53 UTC 2010

Modified Files:
src/sys/dev/pci: hifn7751.c

Log Message:
Make debug message print more than the device name

OK mbalmer, jmcneill


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/hifn7751.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/hifn7751.c
diff -u src/sys/dev/pci/hifn7751.c:1.44 src/sys/dev/pci/hifn7751.c:1.45
--- src/sys/dev/pci/hifn7751.c:1.44	Mon Feb  1 22:34:29 2010
+++ src/sys/dev/pci/hifn7751.c	Wed Jun 16 20:15:53 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: hifn7751.c,v 1.44 2010/02/01 22:34:29 hubertf Exp $	*/
+/*	$NetBSD: hifn7751.c,v 1.45 2010/06/16 20:15:53 hubertf Exp $	*/
 /*	$FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
 /*	$OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $	*/
 
@@ -48,7 +48,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hifn7751.c,v 1.44 2010/02/01 22:34:29 hubertf Exp $);
+__KERNEL_RCSID(0, $NetBSD: hifn7751.c,v 1.45 2010/06/16 20:15:53 hubertf Exp $);
 
 #include rnd.h
 
@@ -2395,7 +2395,7 @@
 		 */
 #ifdef HIFN_DEBUG
 		if (hifn_debug)
-			printf(device_xname(sc-sc_dv), requeue request\n);
+			printf(%s: requeue request\n, device_xname(sc-sc_dv));
 #endif
 		free(cmd, M_DEVBUF);
 		sc-sc_needwakeup |= CRYPTO_SYMQ;

CVS commit: src/etc

2010-05-03 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Mon May  3 17:15:58 UTC 2010

Modified Files:
src/etc: shrc

Log Message:
Add RCS ID, per PR 43243


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/etc/shrc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/shrc
diff -u src/etc/shrc:1.5 src/etc/shrc:1.6
--- src/etc/shrc:1.5	Sat Feb 14 09:53:07 2009
+++ src/etc/shrc	Mon May  3 17:15:58 2010
@@ -1,3 +1,7 @@
+#   $NetBSD: shrc,v 1.6 2010/05/03 17:15:58 hubertf Exp $
+#
+# System-wide .shrc file for sh(1).
+
 ll(){ ls -l ${1+$@}; }
 
 case $- in *i*)

CVS commit: src/sys/dev/pci

2010-04-30 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Fri Apr 30 21:17:19 UTC 2010

Modified Files:
src/sys/dev/pci: if_pcn.c

Log Message:
silence boot -z


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/if_pcn.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_pcn.c
diff -u src/sys/dev/pci/if_pcn.c:1.50 src/sys/dev/pci/if_pcn.c:1.51
--- src/sys/dev/pci/if_pcn.c:1.50	Mon Apr  5 07:20:26 2010
+++ src/sys/dev/pci/if_pcn.c	Fri Apr 30 21:17:19 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_pcn.c,v 1.50 2010/04/05 07:20:26 joerg Exp $	*/
+/*	$NetBSD: if_pcn.c,v 1.51 2010/04/30 21:17:19 hubertf Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_pcn.c,v 1.50 2010/04/05 07:20:26 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_pcn.c,v 1.51 2010/04/30 21:17:19 hubertf Exp $);
 
 #include rnd.h
 
@@ -2033,12 +2033,12 @@
 
 #define	ADD(str, m, d)			\
 do {	\
-	printf(%s%s, sep, str);	\
+	aprint_normal(%s%s, sep, str);	\
 	ifmedia_add(sc-sc_mii.mii_media, IFM_ETHER|(m), (d), NULL);	\
 	sep = , ;			\
 } while (/*CONSTCOND*/0)
 
-	printf(%s: , device_xname(sc-sc_dev));
+	aprint_normal(%s: , device_xname(sc-sc_dev));
 	ADD(10base5, IFM_10_5, PORTSEL_AUI);
 	if (sc-sc_variant-pcv_chipid == PARTID_Am79c970A)
 		ADD(10base5-FDX, IFM_10_5|IFM_FDX, PORTSEL_AUI);
@@ -2048,7 +2048,7 @@
 	ADD(auto, IFM_AUTO, 0);
 	if (sc-sc_variant-pcv_chipid == PARTID_Am79c970A)
 		ADD(auto-FDX, IFM_AUTO|IFM_FDX, 0);
-	printf(\n);
+	aprint_normal(\n);
 
 	ifmedia_set(sc-sc_mii.mii_media, IFM_ETHER|IFM_AUTO);
 }

CVS commit: src

2010-04-29 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Thu Apr 29 20:13:46 UTC 2010

Modified Files:
src/doc: CHANGES
src/libexec/tftpd: tftpd.8 tftpd.c

Log Message:
Rename -w to -c by popular demand
(allow file 'c'reation - 'w'riting was always available, with some twist;
 plus there's already such a feature elsewhere, so let's try to not
 diverge needlessly)


To generate a diff of this commit:
cvs rdiff -u -r1.1384 -r1.1385 src/doc/CHANGES
cvs rdiff -u -r1.26 -r1.27 src/libexec/tftpd/tftpd.8
cvs rdiff -u -r1.37 -r1.38 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/doc/CHANGES
diff -u src/doc/CHANGES:1.1384 src/doc/CHANGES:1.1385
--- src/doc/CHANGES:1.1384	Wed Apr 28 22:21:51 2010
+++ src/doc/CHANGES	Thu Apr 29 20:13:46 2010
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1384 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1385 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -599,6 +599,6 @@
 		The database cache for services(5) has been updated to use
 		this. services_mkdb(8) can still be used to create the old
 		format. [joerg 20100425]
-	tftpd(8): Add -w so files can be uploaded without requiring them
+	tftpd(8): Add -c so files can be uploaded without requiring them
 		to be created before the upload. See the section on security 
 		considerations before enabling. [hubertf 20100429]

Index: src/libexec/tftpd/tftpd.8
diff -u src/libexec/tftpd/tftpd.8:1.26 src/libexec/tftpd/tftpd.8:1.27
--- src/libexec/tftpd/tftpd.8:1.26	Thu Apr 29 07:04:44 2010
+++ src/libexec/tftpd/tftpd.8	Thu Apr 29 20:13:46 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: tftpd.8,v 1.26 2010/04/29 07:04:44 wiz Exp $
+.\	$NetBSD: tftpd.8,v 1.27 2010/04/29 20:13:46 hubertf Exp $
 .\
 .\ Copyright (c) 1983, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -39,7 +39,7 @@
 Internet Trivial File Transfer Protocol server
 .Sh SYNOPSIS
 .Nm
-.Op Fl dlnw
+.Op Fl cdln
 .Op Fl g Ar group
 .Op Fl p Ar pathsep
 .Op Fl s Ar directory
@@ -70,8 +70,8 @@
 or containing
 .Dq Pa /../
 are not allowed.
-Unless
-.Fl w
+Unless option
+.Fl c
 is used,
 files may be written to only if they already exist and are publicly writable.
 .Pp
@@ -95,6 +95,9 @@
 .Pp
 The options are:
 .Bl -tag -width XsXdirectoryX
+.It Fl c
+Allow unrestricted creation of new files, with no need for
+a prior existance.
 .It Fl d
 Enable verbose debugging messages to
 .Xr syslogd 8 .
@@ -151,9 +154,6 @@
 isn't also given, change the gid to that of
 .Ar user
 as well.
-.It Fl w
-Allow unrestricted writing of new files, without need of
-prior existence.
 .El
 .Sh SEE ALSO
 .Xr tftp 1 ,
@@ -240,7 +240,7 @@
 difficult to document here.
 .Pp
 If unrestricted file upload is enabled via the
-.Fl w
+.Fl c
 option, care should be taken that this can be used
 to fill up disk space in an uncontrolled manner
 if this is used in an insecure environment.

Index: src/libexec/tftpd/tftpd.c
diff -u src/libexec/tftpd/tftpd.c:1.37 src/libexec/tftpd/tftpd.c:1.38
--- src/libexec/tftpd/tftpd.c:1.37	Wed Apr 28 22:21:51 2010
+++ src/libexec/tftpd/tftpd.c	Thu Apr 29 20:13:46 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: tftpd.c,v 1.37 2010/04/28 22:21:51 hubertf Exp $	*/
+/*	$NetBSD: tftpd.c,v 1.38 2010/04/29 20:13:46 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -36,7 +36,7 @@
 #if 0
 static char sccsid[] = @(#)tftpd.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: tftpd.c,v 1.37 2010/04/28 22:21:51 hubertf Exp $);
+__RCSID($NetBSD: tftpd.c,v 1.38 2010/04/29 20:13:46 hubertf Exp $);
 #endif
 #endif /* not lint */
 
@@ -172,8 +172,12 @@
 	curuid = getuid();
 	curgid = getgid();
 
-	while ((ch = getopt(argc, argv, dg:lnp:s:u:w)) != -1)
+	while ((ch = getopt(argc, argv, cdg:lnp:s:u:)) != -1)
 		switch (ch) {
+		case 'w':
+			unrestricted_writes = 1;
+			break;
+
 		case 'd':
 			debug++;
 			break;
@@ -205,10 +209,6 @@
 			tgtuser = optarg;
 			break;
 
-		case 'w':
-			unrestricted_writes = 1;
-			break;
-
 		default:
 			usage();
 			break;

CVS commit: src/sys/dev/pci

2010-04-28 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Wed Apr 28 22:08:58 UTC 2010

Modified Files:
src/sys/dev/pci: if_vr.c

Log Message:
Silence for boot -z


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/dev/pci/if_vr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/if_vr.c
diff -u src/sys/dev/pci/if_vr.c:1.104 src/sys/dev/pci/if_vr.c:1.105
--- src/sys/dev/pci/if_vr.c:1.104	Mon Apr  5 07:20:28 2010
+++ src/sys/dev/pci/if_vr.c	Wed Apr 28 22:08:58 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vr.c,v 1.104 2010/04/05 07:20:28 joerg Exp $	*/
+/*	$NetBSD: if_vr.c,v 1.105 2010/04/28 22:08:58 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_vr.c,v 1.104 2010/04/05 07:20:28 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_vr.c,v 1.105 2010/04/28 22:08:58 hubertf Exp $);
 
 #include rnd.h
 
@@ -1587,7 +1587,7 @@
 	/*
 	 * A Rhine chip was detected. Inform the world.
 	 */
-	printf(%s: Ethernet address: %s\n,
+	aprint_normal(%s: Ethernet address: %s\n,
 		device_xname(self), ether_sprintf(eaddr));
 
 	memcpy(sc-vr_enaddr, eaddr, ETHER_ADDR_LEN);

CVS commit: src

2010-04-28 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Wed Apr 28 22:21:51 UTC 2010

Modified Files:
src/doc: CHANGES
src/libexec/tftpd: tftpd.8 tftpd.c

Log Message:
tftpd(8): Add -w so files can be uploaded without requiring them
to be created before the upload. See the section on security
considerations before enabling. [hubertf 20100429]

Addresses PR bin/43164.


To generate a diff of this commit:
cvs rdiff -u -r1.1383 -r1.1384 src/doc/CHANGES
cvs rdiff -u -r1.24 -r1.25 src/libexec/tftpd/tftpd.8
cvs rdiff -u -r1.36 -r1.37 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/doc/CHANGES
diff -u src/doc/CHANGES:1.1383 src/doc/CHANGES:1.1384
--- src/doc/CHANGES:1.1383	Sun Apr 25 00:57:12 2010
+++ src/doc/CHANGES	Wed Apr 28 22:21:51 2010
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1383 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1384 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -599,3 +599,6 @@
 		The database cache for services(5) has been updated to use
 		this. services_mkdb(8) can still be used to create the old
 		format. [joerg 20100425]
+	tftpd(8): Add -w so files can be uploaded without requiring them
+		to be created before the upload. See the section on security 
+		considerations before enabling. [hubertf 20100429]

Index: src/libexec/tftpd/tftpd.8
diff -u src/libexec/tftpd/tftpd.8:1.24 src/libexec/tftpd/tftpd.8:1.25
--- src/libexec/tftpd/tftpd.8:1.24	Fri Jan  8 23:27:08 2010
+++ src/libexec/tftpd/tftpd.8	Wed Apr 28 22:21:51 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: tftpd.8,v 1.24 2010/01/08 23:27:08 wiz Exp $
+.\	$NetBSD: tftpd.8,v 1.25 2010/04/28 22:21:51 hubertf Exp $
 .\
 .\ Copyright (c) 1983, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\	from: @(#)tftpd.8	8.1 (Berkeley) 6/4/93
 .\
-.Dd January 8, 2010
+.Dd April 22, 2010
 .Dt TFTPD 8
 .Os
 .Sh NAME
@@ -44,6 +44,7 @@
 .Op Fl p Ar pathsep
 .Op Fl s Ar directory
 .Op Fl u Ar user
+.Op Fl w
 .Op Ar directory ...
 .Sh DESCRIPTION
 .Nm
@@ -70,7 +71,10 @@
 or containing
 .Dq Pa /../
 are not allowed.
-Files may be written to only if they already exist and are publicly writable.
+Unless option
+.Fl w
+is used,
+files may be written to only if they already exist and are publicly writable.
 .Pp
 Note that this extends the concept of
 .Qq public
@@ -148,6 +152,9 @@
 isn't also given, change the gid to that of
 .Ar user
 as well.
+.It Fl w
+Allow unrestricted writing of new files, with no need for
+a prior existance.
 .El
 .Sh SEE ALSO
 .Xr tftp 1 ,
@@ -232,3 +239,9 @@
 sort of file-access restrictions in place.
 The exact methods are specific to each site and therefore
 difficult to document here.
+.Pp
+If unrestricted file upload is enabled via the
+.Fl w
+option, care should be taken that this can be used
+to fill up disk space in an uncontrolled manner
+if this is used in an insecure environment.

Index: src/libexec/tftpd/tftpd.c
diff -u src/libexec/tftpd/tftpd.c:1.36 src/libexec/tftpd/tftpd.c:1.37
--- src/libexec/tftpd/tftpd.c:1.36	Sat Jan  9 10:46:31 2010
+++ src/libexec/tftpd/tftpd.c	Wed Apr 28 22:21:51 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: tftpd.c,v 1.36 2010/01/09 10:46:31 mbalmer Exp $	*/
+/*	$NetBSD: tftpd.c,v 1.37 2010/04/28 22:21:51 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -36,7 +36,7 @@
 #if 0
 static char sccsid[] = @(#)tftpd.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: tftpd.c,v 1.36 2010/01/09 10:46:31 mbalmer Exp $);
+__RCSID($NetBSD: tftpd.c,v 1.37 2010/04/28 22:21:51 hubertf Exp $);
 #endif
 #endif /* not lint */
 
@@ -109,6 +109,7 @@
 static int	secure;
 static char	pathsep = '\0';
 static char	*securedir;
+static int	unrestricted_writes;/* uploaded files don't have to exist */
 
 struct formats;
 
@@ -171,7 +172,7 @@
 	curuid = getuid();
 	curgid = getgid();
 
-	while ((ch = getopt(argc, argv, dg:lnp:s:u:w:)) != -1)
+	while ((ch = getopt(argc, argv, dg:lnp:s:u:w)) != -1)
 		switch (ch) {
 		case 'd':
 			debug++;
@@ -204,6 +205,10 @@
 			tgtuser = optarg;
 			break;
 
+		case 'w':
+			unrestricted_writes = 1;
+			break;
+
 		default:
 			usage();
 			break;
@@ -739,6 +744,8 @@
 	static char	 pathname[MAXPATHLEN];
 	char		*filename;
 	int		 fd;
+	int		 create = 0;
+	int		 trunc = 0;
 
 	filename = *filep;
 
@@ -804,21 +811,45 @@
 return (EACCESS);
 			*filep = filename = pathname;
 		} else {
+			int stat_rc;
+
 			/*
 			 * If there's no directory list, take our cue from the
 			 * absolute file request check above (*filename == '/'),
 			 * and allow access to anything.
 			 */
-			if (stat(filename, stbuf)  0)
-return (errno == ENOENT ? ENOTFOUND : EACCESS);
-			if (!S_ISREG(stbuf.st_mode))
-return (ENOTFOUND);
+			stat_rc = stat(filename, stbuf);
 			if (mode == RRQ) {
+/* Read request */
+if (stat_rc

CVS commit: src/sys/dev/pci

2010-02-09 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Tue Feb  9 23:13:10 UTC 2010

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add entry for Juniper Networks Experimental Clock Version 0
Fixes PR kern/42742


To generate a diff of this commit:
cvs rdiff -u -r1.1021 -r1.1022 src/sys/dev/pci/pcidevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1021 src/sys/dev/pci/pcidevs:1.1022
--- src/sys/dev/pci/pcidevs:1.1021	Tue Feb  9 04:40:21 2010
+++ src/sys/dev/pci/pcidevs	Tue Feb  9 23:13:09 2010
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1021 2010/02/09 04:40:21 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1022 2010/02/09 23:13:09 hubertf Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -538,6 +538,7 @@
 vendor RAINBOW		0x12de	Rainbow Technologies
 vendor DATUM		0x12e2	Datum Inc. Bancomm-Timing Division
 vendor AUREAL		0x12eb	Aureal Semiconductor
+vendor JUNIPER		0x1304	Juniper Networks
 vendor ADMTEK		0x1317	ADMtek
 vendor PACKETENGINES	0x1318	Packet Engines
 vendor FORTEMEDIA	0x1319	Forte Media
@@ -2856,6 +2857,9 @@
 product JNI FCX26562	0x6562	FCX2-6562 Dual Fibre-Channel Adapter
 product JNI FCX6562	0x656a	FCX-6562 Fibre-Channel Adapter
 
+/* Juniper Networks products */
+product JUNIPER XCLK0	0x0030	Experimental Clock Version 0
+
 /* KTI products - XXX better descriptions */
 product KTI NE2KETHER	0x3000	Ethernet

CVS commit: src/sys/arch/i386/stand/boot

2010-02-08 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Mon Feb  8 21:25:32 UTC 2010

Modified Files:
src/sys/arch/i386/stand/boot: boot2.c

Log Message:
When a password is set for the bootloader (installboot -o password=...),
it currently complains about an unknown command and prints a usage if the
password is entered wrong:

...
Choose an option; RETURN for default; SPACE to stop countdown.
Option 1 will be chosen in 0 seconds.
Password: *
Password: *
Password: *
unknown command
commands are:
boot [xdNx:][filename] [-12acdqsvxz]
 (ex. hd0a:netbsd.old -s
ls [path]
dev xd[N[x]]:
consdev {pc|com[0123]|com[0123]kbd|auto}
modules {enabled|disabled}
load {path_to_module}
multiboot [xdNx:][filename] [args]
help|?
quit

Choose an option; RETURN for default; SPACE to stop countdown.
Option 1 will be chosen in 0 seconds.
...

This is confusing, plus someone may use it to determine bits of
information about the system. What should happen instead is that the user
is informed that the password is wrong:

...
Choose an option; RETURN for default; SPACE to stop countdown.
Option 1 will be chosen in 0 seconds.
Password: 
Password: 
Password: 
Wrong password.

Choose an option; RETURN for default; SPACE to stop countdown.
...

Implement the latter behaviour.


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/i386/stand/boot/boot2.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/i386/stand/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.47 src/sys/arch/i386/stand/boot/boot2.c:1.48
--- src/sys/arch/i386/stand/boot/boot2.c:1.47	Sun Jan 17 14:54:44 2010
+++ src/sys/arch/i386/stand/boot/boot2.c	Mon Feb  8 21:25:32 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot2.c,v 1.47 2010/01/17 14:54:44 drochner Exp $	*/
+/*	$NetBSD: boot2.c,v 1.48 2010/02/08 21:25:32 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -344,11 +344,23 @@
 #else
 		c = awaitkey((bootconf.timeout  0) ? 0 : bootconf.timeout, 1);
 #endif
-		if ((c != '\r')  (c != '\n')  (c != '\0') 
-		((boot_params.bp_flags  X86_BP_FLAGS_PASSWORD) == 0
-		 || check_password(boot_params.bp_password))) {
-			printf(type \?\ or \help\ for help.\n);
+		if ((c != '\r')  (c != '\n')  (c != '\0')) {
+		if ((boot_params.bp_flags  X86_BP_FLAGS_PASSWORD) == 0) {
+			/* do NOT ask for password */
 			bootmenu(); /* does not return */
+		} else {
+			/* DO ask for password */
+			if (check_password(boot_params.bp_password)) {
+			/* password ok */
+			printf(type \?\ or \help\ for help.\n);
+			bootmenu(); /* does not return */
+			} else {
+			/* bad password */
+			printf(Wrong password.\n);
+			currname = 0;
+			continue;
+			}
+		}
 		}
 
 		/*

CVS commit: src/sys/dev/pci

2010-02-01 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Mon Feb  1 22:34:29 UTC 2010

Modified Files:
src/sys/dev/pci: hifn7751.c

Log Message:
Use uppercase for acronyms on output: DRAM, SRAM


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/hifn7751.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/hifn7751.c
diff -u src/sys/dev/pci/hifn7751.c:1.43 src/sys/dev/pci/hifn7751.c:1.44
--- src/sys/dev/pci/hifn7751.c:1.43	Thu Nov 26 15:17:09 2009
+++ src/sys/dev/pci/hifn7751.c	Mon Feb  1 22:34:29 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: hifn7751.c,v 1.43 2009/11/26 15:17:09 njoly Exp $	*/
+/*	$NetBSD: hifn7751.c,v 1.44 2010/02/01 22:34:29 hubertf Exp $	*/
 /*	$FreeBSD: hifn7751.c,v 1.5.2.7 2003/10/08 23:52:00 sam Exp $ */
 /*	$OpenBSD: hifn7751.c,v 1.140 2003/08/01 17:55:54 deraadt Exp $	*/
 
@@ -48,7 +48,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hifn7751.c,v 1.43 2009/11/26 15:17:09 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: hifn7751.c,v 1.44 2010/02/01 22:34:29 hubertf Exp $);
 
 #include rnd.h
 
@@ -384,9 +384,9 @@
 		rbase = 'M';
 		rseg /= 1024;
 	}
-	aprint_normal_dev(sc-sc_dv, %s, %d%cB %cram, interrupting at %s\n,
+	aprint_normal_dev(sc-sc_dv, %s, %d%cB %cRAM, interrupting at %s\n,
 	hifncap, rseg, rbase,
-	sc-sc_drammodel ? 'd' : 's', intrstr);
+	sc-sc_drammodel ? 'D' : 'S', intrstr);
 
 	sc-sc_cid = crypto_get_driverid(0);
 	if (sc-sc_cid  0) {

CVS commit: src/sys/opencrypto

2010-01-31 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Jan 31 14:32:56 UTC 2010

Modified Files:
src/sys/opencrypto: cryptodev.c

Log Message:
Add missing break for CRYPTO_CAST_CBC, and some assorted comment fixes.
openssl(1) checks for CAST (and others) on ~every startup.


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/opencrypto/cryptodev.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/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.51 src/sys/opencrypto/cryptodev.c:1.52
--- src/sys/opencrypto/cryptodev.c:1.51	Sun Dec 20 09:36:06 2009
+++ src/sys/opencrypto/cryptodev.c	Sun Jan 31 14:32:56 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cryptodev.c,v 1.51 2009/12/20 09:36:06 dsl Exp $ */
+/*	$NetBSD: cryptodev.c,v 1.52 2010/01/31 14:32:56 hubertf Exp $ */
 /*	$FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $	*/
 /*	$OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $	*/
 
@@ -64,7 +64,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.51 2009/12/20 09:36:06 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.52 2010/01/31 14:32:56 hubertf Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -598,7 +598,6 @@
 	 * XXX disabled on NetBSD since 1.6O due to a race condition.
 	 * XXX But crypto_dispatch went to splcrypto() itself!  (And
 	 * XXX now takes the crypto_mtx mutex itself).  We do, however,
-	 *
 	 * XXX need to hold the mutex across the call to cv_wait().
 	 * XXX (should we arrange for crypto_dispatch to return to
 	 * XXX  us with it held?  it seems quite ugly to do so.)
@@ -612,7 +611,7 @@
 	/* 
 	 * If the request was going to be completed by the
 	 * ioctl thread then it would have been done by now.
-	 * Remove the F_USER flag it so crypto_done() is not confused
+	 * Remove the F_USER flag so crypto_done() is not confused
 	 * if the crypto device calls it after this point.
 	 */
 	crp-crp_flags = ~(CRYPTO_F_USER);
@@ -1498,6 +1497,7 @@
 		break;
 	case CRYPTO_CAST_CBC:
 		txform = enc_xform_cast5;
+		break;
 	case CRYPTO_SKIPJACK_CBC:
 		txform = enc_xform_skipjack;
 		break;

CVS commit: src/share/man/man4

2010-01-31 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Jan 31 14:43:04 UTC 2010

Modified Files:
src/share/man/man4: crypto.4

Log Message:
Fix two typos to make documentation match the code:
 * the CIOCFKEY ioctl is really called CIOCKEY
 * CRK_MOD_EX = CRK_MOD_EXP

Bump date.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/crypto.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/crypto.4
diff -u src/share/man/man4/crypto.4:1.17 src/share/man/man4/crypto.4:1.18
--- src/share/man/man4/crypto.4:1.17	Thu Jan 28 08:35:06 2010
+++ src/share/man/man4/crypto.4	Sun Jan 31 14:43:04 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: crypto.4,v 1.17 2010/01/28 08:35:06 hubertf Exp $
+.\	$NetBSD: crypto.4,v 1.18 2010/01/31 14:43:04 hubertf Exp $
 .\
 .\ Copyright (c) 2008 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -53,7 +53,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\ THE POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd May 16, 2009
+.Dd Jan 28, 2010
 .Dt CRYPTO 4
 .Os
 .Sh NAME
@@ -127,7 +127,7 @@
 .Dv CIOCCRYPT
 (symmetric)
 or
-.Dv CIOCFKEY
+.Dv CIOCKEY
 (asymmetric)
 or asynchronously with
 .Dv CIOCNCRYPTM
@@ -208,7 +208,7 @@
 as symmetric-key hash algorithms with a zero-length key.
 .Ss IOCTL Request Descriptions
 .\
-.Bl -tag -width CIOCFKEY
+.Bl -tag -width CIOCKEY
 .\
 .It Dv CRIOGET Fa int *fd
 This operation is deprecated and will be removed after
@@ -453,7 +453,7 @@
 .Pp
 See below for discussion of the input and output parameter counts.
 .Ss Asymmetric-key commands
-.Bl -tag -width CIOCFKEY
+.Bl -tag -width CIOCKEY
 .It Dv CIOCASYMFEAT Fa int *feature_mask
 Returns a bitmask of supported asymmetric-key operations.
 Each of the above-listed asymmetric operations is present
@@ -462,9 +462,9 @@
 For example,
 .Dv CRK_MOD_EXP
 is available if and only if the bit
-.Pq 1 \*[Lt]\*[Lt] Dv CRK_MOD_EX
+.Pq 1 \*[Lt]\*[Lt] Dv CRK_MOD_EXP
 is set.
-.It Dv CIOCFKEY Fa struct crypt_kop *kop
+.It Dv CIOCKEY Fa struct crypt_kop *kop
 .Bd -literal
 struct crypt_kop {
 u_int crk_op;		/* e.g. CRK_MOD_EXP */
@@ -521,7 +521,7 @@
 
 .Ed
 This is the asynchronous version of
-.Dv CIOCFKEY ,
+.Dv CIOCKEY ,
 which starts one or more key operations.
 See
 .Dv CIOCNCRYPTM
@@ -550,7 +550,7 @@
 .Xr poll 2
 functions to determine when the file descriptor has completed operations ready
 to be retrieved.
-.Bl -tag -width CIOCFKEY
+.Bl -tag -width CIOCKEY
 .It Dv CIOCNCRYPTRET Fa struct crypt_result *cres
 .Bd -literal
 struct crypt_result {

CVS commit: src/sys

2010-01-30 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Jan 31 00:43:38 UTC 2010

Modified Files:
src/sys/arch/x86/x86: pmap.c x86_autoconf.c
src/sys/dev/pci: agp_via.c
src/sys/kern: cnmagic.c init_main.c kern_ksyms.c
src/sys/netipsec: ipsec.c key.c
src/sys/netkey: key.c

Log Message:
Replace more printfs with aprint_normal / aprint_verbose
Makes boot -z go mostly silent for me.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/x86/x86/x86_autoconf.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/agp_via.c
cvs rdiff -u -r1.10 -r1.11 src/sys/kern/cnmagic.c
cvs rdiff -u -r1.414 -r1.415 src/sys/kern/init_main.c
cvs rdiff -u -r1.52 -r1.53 src/sys/kern/kern_ksyms.c
cvs rdiff -u -r1.46 -r1.47 src/sys/netipsec/ipsec.c
cvs rdiff -u -r1.62 -r1.63 src/sys/netipsec/key.c
cvs rdiff -u -r1.175 -r1.176 src/sys/netkey/key.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.99 src/sys/arch/x86/x86/pmap.c:1.100
--- src/sys/arch/x86/x86/pmap.c:1.99	Sun Jan 10 12:10:23 2010
+++ src/sys/arch/x86/x86/pmap.c	Sun Jan 31 00:43:37 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.99 2010/01/10 12:10:23 jym Exp $	*/
+/*	$NetBSD: pmap.c,v 1.100 2010/01/31 00:43:37 hubertf Exp $	*/
 
 /*
  * Copyright (c) 2007 Manuel Bouyer.
@@ -149,7 +149,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.99 2010/01/10 12:10:23 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.100 2010/01/31 00:43:37 hubertf Exp $);
 
 #include opt_user_ldt.h
 #include opt_lockdebug.h
@@ -1380,7 +1380,7 @@
 			tlbflush();
 		}
 #if defined(DEBUG)
-		printf(kernel text is mapped with 
+		aprint_normal(kernel text is mapped with 
 		%lu large pages and %lu normal pages\n,
 		(unsigned long)howmany(kva - KERNBASE, NBPD_L2),
 		(unsigned long)howmany((vaddr_t)__data_start - kva,

Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.48 src/sys/arch/x86/x86/x86_autoconf.c:1.49
--- src/sys/arch/x86/x86/x86_autoconf.c:1.48	Fri Jan  8 19:43:26 2010
+++ src/sys/arch/x86/x86/x86_autoconf.c	Sun Jan 31 00:43:37 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_autoconf.c,v 1.48 2010/01/08 19:43:26 dyoung Exp $	*/
+/*	$NetBSD: x86_autoconf.c,v 1.49 2010/01/31 00:43:37 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.48 2010/01/08 19:43:26 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: x86_autoconf.c,v 1.49 2010/01/31 00:43:37 hubertf Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -554,11 +554,11 @@
 
 	if (booted_wedge) {
 		KASSERT(booted_device != NULL);
-		printf(boot device: %s (%s)\n,
+		aprint_normal(boot device: %s (%s)\n,
 		device_xname(booted_wedge), device_xname(booted_device));
 		setroot(booted_wedge, 0);
 	} else {
-		printf(boot device: %s\n,
+		aprint_normal(boot device: %s\n,
 		booted_device ? device_xname(booted_device) : unknown);
 		setroot(booted_device, booted_partition);
 	}

Index: src/sys/dev/pci/agp_via.c
diff -u src/sys/dev/pci/agp_via.c:1.17 src/sys/dev/pci/agp_via.c:1.18
--- src/sys/dev/pci/agp_via.c:1.17	Mon Jun  9 06:49:54 2008
+++ src/sys/dev/pci/agp_via.c	Sun Jan 31 00:43:37 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: agp_via.c,v 1.17 2008/06/09 06:49:54 freza Exp $	*/
+/*	$NetBSD: agp_via.c,v 1.18 2010/01/31 00:43:37 hubertf Exp $	*/
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -29,7 +29,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: agp_via.c,v 1.17 2008/06/09 06:49:54 freza Exp $);
+__KERNEL_RCSID(0, $NetBSD: agp_via.c,v 1.18 2010/01/31 00:43:37 hubertf Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -107,14 +107,14 @@
 		agpsel = pci_conf_read(pa-pa_pc, pa-pa_tag, AGP_VIA_AGPSEL);
 		if ((agpsel  (1  9)) == 0) {
 			asc-regs = via_v3_regs;
-			printf( (v3));
+			aprint_normal( (v3));
 		} else {
 			asc-regs = via_v2_regs;
-			printf( (v2 compat mode));
+			aprint_normal( (v2 compat mode));
 		}
 	} else {
 		asc-regs = via_v2_regs;
-		printf( (v2));
+		aprint_normal( (v2));
 	}
 
 	if (agp_map_aperture(pa, sc, AGP_APBASE) != 0) {

Index: src/sys/kern/cnmagic.c
diff -u src/sys/kern/cnmagic.c:1.10 src/sys/kern/cnmagic.c:1.11
--- src/sys/kern/cnmagic.c:1.10	Mon Oct 19 18:12:37 2009
+++ src/sys/kern/cnmagic.c	Sun Jan 31 00:43:37 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cnmagic.c,v 1.10 2009/10/19 18:12:37 snj Exp $	*/
+/*	$NetBSD: cnmagic.c,v 1.11 2010/01/31 00:43:37 hubertf Exp $	*/
 
 /*
  * Copyright (c) 2000 Eduardo Horvath
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cnmagic.c,v 1.10 2009/10/19 18:12:37 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: cnmagic.c,v 1.11 2010/01/31 00:43:37 hubertf Exp $);
 
 #include sys/param.h
 #include

CVS commit: src/share/man/man4

2010-01-28 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Thu Jan 28 08:35:06 UTC 2010

Modified Files:
src/share/man/man4: crypto.4

Log Message:
Fix typo: CIOCASSYMFEAT - CIOCASYMFEAT


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/man/man4/crypto.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/crypto.4
diff -u src/share/man/man4/crypto.4:1.16 src/share/man/man4/crypto.4:1.17
--- src/share/man/man4/crypto.4:1.16	Sun May 17 06:50:59 2009
+++ src/share/man/man4/crypto.4	Thu Jan 28 08:35:06 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: crypto.4,v 1.16 2009/05/17 06:50:59 wiz Exp $
+.\	$NetBSD: crypto.4,v 1.17 2010/01/28 08:35:06 hubertf Exp $
 .\
 .\ Copyright (c) 2008 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -454,7 +454,7 @@
 See below for discussion of the input and output parameter counts.
 .Ss Asymmetric-key commands
 .Bl -tag -width CIOCFKEY
-.It Dv CIOCASSYMFEAT Fa int *feature_mask
+.It Dv CIOCASYMFEAT Fa int *feature_mask
 Returns a bitmask of supported asymmetric-key operations.
 Each of the above-listed asymmetric operations is present
 if and only if the bit position numbered by the code for that operation

CVS commit: src/sys/kern

2010-01-22 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Fri Jan 22 08:32:05 UTC 2010

Modified Files:
src/sys/kern: kern_malloc.c

Log Message:
Let kernel build when MALLOCLOG is defined but DIAGNOSTIC is not.
Else, hitmlog() is defined but not used, which triggers a warning.


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/kern/kern_malloc.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/kern_malloc.c
diff -u src/sys/kern/kern_malloc.c:1.127 src/sys/kern/kern_malloc.c:1.128
--- src/sys/kern/kern_malloc.c:1.127	Sun Sep 13 18:45:11 2009
+++ src/sys/kern/kern_malloc.c	Fri Jan 22 08:32:05 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_malloc.c,v 1.127 2009/09/13 18:45:11 pooka Exp $	*/
+/*	$NetBSD: kern_malloc.c,v 1.128 2010/01/22 08:32:05 hubertf Exp $	*/
 
 /*
  * Copyright (c) 1987, 1991, 1993
@@ -66,7 +66,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_malloc.c,v 1.127 2009/09/13 18:45:11 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_malloc.c,v 1.128 2010/01/22 08:32:05 hubertf Exp $);
 
 #include sys/param.h
 #include sys/proc.h
@@ -215,6 +215,7 @@
 		malloclogptr = 0;
 }
 
+#ifdef DIAGNOSTIC
 static void
 hitmlog(void *a)
 {
@@ -271,6 +272,7 @@
 
 #undef PRT
 }
+#endif /* DIAGNOSTIC */
 #endif /* MALLOCLOG */
 
 #ifdef DIAGNOSTIC

CVS commit: src/share/man/man9

2010-01-22 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Fri Jan 22 09:18:07 UTC 2010

Modified Files:
src/share/man/man9: opencrypto.9

Log Message:
Document sysctls


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/share/man/man9/opencrypto.9

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/man9/opencrypto.9
diff -u src/share/man/man9/opencrypto.9:1.8 src/share/man/man9/opencrypto.9:1.9
--- src/share/man/man9/opencrypto.9:1.8	Tue Dec  8 09:23:06 2009
+++ src/share/man/man9/opencrypto.9	Fri Jan 22 09:18:07 2010
@@ -1,5 +1,5 @@
 .\	$OpenBSD: crypto.9,v 1.25 2003/07/11 13:47:41 jmc Exp $
-.\	$NetBSD: opencrypto.9,v 1.8 2009/12/08 09:23:06 mbalmer Exp $
+.\	$NetBSD: opencrypto.9,v 1.9 2010/01/22 09:18:07 hubertf Exp $
 .\
 .\ The author of this man page is Angelos D. Keromytis (ange...@cis.upenn.edu)
 .\
@@ -16,7 +16,7 @@
 .\ MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
 .\ PURPOSE.
 .\
-.Dd December 20, 2003
+.Dd January 1, 2010
 .Dt OPENCRYPTO 9
 .Os
 .Sh NAME
@@ -324,7 +324,8 @@
 For MAC algorithms, this is where the result of the keyed hash will be
 inserted.
 .It Fa crd_flags
-The following flags are defined:
+For adjusting general operation from userland,
+the following flags are defined:
 .Bl -tag -width CRD_F_IV_EXPLICIT
 .It Dv CRD_F_ENCRYPT
 For encryption algorithms, this bit is set when encryption is required
@@ -429,6 +430,28 @@
 .It Fa krp_callback
 Callback called on completion of a keying operation.
 .El
+.Pp
+The following sysctl entries exist to adjust 
+the behaviour of the system from userland:
+.Bl -tag -width kern.cryptodevallowsoft
+.It kern.usercrypto
+Allow (1) or forbid (0) userland acces to 
+.Pa /dev/crypto .
+.It kern.userasymcrypto
+Allow (1) or forbid (0) userland acces to 
+do asymmetric crypto requests.
+.It kern.cryptodevallowsoft
+Enable/disable access to hardware versus software operations:
+.Bl -tag -width xxx
+.It  0
+Force userlevel requests to use software operations, always.
+.It = 0
+Use hardware if present, grant userlevel requests for non-accelerated
+operations (handling the latter in software).
+.It  0
+Allow user requests only for operations which are hardware-accelerated.
+.El
+.El
 .Sh DRIVER-SIDE API
 The
 .Fn crypto_get_driverid ,
@@ -559,9 +582,11 @@
 .Fa crp_etype
 field.
 .Sh FILES
-.Bl -tag -width sys/crypto/crypto.c
-.It Pa sys/crypto/crypto.c
+.Bl -tag -width sys/opencrypto/crypto.c
+.It Pa sys/opencrypto/crypto.c
 most of the framework code
+.It Pa sys/crypto
+crypto algorithm implementations
 .El
 .Sh SEE ALSO
 .Xr ipsec 4 ,

CVS commit: src/sys/dev/pci

2010-01-21 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Thu Jan 21 23:23:44 UTC 2010

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
add/improve a few devices


To generate a diff of this commit:
cvs rdiff -u -r1.1015 -r1.1016 src/sys/dev/pci/pcidevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1015 src/sys/dev/pci/pcidevs:1.1016
--- src/sys/dev/pci/pcidevs:1.1015	Tue Jan 19 11:43:33 2010
+++ src/sys/dev/pci/pcidevs	Thu Jan 21 23:23:44 2010
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1015 2010/01/19 11:43:33 mbalmer Exp $
+$NetBSD: pcidevs,v 1.1016 2010/01/21 23:23:44 hubertf Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1916,8 +1916,8 @@
 product O2MICRO OZ6922		0x6925	OZ6922 PCI-CardBus Bridge
 product O2MICRO OZ6933		0x6933	OZ6933 PCI-CardBus Bridge
 product O2MICRO OZ6972		0x6972	OZ6912/OZ6972 PCI-CardBus Bridge
-product O2MICRO 7120		0x7120	Integrated MMC/SD Controller
-product O2MICRO 7130		0x7130	Integrated MS/xD/SM Controller
+product O2MICRO 7120		0x7120	OZ7120 Integrated MMC/SD Controller
+product O2MICRO 7130		0x7130	OZ7130 Integrated MS/xD/SM Controller
 product O2MICRO 7223		0x7223	OZ711E0 PCI-CardBus Bridge
 
 /* Evans  Sutherland products */
@@ -3522,6 +3522,7 @@
 product PLX 9054	0x9054	9054 I/O Accelerator
 product PLX 9060ES	0x906e	9060ES PCI Bus Controller
 product PLX 9656	0x9656	9656 I/O Accelerator
+product PLX 9656FPBGA	0x5601	9656 I/O Accelerator FPBGA
 
 /* Powerhouse Systems products */
 product POWERHOUSE POWERTOP	0x6037	PowerTop PowerPC System Controller

CVS commit: src/share/man/man8

2009-10-27 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Tue Oct 27 08:55:44 UTC 2009

Modified Files:
src/share/man/man8: MAKEDEV.8

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/share/man/man8/MAKEDEV.8

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/man8/MAKEDEV.8
diff -u src/share/man/man8/MAKEDEV.8:1.36 src/share/man/man8/MAKEDEV.8:1.37
--- src/share/man/man8/MAKEDEV.8:1.36	Sun Sep  6 17:25:55 2009
+++ src/share/man/man8/MAKEDEV.8	Tue Oct 27 08:55:44 2009
@@ -6,7 +6,7 @@
 .\ *** DO NOT EDIT - any changes will be lost!!!
 .\ *** --
 .\
-.\ $NetBSD: MAKEDEV.8,v 1.36 2009/09/06 17:25:55 sborrill Exp $
+.\ $NetBSD: MAKEDEV.8,v 1.37 2009/10/27 08:55:44 hubertf Exp $
 .\
 .\ Copyright (c) 2001, 2003, 2007, 2008 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -35,7 +35,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd September  6, 2009
+.Dd October 27, 2009
 .Dt MAKEDEV 8
 .Os
 .Sh NAME
@@ -713,6 +713,9 @@
 . It Ar dpti#
 DPT/Adaptec I2O RAID management interface, see
 .Xr \dpti 4
+. It Ar drm#
+Direct Rendering Manager interface, see
+.Xr \drm 4
 . It Ar fb#
 PMAX generic framebuffer pseudo-device
 . It Ar fd

CVS commit: src/share/man/man8

2009-10-27 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Tue Oct 27 08:58:04 UTC 2009

Removed Files:
src/share/man/man8: MAKEDEV2manpage.awk

Log Message:
This was replaced by a shell script quite some time ago, purge.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r0 src/share/man/man8/MAKEDEV2manpage.awk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.sbin/user

2009-10-15 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Thu Oct 15 23:03:02 UTC 2009

Modified Files:
src/usr.sbin/user: user.c

Log Message:
Fix -p:
 * rm_eo is the first character *after* the match, so no need for a +1
 * Blowfish hashes are only 53 chars long, not 54


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/usr.sbin/user/user.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/user/user.c
diff -u src/usr.sbin/user/user.c:1.123 src/usr.sbin/user/user.c:1.124
--- src/usr.sbin/user/user.c:1.123	Fri Mar 20 02:53:47 2009
+++ src/usr.sbin/user/user.c	Thu Oct 15 23:03:02 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: user.c,v 1.123 2009/03/20 02:53:47 mike Exp $ */
+/* $NetBSD: user.c,v 1.124 2009/10/15 23:03:02 hubertf Exp $ */
 
 /*
  * Copyright (c) 1999 Alistair G. Crooks.  All rights reserved.
@@ -33,7 +33,7 @@
 #ifndef lint
 __COPYRIGHT(@(#) Copyright (c) 1999\
  The NetBSD Foundation, Inc.  All rights reserved.);
-__RCSID($NetBSD: user.c,v 1.123 2009/03/20 02:53:47 mike Exp $);
+__RCSID($NetBSD: user.c,v 1.124 2009/10/15 23:03:02 hubertf Exp $);
 #endif
 
 #include sys/types.h
@@ -908,7 +908,7 @@
 
 static passwd_type_t	passwd_types[] = {
 	{ $sha1,	5,	28,	\\$[^$]+\\$[^$]+\\$[^$]+\\$(.*), 1 },	/* SHA1 */
-	{ $2a,	3,	54,	\\$[^$]+\\$[^$]+\\$(.*),	1 },	/* Blowfish */
+	{ $2a,	3,	53,	\\$[^$]+\\$[^$]+\\$(.*),	1 },	/* Blowfish */
 	{ $1,		2,	34,	NULL,0 },	/* MD5 */
 	{ ,		0,	DES_Len,NULL,0 },	/* standard DES */
 	{ NULL,		(size_t)~0,	(size_t)~0,	NULL,		0 }
@@ -932,7 +932,7 @@
 			if (regexec(r, newpasswd, 10, matchv, 0) == 0) {
 regfree(r);
 return (int)(matchv[pwtp-re_sub].rm_eo -
-matchv[pwtp-re_sub].rm_so + 1) ==
+matchv[pwtp-re_sub].rm_so) ==
 pwtp-length;
 			}
 			regfree(r);

CVS commit: src/distrib/i386/cdroms

2009-08-30 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Aug 30 22:30:30 UTC 2009

Modified Files:
src/distrib/i386/cdroms: Makefile.cdrom

Log Message:
Make sure cdrom/etc exists before copying files into it.

Needed when someone sets CDRUNTIME to  in  a subdirectory's Makefile,
to not get anything besides a kernel and maybe a ramdisk (module) on a CD.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/i386/cdroms/Makefile.cdrom

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.11 src/distrib/i386/cdroms/Makefile.cdrom:1.12
--- src/distrib/i386/cdroms/Makefile.cdrom:1.11	Sat Mar  7 20:19:45 2009
+++ src/distrib/i386/cdroms/Makefile.cdrom	Sun Aug 30 22:30:30 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.11 2009/03/07 20:19:45 christos Exp $
+# $NetBSD: Makefile.cdrom,v 1.12 2009/08/30 22:30:30 hubertf Exp $
 
 .include bsd.own.mk
 
@@ -46,6 +46,7 @@
 CDRUNTIME+=	./usr/share/misc/termcap
 
 image_md_pre:
+	${MKDIR} cdrom/etc
 	${CP} ${.CURDIR}/../../ramdisks/common/dot.profile cdrom/etc/rc
 	${MKDIR} cdrom/mnt2 cdrom/targetroot
 	${CP} ${SYSINSTDIR}/sysinst cdrom

CVS commit: src/usr.sbin/sti

2009-08-28 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Fri Aug 28 21:19:13 UTC 2009

Modified Files:
src/usr.sbin/sti: sti.8

Log Message:
improve wording a bit


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sti/sti.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/sti/sti.8
diff -u src/usr.sbin/sti/sti.8:1.5 src/usr.sbin/sti/sti.8:1.6
--- src/usr.sbin/sti/sti.8:1.5	Wed Apr 30 13:11:03 2008
+++ src/usr.sbin/sti/sti.8	Fri Aug 28 21:19:13 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: sti.8,v 1.5 2008/04/30 13:11:03 martin Exp $
+.\ $NetBSD: sti.8,v 1.6 2009/08/28 21:19:13 hubertf Exp $
 .\
 .\ Copyright (c) 2005 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -46,9 +46,9 @@
 specified in the command line using
 .Xr ioctl 2
 .Dv TIOCSTI ,
-or send the standard input if a
+or send the standard input if no
 .Ar string
-is not supplied.
+is supplied.
 This
 .Xr ioctl 2
 is limited to the superuser.

CVS commit: [netbsd-5] src/sbin/ifconfig

2009-07-29 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Wed Jul 29 16:50:41 UTC 2009

Modified Files:
src/sbin/ifconfig [netbsd-5]: ifconfig.8

Log Message:
Add MAC keyword to the corresponding example.


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.94.2.1 src/sbin/ifconfig/ifconfig.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/ifconfig/ifconfig.8
diff -u src/sbin/ifconfig/ifconfig.8:1.94 src/sbin/ifconfig/ifconfig.8:1.94.2.1
--- src/sbin/ifconfig/ifconfig.8:1.94	Tue Sep 30 09:41:41 2008
+++ src/sbin/ifconfig/ifconfig.8	Wed Jul 29 16:50:41 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: ifconfig.8,v 1.94 2008/09/30 09:41:41 wiz Exp $
+.\	$NetBSD: ifconfig.8,v 1.94.2.1 2009/07/29 16:50:41 hubertf Exp $
 .\
 .\ Copyright (c) 1983, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -804,7 +804,7 @@
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55
 .Pp
-Add and activate a link-layer address:
+Add and activate a link-layer (MAC) address:
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55 active
 .Sh DIAGNOSTICS

CVS commit: [netbsd-5] src/sbin/ifconfig

2009-07-29 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Wed Jul 29 21:46:33 UTC 2009

Modified Files:
src/sbin/ifconfig [netbsd-5]: ifconfig.8

Log Message:
backout previous - wrong branch, thanks veego


To generate a diff of this commit:
cvs rdiff -u -r1.94.2.1 -r1.94.2.2 src/sbin/ifconfig/ifconfig.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/ifconfig/ifconfig.8
diff -u src/sbin/ifconfig/ifconfig.8:1.94.2.1 src/sbin/ifconfig/ifconfig.8:1.94.2.2
--- src/sbin/ifconfig/ifconfig.8:1.94.2.1	Wed Jul 29 16:50:41 2009
+++ src/sbin/ifconfig/ifconfig.8	Wed Jul 29 21:46:33 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: ifconfig.8,v 1.94.2.1 2009/07/29 16:50:41 hubertf Exp $
+.\	$NetBSD: ifconfig.8,v 1.94.2.2 2009/07/29 21:46:33 hubertf Exp $
 .\
 .\ Copyright (c) 1983, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -804,7 +804,7 @@
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55
 .Pp
-Add and activate a link-layer (MAC) address:
+Add and activate a link-layer address:
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55 active
 .Sh DIAGNOSTICS

CVS commit: src/sbin/ifconfig

2009-07-29 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Wed Jul 29 21:47:11 UTC 2009

Modified Files:
src/sbin/ifconfig: ifconfig.8

Log Message:
Add MAC keyword to the corresponding example.


To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sbin/ifconfig/ifconfig.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/ifconfig/ifconfig.8
diff -u src/sbin/ifconfig/ifconfig.8:1.98 src/sbin/ifconfig/ifconfig.8:1.99
--- src/sbin/ifconfig/ifconfig.8:1.98	Thu Jul  2 18:43:47 2009
+++ src/sbin/ifconfig/ifconfig.8	Wed Jul 29 21:47:11 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: ifconfig.8,v 1.98 2009/07/02 18:43:47 dyoung Exp $
+.\	$NetBSD: ifconfig.8,v 1.99 2009/07/29 21:47:11 hubertf Exp $
 .\
 .\ Copyright (c) 1983, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -819,7 +819,7 @@
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55
 .Pp
-Add and activate a link-layer address:
+Add and activate a link-layer (MAC) address:
 .Pp
 .Ic ifconfig sip0 link 00:11:22:33:44:55 active
 .Sh DIAGNOSTICS

CVS commit: src/doc

2009-07-12 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Jul 12 12:14:51 UTC 2009

Modified Files:
src/doc: BUILDING.mdoc

Log Message:
Add a keywords for people looking for reproducable (identical) builds.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/doc/BUILDING.mdoc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.72 src/doc/BUILDING.mdoc:1.73
--- src/doc/BUILDING.mdoc:1.72	Fri May  1 19:42:18 2009
+++ src/doc/BUILDING.mdoc	Sun Jul 12 12:14:51 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: BUILDING.mdoc,v 1.72 2009/05/01 19:42:18 snj Exp $
+.\	$NetBSD: BUILDING.mdoc,v 1.73 2009/07/12 12:14:51 hubertf Exp $
 .\
 .\ Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -311,7 +311,7 @@
 the -frandom-seed flag with this value.
 By default, it is set to NetBSD-(majorversion).
 Using a fixed value causes C++ binaries to be the same when
-built from the same sources.
+built from the same sources, resulting in identical (reproducable) builds.
 Additional information is available in the GCC
 documentation of -frandom-seed.
 .

CVS commit: src

2009-07-12 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Jul 12 12:15:10 UTC 2009

Modified Files:
src: BUILDING

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/BUILDING

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.83 src/BUILDING:1.84
--- src/BUILDING:1.83	Fri May  1 19:42:18 2009
+++ src/BUILDING	Sun Jul 12 12:15:10 2009
@@ -140,9 +140,9 @@
  able seeds the gcc random number generator using the -fran-
  dom-seed flag with this value.  By default, it is set to
  NetBSD-(majorversion).  Using a fixed value causes C++ bina-
- ries to be the same when built from the same sources.  Addi-
- tional information is available in the GCC documentation of
- -frandom-seed.
+ ries to be the same when built from the same sources, result-
+ ing in identical (reproducable) builds.  Additional informa-
+ tion is available in the GCC documentation of -frandom-seed.
 
  DESTDIR Directory to contain the built NetBSD system.  If set, spe-
  cial options are passed to the compilation tools to prevent

CVS commit: src/doc

2009-07-12 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Jul 12 14:16:36 UTC 2009

Modified Files:
src/doc: BUILDING.mdoc

Log Message:
s/reproducable/reproducible/, requested by salo@


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/doc/BUILDING.mdoc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.73 src/doc/BUILDING.mdoc:1.74
--- src/doc/BUILDING.mdoc:1.73	Sun Jul 12 12:14:51 2009
+++ src/doc/BUILDING.mdoc	Sun Jul 12 14:16:36 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: BUILDING.mdoc,v 1.73 2009/07/12 12:14:51 hubertf Exp $
+.\	$NetBSD: BUILDING.mdoc,v 1.74 2009/07/12 14:16:36 hubertf Exp $
 .\
 .\ Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -311,7 +311,7 @@
 the -frandom-seed flag with this value.
 By default, it is set to NetBSD-(majorversion).
 Using a fixed value causes C++ binaries to be the same when
-built from the same sources, resulting in identical (reproducable) builds.
+built from the same sources, resulting in identical (reproducible) builds.
 Additional information is available in the GCC
 documentation of -frandom-seed.
 .

CVS commit: src

2009-07-12 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Jul 12 14:17:18 UTC 2009

Modified Files:
src: BUILDING

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/BUILDING

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/BUILDING
diff -u src/BUILDING:1.84 src/BUILDING:1.85
--- src/BUILDING:1.84	Sun Jul 12 12:15:10 2009
+++ src/BUILDING	Sun Jul 12 14:17:18 2009
@@ -141,7 +141,7 @@
  dom-seed flag with this value.  By default, it is set to
  NetBSD-(majorversion).  Using a fixed value causes C++ bina-
  ries to be the same when built from the same sources, result-
- ing in identical (reproducable) builds.  Additional informa-
+ ing in identical (reproducible) builds.  Additional informa-
  tion is available in the GCC documentation of -frandom-seed.
 
  DESTDIR Directory to contain the built NetBSD system.  If set, spe-

CVS commit: src/etc

2009-07-03 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Fri Jul  3 22:32:55 UTC 2009

Modified Files:
src/etc: hosts

Log Message:
Make the section on private networks more clear - inspired by RFC.
OK core@


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/etc/hosts

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/hosts
diff -u src/etc/hosts:1.7 src/etc/hosts:1.8
--- src/etc/hosts:1.7	Sun Aug 29 13:26:17 2004
+++ src/etc/hosts	Fri Jul  3 22:32:55 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: hosts,v 1.7 2004/08/29 13:26:17 chs Exp $
+#	$NetBSD: hosts,v 1.8 2009/07/03 22:32:55 hubertf Exp $
 #
 # Host Database
 # This file should contain the addresses and aliases
@@ -10,7 +10,7 @@
 ::1			localhost localhost.
 127.0.0.1		localhost localhost.
 #
-# RFC 1918 specifies that these networks are internal.
-# 10.0.0.0	10.255.255.255
-# 172.16.0.0	172.31.255.255
-# 192.168.0.0	192.168.255.255
+# RFC 1918 specifies that these networks are internal:
+# 10.0.0.0-   10.255.255.255  (10/8 prefix)
+# 172.16.0.0  -   172.31.255.255  (172.16/12 prefix)
+# 192.168.0.0 -   192.168.255.255 (192.168/16 prefix)

CVS commit: src/sys/dev/pci

2009-06-29 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Mon Jun 29 11:02:44 UTC 2009

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
add a few sdhc(4) devices


To generate a diff of this commit:
cvs rdiff -u -r1.992 -r1.993 src/sys/dev/pci/pcidevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.992 src/sys/dev/pci/pcidevs:1.993
--- src/sys/dev/pci/pcidevs:1.992	Fri Jun 12 23:00:24 2009
+++ src/sys/dev/pci/pcidevs	Mon Jun 29 11:02:43 2009
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.992 2009/06/12 23:00:24 rjs Exp $
+$NetBSD: pcidevs,v 1.993 2009/06/29 11:02:43 hubertf Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -1849,6 +1849,7 @@
 
 /* ENE Technology products */
 product ENE MCR510	0x0510	MCR510 PCI Memory Card Reader Controller
+product ENE CB712	0x0550	CB712/714/810 PCI SD Card Reader Controller
 product ENE CB1211	0x1211	CB1211 CardBus Controller
 product ENE CB1225	0x1225	CB1225 CardBus Controller
 product ENE CB1410	0x1410	CB1410 CardBus Controller
@@ -3899,6 +3900,8 @@
 product TI	PCI72111CB	0x8031	PCI7x21/7x11 Cardbus Controller
 product TI	PCI72111FW	0x8032	PCI7x21/7x11 IEEE 1394 Host Controller
 product TI	PCI72111FM	0x8033	PCI7x21/7x11 Integrated FlashMedia Controller
+product TI	PCI72111SD	0x8034	PCI7x21/7x11 SD Card Controller
+product TI	PCI72111SM	0x8035	PCI7x21/7x11 SM Card Controller
 product TI	PCI6515A	0x8036	PCI6515A Cardbus Controller 
 product TI	PCI6515ASM	0x8038	PCI6515A Cardbus Controller (Smart Card mode)
 product TI	PCIXX12CB	0x8039	PCIXX12 Cardbus Controller

CVS commit: src/sys/dev/pci

2009-06-29 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Mon Jun 29 11:05:12 UTC 2009

Modified Files:
src/sys/dev/pci: sdhc_pci.c

Log Message:
Use PCI IDs from pcidevs, instead of storing them in here.
Compile tested and OK'd by NONAKA Kimihiro.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/sdhc_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/pci/sdhc_pci.c
diff -u src/sys/dev/pci/sdhc_pci.c:1.1 src/sys/dev/pci/sdhc_pci.c:1.2
--- src/sys/dev/pci/sdhc_pci.c:1.1	Tue Apr 21 03:00:29 2009
+++ src/sys/dev/pci/sdhc_pci.c	Mon Jun 29 11:05:12 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: sdhc_pci.c,v 1.1 2009/04/21 03:00:29 nonaka Exp $	*/
+/*	$NetBSD: sdhc_pci.c,v 1.2 2009/06/29 11:05:12 hubertf Exp $	*/
 /*	$OpenBSD: sdhc_pci.c,v 1.7 2007/10/30 18:13:45 chl Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc_pci.c,v 1.1 2009/04/21 03:00:29 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc_pci.c,v 1.2 2009/06/29 11:05:12 hubertf Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -67,11 +67,6 @@
 #define	DPRINTF(s)	/**/
 #endif
 
-/* XXX */
-#define	PCI_PRODUCT_TI_PCI7XX1_FLASH	0x8033
-#define	PCI_PRODUCT_TI_PCI7XX1_SD	0x8034
-#define	PCI_PRODUCT_ENE_SDCARD		0x0550
-
 static const struct sdhc_pci_quirk {
 	pci_vendor_id_t		vendor;
 	pci_product_id_t	product;
@@ -86,7 +81,7 @@
 } sdhc_pci_quirk_table[] = {
 	{
 		PCI_VENDOR_TI,
-		PCI_PRODUCT_TI_PCI7XX1_SD,
+		PCI_PRODUCT_TI_PCI72111SD,
 		0x,
 		0x,
 		4,
@@ -95,7 +90,7 @@
 
 	{
 		PCI_VENDOR_ENE,
-		PCI_PRODUCT_ENE_SDCARD,
+		PCI_PRODUCT_ENE_CB712,
 		0x,
 		0x,
 		0,
@@ -286,7 +281,7 @@
 	/* Look at func 3 for the flash device */
 	tag = pci_make_tag(pc, pa-pa_bus, pa-pa_device, 3);
 	id = pci_conf_read(pc, tag, PCI_ID_REG);
-	if (PCI_PRODUCT(id) != PCI_PRODUCT_TI_PCI7XX1_FLASH)
+	if (PCI_PRODUCT(id) != PCI_PRODUCT_TI_PCI72111FM)
 		return;
 
 	/*

CVS commit: src/sys/dev/sdmmc

2009-06-28 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Sun Jun 28 11:17:39 UTC 2009

Modified Files:
src/sys/dev/sdmmc: files.sdmmc

Log Message:
Remove trailing whitespace,
from KIYOHARA Takashi on current-users@


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/sdmmc/files.sdmmc

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/sdmmc/files.sdmmc
diff -u src/sys/dev/sdmmc/files.sdmmc:1.1 src/sys/dev/sdmmc/files.sdmmc:1.2
--- src/sys/dev/sdmmc/files.sdmmc:1.1	Tue Apr 21 03:00:30 2009
+++ src/sys/dev/sdmmc/files.sdmmc	Sun Jun 28 11:17:39 2009
@@ -1,20 +1,20 @@
-#  $NetBSD: files.sdmmc,v 1.1 2009/04/21 03:00:30 nonaka Exp $
+#  $NetBSD: files.sdmmc,v 1.2 2009/06/28 11:17:39 hubertf Exp $
 #  $OpenBSD: files.sdmmc,v 1.2 2006/06/01 21:53:41 uwe Exp $
 #
 # Config file and device description for machine-independent SD/MMC code.
 # Included by ports that need it.
 
 device sdmmc {}
-attach sdmmc at sdmmcbus 
+attach sdmmc at sdmmcbus
 file	dev/sdmmc/sdmmc.c		sdmmc
 file	dev/sdmmc/sdmmc_cis.c		sdmmc
 file	dev/sdmmc/sdmmc_io.c		sdmmc
-file	dev/sdmmc/sdmmc_mem.c		sdmmc 
+file	dev/sdmmc/sdmmc_mem.c		sdmmc
 
 attach ld at sdmmc with ld_sdmmc
 file	dev/sdmmc/ld_sdmmc.c		ld_sdmmc
 
 # Bluetooth SDIO cards (Type-A/B)
-device sbt: btbus, bluetooth 
-attach sbt at sdmmc 
+device sbt: btbus, bluetooth
+attach sbt at sdmmc
 file	dev/sdmmc/sbt.c			sbt

CVS commit: src/usr.bin/window

2009-06-25 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Thu Jun 25 21:48:49 UTC 2009

Modified Files:
src/usr.bin/window: window.1

Log Message:
Add an example .windowrc


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/window/window.1

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/window/window.1
diff -u src/usr.bin/window/window.1:1.16 src/usr.bin/window/window.1:1.17
--- src/usr.bin/window/window.1:1.16	Tue Mar 10 21:18:35 2009
+++ src/usr.bin/window/window.1	Thu Jun 25 21:48:49 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: window.1,v 1.16 2009/03/10 21:18:35 joerg Exp $
+.\	$NetBSD: window.1,v 1.17 2009/06/25 21:48:49 hubertf Exp $
 .\
 .\ Copyright (c) 1985, 1990, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\
 .\	@(#)window.1	8.2 (Berkeley) 12/30/93
 .\
-.Dd December 30, 1993
+.Dd June 25, 2009
 .Dt WINDOW 1
 .Os
 .Sh NAME
@@ -1048,6 +1048,18 @@
 .It Pa /dev/[pt]ty[pq]?
 pseudo-terminal devices.
 .El
+.Sh EXAMPLES
+The following example
+.Pa ~/.windowrc
+will open two windows. 
+The upper one will take one third of the screen 
+and run tcpdump, the lower one will take
+the remaining two thirds of the screen and run
+the default shell:
+.Bd -literal -offset 
+window r=1, nr=$nrow/3-1, l=tcpdump\\ pcn0, sh=tcpdump \\-ni pcn0
+window r=$nrow/3, nr=2*$nrow/3+1
+.Ed
 .Sh DIAGNOSTICS
 Should be self explanatory.
 .Sh HISTORY

CVS commit: [netbsd-5] src/usr.bin/window

2009-06-25 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Thu Jun 25 21:48:17 UTC 2009

Modified Files:
src/usr.bin/window [netbsd-5]: window.1

Log Message:
Revert previous commit - wrong branch


To generate a diff of this commit:
cvs rdiff -u -r1.15.40.1 -r1.15.40.2 src/usr.bin/window/window.1

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/window/window.1
diff -u src/usr.bin/window/window.1:1.15.40.1 src/usr.bin/window/window.1:1.15.40.2
--- src/usr.bin/window/window.1:1.15.40.1	Thu Jun 25 21:47:20 2009
+++ src/usr.bin/window/window.1	Thu Jun 25 21:48:17 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: window.1,v 1.15.40.1 2009/06/25 21:47:20 hubertf Exp $
+.\	$NetBSD: window.1,v 1.15.40.2 2009/06/25 21:48:17 hubertf Exp $
 .\
 .\ Copyright (c) 1985, 1990, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\
 .\	@(#)window.1	8.2 (Berkeley) 12/30/93
 .\
-.Dd June 25, 2009
+.Dd December 30, 1993
 .Dt WINDOW 1
 .Os
 .Sh NAME
@@ -1048,18 +1048,6 @@
 .It Pa /dev/[pt]ty[pq]?
 pseudo-terminal devices.
 .El
-.Sh EXAMPLES
-The following example
-.Pa ~/.windowrc
-will open two windows. 
-The upper one will take one third of the screen 
-and run tcpdump, the lower one will take
-the remaining two thirds of the screen and run
-the default shell:
-.Bd -literal -offset 
-window r=1, nr=$nrow/3-1, l=tcpdump\\ pcn0, sh=tcpdump \\-ni pcn0
-window r=$nrow/3, nr=2*$nrow/3+1
-.Ed
 .Sh DIAGNOSTICS
 Should be self explanatory.
 .Sh HISTORY

CVS commit: [netbsd-5] src/usr.bin/window

2009-06-25 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Thu Jun 25 21:47:21 UTC 2009

Modified Files:
src/usr.bin/window [netbsd-5]: window.1

Log Message:
Add an example .windowrc


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.40.1 src/usr.bin/window/window.1

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/window/window.1
diff -u src/usr.bin/window/window.1:1.15 src/usr.bin/window/window.1:1.15.40.1
--- src/usr.bin/window/window.1:1.15	Thu Aug  7 11:17:34 2003
+++ src/usr.bin/window/window.1	Thu Jun 25 21:47:20 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: window.1,v 1.15 2003/08/07 11:17:34 agc Exp $
+.\	$NetBSD: window.1,v 1.15.40.1 2009/06/25 21:47:20 hubertf Exp $
 .\
 .\ Copyright (c) 1985, 1990, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -32,7 +32,7 @@
 .\
 .\	@(#)window.1	8.2 (Berkeley) 12/30/93
 .\
-.Dd December 30, 1993
+.Dd June 25, 2009
 .Dt WINDOW 1
 .Os
 .Sh NAME
@@ -1048,6 +1048,18 @@
 .It Pa /dev/[pt]ty[pq]?
 pseudo-terminal devices.
 .El
+.Sh EXAMPLES
+The following example
+.Pa ~/.windowrc
+will open two windows. 
+The upper one will take one third of the screen 
+and run tcpdump, the lower one will take
+the remaining two thirds of the screen and run
+the default shell:
+.Bd -literal -offset 
+window r=1, nr=$nrow/3-1, l=tcpdump\\ pcn0, sh=tcpdump \\-ni pcn0
+window r=$nrow/3, nr=2*$nrow/3+1
+.Ed
 .Sh DIAGNOSTICS
 Should be self explanatory.
 .Sh HISTORY

CVS commit: src/sys/dev/i2c

2009-06-05 Thread Hubert Feyrer

Module Name:src
Committed By:   hubertf
Date:   Fri Jun  5 12:42:43 UTC 2009

Modified Files:
src/sys/dev/i2c: adm1021.c

Log Message:
From the specs: address 0xff gives the die revision


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/adm1021.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/i2c/adm1021.c
diff -u src/sys/dev/i2c/adm1021.c:1.2 src/sys/dev/i2c/adm1021.c:1.3
--- src/sys/dev/i2c/adm1021.c:1.2	Tue May 12 14:23:33 2009
+++ src/sys/dev/i2c/adm1021.c	Fri Jun  5 12:42:43 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: adm1021.c,v 1.2 2009/05/12 14:23:33 cegger Exp $ */
+/*	$NetBSD: adm1021.c,v 1.3 2009/06/05 12:42:43 hubertf Exp $ */
 /*	$OpenBSD: adm1021.c,v 1.27 2007/06/24 05:34:35 dlg Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: adm1021.c,v 1.2 2009/05/12 14:23:33 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: adm1021.c,v 1.3 2009/06/05 12:42:43 hubertf Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -38,7 +38,7 @@
 #define ADM1021_CONFIG_WRITE	0x09
 #define ADM1021_CONFIG_RUN	0x40
 #define ADM1021_COMPANY		0xfe	/* contains 0x41 */
-#define ADM1021_STEPPING	0xff	/* contains 0x3? */
+#define ADM1021_DIE_REVISION	0xff
 
 /* Sensors */
 #define ADMTEMP_INT		0

49 matches

Mail list logo