[src/trunk]: src/sys/dev/usb Rename the GRXSTSP registers and don't print the...

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

details:   https://anonhg.NetBSD.org/src/rev/402cbcf549b3
branches:  trunk
changeset: 784137:402cbcf549b3
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Jan 19 14:33:51 2013 +0000

description:
Rename the GRXSTSP registers and don't print the "pop" version.

diffstat:

 sys/dev/usb/dwc_otg.c    |  9 ++++-----
 sys/dev/usb/dwc_otgreg.h |  4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r c2e597570e55 -r 402cbcf549b3 sys/dev/usb/dwc_otg.c
--- a/sys/dev/usb/dwc_otg.c     Sat Jan 19 14:26:51 2013 +0000
+++ b/sys/dev/usb/dwc_otg.c     Sat Jan 19 14:33:51 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dwc_otg.c,v 1.27 2013/01/19 14:26:51 skrll Exp $       */
+/*     $NetBSD: dwc_otg.c,v 1.28 2013/01/19 14:33:51 skrll Exp $       */
 
 /*-
  * Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.27 2013/01/19 14:26:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.28 2013/01/19 14:33:51 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1766,8 +1766,7 @@
        printf("GRSTCTL        0x%08x\n", DWC_OTG_READ_4(sc, DOTG_GRSTCTL));
        printf("GINTSTS        0x%08x\n", DWC_OTG_READ_4(sc, DOTG_GINTSTS));
        printf("GINTMSK        0x%08x\n", DWC_OTG_READ_4(sc, DOTG_GINTMSK));
-       printf("GRXSTSR        0x%08x\n", DWC_OTG_READ_4(sc, DOTG_GRXSTSRD));
-       printf("GRXSTSP        0x%08x\n", DWC_OTG_READ_4(sc, DOTG_GRXSTSPD));
+       printf("GRXSTSR        0x%08x\n", DWC_OTG_READ_4(sc, DOTG_GRXSTSR));
        printf("GRXFSIZ        0x%08x\n", DWC_OTG_READ_4(sc, DOTG_GRXFSIZ));
        printf("GNPTXFSIZ      0x%08x\n", DWC_OTG_READ_4(sc, DOTG_GNPTXFSIZ));
        printf("GNPTXSTS       0x%08x\n", DWC_OTG_READ_4(sc, DOTG_GNPTXSTS));
@@ -3266,7 +3265,7 @@
                if (temp & GINTSTS_RXFLVL) {
                        /* pop current status */
                        sc->sc_last_rx_status =
-                           DWC_OTG_READ_4(sc, DOTG_GRXSTSPD);
+                           DWC_OTG_READ_4(sc, DOTG_GRXSTSP);
                }
 
                if (sc->sc_last_rx_status != 0) {
diff -r c2e597570e55 -r 402cbcf549b3 sys/dev/usb/dwc_otgreg.h
--- a/sys/dev/usb/dwc_otgreg.h  Sat Jan 19 14:26:51 2013 +0000
+++ b/sys/dev/usb/dwc_otgreg.h  Sat Jan 19 14:33:51 2013 +0000
@@ -37,8 +37,8 @@
 #define        DOTG_GRSTCTL            0x0010
 #define        DOTG_GINTSTS            0x0014
 #define        DOTG_GINTMSK            0x0018
-#define        DOTG_GRXSTSRD           0x001C
-#define        DOTG_GRXSTSPD           0x0020
+#define        DOTG_GRXSTSR            0x001C
+#define        DOTG_GRXSTSP            0x0020
 #define        DOTG_GRXFSIZ            0x0024
 #define        DOTG_GNPTXFSIZ          0x0028
 #define        DOTG_GNPTXSTS           0x002C