Browse Source

Plan 9 from Bell Labs 2004-06-26

David du Colombier 16 years ago
parent
commit
8464ff3f52

+ 18 - 3
dist/replica/_plan9.db

@@ -5351,7 +5351,7 @@ sys/src/9/pc/etherec2t.c - 664 sys sys 1086960044 4039
 sys/src/9/pc/etherelnk3.c - 664 sys sys 1081706477 48724
 sys/src/9/pc/etherga620.c - 664 sys sys 1074785126 28754
 sys/src/9/pc/etherga620fw.h - 644 sys sys 1026847642 222295
-sys/src/9/pc/etherif.h - 664 sys sys 1045063564 961
+sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
 sys/src/9/pc/etherigbe.c - 664 sys sys 1081706478 42962
 sys/src/9/pc/ethermii.c - 664 sys sys 1084331434 4612
 sys/src/9/pc/ethermii.h - 664 sys sys 1086873891 3258
@@ -6152,7 +6152,7 @@ sys/src/ape/lib/ap/plan9/umask.c - 664 sys sys 1014921985 182
 sys/src/ape/lib/ap/plan9/uname.c - 664 sys sys 1014921985 408
 sys/src/ape/lib/ap/plan9/unlink.c - 664 sys sys 1038237528 1505
 sys/src/ape/lib/ap/plan9/utime.c - 664 sys sys 1046643007 469
-sys/src/ape/lib/ap/plan9/wait.c - 664 sys sys 1087406384 2131
+sys/src/ape/lib/ap/plan9/wait.c - 664 sys sys 1088204173 2147
 sys/src/ape/lib/ap/plan9/write.c - 664 sys sys 1038237529 348
 sys/src/ape/lib/ap/posix - 20000000775 sys sys 1014921981 0
 sys/src/ape/lib/ap/posix/getgrent.c - 664 sys sys 1014921981 945
@@ -7151,7 +7151,7 @@ sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1014925010 35895
 sys/src/cmd/aux/vga/mkfile - 664 sys sys 1048636613 905
 sys/src/cmd/aux/vga/neomagic.c - 664 sys sys 1014925010 8801
 sys/src/cmd/aux/vga/notes.txt - 664 sys sys 1028334647 14376
-sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1081358076 23145
+sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1088204577 23412
 sys/src/cmd/aux/vga/palette.c - 664 sys sys 1014925010 2201
 sys/src/cmd/aux/vga/pci.c - 664 sys sys 1014925011 8659
 sys/src/cmd/aux/vga/pci.h - 664 sys sys 1014925011 3290
@@ -12431,3 +12431,18 @@ usr/glenda/lib/profile - 664 glenda glenda 1021580005 847
 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/bin/awk - 775 sys sys 1088219073 320920
+386/bin/grap - 775 sys sys 1088219074 279678
+386/bin/gs - 775 sys sys 1088219096 11131720
+386/bin/pic - 775 sys sys 1088219097 304738
+386/bin/spin - 775 sys sys 1088219098 654809
+386/bin/ape/diff - 775 sys sys 1088219068 349087
+386/bin/ape/diff3 - 775 sys sys 1088219068 187503
+386/bin/ape/make - 775 sys sys 1088219069 208240
+386/bin/ape/patch - 775 sys sys 1088219069 301561
+386/bin/ape/sh - 775 sys sys 1088219071 476553
+386/bin/aux/lpdaemon - 775 sys sys 1088219071 167447
+386/bin/aux/tcpostio - 775 sys sys 1088219072 200192
+386/bin/aux/vga - 775 sys sys 1088219073 300474
+386/bin/troff - 775 sys sys 1088219099 357256
+386/lib/ape/libap.a - 664 sys sys 1088219101 806956

+ 18 - 18
dist/replica/plan9.db

@@ -31,16 +31,16 @@
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1087442501 132681
 386/bin/ape/cc - 775 sys sys 1085076973 68304
-386/bin/ape/diff - 775 sys sys 1087442501 349070
-386/bin/ape/diff3 - 775 sys sys 1087442502 187486
+386/bin/ape/diff - 775 sys sys 1088219068 349087
+386/bin/ape/diff3 - 775 sys sys 1088219068 187503
 386/bin/ape/dirname - 775 sys sys 1087442502 132460
 386/bin/ape/expr - 775 sys sys 1087442502 142097
 386/bin/ape/kill - 775 sys sys 1087442503 138039
-386/bin/ape/make - 775 sys sys 1087442503 208223
-386/bin/ape/patch - 775 sys sys 1087442504 301544
+386/bin/ape/make - 775 sys sys 1088219069 208240
+386/bin/ape/patch - 775 sys sys 1088219069 301561
 386/bin/ape/psh - 775 sys sys 1042220689 34
 386/bin/ape/sed - 775 sys sys 1087442504 158112
-386/bin/ape/sh - 775 sys sys 1087442505 476536
+386/bin/ape/sh - 775 sys sys 1088219071 476553
 386/bin/ape/stty - 775 sys sys 1085076973 41013
 386/bin/ape/tar - 775 sys sys 1085076974 59875
 386/bin/ape/uname - 775 sys sys 1087442505 132510
@@ -114,7 +114,7 @@
 386/bin/aux/lines - 775 sys sys 1085076993 58460
 386/bin/aux/listen - 775 sys sys 1085076994 104854
 386/bin/aux/listen1 - 775 sys sys 1085076994 91430
-386/bin/aux/lpdaemon - 775 sys sys 1087442506 167430
+386/bin/aux/lpdaemon - 775 sys sys 1088219071 167447
 386/bin/aux/lpdsend - 775 sys sys 1087442507 153635
 386/bin/aux/lpsend - 775 sys sys 1085076994 52497
 386/bin/aux/mapd - 775 sys sys 1085076995 190822
@@ -145,20 +145,20 @@
 386/bin/aux/ssh_genkey - 775 sys sys 1045537957 194629
 386/bin/aux/sshserve - 775 sys sys 1085077007 251118
 386/bin/aux/stub - 775 sys sys 1086923027 132993
-386/bin/aux/tcpostio - 775 sys sys 1087442508 200175
+386/bin/aux/tcpostio - 775 sys sys 1088219072 200192
 386/bin/aux/text2post - 775 sys sys 1085077008 76406
 386/bin/aux/timesync - 775 sys sys 1085077008 126318
 386/bin/aux/tr2post - 775 sys sys 1085077009 174655
 386/bin/aux/trampoline - 775 sys sys 1085077009 81287
 386/bin/aux/typepasswd - 775 sys sys 1085077010 67426
-386/bin/aux/vga - 775 sys sys 1087442509 300332
+386/bin/aux/vga - 775 sys sys 1088219073 300474
 386/bin/aux/vmmousepoll - 775 sys sys 1032480572 41434
 386/bin/aux/vmware - 775 sys sys 1049428256 453
 386/bin/aux/vmwarefs - 775 sys sys 1045537962 102172
 386/bin/aux/write - 775 sys sys 1085077011 4188
 386/bin/aux/zerotrunc - 775 sys sys 1057551514 58154
 386/bin/awd - 775 sys sys 1085077011 5029
-386/bin/awk - 775 sys sys 1087442510 320903
+386/bin/awk - 775 sys sys 1088219073 320920
 386/bin/basename - 775 sys sys 1085077011 37856
 386/bin/bc - 775 sys sys 1085077012 79712
 386/bin/bind - 775 sys sys 1085077012 57577
@@ -248,10 +248,10 @@
 386/bin/ftpfs - 775 sys sys 1085077059 145999
 386/bin/getmap - 775 sys sys 1085077059 63150
 386/bin/gif - 775 sys sys 1085077060 155975
-386/bin/grap - 775 sys sys 1087442511 279661
+386/bin/grap - 775 sys sys 1088219074 279678
 386/bin/graph - 775 sys sys 1085077060 127266
 386/bin/grep - 775 sys sys 1085077060 77099
-386/bin/gs - 775 sys sys 1087442533 11131703
+386/bin/gs - 775 sys sys 1088219096 11131720
 386/bin/gunzip - 775 sys sys 1085077061 78252
 386/bin/gview - 775 sys sys 1087873351 235313
 386/bin/gzip - 775 sys sys 1085077061 82899
@@ -344,7 +344,7 @@
 386/bin/passwd - 775 sys sys 1085077087 81627
 386/bin/pbd - 775 sys sys 1085077087 4661
 386/bin/pcc - 775 sys sys 1085077087 65827
-386/bin/pic - 775 sys sys 1087442536 304721
+386/bin/pic - 775 sys sys 1088219097 304738
 386/bin/pipefile - 775 sys sys 1085077087 39368
 386/bin/plot - 775 sys sys 1085077088 219548
 386/bin/plumb - 775 sys sys 1085077088 64937
@@ -391,7 +391,7 @@
 386/bin/sniffer - 775 sys sys 1038443185 99028
 386/bin/snoopy - 775 sys sys 1085077098 152766
 386/bin/sort - 775 sys sys 1085077099 80213
-386/bin/spin - 775 sys sys 1087442537 654792
+386/bin/spin - 775 sys sys 1088219098 654809
 386/bin/split - 775 sys sys 1085077099 73388
 386/bin/srv - 775 sys sys 1085077099 80398
 386/bin/srvfs - 775 sys sys 1085077099 39578
@@ -423,7 +423,7 @@
 386/bin/tprof - 775 sys sys 1085077108 271255
 386/bin/tr - 775 sys sys 1085077108 60009
 386/bin/trace - 775 sys sys 1085077109 178355
-386/bin/troff - 775 sys sys 1087442539 357239
+386/bin/troff - 775 sys sys 1088219099 357256
 386/bin/troff2html - 775 sys sys 1085077109 80041
 386/bin/tweak - 775 sys sys 1085077109 190079
 386/bin/unicode - 775 sys sys 1085077109 60489
@@ -515,7 +515,7 @@
 386/lib - 20000000775 sys sys 1016826328 0
 386/lib/ape - 20000000775 sys sys 944969312 0
 386/lib/ape/lib9.a - 664 sys sys 1038237538 6378
-386/lib/ape/libap.a - 664 sys sys 1087442542 806922
+386/lib/ape/libap.a - 664 sys sys 1088219101 806956
 386/lib/ape/libbsd.a - 664 sys sys 1087442542 179270
 386/lib/ape/libdraw.a - 664 sys sys 1085077138 574254
 386/lib/ape/libfmt.a - 664 sys sys 1087442542 147014
@@ -5351,7 +5351,7 @@ sys/src/9/pc/etherec2t.c - 664 sys sys 1086960044 4039
 sys/src/9/pc/etherelnk3.c - 664 sys sys 1081706477 48724
 sys/src/9/pc/etherga620.c - 664 sys sys 1074785126 28754
 sys/src/9/pc/etherga620fw.h - 644 sys sys 1026847642 222295
-sys/src/9/pc/etherif.h - 664 sys sys 1045063564 961
+sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
 sys/src/9/pc/etherigbe.c - 664 sys sys 1081706478 42962
 sys/src/9/pc/ethermii.c - 664 sys sys 1084331434 4612
 sys/src/9/pc/ethermii.h - 664 sys sys 1086873891 3258
@@ -6152,7 +6152,7 @@ sys/src/ape/lib/ap/plan9/umask.c - 664 sys sys 1014921985 182
 sys/src/ape/lib/ap/plan9/uname.c - 664 sys sys 1014921985 408
 sys/src/ape/lib/ap/plan9/unlink.c - 664 sys sys 1038237528 1505
 sys/src/ape/lib/ap/plan9/utime.c - 664 sys sys 1046643007 469
-sys/src/ape/lib/ap/plan9/wait.c - 664 sys sys 1087406384 2131
+sys/src/ape/lib/ap/plan9/wait.c - 664 sys sys 1088204173 2147
 sys/src/ape/lib/ap/plan9/write.c - 664 sys sys 1038237529 348
 sys/src/ape/lib/ap/posix - 20000000775 sys sys 1014921981 0
 sys/src/ape/lib/ap/posix/getgrent.c - 664 sys sys 1014921981 945
@@ -7151,7 +7151,7 @@ sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1014925010 35895
 sys/src/cmd/aux/vga/mkfile - 664 sys sys 1048636613 905
 sys/src/cmd/aux/vga/neomagic.c - 664 sys sys 1014925010 8801
 sys/src/cmd/aux/vga/notes.txt - 664 sys sys 1028334647 14376
-sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1081358076 23145
+sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1088204577 23412
 sys/src/cmd/aux/vga/palette.c - 664 sys sys 1014925010 2201
 sys/src/cmd/aux/vga/pci.c - 664 sys sys 1014925011 8659
 sys/src/cmd/aux/vga/pci.h - 664 sys sys 1014925011 3290

+ 18 - 0
dist/replica/plan9.log

@@ -15730,3 +15730,21 @@
 1088091111 5 c 386/ld.com - 775 sys sys 1088089728 64448
 1088091111 6 c sys/src/boot/pc/clock.c - 664 sys sys 1088089722 5783
 1088107315 0 c sys/man/2/read - 664 sys sys 1088107191 1883
+1088179208 0 c sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
+1088204412 0 c sys/src/ape/lib/ap/plan9/wait.c - 664 sys sys 1088204173 2147
+1088206212 0 c sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1088204577 23412
+1088220616 0 c 386/bin/awk - 775 sys sys 1088219073 320920
+1088220616 1 c 386/bin/grap - 775 sys sys 1088219074 279678
+1088220616 2 c 386/bin/gs - 775 sys sys 1088219096 11131720
+1088220616 3 c 386/bin/pic - 775 sys sys 1088219097 304738
+1088220616 4 c 386/bin/spin - 775 sys sys 1088219098 654809
+1088220616 5 c 386/bin/ape/diff - 775 sys sys 1088219068 349087
+1088220616 6 c 386/bin/ape/diff3 - 775 sys sys 1088219068 187503
+1088220616 7 c 386/bin/ape/make - 775 sys sys 1088219069 208240
+1088220616 8 c 386/bin/ape/patch - 775 sys sys 1088219069 301561
+1088220616 9 c 386/bin/ape/sh - 775 sys sys 1088219071 476553
+1088220616 10 c 386/bin/aux/lpdaemon - 775 sys sys 1088219071 167447
+1088220616 11 c 386/bin/aux/tcpostio - 775 sys sys 1088219072 200192
+1088220616 12 c 386/bin/aux/vga - 775 sys sys 1088219073 300474
+1088220616 13 c 386/bin/troff - 775 sys sys 1088219099 357256
+1088220616 14 c 386/lib/ape/libap.a - 664 sys sys 1088219101 806956

+ 1 - 1
sys/src/9/pc/etherif.h

@@ -1,5 +1,5 @@
 enum {
-	MaxEther	= 24,
+	MaxEther	= 48,
 	Ntypes		= 8,
 };
 

+ 1 - 0
sys/src/ape/lib/ap/plan9/wait.c

@@ -89,6 +89,7 @@ wait4 (pid_t wpid, int *status, int options, Waitmsg *waitmsg) {
 		if (wpid <= 0) {
 			waitmsg = w;
 			wpid = w->pid;
+			*status = 0;
 			return wpid;
 		}
 		if (w->pid == wpid) {

+ 14 - 1
sys/src/cmd/aux/vga/nvidia.c

@@ -260,7 +260,7 @@ snarf(Vga* vga, Ctlr* ctlr)
 		}
 		nv->extra = vgaxi(Crtx, 0x41);
 		nv->cursorconfig = nv->pcrtc[0x0810/4];
-		if (implementation = 0x0110)
+		if (implementation == 0x0110)
 			nv->dither = nv->pramdac[0x0528/4];
 		else if (implementation >= 0x0170)
 			nv->dither = nv->pramdac[0x083C/4];
@@ -427,6 +427,8 @@ init(Vga* vga, Ctlr* ctlr)
 		vga->crt[0x05] &= ~0x80;
 	if (tmp & 0x40)
 		nv->screen = 0x10;
+	else
+		nv->screen = 0x00;
 
 	/* overflow bits */
 
@@ -486,6 +488,7 @@ init(Vga* vga, Ctlr* ctlr)
 	if (vga->crt[0x13] & 0x800)
 		nv->screen |= 0x20;
 
+	nv->horiz = 0x00;
 	if (vga->crt[0x00] & 0x100)
 		nv->horiz = 0x01;
 	if(vga->crt[0x01] & 0x100)
@@ -495,6 +498,16 @@ init(Vga* vga, Ctlr* ctlr)
 	if(vga->crt[0x04] & 0x100)
 		nv->horiz |= 0x08;
 
+	nv->extra = 0x00;
+	if (vga->crt[0x06] & 0x800)
+		nv->extra |= 0x01;
+	if (vga->crt[0x12] & 0x800)
+		nv->extra |= 0x04;
+	if (vga->crt[0x10] & 0x800)
+		nv->extra |= 0x10;
+	if (vga->crt[0x15] & 0x800)
+		nv->extra |= 0x40;
+
 	nv->interlace = 0xFF;
 	if (nv->twoheads) {
 		nv->head |= 0x00001000;