[src/phil-wifi]: src/sys/dev Update with 92EU changes from -current.

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

details:   https://anonhg.NetBSD.org/src/rev/d94a1d705263
branches:  phil-wifi
changeset: 930897:d94a1d705263
user:      nat <nat%NetBSD.org@localhost>
date:      Thu Apr 16 17:24:49 2020 +0000

description:
Update with 92EU changes from -current.

diffstat:

 sys/dev/ic/rtwnreg.h   |  4 +++-
 sys/dev/usb/if_urtwn.c |  9 ++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (48 lines):

diff -r 2aa879e07566 -r d94a1d705263 sys/dev/ic/rtwnreg.h
--- a/sys/dev/ic/rtwnreg.h      Thu Apr 16 15:33:07 2020 +0000
+++ b/sys/dev/ic/rtwnreg.h      Thu Apr 16 17:24:49 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rtwnreg.h,v 1.1.8.3 2020/04/13 08:04:22 martin Exp $   */
+/*     $NetBSD: rtwnreg.h,v 1.1.8.4 2020/04/16 17:24:49 nat Exp $      */
 /*     $OpenBSD: r92creg.h,v 1.16 2017/09/22 13:41:56 kevlo Exp $      */
 
 /*-
@@ -1341,6 +1341,8 @@
 
 #define R92C_RXDW2_PKTCNT_M    0x00ff0000
 #define R92C_RXDW2_PKTCNT_S    16
+#define R92E_RXDW2_PKTCNT_M    0x3fc00000
+#define R92E_RXDW2_PKTCNT_S    22
 
 #define R92C_RXDW3_RATE_M      0x0000003f
 #define R92C_RXDW3_RATE_S      0
diff -r 2aa879e07566 -r d94a1d705263 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Thu Apr 16 15:33:07 2020 +0000
+++ b/sys/dev/usb/if_urtwn.c    Thu Apr 16 17:24:49 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_urtwn.c,v 1.59.2.10 2020/04/16 15:33:07 nat Exp $   */
+/*     $NetBSD: if_urtwn.c,v 1.59.2.11 2020/04/16 17:24:49 nat Exp $   */
 /*     $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $       */
 
 /*-
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.59.2.10 2020/04/16 15:33:07 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.59.2.11 2020/04/16 17:24:49 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -2923,7 +2923,10 @@
 
        /* Get the number of encapsulated frames. */
        stat = (struct r92c_rx_desc_usb *)buf;
-       npkts = MS(le32toh(stat->rxdw2), R92C_RXDW2_PKTCNT);
+       if (ISSET(sc->chip, URTWN_CHIP_92EU))
+               npkts = MS(le32toh(stat->rxdw2), R92E_RXDW2_PKTCNT);
+       else
+               npkts = MS(le32toh(stat->rxdw2), R92C_RXDW2_PKTCNT);
        DPRINTFN(DBG_RX, ("%s: %s: Rx %d frames in one chunk\n",
            device_xname(sc->sc_dev), __func__, npkts));