[src-draft/trunk]: src/sys/dev/usb Revert changesets 1029900 1029899 1029898 ...

[Nathanial Sloss <nat%netbsd.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/201d85367782
branches:  trunk
changeset: 367671:201d85367782
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Sat May 14 11:31:05 2022 +1000

description:
Revert changesets 1029900 1029899 1029898 and 1029897.

Reverting these changes as they were attempts at papering over
issues with the new stack.

diffstat:

 sys/dev/usb/if_urtwn.c |  10 ++--------
 sys/dev/usb/usbwifi.c  |   2 --
 2 files changed, 2 insertions(+), 10 deletions(-)

diffs (41 lines):

diff -r 11a5a598e40d -r 201d85367782 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Fri Apr 08 23:35:18 2022 +1000
+++ b/sys/dev/usb/if_urtwn.c    Sat May 14 11:31:05 2022 +1000
@@ -4386,10 +4386,6 @@
 
        usbwifi_isowned_ic(&sc->sc_uw);
 
-       if (ISSET(sc->sc_uw.uw_flags, URTWN_FLAG_FWREADY)) {
-               return EEXIST;
-       }
-
        mutex_enter(&sc->sc_task_mtx);
        /* Init host async commands ring. */
        sc->cmdq.cur = sc->cmdq.next = sc->cmdq.queued = 0;
@@ -4733,12 +4729,10 @@
 urtwn_delay_ms(struct urtwn_softc *sc, int ms)
 {
 
-       if (sc->sc_uw.uw_udev == NULL || 
-           !ISSET(sc->sc_uw.uw_flags, URTWN_FLAG_FWREADY))
+       if (sc->sc_uw.uw_udev == NULL)
                DELAY(ms * 1000);
        else
-               usbd_delay_ms_locked(sc->sc_uw.uw_udev, ms,
-                   usbwifi_mutex_ic(&sc->sc_uw));
+               usbd_delay_ms(sc->sc_uw.uw_udev, ms);
 }
 
 MODULE(MODULE_CLASS_DRIVER, if_urtwn, NULL);
diff -r 11a5a598e40d -r 201d85367782 sys/dev/usb/usbwifi.c
--- a/sys/dev/usb/usbwifi.c     Fri Apr 08 23:35:18 2022 +1000
+++ b/sys/dev/usb/usbwifi.c     Sat May 14 11:31:05 2022 +1000
@@ -609,8 +609,6 @@
                                c->uwc_buf = usbd_get_buffer(c->uwc_xfer);
                        }
                }
-               cd->uwcd_tx_chains[i].uwscd_tx_prod =
-                   cd->uwcd_tx_chains[i].uwscd_tx_cnt = 0;
        }
 
        KASSERTMSG((char*)chain - (char*)cd->uwcd_tx_chains ==