Plan 9 from Bell Labs 2007-09-20

dist/replica/_plan9.db

@@ -5830,7 +5830,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1189631972 266898
+sys/games/lib/fortunes - 664 sys sys 1190238331 266990
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -6703,7 +6703,7 @@ sys/lib/man/trademarks - 664 sys sys 958527089 1838
 sys/lib/mimetype - 664 sys sys 1168305580 6313
 sys/lib/newuser - 775 sys sys 1112362340 1226
 sys/lib/plumb - 20000000775 sys sys 1039727360 0
-sys/lib/plumb/basic - 664 sys sys 1155363394 2879
+sys/lib/plumb/basic - 664 sys sys 1190228595 2889
 sys/lib/plumb/fileaddr - 664 sys sys 944957365 88
 sys/lib/postscript - 20000000775 sys sys 1039727391 0
 sys/lib/postscript/afm - 20000000775 sys sys 1020895803 0
@@ -7431,7 +7431,7 @@ sys/man/1/ns - 664 sys sys 1163208505 895
 sys/man/1/p - 664 sys sys 944959673 504
 sys/man/1/page - 664 sys sys 1087829646 5839
 sys/man/1/passwd - 664 sys sys 1181277007 1532
-sys/man/1/patch - 664 sys sys 1145023250 2375
+sys/man/1/patch - 664 sys sys 1190245640 2437
 sys/man/1/pcc - 664 sys sys 1015024740 3478
 sys/man/1/pic - 664 sys sys 1022625353 8229
 sys/man/1/pipefile - 664 sys sys 984709628 1861
@@ -7513,7 +7513,7 @@ sys/man/2/arg - 664 sys sys 1139744263 2184
 sys/man/2/arith3 - 664 sys sys 1162102967 4393
 sys/man/2/assert - 664 sys sys 1102868467 377
 sys/man/2/atof - 664 sys sys 1171668702 2778
-sys/man/2/auth - 664 sys sys 1187643286 7538
+sys/man/2/auth - 664 sys sys 1190243345 7537
 sys/man/2/authsrv - 664 sys sys 1171690308 4505
 sys/man/2/bin - 664 sys sys 985023077 1880
 sys/man/2/bind - 664 sys sys 1015091518 4685
@@ -7703,14 +7703,14 @@ sys/man/4/consolefs - 664 sys sys 1144424854 4245
 sys/man/4/cwfs - 664 sys sys 1189029640 6255
 sys/man/4/dossrv - 664 sys sys 1168307403 4334
 sys/man/4/execnet - 664 sys sys 1019866708 1069
-sys/man/4/exportfs - 664 sys sys 1189182220 4657
+sys/man/4/exportfs - 664 sys sys 1190243304 4655
 sys/man/4/ext2srv - 664 sys sys 1055692986 2409
 sys/man/4/factotum - 664 sys sys 1187721636 14843
 sys/man/4/fossil - 664 sys sys 1186820346 9592
 sys/man/4/fs - 664 sys sys 1188531555 3441
 sys/man/4/ftpfs - 664 sys sys 1112563349 4410
 sys/man/4/httpfile - 664 sys sys 1128556957 1233
-sys/man/4/import - 664 sys sys 1179442944 3272
+sys/man/4/import - 664 sys sys 1190243339 3269
 sys/man/4/iostats - 664 sys sys 1105574383 1621
 sys/man/4/keyfs - 664 sys sys 1116594919 5048
 sys/man/4/kfs - 664 sys sys 1102088374 2164
@@ -7825,7 +7825,7 @@ sys/man/8/init - 664 sys sys 944959679 1430
 sys/man/8/ipconfig - 664 sys sys 1177100280 7984
 sys/man/8/ipserv - 664 sys sys 1188191285 4411
 sys/man/8/kfscmd - 664 sys sys 1182192559 4514
-sys/man/8/listen - 664 sys sys 1188520111 3664
+sys/man/8/listen - 664 sys sys 1190243316 3735
 sys/man/8/lp - 664 sys sys 954614702 2491
 sys/man/8/mk9660 - 664 sys sys 1104430379 3946
 sys/man/8/mkfs - 664 sys sys 1186179498 3427
@@ -7839,7 +7839,7 @@ sys/man/8/nfsserver - 664 sys sys 1163208425 3587
 sys/man/8/pcmcia - 664 sys sys 944959679 408
 sys/man/8/pem - 664 sys sys 1060263669 1189
 sys/man/8/ping - 664 sys sys 1169105315 3650
-sys/man/8/plan9.ini - 664 sys sys 1181239022 23242
+sys/man/8/plan9.ini - 664 sys sys 1190241912 23835
 sys/man/8/pop3 - 664 sys sys 1063854676 2720
 sys/man/8/ppp - 664 sys sys 1187046045 4430
 sys/man/8/prep - 664 sys sys 1152729153 14013
@@ -8079,7 +8079,7 @@ sys/src/9/pc/ether8139.c - 664 sys sys 1185650567 19974
 sys/src/9/pc/ether8169.c - 664 sys sys 1185812348 26931
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1131290377 32294
 sys/src/9/pc/ether82557.c - 664 sys sys 1185509068 30197
-sys/src/9/pc/ether82563.c - 664 sys sys 1178932992 32729
+sys/src/9/pc/ether82563.c - 664 sys sys 1190235476 35505
 sys/src/9/pc/ether83815.c - 664 sys sys 1172259521 26346
 sys/src/9/pc/ether8390.c - 664 sys sys 1131290377 17702
 sys/src/9/pc/ether8390.h - 664 sys sys 1015014517 1511
@@ -8141,7 +8141,7 @@ sys/src/9/pc/screen.c - 664 sys sys 1184522395 13973
 sys/src/9/pc/screen.h - 664 sys sys 1147023549 4256
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1170456695 55276
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657
-sys/src/9/pc/sd63xxesb.c - 664 sys sys 1184467400 35975
+sys/src/9/pc/sd63xxesb.c - 664 sys sys 1190229767 36207
 sys/src/9/pc/sdata.c - 664 sys sys 1186361525 52991
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1184467229 33837
 sys/src/9/pc/sdmylex.c - 664 sys sys 1189229947 28395
@@ -8150,7 +8150,7 @@ sys/src/9/pc/trap.c - 664 sys sys 1186361997 21898
 sys/src/9/pc/uartaxp.c - 664 sys sys 1166247784 18879
 sys/src/9/pc/uarti8250.c - 664 sys sys 1177676872 13957
 sys/src/9/pc/uartisa.c - 664 sys sys 1127126907 1777
-sys/src/9/pc/uartpci.c - 664 sys sys 1187668457 4534
+sys/src/9/pc/uartpci.c - 664 sys sys 1190235592 4685
 sys/src/9/pc/usb.h - 664 sys sys 1165555430 4257
 sys/src/9/pc/usbuhci.c - 664 sys sys 1184466791 31205
 sys/src/9/pc/vga.c - 664 sys sys 1131290595 5148
@@ -9156,7 +9156,7 @@ sys/src/boot/pc/ether82563.c - 664 sys sys 1181517000 25452
 sys/src/boot/pc/ether83815.c - 664 sys sys 1144961190 21993
 sys/src/boot/pc/ether8390.c - 664 sys sys 1112382847 16209
 sys/src/boot/pc/ether8390.h - 664 sys sys 1015007951 1392
-sys/src/boot/pc/etherdp83820.c - 664 sys sys 1178926667 28729
+sys/src/boot/pc/etherdp83820.c - 664 sys sys 1190221155 28740
 sys/src/boot/pc/etherec2t.c - 664 sys sys 1015007951 3598
 sys/src/boot/pc/etherelnk3.c - 664 sys sys 1158012439 44736
 sys/src/boot/pc/etherelnk3x.c - 664 sys sys 1015007951 24989
@@ -12378,7 +12378,7 @@ sys/src/cmd/hoc/tests.a - 664 sys sys 944961000 1782
 sys/src/cmd/html2ms.c - 664 sys sys 1014926694 10030
 sys/src/cmd/htmlfmt - 20000000775 sys sys 1060876449 0
 sys/src/cmd/htmlfmt/dat.h - 664 sys sys 1034015651 845
-sys/src/cmd/htmlfmt/html.c - 664 sys sys 1060876449 6032
+sys/src/cmd/htmlfmt/html.c - 664 sys sys 1190228833 6040
 sys/src/cmd/htmlfmt/main.c - 664 sys sys 1034015651 1108
 sys/src/cmd/htmlfmt/mkfile - 664 sys sys 1034015650 297
 sys/src/cmd/htmlfmt/util.c - 664 sys sys 1015364025 1765

dist/replica/plan9.db

@@ -5830,7 +5830,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1189631972 266898
+sys/games/lib/fortunes - 664 sys sys 1190238331 266990
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -6703,7 +6703,7 @@ sys/lib/man/trademarks - 664 sys sys 958527089 1838
 sys/lib/mimetype - 664 sys sys 1168305580 6313
 sys/lib/newuser - 775 sys sys 1112362340 1226
 sys/lib/plumb - 20000000775 sys sys 1039727360 0
-sys/lib/plumb/basic - 664 sys sys 1155363394 2879
+sys/lib/plumb/basic - 664 sys sys 1190228595 2889
 sys/lib/plumb/fileaddr - 664 sys sys 944957365 88
 sys/lib/postscript - 20000000775 sys sys 1039727391 0
 sys/lib/postscript/afm - 20000000775 sys sys 1020895803 0
@@ -7431,7 +7431,7 @@ sys/man/1/ns - 664 sys sys 1163208505 895
 sys/man/1/p - 664 sys sys 944959673 504
 sys/man/1/page - 664 sys sys 1087829646 5839
 sys/man/1/passwd - 664 sys sys 1181277007 1532
-sys/man/1/patch - 664 sys sys 1145023250 2375
+sys/man/1/patch - 664 sys sys 1190245640 2437
 sys/man/1/pcc - 664 sys sys 1015024740 3478
 sys/man/1/pic - 664 sys sys 1022625353 8229
 sys/man/1/pipefile - 664 sys sys 984709628 1861
@@ -7513,7 +7513,7 @@ sys/man/2/arg - 664 sys sys 1139744263 2184
 sys/man/2/arith3 - 664 sys sys 1162102967 4393
 sys/man/2/assert - 664 sys sys 1102868467 377
 sys/man/2/atof - 664 sys sys 1171668702 2778
-sys/man/2/auth - 664 sys sys 1187643286 7538
+sys/man/2/auth - 664 sys sys 1190243345 7537
 sys/man/2/authsrv - 664 sys sys 1171690308 4505
 sys/man/2/bin - 664 sys sys 985023077 1880
 sys/man/2/bind - 664 sys sys 1015091518 4685
@@ -7703,14 +7703,14 @@ sys/man/4/consolefs - 664 sys sys 1144424854 4245
 sys/man/4/cwfs - 664 sys sys 1189029640 6255
 sys/man/4/dossrv - 664 sys sys 1168307403 4334
 sys/man/4/execnet - 664 sys sys 1019866708 1069
-sys/man/4/exportfs - 664 sys sys 1189182220 4657
+sys/man/4/exportfs - 664 sys sys 1190243304 4655
 sys/man/4/ext2srv - 664 sys sys 1055692986 2409
 sys/man/4/factotum - 664 sys sys 1187721636 14843
 sys/man/4/fossil - 664 sys sys 1186820346 9592
 sys/man/4/fs - 664 sys sys 1188531555 3441
 sys/man/4/ftpfs - 664 sys sys 1112563349 4410
 sys/man/4/httpfile - 664 sys sys 1128556957 1233
-sys/man/4/import - 664 sys sys 1179442944 3272
+sys/man/4/import - 664 sys sys 1190243339 3269
 sys/man/4/iostats - 664 sys sys 1105574383 1621
 sys/man/4/keyfs - 664 sys sys 1116594919 5048
 sys/man/4/kfs - 664 sys sys 1102088374 2164
@@ -7825,7 +7825,7 @@ sys/man/8/init - 664 sys sys 944959679 1430
 sys/man/8/ipconfig - 664 sys sys 1177100280 7984
 sys/man/8/ipserv - 664 sys sys 1188191285 4411
 sys/man/8/kfscmd - 664 sys sys 1182192559 4514
-sys/man/8/listen - 664 sys sys 1188520111 3664
+sys/man/8/listen - 664 sys sys 1190243316 3735
 sys/man/8/lp - 664 sys sys 954614702 2491
 sys/man/8/mk9660 - 664 sys sys 1104430379 3946
 sys/man/8/mkfs - 664 sys sys 1186179498 3427
@@ -7839,7 +7839,7 @@ sys/man/8/nfsserver - 664 sys sys 1163208425 3587
 sys/man/8/pcmcia - 664 sys sys 944959679 408
 sys/man/8/pem - 664 sys sys 1060263669 1189
 sys/man/8/ping - 664 sys sys 1169105315 3650
-sys/man/8/plan9.ini - 664 sys sys 1181239022 23242
+sys/man/8/plan9.ini - 664 sys sys 1190241912 23835
 sys/man/8/pop3 - 664 sys sys 1063854676 2720
 sys/man/8/ppp - 664 sys sys 1187046045 4430
 sys/man/8/prep - 664 sys sys 1152729153 14013
@@ -8079,7 +8079,7 @@ sys/src/9/pc/ether8139.c - 664 sys sys 1185650567 19974
 sys/src/9/pc/ether8169.c - 664 sys sys 1185812348 26931
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1131290377 32294
 sys/src/9/pc/ether82557.c - 664 sys sys 1185509068 30197
-sys/src/9/pc/ether82563.c - 664 sys sys 1178932992 32729
+sys/src/9/pc/ether82563.c - 664 sys sys 1190235476 35505
 sys/src/9/pc/ether83815.c - 664 sys sys 1172259521 26346
 sys/src/9/pc/ether8390.c - 664 sys sys 1131290377 17702
 sys/src/9/pc/ether8390.h - 664 sys sys 1015014517 1511
@@ -8141,7 +8141,7 @@ sys/src/9/pc/screen.c - 664 sys sys 1184522395 13973
 sys/src/9/pc/screen.h - 664 sys sys 1147023549 4256
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1170456695 55276
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1131290556 12657
-sys/src/9/pc/sd63xxesb.c - 664 sys sys 1184467400 35975
+sys/src/9/pc/sd63xxesb.c - 664 sys sys 1190229767 36207
 sys/src/9/pc/sdata.c - 664 sys sys 1186361525 52991
 sys/src/9/pc/sdmv50xx.c - 664 sys sys 1184467229 33837
 sys/src/9/pc/sdmylex.c - 664 sys sys 1189229947 28395
@@ -8150,7 +8150,7 @@ sys/src/9/pc/trap.c - 664 sys sys 1186361997 21898
 sys/src/9/pc/uartaxp.c - 664 sys sys 1166247784 18879
 sys/src/9/pc/uarti8250.c - 664 sys sys 1177676872 13957
 sys/src/9/pc/uartisa.c - 664 sys sys 1127126907 1777
-sys/src/9/pc/uartpci.c - 664 sys sys 1187668457 4534
+sys/src/9/pc/uartpci.c - 664 sys sys 1190235592 4685
 sys/src/9/pc/usb.h - 664 sys sys 1165555430 4257
 sys/src/9/pc/usbuhci.c - 664 sys sys 1184466791 31205
 sys/src/9/pc/vga.c - 664 sys sys 1131290595 5148
@@ -9156,7 +9156,7 @@ sys/src/boot/pc/ether82563.c - 664 sys sys 1181517000 25452
 sys/src/boot/pc/ether83815.c - 664 sys sys 1144961190 21993
 sys/src/boot/pc/ether8390.c - 664 sys sys 1112382847 16209
 sys/src/boot/pc/ether8390.h - 664 sys sys 1015007951 1392
-sys/src/boot/pc/etherdp83820.c - 664 sys sys 1178926667 28729
+sys/src/boot/pc/etherdp83820.c - 664 sys sys 1190221155 28740
 sys/src/boot/pc/etherec2t.c - 664 sys sys 1015007951 3598
 sys/src/boot/pc/etherelnk3.c - 664 sys sys 1158012439 44736
 sys/src/boot/pc/etherelnk3x.c - 664 sys sys 1015007951 24989
@@ -12378,7 +12378,7 @@ sys/src/cmd/hoc/tests.a - 664 sys sys 944961000 1782
 sys/src/cmd/html2ms.c - 664 sys sys 1014926694 10030
 sys/src/cmd/htmlfmt - 20000000775 sys sys 1060876449 0
 sys/src/cmd/htmlfmt/dat.h - 664 sys sys 1034015651 845
-sys/src/cmd/htmlfmt/html.c - 664 sys sys 1060876449 6032
+sys/src/cmd/htmlfmt/html.c - 664 sys sys 1190228833 6040
 sys/src/cmd/htmlfmt/main.c - 664 sys sys 1034015651 1108
 sys/src/cmd/htmlfmt/mkfile - 664 sys sys 1034015650 297
 sys/src/cmd/htmlfmt/util.c - 664 sys sys 1015364025 1765

dist/replica/plan9.log

@@ -52793,3 +52793,20 @@
 1190093403 7 c sys/src/libventi/log.c - 664 sys sys 1190092827 3936
 1190142004 0 c 386/lib/libventi.a - 664 sys sys 1190141465 190048
 1190151004 0 c sys/man/1/2c - 664 sys sys 1190150125 9524
+1190210403 0 c sys/games/lib/fortunes - 664 sys sys 1190209086 266936
+1190221204 0 c sys/src/boot/pc/etherdp83820.c - 664 sys sys 1190221155 28740
+1190228404 0 c sys/lib/plumb/basic - 664 sys sys 1190228595 2889
+1190230204 0 c sys/src/9/pc/sd63xxesb.c - 664 sys sys 1190229767 36207
+1190230204 1 c sys/src/cmd/htmlfmt/html.c - 664 sys sys 1190228833 6040
+1190233804 0 c sys/man/8/plan9.ini - 664 sys sys 1190233745 23271
+1190233804 1 c sys/src/9/pc/ether82563.c - 664 sys sys 1190233853 34873
+1190235604 0 c sys/man/8/plan9.ini - 664 sys sys 1190235350 23285
+1190235604 1 c sys/src/9/pc/uartpci.c - 664 sys sys 1190235592 4685
+1190235604 2 c sys/src/9/pc/ether82563.c - 664 sys sys 1190235476 35505
+1190239204 0 c sys/games/lib/fortunes - 664 sys sys 1190238331 266990
+1190242805 0 c sys/man/8/plan9.ini - 664 sys sys 1190241912 23835
+1190244604 0 c sys/man/2/auth - 664 sys sys 1190243345 7537
+1190244604 1 c sys/man/4/exportfs - 664 sys sys 1190243304 4655
+1190244604 2 c sys/man/4/import - 664 sys sys 1190243339 3269
+1190244604 3 c sys/man/8/listen - 664 sys sys 1190243316 3735
+1190246404 0 c sys/man/1/patch - 664 sys sys 1190245640 2437

sys/games/lib/fortunes

@@ -4195,3 +4195,5 @@ By the time you finish reading this article, you will be able to take advantage
 Intel Pentium 4 2.0Hz processor - TigerDirect catalogue
 You are roughly 2^90 times more likely to win a U.S. state lottery *and* be struck by lightning simultaneously than you are to encounter [an accidental SHA1 collision] in your file system.  - J. Black
 prelink - prelink ELF shared libraries and binaries to speed up startup time
+	schedule(); // XXX poll? waitqueues?
+gsoc | doc archive | uriel | harmful | 9P | cat-v.org

sys/lib/plumb/basic

@@ -35,7 +35,7 @@ plumb start window rc -c '''echo % mail '''$0'; mail '$0
 # image files go to page
 type is text
 data matches '[a-zA-Z¡-￿0-9_\-./]+'
-data matches '([a-zA-Z¡-￿0-9_\-./]+)\.(jpe?g|JPE?G|gif|GIF|tiff?|TIFF?|ppm|PPM|bit|BIT|png|PNG|pgm|PGM|bmp|BMP)'
+data matches '([a-zA-Z¡-￿0-9_\-./]+)\.(jpe?g|JPE?G|gif|GIF|tiff?|TIFF?|ppm|PPM|bit|BIT|png|PNG|pgm|PGM|bmp|BMP|yuv|YUV)'
 arg isfile	$0
 plumb to image
 plumb client page -wi
@@ -51,7 +51,7 @@ plumb start page -w $file
 
 # existing files, possibly tagged by line number, go to editor
 type is text
-data matches '([.a-zA-Z¡-￿0-9_/\-]*[a-zA-Z¡-￿0-9_/\-])('$addr')?'
+data matches '([.a-zA-Z¡-￿0-9_/+\-]*[a-zA-Z¡-￿0-9_/+\-])('$addr')?'
 arg isfile	$1
 data set	$file
 attr add	addr=$3

sys/man/1/patch

@@ -44,6 +44,7 @@ and is stored in
 creates a new patch consisting of the changes to
 the listed files, reading
 a description of the patch from standard input.
+Please provide some context and justification for the change.
 The
 .I email
 address, if not

sys/man/2/auth

@@ -132,7 +132,7 @@ changes the user id of the process
 and recreates the namespace using the file
 .I namespace
 (default
-.BR /lib/nnamespace ).
+.BR /lib/namespace ).
 It uses
 .I auth_userpasswd
 and

sys/man/4/exportfs

@@ -43,11 +43,6 @@ tree are executed on the remote server and the results returned.  This
 gives the appearance of exporting a name space from a remote machine
 into a local file tree.
 .PP
-.I Exportfs
-creates a new name space for each connection, using
-.B /lib/namespace
-by default (see
-.IR namespace (6)).
 The options are:
 .TP
 .PD
@@ -66,6 +61,11 @@ protocol before running the regular
 session; used when 
 .I exportfs
 is invoked to handle an incoming network connection.
+.I Exportfs
+creates a new name space for each connection, using
+.B /lib/namespace
+by default (see
+.IR namespace (6)).
 .TP
 .B -B \fIaddress
 Dial
@@ -249,6 +249,6 @@ cd /n/spy; ls
 .br
 .B /sys/src/cmd/srvfs.c
 .SH SEE ALSO
-.IR aan (8),
 .IR import (4),
-.IR exportfs (4)
+.IR aan (8),
+.IR listen (8)

sys/man/4/import

@@ -152,7 +152,7 @@ telnet /net.alt/tcp!ucbvax
 .PP
 Suppose that the machine
 .B moscvax
-is has access to a private file server containing public web pages
+has access to a private file server containing public web pages
 that need to be served by the less-trusted server
 .BR webvax .
 .B Webvax

sys/man/8/listen

@@ -45,17 +45,20 @@ are executed as user
 .BR none ;
 services found in
 .I trustsrvdir
-as executed as the user who started
+are executed as the user who started
 .IR listen .
+When changing user to
+.BR none ,
+a new namespace is created,
+usually by executing
+.BR /lib/namespace ,
+but
+.B -n
+selects an alternate
+.IR namespace .
 Option
 .B -q
-suppresses affirmative log information;
-option
-.B -n
-sets an alternate
-.I namespace
-file (default
-.BR /lib/namespace ).
+suppresses affirmative log information.
 .PP
 Service names are made by concatenating the name of
 the network with the name of the service or port.

sys/man/8/plan9.ini

@@ -56,7 +56,7 @@ However, values whose names begin with an asterisk
 are used by the kernel and are not converted into environment variables.
 .PP
 The following sections describe how variables are used.
-.SS DEVICES
+.SS ETHERNET
 .SS \fLetherX=value\fP
 This defines an Ethernet interface.
 .IR X ,
@@ -85,7 +85,9 @@ have automatically detected it.
 Some cards are software configurable and do not require all options.
 Unspecified options default to the factory defaults.
 .PP
-Known types are
+Known
+.IR TYPE s
+are
 .\" .TF ga620
 .TF vt6102
 .PD
@@ -95,8 +97,9 @@ The Intel 8254X Gigabit Ethernet controllers,
 as found on the Intel PRO/1000 adapters for copper (not fiber).
 Completely configurable.
 .TP
-.B i82563
-The Intel 82563 Gigabit Ethernet controller.
+.B igbepcie
+The Intel 8256[36], 8257[12], and 82573[ev] Gigabit Ethernet
+PCI-Express controllers.
 Completely configurable.
 .TP
 .B rtl8169
@@ -380,7 +383,9 @@ programming interface.
 Currently the only tested cards are those based on the
 Intersil Prism 2.5 chipset.
 .
-.SS \fLusbX=type=uhci port=xxx irq=xxx\fP
+.SS DISKS, TAPES
+(S)ATA controllers are autodetected.
+.SS \fLusbX=type=uhci\fP
 This specifies the settings for a USB UHCI controller.
 Like the Ethernet controllers, USB controllers are autodetected
 after scanning for the ones listed in
@@ -395,7 +400,9 @@ disabled by specifying the line
 This defines a SCSI interface which cannot be automatically detected
 by the kernel.
 .PP
-Known types are
+Known
+.IR TYPE s 
+are
 .TP
 .B aha1542
 Adaptec 154x series of controllers (and clones).
@@ -418,10 +425,30 @@ both the hard reset and SCSI bus reset flags in the driver interface.
 If a variable
 .BR *noscsireset
 is defined, the SCSI bus reset flag is omitted.
+.SS \fLaoeif=\fP\fIlist\fP
+This specifies a space-separated
+.I list
+of Ethernet interfaces to be bound at boot to the ATA-over-Ethernet driver,
+.IR aoe (3).
+For example,
+.LR "aoeif=ether0 ether1" .
+Only interfaces on this list will initially be accessible via AoE.
+.SS \fLaoedev=e!#æ/aoe/\fIshelf\fL.\fIslot\fR
+This specifies an ATA-over-Ethernet device accessible via the interfaces
+named in
+.IR aoeif
+on AoE
+.I shelf
+and
+.I slot
+to use as a root device for bootstrapping.
+.SS AUDIO
 .SS \fLaudioX=value\fP
 This defines a sound interface.
 .PP
 Known types are
+.TF ess1688
+.PD
 .TP
 .B sb16
 Sound Blaster 16.

sys/src/9/pc/sd63xxesb.c

@@ -1,5 +1,5 @@
 /*
- * intel 63[12]?esb ahci sata controller
+ * intel/amd ahci sata controller
  * copyright © 2007 coraid, inc.
  */
 
@@ -14,10 +14,10 @@
 #include "ahci.h"
 
 #define	dprint(...)	if(debug == 1)	iprint(__VA_ARGS__); else USED(debug)
-#define	idprint(...)	if(prid == 1)	print(__VA_ARGS__); else USED(prid)
+#define	idprint(...)	if(prid == 1)	print(__VA_ARGS__);  else USED(prid)
 #define	aprint(...)	if(datapi == 1)	iprint(__VA_ARGS__); else USED(datapi)
 
-enum{
+enum {
 	NCtlr	= 4,
 	NCtlrdrv= 32,
 	NDrive	= NCtlr*NCtlrdrv,
@@ -27,13 +27,27 @@ enum{
 };
 
 /* pci space configuration */
-enum{
+enum {
 	Pmap	= 0x90,
 	Ppcs	= 0x91,
 	Prev	= 0xa8,
 };
 
-enum{
+enum {
+	Tesb,
+	Tich,
+	Tsb600,
+};
+
+#define Intel(x)	((x) == Tesb  || (x) == Tich)
+
+static char *tname[] = {
+	"63xxesb",
+	"ich",
+	"sb600",
+};
+
+enum {
 	Dnull,
 	Dmissing,
 	Dnew,
@@ -59,7 +73,7 @@ static char *diskstates[Dlast] = {
 extern SDifc sd63xxesbifc;
 typedef struct Ctlr Ctlr;
 
-enum{
+enum {
 	DMautoneg,
 	DMsatai,
 	DMsataii,
@@ -80,7 +94,7 @@ static char *flagname[] = {
 	"atapi16",
 };
 
-typedef struct{
+typedef struct {
 	Lock;
 
 	Ctlr	*ctlr;
@@ -114,8 +128,7 @@ typedef struct{
 struct Ctlr{
 	Lock;
 
-	int	irq;
-	int	tbdf;
+	int	type;
 	int	enabled;
 	SDev	*sdev;
 	Pcidev	*pci;
@@ -196,7 +209,7 @@ esleep(int ms)
 	poperror();
 }
 
-typedef struct{
+typedef struct {
 	Aport	*p;
 	int	i;
 }Asleep;
@@ -297,6 +310,10 @@ setudmamode(Aportc *pc, uchar f)
 	Actab *t;
 	Alist *l;
 
+	/* hack */
+	if((pc->p->sig >> 16) == 0xeb14)
+		return 0;
+
 	t = pc->m->ctab;
 	c = t->cfis;
 
@@ -1100,12 +1117,11 @@ newdrive(Drive *d)
 	return 0;
 
 lose:
-//	qunlock(&d->portm);		/* shurely shome mishtake */
 	qunlock(c->m);
 	return -1;
 }
 
-enum{
+enum {
 	Nms		= 256,
 	Mphywait	=  2*1024/Nms - 1,
 	Midwait		= 16*1024/Nms - 1,
@@ -1303,7 +1319,7 @@ iaenable(SDev *s)
 			kproc("iasata", satakproc, 0);
 		pcisetbme(c->pci);
 		snprint(name, sizeof name, "%s (%s)", s->name, s->ifc->name);
-		intrenable(c->irq, iainterrupt, c, c->tbdf, name);
+		intrenable(c->pci->intl, iainterrupt, c, c->pci->tbdf, name);
 		/* supposed to squelch leftover interrupts here. */
 		ahcienable(c->hba);
 	}
@@ -1322,7 +1338,7 @@ iadisable(SDev *s)
 	ilock(c);
 	ahcidisable(c->hba);
 	snprint(name, sizeof name, "%s (%s)", s->name, s->ifc->name);
-	intrdisable(c->irq, iainterrupt, c, c->tbdf, name);
+	intrdisable(c->pci->intl, iainterrupt, c, c->pci->tbdf, name);
 	c->enabled = 0;
 	iunlock(c);
 	return 1;
@@ -1710,19 +1726,17 @@ iasetupahci(Ctlr *c)
 	pcicfgw16(c->pci, 0x40, pcicfgr16(c->pci, 0x40) & ~(1<<15));
 	pcicfgw16(c->pci, 0x42, pcicfgr16(c->pci, 0x42) & ~(1<<15));
 
-	c->lmmio[0x4/4] |= 1<<31;	/* enable ahci mode (ghc register) */
-	c->lmmio[0xc/4] = (1<<6) - 1;	/* 5 ports. (supposedly ro pi reg.) */
+	c->lmmio[0x4/4] |= 1 << 31;	/* enable ahci mode (ghc register) */
+	c->lmmio[0xc/4] = (1 << 6) - 1;	/* 5 ports. (supposedly ro pi reg.) */
 
-	/* enable ahci mode. */
-//	pcicfgw8(c->pci, 0x90, 0x40);
-//	pcicfgw16(c->pci, 0x90, 1<<6 | 1<<5); /* pedantically proper for ich9 */
-	pcicfgw8(c->pci, 0x90, 1<<6 | 1<<5);  /* pedantically proper for ich9 */
+	/* enable ahci mode; from ich9 datasheet */
+	pcicfgw8(c->pci, 0x90, 1<<6 | 1<<5);
 }
 
 static SDev*
 iapnp(void)
 {
-	int i, n, nunit;
+	int i, n, nunit, type;
 	ulong io;
 	Ctlr *c;
 	Drive *d;
@@ -1736,11 +1750,17 @@ iapnp(void)
 	p = nil;
 	head = tail = nil;
 loop:
-	while((p = pcimatch(p, 0x8086, 0)) != nil){
-		if((p->did & 0xfffc) != 0x2680 && (p->did & 0xfffe) != 0x27c4)
-			continue;		/* !esb && !82801g[bh]m */
+	while((p = pcimatch(p, 0, 0)) != nil){
+		if(p->vid == 0x8086 && (p->did & 0xfffc) == 0x2680)
+			type = Tesb;
+		else if(p->vid == 0x8086 && (p->did & 0xfffe) != 0x27c4)
+			type = Tich;		/* 82801g[bh]m */
+		else if(p->vid == 0x1002 && p->did == 0x4380)
+			type = Tsb600;
+		else
+			continue;
 		if(niactlr == NCtlr){
-			print("iapnp: too many controllers\n");
+			print("%spnp: too many controllers\n", tname[type]);
 			break;
 		}
 		c = iactlr + niactlr;
@@ -1750,33 +1770,32 @@ loop:
 		io = p->mem[Abar].bar & ~0xf;
 		c->mmio = vmap(io, p->mem[0].size);
 		if(c->mmio == 0){
-			print("iapnp: address 0x%luX in use did=%x\n",
-				io, p->did);
+			print("%s: address 0x%luX in use did=%x\n",
+				tname[type], io, p->did);
 			continue;
 		}
 		c->lmmio = (ulong*)c->mmio;
 		c->pci = p;
-		if(p->did != 0x2681)
+		c->type = type;
+		if(Intel(c->type) && p->did != 0x2681)
 			iasetupahci(c);
 		nunit = ahciconf(c);
-		// ahcihbareset((Ahba*)c->mmio);
-		if(iaahcimode(p) == -1)
+//		ahcihbareset((Ahba*)c->mmio);
+		if(Intel(c->type) && iaahcimode(p) == -1)
 			break;
 		if(nunit < 1){
 			vunmap(c->mmio, p->mem[0].size);
 			continue;
 		}
 
-		i = (c->hba->cap>>21) & 1;
-		print("intel 63[12]xesb: sata-%s ports with %d ports\n",
-			"I\0II" + i*2, nunit);
+		i = (c->hba->cap >> 21) & 1;
+		print("%s: sata-%s ports with %d ports\n",
+			tname[c->type], "I\0II" + i*2, nunit);
 		s->ifc = &sd63xxesbifc;
 		s->ctlr = c;
 		s->nunit = nunit;
 		s->idno = 'E';
 		c->sdev = s;
-		c->irq = p->intl;
-		c->tbdf = p->tbdf;
 		c->ndrive = nunit;
 
 		/* map the drives -- they don't all need to be enabled. */
@@ -1799,7 +1818,8 @@ loop:
 		}
 		for(i = 0; i < n; i++)
 			if(ahciidle(c->drive[i]->port) == -1){
-				dprint("intel 63[12]xesb: port %d wedged; abort\n", i);
+				dprint("%s: port %d wedged; abort\n",
+					tname[c->type], i);
 				goto loop;
 			}
 		for(i = 0; i < n; i++){
@@ -1831,7 +1851,7 @@ pflag(char *s, char *e, uchar f)
 
 	for(i = 0; i < 8; i++){
 		m = 1 << i;
-		if(f&m)
+		if(f & m)
 			s = seprint(s, e, "%s ", flagname[i]);
 	}
 	return seprint(s, e, "\n");

sys/src/9/pc/uartpci.c

@@ -58,13 +58,13 @@ uartpci(int ctlrno, Pcidev* p, int barno, int n, int freq, char* name,
 }
 
 static Uart *
-ultraport16si(Pcidev *p, int ctlrno, ulong freq)
+ultraport16si(int ctlrno, Pcidev *p, ulong freq)
 {
 	int io, i;
 	char *name;
 	Uart *uart;
 
-	name = "Ultraport16si";			/* 16L788 UARTs */
+	name = "Ultraport16si";		/* 16L788 UARTs */
 	io = p->mem[4].bar & ~1;
 	if (ioalloc(io, p->mem[4].size, 0, name) < 0) {
 		print("uartpci: can't get IO space to set %s to rs-232\n", name);
@@ -162,8 +162,13 @@ uartpcipnp(void)
 				name = "Ultraport8";	/* 16C754 UARTs */
 				uart = uartpci(ctlrno, p, 2, 8, freq, name, 8);
 				break;
+			case (0x0041<<16)|0x155F:	/* Perle Ultraport16 */
+				name = "Ultraport16";
+				uart = uartpci(ctlrno, p, 2, 16, 2 * freq,
+					name, 8);
+				break;
 			case (0x0241<<16)|0x155F:	/* Perle Ultraport16 */
-				uart = ultraport16si(p, ctlrno, 4 * freq);
+				uart = ultraport16si(ctlrno, p, 4 * freq);
 				break;
 			}
 			break;

sys/src/boot/pc/etherdp83820.c

@@ -952,8 +952,9 @@ dp83820interrupt(Ureg*, void* arg)
 			dp83820cfg(ctlr);
 			isr &= ~Phy;
 		}
-// TODO fix		if(isr)
-// TODO fix			iprint("dp83820: isr %8.8uX\n", isr);
+// TODO fix	if(isr)
+// TODO fix		iprint("dp83820: isr %8.8uX\n", isr);
+		USED(isr);
 	}
 }
 

sys/src/cmd/htmlfmt/html.c

@@ -7,7 +7,9 @@
 #include <ctype.h>
 #include "dat.h"
 
-char urlexpr[] = "^(https?|ftp|file|gopher|mailto|news|nntp|telnet|wais|prospero)://([a-zA-Z0-9_@\\-]+([.:][a-zA-Z0-9_@\\-]+)*)";
+char urlexpr[] =
+	"^(https?|ftp|file|gopher|mailto|news|nntp|telnet|wais|prospero)"
+	"://([a-zA-Z0-9_@\\-]+([.:][a-zA-Z0-9_@\\-]+)*)";
 Reprog	*urlprog;
 
 int inword = 0;
@@ -52,7 +54,7 @@ runetobyte(Rune *r, int n)
 }
 
 int
-closingpunct(int c)
+closingpunct(char c)
 {
 	return strchr(".,:;'\")]}>!?", c) != nil;
 }
@@ -66,13 +68,13 @@ emitword(Bytes *b, Rune *r, int nr)
 	if(nr == 0)
 		return;
 	s = smprint("%.*S", nr, r);
-	space = (b->n>0) && !isspace(b->b[b->n-1]) && !closingpunct(r[0]);
-	if(col>0 && col+space+nr > width){
+	space = b->n > 0 && !isspace(b->b[b->n-1]) && !closingpunct(*s);
+	if(col > 0 && col+space+nr > width){
 		growbytes(b, "\n", 1);
 		space = 0;
 		col = 0;
 	}
-	if(space && col>0){
+	if(space && col > 0){
 		growbytes(b, " ", 1);
 		col++;
 	}