Changeset cb8ede1 in mainline

Timestamp:

2013-08-07T08:56:48Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4b8ecff

Parents:

6340a6ff

Message:

usb: Root hub always communicates at max spped

and it can be queried internally.

Location:

uspace

Files:

• drv/bus/usb/ohci/ohci.c (modified) (1 diff)
• drv/bus/usb/uhci/uhci.c (modified) (1 diff)
• drv/bus/usb/vhc/main.c (modified) (1 diff)
• lib/usbhost/include/usb/host/ddf_helpers.h (modified) (1 diff)
• lib/usbhost/src/ddf_helpers.c (modified) (1 diff)

uspace/drv/bus/usb/ohci/ohci.c

@@ -158 +158 @@
 
         /* HC should be running OK. We can add root hub */
-        ret = hcd_ddf_setup_root_hub(device, USB_SPEED_FULL);
+        ret = hcd_ddf_setup_root_hub(device);
         CHECK_RET_CLEAN_RETURN(ret,
             "Failed to register OHCI root hub: %s.\n", str_error(ret));

uspace/drv/bus/usb/uhci/uhci.c

@@ -150 +150 @@
 
         /*
-         * Creating root hub registers a new USB device so all HC
-         * functionality needs to be ready at this time.
+         * Creating root hub registers a new USB device so HC
+         * needs to be ready at this time.
          */
-        ret = hcd_ddf_setup_root_hub(device, USB_SPEED_FULL);
+        ret = hcd_ddf_setup_root_hub(device);
         if (ret != EOK) {
                 // TODO: Undo hcd_setup_device

uspace/drv/bus/usb/vhc/main.c

@@ -105 +105 @@
         }
 
-        ret = hcd_ddf_setup_root_hub(dev, USB_SPEED_FULL);
+        /*
+         * Creating root hub registers a new USB device so HC
+         * needs to be ready at this time.
+         */
+        ret = hcd_ddf_setup_root_hub(dev);
         if (ret != EOK) {
                 usb_log_error("Failed to init VHC root hub: %s\n",

uspace/lib/usbhost/include/usb/host/ddf_helpers.h

@@ -45 +45 @@
 int hcd_ddf_setup_device(ddf_dev_t *device, ddf_fun_t **hc_fun,
     usb_speed_t max_speed, size_t bw, bw_count_func_t bw_count);
-int hcd_ddf_setup_root_hub(ddf_dev_t *dev, usb_speed_t speed);
+int hcd_ddf_setup_root_hub(ddf_dev_t *device);
 int hcd_ddf_new_device(ddf_dev_t *device, usb_address_t *address);
 int hcd_ddf_remove_device(ddf_dev_t *device, usb_address_t address);

uspace/lib/usbhost/src/ddf_helpers.c

@@ -579 +579 @@
  *
  * @param[in] device Host controller ddf device
- * @param[in] speed roothub communication speed
  * @return Error code
  */
-int hcd_ddf_setup_root_hub(ddf_dev_t *device, usb_speed_t speed)
+int hcd_ddf_setup_root_hub(ddf_dev_t *device)
 {
         assert(device);
         hcd_t *hcd = dev_to_hcd(device);
         assert(hcd);
+
+        const usb_speed_t speed = hcd->ep_manager.max_speed;
 
         hcd_reserve_default_address(hcd, speed);