Browse Source

Plan 9 from Bell Labs 2008-12-03

David du Colombier 15 years ago
parent
commit
f7446f90e6
6 changed files with 358 additions and 128 deletions
  1. 6 9
      dist/replica/_plan9.db
  2. 3 3
      dist/replica/plan9.db
  3. 3 0
      dist/replica/plan9.log
  4. 302 107
      lib/pci
  5. 40 7
      rc/bin/pci
  6. 4 2
      sys/man/8/pci

+ 6 - 9
dist/replica/_plan9.db

@@ -299,7 +299,7 @@
 386/bin/ip/gping - 775 sys sys 1210392772 182372
 386/bin/ip/hogports - 775 sys sys 1148500655 42914
 386/bin/ip/httpd - 20000000775 sys sys 1068385801 0
-386/bin/ip/httpd/httpd - 775 sys sys 1227384558 298281
+386/bin/ip/httpd/httpd - 775 sys sys 1228190946 298453
 386/bin/ip/httpd/imagemap - 775 sys sys 1209614361 116331
 386/bin/ip/httpd/man2html - 775 sys sys 1209614364 124885
 386/bin/ip/httpd/netlib_find - 775 sys sys 1209614367 117179
@@ -507,7 +507,7 @@
 386/bin/venti/checkindex - 775 sys sys 1224558579 256635
 386/bin/venti/clumpstats - 775 sys sys 1224558579 245571
 386/bin/venti/conf - 775 sys sys 1189362423 1505
-386/bin/venti/copy - 775 sys sys 1214510208 138019
+386/bin/venti/copy - 775 sys sys 1228190946 138029
 386/bin/venti/findscore - 775 sys sys 1224558579 247599
 386/bin/venti/fixarenas - 775 sys sys 1224558580 212878
 386/bin/venti/fmtarenas - 775 sys sys 1224558580 247840
@@ -565,7 +565,7 @@
 386/lib/ape/libregexp.a - 664 sys sys 1212377638 47500
 386/lib/ape/libutf.a - 664 sys sys 1212377640 88500
 386/lib/ape/libv.a - 664 sys sys 1219693465 19334
-386/lib/lib9p.a - 664 sys sys 1209184390 91992
+386/lib/lib9p.a - 664 sys sys 1228190946 91992
 386/lib/libString.a - 664 sys sys 1209184391 22466
 386/lib/libauth.a - 664 sys sys 1214418439 59742
 386/lib/libauthsrv.a - 664 sys sys 1209439929 36740
@@ -5274,7 +5274,7 @@ lib/ndb/local - 664 sys sys 1077723747 292
 lib/ndb/local.complicated - 664 sys sys 1196401790 2980
 lib/ndb/nfs - 664 sys sys 954036707 113
 lib/news - 20000000775 sys sys 1020895764 0
-lib/pci - 664 sys sys 1203978472 219265
+lib/pci - 664 sys sys 1228259418 233927
 lib/rfc - 20000000775 sys sys 1180724499 0
 lib/rfc/grabrfc - 775 sys sys 1225681460 815
 lib/sky - 20000000775 sys sys 1079376081 0
@@ -5585,7 +5585,7 @@ rc/bin/pc/personalize - 775 sys sys 959698938 99
 rc/bin/pc/setup.9fat - 775 sys sys 960857447 546
 rc/bin/pc/setup.disk - 775 sys sys 960857447 579
 rc/bin/pc/update - 775 sys sys 960235807 468
-rc/bin/pci - 775 sys sys 1224614984 933
+rc/bin/pci - 775 sys sys 1228259418 1373
 rc/bin/pdf2ps - 775 sys sys 1210371045 895
 rc/bin/postscript - 20000000775 sys sys 1217181731 0
 rc/bin/printfont - 775 sys sys 945617208 2851
@@ -7885,7 +7885,7 @@ sys/man/8/ndb - 664 sys sys 1218247417 15243
 sys/man/8/newuser - 664 sys sys 1196638947 2418
 sys/man/8/nfsserver - 664 sys sys 1217138303 3807
 sys/man/8/partfs - 664 sys sys 1196638947 869
-sys/man/8/pci - 664 sys sys 1203983723 591
+sys/man/8/pci - 664 sys sys 1228259418 627
 sys/man/8/pcmcia - 664 sys sys 1196638947 408
 sys/man/8/pem - 664 sys sys 1196638947 1189
 sys/man/8/ping - 664 sys sys 1215981423 3662
@@ -15889,6 +15889,3 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1020896385 0
-386/bin/venti/copy - 775 sys sys 1228190946 138029
-386/bin/ip/httpd/httpd - 775 sys sys 1228190946 298453
-386/lib/lib9p.a - 664 sys sys 1228190946 91992

+ 3 - 3
dist/replica/plan9.db

@@ -5274,7 +5274,7 @@ lib/ndb/local - 664 sys sys 1077723747 292
 lib/ndb/local.complicated - 664 sys sys 1196401790 2980
 lib/ndb/nfs - 664 sys sys 954036707 113
 lib/news - 20000000775 sys sys 1020895764 0
-lib/pci - 664 sys sys 1203978472 219265
+lib/pci - 664 sys sys 1228259418 233927
 lib/rfc - 20000000775 sys sys 1180724499 0
 lib/rfc/grabrfc - 775 sys sys 1225681460 815
 lib/sky - 20000000775 sys sys 1079376081 0
@@ -5585,7 +5585,7 @@ rc/bin/pc/personalize - 775 sys sys 959698938 99
 rc/bin/pc/setup.9fat - 775 sys sys 960857447 546
 rc/bin/pc/setup.disk - 775 sys sys 960857447 579
 rc/bin/pc/update - 775 sys sys 960235807 468
-rc/bin/pci - 775 sys sys 1224614984 933
+rc/bin/pci - 775 sys sys 1228259418 1373
 rc/bin/pdf2ps - 775 sys sys 1210371045 895
 rc/bin/postscript - 20000000775 sys sys 1217181731 0
 rc/bin/printfont - 775 sys sys 945617208 2851
@@ -7885,7 +7885,7 @@ sys/man/8/ndb - 664 sys sys 1218247417 15243
 sys/man/8/newuser - 664 sys sys 1196638947 2418
 sys/man/8/nfsserver - 664 sys sys 1217138303 3807
 sys/man/8/partfs - 664 sys sys 1196638947 869
-sys/man/8/pci - 664 sys sys 1203983723 591
+sys/man/8/pci - 664 sys sys 1228259418 627
 sys/man/8/pcmcia - 664 sys sys 1196638947 408
 sys/man/8/pem - 664 sys sys 1196638947 1189
 sys/man/8/ping - 664 sys sys 1215981423 3662

+ 3 - 0
dist/replica/plan9.log

@@ -36309,3 +36309,6 @@
 1228192204 0 c 386/bin/venti/copy - 775 sys sys 1228190946 138029
 1228192204 1 c 386/bin/ip/httpd/httpd - 775 sys sys 1228190946 298453
 1228192204 2 c 386/lib/lib9p.a - 664 sys sys 1228190946 91992
+1228260604 0 c lib/pci - 664 sys sys 1228259418 233927
+1228260604 1 c rc/bin/pci - 775 sys sys 1228259418 1373
+1228260604 2 c sys/man/8/pci - 664 sys sys 1228259418 627

File diff suppressed because it is too large
+ 302 - 107
lib/pci


+ 40 - 7
rc/bin/pci

@@ -1,5 +1,5 @@
 #!/bin/rc
-# pci [-v] - dump pci configuration
+# pci [-bv] - dump pci configuration
 rfork e
 fn verbose {
 	if (! test -f /lib/pci)
@@ -20,11 +20,11 @@ fn verbose {
 		FS="\t"
 		while(getline <file > 0){
 			if(/^;/) continue
-			if(/^[0-9A-F]/){
+			if(/^[0-9a-fA-F]/){
 				vid=lower($1)
 				vendor[vid] = $2
 			}
-			if(/^	[0-9]/){
+			if(/^	[0-9a-fA-F]/){
 				did=lower($2)
 				id[vid "/" did] = $3
 			}
@@ -45,18 +45,51 @@ fn verbose {
 	}
 '
 }
+fn usage {
+	echo usage: $1 '[-bv]' >[1=2]
+	exit usage
+}
 
 filter=cat
-if(~ $1 -v){
-	filter=verbose
+bridges=yes
+done=0
+while (~ $done 0 && ! ~ $#* 0 && ~ $1 -*) {
+	if (~ $1 -*b*)
+		bridges=no
+	if (~ $1 -*v*)
+		filter=verbose
+	switch ($1) {
+	case --
+		done = 1		# no break in rc, alas
+	case -*[~bv]*
+		usage $0
+	}
+	shift
 }
-builtin cd '#$/pci' && grep . *ctl | sed '
+if (! ~ $#* 0)
+	usage $0
+
+builtin cd '#$/pci' && grep . *ctl | {
+	if (~ $bridges no)
+		sed /:06/d
+	if not
+		cat
+	} |
+	sed '
 	s/ctl:/:	/
+	t noop
+: noop
 	s/:	01/:	disk 01/
 	s/:	02/:	net  02/
 	s/:	03/:	vid  03/
+	s/:	04/:	aud  04/
+	s/:	05/:	mem  05/
 	s/:	06/:	brg  06/
+	s/:	07/:	ser  07/
 	s/:	0c\.03/:	usb  0c.03/
 	s/:	0c\.05/:	smb  0c.05/
-	s/:	([0-9])/:	---  \1/
+	s/:	0d/:	rad  0d/
+	s/:	10/:	cryp 10/
+	t
+	s/	/	---  /
 ' | $filter

+ 4 - 2
sys/man/8/pci

@@ -4,7 +4,7 @@ pci \- print PCI bus configuration
 .SH SYNOPSIS
 .B pci
 [
-.B -v
+.B -bv
 ]
 .SH DESCRIPTION
 .I Pci
@@ -23,11 +23,13 @@ followed by the configuration registers in pairs of
 and
 .IR size .
 The
+.B -b
+option suppresses output for PCI bridges.
+The
 .B -v
 option adds a second line per device, containing an English description
 obtained from
 .BR /lib/pci .
-.\" .SH EXAMPLES
 .SH FILES
 .B /lib/pci
 .SH SOURCE

Some files were not shown because too many files changed in this diff