svn commit: r310305 - in head/sys/dev/rtwn: rtl8188e/usb rtl8192c rtl8812a

[Kevin Lo]

Author: kevlo
Date: Tue Dec 20 01:13:11 2016
New Revision: 310305
URL: https://svnweb.freebsd.org/changeset/base/310305

Log:
  Merge r92c_init_rf_common() into r92c_init_rf().  In r88eu_attach.c, we could
  use r92c_init_rf() rather than r92c_init_rf_common() when sc_init_rf()
  callback is invoked.
  
  While here, constantly use RF chain instead of RF path in comment.
  
  Reviewed by:	avos

Modified:
  head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c
  head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c
  head/sys/dev/rtwn/rtl8192c/r92c.h
  head/sys/dev/rtwn/rtl8192c/r92c_init.c
  head/sys/dev/rtwn/rtl8812a/r12a_priv.h

Modified: head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c
==============================================================================
--- head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c	Mon Dec 19 23:38:07 2016	(r310304)
+++ head/sys/dev/rtwn/rtl8188e/usb/r88eu_attach.c	Tue Dec 20 01:13:11 2016	(r310305)
@@ -171,7 +171,7 @@ r88eu_attach(struct rtwn_usb_softc *uc)
 	sc->sc_init_intr		= r88eu_init_intr;
 	sc->sc_init_edca		= r92c_init_edca;
 	sc->sc_init_bb			= r88e_init_bb;
-	sc->sc_init_rf			= r92c_init_rf_common;
+	sc->sc_init_rf			= r92c_init_rf;
 	sc->sc_init_antsel		= rtwn_nop_softc;
 	sc->sc_post_init		= r88eu_post_init;
 	sc->sc_init_bcnq1_boundary	= rtwn_nop_int_softc;

Modified: head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c
==============================================================================
--- head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c	Mon Dec 19 23:38:07 2016	(r310304)
+++ head/sys/dev/rtwn/rtl8188e/usb/r88eu_init.c	Tue Dec 20 01:13:11 2016	(r310305)
@@ -200,9 +200,6 @@ r88eu_init_rx_agg(struct rtwn_softc *sc)
 void
 r88eu_post_init(struct rtwn_softc *sc)
 {
-	/* Turn CCK and OFDM blocks on. */
-	rtwn_bb_setbits(sc, R92C_FPGA0_RFMOD, 0, R92C_RFMOD_CCK_EN);
-	rtwn_bb_setbits(sc, R92C_FPGA0_RFMOD, 0, R92C_RFMOD_OFDM_EN);
 
 	/* Enable per-packet TX report. */
 	rtwn_setbits_1(sc, R88E_TX_RPT_CTRL, 0, R88E_TX_RPT1_ENA);

Modified: head/sys/dev/rtwn/rtl8192c/r92c.h
==============================================================================
--- head/sys/dev/rtwn/rtl8192c/r92c.h	Mon Dec 19 23:38:07 2016	(r310304)
+++ head/sys/dev/rtwn/rtl8192c/r92c.h	Tue Dec 20 01:13:11 2016	(r310305)
@@ -81,7 +81,6 @@ int	r92c_set_page_size(struct rtwn_softc
 void	r92c_init_bb_common(struct rtwn_softc *);
 int	r92c_init_rf_chain(struct rtwn_softc *,
 	    const struct rtwn_rf_prog *, int);
-void	r92c_init_rf_common(struct rtwn_softc *);
 void	r92c_init_rf(struct rtwn_softc *);
 void	r92c_init_edca(struct rtwn_softc *);
 void	r92c_init_ampdu(struct rtwn_softc *);

Modified: head/sys/dev/rtwn/rtl8192c/r92c_init.c
==============================================================================
--- head/sys/dev/rtwn/rtl8192c/r92c_init.c	Mon Dec 19 23:38:07 2016	(r310304)
+++ head/sys/dev/rtwn/rtl8192c/r92c_init.c	Tue Dec 20 01:13:11 2016	(r310305)
@@ -204,7 +204,7 @@ r92c_init_rf_chain(struct rtwn_softc *sc
 }
 
 void
-r92c_init_rf_common(struct rtwn_softc *sc)
+r92c_init_rf(struct rtwn_softc *sc)
 {
 	struct r92c_softc *rs = sc->sc_priv;
 	uint32_t reg, type;
@@ -244,14 +244,6 @@ r92c_init_rf_common(struct rtwn_softc *s
 		rs->rf_chnlbw[chain] = rtwn_rf_read(sc, chain,
 		    R92C_RF_CHNLBW);
 	}
-}
-
-void
-r92c_init_rf(struct rtwn_softc *sc)
-{
-	struct r92c_softc *rs = sc->sc_priv;
-
-	r92c_init_rf_common(sc);
 
 	if ((rs->chip & (R92C_CHIP_UMC_A_CUT | R92C_CHIP_92C)) ==
 	    R92C_CHIP_UMC_A_CUT) {

Modified: head/sys/dev/rtwn/rtl8812a/r12a_priv.h
==============================================================================
--- head/sys/dev/rtwn/rtl8812a/r12a_priv.h	Mon Dec 19 23:38:07 2016	(r310304)
+++ head/sys/dev/rtwn/rtl8812a/r12a_priv.h	Tue Dec 20 01:13:11 2016	(r310305)
@@ -657,7 +657,7 @@ static const struct rtwn_rf_prog rtl8812
 		NULL
 	},
 	{ 0, NULL, NULL, { 0 },	NULL },
-	/* RF path 2. */
+	/* RF chain 1. */
 	{
 		nitems(rtl8812au_rf1_regs0),
 		rtl8812au_rf1_regs0,