summaryrefslogtreecommitdiff
path: root/sys/dev/usb
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2019-03-11 17:50:10 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2019-03-11 17:50:10 +0000
commitee646aa4742c8fcd53ed7375ffa87ea175dc37ec (patch)
tree9f6cb5317659fbf1388073b808abca2364128dd2 /sys/dev/usb
parent8e520e7296a7e0eb0b77435e9b5f467bf11cf292 (diff)
Add missing bus powered bit, from aalm@
Diffstat (limited to 'sys/dev/usb')
-rw-r--r--sys/dev/usb/dwc2/dwc2.c4
-rw-r--r--sys/dev/usb/ehci.c4
-rw-r--r--sys/dev/usb/ohci.c4
-rw-r--r--sys/dev/usb/uhci.c4
-rw-r--r--sys/dev/usb/xhci.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/sys/dev/usb/dwc2/dwc2.c b/sys/dev/usb/dwc2/dwc2.c
index 1c0ccba0e25..2fcb7d8e1c4 100644
--- a/sys/dev/usb/dwc2/dwc2.c
+++ b/sys/dev/usb/dwc2/dwc2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwc2.c,v 1.46 2017/06/29 17:36:16 deraadt Exp $ */
+/* $OpenBSD: dwc2.c,v 1.47 2019/03/11 17:50:09 mpi Exp $ */
/* $NetBSD: dwc2.c,v 1.32 2014/09/02 23:26:20 macallan Exp $ */
/*-
@@ -642,7 +642,7 @@ STATIC const struct dwc2_config_desc dwc2_confd = {
.bNumInterface = 1,
.bConfigurationValue = 1,
.iConfiguration = 0,
- .bmAttributes = UC_SELF_POWERED,
+ .bmAttributes = UC_BUS_POWERED | UC_SELF_POWERED,
.bMaxPower = 0,
},
.ifcd = {
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index b75c47db7cc..1ef9da9bb3e 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ehci.c,v 1.202 2019/01/19 18:50:24 uaa Exp $ */
+/* $OpenBSD: ehci.c,v 1.203 2019/03/11 17:50:08 mpi Exp $ */
/* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */
/*
@@ -1733,7 +1733,7 @@ usb_config_descriptor_t ehci_confd = {
1,
1,
0,
- UC_SELF_POWERED,
+ UC_BUS_POWERED | UC_SELF_POWERED,
0 /* max power */
};
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 9313dc382df..eca48d41440 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci.c,v 1.155 2019/01/07 03:41:06 dlg Exp $ */
+/* $OpenBSD: ohci.c,v 1.156 2019/03/11 17:50:08 mpi Exp $ */
/* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
@@ -2187,7 +2187,7 @@ usb_config_descriptor_t ohci_confd = {
1,
1,
0,
- UC_SELF_POWERED,
+ UC_BUS_POWERED | UC_SELF_POWERED,
0 /* max power */
};
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 5c499cbe69f..89a8c301ef1 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci.c,v 1.145 2019/01/31 18:01:14 millert Exp $ */
+/* $OpenBSD: uhci.c,v 1.146 2019/03/11 17:50:09 mpi Exp $ */
/* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
@@ -2708,7 +2708,7 @@ usb_config_descriptor_t uhci_confd = {
1,
1,
0,
- UC_SELF_POWERED,
+ UC_BUS_POWERED | UC_SELF_POWERED,
0 /* max power */
};
diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c
index 6b01165672b..9f7e0064d69 100644
--- a/sys/dev/usb/xhci.c
+++ b/sys/dev/usb/xhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xhci.c,v 1.93 2019/03/01 19:15:59 patrick Exp $ */
+/* $OpenBSD: xhci.c,v 1.94 2019/03/11 17:50:09 mpi Exp $ */
/*
* Copyright (c) 2014-2015 Martin Pieuchot
@@ -1986,7 +1986,7 @@ const usb_config_descriptor_t xhci_confd = {
1,
1,
0,
- UC_SELF_POWERED,
+ UC_BUS_POWERED | UC_SELF_POWERED,
0 /* max power */
};