Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/dwc2/dist Re-apply hunk that got lost in th...
details: https://anonhg.NetBSD.org/src/rev/fad9e70337d4
branches: trunk
changeset: 810489:fad9e70337d4
user: skrll <skrll%NetBSD.org@localhost>
date: Tue Sep 01 06:24:21 2015 +0000
description:
Re-apply hunk that got lost in the recent import. CVS is fun!
diffstat:
sys/external/bsd/dwc2/dist/dwc2_core.c | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diffs (41 lines):
diff -r 6f1b55e07bf7 -r fad9e70337d4 sys/external/bsd/dwc2/dist/dwc2_core.c
--- a/sys/external/bsd/dwc2/dist/dwc2_core.c Tue Sep 01 06:16:58 2015 +0000
+++ b/sys/external/bsd/dwc2/dist/dwc2_core.c Tue Sep 01 06:24:21 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_core.c,v 1.8 2015/08/30 12:59:59 skrll Exp $ */
+/* $NetBSD: dwc2_core.c,v 1.9 2015/09/01 06:24:21 skrll Exp $ */
/*
* core.c - DesignWare HS OTG Controller common routines
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_core.c,v 1.8 2015/08/30 12:59:59 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_core.c,v 1.9 2015/09/01 06:24:21 skrll Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -1842,10 +1842,18 @@
} else {
dma_addr = chan->xfer_dma;
}
- DWC2_WRITE_4(hsotg, HCDMA(chan->hc_num), (u32)dma_addr);
- if (dbg_hc(chan))
- dev_vdbg(hsotg->dev, "Wrote %08lx to HCDMA(%d)\n",
- (unsigned long)dma_addr, chan->hc_num);
+ if (hsotg->hsotg_sc->sc_set_dma_addr == NULL) {
+ DWC2_WRITE_4(hsotg, HCDMA(chan->hc_num),
+ (u32)dma_addr);
+ if (dbg_hc(chan))
+ dev_vdbg(hsotg->dev,
+ "Wrote %08lx to HCDMA(%d)\n",
+ (unsigned long)dma_addr,
+ chan->hc_num);
+ } else {
+ (void)(*hsotg->hsotg_sc->sc_set_dma_addr)(
+ hsotg->dev, dma_addr, chan->hc_num);
+ }
}
/* Start the split */
Home |
Main Index |
Thread Index |
Old Index