summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/dev/usb/uhub.c4
-rw-r--r--sys/dev/usb/usbdivar.h9
2 files changed, 8 insertions, 5 deletions
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c
index fa4d5d710d1..eaf940af634 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/dev/usb/uhub.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhub.c,v 1.76 2014/11/07 13:56:29 mpi Exp $ */
+/* $OpenBSD: uhub.c,v 1.77 2014/11/10 14:26:38 mpi Exp $ */
/* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
@@ -120,6 +120,7 @@ uhub_attach(struct device *parent, struct device *self, void *aux)
struct usbd_interface *iface;
usb_endpoint_descriptor_t *ed;
struct usbd_tt *tts = NULL;
+ uint8_t ttthink = 0;
usbd_status err;
#ifdef UHUB_DEBUG
int nremov;
@@ -219,6 +220,7 @@ uhub_attach(struct device *parent, struct device *self, void *aux)
hub->explore = uhub_explore;
hub->nports = nports;
hub->powerdelay = powerdelay;
+ hub->ttthink = ttthink;
if (!dev->self_powered && dev->powersrc->parent != NULL &&
!dev->powersrc->parent->self_powered) {
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index 8e9df7498c7..769db491f01 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdivar.h,v 1.66 2014/11/10 11:01:13 mpi Exp $ */
+/* $OpenBSD: usbdivar.h,v 1.67 2014/11/10 14:26:38 mpi Exp $ */
/* $NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */
@@ -90,9 +90,10 @@ struct usbd_port {
struct usbd_hub {
int (*explore)(struct usbd_device *);
void *hubsoftc;
- int nports;
- u_int8_t powerdelay;
- struct usbd_port *ports;
+ struct usbd_port *ports;
+ int nports;
+ u_int8_t powerdelay;
+ u_int8_t ttthink;
};
struct usbd_bus {