diff options
| author | Tatyana Brokhman <tlinder@codeaurora.org> | 2011-06-29 16:41:53 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-01 14:27:06 -0700 |
| commit | 7eca4c5a8b73f22ad16ad6e76b901351732355da (patch) | |
| tree | 553df42ae8d66f78e697b787d50c5ad5cc168bc3 /drivers/usb | |
| parent | 1cd8fd2887e162ad3d067150962cc3d32dcf3150 (diff) | |
| download | linux-3.10-7eca4c5a8b73f22ad16ad6e76b901351732355da.tar.gz linux-3.10-7eca4c5a8b73f22ad16ad6e76b901351732355da.tar.bz2 linux-3.10-7eca4c5a8b73f22ad16ad6e76b901351732355da.zip | |
usb: gadget: dummy_hcd: add 'is_high_speed' parameter
This patch adds a new module parameter to dummy_hcd
called is_high_speed.
When set to false the connected device will be forced
to operate in full-speed mode. By default, this parameter
is set to 'true'.
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/dummy_hcd.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c index a4896df3296..d040dc406b1 100644 --- a/drivers/usb/gadget/dummy_hcd.c +++ b/drivers/usb/gadget/dummy_hcd.c @@ -72,13 +72,17 @@ MODULE_LICENSE ("GPL"); struct dummy_hcd_module_parameters { bool is_super_speed; + bool is_high_speed; }; static struct dummy_hcd_module_parameters mod_data = { - .is_super_speed = false + .is_super_speed = false, + .is_high_speed = true, }; module_param_named(is_super_speed, mod_data.is_super_speed, bool, S_IRUGO); MODULE_PARM_DESC(is_super_speed, "true to simulate SuperSpeed connection"); +module_param_named(is_high_speed, mod_data.is_high_speed, bool, S_IRUGO); +MODULE_PARM_DESC(is_high_speed, "true to simulate HighSpeed connection"); /*-------------------------------------------------------------------------*/ /* gadget side driver data structres */ @@ -909,12 +913,15 @@ static int dummy_udc_start(struct usb_gadget_driver *driver, dum->gadget.ep0 = &dum->ep [0].ep; if (mod_data.is_super_speed) dum->gadget.speed = driver->speed; + else if (mod_data.is_high_speed) + dum->gadget.speed = min_t(u8, USB_SPEED_HIGH, driver->speed); else - dum->gadget.speed = min((u8)USB_SPEED_HIGH, (u8)driver->speed); + dum->gadget.speed = USB_SPEED_FULL; if (dum->gadget.speed < driver->speed) - dev_dbg(udc_dev(dum), "This device can perform faster if" - " you connect it to a " - "SupeSpeed port...\n"); + dev_dbg(udc_dev(dum), "This device can perform faster" + " if you connect it to a %s port...\n", + (driver->speed == USB_SPEED_SUPER ? + "SuperSpeed" : "HighSpeed")); if (dum->gadget.speed == USB_SPEED_SUPER) { for (i = 0; i < DUMMY_ENDPOINTS; i++) @@ -2435,6 +2442,9 @@ static int __init init (void) if (usb_disabled ()) return -ENODEV; + if (!mod_data.is_high_speed && mod_data.is_super_speed) + return -EINVAL; + the_hcd_pdev = platform_device_alloc(driver_name, -1); if (!the_hcd_pdev) return retval; |