Module Name: src
Committed By: skrll
Date: Fri Sep 27 21:56:05 UTC 2013
Modified Files:
src/sys/external/bsd/dwc2: dwc2.c
src/sys/external/bsd/dwc2/dist: dwc2_hcd.c dwc2_hcd.h
Log Message:
Tidyup dwc2_host_is_b_hnp_enabled
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/dwc2/dwc2.c
cvs rdiff -u -r1.3 -r1.4 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/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.5 src/sys/external/bsd/dwc2/dwc2.c:1.6
--- src/sys/external/bsd/dwc2/dwc2.c:1.5 Fri Sep 27 21:50:45 2013
+++ src/sys/external/bsd/dwc2/dwc2.c Fri Sep 27 21:56:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.5 2013/09/27 21:50:45 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.6 2013/09/27 21:56:05 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.5 2013/09/27 21:50:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.6 2013/09/27 21:56:05 skrll Exp $");
#include "opt_usb.h"
@@ -1731,3 +1731,9 @@ _dwc2_hcd_start(struct dwc2_hsotg *hsotg
mutex_spin_exit(&hsotg->lock);
return 0;
}
+
+int dwc2_host_is_b_hnp_enabled(struct dwc2_hsotg *hsotg)
+{
+
+ return false;
+}
Index: src/sys/external/bsd/dwc2/dist/dwc2_hcd.c
diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.3 src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.4
--- src/sys/external/bsd/dwc2/dist/dwc2_hcd.c:1.3 Wed Sep 25 06:19:22 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_hcd.c Fri Sep 27 21:56:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_hcd.c,v 1.3 2013/09/25 06:19:22 skrll Exp $ */
+/* $NetBSD: dwc2_hcd.c,v 1.4 2013/09/27 21:56:05 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.3 2013/09/25 06:19:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_hcd.c,v 1.4 2013/09/27 21:56:05 skrll Exp $");
#include <sys/types.h>
#include <sys/kmem.h>
@@ -1351,18 +1351,6 @@ void dwc2_wakeup_detected(void * data)
hsotg->lx_state = DWC2_L0;
}
-static int dwc2_host_is_b_hnp_enabled(struct dwc2_hsotg *hsotg)
-{
-#if 1
- /* XXXNH */
- return false;
-#else
- struct usb_hcd *hcd = dwc2_hsotg_to_hcd(hsotg);
-
- return hcd->self.b_hnp_enable;
-#endif
-}
-
/* Must NOT be called with interrupt disabled or spinlock held */
static void dwc2_port_suspend(struct dwc2_hsotg *hsotg, u16 windex)
{
Index: src/sys/external/bsd/dwc2/dist/dwc2_hcd.h
diff -u src/sys/external/bsd/dwc2/dist/dwc2_hcd.h:1.3 src/sys/external/bsd/dwc2/dist/dwc2_hcd.h:1.4
--- src/sys/external/bsd/dwc2/dist/dwc2_hcd.h:1.3 Wed Sep 25 06:19:22 2013
+++ src/sys/external/bsd/dwc2/dist/dwc2_hcd.h Fri Sep 27 21:56:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_hcd.h,v 1.3 2013/09/25 06:19:22 skrll Exp $ */
+/* $NetBSD: dwc2_hcd.h,v 1.4 2013/09/27 21:56:05 skrll Exp $ */
/*
* hcd.h - DesignWare HS OTG Controller host-mode declarations
@@ -775,4 +775,6 @@ void dwc2_hcd_urb_free(struct dwc2_hsotg
int _dwc2_hcd_start(struct dwc2_hsotg *);
+int dwc2_host_is_b_hnp_enabled(struct dwc2_hsotg *);
+
#endif /* __DWC2_HCD_H__ */
