Plan 9 from Bell Labs’s /usr/web/sources/contrib/uriel/changes/2005/1113/2

Copyright © 2021 Plan 9 Foundation.
Distributed under the MIT License.
Download the Plan 9 distribution.


Recognize alternate 82541GI.
 [rsc] --rw-rw-r-- M 173985 jmk sys 44621 Nov 13 10:40 sys/src/9/pc/etherigbe.c
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/etherigbe.c:38,43 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/etherigbe.c:38,44
	  	i82545gmc	= (0x1026<<16)|0x8086,
	  	i82547gi   	= (0x1075<<16)|0x8086,
	  	i82541gi   	= (0x1076<<16)|0x8086,
	+ 	i82541gi2		= (0x1077<<16)|0x8086,
	  	i82546gb   	= (0x1079<<16)|0x8086,
	  	i82541pi	= (0x107c<<16)|0x8086,
	  	i82546eb	= (0x1010<<16)|0x8086,
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/etherigbe.c:830,835 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/etherigbe.c:831,837
	  		case i82540em:
	  		case i82540eplp:
	  		case i82547gi:
	+ 		case i82541gi2:
	  		case i82541gi:
	  		case i82541pi:
	  			break;
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/etherigbe.c:886,891 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/etherigbe.c:888,894
	  	case i82546gb:
	  	case i82546eb:
	  	case i82547gi:
	+ 	case i82541gi2:
	  		r = 8;
	  		break;
	  	}
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/etherigbe.c:919,924 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/etherigbe.c:922,928
	  	case i82540em:
	  	case i82540eplp:
	  	case i82547gi:
	+ 	case i82541gi2:
	  	case i82545gmc:
	  	case i82546gb:
	  	case i82546eb:
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/etherigbe.c:1057,1062 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/etherigbe.c:1061,1067
	  	case i82546gb:
	  	case i82546eb:
	  	case i82547gi:
	+ 	case i82541gi2:
	  		csr32w(ctlr, Radv, 64);
	  		break;
	  	}
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/etherigbe.c:1447,1452 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/etherigbe.c:1452,1458
	  	case i82540em:
	  	case i82540eplp:
	  	case i82547gi:
	+ 	case i82541gi2:
	  	case i82541gi:
	  	case i82541pi:
	  	case i82545gmc:
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/etherigbe.c:1480,1485 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/etherigbe.c:1486,1492
	  	 */
	  	switch(ctlr->id){
	  	case i82547gi:
	+ 	case i82541gi2:
	  	case i82541gi:
	  	case i82541pi:
	  	case i82545gmc:
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/etherigbe.c:1615,1620 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/etherigbe.c:1622,1628
	  	case i82541gi:
	  	case i82541pi:
	  	case i82547gi:
	+ 	case i82541gi2:
	  	case i82545gmc:
	  	case i82546gb:
	  	case i82546eb:
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/etherigbe.c:1699,1704 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/etherigbe.c:1707,1713
	  	case i82541gi:
	  	case i82541pi:
	  	case i82547gi:
	+ 	case i82541gi2:
	  	case i82545gmc:
	  	case i82546gb:
	  	case i82546eb:
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/etherigbe.c:1867,1874 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/etherigbe.c:1876,1884
	  		case i82547ei:
	  		case i82540em:
	  		case i82540eplp:
	- 		case i82547gi:
	  		case i82541gi:
	+ 		case i82547gi:
	+ 		case i82541gi2:
	  		case i82541pi:
	  		case i82545gmc:
	  		case i82546gb:
 [rsc] --rw-rw-r-- M 173985 glenda sys 13460 Nov 13 08:01 sys/src/9/pc/screen.c
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/screen.c:662,668 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/screen.c:662,668
	  	didswcursorinit = 1;
	  	if(!init){
	  		init = 1;
	- 		addclock0link(swcursorclock, 50);
	+ 		addclock0link(swcursorclock, 10);
	  	}
	  	scr = &vgascreen[0];
	  	if(scr==nil || scr->gscreen==nil)
 [rsc] --rw-rw-r-- M 173985 glenda sys 28287 Nov 13 08:00 sys/src/9/port/devproc.c
	/n/sourcesdump/2005/1113/plan9/sys/src/9/port/devproc.c:740,747 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/port/devproc.c:740,748
	  		}
	  		for(i=0; i<nelem(conf.mem); i++){
	  			cm = &conf.mem[i];
	- 			if(cm->kbase <= offset && offset < cm->klimit){
	- 				if(offset+n > cm->klimit)
	+ 			/* klimit-1 because klimit might be zero! */
	+ 			if(cm->kbase <= offset && offset <= cm->klimit-1){
	+ 				if(offset+n >= cm->klimit-1)
	  					n = cm->klimit - offset;
	  				memmove(a, (char*)offset, n);
	  				return n;
 [rsc] --rw-rw-r-- M 173985 jmk sys 44621 Nov 13 10:40 sys/src/9/pc/etherigbe.c
 [jmk] --rw-rw-r-- M 173985 glenda sys 3571 Nov 13 13:52 sys/src/9/pc/mkfile
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/mkfile:1,6 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/mkfile:1,6
	  CONF=pc
	  CONFLIST=pc pccpu pcf pccpuf pcdisk pcauth
	- CRAPLIST=pccd pcflop pcmartha
	+ CRAPLIST=pccd pcflop
	  EXTRACOPIES=
	  #EXTRACOPIES=lookout boundary	# copy to these servers on install
	  
 [jmk] --rw-rw-r-- M 173985 glenda sys 1428 Nov 13 13:48 sys/src/9/pc/pc
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/pc:53,59 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/pc:53,59
	  	etherelnk3	pci
	  	etherga620	pci
	  	etherigbe	pci ethermii
	- 	etherrhine	pci ethermii
	+ 	ethervt6102	pci ethermii
	  	ethersink
	  	ethersmc	devi82365 cis
	  	etherwavelan	wavelan devi82365 cis pci
 [jmk] --rw-rw-r-- M 173985 glenda sys 715 Nov 13 13:48 sys/src/9/pc/pcauth
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/pcauth:31,37 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/pcauth:31,37
	  link
	  	apm		apmjump
	  	ether82557	pci
	- 	etherrhine	pci ethermii
	+ 	ethervt6102	pci ethermii
	  	ethermedium
	  	netdevmedium
	  	loopbackmedium
 [jmk] --rw-rw-r-- M 173985 glenda sys 867 Nov 13 13:48 sys/src/9/pc/pccpu
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/pccpu:41,47 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/pccpu:41,47
	  	etherelnk3	pci
	  	etherga620	pci
	  	etherigbe	pci ethermii
	- 	etherrhine	pci ethermii
	+ 	ethervt6102	pci ethermii
	  	ethersink
	  	ethermedium
	  	loopbackmedium
 [jmk] --rw-rw-r-- M 173985 glenda sys 1447 Nov 13 13:48 sys/src/9/pc/pcdisk
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/pcdisk:49,55 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/pcdisk:49,55
	  	etherelnk3	pci
	  	etherga620	pci
	  	etherigbe	pci ethermii
	- 	etherrhine	pci ethermii
	+ 	ethervt6102	pci ethermii
	  	ethersink
	  	ethersmc	devi82365 cis
	  	etherwavelan	wavelan devi82365 cis pci
 [jmk] --rw-rw-r-- M 173985 presotto sys 1505 Nov 13 13:48 sys/src/9/pc/pcf
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/pcf:52,58 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/pcf:52,58
	  	etherelnk3	pci
	  	etherga620	pci
	  	etherigbe	pci ethermii
	- 	etherrhine	pci ethermii
	+ 	ethervt6102	pci ethermii
	  	ethersink
	  	ethersmc	devi82365 cis
	  	etherwavelan	wavelan devi82365 cis pci
 [jmk] --rw-rw-r-- M 173985 jmk sys 22286 Nov 13 13:44 sys/src/9/pc/ethervt6102.c
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/ethervt6102.c:331,340 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/ethervt6102.c:331,336
	  	"Excessive Collisions",
	  };
	  
	- //extern void cgapost(char[2]);
	- //extern char* cgapostlo;
	- //extern char* cgaposthi;
	- 
	  static long
	  vt6102ifstat(Ether* edev, void* a, long n, ulong offset)
	  {
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/ethervt6102.c:598,614 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/ethervt6102.c:594,606
	  		 * To do: adjust Tx FIFO threshold on underflow.
	  		 */
	  		if(ds->status & (Abt|Tbuff|Udf)){
	- //*cgaposthi = 'A';
	  			for(timeo = 0; timeo < 1000; timeo++){
	  				if(!(csr16r(ctlr, Cr) & Txon))
	  					break;
	  				microdelay(1);
	  			}
	- //			if(timeo >= 1000)
	- //				*cgaposthi = 'T';
	  			ds->status = Own;
	  			csr32w(ctlr, Txdaddr, PCIWADDR(ds));
	- //*cgaposthi = 'B';
	  		}
	  
	  		if(ds->status & Own)
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/ethervt6102.c:712,723 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/ethervt6102.c:704,713
	  	ds = ctlr->rdh;
	  	while(!(ds->status & Own) && ds->status != 0){
	  		if(ds->status & Rerr){
	- //*cgaposthi = 'R';
	  			for(i = 0; i < Nrxstats; i++){
	  				if(ds->status & (1<<i))
	  					ctlr->rxstats[i]++;
	  			}
	- //*cgaposthi = 'r';
	  		}
	  		else if(bp = iallocb(Rdbsz+3)){
	  			len = ((ds->status & LengthMASK)>>LengthSHIFT)-4;
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/ethervt6102.c:776,791 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/ethervt6102.c:766,776
	  		}
	  		if(isr & (Abti|Udfi|Tu|Txe|Ptx)){
	  			if(isr & (Abti|Udfi|Tu)){
	- //*cgaposthi = 'a';
	  				for(timeo = 0; timeo < 1000; timeo++){
	  					if(!(csr16r(ctlr, Cr) & Txon))
	  						break;
	  					microdelay(1);
	  				}
	- //				if(timeo >= 1000)
	- //					*cgapostlo = 't';
	- //				else
	- //					*cgapostlo = 'b';
	  
	  				if((isr & Udfi) && ctlr->tft < CtftSAF){
	  					ctlr->tft += 1<<CtftSHIFT;
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/ethervt6102.c:797,806 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/ethervt6102.c:782,789
	  			isr &= ~(Abti|Udfi|Tu|Txe|Ptx);
	  			ctlr->tintr++;
	  		}
	- 		if(isr){
	- //*cgaposthi = 'X';
	+ 		if(isr)
	  			panic("vt6102: isr %4.4uX\n", isr);
	- 		}
	  	}
	  	ctlr->imr = imr;
	  	csr16w(ctlr, Imr, ctlr->imr);
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/ethervt6102.c:926,931 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/ethervt6102.c:909,915
	  		return -1;
	  	}
	  	// print("oui %X phyno %d\n", phy->oui, phy->phyno);
	+ 	USED(phy);
	  
	  	//miiane(ctlr->mii, ~0, ~0, ~0);
	  
 [jmk] --rw-rw-r-- M 173985 presotto sys 1487 Nov 13 13:48 sys/src/9/pc/pccpuf
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/pccpuf:49,55 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/pccpuf:49,55
	  	etherelnk3	pci
	  	etherga620	pci
	  	etherigbe	pci ethermii
	- 	etherrhine	pci ethermii
	+ 	ethervt6102	pci ethermii
	  	ethersink
	  	ethersmc	devi82365 cis
	  	etherwavelan	wavelan devi82365 cis pci
 [jmk] --rw-rw-r-- M 173985 rsc sys 1474 Nov 13 13:48 sys/src/9/pc/pcflop
	/n/sourcesdump/2005/1113/plan9/sys/src/9/pc/pcflop:52,58 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/pc/pcflop:52,58
	  	etherelnk3	pci
	  	etherga620	pci
	  	etherigbe	pci ethermii
	- 	etherrhine	pci ethermii
	+ 	ethervt6102	pci ethermii
	  #	ethersink
	  	ethersmc	devi82365 cis
	  	etherwavelan	wavelan devi82365 cis pci
 [jmk] --rw-rw-r-- M 173985 glenda sys 2062 Nov 13 13:52 sys/src/9/port/portmkfile
	/n/sourcesdump/2005/1113/plan9/sys/src/9/port/portmkfile:31,37 - 
	/n/sourcesdump/2005/1114/plan9/sys/src/9/port/portmkfile:31,37
	  
	  clean:V:
	  	rm -f *.[$OS] *.root.s *.rootc.c cfs.h fs.h init.h conf.h *.out *.m errstr.h
	- 	for(i in $CONFLIST)
	+ 	for(i in $CONFLIST $CRAPLIST)
	  		mk $i.clean
	  
	  %.clean:V:


Bell Labs OSI certified Powered by Plan 9

(Return to Plan 9 Home Page)

Copyright © 2021 Plan 9 Foundation. All Rights Reserved.
Comments to [email protected].