svn commit: r268487 - head/sys/dev/usb/wlan

[Kevin Lo]

Author: kevlo
Date: Thu Jul 10 09:42:34 2014
New Revision: 268487
URL: http://svnweb.freebsd.org/changeset/base/268487

Log:
  Enable 8051 before downloading firmware.
  
  Tested by:	Carlos Jacobo Puga Medina <cpm at fbsd dot es>

Modified:
  head/sys/dev/usb/wlan/if_urtwn.c

Modified: head/sys/dev/usb/wlan/if_urtwn.c
==============================================================================
--- head/sys/dev/usb/wlan/if_urtwn.c	Thu Jul 10 09:17:46 2014	(r268486)
+++ head/sys/dev/usb/wlan/if_urtwn.c	Thu Jul 10 09:42:34 2014	(r268487)
@@ -2281,9 +2281,6 @@ urtwn_fw_reset(struct urtwn_softc *sc)
 	}
 	/* Force 8051 reset. */
 	urtwn_write_2(sc, R92C_SYS_FUNC_EN, reg & ~R92C_SYS_FUNC_EN_CPUEN);
-	urtwn_write_2(sc, R92C_SYS_FUNC_EN,
-	    urtwn_read_2(sc, R92C_SYS_FUNC_EN) |
-	    R92C_SYS_FUNC_EN_CPUEN);
 }
 
 static void
@@ -2383,6 +2380,11 @@ urtwn_load_firmware(struct urtwn_softc *
 		urtwn_write_1(sc, R92C_MCUFWDL, 0);
 	}
 
+	if (!(sc->chip & URTWN_CHIP_88E)) {
+		urtwn_write_2(sc, R92C_SYS_FUNC_EN,
+		    urtwn_read_2(sc, R92C_SYS_FUNC_EN) |
+		    R92C_SYS_FUNC_EN_CPUEN);
+	}
 	urtwn_write_1(sc, R92C_MCUFWDL,
 	    urtwn_read_1(sc, R92C_MCUFWDL) | R92C_MCUFWDL_EN);
 	urtwn_write_1(sc, R92C_MCUFWDL + 2,