[src/trunk]: src/sys/external/bsd/dwc2/dist Merge conflicts.

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

details:   https://anonhg.NetBSD.org/src/rev/5884cada1d56
branches:  trunk
changeset: 790382:5884cada1d56
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Oct 05 06:51:43 2013 +0000

description:
Merge conflicts.

diffstat:

 sys/external/bsd/dwc2/dist/dwc2_core.c     |  8 ++++----
 sys/external/bsd/dwc2/dist/dwc2_core.h     |  4 ++--
 sys/external/bsd/dwc2/dist/dwc2_coreintr.c |  4 +++-
 sys/external/bsd/dwc2/dist/dwc2_hcd.c      |  4 ++--
 sys/external/bsd/dwc2/dist/dwc2_hcd.h      |  2 +-
 sys/external/bsd/dwc2/dist/dwc2_hcdddma.c  |  4 ++--
 sys/external/bsd/dwc2/dist/dwc2_hcdintr.c  |  4 ++--
 sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c |  4 +++-
 8 files changed, 19 insertions(+), 15 deletions(-)

diffs (153 lines):

diff -r 0ef7d184ba53 -r 5884cada1d56 sys/external/bsd/dwc2/dist/dwc2_core.c
--- a/sys/external/bsd/dwc2/dist/dwc2_core.c    Sat Oct 05 06:15:51 2013 +0000
+++ b/sys/external/bsd/dwc2/dist/dwc2_core.c    Sat Oct 05 06:51:43 2013 +0000
@@ -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 @@
 {
 #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 @@
                hsotg->core_params->ahbcfg = val;
        else
                hsotg->core_params->ahbcfg = GAHBCFG_HBSTLEN_INCR4 <<
-                                             GAHBCFG_HBSTLEN_SHIFT;
+                                               GAHBCFG_HBSTLEN_SHIFT;
        return 0;
 }
 
diff -r 0ef7d184ba53 -r 5884cada1d56 sys/external/bsd/dwc2/dist/dwc2_core.h
--- a/sys/external/bsd/dwc2/dist/dwc2_core.h    Sat Oct 05 06:15:51 2013 +0000
+++ b/sys/external/bsd/dwc2/dist/dwc2_core.h    Sat Oct 05 06:51:43 2013 +0000
@@ -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 @@
        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;
diff -r 0ef7d184ba53 -r 5884cada1d56 sys/external/bsd/dwc2/dist/dwc2_coreintr.c
--- a/sys/external/bsd/dwc2/dist/dwc2_coreintr.c        Sat Oct 05 06:15:51 2013 +0000
+++ b/sys/external/bsd/dwc2/dist/dwc2_coreintr.c        Sat Oct 05 06:51:43 2013 +0000
@@ -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>
diff -r 0ef7d184ba53 -r 5884cada1d56 sys/external/bsd/dwc2/dist/dwc2_hcd.c
--- a/sys/external/bsd/dwc2/dist/dwc2_hcd.c     Sat Oct 05 06:15:51 2013 +0000
+++ b/sys/external/bsd/dwc2/dist/dwc2_hcd.c     Sat Oct 05 06:51:43 2013 +0000
@@ -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>
diff -r 0ef7d184ba53 -r 5884cada1d56 sys/external/bsd/dwc2/dist/dwc2_hcd.h
--- a/sys/external/bsd/dwc2/dist/dwc2_hcd.h     Sat Oct 05 06:15:51 2013 +0000
+++ b/sys/external/bsd/dwc2/dist/dwc2_hcd.h     Sat Oct 05 06:51:43 2013 +0000
@@ -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
diff -r 0ef7d184ba53 -r 5884cada1d56 sys/external/bsd/dwc2/dist/dwc2_hcdddma.c
--- a/sys/external/bsd/dwc2/dist/dwc2_hcdddma.c Sat Oct 05 06:15:51 2013 +0000
+++ b/sys/external/bsd/dwc2/dist/dwc2_hcdddma.c Sat Oct 05 06:51:43 2013 +0000
@@ -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>
diff -r 0ef7d184ba53 -r 5884cada1d56 sys/external/bsd/dwc2/dist/dwc2_hcdintr.c
--- a/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c Sat Oct 05 06:15:51 2013 +0000
+++ b/sys/external/bsd/dwc2/dist/dwc2_hcdintr.c Sat Oct 05 06:51:43 2013 +0000
@@ -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>
diff -r 0ef7d184ba53 -r 5884cada1d56 sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c
--- a/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c        Sat Oct 05 06:15:51 2013 +0000
+++ b/sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c        Sat Oct 05 06:51:43 2013 +0000
@@ -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>