Re: CVS commit: src/usr.sbin/wake

2009-06-27 Thread Marc Balmer


Am 27.06.2009 um 05:27 schrieb Simon Burge:


Marc Balmer wrote:


Am 27.06.2009 um 00:08 schrieb Marc Balmer:



Am 26.06.2009 um 20:22 schrieb David Laight:


On Fri, Jun 26, 2009 at 01:38:32PM -0400, Christos Zoulas wrote:


I think this utility should be renamed wakeonlan because wake is
too generic.


FWIW I agree ...


I disagree.  Totally.



and I forgot to mention why:  the command name reflects what the
command does,
not how it does it.  wakeonlan would be misleading, because a LAN
could also
be a token ring, where this would nor work... (ok, exaggerating a  
bit,

but you get
the idea)

should we rename ssh to sshovertcpip ;)  tcpdump to tcpdumponlan?


wake is a lot more generic term than ssh or tcpdump.  When I  
first

saw the subject CVS commit: src/usr.sbin/wake it wasn't in any way
obvious that this sent wake-on-lan packets to remote hosts.  My first
guess was something that woke up processes blocked in the kernel  
that

are otherwise unkillable - try man -k wake for example.


I deliberately choose that name when I first wrote the command (I use  
it on other OSs as well) and of course I first talked to my sponsors  
before I added it to NetBSD.


Waking processes from the command line sounds like a strange use case  
to me.



Cheers,
Simon.




Re: CVS commit: xsrc/external/mit/xf86-input-mouse/dist/src

2009-07-08 Thread Marc Balmer


Am 08.07.2009 um 02:30 schrieb matthew green:


Module Name:xsrc
Committed By:   mrg
Date:   Wed Jul  8 00:30:52 UTC 2009

Modified Files:
xsrc/external/mit/xf86-input-mouse/dist/src: mouse.c

Log Message:
use strcasecmp() to check for netbsd wsmouse.
auto-generated configs end up with WSmouse.

fixes PR#41677.


nice find, thanks!




To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-input-mouse/dist/src/ 
mouse.c


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

Modified files:

Index: xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c
diff -u xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.5 xsrc/ 
external/mit/xf86-input-mouse/dist/src/mouse.c:1.6
--- xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c:1.5	Fri Jun  
12 05:53:58 2009
+++ xsrc/external/mit/xf86-input-mouse/dist/src/mouse.c	Wed Jul  8  
00:30:52 2009

@@ -1757,7 +1757,7 @@
	xf86Msg(X_WARNING, %s: cannot open input device\n, pInfo- 
name);

else {
#if defined(__NetBSD__)  defined(WSCONS_SUPPORT)   
defined(WSMOUSEIO_SETVERSION)

-   if (!strcmp(pMse-protocol, wsmouse)) {
+   if (!strcasecmp(pMse-protocol, wsmouse)) {
int version = WSMOUSE_EVENT_VERSION;
if (ioctl(pInfo-fd, WSMOUSEIO_SETVERSION, version) == -1)
	xf86Msg(X_WARNING, %s: cannot set version\n, pInfo- 
name);






Re: CVS commit: src/share/man/man4

2009-07-25 Thread Marc Balmer



Module Name:src
Committed By:   wiz
Date:   Sat Jul 25 21:16:35 UTC 2009

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

Log Message:
Reword for better HTML output.


we should fix our tools, instead.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/share/man/man4/gpio.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/gpio.4
diff -u src/share/man/man4/gpio.4:1.9 src/share/man/man4/gpio.4:1.10
--- src/share/man/man4/gpio.4:1.9   Sat Jul 25 16:20:11 2009
+++ src/share/man/man4/gpio.4   Sat Jul 25 21:16:35 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: gpio.4,v 1.9 2009/07/25 16:20:11 mbalmer Exp $
+.\ $NetBSD: gpio.4,v 1.10 2009/07/25 21:16:35 wiz Exp $
.\$OpenBSD: gpio.4,v 1.5 2004/11/23 09:39:29 reyk Exp $
.\
.\ Copyright (c) 2004 Alexander Yurchenko gra...@openbsd.org
@@ -51,12 +51,12 @@
.Xr ioctl 2
calls on these devices.
.Pp
-The layout of the GPIO device is defined at a securelevel  1, i.e.  
typically

-during system boot, and cannot be changed later.
+The layout of the GPIO device is defined at a securelevel less than
+1, i.e. typically during system boot, and cannot be changed later.
GPIO pins can be configured and given a symbolic name and device  
drivers

that use GPIO pins can be attached to the
.Nm
-device at a securelevel  1.
+device at a securelevel less than 1.
All other pins will not be accessible once the runlevel has been  
raised.

.Sh IOCTL INTERFACE
The following structures and constants are defined in the





Re: CVS commit: src/sys/kern

2009-07-27 Thread Marc Balmer


Am 27.07.2009 um 18:08 schrieb Matthias Drochner:



lacom...@gmail.com said:

Am I the only one to find that attaching a pseudo-device in main() is
not the right way to go ?


No. This looks like a case for defpseudodev. You'll find a couple
of examples in the tree. (Or I can help if necessary.)


yes, please mail me some hints, I find it gross myself, but did not  
yet find a better way.





best regards
Matthias





Forschungszentrum Juelich GmbH
52425 Juelich
Sitz der Gesellschaft: Juelich
Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
Vorsitzende des Aufsichtsrats: MinDir'in Baerbel Brumme-Bothe
Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender),
Dr. Ulrich Krafft (stellv. Vorsitzender), Prof. Dr.-Ing. Harald Bolt,
Prof. Dr. Sebastian M. Schmidt






Re: CVS commit: src/sys/kern

2009-07-27 Thread Marc Balmer


Am 27.07.2009 um 18:36 schrieb Matthias Drochner:



lacom...@gmail.com said:

config(9) doesn't seem to know anything about 'defpseudodev'


config(5) mentions it. (I've written that part. It anyone has
suggestions for better wording please tell me.)


I'll take care of this issue.  If there is a better way, it should not  
attach at root in init_main.c




best regards
Matthias





Forschungszentrum Juelich GmbH
52425 Juelich
Sitz der Gesellschaft: Juelich
Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
Vorsitzende des Aufsichtsrats: MinDir'in Baerbel Brumme-Bothe
Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender),
Dr. Ulrich Krafft (stellv. Vorsitzender), Prof. Dr.-Ing. Harald Bolt,
Prof. Dr. Sebastian M. Schmidt






Re: CVS commit: src

2009-09-14 Thread Marc Balmer


Am 14.09.2009 um 14:24 schrieb Michael Shalayeff:


On Mon, Sep 14, 2009 at 12:44:34PM +0100, Matthias Scheler wrote:

On Mon, Sep 14, 2009 at 11:17:25AM +, Michael Shalayeff wrote:
pfsync never collided w/ anything. it used unassigned proto  
number.


Does it still do that?


of course. adding extra udp encapsualtion only kills performance.


maybe we should just note the fact in a CAVEAT section in the manual  
page.



cu
--
   paranoic mickey   (my employers have changed but, the name  
has remained)




Re: CVS commit: src/doc

2009-10-03 Thread Marc Balmer


Am 02.10.2009 um 09:43 schrieb Christoph Egger:


Module Name:src
Committed By:   cegger
Date:   Fri Oct  2 07:43:01 UTC 2009

Modified Files:
src/doc: BUILDING.mdoc CHANGES.prev
src/doc/roadmaps: storage

Log Message:
backout wrong changes after I got teached that the vowel *sound*  
matters

and not the spelling letter (which is what I learned at school).


are you sure they teached you english at that school and not some  
bavarian variant of it?


;) - Marc




To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.96 -r1.97 src/doc/CHANGES.prev
cvs rdiff -u -r1.6 -r1.7 src/doc/roadmaps/storage

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.78 src/doc/BUILDING.mdoc:1.79
--- src/doc/BUILDING.mdoc:1.78  Fri Oct  2 07:17:16 2009
+++ src/doc/BUILDING.mdoc   Fri Oct  2 07:43:01 2009
@@ -1,4 +1,4 @@
-.\   $NetBSD: BUILDING.mdoc,v 1.78 2009/10/02 07:17:16 cegger Exp $
+.\   $NetBSD: BUILDING.mdoc,v 1.79 2009/10/02 07:43:01 cegger Exp $
.\
.\ Copyright (c) 2001-2008 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -1165,7 +1165,7 @@
.Sy /bin/sh
is unusually old and broken, the Korn Shell
.Sy ( /bin/ksh ) ,
-if available, may be an usable alternative.
+if available, may be a usable alternative.
.Pp
All cross-compile builds, and most native builds, of the entire system
should make use of

Index: src/doc/CHANGES.prev
diff -u src/doc/CHANGES.prev:1.96 src/doc/CHANGES.prev:1.97
--- src/doc/CHANGES.prev:1.96   Fri Oct  2 07:17:16 2009
+++ src/doc/CHANGES.prevFri Oct  2 07:43:01 2009
@@ -1,4 +1,4 @@
-LIST OF CHANGES FROM PREVIOUS RELEASES:$Revision: 1.96 
$
+LIST OF CHANGES FROM PREVIOUS RELEASES:$Revision: 1.97 
$


Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8:
@@ -1608,7 +1608,7 @@
counts (e.g. isofs). [mycroft 19941026]
Reworked part of the `mcd' driver to make it more reliable. [mycroft
19941026]
-	Made fork(2)ing with an user-defined LDT work (and not panic).  
[mycroft
+	Made fork(2)ing with a user-defined LDT work (and not panic).  
[mycroft

19941031]
upgraded diff, diff3, and sdiff to version 2.7. (jtc)
lorder(1): Fixed lorder manpage. From Brad Parker. (jtc)
@@ -2644,7 +2644,7 @@
underlying device and a printable external name
(name + unit number), thus eliminating if_name and if_unit.
Updated interface to (*if_watchdog)() and (*if_reset)()
-   to take a struct ifnet *, rather than an unit number.
+   to take a struct ifnet *, rather than a unit number.
[thorpej 19960506]
ethernet: made the MI LANCE driver standalone, using cfattach to
resolve naming conflicts on ports which can have more
@@ -3512,7 +3512,7 @@
new bus dma framework.  [thorpej 19970606]
alpha: Add support for SGMAP-mapped DMA, using new bus dma
framework, allowing ISA DMA to function.  [thorpej 19970606]
-   isa: convert isadma.c to be an user of new bus dma framework,
+   isa: convert isadma.c to be a user of new bus dma framework,
and convert all drivers that use it to the new API.
[thorpej 19970606]
New sysctl hw.machine_arch which returns the CPU class of a machine.
@@ -4307,7 +4307,7 @@
Sweep inspired by a discussion of a bug introduced in
OpenBSD on Bugtraq.  [thorpej 19980728]
libedit: add 'edit on|off' editrc command, which is used to advise
-   invoking programs if an user's does or doesn't want editline
+   invoking programs if a user's does or doesn't want editline
support. Modify ftp(1) to honour this.  [lukem 19980729]
	tftpd(8): add support for -u user and -g group, which specify the  
user

and group to run as. Fixes PR #4218.  [lukem 19980729]
@@ -4498,7 +4498,7 @@
newsmips: Switch to UVM by default on newsmips. [tsubai 19981116]
i386: Switch to gas.new on i386. [kristerw 19981116]
sparc: Switch to gas.new on sparc. [kristerw 19981116]
-   mbrlabel(8): Add an utility to access partitions on MBR labeled
+   mbrlabel(8): Add a utility to access partitions on MBR labeled
disks like those transferred from a DOS machine [ws 19981116]
pmax:  Add crunched miniroot distribution media [jonathan 19981116]
	kernel: Add support for detaching and activating/deactivating  
devices.

@@ -4749,7 +4749,7 @@
[bad 19990323]
dump(8): Add read cache. Speeds up dump operations in most cases
[bouyer,mjl 19990323]
-	net: prevent bind(2)ing to an unicast address/port if the uids of  
the

+   

Re: CVS commit: src/games/canfield/cfscores

2010-01-01 Thread Marc Balmer

Am 01.01.2010 um 07:20 schrieb David A. Holland:

 Module Name:  src
 Committed By: dholland
 Date: Fri Jan  1 06:20:45 UTC 2010
 
 Modified Files:
   src/games/canfield/cfscores: cfscores.c
 
 Log Message:
 Send error messages to stderr. Use errx/warnx, not printf.
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.17 -r1.18 src/games/canfield/cfscores/cfscores.c
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.
 
 Modified files:
 
 Index: src/games/canfield/cfscores/cfscores.c
 diff -u src/games/canfield/cfscores/cfscores.c:1.17 
 src/games/canfield/cfscores/cfscores.c:1.18
 --- src/games/canfield/cfscores/cfscores.c:1.17   Fri Jan  1 06:16:36 2010
 +++ src/games/canfield/cfscores/cfscores.cFri Jan  1 06:20:45 2010
 @@ -1,4 +1,4 @@
 -/*   $NetBSD: cfscores.c,v 1.17 2010/01/01 06:16:36 dholland Exp $   */
 +/*   $NetBSD: cfscores.c,v 1.18 2010/01/01 06:20:45 dholland Exp $   */
 
 /*
  * Copyright (c) 1983, 1993
 @@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = @(#)cfscores.c8.1 (Berkeley) 5/31/93;
 #else
 -__RCSID($NetBSD: cfscores.c,v 1.17 2010/01/01 06:16:36 dholland Exp $);
 +__RCSID($NetBSD: cfscores.c,v 1.18 2010/01/01 06:20:45 dholland Exp $);
 #endif
 #endif /* not lint */
 
 @@ -78,8 +78,7 @@
   setgid(getgid());
 
   if (argc  2) {
 - printf(Usage: cfscores -a | cfscores [user]\n);
 - exit(1);
 + errx(1, Usage: cfscores -a | cfscores [user]);

imo, lower case usage would be more consistent with other commands.

   }
   dbfd = open(_PATH_SCORE, O_RDONLY);
   if (dbfd  0)
 @@ -89,8 +88,7 @@
   uid = getuid();
   pw = getpwuid(uid);
   if (pw == 0) {
 - printf(You are not listed in the password file?!?\n);
 - exit(2);
 + errx(2, You are not listed in the password file?!?);
   }
   printuser(pw, 1);
   exit(0);
 @@ -102,8 +100,7 @@
   }
   pw = getpwnam(argv[1]);
   if (pw == 0) {
 - printf(User %s unknown\n, argv[1]);
 - exit(3);
 + errx(3, User %s unknown, argv[1]);
   }
   printuser(pw, 1);
   exit(0);
 @@ -122,7 +119,7 @@
   pos = pw-pw_uid * (off_t)sizeof(struct betinfo);
   /* test pos, not pw_uid; uid_t can be unsigned, which makes gcc warn */
   if (pos  0) {
 - printf(Bad uid %d\n, (int)pw-pw_uid);
 + warnx(Bad uid %d, (int)pw-pw_uid);
   return;
   }
   i = lseek(dbfd, pos, SEEK_SET);
 



Re: CVS commit: src/games/canfield/cfscores

2010-01-01 Thread Marc Balmer

Am 01.01.2010 um 18:35 schrieb David Holland:

 On Fri, Jan 01, 2010 at 03:33:26PM +0100, Marc Balmer wrote:
 if (argc  2) {
 -   printf(Usage: cfscores -a | cfscores [user]\n);
 -   exit(1);
 +   errx(1, Usage: cfscores -a | cfscores [user]);
 
 imo, lower case usage would be more consistent with other commands.
 
 Some grep usage suggests that lowercase outnumbers capitalized by a
 good margin, but there's still a healthy minority of capitalized usage
 messages. (It's about 500 to 125.)
 
 Is this something we care enough about to make a point of fixing it as
 we go?

with a ratio of 500:125, I am inclined to say no.

 
 -- 
 David A. Holland
 dholl...@netbsd.org



CVS commit: src/usr.sbin/syslogd

2010-01-01 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Fri Jan  1 21:26:18 UTC 2010

Modified Files:
src/usr.sbin/syslogd: syslog.conf.5

Log Message:
fold long lines.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/syslogd/syslog.conf.5

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



CVS commit: src/usr.sbin/wake

2010-01-03 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sun Jan  3 17:58:14 UTC 2010

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

Log Message:
Indicating the interface over which to send Wake on LAN frames is optional,
if the interface is not given on the command line, wake(8) will use the
first ethernet interface that is up and running.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/wake/wake.8
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/wake/wake.c

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



CVS commit: src/sys/arch/arm

2010-01-05 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Tue Jan  5 13:14:56 UTC 2010

Modified Files:
src/sys/arch/arm/arm32: fault.c
src/sys/arch/arm/ep93xx: eprtc.c
src/sys/arch/arm/gemini: gemini_obio.c gemini_pci.c gemini_timer.c
src/sys/arch/arm/s3c2xx0: s3c2410_extint.c

Log Message:
One semicolon is enough.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/arm/arm32/fault.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ep93xx/eprtc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/gemini/gemini_obio.c \
src/sys/arch/arm/gemini/gemini_pci.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_timer.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/s3c2xx0/s3c2410_extint.c

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



CVS commit: src/sys/arch

2010-01-05 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Tue Jan  5 13:20:30 UTC 2010

Modified Files:
src/sys/arch/hp700/dev: apic.c
src/sys/arch/powerpc/powerpc: trap.c
src/sys/arch/shark/shark: sequoia.c
src/sys/arch/vax/vax: trap.c
src/sys/arch/x86/x86: mpacpi.c

Log Message:
One semicolon only (;; - ;)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp700/dev/apic.c
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/powerpc/powerpc/trap.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/shark/shark/sequoia.c
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/vax/vax/trap.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/x86/x86/mpacpi.c

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



CVS commit: src/sys

2010-01-05 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Tue Jan  5 13:30:11 UTC 2010

Modified Files:
src/sys/dev/ic: isp.c isp_library.c mvsata.c
src/sys/fs/nilfs: nilfs_vnops.c
src/sys/fs/sysvbfs: sysvbfs_vnops.c
src/sys/fs/udf: udf_subr.c udf_vnops.c

Log Message:
Remove extra semicolons.


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/ic/isp.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/isp_library.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nilfs/nilfs_vnops.c
cvs rdiff -u -r1.24 -r1.25 src/sys/fs/sysvbfs/sysvbfs_vnops.c
cvs rdiff -u -r1.100 -r1.101 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.55 -r1.56 src/sys/fs/udf/udf_vnops.c

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



CVS commit: src/usr.bin/unzip

2010-01-09 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Jan  9 09:27:42 UTC 2010

Modified Files:
src/usr.bin/unzip: unzip.c

Log Message:
When restoring files, use the mode, not the filetype, for the mode.
From FreeBSD (r201630)


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/unzip/unzip.c

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



CVS commit: src/share/man/man4

2010-01-09 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Jan  9 09:44:41 UTC 2010

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

Log Message:
Fix date.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/faith.4

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



CVS commit: src/usr.sbin/faithd

2010-01-09 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Jan  9 10:43:12 UTC 2010

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

Log Message:
Various language fixes.
From FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/faithd/faithd.8

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



CVS commit: src/libexec/tftpd

2010-01-09 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Jan  9 10:46:31 UTC 2010

Modified Files:
src/libexec/tftpd: tftpd.c

Log Message:
fix build


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/libexec/tftpd/tftpd.c

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



CVS commit: src/usr.sbin/wake

2010-01-10 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sun Jan 10 19:40:12 UTC 2010

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

Log Message:
remove stupid casts.  if lint complains about return values that are ignored,
lint should fe fixed, and not code being cluttered.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/wake/wake.c

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



CVS commit: src/usr.sbin/rtsold

2010-01-11 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Mon Jan 11 09:21:39 UTC 2010

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

Log Message:
some wording fixes


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/rtsold/rtsold.8

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



CVS commit: src/usr.bin/midiplay

2010-01-16 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Jan 16 08:50:29 UTC 2010

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

Log Message:
fix wording:
instead of the a file - instead of a file


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/midiplay/midiplay.1

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



Re: tn3270 removal (was: CVS commit: src)

2010-01-16 Thread Marc Balmer

Am 16.01.2010 um 23:29 schrieb Bernd Ernesti:

 On Sat, Jan 16, 2010 at 03:34:26PM +, Roy Marples wrote:
 Module Name: src
 Committed By:roy
 Date:Sat Jan 16 15:34:26 UTC 2010
 [..]
 
 Log Message:
 Remove tn3270 from base system.
 If anyone really needs it then it can be put into pkgsrc.
 Importing c3270 into pkgsrc is probably a better option though.
 
 Where was this discussed before?

on tech-userlevel



CVS commit: src/games/fortune/strfile

2010-01-17 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sun Jan 17 13:35:00 UTC 2010

Modified Files:
src/games/fortune/strfile: strfile.8

Log Message:
The default output file extension is '.dat', not '.out'.
From Lars Nooden via OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/games/fortune/strfile/strfile.8

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



CVS commit: src/sys/dev/pci

2010-01-19 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Tue Jan 19 11:43:34 UTC 2010

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

Log Message:
Add two IBM RSS devices.


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

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



CVS commit: src/sys/dev/pci

2010-01-19 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Tue Jan 19 12:00:51 UTC 2010

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regenerate


To generate a diff of this commit:
cvs rdiff -u -r1.1011 -r1.1012 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1010 -r1.1011 src/sys/dev/pci/pcidevs_data.h

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



CVS commit: src/sys/dev/pci

2010-01-19 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Tue Jan 19 12:11:21 UTC 2010

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

Log Message:
Add the IBM 481033H SCC


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/pucdata.c

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



CVS commit: src/sys/dev/gpio

2010-01-24 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sun Jan 24 12:25:20 UTC 2010

Modified Files:
src/sys/dev/gpio: gpio.c

Log Message:
Unfold, bump copyright.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/gpio/gpio.c

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



Re: CVS commit: src/share/man/man4

2010-01-25 Thread Marc Balmer
Jukka,

Am 25.01.10 11:12, schrieb Jukka Ruohonen:
 Module Name:  src
 Committed By: jruoho
 Date: Mon Jan 25 10:12:41 UTC 2010
 
 Modified Files:
   src/share/man/man4: acpidalb.4
 
 Log Message:
 Recommit:
   * add verbosity to the PNP0C32 reference
   * use more markup
   * improve wording
 

You know that you quite easily change a commit message after commit?  So
in this case you could have just changed the commit message instead of
leaving us with an empty commit message.

I think you should still fix the empty commit message, it confuses
people that look at the cvs log.

- Marc

 
 To generate a diff of this commit:
 cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/acpidalb.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/acpidalb.4
 diff -u src/share/man/man4/acpidalb.4:1.4 src/share/man/man4/acpidalb.4:1.5
 --- src/share/man/man4/acpidalb.4:1.4 Mon Jan 25 10:05:14 2010
 +++ src/share/man/man4/acpidalb.4 Mon Jan 25 10:12:41 2010
 @@ -1,4 +1,4 @@
 -.\ $NetBSD: acpidalb.4,v 1.4 2010/01/25 10:05:14 jruoho Exp $
 +.\ $NetBSD: acpidalb.4,v 1.5 2010/01/25 10:12:41 jruoho Exp $
  .\
  .\ Copyright (c) 2008 Christoph Egger ceg...@netbsd.org
  .\ All rights reserved.
 @@ -31,23 +31,33 @@
  .Nm acpidalb
  .Nd Direct Application Launch Buttons
  .Sh SYNOPSIS
 -.Cd acpidalb*at acpi?
 +.Cd acpidalb* at acpi?
  .Sh DESCRIPTION
 -This driver provides support for PNP0C32 ACPI hotkeys aka
 +This driver provides support for
 +.Tn PNP0C32
 +.Tn ACPI
 +hotkeys a.k.a.
  .Dq The Direct Application Launch Buttons .
  .Pp
  These are recognized on startup from system-wake or at runtime.
  Behaviour may differ from the standard specification in relation
  to the ACPI implementation.
  .Pp
 -The hotkeys are reported to the power daemon as
 +The hotkeys are reported to the power management daemon as
  .Dv hotkey_button .
  .Sh SEE ALSO
  .Xr acpi 4 ,
  .Xr powerd 8
 -.Sh STANDARDS
 -This drivers conforms to the PNP0C32 specification provided at
 -.Lk http://www.microsoft.com/whdc/system/vista/DirAppLaunch.mspx
 +.Pp
 +The
 +.Tn PNP0C32
 +specification is described in:
 +.Rs
 +.%A Microsoft Corporation
 +.%D October 26, 2006
 +.%T Direct Application Launch from System Startup on Windows Vista
 +.%U http://www.microsoft.com/whdc/system/vista/DirAppLaunch.mspx
 +.Re
  .Sh HISTORY
  The
  .Nm
 



CVS commit: src/share/dict

2010-01-25 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Tue Jan 26 07:16:41 UTC 2010

Modified Files:
src/share/dict: web2

Log Message:
What a pleasure to fix a typo in Webster's... (Though the typo most probably
was not in it).


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/share/dict/web2

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



CVS commit: src/share

2010-01-28 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Thu Jan 28 14:05:03 UTC 2010

Modified Files:
src/share/doc/psd/05.sysman: 2.3.t
src/share/termcap: termcap.src

Log Message:
Fix language.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/doc/psd/05.sysman/2.3.t
cvs rdiff -u -r1.102 -r1.103 src/share/termcap/termcap.src

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



Re: CVS commit: src/external/bsd/liblzf/dist

2010-02-04 Thread Marc Balmer
Am 04.02.10 00:52, schrieb Christos Zoulas:
 In article 20100203170030.ga7...@panix.com,
 Thor Lancelot Simon  t...@panix.com wrote:
 On Wed, Feb 03, 2010 at 04:33:59PM +0100, Joerg Sonnenberger wrote:
 On Wed, Feb 03, 2010 at 12:44:39AM -0500, Thor Lancelot Simon wrote:
 It's a tiny, very very fast compression library.  Christos wants it
 for bootblocks, among other things (or so he says -- ask him).

 For boot blocks or boot loaders?

 Ask Christos.  I don't use it for that purpose myself (I use it for
 a number of other things a very fast compressor is useful for, like
 network data streams and backups).  I am guessing what he was after
 was small size and fast decompression (for some resource-constrained
 platform?).
 
 I wanted to evaluate using it at work, for data streaming. The discussion
 with Thor went like:
 Thor: I have it already integrated in my own tree, should I import it.
 Christos: Sure I think so; it is small enough and we don't have something
 else with similar functionality in the tree, LZO is GPL, and the rest are
 too big/complicated.
 
 The bottom line is that I had the code in my local tree, someone whose
 technical opinion I respect sufficiently to simply check it in on his
 request made the request, and so I did.

 As I said earlier, if you want to remove 3-5000 bytes from the system,
 I can recommend some much better candidates.
 
 I still think it is useful and it should stay, just because the code is
 so simple. It is not the best compressor, but it is a fast and easy to
 understand one. If you don't think so, I'll remove it.

Actually I totally agree with you, I also think it should stay.


Re: CVS commit: src/etc/rc.d

2010-02-16 Thread Marc Balmer

Am 16.02.10 03:46, schrieb matthew green:

Module Name:src
Committed By:   mrg
Date:   Tue Feb 16 02:46:02 UTC 2010

Modified Files:
src/etc/rc.d: fsck_root

Log Message:
only fsck / if we find it in /etc/fstab.  diskless systems don't need
a / entry.

XXX: still get an error from mount / in etc/rc.d/root itself.


There is a corner case that will now use an unchecked filesystem:  When 
you specify it during boot on the console.


Not sure if that is a real problem, though.


CVS commit: src/usr.bin/hexdump

2010-02-27 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Feb 27 10:45:23 UTC 2010

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

Log Message:
DEL is 0x7F, not 0xFF.  From FreeBSD via OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/hexdump/hexdump.1

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



CVS commit: src/usr.bin/hexdump

2010-02-27 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Feb 27 10:45:23 UTC 2010

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

Log Message:
DEL is 0x7F, not 0xFF.  From FreeBSD via OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/hexdump/hexdump.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/hexdump/hexdump.1
diff -u src/usr.bin/hexdump/hexdump.1:1.19 src/usr.bin/hexdump/hexdump.1:1.20
--- src/usr.bin/hexdump/hexdump.1:1.19	Wed Oct 14 17:44:59 2009
+++ src/usr.bin/hexdump/hexdump.1	Sat Feb 27 10:45:23 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: hexdump.1,v 1.19 2009/10/14 17:44:59 joerg Exp $
+.\	$NetBSD: hexdump.1,v 1.20 2010/02/27 10:45:23 mbalmer Exp $
 .\
 .\ Copyright (c) 1989, 1990, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\	from: @(#)hexdump.1	8.2 (Berkeley) 4/18/94
 .\
-.Dd April 18, 1994
+.Dd February 27, 2010
 .Dt HEXDUMP 1
 .Os
 .Sh NAME
@@ -242,7 +242,7 @@
 .It \00C\ ff\t00D\ cr\t00E\ so\t00F\ si\t010\ dle\t011\ dc1
 .It \012\ dc2\t013\ dc3\t014\ dc4\t015\ nak\t016\ syn\t017\ etb
 .It \018\ can\t019\ em\t01A\ sub\t01B\ esc\t01C\ fs\t01D\ gs
-.It \01E\ rs\t01F\ us\t0FF\ del
+.It \01E\ rs\t01F\ us\t07F\ del
 .El
 .El
 .Pp



Re: CVS commit: src/lib/libpthread

2010-05-17 Thread Marc Balmer
Am 16.05.10 14:23, schrieb Jukka Ruohonen:
 Module Name:  src
 Committed By: jruoho
 Date: Sun May 16 12:23:32 UTC 2010
 
 Modified Files:
   src/lib/libpthread: pthread.3
 
 Log Message:
 Add the Butenhof's book to SEE ALSO. (It was decent enough when I read it
 years ago, but if there are better ones, please feel free to add those.)

Is the SEE ALSO section meant to refer to external sources?  I always
thought it was only to reference other manpages.

Butenhof's book is a must read for serious pthread users, of course...

 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.13 -r1.14 src/lib/libpthread/pthread.3
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.
 
 
 
 
 Modified files:
 
 Index: src/lib/libpthread/pthread.3
 diff -u src/lib/libpthread/pthread.3:1.13 src/lib/libpthread/pthread.3:1.14
 --- src/lib/libpthread/pthread.3:1.13 Sun May 16 12:20:00 2010
 +++ src/lib/libpthread/pthread.3  Sun May 16 12:23:32 2010
 @@ -1,4 +1,4 @@
 -.\  $NetBSD: pthread.3,v 1.13 2010/05/16 12:20:00 jruoho Exp $
 +.\  $NetBSD: pthread.3,v 1.14 2010/05/16 12:23:32 jruoho Exp $
  .\
  .\ Copyright (c) 2003, 2007, 2009 The NetBSD Foundation, Inc.
  .\ All rights reserved.
 @@ -156,6 +156,13 @@
  for
  .Xr sh 1 ) .
  .El
 +.Sh SEE ALSO
 +.Rs
 +.%A David R. Butenhof
 +.%T Programming with POSIX(R) Threads
 +.%D 1997
 +.%I Addison-Wesley
 +.Re
  .Sh STANDARDS
  The
  .Nm
 



Re: CVS commit: src/distrib/sets/lists

2010-11-01 Thread Marc Balmer
Am 01.11.10 00:42, schrieb matthew green:
 Module Name: src
 Committed By:mbalmer
 Date:Sun Oct 31 16:31:12 UTC 2010

 Modified Files:
  src/distrib/sets/lists/base: md.amd64 md.sparc64
  src/distrib/sets/lists/comp: md.amd64 md.sparc64

 Log Message:
 Fix file lists for amd64 and sparc64 since on these arches 32bit versions of
 the libraries are built as well.
 
 did you get mips64*, too?

No.  That are the ad.mips64xx files, right?  Why are there two them?
For both endianesses of the CPU?

Does mips64 install in /usr/lib and /usr/lib/64 ?




Re: CVS commit: src/sys/fs/tmpfs

2011-05-14 Thread Marc Balmer
Am 10.05.11 02:34, schrieb Matt Thomas:
 Module Name:  src
 Committed By: matt
 Date: Tue May 10 00:34:26 UTC 2011
 
 Modified Files:
   src/sys/fs/tmpfs: tmpfs_vnops.c
 
 Log Message:
 yes, more C99 please (back out previous change).

After this committ/back-out/back-out-pf-the-back-out fest I have a
technical question:

What is the current state of C99 vs. older Cs?  Do all arches /
compilers we have support C99?  I assume gcc, llvm/clang are safe, but
what about pcc wrt C99?

I'd like a short clarification here, since this might influence my
coding...  tnx.

 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.79 -r1.80 src/sys/fs/tmpfs/tmpfs_vnops.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/fs/tmpfs/tmpfs_vnops.c
 diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.79 
 src/sys/fs/tmpfs/tmpfs_vnops.c:1.80
 --- src/sys/fs/tmpfs/tmpfs_vnops.c:1.79   Sun May  8 00:03:35 2011
 +++ src/sys/fs/tmpfs/tmpfs_vnops.cTue May 10 00:34:26 2011
 @@ -1,4 +1,4 @@
 -/*   $NetBSD: tmpfs_vnops.c,v 1.79 2011/05/08 00:03:35 christos Exp $
 */
 +/*   $NetBSD: tmpfs_vnops.c,v 1.80 2011/05/10 00:34:26 matt Exp $*/
  
  /*
   * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
 @@ -35,7 +35,7 @@
   */
  
  #include sys/cdefs.h
 -__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.79 2011/05/08 00:03:35 
 christos Exp $);
 +__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.80 2011/05/10 00:34:26 matt 
 Exp $);
  
  #include sys/param.h
  #include sys/dirent.h
 @@ -1466,8 +1466,7 @@
  
  #if defined(DEBUG)
   if (!error  pgs) {
 - int i;
 - for (i = 0; i  npages; i++) {
 + for (int i = 0; i  npages; i++) {
   KASSERT(pgs[i] != NULL);
   }
   }
 



Re: CVS commit: src/sys/fs/tmpfs

2011-05-14 Thread Marc Balmer
Am 14.05.11 10:45, schrieb Anders Magnusson:
[...]

 What is the current state of C99 vs. older Cs?  Do all arches /
 compilers we have support C99?  I assume gcc, llvm/clang are safe, but
 what about pcc wrt C99?
 pcc should be C99 compliant. If something do not work as expected, I'll
 fix it.

cool!  thanks for the update.

 
 -- Ragge

[...]


Re: CVS commit: src/etc

2011-07-29 Thread Marc Balmer
Am 29.07.11 10:03, schrieb Aleksej Saushev:
 Simon Burge sim...@netbsd.org writes:
 
 Module Name: src
 Committed By:simonb
 Date:Thu Jul 28 22:28:07 UTC 2011

 Modified Files:
  src/etc: ntp.conf

 Log Message:
 Restore duplicate entries, but use 0. and 1. names to ensure that
 same hosts aren't used by both entries.
 
  # Northern Europe
 -#server de.pool.ntp.org
 +#server 0.de.pool.ntp.org
 +#server 1.de.pool.ntp.org
  #server dk.pool.ntp.org
 
 This removes more useful information on how to setup NTP.
 I believe that I don't need to remember how many groups there're in
 ru.pool.ntp.org when DNS does that for me.
 (I think that previous version is correct, at least ru.pool.ntp.org
 seems to cycle through all servers in subpools.)

there should be a keyword 'servers' to make it clear that we expect more
than one IP address, i.e.

server xyz  - one IP
servers xzy  - several IPs




Re: CVS commit: src/distrib/sets/lists/comp

2011-08-06 Thread Marc Balmer
Am 06.08.11 18:29, schrieb Izumi Tsutsui:
 jruoho obsoleted the ieee(3) manpage; remove it from the list.
 
 It says:
 # Note: don't delete entries from here - mark them as obsolete instead.

All right, I reverted it,  jruoho can handle it.



Re: CVS commit: src

2011-08-06 Thread Marc Balmer
Am 06.08.11 21:52, schrieb John Nemeth:
 Module Name:  src
 Committed By: jnemeth
 Date: Sat Aug  6 19:52:49 UTC 2011
 
 Modified Files:
   src: BUILDING
 
 Log Message:
 Add description of MKKMOD, part of PR misc/45216

I wonder, if instead of duplicating the information here, we should
instead point to the mk.conf manual page, so that this information has
to be maintained in one place only?

 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.92 -r1.93 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.92 src/BUILDING:1.93
 --- src/BUILDING:1.92 Sat Jan 29 16:56:26 2011
 +++ src/BUILDING  Sat Aug  6 19:52:49 2011
 @@ -234,6 +234,11 @@
  
   Default: ``yes''
  
 + MKKMOD  Can be set to ``yes'' or ``no''.  Indicates whether kernel
 + modules are built and installed.
 +
 + Default: ``yes''
 +
   MKLINT  Can be set to ``yes'' or ``no''.  Indicates whether lint(1)
   will be run against portions of the NetBSD source code 
 during
   the build, and whether lint libraries will be installed into
 



Re: CVS commit: src/usr.sbin/chroot

2011-08-28 Thread Marc Balmer
Am 28.08.11 00:32, schrieb Joerg Sonnenberger:
 Module Name:  src
 Committed By: joerg
 Date: Sat Aug 27 22:32:44 UTC 2011
 
 Modified Files:
   src/usr.sbin/chroot: chroot.c
 
 Log Message:
 Use __dead. Move global variables into function scope.
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/chroot/chroot.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/chroot/chroot.c
 diff -u src/usr.sbin/chroot/chroot.c:1.16 src/usr.sbin/chroot/chroot.c:1.17
 --- src/usr.sbin/chroot/chroot.c:1.16 Mon Aug 15 14:43:17 2011
 +++ src/usr.sbin/chroot/chroot.c  Sat Aug 27 22:32:44 2011
 @@ -1,4 +1,4 @@
 -/*   $NetBSD: chroot.c,v 1.16 2011/08/15 14:43:17 wiz Exp $  */
 +/*   $NetBSD: chroot.c,v 1.17 2011/08/27 22:32:44 joerg Exp $*/
  
  /*
   * Copyright (c) 1988, 1993
 @@ -39,7 +39,7 @@
  #if 0
  static char sccsid[] = @(#)chroot.c 8.1 (Berkeley) 6/9/93;
  #else
 -__RCSID($NetBSD: chroot.c,v 1.16 2011/08/15 14:43:17 wiz Exp $);
 +__RCSID($NetBSD: chroot.c,v 1.17 2011/08/27 22:32:44 joerg Exp $);
  #endif
  #endif /* not lint */
  
 @@ -56,16 +56,14 @@
  #include string.h
  #include unistd.h
  
 -int  main(int, char **);
 -void usage(void) __dead;
 -
 -char *user;  /* user to switch to before running program */
 -char *group; /* group to switch to ... */
 -char *grouplist; /* group list to switch to ... */
 +static void  usage(void) __dead;
  
  int
  main(int argc, char *argv[])
  {
 + char*user;  /* user to switch to before running program */
 + char*group; /* group to switch to ... */
 + char*grouplist; /* group list to switch to ... */
   struct group*gp;
   struct passwd   *pw;
   char*endp, *p;
 @@ -175,7 +173,7 @@
   /* NOTREACHED */
  }
  
 -void
 +static void
  usage(void)
  {
  
 


-- 
  \~.The NetBSD Foundation
   \~'   Marc Balmer, Developer / Marketing
  NetBSD
 \   mbal...@netbsd.org   http://www.NetBSD.org/


Re: CVS commit: src/sys/arch/i386/conf

2011-08-29 Thread Marc Balmer
Am 29.08.11 11:38, schrieb Jukka Ruohonen:
 On Sat, Aug 27, 2011 at 09:28:56AM +, Marc Balmer wrote:
 Module Name: src
 Committed By:mbalmer
 Date:Sat Aug 27 09:28:56 UTC 2011

 Modified Files:
  src/sys/arch/i386/conf: GENERIC

 Log Message:
 Enable some gpio devices.
 
 Is onewire(4) really something to be enabled by default on i386?

Yes, why not?.  It is small enough and lets you access cheap temperature
sensors via gpiow(4).





Re: CVS commit: src/sys/arch/i386/conf

2011-08-29 Thread Marc Balmer
Am 29.08.11 14:53, schrieb Jukka Ruohonen:
 On Mon, Aug 29, 2011 at 02:48:52PM +0200, Marc Balmer wrote:
 Am 29.08.11 11:38, schrieb Jukka Ruohonen:
 On Sat, Aug 27, 2011 at 09:28:56AM +, Marc Balmer wrote:
 Module Name:   src
 Committed By:  mbalmer
 Date:  Sat Aug 27 09:28:56 UTC 2011

 Modified Files:
src/sys/arch/i386/conf: GENERIC

 Log Message:
 Enable some gpio devices.

 Is onewire(4) really something to be enabled by default on i386?

 Yes, why not?.  It is small enough and lets you access cheap temperature
 sensors via gpiow(4).
 
 Just that I have never seen a i386 system with onewire(4).

with gpioow(4) you can use it over gpio(4), and means many system, e.g.
all of Soekris, Alix, etc.

 
 (GENERIC as in: something common or descriptive for all members.)
 
 - Jukka.


Re: CVS commit: src/sys/arch

2011-08-30 Thread Marc Balmer
Am 30.08.11 12:33, schrieb Jukka Ruohonen:
 On Tue, Aug 30, 2011 at 06:28:20AM -0400, Jared McNeill wrote:
 Uh? The bktr driver works fine and the cards are still useful and they 
 drivers are not modularized.
 
 But in my opinion, like many things, it is not something to be enabled by
 default in the GENERIC kernels.

My standpoint is that working drivers should be enabled by default (new
ones maybe after some field testing).  So users can make the best use
of NetBSD.  They have some hardware, and NetBSD just supports it.


Re: CVS commit: src/share/man/man4

2011-08-30 Thread Marc Balmer
Am 30.08.11 18:22, schrieb Jukka Ruohonen:
 On Tue, Aug 30, 2011 at 10:10:05AM -0500, David Young wrote:

 The driver should be converted, however, I don't think that there is
 a case for bluntly removing bktr(4), 
 
 Yes, I was corrected already (the conversion should go towards video(4)).
 
 But as always, it is about picking the good defaults for GENERIC.

And why should GENERIC *not* support hardware that is available, works,
and is of use to someone?  If GENERIC is to support only the idea of
what an OS should look for some developers, why do we ship GENERIC at
all and not tell folks to create their own kernels?

I find this this-does-not-belong-in-GENERIC attitude of some folks
here quite unreasonable.  We have match and attach in autoconfiguration,
if the hardware is not present, no harm is done.  Oh don't tell me it's
the build time.  I rather think it is just because some folks *think*
that this and that should not be in GENERIC just because *they* don't
use it...


Re: CVS commit: src/share/man/man4

2011-08-30 Thread Marc Balmer
Am 30.08.11 18:44, schrieb Jukka Ruohonen:
 On Tue, Aug 30, 2011 at 06:33:18PM +0200, Marc Balmer wrote:
 Am 30.08.11 18:22, schrieb Jukka Ruohonen:
 And why should GENERIC *not* support hardware that is available, works,
 and is of use to someone?  If GENERIC is to support only the idea of
 what an OS should look for some developers, why do we ship GENERIC at
 all and not tell folks to create their own kernels?
 
 I don't disagree on principle.[1] But sooner or later you end up with
 tremendous amount legacy stuff and things that 0.001 % of people use.
 And then people go and compile their own kernels because of that.

To address this issue, I think we are slowly moving towards modularized
kernels.  So what I said is about drivers and kernel subsystem, that are
not yet available as modules.  But modules are still WIP, and I think
there are still a few problems left to be solved before we can say we
are an OS with a modular kernel.

 Do you think Linux distributions ship kernels with all their drivers
 compiled into one monolithic unit? And why not?

I don't care what Linux does.  This is BSD.  Memory does not matter.
There is no reason to not include stuff in a kernel.

 
 - Jukka.
 
 [1] For years, it was more than annoying that even the installation kernel
 lacked e.g. cgd(4). Even today, many *important* things are commented
 out, while many inane things from the early 1990s are compiled in.

And when uncomment sth you need, you get yelled at, USE YOUR OWN KERNEL
CONFIG


Re: CVS commit: src/tests/lib/libm

2011-09-13 Thread Marc Balmer
Am 12.09.11 18:28, schrieb Jukka Ruohonen:
 Module Name:  src
 Committed By: jruoho
 Date: Mon Sep 12 16:28:37 UTC 2011
 
 Modified Files:
   src/tests/lib/libm: t_ldexp.c t_scalbn.c t_tanh.c
 
 Log Message:
 Happiness of VAX implies ugliness of the code.

But does it make the VAX really happy, if all the code is just ifdef'ed
out?  Or did I get that wrong that the tests are now simply disabled on
the vax?

 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libm/t_ldexp.c \
 src/tests/lib/libm/t_scalbn.c
 cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libm/t_tanh.c
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.
 
 
 
 
 Modified files:
 
 Index: src/tests/lib/libm/t_ldexp.c
 diff -u src/tests/lib/libm/t_ldexp.c:1.2 src/tests/lib/libm/t_ldexp.c:1.3
 --- src/tests/lib/libm/t_ldexp.c:1.2  Mon Sep 12 15:47:14 2011
 +++ src/tests/lib/libm/t_ldexp.c  Mon Sep 12 16:28:37 2011
 @@ -1,4 +1,4 @@
 -/* $NetBSD: t_ldexp.c,v 1.2 2011/09/12 15:47:14 jruoho Exp $ */
 +/* $NetBSD: t_ldexp.c,v 1.3 2011/09/12 16:28:37 jruoho Exp $ */
  
  /*-
   * Copyright (c) 2011 The NetBSD Foundation, Inc.
 @@ -29,7 +29,7 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
  #include sys/cdefs.h
 -__RCSID($NetBSD: t_ldexp.c,v 1.2 2011/09/12 15:47:14 jruoho Exp $);
 +__RCSID($NetBSD: t_ldexp.c,v 1.3 2011/09/12 16:28:37 jruoho Exp $);
  
  #include math.h
  #include limits.h
 @@ -49,6 +49,7 @@
  
  ATF_TC_BODY(ldexp_nan, tc)
  {
 +#ifndef __vax__
   const double x = 0.0L / 0.0L;
   double y;
   size_t i;
 @@ -59,6 +60,7 @@
   y = ldexp(x, exps[i]);
   ATF_CHECK(isnan(y) != 0);
   }
 +#endif
  }
  
  ATF_TC(ldexp_inf_neg);
 @@ -69,11 +71,13 @@
  
  ATF_TC_BODY(ldexp_inf_neg, tc)
  {
 +#ifndef __vax__
   const double x = -1.0L / 0.0L;
   size_t i;
  
   for (i = 0; i  __arraycount(exps); i++)
   ATF_CHECK(ldexp(x, exps[i]) == x);
 +#endif
  }
  
  ATF_TC(ldexp_inf_pos);
 @@ -84,11 +88,13 @@
  
  ATF_TC_BODY(ldexp_inf_pos, tc)
  {
 +#ifndef __vax__
   const double x = 1.0L / 0.0L;
   size_t i;
  
   for (i = 0; i  __arraycount(exps); i++)
   ATF_CHECK(ldexp(x, exps[i]) == x);
 +#endif
  }
  
  ATF_TC(ldexp_zero_neg);
 @@ -99,6 +105,7 @@
  
  ATF_TC_BODY(ldexp_zero_neg, tc)
  {
 +#ifndef __vax__
   const double x = -0.0L;
   double y;
   size_t i;
 @@ -110,6 +117,7 @@
   ATF_CHECK(x == y);
   ATF_CHECK(signbit(y) != 0);
   }
 +#endif
  }
  
  ATF_TC(ldexp_zero_pos);
 @@ -120,6 +128,7 @@
  
  ATF_TC_BODY(ldexp_zero_pos, tc)
  {
 +#ifndef __vax__
   const double x = 0.0L;
   double y;
   size_t i;
 @@ -131,6 +140,7 @@
   ATF_CHECK(x == y);
   ATF_CHECK(signbit(y) == 0);
   }
 +#endif
  }
  
  ATF_TC(ldexpf_nan);
 @@ -141,6 +151,7 @@
  
  ATF_TC_BODY(ldexpf_nan, tc)
  {
 +#ifndef __vax__
   const float x = 0.0L / 0.0L;
   float y;
   size_t i;
 @@ -151,6 +162,7 @@
   y = ldexpf(x, exps[i]);
   ATF_CHECK(isnan(y) != 0);
   }
 +#endif
  }
  
  /*
 @@ -165,11 +177,13 @@
  
  ATF_TC_BODY(ldexpf_inf_neg, tc)
  {
 +#ifndef __vax__
   const float x = -1.0L / 0.0L;
   size_t i;
  
   for (i = 0; i  __arraycount(exps); i++)
   ATF_CHECK(ldexpf(x, exps[i]) == x);
 +#endif
  }
  
  ATF_TC(ldexpf_inf_pos);
 @@ -180,11 +194,13 @@
  
  ATF_TC_BODY(ldexpf_inf_pos, tc)
  {
 +#ifndef __vax__
   const float x = 1.0L / 0.0L;
   size_t i;
  
   for (i = 0; i  __arraycount(exps); i++)
   ATF_CHECK(ldexpf(x, exps[i]) == x);
 +#endif
  }
  
  ATF_TC(ldexpf_zero_neg);
 @@ -195,6 +211,7 @@
  
  ATF_TC_BODY(ldexpf_zero_neg, tc)
  {
 +#ifndef __vax__
   const float x = -0.0L;
   float y;
   size_t i;
 @@ -206,6 +223,7 @@
   ATF_CHECK(x == y);
   ATF_CHECK(signbit(y) != 0);
   }
 +#endif
  }
  
  ATF_TC(ldexpf_zero_pos);
 @@ -216,6 +234,7 @@
  
  ATF_TC_BODY(ldexpf_zero_pos, tc)
  {
 +#ifndef __vax__
   const float x = 0.0L;
   float y;
   size_t i;
 @@ -227,6 +246,7 @@
   ATF_CHECK(x == y);
   ATF_CHECK(signbit(y) == 0);
   }
 +#endif
  }
  
  ATF_TP_ADD_TCS(tp)
 Index: src/tests/lib/libm/t_scalbn.c
 diff -u src/tests/lib/libm/t_scalbn.c:1.2 src/tests/lib/libm/t_scalbn.c:1.3
 --- src/tests/lib/libm/t_scalbn.c:1.2 Mon Sep 12 15:47:14 2011
 +++ src/tests/lib/libm/t_scalbn.c Mon Sep 12 16:28:37 2011
 @@ -1,4 +1,4 @@
 -/* $NetBSD: t_scalbn.c,v 1.2 2011/09/12 15:47:14 jruoho Exp $ */
 +/* $NetBSD: t_scalbn.c,v 1.3 2011/09/12 16:28:37 jruoho Exp $ */
  
  /*-
   * Copyright (c) 2011 The NetBSD Foundation, Inc.
 @@ -29,7 +29,7 @@
   * POSSIBILITY OF SUCH DAMAGE.
   */
  #include sys/cdefs.h
 -__RCSID($NetBSD: t_scalbn.c,v 1.2 2011/09/12 15:47:14 jruoho Exp $);
 +__RCSID($NetBSD: t_scalbn.c,v 1.3 2011/09/12 16:28:37 jruoho Exp $);
  
  #include 

Re: CVS commit: src/usr.bin/audio/record

2011-09-22 Thread Marc Balmer

Am 21.09.2011 um 16:32 schrieb Christos Zoulas:

 Module Name:  src
 Committed By: christos
 Date: Wed Sep 21 14:32:14 UTC 2011
 
 Modified Files:
   src/usr.bin/audio/record: record.c
 
 Log Message:
 PR/45384: Henning Petersen: Swapped arguments in lseek
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.51 -r1.52 src/usr.bin/audio/record/record.c
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.
 
 Modified files:
 
 Index: src/usr.bin/audio/record/record.c
 diff -u src/usr.bin/audio/record/record.c:1.51 
 src/usr.bin/audio/record/record.c:1.52
 --- src/usr.bin/audio/record/record.c:1.51Sat Aug 27 21:17:48 2011
 +++ src/usr.bin/audio/record/record.c Wed Sep 21 10:32:14 2011
 @@ -1,4 +1,4 @@
 -/*   $NetBSD: record.c,v 1.51 2011/08/28 01:17:48 joerg Exp $*/
 +/*   $NetBSD: record.c,v 1.52 2011/09/21 14:32:14 christos Exp $ */
 
 /*
  * Copyright (c) 1999, 2002, 2003, 2005, 2010 Matthew R. Green
 @@ -32,7 +32,7 @@
 #include sys/cdefs.h
 
 #ifndef lint
 -__RCSID($NetBSD: record.c,v 1.51 2011/08/28 01:17:48 joerg Exp $);
 +__RCSID($NetBSD: record.c,v 1.52 2011/09/21 14:32:14 christos Exp $);
 #endif
 
 
 @@ -755,7 +755,7 @@
   if (outfd == STDOUT_FILENO)
   return;
 
 - if (lseek(outfd, SEEK_SET, 0)  0)
 + if (lseek(outfd, (off_t)0, SEEK_SET) == (off_t)-1)
   err(1, could not seek to start of file for header rewrite);

Fwiw, this never caused a problem since SEEK_SET is defined 0.  But why is an 
explicit typecast to off_t needed?  Aren't integer cast automatically?


write_header();
 
 }
 


Freundliche Grüsse,
micro systems

Marc Balmer

--
Marc Balmer
micro systems, Wiesendamm 2a, Postfach, 4019 Basel
fon +41 61 383 05 10, fax +41 61 383 05 12, http://www.msys.ch/



Re: CVS commit: src/usr.bin/audio/record

2011-09-22 Thread Marc Balmer

Am 22.09.2011 um 19:34 schrieb Christos Zoulas:

 In article dbe1242c-f99e-4b75-b356-516245aca...@msys.ch,
 Marc Balmer  m...@msys.ch wrote:
 if (outfd == STDOUT_FILENO)
 return;
 
 -   if (lseek(outfd, SEEK_SET, 0)  0)
 +   if (lseek(outfd, (off_t)0, SEEK_SET) == (off_t)-1)
 err(1, could not seek to start of file for header rewrite);
 
 Fwiw, this never caused a problem since SEEK_SET is defined 0.  But why
 is an explicit typecast to off_t needed?  Aren't integer cast
 automatically?
 
 It is belt-and-suspenders if the prototype is not in scope.
 

In this case, wouldn't it do the right thing even without a prototype in scope? 
 Would it even compile without a prototype in scope?




Re: CVS commit: src/sys/dev/pci

2011-10-08 Thread Marc Balmer
Am 08.10.11 12:44, schrieb Takeshi Nakayama:
 Marc Balmer mbal...@netbsd.org wrote
 
 Module Name: src
 Committed By:mbalmer
 Date:Sat Oct  8 10:21:16 UTC 2011

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

 Log Message:
 Make this compile again: Use the device_xname() macro to get the devic name.
 
 It should use aprint_error_dev() just like other messages.

I only fixed the obviously wrong argument to make it compile again.  I
leave functional changes to those that use this code.



Re: CVS commit: src/sys/arch/x86/x86

2011-10-18 Thread Marc Balmer
Am 18.10.11 06:27, schrieb Jukka Ruohonen:
 On Tue, Oct 18, 2011 at 12:07:45AM +, Jared D. McNeill wrote:
 Module Name: src
 Committed By:jmcneill
 Date:Tue Oct 18 00:07:45 UTC 2011

 Modified Files:
  src/sys/arch/x86/x86: vmt.c

 Log Message:
 don't allow module autounload
 
 I wonder should autounloading be prohibited for all driver-class modules?

Why?  When the parent goes away, why not autounload a driver?



Re: CVS commit: src/sys/arch/x86/x86

2011-10-18 Thread Marc Balmer
Am 18.10.11 12:39, schrieb Jared McNeill:
 I would argue that any manually loaded module shouldn't be autounloaded.
 What do you think about flagging modules as autoloaded and only
 autounloading the autoloaded ones?

I'd say that is a safe way.  I am for it.

 
 
 On Tue, 18 Oct 2011, Jukka Ruohonen wrote:
 
 On Tue, Oct 18, 2011 at 08:43:46AM +0200, Marc Balmer wrote:
 Am 18.10.11 06:27, schrieb Jukka Ruohonen:
 On Tue, Oct 18, 2011 at 12:07:45AM +, Jared D. McNeill wrote:
 Module Name:src
 Committed By:jmcneill
 Date:Tue Oct 18 00:07:45 UTC 2011

 Modified Files:
 src/sys/arch/x86/x86: vmt.c

 Log Message:
 don't allow module autounload

 I wonder should autounloading be prohibited for all driver-class
 modules?

 Why?  When the parent goes away, why not autounload a driver?

 I am not sure. But have we thought about all the consequences and corner-
 cases? Unloading happens while modifying hardware state? Deferred calls
 in the drivers? And so on? To me it also seems that if I manually load
 a driver-module, I expect it to stay loaded until I unload it.

 - Jukka.




-- 
  \~.The NetBSD Foundation
   \~'   Marc Balmer, Developer / Marketing
  NetBSD
 \   mbal...@netbsd.org   http://www.NetBSD.org/


Re: CVS commit: src/sys/arch/x86/x86

2011-10-18 Thread Marc Balmer
Am 18.10.11 13:44, schrieb Iain Hibbert:
 On Tue, 18 Oct 2011, Jukka Ruohonen wrote:
 
 On Tue, Oct 18, 2011 at 06:39:49AM -0400, Jared McNeill wrote:
 I would argue that any manually loaded module shouldn't be autounloaded.
 What do you think about flagging modules as autoloaded and only
 autounloading the autoloaded ones?

When I manually load gpiosim, it will autoload gpio.  Now when I
manually modunload gpiosim, gpio will stay there.  But in this case, I
want gpio to be autounloaded eventually.


 That sounds right to me.

 As noted, generally I am not sure what my opinion about autounloading really
 is. But it feels somewhat awkward and error-prone that drivers must protect
 themselves against the autounloading kthread.
 
 How often is autounloading actually effectively used anyway?  I mean, if
 the module is loaded automatically, it is because the system found that it
 was needed.
 
 So, yes.. there situation where eg USB or PCMCIA devices might have a
 transient need for a driver, but on the other hand, the overhead of a
 driver being in memory is not that great considering that you used it
 once, as the chance of re-use is significant (higher by far than all the
 other drivers that have never been needed)
 
 The real benefit of the modular system is that you don't need to load
 hundreds of modules on the off chance that they will be used. A cron entry
 could be used to flush unused modules if the sysop cares about that, why
 do we need a kthread running?
 


Re: CVS commit: src/share/man/man5

2011-11-07 Thread Marc Balmer
Am 07.11.11 09:24, schrieb Matthias Scheler:
 On Mon, Nov 07, 2011 at 06:51:58AM +0200, Jukka Ruohonen wrote:
 On Sun, Nov 06, 2011 at 10:34:48PM +, Matthias Scheler wrote:
 Module Name:src
 Committed By:   tron
 Date:   Sun Nov  6 22:34:48 UTC 2011

 Modified Files:
 src/share/man/man5: mk.conf.5

 Log Message:
 Stack-smash protection is not enabled by default, at least not for
 the complete source-tree.

 Pointed out by bch on current-users mailing list.

 Wasn't there an explicit decision to enable it by default?
 
 Yes, for kernel builds.

What was the reason to not enable it for userland?



Re: CVS commit: src/share/man/man5

2011-11-07 Thread Marc Balmer
Am 07.11.11 21:01, schrieb Joerg Sonnenberger:
 On Mon, Nov 07, 2011 at 02:27:03PM +0200, Jukka Ruohonen wrote:
 On Mon, Nov 07, 2011 at 10:20:38AM +0100, Joerg Sonnenberger wrote:
 The majority of interesting programs already have USE_FORT=yes.

 But USE_FORT is not the same thing as USE_SSP.
 
 It is stronger.

How so?  Please explain the difference.


Re: CVS commit: src/lib/libc/string

2011-11-25 Thread Marc Balmer
 reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *notice, this list of conditions and the following disclaimer in the
 + *documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 + * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 + * SUCH DAMAGE.
 + */
 +
 +/*
 + * Bloom filter for fast test if a given character is part of the reject set.
 + * The test may have false positives, but doesn't have false negatives.
 + * The first hash function is designed to be very fast to evaluate.
 + * It is collision free if the input is part of the same European language
 + * and shouldn't be too bad even other input.  The second hash function
 + * tries to provide a much better mixing, but involves the slower
 + * multiplication.
 + */
 +
 +#define  BLOOM_SIZE  64
 +#define  BLOOM_ARRAY_SIZE(BLOOM_SIZE / sizeof(size_t))
 +#define  BLOOM_MASK  (BLOOM_SIZE * 8 - 1)
 +#define  BLOOM_DIV   (sizeof(size_t) * 8)
 +
 +static inline size_t
 +wcscspn_bloom1(size_t x)
 +{
 + return x  BLOOM_MASK;
 +}
 +
 +static inline size_t
 +wcscspn_bloom2(size_t x)
 +{
 + return (uint32_t)(x * 2654435761U) /
 + (0x1ULL / (BLOOM_MASK + 1));
 +}
 +
 +static inline void
 +wcsspn_bloom_init(size_t *bloom, const wchar_t *charset)
 +{
 + size_t val;
 +
 + memset(bloom, 0, BLOOM_SIZE);
 + do {
 + val = wcscspn_bloom1((size_t)*charset);
 + bloom[val / BLOOM_DIV] |= 1ULL  (val % BLOOM_DIV);
 + val = wcscspn_bloom2((size_t)*charset);
 + bloom[val / BLOOM_DIV] |= 1ULL  (val % BLOOM_DIV);
 + }
 + while (*++charset);
 +}
 +
 +static inline int
 +wcsspn_in_bloom(const size_t *bloom, wchar_t ch)
 +{
 + size_t val;
 +
 + val = wcscspn_bloom1((size_t)ch);
 + if (bloom[val / BLOOM_DIV]  (1ULL  (val % BLOOM_DIV)))
 + return 1;
 + val = wcscspn_bloom2((size_t)ch);
 + if (bloom[val / BLOOM_DIV]  (1ULL  (val % BLOOM_DIV)))
 + return 1;
 + return 0;
 +}
 


-- 
  \~.The NetBSD Foundation
   \~'   Marc Balmer, Developer / Marketing
  NetBSD
 \   mbal...@netbsd.org   http://www.NetBSD.org/


Re: CVS commit: src/sys/dev/pci

2012-02-14 Thread Marc Balmer
 ichsmb_softc *sc = cookie;
  
 - if (cold || sc-sc_poll || (flags  I2C_F_POLL))
 + if (cold)
   return 0;
  
 - rw_enter(sc-sc_i2c_rwlock, RW_WRITER);
 + mutex_enter(sc-sc_i2c_mutex);
   return 0;
  }
  
 @@ -198,10 +198,10 @@ ichsmb_i2c_release_bus(void *cookie, int
  {
   struct ichsmb_softc *sc = cookie;
  
 - if (cold || sc-sc_poll || (flags  I2C_F_POLL))
 + if (cold)
   return;
  
 - rw_exit(sc-sc_i2c_rwlock);
 + mutex_exit(sc-sc_i2c_mutex);
  }
  
  static int
 
 Index: src/sys/dev/pci/nfsmb.c
 diff -u src/sys/dev/pci/nfsmb.c:1.22 src/sys/dev/pci/nfsmb.c:1.23
 --- src/sys/dev/pci/nfsmb.c:1.22  Mon Jan 30 19:41:22 2012
 +++ src/sys/dev/pci/nfsmb.c   Tue Feb 14 15:08:07 2012
 @@ -1,4 +1,4 @@
 -/*   $NetBSD: nfsmb.c,v 1.22 2012/01/30 19:41:22 drochner Exp $  */
 +/*   $NetBSD: nfsmb.c,v 1.23 2012/02/14 15:08:07 pgoyette Exp $  */
  /*
   * Copyright (c) 2007 KIYOHARA Takashi
   * All rights reserved.
 @@ -26,13 +26,13 @@
   *
   */
  #include sys/cdefs.h
 -__KERNEL_RCSID(0, $NetBSD: nfsmb.c,v 1.22 2012/01/30 19:41:22 drochner Exp 
 $);
 +__KERNEL_RCSID(0, $NetBSD: nfsmb.c,v 1.23 2012/02/14 15:08:07 pgoyette Exp 
 $);
  
  #include sys/param.h
  #include sys/device.h
  #include sys/errno.h
  #include sys/kernel.h
 -#include sys/rwlock.h
 +#include sys/mutex.h
  #include sys/proc.h
  
  #include sys/bus.h
 @@ -73,7 +73,7 @@ struct nfsmb_softc {
   bus_space_handle_t sc_ioh;
  
   struct i2c_controller sc_i2c;   /* i2c controller info */
 - krwlock_t sc_rwlock;
 + kmutex_t sc_mutex;
  };
  
  
 @@ -237,7 +237,7 @@ nfsmb_attach(device_t parent, device_t s
   sc-sc_i2c.ic_write_byte = NULL;
   sc-sc_i2c.ic_exec = nfsmb_exec;
  
 - rw_init(sc-sc_rwlock);
 + mutex_init(sc-sc_mutex, MUTEX_DEFAULT, IPL_NONE);
  
   if (bus_space_map(sc-sc_iot, nfsmbcap-nfsmb_addr, NFORCE_SMBSIZE, 0,
   sc-sc_ioh) != 0) {
 @@ -261,7 +261,7 @@ nfsmb_acquire_bus(void *cookie, int flag
  {
   struct nfsmb_softc *sc = cookie;
  
 - rw_enter(sc-sc_rwlock, RW_WRITER);
 + mutex_enter(sc-sc_mutex);
   return 0;
  }
  
 @@ -270,7 +270,7 @@ nfsmb_release_bus(void *cookie, int flag
  {
   struct nfsmb_softc *sc = cookie;
  
 - rw_exit(sc-sc_rwlock);
 + mutex_exit(sc-sc_mutex);
  }
  
  static int
 
 Index: src/sys/dev/pci/piixpm.c
 diff -u src/sys/dev/pci/piixpm.c:1.39 src/sys/dev/pci/piixpm.c:1.40
 --- src/sys/dev/pci/piixpm.c:1.39 Mon Jan 30 19:41:22 2012
 +++ src/sys/dev/pci/piixpm.c  Tue Feb 14 15:08:07 2012
 @@ -1,4 +1,4 @@
 -/* $NetBSD: piixpm.c,v 1.39 2012/01/30 19:41:22 drochner Exp $ */
 +/* $NetBSD: piixpm.c,v 1.40 2012/02/14 15:08:07 pgoyette Exp $ */
  /*   $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $  */
  
  /*
 @@ -22,13 +22,13 @@
   */
  
  #include sys/cdefs.h
 -__KERNEL_RCSID(0, $NetBSD: piixpm.c,v 1.39 2012/01/30 19:41:22 drochner Exp 
 $);
 +__KERNEL_RCSID(0, $NetBSD: piixpm.c,v 1.40 2012/02/14 15:08:07 pgoyette Exp 
 $);
  
  #include sys/param.h
  #include sys/systm.h
  #include sys/device.h
  #include sys/kernel.h
 -#include sys/rwlock.h
 +#include sys/mutex.h
  #include sys/proc.h
  
  #include sys/bus.h
 @@ -82,7 +82,7 @@ struct piixpm_softc {
   pcireg_tsc_id;
  
   struct i2c_controller   sc_i2c_tag;
 - krwlock_t   sc_i2c_rwlock;
 + kmutex_tsc_i2c_mutex;
   struct {
   i2c_op_t op;
   void *  buf;
 @@ -251,7 +251,7 @@ nopowermanagement:
  
  attach_i2c:
   /* Attach I2C bus */
 - rw_init(sc-sc_i2c_rwlock);
 + mutex_init(sc-sc_i2c_mutex, MUTEX_DEFAULT, IPL_NONE);
   sc-sc_i2c_tag.ic_cookie = sc;
   sc-sc_i2c_tag.ic_acquire_bus = piixpm_i2c_acquire_bus;
   sc-sc_i2c_tag.ic_release_bus = piixpm_i2c_release_bus;
 @@ -331,6 +331,7 @@ piixpm_sb800_init(struct piixpm_softc *s
   aprint_error_dev(sc-sc_dev, can't map smbus I/O space\n);
   return EBUSY;
   }
 + aprint_normal_dev(sc-sc_dev, polling (SB800)\n);
   sc-sc_poll = 1;
  
   return 0;
 @@ -362,10 +363,9 @@ piixpm_i2c_acquire_bus(void *cookie, int
  {
   struct piixpm_softc *sc = cookie;
  
 - if (cold || sc-sc_poll || (flags  I2C_F_POLL))
 - return (0);
 + if (!cold)
 + mutex_enter(sc-sc_i2c_mutex);
  
 - rw_enter(sc-sc_i2c_rwlock, RW_WRITER);
   return 0;
  }
  
 @@ -374,10 +374,8 @@ piixpm_i2c_release_bus(void *cookie, int
  {
   struct piixpm_softc *sc = cookie;
  
 - if (cold || sc-sc_poll || (flags  I2C_F_POLL))
 - return;
 -
 - rw_exit(sc-sc_i2c_rwlock);
 + if (!cold)
 + mutex_exit(sc-sc_i2c_mutex);
  }
  
  static int
 


-- 
  \~.The NetBSD Foundation
   \~'   Marc Balmer, Developer / Marketing
  NetBSD
 \   mbal...@netbsd.org   http://www.NetBSD.org/


Re: CVS commit: src/external/bsd/pkg_install/dist

2012-02-21 Thread Marc Balmer
Am 21.02.12 19:27, schrieb Thomas Klausner:
 Module Name:  src
 Committed By: wiz
 Date: Tue Feb 21 18:27:05 UTC 2012
 
 Modified Files:
   src/external/bsd/pkg_install/dist/add: perform.c
   src/external/bsd/pkg_install/dist/lib: version.h
 
 Log Message:
 melt snowflakes

What does that mean?  Please explain and bump date for previous.

 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/add/perform.c
 cvs rdiff -u -r1.8 -r1.9 src/external/bsd/pkg_install/dist/lib/version.h
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.
 
 
 
 
 Modified files:
 
 Index: src/external/bsd/pkg_install/dist/add/perform.c
 diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.2 
 src/external/bsd/pkg_install/dist/add/perform.c:1.3
 --- src/external/bsd/pkg_install/dist/add/perform.c:1.2   Tue Feb 21 
 13:32:45 2012
 +++ src/external/bsd/pkg_install/dist/add/perform.c   Tue Feb 21 18:27:05 2012
 @@ -1,4 +1,4 @@
 -/*   $NetBSD: perform.c,v 1.2 2012/02/21 13:32:45 wiz Exp $  */
 +/*   $NetBSD: perform.c,v 1.3 2012/02/21 18:27:05 wiz Exp $  */
  #if HAVE_CONFIG_H
  #include config.h
  #endif
 @@ -6,7 +6,7 @@
  #if HAVE_SYS_CDEFS_H
  #include sys/cdefs.h
  #endif
 -__RCSID($NetBSD: perform.c,v 1.2 2012/02/21 13:32:45 wiz Exp $);
 +__RCSID($NetBSD: perform.c,v 1.3 2012/02/21 18:27:05 wiz Exp $);
  
  /*-
   * Copyright (c) 2003 Grant Beattie gr...@netbsd.org
 
 Index: src/external/bsd/pkg_install/dist/lib/version.h
 diff -u src/external/bsd/pkg_install/dist/lib/version.h:1.8 
 src/external/bsd/pkg_install/dist/lib/version.h:1.9
 --- src/external/bsd/pkg_install/dist/lib/version.h:1.8   Sun Feb 19 
 17:49:09 2012
 +++ src/external/bsd/pkg_install/dist/lib/version.h   Tue Feb 21 18:27:05 2012
 @@ -1,4 +1,4 @@
 -/*   $NetBSD: version.h,v 1.8 2012/02/19 17:49:09 tron Exp $ */
 +/*   $NetBSD: version.h,v 1.9 2012/02/21 18:27:05 wiz Exp $  */
  
  /*
   * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
 @@ -27,6 +27,6 @@
  #ifndef _INST_LIB_VERSION_H_
  #define _INST_LIB_VERSION_H_
  
 -#define PKGTOOLS_VERSION 20120128
 +#define PKGTOOLS_VERSION 20120221
  
  #endif /* _INST_LIB_VERSION_H_ */
 


Re: CVS commit: src/distrib/utils/sysinst

2012-03-01 Thread Marc Balmer
Am 01.03.12 17:31, schrieb Izumi Tsutsui:
 Module Name: src
 Committed By:mbalmer
 Date:Thu Mar  1 16:22:16 UTC 2012

 Modified Files:
  src/distrib/utils/sysinst: msg.mbr.de msg.mbr.en msg.mbr.es msg.mbr.fr
  msg.mbr.pl msg.mi.de msg.mi.en msg.mi.es msg.mi.fr msg.mi.pl
  src/distrib/utils/sysinst/arch/arc: msg.md.en
  src/distrib/utils/sysinst/arch/atari: msg.md.de msg.md.en msg.md.es
  src/distrib/utils/sysinst/arch/cobalt: msg.md.en
  src/distrib/utils/sysinst/arch/evbarm: msg.md.de msg.md.en msg.md.es
  src/distrib/utils/sysinst/arch/hp300: msg.md.de
  src/distrib/utils/sysinst/arch/i386: msg.md.de msg.md.en msg.md.es
  msg.md.pl
  src/distrib/utils/sysinst/arch/mac68k: msg.md.de msg.md.en msg.md.es
  msg.md.pl
  src/distrib/utils/sysinst/arch/ofppc: msg.md.en msg.md.es msg.md.pl
  src/distrib/utils/sysinst/arch/prep: msg.md.en msg.md.es msg.md.pl
  src/distrib/utils/sysinst/arch/sparc: msg.md.de msg.md.en msg.md.es
  src/distrib/utils/sysinst/arch/x68k: msg.md.pl

 Log Message:
 Put back spaces at EOL where needed (in a message file, a space at EOL
 means a line break, a line break means a space...)
 This should fix PR 46042.
 
 Did you check all changes?

I mechanically reverted all whitespace changes so we have the state we
had before the copyright changes.

 
 Trailing spaces in most of MD msg files are not line break,
 but actually extra junk.
 
 It looks only following files needs to be changed:
 src/distrib/utils/sysinst/msg.mbr.de
 src/distrib/utils/sysinst/msg.mbr.en
 src/distrib/utils/sysinst/msg.mbr.es
 src/distrib/utils/sysinst/msg.mbr.fr
 src/distrib/utils/sysinst/msg.mbr.pl
 src/distrib/utils/sysinst/msg.mi.de
 src/distrib/utils/sysinst/msg.mi.en
 src/distrib/utils/sysinst/msg.mi.es
 src/distrib/utils/sysinst/msg.mi.fr
 src/distrib/utils/sysinst/msg.mi.pl
 src/distrib/utils/sysinst/arch/evbarm/msg.md.de
 src/distrib/utils/sysinst/arch/i386/msg.md.en
 
 ---
 Izumi Tsutsui


-- 
  \~.The NetBSD Foundation
   \~'   Marc Balmer, Developer / Marketing
  NetBSD
 \   mbal...@netbsd.org   http://www.NetBSD.org/


Re: CVS commit: [netbsd-5] src

2012-11-08 Thread Marc Balmer

 Rename wake(8) to wakeonlan(8).  Approved by core@.


it works over wlan, too, btw:

wlan - bridging ap - lan - target device



Re: CVS commit: src/usr.bin/mkubootimage

2012-11-29 Thread Marc Balmer
Comments inline...


 Module Name:  src
 Committed By: reed
 Date: Thu Nov 29 23:23:23 UTC 2012
 
 Added Files:
   src/usr.bin/mkubootimage: mkubootimage.1
 
 Log Message:
 Add a manual for mkubootimage(1). It was missing.
 It had one review on netbsd-docs@.
 I didn't add the manual to the Makefile nor distrib set yet --
 waiting for more review or improvements first.
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r0 -r1.1 src/usr.bin/mkubootimage/mkubootimage.1
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.
 
 Added files:
 
 Index: src/usr.bin/mkubootimage/mkubootimage.1
 diff -u /dev/null src/usr.bin/mkubootimage/mkubootimage.1:1.1
 --- /dev/null Thu Nov 29 23:23:23 2012
 +++ src/usr.bin/mkubootimage/mkubootimage.1   Thu Nov 29 23:23:22 2012
 @@ -0,0 +1,162 @@
 +.\  $NetBSD: mkubootimage.1,v 1.1 2012/11/29 23:23:22 reed Exp $
 +.\
 +.\ Copyright (c) 2012 The NetBSD Foundation, Inc.
 +.\ All rights reserved.
 +.\
 +.\ This code is derived from software contributed to The NetBSD Foundation
 +.\ by Jeremy C. Reed
 +.\
 +.\ Redistribution and use in source and binary forms, with or without
 +.\ modification, are permitted provided that the following conditions
 +.\ are met:
 +.\ 1. Redistributions of source code must retain the above copyright
 +.\notice, this list of conditions and the following disclaimer.
 +.\ 2. Redistributions in binary form must reproduce the above copyright
 +.\notice, this list of conditions and the following disclaimer in the
 +.\documentation and/or other materials provided with the distribution.
 +.\
 +.\ THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
 LIMITED
 +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
 PARTICULAR
 +.\ PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 +.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 +.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 +.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 +.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 +.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 +.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 
 THE
 +.\ POSSIBILITY OF SUCH DAMAGE.
 +.\
 +.Dd November 28, 2012
 +.Dt MKUBOOTIMAGE 1
 +.Os
 +.Sh NAME
 +.Nm mkubootimage
 +.Nd create U-Boot loader image
 +.Sh SYNOPSIS
 +.Nm
 +.Fl A No ( arm Ns | Ns mips Ns | Ns mips64 Ns | Ns powerpc )
 +.Fl a Ar address
 +.Op Fl C No Po bz2 Ns | Ns gz Ns | Ns lzma Ns | Ns lzo Ns | Ns none Pc
 +.Op Fl E Ar address
 +.Op Fl e Ar address
 +.Op Fl h
 +.Op Fl m Ar magic
 +.Fl n Ar image
 +.Op Fl O No Po freebsd Ns | Ns linux Ns | Ns netbsd Ns | Ns openbsd Pc
 +.Fl T No ( fs Ns | Ns kernel Ns | Ns ramdisk Ns | Ns standalone )
 +.Ar source destination
 +.\
 +.Sh DESCRIPTION
 +The
 +.Nm
 +utility is used to create an image for Das U-Boot, the
 +.Qq Universal Boot Loader .
 +.Pp
 +The arguments are as follows:
 +.Bl -tag -width indent
 +.It Fl A No ( arm Ns | Ns mips Ns | Ns mips64 Ns | Ns powerpc )
 +Defines the architecture.
 +This is required.
 +.It Fl a Ar address
 +Sets the image load address.
 +This is an integer between 0 and ULONG_MAX.

Maybe note where ULONG_MAX is defined or specify the value here

and ULONG_MAX as defined in //X.h

 +This is required.
 +.It Fl C No ( bz2 Ns | Ns gz Ns | Ns lzma Ns | Ns lzo Ns | Ns none Ns )
 +Defines the compression.
 +The default is
 +.Qq none .
 +.It Fl E Ar address
 +Define the entry point.
 +This is an integer between 0 and ULONG_MAX.
 +This option is the same as
 +.Fl e
 +but it inverts the bytes to convert the 32 bit integer
 +from little to big endian (or vice versa).
 +If
 +.Fl E
 +or
 +.Fl e
 +are not set, the entry point defaults to the
 +image load address
 +.Pq Fl a .
 +.It Fl e Ar address
 +Define the entry point.
 +This is an integer between 0 and ULONG_MAX.
 +If
 +.Fl E
 +or
 +.Fl e
 +are not set, the entry point defaults to the
 +image load address
 +.Pq Fl a .
 +.It Fl h
 +Display the usage and exit.
 +.It Fl m Ar magic
 +Set the magic.
 +This is an integer between 0 and ULONG_MAX.
 +The default is
 +.Qq 0x27051956.
 +.It Fl n Ar image
 +Defines the image name.
 +This is required.
 +.It Fl O No ( freebsd Ns | Ns linux Ns | Ns netbsd Ns | Ns openbsd )
 +Defines the operating system type.
 +The default OS name is
 +.Qq netbsd .
 +.It Fl T No ( fs Ns | Ns kernel Ns | Ns ramdisk Ns | Ns standalone )
 +Defines the image type.
 +This is required.
 +.El
 +.Pp
 +The required
 +.Ar source
 +argument is the filename of the kernel that is read.
 +The required
 +.Ar destination
 +argument is the filename of the image file that is created.
 +.\
 +.Sh RETURN VALUES
 +.Nm
 +returns 1 on failure to read the kernel,
 +generate a header, or 

Re: CVS commit: src/etc/rc.d

2012-12-04 Thread Marc Balmer

Am 04.12.2012 um 17:38 schrieb Patrick Welche pr...@netbsd.org:

 Module Name:  src
 Committed By: prlw1
 Date: Tue Dec  4 16:38:40 UTC 2012
 
 Modified Files:
   src/etc/rc.d: ntpd ppp
 
 Log Message:
 Make sure that ntpd creates a pid file for the rc machinery to work.
 http://mail-index.netbsd.org/current-users/2012/11/19/msg021518.html

How is that related to ppp?  Was that an accidental commit?

 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.13 -r1.14 src/etc/rc.d/ntpd
 cvs rdiff -u -r1.8 -r1.9 src/etc/rc.d/ppp
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.
 
 Modified files:
 
 Index: src/etc/rc.d/ntpd
 diff -u src/etc/rc.d/ntpd:1.13 src/etc/rc.d/ntpd:1.14
 --- src/etc/rc.d/ntpd:1.13Fri Aug 13 18:08:03 2004
 +++ src/etc/rc.d/ntpd Tue Dec  4 16:38:40 2012
 @@ -1,6 +1,6 @@
 #!/bin/sh
 #
 -# $NetBSD: ntpd,v 1.13 2004/08/13 18:08:03 mycroft Exp $
 +# $NetBSD: ntpd,v 1.14 2012/12/04 16:38:40 prlw1 Exp $
 #
 
 # PROVIDE: ntpd
 @@ -19,6 +19,7 @@ required_files=/etc/ntp.conf
 
 ntpd_precmd()
 {
 + rc_flags=-p ${pidfile} $rc_flags
   if [ -z $ntpd_chrootdir ]; then
   return 0;
   fi
 
 Index: src/etc/rc.d/ppp
 diff -u src/etc/rc.d/ppp:1.8 src/etc/rc.d/ppp:1.9
 --- src/etc/rc.d/ppp:1.8  Mon Oct 11 15:00:51 2004
 +++ src/etc/rc.d/ppp  Tue Dec  4 16:38:40 2012
 @@ -1,6 +1,6 @@
 #!/bin/sh
 #
 -# $NetBSD: ppp,v 1.8 2004/10/11 15:00:51 christos Exp $
 +# $NetBSD: ppp,v 1.9 2012/12/04 16:38:40 prlw1 Exp $
 #
 
 # PROVIDE: ppp
 @@ -14,6 +14,7 @@
 $_rc_subr_loaded . /etc/rc.subr
 
 name=ppp
 +rcvar=$name
 start_cmd=ppp_start
 stop_cmd=ppp_stop
 sig_stop=-INT
 @@ -40,6 +41,8 @@ ppp_start()
   fi
   done
   echo .
 + else
 + warn \${ppp_peers} is not set - pppd was not started.
   fi
 }
 
 


Freundliche Grüsse,
micro systems

Marc Balmer

--
Marc Balmer
micro systems, Wiesendamm 2a, Postfach, 4019 Basel
fon +41 61 383 05 10, fax +41 61 383 05 12, http://www.msys.ch/



Re: CVS commit: src/usr.sbin/envstat

2012-12-14 Thread Marc Balmer


Am 14.12.2012 um 17:07 schrieb Joerg Sonnenberger jo...@britannica.bec.de:

 On Fri, Dec 14, 2012 at 08:59:37AM +, David Laight wrote:
 Similarly it just isn't worth trying to free resources prior
 to program exit. Have you ever waited while a big C++ program
 runs all its destructors, paging in code and data just to exit!
 
 Depends, it makes tools like valgrind a lot easier to use.
 

Source code should be optimized for readability, performance, stability, and 
not for debug tools. And that means to consider realities like the fact that on 
Unix resources are freed when the process exits and an explicit free is counter 
productive if terms of effectiveness.



 Joerg


Re: CVS commit: src/usr.sbin/envstat

2012-12-14 Thread Marc Balmer

Am 14.12.2012 um 18:05 schrieb Joerg Sonnenberger jo...@britannica.bec.de:

 On Fri, Dec 14, 2012 at 05:51:44PM +0100, Marc Balmer wrote:
 
 
 Am 14.12.2012 um 17:07 schrieb Joerg Sonnenberger jo...@britannica.bec.de:
 
 On Fri, Dec 14, 2012 at 08:59:37AM +, David Laight wrote:
 Similarly it just isn't worth trying to free resources prior
 to program exit. Have you ever waited while a big C++ program
 runs all its destructors, paging in code and data just to exit!
 
 Depends, it makes tools like valgrind a lot easier to use.
 
 
 Source code should be optimized for readability, performance,
 stability, and not for debug tools.
 
 Ironically, proper ressource managements tends to make it much easier to
 fulfill at least two of the three items...

proper resource management is a good thing - if the code continues to run.  In 
this case, where the program exits, there no benefit from freeing up memory etc.



Re: CVS commit: src/external/public-domain/sqlite/dist

2012-12-16 Thread Marc Balmer

Am 16.12.2012 um 21:44 schrieb Joerg Sonnenberger jo...@britannica.bec.de:

 On Sun, Dec 16, 2012 at 08:42:41PM +, Christos Zoulas wrote:
 In article 20121216202507.ga21...@britannica.bec.de,
 Joerg Sonnenberger  jo...@britannica.bec.de wrote:
 
 Can you please not add random crappy files with unclear license?
 
 Every other distribution that contains sqlite3 (including commercial ones
 like MacOS/X), distributes this exact manpage, and we are going to be
 different? What is unclear about:
 
  This manual page was originally written by Andreas Rottmann
  ro...@debian.org, for the Debian GNU/Linux system (but may be used by
  others). It was subsequently revised by Bill Bumgarner b...@mac.com.
 
 I would be surprised if any lawyer accepts that as a license...

Wo kein Kläger ist, braucht es auch keinen Richter.

I would be surprised if anyone sues anyone for using this man page.  I am not 
even sure if a descriptive text like this one falls under copyright law.  And 
even less sure if anyone would enforce it.
 
 
 The man page is next to useless. The only content that is not pretty
 much CP from sqlite3 -help and .help is the part about the init file.
 Seriously, in this form it is just a waste of space.
 
 The other issue is that imports of the next version of sqlite3 are going
 to drop it again as this is the same directory...
 
 Joerg


Freundliche Grüsse,
micro systems

Marc Balmer

--
Marc Balmer
micro systems, Wiesendamm 2a, Postfach, 4019 Basel
fon +41 61 383 05 10, fax +41 61 383 05 12, http://www.msys.ch/



Re: CVS commit: src/doc

2013-05-20 Thread Marc Balmer
Am 20.05.13 11:31, schrieb Thomas Klausner:
 Module Name:  src
 Committed By: wiz
 Date: Mon May 20 09:31:31 UTC 2013
 
 Modified Files:
   src/doc: 3RDPARTY
 
 Log Message:
 lua-5.2.2 out (mbalmer!!)

Actually I am working on that.  For base and pkgsrc...

So stay tuned ;)


Re: CVS commit: src/sys/modules/lua

2013-10-16 Thread Marc Balmer
Am 17.10.13 00:26, schrieb Alexander Nasonov:
 Two things attracted my eyes after a very quick look.
 
 +#define exit(EXIT_FAILURE) return
 
 I can't believe this code in the tree! I thought we agreed that it will
 be changed.
 
 What's the point of compiling unmodified Lua sources if it forces you
 to write ugly hacks? It's perfectly fine to insert few #ifndef _KERNEL
 to the Lua source.

Agreed, I think.

 
 +++ src/sys/modules/lua/infinite.lua Wed Oct 16 19:44:57 2013
 @@ -0,0 +1,2 @@
 +while (1) do end
 
 Why do you need this file at all and why the code starts like C and ends
 like Lua?
 
   while true do end
 
 no?

It is Lua code.  It is an infinite loop.  It is there so that execution
limit count can be tested.




Re: CVS commit: src/sys/modules/lua

2013-10-18 Thread Marc Balmer
Am 18.10.13 09:16, schrieb Alexander Nasonov:
 Marc Balmer wrote:
 Module Name: src
 Committed By:mbalmer
 Date:Wed Oct 16 19:44:58 UTC 2013

 Added Files:
  src/sys/modules/lua: Makefile assert.h ctype.h errno.h infinite.lua
  inttypes.h limits.h locale.h lua.c luaconf.h luavar.h math.h
  setjmp.h signal.h stdarg.h stddef.h stdio.h stdlib.h string.h
  test.lua

 Log Message:
 welcome lua(4), a devide driver that can create and control Lua states 
 inside the kernel

 
 First of all, the code has been imported the wrong way as I stated in
 the previous email. You should properly import Lua 5.2 to sys/external/
 and then apply local changes required to run it in kernel space.

This was not an import of Lua.  The Lua sources already are in the tree.
 When we are ready to move from Lua 5.1 to Lua 5.2, Lua 5.2 will be
imported to sys/external, as I already mentioned.

 Second, lua device driver has a limited application. We need a generic
 lua module. Your lua device driver can then use it.

This is generic.  The device driver is only there to control Lua states,
load code into it, provide an ioctl interface to userland applications.
 When code in the kernel needs a Lua state, it does not use the lua(4)
driver to create one (but the lua kernel module must be loaded, of course).

 For example, if I want to generate bpf code when a user sends a filter
 program to /dev/bpf* with Lua, I don't need a device driver. I need to
 open a regular lua_State, load sljit module, run bfjit.lua script and
 close the state afterwards.

Which you can already do.  I will have an example for that later.  The
function prototypes ar in sys/sys/lua.h, btw.

 Also, I have a couple of small things.
 
 1. Why do you use lua_ prefix for private functions? You get very close
 to lua names: lua_reader vs lua_Reader of lua_require vs luaL_requiref.

It does not really matter as long as the names don't clash.

 2. When you call lua_tostring() you often (or never???) don't check
 whether it returns NULL. You can easily panic the kernel when you try
 to print a table.

I will look into this.  The return values should be checked, for sure.

Thanks for your feedback,
Marc



Re: CVS commit: src/sys/modules/lua

2013-10-18 Thread Marc Balmer
Am 18.10.13 14:24, schrieb Taylor R Campbell:
From: Marc Balmer mbal...@netbsd.org
Date: Wed, 16 Oct 2013 19:44:58 +
 
welcome lua(4), a devide driver that can create and control Lua states 
 inside 
the kernel
 
 Did you get core approval for this?  The public discussion is still
 ongoing, and still lacking in evidence, and there has been no public
 statement by core as far as I am aware, nor did any members of core I
 asked have any recollection of approving this.  Please don't steamroll
 over public discussions like this.
Just for the record, yes, I got core's approval.



Re: CVS commit: src/sys/modules/lua

2013-10-18 Thread Marc Balmer
Am 18.10.13 19:13, schrieb Alexander Nasonov:
 Marc Balmer wrote:
 This was not an import of Lua.  The Lua sources already are in the tree.
  When we are ready to move from Lua 5.1 to Lua 5.2, Lua 5.2 will be
 imported to sys/external, as I already mentioned.
 
 In this case, kernel changes should have been added to 5.1 source and
 later ported to 5.2 code.

I don't understand you here.  The Lua codes wher imported unaltered.

 
 For example, if I want to generate bpf code when a user sends a filter
 program to /dev/bpf* with Lua, I don't need a device driver. I need to
 open a regular lua_State, load sljit module, run bfjit.lua script and
 close the state afterwards.

 Which you can already do.  I will have an example for that later.  The
 function prototypes ar in sys/sys/lua.h, btw.
 
 ok
 
 It does not really matter as long as the names don't clash.
 
 It potentially makes upgrading to a newer version of Lua more difficult
 because your private names may conflict with the new version of Lua API.

That would be spotted immediately when doing a test build.

 It also harder to read code.
That is only a matter of taste, imo.



Re: CVS import: src/external/bsd/kyua-cli/dist

2013-10-19 Thread Marc Balmer
Am 19.10.13 01:40, schrieb Julio Merino:
 Module Name:  src
 Committed By: jmmv
 Date: Fri Oct 18 23:40:48 UTC 2013
 
 Update of /cvsroot/src/external/bsd/kyua-cli/dist
 In directory ivanova.netbsd.org:/tmp/cvs-serv22893
 
 Log Message:
 Update kyua-cli to 0.7:
 
 The major reason for this update is to support the just-imported lutok-0.3
 and, in turn, support the eventual update of the in-tree lua to 5.2.
 
 Changes:
 

[...]


 * Switched to use Lutok 0.3 to gain compatibility with Lua 5.2.

So your work would be safe and continue to build/work when Lua gets
updated to 5.2?


- Marc



Re: CVS commit: src/sbin/gpt

2013-10-20 Thread Marc Balmer
Am 20.10.13 20:25, schrieb David Laight:
 On Sat, Oct 19, 2013 at 01:19:03AM +, John Nemeth wrote:
 Module Name: src
 Committed By:jnemeth
 Date:Sat Oct 19 01:19:03 UTC 2013

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

 Log Message:
 type fix: accommodate. - accomodate.
 
 Why? The correct spelling has two 'm's
 At least in accommodation, can't imagine accommodate being different.

The verb is 'to accommodate' with two 'm's.




Re: CVS commit: src/sys/modules/lua

2013-10-22 Thread Marc Balmer
Am 22.10.13 14:24, schrieb Christoph Badura:
 On Tue, Oct 22, 2013 at 09:25:19AM +0100, Alexander Nasonov wrote:
 We just need to make sure that all entry points to Lua are protected and
 hope that the above panic will never trigger.
 
 Actually, I would prefer if that call to panic wasn't there at all.
 Instead the script/state should be aborted noisily.
I absolutely agree.  A problem within a Lua state must not cause a
kernel panic.  The only way to panic from Lua should be calling
core.panic() explicitely.




Re: CVS commit: src/distrib/sets/lists/comp

2013-10-27 Thread Marc Balmer
Am 27.10.13 03:39, schrieb Hisashi T Fujinaka:
 Module Name:  src
 Committed By: htodd
 Date: Sun Oct 27 02:39:21 UTC 2013
 
 Modified Files:
   src/distrib/sets/lists/comp: mi
 
 Log Message:
 Revert mi because the added line refers to an imaginary file.

A better solution would have been to contact me, as obviously a file was
missed in a commit.  Just silently backing out others changes is
considered rude...

 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.1847 -r1.1848 src/distrib/sets/lists/comp/mi
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.
 
 
 
 Modified files:
 
 Index: src/distrib/sets/lists/comp/mi
 diff -u src/distrib/sets/lists/comp/mi:1.1847 
 src/distrib/sets/lists/comp/mi:1.1848
 --- src/distrib/sets/lists/comp/mi:1.1847 Sat Oct 26 20:06:38 2013
 +++ src/distrib/sets/lists/comp/miSun Oct 27 02:39:21 2013
 @@ -1,4 +1,4 @@
 -#$NetBSD: mi,v 1.1847 2013/10/26 20:06:38 mbalmer Exp $
 +#$NetBSD: mi,v 1.1848 2013/10/27 02:39:21 htodd Exp $
  #
  # Note: don't delete entries from here - mark them as obsolete instead.
  #
 @@ -2590,7 +2590,6 @@
  ./usr/include/sys/localedef.hcomp-c-include
  ./usr/include/sys/lock.h comp-c-include
  ./usr/include/sys/lockf.hcomp-c-include
 -./usr/include/sys/lua.h  comp-c-include
  ./usr/include/sys/lwp.h  comp-c-include
  ./usr/include/sys/lwpctl.h   comp-c-include
  ./usr/include/sys/malloc.h   comp-c-include
 



Re: CVS commit: src/distrib/sets/lists/comp

2013-10-27 Thread Marc Balmer
Am 27.10.13 09:33, schrieb Marc Balmer:
 Am 27.10.13 03:39, schrieb Hisashi T Fujinaka:
 Module Name: src
 Committed By:htodd
 Date:Sun Oct 27 02:39:21 UTC 2013

 Modified Files:
  src/distrib/sets/lists/comp: mi

 Log Message:
 Revert mi because the added line refers to an imaginary file.
 
 A better solution would have been to contact me, as obviously a file was
 missed in a commit.  Just silently backing out others changes is
 considered rude...

Actually the file was apparently there, but entered to the Makefile.  It
should all be in order now.

(doing a full release build again to verify)



Re: CVS commit: src/distrib/sets/lists/comp

2013-10-27 Thread Marc Balmer
Am 27.10.13 16:35, schrieb Hisashi T Fujinaka:
 On Sun, 27 Oct 2013, Marc Balmer wrote:
 
 Am 27.10.13 09:33, schrieb Marc Balmer:
 Am 27.10.13 03:39, schrieb Hisashi T Fujinaka:
 Module Name:src
 Committed By:htodd
 Date:Sun Oct 27 02:39:21 UTC 2013

 Modified Files:
 src/distrib/sets/lists/comp: mi

 Log Message:
 Revert mi because the added line refers to an imaginary file.

 A better solution would have been to contact me, as obviously a file was
 missed in a commit.  Just silently backing out others changes is
 considered rude...

 Actually the file was apparently there, but entered to the Makefile.  It
 should all be in order now.

 (doing a full release build again to verify)
 
 You were probably asleep because I'm sure you're in Europe, and it was
 obvious what you did.

Yes, I am in Europe, Switzerland.  And please disregard my remark about
backing out stuff as rude... You were not rude at all and did the right
thing.  It was my fault, after all.

Thank you,
- mb




Re: CVS commit: src/sys

2013-11-06 Thread Marc Balmer
Am 06.11.13 10:05, schrieb Martin Husemann:
 On Wed, Nov 06, 2013 at 10:52:26AM +1100, matthew green wrote:
  http://www.netbsd.org/docs/kernel/elf-notes.html

 this or its predecessors have been around since the 90s.
 please update.
 
 Done (pending regen and push) - I tried to describe all missing ones; please
 anyone feel free to fix layout and speeling ;-)

I regen'd and committed it.




Re: CVS commit: src/lib/lua/syslog

2013-11-12 Thread Marc Balmer
Am 12.11.13 17:04, schrieb Christos Zoulas:
 In article 20131112143203.8cd3...@cvs.netbsd.org,
 Marc Balmer source-changes-d@NetBSD.org wrote:
 -=-=-=-=-=-

 Module Name: src
 Committed By:mbalmer
 Date:Tue Nov 12 14:32:03 UTC 2013

 Added Files:
  src/lib/lua/syslog: Makefile syslog.c

 Log Message:
 Add a syslog(3) binding for Lua (not yet linked to the build.)
 
 Is there any reason not to use the modern syslog (thread-safe) functions
 openlog_r(), syslog_r(), syslogp_r()?

Good question.  We would have to keep the context somewhere (certainly
solvable), then, I wonder I Lua is ever used threaded?  Could the
problem arise in reality (it did not in our stuff since Jan 1st 2009)

Maybe if two threads create separate states, and then both threads use
syslog at the same time?  (can not happen at this moment).




Re: CVS commit: src/sys/arch/i386/conf

2013-11-23 Thread Marc Balmer

Zitat von Jeff Rizzo r...@netbsd.org:


Module Name:src
Committed By:   riz
Date:   Fri Nov 22 18:58:01 UTC 2013

Modified Files:
src/sys/arch/i386/conf: ALL

Log Message:
Comment out npf for now, as we can't have both NPF and PF in the
same kernel - rmind has said he'll address this eventually,
and for now PF is more likely to have unnoticed breakage.  ALL now
builds again!



Wouldn't it make a more sense to disable pf since npf sees actual  
development, so testing it would actually help (and ALL is not meant  
to be run anyways)?


To me compile testing npf would make much more sense than pf... ymmv.








To generate a diff of this commit:
cvs rdiff -u -r1.364 -r1.365 src/sys/arch/i386/conf/ALL

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







This message was sent using IMP, the Internet Messaging Program.




Re: CVS commit: src

2013-12-04 Thread Marc Balmer
Am 04.12.13 00:26, schrieb Alexander Nasonov:

 Lua is external software and we should keep our copy close to the
 original. If this sense long long is the best choice. However, Lua
 5.3 isn't released yet and Lua team may change their minds. They will
 have to go through similar problem with strtoll replacement, though.

I discussed Lua 5.3 with Roberto Ierusalimschy during the Lua Workshop
2013.  He said it will very, very likely be published in the current
(release candidate) form, they have no plans to change anything anymore
for the final release.  He encouraged my to use this version, skipping
5.2, which is what we plan to do.




Re: CVS commit: src/sys/sys

2014-07-17 Thread Marc Balmer

Am 17.07.2014 um 16:55 schrieb Taylor R Campbell riastr...@netbsd.org:

 Module Name:  src
 Committed By: riastradh
 Date: Thu Jul 17 14:55:32 UTC 2014
 
 Modified Files:
   src/sys/sys: systm.h
 
 Log Message:
 Expand null macros to `do {} while (0)', not to nothing.
 
 

Not that I object, but out of curiosity, what is this good for, or, why is this 
need/a good thing?

 Index: src/sys/sys/systm.h
 diff -u src/sys/sys/systm.h:1.263 src/sys/sys/systm.h:1.264
 --- src/sys/sys/systm.h:1.263 Thu Apr  3 15:22:57 2014
 +++ src/sys/sys/systm.h   Thu Jul 17 14:55:32 2014
 @@ -1,4 +1,4 @@
 -/*   $NetBSD: systm.h,v 1.263 2014/04/03 15:22:57 christos Exp $ */
 +/*   $NetBSD: systm.h,v 1.264 2014/07/17 14:55:32 riastradh Exp $*/
 
 /*-
  * Copyright (c) 1982, 1988, 1991, 1993
 @@ -527,7 +527,7 @@ void assert_sleepable(void);
 #if defined(DEBUG)
 #define   ASSERT_SLEEPABLE()  assert_sleepable()
 #else /* defined(DEBUG) */
 -#define  ASSERT_SLEEPABLE()  /* nothing */
 +#define  ASSERT_SLEEPABLE()  do {} while (0)
 #endif /* defined(DEBUG) */
 
 vaddr_t calc_cache_size(vsize_t , int, int);
 



Re: CVS commit: src

2014-07-19 Thread Marc Balmer

Am 19.07.2014 um 21:54 schrieb Alexander Nasonov al...@yandex.ru:

 
 That's not how we update 3rd-party code in the tree. We use cvs import
 and resolve conflicts afterwards.


Oh well..  Having recent Lua is more important than following a procedure that 
is difficult to follow.



Re: CVS commit: src/lib/librumpuser

2014-10-07 Thread Marc Balmer

Am 29.09.2014 um 17:54 schrieb Justin Cormack jus...@netbsd.org:

 Module Name:  src
 Committed By: justin
 Date: Mon Sep 29 15:54:28 UTC 2014
 
 Modified Files:
   src/lib/librumpuser: rumpuser_port.h
 
 Log Message:
 Minix also has getenv_r support
 
 
 To generate a diff of this commit:
 cvs rdiff -u -r1.34 -r1.35 src/lib/librumpuser/rumpuser_port.h
 
 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.
 
 Modified files:
 
 Index: src/lib/librumpuser/rumpuser_port.h
 diff -u src/lib/librumpuser/rumpuser_port.h:1.34 
 src/lib/librumpuser/rumpuser_port.h:1.35
 --- src/lib/librumpuser/rumpuser_port.h:1.34  Tue Jul 22 22:41:58 2014
 +++ src/lib/librumpuser/rumpuser_port.h   Mon Sep 29 15:54:28 2014
 @@ -1,4 +1,4 @@
 -/*   $NetBSD: rumpuser_port.h,v 1.34 2014/07/22 22:41:58 justin Exp $
 */
 +/*   $NetBSD: rumpuser_port.h,v 1.35 2014/09/29 15:54:28 justin Exp $
 */
 
 /*
  * Portability header for non-NetBSD platforms.
 @@ -112,8 +112,8 @@ clock_gettime(clockid_t clk, struct time
 #include sys/types.h
 #include sys/param.h
 
 -/* NetBSD is the only(?) platform with getenv_r() */
 -#if !defined(__NetBSD__)
 +/* NetBSD is almost the only platform with getenv_r() */
 +#if !(defined(__NetBSD__) || defined(__minix__))

Minix defines __minix, not __minix__, though.

 #include errno.h
 #include stdlib.h
 #include string.h
 



CVS commit: src

2009-08-14 Thread Marc Balmer
 +24,7 @@
 defflagPTRACE
 defflagCOREDUMP
 defflagMODULAR
+defflagKEYLOCK
 
 defparam			DEFCORENAME
 defparam			HZ
@@ -1371,6 +1372,7 @@
 file	dev/dkwedge/dkwedge_mbr.c	dkwedge_method_mbr
 file	dev/firmload.c			firmload
 file	dev/fss.c			fss			needs-count
+file	dev/keylock.c			keylock
 file	dev/lockstat.c			lockstat		needs-flag
 file	dev/md.c			md			needs-count
 file	dev/midi.c			midi | midibus		needs-flag

Index: src/sys/dev/gpio/files.gpio
diff -u src/sys/dev/gpio/files.gpio:1.7 src/sys/dev/gpio/files.gpio:1.8
--- src/sys/dev/gpio/files.gpio:1.7	Sun Aug  9 08:18:00 2009
+++ src/sys/dev/gpio/files.gpio	Fri Aug 14 21:17:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.gpio,v 1.7 2009/08/09 08:18:00 mbalmer Exp $
+# $NetBSD: files.gpio,v 1.8 2009/08/14 21:17:22 mbalmer Exp $
 
 define	gpio {[offset = -1], [mask = 0]}
 
@@ -19,3 +19,8 @@
 device	gpioow: onewirebus, onewire_bitbang
 attach	gpioow at gpio
 file	dev/gpio/gpioow.c			gpioow
+
+# Keylock
+device	gpiolock: gpiobus
+attach	gpiolock at gpio
+file	dev/gpio/gpiolock.c			gpiolock

Index: src/sys/secmodel/files.secmodel
diff -u src/sys/secmodel/files.secmodel:1.2 src/sys/secmodel/files.secmodel:1.3
--- src/sys/secmodel/files.secmodel:1.2	Wed Nov 21 22:49:07 2007
+++ src/sys/secmodel/files.secmodel	Fri Aug 14 21:17:22 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.secmodel,v 1.2 2007/11/21 22:49:07 elad Exp $
+# $NetBSD: files.secmodel,v 1.3 2009/08/14 21:17:22 mbalmer Exp $
 
 #
 # Traditional 4.4BSD - Securelevel
@@ -14,3 +14,8 @@
 # Sample overlay model on-top of the traditional one
 #
 include secmodel/overlay/files.overlay
+
+#
+# Multi-position keylock
+#
+include secmodel/keylock/files.keylock

Index: src/sys/sys/Makefile
diff -u src/sys/sys/Makefile:1.118 src/sys/sys/Makefile:1.119
--- src/sys/sys/Makefile:1.118	Mon Nov 24 16:05:21 2008
+++ src/sys/sys/Makefile	Fri Aug 14 21:17:22 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.118 2008/11/24 16:05:21 joerg Exp $
+#	$NetBSD: Makefile,v 1.119 2009/08/14 21:17:22 mbalmer Exp $
 
 .include bsd.sys.mk
 
@@ -17,7 +17,7 @@
 	float_ieee754.h fstypes.h gcq.h gmon.h gpio.h hash.h \
 	ieee754.h inttypes.h ioccom.h ioctl.h ioctl_compat.h iostat.h ipc.h \
 	joystick.h \
-	kcore.h kgdb.h kmem.h ksem.h ksyms.h ktrace.h \
+	kcore.h keylock.h kgdb.h kmem.h ksem.h ksyms.h ktrace.h \
 	localedef.h lock.h lockf.h lwp.h lwpctl.h \
 	malloc.h mallocvar.h mbuf.h md4.h md5.h midiio.h \
 	mman.h module.h mount.h mqueue.h msg.h msgbuf.h mtio.h mutex.h \

Added files:

Index: src/share/man/man4/gpiolock.4
diff -u /dev/null src/share/man/man4/gpiolock.4:1.1
--- /dev/null	Fri Aug 14 21:17:22 2009
+++ src/share/man/man4/gpiolock.4	Fri Aug 14 21:17:21 2009
@@ -0,0 +1,67 @@
+.\	$NetBSD: gpiolock.4,v 1.1 2009/08/14 21:17:21 mbalmer Exp $
+.\
+.\ Copyright (c) 2009 Marc Balmer m...@msys.ch
+.\
+.\ Permission to use, copy, modify, and distribute this software for any
+.\ purpose with or without fee is hereby granted, provided that the above
+.\ copyright notice and this permission notice appear in all copies.
+.\
+.\ THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\
+.Dd August 10, 2009
+.Dt GPIOLOCK 4
+.Os
+.Sh NAME
+.Nm gpiolock
+.Nd support for multi-position keylocks attached to GPIO pins
+.Sh SYNOPSIS
+.Cd gpiolock* at gpio? offset ? mask ?
+.Cd gpiolock* at gpio?
+.Sh DESCRIPTION
+The
+.Nm
+driver allows connecting of multi-position keylocks over GPIO pins.
+The keylock driver registers with a in-kernel keylock supporting system
+and provides
+.Xr kauth 9
+support through an experimental security model.
+The keylock state can be queried using the hw.keylock sysctl variables.
+Only locks with 2-4 positions are currently supported.
+The pin number is specified in the kernel configuration with the
+.Ar offset
+locator.
+The
+.Ar mask
+locator denotes the pins used for the lock (minimum 2, maximum 4 pins are used).
+The
+.Ar offset
+and
+.Ar mask
+can also be specified when
+.Nm
+is attached at runtime using the
+.Dv GPIOATTACH
+.Xr ioctl 2
+on the
+.Xr gpio 4
+device.
+.Sh SEE ALSO
+.Xr gpio 4 ,
+.Xr intro 4 ,
+.Sh HISTORY
+The
+.Nm
+driver first appeared in
+.Nx 5.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Marc Balmer Aq m...@msys.ch .

Index: src/sys/dev/keylock.c
diff -u /dev/null src/sys/dev/keylock.c:1.1
--- /dev/null	Fri Aug 14 21:17:22 2009
+++ src/sys/dev/keylock.c	Fri Aug 14 21:17:22 2009
@@ -0,0 +1,210 @@
+/* $NetBSD: keylock.c,v 1.1 2009/08/14 21:17:22 mbalmer Exp $ */
+
+/*
+ * Copyright (c) 2009 Marc Balmer m...@msys.ch
+ * All rights

CVS commit: src/doc

2009-08-15 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Aug 15 08:32:53 UTC 2009

Modified Files:
src/doc: CHANGES

Log Message:
Mention keylock support.


To generate a diff of this commit:
cvs rdiff -u -r1.1274 -r1.1275 src/doc/CHANGES

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

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1274 src/doc/CHANGES:1.1275
--- src/doc/CHANGES:1.1274	Wed Aug 12 23:41:10 2009
+++ src/doc/CHANGES	Sat Aug 15 08:32:52 2009
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1274 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1275 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -364,3 +364,5 @@
 	voyagerfb(8): a driver for the Gdium Liberty 1000's video controller
 		[macallan 20090812]
 	mips a.out support: removed [matt 20090812]
+	secmode_keylock, keylock, gpiolock(4): Add support for multi-position
+		keylocks. [mbalmer 20090814]



CVS commit: src/doc

2009-08-15 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Aug 15 08:35:22 UTC 2009

Modified Files:
src/doc: RESPONSIBLE

Log Message:
I take responsability for keylocks.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/doc/RESPONSIBLE

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

Modified files:

Index: src/doc/RESPONSIBLE
diff -u src/doc/RESPONSIBLE:1.89 src/doc/RESPONSIBLE:1.90
--- src/doc/RESPONSIBLE:1.89	Sun Jul 26 14:34:10 2009
+++ src/doc/RESPONSIBLE	Sat Aug 15 08:35:22 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: RESPONSIBLE,v 1.89 2009/07/26 14:34:10 mbalmer Exp $
+#	$NetBSD: RESPONSIBLE,v 1.90 2009/08/15 08:35:22 mbalmer Exp $
 
 List of sections of the system, and who is responsible for them (or at
 least considered an expert on them).
@@ -107,6 +107,7 @@
 ide/atapi	bouyer
 irda		augustss, kenh
 isdn		martin
+keylock		mbalmer
 mca		jdolecek
 net80211	dyoung
 onewire		riz



CVS commit: src/sys/arch/i386/conf

2009-08-15 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Aug 15 08:44:35 UTC 2009

Modified Files:
src/sys/arch/i386/conf: GENERIC

Log Message:
Add commented entries for keylock support.


To generate a diff of this commit:
cvs rdiff -u -r1.940 -r1.941 src/sys/arch/i386/conf/GENERIC

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

Modified files:

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.940 src/sys/arch/i386/conf/GENERIC:1.941
--- src/sys/arch/i386/conf/GENERIC:1.940	Wed Jul 29 11:58:31 2009
+++ src/sys/arch/i386/conf/GENERIC	Sat Aug 15 08:44:35 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.940 2009/07/29 11:58:31 mbalmer Exp $
+# $NetBSD: GENERIC,v 1.941 2009/08/15 08:44:35 mbalmer Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.940 $
+#ident 		GENERIC-$Revision: 1.941 $
 
 maxusers	64		# estimated number of users
 
@@ -304,6 +304,10 @@
 #options 	SPLASHSCREEN
 #options 	SPLASHSCREEN_PROGRESS
 
+# Keylock support
+#options	KEYLOCK
+#options	secmodel_keylock	# Requires options KEYLOCK
+
 # Kernel root file system and dump configuration.
 config		netbsd	root on ? type ?
 #config		netbsd	root on sd0a type ffs
@@ -682,6 +686,9 @@
 # 1-Wire devices
 #owtemp* 	at onewire?			# Temperature sensors
 
+# Keylock support
+#gpiolock*	at gpio?
+
 # SCSI Controllers and Devices
 
 # PCI SCSI controllers



CVS commit: src/sys

2009-08-15 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Aug 15 09:43:59 UTC 2009

Modified Files:
src/sys/arch/i386/conf: ALL
src/sys/dev: keylock.c
src/sys/dev/gpio: gpiolock.c
src/sys/secmodel/keylock: secmodel_keylock.c
src/sys/sys: Makefile
Added Files:
src/sys/dev: keylock.h
Removed Files:
src/sys/sys: keylock.h

Log Message:
Move the keylock.h header from sys/sys to sys/dev where it really belongs.
Add keylock options to the ALL kernel configuration.


To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/keylock.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/keylock.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/gpio/gpiolock.c
cvs rdiff -u -r1.1 -r1.2 src/sys/secmodel/keylock/secmodel_keylock.c
cvs rdiff -u -r1.119 -r1.120 src/sys/sys/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/sys/keylock.h

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

Modified files:

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.203 src/sys/arch/i386/conf/ALL:1.204
--- src/sys/arch/i386/conf/ALL:1.203	Wed Jul 29 11:52:44 2009
+++ src/sys/arch/i386/conf/ALL	Sat Aug 15 09:43:58 2009
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.203 2009/07/29 11:52:44 mbalmer Exp $
+# $NetBSD: ALL,v 1.204 2009/08/15 09:43:58 mbalmer Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		ALL-$Revision: 1.203 $
+#ident 		ALL-$Revision: 1.204 $
 
 maxusers	32		# estimated number of users
 
@@ -297,6 +297,10 @@
 #options 	SPLASHSCREEN
 #options 	SPLASHSCREEN_PROGRESS
 
+# Keylock support
+options		KEYLOCK
+options		secmodel_keylock
+
 # Kernel root file system and dump configuration.
 config		netbsd	root on ? type ?
 #config		netbsd	root on sd0a type ffs

Index: src/sys/dev/keylock.c
diff -u src/sys/dev/keylock.c:1.1 src/sys/dev/keylock.c:1.2
--- src/sys/dev/keylock.c:1.1	Fri Aug 14 21:17:22 2009
+++ src/sys/dev/keylock.c	Sat Aug 15 09:43:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: keylock.c,v 1.1 2009/08/14 21:17:22 mbalmer Exp $ */
+/* $NetBSD: keylock.c,v 1.2 2009/08/15 09:43:58 mbalmer Exp $ */
 
 /*
  * Copyright (c) 2009 Marc Balmer m...@msys.ch
@@ -31,9 +31,10 @@
 
 #include sys/param.h
 #include sys/kernel.h
-#include sys/keylock.h
 #include sys/sysctl.h
 
+#include dev/keylock.h
+
 #ifdef secmodel_keylock
 #include sys/kauth.h
 #include secmodel/keylock/keylock.h

Index: src/sys/dev/gpio/gpiolock.c
diff -u src/sys/dev/gpio/gpiolock.c:1.1 src/sys/dev/gpio/gpiolock.c:1.2
--- src/sys/dev/gpio/gpiolock.c:1.1	Fri Aug 14 21:17:22 2009
+++ src/sys/dev/gpio/gpiolock.c	Sat Aug 15 09:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiolock.c,v 1.1 2009/08/14 21:17:22 mbalmer Exp $ */
+/* $NetBSD: gpiolock.c,v 1.2 2009/08/15 09:43:59 mbalmer Exp $ */
 
 /*
  * Copyright (c) 2009 Marc Balmer m...@msys.ch
@@ -34,9 +34,9 @@
 #include sys/param.h
 #include sys/device.h
 #include sys/gpio.h
-#include sys/keylock.h
 
 #include dev/gpio/gpiovar.h
+#include dev/keylock.h
 
 #define GPIOLOCK_MAXPINS	4
 #define GPIOLOCK_MINPINS	2

Index: src/sys/secmodel/keylock/secmodel_keylock.c
diff -u src/sys/secmodel/keylock/secmodel_keylock.c:1.1 src/sys/secmodel/keylock/secmodel_keylock.c:1.2
--- src/sys/secmodel/keylock/secmodel_keylock.c:1.1	Fri Aug 14 21:17:22 2009
+++ src/sys/secmodel/keylock/secmodel_keylock.c	Sat Aug 15 09:43:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: secmodel_keylock.c,v 1.1 2009/08/14 21:17:22 mbalmer Exp $ */
+/* $NetBSD: secmodel_keylock.c,v 1.2 2009/08/15 09:43:59 mbalmer Exp $ */
 /*-
  * Copyright (c) 2009 Marc Balmer m...@msys.ch
  * Copyright (c) 2006 Elad Efrat e...@netbsd.org
@@ -54,18 +54,19 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: secmodel_keylock.c,v 1.1 2009/08/14 21:17:22 mbalmer Exp $);
+__KERNEL_RCSID(0, $NetBSD: secmodel_keylock.c,v 1.2 2009/08/15 09:43:59 mbalmer Exp $);
 
 #include sys/types.h
 #include sys/param.h
 #include sys/kauth.h
 
 #include sys/conf.h
-#include sys/keylock.h
 #include sys/mount.h
 #include sys/sysctl.h
 #include sys/vnode.h
 
+#include dev/keylock.h
+
 #include miscfs/specfs/specdev.h
 
 #include secmodel/keylock/keylock.h

Index: src/sys/sys/Makefile
diff -u src/sys/sys/Makefile:1.119 src/sys/sys/Makefile:1.120
--- src/sys/sys/Makefile:1.119	Fri Aug 14 21:17:22 2009
+++ src/sys/sys/Makefile	Sat Aug 15 09:43:59 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.119 2009/08/14 21:17:22 mbalmer Exp $
+#	$NetBSD: Makefile,v 1.120 2009/08/15 09:43:59 mbalmer Exp $
 
 .include bsd.sys.mk
 
@@ -17,7 +17,7 @@
 	float_ieee754.h fstypes.h gcq.h gmon.h gpio.h hash.h \
 	ieee754.h inttypes.h ioccom.h ioctl.h ioctl_compat.h iostat.h ipc.h \
 	joystick.h \
-	kcore.h keylock.h kgdb.h kmem.h ksem.h ksyms.h ktrace.h \
+	kcore.h kgdb.h kmem.h ksem.h ksyms.h ktrace.h \
 	localedef.h lock.h

CVS commit: src/distrib/sets/lists/comp

2009-08-15 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Aug 15 09:52:57 UTC 2009

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
Move keylock.h where it belongs.


To generate a diff of this commit:
cvs rdiff -u -r1.1291 -r1.1292 src/distrib/sets/lists/comp/mi

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

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1291 src/distrib/sets/lists/comp/mi:1.1292
--- src/distrib/sets/lists/comp/mi:1.1291	Sat Aug 15 05:50:49 2009
+++ src/distrib/sets/lists/comp/mi	Sat Aug 15 09:52:57 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1291 2009/08/15 05:50:49 mrg Exp $
+#	$NetBSD: mi,v 1.1292 2009/08/15 09:52:57 mbalmer Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -436,6 +436,7 @@
 ./usr/include/dev/isapnp/if_levar.h		comp-obsolete		obsolete
 ./usr/include/dev/isapnp/isapnpreg.h		comp-obsolete		obsolete
 ./usr/include/dev/isapnp/isapnpvar.h		comp-obsolete		obsolete
+./usr/include/dev/keylock.h			comp-c-include
 ./usr/include/dev/kttcpio.h			comp-c-include
 ./usr/include/dev/lockstat.h			comp-c-include
 ./usr/include/dev/md.hcomp-c-include
@@ -1997,7 +1998,7 @@
 ./usr/include/sys/kcore.h			comp-c-include
 ./usr/include/sys/kernel.h			comp-obsolete		obsolete
 ./usr/include/sys/kgdb.h			comp-c-include
-./usr/include/sys/keylock.h			comp-c-include
+./usr/include/sys/keylock.h			comp-obsolete		obsolete
 ./usr/include/sys/kmem.h			comp-c-include
 ./usr/include/sys/ksem.h			comp-c-include
 ./usr/include/sys/ksyms.h			comp-c-include



CVS commit: src/sys/dev/gpio

2009-08-17 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Mon Aug 17 12:44:44 UTC 2009

Modified Files:
src/sys/dev/gpio: gpio.c

Log Message:
unfold short lines, fold long line.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/gpio/gpio.c

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

Modified files:

Index: src/sys/dev/gpio/gpio.c
diff -u src/sys/dev/gpio/gpio.c:1.25 src/sys/dev/gpio/gpio.c:1.26
--- src/sys/dev/gpio/gpio.c:1.25	Fri Aug  7 08:05:48 2009
+++ src/sys/dev/gpio/gpio.c	Mon Aug 17 12:44:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.25 2009/08/07 08:05:48 mbalmer Exp $ */
+/* $NetBSD: gpio.c,v 1.26 2009/08/17 12:44:44 mbalmer Exp $ */
 /*	$OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $	*/
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gpio.c,v 1.25 2009/08/07 08:05:48 mbalmer Exp $);
+__KERNEL_RCSID(0, $NetBSD: gpio.c,v 1.26 2009/08/17 12:44:44 mbalmer Exp $);
 
 /*
  * General Purpose Input/Output framework.
@@ -300,8 +300,7 @@
 }
 
 int
-gpioopen(dev_t dev, int flag, int mode,
-struct lwp *l)
+gpioopen(dev_t dev, int flag, int mode, struct lwp *l)
 {
 	struct gpio_softc *sc;
 	int ret;
@@ -328,8 +327,7 @@
 }
 
 int
-gpioclose(dev_t dev, int flag, int mode,
-struct lwp *l)
+gpioclose(dev_t dev, int flag, int mode, struct lwp *l)
 {
 	struct gpio_softc *sc;
 
@@ -353,8 +351,7 @@
 }
 
 int
-gpioioctl(dev_t dev, u_long cmd, void *data, int flag,
-struct lwp *l)
+gpioioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
 {
 	struct gpio_softc *sc;
 	gpio_chipset_tag_t gc;
@@ -375,7 +372,8 @@
 	gc = sc-sc_gc;
 
 	if (cmd != GPIOINFO  !device_is_active(sc-sc_dev)) {
-		DPRINTF((%s: device is not active\n, device_xname(sc-sc_dev)));
+		DPRINTF((%s: device is not active\n,
+		device_xname(sc-sc_dev)));
 		return EBUSY;
 	}
 	



CVS commit: src/sys/arch/i386/pci

2009-08-17 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Mon Aug 17 14:18:58 UTC 2009

Modified Files:
src/sys/arch/i386/pci: gscpcib.c

Log Message:
Add struct pcib_softc to the gscpcib's softc, it is needed since we call
pcibattach() later.  This fixes the driver and lets the GPIO pins attach.
While here, remove the empty gscpcib_childdetach function.  Fixes GPIO
on my Soekris net4801 where I can now control the error LED...

please commit joerg@


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/pci/gscpcib.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/pci/gscpcib.c
diff -u src/sys/arch/i386/pci/gscpcib.c:1.12 src/sys/arch/i386/pci/gscpcib.c:1.13
--- src/sys/arch/i386/pci/gscpcib.c:1.12	Mon May  4 12:41:09 2009
+++ src/sys/arch/i386/pci/gscpcib.c	Mon Aug 17 14:18:58 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: gscpcib.c,v 1.12 2009/05/04 12:41:09 cegger Exp $	*/
+/*	$NetBSD: gscpcib.c,v 1.13 2009/08/17 14:18:58 mbalmer Exp $	*/
 /*	$OpenBSD: gscpcib.c,v 1.3 2004/10/05 19:02:33 grange Exp $	*/
 /*
  * Copyright (c) 2004 Alexander Yurchenko gra...@openbsd.org
@@ -23,7 +23,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gscpcib.c,v 1.12 2009/05/04 12:41:09 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: gscpcib.c,v 1.13 2009/08/17 14:18:58 mbalmer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -40,8 +40,11 @@
 #include dev/gpio/gpiovar.h
 
 #include i386/pci/gscpcibreg.h
+#include arch/x86/pci/pcibvar.h
 
 struct gscpcib_softc {
+	struct pcib_softc sc_pcib;
+
 	bool sc_gpio_present;
 
 	/* GPIO interface */
@@ -54,29 +57,19 @@
 int	gscpcib_match(device_t, cfdata_t, void *);
 void	gscpcib_attach(device_t, device_t, void *);
 int	gscpcib_detach(device_t, int);
-void	gscpcib_childdetached(device_t, device_t);
 
 int	gscpcib_gpio_pin_read(void *, int);
 void	gscpcib_gpio_pin_write(void *, int, int);
 void	gscpcib_gpio_pin_ctl(void *, int, int);
 
-/* arch/i386/pci/pcib.c */
+/* arch/x86/pci/pcib.c */
 voidpcibattach(device_t, device_t, void *);
 
-CFATTACH_DECL2_NEW(gscpcib, sizeof(struct gscpcib_softc),
-	gscpcib_match, gscpcib_attach, gscpcib_detach, NULL, NULL,
-	gscpcib_childdetached);
+CFATTACH_DECL_NEW(gscpcib, sizeof(struct gscpcib_softc),
+	gscpcib_match, gscpcib_attach, gscpcib_detach, NULL);
 
 extern struct cfdriver gscpcib_cd;
 
-void
-gscpcib_childdetached(device_t self, device_t child)
-{
-	/* We hold no pointers to child devices, so there is nothing
-	 * to do here.
-	 */
-}
-
 int
 gscpcib_match(device_t parent, cfdata_t match, void *aux)
 {



CVS commit: src/share/man/man4

2009-08-21 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Fri Aug 21 08:20:30 UTC 2009

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

Log Message:
This will appear in .Nx 6, not 5.  Prodded by wiz.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/gpiolock.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/gpiolock.4
diff -u src/share/man/man4/gpiolock.4:1.3 src/share/man/man4/gpiolock.4:1.4
--- src/share/man/man4/gpiolock.4:1.3	Sat Aug 15 09:59:12 2009
+++ src/share/man/man4/gpiolock.4	Fri Aug 21 08:20:30 2009
@@ -1,4 +1,4 @@
-.\	$NetBSD: gpiolock.4,v 1.3 2009/08/15 09:59:12 cegger Exp $
+.\	$NetBSD: gpiolock.4,v 1.4 2009/08/21 08:20:30 mbalmer Exp $
 .\
 .\ Copyright (c) 2009 Marc Balmer m...@msys.ch
 .\
@@ -14,7 +14,7 @@
 .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\
-.Dd August 10, 2009
+.Dd August 21, 2009
 .Dt GPIOLOCK 4
 .Os
 .Sh NAME
@@ -58,7 +58,7 @@
 The
 .Nm
 driver first appeared in
-.Nx 5.0 .
+.Nx 6.0 .
 .Sh AUTHORS
 .An -nosplit
 The



CVS commit: src/sys/dev/gpio

2009-08-21 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Fri Aug 21 12:53:42 UTC 2009

Modified Files:
src/sys/dev/gpio: gpio.c gpiovar.h

Log Message:
Before trying to attach a child device driver, make sure the GPIO pins can
be mapped.  This prevents drivers from later failing in the attach routine.
Problem found by me, solution suggested by jmcneill.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/gpio/gpio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/gpio/gpiovar.h

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

Modified files:

Index: src/sys/dev/gpio/gpio.c
diff -u src/sys/dev/gpio/gpio.c:1.26 src/sys/dev/gpio/gpio.c:1.27
--- src/sys/dev/gpio/gpio.c:1.26	Mon Aug 17 12:44:44 2009
+++ src/sys/dev/gpio/gpio.c	Fri Aug 21 12:53:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.26 2009/08/17 12:44:44 mbalmer Exp $ */
+/* $NetBSD: gpio.c,v 1.27 2009/08/21 12:53:42 mbalmer Exp $ */
 /*	$OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $	*/
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gpio.c,v 1.26 2009/08/17 12:44:44 mbalmer Exp $);
+__KERNEL_RCSID(0, $NetBSD: gpio.c,v 1.27 2009/08/21 12:53:42 mbalmer Exp $);
 
 /*
  * General Purpose Input/Output framework.
@@ -217,6 +217,30 @@
 	return UNCONF;
 }
 
+/* return 1 if all pins can be mapped, 0 if not */
+
+int
+gpio_pin_can_map(void *gpio, int offset, u_int32_t mask)
+{
+	struct gpio_softc *sc = gpio;
+	int npins, pin, i;
+
+	npins = gpio_npins(mask);
+	if (npins  sc-sc_npins)
+		return 0;
+
+	for (npins = 0, i = 0; i  32; i++)
+		if (mask  (1  i)) {
+			pin = offset + i;
+			if (pin  0 || pin = sc-sc_npins)
+return 0;
+			if (sc-sc_pins[pin].pin_mapped)
+return 0;
+		}
+
+	return 1;
+}
+
 int
 gpio_pin_map(void *gpio, int offset, u_int32_t mask, struct gpio_pinmap *map)
 {
@@ -483,8 +507,13 @@
 		if (kauth_authorize_device(cred, KAUTH_DEVICE_GPIO_PINSET,
 		NULL, NULL, NULL, NULL))
 			return EPERM;
-
+
 		attach = (struct gpio_attach *)data;
+
+		/* do not try to attach if the pins are already mapped */
+		if (!gpio_pin_can_map(sc, attach-ga_offset, attach-ga_mask))
+			return EBUSY;
+
 		ga.ga_gpio = sc;
 		ga.ga_dvname = attach-ga_dvname;
 		ga.ga_offset = attach-ga_offset;

Index: src/sys/dev/gpio/gpiovar.h
diff -u src/sys/dev/gpio/gpiovar.h:1.9 src/sys/dev/gpio/gpiovar.h:1.10
--- src/sys/dev/gpio/gpiovar.h:1.9	Sat Jul 25 16:30:44 2009
+++ src/sys/dev/gpio/gpiovar.h	Fri Aug 21 12:53:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gpiovar.h,v 1.9 2009/07/25 16:30:44 mbalmer Exp $ */
+/* $NetBSD: gpiovar.h,v 1.10 2009/08/21 12:53:42 mbalmer Exp $ */
 /*	$OpenBSD: gpiovar.h,v 1.3 2006/01/14 12:33:49 grange Exp $	*/
 
 /*
@@ -88,6 +88,7 @@
 	LIST_ENTRY(gpio_name)	gp_next;
 };
 
+int	gpio_pin_can_map(void *, int, u_int32_t);
 int	gpio_pin_map(void *, int, u_int32_t, struct gpio_pinmap *);
 void	gpio_pin_unmap(void *, struct gpio_pinmap *);
 int	gpio_pin_read(void *, struct gpio_pinmap *, int);



CVS commit: src/share/man/man4

2009-08-23 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sun Aug 23 10:20:41 UTC 2009

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

Log Message:
Mention that defining the GPIO layout is subject to kauth(9) auhtorization.
Suggested by Elad Efrat.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/share/man/man4/gpio.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/gpio.4
diff -u src/share/man/man4/gpio.4:1.12 src/share/man/man4/gpio.4:1.13
--- src/share/man/man4/gpio.4:1.12	Sat Aug  1 15:52:55 2009
+++ src/share/man/man4/gpio.4	Sun Aug 23 10:20:41 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: gpio.4,v 1.12 2009/08/01 15:52:55 mbalmer Exp $
+.\ $NetBSD: gpio.4,v 1.13 2009/08/23 10:20:41 mbalmer Exp $
 .\	$OpenBSD: gpio.4,v 1.5 2004/11/23 09:39:29 reyk Exp $
 .\
 .\ Copyright (c) 2004 Alexander Yurchenko gra...@openbsd.org
@@ -15,7 +15,7 @@
 .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\
-.Dd August 1, 2009
+.Dd August 23, 2009
 .Dt GPIO 4
 .Os
 .Sh NAME
@@ -52,8 +52,15 @@
 .Xr ioctl 2
 calls on these devices.
 .Pp
-The layout of the GPIO device is defined at a securelevel less than
-1, i.e. typically during system boot, and cannot be changed later.
+Whether the layout of the GPIO device can be configured is subject to
+authorization by the
+.Xr kauth 9
+framework.
+.Pp
+If the
+.Xr secmodel_securelevel 9
+is active, e.g., the layout of the GPIO device is defined at a securelevel
+less than 1, i.e. typically during system boot, and cannot be changed later.
 GPIO pins can be configured and given a symbolic name and device drivers
 that use GPIO pins can be attached to the
 .Nm



CVS commit: src/sys/dev/gpio

2009-08-23 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sun Aug 23 12:08:57 UTC 2009

Modified Files:
src/sys/dev/gpio: gpio.c

Log Message:
Prevent the creation of duplicate pin names in GPIOPINSET.
Problem noticed by rmind a while ago.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/gpio/gpio.c

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

Modified files:

Index: src/sys/dev/gpio/gpio.c
diff -u src/sys/dev/gpio/gpio.c:1.27 src/sys/dev/gpio/gpio.c:1.28
--- src/sys/dev/gpio/gpio.c:1.27	Fri Aug 21 12:53:42 2009
+++ src/sys/dev/gpio/gpio.c	Sun Aug 23 12:08:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.27 2009/08/21 12:53:42 mbalmer Exp $ */
+/* $NetBSD: gpio.c,v 1.28 2009/08/23 12:08:56 mbalmer Exp $ */
 /*	$OpenBSD: gpio.c,v 1.6 2006/01/14 12:33:49 grange Exp $	*/
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gpio.c,v 1.27 2009/08/21 12:53:42 mbalmer Exp $);
+__KERNEL_RCSID(0, $NetBSD: gpio.c,v 1.28 2009/08/23 12:08:56 mbalmer Exp $);
 
 /*
  * General Purpose Input/Output framework.
@@ -390,7 +390,7 @@
 	cfdata_t cf;
 	kauth_cred_t cred;
 	int locs[GPIOCF_NLOCS];
-	int pin, value, flags, npins, found;
+	int pin, value, flags, npins;
 
 	sc = device_lookup_private(gpio_cd, minor(dev));
 	gc = sc-sc_gc;
@@ -591,17 +591,21 @@
 		}
 
 		/* rename pin or new pin? */
-		/* XXX avoid the creation of duplicates */
 		if (set-gp_name2[0] != '\0') {
-			found = 0;
-			LIST_FOREACH(nm, sc-sc_names, gp_next)
-if (nm-gp_pin == pin) {
-	strlcpy(nm-gp_name, set-gp_name2,
-	sizeof(nm-gp_name));
-	found = 1;
-	break;
-}
-			if (!found) {
+			struct gpio_name *gnm;
+
+			gnm = NULL;
+			LIST_FOREACH(nm, sc-sc_names, gp_next) {
+if (!strcmp(nm-gp_name, set-gp_name2) 
+nm-gp_pin != pin)
+	return EINVAL;	/* duplicate name */
+if (nm-gp_pin == pin)
+	gnm = nm;
+			}
+			if (gnm != NULL)
+strlcpy(gnm-gp_name, set-gp_name2,
+sizeof(gnm-gp_name));
+			else  {
 nm = kmem_alloc(sizeof(struct gpio_name),
 KM_SLEEP);
 strlcpy(nm-gp_name, set-gp_name2,



CVS commit: src

2009-09-25 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Fri Sep 25 19:37:03 UTC 2009

Modified Files:
src/share/man/man4: gpio.4
src/sys/sys: gpio.h
src/usr.sbin/gpioctl: gpioctl.8 gpioctl.c

Log Message:
Jonatha Kollasch has a GPIO device that can pulse the output lines.
Support it wuth the GPIO_PIN_PULSE attribute and the 'pulse' paramater
to gpioctl.  Discussed with Jonathan.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/gpio.4
cvs rdiff -u -r1.5 -r1.6 src/sys/sys/gpio.h
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/gpioctl/gpioctl.8
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/gpioctl/gpioctl.c

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

Modified files:

Index: src/share/man/man4/gpio.4
diff -u src/share/man/man4/gpio.4:1.14 src/share/man/man4/gpio.4:1.15
--- src/share/man/man4/gpio.4:1.14	Sun Aug 23 15:41:28 2009
+++ src/share/man/man4/gpio.4	Fri Sep 25 19:37:03 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: gpio.4,v 1.14 2009/08/23 15:41:28 wiz Exp $
+.\ $NetBSD: gpio.4,v 1.15 2009/09/25 19:37:03 mbalmer Exp $
 .\	$OpenBSD: gpio.4,v 1.5 2004/11/23 09:39:29 reyk Exp $
 .\
 .\ Copyright (c) 2004 Alexander Yurchenko gra...@openbsd.org
@@ -15,7 +15,7 @@
 .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\
-.Dd August 23, 2009
+.Dd September 25, 2009
 .Dt GPIO 4
 .Os
 .Sh NAME
@@ -163,6 +163,8 @@
 invert input
 .It Dv GPIO_PIN_INVOUT
 invert output
+.It Dv GPIO_PIN_PULSE
+pulse output
 .El
 .Pp
 Note that the GPIO controller

Index: src/sys/sys/gpio.h
diff -u src/sys/sys/gpio.h:1.5 src/sys/sys/gpio.h:1.6
--- src/sys/sys/gpio.h:1.5	Tue Sep 22 01:29:36 2009
+++ src/sys/sys/gpio.h	Fri Sep 25 19:37:03 2009
@@ -1,6 +1,7 @@
-/* $NetBSD: gpio.h,v 1.5 2009/09/22 01:29:36 isaki Exp $ */
+/* $NetBSD: gpio.h,v 1.6 2009/09/25 19:37:03 mbalmer Exp $ */
 /*	$OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $	*/
 /*
+ * Copyright (c) 2009 Marc Balmer m...@msys.ch
  * Copyright (c) 2004 Alexander Yurchenko gra...@openbsd.org
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -38,6 +39,7 @@
 #define GPIO_PIN_INVIN		0x0100	/* invert input */
 #define GPIO_PIN_INVOUT		0x0200	/* invert output */
 #define GPIO_PIN_USER		0x0400	/* user != 0 can access */
+#define GPIO_PIN_PULSE		0x0800	/* pulse in hardware */
 #define GPIO_PIN_SET		0x8000	/* set for securelevel access */
 
 /* GPIO controller description */

Index: src/usr.sbin/gpioctl/gpioctl.8
diff -u src/usr.sbin/gpioctl/gpioctl.8:1.5 src/usr.sbin/gpioctl/gpioctl.8:1.6
--- src/usr.sbin/gpioctl/gpioctl.8:1.5	Sat Jul 25 16:18:09 2009
+++ src/usr.sbin/gpioctl/gpioctl.8	Fri Sep 25 19:37:03 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: gpioctl.8,v 1.5 2009/07/25 16:18:09 mbalmer Exp $
+.\ $NetBSD: gpioctl.8,v 1.6 2009/09/25 19:37:03 mbalmer Exp $
 .\
 .\ Copyright (c) 2009 Marc Balmer m...@msys.ch
 .\ Copyright (c) 2004 Alexander Yurchenko gra...@openbsd.org
@@ -15,7 +15,7 @@
 .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\
-.Dd July 15, 2009
+.Dd September 25, 2009
 .Dt GPIOCTL 8
 .Os
 .Sh NAME
@@ -137,6 +137,8 @@
 invert input
 .It iout
 invert output
+.It pulse
+pulse output
 .El
 .Pp
 Note that not all the flags may be supported by the particular GPIO controller.

Index: src/usr.sbin/gpioctl/gpioctl.c
diff -u src/usr.sbin/gpioctl/gpioctl.c:1.6 src/usr.sbin/gpioctl/gpioctl.c:1.7
--- src/usr.sbin/gpioctl/gpioctl.c:1.6	Sat Jul 25 16:18:09 2009
+++ src/usr.sbin/gpioctl/gpioctl.c	Fri Sep 25 19:37:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gpioctl.c,v 1.6 2009/07/25 16:18:09 mbalmer Exp $ */
+/* $NetBSD: gpioctl.c,v 1.7 2009/09/25 19:37:03 mbalmer Exp $ */
 
 /*
  * Copyright (c) 2008 Marc Balmer mbal...@openbsd.org
@@ -67,6 +67,7 @@
 	{ GPIO_PIN_PULLDOWN, pd },
 	{ GPIO_PIN_INVIN, iin },
 	{ GPIO_PIN_INVOUT, iout },
+	{ GPIO_PIN_PULSE, pulse },
 	{ 0, NULL },
 };
 



CVS commit: src

2009-09-25 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Fri Sep 25 20:27:50 UTC 2009

Modified Files:
src/sys/sys: gpio.h
src/usr.sbin/gpioctl: gpioctl.8 gpioctl.c

Log Message:
Rename 'pulse' to 'pulsate' to make clear it is a continuous strain of
pulses and and not a single shot pulse that is emitted by devices
supporting this kind of operation.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/sys/gpio.h
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/gpioctl/gpioctl.8
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/gpioctl/gpioctl.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/sys/gpio.h
diff -u src/sys/sys/gpio.h:1.6 src/sys/sys/gpio.h:1.7
--- src/sys/sys/gpio.h:1.6	Fri Sep 25 19:37:03 2009
+++ src/sys/sys/gpio.h	Fri Sep 25 20:27:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.h,v 1.6 2009/09/25 19:37:03 mbalmer Exp $ */
+/* $NetBSD: gpio.h,v 1.7 2009/09/25 20:27:50 mbalmer Exp $ */
 /*	$OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $	*/
 /*
  * Copyright (c) 2009 Marc Balmer m...@msys.ch
@@ -39,7 +39,7 @@
 #define GPIO_PIN_INVIN		0x0100	/* invert input */
 #define GPIO_PIN_INVOUT		0x0200	/* invert output */
 #define GPIO_PIN_USER		0x0400	/* user != 0 can access */
-#define GPIO_PIN_PULSE		0x0800	/* pulse in hardware */
+#define GPIO_PIN_PULSATE	0x0800	/* pulsate in hardware */
 #define GPIO_PIN_SET		0x8000	/* set for securelevel access */
 
 /* GPIO controller description */

Index: src/usr.sbin/gpioctl/gpioctl.8
diff -u src/usr.sbin/gpioctl/gpioctl.8:1.6 src/usr.sbin/gpioctl/gpioctl.8:1.7
--- src/usr.sbin/gpioctl/gpioctl.8:1.6	Fri Sep 25 19:37:03 2009
+++ src/usr.sbin/gpioctl/gpioctl.8	Fri Sep 25 20:27:50 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: gpioctl.8,v 1.6 2009/09/25 19:37:03 mbalmer Exp $
+.\ $NetBSD: gpioctl.8,v 1.7 2009/09/25 20:27:50 mbalmer Exp $
 .\
 .\ Copyright (c) 2009 Marc Balmer m...@msys.ch
 .\ Copyright (c) 2004 Alexander Yurchenko gra...@openbsd.org
@@ -137,8 +137,8 @@
 invert input
 .It iout
 invert output
-.It pulse
-pulse output
+.It pulsate
+pulsate output at a hardware-defined frequency and duty cycle
 .El
 .Pp
 Note that not all the flags may be supported by the particular GPIO controller.

Index: src/usr.sbin/gpioctl/gpioctl.c
diff -u src/usr.sbin/gpioctl/gpioctl.c:1.7 src/usr.sbin/gpioctl/gpioctl.c:1.8
--- src/usr.sbin/gpioctl/gpioctl.c:1.7	Fri Sep 25 19:37:03 2009
+++ src/usr.sbin/gpioctl/gpioctl.c	Fri Sep 25 20:27:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: gpioctl.c,v 1.7 2009/09/25 19:37:03 mbalmer Exp $ */
+/* $NetBSD: gpioctl.c,v 1.8 2009/09/25 20:27:50 mbalmer Exp $ */
 
 /*
  * Copyright (c) 2008 Marc Balmer mbal...@openbsd.org
@@ -67,7 +67,7 @@
 	{ GPIO_PIN_PULLDOWN, pd },
 	{ GPIO_PIN_INVIN, iin },
 	{ GPIO_PIN_INVOUT, iout },
-	{ GPIO_PIN_PULSE, pulse },
+	{ GPIO_PIN_PULSATE, pulsate },
 	{ 0, NULL },
 };
 



CVS commit: src/share/misc

2009-10-10 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Sat Oct 10 17:17:37 UTC 2009

Modified Files:
src/share/misc: airport

Log Message:
Sassari airport is actually in Alghero.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/share/misc/airport

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/airport
diff -u src/share/misc/airport:1.35 src/share/misc/airport:1.36
--- src/share/misc/airport:1.35	Tue Jul  7 10:50:51 2009
+++ src/share/misc/airport	Sat Oct 10 17:17:37 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: airport,v 1.35 2009/07/07 10:50:51 mbalmer Exp $
+#	$NetBSD: airport,v 1.36 2009/10/10 17:17:37 mbalmer Exp $
 #	@(#)airport	8.1 (Berkeley) 6/8/93
 #
 # Some of this information from http://www.mapping.com/airportcodes.html.
@@ -6442,7 +6442,7 @@
 QSO:Sousse, Tunisia
 QSP:Sancti Spiritu, Cuba
 QSR:Salerno, Italy
-QSS:Alhegro/Sassari, Sardinia, Italy
+QSS:Alghero/Sassari, Sardinia, Italy
 QSZ:Shizuoka City, Japan
 QTA:Atibaia, SP, Brazil
 QTD:Timbauba, PE, Brazil



CVS commit: src/sys/dev/usb

2011-03-29 Thread Marc Balmer
Module Name:src
Committed By:   mbalmer
Date:   Tue Mar 29 07:48:14 UTC 2011

Modified Files:
src/sys/dev/usb: ulpt.c

Log Message:
Don't comment out printer reset on open, if this causes a problem, use the
/dev/ulpnX device node which sets a flag that prevents the reset.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/usb/ulpt.c

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

Modified files:

Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.85 src/sys/dev/usb/ulpt.c:1.86
--- src/sys/dev/usb/ulpt.c:1.85	Wed Nov  3 22:34:24 2010
+++ src/sys/dev/usb/ulpt.c	Tue Mar 29 07:48:13 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ulpt.c,v 1.85 2010/11/03 22:34:24 dyoung Exp $	*/
+/*	$NetBSD: ulpt.c,v 1.86 2011/03/29 07:48:13 mbalmer Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $	*/
 
 /*
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ulpt.c,v 1.85 2010/11/03 22:34:24 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: ulpt.c,v 1.86 2011/03/29 07:48:13 mbalmer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -524,10 +524,8 @@
 	error = 0;
 	sc-sc_refcnt++;
 
-#if 0 /* XXX causes some printers to disconnect */
 	if ((flags  ULPT_NOPRIME) == 0)
 		ulpt_reset(sc);
-#endif
 
 	for (spin = 0; (ulpt_status(sc)  LPS_SELECT) == 0; spin += STEP) {
 		DPRINTFN(2, (ulpt_open: waiting a while\n));



  1   2   3   4   5   6   7   8   9   10   >