d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix support for 630ET support. We don't need the Linux part to set the

Browse Source 
mii access mode.  Fix the device ID and make it read the mac via sis_read_mac.

Reviewed by: 	imp
MFC after:	1 week
This commit is contained in:
Doug Ambrisko 2002-02-06 22:06:47 +00:00
parent de29c3cfb5
commit 4c2380660a
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/pci/if_sis.c
View File

@ -958,11 +958,11 @@ static int sis_attach(dev)
*/ */
if (sc->sis_rev == SIS_REV_630S || if (sc->sis_rev == SIS_REV_630S ||
sc->sis_rev == SIS_REV_630E || sc->sis_rev == SIS_REV_630E ||
sc->sis_rev == SIS_REV_630EA1 || sc->sis_rev == SIS_REV_630EA1)
sc->sis_rev == SIS_REV_630ET)
sis_read_cmos(sc, dev, (caddr_t)&eaddr, 0x9, 6); sis_read_cmos(sc, dev, (caddr_t)&eaddr, 0x9, 6);
else if (sc->sis_rev == SIS_REV_635) else if (sc->sis_rev == SIS_REV_635 ||
sc->sis_rev == SIS_REV_630ET)
sis_read_mac(sc, dev, (caddr_t)&eaddr); sis_read_mac(sc, dev, (caddr_t)&eaddr);
else else
#endif #endif
@ -976,13 +976,6 @@ static int sis_attach(dev)
*/ */
printf("sis%d: Ethernet address: %6D\n", unit, eaddr, ":"); printf("sis%d: Ethernet address: %6D\n", unit, eaddr, ":");
/*
* From the Linux driver:
* 630ET : set the mii access mode as software-mode
*/
if (sc->sis_rev == SIS_REV_630ET)
SIS_SETBIT(sc, SIS_CSR, SIS_CSR_ACCESS_MODE);
sc->sis_unit = unit; sc->sis_unit = unit;
callout_handle_init(&sc->sis_stat_ch); callout_handle_init(&sc->sis_stat_ch);
bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN);

2
sys/pci/if_sisreg.h
View File

@ -383,7 +383,7 @@ struct sis_ring_data {
#define SIS_REV_630E 0x0081 #define SIS_REV_630E 0x0081
#define SIS_REV_630S 0x0082 #define SIS_REV_630S 0x0082
#define SIS_REV_630EA1 0x0083 #define SIS_REV_630EA1 0x0083
#define SIS_REV_630ET 0x0083 #define SIS_REV_630ET 0x0084
#define SIS_REV_635 0x0090 #define SIS_REV_635 0x0090
/* /*