[Midnightbsd-cvs] src [9380] trunk/sys/dev/sis: introduced SIS_TYPE_83816 but it was not actually set in

[laffer1 at midnightbsd.org]

Revision: 9380
          http://svnweb.midnightbsd.org/src/?rev=9380
Author:   laffer1
Date:     2017-03-04 15:34:47 -0500 (Sat, 04 Mar 2017)
Log Message:
-----------
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 Paths:
--------------
    trunk/sys/dev/sis/if_sis.c
    trunk/sys/dev/sis/if_sisreg.h

Modified: trunk/sys/dev/sis/if_sis.c
===================================================================
--- trunk/sys/dev/sis/if_sis.c	2017-03-04 20:33:14 UTC (rev 9379)
+++ trunk/sys/dev/sis/if_sis.c	2017-03-04 20:34:47 UTC (rev 9380)
@@ -625,7 +625,7 @@
 		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 @@
 		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: trunk/sys/dev/sis/if_sisreg.h
===================================================================
--- trunk/sys/dev/sis/if_sisreg.h	2017-03-04 20:33:14 UTC (rev 9379)
+++ trunk/sys/dev/sis/if_sisreg.h	2017-03-04 20:34:47 UTC (rev 9380)
@@ -439,7 +439,6 @@
 #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;