Attachment 20650 Details for Bug 36410 – file.diff

[patch] file.diff

file.diff (text/plain), 1.45 KB, created by Genya Sugiyama on 2002-03-28 07:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Genya Sugiyama

Created: 2002-03-28 07:20:01 UTC

Size: 1.45 KB

patch

obsolete

>*** /usr/src/sys/pci/if_dc.c.org	Tue Feb 26 22:35:49 2002
>--- /usr/src/sys/pci/if_dc.c	Thu Mar 28 09:27:06 2002
>***************
>*** 1669,1675 ****
>  {
>  	int			s, tmp = 0;
>  	u_char			eaddr[ETHER_ADDR_LEN];
>! 	u_int32_t		command;
>  	struct dc_softc		*sc;
>  	struct ifnet		*ifp;
>  	u_int32_t		revision;
>--- 1669,1675 ----
>  {
>  	int			s, tmp = 0;
>  	u_char			eaddr[ETHER_ADDR_LEN];
>! 	u_int32_t		command, reg;
>  	struct dc_softc		*sc;
>  	struct ifnet		*ifp;
>  	u_int32_t		revision;
>***************
>*** 1775,1781 ****
>  		break;
>  	case DC_DEVICEID_AN985:
>  	case DC_DEVICEID_EN2242:
>! 		sc->dc_type = DC_TYPE_AN985;
>  		sc->dc_flags |= DC_TX_USE_TX_INTR;
>  		sc->dc_flags |= DC_TX_ADMTEK_WAR;
>  		sc->dc_pmode = DC_PMODE_MII;
>--- 1775,1791 ----
>  		break;
>  	case DC_DEVICEID_AN985:
>  	case DC_DEVICEID_EN2242:
>! 		reg = pci_read_config(dev, DC_PCI_CSID, 4);
>! 		/* printf("CSID=%08x\n", reg); */
>! 		switch (reg) {
>! 		case 0x980314ea: /* FNW-9803-T */
>! 		case 0xa11b1259: /* Corega */
>! 			sc->dc_type = DC_TYPE_AN983;
>! 			break;
>! 		default:
>! 			sc->dc_type = DC_TYPE_AN985;
>! 			break;
>! 		}
>  		sc->dc_flags |= DC_TX_USE_TX_INTR;
>  		sc->dc_flags |= DC_TX_ADMTEK_WAR;
>  		sc->dc_pmode = DC_PMODE_MII;
>***************
>*** 1900,1905 ****
>--- 1910,1916 ----
>  		dc_read_eeprom(sc, (caddr_t)&eaddr, DC_EE_NODEADDR, 3, 0);
>  		break;
>  	case DC_TYPE_AL981:
>+ 	case DC_TYPE_AN983:
>  	case DC_TYPE_AN985:
>  		dc_read_eeprom(sc, (caddr_t)&eaddr, DC_AL_EE_NODEADDR, 3, 0);
>  		break;

Actions: View | Diff

Attachments on bug 36410: 20649 | 20650