Module Name: src
Committed By: skrll
Date: Sat Oct 5 06:51:43 UTC 2013
Modified Files:
src/sys/external/bsd/dwc2/dist: dwc2_core.c dwc2_core.h dwc2_coreintr.c
dwc2_hcd.c dwc2_hcd.h dwc2_hcdddma.c dwc2_hcdintr.c dwc2_hcdqueue.c
Log Message:
Merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/dwc2/dist/dwc2_core.c \
src/sys/external/bsd/dwc2/dist/dwc2_core.h \
src/sys/external/bsd/dwc2/dist/dwc2_hcdddma.c \
src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/dwc2/dist/dwc2_coreintr.c \
src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/dwc2/dist/dwc2_hcd.c \
src/sys/external/bsd/dwc2/dist/dwc2_hcd.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/external/bsd/dwc2/dist/dwc2_core.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_core.c:1.3 src/sys/external/bsd/dwc2/dist/dwc2_core.c:1.4
--- src/sys/external/bsd/dwc2/dist/dwc2_core.c:1.3 Wed Sep 25 06:19:22 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_core.c Sat Oct 5 06:51:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_core.c,v 1.3 2013/09/25 06:19:22 skrll Exp $ */
+/* $NetBSD: dwc2_core.c,v 1.4 2013/10/05 06:51:43 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.3 2013/09/25 06:19:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_core.c,v 1.4 2013/10/05 06:51:43 skrll Exp $");
#include <sys/types.h>
#include <sys/bus.h>
@@ -2205,7 +2205,7 @@ int dwc2_set_param_phy_type(struct dwc2_
{
#ifndef NO_FS_PHY_HW_CHECKS
int valid = 0;
- u32 hs_phy_type, fs_phy_type;
+ u32 hs_phy_type, fs_phy_type;
#endif
int retval = 0;
@@ -2553,7 +2553,7 @@ int dwc2_set_param_ahbcfg(struct dwc2_hs
hsotg->core_params->ahbcfg = val;
else
hsotg->core_params->ahbcfg = GAHBCFG_HBSTLEN_INCR4 <<
- GAHBCFG_HBSTLEN_SHIFT;
+ GAHBCFG_HBSTLEN_SHIFT;
return 0;
}
Index: src/sys/external/bsd/dwc2/dist/dwc2_core.h
diff -u src/sys/external/bsd/dwc2/dist/dwc2_core.h:1.3 src/sys/external/bsd/dwc2/dist/dwc2_core.h:1.4
--- src/sys/external/bsd/dwc2/dist/dwc2_core.h:1.3 Wed Sep 25 06:19:22 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_core.h Sat Oct 5 06:51:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_core.h,v 1.3 2013/09/25 06:19:22 skrll Exp $ */
+/* $NetBSD: dwc2_core.h,v 1.4 2013/10/05 06:51:43 skrll Exp $ */
/*
* core.h - DesignWare HS OTG Controller common declarations
@@ -293,7 +293,7 @@ struct dwc2_hw_params {
unsigned dev_token_q_depth:5;
unsigned max_transfer_size:26;
unsigned max_packet_count:11;
- unsigned host_channels:4;
+ unsigned host_channels:5;
unsigned hs_phy_type:2;
unsigned fs_phy_type:2;
unsigned i2c_enable:1;
Index: src/sys/external/bsd/dwc2/dist/dwc2_hcdddma.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcdddma.c:1.3 src/sys/external/bsd/dwc2/dist/dwc2_hcdddma.c:1.4
--- src/sys/external/bsd/dwc2/dist/dwc2_hcdddma.c:1.3 Wed Sep 25 06:19:22 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_hcdddma.c Sat Oct 5 06:51:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_hcdddma.c,v 1.3 2013/09/25 06:19:22 skrll Exp $ */
+/* $NetBSD: dwc2_hcdddma.c,v 1.4 2013/10/05 06:51:43 skrll Exp $ */
/*
* hcd_ddma.c - DesignWare HS OTG Controller descriptor DMA routines
@@ -40,7 +40,7 @@
* This file contains the Descriptor DMA implementation for Host mode
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_hcdddma.c,v 1.3 2013/09/25 06:19:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_hcdddma.c,v 1.4 2013/10/05 06:51:43 skrll Exp $");
#include <sys/param.h>
#include <sys/types.h>
Index: src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c:1.3 src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c:1.4
--- src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c:1.3 Wed Sep 25 06:19:22 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c Sat Oct 5 06:51:43 2013
@@ -1,3 +1,5 @@
+/* $NetBSD: dwc2_hcdqueue.c,v 1.4 2013/10/05 06:51:43 skrll Exp $ */
+
/*
* hcd_queue.c - DesignWare HS OTG Controller host queuing routines
*
@@ -40,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_hcdqueue.c,v 1.3 2013/09/25 06:19:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_hcdqueue.c,v 1.4 2013/10/05 06:51:43 skrll Exp $");
#include <sys/types.h>
#include <sys/kmem.h>
Index: src/sys/external/bsd/dwc2/dist/dwc2_coreintr.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_coreintr.c:1.4 src/sys/external/bsd/dwc2/dist/dwc2_coreintr.c:1.5
--- src/sys/external/bsd/dwc2/dist/dwc2_coreintr.c:1.4 Fri Sep 27 21:39:34 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_coreintr.c Sat Oct 5 06:51:43 2013
@@ -1,3 +1,5 @@
+/* $NetBSD: dwc2_coreintr.c,v 1.5 2013/10/05 06:51:43 skrll Exp $ */
+
/*
* core_intr.c - DesignWare HS OTG Controller common interrupt handling
*
@@ -39,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_coreintr.c,v 1.4 2013/09/27 21:39:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_coreintr.c,v 1.5 2013/10/05 06:51:43 skrll Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
Index: src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c:1.4 src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c:1.5
--- src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c:1.4 Fri Sep 27 21:39:34 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c Sat Oct 5 06:51:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_hcdintr.c,v 1.4 2013/09/27 21:39:34 skrll Exp $ */
+/* $NetBSD: dwc2_hcdintr.c,v 1.5 2013/10/05 06:51:43 skrll Exp $ */
/*
* hcd_intr.c - DesignWare HS OTG Controller host-mode interrupt handling
@@ -40,7 +40,7 @@
* This file contains the interrupt handlers for Host mode
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_hcdintr.c,v 1.4 2013/09/27 21:39:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_hcdintr.c,v 1.5 2013/10/05 06:51:43 skrll Exp $");
#include <sys/types.h>
#include <sys/pool.h>
Index: src/sys/external/bsd/dwc2/dist/dwc2_hcd.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.5 src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.6
--- src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.5 Wed Oct 2 11:36:27 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_hcd.c Sat Oct 5 06:51:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_hcd.c,v 1.5 2013/10/02 11:36:27 skrll Exp $ */
+/* $NetBSD: dwc2_hcd.c,v 1.6 2013/10/05 06:51:43 skrll Exp $ */
/*
* hcd.c - DesignWare HS OTG Controller host-mode routines
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2_hcd.c,v 1.5 2013/10/02 11:36:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_hcd.c,v 1.6 2013/10/05 06:51:43 skrll Exp $");
#include <sys/types.h>
#include <sys/kmem.h>
Index: src/sys/external/bsd/dwc2/dist/dwc2_hcd.h
diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcd.h:1.5 src/sys/external/bsd/dwc2/dist/dwc2_hcd.h:1.6
--- src/sys/external/bsd/dwc2/dist/dwc2_hcd.h:1.5 Fri Sep 27 22:03:01 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_hcd.h Sat Oct 5 06:51:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_hcd.h,v 1.5 2013/09/27 22:03:01 skrll Exp $ */
+/* $NetBSD: dwc2_hcd.h,v 1.6 2013/10/05 06:51:43 skrll Exp $ */
/*
* hcd.h - DesignWare HS OTG Controller host-mode declarations
