[src-draft/trunk]: src/sys/dev/usb Backed out changeset 43c05566916a (may be ...

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

details:   https://anonhg.NetBSD.org/src-all/rev/fe800aab8d1d
branches:  trunk
changeset: 987545:fe800aab8d1d
user:      Martin Husemann <martin%NetBSD.org@localhost>
date:      Mon Sep 20 17:02:23 2021 +0200

description:
Backed out changeset 43c05566916a (may be redone differently later)

diffstat:

 sys/dev/usb/if_urtwn.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r 926396a231f0 -r fe800aab8d1d sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Mon Sep 20 17:01:52 2021 +0200
+++ b/sys/dev/usb/if_urtwn.c    Mon Sep 20 17:02:23 2021 +0200
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_urtwn.c,v 1.97 2021/09/17 12:55:10 nat Exp $        */
+/*     $NetBSD: if_urtwn.c,v 1.96 2021/03/02 22:21:38 nat 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.97 2021/09/17 12:55:10 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.96 2021/03/02 22:21:38 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1112,7 +1112,7 @@
        for (ntries = 0; ntries < 100; ntries++) {
                if (!(urtwn_read_1(sc, R92C_HMETFR) & (1 << fwcur)))
                        break;
-               urtwn_delay_ms(sc, 2);
+               DELAY(2000);
        }
        if (ntries == 100) {
                aprint_error_dev(sc->sc_dev,
@@ -1195,16 +1195,16 @@
 
        urtwn_bb_write(sc, R92C_HSSI_PARAM2(0),
            reg[0] & ~R92C_HSSI_PARAM2_READ_EDGE);
-       urtwn_delay_ms(sc, 1);
+       DELAY(1000);
 
        urtwn_bb_write(sc, R92C_HSSI_PARAM2(chain),
            RW(reg[chain], R92C_HSSI_PARAM2_READ_ADDR, addr) |
            R92C_HSSI_PARAM2_READ_EDGE);
-       urtwn_delay_ms(sc, 1);
+       DELAY(1000);
 
        urtwn_bb_write(sc, R92C_HSSI_PARAM2(0),
            reg[0] | R92C_HSSI_PARAM2_READ_EDGE);
-       urtwn_delay_ms(sc, 1);
+       DELAY(1000);
 
        if (urtwn_bb_read(sc, R92C_HSSI_PARAM1(chain)) & R92C_HSSI_PARAM1_PI) {
                val = urtwn_bb_read(sc, R92C_HSPI_READBACK(chain));