Browse Source

Plan 9 from Bell Labs 2005-01-18

David du Colombier 19 years ago
parent
commit
96ff5c82da

+ 6 - 4
dist/replica/_plan9.db

@@ -3343,7 +3343,7 @@ sys/doc/venti/venti.pdf - 755 sys sys 1020384352 139090
 sys/doc/venti/venti.ps - 664 sys sys 1019852320 2012620
 sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
-sys/games/lib/fortunes - 664 sys sys 1105406030 251918
+sys/games/lib/fortunes - 664 sys sys 1105977679 252117
 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
@@ -5025,7 +5025,7 @@ sys/man/4/tapefs - 664 sys sys 944959699 1731
 sys/man/4/telco - 664 sys sys 1015024814 4359
 sys/man/4/u9fs - 664 sys sys 1043769139 4748
 sys/man/4/upasfs - 664 sys sys 1034348505 6212
-sys/man/4/usb - 664 sys sys 1101830658 3423
+sys/man/4/usb - 664 sys sys 1105992038 4295
 sys/man/4/usbd - 664 sys sys 1018386778 731
 sys/man/4/vacfs - 664 sys sys 1084333062 1545
 sys/man/4/webcookies - 664 sys sys 1019828742 3525
@@ -5273,7 +5273,7 @@ sys/src/9/boot/bootmkfile - 664 sys sys 1091732792 404
 sys/src/9/boot/doauthenticate.c - 664 sys sys 1015012529 2300
 sys/src/9/boot/embed.c - 664 sys sys 1039763720 1191
 sys/src/9/boot/getpasswd.c - 664 sys sys 957373373 654
-sys/src/9/boot/local.c - 664 sys sys 1068835808 5355
+sys/src/9/boot/local.c - 664 sys sys 1105976808 5619
 sys/src/9/boot/mkboot - 775 sys sys 1045504382 1935
 sys/src/9/boot/nopsession.c - 664 sys sys 957373374 843
 sys/src/9/boot/paq.c - 664 sys sys 1067722601 1099
@@ -6515,7 +6515,7 @@ sys/src/boot/pc/ether589.c - 664 sys sys 1015007950 4628
 sys/src/boot/pc/ether79c970.c - 664 sys sys 1015007950 11717
 sys/src/boot/pc/ether8003.c - 664 sys sys 1015007950 6446
 sys/src/boot/pc/ether8139.c - 664 sys sys 1102429126 14806
-sys/src/boot/pc/ether8169.c - 664 sys sys 1103641772 18622
+sys/src/boot/pc/ether8169.c - 664 sys sys 1106018997 18687
 sys/src/boot/pc/ether82557.c - 664 sys sys 1098848150 18911
 sys/src/boot/pc/ether83815.c - 664 sys sys 1019537742 19576
 sys/src/boot/pc/ether8390.c - 664 sys sys 1015007951 16065
@@ -12457,3 +12457,5 @@ 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 1018802620 0
+386/9loaddebug - 775 sys sys 1106021711 306647
+386/9pccpu - 775 sys sys 1106021714 1488543

+ 6 - 6
dist/replica/plan9.db

@@ -1,11 +1,11 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1100269948 208708
-386/9loaddebug - 775 sys sys 1104122096 306647
+386/9loaddebug - 775 sys sys 1106021711 306647
 386/9loadlite - 775 sys sys 1100269949 132260
 386/9loadlitedebug - 775 sys sys 1104122096 195560
 386/9pc - 775 sys sys 1105161523 1833601
 386/9pc.gz - 664 sys sys 1077049336 635727
-386/9pccpu - 775 sys sys 1105161526 1488543
+386/9pccpu - 775 sys sys 1106021714 1488543
 386/9pccpu.gz - 664 sys sys 1077049387 519909
 386/9pcdisk - 775 sys sys 1105161530 2039055
 386/9pcdisk.gz - 664 sys sys 1040006345 703136
@@ -3343,7 +3343,7 @@ sys/doc/venti/venti.pdf - 755 sys sys 1020384352 139090
 sys/doc/venti/venti.ps - 664 sys sys 1019852320 2012620
 sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
-sys/games/lib/fortunes - 664 sys sys 1105406030 251918
+sys/games/lib/fortunes - 664 sys sys 1105977679 252117
 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
@@ -5025,7 +5025,7 @@ sys/man/4/tapefs - 664 sys sys 944959699 1731
 sys/man/4/telco - 664 sys sys 1015024814 4359
 sys/man/4/u9fs - 664 sys sys 1043769139 4748
 sys/man/4/upasfs - 664 sys sys 1034348505 6212
-sys/man/4/usb - 664 sys sys 1101830658 3423
+sys/man/4/usb - 664 sys sys 1105992038 4295
 sys/man/4/usbd - 664 sys sys 1018386778 731
 sys/man/4/vacfs - 664 sys sys 1084333062 1545
 sys/man/4/webcookies - 664 sys sys 1019828742 3525
@@ -5273,7 +5273,7 @@ sys/src/9/boot/bootmkfile - 664 sys sys 1091732792 404
 sys/src/9/boot/doauthenticate.c - 664 sys sys 1015012529 2300
 sys/src/9/boot/embed.c - 664 sys sys 1039763720 1191
 sys/src/9/boot/getpasswd.c - 664 sys sys 957373373 654
-sys/src/9/boot/local.c - 664 sys sys 1068835808 5355
+sys/src/9/boot/local.c - 664 sys sys 1105976808 5619
 sys/src/9/boot/mkboot - 775 sys sys 1045504382 1935
 sys/src/9/boot/nopsession.c - 664 sys sys 957373374 843
 sys/src/9/boot/paq.c - 664 sys sys 1067722601 1099
@@ -6515,7 +6515,7 @@ sys/src/boot/pc/ether589.c - 664 sys sys 1015007950 4628
 sys/src/boot/pc/ether79c970.c - 664 sys sys 1015007950 11717
 sys/src/boot/pc/ether8003.c - 664 sys sys 1015007950 6446
 sys/src/boot/pc/ether8139.c - 664 sys sys 1102429126 14806
-sys/src/boot/pc/ether8169.c - 664 sys sys 1103641772 18622
+sys/src/boot/pc/ether8169.c - 664 sys sys 1106018997 18687
 sys/src/boot/pc/ether82557.c - 664 sys sys 1098848150 18911
 sys/src/boot/pc/ether83815.c - 664 sys sys 1019537742 19576
 sys/src/boot/pc/ether8390.c - 664 sys sys 1015007951 16065

+ 6 - 0
dist/replica/plan9.log

@@ -13235,3 +13235,9 @@
 1105799458 1 c sys/src/cmd/kl/asm.c - 664 sys sys 1105798985 26122
 1105799458 2 c sys/src/cmd/kl/optab.c - 664 sys sys 1105798985 7369
 1105912881 0 c sys/src/9/pc/ether8169.c - 664 sys sys 1105912215 22703
+1105977694 0 c sys/games/lib/fortunes - 664 sys sys 1105977679 252117
+1105977694 1 c sys/src/9/boot/local.c - 664 sys sys 1105976808 5619
+1105992096 0 c sys/man/4/usb - 664 sys sys 1105992038 4295
+1106019101 0 c sys/src/boot/pc/ether8169.c - 664 sys sys 1106018997 18687
+1106022702 0 c 386/9loaddebug - 775 sys sys 1106021711 306647
+1106022702 1 c 386/9pccpu - 775 sys sys 1106021714 1488543

+ 2 - 0
sys/games/lib/fortunes

@@ -4043,3 +4043,5 @@ usage: tar [-][{ruxXtcC}acdefhlm{o|S}pqvwLUBDRV{O|K}fb] [dir] [tapefile] [blocks
 /opt/exp/lib/firefox/bin/run-mozilla.sh: line 451: 16207 Segmentation fault      "$prog" ${1+"$@"}
 LoadPlugin: failed to initialize shared library /opt/net/exp/lib/mozilla/bin/plugins/j2re1.4.2/plugin/i386/ns610-gcc32/libjavaplugin_oji.so [/opt/net/exp/lib/mozilla/bin/plugins/j2re1.4.2/plugin/i386/ns610-gcc32/libjavaplugin_oji.so: undefined symbol: _ZdlPv]
 This 43 minute video FEATURES the 22 year-old, 6'6" (6'11" in heels) 300+ pound, size 14 shoe size Blythe
+Linux is good if you want to run Apache or compile the kernel.  Every other application is suspect.  - Andrew Hume
+/etc/bash.bashrc:	alias unmount='echo "Error: Try the command: umount" 1>&2; false'

+ 23 - 0
sys/man/4/usb

@@ -165,3 +165,26 @@ in your profile.
 .SH "SEE ALSO"
 .IR usb (3),
 .IR usbd (4)
+.SH BUGS
+Usbaudio only works for certain audio devices.  This is the list of devices known to work with usbaudio:
+.IP
+.TP
+Xitel AN1
+Output only.  Marginally enough to drive headphones.  Has mute, volume, bass, treble controls.
+.TP
+Philips USB speakers, model DSS 370/17
+Usbaudio acts on the volume + and - buttons.
+.TP
+Edirol UA-3
+Playback and record.  Playback only at 44.1 KHz, record at 32, 44.1 or 48 KHz.
+Playback volume control and mute control.  The device only has analog (slider controlled)
+input volume control.
+.TP
+Edirol UA-1X
+Playback and record.  Playback only at 32, 44.1 or 48 KHz, record at 8, 16, 22.05, 32, 44.1 or 48 KHz.
+Playback volume control and mute control.
+(haven't tested recording, but I believe it'll work)
+.TP
+Xitel Pro HiFi-Link
+Playback only.  48 KHz only.  There is a volume control but it isn't connected
+to the output, so does nothing.

+ 11 - 2
sys/src/9/boot/local.c

@@ -179,7 +179,7 @@ int
 connectlocalfossil(void)
 {
 	int fd;
-	char *venti, *f[32];
+	char *venti, *f[32], *p;
 	int nf;
 	char partition[128], buf[512];
 	char *dev;
@@ -232,7 +232,16 @@ connectlocalfossil(void)
 				f[2] = "tcp!127.1!8000";
 			}
 			configloopback();
-			run("/boot/venti", "-c", venti, "-a", f[1], "-h", f[2], 0);
+			run("/boot/venti", "-c", f[0], "-a", f[1], "-h", f[2], 0);
+			/*
+			 * If the announce address is tcp!*!foo, then set
+			 * $venti to tcp!127.1!foo instead, which is actually dialable.
+			 */
+			if((p = strstr(f[1], "!*!")) == 0){
+				*p = 0;
+				snprint(buf, sizeof buf, "%s!127.1!%s", f[1], p+3);
+				f[1] = buf;
+			}
 			setenv("venti", f[1]);
 		}else{
 			/* set up the network so we can talk to the venti server */

+ 1 - 0
sys/src/boot/pc/ether8169.c

@@ -765,6 +765,7 @@ static struct {
 	int	id;
 } rtl8169pci[] = {
 	{ "rtl8169",	(0x8169<<16)|0x10EC, },	/* generic */
+	{ "CG-LAPCIGT",	(0xC107<<16)|0x1259, },	/* Corega CG-LAPCIGT */
 	{ nil },
 };