svn commit: r311347 - in head/sys/dev/rtwn/rtl8192c: . pci usb

[Kevin Lo]

Author: kevlo
Date: Thu Jan  5 02:04:53 2017
New Revision: 311347
URL: https://svnweb.freebsd.org/changeset/base/311347

Log:
  In rtl8188eu, read R92C_HSSI_PARAM2(0)) register to detect whether it needs
  to enable CCK high power feature or not.
  
  Reviewed by:	avos

Modified:
  head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c
  head/sys/dev/rtwn/rtl8192c/r92c_init.c
  head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c

Modified: head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c
==============================================================================
--- head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c	Thu Jan  5 01:44:12 2017	(r311346)
+++ head/sys/dev/rtwn/rtl8192c/pci/r92ce_init.c	Thu Jan  5 02:04:53 2017	(r311347)
@@ -105,10 +105,6 @@ r92ce_init_bb(struct rtwn_softc *sc)
 	rtwn_setbits_4(sc, R92C_LEDCFG0, 0, 0x00800000);
 
 	r92c_init_bb_common(sc);
-
-	if (rtwn_bb_read(sc, R92C_HSSI_PARAM2(0)) &
-	    R92C_HSSI_PARAM2_CCK_HIPWR)
-		sc->sc_flags |= RTWN_FLAG_CCK_HIPWR;
 }
 
 int

Modified: head/sys/dev/rtwn/rtl8192c/r92c_init.c
==============================================================================
--- head/sys/dev/rtwn/rtl8192c/r92c_init.c	Thu Jan  5 01:44:12 2017	(r311346)
+++ head/sys/dev/rtwn/rtl8192c/r92c_init.c	Thu Jan  5 02:04:53 2017	(r311347)
@@ -159,6 +159,9 @@ r92c_init_bb_common(struct rtwn_softc *s
 			rtwn_delay(sc, 1);
 		}
 	}
+
+	if (rtwn_bb_read(sc, R92C_HSSI_PARAM2(0)) & R92C_HSSI_PARAM2_CCK_HIPWR)
+		sc->sc_flags |= RTWN_FLAG_CCK_HIPWR;
 }
 
 int

Modified: head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c
==============================================================================
--- head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c	Thu Jan  5 01:44:12 2017	(r311346)
+++ head/sys/dev/rtwn/rtl8192c/usb/r92cu_init.c	Thu Jan  5 02:04:53 2017	(r311347)
@@ -78,10 +78,6 @@ r92cu_init_bb(struct rtwn_softc *sc)
 	rtwn_write_1(sc, R92C_AFE_XTAL_CTRL + 1, 0x80);
 
 	r92c_init_bb_common(sc);
-
-	if (rtwn_bb_read(sc, R92C_HSSI_PARAM2(0)) &
-	    R92C_HSSI_PARAM2_CCK_HIPWR)
-		sc->sc_flags |= RTWN_FLAG_CCK_HIPWR;
 }
 
 int