Plan 9 from Bell Labs’s /usr/web/sources/contrib/uriel/changes/2006/0413/5

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


kernels: add new admtek cardbus controller
 [jmk] --rw-rw-r-- M 779778 glenda sys 41694 Apr 13 17:30 sys/src/9/pc/ether2114x.c
	/n/sourcesdump/2006/0413/plan9/sys/src/9/pc/ether2114x.c:190,195 - 
	/n/sourcesdump/2006/0414/plan9/sys/src/9/pc/ether2114x.c:190,196
	  	Pnic		= (0x0002<<16)|0x11AD,
	  	Pnic2		= (0xC115<<16)|0x11AD,
	  	CentaurP	= (0x0985<<16)|0x1317,
	+ 	CentaurPcb	= (0x1985<<16)|0x1317,
	  };
	  
	  typedef struct Ctlr Ctlr;
	/n/sourcesdump/2006/0413/plan9/sys/src/9/pc/ether2114x.c:1515,1521 - 
	/n/sourcesdump/2006/0414/plan9/sys/src/9/pc/ether2114x.c:1516,1522
	  			ctlr->srom[20+i+1] = ctlr->srom[i];
	  		}
	  	}
	- 	if(ctlr->id == CentaurP){
	+ 	if(ctlr->id == CentaurP || ctlr->id == CentaurPcb){
	  		memmove(&ctlr->srom[20], leafpnic, sizeof(leafpnic));
	  		for(i = 0; i < Eaddrlen; i += 2){
	  			ctlr->srom[20+i] = ctlr->srom[8+i];
	/n/sourcesdump/2006/0413/plan9/sys/src/9/pc/ether2114x.c:1603,1609 - 
	/n/sourcesdump/2006/0414/plan9/sys/src/9/pc/ether2114x.c:1604,1610
	  	if(phy){
	  		x = 0;
	  		for(k = 0; k < nelem(ctlr->phy); k++){
	- 			if(ctlr->id == CentaurP && k != 1)
	+ 			if((ctlr->id == CentaurP || ctlr->id == CentaurPcb) && k != 1)
	  				continue;
	  			if((oui = miir(ctlr, k, 2)) == -1 || oui == 0)
	  				continue;
	/n/sourcesdump/2006/0413/plan9/sys/src/9/pc/ether2114x.c:1655,1660 - 
	/n/sourcesdump/2006/0414/plan9/sys/src/9/pc/ether2114x.c:1656,1662
	  		case Pnic:			/* PNIC */
	  		case Pnic2:			/* PNIC-II */
	  		case CentaurP:			/* ADMtek */
	+ 		case CentaurPcb:		/* ADMtek CardBus */
	  			break;
	  		}
	  
	/n/sourcesdump/2006/0413/plan9/sys/src/9/pc/ether2114x.c:1698,1703 - 
	/n/sourcesdump/2006/0414/plan9/sys/src/9/pc/ether2114x.c:1700,1706
	  			csr32w(ctlr, 15, 0x00000001);
	  			break;
	  		case CentaurP:
	+ 		case CentaurPcb:
	  			/*
	  			 * Nice - the register offsets change from *8 to *4
	  			 * for CSR16 and up...
	/n/sourcesdump/2006/0413/plan9/sys/src/9/pc/ether2114x.c:1823,1828 - 
	/n/sourcesdump/2006/0414/plan9/sys/src/9/pc/ether2114x.c:1826,1831
	  void
	  ether2114xlink(void)
	  {
	- 	addethercard("21140",  reset);
	  	addethercard("2114x",  reset);
	+ 	addethercard("21140",  reset);
	  }


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].