Plan 9 from Bell Labs 2006-02-23

dist/replica/_plan9.db

@@ -149,7 +149,7 @@
 386/bin/aux/trampoline - 775 sys sys 1135570791 83641
 386/bin/aux/typepasswd - 775 sys sys 1135570791 69495
 386/bin/aux/usage - 775 sys sys 1139853471 59587
-386/bin/aux/vga - 775 sys sys 1136087522 333880
+386/bin/aux/vga - 775 sys sys 1140631128 333747
 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 1095563640 99117
@@ -5746,7 +5746,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000664 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000664 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1140522013 257576
+sys/games/lib/fortunes - 664 sys sys 1140655027 257628
 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
@@ -7966,7 +7966,7 @@ sys/src/9/pc/etherelnk3.c - 664 sys sys 1131290378 48733
 sys/src/9/pc/etherga620.c - 664 sys sys 1134390125 28760
 sys/src/9/pc/etherga620fw.h - 664 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
-sys/src/9/pc/etherigbe.c - 664 sys sys 1140545255 44829
+sys/src/9/pc/etherigbe.c - 664 sys sys 1140615989 44814
 sys/src/9/pc/ethermii.c - 664 sys sys 1084331434 4612
 sys/src/9/pc/ethermii.h - 664 sys sys 1086873891 3258
 sys/src/9/pc/etherrhine.c - 664 sys sys 1081706478 13799
@@ -9705,7 +9705,7 @@ sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1135487948 35804
 sys/src/cmd/aux/vga/mkfile - 664 sys sys 1115734903 927
 sys/src/cmd/aux/vga/neomagic.c - 664 sys sys 1104430499 8975
 sys/src/cmd/aux/vga/notes.txt - 664 sys sys 1028334647 14376
-sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1135487946 31487
+sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1140615970 31488
 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

dist/replica/plan9.db

@@ -149,7 +149,7 @@
 386/bin/aux/trampoline - 775 sys sys 1135570791 83641
 386/bin/aux/typepasswd - 775 sys sys 1135570791 69495
 386/bin/aux/usage - 775 sys sys 1139853471 59587
-386/bin/aux/vga - 775 sys sys 1136087522 333880
+386/bin/aux/vga - 775 sys sys 1140631128 333747
 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 1095563640 99117
@@ -5746,7 +5746,7 @@ sys/games - 20000000775 sys sys 952648872 0
 sys/games/lib - 20000000775 sys sys 952648879 0
 sys/games/lib/4scores - 10000000664 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000664 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1140522013 257576
+sys/games/lib/fortunes - 664 sys sys 1140655027 257628
 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
@@ -7966,7 +7966,7 @@ sys/src/9/pc/etherelnk3.c - 664 sys sys 1131290378 48733
 sys/src/9/pc/etherga620.c - 664 sys sys 1134390125 28760
 sys/src/9/pc/etherga620fw.h - 664 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1088178711 961
-sys/src/9/pc/etherigbe.c - 664 sys sys 1140545255 44829
+sys/src/9/pc/etherigbe.c - 664 sys sys 1140615989 44814
 sys/src/9/pc/ethermii.c - 664 sys sys 1084331434 4612
 sys/src/9/pc/ethermii.h - 664 sys sys 1086873891 3258
 sys/src/9/pc/etherrhine.c - 664 sys sys 1081706478 13799
@@ -9705,7 +9705,7 @@ sys/src/cmd/aux/vga/mga4xx.c - 664 sys sys 1135487948 35804
 sys/src/cmd/aux/vga/mkfile - 664 sys sys 1115734903 927
 sys/src/cmd/aux/vga/neomagic.c - 664 sys sys 1104430499 8975
 sys/src/cmd/aux/vga/notes.txt - 664 sys sys 1028334647 14376
-sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1135487946 31487
+sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1140615970 31488
 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

dist/replica/plan9.log

@@ -27813,3 +27813,7 @@
 1140546700 0 c sys/src/9/pc/etherigbe.c - 664 sys sys 1140545255 44829
 1140546700 1 c sys/src/cmd/8l/asm.c - 664 sys sys 1140545812 11882
 1140553902 0 c 386/bin/8l - 775 sys sys 1140553397 115719
+1140616917 0 c sys/src/9/pc/etherigbe.c - 664 sys sys 1140615989 44814
+1140616917 1 c sys/src/cmd/aux/vga/nvidia.c - 664 sys sys 1140615970 31488
+1140631323 0 c 386/bin/aux/vga - 775 sys sys 1140631128 333747
+1140656409 0 c sys/games/lib/fortunes - 664 sys sys 1140655027 257628

sys/games/lib/fortunes

@@ -4106,3 +4106,4 @@ Equations are the devil's sentences.  - Stephen Colbert
 cpu: can't dial: plan9.lanl.gov: The operation completed successfully.
 A kiss without a beard is like an egg without salt.  - Dutch proverb
 Nothing is good enough for the fortune file! - Dan Cross
+Tried to read 71776119061217303 bytes. Read only 23

sys/src/9/pc/etherigbe.c

@@ -674,13 +674,13 @@ igbectl(Ether* edev, void* buf, long n)
 {
 	int v;
 	char *p;
-	Ctlr *ctlr;	
+	Ctlr *ctlr;
 	Cmdbuf *cb;
 	Cmdtab *ct;
 
 	if((ctlr = edev->ctlr) == nil)
 		error(Enonexist);
-	
+
 	cb = parsecmd(buf, n);
 	if(waserror()){
 		free(cb);
@@ -739,7 +739,7 @@ igbemulticast(void* arg, uchar* addr, int on)
 		ctlr->mta[x] |= 1<<bit;
 	else
 		ctlr->mta[x] &= ~(1<<bit);
-	
+
 	csr32w(ctlr, Mta+x*4, ctlr->mta[x]);
 }
 
@@ -1107,10 +1107,10 @@ igberproc(void* arg)
 		rdh = ctlr->rdh;
 		for(;;){
 			rd = &ctlr->rdba[rdh];
-	
+
 			if(!(rd->status & Rdd))
 				break;
-	
+
 			/*
 			 * Accept eop packets with no errors.
 			 * With no errors and the Ixsm bit set,
@@ -1157,7 +1157,7 @@ igberproc(void* arg)
 			rdh = NEXT(rdh, ctlr->nrd);
 		}
 		ctlr->rdh = rdh;
-	
+
 		if(ctlr->rdfree < ctlr->nrd/2 || (ctlr->rim & Rxdmt0))
 			igbereplenish(ctlr);
 	}
@@ -1501,13 +1501,13 @@ igbemii(Ctlr* ctlr)
 		r |= 0x0060;			/* auto-crossover all speeds */
 		r |= 0x0002;			/* polarity reversal enabled */
 		miimiw(ctlr->mii, 16, r);
-	
+
 		r = miimir(ctlr->mii, 20);
 		r |= 0x0070;			/* +25MHz clock */
 		r &= ~0x0F00;
 		r |= 0x0100;			/* 1x downshift */
 		miimiw(ctlr->mii, 20, r);
-	
+
 		miireset(ctlr->mii);
 		p = 0;
 		if(ctlr->txcw & TxcwPs)
@@ -1794,7 +1794,7 @@ if(i == Ea && ctlr->id == i82541gi && ctlr->eeprom[i] == 0xFFFF)
 		txcw &= ~(TxcwAne|TxcwPauseMASK|TxcwFd);
 		ctrl = csr32r(ctlr, Ctrl);
 		ctrl &= ~(SwdpioloMASK|Frcspd|Ilos|Lrst|Fd);
-	
+
 		if(ctlr->eeprom[Icw1] & 0x0400){
 			ctrl |= Fd;
 			txcw |= TxcwFd;
@@ -1808,7 +1808,7 @@ if(i == Ea && ctlr->id == i82541gi && ctlr->eeprom[i] == 0xFFFF)
 		swdpio = (ctlr->eeprom[Icw1] & 0x01E0)>>5;
 		ctrl |= swdpio<<SwdpioloSHIFT;
 		csr32w(ctlr, Ctrl, ctrl);
-		
+
 		ctrl = csr32r(ctlr, Ctrlext);
 		ctrl &= ~(Ips|SwdpiohiMASK);
 		swdpio = (ctlr->eeprom[Icw2] & 0x00F0)>>4;
@@ -1816,7 +1816,7 @@ if(i == Ea && ctlr->id == i82541gi && ctlr->eeprom[i] == 0xFFFF)
 			ctrl |= Ips;
 		ctrl |= swdpio<<SwdpiohiSHIFT;
 		csr32w(ctlr, Ctrlext, ctrl);
-	
+
 		if(ctlr->eeprom[Icw2] & 0x0800)
 			txcw |= TxcwAne;
 		pause = (ctlr->eeprom[Icw2] & 0x3000)>>12;
@@ -1841,7 +1841,7 @@ if(i == Ea && ctlr->id == i82541gi && ctlr->eeprom[i] == 0xFFFF)
 		csr32w(ctlr, Txcw, txcw);
 	}
 
-		
+
 	/*
 	 * Flow control - values from the datasheet.
 	 */
@@ -1866,7 +1866,7 @@ igbepci(void)
 	Pcidev *p;
 	Ctlr *ctlr;
 	void *mem;
-	
+
 	p = nil;
 	while(p = pcimatch(p, 0, 0)){
 		if(p->ccrb != 0x02 || p->ccru != 0)

sys/src/cmd/aux/vga/nvidia.c

@@ -145,6 +145,27 @@ snarf(Vga* vga, Ctlr* ctlr)
 		if(p == nil)
 			error("%s: not found\n", ctlr->name);
 
+		vgactlw("type", ctlr->name);
+
+		mmio = segattach(0, "nvidiammio", 0, p->mem[0].size);
+		if(mmio == (void*)-1)
+			error("%s: segattach nvidiammio, size %d: %r\n",
+				ctlr->name, p->mem[0].size);
+
+		nv->pci = p;
+		nv->mmio = mmio;
+
+		nv->pfb = mmio+0x00100000/4;
+		nv->pramdac = mmio+0x00680000/4;
+		nv->pextdev = mmio+0x00101000/4;
+		nv->pmc	= mmio+0x00000000/4;
+		nv->ptimer = mmio+0x00009000/4;
+		nv->pfifo = mmio+0x00002000/4;
+		nv->pramin = mmio+0x00710000/4;
+		nv->pgraph = mmio+0x00400000/4;
+		nv->fifo = mmio+0x00800000/4;
+		nv->pcrtc= mmio+0x00600000/4;		
+
 		nv->did = p->did;
 		if ((nv->did & 0xfff0) == 0x00f0)
 			getpcixdid(nv);
@@ -190,26 +211,6 @@ snarf(Vga* vga, Ctlr* ctlr)
 			error("%s: DID %4.4uX unsupported\n", ctlr->name, nv->did);
 			break;
 		}
-		vgactlw("type", ctlr->name);
-
-		mmio = segattach(0, "nvidiammio", 0, p->mem[0].size);
-		if(mmio == (void*)-1)
-			error("%s: segattach nvidiammio, size %d: %r\n",
-				ctlr->name, p->mem[0].size);
-
-		nv->pci = p;
-		nv->mmio = mmio;
-
-		nv->pfb = mmio+0x00100000/4;
-		nv->pramdac = mmio+0x00680000/4;
-		nv->pextdev = mmio+0x00101000/4;
-		nv->pmc	= mmio+0x00000000/4;
-		nv->ptimer = mmio+0x00009000/4;
-		nv->pfifo = mmio+0x00002000/4;
-		nv->pramin = mmio+0x00710000/4;
-		nv->pgraph = mmio+0x00400000/4;
-		nv->fifo = mmio+0x00800000/4;
-		nv->pcrtc= mmio+0x00600000/4;		
 	}
 	nv = vga->private;
 	implementation = nv->did & 0x0ff0;