Module Name: src
Committed By: skrll
Date: Sat Jan 19 14:33:51 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c dwc_otgreg.h
Log Message:
Rename the GRXSTSP registers and don't print the "pop" version.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/dwc_otg.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/dwc_otgreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.27 src/sys/dev/usb/dwc_otg.c:1.28
--- src/sys/dev/usb/dwc_otg.c:1.27 Sat Jan 19 14:26:51 2013
+++ src/sys/dev/usb/dwc_otg.c Sat Jan 19 14:33:51 2013
@@ -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 @@ dwc_otg_dump_global_regs(struct dwc_otg_
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 @@ repeat:
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) {
Index: src/sys/dev/usb/dwc_otgreg.h
diff -u src/sys/dev/usb/dwc_otgreg.h:1.2 src/sys/dev/usb/dwc_otgreg.h:1.3
--- src/sys/dev/usb/dwc_otgreg.h:1.2 Fri Jan 11 12:21:54 2013
+++ src/sys/dev/usb/dwc_otgreg.h Sat Jan 19 14:33:51 2013
@@ -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
