From f2fc85cd1905405fd1f0baae03428ac6e6dfe708 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Mon, 2 May 2005 11:25:17 -0400
Subject: [PATCH] --- yaml --- r: 3679 b: refs/heads/master c:
 5742b0c95026c817d9c266174ca39a909e8d38ca h: refs/heads/master i:   3677:
 7b80bf97026cd42cf25e5a97b53494622ed944d0   3675:
 1a875f1e9bfc53015e40d74e85b211bb1d4b020a   3671:
 16fb0f025aa18160790074fb4a683b2a9f3e25a1   3663:
 808012837292a2dda0f61fb9781e4902317491e1   3647:
 e2b820f9cf78a9cbaf32636591d7fbd52d0c22a9 v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/usb/gadget/dummy_hcd.c | 30 ++++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6c7948367a5a..e2b52c1bee6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65111084c63d7674dc37833e8eb59cfdaa4d0bda
+refs/heads/master: 5742b0c95026c817d9c266174ca39a909e8d38ca
diff --git a/trunk/drivers/usb/gadget/dummy_hcd.c b/trunk/drivers/usb/gadget/dummy_hcd.c
index 1918d10f7569..e9b95df5b23d 100644
--- a/trunk/drivers/usb/gadget/dummy_hcd.c
+++ b/trunk/drivers/usb/gadget/dummy_hcd.c
@@ -601,8 +601,10 @@ static int dummy_wakeup (struct usb_gadget *_gadget)
 	struct dummy	*dum;
 
 	dum = gadget_to_dummy (_gadget);
-	if ((dum->devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) == 0
-			|| !(dum->port_status & (1 << USB_PORT_FEAT_SUSPEND)))
+	if (!(dum->port_status & (1 << USB_PORT_FEAT_SUSPEND))
+			|| !(dum->devstatus &
+				( (1 << USB_DEVICE_B_HNP_ENABLE)
+				| (1 << USB_DEVICE_REMOTE_WAKEUP))))
 		return -EINVAL;
 
 	/* hub notices our request, issues downstream resume, etc */
@@ -713,6 +715,9 @@ usb_gadget_register_driver (struct usb_gadget_driver *driver)
 	dum->gadget.ops = &dummy_ops;
 	dum->gadget.is_dualspeed = 1;
 
+	/* maybe claim OTG support, though we won't complete HNP */
+	dum->gadget.is_otg = (dummy_to_hcd(dum)->self.otg_port != 0);
+
 	dum->devstatus = 0;
 	dum->resuming = 0;
 
@@ -1215,6 +1220,16 @@ static void dummy_timer (unsigned long _dum)
 					switch (setup.wValue) {
 					case USB_DEVICE_REMOTE_WAKEUP:
 						break;
+					case USB_DEVICE_B_HNP_ENABLE:
+						dum->gadget.b_hnp_enable = 1;
+						break;
+					case USB_DEVICE_A_HNP_SUPPORT:
+						dum->gadget.a_hnp_support = 1;
+						break;
+					case USB_DEVICE_A_ALT_HNP_SUPPORT:
+						dum->gadget.a_alt_hnp_support
+							= 1;
+						break;
 					default:
 						value = -EOPNOTSUPP;
 					}
@@ -1533,6 +1548,13 @@ static int dummy_hub_control (
 					spin_unlock (&dum->lock);
 					dum->driver->suspend (&dum->gadget);
 					spin_lock (&dum->lock);
+					/* HNP would happen here; for now we
+					 * assume b_bus_req is always true.
+					 */
+					if (((1 << USB_DEVICE_B_HNP_ENABLE)
+							& dum->devstatus) != 0)
+						dev_dbg (dummy_dev(dum),
+							"no HNP yet!\n");
 				}
 			}
 			break;
@@ -1648,6 +1670,10 @@ static int dummy_start (struct usb_hcd *hcd)
 	hcd->power_budget = 8;
 	hcd->state = HC_STATE_RUNNING;
 
+#ifdef CONFIG_USB_OTG
+	hcd->self.otg_port = 1;
+#endif
+
 	/* FIXME 'urbs' should be a per-device thing, maybe in usbcore */
 	device_create_file (dummy_dev(dum), &dev_attr_urbs);
 	return 0;