From: pirofti <pirofti@openbsd.org>
Date: Sat, 12 Jul 2014 17:53:45 +0000 (+0000)
Subject: Fix root hub descriptors by matching ehci(4)'s descriptors.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=481871dea05cbaa875b34c2e8c8c0b159f156139;p=openbsd

Fix root hub descriptors by matching ehci(4)'s descriptors.

Reminded by mpi@, thanks!

On a side note usb sticks don't get fried anymore, they "just"
freeze the system.
---

diff --git a/sys/arch/octeon/dev/octhci.c b/sys/arch/octeon/dev/octhci.c
index 7656f2d9af6..2c285c2c855 100644
--- a/sys/arch/octeon/dev/octhci.c
+++ b/sys/arch/octeon/dev/octhci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octhci.c,v 1.11 2014/07/12 16:43:31 pirofti Exp $	*/
+/*	$OpenBSD: octhci.c,v 1.12 2014/07/12 17:53:45 pirofti Exp $	*/
 
 /*
  * Copyright (c) 2014 Paul Irofti <pirofti@openbsd.org>
@@ -601,21 +601,13 @@ const usb_endpoint_descriptor_t octhci_endpd = {
 	UDESC_ENDPOINT,
 	UE_DIR_IN | OCTHCI_INTR_ENDPT,
 	UE_INTERRUPT,
-	{2, 0},                 /* max 15 ports */
-	255
-};
-
-const usb_endpoint_ss_comp_descriptor_t octhci_endpcd = {
-	USB_ENDPOINT_SS_COMP_DESCRIPTOR_SIZE,
-	UDESC_ENDPOINT_SS_COMP,
-	0,
-	0,
-	{0, 0}			/* XXX */
+	{8, 0},                 /* max packet */
+	12
 };
 
 const usb_hub_descriptor_t octhci_hubd = {
 	USB_HUB_DESCRIPTOR_SIZE,
-	UDESC_SS_HUB,
+	UDESC_HUB,
 	0,
 	{0,0},
 	0,