Browse Source

Plan 9 from Bell Labs 2007-03-29

David du Colombier 14 years ago
parent
commit
e2e615516b

+ 5 - 4
dist/replica/_plan9.db

@@ -1,6 +1,6 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1171784718 220040
-386/9loaddebug - 775 sys sys 1174186577 401944
+386/9loaddebug - 775 sys sys 1175111768 401962
 386/9loadlite - 775 sys sys 1171784720 137116
 386/9loadlitedebug - 775 sys sys 1174186577 202506
 386/9pc - 775 sys sys 1161230890 1924142
@@ -5771,7 +5771,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 1174242183 264068
+sys/games/lib/fortunes - 664 sys sys 1175084846 264123
 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
@@ -7068,7 +7068,7 @@ sys/lib/tmac/mmt - 664 sys sys 964454718 40915
 sys/lib/tmac/name.sed - 664 sys sys 944956202 62
 sys/lib/tmac/sendcover - 775 sys sys 944956202 50
 sys/lib/tmac/strings.mm - 664 sys sys 964455723 2146
-sys/lib/tmac/tmac.an - 664 sys sys 1174885603 8441
+sys/lib/tmac/tmac.an - 664 sys sys 1175140359 8441
 sys/lib/tmac/tmac.anhtml - 664 sys sys 984696197 105
 sys/lib/tmac/tmac.antimes - 664 sys sys 964454718 7809
 sys/lib/tmac/tmac.bits - 664 sys sys 944956202 1089
@@ -8015,7 +8015,7 @@ sys/src/9/pc/etherrhine.c - 664 sys sys 1081706478 13799
 sys/src/9/pc/ethersink.c - 664 sys sys 1048644103 1076
 sys/src/9/pc/ethersmc.c - 664 sys sys 1162951986 15116
 sys/src/9/pc/ethervgbe.c - 664 sys sys 1160066496 26838
-sys/src/9/pc/ethervt6102.c - 664 sys sys 1131907459 22286
+sys/src/9/pc/ethervt6102.c - 664 sys sys 1175105554 22333
 sys/src/9/pc/etherwavelan.c - 664 sys sys 1131290380 3747
 sys/src/9/pc/floppy.h - 664 sys sys 1055700609 3835
 sys/src/9/pc/fns.h - 664 sys sys 1173287378 4719
@@ -15767,3 +15767,4 @@ 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
+sys/lib/tmac/tmac.an - 664 sys sys 1175141775 8441

+ 4 - 4
dist/replica/plan9.db

@@ -1,6 +1,6 @@
 386 - 20000000775 sys sys 1010957353 0
 386/9load - 775 sys sys 1171784718 220040
-386/9loaddebug - 775 sys sys 1174186577 401944
+386/9loaddebug - 775 sys sys 1175111768 401962
 386/9loadlite - 775 sys sys 1171784720 137116
 386/9loadlitedebug - 775 sys sys 1174186577 202506
 386/9pc - 775 sys sys 1161230890 1924142
@@ -5771,7 +5771,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 1174242183 264068
+sys/games/lib/fortunes - 664 sys sys 1175084846 264123
 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
@@ -7068,7 +7068,7 @@ sys/lib/tmac/mmt - 664 sys sys 964454718 40915
 sys/lib/tmac/name.sed - 664 sys sys 944956202 62
 sys/lib/tmac/sendcover - 775 sys sys 944956202 50
 sys/lib/tmac/strings.mm - 664 sys sys 964455723 2146
-sys/lib/tmac/tmac.an - 664 sys sys 1174885603 8441
+sys/lib/tmac/tmac.an - 664 sys sys 1175141775 8441
 sys/lib/tmac/tmac.anhtml - 664 sys sys 984696197 105
 sys/lib/tmac/tmac.antimes - 664 sys sys 964454718 7809
 sys/lib/tmac/tmac.bits - 664 sys sys 944956202 1089
@@ -8015,7 +8015,7 @@ sys/src/9/pc/etherrhine.c - 664 sys sys 1081706478 13799
 sys/src/9/pc/ethersink.c - 664 sys sys 1048644103 1076
 sys/src/9/pc/ethersmc.c - 664 sys sys 1162951986 15116
 sys/src/9/pc/ethervgbe.c - 664 sys sys 1160066496 26838
-sys/src/9/pc/ethervt6102.c - 664 sys sys 1131907459 22286
+sys/src/9/pc/ethervt6102.c - 664 sys sys 1175105554 22333
 sys/src/9/pc/etherwavelan.c - 664 sys sys 1131290380 3747
 sys/src/9/pc/floppy.h - 664 sys sys 1055700609 3835
 sys/src/9/pc/fns.h - 664 sys sys 1173287378 4719

+ 5 - 0
dist/replica/plan9.log

@@ -48093,3 +48093,8 @@
 1175020206 0 c sys/src/9/pc/ether8139.c - 664 sys sys 1175019929 18584
 1175023805 0 c 386/bin/cwfs - 775 sys sys 1175023297 366681
 1175023805 1 c 386/bin/ndb/dnstcp - 775 sys sys 1175023298 250427
+1175085006 0 c sys/games/lib/fortunes - 664 sys sys 1175084846 264123
+1175106605 0 c sys/src/9/pc/ethervt6102.c - 664 sys sys 1175105554 22333
+1175112005 0 c 386/9loaddebug - 775 sys sys 1175111768 401962
+1175140817 0 c sys/lib/tmac/tmac.an - 664 sys sys 1175140359 8441
+1175142616 0 c sys/lib/tmac/tmac.an - 664 sys sys 1175141775 8441

+ 1 - 0
sys/games/lib/fortunes

@@ -4173,3 +4173,4 @@ Please wait. This can take some time.
 I love troff. It reminds me of runoff, which reminds me of my youth, when VMS was in flower and knowledge of EDT and runoff was all a lad needed to make a good living as a tech writer.  - Frank Willison
 General Internet error has occurred. - [OpenOffice.org 2.0]
 Remember to drink responsibly during this St. Patrick's Day season.
+File under POPULAR: Male Vocal - Syd Barrett LP sleeve

+ 2 - 2
sys/lib/tmac/tmac.an

@@ -467,8 +467,8 @@
 .ift \{.ds R ®
 .dsS \s\n()S
 ..\}
-.ifn \{.if \nL<=0 .nr )L 11i
-.ie \{\c
+.ifn \{.ie \nL<=0 .nr )L 11i
+.el \{\c
 .nr )L \nLu
 .\" Changed the above from .nr )L 1000i
 .\" (doesn't work for invocation outside of man) [sape]

+ 3 - 1
sys/src/9/pc/ethervt6102.c

@@ -925,7 +925,7 @@ vt6102pci(void)
 
 	p = nil;
 	while(p = pcimatch(p, 0, 0)){
-		if(p->ccrb != 0x02 || p->ccru != 0)
+		if(p->ccrb != Pcibcnet || p->ccru != Pciscether)
 			continue;
 
 		switch((p->did<<16)|p->vid){
@@ -950,12 +950,14 @@ vt6102pci(void)
 		ctlr->cls = cls*4;
 		if(ctlr->cls < sizeof(Ds)){
 			print("vt6102: cls %d < sizeof(Ds)\n", ctlr->cls);
+			iofree(port);
 			free(ctlr);
 			continue;
 		}
 		ctlr->tft = Ctft64;
 
 		if(vt6102reset(ctlr)){
+			iofree(port);
 			free(ctlr);
 			continue;
 		}