svn commit: r250646 - stable/9/sys/dev/sis

[Pyun YongHyeon]

Author: yongari
Date: Wed May 15 01:05:16 2013
New Revision: 250646
URL: http://svnweb.freebsd.org/changeset/base/250646

Log:
  MFC r248456:
    r119712 introduced SIS_TYPE_83816 but it was not actually set in
    driver such that checking against the type was always false.
    To detect NS DP83816, driver should have checked silicon revision
    register for NS controllers. While here, remove SIS_TYPE_83816 to
    not make the similar mistake again.

Modified:
  stable/9/sys/dev/sis/if_sis.c
  stable/9/sys/dev/sis/if_sisreg.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/sis/if_sis.c
==============================================================================
--- stable/9/sys/dev/sis/if_sis.c	Wed May 15 01:00:40 2013	(r250645)
+++ stable/9/sys/dev/sis/if_sis.c	Wed May 15 01:05:16 2013	(r250646)
@@ -625,7 +625,7 @@ sis_miibus_statchg(device_t dev)
 		SIS_CLRBIT(sc, SIS_RX_CFG, SIS_RXCFG_RX_TXPKTS);
 	}
 
-	if (sc->sis_type == SIS_TYPE_83816) {
+	if (sc->sis_type == SIS_TYPE_83815 && sc->sis_srr >= NS_SRR_16A) {
 		/*
 		 * MPII03.D: Half Duplex Excessive Collisions.
 		 * Also page 49 in 83816 manual
@@ -1990,7 +1990,7 @@ sis_initl(struct sis_softc *sc)
 		return;
 	}
 
-	if (sc->sis_type == SIS_TYPE_83815 || sc->sis_type == SIS_TYPE_83816) {
+	if (sc->sis_type == SIS_TYPE_83815) {
 		if (sc->sis_manual_pad != 0)
 			sc->sis_flags |= SIS_FLAG_MANUAL_PAD;
 		else

Modified: stable/9/sys/dev/sis/if_sisreg.h
==============================================================================
--- stable/9/sys/dev/sis/if_sisreg.h	Wed May 15 01:00:40 2013	(r250645)
+++ stable/9/sys/dev/sis/if_sisreg.h	Wed May 15 01:05:16 2013	(r250646)
@@ -439,7 +439,6 @@ struct sis_type {
 #define SIS_TYPE_900	1
 #define SIS_TYPE_7016	2
 #define SIS_TYPE_83815	3
-#define SIS_TYPE_83816	4
 
 struct sis_txdesc {
 	struct mbuf		*tx_m;