[src/netbsd-8]: src Pull up following revision(s) (requested by msaitoh in ti...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/15084b21b6aa
branches:  netbsd-8
changeset: 852186:15084b21b6aa
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Dec 18 18:32:00 2018 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #1140):
        share/man/man4/urtwn.4: revision 1.16
        sys/dev/usb/if_urtwn.c: revision 1.66

Add IO-DATA WN-G150UMW.

 -

Make IODATA WN-G150UMW work:

- Increase delay to prevent "could not send firmware command". The value
   is taken from FreeBSD.
-Increase delay to prevent "timeout waiting for firmware readiness". The
   value is taken from Linux.

diffstat:

 share/man/man4/urtwn.4 |   5 +++--
 sys/dev/usb/if_urtwn.c |  10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (68 lines):

diff -r 70948164b6d6 -r 15084b21b6aa share/man/man4/urtwn.4
--- a/share/man/man4/urtwn.4    Tue Dec 18 18:26:23 2018 +0000
+++ b/share/man/man4/urtwn.4    Tue Dec 18 18:32:00 2018 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: urtwn.4,v 1.15 2016/10/12 03:23:29 nat Exp $
+.\" $NetBSD: urtwn.4,v 1.15.6.1 2018/12/18 18:32:00 martin Exp $
 .\" $OpenBSD: urtwn.4,v 1.15 2011/11/26 06:39:33 ckuethe Exp $
 .\"
 .\" Copyright (c) 2010 Damien Bergamini <damien.bergamini%free.fr@localhost>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd July 25, 2014
+.Dd December 17, 2018
 .Dt URTWN 4
 .Os
 .Sh NAME
@@ -117,6 +117,7 @@
 .It ELECOM WDC-150SU2M
 .It Full River FR-W100NUL
 .It Hercules Wireless N USB Pico HWNUp-150
+.It IO-DATA WN-G150UMW
 .It Netgear WNA1000A
 .It Planex GW-USEco300
 .It Planex GW-USNano2
diff -r 70948164b6d6 -r 15084b21b6aa sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Tue Dec 18 18:26:23 2018 +0000
+++ b/sys/dev/usb/if_urtwn.c    Tue Dec 18 18:32:00 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_urtwn.c,v 1.53.2.4 2018/08/08 10:28:35 martin Exp $ */
+/*     $NetBSD: if_urtwn.c,v 1.53.2.5 2018/12/18 18:32:00 martin Exp $ */
 /*     $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $       */
 
 /*-
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53.2.4 2018/08/08 10:28:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53.2.5 2018/12/18 18:32:00 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1030,7 +1030,7 @@
        for (ntries = 0; ntries < 100; ntries++) {
                if (!(urtwn_read_1(sc, R92C_HMETFR) & (1 << fwcur)))
                        break;
-               DELAY(10);
+               DELAY(2000);
        }
        if (ntries == 100) {
                aprint_error_dev(sc->sc_dev,
@@ -3474,12 +3474,12 @@
        if (ISSET(sc->chip, URTWN_CHIP_88E) ||
            ISSET(sc->chip, URTWN_CHIP_92EU))
                urtwn_r88e_fw_reset(sc);
-       for (ntries = 0; ntries < 1000; ntries++) {
+       for (ntries = 0; ntries < 6000; ntries++) {
                if (urtwn_read_4(sc, R92C_MCUFWDL) & R92C_MCUFWDL_WINTINI_RDY)
                        break;
                DELAY(5);
        }
-       if (ntries == 1000) {
+       if (ntries == 6000) {
                aprint_error_dev(sc->sc_dev,
                    "timeout waiting for firmware readiness\n");
                error = ETIMEDOUT;