diff options
| author | ambrisko <ambrisko@FreeBSD.org> | 2002-02-06 22:06:47 +0000 |
|---|---|---|
| committer | ambrisko <ambrisko@FreeBSD.org> | 2002-02-06 22:06:47 +0000 |
| commit | 66ffb1f1383c2274845ae6970fe3a5694a8cdf23 (patch) | |
| tree | 66b4fc695582af1750fd1b4f19a8919f53a3d74d /sys | |
| parent | caff7678a766dc62b2988ed0f5980fe796e5c146 (diff) | |
| download | FreeBSD-src-66ffb1f1383c2274845ae6970fe3a5694a8cdf23.zip FreeBSD-src-66ffb1f1383c2274845ae6970fe3a5694a8cdf23.tar.gz | |
Fix support for 630ET support. We don't need the Linux part to set the
mii access mode. Fix the device ID and make it read the mac via sis_read_mac.
Reviewed by: imp
MFC after: 1 week
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pci/if_sis.c | 13 | ||||
| -rw-r--r-- | sys/pci/if_sisreg.h | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c index 998203e..645c5e7 100644 --- a/sys/pci/if_sis.c +++ b/sys/pci/if_sis.c @@ -958,11 +958,11 @@ static int sis_attach(dev) */ if (sc->sis_rev == SIS_REV_630S || sc->sis_rev == SIS_REV_630E || - sc->sis_rev == SIS_REV_630EA1 || - sc->sis_rev == SIS_REV_630ET) + sc->sis_rev == SIS_REV_630EA1) 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); else #endif @@ -976,13 +976,6 @@ static int sis_attach(dev) */ 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; callout_handle_init(&sc->sis_stat_ch); bcopy(eaddr, (char *)&sc->arpcom.ac_enaddr, ETHER_ADDR_LEN); diff --git a/sys/pci/if_sisreg.h b/sys/pci/if_sisreg.h index 81e3e60..3137543 100644 --- a/sys/pci/if_sisreg.h +++ b/sys/pci/if_sisreg.h @@ -383,7 +383,7 @@ struct sis_ring_data { #define SIS_REV_630E 0x0081 #define SIS_REV_630S 0x0082 #define SIS_REV_630EA1 0x0083 -#define SIS_REV_630ET 0x0083 +#define SIS_REV_630ET 0x0084 #define SIS_REV_635 0x0090 /* |
