Changeset 4e8e1f5 in mainline for uspace/drv

Timestamp:

2011-02-11T18:10:21Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d321cd7

Parents:

79d2987

Message:

Device recognition uses pipe API

Location:

uspace/drv

Files:

• uhci-rhd/port.c (modified) (2 diffs)
• usbhub/usbhub.c (modified) (2 diffs)
• vhc/hub.c (modified) (2 diffs)

uspace/drv/uhci-rhd/port.c

@@ -33 +33 @@
  */
 #include <errno.h>
+#include <str_error.h>
 
 #include <usb/usb.h>    /* usb_address_t */
 #include <usb/usbdrv.h> /* usb_drv_*     */
 #include <usb/debug.h>
+#include <usb/recognise.h>
 
 #include "port.h"
@@ -204 +206 @@
         assert(port->attached_device == 0);
 
-        ret = usb_drv_register_child_in_devman(port->hc_phone, port->rh,
-          usb_address, &port->attached_device);
-
+        devman_handle_t hc_handle;
+        ret = usb_drv_find_hc(port->rh, &hc_handle);
+        if (ret != EOK) {
+                usb_log_error("Failed to get handle of host controller: %s.\n",
+                    str_error(ret));
+                uhci_port_set_enabled(port, false);
+                return ENOMEM;
+        }
+
+        ret = usb_device_register_child_in_devman(usb_address, hc_handle,
+            port->rh, &port->attached_device);
         if (ret != EOK) { /* something went wrong */
                 usb_log_error("Failed(%d) in usb_drv_register_child.\n", ret);

uspace/drv/usbhub/usbhub.c

@@ -36 +36 @@
 #include <bool.h>
 #include <errno.h>
+#include <str_error.h>
 
 #include <usb_iface.h>
 #include <usb/usbdrv.h>
 #include <usb/descriptor.h>
+#include <usb/recognise.h>
 #include <usb/devreq.h>
 #include <usb/classes/hub.h>
@@ -317 +319 @@
         }
 
+        devman_handle_t hc_handle;
+        opResult = usb_drv_find_hc(hub->device, &hc_handle);
+        if (opResult != EOK) {
+                usb_log_error("Failed to get handle of host controller: %s.\n",
+                    str_error(opResult));
+                return;
+        }
+
         devman_handle_t child_handle;
-        opResult = usb_drv_register_child_in_devman(hc, hub->device,
-            new_device_address, &child_handle);
+        opResult = usb_device_register_child_in_devman(new_device_address,
+            hc_handle, hub->device, &child_handle);
         if (opResult != EOK) {
                 dprintf(USB_LOG_LEVEL_ERROR, "could not start driver for new device");

uspace/drv/vhc/hub.c

@@ -41 +41 @@
 #include <driver.h>
 #include <usb/usbdrv.h>
+#include <usb/recognise.h>
 
 #include "hub.h"
@@ -93 +94 @@
 
         devman_handle_t hub_handle;
-        usb_drv_register_child_in_devman(hc, hc_dev, hub_address, &hub_handle);
+        usb_device_register_child_in_devman(hub_address, hc_dev->handle,
+            hc_dev, &hub_handle);
+        //usb_drv_register_child_in_devman(hc, hc_dev, hub_address, &hub_handle);
         usb_drv_bind_address(hc, hub_address, hub_handle);